From james.hilliard1 at gmail.com Sat Jan 1 00:04:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 17:04:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency Message-ID: <20220101000408.1538099-1-james.hilliard1@gmail.com> Fixes: File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in ModuleNotFoundError: No module named 'aiosignal' Signed-off-by: James Hilliard --- package/python-aiohttp/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 9ffea088e4..85a6862141 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_AIOHTTP bool "python-aiohttp" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIODNS # runtime + select BR2_PACKAGE_PYTHON_AIOSIGNAL # runtime select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 00:31:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 17:31:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-sse: bump to version 2.1.0 Message-ID: <20220101003125.1957739-1-james.hilliard1@gmail.com> License hash change due to full text removal: https://github.com/aio-libs/aiohttp-sse/commit/307fd35a84a66b7fb5adfd70cd5b7d709fa8508c Fixes(python 3.10 compatibility): File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 107, in wait File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 144, in _ping TypeError: sleep() got an unexpected keyword argument 'loop' Signed-off-by: James Hilliard --- package/python-aiohttp-sse/python-aiohttp-sse.hash | 6 +++--- package/python-aiohttp-sse/python-aiohttp-sse.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.hash b/package/python-aiohttp-sse/python-aiohttp-sse.hash index 2f21da462e..224601450c 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.hash +++ b/package/python-aiohttp-sse/python-aiohttp-sse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-sse/json -md5 d2f394fb75f591045b2c94fc17c8533d aiohttp-sse-2.0.0.tar.gz -sha256 547e1eaa129749f090d02b31956215edbcde74ce99721f5f0ac902a9ccb1202e aiohttp-sse-2.0.0.tar.gz +md5 822cd0c30325e8a711101c1a1ede4058 aiohttp-sse-2.1.0.tar.gz +sha256 dfe8f7271ab4470891fa1bfa1913d6889b3d19015dd3d3a4cab949e66971bbca aiohttp-sse-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE +sha256 5585eb91ec607b4fdbe97d44a61146a9cc27bb703336628bc3c6a1eaffe60307 LICENSE diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.mk b/package/python-aiohttp-sse/python-aiohttp-sse.mk index 7a7a0d0a70..2aef1579f5 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.mk +++ b/package/python-aiohttp-sse/python-aiohttp-sse.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SSE_VERSION = 2.0.0 +PYTHON_AIOHTTP_SSE_VERSION = 2.1.0 PYTHON_AIOHTTP_SSE_SOURCE = aiohttp-sse-$(PYTHON_AIOHTTP_SSE_VERSION).tar.gz -PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2b/50/e127729f7df53c32c96b5c71932a7262cad40c83f1e19c218b068c816d51 +PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2f/3f/cc4f5a3fe6cb50ad5b9d26bb7738c5da1f61645b517d4230df2fc32d89f0 PYTHON_AIOHTTP_SSE_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SSE_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SSE_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 00:40:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 17:40:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: bump to version 3.8.1 Message-ID: <20220101004032.1986569-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiohttp/python-aiohttp.hash | 4 ++-- package/python-aiohttp/python-aiohttp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index 90dbd75994..b2b0f8c937 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 4743950052dbaf5ce5c3622754ebceae aiohttp-3.8.0.tar.gz -sha256 d3b19d8d183bcfd68b25beebab8dc3308282fe2ca3d6ea3cb4cd101b3c279f8d aiohttp-3.8.0.tar.gz +md5 faf7726dc65a940272874c0f441e8ec6 aiohttp-3.8.1.tar.gz +sha256 fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578 aiohttp-3.8.1.tar.gz # Locally computed sha256 checksums sha256 383c70c090b60ae81e035fe4fafed689b45c4421cd3bc355f1bd41ac208ccf3f LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 03501a7527..5a2d306438 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.8.0 +PYTHON_AIOHTTP_VERSION = 3.8.1 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/48/1a/ba9542a545aed4b0b6ef128561f68dd3c2812ff5abfa9ed5b96547a728ea +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/5a/86/5f63de7a202550269a617a5d57859a2961f3396ecd1739a70b92224766bc PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 04:49:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 21:49:13 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-remotes: bump to version 1.1.0 Message-ID: <20220101044913.1990522-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiohttp-remotes/python-aiohttp-remotes.hash | 4 ++-- package/python-aiohttp-remotes/python-aiohttp-remotes.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index a9a6cad2df..595340d5d8 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 e90fad4b7aa088207f831698fddd9eea aiohttp_remotes-1.0.0.tar.gz -sha256 caec1681de70bac82daa676078d9b125758fb3952fdaa893a6b42bdd995562ef aiohttp_remotes-1.0.0.tar.gz +md5 da13880f25ec3b9cf98c7baff92835a2 aiohttp_remotes-1.1.0.tar.gz +sha256 e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174 aiohttp_remotes-1.1.0.tar.gz # Locally computed sha256 checksums sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index f04cecd89d..e2bc3e1c18 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.0.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.1.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/40/b6/1178bd1e26e88f9f29b7d1bbfae7b38d39ec9cf787d4685f83ade2e7aa7f +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/e3/fc/5523010172e2d8685a8934fbb49d564118c9ebc1e4233a62b77310f979db PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 05:01:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 22:01:52 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiosignal: bump to version 1.2.0 Message-ID: <20220101050152.1991600-1-james.hilliard1@gmail.com> License file renamed in: https://github.com/aio-libs/aiosignal/commit/98b25a33d08821a2948d334b223e2874979f5bd4 Signed-off-by: James Hilliard --- package/python-aiosignal/python-aiosignal.hash | 6 +++--- package/python-aiosignal/python-aiosignal.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-aiosignal/python-aiosignal.hash b/package/python-aiosignal/python-aiosignal.hash index 3fdd459502..f2a09749b8 100644 --- a/package/python-aiosignal/python-aiosignal.hash +++ b/package/python-aiosignal/python-aiosignal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosignal/json -md5 f3edf1b700b4fee6ea6ed375c3f6555c aiosignal-1.1.2.tar.gz -sha256 15605698a0401075a03d36cea979e3c0e6cf8467a9e3b9047040514dd9e6f43b aiosignal-1.1.2.tar.gz +md5 011700c3acc576a3a38deade6a4860cb aiosignal-1.2.0.tar.gz +sha256 78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2 aiosignal-1.2.0.tar.gz # Locally computed sha256 checksums -sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt +sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-aiosignal/python-aiosignal.mk b/package/python-aiosignal/python-aiosignal.mk index ea11d97060..e0436e973e 100644 --- a/package/python-aiosignal/python-aiosignal.mk +++ b/package/python-aiosignal/python-aiosignal.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_AIOSIGNAL_VERSION = 1.1.2 +PYTHON_AIOSIGNAL_VERSION = 1.2.0 PYTHON_AIOSIGNAL_SOURCE = aiosignal-$(PYTHON_AIOSIGNAL_VERSION).tar.gz -PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/ac/f7/c3df3b7eac6ea96175e0817b272b43b398d5ba589be09a50d1b758d5b852 +PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/27/6b/a89fbcfae70cf53f066ec22591938296889d3cc58fec1e1c393b10e8d71d PYTHON_AIOSIGNAL_SETUP_TYPE = setuptools PYTHON_AIOSIGNAL_LICENSE = Apache-2.0 -PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE.txt +PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE $(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 05:16:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 22:16:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-async-timeout: bump to version 4.0.2 Message-ID: <20220101051608.1993550-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-async-timeout/python-async-timeout.hash | 4 ++-- package/python-async-timeout/python-async-timeout.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-async-timeout/python-async-timeout.hash b/package/python-async-timeout/python-async-timeout.hash index 1a64c3a77d..0ecf1ef5ae 100644 --- a/package/python-async-timeout/python-async-timeout.hash +++ b/package/python-async-timeout/python-async-timeout.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/async-timeout/json -md5 2871f3853060ac7e76e6278b85dfb3c9 async-timeout-4.0.0.tar.gz -sha256 7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382 async-timeout-4.0.0.tar.gz +md5 10571272b2e0fab839ec23f8293bf482 async-timeout-4.0.2.tar.gz +sha256 2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15 async-timeout-4.0.2.tar.gz # Locally computed sha256 checksums sha256 e18d7bb8f513e2c46bb585c94b585bd30720dd3ccb21ddb0786f72d16658f92c LICENSE diff --git a/package/python-async-timeout/python-async-timeout.mk b/package/python-async-timeout/python-async-timeout.mk index 1d2c716fa9..b3c5f79e45 100644 --- a/package/python-async-timeout/python-async-timeout.mk +++ b/package/python-async-timeout/python-async-timeout.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.0 +PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.2 PYTHON_ASYNC_TIMEOUT_SOURCE = async-timeout-$(PYTHON_ASYNC_TIMEOUT_VERSION).tar.gz -PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/28/0c/1cd218ea84964f0740a3ab6152dfa99661174abdd8e4053e06c0285ac42a +PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/54/6e/9678f7b2993537452710ffb1750c62d2c26df438aa621ad5fa9d1507a43a PYTHON_ASYNC_TIMEOUT_LICENSE = Apache-2.0 PYTHON_ASYNC_TIMEOUT_LICENSE_FILES = LICENSE PYTHON_ASYNC_TIMEOUT_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 05:20:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 22:20:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiorwlock: bump to version 1.2.0 Message-ID: <20220101052032.1994475-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index bddc846a5b..fad7079789 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 066260ea2c6798f6e18258d4430031bb aiorwlock-1.1.0.tar.gz -sha256 2aaf1d1cc995abfd5b2f07ca0e9b5c23bd369517c75495a347eb5896bc307f29 aiorwlock-1.1.0.tar.gz +md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz +sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index acc6f90158..4ba4965eb5 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.1.0 +PYTHON_AIORWLOCK_VERSION = 1.2.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/ca/e5/3221d49edb432024f6b1b7e9e36cad6363601973375667477f2130d5da7d +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 05:32:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 22:32:21 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-session: bump to version 2.10.0 Message-ID: <20220101053221.1995791-1-james.hilliard1@gmail.com> License hash changed due to full text removal: https://github.com/aio-libs/aiohttp-session/commit/6a1c7f0efe006425b5387b089f4d39bc48765ed7 Signed-off-by: James Hilliard --- package/python-aiohttp-session/python-aiohttp-session.hash | 6 +++--- package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index f10827b616..3842f0c7af 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.hash +++ b/package/python-aiohttp-session/python-aiohttp-session.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-session/json -md5 993ec277ece4765472d0edc0f6c0bba3 aiohttp-session-2.9.0.tar.gz -sha256 959413468b84e30e7ca09719617cfb0000066a2e0f6c20062d043433e82aeb74 aiohttp-session-2.9.0.tar.gz +md5 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz +sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz # Locally computed sha256 checksums -sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE +sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index fa724fdb86..a28b1ae143 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/package/python-aiohttp-session/python-aiohttp-session.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SESSION_VERSION = 2.9.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.10.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/f8/fe/53dfd35f5c7fcc7f2d0866cb29e722303e3fae7f749c1f3d4d11d361dc38 +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 08:06:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 01:06:20 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.3.3 Message-ID: <20220101080620.1997183-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 45139a6606..26a3778756 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 b8cbcb6e00d8e535256526dfe4f27db3 aioconsole-0.3.2.tar.gz -sha256 9355b36d41d5fbdd3dbb01510deb2b985b508b2ebcd5b8bd85af61a707e2f6c8 aioconsole-0.3.2.tar.gz +md5 f8b67330e631cfc45a9b2560a6e0fa98 aioconsole-0.3.3.tar.gz +sha256 47df42d9f8cc3995bbe032dd5f01d32cc5b06639e9078bb9b4e3c55b237f5e32 aioconsole-0.3.3.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 75ea3c2a2a..f06d91a550 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.2 +PYTHON_AIOCONSOLE_VERSION = 0.3.3 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/7a/b2/747ab3cb965596cd84c5159941613d901d8771acad3c51c4f5da362aa9f0 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/dd/f6/bbc451ba96c1e1da6aa253f254b181ceb03272b475b27b481b57865d7d7f PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 08:09:43 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 01:09:43 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiofiles: bump to version 0.8.0 Message-ID: <20220101080943.1998115-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiofiles/python-aiofiles.hash | 4 ++-- package/python-aiofiles/python-aiofiles.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiofiles/python-aiofiles.hash b/package/python-aiofiles/python-aiofiles.hash index a5c140606b..268136a406 100644 --- a/package/python-aiofiles/python-aiofiles.hash +++ b/package/python-aiofiles/python-aiofiles.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiofiles/json -md5 a2dd24e2ca8d7b7e7dbacd6381da748a aiofiles-0.7.0.tar.gz -sha256 a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4 aiofiles-0.7.0.tar.gz +md5 697deeb4fdcb620c45f114f173ed7c0d aiofiles-0.8.0.tar.gz +sha256 8334f23235248a3b2e83b2c3a78a22674f39969b96397126cc93664d9a901e59 aiofiles-0.8.0.tar.gz # Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index e43cf9a484..996e5eb6c0 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOFILES_VERSION = 0.7.0 +PYTHON_AIOFILES_VERSION = 0.8.0 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz -PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/06/f0/af90f3fb4066b0707b6a5af3ffd5fd9b3809bbb52f0153a3c7550e594de3 +PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/10/ca/c416cfacf6a47e1400dad56eab85aa86c92c6fbe58447d12035e434f0d5c PYTHON_AIOFILES_SETUP_TYPE = setuptools PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 1 08:35:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:35:49 +0100 Subject: [Buildroot] [git commit] package/flare-game: really use LICENSE.txt as license file Message-ID: <20220101083153.3282D8120D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7684604188f829820f96ced628137ff880e302f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The previous version bump [1] added the hash of LICENSE.txt but forgot to update FLARE_GAME_LICENSE_FILES. [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/flare-game/flare-game.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index d65e3d6c38..2845dc9714 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -8,7 +8,7 @@ FLARE_GAME_VERSION = 1.11 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) -FLARE_GAME_LICENSE_FILES = README +FLARE_GAME_LICENSE_FILES = LICENSE.txt FLARE_GAME_DEPENDENCIES = flare-engine From yann.morin.1998 at free.fr Sat Jan 1 08:35:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:35:47 +0100 Subject: [Buildroot] [git commit] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Message-ID: <20220101083153.2550282DA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f66c3557a391a00a7527e2b2e8fddd83f0ba0aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Flare games use OGG audio file format througt SDL2-mixer. Without OGG support, flare-engine trigger a lot of errors in its log and fail to start the game. ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/flare-engine/Config.in | 1 + package/flare-engine/flare-engine.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index d08b740af3..9c997c2b9a 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FLARE_ENGINE select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER select BR2_PACKAGE_SDL2_TTF + select BR2_PACKAGE_TREMOR # for SDL2_mixer ogg support help Flare (Free Libre Action Roleplaying Engine) is a simple game engine built to handle a very specific kind of game: diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index 14d2681fda..d722a42208 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -9,7 +9,7 @@ FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING -FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf +FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf tremor # Don't use /usr/games and /usr/share/games FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare From yann.morin.1998 at free.fr Sat Jan 1 08:40:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:40:00 +0100 Subject: [Buildroot] [git commit] flare-{engine, game}: bump to version 1.12 Message-ID: <20220101083540.E3C8D81E43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc0edf6e698ba9ed2686f0b3652b6739979964cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See: https://flarerpg.org/2021/08/02/flare-1-12/ Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/flare-engine/flare-engine.hash | 2 +- package/flare-engine/flare-engine.mk | 2 +- package/flare-game/flare-game.hash | 2 +- package/flare-game/flare-game.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash index 0e37a71922..7f6169381c 100644 --- a/package/flare-engine/flare-engine.hash +++ b/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d flare-engine-1.11.tar.gz +sha256 287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e flare-engine-1.12.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index d722a42208..cbb7add4bb 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_ENGINE_VERSION = 1.11 +FLARE_ENGINE_VERSION = 1.12 FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash index 983c23200f..3d6d678c94 100644 --- a/package/flare-game/flare-game.hash +++ b/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c13231c7dd021252487f6cf117f7f2bb24bbda40af0a2b2902d72b5e2d4c242a flare-game-1.11.tar.gz +sha256 19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160 flare-game-1.12.tar.gz sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index 2845dc9714..41f02bec93 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_GAME_VERSION = 1.11 +FLARE_GAME_VERSION = 1.12 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) From yann.morin.1998 at free.fr Sat Jan 1 08:42:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:42:11 +0100 Subject: [Buildroot] [PATCH 3/3] flare-{engine, game}: bump to version 1.12 In-Reply-To: <20211231124728.1692301-3-romain.naour@gmail.com> References: <20211231124728.1692301-1-romain.naour@gmail.com> <20211231124728.1692301-3-romain.naour@gmail.com> Message-ID: <20220101084211.GP3390456@scaer> Romain, All, On 2021-12-31 13:47 +0100, Romain Naour spake thusly: > See: > https://flarerpg.org/2021/08/02/flare-1-12/ > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/flare-engine/flare-engine.hash | 2 +- > package/flare-engine/flare-engine.mk | 2 +- > package/flare-game/flare-game.hash | 2 +- > package/flare-game/flare-game.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash > index 0e37a71922..7f6169381c 100644 > --- a/package/flare-engine/flare-engine.hash > +++ b/package/flare-engine/flare-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d flare-engine-1.11.tar.gz > +sha256 287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e flare-engine-1.12.tar.gz > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk > index d722a42208..cbb7add4bb 100644 > --- a/package/flare-engine/flare-engine.mk > +++ b/package/flare-engine/flare-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FLARE_ENGINE_VERSION = 1.11 > +FLARE_ENGINE_VERSION = 1.12 > FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) > FLARE_ENGINE_LICENSE = GPL-3.0+ > FLARE_ENGINE_LICENSE_FILES = COPYING > diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash > index 983c23200f..3d6d678c94 100644 > --- a/package/flare-game/flare-game.hash > +++ b/package/flare-game/flare-game.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 c13231c7dd021252487f6cf117f7f2bb24bbda40af0a2b2902d72b5e2d4c242a flare-game-1.11.tar.gz > +sha256 19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160 flare-game-1.12.tar.gz > sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt > diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk > index 2845dc9714..41f02bec93 100644 > --- a/package/flare-game/flare-game.mk > +++ b/package/flare-game/flare-game.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FLARE_GAME_VERSION = 1.11 > +FLARE_GAME_VERSION = 1.12 > FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) > FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ > OFL-1.1 (Liberation Sans) > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 08:50:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:50:47 +0100 Subject: [Buildroot] [git commit] package/ruby: update to 3.1.0 Message-ID: <20220101084614.C44B282289@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4efd17526a5554b5191e3e5ef69d33aa210c5ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All patches are upstream. Tested with qemu-system-arm/qemu-system-sparc. LEGAL license hash changed: - drop aclocal.m4, no longer provided - add MIT-covered works Signed-off-by: Waldemar Brodkorb [yann.morin.1998 at free.fr: update license hash] Signed-off-by: Yann E. MORIN --- .../0001-fix-default-coroutine-selection.patch | 21 ---------------- package/ruby/0002-Needs-AC_PROG_CC.patch | 28 ---------------------- package/ruby/ruby.hash | 6 ++--- package/ruby/ruby.mk | 21 +++++++++------- 4 files changed, 16 insertions(+), 60 deletions(-) diff --git a/package/ruby/0001-fix-default-coroutine-selection.patch b/package/ruby/0001-fix-default-coroutine-selection.patch deleted file mode 100644 index ea84aa9bc6..0000000000 --- a/package/ruby/0001-fix-default-coroutine-selection.patch +++ /dev/null @@ -1,21 +0,0 @@ -fixed default coroutine selection for musl/uclibc - -https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac ---- ruby-3.0.0.orig/configure.ac 2020-12-25 04:33:01.000000000 +0100 -+++ ruby-3.0.0/configure.ac 2021-02-22 13:00:53.990314464 +0100 -@@ -2441,7 +2441,10 @@ - rb_cv_coroutine=copy - ], - [ -- rb_cv_coroutine=ucontext -+ AC_CHECK_FUNCS([getcontext swapcontext makecontext], -+ [rb_cv_coroutine=ucontext], -+ [rb_cv_coroutine=copy; break] -+ ) - ] - ) - AC_MSG_RESULT(${rb_cv_coroutine}) diff --git a/package/ruby/0002-Needs-AC_PROG_CC.patch b/package/ruby/0002-Needs-AC_PROG_CC.patch deleted file mode 100644 index 647358be70..0000000000 --- a/package/ruby/0002-Needs-AC_PROG_CC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Thu, 30 Sep 2021 18:24:37 +0900 -Subject: [PATCH] Needs `AC_PROG_CC` - -Although `AC_PROG_CC_C99` has been obsolete, `AC_PROG_CC` is not -and the latter is necessary not to make C++ compiler mandatory. - -[Retrieved from: -https://github.com/ruby/ruby/commit/912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b24a8f59b0d2..c7059ee1ecf4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -218,7 +218,7 @@ rb_test_CXXFLAGS=${CXXFLAGS+yes} - # BSD's ports and MacPorts prefix GNU binutils with 'g' - - dnl Seems necessarily in order to add -std=gnu99 option for gcc 4.9. --m4_version_prereq([2.70], [], [AC_PROG_CC_C99]) -+m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_C99]) - - AC_PROG_CXX - AC_PROG_CPP diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 1208461cd0..90e7627a97 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,6 +1,6 @@ -# https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/ -sha512 bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00 ruby-3.0.3.tar.xz +# https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/ +sha512 a2bb6b5e62d5fa06dd9c30cf84ddcb2c27cb87fbaaffd2309a44391a6b110e1dde6b7b0d8c659b56387ee3c9b4264003f3532d5a374123a7c187ebba9293f320 ruby-3.1.0.tar.xz # License files, Locally calculated -sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL +sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING sha256 36a9a6e7347214bbba599a412617204e65bff065dcbe5c46f5cb454c80de9eb0 BSDL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 7966450fd1..4f3b94f83b 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,11 +4,21 @@ # ################################################################################ -RUBY_VERSION_MAJOR = 3.0 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 -RUBY_VERSION_EXT = 3.0.0 +RUBY_VERSION_MAJOR = 3.1 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 +RUBY_VERSION_EXT = 3.1.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz + +RUBY_LICENSE = \ + Ruby or BSD-2-Clause, \ + BSD-3-Clause, \ + MIT, \ + others +RUBY_LICENSE_FILES = LEGAL COPYING BSDL + +RUBY_CPE_ID_VENDOR = ruby-lang + RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -17,11 +27,6 @@ HOST_RUBY_CONF_OPTS = \ --disable-install-doc \ --with-out-ext=curses,readline \ --without-gmp -RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others -RUBY_LICENSE_FILES = LEGAL COPYING BSDL -RUBY_CPE_ID_VENDOR = ruby-lang -# 0001-fix-default-coroutine-selection.patch -RUBY_AUTORECONF = YES ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) RUBY_CONF_ENV += LIBS=-latomic From yann.morin.1998 at free.fr Sat Jan 1 08:57:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:57:52 +0100 Subject: [Buildroot] [PATCH] package/ruby: update to 3.1.0 In-Reply-To: References: Message-ID: <20220101085751.GQ3390456@scaer> Waldemar, All, On 2021-12-31 16:12 +0100, Waldemar Brodkorb spake thusly: > All patches are upstream. Tested with qemu-system-arm/qemu-system-sparc. > > Signed-off-by: Waldemar Brodkorb $ make host-ruby-legal-info >>> host-ruby 3.1.0 Collecting legal info ERROR: LEGAL has wrong sha256 hash: ERROR: expected: 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e ERROR: got : 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc ERROR: Incomplete download, or man-in-the-middle (MITM) attack That's because new files have been added, MIT-covered, and another has been removed. So I've fixed the hash, added the MIT to the list of licenses, and pushed to master (with a bit of shuffling the variables around). I've also noted that there is the GPL license text in the 'GPL' file at the root of the package, ad idneed, there are a few files that do refer to the GPL. Could you please have a look and send an update, please? Regards, Yann E. MORIN. > --- > ...0001-fix-default-coroutine-selection.patch | 21 -------------- > package/ruby/0002-Needs-AC_PROG_CC.patch | 28 ------------------- > package/ruby/ruby.hash | 4 +-- > package/ruby/ruby.mk | 8 ++---- > 4 files changed, 5 insertions(+), 56 deletions(-) > delete mode 100644 package/ruby/0001-fix-default-coroutine-selection.patch > delete mode 100644 package/ruby/0002-Needs-AC_PROG_CC.patch > > diff --git a/package/ruby/0001-fix-default-coroutine-selection.patch b/package/ruby/0001-fix-default-coroutine-selection.patch > deleted file mode 100644 > index ea84aa9bc6..0000000000 > --- a/package/ruby/0001-fix-default-coroutine-selection.patch > +++ /dev/null > @@ -1,21 +0,0 @@ > -fixed default coroutine selection for musl/uclibc > - > -https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3 > - > -Signed-off-by: Waldemar Brodkorb > - > -diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac > ---- ruby-3.0.0.orig/configure.ac 2020-12-25 04:33:01.000000000 +0100 > -+++ ruby-3.0.0/configure.ac 2021-02-22 13:00:53.990314464 +0100 > -@@ -2441,7 +2441,10 @@ > - rb_cv_coroutine=copy > - ], > - [ > -- rb_cv_coroutine=ucontext > -+ AC_CHECK_FUNCS([getcontext swapcontext makecontext], > -+ [rb_cv_coroutine=ucontext], > -+ [rb_cv_coroutine=copy; break] > -+ ) > - ] > - ) > - AC_MSG_RESULT(${rb_cv_coroutine}) > diff --git a/package/ruby/0002-Needs-AC_PROG_CC.patch b/package/ruby/0002-Needs-AC_PROG_CC.patch > deleted file mode 100644 > index 647358be70..0000000000 > --- a/package/ruby/0002-Needs-AC_PROG_CC.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -From 912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6 Mon Sep 17 00:00:00 2001 > -From: Nobuyoshi Nakada > -Date: Thu, 30 Sep 2021 18:24:37 +0900 > -Subject: [PATCH] Needs `AC_PROG_CC` > - > -Although `AC_PROG_CC_C99` has been obsolete, `AC_PROG_CC` is not > -and the latter is necessary not to make C++ compiler mandatory. > - > -[Retrieved from: > -https://github.com/ruby/ruby/commit/912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index b24a8f59b0d2..c7059ee1ecf4 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -218,7 +218,7 @@ rb_test_CXXFLAGS=${CXXFLAGS+yes} > - # BSD's ports and MacPorts prefix GNU binutils with 'g' > - > - dnl Seems necessarily in order to add -std=gnu99 option for gcc 4.9. > --m4_version_prereq([2.70], [], [AC_PROG_CC_C99]) > -+m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_C99]) > - > - AC_PROG_CXX > - AC_PROG_CPP > diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash > index 1208461cd0..93708a4d7d 100644 > --- a/package/ruby/ruby.hash > +++ b/package/ruby/ruby.hash > @@ -1,5 +1,5 @@ > -# https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/ > -sha512 bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00 ruby-3.0.3.tar.xz > +# https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/ > +sha512 a2bb6b5e62d5fa06dd9c30cf84ddcb2c27cb87fbaaffd2309a44391a6b110e1dde6b7b0d8c659b56387ee3c9b4264003f3532d5a374123a7c187ebba9293f320 ruby-3.1.0.tar.xz > # License files, Locally calculated > sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL > sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING > diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk > index 7966450fd1..0bb4391e33 100644 > --- a/package/ruby/ruby.mk > +++ b/package/ruby/ruby.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -RUBY_VERSION_MAJOR = 3.0 > -RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 > -RUBY_VERSION_EXT = 3.0.0 > +RUBY_VERSION_MAJOR = 3.1 > +RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 > +RUBY_VERSION_EXT = 3.1.0 > RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) > RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz > RUBY_DEPENDENCIES = host-pkgconf host-ruby > @@ -20,8 +20,6 @@ HOST_RUBY_CONF_OPTS = \ > RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others > RUBY_LICENSE_FILES = LEGAL COPYING BSDL > RUBY_CPE_ID_VENDOR = ruby-lang > -# 0001-fix-default-coroutine-selection.patch > -RUBY_AUTORECONF = YES > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > RUBY_CONF_ENV += LIBS=-latomic > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 09:46:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:46:24 +0100 Subject: [Buildroot] [git commit] package/libdnet: bump to version 1.14, drop python2 support. Message-ID: <20220101094111.4A87E811FA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee21467863d30e20df80fcc1384ac9e573ec8f43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Change the url to the github ofalk repository (SF's repo is MIA; now everyone and their distros switched over to the Github-hosted fork). Depend on python3 and host-python3-cython for python bindings. Remove upstream patches; rework python-makefile.patch to adhere to git formatting and refresh for 1.14. Update License hash due to year changes. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: rework commit log, explain switch to Github] Signed-off-by: Yann E. MORIN --- package/libdnet/0001-python-gcc.patch | 20 -------------------- package/libdnet/0001-python-makefile.patch | 27 +++++++++++++++++++++++++++ package/libdnet/0002-python-makefile.patch | 16 ---------------- package/libdnet/Config.in | 6 +++--- package/libdnet/libdnet.hash | 4 ++-- package/libdnet/libdnet.mk | 12 ++++++------ 6 files changed, 38 insertions(+), 47 deletions(-) diff --git a/package/libdnet/0001-python-gcc.patch b/package/libdnet/0001-python-gcc.patch deleted file mode 100644 index ea732e4358..0000000000 --- a/package/libdnet/0001-python-gcc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/python/dnet.c 2006-01-19 18:08:23.000000000 +1100 -+++ b/python/dnet.c 2008-09-03 16:30:47.000000000 +1000 -@@ -2726,7 +2726,7 @@ - PyObject *__pyx_3 = 0; - unsigned short __pyx_4; - Py_INCREF(__pyx_v_self); -- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); - - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */ - __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max); -@@ -2738,7 +2739,7 @@ - Py_DECREF(__pyx_2); __pyx_2 = 0; - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} - Py_DECREF(((PyObject *)__pyx_v_next)); -- ((PyObject *)__pyx_v_next) = __pyx_3; -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)__pyx_3; - __pyx_3 = 0; - - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */ diff --git a/package/libdnet/0001-python-makefile.patch b/package/libdnet/0001-python-makefile.patch new file mode 100644 index 0000000000..eae22b2f14 --- /dev/null +++ b/package/libdnet/0001-python-makefile.patch @@ -0,0 +1,27 @@ +From 298cd8eaa21a21eee85f9551a26ad294347b1d5a Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Thu, 30 Dec 2021 11:14:15 -0800 +Subject: [PATCH] python makefile + +Signed-off-by: Peter Korsgaard +[adam: refresh for 1.14; make it git-formatted] +Signed-off-by: Adam Duskett +--- + python/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/python/Makefile.am b/python/Makefile.am +index 1a74ef2..59fe0f3 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -11,6 +11,7 @@ $(srcdir)/dnet.c: $(srcdir)/dnet.pyx + pyrexc $(srcdir)/dnet.pyx + + python-build: $(srcdir)/dnet.c ++ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) + $(PYTHON) setup.py build + touch python-build + +-- +2.33.1 + diff --git a/package/libdnet/0002-python-makefile.patch b/package/libdnet/0002-python-makefile.patch deleted file mode 100644 index fb41e43e35..0000000000 --- a/package/libdnet/0002-python-makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - python/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -Index: libdnet-1.11/python/Makefile.am -=================================================================== ---- libdnet-1.11.orig/python/Makefile.am -+++ libdnet-1.11/python/Makefile.am -@@ -11,6 +11,7 @@ - pyrexc $(srcdir)/dnet.pyx - - python-build: $(srcdir)/dnet.c -+ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) - $(PYTHON) setup.py build - touch python-build - diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in index e7ba3a21af..f853e4e12d 100644 --- a/package/libdnet/Config.in +++ b/package/libdnet/Config.in @@ -10,11 +10,11 @@ if BR2_PACKAGE_LIBDNET config BR2_PACKAGE_LIBDNET_PYTHON bool "libdnet python module" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON3 help dnet module for python -comment "dnet module for python requires python package" - depends on !BR2_PACKAGE_PYTHON +comment "dnet module for python requires python3 package" + depends on !BR2_PACKAGE_PYTHON3 endif diff --git a/package/libdnet/libdnet.hash b/package/libdnet/libdnet.hash index d2e820270f..d322a1cc29 100644 --- a/package/libdnet/libdnet.hash +++ b/package/libdnet/libdnet.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53 libdnet-1.11.tar.gz -sha256 1e94df12cb3701fa64e07eeb60284bb16a3544815d5a39860dacff7b86610584 LICENSE +sha256 592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe libdnet-1.14.tar.gz +sha256 6b46ec86e290066c47b6607d322135b3c473566e7225ac23d35a7c0588a82da6 LICENSE diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index 3d3fcbe605..e9a57d6ed2 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBDNET_VERSION = 1.11 -LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION) +LIBDNET_VERSION = 1.14 +LIBDNET_SITE = $(call github,ofalk,libdnet,libdnet-$(LIBDNET_VERSION)) LIBDNET_LICENSE = BSD-3-Clause LIBDNET_LICENSE_FILES = LICENSE LIBDNET_INSTALL_STAGING = YES @@ -15,10 +15,10 @@ LIBDNET_CONF_OPTS = \ --with-check=no LIBDNET_CONFIG_SCRIPTS = dnet-config -ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),) -LIBDNET_DEPENDENCIES += python -LIBDNET_CONF_OPTS += --with-python -LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib +ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) +LIBDNET_DEPENDENCIES += host-python3-cython python3 +LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin +LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endif From yann.morin.1998 at free.fr Sat Jan 1 09:49:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:49:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency In-Reply-To: <20220101000408.1538099-1-james.hilliard1@gmail.com> References: <20220101000408.1538099-1-james.hilliard1@gmail.com> Message-ID: <20220101094952.GR3390456@scaer> James, All, On 2021-12-31 17:04 -0700, James Hilliard spake thusly: > Fixes: > File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in > File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in > File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in > ModuleNotFoundError: No module named 'aiosignal' What about a small runtime test to ensure we no longer miss any such dependency in the future? ;-) > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-aiohttp/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in > index 9ffea088e4..85a6862141 100644 > --- a/package/python-aiohttp/Config.in > +++ b/package/python-aiohttp/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_AIOHTTP > bool "python-aiohttp" > depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIODNS # runtime > + select BR2_PACKAGE_PYTHON_AIOSIGNAL # runtime > select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 09:49:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:49:57 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp: add aiosignal runtime dependency Message-ID: <20220101094828.25061813B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=393614da509c0ce5984b75b943bb7284454fb96c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in ModuleNotFoundError: No module named 'aiosignal' Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 9ffea088e4..85a6862141 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_AIOHTTP bool "python-aiohttp" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIODNS # runtime + select BR2_PACKAGE_PYTHON_AIOSIGNAL # runtime select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime From yann.morin.1998 at free.fr Sat Jan 1 09:50:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:29 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-sse: bump to version 2.1.0 Message-ID: <20220101094828.2E2FD813B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc5b783b191adb1bc6a0714a06b247d2433535fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash change due to full text removal: https://github.com/aio-libs/aiohttp-sse/commit/307fd35a84a66b7fb5adfd70cd5b7d709fa8508c Fixes(python 3.10 compatibility): File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 107, in wait File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 144, in _ping TypeError: sleep() got an unexpected keyword argument 'loop' Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp-sse/python-aiohttp-sse.hash | 6 +++--- package/python-aiohttp-sse/python-aiohttp-sse.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.hash b/package/python-aiohttp-sse/python-aiohttp-sse.hash index 2f21da462e..224601450c 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.hash +++ b/package/python-aiohttp-sse/python-aiohttp-sse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-sse/json -md5 d2f394fb75f591045b2c94fc17c8533d aiohttp-sse-2.0.0.tar.gz -sha256 547e1eaa129749f090d02b31956215edbcde74ce99721f5f0ac902a9ccb1202e aiohttp-sse-2.0.0.tar.gz +md5 822cd0c30325e8a711101c1a1ede4058 aiohttp-sse-2.1.0.tar.gz +sha256 dfe8f7271ab4470891fa1bfa1913d6889b3d19015dd3d3a4cab949e66971bbca aiohttp-sse-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE +sha256 5585eb91ec607b4fdbe97d44a61146a9cc27bb703336628bc3c6a1eaffe60307 LICENSE diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.mk b/package/python-aiohttp-sse/python-aiohttp-sse.mk index 7a7a0d0a70..2aef1579f5 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.mk +++ b/package/python-aiohttp-sse/python-aiohttp-sse.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SSE_VERSION = 2.0.0 +PYTHON_AIOHTTP_SSE_VERSION = 2.1.0 PYTHON_AIOHTTP_SSE_SOURCE = aiohttp-sse-$(PYTHON_AIOHTTP_SSE_VERSION).tar.gz -PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2b/50/e127729f7df53c32c96b5c71932a7262cad40c83f1e19c218b068c816d51 +PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2f/3f/cc4f5a3fe6cb50ad5b9d26bb7738c5da1f61645b517d4230df2fc32d89f0 PYTHON_AIOHTTP_SSE_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SSE_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SSE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:31 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp: bump to version 3.8.1 Message-ID: <20220101094828.6D032813B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6d2ad9b359c8fe786efb0f6d224fc203d46b94b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp/python-aiohttp.hash | 4 ++-- package/python-aiohttp/python-aiohttp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index 90dbd75994..b2b0f8c937 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 4743950052dbaf5ce5c3622754ebceae aiohttp-3.8.0.tar.gz -sha256 d3b19d8d183bcfd68b25beebab8dc3308282fe2ca3d6ea3cb4cd101b3c279f8d aiohttp-3.8.0.tar.gz +md5 faf7726dc65a940272874c0f441e8ec6 aiohttp-3.8.1.tar.gz +sha256 fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578 aiohttp-3.8.1.tar.gz # Locally computed sha256 checksums sha256 383c70c090b60ae81e035fe4fafed689b45c4421cd3bc355f1bd41ac208ccf3f LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 03501a7527..5a2d306438 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.8.0 +PYTHON_AIOHTTP_VERSION = 3.8.1 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/48/1a/ba9542a545aed4b0b6ef128561f68dd3c2812ff5abfa9ed5b96547a728ea +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/5a/86/5f63de7a202550269a617a5d57859a2961f3396ecd1739a70b92224766bc PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Sat Jan 1 09:50:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:40 +0100 Subject: [Buildroot] [git commit] package/python-aiorwlock: bump to version 1.2.0 Message-ID: <20220101094828.90F01813B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f72c1355f09b67fe353a728eb9eef7baeb8837bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index bddc846a5b..fad7079789 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 066260ea2c6798f6e18258d4430031bb aiorwlock-1.1.0.tar.gz -sha256 2aaf1d1cc995abfd5b2f07ca0e9b5c23bd369517c75495a347eb5896bc307f29 aiorwlock-1.1.0.tar.gz +md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz +sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index acc6f90158..4ba4965eb5 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.1.0 +PYTHON_AIORWLOCK_VERSION = 1.2.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/ca/e5/3221d49edb432024f6b1b7e9e36cad6363601973375667477f2130d5da7d +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:38 +0100 Subject: [Buildroot] [git commit] package/python-async-timeout: bump to version 4.0.2 Message-ID: <20220101094828.87DAD813B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a27ad5ca247835de0fc10a1583b6c2bb1a6648e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-async-timeout/python-async-timeout.hash | 4 ++-- package/python-async-timeout/python-async-timeout.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-async-timeout/python-async-timeout.hash b/package/python-async-timeout/python-async-timeout.hash index 1a64c3a77d..0ecf1ef5ae 100644 --- a/package/python-async-timeout/python-async-timeout.hash +++ b/package/python-async-timeout/python-async-timeout.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/async-timeout/json -md5 2871f3853060ac7e76e6278b85dfb3c9 async-timeout-4.0.0.tar.gz -sha256 7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382 async-timeout-4.0.0.tar.gz +md5 10571272b2e0fab839ec23f8293bf482 async-timeout-4.0.2.tar.gz +sha256 2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15 async-timeout-4.0.2.tar.gz # Locally computed sha256 checksums sha256 e18d7bb8f513e2c46bb585c94b585bd30720dd3ccb21ddb0786f72d16658f92c LICENSE diff --git a/package/python-async-timeout/python-async-timeout.mk b/package/python-async-timeout/python-async-timeout.mk index 1d2c716fa9..b3c5f79e45 100644 --- a/package/python-async-timeout/python-async-timeout.mk +++ b/package/python-async-timeout/python-async-timeout.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.0 +PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.2 PYTHON_ASYNC_TIMEOUT_SOURCE = async-timeout-$(PYTHON_ASYNC_TIMEOUT_VERSION).tar.gz -PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/28/0c/1cd218ea84964f0740a3ab6152dfa99661174abdd8e4053e06c0285ac42a +PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/54/6e/9678f7b2993537452710ffb1750c62d2c26df438aa621ad5fa9d1507a43a PYTHON_ASYNC_TIMEOUT_LICENSE = Apache-2.0 PYTHON_ASYNC_TIMEOUT_LICENSE_FILES = LICENSE PYTHON_ASYNC_TIMEOUT_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Sat Jan 1 09:50:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:35 +0100 Subject: [Buildroot] [git commit] package/python-aiosignal: bump to version 1.2.0 Message-ID: <20220101094828.7EA24813D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd3550f17948240f3fb80be93511304e73ec0f33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License file renamed in: https://github.com/aio-libs/aiosignal/commit/98b25a33d08821a2948d334b223e2874979f5bd4 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiosignal/python-aiosignal.hash | 6 +++--- package/python-aiosignal/python-aiosignal.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-aiosignal/python-aiosignal.hash b/package/python-aiosignal/python-aiosignal.hash index 3fdd459502..f2a09749b8 100644 --- a/package/python-aiosignal/python-aiosignal.hash +++ b/package/python-aiosignal/python-aiosignal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosignal/json -md5 f3edf1b700b4fee6ea6ed375c3f6555c aiosignal-1.1.2.tar.gz -sha256 15605698a0401075a03d36cea979e3c0e6cf8467a9e3b9047040514dd9e6f43b aiosignal-1.1.2.tar.gz +md5 011700c3acc576a3a38deade6a4860cb aiosignal-1.2.0.tar.gz +sha256 78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2 aiosignal-1.2.0.tar.gz # Locally computed sha256 checksums -sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt +sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-aiosignal/python-aiosignal.mk b/package/python-aiosignal/python-aiosignal.mk index ea11d97060..e0436e973e 100644 --- a/package/python-aiosignal/python-aiosignal.mk +++ b/package/python-aiosignal/python-aiosignal.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_AIOSIGNAL_VERSION = 1.1.2 +PYTHON_AIOSIGNAL_VERSION = 1.2.0 PYTHON_AIOSIGNAL_SOURCE = aiosignal-$(PYTHON_AIOSIGNAL_VERSION).tar.gz -PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/ac/f7/c3df3b7eac6ea96175e0817b272b43b398d5ba589be09a50d1b758d5b852 +PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/27/6b/a89fbcfae70cf53f066ec22591938296889d3cc58fec1e1c393b10e8d71d PYTHON_AIOSIGNAL_SETUP_TYPE = setuptools PYTHON_AIOSIGNAL_LICENSE = Apache-2.0 -PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE.txt +PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE $(eval $(python-package)) From yann.morin.1998 at free.fr Sat Jan 1 09:50:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:33 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-remotes: bump to version 1.1.0 Message-ID: <20220101094828.7564D813B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfb1265750e8e3ecef4aff2e3aa0762b8e9ae2b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp-remotes/python-aiohttp-remotes.hash | 4 ++-- package/python-aiohttp-remotes/python-aiohttp-remotes.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index a9a6cad2df..595340d5d8 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 e90fad4b7aa088207f831698fddd9eea aiohttp_remotes-1.0.0.tar.gz -sha256 caec1681de70bac82daa676078d9b125758fb3952fdaa893a6b42bdd995562ef aiohttp_remotes-1.0.0.tar.gz +md5 da13880f25ec3b9cf98c7baff92835a2 aiohttp_remotes-1.1.0.tar.gz +sha256 e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174 aiohttp_remotes-1.1.0.tar.gz # Locally computed sha256 checksums sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index f04cecd89d..e2bc3e1c18 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.0.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.1.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/40/b6/1178bd1e26e88f9f29b7d1bbfae7b38d39ec9cf787d4685f83ade2e7aa7f +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/e3/fc/5523010172e2d8685a8934fbb49d564118c9ebc1e4233a62b77310f979db PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:42 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-session: bump to version 2.10.0 Message-ID: <20220101094828.9D257813B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9dbed1ca6aaaecf9de63f9f6b20ccaf41897d7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to full text removal: https://github.com/aio-libs/aiohttp-session/commit/6a1c7f0efe006425b5387b089f4d39bc48765ed7 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp-session/python-aiohttp-session.hash | 6 +++--- package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index f10827b616..3842f0c7af 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.hash +++ b/package/python-aiohttp-session/python-aiohttp-session.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-session/json -md5 993ec277ece4765472d0edc0f6c0bba3 aiohttp-session-2.9.0.tar.gz -sha256 959413468b84e30e7ca09719617cfb0000066a2e0f6c20062d043433e82aeb74 aiohttp-session-2.9.0.tar.gz +md5 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz +sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz # Locally computed sha256 checksums -sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE +sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index fa724fdb86..a28b1ae143 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/package/python-aiohttp-session/python-aiohttp-session.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SESSION_VERSION = 2.9.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.10.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/f8/fe/53dfd35f5c7fcc7f2d0866cb29e722303e3fae7f749c1f3d4d11d361dc38 +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:45 +0100 Subject: [Buildroot] [git commit] package/python-aioconsole: bump to version 0.3.3 Message-ID: <20220101094828.A5335813B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d25064b907d2239aab7de4fe08991335f1e0955c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 45139a6606..26a3778756 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 b8cbcb6e00d8e535256526dfe4f27db3 aioconsole-0.3.2.tar.gz -sha256 9355b36d41d5fbdd3dbb01510deb2b985b508b2ebcd5b8bd85af61a707e2f6c8 aioconsole-0.3.2.tar.gz +md5 f8b67330e631cfc45a9b2560a6e0fa98 aioconsole-0.3.3.tar.gz +sha256 47df42d9f8cc3995bbe032dd5f01d32cc5b06639e9078bb9b4e3c55b237f5e32 aioconsole-0.3.3.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 75ea3c2a2a..f06d91a550 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.2 +PYTHON_AIOCONSOLE_VERSION = 0.3.3 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/7a/b2/747ab3cb965596cd84c5159941613d901d8771acad3c51c4f5da362aa9f0 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/dd/f6/bbc451ba96c1e1da6aa253f254b181ceb03272b475b27b481b57865d7d7f PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:47 +0100 Subject: [Buildroot] [git commit] package/python-aiofiles: bump to version 0.8.0 Message-ID: <20220101094828.AD96D813D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d943a4ede09210a407846c59c41373263b2e5a1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiofiles/python-aiofiles.hash | 4 ++-- package/python-aiofiles/python-aiofiles.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiofiles/python-aiofiles.hash b/package/python-aiofiles/python-aiofiles.hash index a5c140606b..268136a406 100644 --- a/package/python-aiofiles/python-aiofiles.hash +++ b/package/python-aiofiles/python-aiofiles.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiofiles/json -md5 a2dd24e2ca8d7b7e7dbacd6381da748a aiofiles-0.7.0.tar.gz -sha256 a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4 aiofiles-0.7.0.tar.gz +md5 697deeb4fdcb620c45f114f173ed7c0d aiofiles-0.8.0.tar.gz +sha256 8334f23235248a3b2e83b2c3a78a22674f39969b96397126cc93664d9a901e59 aiofiles-0.8.0.tar.gz # Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index e43cf9a484..996e5eb6c0 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOFILES_VERSION = 0.7.0 +PYTHON_AIOFILES_VERSION = 0.8.0 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz -PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/06/f0/af90f3fb4066b0707b6a5af3ffd5fd9b3809bbb52f0153a3c7550e594de3 +PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/10/ca/c416cfacf6a47e1400dad56eab85aa86c92c6fbe58447d12035e434f0d5c PYTHON_AIOFILES_SETUP_TYPE = setuptools PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:55:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:55:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-sse: bump to version 2.1.0 In-Reply-To: <20220101003125.1957739-1-james.hilliard1@gmail.com> References: <20220101003125.1957739-1-james.hilliard1@gmail.com> Message-ID: <20220101095508.GS3390456@scaer> James, All, On 2021-12-31 17:31 -0700, James Hilliard spake thusly: > License hash change due to full text removal: > https://github.com/aio-libs/aiohttp-sse/commit/307fd35a84a66b7fb5adfd70cd5b7d709fa8508c > > Fixes(python 3.10 compatibility): > File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 107, in wait > File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 144, in _ping > TypeError: sleep() got an unexpected keyword argument 'loop' > > Signed-off-by: James Hilliard This, and your 8 following python-related patches, applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-aiohttp-sse/python-aiohttp-sse.hash | 6 +++--- > package/python-aiohttp-sse/python-aiohttp-sse.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.hash b/package/python-aiohttp-sse/python-aiohttp-sse.hash > index 2f21da462e..224601450c 100644 > --- a/package/python-aiohttp-sse/python-aiohttp-sse.hash > +++ b/package/python-aiohttp-sse/python-aiohttp-sse.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aiohttp-sse/json > -md5 d2f394fb75f591045b2c94fc17c8533d aiohttp-sse-2.0.0.tar.gz > -sha256 547e1eaa129749f090d02b31956215edbcde74ce99721f5f0ac902a9ccb1202e aiohttp-sse-2.0.0.tar.gz > +md5 822cd0c30325e8a711101c1a1ede4058 aiohttp-sse-2.1.0.tar.gz > +sha256 dfe8f7271ab4470891fa1bfa1913d6889b3d19015dd3d3a4cab949e66971bbca aiohttp-sse-2.1.0.tar.gz > # Locally computed sha256 checksums > -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE > +sha256 5585eb91ec607b4fdbe97d44a61146a9cc27bb703336628bc3c6a1eaffe60307 LICENSE > diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.mk b/package/python-aiohttp-sse/python-aiohttp-sse.mk > index 7a7a0d0a70..2aef1579f5 100644 > --- a/package/python-aiohttp-sse/python-aiohttp-sse.mk > +++ b/package/python-aiohttp-sse/python-aiohttp-sse.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOHTTP_SSE_VERSION = 2.0.0 > +PYTHON_AIOHTTP_SSE_VERSION = 2.1.0 > PYTHON_AIOHTTP_SSE_SOURCE = aiohttp-sse-$(PYTHON_AIOHTTP_SSE_VERSION).tar.gz > -PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2b/50/e127729f7df53c32c96b5c71932a7262cad40c83f1e19c218b068c816d51 > +PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2f/3f/cc4f5a3fe6cb50ad5b9d26bb7738c5da1f61645b517d4230df2fc32d89f0 > PYTHON_AIOHTTP_SSE_SETUP_TYPE = setuptools > PYTHON_AIOHTTP_SSE_LICENSE = Apache-2.0 > PYTHON_AIOHTTP_SSE_LICENSE_FILES = LICENSE > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:02:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:02:54 +0100 Subject: [Buildroot] [git commit] package/libimxvpuapi: switch to using host-python3 Message-ID: <20220101095723.D18D0817B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57edd417c58e58dc10e60d84b6b1920e72560262 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package builds just fine with python3. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/libimxvpuapi/libimxvpuapi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk index a2a3b21105..d8f214b9e0 100644 --- a/package/libimxvpuapi/libimxvpuapi.mk +++ b/package/libimxvpuapi/libimxvpuapi.mk @@ -8,7 +8,7 @@ LIBIMXVPUAPI_VERSION = 0.10.3 LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION)) LIBIMXVPUAPI_LICENSE = LGPL-2.1+ LIBIMXVPUAPI_LICENSE_FILES = LICENSE -LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu +LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python3 imx-vpu LIBIMXVPUAPI_INSTALL_STAGING = YES LIBIMXVPUAPI_NEEDS_EXTERNAL_WAF = YES From yann.morin.1998 at free.fr Sat Jan 1 10:03:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:03:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libimxvpuapi: depend on host-python3 In-Reply-To: <20211231230422.955804-1-aduskett@gmail.com> References: <20211231230422.955804-1-aduskett@gmail.com> Message-ID: <20220101100352.GT3390456@scaer> Adam, All, On 2021-12-31 15:04 -0800, Adam Duskett spake thusly: > This package builds just fine with python3. > > Signed-off-by: Adam Duskett I've rephrased the title, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libimxvpuapi/libimxvpuapi.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk > index a2a3b21105..d8f214b9e0 100644 > --- a/package/libimxvpuapi/libimxvpuapi.mk > +++ b/package/libimxvpuapi/libimxvpuapi.mk > @@ -8,7 +8,7 @@ LIBIMXVPUAPI_VERSION = 0.10.3 > LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION)) > LIBIMXVPUAPI_LICENSE = LGPL-2.1+ > LIBIMXVPUAPI_LICENSE_FILES = LICENSE > -LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu > +LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python3 imx-vpu > LIBIMXVPUAPI_INSTALL_STAGING = YES > LIBIMXVPUAPI_NEEDS_EXTERNAL_WAF = YES > > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:05:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:05:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdnet: bump to version 1.14, drop python2 support. In-Reply-To: <20211231211055.3996590-1-aduskett@gmail.com> References: <20211231211055.3996590-1-aduskett@gmail.com> Message-ID: <20220101100502.GU3390456@scaer> Adam, All, On 2021-12-31 13:10 -0800, Adam Duskett spake thusly: > - Change the url to the github ofalk repository. > - Remove upstream patches > - Rework python-makefile.patch to adhere to git formatting and refresh for 1.14 > - Update License hash due to year changes > - Depend on python3 and host-python3-cython for python bindings > > Signed-off-by: Adam Duskett I've added an explanation why we switch to the ofalk repo, took that opportunity to rephrase the commit log, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libdnet/0001-python-gcc.patch | 20 ---------------- > package/libdnet/0001-python-makefile.patch | 27 ++++++++++++++++++++++ > package/libdnet/0002-python-makefile.patch | 16 ------------- > package/libdnet/Config.in | 6 ++--- > package/libdnet/libdnet.hash | 4 ++-- > package/libdnet/libdnet.mk | 12 +++++----- > 6 files changed, 38 insertions(+), 47 deletions(-) > delete mode 100644 package/libdnet/0001-python-gcc.patch > create mode 100644 package/libdnet/0001-python-makefile.patch > delete mode 100644 package/libdnet/0002-python-makefile.patch > > diff --git a/package/libdnet/0001-python-gcc.patch b/package/libdnet/0001-python-gcc.patch > deleted file mode 100644 > index ea732e4358..0000000000 > --- a/package/libdnet/0001-python-gcc.patch > +++ /dev/null > @@ -1,20 +0,0 @@ > ---- a/python/dnet.c 2006-01-19 18:08:23.000000000 +1100 > -+++ b/python/dnet.c 2008-09-03 16:30:47.000000000 +1000 > -@@ -2726,7 +2726,7 @@ > - PyObject *__pyx_3 = 0; > - unsigned short __pyx_4; > - Py_INCREF(__pyx_v_self); > -- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); > -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); > - > - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */ > - __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max); > -@@ -2738,7 +2739,7 @@ > - Py_DECREF(__pyx_2); __pyx_2 = 0; > - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} > - Py_DECREF(((PyObject *)__pyx_v_next)); > -- ((PyObject *)__pyx_v_next) = __pyx_3; > -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)__pyx_3; > - __pyx_3 = 0; > - > - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */ > diff --git a/package/libdnet/0001-python-makefile.patch b/package/libdnet/0001-python-makefile.patch > new file mode 100644 > index 0000000000..5f641302be > --- /dev/null > +++ b/package/libdnet/0001-python-makefile.patch > @@ -0,0 +1,27 @@ > +From 298cd8eaa21a21eee85f9551a26ad294347b1d5a Mon Sep 17 00:00:00 2001 > +From: Peter Korsgaard > +Date: Thu, 30 Dec 2021 11:14:15 -0800 > +Subject: [PATCH] python makefile > + > +Signed-off-by: Peter Korsgaard > +Signed-off-by: Adam Duskett > +Refresh for 1.14 > +--- > + python/Makefile.am | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/python/Makefile.am b/python/Makefile.am > +index 1a74ef2..59fe0f3 100644 > +--- a/python/Makefile.am > ++++ b/python/Makefile.am > +@@ -11,6 +11,7 @@ $(srcdir)/dnet.c: $(srcdir)/dnet.pyx > + pyrexc $(srcdir)/dnet.pyx > + > + python-build: $(srcdir)/dnet.c > ++ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) > + $(PYTHON) setup.py build > + touch python-build > + > +-- > +2.33.1 > + > diff --git a/package/libdnet/0002-python-makefile.patch b/package/libdnet/0002-python-makefile.patch > deleted file mode 100644 > index fb41e43e35..0000000000 > --- a/package/libdnet/0002-python-makefile.patch > +++ /dev/null > @@ -1,16 +0,0 @@ > ---- > - python/Makefile.am | 1 + > - 1 file changed, 1 insertion(+) > - > -Index: libdnet-1.11/python/Makefile.am > -=================================================================== > ---- libdnet-1.11.orig/python/Makefile.am > -+++ libdnet-1.11/python/Makefile.am > -@@ -11,6 +11,7 @@ > - pyrexc $(srcdir)/dnet.pyx > - > - python-build: $(srcdir)/dnet.c > -+ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) > - $(PYTHON) setup.py build > - touch python-build > - > diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in > index e7ba3a21af..f853e4e12d 100644 > --- a/package/libdnet/Config.in > +++ b/package/libdnet/Config.in > @@ -10,11 +10,11 @@ if BR2_PACKAGE_LIBDNET > > config BR2_PACKAGE_LIBDNET_PYTHON > bool "libdnet python module" > - depends on BR2_PACKAGE_PYTHON > + depends on BR2_PACKAGE_PYTHON3 > help > dnet module for python > > -comment "dnet module for python requires python package" > - depends on !BR2_PACKAGE_PYTHON > +comment "dnet module for python requires python3 package" > + depends on !BR2_PACKAGE_PYTHON3 > > endif > diff --git a/package/libdnet/libdnet.hash b/package/libdnet/libdnet.hash > index d2e820270f..d322a1cc29 100644 > --- a/package/libdnet/libdnet.hash > +++ b/package/libdnet/libdnet.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53 libdnet-1.11.tar.gz > -sha256 1e94df12cb3701fa64e07eeb60284bb16a3544815d5a39860dacff7b86610584 LICENSE > +sha256 592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe libdnet-1.14.tar.gz > +sha256 6b46ec86e290066c47b6607d322135b3c473566e7225ac23d35a7c0588a82da6 LICENSE > diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk > index 3d3fcbe605..e9a57d6ed2 100644 > --- a/package/libdnet/libdnet.mk > +++ b/package/libdnet/libdnet.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBDNET_VERSION = 1.11 > -LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION) > +LIBDNET_VERSION = 1.14 > +LIBDNET_SITE = $(call github,ofalk,libdnet,libdnet-$(LIBDNET_VERSION)) > LIBDNET_LICENSE = BSD-3-Clause > LIBDNET_LICENSE_FILES = LICENSE > LIBDNET_INSTALL_STAGING = YES > @@ -15,10 +15,10 @@ LIBDNET_CONF_OPTS = \ > --with-check=no > LIBDNET_CONFIG_SCRIPTS = dnet-config > > -ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),) > -LIBDNET_DEPENDENCIES += python > -LIBDNET_CONF_OPTS += --with-python > -LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib > +ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) > +LIBDNET_DEPENDENCIES += host-python3-cython python3 > +LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin > +LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) > LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec > LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install > endif > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:06:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:06:56 +0100 Subject: [Buildroot] [git commit] package/python3: requires blake2 support in openssl Message-ID: <20220101100109.4995E817EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae54331db305f30c6c958ca64d9e6c63b7ae9e50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: /home/buildroot/autobuild/instance-3/output-1/build/python3-3.10.1/Modules/_hashopenssl.c:244:22: error: implicit declaration of function 'EVP_blake2s256'; did you mean 'LN_blake2s256'? [-Werror=implicit-function-declaration] 244 | digest = EVP_blake2s256(); | ^~~~~~~~~~~~~~ | LN_blake2s256 Fixes: - http://autobuild.buildroot.org/results/9112571b75aebb0ba5032ef1b16226d9848f5184 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python3/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/Config.in b/package/python3/Config.in index efc4dbb3d4..7714518edc 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -90,6 +90,7 @@ config BR2_PACKAGE_PYTHON3_READLINE config BR2_PACKAGE_PYTHON3_SSL bool "ssl" select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 if BR2_PACKAGE_LIBOPENSSL help _ssl module for Python3 (required for https in urllib etc). From yann.morin.1998 at free.fr Sat Jan 1 10:07:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:07:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3: requires blake2 support in openssl In-Reply-To: <20211231092425.3550185-1-fontaine.fabrice@gmail.com> References: <20211231092425.3550185-1-fontaine.fabrice@gmail.com> Message-ID: <20220101100723.GV3390456@scaer> Fabrice, All, On 2021-12-31 10:24 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 3.10.1 in > commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > /home/buildroot/autobuild/instance-3/output-1/build/python3-3.10.1/Modules/_hashopenssl.c:244:22: error: implicit declaration of function 'EVP_blake2s256'; did you mean 'LN_blake2s256'? [-Werror=implicit-function-declaration] > 244 | digest = EVP_blake2s256(); > | ^~~~~~~~~~~~~~ > | LN_blake2s256 > > Fixes: > - http://autobuild.buildroot.org/results/9112571b75aebb0ba5032ef1b16226d9848f5184 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python3/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python3/Config.in b/package/python3/Config.in > index efc4dbb3d4..7714518edc 100644 > --- a/package/python3/Config.in > +++ b/package/python3/Config.in > @@ -90,6 +90,7 @@ config BR2_PACKAGE_PYTHON3_READLINE > config BR2_PACKAGE_PYTHON3_SSL > bool "ssl" > select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 if BR2_PACKAGE_LIBOPENSSL > help > _ssl module for Python3 (required for https in urllib etc). > > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:07:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:07:52 +0100 Subject: [Buildroot] [git commit] package/ogre: disable csharp Message-ID: <20220101100218.B232F817FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d18582d94152f541beab4478deded4053c554bc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable csharp to avoid the following build failure with python since bump to version 1.12.12 in commit 4e814227caa0a5d190e36cd5174239fe5c627279 and https://github.com/OGRECave/ogre/commit/3fd839c76a153e614c9e3131ff9959234099e749: /bin/sh: 1: mcs: not found Fixes: - http://autobuild.buildroot.org/results/5f384dbed8e5241f91072bfffa54ba6b9c509751 Signed-off-by: Fabrice Fontaine Acked-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/ogre/ogre.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk index 72c96cb33a..72fd616c0c 100644 --- a/package/ogre/ogre.mk +++ b/package/ogre/ogre.mk @@ -33,6 +33,7 @@ OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU # Disable java and nvidia cg support. # Disable imgui overlay to avoid extra download from CMake. OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ + -DOGRE_BUILD_COMPONENT_CSHARP=OFF \ -DOGRE_BUILD_COMPONENT_JAVA=OFF \ -DOGRE_BUILD_PLUGIN_CG=OFF \ -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=OFF \ From yann.morin.1998 at free.fr Sat Jan 1 10:08:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:08:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/ogre: disable csharp In-Reply-To: <20211231090030.3437133-1-fontaine.fabrice@gmail.com> References: <20211231090030.3437133-1-fontaine.fabrice@gmail.com> Message-ID: <20220101100830.GW3390456@scaer> Fabrice, All, On 2021-12-31 10:00 +0100, Fabrice Fontaine spake thusly: > Disable csharp to avoid the following build failure with python since > bump to version 1.12.12 in commit > 4e814227caa0a5d190e36cd5174239fe5c627279 and > https://github.com/OGRECave/ogre/commit/3fd839c76a153e614c9e3131ff9959234099e749: > > /bin/sh: 1: mcs: not found > > Fixes: > - http://autobuild.buildroot.org/results/5f384dbed8e5241f91072bfffa54ba6b9c509751 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ogre/ogre.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk > index 72c96cb33a..72fd616c0c 100644 > --- a/package/ogre/ogre.mk > +++ b/package/ogre/ogre.mk > @@ -33,6 +33,7 @@ OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU > # Disable java and nvidia cg support. > # Disable imgui overlay to avoid extra download from CMake. > OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ > + -DOGRE_BUILD_COMPONENT_CSHARP=OFF \ > -DOGRE_BUILD_COMPONENT_JAVA=OFF \ > -DOGRE_BUILD_PLUGIN_CG=OFF \ > -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=OFF \ > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:09:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:09:18 +0100 Subject: [Buildroot] [git commit] package/libzip: bump to version 1.8.0 Message-ID: <20220101100650.3DC6B81851@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6990000654e564a357c446ee2bf5afb04ae046a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patches (already in version) - Add zstd optional dependency https://libzip.org/news/release-1.8.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Add-FindGnuTLS-cmake-from-3-17-3.patch | 103 --------------------- .../libzip/0002-Include-limits.h-for-INT_MAX.patch | 27 ------ package/libzip/libzip.hash | 2 +- package/libzip/libzip.mk | 9 +- 4 files changed, 9 insertions(+), 132 deletions(-) diff --git a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch b/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch deleted file mode 100644 index 30bc201048..0000000000 --- a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 73f6f8ebff678a0847e6b197b574082cc285b528 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Sat, 25 Jul 2020 12:03:29 +0200 -Subject: [PATCH] Add FindGnuTLS.cmake from 3.17.3. - -Addresses #199 - -[Retrieved from: -https://github.com/nih-at/libzip/commit/73f6f8ebff678a0847e6b197b574082cc285b528] -Signed-off-by: Fabrice Fontaine ---- - cmake-compat/FindGnuTLS.cmake | 82 +++++++++++++++++++++++++++++++++++ - 1 file changed, 82 insertions(+) - create mode 100644 cmake-compat/FindGnuTLS.cmake - -diff --git a/cmake-compat/FindGnuTLS.cmake b/cmake-compat/FindGnuTLS.cmake -new file mode 100644 -index 00000000..819f0001 ---- /dev/null -+++ b/cmake-compat/FindGnuTLS.cmake -@@ -0,0 +1,82 @@ -+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -+# file Copyright.txt or https://cmake.org/licensing for details. -+ -+#[=======================================================================[.rst: -+FindGnuTLS -+---------- -+ -+Find the GNU Transport Layer Security library (gnutls) -+ -+IMPORTED Targets -+^^^^^^^^^^^^^^^^ -+ -+This module defines :prop_tgt:`IMPORTED` target ``GnuTLS::GnuTLS``, if -+gnutls has been found. -+ -+Result Variables -+^^^^^^^^^^^^^^^^ -+ -+``GNUTLS_FOUND`` -+ System has gnutls -+``GNUTLS_INCLUDE_DIR`` -+ The gnutls include directory -+``GNUTLS_LIBRARIES`` -+ The libraries needed to use gnutls -+``GNUTLS_DEFINITIONS`` -+ Compiler switches required for using gnutls -+``GNUTLS_VERSION`` -+ version of gnutls. -+#]=======================================================================] -+ -+# Note that this doesn't try to find the gnutls-extra package. -+ -+ -+if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARY) -+ # in cache already -+ set(gnutls_FIND_QUIETLY TRUE) -+endif () -+ -+if (NOT WIN32) -+ # try using pkg-config to get the directories and then use these values -+ # in the find_path() and find_library() calls -+ # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful -+ find_package(PkgConfig QUIET) -+ PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls) -+ set(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) -+ set(GNUTLS_VERSION ${PC_GNUTLS_VERSION}) -+ # keep for backward compatibility -+ set(GNUTLS_VERSION_STRING ${PC_GNUTLS_VERSION}) -+endif () -+ -+find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h -+ HINTS -+ ${PC_GNUTLS_INCLUDEDIR} -+ ${PC_GNUTLS_INCLUDE_DIRS} -+ ) -+ -+find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls -+ HINTS -+ ${PC_GNUTLS_LIBDIR} -+ ${PC_GNUTLS_LIBRARY_DIRS} -+ ) -+ -+mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) -+ -+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS -+ REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR -+ VERSION_VAR GNUTLS_VERSION_STRING) -+ -+if(GNUTLS_FOUND) -+ set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) -+ set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) -+ -+ if(NOT TARGET GnuTLS::GnuTLS) -+ add_library(GnuTLS::GnuTLS UNKNOWN IMPORTED) -+ set_target_properties(GnuTLS::GnuTLS PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}" -+ INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}" -+ IMPORTED_LINK_INTERFACE_LANGUAGES "C" -+ IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") -+ endif() -+endif() diff --git a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch deleted file mode 100644 index c488f05289..0000000000 --- a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=98rjan=20Malde?= -Date: Wed, 15 Jul 2020 12:16:16 +0200 -Subject: [PATCH] Include limits.h for INT_MAX - -[Retrieved from: -https://github.com/nih-at/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] -Signed-off-by: Paul Cercueil ---- - lib/zip_crypto_openssl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c -index 1cb00479..60f92758 100644 ---- a/lib/zip_crypto_openssl.c -+++ b/lib/zip_crypto_openssl.c -@@ -38,6 +38,7 @@ - #include "zip_crypto.h" - - #include -+#include - - #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) - #define USE_OPENSSL_1_0_API --- -2.28.0 - diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash index a298b9aba9..5afdfd7cb8 100644 --- a/package/libzip/libzip.hash +++ b/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 libzip-1.7.3.tar.xz +sha256 f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e libzip-1.8.0.tar.xz sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 4a028f970a..6bc5c5c193 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZIP_VERSION = 1.7.3 +LIBZIP_VERSION = 1.8.0 LIBZIP_SITE = https://libzip.org/download LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause @@ -54,5 +54,12 @@ else LIBZIP_CONF_OPTS += -DENABLE_LZMA=OFF endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +LIBZIP_DEPENDENCIES += zstd +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=ON +else +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Sat Jan 1 10:09:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:09:10 +0100 Subject: [Buildroot] [git commit] package/gawk: bump to version 5.1.1 Message-ID: <20220101100650.214C881851@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9865dc01ddab8d8048acb09787f4e1342cd4377f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.savannah.gnu.org/cgit/gawk.git/tree/NEWS?h=gawk-5.1.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gawk/gawk.hash | 4 ++-- package/gawk/gawk.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index 91e506607e..894c939c5b 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.1.1.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd gawk-5.1.0.tar.xz +sha256 d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2 gawk-5.1.1.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index ae2bbe5422..b55c74d00a 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.1.0 +GAWK_VERSION = 5.1.1 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk From yann.morin.1998 at free.fr Sat Jan 1 10:09:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:09:12 +0100 Subject: [Buildroot] [git commit] package/shairport-sync: bump to version 3.3.9 Message-ID: <20220101100650.2ABCF818B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a252a2852df8d42c1fd4b10afc2d0fa385e51186 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop second patch (already in version) https://github.com/mikebrady/shairport-sync/releases/tag/3.3.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...nfigure.ac-fix-build-with-automake-1.16.5.patch | 48 ---------------------- package/shairport-sync/shairport-sync.hash | 2 +- package/shairport-sync/shairport-sync.mk | 2 +- 3 files changed, 2 insertions(+), 50 deletions(-) diff --git a/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch b/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch deleted file mode 100644 index 2ee8f59fee..0000000000 --- a/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ad22edb303a470b6f9eda9fd9d3f588bb2eff8cb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 15 Oct 2021 08:02:23 +0200 -Subject: [PATCH] configure.ac: fix build with automake 1.16.5 - -Fix the following build failure with convolution raised since automake -1.16.5 and -https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624: - -configure.ac:305: error: AM_INIT_AUTOMAKE expanded multiple times -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... -configure.ac:6: the top level -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... -configure.ac:305: the top level - -Fixes: - - http://autobuild.buildroot.org/results/464148bdccb705d8992dc860262bfdeb01b7e2a1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1314] ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f77087c5..aa533a2d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ - - AC_PREREQ([2.50]) - AC_INIT([shairport-sync], [3.3.8], [4265913+mikebrady at users.noreply.github.com]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([subdir-objects]) - AC_CONFIG_SRCDIR([shairport.c]) - AC_CONFIG_HEADERS([config.h]) - AC_PROG_RANLIB -@@ -302,7 +302,6 @@ AM_CONDITIONAL([USE_PA], [test "x$with_pa" = "xyes"]) - # Look for Convolution flag - AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP convolution support])]) - if test "x$with_convolution" = "xyes" ; then -- AM_INIT_AUTOMAKE([subdir-objects]) - AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.]) - AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!)) - fi --- -2.33.0 - diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index ebc81dedc1..331866a379 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca shairport-sync-3.3.8.tar.gz +sha256 17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795 shairport-sync-3.3.9.tar.gz sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index ba8b44a621..cf49f2b2ed 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.3.8 +SHAIRPORT_SYNC_VERSION = 3.3.9 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause From yann.morin.1998 at free.fr Sat Jan 1 10:09:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:09:15 +0100 Subject: [Buildroot] [git commit] package/file: bump to version 5.41 Message-ID: <20220101100650.33CA48190F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d38b72bcd75392a88b5100839ac410859d0a6a79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (already in version) and so autoreconf - Update hash of vasprintf.c (changes not related to license: https://github.com/file/file/commit/80816651588efb79a5d054e13703bf2a3378d024 https://github.com/file/file/commit/43f7989076aa3731f3558c6954780bc7b2734b64) https://github.com/file/file/blob/FILE5_41/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/file/0001-Add-libmagic.pc.patch | 76 --------------------------------- package/file/file.hash | 10 ++--- package/file/file.mk | 4 +- 3 files changed, 6 insertions(+), 84 deletions(-) diff --git a/package/file/0001-Add-libmagic.pc.patch b/package/file/0001-Add-libmagic.pc.patch deleted file mode 100644 index b26d16224d..0000000000 --- a/package/file/0001-Add-libmagic.pc.patch +++ /dev/null @@ -1,76 +0,0 @@ -From d079cac1110cc2761417f0dcb0a142b217eb1eda Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 31 Jan 2020 20:26:29 +0100 -Subject: [PATCH] Add libmagic.pc - -libmagic can optionally depends on xz (for lzma) or bzip2 since version -5.38 and -https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7 -so add libmagic.pc so package (such as gerbera) that links with libmagic -will be able to use pkg-config to retrieve those static dependencies -For example, this will avoid the following build failure: - -[100%] Linking CXX executable gerbera -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf': -compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' - -Fixes: - - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugs.astron.com/view.php?id=136] ---- - Makefile.am | 5 +++++ - configure.ac | 2 +- - libmagic.pc.in | 10 ++++++++++ - 3 files changed, 16 insertions(+), 1 deletion(-) - create mode 100644 libmagic.pc.in - -diff --git a/Makefile.am b/Makefile.am -index 8bd927d9..2ab67ed7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,3 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = MAINT - - SUBDIRS = src magic tests doc python -+ -+# This variable must have 'exec' in its name, in order to be installed -+# by 'install-exec' target (instead of default 'install-data') -+pkgconfigexecdir = $(libdir)/pkgconfig -+pkgconfigexec_DATA = libmagic.pc -diff --git a/configure.ac b/configure.ac -index ac37fccd..b2e2e5b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -217,5 +217,5 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t - AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support]) - fi - --AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile]) -+AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc]) - AC_OUTPUT -diff --git a/libmagic.pc.in b/libmagic.pc.in -new file mode 100644 -index 00000000..3ad1290b ---- /dev/null -+++ b/libmagic.pc.in -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libmagic -+Description: Magic number recognition library -+Version: @VERSION@ -+Libs: -L${libdir} -lmagic -+Libs.private: @LIBS@ --- -2.24.1 - diff --git a/package/file/file.hash b/package/file/file.hash index 96efaf8483..33875776eb 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,7 +1,7 @@ # Locally calculated after verifying signature -# ftp://ftp.astron.com/pub/file/file-5.38.tar.gz.asc +# ftp://ftp.astron.com/pub/file/file-5.41.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A -sha256 593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34 file-5.38.tar.gz -sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING -sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h -sha256 58b5932aca6c10f2194290a3b26088ec9ba07ef6b52cc9bb2dd638cc634db6f1 src/vasprintf.c +sha256 13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f file-5.41.tar.gz +sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING +sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h +sha256 c4fa92d6504b88484a12140fe3e24b9b29b0112717f94b1ff4205d54828b1c70 src/vasprintf.c diff --git a/package/file/file.mk b/package/file/file.mk index c41a8eb3a4..12647af8bb 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.38 +FILE_VERSION = 5.41 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file HOST_FILE_DEPENDENCIES = host-zlib @@ -13,8 +13,6 @@ FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c FILE_CPE_ID_VENDOR = file_project -# We're patching configure.ac -FILE_AUTORECONF = YES HOST_FILE_CONF_OPTS = --disable-libseccomp ifeq ($(BR2_PACKAGE_BZIP2),y) From yann.morin.1998 at free.fr Sat Jan 1 10:12:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:12:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/gawk: bump to version 5.1.1 In-Reply-To: <20211230225958.3089672-1-fontaine.fabrice@gmail.com> References: <20211230225958.3089672-1-fontaine.fabrice@gmail.com> Message-ID: <20220101101258.GX3390456@scaer> Fabrice, All, On 2021-12-30 23:59 +0100, Fabrice Fontaine spake thusly: > https://git.savannah.gnu.org/cgit/gawk.git/tree/NEWS?h=gawk-5.1.1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gawk/gawk.hash | 4 ++-- > package/gawk/gawk.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash > index 91e506607e..894c939c5b 100644 > --- a/package/gawk/gawk.hash > +++ b/package/gawk/gawk.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz.sig > +# https://ftp.gnu.org/gnu/gawk/gawk-5.1.1.tar.xz.sig > # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 > -sha256 cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd gawk-5.1.0.tar.xz > +sha256 d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2 gawk-5.1.1.tar.xz > # Locally calculated > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk > index ae2bbe5422..b55c74d00a 100644 > --- a/package/gawk/gawk.mk > +++ b/package/gawk/gawk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GAWK_VERSION = 5.1.0 > +GAWK_VERSION = 5.1.1 > GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz > GAWK_SITE = $(BR2_GNU_MIRROR)/gawk > GAWK_DEPENDENCIES = host-gawk > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:13:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:13:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/shairport-sync: bump to version 3.3.9 In-Reply-To: <20211230230701.3177447-1-fontaine.fabrice@gmail.com> References: <20211230230701.3177447-1-fontaine.fabrice@gmail.com> Message-ID: <20220101101318.GY3390456@scaer> Fabrice, All, On 2021-12-31 00:07 +0100, Fabrice Fontaine spake thusly: > Drop second patch (already in version) > > https://github.com/mikebrady/shairport-sync/releases/tag/3.3.9 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...re.ac-fix-build-with-automake-1.16.5.patch | 48 ------------------- > package/shairport-sync/shairport-sync.hash | 2 +- > package/shairport-sync/shairport-sync.mk | 2 +- > 3 files changed, 2 insertions(+), 50 deletions(-) > delete mode 100644 package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch > > diff --git a/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch b/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch > deleted file mode 100644 > index 2ee8f59fee..0000000000 > --- a/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From ad22edb303a470b6f9eda9fd9d3f588bb2eff8cb Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 15 Oct 2021 08:02:23 +0200 > -Subject: [PATCH] configure.ac: fix build with automake 1.16.5 > - > -Fix the following build failure with convolution raised since automake > -1.16.5 and > -https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624: > - > -configure.ac:305: error: AM_INIT_AUTOMAKE expanded multiple times > -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... > -configure.ac:6: the top level > -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... > -configure.ac:305: the top level > - > -Fixes: > - - http://autobuild.buildroot.org/results/464148bdccb705d8992dc860262bfdeb01b7e2a1 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1314] > ---- > - configure.ac | 3 +-- > - 1 file changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/configure.ac b/configure.ac > -index f77087c5..aa533a2d 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -3,7 +3,7 @@ > - > - AC_PREREQ([2.50]) > - AC_INIT([shairport-sync], [3.3.8], [4265913+mikebrady at users.noreply.github.com]) > --AM_INIT_AUTOMAKE > -+AM_INIT_AUTOMAKE([subdir-objects]) > - AC_CONFIG_SRCDIR([shairport.c]) > - AC_CONFIG_HEADERS([config.h]) > - AC_PROG_RANLIB > -@@ -302,7 +302,6 @@ AM_CONDITIONAL([USE_PA], [test "x$with_pa" = "xyes"]) > - # Look for Convolution flag > - AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP convolution support])]) > - if test "x$with_convolution" = "xyes" ; then > -- AM_INIT_AUTOMAKE([subdir-objects]) > - AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.]) > - AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!)) > - fi > --- > -2.33.0 > - > diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash > index ebc81dedc1..331866a379 100644 > --- a/package/shairport-sync/shairport-sync.hash > +++ b/package/shairport-sync/shairport-sync.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca shairport-sync-3.3.8.tar.gz > +sha256 17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795 shairport-sync-3.3.9.tar.gz > sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES > diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk > index ba8b44a621..cf49f2b2ed 100644 > --- a/package/shairport-sync/shairport-sync.mk > +++ b/package/shairport-sync/shairport-sync.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SHAIRPORT_SYNC_VERSION = 3.3.8 > +SHAIRPORT_SYNC_VERSION = 3.3.9 > SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) > > SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:13:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:13:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/file: bump to version 5.41 In-Reply-To: <20211230231836.3197707-1-fontaine.fabrice@gmail.com> References: <20211230231836.3197707-1-fontaine.fabrice@gmail.com> Message-ID: <20220101101331.GZ3390456@scaer> Fabrice, All, On 2021-12-31 00:18 +0100, Fabrice Fontaine spake thusly: > - Drop patch (already in version) and so autoreconf > - Update hash of vasprintf.c (changes not related to license: > https://github.com/file/file/commit/80816651588efb79a5d054e13703bf2a3378d024 > https://github.com/file/file/commit/43f7989076aa3731f3558c6954780bc7b2734b64) > > https://github.com/file/file/blob/FILE5_41/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/file/0001-Add-libmagic.pc.patch | 76 ------------------------- > package/file/file.hash | 10 ++-- > package/file/file.mk | 4 +- > 3 files changed, 6 insertions(+), 84 deletions(-) > delete mode 100644 package/file/0001-Add-libmagic.pc.patch > > diff --git a/package/file/0001-Add-libmagic.pc.patch b/package/file/0001-Add-libmagic.pc.patch > deleted file mode 100644 > index b26d16224d..0000000000 > --- a/package/file/0001-Add-libmagic.pc.patch > +++ /dev/null > @@ -1,76 +0,0 @@ > -From d079cac1110cc2761417f0dcb0a142b217eb1eda Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 31 Jan 2020 20:26:29 +0100 > -Subject: [PATCH] Add libmagic.pc > - > -libmagic can optionally depends on xz (for lzma) or bzip2 since version > -5.38 and > -https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7 > -so add libmagic.pc so package (such as gerbera) that links with libmagic > -will be able to use pkg-config to retrieve those static dependencies > -For example, this will avoid the following build failure: > - > -[100%] Linking CXX executable gerbera > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf': > -compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' > - > -Fixes: > - - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://bugs.astron.com/view.php?id=136] > ---- > - Makefile.am | 5 +++++ > - configure.ac | 2 +- > - libmagic.pc.in | 10 ++++++++++ > - 3 files changed, 16 insertions(+), 1 deletion(-) > - create mode 100644 libmagic.pc.in > - > -diff --git a/Makefile.am b/Makefile.am > -index 8bd927d9..2ab67ed7 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -3,3 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 > - EXTRA_DIST = MAINT > - > - SUBDIRS = src magic tests doc python > -+ > -+# This variable must have 'exec' in its name, in order to be installed > -+# by 'install-exec' target (instead of default 'install-data') > -+pkgconfigexecdir = $(libdir)/pkgconfig > -+pkgconfigexec_DATA = libmagic.pc > -diff --git a/configure.ac b/configure.ac > -index ac37fccd..b2e2e5b8 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -217,5 +217,5 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t > - AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support]) > - fi > - > --AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile]) > -+AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc]) > - AC_OUTPUT > -diff --git a/libmagic.pc.in b/libmagic.pc.in > -new file mode 100644 > -index 00000000..3ad1290b > ---- /dev/null > -+++ b/libmagic.pc.in > -@@ -0,0 +1,10 @@ > -+prefix=@prefix@ > -+exec_prefix=@exec_prefix@ > -+libdir=@libdir@ > -+includedir=@includedir@ > -+ > -+Name: libmagic > -+Description: Magic number recognition library > -+Version: @VERSION@ > -+Libs: -L${libdir} -lmagic > -+Libs.private: @LIBS@ > --- > -2.24.1 > - > diff --git a/package/file/file.hash b/package/file/file.hash > index 96efaf8483..33875776eb 100644 > --- a/package/file/file.hash > +++ b/package/file/file.hash > @@ -1,7 +1,7 @@ > # Locally calculated after verifying signature > -# ftp://ftp.astron.com/pub/file/file-5.38.tar.gz.asc > +# ftp://ftp.astron.com/pub/file/file-5.41.tar.gz.asc > # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A > -sha256 593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34 file-5.38.tar.gz > -sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING > -sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h > -sha256 58b5932aca6c10f2194290a3b26088ec9ba07ef6b52cc9bb2dd638cc634db6f1 src/vasprintf.c > +sha256 13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f file-5.41.tar.gz > +sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING > +sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h > +sha256 c4fa92d6504b88484a12140fe3e24b9b29b0112717f94b1ff4205d54828b1c70 src/vasprintf.c > diff --git a/package/file/file.mk b/package/file/file.mk > index c41a8eb3a4..12647af8bb 100644 > --- a/package/file/file.mk > +++ b/package/file/file.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FILE_VERSION = 5.38 > +FILE_VERSION = 5.41 > FILE_SITE = ftp://ftp.astron.com/pub/file > FILE_DEPENDENCIES = host-file > HOST_FILE_DEPENDENCIES = host-zlib > @@ -13,8 +13,6 @@ FILE_INSTALL_STAGING = YES > FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) > FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c > FILE_CPE_ID_VENDOR = file_project > -# We're patching configure.ac > -FILE_AUTORECONF = YES > HOST_FILE_CONF_OPTS = --disable-libseccomp > > ifeq ($(BR2_PACKAGE_BZIP2),y) > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:13:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:13:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libzip: bump to version 1.8.0 In-Reply-To: <20211230233920.3207191-1-fontaine.fabrice@gmail.com> References: <20211230233920.3207191-1-fontaine.fabrice@gmail.com> Message-ID: <20220101101344.GA3390456@scaer> Fabrice, All, On 2021-12-31 00:39 +0100, Fabrice Fontaine spake thusly: > - Drop patches (already in version) > - Add zstd optional dependency > > https://libzip.org/news/release-1.8.0.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...001-Add-FindGnuTLS-cmake-from-3-17-3.patch | 103 ------------------ > .../0002-Include-limits.h-for-INT_MAX.patch | 27 ----- > package/libzip/libzip.hash | 2 +- > package/libzip/libzip.mk | 9 +- > 4 files changed, 9 insertions(+), 132 deletions(-) > delete mode 100644 package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > delete mode 100644 package/libzip/0002-Include-limits.h-for-INT_MAX.patch > > diff --git a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch b/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > deleted file mode 100644 > index 30bc201048..0000000000 > --- a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > +++ /dev/null > @@ -1,103 +0,0 @@ > -From 73f6f8ebff678a0847e6b197b574082cc285b528 Mon Sep 17 00:00:00 2001 > -From: Thomas Klausner > -Date: Sat, 25 Jul 2020 12:03:29 +0200 > -Subject: [PATCH] Add FindGnuTLS.cmake from 3.17.3. > - > -Addresses #199 > - > -[Retrieved from: > -https://github.com/nih-at/libzip/commit/73f6f8ebff678a0847e6b197b574082cc285b528] > -Signed-off-by: Fabrice Fontaine > ---- > - cmake-compat/FindGnuTLS.cmake | 82 +++++++++++++++++++++++++++++++++++ > - 1 file changed, 82 insertions(+) > - create mode 100644 cmake-compat/FindGnuTLS.cmake > - > -diff --git a/cmake-compat/FindGnuTLS.cmake b/cmake-compat/FindGnuTLS.cmake > -new file mode 100644 > -index 00000000..819f0001 > ---- /dev/null > -+++ b/cmake-compat/FindGnuTLS.cmake > -@@ -0,0 +1,82 @@ > -+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying > -+# file Copyright.txt or https://cmake.org/licensing for details. > -+ > -+#[=======================================================================[.rst: > -+FindGnuTLS > -+---------- > -+ > -+Find the GNU Transport Layer Security library (gnutls) > -+ > -+IMPORTED Targets > -+^^^^^^^^^^^^^^^^ > -+ > -+This module defines :prop_tgt:`IMPORTED` target ``GnuTLS::GnuTLS``, if > -+gnutls has been found. > -+ > -+Result Variables > -+^^^^^^^^^^^^^^^^ > -+ > -+``GNUTLS_FOUND`` > -+ System has gnutls > -+``GNUTLS_INCLUDE_DIR`` > -+ The gnutls include directory > -+``GNUTLS_LIBRARIES`` > -+ The libraries needed to use gnutls > -+``GNUTLS_DEFINITIONS`` > -+ Compiler switches required for using gnutls > -+``GNUTLS_VERSION`` > -+ version of gnutls. > -+#]=======================================================================] > -+ > -+# Note that this doesn't try to find the gnutls-extra package. > -+ > -+ > -+if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARY) > -+ # in cache already > -+ set(gnutls_FIND_QUIETLY TRUE) > -+endif () > -+ > -+if (NOT WIN32) > -+ # try using pkg-config to get the directories and then use these values > -+ # in the find_path() and find_library() calls > -+ # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful > -+ find_package(PkgConfig QUIET) > -+ PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls) > -+ set(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) > -+ set(GNUTLS_VERSION ${PC_GNUTLS_VERSION}) > -+ # keep for backward compatibility > -+ set(GNUTLS_VERSION_STRING ${PC_GNUTLS_VERSION}) > -+endif () > -+ > -+find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h > -+ HINTS > -+ ${PC_GNUTLS_INCLUDEDIR} > -+ ${PC_GNUTLS_INCLUDE_DIRS} > -+ ) > -+ > -+find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls > -+ HINTS > -+ ${PC_GNUTLS_LIBDIR} > -+ ${PC_GNUTLS_LIBRARY_DIRS} > -+ ) > -+ > -+mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) > -+ > -+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) > -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS > -+ REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR > -+ VERSION_VAR GNUTLS_VERSION_STRING) > -+ > -+if(GNUTLS_FOUND) > -+ set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) > -+ set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) > -+ > -+ if(NOT TARGET GnuTLS::GnuTLS) > -+ add_library(GnuTLS::GnuTLS UNKNOWN IMPORTED) > -+ set_target_properties(GnuTLS::GnuTLS PROPERTIES > -+ INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}" > -+ INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}" > -+ IMPORTED_LINK_INTERFACE_LANGUAGES "C" > -+ IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") > -+ endif() > -+endif() > diff --git a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch > deleted file mode 100644 > index c488f05289..0000000000 > --- a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch > +++ /dev/null > @@ -1,27 +0,0 @@ > -From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?=C3=98rjan=20Malde?= > -Date: Wed, 15 Jul 2020 12:16:16 +0200 > -Subject: [PATCH] Include limits.h for INT_MAX > - > -[Retrieved from: > -https://github.com/nih-at/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] > -Signed-off-by: Paul Cercueil > ---- > - lib/zip_crypto_openssl.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c > -index 1cb00479..60f92758 100644 > ---- a/lib/zip_crypto_openssl.c > -+++ b/lib/zip_crypto_openssl.c > -@@ -38,6 +38,7 @@ > - #include "zip_crypto.h" > - > - #include > -+#include > - > - #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) > - #define USE_OPENSSL_1_0_API > --- > -2.28.0 > - > diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash > index a298b9aba9..5afdfd7cb8 100644 > --- a/package/libzip/libzip.hash > +++ b/package/libzip/libzip.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 libzip-1.7.3.tar.xz > +sha256 f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e libzip-1.8.0.tar.xz > sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE > diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk > index 4a028f970a..6bc5c5c193 100644 > --- a/package/libzip/libzip.mk > +++ b/package/libzip/libzip.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBZIP_VERSION = 1.7.3 > +LIBZIP_VERSION = 1.8.0 > LIBZIP_SITE = https://libzip.org/download > LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz > LIBZIP_LICENSE = BSD-3-Clause > @@ -54,5 +54,12 @@ else > LIBZIP_CONF_OPTS += -DENABLE_LZMA=OFF > endif > > +ifeq ($(BR2_PACKAGE_ZSTD),y) > +LIBZIP_DEPENDENCIES += zstd > +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=ON > +else > +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=OFF > +endif > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:17:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:17:52 +0100 Subject: [Buildroot] [git commit] package/openjdk: Make sure for ARC only Zero is selectable Message-ID: <20220101101449.662E981A0E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef7ace1017f13ca9266bb689c18bc008cca92ed2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit a5d2c379ebf5 (package/openjdk: add ARC HS3x/4x support via "Zero Assembly Project") forgot to limit the scope of the ARC support. As of now for ARC we only have fully-interpreted mode AKA "Project Zero" and so all the JIT'ed modes must be explicitly disabled for ARC. Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/openjdk/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index b6eb2d7818..8b7fd4653e 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -126,19 +126,19 @@ config BR2_PACKAGE_OPENJDK_FULL_JDK choice prompt "openjdk variant" - default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc + default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !(BR2_powerpc || BR2_arc) default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_arc config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT bool "client" - depends on !BR2_powerpc + depends on !(BR2_powerpc || BR2_arc) help Quick loading, but slower run-time performance. config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER bool "server" - depends on !BR2_powerpc + depends on !(BR2_powerpc || BR2_arc) help Slower loading, but faster run-time performance. From yann.morin.1998 at free.fr Sat Jan 1 10:22:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:22:06 +0100 Subject: [Buildroot] [PATCH] package/openjdk: Make sure for ARC only Zero is selectable In-Reply-To: <20211230225719.31728-1-abrodkin@synopsys.com> References: <20211230225719.31728-1-abrodkin@synopsys.com> Message-ID: <20220101102206.GB3390456@scaer> Alexey, All, On 2021-12-31 01:57 +0300, Alexey Brodkin via buildroot spake thusly: > As of now for ARC we only have fully-interpreted mode AKA > "Project Zero" and so all the JIT'ed modes must be explicitly > disabled for ARC. Doing it now as it was not done in the initial > submission > > Signed-off-by: Alexey Brodkin > Cc: Thomas Petazzoni I've slightly reworded the commit log to adde the actual reference to the initial commit, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/openjdk/Config.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in > index b6eb2d7818..8b7fd4653e 100644 > --- a/package/openjdk/Config.in > +++ b/package/openjdk/Config.in > @@ -126,19 +126,19 @@ config BR2_PACKAGE_OPENJDK_FULL_JDK > > choice > prompt "openjdk variant" > - default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc > + default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !(BR2_powerpc || BR2_arc) > default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc > default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_arc > > config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT > bool "client" > - depends on !BR2_powerpc > + depends on !(BR2_powerpc || BR2_arc) > help > Quick loading, but slower run-time performance. > > config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER > bool "server" > - depends on !BR2_powerpc > + depends on !(BR2_powerpc || BR2_arc) > help > Slower loading, but faster run-time performance. > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:26:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:26:16 +0100 Subject: [Buildroot] [git commit] package/libexecinfo: needs dynamic library Message-ID: <20220101102026.B6B9D8190F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c87659ec8030de5155667664de1bf67ab18a7613 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit eea8ba446c10701a273432552108d80fb2224ef4: execinfo.c:32:10: fatal error: dlfcn.h: No such file or directory 32 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ea33c8c6aa5091983837609eec5d129902183ef1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libexecinfo/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libexecinfo/Config.in b/package/libexecinfo/Config.in index 473a4f7181..e90dfc4e87 100644 --- a/package/libexecinfo/Config.in +++ b/package/libexecinfo/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_LIBEXECINFO bool "libexecinfo" + depends on !BR2_STATIC_LIBS # dlfcn.h depends on !BR2_TOOLCHAIN_USES_GLIBC help Library for inspecting program's backtrace https://github.com/mikroskeem/libexecinfo + +comment "libexecinfo needs a musl or uclibc toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS From yann.morin.1998 at free.fr Sat Jan 1 10:26:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:26:49 +0100 Subject: [Buildroot] [git commit] package/nodejs: bump to version 14.18.2 Message-ID: <20220101102139.B5F5F81D8B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06735b085fd595ffc233e48cc5a57f4fa555b02c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: Please use python3.9 or python3.8 or python3.7 or python3.6 or python3.5 or python2.7. /usr/bin/python3.7 ./configure /usr/bin/python3.5 ./configure /home/peko/autobuild/instance-1/output-1/host/bin/python2.7 ./configure Node.js configure: Found Python 3.10.1... https://github.com/nodejs/node/releases/tag/v14.18.2 Fixes: - http://autobuild.buildroot.org/results/9e2ebb9c3681ec0485eaa042fa838c8ee62f649b Signed-off-by: Fabrice Fontaine Tested-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 3a4571e8e5..f330757341 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.17.6/SHASUMS256.txt -sha256 3fa1d71adddfab2f5e3e41874b4eddbdf92b65cade4a43922fb1e437afcf89ed node-v14.18.1.tar.xz +# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt +sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 42ef1baa64..44bf786dfd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.1 +NODEJS_VERSION = 14.18.2 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ From yann.morin.1998 at free.fr Sat Jan 1 10:28:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:28:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: bump to version 14.18.2 In-Reply-To: <20211231100725.3662078-1-fontaine.fabrice@gmail.com> References: <20211231100725.3662078-1-fontaine.fabrice@gmail.com> Message-ID: <20220101102813.GC3390456@scaer> On 2021-12-31 11:07 +0100, Fabrice Fontaine spake thusly: Fabrice, All, > This bump will fix the following build failure raised since bump of > python3 to version 3.10.1 in commit > 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > Please use python3.9 or python3.8 or python3.7 or python3.6 or python3.5 or python2.7. > /usr/bin/python3.7 ./configure > /usr/bin/python3.5 ./configure > /home/peko/autobuild/instance-1/output-1/host/bin/python2.7 ./configure > Node.js configure: Found Python 3.10.1... > > https://github.com/nodejs/node/releases/tag/v14.18.2 > > Fixes: > - http://autobuild.buildroot.org/results/9e2ebb9c3681ec0485eaa042fa838c8ee62f649b > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nodejs/nodejs.hash | 4 ++-- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash > index 3a4571e8e5..f330757341 100644 > --- a/package/nodejs/nodejs.hash > +++ b/package/nodejs/nodejs.hash > @@ -1,5 +1,5 @@ > -# From https://nodejs.org/dist/v14.17.6/SHASUMS256.txt > -sha256 3fa1d71adddfab2f5e3e41874b4eddbdf92b65cade4a43922fb1e437afcf89ed node-v14.18.1.tar.xz > +# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt > +sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz > > # Hash for license file > sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 322eed6d19..7d5c93eb93 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NODEJS_VERSION = 14.18.1 > +NODEJS_VERSION = 14.18.2 > NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz > NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) > NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:39:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:39:55 +0100 Subject: [Buildroot] [git commit] package/assimp: fix namespace related compile failure Message-ID: <20220101103427.6806381D8B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6dfb23a407f5c8c5cf6678554f39a8bd32a26d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - http://autobuild.buildroot.net/results/0861c66ec02a55e984577094e28b65c78b95a330 .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] const FileDatabase &db) const { ^ In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] void Convert(T &dest, const FileDatabase &db) const; ^ .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] const FileDatabase &db) const { ^ In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] void Convert(T &dest, const FileDatabase &db) const; ^ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: update upstream status] Signed-off-by: Yann E. MORIN --- ...e-use-explicit-namespace-instead-of-using.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch new file mode 100644 index 0000000000..c83e9c50a4 --- /dev/null +++ b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch @@ -0,0 +1,57 @@ +From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 30 Dec 2021 18:01:54 +0100 +Subject: [PATCH] BlenderScene: use explicit namespace instead of using + namespace + +Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): + + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] + const FileDatabase &db) const { + ^ + In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, + from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] + void Convert(T &dest, const FileDatabase &db) const; + ^ + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] + const FileDatabase &db) const { + ^ + In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, + from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] + void Convert(T &dest, const FileDatabase &db) const; + ^ + +[backport from upstream commit a099fe7cd331] +Signed-off-by: Peter Seiderer +--- + code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp +index c93d913fc..9ad086fe6 100644 +--- a/code/AssetLib/Blender/BlenderScene.cpp ++++ b/code/AssetLib/Blender/BlenderScene.cpp +@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "BlenderDNA.h" + #include "BlenderSceneGen.h" + +-using namespace Assimp; +-using namespace Assimp::Blender; ++namespace Assimp { ++namespace Blender { + + //-------------------------------------------------------------------------------- + template <> +@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { + converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); + } + ++} // namespace Blender ++} //namespace Assimp ++ + #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER +-- +2.34.1 + From yann.morin.1998 at free.fr Sat Jan 1 10:43:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:43:11 +0100 Subject: [Buildroot] [RFC v1] package/assimp: fix namespace related compile failure In-Reply-To: <20211230172507.30212-1-ps.report@gmx.net> References: <20211230172507.30212-1-ps.report@gmx.net> Message-ID: <20220101104311.GD3390456@scaer> Peter, All, On 2021-12-30 18:25 +0100, Peter Seiderer spake thusly: > Fixes: > > - http://autobuild.buildroot.net/results/0861c66ec02a55e984577094e28b65c78b95a330 > > .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > const FileDatabase &db) const { > ^ > In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > void Convert(T &dest, const FileDatabase &db) const; > ^ > .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > const FileDatabase &db) const { > ^ > In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > void Convert(T &dest, const FileDatabase &db) const; > ^ > > Signed-off-by: Peter Seiderer > --- > Note: > - patch fixes the compile failure but did not find the root cause > and/or a good explanation why the template spezialisation failes > for Structure::Convert and > Structure::Convert (but not the other ones) and > why it is fixed by the patch... Since this is now an upstream commit, I've applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-explicit-namespace-instead-of-using.patch | 56 +++++++++++++++++++ > 1 file changed, 56 insertions(+) > create mode 100644 package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > > diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > new file mode 100644 > index 0000000000..b498c3be3f > --- /dev/null > +++ b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > @@ -0,0 +1,56 @@ > +From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Thu, 30 Dec 2021 18:01:54 +0100 > +Subject: [PATCH] BlenderScene: use explicit namespace instead of using > + namespace > + > +Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): > + > + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > + const FileDatabase &db) const { > + ^ > + In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > + from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > + void Convert(T &dest, const FileDatabase &db) const; > + ^ > + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > + const FileDatabase &db) const { > + ^ > + In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > + from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > + void Convert(T &dest, const FileDatabase &db) const; > + ^ > + > +Signed-off-by: Peter Seiderer > +--- > + code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- > + 1 file changed, 5 insertions(+), 2 deletions(-) > + > +diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp > +index c93d913fc..9ad086fe6 100644 > +--- a/code/AssetLib/Blender/BlenderScene.cpp > ++++ b/code/AssetLib/Blender/BlenderScene.cpp > +@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + #include "BlenderDNA.h" > + #include "BlenderSceneGen.h" > + > +-using namespace Assimp; > +-using namespace Assimp::Blender; > ++namespace Assimp { > ++namespace Blender { > + > + //-------------------------------------------------------------------------------- > + template <> > +@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { > + converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); > + } > + > ++} // namespace Blender > ++} //namespace Assimp > ++ > + #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sat Jan 1 10:50:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 1 Jan 2022 11:50:58 +0100 Subject: [Buildroot] [buildroot-test] scripts/autobuild-run: extend timeout from 120 to 180 minutes In-Reply-To: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> References: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> Message-ID: <20220101115058.0515c8d9@windsurf> Hello Giulio, On Fri, 1 Oct 2021 01:14:24 +0200 Giulio Benetti wrote: > During the last months some package started to timeout, but this is not due > to toolchain infinite loop. I think it's due to the increase of the source > code files' length and to complexity of toolchains or even slow compiling > time. For example python-uvloop and python-lxml only take long time to > build with -Os optimization and this makes it seem a TIMEOUT but it's not. > So let's extend timeout setting from 120 to 180 minutes to avoid false > TIMEOUTs. > > Signed-off-by: Giulio Benetti Do you have a specific example where you have seen a failure? Please note that this HUNG_BUILD_TIMEOUT value is the per-step timeout: it verifies that one step of one particular package doesn't take more than 120 minutes. Unless you have a specific example where you have seen this timeout causing false positives, I'm not really keen on applying such a patch as it would cause situations where the build is really stuck to be stuck for 3 hours instead of 2. Did you identify that the python-uvloop and python-lxml packages really took more than 2 hours to build? I did see at http://autobuild.buildroot.net/?status=TIMEOUT those timeouts dating back from ~November. Did you reproduce the issue, and verified that the build indeed completes at some point? In general, if a simple package such as python-uvloop or python-lxml takes more than 2 hours to build, it means that the compiler (or linker) has gone crazy in an infinite loop, and the build will in fact never finish. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 1 11:00:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 12:00:31 +0100 Subject: [Buildroot] [git commit] package/freeipmi: new package Message-ID: <20220101105445.6819782628@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=663f39c88c01593855c18355a4decdceeffd884b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master FreeIPMI provides in-band and out-of-band IPMI software based on the IPMI v1.5/2.0 specification. The IPMI specification defines a set of interfaces for platform management and is implemented by a number vendors for system management. The features of IPMI that most users will be interested in are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL). https://www.gnu.org/software/freeipmi/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/freeipmi/0001-fix-build-on-musl.patch | 49 +++++++++++++++++++++++++++ package/freeipmi/Config.in | 20 +++++++++++ package/freeipmi/freeipmi.hash | 15 ++++++++ package/freeipmi/freeipmi.mk | 35 +++++++++++++++++++ 6 files changed, 121 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 78e41b7d7c..21e4f2a84c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -858,6 +858,7 @@ F: package/daq3/ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ +F: package/freeipmi/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index ce12e5f3c5..d3d0717535 100644 --- a/package/Config.in +++ b/package/Config.in @@ -478,6 +478,7 @@ endmenu source "package/fconfig/Config.in" source "package/flashrom/Config.in" source "package/fmtools/Config.in" + source "package/freeipmi/Config.in" source "package/freescale-imx/Config.in" source "package/fxload/Config.in" source "package/gcnano-binaries/Config.in" diff --git a/package/freeipmi/0001-fix-build-on-musl.patch b/package/freeipmi/0001-fix-build-on-musl.patch new file mode 100644 index 0000000000..ff7425d221 --- /dev/null +++ b/package/freeipmi/0001-fix-build-on-musl.patch @@ -0,0 +1,49 @@ +From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 30 Oct 2021 00:26:40 +0200 +Subject: [PATCH] fix build on musl + +musl doesn't provide getmsg or putmsg even if stropts.h is available + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2] +--- + configure.ac | 1 + + libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 562dd624e..711b27674 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) + AC_CHECK_FUNCS([iopl]) + AC_CHECK_FUNCS([asprintf]) + AC_CHECK_FUNCS([cbrt]) ++AC_CHECK_FUNCS([getmsg putmsg]) + + dnl sighandler_t apparently not defined in Apple/OS X + AC_CHECK_TYPES([sighandler_t], [], [], [[#include ]]) +diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c +index 05caca8b6..4ae8c5719 100644 +--- a/libfreeipmi/driver/ipmi-sunbmc-driver.c ++++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c +@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx, + assert (ctx->io_init); + assert (ctx->putmsg_intf); + +-#if defined(HAVE_SYS_STROPTS_H) ++#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG) + memset (&sbuf, '\0', sizeof (struct strbuf)); + + /* Due to API differences, we need to extract the cmd out of the +@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx, + return (-1); + } + +-#if defined(HAVE_SYS_STROPTS_H) ++#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG) + if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0) + { + SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno); diff --git a/package/freeipmi/Config.in b/package/freeipmi/Config.in new file mode 100644 index 0000000000..8ef2e137fa --- /dev/null +++ b/package/freeipmi/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_FREEIPMI + bool "freeipmi" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + help + FreeIPMI provides in-band and out-of-band IPMI software based + on the IPMI v1.5/2.0 specification. + + The IPMI specification defines a set of interfaces for + platform management and is implemented by a number vendors + for system management. The features of IPMI that most users + will be interested in are sensor monitoring, system event + monitoring, power control, and serial-over-LAN (SOL). + + https://www.gnu.org/software/freeipmi/ + +comment "freeipmi needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash new file mode 100644 index 0000000000..f73b4a25fe --- /dev/null +++ b/package/freeipmi/freeipmi.hash @@ -0,0 +1,15 @@ +# Locally computed: +sha256 4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71 freeipmi-1.6.8.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmi-dcmi +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmidetect +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmi-fru +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmimonitoring +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiping +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmipower +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiseld +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.pstdout +sha256 48f44386b3f359e70d7e4a5d7f1d529d8591a7c64c47df3f4abdf2ad45a6d537 COPYING.sunbmc +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ZRESEARCH diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk new file mode 100644 index 0000000000..b25ef0a4c6 --- /dev/null +++ b/package/freeipmi/freeipmi.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# freeipmi +# +################################################################################ + +FREEIPMI_VERSION = 1.6.8 +FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi +FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) +FREEIPMI_LICENSE_FILES = \ + COPYING COPYING.bmc-watchdog COPYING.ipmiconsole COPYING.ipmi-dcmi \ + COPYING.ipmidetect COPYING.ipmi-fru COPYING.ipmimonitoring \ + COPYING.ipmiping COPYING.ipmipower COPYING.ipmiseld COPYING.pstdout \ + COPYING.sunbmc COPYING.ZRESEARCH +FREEIPMI_DEPENDENCIES = host-pkgconf +FREEIPMI_INSTALL_STAGING = YES +# We're patching configure.ac +FREEIPMI_AUTORECONF = YES +# Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE +FREEIPMI_CONF_OPTS = --without-random-device + +# Work around for uClibc or musl toolchains which lack argp_*() +# functions. +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) +FREEIPMI_DEPENDENCIES += argp-standalone +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +FREEIPMI_CONF_OPTS += --with-encryption +FREEIPMI_DEPENDENCIES += libgcrypt +else +FREEIPMI_CONF_OPTS += --without-encryption +endif + +$(eval $(autotools-package)) From yann.morin.1998 at free.fr Sat Jan 1 11:01:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 12:01:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: new package In-Reply-To: <20211227124417.1509743-1-fontaine.fabrice@gmail.com> References: <20211227124417.1509743-1-fontaine.fabrice@gmail.com> Message-ID: <20220101110127.GE3390456@scaer> Fabrice, All, On 2021-12-27 13:44 +0100, Fabrice Fontaine spake thusly: > FreeIPMI provides in-band and out-of-band IPMI software based on the > IPMI v1.5/2.0 specification. > > The IPMI specification defines a set of interfaces for platform > management and is implemented by a number vendors for system management. > The features of IPMI that most users will be interested in are sensor > monitoring, system event monitoring, power control, and serial-over-LAN > (SOL). > > https://www.gnu.org/software/freeipmi/ > > Signed-off-by: Fabrice Fontaine [--SNIP--] > diff --git a/package/freeipmi/0001-fix-build-on-musl.patch b/package/freeipmi/0001-fix-build-on-musl.patch > new file mode 100644 > index 0000000000..0a570b8841 > --- /dev/null > +++ b/package/freeipmi/0001-fix-build-on-musl.patch > @@ -0,0 +1,49 @@ > +From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 30 Oct 2021 00:26:40 +0200 > +Subject: [PATCH] fix build on musl > + > +musl doesn't provide getmsg or putmsg even if stropts.h is available > + > +Signed-off-by: Fabrice Fontaine > +[Retrieved from: > +https://github.com/chu11/freeipmi-mirror/commit/6295c96ae54cb16efe41e53f526a4dc19cd719f2] I've changed that to point to the official git repository: https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2 Applied to master, thanks. Regards, Yann E. MORIN. > +--- > + configure.ac | 1 + > + libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++-- > + 2 files changed, 3 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 562dd624e..711b27674 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) > + AC_CHECK_FUNCS([iopl]) > + AC_CHECK_FUNCS([asprintf]) > + AC_CHECK_FUNCS([cbrt]) > ++AC_CHECK_FUNCS([getmsg putmsg]) > + > + dnl sighandler_t apparently not defined in Apple/OS X > + AC_CHECK_TYPES([sighandler_t], [], [], [[#include ]]) > +diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c > +index 05caca8b6..4ae8c5719 100644 > +--- a/libfreeipmi/driver/ipmi-sunbmc-driver.c > ++++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c > +@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx, > + assert (ctx->io_init); > + assert (ctx->putmsg_intf); > + > +-#if defined(HAVE_SYS_STROPTS_H) > ++#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG) > + memset (&sbuf, '\0', sizeof (struct strbuf)); > + > + /* Due to API differences, we need to extract the cmd out of the > +@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx, > + return (-1); > + } > + > +-#if defined(HAVE_SYS_STROPTS_H) > ++#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG) > + if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0) > + { > + SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno); > diff --git a/package/freeipmi/Config.in b/package/freeipmi/Config.in > new file mode 100644 > index 0000000000..8ef2e137fa > --- /dev/null > +++ b/package/freeipmi/Config.in > @@ -0,0 +1,20 @@ > +config BR2_PACKAGE_FREEIPMI > + bool "freeipmi" > + depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_HAS_THREADS > + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL > + help > + FreeIPMI provides in-band and out-of-band IPMI software based > + on the IPMI v1.5/2.0 specification. > + > + The IPMI specification defines a set of interfaces for > + platform management and is implemented by a number vendors > + for system management. The features of IPMI that most users > + will be interested in are sensor monitoring, system event > + monitoring, power control, and serial-over-LAN (SOL). > + > + https://www.gnu.org/software/freeipmi/ > + > +comment "freeipmi needs a toolchain w/ threads" > + depends on BR2_USE_MMU > + depends on !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash > new file mode 100644 > index 0000000000..f73b4a25fe > --- /dev/null > +++ b/package/freeipmi/freeipmi.hash > @@ -0,0 +1,15 @@ > +# Locally computed: > +sha256 4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71 freeipmi-1.6.8.tar.gz > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmi-dcmi > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmidetect > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmi-fru > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmimonitoring > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiping > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmipower > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiseld > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.pstdout > +sha256 48f44386b3f359e70d7e4a5d7f1d529d8591a7c64c47df3f4abdf2ad45a6d537 COPYING.sunbmc > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ZRESEARCH > diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk > new file mode 100644 > index 0000000000..b25ef0a4c6 > --- /dev/null > +++ b/package/freeipmi/freeipmi.mk > @@ -0,0 +1,35 @@ > +################################################################################ > +# > +# freeipmi > +# > +################################################################################ > + > +FREEIPMI_VERSION = 1.6.8 > +FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi > +FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) > +FREEIPMI_LICENSE_FILES = \ > + COPYING COPYING.bmc-watchdog COPYING.ipmiconsole COPYING.ipmi-dcmi \ > + COPYING.ipmidetect COPYING.ipmi-fru COPYING.ipmimonitoring \ > + COPYING.ipmiping COPYING.ipmipower COPYING.ipmiseld COPYING.pstdout \ > + COPYING.sunbmc COPYING.ZRESEARCH > +FREEIPMI_DEPENDENCIES = host-pkgconf > +FREEIPMI_INSTALL_STAGING = YES > +# We're patching configure.ac > +FREEIPMI_AUTORECONF = YES > +# Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE > +FREEIPMI_CONF_OPTS = --without-random-device > + > +# Work around for uClibc or musl toolchains which lack argp_*() > +# functions. > +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) > +FREEIPMI_DEPENDENCIES += argp-standalone > +endif > + > +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > +FREEIPMI_CONF_OPTS += --with-encryption > +FREEIPMI_DEPENDENCIES += libgcrypt > +else > +FREEIPMI_CONF_OPTS += --without-encryption > +endif > + > +$(eval $(autotools-package)) > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 11:02:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 12:02:54 +0100 Subject: [Buildroot] [git commit] package/sslh: bump to version 1.22c Message-ID: <20220101105810.36D7682258@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b9c58531e97b012a8a11c6ae5145b16dcfb8f74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - pcre2 is mandatory since version 1.22b and https://github.com/yrutschle/sslh/commit/37d275670345bc177d4081d7d348c0943f743132 - Drop patch (not needed anymore) https://github.com/yrutschle/sslh/blob/v1.22c/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...001-Makefile-fix-static-linking-with-pcre.patch | 41 ---------------------- package/sslh/Config.in | 1 + package/sslh/sslh.hash | 2 +- package/sslh/sslh.mk | 10 ++---- 4 files changed, 4 insertions(+), 50 deletions(-) diff --git a/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch b/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch deleted file mode 100644 index 5fc3296da5..0000000000 --- a/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0d9e004d324cc030c173de04c40db51a0f22bb5c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 07:58:05 +0200 -Subject: [PATCH] Makefile: fix static linking with pcre - -Static build with pcre is broken since version 1.19b and -https://github.com/yrutschle/sslh/commit/cb90cc97ae64a445242e517847c6e44b7003eda4 -because -lpcre has been replaced by -lpcreposix which will result in -the following static build failure: - -/srv/storage/autobuild/run/instance-1/output-1/host/bin/mipsel-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -o echosrv echosrv.o probe.o common.o tls.o -lpcreposix -lconfig -lcap -/srv/storage/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/8.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-1/output-1/host/mipsel-buildroot-linux-uclibc/sysroot/usr/lib/libpcreposix.a(libpcreposix_la-pcreposix.o): in function `regfree': -pcreposix.c:(.text+0x120): undefined reference to `pcre_free' - -So append -lpcre after -lpcreposix - -Fixes: - - http://autobuild.buildroot.org/results/a601824fc0c205a6a940e0f9f079ce2c39840605 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/yrutschle/sslh/pull/280] ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 986cf1c..ecadc22 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,7 +43,7 @@ endif - - ifneq ($(strip $(USELIBPCRE)),) - CPPFLAGS+=-DLIBPCRE -- LIBS:=$(LIBS) -lpcreposix -+ LIBS:=$(LIBS) -lpcreposix -lpcre - endif - - ifneq ($(strip $(USELIBCONFIG)),) --- -2.28.0 - diff --git a/package/sslh/Config.in b/package/sslh/Config.in index f6b46f3218..a1d5211851 100644 --- a/package/sslh/Config.in +++ b/package/sslh/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_SSLH bool "sslh" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBCONFIG if BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_PCRE2 help Applicative protocol multiplexer diff --git a/package/sslh/sslh.hash b/package/sslh/sslh.hash index 00e5c12d77..ae678563da 100644 --- a/package/sslh/sslh.hash +++ b/package/sslh/sslh.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 sslh-v1.21c.tar.gz +sha256 8e3742d14edf4119350cfdc7bb96b89134d9218eb6d2a6e1f70891ca18a649b1 sslh-v1.22c.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 4bde143cd8..99fb6bf922 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -4,11 +4,12 @@ # ################################################################################ -SSLH_VERSION = 1.21c +SSLH_VERSION = 1.22c SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz SSLH_SITE = http://www.rutschle.net/tech/sslh SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING +SSLH_DEPENDENCIES = pcre2 SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) @@ -33,13 +34,6 @@ else SSLH_MAKE_OPTS += USELIBCONFIG= endif -ifeq ($(BR2_PACKAGE_PCRE),y) -SSLH_DEPENDENCIES += pcre -SSLH_MAKE_OPTS += USELIBPCRE=1 -else -SSLH_MAKE_OPTS += USELIBPCRE= -endif - ifeq ($(BR2_PACKAGE_SYSTEMD),y) SSLH_DEPENDENCIES += systemd SSLH_MAKE_OPTS += USESYSTEMD=1 From yann.morin.1998 at free.fr Sat Jan 1 11:05:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 12:05:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/sslh: bump to version 1.22c In-Reply-To: <20211230225204.3080462-1-fontaine.fabrice@gmail.com> References: <20211230225204.3080462-1-fontaine.fabrice@gmail.com> Message-ID: <20220101110512.GF3390456@scaer> Fabrice, All, On 2021-12-30 23:52 +0100, Fabrice Fontaine spake thusly: > - pcre2 is mandatory since version 1.22b and > https://github.com/yrutschle/sslh/commit/37d275670345bc177d4081d7d348c0943f743132 > - Drop patch (not needed anymore) > > https://github.com/yrutschle/sslh/blob/v1.22c/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...akefile-fix-static-linking-with-pcre.patch | 41 ------------------- > package/sslh/Config.in | 1 + > package/sslh/sslh.hash | 2 +- > package/sslh/sslh.mk | 10 +---- > 4 files changed, 4 insertions(+), 50 deletions(-) > delete mode 100644 package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch > > diff --git a/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch b/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch > deleted file mode 100644 > index 5fc3296da5..0000000000 > --- a/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -From 0d9e004d324cc030c173de04c40db51a0f22bb5c Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Thu, 15 Oct 2020 07:58:05 +0200 > -Subject: [PATCH] Makefile: fix static linking with pcre > - > -Static build with pcre is broken since version 1.19b and > -https://github.com/yrutschle/sslh/commit/cb90cc97ae64a445242e517847c6e44b7003eda4 > -because -lpcre has been replaced by -lpcreposix which will result in > -the following static build failure: > - > -/srv/storage/autobuild/run/instance-1/output-1/host/bin/mipsel-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -o echosrv echosrv.o probe.o common.o tls.o -lpcreposix -lconfig -lcap > -/srv/storage/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/8.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-1/output-1/host/mipsel-buildroot-linux-uclibc/sysroot/usr/lib/libpcreposix.a(libpcreposix_la-pcreposix.o): in function `regfree': > -pcreposix.c:(.text+0x120): undefined reference to `pcre_free' > - > -So append -lpcre after -lpcreposix > - > -Fixes: > - - http://autobuild.buildroot.org/results/a601824fc0c205a6a940e0f9f079ce2c39840605 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/yrutschle/sslh/pull/280] > ---- > - Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index 986cf1c..ecadc22 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -43,7 +43,7 @@ endif > - > - ifneq ($(strip $(USELIBPCRE)),) > - CPPFLAGS+=-DLIBPCRE > -- LIBS:=$(LIBS) -lpcreposix > -+ LIBS:=$(LIBS) -lpcreposix -lpcre > - endif > - > - ifneq ($(strip $(USELIBCONFIG)),) > --- > -2.28.0 > - > diff --git a/package/sslh/Config.in b/package/sslh/Config.in > index f6b46f3218..a1d5211851 100644 > --- a/package/sslh/Config.in > +++ b/package/sslh/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_SSLH > bool "sslh" > depends on BR2_USE_MMU # fork() > select BR2_PACKAGE_LIBCONFIG if BR2_PACKAGE_SYSTEMD > + select BR2_PACKAGE_PCRE2 > help > Applicative protocol multiplexer > > diff --git a/package/sslh/sslh.hash b/package/sslh/sslh.hash > index 00e5c12d77..ae678563da 100644 > --- a/package/sslh/sslh.hash > +++ b/package/sslh/sslh.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 sslh-v1.21c.tar.gz > +sha256 8e3742d14edf4119350cfdc7bb96b89134d9218eb6d2a6e1f70891ca18a649b1 sslh-v1.22c.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk > index 4bde143cd8..99fb6bf922 100644 > --- a/package/sslh/sslh.mk > +++ b/package/sslh/sslh.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -SSLH_VERSION = 1.21c > +SSLH_VERSION = 1.22c > SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz > SSLH_SITE = http://www.rutschle.net/tech/sslh > SSLH_LICENSE = GPL-2.0+ > SSLH_LICENSE_FILES = COPYING > +SSLH_DEPENDENCIES = pcre2 > > SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) > > @@ -33,13 +34,6 @@ else > SSLH_MAKE_OPTS += USELIBCONFIG= > endif > > -ifeq ($(BR2_PACKAGE_PCRE),y) > -SSLH_DEPENDENCIES += pcre > -SSLH_MAKE_OPTS += USELIBPCRE=1 > -else > -SSLH_MAKE_OPTS += USELIBPCRE= > -endif > - > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > SSLH_DEPENDENCIES += systemd > SSLH_MAKE_OPTS += USESYSTEMD=1 > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd.kuhls at t-online.de Sat Jan 1 12:09:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 1 Jan 2022 13:09:20 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/vdr: enable musl/uclibc build Message-ID: <20220101120920.2809336-1-bernd.kuhls@t-online.de> Re-add patch 0001 to fix uClibc build, this patch was removed 2019: https://git.buildroot.net/buildroot/commit/?id=573d15b0790cfd2838cf0544ded79b415e20f5a7 Add two more patches from Alpine Linux to fix musl build. Add optional dependency to libexecinfo to provide execinfo.h. Depend on BR2_SYSTEM_ENABLE_NLS to have gettext being added as dependency to provide _nl_msg_cat_cntr() needed by i18n.c. Signed-off-by: Bernd Kuhls --- v3: rework nls/gettext dependencies (Thomas) v2: no changes package/vdr/0001-getloadavg.patch | 55 +++++++ package/vdr/0002-musl-compat.patch | 140 ++++++++++++++++++ package/vdr/0003-include-missing-limits.patch | 30 ++++ package/vdr/Config.in | 8 +- package/vdr/vdr.mk | 5 + 5 files changed, 234 insertions(+), 4 deletions(-) create mode 100644 package/vdr/0001-getloadavg.patch create mode 100644 package/vdr/0002-musl-compat.patch create mode 100644 package/vdr/0003-include-missing-limits.patch diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch new file mode 100644 index 0000000000..9e6316e284 --- /dev/null +++ b/package/vdr/0001-getloadavg.patch @@ -0,0 +1,55 @@ +Fix compilation with uClibc + +Ported from +https://github.com/stschake/buildroot-grasshopper/blob/master/package/torsmo/torsmo-0.18-uclibc-getloadavg.patch + +Signed-off-by: Bernd Kuhls + +diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +--- vdr-2.3.1.org/skinlcars.c 2015-09-01 12:07:07.000000000 +0200 ++++ vdr-2.3.1/skinlcars.c 2016-07-31 21:00:11.000000000 +0200 +@@ -1100,6 +1100,44 @@ + } + } + ++/* uclibc and dietlibc do not have this junk -ReneR */ ++#if defined (__UCLIBC__) || defined (__dietlibc__) ++static int getloadavg (double loadavg[], int nelem) ++{ ++ int fd; ++ ++ fd = open ("/proc/loadavg", O_RDONLY); ++ if (fd < 0) ++ return -1; ++ else ++ { ++ char buf[65], *p; ++ ssize_t nread; ++ int i; ++ ++ nread = read (fd, buf, sizeof buf - 1); ++ close (fd); ++ if (nread <= 0) ++ return -1; ++ buf[nread - 1] = '\0'; ++ ++ if (nelem > 3) ++ nelem = 3; ++ p = buf; ++ for (i = 0; i < nelem; ++i) ++ { ++ char *endp; ++ loadavg[i] = strtod (p, &endp); ++ if (endp == p) ++ return -1; ++ p = endp; ++ } ++ ++ return i; ++ } ++} ++#endif ++ + void cSkinLCARSDisplayMenu::DrawLoad(void) + { + if (yb04) { diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-musl-compat.patch new file mode 100644 index 0000000000..b6f8f414a9 --- /dev/null +++ b/package/vdr/0002-musl-compat.patch @@ -0,0 +1,140 @@ +Fix musl build + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch + +Signed-off-by: Bernd Kuhls + +diff --git a/i18n.h b/i18n.h +index f8ad9de..b002bbf 100644 +--- a/i18n.h ++++ b/i18n.h +@@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); + ///< have an actual locale installed. The rest are just dummy entries + ///< to allow having three letter language codes for other languages + ///< that have no actual locale on this system. +-const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1); ++const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute__((__format_arg__ (1))); + ///< Translates the given string (with optional Plugin context) into + ///< the current language. If no translation is available, the original + ///< string will be returned. +diff --git a/osd.c b/osd.c +index 524700a..ef975f5 100644 +--- a/osd.c ++++ b/osd.c +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include "device.h" + #include "tools.h" + +diff --git a/thread.c b/thread.c +index 47eb977..58dba43 100644 +--- a/thread.c ++++ b/thread.c +@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) + writeLockThreadId = 0; + pthread_rwlockattr_t attr; + pthread_rwlockattr_init(&attr); ++#if defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP); ++#endif + pthread_rwlock_init(&rwlock, &attr); + } + +@@ -205,7 +207,7 @@ cMutex::cMutex(void) + locked = 0; + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); + pthread_mutex_init(&mutex, &attr); + } + +diff --git a/tools.c b/tools.c +index 754673d..fef9d2d 100644 +--- a/tools.c ++++ b/tools.c +@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) + { + if (!FileName) + return NULL; +- char *TargetName = canonicalize_file_name(FileName); ++ char *TargetName = realpath(FileName, NULL); + if (!TargetName) { + if (errno == ENOENT) // file doesn't exist + TargetName = strdup(FileName); +@@ -1528,7 +1528,7 @@ + struct dirent *cReadDir::Next(void) + { + if (directory) { +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + while (readdir_r(directory, &u.d, &result) == 0 && result) { + #else + while ((result = readdir(directory)) != NULL) { +diff --git a/tools.h b/tools.h +index 73cca5a..03f5fd1 100644 +--- a/tools.h ++++ b/tools.h +@@ -28,6 +28,16 @@ + #include + #include "thread.h" + ++#ifndef ACCESSPERMS ++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++#ifndef ALLPERMS ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ ++#endif ++#ifndef DEFFILEMODE ++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ ++#endif ++ + typedef unsigned char uchar; + + extern int SysLogLevel; +@@ -400,7 +410,7 @@ + private: + DIR *directory; + struct dirent *result; +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + union { // according to "The GNU C Library Reference Manual" + struct dirent d; + char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; +@@ -738,7 +748,7 @@ public: + data[i] = T(0); + size = 0; + } +- void Sort(__compar_fn_t Compare) ++ void Sort(int (*Compare)(const void *, const void *)) + { + qsort(data, size, sizeof(T), Compare); + } +diff --git a/vdr.c b/vdr.c +index 8a49471..c2a82aa 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) + } + } + else if (Terminal) { ++#ifdef __GLIBC__ + // Claim new controlling terminal + stdin = freopen(Terminal, "r", stdin); + stdout = freopen(Terminal, "w", stdout); + stderr = freopen(Terminal, "w", stderr); + HasStdin = true; + tcgetattr(STDIN_FILENO, &savedTm); ++#else ++ // stdin, stdout, stderr are declared FILE const* by musl C library ++ fprintf(stderr, "Option '-t' is only supported if VDR has been built against glibc.\n"); ++ return 2; ++#endif + } + + isyslog("VDR version %s started", VDRVERSION); diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch new file mode 100644 index 0000000000..c2efe291e6 --- /dev/null +++ b/package/vdr/0003-include-missing-limits.patch @@ -0,0 +1,30 @@ +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Signed-off-by: Bernd Kuhls +---- + +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + diff --git a/package/vdr/Config.in b/package/vdr/Config.in index df602f26d6..1f9187ce6c 100644 --- a/package/vdr/Config.in +++ b/package/vdr/Config.in @@ -2,25 +2,25 @@ config BR2_PACKAGE_VDR bool "vdr" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_SYSTEM_ENABLE_NLS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBCAP - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC help This project describes how to build your own digital satellite receiver and Video Disk Recorder. http://www.tvdr.de -comment "vdr needs a glibc toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9" +comment "vdr needs a toolchain w/ C++, dynamic library, NLS, NPTL, wchar, headers >= 3.9" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_USE_WCHAR || \ + !BR2_SYSTEM_ENABLE_NLS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 51affe5a7b..bb7b1e22c0 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -26,6 +26,11 @@ VDR_MAKE_FLAGS = \ VIDEODIR=/var/lib/vdr VDR_LDFLAGS = $(TARGET_NLS_LIBS) +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +VDR_DEPENDENCIES += libexecinfo +VDR_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) VDR_DEPENDENCIES += libfribidi VDR_MAKE_FLAGS += BIDI=1 -- 2.30.2 From troglobit at gmail.com Sat Jan 1 12:19:54 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Sat, 01 Jan 2022 13:19:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/dhcpcd: add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP In-Reply-To: <20210305111048.1902558-1-fontaine.fabrice@gmail.com> References: <20210305111048.1902558-1-fontaine.fabrice@gmail.com> Message-ID: <87mtkf1wd1.fsf@gmail.com> On Fri, Mar 05, 2021 at 12:10, Fabrice Fontaine wrote: > Add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP following Arnout feedback: > https://patchwork.ozlabs.org/project/buildroot/patch/20210303091904.467706-1-fontaine.fabrice at gmail.com > > Signed-off-by: Fabrice Fontaine Looks good to me, much cleaner than what we have now. Reviewed-by: Joachim Wiberg From troglobit at gmail.com Sat Jan 1 12:28:15 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Sat, 01 Jan 2022 13:28:15 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled In-Reply-To: <20210321135842.1165539-1-fontaine.fabrice@gmail.com> References: <20210321135842.1165539-1-fontaine.fabrice@gmail.com> Message-ID: <87k0fj1vz4.fsf@gmail.com> On Sun, Mar 21, 2021 at 14:58, Fabrice Fontaine wrote: > Following the bump to 8.1910.0, items requiring libcurl were > disabled by default. This patch selectively enables options > which depend on libcurl when that package is enabled in the > build. > > Signed-off-by: Matthew Weber > [Fabrice: Disable mmkubernetes which also depends on lognorm and while > at it also disable mmnormalize which is available since version 6.1.2 > (from 2010) and > https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf] > Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg From yann.morin.1998 at free.fr Sat Jan 1 13:02:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:02:41 +0100 Subject: [Buildroot] [git commit] package/dhcpcd: add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP Message-ID: <20220101125821.B0DFC82901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20dd9453f32c9898ae4a0dc482bbb0a21853090c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP following Arnout feedback: https://patchwork.ozlabs.org/project/buildroot/patch/20210303091904.467706-1-fontaine.fabrice at gmail.com Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/dhcpcd/Config.in | 19 +++++++++++++++++++ package/dhcpcd/dhcpcd.mk | 22 ++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in index ece08d2c96..3ebacb3ba2 100644 --- a/package/dhcpcd/Config.in +++ b/package/dhcpcd/Config.in @@ -8,3 +8,22 @@ config BR2_PACKAGE_DHCPCD An RFC2131 compliant DHCP client http://roy.marples.name/projects/dhcpcd/ + +if BR2_PACKAGE_DHCPCD + +config BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP + bool + default y + depends on BR2_USE_MMU + # Audit headers were only added in recent kernels for some arches + depends on !(BR2_arceb || BR2_arcle) || \ + BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + depends on !(BR2_microblazeel || BR2_microblazebe) || \ + BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + depends on !BR2_nds32 || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + depends on !BR2_nios2 || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + depends on !BR2_or1k || BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + depends on !BR2_sh || BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + depends on !BR2_xtensa || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + +endif diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index ebe6941646..922d289b26 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -17,23 +17,9 @@ DHCPCD_CONFIG_OPTS = \ --os=linux \ --privsepuser=dhcpcd -# AUDIT_ARCH_{OPENRISC,SH,SHEL,SH64,SHEL64} are only available with kernel >= 3.7 -ifeq ($(BR2_or1k)$(BR2_sh):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7),y:) -DHCPCD_CONFIG_OPTS += --disable-privsep -endif - -# AUDIT_ARCH_MICROBLAZE is only available with kernel >= 3.18 -ifeq ($(BR2_microblazeel)$(BR2_microblazebe):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18),y:) -DHCPCD_CONFIG_OPTS += --disable-privsep -endif - -# AUDIT_ARCH_XTENSA is only available with kernel >= 5.0 -ifeq ($(BR2_xtensa):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y:) -DHCPCD_CONFIG_OPTS += --disable-privsep -endif - -# AUDIT_ARCH_{ARCOMPACT,ARCV2,NDS32,NIOS2} are only available with kernel >= 5.2 -ifeq ($(BR2_arceb)$(BR2_arcle)$(BR2_nds32)$(BR2_nios2):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2),y:) +ifeq ($(BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP),y) +DHCPCD_CONFIG_OPTS += --enable-privsep +else DHCPCD_CONFIG_OPTS += --disable-privsep endif @@ -49,7 +35,7 @@ DHCPCD_CONFIG_OPTS += --enable-static endif ifeq ($(BR2_USE_MMU),) -DHCPCD_CONFIG_OPTS += --disable-fork --disable-privsep +DHCPCD_CONFIG_OPTS += --disable-fork endif define DHCPCD_CONFIGURE_CMDS From yann.morin.1998 at free.fr Sat Jan 1 13:04:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:04:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/dhcpcd: add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP In-Reply-To: <87mtkf1wd1.fsf@gmail.com> References: <20210305111048.1902558-1-fontaine.fabrice@gmail.com> <87mtkf1wd1.fsf@gmail.com> Message-ID: <20220101130407.GG3390456@scaer> Fabrice, All, On 2022-01-01 13:19 +0100, Joachim Wiberg spake thusly: > On Fri, Mar 05, 2021 at 12:10, Fabrice Fontaine wrote: > > Add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP following Arnout feedback: > > https://patchwork.ozlabs.org/project/buildroot/patch/20210303091904.467706-1-fontaine.fabrice at gmail.com > > > > Signed-off-by: Fabrice Fontaine > > Looks good to me, much cleaner than what we have now. > > Reviewed-by: Joachim Wiberg Applied to master, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 13:06:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:06:14 +0100 Subject: [Buildroot] [git commit] package/rsyslog: enable options when libcurl is enabled Message-ID: <20220101130033.D31538261A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e644e5df39c4d63ce7ae28ce2d02bfbf2a230cff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Following the bump to 8.1910.0, items requiring libcurl were disabled by default. This patch selectively enables options which depend on libcurl when that package is enabled in the build. Signed-off-by: Matthew Weber [Fabrice: Disable mmkubernetes which also depends on lognorm and while at it also disable mmnormalize which is available since version 6.1.2 (from 2010) and https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf] Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/rsyslog/rsyslog.mk | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 6cf53ccb82..afd1a5557e 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -28,14 +28,29 @@ endif RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) -# Disable items requiring libcurl -RSYSLOG_CONF_OPTS += --disable-elasticsearch \ +# Disable items requiring lognorm +RSYSLOG_CONF_OPTS += \ + --disable-mmkubernetes \ + --disable-mmnormalize + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +RSYSLOG_DEPENDENCIES += libcurl +RSYSLOG_CONF_OPTS += \ + --enable-clickhouse \ + --enable-elasticsearch \ + --enable-fmhttp \ + --enable-imdocker \ + --enable-omhttp \ + --enable-omhttpfs +else +RSYSLOG_CONF_OPTS += \ --disable-clickhouse \ - --disable-omhttp \ + --disable-elasticsearch \ --disable-fmhttp \ --disable-imdocker \ - --disable-omhttpfs \ - --disable-mmkubernetes + --disable-omhttp \ + --disable-omhttpfs +endif ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) RSYSLOG_DEPENDENCIES += civetweb From yann.morin.1998 at free.fr Sat Jan 1 13:08:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:08:09 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled In-Reply-To: <87k0fj1vz4.fsf@gmail.com> References: <20210321135842.1165539-1-fontaine.fabrice@gmail.com> <87k0fj1vz4.fsf@gmail.com> Message-ID: <20220101130809.GH3390456@scaer> Fabrice, All, On 2022-01-01 13:28 +0100, Joachim Wiberg spake thusly: > On Sun, Mar 21, 2021 at 14:58, Fabrice Fontaine wrote: > > Following the bump to 8.1910.0, items requiring libcurl were > > disabled by default. This patch selectively enables options > > which depend on libcurl when that package is enabled in the > > build. > > > > Signed-off-by: Matthew Weber > > [Fabrice: Disable mmkubernetes which also depends on lognorm and while > > at it also disable mmnormalize which is available since version 6.1.2 > > (from 2010) and > > https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf] > > Signed-off-by: Fabrice Fontaine > > Reviewed-by: Joachim Wiberg Applied to master, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 13:27:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:27:17 +0100 Subject: [Buildroot] [git commit] package/makedevs: allow recursive on directory with dangling symlinks Message-ID: <20220101132341.5942981DD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e745c0b92db3db7008d066813e2529d2032986c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When using BR2_ROOTFS_DEVICE_TABLE to change ownership of /etc, like so: /etc r -1 root wheel - - - - - makedevs fails due to trying to chown() a dangling symlink: makedevs: chown failed for /src/myLinux/output/build/buildroot-fs/ext2/target/etc/mtab: No such file or directory makedevs: line 25: recursive failed for /src/myLinux/output/build/buildroot-fs/ext2/target/etc: No such file or directory make[2]: *** [fs/ext2/ext2.mk:63: /src/myLinux/output/images/rootfs.ext2] Error 1 make[1]: *** [Makefile:84: _all] Error 2 make[1]: Leaving directory '/src/myLinux/buildroot' This patch changes chown() to lchown() in two cases in makedevs.c when the argument can be a symlink, dangling or not. In case the recursive operation includes a chmod() as well, explicitly exclude symlinks that are dangling, because chmod() always operates on the link target. Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/makedevs/makedevs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index c57b964f5c..2796cd5e78 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -440,11 +440,13 @@ void bb_show_usage(void) int bb_recursive(const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf){ - if (chown(fpath, recursive_uid, recursive_gid) == -1) { + if (lchown(fpath, recursive_uid, recursive_gid) == -1) { bb_perror_msg("chown failed for %s", fpath); return -1; } - if (recursive_mode != -1) { + + /* chmod() is optional, also skip if dangling symlink */ + if (recursive_mode != -1 && tflag == FTW_SL && access(fpath, F_OK)) { if (chmod(fpath, recursive_mode) < 0) { bb_perror_msg("chmod failed for %s", fpath); return -1; @@ -628,7 +630,7 @@ int main(int argc, char **argv) if (mknod(full_name_inc, mode, rdev) < 0) { bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc); ret = EXIT_FAILURE; - } else if (chown(full_name_inc, uid, gid) < 0) { + } else if (lchown(full_name_inc, uid, gid) < 0) { bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc); ret = EXIT_FAILURE; } else if (chmod(full_name_inc, mode) < 0) { From yann.morin.1998 at free.fr Sat Jan 1 13:32:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:32:18 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/makedevs: allow recursive on directory with dangling symlinks In-Reply-To: <20211223090800.1716321-2-troglobit@gmail.com> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-2-troglobit@gmail.com> Message-ID: <20220101133218.GI3390456@scaer> Joachim, All, On 2021-12-23 10:07 +0100, Joachim Wiberg spake thusly: > When using BR2_ROOTFS_DEVICE_TABLE to change ownership of /etc, like so: > > /etc r -1 root wheel - - - - - > > makdevs fails due to it trying to chown() a dangling symlink: *makedevs *its (really "its", and really not "it's") Applied to master, thanks. Regards, Yann E. MORIN. > makedevs: chown failed for /src/myLinux/output/build/buildroot-fs/ext2/target/etc/mtab: No such file or directory > makedevs: line 25: recursive failed for /src/myLinux/output/build/buildroot-fs/ext2/target/etc: No such file or directory > make[2]: *** [fs/ext2/ext2.mk:63: /src/myLinux/output/images/rootfs.ext2] Error 1 > make[1]: *** [Makefile:84: _all] Error 2 > make[1]: Leaving directory '/src/myLinux/buildroot' > > This patch changes chown() to lchown() in two cases in makedevs.c when > the argument can be a symlink, dangling or not. > > In case the recursive operation includes a chmod() as well, explicitly > exclude symlinks that are dangling, because chmod() always operates on > the link target. > > Signed-off-by: Joachim Wiberg > --- > package/makedevs/makedevs.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c > index c57b964f5c..2796cd5e78 100644 > --- a/package/makedevs/makedevs.c > +++ b/package/makedevs/makedevs.c > @@ -440,11 +440,13 @@ void bb_show_usage(void) > int bb_recursive(const char *fpath, const struct stat *sb, > int tflag, struct FTW *ftwbuf){ > > - if (chown(fpath, recursive_uid, recursive_gid) == -1) { > + if (lchown(fpath, recursive_uid, recursive_gid) == -1) { > bb_perror_msg("chown failed for %s", fpath); > return -1; > } > - if (recursive_mode != -1) { > + > + /* chmod() is optional, also skip if dangling symlink */ > + if (recursive_mode != -1 && tflag == FTW_SL && access(fpath, F_OK)) { > if (chmod(fpath, recursive_mode) < 0) { > bb_perror_msg("chmod failed for %s", fpath); > return -1; > @@ -628,7 +630,7 @@ int main(int argc, char **argv) > if (mknod(full_name_inc, mode, rdev) < 0) { > bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc); > ret = EXIT_FAILURE; > - } else if (chown(full_name_inc, uid, gid) < 0) { > + } else if (lchown(full_name_inc, uid, gid) < 0) { > bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc); > ret = EXIT_FAILURE; > } else if (chmod(full_name_inc, mode) < 0) { > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 13:58:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:58:30 +0100 Subject: [Buildroot] [PATCH v3 2/3] .clang-format: initial import from Linux 5.15.6 In-Reply-To: <20211223090800.1716321-3-troglobit@gmail.com> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-3-troglobit@gmail.com> Message-ID: <20220101135830.GA2777@scaer> Joachim, All, On 2021-12-23 10:07 +0100, Joachim Wiberg spake thusly: > Intended as an aid when working with in-tree C files, like makdevs.c > > Notice max number of columns is set to 80, despite the LKML discussion > to not enforce this limit in checkpatch.pl, see [1] for details, hence > use with care and perhaps try to avoid unnecessary line breaks. In Buldroot, we have already settled down for 132 columns: # grep max .flake8 max-line-length=132 so I would say that we would want to use 132 for C-style code too. Applied to master with the above change, thanks. Regards, Yann E. MORIN. > [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bdc48fa11e46f867ea4d75fa59ee87a7f48be144 > > Signed-off-by: Joachim Wiberg > --- > .clang-format | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 566 insertions(+) > create mode 100644 .clang-format > > diff --git a/.clang-format b/.clang-format > new file mode 100644 > index 0000000000..91b92e97e5 > --- /dev/null > +++ b/.clang-format > @@ -0,0 +1,566 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# clang-format configuration file. Intended for clang-format >= 4. > +# > +# For more information, see: > +# > +# Documentation/process/clang-format.rst > +# https://clang.llvm.org/docs/ClangFormat.html > +# https://clang.llvm.org/docs/ClangFormatStyleOptions.html > +# > + > +# Buildroot: imported unmodified from Linux 5.15.6 -- please note, > +# this is not enforced at the moment. Intended as an aid > +# when working with in-tree C files, like makedevs.c > +# > +--- > +AccessModifierOffset: -4 > +AlignAfterOpenBracket: Align > +AlignConsecutiveAssignments: false > +AlignConsecutiveDeclarations: false > +#AlignEscapedNewlines: Left # Unknown to clang-format-4.0 > +AlignOperands: true > +AlignTrailingComments: false > +AllowAllParametersOfDeclarationOnNextLine: false > +AllowShortBlocksOnASingleLine: false > +AllowShortCaseLabelsOnASingleLine: false > +AllowShortFunctionsOnASingleLine: None > +AllowShortIfStatementsOnASingleLine: false > +AllowShortLoopsOnASingleLine: false > +AlwaysBreakAfterDefinitionReturnType: None > +AlwaysBreakAfterReturnType: None > +AlwaysBreakBeforeMultilineStrings: false > +AlwaysBreakTemplateDeclarations: false > +BinPackArguments: true > +BinPackParameters: true > +BraceWrapping: > + AfterClass: false > + AfterControlStatement: false > + AfterEnum: false > + AfterFunction: true > + AfterNamespace: true > + AfterObjCDeclaration: false > + AfterStruct: false > + AfterUnion: false > + #AfterExternBlock: false # Unknown to clang-format-5.0 > + BeforeCatch: false > + BeforeElse: false > + IndentBraces: false > + #SplitEmptyFunction: true # Unknown to clang-format-4.0 > + #SplitEmptyRecord: true # Unknown to clang-format-4.0 > + #SplitEmptyNamespace: true # Unknown to clang-format-4.0 > +BreakBeforeBinaryOperators: None > +BreakBeforeBraces: Custom > +#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0 > +BreakBeforeTernaryOperators: false > +BreakConstructorInitializersBeforeComma: false > +#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0 > +BreakAfterJavaFieldAnnotations: false > +BreakStringLiterals: false > +ColumnLimit: 80 > +CommentPragmas: '^ IWYU pragma:' > +#CompactNamespaces: false # Unknown to clang-format-4.0 > +ConstructorInitializerAllOnOneLineOrOnePerLine: false > +ConstructorInitializerIndentWidth: 8 > +ContinuationIndentWidth: 8 > +Cpp11BracedListStyle: false > +DerivePointerAlignment: false > +DisableFormat: false > +ExperimentalAutoDetectBinPacking: false > +#FixNamespaceComments: false # Unknown to clang-format-4.0 > + > +# Taken from: > +# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \ > +# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \ > +# | sort | uniq > +ForEachMacros: > + - 'apei_estatus_for_each_section' > + - 'ata_for_each_dev' > + - 'ata_for_each_link' > + - '__ata_qc_for_each' > + - 'ata_qc_for_each' > + - 'ata_qc_for_each_raw' > + - 'ata_qc_for_each_with_internal' > + - 'ax25_for_each' > + - 'ax25_uid_for_each' > + - '__bio_for_each_bvec' > + - 'bio_for_each_bvec' > + - 'bio_for_each_bvec_all' > + - 'bio_for_each_integrity_vec' > + - '__bio_for_each_segment' > + - 'bio_for_each_segment' > + - 'bio_for_each_segment_all' > + - 'bio_list_for_each' > + - 'bip_for_each_vec' > + - 'bitmap_for_each_clear_region' > + - 'bitmap_for_each_set_region' > + - 'blkg_for_each_descendant_post' > + - 'blkg_for_each_descendant_pre' > + - 'blk_queue_for_each_rl' > + - 'bond_for_each_slave' > + - 'bond_for_each_slave_rcu' > + - 'bpf_for_each_spilled_reg' > + - 'btree_for_each_safe128' > + - 'btree_for_each_safe32' > + - 'btree_for_each_safe64' > + - 'btree_for_each_safel' > + - 'card_for_each_dev' > + - 'cgroup_taskset_for_each' > + - 'cgroup_taskset_for_each_leader' > + - 'cpufreq_for_each_entry' > + - 'cpufreq_for_each_entry_idx' > + - 'cpufreq_for_each_valid_entry' > + - 'cpufreq_for_each_valid_entry_idx' > + - 'css_for_each_child' > + - 'css_for_each_descendant_post' > + - 'css_for_each_descendant_pre' > + - 'device_for_each_child_node' > + - 'displayid_iter_for_each' > + - 'dma_fence_chain_for_each' > + - 'do_for_each_ftrace_op' > + - 'drm_atomic_crtc_for_each_plane' > + - 'drm_atomic_crtc_state_for_each_plane' > + - 'drm_atomic_crtc_state_for_each_plane_state' > + - 'drm_atomic_for_each_plane_damage' > + - 'drm_client_for_each_connector_iter' > + - 'drm_client_for_each_modeset' > + - 'drm_connector_for_each_possible_encoder' > + - 'drm_for_each_bridge_in_chain' > + - 'drm_for_each_connector_iter' > + - 'drm_for_each_crtc' > + - 'drm_for_each_crtc_reverse' > + - 'drm_for_each_encoder' > + - 'drm_for_each_encoder_mask' > + - 'drm_for_each_fb' > + - 'drm_for_each_legacy_plane' > + - 'drm_for_each_plane' > + - 'drm_for_each_plane_mask' > + - 'drm_for_each_privobj' > + - 'drm_mm_for_each_hole' > + - 'drm_mm_for_each_node' > + - 'drm_mm_for_each_node_in_range' > + - 'drm_mm_for_each_node_safe' > + - 'flow_action_for_each' > + - 'for_each_acpi_dev_match' > + - 'for_each_active_dev_scope' > + - 'for_each_active_drhd_unit' > + - 'for_each_active_iommu' > + - 'for_each_aggr_pgid' > + - 'for_each_available_child_of_node' > + - 'for_each_bio' > + - 'for_each_board_func_rsrc' > + - 'for_each_bvec' > + - 'for_each_card_auxs' > + - 'for_each_card_auxs_safe' > + - 'for_each_card_components' > + - 'for_each_card_dapms' > + - 'for_each_card_pre_auxs' > + - 'for_each_card_prelinks' > + - 'for_each_card_rtds' > + - 'for_each_card_rtds_safe' > + - 'for_each_card_widgets' > + - 'for_each_card_widgets_safe' > + - 'for_each_cgroup_storage_type' > + - 'for_each_child_of_node' > + - 'for_each_clear_bit' > + - 'for_each_clear_bit_from' > + - 'for_each_cmsghdr' > + - 'for_each_compatible_node' > + - 'for_each_component_dais' > + - 'for_each_component_dais_safe' > + - 'for_each_comp_order' > + - 'for_each_console' > + - 'for_each_cpu' > + - 'for_each_cpu_and' > + - 'for_each_cpu_not' > + - 'for_each_cpu_wrap' > + - 'for_each_dapm_widgets' > + - 'for_each_dev_addr' > + - 'for_each_dev_scope' > + - 'for_each_dma_cap_mask' > + - 'for_each_dpcm_be' > + - 'for_each_dpcm_be_rollback' > + - 'for_each_dpcm_be_safe' > + - 'for_each_dpcm_fe' > + - 'for_each_drhd_unit' > + - 'for_each_dss_dev' > + - 'for_each_dtpm_table' > + - 'for_each_efi_memory_desc' > + - 'for_each_efi_memory_desc_in_map' > + - 'for_each_element' > + - 'for_each_element_extid' > + - 'for_each_element_id' > + - 'for_each_endpoint_of_node' > + - 'for_each_evictable_lru' > + - 'for_each_fib6_node_rt_rcu' > + - 'for_each_fib6_walker_rt' > + - 'for_each_free_mem_pfn_range_in_zone' > + - 'for_each_free_mem_pfn_range_in_zone_from' > + - 'for_each_free_mem_range' > + - 'for_each_free_mem_range_reverse' > + - 'for_each_func_rsrc' > + - 'for_each_hstate' > + - 'for_each_if' > + - 'for_each_iommu' > + - 'for_each_ip_tunnel_rcu' > + - 'for_each_irq_nr' > + - 'for_each_link_codecs' > + - 'for_each_link_cpus' > + - 'for_each_link_platforms' > + - 'for_each_lru' > + - 'for_each_matching_node' > + - 'for_each_matching_node_and_match' > + - 'for_each_member' > + - 'for_each_memcg_cache_index' > + - 'for_each_mem_pfn_range' > + - '__for_each_mem_range' > + - 'for_each_mem_range' > + - '__for_each_mem_range_rev' > + - 'for_each_mem_range_rev' > + - 'for_each_mem_region' > + - 'for_each_migratetype_order' > + - 'for_each_msi_entry' > + - 'for_each_msi_entry_safe' > + - 'for_each_msi_vector' > + - 'for_each_net' > + - 'for_each_net_continue_reverse' > + - 'for_each_netdev' > + - 'for_each_netdev_continue' > + - 'for_each_netdev_continue_rcu' > + - 'for_each_netdev_continue_reverse' > + - 'for_each_netdev_feature' > + - 'for_each_netdev_in_bond_rcu' > + - 'for_each_netdev_rcu' > + - 'for_each_netdev_reverse' > + - 'for_each_netdev_safe' > + - 'for_each_net_rcu' > + - 'for_each_new_connector_in_state' > + - 'for_each_new_crtc_in_state' > + - 'for_each_new_mst_mgr_in_state' > + - 'for_each_new_plane_in_state' > + - 'for_each_new_private_obj_in_state' > + - 'for_each_node' > + - 'for_each_node_by_name' > + - 'for_each_node_by_type' > + - 'for_each_node_mask' > + - 'for_each_node_state' > + - 'for_each_node_with_cpus' > + - 'for_each_node_with_property' > + - 'for_each_nonreserved_multicast_dest_pgid' > + - 'for_each_of_allnodes' > + - 'for_each_of_allnodes_from' > + - 'for_each_of_cpu_node' > + - 'for_each_of_pci_range' > + - 'for_each_old_connector_in_state' > + - 'for_each_old_crtc_in_state' > + - 'for_each_old_mst_mgr_in_state' > + - 'for_each_oldnew_connector_in_state' > + - 'for_each_oldnew_crtc_in_state' > + - 'for_each_oldnew_mst_mgr_in_state' > + - 'for_each_oldnew_plane_in_state' > + - 'for_each_oldnew_plane_in_state_reverse' > + - 'for_each_oldnew_private_obj_in_state' > + - 'for_each_old_plane_in_state' > + - 'for_each_old_private_obj_in_state' > + - 'for_each_online_cpu' > + - 'for_each_online_node' > + - 'for_each_online_pgdat' > + - 'for_each_pci_bridge' > + - 'for_each_pci_dev' > + - 'for_each_pci_msi_entry' > + - 'for_each_pcm_streams' > + - 'for_each_physmem_range' > + - 'for_each_populated_zone' > + - 'for_each_possible_cpu' > + - 'for_each_present_cpu' > + - 'for_each_prime_number' > + - 'for_each_prime_number_from' > + - 'for_each_process' > + - 'for_each_process_thread' > + - 'for_each_prop_codec_conf' > + - 'for_each_prop_dai_codec' > + - 'for_each_prop_dai_cpu' > + - 'for_each_prop_dlc_codecs' > + - 'for_each_prop_dlc_cpus' > + - 'for_each_prop_dlc_platforms' > + - 'for_each_property_of_node' > + - 'for_each_registered_fb' > + - 'for_each_requested_gpio' > + - 'for_each_requested_gpio_in_range' > + - 'for_each_reserved_mem_range' > + - 'for_each_reserved_mem_region' > + - 'for_each_rtd_codec_dais' > + - 'for_each_rtd_components' > + - 'for_each_rtd_cpu_dais' > + - 'for_each_rtd_dais' > + - 'for_each_set_bit' > + - 'for_each_set_bit_from' > + - 'for_each_set_clump8' > + - 'for_each_sg' > + - 'for_each_sg_dma_page' > + - 'for_each_sg_page' > + - 'for_each_sgtable_dma_page' > + - 'for_each_sgtable_dma_sg' > + - 'for_each_sgtable_page' > + - 'for_each_sgtable_sg' > + - 'for_each_sibling_event' > + - 'for_each_subelement' > + - 'for_each_subelement_extid' > + - 'for_each_subelement_id' > + - '__for_each_thread' > + - 'for_each_thread' > + - 'for_each_unicast_dest_pgid' > + - 'for_each_vsi' > + - 'for_each_wakeup_source' > + - 'for_each_zone' > + - 'for_each_zone_zonelist' > + - 'for_each_zone_zonelist_nodemask' > + - 'fwnode_for_each_available_child_node' > + - 'fwnode_for_each_child_node' > + - 'fwnode_graph_for_each_endpoint' > + - 'gadget_for_each_ep' > + - 'genradix_for_each' > + - 'genradix_for_each_from' > + - 'hash_for_each' > + - 'hash_for_each_possible' > + - 'hash_for_each_possible_rcu' > + - 'hash_for_each_possible_rcu_notrace' > + - 'hash_for_each_possible_safe' > + - 'hash_for_each_rcu' > + - 'hash_for_each_safe' > + - 'hctx_for_each_ctx' > + - 'hlist_bl_for_each_entry' > + - 'hlist_bl_for_each_entry_rcu' > + - 'hlist_bl_for_each_entry_safe' > + - 'hlist_for_each' > + - 'hlist_for_each_entry' > + - 'hlist_for_each_entry_continue' > + - 'hlist_for_each_entry_continue_rcu' > + - 'hlist_for_each_entry_continue_rcu_bh' > + - 'hlist_for_each_entry_from' > + - 'hlist_for_each_entry_from_rcu' > + - 'hlist_for_each_entry_rcu' > + - 'hlist_for_each_entry_rcu_bh' > + - 'hlist_for_each_entry_rcu_notrace' > + - 'hlist_for_each_entry_safe' > + - 'hlist_for_each_entry_srcu' > + - '__hlist_for_each_rcu' > + - 'hlist_for_each_safe' > + - 'hlist_nulls_for_each_entry' > + - 'hlist_nulls_for_each_entry_from' > + - 'hlist_nulls_for_each_entry_rcu' > + - 'hlist_nulls_for_each_entry_safe' > + - 'i3c_bus_for_each_i2cdev' > + - 'i3c_bus_for_each_i3cdev' > + - 'ide_host_for_each_port' > + - 'ide_port_for_each_dev' > + - 'ide_port_for_each_present_dev' > + - 'idr_for_each_entry' > + - 'idr_for_each_entry_continue' > + - 'idr_for_each_entry_continue_ul' > + - 'idr_for_each_entry_ul' > + - 'in_dev_for_each_ifa_rcu' > + - 'in_dev_for_each_ifa_rtnl' > + - 'inet_bind_bucket_for_each' > + - 'inet_lhash2_for_each_icsk_rcu' > + - 'key_for_each' > + - 'key_for_each_safe' > + - 'klp_for_each_func' > + - 'klp_for_each_func_safe' > + - 'klp_for_each_func_static' > + - 'klp_for_each_object' > + - 'klp_for_each_object_safe' > + - 'klp_for_each_object_static' > + - 'kunit_suite_for_each_test_case' > + - 'kvm_for_each_memslot' > + - 'kvm_for_each_vcpu' > + - 'list_for_each' > + - 'list_for_each_codec' > + - 'list_for_each_codec_safe' > + - 'list_for_each_continue' > + - 'list_for_each_entry' > + - 'list_for_each_entry_continue' > + - 'list_for_each_entry_continue_rcu' > + - 'list_for_each_entry_continue_reverse' > + - 'list_for_each_entry_from' > + - 'list_for_each_entry_from_rcu' > + - 'list_for_each_entry_from_reverse' > + - 'list_for_each_entry_lockless' > + - 'list_for_each_entry_rcu' > + - 'list_for_each_entry_reverse' > + - 'list_for_each_entry_safe' > + - 'list_for_each_entry_safe_continue' > + - 'list_for_each_entry_safe_from' > + - 'list_for_each_entry_safe_reverse' > + - 'list_for_each_entry_srcu' > + - 'list_for_each_prev' > + - 'list_for_each_prev_safe' > + - 'list_for_each_safe' > + - 'llist_for_each' > + - 'llist_for_each_entry' > + - 'llist_for_each_entry_safe' > + - 'llist_for_each_safe' > + - 'mci_for_each_dimm' > + - 'media_device_for_each_entity' > + - 'media_device_for_each_intf' > + - 'media_device_for_each_link' > + - 'media_device_for_each_pad' > + - 'nanddev_io_for_each_page' > + - 'netdev_for_each_lower_dev' > + - 'netdev_for_each_lower_private' > + - 'netdev_for_each_lower_private_rcu' > + - 'netdev_for_each_mc_addr' > + - 'netdev_for_each_uc_addr' > + - 'netdev_for_each_upper_dev_rcu' > + - 'netdev_hw_addr_list_for_each' > + - 'nft_rule_for_each_expr' > + - 'nla_for_each_attr' > + - 'nla_for_each_nested' > + - 'nlmsg_for_each_attr' > + - 'nlmsg_for_each_msg' > + - 'nr_neigh_for_each' > + - 'nr_neigh_for_each_safe' > + - 'nr_node_for_each' > + - 'nr_node_for_each_safe' > + - 'of_for_each_phandle' > + - 'of_property_for_each_string' > + - 'of_property_for_each_u32' > + - 'pci_bus_for_each_resource' > + - 'pcl_for_each_chunk' > + - 'pcl_for_each_segment' > + - 'pcm_for_each_format' > + - 'ping_portaddr_for_each_entry' > + - 'plist_for_each' > + - 'plist_for_each_continue' > + - 'plist_for_each_entry' > + - 'plist_for_each_entry_continue' > + - 'plist_for_each_entry_safe' > + - 'plist_for_each_safe' > + - 'pnp_for_each_card' > + - 'pnp_for_each_dev' > + - 'protocol_for_each_card' > + - 'protocol_for_each_dev' > + - 'queue_for_each_hw_ctx' > + - 'radix_tree_for_each_slot' > + - 'radix_tree_for_each_tagged' > + - 'rb_for_each' > + - 'rbtree_postorder_for_each_entry_safe' > + - 'rdma_for_each_block' > + - 'rdma_for_each_port' > + - 'rdma_umem_for_each_dma_block' > + - 'resource_list_for_each_entry' > + - 'resource_list_for_each_entry_safe' > + - 'rhl_for_each_entry_rcu' > + - 'rhl_for_each_rcu' > + - 'rht_for_each' > + - 'rht_for_each_entry' > + - 'rht_for_each_entry_from' > + - 'rht_for_each_entry_rcu' > + - 'rht_for_each_entry_rcu_from' > + - 'rht_for_each_entry_safe' > + - 'rht_for_each_from' > + - 'rht_for_each_rcu' > + - 'rht_for_each_rcu_from' > + - '__rq_for_each_bio' > + - 'rq_for_each_bvec' > + - 'rq_for_each_segment' > + - 'scsi_for_each_prot_sg' > + - 'scsi_for_each_sg' > + - 'sctp_for_each_hentry' > + - 'sctp_skb_for_each' > + - 'shdma_for_each_chan' > + - '__shost_for_each_device' > + - 'shost_for_each_device' > + - 'sk_for_each' > + - 'sk_for_each_bound' > + - 'sk_for_each_entry_offset_rcu' > + - 'sk_for_each_from' > + - 'sk_for_each_rcu' > + - 'sk_for_each_safe' > + - 'sk_nulls_for_each' > + - 'sk_nulls_for_each_from' > + - 'sk_nulls_for_each_rcu' > + - 'snd_array_for_each' > + - 'snd_pcm_group_for_each_entry' > + - 'snd_soc_dapm_widget_for_each_path' > + - 'snd_soc_dapm_widget_for_each_path_safe' > + - 'snd_soc_dapm_widget_for_each_sink_path' > + - 'snd_soc_dapm_widget_for_each_source_path' > + - 'tb_property_for_each' > + - 'tcf_exts_for_each_action' > + - 'udp_portaddr_for_each_entry' > + - 'udp_portaddr_for_each_entry_rcu' > + - 'usb_hub_for_each_child' > + - 'v4l2_device_for_each_subdev' > + - 'v4l2_m2m_for_each_dst_buf' > + - 'v4l2_m2m_for_each_dst_buf_safe' > + - 'v4l2_m2m_for_each_src_buf' > + - 'v4l2_m2m_for_each_src_buf_safe' > + - 'virtio_device_for_each_vq' > + - 'while_for_each_ftrace_op' > + - 'xa_for_each' > + - 'xa_for_each_marked' > + - 'xa_for_each_range' > + - 'xa_for_each_start' > + - 'xas_for_each' > + - 'xas_for_each_conflict' > + - 'xas_for_each_marked' > + - 'xbc_array_for_each_value' > + - 'xbc_for_each_key_value' > + - 'xbc_node_for_each_array_value' > + - 'xbc_node_for_each_child' > + - 'xbc_node_for_each_key_value' > + - 'zorro_for_each_dev' > + > +#IncludeBlocks: Preserve # Unknown to clang-format-5.0 > +IncludeCategories: > + - Regex: '.*' > + Priority: 1 > +IncludeIsMainRegex: '(Test)?$' > +IndentCaseLabels: false > +#IndentPPDirectives: None # Unknown to clang-format-5.0 > +IndentWidth: 8 > +IndentWrappedFunctionNames: false > +JavaScriptQuotes: Leave > +JavaScriptWrapImports: true > +KeepEmptyLinesAtTheStartOfBlocks: false > +MacroBlockBegin: '' > +MacroBlockEnd: '' > +MaxEmptyLinesToKeep: 1 > +NamespaceIndentation: None > +#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0 > +ObjCBlockIndentWidth: 8 > +ObjCSpaceAfterProperty: true > +ObjCSpaceBeforeProtocolList: true > + > +# Taken from git's rules > +#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0 > +PenaltyBreakBeforeFirstCallParameter: 30 > +PenaltyBreakComment: 10 > +PenaltyBreakFirstLessLess: 0 > +PenaltyBreakString: 10 > +PenaltyExcessCharacter: 100 > +PenaltyReturnTypeOnItsOwnLine: 60 > + > +PointerAlignment: Right > +ReflowComments: false > +SortIncludes: false > +#SortUsingDeclarations: false # Unknown to clang-format-4.0 > +SpaceAfterCStyleCast: false > +SpaceAfterTemplateKeyword: true > +SpaceBeforeAssignmentOperators: true > +#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0 > +#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0 > +SpaceBeforeParens: ControlStatements > +#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0 > +SpaceInEmptyParentheses: false > +SpacesBeforeTrailingComments: 1 > +SpacesInAngles: false > +SpacesInContainerLiterals: false > +SpacesInCStyleCastParentheses: false > +SpacesInParentheses: false > +SpacesInSquareBrackets: false > +Standard: Cpp03 > +TabWidth: 8 > +UseTab: Always > +... > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 13:57:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 14:57:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: new package Message-ID: <20220101135737.956301-1-fontaine.fabrice@gmail.com> ksmbd kernel server userspace utilities. https://github.com/cifsd-team/ksmbd-tools Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/ksmbd-tools/Config.in | 15 +++++++++++++++ package/ksmbd-tools/ksmbd-tools.hash | 3 +++ package/ksmbd-tools/ksmbd-tools.mk | 20 ++++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/ksmbd-tools/Config.in create mode 100644 package/ksmbd-tools/ksmbd-tools.hash create mode 100644 package/ksmbd-tools/ksmbd-tools.mk diff --git a/DEVELOPERS b/DEVELOPERS index 98ff2372cc..cf0e6fe0fc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -870,6 +870,7 @@ F: package/hiredis/ F: package/i2pd/ F: package/igd2-for-linux/ F: package/json-c/ +F: package/ksmbd-tools/ F: package/lcms2/ F: package/lftp/ F: package/libcap-ng/ diff --git a/package/Config.in b/package/Config.in index 4185675e4c..1e25ccd964 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2235,6 +2235,7 @@ endif source "package/keepalived/Config.in" source "package/kismet/Config.in" source "package/knock/Config.in" + source "package/ksmbd-tools/Config.in" source "package/leafnode2/Config.in" source "package/lft/Config.in" source "package/lftp/Config.in" diff --git a/package/ksmbd-tools/Config.in b/package/ksmbd-tools/Config.in new file mode 100644 index 0000000000..ce1850e016 --- /dev/null +++ b/package/ksmbd-tools/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_KSMBD_TOOLS + bool "ksmbd-tools" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libnl + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBNL + help + ksmbd kernel server userspace utilities. + + https://github.com/cifsd-team/ksmbd-tools + +comment "ksmbd-tools needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash new file mode 100644 index 0000000000..ad507bfdb2 --- /dev/null +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk new file mode 100644 index 0000000000..b3ffc3e768 --- /dev/null +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# ksmbd-tools +# +################################################################################ + +KSMBD_TOOLS_VERSION = 3.4.3 +KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) +KSMBD_TOOLS_LICENSE = GPL-2.0+ +KSMBD_TOOLS_LICENSE_FILES = COPYING +KSMBD_TOOLS_DEPENDENCIES = host-pkgconf libglib2 libnl + +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +KSMBD_TOOLS_CONF_OPTS += --enable-krb5 +KSMBD_TOOLS_DEPENDENCIES += libkrb5 +else +KSMBD_TOOLS_CONF_OPTS += --disable-krb5 +endif + +$(eval $(autotools-package)) -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 14:01:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 15:01:13 +0100 Subject: [Buildroot] [git commit] .clang-format: initial import from Linux 5.15.6 Message-ID: <20220101135527.56A88829F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8fddaf36edc449c1239b75468cfe75be4cd5132f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Intended as an aid when working with in-tree C files, like makdevs.c. Unlike for the kernel, which still has an 80-char limit line (but they decided not to enforce it [0]), we set the limit to 132-char for us, like we do for the python code (see ./.flake8). [0] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bdc48fa11e46f867ea4d75fa59ee87a7f48be144 Signed-off-by: Joachim Wiberg [yann.morin.1998 at free.fr: use and explain the 132-char limit) Signed-off-by: Yann E. MORIN --- .clang-format | 567 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 567 insertions(+) diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000000..1758a23f32 --- /dev/null +++ b/.clang-format @@ -0,0 +1,567 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# clang-format configuration file. Intended for clang-format >= 4. +# +# For more information, see: +# +# Documentation/process/clang-format.rst +# https://clang.llvm.org/docs/ClangFormat.html +# https://clang.llvm.org/docs/ClangFormatStyleOptions.html +# + +# Buildroot: imported from Linux 5.15.6, with minimal modifications. +# Please note, this is not enforced at the moment. Intended +# as an aid when working with in-tree C files, like +# makedevs.c +# +--- +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +#AlignEscapedNewlines: Left # Unknown to clang-format-4.0 +AlignOperands: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + #AfterExternBlock: false # Unknown to clang-format-5.0 + BeforeCatch: false + BeforeElse: false + IndentBraces: false + #SplitEmptyFunction: true # Unknown to clang-format-4.0 + #SplitEmptyRecord: true # Unknown to clang-format-4.0 + #SplitEmptyNamespace: true # Unknown to clang-format-4.0 +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Custom +#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0 +BreakBeforeTernaryOperators: false +BreakConstructorInitializersBeforeComma: false +#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0 +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: false +ColumnLimit: 132 # Specially for Buildroot +CommentPragmas: '^ IWYU pragma:' +#CompactNamespaces: false # Unknown to clang-format-4.0 +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 8 +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +#FixNamespaceComments: false # Unknown to clang-format-4.0 + +# Taken from: +# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \ +# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \ +# | sort | uniq +ForEachMacros: + - 'apei_estatus_for_each_section' + - 'ata_for_each_dev' + - 'ata_for_each_link' + - '__ata_qc_for_each' + - 'ata_qc_for_each' + - 'ata_qc_for_each_raw' + - 'ata_qc_for_each_with_internal' + - 'ax25_for_each' + - 'ax25_uid_for_each' + - '__bio_for_each_bvec' + - 'bio_for_each_bvec' + - 'bio_for_each_bvec_all' + - 'bio_for_each_integrity_vec' + - '__bio_for_each_segment' + - 'bio_for_each_segment' + - 'bio_for_each_segment_all' + - 'bio_list_for_each' + - 'bip_for_each_vec' + - 'bitmap_for_each_clear_region' + - 'bitmap_for_each_set_region' + - 'blkg_for_each_descendant_post' + - 'blkg_for_each_descendant_pre' + - 'blk_queue_for_each_rl' + - 'bond_for_each_slave' + - 'bond_for_each_slave_rcu' + - 'bpf_for_each_spilled_reg' + - 'btree_for_each_safe128' + - 'btree_for_each_safe32' + - 'btree_for_each_safe64' + - 'btree_for_each_safel' + - 'card_for_each_dev' + - 'cgroup_taskset_for_each' + - 'cgroup_taskset_for_each_leader' + - 'cpufreq_for_each_entry' + - 'cpufreq_for_each_entry_idx' + - 'cpufreq_for_each_valid_entry' + - 'cpufreq_for_each_valid_entry_idx' + - 'css_for_each_child' + - 'css_for_each_descendant_post' + - 'css_for_each_descendant_pre' + - 'device_for_each_child_node' + - 'displayid_iter_for_each' + - 'dma_fence_chain_for_each' + - 'do_for_each_ftrace_op' + - 'drm_atomic_crtc_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane_state' + - 'drm_atomic_for_each_plane_damage' + - 'drm_client_for_each_connector_iter' + - 'drm_client_for_each_modeset' + - 'drm_connector_for_each_possible_encoder' + - 'drm_for_each_bridge_in_chain' + - 'drm_for_each_connector_iter' + - 'drm_for_each_crtc' + - 'drm_for_each_crtc_reverse' + - 'drm_for_each_encoder' + - 'drm_for_each_encoder_mask' + - 'drm_for_each_fb' + - 'drm_for_each_legacy_plane' + - 'drm_for_each_plane' + - 'drm_for_each_plane_mask' + - 'drm_for_each_privobj' + - 'drm_mm_for_each_hole' + - 'drm_mm_for_each_node' + - 'drm_mm_for_each_node_in_range' + - 'drm_mm_for_each_node_safe' + - 'flow_action_for_each' + - 'for_each_acpi_dev_match' + - 'for_each_active_dev_scope' + - 'for_each_active_drhd_unit' + - 'for_each_active_iommu' + - 'for_each_aggr_pgid' + - 'for_each_available_child_of_node' + - 'for_each_bio' + - 'for_each_board_func_rsrc' + - 'for_each_bvec' + - 'for_each_card_auxs' + - 'for_each_card_auxs_safe' + - 'for_each_card_components' + - 'for_each_card_dapms' + - 'for_each_card_pre_auxs' + - 'for_each_card_prelinks' + - 'for_each_card_rtds' + - 'for_each_card_rtds_safe' + - 'for_each_card_widgets' + - 'for_each_card_widgets_safe' + - 'for_each_cgroup_storage_type' + - 'for_each_child_of_node' + - 'for_each_clear_bit' + - 'for_each_clear_bit_from' + - 'for_each_cmsghdr' + - 'for_each_compatible_node' + - 'for_each_component_dais' + - 'for_each_component_dais_safe' + - 'for_each_comp_order' + - 'for_each_console' + - 'for_each_cpu' + - 'for_each_cpu_and' + - 'for_each_cpu_not' + - 'for_each_cpu_wrap' + - 'for_each_dapm_widgets' + - 'for_each_dev_addr' + - 'for_each_dev_scope' + - 'for_each_dma_cap_mask' + - 'for_each_dpcm_be' + - 'for_each_dpcm_be_rollback' + - 'for_each_dpcm_be_safe' + - 'for_each_dpcm_fe' + - 'for_each_drhd_unit' + - 'for_each_dss_dev' + - 'for_each_dtpm_table' + - 'for_each_efi_memory_desc' + - 'for_each_efi_memory_desc_in_map' + - 'for_each_element' + - 'for_each_element_extid' + - 'for_each_element_id' + - 'for_each_endpoint_of_node' + - 'for_each_evictable_lru' + - 'for_each_fib6_node_rt_rcu' + - 'for_each_fib6_walker_rt' + - 'for_each_free_mem_pfn_range_in_zone' + - 'for_each_free_mem_pfn_range_in_zone_from' + - 'for_each_free_mem_range' + - 'for_each_free_mem_range_reverse' + - 'for_each_func_rsrc' + - 'for_each_hstate' + - 'for_each_if' + - 'for_each_iommu' + - 'for_each_ip_tunnel_rcu' + - 'for_each_irq_nr' + - 'for_each_link_codecs' + - 'for_each_link_cpus' + - 'for_each_link_platforms' + - 'for_each_lru' + - 'for_each_matching_node' + - 'for_each_matching_node_and_match' + - 'for_each_member' + - 'for_each_memcg_cache_index' + - 'for_each_mem_pfn_range' + - '__for_each_mem_range' + - 'for_each_mem_range' + - '__for_each_mem_range_rev' + - 'for_each_mem_range_rev' + - 'for_each_mem_region' + - 'for_each_migratetype_order' + - 'for_each_msi_entry' + - 'for_each_msi_entry_safe' + - 'for_each_msi_vector' + - 'for_each_net' + - 'for_each_net_continue_reverse' + - 'for_each_netdev' + - 'for_each_netdev_continue' + - 'for_each_netdev_continue_rcu' + - 'for_each_netdev_continue_reverse' + - 'for_each_netdev_feature' + - 'for_each_netdev_in_bond_rcu' + - 'for_each_netdev_rcu' + - 'for_each_netdev_reverse' + - 'for_each_netdev_safe' + - 'for_each_net_rcu' + - 'for_each_new_connector_in_state' + - 'for_each_new_crtc_in_state' + - 'for_each_new_mst_mgr_in_state' + - 'for_each_new_plane_in_state' + - 'for_each_new_private_obj_in_state' + - 'for_each_node' + - 'for_each_node_by_name' + - 'for_each_node_by_type' + - 'for_each_node_mask' + - 'for_each_node_state' + - 'for_each_node_with_cpus' + - 'for_each_node_with_property' + - 'for_each_nonreserved_multicast_dest_pgid' + - 'for_each_of_allnodes' + - 'for_each_of_allnodes_from' + - 'for_each_of_cpu_node' + - 'for_each_of_pci_range' + - 'for_each_old_connector_in_state' + - 'for_each_old_crtc_in_state' + - 'for_each_old_mst_mgr_in_state' + - 'for_each_oldnew_connector_in_state' + - 'for_each_oldnew_crtc_in_state' + - 'for_each_oldnew_mst_mgr_in_state' + - 'for_each_oldnew_plane_in_state' + - 'for_each_oldnew_plane_in_state_reverse' + - 'for_each_oldnew_private_obj_in_state' + - 'for_each_old_plane_in_state' + - 'for_each_old_private_obj_in_state' + - 'for_each_online_cpu' + - 'for_each_online_node' + - 'for_each_online_pgdat' + - 'for_each_pci_bridge' + - 'for_each_pci_dev' + - 'for_each_pci_msi_entry' + - 'for_each_pcm_streams' + - 'for_each_physmem_range' + - 'for_each_populated_zone' + - 'for_each_possible_cpu' + - 'for_each_present_cpu' + - 'for_each_prime_number' + - 'for_each_prime_number_from' + - 'for_each_process' + - 'for_each_process_thread' + - 'for_each_prop_codec_conf' + - 'for_each_prop_dai_codec' + - 'for_each_prop_dai_cpu' + - 'for_each_prop_dlc_codecs' + - 'for_each_prop_dlc_cpus' + - 'for_each_prop_dlc_platforms' + - 'for_each_property_of_node' + - 'for_each_registered_fb' + - 'for_each_requested_gpio' + - 'for_each_requested_gpio_in_range' + - 'for_each_reserved_mem_range' + - 'for_each_reserved_mem_region' + - 'for_each_rtd_codec_dais' + - 'for_each_rtd_components' + - 'for_each_rtd_cpu_dais' + - 'for_each_rtd_dais' + - 'for_each_set_bit' + - 'for_each_set_bit_from' + - 'for_each_set_clump8' + - 'for_each_sg' + - 'for_each_sg_dma_page' + - 'for_each_sg_page' + - 'for_each_sgtable_dma_page' + - 'for_each_sgtable_dma_sg' + - 'for_each_sgtable_page' + - 'for_each_sgtable_sg' + - 'for_each_sibling_event' + - 'for_each_subelement' + - 'for_each_subelement_extid' + - 'for_each_subelement_id' + - '__for_each_thread' + - 'for_each_thread' + - 'for_each_unicast_dest_pgid' + - 'for_each_vsi' + - 'for_each_wakeup_source' + - 'for_each_zone' + - 'for_each_zone_zonelist' + - 'for_each_zone_zonelist_nodemask' + - 'fwnode_for_each_available_child_node' + - 'fwnode_for_each_child_node' + - 'fwnode_graph_for_each_endpoint' + - 'gadget_for_each_ep' + - 'genradix_for_each' + - 'genradix_for_each_from' + - 'hash_for_each' + - 'hash_for_each_possible' + - 'hash_for_each_possible_rcu' + - 'hash_for_each_possible_rcu_notrace' + - 'hash_for_each_possible_safe' + - 'hash_for_each_rcu' + - 'hash_for_each_safe' + - 'hctx_for_each_ctx' + - 'hlist_bl_for_each_entry' + - 'hlist_bl_for_each_entry_rcu' + - 'hlist_bl_for_each_entry_safe' + - 'hlist_for_each' + - 'hlist_for_each_entry' + - 'hlist_for_each_entry_continue' + - 'hlist_for_each_entry_continue_rcu' + - 'hlist_for_each_entry_continue_rcu_bh' + - 'hlist_for_each_entry_from' + - 'hlist_for_each_entry_from_rcu' + - 'hlist_for_each_entry_rcu' + - 'hlist_for_each_entry_rcu_bh' + - 'hlist_for_each_entry_rcu_notrace' + - 'hlist_for_each_entry_safe' + - 'hlist_for_each_entry_srcu' + - '__hlist_for_each_rcu' + - 'hlist_for_each_safe' + - 'hlist_nulls_for_each_entry' + - 'hlist_nulls_for_each_entry_from' + - 'hlist_nulls_for_each_entry_rcu' + - 'hlist_nulls_for_each_entry_safe' + - 'i3c_bus_for_each_i2cdev' + - 'i3c_bus_for_each_i3cdev' + - 'ide_host_for_each_port' + - 'ide_port_for_each_dev' + - 'ide_port_for_each_present_dev' + - 'idr_for_each_entry' + - 'idr_for_each_entry_continue' + - 'idr_for_each_entry_continue_ul' + - 'idr_for_each_entry_ul' + - 'in_dev_for_each_ifa_rcu' + - 'in_dev_for_each_ifa_rtnl' + - 'inet_bind_bucket_for_each' + - 'inet_lhash2_for_each_icsk_rcu' + - 'key_for_each' + - 'key_for_each_safe' + - 'klp_for_each_func' + - 'klp_for_each_func_safe' + - 'klp_for_each_func_static' + - 'klp_for_each_object' + - 'klp_for_each_object_safe' + - 'klp_for_each_object_static' + - 'kunit_suite_for_each_test_case' + - 'kvm_for_each_memslot' + - 'kvm_for_each_vcpu' + - 'list_for_each' + - 'list_for_each_codec' + - 'list_for_each_codec_safe' + - 'list_for_each_continue' + - 'list_for_each_entry' + - 'list_for_each_entry_continue' + - 'list_for_each_entry_continue_rcu' + - 'list_for_each_entry_continue_reverse' + - 'list_for_each_entry_from' + - 'list_for_each_entry_from_rcu' + - 'list_for_each_entry_from_reverse' + - 'list_for_each_entry_lockless' + - 'list_for_each_entry_rcu' + - 'list_for_each_entry_reverse' + - 'list_for_each_entry_safe' + - 'list_for_each_entry_safe_continue' + - 'list_for_each_entry_safe_from' + - 'list_for_each_entry_safe_reverse' + - 'list_for_each_entry_srcu' + - 'list_for_each_prev' + - 'list_for_each_prev_safe' + - 'list_for_each_safe' + - 'llist_for_each' + - 'llist_for_each_entry' + - 'llist_for_each_entry_safe' + - 'llist_for_each_safe' + - 'mci_for_each_dimm' + - 'media_device_for_each_entity' + - 'media_device_for_each_intf' + - 'media_device_for_each_link' + - 'media_device_for_each_pad' + - 'nanddev_io_for_each_page' + - 'netdev_for_each_lower_dev' + - 'netdev_for_each_lower_private' + - 'netdev_for_each_lower_private_rcu' + - 'netdev_for_each_mc_addr' + - 'netdev_for_each_uc_addr' + - 'netdev_for_each_upper_dev_rcu' + - 'netdev_hw_addr_list_for_each' + - 'nft_rule_for_each_expr' + - 'nla_for_each_attr' + - 'nla_for_each_nested' + - 'nlmsg_for_each_attr' + - 'nlmsg_for_each_msg' + - 'nr_neigh_for_each' + - 'nr_neigh_for_each_safe' + - 'nr_node_for_each' + - 'nr_node_for_each_safe' + - 'of_for_each_phandle' + - 'of_property_for_each_string' + - 'of_property_for_each_u32' + - 'pci_bus_for_each_resource' + - 'pcl_for_each_chunk' + - 'pcl_for_each_segment' + - 'pcm_for_each_format' + - 'ping_portaddr_for_each_entry' + - 'plist_for_each' + - 'plist_for_each_continue' + - 'plist_for_each_entry' + - 'plist_for_each_entry_continue' + - 'plist_for_each_entry_safe' + - 'plist_for_each_safe' + - 'pnp_for_each_card' + - 'pnp_for_each_dev' + - 'protocol_for_each_card' + - 'protocol_for_each_dev' + - 'queue_for_each_hw_ctx' + - 'radix_tree_for_each_slot' + - 'radix_tree_for_each_tagged' + - 'rb_for_each' + - 'rbtree_postorder_for_each_entry_safe' + - 'rdma_for_each_block' + - 'rdma_for_each_port' + - 'rdma_umem_for_each_dma_block' + - 'resource_list_for_each_entry' + - 'resource_list_for_each_entry_safe' + - 'rhl_for_each_entry_rcu' + - 'rhl_for_each_rcu' + - 'rht_for_each' + - 'rht_for_each_entry' + - 'rht_for_each_entry_from' + - 'rht_for_each_entry_rcu' + - 'rht_for_each_entry_rcu_from' + - 'rht_for_each_entry_safe' + - 'rht_for_each_from' + - 'rht_for_each_rcu' + - 'rht_for_each_rcu_from' + - '__rq_for_each_bio' + - 'rq_for_each_bvec' + - 'rq_for_each_segment' + - 'scsi_for_each_prot_sg' + - 'scsi_for_each_sg' + - 'sctp_for_each_hentry' + - 'sctp_skb_for_each' + - 'shdma_for_each_chan' + - '__shost_for_each_device' + - 'shost_for_each_device' + - 'sk_for_each' + - 'sk_for_each_bound' + - 'sk_for_each_entry_offset_rcu' + - 'sk_for_each_from' + - 'sk_for_each_rcu' + - 'sk_for_each_safe' + - 'sk_nulls_for_each' + - 'sk_nulls_for_each_from' + - 'sk_nulls_for_each_rcu' + - 'snd_array_for_each' + - 'snd_pcm_group_for_each_entry' + - 'snd_soc_dapm_widget_for_each_path' + - 'snd_soc_dapm_widget_for_each_path_safe' + - 'snd_soc_dapm_widget_for_each_sink_path' + - 'snd_soc_dapm_widget_for_each_source_path' + - 'tb_property_for_each' + - 'tcf_exts_for_each_action' + - 'udp_portaddr_for_each_entry' + - 'udp_portaddr_for_each_entry_rcu' + - 'usb_hub_for_each_child' + - 'v4l2_device_for_each_subdev' + - 'v4l2_m2m_for_each_dst_buf' + - 'v4l2_m2m_for_each_dst_buf_safe' + - 'v4l2_m2m_for_each_src_buf' + - 'v4l2_m2m_for_each_src_buf_safe' + - 'virtio_device_for_each_vq' + - 'while_for_each_ftrace_op' + - 'xa_for_each' + - 'xa_for_each_marked' + - 'xa_for_each_range' + - 'xa_for_each_start' + - 'xas_for_each' + - 'xas_for_each_conflict' + - 'xas_for_each_marked' + - 'xbc_array_for_each_value' + - 'xbc_for_each_key_value' + - 'xbc_node_for_each_array_value' + - 'xbc_node_for_each_child' + - 'xbc_node_for_each_key_value' + - 'zorro_for_each_dev' + +#IncludeBlocks: Preserve # Unknown to clang-format-5.0 +IncludeCategories: + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: false +#IndentPPDirectives: None # Unknown to clang-format-5.0 +IndentWidth: 8 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0 +ObjCBlockIndentWidth: 8 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true + +# Taken from git's rules +#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0 +PenaltyBreakBeforeFirstCallParameter: 30 +PenaltyBreakComment: 10 +PenaltyBreakFirstLessLess: 0 +PenaltyBreakString: 10 +PenaltyExcessCharacter: 100 +PenaltyReturnTypeOnItsOwnLine: 60 + +PointerAlignment: Right +ReflowComments: false +SortIncludes: false +#SortUsingDeclarations: false # Unknown to clang-format-4.0 +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0 +#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0 +SpaceBeforeParens: ControlStatements +#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0 +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp03 +TabWidth: 8 +UseTab: Always +... From troglobit at gmail.com Sat Jan 1 14:01:23 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Sat, 01 Jan 2022 15:01:23 +0100 Subject: [Buildroot] [[Next]RFC] sdk-docker: new make target using Dockcross In-Reply-To: <20210215053258.3323654-1-matt@thewebers.ws> References: <20210215053258.3323654-1-matt@thewebers.ws> Message-ID: <87ee5r1rnw.fsf@gmail.com> Hi, sorry for the late review: On Sun, Feb 14, 2021 at 23:32, Matt Weber wrote: > This patch adds a new make target for building a Docker with > an SDK installed. This patch has not been broken up and is for > RFC only to get feedback on the technical approach. > > - `make sdk-docker` first sets up the dockcross package and > the environment-setup script to stage the environment. > > - The dockcross package in Buildroot includes a folder with > a custom Dockerfile and pre-exec setup scripts which are > copied into the dockcross build folder at configure time. > This Dockerfile uses the Buildroot base and sets up other > tools to allow a project to completely execute a build flow > with make / cmake / meson / scons. > > - Within the Dockcross package, the entrypoint and sudo > scripting are reused but a new standard image/custom image > is not defined. Instead this patchset duplicates the > docker build step in the Buildroot top-level Makefile. > The entrypoint / sudo scripting were reused because it > handles seamless mapping of the calling user into the > container for the build and back with all the files uid/gid > intacted. > > - One of the best advantages of this environment is the > fact it resets on each new lauch and is clean for a new > build. I.e. just the PWD which is mapped as /work inside > is maintained after the container tears down. > > - I'm unsure if it makes sense to use dockcross or just pull > over the concepts they use into Buildroot directly.... > I think I found a good balance considering each Buildroot > defconfig build is unique so it doesn't seem like there is > a chance to upstream a Buildroot configuration to dockcross. > > - TODO: Add a manual section that includes usage notes > > - How to test > make qemu_aarch64_virt_defconfig > make sdk-docker > # Usage from https://github.com/dockcross/dockcross > # Setup container launch script > docker run --rm dockcross/buildroot-sdk-aarch64-buildroot-linux-gnu > ./dockcross > # This dockcross script maps the pwd into the container as /work > # as well as the current users $HOME as $HOME inside. > # Executing the script to dump the env, should list all the > # environment-setup exported values for use > ./dockcross bash -c 'export' > # Check that the cross toolchain executes > ./dockcross bash -c '$CC -version' > > Signed-off-by: Matt Weber This looks *really* interesting! At $DAYJOB we currently have locally maintained docker containers to get reproducible build environments on developer laptops. Having it integrated in Buildroot would be great! I've tested your patch using latest Buildroot and qemu_x86_64_defconfig but it failed with the following, which turned out to be a too old buildroot/base. When I bumped to 20211120.1925 it worked fine. Turns out GitHub dropped insecure cryptos last summer and the old Debian base had a bit too old curl: Downloading https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 ######################################################################## 100.0% curl: (35) Unknown SSL protocol error in connection to objects.githubusercontent.com:443 The command '/bin/sh -c set -x && /buildscripts/install-gosu-binary.sh && /buildscripts/install-gosu-binary-wrapper.sh && rm -rf /buildscripts' returned a non-zero code: 35 make[1]: *** [Makefile:629: sdk-docker] Error 35 Only two things that stick out to me are: 1. might need to have some small check in the top Makefile to verify that 'docker' is available on the host system -- maybe obvious to experienced users, but it would help reduce the support burden for the mailing list, I think 2. the dockcross project apparently doesn't do releases, or even tags, so it might be a bit of a hassle to track changes and do updates? Maybe we could reach out to them and ask for tags, at least Can't give better technical feedback than that, maybe Mr Petazzoni can chime in here wrt the actual integration. Reviewed-by: Joachim Wiberg From fontaine.fabrice at gmail.com Sat Jan 1 14:03:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 15:03:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectd: add ipmi support Message-ID: <20220101140324.1001998-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/collectd/Config.in | 11 +++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 05fb577345..5e5dff6fe1 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -312,6 +312,17 @@ config BR2_PACKAGE_COLLECTD_IPC IPC counters: semaphores used, number of allocated segments in shared memory and more. +config BR2_PACKAGE_COLLECTD_IPMI + bool "ipmi" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_OPENIPMI + help + Read hardware sensors from servers using the Intelligent + Platform Management Interface (IPMI). + +comment "ipmi needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + config BR2_PACKAGE_COLLECTD_IPTABLES bool "iptables" select BR2_PACKAGE_IPTABLES diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index d01058471d..9d6f630fe3 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -18,7 +18,7 @@ COLLECTD_SELINUX_MODULES = apache collectd # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dpdkstat email \ - gmond hddtemp intel_rdt ipmi java lpar \ + gmond hddtemp intel_rdt java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ @@ -88,6 +88,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ + $(if $(BR2_PACKAGE_COLLECTD_IPMI),--enable-ipmi,--disable-ipmi) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ $(if $(BR2_PACKAGE_COLLECTD_IPVS),--enable-ipvs,--disable-ipvs) \ $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ @@ -174,6 +175,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ + $(if $(BR2_PACKAGE_COLLECTD_IPMI),openipmi) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 14:13:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 15:13:15 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/makedevs: coding style and whitespace cleanup In-Reply-To: <20211223090800.1716321-4-troglobit@gmail.com> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-4-troglobit@gmail.com> Message-ID: <20220101141315.GB2777@scaer> Joachim, All, On 2021-12-23 10:08 +0100, Joachim Wiberg spake thusly: > This program is cobbled up with parts from all over the place, mostly > BusyBox, so the style has not been kept consistent. This patch is a > modest attempt to clean it up a bit. Some changes, e.g., comments are > for consistency with the rest of the program. > > - The (new) top level .clang-format file has been used as an aid > - Overly long lines have been kept to keep the diff small and any > discussions on max line length in the project to a minimum > - Comment indentation has been kept, again to keep the diff small While I appreciate the rasoning, I think that, if we have a code style and a linter/reformatter, then we should just mechanically apply it and not manually apply parts of the rules. Otherwise, it does not help the maintenance/review anymore than the current state. So, I would be of the opinion that we should just blindly apply clang-format and be done with that. However, I'm also afraid that there might be different reformatting rules based on the clang-format version... Maybe the version we use should be documented somewhere? Regards, Yann E. MORIN. > Signed-off-by: Joachim Wiberg > --- > package/makedevs/makedevs.c | 111 +++++++++++++++++++----------------- > 1 file changed, 60 insertions(+), 51 deletions(-) > > diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c > index 2796cd5e78..ec7db8f3e8 100644 > --- a/package/makedevs/makedevs.c > +++ b/package/makedevs/makedevs.c > @@ -44,7 +44,7 @@ uid_t recursive_uid; > gid_t recursive_gid; > unsigned int recursive_mode; > #define PASSWD_PATH "etc/passwd" /* MUST be relative */ > -#define GROUP_PATH "etc/group" /* MUST be relative */ > +#define GROUP_PATH "etc/group" /* MUST be relative */ > > void bb_verror_msg(const char *s, va_list p) > { > @@ -76,10 +76,12 @@ void bb_error_msg_and_die(const char *s, ...) > > void bb_vperror_msg(const char *s, va_list p) > { > - int err=errno; > - if(s == 0) s = ""; > + int err = errno; > + if (s == 0) > + s = ""; > bb_verror_msg(s, p); > - if (*s) s = ": "; > + if (*s) > + s = ": "; > fprintf(stderr, "%s%s\n", s, strerror(err)); > } > > @@ -129,8 +131,8 @@ int bb_make_directory (char *path, long mode, int flags) > if (mode == -1) { > umask(mask); > mode = (S_IXUSR | S_IXGRP | S_IXOTH | > - S_IWUSR | S_IWGRP | S_IWOTH | > - S_IRUSR | S_IRGRP | S_IROTH) & ~mask; > + S_IWUSR | S_IWGRP | S_IWOTH | > + S_IRUSR | S_IRGRP | S_IROTH) & ~mask; > } else { > umask(mask & ~0300); > } > @@ -154,18 +156,22 @@ int bb_make_directory (char *path, long mode, int flags) > } > > if (mkdir(path, 0777) < 0) { > - /* If we failed for any other reason than the directory > - * already exists, output a diagnostic and return -1.*/ > - if ((errno != EEXIST && errno != EISDIR) > - || !(flags & FILEUTILS_RECUR) > - || (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) { > + /* > + * If we failed for any other reason than the directory > + * already exists, output a diagnostic and return -1. > + */ > + if ((errno != EEXIST && errno != EISDIR) || > + !(flags & FILEUTILS_RECUR) || > + (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) { > fail_msg = "create"; > umask(mask); > break; > } > - /* Since the directory exists, don't attempt to change > + /* > + * Since the directory exists, don't attempt to change > * permissions if it was the full target. Note that > - * this is not an error conditon. */ > + * this is not an error conditon. > + */ > if (!c) { > umask(mask); > return 0; > @@ -173,11 +179,13 @@ int bb_make_directory (char *path, long mode, int flags) > } > > if (!c) { > - /* Done. If necessary, updated perms on the newly > + /* > + * Done. If necessary, updated perms on the newly > * created directory. Failure to update here _is_ > - * an error.*/ > + * an error. > + */ > umask(mask); > - if ((mode != -1) && (chmod(path, mode) < 0)){ > + if ((mode != -1) && (chmod(path, mode) < 0)) { > fail_msg = "set permissions of"; > break; > } > @@ -189,25 +197,29 @@ int bb_make_directory (char *path, long mode, int flags) > > } while (1); > > - bb_perror_msg ("Cannot %s directory `%s'", fail_msg, path); > + bb_perror_msg("Cannot %s directory `%s'", fail_msg, path); > return -1; > } > > -const char * const bb_msg_memory_exhausted = "memory exhausted"; > +const char *const bb_msg_memory_exhausted = "memory exhausted"; > > void *xmalloc(size_t size) > { > void *ptr = malloc(size); > + > if (ptr == NULL && size != 0) > bb_error_msg_and_die(bb_msg_memory_exhausted); > + > return ptr; > } > > void *xcalloc(size_t nmemb, size_t size) > { > void *ptr = calloc(nmemb, size); > + > if (ptr == NULL && nmemb != 0 && size != 0) > bb_error_msg_and_die(bb_msg_memory_exhausted); > + > return ptr; > } > > @@ -216,6 +228,7 @@ void *xrealloc(void *ptr, size_t size) > ptr = realloc(ptr, size); > if (ptr == NULL && size != 0) > bb_error_msg_and_die(bb_msg_memory_exhausted); > + > return ptr; > } > > @@ -234,8 +247,9 @@ char *private_get_line_from_file(FILE *file, int c) > linebuf = xrealloc(linebuf, linebufsz += GROWBY); > } > linebuf[idx++] = (char)ch; > - if (!ch) return linebuf; > - if (c<2 && ch == '\n') { > + if (!ch) > + return linebuf; > + if (c < 2 && ch == '\n') { > if (c) { > --idx; > } > @@ -263,7 +277,7 @@ long my_getpwnam(const char *name) > FILE *stream; > > stream = bb_xfopen(PASSWD_PATH, "r"); > - while(1) { > + while (1) { > errno = 0; > myuser = fgetpwent(stream); > if (myuser == NULL) > @@ -284,7 +298,7 @@ long my_getgrnam(const char *name) > FILE *stream; > > stream = bb_xfopen(GROUP_PATH, "r"); > - while(1) { > + while (1) { > errno = 0; > mygroup = fgetgrent(stream); > if (mygroup == NULL) > @@ -312,12 +326,12 @@ unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *)) > return r; > } > > -char * last_char_is(const char *s, int c) > +char *last_char_is(const char *s, int c) > { > char *sret = (char *)s; > if (sret) { > sret = strrchr(sret, c); > - if(sret != NULL && *(sret+1) != 0) > + if (sret != NULL && *(sret + 1) != 0) > sret = NULL; > } > return sret; > @@ -347,7 +361,7 @@ char *concat_path_file(const char *path, const char *filename) > lc = last_char_is(path, '/'); > while (*filename == '/') > filename++; > - bb_xasprintf(&outbuf, "%s%s%s", path, (lc==NULL ? "/" : ""), filename); > + bb_xasprintf(&outbuf, "%s%s%s", path, (lc == NULL ? "/" : ""), filename); > > return outbuf; > } > @@ -437,9 +451,8 @@ void bb_show_usage(void) > exit(1); > } > > -int bb_recursive(const char *fpath, const struct stat *sb, > - int tflag, struct FTW *ftwbuf){ > - > +int bb_recursive(const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf) > +{ > if (lchown(fpath, recursive_uid, recursive_gid) == -1) { > bb_perror_msg("chown failed for %s", fpath); > return -1; > @@ -469,16 +482,16 @@ int main(int argc, char **argv) > bb_applet_name = basename(argv[0]); > > while ((opt = getopt(argc, argv, "d:")) != -1) { > - switch(opt) { > - case 'd': > - table = bb_xfopen((line=optarg), "r"); > - break; > - default: > - bb_show_usage(); > + switch (opt) { > + case 'd': > + table = bb_xfopen((line = optarg), "r"); > + break; > + default: > + bb_show_usage(); > } > } > > - if (optind >= argc || (rootdir=argv[optind])==NULL) { > + if (optind >= argc || (rootdir = argv[optind]) == NULL) { > bb_error_msg_and_die("root directory not speficied"); > } > > @@ -527,12 +540,11 @@ int main(int argc, char **argv) > continue; > } > > - if ((2 > sscanf(line, "%4095s %c %o %40s %40s %u %u %u %u %u", name, > - &type, &mode, user, group, &major, > - &minor, &start, &increment, &count)) || > - ((major | minor | start | count | increment) > 0xfffff)) > - { > - if (*line=='\0' || *line=='#' || isspace(*line)) > + if ((2 > sscanf(line, "%4095s %c %o %40s %40s %u %u %u %u %u", > + name, &type, &mode, user, group, &major, &minor, > + &start, &increment, &count)) || > + ((major | minor | start | count | increment) > 0xfffff)) { > + if (*line == '\0' || *line == '#' || isspace(*line)) > continue; > bb_error_msg("line %d invalid: '%s'\n", linenum, line); > ret = EXIT_FAILURE; > @@ -567,7 +579,7 @@ int main(int argc, char **argv) > ret = EXIT_FAILURE; > goto loop; > } > - if ((mode != -1) && (chmod(full_name, mode) < 0)){ > + if ((mode != -1) && (chmod(full_name, mode) < 0)) { > bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); > ret = EXIT_FAILURE; > goto loop; > @@ -587,7 +599,7 @@ int main(int argc, char **argv) > ret = EXIT_FAILURE; > goto loop; > } > - if ((mode != -1) && (chmod(full_name, mode) < 0)){ > + if ((mode != -1) && (chmod(full_name, mode) < 0)) { > bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); > ret = EXIT_FAILURE; > goto loop; > @@ -601,19 +613,16 @@ int main(int argc, char **argv) > ret = EXIT_FAILURE; > goto loop; > } > - } else > - { > + } else { > dev_t rdev; > unsigned i; > char *full_name_inc; > > if (type == 'p') { > mode |= S_IFIFO; > - } > - else if (type == 'c') { > + } else if (type == 'c') { > mode |= S_IFCHR; > - } > - else if (type == 'b') { > + } else if (type == 'b') { > mode |= S_IFBLK; > } else { > bb_error_msg("line %d: Unsupported file type %c", linenum, type); > @@ -621,7 +630,7 @@ int main(int argc, char **argv) > goto loop; > } > > - full_name_inc = xmalloc(strlen(full_name) + sizeof(int)*3 + 2); > + full_name_inc = xmalloc(strlen(full_name) + sizeof(int) * 3 + 2); > if (count) > count--; > for (i = start; i <= start + count; i++) { > @@ -640,7 +649,7 @@ int main(int argc, char **argv) > } > free(full_name_inc); > } > -loop: > + loop: > free(line); > } > fclose(table); > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From troglobit at gmail.com Sat Jan 1 14:26:58 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Sat, 1 Jan 2022 15:26:58 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/makedevs: coding style and whitespace cleanup In-Reply-To: <20220101141315.GB2777@scaer> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-4-troglobit@gmail.com> <20220101141315.GB2777@scaer> Message-ID: <07d1d003-f2fd-a682-d496-d733c2e974ce@gmail.com> On 1/1/22 3:13 PM, Yann E. MORIN wrote: > Joachim, All, > On 2021-12-23 10:08 +0100, Joachim Wiberg spake thusly: >> This program is cobbled up with parts from all over the place, mostly >> BusyBox, so the style has not been kept consistent. This patch is a >> modest attempt to clean it up a bit. Some changes, e.g., comments are >> for consistency with the rest of the program. >> >> - The (new) top level .clang-format file has been used as an aid >> - Overly long lines have been kept to keep the diff small and any >> discussions on max line length in the project to a minimum >> - Comment indentation has been kept, again to keep the diff small > While I appreciate the rasoning, I think that, if we have a code style > and a linter/reformatter, then we should just mechanically apply it and > not manually apply parts of the rules. > Otherwise, it does not help the maintenance/review anymore than the > current state. > So, I would be of the opinion that we should just blindly apply > clang-format and be done with that. Agreed. > However, I'm also afraid that there might be different reformatting > rules based on the clang-format version... Maybe the version we use > should be documented somewhere? Possibly, but in that case this would be a problem also in other projects, e.g. the kernel. I'd lean more towards syncing with kernel .clang-format if that should turn out to be a regular problem. Best regards /Joachim From fontaine.fabrice at gmail.com Sat Jan 1 14:26:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 15:26:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: fix avahi build Message-ID: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit 27908c6eab768d0b9fd3444a929b3f1b1510da71: ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency "avahi-client" not found, tried pkgconfig Fixes: - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 Signed-off-by: Fabrice Fontaine --- package/pipewire/pipewire.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index efda3ad695..7043745cc1 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -82,7 +82,8 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# avahi support needs avahi-client, which needs avahi-daemon and dbus +ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 14:38:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 15:38:20 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/makedevs: coding style and whitespace cleanup In-Reply-To: <07d1d003-f2fd-a682-d496-d733c2e974ce@gmail.com> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-4-troglobit@gmail.com> <20220101141315.GB2777@scaer> <07d1d003-f2fd-a682-d496-d733c2e974ce@gmail.com> Message-ID: <20220101143820.GC2777@scaer> Joachim, All, On 2022-01-01 15:26 +0100, Joachim Wiberg spake thusly: > On 1/1/22 3:13 PM, Yann E. MORIN wrote: > > However, I'm also afraid that there might be different reformatting > > rules based on the clang-format version... Maybe the version we use > > should be documented somewhere? > Possibly, but in that case this would be a problem also in other > projects, e.g. the kernel. I'd lean more towards syncing with kernel > .clang-format if that should turn out to be a regular problem. Agreed. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 14:48:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 15:48:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libapparmor: fix build with python 3.10 Message-ID: <20220101144840.1387059-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: configure: error: cannot import Python module "distutils". Please check your Python installation. The error was: :1: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives Fixes: - http://autobuild.buildroot.org/results//f3e400cbb5b00fbd7f0cb421c993e46b64ec5ac5 Signed-off-by: Fabrice Fontaine --- ...deprecated-distutils-with-setuptools.patch | 244 ++++++++++++++++++ package/libapparmor/libapparmor.mk | 2 +- 2 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch new file mode 100644 index 0000000000..5aed31d0b5 --- /dev/null +++ b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch @@ -0,0 +1,244 @@ +From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 +From: Georgia Garcia +Date: Wed, 10 Nov 2021 19:50:35 +0000 +Subject: [PATCH] replace deprecated distutils with setuptools + +Adds python3 setuptools as a build dependency for libapparmor + +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 +Signed-off-by: Georgia Garcia +Acked-by: Christian Boltz + +[Retrieved (and updated to remove changes on .gitlab-ci.yml and +README.md) from: +https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 3 ++ + .gitlab-ci.yml | 2 +- + libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- + libraries/libapparmor/swig/python/Makefile.am | 2 +- + libraries/libapparmor/swig/python/setup.py.in | 2 +- + .../libapparmor/swig/python/test/Makefile.am | 2 +- + profiles/Makefile | 2 +- + utils/Makefile | 1 + + utils/python-tools-setup.py | 6 ++-- + utils/test/Makefile | 2 +- + utils/test/README.md | 2 +- + 11 files changed, 32 insertions(+), 28 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 78a06fdf9..4782a351a 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c + libraries/libapparmor/swig/perl/libapparmor_wrap.o + libraries/libapparmor/swig/perl/pm_to_blib + libraries/libapparmor/swig/python/LibAppArmor.py ++libraries/libapparmor/swig/python/LibAppArmor.egg-info/ + libraries/libapparmor/swig/python/build/ + libraries/libapparmor/swig/python/libapparmor_wrap.c + libraries/libapparmor/swig/python/Makefile +@@ -204,6 +205,8 @@ utils/*.tmp + utils/po/*.mo + utils/apparmor/*.pyc + utils/apparmor/rule/*.pyc ++utils/apparmor.egg-info/ ++utils/build/ + utils/htmlcov/ + utils/test/common_test.pyc + utils/test/.coverage +diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 +index 1da29d873..f21f70ce7 100644 +--- a/libraries/libapparmor/m4/ac_python_devel.m4 ++++ b/libraries/libapparmor/m4/ac_python_devel.m4 +@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. + fi + + # +- # Check if you have distutils, else fail ++ # Check if you have setuptools, else fail + # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ AC_MSG_CHECKING([for the setuptools Python package]) ++ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` ++ if test -z "$ac_setuptools_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ AC_MSG_ERROR([cannot import Python module "setuptools". + Please check your Python installation. The error was: +-$ac_distutils_result]) ++$ac_setuptools_result]) + PYTHON_VERSION="" + fi + +@@ -88,8 +88,8 @@ $ac_distutils_result]) + PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` + fi + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` ++ python_path=`$PYTHON -c "import sys; import sysconfig;\ ++sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` + if test -n "${python_path}"; then + python_path="-I$python_path" + fi +@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` + if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) +- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` ++ py_version=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` + if test "$py_version" == "[None]"; then + if test -n "$PYTHON_VERSION"; then + py_version=$PYTHON_VERSION +@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` + fi + fi + +- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ ++ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ + "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` + fi + AC_MSG_RESULT([$PYTHON_LDFLAGS]) +@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO + # + AC_MSG_CHECKING([for Python site-packages path]) + if test -z "$PYTHON_SITE_PKG"; then +- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` ++ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` + fi + AC_MSG_RESULT([$PYTHON_SITE_PKG]) + AC_SUBST([PYTHON_SITE_PKG]) +@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` + PYTHON_EXTRA_LIBS='' + fi + if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) +@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( + PYTHON_EXTRA_LDFLAGS='' + fi + if test -z "$PYTHON_EXTRA_LDFLAGS"; then +- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) +diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am +index 04edff003..bf05fe0fc 100644 +--- a/libraries/libapparmor/swig/python/Makefile.am ++++ b/libraries/libapparmor/swig/python/Makefile.am +@@ -21,7 +21,7 @@ install-exec-local: + + clean-local: + if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi +- rm -rf build ++ rm -rf build LibAppArmor.egg-info + if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi + + endif +diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in +index 32abd46b2..b23e40746 100644 +--- a/libraries/libapparmor/swig/python/setup.py.in ++++ b/libraries/libapparmor/swig/python/setup.py.in +@@ -1,4 +1,4 @@ +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import string + + setup(name = 'LibAppArmor', +diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am +index 7287819c9..9dccfdef6 100644 +--- a/libraries/libapparmor/swig/python/test/Makefile.am ++++ b/libraries/libapparmor/swig/python/test/Makefile.am +@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status + CLEANFILES = test_python.py + + # bah, how brittle is this? +-PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' ++PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' + + TESTS = test_python.py + TESTS_ENVIRONMENT = \ +diff --git a/profiles/Makefile b/profiles/Makefile +index c471e58e8..0b7f2655d 100644 +--- a/profiles/Makefile ++++ b/profiles/Makefile +@@ -41,7 +41,7 @@ ifdef USE_SYSTEM + LOGPROF?=aa-logprof + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) +diff --git a/utils/Makefile b/utils/Makefile +index 1f08f259a..91a15107b 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -72,6 +72,7 @@ clean: pod_clean + rm -rf staging/ build/ + rm -f apparmor/*.pyc apparmor/rule/*.pyc + rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ ++ rm -rf apparmor.egg-info/ + + # ${CAPABILITIES} is defined in common/Make.rules + .PHONY: check_severity_db +diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py +index 30ce0cb05..2cbde8fc1 100644 +--- a/utils/python-tools-setup.py ++++ b/utils/python-tools-setup.py +@@ -20,14 +20,14 @@ + # Note: --version=... must be the last argument to this script + # + +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import os + import shutil + import sys + + class Install(_install, object): +- '''Override distutils to install the files where we want them.''' ++ '''Override setuptools to install the files where we want them.''' + def run(self): + # Now byte-compile everything + super(Install, self).run() +diff --git a/utils/test/Makefile b/utils/test/Makefile +index 90354aa50..9126bdd71 100644 +--- a/utils/test/Makefile ++++ b/utils/test/Makefile +@@ -32,7 +32,7 @@ ifdef USE_SYSTEM + PARSER= + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) +-- +GitLab + diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 0d5822a56d..b21a841f3f 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -28,7 +28,7 @@ LIBAPPARMOR_CONF_OPTS = \ --disable-man-pages ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIBAPPARMOR_DEPENDENCIES += host-python3 host-swig python3 +LIBAPPARMOR_DEPENDENCIES += host-python3 host-python3-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 14:56:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 15:56:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/fail2ban: fix build with python 3.10 Message-ID: <20220101145632.1393642-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: error in fail2ban setup command: use_2to3 is invalid. Fixes: - http://autobuild.buildroot.org/results/6a5e91f9912f869b2b07b10b576457b432066393 Signed-off-by: Fabrice Fontaine --- ...with-error-in-fail2ban-setup-command.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch diff --git a/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch new file mode 100644 index 0000000000..8cb097dc38 --- /dev/null +++ b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch @@ -0,0 +1,67 @@ +From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001 +From: sebres +Date: Sun, 19 Sep 2021 18:49:18 +0200 +Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup + command: use_2to3 is invalid (setuptools 58+) + +[Retrieved from: +https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497] +Signed-off-by: Fabrice Fontaine +--- + setup.py | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/setup.py b/setup.py +index f4c2550f6..98413273c 100755 +--- a/setup.py ++++ b/setup.py +@@ -48,7 +48,7 @@ + from glob import glob + + from fail2ban.setup import updatePyExec +- ++from fail2ban.version import version + + source_dir = os.path.realpath(os.path.dirname( + # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): +@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): + # Wrapper to specify fail2ban own options: + class install_command_f2b(install): + user_options = install.user_options + [ +- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), + ('without-tests', None, 'without tests files installation'), + ] + def initialize_options(self): +- self.disable_2to3 = None + self.without_tests = not with_tests + install.initialize_options(self) + def finalize_options(self): +- global _2to3 +- ## in the test cases 2to3 should be already done (fail2ban-2to3): +- if self.disable_2to3: +- _2to3 = False +- if _2to3: +- cmdclass = self.distribution.cmdclass +- cmdclass['build_py'] = build_py_2to3 +- cmdclass['build_scripts'] = build_scripts_2to3 + if self.without_tests: + self.distribution.scripts.remove('bin/fail2ban-testcases') + +@@ -178,7 +168,6 @@ def run(self): + if setuptools: + setup_extra = { + 'test_suite': "fail2ban.tests.utils.gatherTests", +- 'use_2to3': True, + } + else: + setup_extra = {} +@@ -202,9 +191,6 @@ def run(self): + ('/usr/share/doc/fail2ban', doc_files) + ) + +-# Get version number, avoiding importing fail2ban. +-# This is due to tests not functioning for python3 as 2to3 takes place later +-exec(open(join("fail2ban", "version.py")).read()) + + setup( + name = "fail2ban", -- 2.33.0 From giulio.benetti at benettiengineering.com Sat Jan 1 15:10:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 1 Jan 2022 16:10:09 +0100 Subject: [Buildroot] [buildroot-test] scripts/autobuild-run: extend timeout from 120 to 180 minutes In-Reply-To: <20220101115058.0515c8d9@windsurf> References: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> <20220101115058.0515c8d9@windsurf> Message-ID: <9c4d8993-46b2-8f1a-6aa3-bdd9957b783c@benettiengineering.com> Hi Thomas, On 01/01/22 11:50, Thomas Petazzoni wrote: > Hello Giulio, > > On Fri, 1 Oct 2021 01:14:24 +0200 > Giulio Benetti wrote: > >> During the last months some package started to timeout, but this is not due >> to toolchain infinite loop. I think it's due to the increase of the source >> code files' length and to complexity of toolchains or even slow compiling >> time. For example python-uvloop and python-lxml only take long time to >> build with -Os optimization and this makes it seem a TIMEOUT but it's not. >> So let's extend timeout setting from 120 to 180 minutes to avoid false >> TIMEOUTs. >> >> Signed-off-by: Giulio Benetti > > Do you have a specific example where you have seen a failure? Not anymore, it's been only in September. 2 days ago I was right thinking about dropping this patch when checking patchwork. > Please > note that this HUNG_BUILD_TIMEOUT value is the per-step timeout: it > verifies that one step of one particular package doesn't take more than > 120 minutes. Ah, I thought the entire build, but that makes no sense since some build can take way more than 2 hours. > Unless you have a specific example where you have seen this timeout > causing false positives, I'm not really keen on applying such a patch > as it would cause situations where the build is really stuck to be > stuck for 3 hours instead of 2. Yes, I see you've already marked it as rejected. > Did you identify that the python-uvloop and python-lxml packages really > took more than 2 hours to build? I did see at > http://autobuild.buildroot.net/?status=TIMEOUT those timeouts dating > back from ~November. Did you reproduce the issue, and verified that the > build indeed completes at some point? In general, if a simple package > such as python-uvloop or python-lxml takes more than 2 hours to build, > it means that the compiler (or linker) has gone crazy in an infinite > loop, and the build will in fact never finish. It was only my suspicious as specified in commit log. I couldn't reproduce it and I thought it was due to the autobuilder's host. And yes, now that I know it's a per-step timeout it doesn't make sense at all for such little packages. Thank you Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sat Jan 1 15:12:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 16:12:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtorrent-rasterbar: fix build with gcc 9 Message-ID: <20220101151218.1620080-1-fontaine.fabrice@gmail.com> Drop -std=c++11 to avoid the following build failure with gcc 9 raised since bump to version 1.2.15 in commit 2cecfe94f889165f3a5169598ed7e0388941a6cd and https://github.com/arvidn/libtorrent/commit/b7e02cc700d884f87a18a3bc59f95a66a5cb0209: configure: error: *** A compiler with support for C++14 language features is required. Fixes: - http://autobuild.buildroot.org/results/905a51bee38e85a48aa170c15494f2798aa6afea Signed-off-by: Fabrice Fontaine --- package/libtorrent-rasterbar/libtorrent-rasterbar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 914e0cbca3..cde010a4f7 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -16,7 +16,7 @@ LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES LIBTORRENT_RASTERBAR_CONF_OPTS = \ --with-boost-libdir=$(STAGING_DIR)/usr/lib \ --disable-invariant-checks -LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 +LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) # Internal error, aborting at dwarf2cfi.c:2802 in connect_traces # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 15:50:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 16:50:22 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/alchemy: new host package In-Reply-To: <20211112131258.2671293-2-herve.codina@bootlin.com> References: <20211112131258.2671293-1-herve.codina@bootlin.com> <20211112131258.2671293-2-herve.codina@bootlin.com> Message-ID: <20220101155022.GD2777@scaer> Herv?, All, On 2021-11-12 14:12 +0100, Herve Codina spake thusly: > Alchemy is a build system developed by Parrot. > > It is a new build system based on the one used in Android. > A central makefile instance scans a workspace to find user > makefiles, includes them and register modules to be built. > > https://github.com/Parrot-Developers/alchemy > > Signed-off-by: Herve Codina I was about to push this, with a few changes, but I have some questions about the packages, so here's the patch of the changes I did: [yann.morin.1998 at free.fr: - use ALCHEMY_HOME everywhere rather than repeating the location in the install macro - don't remove install dir before installing - use a template for atom.mk, not in-line in alchemy.mk ] diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk index 63d5a941c5..f802c62425 100644 --- a/package/alchemy/alchemy.mk +++ b/package/alchemy/alchemy.mk @@ -10,19 +10,19 @@ ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) ALCHEMY_LICENSE_FILES = COPYING README HOST_ALCHEMY_DEPENDENCIES = host-python3 +ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk define HOST_ALCHEMY_INSTALL_CMDS - rm -rf $(HOST_DIR)/opt/alchemy - mkdir -p $(HOST_DIR)/opt/alchemy - cp -rf $(@D)/* $(HOST_DIR)/opt/alchemy/ + mkdir -p $(ALCHEMY_HOME) + cp -rf $(@D)/* $(ALCHEMY_HOME) + cp $(ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOM E)/atom.mk.in endef $(eval $(host-generic-package)) # Variables used by other packages -ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake # TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture. @@ -59,14 +59,11 @@ endif # $2: Alchemy module name # $3: Alchemy module file name define ALCHEMY_INSTALL_LIB_SDK_FILE - mkdir -p $(ALCHEMY_SDK_BASEDIR)/$(strip $(1)) - ( \ - echo 'LOCAL_PATH := $$(call my-dir)'; \ - echo 'include $$(CLEAR_VARS)'; \ - echo 'LOCAL_MODULE := $(strip $(2))'; \ - echo 'LOCAL_SDK := $(STAGING_DIR)'; \ - echo 'LOCAL_DESTDIR := usr/lib'; \ - echo 'LOCAL_MODULE_FILENAME := $(strip $(3))'; \ - echo 'include $$(BUILD_LIBRARY)'; \ - ) > $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk + $(INSTALL) -m 0644 -D \ + $(ALCHEMY_HOME)/atom.mk.in \ + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk + $(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \ + -e 's#@MODULE@#$(strip $(2))#' \ + -e 's#@MODULE_FILENAME@#$(strip $(3))#' \ + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk endef diff --git a/package/alchemy/atom.mk.in b/package/alchemy/atom.mk.in new file mode 100644 index 0000000000..30eb6d5e23 --- /dev/null +++ b/package/alchemy/atom.mk.in @@ -0,0 +1,7 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE := @MODULE@ +LOCAL_SDK := @STAGING_DIR@ +LOCAL_DESTDIR := usr/lib +LOCAL_MODULE_FILENAME := @MODULE_FILENAME@ +include $(BUILD_LIBRARY) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 15:59:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 16:59:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/tvheadend: disable execinfo Message-ID: <20220101155950.1784485-1-fontaine.fabrice@gmail.com> Disable execinfo to avoid the following build failure if libexecinfo is built before tvheadend since the addition of the package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/build.linux/src/tvhlog.o: in function `tvhlog_backtrace_printf': /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/src/tvhlog.c:522: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/ee9ad2c999b622097fe0f1522e7e32184722e548 Signed-off-by: Fabrice Fontaine --- .../0002-configure-add-execinfo-option.patch | 55 +++++++++++++++++++ package/tvheadend/tvheadend.mk | 1 + 2 files changed, 56 insertions(+) create mode 100644 package/tvheadend/0002-configure-add-execinfo-option.patch diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch new file mode 100644 index 0000000000..c55d127d58 --- /dev/null +++ b/package/tvheadend/0002-configure-add-execinfo-option.patch @@ -0,0 +1,55 @@ +From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 16:53:29 +0100 +Subject: [PATCH] configure: add execinfo option + +Add execinfo option to allow the user to disable the feature even if +execinfo.h is found on the system + +Signed-off-by: Fabrice Fontaine +[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] +--- + configure | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 4dad024c4..c087502bf 100755 +--- a/configure ++++ b/configure +@@ -75,6 +75,7 @@ OPTIONS=( + "ddci:yes" + "cclang_threadsan:no" + "gperftools:no" ++ "execinfo:auto" + ) + + # +@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then + # If we don't have libunwind then fallback to execinfo. + if ! enabled libunwind + then +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + + else +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + check_cc_option mmx + check_cc_option sse2 +-- +2.33.0 + diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 4e84e496bf..58ebdcb054 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -161,6 +161,7 @@ define TVHEADEND_CONFIGURE_CMDS --enable-dvbscan \ --enable-bundle \ --enable-pngquant \ + --disable-execinfo \ --disable-ffmpeg_static \ --disable-hdhomerun_static \ $(TVHEADEND_CONF_OPTS) \ -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 16:05:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 17:05:33 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/ulog: new package In-Reply-To: <20211112131258.2671293-3-herve.codina@bootlin.com> References: <20211112131258.2671293-1-herve.codina@bootlin.com> <20211112131258.2671293-3-herve.codina@bootlin.com> Message-ID: <20220101160533.GE2777@scaer> Herv?, All, On 2021-11-12 14:12 +0100, Herve Codina spake thusly: > The ulog library is a minimalistic logging library derived from > Android logger. > > https://github.com/Parrot-Developers/ulog > > Signed-off-by: Herve Codina [--SNIP--] > diff --git a/package/ulog/ulog.mk b/package/ulog/ulog.mk > new file mode 100644 > index 0000000000..fab16e80d8 > --- /dev/null > +++ b/package/ulog/ulog.mk > @@ -0,0 +1,44 @@ > +################################################################################ > +# > +# ulog > +# > +################################################################################ > + > +ULOG_VERSION = 0389d243352255f6182326dccdae3d56dadc078f > +ULOG_SITE = $(call github,Parrot-Developers,ulog,$(ULOG_VERSION)) > +ULOG_LICENSE = Apache-2.0 > +ULOG_LICENSE_FILES = COPYING > +ULOG_DEPENDENCIES = host-alchemy > +ULOG_INSTALL_STAGING = YES > + > +define ULOG_BUILD_CMDS > + $(ALCHEMY_TARGET_ENV) \ > + $(ALCHEMY_MAKE) libulog > +endef > + > +define ULOG_INSTALL_STATIC_LIBS > + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.a $(1)/usr/lib/ > +endef So, it looks like you are always going to install the static library, but the package does not have: depends on !BR2_STATIC_LIBS > + > +define ULOG_INSTALL_HEADERS > + cp -Raf $(@D)/libulog/include/* $(1)/usr/include/ > +endef > + > +ifeq ($(BR2_STATIC_LIBS),) > +define ULOG_INSTALL_SHARED_LIBS > + $(INSTALL) -m 755 $(@D)/alchemy-out/staging/usr/lib/libulog.so* $(1)/usr/lib/ Although it is very improbable that the destination directory does not already exist, that is still a possibility, especially in target/. And for consistency with all the other packages, you must create the destination directory first before you start copying multiple files in there. Also for consistency, use either 'cp' or '$(INSTALL)', not both , in the same .mk (you used 'cp' for headers, and '$(INSTALL)' for libs, although I don't see a reason not to use them consistently). Oh, and shared libraries do not need to be +x, so -m 644 is enough. > +endef > +endif > + > +define ULOG_INSTALL_TARGET_CMDS > + $(call ULOG_INSTALL_SHARED_LIBS, $(TARGET_DIR)) > +endef > + > +define ULOG_INSTALL_STAGING_CMDS > + $(call ULOG_INSTALL_STATIC_LIBS, $(STAGING_DIR)) > + $(call ULOG_INSTALL_SHARED_LIBS, $(STAGING_DIR)) > + $(call ULOG_INSTALL_HEADERS, $(STAGING_DIR)) > + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, ulog, libulog, libulog.so) So, what happens with BR2_STATIC_LIBS=y? The .so would not exist in that case, would it? But then, this is what would be registered in the atom.mk... And with BR2_STATIC_LIBS not set, then the .a should not be built (or at least not installed!), yet the installation of the static lib is unconditional (and see the first comment too). It is difficult to understand if all of the static-shared combinations are supported, so could you please check/clarify this? If the three combinations are indeed supported, then both the shared and the staic install macros should be conditional. Otherwise, proper guards should be added in the Config.in. Those comments apply to all the pakcages in this series. Regards, Yann E. MORIN. > +endef > + > +$(eval $(generic-package)) > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 17:09:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 18:09:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.23 Message-ID: <20220101170938.1866790-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://www.spinics.net/lists/kexec/msg27693.html Signed-off-by: Fabrice Fontaine --- ...move-duplicate-definition-of-ramdisk.patch | 32 ------------------- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch diff --git a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch b/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch deleted file mode 100644 index 173323bff8..0000000000 --- a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001 -From: Petr Tesarik -Date: Mon, 26 Apr 2021 15:29:51 +0200 -Subject: kexec-tools: Remove duplicate definition of ramdisk - -The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This -other definition is not needed and breaks build with -fno-common. - -Signed-off-by: Petr Tesarik -Signed-off-by: Simon Horman -[Retrieved from: -https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c] -Signed-off-by: Fabrice Fontaine ---- - kexec/arch/ppc/kexec-elf-ppc.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c -index ad43ad1..4a4886e 100644 ---- a/kexec/arch/ppc/kexec-elf-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-ppc.c -@@ -33,7 +33,6 @@ - static const int probe_debug = 0; - - unsigned char reuse_initrd; --const char *ramdisk; - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, - char *); - --- -cgit 1.2.3-1.el7 - diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 1cf860d85e..05eb9e3d02 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 kexec-tools-2.0.22.tar.xz +sha256 aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b kexec-tools-2.0.23.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 81d35815d8..b3b4e56546 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.22 +KEXEC_VERSION = 2.0.23 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 -- 2.33.0 From richard at audacityteam.org Sat Jan 1 17:37:05 2022 From: richard at audacityteam.org (Richard Ash) Date: Sat, 1 Jan 2022 17:37:05 +0000 Subject: [Buildroot] Patching a BR package makefile In-Reply-To: References: Message-ID: <20220101173705.142a0496@audacityteam.org> On Wed, 29 Dec 2021 14:57:54 +0200 Jacques Samoun wrote: > I had to modify a OPENSSH_CONF_OPTS of the openssh.mk package > makefile to solve a known interoperability issue (openssh vs > libopenssl). Now the fix is verified, i would like to create a patch > to be applied to this openssh.mk . > > However, while I already did a couple of patches to other packages, > they were always so far applied to the course code of the packages. In > this specific case, I do not know how to make this on the > buildroot/package/.mk file. > > Is there a preferred way to do so ? As far as I know, there isn't a way to do this within buildroot, because the buildroot tree is (has to be) immutable by the time buildroot runs. Put another way you can't patch what effectively becomes one vast Makefile from within that Makefile without badly upsetting make! The only options I have found are: 1. Write a wrapper script to unpack the buildroot tarball and apply your patches (note you may have problems if your patches change over time). 2. Have your own fork of buildroot git, and then your own branch from the relevant release tag with your changes on top. This means you can rebase your changes with git's help when you want to move to a newer buildroot. Convenient if the rest of your build is in git and you can use a git submodule to fetch your forked git automatically. 3. Don't try to modify the buildroot package, create your own custom-ssh package (copy of buildroot plus your patch) and maintain it in a buildroot external (see the manual). Could be a pain to keep up to date in the longer term. I'm not in any way a buildroot maintainer however! All of these are good reasons to get patches upstreamed (if possible) into buildroot! Richard From james.hilliard1 at gmail.com Sat Jan 1 18:00:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 11:00:04 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cffi: bump to version 1.15.0 Message-ID: <20220101180004.2499189-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-cffi/python-cffi.hash | 4 ++-- package/python-cffi/python-cffi.mk | 4 ++-- package/python3-cffi/python3-cffi.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash index 8ab672a56f..41565f9a62 100644 --- a/package/python-cffi/python-cffi.hash +++ b/package/python-cffi/python-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cffi/json -md5 5c118a18ea897df164dbff67a32876fc cffi-1.14.6.tar.gz -sha256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd cffi-1.14.6.tar.gz +md5 f3a3f26cd3335fc597479c9475da0a0b cffi-1.15.0.tar.gz +sha256 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 cffi-1.15.0.tar.gz # Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index 2504cf18f4..b14dce8225 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-cffi/python3-cffi.mk -PYTHON_CFFI_VERSION = 1.14.6 +PYTHON_CFFI_VERSION = 1.15.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk index 52ea3b3fbf..2770eda93e 100644 --- a/package/python3-cffi/python3-cffi.mk +++ b/package/python3-cffi/python3-cffi.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-cffi/python-cffi.mk -PYTHON3_CFFI_VERSION = 1.14.6 +PYTHON3_CFFI_VERSION = 1.15.0 PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz -PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 +PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a PYTHON3_CFFI_SETUP_TYPE = setuptools PYTHON3_CFFI_LICENSE = MIT PYTHON3_CFFI_LICENSE_FILES = LICENSE -- 2.25.1 From fontaine.fabrice at gmail.com Sat Jan 1 18:25:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 19:25:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/mdadm: bump to version 4.2 Message-ID: <20220101182557.1915942-1-fontaine.fabrice@gmail.com> - Drop first patch and use install-bin target added by https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=b4a5ad4958cb3ad87c3c5fa993e7572c38596d09 - Drop second patch (already in version) - Handle libudev optional dependency through CXFLAGS instead of overriding CFLAGS as wanted by upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=af3396dadfcd3b13480d021b8d3645c6d2420f79 - Update indentation in hash file (two spaces) https://www.spinics.net/lists/raid/msg69218.html Signed-off-by: Fabrice Fontaine --- ...-install-targets-for-mdadm-and-mdmon.patch | 32 ----------------- ...-include-sysmacros.h-unconditionally.patch | 35 ------------------- package/mdadm/mdadm.hash | 4 +-- package/mdadm/mdadm.mk | 21 +++++++---- 4 files changed, 17 insertions(+), 75 deletions(-) delete mode 100644 package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch delete mode 100644 package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch diff --git a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch b/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch deleted file mode 100644 index 15df7557e7..0000000000 --- a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Wed, 6 Mar 2013 16:03:14 +0100 -Subject: [PATCH] Add install targets for mdadm and mdmon - - -Signed-off-by: Christophe Vu-Brugier ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 315455b..27d8eeb 100644 ---- a/Makefile -+++ b/Makefile -@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h - sha1.o : sha1.c sha1.h md5.h - $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c - --install : mdadm mdmon install-man install-udev -+install : install-mdadm install-mdmon install-man install-udev -+ -+install-mdadm : - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm -+ -+install-mdmon : - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon - - install-static : mdadm.static install-man --- -1.7.10.4 - diff --git a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch b/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch deleted file mode 100644 index c8944c8475..0000000000 --- a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 6 Aug 2019 16:01:15 +0300 -Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally - -musl libc now also requires sys/sysmacros.h for the major/minor macros. -All supported libc implementations carry sys/sysmacros.h, including -diet-libc, klibc, and uclibc-ng. - -Cc: Hauke Mehrtens -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=linux-raid&m=156509677018508 - - mdadm.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/mdadm.h b/mdadm.h -index c36d7fdb10f6..d61a9ca82dc1 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - #include - #include - #include --#ifdef __GLIBC__ - /* Newer glibc requires sys/sysmacros.h directly for makedev() */ - #include --#endif - #ifdef __dietlibc__ - #include - /* dietlibc has deprecated random and srandom!! */ --- -2.20.1 - diff --git a/package/mdadm/mdadm.hash b/package/mdadm/mdadm.hash index b15cb4e031..b9631a2aaa 100644 --- a/package/mdadm/mdadm.hash +++ b/package/mdadm/mdadm.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a mdadm-4.1.tar.xz +sha256 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d mdadm-4.2.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 171782712f..6ee0bb60c9 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -4,14 +4,19 @@ # ################################################################################ -MDADM_VERSION = 4.1 +MDADM_VERSION = 4.2 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING -MDADM_BUILD_OPTS = $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" \ +MDADM_CXFLAGS = $(TARGET_CFLAGS) + +MDADM_BUILD_OPTS = \ + CC=$(TARGET_CC) \ + COROSYNC=-DNO_COROSYNC \ + DLM=-DNO_DLM \ + CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 @@ -19,14 +24,18 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) MDADM_BUILD_OPTS += USE_PTHREADS= endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +MDADM_DEPENDENCIES += udev +else +MDADM_CXFLAGS += -DNO_LIBUDEV +endif + define MDADM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(MDADM_BUILD_OPTS) mdadm mdmon endef define MDADM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) \ - install-mdadm install-mdmon + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin endef $(eval $(generic-package)) -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 18:36:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 19:36:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-lib: fix static build Message-ID: <20220101183612.1965455-1-fontaine.fabrice@gmail.com> Fix the following static build failure with alsa-utils raised since bump to version 1.2.6 in commit 4d4a588a504a6446dd0a29a353d94c6e86cfd879: checking for snd_tplg_new in -latopology... no configure: error: No linkable libatopology was found. Fixes: - http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 Signed-off-by: Fabrice Fontaine --- ...ser.c-drop-duplicate-safe_strtol_bas.patch | 51 +++++++++++ ...-safe_strto-functions-from-libasound.patch | 88 +++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch create mode 100644 package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch diff --git a/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch new file mode 100644 index 0000000000..a3741c42c0 --- /dev/null +++ b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch @@ -0,0 +1,51 @@ +From 47252054b4a2d5c8382cb1342f5d4eb89dabf95f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 17:20:47 +0100 +Subject: [PATCH] src/topology/parser.c: drop duplicate safe_strtol_base + +The safe_strtol_base() function is defined twice since + f547b2e3 ("conf: introduce safe_strtol_base()") and + 5fab157a ("topology: do not call strtol directly") +resulting in the following build failure when alsa-utils is built +statically because safe_strtol_base is defined twice. + +Fixes: http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 +Fixes: https://github.com/alsa-project/alsa-lib/pull/207 +Signed-off-by: Fabrice Fontaine +Signed-off-by: Jaroslav Kysela +[Retrieved from: +https://github.com/alsa-project/alsa-lib/commit/47252054b4a2d5c8382cb1342f5d4eb89dabf95f] +--- + src/topology/parser.c | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/src/topology/parser.c b/src/topology/parser.c +index 01c95afa..e70173f6 100644 +--- a/src/topology/parser.c ++++ b/src/topology/parser.c +@@ -21,25 +21,6 @@ + #include "list.h" + #include "tplg_local.h" + +-/* +- * Safe strtol call +- */ +-int safe_strtol_base(const char *str, long *val, int base) +-{ +- char *end; +- long v; +- if (!*str) +- return -EINVAL; +- errno = 0; +- v = strtol(str, &end, base); +- if (errno) +- return -errno; +- if (*end) +- return -EINVAL; +- *val = v; +- return 0; +-} +- + /* + * Get integer value + */ diff --git a/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch new file mode 100644 index 0000000000..3dfcb78b5c --- /dev/null +++ b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch @@ -0,0 +1,88 @@ +From c687c482107f746332dd18f7407f6c6efbffccb2 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sat, 1 Jan 2022 19:18:25 +0100 +Subject: [PATCH] conf: fix the export of safe_strto* functions from libasound + +Only one library should define the safe_strto function. Export it +correctly and add _snd_ prefix to avoid possible clashes with the other +application code. + +Fixes: 47252054 ("src/topology/parser.c: drop duplicate safe_strtol_base") +Fixes: https://github.com/alsa-project/alsa-lib/pull/208 +Signed-off-by: Jaroslav Kysela + +[Retrieved from: +https://github.com/alsa-project/alsa-lib/commit/c687c482107f746332dd18f7407f6c6efbffccb2] +Signed-off-by: Fabrice Fontaine +--- + include/local.h | 8 ++++++-- + src/Versions.in | 6 ++++++ + src/conf.c | 6 +++--- + 3 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/include/local.h b/include/local.h +index ebc9350c..f64fe9d8 100644 +--- a/include/local.h ++++ b/include/local.h +@@ -232,10 +232,14 @@ size_t page_align(size_t size); + size_t page_size(void); + size_t page_ptr(size_t object_offset, size_t object_size, size_t *offset, size_t *mmap_offset); + +-int safe_strtoll_base(const char *str, long long *val, int base); ++#define safe_strtoll_base _snd_safe_strtoll_base ++int _snd_safe_strtoll_base(const char *str, long long *val, int base); + static inline int safe_strtoll(const char *str, long long *val) { return safe_strtoll_base(str, val, 0); } +-int safe_strtol_base(const char *str, long *val, int base); ++#define safe_strtol_base _snd_safe_strtol_base ++int _snd_safe_strtol_base(const char *str, long *val, int base); + static inline int safe_strtol(const char *str, long *val) { return safe_strtol_base(str, val, 0); } ++#define safe_strtod _snd_safe_strtod ++int _snd_safe_strtod(const char *str, double *val); + + int snd_send_fd(int sock, void *data, size_t len, int fd); + int snd_receive_fd(int sock, void *data, size_t len, int *fd); +diff --git a/src/Versions.in b/src/Versions.in +index 5daccbd4..85031b38 100644 +--- a/src/Versions.in ++++ b/src/Versions.in +@@ -134,3 +134,9 @@ ALSA_1.1.6 { + + @SYMBOL_PREFIX at snd_dlopen; + } ALSA_0.9.7; ++ ++ALSA_1.2.6 { ++ global: ++ ++ @SYMBOL_PREFIX at _snd_safe_strto*; ++} ALSA_1.1.6; +diff --git a/src/conf.c b/src/conf.c +index d3597cbc..098ebd63 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -663,7 +663,7 @@ static int input_stdio_open(snd_input_t **inputp, const char *file, + return err; + } + +-int safe_strtoll_base(const char *str, long long *val, int base) ++int _snd_safe_strtoll_base(const char *str, long long *val, int base) + { + char *end; + long v; +@@ -679,7 +679,7 @@ int safe_strtoll_base(const char *str, long long *val, int base) + return 0; + } + +-int safe_strtol_base(const char *str, long *val, int base) ++int _snd_safe_strtol_base(const char *str, long *val, int base) + { + char *end; + long v; +@@ -695,7 +695,7 @@ int safe_strtol_base(const char *str, long *val, int base) + return 0; + } + +-static int safe_strtod(const char *str, double *val) ++int _snd_safe_strtod(const char *str, double *val) + { + char *end; + double v; -- 2.33.0 From james.hilliard1 at gmail.com Sat Jan 1 19:30:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:14 -0700 Subject: [Buildroot] [PATCH 1/5] package/python-tomli: new package Message-ID: <20220101193018.404937-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-tomli/Config.in | 7 +++++++ package/python-tomli/python-tomli.hash | 5 +++++ package/python-tomli/python-tomli.mk | 16 ++++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/python-tomli/Config.in create mode 100644 package/python-tomli/python-tomli.hash create mode 100644 package/python-tomli/python-tomli.mk diff --git a/DEVELOPERS b/DEVELOPERS index 21e4f2a84c..e14842575a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1292,6 +1292,7 @@ F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ +F: package/python-tomli/ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ diff --git a/package/Config.in b/package/Config.in index d3d0717535..a34323175d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1254,6 +1254,7 @@ menu "External python modules" source "package/python-tinyrpc/Config.in" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" + source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in new file mode 100644 index 0000000000..e1cecaaa36 --- /dev/null +++ b/package/python-tomli/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TOMLI + bool "python-tomli" + depends on BR2_PACKAGE_PYTHON3 + help + A lil' TOML parser. + + https://github.com/hukkin/tomli diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash new file mode 100644 index 0000000000..1a274c8a40 --- /dev/null +++ b/package/python-tomli/python-tomli.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tomli/json +md5 2ecbc7a23b8c8dc2fe96f588f88463d9 tomli-1.2.0.tar.gz +sha256 d60e681734099207a6add7a10326bc2ddd1fdc36c1b0f547d00ef73ac63739c2 tomli-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk new file mode 100644 index 0000000000..4e6b023ef7 --- /dev/null +++ b/package/python-tomli/python-tomli.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-tomli +# +################################################################################ + +PYTHON_TOMLI_VERSION = 1.2.0 +PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa +PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_LICENSE = MIT +PYTHON_TOMLI_LICENSE_FILES = LICENSE +HOST_PYTHON_TOMLI_NEEDS_HOST_PYTHON = python3 + +$(eval $(python-package)) +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:30:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:15 -0700 Subject: [Buildroot] [PATCH 2/5] package/python-pyparsing: enable host build In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220101193018.404937-2-james.hilliard1@gmail.com> This will be required by host-python-packaging. Signed-off-by: James Hilliard --- package/python-pyparsing/python-pyparsing.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 0dacf2371d..5741458d65 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -10,5 +10,7 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools +HOST_PYTHON_PYPARSING_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:30:16 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:16 -0700 Subject: [Buildroot] [PATCH 3/5] package/python-packaging: enable host build In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220101193018.404937-3-james.hilliard1@gmail.com> This is required by python-setuptools-scm. Signed-off-by: James Hilliard --- package/python-packaging/python-packaging.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 6b54d2416d..e2fb9b120b 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -10,5 +10,8 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3a PYTHON_PACKAGING_SETUP_TYPE = setuptools PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD +HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:30:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:17 -0700 Subject: [Buildroot] [PATCH 4/5] package/python-setuptools-scm: bump to version 6.3.2 In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220101193018.404937-4-james.hilliard1@gmail.com> Add new host-python-packaging and host-python-tomli dependencies. Signed-off-by: James Hilliard --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 79999fca0d..22b9afd2c2 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 c11bf23d80224691a46ee5deb84c42db setuptools_scm-5.0.1.tar.gz -sha256 c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a setuptools_scm-5.0.1.tar.gz +md5 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz +sha256 a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 setuptools_scm-6.3.2.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index caca6d4314..f7f4e3ef27 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 5.0.1 +PYTHON_SETUPTOOLS_SCM_VERSION = 6.3.2 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/af/df/f8aa8a78d4d29e0cffa4512e9bc223ed02f24893fe1837c6cee2749ebd67 +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4b/0d/ecb9595fae02467edba5023eb8a23c688d2b438a6a8d1a9e2b8649faf23d PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools +HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli $(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:30:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:18 -0700 Subject: [Buildroot] [PATCH 5/5] package/python-argon2-cffi-bindings: new package In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220101193018.404937-5-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-argon2-cffi-bindings/Config.in | 11 ++++++++ .../python-argon2-cffi-bindings.hash | 5 ++++ .../python-argon2-cffi-bindings.mk | 25 +++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/python-argon2-cffi-bindings/Config.in create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk diff --git a/DEVELOPERS b/DEVELOPERS index e14842575a..1f9516da87 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1270,6 +1270,7 @@ F: package/python-aiorwlock/ F: package/python-aiosignal/ F: package/python-aiozipkin/ F: package/python-argon2-cffi/ +F: package/python-argon2-cffi-bindings/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-bidict/ diff --git a/package/Config.in b/package/Config.in index a34323175d..f5c4c23e27 100644 --- a/package/Config.in +++ b/package/Config.in @@ -917,6 +917,7 @@ menu "External python modules" source "package/python-ansicolors/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" + source "package/python-argon2-cffi-bindings/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in new file mode 100644 index 0000000000..3d409759e0 --- /dev/null +++ b/package/python-argon2-cffi-bindings/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS + bool "python-argon2-cffi-bindings" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU # libargon2 + depends on !BR2_STATIC_LIBS # libargon2 + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_LIBARGON2 + help + Low-level CFFI bindings for Argon2. + + https://github.com/hynek/argon2-cffi-bindings diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash new file mode 100644 index 0000000000..e088d3dad1 --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/argon2-cffi-bindings/json +md5 f1591e1af7dea9ef3e5b982e2c196c1d argon2-cffi-bindings-21.2.0.tar.gz +sha256 bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 argon2-cffi-bindings-21.2.0.tar.gz +# Locally computed sha256 checksums +sha256 9c158d4f433627f48ac24b6b4d37970afe4172514673c5318014d7cca157c6df LICENSE diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk new file mode 100644 index 0000000000..f0d71e803a --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# python-argon2-cffi-bindings +# +################################################################################ + +PYTHON_ARGON2_CFFI_BINDINGS_VERSION = 21.2.0 +PYTHON_ARGON2_CFFI_BINDINGS_SOURCE = argon2-cffi-bindings-$(PYTHON_ARGON2_CFFI_BINDINGS_VERSION).tar.gz +PYTHON_ARGON2_CFFI_BINDINGS_SITE = https://files.pythonhosted.org/packages/b9/e9/184b8ccce6683b0aa2fbb7ba5683ea4b9c5763f1356347f1312c32e3c66e +PYTHON_ARGON2_CFFI_BINDINGS_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE = MIT +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE_FILES = LICENSE +PYTHON_ARGON2_CFFI_BINDINGS_DEPENDENCIES = \ + host-python-cffi \ + host-python-setuptools-scm \ + libargon2 +PYTHON_ARGON2_CFFI_BINDINGS_ENV = ARGON2_CFFI_USE_SYSTEM=1 + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=1 +else +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=0 +endif + +$(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:59:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:59:10 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aioredis: bump to version 2.0.1 Message-ID: <20220101195910.406035-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aioredis/python-aioredis.hash | 4 ++-- package/python-aioredis/python-aioredis.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioredis/python-aioredis.hash b/package/python-aioredis/python-aioredis.hash index ca3f64d1e5..29e6361014 100644 --- a/package/python-aioredis/python-aioredis.hash +++ b/package/python-aioredis/python-aioredis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioredis/json -md5 343a451df2381b9ea368e12b9075caa5 aioredis-2.0.0.tar.gz -sha256 3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db aioredis-2.0.0.tar.gz +md5 8f3547af83ef4b863b18c19f23166a9d aioredis-2.0.1.tar.gz +sha256 eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e aioredis-2.0.1.tar.gz # Locally computed sha256 checksums sha256 183b21f240e41af611c951d01d4f36793d470a82d5fd79efc21f25ae4cf68543 LICENSE diff --git a/package/python-aioredis/python-aioredis.mk b/package/python-aioredis/python-aioredis.mk index 21a8a349c5..798dbd0c3c 100644 --- a/package/python-aioredis/python-aioredis.mk +++ b/package/python-aioredis/python-aioredis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOREDIS_VERSION = 2.0.0 +PYTHON_AIOREDIS_VERSION = 2.0.1 PYTHON_AIOREDIS_SOURCE = aioredis-$(PYTHON_AIOREDIS_VERSION).tar.gz -PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/92/60/a3cb5fadc254cc6e709ba14a02531870b02386b8c7bb147bf80a2be93f76 +PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/2e/cf/9eb144a0b05809ffc5d29045c4b51039000ea275bc1268d0351c9e7dfc06 PYTHON_AIOREDIS_SETUP_TYPE = setuptools PYTHON_AIOREDIS_LICENSE = MIT PYTHON_AIOREDIS_LICENSE_FILES = LICENSE -- 2.25.1 From thomas.petazzoni at bootlin.com Sat Jan 1 20:09:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 1 Jan 2022 21:09:57 +0100 Subject: [Buildroot] [buildroot-test] scripts/autobuild-run: extend timeout from 120 to 180 minutes In-Reply-To: <9c4d8993-46b2-8f1a-6aa3-bdd9957b783c@benettiengineering.com> References: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> <20220101115058.0515c8d9@windsurf> <9c4d8993-46b2-8f1a-6aa3-bdd9957b783c@benettiengineering.com> Message-ID: <20220101210957.0fde77e5@windsurf> Hello, On Sat, 1 Jan 2022 16:10:09 +0100 Giulio Benetti wrote: > > Please > > note that this HUNG_BUILD_TIMEOUT value is the per-step timeout: it > > verifies that one step of one particular package doesn't take more than > > 120 minutes. > > Ah, I thought the entire build, but that makes no sense since some build > can take way more than 2 hours. There used to be a global timeout for the build, but we had false positives when really large configurations were built. Due to this, commit 86892c63f754b4f6c9a4a517fde30160127b3506 change to a more fine grained timeout: we monitor the file build-time.log (which gets appended everytime the step of a package starts or ends), and we time out after HUNG_BUILD_TIMEOUT minutes if that file hasn't changed; > > Did you identify that the python-uvloop and python-lxml packages really > > took more than 2 hours to build? I did see at > > http://autobuild.buildroot.net/?status=TIMEOUT those timeouts dating > > back from ~November. Did you reproduce the issue, and verified that the > > build indeed completes at some point? In general, if a simple package > > such as python-uvloop or python-lxml takes more than 2 hours to build, > > it means that the compiler (or linker) has gone crazy in an infinite > > loop, and the build will in fact never finish. > > It was only my suspicious as specified in commit log. I couldn't > reproduce it and I thought it was due to the autobuilder's host. > > And yes, now that I know it's a per-step timeout it doesn't make sense > at all for such little packages. Yes, for such small packages, it clearly hints at a compiler/linker bug that stays stuck in an infinite loop. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From giulio.benetti at benettiengineering.com Sat Jan 1 20:43:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 1 Jan 2022 21:43:30 +0100 Subject: [Buildroot] [buildroot-test] scripts/autobuild-run: extend timeout from 120 to 180 minutes In-Reply-To: <20220101210957.0fde77e5@windsurf> References: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> <20220101115058.0515c8d9@windsurf> <9c4d8993-46b2-8f1a-6aa3-bdd9957b783c@benettiengineering.com> <20220101210957.0fde77e5@windsurf> Message-ID: <56356313-5055-5bb4-e69d-c5ed8d16c274@benettiengineering.com> On 01/01/22 21:09, Thomas Petazzoni wrote: > Hello, > > On Sat, 1 Jan 2022 16:10:09 +0100 > Giulio Benetti wrote: > >>> Please >>> note that this HUNG_BUILD_TIMEOUT value is the per-step timeout: it >>> verifies that one step of one particular package doesn't take more than >>> 120 minutes. >> >> Ah, I thought the entire build, but that makes no sense since some build >> can take way more than 2 hours. > > There used to be a global timeout for the build, but we had false > positives when really large configurations were built. Due to this, > commit 86892c63f754b4f6c9a4a517fde30160127b3506 change to a more fine > grained timeout: we monitor the file build-time.log (which gets > appended everytime the step of a package starts or ends), and we time > out after HUNG_BUILD_TIMEOUT minutes if that file hasn't changed; Thank you for the explanation >>> Did you identify that the python-uvloop and python-lxml packages really >>> took more than 2 hours to build? I did see at >>> http://autobuild.buildroot.net/?status=TIMEOUT those timeouts dating >>> back from ~November. Did you reproduce the issue, and verified that the >>> build indeed completes at some point? In general, if a simple package >>> such as python-uvloop or python-lxml takes more than 2 hours to build, >>> it means that the compiler (or linker) has gone crazy in an infinite >>> loop, and the build will in fact never finish. >> >> It was only my suspicious as specified in commit log. I couldn't >> reproduce it and I thought it was due to the autobuilder's host. >> >> And yes, now that I know it's a per-step timeout it doesn't make sense >> at all for such little packages. > > Yes, for such small packages, it clearly hints at a compiler/linker bug > that stays stuck in an infinite loop. Yes, that was the reason I was looking for in the beginning :-) Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Sat Jan 1 21:08:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:08:57 +0100 Subject: [Buildroot] [PATCH 2/3] utils/test-pkg: add ability to fail when skipped In-Reply-To: <20211201230827.35080-2-matthew.weber@collins.com> References: <20211201230827.35080-1-matthew.weber@collins.com> <20211201230827.35080-2-matthew.weber@collins.com> Message-ID: <20220101210857.GA69135@scaer> Matthew, All, On 2021-12-01 17:08 -0600, Matthew Weber via buildroot spake thusly: > Add flag to allow the return value to be incremented when a skip > happens, treating the overall run as a failure. > > This flag could be used when using test-pkg for local validation of > downstream packages, for example in a user's br2-external. An example of > this could be a user choosing to use test-pkg as part of a CI > infrastructure where the fragment and toolchains are tightly controlled > to test a package against multiple toolchains easily. > > In this case, the user would want to lower the rate of false-positives > of that fragment/toolchain configuration if a build is instead skipped > (which may happen in the case of buildroot version bumps where > dependencies could change). I am a bit skeptical about this use-case. As I understand it, wht is most interesting in a CI setup for internal development, is that *all* internal packages do build togetrher and form a working sysem *as a whole*. As such, a CI setup would build the defconfig file(s) for a project (and run the integration test-suite), rather than build each package individually Building each package individually with test-pkg would have the disadvantage that it takes more time overall, as all the common deps are build as many times as there are packages to test, and package are also dependencies one of the others, so most packages would be built more than once as well... So, I am really not convinced... Regards, Yann E. MORIN. > Signed-off-by: Matthew Weber > --- > utils/test-pkg | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index d0472f176b..97957008fa 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -18,8 +18,8 @@ main() { > local -a toolchains > local pkg_br_name > > - o='hakc:d:n:p:r:t:e:' > - O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,' > + o='hakc:d:n:p:r:t:e:f' > + O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,fail-on-skip' > opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" > eval set -- "${opts}" > > @@ -29,6 +29,7 @@ main() { > number=0 > mode=0 > prepare_only=0 > + fail_on_skip=0 > toolchains_csv="${TOOLCHAINS_CSV}" > while [ ${#} -gt 0 ]; do > case "${1}" in > @@ -65,6 +66,9 @@ main() { > (-e|--externals) > BR2_EXTERNALS="${2}"; shift 2 > ;; > + (-f|--fail-on-skip) > + fail_on_skip=1; shift 1 > + ;; > (--) > shift; break > ;; > @@ -147,7 +151,12 @@ main() { > printf "%d builds, %d skipped, %d build failed, %d legal-info failed\n" \ > ${nb} ${nb_skip} ${nb_fail} ${nb_legal} > > - return $((nb_fail + nb_legal)) > + nb_result=$((nb_fail + nb_legal)) > + if [ ${fail_on_skip} ]; then > + nb_result=$((nb_result + nb_skip)) > + fi > + > + return $nb_result > } > > build_one() { > @@ -279,6 +288,9 @@ Options: > Externals to be used as part of the build process. Packages from > within these externals may be tested. > > + -f, --fail-on-skip > + If any builds are skipped, return a negative exit value. > + > Example: > > Testing libcec would require a config snippet that contains: > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sat Jan 1 21:09:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 1 Jan 2022 22:09:52 +0100 Subject: [Buildroot] [PATCH] package/libnss: fix build failure with make version 4.3 Message-ID: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> Make 4.3 is buggy and when parallel building host-libnss/libnss we end up with a failure thrown by make itself. So let's work-around this by don't parallel build the package if Make version is 4.3. Signed-off-by: Giulio Benetti --- package/libnss/libnss.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e2f7521b47..b6279fa921 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING LIBNSS_CPE_ID_VENDOR = mozilla LIBNSS_CPE_ID_PRODUCT = nss +# Don't parallel build if make version = 4.3 +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) +LIBNSS_MAKE = $(MAKE1) +else +LIBNSS_MAKE = $(MAKE) +endif + LIBNSS_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) @@ -71,12 +78,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 endif define HOST_LIBNSS_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(HOST_LIBNSS_BUILD_VARS) - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 21:33:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 14:33:46 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cbor2: bump to version 5.4.2 Message-ID: <20220101213346.408623-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-cbor2/python-cbor2.hash | 4 ++-- package/python-cbor2/python-cbor2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index 879463c2ce..9910e632a2 100644 --- a/package/python-cbor2/python-cbor2.hash +++ b/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 87b3ad8a9dd8875fa46c6ec06e3fb0ba cbor2-5.4.1.tar.gz -sha256 a8bf432f6cb595f50aeb8fed2a4aa3b3f7caa7f135fb57e4378eaa39242feac9 cbor2-5.4.1.tar.gz +md5 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz +sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz # Locally computed sha256 checksums sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index af42d0344a..4cc09a219f 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.1 +PYTHON_CBOR2_VERSION = 5.4.2 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/9e/25/9dd432c051010faea6a702cb85d0b53dc9d5414513866b6a73b3ac954092 +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 1 21:33:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:33:20 +0100 Subject: [Buildroot] [git commit] package/libnss: fix build failure with make version 4.3 Message-ID: <20220101212839.D87DF82963@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=540029eb4550760c2190a18ecbf0cb4391bb1dea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make 4.3 is buggy and when parallel building host-libnss/libnss we end up with a failure thrown by make itself. So let's work-around this by don't parallel build the package if Make version is 4.3. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/libnss/libnss.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e2f7521b47..b6279fa921 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING LIBNSS_CPE_ID_VENDOR = mozilla LIBNSS_CPE_ID_PRODUCT = nss +# Don't parallel build if make version = 4.3 +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) +LIBNSS_MAKE = $(MAKE1) +else +LIBNSS_MAKE = $(MAKE) +endif + LIBNSS_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) @@ -71,12 +78,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 endif define HOST_LIBNSS_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(HOST_LIBNSS_BUILD_VARS) - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ From yann.morin.1998 at free.fr Sat Jan 1 21:34:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:34:59 +0100 Subject: [Buildroot] [PATCH] package/libnss: fix build failure with make version 4.3 In-Reply-To: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> References: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> Message-ID: <20220101213459.GB69135@scaer> Giulio, All, On 2022-01-01 22:09 +0100, Giulio Benetti spake thusly: > Make 4.3 is buggy and when parallel building host-libnss/libnss we end up > with a failure thrown by make itself. So let's work-around this by don't > parallel build the package if Make version is 4.3. > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libnss/libnss.mk | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk > index e2f7521b47..b6279fa921 100644 > --- a/package/libnss/libnss.mk > +++ b/package/libnss/libnss.mk > @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING > LIBNSS_CPE_ID_VENDOR = mozilla > LIBNSS_CPE_ID_PRODUCT = nss > > +# Don't parallel build if make version = 4.3 > +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) > +LIBNSS_MAKE = $(MAKE1) > +else > +LIBNSS_MAKE = $(MAKE) > +endif > + > LIBNSS_CFLAGS = $(TARGET_CFLAGS) > > ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) > @@ -71,12 +78,12 @@ endif > endif > > define LIBNSS_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ > + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > $(LIBNSS_BUILD_VARS) > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ > + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 > endif > > define HOST_LIBNSS_BUILD_CMDS > - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ > + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > $(HOST_LIBNSS_BUILD_VARS) > - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ > + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 21:37:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:37:47 +0100 Subject: [Buildroot] [git commit] package/alsa-lib: fix static build Message-ID: <20220101213259.2F50F82A1F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0629443499230b1dd4ab77c3e469d778ad1b2a66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure with alsa-utils raised since bump to version 1.2.6 in commit 4d4a588a504a6446dd0a29a353d94c6e86cfd879: checking for snd_tplg_new in -latopology... no configure: error: No linkable libatopology was found. Fixes: - http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...y-parser.c-drop-duplicate-safe_strtol_bas.patch | 51 +++++++++++++ ...rt-of-safe_strto-functions-from-libasound.patch | 88 ++++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch new file mode 100644 index 0000000000..a3741c42c0 --- /dev/null +++ b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch @@ -0,0 +1,51 @@ +From 47252054b4a2d5c8382cb1342f5d4eb89dabf95f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 17:20:47 +0100 +Subject: [PATCH] src/topology/parser.c: drop duplicate safe_strtol_base + +The safe_strtol_base() function is defined twice since + f547b2e3 ("conf: introduce safe_strtol_base()") and + 5fab157a ("topology: do not call strtol directly") +resulting in the following build failure when alsa-utils is built +statically because safe_strtol_base is defined twice. + +Fixes: http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 +Fixes: https://github.com/alsa-project/alsa-lib/pull/207 +Signed-off-by: Fabrice Fontaine +Signed-off-by: Jaroslav Kysela +[Retrieved from: +https://github.com/alsa-project/alsa-lib/commit/47252054b4a2d5c8382cb1342f5d4eb89dabf95f] +--- + src/topology/parser.c | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/src/topology/parser.c b/src/topology/parser.c +index 01c95afa..e70173f6 100644 +--- a/src/topology/parser.c ++++ b/src/topology/parser.c +@@ -21,25 +21,6 @@ + #include "list.h" + #include "tplg_local.h" + +-/* +- * Safe strtol call +- */ +-int safe_strtol_base(const char *str, long *val, int base) +-{ +- char *end; +- long v; +- if (!*str) +- return -EINVAL; +- errno = 0; +- v = strtol(str, &end, base); +- if (errno) +- return -errno; +- if (*end) +- return -EINVAL; +- *val = v; +- return 0; +-} +- + /* + * Get integer value + */ diff --git a/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch new file mode 100644 index 0000000000..3dfcb78b5c --- /dev/null +++ b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch @@ -0,0 +1,88 @@ +From c687c482107f746332dd18f7407f6c6efbffccb2 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sat, 1 Jan 2022 19:18:25 +0100 +Subject: [PATCH] conf: fix the export of safe_strto* functions from libasound + +Only one library should define the safe_strto function. Export it +correctly and add _snd_ prefix to avoid possible clashes with the other +application code. + +Fixes: 47252054 ("src/topology/parser.c: drop duplicate safe_strtol_base") +Fixes: https://github.com/alsa-project/alsa-lib/pull/208 +Signed-off-by: Jaroslav Kysela + +[Retrieved from: +https://github.com/alsa-project/alsa-lib/commit/c687c482107f746332dd18f7407f6c6efbffccb2] +Signed-off-by: Fabrice Fontaine +--- + include/local.h | 8 ++++++-- + src/Versions.in | 6 ++++++ + src/conf.c | 6 +++--- + 3 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/include/local.h b/include/local.h +index ebc9350c..f64fe9d8 100644 +--- a/include/local.h ++++ b/include/local.h +@@ -232,10 +232,14 @@ size_t page_align(size_t size); + size_t page_size(void); + size_t page_ptr(size_t object_offset, size_t object_size, size_t *offset, size_t *mmap_offset); + +-int safe_strtoll_base(const char *str, long long *val, int base); ++#define safe_strtoll_base _snd_safe_strtoll_base ++int _snd_safe_strtoll_base(const char *str, long long *val, int base); + static inline int safe_strtoll(const char *str, long long *val) { return safe_strtoll_base(str, val, 0); } +-int safe_strtol_base(const char *str, long *val, int base); ++#define safe_strtol_base _snd_safe_strtol_base ++int _snd_safe_strtol_base(const char *str, long *val, int base); + static inline int safe_strtol(const char *str, long *val) { return safe_strtol_base(str, val, 0); } ++#define safe_strtod _snd_safe_strtod ++int _snd_safe_strtod(const char *str, double *val); + + int snd_send_fd(int sock, void *data, size_t len, int fd); + int snd_receive_fd(int sock, void *data, size_t len, int *fd); +diff --git a/src/Versions.in b/src/Versions.in +index 5daccbd4..85031b38 100644 +--- a/src/Versions.in ++++ b/src/Versions.in +@@ -134,3 +134,9 @@ ALSA_1.1.6 { + + @SYMBOL_PREFIX at snd_dlopen; + } ALSA_0.9.7; ++ ++ALSA_1.2.6 { ++ global: ++ ++ @SYMBOL_PREFIX at _snd_safe_strto*; ++} ALSA_1.1.6; +diff --git a/src/conf.c b/src/conf.c +index d3597cbc..098ebd63 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -663,7 +663,7 @@ static int input_stdio_open(snd_input_t **inputp, const char *file, + return err; + } + +-int safe_strtoll_base(const char *str, long long *val, int base) ++int _snd_safe_strtoll_base(const char *str, long long *val, int base) + { + char *end; + long v; +@@ -679,7 +679,7 @@ int safe_strtoll_base(const char *str, long long *val, int base) + return 0; + } + +-int safe_strtol_base(const char *str, long *val, int base) ++int _snd_safe_strtol_base(const char *str, long *val, int base) + { + char *end; + long v; +@@ -695,7 +695,7 @@ int safe_strtol_base(const char *str, long *val, int base) + return 0; + } + +-static int safe_strtod(const char *str, double *val) ++int _snd_safe_strtod(const char *str, double *val) + { + char *end; + double v; From yann.morin.1998 at free.fr Sat Jan 1 21:39:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:39:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-lib: fix static build In-Reply-To: <20220101183612.1965455-1-fontaine.fabrice@gmail.com> References: <20220101183612.1965455-1-fontaine.fabrice@gmail.com> Message-ID: <20220101213922.GC69135@scaer> Fabrice, All, On 2022-01-01 19:36 +0100, Fabrice Fontaine spake thusly: > Fix the following static build failure with alsa-utils raised since bump > to version 1.2.6 in commit 4d4a588a504a6446dd0a29a353d94c6e86cfd879: > > checking for snd_tplg_new in -latopology... no > configure: error: No linkable libatopology was found. > > Fixes: > - http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ser.c-drop-duplicate-safe_strtol_bas.patch | 51 +++++++++++ > ...-safe_strto-functions-from-libasound.patch | 88 +++++++++++++++++++ > 2 files changed, 139 insertions(+) > create mode 100644 package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch > create mode 100644 package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch > > diff --git a/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch > new file mode 100644 > index 0000000000..a3741c42c0 > --- /dev/null > +++ b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch > @@ -0,0 +1,51 @@ > +From 47252054b4a2d5c8382cb1342f5d4eb89dabf95f Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 1 Jan 2022 17:20:47 +0100 > +Subject: [PATCH] src/topology/parser.c: drop duplicate safe_strtol_base > + > +The safe_strtol_base() function is defined twice since > + f547b2e3 ("conf: introduce safe_strtol_base()") and > + 5fab157a ("topology: do not call strtol directly") > +resulting in the following build failure when alsa-utils is built > +statically because safe_strtol_base is defined twice. > + > +Fixes: http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 > +Fixes: https://github.com/alsa-project/alsa-lib/pull/207 > +Signed-off-by: Fabrice Fontaine > +Signed-off-by: Jaroslav Kysela > +[Retrieved from: > +https://github.com/alsa-project/alsa-lib/commit/47252054b4a2d5c8382cb1342f5d4eb89dabf95f] > +--- > + src/topology/parser.c | 19 ------------------- > + 1 file changed, 19 deletions(-) > + > +diff --git a/src/topology/parser.c b/src/topology/parser.c > +index 01c95afa..e70173f6 100644 > +--- a/src/topology/parser.c > ++++ b/src/topology/parser.c > +@@ -21,25 +21,6 @@ > + #include "list.h" > + #include "tplg_local.h" > + > +-/* > +- * Safe strtol call > +- */ > +-int safe_strtol_base(const char *str, long *val, int base) > +-{ > +- char *end; > +- long v; > +- if (!*str) > +- return -EINVAL; > +- errno = 0; > +- v = strtol(str, &end, base); > +- if (errno) > +- return -errno; > +- if (*end) > +- return -EINVAL; > +- *val = v; > +- return 0; > +-} > +- > + /* > + * Get integer value > + */ > diff --git a/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch > new file mode 100644 > index 0000000000..3dfcb78b5c > --- /dev/null > +++ b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch > @@ -0,0 +1,88 @@ > +From c687c482107f746332dd18f7407f6c6efbffccb2 Mon Sep 17 00:00:00 2001 > +From: Jaroslav Kysela > +Date: Sat, 1 Jan 2022 19:18:25 +0100 > +Subject: [PATCH] conf: fix the export of safe_strto* functions from libasound > + > +Only one library should define the safe_strto function. Export it > +correctly and add _snd_ prefix to avoid possible clashes with the other > +application code. > + > +Fixes: 47252054 ("src/topology/parser.c: drop duplicate safe_strtol_base") > +Fixes: https://github.com/alsa-project/alsa-lib/pull/208 > +Signed-off-by: Jaroslav Kysela > + > +[Retrieved from: > +https://github.com/alsa-project/alsa-lib/commit/c687c482107f746332dd18f7407f6c6efbffccb2] > +Signed-off-by: Fabrice Fontaine > +--- > + include/local.h | 8 ++++++-- > + src/Versions.in | 6 ++++++ > + src/conf.c | 6 +++--- > + 3 files changed, 15 insertions(+), 5 deletions(-) > + > +diff --git a/include/local.h b/include/local.h > +index ebc9350c..f64fe9d8 100644 > +--- a/include/local.h > ++++ b/include/local.h > +@@ -232,10 +232,14 @@ size_t page_align(size_t size); > + size_t page_size(void); > + size_t page_ptr(size_t object_offset, size_t object_size, size_t *offset, size_t *mmap_offset); > + > +-int safe_strtoll_base(const char *str, long long *val, int base); > ++#define safe_strtoll_base _snd_safe_strtoll_base > ++int _snd_safe_strtoll_base(const char *str, long long *val, int base); > + static inline int safe_strtoll(const char *str, long long *val) { return safe_strtoll_base(str, val, 0); } > +-int safe_strtol_base(const char *str, long *val, int base); > ++#define safe_strtol_base _snd_safe_strtol_base > ++int _snd_safe_strtol_base(const char *str, long *val, int base); > + static inline int safe_strtol(const char *str, long *val) { return safe_strtol_base(str, val, 0); } > ++#define safe_strtod _snd_safe_strtod > ++int _snd_safe_strtod(const char *str, double *val); > + > + int snd_send_fd(int sock, void *data, size_t len, int fd); > + int snd_receive_fd(int sock, void *data, size_t len, int *fd); > +diff --git a/src/Versions.in b/src/Versions.in > +index 5daccbd4..85031b38 100644 > +--- a/src/Versions.in > ++++ b/src/Versions.in > +@@ -134,3 +134,9 @@ ALSA_1.1.6 { > + > + @SYMBOL_PREFIX at snd_dlopen; > + } ALSA_0.9.7; > ++ > ++ALSA_1.2.6 { > ++ global: > ++ > ++ @SYMBOL_PREFIX at _snd_safe_strto*; > ++} ALSA_1.1.6; > +diff --git a/src/conf.c b/src/conf.c > +index d3597cbc..098ebd63 100644 > +--- a/src/conf.c > ++++ b/src/conf.c > +@@ -663,7 +663,7 @@ static int input_stdio_open(snd_input_t **inputp, const char *file, > + return err; > + } > + > +-int safe_strtoll_base(const char *str, long long *val, int base) > ++int _snd_safe_strtoll_base(const char *str, long long *val, int base) > + { > + char *end; > + long v; > +@@ -679,7 +679,7 @@ int safe_strtoll_base(const char *str, long long *val, int base) > + return 0; > + } > + > +-int safe_strtol_base(const char *str, long *val, int base) > ++int _snd_safe_strtol_base(const char *str, long *val, int base) > + { > + char *end; > + long v; > +@@ -695,7 +695,7 @@ int safe_strtol_base(const char *str, long *val, int base) > + return 0; > + } > + > +-static int safe_strtod(const char *str, double *val) > ++int _snd_safe_strtod(const char *str, double *val) > + { > + char *end; > + double v; > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sat Jan 1 21:40:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 1 Jan 2022 22:40:34 +0100 Subject: [Buildroot] [PATCH] Makefile: disable 'printvars' and 'show-vars' recipes for Make 4.3 Message-ID: <20220101214034.2152144-1-giulio.benetti@benettiengineering.com> Make 4.3 is buggy and leads to a "Segmentation fault (core dumped)" when calling 'make printvars' or 'make show-vars', so let's refuse to execute those recipes if Make 4.3 by adding 'check-make-version' recipe as depedendency of 'printvars' and 'show-vars' as suggested by Yann E. Morin. Signed-off-by: Giulio Benetti --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0b8c7b2867..ac98b84425 100644 --- a/Makefile +++ b/Makefile @@ -1058,13 +1058,20 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif +.PHONY: check-make-version +check-make-version: +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) + @echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes" + @exit 1 +endif + # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are # displayed. # show-vars does the same, but as a JSON dictionnary. .PHONY: printvars -printvars: +printvars: check-make-version @: $(foreach V, \ $(sort $(filter $(VARS),$(.VARIABLES))), \ @@ -1077,7 +1084,7 @@ printvars: .PHONY: show-vars show-vars: VARS?=% -show-vars: +show-vars: check-make-version @: $(info $(call clean-json, { \ $(foreach V, \ -- 2.25.1 From ju.o at free.fr Sat Jan 1 21:39:48 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 1 Jan 2022 22:39:48 +0100 Subject: [Buildroot] [PATCH 1/1] support/config-fragments/autobuild: fix riscv64 toolchain configs Message-ID: <20220101213948.265173-1-ju.o@free.fr> commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 toolchains by RISC-V LP64D. The config symbols BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. Those changes were not reflected in the autobuild toolchain configs in support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config When testing a package with the command: ./utils/test-pkg --all --package somepackage bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build logfile contains: [...] Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y Actual value: Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set This commit update the autobuild config fragments for RISC-V 64bit toolchains so they can be used by test-pkg. Signed-off-by: Julien Olivain --- .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config index f6c6fcaa36..433a6e89f7 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config index 2b6a6e56da..fee1f29f4a 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config @@ -1,4 +1,4 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y -- 2.33.1 From fontaine.fabrice at gmail.com Sat Jan 1 21:40:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 22:40:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/jose: bump to version 11 Message-ID: <20220101214034.2000480-1-fontaine.fabrice@gmail.com> - Switch to meson-package (and so drop second patch) - Update indentation in hash file (two spaces) https://github.com/latchset/jose/releases/tag/v11 Signed-off-by: Fabrice Fontaine --- ...nfigure-fix-build-with-old-compilers.patch | 165 ------------------ package/jose/jose.hash | 4 +- package/jose/jose.mk | 8 +- 3 files changed, 5 insertions(+), 172 deletions(-) delete mode 100644 package/jose/0002-configure-fix-build-with-old-compilers.patch diff --git a/package/jose/0002-configure-fix-build-with-old-compilers.patch b/package/jose/0002-configure-fix-build-with-old-compilers.patch deleted file mode 100644 index 0484f38f0d..0000000000 --- a/package/jose/0002-configure-fix-build-with-old-compilers.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 98e9faa4d39cd5b6aaab882877e19ae394ba3810 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Nov 2017 23:10:38 +0100 -Subject: [PATCH] configure: fix build with old compilers - -Old gcc versions (gcc 4.7) do not support all warnings flags currently -hard-coded by configure.ac. In order to fix this, we import the -AX_CHECK_COMPILE_FLAG() macro from the autoconf-archive, and use it in -the configure.ac to only use warning flags when the compiler supports -them. - -Submitted-upstream: https://github.com/latchset/jose/pull/51 -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 46 +++++++++++++++------------- - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 105 insertions(+), 22 deletions(-) - create mode 100644 m4/ax_check_compile_flag.m4 - -diff --git a/configure.ac b/configure.ac -index cf8c9a6..6fe4ded 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,6 @@ - AC_PREREQ(2.62) - AC_INIT(jose, 10) -+AC_CONFIG_MACRO_DIRS([m4]) - AC_CANONICAL_SYSTEM - AC_PROG_CC_C99 - -@@ -18,27 +19,30 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.0.2]) - AC_OPENMP - AC_SUBST([OPENMP_CFLAGS]) - --JOSE_CFLAGS="\ ---Wall \ ---Wextra \ ---Werror \ ---Wstrict-aliasing \ ---Wchar-subscripts \ ---Wformat-security \ ---Wmissing-declarations \ ---Wmissing-prototypes \ ---Wnested-externs \ ---Wpointer-arith \ ---Wshadow \ ---Wsign-compare \ ---Wstrict-prototypes \ ---Wtype-limits \ ---Wunused-function \ ---Wno-missing-field-initializers \ ---Wno-unused-command-line-argument \ ---Wno-unused-parameter \ ---Wno-unknown-pragmas \ --" -+for flag in \ -+ -Wall \ -+ -Wextra \ -+ -Werror \ -+ -Wstrict-aliasing \ -+ -Wchar-subscripts \ -+ -Wformat-security \ -+ -Wmissing-declarations \ -+ -Wmissing-prototypes \ -+ -Wnested-externs \ -+ -Wpointer-arith \ -+ -Wshadow \ -+ -Wsign-compare \ -+ -Wstrict-prototypes \ -+ -Wtype-limits \ -+ -Wunused-function \ -+ -Wno-missing-field-initializers \ -+ -Wno-unused-command-line-argument \ -+ -Wno-unused-parameter \ -+ -Wno-unknown-pragmas ; do -+ AX_CHECK_COMPILE_FLAG([${flag}], -+ [JOSE_CFLAGS="${JOSE_CFLAGS} ${flag}"]) -+done -+ - AC_SUBST([JOSE_CFLAGS]) - - AC_MSG_CHECKING([for linker script support]) -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..dcabb92 ---- /dev/null -+++ b/m4/ax_check_compile_flag.m4 -@@ -0,0 +1,74 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the current language's compiler -+# or gives an error. (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the current language's default -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -+# force the compiler to issue an error when a bad flag is given. -+# -+# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim -+# Copyright (c) 2011 Maarten Bosmans -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 5 -+ -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], -+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" -+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -+AS_VAR_IF(CACHEVAR,yes, -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_COMPILE_FLAGS --- -2.13.6 - diff --git a/package/jose/jose.hash b/package/jose/jose.hash index 376bc0b585..128d26d163 100644 --- a/package/jose/jose.hash +++ b/package/jose/jose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72 jose-10.tar.bz2 -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING +sha256 e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 jose-11.tar.xz +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING diff --git a/package/jose/jose.mk b/package/jose/jose.mk index 2758d408da..8a60e20cc6 100644 --- a/package/jose/jose.mk +++ b/package/jose/jose.mk @@ -4,14 +4,12 @@ # ################################################################################ -JOSE_VERSION = 10 -JOSE_SOURCE = jose-$(JOSE_VERSION).tar.bz2 +JOSE_VERSION = 11 +JOSE_SOURCE = jose-$(JOSE_VERSION).tar.xz JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) JOSE_LICENSE = Apache-2.0 JOSE_LICENSE_FILES = COPYING -# 0002-configure-fix-build-with-old-compilers.patch -JOSE_AUTORECONF = YES JOSE_INSTALL_STAGING = YES JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 21:55:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:55:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/libopenaptx: use official tarball In-Reply-To: <20211218232238.667138-1-fontaine.fabrice@gmail.com> References: <20211218232238.667138-1-fontaine.fabrice@gmail.com> Message-ID: <20220101215555.GD69135@scaer> Fabrice, All, On 2021-12-19 00:22 +0100, Fabrice Fontaine spake thusly: > Use official tarball and while at it use 2 spaces and reorder files in > libopenaptx.hash As explained in my review,i and despite my previous suggestion for this change, this would clash with the archive that is now on s.b.o, or with those people already have localy. So, I've marked this as rejected. Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > package/libopenaptx/libopenaptx.hash | 4 ++-- > package/libopenaptx/libopenaptx.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libopenaptx/libopenaptx.hash b/package/libopenaptx/libopenaptx.hash > index 76b4e66c9b..acaec5d642 100644 > --- a/package/libopenaptx/libopenaptx.hash > +++ b/package/libopenaptx/libopenaptx.hash > @@ -1,3 +1,3 @@ > # Locally calculated: > -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > -sha256 a19b3b642def6f86441b73dd4efda6e6f13d49e7e2d6e5e91cc7eb464ebb505a libopenaptx-0.2.1.tar.gz > +sha256 f13eac1ebfe31a563943cd47819eece1109960e10a1e85c111975bcfd37d5361 libopenaptx-0.2.1.tar.gz > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/libopenaptx/libopenaptx.mk b/package/libopenaptx/libopenaptx.mk > index c2f5fa2390..12c33f6225 100644 > --- a/package/libopenaptx/libopenaptx.mk > +++ b/package/libopenaptx/libopenaptx.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBOPENAPTX_VERSION = 0.2.1 > -LIBOPENAPTX_SITE = $(call github,pali,libopenaptx,$(LIBOPENAPTX_VERSION)) > +LIBOPENAPTX_SITE = https://github.com/pali/libopenaptx/releases/download/$(LIBOPENAPTX_VERSION) > LIBOPENAPTX_LICENSE = GPL-3.0+ > LIBOPENAPTX_LICENSE_FILES = COPYING > LIBOPENAPTX_INSTALL_STAGING = YES > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 21:56:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 22:56:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/mraa: bump to version 2.2.0 Message-ID: <20220101215622.2013558-1-fontaine.fabrice@gmail.com> - Refresh upstream status of first patch - Drop second patch (already in version) https://github.com/eclipse/mraa/blob/v2.2.0/docs/changelog.md Signed-off-by: Fabrice Fontaine --- ...de-Declare-gVERSION-global-as-extern.patch | 7 +- ...2-CMakeLists.txt-add-BUILDCPP-option.patch | 193 ------------------ package/mraa/mraa.hash | 2 +- package/mraa/mraa.mk | 2 +- 4 files changed, 6 insertions(+), 198 deletions(-) delete mode 100644 package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch diff --git a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch index b3a1f5a03a..110c020a62 100644 --- a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch +++ b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch @@ -1,13 +1,14 @@ -From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 +From aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 13 Apr 2020 20:12:11 +0200 Subject: [PATCH] include: Declare gVERSION global as 'extern'. Fixes build with '-fno-common'. +Signed-off-by: Thomas Ingleby [Retrieved from: -https://github.com/eclipse/mraa/pull/1012/commits/dbb5961f106ec42cd70689d933674c9c37aedfe1] -Signed-off-by: Fabrice Fontaine +https://github.com/eclipse/mraa/commit/aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031] +Signed-off-by: Fabrice Fontaine --- include/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch b/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch deleted file mode 100644 index fbadfe79ef..0000000000 --- a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch +++ /dev/null @@ -1,193 +0,0 @@ -From cb88e4dd1fbbb9d24e625dba2768b88ed99da309 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Jun 2020 22:51:37 +0200 -Subject: [PATCH] CMakeLists.txt: add BUILDCPP option - -C++ is a mandatory dependency since version 1.4.0 and -https://github.com/eclipse/mraa/commit/122cab1f1e53b7c9c7cd82905b962071f9bad9dc - -As a result, build on embedded toolchains that do not support C++ fails -on: - -CMake Error at CMakeLists.txt:2 (project): - The CMAKE_CXX_COMPILER: - - /home/naourr/work/instance-1/output-1/per-package/mraa/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - -Fixes: - - http://autobuild.buildroot.org/results/31086422e03611c16ab59c4418e3669b580bc0c0 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/eclipse/mraa/commit/cb88e4dd1fbbb9d24e625dba2768b88ed99da309] ---- - CMakeLists.txt | 69 +++++++++++++++++++---------------- - src/java/CMakeLists.txt | 4 +- - src/javascript/CMakeLists.txt | 34 +++++++++-------- - 3 files changed, 59 insertions(+), 48 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 250d9106e..90c0dc920 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required (VERSION 2.8.11) --project (mraa C CXX) -+project (mraa C) - - FIND_PACKAGE (Threads REQUIRED) - -@@ -11,6 +11,8 @@ else () - set (CMAKE_C_STANDARD 99) - endif () - -+option (BUILDCPP "Enable C++ (needed by FTDI4222 and tests)" ON) -+ - ############################################################################### - # Detect supported warning flags - # Modified from work By Dan Liew (fpbench - MIT) -@@ -33,15 +35,18 @@ set (MRAA_C_WARNING_FLAGS - -Werror=missing-parameter-type - ) - --# Warning flags for the C++ compiler only --set (MRAA_CXX_WARNING_FLAGS -- -Wnon-virtual-dtor -- -Woverloaded-virtual -- -Wreorder --) -- - include (CheckCCompilerFlag) --include (CheckCXXCompilerFlag) -+if (BUILDCPP) -+ # Warning flags for the C++ compiler only -+ set (MRAA_CXX_WARNING_FLAGS -+ -Wnon-virtual-dtor -+ -Woverloaded-virtual -+ -Wreorder -+ ) -+ -+ enable_language (CXX) -+ include (CheckCXXCompilerFlag) -+endif () - function (MRAA_SANITIZE_FLAG_NAME OUTPUT_VAR FLAG) - string (REPLACE "-" "_" SANITIZED_FLAG_NAME "${FLAG}") - string (REPLACE "/" "_" SANITIZED_FLAG_NAME "${SANITIZED_FLAG_NAME}") -@@ -62,28 +67,30 @@ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_C_WARNING_FLAGS}) - endif () - endforeach () - --# Globally set C++ compiler warning flags that are supported and emit --# a warning about unsupported flags --foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) -- MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") -- CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) -- if (HAS_CXX_${SANITIZED_FLAG_NAME}) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") -- else () -- message (WARNING "C++ compiler does not support flag \"${flag}\"") -- endif () --endforeach () -- --# This function adds the c++11 flag to a c++ target (if supported) --function(use_cxx_11 targetname) -- include(CheckCXXCompilerFlag) -- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -- if (COMPILER_SUPPORTS_CXX11) -- set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") -- else() -- message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") -- endif() --endfunction() -+if (BUILDCPP) -+ # Globally set C++ compiler warning flags that are supported and emit -+ # a warning about unsupported flags -+ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) -+ MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") -+ CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) -+ if (HAS_CXX_${SANITIZED_FLAG_NAME}) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") -+ else () -+ message (WARNING "C++ compiler does not support flag \"${flag}\"") -+ endif () -+ endforeach () -+ -+ # This function adds the c++11 flag to a c++ target (if supported) -+ function(use_cxx_11 targetname) -+ include(CheckCXXCompilerFlag) -+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -+ if (COMPILER_SUPPORTS_CXX11) -+ set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") -+ else() -+ message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") -+ endif() -+ endfunction() -+endif() - - # Set CMAKE_INSTALL_LIBDIR if not defined - include(GNUInstallDirs) -diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt -index 231c755fa..cfa72a0df 100644 ---- a/src/java/CMakeLists.txt -+++ b/src/java/CMakeLists.txt -@@ -16,7 +16,9 @@ include_directories ( - set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src") - set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") -+if (BUILDCPP) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") -+endif() - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") - - if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) -diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt -index 25fd36275..99a96b49d 100644 ---- a/src/javascript/CMakeLists.txt -+++ b/src/javascript/CMakeLists.txt -@@ -36,25 +36,27 @@ set_target_properties (mraajs PROPERTIES - ) - - message (STATUS "INFO - swig Version ${SWIG_VERSION}") --message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") -+if (BUILDCPP) -+ message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") - --if (${V8_VERSION_MAJOR} GREATER 3) -- message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") -- # Node 0.12.x V8 engine major version is '3'. -- # Node 2.1.0 V8 engine major version is '4'. -- set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) -- set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) -- if (CMAKE_VERSION VERSION_LESS "3.1") -- message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") -- if (CMAKE_COMPILER_IS_GNUCXX) -- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -- message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") -+ if (${V8_VERSION_MAJOR} GREATER 3) -+ message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") -+ # Node 0.12.x V8 engine major version is '3'. -+ # Node 2.1.0 V8 engine major version is '4'. -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) -+ if (CMAKE_VERSION VERSION_LESS "3.1") -+ message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") -+ if (CMAKE_COMPILER_IS_GNUCXX) -+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -+ message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") -+ endif () -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") -+ else () -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") - endif () -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") -- else () -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") - endif () -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") - endif () - endif () - diff --git a/package/mraa/mraa.hash b/package/mraa/mraa.hash index f29a5ce838..321b6409ed 100644 --- a/package/mraa/mraa.hash +++ b/package/mraa/mraa.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345 mraa-2.1.0.tar.gz +sha256 076669bee8423ffef3065735b293a329020be86630fea457174dbfcc67a0554a mraa-2.2.0.tar.gz sha256 fac52622ed3badd86b34857b21777ab90296d6ccbc2ac0fd457c09fdeefa9ef1 COPYING diff --git a/package/mraa/mraa.mk b/package/mraa/mraa.mk index 910339b386..47178a423b 100644 --- a/package/mraa/mraa.mk +++ b/package/mraa/mraa.mk @@ -4,7 +4,7 @@ # ################################################################################ -MRAA_VERSION = 2.1.0 +MRAA_VERSION = 2.2.0 MRAA_SITE = $(call github,eclipse,mraa,v$(MRAA_VERSION)) MRAA_LICENSE = MIT MRAA_LICENSE_FILES = COPYING -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 22:05:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 23:05:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbredir: bump to version 0.12.0 Message-ID: <20220101220532.2057125-1-fontaine.fabrice@gmail.com> Drop all patches (already in version) https://gitlab.freedesktop.org/spice/usbredir/-/blob/usbredir-0.12.0/ChangeLog.md Signed-off-by: Fabrice Fontaine --- .../0001-meson-add-tests-option.patch | 46 -------------- ...002-meson-add-stack_protector-option.patch | 60 ------------------- .../0003-meson.build-make-C-optional.patch | 39 ------------ package/usbredir/usbredir.hash | 4 +- package/usbredir/usbredir.mk | 2 +- 5 files changed, 3 insertions(+), 148 deletions(-) delete mode 100644 package/usbredir/0001-meson-add-tests-option.patch delete mode 100644 package/usbredir/0002-meson-add-stack_protector-option.patch delete mode 100644 package/usbredir/0003-meson.build-make-C-optional.patch diff --git a/package/usbredir/0001-meson-add-tests-option.patch b/package/usbredir/0001-meson-add-tests-option.patch deleted file mode 100644 index b2df1587b1..0000000000 --- a/package/usbredir/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8490a7ac101d4ee0a78c44b252d3b7a6c2508c74 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 21 Aug 2021 11:55:48 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to disable them - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/spice/usbredir/-/commit/8490a7ac101d4ee0a78c44b252d3b7a6c2508c74] ---- - meson.build | 4 +++- - meson_options.txt | 5 +++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6e773a7..a6d21b8 100644 ---- a/meson.build -+++ b/meson.build -@@ -106,7 +106,9 @@ if host_machine.system() != 'windows' - subdir('fuzzing') - endif - endif --subdir('tests') -+if get_option('tests').enabled() -+ subdir('tests') -+endif - subdir('data') - - summary(summary_info, bool_yn: true) -diff --git a/meson_options.txt b/meson_options.txt -index b35732b..63e8c85 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -21,3 +21,8 @@ option('tools', - type : 'feature', - value : 'enabled', - description : 'Build usbredir\'s tools such as usbredirect') -+ -+option('tests', -+ type : 'feature', -+ value : 'enabled', -+ description : 'Build usbredir\'s tests such as filter') --- -GitLab - diff --git a/package/usbredir/0002-meson-add-stack_protector-option.patch b/package/usbredir/0002-meson-add-stack_protector-option.patch deleted file mode 100644 index 613e2714e3..0000000000 --- a/package/usbredir/0002-meson-add-stack_protector-option.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 54cf1897ef3aa4d0a35b5f4eb1f5c6928b033af5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 24 Sep 2021 17:24:43 +0200 -Subject: [PATCH] meson: add stack_protector option - -Add stack_protector option to allow the user to disable it as some -embedded toolchains don't support it which will result in the following -build failure: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: usbredirparser/libusbredirparser.so.1.1.0.p/usbredirparser.c.o: in function `va_log': -usbredirparser.c:(.text+0x1c4): undefined reference to `__stack_chk_guard' - -Fixes: - - http://autobuild.buildroot.org/results/40de5443e98157ad50c6841ea70a835cd5ad4fe9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/53] ---- - meson.build | 6 +++++- - meson_options.txt | 5 +++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index a6d21b8..4350f53 100644 ---- a/meson.build -+++ b/meson.build -@@ -17,8 +17,12 @@ cc_flags = [ - if host_machine.system() != 'windows' - cc_flags += [ - '-Wp,-D_FORTIFY_SOURCE=2', -- '-fstack-protector', - ] -+ if get_option('stack_protector').enabled() -+ cc_flags += [ -+ '-fstack-protector', -+ ] -+ endif - endif - - # Check if we are building from .git -diff --git a/meson_options.txt b/meson_options.txt -index 63e8c85..34dd392 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,6 +17,11 @@ option('fuzzing-install-dir', - type : 'string', - description : 'Installation directory for fuzzing binaries') - -+option('stack_protector', -+ type : 'feature', -+ value : 'enabled', -+ description : 'Build usbredir\'s with stack-protector') -+ - option('tools', - type : 'feature', - value : 'enabled', --- -2.33.0 - diff --git a/package/usbredir/0003-meson.build-make-C-optional.patch b/package/usbredir/0003-meson.build-make-C-optional.patch deleted file mode 100644 index fe1ed3f698..0000000000 --- a/package/usbredir/0003-meson.build-make-C-optional.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 55fc307d23d657b52433d1c8508467d0589754d5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 16 Oct 2021 15:45:57 +0200 -Subject: [PATCH] meson.build: make C++ optional - -Remove cpp from meson project statement to make C++ optional and avoid -the following build failure when the toolchain does not provide a C++ -compiler: - -../output-1/build/usbredir-0.11.0/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++']] -The following exception(s) were encountered: -Running "/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++ --version" gave "[Errno 2] No such file or directory: '/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++'" - -Indeed C++ is only required for fuzzing which is already handled by -meson through add_languages('cpp', required: true) - -Fixes: - - http://autobuild.buildroot.org/results/eca1d8a2b73a769354ab1d24c7996be30f152138 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/55] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 49dbce4..ca19f22 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('usbredir', 'c', 'cpp', -+project('usbredir', 'c', - version: '0.11.0', - license: 'LGPLv2.1+', - meson_version : '>= 0.53', --- -2.33.0 - diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash index e11d4aa720..f738c36690 100644 --- a/package/usbredir/usbredir.hash +++ b/package/usbredir/usbredir.hash @@ -1,5 +1,5 @@ -# https://spice-space.org/download/usbredir/usbredir-0.11.0.tar.xz.sha256sum -sha256 72dd5f3aa90dfbc0510b5149bb5b1654c8f21fdc405dfce7b5dc163dcff19cba usbredir-0.11.0.tar.xz +# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum +sha256 fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d usbredir-0.12.0.tar.xz # Hash for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index 0a8dbf012d..6792a3e758 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBREDIR_VERSION = 0.11.0 +USBREDIR_VERSION = 0.12.0 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz USBREDIR_SITE = http://spice-space.org/download/usbredir USBREDIR_LICENSE = LGPL-2.1+ (libraries) -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 22:14:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 23:14:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: bump to version 0.8.1 Message-ID: <20220101221425.2059395-1-fontaine.fabrice@gmail.com> - Drop first patch (already in version) - Refresh upstream status of latest patch - Update hash of LICENSE and add cli/COPYING: https://github.com/Cyan4973/xxHash/commit/85e1ea2ab0d90463b804f4a65b0f67d99718c6f8 https://github.com/Cyan4973/xxHash/releases/tag/v0.8.1 Signed-off-by: Fabrice Fontaine --- ...h => 0001-fix-man-page-installation.patch} | 0 .../0001-fixed-man-page-installation.patch | 31 ------------------- ...efile-add-dedicated-install-targets.patch} | 8 ++--- package/xxhash/xxhash.hash | 5 +-- package/xxhash/xxhash.mk | 4 +-- 5 files changed, 8 insertions(+), 40 deletions(-) rename package/xxhash/{0002-fix-man-page-installation.patch => 0001-fix-man-page-installation.patch} (100%) delete mode 100644 package/xxhash/0001-fixed-man-page-installation.patch rename package/xxhash/{0003-Makefile-add-dedicated-install-targets.patch => 0002-Makefile-add-dedicated-install-targets.patch} (94%) diff --git a/package/xxhash/0002-fix-man-page-installation.patch b/package/xxhash/0001-fix-man-page-installation.patch similarity index 100% rename from package/xxhash/0002-fix-man-page-installation.patch rename to package/xxhash/0001-fix-man-page-installation.patch diff --git a/package/xxhash/0001-fixed-man-page-installation.patch b/package/xxhash/0001-fixed-man-page-installation.patch deleted file mode 100644 index a9f68db4b4..0000000000 --- a/package/xxhash/0001-fixed-man-page-installation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Fri, 6 Aug 2021 15:29:32 -0700 -Subject: [PATCH] fixed man page installation - -[Retrieved from: -https://github.com/Cyan4973/xxHash/commit/e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index b8552a9f..556a32a0 100644 ---- a/Makefile -+++ b/Makefile -@@ -498,10 +498,10 @@ endif - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum - @echo Installing man pages -- $(Q)$(INSTALL_DATA) xxhsum.1 $(DESTDIR)$(MANDIR)/xxhsum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 -+ $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 - @echo xxhash installation completed - - .PHONY: uninstall diff --git a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch similarity index 94% rename from package/xxhash/0003-Makefile-add-dedicated-install-targets.patch rename to package/xxhash/0002-Makefile-add-dedicated-install-targets.patch index 0607c8ee82..17d34a0823 100644 --- a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch +++ b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch @@ -10,13 +10,14 @@ This is especially useful on embedded systems where dynamic library is not always supported by toolchains Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/Cyan4973/xxHash/pull/665] +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/db9c199e99f7b4d419647b1ef49c547fc2547516] --- Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index 8d4fcd2..5fe7297 100644 +index 8d4fcd21..5fe72972 100644 --- a/Makefile +++ b/Makefile @@ -505,11 +505,14 @@ libxxhash.pc: libxxhash.pc.in @@ -68,6 +69,3 @@ index 8d4fcd2..5fe7297 100644 @echo xxhash installation completed .PHONY: uninstall --- -2.33.0 - diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash index feb5000808..2c99236a45 100644 --- a/package/xxhash/xxhash.hash +++ b/package/xxhash/xxhash.hash @@ -1,3 +1,4 @@ # locally computed -sha256 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f xxhash-0.8.0.tar.gz -sha256 9da63520e9293d82c4b1613be5c84058cadb82b02f5972179bad13731d589910 LICENSE +sha256 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c xxhash-0.8.1.tar.gz +sha256 553d0035773ddd1590045f8fdc3a4c6ead31e36336721aeca8421e88ed1c9f80 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 3e7f3244b3..a8f8d1d179 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -4,10 +4,10 @@ # ################################################################################ -XXHASH_VERSION = 0.8.0 +XXHASH_VERSION = 0.8.1 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) -XXHASH_LICENSE_FILES = LICENSE +XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES XXHASH_TARGETS = xxhsum -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 22:35:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 23:35:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: bump to version 2.0.0 Message-ID: <20220101223529.2111756-1-fontaine.fabrice@gmail.com> - Switch to meson-package to drop first patch and disable examples and utils - Drop second patch (already in version) - Update hash of NOTICE (empty new lines added with https://github.com/tinyalsa/tinyalsa/commit/902b8c8f9fa5a2e1937007d7d5ee90f01790808b) https://github.com/tinyalsa/tinyalsa/releases/tag/v2.0.0 Signed-off-by: Fabrice Fontaine --- .../tinyalsa/0001-disable-doxygen-usage.patch | 35 ------------------ .../0002-interval.h-add-missing-header.patch | 36 ------------------- package/tinyalsa/tinyalsa.hash | 4 +-- package/tinyalsa/tinyalsa.mk | 27 +++----------- 4 files changed, 6 insertions(+), 96 deletions(-) delete mode 100644 package/tinyalsa/0001-disable-doxygen-usage.patch delete mode 100644 package/tinyalsa/0002-interval.h-add-missing-header.patch diff --git a/package/tinyalsa/0001-disable-doxygen-usage.patch b/package/tinyalsa/0001-disable-doxygen-usage.patch deleted file mode 100644 index ed939fb9bf..0000000000 --- a/package/tinyalsa/0001-disable-doxygen-usage.patch +++ /dev/null @@ -1,35 +0,0 @@ -Disable doxygen usage - -In order to avoid a dependency on doxygen on the build machine, this -patch adjusts the main Makefile to not build and install the -documentation. - -[Vincent: tweak patch for 1.1.1 version] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Makefile b/Makefile ---- a/Makefile 2017-05-24 05:23:57.000000000 +0100 -+++ b/Makefile 2017-05-25 10:35:20.781747053 +0100 -@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man - all: - $(MAKE) -C src - $(MAKE) -C utils -- $(MAKE) -C doxygen - $(MAKE) -C examples - - .PHONY: clean - clean: - $(MAKE) -C src clean - $(MAKE) -C utils clean -- $(MAKE) -C doxygen clean - $(MAKE) -C examples clean - - .PHONY: install -@@ -30,5 +28,4 @@ install: - install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/ - $(MAKE) -C src install - $(MAKE) -C utils install -- $(MAKE) -C doxygen install - diff --git a/package/tinyalsa/0002-interval.h-add-missing-header.patch b/package/tinyalsa/0002-interval.h-add-missing-header.patch deleted file mode 100644 index c043145b55..0000000000 --- a/package/tinyalsa/0002-interval.h-add-missing-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 2 Jun 2017 12:19:03 +0300 -Subject: [PATCH] interval.h: add missing header - -The ssize_t type requires the unistd.h header. This fixes build with musl -libc: - -In file included from ../include/tinyalsa/limits.h:32:0, - from limits.c:1: -../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t' - ssize_t max; - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98 - - include/tinyalsa/interval.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h -index 3f6f3dce5d90..068571df5a63 100644 ---- a/include/tinyalsa/interval.h -+++ b/include/tinyalsa/interval.h -@@ -30,6 +30,7 @@ - #define TINYALSA_INTERVAL_H - - #include -+#include - - /** A closed range signed interval. */ - --- -2.11.0 - diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash index d078bab597..f7673b1769 100644 --- a/package/tinyalsa/tinyalsa.hash +++ b/package/tinyalsa/tinyalsa.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz -sha256 ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d NOTICE +sha256 573ae0b2d3480851c1d2a12503ead2beea27f92d44ed47b74b553ba947994ef1 tinyalsa-2.0.0.tar.gz +sha256 ea22a4711f5250f88a4d7011fbc65367d1b02ac954dcc49f5b6d7c135e6537c4 NOTICE diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index bd9d9a00d0..b5c39e35d6 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -4,30 +4,11 @@ # ################################################################################ -TINYALSA_VERSION = 1.1.1 -TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) +TINYALSA_VERSION = 2.0.0 +TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled -define TINYALSA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) -endef - -define TINYALSA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(STAGING_DIR)" install -endef - -define TINYALSA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) -- 2.33.0 From who+buildroot at cnackers.org Sat Jan 1 22:38:58 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Sat, 1 Jan 2022 23:38:58 +0100 Subject: [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Message-ID: <20220101223900.2970405-1-who+buildroot@cnackers.org> The last reference of uriparser was removed in: https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e Signed-off-by: Erik Larsson --- package/tpm2-tss/tpm2-tss.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 71aa3feb96..060883c377 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES -- 2.34.1 From who+buildroot at cnackers.org Sat Jan 1 22:39:00 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Sat, 1 Jan 2022 23:39:00 +0100 Subject: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools In-Reply-To: <20220101223900.2970405-1-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> Message-ID: <20220101223900.2970405-3-who+buildroot@cnackers.org> Signed-off-by: Erik Larsson --- package/tpm2-tools/Config.in | 11 +++++++++++ package/tpm2-tools/tpm2-tools.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 1a6698570a..cb3eb2b0a5 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS https://github.com/tpm2-software/tpm2-tools +if BR2_PACKAGE_TPM2_TOOLS + +config BR2_PACKAGE_TPM2_TOOLS_FAPI + bool "tpm2-tools fapi support" + select BR2_PACKAGE_TPM2_TSS_FAPI + help + This option enables Feature API (FAPI) support in tpm2-tools. + The FAPI tools are prefixed with tss2_. + +endif + comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index df5fbbfff4..6894be195f 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening # do not build man pages TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) +TPM2_TOOLS_CONF_OPTS += --enable-fapi +else +TPM2_TOOLS_CONF_OPTS += --disable-fapi +endif + $(eval $(autotools-package)) -- 2.34.1 From who+buildroot at cnackers.org Sat Jan 1 22:38:59 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Sat, 1 Jan 2022 23:38:59 +0100 Subject: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 In-Reply-To: <20220101223900.2970405-1-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> Message-ID: <20220101223900.2970405-2-who+buildroot@cnackers.org> Depedency on libuuid was removed in: https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 Signed-off-by: Erik Larsson --- .../0001-configure-make-build-gnu99.patch | 30 ------------------- package/tpm2-tools/Config.in | 2 -- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 4 +-- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch deleted file mode 100644 index 37ca6c5873..0000000000 --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 -From: William Roberts -Date: Mon, 8 Feb 2021 11:57:28 -0600 -Subject: [PATCH] configure: make build gnu99 - -Signed-off-by: William Roberts - -[Retrieved from: -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c -and updated to set gnu99 instead of c99 as done by -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dc15b5595..25039a0d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ - # -D_GNU_SOURCE is required for execvpe() in options.c - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) - -+# Enable gnu99 mode, since we use some of these features. -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) -+ - # Best attempt compiler options that are on newer versions of GCC that - # we can't widely enforce without killing other peoples builds. - # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 3be947648f..1a6698570a 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index bfb7e9b220..f50a896363 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 41f5bcf201..df5fbbfff4 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,13 +4,13 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.3.2 +TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # We're patching configure.ac TPM2_TOOLS_AUTORECONF = YES -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 1 22:59:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 23:59:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 Message-ID: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> The LXC 4.0 branch is supported until June 2025. Only bugfixes and securitiy issues get included into the stable bugfix releases, so it's always safe and recommended to keep up and run the latest bugfix release. https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 Signed-off-by: Fabrice Fontaine --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index efd7a8e42c..2b58df2f1d 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 93f6d2535f..4d63fc14cb 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.10 +LXC_VERSION = 4.0.11 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 -- 2.33.0 From charles at steinkuehler.net Sat Jan 1 23:46:53 2022 From: charles at steinkuehler.net (Charles Steinkuehler) Date: Sat, 1 Jan 2022 17:46:53 -0600 Subject: [Buildroot] Buildroot + RAUC Message-ID: Buildroot has included RAUC for some time, but I was unable to find any working examples suitable for experimenting or as a foundation for a production system. I have attempted to fill this void and have crafted a BR2_EXTERNAL project that layers a basic RAUC setup on top of Buildroot targeting the Raspberry Pi cm4io. As I am new to both Buildroot and RAUC, I would appreciate any reviews or critiques of how I have managed the customization required for Buildroot, U-Boot, RAUC, Linux, and the device tree. The project files and instructions are on github: https://github.com/cdsteinkuehler/br2rauc All comments welcome, especially the "no you fool, don't do it *THAT* way!" variety. :) -- Charles Steinkuehler charles at steinkuehler.net From baruch at tkos.co.il Sun Jan 2 04:04:26 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 02 Jan 2022 06:04:26 +0200 Subject: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 In-Reply-To: <20220101223900.2970405-2-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> <20220101223900.2970405-2-who+buildroot@cnackers.org> Message-ID: <871r1qkcis.fsf@tarshish> Hi Erik, On Sat, Jan 01 2022, Erik Larsson wrote: > Depedency on libuuid was removed in: > https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd > > Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 > > Signed-off-by: Erik Larsson > --- > .../0001-configure-make-build-gnu99.patch | 30 ------------------- > package/tpm2-tools/Config.in | 2 -- > package/tpm2-tools/tpm2-tools.hash | 2 +- > package/tpm2-tools/tpm2-tools.mk | 4 +-- > 4 files changed, 3 insertions(+), 35 deletions(-) > delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch > > diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch > deleted file mode 100644 > index 37ca6c5873..0000000000 > --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 > -From: William Roberts > -Date: Mon, 8 Feb 2021 11:57:28 -0600 > -Subject: [PATCH] configure: make build gnu99 > - > -Signed-off-by: William Roberts > - > -[Retrieved from: > -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c > -and updated to set gnu99 instead of c99 as done by > -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index dc15b5595..25039a0d9 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ > - # -D_GNU_SOURCE is required for execvpe() in options.c > - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) > - > -+# Enable gnu99 mode, since we use some of these features. > -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) > -+ > - # Best attempt compiler options that are on newer versions of GCC that > - # we can't widely enforce without killing other peoples builds. > - # Works with gcc only. Needs to be disabled on BSD and clang > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 3be947648f..1a6698570a 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_TPM2_TSS > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBUUID > help > TPM (Trusted Platform Module) 2.0 CLI tools based on system > API of TPM2-TSS. These tools can be used to manage keys, > diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash > index bfb7e9b220..f50a896363 100644 > --- a/package/tpm2-tools/tpm2-tools.hash > +++ b/package/tpm2-tools/tpm2-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz > +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz > sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index 41f5bcf201..df5fbbfff4 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -4,13 +4,13 @@ > # > ################################################################################ > > -TPM2_TOOLS_VERSION = 4.3.2 > +TPM2_TOOLS_VERSION = 5.2 > TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_LICENSE = BSD-3-Clause > TPM2_TOOLS_LICENSE_FILES = doc/LICENSE > TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project > TPM2_TOOLS_SELINUX_MODULES = tpm2 > -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux > +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf > # We're patching configure.ac > TPM2_TOOLS_AUTORECONF = YES You can also remove this AUTORECONF since you remove the configure.ac patch. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From jacques.samoun33 at gmail.com Sun Jan 2 06:38:57 2022 From: jacques.samoun33 at gmail.com (Jacques Samoun) Date: Sun, 2 Jan 2022 08:38:57 +0200 Subject: [Buildroot] Patching a BR package makefile In-Reply-To: <20220101173705.142a0496@audacityteam.org> References: <20220101173705.142a0496@audacityteam.org> Message-ID: Hi Richard, thanks for that. I think option 3 is the way to go, at least till this openssh/openssl issue has been fixed, which should happen (there is an PR at openssh already). Thanks, Jacques On Sat, Jan 1, 2022 at 7:37 PM Richard Ash wrote: > On Wed, 29 Dec 2021 14:57:54 +0200 > Jacques Samoun wrote: > > > I had to modify a OPENSSH_CONF_OPTS of the openssh.mk package > > makefile to solve a known interoperability issue (openssh vs > > libopenssl). Now the fix is verified, i would like to create a patch > > to be applied to this openssh.mk . > > > > However, while I already did a couple of patches to other packages, > > they were always so far applied to the course code of the packages. In > > this specific case, I do not know how to make this on the > > buildroot/package/.mk file. > > > > Is there a preferred way to do so ? > > As far as I know, there isn't a way to do this within buildroot, > because the buildroot tree is (has to be) immutable by the time > buildroot runs. Put another way you can't patch what effectively > becomes one vast Makefile from within that Makefile without badly > upsetting make! > > The only options I have found are: > 1. Write a wrapper script to unpack the buildroot tarball and apply > your patches (note you may have problems if your patches change over > time). > 2. Have your own fork of buildroot git, and then your own branch from > the relevant release tag with your changes on top. This means you can > rebase your changes with git's help when you want to move to a newer > buildroot. Convenient if the rest of your build is in git and you can > use a git submodule to fetch your forked git automatically. > 3. Don't try to modify the buildroot package, create your own > custom-ssh package (copy of buildroot plus your patch) and maintain it > in a buildroot external (see the manual). Could be a pain to keep up to > date in the longer term. > > I'm not in any way a buildroot maintainer however! > > All of these are good reasons to get patches upstreamed (if possible) > into buildroot! > > Richard > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sun Jan 2 06:56:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 02 Jan 2022 06:56:16 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-01 Message-ID: <20220102065622.9D5A04028A@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-01 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 71 | 9 | 0 | 80 | 2021.11.x | 30 | 2 | 0 | 32 | master | 95 | 64 | 0 | 159 | Classification of failures by reason for master ----------------------------------------------- python3-3.10.1 | 25 host-nodejs-14.18.1 | 5 libapparmor-3.0.3 | 4 wavemon-0.9.4 | 4 rygel-0.40.2 | 3 babeltrace2-2.0.3 | 2 fail2ban-0.11.2 | 2 hiawatha-11.1 | 2 poppler-21.12.0 | 2 alsa-utils-1.2.4 | 1 assimp-5.1.4 | 1 belle-sip-4.4.8 | 1 boinc-7.18.1 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 gstreamer1-mm-1.10.0 | 1 guile-3.0.7 | 1 libexecinfo-1.1-3 | 1 log4cxx-0.12.0 | 1 pipewire-0.3.40 | 1 pulseview-0.4.2 | 1 qt5webkit-5.9.1 | 1 suricata-6.0.4 | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | alsa-utils-1.2.4 | NOK | http://autobuild.buildroot.net/results/08d028004090b2a8292f03910cb9bf80a73ac804 | mips | assimp-5.1.4 | NOK | http://autobuild.buildroot.net/results/e6edcf4acde4b053fa6190a45f6d1e00c86bdb27 | or1k | babeltrace2-2.0.3 | NOK | http://autobuild.buildroot.net/results/c383730b84342532f047a9ea73de19df9d734dbe | or1k | babeltrace2-2.0.3 | NOK | http://autobuild.buildroot.net/results/bd00ac7f40fe1925800f549029e41d04acc37462 | nios2 | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/945afeae741757641a0463b40598ba95f68d7d24 | arm | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/c234ba45416ea309ead0a02de7598aa15331617d | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/661b658a8c109893f68bf8fd93f67b3bf0ebd608 | arm | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/dbba8135047632311bbcfe3dc1407c2e7a9b4087 | sparc64 | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/6a5e91f9912f869b2b07b10b576457b432066393 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/33e8b8c9be1a84a22cdb7fbbc5696de965af4373 | mipsel | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/6b7d2ad6b5f3b8d4b882664eaf51d87b55de3009 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/dc6b337006529b0723d9a18813befc34a1e0f11f | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/b63f85b8849d91f648433f824d2284489c9c15d9 | arc | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/9f2481ae19461a760d39afa4f99060ed652aa18c | arm | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/b2379660b5e30c54005d18edeb5e330937841fe7 | arm | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/a3eadd01dac90d57c26d07d3b276cd813c701168 | xtensa | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/c1b8b2ca194e34994cd77aa460410b39f97042d3 | arm | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/d0dec14fff18b483c8947ceefbc5e59ed842104e | xtensa | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/36262ace4639008d9261cab09fbe6cc2bd6e09fe | arc | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/f3e400cbb5b00fbd7f0cb421c993e46b64ec5ac5 | powerpc64le | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/cd757c6b7b1edd938abb13f5d5ad1f60d98b6944 | arc | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/fc30266947a5aecc1e302d88006ffbbab1e9528a | mips64el | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/d26c42f8cc67ea36df43e59bb6f7b3839c57c4e1 | m68k | libexecinfo-1.1-3 | NOK | http://autobuild.buildroot.net/results/a5bbdc349d2c1ecf07e9e1980ebe2c8881637bde | ORPH riscv32 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/ef4b7d12a1b2b19c64db08170bfb7bc9192ddc2c | or1k | pipewire-0.3.40 | NOK | http://autobuild.buildroot.net/results/d1707ad82159aafbddb69c503109bf2e830f0f29 | i586 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/716fdb10500d59b949e32246538808b2a15cd333 | arm | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/cca6f072af6c0758e7b75b18753cd53f7bf70f3c | powerpc64le | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/531c17f6b6410739bb3b0c8212af91c1f6e1149b | riscv64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/8299b1458369720bb6ea773d35fc46c6f18c4f44 | arc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/0df7fd2160f707b8eda50c366d64d17784c32d89 | x86_64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/fbeee34ffad87a0300c856a134d2bfebaf3bd59b | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/18d0ee27688896ffc1b79fbb8aa9b1a8502b81ce | powerpc64le | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/846adda3a7157dc65c95c7b565bc4db9ec1ac2c2 | powerpc64le | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/efa154c01a0165a6ab35db951129a71c1bd3e475 | arc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/19d1ce37556a290c8cdad0e138ff4a02edbaa04b | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/bed22c4e40d4ecdb34a370f3b56a21835f4c0d26 | mipsel | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/7b67f73a2cf1aead7fc5f582684388675348eea2 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/1bf4d7d64e0580a324e0e6164a62a6a6997d6640 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/d2a3960f1f06e97a151a1459f384f5c3e3b8650b | powerpc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/c60a9531689b5b8c955775f558ef071aebaeeedd | mipsel | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/08aace35c21ff0206628015c2f94a4b38eff58fa | i686 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/0361de31c3fc3c4fd6a5078d5ac0211f511d5996 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/ba6fbbd2ae9572795e8d40d4d58fcb5c94fe5d7c | sparc64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/b96dae6b6a30f5a80de14586371cfaa4a8b88168 | riscv64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/9302952721d9c4ec8a858cf4a2e5e81d83b4fb75 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/2d487a558b414c72e627b3fb876afcd6572cf02d | riscv64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/b9727dc7bea5d4d7d38296fe6eeeac8186562a37 | arc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/e9df7a5dbcc6168876cf7e5fe5ff4338bde3b955 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/ba5c022c5f69d78aae8cc8ef6cb79a188dfb5575 | sparc64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/635f56c2df68b4f9de4d777f2422b0415f66ba92 | powerpc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/b6ec492972635599b0fb1d87feb1e25a906e83fe | nios2 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/6966ad896c33c9e10a2b70df76144999d92f6355 | x86_64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/8ee7b605be1013ac3f1f227b816aa38060ab26a5 | mipsel | qt5webkit-5.9.1 | NOK | http://autobuild.buildroot.net/results/5c41f09be7d12e455d7a142ea2c0302307d970c5 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/49b83df3604caf1e2fb30641d4a5a3ce9e2ba4be | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3b41bc7edce11190fe360c74040a19f7fe8309d6 | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c8db67ec4334f94b0d10fb1b1d543b5d2e803839 | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/425ef4f74765c3cd227eab40f0ec8698a2f4e6be | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/37ef1654c5419714425f6afff829a9848715e8ea | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9a7545cede50dd12a9c47e67677ea37b15be49f0 | powerpc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/994bb96cde3c743aaa4dbec058c9019ae613f301 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/970b9c0fe4969c20d8d78962bf5f018182679e80 | riscv32 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f77732d083d4c332afc601703a914faa83e4f756 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 monkey-f54856ce250c4e257354... | 2 glib-networking-2.66.0 | 1 gobject-introspection-1.64.1 | 1 xvisor-0.3.0 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/30ecfd7c9adb3cb236c60bf449ddd04dc78ed483 | ORPH x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/fa9d8e8785ba74292df7fbb528e1e9a6ed788013 | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/2c1e274963484b56556888acc008286375a16e8b | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5dafb691e11f9f172ab9adbb5e100a2674ad7d0a | mips | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c0546b3ec690852d2bda4f17a0d89651b6e5ab0e | xtensa | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/47643be58fae84410eb32ab4042516224d47717f | riscv64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/d142552c3ee9854e613a45c191cbcae084b7dbe7 | x86_64 | xvisor-0.3.0 | NOK | http://autobuild.buildroot.net/results/6045d74e7fc6d9190e29cb9157ad32929c28efbd | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/211e93a4d648c99c46d3b8e43f7ae2f48e11f3b8 | Classification of failures by reason for 2021.11.x -------------------------------------------------- openal-1.21.1 | 1 python-pybind-2.6.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/d278eb4bd6c922a54325188dab7e9c2c8f4ea3cd | riscv64 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/308a4e0ac1482323ee29b30c705c0874c5f429c9 | -- http://autobuild.buildroot.net From Alexey.Brodkin at synopsys.com Sun Jan 2 08:06:35 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Sun, 2 Jan 2022 11:06:35 +0300 Subject: [Buildroot] [PATCH] configs/cubieboard2: bump U-Boot and kernel Message-ID: <20220102080635.9405-1-abrodkin@synopsys.com> Bump U-Boot to version 2021.10 and kernel to 5.15.11 Among other things fixes U-Boot build failure, see https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006081: ---------------------->8------------------- HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ---------------------->8------------------- Signed-off-by: Alexey Brodkin --- configs/cubieboard2_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 8924c88c54..a9356295c1 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" BR2_TARGET_ROOTFS_EXT2=y @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -- 2.25.1 From fperrad at gmail.com Sun Jan 2 10:43:18 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 2 Jan 2022 11:43:18 +0100 Subject: [Buildroot] [PATCH] package/perl: bump to version 5.34.0 Message-ID: <20220102104318.2631-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl/perl.hash | 12 ++++++------ package/perl/perl.mk | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 42b7cc66c..b0f60ef6f 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,10 +1,10 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz.{md5,sha1,sha256}.txt -md5 7f104064b906ad8c7329ca5e409a32d7 perl-5.32.1.tar.xz -sha1 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e perl-5.32.1.tar.xz -sha256 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt +md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz +sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz +sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.hash -sha256 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25 perl-cross-1.3.5.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash +sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic diff --git a/package/perl/perl.mk b/package/perl/perl.mk index f661fef01..d7f9c58dd 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 32 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION_MAJOR = 34 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 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.3.5 +PERL_CROSS_VERSION = 1.3.6 # 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 -- 2.32.0 From romain.naour at gmail.com Sun Jan 2 16:54:31 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 2 Jan 2022 17:54:31 +0100 Subject: [Buildroot] [PATCH] board/qemu/aarch64-sbsa: use partition-type-uuid for genimage-15 Message-ID: <20220102165431.3551867-1-romain.naour@gmail.com> Genimage 15 restricted the partition-type option to mbr and hybrid partition-table-type and now prints a warning when it is used [1]: ERROR: hdimage(disk.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type [1] https://github.com/pengutronix/genimage/commit/1d72d8091f83790a0a35a1ea7dc25d46adba8876 Sync the genimage.cfg with the one used for aarch64_efi_defconfig Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717179 https://gitlab.com/buildroot.org/buildroot/-/jobs/1921792262 Signed-off-by: Romain Naour Cc: Dick Olsson Cc: Pierre-Jean Texier --- board/qemu/aarch64-sbsa/genimage.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index 121ae9f37b..bdf8a89d75 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -18,12 +18,14 @@ image disk.img { } partition boot { - partition-type = 0xEF image = "efi-part.vfat" + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32K + bootable = true } partition root { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } -- 2.31.1 From dariobin at libero.it Sun Jan 2 16:58:49 2022 From: dariobin at libero.it (Dario Binacchi) Date: Sun, 2 Jan 2022 17:58:49 +0100 Subject: [Buildroot] [PATCH 2/2] configs/stm32f469_disco_xip: explicitly set the kernel version In-Reply-To: <20220102165849.1653228-1-dariobin@libero.it> References: <20220102165849.1653228-1-dariobin@libero.it> Message-ID: <20220102165849.1653228-2-dariobin@libero.it> The version of the kernel and its headers must be explicitly set because if you keep the default setting, the kernel is continuously updated in buildroot with the risk that its image + dtb grow so much that it again exceeds the 2 MByte of the flash module. Signed-off-by: Dario Binacchi --- configs/stm32f469_disco_xip_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 6c4f227f582d..d95b7759f31a 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -1,9 +1,12 @@ BR2_arm=y BR2_cortex_m4=y +BR2_KERNEL_HEADERS_5_15=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_GCC_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.32.0 From dariobin at libero.it Sun Jan 2 16:58:48 2022 From: dariobin at libero.it (Dario Binacchi) Date: Sun, 2 Jan 2022 17:58:48 +0100 Subject: [Buildroot] [PATCH 1/2] configs/stm32f469_disco_xip: remove BR2_LINUX_KERNEL_XZ Message-ID: <20220102165849.1653228-1-dariobin@libero.it> This is a XIP kernel, so it shouldn't be compressed. Signed-off-by: Dario Binacchi --- configs/stm32f469_disco_xip_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index f3d333278a53..6c4f227f582d 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -7,7 +7,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_XZ=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -- 2.32.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:42:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:42:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/zchunk: needs MMU Message-ID: <20220102174226.2823845-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit c618da772df32679fdd338b99f44133655c9113f: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: src/zck_gen_zdict.p/zck_gen_zdict.c.o: in function `main': zck_gen_zdict.c:(.text.startup+0x254): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/582b994372435b8c35a56345c15bd0ffc722af79 Signed-off-by: Fabrice Fontaine --- package/zchunk/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zchunk/Config.in b/package/zchunk/Config.in index 2c8db434ce..2d2a78a210 100644 --- a/package/zchunk/Config.in +++ b/package/zchunk/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ZCHUNK bool "zchunk" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_LIBCURL help -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:43:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:43:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiio: set PYTHON_EXECUTABLE Message-ID: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> Set PYTHON_EXECUTABLE to avoid the following build failure when BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without setuptools on host: -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter -- new -- Python_EXECUTABLE /usr/bin/python3.5 [...] Traceback (most recent call last): File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in from setuptools import setup ImportError: No module named 'setuptools' Fixes: - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 Signed-off-by: Fabrice Fontaine --- package/libiio/libiio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index f706298c22..38b2f83e6e 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -76,8 +76,10 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) ifeq ($(BR2_PACKAGE_PYTHON),y) LIBIIO_DEPENDENCIES += host-python-setuptools python +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python else ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 endif LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON else -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:45:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:45:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with gcc 4.8 Message-ID: <20220102174556.2824179-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: option.c: In function 'one_opt': option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode for (char *p = arg; *p; p++) { ^ option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { ^ Fixes: - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 Signed-off-by: Fabrice Fontaine --- ...-src-option.c-fix-build-with-gcc-4.8.patch | 52 +++++++++++++++++++ ...9080ff8743133fbd52427b4b2213171-typo.patch | 36 +++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch create mode 100644 package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..50ecf2f18a --- /dev/null +++ b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,52 @@ +From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 31 Dec 2021 17:29:44 +0100 +Subject: [PATCH] src/option.c: fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8 raised since version 2.86: + +option.c: In function 'one_opt': +option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode + for (char *p = arg; *p; p++) { + ^ +option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code +option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode + for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 + +Signed-off-by: Fabrice Fontaine +[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] +--- + src/option.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index ff54def..c57f6d8 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + arg += 9; + if (strlen(arg) != 16) + ret_err(gen_err); +- for (char *p = arg; *p; p++) { ++ char *p; ++ for (*p = arg; *p; p++) { + if (!isxdigit((int)*p)) + ret_err(gen_err); + } +@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + + u8 *u = daemon->umbrella_device; + char word[3]; +- for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { ++ u8 i; ++ for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { + memcpy(word, &(arg[0]), 2); + *u++ = strtoul(word, NULL, 16); + } +-- +2.33.0 + diff --git a/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch new file mode 100644 index 0000000000..8cdf5b3f1b --- /dev/null +++ b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch @@ -0,0 +1,36 @@ +From 2748fb81e23b71e2c44956e99321816aca91905d Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Sat, 1 Jan 2022 23:03:26 +0000 +Subject: [PATCH] Fix 46312909d9080ff8743133fbd52427b4b2213171 typo. + +[Upstream commit 2748fb81e23b71e2c44956e99321816aca91905d] +Signed-off-by: Fabrice Fontaine +--- + src/option.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index c57f6d8..6f56ce8 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -357,7 +357,7 @@ static const struct myoption opts[] = + { "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID }, + { "dynamic-host", 1, 0, LOPT_DYNHOST }, + { "log-debug", 0, 0, LOPT_LOG_DEBUG }, +- { "umbrella", 2, 0, LOPT_UMBRELLA }, ++ { "umbrella", 2, 0, LOPT_UMBRELLA }, + { "quiet-tftp", 0, 0, LOPT_QUIET_TFTP }, + { NULL, 0, 0, 0 } + }; +@@ -2526,7 +2526,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + if (strlen(arg) != 16) + ret_err(gen_err); + char *p; +- for (*p = arg; *p; p++) { ++ for (p = arg; *p; p++) { + if (!isxdigit((int)*p)) + ret_err(gen_err); + } +-- +2.33.0 + -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:45:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:45:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix uclibc-ng build Message-ID: <20220102174501.2824124-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 663f39c88c01593855c18355a4decdceeffd884b: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': /home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' Fixes: - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d Signed-off-by: Fabrice Fontaine --- .../0002-check-for-inb-and-outb.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch new file mode 100644 index 0000000000..3bc006acc7 --- /dev/null +++ b/package/freeipmi/0002-check-for-inb-and-outb.patch @@ -0,0 +1,50 @@ +From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 10:37:00 +0100 +Subject: [PATCH] check for inb and outb + +Check for inb and outb before using them to avoid the following build +failure on uclibc-ng: + +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': +/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' + +Fixes: + - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] +--- + configure.ac | 2 +- + libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 711b27674..bcc4156ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) + AC_CHECK_FUNCS([getline getprogname]) + AC_CHECK_FUNCS([strerror strerror_r]) + AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) +-AC_CHECK_FUNCS([iopl]) ++AC_CHECK_FUNCS([inb iopl outb]) + AC_CHECK_FUNCS([asprintf]) + AC_CHECK_FUNCS([cbrt]) + AC_CHECK_FUNCS([getmsg putmsg]) +diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c +index c212887c0..a9d4b2e96 100644 +--- a/libfreeipmi/driver/ipmi-kcs-driver.c ++++ b/libfreeipmi/driver/ipmi-kcs-driver.c +@@ -162,7 +162,7 @@ + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + # define _INB(port) inb (port) + # define _OUTB(data, port) outb (port, data) +-#elif defined(HAVE_IOPL) ++#elif defined(HAVE_INB) && defined(HAVE_OUTB) + # define _INB(port) inb (port) + # define _OUTB(data, port) outb (data, port) + #else +-- +2.33.0 + -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:46:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:46:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-utils: bump to version 1.2.6 Message-ID: <20220102174659.2824253-1-fontaine.fabrice@gmail.com> https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.6 https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5.1 https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5 Signed-off-by: Fabrice Fontaine --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index dda009c1af..c2d3ee9bb5 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2 +sha256 6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d alsa-utils-1.2.6.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 2603e52f18..c1478bf847 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.4 +ALSA_UTILS_VERSION = 1.2.6 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 -- 2.33.0 From amrtmoh2006 at gmail.com Sun Jan 2 18:15:24 2022 From: amrtmoh2006 at gmail.com (azxxza22) Date: Sun, 2 Jan 2022 20:15:24 +0200 Subject: [Buildroot] [PATCH 1/2] nodogsplash package added Message-ID: <20220102181525.9494-1-amrtmoh2006@gmail.com> Signed-off-by: azxxza22 --- package/Config.in | 1 + package/nodogsplash/Config.in | 9 ++++++++ package/nodogsplash/nodogsplash.mk | 37 ++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 package/nodogsplash/Config.in create mode 100644 package/nodogsplash/nodogsplash.mk diff --git a/package/Config.in b/package/Config.in index 2eda8f6ad7..152a2e9e60 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2270,6 +2270,7 @@ endif source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" + source "package/nodogsplash/Config.in" if BR2_PACKAGE_NGINX menu "External nginx modules" source "package/nginx-dav-ext/Config.in" diff --git a/package/nodogsplash/Config.in b/package/nodogsplash/Config.in new file mode 100644 index 0000000000..7a68bcccb0 --- /dev/null +++ b/package/nodogsplash/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_NODOGSPLASH + bool "nodogsplash" + depends on BR2_PACKAGE_LIBMICROHTTPD + help + Nodogsplash is a Captive Portal that offers + a simple way to provide restricted access to the Internet by + showing a splash page to the user before Internet access is granted + + https://github.com/nodogsplash/nodogsplash/ diff --git a/package/nodogsplash/nodogsplash.mk b/package/nodogsplash/nodogsplash.mk new file mode 100644 index 0000000000..3075b7e9f1 --- /dev/null +++ b/package/nodogsplash/nodogsplash.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# nodogsplash +# +################################################################################ +NODOGSPLASH_VERSION = v4.5.1 +NODOGSPLASH_SITE = git://github.com/nodogsplash/nodogsplash.git +NODOGSPLASH_SITE_METHOD = git +NODOGSPLASH_LICENSE = GPL-2.0 +NODOGSPLASH_LICENSE_FILES = COPYING +NODOGSPLASH_DEPENDENCIES = libmicrohttpd +NODOGSPLASH_INSTALL_STAGING = YES + +define NODOGSPLASH_BUILD_CMDS + $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) +endef + +define NODOGSPLASH_INSTALL_EXTRA_FILES + mkdir -p $(TARGET_DIR)/usr/bin + mkdir -p $(TARGET_DIR)/etc/nodogsplash/htdocs/images + cp $(@D)/resources/nodogsplash.conf $(TARGET_DIR)/etc/nodogsplash/ + cp $(@D)/resources/splash.html $(TARGET_DIR)/etc/nodogsplash/htdocs/ + cp $(@D)/resources/splash.css $(TARGET_DIR)/etc/nodogsplash/htdocs/ + cp $(@D)/resources/status.html $(TARGET_DIR)/etc/nodogsplash/htdocs/ + cp $(@D)/resources/splash.jpg $(TARGET_DIR)/etc/nodogsplash/htdocs/images/ +endef + +NODOGSPLASH_POST_INSTALL_TARGET_HOOKS += NODOGSPLASH_INSTALL_EXTRA_FILES + +define NODOGSPLASH_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/nodogsplash $(TARGET_DIR)/usr/bin + $(INSTALL) -D -m 0755 $(@D)/ndsctl $(TARGET_DIR)/usr/bin + +endef + +$(eval $(generic-package)) + -- 2.17.1 From amrtmoh2006 at gmail.com Sun Jan 2 18:15:25 2022 From: amrtmoh2006 at gmail.com (azxxza22) Date: Sun, 2 Jan 2022 20:15:25 +0200 Subject: [Buildroot] [PATCH 2/2] hash file added In-Reply-To: <20220102181525.9494-1-amrtmoh2006@gmail.com> References: <20220102181525.9494-1-amrtmoh2006@gmail.com> Message-ID: <20220102181525.9494-2-amrtmoh2006@gmail.com> Signed-off-by: azxxza22 --- package/nodogsplash/nodogsplash.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/nodogsplash/nodogsplash.hash diff --git a/package/nodogsplash/nodogsplash.hash b/package/nodogsplash/nodogsplash.hash new file mode 100644 index 0000000000..da059a854d --- /dev/null +++ b/package/nodogsplash/nodogsplash.hash @@ -0,0 +1,2 @@ +md5 edafdd4ef89218261f29a9074891cf7a nodogsplash-v4.5.1-br1.tar.gz +md5 cbbd794e2a0a289b9dfcc9f513d1996e COPYING -- 2.17.1 From bernd.kuhls at t-online.de Sun Jan 2 19:10:18 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:18 +0100 Subject: [Buildroot] [PATCH 12/19] package/kodi-pvr-stalker: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-12-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 66d587b19d..90e74d451a 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6161f0593feb67865e78f9aecc8c59019933ddda273e495ffadb0bdb42dde2a3 kodi-pvr-stalker-19.0.0-Matrix.tar.gz +sha256 84a92c298ddda8d72072aafe2a62c5c6b48b60b3b85408ce7ca4f96e42965541 kodi-pvr-stalker-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index d0ffebb063..a0d5f4356d 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 19.0.0-Matrix +KODI_PVR_STALKER_VERSION = 19.0.1-Matrix KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:07 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:07 +0100 Subject: [Buildroot] [PATCH 01/19] package/kodi-audiodecoder-modplug: bump version to 19.0.2-Matrix Message-ID: <20220102191025.259154-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index 7bab017241..e2bfe09928 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c422cacf456ab9eda5e2836d2789c3756bfbae03265a01647dd8f935261d9ec kodi-audiodecoder-modplug-19.0.1-Matrix.tar.gz +sha256 6e1b1910e799ea8c5ab11428084feb8f6a0a9b1b0d4b5760033545fe765a59e9 kodi-audiodecoder-modplug-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index 9b2cf98dbc..f5736e7db7 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:15 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:15 +0100 Subject: [Buildroot] [PATCH 09/19] package/kodi-pvr-nextpvr: bump version to 19.0.3-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-9-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- 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 2a0c235af1..df13732957 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 c240c16a878f3b024c40728efe5b4f1ae19b74c4cb69875d5f9e415882838ee3 kodi-pvr-nextpvr-19.0.2-Matrix.tar.gz +sha256 f9a03f7e61ae69096b149184a1ababa2d98cf2486688022e7b63823047c04496 kodi-pvr-nextpvr-19.0.3-Matrix.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 a453c4e62f..c245a7e0bc 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 = 19.0.2-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.3-Matrix 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 -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:23 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:23 +0100 Subject: [Buildroot] [PATCH 17/19] package/kodi-visualisation-matrix: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-17-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-visualisation-matrix/kodi-visualisation-matrix.hash | 2 +- package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash index 602dc3f2f0..9a5652a2d9 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e2cf98fa3cb9451dca595b2fad211ae34b5c449be07073c91aa73f182b208182 kodi-visualisation-matrix-19.0.0-Matrix.tar.gz +sha256 aba081aca30b6ff2b349f90ecc3ad9519fa7b8b88d61e08aeba2b66fad2a17a2 kodi-visualisation-matrix-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk index 080823e124..f8959facbd 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_MATRIX_VERSION = 19.0.0-Matrix +KODI_VISUALISATION_MATRIX_VERSION = 19.0.1-Matrix KODI_VISUALISATION_MATRIX_SITE = $(call github,xbmc,visualization.matrix,$(KODI_VISUALISATION_MATRIX_VERSION)) KODI_VISUALISATION_MATRIX_LICENSE = GPL-2.0+ KODI_VISUALISATION_MATRIX_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:20 +0100 Subject: [Buildroot] [PATCH 14/19] package/kodi-pvr-wmc: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-14-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index bfd95b37f7..4a04c07ac8 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f8e05a70948f31289a5c1a19114e904e088189ad12bf478dc4ab8e3b7dca211e kodi-pvr-wmc-19.0.1-Matrix.tar.gz +sha256 d5addd39f64f97beb6e14090561583de47f0acdc70bedb39b3037613430cc71a kodi-pvr-wmc-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 2eaaaaa77a..3bf21b3440 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 19.0.1-Matrix +KODI_PVR_WMC_VERSION = 19.0.2-Matrix KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:10 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:10 +0100 Subject: [Buildroot] [PATCH 04/19] package/kodi-audioencoder-lame: bump version to 19.1.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-4-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index f39b1f7a82..a9cb12af6a 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb75e1cb069e977887003d3f11cc73a1ecf885c7fb9c03950cd5c918dc64820a kodi-audioencoder-lame-19.1.1-Matrix.tar.gz +sha256 774e75b051b1872620a706aa5e6c8741708364ac8d9d849286c4a265dd1a22f7 kodi-audioencoder-lame-19.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index 9048d4d730..fbc7489782 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 19.1.1-Matrix +KODI_AUDIOENCODER_LAME_VERSION = 19.1.2-Matrix KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:25 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:25 +0100 Subject: [Buildroot] [PATCH 19/19] package/kodi-vfs-sftp: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-19-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 217b2b5ee3..1f3cc4978f 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 06015d9c645642f92ed2b28d6c6e3c1c9b149e7fb1e212b66a02510d438b4947 kodi-vfs-sftp-19.0.0-Matrix.tar.gz +sha256 671bc7bd45d8d744f7e8a60bde9d1f9a0c821d7dd79b9e33d29b2bb2b5d231a1 kodi-vfs-sftp-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index ea6cef069c..6415fcb1de 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 19.0.0-Matrix +KODI_VFS_SFTP_VERSION = 19.0.1-Matrix KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:22 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:22 +0100 Subject: [Buildroot] [PATCH 16/19] package/kodi-visualisation-fishbmc: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-16-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash | 2 +- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index c595b0ba1b..449b2a4817 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8cb7793f29b3c3d097a5348831347af8fbed1e4ef44d37d9faeff83ff22a830 kodi-visualisation-fishbmc-19.0.0-Matrix.tar.gz +sha256 3023e6cf739985c31ff9a6cd2a217909563b9817de5c1047aab8d9928a00cfd9 kodi-visualisation-fishbmc-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index 8e0fcabff9..060e1d9b69 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 19.0.0-Matrix +KODI_VISUALISATION_FISHBMC_VERSION = 19.0.1-Matrix KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ KODI_VISUALISATION_FISHBMC_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:12 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:12 +0100 Subject: [Buildroot] [PATCH 06/19] package/kodi-peripheral-joystick: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-6-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 8cc09e9774..c43d5d8628 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85452cab5aa6e6dd426ca5df76c0832e1c9fa2d464973a16ad5e8c52d4533cc9 kodi-peripheral-joystick-19.0.0-Matrix.tar.gz +sha256 65efcfb8b0ed6595082d8d7298ec25b5c31d0189bb8e09ae1bc10989b9655204 kodi-peripheral-joystick-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index b753e689e8..b823550751 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.0-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.1-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:09 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:09 +0100 Subject: [Buildroot] [PATCH 03/19] package/kodi-audiodecoder-snesapu: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-3-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash | 2 +- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index c8bf76ada7..1a0227f415 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f7a346b751900f4b66e8a3e7d3c3579b0b10a112e6ed6901553c4c9fc72bbb3b kodi-audiodecoder-snesapu-19.0.1-Matrix.tar.gz +sha256 b7180132472b27e71bf9f30675c0af58330f3ad07d7065492d28f3e97117c341 kodi-audiodecoder-snesapu-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index 5397e765f7..ff988dffce 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:08 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:08 +0100 Subject: [Buildroot] [PATCH 02/19] package/kodi-audiodecoder-nosefart: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash | 2 +- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 56a73306bd..9d1c9a2a76 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5ed3013f42860afec661e72bdcb4ebb10e98705d3a7c9826dfe29d2c394709d kodi-audiodecoder-nosefart-19.0.1-Matrix.tar.gz +sha256 631b2abded62a34bf66a6769f7b1597a418057f64d79e54322f57090e53e63e7 kodi-audiodecoder-nosefart-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index 4e12c965d5..fbf327032b 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:19 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:19 +0100 Subject: [Buildroot] [PATCH 13/19] package/kodi-pvr-vdr-vnsi: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-13-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 6759dfc5f5..c6223fc8e4 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab7ba632438d12001cb1e10c2ccb75816be9a9181ec2fdb739bd8eb2f173cf7f kodi-pvr-vdr-vnsi-19.0.0-Matrix.tar.gz +sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 51a22d6cb5..b281f00f19 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.0-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:17 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:17 +0100 Subject: [Buildroot] [PATCH 11/19] package/kodi-pvr-pctv: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-11-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 8946250980..04919af7d2 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 004d9f8801e9c5d2d76c0c84d0844c4560ede7e2ed02c4c43286991a54d720c9 kodi-pvr-pctv-19.0.0-Matrix.tar.gz +sha256 cd267a5b9e98b3b1b1c00feac16e2a07962641cbe53ff4c05ccb72acd925e3f8 kodi-pvr-pctv-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 61557eb301..6f8dca4b23 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 19.0.0-Matrix +KODI_PVR_PCTV_VERSION = 19.0.1-Matrix KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:16 +0100 Subject: [Buildroot] [PATCH 10/19] package/kodi-pvr-njoy: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-10-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index a5305526b1..ec78e7c84a 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 55644b3e7b09f0ae14ccbe55b569b5add782b72fb973e1545414f17c2613a4a8 kodi-pvr-njoy-19.0.0-Matrix.tar.gz +sha256 e5a6d31d1a74d8c053919f1c3c73eb9ada1e799d99f61dca171c3d8f0afa0a03 kodi-pvr-njoy-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index f6cee1bbb0..4808974c31 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 19.0.0-Matrix +KODI_PVR_NJOY_VERSION = 19.0.1-Matrix KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ KODI_PVR_NJOY_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:24 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:24 +0100 Subject: [Buildroot] [PATCH 18/19] package/kodi-visualisation-shadertoy: bump version to 19.1.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-18-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-visualisation-shadertoy.hash | 2 +- .../kodi-visualisation-shadertoy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index a27334d2cc..d3f489e4f9 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c556003a46ebf11595fb04343bf21a135365342f09e2280da2e7fd5e802944e7 kodi-visualisation-shadertoy-19.1.1-Matrix.tar.gz +sha256 49ffaf8ee1a95193d7ac4a6280ae7db8d59ca44c9e5554c0b8cd85a768d1d002 kodi-visualisation-shadertoy-19.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index e15264bb44..5c644bb3ee 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.1-Matrix +KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.2-Matrix KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:11 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:11 +0100 Subject: [Buildroot] [PATCH 05/19] package/kodi-inputstream-ffmpegdirect: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-5-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-inputstream-ffmpegdirect.hash | 2 +- .../kodi-inputstream-ffmpegdirect.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash index 90122f7bbf..97385a5167 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 47b920094d1ffaa8a6204ffb223cff94078a764c035a97384ae969e87a3f5e6e kodi-inputstream-ffmpegdirect-19.0.0-Matrix.tar.gz +sha256 b676f5264df50f3cf990b270bbeb4a18bb082e99ff189d7b9a25fd67313a0382 kodi-inputstream-ffmpegdirect-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk index 65cf63f6c8..bad6c6ac97 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.0-Matrix +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.1-Matrix KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION)) KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:14 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:14 +0100 Subject: [Buildroot] [PATCH 08/19] package/kodi-pvr-mediaportal-tvserver: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-8-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-pvr-mediaportal-tvserver.hash | 2 +- .../kodi-pvr-mediaportal-tvserver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 72c28d4aef..9f4bd97366 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e7947b0428fc394220138bedf1b56fce0ed7f5218d2f3e773d5fec62edbdc95e kodi-pvr-mediaportal-tvserver-19.0.1-Matrix.tar.gz +sha256 3e0ba7a111ee0f93b64d0a0cb640569b13e429b1c47c88ac737389083054d732 kodi-pvr-mediaportal-tvserver-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 9ddfae91e6..1db0dca618 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.1-Matrix +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.2-Matrix KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:13 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:13 +0100 Subject: [Buildroot] [PATCH 07/19] package/kodi-pvr-argustv: bump version to 19.1.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-7-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index d7bb94ec68..47ecd18975 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 66722c72c0bcd2b80ef2092a6bfc650ea2742f4a72521820ac716856bf69712b kodi-pvr-argustv-19.0.1-Matrix.tar.gz +sha256 31f0ac72c8549339c18c828e51ce2531c24686c6ce6c734db0f2b0ce67ff41a3 kodi-pvr-argustv-19.1.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index cbb7b9dc9b..793f7f1adc 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.0.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.1.1-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:21 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:21 +0100 Subject: [Buildroot] [PATCH 15/19] package/kodi-vfs-libarchive: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-15-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash | 2 +- package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index feda0ee6b2..f3a2c8fcef 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 941dd675e84c2a6e964622fcc36664f011304d2b2e207196aad298167c713715 kodi-vfs-libarchive-19.0.0-Matrix.tar.gz +sha256 1360154d86bc73fc6f01f546d7b09a92968653cf05b037b0cd80a825d95a9187 kodi-vfs-libarchive-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index 91191ab636..eac02d7442 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = 19.0.0-Matrix +KODI_VFS_LIBARCHIVE_VERSION = 19.0.1-Matrix KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md -- 2.30.2 From fontaine.fabrice at gmail.com Sun Jan 2 19:10:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 20:10:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrokdecode: fix build with python 3.10 Message-ID: <20220102191027.3219775-1-fontaine.fabrice@gmail.com> Fix the following build failure with sigrok-cli raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-none-linux-gnu/10.3.1/../../../../aarch64-none-linux-gnu/bin/ld: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/e2f33366803b18aff29086007610fa0a264f90d6 Signed-off-by: Fabrice Fontaine --- ...02-configure-Add-python-3-10-support.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch diff --git a/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch new file mode 100644 index 0000000000..e3148dcde8 --- /dev/null +++ b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch @@ -0,0 +1,28 @@ +From c4c10b89396fe21a622b8c38dd5815a496b007bf Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Mon, 20 Dec 2021 19:36:39 +0100 +Subject: [PATCH] configure: Add python 3.10 support + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=c4c10b89396fe21a622b8c38dd5815a496b007bf] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2917cb3..b8841f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.24.0.rc2 + -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 20:03:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 21:03:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/file: fix build with gcc 4.8 Message-ID: <20220102200337.3271548-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 5.41 in commit d38b72bcd75392a88b5100839ac410859d0a6a79: readelf.c: In function 'do_auxv_note': readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode for (size_t off = 0; off + elsize <= descsz; off += elsize) { ^ Fixes: - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc Signed-off-by: Fabrice Fontaine --- .../file/0001-fix-build-with-gcc-4.8.patch | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 package/file/0001-fix-build-with-gcc-4.8.patch diff --git a/package/file/0001-fix-build-with-gcc-4.8.patch b/package/file/0001-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..2494c6a7c0 --- /dev/null +++ b/package/file/0001-fix-build-with-gcc-4.8.patch @@ -0,0 +1,97 @@ +From e36455301a3757618381cb83bf17115dd386131e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 20:41:31 +0100 +Subject: [PATCH] fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8 + +readelf.c: In function 'do_auxv_note': +readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode + for (size_t off = 0; off + elsize <= descsz; off += elsize) { + ^ + +funcs.c:93:2: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *p = fmt; *p; p++) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugs.astron.com/view.php?id=307] +--- + src/der.c | 6 ++++-- + src/funcs.c | 3 ++- + src/readelf.c | 4 ++-- + 3 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/src/der.c b/src/der.c +index 4bee9f16..23b9a574 100644 +--- a/src/der.c ++++ b/src/der.c +@@ -235,6 +235,7 @@ der_tag(char *buf, size_t len, uint32_t tag) + static int + der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) + { ++ uint32_t i; + const uint8_t *d = CAST(const uint8_t *, q); + switch (tag) { + case DER_TAG_PRINTABLE_STRING: +@@ -251,7 +252,7 @@ der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) + break; + } + +- for (uint32_t i = 0; i < len; i++) { ++ for (i = 0; i < len; i++) { + uint32_t z = i << 1; + if (z < blen - 2) + snprintf(buf + z, blen - z, "%.2x", d[i]); +@@ -283,7 +284,8 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes) + offs += ms->offset + m->offset; + DPRINTF(("cont_level = %d\n", m->cont_level)); + #ifdef DEBUG_DER +- for (size_t i = 0; i < m->cont_level; i++) ++ size_t i; ++ for (i = 0; i < m->cont_level; i++) + printf("cont_level[%" SIZE_T_FORMAT "u] = %u\n", i, + ms->c.li[i].off); + #endif +diff --git a/src/funcs.c b/src/funcs.c +index d968873d..08b565fb 100644 +--- a/src/funcs.c ++++ b/src/funcs.c +@@ -90,7 +90,8 @@ file_checkfield(char *msg, size_t mlen, const char *what, const char **pp) + protected int + file_checkfmt(char *msg, size_t mlen, const char *fmt) + { +- for (const char *p = fmt; *p; p++) { ++ const char *p; ++ for (p = fmt; *p; p++) { + if (*p != '%') + continue; + if (*++p == '%') +diff --git a/src/readelf.c b/src/readelf.c +index 01c60fe9..46421a2e 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -1015,7 +1015,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, + size_t elsize = xauxv_sizeof; + const char *tag; + int is_string; +- size_t nval; ++ size_t nval, off; + + if ((*flags & (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) != + (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) +@@ -1043,7 +1043,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, + *flags |= FLAGS_DID_AUXV; + + nval = 0; +- for (size_t off = 0; off + elsize <= descsz; off += elsize) { ++ for (off = 0; off + elsize <= descsz; off += elsize) { + memcpy(xauxv_addr, &nbuf[doff + off], xauxv_sizeof); + /* Limit processing to 50 vector entries to prevent DoS */ + if (nval++ >= 50) { +-- +2.33.0 + -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 20:36:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 21:36:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> Message-ID: Hi, Le ven. 31 d?c. 2021 ? 09:26, Joachim Wiberg a ?crit : > > Hi everyone! > > On 12/28/21 6:14 PM, Thomas Petazzoni wrote: > > On Tue, 28 Dec 2021 18:07:03 +0100 Fabrice Fontaine wrote: > >>> An important (and unfortunate point) is that apparently mbedtls3 cannot > >>> be installed side-by-side with mbedtls. At least that's what your > >>> "depends on !BR2_PACKAGE_MBEDTLS" seems to hint. > >> Indeed, both versions install their headers in include/mbedtls. > >>> This is a major annoyance, and I'm not sure how Linux distributions > >>> will handle this migration if they cannot have mbedtls 2.x and mbedtls > >>> 3.x installed side by side. > >> 3.0 was released in July. > >> To my knowledge, hiawatha is one of the first package that uses this > >> new API and buildroot will probably be one of the first build system > >> that will provide mbedts3. > >> IMHO, being unable to install both versions side by side is pretty > >> common: we had the same issue with libupnp 1.6.x and libupnp 1.8.x. > >> Concerning libupnp, we even had to revert the possibility to install > >> both versions side by side because it was a "burden to programs > >> linking against libupnp": > >> https://github.com/pupnp/pupnp/commit/07f504c61bd9e4d93eb3d373ffc8527cafe0b9af > > I'm not sure to follow you here. The fact that it's pretty common > > doesn't make it a good solution. It makes the transition period > > absolutely awful. > > With the currently proposed approach, someone who today has a working > > configuration that has hiawatha and belle-sip can conveniently build > > both in the same image. With your patch applied, this is no longer > > possible, due to hiawatha now using mbedtls3, which cannot be installed > > side-by-side with mbedtls. > > This doesn't seem very acceptable for us, and probably is even less > > acceptable for major Linux distributions. > > I looked into this, ever so briefly, and without checking with any of > the packages that select BR2_PACKAGE_MBEDTLS. > > However, seeing as it is only Hiawatha that requires a version >= 3.0, > for a transition period, we could change it to -DUSE_SYSTEM_MBEDTLS=OFF > and let Hiawatha use its bundled mbedtls instead. Indeed, this is also an alternative, even if I think that adding mbedtls3 would be a great addition. For example, libcurl supports mbedts 3.0 since its version 7.79 and https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. Otherwise, as requested by Thomas, I sent an email to mbedtls mailing list: https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ Here is an extract of their answer: "you need to install the header files and the libraries under different paths. At most one can be in the default include and lib directories. Since each program can only use one version, you need to pick the desired -I/-L paths at compile/link times." So basically, we can't really install them side by side in the context of buildroot except if you want to patch every single mbedtls package with custom CFLAGS and LDFLAGS ... If one of you wants to debate with them, feel free to do it. > > > Best regards > /Joachim Best Regards, Fabrice From giulio.benetti at benettiengineering.com Sun Jan 2 21:04:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 2 Jan 2022 22:04:08 +0100 Subject: [Buildroot] [PATCH 2/2] toolchain: remove binutils bug 21464 In-Reply-To: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> References: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> Message-ID: <20220102210408.221439-2-giulio.benetti@benettiengineering.com> Binutils bug 21464 is not present anymore in Buildroot so let's remove it and its depends on in libgeos and postgis packages. Signed-off-by: Giulio Benetti --- package/libgeos/Config.in | 4 +--- package/postgis/Config.in | 4 +--- toolchain/Config.in | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 5e861ab010..8411627d43 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 21464, 27597" +comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/postgis/Config.in b/package/postgis/Config.in index f4d913ece7..405c5c723a 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 # libgeos depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ @@ -19,8 +18,7 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 21464, 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/toolchain/Config.in b/toolchain/Config.in index 140d07ca38..fd005f4740 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=21464 -# Affect toolchains built with binutils 2.31.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 - bool - default y if BR2_or1k - # https://sourceware.org/bugzilla/show_bug.cgi?id=27597 # Affect toolchains built with binutils 2.36.1, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Jan 2 21:04:07 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 2 Jan 2022 22:04:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: add patches to fix binutils bug 28735(or1k) Message-ID: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> After fixing binutils bug 21464, bug 28735 showed up. It got fixed very soon after my request: https://sourceware.org/pipermail/binutils/2022-January/119078.html So let's add patch and backported patches to all binutils versions to make Buildroot free from bug 28735. Unfortunately Bootlin toolchains have just been rebuilt and will fail for this bug. This happened because libgeos has been bumped few time ago and was masked by bug 21464 dependency that prevented to build. Signed-off-by: Giulio Benetti --- ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ 4 files changed, 300 insertions(+) create mode 100644 package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch create mode 100644 package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch create mode 100644 package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch create mode 100644 package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch diff --git a/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..7e92e2bfd8 --- /dev/null +++ b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 51def3dc6a168d03d28e0d4e2935d9ddb2929192 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index cfa292f0032..ecb70753b6a 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1477,12 +1494,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..e96d49122a --- /dev/null +++ b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From fbab8933bca6b7dba2aa19190a71f799a370c3d4 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 2ff998066a8..3df31172fcb 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1508,12 +1525,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..c4fedb719a --- /dev/null +++ b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 190091f9c1ec4cb80f8106e45ab4125eefa4114b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 431a8ee479f..ea26cdf1033 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 362a20108782b87cd780a989c0dbd014fc2def8b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..7fd88d72442 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + false), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ false, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ false, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ false); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = true; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + -- 2.25.1 From who+buildroot at cnackers.org Sun Jan 2 21:25:59 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Sun, 2 Jan 2022 22:25:59 +0100 Subject: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 In-Reply-To: <20220101223900.2970405-2-who+buildroot@cnackers.org> References: <20220101223900.2970405-2-who+buildroot@cnackers.org> Message-ID: <20220102212559.43475-1-who+buildroot@cnackers.org> Depedency on libuuid was removed in: https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 Signed-off-by: Erik Larsson --- .../0001-configure-make-build-gnu99.patch | 30 ------------------- package/tpm2-tools/Config.in | 2 -- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 6 ++-- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch deleted file mode 100644 index 37ca6c5873..0000000000 --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 -From: William Roberts -Date: Mon, 8 Feb 2021 11:57:28 -0600 -Subject: [PATCH] configure: make build gnu99 - -Signed-off-by: William Roberts - -[Retrieved from: -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c -and updated to set gnu99 instead of c99 as done by -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dc15b5595..25039a0d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ - # -D_GNU_SOURCE is required for execvpe() in options.c - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) - -+# Enable gnu99 mode, since we use some of these features. -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) -+ - # Best attempt compiler options that are on newer versions of GCC that - # we can't widely enforce without killing other peoples builds. - # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 3be947648f..1a6698570a 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index bfb7e9b220..f50a896363 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 41f5bcf201..8675344805 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,15 +4,13 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.3.2 +TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux -# We're patching configure.ac -TPM2_TOOLS_AUTORECONF = YES +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options -- 2.34.1 From m.niestroj at grinn-global.com Sun Jan 2 21:56:11 2022 From: m.niestroj at grinn-global.com (Marcin =?utf-8?Q?Niestr=C3=B3j?=) Date: Sun, 02 Jan 2022 22:56:11 +0100 Subject: [Buildroot] [PATCH 2/5] package/python-pyparsing: enable host build In-Reply-To: <20220101193018.404937-2-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-2-james.hilliard1@gmail.com> Message-ID: <87ee5phjzu.fsf@grinn-global.com> James Hilliard writes: > This will be required by host-python-packaging. > > Signed-off-by: James Hilliard > --- > package/python-pyparsing/python-pyparsing.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk > index 0dacf2371d..5741458d65 100644 > --- a/package/python-pyparsing/python-pyparsing.mk > +++ b/package/python-pyparsing/python-pyparsing.mk > @@ -10,5 +10,7 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9 > PYTHON_PYPARSING_LICENSE = MIT > PYTHON_PYPARSING_LICENSE_FILES = LICENSE > PYTHON_PYPARSING_SETUP_TYPE = setuptools > +HOST_PYTHON_PYPARSING_NEEDS_HOST_PYTHON = python3 > > $(eval $(python-package)) > +$(eval $(host-python-package)) Reviewed-by: Marcin Niestroj -- Marcin Niestr?j From m.niestroj at grinn-global.com Sun Jan 2 22:05:17 2022 From: m.niestroj at grinn-global.com (Marcin =?utf-8?Q?Niestr=C3=B3j?=) Date: Sun, 02 Jan 2022 23:05:17 +0100 Subject: [Buildroot] [PATCH 3/5] package/python-packaging: enable host build In-Reply-To: <20220101193018.404937-3-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-3-james.hilliard1@gmail.com> Message-ID: <87a6gdhjyi.fsf@grinn-global.com> James Hilliard writes: > This is required by python-setuptools-scm. > > Signed-off-by: James Hilliard > --- > package/python-packaging/python-packaging.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk > index 6b54d2416d..e2fb9b120b 100644 > --- a/package/python-packaging/python-packaging.mk > +++ b/package/python-packaging/python-packaging.mk > @@ -10,5 +10,8 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3a > PYTHON_PACKAGING_SETUP_TYPE = setuptools > PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause > PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD > +HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3 > +HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing > > $(eval $(python-package)) > +$(eval $(host-python-package)) Reviewed-by: Marcin Niestroj -- Marcin Niestr?j From fido_max at inbox.ru Mon Jan 3 04:33:25 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 3 Jan 2022 07:33:25 +0300 Subject: [Buildroot] [PATCH 2/2] toolchain: remove binutils bug 21464 In-Reply-To: <20220102210408.221439-2-giulio.benetti@benettiengineering.com> References: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> <20220102210408.221439-2-giulio.benetti@benettiengineering.com> Message-ID: On 03.01.2022 00:04, Giulio Benetti wrote: > Binutils bug 21464 is not present anymore in Buildroot so let's remove it > and its depends on in libgeos and postgis packages. > > Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov > --- > package/libgeos/Config.in | 4 +--- > package/postgis/Config.in | 4 +--- > toolchain/Config.in | 6 ------ > 3 files changed, 2 insertions(+), 12 deletions(-) From thomas.petazzoni at bootlin.com Mon Jan 3 06:56:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 03 Jan 2022 06:56:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-02 Message-ID: <20220103065642.8762960AF7@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-01-02 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 74 | 7 | 0 | 81 | 2021.11.x | 26 | 3 | 0 | 29 | master | 113 | 61 | 0 | 174 | Classification of failures by reason for master ----------------------------------------------- libapparmor-3.0.3 | 13 fail2ban-0.11.2 | 5 rygel-0.40.2 | 5 frr-8.1 | 4 google-breakpad-7515ab13768... | 3 guile-3.0.7 | 3 poppler-21.12.0 | 3 freeipmi-1.6.8 | 2 gstreamer1-mm-1.10.0 | 2 hiawatha-11.1 | 2 unknown | 2 wavemon-0.9.4 | 2 4th-3.62.5 | 1 delve-1.6.1 | 1 dnsmasq-2.86 | 1 efl-1.26.0 | 1 host-file-5.41 | 1 kismet-2021-08-R1 | 1 libiio-0.23 | 1 log4cxx-0.12.0 | 1 pcsc-lite-1.9.5 | 1 resiprocate-1.12.0 | 1 sg3_utils-1.47 | 1 sigrok-cli-0.7.2 | 1 tinycbor-0.6.0 | 1 tvheadend-b8710206eb073c72b... | 1 zchunk-1.1.16 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | 4th-3.62.5 | NOK | http://autobuild.buildroot.net/results/d7cbc4560455f09af137f329ee283803da6d9a18 | x86_64 | delve-1.6.1 | NOK | http://autobuild.buildroot.net/results/4999c1dcaf8d9ce58fa054f65bc0564379b601d9 | arc | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/51242d4f532373544e3c7ea45036b8d41390b29b | x86_64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/055c634f528d490155633f540b7702e9b209671b | arm | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/ec209d2a25ae42169bd64f9b7c841bb904d1a367 | i586 | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/969a6c8fef6931ed983eddbbed4c41458337353d | riscv64 | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/53c2cb461746ce7cfdd260bb74cb0a9e19f83fcb | arm | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/dae1b8aed29d7ee79b3ba645460846c45ad64ae8 | arm | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/ec32b353414072086c327636b1d8be7b4a99e88d | powerpc | freeipmi-1.6.8 | NOK | http://autobuild.buildroot.net/results/27187cf998c688ef12d637c47ebe16745623f9f2 | powerpc | freeipmi-1.6.8 | NOK | http://autobuild.buildroot.net/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d | nds32le | frr-8.1 | NOK | http://autobuild.buildroot.net/results/36e790ee5dd1fb9e668f85bebf43dc3612945bf6 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e981c6ba8a7cd3ed028e6f98c8b889e80a025834 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/487c56ffe6f88f9fee7f407e67beb7dec9f52267 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a1b8375f5d18e81aff578db624182878f57abe62 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/8b424fe5d7b6853319f3d87017c8b26ca2e5dfe5 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/50833673eb73134dfd2a99affbdf1f68a2e23f73 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/ae331418736d44a740126b6d0fb9e734d802f97d | mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/6ea1a3d89faea9b60eecacb66c22ddfd60f2b25d | ORPH mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/b82363db6ccb609a2905eb011e8364fd844ac93a | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a76debb958938f520fe340841baff446132197b0 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/9b163d3132018ce6032af33be9b51f2f1f0a9f1f | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/df99a01ffd9e8bf8a741755283dac9b79470f3e6 | ORPH mips64el | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/166d121ee85ad01edc49097a91fa9747df7210aa | arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/71c23dde4ddb8cdd7c9cda4218d55230aa822b9d | nios2 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc | ORPH m68k | kismet-2021-08-R1 | NOK | http://autobuild.buildroot.net/results/0108fecea42d2a1ddcf1e66e05f2bfcc1217d3b0 | ORPH arm | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/95dd18f38e41af9a2ab2864b9a79b3fdef168995 | aarch64 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/51f6e8656ae768e449225ec873a6b2b59875ecc6 | xtensa | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/939347a17a5d57920008648abb52cf9ee737fcdb | mips64el | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/353c4bd5377cf0d39b71b6436b326806a460100c | i686 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/fc4b0216c92374afd7a4c0d7e1551268b07693cc | x86_64 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/606844a4b65af028fdf08986a17c8ec478d9e168 | arc | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/d15509c627f814a36b78f0bfab81dfacf8908158 | aarch64 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/aa3af8eac008a1f6559e9fce1ce874a2ae8dd5fa | mips64el | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/da40fa0fa7659da8e66f8884fa3b8b7e45fab7c0 | x86_64 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/0bdcc7e2d0e3a9b9229d5704208ced0dc88a88d7 | mipsel | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/01c46c1916b1a2f7e06d4c4bf9e28b1a41cdfeee | i686 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/e347b70fe903fa366e70d3816ec97d88b6888118 | s390x | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/fad379bef963bfc86ac5ad3c8567dfbcb17c6f4c | microblazeel | libiio-0.23 | NOK | http://autobuild.buildroot.net/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 | powerpc64le | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/aef34c14fc8ec8dfa7492de2b994c770a2747217 | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/66c8b7973f2e787195a8565633cd7cab53581134 | ORPH arc | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/e9e3e4635e3e1e27e5e619001b71a328ad3b65d6 | arc | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/6ff25c3f7aae9afd4c971fe9fda8d665a8fea3f6 | xtensa | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/044a7111c65606cb063821f9cb6007af9f5d6ec8 | x86_64 | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/f26bbb8346d5ec68712e7eea9c7b61db8b36e268 | ORPH or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/20c7fabb447cce1e814cfdd05c5cf2bc80733e63 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/fec081130f87333a22cc25ec91f20c309aa0097b | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3dc2cd178e402651be1cf8e4b3e329cc5f83bdcd | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f228ecf5897db62191ae99387a241bc35f41d7ec | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1d8e73c11f4a164e319a1c01e9df556518104269 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/50abba4d95cd34cae0b1a167f13efdd9af1c8c7b | aarch64 | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/e2f33366803b18aff29086007610fa0a264f90d6 | arm | tinycbor-0.6.0 | NOK | http://autobuild.buildroot.net/results/36f17ce944994c01b57fc419e1af3d7d7def93ca | powerpc | tvheadend-b8710206eb073c72b... | NOK | http://autobuild.buildroot.net/results/01c578dcc56b45e5c620f5b43ff4a3348660b4e3 | arm | unknown | NOK | http://autobuild.buildroot.net/results/ddda25a9fe7d98a740633a8fa0c551f6d940bb44 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/b2a1a4f569ccf7fa43c77921ac6401f0b19e8824 | mipsel | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/af33495f64ebe4be0f85c55a8ebe587e4a40b601 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/dcaca10b00ba7dc2a6baa9828f30bf59bc613693 | arm | zchunk-1.1.16 | NOK | http://autobuild.buildroot.net/results/582b994372435b8c35a56345c15bd0ffc722af79 | Classification of failures by reason for 2021.02.x -------------------------------------------------- zeromq-4.3.4 | 2 apitrace-9.0 | 1 host-sentry-cli-1.57.0 | 1 openal-1.20.1 | 1 rocksdb-6.13.3 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-9.0 | NOK | http://autobuild.buildroot.net/results/ef77899a8882725ba56d051dc2c7c529a4513c89 | mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/62593a101fbde2c494fc1bce0675b10fa03e1e76 | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/bd93a666749d850ed7cc680f6dd04ea7ad4081ad | arm | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/8a17c033f9fb9db3edb0786f56a0c26ecf0952e0 | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/cd72d15758cf3f8169ed0a8645776b14b9875ec4 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/797799ed46d621435e9dc15ba79647f9d0c28c55 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/7ab63dd8ed5bc32e137a8a1f2ee88815ccdeefd1 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 1 libmbim-1.26.0 | 1 pipewire-0.3.39 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/5946985a0e850ddd54d70510122e327b29662631 | powerpc64 | libmbim-1.26.0 | NOK | http://autobuild.buildroot.net/results/36ee4839f9d80a07d66f739447db3b53150af6cb | arm | pipewire-0.3.39 | NOK | http://autobuild.buildroot.net/results/0b5510c6af93a3cf3de28b19729a8edec0a62412 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- acpica | DISTRO | https://release-monitoring.org/project/00018 | 20200717 | 20211217 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 41.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.3.1 | 4.5.2 | alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.6 | 1.2.6.1 | alsa-plugins | DISTRO | https://release-monitoring.org/project/00041 | 1.2.5 | 1.2.6 | alsa-utils | DISTRO | https://release-monitoring.org/project/00037 | 1.2.4 | 1.2.6 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 12.0.0_r21 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.0 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.4 | 5.1.5 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.42.0 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | r1450 | 6.4 | avro-c | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.10 | ORPH babeltrace2 | DISTRO | https://release-monitoring.org/project/07137 | 2.0.3 | 2.0.4 | balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 19.03.14 | 20.10.11 | ORPH bash | DISTRO | https://release-monitoring.org/project/00166 | 5.1 | 5.1.8 | ORPH batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2021.4 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.1 | 2021.4 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.5.0 | bcg729 | DISTRO | https://release-monitoring.org/project/14743 | 1.0.4 | 1.1.1 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.0.61 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.61 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.61 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.4 | ORPH bind | DISTRO | https://release-monitoring.org/project/14923 | 9.11.36 | 9.17.21 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.37 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 22.0 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.1.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.11 | 5.15.1 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.09 | 3.21 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.34.1 | 1.35.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.7 | 0.5.9 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.4 | 0.5.5 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.4 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.5.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.4.34 | 1.4.36 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.2 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.1 | 4.2 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.13 | 6.14 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.17.1 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.4 | 0.104.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.0 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.1 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.2 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.2.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.11.3 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.1.1 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.0.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.5 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.6.1 | 1.8.0 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20211214 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.11 | 20.10.12 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.2 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.11 | 20.10.12 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.19.1 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.4 | 1.46.5 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.0 | 1.26.1 | eigen | DISTRO | https://release-monitoring.org/project/00666 | 3.3.7 | 3.4.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 20.07 | 21.12 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.184 | 0.186 | ORPH elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.13.1 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.0 | 0.25.1 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.17 | 1.0.21 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-idna | DISTRO | https://release-monitoring.org/project/45374 | 6.0.0 | 6.1.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.9.0 | 1.11.2 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.6.10 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.9 | 1.0.16 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.25 | 1.0.29 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.10 | 1.0.14 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.7 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.6 | 1.0.8 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.38 | 1.0.45 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.23 | 1.0.27 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.39 | 1.1.0 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.9 | 1.1.13 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.20 | 1.0.24 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.44 | 1.1.48 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.4.10 | 1.5.6 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.28 | 1.0.32 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.8 | 1.0.12 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.9 | 1.0.10 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.3 | 1.4 | ethtool | DISTRO | https://release-monitoring.org/project/00763 | 5.12 | 5.15 | eudev | DISTRO | https://release-monitoring.org/project/13466 | 3.2.10 | 3.2.11 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.8.0.1 | 2.8.2.0 | exfatprogs | DISTRO | https://release-monitoring.org/project/94441 | 1.1.0 | 1.1.3 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.7.2 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.24 | 6.4.26 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.29 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.16.0 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.2 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | fsl-sdk-v2.0 | 0.2.0 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 5.15.4 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.94 | ORPH freeswitch | DISTRO | https://release-monitoring.org/project/21436 | 1.10.6 | 1.10.7 | freetype | DISTRO | https://release-monitoring.org/project/00854 | 2.10.4 | 2.11.1 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 21.12.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.10 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdk-pixbuf | DISTRO | https://release-monitoring.org/project/09533 | 2.42.4 | 2.42.6 | ORPH gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.2.9 | 2.3.5 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.53.3 | 9.55.0 | git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.34.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.66.0 | 2.70.1 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.70.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.10 | 3.0.14 | gnuchess | DISTRO | https://release-monitoring.org/project/01206 | 6.2.8 | 6.2.9 | ORPH gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.2.32 | 2.3.4 | ORPH gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.8.2.0 | 3.9.4.0 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.68.0 | 1.70.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.1 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grub2 | DISTRO | https://release-monitoring.org/project/01257 | 2.04 | 2.06 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 41.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gst-omx | DISTRO | https://release-monitoring.org/project/21845 | 1.18.5 | 1.19.3 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.5 | 1.19.3 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-libav | DISTRO | https://release-monitoring.org/project/21848 | 1.18.5 | 1.19.3 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.5 | 1.19.3 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.1 | ORPH gtkmm3 | DISTRO | https://release-monitoring.org/project/07963 | 3.22.0 | 4.4.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.0 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.13.0 | 0.14.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.44.1 | 1.48.1 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2018.01.1 | 2021.03.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.4.8 | 2.5.0 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.21.12 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.4.1 | 2.7.0 | icu | DISTRO | https://release-monitoring.org/project/16134 | 69-1 | 70.1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.36+nmu1 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.0.11-13 | 7.1.0-19 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.7.5 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.21.9.6 | ORPH ipmiutil | DISTRO | https://release-monitoring.org/project/01391 | 3.1.7 | 3.1.8 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | isl | DISTRO | https://release-monitoring.org/project/13286 | 0.23 | 0.24 | ORPH jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.17 | 1.9.19 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.18.1 | 1.19.2 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 0.10.10 | 0.11.6 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.28 | 2.0.33 | jimtcl | DISTRO | https://release-monitoring.org/project/01459 | 0.80 | 0.81 | jose | DISTRO | https://release-monitoring.org/project/11761 | 10 | 11 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.3 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.10.4 | 1.13.0 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.0 | json-glib | DISTRO | https://release-monitoring.org/project/13144 | 1.4.4 | 1.6.6 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.2.2 | 3.7.1 | keepalived | DISTRO | https://release-monitoring.org/project/01504 | 2.1.4 | 2.2.4 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.22 | 2.0.23 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.89.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.89.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.89.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.89.0 | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.4-Ma... | 20.2.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.0.3-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.10-M... | 20.2.0-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.1-Ma... | 20.2.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.2-Ma... | 20.1.0-Nexus | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 1.2.0 | 2.1.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | lft | DISTRO | https://release-monitoring.org/project/21863 | 3.8 | 3.91 | ORPH libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.25 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.4.0 | 0.6.1 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.10.0 | 0.11.3 | libbytesize | DISTRO | https://release-monitoring.org/project/07869 | 2.5 | 2.6 | ORPH libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.52 | 2.62 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 2.0 | libcodec2 | DISTRO | https://release-monitoring.org/project/14605 | 1.0.1 | 1.03 | libeXosip2 | DISTRO | https://release-monitoring.org/project/21475 | 5.2.1 | 5.3.0 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20191231-3.1 | 20210910-3.1 | libev | DISTRO | https://release-monitoring.org/project/01605 | 4.27 | 4.33 | ORPH libfribidi | DISTRO | https://release-monitoring.org/project/00857 | 1.0.10 | 1.0.11 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgeotiff | DISTRO | https://release-monitoring.org/project/21361 | 1.6.0 | 1.7.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.2 | 3.3.6 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.68.4 | 2.70.2 | libgpg-error | DISTRO | https://release-monitoring.org/project/01628 | 1.42 | 1.43 | ORPH libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.6.0 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.37 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.12 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.16 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libldns | DISTRO | https://release-monitoring.org/project/14817 | 1.7.1 | 1.8.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.1 | 0.11.3 | libmhash | DISTRO | https://release-monitoring.org/project/21488 | 0.9.9.9 | 1.4 | ORPH libminiupnpc | DISTRO | https://release-monitoring.org/project/01986 | 2.1.20201016 | 2.2.3 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.0 | 1.2.1 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.6 | 3.2.8 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 1.1.1m | 3.0.1 | libosip2 | DISTRO | https://release-monitoring.org/project/15135 | 5.2.1 | 5.3.0 | libpagekite | DISTRO | https://release-monitoring.org/project/21366 | 0.91.190530 | 0.91.201110 | libpam-radius-auth | DISTRO | https://release-monitoring.org/project/57834 | 1.4.0 | 2.0.0 | ORPH libpjsip | DISTRO | https://release-monitoring.org/project/15701 | 2.10 | 2.11.1 | libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.6.0 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.5.0 | 1.6.0 | libqb | DISTRO | https://release-monitoring.org/project/09399 | 2.0.3 | 2.0.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.5 | libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.2 | 3.3 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.2 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.2 | 20200710 | libsoundtouch | DISTRO | https://release-monitoring.org/project/115722 | 2.2 | 2.3.1 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.0 | 3.0.3 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.1 | 2.4.2 | libss7 | DISTRO | https://release-monitoring.org/project/21690 | 2.0.0 | 2.0.1 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.5 | libuhttpd | DISTRO | https://release-monitoring.org/project/89386 | 3.12.1 | 3.14.1 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.5.0 | 4.0.10 | ORPH libvdpau | DISTRO | https://release-monitoring.org/project/01755 | 1.3 | 1.4 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.1 | libvirt | DISTRO | https://release-monitoring.org/project/224041 | 7.7.0 | 7.10.0 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.0.21 | 4.3.0 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.26 | 4.4.27 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.61 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20210919 | 20211216 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2021.12.18 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.9 | 1.0.13 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.12.0 | 0.12.1 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.18.0 | 3.18.1 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.3 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.8 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.11.0 | 2.13.0 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.3 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.12 | 2.03.14 | ORPH lxc | DISTRO | https://release-monitoring.org/project/01860 | 4.0.10 | 4.0.11 | lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.3 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.30 | 10.7.1 | ORPH matchbox-fakekey | DISTRO | https://release-monitoring.org/project/229563 | 0.1 | 0.3 | matchbox-keyboard | DISTRO | https://release-monitoring.org/project/230595 | 0.1 | 0.1.1 | matchbox-lib | DISTRO | https://release-monitoring.org/project/21187 | 1.9 | 1.12 | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.16.12 | 3.1.0 | mbuffer | DISTRO | https://release-monitoring.org/project/15518 | 20210328 | 20211018 | mdadm | DISTRO | https://release-monitoring.org/project/01958 | 4.1 | 4.2 | ORPH mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.4.0 | 0.1.5.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.0.61 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 5.31b | memtester | DISTRO | https://release-monitoring.org/project/01967 | 4.5.0 | 4.5.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.42.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2021.12 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20190618 | 20210805 | ORPH modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.16.10 | 1.18.4 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.11 | 5.1.1 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.5 | mongrel2 | DISTRO | https://release-monitoring.org/project/16904 | 1.12.2 | 1.13.0 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.29.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.163 | mp4v2 | DISTRO | https://release-monitoring.org/project/98413 | 4.1.3 | 5.0.1 | ORPH mpd | DISTRO | https://release-monitoring.org/project/14864 | 0.23.3 | 0.23.5 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.0 | 2.5.1 | mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.29.3 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.34.0 | mraa | DISTRO | https://release-monitoring.org/project/21528 | 2.1.0 | 2.2.0 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 4.0.3 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.14 | 1.8.19 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.0.9 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.26 | 4.0.36 | multipath-tools | DISTRO | https://release-monitoring.org/project/00424 | 0.8.7 | 0.8.8 | mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | mutt | DISTRO | https://release-monitoring.org/project/02035 | 2.1.4 | 2.1.5 | nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.0.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220101 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.30.2 | 0.32.1 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | debian_1.... | 1.218 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.32.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.6.1 | 0.7.3 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9 | 5.9.1 | ORPH network-manager-openvpn | DISTRO | https://release-monitoring.org/project/69977 | 1.8.14 | 1.8.16 | nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.0 | 1.0.1 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.46.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.5 | nmon | DISTRO | https://release-monitoring.org/project/02097 | 16m | 16n | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.2 | 17.3.0 | nss-mdns | DISTRO | https://release-monitoring.org/project/05491 | 0.14.1 | 0.15.1 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.132 | 390.147 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 495.46 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 1.16 | ORPH ocf-linux | DISTRO | https://release-monitoring.org/project/21541 | 20120127 | 20171122 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.31 | 1.33 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.2.4 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.3 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.19 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.5.5 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.7.0 | openipmi | DISTRO | https://release-monitoring.org/project/02549 | 2.0.28 | 2.0.32 | ORPH openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.13+8 | 19+3 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.9.0 | 6.10.0 | openldap | DISTRO | https://release-monitoring.org/project/02551 | 2.4.59 | 2.6.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.2 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.44.10 | opentracing-cpp | DISTRO | https://release-monitoring.org/project/21553 | 1.5.1 | 1.6.0 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 10.3.5-10... | 11.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.5.0 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.27 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.0.61 | ORPH p11-kit | DISTRO | https://release-monitoring.org/project/02582 | 0.23.22 | 0.24.0 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.0 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH parted | DISTRO | https://release-monitoring.org/project/02596 | 3.3 | 3.4 | patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.9 | 0.14.3 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.3 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202112 | ORPH perl | DISTRO | https://release-monitoring.org/project/13599 | 5.32.1 | 5.34.0 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-guess | DISTRO | https://release-monitoring.org/project/17375 | 0.12 | 0.14 | perl-crypt-openssl-rsa | DISTRO | https://release-monitoring.org/project/02748 | 0.31 | 0.32 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.85 | 6.86 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-http-message | DISTRO | https://release-monitoring.org/project/02977 | 6.33 | 6.35 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.072 | 2.073 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.57 | 6.60 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20200907 | perl-net-dns | DISTRO | https://release-monitoring.org/project/03147 | 1.32 | 1.33 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.85 | 1.90 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-try-tiny | DISTRO | https://release-monitoring.org/project/11921 | 0.30 | 0.31 | perl-uri | DISTRO | https://release-monitoring.org/project/03485 | 5.09 | 5.10 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0207 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.0.14 | 8.1.1 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.21 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-imagick | DISTRO | https://release-monitoring.org/project/17401 | 3.5.0 | 3.6.0 | ORPH php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.1.2 | php-yaml | DISTRO | https://release-monitoring.org/project/12515 | 2.2.1 | 2.2.2 | ORPH pigpio | DISTRO | https://release-monitoring.org/project/21577 | 79 | 7301 | pinentry | DISTRO | https://release-monitoring.org/project/03643 | 1.1.1 | 1.2.0 | ORPH pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.40 | 0.3.42 | pkcs11-helper | DISTRO | https://release-monitoring.org/project/91990 | 1.27 | 1.28 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.8.0 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.16.0 | 2.17.0 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.10.1 | 1.11.1 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.8 | 1.3.9 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.14 | proftpd | DISTRO | https://release-monitoring.org/project/07609 | 1.3.6e | 1.3.7c | proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 8.2.1 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.15 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 14.2 | 15.0 | python-aenum | DISTRO | https://release-monitoring.org/project/34074 | 3.1.0 | 3.1.5 | python-aioblescan | DISTRO | https://release-monitoring.org/project/21242 | 0.2.8 | 0.2.10 | python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.1 | 0.4.3 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiojobs | DISTRO | https://release-monitoring.org/project/21252 | 0.3.0 | 1.0.0 | python-aioredis | DISTRO | https://release-monitoring.org/project/21938 | 2.0.0 | 2.0.1 | python-alsaaudio | DISTRO | https://release-monitoring.org/project/10072 | 0.8.4 | 0.9.0 | python-argon2-cffi | DISTRO | https://release-monitoring.org/project/33377 | 21.1.0 | 21.3.0 | python-arrow | DISTRO | https://release-monitoring.org/project/05314 | 1.2.0 | 1.2.1 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.4.1 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 21.2.0 | 21.4.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 21.3.1 | 21.11.1 | python-avro | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | python-backports-functools-... | DISTRO | https://release-monitoring.org/project/28328 | 1.5 | 1.6.4 | python-bidict | DISTRO | https://release-monitoring.org/project/114352 | 0.21.3 | 0.21.4 | python-bleak | DISTRO | https://release-monitoring.org/project/26271 | 0.12.1 | 0.13.0 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.26 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.26 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 1.2.1 | python-cbor2 | DISTRO | https://release-monitoring.org/project/64102 | 5.4.1 | 5.4.2 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2021.5.30 | 2021.10.8 | python-cffi | DISTRO | https://release-monitoring.org/project/05536 | 1.14.6 | 1.15.0 | python-channels | DISTRO | https://release-monitoring.org/project/21937 | 2.3.1 | 3.0.4 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 2.4.1 | 3.3.1 | python-charset-normalizer | DISTRO | https://release-monitoring.org/project/55366 | 2.0.7 | 2.0.9 | python-cheroot | DISTRO | https://release-monitoring.org/project/20163 | 8.2.1 | 8.5.2 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 12.0.1 | 18.6.1 | python-click | DISTRO | https://release-monitoring.org/project/03802 | 7.1.2 | 8.0.3 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.4.1 | 6.6.0 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.fb18 | 1.5 | python-cryptography | DISTRO | https://release-monitoring.org/project/05532 | 3.3.2 | 36.0.1 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 1.0.2 | 2.3.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a9 | python-daemon | DISTRO | https://release-monitoring.org/project/03816 | 2.2.3 | 2.3.0 | python-daphne | DISTRO | https://release-monitoring.org/project/21939 | 2.4.1 | 3.0.2 | python-dataproperty | DISTRO | https://release-monitoring.org/project/21697 | 0.53.0 | 0.54.2 | python-dialog | DISTRO | https://release-monitoring.org/project/03823 | 3.4.0 | 3.5.3 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 3.2.10 | 4.0b1 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 4.1.0 | 5.0.3 | python-docutils | DISTRO | https://release-monitoring.org/project/03849 | 0.15.2 | 0.18.1 | python-ecdsa | DISTRO | https://release-monitoring.org/project/08370 | 0.17.0 | 0.18.0b1 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.2.1 | 4.3.0 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.4.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.2 | python-flask-expects-json | DISTRO | https://release-monitoring.org/project/127659 | 1.5.0 | 1.7.0 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 0.3.1 | 2.1.0 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 2.4.1 | 2.5.1 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 0.15.1 | 1.0.0 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.28.2 | 4.28.5 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.9 | python-h2 | DISTRO | https://release-monitoring.org/project/19033 | 3.2.0 | 4.1.0 | python-hpack | DISTRO | https://release-monitoring.org/project/19034 | 3.0.0 | 4.0.0 | python-httplib2 | DISTRO | https://release-monitoring.org/project/03887 | 0.19.1 | 0.20.2 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.13.1 | python-hyperframe | DISTRO | https://release-monitoring.org/project/19035 | 5.2.0 | 6.0.1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.2 | 3.3 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.28.0 | 8.0.0b1 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 1.1.0 | 2.0.1 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-janus | DISTRO | https://release-monitoring.org/project/56567 | 0.6.1 | 1.0.0 | python-jaraco-classes | DISTRO | https://release-monitoring.org/project/20150 | 2.0 | 3.2.1 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 2.0 | 3.5.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.0.2 | 3.0.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 2.5.1 | 4.3.3 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 19.2.0 | 23.5.0 | python-kiwisolver | DISTRO | https://release-monitoring.org/project/16910 | 1.1.0 | 1.3.2 | python-lmdb | DISTRO | https://release-monitoring.org/project/15512 | 1.2.1 | 1.3.0 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.6.5 | 4.7.1 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.1.5 | 1.1.6 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.3.4 | 3.3.6 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.1 | 2.4.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.5.1 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 0.8.4 | 2.0.1 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 8.10.0 | 8.12.0 | python-msgfy | DISTRO | https://release-monitoring.org/project/29716 | 0.1.0 | 0.2.0 | python-msgpack | DISTRO | https://release-monitoring.org/project/21831 | 1.0.2 | 1.0.3 | python-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-nfc | DISTRO | https://release-monitoring.org/project/21829 | 0.13.5 | 1.0.3 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.0 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 0.8.4 | 0.98.9 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 21.0 | 21.3 | python-paho-mqtt | DISTRO | https://release-monitoring.org/project/06084 | 1.4.0 | 1.6.1 | python-pam | DISTRO | https://release-monitoring.org/project/05725 | 0.5.0 | 1.8.4 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.1 | python-pathlib2 | DISTRO | https://release-monitoring.org/project/12723 | 2.3.5 | 2.3.6 | python-pathpy | DISTRO | https://release-monitoring.org/project/21703 | 12.0.1 | 12.5.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.6.0 | 5.8.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 8.4.0 | 9.0.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 21.3.1 | python-portend | DISTRO | https://release-monitoring.org/project/20203 | 2.5 | 3.1.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.20 | 3.0.24 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python-psycopg2 | DISTRO | https://release-monitoring.org/project/03979 | 2.9.1 | 2.9.3 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2021.1 | 2021.2.2 | python-py | DISTRO | https://release-monitoring.org/project/03981 | 1.10.0 | 1.11.0 | python-pybind | DISTRO | https://release-monitoring.org/project/13384 | 2.6.1 | 2.9.0 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0a2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.5 | 1.5.6 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.7.4 | 2.11.1 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.2 | 2.0.3 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 1.9.7 | 2.8 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.19.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 2.2.0 | 2.5.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.18.14 | 1.19.4 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 19.1.0 | 21.0.0 | python-pyparsing | DISTRO | https://release-monitoring.org/project/03756 | 2.4.7 | 3.0.6 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.11.6 | 3.11.7 | python-pyphen | DISTRO | https://release-monitoring.org/project/19681 | 0.11.0 | 0.12.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.7 | 5.15.6 | python-pyro | DISTRO | https://release-monitoring.org/project/19993 | 3.16 | 4.82 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.5 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.1 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.16.0 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2019.3 | 2021.3 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | python-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 19.0.2 | 22.3.0 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 3.5.3 | 4.1.0 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.1 | python-rsa | DISTRO | https://release-monitoring.org/project/08808 | 4.7.2 | 4.8 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.fb57 | 2.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.1 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 18.1.0 | 21.1.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 44.0.0 | 60.2.0 | python-setuptools-rust | DISTRO | https://release-monitoring.org/project/122284 | 0.12.1 | 1.1.2 | python-setuptools-scm | DISTRO | https://release-monitoring.org/project/07874 | 5.0.1 | 6.3.2 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.17.5 | 3.17.6 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 0.45.2 | 1.3.0 | python-singledispatch | DISTRO | https://release-monitoring.org/project/12013 | 3.4.0.3 | 3.7.0 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.18 | 5.0.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 4.0.0 | 5.0.0 | python-snappy | DISTRO | https://release-monitoring.org/project/07203 | 0.5.4 | 0.6.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.0 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.2.1 | 2.3.1 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.3.10 | 1.4.29 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.2.0 | 1.2.1 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.3.0 | 0.4.2 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 1.14.1 | 4.1.2 | python-terminaltables | DISTRO | https://release-monitoring.org/project/15542 | 3.1.0 | 3.1.10 | python-thrift | DISTRO | https://release-monitoring.org/project/21614 | 0.13.0 | 0.15.0 | python-tinycss2 | DISTRO | https://release-monitoring.org/project/16655 | 1.1.0 | 1.1.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.1 | 1.1.3 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.0.4 | 6.1 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.40.1 | 4.62.3 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.1.0 | 5.1.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 20.3.0 | 21.5.0 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 20.3.0 | 21.7.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.0.1 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 4.2.0 | 5.1.0 | python-validators | DISTRO | https://release-monitoring.org/project/19818 | 0.15.0 | 0.18.2 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.1.9 | 0.2.5 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 53.4 | 54.0b1 | python-webpy | DISTRO | https://release-monitoring.org/project/04090 | 0.40 | 0.62 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 0.58.0 | 1.2.3 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.2 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.12.1 | 1.13.3 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 2.3.3 | 3.0.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.27 | 0.31 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.1 | 3.0.2 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.1 | python3-cffi | DISTRO | https://release-monitoring.org/project/05536 | 1.14.6 | 1.15.0 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a9 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python3-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 59.8.0 | 60.2.0 | qemu | DISTRO | https://release-monitoring.org/project/13607 | 6.1.0 | 6.2.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt53d | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5base | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5charts | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5connectivity | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5declarative | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5graphicaleffects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5imageformats | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5location | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5lottie | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5multimedia | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols2 | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quicktimeline | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5remoteobjects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5script | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5scxml | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5sensors | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialbus | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialport | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5svg | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5tools | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5virtualkeyboard | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5wayland | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webchannel | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.9.1 | 6.2.2 | qt5webkit-examples | DISTRO | https://release-monitoring.org/project/07927 | 5.9.1 | 6.2.2 | qt5websockets | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webview | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5x11extras | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5xmlpatterns | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.1 | 1.2 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-server | DISTRO | https://release-monitoring.org/project/05585 | 3.8.2 | 3.9.11 | ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.2 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.4 | 1.10.5 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.27.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2112.0 | rtai | DISTRO | https://release-monitoring.org/project/21658 | 4.0.1 | 5.3 | ORPH rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.0.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.57.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.57.0 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.10.0.3 | 2.11.0.1 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.1 | 2.3.5.3 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.6.3 | 1.0.7.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.5.1.5 | 2.5.1.7 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.4.1.1 | 2.5.1.0 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.3.2 | 2.2.3.4 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.2.2 | 0.5.3.0 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.3.0 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | sedutil | DISTRO | https://release-monitoring.org/project/15203 | 1.15.1 | 1.20.0 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.2 | 3.3 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.2 | 3.3 | ORPH sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.13 | sg3_utils | DISTRO | https://release-monitoring.org/project/04801 | 1.47 | 1.47r915 | shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.1 | ORPH skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.10.0.3 | 2.11.1.0 | snappy | DISTRO | https://release-monitoring.org/project/04844 | 1.1.8 | 1.1.9 | sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.4.7 | 1.4.10 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.2 | 3.4.8 | snort | DISTRO | https://release-monitoring.org/project/212335 | 2.9.18.1 | 2.9.19 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.3-80... | 1.13.6 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | speexdsp | DISTRO | https://release-monitoring.org/project/08419 | SpeexDSP-... | 1.2.0 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spi-tools | DISTRO | https://release-monitoring.org/project/20628 | 1.0.0 | 1.0.1 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.0 | 3.37.1 | squid | DISTRO | https://release-monitoring.org/project/04880 | 4.17 | 5.2 | ORPH sshfs | DISTRO | https://release-monitoring.org/project/11058 | 3.7.1 | 3.7.2 | ORPH start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.1 | ORPH startup-notification | DISTRO | https://release-monitoring.org/project/10089 | 0.9 | 0.12 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.4 | 1.0.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.61 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.4 | ORPH synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.23.1 | 0.28.0 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.34.1 | 3.35.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.42.1 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.4.2 | 12.5.5 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.01 | ORPH targetcli-fb | DISTRO | https://release-monitoring.org/project/09174 | 2.1.fb41 | 2.1.54 | tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.9.0 | 1.12.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 4.1.1 | 5.0.0 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.15.0 | ORPH tinyalsa | DISTRO | https://release-monitoring.org/project/21382 | 1.1.1 | 2.0.0 | ORPH tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.2a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 2.4.0 | ORPH tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 4.3.2 | 5.2 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | trace-cmd... | 2.9.4 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.0 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2021.10 | udpcast | DISTRO | https://release-monitoring.org/project/10206 | 20200328 | 20211207 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.10 | 0.11 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 3.15.0.0 | 4.1.0.5 | umtprd | DISTRO | https://release-monitoring.org/project/46129 | 1.3.10 | 1.6.2 | unclutter-xfixes | DISTRO | https://release-monitoring.org/project/09206 | 1.5 | 1.6 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 2.2 | unrar | DISTRO | https://release-monitoring.org/project/13306 | 5.9.4 | 6.1.3 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | usbredir | DISTRO | https://release-monitoring.org/project/16012 | 0.11.0 | 0.12.0 | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.54.5 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.3930 | 8.2.3978 | ORPH vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.48.3 | 0.66.2 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.22 | 3.2.26 | waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.22 | 2.0.23 | waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.6.1 | 1.7.0 | wayland | DISTRO | https://release-monitoring.org/project/10061 | 1.19.0 | 1.20.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.23 | 1.24 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.32.4 | 2.34.3 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 6.23 | wireguard-linux-compat | DISTRO | https://release-monitoring.org/project/62379 | 1.0.20210606 | 1.0.20211208 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.2 | 0.4.5 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.10 | 3.6.1 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.0 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.1.0 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.3 | 2.35.1 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.18 | 1.4.19 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20210218 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 21.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.3 | 4.16.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.10.0 | 5.14.2 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xml-security-c | DISTRO | https://release-monitoring.org/project/05197 | 2.0.2 | 2.0.4 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 5.45 | 6.02 | xserver_xorg-server | DISTRO | https://release-monitoring.org/project/05250 | 21.1.2 | 21.1.3 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.17 | 3.18 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.0 | 0.3.1 | xxhash | DISTRO | https://release-monitoring.org/project/17583 | 0.8.0 | 0.8.1 | ORPH yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2020f | 2021e | zlib-ng | DISTRO | https://release-monitoring.org/project/115592 | 1.9.9-b1 | 2.0.6 | ORPH zynq-boot-bin | DISTRO | https://release-monitoring.org/project/21623 | 2015.1 | 2021.2 | ORPH Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 bash | CVE-2019-18276 | https://security-tracker.debian.org/tracker/CVE-2019-18276 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-3487 | https://security-tracker.debian.org/tracker/CVE-2021-3487 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bird | CVE-2021-26928 | https://security-tracker.debian.org/tracker/CVE-2021-26928 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2021-42376 | https://security-tracker.debian.org/tracker/CVE-2021-42376 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 civetweb | CVE-2020-27304 | https://security-tracker.debian.org/tracker/CVE-2020-27304 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exim | CVE-2021-38371 | https://security-tracker.debian.org/tracker/CVE-2021-38371 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2020-35965 | https://security-tracker.debian.org/tracker/CVE-2020-35965 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 flatbuffers | CVE-2020-35864 | https://security-tracker.debian.org/tracker/CVE-2020-35864 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41157 | https://security-tracker.debian.org/tracker/CVE-2021-41157 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-27645 | https://security-tracker.debian.org/tracker/CVE-2021-27645 glibc | CVE-2021-33574 | https://security-tracker.debian.org/tracker/CVE-2021-33574 glibc | CVE-2021-38604 | https://security-tracker.debian.org/tracker/CVE-2021-38604 gnuchess | CVE-2021-30184 | https://security-tracker.debian.org/tracker/CVE-2021-30184 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 go | CVE-2021-29923 | https://security-tracker.debian.org/tracker/CVE-2021-29923 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2020-6624 | https://security-tracker.debian.org/tracker/CVE-2020-6624 jhead | CVE-2020-6625 | https://security-tracker.debian.org/tracker/CVE-2020-6625 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 keepalived | CVE-2021-44225 | https://security-tracker.debian.org/tracker/CVE-2021-44225 kodi | CVE-2021-42917 | https://security-tracker.debian.org/tracker/CVE-2021-42917 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libesmtp | CVE-2019-19977 | https://security-tracker.debian.org/tracker/CVE-2019-19977 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libnss | CVE-2021-43527 | https://security-tracker.debian.org/tracker/CVE-2021-43527 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libressl | CVE-2021-41581 | https://security-tracker.debian.org/tracker/CVE-2021-41581 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 monkey | CVE-2013-1771 | https://security-tracker.debian.org/tracker/CVE-2013-1771 monkey | CVE-2013-2183 | https://security-tracker.debian.org/tracker/CVE-2013-2183 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 mutt | CVE-2021-32055 | https://security-tracker.debian.org/tracker/CVE-2021-32055 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 network-manager | CVE-2021-20297 | https://security-tracker.debian.org/tracker/CVE-2021-20297 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 openblas | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvpn | CVE-2021-3606 | https://security-tracker.debian.org/tracker/CVE-2021-3606 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php-imagick | CVE-2019-11037 | https://security-tracker.debian.org/tracker/CVE-2019-11037 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 privoxy | CVE-2021-44542 | https://security-tracker.debian.org/tracker/CVE-2021-44542 privoxy | CVE-2021-44543 | https://security-tracker.debian.org/tracker/CVE-2021-44543 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-autobahn | CVE-2020-35678 | https://security-tracker.debian.org/tracker/CVE-2020-35678 python-cryptography | CVE-2020-36242 | https://security-tracker.debian.org/tracker/CVE-2020-36242 python-django | CVE-2021-44420 | https://security-tracker.debian.org/tracker/CVE-2021-44420 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2020-35503 | https://security-tracker.debian.org/tracker/CVE-2020-35503 qemu | CVE-2020-35504 | https://security-tracker.debian.org/tracker/CVE-2020-35504 qemu | CVE-2020-35505 | https://security-tracker.debian.org/tracker/CVE-2020-35505 qemu | CVE-2020-35506 | https://security-tracker.debian.org/tracker/CVE-2020-35506 qemu | CVE-2020-35517 | https://security-tracker.debian.org/tracker/CVE-2020-35517 qemu | CVE-2021-20181 | https://security-tracker.debian.org/tracker/CVE-2021-20181 qemu | CVE-2021-20196 | https://security-tracker.debian.org/tracker/CVE-2021-20196 qemu | CVE-2021-20203 | https://security-tracker.debian.org/tracker/CVE-2021-20203 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-20263 | https://security-tracker.debian.org/tracker/CVE-2021-20263 qemu | CVE-2021-3392 | https://security-tracker.debian.org/tracker/CVE-2021-3392 qemu | CVE-2021-3409 | https://security-tracker.debian.org/tracker/CVE-2021-3409 qemu | CVE-2021-3416 | https://security-tracker.debian.org/tracker/CVE-2021-3416 qemu | CVE-2021-3507 | https://security-tracker.debian.org/tracker/CVE-2021-3507 qemu | CVE-2021-3527 | https://security-tracker.debian.org/tracker/CVE-2021-3527 qemu | CVE-2021-3544 | https://security-tracker.debian.org/tracker/CVE-2021-3544 qemu | CVE-2021-3545 | https://security-tracker.debian.org/tracker/CVE-2021-3545 qemu | CVE-2021-3546 | https://security-tracker.debian.org/tracker/CVE-2021-3546 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 qpid-proton | CVE-2016-2166 | https://security-tracker.debian.org/tracker/CVE-2016-2166 qpid-proton | CVE-2016-4467 | https://security-tracker.debian.org/tracker/CVE-2016-4467 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2021-28966 | https://security-tracker.debian.org/tracker/CVE-2021-28966 runc | CVE-2021-43784 | https://security-tracker.debian.org/tracker/CVE-2021-43784 rust | CVE-2021-29922 | https://security-tracker.debian.org/tracker/CVE-2021-29922 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2021-3156 | https://security-tracker.debian.org/tracker/CVE-2021-3156 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tools | CVE-2021-3565 | https://security-tracker.debian.org/tracker/CVE-2021-3565 uboot-tools | CVE-2021-27097 | https://security-tracker.debian.org/tracker/CVE-2021-27097 uboot-tools | CVE-2021-27138 | https://security-tracker.debian.org/tracker/CVE-2021-27138 util-linux | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 util-linux-libs | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 vim | CVE-2021-4069 | https://security-tracker.debian.org/tracker/CVE-2021-4069 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wget | CVE-2021-31879 | https://security-tracker.debian.org/tracker/CVE-2021-31879 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28705 | https://security-tracker.debian.org/tracker/CVE-2021-28705 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28709 | https://security-tracker.debian.org/tracker/CVE-2021-28709 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 keepalived | CVE-2021-44225 | https://security-tracker.debian.org/tracker/CVE-2021-44225 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 openblas | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 privoxy | CVE-2021-44542 | https://security-tracker.debian.org/tracker/CVE-2021-44542 privoxy | CVE-2021-44543 | https://security-tracker.debian.org/tracker/CVE-2021-44543 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-django | CVE-2021-44420 | https://security-tracker.debian.org/tracker/CVE-2021-44420 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 runc | CVE-2021-43784 | https://security-tracker.debian.org/tracker/CVE-2021-43784 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2021-36690 | https://security-tracker.debian.org/tracker/CVE-2021-36690 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4069 | https://security-tracker.debian.org/tracker/CVE-2021-4069 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28705 | https://security-tracker.debian.org/tracker/CVE-2021-28705 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28709 | https://security-tracker.debian.org/tracker/CVE-2021-28709 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From tomi.valkeinen at ideasonboard.com Mon Jan 3 08:24:07 2022 From: tomi.valkeinen at ideasonboard.com (Tomi Valkeinen) Date: Mon, 3 Jan 2022 10:24:07 +0200 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: <20211206215730.GE2603@scaer> References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> Message-ID: Hi, On 06/12/2021 23:57, Yann E. MORIN wrote: > So I think we really, really need a package (like scipy) that actually > makes use of pybind, so we can see how it works, and to fix it... Jfyi, there are two relatively simple packages in buildroot that can use pybind: kmsxx and rwmem. Both use meson for building. I can test the next version of this series with those packages. Tomi From troglobit at gmail.com Mon Jan 3 08:41:39 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Mon, 03 Jan 2022 09:41:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> Message-ID: <87bl0t1a9o.fsf@gmail.com> On Sat, Jan 01, 2022 at 23:59, Fabrice Fontaine wrote: > The LXC 4.0 branch is supported until June 2025. > Only bugfixes and securitiy issues get included into the stable bugfix > releases, so it's always safe and recommended to keep up and run the > latest bugfix release. > > https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg From troglobit at gmail.com Mon Jan 3 08:42:10 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Mon, 03 Jan 2022 09:42:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: new package In-Reply-To: <20220101135737.956301-1-fontaine.fabrice@gmail.com> References: <20220101135737.956301-1-fontaine.fabrice@gmail.com> Message-ID: <878rvx1a8t.fsf@gmail.com> On Sat, Jan 01, 2022 at 14:57, Fabrice Fontaine wrote: > ksmbd kernel server userspace utilities. > > https://github.com/cifsd-team/ksmbd-tools > > Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg From yann.morin.1998 at free.fr Mon Jan 3 09:04:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:14 +0100 Subject: [Buildroot] [git commit] package/kodi-peripheral-joystick: bump version to 19.0.1-Matrix Message-ID: <20220103090129.396C982BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ac5273f8571f53966ca1beb382f573712d8a2e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 8cc09e9774..c43d5d8628 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85452cab5aa6e6dd426ca5df76c0832e1c9fa2d464973a16ad5e8c52d4533cc9 kodi-peripheral-joystick-19.0.0-Matrix.tar.gz +sha256 65efcfb8b0ed6595082d8d7298ec25b5c31d0189bb8e09ae1bc10989b9655204 kodi-peripheral-joystick-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index b753e689e8..b823550751 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.0-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.1-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:02 +0100 Subject: [Buildroot] [git commit] package/kodi-audiodecoder-modplug: bump version to 19.0.2-Matrix Message-ID: <20220103090129.0876082BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=deec3a88876cdb1454cb550ea57d4b3692d54cea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index 7bab017241..e2bfe09928 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c422cacf456ab9eda5e2836d2789c3756bfbae03265a01647dd8f935261d9ec kodi-audiodecoder-modplug-19.0.1-Matrix.tar.gz +sha256 6e1b1910e799ea8c5ab11428084feb8f6a0a9b1b0d4b5760033545fe765a59e9 kodi-audiodecoder-modplug-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index 9b2cf98dbc..f5736e7db7 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:05 +0100 Subject: [Buildroot] [git commit] package/kodi-audiodecoder-nosefart: bump version to 19.0.2-Matrix Message-ID: <20220103090129.10B9C82D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2973455e7043e134029385c815c3e8a5975c46af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash | 2 +- package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 56a73306bd..9d1c9a2a76 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5ed3013f42860afec661e72bdcb4ebb10e98705d3a7c9826dfe29d2c394709d kodi-audiodecoder-nosefart-19.0.1-Matrix.tar.gz +sha256 631b2abded62a34bf66a6769f7b1597a418057f64d79e54322f57090e53e63e7 kodi-audiodecoder-nosefart-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index 4e12c965d5..fbf327032b 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:29 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-stalker: bump version to 19.0.1-Matrix Message-ID: <20220103090129.714F382D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=040560c3d765f8e1b44f796f480ec8aadb646a25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 66d587b19d..90e74d451a 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6161f0593feb67865e78f9aecc8c59019933ddda273e495ffadb0bdb42dde2a3 kodi-pvr-stalker-19.0.0-Matrix.tar.gz +sha256 84a92c298ddda8d72072aafe2a62c5c6b48b60b3b85408ce7ca4f96e42965541 kodi-pvr-stalker-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index d0ffebb063..a0d5f4356d 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 19.0.0-Matrix +KODI_PVR_STALKER_VERSION = 19.0.1-Matrix KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:10 +0100 Subject: [Buildroot] [git commit] package/kodi-audioencoder-lame: bump version to 19.1.2-Matrix Message-ID: <20220103090129.2170882BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fb70b49b615ace33730f0b0fee0cc02e06624d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index f39b1f7a82..a9cb12af6a 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb75e1cb069e977887003d3f11cc73a1ecf885c7fb9c03950cd5c918dc64820a kodi-audioencoder-lame-19.1.1-Matrix.tar.gz +sha256 774e75b051b1872620a706aa5e6c8741708364ac8d9d849286c4a265dd1a22f7 kodi-audioencoder-lame-19.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index 9048d4d730..fbc7489782 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 19.1.1-Matrix +KODI_AUDIOENCODER_LAME_VERSION = 19.1.2-Matrix KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:45 +0100 Subject: [Buildroot] [git commit] package/kodi-vfs-sftp: bump version to 19.0.1-Matrix Message-ID: <20220103090129.BB84882D9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76c1664ddd62711183b4698c74749d62462c809a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 217b2b5ee3..1f3cc4978f 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 06015d9c645642f92ed2b28d6c6e3c1c9b149e7fb1e212b66a02510d438b4947 kodi-vfs-sftp-19.0.0-Matrix.tar.gz +sha256 671bc7bd45d8d744f7e8a60bde9d1f9a0c821d7dd79b9e33d29b2bb2b5d231a1 kodi-vfs-sftp-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index ea6cef069c..6415fcb1de 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 19.0.0-Matrix +KODI_VFS_SFTP_VERSION = 19.0.1-Matrix KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:36 +0100 Subject: [Buildroot] [git commit] package/kodi-vfs-libarchive: bump version to 19.0.1-Matrix Message-ID: <20220103090129.9062182D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=947f30ef43b1828ce5d5f3713ac3da1f7ed4fac1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash | 2 +- package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index feda0ee6b2..f3a2c8fcef 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 941dd675e84c2a6e964622fcc36664f011304d2b2e207196aad298167c713715 kodi-vfs-libarchive-19.0.0-Matrix.tar.gz +sha256 1360154d86bc73fc6f01f546d7b09a92968653cf05b037b0cd80a825d95a9187 kodi-vfs-libarchive-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index 91191ab636..eac02d7442 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = 19.0.0-Matrix +KODI_VFS_LIBARCHIVE_VERSION = 19.0.1-Matrix KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:12 +0100 Subject: [Buildroot] [git commit] package/kodi-inputstream-ffmpegdirect: bump version to 19.0.1-Matrix Message-ID: <20220103090129.30BC182D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0921cf401c16c64202db24484a585ba5c652a04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash | 2 +- package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash index 90122f7bbf..97385a5167 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 47b920094d1ffaa8a6204ffb223cff94078a764c035a97384ae969e87a3f5e6e kodi-inputstream-ffmpegdirect-19.0.0-Matrix.tar.gz +sha256 b676f5264df50f3cf990b270bbeb4a18bb082e99ff189d7b9a25fd67313a0382 kodi-inputstream-ffmpegdirect-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk index 65cf63f6c8..bad6c6ac97 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.0-Matrix +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.1-Matrix KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION)) KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:07 +0100 Subject: [Buildroot] [git commit] package/kodi-audiodecoder-snesapu: bump version to 19.0.2-Matrix Message-ID: <20220103090129.191BC82D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51dc39eed390e2b0f86f6e5d5d8c083067c17c51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash | 2 +- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index c8bf76ada7..1a0227f415 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f7a346b751900f4b66e8a3e7d3c3579b0b10a112e6ed6901553c4c9fc72bbb3b kodi-audiodecoder-snesapu-19.0.1-Matrix.tar.gz +sha256 b7180132472b27e71bf9f30675c0af58330f3ad07d7065492d28f3e97117c341 kodi-audiodecoder-snesapu-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index 5397e765f7..ff988dffce 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:33 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-wmc: bump version to 19.0.2-Matrix Message-ID: <20220103090129.8726782D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99b223aecf0b967a88a8df4ee178a9527ea17de9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index bfd95b37f7..4a04c07ac8 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f8e05a70948f31289a5c1a19114e904e088189ad12bf478dc4ab8e3b7dca211e kodi-pvr-wmc-19.0.1-Matrix.tar.gz +sha256 d5addd39f64f97beb6e14090561583de47f0acdc70bedb39b3037613430cc71a kodi-pvr-wmc-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 2eaaaaa77a..3bf21b3440 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 19.0.1-Matrix +KODI_PVR_WMC_VERSION = 19.0.2-Matrix KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:43 +0100 Subject: [Buildroot] [git commit] package/kodi-visualisation-shadertoy: bump version to 19.1.2-Matrix Message-ID: <20220103090129.B304D82D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa9b29fdf51b9d992343f3736709fce98d247f60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash | 2 +- package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index a27334d2cc..d3f489e4f9 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c556003a46ebf11595fb04343bf21a135365342f09e2280da2e7fd5e802944e7 kodi-visualisation-shadertoy-19.1.1-Matrix.tar.gz +sha256 49ffaf8ee1a95193d7ac4a6280ae7db8d59ca44c9e5554c0b8cd85a768d1d002 kodi-visualisation-shadertoy-19.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index e15264bb44..5c644bb3ee 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.1-Matrix +KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.2-Matrix KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:19 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-mediaportal-tvserver: bump version to 19.0.2-Matrix Message-ID: <20220103090129.492A382D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c25809c665ee6aca8923f0721ffd4e5a6fd55273 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash | 2 +- package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 72c28d4aef..9f4bd97366 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e7947b0428fc394220138bedf1b56fce0ed7f5218d2f3e773d5fec62edbdc95e kodi-pvr-mediaportal-tvserver-19.0.1-Matrix.tar.gz +sha256 3e0ba7a111ee0f93b64d0a0cb640569b13e429b1c47c88ac737389083054d732 kodi-pvr-mediaportal-tvserver-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 9ddfae91e6..1db0dca618 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.1-Matrix +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.2-Matrix KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:17 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-argustv: bump version to 19.1.1-Matrix Message-ID: <20220103090129.4172382BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=596744fe95468da1f869f9d4d0aa49f5d98d1815 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index d7bb94ec68..47ecd18975 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 66722c72c0bcd2b80ef2092a6bfc650ea2742f4a72521820ac716856bf69712b kodi-pvr-argustv-19.0.1-Matrix.tar.gz +sha256 31f0ac72c8549339c18c828e51ce2531c24686c6ce6c734db0f2b0ce67ff41a3 kodi-pvr-argustv-19.1.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index cbb7b9dc9b..793f7f1adc 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.0.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.1.1-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:40 +0100 Subject: [Buildroot] [git commit] package/kodi-visualisation-matrix: bump version to 19.0.1-Matrix Message-ID: <20220103090129.A9CF382D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f77e4b34cd19bc50c79c01bf5321c53fe0c4a83c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash | 2 +- package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash index 602dc3f2f0..9a5652a2d9 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e2cf98fa3cb9451dca595b2fad211ae34b5c449be07073c91aa73f182b208182 kodi-visualisation-matrix-19.0.0-Matrix.tar.gz +sha256 aba081aca30b6ff2b349f90ecc3ad9519fa7b8b88d61e08aeba2b66fad2a17a2 kodi-visualisation-matrix-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk index 080823e124..f8959facbd 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_MATRIX_VERSION = 19.0.0-Matrix +KODI_VISUALISATION_MATRIX_VERSION = 19.0.1-Matrix KODI_VISUALISATION_MATRIX_SITE = $(call github,xbmc,visualization.matrix,$(KODI_VISUALISATION_MATRIX_VERSION)) KODI_VISUALISATION_MATRIX_LICENSE = GPL-2.0+ KODI_VISUALISATION_MATRIX_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:21 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-nextpvr: bump version to 19.0.3-Matrix Message-ID: <20220103090129.50CCC82D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1053d9d91bf702cdad38a141c3e6391002a6e996 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 2a0c235af1..df13732957 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 c240c16a878f3b024c40728efe5b4f1ae19b74c4cb69875d5f9e415882838ee3 kodi-pvr-nextpvr-19.0.2-Matrix.tar.gz +sha256 f9a03f7e61ae69096b149184a1ababa2d98cf2486688022e7b63823047c04496 kodi-pvr-nextpvr-19.0.3-Matrix.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 a453c4e62f..c245a7e0bc 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 = 19.0.2-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.3-Matrix 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 yann.morin.1998 at free.fr Mon Jan 3 09:04:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:24 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-njoy: bump version to 19.0.1-Matrix Message-ID: <20220103090129.5A8BD82D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bc526ea99fc8a485e7d0b22a502ab9312121ef1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index a5305526b1..ec78e7c84a 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 55644b3e7b09f0ae14ccbe55b569b5add782b72fb973e1545414f17c2613a4a8 kodi-pvr-njoy-19.0.0-Matrix.tar.gz +sha256 e5a6d31d1a74d8c053919f1c3c73eb9ada1e799d99f61dca171c3d8f0afa0a03 kodi-pvr-njoy-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index f6cee1bbb0..4808974c31 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 19.0.0-Matrix +KODI_PVR_NJOY_VERSION = 19.0.1-Matrix KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ KODI_PVR_NJOY_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:26 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-pctv: bump version to 19.0.1-Matrix Message-ID: <20220103090129.674A882D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24d3ed0e9fb91063edc12a96e617795fdaad9ab7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 8946250980..04919af7d2 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 004d9f8801e9c5d2d76c0c84d0844c4560ede7e2ed02c4c43286991a54d720c9 kodi-pvr-pctv-19.0.0-Matrix.tar.gz +sha256 cd267a5b9e98b3b1b1c00feac16e2a07962641cbe53ff4c05ccb72acd925e3f8 kodi-pvr-pctv-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 61557eb301..6f8dca4b23 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 19.0.0-Matrix +KODI_PVR_PCTV_VERSION = 19.0.1-Matrix KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:31 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-vdr-vnsi: bump version to 19.0.1-Matrix Message-ID: <20220103090129.7AB2E82D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c1cede383f616fa1472c261f271323e8cc610f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 6759dfc5f5..c6223fc8e4 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab7ba632438d12001cb1e10c2ccb75816be9a9181ec2fdb739bd8eb2f173cf7f kodi-pvr-vdr-vnsi-19.0.0-Matrix.tar.gz +sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 51a22d6cb5..b281f00f19 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.0-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:38 +0100 Subject: [Buildroot] [git commit] package/kodi-visualisation-fishbmc: bump version to 19.0.1-Matrix Message-ID: <20220103090129.9AC8382D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4698bada4e613ea144275800a7bdfd3dc01334f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash | 2 +- package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index c595b0ba1b..449b2a4817 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8cb7793f29b3c3d097a5348831347af8fbed1e4ef44d37d9faeff83ff22a830 kodi-visualisation-fishbmc-19.0.0-Matrix.tar.gz +sha256 3023e6cf739985c31ff9a6cd2a217909563b9817de5c1047aab8d9928a00cfd9 kodi-visualisation-fishbmc-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index 8e0fcabff9..060e1d9b69 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 19.0.0-Matrix +KODI_VISUALISATION_FISHBMC_VERSION = 19.0.1-Matrix KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ KODI_VISUALISATION_FISHBMC_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:07:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:07:32 +0100 Subject: [Buildroot] [PATCH 01/19] package/kodi-audiodecoder-modplug: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220103090732.GE69135@scaer> Bernd, All, On 2022-01-02 20:10 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls Whole series of 19 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- > package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash > index 7bab017241..e2bfe09928 100644 > --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash > +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4c422cacf456ab9eda5e2836d2789c3756bfbae03265a01647dd8f935261d9ec kodi-audiodecoder-modplug-19.0.1-Matrix.tar.gz > +sha256 6e1b1910e799ea8c5ab11428084feb8f6a0a9b1b0d4b5760033545fe765a59e9 kodi-audiodecoder-modplug-19.0.2-Matrix.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk > index 9b2cf98dbc..f5736e7db7 100644 > --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk > +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.1-Matrix > +KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.2-Matrix > KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) > KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ > KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 09:16:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:16:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220102200337.3271548-1-fontaine.fabrice@gmail.com> References: <20220102200337.3271548-1-fontaine.fabrice@gmail.com> Message-ID: <20220103091657.GF69135@scaer> Fabrice, All, On 2022-01-02 21:03 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 5.41 in > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > readelf.c: In function 'do_auxv_note': > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc The error above explicitly states that C99 should be used to build those files. C99 is supposedly complete in gcc 4.8, but was not the default, hence the error. And it seems that using C99 is what we attempted in da400ee5e1e (file: bump to version 5.26), which added the following line: FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' So, why are those files not built with C99? Ha, because this is the host variant... We should also use -std=gnu99 for the host variant. Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > .../file/0001-fix-build-with-gcc-4.8.patch | 97 +++++++++++++++++++ > 1 file changed, 97 insertions(+) > create mode 100644 package/file/0001-fix-build-with-gcc-4.8.patch > > diff --git a/package/file/0001-fix-build-with-gcc-4.8.patch b/package/file/0001-fix-build-with-gcc-4.8.patch > new file mode 100644 > index 0000000000..2494c6a7c0 > --- /dev/null > +++ b/package/file/0001-fix-build-with-gcc-4.8.patch > @@ -0,0 +1,97 @@ > +From e36455301a3757618381cb83bf17115dd386131e Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 2 Jan 2022 20:41:31 +0100 > +Subject: [PATCH] fix build with gcc 4.8 > + > +Fix the following build failure with gcc 4.8 > + > +readelf.c: In function 'do_auxv_note': > +readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > + for (size_t off = 0; off + elsize <= descsz; off += elsize) { > + ^ > + > +funcs.c:93:2: error: 'for' loop initial declarations are only allowed in C99 mode > + for (const char *p = fmt; *p; p++) { > + ^ > + > +Fixes: > + - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://bugs.astron.com/view.php?id=307] > +--- > + src/der.c | 6 ++++-- > + src/funcs.c | 3 ++- > + src/readelf.c | 4 ++-- > + 3 files changed, 8 insertions(+), 5 deletions(-) > + > +diff --git a/src/der.c b/src/der.c > +index 4bee9f16..23b9a574 100644 > +--- a/src/der.c > ++++ b/src/der.c > +@@ -235,6 +235,7 @@ der_tag(char *buf, size_t len, uint32_t tag) > + static int > + der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) > + { > ++ uint32_t i; > + const uint8_t *d = CAST(const uint8_t *, q); > + switch (tag) { > + case DER_TAG_PRINTABLE_STRING: > +@@ -251,7 +252,7 @@ der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) > + break; > + } > + > +- for (uint32_t i = 0; i < len; i++) { > ++ for (i = 0; i < len; i++) { > + uint32_t z = i << 1; > + if (z < blen - 2) > + snprintf(buf + z, blen - z, "%.2x", d[i]); > +@@ -283,7 +284,8 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes) > + offs += ms->offset + m->offset; > + DPRINTF(("cont_level = %d\n", m->cont_level)); > + #ifdef DEBUG_DER > +- for (size_t i = 0; i < m->cont_level; i++) > ++ size_t i; > ++ for (i = 0; i < m->cont_level; i++) > + printf("cont_level[%" SIZE_T_FORMAT "u] = %u\n", i, > + ms->c.li[i].off); > + #endif > +diff --git a/src/funcs.c b/src/funcs.c > +index d968873d..08b565fb 100644 > +--- a/src/funcs.c > ++++ b/src/funcs.c > +@@ -90,7 +90,8 @@ file_checkfield(char *msg, size_t mlen, const char *what, const char **pp) > + protected int > + file_checkfmt(char *msg, size_t mlen, const char *fmt) > + { > +- for (const char *p = fmt; *p; p++) { > ++ const char *p; > ++ for (p = fmt; *p; p++) { > + if (*p != '%') > + continue; > + if (*++p == '%') > +diff --git a/src/readelf.c b/src/readelf.c > +index 01c60fe9..46421a2e 100644 > +--- a/src/readelf.c > ++++ b/src/readelf.c > +@@ -1015,7 +1015,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, > + size_t elsize = xauxv_sizeof; > + const char *tag; > + int is_string; > +- size_t nval; > ++ size_t nval, off; > + > + if ((*flags & (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) != > + (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) > +@@ -1043,7 +1043,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, > + *flags |= FLAGS_DID_AUXV; > + > + nval = 0; > +- for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ++ for (off = 0; off + elsize <= descsz; off += elsize) { > + memcpy(xauxv_addr, &nbuf[doff + off], xauxv_sizeof); > + /* Limit processing to 50 vector entries to prevent DoS */ > + if (nval++ >= 50) { > +-- > +2.33.0 > + > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 09:20:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:20:06 +0100 Subject: [Buildroot] [git commit] package/libsigrokdecode: fix build with python 3.10 Message-ID: <20220103091418.2CAFC82AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=779501290f7205de2dcb7a7eadff9e456b0e2d3e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with sigrok-cli raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-none-linux-gnu/10.3.1/../../../../aarch64-none-linux-gnu/bin/ld: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/e2f33366803b18aff29086007610fa0a264f90d6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0002-configure-Add-python-3-10-support.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch new file mode 100644 index 0000000000..53acb65944 --- /dev/null +++ b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch @@ -0,0 +1,28 @@ +From c4c10b89396fe21a622b8c38dd5815a496b007bf Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Mon, 20 Dec 2021 19:36:39 +0100 +Subject: [PATCH] configure: Add python 3.10 support + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff;h=c4c10b89396fe21a622b8c38dd5815a496b007bf +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2917cb3..b8841f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.24.0.rc2 + From yann.morin.1998 at free.fr Mon Jan 3 09:21:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:21:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrokdecode: fix build with python 3.10 In-Reply-To: <20220102191027.3219775-1-fontaine.fabrice@gmail.com> References: <20220102191027.3219775-1-fontaine.fabrice@gmail.com> Message-ID: <20220103092108.GG69135@scaer> Fabrice, All, On 2022-01-02 20:10 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure with sigrok-cli raised since bump of > python3 to version 3.10.1 in commit > 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-none-linux-gnu/10.3.1/../../../../aarch64-none-linux-gnu/bin/ld: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' > > Fixes: > - http://autobuild.buildroot.org/results/e2f33366803b18aff29086007610fa0a264f90d6 > > Signed-off-by: Fabrice Fontaine > --- > ...02-configure-Add-python-3-10-support.patch | 28 +++++++++++++++++++ > 1 file changed, 28 insertions(+) > create mode 100644 package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch > > diff --git a/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch > new file mode 100644 > index 0000000000..e3148dcde8 > --- /dev/null > +++ b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch > @@ -0,0 +1,28 @@ > +From c4c10b89396fe21a622b8c38dd5815a496b007bf Mon Sep 17 00:00:00 2001 > +From: Soeren Apel > +Date: Mon, 20 Dec 2021 19:36:39 +0100 > +Subject: [PATCH] configure: Add python 3.10 support > + > +[Retrieved from: > +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=c4c10b89396fe21a622b8c38dd5815a496b007bf] I've changed that to point to the commit-diff (not just the commit log), and applied to master, thanks. Regards, Yann E. MORIN. > +Signed-off-by: Fabrice Fontaine > +--- > + configure.ac | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index 2917cb3..b8841f8 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) > + # first, since usually only that variant will add "-lpython3.8". > + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build > + SR_PKG_CHECK([python3], [SRD_PKGLIBS], > +- [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) > ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) > + AS_IF([test "x$sr_have_python3" = xno], > + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) > + > +-- > +2.24.0.rc2 > + > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fperrad at gmail.com Mon Jan 3 10:43:43 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 3 Jan 2022 11:43:43 +0100 Subject: [Buildroot] [PATCH] package/ethtool: bump to version 5.15 Message-ID: <20220103104343.15975-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 536579670..59c657e86 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 ethtool-5.12.tar.xz +sha256 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d ethtool-5.15.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index f3e950f21..c4bb9bdd9 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.12 +ETHTOOL_VERSION = 5.15 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 -- 2.32.0 From fperrad at gmail.com Mon Jan 3 10:43:55 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 3 Jan 2022 11:43:55 +0100 Subject: [Buildroot] [PATCH] package/spi-tools: bump to version 1.0.1 Message-ID: <20220103104355.16030-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/spi-tools/spi-tools.hash | 2 +- package/spi-tools/spi-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash index a1ef4c2b9..1595cd3d2 100644 --- a/package/spi-tools/spi-tools.hash +++ b/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 5eb24670461dcf2c58471114dc69b5204dab1c0cc5053878f6de79503bd8cc9f spi-tools-1.0.0.tar.gz +sha256 81bb9f7218123f86c3644d92ad2c427343758df2143ee5da38e6f743f18714fd spi-tools-1.0.1.tar.gz sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk index 26d0dcf54..d623babf4 100644 --- a/package/spi-tools/spi-tools.mk +++ b/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 1.0.0 +SPI_TOOLS_VERSION = 1.0.1 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES -- 2.32.0 From fperrad at gmail.com Mon Jan 3 10:44:07 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 3 Jan 2022 11:44:07 +0100 Subject: [Buildroot] [PATCH] package/sqlite: bump to version 3.37.1 Message-ID: <20220103104407.16085-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- 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 94f0127d1..604275ebf 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7 sqlite-autoconf-3370000.tar.gz +sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index be060c311..59b76ce16 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.0 -SQLITE_TAR_VERSION = 3370000 +SQLITE_VERSION = 3.37.1 +SQLITE_TAR_VERSION = 3370100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2021 SQLITE_LICENSE = Public domain -- 2.32.0 From paul at crapouillou.net Mon Jan 3 10:52:53 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Mon, 03 Jan 2022 10:52:53 +0000 Subject: [Buildroot] [PATCH 1/1] package/libiio: set PYTHON_EXECUTABLE In-Reply-To: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> References: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> Message-ID: <5KR45R.7T4EYI3OTWEG1@crapouillou.net> Hi Fabrice, Le dim., janv. 2 2022 at 18:43:29 +0100, Fabrice Fontaine a ?crit : > Set PYTHON_EXECUTABLE to avoid the following build failure when > BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without > setuptools on host: > > -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found > components: Interpreter > -- new > -- Python_EXECUTABLE /usr/bin/python3.5 > > [...] > > Traceback (most recent call last): > File > "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", > line 15, in > from setuptools import setup > ImportError: No module named 'setuptools' > > Fixes: > - > http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 > > Signed-off-by: Fabrice Fontaine Acked-by: Paul Cercueil Cheers, -Paul > --- > package/libiio/libiio.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk > index f706298c22..38b2f83e6e 100644 > --- a/package/libiio/libiio.mk > +++ b/package/libiio/libiio.mk > @@ -76,8 +76,10 @@ endif > ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) > ifeq ($(BR2_PACKAGE_PYTHON),y) > LIBIIO_DEPENDENCIES += host-python-setuptools python > +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python > else ifeq ($(BR2_PACKAGE_PYTHON3),y) > LIBIIO_DEPENDENCIES += host-python3-setuptools python3 > +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 > endif > LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON > else > -- > 2.33.0 > From andreynech at gmail.com Mon Jan 3 11:29:11 2022 From: andreynech at gmail.com (Andrey Nechypurenko) Date: Mon, 3 Jan 2022 12:29:11 +0100 Subject: [Buildroot] [PATCH 1/1] support/scripts/: remove -E flag from patch call In-Reply-To: <20211230214722.GJ3390456@scaer> References: <20211214125510.13654-1-andreynech@gmail.com> <20211230214722.GJ3390456@scaer> Message-ID: Hi Yann, >> -E flag instructs patch to remove empty files. However, in some cases >> empty files are essential. If they are missing, build could be broken >> or other bad things can happen. > > Do you have an example of a publicly accessible package that has this > issue? No I have not. In my case this is not a mainlined driver for the touch controller provided by the display manufacturer. > So we have an antagonist situation: some patches will want to rem ove > files, and some patches will want to not remove files. We can't satisfy > both, obviously. > > So, unfortunately, it is not possible to apply your patch. I understand your concern. So it sounds like a need for configurability here. > Unless someone comes up with a better idea... Not sure if it is a good idea, but maybe the problem could be solved using series files? Currently, there is already -p1 parameter which could be specified in the series files. Brief look at the relevant part of the apply-patches.sh reveals that it is ignored :-) but it could be changed. After that, the script can walk through patch directories where patches with +++ /dev/null are found, generate or update series files to use the -E flag together with -p1. This solution would not break existing packages and provide flexibility for the new packages where developers can decide whether to add -E (or maybe some other flags) to patch invocation using series files. What do you think about it? Best regards, Andrey. From thomas.petazzoni at bootlin.com Mon Jan 3 15:23:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 3 Jan 2022 16:23:41 +0100 Subject: [Buildroot] [RFC v1] package/assimp: fix namespace related compile failure In-Reply-To: <20211231091800.629b2ad3@gmx.net> References: <20211230172507.30212-1-ps.report@gmx.net> <20211230211120.031434c7@windsurf> <20211231091800.629b2ad3@gmx.net> Message-ID: <20220103162341.2c6f2a55@windsurf> Hello Peter, On Fri, 31 Dec 2021 09:18:00 +0100 Peter Seiderer wrote: > Same failure today (see [1]) with: > > $ ./host/bin/mips-linux-gnu-g++ --version > mips-linux-gnu-g++ (Sourcery CodeBench Lite 2016.05-8) 5.3.0 > > And merge request accepted upstream, see [2]... Thanks for the ping on this. In the mean time, Yann merged the patch, so we're good! Thanks a lot, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 3 15:25:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 3 Jan 2022 16:25:20 +0100 Subject: [Buildroot] [PATCH v5 05/10] board: Add Sipeed MAIX-bit support In-Reply-To: References: <20211026071728.954356-1-damien.lemoal@wdc.com> <20211026071728.954356-6-damien.lemoal@wdc.com> <20211230212742.030be8c5@windsurf> Message-ID: <20220103162520.07b40bf0@windsurf> Hello Damien, On Fri, 31 Dec 2021 00:39:14 +0000 Damien Le Moal wrote: > My apologies about the delay. I have been swamped with the kernel and other > projects. I kept at this a little though, mainly trying to address the elf2flt > issue which seems to generate unworkable binaries for Peter, while it is always > working for me... Really no clue what is going on so I am a little stuck with > that. I will work on updates addressing all of Peter's comments and see how > that work. No worries about the delay. I took advantage of the Christmas/New Year quiet period to help catch up with our patch backlog, and stumbled across your patch series, which is why I asked. I also saw the on-going discussion with Peter who had issues with non-working binaries produced by elf2flt. > > - The readme.txt file for each defconfig should be added in the patch > > adding the defconfig > > Hmm... It is the same procedure for all boards, only the defconfig name > differs. Hence I added this README file last with all board defconfigs > mentioned. I can add the README file with the first board and update it with > each patch adding a board ? Yes, that would work: add the README file with the first board, and update it progressively for each board. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From florent.aumaitre at medianesysteme.com Mon Jan 3 16:36:53 2022 From: florent.aumaitre at medianesysteme.com (Florent AUMAITRE) Date: Mon, 3 Jan 2022 16:36:53 +0000 Subject: [Buildroot] [PATCH 1/1] package/qt5: fix parallel build qmake package (qt5) doesn't build when using parallel build. In-Reply-To: <20211226235013.22faad2e@windsurf> References: <20211214075133.4482-1-florent.aumaitre@medianesysteme.com> <20211215232839.22ae07a9@gmx.net> <20211226235013.22faad2e@windsurf> Message-ID: Hello Thomas, > -----Message d'origine----- > De?: Thomas Petazzoni > Envoy??: dimanche 26 d?cembre 2021 23:50 > ??: Florent AUMAITRE > Cc?: Peter Seiderer ; Julien Corjon > ; Naumann Andreas > ; buildroot at buildroot.org > Objet?: Re: [Buildroot] [PATCH 1/1] package/qt5: fix parallel build qmake > package (qt5) doesn't build when using parallel build. > > Hello Florent, > > On Thu, 16 Dec 2021 09:25:19 +0000 > Florent AUMAITRE wrote: > > > > Which failure? Does it happen with per-package enabled or without > > > (would like to avoid the forced MAKE1 for all qt packages install) > > > too? In case it happens with per-package disabled it should go to an extra > patch... > > > > I observe a race condition with some install target > > 2021-11-04T12:43:36 Makefile:886: recipe for target > > 'install_do_install_qmltypes' failed > > 2021-11-04T12:43:36 Makefile:400: recipe for target > > 'sub-wavefrontmesh-install_subtargets' failed > > 2021-11-04T12:43:36 make[4]: *** > > [sub-wavefrontmesh-install_subtargets] Error 2 > > 2021-11-04T12:43:36 make[4]: *** Waiting for unfinished jobs... > > > > Qt5declarative generated makefile (qt5declarative- > 5.15.2/src/imports/wavefrontmesh/Makefile) install twice > /usr/qml/Qt/labs/wavefrontmesh/plugins.qmltypes in target install_qmlfiles > and install_do_install_qmltypes. > > Could you specify whether this happens with > BR2_PER_PACKAGE_DIRECTORIES enabled or disabled? Also, do you have an > example Buildroot configuration that exhibits this problem? This appended with BR2_PER_PACKAGE_DIRECTORIES enabled. This problem is random so I didn't have a configuration that exhibits the problem all times. For info we build on a machine with 36 cores (Intel(R) Core(TM) i9-10980XE CPU @ 3.00GHz). I think http://autobuild.buildroot.net/results/d0c/d0c43084edd4de1221d93dfdfa15dfdeae16ceeb/build-end.log is the same problem. > > According to http://autobuild.buildroot.net/?reason=qt5declarative% > there are only 3 "recent" failures of qt5declarative-5.15.2 and they are not > what you're pointing. > We unfortunately can't "blindly" apply a workaround for a problem that isn't > "visible". > > However, your commit seems to mix up the $(MAKE) -> $(MAKE1) change > with those PKG_QMAKE_FIXUP_ABSOLUTE_PATH and > QT5BASE_CMAKECONFIG_FIXUP macros which are not explained in the > commit log. Could you give more details? Some part of the patch is for issue with linker like in http://autobuild.buildroot.net/results/8eb/8ebf6f8024ba32883e5c34c1c1c69de77246a7c3/build-end.log Sysroot path : --sysroot=/tmp/instance-0/output-1/per-package/qt5declarative/host/arm-buildroot-linux-gnueabihf/sysroot And Library search path : -L/tmp/instance-0/output-1/per-package/qt5base/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib Are not with the same prefix path so linker didn't find system library. So I add PKG_QMAKE_FIXUP_ABSOLUTE_PATH and QT5BASE_CMAKECONFIG_FIXUP to fix this. > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel > engineering and training https://bootlin.com Best Regards Florent From florent.aumaitre at medianesysteme.com Mon Jan 3 16:54:51 2022 From: florent.aumaitre at medianesysteme.com (Florent AUMAITRE) Date: Mon, 3 Jan 2022 17:54:51 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-pyqt5: Fix parallel build Message-ID: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> This patch fix build of python-pyqt5 package when parallel build is used Signed-off-by: Florent AUMAITRE Changes v1 -> v2: - Re-use the existing QT5_INSTALL_QT_CONF macro from package/qt5/qt5.mk (suggested by Thomas Petazzoni) Signed-off-by: Florent AUMAITRE --- package/python-pyqt5/python-pyqt5.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 8f28c90d15..b05043563e 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL ) endef +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP + PYTHON_PYQT5_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ -- 2.17.1 From arnout at mind.be Mon Jan 3 17:11:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 3 Jan 2022 18:11:49 +0100 Subject: [Buildroot] [PATCH 1/1] support/scripts/: remove -E flag from patch call In-Reply-To: <20211230214722.GJ3390456@scaer> References: <20211214125510.13654-1-andreynech@gmail.com> <20211230214722.GJ3390456@scaer> Message-ID: <63439c64-530d-4d2f-67e5-91a854501a5c@mind.be> On 30/12/2021 22:47, Yann E. MORIN wrote: > Andrey, All, > > On 2021-12-14 13:55 +0100, Andrey Nechypurenko spake thusly: >> -E flag instructs patch to remove empty files. However, in some cases >> empty files are essential. If they are missing, build could be broken >> or other bad things can happen. > > Do you have an example of a publicly accessible package that has this > issue? > >> Signed-off-by: Andrey Nechypurenko > > I was going to apply this, but then I was wondering; what about patches > that actually *want* to remove files? > > It turns out that we do have a few patches that remove files: > > $ git grep -E '\+\+\+ /dev/null' > board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch:+++ /dev/null > board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch:+++ /dev/null > board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch:+++ /dev/null > boot/grub2/0033-verifiers-Move-verifiers-API-to-kernel-image.patch:+++ /dev/null > boot/grub2/0034-efi-Move-the-shim_lock-verifier-to-the-GRUB-core.patch:+++ /dev/null > boot/lpc32xxcdl/0002-delete_redundant_files.patch:+++ /dev/null2012-01-01 16:39:47.918907000 +0100 > boot/lpc32xxcdl/0002-delete_redundant_files.patch:+++ /dev/null2012-01-01 16:39:47.918907000 +0100 > package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch:+++ /dev/null > package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch:+++ /dev/null > package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch:+++ /dev/null > package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch:+++ /dev/null Have you actually tested this? With modern patch, the /dev/null indicates exactly what we want: that the file must be removed. So even without -E, the file gets removed. What -E does is remove a file in the following case: --- a/foo +++ a/foo @@ -1,1 +0,0 @@ - foo git grep -B1 '+0,0 @@' only yields /dev/null cases, so I think it's OK. So I think the only real concern is: will a patch version that supports renames always behave like this? I *think* the answer is yes, but it's hard to be sure of course. Regards, Arnout > package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch:+++ /dev/null > package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch:+++ /dev/null > package/gcc/9.4.0/0003-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch:+++ /dev/null > package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch:+++ /dev/null > package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch:+++ /dev/null > package/screen/0005-rename-sched_h.patch:+++ /dev/null > > While a few of them could be rewriten so that the are actual renames > (now that we require a patch version that supports renames), some really > do want to remove files; that's notably the case with the uboot patch > for the roseapplepi board, or the babeltrace2 patch, as well as the gcc > patches... > > Furthermore, some users may have alaready relied on this behaviour, that > empty files get removed, for their packages in theor br2-external > trees... > > So we have an antagonist situation: some patches will want to rem ove > files, and some patches will want to not remove files. We can't satisfy > both, obviously. > > So, unfortunately, it is not possible to apply your patch. > > If your package really requires that the files be present and empty, you > should then use a post-patch hook to touch those files. > > Unless someone comes up with a better idea... > > Regards, > Yann E. MORIN. > >> --- >> support/scripts/apply-patches.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh >> index e5a2fdd09e..6da83f6826 100755 >> --- a/support/scripts/apply-patches.sh >> +++ b/support/scripts/apply-patches.sh >> @@ -114,7 +114,7 @@ function apply_patch { >> exit 1 >> fi >> echo "${path}/${patch}" >> ${builddir}/.applied_patches_list >> - ${uncomp} "${path}/$patch" | patch -g0 -p1 -E --no-backup-if-mismatch -d "${builddir}" -t -N $silent >> + ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent >> if [ $? != 0 ] ; then >> echo "Patch failed! Please fix ${patch}!" >> exit 1 >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From clg at kaod.org Mon Jan 3 16:58:05 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 3 Jan 2022 17:58:05 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 Message-ID: <20220103165805.3697636-1-clg@kaod.org> Remove uclibc workaround which was deprecated by upstream : commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") Remove upstream patches : commit 304332039014 ("block/export/fuse.c: fix musl build") commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") Signed-off-by: C?dric Le Goater --- ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 5 files changed, 2 insertions(+), 130 deletions(-) delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch deleted file mode 100644 index 6db4e8bc923e..000000000000 --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 5 May 2017 09:07:15 +0200 -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc - -user-exec.c has some conditional code to decide how to use the -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path -gets used, which doesn't apply to uClibc. - -Fix this by excluding __UCLIBC__, which ensures we fall back to the -general case of using uc_mcontext.arm_pc, which works fine with -uClibc. - -Signed-off-by: Thomas Petazzoni ---- - accel/tcg/user-exec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c -index 4ebe25461a..0496674fbd 100644 ---- a/accel/tcg/user-exec.c -+++ b/accel/tcg/user-exec.c -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, - - #if defined(__NetBSD__) - pc = uc->uc_mcontext.__gregs[_REG_R15]; --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) - pc = uc->uc_mcontext.gregs[R15]; - #else - pc = uc->uc_mcontext.arm_pc; --- -2.25.3 - diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch deleted file mode 100644 index 50762055bf18..000000000000 --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 23:40:01 +0200 -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl - -Include linux/fs.h to avoid the following build failure on uclibc or -musl raised since version 6.0.0: - -../block/export/fuse.c: In function 'fuse_lseek': -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ - | SEEK_SET - -Fixes: - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] ---- - block/export/fuse.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index fc7b07d2b5..2e3bf8270b 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,9 @@ - #include - #include - -+#ifdef __linux__ -+#include -+#endif - - /* Prevent overly long bounce buffer allocations */ - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) --- -2.32.0 - diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch deleted file mode 100644 index 4856821843fc..000000000000 --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 11:52:09 +0200 -Subject: [PATCH] block/export/fuse.c: fix musl build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb -and avoid the following build failure on musl: - -../block/export/fuse.c: In function 'fuse_fallocate': -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b - -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") -Signed-off-by: Fabrice Fontaine -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> -Reviewed-by: Philippe Mathieu-Daud? -Signed-off-by: Kevin Wolf -[Retrieved from: -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] ---- - block/export/fuse.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index 2e3bf8270b..823c126d23 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,10 @@ - #include - #include - -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) -+#include -+#endif -+ - #ifdef __linux__ - #include - #endif --- -GitLab - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 0613fce49367..9411832384ba 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 919aef6599f1..97f9f885a18a 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 6.1.0 +QEMU_VERSION = 6.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c -- 2.31.1 From yann.morin.1998 at free.fr Mon Jan 3 19:49:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 20:49:52 +0100 Subject: [Buildroot] [git commit] package/qemu: bump to version 6.2.0 Message-ID: <20220103200326.8277D82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85c7bd0602715dc6a148cc79db8910dca27c4e76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove uclibc workaround which was deprecated by upstream : commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") Remove upstream patches : commit 304332039014 ("block/export/fuse.c: fix musl build") commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") Signed-off-by: C??dric Le Goater Signed-off-by: Yann E. MORIN --- ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 35 ---------------- ...t-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ------------------- .../0004-block-export-fuse.c-fix-musl-build.patch | 49 ---------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 5 files changed, 2 insertions(+), 130 deletions(-) diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch deleted file mode 100644 index 6db4e8bc92..0000000000 --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 5 May 2017 09:07:15 +0200 -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc - -user-exec.c has some conditional code to decide how to use the -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path -gets used, which doesn't apply to uClibc. - -Fix this by excluding __UCLIBC__, which ensures we fall back to the -general case of using uc_mcontext.arm_pc, which works fine with -uClibc. - -Signed-off-by: Thomas Petazzoni ---- - accel/tcg/user-exec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c -index 4ebe25461a..0496674fbd 100644 ---- a/accel/tcg/user-exec.c -+++ b/accel/tcg/user-exec.c -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, - - #if defined(__NetBSD__) - pc = uc->uc_mcontext.__gregs[_REG_R15]; --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) - pc = uc->uc_mcontext.gregs[R15]; - #else - pc = uc->uc_mcontext.arm_pc; --- -2.25.3 - diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch deleted file mode 100644 index 50762055bf..0000000000 --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 23:40:01 +0200 -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl - -Include linux/fs.h to avoid the following build failure on uclibc or -musl raised since version 6.0.0: - -../block/export/fuse.c: In function 'fuse_lseek': -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ - | SEEK_SET - -Fixes: - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] ---- - block/export/fuse.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index fc7b07d2b5..2e3bf8270b 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,9 @@ - #include - #include - -+#ifdef __linux__ -+#include -+#endif - - /* Prevent overly long bounce buffer allocations */ - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) --- -2.32.0 - diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch deleted file mode 100644 index 4856821843..0000000000 --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 11:52:09 +0200 -Subject: [PATCH] block/export/fuse.c: fix musl build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb -and avoid the following build failure on musl: - -../block/export/fuse.c: In function 'fuse_fallocate': -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b - -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") -Signed-off-by: Fabrice Fontaine -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> -Reviewed-by: Philippe Mathieu-Daud?? -Signed-off-by: Kevin Wolf -[Retrieved from: -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] ---- - block/export/fuse.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index 2e3bf8270b..823c126d23 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,10 @@ - #include - #include - -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) -+#include -+#endif -+ - #ifdef __linux__ - #include - #endif --- -GitLab - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 0613fce493..9411832384 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 919aef6599..97f9f885a1 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 6.1.0 +QEMU_VERSION = 6.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c From yann.morin.1998 at free.fr Mon Jan 3 20:10:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:10:19 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <20220103165805.3697636-1-clg@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> Message-ID: <20220103201019.GH69135@scaer> C?dric, All, On 2022-01-03 17:58 +0100, C?dric Le Goater spake thusly: > Remove uclibc workaround which was deprecated by upstream : > commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") > > Remove upstream patches : > commit 304332039014 ("block/export/fuse.c: fix musl build") > commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") > > Signed-off-by: C?dric Le Goater Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- > ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- > ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- > package/qemu/qemu.hash | 2 +- > package/qemu/qemu.mk | 2 +- > 5 files changed, 2 insertions(+), 130 deletions(-) > delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > > diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > deleted file mode 100644 > index 6db4e8bc923e..000000000000 > --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Fri, 5 May 2017 09:07:15 +0200 > -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc > - > -user-exec.c has some conditional code to decide how to use the > -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but > -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path > -gets used, which doesn't apply to uClibc. > - > -Fix this by excluding __UCLIBC__, which ensures we fall back to the > -general case of using uc_mcontext.arm_pc, which works fine with > -uClibc. > - > -Signed-off-by: Thomas Petazzoni > ---- > - accel/tcg/user-exec.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c > -index 4ebe25461a..0496674fbd 100644 > ---- a/accel/tcg/user-exec.c > -+++ b/accel/tcg/user-exec.c > -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, > - > - #if defined(__NetBSD__) > - pc = uc->uc_mcontext.__gregs[_REG_R15]; > --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > - pc = uc->uc_mcontext.gregs[R15]; > - #else > - pc = uc->uc_mcontext.arm_pc; > --- > -2.25.3 > - > diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > deleted file mode 100644 > index 50762055bf18..000000000000 > --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 27 Aug 2021 23:40:01 +0200 > -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl > - > -Include linux/fs.h to avoid the following build failure on uclibc or > -musl raised since version 6.0.0: > - > -../block/export/fuse.c: In function 'fuse_lseek': > -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in > -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > - | SEEK_SET > - > -Fixes: > - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] > ---- > - block/export/fuse.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index fc7b07d2b5..2e3bf8270b 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,9 @@ > - #include > - #include > - > -+#ifdef __linux__ > -+#include > -+#endif > - > - /* Prevent overly long bounce buffer allocations */ > - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) > --- > -2.32.0 > - > diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > deleted file mode 100644 > index 4856821843fc..000000000000 > --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 22 Oct 2021 11:52:09 +0200 > -Subject: [PATCH] block/export/fuse.c: fix musl build > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix > -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb > -and avoid the following build failure on musl: > - > -../block/export/fuse.c: In function 'fuse_fallocate': > -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) > - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { > - | ^~~~~~~~~~~~~~~~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b > - > -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") > -Signed-off-by: Fabrice Fontaine > -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> > -Reviewed-by: Philippe Mathieu-Daud? > -Signed-off-by: Kevin Wolf > -[Retrieved from: > -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] > ---- > - block/export/fuse.c | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index 2e3bf8270b..823c126d23 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,10 @@ > - #include > - #include > - > -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) > -+#include > -+#endif > -+ > - #ifdef __linux__ > - #include > - #endif > --- > -GitLab > - > diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash > index 0613fce49367..9411832384ba 100644 > --- a/package/qemu/qemu.hash > +++ b/package/qemu/qemu.hash > @@ -1,4 +1,4 @@ > # Locally computed, tarball verified with GPG signature > -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz > +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz > sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 919aef6599f1..97f9f885a18a 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QEMU_VERSION = 6.1.0 > +QEMU_VERSION = 6.2.0 > QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz > QEMU_SITE = http://download.qemu.org > QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 20:14:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:14:32 +0100 Subject: [Buildroot] [git commit] support/scripts/: remove -E flag from patch call Message-ID: <20220103201049.30C9F82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1368ce2331cc0303ea59b35093875989d0d2bf8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master -E flag instructs patch to remove empty files. However, in some cases empty files are essential. If they are missing, build could be broken or other bad things can happen. Note that empty files are still removed when their headers are properly formattedo: timestamp set to 1970-01-01T00:00:00Z, destination set to /dev/null. Signed-off-by: Andrey Nechypurenko Signed-off-by: Yann E. MORIN --- support/scripts/apply-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index e5a2fdd09e..6da83f6826 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -114,7 +114,7 @@ function apply_patch { exit 1 fi echo "${path}/${patch}" >> ${builddir}/.applied_patches_list - ${uncomp} "${path}/$patch" | patch -g0 -p1 -E --no-backup-if-mismatch -d "${builddir}" -t -N $silent + ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1 From yann.morin.1998 at free.fr Mon Jan 3 20:18:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:18:22 +0100 Subject: [Buildroot] [PATCH 1/1] support/scripts/: remove -E flag from patch call In-Reply-To: <63439c64-530d-4d2f-67e5-91a854501a5c@mind.be> References: <20211214125510.13654-1-andreynech@gmail.com> <20211230214722.GJ3390456@scaer> <63439c64-530d-4d2f-67e5-91a854501a5c@mind.be> Message-ID: <20220103201822.GI69135@scaer> Arnout, All, On 2022-01-03 18:11 +0100, Arnout Vandecappelle spake thusly: > On 30/12/2021 22:47, Yann E. MORIN wrote: > >On 2021-12-14 13:55 +0100, Andrey Nechypurenko spake thusly: > >>-E flag instructs patch to remove empty files. However, in some cases > >>empty files are essential. If they are missing, build could be broken > >>or other bad things can happen. [--SNIP--] > >I was going to apply this, but then I was wondering; what about patches > >that actually *want* to remove files? > >It turns out that we do have a few patches that remove files: > Have you actually tested this? With modern patch, the /dev/null indicates > exactly what we want: that the file must be removed. So even without -E, the > file gets removed. > > What -E does is remove a file in the following case: > > --- a/foo > +++ a/foo > @@ -1,1 +0,0 @@ > - foo Ah, yeah, I was a bit unsure... Now I tried, adn indeed it behaves as expected. > git grep -B1 '+0,0 @@' only yields /dev/null cases, so I think it's OK. > So I think the only real concern is: will a patch version that supports > renames always behave like this? I *think* the answer is yes, but it's hard > to be sure of course. OK, I'm sold on the idea, and I believe this is sane enough. Applied to master, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Mon Jan 3 20:19:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 21:19:50 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <20220103165805.3697636-1-clg@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> Message-ID: <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> Hi C?dric, All, Le 03/01/2022 ? 17:58, C?dric Le Goater a ?crit?: > Remove uclibc workaround which was deprecated by upstream : > commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") > > Remove upstream patches : > commit 304332039014 ("block/export/fuse.c: fix musl build") > commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") > > Signed-off-by: C?dric Le Goater I did a similar commit to test all qemu defconfig in gitlab-ci: https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 No problem detected so far, I was investigating why the s390x defconfig failed for me... It would be great if you can do a runtime test in gitlab and add the link in the commit log. > --- > ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- > ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- > ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- > package/qemu/qemu.hash | 2 +- > package/qemu/qemu.mk | 2 +- > 5 files changed, 2 insertions(+), 130 deletions(-) > delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > > diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > deleted file mode 100644 > index 6db4e8bc923e..000000000000 > --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Fri, 5 May 2017 09:07:15 +0200 > -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc > - > -user-exec.c has some conditional code to decide how to use the > -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but > -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path > -gets used, which doesn't apply to uClibc. > - > -Fix this by excluding __UCLIBC__, which ensures we fall back to the > -general case of using uc_mcontext.arm_pc, which works fine with > -uClibc. > - > -Signed-off-by: Thomas Petazzoni > ---- > - accel/tcg/user-exec.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c > -index 4ebe25461a..0496674fbd 100644 > ---- a/accel/tcg/user-exec.c > -+++ b/accel/tcg/user-exec.c > -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, > - > - #if defined(__NetBSD__) > - pc = uc->uc_mcontext.__gregs[_REG_R15]; > --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > - pc = uc->uc_mcontext.gregs[R15]; > - #else > - pc = uc->uc_mcontext.arm_pc; > --- > -2.25.3 > - > diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > deleted file mode 100644 > index 50762055bf18..000000000000 > --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 27 Aug 2021 23:40:01 +0200 > -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl > - > -Include linux/fs.h to avoid the following build failure on uclibc or > -musl raised since version 6.0.0: > - > -../block/export/fuse.c: In function 'fuse_lseek': > -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in > -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > - | SEEK_SET > - > -Fixes: > - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] > ---- > - block/export/fuse.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index fc7b07d2b5..2e3bf8270b 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,9 @@ > - #include > - #include > - > -+#ifdef __linux__ > -+#include > -+#endif > - > - /* Prevent overly long bounce buffer allocations */ > - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) > --- > -2.32.0 > - > diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > deleted file mode 100644 > index 4856821843fc..000000000000 > --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 22 Oct 2021 11:52:09 +0200 > -Subject: [PATCH] block/export/fuse.c: fix musl build > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix > -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb > -and avoid the following build failure on musl: > - > -../block/export/fuse.c: In function 'fuse_fallocate': > -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) > - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { > - | ^~~~~~~~~~~~~~~~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b > - > -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") > -Signed-off-by: Fabrice Fontaine > -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> > -Reviewed-by: Philippe Mathieu-Daud? > -Signed-off-by: Kevin Wolf > -[Retrieved from: > -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] > ---- > - block/export/fuse.c | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index 2e3bf8270b..823c126d23 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,10 @@ > - #include > - #include > - > -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) > -+#include > -+#endif > -+ > - #ifdef __linux__ > - #include > - #endif > --- > -GitLab > - > diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash > index 0613fce49367..9411832384ba 100644 > --- a/package/qemu/qemu.hash > +++ b/package/qemu/qemu.hash > @@ -1,4 +1,4 @@ > # Locally computed, tarball verified with GPG signature > -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz > +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz > sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 919aef6599f1..97f9f885a18a 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QEMU_VERSION = 6.1.0 > +QEMU_VERSION = 6.2.0 > QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz > QEMU_SITE = http://download.qemu.org > QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c > Please check qemu configure options while doing a version bump, there are a lot of new option added: https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e Best regards, Romain From yann.morin.1998 at free.fr Mon Jan 3 20:41:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:41:50 +0100 Subject: [Buildroot] [git commit] board/qemu/aarch64-sbsa: use partition-type-uuid for genimage-15 Message-ID: <20220103203632.64AE982A54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16d490d1117e1e7496fb6287a8b6d5c04b1712b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Genimage 15 restricted the partition-type option to mbr and hybrid partition-table-type and now prints a warning when it is used [1]: ERROR: hdimage(disk.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type [1] https://github.com/pengutronix/genimage/commit/1d72d8091f83790a0a35a1ea7dc25d46adba8876 Sync the genimage.cfg with the one used for aarch64_efi_defconfig Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717179 https://gitlab.com/buildroot.org/buildroot/-/jobs/1921792262 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Romain Naour Cc: Dick Olsson Cc: Pierre-Jean Texier [yann.morin.1998 at free.fr: add Wikipedia link] Signed-off-by: Yann E. MORIN --- board/qemu/aarch64-sbsa/genimage.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index 121ae9f37b..bdf8a89d75 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -18,12 +18,14 @@ image disk.img { } partition boot { - partition-type = 0xEF image = "efi-part.vfat" + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32K + bootable = true } partition root { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } From yann.morin.1998 at free.fr Mon Jan 3 20:43:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:43:44 +0100 Subject: [Buildroot] [PATCH] board/qemu/aarch64-sbsa: use partition-type-uuid for genimage-15 In-Reply-To: <20220102165431.3551867-1-romain.naour@gmail.com> References: <20220102165431.3551867-1-romain.naour@gmail.com> Message-ID: <20220103204344.GJ69135@scaer> Romain, All, On 2022-01-02 17:54 +0100, Romain Naour spake thusly: > Genimage 15 restricted the partition-type option to mbr and hybrid > partition-table-type and now prints a warning when it is used [1]: > > ERROR: hdimage(disk.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type > > [1] https://github.com/pengutronix/genimage/commit/1d72d8091f83790a0a35a1ea7dc25d46adba8876 > > Sync the genimage.cfg with the one used for aarch64_efi_defconfig > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717179 > https://gitlab.com/buildroot.org/buildroot/-/jobs/1921792262 I've added a link to the Wikipedia page that lists the UUIDs: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > Signed-off-by: Romain Naour > Cc: Dick Olsson > Cc: Pierre-Jean Texier Applied to master, thanks. Regards, Yann E. MORIN. > --- > board/qemu/aarch64-sbsa/genimage.cfg | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg > index 121ae9f37b..bdf8a89d75 100644 > --- a/board/qemu/aarch64-sbsa/genimage.cfg > +++ b/board/qemu/aarch64-sbsa/genimage.cfg > @@ -18,12 +18,14 @@ image disk.img { > } > > partition boot { > - partition-type = 0xEF > image = "efi-part.vfat" > + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b > + offset = 32K > + bootable = true > } > > partition root { > - partition-type = 0x83 > + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > image = "rootfs.ext2" > } > } > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Mon Jan 3 20:45:15 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 21:45:15 +0100 Subject: [Buildroot] [PATCH] board/qemu/aarch64-sbsa: use partition-type-uuid for genimage-15 In-Reply-To: <20220103204344.GJ69135@scaer> References: <20220102165431.3551867-1-romain.naour@gmail.com> <20220103204344.GJ69135@scaer> Message-ID: <85e542af-edfa-629f-3b6e-1afa7eb55c31@gmail.com> Hello Yann, Le 03/01/2022 ? 21:43, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-02 17:54 +0100, Romain Naour spake thusly: >> Genimage 15 restricted the partition-type option to mbr and hybrid >> partition-table-type and now prints a warning when it is used [1]: >> >> ERROR: hdimage(disk.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type >> >> [1] https://github.com/pengutronix/genimage/commit/1d72d8091f83790a0a35a1ea7dc25d46adba8876 >> >> Sync the genimage.cfg with the one used for aarch64_efi_defconfig >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717179 >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1921792262 > > I've added a link to the Wikipedia page that lists the UUIDs: > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Thanks, useful link! Best regards, Romain > >> Signed-off-by: Romain Naour >> Cc: Dick Olsson >> Cc: Pierre-Jean Texier > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > >> --- >> board/qemu/aarch64-sbsa/genimage.cfg | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg >> index 121ae9f37b..bdf8a89d75 100644 >> --- a/board/qemu/aarch64-sbsa/genimage.cfg >> +++ b/board/qemu/aarch64-sbsa/genimage.cfg >> @@ -18,12 +18,14 @@ image disk.img { >> } >> >> partition boot { >> - partition-type = 0xEF >> image = "efi-part.vfat" >> + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b >> + offset = 32K >> + bootable = true >> } >> >> partition root { >> - partition-type = 0x83 >> + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae >> image = "rootfs.ext2" >> } >> } >> -- >> 2.31.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Mon Jan 3 20:44:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:44:27 +0100 Subject: [Buildroot] [git commit] package/ethtool: bump to version 5.15 Message-ID: <20220103203945.4F2E682BC4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e732d651758e4e974590b067b2992f4645fd301 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 536579670f..59c657e868 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 ethtool-5.12.tar.xz +sha256 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d ethtool-5.15.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index f3e950f212..c4bb9bdd90 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.12 +ETHTOOL_VERSION = 5.15 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From yann.morin.1998 at free.fr Mon Jan 3 20:44:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:44:29 +0100 Subject: [Buildroot] [git commit] package/spi-tools: bump to version 1.0.1 Message-ID: <20220103203945.585E881934@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=867b708ebdcf68f81bd07f91901d3ca12e94c9e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/spi-tools/spi-tools.hash | 2 +- package/spi-tools/spi-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash index a1ef4c2b9b..1595cd3d2c 100644 --- a/package/spi-tools/spi-tools.hash +++ b/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 5eb24670461dcf2c58471114dc69b5204dab1c0cc5053878f6de79503bd8cc9f spi-tools-1.0.0.tar.gz +sha256 81bb9f7218123f86c3644d92ad2c427343758df2143ee5da38e6f743f18714fd spi-tools-1.0.1.tar.gz sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk index 26d0dcf546..d623babf48 100644 --- a/package/spi-tools/spi-tools.mk +++ b/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 1.0.0 +SPI_TOOLS_VERSION = 1.0.1 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES From yann.morin.1998 at free.fr Mon Jan 3 20:44:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:44:32 +0100 Subject: [Buildroot] [git commit] package/sqlite: bump to version 3.37.1 Message-ID: <20220103203945.61DBF82DF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c37cf14c4cd8b4a9ede2ab4aaa39f01b2a1a2bff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- 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 94f0127d19..604275ebfb 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7 sqlite-autoconf-3370000.tar.gz +sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index be060c3117..59b76ce164 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.0 -SQLITE_TAR_VERSION = 3370000 +SQLITE_VERSION = 3.37.1 +SQLITE_TAR_VERSION = 3370100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2021 SQLITE_LICENSE = Public domain From yann.morin.1998 at free.fr Mon Jan 3 20:46:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:46:21 +0100 Subject: [Buildroot] [PATCH] package/ethtool: bump to version 5.15 In-Reply-To: <20220103104343.15975-1-francois.perrad@gadz.org> References: <20220103104343.15975-1-francois.perrad@gadz.org> Message-ID: <20220103204621.GK69135@scaer> Fran?ois, All, On 2022-01-03 11:43 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ethtool/ethtool.hash | 2 +- > package/ethtool/ethtool.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash > index 536579670..59c657e86 100644 > --- a/package/ethtool/ethtool.hash > +++ b/package/ethtool/ethtool.hash > @@ -1,5 +1,5 @@ > # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc > -sha256 f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 ethtool-5.12.tar.xz > +sha256 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d ethtool-5.15.tar.xz > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE > diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk > index f3e950f21..c4bb9bdd9 100644 > --- a/package/ethtool/ethtool.mk > +++ b/package/ethtool/ethtool.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ETHTOOL_VERSION = 5.12 > +ETHTOOL_VERSION = 5.15 > ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz > ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool > ETHTOOL_LICENSE = GPL-2.0 > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 20:46:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:46:35 +0100 Subject: [Buildroot] [PATCH] package/spi-tools: bump to version 1.0.1 In-Reply-To: <20220103104355.16030-1-francois.perrad@gadz.org> References: <20220103104355.16030-1-francois.perrad@gadz.org> Message-ID: <20220103204635.GL69135@scaer> Fran?ois, All, On 2022-01-03 11:43 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/spi-tools/spi-tools.hash | 2 +- > package/spi-tools/spi-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash > index a1ef4c2b9..1595cd3d2 100644 > --- a/package/spi-tools/spi-tools.hash > +++ b/package/spi-tools/spi-tools.hash > @@ -1,3 +1,3 @@ > # locally computed hash > -sha256 5eb24670461dcf2c58471114dc69b5204dab1c0cc5053878f6de79503bd8cc9f spi-tools-1.0.0.tar.gz > +sha256 81bb9f7218123f86c3644d92ad2c427343758df2143ee5da38e6f743f18714fd spi-tools-1.0.1.tar.gz > sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE > diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk > index 26d0dcf54..d623babf4 100644 > --- a/package/spi-tools/spi-tools.mk > +++ b/package/spi-tools/spi-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SPI_TOOLS_VERSION = 1.0.0 > +SPI_TOOLS_VERSION = 1.0.1 > SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) > # autoreconf must be run as specified in package documentation > SPI_TOOLS_AUTORECONF = YES > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 20:46:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:46:52 +0100 Subject: [Buildroot] [PATCH] package/sqlite: bump to version 3.37.1 In-Reply-To: <20220103104407.16085-1-francois.perrad@gadz.org> References: <20220103104407.16085-1-francois.perrad@gadz.org> Message-ID: <20220103204652.GM69135@scaer> Fran?ois, All, On 2022-01-03 11:44 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 94f0127d1..604275ebf 100644 > --- a/package/sqlite/sqlite.hash > +++ b/package/sqlite/sqlite.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7 sqlite-autoconf-3370000.tar.gz > +sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz > sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms > diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk > index be060c311..59b76ce16 100644 > --- a/package/sqlite/sqlite.mk > +++ b/package/sqlite/sqlite.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -SQLITE_VERSION = 3.37.0 > -SQLITE_TAR_VERSION = 3370000 > +SQLITE_VERSION = 3.37.1 > +SQLITE_TAR_VERSION = 3370100 > SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz > SQLITE_SITE = https://www.sqlite.org/2021 > SQLITE_LICENSE = Public domain > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 20:59:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:59:31 +0100 Subject: [Buildroot] [PATCH 1/3] utils/test-pkg: add support for externals In-Reply-To: <20211201230827.35080-1-matthew.weber@collins.com> References: <20211201230827.35080-1-matthew.weber@collins.com> Message-ID: <20220103205931.GN69135@scaer> Matthew, All, On 2021-12-01 17:08 -0600, Matthew Weber via buildroot spake thusly: > Add support to test-pkg to allow the usage br2-externals, so that > it may be leveraged for packages outside of upstream buildroot as well. Why is it even needed? Just pass BR2_EXTERNAL in the environment: BR2_EXTERNAL=/path/to/foo:/path/to/bar ./utils/test-pkg Maybe we should change the manual to state that BR2_EXTERNAL can be set in the environment as well, and the help for ./utils/test-pkg could also mention that. Oh, and by the way: we should not have added the -e option to support/kconfig/merge_config.sh either, because even in that case, BR2_EXTERNAL in the environment works as well. Regards, Yann E. MORIN. > Signed-off-by: Matthew Weber > --- > utils/test-pkg | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index 526b95b1fb..d0472f176b 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -3,6 +3,7 @@ set -e > > TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' > TEMP_CONF="" > +BR2_EXTERNALS="" > > do_clean() { > if [ ! -z "${TEMP_CONF}" ]; then > @@ -17,8 +18,8 @@ main() { > local -a toolchains > local pkg_br_name > > - o='hakc:d:n:p:r:t:' > - O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:' > + o='hakc:d:n:p:r:t:e:' > + O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,' > opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" > eval set -- "${opts}" > > @@ -61,6 +62,9 @@ main() { > (-t|--toolchains-csv) > toolchains_csv="${2}"; shift 2 > ;; > + (-e|--externals) > + BR2_EXTERNALS="${2}"; shift 2 > + ;; > (--) > shift; break > ;; > @@ -155,7 +159,7 @@ build_one() { > > mkdir -p "${dir}" > > - CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ > + CONFIG_= support/kconfig/merge_config.sh -e "${BR2_EXTERNALS}" -O "${dir}" \ > "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ > >> "${dir}/logfile" 2>&1 > # We want all the options from the snippet to be present as-is (set > @@ -181,7 +185,7 @@ build_one() { > fi > > if [ -n "${pkg}" ]; then > - if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then > + if ! make BR2_EXTERNAL="${BR2_EXTERNALS}" O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then > return 2 > fi > fi > @@ -193,14 +197,14 @@ build_one() { > > # legal-info done systematically, because some packages have different > # sources depending on the configuration (e.g. lua-5.2 vs. lua-5.3) > - if ! make O="${dir}" legal-info >> "${dir}/logfile" 2>&1; then > + if ! make BR2_EXTERNAL="${BR2_EXTERNALS}" O="${dir}" legal-info >> "${dir}/logfile" 2>&1; then > return 3 > fi > > # If we get here, the build was successful. Clean up the build/host > # directories to save disk space, unless 'keep' was set. > if [ ${keep} -ne 1 ]; then > - make O="${dir}" clean >> "${dir}/logfile" 2>&1 > + make BR2_EXTERNAL="${BR2_EXTERNALS}" O="${dir}" clean >> "${dir}/logfile" 2>&1 > fi > } > > @@ -271,6 +275,10 @@ Options: > Only prepare the .config files, but do not build them. Output the > list of build directories to stdout, and the status on stderr. > > + -e, --externals > + Externals to be used as part of the build process. Packages from > + within these externals may be tested. > + > Example: > > Testing libcec would require a config snippet that contains: > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Mon Jan 3 21:00:46 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:00:46 +0100 Subject: [Buildroot] [PATCH 1/3] package/qemu: reorder enable/disable options alphabetically Message-ID: <20220103210048.7879-1-romain.naour@gmail.com> Signed-off-by: Romain Naour --- package/qemu/qemu.mk | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 97f9f885a1..43450a6649 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -187,39 +187,39 @@ define QEMU_CONFIGURE_CMDS --audio-drv-list= \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ - --enable-kvm \ - --enable-attr \ - --enable-vhost-net \ --disable-bpf \ + --disable-brlapi \ --disable-bsd-user \ + --disable-cap-ng \ + --disable-capstone \ --disable-containers \ - --disable-xen \ - --disable-virtfs \ - --disable-brlapi \ - --disable-curses \ --disable-curl \ - --disable-vde \ - --disable-linux-aio \ - --disable-linux-io-uring \ - --disable-cap-ng \ + --disable-curses \ --disable-docs \ - --disable-rbd \ - --disable-libiscsi \ - --disable-strip \ - --disable-sparse \ - --disable-mpath \ - --disable-sanitizers \ --disable-hvf \ - --disable-whpx \ + --disable-libiscsi \ + --disable-libxml2 \ + --disable-linux-aio \ + --disable-linux-io-uring \ --disable-malloc-trim \ --disable-membarrier \ - --disable-vhost-crypto \ - --disable-libxml2 \ - --disable-capstone \ - --with-git-submodules=ignore \ + --disable-mpath \ --disable-opengl \ + --disable-rbd \ + --disable-sanitizers \ + --disable-sparse \ + --disable-strip \ + --disable-vde \ + --disable-vhost-crypto \ --disable-vhost-user-blk-server \ + --disable-virtfs \ --disable-virtiofsd \ + --disable-whpx \ + --disable-xen \ + --enable-attr \ + --enable-kvm \ + --enable-vhost-net \ + --with-git-submodules=ignore \ $(QEMU_OPTS) endef -- 2.31.1 From romain.naour at gmail.com Mon Jan 3 21:00:47 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:00:47 +0100 Subject: [Buildroot] [PATCH 2/3] package/qemu: Disable new configure options added by Qemu 2.6.0 In-Reply-To: <20220103210048.7879-1-romain.naour@gmail.com> References: <20220103210048.7879-1-romain.naour@gmail.com> Message-ID: <20220103210048.7879-2-romain.naour@gmail.com> Disable new configure options added by this release to avoid adding new dependencies or features. Signed-off-by: Romain Naour --- package/qemu/qemu.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 43450a6649..e69e813059 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -187,16 +187,20 @@ define QEMU_CONFIGURE_CMDS --audio-drv-list= \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ + --disable-alsa \ --disable-bpf \ --disable-brlapi \ --disable-bsd-user \ --disable-cap-ng \ --disable-capstone \ --disable-containers \ + --disable-coreaudio \ --disable-curl \ --disable-curses \ --disable-docs \ + --disable-dsound \ --disable-hvf \ + --disable-jack \ --disable-libiscsi \ --disable-libxml2 \ --disable-linux-aio \ @@ -204,9 +208,13 @@ define QEMU_CONFIGURE_CMDS --disable-malloc-trim \ --disable-membarrier \ --disable-mpath \ + --disable-netmap \ --disable-opengl \ + --disable-oss \ + --disable-pa \ --disable-rbd \ --disable-sanitizers \ + --disable-selinux \ --disable-sparse \ --disable-strip \ --disable-vde \ @@ -355,14 +363,24 @@ define HOST_QEMU_CONFIGURE_CMDS --extra-ldflags="$(HOST_LDFLAGS)" \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ + --disable-alsa \ --disable-bpf \ --disable-bzip2 \ --disable-containers \ + --disable-coreaudio \ --disable-curl \ --disable-docs \ + --disable-dsound \ + --disable-jack \ --disable-libssh \ + --disable-linux-aio \ --disable-linux-io-uring \ + --disable-netmap \ + --disable-oss \ + --disable-pa \ --disable-sdl \ + --disable-selinux \ + --disable-vde \ --disable-vhost-user-blk-server \ --disable-virtiofsd \ --disable-vnc-jpeg \ -- 2.31.1 From romain.naour at gmail.com Mon Jan 3 21:00:48 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:00:48 +0100 Subject: [Buildroot] [PATCH 3/3] package/qemu: reorder patches In-Reply-To: <20220103210048.7879-1-romain.naour@gmail.com> References: <20220103210048.7879-1-romain.naour@gmail.com> Message-ID: <20220103210048.7879-3-romain.naour@gmail.com> The commit [1] removed patch 0001. [1] 85c7bd0602715dc6a148cc79db8910dca27c4e76 Signed-off-by: Romain Naour --- ...atch => 0001-tests-fp-disable-fp-bench-build-by-default.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/qemu/{0002-tests-fp-disable-fp-bench-build-by-default.patch => 0001-tests-fp-disable-fp-bench-build-by-default.patch} (100%) diff --git a/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch similarity index 100% rename from package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch rename to package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch -- 2.31.1 From romain.naour at gmail.com Mon Jan 3 21:07:13 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:07:13 +0100 Subject: [Buildroot] [PATCH] package/terminology: bump to version 1.12.0 Message-ID: <20220103210713.8642-1-romain.naour@gmail.com> Requires efl 1.26.0 [1] [1] https://git.enlightenment.org/apps/terminology.git/commit/?id=3e95d2ad9f59e01d498e90dcb4413dc886d49852 See: https://www.enlightenment.org/news/2022-01-02-terminology-1.12.0 Signed-off-by: Romain Naour --- package/terminology/terminology.hash | 4 ++-- package/terminology/terminology.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index be1d6f4269..7e9658482a 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz.sha256sum -sha256 3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c terminology-1.9.0.tar.xz +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum +sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index 29b59fb39e..787c9ad137 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.9.0 +TERMINOLOGY_VERSION = 1.12.0 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause -- 2.31.1 From ps.report at gmx.net Mon Jan 3 21:08:16 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 3 Jan 2022 22:08:16 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.1.5 Message-ID: <20220103210816.26410-1-ps.report@gmx.net> - remove 0002-BlenderScene-use-explicit-namespace-instead-of-using.patch (upstream applied [1]). For details see [2]. [1] https://github.com/assimp/assimp/commit/a099fe7cd331a839137115db5df1733c4c1c8070 [2] https://github.com/assimp/assimp/releases/tag/v5.1.5 Signed-off-by: Peter Seiderer --- ...-explicit-namespace-instead-of-using.patch | 57 ------------------- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch deleted file mode 100644 index c83e9c50a4..0000000000 --- a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 30 Dec 2021 18:01:54 +0100 -Subject: [PATCH] BlenderScene: use explicit namespace instead of using - namespace - -Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): - - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - -[backport from upstream commit a099fe7cd331] -Signed-off-by: Peter Seiderer ---- - code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp -index c93d913fc..9ad086fe6 100644 ---- a/code/AssetLib/Blender/BlenderScene.cpp -+++ b/code/AssetLib/Blender/BlenderScene.cpp -@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "BlenderDNA.h" - #include "BlenderSceneGen.h" - --using namespace Assimp; --using namespace Assimp::Blender; -+namespace Assimp { -+namespace Blender { - - //-------------------------------------------------------------------------------- - template <> -@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { - converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); - } - -+} // namespace Blender -+} //namespace Assimp -+ - #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER --- -2.34.1 - diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 89b8d168c2..8f6d613bb4 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6 assimp-5.1.4.tar.gz +sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index ead5d73bca..b5f84ef56f 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.4 +ASSIMP_VERSION = 5.1.5 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE -- 2.34.1 From romain.naour at gmail.com Mon Jan 3 21:20:45 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:20:45 +0100 Subject: [Buildroot] [PATCH 2/2 v4] package/mesa3d: make it aware of libglvnd and support it when present In-Reply-To: <20200727173524.GG19818@scaer> References: <20200727173844.2ac2945f@windsurf.home> <20200727173524.GG19818@scaer> Message-ID: <85de806e-39a4-ce1b-fd07-2916443dfbbf@gmail.com> Hello Yann, Thomas, Le 27/07/2020 ? 19:35, Yann E. MORIN a ?crit?: > Thomas, All, > > On 2020-07-27 17:38 +0200, Thomas Petazzoni spake thusly: >> On Mon, 27 Jul 2020 10:47:02 +0200 >> "Yann E. MORIN" wrote: >>> From: Jakub Skrzypnik >>> >>> When libglvnd is enabled, mesa3d must be told so, so as it installs its >>> libraries with the vendor suffix (e.g. libEGL_mesa.so instead of >>> libEGL.so). >>> >>> Additionally, the provider (in Buildroot parlance) is libglvnd, not mesa3d. > [--SNIP--] >>> config BR2_PACKAGE_MESA3D_OPENGL_GLX >>> bool "OpenGL GLX" >>> depends on BR2_PACKAGE_XORG7 >>> - select BR2_PACKAGE_HAS_LIBGL >>> + select BR2_PACKAGE_HAS_LIBGL if !BR2_PACKAGE_LIBGLVND >>> + select BR2_PACKAGE_LIBGLVND_DISPATCH_GL if BR2_PACKAGE_LIBGLVND >> >> I don't immediately see a good solution for this, but I find that >> solution to be quite annoying :-/ > > At first, I though so too, and I also looked for a better approach, > but... > >> Indeed, I understand that once libglvnd is enabled, the GL-provider is >> libglvnd, which in the background is using mesa3d. The dance to handle >> libglvnd in mesa3d is already not nice, and we would have to have the >> same dance in other GL providers that support libglvnd. > > Well, it is not _so_ bad. We could maybe make it a bit simpler, with: > > config BR2_PACKAGE_MESA3D_OPENGL_GLX > bool "OpenGL GLX" > select BR2_PACKAGE_HAS_LIBGL > > We still need to declare emsa3d as providing libgl depending on whether > libglvnd is enabled, but we can make it a bit more "compact": > > if !BR2_PACKAGE_LIBGLVND > > config BR2_PACKAGE_PROVIDES_LIBGL > default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX > > [EGL and GLES too here] > > endif > > And in mesa3d.mk too: > > ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) > MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgl) > [...] > endif > > But now, in libglvnd, we don't need any extra symbol, we can just re-use > BR2_PACKAGE_PROVIDES_LIBGL et al.: > > config BR2_PACKAGE_LIBGLVND > bool "libglvnd" > select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_PROVIDES_LIBGL > select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_PROVIDES_LIBGL > select BR2_PACKAGE_XLIB_XORGPROTO if BR2_PACKAGE_PROVIDES_LIBGL > select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_PROVIDES_LIBGL > > if BR2_PACKAGE_LIBGLVND > > config BR2_PACKAGE_PROVIDES_LIBGL > default "libglvnd" if BR2_PACKAGE_HAS_LIBGL > > endif > > and in libglvnd.mk: > > ifeq ($(BR2_PACKAGE_PROVIDES_LIBGL),y) > LIBGLVND_DEPENDENCIES += xlib_libXext xorgproto > LIBGLVND_CONF_OPTS += -Dglx=enabled > LIBGLVND_PROVIDES += libgl > else > LIBGLVND_CONF_OPTS += -Dglx=disabled > endif > >> OK, here is some vague idea for a possible solution: >> - We introduce an intermediate "layer" between libgl and GL providers. > [--SNIP--] >> I *think* this would perhaps avoid that complexity in mesa3d... >> obviously for additional complexity in terms of how the virtual >> packages in GL world all work together. > > You are reinventing libglvnd in between libglvnd and actual providers, no? > > Also, remember that individual GL providers will still have to function > as providers without libglvnd, which is not required. > > But I would like we progress on the topic, and when we have a second > candidate for libglvnd use, we can revisit the topic and see if we can > over-engineer the thing. > > Usually, we wait for three or four cases before trying to solve the > problem in a generic fashion, and so I'd like to do here as well. > Because so far, only two providers are known to work with libglvnd: > mewsa3d and nvidia. ATI might be a third one, but I have no clue about > it. And in the SoC land, there is not much that is libglvnd compatible > so far, if at all. > > So, in the short-to-medium term, we'd at best have three providers. Is > that enough to delve into a generic infra so far? Not sure... I had an issue with a package (ogre) that now use OPENGL_glx_LIBRARY to find the "GLVND 'GLX' library" https://github.com/OGRECave/ogre/commit/aa9ffa7a51e52cb714f1bf5a3a00b9ef9f5a7dc2 https://cmake.org/cmake/help/latest/module/FindOpenGL.html I guess libglvnd will be required at some point. Best regards, Romain > > Regards, > Yann E. MORIN. > From romain.naour at gmail.com Mon Jan 3 21:25:57 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:25:57 +0100 Subject: [Buildroot] [PATCH 2/2 v4] package/mesa3d: make it aware of libglvnd and support it when present In-Reply-To: <85de806e-39a4-ce1b-fd07-2916443dfbbf@gmail.com> References: <20200727173844.2ac2945f@windsurf.home> <20200727173524.GG19818@scaer> <85de806e-39a4-ce1b-fd07-2916443dfbbf@gmail.com> Message-ID: <2679464d-5793-f8dc-4b57-14646bfdba6e@gmail.com> Le 03/01/2022 ? 22:20, Romain Naour a ?crit?: > Hello Yann, Thomas, > > Le 27/07/2020 ? 19:35, Yann E. MORIN a ?crit?: >> Thomas, All, >> >> On 2020-07-27 17:38 +0200, Thomas Petazzoni spake thusly: >>> On Mon, 27 Jul 2020 10:47:02 +0200 >>> "Yann E. MORIN" wrote: >>>> From: Jakub Skrzypnik >>>> >>>> When libglvnd is enabled, mesa3d must be told so, so as it installs its >>>> libraries with the vendor suffix (e.g. libEGL_mesa.so instead of >>>> libEGL.so). >>>> >>>> Additionally, the provider (in Buildroot parlance) is libglvnd, not mesa3d. >> [--SNIP--] >>>> config BR2_PACKAGE_MESA3D_OPENGL_GLX >>>> bool "OpenGL GLX" >>>> depends on BR2_PACKAGE_XORG7 >>>> - select BR2_PACKAGE_HAS_LIBGL >>>> + select BR2_PACKAGE_HAS_LIBGL if !BR2_PACKAGE_LIBGLVND >>>> + select BR2_PACKAGE_LIBGLVND_DISPATCH_GL if BR2_PACKAGE_LIBGLVND >>> >>> I don't immediately see a good solution for this, but I find that >>> solution to be quite annoying :-/ >> >> At first, I though so too, and I also looked for a better approach, >> but... >> >>> Indeed, I understand that once libglvnd is enabled, the GL-provider is >>> libglvnd, which in the background is using mesa3d. The dance to handle >>> libglvnd in mesa3d is already not nice, and we would have to have the >>> same dance in other GL providers that support libglvnd. >> >> Well, it is not _so_ bad. We could maybe make it a bit simpler, with: >> >> config BR2_PACKAGE_MESA3D_OPENGL_GLX >> bool "OpenGL GLX" >> select BR2_PACKAGE_HAS_LIBGL >> >> We still need to declare emsa3d as providing libgl depending on whether >> libglvnd is enabled, but we can make it a bit more "compact": >> >> if !BR2_PACKAGE_LIBGLVND >> >> config BR2_PACKAGE_PROVIDES_LIBGL >> default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX >> >> [EGL and GLES too here] >> >> endif >> >> And in mesa3d.mk too: >> >> ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) >> MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgl) >> [...] >> endif >> >> But now, in libglvnd, we don't need any extra symbol, we can just re-use >> BR2_PACKAGE_PROVIDES_LIBGL et al.: >> >> config BR2_PACKAGE_LIBGLVND >> bool "libglvnd" >> select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_PROVIDES_LIBGL >> select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_PROVIDES_LIBGL >> select BR2_PACKAGE_XLIB_XORGPROTO if BR2_PACKAGE_PROVIDES_LIBGL >> select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_PROVIDES_LIBGL >> >> if BR2_PACKAGE_LIBGLVND >> >> config BR2_PACKAGE_PROVIDES_LIBGL >> default "libglvnd" if BR2_PACKAGE_HAS_LIBGL >> >> endif >> >> and in libglvnd.mk: >> >> ifeq ($(BR2_PACKAGE_PROVIDES_LIBGL),y) >> LIBGLVND_DEPENDENCIES += xlib_libXext xorgproto >> LIBGLVND_CONF_OPTS += -Dglx=enabled >> LIBGLVND_PROVIDES += libgl >> else >> LIBGLVND_CONF_OPTS += -Dglx=disabled >> endif >> >>> OK, here is some vague idea for a possible solution: >>> - We introduce an intermediate "layer" between libgl and GL providers. >> [--SNIP--] >>> I *think* this would perhaps avoid that complexity in mesa3d... >>> obviously for additional complexity in terms of how the virtual >>> packages in GL world all work together. >> >> You are reinventing libglvnd in between libglvnd and actual providers, no? >> >> Also, remember that individual GL providers will still have to function >> as providers without libglvnd, which is not required. >> >> But I would like we progress on the topic, and when we have a second >> candidate for libglvnd use, we can revisit the topic and see if we can >> over-engineer the thing. >> >> Usually, we wait for three or four cases before trying to solve the >> problem in a generic fashion, and so I'd like to do here as well. >> Because so far, only two providers are known to work with libglvnd: >> mewsa3d and nvidia. ATI might be a third one, but I have no clue about >> it. And in the SoC land, there is not much that is libglvnd compatible >> so far, if at all. >> >> So, in the short-to-medium term, we'd at best have three providers. Is >> that enough to delve into a generic infra so far? Not sure... > > I had an issue with a package (ogre) that now use OPENGL_glx_LIBRARY to find the > "GLVND 'GLX' library" > > https://github.com/OGRECave/ogre/commit/aa9ffa7a51e52cb714f1bf5a3a00b9ef9f5a7dc2 > https://cmake.org/cmake/help/latest/module/FindOpenGL.html > > I guess libglvnd will be required at some point. Actually I did a test using this series as is. Tested-by: Romain Naour Best regards, Romain > > Best regards, > Romain > > >> >> Regards, >> Yann E. MORIN. >> > From romain.naour at gmail.com Mon Jan 3 21:39:40 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:39:40 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> Message-ID: Hello, Le 03/01/2022 ? 22:26, C?dric Le Goater a ?crit?: > On 1/3/22 21:19, Romain Naour wrote: >> Hi C?dric, All, >> >> Le 03/01/2022 ? 17:58, C?dric Le Goater a ?crit?: >>> Remove uclibc workaround which was deprecated by upstream : >>> ?? commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") >>> >>> Remove upstream patches : >>> ?? commit 304332039014 ("block/export/fuse.c: fix musl build") >>> ?? commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") >>> >>> Signed-off-by: C?dric Le Goater >> >> I did a similar commit to test all qemu defconfig in gitlab-ci: >> >> https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 >> >> No problem detected so far, I was investigating why the s390x defconfig failed >> for me... >> >> It would be great if you can do a runtime test in gitlab and add the link in the >> commit log. > > I did a few runs with test branches but I didn't find a way to run only > the qemu board boot tests. How did you do that ? Ok, I'll try to find some time to document how to use gitlab for qemu testing (see also recent changes in gitlab-ci) Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. Create a test branch named: qemu-6.2.0-defconfigs-qemu Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing Buildroot defconfis and "qemu" is a pattern. See: https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 "pushing a branch called "-defconfigs-" which will test all defconfigs whose name start with the pattern." > > ? >>> --- >>> ? ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- >>> ? ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- >>> ? ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- >>> ? package/qemu/qemu.hash??????????????????????? |? 2 +- >>> ? package/qemu/qemu.mk????????????????????????? |? 2 +- >>> ? 5 files changed, 2 insertions(+), 130 deletions(-) >>> ? delete mode 100644 >>> package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> ? delete mode 100644 >>> package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> ? delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> >>> diff --git >>> a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> >>> deleted file mode 100644 >>> index 6db4e8bc923e..000000000000 >>> --- >>> a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> +++ /dev/null >>> @@ -1,35 +0,0 @@ >>> -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 >>> -From: Thomas Petazzoni >>> -Date: Fri, 5 May 2017 09:07:15 +0200 >>> -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc >>> - >>> -user-exec.c has some conditional code to decide how to use the >>> -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but >>> -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path >>> -gets used, which doesn't apply to uClibc. >>> - >>> -Fix this by excluding __UCLIBC__, which ensures we fall back to the >>> -general case of using uc_mcontext.arm_pc, which works fine with >>> -uClibc. >>> - >>> -Signed-off-by: Thomas Petazzoni >>> ---- >>> - accel/tcg/user-exec.c | 2 +- >>> - 1 file changed, 1 insertion(+), 1 deletion(-) >>> - >>> -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c >>> -index 4ebe25461a..0496674fbd 100644 >>> ---- a/accel/tcg/user-exec.c >>> -+++ b/accel/tcg/user-exec.c >>> -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, >>> - >>> - #if defined(__NetBSD__) >>> -???? pc = uc->uc_mcontext.__gregs[_REG_R15]; >>> --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && >>> __GLIBC_MINOR__ <= 3)) >>> -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || >>> (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >>> -???? pc = uc->uc_mcontext.gregs[R15]; >>> - #else >>> -???? pc = uc->uc_mcontext.arm_pc; >>> --- >>> -2.25.3 >>> - >>> diff --git >>> a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> >>> deleted file mode 100644 >>> index 50762055bf18..000000000000 >>> --- >>> a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> +++ /dev/null >>> @@ -1,44 +0,0 @@ >>> -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 >>> -From: Fabrice Fontaine >>> -Date: Fri, 27 Aug 2021 23:40:01 +0200 >>> -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl >>> - >>> -Include linux/fs.h to avoid the following build failure on uclibc or >>> -musl raised since version 6.0.0: >>> - >>> -../block/export/fuse.c: In function 'fuse_lseek': >>> -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in >>> this function) >>> -? 641 |???? if (whence != SEEK_HOLE && whence != SEEK_DATA) { >>> -????? |?????????????????? ^~~~~~~~~ >>> -../block/export/fuse.c:641:19: note: each undeclared identifier is reported >>> only once for each function it appears in >>> -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in >>> this function); did you mean 'SEEK_SET'? >>> -? 641 |???? if (whence != SEEK_HOLE && whence != SEEK_DATA) { >>> -????? |????????????????????????????????????????? ^~~~~~~~~ >>> -????? |????????????????????????????????????????? SEEK_SET >>> - >>> -Fixes: >>> - - >>> http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 >>> - >>> -Signed-off-by: Fabrice Fontaine >>> -[Upstream status: >>> https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] >>> >>> ---- >>> - block/export/fuse.c | 3 +++ >>> - 1 file changed, 3 insertions(+) >>> - >>> -diff --git a/block/export/fuse.c b/block/export/fuse.c >>> -index fc7b07d2b5..2e3bf8270b 100644 >>> ---- a/block/export/fuse.c >>> -+++ b/block/export/fuse.c >>> -@@ -31,6 +31,9 @@ >>> - #include >>> - #include >>> - >>> -+#ifdef __linux__ >>> -+#include >>> -+#endif >>> - >>> - /* Prevent overly long bounce buffer allocations */ >>> - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) >>> --- >>> -2.32.0 >>> - >>> diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> deleted file mode 100644 >>> index 4856821843fc..000000000000 >>> --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> +++ /dev/null >>> @@ -1,49 +0,0 @@ >>> -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 >>> -From: Fabrice Fontaine >>> -Date: Fri, 22 Oct 2021 11:52:09 +0200 >>> -Subject: [PATCH] block/export/fuse.c: fix musl build >>> -MIME-Version: 1.0 >>> -Content-Type: text/plain; charset=UTF-8 >>> -Content-Transfer-Encoding: 8bit >>> - >>> -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix >>> -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb >>> >>> -and avoid the following build failure on musl: >>> - >>> -../block/export/fuse.c: In function 'fuse_fallocate': >>> -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared >>> (first use in this function) >>> -? 643 |???? else if (mode & FALLOC_FL_ZERO_RANGE) { >>> -????? |???????????????????? ^~~~~~~~~~~~~~~~~~~~ >>> - >>> -Fixes: >>> - - >>> http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b >>> - >>> -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") >>> -Signed-off-by: Fabrice Fontaine >>> -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> >>> -Reviewed-by: Philippe Mathieu-Daud? >>> -Signed-off-by: Kevin Wolf >>> -[Retrieved from: >>> -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] >>> >>> ---- >>> - block/export/fuse.c | 4 ++++ >>> - 1 file changed, 4 insertions(+) >>> - >>> -diff --git a/block/export/fuse.c b/block/export/fuse.c >>> -index 2e3bf8270b..823c126d23 100644 >>> ---- a/block/export/fuse.c >>> -+++ b/block/export/fuse.c >>> -@@ -31,6 +31,10 @@ >>> - #include >>> - #include >>> - >>> -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) >>> -+#include >>> -+#endif >>> -+ >>> - #ifdef __linux__ >>> - #include >>> - #endif >>> --- >>> -GitLab >>> - >>> diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash >>> index 0613fce49367..9411832384ba 100644 >>> --- a/package/qemu/qemu.hash >>> +++ b/package/qemu/qemu.hash >>> @@ -1,4 +1,4 @@ >>> ? # Locally computed, tarball verified with GPG signature >>> -sha256? eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96? >>> qemu-6.1.0.tar.xz >>> +sha256? 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45? >>> qemu-6.2.0.tar.xz >>> ? sha256? 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100? >>> COPYING >>> ? sha256? dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551? >>> COPYING.LIB >>> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk >>> index 919aef6599f1..97f9f885a18a 100644 >>> --- a/package/qemu/qemu.mk >>> +++ b/package/qemu/qemu.mk >>> @@ -4,7 +4,7 @@ >>> ? # >>> ? >>> ################################################################################ >>> ? -QEMU_VERSION = 6.1.0 >>> +QEMU_VERSION = 6.2.0 >>> ? QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz >>> ? QEMU_SITE = http://download.qemu.org >>> ? QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, >>> Others/BSD-1c >>> >> >> Please check qemu configure options while doing a version bump, there are a lot >> of new option added: > > yes. QEMU is very much alive. > >> https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e >> > > I suppose you disable options to reduce compile time ? I'm more concerned about qemu dependencies. host-qemu must avoid linking with libraries installed on the host (unpredictable build and runtime result). Best regards, Romain > > Thanks, > > C. From ps.report at gmx.net Mon Jan 3 21:56:19 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 3 Jan 2022 22:56:19 +0100 Subject: [Buildroot] [PATCH v1] package/pkg-waf.mk: enable verbose compile Message-ID: <20220103215619.4580-1-ps.report@gmx.net> Honour the buildroot verbose flag ('V=1') for the waf compile step by adding '-v' to the build command. Signed-off-by: Peter Seiderer --- package/pkg-waf.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index a593476a69..0239862ac6 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -20,6 +20,8 @@ # ################################################################################ +WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) + ################################################################################ # inner-waf-package -- defines how the configuration, compilation and # installation of a waf package should be done, implements a few hooks @@ -74,7 +76,7 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ + build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef endif -- 2.34.1 From yann.morin.1998 at free.fr Mon Jan 3 21:19:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 22:19:58 +0100 Subject: [Buildroot] [git commit] package/qemu: renumber remaining patch Message-ID: <20220103215701.85C9B82DEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5c58aff5d4ff44b6b923c4a91e9beb27ee536fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The commit [1] removed patch 0001. [1] 85c7bd0602715dc6a148cc79db8910dca27c4e76 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...efault.patch => 0001-tests-fp-disable-fp-bench-build-by-default.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch similarity index 100% rename from package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch rename to package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch From yann.morin.1998 at free.fr Mon Jan 3 21:25:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 22:25:02 +0100 Subject: [Buildroot] [git commit] package/qemu: Disable new configure options added by Qemu 2.6.0 Message-ID: <20220103215701.9967782DF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78a989b1f15311d7e9e01717111c3dc306a0dbaa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable new configure options added by this release to avoid adding new dependencies or features. Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 43450a6649..e69e813059 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -187,16 +187,20 @@ define QEMU_CONFIGURE_CMDS --audio-drv-list= \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ + --disable-alsa \ --disable-bpf \ --disable-brlapi \ --disable-bsd-user \ --disable-cap-ng \ --disable-capstone \ --disable-containers \ + --disable-coreaudio \ --disable-curl \ --disable-curses \ --disable-docs \ + --disable-dsound \ --disable-hvf \ + --disable-jack \ --disable-libiscsi \ --disable-libxml2 \ --disable-linux-aio \ @@ -204,9 +208,13 @@ define QEMU_CONFIGURE_CMDS --disable-malloc-trim \ --disable-membarrier \ --disable-mpath \ + --disable-netmap \ --disable-opengl \ + --disable-oss \ + --disable-pa \ --disable-rbd \ --disable-sanitizers \ + --disable-selinux \ --disable-sparse \ --disable-strip \ --disable-vde \ @@ -355,14 +363,24 @@ define HOST_QEMU_CONFIGURE_CMDS --extra-ldflags="$(HOST_LDFLAGS)" \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ + --disable-alsa \ --disable-bpf \ --disable-bzip2 \ --disable-containers \ + --disable-coreaudio \ --disable-curl \ --disable-docs \ + --disable-dsound \ + --disable-jack \ --disable-libssh \ + --disable-linux-aio \ --disable-linux-io-uring \ + --disable-netmap \ + --disable-oss \ + --disable-pa \ --disable-sdl \ + --disable-selinux \ + --disable-vde \ --disable-vhost-user-blk-server \ --disable-virtiofsd \ --disable-vnc-jpeg \ From yann.morin.1998 at free.fr Mon Jan 3 21:22:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 22:22:18 +0100 Subject: [Buildroot] [git commit] package/qemu: reorder enable/disable options alphabetically Message-ID: <20220103215701.8FCC682DF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c115a09c894404d6417997dd722e3029fa71317 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 97f9f885a1..43450a6649 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -187,39 +187,39 @@ define QEMU_CONFIGURE_CMDS --audio-drv-list= \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ - --enable-kvm \ - --enable-attr \ - --enable-vhost-net \ --disable-bpf \ + --disable-brlapi \ --disable-bsd-user \ + --disable-cap-ng \ + --disable-capstone \ --disable-containers \ - --disable-xen \ - --disable-virtfs \ - --disable-brlapi \ - --disable-curses \ --disable-curl \ - --disable-vde \ - --disable-linux-aio \ - --disable-linux-io-uring \ - --disable-cap-ng \ + --disable-curses \ --disable-docs \ - --disable-rbd \ - --disable-libiscsi \ - --disable-strip \ - --disable-sparse \ - --disable-mpath \ - --disable-sanitizers \ --disable-hvf \ - --disable-whpx \ + --disable-libiscsi \ + --disable-libxml2 \ + --disable-linux-aio \ + --disable-linux-io-uring \ --disable-malloc-trim \ --disable-membarrier \ - --disable-vhost-crypto \ - --disable-libxml2 \ - --disable-capstone \ - --with-git-submodules=ignore \ + --disable-mpath \ --disable-opengl \ + --disable-rbd \ + --disable-sanitizers \ + --disable-sparse \ + --disable-strip \ + --disable-vde \ + --disable-vhost-crypto \ --disable-vhost-user-blk-server \ + --disable-virtfs \ --disable-virtiofsd \ + --disable-whpx \ + --disable-xen \ + --enable-attr \ + --enable-kvm \ + --enable-vhost-net \ + --with-git-submodules=ignore \ $(QEMU_OPTS) endef From fontaine.fabrice at gmail.com Mon Jan 3 22:07:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 3 Jan 2022 23:07:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-rgb-led-matrix: fix musl build Message-ID: <20220103220724.559180-1-fontaine.fabrice@gmail.com> Fix the following build failure on musl raised since the addition of the package in commit e821078031e14df69e5142f23e9cb7b5a1ea0e77: text-scroller.cc: In function 'int main(int, char**)': text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? 220 | uint frame_counter = 0; | ^~~~ | rint Fixes: - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 Signed-off-by: Fabrice Fontaine --- ...-utils-text-scroller.cc-replace-uint.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch diff --git a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch new file mode 100644 index 0000000000..627415bac8 --- /dev/null +++ b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch @@ -0,0 +1,50 @@ +From a56338db0f003d5236f2ce98c73a591d64a70852 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Jan 2022 22:57:11 +0100 +Subject: [PATCH] utils/text-scroller.cc: replace uint (#1383) + +Replace uint by uint64_t to avoid the following build failure on musl: + +text-scroller.cc: In function 'int main(int, char**)': +text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? + 220 | uint frame_counter = 0; + | ^~~~ + | rint + +Fixes: + - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/hzeller/rpi-rgb-led-matrix/commit/a56338db0f003d5236f2ce98c73a591d64a70852] +--- + utils/text-scroller.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/utils/text-scroller.cc b/utils/text-scroller.cc +index a64ba0c89..28d4f7182 100644 +--- a/utils/text-scroller.cc ++++ b/utils/text-scroller.cc +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -217,12 +218,12 @@ int main(int argc, char *argv[]) { + + struct timespec next_frame = {0, 0}; + +- uint frame_counter = 0; ++ uint64_t frame_counter = 0; + while (!interrupt_received && loops != 0) { + ++frame_counter; + offscreen_canvas->Fill(bg_color.r, bg_color.g, bg_color.b); + const bool draw_on_frame = (blink_on <= 0) +- || (frame_counter % (blink_on + blink_off) < (uint)blink_on); ++ || (frame_counter % (blink_on + blink_off) < (uint64_t)blink_on); + + if (draw_on_frame) { + if (outline_font) { -- 2.34.1 From clg at kaod.org Mon Jan 3 22:20:49 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Mon, 3 Jan 2022 23:20:49 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> Message-ID: <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> Hello, > Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. > > Create a test branch named: qemu-6.2.0-defconfigs-qemu > > Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing > Buildroot defconfis and "qemu" is a pattern. > > See: > https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 > > "pushing a branch called "-defconfigs-" which will test all > defconfigs whose name start with the pattern." That looks simple enough. Something is going wrong though : https://gitlab.com/legoater/buildroot/-/jobs/1937752353 Am I missing something ? Thanks, C. From clg at kaod.org Mon Jan 3 21:26:20 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Mon, 3 Jan 2022 22:26:20 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> Message-ID: <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> On 1/3/22 21:19, Romain Naour wrote: > Hi C?dric, All, > > Le 03/01/2022 ? 17:58, C?dric Le Goater a ?crit?: >> Remove uclibc workaround which was deprecated by upstream : >> commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") >> >> Remove upstream patches : >> commit 304332039014 ("block/export/fuse.c: fix musl build") >> commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") >> >> Signed-off-by: C?dric Le Goater > > I did a similar commit to test all qemu defconfig in gitlab-ci: > > https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 > > No problem detected so far, I was investigating why the s390x defconfig failed > for me... > > It would be great if you can do a runtime test in gitlab and add the link in the > commit log. I did a few runs with test branches but I didn't find a way to run only the qemu board boot tests. How did you do that ? >> --- >> ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- >> ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- >> ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- >> package/qemu/qemu.hash | 2 +- >> package/qemu/qemu.mk | 2 +- >> 5 files changed, 2 insertions(+), 130 deletions(-) >> delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> >> diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> deleted file mode 100644 >> index 6db4e8bc923e..000000000000 >> --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> +++ /dev/null >> @@ -1,35 +0,0 @@ >> -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 >> -From: Thomas Petazzoni >> -Date: Fri, 5 May 2017 09:07:15 +0200 >> -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc >> - >> -user-exec.c has some conditional code to decide how to use the >> -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but >> -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path >> -gets used, which doesn't apply to uClibc. >> - >> -Fix this by excluding __UCLIBC__, which ensures we fall back to the >> -general case of using uc_mcontext.arm_pc, which works fine with >> -uClibc. >> - >> -Signed-off-by: Thomas Petazzoni >> ---- >> - accel/tcg/user-exec.c | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c >> -index 4ebe25461a..0496674fbd 100644 >> ---- a/accel/tcg/user-exec.c >> -+++ b/accel/tcg/user-exec.c >> -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, >> - >> - #if defined(__NetBSD__) >> - pc = uc->uc_mcontext.__gregs[_REG_R15]; >> --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >> -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >> - pc = uc->uc_mcontext.gregs[R15]; >> - #else >> - pc = uc->uc_mcontext.arm_pc; >> --- >> -2.25.3 >> - >> diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> deleted file mode 100644 >> index 50762055bf18..000000000000 >> --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> +++ /dev/null >> @@ -1,44 +0,0 @@ >> -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Fri, 27 Aug 2021 23:40:01 +0200 >> -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl >> - >> -Include linux/fs.h to avoid the following build failure on uclibc or >> -musl raised since version 6.0.0: >> - >> -../block/export/fuse.c: In function 'fuse_lseek': >> -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) >> - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { >> - | ^~~~~~~~~ >> -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in >> -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? >> - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { >> - | ^~~~~~~~~ >> - | SEEK_SET >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 >> - >> -Signed-off-by: Fabrice Fontaine >> -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] >> ---- >> - block/export/fuse.c | 3 +++ >> - 1 file changed, 3 insertions(+) >> - >> -diff --git a/block/export/fuse.c b/block/export/fuse.c >> -index fc7b07d2b5..2e3bf8270b 100644 >> ---- a/block/export/fuse.c >> -+++ b/block/export/fuse.c >> -@@ -31,6 +31,9 @@ >> - #include >> - #include >> - >> -+#ifdef __linux__ >> -+#include >> -+#endif >> - >> - /* Prevent overly long bounce buffer allocations */ >> - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) >> --- >> -2.32.0 >> - >> diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> deleted file mode 100644 >> index 4856821843fc..000000000000 >> --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> +++ /dev/null >> @@ -1,49 +0,0 @@ >> -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Fri, 22 Oct 2021 11:52:09 +0200 >> -Subject: [PATCH] block/export/fuse.c: fix musl build >> -MIME-Version: 1.0 >> -Content-Type: text/plain; charset=UTF-8 >> -Content-Transfer-Encoding: 8bit >> - >> -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix >> -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb >> -and avoid the following build failure on musl: >> - >> -../block/export/fuse.c: In function 'fuse_fallocate': >> -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) >> - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { >> - | ^~~~~~~~~~~~~~~~~~~~ >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b >> - >> -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") >> -Signed-off-by: Fabrice Fontaine >> -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> >> -Reviewed-by: Philippe Mathieu-Daud? >> -Signed-off-by: Kevin Wolf >> -[Retrieved from: >> -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] >> ---- >> - block/export/fuse.c | 4 ++++ >> - 1 file changed, 4 insertions(+) >> - >> -diff --git a/block/export/fuse.c b/block/export/fuse.c >> -index 2e3bf8270b..823c126d23 100644 >> ---- a/block/export/fuse.c >> -+++ b/block/export/fuse.c >> -@@ -31,6 +31,10 @@ >> - #include >> - #include >> - >> -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) >> -+#include >> -+#endif >> -+ >> - #ifdef __linux__ >> - #include >> - #endif >> --- >> -GitLab >> - >> diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash >> index 0613fce49367..9411832384ba 100644 >> --- a/package/qemu/qemu.hash >> +++ b/package/qemu/qemu.hash >> @@ -1,4 +1,4 @@ >> # Locally computed, tarball verified with GPG signature >> -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz >> +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz >> sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING >> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB >> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk >> index 919aef6599f1..97f9f885a18a 100644 >> --- a/package/qemu/qemu.mk >> +++ b/package/qemu/qemu.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -QEMU_VERSION = 6.1.0 >> +QEMU_VERSION = 6.2.0 >> QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz >> QEMU_SITE = http://download.qemu.org >> QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c >> > > Please check qemu configure options while doing a version bump, there are a lot > of new option added: yes. QEMU is very much alive. > https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e I suppose you disable options to reduce compile time ? Thanks, C. From romain.naour at gmail.com Mon Jan 3 22:43:11 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 23:43:11 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> Message-ID: <1b60df77-a795-f328-6651-4e3b5c4b0757@gmail.com> Le 03/01/2022 ? 23:20, C?dric Le Goater a ?crit?: > Hello, >> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >> >> Create a test branch named: qemu-6.2.0-defconfigs-qemu >> >> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >> Buildroot defconfis and "qemu" is a pattern. >> >> See: >> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >> >> >> "pushing a branch called "-defconfigs-" which will test all >> defconfigs whose name start with the pattern." > > That looks simple enough. Something is going wrong though : > > ? https://gitlab.com/legoater/buildroot/-/jobs/1937752353 > > Am I missing something ? humm, maybe there is weakness in the script when foo is "qemu-6.2.0" ^ Try again with something else like qemu_6.2.0-defconfigs-qemu Best regards, Romain > > Thanks, > > C. From romain.naour at gmail.com Mon Jan 3 22:50:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 23:50:41 +0100 Subject: [Buildroot] [PATCH] package/zfs: fix python3 version check Message-ID: <20220103225041.13925-1-romain.naour@gmail.com> Backport a patch to fix the python 3 version check that broke the build since the python 3.10 version bump. Add host-python-packaging dependency since the backport add "from packaging import version" while checking the python version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1935414730 https://gitlab.com/buildroot.org/buildroot/-/jobs/1935415049 Signed-off-by: Romain Naour --- ...law-in-the-Python-3-version-checking.patch | 106 ++++++++++++++++++ package/zfs/zfs.mk | 5 +- 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch new file mode 100644 index 0000000000..70978f9f4d --- /dev/null +++ b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch @@ -0,0 +1,106 @@ +From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain at users.noreply.github.com> +Date: Tue, 8 Jun 2021 20:20:16 -0400 +Subject: [PATCH] Correct a flaw in the Python 3 version checking + +It turns out the ax_python_devel.m4 version check assumes that +("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 +is 10 or above and X is not. (Also presumably X+1=100 and ...) + +So let's remake the check to behave consistently, using the +"packaging" or (if absent) the "distlib" modules. + +(Also, update the Github workflows to use the new packages.) + +Reviewed-by: Brian Behlendorf +Reviewed-by: John Kennedy +Signed-off-by: Rich Ercolani +Closes: #12073 +(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) +[Romain: drop rpm spec and github workflows changes] +Signed-off-by: Romain Naour +--- + config/always-pyzfs.m4 | 15 +++++++++++++++ + config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ + 2 files changed, 42 insertions(+), 6 deletions(-) + +diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 +index 76e07b593..fa39fd885 100644 +--- a/config/always-pyzfs.m4 ++++ b/config/always-pyzfs.m4 +@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ + ]) + AC_SUBST(DEFINE_PYZFS) + ++ dnl # ++ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs ++ dnl # ++ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ ++ ZFS_AC_PYTHON_MODULE([packaging], [], [ ++ ZFS_AC_PYTHON_MODULE([distlib], [], [ ++ AS_IF([test "x$enable_pyzfs" = xyes], [ ++ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") ++ ], [test "x$enable_pyzfs" != xno], [ ++ enable_pyzfs=no ++ ]) ++ ]) ++ ]) ++ ]) ++ + dnl # + dnl # Require python-devel libraries + dnl # +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index c51b45b7d..cdfbbf81f 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split ()[[0]]; \ +- print (ver >= '2.1.0')"` ++ ac_supports_python_ver=`cat<= '3.11.0' ++ ac_supports_python_ver=`cat< Signed-off-by: Romain Naour --- package/python-packaging/python-packaging.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 6b54d2416d..1fd6f26d64 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -12,3 +12,4 @@ PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.31.1 From romain.naour at gmail.com Mon Jan 3 22:54:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 23:54:50 +0100 Subject: [Buildroot] [PATCH 2/2] package/zfs: fix python3 version check In-Reply-To: <20220103225450.14459-1-romain.naour@gmail.com> References: <20220103225450.14459-1-romain.naour@gmail.com> Message-ID: <20220103225450.14459-2-romain.naour@gmail.com> Backport a patch to fix the python 3 version check that broke the build since the python 3.10 version bump. Add host-python-packaging dependency since the backport add "from packaging import version" while checking the python version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1935414730 https://gitlab.com/buildroot.org/buildroot/-/jobs/1935415049 Signed-off-by: Romain Naour --- ...law-in-the-Python-3-version-checking.patch | 106 ++++++++++++++++++ package/zfs/zfs.mk | 5 +- 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch new file mode 100644 index 0000000000..70978f9f4d --- /dev/null +++ b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch @@ -0,0 +1,106 @@ +From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain at users.noreply.github.com> +Date: Tue, 8 Jun 2021 20:20:16 -0400 +Subject: [PATCH] Correct a flaw in the Python 3 version checking + +It turns out the ax_python_devel.m4 version check assumes that +("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 +is 10 or above and X is not. (Also presumably X+1=100 and ...) + +So let's remake the check to behave consistently, using the +"packaging" or (if absent) the "distlib" modules. + +(Also, update the Github workflows to use the new packages.) + +Reviewed-by: Brian Behlendorf +Reviewed-by: John Kennedy +Signed-off-by: Rich Ercolani +Closes: #12073 +(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) +[Romain: drop rpm spec and github workflows changes] +Signed-off-by: Romain Naour +--- + config/always-pyzfs.m4 | 15 +++++++++++++++ + config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ + 2 files changed, 42 insertions(+), 6 deletions(-) + +diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 +index 76e07b593..fa39fd885 100644 +--- a/config/always-pyzfs.m4 ++++ b/config/always-pyzfs.m4 +@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ + ]) + AC_SUBST(DEFINE_PYZFS) + ++ dnl # ++ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs ++ dnl # ++ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ ++ ZFS_AC_PYTHON_MODULE([packaging], [], [ ++ ZFS_AC_PYTHON_MODULE([distlib], [], [ ++ AS_IF([test "x$enable_pyzfs" = xyes], [ ++ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") ++ ], [test "x$enable_pyzfs" != xno], [ ++ enable_pyzfs=no ++ ]) ++ ]) ++ ]) ++ ]) ++ + dnl # + dnl # Require python-devel libraries + dnl # +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index c51b45b7d..cdfbbf81f 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split ()[[0]]; \ +- print (ver >= '2.1.0')"` ++ ac_supports_python_ver=`cat<= '3.11.0' ++ ac_supports_python_ver=`cat< These patches fix per-package builds with non-qt5base qt5 packages. Based off of Louis-Paul's earlier work[1] and And Yann Morin's feedback to a different patch set[2], the simple fix is to add a few pre-configure hook methods to pkg-generic.mk, pkg-cmake.mk, and pkg-qmake.mk which search for .pc, .cmake, and .pri files for the $(STAGING_DIR)/ prefix and removes them. Feedback is welcome! Adam 1) https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ 2) https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Adam Duskett (3): package/pkg-generic.mk: fix absolute paths in .pc files for per-package builds Some packages (notably qmake packages) generate .pc files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in the .pc file point outside the per-package sysroot. package/pkg-cmake.mk: fix absolute paths in .cmake files for per-package builds package/pkg-qmake.mk: fix absolute paths in .pri files for per-package builds package/pkg-cmake.mk | 11 +++++++++++ package/pkg-generic.mk | 11 +++++++++++ package/pkg-qmake.mk | 11 +++++++++++ 3 files changed, 33 insertions(+) -- 2.33.1 From aduskett at gmail.com Mon Jan 3 23:02:48 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 3 Jan 2022 15:02:48 -0800 Subject: [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: fix absolute paths in .cmake files for per-package builds In-Reply-To: <20220103230249.310062-1-aduskett@gmail.com> References: <20220103230249.310062-1-aduskett@gmail.com> Message-ID: <20220103230249.310062-3-aduskett@gmail.com> Some packages (notably qmake packages) generate .cmake files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in the .cmake files point outside the per-package sysroot. Add the new pre-configure-hook "FIXUP_CMAKECONFIG_ABSOLUTE_PATHS" in package/pkg-cmake.mk which searches for all .cmake files in a per-package staging directory and removes the $(STAGING_DIR)/ prefix from in them. This simple fix allows non-qt5base qt5 packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- package/pkg-cmake.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..47234fbdd9 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -65,6 +65,17 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +# Some packages may generate cmake files with absolute paths. Remove the +# absolute paths from the generated cmake files to keep per-package isolation +# with the build sysroot. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_CMAKECONFIG_ABSOLUTE_PATHS + $(Q)find $(STAGING_DIR)/ -name "*.cmake" | xargs --no-run-if-empty \ + $(SED) "s:$(STAGING_DIR)::g" +endef +$(2)_PRE_CONFIGURE_HOOKS += FIXUP_CMAKECONFIG_ABSOLUTE_PATHS +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target -- 2.33.1 From aduskett at gmail.com Mon Jan 3 23:02:47 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 3 Jan 2022 15:02:47 -0800 Subject: [Buildroot] [PATCH 1/3] package/pkg-generic.mk: fix absolute paths in .pc files for per-package builds In-Reply-To: <20220103230249.310062-1-aduskett@gmail.com> References: <20220103230249.310062-1-aduskett@gmail.com> Message-ID: <20220103230249.310062-2-aduskett@gmail.com> Some packages (notably qmake packages) generate .pc files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in the .pc file point outside the per-package sysroot. Add the new pre-configure-hook "FIXUP_PC_FILES_ABSOLUTE_PATHS" in package/pkg-generic.mk which searches for all .pc files in a per-package staging directory and removes the $(STAGING_DIR)/ prefix in them. This simple fix allows non-qt5base qt5 packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- package/pkg-generic.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5626af1d87..94104cbfa9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -103,6 +103,17 @@ define fixup-libtool-files endef endif +# When per-package is enabled, packages may generate .pc files with absolute +# paths for the prefix field. Remove the absolute paths from the generated .pc +# files to keep per-package isolation with the build sysroot. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_PC_FILES_ABSOLUTE_PATHS + $(Q)find $(STAGING_DIR)/ -name "*.pc" | xargs --no-run-if-empty \ + $(SED) "s:$(STAGING_DIR)::g" +endef +$(2)_PRE_CONFIGURE_HOOKS += FIXUP_PC_ABSOLUTE_PATHS +endif + # Make sure python _sysconfigdata*.py files only reference the current # per-package directory. # -- 2.33.1 From aduskett at gmail.com Mon Jan 3 23:02:49 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 3 Jan 2022 15:02:49 -0800 Subject: [Buildroot] [PATCH 3/3] package/pkg-qmake.mk: fix absolute paths in .pri files for per-package builds In-Reply-To: <20220103230249.310062-1-aduskett@gmail.com> References: <20220103230249.310062-1-aduskett@gmail.com> Message-ID: <20220103230249.310062-4-aduskett@gmail.com> Qmake generates .pri files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in the .pri files point outside the per-package sysroot. Add the new pre-configure-hook "FIXUP_PRI_FILES_ABSOLUTE_PATHS" in package/pkg-qmake.mk which searches for all .pri files in a per-package staging directory and removes the $(STAGING_DIR)/ prefix in them. This simple fix allows non-qt5base qt5 packages that use .pri files to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- package/pkg-qmake.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..b847ab0ef8 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -27,6 +27,17 @@ define QT_HEADERS_SYNC_HOOK $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) endef +# When per-package is enabled, qmake packages may generate .pri files with +# absolute paths Remove the absolute paths from the generated .pri files to +# keep per-package isolation with the build sysroot. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_PRI_FILES_ABSOLUTE_PATHS + $(Q)find $(HOST_DIR)/ -name "*.pri" | xargs --no-run-if-empty \ + $(SED) "s:$(STAGING_DIR):\$$\$$\[QT_SYSROOT\]:g" +endef +$(2)_PRE_CONFIGURE_HOOKS += FIXUP_PC_ABSOLUTE_PATHS +endif + ################################################################################ # inner-qmake-package -- defines how the configuration, compilation and # installation of a qmake package should be done, implements a few hooks -- 2.33.1 From james.hilliard1 at gmail.com Tue Jan 4 07:48:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 4 Jan 2022 00:48:21 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: bump to version 5.212.0-alpha4 Message-ID: <20220104074821.1330228-1-james.hilliard1@gmail.com> Switch to latest release in new active upstream: https://github.com/qtwebkit/qtwebkit Migrate python2 build to python3. Drop patches that are upstream/no longer needed. Adapt/add patches to fix build issues. Rework build system to use cmake instead of qmake(which does not currently support cross compilation). Signed-off-by: James Hilliard --- ...compile-failures-from-capital-bool-d.patch | 147 ++++++++++++++++++ ...0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 36 ----- ...acktrace-API-for-non-glibc-libraries.patch | 44 ------ ...with-Python-3.9-avoid-passing-encodi.patch | 33 ++++ ...-Detect-32-bits-armv8-a-architecture.patch | 48 ------ ...e-the-header-directly-to-fix-build-.patch} | 22 +-- ...04-Fix-installation-of-class-headers.patch | 49 ------ ..._object-declarations-to-fix-build-wi.patch | 31 ++++ ...005-Fix-ICU-related-compile-failures.patch | 67 -------- ...-legacy-reference-to-qtConfig-mircli.patch | 34 ---- ...te-the-header-directly-to-fix-build-.patch | 31 ---- ...compile-failures-from-capital-bool-d.patch | 99 ------------ package/qt5/qt5webkit/Config.in | 14 ++ package/qt5/qt5webkit/qt5webkit.hash | 4 +- package/qt5/qt5webkit/qt5webkit.mk | 37 ++--- 15 files changed, 250 insertions(+), 446 deletions(-) create mode 100644 package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch delete mode 100644 package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch delete mode 100644 package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch create mode 100644 package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch delete mode 100644 package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch rename package/qt5/qt5webkit/{0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch => 0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch} (60%) delete mode 100644 package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch create mode 100644 package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch delete mode 100644 package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch delete mode 100644 package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch delete mode 100644 package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch delete mode 100644 package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch new file mode 100644 index 0000000000..11d0b7b248 --- /dev/null +++ b/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch @@ -0,0 +1,147 @@ +From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001 +From: Henri Roosen +Date: Thu, 18 Mar 2021 11:53:57 +0100 +Subject: [PATCH] Fix ICU related compile failures from capital bool defines + +See ICU-21267 + +Signed-off-by: Henri Roosen +Signed-off-by: James Hilliard +--- + Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- + Source/WebCore/platform/text/icu/UTextProvider.h | 8 ++++---- + .../platform/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- + .../platform/text/icu/UTextProviderUTF16.cpp | 4 ++-- + 4 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp +index dd6ff0675bb1..e0f4bd718828 100644 +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h +index c254fc4c7ce2..6d1e1cbc5eb2 100644 +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +index cd6852c71e55..6a864b1c1567 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +index 7aaac48c8151..9ae0d367f1f6 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch deleted file mode 100644 index 669c7e6aa2..0000000000 --- a/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner -Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) - -Building qtwebkit causes a QA issue such that QtWebPluginProcess and -QtWebProcess contain bad RPATHs which point into the build location. This fix -adds a patch to not include the rpath.prf which causes this problem. - -Signed-off-by: Trevor Woerner -Signed-off-by: Martin Jansa - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0001-qtwebkit-fix-QA-issue-bad-RPATH.patch - -Signed-off-by: Gary Bisson ---- - Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index fd66af6..ef754c3 100644 ---- a/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -61,7 +61,6 @@ linux-*g++* { - } - } - --contains(TEMPLATE, app): CONFIG += rpath - - CONFIG(debug, debug|release)|force_debug_info { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. --- -2.7.0 - diff --git a/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted file mode 100644 index a2597a54bb..0000000000 --- a/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries - -It was excluding musl with current checks, so lets make it such that it -considers only glibc when using backtrace API - -Signed-off-by: Khem Raj - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0003-Exclude-backtrace-API-for-non-glibc-libraries.patch - -Signed-off-by: Gary Bisson ---- - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 1b2091f..ba03a28 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -61,7 +61,7 @@ - #include - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include - #include -@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined --- -2.7.0 - diff --git a/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch b/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch new file mode 100644 index 0000000000..d167a44bf3 --- /dev/null +++ b/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch @@ -0,0 +1,33 @@ +From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Wed, 3 Jun 2020 15:01:42 +0300 +Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to + json.load() + +In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument +is not supported. + +Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +78360c01c796b6260bf828bc9c8a0ef73c5132fd] +--- + Source/JavaScriptCore/generate-bytecode-files | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files +index c5dab429c7b0..af3431275ecf 100644 +--- a/Source/JavaScriptCore/generate-bytecode-files ++++ b/Source/JavaScriptCore/generate-bytecode-files +@@ -163,7 +163,7 @@ if __name__ == "__main__": + initBytecodesFile = openOrExit(initASMFileName, "w") + + try: +- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") ++ bytecodeSections = json.load(bytecodeFile) + except: + print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) + +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch deleted file mode 100644 index 9c2205dd94..0000000000 --- a/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 15 Aug 2017 18:28:49 -0400 -Subject: [PATCH] Detect 32-bits armv8-a architecture -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Adds WTF platform support for the 32-bits armv8-a architectures. - -Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) -and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). - -This commit catches this new architecture (armv8a) within a #ifdef/#endif -inside the if statement dedicated for 32-bits ARM detection. - -Fixes: - - In file included from ./config.h:30:0, - from ... - ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" - # error "Not supported ARM architecture" - ^~~~~ - -Upstream-Status: Backport [with adaptations] -Signed-off-by: Ga?l PORTAY ---- - Source/WTF/wtf/Platform.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 562840cf7..9cf656845 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -243,6 +243,10 @@ - || defined(__ARM_ARCH_7S__) - #define WTF_ARM_ARCH_VERSION 7 - -+#elif defined(__ARM_ARCH_8__) \ -+ || defined(__ARM_ARCH_8A__) -+#define WTF_ARM_ARCH_VERSION 8 -+ - /* MSVC sets _M_ARM */ - #elif defined(_M_ARM) - #define WTF_ARM_ARCH_VERSION _M_ARM --- -2.16.1 - diff --git a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch similarity index 60% rename from package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch rename to package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch index 7bb81b1259..1591b8a82c 100644 --- a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch +++ b/package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch @@ -1,4 +1,4 @@ -From 894a5448ee8ce0f134845c877b4c0a2a660e4ab3 Mon Sep 17 00:00:00 2001 +From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Tue, 4 Aug 2020 21:04:06 +0300 Subject: [PATCH] Let Bison generate the header directly, to fix build with @@ -9,24 +9,25 @@ by default, instead of duplicating it. So we should not delete it. Remove the code to add #ifdef guards to the header, since Bison adds them itself since version 2.6.3. - -[Original patch taken from -https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch?id=69e618c88a9134f754264efc11aa0b1fdc028b88 -ported to qtwebkit-opensource-src-5.9.1] -Signed-off-by: Peter Seiderer +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +d92b11fea65364fefa700249bd3340e0cd4c5b31] --- Source/WebCore/css/makegrammar.pl | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 4e0452ed..9ef32963 100644 +index 5d63b08102eb..9435701c7061 100644 --- a/Source/WebCore/css/makegrammar.pl +++ b/Source/WebCore/css/makegrammar.pl -@@ -73,23 +73,4 @@ if ($suffix eq ".y.in") { +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { } my $fileBase = File::Spec->join($outputDir, $filename); --system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; - -open HEADER, ">$fileBase.h" or die; -print HEADER << "EOF"; @@ -46,7 +47,6 @@ index 4e0452ed..9ef32963 100644 -unlink("$fileBase.cpp.h"); -unlink("$fileBase.hpp"); - -+system("$bison --defines=$fileBase.h -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); -- -2.28.0 +2.25.1 diff --git a/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch b/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch deleted file mode 100644 index 92aab57111..0000000000 --- a/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7d763d441fd4fa78553a818ee75ac477eb6dbcbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= -Date: Sun, 2 Feb 2020 10:48:50 +0100 -Subject: [PATCH] Fix installation of class headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since Qt 5.11 (see commit [1]), the key word HEADER_CLASSES has been -removed. It has been replaced by a new variable GENERATED_HEADER_FILES. - -The class headers were not generated, this commit moves them directly to -HEADER_FILES. - -[1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 - -Signed-off-by: Ga?l PORTAY -[Converted to git formated patch] -Signed-off-by: Peter Seiderer ---- - include/QtWebKit/headers.pri | 3 +-- - include/QtWebKitWidgets/headers.pri | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/include/QtWebKit/headers.pri b/include/QtWebKit/headers.pri -index 6775f3a6..3a5c14cd 100644 ---- a/include/QtWebKit/headers.pri -+++ b/include/QtWebKit/headers.pri -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit --SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion -+SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = -diff --git a/include/QtWebKitWidgets/headers.pri b/include/QtWebKitWidgets/headers.pri -index 9d386e29..2b8b095c 100644 ---- a/include/QtWebKitWidgets/headers.pri -+++ b/include/QtWebKitWidgets/headers.pri -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets --SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion -+SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch new file mode 100644 index 0000000000..48605e4fe4 --- /dev/null +++ b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch @@ -0,0 +1,31 @@ +From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 7 Apr 2021 13:38:09 +0200 +Subject: [PATCH] Remove invalid g_object declarations to fix build with glib + >= 2.68 + +g_object_ref_sink is defined as a macro meanwhile and so the build fails. +Just remove the declarations, glib.h is included anyway. +Signed-off-by: James Hilliard +[Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058] +--- + Source/WTF/wtf/glib/GRefPtr.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h +index 06133d82cb35..d9a1d2f145f5 100644 +--- a/Source/WTF/wtf/glib/GRefPtr.h ++++ b/Source/WTF/wtf/glib/GRefPtr.h +@@ -29,9 +29,6 @@ + #include + #include + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt }; +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch b/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch deleted file mode 100644 index 1a99eb7f84..0000000000 --- a/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 2 Feb 2020 10:51:00 +0100 -Subject: [PATCH] Fix ICU related compile failures. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The ICU macro U16_NEXT() needs a trailing semicolon. - -Fixes: - - platform/graphics/SegmentedFontData.cpp:65:9: error: expected ?;? before ?if? - dom/Document.cpp:3850:5: error: expected ?;? before ?if? - dom/Document.cpp:3855:9: error: expected ?;? before ?if? - dom/Document.cpp:3918:9: error: expected ?;? before ?if? - -Signed-off-by: Peter Seiderer ---- - Source/WebCore/dom/Document.cpp | 6 +++--- - Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index af63b141..26f7312b 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S - const UChar* s = qualifiedName.characters(); - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(s, i, length, c) -+ U16_NEXT(s, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; -diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp -index efb20a8c..99b3e86c 100644 ---- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp -+++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp -@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length) - { - UChar32 c; - for (int i = 0; i < length; ) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!containsCharacter(c)) - return false; - } --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch b/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch deleted file mode 100644 index d9b94697da..0000000000 --- a/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c408484e3a442ecf99d3cc61402f20c45c894b7c Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 3 Feb 2020 21:19:57 +0100 -Subject: [PATCH] configure: remove legacy reference to qtConfig(mirclient) - -The optio mirclient is removed since Qt-5.14.x (see [1]) -Fixes: - - Project ERROR: Could not find feature mirclient. - -[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405 - -Signed-off-by: Peter Seiderer ---- - Tools/qmake/mkspecs/features/configure.prf | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf -index 23d99040..783f6752 100644 ---- a/Tools/qmake/mkspecs/features/configure.prf -+++ b/Tools/qmake/mkspecs/features/configure.prf -@@ -130,9 +130,6 @@ defineTest(finalizeConfigure) { - addReasonForSkippingBuild("Build not supported on Android.") - } - QT_FOR_CONFIG += gui-private -- production_build:qtConfig(mirclient) { -- addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") -- } - !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) { - addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") - } --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch deleted file mode 100644 index 9deb2d8c63..0000000000 --- a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8959e226fac7f73b9a40e202610bd5e12334561b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 15 Sep 2020 19:11:18 +0200 -Subject: [PATCH] let bison generate the header directly, to fix build with - bison 3.7 - -Do the same as the patch taken from [1] for the bison call in -Source/WebCore/DerivedSources.pri to fix file generation -for bison 3.7. - -Signed-off-by: Peter Seiderer ---- - Source/WebCore/DerivedSources.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri -index 57a6b0f7..e9f52614 100644 ---- a/Source/WebCore/DerivedSources.pri -+++ b/Source/WebCore/DerivedSources.pri -@@ -987,7 +987,7 @@ GENERATORS += pluginsresources - # GENERATOR 11: XPATH grammar - xpathbison.output = ${QMAKE_FILE_BASE}.cpp - xpathbison.input = XPATHBISON --xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h -+xpathbison.commands = bison --defines=${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.h -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.cpp - xpathbison.depends = ${QMAKE_FILE_NAME} - GENERATORS += xpathbison - --- -2.28.0 - diff --git a/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch deleted file mode 100644 index 7d941a5683..0000000000 --- a/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 37ee268d9d07a8dad02c1d8db3bf96e0b30df10b Mon Sep 17 00:00:00 2001 -From: Henri Roosen -Date: Thu, 18 Mar 2021 11:53:57 +0100 -Subject: [PATCH] Fix ICU related compile failures from capital bool defines - -See ICU-21267 - -Signed-off-by: Henri Roosen ---- - .../platform/text/TextBreakIteratorICU.cpp | 16 ++++++++-------- - Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -index b4046ac9..832890a2 100644 ---- a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -+++ b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -@@ -214,12 +214,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < numeric_limits::max()); - text->chunkOffset = offset < numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -228,12 +228,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < numeric_limits::max()); - text->chunkOffset = offset < numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } -@@ -243,7 +243,7 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = textNativeLength(text); - UBool isAccessible; - if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -263,7 +263,7 @@ static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward) - ASSERT(newContext == PriorContext); - textLatin1SwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static const struct UTextFuncs textLatin1Funcs = { -@@ -364,7 +364,7 @@ static void textUTF16SwitchToPriorContext(UText* text, int64_t nativeIndex, int6 - static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = textNativeLength(text); - UBool isAccessible; - if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -384,7 +384,7 @@ static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward) - ASSERT(newContext == PriorContext); - textUTF16SwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static const struct UTextFuncs textUTF16Funcs = { -diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp -index 86d4ea17..da152edd 100644 ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -269,7 +269,7 @@ void TextCodecICU::createICUConverter() const - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) --- -2.20.1 - diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 82e38dff52..b7beb2b252 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -9,10 +9,24 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_BINFMT_FLAT # icu # assumes a FPU is available on MIPS depends on !BR2_MIPS_SOFT_FLOAT + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_ICU + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION + select BR2_PACKAGE_QT5SENSORS + select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB help diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 312d58272a..d7c8bd6c8a 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,5 +1,5 @@ -# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz +# Locally calculated +sha256 9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6 qtwebkit-5.212.0-alpha4.tar.xz # Hashes for license files: sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index dd99661be0..3af1918a46 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBKIT_VERSION = 5.9.1 -QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_VERSION = 5.212.0-alpha4 +QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION) +QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ - host-bison host-flex host-gperf host-python host-ruby \ - leveldb sqlite + host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ + gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ + qt5sensors qt5webchannel sqlite webp woff2 QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 @@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender +QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_DEPENDENCIES += qt5declarative endif -# QtWebkit's build system uses python, but only supports python2. We work -# around this by forcing python2 early in the PATH, via a python->python2 -# symlink. -QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -define QT5WEBKIT_PYTHON2_SYMLINK - mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python -endef -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK +QT5WEBKIT_CONF_OPTS += \ + -DPORT=Qt \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DUSE_LIBHYPHEN=OFF -QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb - -define QT5WEBKIT_INSTALL_TARGET_EXTRAS - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ -endef - -QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS - -$(eval $(qmake-package)) +$(eval $(cmake-package)) -- 2.25.1 From yann.morin.1998 at free.fr Tue Jan 4 08:27:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 09:27:36 +0100 Subject: [Buildroot] [git commit] package/pkg-waf.mk: enable verbose compile Message-ID: <20220104082233.C52DA82A54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0db062f4b6a7e249602e540204e7e428fc5ff2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Honour the buildroot verbose flag ('V=1') for the waf compile step by adding '-v' to the build command. Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index a593476a69..d546b4a817 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -20,6 +20,8 @@ # ################################################################################ +WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) + ################################################################################ # inner-waf-package -- defines how the configuration, compilation and # installation of a waf package should be done, implements a few hooks @@ -74,7 +76,7 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ + build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef endif From yann.morin.1998 at free.fr Tue Jan 4 08:29:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 09:29:41 +0100 Subject: [Buildroot] [PATCH v1] package/pkg-waf.mk: enable verbose compile In-Reply-To: <20220103215619.4580-1-ps.report@gmx.net> References: <20220103215619.4580-1-ps.report@gmx.net> Message-ID: <20220104082941.GQ69135@scaer> Peter, All, On 2022-01-03 22:56 +0100, Peter Seiderer spake thusly: > Honour the buildroot verbose flag ('V=1') for the waf compile step by > adding '-v' to the build command. > > Signed-off-by: Peter Seiderer > --- > package/pkg-waf.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index a593476a69..0239862ac6 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -20,6 +20,8 @@ > # > ################################################################################ > > +WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) s/\t=/ =/ Applied to master, thanks. Regards, Yann E. MORIN. > ################################################################################ > # inner-waf-package -- defines how the configuration, compilation and > # installation of a waf package should be done, implements a few hooks > @@ -74,7 +76,7 @@ ifndef $(2)_BUILD_CMDS > define $(2)_BUILD_CMDS > cd $$($$(PKG)_SRCDIR) && \ > $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ > - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ > + build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \ > $$($(2)_WAF_OPTS) > endef > endif > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 4 08:30:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 09:30:11 +0100 Subject: [Buildroot] [PATCH 1/3] package/qemu: reorder enable/disable options alphabetically In-Reply-To: <20220103210048.7879-1-romain.naour@gmail.com> References: <20220103210048.7879-1-romain.naour@gmail.com> Message-ID: <20220104083011.GR69135@scaer> Romain, All, On 2022-01-03 22:00 +0100, Romain Naour spake thusly: > Signed-off-by: Romain Naour Series of three patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/qemu/qemu.mk | 44 ++++++++++++++++++++++---------------------- > 1 file changed, 22 insertions(+), 22 deletions(-) > > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 97f9f885a1..43450a6649 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -187,39 +187,39 @@ define QEMU_CONFIGURE_CMDS > --audio-drv-list= \ > --meson=$(HOST_DIR)/bin/meson \ > --ninja=$(HOST_DIR)/bin/ninja \ > - --enable-kvm \ > - --enable-attr \ > - --enable-vhost-net \ > --disable-bpf \ > + --disable-brlapi \ > --disable-bsd-user \ > + --disable-cap-ng \ > + --disable-capstone \ > --disable-containers \ > - --disable-xen \ > - --disable-virtfs \ > - --disable-brlapi \ > - --disable-curses \ > --disable-curl \ > - --disable-vde \ > - --disable-linux-aio \ > - --disable-linux-io-uring \ > - --disable-cap-ng \ > + --disable-curses \ > --disable-docs \ > - --disable-rbd \ > - --disable-libiscsi \ > - --disable-strip \ > - --disable-sparse \ > - --disable-mpath \ > - --disable-sanitizers \ > --disable-hvf \ > - --disable-whpx \ > + --disable-libiscsi \ > + --disable-libxml2 \ > + --disable-linux-aio \ > + --disable-linux-io-uring \ > --disable-malloc-trim \ > --disable-membarrier \ > - --disable-vhost-crypto \ > - --disable-libxml2 \ > - --disable-capstone \ > - --with-git-submodules=ignore \ > + --disable-mpath \ > --disable-opengl \ > + --disable-rbd \ > + --disable-sanitizers \ > + --disable-sparse \ > + --disable-strip \ > + --disable-vde \ > + --disable-vhost-crypto \ > --disable-vhost-user-blk-server \ > + --disable-virtfs \ > --disable-virtiofsd \ > + --disable-whpx \ > + --disable-xen \ > + --enable-attr \ > + --enable-kvm \ > + --enable-vhost-net \ > + --with-git-submodules=ignore \ > $(QEMU_OPTS) > endef > > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From clg at kaod.org Tue Jan 4 09:05:09 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Tue, 4 Jan 2022 10:05:09 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <1b60df77-a795-f328-6651-4e3b5c4b0757@gmail.com> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> <1b60df77-a795-f328-6651-4e3b5c4b0757@gmail.com> Message-ID: <20b2bd43-9fe6-f174-e437-7595ea5864d8@kaod.org> Hello, On 1/3/22 23:43, Romain Naour wrote: > Le 03/01/2022 ? 23:20, C?dric Le Goater a ?crit?: >> Hello, >>> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >>> >>> Create a test branch named: qemu-6.2.0-defconfigs-qemu >>> >>> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >>> Buildroot defconfis and "qemu" is a pattern. >>> >>> See: >>> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >>> >>> >>> "pushing a branch called "-defconfigs-" which will test all >>> defconfigs whose name start with the pattern." >> >> That looks simple enough. Something is going wrong though : >> >> ? https://gitlab.com/legoater/buildroot/-/jobs/1937752353 >> >> Am I missing something ? > > humm, maybe there is weakness in the script when foo is "qemu-6.2.0" > ^ > Try again with something else like qemu_6.2.0-defconfigs-qemu Yes. That was it. Thanks, C. From guillaume.bressaix at gmail.com Tue Jan 4 12:38:59 2022 From: guillaume.bressaix at gmail.com (guillaume.bressaix at gmail.com) Date: Tue, 4 Jan 2022 13:38:59 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/python-pybind: fix upgrade to 2.6.1 In-Reply-To: References: Message-ID: <20220104123901.23929-1-guillaume.bressaix@gmail.com> From: "Guillaume W. Bres" Fixes http://autobuild.buildroot.net/results/b89f1de64b308dffa73675f1f31ccb0b7be5a10d http://autobuild.buildroot.net/results/d0287b7f64f206b0f074908c5780a3632e0cb799 http://autobuild.buildroot.net/results/27efb545a5a719a5581c8f746d3a3555ff4216ce http://autobuild.buildroot.net/results/d2f0a0ad8f6c7178517df109e7d885dac9134c3a http://autobuild.buildroot.net/results/b57e9a3279260dae4a590f9421238fcabb2f7cab http://autobuild.buildroot.net/results/515e6f2fc6b5780260d98d6bb52b541ce4bf1afe http://autobuild.buildroot.net/results/d89c4ecc81222d4f80c951da2232d2e393fa1c69 Signed-off-by: Guillaume W. Bres --- setup.py now calls 'cmake', as is, internally, with DESTDIR=$(@D) to provide some setup.py build requirements. The autobuild failures were actually of different kinds: (1) 'cmake' too old causes an early crash as it is unable to parse their CMakeList.txt (host machine dependent) (2) $(@D)/pybind missing because cmake call was faulty (happened all the time) The provided patch allows us to fully control the hidden cmake context: * which 'cmake' is actually called is important, as most of the time we end up using /usr/bin/cmake. By adding BR2_CMAKE_DEPENDENCY we make sure (1) never happens and (2) is always solved with a complete cmake context control. We could convert python-pybind to a cmake package but it involves so much patching and tweaking (mostly for the python install), that it is now clear that keeping the package as is, is the best option. I also fixed the previous package declaration / handling: * this is a header only lib, so installing to target does not make sense, and installing to staging is mandatory * most of the time, this package will be used at compile time, on host, so having the host-package option is mandatory. This package is then used to customize the host/usr/python capacity, with C++ macro bindings. This patch serie provides an example of use, that does exactly that, and works for both python2 and python3 (refer to following patch) --- ...-py-improve-cmake-context-definition.patch | 48 +++++++++++++++++++ package/python-pybind/python-pybind.mk | 47 ++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 package/python-pybind/0001-setup-py-improve-cmake-context-definition.patch diff --git a/package/python-pybind/0001-setup-py-improve-cmake-context-definition.patch b/package/python-pybind/0001-setup-py-improve-cmake-context-definition.patch new file mode 100644 index 0000000000..0952d44464 --- /dev/null +++ b/package/python-pybind/0001-setup-py-improve-cmake-context-definition.patch @@ -0,0 +1,48 @@ +From aeee170bc90d89973268f286c8bfa12afd8f330c Mon Sep 17 00:00:00 2001 +From: "Guillaume W. Bres" +Date: Thu, 9 Dec 2021 20:30:08 +0100 +Subject: [PATCH] setup.py: improve cmake context definition + +Use two env. variables to define which cmake +is internally called and pass a toolchain file +for complex cross-compilation contexts. + +Signed-off-by: Guillaume W. Bres +--- + setup.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3a03279..2dff721 100644 +--- a/setup.py ++++ b/setup.py +@@ -23,6 +23,8 @@ VERSION_REGEX = re.compile( + # files, and the sys.prefix files (CMake and headers). + + global_sdist = os.environ.get("PYBIND11_GLOBAL_SDIST", False) ++global_cmake = os.environ.get("PYBIND11_CMAKE", "unknown") ++global_cmake_toolchain_file = os.environ.get("PYBIND11_CMAKE_TOOLCHAIN_FILE", "unknown") + + setup_py = "tools/setup_global.py.in" if global_sdist else "tools/setup_main.py.in" + extra_cmd = 'cmdclass["sdist"] = SDist\n' +@@ -101,14 +103,15 @@ def remove_output(*sources): + with remove_output("pybind11/include", "pybind11/share"): + # Generate the files if they are not present. + with TemporaryDirectory() as tmpdir: +- cmd = ["cmake", "-S", ".", "-B", tmpdir] + [ ++ cmd = [global_cmake, "-S", ".", "-B", tmpdir] + [ + "-DCMAKE_INSTALL_PREFIX=pybind11", ++ "-DCMAKE_TOOLCHAIN_FILE={:s}".format(global_cmake_toolchain_file), + "-DBUILD_TESTING=OFF", + "-DPYBIND11_NOPYTHON=ON", + ] + cmake_opts = dict(cwd=DIR, stdout=sys.stdout, stderr=sys.stderr) + subprocess.check_call(cmd, **cmake_opts) +- subprocess.check_call(["cmake", "--install", tmpdir], **cmake_opts) ++ subprocess.check_call([global_cmake, "--install", tmpdir], **cmake_opts) + + txt = get_and_replace(setup_py, version=version, extra_cmd=extra_cmd) + code = compile(txt, setup_py, "exec") +-- +1.8.3.1 + diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index a6a1bdb976..442ed3328f 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -10,4 +10,51 @@ PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE PYTHON_PYBIND_SETUP_TYPE = setuptools +# Only installs header files +PYTHON_PYBIND_INSTALL_TARGET = NO +PYTHON_PYBIND_INSTALL_STAGING = YES + +# their cmakelist.txt file needs a recent cmake +PYTHON_PYBIND_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) +HOST_PYTHON_PYBIND_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) + +# every single setup.py interaction calls 'cmake' (as is) intrinsicly. +# we deliver a patch to customize setup.py to define the cmake context +# using the following variables +PYTHON_PYBIND_MAKE_ENV = $(MAKE_ENV) +PYTHON_PYBIND_SETUPTOOLS_ENV = $(PKG_PYTHON_SETUPTOOLS_ENV) +PYTHON_PYBIND_SETUPTOOLS_ENV += PYBIND11_CMAKE=$(BR2_CMAKE) +PYTHON_PYBIND_SETUPTOOLS_ENV += PYBIND11_CMAKE_TOOLCHAIN_FILE=$(HOST_DIR)/share/buildroot/toolchainfile.cmake + +HOST_PYTHON_PYBIND_MAKE_ENV = $(MAKE_ENV) +HOST_PYTHON_PYBIND_SETUPTOOLS_ENV = $(PKG_PYTHON_SETUPTOOLS_ENV) +HOST_PYTHON_PYBIND_SETUPTOOLS_ENV += PYBIND11_CMAKE=$(BR2_CMAKE) +HOST_PYTHON_PYBIND_SETUPTOOLS_ENV += PYBIND11_CMAKE_TOOLCHAIN_FILE=$(HOST_DIR)/share/buildroot/toolchainfile.cmake + +define PYTHON_PYBIND_BUILD_CMDS + cd $(@D); \ + $(PYTHON_PYBIND_SETUPTOOLS_ENV) $(HOST_DIR)/usr/bin/python setup.py build +endef + +define HOST_PYTHON_PYBIND_BUILD_CMDS + cd $(@D); \ + $(PYTHON_PYBIND_SETUPTOOLS_ENV) $(HOST_DIR)/usr/bin/python setup.py build +endef + +# define installation destinations properly +define PYTHON_PYBIND_INSTALL_STAGING_CMDS + cd $(@D); \ + $(PYTHON_PYBIND_SETUPTOOLS_ENV) \ + PREFIX=$(STAGING_DIR)/usr \ + $(HOST_DIR)/bin/python setup.py install +endef + +define HOST_PYTHON_PYBIND_INSTALL_CMDS + cd $(@D); \ + $(PYTHON_PYBIND_SETUPTOOLS_ENV) \ + PREFIX=$(HOST_DIR)/usr \ + $(HOST_DIR)/bin/python setup.py install +endef + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.30.2 From guillaume.bressaix at gmail.com Tue Jan 4 12:39:00 2022 From: guillaume.bressaix at gmail.com (guillaume.bressaix at gmail.com) Date: Tue, 4 Jan 2022 13:39:00 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/python-pybind: bump to version 2.8.1 In-Reply-To: <20220104123901.23929-1-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> Message-ID: <20220104123901.23929-2-guillaume.bressaix@gmail.com> From: "Guillaume W. Bres" Signed-off-by: Guillaume W. Bres --- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index a68ac846e2..e1d86a4494 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a python-pybind-2.6.1.tar.gz +sha256 f1bcc07caa568eb312411dde5308b1e250bd0e1bc020fae855bf9f43209940cc python-pybind-2.8.1.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index 442ed3328f..cf6a642922 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.6.1 +PYTHON_PYBIND_VERSION = 2.8.1 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE -- 2.30.2 From guillaume.bressaix at gmail.com Tue Jan 4 12:39:01 2022 From: guillaume.bressaix at gmail.com (guillaume.bressaix at gmail.com) Date: Tue, 4 Jan 2022 13:39:01 +0100 Subject: [Buildroot] [PATCH v2 3/3] support/testing: add test for python-pybind In-Reply-To: <20220104123901.23929-1-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> Message-ID: <20220104123901.23929-3-guillaume.bressaix@gmail.com> From: "Guillaume W. Bres" python-pybind is a header only library, most of the time used as a host-package, to customize the host/usr/python interpreter capacity (at build time) with C++ based features. Signed-off-by: Guillaume W. Bres --- This test case enhances the /host/usr/python interpreter with a C++ macro. The test delivers a C++ macro contained in its br-external/example.cpp. We compile it against the host context. We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively contained in the host-python system path (import is easy). The macro is an integer adder, written in C++ that we can now call in host-python. The test infrastructure should actually be declared "host-generic-package" instead of "generic-package", to be consistent with Buildroot infrastructure. But I am not able to get this to actually do anything, if I declare this package as a host-generic and "Config.in.host" instead of "Config.in". To me, this is not too important * TestPythonPybind allows testing for both Py2 and Py3 like it is done in many other packages * TestPythonPybind does not inherit from TestPythonPackageBase as usually done (1) because I need the br2-external feature to ship the example.cpp containing the custom macro (2) because TestPythonPackageBase always involves the emulator, which we do not want in our context * Although TestPythonPybind does have a TestPythonBase.config base at the same time, as it is most convenient to have a valid python context * TestPythonPybind uses subprocess, as similarly done in 'core' on 'infra' test cases, because we do not involve the emulator * TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3 * TestPythonPybind tests a custom module attribute, written in C++, used in Python 2/3 --- DEVELOPERS | 3 ++ .../br2-external/python-pybind/Config.in | 1 + .../br2-external/python-pybind/external.desc | 1 + .../br2-external/python-pybind/external.mk | 1 + .../package/python-pybind-example/Config.in | 5 ++ .../package/python-pybind-example/example.cpp | 16 +++++++ .../python-pybind-example.mk | 47 ++++++++++++++++++ .../tests/package/sample_python_pybind.py | 4 ++ .../tests/package/test_python_pybind.py | 48 +++++++++++++++++++ 9 files changed, 126 insertions(+) create mode 100644 support/testing/tests/package/br2-external/python-pybind/Config.in create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.desc create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.mk create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk create mode 100644 support/testing/tests/package/sample_python_pybind.py create mode 100644 support/testing/tests/package/test_python_pybind.py diff --git a/DEVELOPERS b/DEVELOPERS index 21e4f2a84c..130ac3db73 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1120,6 +1120,9 @@ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ F: package/reaver/ +F: support/testing/tests/package/br2-external/python-pybind +F: support/testing/tests/package/sample_python_pybind.py +F: support/testing/tests/package/test_python_pybind.py N: Guo Ren F: arch/Config.in.csky diff --git a/support/testing/tests/package/br2-external/python-pybind/Config.in b/support/testing/tests/package/br2-external/python-pybind/Config.in new file mode 100644 index 0000000000..70c77157b3 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in" diff --git a/support/testing/tests/package/br2-external/python-pybind/external.desc b/support/testing/tests/package/br2-external/python-pybind/external.desc new file mode 100644 index 0000000000..eef5e0f5a0 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/external.desc @@ -0,0 +1 @@ +name: PYTHON_PYBIND diff --git a/support/testing/tests/package/br2-external/python-pybind/external.mk b/support/testing/tests/package/br2-external/python-pybind/external.mk new file mode 100644 index 0000000000..3501f3135e --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in new file mode 100644 index 0000000000..773d021a53 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE + bool "python-pybind-example" + depends on BR2_PACKAGE_PYTHON_PYBIND + help + This test creates a cpp macro later used on target in python diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp new file mode 100644 index 0000000000..f2eea8e48d --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp @@ -0,0 +1,16 @@ +#include +namespace py = pybind11; + +int add (int i, int j) { + return i + j; +} + +PYBIND11_MODULE (example, m) { + // optional module description + m.doc() = "pybind11 example plugin"; + // test a module method + m.def("add", &add, "example::add adds two integer numbers"); + // test a module attribute + py::object hello = py::cast("Hello World"); + m.attr("says") = hello; +} diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk new file mode 100644 index 0000000000..85dd09d93f --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# python-pybind-example +# +################################################################################ + +# this builds a C++ macro "add(a,b)" +# that we expose to host-python with a custom install +# and that the python test script will later use +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind + +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS) +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR) +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3 +else +PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR) +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2 +endif + +# retrieve pybind11 include paths +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \ + $(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes) + +# .so to be installed must have exact suffix +# otherwise import() in python will not work +HOST_LIB_BINARY_SUFFIX = \ + $(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix) + +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS + $(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D) + cd $(@D); \ + $(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \ + example.cpp -o example$(HOST_LIB_BINARY_SUFFIX) +endef + +# installs into host/python sys.path +# so the new macro is naturally known +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \ + $(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX) +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py new file mode 100644 index 0000000000..605c0bab15 --- /dev/null +++ b/support/testing/tests/package/sample_python_pybind.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import example +print(example.add(1, 2)) +print(example.says) diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py new file mode 100644 index 0000000000..7a68d6512a --- /dev/null +++ b/support/testing/tests/package/test_python_pybind.py @@ -0,0 +1,48 @@ +import os +import infra +import subprocess +from tests.package.test_python import TestPythonPackageBase + +class TestPythonPybind (infra.basetest.BRTest): + config = TestPythonPackageBase.config # python minimal requirements + sample_script = "tests/package/sample_python_pybind.py" + # ship examples macro & installs it to host + br2_external = [infra.filepath("tests/package/br2-external/python-pybind")] + +class TestPythonPy2Pybind (TestPythonPybind): + __test__ = True + config = TestPythonPybind.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_PYBIND=y + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y + """ + + def test_run(self): + host_interpreter = os.path.join(self.builddir,"host","usr","bin","python") + # test new c++->py macro exposed to host interpreter + cmd = [host_interpreter, infra.filepath(self.sample_script)] + output = subprocess.check_output(cmd) + result = int(output.splitlines()[0]) + attribute = output.splitlines()[1].decode("utf-8") + self.assertEqual(result,3) # 2+1 using '+' macro from cpp + self.assertEqual(attribute,"Hello World") # macro special attribute + +class TestPythonPy3Pybind (TestPythonPybind): + __test__ = True + config = TestPythonPybind.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYBIND=y + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y + """ + + def test_run(self): + host_interpreter = os.path.join(self.builddir,"host","usr","bin","python") + # test new c++->py macro exposed to host interpreter + cmd = [host_interpreter, infra.filepath(self.sample_script)] + output = subprocess.check_output(cmd) + result = int(output.splitlines()[0]) + attribute = output.splitlines()[1].decode("utf-8") + self.assertEqual(result,3) # 2+1 using '+' macro from cpp + self.assertEqual(attribute,"Hello World") # macro special attribute -- 2.30.2 From buildroot at heine.tech Tue Jan 4 13:34:03 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Tue, 4 Jan 2022 14:34:03 +0100 Subject: [Buildroot] [PATCH] package/json-for-modern-cpp: bump version to 3.10.5 Message-ID: <20220104133416.5185-1-buildroot@heine.tech> * Update License hash due to updated year Fixes: - Make sure C++17 filesystem conversions are only used if the compiler supports it. Signed-off-by: Michael Nosthoff --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 4 ++-- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index eb14d2fd6d..a193fa6d49 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3 json-3.10.4.tar.gz -sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT +sha256 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz +sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 428473db5a..fd13ce1fd1 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.10.4 +JSON_FOR_MODERN_CPP_VERSION = 3.10.5 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT -- 2.25.1 From arnout at mind.be Tue Jan 4 16:44:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:44:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: new package In-Reply-To: <20220101135737.956301-1-fontaine.fabrice@gmail.com> References: <20220101135737.956301-1-fontaine.fabrice@gmail.com> Message-ID: <0949e63d-a8b0-d70c-af17-06cecbbe87f1@mind.be> On 01/01/2022 14:57, Fabrice Fontaine wrote: > ksmbd kernel server userspace utilities. > > https://github.com/cifsd-team/ksmbd-tools > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/ksmbd-tools/Config.in | 15 +++++++++++++++ > package/ksmbd-tools/ksmbd-tools.hash | 3 +++ > package/ksmbd-tools/ksmbd-tools.mk | 20 ++++++++++++++++++++ > 5 files changed, 40 insertions(+) > create mode 100644 package/ksmbd-tools/Config.in > create mode 100644 package/ksmbd-tools/ksmbd-tools.hash > create mode 100644 package/ksmbd-tools/ksmbd-tools.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 98ff2372cc..cf0e6fe0fc 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -870,6 +870,7 @@ F: package/hiredis/ > F: package/i2pd/ > F: package/igd2-for-linux/ > F: package/json-c/ > +F: package/ksmbd-tools/ > F: package/lcms2/ > F: package/lftp/ > F: package/libcap-ng/ > diff --git a/package/Config.in b/package/Config.in > index 4185675e4c..1e25ccd964 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2235,6 +2235,7 @@ endif > source "package/keepalived/Config.in" > source "package/kismet/Config.in" > source "package/knock/Config.in" > + source "package/ksmbd-tools/Config.in" > source "package/leafnode2/Config.in" > source "package/lft/Config.in" > source "package/lftp/Config.in" > diff --git a/package/ksmbd-tools/Config.in b/package/ksmbd-tools/Config.in > new file mode 100644 > index 0000000000..ce1850e016 > --- /dev/null > +++ b/package/ksmbd-tools/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_KSMBD_TOOLS > + bool "ksmbd-tools" > + depends on BR2_USE_MMU # fork() > + depends on BR2_USE_WCHAR # libglib2 > + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libnl > + select BR2_PACKAGE_LIBGLIB2 > + select BR2_PACKAGE_LIBNL > + help > + ksmbd kernel server userspace utilities. > + > + https://github.com/cifsd-team/ksmbd-tools > + > +comment "ksmbd-tools needs a toolchain w/ wchar, threads" > + depends on BR2_USE_MMU > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash > new file mode 100644 > index 0000000000..ad507bfdb2 > --- /dev/null > +++ b/package/ksmbd-tools/ksmbd-tools.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz > +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING > diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk > new file mode 100644 > index 0000000000..b3ffc3e768 > --- /dev/null > +++ b/package/ksmbd-tools/ksmbd-tools.mk > @@ -0,0 +1,20 @@ > +################################################################################ > +# > +# ksmbd-tools > +# > +################################################################################ > + > +KSMBD_TOOLS_VERSION = 3.4.3 > +KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) > +KSMBD_TOOLS_LICENSE = GPL-2.0+ > +KSMBD_TOOLS_LICENSE_FILES = COPYING > +KSMBD_TOOLS_DEPENDENCIES = host-pkgconf libglib2 libnl > + > +ifeq ($(BR2_PACKAGE_LIBKRB5),y) > +KSMBD_TOOLS_CONF_OPTS += --enable-krb5 > +KSMBD_TOOLS_DEPENDENCIES += libkrb5 > +else > +KSMBD_TOOLS_CONF_OPTS += --disable-krb5 > +endif > + > +$(eval $(autotools-package)) > From arnout at mind.be Tue Jan 4 16:44:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:44:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectd: add ipmi support In-Reply-To: <20220101140324.1001998-1-fontaine.fabrice@gmail.com> References: <20220101140324.1001998-1-fontaine.fabrice@gmail.com> Message-ID: On 01/01/2022 15:03, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/collectd/Config.in | 11 +++++++++++ > package/collectd/collectd.mk | 4 +++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/package/collectd/Config.in b/package/collectd/Config.in > index 05fb577345..5e5dff6fe1 100644 > --- a/package/collectd/Config.in > +++ b/package/collectd/Config.in > @@ -312,6 +312,17 @@ config BR2_PACKAGE_COLLECTD_IPC > IPC counters: semaphores used, number of allocated segments > in shared memory and more. > > +config BR2_PACKAGE_COLLECTD_IPMI > + bool "ipmi" > + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > + select BR2_PACKAGE_OPENIPMI > + help > + Read hardware sensors from servers using the Intelligent > + Platform Management Interface (IPMI). > + > +comment "ipmi needs a toolchain w/ NPTL" > + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL > + > config BR2_PACKAGE_COLLECTD_IPTABLES > bool "iptables" > select BR2_PACKAGE_IPTABLES > diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk > index d01058471d..9d6f630fe3 100644 > --- a/package/collectd/collectd.mk > +++ b/package/collectd/collectd.mk > @@ -18,7 +18,7 @@ COLLECTD_SELINUX_MODULES = apache collectd > # These require unmet dependencies, are fringe, pointless or deprecated > COLLECTD_PLUGINS_DISABLE = \ > apple_sensors aquaero ascent barometer dpdkstat email \ > - gmond hddtemp intel_rdt ipmi java lpar \ > + gmond hddtemp intel_rdt java lpar \ > madwifi mbmon mic multimeter netapp notify_desktop numa \ > oracle perl pf pinba powerdns python routeros \ > rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ > @@ -88,6 +88,7 @@ COLLECTD_CONF_OPTS += \ > $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ > $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ > $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ > + $(if $(BR2_PACKAGE_COLLECTD_IPMI),--enable-ipmi,--disable-ipmi) \ > $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ > $(if $(BR2_PACKAGE_COLLECTD_IPVS),--enable-ipvs,--disable-ipvs) \ > $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ > @@ -174,6 +175,7 @@ COLLECTD_DEPENDENCIES = \ > $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \ > $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ > $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ > + $(if $(BR2_PACKAGE_COLLECTD_IPMI),openipmi) \ > $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ > $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ > $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ > From arnout at mind.be Tue Jan 4 16:45:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:45:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: fix avahi build In-Reply-To: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> References: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> Message-ID: <29663017-0e83-de96-8fd6-ac2752b503fc@mind.be> On 01/01/2022 15:26, Fabrice Fontaine wrote: > Fix the following build failure raised since commit > 27908c6eab768d0b9fd3444a929b3f1b1510da71: > > ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency "avahi-client" not found, tried pkgconfig > > Fixes: > - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 > > Signed-off-by: Fabrice Fontaine > --- > package/pipewire/pipewire.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk > index efda3ad695..7043745cc1 100644 > --- a/package/pipewire/pipewire.mk > +++ b/package/pipewire/pipewire.mk > @@ -82,7 +82,8 @@ else > PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled > endif > > -ifeq ($(BR2_PACKAGE_AVAHI),y) > +# avahi support needs avahi-client, which needs avahi-daemon and dbus > +ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) BR2_PACKAGE_AVAHI is redundant with BR2_PACKAGE_AVAHI_DAEMON, but I kept it anyway since it's IMHO a little clearer that way. Applied to master, thanks. Regards, Arnout > PIPEWIRE_CONF_OPTS += -Davahi=enabled > PIPEWIRE_DEPENDENCIES += avahi > else > From arnout at mind.be Tue Jan 4 16:46:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:46:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/libapparmor: fix build with python 3.10 In-Reply-To: <20220101144840.1387059-1-fontaine.fabrice@gmail.com> References: <20220101144840.1387059-1-fontaine.fabrice@gmail.com> Message-ID: On 01/01/2022 15:48, Fabrice Fontaine wrote: > Fix the following build failure raised since bump of python3 to version > 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > configure: error: cannot import Python module "distutils". > Please check your Python installation. The error was: > :1: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives > > Fixes: > - http://autobuild.buildroot.org/results//f3e400cbb5b00fbd7f0cb421c993e46b64ec5ac5 > > Signed-off-by: Fabrice Fontaine > --- > ...deprecated-distutils-with-setuptools.patch | 244 ++++++++++++++++++ > package/libapparmor/libapparmor.mk | 2 +- > 2 files changed, 245 insertions(+), 1 deletion(-) > create mode 100644 package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > > diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > new file mode 100644 > index 0000000000..5aed31d0b5 > --- /dev/null > +++ b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > @@ -0,0 +1,244 @@ > +From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 > +From: Georgia Garcia > +Date: Wed, 10 Nov 2021 19:50:35 +0000 > +Subject: [PATCH] replace deprecated distutils with setuptools > + > +Adds python3 setuptools as a build dependency for libapparmor > + > +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 > +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 > +Signed-off-by: Georgia Garcia > +Acked-by: Christian Boltz > + > +[Retrieved (and updated to remove changes on .gitlab-ci.yml and > +README.md) from: > +https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] > +Signed-off-by: Fabrice Fontaine > +--- > + .gitignore | 3 ++ > + .gitlab-ci.yml | 2 +- > + libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- Sounds like this requires AUTORECONF = YES ... which was already set because it wasn't removed when the version was bumped and the patches removed. So I updated the comment and the commit message, and applied to master, thanks. Regards, Arnout [snip] From arnout at mind.be Tue Jan 4 16:17:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:17:30 +0100 Subject: [Buildroot] [git commit] package/collectd: add ipmi support Message-ID: <20220104164044.8E57B82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53ba8d3c0e1f7d4023ff37f6aea838043466c59e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/collectd/Config.in | 11 +++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 05fb577345..5e5dff6fe1 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -312,6 +312,17 @@ config BR2_PACKAGE_COLLECTD_IPC IPC counters: semaphores used, number of allocated segments in shared memory and more. +config BR2_PACKAGE_COLLECTD_IPMI + bool "ipmi" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_OPENIPMI + help + Read hardware sensors from servers using the Intelligent + Platform Management Interface (IPMI). + +comment "ipmi needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + config BR2_PACKAGE_COLLECTD_IPTABLES bool "iptables" select BR2_PACKAGE_IPTABLES diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index d01058471d..9d6f630fe3 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -18,7 +18,7 @@ COLLECTD_SELINUX_MODULES = apache collectd # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dpdkstat email \ - gmond hddtemp intel_rdt ipmi java lpar \ + gmond hddtemp intel_rdt java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ @@ -88,6 +88,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ + $(if $(BR2_PACKAGE_COLLECTD_IPMI),--enable-ipmi,--disable-ipmi) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ $(if $(BR2_PACKAGE_COLLECTD_IPVS),--enable-ipvs,--disable-ipvs) \ $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ @@ -174,6 +175,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ + $(if $(BR2_PACKAGE_COLLECTD_IPMI),openipmi) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ From arnout at mind.be Tue Jan 4 16:17:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:17:33 +0100 Subject: [Buildroot] [git commit] package/pipewire: fix avahi build Message-ID: <20220104164044.97B2582E21@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5131f6f28e384eb9dca1b11f571536e38d3ee9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit 27908c6eab768d0b9fd3444a929b3f1b1510da71: ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency "avahi-client" not found, tried pkgconfig Fixes: - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pipewire/pipewire.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index efda3ad695..7043745cc1 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -82,7 +82,8 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# avahi support needs avahi-client, which needs avahi-daemon and dbus +ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else From arnout at mind.be Tue Jan 4 16:17:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:17:27 +0100 Subject: [Buildroot] [git commit] package/ksmbd-tools: new package Message-ID: <20220104164044.8561782BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6be9913a7eeead7cdac804afc127791ba4b0e69e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ksmbd kernel server userspace utilities. https://github.com/cifsd-team/ksmbd-tools Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ksmbd-tools/Config.in | 15 +++++++++++++++ package/ksmbd-tools/ksmbd-tools.hash | 3 +++ package/ksmbd-tools/ksmbd-tools.mk | 20 ++++++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 21e4f2a84c..37c792816a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -870,6 +870,7 @@ F: package/hiredis/ F: package/i2pd/ F: package/igd2-for-linux/ F: package/json-c/ +F: package/ksmbd-tools/ F: package/lcms2/ F: package/lftp/ F: package/libcap-ng/ diff --git a/package/Config.in b/package/Config.in index d3d0717535..7148639735 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2231,6 +2231,7 @@ endif source "package/keepalived/Config.in" source "package/kismet/Config.in" source "package/knock/Config.in" + source "package/ksmbd-tools/Config.in" source "package/leafnode2/Config.in" source "package/lft/Config.in" source "package/lftp/Config.in" diff --git a/package/ksmbd-tools/Config.in b/package/ksmbd-tools/Config.in new file mode 100644 index 0000000000..ce1850e016 --- /dev/null +++ b/package/ksmbd-tools/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_KSMBD_TOOLS + bool "ksmbd-tools" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libnl + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBNL + help + ksmbd kernel server userspace utilities. + + https://github.com/cifsd-team/ksmbd-tools + +comment "ksmbd-tools needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash new file mode 100644 index 0000000000..ad507bfdb2 --- /dev/null +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk new file mode 100644 index 0000000000..b3ffc3e768 --- /dev/null +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# ksmbd-tools +# +################################################################################ + +KSMBD_TOOLS_VERSION = 3.4.3 +KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) +KSMBD_TOOLS_LICENSE = GPL-2.0+ +KSMBD_TOOLS_LICENSE_FILES = COPYING +KSMBD_TOOLS_DEPENDENCIES = host-pkgconf libglib2 libnl + +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +KSMBD_TOOLS_CONF_OPTS += --enable-krb5 +KSMBD_TOOLS_DEPENDENCIES += libkrb5 +else +KSMBD_TOOLS_CONF_OPTS += --disable-krb5 +endif + +$(eval $(autotools-package)) From arnout at mind.be Tue Jan 4 16:41:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:41:24 +0100 Subject: [Buildroot] [git commit] package/libapparmor: fix build with python 3.10 Message-ID: <20220104164044.A29D682BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40a09b263486b95f000547860da451b32ad19174 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: configure: error: cannot import Python module "distutils". Please check your Python installation. The error was: :1: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives Fixes: - http://autobuild.buildroot.org/results//f3e400cbb5b00fbd7f0cb421c993e46b64ec5ac5 _AUTORECONF was already set to YES even though it was no longer needed since the patches were removed with the bump to 3.0.1 in 2cacda2591. So just update the comment. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...lace-deprecated-distutils-with-setuptools.patch | 244 +++++++++++++++++++++ package/libapparmor/libapparmor.mk | 4 +- 2 files changed, 246 insertions(+), 2 deletions(-) diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch new file mode 100644 index 0000000000..5aed31d0b5 --- /dev/null +++ b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch @@ -0,0 +1,244 @@ +From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 +From: Georgia Garcia +Date: Wed, 10 Nov 2021 19:50:35 +0000 +Subject: [PATCH] replace deprecated distutils with setuptools + +Adds python3 setuptools as a build dependency for libapparmor + +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 +Signed-off-by: Georgia Garcia +Acked-by: Christian Boltz + +[Retrieved (and updated to remove changes on .gitlab-ci.yml and +README.md) from: +https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 3 ++ + .gitlab-ci.yml | 2 +- + libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- + libraries/libapparmor/swig/python/Makefile.am | 2 +- + libraries/libapparmor/swig/python/setup.py.in | 2 +- + .../libapparmor/swig/python/test/Makefile.am | 2 +- + profiles/Makefile | 2 +- + utils/Makefile | 1 + + utils/python-tools-setup.py | 6 ++-- + utils/test/Makefile | 2 +- + utils/test/README.md | 2 +- + 11 files changed, 32 insertions(+), 28 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 78a06fdf9..4782a351a 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c + libraries/libapparmor/swig/perl/libapparmor_wrap.o + libraries/libapparmor/swig/perl/pm_to_blib + libraries/libapparmor/swig/python/LibAppArmor.py ++libraries/libapparmor/swig/python/LibAppArmor.egg-info/ + libraries/libapparmor/swig/python/build/ + libraries/libapparmor/swig/python/libapparmor_wrap.c + libraries/libapparmor/swig/python/Makefile +@@ -204,6 +205,8 @@ utils/*.tmp + utils/po/*.mo + utils/apparmor/*.pyc + utils/apparmor/rule/*.pyc ++utils/apparmor.egg-info/ ++utils/build/ + utils/htmlcov/ + utils/test/common_test.pyc + utils/test/.coverage +diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 +index 1da29d873..f21f70ce7 100644 +--- a/libraries/libapparmor/m4/ac_python_devel.m4 ++++ b/libraries/libapparmor/m4/ac_python_devel.m4 +@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. + fi + + # +- # Check if you have distutils, else fail ++ # Check if you have setuptools, else fail + # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ AC_MSG_CHECKING([for the setuptools Python package]) ++ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` ++ if test -z "$ac_setuptools_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ AC_MSG_ERROR([cannot import Python module "setuptools". + Please check your Python installation. The error was: +-$ac_distutils_result]) ++$ac_setuptools_result]) + PYTHON_VERSION="" + fi + +@@ -88,8 +88,8 @@ $ac_distutils_result]) + PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` + fi + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` ++ python_path=`$PYTHON -c "import sys; import sysconfig;\ ++sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` + if test -n "${python_path}"; then + python_path="-I$python_path" + fi +@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` + if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) +- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` ++ py_version=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` + if test "$py_version" == "[None]"; then + if test -n "$PYTHON_VERSION"; then + py_version=$PYTHON_VERSION +@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` + fi + fi + +- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ ++ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ + "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` + fi + AC_MSG_RESULT([$PYTHON_LDFLAGS]) +@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO + # + AC_MSG_CHECKING([for Python site-packages path]) + if test -z "$PYTHON_SITE_PKG"; then +- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` ++ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` + fi + AC_MSG_RESULT([$PYTHON_SITE_PKG]) + AC_SUBST([PYTHON_SITE_PKG]) +@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` + PYTHON_EXTRA_LIBS='' + fi + if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) +@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( + PYTHON_EXTRA_LDFLAGS='' + fi + if test -z "$PYTHON_EXTRA_LDFLAGS"; then +- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) +diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am +index 04edff003..bf05fe0fc 100644 +--- a/libraries/libapparmor/swig/python/Makefile.am ++++ b/libraries/libapparmor/swig/python/Makefile.am +@@ -21,7 +21,7 @@ install-exec-local: + + clean-local: + if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi +- rm -rf build ++ rm -rf build LibAppArmor.egg-info + if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi + + endif +diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in +index 32abd46b2..b23e40746 100644 +--- a/libraries/libapparmor/swig/python/setup.py.in ++++ b/libraries/libapparmor/swig/python/setup.py.in +@@ -1,4 +1,4 @@ +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import string + + setup(name = 'LibAppArmor', +diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am +index 7287819c9..9dccfdef6 100644 +--- a/libraries/libapparmor/swig/python/test/Makefile.am ++++ b/libraries/libapparmor/swig/python/test/Makefile.am +@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status + CLEANFILES = test_python.py + + # bah, how brittle is this? +-PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' ++PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' + + TESTS = test_python.py + TESTS_ENVIRONMENT = \ +diff --git a/profiles/Makefile b/profiles/Makefile +index c471e58e8..0b7f2655d 100644 +--- a/profiles/Makefile ++++ b/profiles/Makefile +@@ -41,7 +41,7 @@ ifdef USE_SYSTEM + LOGPROF?=aa-logprof + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) +diff --git a/utils/Makefile b/utils/Makefile +index 1f08f259a..91a15107b 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -72,6 +72,7 @@ clean: pod_clean + rm -rf staging/ build/ + rm -f apparmor/*.pyc apparmor/rule/*.pyc + rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ ++ rm -rf apparmor.egg-info/ + + # ${CAPABILITIES} is defined in common/Make.rules + .PHONY: check_severity_db +diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py +index 30ce0cb05..2cbde8fc1 100644 +--- a/utils/python-tools-setup.py ++++ b/utils/python-tools-setup.py +@@ -20,14 +20,14 @@ + # Note: --version=... must be the last argument to this script + # + +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import os + import shutil + import sys + + class Install(_install, object): +- '''Override distutils to install the files where we want them.''' ++ '''Override setuptools to install the files where we want them.''' + def run(self): + # Now byte-compile everything + super(Install, self).run() +diff --git a/utils/test/Makefile b/utils/test/Makefile +index 90354aa50..9126bdd71 100644 +--- a/utils/test/Makefile ++++ b/utils/test/Makefile +@@ -32,7 +32,7 @@ ifdef USE_SYSTEM + PARSER= + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) +-- +GitLab + diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 0d5822a56d..f3d744e3e7 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -16,7 +16,7 @@ LIBAPPARMOR_DEPENDENCIES = host-bison host-flex host-pkgconf LIBAPPARMOR_SUBDIR = libraries/libapparmor LIBAPPARMOR_INSTALL_STAGING = YES -# Patches 0001 and 0002 touch Makefile.am and an m4 file +# Patch 0001 touches Makefile.am and m4 files LIBAPPARMOR_AUTORECONF = YES # Most AppArmor tools will want to link to the static lib. @@ -28,7 +28,7 @@ LIBAPPARMOR_CONF_OPTS = \ --disable-man-pages ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIBAPPARMOR_DEPENDENCIES += host-python3 host-swig python3 +LIBAPPARMOR_DEPENDENCIES += host-python3 host-python3-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ From arnout at mind.be Tue Jan 4 16:51:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:51:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/fail2ban: fix build with python 3.10 In-Reply-To: <20220101145632.1393642-1-fontaine.fabrice@gmail.com> References: <20220101145632.1393642-1-fontaine.fabrice@gmail.com> Message-ID: <9b639725-a9f6-6887-f43d-2dd080586df0@mind.be> On 01/01/2022 15:56, Fabrice Fontaine wrote: > Fix the following build failure raised since bump of python3 to version > 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > error in fail2ban setup command: use_2to3 is invalid. > > Fixes: > - http://autobuild.buildroot.org/results/6a5e91f9912f869b2b07b10b576457b432066393 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...with-error-in-fail2ban-setup-command.patch | 67 +++++++++++++++++++ > 1 file changed, 67 insertions(+) > create mode 100644 package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch > > diff --git a/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch > new file mode 100644 > index 0000000000..8cb097dc38 > --- /dev/null > +++ b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch > @@ -0,0 +1,67 @@ > +From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001 > +From: sebres > +Date: Sun, 19 Sep 2021 18:49:18 +0200 > +Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup > + command: use_2to3 is invalid (setuptools 58+) > + > +[Retrieved from: > +https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497] > +Signed-off-by: Fabrice Fontaine > +--- > + setup.py | 16 +--------------- > + 1 file changed, 1 insertion(+), 15 deletions(-) > + > +diff --git a/setup.py b/setup.py > +index f4c2550f6..98413273c 100755 > +--- a/setup.py > ++++ b/setup.py > +@@ -48,7 +48,7 @@ > + from glob import glob > + > + from fail2ban.setup import updatePyExec > +- > ++from fail2ban.version import version > + > + source_dir = os.path.realpath(os.path.dirname( > + # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): > +@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): > + # Wrapper to specify fail2ban own options: > + class install_command_f2b(install): > + user_options = install.user_options + [ > +- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), > + ('without-tests', None, 'without tests files installation'), > + ] > + def initialize_options(self): > +- self.disable_2to3 = None > + self.without_tests = not with_tests > + install.initialize_options(self) > + def finalize_options(self): > +- global _2to3 > +- ## in the test cases 2to3 should be already done (fail2ban-2to3): > +- if self.disable_2to3: > +- _2to3 = False > +- if _2to3: > +- cmdclass = self.distribution.cmdclass > +- cmdclass['build_py'] = build_py_2to3 > +- cmdclass['build_scripts'] = build_scripts_2to3 > + if self.without_tests: > + self.distribution.scripts.remove('bin/fail2ban-testcases') > + > +@@ -178,7 +168,6 @@ def run(self): > + if setuptools: > + setup_extra = { > + 'test_suite': "fail2ban.tests.utils.gatherTests", > +- 'use_2to3': True, > + } > + else: > + setup_extra = {} > +@@ -202,9 +191,6 @@ def run(self): > + ('/usr/share/doc/fail2ban', doc_files) > + ) > + > +-# Get version number, avoiding importing fail2ban. > +-# This is due to tests not functioning for python3 as 2to3 takes place later > +-exec(open(join("fail2ban", "version.py")).read()) > + > + setup( > + name = "fail2ban", > From arnout at mind.be Tue Jan 4 16:43:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:43:10 +0100 Subject: [Buildroot] [git commit] package/fail2ban: fix build with python 3.10 Message-ID: <20220104164505.E897B82AB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee16da9654f83682accea5873732303f355e0c0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: error in fail2ban setup command: use_2to3 is invalid. Fixes: - http://autobuild.buildroot.org/results/6a5e91f9912f869b2b07b10b576457b432066393 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ails-with-error-in-fail2ban-setup-command.patch | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch new file mode 100644 index 0000000000..8cb097dc38 --- /dev/null +++ b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch @@ -0,0 +1,67 @@ +From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001 +From: sebres +Date: Sun, 19 Sep 2021 18:49:18 +0200 +Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup + command: use_2to3 is invalid (setuptools 58+) + +[Retrieved from: +https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497] +Signed-off-by: Fabrice Fontaine +--- + setup.py | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/setup.py b/setup.py +index f4c2550f6..98413273c 100755 +--- a/setup.py ++++ b/setup.py +@@ -48,7 +48,7 @@ + from glob import glob + + from fail2ban.setup import updatePyExec +- ++from fail2ban.version import version + + source_dir = os.path.realpath(os.path.dirname( + # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): +@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): + # Wrapper to specify fail2ban own options: + class install_command_f2b(install): + user_options = install.user_options + [ +- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), + ('without-tests', None, 'without tests files installation'), + ] + def initialize_options(self): +- self.disable_2to3 = None + self.without_tests = not with_tests + install.initialize_options(self) + def finalize_options(self): +- global _2to3 +- ## in the test cases 2to3 should be already done (fail2ban-2to3): +- if self.disable_2to3: +- _2to3 = False +- if _2to3: +- cmdclass = self.distribution.cmdclass +- cmdclass['build_py'] = build_py_2to3 +- cmdclass['build_scripts'] = build_scripts_2to3 + if self.without_tests: + self.distribution.scripts.remove('bin/fail2ban-testcases') + +@@ -178,7 +168,6 @@ def run(self): + if setuptools: + setup_extra = { + 'test_suite': "fail2ban.tests.utils.gatherTests", +- 'use_2to3': True, + } + else: + setup_extra = {} +@@ -202,9 +191,6 @@ def run(self): + ('/usr/share/doc/fail2ban', doc_files) + ) + +-# Get version number, avoiding importing fail2ban. +-# This is due to tests not functioning for python3 as 2to3 takes place later +-exec(open(join("fail2ban", "version.py")).read()) + + setup( + name = "fail2ban", From arnout at mind.be Tue Jan 4 16:52:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtorrent-rasterbar: fix build with gcc 9 In-Reply-To: <20220101151218.1620080-1-fontaine.fabrice@gmail.com> References: <20220101151218.1620080-1-fontaine.fabrice@gmail.com> Message-ID: <9b3f060d-9671-e475-40f7-dbf46e5d480c@mind.be> On 01/01/2022 16:12, Fabrice Fontaine wrote: > Drop -std=c++11 to avoid the following build failure with gcc 9 raised > since bump to version 1.2.15 in commit > 2cecfe94f889165f3a5169598ed7e0388941a6cd and > https://github.com/arvidn/libtorrent/commit/b7e02cc700d884f87a18a3bc59f95a66a5cb0209: > > configure: error: *** A compiler with support for C++14 language features is required. > > Fixes: > - http://autobuild.buildroot.org/results/905a51bee38e85a48aa170c15494f2798aa6afea > > Signed-off-by: Fabrice Fontaine > --- > package/libtorrent-rasterbar/libtorrent-rasterbar.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk > index 914e0cbca3..cde010a4f7 100644 > --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk > +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk > @@ -16,7 +16,7 @@ LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES > LIBTORRENT_RASTERBAR_CONF_OPTS = \ > --with-boost-libdir=$(STAGING_DIR)/usr/lib \ > --disable-invariant-checks > -LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 If this was needed before, it sounds like we might now need -std=c++14 (for GCC versions that default to an earlier standard, i.e. anything below 6 I think). Have you tested with GCC 4.9? Regards, Arnout > +LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) > > # Internal error, aborting at dwarf2cfi.c:2802 in connect_traces > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 > From arnout at mind.be Tue Jan 4 17:11:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:11:28 +0100 Subject: [Buildroot] [PATCH] Config.in.legacy: fix removed bootlin riscv64 toolchains Message-ID: <20220104171128.956397-1-arnout@mind.be> commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 bootlin toolchains by RISC-V LP64D. However, Config.in.legacy was added for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE, which never existed (the stable version was only added after the switch to LP64D). Conversely, BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE, which was removed, was not mentioned in Config.in.legacy. Correct the symbol name and its comment in Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5994d94487..e5349e58ac 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,8 +153,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE The RISC-V 64-bit LP64 Bootlin toolchains have been removed, in favor of RISC-V 64-bit LP64D toolchains. -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE - bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE + bool "Bootlin riscv64 musl bleeding-edge toolchain removed" select BR2_LEGACY help The RISC-V 64-bit LP64 Bootlin toolchains have been removed, -- 2.31.1 From arnout at mind.be Tue Jan 4 17:13:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:13:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/tvheadend: disable execinfo In-Reply-To: <20220101155950.1784485-1-fontaine.fabrice@gmail.com> References: <20220101155950.1784485-1-fontaine.fabrice@gmail.com> Message-ID: On 01/01/2022 16:59, Fabrice Fontaine wrote: > Disable execinfo to avoid the following build failure if libexecinfo is > built before tvheadend since the addition of the package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/build.linux/src/tvhlog.o: in function `tvhlog_backtrace_printf': > /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/src/tvhlog.c:522: undefined reference to `backtrace' I was thinking, why not simply link with libexecinfo when needed? But since the patch was anyway accepted upstream and I don't care about execinfo in tvheadend: Applied to master, thanks. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/ee9ad2c999b622097fe0f1522e7e32184722e548 > > Signed-off-by: Fabrice Fontaine > --- > .../0002-configure-add-execinfo-option.patch | 55 +++++++++++++++++++ > package/tvheadend/tvheadend.mk | 1 + > 2 files changed, 56 insertions(+) > create mode 100644 package/tvheadend/0002-configure-add-execinfo-option.patch > > diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch > new file mode 100644 > index 0000000000..c55d127d58 > --- /dev/null > +++ b/package/tvheadend/0002-configure-add-execinfo-option.patch > @@ -0,0 +1,55 @@ > +From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 1 Jan 2022 16:53:29 +0100 > +Subject: [PATCH] configure: add execinfo option > + > +Add execinfo option to allow the user to disable the feature even if > +execinfo.h is found on the system > + > +Signed-off-by: Fabrice Fontaine > +[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] > +--- > + configure | 17 +++++++++++++++-- > + 1 file changed, 15 insertions(+), 2 deletions(-) > + > +diff --git a/configure b/configure > +index 4dad024c4..c087502bf 100755 > +--- a/configure > ++++ b/configure > +@@ -75,6 +75,7 @@ OPTIONS=( > + "ddci:yes" > + "cclang_threadsan:no" > + "gperftools:no" > ++ "execinfo:auto" > + ) > + > + # > +@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then > + # If we don't have libunwind then fallback to execinfo. > + if ! enabled libunwind > + then > +- check_cc_header execinfo > ++ if enabled_or_auto execinfo; then > ++ if check_cc_header execinfo; then > ++ enable execinfo > ++ else > ++ die "execinfo.h not found (use --disable-execinfo)" > ++ fi > ++ fi > + fi > + > + else > +- check_cc_header execinfo > ++ if enabled_or_auto execinfo; then > ++ if check_cc_header execinfo; then > ++ enable execinfo > ++ else > ++ die "execinfo.h not found (use --disable-execinfo)" > ++ fi > ++ fi > + fi > + check_cc_option mmx > + check_cc_option sse2 > +-- > +2.33.0 > + > diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk > index 4e84e496bf..58ebdcb054 100644 > --- a/package/tvheadend/tvheadend.mk > +++ b/package/tvheadend/tvheadend.mk > @@ -161,6 +161,7 @@ define TVHEADEND_CONFIGURE_CMDS > --enable-dvbscan \ > --enable-bundle \ > --enable-pngquant \ > + --disable-execinfo \ > --disable-ffmpeg_static \ > --disable-hdhomerun_static \ > $(TVHEADEND_CONF_OPTS) \ > From arnout at mind.be Tue Jan 4 17:13:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:13:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.23 In-Reply-To: <20220101170938.1866790-1-fontaine.fabrice@gmail.com> References: <20220101170938.1866790-1-fontaine.fabrice@gmail.com> Message-ID: <4cf4ec18-f0eb-e14b-927a-1512157c795b@mind.be> On 01/01/2022 18:09, Fabrice Fontaine wrote: > Drop patch (already in version) > > https://www.spinics.net/lists/kexec/msg27693.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...move-duplicate-definition-of-ramdisk.patch | 32 ------------------- > package/kexec/kexec.hash | 2 +- > package/kexec/kexec.mk | 2 +- > 3 files changed, 2 insertions(+), 34 deletions(-) > delete mode 100644 package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch > > diff --git a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch b/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch > deleted file mode 100644 > index 173323bff8..0000000000 > --- a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001 > -From: Petr Tesarik > -Date: Mon, 26 Apr 2021 15:29:51 +0200 > -Subject: kexec-tools: Remove duplicate definition of ramdisk > - > -The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This > -other definition is not needed and breaks build with -fno-common. > - > -Signed-off-by: Petr Tesarik > -Signed-off-by: Simon Horman > -[Retrieved from: > -https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c] > -Signed-off-by: Fabrice Fontaine > ---- > - kexec/arch/ppc/kexec-elf-ppc.c | 1 - > - 1 file changed, 1 deletion(-) > - > -diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c > -index ad43ad1..4a4886e 100644 > ---- a/kexec/arch/ppc/kexec-elf-ppc.c > -+++ b/kexec/arch/ppc/kexec-elf-ppc.c > -@@ -33,7 +33,6 @@ > - static const int probe_debug = 0; > - > - unsigned char reuse_initrd; > --const char *ramdisk; > - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, > - char *); > - > --- > -cgit 1.2.3-1.el7 > - > diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash > index 1cf860d85e..05eb9e3d02 100644 > --- a/package/kexec/kexec.hash > +++ b/package/kexec/kexec.hash > @@ -1,4 +1,4 @@ > # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc > -sha256 96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 kexec-tools-2.0.22.tar.xz > +sha256 aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b kexec-tools-2.0.23.tar.xz > # locally calculated > sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING > diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk > index 81d35815d8..b3b4e56546 100644 > --- a/package/kexec/kexec.mk > +++ b/package/kexec/kexec.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KEXEC_VERSION = 2.0.22 > +KEXEC_VERSION = 2.0.23 > KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz > KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec > KEXEC_LICENSE = GPL-2.0 > From arnout at mind.be Tue Jan 4 17:13:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:13:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cffi: bump to version 1.15.0 In-Reply-To: <20220101180004.2499189-1-james.hilliard1@gmail.com> References: <20220101180004.2499189-1-james.hilliard1@gmail.com> Message-ID: On 01/01/2022 19:00, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-cffi/python-cffi.hash | 4 ++-- > package/python-cffi/python-cffi.mk | 4 ++-- > package/python3-cffi/python3-cffi.mk | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash > index 8ab672a56f..41565f9a62 100644 > --- a/package/python-cffi/python-cffi.hash > +++ b/package/python-cffi/python-cffi.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/cffi/json > -md5 5c118a18ea897df164dbff67a32876fc cffi-1.14.6.tar.gz > -sha256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd cffi-1.14.6.tar.gz > +md5 f3a3f26cd3335fc597479c9475da0a0b cffi-1.15.0.tar.gz > +sha256 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 cffi-1.15.0.tar.gz > # Locally computed sha256 checksums > sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE > diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk > index 2504cf18f4..b14dce8225 100644 > --- a/package/python-cffi/python-cffi.mk > +++ b/package/python-cffi/python-cffi.mk > @@ -5,9 +5,9 @@ > ################################################################################ > > # Please keep in sync with package/python3-cffi/python3-cffi.mk > -PYTHON_CFFI_VERSION = 1.14.6 > +PYTHON_CFFI_VERSION = 1.15.0 > PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz > -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 > +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a > PYTHON_CFFI_SETUP_TYPE = setuptools > PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi > PYTHON_CFFI_LICENSE = MIT > diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk > index 52ea3b3fbf..2770eda93e 100644 > --- a/package/python3-cffi/python3-cffi.mk > +++ b/package/python3-cffi/python3-cffi.mk > @@ -5,9 +5,9 @@ > ################################################################################ > > # Please keep in sync with package/python-cffi/python-cffi.mk > -PYTHON3_CFFI_VERSION = 1.14.6 > +PYTHON3_CFFI_VERSION = 1.15.0 > PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz > -PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 > +PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a > PYTHON3_CFFI_SETUP_TYPE = setuptools > PYTHON3_CFFI_LICENSE = MIT > PYTHON3_CFFI_LICENSE_FILES = LICENSE > From arnout at mind.be Tue Jan 4 17:13:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:13:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/mdadm: bump to version 4.2 In-Reply-To: <20220101182557.1915942-1-fontaine.fabrice@gmail.com> References: <20220101182557.1915942-1-fontaine.fabrice@gmail.com> Message-ID: <4fd6af9a-376a-4682-05b8-042c3ba41ad5@mind.be> On 01/01/2022 19:25, Fabrice Fontaine wrote: > - Drop first patch and use install-bin target added by > https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=b4a5ad4958cb3ad87c3c5fa993e7572c38596d09 > - Drop second patch (already in version) > - Handle libudev optional dependency through CXFLAGS instead of > overriding CFLAGS as wanted by upstream: > https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=af3396dadfcd3b13480d021b8d3645c6d2420f79 > - Update indentation in hash file (two spaces) > > https://www.spinics.net/lists/raid/msg69218.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-install-targets-for-mdadm-and-mdmon.patch | 32 ----------------- > ...-include-sysmacros.h-unconditionally.patch | 35 ------------------- > package/mdadm/mdadm.hash | 4 +-- > package/mdadm/mdadm.mk | 21 +++++++---- > 4 files changed, 17 insertions(+), 75 deletions(-) > delete mode 100644 package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch > delete mode 100644 package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch > > diff --git a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch b/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch > deleted file mode 100644 > index 15df7557e7..0000000000 > --- a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001 > -From: Christophe Vu-Brugier > -Date: Wed, 6 Mar 2013 16:03:14 +0100 > -Subject: [PATCH] Add install targets for mdadm and mdmon > - > - > -Signed-off-by: Christophe Vu-Brugier > ---- > - Makefile | 6 +++++- > - 1 file changed, 5 insertions(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index 315455b..27d8eeb 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h > - sha1.o : sha1.c sha1.h md5.h > - $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c > - > --install : mdadm mdmon install-man install-udev > -+install : install-mdadm install-mdmon install-man install-udev > -+ > -+install-mdadm : > - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm > -+ > -+install-mdmon : > - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon > - > - install-static : mdadm.static install-man > --- > -1.7.10.4 > - > diff --git a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch b/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch > deleted file mode 100644 > index c8944c8475..0000000000 > --- a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001 > -From: Baruch Siach > -Date: Tue, 6 Aug 2019 16:01:15 +0300 > -Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally > - > -musl libc now also requires sys/sysmacros.h for the major/minor macros. > -All supported libc implementations carry sys/sysmacros.h, including > -diet-libc, klibc, and uclibc-ng. > - > -Cc: Hauke Mehrtens > -Signed-off-by: Baruch Siach > ---- > -Upstream status: https://marc.info/?l=linux-raid&m=156509677018508 > - > - mdadm.h | 2 -- > - 1 file changed, 2 deletions(-) > - > -diff --git a/mdadm.h b/mdadm.h > -index c36d7fdb10f6..d61a9ca82dc1 100644 > ---- a/mdadm.h > -+++ b/mdadm.h > -@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); > - #include > - #include > - #include > --#ifdef __GLIBC__ > - /* Newer glibc requires sys/sysmacros.h directly for makedev() */ > - #include > --#endif > - #ifdef __dietlibc__ > - #include > - /* dietlibc has deprecated random and srandom!! */ > --- > -2.20.1 > - > diff --git a/package/mdadm/mdadm.hash b/package/mdadm/mdadm.hash > index b15cb4e031..b9631a2aaa 100644 > --- a/package/mdadm/mdadm.hash > +++ b/package/mdadm/mdadm.hash > @@ -1,4 +1,4 @@ > # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc > -sha256 ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a mdadm-4.1.tar.xz > +sha256 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d mdadm-4.2.tar.xz > # Locally calculated > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk > index 171782712f..6ee0bb60c9 100644 > --- a/package/mdadm/mdadm.mk > +++ b/package/mdadm/mdadm.mk > @@ -4,14 +4,19 @@ > # > ################################################################################ > > -MDADM_VERSION = 4.1 > +MDADM_VERSION = 4.2 > MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz > MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm > MDADM_LICENSE = GPL-2.0+ > MDADM_LICENSE_FILES = COPYING > > -MDADM_BUILD_OPTS = $(TARGET_CONFIGURE_OPTS) \ > - CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" \ > +MDADM_CXFLAGS = $(TARGET_CFLAGS) > + > +MDADM_BUILD_OPTS = \ > + CC=$(TARGET_CC) \ > + COROSYNC=-DNO_COROSYNC \ > + DLM=-DNO_DLM \ > + CXFLAGS="$(MDADM_CXFLAGS)" \ > CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ > CHECK_RUN_DIR=0 > > @@ -19,14 +24,18 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > MDADM_BUILD_OPTS += USE_PTHREADS= > endif > > +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > +MDADM_DEPENDENCIES += udev > +else > +MDADM_CXFLAGS += -DNO_LIBUDEV > +endif > + > define MDADM_BUILD_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(MDADM_BUILD_OPTS) mdadm mdmon > endef > > define MDADM_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ > - DESTDIR=$(TARGET_DIR) \ > - install-mdadm install-mdmon > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin > endef > > $(eval $(generic-package)) > From arnout at mind.be Tue Jan 4 17:14:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:14:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aioredis: bump to version 2.0.1 In-Reply-To: <20220101195910.406035-1-james.hilliard1@gmail.com> References: <20220101195910.406035-1-james.hilliard1@gmail.com> Message-ID: On 01/01/2022 20:59, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aioredis/python-aioredis.hash | 4 ++-- > package/python-aioredis/python-aioredis.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aioredis/python-aioredis.hash b/package/python-aioredis/python-aioredis.hash > index ca3f64d1e5..29e6361014 100644 > --- a/package/python-aioredis/python-aioredis.hash > +++ b/package/python-aioredis/python-aioredis.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aioredis/json > -md5 343a451df2381b9ea368e12b9075caa5 aioredis-2.0.0.tar.gz > -sha256 3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db aioredis-2.0.0.tar.gz > +md5 8f3547af83ef4b863b18c19f23166a9d aioredis-2.0.1.tar.gz > +sha256 eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e aioredis-2.0.1.tar.gz > # Locally computed sha256 checksums > sha256 183b21f240e41af611c951d01d4f36793d470a82d5fd79efc21f25ae4cf68543 LICENSE > diff --git a/package/python-aioredis/python-aioredis.mk b/package/python-aioredis/python-aioredis.mk > index 21a8a349c5..798dbd0c3c 100644 > --- a/package/python-aioredis/python-aioredis.mk > +++ b/package/python-aioredis/python-aioredis.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOREDIS_VERSION = 2.0.0 > +PYTHON_AIOREDIS_VERSION = 2.0.1 > PYTHON_AIOREDIS_SOURCE = aioredis-$(PYTHON_AIOREDIS_VERSION).tar.gz > -PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/92/60/a3cb5fadc254cc6e709ba14a02531870b02386b8c7bb147bf80a2be93f76 > +PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/2e/cf/9eb144a0b05809ffc5d29045c4b51039000ea275bc1268d0351c9e7dfc06 > PYTHON_AIOREDIS_SETUP_TYPE = setuptools > PYTHON_AIOREDIS_LICENSE = MIT > PYTHON_AIOREDIS_LICENSE_FILES = LICENSE > From arnout at mind.be Tue Jan 4 17:14:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:14:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cbor2: bump to version 5.4.2 In-Reply-To: <20220101213346.408623-1-james.hilliard1@gmail.com> References: <20220101213346.408623-1-james.hilliard1@gmail.com> Message-ID: <37a88641-b1b7-fc77-8f97-83492e9875e3@mind.be> On 01/01/2022 22:33, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-cbor2/python-cbor2.hash | 4 ++-- > package/python-cbor2/python-cbor2.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash > index 879463c2ce..9910e632a2 100644 > --- a/package/python-cbor2/python-cbor2.hash > +++ b/package/python-cbor2/python-cbor2.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/cbor2/json > -md5 87b3ad8a9dd8875fa46c6ec06e3fb0ba cbor2-5.4.1.tar.gz > -sha256 a8bf432f6cb595f50aeb8fed2a4aa3b3f7caa7f135fb57e4378eaa39242feac9 cbor2-5.4.1.tar.gz > +md5 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz > +sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz > # Locally computed sha256 checksums > sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt > diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk > index af42d0344a..4cc09a219f 100644 > --- a/package/python-cbor2/python-cbor2.mk > +++ b/package/python-cbor2/python-cbor2.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_CBOR2_VERSION = 5.4.1 > +PYTHON_CBOR2_VERSION = 5.4.2 > PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz > -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/9e/25/9dd432c051010faea6a702cb85d0b53dc9d5414513866b6a73b3ac954092 > +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa > PYTHON_CBOR2_SETUP_TYPE = setuptools > PYTHON_CBOR2_LICENSE = MIT > PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt > From arnout at mind.be Tue Jan 4 17:15:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:15:36 +0100 Subject: [Buildroot] [PATCH] Makefile: disable 'printvars' and 'show-vars' recipes for Make 4.3 In-Reply-To: <20220101214034.2152144-1-giulio.benetti@benettiengineering.com> References: <20220101214034.2152144-1-giulio.benetti@benettiengineering.com> Message-ID: On 01/01/2022 22:40, Giulio Benetti wrote: > Make 4.3 is buggy and leads to a "Segmentation fault (core dumped)" when > calling 'make printvars' or 'make show-vars', so let's refuse to execute > those recipes if Make 4.3 by adding 'check-make-version' recipe as > depedendency of 'printvars' and 'show-vars' as suggested by Yann E. Morin. > > Signed-off-by: Giulio Benetti Yeah, this has been bothering me for ages... I hope this gets fixed soon. Applied to master, thanks. Regards, Arnout > --- > Makefile | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 0b8c7b2867..ac98b84425 100644 > --- a/Makefile > +++ b/Makefile > @@ -1058,13 +1058,20 @@ ifeq ($(NEED_WRAPPER),y) > $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) > endif > > +.PHONY: check-make-version > +check-make-version: > +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) > + @echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes" > + @exit 1 > +endif > + > # printvars prints all the variables currently defined in our > # Makefiles. Alternatively, if a non-empty VARS variable is passed, > # only the variables matching the make pattern passed in VARS are > # displayed. > # show-vars does the same, but as a JSON dictionnary. > .PHONY: printvars > -printvars: > +printvars: check-make-version > @: > $(foreach V, \ > $(sort $(filter $(VARS),$(.VARIABLES))), \ > @@ -1077,7 +1084,7 @@ printvars: > > .PHONY: show-vars > show-vars: VARS?=% > -show-vars: > +show-vars: check-make-version > @: > $(info $(call clean-json, { \ > $(foreach V, \ > From arnout at mind.be Tue Jan 4 17:16:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:16:49 +0100 Subject: [Buildroot] [PATCH 1/1] support/config-fragments/autobuild: fix riscv64 toolchain configs In-Reply-To: <20220101213948.265173-1-ju.o@free.fr> References: <20220101213948.265173-1-ju.o@free.fr> Message-ID: On 01/01/2022 22:39, Julien Olivain wrote: > commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 > toolchains by RISC-V LP64D. The config symbols > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. > Those changes were not reflected in the autobuild toolchain configs in > support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config > > When testing a package with the command: > > ./utils/test-pkg --all --package somepackage > > bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build > logfile contains: > > [...] > Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config > Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > Actual value: > > Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config > Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y > Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set > > This commit update the autobuild config fragments for RISC-V 64bit > toolchains so they can be used by test-pkg. > > Signed-off-by: Julien Olivain Applied to master, thanks. While reviewing this, I noticed that BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, so I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc Thomas on that, so Thomas consider yourself CCed now :-) Regards, Arnout > --- > .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- > .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > index f6c6fcaa36..433a6e89f7 100644 > --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > @@ -1,5 +1,5 @@ > BR2_riscv=y > -BR2_RISCV_ABI_LP64=y > +BR2_RISCV_ABI_LP64D=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y > +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y > diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config > index 2b6a6e56da..fee1f29f4a 100644 > --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config > +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config > @@ -1,4 +1,4 @@ > BR2_riscv=y > -BR2_RISCV_ABI_LP64=y > +BR2_RISCV_ABI_LP64D=y > BR2_TOOLCHAIN_EXTERNAL=y > -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y > +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y > From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/python-aioredis: bump to version 2.0.1 Message-ID: <20220104171106.2C81A82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ebbfa0c5765c9c51acc21bf1995a01c9063e4c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-aioredis/python-aioredis.hash | 4 ++-- package/python-aioredis/python-aioredis.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioredis/python-aioredis.hash b/package/python-aioredis/python-aioredis.hash index ca3f64d1e5..29e6361014 100644 --- a/package/python-aioredis/python-aioredis.hash +++ b/package/python-aioredis/python-aioredis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioredis/json -md5 343a451df2381b9ea368e12b9075caa5 aioredis-2.0.0.tar.gz -sha256 3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db aioredis-2.0.0.tar.gz +md5 8f3547af83ef4b863b18c19f23166a9d aioredis-2.0.1.tar.gz +sha256 eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e aioredis-2.0.1.tar.gz # Locally computed sha256 checksums sha256 183b21f240e41af611c951d01d4f36793d470a82d5fd79efc21f25ae4cf68543 LICENSE diff --git a/package/python-aioredis/python-aioredis.mk b/package/python-aioredis/python-aioredis.mk index 21a8a349c5..798dbd0c3c 100644 --- a/package/python-aioredis/python-aioredis.mk +++ b/package/python-aioredis/python-aioredis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOREDIS_VERSION = 2.0.0 +PYTHON_AIOREDIS_VERSION = 2.0.1 PYTHON_AIOREDIS_SOURCE = aioredis-$(PYTHON_AIOREDIS_VERSION).tar.gz -PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/92/60/a3cb5fadc254cc6e709ba14a02531870b02386b8c7bb147bf80a2be93f76 +PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/2e/cf/9eb144a0b05809ffc5d29045c4b51039000ea275bc1268d0351c9e7dfc06 PYTHON_AIOREDIS_SETUP_TYPE = setuptools PYTHON_AIOREDIS_LICENSE = MIT PYTHON_AIOREDIS_LICENSE_FILES = LICENSE From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/kexec: bump to version 2.0.23 Message-ID: <20220104171106.0DD4C82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c1c0de0bdb6b2ff618cbebf9e5b8070bf561562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://www.spinics.net/lists/kexec/msg27693.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ls-Remove-duplicate-definition-of-ramdisk.patch | 32 ---------------------- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch b/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch deleted file mode 100644 index 173323bff8..0000000000 --- a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001 -From: Petr Tesarik -Date: Mon, 26 Apr 2021 15:29:51 +0200 -Subject: kexec-tools: Remove duplicate definition of ramdisk - -The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This -other definition is not needed and breaks build with -fno-common. - -Signed-off-by: Petr Tesarik -Signed-off-by: Simon Horman -[Retrieved from: -https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c] -Signed-off-by: Fabrice Fontaine ---- - kexec/arch/ppc/kexec-elf-ppc.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c -index ad43ad1..4a4886e 100644 ---- a/kexec/arch/ppc/kexec-elf-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-ppc.c -@@ -33,7 +33,6 @@ - static const int probe_debug = 0; - - unsigned char reuse_initrd; --const char *ramdisk; - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, - char *); - --- -cgit 1.2.3-1.el7 - diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 1cf860d85e..05eb9e3d02 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 kexec-tools-2.0.22.tar.xz +sha256 aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b kexec-tools-2.0.23.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 81d35815d8..b3b4e56546 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.22 +KEXEC_VERSION = 2.0.23 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/tvheadend: disable execinfo Message-ID: <20220104171106.03EBB82DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee6477095a61a46ad66209f4fd14eaca12b51576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable execinfo to avoid the following build failure if libexecinfo is built before tvheadend since the addition of the package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/build.linux/src/tvhlog.o: in function `tvhlog_backtrace_printf': /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/src/tvhlog.c:522: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/ee9ad2c999b622097fe0f1522e7e32184722e548 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-configure-add-execinfo-option.patch | 55 ++++++++++++++++++++++ package/tvheadend/tvheadend.mk | 1 + 2 files changed, 56 insertions(+) diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch new file mode 100644 index 0000000000..c55d127d58 --- /dev/null +++ b/package/tvheadend/0002-configure-add-execinfo-option.patch @@ -0,0 +1,55 @@ +From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 16:53:29 +0100 +Subject: [PATCH] configure: add execinfo option + +Add execinfo option to allow the user to disable the feature even if +execinfo.h is found on the system + +Signed-off-by: Fabrice Fontaine +[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] +--- + configure | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 4dad024c4..c087502bf 100755 +--- a/configure ++++ b/configure +@@ -75,6 +75,7 @@ OPTIONS=( + "ddci:yes" + "cclang_threadsan:no" + "gperftools:no" ++ "execinfo:auto" + ) + + # +@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then + # If we don't have libunwind then fallback to execinfo. + if ! enabled libunwind + then +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + + else +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + check_cc_option mmx + check_cc_option sse2 +-- +2.33.0 + diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 4e84e496bf..58ebdcb054 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -161,6 +161,7 @@ define TVHEADEND_CONFIGURE_CMDS --enable-dvbscan \ --enable-bundle \ --enable-pngquant \ + --disable-execinfo \ --disable-ffmpeg_static \ --disable-hdhomerun_static \ $(TVHEADEND_CONF_OPTS) \ From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/python{3}-cffi: bump to version 1.15.0 Message-ID: <20220104171106.179A082E21@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1c37ece2842225b1794c80347d52a3c1df3ec08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-cffi/python-cffi.hash | 4 ++-- package/python-cffi/python-cffi.mk | 4 ++-- package/python3-cffi/python3-cffi.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash index 8ab672a56f..41565f9a62 100644 --- a/package/python-cffi/python-cffi.hash +++ b/package/python-cffi/python-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cffi/json -md5 5c118a18ea897df164dbff67a32876fc cffi-1.14.6.tar.gz -sha256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd cffi-1.14.6.tar.gz +md5 f3a3f26cd3335fc597479c9475da0a0b cffi-1.15.0.tar.gz +sha256 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 cffi-1.15.0.tar.gz # Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index 2504cf18f4..b14dce8225 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-cffi/python3-cffi.mk -PYTHON_CFFI_VERSION = 1.14.6 +PYTHON_CFFI_VERSION = 1.15.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk index 52ea3b3fbf..2770eda93e 100644 --- a/package/python3-cffi/python3-cffi.mk +++ b/package/python3-cffi/python3-cffi.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-cffi/python-cffi.mk -PYTHON3_CFFI_VERSION = 1.14.6 +PYTHON3_CFFI_VERSION = 1.15.0 PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz -PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 +PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a PYTHON3_CFFI_SETUP_TYPE = setuptools PYTHON3_CFFI_LICENSE = MIT PYTHON3_CFFI_LICENSE_FILES = LICENSE From arnout at mind.be Tue Jan 4 17:08:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:08:57 +0100 Subject: [Buildroot] [git commit] support/config-fragments/autobuild: fix bootlin-riscv64 configs Message-ID: <20220104171106.45E9382E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c92ef3dd8f6b83c33d8e4fad2e2ac2d2a2d6a39 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 bootlin toolchains by RISC-V LP64D. The config symbols BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. Those changes were not reflected in the autobuild toolchain configs in support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config When testing a package with the command: ./utils/test-pkg --all --package somepackage bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build logfile contains: [...] Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y Actual value: Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set This commit update the autobuild config fragments for RISC-V 64bit toolchains so they can be used by test-pkg. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- support/config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config index f6c6fcaa36..433a6e89f7 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config index 2b6a6e56da..fee1f29f4a 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config @@ -1,4 +1,4 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y From arnout at mind.be Tue Jan 4 16:53:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:53:00 +0100 Subject: [Buildroot] [git commit] Makefile: disable 'printvars' and 'show-vars' recipes for Make 4.3 Message-ID: <20220104171106.3DDBA82DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25cec5ea733251eb27745adb489f268e7e4d5a76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make 4.3 is buggy and leads to a "Segmentation fault (core dumped)" when calling 'make printvars' or 'make show-vars', so let's refuse to execute those recipes if Make 4.3 by adding 'check-make-version' recipe as depedendency of 'printvars' and 'show-vars' as suggested by Yann E. Morin. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0b8c7b2867..ac98b84425 100644 --- a/Makefile +++ b/Makefile @@ -1058,13 +1058,20 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif +.PHONY: check-make-version +check-make-version: +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) + @echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes" + @exit 1 +endif + # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are # displayed. # show-vars does the same, but as a JSON dictionnary. .PHONY: printvars -printvars: +printvars: check-make-version @: $(foreach V, \ $(sort $(filter $(VARS),$(.VARIABLES))), \ @@ -1077,7 +1084,7 @@ printvars: .PHONY: show-vars show-vars: VARS?=% -show-vars: +show-vars: check-make-version @: $(info $(call clean-json, { \ $(foreach V, \ From arnout at mind.be Tue Jan 4 16:53:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:53:00 +0100 Subject: [Buildroot] [git commit] package/python-cbor2: bump to version 5.4.2 Message-ID: <20220104171106.34E9282E21@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63b1ebe94d96951c56bab97eba56b6298cf015ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-cbor2/python-cbor2.hash | 4 ++-- package/python-cbor2/python-cbor2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index 879463c2ce..9910e632a2 100644 --- a/package/python-cbor2/python-cbor2.hash +++ b/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 87b3ad8a9dd8875fa46c6ec06e3fb0ba cbor2-5.4.1.tar.gz -sha256 a8bf432f6cb595f50aeb8fed2a4aa3b3f7caa7f135fb57e4378eaa39242feac9 cbor2-5.4.1.tar.gz +md5 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz +sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz # Locally computed sha256 checksums sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index af42d0344a..4cc09a219f 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.1 +PYTHON_CBOR2_VERSION = 5.4.2 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/9e/25/9dd432c051010faea6a702cb85d0b53dc9d5414513866b6a73b3ac954092 +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/mdadm: bump to version 4.2 Message-ID: <20220104171106.2271582DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b03fc7974536378ba102418451ba7e9801bc6251 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop first patch and use install-bin target added by https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=b4a5ad4958cb3ad87c3c5fa993e7572c38596d09 - Drop second patch (already in version) - Handle libudev optional dependency through CXFLAGS instead of overriding CFLAGS as wanted by upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=af3396dadfcd3b13480d021b8d3645c6d2420f79 - Update indentation in hash file (two spaces) https://www.spinics.net/lists/raid/msg69218.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...1-add-install-targets-for-mdadm-and-mdmon.patch | 32 -------------------- ...adm.h-include-sysmacros.h-unconditionally.patch | 35 ---------------------- package/mdadm/mdadm.hash | 4 +-- package/mdadm/mdadm.mk | 21 +++++++++---- 4 files changed, 17 insertions(+), 75 deletions(-) diff --git a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch b/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch deleted file mode 100644 index 15df7557e7..0000000000 --- a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Wed, 6 Mar 2013 16:03:14 +0100 -Subject: [PATCH] Add install targets for mdadm and mdmon - - -Signed-off-by: Christophe Vu-Brugier ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 315455b..27d8eeb 100644 ---- a/Makefile -+++ b/Makefile -@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h - sha1.o : sha1.c sha1.h md5.h - $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c - --install : mdadm mdmon install-man install-udev -+install : install-mdadm install-mdmon install-man install-udev -+ -+install-mdadm : - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm -+ -+install-mdmon : - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon - - install-static : mdadm.static install-man --- -1.7.10.4 - diff --git a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch b/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch deleted file mode 100644 index c8944c8475..0000000000 --- a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 6 Aug 2019 16:01:15 +0300 -Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally - -musl libc now also requires sys/sysmacros.h for the major/minor macros. -All supported libc implementations carry sys/sysmacros.h, including -diet-libc, klibc, and uclibc-ng. - -Cc: Hauke Mehrtens -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=linux-raid&m=156509677018508 - - mdadm.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/mdadm.h b/mdadm.h -index c36d7fdb10f6..d61a9ca82dc1 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - #include - #include - #include --#ifdef __GLIBC__ - /* Newer glibc requires sys/sysmacros.h directly for makedev() */ - #include --#endif - #ifdef __dietlibc__ - #include - /* dietlibc has deprecated random and srandom!! */ --- -2.20.1 - diff --git a/package/mdadm/mdadm.hash b/package/mdadm/mdadm.hash index b15cb4e031..b9631a2aaa 100644 --- a/package/mdadm/mdadm.hash +++ b/package/mdadm/mdadm.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a mdadm-4.1.tar.xz +sha256 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d mdadm-4.2.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 171782712f..6ee0bb60c9 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -4,14 +4,19 @@ # ################################################################################ -MDADM_VERSION = 4.1 +MDADM_VERSION = 4.2 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING -MDADM_BUILD_OPTS = $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" \ +MDADM_CXFLAGS = $(TARGET_CFLAGS) + +MDADM_BUILD_OPTS = \ + CC=$(TARGET_CC) \ + COROSYNC=-DNO_COROSYNC \ + DLM=-DNO_DLM \ + CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 @@ -19,14 +24,18 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) MDADM_BUILD_OPTS += USE_PTHREADS= endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +MDADM_DEPENDENCIES += udev +else +MDADM_CXFLAGS += -DNO_LIBUDEV +endif + define MDADM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(MDADM_BUILD_OPTS) mdadm mdmon endef define MDADM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) \ - install-mdadm install-mdmon + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin endef $(eval $(generic-package)) From arnout at mind.be Tue Jan 4 17:32:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:32:08 +0100 Subject: [Buildroot] [PATCH 1/1] support/config-fragments/autobuild: fix riscv64 toolchain configs In-Reply-To: References: <20220101213948.265173-1-ju.o@free.fr> Message-ID: <067a8d97-e71c-4036-a1b2-4fcb7d062947@mind.be> On 04/01/2022 18:16, Arnout Vandecappelle wrote: > > > On 01/01/2022 22:39, Julien Olivain wrote: >> commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 >> toolchains by RISC-V LP64D. The config symbols >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. >> Those changes were not reflected in the autobuild toolchain configs in >> support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config >> >> When testing a package with the command: >> >> ???? ./utils/test-pkg --all --package somepackage >> >> bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build >> logfile contains: >> >> ???? [...] >> ???? Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config >> ???? Requested value:? BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y >> ???? Actual value: >> >> ???? Value requested for >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config >> ???? Requested value: >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y >> ???? Actual value:???? # >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set >> >> This commit update the autobuild config fragments for RISC-V 64bit >> toolchains so they can be used by test-pkg. >> >> Signed-off-by: Julien Olivain > > ?Applied to master, thanks. > > ?While reviewing this, I noticed that > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, so > I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc Thomas > on that, so Thomas consider yourself CCed now :-) > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220104171128.956397-1-arnout at mind.be/ ?Regards, ?Arnout > ?Regards, > ?Arnout > > >> --- >> ? .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- >> ? .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- >> ? 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config >> b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config >> index f6c6fcaa36..433a6e89f7 100644 >> --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config >> +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config >> @@ -1,5 +1,5 @@ >> ? BR2_riscv=y >> -BR2_RISCV_ABI_LP64=y >> +BR2_RISCV_ABI_LP64D=y >> ? BR2_TOOLCHAIN_EXTERNAL=y >> ? BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y >> -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y >> +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y >> diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config >> b/support/config-fragments/autobuild/bootlin-riscv64-musl.config >> index 2b6a6e56da..fee1f29f4a 100644 >> --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config >> +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config >> @@ -1,4 +1,4 @@ >> ? BR2_riscv=y >> -BR2_RISCV_ABI_LP64=y >> +BR2_RISCV_ABI_LP64D=y >> ? BR2_TOOLCHAIN_EXTERNAL=y >> -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y >> +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y >> From aduskett at gmail.com Tue Jan 4 17:48:57 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 4 Jan 2022 09:48:57 -0800 Subject: [Buildroot] [PATCH v2 0/1] Fix per-package builds with qt5 submodule packages Message-ID: <20220104174858.2665848-1-aduskett@gmail.com> Based off of Louis-Paul's earlier work[1] and And Yann Morin's feedback to a different patch set[2], this simple fix adds a new pre-configure hook method to pkg-generic.mk which searches for .pc,.cmake, and .pri files for any line that has a PER_PACKAGE_DIR path and replaces it with the appropriate PER_PACKAGE_DIR path for the package being compiled. $(HOST_DIR) is used instead of $(STAGING_DIR) as that covers both host and staging directories in one step. IE: If building qt5svg: buildroot/output/per-package/qt5base -> buildroot/output/per-package/qt5svg Feedback is welcome! Adam 1) https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ 2) https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Adam Duskett (1): package/pkg-generic.mk: fix absolute paths in per-package config files package/pkg-generic.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- changes v1 -> v2 - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host directories in a single step. 2.33.1 From aduskett at gmail.com Tue Jan 4 17:48:58 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 4 Jan 2022 09:48:58 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-generic.mk: fix absolute paths in per-package config files In-Reply-To: <20220104174858.2665848-1-aduskett@gmail.com> References: <20220104174858.2665848-1-aduskett@gmail.com> Message-ID: <20220104174858.2665848-2-aduskett@gmail.com> Some packages (notably qmake packages) generate .cmake, .pc, and .pri files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in those files point outside the per-package sysroot for packages that have rsynced those same files. Add the new pre-configure hook "FIXUP_CONFIG_FILES_ABSOLUTE_PATHS" in package/pkg-generic.mk which searches for .cmake, .pc, and .pri files in a given per-package host and staging directory and replaces the old $(PER_PACKAGE_DIR) directory with the correct directory for the given package. This simple fix allows qt5 submodule packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- changes v1 -> v2 - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host directories in a single step. package/pkg-generic.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5626af1d87..5a2b4ccaf8 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -103,6 +103,21 @@ define fixup-libtool-files endef endif +# When per-package is enabled, packages may generate files with absolute paths +# that point to the given sysroot. However, after the rsync step for another +# package that uses those files, per-package isolation is broken because the +# hard-coded paths point to directories outside the per-package sysroot. +# As a pre-configure step, sed all .cmake, .pc, and .pri files in a given +# package sysroot containing the word "per-package" and replace the line with +# the appropriate per-package directory. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_CONFIG_FILES_ABSOLUTE_PATHS + $(Q)find $(HOST_DIR)/ -name "*.pc" -o -name "*.cmake" -o -name "*.pri" \ + | xargs --no-run-if-empty \ + $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(NAME)/:g" +endef +endif + # Make sure python _sysconfigdata*.py files only reference the current # per-package directory. # @@ -837,6 +852,7 @@ $(2)_EXTRACT_CMDS ?= \ # pre/post-steps hooks $(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_PRE_CONFIGURE_HOOKS += FIXUP_CONFIG_FILES_ABSOLUTE_PATHS ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.33.1 From arnout at mind.be Tue Jan 4 17:49:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:49:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/jose: bump to version 11 In-Reply-To: <20220101214034.2000480-1-fontaine.fabrice@gmail.com> References: <20220101214034.2000480-1-fontaine.fabrice@gmail.com> Message-ID: <153def22-4f44-e274-107f-010e68cb1407@mind.be> On 01/01/2022 22:40, Fabrice Fontaine wrote: > - Switch to meson-package (and so drop second patch) > - Update indentation in hash file (two spaces) > > https://github.com/latchset/jose/releases/tag/v11 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...nfigure-fix-build-with-old-compilers.patch | 165 ------------------ > package/jose/jose.hash | 4 +- > package/jose/jose.mk | 8 +- > 3 files changed, 5 insertions(+), 172 deletions(-) > delete mode 100644 package/jose/0002-configure-fix-build-with-old-compilers.patch > > diff --git a/package/jose/0002-configure-fix-build-with-old-compilers.patch b/package/jose/0002-configure-fix-build-with-old-compilers.patch > deleted file mode 100644 > index 0484f38f0d..0000000000 > --- a/package/jose/0002-configure-fix-build-with-old-compilers.patch > +++ /dev/null > @@ -1,165 +0,0 @@ > -From 98e9faa4d39cd5b6aaab882877e19ae394ba3810 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Mon, 20 Nov 2017 23:10:38 +0100 > -Subject: [PATCH] configure: fix build with old compilers > - > -Old gcc versions (gcc 4.7) do not support all warnings flags currently > -hard-coded by configure.ac. In order to fix this, we import the > -AX_CHECK_COMPILE_FLAG() macro from the autoconf-archive, and use it in > -the configure.ac to only use warning flags when the compiler supports > -them. > - > -Submitted-upstream: https://github.com/latchset/jose/pull/51 > -Signed-off-by: Thomas Petazzoni > ---- > - configure.ac | 46 +++++++++++++++------------- > - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ > - 3 files changed, 105 insertions(+), 22 deletions(-) > - create mode 100644 m4/ax_check_compile_flag.m4 > - > -diff --git a/configure.ac b/configure.ac > -index cf8c9a6..6fe4ded 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -1,5 +1,6 @@ > - AC_PREREQ(2.62) > - AC_INIT(jose, 10) > -+AC_CONFIG_MACRO_DIRS([m4]) > - AC_CANONICAL_SYSTEM > - AC_PROG_CC_C99 > - > -@@ -18,27 +19,30 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.0.2]) > - AC_OPENMP > - AC_SUBST([OPENMP_CFLAGS]) > - > --JOSE_CFLAGS="\ > ---Wall \ > ---Wextra \ > ---Werror \ > ---Wstrict-aliasing \ > ---Wchar-subscripts \ > ---Wformat-security \ > ---Wmissing-declarations \ > ---Wmissing-prototypes \ > ---Wnested-externs \ > ---Wpointer-arith \ > ---Wshadow \ > ---Wsign-compare \ > ---Wstrict-prototypes \ > ---Wtype-limits \ > ---Wunused-function \ > ---Wno-missing-field-initializers \ > ---Wno-unused-command-line-argument \ > ---Wno-unused-parameter \ > ---Wno-unknown-pragmas \ > --" > -+for flag in \ > -+ -Wall \ > -+ -Wextra \ > -+ -Werror \ > -+ -Wstrict-aliasing \ > -+ -Wchar-subscripts \ > -+ -Wformat-security \ > -+ -Wmissing-declarations \ > -+ -Wmissing-prototypes \ > -+ -Wnested-externs \ > -+ -Wpointer-arith \ > -+ -Wshadow \ > -+ -Wsign-compare \ > -+ -Wstrict-prototypes \ > -+ -Wtype-limits \ > -+ -Wunused-function \ > -+ -Wno-missing-field-initializers \ > -+ -Wno-unused-command-line-argument \ > -+ -Wno-unused-parameter \ > -+ -Wno-unknown-pragmas ; do > -+ AX_CHECK_COMPILE_FLAG([${flag}], > -+ [JOSE_CFLAGS="${JOSE_CFLAGS} ${flag}"]) > -+done > -+ > - AC_SUBST([JOSE_CFLAGS]) > - > - AC_MSG_CHECKING([for linker script support]) > -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 > -new file mode 100644 > -index 0000000..dcabb92 > ---- /dev/null > -+++ b/m4/ax_check_compile_flag.m4 > -@@ -0,0 +1,74 @@ > -+# =========================================================================== > -+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html > -+# =========================================================================== > -+# > -+# SYNOPSIS > -+# > -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) > -+# > -+# DESCRIPTION > -+# > -+# Check whether the given FLAG works with the current language's compiler > -+# or gives an error. (Warnings, however, are ignored) > -+# > -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on > -+# success/failure. > -+# > -+# If EXTRA-FLAGS is defined, it is added to the current language's default > -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with > -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to > -+# force the compiler to issue an error when a bad flag is given. > -+# > -+# INPUT gives an alternative input source to AC_COMPILE_IFELSE. > -+# > -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this > -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. > -+# > -+# LICENSE > -+# > -+# Copyright (c) 2008 Guido U. Draheim > -+# Copyright (c) 2011 Maarten Bosmans > -+# > -+# This program is free software: you can redistribute it and/or modify it > -+# under the terms of the GNU General Public License as published by the > -+# Free Software Foundation, either version 3 of the License, or (at your > -+# option) any later version. > -+# > -+# This program is distributed in the hope that it will be useful, but > -+# WITHOUT ANY WARRANTY; without even the implied warranty of > -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General > -+# Public License for more details. > -+# > -+# You should have received a copy of the GNU General Public License along > -+# with this program. If not, see . > -+# > -+# As a special exception, the respective Autoconf Macro's copyright owner > -+# gives unlimited permission to copy, distribute and modify the configure > -+# scripts that are the output of Autoconf when processing the Macro. You > -+# need not follow the terms of the GNU General Public License when using > -+# or distributing such scripts, even though portions of the text of the > -+# Macro appear in them. The GNU General Public License (GPL) does govern > -+# all other use of the material that constitutes the Autoconf Macro. > -+# > -+# This special exception to the GPL applies to versions of the Autoconf > -+# Macro released by the Autoconf Archive. When you make and distribute a > -+# modified version of the Autoconf Macro, you may extend this special > -+# exception to the GPL to apply to your modified version as well. > -+ > -+#serial 5 > -+ > -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], > -+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF > -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl > -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ > -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS > -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" > -+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], > -+ [AS_VAR_SET(CACHEVAR,[yes])], > -+ [AS_VAR_SET(CACHEVAR,[no])]) > -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) > -+AS_VAR_IF(CACHEVAR,yes, > -+ [m4_default([$2], :)], > -+ [m4_default([$3], :)]) > -+AS_VAR_POPDEF([CACHEVAR])dnl > -+])dnl AX_CHECK_COMPILE_FLAGS > --- > -2.13.6 > - > diff --git a/package/jose/jose.hash b/package/jose/jose.hash > index 376bc0b585..128d26d163 100644 > --- a/package/jose/jose.hash > +++ b/package/jose/jose.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72 jose-10.tar.bz2 > -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING > +sha256 e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 jose-11.tar.xz > +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING > diff --git a/package/jose/jose.mk b/package/jose/jose.mk > index 2758d408da..8a60e20cc6 100644 > --- a/package/jose/jose.mk > +++ b/package/jose/jose.mk > @@ -4,14 +4,12 @@ > # > ################################################################################ > > -JOSE_VERSION = 10 > -JOSE_SOURCE = jose-$(JOSE_VERSION).tar.bz2 > +JOSE_VERSION = 11 > +JOSE_SOURCE = jose-$(JOSE_VERSION).tar.xz > JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) > JOSE_LICENSE = Apache-2.0 > JOSE_LICENSE_FILES = COPYING > -# 0002-configure-fix-build-with-old-compilers.patch > -JOSE_AUTORECONF = YES > JOSE_INSTALL_STAGING = YES > JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl > > -$(eval $(autotools-package)) > +$(eval $(meson-package)) > From arnout at mind.be Tue Jan 4 17:49:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:49:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/mraa: bump to version 2.2.0 In-Reply-To: <20220101215622.2013558-1-fontaine.fabrice@gmail.com> References: <20220101215622.2013558-1-fontaine.fabrice@gmail.com> Message-ID: On 01/01/2022 22:56, Fabrice Fontaine wrote: > - Refresh upstream status of first patch > - Drop second patch (already in version) > > https://github.com/eclipse/mraa/blob/v2.2.0/docs/changelog.md > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...de-Declare-gVERSION-global-as-extern.patch | 7 +- > ...2-CMakeLists.txt-add-BUILDCPP-option.patch | 193 ------------------ > package/mraa/mraa.hash | 2 +- > package/mraa/mraa.mk | 2 +- > 4 files changed, 6 insertions(+), 198 deletions(-) > delete mode 100644 package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch > > diff --git a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch > index b3a1f5a03a..110c020a62 100644 > --- a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch > +++ b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch > @@ -1,13 +1,14 @@ > -From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 > +From aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= > Date: Mon, 13 Apr 2020 20:12:11 +0200 > Subject: [PATCH] include: Declare gVERSION global as 'extern'. > > Fixes build with '-fno-common'. > > +Signed-off-by: Thomas Ingleby > [Retrieved from: > -https://github.com/eclipse/mraa/pull/1012/commits/dbb5961f106ec42cd70689d933674c9c37aedfe1] > -Signed-off-by: Fabrice Fontaine > +https://github.com/eclipse/mraa/commit/aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031] > +Signed-off-by: Fabrice Fontaine > --- > include/version.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch b/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch > deleted file mode 100644 > index fbadfe79ef..0000000000 > --- a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch > +++ /dev/null > @@ -1,193 +0,0 @@ > -From cb88e4dd1fbbb9d24e625dba2768b88ed99da309 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 13 Jun 2020 22:51:37 +0200 > -Subject: [PATCH] CMakeLists.txt: add BUILDCPP option > - > -C++ is a mandatory dependency since version 1.4.0 and > -https://github.com/eclipse/mraa/commit/122cab1f1e53b7c9c7cd82905b962071f9bad9dc > - > -As a result, build on embedded toolchains that do not support C++ fails > -on: > - > -CMake Error at CMakeLists.txt:2 (project): > - The CMAKE_CXX_COMPILER: > - > - /home/naourr/work/instance-1/output-1/per-package/mraa/host/bin/arm-linux-g++ > - > - is not a full path to an existing compiler tool. > - > -Fixes: > - - http://autobuild.buildroot.org/results/31086422e03611c16ab59c4418e3669b580bc0c0 > - > -Signed-off-by: Fabrice Fontaine > -[Retrieved from: > -https://github.com/eclipse/mraa/commit/cb88e4dd1fbbb9d24e625dba2768b88ed99da309] > ---- > - CMakeLists.txt | 69 +++++++++++++++++++---------------- > - src/java/CMakeLists.txt | 4 +- > - src/javascript/CMakeLists.txt | 34 +++++++++-------- > - 3 files changed, 59 insertions(+), 48 deletions(-) > - > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index 250d9106e..90c0dc920 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -1,5 +1,5 @@ > - cmake_minimum_required (VERSION 2.8.11) > --project (mraa C CXX) > -+project (mraa C) > - > - FIND_PACKAGE (Threads REQUIRED) > - > -@@ -11,6 +11,8 @@ else () > - set (CMAKE_C_STANDARD 99) > - endif () > - > -+option (BUILDCPP "Enable C++ (needed by FTDI4222 and tests)" ON) > -+ > - ############################################################################### > - # Detect supported warning flags > - # Modified from work By Dan Liew (fpbench - MIT) > -@@ -33,15 +35,18 @@ set (MRAA_C_WARNING_FLAGS > - -Werror=missing-parameter-type > - ) > - > --# Warning flags for the C++ compiler only > --set (MRAA_CXX_WARNING_FLAGS > -- -Wnon-virtual-dtor > -- -Woverloaded-virtual > -- -Wreorder > --) > -- > - include (CheckCCompilerFlag) > --include (CheckCXXCompilerFlag) > -+if (BUILDCPP) > -+ # Warning flags for the C++ compiler only > -+ set (MRAA_CXX_WARNING_FLAGS > -+ -Wnon-virtual-dtor > -+ -Woverloaded-virtual > -+ -Wreorder > -+ ) > -+ > -+ enable_language (CXX) > -+ include (CheckCXXCompilerFlag) > -+endif () > - function (MRAA_SANITIZE_FLAG_NAME OUTPUT_VAR FLAG) > - string (REPLACE "-" "_" SANITIZED_FLAG_NAME "${FLAG}") > - string (REPLACE "/" "_" SANITIZED_FLAG_NAME "${SANITIZED_FLAG_NAME}") > -@@ -62,28 +67,30 @@ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_C_WARNING_FLAGS}) > - endif () > - endforeach () > - > --# Globally set C++ compiler warning flags that are supported and emit > --# a warning about unsupported flags > --foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) > -- MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") > -- CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) > -- if (HAS_CXX_${SANITIZED_FLAG_NAME}) > -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") > -- else () > -- message (WARNING "C++ compiler does not support flag \"${flag}\"") > -- endif () > --endforeach () > -- > --# This function adds the c++11 flag to a c++ target (if supported) > --function(use_cxx_11 targetname) > -- include(CheckCXXCompilerFlag) > -- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) > -- if (COMPILER_SUPPORTS_CXX11) > -- set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") > -- else() > -- message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") > -- endif() > --endfunction() > -+if (BUILDCPP) > -+ # Globally set C++ compiler warning flags that are supported and emit > -+ # a warning about unsupported flags > -+ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) > -+ MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") > -+ CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) > -+ if (HAS_CXX_${SANITIZED_FLAG_NAME}) > -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") > -+ else () > -+ message (WARNING "C++ compiler does not support flag \"${flag}\"") > -+ endif () > -+ endforeach () > -+ > -+ # This function adds the c++11 flag to a c++ target (if supported) > -+ function(use_cxx_11 targetname) > -+ include(CheckCXXCompilerFlag) > -+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) > -+ if (COMPILER_SUPPORTS_CXX11) > -+ set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") > -+ else() > -+ message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") > -+ endif() > -+ endfunction() > -+endif() > - > - # Set CMAKE_INSTALL_LIBDIR if not defined > - include(GNUInstallDirs) > -diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt > -index 231c755fa..cfa72a0df 100644 > ---- a/src/java/CMakeLists.txt > -+++ b/src/java/CMakeLists.txt > -@@ -16,7 +16,9 @@ include_directories ( > - set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src") > - set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) > - > --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") > -+if (BUILDCPP) > -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") > -+endif() > - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") > - > - if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) > -diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt > -index 25fd36275..99a96b49d 100644 > ---- a/src/javascript/CMakeLists.txt > -+++ b/src/javascript/CMakeLists.txt > -@@ -36,25 +36,27 @@ set_target_properties (mraajs PROPERTIES > - ) > - > - message (STATUS "INFO - swig Version ${SWIG_VERSION}") > --message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") > -+if (BUILDCPP) > -+ message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") > - > --if (${V8_VERSION_MAJOR} GREATER 3) > -- message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") > -- # Node 0.12.x V8 engine major version is '3'. > -- # Node 2.1.0 V8 engine major version is '4'. > -- set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) > -- set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) > -- if (CMAKE_VERSION VERSION_LESS "3.1") > -- message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") > -- if (CMAKE_COMPILER_IS_GNUCXX) > -- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") > -- message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") > -+ if (${V8_VERSION_MAJOR} GREATER 3) > -+ message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") > -+ # Node 0.12.x V8 engine major version is '3'. > -+ # Node 2.1.0 V8 engine major version is '4'. > -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) > -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) > -+ if (CMAKE_VERSION VERSION_LESS "3.1") > -+ message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") > -+ if (CMAKE_COMPILER_IS_GNUCXX) > -+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") > -+ message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") > -+ endif () > -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") > -+ else () > -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") > - endif () > -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") > -- else () > -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") > -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") > - endif () > -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") > - endif () > - endif () > - > diff --git a/package/mraa/mraa.hash b/package/mraa/mraa.hash > index f29a5ce838..321b6409ed 100644 > --- a/package/mraa/mraa.hash > +++ b/package/mraa/mraa.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345 mraa-2.1.0.tar.gz > +sha256 076669bee8423ffef3065735b293a329020be86630fea457174dbfcc67a0554a mraa-2.2.0.tar.gz > sha256 fac52622ed3badd86b34857b21777ab90296d6ccbc2ac0fd457c09fdeefa9ef1 COPYING > diff --git a/package/mraa/mraa.mk b/package/mraa/mraa.mk > index 910339b386..47178a423b 100644 > --- a/package/mraa/mraa.mk > +++ b/package/mraa/mraa.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MRAA_VERSION = 2.1.0 > +MRAA_VERSION = 2.2.0 > MRAA_SITE = $(call github,eclipse,mraa,v$(MRAA_VERSION)) > MRAA_LICENSE = MIT > MRAA_LICENSE_FILES = COPYING > From arnout at mind.be Tue Jan 4 17:50:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:50:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbredir: bump to version 0.12.0 In-Reply-To: <20220101220532.2057125-1-fontaine.fabrice@gmail.com> References: <20220101220532.2057125-1-fontaine.fabrice@gmail.com> Message-ID: <94b150cd-2e70-dc09-749e-cc567bc8db30@mind.be> On 01/01/2022 23:05, Fabrice Fontaine wrote: > Drop all patches (already in version) > > https://gitlab.freedesktop.org/spice/usbredir/-/blob/usbredir-0.12.0/ChangeLog.md > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0001-meson-add-tests-option.patch | 46 -------------- > ...002-meson-add-stack_protector-option.patch | 60 ------------------- > .../0003-meson.build-make-C-optional.patch | 39 ------------ > package/usbredir/usbredir.hash | 4 +- > package/usbredir/usbredir.mk | 2 +- > 5 files changed, 3 insertions(+), 148 deletions(-) > delete mode 100644 package/usbredir/0001-meson-add-tests-option.patch > delete mode 100644 package/usbredir/0002-meson-add-stack_protector-option.patch > delete mode 100644 package/usbredir/0003-meson.build-make-C-optional.patch > > diff --git a/package/usbredir/0001-meson-add-tests-option.patch b/package/usbredir/0001-meson-add-tests-option.patch > deleted file mode 100644 > index b2df1587b1..0000000000 > --- a/package/usbredir/0001-meson-add-tests-option.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From 8490a7ac101d4ee0a78c44b252d3b7a6c2508c74 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 21 Aug 2021 11:55:48 +0200 > -Subject: [PATCH] meson: add tests option > - > -Add tests option to allow the user to disable them > - > -Signed-off-by: Fabrice Fontaine > -[Retrieved from: > -https://gitlab.freedesktop.org/spice/usbredir/-/commit/8490a7ac101d4ee0a78c44b252d3b7a6c2508c74] > ---- > - meson.build | 4 +++- > - meson_options.txt | 5 +++++ > - 2 files changed, 8 insertions(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index 6e773a7..a6d21b8 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -106,7 +106,9 @@ if host_machine.system() != 'windows' > - subdir('fuzzing') > - endif > - endif > --subdir('tests') > -+if get_option('tests').enabled() > -+ subdir('tests') > -+endif > - subdir('data') > - > - summary(summary_info, bool_yn: true) > -diff --git a/meson_options.txt b/meson_options.txt > -index b35732b..63e8c85 100644 > ---- a/meson_options.txt > -+++ b/meson_options.txt > -@@ -21,3 +21,8 @@ option('tools', > - type : 'feature', > - value : 'enabled', > - description : 'Build usbredir\'s tools such as usbredirect') > -+ > -+option('tests', > -+ type : 'feature', > -+ value : 'enabled', > -+ description : 'Build usbredir\'s tests such as filter') > --- > -GitLab > - > diff --git a/package/usbredir/0002-meson-add-stack_protector-option.patch b/package/usbredir/0002-meson-add-stack_protector-option.patch > deleted file mode 100644 > index 613e2714e3..0000000000 > --- a/package/usbredir/0002-meson-add-stack_protector-option.patch > +++ /dev/null > @@ -1,60 +0,0 @@ > -From 54cf1897ef3aa4d0a35b5f4eb1f5c6928b033af5 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 24 Sep 2021 17:24:43 +0200 > -Subject: [PATCH] meson: add stack_protector option > - > -Add stack_protector option to allow the user to disable it as some > -embedded toolchains don't support it which will result in the following > -build failure: > - > -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: usbredirparser/libusbredirparser.so.1.1.0.p/usbredirparser.c.o: in function `va_log': > -usbredirparser.c:(.text+0x1c4): undefined reference to `__stack_chk_guard' > - > -Fixes: > - - http://autobuild.buildroot.org/results/40de5443e98157ad50c6841ea70a835cd5ad4fe9 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: > -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/53] > ---- > - meson.build | 6 +++++- > - meson_options.txt | 5 +++++ > - 2 files changed, 10 insertions(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index a6d21b8..4350f53 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -17,8 +17,12 @@ cc_flags = [ > - if host_machine.system() != 'windows' > - cc_flags += [ > - '-Wp,-D_FORTIFY_SOURCE=2', > -- '-fstack-protector', > - ] > -+ if get_option('stack_protector').enabled() > -+ cc_flags += [ > -+ '-fstack-protector', > -+ ] > -+ endif > - endif > - > - # Check if we are building from .git > -diff --git a/meson_options.txt b/meson_options.txt > -index 63e8c85..34dd392 100644 > ---- a/meson_options.txt > -+++ b/meson_options.txt > -@@ -17,6 +17,11 @@ option('fuzzing-install-dir', > - type : 'string', > - description : 'Installation directory for fuzzing binaries') > - > -+option('stack_protector', > -+ type : 'feature', > -+ value : 'enabled', > -+ description : 'Build usbredir\'s with stack-protector') > -+ > - option('tools', > - type : 'feature', > - value : 'enabled', > --- > -2.33.0 > - > diff --git a/package/usbredir/0003-meson.build-make-C-optional.patch b/package/usbredir/0003-meson.build-make-C-optional.patch > deleted file mode 100644 > index fe1ed3f698..0000000000 > --- a/package/usbredir/0003-meson.build-make-C-optional.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From 55fc307d23d657b52433d1c8508467d0589754d5 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 16 Oct 2021 15:45:57 +0200 > -Subject: [PATCH] meson.build: make C++ optional > - > -Remove cpp from meson project statement to make C++ optional and avoid > -the following build failure when the toolchain does not provide a C++ > -compiler: > - > -../output-1/build/usbredir-0.11.0/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++']] > -The following exception(s) were encountered: > -Running "/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++ --version" gave "[Errno 2] No such file or directory: '/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++'" > - > -Indeed C++ is only required for fuzzing which is already handled by > -meson through add_languages('cpp', required: true) > - > -Fixes: > - - http://autobuild.buildroot.org/results/eca1d8a2b73a769354ab1d24c7996be30f152138 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: > -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/55] > ---- > - meson.build | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index 49dbce4..ca19f22 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -1,4 +1,4 @@ > --project('usbredir', 'c', 'cpp', > -+project('usbredir', 'c', > - version: '0.11.0', > - license: 'LGPLv2.1+', > - meson_version : '>= 0.53', > --- > -2.33.0 > - > diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash > index e11d4aa720..f738c36690 100644 > --- a/package/usbredir/usbredir.hash > +++ b/package/usbredir/usbredir.hash > @@ -1,5 +1,5 @@ > -# https://spice-space.org/download/usbredir/usbredir-0.11.0.tar.xz.sha256sum > -sha256 72dd5f3aa90dfbc0510b5149bb5b1654c8f21fdc405dfce7b5dc163dcff19cba usbredir-0.11.0.tar.xz > +# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum > +sha256 fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d usbredir-0.12.0.tar.xz > > # Hash for license files > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk > index 0a8dbf012d..6792a3e758 100644 > --- a/package/usbredir/usbredir.mk > +++ b/package/usbredir/usbredir.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -USBREDIR_VERSION = 0.11.0 > +USBREDIR_VERSION = 0.12.0 > USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz > USBREDIR_SITE = http://spice-space.org/download/usbredir > USBREDIR_LICENSE = LGPL-2.1+ (libraries) > From arnout at mind.be Tue Jan 4 17:50:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:50:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: bump to version 0.8.1 In-Reply-To: <20220101221425.2059395-1-fontaine.fabrice@gmail.com> References: <20220101221425.2059395-1-fontaine.fabrice@gmail.com> Message-ID: <1b540313-e49f-e282-3db5-b9e51076c280@mind.be> On 01/01/2022 23:14, Fabrice Fontaine wrote: > - Drop first patch (already in version) > - Refresh upstream status of latest patch > - Update hash of LICENSE and add cli/COPYING: > https://github.com/Cyan4973/xxHash/commit/85e1ea2ab0d90463b804f4a65b0f67d99718c6f8 > > https://github.com/Cyan4973/xxHash/releases/tag/v0.8.1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...h => 0001-fix-man-page-installation.patch} | 0 > .../0001-fixed-man-page-installation.patch | 31 ------------------- > ...efile-add-dedicated-install-targets.patch} | 8 ++--- > package/xxhash/xxhash.hash | 5 +-- > package/xxhash/xxhash.mk | 4 +-- > 5 files changed, 8 insertions(+), 40 deletions(-) > rename package/xxhash/{0002-fix-man-page-installation.patch => 0001-fix-man-page-installation.patch} (100%) > delete mode 100644 package/xxhash/0001-fixed-man-page-installation.patch > rename package/xxhash/{0003-Makefile-add-dedicated-install-targets.patch => 0002-Makefile-add-dedicated-install-targets.patch} (94%) > > diff --git a/package/xxhash/0002-fix-man-page-installation.patch b/package/xxhash/0001-fix-man-page-installation.patch > similarity index 100% > rename from package/xxhash/0002-fix-man-page-installation.patch > rename to package/xxhash/0001-fix-man-page-installation.patch > diff --git a/package/xxhash/0001-fixed-man-page-installation.patch b/package/xxhash/0001-fixed-man-page-installation.patch > deleted file mode 100644 > index a9f68db4b4..0000000000 > --- a/package/xxhash/0001-fixed-man-page-installation.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6 Mon Sep 17 00:00:00 2001 > -From: Yann Collet > -Date: Fri, 6 Aug 2021 15:29:32 -0700 > -Subject: [PATCH] fixed man page installation > - > -[Retrieved from: > -https://github.com/Cyan4973/xxHash/commit/e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6] > -Signed-off-by: Fabrice Fontaine > ---- > - Makefile | 8 ++++---- > - 1 file changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index b8552a9f..556a32a0 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -498,10 +498,10 @@ endif > - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum > - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum > - @echo Installing man pages > -- $(Q)$(INSTALL_DATA) xxhsum.1 $(DESTDIR)$(MANDIR)/xxhsum.1 > -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 > -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 > -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 > -+ $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 > -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 > -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 > -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 > - @echo xxhash installation completed > - > - .PHONY: uninstall > diff --git a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch > similarity index 94% > rename from package/xxhash/0003-Makefile-add-dedicated-install-targets.patch > rename to package/xxhash/0002-Makefile-add-dedicated-install-targets.patch > index 0607c8ee82..17d34a0823 100644 > --- a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch > +++ b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch > @@ -10,13 +10,14 @@ This is especially useful on embedded systems where dynamic library is > not always supported by toolchains > > Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/Cyan4973/xxHash/pull/665] > +[Retrieved from: > +https://github.com/Cyan4973/xxHash/commit/db9c199e99f7b4d419647b1ef49c547fc2547516] > --- > Makefile | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > -index 8d4fcd2..5fe7297 100644 > +index 8d4fcd21..5fe72972 100644 > --- a/Makefile > +++ b/Makefile > @@ -505,11 +505,14 @@ libxxhash.pc: libxxhash.pc.in > @@ -68,6 +69,3 @@ index 8d4fcd2..5fe7297 100644 > @echo xxhash installation completed > > .PHONY: uninstall > --- > -2.33.0 > - > diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash > index feb5000808..2c99236a45 100644 > --- a/package/xxhash/xxhash.hash > +++ b/package/xxhash/xxhash.hash > @@ -1,3 +1,4 @@ > # locally computed > -sha256 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f xxhash-0.8.0.tar.gz > -sha256 9da63520e9293d82c4b1613be5c84058cadb82b02f5972179bad13731d589910 LICENSE > +sha256 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c xxhash-0.8.1.tar.gz > +sha256 553d0035773ddd1590045f8fdc3a4c6ead31e36336721aeca8421e88ed1c9f80 LICENSE > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING > diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk > index 3e7f3244b3..a8f8d1d179 100644 > --- a/package/xxhash/xxhash.mk > +++ b/package/xxhash/xxhash.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -XXHASH_VERSION = 0.8.0 > +XXHASH_VERSION = 0.8.1 > XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) > XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) > -XXHASH_LICENSE_FILES = LICENSE > +XXHASH_LICENSE_FILES = LICENSE cli/COPYING > XXHASH_INSTALL_STAGING = YES > > XXHASH_TARGETS = xxhsum > From arnout at mind.be Tue Jan 4 17:50:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:50:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: bump to version 2.0.0 In-Reply-To: <20220101223529.2111756-1-fontaine.fabrice@gmail.com> References: <20220101223529.2111756-1-fontaine.fabrice@gmail.com> Message-ID: <64cd02f8-a2b5-1f20-8198-ff522eb999e3@mind.be> On 01/01/2022 23:35, Fabrice Fontaine wrote: > - Switch to meson-package to drop first patch and disable examples and > utils > - Drop second patch (already in version) > - Update hash of NOTICE (empty new lines added with > https://github.com/tinyalsa/tinyalsa/commit/902b8c8f9fa5a2e1937007d7d5ee90f01790808b) > > https://github.com/tinyalsa/tinyalsa/releases/tag/v2.0.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../tinyalsa/0001-disable-doxygen-usage.patch | 35 ------------------ > .../0002-interval.h-add-missing-header.patch | 36 ------------------- > package/tinyalsa/tinyalsa.hash | 4 +-- > package/tinyalsa/tinyalsa.mk | 27 +++----------- > 4 files changed, 6 insertions(+), 96 deletions(-) > delete mode 100644 package/tinyalsa/0001-disable-doxygen-usage.patch > delete mode 100644 package/tinyalsa/0002-interval.h-add-missing-header.patch > > diff --git a/package/tinyalsa/0001-disable-doxygen-usage.patch b/package/tinyalsa/0001-disable-doxygen-usage.patch > deleted file mode 100644 > index ed939fb9bf..0000000000 > --- a/package/tinyalsa/0001-disable-doxygen-usage.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -Disable doxygen usage > - > -In order to avoid a dependency on doxygen on the build machine, this > -patch adjusts the main Makefile to not build and install the > -documentation. > - > -[Vincent: tweak patch for 1.1.1 version] > - > -Signed-off-by: Thomas Petazzoni > -Signed-off-by: Vicente Olivert Riera > - > -diff -rup a/Makefile b/Makefile > ---- a/Makefile 2017-05-24 05:23:57.000000000 +0100 > -+++ b/Makefile 2017-05-25 10:35:20.781747053 +0100 > -@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man > - all: > - $(MAKE) -C src > - $(MAKE) -C utils > -- $(MAKE) -C doxygen > - $(MAKE) -C examples > - > - .PHONY: clean > - clean: > - $(MAKE) -C src clean > - $(MAKE) -C utils clean > -- $(MAKE) -C doxygen clean > - $(MAKE) -C examples clean > - > - .PHONY: install > -@@ -30,5 +28,4 @@ install: > - install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/ > - $(MAKE) -C src install > - $(MAKE) -C utils install > -- $(MAKE) -C doxygen install > - > diff --git a/package/tinyalsa/0002-interval.h-add-missing-header.patch b/package/tinyalsa/0002-interval.h-add-missing-header.patch > deleted file mode 100644 > index c043145b55..0000000000 > --- a/package/tinyalsa/0002-interval.h-add-missing-header.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001 > -From: Baruch Siach > -Date: Fri, 2 Jun 2017 12:19:03 +0300 > -Subject: [PATCH] interval.h: add missing header > - > -The ssize_t type requires the unistd.h header. This fixes build with musl > -libc: > - > -In file included from ../include/tinyalsa/limits.h:32:0, > - from limits.c:1: > -../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t' > - ssize_t max; > - ^ > - > -Signed-off-by: Baruch Siach > ---- > -Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98 > - > - include/tinyalsa/interval.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h > -index 3f6f3dce5d90..068571df5a63 100644 > ---- a/include/tinyalsa/interval.h > -+++ b/include/tinyalsa/interval.h > -@@ -30,6 +30,7 @@ > - #define TINYALSA_INTERVAL_H > - > - #include > -+#include > - > - /** A closed range signed interval. */ > - > --- > -2.11.0 > - > diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash > index d078bab597..f7673b1769 100644 > --- a/package/tinyalsa/tinyalsa.hash > +++ b/package/tinyalsa/tinyalsa.hash > @@ -1,3 +1,3 @@ > # locally computed > -sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz > -sha256 ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d NOTICE > +sha256 573ae0b2d3480851c1d2a12503ead2beea27f92d44ed47b74b553ba947994ef1 tinyalsa-2.0.0.tar.gz > +sha256 ea22a4711f5250f88a4d7011fbc65367d1b02ac954dcc49f5b6d7c135e6537c4 NOTICE > diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk > index bd9d9a00d0..b5c39e35d6 100644 > --- a/package/tinyalsa/tinyalsa.mk > +++ b/package/tinyalsa/tinyalsa.mk > @@ -4,30 +4,11 @@ > # > ################################################################################ > > -TINYALSA_VERSION = 1.1.1 > -TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) > +TINYALSA_VERSION = 2.0.0 > +TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) > TINYALSA_LICENSE = BSD-3-Clause > TINYALSA_LICENSE_FILES = NOTICE > TINYALSA_INSTALL_STAGING = YES > +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled > > -define TINYALSA_BUILD_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) > -endef > - > -define TINYALSA_INSTALL_STAGING_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) \ > - -C $(@D) \ > - PREFIX="/usr" \ > - CROSS_COMPILE="$(TARGET_CROSS)" \ > - DESTDIR="$(STAGING_DIR)" install > -endef > - > -define TINYALSA_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) \ > - -C $(@D) \ > - PREFIX="/usr" \ > - CROSS_COMPILE="$(TARGET_CROSS)" \ > - DESTDIR="$(TARGET_DIR)" install > -endef > - > -$(eval $(generic-package)) > +$(eval $(meson-package)) > From arnout at mind.be Tue Jan 4 17:51:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:51:03 +0100 Subject: [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency In-Reply-To: <20220101223900.2970405-1-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> Message-ID: <2cf41923-653d-2e32-c5d3-352338c918ea@mind.be> On 01/01/2022 23:38, Erik Larsson wrote: > The last reference of uriparser was removed in: > https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e > > Signed-off-by: Erik Larsson Applied to master, thanks. Regards, Arnout > --- > package/tpm2-tss/tpm2-tss.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk > index 71aa3feb96..060883c377 100644 > --- a/package/tpm2-tss/tpm2-tss.mk > +++ b/package/tpm2-tss/tpm2-tss.mk > @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE > TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project > TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack > TPM2_TSS_INSTALL_STAGING = YES > -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf > +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf > > # 0001-configure-Only-use-CXX-when-fuzzing.patch > TPM2_TSS_AUTORECONF = YES > From arnout at mind.be Tue Jan 4 17:51:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:51:15 +0100 Subject: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 In-Reply-To: <20220102212559.43475-1-who+buildroot@cnackers.org> References: <20220101223900.2970405-2-who+buildroot@cnackers.org> <20220102212559.43475-1-who+buildroot@cnackers.org> Message-ID: <02ad5067-f0ed-884c-478c-3e7e83062e72@mind.be> On 02/01/2022 22:25, Erik Larsson wrote: > Depedency on libuuid was removed in: > https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd > > Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 > > Signed-off-by: Erik Larsson Applied to master, thanks. Regards, Arnout > --- > .../0001-configure-make-build-gnu99.patch | 30 ------------------- > package/tpm2-tools/Config.in | 2 -- > package/tpm2-tools/tpm2-tools.hash | 2 +- > package/tpm2-tools/tpm2-tools.mk | 6 ++-- > 4 files changed, 3 insertions(+), 37 deletions(-) > delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch > > diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch > deleted file mode 100644 > index 37ca6c5873..0000000000 > --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 > -From: William Roberts > -Date: Mon, 8 Feb 2021 11:57:28 -0600 > -Subject: [PATCH] configure: make build gnu99 > - > -Signed-off-by: William Roberts > - > -[Retrieved from: > -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c > -and updated to set gnu99 instead of c99 as done by > -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index dc15b5595..25039a0d9 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ > - # -D_GNU_SOURCE is required for execvpe() in options.c > - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) > - > -+# Enable gnu99 mode, since we use some of these features. > -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) > -+ > - # Best attempt compiler options that are on newer versions of GCC that > - # we can't widely enforce without killing other peoples builds. > - # Works with gcc only. Needs to be disabled on BSD and clang > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 3be947648f..1a6698570a 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_TPM2_TSS > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBUUID > help > TPM (Trusted Platform Module) 2.0 CLI tools based on system > API of TPM2-TSS. These tools can be used to manage keys, > diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash > index bfb7e9b220..f50a896363 100644 > --- a/package/tpm2-tools/tpm2-tools.hash > +++ b/package/tpm2-tools/tpm2-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz > +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz > sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index 41f5bcf201..8675344805 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -4,15 +4,13 @@ > # > ################################################################################ > > -TPM2_TOOLS_VERSION = 4.3.2 > +TPM2_TOOLS_VERSION = 5.2 > TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_LICENSE = BSD-3-Clause > TPM2_TOOLS_LICENSE_FILES = doc/LICENSE > TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project > TPM2_TOOLS_SELINUX_MODULES = tpm2 > -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux > -# We're patching configure.ac > -TPM2_TOOLS_AUTORECONF = YES > +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf > > # -fstack-protector-all and FORTIFY_SOURCE=2 is used by > # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options > From arnout at mind.be Tue Jan 4 17:52:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:52:12 +0100 Subject: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools In-Reply-To: <20220101223900.2970405-3-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> <20220101223900.2970405-3-who+buildroot@cnackers.org> Message-ID: On 01/01/2022 23:39, Erik Larsson wrote: > Signed-off-by: Erik Larsson > --- > package/tpm2-tools/Config.in | 11 +++++++++++ > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > 2 files changed, 17 insertions(+) > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 1a6698570a..cb3eb2b0a5 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > https://github.com/tpm2-software/tpm2-tools > > +if BR2_PACKAGE_TPM2_TOOLS > + > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > + bool "tpm2-tools fapi support" > + select BR2_PACKAGE_TPM2_TSS_FAPI > + help > + This option enables Feature API (FAPI) support in tpm2-tools. > + The FAPI tools are prefixed with tss2_. > + > +endif > + > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index df5fbbfff4..6894be195f 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > # do not build man pages > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) Does this optoin make a big difference in size? If not, we'd normally make it an automatic option, i.e. ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) (and remove the Config.in option). Regards, Arnout > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > +else > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > +endif > + > $(eval $(autotools-package)) > From arnout at mind.be Tue Jan 4 17:54:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:54:41 +0100 Subject: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools In-Reply-To: <20220101223900.2970405-3-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> <20220101223900.2970405-3-who+buildroot@cnackers.org> Message-ID: On 01/01/2022 23:39, Erik Larsson wrote: > Signed-off-by: Erik Larsson > --- > package/tpm2-tools/Config.in | 11 +++++++++++ > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > 2 files changed, 17 insertions(+) > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 1a6698570a..cb3eb2b0a5 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > https://github.com/tpm2-software/tpm2-tools > > +if BR2_PACKAGE_TPM2_TOOLS > + > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > + bool "tpm2-tools fapi support" > + select BR2_PACKAGE_TPM2_TSS_FAPI > + help > + This option enables Feature API (FAPI) support in tpm2-tools. > + The FAPI tools are prefixed with tss2_. > + > +endif > + > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index df5fbbfff4..6894be195f 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > # do not build man pages > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) Does this optoin make a big difference in size? If not, we'd normally make it an automatic option, i.e. ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) (and remove the Config.in option). Regards, Arnout > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > +else > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > +endif > + > $(eval $(autotools-package)) > From arnout at mind.be Tue Jan 4 17:56:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:56:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> Message-ID: <61aad133-ed50-1cda-80bb-b04ce9dbd133@mind.be> On 01/01/2022 23:59, Fabrice Fontaine wrote: > The LXC 4.0 branch is supported until June 2025. > Only bugfixes and securitiy issues get included into the stable bugfix > releases, so it's always safe and recommended to keep up and run the > latest bugfix release. > > https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/lxc/lxc.hash | 2 +- > package/lxc/lxc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash > index efd7a8e42c..2b58df2f1d 100644 > --- a/package/lxc/lxc.hash > +++ b/package/lxc/lxc.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz > +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk > index 93f6d2535f..4d63fc14cb 100644 > --- a/package/lxc/lxc.mk > +++ b/package/lxc/lxc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LXC_VERSION = 4.0.10 > +LXC_VERSION = 4.0.11 > LXC_SITE = https://linuxcontainers.org/downloads/lxc > LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ > LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 > From arnout at mind.be Tue Jan 4 17:56:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:56:58 +0100 Subject: [Buildroot] [PATCH] configs/cubieboard2: bump U-Boot and kernel In-Reply-To: <20220102080635.9405-1-abrodkin@synopsys.com> References: <20220102080635.9405-1-abrodkin@synopsys.com> Message-ID: On 02/01/2022 09:06, Alexey Brodkin via buildroot wrote: > Bump U-Boot to version 2021.10 and kernel to 5.15.11 > Among other things fixes U-Boot build failure, > see https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006081: > ---------------------->8------------------- > HOSTLD scripts/dtc/dtc > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > ---------------------->8------------------- > > Signed-off-by: Alexey Brodkin Applied to master, thanks. Regards, Arnout > --- > configs/cubieboard2_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig > index 8924c88c54..a9356295c1 100644 > --- a/configs/cubieboard2_defconfig > +++ b/configs/cubieboard2_defconfig > @@ -1,16 +1,16 @@ > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > -# Linux headers same as kernel, a 4.18 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y > +# Linux headers same as kernel, a 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" > BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" > BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14" > -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" > +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" > BR2_TARGET_ROOTFS_EXT2=y > @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > From arnout at mind.be Tue Jan 4 17:57:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:57:34 +0100 Subject: [Buildroot] [PATCH] package/perl: bump to version 5.34.0 In-Reply-To: <20220102104318.2631-1-francois.perrad@gadz.org> References: <20220102104318.2631-1-francois.perrad@gadz.org> Message-ID: <21297fa7-2ce2-c60d-6c55-d3872151587a@mind.be> On 02/01/2022 11:43, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/perl/perl.hash | 12 ++++++------ > package/perl/perl.mk | 6 +++--- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/package/perl/perl.hash b/package/perl/perl.hash > index 42b7cc66c..b0f60ef6f 100644 > --- a/package/perl/perl.hash > +++ b/package/perl/perl.hash > @@ -1,10 +1,10 @@ > -# Hashes from: https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz.{md5,sha1,sha256}.txt > -md5 7f104064b906ad8c7329ca5e409a32d7 perl-5.32.1.tar.xz > -sha1 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e perl-5.32.1.tar.xz > -sha256 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz > +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt > +md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz > +sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz > +sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz > > -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.hash > -sha256 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25 perl-cross-1.3.5.tar.gz > +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash > +sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz > > # Locally calculated > sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic > diff --git a/package/perl/perl.mk b/package/perl/perl.mk > index f661fef01..d7f9c58dd 100644 > --- a/package/perl/perl.mk > +++ b/package/perl/perl.mk > @@ -5,8 +5,8 @@ > ################################################################################ > > # When updating the version here, also update utils/scancpan > -PERL_VERSION_MAJOR = 32 > -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 > +PERL_VERSION_MAJOR = 34 > +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 > 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.3.5 > +PERL_CROSS_VERSION = 1.3.6 > # 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 arnout at mind.be Tue Jan 4 17:59:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:59:08 +0100 Subject: [Buildroot] [PATCH 1/2] configs/stm32f469_disco_xip: remove BR2_LINUX_KERNEL_XZ In-Reply-To: <20220102165849.1653228-1-dariobin@libero.it> References: <20220102165849.1653228-1-dariobin@libero.it> Message-ID: On 02/01/2022 17:58, Dario Binacchi wrote: > This is a XIP kernel, so it shouldn't be compressed. > > Signed-off-by: Dario Binacchi Both applied to master, thanks. Regards, Arnout > --- > configs/stm32f469_disco_xip_defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig > index f3d333278a53..6c4f227f582d 100644 > --- a/configs/stm32f469_disco_xip_defconfig > +++ b/configs/stm32f469_disco_xip_defconfig > @@ -7,7 +7,6 @@ BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > -BR2_LINUX_KERNEL_XZ=y > BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" > From arnout at mind.be Tue Jan 4 17:59:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:59:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/zchunk: needs MMU In-Reply-To: <20220102174226.2823845-1-fontaine.fabrice@gmail.com> References: <20220102174226.2823845-1-fontaine.fabrice@gmail.com> Message-ID: <9d62c676-5055-b373-0ece-7b83d5aa41a6@mind.be> On 02/01/2022 18:42, Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit c618da772df32679fdd338b99f44133655c9113f: > > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: src/zck_gen_zdict.p/zck_gen_zdict.c.o: in function `main': > zck_gen_zdict.c:(.text.startup+0x254): undefined reference to `fork' > > Fixes: > - http://autobuild.buildroot.org/results/582b994372435b8c35a56345c15bd0ffc722af79 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/zchunk/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/zchunk/Config.in b/package/zchunk/Config.in > index 2c8db434ce..2d2a78a210 100644 > --- a/package/zchunk/Config.in > +++ b/package/zchunk/Config.in > @@ -1,5 +1,6 @@ > config BR2_PACKAGE_ZCHUNK > bool "zchunk" > + depends on BR2_USE_MMU # fork() > select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL > select BR2_PACKAGE_LIBCURL > help > From arnout at mind.be Tue Jan 4 17:59:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:59:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiio: set PYTHON_EXECUTABLE In-Reply-To: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> References: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> Message-ID: On 02/01/2022 18:43, Fabrice Fontaine wrote: > Set PYTHON_EXECUTABLE to avoid the following build failure when > BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without > setuptools on host: > > -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter > -- new > -- Python_EXECUTABLE /usr/bin/python3.5 > > [...] > > Traceback (most recent call last): > File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in > from setuptools import setup > ImportError: No module named 'setuptools' > > Fixes: > - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libiio/libiio.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk > index f706298c22..38b2f83e6e 100644 > --- a/package/libiio/libiio.mk > +++ b/package/libiio/libiio.mk > @@ -76,8 +76,10 @@ endif > ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) > ifeq ($(BR2_PACKAGE_PYTHON),y) > LIBIIO_DEPENDENCIES += host-python-setuptools python > +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python > else ifeq ($(BR2_PACKAGE_PYTHON3),y) > LIBIIO_DEPENDENCIES += host-python3-setuptools python3 > +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 > endif > LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON > else > From arnout at mind.be Tue Jan 4 17:59:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:59:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with gcc 4.8 In-Reply-To: <20220102174556.2824179-1-fontaine.fabrice@gmail.com> References: <20220102174556.2824179-1-fontaine.fabrice@gmail.com> Message-ID: <2214f965-06d7-ddb8-1709-14bc1c7cdb4e@mind.be> On 02/01/2022 18:45, Fabrice Fontaine wrote: > Fix the following build failure with gcc 4.8 raised since bump to > version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: > > option.c: In function 'one_opt': > option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode > for (char *p = arg; *p; p++) { > ^ > option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code > option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode > for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-src-option.c-fix-build-with-gcc-4.8.patch | 52 +++++++++++++++++++ > ...9080ff8743133fbd52427b4b2213171-typo.patch | 36 +++++++++++++ > 2 files changed, 88 insertions(+) > create mode 100644 package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch > create mode 100644 package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch > > diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch > new file mode 100644 > index 0000000000..50ecf2f18a > --- /dev/null > +++ b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch > @@ -0,0 +1,52 @@ > +From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 31 Dec 2021 17:29:44 +0100 > +Subject: [PATCH] src/option.c: fix build with gcc 4.8 > + > +Fix the following build failure with gcc 4.8 raised since version 2.86: > + > +option.c: In function 'one_opt': > +option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode > + for (char *p = arg; *p; p++) { > + ^ > +option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code > +option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode > + for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > + ^ > + > +Fixes: > + - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] > +--- > + src/option.c | 6 ++++-- > + 1 file changed, 4 insertions(+), 2 deletions(-) > + > +diff --git a/src/option.c b/src/option.c > +index ff54def..c57f6d8 100644 > +--- a/src/option.c > ++++ b/src/option.c > +@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma > + arg += 9; > + if (strlen(arg) != 16) > + ret_err(gen_err); > +- for (char *p = arg; *p; p++) { > ++ char *p; > ++ for (*p = arg; *p; p++) { > + if (!isxdigit((int)*p)) > + ret_err(gen_err); > + } > +@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma > + > + u8 *u = daemon->umbrella_device; > + char word[3]; > +- for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > ++ u8 i; > ++ for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > + memcpy(word, &(arg[0]), 2); > + *u++ = strtoul(word, NULL, 16); > + } > +-- > +2.33.0 > + > diff --git a/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch > new file mode 100644 > index 0000000000..8cdf5b3f1b > --- /dev/null > +++ b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch > @@ -0,0 +1,36 @@ > +From 2748fb81e23b71e2c44956e99321816aca91905d Mon Sep 17 00:00:00 2001 > +From: Simon Kelley > +Date: Sat, 1 Jan 2022 23:03:26 +0000 > +Subject: [PATCH] Fix 46312909d9080ff8743133fbd52427b4b2213171 typo. > + > +[Upstream commit 2748fb81e23b71e2c44956e99321816aca91905d] > +Signed-off-by: Fabrice Fontaine > +--- > + src/option.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/src/option.c b/src/option.c > +index c57f6d8..6f56ce8 100644 > +--- a/src/option.c > ++++ b/src/option.c > +@@ -357,7 +357,7 @@ static const struct myoption opts[] = > + { "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID }, > + { "dynamic-host", 1, 0, LOPT_DYNHOST }, > + { "log-debug", 0, 0, LOPT_LOG_DEBUG }, > +- { "umbrella", 2, 0, LOPT_UMBRELLA }, > ++ { "umbrella", 2, 0, LOPT_UMBRELLA }, > + { "quiet-tftp", 0, 0, LOPT_QUIET_TFTP }, > + { NULL, 0, 0, 0 } > + }; > +@@ -2526,7 +2526,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma > + if (strlen(arg) != 16) > + ret_err(gen_err); > + char *p; > +- for (*p = arg; *p; p++) { > ++ for (p = arg; *p; p++) { > + if (!isxdigit((int)*p)) > + ret_err(gen_err); > + } > +-- > +2.33.0 > + > From arnout at mind.be Tue Jan 4 18:00:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:00:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix uclibc-ng build In-Reply-To: <20220102174501.2824124-1-fontaine.fabrice@gmail.com> References: <20220102174501.2824124-1-fontaine.fabrice@gmail.com> Message-ID: <05f28cff-efc0-0ac8-4219-055c39a807f3@mind.be> On 02/01/2022 18:45, Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit 663f39c88c01593855c18355a4decdceeffd884b: > > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': > /home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' > > Fixes: > - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0002-check-for-inb-and-outb.patch | 50 +++++++++++++++++++ > 1 file changed, 50 insertions(+) > create mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch > > diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch > new file mode 100644 > index 0000000000..3bc006acc7 > --- /dev/null > +++ b/package/freeipmi/0002-check-for-inb-and-outb.patch > @@ -0,0 +1,50 @@ > +From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 2 Jan 2022 10:37:00 +0100 > +Subject: [PATCH] check for inb and outb > + > +Check for inb and outb before using them to avoid the following build > +failure on uclibc-ng: > + > +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': > +/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' > + > +Fixes: > + - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] > +--- > + configure.ac | 2 +- > + libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 711b27674..bcc4156ff 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) > + AC_CHECK_FUNCS([getline getprogname]) > + AC_CHECK_FUNCS([strerror strerror_r]) > + AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) > +-AC_CHECK_FUNCS([iopl]) > ++AC_CHECK_FUNCS([inb iopl outb]) > + AC_CHECK_FUNCS([asprintf]) > + AC_CHECK_FUNCS([cbrt]) > + AC_CHECK_FUNCS([getmsg putmsg]) > +diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c > +index c212887c0..a9d4b2e96 100644 > +--- a/libfreeipmi/driver/ipmi-kcs-driver.c > ++++ b/libfreeipmi/driver/ipmi-kcs-driver.c > +@@ -162,7 +162,7 @@ > + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) > + # define _INB(port) inb (port) > + # define _OUTB(data, port) outb (port, data) > +-#elif defined(HAVE_IOPL) > ++#elif defined(HAVE_INB) && defined(HAVE_OUTB) > + # define _INB(port) inb (port) > + # define _OUTB(data, port) outb (data, port) > + #else > +-- > +2.33.0 > + > From arnout at mind.be Tue Jan 4 18:00:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:00:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-utils: bump to version 1.2.6 In-Reply-To: <20220102174659.2824253-1-fontaine.fabrice@gmail.com> References: <20220102174659.2824253-1-fontaine.fabrice@gmail.com> Message-ID: <44a80bd0-9257-9cd5-d192-d6a0985200d6@mind.be> On 02/01/2022 18:46, Fabrice Fontaine wrote: > https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.6 > https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5.1 > https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/alsa-utils/alsa-utils.hash | 2 +- > package/alsa-utils/alsa-utils.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash > index dda009c1af..c2d3ee9bb5 100644 > --- a/package/alsa-utils/alsa-utils.hash > +++ b/package/alsa-utils/alsa-utils.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2 > +sha256 6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d alsa-utils-1.2.6.tar.bz2 > sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING > diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk > index 2603e52f18..c1478bf847 100644 > --- a/package/alsa-utils/alsa-utils.mk > +++ b/package/alsa-utils/alsa-utils.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ALSA_UTILS_VERSION = 1.2.4 > +ALSA_UTILS_VERSION = 1.2.6 > ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 > ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils > ALSA_UTILS_LICENSE = GPL-2.0 > From arnout at mind.be Tue Jan 4 17:49:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:19 +0100 Subject: [Buildroot] [git commit] package/lxc: bump to version 4.0.11 Message-ID: <20220104180257.2D83783249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97a504ed30dbeaca4704cbac8699d98ce7f26102 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The LXC 4.0 branch is supported until June 2025. Only bugfixes and securitiy issues get included into the stable bugfix releases, so it's always safe and recommended to keep up and run the latest bugfix release. https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index efd7a8e42c..2b58df2f1d 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 93f6d2535f..4d63fc14cb 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.10 +LXC_VERSION = 4.0.11 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/usbredir: bump to version 0.12.0 Message-ID: <20220104180256.F2D248324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f6f3b99fbac974e4b8d977810e97500126ef4d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop all patches (already in version) https://gitlab.freedesktop.org/spice/usbredir/-/blob/usbredir-0.12.0/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/usbredir/0001-meson-add-tests-option.patch | 46 ----------------- .../0002-meson-add-stack_protector-option.patch | 60 ---------------------- .../0003-meson.build-make-C-optional.patch | 39 -------------- package/usbredir/usbredir.hash | 4 +- package/usbredir/usbredir.mk | 2 +- 5 files changed, 3 insertions(+), 148 deletions(-) diff --git a/package/usbredir/0001-meson-add-tests-option.patch b/package/usbredir/0001-meson-add-tests-option.patch deleted file mode 100644 index b2df1587b1..0000000000 --- a/package/usbredir/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8490a7ac101d4ee0a78c44b252d3b7a6c2508c74 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 21 Aug 2021 11:55:48 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to disable them - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/spice/usbredir/-/commit/8490a7ac101d4ee0a78c44b252d3b7a6c2508c74] ---- - meson.build | 4 +++- - meson_options.txt | 5 +++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6e773a7..a6d21b8 100644 ---- a/meson.build -+++ b/meson.build -@@ -106,7 +106,9 @@ if host_machine.system() != 'windows' - subdir('fuzzing') - endif - endif --subdir('tests') -+if get_option('tests').enabled() -+ subdir('tests') -+endif - subdir('data') - - summary(summary_info, bool_yn: true) -diff --git a/meson_options.txt b/meson_options.txt -index b35732b..63e8c85 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -21,3 +21,8 @@ option('tools', - type : 'feature', - value : 'enabled', - description : 'Build usbredir\'s tools such as usbredirect') -+ -+option('tests', -+ type : 'feature', -+ value : 'enabled', -+ description : 'Build usbredir\'s tests such as filter') --- -GitLab - diff --git a/package/usbredir/0002-meson-add-stack_protector-option.patch b/package/usbredir/0002-meson-add-stack_protector-option.patch deleted file mode 100644 index 613e2714e3..0000000000 --- a/package/usbredir/0002-meson-add-stack_protector-option.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 54cf1897ef3aa4d0a35b5f4eb1f5c6928b033af5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 24 Sep 2021 17:24:43 +0200 -Subject: [PATCH] meson: add stack_protector option - -Add stack_protector option to allow the user to disable it as some -embedded toolchains don't support it which will result in the following -build failure: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: usbredirparser/libusbredirparser.so.1.1.0.p/usbredirparser.c.o: in function `va_log': -usbredirparser.c:(.text+0x1c4): undefined reference to `__stack_chk_guard' - -Fixes: - - http://autobuild.buildroot.org/results/40de5443e98157ad50c6841ea70a835cd5ad4fe9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/53] ---- - meson.build | 6 +++++- - meson_options.txt | 5 +++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index a6d21b8..4350f53 100644 ---- a/meson.build -+++ b/meson.build -@@ -17,8 +17,12 @@ cc_flags = [ - if host_machine.system() != 'windows' - cc_flags += [ - '-Wp,-D_FORTIFY_SOURCE=2', -- '-fstack-protector', - ] -+ if get_option('stack_protector').enabled() -+ cc_flags += [ -+ '-fstack-protector', -+ ] -+ endif - endif - - # Check if we are building from .git -diff --git a/meson_options.txt b/meson_options.txt -index 63e8c85..34dd392 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,6 +17,11 @@ option('fuzzing-install-dir', - type : 'string', - description : 'Installation directory for fuzzing binaries') - -+option('stack_protector', -+ type : 'feature', -+ value : 'enabled', -+ description : 'Build usbredir\'s with stack-protector') -+ - option('tools', - type : 'feature', - value : 'enabled', --- -2.33.0 - diff --git a/package/usbredir/0003-meson.build-make-C-optional.patch b/package/usbredir/0003-meson.build-make-C-optional.patch deleted file mode 100644 index fe1ed3f698..0000000000 --- a/package/usbredir/0003-meson.build-make-C-optional.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 55fc307d23d657b52433d1c8508467d0589754d5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 16 Oct 2021 15:45:57 +0200 -Subject: [PATCH] meson.build: make C++ optional - -Remove cpp from meson project statement to make C++ optional and avoid -the following build failure when the toolchain does not provide a C++ -compiler: - -../output-1/build/usbredir-0.11.0/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++']] -The following exception(s) were encountered: -Running "/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++ --version" gave "[Errno 2] No such file or directory: '/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++'" - -Indeed C++ is only required for fuzzing which is already handled by -meson through add_languages('cpp', required: true) - -Fixes: - - http://autobuild.buildroot.org/results/eca1d8a2b73a769354ab1d24c7996be30f152138 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/55] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 49dbce4..ca19f22 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('usbredir', 'c', 'cpp', -+project('usbredir', 'c', - version: '0.11.0', - license: 'LGPLv2.1+', - meson_version : '>= 0.53', --- -2.33.0 - diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash index e11d4aa720..f738c36690 100644 --- a/package/usbredir/usbredir.hash +++ b/package/usbredir/usbredir.hash @@ -1,5 +1,5 @@ -# https://spice-space.org/download/usbredir/usbredir-0.11.0.tar.xz.sha256sum -sha256 72dd5f3aa90dfbc0510b5149bb5b1654c8f21fdc405dfce7b5dc163dcff19cba usbredir-0.11.0.tar.xz +# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum +sha256 fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d usbredir-0.12.0.tar.xz # Hash for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index 0a8dbf012d..6792a3e758 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBREDIR_VERSION = 0.11.0 +USBREDIR_VERSION = 0.12.0 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz USBREDIR_SITE = http://spice-space.org/download/usbredir USBREDIR_LICENSE = LGPL-2.1+ (libraries) From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/perl: bump to version 5.34.0 Message-ID: <20220104180257.3F1E482BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c1ef8129f37200b046750c6405ecd304fd4f1bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/perl/perl.hash | 12 ++++++------ package/perl/perl.mk | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 42b7cc66c7..b0f60ef6f8 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,10 +1,10 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz.{md5,sha1,sha256}.txt -md5 7f104064b906ad8c7329ca5e409a32d7 perl-5.32.1.tar.xz -sha1 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e perl-5.32.1.tar.xz -sha256 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt +md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz +sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz +sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.hash -sha256 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25 perl-cross-1.3.5.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash +sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic diff --git a/package/perl/perl.mk b/package/perl/perl.mk index f661fef013..d7f9c58ddd 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 32 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION_MAJOR = 34 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 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.3.5 +PERL_CROSS_VERSION = 1.3.6 # 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 arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] configs/stm32f469_disco_xip: explicitly set the kernel version Message-ID: <20220104180257.4DE028324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ba47c2d4e8c84b57d52d12b60c9efa983eca98a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The version of the kernel and its headers must be explicitly set because if you keep the default setting, the kernel is continuously updated in buildroot with the risk that its image + dtb grow so much that it again exceeds the 2 MByte of the flash module. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/stm32f469_disco_xip_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 6c4f227f58..d95b7759f3 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -1,9 +1,12 @@ BR2_arm=y BR2_cortex_m4=y +BR2_KERNEL_HEADERS_5_15=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_GCC_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] configs/cubieboard2: bump U-Boot and kernel Message-ID: <20220104180257.36E7882BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06f10a88f30b73aaea5c0e0888d7ba9d9a6420f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump U-Boot to version 2021.10 and kernel to 5.15.11 Among other things fixes U-Boot build failure, see https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006081: ---------------------->8------------------- HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ---------------------->8------------------- Signed-off-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/cubieboard2_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 8924c88c54..a9356295c1 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" BR2_TARGET_ROOTFS_EXT2=y @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/xxhash: bump to version 0.8.1 Message-ID: <20220104180257.0897E82BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dbdb2535c649ee617595b8c4ae3cbba0ee37b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop first patch (already in version) - Refresh upstream status of latest patch - Update hash of LICENSE and add cli/COPYING: https://github.com/Cyan4973/xxHash/commit/85e1ea2ab0d90463b804f4a65b0f67d99718c6f8 https://github.com/Cyan4973/xxHash/releases/tag/v0.8.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ....patch => 0001-fix-man-page-installation.patch} | 0 .../xxhash/0001-fixed-man-page-installation.patch | 31 ---------------------- ...2-Makefile-add-dedicated-install-targets.patch} | 8 +++--- package/xxhash/xxhash.hash | 5 ++-- package/xxhash/xxhash.mk | 4 +-- 5 files changed, 8 insertions(+), 40 deletions(-) diff --git a/package/xxhash/0002-fix-man-page-installation.patch b/package/xxhash/0001-fix-man-page-installation.patch similarity index 100% rename from package/xxhash/0002-fix-man-page-installation.patch rename to package/xxhash/0001-fix-man-page-installation.patch diff --git a/package/xxhash/0001-fixed-man-page-installation.patch b/package/xxhash/0001-fixed-man-page-installation.patch deleted file mode 100644 index a9f68db4b4..0000000000 --- a/package/xxhash/0001-fixed-man-page-installation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Fri, 6 Aug 2021 15:29:32 -0700 -Subject: [PATCH] fixed man page installation - -[Retrieved from: -https://github.com/Cyan4973/xxHash/commit/e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index b8552a9f..556a32a0 100644 ---- a/Makefile -+++ b/Makefile -@@ -498,10 +498,10 @@ endif - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum - @echo Installing man pages -- $(Q)$(INSTALL_DATA) xxhsum.1 $(DESTDIR)$(MANDIR)/xxhsum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 -+ $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 - @echo xxhash installation completed - - .PHONY: uninstall diff --git a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch similarity index 94% rename from package/xxhash/0003-Makefile-add-dedicated-install-targets.patch rename to package/xxhash/0002-Makefile-add-dedicated-install-targets.patch index 0607c8ee82..17d34a0823 100644 --- a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch +++ b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch @@ -10,13 +10,14 @@ This is especially useful on embedded systems where dynamic library is not always supported by toolchains Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/Cyan4973/xxHash/pull/665] +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/db9c199e99f7b4d419647b1ef49c547fc2547516] --- Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index 8d4fcd2..5fe7297 100644 +index 8d4fcd21..5fe72972 100644 --- a/Makefile +++ b/Makefile @@ -505,11 +505,14 @@ libxxhash.pc: libxxhash.pc.in @@ -68,6 +69,3 @@ index 8d4fcd2..5fe7297 100644 @echo xxhash installation completed .PHONY: uninstall --- -2.33.0 - diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash index feb5000808..2c99236a45 100644 --- a/package/xxhash/xxhash.hash +++ b/package/xxhash/xxhash.hash @@ -1,3 +1,4 @@ # locally computed -sha256 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f xxhash-0.8.0.tar.gz -sha256 9da63520e9293d82c4b1613be5c84058cadb82b02f5972179bad13731d589910 LICENSE +sha256 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c xxhash-0.8.1.tar.gz +sha256 553d0035773ddd1590045f8fdc3a4c6ead31e36336721aeca8421e88ed1c9f80 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 3e7f3244b3..a8f8d1d179 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -4,10 +4,10 @@ # ################################################################################ -XXHASH_VERSION = 0.8.0 +XXHASH_VERSION = 0.8.1 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) -XXHASH_LICENSE_FILES = LICENSE +XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES XXHASH_TARGETS = xxhsum From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/tpm2-tss: remove unused dependency Message-ID: <20220104180257.1C2CE8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=593683b45f72169dd94ec14fa18720b3cec9dda4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The last reference of uriparser was removed in: https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e Signed-off-by: Erik Larsson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/tpm2-tss/tpm2-tss.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 71aa3feb96..060883c377 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/alsa-utils: bump to version 1.2.6 Message-ID: <20220104180257.78A3C8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c1f6a6a7ba24e883fe089cd09cbc61a88f8508d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.6 https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5.1 https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index dda009c1af..c2d3ee9bb5 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2 +sha256 6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d alsa-utils-1.2.6.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 2603e52f18..c1478bf847 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.4 +ALSA_UTILS_VERSION = 1.2.6 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/zchunk: needs MMU Message-ID: <20220104180257.5622482BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48f790099399e3f74e4487148de437881fee990c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit c618da772df32679fdd338b99f44133655c9113f: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: src/zck_gen_zdict.p/zck_gen_zdict.c.o: in function `main': zck_gen_zdict.c:(.text.startup+0x254): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/582b994372435b8c35a56345c15bd0ffc722af79 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zchunk/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zchunk/Config.in b/package/zchunk/Config.in index 2c8db434ce..2d2a78a210 100644 --- a/package/zchunk/Config.in +++ b/package/zchunk/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ZCHUNK bool "zchunk" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_LIBCURL help From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/mraa: bump to version 2.2.0 Message-ID: <20220104180256.E939583249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a30732769c0ca54c2a7e0eeca64f42d8479e7f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Refresh upstream status of first patch - Drop second patch (already in version) https://github.com/eclipse/mraa/blob/v2.2.0/docs/changelog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...include-Declare-gVERSION-global-as-extern.patch | 7 +- .../0002-CMakeLists.txt-add-BUILDCPP-option.patch | 193 --------------------- package/mraa/mraa.hash | 2 +- package/mraa/mraa.mk | 2 +- 4 files changed, 6 insertions(+), 198 deletions(-) diff --git a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch index b3a1f5a03a..110c020a62 100644 --- a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch +++ b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch @@ -1,13 +1,14 @@ -From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 +From aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 13 Apr 2020 20:12:11 +0200 Subject: [PATCH] include: Declare gVERSION global as 'extern'. Fixes build with '-fno-common'. +Signed-off-by: Thomas Ingleby [Retrieved from: -https://github.com/eclipse/mraa/pull/1012/commits/dbb5961f106ec42cd70689d933674c9c37aedfe1] -Signed-off-by: Fabrice Fontaine +https://github.com/eclipse/mraa/commit/aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031] +Signed-off-by: Fabrice Fontaine --- include/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch b/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch deleted file mode 100644 index fbadfe79ef..0000000000 --- a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch +++ /dev/null @@ -1,193 +0,0 @@ -From cb88e4dd1fbbb9d24e625dba2768b88ed99da309 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Jun 2020 22:51:37 +0200 -Subject: [PATCH] CMakeLists.txt: add BUILDCPP option - -C++ is a mandatory dependency since version 1.4.0 and -https://github.com/eclipse/mraa/commit/122cab1f1e53b7c9c7cd82905b962071f9bad9dc - -As a result, build on embedded toolchains that do not support C++ fails -on: - -CMake Error at CMakeLists.txt:2 (project): - The CMAKE_CXX_COMPILER: - - /home/naourr/work/instance-1/output-1/per-package/mraa/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - -Fixes: - - http://autobuild.buildroot.org/results/31086422e03611c16ab59c4418e3669b580bc0c0 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/eclipse/mraa/commit/cb88e4dd1fbbb9d24e625dba2768b88ed99da309] ---- - CMakeLists.txt | 69 +++++++++++++++++++---------------- - src/java/CMakeLists.txt | 4 +- - src/javascript/CMakeLists.txt | 34 +++++++++-------- - 3 files changed, 59 insertions(+), 48 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 250d9106e..90c0dc920 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required (VERSION 2.8.11) --project (mraa C CXX) -+project (mraa C) - - FIND_PACKAGE (Threads REQUIRED) - -@@ -11,6 +11,8 @@ else () - set (CMAKE_C_STANDARD 99) - endif () - -+option (BUILDCPP "Enable C++ (needed by FTDI4222 and tests)" ON) -+ - ############################################################################### - # Detect supported warning flags - # Modified from work By Dan Liew (fpbench - MIT) -@@ -33,15 +35,18 @@ set (MRAA_C_WARNING_FLAGS - -Werror=missing-parameter-type - ) - --# Warning flags for the C++ compiler only --set (MRAA_CXX_WARNING_FLAGS -- -Wnon-virtual-dtor -- -Woverloaded-virtual -- -Wreorder --) -- - include (CheckCCompilerFlag) --include (CheckCXXCompilerFlag) -+if (BUILDCPP) -+ # Warning flags for the C++ compiler only -+ set (MRAA_CXX_WARNING_FLAGS -+ -Wnon-virtual-dtor -+ -Woverloaded-virtual -+ -Wreorder -+ ) -+ -+ enable_language (CXX) -+ include (CheckCXXCompilerFlag) -+endif () - function (MRAA_SANITIZE_FLAG_NAME OUTPUT_VAR FLAG) - string (REPLACE "-" "_" SANITIZED_FLAG_NAME "${FLAG}") - string (REPLACE "/" "_" SANITIZED_FLAG_NAME "${SANITIZED_FLAG_NAME}") -@@ -62,28 +67,30 @@ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_C_WARNING_FLAGS}) - endif () - endforeach () - --# Globally set C++ compiler warning flags that are supported and emit --# a warning about unsupported flags --foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) -- MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") -- CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) -- if (HAS_CXX_${SANITIZED_FLAG_NAME}) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") -- else () -- message (WARNING "C++ compiler does not support flag \"${flag}\"") -- endif () --endforeach () -- --# This function adds the c++11 flag to a c++ target (if supported) --function(use_cxx_11 targetname) -- include(CheckCXXCompilerFlag) -- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -- if (COMPILER_SUPPORTS_CXX11) -- set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") -- else() -- message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") -- endif() --endfunction() -+if (BUILDCPP) -+ # Globally set C++ compiler warning flags that are supported and emit -+ # a warning about unsupported flags -+ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) -+ MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") -+ CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) -+ if (HAS_CXX_${SANITIZED_FLAG_NAME}) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") -+ else () -+ message (WARNING "C++ compiler does not support flag \"${flag}\"") -+ endif () -+ endforeach () -+ -+ # This function adds the c++11 flag to a c++ target (if supported) -+ function(use_cxx_11 targetname) -+ include(CheckCXXCompilerFlag) -+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -+ if (COMPILER_SUPPORTS_CXX11) -+ set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") -+ else() -+ message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") -+ endif() -+ endfunction() -+endif() - - # Set CMAKE_INSTALL_LIBDIR if not defined - include(GNUInstallDirs) -diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt -index 231c755fa..cfa72a0df 100644 ---- a/src/java/CMakeLists.txt -+++ b/src/java/CMakeLists.txt -@@ -16,7 +16,9 @@ include_directories ( - set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src") - set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") -+if (BUILDCPP) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") -+endif() - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") - - if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) -diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt -index 25fd36275..99a96b49d 100644 ---- a/src/javascript/CMakeLists.txt -+++ b/src/javascript/CMakeLists.txt -@@ -36,25 +36,27 @@ set_target_properties (mraajs PROPERTIES - ) - - message (STATUS "INFO - swig Version ${SWIG_VERSION}") --message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") -+if (BUILDCPP) -+ message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") - --if (${V8_VERSION_MAJOR} GREATER 3) -- message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") -- # Node 0.12.x V8 engine major version is '3'. -- # Node 2.1.0 V8 engine major version is '4'. -- set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) -- set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) -- if (CMAKE_VERSION VERSION_LESS "3.1") -- message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") -- if (CMAKE_COMPILER_IS_GNUCXX) -- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -- message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") -+ if (${V8_VERSION_MAJOR} GREATER 3) -+ message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") -+ # Node 0.12.x V8 engine major version is '3'. -+ # Node 2.1.0 V8 engine major version is '4'. -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) -+ if (CMAKE_VERSION VERSION_LESS "3.1") -+ message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") -+ if (CMAKE_COMPILER_IS_GNUCXX) -+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -+ message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") -+ endif () -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") -+ else () -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") - endif () -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") -- else () -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") - endif () -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") - endif () - endif () - diff --git a/package/mraa/mraa.hash b/package/mraa/mraa.hash index f29a5ce838..321b6409ed 100644 --- a/package/mraa/mraa.hash +++ b/package/mraa/mraa.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345 mraa-2.1.0.tar.gz +sha256 076669bee8423ffef3065735b293a329020be86630fea457174dbfcc67a0554a mraa-2.2.0.tar.gz sha256 fac52622ed3badd86b34857b21777ab90296d6ccbc2ac0fd457c09fdeefa9ef1 COPYING diff --git a/package/mraa/mraa.mk b/package/mraa/mraa.mk index 910339b386..47178a423b 100644 --- a/package/mraa/mraa.mk +++ b/package/mraa/mraa.mk @@ -4,7 +4,7 @@ # ################################################################################ -MRAA_VERSION = 2.1.0 +MRAA_VERSION = 2.2.0 MRAA_SITE = $(call github,eclipse,mraa,v$(MRAA_VERSION)) MRAA_LICENSE = MIT MRAA_LICENSE_FILES = COPYING From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/jose: bump to version 11 Message-ID: <20220104180256.DFA4F82BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b72b849ad597810823ecf9efe471a40e2427c8e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to meson-package (and so drop second patch) - Update indentation in hash file (two spaces) https://github.com/latchset/jose/releases/tag/v11 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...02-configure-fix-build-with-old-compilers.patch | 165 --------------------- package/jose/jose.hash | 4 +- package/jose/jose.mk | 8 +- 3 files changed, 5 insertions(+), 172 deletions(-) diff --git a/package/jose/0002-configure-fix-build-with-old-compilers.patch b/package/jose/0002-configure-fix-build-with-old-compilers.patch deleted file mode 100644 index 0484f38f0d..0000000000 --- a/package/jose/0002-configure-fix-build-with-old-compilers.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 98e9faa4d39cd5b6aaab882877e19ae394ba3810 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Nov 2017 23:10:38 +0100 -Subject: [PATCH] configure: fix build with old compilers - -Old gcc versions (gcc 4.7) do not support all warnings flags currently -hard-coded by configure.ac. In order to fix this, we import the -AX_CHECK_COMPILE_FLAG() macro from the autoconf-archive, and use it in -the configure.ac to only use warning flags when the compiler supports -them. - -Submitted-upstream: https://github.com/latchset/jose/pull/51 -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 46 +++++++++++++++------------- - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 105 insertions(+), 22 deletions(-) - create mode 100644 m4/ax_check_compile_flag.m4 - -diff --git a/configure.ac b/configure.ac -index cf8c9a6..6fe4ded 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,6 @@ - AC_PREREQ(2.62) - AC_INIT(jose, 10) -+AC_CONFIG_MACRO_DIRS([m4]) - AC_CANONICAL_SYSTEM - AC_PROG_CC_C99 - -@@ -18,27 +19,30 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.0.2]) - AC_OPENMP - AC_SUBST([OPENMP_CFLAGS]) - --JOSE_CFLAGS="\ ---Wall \ ---Wextra \ ---Werror \ ---Wstrict-aliasing \ ---Wchar-subscripts \ ---Wformat-security \ ---Wmissing-declarations \ ---Wmissing-prototypes \ ---Wnested-externs \ ---Wpointer-arith \ ---Wshadow \ ---Wsign-compare \ ---Wstrict-prototypes \ ---Wtype-limits \ ---Wunused-function \ ---Wno-missing-field-initializers \ ---Wno-unused-command-line-argument \ ---Wno-unused-parameter \ ---Wno-unknown-pragmas \ --" -+for flag in \ -+ -Wall \ -+ -Wextra \ -+ -Werror \ -+ -Wstrict-aliasing \ -+ -Wchar-subscripts \ -+ -Wformat-security \ -+ -Wmissing-declarations \ -+ -Wmissing-prototypes \ -+ -Wnested-externs \ -+ -Wpointer-arith \ -+ -Wshadow \ -+ -Wsign-compare \ -+ -Wstrict-prototypes \ -+ -Wtype-limits \ -+ -Wunused-function \ -+ -Wno-missing-field-initializers \ -+ -Wno-unused-command-line-argument \ -+ -Wno-unused-parameter \ -+ -Wno-unknown-pragmas ; do -+ AX_CHECK_COMPILE_FLAG([${flag}], -+ [JOSE_CFLAGS="${JOSE_CFLAGS} ${flag}"]) -+done -+ - AC_SUBST([JOSE_CFLAGS]) - - AC_MSG_CHECKING([for linker script support]) -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..dcabb92 ---- /dev/null -+++ b/m4/ax_check_compile_flag.m4 -@@ -0,0 +1,74 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the current language's compiler -+# or gives an error. (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the current language's default -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -+# force the compiler to issue an error when a bad flag is given. -+# -+# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim -+# Copyright (c) 2011 Maarten Bosmans -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 5 -+ -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], -+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" -+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -+AS_VAR_IF(CACHEVAR,yes, -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_COMPILE_FLAGS --- -2.13.6 - diff --git a/package/jose/jose.hash b/package/jose/jose.hash index 376bc0b585..128d26d163 100644 --- a/package/jose/jose.hash +++ b/package/jose/jose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72 jose-10.tar.bz2 -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING +sha256 e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 jose-11.tar.xz +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING diff --git a/package/jose/jose.mk b/package/jose/jose.mk index 2758d408da..8a60e20cc6 100644 --- a/package/jose/jose.mk +++ b/package/jose/jose.mk @@ -4,14 +4,12 @@ # ################################################################################ -JOSE_VERSION = 10 -JOSE_SOURCE = jose-$(JOSE_VERSION).tar.bz2 +JOSE_VERSION = 11 +JOSE_SOURCE = jose-$(JOSE_VERSION).tar.xz JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) JOSE_LICENSE = Apache-2.0 JOSE_LICENSE_FILES = COPYING -# 0002-configure-fix-build-with-old-compilers.patch -JOSE_AUTORECONF = YES JOSE_INSTALL_STAGING = YES JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/freeipmi: fix uclibc-ng build Message-ID: <20220104180257.6F87983249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f1acbea1dc7ad7c6cbb4dfc2aafd4bd428b416e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit 663f39c88c01593855c18355a4decdceeffd884b: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': /home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' Fixes: - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/freeipmi/0002-check-for-inb-and-outb.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch new file mode 100644 index 0000000000..3bc006acc7 --- /dev/null +++ b/package/freeipmi/0002-check-for-inb-and-outb.patch @@ -0,0 +1,50 @@ +From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 10:37:00 +0100 +Subject: [PATCH] check for inb and outb + +Check for inb and outb before using them to avoid the following build +failure on uclibc-ng: + +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': +/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' + +Fixes: + - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] +--- + configure.ac | 2 +- + libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 711b27674..bcc4156ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) + AC_CHECK_FUNCS([getline getprogname]) + AC_CHECK_FUNCS([strerror strerror_r]) + AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) +-AC_CHECK_FUNCS([iopl]) ++AC_CHECK_FUNCS([inb iopl outb]) + AC_CHECK_FUNCS([asprintf]) + AC_CHECK_FUNCS([cbrt]) + AC_CHECK_FUNCS([getmsg putmsg]) +diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c +index c212887c0..a9d4b2e96 100644 +--- a/libfreeipmi/driver/ipmi-kcs-driver.c ++++ b/libfreeipmi/driver/ipmi-kcs-driver.c +@@ -162,7 +162,7 @@ + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + # define _INB(port) inb (port) + # define _OUTB(data, port) outb (port, data) +-#elif defined(HAVE_IOPL) ++#elif defined(HAVE_INB) && defined(HAVE_OUTB) + # define _INB(port) inb (port) + # define _OUTB(data, port) outb (data, port) + #else +-- +2.33.0 + From arnout at mind.be Tue Jan 4 18:00:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:00:33 +0100 Subject: [Buildroot] [git commit] package/python-pyqt5: Fix per-package build Message-ID: <20220104180257.81B8183249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51c22b4ba905f8e0a0f75189715eab628cefab6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pyqt5 uses qmake internally, but is python package rather than a qmake package. Therefore, we need to manually apply the same fixup as for qmake packages. Without this, top-level parallel build may fail because dependencies are looked for in the qt5 per-package staging directory instead of the python-pyqt5 one. Signed-off-by: Florent AUMAITRE Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pyqt5/python-pyqt5.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 8f28c90d15..b05043563e 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL ) endef +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP + PYTHON_PYQT5_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: fix build with gcc 4.8 Message-ID: <20220104180257.67D5282BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17aa836bd7a2c90da053398ce024b4113cf8b53c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: option.c: In function 'one_opt': option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode for (char *p = arg; *p; p++) { ^ option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { ^ Fixes: - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-src-option.c-fix-build-with-gcc-4.8.patch | 52 ++++++++++++++++++++++ ...2909d9080ff8743133fbd52427b4b2213171-typo.patch | 36 +++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..50ecf2f18a --- /dev/null +++ b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,52 @@ +From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 31 Dec 2021 17:29:44 +0100 +Subject: [PATCH] src/option.c: fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8 raised since version 2.86: + +option.c: In function 'one_opt': +option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode + for (char *p = arg; *p; p++) { + ^ +option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code +option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode + for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 + +Signed-off-by: Fabrice Fontaine +[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] +--- + src/option.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index ff54def..c57f6d8 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + arg += 9; + if (strlen(arg) != 16) + ret_err(gen_err); +- for (char *p = arg; *p; p++) { ++ char *p; ++ for (*p = arg; *p; p++) { + if (!isxdigit((int)*p)) + ret_err(gen_err); + } +@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + + u8 *u = daemon->umbrella_device; + char word[3]; +- for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { ++ u8 i; ++ for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { + memcpy(word, &(arg[0]), 2); + *u++ = strtoul(word, NULL, 16); + } +-- +2.33.0 + diff --git a/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch new file mode 100644 index 0000000000..8cdf5b3f1b --- /dev/null +++ b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch @@ -0,0 +1,36 @@ +From 2748fb81e23b71e2c44956e99321816aca91905d Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Sat, 1 Jan 2022 23:03:26 +0000 +Subject: [PATCH] Fix 46312909d9080ff8743133fbd52427b4b2213171 typo. + +[Upstream commit 2748fb81e23b71e2c44956e99321816aca91905d] +Signed-off-by: Fabrice Fontaine +--- + src/option.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index c57f6d8..6f56ce8 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -357,7 +357,7 @@ static const struct myoption opts[] = + { "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID }, + { "dynamic-host", 1, 0, LOPT_DYNHOST }, + { "log-debug", 0, 0, LOPT_LOG_DEBUG }, +- { "umbrella", 2, 0, LOPT_UMBRELLA }, ++ { "umbrella", 2, 0, LOPT_UMBRELLA }, + { "quiet-tftp", 0, 0, LOPT_QUIET_TFTP }, + { NULL, 0, 0, 0 } + }; +@@ -2526,7 +2526,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + if (strlen(arg) != 16) + ret_err(gen_err); + char *p; +- for (*p = arg; *p; p++) { ++ for (p = arg; *p; p++) { + if (!isxdigit((int)*p)) + ret_err(gen_err); + } +-- +2.33.0 + From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/tinyalsa: bump to version 2.0.0 Message-ID: <20220104180257.11C7483249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b9c8f8cb53e449e39899a40712703c272c5eeff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to meson-package to drop first patch and disable examples and utils - Drop second patch (already in version) - Update hash of NOTICE (empty new lines added with https://github.com/tinyalsa/tinyalsa/commit/902b8c8f9fa5a2e1937007d7d5ee90f01790808b) https://github.com/tinyalsa/tinyalsa/releases/tag/v2.0.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/tinyalsa/0001-disable-doxygen-usage.patch | 35 --------------------- .../0002-interval.h-add-missing-header.patch | 36 ---------------------- package/tinyalsa/tinyalsa.hash | 4 +-- package/tinyalsa/tinyalsa.mk | 27 +++------------- 4 files changed, 6 insertions(+), 96 deletions(-) diff --git a/package/tinyalsa/0001-disable-doxygen-usage.patch b/package/tinyalsa/0001-disable-doxygen-usage.patch deleted file mode 100644 index ed939fb9bf..0000000000 --- a/package/tinyalsa/0001-disable-doxygen-usage.patch +++ /dev/null @@ -1,35 +0,0 @@ -Disable doxygen usage - -In order to avoid a dependency on doxygen on the build machine, this -patch adjusts the main Makefile to not build and install the -documentation. - -[Vincent: tweak patch for 1.1.1 version] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Makefile b/Makefile ---- a/Makefile 2017-05-24 05:23:57.000000000 +0100 -+++ b/Makefile 2017-05-25 10:35:20.781747053 +0100 -@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man - all: - $(MAKE) -C src - $(MAKE) -C utils -- $(MAKE) -C doxygen - $(MAKE) -C examples - - .PHONY: clean - clean: - $(MAKE) -C src clean - $(MAKE) -C utils clean -- $(MAKE) -C doxygen clean - $(MAKE) -C examples clean - - .PHONY: install -@@ -30,5 +28,4 @@ install: - install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/ - $(MAKE) -C src install - $(MAKE) -C utils install -- $(MAKE) -C doxygen install - diff --git a/package/tinyalsa/0002-interval.h-add-missing-header.patch b/package/tinyalsa/0002-interval.h-add-missing-header.patch deleted file mode 100644 index c043145b55..0000000000 --- a/package/tinyalsa/0002-interval.h-add-missing-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 2 Jun 2017 12:19:03 +0300 -Subject: [PATCH] interval.h: add missing header - -The ssize_t type requires the unistd.h header. This fixes build with musl -libc: - -In file included from ../include/tinyalsa/limits.h:32:0, - from limits.c:1: -../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t' - ssize_t max; - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98 - - include/tinyalsa/interval.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h -index 3f6f3dce5d90..068571df5a63 100644 ---- a/include/tinyalsa/interval.h -+++ b/include/tinyalsa/interval.h -@@ -30,6 +30,7 @@ - #define TINYALSA_INTERVAL_H - - #include -+#include - - /** A closed range signed interval. */ - --- -2.11.0 - diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash index d078bab597..f7673b1769 100644 --- a/package/tinyalsa/tinyalsa.hash +++ b/package/tinyalsa/tinyalsa.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz -sha256 ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d NOTICE +sha256 573ae0b2d3480851c1d2a12503ead2beea27f92d44ed47b74b553ba947994ef1 tinyalsa-2.0.0.tar.gz +sha256 ea22a4711f5250f88a4d7011fbc65367d1b02ac954dcc49f5b6d7c135e6537c4 NOTICE diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index bd9d9a00d0..b5c39e35d6 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -4,30 +4,11 @@ # ################################################################################ -TINYALSA_VERSION = 1.1.1 -TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) +TINYALSA_VERSION = 2.0.0 +TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled -define TINYALSA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) -endef - -define TINYALSA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(STAGING_DIR)" install -endef - -define TINYALSA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/tpm2-tools: bump version to 5.2 Message-ID: <20220104180257.24DBE82BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e39bd0439be9f65a7b03f4bcd86bf2fbb16b212 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Depedency on libuuid was removed in: https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 Signed-off-by: Erik Larsson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-configure-make-build-gnu99.patch | 30 ---------------------- package/tpm2-tools/Config.in | 2 -- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 6 ++--- 4 files changed, 3 insertions(+), 37 deletions(-) diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch deleted file mode 100644 index 37ca6c5873..0000000000 --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 -From: William Roberts -Date: Mon, 8 Feb 2021 11:57:28 -0600 -Subject: [PATCH] configure: make build gnu99 - -Signed-off-by: William Roberts - -[Retrieved from: -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c -and updated to set gnu99 instead of c99 as done by -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dc15b5595..25039a0d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ - # -D_GNU_SOURCE is required for execvpe() in options.c - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) - -+# Enable gnu99 mode, since we use some of these features. -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) -+ - # Best attempt compiler options that are on newer versions of GCC that - # we can't widely enforce without killing other peoples builds. - # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 3be947648f..1a6698570a 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index bfb7e9b220..f50a896363 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 41f5bcf201..8675344805 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,15 +4,13 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.3.2 +TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux -# We're patching configure.ac -TPM2_TOOLS_AUTORECONF = YES +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] configs/stm32f469_disco_xip: remove BR2_LINUX_KERNEL_XZ Message-ID: <20220104180257.4681183249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01a4446d1cff0ff67a4fdc7778a259105634643c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a XIP kernel, so it shouldn't be compressed. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/stm32f469_disco_xip_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index f3d333278a..6c4f227f58 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -7,7 +7,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_XZ=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/libiio: set PYTHON_EXECUTABLE Message-ID: <20220104180257.5E7EF82BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f384de4f4ec646c28dab6c442dd6bb2f06628725 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set PYTHON_EXECUTABLE to avoid the following build failure when BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without setuptools on host: -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter -- new -- Python_EXECUTABLE /usr/bin/python3.5 [...] Traceback (most recent call last): File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in from setuptools import setup ImportError: No module named 'setuptools' Fixes: - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 Signed-off-by: Fabrice Fontaine Acked-by: Paul Cercueil Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libiio/libiio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index f706298c22..38b2f83e6e 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -76,8 +76,10 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) ifeq ($(BR2_PACKAGE_PYTHON),y) LIBIIO_DEPENDENCIES += host-python-setuptools python +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python else ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 endif LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON else From fontaine.fabrice at gmail.com Tue Jan 4 18:08:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:08:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcm-tools: fix static build Message-ID: <20220104180826.3171770-1-fontaine.fabrice@gmail.com> Don't build c_example which needs a dynamic library and so will raise the following static build failure since bump to version 2021.10 in commit d1d93d488c76d4bc2551270007096693d8194435 and https://github.com/opcm/pcm/commit/12647a6ee579c29bd306fd034470eb62dcb3156e: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: cannot find -lpcm Fixes: - http://autobuild.buildroot.org/results/1276a3d49c8848039f034e7f03632df365097e94 Signed-off-by: Fabrice Fontaine --- package/pcm-tools/pcm-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index 8a58034232..d676df57f9 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -17,7 +17,8 @@ define PCM_TOOLS_BUILD_CMDS touch $(@D)/daemon-binaries $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" \ - UNAME=Linux HOST=_LINUX + UNAME=Linux HOST=_LINUX \ + $(foreach f,$(PCM_TOOLS_EXE_FILES),$(f).x) endef ifeq ($(BR2_PACKAGE_PCM_TOOLS_PMU_QUERY),y) -- 2.34.1 From arnout at mind.be Tue Jan 4 18:09:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:09:31 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-pyqt5: Fix parallel build In-Reply-To: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> References: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> Message-ID: <8481639d-e8cd-89d2-dbf6-8d2ae54cabef@mind.be> On 03/01/2022 17:54, Florent AUMAITRE wrote: > This patch fix build of python-pyqt5 package when parallel build is used This explanation was a bit too terse. I tried to invent something that is more complete: pyqt5 uses qmake internally, but is python package rather than a qmake package. Therefore, we need to manually apply the same fixup as for qmake packages. Without this, top-level parallel build may fail because dependencies are looked for in the qt5 per-package staging directory instead of the python-pyqt5 one. Hopefully that's more or less correct :-) > > Signed-off-by: Florent AUMAITRE > > Changes v1 -> v2: > - Re-use the existing QT5_INSTALL_QT_CONF macro from package/qt5/qt5.mk (suggested by Thomas Petazzoni) This should go below a --- line, i.e.: --- Changes v1 -> v2: That way, it is not part of the git history. Applied to master with those things changed, thanks. Regards, Arnout > > Signed-off-by: Florent AUMAITRE > --- > package/python-pyqt5/python-pyqt5.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk > index 8f28c90d15..b05043563e 100644 > --- a/package/python-pyqt5/python-pyqt5.mk > +++ b/package/python-pyqt5/python-pyqt5.mk > @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL > ) > endef > > +# The file "qt.conf" can be used to override the hard-coded paths that are > +# compiled into the Qt library. We need it to make "qmake" relocatable and > +# tweak the per-package install pathes > +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP > + > PYTHON_PYQT5_CONF_OPTS = \ > --bindir $(TARGET_DIR)/usr/bin \ > --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ > From fontaine.fabrice at gmail.com Tue Jan 4 18:11:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:11:06 +0100 Subject: [Buildroot] [PATCH 1/2] package/liburing: new package Message-ID: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> This is the io_uring library, liburing. liburing provides helpers to setup and teardown io_uring instances, and also a simplified interface for applications that don't need (or want) to deal with the full kernel side implementation. https://git.kernel.dk/cgit/liburing Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/liburing/Config.in | 13 ++++++++++++ package/liburing/liburing.hash | 8 ++++++++ package/liburing/liburing.mk | 36 ++++++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 package/liburing/Config.in create mode 100644 package/liburing/liburing.hash create mode 100644 package/liburing/liburing.mk diff --git a/DEVELOPERS b/DEVELOPERS index 444e58714c..5017dde56e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -904,6 +904,7 @@ F: package/librsync/ F: package/libsoup/ F: package/libsoxr/ F: package/libupnp/ +F: package/liburing/ F: package/libv4l/ F: package/libxslt/ F: package/mbedtls/ diff --git a/package/Config.in b/package/Config.in index e09e4aad3f..1f3ec9a334 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2001,6 +2001,7 @@ menu "Other" source "package/libuci/Config.in" source "package/libunwind/Config.in" source "package/liburcu/Config.in" + source "package/liburing/Config.in" source "package/libuv/Config.in" source "package/lightning/Config.in" source "package/linux-pam/Config.in" diff --git a/package/liburing/Config.in b/package/liburing/Config.in new file mode 100644 index 0000000000..898d95cfa6 --- /dev/null +++ b/package/liburing/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBURING + bool "liburing" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + help + This is the io_uring library, liburing. liburing provides + helpers to setup and teardown io_uring instances, and also a + simplified interface for applications that don't need (or + want) to deal with the full kernel side implementation. + + https://git.kernel.dk/cgit/liburing + +comment "liburing needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash new file mode 100644 index 0000000000..56e90d71cc --- /dev/null +++ b/package/liburing/liburing.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 df7c8fd05fd39da622b2814e06f815f11f1beb429487a4330eed64bb7f353dbf liburing-2.1.tar.bz2 + +# Hash for license files +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 d0b225f17ef2d05d5cda6b25b2dc334ef6f5f12537c20edf6e391852a095ec19 LICENSE +sha256 97d62ff5d7cf0b1cef34c33a89877352911278ca4ac1c6c4f24a835baa5ea10b README diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk new file mode 100644 index 0000000000..a977e74b4f --- /dev/null +++ b/package/liburing/liburing.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# liburing +# +################################################################################ + +LIBURING_VERSION = 2.1 +LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 +LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot +LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT +LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README +LIBURING_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBURING_MAKE_OPTS += ENABLE_SHARED=0 +else +LIBURING_MAKE_OPTS += ENABLE_SHARED=1 +endif + +define LIBURING_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define LIBURING_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D)/src +endef + +define LIBURING_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install +endef + +define LIBURING_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 18:11:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:11:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/lxc: add liburing optional dependency In-Reply-To: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> Message-ID: <20220104181107.3171973-2-fontaine.fabrice@gmail.com> liburing is an optional dependency (enabed by default) since version 4.0.11 and https://github.com/lxc/lxc/commit/b1f9aee5c466b5a6d88582375ea15971d846d18b Signed-off-by: Fabrice Fontaine --- package/lxc/lxc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4d63fc14cb..08f64bcec7 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -44,6 +44,13 @@ else LXC_CONF_OPTS += --disable-selinux endif +ifeq ($(BR2_PACKAGE_LIBURING),y) +LXC_CONF_OPTS += --enable-liburing +LXC_DEPENDENCIES += liburing +else +LXC_CONF_OPTS += --disable-liburing +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LXC_CONF_OPTS += --enable-openssl LXC_DEPENDENCIES += openssl -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 18:17:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:17:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 Message-ID: <20220104181757.3207568-1-fontaine.fabrice@gmail.com> - Drop patch (already in version) - This bump will also fix the following build failure on musl raised since the addition of the package in commit e821078031e14df69e5142f23e9cb7b5a1ea0e77: text-scroller.cc: In function 'int main(int, char**)': text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? 220 | uint frame_counter = 0; | ^~~~ | rint Fixes: - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 Signed-off-by: Fabrice Fontaine --- .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 ------------------- .../rpi-rgb-led-matrix.hash | 2 +- .../rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 2 +- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch deleted file mode 100644 index f7a92f5fb2..0000000000 --- a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 -From: Grzegorz Blach -Date: Sat, 29 Aug 2020 20:48:57 +0200 -Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. - -This change allows additional flags to be added to the linker -from the command line. - -Signed-off-by: Grzegorz Blach ---- - utils/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/utils/Makefile b/utils/Makefile -index e751adc..e704442 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include - RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib - RGB_LIBRARY_NAME=rgbmatrix - RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a --LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread -+RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread - - # Imagemagic flags, only needed if actually compiled. - MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) -@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE - $(MAKE) -C $(RGB_LIBDIR) - - text-scroller: text-scroller.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) - - led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) -+ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) - - video-viewer: video-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) -+ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) - - %.o : %.cc - $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< --- -2.24.3 (Apple Git-128) - diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash index 3b1cb5fd76..265e4c4249 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz +sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk index e436755121..499fb408c2 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 +RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 18:20:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:20:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/openipmi: bump to version 2.0.32 Message-ID: <20220104182037.3292464-1-fontaine.fabrice@gmail.com> - Refresh patch and send it upstream - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...01-Avoid-searching-host-library-path.patch | 27 ++++++++++--------- package/openipmi/openipmi.hash | 12 ++++----- package/openipmi/openipmi.mk | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch index 44a57dcfb4..15b4510f67 100644 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ b/package/openipmi/0001-Avoid-searching-host-library-path.patch @@ -10,6 +10,9 @@ $(libdir) in the library search path. Signed-off-by: Baruch Siach Signed-off-by: Joel Stanley +[Fabrice: refresh patch for 2.0.32] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/openipmi/patches/35] --- cmdlang/Makefile.am | 3 +-- unix/Makefile.am | 6 ++---- @@ -19,13 +22,12 @@ diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am index 264ee12be79f..0b3843784656 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - libOpenIPMIcmdlang_la_LIBADD = -lm \ +@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined bin_PROGRAMS = openipmish @@ -33,20 +35,19 @@ diff --git a/unix/Makefile.am b/unix/Makefile.am index 5128839dad13..bd0f897ba8d6 100644 --- a/unix/Makefile.am +++ b/unix/Makefile.am -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c +@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ $(GDBM_LIB) $(RT_LIB) --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined noinst_HEADERS = heap.h diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index 2ec9dd31af..eded076ade 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 be0c87743a38e2fa00586df931f021c0b480385b OpenIPMI-2.0.28.tar.gz -md5 ba37f08e306062ec73c7ed2a2bd4d5f4 OpenIPMI-2.0.28.tar.gz +sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz +md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz # Locally computed -sha256 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 OpenIPMI-2.0.28.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB +sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index 3240b89894..ad2f2d2f4f 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.28 +OPENIPMI_VERSION = 2.0.32 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 18:25:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:25:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: bump to version 2.1.5 Message-ID: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, fixing two SMTP authentication issues, a crash bug on NetBSD, and a couple other issues. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog Signed-off-by: Fabrice Fontaine --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index dceae57b65..d439b23aa3 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz +sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 44d7864eb6..7e9046fe8a 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.4 +MUTT_VERSION = 2.1.5 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL -- 2.34.1 From arnout at mind.be Tue Jan 4 18:30:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:30:11 +0100 Subject: [Buildroot] [PATCH] package/terminology: bump to version 1.12.0 In-Reply-To: <20220103210713.8642-1-romain.naour@gmail.com> References: <20220103210713.8642-1-romain.naour@gmail.com> Message-ID: <2386b29d-68b3-5ffa-8a0e-6dfd3de3b83d@mind.be> On 03/01/2022 22:07, Romain Naour wrote: > Requires efl 1.26.0 [1] > > [1] https://git.enlightenment.org/apps/terminology.git/commit/?id=3e95d2ad9f59e01d498e90dcb4413dc886d49852 > > See: > https://www.enlightenment.org/news/2022-01-02-terminology-1.12.0 > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Arnout > --- > package/terminology/terminology.hash | 4 ++-- > package/terminology/terminology.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash > index be1d6f4269..7e9658482a 100644 > --- a/package/terminology/terminology.hash > +++ b/package/terminology/terminology.hash > @@ -1,3 +1,3 @@ > -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz.sha256sum > -sha256 3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c terminology-1.9.0.tar.xz > +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum > +sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz > sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING > diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk > index 29b59fb39e..787c9ad137 100644 > --- a/package/terminology/terminology.mk > +++ b/package/terminology/terminology.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TERMINOLOGY_VERSION = 1.9.0 > +TERMINOLOGY_VERSION = 1.12.0 > TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz > TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology > TERMINOLOGY_LICENSE = BSD-2-Clause > From arnout at mind.be Tue Jan 4 18:30:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:30:26 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.1.5 In-Reply-To: <20220103210816.26410-1-ps.report@gmx.net> References: <20220103210816.26410-1-ps.report@gmx.net> Message-ID: <9103e134-aa44-0218-da7e-5face2b74edc@mind.be> On 03/01/2022 22:08, Peter Seiderer wrote: > - remove 0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > (upstream applied [1]). > > For details see [2]. > > [1] https://github.com/assimp/assimp/commit/a099fe7cd331a839137115db5df1733c4c1c8070 > [2] https://github.com/assimp/assimp/releases/tag/v5.1.5 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > ...-explicit-namespace-instead-of-using.patch | 57 ------------------- > package/assimp/assimp.hash | 2 +- > package/assimp/assimp.mk | 2 +- > 3 files changed, 2 insertions(+), 59 deletions(-) > delete mode 100644 package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > > diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > deleted file mode 100644 > index c83e9c50a4..0000000000 > --- a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > +++ /dev/null > @@ -1,57 +0,0 @@ > -From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer > -Date: Thu, 30 Dec 2021 18:01:54 +0100 > -Subject: [PATCH] BlenderScene: use explicit namespace instead of using > - namespace > - > -Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): > - > - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > - const FileDatabase &db) const { > - ^ > - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > - void Convert(T &dest, const FileDatabase &db) const; > - ^ > - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > - const FileDatabase &db) const { > - ^ > - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > - void Convert(T &dest, const FileDatabase &db) const; > - ^ > - > -[backport from upstream commit a099fe7cd331] > -Signed-off-by: Peter Seiderer > ---- > - code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- > - 1 file changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp > -index c93d913fc..9ad086fe6 100644 > ---- a/code/AssetLib/Blender/BlenderScene.cpp > -+++ b/code/AssetLib/Blender/BlenderScene.cpp > -@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > - #include "BlenderDNA.h" > - #include "BlenderSceneGen.h" > - > --using namespace Assimp; > --using namespace Assimp::Blender; > -+namespace Assimp { > -+namespace Blender { > - > - //-------------------------------------------------------------------------------- > - template <> > -@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { > - converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); > - } > - > -+} // namespace Blender > -+} //namespace Assimp > -+ > - #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER > --- > -2.34.1 > - > diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash > index 89b8d168c2..8f6d613bb4 100644 > --- a/package/assimp/assimp.hash > +++ b/package/assimp/assimp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6 assimp-5.1.4.tar.gz > +sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz > sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE > diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk > index ead5d73bca..b5f84ef56f 100644 > --- a/package/assimp/assimp.mk > +++ b/package/assimp/assimp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ASSIMP_VERSION = 5.1.4 > +ASSIMP_VERSION = 5.1.5 > ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) > ASSIMP_LICENSE = BSD-3-Clause > ASSIMP_LICENSE_FILES = LICENSE > From arnout at mind.be Tue Jan 4 18:30:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:30:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 In-Reply-To: <20220104181757.3207568-1-fontaine.fabrice@gmail.com> References: <20220104181757.3207568-1-fontaine.fabrice@gmail.com> Message-ID: <6812e29d-ecb5-fd13-53fc-828ec21bde82@mind.be> On 04/01/2022 19:17, Fabrice Fontaine wrote: > - Drop patch (already in version) > - This bump will also fix the following build failure on musl raised > since the addition of the package in commit > e821078031e14df69e5142f23e9cb7b5a1ea0e77: > > text-scroller.cc: In function 'int main(int, char**)': > text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? > 220 | uint frame_counter = 0; > | ^~~~ > | rint > > Fixes: > - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 ------------------- > .../rpi-rgb-led-matrix.hash | 2 +- > .../rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 2 +- > 3 files changed, 2 insertions(+), 48 deletions(-) > delete mode 100644 package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch > > diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch > deleted file mode 100644 > index f7a92f5fb2..0000000000 > --- a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 > -From: Grzegorz Blach > -Date: Sat, 29 Aug 2020 20:48:57 +0200 > -Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. > - > -This change allows additional flags to be added to the linker > -from the command line. > - > -Signed-off-by: Grzegorz Blach > ---- > - utils/Makefile | 8 ++++---- > - 1 file changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/utils/Makefile b/utils/Makefile > -index e751adc..e704442 100644 > ---- a/utils/Makefile > -+++ b/utils/Makefile > -@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include > - RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib > - RGB_LIBRARY_NAME=rgbmatrix > - RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a > --LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread > -+RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread > - > - # Imagemagic flags, only needed if actually compiled. > - MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) > -@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE > - $(MAKE) -C $(RGB_LIBDIR) > - > - text-scroller: text-scroller.o $(RGB_LIBRARY) > -- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) > -+ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) > - > - led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) > -- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) > -+ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) > - > - video-viewer: video-viewer.o $(RGB_LIBRARY) > -- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) > -+ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) > - > - %.o : %.cc > - $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< > --- > -2.24.3 (Apple Git-128) > - > diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash > index 3b1cb5fd76..265e4c4249 100644 > --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash > +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz > +sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk > index e436755121..499fb408c2 100644 > --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk > +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 > +RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 > RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) > RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 > RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING > From arnout at mind.be Tue Jan 4 18:31:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:31:03 +0100 Subject: [Buildroot] [PATCH 2/2] package/zfs: fix python3 version check In-Reply-To: <20220103225450.14459-2-romain.naour@gmail.com> References: <20220103225450.14459-1-romain.naour@gmail.com> <20220103225450.14459-2-romain.naour@gmail.com> Message-ID: On 03/01/2022 23:54, Romain Naour wrote: > Backport a patch to fix the python 3 version check that > broke the build since the python 3.10 version bump. > > Add host-python-packaging dependency since the backport > add "from packaging import version" while checking the > python version. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1935414730 > https://gitlab.com/buildroot.org/buildroot/-/jobs/1935415049 > > Signed-off-by: Romain Naour Both applied to master, thanks. Regards, Arnout > --- > ...law-in-the-Python-3-version-checking.patch | 106 ++++++++++++++++++ > package/zfs/zfs.mk | 5 +- > 2 files changed, 109 insertions(+), 2 deletions(-) > create mode 100644 package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch > > diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch > new file mode 100644 > index 0000000000..70978f9f4d > --- /dev/null > +++ b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch > @@ -0,0 +1,106 @@ > +From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 > +From: Rich Ercolani <214141+rincebrain at users.noreply.github.com> > +Date: Tue, 8 Jun 2021 20:20:16 -0400 > +Subject: [PATCH] Correct a flaw in the Python 3 version checking > + > +It turns out the ax_python_devel.m4 version check assumes that > +("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 > +is 10 or above and X is not. (Also presumably X+1=100 and ...) > + > +So let's remake the check to behave consistently, using the > +"packaging" or (if absent) the "distlib" modules. > + > +(Also, update the Github workflows to use the new packages.) > + > +Reviewed-by: Brian Behlendorf > +Reviewed-by: John Kennedy > +Signed-off-by: Rich Ercolani > +Closes: #12073 > +(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) > +[Romain: drop rpm spec and github workflows changes] > +Signed-off-by: Romain Naour > +--- > + config/always-pyzfs.m4 | 15 +++++++++++++++ > + config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ > + 2 files changed, 42 insertions(+), 6 deletions(-) > + > +diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 > +index 76e07b593..fa39fd885 100644 > +--- a/config/always-pyzfs.m4 > ++++ b/config/always-pyzfs.m4 > +@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ > + ]) > + AC_SUBST(DEFINE_PYZFS) > + > ++ dnl # > ++ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs > ++ dnl # > ++ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ > ++ ZFS_AC_PYTHON_MODULE([packaging], [], [ > ++ ZFS_AC_PYTHON_MODULE([distlib], [], [ > ++ AS_IF([test "x$enable_pyzfs" = xyes], [ > ++ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") > ++ ], [test "x$enable_pyzfs" != xno], [ > ++ enable_pyzfs=no > ++ ]) > ++ ]) > ++ ]) > ++ ]) > ++ > + dnl # > + dnl # Require python-devel libraries > + dnl # > +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 > +index c51b45b7d..cdfbbf81f 100644 > +--- a/config/ax_python_devel.m4 > ++++ b/config/ax_python_devel.m4 > +@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ > + # Check for a version of Python >= 2.1.0 > + # > + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) > +- ac_supports_python_ver=`$PYTHON -c "import sys; \ > +- ver = sys.version.split ()[[0]]; \ > +- print (ver >= '2.1.0')"` > ++ ac_supports_python_ver=`cat< ++from __future__ import print_function; > ++import sys; > ++try: > ++ from packaging import version; > ++except ImportError: > ++ from distlib import version; > ++ver = sys.version.split ()[[0]]; > ++(tst_cmp, tst_ver) = ">= '2.1.0'".split (); > ++tst_ver = tst_ver.strip ("'"); > ++eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))") > ++EOD` > + if test "$ac_supports_python_ver" != "True"; then > + if test -z "$PYTHON_NOVERSIONCHECK"; then > + AC_MSG_RESULT([no]) > +@@ -126,9 +135,21 @@ to something else than an empty string. > + # > + if test -n "$1"; then > + AC_MSG_CHECKING([for a version of Python $1]) > +- ac_supports_python_ver=`$PYTHON -c "import sys; \ > +- ver = sys.version.split ()[[0]]; \ > +- print (ver $1)"` > ++ # Why the strip ()? Because if we don't, version.parse > ++ # will, for example, report 3.10.0 >= '3.11.0' > ++ ac_supports_python_ver=`cat< ++ > ++from __future__ import print_function; > ++import sys; > ++try: > ++ from packaging import version; > ++except ImportError: > ++ from distlib import version; > ++ver = sys.version.split ()[[0]]; > ++(tst_cmp, tst_ver) = "$1".split (); > ++tst_ver = tst_ver.strip ("'"); > ++eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))") > ++EOD` > + if test "$ac_supports_python_ver" = "True"; then > + AC_MSG_RESULT([yes]) > + else > +-- > +2.31.1 > + > diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk > index 3b1afb419a..0e7e3e4e74 100644 > --- a/package/zfs/zfs.mk > +++ b/package/zfs/zfs.mk > @@ -11,6 +11,7 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT > ZFS_CPE_ID_VENDOR = openzfs > ZFS_CPE_ID_PRODUCT = openzfs > > +# 0001-Correct-a-flaw-in-the-Python-3-version-checking.patch > ZFS_AUTORECONF = YES > > ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib > @@ -39,7 +40,7 @@ endif > # The optional PyZFS uses different scripts depending on the python > # version (ex: arc_summary2 or arc_summary3). > ifeq ($(BR2_PACKAGE_PYTHON),y) > -ZFS_DEPENDENCIES += python python-setuptools host-python-cffi > +ZFS_DEPENDENCIES += python python-setuptools host-python-cffi host-python-packaging > ZFS_CONF_ENV += \ > PYTHON=$(HOST_DIR)/usr/bin/python2 \ > PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ > @@ -47,7 +48,7 @@ ZFS_CONF_ENV += \ > PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" > ZFS_CONF_OPTS += --enable-pyzfs > else ifeq ($(BR2_PACKAGE_PYTHON3),y) > -ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi > +ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging > ZFS_CONF_ENV += \ > PYTHON=$(HOST_DIR)/usr/bin/python3 \ > PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ > From arnout at mind.be Tue Jan 4 18:31:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:31:17 +0100 Subject: [Buildroot] [PATCH] package/json-for-modern-cpp: bump version to 3.10.5 In-Reply-To: <20220104133416.5185-1-buildroot@heine.tech> References: <20220104133416.5185-1-buildroot@heine.tech> Message-ID: On 04/01/2022 14:34, Michael Nosthoff via buildroot wrote: > * Update License hash due to updated year > > Fixes: > - Make sure C++17 filesystem conversions are only used if the compiler supports it. > > Signed-off-by: Michael Nosthoff Applied to master, thanks. Regards, Arnout > --- > package/json-for-modern-cpp/json-for-modern-cpp.hash | 4 ++-- > package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash > index eb14d2fd6d..a193fa6d49 100644 > --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash > +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3 json-3.10.4.tar.gz > -sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT > +sha256 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz > +sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT > diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk > index 428473db5a..fd13ce1fd1 100644 > --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk > +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -JSON_FOR_MODERN_CPP_VERSION = 3.10.4 > +JSON_FOR_MODERN_CPP_VERSION = 3.10.5 > JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz > JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) > JSON_FOR_MODERN_CPP_LICENSE = MIT > From arnout at mind.be Tue Jan 4 18:33:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:33:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: bump to version 5.212.0-alpha4 In-Reply-To: <20220104074821.1330228-1-james.hilliard1@gmail.com> References: <20220104074821.1330228-1-james.hilliard1@gmail.com> Message-ID: On 04/01/2022 08:48, James Hilliard wrote: > Switch to latest release in new active upstream: > https://github.com/qtwebkit/qtwebkit Perhaps you can push the remaining patch to upstream then? > > Migrate python2 build to python3. > > Drop patches that are upstream/no longer needed. > > Adapt/add patches to fix build issues. > > Rework build system to use cmake instead of qmake(which does not > currently support cross compilation). > > Signed-off-by: James Hilliard [snip] > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index dd99661be0..3af1918a46 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5WEBKIT_VERSION = 5.9.1 > -QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > +QT5WEBKIT_VERSION = 5.212.0-alpha4 > +QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION) Upstream README says: Use the following repository if you need to get latest snapshots of QtWebKit code: http://code.qt.io/cgit/qt/qtwebkit.git/ This repo aslo has a 5.212.0-alpha4 tag. Perhaps we should switch to that? Anyway, I applied to master as is. Regards, Arnout > +QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz > QT5WEBKIT_DEPENDENCIES = \ > - host-bison host-flex host-gperf host-python host-ruby \ > - leveldb sqlite > + host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ > + gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ > + qt5sensors qt5webchannel sqlite webp woff2 > QT5WEBKIT_INSTALL_STAGING = YES > > QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 > @@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender > +QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender > endif > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5WEBKIT_DEPENDENCIES += qt5declarative > endif > > -# QtWebkit's build system uses python, but only supports python2. We work > -# around this by forcing python2 early in the PATH, via a python->python2 > -# symlink. > -QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) > -QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) > -define QT5WEBKIT_PYTHON2_SYMLINK > - mkdir -p $(@D)/host-bin > - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python > -endef > -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK > +QT5WEBKIT_CONF_OPTS += \ > + -DPORT=Qt \ > + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > + -DUSE_LIBHYPHEN=OFF > > -QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb > - > -define QT5WEBKIT_INSTALL_TARGET_EXTRAS > - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ > -endef > - > -QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS > - > -$(eval $(qmake-package)) > +$(eval $(cmake-package)) > From arnout at mind.be Tue Jan 4 18:10:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:46 +0100 Subject: [Buildroot] [git commit] package/assimp: bump version to 5.1.5 Message-ID: <20220104182811.9D6D083249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5390200a722132365c90e07790b9a24a06af7134 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - remove 0002-BlenderScene-use-explicit-namespace-instead-of-using.patch (upstream applied [1]). For details see [2]. [1] https://github.com/assimp/assimp/commit/a099fe7cd331a839137115db5df1733c4c1c8070 [2] https://github.com/assimp/assimp/releases/tag/v5.1.5 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...e-use-explicit-namespace-instead-of-using.patch | 57 ---------------------- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 3 files changed, 2 insertions(+), 59 deletions(-) diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch deleted file mode 100644 index c83e9c50a4..0000000000 --- a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 30 Dec 2021 18:01:54 +0100 -Subject: [PATCH] BlenderScene: use explicit namespace instead of using - namespace - -Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): - - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - -[backport from upstream commit a099fe7cd331] -Signed-off-by: Peter Seiderer ---- - code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp -index c93d913fc..9ad086fe6 100644 ---- a/code/AssetLib/Blender/BlenderScene.cpp -+++ b/code/AssetLib/Blender/BlenderScene.cpp -@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "BlenderDNA.h" - #include "BlenderSceneGen.h" - --using namespace Assimp; --using namespace Assimp::Blender; -+namespace Assimp { -+namespace Blender { - - //-------------------------------------------------------------------------------- - template <> -@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { - converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); - } - -+} // namespace Blender -+} //namespace Assimp -+ - #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER --- -2.34.1 - diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 89b8d168c2..8f6d613bb4 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6 assimp-5.1.4.tar.gz +sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index ead5d73bca..b5f84ef56f 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.4 +ASSIMP_VERSION = 5.1.5 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE From arnout at mind.be Tue Jan 4 18:10:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:47 +0100 Subject: [Buildroot] [git commit] package/python-packaging: add host variant Message-ID: <20220104182811.B0ADE82DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cc445fd5fbb83c2b55f679f3d92223f34f214cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-packaging/python-packaging.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 6b54d2416d..1fd6f26d64 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -12,3 +12,4 @@ PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD $(eval $(python-package)) +$(eval $(host-python-package)) From arnout at mind.be Tue Jan 4 18:10:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:46 +0100 Subject: [Buildroot] [git commit] package/terminology: bump to version 1.12.0 Message-ID: <20220104182811.9472982DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a242529917cfa7025eb979a87b84b81b5ff25e1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Requires efl 1.26.0 [1] [1] https://git.enlightenment.org/apps/terminology.git/commit/?id=3e95d2ad9f59e01d498e90dcb4413dc886d49852 See: https://www.enlightenment.org/news/2022-01-02-terminology-1.12.0 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/terminology/terminology.hash | 4 ++-- package/terminology/terminology.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index be1d6f4269..7e9658482a 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz.sha256sum -sha256 3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c terminology-1.9.0.tar.xz +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum +sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index 29b59fb39e..787c9ad137 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.9.0 +TERMINOLOGY_VERSION = 1.12.0 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause From arnout at mind.be Tue Jan 4 18:10:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:47 +0100 Subject: [Buildroot] [git commit] package/json-for-modern-cpp: bump version to 3.10.5 Message-ID: <20220104182811.CD58F82DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7cbf6d2a42d482f54f58b2ed10b0078fa13a719e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master * Update License hash due to updated year Fixes: - Make sure C++17 filesystem conversions are only used if the compiler supports it. Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 4 ++-- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index eb14d2fd6d..a193fa6d49 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3 json-3.10.4.tar.gz -sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT +sha256 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz +sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 428473db5a..fd13ce1fd1 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.10.4 +JSON_FOR_MODERN_CPP_VERSION = 3.10.5 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From arnout at mind.be Tue Jan 4 18:10:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:47 +0100 Subject: [Buildroot] [git commit] package/zfs: fix python3 version check Message-ID: <20220104182811.B9A1183249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0197eb3a7121712d5ae1c8c5c3e180961fce1cdb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Backport a patch to fix the python 3 version check that broke the build since the python 3.10 version bump. Add host-python-packaging dependency since the backport add "from packaging import version" while checking the python version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1935414730 https://gitlab.com/buildroot.org/buildroot/-/jobs/1935415049 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...t-a-flaw-in-the-Python-3-version-checking.patch | 106 +++++++++++++++++++++ package/zfs/zfs.mk | 5 +- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch new file mode 100644 index 0000000000..70978f9f4d --- /dev/null +++ b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch @@ -0,0 +1,106 @@ +From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain at users.noreply.github.com> +Date: Tue, 8 Jun 2021 20:20:16 -0400 +Subject: [PATCH] Correct a flaw in the Python 3 version checking + +It turns out the ax_python_devel.m4 version check assumes that +("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 +is 10 or above and X is not. (Also presumably X+1=100 and ...) + +So let's remake the check to behave consistently, using the +"packaging" or (if absent) the "distlib" modules. + +(Also, update the Github workflows to use the new packages.) + +Reviewed-by: Brian Behlendorf +Reviewed-by: John Kennedy +Signed-off-by: Rich Ercolani +Closes: #12073 +(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) +[Romain: drop rpm spec and github workflows changes] +Signed-off-by: Romain Naour +--- + config/always-pyzfs.m4 | 15 +++++++++++++++ + config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ + 2 files changed, 42 insertions(+), 6 deletions(-) + +diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 +index 76e07b593..fa39fd885 100644 +--- a/config/always-pyzfs.m4 ++++ b/config/always-pyzfs.m4 +@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ + ]) + AC_SUBST(DEFINE_PYZFS) + ++ dnl # ++ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs ++ dnl # ++ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ ++ ZFS_AC_PYTHON_MODULE([packaging], [], [ ++ ZFS_AC_PYTHON_MODULE([distlib], [], [ ++ AS_IF([test "x$enable_pyzfs" = xyes], [ ++ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") ++ ], [test "x$enable_pyzfs" != xno], [ ++ enable_pyzfs=no ++ ]) ++ ]) ++ ]) ++ ]) ++ + dnl # + dnl # Require python-devel libraries + dnl # +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index c51b45b7d..cdfbbf81f 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split ()[[0]]; \ +- print (ver >= '2.1.0')"` ++ ac_supports_python_ver=`cat<= '3.11.0' ++ ac_supports_python_ver=`cat< commit: https://git.buildroot.net/buildroot/commit/?id=0d628aa9521ce79ed2a41a65981c466819dad29e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on musl raised since the addition of the package in commit e821078031e14df69e5142f23e9cb7b5a1ea0e77: text-scroller.cc: In function 'int main(int, char**)': text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? 220 | uint frame_counter = 0; | ^~~~ | rint Fixes: - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-utils-text-scroller.cc-replace-uint.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch new file mode 100644 index 0000000000..627415bac8 --- /dev/null +++ b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch @@ -0,0 +1,50 @@ +From a56338db0f003d5236f2ce98c73a591d64a70852 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Jan 2022 22:57:11 +0100 +Subject: [PATCH] utils/text-scroller.cc: replace uint (#1383) + +Replace uint by uint64_t to avoid the following build failure on musl: + +text-scroller.cc: In function 'int main(int, char**)': +text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? + 220 | uint frame_counter = 0; + | ^~~~ + | rint + +Fixes: + - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/hzeller/rpi-rgb-led-matrix/commit/a56338db0f003d5236f2ce98c73a591d64a70852] +--- + utils/text-scroller.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/utils/text-scroller.cc b/utils/text-scroller.cc +index a64ba0c89..28d4f7182 100644 +--- a/utils/text-scroller.cc ++++ b/utils/text-scroller.cc +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -217,12 +218,12 @@ int main(int argc, char *argv[]) { + + struct timespec next_frame = {0, 0}; + +- uint frame_counter = 0; ++ uint64_t frame_counter = 0; + while (!interrupt_received && loops != 0) { + ++frame_counter; + offscreen_canvas->Fill(bg_color.r, bg_color.g, bg_color.b); + const bool draw_on_frame = (blink_on <= 0) +- || (frame_counter % (blink_on + blink_off) < (uint)blink_on); ++ || (frame_counter % (blink_on + blink_off) < (uint64_t)blink_on); + + if (draw_on_frame) { + if (outline_font) { From arnout at mind.be Tue Jan 4 18:10:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:47 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: bump to version 5.212.0-alpha4 Message-ID: <20220104182811.C4D2B8324B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df0b0fe6919c0d0f3750f439a3cfa765232bd569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to latest release in new active upstream: https://github.com/qtwebkit/qtwebkit Migrate python2 build to python3. Drop patches that are upstream/no longer needed. Adapt/add patches to fix build issues. Rework build system to use cmake instead of qmake(which does not currently support cross compilation). Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ated-compile-failures-from-capital-bool-d.patch | 147 +++++++++++++++++++++ .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 36 ----- ...ude-backtrace-API-for-non-glibc-libraries.patch | 44 ------ ...tion-with-Python-3.9-avoid-passing-encodi.patch | 33 +++++ .../0003-Detect-32-bits-armv8-a-architecture.patch | 48 ------- ...nerate-the-header-directly-to-fix-build-.patch} | 22 +-- .../0004-Fix-installation-of-class-headers.patch | 49 ------- ...lid-g_object-declarations-to-fix-build-wi.patch | 31 +++++ .../0005-Fix-ICU-related-compile-failures.patch | 67 ---------- ...emove-legacy-reference-to-qtConfig-mircli.patch | 34 ----- ...enerate-the-header-directly-to-fix-build-.patch | 31 ----- ...ated-compile-failures-from-capital-bool-d.patch | 99 -------------- package/qt5/qt5webkit/Config.in | 14 ++ package/qt5/qt5webkit/qt5webkit.hash | 4 +- package/qt5/qt5webkit/qt5webkit.mk | 37 ++---- 15 files changed, 250 insertions(+), 446 deletions(-) diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch new file mode 100644 index 0000000000..11d0b7b248 --- /dev/null +++ b/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch @@ -0,0 +1,147 @@ +From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001 +From: Henri Roosen +Date: Thu, 18 Mar 2021 11:53:57 +0100 +Subject: [PATCH] Fix ICU related compile failures from capital bool defines + +See ICU-21267 + +Signed-off-by: Henri Roosen +Signed-off-by: James Hilliard +--- + Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- + Source/WebCore/platform/text/icu/UTextProvider.h | 8 ++++---- + .../platform/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- + .../platform/text/icu/UTextProviderUTF16.cpp | 4 ++-- + 4 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp +index dd6ff0675bb1..e0f4bd718828 100644 +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h +index c254fc4c7ce2..6d1e1cbc5eb2 100644 +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +index cd6852c71e55..6a864b1c1567 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +index 7aaac48c8151..9ae0d367f1f6 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch deleted file mode 100644 index 669c7e6aa2..0000000000 --- a/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner -Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) - -Building qtwebkit causes a QA issue such that QtWebPluginProcess and -QtWebProcess contain bad RPATHs which point into the build location. This fix -adds a patch to not include the rpath.prf which causes this problem. - -Signed-off-by: Trevor Woerner -Signed-off-by: Martin Jansa - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0001-qtwebkit-fix-QA-issue-bad-RPATH.patch - -Signed-off-by: Gary Bisson ---- - Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index fd66af6..ef754c3 100644 ---- a/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -61,7 +61,6 @@ linux-*g++* { - } - } - --contains(TEMPLATE, app): CONFIG += rpath - - CONFIG(debug, debug|release)|force_debug_info { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. --- -2.7.0 - diff --git a/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted file mode 100644 index a2597a54bb..0000000000 --- a/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries - -It was excluding musl with current checks, so lets make it such that it -considers only glibc when using backtrace API - -Signed-off-by: Khem Raj - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0003-Exclude-backtrace-API-for-non-glibc-libraries.patch - -Signed-off-by: Gary Bisson ---- - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 1b2091f..ba03a28 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -61,7 +61,7 @@ - #include - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include - #include -@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined --- -2.7.0 - diff --git a/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch b/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch new file mode 100644 index 0000000000..d167a44bf3 --- /dev/null +++ b/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch @@ -0,0 +1,33 @@ +From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Wed, 3 Jun 2020 15:01:42 +0300 +Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to + json.load() + +In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument +is not supported. + +Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +78360c01c796b6260bf828bc9c8a0ef73c5132fd] +--- + Source/JavaScriptCore/generate-bytecode-files | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files +index c5dab429c7b0..af3431275ecf 100644 +--- a/Source/JavaScriptCore/generate-bytecode-files ++++ b/Source/JavaScriptCore/generate-bytecode-files +@@ -163,7 +163,7 @@ if __name__ == "__main__": + initBytecodesFile = openOrExit(initASMFileName, "w") + + try: +- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") ++ bytecodeSections = json.load(bytecodeFile) + except: + print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) + +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch deleted file mode 100644 index 9c2205dd94..0000000000 --- a/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 15 Aug 2017 18:28:49 -0400 -Subject: [PATCH] Detect 32-bits armv8-a architecture -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Adds WTF platform support for the 32-bits armv8-a architectures. - -Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) -and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). - -This commit catches this new architecture (armv8a) within a #ifdef/#endif -inside the if statement dedicated for 32-bits ARM detection. - -Fixes: - - In file included from ./config.h:30:0, - from ... - ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" - # error "Not supported ARM architecture" - ^~~~~ - -Upstream-Status: Backport [with adaptations] -Signed-off-by: Ga??l PORTAY ---- - Source/WTF/wtf/Platform.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 562840cf7..9cf656845 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -243,6 +243,10 @@ - || defined(__ARM_ARCH_7S__) - #define WTF_ARM_ARCH_VERSION 7 - -+#elif defined(__ARM_ARCH_8__) \ -+ || defined(__ARM_ARCH_8A__) -+#define WTF_ARM_ARCH_VERSION 8 -+ - /* MSVC sets _M_ARM */ - #elif defined(_M_ARM) - #define WTF_ARM_ARCH_VERSION _M_ARM --- -2.16.1 - diff --git a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch similarity index 60% rename from package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch rename to package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch index 7bb81b1259..1591b8a82c 100644 --- a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch +++ b/package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch @@ -1,4 +1,4 @@ -From 894a5448ee8ce0f134845c877b4c0a2a660e4ab3 Mon Sep 17 00:00:00 2001 +From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Tue, 4 Aug 2020 21:04:06 +0300 Subject: [PATCH] Let Bison generate the header directly, to fix build with @@ -9,24 +9,25 @@ by default, instead of duplicating it. So we should not delete it. Remove the code to add #ifdef guards to the header, since Bison adds them itself since version 2.6.3. - -[Original patch taken from -https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch?id=69e618c88a9134f754264efc11aa0b1fdc028b88 -ported to qtwebkit-opensource-src-5.9.1] -Signed-off-by: Peter Seiderer +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +d92b11fea65364fefa700249bd3340e0cd4c5b31] --- Source/WebCore/css/makegrammar.pl | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 4e0452ed..9ef32963 100644 +index 5d63b08102eb..9435701c7061 100644 --- a/Source/WebCore/css/makegrammar.pl +++ b/Source/WebCore/css/makegrammar.pl -@@ -73,23 +73,4 @@ if ($suffix eq ".y.in") { +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { } my $fileBase = File::Spec->join($outputDir, $filename); --system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; - -open HEADER, ">$fileBase.h" or die; -print HEADER << "EOF"; @@ -46,7 +47,6 @@ index 4e0452ed..9ef32963 100644 -unlink("$fileBase.cpp.h"); -unlink("$fileBase.hpp"); - -+system("$bison --defines=$fileBase.h -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); -- -2.28.0 +2.25.1 diff --git a/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch b/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch deleted file mode 100644 index 92aab57111..0000000000 --- a/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7d763d441fd4fa78553a818ee75ac477eb6dbcbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= -Date: Sun, 2 Feb 2020 10:48:50 +0100 -Subject: [PATCH] Fix installation of class headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since Qt 5.11 (see commit [1]), the key word HEADER_CLASSES has been -removed. It has been replaced by a new variable GENERATED_HEADER_FILES. - -The class headers were not generated, this commit moves them directly to -HEADER_FILES. - -[1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 - -Signed-off-by: Ga??l PORTAY -[Converted to git formated patch] -Signed-off-by: Peter Seiderer ---- - include/QtWebKit/headers.pri | 3 +-- - include/QtWebKitWidgets/headers.pri | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/include/QtWebKit/headers.pri b/include/QtWebKit/headers.pri -index 6775f3a6..3a5c14cd 100644 ---- a/include/QtWebKit/headers.pri -+++ b/include/QtWebKit/headers.pri -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit --SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion -+SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFacto ry ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhis tory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = -diff --git a/include/QtWebKitWidgets/headers.pri b/include/QtWebKitWidgets/headers.pri -index 9d386e29..2b8b095c 100644 ---- a/include/QtWebKitWidgets/headers.pri -+++ b/include/QtWebKitWidgets/headers.pri -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets --SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion -+SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch new file mode 100644 index 0000000000..48605e4fe4 --- /dev/null +++ b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch @@ -0,0 +1,31 @@ +From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 7 Apr 2021 13:38:09 +0200 +Subject: [PATCH] Remove invalid g_object declarations to fix build with glib + >= 2.68 + +g_object_ref_sink is defined as a macro meanwhile and so the build fails. +Just remove the declarations, glib.h is included anyway. +Signed-off-by: James Hilliard +[Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058] +--- + Source/WTF/wtf/glib/GRefPtr.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h +index 06133d82cb35..d9a1d2f145f5 100644 +--- a/Source/WTF/wtf/glib/GRefPtr.h ++++ b/Source/WTF/wtf/glib/GRefPtr.h +@@ -29,9 +29,6 @@ + #include + #include + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt }; +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch b/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch deleted file mode 100644 index 1a99eb7f84..0000000000 --- a/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 2 Feb 2020 10:51:00 +0100 -Subject: [PATCH] Fix ICU related compile failures. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The ICU macro U16_NEXT() needs a trailing semicolon. - -Fixes: - - platform/graphics/SegmentedFontData.cpp:65:9: error: expected ???;??? before ???if??? - dom/Document.cpp:3850:5: error: expected ???;??? before ???if??? - dom/Document.cpp:3855:9: error: expected ???;??? before ???if??? - dom/Document.cpp:3918:9: error: expected ???;??? before ???if??? - -Signed-off-by: Peter Seiderer ---- - Source/WebCore/dom/Document.cpp | 6 +++--- - Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index af63b141..26f7312b 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S - const UChar* s = qualifiedName.characters(); - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(s, i, length, c) -+ U16_NEXT(s, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; -diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp -index efb20a8c..99b3e86c 100644 ---- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp -+++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp -@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length) - { - UChar32 c; - for (int i = 0; i < length; ) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!containsCharacter(c)) - return false; - } --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch b/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch deleted file mode 100644 index d9b94697da..0000000000 --- a/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c408484e3a442ecf99d3cc61402f20c45c894b7c Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 3 Feb 2020 21:19:57 +0100 -Subject: [PATCH] configure: remove legacy reference to qtConfig(mirclient) - -The optio mirclient is removed since Qt-5.14.x (see [1]) -Fixes: - - Project ERROR: Could not find feature mirclient. - -[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405 - -Signed-off-by: Peter Seiderer ---- - Tools/qmake/mkspecs/features/configure.prf | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf -index 23d99040..783f6752 100644 ---- a/Tools/qmake/mkspecs/features/configure.prf -+++ b/Tools/qmake/mkspecs/features/configure.prf -@@ -130,9 +130,6 @@ defineTest(finalizeConfigure) { - addReasonForSkippingBuild("Build not supported on Android.") - } - QT_FOR_CONFIG += gui-private -- production_build:qtConfig(mirclient) { -- addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") -- } - !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) { - addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") - } --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch deleted file mode 100644 index 9deb2d8c63..0000000000 --- a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8959e226fac7f73b9a40e202610bd5e12334561b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 15 Sep 2020 19:11:18 +0200 -Subject: [PATCH] let bison generate the header directly, to fix build with - bison 3.7 - -Do the same as the patch taken from [1] for the bison call in -Source/WebCore/DerivedSources.pri to fix file generation -for bison 3.7. - -Signed-off-by: Peter Seiderer ---- - Source/WebCore/DerivedSources.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri -index 57a6b0f7..e9f52614 100644 ---- a/Source/WebCore/DerivedSources.pri -+++ b/Source/WebCore/DerivedSources.pri -@@ -987,7 +987,7 @@ GENERATORS += pluginsresources - # GENERATOR 11: XPATH grammar - xpathbison.output = ${QMAKE_FILE_BASE}.cpp - xpathbison.input = XPATHBISON --xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h -+xpathbison.commands = bison --defines=${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.h -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.cpp - xpathbison.depends = ${QMAKE_FILE_NAME} - GENERATORS += xpathbison - --- -2.28.0 - diff --git a/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch deleted file mode 100644 index 7d941a5683..0000000000 --- a/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 37ee268d9d07a8dad02c1d8db3bf96e0b30df10b Mon Sep 17 00:00:00 2001 -From: Henri Roosen -Date: Thu, 18 Mar 2021 11:53:57 +0100 -Subject: [PATCH] Fix ICU related compile failures from capital bool defines - -See ICU-21267 - -Signed-off-by: Henri Roosen ---- - .../platform/text/TextBreakIteratorICU.cpp | 16 ++++++++-------- - Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -index b4046ac9..832890a2 100644 ---- a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -+++ b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -@@ -214,12 +214,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < numeric_limits::max()); - text->chunkOffset = offset < numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -228,12 +228,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < numeric_limits::max()); - text->chunkOffset = offset < numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } -@@ -243,7 +243,7 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = textNativeLength(text); - UBool isAccessible; - if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -263,7 +263,7 @@ static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward) - ASSERT(newContext == PriorContext); - textLatin1SwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static const struct UTextFuncs textLatin1Funcs = { -@@ -364,7 +364,7 @@ static void textUTF16SwitchToPriorContext(UText* text, int64_t nativeIndex, int6 - static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = textNativeLength(text); - UBool isAccessible; - if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -384,7 +384,7 @@ static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward) - ASSERT(newContext == PriorContext); - textUTF16SwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static const struct UTextFuncs textUTF16Funcs = { -diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp -index 86d4ea17..da152edd 100644 ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -269,7 +269,7 @@ void TextCodecICU::createICUConverter() const - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) --- -2.20.1 - diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 82e38dff52..b7beb2b252 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -9,10 +9,24 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_BINFMT_FLAT # icu # assumes a FPU is available on MIPS depends on !BR2_MIPS_SOFT_FLOAT + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_ICU + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION + select BR2_PACKAGE_QT5SENSORS + select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB help diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 312d58272a..d7c8bd6c8a 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,5 +1,5 @@ -# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz +# Locally calculated +sha256 9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6 qtwebkit-5.212.0-alpha4.tar.xz # Hashes for license files: sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index dd99661be0..3af1918a46 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBKIT_VERSION = 5.9.1 -QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_VERSION = 5.212.0-alpha4 +QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION) +QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ - host-bison host-flex host-gperf host-python host-ruby \ - leveldb sqlite + host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ + gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ + qt5sensors qt5webchannel sqlite webp woff2 QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 @@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender +QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_DEPENDENCIES += qt5declarative endif -# QtWebkit's build system uses python, but only supports python2. We work -# around this by forcing python2 early in the PATH, via a python->python2 -# symlink. -QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -define QT5WEBKIT_PYTHON2_SYMLINK - mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python -endef -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK +QT5WEBKIT_CONF_OPTS += \ + -DPORT=Qt \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DUSE_LIBHYPHEN=OFF -QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb - -define QT5WEBKIT_INSTALL_TARGET_EXTRAS - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ -endef - -QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS - -$(eval $(qmake-package)) +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Tue Jan 4 19:58:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 20:58:30 +0100 Subject: [Buildroot] [git commit] package/mutt: bump to version 2.1.5 Message-ID: <20220104195259.7FBF982A54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db156d693a54fadb43f6b487902ae6795477921f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, fixing two SMTP authentication issues, a crash bug on NetBSD, and a couple other issues. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index dceae57b65..d439b23aa3 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz +sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 44d7864eb6..7e9046fe8a 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.4 +MUTT_VERSION = 2.1.5 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From yann.morin.1998 at free.fr Tue Jan 4 19:59:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 20:59:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: bump to version 2.1.5 In-Reply-To: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> References: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> Message-ID: <20220104195934.GA614810@scaer> Fabrice, All, On 2022-01-04 19:25 +0100, Fabrice Fontaine spake thusly: > Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, > fixing two SMTP authentication issues, a crash bug on NetBSD, and a > couple other issues. > > https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/mutt/mutt.hash | 2 +- > package/mutt/mutt.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash > index dceae57b65..d439b23aa3 100644 > --- a/package/mutt/mutt.hash > +++ b/package/mutt/mutt.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz > +sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz > sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL > diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk > index 44d7864eb6..7e9046fe8a 100644 > --- a/package/mutt/mutt.mk > +++ b/package/mutt/mutt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MUTT_VERSION = 2.1.4 > +MUTT_VERSION = 2.1.5 > MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads > MUTT_LICENSE = GPL-2.0+ > MUTT_LICENSE_FILES = GPL > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 4 20:00:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 21:00:23 +0100 Subject: [Buildroot] [git commit] package/openipmi: bump to version 2.0.32 Message-ID: <20220104195526.E39BF82BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0be734b7b2272b9adfa9a5e51a40ca48e650eb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Refresh patch and send it upstream - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Avoid-searching-host-library-path.patch | 27 +++++++++++----------- package/openipmi/openipmi.hash | 12 +++++----- package/openipmi/openipmi.mk | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch index 44a57dcfb4..15b4510f67 100644 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ b/package/openipmi/0001-Avoid-searching-host-library-path.patch @@ -10,6 +10,9 @@ $(libdir) in the library search path. Signed-off-by: Baruch Siach Signed-off-by: Joel Stanley +[Fabrice: refresh patch for 2.0.32] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/openipmi/patches/35] --- cmdlang/Makefile.am | 3 +-- unix/Makefile.am | 6 ++---- @@ -19,13 +22,12 @@ diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am index 264ee12be79f..0b3843784656 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - libOpenIPMIcmdlang_la_LIBADD = -lm \ +@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined bin_PROGRAMS = openipmish @@ -33,20 +35,19 @@ diff --git a/unix/Makefile.am b/unix/Makefile.am index 5128839dad13..bd0f897ba8d6 100644 --- a/unix/Makefile.am +++ b/unix/Makefile.am -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c +@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ $(GDBM_LIB) $(RT_LIB) --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined noinst_HEADERS = heap.h diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index 2ec9dd31af..eded076ade 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 be0c87743a38e2fa00586df931f021c0b480385b OpenIPMI-2.0.28.tar.gz -md5 ba37f08e306062ec73c7ed2a2bd4d5f4 OpenIPMI-2.0.28.tar.gz +sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz +md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz # Locally computed -sha256 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 OpenIPMI-2.0.28.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB +sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index 3240b89894..ad2f2d2f4f 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.28 +OPENIPMI_VERSION = 2.0.32 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause From yann.morin.1998 at free.fr Tue Jan 4 20:03:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 21:03:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/openipmi: bump to version 2.0.32 In-Reply-To: <20220104182037.3292464-1-fontaine.fabrice@gmail.com> References: <20220104182037.3292464-1-fontaine.fabrice@gmail.com> Message-ID: <20220104200320.GB614810@scaer> Fabrice, All, On 2022-01-04 19:20 +0100, Fabrice Fontaine spake thusly: > - Refresh patch and send it upstream > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...01-Avoid-searching-host-library-path.patch | 27 ++++++++++--------- > package/openipmi/openipmi.hash | 12 ++++----- > package/openipmi/openipmi.mk | 2 +- > 3 files changed, 21 insertions(+), 20 deletions(-) > > diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch > index 44a57dcfb4..15b4510f67 100644 > --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch > +++ b/package/openipmi/0001-Avoid-searching-host-library-path.patch > @@ -10,6 +10,9 @@ $(libdir) in the library search path. > > Signed-off-by: Baruch Siach > Signed-off-by: Joel Stanley > +[Fabrice: refresh patch for 2.0.32] > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://sourceforge.net/p/openipmi/patches/35] > --- > cmdlang/Makefile.am | 3 +-- > unix/Makefile.am | 6 ++---- > @@ -19,13 +22,12 @@ diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am > index 264ee12be79f..0b3843784656 100644 > --- a/cmdlang/Makefile.am > +++ b/cmdlang/Makefile.am > -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ > - libOpenIPMIcmdlang_la_LIBADD = -lm \ > +@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ > $(top_builddir)/utils/libOpenIPMIutils.la \ > $(top_builddir)/lib/libOpenIPMI.la > --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > -- -L$(libdir) > -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) > + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > +- -L$(libdir) -no-undefined > ++ -no-undefined > > bin_PROGRAMS = openipmish > > @@ -33,20 +35,19 @@ diff --git a/unix/Makefile.am b/unix/Makefile.am > index 5128839dad13..bd0f897ba8d6 100644 > --- a/unix/Makefile.am > +++ b/unix/Makefile.am > -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la > - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c > +@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la > libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ > $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) > --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > -- -L$(libdir) > -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) > + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > +- -L$(libdir) -no-undefined > ++ -no-undefined > > libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c > libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ > $(GDBM_LIB) $(RT_LIB) > --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > -- -L$(libdir) > -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) > + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > +- -L$(libdir) -no-undefined > ++ -no-undefined > > noinst_HEADERS = heap.h > > diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash > index 2ec9dd31af..eded076ade 100644 > --- a/package/openipmi/openipmi.hash > +++ b/package/openipmi/openipmi.hash > @@ -1,8 +1,8 @@ > # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ > -sha1 be0c87743a38e2fa00586df931f021c0b480385b OpenIPMI-2.0.28.tar.gz > -md5 ba37f08e306062ec73c7ed2a2bd4d5f4 OpenIPMI-2.0.28.tar.gz > +sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz > +md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz > # Locally computed > -sha256 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 OpenIPMI-2.0.28.tar.gz > -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING > -sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD > -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB > +sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz > +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING > +sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD > +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB > diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk > index 3240b89894..ad2f2d2f4f 100644 > --- a/package/openipmi/openipmi.mk > +++ b/package/openipmi/openipmi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -OPENIPMI_VERSION = 2.0.28 > +OPENIPMI_VERSION = 2.0.32 > OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library > OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz > OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From aduskett at gmail.com Tue Jan 4 20:09:04 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 4 Jan 2022 12:09:04 -0800 Subject: [Buildroot] [PATCH 1/1] package/gdb: remove python2 support Message-ID: <20220104200904.1422985-1-aduskett@gmail.com> According to the GDB 9.2 changelog, python3 has been supported since at least 2019. - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in Signed-off-by: Adam Duskett --- Config.in.legacy | 7 +++++++ package/gdb/Config.in | 2 +- package/gdb/Config.in.host | 5 ----- package/gdb/gdb.mk | 10 +--------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5994d94487..a126d56052 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_HOST_GDB_PYTHON + bool "GDB Python2 support removed" + select BR2_LEGACY + help + Python2 is deprecated and no longer supported. + Please migrate to Python3. + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" select BR2_LEGACY diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 6f1a883de7..daad6c910d 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI config BR2_PACKAGE_GDB_PYTHON bool "Python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help This option enables Python support in the target gdb. diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a6e1d7f53c..2c6c78f20a 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON help This option disables Python support in the cross gdb. -config BR2_PACKAGE_HOST_GDB_PYTHON - bool "Python 2" - help - This option enables the Python 2 support in the cross gdb. - config BR2_PACKAGE_HOST_GDB_PYTHON3 bool "Python 3" help diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4ff498230a..2929eaf058 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_DEPENDENCIES += python3 -else -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_DEPENDENCIES += python endif GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config else @@ -287,10 +282,7 @@ else HOST_GDB_CONF_OPTS += --disable-tui endif -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 -HOST_GDB_DEPENDENCIES += host-python -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 HOST_GDB_DEPENDENCIES += host-python3 else -- 2.33.1 From festevam at gmail.com Tue Jan 4 20:25:41 2022 From: festevam at gmail.com (Fabio Estevam) Date: Tue, 4 Jan 2022 17:25:41 -0300 Subject: [Buildroot] [PATCH] configs/imx6-sabresd: Bump U-Boot and kernel Message-ID: <20220104202541.1175048-1-festevam@gmail.com> Bump U-Boot to 2021.10 and kernel to 5.15.12 version. Signed-off-by: Fabio Estevam --- configs/imx6-sabresd_defconfig | 8 ++++---- configs/imx6-sabresd_qt5_defconfig | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 5a39f333d1ac..0e8300438fcd 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 1330b5cfbfa1..47d14da6a6d6 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,7 +30,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" -- 2.25.1 From festevam at gmail.com Tue Jan 4 20:32:42 2022 From: festevam at gmail.com (Fabio Estevam) Date: Tue, 4 Jan 2022 17:32:42 -0300 Subject: [Buildroot] [PATCH v2] configs/imx6-sabresd: Bump U-Boot and kernel Message-ID: <20220104203242.1175845-1-festevam@gmail.com> Bump U-Boot to 2021.10 and kernel to 5.15.12 version. Signed-off-by: Fabio Estevam --- Changes since v1: - Also select BR2_TARGET_UBOOT_NEEDS_OPENSSL=y as a requirement for U-Boot 2021.10. configs/imx6-sabresd_defconfig | 9 +++++---- configs/imx6-sabresd_qt5_defconfig | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 5a39f333d1ac..19986f2cbb54 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,15 +24,16 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 1330b5cfbfa1..38a86131dda3 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,15 +30,16 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" -- 2.25.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:41:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:41:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/gensio: add avahi optional dependency Message-ID: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> avahi-client is an optional dependency which is enabled by default since version 2.2.0 and https://github.com/cminyard/gensio/commit/5ab117c9743fd4719f610cf9f1ba45023cc25d7c Signed-off-by: Fabrice Fontaine --- package/gensio/gensio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 389de1e263..b4936d5f21 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING GENSIO_INSTALL_STAGING = YES +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) GENSIO_CONF_OPTS = \ --without-openipmi \ --without-swig \ -- 2.34.1 From aduskett at gmail.com Tue Jan 4 20:49:23 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 4 Jan 2022 12:49:23 -0800 Subject: [Buildroot] [PATCH v3 1/1] package/pkg-generic.mk: fix absolute paths in per-package config files Message-ID: <20220104204923.2124418-1-aduskett@gmail.com> Some packages (notably qmake packages) generate .cmake, .pc, and .pri files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in those files point outside the per-package sysroot for packages that have rsynced those same files. - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk to avoid more calls to ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) - Add a new step which searches for .cmake, .pc, and .pri files in a given per-package host and staging directory and replaces the old $(PER_PACKAGE_DIR) directory with the correct directory for the given package. This simple fix allows qt5 submodule packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- changes v2 -> v3: - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk (Yann) - Combine FIXUP_CONFIG_FILES_ABSOLUTE_PATHS with FIXUP_PER_PACKAGE_FILES (Yann) changes v1 -> v2 - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host directories in a single step. package/pkg-generic.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5626af1d87..65fe9baced 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -113,8 +113,16 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. +# +# When per-package is enabled, packages may generate files with absolute paths +# that point to the packages per-package sysroot. However, this breaks +# per-package isolation when the files are rsynced to a new package that depends +# on the first package. because the hard-coded paths point to directories +# outside the packages sysroot. Run sed on all .cmake, .pc, and .pri files in a +# given packages sysroot containing the word "per-package" and replace the path +# with the appropriate per-package directory. ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define FIXUP_PYTHON_SYSCONFIGDATA +define FIXUP_PER_PACKAGE_FILES $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ @@ -124,6 +132,11 @@ define FIXUP_PYTHON_SYSCONFIGDATA \) \ | xargs -0 --no-run-if-empty \ $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + + $(Q)find $(HOST_DIR)/ -name "*.pc" -o -name "*.cmake" -o -name "*.pri" \ + | xargs --no-run-if-empty \ + $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(NAME)/:g" + endef endif @@ -836,7 +849,7 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += FIXUP_PER_PACKAGE_FILES ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.33.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:50:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:50:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/libvirt: install in staging Message-ID: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> Install libvirt in staging to allow collectd to use it Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 9a4788c905..41218c0e53 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -10,6 +10,7 @@ LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ LIBVIRT_LICENSE_FILES = COPYING LIBVIRT_CPE_ID_VENDOR = redhat +LIBVIRT_INSTALL_STAGING = YES LIBVIRT_DEPENDENCIES = \ host-libxslt \ host-nfs-utils \ -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:50:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:50:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/collectd: add virt support In-Reply-To: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> References: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> Message-ID: <20220104205008.3631801-2-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/collectd/Config.in | 18 ++++++++++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 5e5dff6fe1..697dc51f7e 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -591,6 +591,24 @@ config BR2_PACKAGE_COLLECTD_USERS help Counts the number of users currently logged in. +config BR2_PACKAGE_COLLECTD_VIRT + bool "virt" + depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS # libvirt + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # libvirt + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 # libvirt + depends on BR2_PACKAGE_HAS_UDEV # libvirt + depends on BR2_USE_WCHAR # libvirt + select BR2_PACKAGE_LIBVIRT + select BR2_PACKAGE_LIBXML2 + help + Gather statistics about virtualized guests on a system. + +comment "virt needs udev /dev management, a toolchain w/ wchar, kernel headers >= 3.12 (4.11 for AArch64)" + depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR || \ + !(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \ + (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) + config BR2_PACKAGE_COLLECTD_VMEM bool "vmem" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 9d6f630fe3..5751757040 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -22,7 +22,7 @@ COLLECTD_PLUGINS_DISABLE = \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ - tokyotyrant turbostat uuid varnish virt vserver write_kafka \ + tokyotyrant turbostat uuid varnish vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone COLLECTD_CONF_ENV += LIBS="-lm" @@ -149,6 +149,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \ $(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \ $(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \ + $(if $(BR2_PACKAGE_COLLECTD_VIRT),--enable-virt,--disable-virt) \ $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ @@ -197,6 +198,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \ $(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ + $(if $(BR2_PACKAGE_COLLECTD_VIRT),libvirt libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) -- 2.34.1 From james.hilliard1 at gmail.com Tue Jan 4 20:52:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 4 Jan 2022 13:52:13 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: use backported ICU patch from upstream Message-ID: <20220104205213.1367539-1-james.hilliard1@gmail.com> Use backported upstream ICU fix instead of adapted downstream patch. Signed-off-by: James Hilliard --- ...ion-ICU-68.1-no-longer-exposes-FALS.patch} | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) rename package/qt5/qt5webkit/{0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch => 0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch} (86%) diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch similarity index 86% rename from package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch rename to package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch index 11d0b7b248..0c3e8b3586 100644 --- a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch +++ b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch @@ -1,18 +1,39 @@ -From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001 -From: Henri Roosen -Date: Thu, 18 Mar 2021 11:53:57 +0100 -Subject: [PATCH] Fix ICU related compile failures from capital bool defines +From 736e1d804d1efa2077c4f1fe0b9084927d82e249 Mon Sep 17 00:00:00 2001 +From: "stephan.szabo at sony.com" + +Date: Tue, 3 Nov 2020 20:06:15 +0000 +Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and + TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522 -See ICU-21267 +Reviewed by Don Olmstead. -Signed-off-by: Henri Roosen +Source/WebCore: + +* platform/text/TextCodecICU.cpp: Replace use of TRUE with true + +Source/WebKit: + +* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false + +Source/WTF: + +Replace uses of FALSE and TRUE with false and true. + +* wtf/text/icu/UTextProvider.h: +* wtf/text/icu/UTextProviderLatin1.cpp: +* wtf/text/icu/UTextProviderUTF16.cpp: + +Change-Id: I876cf2b10b8c858c3d265113c062d159749a2f3e +git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +736e1d804d1efa2077c4f1fe0b9084927d82e249] --- Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- Source/WebCore/platform/text/icu/UTextProvider.h | 8 ++++---- .../platform/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- .../platform/text/icu/UTextProviderUTF16.cpp | 4 ++-- - 4 files changed, 14 insertions(+), 14 deletions(-) + 7 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp index dd6ff0675bb1..e0f4bd718828 100644 -- 2.25.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:52:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:52:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/4th: bump to version 3.64.0 Message-ID: <20220104205204.3632035-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/4th/4th.hash | 2 +- package/4th/4th.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/4th/4th.hash b/package/4th/4th.hash index 36d2941055..ae08a6bf5e 100644 --- a/package/4th/4th.hash +++ b/package/4th/4th.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f822f7dd8cfb0b1744a62d653c6efe933578ae1789ec60a088509a38bca4b4fc 4th-3.62.5-unix.tar.gz +sha256 c0905e92316c151224858fcfff21c143c85efa4f9f1b2ade3c64cfd988e0a6a8 4th-3.64.0-unix.tar.gz sha256 8c6111b645a02219579ea66e84aa8e78a0ed4f4dd80857ffb91bcda5528717d4 COPYING diff --git a/package/4th/4th.mk b/package/4th/4th.mk index aee59c463f..d031c0e4b4 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -4,7 +4,7 @@ # ################################################################################ -4TH_VERSION = 3.62.5 +4TH_VERSION = 3.64.0 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) 4TH_LICENSE = GPL-3.0+, LGPL-3.0+ -- 2.34.1 From james.hilliard1 at gmail.com Tue Jan 4 20:53:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 4 Jan 2022 14:53:24 -0600 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: bump to version 5.212.0-alpha4 In-Reply-To: References: <20220104074821.1330228-1-james.hilliard1@gmail.com> Message-ID: On Tue, Jan 4, 2022 at 12:33 PM Arnout Vandecappelle wrote: > > > > On 04/01/2022 08:48, James Hilliard wrote: > > Switch to latest release in new active upstream: > > https://github.com/qtwebkit/qtwebkit > > Perhaps you can push the remaining patch to upstream then? Oh, it's already upstream, switched to that version here: https://patchwork.ozlabs.org/project/buildroot/patch/20220104205213.1367539-1-james.hilliard1 at gmail.com/ > > > > > Migrate python2 build to python3. > > > > Drop patches that are upstream/no longer needed. > > > > Adapt/add patches to fix build issues. > > > > Rework build system to use cmake instead of qmake(which does not > > currently support cross compilation). > > > > Signed-off-by: James Hilliard > > [snip] > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > > index dd99661be0..3af1918a46 100644 > > --- a/package/qt5/qt5webkit/qt5webkit.mk > > +++ b/package/qt5/qt5webkit/qt5webkit.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5WEBKIT_VERSION = 5.9.1 > > -QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > > -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > > +QT5WEBKIT_VERSION = 5.212.0-alpha4 > > +QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION) > > Upstream README says: > > Use the following repository if you need to get latest snapshots of QtWebKit code: > > http://code.qt.io/cgit/qt/qtwebkit.git/ > > This repo aslo has a 5.212.0-alpha4 tag. Perhaps we should switch to that? That repo has no recent activity and appears abandoned, the new upstream is a fork of that, also I didn't see a release tarball from qt organization(which seems to no longer maintain qtwebkit at all). > > Anyway, I applied to master as is. > > Regards, > Arnout > > > +QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz > > QT5WEBKIT_DEPENDENCIES = \ > > - host-bison host-flex host-gperf host-python host-ruby \ > > - leveldb sqlite > > + host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ > > + gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ > > + qt5sensors qt5webchannel sqlite webp woff2 > > QT5WEBKIT_INSTALL_STAGING = YES > > > > QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 > > @@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > > > > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > > -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender > > +QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender > > endif > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5WEBKIT_DEPENDENCIES += qt5declarative > > endif > > > > -# QtWebkit's build system uses python, but only supports python2. We work > > -# around this by forcing python2 early in the PATH, via a python->python2 > > -# symlink. > > -QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) > > -QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) > > -define QT5WEBKIT_PYTHON2_SYMLINK > > - mkdir -p $(@D)/host-bin > > - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python > > -endef > > -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK > > +QT5WEBKIT_CONF_OPTS += \ > > + -DPORT=Qt \ > > + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > > + -DUSE_LIBHYPHEN=OFF > > > > -QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb > > - > > -define QT5WEBKIT_INSTALL_TARGET_EXTRAS > > - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ > > -endef > > - > > -QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS > > - > > -$(eval $(qmake-package)) > > +$(eval $(cmake-package)) > > From fontaine.fabrice at gmail.com Tue Jan 4 20:54:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:54:55 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/file: fix build with gcc 4.8 Message-ID: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 5.41 in commit d38b72bcd75392a88b5100839ac410859d0a6a79: readelf.c: In function 'do_auxv_note': readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode for (size_t off = 0; off + elsize <= descsz; off += elsize) { ^ Fixes: - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Set ac_cv_prog_c99 for host as already done for target instead of adding an upstreamable patch package/file/file.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/file/file.mk b/package/file/file.mk index 12647af8bb..62cec4b2c9 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -9,6 +9,7 @@ FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file HOST_FILE_DEPENDENCIES = host-zlib FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' +HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:57:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:57:46 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 Message-ID: <20220104205746.3633354-1-fontaine.fabrice@gmail.com> Drop patches (already in version) Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Drop second patch now that it has been applied .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 ----------------- ...-utils-text-scroller.cc-replace-uint.patch | 50 ------------------- .../rpi-rgb-led-matrix.hash | 2 +- .../rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 2 +- 4 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch delete mode 100644 package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch deleted file mode 100644 index f7a92f5fb2..0000000000 --- a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 -From: Grzegorz Blach -Date: Sat, 29 Aug 2020 20:48:57 +0200 -Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. - -This change allows additional flags to be added to the linker -from the command line. - -Signed-off-by: Grzegorz Blach ---- - utils/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/utils/Makefile b/utils/Makefile -index e751adc..e704442 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include - RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib - RGB_LIBRARY_NAME=rgbmatrix - RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a --LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread -+RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread - - # Imagemagic flags, only needed if actually compiled. - MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) -@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE - $(MAKE) -C $(RGB_LIBDIR) - - text-scroller: text-scroller.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) - - led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) -+ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) - - video-viewer: video-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) -+ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) - - %.o : %.cc - $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< --- -2.24.3 (Apple Git-128) - diff --git a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch deleted file mode 100644 index 627415bac8..0000000000 --- a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a56338db0f003d5236f2ce98c73a591d64a70852 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 22:57:11 +0100 -Subject: [PATCH] utils/text-scroller.cc: replace uint (#1383) - -Replace uint by uint64_t to avoid the following build failure on musl: - -text-scroller.cc: In function 'int main(int, char**)': -text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? - 220 | uint frame_counter = 0; - | ^~~~ - | rint - -Fixes: - - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/hzeller/rpi-rgb-led-matrix/commit/a56338db0f003d5236f2ce98c73a591d64a70852] ---- - utils/text-scroller.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/utils/text-scroller.cc b/utils/text-scroller.cc -index a64ba0c89..28d4f7182 100644 ---- a/utils/text-scroller.cc -+++ b/utils/text-scroller.cc -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -217,12 +218,12 @@ int main(int argc, char *argv[]) { - - struct timespec next_frame = {0, 0}; - -- uint frame_counter = 0; -+ uint64_t frame_counter = 0; - while (!interrupt_received && loops != 0) { - ++frame_counter; - offscreen_canvas->Fill(bg_color.r, bg_color.g, bg_color.b); - const bool draw_on_frame = (blink_on <= 0) -- || (frame_counter % (blink_on + blink_off) < (uint)blink_on); -+ || (frame_counter % (blink_on + blink_off) < (uint64_t)blink_on); - - if (draw_on_frame) { - if (outline_font) { diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash index 3b1cb5fd76..265e4c4249 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz +sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk index e436755121..499fb408c2 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 +RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:59:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:59:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/openipmi: fix musl build with libexecinfo Message-ID: <20220104205948.3633747-1-fontaine.fabrice@gmail.com> Disable execinfo to avoid the following musl build failure raised since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 Signed-off-by: Fabrice Fontaine --- ...igure.ac-add-without-execinfo-option.patch | 55 +++++++++++++++++++ package/openipmi/openipmi.mk | 1 + 2 files changed, 56 insertions(+) create mode 100644 package/openipmi/0002-configure.ac-add-without-execinfo-option.patch diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch new file mode 100644 index 0000000000..e1838a06f4 --- /dev/null +++ b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch @@ -0,0 +1,55 @@ +From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Jan 2022 23:27:21 +0100 +Subject: [PATCH] configure.ac: add --without-execinfo option + +Add an option to allow the user to disable execinfo to avoid the +following build failure on musl with +https://github.com/mikroskeem/libexecinfo: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' + +Fixes: + - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/openipmi/patches/36] +--- + configure.ac | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 607864b9..f369166f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, + POPTLIBS="$withval" + ) + ++tryexecinfo=yes ++AC_ARG_WITH(execinfo, ++[ --with-execinfo[[=yes|no]] Look for execinfo.], ++ if test "x$withval" = "xyes"; then ++ tryexecinfo=yes ++ elif test "x$withval" = "xno"; then ++ tryexecinfo=no ++ fi, ++) ++ + # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib + tryopenssl=yes + AC_ARG_WITH(openssl, +@@ -275,7 +285,9 @@ AM_PROG_CC_C_O + AC_PROG_LIBTOOL + AC_STDC_HEADERS + +-AC_CHECK_HEADERS(execinfo.h) ++if test "x$tryexecinfo" != "xno"; then ++ AC_CHECK_HEADERS(execinfo.h) ++fi + AC_CHECK_HEADERS([netinet/ether.h]) + AC_CHECK_HEADERS([sys/ethernet.h]) + +-- +2.34.1 + diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index ad2f2d2f4f..b3a4d90d4b 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,6 +15,7 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ + --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 21:07:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 22:07:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/qpdf: needs atomic Message-ID: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> qpdf needs atomic since bump to version 10.5.0 in commit b5352c2177011ca389cbb7c68e78447549cbdaaa and https://github.com/qpdf/qpdf/commit/c5c1a028cdd3cf345046c46963fb0fdacfb2c33c: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-2/output-1/build/qpdf-10.5.0/libqpdf/build/.libs/libqpdf.a(QPDF.o): in function `QPDF::QPDF()': QPDF.cc:(.text+0x48de): undefined reference to `__atomic_fetch_add_8' Fixes: - http://autobuild.buildroot.org/results/7e18689670dcbe491c35f0597e5c3c787936263f Signed-off-by: Fabrice Fontaine --- package/cups-filters/Config.in | 2 ++ package/qpdf/Config.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in index 32381e6c1f..ded99a4774 100644 --- a/package/cups-filters/Config.in +++ b/package/cups-filters/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qpdf + depends on BR2_TOOLCHAIN_HAS_ATOMIC # qpdf select BR2_PACKAGE_JPEG select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE @@ -33,6 +34,7 @@ config BR2_PACKAGE_CUPS_FILTERS comment "cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 5" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/qpdf/Config.in b/package/qpdf/Config.in index 047c4c8a75..accf2b5f34 100644 --- a/package/qpdf/Config.in +++ b/package/qpdf/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QPDF bool "qpdf" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_ZLIB select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL @@ -16,5 +17,6 @@ config BR2_PACKAGE_QPDF http://qpdf.sourceforge.net/ comment "qpdf needs a toolchain w/ C++, gcc >= 5" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 -- 2.34.1 From matthew.weber at collins.com Tue Jan 4 21:55:41 2022 From: matthew.weber at collins.com (Matthew Weber) Date: Tue, 4 Jan 2022 15:55:41 -0600 Subject: [Buildroot] [PATCH v9] package/freeradius-server: new package Message-ID: <20220104215541.23003-1-matthew.weber@collins.com> From: David GOUARIN FreeRADIUS is an open source server which implements a protocol for remote user Authorization, Authentication and Accounting. Signed-off-by: David GOUARIN Signed-off-by: Kalpesh Panchal Signed-off-by: Matt Weber --- Changes v8 -> v9: - A systemd unit is installed if systemd is enabled. The default provided by `freeradius-server/redhat/radiusd.service` was not used because of extra options not compatible with Buildroot. The unit is instead based on a simplified version of that upstream file. v7 -> v8: - added dependencies to include libpcap - version bump to 3.0.25 v6 -> v7 - resolve rlm_sql module compilation error (Newer GCC) (remove mysql_version.h as mysql.h is included) v5 -> v6: - cleaned up patches to all be git formatted - added depends on BR2_USE_MMU - rebased on master - added CPE info v4 -> v5: - better package patches formatting v3 -> v4: Taken in account Thomas review - fix build with BR2_COMPILER_PARANOID_UNSAFE_PATH - import patches inside package directory instead of downloading them - remove config.cache file, pass the answers on the command line instead - add comments for weird TARGET_DIR and R directives - remove broken python optional feature. Managed to get it to build with python 2.7, not 3.0 and it still fails basic testing v2 -> v3: - As suggested by Matt, merge with pending upstream patch. Included most of it, including patches based on Yocto work : http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files Didn't kept all the --without directive, as they do not seem useful, nor the custom INSTALL_TARGET_CMDS. v1 -> v2: - fix invalid characters in Config.in --- DEVELOPERS | 2 + package/Config.in | 1 + .../0001-jlibtool-cross-with-host-CC.patch | 33 +++ .../0002-avoid-searching-host-dirs.patch | 201 ++++++++++++++++++ ...3-configure.ac-add-option-for-libcap.patch | 74 +++++++ ...configure.ac-allow-cross-compilation.patch | 41 ++++ ...r-for-expansion-of-macro-in-thread.h.patch | 65 ++++++ ...dules-rlm_sql-remove-mysql_version.h.patch | 36 ++++ package/freeradius-server/Config.in | 21 ++ .../freeradius-server/freeradius-server.hash | 3 + .../freeradius-server/freeradius-server.mk | 124 +++++++++++ package/freeradius-server/radiusd.service | 38 ++++ 12 files changed, 639 insertions(+) create mode 100644 package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch create mode 100644 package/freeradius-server/0002-avoid-searching-host-dirs.patch create mode 100644 package/freeradius-server/0003-configure.ac-add-option-for-libcap.patch create mode 100644 package/freeradius-server/0004-configure.ac-allow-cross-compilation.patch create mode 100644 package/freeradius-server/0005-fix-error-for-expansion-of-macro-in-thread.h.patch create mode 100644 package/freeradius-server/0006-modules-rlm_sql-remove-mysql_version.h.patch create mode 100644 package/freeradius-server/Config.in create mode 100644 package/freeradius-server/freeradius-server.hash create mode 100644 package/freeradius-server/freeradius-server.mk create mode 100644 package/freeradius-server/radiusd.service diff --git a/DEVELOPERS b/DEVELOPERS index 37c792816a..095e711197 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -658,6 +658,7 @@ N: David du Colombier <0intro at gmail.com> F: package/x264/ N: David GOUARIN +F: package/freeradius-server/ F: package/librelp/ F: package/libtalloc/ @@ -1833,6 +1834,7 @@ F: package/ethtool/ F: package/flashbench/ F: package/fmc/ F: package/fmlib/ +F: package/freeradius-server/ F: package/git/ F: package/gnutls/ F: package/hostapd/ diff --git a/package/Config.in b/package/Config.in index 7148639735..a095f6c536 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2186,6 +2186,7 @@ endif source "package/flannel/Config.in" source "package/fmc/Config.in" source "package/fping/Config.in" + source "package/freeradius-server/Config.in" source "package/freeswitch/Config.in" source "package/freeswitch-mod-bcg729/Config.in" source "package/frr/Config.in" diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch new file mode 100644 index 0000000000..398f88e4ad --- /dev/null +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -0,0 +1,33 @@ +From 8a8506320acf3ea18940a6e3a447d7d394a3bd8e Mon Sep 17 00:00:00 2001 +From: David Gouarin +Date: Mon, 12 Apr 2021 11:05:54 -0500 +Subject: [PATCH] jlibtool cross with host CC + +jlibtool.c: while cross compiling, use host CC instead of target CC to build jlibtool + +Upstream: Not applicable + +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + scripts/libtool.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/libtool.mk b/scripts/libtool.mk +index 57915e1053..c28260dd7e 100644 +--- a/scripts/libtool.mk ++++ b/scripts/libtool.mk +@@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" + # binary! + ${JLIBTOOL}: ${top_makedir}/jlibtool.c + $(Q)mkdir -p $(dir $@) +- $(Q)echo CC jlibtool.c +- $(Q)${CC} $< -o $@ ++ $(Q)echo HOSTCC jlibtool.c ++ $(Q)${HOSTCC} $< -o $@ + + clean: jlibtool_clean + +-- +2.17.1 + diff --git a/package/freeradius-server/0002-avoid-searching-host-dirs.patch b/package/freeradius-server/0002-avoid-searching-host-dirs.patch new file mode 100644 index 0000000000..163f10346c --- /dev/null +++ b/package/freeradius-server/0002-avoid-searching-host-dirs.patch @@ -0,0 +1,201 @@ +From 1dcbfce955edb834c9bb619b5ca44b0d58959de2 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Mon, 4 Jan 2016 01:44:04 -0500 +Subject: [PATCH] avoid searching host dirs + +Don't search the hardcoded host dirs to avoid +host contamination. + +Upstream-Status: Inappropriate [cross-compile specific] + +Signed-off-by: Jackie Huang + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + acinclude.m4 | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 6 +++--- + src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 2 +- + src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- + 8 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index da48acc08a..b513ae10cf 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -178,7 +178,7 @@ if test "x$smart_lib" = "x"; then + FR_LOCATE_DIR(smart_lib_dir,[lib$1${libltdl_cv_shlibext}]) + FR_LOCATE_DIR(smart_lib_dir,[lib$1.a]) + +- for try in $smart_lib_dir /usr/local/lib /opt/lib; do ++ for try in $smart_lib_dir; do + AC_MSG_CHECKING([for $2 in -l$1 in $try]) + LIBS="-l$1 $old_LIBS" + CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" +@@ -218,7 +218,7 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` + old_CPPFLAGS="$CPPFLAGS" + smart_include= + dnl # The default directories we search in (in addition to the compilers search path) +-smart_include_dir="/usr/local/include /opt/include" ++smart_include_dir= + + dnl # Our local versions + _smart_try_dir= +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac +index 75c851a135..a262d71d1a 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac +@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then + esac]) + + dnl Check for SQLConnect in -ldb2 +- smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib" ++ smart_try_dir="$ibmdb2_lib_dir" + FR_SMART_CHECK_LIB(db2, SQLConnect) + if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then + fail="$fail libdb2" + fi + + dnl Check for sqlcli.h +- smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include" ++ smart_try_dir="$ibmdb2_include_dir" + FR_SMART_CHECK_INCLUDE(sqlcli.h) + if test "x$ac_cv_header_sqlcli_h" != xyes; then + fail="$fail sqlcli.h" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac +index 4da57b308e..752b043ffb 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac +@@ -56,14 +56,14 @@ if test x$with_[]modname != xno; then + esac]) + + dnl Check for isc_attach_database in -lfbclient +- smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib" ++ smart_try_dir="$firebird_lib_dir" + FR_SMART_CHECK_LIB(fbclient, isc_attach_database) + if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then + fail="$fail libfbclient" + fi + + dnl Check for ibase.h +- smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include" ++ smart_try_dir="$firebird_include_dir" + FR_SMART_CHECK_INCLUDE(ibase.h) + if test "x$ac_cv_header_ibase_h" != xyes; then + fail="$fail ibase.h" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac +index ba6304fdcd..3393557cdb 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac +@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then + esac]) + + dnl Check for SQLConnect in -liodbc +- smart_try_dir="$iodbc_lib_dir /usr/lib /usr/lib/iodbc /usr/local/lib/iodbc /usr/local/iodbc/lib/iodbc" ++ smart_try_dir="$iodbc_lib_dir" + FR_SMART_CHECK_LIB(iodbc, SQLConnect) + if test "x$ac_cv_lib_iodbc_SQLConnect" != xyes; then + fail="$fail libiodbc" + fi + + dnl Check for isql.h +- smart_try_dir="$iodbc_include_dir /usr/include /usr/include/iodbc /usr/local/iodbc/include" ++ smart_try_dir="$iodbc_include_dir" + FR_SMART_CHECK_INCLUDE(isql.h) + if test "x$ac_cv_header_isql_h" != xyes; then + fail="$fail isql.h" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac +index fbe57b6c1d..ac6caacf71 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac +@@ -136,7 +136,7 @@ if test x$with_[]modname != xno; then + + dnl # Check for libmysqlclient_r + if test "x$have_a_libmysqlclient" != "xyes"; then +- smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" ++ smart_try_dir="$mysql_lib_dir" + FR_SMART_CHECK_LIB(mysqlclient_r, mysql_init) + if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then + have_a_libmysqlclient='yes' +@@ -145,7 +145,7 @@ if test x$with_[]modname != xno; then + + dnl # Check for libmysqlclient + if test "x$have_a_libmysqlclient" != "xyes"; then +- smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" ++ smart_try_dir="$mysql_lib_dir" + FR_SMART_CHECK_LIB(mysqlclient, mysql_init) + if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then + have_a_libmysqlclient='yes' +@@ -239,7 +239,7 @@ if test x$with_[]modname != xno; then + fi + + if test "x$have_mysql_h" != "xyes"; then +- smart_try_dir="$mysql_include_dir /usr/local/include /usr/local/mysql/include" ++ smart_try_dir="$mysql_include_dir" + FR_SMART_CHECK_INCLUDE(mysql/mysql.h) + if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then + AC_DEFINE(HAVE_MYSQL_MYSQL_H, [], [Define if you have ]) +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +index 2a97fd6764..2b4a4baed4 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +@@ -64,7 +64,7 @@ if test x$with_[]modname != xno; then + dnl # Check for header files + dnl ############################################################ + +- smart_try_dir="$oracle_include_dir /usr/local/instaclient/include" ++ smart_try_dir="$oracle_include_dir" + + if test "x$ORACLE_HOME" != "x"; then + smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +index 4f9a890ba0..e1cf811ce8 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +@@ -41,7 +41,7 @@ if test x$with_[]modname != xno; then + esac ] + ) + +- smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql" ++ smart_try_dir="$rlm_sql_postgresql_include_dir" + FR_SMART_CHECK_INCLUDE(libpq-fe.h) + if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then + fail="$fail libpq-fe.h" +@@ -76,7 +76,7 @@ if test x$with_[]modname != xno; then + ]) + fi + +- smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib" ++ smart_try_dir="$rlm_sql_postgresql_lib_dir" + FR_SMART_CHECK_LIB(pq, PQconnectdb) + if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then + fail="$fail libpq" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac +index 35453879e3..c543ed4d51 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac +@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then + esac]) + + dnl Check for SQLConnect in -lodbc +- smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib" ++ smart_try_dir="$unixodbc_lib_dir" + FR_SMART_CHECK_LIB(odbc, SQLConnect) + if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then + fail="$fail libodbc" + fi + + dnl Check for sql.h +- smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include" ++ smart_try_dir="$unixodbc_include_dir" + FR_SMART_CHECK_INCLUDE(sql.h) + if test "x$ac_cv_header_sql_h" != xyes; then + fail="$fail sql.h" +-- +2.17.1 + diff --git a/package/freeradius-server/0003-configure.ac-add-option-for-libcap.patch b/package/freeradius-server/0003-configure.ac-add-option-for-libcap.patch new file mode 100644 index 0000000000..05137ec6a8 --- /dev/null +++ b/package/freeradius-server/0003-configure.ac-add-option-for-libcap.patch @@ -0,0 +1,74 @@ +From 404f18da62e3708c9b290ee4eaf8461911df5475 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 22 Aug 2019 10:50:21 +0800 +Subject: [PATCH] configure.ac: add option for libcap + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang +Signed-off-by: Changqing Li + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + configure.ac | 36 +++++++++++++++++++++++++++--------- + 1 file changed, 27 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c72511ab39..de016b28e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -941,6 +941,22 @@ fi + dnl Set by FR_SMART_CHECKLIB + LIBS="${old_LIBS}" + ++dnl # ++dnl # extra argument: --with-libcap ++dnl # ++WITH_LIBCAP=yes ++AC_ARG_WITH(libcap, ++[ --with-licap use licap for debugger checks. (default=yes)], ++[ case "$withval" in ++ no) ++ WITH_LIBCAP=no ++ ;; ++ *) ++ WITH_LIBCAP=yes ++ ;; ++ esac ] ++) ++ + dnl Check for cap + dnl extra argument: --with-cap-lib-dir=DIR + cap_lib_dir= +@@ -974,15 +990,17 @@ AC_ARG_WITH(cap-include-dir, + ;; + esac]) + +-smart_try_dir="$cap_lib_dir" +-FR_SMART_CHECK_LIB(cap, cap_get_proc) +-if test "x$ac_cv_lib_cap_cap_get_proc" != "xyes"; then +- AC_MSG_WARN([cap library not found, debugger checks will not be enabled. Use --with-cap-lib-dir=.]) +-else +- AC_DEFINE(HAVE_LIBCAP, 1, +- [Define to 1 if you have the `cap' library (-lcap).] +- ) +- HAVE_LIBCAP=1 ++if test "x$WITH_LIBCAP" = xyes; then ++ smart_try_dir="$cap_lib_dir" ++ FR_SMART_CHECK_LIB(cap, cap_get_proc) ++ if test "x$ac_cv_lib_cap_cap_get_proc" != "xyes"; then ++ AC_MSG_WARN([cap library not found, debugger checks will not be enabled. Use --with-cap-lib-dir=.]) ++ else ++ AC_DEFINE(HAVE_LIBCAP, 1, ++ [Define to 1 if you have the `cap' library (-lcap).] ++ ) ++ HAVE_LIBCAP=1 ++ fi + fi + + dnl # +-- +2.17.1 + diff --git a/package/freeradius-server/0004-configure.ac-allow-cross-compilation.patch b/package/freeradius-server/0004-configure.ac-allow-cross-compilation.patch new file mode 100644 index 0000000000..248a5f0e34 --- /dev/null +++ b/package/freeradius-server/0004-configure.ac-allow-cross-compilation.patch @@ -0,0 +1,41 @@ +From d6c1da041da77902a06d10bf03ef454468921801 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 24 Jul 2018 15:03:39 +0800 +Subject: [PATCH] configure.ac: allow cross-compilation + +The checking OpenSSL library and header version consistency will +always fail in cross compiling, skip the check and give a warning +instead for cross compiling. + +Upstream-Status: Inappropriate[embedded specific] + +Signed-off-by: Jackie Huang +Signed-off-by: Yi Zhao + +update to new version 3.0.17 to fix patch warning +Signed-off-by: Changqing Li + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + src/modules/rlm_krb5/configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac +index efc9f29d7f..98a97e438a 100644 +--- a/src/modules/rlm_krb5/configure.ac ++++ b/src/modules/rlm_krb5/configure.ac +@@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then + FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) + if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[return krb5_is_thread_safe() ? 0 : 1]])], +- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) ++ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], ++ [AC_MSG_WARN(cross compiling: not checking)]) + fi + else + krb5threadsafe="" +-- +2.17.1 + diff --git a/package/freeradius-server/0005-fix-error-for-expansion-of-macro-in-thread.h.patch b/package/freeradius-server/0005-fix-error-for-expansion-of-macro-in-thread.h.patch new file mode 100644 index 0000000000..cf6ad81a14 --- /dev/null +++ b/package/freeradius-server/0005-fix-error-for-expansion-of-macro-in-thread.h.patch @@ -0,0 +1,65 @@ +From dae3b7c53171dfeacce91e0da1c8bd4e4166352e Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Wed, 18 Jan 2017 14:59:39 +0800 +Subject: [PATCH] fix error for expansion of macro in thread.h + +The parameter declaration is missing in expansion of macro +which cause the build error: +| In file included from src/freeradius-devel/libradius.h:80:0, +| from src/lib/log.c:26: +| src/lib/log.c: In function '__fr_thread_local_destroy_fr_strerror_buffer': +| src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function) +| fr_thread_local_setup(char *, fr_strerror_buffer) /* macro */ +| ^ + +Add the missing declaration in macro. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + src/include/threads.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/include/threads.h b/src/include/threads.h +index e36d81dac0..2bcb6aadcb 100644 +--- a/src/include/threads.h ++++ b/src/include/threads.h +@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ + # define fr_thread_local_get(_n) _n + #elif defined(HAVE_PTHREAD_H) + # include +-# define fr_thread_local_setup(_t, _n) \ ++# define fr_thread_local_setup(_t, _n) static __thread _t _n;\ + static pthread_key_t __fr_thread_local_key_##_n;\ + static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ + static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ +@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\ + static void __fr_thread_local_key_init_##_n(void)\ + {\ + (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ +- (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ + }\ + static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ + {\ + __fr_thread_local_destructor_##_n = func;\ + if (_n) return _n; \ + (void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\ ++ (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ + return _n;\ + } +-# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) +-# define fr_thread_local_set(_n, _v) __fr_thread_local_set_##_n(_v) +-# define fr_thread_local_get(_n) __fr_thread_local_get_##_n() ++# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) ++# define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1)) ++# define fr_thread_local_get(_n) _n + #endif + #endif +-- +2.17.1 + diff --git a/package/freeradius-server/0006-modules-rlm_sql-remove-mysql_version.h.patch b/package/freeradius-server/0006-modules-rlm_sql-remove-mysql_version.h.patch new file mode 100644 index 0000000000..03f8ef8805 --- /dev/null +++ b/package/freeradius-server/0006-modules-rlm_sql-remove-mysql_version.h.patch @@ -0,0 +1,36 @@ +From 77b8c75f9904897768f87e20fef5d7739ddcd3c7 Mon Sep 17 00:00:00 2001 +From: Jared Bents +Date: Tue, 4 Feb 2020 08:22:11 -0600 +Subject: [PATCH] modules/rlm_sql: remove mysql_version.h + +remove mysql_version.h as mysql.h is included and mysql_version.h +should not be included by per the header file warning + +Upstream: http://lists.freeradius.org/pipermail/freeradius-devel/2021-April/014218.html + +Signed-off-by: Jared Bents +Signed-off-by: Matt Weber +--- + src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c +index a7992647cd..ea44d0cc7a 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c ++++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c +@@ -34,12 +34,10 @@ RCSID("$Id$") + #include "config.h" + + #ifdef HAVE_MYSQL_MYSQL_H +-# include + # include + # include + # include + #elif defined(HAVE_MYSQL_H) +-# include + # include + # include + # include +-- +2.17.1 + diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in new file mode 100644 index 0000000000..0f796e21d2 --- /dev/null +++ b/package/freeradius-server/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_FREERADIUS_SERVER + bool "freeradius-server" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_MMU + select BR2_PACKAGE_LIBTALLOC + help + FreeRADIUS is an open source server which implements + a protocol for remote user Authorization, Authentication + and Accounting. + + http://wiki.freeradius.org/ + +comment "freeradius-server needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +comment "freeradius-server needs a glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC + +comment "freeradius-server needs a target w/ MMU" + depends on !BR2_USE_MMU diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash new file mode 100644 index 0000000000..68f7e05435 --- /dev/null +++ b/package/freeradius-server/freeradius-server.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4883a68bb3cee46025359a97c1691ce655e8babfd6dc3c021d00e109a2ff4c10 freeradius-server-3.0.25.tar.gz +sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk new file mode 100644 index 0000000000..0c071a2378 --- /dev/null +++ b/package/freeradius-server/freeradius-server.mk @@ -0,0 +1,124 @@ +################################################################################ +# +# freeradius-server +# +################################################################################ + +FREERADIUS_SERVER_VERSION = 3.0.25 +FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius +FREERADIUS_SERVER_LICENSE = GPL-2.0 +FREERADIUS_SERVER_LICENSE_FILES = COPYRIGHT +FREERADIUS_SERVER_DEPENDENCIES = libtalloc + +# some compiler checks are not supported while cross compiling. +# instead of removing those checks, we cache the answers +FREERADIUS_SERVER_CONF_OPTS += \ + ax_cv_cc_bounded_attribute=no \ + ax_cv_cc_builtin_bswap64=no \ + ax_cv_cc_builtin_choose_expr=no \ + ax_cv_cc_builtin_types_compatible_p=no + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-libcap +FREERADIUS_SERVER_DEPENDENCIES += libcap +else +FREERADIUS_SERVER_CONF_OPTS += --without-libcap +endif + +ifeq ($(BR2_PACKAGE_LIBPCAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-libpcap +FREERADIUS_SERVER_DEPENDENCIES += libpcap +else +FREERADIUS_SERVER_CONF_OPTS += --without-libpcap +endif + +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_krb5 +FREERADIUS_SERVER_DEPENDENCIES += libkrb5 +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_krb5 +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_pam +FREERADIUS_SERVER_DEPENDENCIES += linux-pam +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_pam +endif + +ifeq ($(BR2_PACKAGE_OPENLDAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ldap +FREERADIUS_SERVER_DEPENDENCIES += openldap +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ldap +endif + +ifeq ($(BR2_PACKAGE_MYSQL),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_mysql +FREERADIUS_SERVER_DEPENDENCIES += mysql +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_mysql +endif + +ifeq ($(BR2_PACKAGE_SQLITE),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_sqlite +FREERADIUS_SERVER_DEPENDENCIES += sqlite +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_sqlite +endif + +ifeq ($(BR2_PACKAGE_UNIXODBC),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_unixodbc +FREERADIUS_SERVER_DEPENDENCIES += unixodbc +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_unixodbc +endif + +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_postgresql +FREERADIUS_SERVER_DEPENDENCIES += postgresql +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_postgresql +endif + +ifeq ($(BR2_PACKAGE_HAS_OPENSSL),y) +FREERADIUS_SERVER_DEPENDENCIES += openssl +FREERADIUS_SERVER_CONF_OPTS += --with-openssl +else +FREERADIUS_SERVER_CONF_OPTS += --without-openssl +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +FREERADIUS_SERVER_CONF_OPTS += --with-pcre +FREERADIUS_SERVER_DEPENDENCIES += pcre +else +FREERADIUS_SERVER_CONF_OPTS += --without-pcre +endif + +ifeq ($(BR2_PACKAGE_RUBY),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ruby +FREERADIUS_SERVER_DEPENDENCIES += ruby +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ruby +endif + +ifeq ($(BR2_INIT_SYSTEMD),y) +FREERADIUS_SERVER_CONF_OPTS += --with-systemd +FREERADIUS_SERVER_DEPENDENCIES += systemd +else +FREERADIUS_SERVER_CONF_OPTS += --without-systemd +endif + +# TARGET_DIR is set to empty to avoid creation of symlinks in hardcoded host directories +# freeradius Makefile does not support an alternate DESTDIR, instead it uses the magic $(R) variable +FREERADIUS_SERVER_MAKE_ENV = R=$(TARGET_DIR) TARGET_DIR="" + +# use MAKE1 because make install does not support parallel build +FREERADIUS_SERVER_MAKE = $(MAKE1) + +define FREERADIUS_SERVER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/freeradius-server/radiusd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/radiusd.service +endef + +$(eval $(autotools-package)) diff --git a/package/freeradius-server/radiusd.service b/package/freeradius-server/radiusd.service new file mode 100644 index 0000000000..a55bce62d3 --- /dev/null +++ b/package/freeradius-server/radiusd.service @@ -0,0 +1,38 @@ +# Reference from: freeradius-server/redhat/radiusd.service + +[Unit] +Description=FreeRADIUS multi-protocol policy server +After=network-online.target +Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ http://networkradius.com/doc/ + +[Service] +Type=notify +WatchdogSec=60 +NotifyAccess=all +EnvironmentFile=-/etc/sysconfig/radiusd + +# FreeRADIUS can do static evaluation of policy language rules based +# on environmental variables which is very useful for doing per-host +# customization. +# Unfortunately systemd does not allow variable substitutions such +# as %H or $(hostname) in the EnvironmentFile. +# We provide HOSTNAME here for convenience. +Environment=HOSTNAME=%H + +# Limit memory to 2G this is fine for %99.99 of deployments. FreeRADIUS +# is not memory hungry, if it's using more than this, then there's probably +# a leak somewhere. +MemoryLimit=2G + +ExecStartPre=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cx -lstdout +ExecStart=/usr/sbin/radiusd -f $FREERADIUS_OPTIONS +Restart=on-failure +RestartSec=5 +ExecReload=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cxm -lstdout +ExecReload=/bin/kill -HUP $MAINPID + +# Only allow native system calls +SystemCallArchitectures=native + +[Install] +WantedBy=multi-user.target -- 2.17.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:40 +0100 Subject: [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 Message-ID: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Add gcc >= 5 dependency because __builtin_add_overflow is unconditionally used since https://github.com/SELinuxProject/selinux/commit/0744fa4f533c765d0a704fe8aa7174a0f93eb7bc https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/checkpolicy/Config.in | 6 ++++-- package/libselinux/Config.in | 6 ++++-- package/libsepol/Config.in | 6 ++++-- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 2 +- package/refpolicy/Config.in | 6 ++++-- package/restorecond/Config.in | 5 +++-- package/selinux-python/Config.in | 8 ++++++++ package/semodule-utils/Config.in | 6 ++++-- package/setools/Config.in | 5 +++-- 10 files changed, 36 insertions(+), 16 deletions(-) diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in index ad769d22b7..6a1f22991d 100644 --- a/package/checkpolicy/Config.in +++ b/package/checkpolicy/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_CHECKPOLICY bool "checkpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_FLEX help @@ -13,5 +14,6 @@ config BR2_PACKAGE_CHECKPOLICY http://selinuxproject.org/page/Main_Page -comment "checkpolicy needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "checkpolicy needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 62070c8d59..348757abce 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSELINUX bool "libselinux" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC @@ -16,5 +17,6 @@ config BR2_PACKAGE_LIBSELINUX http://selinuxproject.org/page/Main_Page -comment "libselinux needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "libselinux needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 04af880e67..7516076cd5 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBSEPOL bool "libsepol" depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 help Libsepol is the binary policy manipulation library. It doesn't depend upon or use any of the other SELinux components. @@ -35,5 +36,6 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION endif -comment "libsepol needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libsepol needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index b273f982b6..039e4e3c7e 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz +sha256 2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b libsepol-3.3.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 55125f2203..8551a5de79 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.2 +LIBSEPOL_VERSION = 3.3 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index c529b85e1d..043cc40a72 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol # Even though libsepol is not necessary for building, we get # the policy version from libsepol, so we select it, and treat # it like a runtime dependency. @@ -113,5 +114,6 @@ endif endif -comment "refpolicy needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "refpolicy needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in index 31f85f2882..5e5567b213 100644 --- a/package/restorecond/Config.in +++ b/package/restorecond/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RESTORECOND depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBGLIB2 @@ -15,7 +16,7 @@ config BR2_PACKAGE_RESTORECOND https://github.com/SELinuxProject/selinux/wiki/Releases -comment "restorecond needs a toolchain w/ wchar, threads, dynamic library" +comment "restorecond needs a toolchain w/ wchar, threads, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 0f1c281777..6a518f97d4 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -17,6 +17,7 @@ if BR2_PACKAGE_SELINUX_PYTHON config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW bool "audit2allow" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol select BR2_PACKAGE_CHECKPOLICY select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN select BR2_PACKAGE_SEMODULE_UTILS @@ -29,13 +30,20 @@ config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW audit2why - translates SELinux audit messages into a description of why the access was denied (audit2allow -w) +comment "audit2allow needs a toolchain w/ gcc 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN bool "sepolgen" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol select BR2_PACKAGE_SEMODULE_UTILS help This package contains a Python module that allows you to generate an initial SELinux policy module template. +comment "sepolgen needs a toolchain w/ gcc 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + endif comment "selinux-python needs python3" diff --git a/package/semodule-utils/Config.in b/package/semodule-utils/Config.in index 38e043dc2c..5d98dc615f 100644 --- a/package/semodule-utils/Config.in +++ b/package/semodule-utils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SEMODULE_UTILS bool "semodule-utils" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL help semodule-utils is a package that contains tools for handling @@ -15,5 +16,6 @@ config BR2_PACKAGE_SEMODULE_UTILS https://github.com/SELinuxProject/selinux/wiki/Releases -comment "semodule-utils needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "semodule-utils needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/setools/Config.in b/package/setools/Config.in index 3ab7f55948..5a71672bdf 100644 --- a/package/setools/Config.in +++ b/package/setools/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_USE_WCHAR depends on BR2_USE_MMU depends on BR2_PACKAGE_PYTHON3 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX @@ -19,10 +20,10 @@ config BR2_PACKAGE_SETOOLS https://github.com/SELinuxProject/setools/ -comment "setools needs a toolchain w/ threads, wchar, dynamic library" +comment "setools needs a toolchain w/ threads, wchar, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "setools needs python3" depends on BR2_USE_MMU -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:41 +0100 Subject: [Buildroot] [PATCH 2/6] package/libselinux: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-2-fontaine.fabrice@gmail.com> - Drop third patch (already in version) - Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- ...s-getseuser.c-fix-build-with-gcc-4.8.patch | 47 ------------------- package/libselinux/libselinux.hash | 4 +- package/libselinux/libselinux.mk | 2 +- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch diff --git a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch b/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 645e84b236..0000000000 --- a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5c4ddfc88f0a7f10a5e9edddbdbe8e8ef1f9945e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Jun 2021 07:38:02 +0200 -Subject: [PATCH] libselinux/utils/getseuser.c: fix build with gcc 4.8 - -Fix the following build failure with gcc 4.8 which is raised since -version 3.2 and -https://github.com/SELinuxProject/selinux/commit/156dd0de5cad31e7d437c64e11a8aef027f0a691 - -getseuser.c:53:2: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < n; i++) - ^ - -Fixes: - - http://autobuild.buildroot.org/results/37eb0952a763256fbf6ef3c668f6c95fbdf2dd35 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/selinux/pull/289] ---- - libselinux/utils/getseuser.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/getseuser.c b/utils/getseuser.c -index ce1b7b27..34f2e887 100644 ---- a/utils/getseuser.c -+++ b/utils/getseuser.c -@@ -9,7 +9,7 @@ int main(int argc, char **argv) - { - char *seuser = NULL, *level = NULL; - char **contextlist; -- int rc, n; -+ int rc, n, i; - - if (argc != 3) { - fprintf(stderr, "usage: %s linuxuser fromcon\n", argv[0]); -@@ -50,7 +50,7 @@ int main(int argc, char **argv) - if (n == 0) - printf("no valid context found\n"); - -- for (int i = 0; i < n; i++) -+ for (i = 0; i < n; i++) - printf("Context %d\t%s\n", i, contextlist[i]); - - freeconary(contextlist); --- -2.30.2 - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 797b978ee1..a2e0083f7b 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161 libselinux-3.2.tar.gz +sha256 acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057 libselinux-3.3.tar.gz # Hash for license file -sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE +sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 0f36db1cfd..c1e90130d2 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.2 +LIBSELINUX_VERSION = 3.3 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:42 +0100 Subject: [Buildroot] [PATCH 3/6] package/libsemanage: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-3-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/libsemanage/libsemanage.hash | 4 ++-- package/libsemanage/libsemanage.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 117fd40d6a..1f333aac30 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 d722a55ca4fe2d4e2b30527720db657e6238b28079e69e2e4affeb8e733ee511 libsemanage-3.2.tar.gz +sha256 84d0ec5afa34bbbb471f602d8c1bf317d12443d07852a34b60741d428d597ce8 libsemanage-3.3.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index bbe976a2c9..db9f16bb6a 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.2 +LIBSEMANAGE_VERSION = 3.3 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:43 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:43 +0100 Subject: [Buildroot] [PATCH 4/6] package/checkpolicy: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-4-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/checkpolicy/checkpolicy.hash | 4 ++-- package/checkpolicy/checkpolicy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index c237913eaf..3586389047 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 9b1c81fa86fe3867842164448d90c8e7ea94b2987497809c65d4caa87a5c5bc8 checkpolicy-3.2.tar.gz +sha256 25c84edfa3a10ab8cb073b97bc55cb66377532d54a2723da9accdabd05431485 checkpolicy-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index f8ce48c175..af9a58cee8 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.2 +CHECKPOLICY_VERSION = 3.3 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:44 +0100 Subject: [Buildroot] [PATCH 5/6] package/restorecond: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-5-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/restorecond/restorecond.hash | 4 ++-- package/restorecond/restorecond.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 1869100188..b38c6dcf14 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 471c17e64aa6d7226e861d4d0125d15fdf9b38892c542be32bd83d999e5e75f5 restorecond-3.2.tar.gz +sha256 218c3d8873f31764e3c82d53ac713c0c9faaa07caf42ed7184e93ca2b27d8f27 restorecond-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 671f071b1d..7d6ed86f08 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTORECOND_VERSION = 3.2 +RESTORECOND_VERSION = 3.3 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:45 +0100 Subject: [Buildroot] [PATCH 6/6] package/selinux-python: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-6-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/selinux-python/selinux-python.hash | 4 ++-- package/selinux-python/selinux-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 00c28b722c..93a28becdd 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz +sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.2.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 61ec7eb595..0cec602f3d 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.2 +SELINUX_PYTHON_VERSION = 3.3 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING -- 2.34.1 From yann.morin.1998 at free.fr Tue Jan 4 22:12:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 23:12:32 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: fix removed bootlin riscv64 toolchains Message-ID: <20220104220637.88C20832AD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9290c6ea591ec1280c9a526c412a6a2ecf33d2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 bootlin toolchains by RISC-V LP64D. However, Config.in.legacy was added for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE, which never existed (the stable version was only added after the switch to LP64D). Conversely, BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE, which was removed, was not mentioned in Config.in.legacy. Correct the symbol name and its comment in Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5994d94487..e5349e58ac 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,8 +153,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE The RISC-V 64-bit LP64 Bootlin toolchains have been removed, in favor of RISC-V 64-bit LP64D toolchains. -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE - bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE + bool "Bootlin riscv64 musl bleeding-edge toolchain removed" select BR2_LEGACY help The RISC-V 64-bit LP64 Bootlin toolchains have been removed, From yann.morin.1998 at free.fr Tue Jan 4 22:14:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 23:14:07 +0100 Subject: [Buildroot] [PATCH] Config.in.legacy: fix removed bootlin riscv64 toolchains In-Reply-To: <20220104171128.956397-1-arnout@mind.be> References: <20220104171128.956397-1-arnout@mind.be> Message-ID: <20220104221407.GC614810@scaer> Arnout, All, On 2022-01-04 18:11 +0100, Arnout Vandecappelle (Essensium/Mind) spake thusly: > commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 > bootlin toolchains by RISC-V LP64D. However, Config.in.legacy was added > for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE, which never > existed (the stable version was only added after the switch to LP64D). > Conversely, BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE, > which was removed, was not mentioned in Config.in.legacy. > > Correct the symbol name and its comment in Config.in.legacy. Thanks for spotting what I missed. How did you notice, so that I can add that to my check-list? > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Applied to master, thanks. Regards, Yann E. MORIN. > --- > Config.in.legacy | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 5994d94487..e5349e58ac 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -153,8 +153,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE > The RISC-V 64-bit LP64 Bootlin toolchains have been removed, > in favor of RISC-V 64-bit LP64D toolchains. > > -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE > - bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" > +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE > + bool "Bootlin riscv64 musl bleeding-edge toolchain removed" > select BR2_LEGACY > help > The RISC-V 64-bit LP64 Bootlin toolchains have been removed, > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 4 22:15:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 23:15:51 +0100 Subject: [Buildroot] [PATCH 1/1] support/config-fragments/autobuild: fix riscv64 toolchain configs In-Reply-To: References: <20220101213948.265173-1-ju.o@free.fr> Message-ID: <20220104221551.GD614810@scaer> Arnout, All, On 2022-01-04 18:16 +0100, Arnout Vandecappelle spake thusly: > On 01/01/2022 22:39, Julien Olivain wrote: > >commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 > >toolchains by RISC-V LP64D. The config symbols > >BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and > >BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. > >Those changes were not reflected in the autobuild toolchain configs in > >support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config > > > >When testing a package with the command: > > > > ./utils/test-pkg --all --package somepackage > > > >bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build > >logfile contains: > > > > [...] > > Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config > > Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > > Actual value: > > > > Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config > > Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y > > Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set > > > >This commit update the autobuild config fragments for RISC-V 64bit > >toolchains so they can be used by test-pkg. > > > >Signed-off-by: Julien Olivain > > Applied to master, thanks. > > While reviewing this, I noticed that > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, > so I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc > Thomas on that, so Thomas consider yourself CCed now :-) Ah, I see how you noticed that issue, now. Regards, Yann E. MORIN. > Regards, > Arnout > > > >--- > > .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- > > .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > >diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > >index f6c6fcaa36..433a6e89f7 100644 > >--- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > >+++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > >@@ -1,5 +1,5 @@ > > BR2_riscv=y > >-BR2_RISCV_ABI_LP64=y > >+BR2_RISCV_ABI_LP64D=y > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > >-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y > >+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y > >diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config > >index 2b6a6e56da..fee1f29f4a 100644 > >--- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config > >+++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config > >@@ -1,4 +1,4 @@ > > BR2_riscv=y > >-BR2_RISCV_ABI_LP64=y > >+BR2_RISCV_ABI_LP64D=y > > BR2_TOOLCHAIN_EXTERNAL=y > >-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y > >+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From f.fainelli at gmail.com Tue Jan 4 23:05:22 2022 From: f.fainelli at gmail.com (Florian Fainelli) Date: Tue, 4 Jan 2022 15:05:22 -0800 Subject: [Buildroot] [PATCH] package/elfutils: bump to version 0.186 Message-ID: <20220104230522.1433670-1-florian.fainelli@broadcom.com> From: Florian Fainelli https://sourceware.org/pipermail/elfutils-devel/2021q4/004346.html Signed-off-by: Florian Fainelli --- package/elfutils/elfutils.hash | 4 ++-- package/elfutils/elfutils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index 9148758e29f4..3274b3265081 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,5 +1,5 @@ -# From https://sourceware.org/elfutils/ftp/0.184/sha512.sum -sha512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8 elfutils-0.184.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.186/sha512.sum +sha512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78 elfutils-0.186.tar.bz2 # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index c64224a90f87..8116ae597241 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.184 +ELFUTILS_VERSION = 0.186 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES -- 2.25.1 From who+buildroot at cnackers.org Wed Jan 5 00:12:20 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Wed, 05 Jan 2022 01:12:20 +0100 Subject: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools In-Reply-To: References: <20220101223900.2970405-1-who+buildroot@cnackers.org> <20220101223900.2970405-3-who+buildroot@cnackers.org> Message-ID: <0ddf26619d1ef9d2df5d3c9de58ba91453b1a91b.camel@cnackers.org> On Tue, 2022-01-04 at 18:52 +0100, Arnout Vandecappelle wrote: > > On 01/01/2022 23:39, Erik Larsson wrote: > > Signed-off-by: Erik Larsson > > --- > > package/tpm2-tools/Config.in | 11 +++++++++++ > > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > > 2 files changed, 17 insertions(+) > > > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > > index 1a6698570a..cb3eb2b0a5 100644 > > --- a/package/tpm2-tools/Config.in > > +++ b/package/tpm2-tools/Config.in > > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > > > https://github.com/tpm2-software/tpm2-tools > > > > +if BR2_PACKAGE_TPM2_TOOLS > > + > > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > > + bool "tpm2-tools fapi support" > > + select BR2_PACKAGE_TPM2_TSS_FAPI > > + help > > + This option enables Feature API (FAPI) support in tpm2-tools. > > + The FAPI tools are prefixed with tss2_. > > + > > +endif > > + > > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > > index df5fbbfff4..6894be195f 100644 > > --- a/package/tpm2-tools/tpm2-tools.mk > > +++ b/package/tpm2-tools/tpm2-tools.mk > > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > > # do not build man pages > > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) > > Does this optoin make a big difference in size? If not, we'd normally make it > an automatic option, i.e. > > ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) > > (and remove the Config.in option). The size difference is minimal (about 100K). The FAPI tools are enabled automatically if tss2-fapi is available, so I think this patch can be skipped in that case. /Erik > > Regards, > Arnout > > > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > > +else > > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > > +endif > > + > > $(eval $(autotools-package)) > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Wed Jan 5 07:39:01 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 05 Jan 2022 07:39:01 +0000 Subject: [Buildroot] [Bug 14501] New: lttng-modules v2.11 package fails to build Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 Bug ID: 14501 Summary: lttng-modules v2.11 package fails to build Product: buildroot Version: 2021.05 Hardware: All OS: Linux Status: NEW Severity: blocker Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: sreedharmahadevan at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Hello, I am not able to successfully build the lttng-modules package with Buildroot v2021.05. I get the following syntax errors: output/build/lttng-modules-2.11.0/./probes/../instrumentation/events/lttng-module/timer.h:313:41: error: invalid use of undefined type ?const struct itimerval? 313 | ctf_integer(long, interval_usec, value->it_interval.tv_usec) | ^~ output/build/lttng-modules-2.11.0/./lib/../lib/ringbuffer/frontend.h:82:6: error: implicit declaration of function ?smp_read_barrier_depends? [-Werror=implicit-function-declaration] 82 | smp_read_barrier_depends(); (cpu) < nr_cpu_ids; });) | ^~~~~~~~~~~~~~~~~~~~~~~~ /output/build/lttng-modules-2.11.0/./lib/../wrapper/trace-clock.h:168:3: error: implicit declaration of function ?read_barrier_depends? [-Werror=implicit-function-declaration] 168 | read_barrier_depends(); /* load ltc before content */ | ^~~~~~~~~~~~~~~~~~~~ The errors look mostly syntactical and is replicated with a fresh clone of v2021.08, v2021.11, v2020.05, v2020.08 also. The lttng-tools and lttng-babeltrace packages build without issues but the moment lttng-modules is selected and built, it fails. Is this issue known already? Are there any solutions for it? -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Wed Jan 5 07:54:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 08:54:40 +0100 Subject: [Buildroot] [PATCH] Config.in.legacy: fix removed bootlin riscv64 toolchains In-Reply-To: <20220104171128.956397-1-arnout@mind.be> References: <20220104171128.956397-1-arnout@mind.be> Message-ID: <20220105085440.6581a038@windsurf> Hello Arnout, On Tue, 4 Jan 2022 18:11:28 +0100 "Arnout Vandecappelle (Essensium/Mind)" wrote: > commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 > bootlin toolchains by RISC-V LP64D. However, Config.in.legacy was added > for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE, which never > existed (the stable version was only added after the switch to LP64D). > Conversely, BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE, > which was removed, was not mentioned in Config.in.legacy. > > Correct the symbol name and its comment in Config.in.legacy. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > Config.in.legacy | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Too late, but: Acked-by: Thomas Petazzoni Thanks for fixing this! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 5 09:20:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:20:29 +0100 Subject: [Buildroot] [git commit] package/elfutils: bump to version 0.186 Message-ID: <20220105091431.BD89382DD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eea674afbf5b437af3d31cc9fc003768cdde3e8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://sourceware.org/pipermail/elfutils-devel/2021q4/004346.html Signed-off-by: Florian Fainelli Signed-off-by: Yann E. MORIN --- package/elfutils/elfutils.hash | 4 ++-- package/elfutils/elfutils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index 9148758e29..3274b32650 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,5 +1,5 @@ -# From https://sourceware.org/elfutils/ftp/0.184/sha512.sum -sha512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8 elfutils-0.184.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.186/sha512.sum +sha512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78 elfutils-0.186.tar.bz2 # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index c64224a90f..8116ae5972 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.184 +ELFUTILS_VERSION = 0.186 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Jan 5 09:21:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:21:30 +0100 Subject: [Buildroot] [PATCH] package/elfutils: bump to version 0.186 In-Reply-To: <20220104230522.1433670-1-florian.fainelli@broadcom.com> References: <20220104230522.1433670-1-florian.fainelli@broadcom.com> Message-ID: <20220105092130.GE614810@scaer> Florian, All, On 2022-01-04 15:05 -0800, Florian Fainelli spake thusly: > From: Florian Fainelli > > https://sourceware.org/pipermail/elfutils-devel/2021q4/004346.html > > Signed-off-by: Florian Fainelli Applied to master, thanks. > --- > package/elfutils/elfutils.hash | 4 ++-- > package/elfutils/elfutils.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash > index 9148758e29f4..3274b3265081 100644 > --- a/package/elfutils/elfutils.hash > +++ b/package/elfutils/elfutils.hash > @@ -1,5 +1,5 @@ > -# From https://sourceware.org/elfutils/ftp/0.184/sha512.sum > -sha512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8 elfutils-0.184.tar.bz2 > +# From https://sourceware.org/elfutils/ftp/0.186/sha512.sum > +sha512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78 elfutils-0.186.tar.bz2 > # Locally calculated > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 > diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk > index c64224a90f87..8116ae597241 100644 > --- a/package/elfutils/elfutils.mk > +++ b/package/elfutils/elfutils.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELFUTILS_VERSION = 0.184 > +ELFUTILS_VERSION = 0.186 > ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 > ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) > ELFUTILS_INSTALL_STAGING = YES > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 5 09:29:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:52 +0100 Subject: [Buildroot] [git commit] package/checkpolicy: bump to version 3.3 Message-ID: <20220105092630.5016E82DD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75cfeb7c6fa80022ebb5ea332d7e466b3eb14e6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/checkpolicy/checkpolicy.hash | 4 ++-- package/checkpolicy/checkpolicy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index c237913eaf..3586389047 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 9b1c81fa86fe3867842164448d90c8e7ea94b2987497809c65d4caa87a5c5bc8 checkpolicy-3.2.tar.gz +sha256 25c84edfa3a10ab8cb073b97bc55cb66377532d54a2723da9accdabd05431485 checkpolicy-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index f8ce48c175..af9a58cee8 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.2 +CHECKPOLICY_VERSION = 3.3 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Jan 5 09:29:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:50 +0100 Subject: [Buildroot] [git commit] package/libsemanage: bump to version 3.3 Message-ID: <20220105092630.47147832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d43956f91d875d671c2563ba143fe71dabdbbff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsemanage/libsemanage.hash | 4 ++-- package/libsemanage/libsemanage.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 117fd40d6a..1f333aac30 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 d722a55ca4fe2d4e2b30527720db657e6238b28079e69e2e4affeb8e733ee511 libsemanage-3.2.tar.gz +sha256 84d0ec5afa34bbbb471f602d8c1bf317d12443d07852a34b60741d428d597ce8 libsemanage-3.3.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index bbe976a2c9..db9f16bb6a 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.2 +LIBSEMANAGE_VERSION = 3.3 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Jan 5 09:29:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:55 +0100 Subject: [Buildroot] [git commit] package/restorecond: bump to version 3.3 Message-ID: <20220105092630.5907083236@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6282553e764939bbe665fd0bafc46eca31dff51b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/restorecond/restorecond.hash | 4 ++-- package/restorecond/restorecond.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 1869100188..b38c6dcf14 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 471c17e64aa6d7226e861d4d0125d15fdf9b38892c542be32bd83d999e5e75f5 restorecond-3.2.tar.gz +sha256 218c3d8873f31764e3c82d53ac713c0c9faaa07caf42ed7184e93ca2b27d8f27 restorecond-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 671f071b1d..7d6ed86f08 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTORECOND_VERSION = 3.2 +RESTORECOND_VERSION = 3.3 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Jan 5 09:29:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:48 +0100 Subject: [Buildroot] [git commit] package/libselinux: bump to version 3.3 Message-ID: <20220105092630.3E12C83236@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75a4ab2e8708e118576326c026a4f98a924f31ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop third patch (already in version) - Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-utils-getseuser.c-fix-build-with-gcc-4.8.patch | 47 ---------------------- package/libselinux/libselinux.hash | 4 +- package/libselinux/libselinux.mk | 2 +- 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch b/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 645e84b236..0000000000 --- a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5c4ddfc88f0a7f10a5e9edddbdbe8e8ef1f9945e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Jun 2021 07:38:02 +0200 -Subject: [PATCH] libselinux/utils/getseuser.c: fix build with gcc 4.8 - -Fix the following build failure with gcc 4.8 which is raised since -version 3.2 and -https://github.com/SELinuxProject/selinux/commit/156dd0de5cad31e7d437c64e11a8aef027f0a691 - -getseuser.c:53:2: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < n; i++) - ^ - -Fixes: - - http://autobuild.buildroot.org/results/37eb0952a763256fbf6ef3c668f6c95fbdf2dd35 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/selinux/pull/289] ---- - libselinux/utils/getseuser.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/getseuser.c b/utils/getseuser.c -index ce1b7b27..34f2e887 100644 ---- a/utils/getseuser.c -+++ b/utils/getseuser.c -@@ -9,7 +9,7 @@ int main(int argc, char **argv) - { - char *seuser = NULL, *level = NULL; - char **contextlist; -- int rc, n; -+ int rc, n, i; - - if (argc != 3) { - fprintf(stderr, "usage: %s linuxuser fromcon\n", argv[0]); -@@ -50,7 +50,7 @@ int main(int argc, char **argv) - if (n == 0) - printf("no valid context found\n"); - -- for (int i = 0; i < n; i++) -+ for (i = 0; i < n; i++) - printf("Context %d\t%s\n", i, contextlist[i]); - - freeconary(contextlist); --- -2.30.2 - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 797b978ee1..a2e0083f7b 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161 libselinux-3.2.tar.gz +sha256 acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057 libselinux-3.3.tar.gz # Hash for license file -sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE +sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 0f36db1cfd..c1e90130d2 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.2 +LIBSELINUX_VERSION = 3.3 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Jan 5 09:32:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:32:15 +0100 Subject: [Buildroot] [git commit] package/selinux-python: bump to version 3.3 Message-ID: <20220105092630.619A4832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a478b17ae4c67b7d9282daf3db3af6b7917587c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/selinux-python/selinux-python.hash | 4 ++-- package/selinux-python/selinux-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 00c28b722c..6ada3fee36 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz +sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 61ec7eb595..0cec602f3d 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.2 +SELINUX_PYTHON_VERSION = 3.3 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Jan 5 09:29:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:45 +0100 Subject: [Buildroot] [git commit] package/libsepol: bump to version 3.3 Message-ID: <20220105092630.3547782DD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56d9b887685c86fd4fbadda247cdbe733d499e81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add gcc >= 5 dependency because __builtin_add_overflow is unconditionally used since https://github.com/SELinuxProject/selinux/commit/0744fa4f533c765d0a704fe8aa7174a0f93eb7bc https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/checkpolicy/Config.in | 6 ++++-- package/libselinux/Config.in | 6 ++++-- package/libsepol/Config.in | 6 ++++-- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 2 +- package/refpolicy/Config.in | 6 ++++-- package/restorecond/Config.in | 5 +++-- package/selinux-python/Config.in | 8 ++++++++ package/semodule-utils/Config.in | 6 ++++-- package/setools/Config.in | 5 +++-- 10 files changed, 36 insertions(+), 16 deletions(-) diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in index ad769d22b7..6a1f22991d 100644 --- a/package/checkpolicy/Config.in +++ b/package/checkpolicy/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_CHECKPOLICY bool "checkpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_FLEX help @@ -13,5 +14,6 @@ config BR2_PACKAGE_CHECKPOLICY http://selinuxproject.org/page/Main_Page -comment "checkpolicy needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "checkpolicy needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 62070c8d59..348757abce 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSELINUX bool "libselinux" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC @@ -16,5 +17,6 @@ config BR2_PACKAGE_LIBSELINUX http://selinuxproject.org/page/Main_Page -comment "libselinux needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "libselinux needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 04af880e67..7516076cd5 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBSEPOL bool "libsepol" depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 help Libsepol is the binary policy manipulation library. It doesn't depend upon or use any of the other SELinux components. @@ -35,5 +36,6 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION endif -comment "libsepol needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libsepol needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index b273f982b6..039e4e3c7e 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz +sha256 2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b libsepol-3.3.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 55125f2203..8551a5de79 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.2 +LIBSEPOL_VERSION = 3.3 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index c529b85e1d..043cc40a72 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol # Even though libsepol is not necessary for building, we get # the policy version from libsepol, so we select it, and treat # it like a runtime dependency. @@ -113,5 +114,6 @@ endif endif -comment "refpolicy needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "refpolicy needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in index 31f85f2882..5e5567b213 100644 --- a/package/restorecond/Config.in +++ b/package/restorecond/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RESTORECOND depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBGLIB2 @@ -15,7 +16,7 @@ config BR2_PACKAGE_RESTORECOND https://github.com/SELinuxProject/selinux/wiki/Releases -comment "restorecond needs a toolchain w/ wchar, threads, dynamic library" +comment "restorecond needs a toolchain w/ wchar, threads, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 0f1c281777..6a518f97d4 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -17,6 +17,7 @@ if BR2_PACKAGE_SELINUX_PYTHON config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW bool "audit2allow" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol select BR2_PACKAGE_CHECKPOLICY select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN select BR2_PACKAGE_SEMODULE_UTILS @@ -29,13 +30,20 @@ config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW audit2why - translates SELinux audit messages into a description of why the access was denied (audit2allow -w) +comment "audit2allow needs a toolchain w/ gcc 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN bool "sepolgen" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol select BR2_PACKAGE_SEMODULE_UTILS help This package contains a Python module that allows you to generate an initial SELinux policy module template. +comment "sepolgen needs a toolchain w/ gcc 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + endif comment "selinux-python needs python3" diff --git a/package/semodule-utils/Config.in b/package/semodule-utils/Config.in index 38e043dc2c..5d98dc615f 100644 --- a/package/semodule-utils/Config.in +++ b/package/semodule-utils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SEMODULE_UTILS bool "semodule-utils" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL help semodule-utils is a package that contains tools for handling @@ -15,5 +16,6 @@ config BR2_PACKAGE_SEMODULE_UTILS https://github.com/SELinuxProject/selinux/wiki/Releases -comment "semodule-utils needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "semodule-utils needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/setools/Config.in b/package/setools/Config.in index 3ab7f55948..5a71672bdf 100644 --- a/package/setools/Config.in +++ b/package/setools/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_USE_WCHAR depends on BR2_USE_MMU depends on BR2_PACKAGE_PYTHON3 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX @@ -19,10 +20,10 @@ config BR2_PACKAGE_SETOOLS https://github.com/SELinuxProject/setools/ -comment "setools needs a toolchain w/ threads, wchar, dynamic library" +comment "setools needs a toolchain w/ threads, wchar, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "setools needs python3" depends on BR2_USE_MMU From yann.morin.1998 at free.fr Wed Jan 5 09:33:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:33:08 +0100 Subject: [Buildroot] [PATCH 6/6] package/selinux-python: bump to version 3.3 In-Reply-To: <20220104220245.3706221-6-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> <20220104220245.3706221-6-fontaine.fabrice@gmail.com> Message-ID: <20220105093308.GF614810@scaer> Fabrice, All, On 2022-01-04 23:02 +0100, Fabrice Fontaine spake thusly: > Update indentation in hash file (two spaces) > > https://github.com/SELinuxProject/selinux/releases/tag/3.3 > > Signed-off-by: Fabrice Fontaine > --- > package/selinux-python/selinux-python.hash | 4 ++-- > package/selinux-python/selinux-python.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash > index 00c28b722c..93a28becdd 100644 > --- a/package/selinux-python/selinux-python.hash > +++ b/package/selinux-python/selinux-python.hash > @@ -1,5 +1,5 @@ > # https://github.com/SELinuxProject/selinux/wiki/Releases > -sha256 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz > +sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.2.tar.gz You did update the hash, but forgot to update the version. ;-) Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > # Hash for license file > -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING > +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING > diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk > index 61ec7eb595..0cec602f3d 100644 > --- a/package/selinux-python/selinux-python.mk > +++ b/package/selinux-python/selinux-python.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SELINUX_PYTHON_VERSION = 3.2 > +SELINUX_PYTHON_VERSION = 3.3 > SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) > SELINUX_PYTHON_LICENSE = GPL-2.0 > SELINUX_PYTHON_LICENSE_FILES = COPYING > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 5 09:33:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:33:28 +0100 Subject: [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220105093328.GG614810@scaer> Fabrice, All, On 2022-01-04 23:02 +0100, Fabrice Fontaine spake thusly: > Add gcc >= 5 dependency because __builtin_add_overflow is > unconditionally used since > https://github.com/SELinuxProject/selinux/commit/0744fa4f533c765d0a704fe8aa7174a0f93eb7bc > > https://github.com/SELinuxProject/selinux/releases/tag/3.3 > > Signed-off-by: Fabrice Fontaine Series of 6 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/checkpolicy/Config.in | 6 ++++-- > package/libselinux/Config.in | 6 ++++-- > package/libsepol/Config.in | 6 ++++-- > package/libsepol/libsepol.hash | 2 +- > package/libsepol/libsepol.mk | 2 +- > package/refpolicy/Config.in | 6 ++++-- > package/restorecond/Config.in | 5 +++-- > package/selinux-python/Config.in | 8 ++++++++ > package/semodule-utils/Config.in | 6 ++++-- > package/setools/Config.in | 5 +++-- > 10 files changed, 36 insertions(+), 16 deletions(-) > > diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in > index ad769d22b7..6a1f22991d 100644 > --- a/package/checkpolicy/Config.in > +++ b/package/checkpolicy/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_CHECKPOLICY > bool "checkpolicy" > depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux > depends on !BR2_STATIC_LIBS # libselinux > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol > select BR2_PACKAGE_LIBSELINUX > select BR2_PACKAGE_FLEX > help > @@ -13,5 +14,6 @@ config BR2_PACKAGE_CHECKPOLICY > > http://selinuxproject.org/page/Main_Page > > -comment "checkpolicy needs a toolchain w/ threads, dynamic library" > - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > +comment "checkpolicy needs a toolchain w/ threads, dynamic library, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in > index 62070c8d59..348757abce 100644 > --- a/package/libselinux/Config.in > +++ b/package/libselinux/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSELINUX > bool "libselinux" > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol > select BR2_PACKAGE_LIBSEPOL > select BR2_PACKAGE_PCRE > select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC > @@ -16,5 +17,6 @@ config BR2_PACKAGE_LIBSELINUX > > http://selinuxproject.org/page/Main_Page > > -comment "libselinux needs a toolchain w/ threads, dynamic library" > - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > +comment "libselinux needs a toolchain w/ threads, dynamic library, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in > index 04af880e67..7516076cd5 100644 > --- a/package/libsepol/Config.in > +++ b/package/libsepol/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_LIBSEPOL > bool "libsepol" > depends on BR2_TOOLCHAIN_HAS_THREADS # pthread > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > help > Libsepol is the binary policy manipulation library. It doesn't > depend upon or use any of the other SELinux components. > @@ -35,5 +36,6 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION > > endif > > -comment "libsepol needs a toolchain w/ threads" > - depends on !BR2_TOOLCHAIN_HAS_THREADS > +comment "libsepol needs a toolchain w/ threads, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash > index b273f982b6..039e4e3c7e 100644 > --- a/package/libsepol/libsepol.hash > +++ b/package/libsepol/libsepol.hash > @@ -1,5 +1,5 @@ > # From: https://github.com/SELinuxProject/selinux/wiki/Releases > -sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz > +sha256 2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b libsepol-3.3.tar.gz > > # Hash for license file > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk > index 55125f2203..8551a5de79 100644 > --- a/package/libsepol/libsepol.mk > +++ b/package/libsepol/libsepol.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSEPOL_VERSION = 3.2 > +LIBSEPOL_VERSION = 3.3 > LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) > LIBSEPOL_LICENSE = LGPL-2.1+ > LIBSEPOL_LICENSE_FILES = COPYING > diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in > index c529b85e1d..043cc40a72 100644 > --- a/package/refpolicy/Config.in > +++ b/package/refpolicy/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_REFPOLICY > bool "refpolicy" > depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol > # Even though libsepol is not necessary for building, we get > # the policy version from libsepol, so we select it, and treat > # it like a runtime dependency. > @@ -113,5 +114,6 @@ endif > > endif > > -comment "refpolicy needs a toolchain w/ threads" > - depends on !BR2_TOOLCHAIN_HAS_THREADS > +comment "refpolicy needs a toolchain w/ threads, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in > index 31f85f2882..5e5567b213 100644 > --- a/package/restorecond/Config.in > +++ b/package/restorecond/Config.in > @@ -4,6 +4,7 @@ config BR2_PACKAGE_RESTORECOND > depends on BR2_USE_WCHAR # libglib2 > depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 > depends on !BR2_STATIC_LIBS # libselinux > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol > select BR2_PACKAGE_DBUS > select BR2_PACKAGE_DBUS_GLIB > select BR2_PACKAGE_LIBGLIB2 > @@ -15,7 +16,7 @@ config BR2_PACKAGE_RESTORECOND > > https://github.com/SELinuxProject/selinux/wiki/Releases > > -comment "restorecond needs a toolchain w/ wchar, threads, dynamic library" > +comment "restorecond needs a toolchain w/ wchar, threads, dynamic library, gcc >= 5" > depends on BR2_USE_MMU > depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ > - BR2_STATIC_LIBS > + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in > index 0f1c281777..6a518f97d4 100644 > --- a/package/selinux-python/Config.in > +++ b/package/selinux-python/Config.in > @@ -17,6 +17,7 @@ if BR2_PACKAGE_SELINUX_PYTHON > > config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW > bool "audit2allow" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol > select BR2_PACKAGE_CHECKPOLICY > select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN > select BR2_PACKAGE_SEMODULE_UTILS > @@ -29,13 +30,20 @@ config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW > audit2why - translates SELinux audit messages into a > description of why the access was denied (audit2allow -w) > > +comment "audit2allow needs a toolchain w/ gcc 5" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > + > config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN > bool "sepolgen" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol > select BR2_PACKAGE_SEMODULE_UTILS > help > This package contains a Python module that allows you to > generate an initial SELinux policy module template. > > +comment "sepolgen needs a toolchain w/ gcc 5" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > + > endif > > comment "selinux-python needs python3" > diff --git a/package/semodule-utils/Config.in b/package/semodule-utils/Config.in > index 38e043dc2c..5d98dc615f 100644 > --- a/package/semodule-utils/Config.in > +++ b/package/semodule-utils/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_SEMODULE_UTILS > bool "semodule-utils" > depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol > select BR2_PACKAGE_LIBSEPOL > help > semodule-utils is a package that contains tools for handling > @@ -15,5 +16,6 @@ config BR2_PACKAGE_SEMODULE_UTILS > > https://github.com/SELinuxProject/selinux/wiki/Releases > > -comment "semodule-utils needs a toolchain w/ threads" > - depends on !BR2_TOOLCHAIN_HAS_THREADS > +comment "semodule-utils needs a toolchain w/ threads, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/setools/Config.in b/package/setools/Config.in > index 3ab7f55948..5a71672bdf 100644 > --- a/package/setools/Config.in > +++ b/package/setools/Config.in > @@ -5,6 +5,7 @@ config BR2_PACKAGE_SETOOLS > depends on BR2_USE_WCHAR > depends on BR2_USE_MMU > depends on BR2_PACKAGE_PYTHON3 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol > select BR2_PACKAGE_PYTHON_NETWORKX # runtime > select BR2_PACKAGE_PYTHON_SETUPTOOLS > select BR2_PACKAGE_LIBSELINUX > @@ -19,10 +20,10 @@ config BR2_PACKAGE_SETOOLS > > https://github.com/SELinuxProject/setools/ > > -comment "setools needs a toolchain w/ threads, wchar, dynamic library" > +comment "setools needs a toolchain w/ threads, wchar, dynamic library, gcc >= 5" > depends on BR2_USE_MMU > depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > - !BR2_USE_WCHAR > + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > comment "setools needs python3" > depends on BR2_USE_MMU > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thierry.bultel at linatsea.fr Wed Jan 5 09:46:46 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Wed, 5 Jan 2022 10:46:46 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets Message-ID: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> Hi, For a number of companies, I can see a growing interest in having ros2 support in buildroot. Currently, people wanting to prototype (or make a product) a robotics applications, are stuck to either yocto, or, worse, to a desktop-like distribution. Another topic is charts displaying for sailing. The most famous application (mostly used on raspberry by sailors) is OpenCpn, which is great but relies on wxWidgets. Whereas I am looking for a sponsor for adding ros2 to buildroot, (because it is a quite significant work, that implies to add a new build framework), I am thinking about using my (little) free time for wxWidgets (and OpenCpn later). There has been an attempt is the past (https://bugs.busybox.net/show_bug.cgi?id=261) but it does not seem to have lead to anything else since that time. What are your thought about these both packages ? Any ideas, or links to some WIP stuff ? Best regards Thierry -- Re: test www.linatsea.fr -- www.linatsea.fr -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From arnout at mind.be Wed Jan 5 10:02:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 5 Jan 2022 11:02:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/avahi: add gobject-introspection optional dependency In-Reply-To: <20200407175535.409309-1-fontaine.fabrice@gmail.com> References: <20200407175535.409309-1-fontaine.fabrice@gmail.com> Message-ID: <495ad364-0adb-e8d0-bbe7-b1157f0cea70@mind.be> On 07/04/2020 19:55, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine > --- > package/avahi/avahi.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk > index 73db37545f..3546979d83 100644 > --- a/package/avahi/avahi.mk > +++ b/package/avahi/avahi.mk > @@ -82,6 +82,13 @@ else > AVAHI_CONF_OPTS += --disable-dbus > endif > > +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > +AVAHI_CONF_OPTS += --enable-introspection > +AVAHI_DEPENDENCIES += gobject-introspection It later turned out that this fails when DBUS is enabled, and the solution is too ugly to apply [1]. Therefore, I marked this as Rejected. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20200813232351.1552307-1-aduskett at gmail.com/ > +else > +AVAHI_CONF_OPTS += --disable-introspection > +endif > + > ifeq ($(BR2_PACKAGE_LIBEVENT),y) > AVAHI_DEPENDENCIES += libevent > else > From arnout at mind.be Wed Jan 5 10:04:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 5 Jan 2022 11:04:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-amdgpu: needs opengl In-Reply-To: <20200410123207.3145145-1-bernd.kuhls@t-online.de> References: <20200410123207.3145145-1-bernd.kuhls@t-online.de> Message-ID: <2033c239-7959-0072-464f-7090b4c736cc@mind.be> On 10/04/2020 14:32, Bernd Kuhls wrote: > The package needs dri.h > https://cgit.freedesktop.org/xorg/driver/xf86-video-amdgpu/tree/src/amdgpu_probe.c#n53 > https://cgit.freedesktop.org/xorg/driver/xf86-video-amdgpu/tree/src/drmmode_display.c#n50 > > which is only provided by xserver_xorg-server when opengl is enabled: > https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n123 > > Signed-off-by: Bernd Kuhls > --- > The build error was not recorded by the autobuilders because they fail > already during at configure stage due to wrong dependencies for glamor > support fixed in the second patch of this series. > > package/x11r7/xdriver_xf86-video-amdgpu/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in > index c42255f55c..fb18c0d812 100644 > --- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in > +++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU > bool "xf86-video-amdgpu" > depends on BR2_USE_MMU # libdrm > depends on BR2_PACKAGE_MESA3D_DRI_DRIVER > + depends on BR2_PACKAGE_MESA3D_OPENGL_GLX # dri.h The condition in xorg-server is: ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx XSERVER_XORG_SERVER_DEPENDENCIES += libgl else XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx endif So this should depend on HAS_LIBGL, no? > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm This one should probably also switch to the new gbm option. Regards, Arnout > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_LIBDRM_AMDGPU > @@ -14,4 +15,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU > comment "xf86-video-amdgpu needs egl/opengl support from mesa3d" > depends on BR2_USE_MMU > depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ > + !BR2_PACKAGE_MESA3D_OPENGL_GLX || \ > !BR2_PACKAGE_MESA3D_DRI_DRIVER > From arnout at mind.be Wed Jan 5 10:08:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 5 Jan 2022 11:08:03 +0100 Subject: [Buildroot] [PATCH 2/2] package/x11r7/xdriver_xf86-video-amdgpu: fix glamor dependency In-Reply-To: <20200410123207.3145145-2-bernd.kuhls@t-online.de> References: <20200410123207.3145145-1-bernd.kuhls@t-online.de> <20200410123207.3145145-2-bernd.kuhls@t-online.de> Message-ID: <980403ed-3b13-39a0-b8c6-01df3fb5be20@mind.be> On 10/04/2020 14:32, Bernd Kuhls wrote: > Copy glamor dependencies from xserver_xorg-server omitting libgl/libegl > because this package already depends on both options: > https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n192 > > Fixes: > http://autobuild.buildroot.net/results/4da/4da87d30e6f5a10aafae60abce1b89ed92204a4e/ > http://autobuild.buildroot.net/results/74c/74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/ > > Signed-off-by: Bernd Kuhls > --- > .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > index e7196956a3..ccb5b30d90 100644 > --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > @@ -15,6 +15,12 @@ XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ > xorgproto \ > xserver_xorg-server > > +ifeq ($(BR2_PACKAGE_LIBEPOXY),y) libepoxy is already select'ed in Config.in, so this condition is useless. Thus, this patch does exactly nothing since glamor is always enabled. But I guess the select could be removed from Config.in? I thought that maybe the issue was that libepoxy has to be added to _DEPENDS, but in fact, in the autobuild failures libepoxy is already built before this package (indirect dependency through xorg-server). So I'm not sure how this really should be fixed... BTW, the issue is still happening in autobuilders [1], just very very rarely (once every 4 months or so). Regards, Arnout [1] http://autobuild.buildroot.net/?reason=xdriver_xf86-video-amdgpu%25 > +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --enable-glamor > +else > +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --disable-glamor > +endif > + > # xdriver_xf86-video-amdgpu requires O_CLOEXEC > XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" > > From james.hilliard1 at gmail.com Wed Jan 5 10:14:28 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 03:14:28 -0700 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5webengine-chromium-catapult: new package Message-ID: <20220105101430.175648-1-james.hilliard1@gmail.com> This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium. Signed-off-by: James Hilliard --- .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 0000000000..8190a6dd5d --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 0000000000..fac3c996fa --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Wed Jan 5 10:14:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 03:14:30 -0700 Subject: [Buildroot] [PATCH 3/3] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220105101430.175648-1-james.hilliard1@gmail.com> References: <20220105101430.175648-1-james.hilliard1@gmail.com> Message-ID: <20220105101430.175648-3-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Signed-off-by: James Hilliard --- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 13 ++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 70 files changed, 213 insertions(+), 385 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..d10847ea04 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ba2971dc08..294542fabb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..58e167e483 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..8c0e02152d 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4bdb90b203 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..abffc2891d 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..d48a37fafe 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 84bc291739..3b14284e37 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -6,7 +6,7 @@ QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From james.hilliard1 at gmail.com Wed Jan 5 10:14:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 03:14:29 -0700 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220105101430.175648-1-james.hilliard1@gmail.com> References: <20220105101430.175648-1-james.hilliard1@gmail.com> Message-ID: <20220105101430.175648-2-james.hilliard1@gmail.com> We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages. We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version. There are python3 patches available that apply to this version with minor modifications(to be added in a future patch). We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive. We need to add some new required dependencies to qt5webengine so that it will build. Signed-off-by: James Hilliard --- package/qt5/qt5.mk | 5 +- .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 22 + package/qt5/qt5webengine/Config.in | 2 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 8 files changed, 2561 insertions(+), 2012 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 0000000000..ced431c9e9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 0000000000..103e27d889 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 0000000000..e6ac2706f2 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..017c01a8e7 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). @@ -60,6 +61,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc deleted file mode 100644 index a5fdfdc1f1..0000000000 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ /dev/null @@ -1,1000 +0,0 @@ -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/cityhash/COPYING \ - src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ - src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ - src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ - src/3rdparty/chromium/third_party/dav1d/LICENSE \ - src/3rdparty/chromium/third_party/dawn/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/ink/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jacoco/LICENSE \ - src/3rdparty/chromium/third_party/javalang/LICENSE \ - src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ - src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ - src/3rdparty/chromium/third_party/libipp/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libxslt/src/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/lottie/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mako/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/nasm/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/perfetto/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/pffft/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/r8/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/rnnoise/COPYING \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/schema_org/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/six/src/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ - src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/test_fonts/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/turbine/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/unrar/LICENSE \ - src/3rdparty/chromium/third_party/unrar/src/license.txt \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ - src/3rdparty/chromium/third_party/weston/LICENSE \ - src/3rdparty/chromium/third_party/weston/src/COPYING \ - src/3rdparty/chromium/third_party/weston/src/data/COPYING \ - src/3rdparty/chromium/third_party/widevine/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ - src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ - src/3rdparty/gn/base/third_party/icu/LICENSE \ - src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb..1d2b70c4f6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..1b5529d2bb 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -5,18 +5,18 @@ ################################################################################ QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python + qt5declarative qt5webchannel host-bison host-flex host-freetype \ + host-gperf host-nodejs host-pkgconf host-python +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libxkbfile xlib_libXrandr xlib_libXtst endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss @@ -44,7 +44,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python @@ -53,12 +55,20 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty +endef +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -- 2.25.1 From David.Laight at ACULAB.COM Wed Jan 5 12:01:42 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Wed, 5 Jan 2022 12:01:42 +0000 Subject: [Buildroot] [git commit] package/dnsmasq: fix build with gcc 4.8 In-Reply-To: <20220104180257.67D5282BA6@busybox.osuosl.org> References: <20220104180257.67D5282BA6@busybox.osuosl.org> Message-ID: <516a76d402014d0fb3d8e1b0cb8ef462@AcuMS.aculab.com> From: Arnout Vandecappelle > Sent: 04 January 2022 17:49 > > commit: https://git.buildroot.net/buildroot/commit/?id=17aa836bd7a2c90da053398ce024b4113cf8b53c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > Fix the following build failure with gcc 4.8 raised since bump to > version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: > > option.c: In function 'one_opt': > option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode > for (char *p = arg; *p; p++) { > ^ > option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code > option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode > for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > .../0001-src-option.c-fix-build-with-gcc-4.8.patch | 52 ++++++++++++++++++++++ > ...2909d9080ff8743133fbd52427b4b2213171-typo.patch | 36 +++++++++++++++ > 2 files changed, 88 insertions(+) > > diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001- > src-option.c-fix-build-with-gcc-4.8.patch > new file mode 100644 > index 0000000000..50ecf2f18a > --- /dev/null > +++ b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch > @@ -0,0 +1,52 @@ > +From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 31 Dec 2021 17:29:44 +0100 > +Subject: [PATCH] src/option.c: fix build with gcc 4.8 > + > +Fix the following build failure with gcc 4.8 raised since version 2.86: > + > +option.c: In function 'one_opt': > +option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode > + for (char *p = arg; *p; p++) { > + ^ > +option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code > +option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode > + for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > + ^ > + > +Fixes: > + - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] > +--- > + src/option.c | 6 ++++-- > + 1 file changed, 4 insertions(+), 2 deletions(-) > + > +diff --git a/src/option.c b/src/option.c > +index ff54def..c57f6d8 100644 > +--- a/src/option.c > ++++ b/src/option.c > +@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int > comma > + arg += 9; > + if (strlen(arg) != 16) > + ret_err(gen_err); > +- for (char *p = arg; *p; p++) { > ++ char *p; > ++ for (*p = arg; *p; p++) { Isn't that going to get an error for mixing code and declarations? David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From thomas.petazzoni at bootlin.com Wed Jan 5 13:29:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 14:29:24 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> Message-ID: <20220105142924.4b11ed83@windsurf> Hello Thierry, On Wed, 5 Jan 2022 10:46:46 +0100 Thierry Bultel wrote: > For a number of companies, I can see a growing interest in having ros2 > support in buildroot. > Currently, people wanting to prototype (or make a product) a robotics > applications, are stuck > to either yocto, or, worse, to a desktop-like distribution. > > Another topic is charts displaying for sailing. The most famous > application (mostly used > on raspberry by sailors) is OpenCpn, which is great but relies on wxWidgets. > > Whereas I am looking for a sponsor for adding ros2 to buildroot, > (because it is a quite significant work, > that implies to add a new build framework), I am thinking about using my > (little) free time for wxWidgets (and OpenCpn later). > There has been an attempt is the past > (https://bugs.busybox.net/show_bug.cgi?id=261) but it does not > seem to have lead to anything else since that time. > > What are your thought about these both packages ? Any ideas, or links to > some WIP stuff ? These packages would certainly be very welcome. ROS2 especially makes a lot of sense. Some prior work: https://github.com/mchalain/br_ros http://lists.busybox.net/pipermail/buildroot/2019-March/246497.html I'll be happy to help in the review of such packages. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From bugzilla at busybox.net Wed Jan 5 13:36:30 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 05 Jan 2022 13:36:30 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #1 from Thomas Petazzoni --- Thanks for the bug report. Could you provide the Buildroot .config that allows to reproduce this issue ? -- You are receiving this mail because: You are on the CC list for the bug. From romain.naour at smile.fr Wed Jan 5 13:40:47 2022 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 5 Jan 2022 14:40:47 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <20220105142924.4b11ed83@windsurf> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> Message-ID: <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> Hello, Le 05/01/2022 ? 14:29, Thomas Petazzoni a ?crit?: > Hello Thierry, > > On Wed, 5 Jan 2022 10:46:46 +0100 > Thierry Bultel wrote: > >> For a number of companies, I can see a growing interest in having ros2 >> support in buildroot. >> Currently, people wanting to prototype (or make a product) a robotics >> applications, are stuck >> to either yocto, or, worse, to a desktop-like distribution. We also have some companies interested by ROS2 but they are using meta-ros Yocto layer. >> >> Another topic is charts displaying for sailing. The most famous >> application (mostly used >> on raspberry by sailors) is OpenCpn, which is great but relies on wxWidgets. >> >> Whereas I am looking for a sponsor for adding ros2 to buildroot, >> (because it is a quite significant work, >> that implies to add a new build framework), I am thinking about using my >> (little) free time for wxWidgets (and OpenCpn later). >> There has been an attempt is the past >> (https://bugs.busybox.net/show_bug.cgi?id=261) but it does not >> seem to have lead to anything else since that time. >> >> What are your thought about these both packages ? Any ideas, or links to >> some WIP stuff ? > > These packages would certainly be very welcome. ROS2 especially makes a > lot of sense. > > Some prior work: > > https://github.com/mchalain/br_ros > http://lists.busybox.net/pipermail/buildroot/2019-March/246497.html This is for ROS (v1), this series must be reworked for ROS2. Marc had no time for cleaning and upstreaming this series :-/ > > I'll be happy to help in the review of such packages. Same here, I'll try to help. Best regards, Romain > > Best regards, > > Thomas > From thierry.bultel at linatsea.fr Wed Jan 5 13:49:30 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Wed, 5 Jan 2022 14:49:30 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> Message-ID: <5be78f0b-fdb2-66a0-71a1-11538c064148@linatsea.fr> > We also have some companies interested by ROS2 but they are using meta-ros Yocto > layer. > That would be therefore of less interest to them, unless they are thinking of switching to buildroot. In my case, I rather see companies that just start to enter in "the embedded world" but already use ROS(1/2) on desktops, so it is still not to late for them to make the good choice. From romain.naour at smile.fr Wed Jan 5 14:32:52 2022 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 5 Jan 2022 15:32:52 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <5be78f0b-fdb2-66a0-71a1-11538c064148@linatsea.fr> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> <5be78f0b-fdb2-66a0-71a1-11538c064148@linatsea.fr> Message-ID: <21546798-75a4-c7ef-6b80-420bf5b516d8@smile.fr> Le 05/01/2022 ? 14:49, Thierry Bultel a ?crit?: >> We also have some companies interested by ROS2 but they are using meta-ros Yocto >> layer. >> > > That would be therefore of less interest to them, unless they are thinking of > switching to buildroot. Well, I guess they use Yocto by default since there is currently no other choice. > In my case, I rather see companies that just start to enter in "the embedded > world" but already use ROS(1/2) on desktops, > so it is still not to late for them to make the good choice. ROS is definitely not an easy framework to package into Buildroot, it's doable but requires a lot of work and time. Best regards, Romain > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Wed Jan 5 15:58:40 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 05 Jan 2022 15:58:40 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 Sreedhar Mahadevan changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |sreedharmahadevan at gmail.com --- Comment #2 from Sreedhar Mahadevan --- Created attachment 9196 --> https://bugs.busybox.net/attachment.cgi?id=9196&action=edit Buildroot .config files Hi Thomas, I am attaching two .config files here. The reason is that I suspected the external tool chain option to create the issue, because of which I tried using buildroot's own tool chain. Unfortunately I encountered the same error using both configurations. Request you to kindly use these configurations and check if you can reproduce the issue at your end. Thanks and regards, Sreedhar -- You are receiving this mail because: You are on the CC list for the bug. From marc.chalain at mailoo.org Wed Jan 5 15:57:21 2022 From: marc.chalain at mailoo.org (marc.chalain at mailoo.org) Date: Wed, 5 Jan 2022 16:57:21 +0100 (CET) Subject: [Buildroot] package/aravis: new package Message-ID: Hello and Happy new year, I propose the integration of a camera capture library: Aravis is a library to help GigE camera capture. https://github.com/AravisProject/aravis/releases/tag/0.8.16 This rules install on target: ?libaravis ?arv-camera-test ?arv-fake-gv-camera ?arv-test ?arv-tool and on staging ?aravis/*.h Signed-off-by: Marc Chalain --- ?DEVELOPERS???????????????? |? 3 +++ ?package/Config.in????????? |? 1 + ?package/aravis/Config.in?? | 16 ++++++++++++++++ ?package/aravis/aravis.hash |? 1 + ?package/aravis/aravis.mk?? | 20 ++++++++++++++++++++ ?5 files changed, 41 insertions(+) ?create mode 100644 package/aravis/Config.in ?create mode 100644 package/aravis/aravis.hash ?create mode 100644 package/aravis/aravis.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6dc2e68e42..05c1c3c921 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1653,6 +1653,9 @@ N:??? Manuel V?gele ?F:??? package/python-pyqt5/ ?F:??? package/python-requests-toolbelt/ ? +N:??? Marc Chalain +F:??? package/aravis + ?N:??? Marcin Bis ?F:??? package/bluez5_utils/ ?F:??? package/cc-tool/ diff --git a/package/Config.in b/package/Config.in index 9fed0ab4cb..2a1781afe9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1698,6 +1698,7 @@ menu "Logging" ?endmenu ? ?menu "Multimedia" +??? source "package/aravis/Config.in" ???? source "package/bitstream/Config.in" ???? source "package/dav1d/Config.in" ???? source "package/kvazaar/Config.in" diff --git a/package/aravis/Config.in b/package/aravis/Config.in new file mode 100644 index 0000000000..02c71c44da --- /dev/null +++ b/package/aravis/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_ARAVIS +??? bool "aravis - GigE Camera" +??? depends on BR2_USE_WCHAR +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL +??? depends on BR2_PACKAGE_PCRE_16 +??? depends on BR2_PACKAGE_PCRE_32 +??? select BR2_PACKAGE_LIBGLIB2 +??? select BR2_PACKAGE_LIBXML2 +??? help +??? ? aravis provides the support of GigE camera +??? ? and USB3Vision camera. +??? ? https://github.com/AravisProject/aravis + +comment "aravis needs a toolchain w/ wchar, NPTL, PCRE 16/32" +??? depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ +??? !BR2_PACKAGE_PCRE_16 || !BR2_PACKAGE_PCRE_32 diff --git a/package/aravis/aravis.hash b/package/aravis/aravis.hash new file mode 100644 index 0000000000..f8512491ec --- /dev/null +++ b/package/aravis/aravis.hash @@ -0,0 +1 @@ +sha256 057166753443acc115259ca1f74bd1b28ed4d48f35261cb248eafb8f86664bc7 aravis-0.8.16.tar.gz diff --git a/package/aravis/aravis.mk b/package/aravis/aravis.mk new file mode 100644 index 0000000000..bd783a0374 --- /dev/null +++ b/package/aravis/aravis.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# aravis +# +################################################################################ + +ARAVIS_VERSION = 0.8.16 +ARAVIS_SITE = $(call github,AravisProject,aravis,$(ARAVIS_VERSION)) +ARAVIS_DEPENDENCIES = \ +??? host-pkgconf \ +??? libglib2 \ +??? libxml2 +ARAVIS_INSTALL_STAGING = YES +ARAVIS_LICENSE = LGPL-2 +ARAVIS_LICENSE_FILES = COPYING +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +ARAVIS_CONF_OPTS += -Ddocumentation=disabled + +$(eval $(meson-package)) -- 2.30.2 -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-package-aravis-new-package.patch Type: text/x-patch Size: 3369 bytes Desc: not available URL: From danomimanchego123 at gmail.com Wed Jan 5 16:20:05 2022 From: danomimanchego123 at gmail.com (Danomi Manchego) Date: Wed, 5 Jan 2022 11:20:05 -0500 Subject: [Buildroot] call with hooks Message-ID: Hello all, I noticed a possible inconsistency, and thought I should post it. Looking at places where buildroot uses hooks: $ grep -r '$(hook))$(sep)' . ./Makefile: $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_EXTRACT_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_RSYNC_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) Notice that the one hit in Makefile uses "$($(hook))$(sep)" while the hits in pkg-generic.mk use "$(call $(hook))$(sep)". My Make-fu isn't powerful enough to understand if there is an actual problem - should there be a "call" in the Makefile line? The general syntax for call is "$(call variable,param,param,?)" so I don't follow what the extra call in $(call $(hook) is doing for us. Thanks, Danomi - From fontaine.fabrice at gmail.com Wed Jan 5 18:03:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:03:59 +0100 Subject: [Buildroot] [PATCH 1/4] package/libsemanage: add gcc >= 5 dependency Message-ID: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libsemanage/Config.in | 6 ++++-- package/policycoreutils/Config.in | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/libsemanage/Config.in b/package/libsemanage/Config.in index 3c7050ee51..5103df3f15 100644 --- a/package/libsemanage/Config.in +++ b/package/libsemanage/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSEMANAGE depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_AUDIT select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_BZIP2 @@ -17,6 +18,7 @@ config BR2_PACKAGE_LIBSEMANAGE http://selinuxproject.org/page/Main_Page -comment "libsemanage needs a toolchain w/ threads, dynamic library" +comment "libsemanage needs a toolchain w/ threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 81900b4e41..3201c8fede 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -1,12 +1,14 @@ -comment "policycoreutils needs a toolchain w/ threads, dynamic library" +comment "policycoreutils needs a toolchain w/ threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_POLICYCOREUTILS bool "policycoreutils" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage - depends on !BR2_STATIC_LIBS #libsemanage + depends on !BR2_STATIC_LIBS # libsemanage + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol select BR2_PACKAGE_LIBSEMANAGE select BR2_PACKAGE_LIBCAP_NG help -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:04:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:04:00 +0100 Subject: [Buildroot] [PATCH 2/4] package/refpolicy: add host gcc >= 5 dependency In-Reply-To: <20220105180402.388388-1-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Message-ID: <20220105180402.388388-2-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/refpolicy/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 043cc40a72..0e72b895df 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol + depends on BR2_HOST_GCC_AT_LEAST_5 # host-setools -> host-libsepol # Even though libsepol is not necessary for building, we get # the policy version from libsepol, so we select it, and treat # it like a runtime dependency. @@ -114,6 +115,7 @@ endif endif -comment "refpolicy needs a toolchain w/ threads, gcc >= 5" +comment "refpolicy needs a toolchain w/ threads, gcc >= 5, host gcc >= 5" depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_5 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:04:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:04:01 +0100 Subject: [Buildroot] [PATCH 3/4] package/checkpolicy: add host gcc >= 5 dependency In-Reply-To: <20220105180402.388388-1-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Message-ID: <20220105180402.388388-3-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - http://autobuild.buildroot.org/results/fc727efc0c658aaae55c83632a91af83701f0c49 Signed-off-by: Fabrice Fontaine --- package/checkpolicy/Config.in.host | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/checkpolicy/Config.in.host b/package/checkpolicy/Config.in.host index 240a5b6dc4..38e35e2fc1 100644 --- a/package/checkpolicy/Config.in.host +++ b/package/checkpolicy/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_CHECKPOLICY bool "host checkpolicy" + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol help checkpolicy is the SELinux policy compiler. It uses libsepol to generate the binary policy. checkpolicy uses the static @@ -8,3 +9,6 @@ config BR2_PACKAGE_HOST_CHECKPOLICY shared library interface. http://selinuxproject.org/page/Main_Page + +comment "host checkpolicy needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:04:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:04:02 +0100 Subject: [Buildroot] [PATCH 4/4] package/android-tools: add host gcc >= 5 dependency In-Reply-To: <20220105180402.388388-1-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Message-ID: <20220105180402.388388-4-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/android-tools/Config.in.host | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/android-tools/Config.in.host b/package/android-tools/Config.in.host index 433f4e384f..576e53e8b5 100644 --- a/package/android-tools/Config.in.host +++ b/package/android-tools/Config.in.host @@ -10,12 +10,16 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS if BR2_PACKAGE_HOST_ANDROID_TOOLS config BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol bool "fastboot" help This option will build and install the fastboot utility for the host, which can be used to reflash target devices implementing the fastboot protocol. +comment "fastboot needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 + config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB bool "adb" help @@ -24,10 +28,14 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB implementing the ADB protocol. config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol bool "ext4 utils" help This option will build and install the ext4 utils for the host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg, simg2img and simg2simg. +comment "ext4 utils needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 + endif -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:04:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:04:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/mdadm: disable -Werror Message-ID: <20220105180453.388499-1-fontaine.fabrice@gmail.com> Disable -Werror by setting CWFLAGS to "" This will avoid the following build failure raised since bump to version 4.2 in commit b03fc7974536378ba102418451ba7e9801bc6251: mdadm.c: In function 'main': mdadm.c:156:28: error: this statement may fall through [-Werror=implicit-fallthrough=] 154 | if (mode == ASSEMBLE || mode == BUILD || | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c0f216b7aadb794110409d03dcef7fa58e833cd4 Signed-off-by: Fabrice Fontaine --- package/mdadm/mdadm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 6ee0bb60c9..0a2eb4e5bd 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -16,6 +16,7 @@ MDADM_BUILD_OPTS = \ CC=$(TARGET_CC) \ COROSYNC=-DNO_COROSYNC \ DLM=-DNO_DLM \ + CWFLAGS="" \ CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:06:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:06:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtorrent: disable execinfo Message-ID: <20220105180645.388855-1-fontaine.fabrice@gmail.com> Disable execinfo to avoid the following build failure raised since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: main.o: in function `do_panic(int)': /home/giuliobenetti/autobuild/run/instance-0/output-1/build/rtorrent-0.9.8/src/main.cc:606: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/10fc9016013931c58238240216c5950b23b56b30 Signed-off-by: Fabrice Fontaine --- ...disable-execinfo-option-to-configure.patch | 34 +++++++++++++++++++ package/rtorrent/rtorrent.mk | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch diff --git a/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch b/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch new file mode 100644 index 0000000000..4ff4182b61 --- /dev/null +++ b/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch @@ -0,0 +1,34 @@ +From 582e4e40256b43d3e5322168f1e1ed71ca70ab64 Mon Sep 17 00:00:00 2001 +From: rakshasa +Date: Wed, 16 Jun 2021 23:29:01 +0900 +Subject: [PATCH] Added '--disable-execinfo' option to configure. + +[Retrieved (and backported) from: +https://github.com/rakshasa/rtorrent/commit/582e4e40256b43d3e5322168f1e1ed71ca70ab64] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e3e7d3f1..0f45bc6a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,15 @@ TORRENT_WITHOUT_VARIABLE_FDSET + + AC_SYS_LARGEFILE + +-TORRENT_CHECK_EXECINFO ++AC_ARG_ENABLE(execinfo, ++ AC_HELP_STRING([--disable-execinfo], [disable libexecinfo [[default=enable]]]), ++ [ ++ if test "$enableval" = "yes"; then ++ TORRENT_CHECK_EXECINFO ++ fi ++ ],[ ++ TORRENT_CHECK_EXECINFO ++ ]) + + TORRENT_ENABLE_ARCH + TORRENT_WITH_SYSROOT + diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk index bc3afe8064..210b1d34dc 100644 --- a/package/rtorrent/rtorrent.mk +++ b/package/rtorrent/rtorrent.mk @@ -9,5 +9,8 @@ RTORRENT_SITE = http://rtorrent.net/downloads RTORRENT_DEPENDENCIES = host-pkgconf libcurl libtorrent ncurses RTORRENT_LICENSE = GPL-2.0 RTORRENT_LICENSE_FILES = COPYING +# We're patching configure.ac +RTORRENT_AUTORECONF = YES +RTORRENT_CONF_OPTS = --disable-execinfo $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:07:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:07:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: fix uclibc build Message-ID: <20220105180751.388943-1-fontaine.fabrice@gmail.com> Fix the following uclibc build failure raised since bump to version 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: xxhash.o: in function `XXH3_hashLong_128b_internal.constprop.0': (.text+0xcbc): undefined reference to `static_assert' Fixes: - http://autobuild.buildroot.org/results/559/5595b21a711b482b84e582fc9f56e5468c9eb6d6/build-end.log Signed-off-by: Fabrice Fontaine --- ...nd-on-assert-h-for-XXH_STATIC_ASSERT.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch diff --git a/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch new file mode 100644 index 0000000000..3b65ae1d6c --- /dev/null +++ b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch @@ -0,0 +1,29 @@ +From 6189ecd3d44a693460f86280ccf49d33cb4b18e1 Mon Sep 17 00:00:00 2001 +From: Yann Collet +Date: Sun, 26 Dec 2021 15:15:26 -0800 +Subject: [PATCH] do no longer depend on `` for XXH_STATIC_ASSERT + +since some versions are buggy. + +Use `_Static_assert` instead, which is part of the C11 language. +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1] +Signed-off-by: Fabrice Fontaine +--- + xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/xxhash.h b/xxhash.h +index 311a69c7..5dfd5c45 100644 +--- a/xxhash.h ++++ b/xxhash.h +@@ -1749,8 +1749,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else -- 2.34.1 From jesse_dev at fastmail.com Wed Jan 5 19:03:09 2022 From: jesse_dev at fastmail.com (Jesse Millwood) Date: Wed, 05 Jan 2022 14:03:09 -0500 Subject: [Buildroot] Overriding Kconfig Values from external br2 Message-ID: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> Hello, I have an external C/C++ toolchain that I've put together that uses MUSL. I've also built an external Rust toolchain that uses my MUSL toolchain. My issue is that there is a Rust Kconfig variable that specifies if a specific architecture supports Rust. The Kconfig variable in question is BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS in package/rustc/Config.in.host. In my br2 external project I have the following setup: My issue is that I can't seem to override the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS, which masks all other Rust packages. . ??? external.desc ? |name: MINE ? |desc: My BR2 External ? `---- ??? external.mk ? |include $(sort $(wildcard $(BR2_EXTERNAL_MINE_PATH)/package/*/*.mk)) ? |include $(sort $(wildcard $(BR2_EXTERNAL_MINE_PATH)/toolchain/*/*.mk)) ? `---- ??? Config.in ? | source "$BR2_EXTERNAL_MINE_PATH/toolchain/my-external/Config.in.options" ? | source "$BR2_EXTERNAL_MINE_PATH/package/rpkg/Config.in" ? `---- ??? configs ? ??? my_gnu_defconfig ? ??? my_musl_defconfig | ??? package ? ??? rpkg ? ??? Config.in ? ??? rpkg.mk ??? provides ? ??? toolchains.in ? | config BR2_TOOLCHAIN_EXTERNAL_MY_MUSL ? | bool "My PowerPC MUSL Toolchain" ? | depends on BR2_powerpc ? | ? | config BR2_TOOLCHAIN_EXTERNAL_MY_GNU ? | bool "My PowerPC GNU Toolchain" ? | depends on BR2_powerpc ? `---- ??? toolchain ??? my-external ??? Config.in.options | if BR2_TOOLCHAIN_EXTERNAL_MY_MUSL | config BR2_TOOLCHAIN_EXTERNAL_PREFIX | default "powerpc-my-linux-musl" | config BR2_TOOLCHAIN_EXTERNAL_PATH | default "${WORKSPACE_DIR}/toolchain/powerpc-my-linux-musl" | | config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS | bool | default y if BR2_i386 | default y if BR2_x86_64 | default y if BR2_aarch64 | default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 \ | && !(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI) | default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le | default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_CPU_MIPS32R6 | default y if (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_CPU_MIPS64R6 \ | && BR2_MIPS_NABI64 | depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) | depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS | | endif | | if BR2_TOOLCHAIN_EXTERNAL_MY_GNU | config BR2_TOOLCHAIN_EXTERNAL_PREFIX | default "powerpc-my-linux-gnu" | config BR2_TOOLCHAIN_EXTERNAL_PATH | default "${WORKSPACE_DIR}/toolchain/powerpc-my-linux-gnu" | endif `---- You may notice that I changed the libc depends line to be or'd with BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get considered when I choose my external musl toolchain option. In the menuconfig when I search for the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with the "/" key it looks like it is only getting it from the original file. Does buildroot have a mechanism for overwriting this kind of setting and if not, does anyone have an idea of how I would accomplish what I am trying to do (make buildroot honor my external rust toolchain)? Thanks, Jesse -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Wed Jan 5 20:33:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 21:33:11 +0100 Subject: [Buildroot] [git commit] package/vdr: enable musl/uclibc build Message-ID: <20220105202826.3813D82C08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64843258ce59822ad8d52e75fd4d8fcf10c9b041 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Re-add patch 0001 to fix uClibc build, this patch was removed 2019: https://git.buildroot.net/buildroot/commit/?id=573d15b0790cfd2838cf0544ded79b415e20f5a7 Add two more patches from Alpine Linux to fix musl build. Add optional dependency to libexecinfo to provide execinfo.h. Add a patch that ensures an internal gettext symbol doesn't get used except on glibc and uclibc toolchains. Indeed, both glibc and uclibc provide the _nl_msg_cat_cntr variable, but not the musl implementation. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vdr/0001-getloadavg.patch | 55 ++++++++ package/vdr/0002-musl-compat.patch | 140 +++++++++++++++++++++ package/vdr/0003-include-missing-limits.patch | 30 +++++ ...msg_cat_cntr-is-an-internal-symbol-of-som.patch | 35 ++++++ package/vdr/Config.in | 7 +- package/vdr/vdr.mk | 5 + 6 files changed, 268 insertions(+), 4 deletions(-) diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch new file mode 100644 index 0000000000..9e6316e284 --- /dev/null +++ b/package/vdr/0001-getloadavg.patch @@ -0,0 +1,55 @@ +Fix compilation with uClibc + +Ported from +https://github.com/stschake/buildroot-grasshopper/blob/master/package/torsmo/torsmo-0.18-uclibc-getloadavg.patch + +Signed-off-by: Bernd Kuhls + +diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +--- vdr-2.3.1.org/skinlcars.c 2015-09-01 12:07:07.000000000 +0200 ++++ vdr-2.3.1/skinlcars.c 2016-07-31 21:00:11.000000000 +0200 +@@ -1100,6 +1100,44 @@ + } + } + ++/* uclibc and dietlibc do not have this junk -ReneR */ ++#if defined (__UCLIBC__) || defined (__dietlibc__) ++static int getloadavg (double loadavg[], int nelem) ++{ ++ int fd; ++ ++ fd = open ("/proc/loadavg", O_RDONLY); ++ if (fd < 0) ++ return -1; ++ else ++ { ++ char buf[65], *p; ++ ssize_t nread; ++ int i; ++ ++ nread = read (fd, buf, sizeof buf - 1); ++ close (fd); ++ if (nread <= 0) ++ return -1; ++ buf[nread - 1] = '\0'; ++ ++ if (nelem > 3) ++ nelem = 3; ++ p = buf; ++ for (i = 0; i < nelem; ++i) ++ { ++ char *endp; ++ loadavg[i] = strtod (p, &endp); ++ if (endp == p) ++ return -1; ++ p = endp; ++ } ++ ++ return i; ++ } ++} ++#endif ++ + void cSkinLCARSDisplayMenu::DrawLoad(void) + { + if (yb04) { diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-musl-compat.patch new file mode 100644 index 0000000000..b6f8f414a9 --- /dev/null +++ b/package/vdr/0002-musl-compat.patch @@ -0,0 +1,140 @@ +Fix musl build + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch + +Signed-off-by: Bernd Kuhls + +diff --git a/i18n.h b/i18n.h +index f8ad9de..b002bbf 100644 +--- a/i18n.h ++++ b/i18n.h +@@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); + ///< have an actual locale installed. The rest are just dummy entries + ///< to allow having three letter language codes for other languages + ///< that have no actual locale on this system. +-const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1); ++const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute__((__format_arg__ (1))); + ///< Translates the given string (with optional Plugin context) into + ///< the current language. If no translation is available, the original + ///< string will be returned. +diff --git a/osd.c b/osd.c +index 524700a..ef975f5 100644 +--- a/osd.c ++++ b/osd.c +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include "device.h" + #include "tools.h" + +diff --git a/thread.c b/thread.c +index 47eb977..58dba43 100644 +--- a/thread.c ++++ b/thread.c +@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) + writeLockThreadId = 0; + pthread_rwlockattr_t attr; + pthread_rwlockattr_init(&attr); ++#if defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP); ++#endif + pthread_rwlock_init(&rwlock, &attr); + } + +@@ -205,7 +207,7 @@ cMutex::cMutex(void) + locked = 0; + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); + pthread_mutex_init(&mutex, &attr); + } + +diff --git a/tools.c b/tools.c +index 754673d..fef9d2d 100644 +--- a/tools.c ++++ b/tools.c +@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) + { + if (!FileName) + return NULL; +- char *TargetName = canonicalize_file_name(FileName); ++ char *TargetName = realpath(FileName, NULL); + if (!TargetName) { + if (errno == ENOENT) // file doesn't exist + TargetName = strdup(FileName); +@@ -1528,7 +1528,7 @@ + struct dirent *cReadDir::Next(void) + { + if (directory) { +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + while (readdir_r(directory, &u.d, &result) == 0 && result) { + #else + while ((result = readdir(directory)) != NULL) { +diff --git a/tools.h b/tools.h +index 73cca5a..03f5fd1 100644 +--- a/tools.h ++++ b/tools.h +@@ -28,6 +28,16 @@ + #include + #include "thread.h" + ++#ifndef ACCESSPERMS ++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++#ifndef ALLPERMS ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ ++#endif ++#ifndef DEFFILEMODE ++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ ++#endif ++ + typedef unsigned char uchar; + + extern int SysLogLevel; +@@ -400,7 +410,7 @@ + private: + DIR *directory; + struct dirent *result; +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + union { // according to "The GNU C Library Reference Manual" + struct dirent d; + char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; +@@ -738,7 +748,7 @@ public: + data[i] = T(0); + size = 0; + } +- void Sort(__compar_fn_t Compare) ++ void Sort(int (*Compare)(const void *, const void *)) + { + qsort(data, size, sizeof(T), Compare); + } +diff --git a/vdr.c b/vdr.c +index 8a49471..c2a82aa 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) + } + } + else if (Terminal) { ++#ifdef __GLIBC__ + // Claim new controlling terminal + stdin = freopen(Terminal, "r", stdin); + stdout = freopen(Terminal, "w", stdout); + stderr = freopen(Terminal, "w", stderr); + HasStdin = true; + tcgetattr(STDIN_FILENO, &savedTm); ++#else ++ // stdin, stdout, stderr are declared FILE const* by musl C library ++ fprintf(stderr, "Option '-t' is only supported if VDR has been built against glibc.\n"); ++ return 2; ++#endif + } + + isyslog("VDR version %s started", VDRVERSION); diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch new file mode 100644 index 0000000000..c2efe291e6 --- /dev/null +++ b/package/vdr/0003-include-missing-limits.patch @@ -0,0 +1,30 @@ +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Signed-off-by: Bernd Kuhls +---- + +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + diff --git a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch new file mode 100644 index 0000000000..9cc45a96c1 --- /dev/null +++ b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch @@ -0,0 +1,35 @@ +From 8711ce9c4ded311705f281c99e013a26987fbf1d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 1 Jan 2022 23:35:29 +0100 +Subject: [PATCH] i18n.c: _nl_msg_cat_cntr is an internal symbol of some intl + implementation + +It is supported by glibc and uClibc (which both define __GLIBC__) but +not musl (which doesn't define __GLIBC__). On musl, it doesn't do +anything because musl has a basic NLS implementation. Even +gettext-tiny defines _nl_msg_cat_cntr as a dummy symbol in its stub +libintl-musl implementation. + +Signed-off-by: Thomas Petazzoni +--- + i18n.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/i18n.c b/i18n.c +index 0ef08fd4..da2a3ede 100644 +--- a/i18n.c ++++ b/i18n.c +@@ -123,8 +123,10 @@ static const char *SkipContext(const char *s) + static void SetEnvLanguage(const char *Locale) + { + setenv("LANGUAGE", Locale, 1); ++#if defined(__GLIBC__) + extern int _nl_msg_cat_cntr; + ++_nl_msg_cat_cntr; ++#endif + } + + static void SetLanguageNames(void) +-- +2.31.1 + diff --git a/package/vdr/Config.in b/package/vdr/Config.in index df602f26d6..38502729a7 100644 --- a/package/vdr/Config.in +++ b/package/vdr/Config.in @@ -4,23 +4,22 @@ config BR2_PACKAGE_VDR depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBCAP - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC help This project describes how to build your own digital satellite receiver and Video Disk Recorder. http://www.tvdr.de -comment "vdr needs a glibc toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9" +comment "vdr needs a toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_USE_WCHAR || \ + !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 51affe5a7b..bb7b1e22c0 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -26,6 +26,11 @@ VDR_MAKE_FLAGS = \ VIDEODIR=/var/lib/vdr VDR_LDFLAGS = $(TARGET_NLS_LIBS) +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +VDR_DEPENDENCIES += libexecinfo +VDR_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) VDR_DEPENDENCIES += libfribidi VDR_MAKE_FLAGS += BIDI=1 From yann.morin.1998 at free.fr Wed Jan 5 20:35:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:35:12 +0100 Subject: [Buildroot] [git commit] package/fakedate: fix finding the right date executable Message-ID: <20220105202916.C2ECF813FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd9c604c96480819c053811432b7c36073ad785e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, we look for the actual date be easrching form the end of the PATH, and keeping the last-found date that occurs after the wrapper. However, in some cases, the wrapper will be the last item in the PATH. This is the cae when users already have the HOST_DIR/bin at the end of their PATH, ??-la: PATH="${PATH}:/path/to/buildroot/output/host/bin" In this case, we would not find any matching date. The issue is that Buildroot adds HOST_DIR/bin at the beginning of the PATH, so the real date will be to be found after the HOST_DIR that is early in the PATH, but before the HOST_DIR that is at the end. We fix the issue by searching the PATH as it is expecte to be searched, shoud Buildroot had not added its date wrapper: we use the first date executable that is found in the PATH, starting from the beginning, that is after our wrapper, abd that is not the wrapper itself. Signed-off-by: Ignacy Gaw??dzki [yann.morin.1998 at free.fr: - iterate in order from first-to-last - stop on the first occurence - handle the case where no date was found - extend and expand the commit log ] Signed-off-by: Yann E. MORIN --- package/fakedate/fakedate | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate index 9bef113357..7ebbf1f0da 100755 --- a/package/fakedate/fakedate +++ b/package/fakedate/fakedate @@ -18,16 +18,23 @@ # Copyright (C) 2016 J??r??me Pouiller # -DATE_BIN=false # Do not call any 'date' before us in the PATH, or that would create # an infinite recursion. -for date in $(which -a date |tac); do +found=false +for date in $(which -a date); do if [ "${date}" -ef "$0" ]; then + found=true + elif ${found}; then + DATE_BIN="${date}" break fi - DATE_BIN="${date}" done +if [ -z "${DATE_BIN}" ]; then + printf 'fakedate: no real date found in PATH after "%s"\n' "${0}" >&2 + exit 1 +fi + if [ -n "$SOURCE_DATE_EPOCH" ]; then FORCE_EPOCH=1 for i in "$@"; do From thomas.petazzoni at bootlin.com Wed Jan 5 20:36:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 21:36:28 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/vdr: enable musl/uclibc build In-Reply-To: <20220101120920.2809336-1-bernd.kuhls@t-online.de> References: <20220101120920.2809336-1-bernd.kuhls@t-online.de> Message-ID: <20220105213628.763562b2@windsurf> Hello Bernd, On Sat, 1 Jan 2022 13:09:20 +0100 Bernd Kuhls wrote: > Re-add patch 0001 to fix uClibc build, this patch was removed 2019: > https://git.buildroot.net/buildroot/commit/?id=573d15b0790cfd2838cf0544ded79b415e20f5a7 > > Add two more patches from Alpine Linux to fix musl build. > > Add optional dependency to libexecinfo to provide execinfo.h. > > Depend on BR2_SYSTEM_ENABLE_NLS to have gettext being added as > dependency to provide _nl_msg_cat_cntr() needed by i18n.c. > > Signed-off-by: Bernd Kuhls > --- > v3: rework nls/gettext dependencies (Thomas) > v2: no changes I have applied, but after dropping the NLS dependency. Indeed, the _nl_msg_cat_cntr symbol is an internal symbol of gettext, which only glibc and uclibc provide in their built-in libintl implementation. Even the stub libintl-musl from the gettext-tiny project implements _nl_msg_cat_cntr as a dummy symbol, which really tells us that it serves no purpose on musl toolchains. So I've just added a patch for vdr that ensures _nl_msg_cat_cntr is only used on glibc/uclibc toolchains, by checking __GLIBC__. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 5 20:37:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:37:27 +0100 Subject: [Buildroot] [PATCH] package/fakedate: fix finding the right date executable In-Reply-To: <20211215173432.r75invoe3ff6mthg@zenon.in.qult.net> References: <20211215173432.r75invoe3ff6mthg@zenon.in.qult.net> Message-ID: <20220105203727.GH614810@scaer> Ignacy, All, On 2021-12-15 18:34 +0100, Ignacy Gaw?dzki spake thusly: > If the PATH initially contains host/bin, then the right date > executable is to be found after the *first* occurrence of fakedate in > normal (forward) PATH order. Fix the wrapper so that that first > occurrence is found indeed. > > Signed-off-by: Ignacy Gaw?dzki After discussing this with Arnout and Thomas, we concluded that Arnout's proposal, with my ltile amendment, was the proper solution. Except that the loop had to be broken on first hit, of course, so I added the proper break. I also added a test that we actually did find a date executable. Of course, if we missed something, then feel free to yel back! ;-) Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/fakedate/fakedate | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate > index 9bef113357..03a4f04079 100755 > --- a/package/fakedate/fakedate > +++ b/package/fakedate/fakedate > @@ -21,13 +21,18 @@ > DATE_BIN=false > # Do not call any 'date' before us in the PATH, or that would create > # an infinite recursion. > +last_date=false > for date in $(which -a date |tac); do > if [ "${date}" -ef "$0" ]; then > - break > + DATE_BIN=$last_date > fi > - DATE_BIN="${date}" > + last_date="${date}" > done > > +if [ "$DATE_BIN" = false ]; then > + DATE_BIN=$last_date > +fi > + > if [ -n "$SOURCE_DATE_EPOCH" ]; then > FORCE_EPOCH=1 > for i in "$@"; do > -- > 2.32.0 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Jan 5 20:41:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 21:41:29 +0100 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: <20211210141209.1812043-2-jose.pekkarinen@unikie.com> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> Message-ID: <20220105214129.2f5fffae@windsurf> Hello Jos?, On Fri, 10 Dec 2021 16:12:04 +0200 Jos? Pekkarinen wrote: > This patch adds a new package for minijail. > > Signed-off-by: Jos? Pekkarinen I wanted to apply after fixing the issues pointed by others, but there are in fact other issues, which I cannot resolve directly. See below. > diff --git a/package/minijail/0001-Fix-prlimit-call.patch b/package/minijail/0001-Fix-prlimit-call.patch > new file mode 100644 > index 0000000000..9f6902ed43 > --- /dev/null > +++ b/package/minijail/0001-Fix-prlimit-call.patch > @@ -0,0 +1,29 @@ > +From 09348f06104bf8101a24a0bce235a75a214e1380 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > +Date: Fri, 10 Dec 2021 14:20:30 +0200 > +Subject: [PATCH] Fix prlimit call What are you "fixing"? You're replacing a prlimit() call by by setrlimit(), but why? What problem does it solve? Why is it correct to do that? > diff --git a/package/minijail/0002-Fix-static-assert.patch b/package/minijail/0002-Fix-static-assert.patch > new file mode 100644 > index 0000000000..48139e8baa > --- /dev/null > +++ b/package/minijail/0002-Fix-static-assert.patch > @@ -0,0 +1,30 @@ > +From b5d91b793942747e5126e75abca2eebad60ab478 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > +Date: Fri, 10 Dec 2021 14:21:38 +0200 > +Subject: [PATCH] Fix static assert > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Signed-off-by: Jos? Pekkarinen > +--- > + libminijail.c | 3 --- > + 1 file changed, 3 deletions(-) > + > +diff --git a/libminijail.c b/libminijail.c > +index 45f133e..8323742 100644 > +--- a/libminijail.c > ++++ b/libminijail.c > +@@ -2620,9 +2620,6 @@ static int fd_is_open(int fd) > + return fcntl(fd, F_GETFD) != -1 || errno != EBADF; > + } > + > +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > +- "If true, ensure_no_fd_conflict will always find an unused fd."); You're not fixing the static_assert() here but simply dropping it. Why? When does it fail? What is the problem with it? Why is it safe to drop it? Could you take into account these comments as well as the others received, and send an update patch? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 5 20:59:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 21:59:08 +0100 Subject: [Buildroot] [PATCH] package/opensc: new package In-Reply-To: <20211213061551.4110-1-jose.pekkarinen@unikie.com> References: <20211213061551.4110-1-jose.pekkarinen@unikie.com> Message-ID: <20220105215908.1d8677b3@windsurf> Hello Jos?, On Mon, 13 Dec 2021 08:15:51 +0200 Jos? Pekkarinen wrote: > The patch will add opensc package. > > Signed-off-by: Jos? Pekkarinen I'm afraid that when I read the feedback from upstream in your patches, saying that they introduce memory leaks (and indeed they do), I'm not really keen on merging this. However, I saw you told upstream: It is a bit of a chiken and egg problem. Buildroot wants me to upstream the patches before the package would be accesible to you, you want me to give a testing case that doesn't come easy without upstreaming the package. This is not totally correct for two reason: * we don't require patches to be accepted upstream, except if we have serious doubts about the patches. * the package doesn't have to be accepted in Buildroot upstream to provide an easy way for the opensc developers to reproduce the issue. You can provide a Buildroot branch on a public Git repository, with the opensc package, and a very simple opensc_demo_defconfig in configs/ that uses some external toolchain and builds just opensc to demonstrate the build failure. Then for the opensc people, reproducing is as easy as: git clone -b git://your.repository.com cd buildroot/ make opensc_demo_defconfig make Could you resolve the remaining issues and send an updated patch? Also, please remember to add a version to your patches when submitting, it really makes things easier. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 5 20:59:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:59:00 +0100 Subject: [Buildroot] [git commit] package/refpolicy: add host gcc >= 5 dependency Message-ID: <20220105205428.160CA832CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a087dd17fcfb7df2053cde6286803d6ae326c14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/refpolicy/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 043cc40a72..0e72b895df 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol + depends on BR2_HOST_GCC_AT_LEAST_5 # host-setools -> host-libsepol # Even though libsepol is not necessary for building, we get # the policy version from libsepol, so we select it, and treat # it like a runtime dependency. @@ -114,6 +115,7 @@ endif endif -comment "refpolicy needs a toolchain w/ threads, gcc >= 5" +comment "refpolicy needs a toolchain w/ threads, gcc >= 5, host gcc >= 5" depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_5 From yann.morin.1998 at free.fr Wed Jan 5 20:59:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:59:37 +0100 Subject: [Buildroot] [git commit] package/android-tools: add host gcc >= 5 dependency Message-ID: <20220105205428.299DE832C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae2c55df06e2163b6094b72775180c3a3afc4250 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/android-tools/Config.in.host | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/android-tools/Config.in.host b/package/android-tools/Config.in.host index 433f4e384f..898ddb2199 100644 --- a/package/android-tools/Config.in.host +++ b/package/android-tools/Config.in.host @@ -11,11 +11,15 @@ if BR2_PACKAGE_HOST_ANDROID_TOOLS config BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT bool "fastboot" + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol help This option will build and install the fastboot utility for the host, which can be used to reflash target devices implementing the fastboot protocol. +comment "fastboot needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 + config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB bool "adb" help @@ -25,9 +29,13 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS bool "ext4 utils" + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol help This option will build and install the ext4 utils for the host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg, simg2img and simg2simg. +comment "ext4 utils needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 + endif From yann.morin.1998 at free.fr Wed Jan 5 20:58:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:58:58 +0100 Subject: [Buildroot] [git commit] package/libsemanage: add gcc >= 5 dependency Message-ID: <20220105205428.0D863832C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fb55340ef0781243b18a6f2519c02b5c1d7bf28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsemanage/Config.in | 6 ++++-- package/policycoreutils/Config.in | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/libsemanage/Config.in b/package/libsemanage/Config.in index 3c7050ee51..5103df3f15 100644 --- a/package/libsemanage/Config.in +++ b/package/libsemanage/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSEMANAGE depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_AUDIT select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_BZIP2 @@ -17,6 +18,7 @@ config BR2_PACKAGE_LIBSEMANAGE http://selinuxproject.org/page/Main_Page -comment "libsemanage needs a toolchain w/ threads, dynamic library" +comment "libsemanage needs a toolchain w/ threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 81900b4e41..3201c8fede 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -1,12 +1,14 @@ -comment "policycoreutils needs a toolchain w/ threads, dynamic library" +comment "policycoreutils needs a toolchain w/ threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_POLICYCOREUTILS bool "policycoreutils" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage - depends on !BR2_STATIC_LIBS #libsemanage + depends on !BR2_STATIC_LIBS # libsemanage + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol select BR2_PACKAGE_LIBSEMANAGE select BR2_PACKAGE_LIBCAP_NG help From yann.morin.1998 at free.fr Wed Jan 5 20:59:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:59:03 +0100 Subject: [Buildroot] [git commit] package/checkpolicy: add host gcc >= 5 dependency Message-ID: <20220105205428.1F557832DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c0b521987f929ce88ae97ee2bf6f923311061a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - http://autobuild.buildroot.org/results/fc727efc0c658aaae55c83632a91af83701f0c49 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/checkpolicy/Config.in.host | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/checkpolicy/Config.in.host b/package/checkpolicy/Config.in.host index 240a5b6dc4..38e35e2fc1 100644 --- a/package/checkpolicy/Config.in.host +++ b/package/checkpolicy/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_CHECKPOLICY bool "host checkpolicy" + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol help checkpolicy is the SELinux policy compiler. It uses libsepol to generate the binary policy. checkpolicy uses the static @@ -8,3 +9,6 @@ config BR2_PACKAGE_HOST_CHECKPOLICY shared library interface. http://selinuxproject.org/page/Main_Page + +comment "host checkpolicy needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 From yann.morin.1998 at free.fr Wed Jan 5 21:00:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 22:00:59 +0100 Subject: [Buildroot] [PATCH 1/4] package/libsemanage: add gcc >= 5 dependency In-Reply-To: <20220105180402.388388-1-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Message-ID: <20220105210059.GI614810@scaer> Fabrice, All, On 2022-01-05 19:03 +0100, Fabrice Fontaine spake thusly: > Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 > dependency > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Series of 4 patches applied to master, thanks. I'll further reply to patch 4... Regards, Yann E. MORIN. > --- > package/libsemanage/Config.in | 6 ++++-- > package/policycoreutils/Config.in | 8 +++++--- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/package/libsemanage/Config.in b/package/libsemanage/Config.in > index 3c7050ee51..5103df3f15 100644 > --- a/package/libsemanage/Config.in > +++ b/package/libsemanage/Config.in > @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSEMANAGE > depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol > select BR2_PACKAGE_AUDIT > select BR2_PACKAGE_LIBSELINUX > select BR2_PACKAGE_BZIP2 > @@ -17,6 +18,7 @@ config BR2_PACKAGE_LIBSEMANAGE > > http://selinuxproject.org/page/Main_Page > > -comment "libsemanage needs a toolchain w/ threads, dynamic library" > +comment "libsemanage needs a toolchain w/ threads, dynamic library, gcc >= 5" > depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS > - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in > index 81900b4e41..3201c8fede 100644 > --- a/package/policycoreutils/Config.in > +++ b/package/policycoreutils/Config.in > @@ -1,12 +1,14 @@ > -comment "policycoreutils needs a toolchain w/ threads, dynamic library" > +comment "policycoreutils needs a toolchain w/ threads, dynamic library, gcc >= 5" > depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS > - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > config BR2_PACKAGE_POLICYCOREUTILS > bool "policycoreutils" > depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage > depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage > - depends on !BR2_STATIC_LIBS #libsemanage > + depends on !BR2_STATIC_LIBS # libsemanage > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol > select BR2_PACKAGE_LIBSEMANAGE > select BR2_PACKAGE_LIBCAP_NG > help > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 5 21:02:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 22:02:08 +0100 Subject: [Buildroot] [PATCH 4/4] package/android-tools: add host gcc >= 5 dependency In-Reply-To: <20220105180402.388388-4-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> <20220105180402.388388-4-fontaine.fabrice@gmail.com> Message-ID: <20220105210208.GJ614810@scaer> Fabrice, All, On 2022-01-05 19:04 +0100, Fabrice Fontaine spake thusly: > Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host > gcc >= 5 dependency > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/android-tools/Config.in.host | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/android-tools/Config.in.host b/package/android-tools/Config.in.host > index 433f4e384f..576e53e8b5 100644 > --- a/package/android-tools/Config.in.host > +++ b/package/android-tools/Config.in.host > @@ -10,12 +10,16 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS > if BR2_PACKAGE_HOST_ANDROID_TOOLS > > config BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT > + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol > bool "fastboot" > help > This option will build and install the fastboot utility for > the host, which can be used to reflash target devices > implementing the fastboot protocol. > > +comment "fastboot needs a toolchain w/ host gcc >= 5" > + depends on !BR2_HOST_GCC_AT_LEAST_5 > + > config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB > bool "adb" > help > @@ -24,10 +28,14 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB > implementing the ADB protocol. > > config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS > + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol $ make check-package package/android-tools/Config.in.host:14: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) package/android-tools/Config.in.host:32: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) Applied to master after fixing this, thanks. Regards, Yann E. MORIN. > bool "ext4 utils" > help > This option will build and install the ext4 utils for the > host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg, > simg2img and simg2simg. > > +comment "ext4 utils needs a toolchain w/ host gcc >= 5" > + depends on !BR2_HOST_GCC_AT_LEAST_5 > + > endif > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Wed Jan 5 21:38:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 14:38:18 -0700 Subject: [Buildroot] [PATCH 1/1] Makefile: only check _FINAL_DEPENDENCIES are selected Message-ID: <20220105213818.331826-1-james.hilliard1@gmail.com> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may not need to be selected in kconfig in cases where building is not desired, so only check that _FINAL_DEPENDENCIES are selected. Signed-off-by: James Hilliard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ac98b84425..7a2da3b043 100644 --- a/Makefile +++ b/Makefile @@ -589,7 +589,7 @@ endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ - $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_ALL_DEPENDENCIES)),\ + $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_DEPENDENCIES)),\ $(eval $(call CHECK_ONE_DEPENDENCY,$(pkg),$(dep))$(sep)))) endif -- 2.25.1 From wiselord1983 at gmail.com Wed Jan 5 21:40:46 2022 From: wiselord1983 at gmail.com (Uladzimir Bely) Date: Thu, 6 Jan 2022 00:40:46 +0300 Subject: [Buildroot] [PATCH] package/linux-firmware: add option for Cypress FullMAC Message-ID: <20220105214046.14890-1-wiselord1983@gmail.com> Since 2016, Cypress is in charge of supporting old Broadcom wireless chips and producing new ones. Newer firmwares for now come with a different license and have anoter location in a package. Now, most of Broadcom FullMac firmwares in brcm/ directory should now be just symlinks to the corresponding files in cypress/ directory. Respectively, it also makes sence to autoselect corresponding CYPRESS options if user selectes BRCM wireless stuff. This patch was created as a result of investigation the issue with broken wireless support for such popular boards as Raspberry Pi Zero W and BananaPi M2 Zero. Signed-off-by: Uladzimir Bely --- package/linux-firmware/Config.in | 17 ++++++++++ package/linux-firmware/linux-firmware.hash | 1 + package/linux-firmware/linux-firmware.mk | 39 ++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 622b1ee685..c94ffe24de 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -140,11 +140,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX bool "Broadcom BRCM bcm43xx" + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX help Firmware files for the Broadcom bcm43xx SoftMAC and FullMAC. config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX bool "Broadcom BRCM bcm43xxx" + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX help Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. @@ -158,6 +160,21 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0 help Firmware file for the Broadcom 4366c0 FullMAC chip. +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX + bool "Cypress CY cyw43xx" + help + Firmware files for the Cypress cyw43xx FullMAC. + +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX + bool "Cypress CY cyw43xxx" + help + Firmware files for the Cypress cyw43xxx FullMAC. + +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX + bool "Cypress CY cyw54xxx" + help + Firmware files for the Cypress cyw54xxx FullMAC. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index d8edb37628..4c73374138 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -11,6 +11,7 @@ sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware +sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 281ed0189d..ac45bc8282 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -675,6 +675,45 @@ LINUX_FIRMWARE_FILES += brcm/brcmfmac4366c-pcie.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif +# cyfmac43xx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac4339-sdio.bin \ + cypress/cyfmac4354-sdio.bin \ + cypress/cyfmac4354-sdio.clm_blob \ + cypress/cyfmac4356-pcie.bin \ + cypress/cyfmac4356-pcie.clm_blob \ + cypress/cyfmac4356-sdio.bin \ + cypress/cyfmac4356-sdio.clm_blob \ + cypress/cyfmac4373-sdio.bin \ + cypress/cyfmac4373-sdio.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + +# cyfmac43xxx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac43012-sdio.bin \ + cypress/cyfmac43012-sdio.clm_blob \ + cypress/cyfmac43340-sdio.bin \ + cypress/cyfmac43362-sdio.bin \ + cypress/cyfmac43430-sdio.bin \ + cypress/cyfmac43430-sdio.clm_blob \ + cypress/cyfmac43455-sdio.bin \ + cypress/cyfmac43455-sdio.clm_blob \ + cypress/cyfmac43570-pcie.bin \ + cypress/cyfmac43570-pcie.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + +# cyfmac54xxx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac54591-pcie.bin \ + cypress/cyfmac54591-pcie.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + # ql2xxx ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX),y) LINUX_FIRMWARE_FILES += \ -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 5 22:03:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:03:24 +0100 Subject: [Buildroot] [git commit] package/bmx7: new package Message-ID: <20220105215728.A43E382AE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e065065777e2955f385ae51b14c9f284b83e477 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch will provide an initial package for bmx7 project. Signed-off-by: Jos?? Pekkarinen Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...dule.c-378-36-error-SIOCGSTAMP-undeclared.patch | 28 +++++++++++++++++ package/bmx7/0002-Fix-linking-error.patch | 29 ++++++++++++++++++ ...eorder-includes-to-avoid-ethhdr-collision.patch | 35 ++++++++++++++++++++++ package/bmx7/Config.in | 15 ++++++++++ package/bmx7/bmx7.hash | 3 ++ package/bmx7/bmx7.mk | 21 +++++++++++++ 8 files changed, 133 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 37c792816a..4cb07b6d9a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1485,6 +1485,7 @@ F: package/zfs/ F: support/testing/tests/package/test_zfs.py N: Jos?? Pekkarinen +F: package/bmx7/ F: package/softhsm2/ N: Joseph Kogut diff --git a/package/Config.in b/package/Config.in index 7148639735..d90fb5c450 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2145,6 +2145,7 @@ endif source "package/bluez-tools/Config.in" source "package/bluez5_utils/Config.in" source "package/bmon/Config.in" + source "package/bmx7/Config.in" source "package/boinc/Config.in" source "package/brcm-patchram-plus/Config.in" source "package/bridge-utils/Config.in" diff --git a/package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch b/package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch new file mode 100644 index 0000000000..d627cf6165 --- /dev/null +++ b/package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch @@ -0,0 +1,28 @@ +From f16fa9796e05ca9ea6ee764b3c1f0b8baed535e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 14:35:45 +0200 +Subject: [PATCH] Fix schedule.c:378:36: error: 'SIOCGSTAMP' undeclared +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jos?? Pekkarinen +--- + src/schedule.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/schedule.c b/src/schedule.c +index 8868b01..09ab248 100644 +--- a/src/schedule.c ++++ b/src/schedule.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + + #include "list.h" +-- +2.30.2 + diff --git a/package/bmx7/0002-Fix-linking-error.patch b/package/bmx7/0002-Fix-linking-error.patch new file mode 100644 index 0000000000..04354c6a0a --- /dev/null +++ b/package/bmx7/0002-Fix-linking-error.patch @@ -0,0 +1,29 @@ +From 974541b80bf8d7ec78ed9214a1b541957670f9cd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 14:36:55 +0200 +Subject: [PATCH] Fix linking error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jos?? Pekkarinen +--- + src/bmx.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bmx.h b/src/bmx.h +index 4269903..7789f7f 100644 +--- a/src/bmx.h ++++ b/src/bmx.h +@@ -290,7 +290,7 @@ enum ADGSN { + #define SUCCESS 0 + #define FAILURE -1 + +-const void* FAILURE_PTR; ++extern const void* FAILURE_PTR; + + + #define MAX_SELECT_TIMEOUT_MS 1100 /* MUST be smaller than (1000/2) to fit into max tv_usec */ +-- +2.30.2 + diff --git a/package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch b/package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch new file mode 100644 index 0000000000..75cc392513 --- /dev/null +++ b/package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch @@ -0,0 +1,35 @@ +From fc13da06c1de4d085e21dc2bf45e1e95eb6145d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 14:37:37 +0200 +Subject: [PATCH] Reorder includes to avoid ethhdr collision +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jos?? Pekkarinen +--- + src/ip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ip.c b/src/ip.c +index cd50074..4198e92 100644 +--- a/src/ip.c ++++ b/src/ip.c +@@ -43,13 +43,13 @@ + #include + #include + +-#include /* TUNSETPERSIST, ... */ + #include + + #ifndef BMX7_LIB_IWINFO + #define BMX7_LIB_IW + #include + #endif ++#include /* TUNSETPERSIST, ... */ + //#include + // apt-get install libiw-dev + //#include +-- +2.30.2 + diff --git a/package/bmx7/Config.in b/package/bmx7/Config.in new file mode 100644 index 0000000000..6fa6a07997 --- /dev/null +++ b/package/bmx7/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_BMX7 + bool "bmx7" + depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_MBEDTLS + select BR2_PACKAGE_WIRELESS_TOOLS + select BR2_PACKAGE_WIRELESS_TOOLS_LIB + help + BMX7 is a mesh routing protocol for Linux based + operating systems. + + https://github.com/bmx-routing/bmx7 + +comment "bmx7 needs a toolchain with dynamic library support" + depends on BR2_STATIC_LIBS diff --git a/package/bmx7/bmx7.hash b/package/bmx7/bmx7.hash new file mode 100644 index 0000000000..39203c979f --- /dev/null +++ b/package/bmx7/bmx7.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5f88df1c95e5cb842a6016bb1604e3e7f6097c63c5c9916edc3c84e96d4f5f65 bmx7-7.1.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/bmx7/bmx7.mk b/package/bmx7/bmx7.mk new file mode 100644 index 0000000000..54a9cc8eb5 --- /dev/null +++ b/package/bmx7/bmx7.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# bmx7 +# +################################################################################ + +BMX7_VERSION = 7.1.1 +BMX7_SITE = $(call github,bmx-routing,bmx7,v$(BMX7_VERSION)) +BMX7_LICENSE = GPL-2.0 +BMX7_LICENSE_FILES = LICENSE +BMX7_DEPENDENCIES = zlib mbedtls wireless_tools + +define BMX7_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(d)/src +endef + +define BMX7_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/src/bmx7 $(TARGET_DIR)/usr/bin/bmx7 +endef + +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Wed Jan 5 22:23:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:23:48 +0100 Subject: [Buildroot] [PATCH 3/7] package/bmx7: new package In-Reply-To: <20211210141209.1812043-3-jose.pekkarinen@unikie.com> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-3-jose.pekkarinen@unikie.com> Message-ID: <20220105232348.68986536@windsurf> Hello Jos?, On Fri, 10 Dec 2021 16:12:05 +0200 Jos? Pekkarinen wrote: > This patch will provide an initial package > for bmx7 project. > > Signed-off-by: Jos? Pekkarinen I have applied this patch, with a few changes (see below). But I must say I hesitated. Do you really use this? This project has not seen any updates since July 2019, there is a simple pull request fixing the SIOCGSTAMP issue that has never been looked at, and there are alternatives such as olsr and batman-adv which are actively maintained. Also, gcc generates tons and tons of warnings, which is quite worrying, as gcc tends to become more and more strict, and upstream is no longer active. So I've applied, but I really hesitated. > diff --git a/package/bmx7/Config.in b/package/bmx7/Config.in > new file mode 100644 > index 0000000000..3c13c047e9 > --- /dev/null > +++ b/package/bmx7/Config.in > @@ -0,0 +1,16 @@ > +config BR2_PACKAGE_BMX7 > + bool "bmx7" > + depends on !BR2_STATIC_LIBS # dlopen() > + select BR2_PACKAGE_ZLIB > + select BR2_PACKAGE_LIBZLIB I dropped that, and tested it builds fine with zlib-ng. > +BMX7_VERSION = v7.1.1 > +BMX7_SOURCE = $(BMX7_VERSION).tar.gz > +BMX7_SITE = https://github.com/bmx-routing/bmx7/archive/refs/tags Changed that to use the github macro that we have in Buildroot. > +BMX7_LICENSE = GPL-2 Changed to GPL-2.0. > +BMX7_LICENSE_FILES = LICENSE > +BMX7_DEPENDENCIES = zlib mbedtls wireless_tools > + > +define BMX7_BUILD_CMDS > + (cd $(@D); \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d)/src CC="$(TARGET_CC)") Changed to: $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(d)/src I.e, not need to cd into $(@D), and then using $(TARGET_CONFIGURE_OPTS) to pass all variables, not just CC. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 5 22:29:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 23:29:18 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/cross-ldd: new package In-Reply-To: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> Message-ID: <20220105222918.GK614810@scaer> Thierry, All, On 2021-12-23 12:13 +0100, Thierry Bultel spake thusly: > cross-ldd works just as ldd, but supports > other architectures. It is needed by dracut, for instance. > > Signed-off-by: Thierry Bultel > --- [--SNIP--] > diff --git a/package/cross-ldd/Config.in b/package/cross-ldd/Config.in > new file mode 100644 > index 0000000000..3858fbc5fe > --- /dev/null > +++ b/package/cross-ldd/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_HOST_CROSS_LDD > + bool "cross-ldd" I don't think this tool warrants a Kconfig entry. I.e. it should be a blind host-only package, with no Config.in. > + help > + ldd drop-in replacement for cross-compilation > + toolchains. > + This is the officially supported version mentioned > + in the dracut documentation It would have been nice to add a pointer to that documentation (I spent quite some time look for it...). It's in: docs/README.cross > diff --git a/package/cross-ldd/cross-ldd.mk b/package/cross-ldd/cross-ldd.mk > new file mode 100644 > index 0000000000..fc0752adff > --- /dev/null > +++ b/package/cross-ldd/cross-ldd.mk > @@ -0,0 +1,19 @@ > +################################################################################ > +# > +# cross-ldd > +# > +################################################################################ > + > +CROSS_LDD_VERSION = 6c9c724ebd6a29c279c6e5734e44c07f067808ec > +CROSS_LDD_SOURCE = $(CROSS_LDD_VERSION).tar.gz > +CROSS_LDD_SITE = https://gist.github.com/jerome-pouiller/c403786c1394f53f44a3b61214489e6f/archive I find it really sad that we have to use a random gist without proper packaging or repository... :-( But I guess we don't have much options... You are missing the license for that script: CROSS_LDD_LICENSE = GPL-2.0 (I should know, I wrote it! ;-) And incidentally, it is also mentioned in the help text.) > +# Notice that we change the name to '-ldd-cross', in order to avoid conflict > +# with some external toolchains that implement it -ldd-cross is still too generic. Make it really specific to buildroot, by calling it -ldd-buildroot > +define HOST_CROSS_LDD_INSTALL_CMDS > + $(SED) 's/-ldd}/-ldd-cross}'/g $(@D)/cross-compile-ldd > + install -D -m 755 $(@D)/cross-compile-ldd $(TARGET_CROSS)ldd-cross > +endef This install comand does two things: - modify the source script - install the modified script Semantically, we want to separate actions that happen in the source tree into one of the extract, patch, configure, or build commands. Also, usually, we shy away from patching with sed expressions, and we prefer actual patches. Regards, Yann E. MORIN. > + > +$(eval $(host-generic-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Jan 5 22:38:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:38:53 +0100 Subject: [Buildroot] [git commit] package/alfred: new package Message-ID: <20220105223312.16076832CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b61366f3cc52ea54f9b5719d25ab09e595f53173 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jos?? Pekkarinen Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/alfred/Config.in | 20 ++++++++++++++++++++ package/alfred/alfred.hash | 5 +++++ package/alfred/alfred.mk | 25 +++++++++++++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4cb07b6d9a..4b04f90ccb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1485,6 +1485,7 @@ F: package/zfs/ F: support/testing/tests/package/test_zfs.py N: Jos?? Pekkarinen +F: package/alfred/ F: package/bmx7/ F: package/softhsm2/ diff --git a/package/Config.in b/package/Config.in index d90fb5c450..9f4ab72a80 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2121,6 +2121,7 @@ endmenu menu "Networking applications" source "package/aircrack-ng/Config.in" + source "package/alfred/Config.in" source "package/aoetools/Config.in" source "package/apache/Config.in" if BR2_PACKAGE_APACHE diff --git a/package/alfred/Config.in b/package/alfred/Config.in new file mode 100644 index 0000000000..bfcfef0d40 --- /dev/null +++ b/package/alfred/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_ALFRED + bool "alfred" + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + select BR2_PACKAGE_LIBNL + help + Alfred is a user space daemon for distributing arbitrary + local information over the mesh/network in a decentralized + fashion. + + This data can be anything which appears to be useful - + originally designed to replace the batman-adv visualization + (vis), you may distribute hostnames, phone books, + administration information, DNS information, the local + weather forecast ... + + https://www.open-mesh.org/projects/alfred/wiki + +comment "alfred needs a toolchain w/ dynamic library, threads" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash new file mode 100644 index 0000000000..0799071231 --- /dev/null +++ b/package/alfred/alfred.hash @@ -0,0 +1,5 @@ +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2021.4.tar.gz.sha1 +sha1 be1e9c1317d40e46cfc881a31c632fec78c620a1 alfred-2021.4.tar.gz +# Locally computed +sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk new file mode 100644 index 0000000000..ed59066393 --- /dev/null +++ b/package/alfred/alfred.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# alfred +# +################################################################################ + +ALFRED_VERSION = 2021.4 +ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred +ALFRED_LICENSE = GPL-2.0 +ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 +ALFRED_DEPENDENCIES = libnl + +define ALFRED_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) \ + CONFIG_ALFRED_CAPABILITIES=n \ + CONFIG_ALFRED_GPSD=n +endef + +define ALFRED_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/alfred $(TARGET_DIR)/usr/bin/alfred + $(INSTALL) -m 0755 -D $(@D)/vis/batadv-vis $(TARGET_DIR)/usr/bin/batadv-vis +endef + +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Wed Jan 5 22:43:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:43:03 +0100 Subject: [Buildroot] [PATCH 4/7] package/alfred: new package In-Reply-To: <20211210141209.1812043-4-jose.pekkarinen@unikie.com> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-4-jose.pekkarinen@unikie.com> Message-ID: <20220105234303.28cabcc2@windsurf> Hello Jos?, On Fri, 10 Dec 2021 16:12:06 +0200 Jos? Pekkarinen wrote: > This patch will provide the initial > package for alfred project. > > Signed-off-by: Jos? Pekkarinen I have applied your patch, but after doing a number of changes. See below. > diff --git a/package/alfred/Config.in b/package/alfred/Config.in > new file mode 100644 > index 0000000000..5f9c6f2a6e > --- /dev/null > +++ b/package/alfred/Config.in > @@ -0,0 +1,20 @@ > +config BR2_PACKAGE_ALFRED > + bool "alfred" > + depends on !BR2_STATIC_LIBS # dlopen() > + select BR2_PACKAGE_LIBNL You have forgotten to account for the threads dependency of libnl, which must be replicated here; > + select BR2_PACKAGE_LIBCAP > + select BR2_PACKAGE_GPSD Neither libcap and gpsd are mandatory dependencies (see the README file from the alfred code base for details). So I dropped these entirely. If you want to have support for libcap and gpsd, you need to handle them in the .mk file like this: ifeq ($(BR2_PACKAGE_LIBCAP),y) ... do something ... else ... do something else ... endif > +comment "alfred needs a toolchain with dynamic library support" > + depends on BR2_STATIC_LIBS Modified to account for the threads dependency. > diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash > new file mode 100644 > index 0000000000..a2dd0116d7 > --- /dev/null > +++ b/package/alfred/alfred.hash > @@ -0,0 +1,4 @@ > +# From https://downloads.open-mesh.org/batman/stable/sources/alfred As pointed out by Giulio, this didn't make sense, as it doesn't point to a file that contains the sha256, and actually no file there contains the sha256. So instead I've added the sha1 from the file provided by upstream, and put the sha256 hash under the "Locally computed" comment. > +sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz > +# Locally computed > +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 > diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk > new file mode 100644 > index 0000000000..4e38ddad92 > --- /dev/null > +++ b/package/alfred/alfred.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# alfred > +# > +################################################################################ > + > +ALFRED_VERSION = 2021.4 > +ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred > +ALFRED_LICENSE = GPL-2 used GPL-2.0 here, which is the correct SPDX code for the GPLv2. > +ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 > +ALFRED_DEPENDENCIES = libnl libcap gpsd Dropped libcap and gpsd from here. > + > +define ALFRED_BUILD_CMDS > + (cd $(@D); \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) CC="$(TARGET_CC)") Several things were wrong: - cd $(@D) was not needed, since you're doing -C $(@D) - the $(d) was wrong, as $(d) is an empty variable - doing that within a subshell is not necessary - passing $(TARGET_CONFIGURE_OPTS) is preferred over passing just CC. Applied with those changes, thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 5 22:44:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:44:42 +0100 Subject: [Buildroot] [git commit] package/bmx7: drop useless $(d) Message-ID: <20220105223933.7B7C5832C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b4e139770b03a50dd93202bff50d2acda113346 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This was overlooked in commit 8e065065777e2955f385ae51b14c9f284b83e477 ("package/bmx7: new package") Signed-off-by: Thomas Petazzoni --- package/bmx7/bmx7.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bmx7/bmx7.mk b/package/bmx7/bmx7.mk index 54a9cc8eb5..7eb8a3d6ca 100644 --- a/package/bmx7/bmx7.mk +++ b/package/bmx7/bmx7.mk @@ -11,7 +11,7 @@ BMX7_LICENSE_FILES = LICENSE BMX7_DEPENDENCIES = zlib mbedtls wireless_tools define BMX7_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(d)/src + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/src endef define BMX7_INSTALL_TARGET_CMDS From wiselord1983 at gmail.com Wed Jan 5 23:15:43 2022 From: wiselord1983 at gmail.com (Uladzimir Bely) Date: Thu, 6 Jan 2022 02:15:43 +0300 Subject: [Buildroot] [PATCH] package/python-mpd2: new package Message-ID: <20220105231543.22467-1-wiselord1983@gmail.com> A client interface for the Music Player Daemon. Signed-off-by: Uladzimir Bely --- package/Config.in | 1 + package/python-mpd2/Config.in | 8 ++++++++ package/python-mpd2/python-mpd2.hash | 5 +++++ package/python-mpd2/python-mpd2.mk | 13 +++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-mpd2/Config.in create mode 100644 package/python-mpd2/python-mpd2.hash create mode 100644 package/python-mpd2/python-mpd2.mk diff --git a/package/Config.in b/package/Config.in index 7148639735..b9dc9b49e7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1091,6 +1091,7 @@ menu "External python modules" source "package/python-mistune/Config.in" source "package/python-modbus-tk/Config.in" source "package/python-more-itertools/Config.in" + source "package/python-mpd2/Config.in" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in new file mode 100644 index 0000000000..015ca47610 --- /dev/null +++ b/package/python-mpd2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MPD2 + bool "python-mpd2" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_MPD # runtime + help + A Python MPD client library. + + https://github.com/Mic92/python-mpd2 diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash new file mode 100644 index 0000000000..83487257ee --- /dev/null +++ b/package/python-mpd2/python-mpd2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-mpd2/json +md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz +sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz +# Locally computed sha256 checksums +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk new file mode 100644 index 0000000000..6a7358e8cd --- /dev/null +++ b/package/python-mpd2/python-mpd2.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-mpd2 +# +################################################################################ + +PYTHON_MPD2_VERSION = 3.0.4 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 +PYTHON_MPD2_SETUP_TYPE = setuptools +PYTHON_MPD2_LICENSE = GNU Library or Lesser General Public License (LGPL) +PYTHON_MPD2_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From yann.morin.1998 at free.fr Wed Jan 5 23:16:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 00:16:54 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dracut: new host package In-Reply-To: <20211223111348.3532601-2-thierry.bultel@linatsea.fr> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-2-thierry.bultel@linatsea.fr> Message-ID: <20220105231654.GL614810@scaer> Thierry, All, On 2021-12-23 12:13 +0100, Thierry Bultel spake thusly: > dracut is the tool used by desktop distributions to > build initrds. In the embedded world, it can be > very usefull, too, for instance when wanting to > create an initramfs for a system recovery mode. > Whereas it is definitively possible to achieve > this with buildroot, the process is to have a > dedicated buildroot configuration for that, > and perform a full build. Instead of doing that, > the idea is to use dracut to pick the needed > binaries/shared libraries, configuration files, > or kernel modules from the 'target' directory. > The advantage is to save build time, and also > to have a consistency between the packages versions > taken for the recovery and the production filesystem. Please, wrap your commit log to ~72 chars. > Signed-off-by: Thierry Bultel > --- [--SNIP--] > diff --git a/package/dracut/05busybox-buildroot/module-setup.sh b/package/dracut/05busybox-buildroot/module-setup.sh > new file mode 100755 > index 0000000000..b227571db4 > --- /dev/null > +++ b/package/dracut/05busybox-buildroot/module-setup.sh You will have to (briefly, maybe) explain how those 'modules' are meant to be used... > @@ -0,0 +1,69 @@ > +#!/bin/bash ... here you make it an executable (0755) shell script, but it only defines functions, it actually calls nothing. Are moduels supposed to be source-d from dracut itself? > +check() { > + require_binaries \ > + busybox | return 1 This can't possibly work: it will always fail (there is a single pipe, so the whole command will fail). Then what happens depends on whether the shell is set -e or not. If it is not set -e, the execution continues, and the check() function will always return 0 (success). If the shell is set -e, then execution of check() ends right there, and presumably check() is called as an if-block condition, and thus the condition will never be true. So, it was not tested? ;-) (also: commands that fit on a line should be on a single line, like so: require_binaries busybox || return 1 ) > + return 0 > +} > + > +depends() { > + return 0 > +} > + > + > +install_busybox_links() { > + dir=$1 > + linkname=$2 > + > + (cd "$dracutsysrootdir"$dir && $ shellcheck package/dracut/05busybox-buildroot/module-setup.sh (cd "$dracutsysrootdir"$dir && ^--^ SC2086: Double quote to prevent globbing and word splitting. Also, please do variable expansion with curly braces (everywhere): "${dracutsysrootdir}${dir}" > + for x in *; do > + if [ "$(readlink "$x")" = $linkname ]; then > + ln -sf $linkname $initdir/$dir/$x > + fi > + done > + ) > + > +} > + > +install() { > + No initial empty line at begining of function. [--SNIP--] > +# mkdir -p $initdir/etc/init.d > +# cp -a $dracutsysrootdir/etc/init.d/* $initdir/etc/init.d Commented-out debug code or non-function code should just be removed. > + No empty line at the end of function. > +} > + > diff --git a/package/dracut/06uclibc/module-setup.sh b/package/dracut/06uclibc/module-setup.sh > new file mode 100644 > index 0000000000..77e9bd864e > --- /dev/null > +++ b/package/dracut/06uclibc/module-setup.sh > @@ -0,0 +1,20 @@ > +#!/bin/bash > + > +check() { > + return 0 > +} > + > +depends() { > + return 0 > +} > + > + > + > +install() { > + > + # Despite of the fact that the listed dependency (reported by readelf -d) > + # is purely ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too > + > + ln -s ld-uClibc.so.1 $initdir/lib/ld-uClibc.so.0 > + Extra empty lines... But still, a little explanations (in the commit log) on how those scripts are supposed to be used would help further review. [--SNIP--] > diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk > new file mode 100644 > index 0000000000..6c82b4ba75 > --- /dev/null > +++ b/package/dracut/dracut.mk > @@ -0,0 +1,45 @@ > +################################################################################ > +# > +# dracut > +# > +################################################################################ > + > +DRACUT_VERSION = 055 > +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz > +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut > +DRACUT_LICENSE = GPL-2.0 > +DRACUT_LICENSE_FILES = COPYING > + > +HOST_DRACUT_DEPENDENCIES += host-pkgconf host-kmod host-cross-ldd First assignment should not be +=, but just =. > +define HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT > + $(SED) '/unset LD_LIBRARY_PATH/d' $(HOST_DIR)/bin/dracut > + $(SED) '/unset LD_PRELOAD/d' $(HOST_DIR)/bin/dracut As for cross-ldd, we prefer that patching be done with actual patches rather than sed expressions. > +endef > + > +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT > + $(INSTALL) -D -m 0755 package/dracut/dracut_wrapper.sh \ > + $(HOST_DIR)/usr/bin/dracut_wrapper.sh Your commit log does not explain the reason why we need to have a wrapper, or how it is going to be used... Usually, when we introduce a wrapper, it replace sthe original executable in name, and the original is renamed, with the wrapper eventually calling into the renamed original... So having a wrapper installed as you do it is slightly off-road... > +endef > + > +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) > +define HOST_DRACUT_POST_INSTALL_UCLIBC_MODULE > + $(INSTALL) -D -m 0755 package/dracut/06uclibc/module-setup.sh \ > + $(HOST_DIR)/lib/dracut/modules.d/06uclibc/module-setup.sh > +endef > +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_UCLIBC_MODULE > +endif And what about glibc? musl? Can we unconditionally install the modules and change their check() functions to decide whther the moduels is usable or not? Or something else dynamic? > +ifeq ($(BR2_INIT_BUSYBOX),y) > +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE > + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ > + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh > +endef > +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE And what about systemd as an init system? openrc? sysv-init? Others? > +endif > + > +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT > +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT Spaces around the operator. Also, since this is the same hook, a single assignment is better: HOST_DRACUT_POST_INSTALL_HOOKS += \ HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT \ HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT Note: we prefer to have uncondtional asignemnts come before the conditional ones, and we also prefer to have ythe hook assignment come right after the hook definitionm like so: define HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT blabla endef HOST_DRACUT_POST_INSTALL_HOOKS = HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT blabla endef HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT ifeq ($(BR2_INIT_BUSYBOX),y) define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE blabla endef HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE endif and so on... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Thu Jan 6 06:24:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:24:04 -0700 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected Message-ID: <20220106062407.3131530-1-james.hilliard1@gmail.com> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may not need to be selected in kconfig in cases where building is not desired, so only check that _FINAL_DEPENDENCIES are selected. Signed-off-by: James Hilliard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ac98b84425..7a2da3b043 100644 --- a/Makefile +++ b/Makefile @@ -589,7 +589,7 @@ endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ - $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_ALL_DEPENDENCIES)),\ + $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_DEPENDENCIES)),\ $(eval $(call CHECK_ONE_DEPENDENCY,$(pkg),$(dep))$(sep)))) endif -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 6 06:24:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:24:05 -0700 Subject: [Buildroot] [PATCH v2 2/4] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220106062407.3131530-1-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> Message-ID: <20220106062407.3131530-2-james.hilliard1@gmail.com> This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium. Signed-off-by: James Hilliard --- .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 0000000000..8190a6dd5d --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 0000000000..fac3c996fa --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 6 06:24:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:24:07 -0700 Subject: [Buildroot] [PATCH v2 4/4] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220106062407.3131530-1-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> Message-ID: <20220106062407.3131530-4-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags. Create a .git file so to trigger headers sync during configure. Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 13 ++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 71 files changed, 216 insertions(+), 386 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..d10847ea04 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ba2971dc08..294542fabb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..58e167e483 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..8c0e02152d 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4bdb90b203 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..abffc2891d 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..d48a37fafe 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 84bc291739..3b14284e37 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -6,7 +6,7 @@ QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 6 06:33:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:33:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit-examples: remove package Message-ID: <20220106063308.3132088-1-james.hilliard1@gmail.com> This package seems to have issues building with the latest qt5webkit release, as it has not received updates upstream since 2017 remove it as it is unlikely to be fixed. Signed-off-by: James Hilliard --- Config.in.legacy | 7 ++ .../0001-Build-examples.patch | 52 ------------- .../0002-Fix-QWebView-path.patch | 73 ------------------- .../0003-Fix-QPainterPath-include.patch | 36 --------- package/qt5/qt5webkit-examples/Config.in | 10 --- .../qt5webkit-examples.hash | 8 -- .../qt5webkit-examples/qt5webkit-examples.mk | 26 ------- 7 files changed, 7 insertions(+), 205 deletions(-) delete mode 100644 package/qt5/qt5webkit-examples/0001-Build-examples.patch delete mode 100644 package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch delete mode 100644 package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch delete mode 100644 package/qt5/qt5webkit-examples/Config.in delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk diff --git a/Config.in.legacy b/Config.in.legacy index e5349e58ac..004506e4bb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES + bool "qt5webkit-examples removed" + select BR2_LEGACY + help + The qt5webkit-examples package is unmaintained and has been + removed. + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" select BR2_LEGACY diff --git a/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/package/qt5/qt5webkit-examples/0001-Build-examples.patch deleted file mode 100644 index cd925e21c5..0000000000 --- a/package/qt5/qt5webkit-examples/0001-Build-examples.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 28 Nov 2017 23:14:42 -0500 -Subject: [PATCH] Build examples -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -This patch improves the qt5webkit examples build for 2 aspects: - - - Allows to build even if qt5base examples are not enabled - - Builds xmlpatterns example only if the qt5xmlpattern package - has been built - -Signed-off-by: Massimo Callegari -Signed-off-by: Ga?l PORTAY -[gportay: build imageanalyzer example if concurrent module is built] ---- - examples/webkitwidgets/webkitwidgets.pro | 7 ++++--- - qtwebkit-examples.pro | 1 + - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro -index ab20df4..67f6785 100644 ---- a/examples/webkitwidgets/webkitwidgets.pro -+++ b/examples/webkitwidgets/webkitwidgets.pro -@@ -4,9 +4,10 @@ SUBDIRS += domtraversal \ - previewer \ - fancybrowser \ - simpleselector \ -- imageanalyzer \ - framecapture \ - browser \ - embedded \ -- scroller \ -- xmlpatterns -+ scroller -+ -+qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns -+qtHaveModule(concurrent): SUBDIRS += imageanalyzer -diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro -index 3fcecf1..2ade7ff 100644 ---- a/qtwebkit-examples.pro -+++ b/qtwebkit-examples.pro -@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit)) - load(qt_parts) - - SUBDIRS += doc -+SUBDIRS += examples --- -2.15.0 - diff --git a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch deleted file mode 100644 index 30aab30167..0000000000 --- a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9fa73707216bd55dff380031a33aca701a7d9c8b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 May 2019 23:29:05 +0200 -Subject: [PATCH] Fix QWebView path - -QWebView is installed under QtWebKitWidgets - -Fixes: - - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e - -Signed-off-by: Fabrice Fontaine ---- - examples/webkitwidgets/formextractor/formextractor.ui | 2 +- - examples/webkitwidgets/previewer/previewer.ui | 2 +- - examples/webkitwidgets/simpleselector/window.ui | 2 +- - .../xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/examples/webkitwidgets/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui -index 5c4afec..a38bdd5 100644 ---- a/examples/webkitwidgets/formextractor/formextractor.ui -+++ b/examples/webkitwidgets/formextractor/formextractor.ui -@@ -151,7 +151,7 @@ - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - -diff --git a/examples/webkitwidgets/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui -index d4c9992..69adb2e 100644 ---- a/examples/webkitwidgets/previewer/previewer.ui -+++ b/examples/webkitwidgets/previewer/previewer.ui -@@ -74,7 +74,7 @@ - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - -diff --git a/examples/webkitwidgets/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui -index aa824df..7906186 100644 ---- a/examples/webkitwidgets/simpleselector/window.ui -+++ b/examples/webkitwidgets/simpleselector/window.ui -@@ -64,7 +64,7 @@ - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - -diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -index ad43284..000cae7 100644 ---- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; } - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - --- -2.20.1 - diff --git a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch b/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch deleted file mode 100644 index 2d5e8fae9a..0000000000 --- a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 452123a4491b26c5b078934477bd5864f1d004e4 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 28 May 2020 20:58:26 +0200 -Subject: [PATCH] Fix QPainterPath include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add missing QPainterPath (needed for Qt-5.15.0 compile). - -Fixes: - - searchlineedit.cpp:121:18: error: aggregate ?QPainterPath myPath? has incomplete type and cannot be defined - QPainterPath myPath; - ^~~~~~ - -Signed-off-by: Peter Seiderer ---- - examples/webkitwidgets/browser/searchlineedit.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/webkitwidgets/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp -index fbd73cb..7462c82 100644 ---- a/examples/webkitwidgets/browser/searchlineedit.cpp -+++ b/examples/webkitwidgets/browser/searchlineedit.cpp -@@ -34,6 +34,7 @@ - #include "searchlineedit.h" - - #include -+#include - #include - #include - #include --- -2.26.2 - diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in deleted file mode 100644 index 47bbcbaa68..0000000000 --- a/package/qt5/qt5webkit-examples/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_QT5WEBKIT_EXAMPLES - bool "qt5webkit-examples" - depends on BR2_PACKAGE_QT5WEBKIT - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package contains examples for the qt5webkit module. - - http://qt.io diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash deleted file mode 100644 index ea64f6f14e..0000000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz - -# Hashes for license files: -sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 -sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 -sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 -sha256 d3d9052b838761dbe00067168ed9ebc437734d53ebf71dea1c8e9f7532a5333b LICENSE.GPLv3 diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk deleted file mode 100644 index 84bc291739..0000000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# qt5webkit-examples -# -################################################################################ - -QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 -QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit - -QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 - -QT5WEBKIT_EXAMPLES_LICENSE = LGPL-2.1 with exception or LGPL-3 or GPL-2 or GPL-3 -# Source files contain references to LGPL_EXCEPTION.txt but it is not included -# in the archive. - -ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative -endif - -$(eval $(qmake-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Thu Jan 6 06:59:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 06 Jan 2022 06:59:31 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-05 Message-ID: <20220106065936.D6F5340291@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-05 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 67 | 6 | 0 | 73 | 2021.11.x | 29 | 9 | 0 | 38 | master | 99 | 64 | 0 | 163 | Classification of failures by reason for master ----------------------------------------------- xxhash-0.8.1 | 12 rygel-0.40.2 | 6 unknown | 6 host-file-5.41 | 4 cryptsetup-2.4.2 | 3 host-libsepol-3.3 | 3 mdadm-4.2 | 3 frr-8.1 | 2 gstreamer1-mm-1.10.0 | 2 ksmbd-tools-3.4.3 | 2 suricata-6.0.4 | 2 wavemon-0.9.4 | 2 android-tools-4.2.2+git2013... | 1 bird-2.0.8 | 1 efl-1.26.0 | 1 gstd-0.13.0 | 1 guile-3.0.7 | 1 kf5-kcoreaddons-5.47.0 | 1 libmicrohttpd-0.9.75 | 1 mesa3d-21.3.3 | 1 ndisc6-1.0.5 | 1 nodejs-14.18.2 | 1 opencv4-4.5.5 | 1 openipmi-2.0.32 | 1 qpdf-10.5.0 | 1 qt5webkit-5.212.0-alpha4 | 1 rtorrent-0.9.8 | 1 sg3_utils-1.47 | 1 sslh-1.22c | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/5c34c4db4122594d4a33b42f2ab29b0005f45f26 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/7c873e00ecb154ebd7070d31554e2ad908dddf95 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/8fc16173fa495b4c9536f285da8c8fb0180d80c0 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/338d49a38f9ae0e1c587925569383b1273ecad5a | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/69d83271fe06cf82ccde27d64c8b947e3b888fc5 | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/249e485cf93135e0bc48b4fdfea9daba9cbacf72 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/031511608153e3f52494ce709f73dc4d1c52d71f | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a4285d79815ab441bda9058e47846e19867f8719 | xtensa | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/7a9edf71a709c51672b8756d997bce4b6970822e | ORPH arm | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/6ab28825a1844358670fef8235ae50afc9e01359 | ORPH arc | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/d4e9a50b64c6f2768cb23feab188bae50d7caa77 | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/0447ecb4b424ccea38f004851b9aaa36a465596e | ORPH mips64el | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/f9427462f1cad39a71827ee1be6fcfbd25543d00 | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/64e3f0bebaf4b5b70dc6c4a432d48a10d7350b8c | ORPH powerpc | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/841777ac25cd7d928f16a88eb839ba3712d256cd | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/95ac0e73e3269cd917885d9e76b5d185dfe4fef6 | ORPH arc | host-libsepol-3.3 | NOK | http://autobuild.buildroot.net/results/77f1a65462748e78b3394587c995f2ecdad303e3 | arm | host-libsepol-3.3 | NOK | http://autobuild.buildroot.net/results/fc727efc0c658aaae55c83632a91af83701f0c49 | microblazeel | host-libsepol-3.3 | NOK | http://autobuild.buildroot.net/results/cc560919755e4559bfc01215deb8db65833c7d5f | xtensa | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/33783381177cf57abee850395f1c17b4767b2c48 | arc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/adc2a5095cbcd5fc9736b52976fdc0cfdf7efe3a | mips64el | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/fa88c5bc1924dfb352d9b8dddbb7fdbb192a6b07 | or1k | libmicrohttpd-0.9.75 | NOK | http://autobuild.buildroot.net/results/1320dc178f0170b42e4c861247d4531ddcf270d9 | arc | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/2762e8729ea781cd659de23b7946a9eda09a45af | ORPH arc | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/d7bce4874987695cabf3961db2294f2119000912 | ORPH arm | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/c0f216b7aadb794110409d03dcef7fa58e833cd4 | ORPH arm | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/20469984be330dc93d2873f540a5145e923facd3 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/1a48a65f0eba63e25bc654104f5b608e60921630 | ORPH arm | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/37d59def2590726853c9a107eeb4a2bb8a9212da | sh4 | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/8b2e99ed2866fa85b388d8f86f036b7fa0b7f1e8 | arm | openipmi-2.0.32 | NOK | http://autobuild.buildroot.net/results/d2fbfce984930d2ece1439a3a2b97afafb16859c | ORPH m68k | qpdf-10.5.0 | NOK | http://autobuild.buildroot.net/results/b5eff0f523334c9f34b02a418a172d1eccc536a8 | x86_64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/e94357924c031ab677863edfdff7117ae0c83275 | arc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/10fc9016013931c58238240216c5950b23b56b30 | ORPH xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9f2b3adde62b0bd4135d9c6a41549374de11c81e | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3ddba8cce20a209f5da43ea75cda6deef9fa3669 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f941a1a06d7a63dfeb397dbaf8d1b22bfda816b7 | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1986ade783dd8ebc5ec9bf7ea6d07cd91b74095b | microblazeel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1e9c7f5fe117e84a33b704a3cbdfdeb8bf8cb281 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f9434eff4f7dd913bb076d313556d7ce388ec09d | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/ede0b87fc571b6ab5fc7820cfd4fb937258db160 | arm | sslh-1.22c | NOK | http://autobuild.buildroot.net/results/a99a0291d59cbb38f78e7715b817879b830f7bb9 | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/ce5748005ab564f01ca853a91ab8345934ad7965 | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/9e6c249aff2f887be495f7b07cf0d33378325f62 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/0bfc0eaef4318b2bf4ca6acb8aa491d8a5a29853 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/41ba220cf5578da9a2dc620947a1292bf02e736f | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/b5f9b92e82b80352fedb84246879291559f0a8a4 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/f43f75390ed13fdfdafea281bf2de94f78b6a202 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/4f05c462c7633d2ea25f3bf91f9e9d81505775d0 | arm | unknown | NOK | http://autobuild.buildroot.net/results/10e3df5124bf128dc5dad1d346dfa26770622c1d | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/97e2c5112ca99b4935a25cf457650ba0ff5e205c | m68k | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0bf79e6a0699faddf3a95bf8beae7c1fd73fcff5 | sparc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/1927d514c2b2607b835b18710881f3d9eca8b151 | ORPH xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/118ff013af46c984c9886590c37a58343524f2b2 | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/3d924975ad7bfa7b5fe6a3c10b29d115b3e6f0f5 | ORPH microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/bb5bb1b413882df4c14a494b0764c6c45c9cd9d6 | ORPH i686 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6a3fed60835b4c11727e1340ad67b909e06ae56f | ORPH xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/4b4b3ce17c5947104d00d135f30745a524fc7a98 | ORPH microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/5595b21a711b482b84e582fc9f56e5468c9eb6d6 | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9f2de7ff56fa8299b86734c31cdb7109098693a4 | ORPH xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/54710f0e7a87c4727e347dd1ba112af3f1630b55 | ORPH arc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/db8771c1b87284d2421140ab90872c29c2bcde12 | ORPH arc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6e77ca6f27067c2a18206b0decc557b9946f3252 | ORPH sparc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/b396e5a8c96417802cf62ef80cfe43c1513731a3 | ORPH Classification of failures by reason for 2021.02.x -------------------------------------------------- capnproto-0.8.0 | 1 gobject-introspection-1.64.1 | 1 host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 qt5base-5.15.2 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | capnproto-0.8.0 | NOK | http://autobuild.buildroot.net/results/0c179d0a73a90fb909a644f8e7da95fe42982a99 | x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/a5b0f9a0e5feac089a756fc644eed19adb3dc9e3 | ORPH riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e662ce28adc59f65b4196eeac0c05ff83b4c2177 | i586 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/215f7c809ffdc299f3b1a7d2f136e30df627c6b4 | riscv32 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/1ad57d1c2d333e094cf19a0cc13330436eaa9304 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/12c35e4b2300c06ca2387bb45ebaad564b3e8a3a | Classification of failures by reason for 2021.11.x -------------------------------------------------- wavemon-0.9.4 | 2 bird-2.0.8 | 1 host-erlang-22.2 | 1 libqmi-1.30.2 | 1 log4cxx-0.12.0 | 1 ndisc6-1.0.5 | 1 openal-1.21.1 | 1 unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/37653c4495535948a144dd2aa3cd829480ae65f1 | riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/0c54c3e8216bbc46c157d869403ae8d33753a257 | arm | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/1498610256923e8d10f500d36ada245383ceb2b3 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/6d0d676d652f4c7578dae92646b9287d0b65558f | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/4a382bd2c960928574ef6f2572f0de1fe2b08c41 | ORPH or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/161a63a40e56dd317a695091ff7f93531c5e56d2 | arm | unknown | NOK | http://autobuild.buildroot.net/results/d2ed51f0508122d7a56c30507800d5f323ebfd19 | sparc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/46634286e31bb978eca22ef65730295c04655de4 | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/c74b91b4f85446d5cee429d48cdd4bb2c820354c | -- http://autobuild.buildroot.net From bugzilla at busybox.net Thu Jan 6 07:59:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 06 Jan 2022 07:59:58 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #3 from Sreedhar Mahadevan --- Would like to update one development from my end. I cloned the lttng-modules package directly from its Github repository: https://github.com/lttng/lttng-modules >From this lttng-modules environment, I tried building lttng-modules v2.13.0 based on the instructions in its README.md file by referencing the custom linux version that I was using (v5.10.x corresponding to Buildroot v2021.05) and it built successfully. When I tried building lttng-modules v2.12.0 and v2.11.0 and I got the exact error which I encountered in the Buildroot environment (reported earlier in this bug report). I see that buildroot v2021.08 and 2021.11 all continue using lttng-modules v2.11.0 and all seem to have the same issue. Is this possibly the reason for the issue? If yes, how do I solve it? I tried hacking into the buildroot/package/lttng-modules/lttng-modules.mk and lttng-modules.hash files but I still faced issues with the wrong sha256 hashes. Can you please help? -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Thu Jan 6 08:28:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 09:28:57 +0100 Subject: [Buildroot] [git commit] package/python-aexpect: new package Message-ID: <20220106082409.A920582A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63b72a7c15bcd56fe1570e3f7ecd43993c0fde90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package was initially requested by Jos?? Pekkarinen, so he is assigned as the maintainer for it. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-aexpect/Config.in | 8 ++++++++ package/python-aexpect/python-aexpect.hash | 5 +++++ package/python-aexpect/python-aexpect.mk | 14 ++++++++++++++ support/testing/tests/package/sample_python_aexpect.py | 1 + support/testing/tests/package/test_python_aexpect.py | 12 ++++++++++++ 7 files changed, 44 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4b04f90ccb..a52a8cfa38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1487,7 +1487,10 @@ F: support/testing/tests/package/test_zfs.py N: Jos?? Pekkarinen F: package/alfred/ F: package/bmx7/ +F: package/python-aexpect/ F: package/softhsm2/ +F: support/testing/tests/package/sample_python_aexpect.py +F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut F: package/at-spi2-atk/ diff --git a/package/Config.in b/package/Config.in index 9f4ab72a80..cb15574746 100644 --- a/package/Config.in +++ b/package/Config.in @@ -891,6 +891,7 @@ endif if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" + source "package/python-aexpect/Config.in" source "package/python-aioblescan/Config.in" source "package/python-aiocoap/Config.in" source "package/python-aioconsole/Config.in" diff --git a/package/python-aexpect/Config.in b/package/python-aexpect/Config.in new file mode 100644 index 0000000000..eddba8e0b7 --- /dev/null +++ b/package/python-aexpect/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AEXPECT + bool "python-aexpect" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Aexpect. + + http://avocado-framework.github.io/ diff --git a/package/python-aexpect/python-aexpect.hash b/package/python-aexpect/python-aexpect.hash new file mode 100644 index 0000000000..efe4f55fb8 --- /dev/null +++ b/package/python-aexpect/python-aexpect.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aexpect/json +md5 d37473ff0024c15938bfe86a543537e6 aexpect-1.6.4.tar.gz +sha256 3998aa84ae54963fd59488f0caa533f6edbb31bc6cb842da09b041cbad56ad88 aexpect-1.6.4.tar.gz +# Locally computed sha256 checksums +sha256 7be26abf35e531a226dc742d2379d42d372cb61f027a6e26477c0e2f1a03bfcb LICENSE diff --git a/package/python-aexpect/python-aexpect.mk b/package/python-aexpect/python-aexpect.mk new file mode 100644 index 0000000000..8b5e165135 --- /dev/null +++ b/package/python-aexpect/python-aexpect.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aexpect +# +################################################################################ + +PYTHON_AEXPECT_VERSION = 1.6.4 +PYTHON_AEXPECT_SOURCE = aexpect-$(PYTHON_AEXPECT_VERSION).tar.gz +PYTHON_AEXPECT_SITE = https://files.pythonhosted.org/packages/3b/22/f87ffa70348dde4597d9314995be89c8d4c7728260033b972a8d691e3f7d +PYTHON_AEXPECT_SETUP_TYPE = setuptools +PYTHON_AEXPECT_LICENSE = GPL-2.0+ +PYTHON_AEXPECT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_aexpect.py b/support/testing/tests/package/sample_python_aexpect.py new file mode 100644 index 0000000000..a31a17bd1d --- /dev/null +++ b/support/testing/tests/package/sample_python_aexpect.py @@ -0,0 +1 @@ +import aexpect diff --git a/support/testing/tests/package/test_python_aexpect.py b/support/testing/tests/package/test_python_aexpect.py new file mode 100644 index 0000000000..5b018399b3 --- /dev/null +++ b/support/testing/tests/package/test_python_aexpect.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Aexpect(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_AEXPECT=y + """ + sample_scripts = ["tests/package/sample_python_aexpect.py"] + timeout = 30 From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] testing/infra: Add docstrings to base test classes Message-ID: <20220106083242.B181283342@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2f11c0cbf312b339ae9c686a7734494a096ec24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It wasn't immediately obvious to me what the two Buildroot base test classes were for, so add docstrings to explain the differences between BRConfigTest and BRTest. Signed-off-by: Thomas Preston Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/infra/basetest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index a97a814441..96c6848dfc 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -29,6 +29,7 @@ MINIMAL_CONFIG = \ class BRConfigTest(unittest.TestCase): + """Test up to the configure stage.""" config = None br2_external = list() downloaddir = None @@ -66,6 +67,7 @@ class BRConfigTest(unittest.TestCase): class BRTest(BRConfigTest): + """Test up to the build stage and instantiate an emulator.""" def __init__(self, names): super(BRTest, self).__init__(names) self.emulator = None From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] .gitlab-ci.yml: update docker to 20220105.2314 Message-ID: <20220106083242.E629783455@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2dee09d36735c1e7c1dcf45fa2de620cc3532299 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A new docker image was created that includes openssh-server. Use this image in CI. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc45744a81..ea4ec20a17 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:20210922.2200 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 stages: - generate-gitlab-ci From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] support/download: Add SFTP support Message-ID: <20220106083242.C847383456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16f660f8ceaa2a6aa0c256a77f08149b449e5a3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add Secure File Transfer Program (SFTP) support using a simple wrapper. SFTP is a common protocol used to transfer files securely between enterprises, but it is not currently supported in Buildroot because all of the packages are usually available via HTTP, git or some other download method. SFTP is similar to FTP but it preforms all operations over an encrypted SSH transport using a specific protocol. This is unlike ftps, which is traditional FTP over an SSL/TLS connection. Signed-off-by: Thomas Preston Signed-off-by: Michael Drake [Arnout: - update documentation with sftp everywhere scp is mentioned; - rename "verbose" variable to "quiet"; - print the sftp command, similar to wget and scp helpers. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in | 4 ++++ docs/manual/adding-packages-generic.txt | 4 +++- docs/manual/prerequisite.txt | 1 + package/pkg-download.mk | 1 + support/download/dl-wrapper | 2 +- support/download/sftp | 41 +++++++++++++++++++++++++++++++++ 6 files changed, 51 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index 3db2c8dcab..f0cd6f48ed 100644 --- a/Config.in +++ b/Config.in @@ -119,6 +119,10 @@ config BR2_SCP string "Secure copy (scp) command" default "scp" +config BR2_SFTP + string "Secure file transfer (sftp) command" + default "sftp" + config BR2_HG string "Mercurial (hg) command" default "hg" diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 2d8a1a71ce..1384466f9b 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -256,7 +256,7 @@ not and can not work as people would expect it should: +scp://[user@]host:filepath+, and that filepath is relative to the user's home directory, so you may want to prepend the path with a slash for absolute paths: - +scp://[user@]host:/absolutepath+. + + +scp://[user@]host:/absolutepath+. The same goes for SFTP URLs. + If +HOST_LIBFOO_SITE+ is not specified, it defaults to +LIBFOO_SITE+. Examples: + @@ -291,6 +291,8 @@ not and can not work as people would expect it should: +ftp://+. ** +scp+ for downloads of tarballs over SSH with scp. Used by default when +LIBFOO_SITE+ begins with +scp://+. + ** +sftp+ for downloads of tarballs over SSH with sftp. Used by + default when +LIBFOO_SITE+ begins with +sftp://+. ** +svn+ for retrieving source code from a Subversion repository. Used by default when +LIBFOO_SITE+ begins with +svn://+. When a +http://+ Subversion repository URL is specified in diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt index 4e614cfa1b..40071491f8 100644 --- a/docs/manual/prerequisite.txt +++ b/docs/manual/prerequisite.txt @@ -78,6 +78,7 @@ corresponding tool on the host system: ** +mercurial+ ** +rsync+ ** +scp+ +** +sftp+ ** +subversion+ * Java-related packages, if the Java Classpath needs to be built for diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2527ba5c60..5c2bdfdb23 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -15,6 +15,7 @@ export BZR := $(call qstrip,$(BR2_BZR)) export GIT := $(call qstrip,$(BR2_GIT)) export HG := $(call qstrip,$(BR2_HG)) export SCP := $(call qstrip,$(BR2_SCP)) +export SFTP := $(call qstrip,$(BR2_SFTP)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) # Version of the format of the archives we generate in the corresponding diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 3315bd410e..6cf0b89cba 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -88,7 +88,7 @@ main() { backend_urlencode="${uri%%+*}" backend="${backend_urlencode%|*}" case "${backend}" in - git|svn|cvs|bzr|file|scp|hg) ;; + git|svn|cvs|bzr|file|scp|hg|sftp) ;; *) backend="wget" ;; esac uri=${uri#*+} diff --git a/support/download/sftp b/support/download/sftp new file mode 100755 index 0000000000..0a44be7e61 --- /dev/null +++ b/support/download/sftp @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +# We want to catch any unexpected failure, and exit immediately +set -e + +# Download helper for sftp, to be called from the download wrapper script +# +# Options: +# -q Be quiet. +# -o FILE Copy to local file FILE. +# -f FILE Copy from remote file FILE. +# -u URI Download file at URI. +# +# Environment: +# SFTP : the sftp command to call + +quiet= +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do + case "${OPT}" in + q) quiet=-q;; + o) output="${OPTARG}";; + f) filename="${OPTARG}";; + u) uri="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; + \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; + esac +done + +shift $((OPTIND-1)) # Get rid of our options + +# Caller needs to single-quote its arguments to prevent them from +# being expanded a second time (in case there are spaces in them) +_sftp() { + if [ -z "${quiet}" ]; then + printf '%s ' ${SFTP} "${@}"; printf '\n' + fi + # Note: please keep command below aligned with what is printed above + eval ${SFTP} "${@}" +} + +_sftp ${quiet} "${@}" "'${uri}/${filename}'" "'${output}'" From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] support/testing: Add download tests for SCP/SFTP Message-ID: <20220106083242.DAEA583342@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd548e16fbfbe0ceb6fbc7b8d1276e3ef1f292f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add download test infrastructure which starts an OpenSSH server using the sshd binary installed on the Buildroot host. This server can then be used to test the expected usage of the SCP and SFTP download methods. The test creates new SSH keys for the server and client, so that the server can be run as a non-root user. A new test module has been added called `tests.download.sshd` which contains helper methods to create the SSH keys and a class called `OpenSSHDaemon` which handles the sshd server component. The tests download example packages in the br2-external project `ssh`. They check the following conditions for both SCP and SFTP download methods: - Correct hash. - Incorrect hash. - No hash file. The SSH download test infrastructure is based on test_git.py. Signed-off-by: Thomas Preston [Arnout: - remove spurious end-of-line backslash; - remove unnecessary executable bit; - skip test instead of failing if sshd, ssh-keygen, scp or sftp are not found; - decode the output of subprocess; - use subprocess.check_output instead of subprocess.get_output; - use subprocess.check_call instead of manually checking return code; - don't set always-overridden SSHD_PORT_NUMBER in .mk file; - explicitly set sshd options on commandline instead of relying on host /etc/sshd/sshd_config; - let sshd listen only on localhost; - user internal sftp server; - disable BACKUP_SITE, no network is supposed to be accessed; - remove the -bad and -nohash versions; - rename {sftp,scp}-good to plain {sftp,scp}; - move the sftp and scp packages into a single "ssh" external. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../tests/download/br2-external/ssh/Config.in | 0 .../tests/download/br2-external/ssh/external.desc | 1 + .../tests/download/br2-external/ssh/external.mk | 1 + .../download/br2-external/ssh/package/scp/scp.hash | 1 + .../download/br2-external/ssh/package/scp/scp.mk | 17 +++ .../br2-external/ssh/package/sftp/sftp.hash | 1 + .../download/br2-external/ssh/package/sftp/sftp.mk | 17 +++ support/testing/tests/download/sshd.py | 149 +++++++++++++++++++++ .../tests/download/sshd/ssh-test-1.0.tar.xz | Bin 0 -> 232 bytes support/testing/tests/download/test_ssh.py | 62 +++++++++ 10 files changed, 249 insertions(+) diff --git a/support/testing/tests/download/br2-external/ssh/Config.in b/support/testing/tests/download/br2-external/ssh/Config.in new file mode 100644 index 0000000000..e69de29bb2 diff --git a/support/testing/tests/download/br2-external/ssh/external.desc b/support/testing/tests/download/br2-external/ssh/external.desc new file mode 100644 index 0000000000..2fe078edce --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/external.desc @@ -0,0 +1 @@ +name: SSH diff --git a/support/testing/tests/download/br2-external/ssh/external.mk b/support/testing/tests/download/br2-external/ssh/external.mk new file mode 100644 index 0000000000..c8f0dc748e --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_SSH_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/download/br2-external/ssh/package/scp/scp.hash b/support/testing/tests/download/br2-external/ssh/package/scp/scp.hash new file mode 100644 index 0000000000..31353a88ba --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/package/scp/scp.hash @@ -0,0 +1 @@ +sha256 b457c1a37ba7405e8806b93f3d5cc82165db0b0cad25d203f112e32c7a30c0be ssh-test-1.0.tar.xz diff --git a/support/testing/tests/download/br2-external/ssh/package/scp/scp.mk b/support/testing/tests/download/br2-external/ssh/package/scp/scp.mk new file mode 100644 index 0000000000..3451aaf086 --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/package/scp/scp.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# scp +# +################################################################################ + +SCP_VERSION = 1.0 +SCP_SOURCE = ssh-test-$(SCP_VERSION).tar.xz +SCP_SITE = scp://localhost:$(SSHD_TEST_DIR) +SCP_DL_OPTS = \ + -P $(SSHD_PORT_NUMBER) \ + -i $(SSH_IDENTITY) \ + -o "UserKnownHostsFile=/dev/null" \ + -o "StrictHostKeyChecking=no" \ + -o "CheckHostIP=no" + +$(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.hash b/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.hash new file mode 100644 index 0000000000..31353a88ba --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.hash @@ -0,0 +1 @@ +sha256 b457c1a37ba7405e8806b93f3d5cc82165db0b0cad25d203f112e32c7a30c0be ssh-test-1.0.tar.xz diff --git a/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.mk b/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.mk new file mode 100644 index 0000000000..58d91f6a0d --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# sftp +# +################################################################################ + +SFTP_VERSION = 1.0 +SFTP_SOURCE = ssh-test-$(SFTP_VERSION).tar.xz +SFTP_SITE = sftp://localhost/$(SSHD_TEST_DIR) +SFTP_DL_OPTS = \ + -P $(SSHD_PORT_NUMBER) \ + -i $(SSH_IDENTITY) \ + -o "UserKnownHostsFile=/dev/null" \ + -o "StrictHostKeyChecking=no" \ + -o "CheckHostIP=no" + +$(eval $(generic-package)) diff --git a/support/testing/tests/download/sshd.py b/support/testing/tests/download/sshd.py new file mode 100644 index 0000000000..3345f768cc --- /dev/null +++ b/support/testing/tests/download/sshd.py @@ -0,0 +1,149 @@ +import os +import shutil +import subprocess +from unittest import SkipTest + +# subprocess does not kill the child daemon when a test case fails by raising +# an exception. So use pexpect instead. +import pexpect + +import infra + + +SSHD_PORT_INITIAL = 2222 +SSHD_PORT_LAST = SSHD_PORT_INITIAL + 99 +SSHD_PATH = "/usr/sbin/sshd" +SSHD_HOST_DIR = "host" + +# SSHD_KEY_DIR is where the /etc/ssh/ssh_host_*_key files go +SSHD_KEY_DIR = os.path.join(SSHD_HOST_DIR, "etc/ssh") +SSHD_KEY = os.path.join(SSHD_KEY_DIR, "ssh_host_ed25519_key") + +# SSH_CLIENT_KEY_DIR is where the client id_rsa key and authorized_keys files go +SSH_CLIENT_KEY_DIR = os.path.join(SSHD_HOST_DIR, "home/br-user/ssh") +SSH_CLIENT_KEY = os.path.join(SSH_CLIENT_KEY_DIR, "id_rsa") +SSH_AUTH_KEYS_FILE = os.path.join(SSH_CLIENT_KEY_DIR, "authorized_keys") + + +class OpenSSHDaemon(): + + def __init__(self, builddir, logtofile): + """ + Start an OpenSSH SSH Daemon + + In order to support test cases in parallel, select the port the + server will listen to in runtime. Since there is no reliable way + to allocate the port prior to starting the server (another + process in the host machine can use the port between it is + selected from a list and it is really allocated to the server) + try to start the server in a port and in the case it is already + in use, try the next one in the allowed range. + """ + self.daemon = None + self.port = None + + self.logfile = infra.open_log_file(builddir, "sshd", logtofile) + + server_keyfile = os.path.join(builddir, SSHD_KEY) + auth_keys_file = os.path.join(builddir, SSH_AUTH_KEYS_FILE) + daemon_cmd = [SSHD_PATH, + "-D", # or use -ddd to debug + "-e", + "-h", server_keyfile, + "-f", "/dev/null", + "-o", "ListenAddress=localhost", + "-o", "PidFile=none", + "-o", "AuthenticationMethods=publickey", + "-o", "StrictModes=no", + "-o", "Subsystem=sftp internal-sftp", + "-o", "AuthorizedKeysFile={}".format(auth_keys_file)] + for port in range(SSHD_PORT_INITIAL, SSHD_PORT_LAST + 1): + cmd = daemon_cmd + ["-p", "{}".format(port)] + self.logfile.write( + "> starting sshd with '{}'\n".format(" ".join(cmd))) + try: + self.daemon = pexpect.spawn(cmd[0], cmd[1:], logfile=self.logfile, + encoding='utf-8') + except pexpect.exceptions.ExceptionPexpect as e: + self.logfile.write("> {} - skipping\n".format(e)) + raise SkipTest(str(e)) + + ret = self.daemon.expect([ + # Success + "Server listening on .* port {}.".format(port), + # Failure + "Cannot bind any address."]) + if ret == 0: + self.port = port + return + raise SystemError("Could not find a free port to run sshd") + + def stop(self): + if self.daemon is None: + return + self.daemon.terminate(force=True) + + +def generate_keys_server(builddir, logfile): + """Generate keys required to run an OpenSSH Daemon.""" + keyfile = os.path.join(builddir, SSHD_KEY) + if os.path.exists(keyfile): + logfile.write("> SSH server key already exists '{}'".format(keyfile)) + return + + hostdir = os.path.join(builddir, SSHD_HOST_DIR) + keydir = os.path.join(builddir, SSHD_KEY_DIR) + os.makedirs(hostdir, exist_ok=True) + os.makedirs(keydir, exist_ok=True) + + cmd = ["ssh-keygen", "-A", "-f", hostdir] + logfile.write( + "> generating SSH server keys with '{}'\n".format(" ".join(cmd))) + # When ssh-keygen fails to create an SSH server key it doesn't return a + # useful error code. So use check for an error message in the output + # instead. + try: + out = subprocess.check_output(cmd, encoding='utf-8') + except FileNotFoundError: + logfile.write("> ssh-keygen not found - skipping\n") + raise SkipTest("ssh-keygen not found") + + logfile.write(out) + if "Could not save your public key" in out: + raise SystemError("Could not generate SSH server keys") + + +def generate_keys_client(builddir, logfile): + """Generate keys required to log into an OpenSSH Daemon via SCP or SFTP.""" + keyfile = os.path.join(builddir, SSH_CLIENT_KEY) + if os.path.exists(keyfile): + logfile.write("> SSH client key already exists '{}'".format(keyfile)) + return + + keydir = os.path.join(builddir, SSH_CLIENT_KEY_DIR) + os.makedirs(keydir, exist_ok=True) + + cmd = ["ssh-keygen", + "-f", keyfile, + "-b", "2048", + "-t", "rsa", + "-N", "", + "-q"] + logfile.write( + "> generating SSH client keys with '{}'\n".format(" ".join(cmd))) + try: + subprocess.check_call(cmd, stdout=logfile, stderr=logfile) + except FileNotFoundError: + logfile.write("> ssh-keygen not found - skipping\n") + raise SkipTest("ssh-keygen not found") + + # Allow key-based login for this user (so that we can fetch from localhost) + pubkeyfile = os.path.join(keydir, "{}.pub".format(keyfile)) + authfile = os.path.join(keydir, "authorized_keys") + shutil.copy(pubkeyfile, authfile) + + +def generate_keys(builddir, logtofile): + logfile = infra.open_log_file(builddir, "ssh-keygen", logtofile) + generate_keys_server(builddir, logfile) + generate_keys_client(builddir, logfile) diff --git a/support/testing/tests/download/sshd/ssh-test-1.0.tar.xz b/support/testing/tests/download/sshd/ssh-test-1.0.tar.xz new file mode 100644 index 0000000000..bd83d0aff5 Binary files /dev/null and b/support/testing/tests/download/sshd/ssh-test-1.0.tar.xz differ diff --git a/support/testing/tests/download/test_ssh.py b/support/testing/tests/download/test_ssh.py new file mode 100644 index 0000000000..126002a355 --- /dev/null +++ b/support/testing/tests/download/test_ssh.py @@ -0,0 +1,62 @@ +import os +import shutil + +import tests.download.sshd + +import infra + + +class SSHTestBase(infra.basetest.BRConfigTest): + config = infra.basetest.MINIMAL_CONFIG + ''' +BR2_BACKUP_SITE="" +''' + sshd_test_dir = infra.filepath("tests/download/sshd") + sshd = None + + def setUp(self): + super(SSHTestBase, self).setUp() + + self.show_msg("Generating keys") + tests.download.sshd.generate_keys(self.builddir, self.logtofile) + + self.show_msg("Starting sshd") + self.sshd = tests.download.sshd.OpenSSHDaemon(self.builddir, + self.logtofile) + + def tearDown(self): + self.show_msg("Stopping sshd") + if self.sshd: + self.sshd.stop() + super(SSHTestBase, self).tearDown() + + def download_package(self, package): + self.show_msg("Downloading {}".format(package)) + # store downloaded tarball inside the output dir so the test infra + # cleans it up at the end + dl_dir = os.path.join(self.builddir, "dl") + ssh_identity = os.path.join(self.builddir, + tests.download.sshd.SSH_CLIENT_KEY) + # enforce that we test the download + if os.path.exists(dl_dir): + shutil.rmtree(dl_dir) + env = {"BR2_DL_DIR": dl_dir, + "SSHD_PORT_NUMBER": str(self.sshd.port), + "SSHD_TEST_DIR": self.sshd_test_dir, + "SSH_IDENTITY": ssh_identity} + self.b.build(["{}-dirclean".format(package), + "{}-source".format(package)], + env) + + +class TestSCP(SSHTestBase): + br2_external = [infra.filepath("tests/download/br2-external/ssh")] + + def test_run(self): + self.download_package("scp") + + +class TestSFTP(SSHTestBase): + br2_external = [infra.filepath("tests/download/br2-external/ssh")] + + def test_run(self): + self.download_package("sftp") From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] support/docker: Add openssh-server Message-ID: <20220106083242.BA00183455@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5d2400950fc053119bae0ceff047b3c9b4afa45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Install the openssh-server package into the test container. This package, as well as its dependency openssh-client, is required to test SCP and SFTP download methods on the localhost, as if these tools were already installed on the user's machine. Signed-off-by: Thomas Preston Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index ad8704873c..5ca087546e 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -36,6 +36,7 @@ RUN apt-get install -y --no-install-recommends \ libncurses5-dev \ locales \ mercurial \ + openssh-server \ python3 \ python3-flake8 \ python3-nose2 \ From thomas.petazzoni at bootlin.com Thu Jan 6 08:40:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 09:40:59 +0100 Subject: [Buildroot] [PATCH 5/7] package/aexpect: new package In-Reply-To: <20211210141209.1812043-5-jose.pekkarinen@unikie.com> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-5-jose.pekkarinen@unikie.com> Message-ID: <20220106094059.750a7141@windsurf> Hello Jos?, On Fri, 10 Dec 2021 16:12:07 +0200 Jos? Pekkarinen wrote: > Add package to avocado framework's aexpect. > > Signed-off-by: Jos? Pekkarinen > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/aexpect/Config.in | 12 ++++++++++++ > package/aexpect/aexpect.hash | 4 ++++ > package/aexpect/aexpect.mk | 13 +++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/aexpect/Config.in > create mode 100644 package/aexpect/aexpect.hash > create mode 100644 package/aexpect/aexpect.mk So I have "applied", but I put this between quotes because I've basically redone it entirely. First I've named the package python-aexpect because really aexpect is primarily a Python module. I've used scanpypi to generate the package. Also added a test case for it, noticed that the package doesn't work with Python 2 (syntax error when byte-compiling), so I made it Python 3 only. See the final commit: https://git.buildroot.org/buildroot/commit/?id=63b72a7c15bcd56fe1570e3f7ecd43993c0fde90 Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Thu Jan 6 08:43:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 09:43:06 +0100 Subject: [Buildroot] [PATCH v2 0/5] download: Add SFTP support and tests In-Reply-To: <20200415164846.122126-1-thomas.preston@codethink.co.uk> References: <20200415164846.122126-1-thomas.preston@codethink.co.uk> Message-ID: <0e32f7af-81fa-190f-1232-18940703f879@mind.be> Hi all, I finally applied this series. Since Thomas is no longer with CodeThink this is more for the others in Cc. On 15/04/2020 18:48, Thomas Preston wrote: > Hi, > Back in October 2019 I submitted a patch adding an SFTP download method > to Buildroot, however since there were no packages using SFTP the patch > was rejected. > > Yann E. MORIN suggested that it was a valid change however it required > tests to avoid bitrot - since there was no way to verify the SFTP > download method did not break over time without any packages using it. > > In this series I have re-added the SFTP download method and also some > test infrastructure which starts a local SSH server and uses SFTP to > download some test packages in a br2-external project. I've also added > tests for SCP! :D > > For this, I had to update the Dockerfile from Debian Stretch to Buster > which I explain a bit further in the patch. I'm not sure how to test if > this breaks anything else. Will all the tests run in a clean container + > Buildroot project clone? > > You can run the tests like so: > > support/testing/run-tests -o output -d dl \ > tests.download.test_ssh.TestSFTP \ > tests.download.test_ssh.TestSCP > > Thanks! > Thomas > > Thomas Preston (5): > support/docker: Update to debian:buster-20200327 I skipped this one because in the meanwhile we already updated to a more recent Debian. > support/docker: Add openssh-server > testing/infra: Add docstrings to base test classes > download: Add SFTP support (not FTPS) [Arnout: - update documentation with sftp everywhere scp is mentioned; - rename "verbose" variable to "quiet"; - print the sftp command, similar to wget and scp helpers. ] > support/testing: Add download tests for SCP/SFTP [Arnout: - remove spurious end-of-line backslash; - remove unnecessary executable bit; - skip test instead of failing if sshd, ssh-keygen, scp or sftp are not found; - decode the output of subprocess; - use subprocess.check_output instead of subprocess.get_output; - use subprocess.check_call instead of manually checking return code; - don't set always-overridden SSHD_PORT_NUMBER in .mk file; - explicitly set sshd options on commandline instead of relying on host /etc/sshd/sshd_config; - let sshd listen only on localhost; - user internal sftp server; - disable BACKUP_SITE, no network is supposed to be accessed; - remove the -bad and -nohash versions; - rename {sftp,scp}-good to plain {sftp,scp}; - move the sftp and scp packages into a single "ssh" external. ] > > .gitlab-ci.yml | 2 + > Config.in | 4 + > package/pkg-download.mk | 1 + > support/docker/Dockerfile | 3 +- > support/docker/apt-sources.list | 8 +- > support/download/dl-wrapper | 2 +- > support/download/sftp | 37 +++++ > support/testing/infra/basetest.py | 2 + > .../tests/download/br2-external/scp/Config.in | 0 > .../download/br2-external/scp/external.desc | 1 + > .../download/br2-external/scp/external.mk | 4 + > .../scp/package/scp-bad/scp-bad.hash | 1 + > .../scp/package/scp-bad/scp-bad.mk | 17 +++ > .../scp/package/scp-good/scp-good.hash | 1 + > .../scp/package/scp-good/scp-good.mk | 17 +++ > .../scp/package/scp-nohash/scp-nohash.mk | 17 +++ > .../download/br2-external/sftp/Config.in | 0 > .../download/br2-external/sftp/external.desc | 1 + > .../download/br2-external/sftp/external.mk | 4 + > .../sftp/package/sftp-bad/sftp-bad.hash | 1 + > .../sftp/package/sftp-bad/sftp-bad.mk | 17 +++ > .../sftp/package/sftp-good/sftp-good.hash | 1 + > .../sftp/package/sftp-good/sftp-good.mk | 17 +++ > .../sftp/package/sftp-nohash/sftp-nohash.mk | 17 +++ > support/testing/tests/download/sshd.py | 129 ++++++++++++++++++ > .../tests/download/sshd/ssh-test-1.0.tar.xz | Bin 0 -> 232 bytes > support/testing/tests/download/test_ssh.py | 66 +++++++++ > 27 files changed, 364 insertions(+), 6 deletions(-) > create mode 100755 support/download/sftp > create mode 100644 support/testing/tests/download/br2-external/scp/Config.in > create mode 100644 support/testing/tests/download/br2-external/scp/external.desc > create mode 100644 support/testing/tests/download/br2-external/scp/external.mk > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-bad/scp-bad.hash > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-bad/scp-bad.mk > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-good/scp-good.hash > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-good/scp-good.mk > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-nohash/scp-nohash.mk > create mode 100644 support/testing/tests/download/br2-external/sftp/Config.in > create mode 100644 support/testing/tests/download/br2-external/sftp/external.desc > create mode 100644 support/testing/tests/download/br2-external/sftp/external.mk > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-bad/sftp-bad.hash > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-bad/sftp-bad.mk > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-good/sftp-good.hash > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-good/sftp-good.mk > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-nohash/sftp-nohash.mk > create mode 100644 support/testing/tests/download/sshd.py > create mode 100644 support/testing/tests/download/sshd/ssh-test-1.0.tar.xz > create mode 100755 support/testing/tests/download/test_ssh.py > From romain.naour at smile.fr Thu Jan 6 09:24:53 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 10:24:53 +0100 Subject: [Buildroot] package/aravis: new package In-Reply-To: References: Message-ID: Hello Marc, Le 05/01/2022 ? 16:57, marc.chalain at mailoo.org a ?crit?: > Hello and Happy new year, > > > > I propose the integration of a camera capture library: > > > > Aravis is a library to help GigE camera capture. > https://github.com/AravisProject/aravis/releases/tag/0.8.16 > This rules install on target: > ?libaravis > ?arv-camera-test > ?arv-fake-gv-camera > ?arv-test > ?arv-tool > and on staging > ?aravis/*.h > > Signed-off-by: Marc Chalain > --- > ?DEVELOPERS???????????????? |? 3 +++ > ?package/Config.in????????? |? 1 + > ?package/aravis/Config.in?? | 16 ++++++++++++++++ > ?package/aravis/aravis.hash |? 1 + > ?package/aravis/aravis.mk?? | 20 ++++++++++++++++++++ > ?5 files changed, 41 insertions(+) > ?create mode 100644 package/aravis/Config.in > ?create mode 100644 package/aravis/aravis.hash > ?create mode 100644 package/aravis/aravis.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 6dc2e68e42..05c1c3c921 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1653,6 +1653,9 @@ N:??? Manuel V?gele > ?F:??? package/python-pyqt5/ > ?F:??? package/python-requests-toolbelt/ > ? > +N:??? Marc Chalain > +F:??? package/aravis Missing '/' at the end of the line > + > ?N:??? Marcin Bis > ?F:??? package/bluez5_utils/ > ?F:??? package/cc-tool/ > diff --git a/package/Config.in b/package/Config.in > index 9fed0ab4cb..2a1781afe9 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1698,6 +1698,7 @@ menu "Logging" > ?endmenu > ? > ?menu "Multimedia" > +??? source "package/aravis/Config.in" Probably more related to "Hardware Handling" since it support camera devices. > ???? source "package/bitstream/Config.in" > ???? source "package/dav1d/Config.in" > ???? source "package/kvazaar/Config.in" > diff --git a/package/aravis/Config.in b/package/aravis/Config.in > new file mode 100644 > index 0000000000..02c71c44da > --- /dev/null > +++ b/package/aravis/Config.in > @@ -0,0 +1,16 @@ > +config BR2_PACKAGE_ARAVIS > +??? bool "aravis - GigE Camera" > +??? depends on BR2_USE_WCHAR > +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > +??? depends on BR2_PACKAGE_PCRE_16 > +??? depends on BR2_PACKAGE_PCRE_32 > +??? select BR2_PACKAGE_LIBGLIB2 > +??? select BR2_PACKAGE_LIBXML2 > +??? help > +??? ? aravis provides the support of GigE camera > +??? ? and USB3Vision camera. Add an empty line Also use check-package script to check the coding style. > +??? ? https://github.com/AravisProject/aravis > + > +comment "aravis needs a toolchain w/ wchar, NPTL, PCRE 16/32" > +??? depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ > +??? !BR2_PACKAGE_PCRE_16 || !BR2_PACKAGE_PCRE_32 > diff --git a/package/aravis/aravis.hash b/package/aravis/aravis.hash > new file mode 100644 > index 0000000000..f8512491ec > --- /dev/null > +++ b/package/aravis/aravis.hash > @@ -0,0 +1 @@ > +sha256 057166753443acc115259ca1f74bd1b28ed4d48f35261cb248eafb8f86664bc7 aravis-0.8.16.tar.gz Add the license file hash here (COPYING) > diff --git a/package/aravis/aravis.mk b/package/aravis/aravis.mk > new file mode 100644 > index 0000000000..bd783a0374 > --- /dev/null > +++ b/package/aravis/aravis.mk > @@ -0,0 +1,20 @@ > +################################################################################ > +# > +# aravis > +# > +################################################################################ > + > +ARAVIS_VERSION = 0.8.16 Aravis project is moving fast, there is a new version 0.8.20 already. I'm fine with this version since it was released recently: https://github.com/AravisProject/aravis/releases/tag/0.8.16 > +ARAVIS_SITE = $(call github,AravisProject,aravis,$(ARAVIS_VERSION)) > +ARAVIS_DEPENDENCIES = \ > +??? host-pkgconf \ > +??? libglib2 \ > +??? libxml2 There is a list of dependencies in the Readme: https://github.com/AravisProject/aravis/blob/main/README.md#install-dependencies-on-ubuntu-2004 especially gstreamer and plugins etc.. > +ARAVIS_INSTALL_STAGING = YES > +ARAVIS_LICENSE = LGPL-2 It's a LGPL-2.1 license. > +ARAVIS_LICENSE_FILES = COPYING > +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) Is gettext a mandatory dependency ? At least gettext should be in ARAVIS_DEPENDENCIES when NLS support is enabled. I recommend to use test-pkg script to stress the buildsystem. Thanks to a recent change, you can test your package with test-pkg in gitlab-ci: https://gitlab.com/buildroot.org/buildroot/-/commit/12c7a05da154f2056d0a2a1a72f5d066b8d7b87e Can you send an updated version of your patch? Best regards, Romain > + > +ARAVIS_CONF_OPTS += -Ddocumentation=disabled > + > +$(eval $(meson-package)) > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Thu Jan 6 09:27:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 10:27:39 +0100 Subject: [Buildroot] [git commit] support/testing/tests/download/sshd.py: fix flake8 warning Message-ID: <20220106092256.C7BCE8343E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=007b5b483f2505c7af1f8b466b0f1b96e41d21fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master support/testing/tests/download/sshd.py:50:28: E261 at least two spaces before inline comment 1 E261 at least two spaces before inline comment Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/download/sshd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/download/sshd.py b/support/testing/tests/download/sshd.py index 3345f768cc..6555f0499f 100644 --- a/support/testing/tests/download/sshd.py +++ b/support/testing/tests/download/sshd.py @@ -47,7 +47,7 @@ class OpenSSHDaemon(): server_keyfile = os.path.join(builddir, SSHD_KEY) auth_keys_file = os.path.join(builddir, SSH_AUTH_KEYS_FILE) daemon_cmd = [SSHD_PATH, - "-D", # or use -ddd to debug + "-D", # or use -ddd to debug "-e", "-h", server_keyfile, "-f", "/dev/null", From thomas.petazzoni at bootlin.com Thu Jan 6 09:37:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 10:37:59 +0100 Subject: [Buildroot] package/aravis: new package In-Reply-To: References: Message-ID: <20220106103759.1166357c@windsurf> Hello, On Thu, 6 Jan 2022 10:24:53 +0100 Romain Naour wrote: > > diff --git a/package/aravis/Config.in b/package/aravis/Config.in > > new file mode 100644 > > index 0000000000..02c71c44da > > --- /dev/null > > +++ b/package/aravis/Config.in > > @@ -0,0 +1,16 @@ > > +config BR2_PACKAGE_ARAVIS > > +??? bool "aravis - GigE Camera" Just: bool "aravis" > > +??? depends on BR2_USE_WCHAR > > +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > > +??? depends on BR2_PACKAGE_PCRE_16 > > +??? depends on BR2_PACKAGE_PCRE_32 Please use "select" for pcre. > > +ARAVIS_LICENSE_FILES = COPYING > > +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) > > Is gettext a mandatory dependency ? > At least gettext should be in ARAVIS_DEPENDENCIES when NLS support is enabled. No, don't add gettext directly, use $(TARGET_NLS_DEPENDENCIES), which will automatically add (or not) host-gettext and/or gettext to the dependencies, depending on when it's needed or not. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Thu Jan 6 09:39:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 10:39:57 +0100 Subject: [Buildroot] call with hooks In-Reply-To: References: Message-ID: On 05/01/2022 17:20, Danomi Manchego wrote: > Hello all, > > I noticed a possible inconsistency, and thought I should post it. > Looking at places where buildroot uses hooks: > > $ grep -r '$(hook))$(sep)' . [snip] > > Notice that the one hit in Makefile uses "$($(hook))$(sep)" while the > hits in pkg-generic.mk use "$(call $(hook))$(sep)". My Make-fu isn't > powerful enough to understand if there is an actual problem - should > there be a "call" in the Makefile line? The general syntax for call > is "$(call variable,param,param,?)" so I don't follow what the extra > call in $(call $(hook) is doing for us. Historical accident. The person who first introduced the hooks back in the days didn't realize that $(call ...) is not for "something that looks like a function", but rather it is for "whenever you want to pass arguments". Reviewers also didn't realize this and just applied, and when more hooks were added later they copied the pattern. Regards, Arnout > > Thanks, > Danomi - > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Thu Jan 6 09:45:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 10:45:21 +0100 Subject: [Buildroot] Overriding Kconfig Values from external br2 In-Reply-To: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> References: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> Message-ID: <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> On 05/01/2022 20:03, Jesse Millwood wrote: > Hello, > > I have an external C/C++ toolchain that I've put together that uses MUSL. I've > also built an external Rust toolchain that uses my MUSL toolchain. > > My issue is that there is a Rust Kconfig variable that specifies if a specific > architecture supports Rust. > > The Kconfig variable in question is BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > in package/rustc/Config.in.host. [snip] > You may notice that I changed the libc depends line to be or'd with > BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get considered when I > choose my external musl toolchain option. In the menuconfig when I search for > the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with the "/" key it > looks like it is only getting it from the original file. Does buildroot have a > mechanism for overwriting this kind of setting and if not, does anyone have an > idea of how I would accomplish what I am trying to do (make buildroot honor my > external rust toolchain)? No, there's no way to override the dependencies of an existing Config.in symbol in an external. However, this was corrected in upstream Buildroot in commit d69d40c029dc7d8199b745eaee759d92b66c5d17. So you can try to backport that commit instead, or just update Buildroot to something more recent. Regards, Arnout > > Thanks, > Jesse > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Thu Jan 6 09:46:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 10:46:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit-examples: remove package In-Reply-To: <20220106063308.3132088-1-james.hilliard1@gmail.com> References: <20220106063308.3132088-1-james.hilliard1@gmail.com> Message-ID: <20220106094633.GM614810@scaer> James, All, On 2022-01-05 23:33 -0700, James Hilliard spake thusly: > This package seems to have issues building with the latest > qt5webkit release, as it has not received updates upstream > since 2017 remove it as it is unlikely to be fixed. Furthermore, it is no longer available upstream: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules Not Found The requested URL was not found on this server. So, applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > Config.in.legacy | 7 ++ > .../0001-Build-examples.patch | 52 ------------- > .../0002-Fix-QWebView-path.patch | 73 ------------------- > .../0003-Fix-QPainterPath-include.patch | 36 --------- > package/qt5/qt5webkit-examples/Config.in | 10 --- > .../qt5webkit-examples.hash | 8 -- > .../qt5webkit-examples/qt5webkit-examples.mk | 26 ------- > 7 files changed, 7 insertions(+), 205 deletions(-) > delete mode 100644 package/qt5/qt5webkit-examples/0001-Build-examples.patch > delete mode 100644 package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch > delete mode 100644 package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch > delete mode 100644 package/qt5/qt5webkit-examples/Config.in > delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash > delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index e5349e58ac..004506e4bb 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES > + bool "qt5webkit-examples removed" > + select BR2_LEGACY > + help > + The qt5webkit-examples package is unmaintained and has been > + removed. > + > config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE > bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" > select BR2_LEGACY > diff --git a/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/package/qt5/qt5webkit-examples/0001-Build-examples.patch > deleted file mode 100644 > index cd925e21c5..0000000000 > --- a/package/qt5/qt5webkit-examples/0001-Build-examples.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001 > -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= > -Date: Tue, 28 Nov 2017 23:14:42 -0500 > -Subject: [PATCH] Build examples > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=utf-8 > -Content-Transfer-Encoding: 8bit > - > -This patch improves the qt5webkit examples build for 2 aspects: > - > - - Allows to build even if qt5base examples are not enabled > - - Builds xmlpatterns example only if the qt5xmlpattern package > - has been built > - > -Signed-off-by: Massimo Callegari > -Signed-off-by: Ga?l PORTAY > -[gportay: build imageanalyzer example if concurrent module is built] > ---- > - examples/webkitwidgets/webkitwidgets.pro | 7 ++++--- > - qtwebkit-examples.pro | 1 + > - 2 files changed, 5 insertions(+), 3 deletions(-) > - > -diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro > -index ab20df4..67f6785 100644 > ---- a/examples/webkitwidgets/webkitwidgets.pro > -+++ b/examples/webkitwidgets/webkitwidgets.pro > -@@ -4,9 +4,10 @@ SUBDIRS += domtraversal \ > - previewer \ > - fancybrowser \ > - simpleselector \ > -- imageanalyzer \ > - framecapture \ > - browser \ > - embedded \ > -- scroller \ > -- xmlpatterns > -+ scroller > -+ > -+qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns > -+qtHaveModule(concurrent): SUBDIRS += imageanalyzer > -diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro > -index 3fcecf1..2ade7ff 100644 > ---- a/qtwebkit-examples.pro > -+++ b/qtwebkit-examples.pro > -@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit)) > - load(qt_parts) > - > - SUBDIRS += doc > -+SUBDIRS += examples > --- > -2.15.0 > - > diff --git a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch > deleted file mode 100644 > index 30aab30167..0000000000 > --- a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch > +++ /dev/null > @@ -1,73 +0,0 @@ > -From 9fa73707216bd55dff380031a33aca701a7d9c8b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 12 May 2019 23:29:05 +0200 > -Subject: [PATCH] Fix QWebView path > - > -QWebView is installed under QtWebKitWidgets > - > -Fixes: > - - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e > - > -Signed-off-by: Fabrice Fontaine > ---- > - examples/webkitwidgets/formextractor/formextractor.ui | 2 +- > - examples/webkitwidgets/previewer/previewer.ui | 2 +- > - examples/webkitwidgets/simpleselector/window.ui | 2 +- > - .../xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui | 2 +- > - 4 files changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/examples/webkitwidgets/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui > -index 5c4afec..a38bdd5 100644 > ---- a/examples/webkitwidgets/formextractor/formextractor.ui > -+++ b/examples/webkitwidgets/formextractor/formextractor.ui > -@@ -151,7 +151,7 @@ > - > - QWebView > - QWidget > --
QtWebKit/QWebView
> -+
QtWebKitWidgets/QWebView
> - > - > - > -diff --git a/examples/webkitwidgets/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui > -index d4c9992..69adb2e 100644 > ---- a/examples/webkitwidgets/previewer/previewer.ui > -+++ b/examples/webkitwidgets/previewer/previewer.ui > -@@ -74,7 +74,7 @@ > - > - QWebView > - QWidget > --
QtWebKit/QWebView
> -+
QtWebKitWidgets/QWebView
> - > - > - > -diff --git a/examples/webkitwidgets/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui > -index aa824df..7906186 100644 > ---- a/examples/webkitwidgets/simpleselector/window.ui > -+++ b/examples/webkitwidgets/simpleselector/window.ui > -@@ -64,7 +64,7 @@ > - > - QWebView > - QWidget > --
QtWebKit/QWebView
> -+
QtWebKitWidgets/QWebView
> - > - > - > -diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui > -index ad43284..000cae7 100644 > ---- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui > -+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui > -@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; } > - > - QWebView > - QWidget > --
QtWebKit/QWebView
> -+
QtWebKitWidgets/QWebView
> - > - > - > --- > -2.20.1 > - > diff --git a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch b/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch > deleted file mode 100644 > index 2d5e8fae9a..0000000000 > --- a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 452123a4491b26c5b078934477bd5864f1d004e4 Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer > -Date: Thu, 28 May 2020 20:58:26 +0200 > -Subject: [PATCH] Fix QPainterPath include > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Add missing QPainterPath (needed for Qt-5.15.0 compile). > - > -Fixes: > - > - searchlineedit.cpp:121:18: error: aggregate ?QPainterPath myPath? has incomplete type and cannot be defined > - QPainterPath myPath; > - ^~~~~~ > - > -Signed-off-by: Peter Seiderer > ---- > - examples/webkitwidgets/browser/searchlineedit.cpp | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/examples/webkitwidgets/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp > -index fbd73cb..7462c82 100644 > ---- a/examples/webkitwidgets/browser/searchlineedit.cpp > -+++ b/examples/webkitwidgets/browser/searchlineedit.cpp > -@@ -34,6 +34,7 @@ > - #include "searchlineedit.h" > - > - #include > -+#include > - #include > - #include > - #include > --- > -2.26.2 > - > diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in > deleted file mode 100644 > index 47bbcbaa68..0000000000 > --- a/package/qt5/qt5webkit-examples/Config.in > +++ /dev/null > @@ -1,10 +0,0 @@ > -config BR2_PACKAGE_QT5WEBKIT_EXAMPLES > - bool "qt5webkit-examples" > - depends on BR2_PACKAGE_QT5WEBKIT > - help > - Qt is a cross-platform application and UI framework for > - developers using C++. > - > - This package contains examples for the qt5webkit module. > - > - http://qt.io > diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash > deleted file mode 100644 > index ea64f6f14e..0000000000 > --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash > +++ /dev/null > @@ -1,8 +0,0 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist > -sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz > - > -# Hashes for license files: > -sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 > -sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 > -sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 > -sha256 d3d9052b838761dbe00067168ed9ebc437734d53ebf71dea1c8e9f7532a5333b LICENSE.GPLv3 > diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > deleted file mode 100644 > index 84bc291739..0000000000 > --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > +++ /dev/null > @@ -1,26 +0,0 @@ > -################################################################################ > -# > -# qt5webkit-examples > -# > -################################################################################ > - > -QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 > -QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > -QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit > - > -QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 > - > -QT5WEBKIT_EXAMPLES_LICENSE = LGPL-2.1 with exception or LGPL-3 or GPL-2 or GPL-3 > -# Source files contain references to LGPL_EXCEPTION.txt but it is not included > -# in the archive. > - > -ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) > -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns > -endif > - > -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative > -endif > - > -$(eval $(qmake-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 6 09:45:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 10:45:02 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit-examples: remove package Message-ID: <20220106094059.6C6478345E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4841d722fb37f8c8c4715c7fe8b2502c9a3a9dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package seems to have issues building with the latest qt5webkit release, as it has not received updates upstream since 2017 remove it as it is unlikely to be fixed. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++ .../qt5webkit-examples/0001-Build-examples.patch | 52 --------------- .../0002-Fix-QWebView-path.patch | 73 ---------------------- .../0003-Fix-QPainterPath-include.patch | 36 ----------- package/qt5/qt5webkit-examples/Config.in | 10 --- .../qt5/qt5webkit-examples/qt5webkit-examples.hash | 8 --- .../qt5/qt5webkit-examples/qt5webkit-examples.mk | 26 -------- 7 files changed, 7 insertions(+), 205 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e5349e58ac..004506e4bb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES + bool "qt5webkit-examples removed" + select BR2_LEGACY + help + The qt5webkit-examples package is unmaintained and has been + removed. + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" select BR2_LEGACY diff --git a/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/package/qt5/qt5webkit-examples/0001-Build-examples.patch deleted file mode 100644 index cd925e21c5..0000000000 --- a/package/qt5/qt5webkit-examples/0001-Build-examples.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 28 Nov 2017 23:14:42 -0500 -Subject: [PATCH] Build examples -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -This patch improves the qt5webkit examples build for 2 aspects: - - - Allows to build even if qt5base examples are not enabled - - Builds xmlpatterns example only if the qt5xmlpattern package - has been built - -Signed-off-by: Massimo Callegari -Signed-off-by: Ga??l PORTAY -[gportay: build imageanalyzer example if concurrent module is built] ---- - examples/webkitwidgets/webkitwidgets.pro | 7 ++++--- - qtwebkit-examples.pro | 1 + - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro -index ab20df4..67f6785 100644 ---- a/examples/webkitwidgets/webkitwidgets.pro -+++ b/examples/webkitwidgets/webkitwidgets.pro -@@ -4,9 +4,10 @@ SUBDIRS += domtraversal \ - previewer \ - fancybrowser \ - simpleselector \ -- imageanalyzer \ - framecapture \ - browser \ - embedded \ -- scroller \ -- xmlpatterns -+ scroller -+ -+qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns -+qtHaveModule(concurrent): SUBDIRS += imageanalyzer -diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro -index 3fcecf1..2ade7ff 100644 ---- a/qtwebkit-examples.pro -+++ b/qtwebkit-examples.pro -@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit)) - load(qt_parts) - - SUBDIRS += doc -+SUBDIRS += examples --- -2.15.0 - diff --git a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch deleted file mode 100644 index 30aab30167..0000000000 --- a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9fa73707216bd55dff380031a33aca701a7d9c8b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 May 2019 23:29:05 +0200 -Subject: [PATCH] Fix QWebView path - -QWebView is installed under QtWebKitWidgets - -Fixes: - - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e - -Signed-off-by: Fabrice Fontaine ---- - examples/webkitwidgets/formextractor/formextractor.ui | 2 +- - examples/webkitwidgets/previewer/previewer.ui | 2 +- - examples/webkitwidgets/simpleselector/window.ui | 2 +- - .../xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/examples/webkitwidgets/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui -index 5c4afec..a38bdd5 100644 ---- a/examples/webkitwidgets/formextractor/formextractor.ui -+++ b/examples/webkitwidgets/formextractor/formextractor.ui -@@ -151,7 +151,7 @@ - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - -diff --git a/examples/webkitwidgets/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui -index d4c9992..69adb2e 100644 ---- a/examples/webkitwidgets/previewer/previewer.ui -+++ b/examples/webkitwidgets/previewer/previewer.ui -@@ -74,7 +74,7 @@ - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - -diff --git a/examples/webkitwidgets/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui -index aa824df..7906186 100644 ---- a/examples/webkitwidgets/simpleselector/window.ui -+++ b/examples/webkitwidgets/simpleselector/window.ui -@@ -64,7 +64,7 @@ - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - -diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -index ad43284..000cae7 100644 ---- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; } - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - --- -2.20.1 - diff --git a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch b/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch deleted file mode 100644 index 2d5e8fae9a..0000000000 --- a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 452123a4491b26c5b078934477bd5864f1d004e4 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 28 May 2020 20:58:26 +0200 -Subject: [PATCH] Fix QPainterPath include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add missing QPainterPath (needed for Qt-5.15.0 compile). - -Fixes: - - searchlineedit.cpp:121:18: error: aggregate ???QPainterPath myPath??? has incomplete type and cannot be defined - QPainterPath myPath; - ^~~~~~ - -Signed-off-by: Peter Seiderer ---- - examples/webkitwidgets/browser/searchlineedit.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/webkitwidgets/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp -index fbd73cb..7462c82 100644 ---- a/examples/webkitwidgets/browser/searchlineedit.cpp -+++ b/examples/webkitwidgets/browser/searchlineedit.cpp -@@ -34,6 +34,7 @@ - #include "searchlineedit.h" - - #include -+#include - #include - #include - #include --- -2.26.2 - diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in deleted file mode 100644 index 47bbcbaa68..0000000000 --- a/package/qt5/qt5webkit-examples/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_QT5WEBKIT_EXAMPLES - bool "qt5webkit-examples" - depends on BR2_PACKAGE_QT5WEBKIT - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package contains examples for the qt5webkit module. - - http://qt.io diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash deleted file mode 100644 index ea64f6f14e..0000000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz - -# Hashes for license files: -sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 -sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 -sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 -sha256 d3d9052b838761dbe00067168ed9ebc437734d53ebf71dea1c8e9f7532a5333b LICENSE.GPLv3 diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk deleted file mode 100644 index 84bc291739..0000000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# qt5webkit-examples -# -################################################################################ - -QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 -QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit - -QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 - -QT5WEBKIT_EXAMPLES_LICENSE = LGPL-2.1 with exception or LGPL-3 or GPL-2 or GPL-3 -# Source files contain references to LGPL_EXCEPTION.txt but it is not included -# in the archive. - -ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative -endif - -$(eval $(qmake-package)) From yann.morin.1998 at free.fr Thu Jan 6 10:31:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 11:31:49 +0100 Subject: [Buildroot] [PATCH v3 3/3] fs/cpio: new option to use dracut tool In-Reply-To: <20211223111348.3532601-3-thierry.bultel@linatsea.fr> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-3-thierry.bultel@linatsea.fr> Message-ID: <20220106103149.GN614810@scaer> Thierry, All, On 2021-12-23 12:13 +0100, Thierry Bultel spake thusly: > Adds an option to invoke the dracut host tool, providing > a configuration file, instead of having a full cpio archive > of the whole target directory. > > Signed-off-by: Thierry Bultel [--SNIP--] > diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in > index c1151a2881..3d0f963a8d 100644 > --- a/fs/cpio/Config.in > +++ b/fs/cpio/Config.in > @@ -7,6 +7,33 @@ config BR2_TARGET_ROOTFS_CPIO > > if BR2_TARGET_ROOTFS_CPIO > > +choice > + prompt "cpio type" Missing empty line between the choice prompt and the first choice entry. > +config BR2_TARGET_ROOTFS_CPIO_FULL > + bool "cpio the whole root filesystem (ie the content of 'target')" > + help > + Build a cpio archive containing the whole the root filesystem. > + > +config BR2_TARGET_ROOTFS_CPIO_DRACUT > + bool "Invoke dracut to make an initramfs" > + select BR2_PACKAGE_HOST_DRACUT > + select BR2_PACKAGE_HOST_UBOOT_TOOLS > + help > + Builds an additional initramfs using dracut. > + This can be useful to create a recovery system, > + for instance. > + > +if BR2_TARGET_ROOTFS_CPIO_DRACUT > +config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE > + string "configuration file" > +endif Don't add the option in the choice, but outside of it. > diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk > index 81f8c393d1..e0e0eb2b1e 100644 > --- a/fs/cpio/cpio.mk > +++ b/fs/cpio/cpio.mk > @@ -29,6 +29,41 @@ endif # BR2_ROOTFS_DEVICE_CREATION_STATIC > > ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT > > +ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) > + > +export TARGET_CROSS Don't do such a global export. If you need it in the environment, then do so when calling the utility, like: TARGET_CROSS="$(TARGET_CROSS)" \ $(HOST_DIR)/bin/dracut \ blabla other options... > +ROOTFS_CPIO_DEPENDENCIES += host-dracut > + > +ifeq ($(BR2_LINUX_KERNEL),y) > +ROOTFS_CPIO_DEPENDENCIES += linux > +endif > + > +ifeq ($(BR_BUILDING).$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE),y.) > +$(error No dracut config file name specified, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE setting) > +endif > + > +ifeq ($(BR2_LINUX_KERNEL),y) > +ROOTFS_CPIO_DRACUT_CMD_OPTS += --kver $(LINUX_VERSION_PROBED) > +else > +ROOTFS_CPIO_DRACUT_CMD_OPTS += --no-kernel > +endif > + > +define ROOTFS_CPIO_CMD > + mkdir -p $(@D)/tmp > + rm -rf $(@D)/tmp/* The $(@D) for ROOTFS_*_CMD is $(BINARIES_DIR), i.e. output/images/ and so creating a te,mporary directory in there is not so nice. You should use $(ROOTFS_CPIO_DIR)/tmp Also, if I understand correctly, you are doing this mkdir+rm trick to ensure you have an empty tmp directory to start with. By using $(ROOTFS_CPIO_DIR) as base, this will be guaranteed, because $(ROOTFS_CPIO_DIR) is removed and recreated before running the fs commands. > + $(HOST_DIR)/usr/bin/dracut_wrapper.sh \ > + $(ROOTFS_CPIO_DRACUT_CMD_OPTS) \ > + -c $(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE) \ > + --tmpdir $(@D)/tmp \ > + -M \ > + --force \ > + --keep \ > + $@ > +endef > + > +else ifeq ($(BR2_TARGET_ROOTFS_CPIO_FULL),y) Please, keep the original, plain cpio first in the code, and add the dracut specificities after. > # --reproducible option was introduced in cpio v2.12, which may not be > # available in some old distributions, so we build host-cpio > ifeq ($(BR2_REPRODUCIBLE),y) > @@ -53,4 +88,6 @@ endef > ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE > endif > > +endif #BR2_TARGET_ROOTFS_CPIO_DRACUT > + > $(eval $(rootfs)) > diff --git a/support/testing/conf/dracut.conf b/support/testing/conf/dracut.conf > new file mode 100644 > index 0000000000..eb793a3562 > --- /dev/null > +++ b/support/testing/conf/dracut.conf > @@ -0,0 +1,93 @@ > +#Yuco dracut config "Yuco"? > +#Dracut configuration > + > +show_modules=yes > +i18n_install_all=no > +lvmconf=no > +mdadmconf=no > +early_microcode=no > +hostonly=no > +hostonly_cmdline=no > +use_fstab=no > +kernel_cmdline="rd.break=initqueue" > +do_strip=no > + > +# Dracut modules need > +add_dracutmodules+=" \ > +busybox-buildroot \ > +bash > +" > + > +# Modules to ignore > +omit_dracutmodules+=" \ [--SNIP big list of stuff--] > +" Rather than remove select stuff, can't we just start from an empty set and add just what is needed? Regards, Yann E. MORIN. > + > diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py > new file mode 100644 > index 0000000000..5570693dc2 > --- /dev/null > +++ b/support/testing/tests/fs/test_cpio.py > @@ -0,0 +1,44 @@ > +import os > +import infra.basetest > + > +CHECK_FS_CMD = "mount | grep 'rootfs on / type rootfs'" > + > +def boot_img(emulator, builddir): > + img = os.path.join(builddir, "images", "rootfs.cpio") > + emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", "{}".format(img)]) > + emulator.login() > + _, exit_code = emulator.run(CHECK_FS_CMD) > + return exit_code > + > +class TestCpioDracut(infra.basetest.BRTest): > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_INIT_BUSYBOX=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_DRACUT=y > + BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE="{}" > + """.format(infra.filepath("conf/dracut.conf")) > + > + def test_run(self): > + > + exit_code = boot_img(self.emulator, > + self.builddir) > + self.assertEqual(exit_code, 0) > + > +class TestCpioFull(infra.basetest.BRTest): > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_INIT_BUSYBOX=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_FULL=y > + """ > + > + def test_run(self): > + > + exit_code = boot_img(self.emulator, > + self.builddir) > + self.assertEqual(exit_code, 0) > + > + > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ignacy.gawedzki at green-communications.fr Thu Jan 6 10:32:29 2022 From: ignacy.gawedzki at green-communications.fr (Ignacy =?utf-8?B?R2F3xJlkemtp?=) Date: Thu, 6 Jan 2022 11:32:29 +0100 Subject: [Buildroot] [PATCH] package/fakedate: fix finding the right date executable In-Reply-To: <20220105203727.GH614810@scaer> References: <20211215173432.r75invoe3ff6mthg@zenon.in.qult.net> <20220105203727.GH614810@scaer> Message-ID: <20220106103229.brnw22bg5xb6sqpu@zenon.in.qult.net> On Wed, Jan 05, 2022 at 09:37:27PM +0100, thus spake Yann E. MORIN: > Ignacy, All, > > On 2021-12-15 18:34 +0100, Ignacy Gaw?dzki spake thusly: > > If the PATH initially contains host/bin, then the right date > > executable is to be found after the *first* occurrence of fakedate in > > normal (forward) PATH order. Fix the wrapper so that that first > > occurrence is found indeed. > > > > Signed-off-by: Ignacy Gaw?dzki > > After discussing this with Arnout and Thomas, we concluded that Arnout's > proposal, with my ltile amendment, was the proper solution. Except that > the loop had to be broken on first hit, of course, so I added the proper > break. > > I also added a test that we actually did find a date executable. > > Of course, if we missed something, then feel free to yel back! ;-) With this code, fakedate is not usable without having its path in PATH. If that will never be a problem, then I have no reason to yell. =) > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > --- > > package/fakedate/fakedate | 9 +++++++-- > > 1 file changed, 7 insertions(+), 2 deletions(-) > > > > diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate > > index 9bef113357..03a4f04079 100755 > > --- a/package/fakedate/fakedate > > +++ b/package/fakedate/fakedate > > @@ -21,13 +21,18 @@ > > DATE_BIN=false > > # Do not call any 'date' before us in the PATH, or that would create > > # an infinite recursion. > > +last_date=false > > for date in $(which -a date |tac); do > > if [ "${date}" -ef "$0" ]; then > > - break > > + DATE_BIN=$last_date > > fi > > - DATE_BIN="${date}" > > + last_date="${date}" > > done > > > > +if [ "$DATE_BIN" = false ]; then > > + DATE_BIN=$last_date > > +fi > > + > > if [ -n "$SOURCE_DATE_EPOCH" ]; then > > FORCE_EPOCH=1 > > for i in "$@"; do > > -- > > 2.32.0 > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > > -- Ignacy Gaw?dzki R&D Engineer Green Communications From thomas.petazzoni at bootlin.com Thu Jan 6 10:32:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 11:32:58 +0100 Subject: [Buildroot] [PATCH-NEXT v3 4/6] support/download/go-post-process: implement Go vendoring support In-Reply-To: <20211010234655.585526-4-christian@paral.in> References: <20211010234655.585526-1-christian@paral.in> <20211010234655.585526-4-christian@paral.in> Message-ID: <20220106113258.36ce7f11@windsurf> Hello Christian, On Sun, 10 Oct 2021 16:46:53 -0700 Christian Stewart via buildroot wrote: > From: Thomas Petazzoni > > This commit introduces the download post-process script > support/download/go-post-process, and hooks it into the Go package > infrastructure. > > Signed-off-by: Thomas Petazzoni > Signed-off-by: Christian Stewart > > v1 -> v2: > > - re-submitting Thomas's series with adjustments: > - run "go mod init" just before "go mod vendor" > - this fixes the case when go.mod does not exist > - use -modcacherw to fix "make clean" permissions errors > - use the mk_tar_gz helper in the post-process step > > Signed-off-by: Christian Stewart I am a bit confused by the changes you introduced here. You're labelling this patch series v3, so I assume it comes after my v2: https://patchwork.ozlabs.org/project/buildroot/patch/20201219153525.1361175-6-thomas.petazzoni at bootlin.com/ I'm particularly confused by the addition of the -g option to pass the argument of "go mod init" as opposed to using the BR_GOMOD environment variable. In the patch I linked above, you reported that it was causing some hash issues, but I don't understand which of your changes fixed that problem. Could you clarify? Also, my patch dropped the creation of go.mod from package/pkg-golang.mk (macro $(2)_GEN_GOMOD), but I'm not sure why your patch doesn't drop that. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Thu Jan 6 10:35:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 11:35:21 +0100 Subject: [Buildroot] [PATCH 1/1] download/git: support Git LFS In-Reply-To: <20200121203337.30856-1-vfazio@xes-inc.com> References: <20200121203337.30856-1-vfazio@xes-inc.com> Message-ID: Hi John, Vincent, I finally applied this to master, with a few minor changes. On 21/01/2020 21:33, Vincent Fazio wrote: > From: John Keeping > > Git Large File Storage replaces large files with text pointers in the > Git repository while storing the contents on a remote server. If a > repository is using this extension, then git-lfs must be used to > checkout the large files before the source archive is generated. > > Signed-off-by: John Keeping > [vfazio: > - add git-lfs to DL_TOOLS_DEPENDENCIES > - fixup for 5a0d6813948fea2cdb88a2e35984520eec856dec > ("infra/pkg-download: make the DOWNLOAD macro fully parameterised") > ] > Signed-off-by: Vincent Fazio [snip] > +# If there are large files then fetch them. > +if [ ${large_file} -eq 1 ]; then > + _git lfs install AFAICS an lfs install is not needed. IMHO it's pretty bad to do that because it updates ~/.gitconfig, which Buildroot shouldn't do. We could do lfs install --local, but even that is not needed. The lfs install just makes sure that lfs is done automatically whenever you do commit or pull or something like that, but in Buildroot we always do it explicitly so the smudge filter isn't needed. > + _git lfs fetch > + _git lfs checkout As already mentioned by Yann, this doesn't work when combined with submodules. The solution is pretty trivial: # If there are also submodules, recurse into them, if [ ${recurse} -eq 1 ]; then _git submodule foreach --recursive ${GIT} lfs fetch _git submodule foreach --recursive ${GIT} lfs checkout fi I haven't actually tested this though. Vincent (or anybody), it would be nice to have a runtime test for this feature. support/testing/tests/download/br2-external/git-refs/package/git-submodule-{enabled,disabled} can be a good source of inspiration. Only I'm not sure if it's possible to set up an LFS repository that is purely file-based. Regards, Arnout > +fi > + > # Generate the archive, sort with the C locale so that it is reproducible. > # We do not want the .git dir; we keep other .git files, in case they are the > # only files in their directory. > From arnout at mind.be Thu Jan 6 10:32:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 11:32:23 +0100 Subject: [Buildroot] [git commit] download/git: support Git LFS Message-ID: <20220106102930.F11C08344C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cff428fe313a9163098243789e2ac2bd7c20d447 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Git Large File Storage replaces large files with text pointers in the Git repository while storing the contents on a remote server. If a repository is using this extension, then git-lfs must be used to checkout the large files before the source archive is generated. Signed-off-by: John Keeping [vfazio: - add git-lfs to DL_TOOLS_DEPENDENCIES - fixup for 5a0d6813948fea2cdb88a2e35984520eec856dec ("infra/pkg-download: make the DOWNLOAD macro fully parameterised") ] Signed-off-by: Vincent Fazio [Arnout: - don't "git lfs install"; - recurse into submodules. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-packages-generic.txt | 4 ++++ package/pkg-download.mk | 1 + package/pkg-generic.mk | 3 +++ support/download/dl-wrapper | 9 +++++---- support/download/git | 13 +++++++++++++ 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 1384466f9b..8723da214a 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -344,6 +344,10 @@ not and can not work as people would expect it should: submodules when they contain bundled libraries, in which case we prefer to use those libraries from their own package. +* +LIBFOO_GIT_LFS+ should be set to +YES+ if the Git repository uses + Git LFS to store large files out of band. This is only available for + packages downloaded with git (i.e. when +LIBFOO_SITE_METHOD=git+). + * +LIBFOO_STRIP_COMPONENTS+ is the number of leading components (directories) that tar must strip from file names on extraction. The tarball for most packages has one leading component named diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 5c2bdfdb23..823b34981c 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -119,6 +119,7 @@ define DOWNLOAD -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ $(if $($(2)_GIT_SUBMODULES),-r) \ + $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ $(QUIET) \ -- \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5626af1d87..6a5fe5507b 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1207,6 +1207,9 @@ ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn else ifeq ($$($(2)_SITE_METHOD),git) DL_TOOLS_DEPENDENCIES += git +ifneq ($$($(2)_GIT_LFS),) +DL_TOOLS_DEPENDENCIES += git-lfs +endif else ifeq ($$($(2)_SITE_METHOD),bzr) DL_TOOLS_DEPENDENCIES += bzr else ifeq ($$($(2)_SITE_METHOD),scp) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 6cf0b89cba..3185887541 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -17,15 +17,15 @@ # We want to catch any unexpected failure, and exit immediately. set -e -export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:ru:qf:e" +export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:lru:qf:e" main() { local OPT OPTARG - local backend output hfile recurse quiet rc + local backend output hfile large_file recurse quiet rc local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:rf:u:q" OPT; do + while getopts ":c:d:D:o:n:N:H:lrf:u:q" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -34,6 +34,7 @@ main() { n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; H) hfile="${OPTARG}";; + l) large_file="-l";; r) recurse="-r";; f) filename="${OPTARG}";; u) uris+=( "${OPTARG}" );; @@ -127,7 +128,7 @@ main() { -f "${filename}" \ -u "${uri}" \ -o "${tmpf}" \ - ${quiet} ${recurse} -- "${@}" + ${quiet} ${large_file} ${recurse} -- "${@}" then # cd back to keep path coherence cd "${OLDPWD}" diff --git a/support/download/git b/support/download/git index 1e690d4444..41c3160099 100755 --- a/support/download/git +++ b/support/download/git @@ -51,10 +51,12 @@ _on_error() { } quiet= +large_file=0 recurse=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q; exec >/dev/null;; + l) large_file=1;; r) recurse=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; @@ -205,6 +207,17 @@ if [ ${recurse} -eq 1 ]; then done fi +# If there are large files then fetch them. +if [ ${large_file} -eq 1 ]; then + _git lfs fetch + _git lfs checkout + # If there are also submodules, recurse into them, + if [ ${recurse} -eq 1 ]; then + _git submodule foreach --recursive ${GIT} lfs fetch + _git submodule foreach --recursive ${GIT} lfs checkout + fi +fi + popd >/dev/null # Generate the archive. From romain.naour at smile.fr Thu Jan 6 10:38:38 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 11:38:38 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <20b2bd43-9fe6-f174-e437-7595ea5864d8@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> <1b60df77-a795-f328-6651-4e3b5c4b0757@gmail.com> <20b2bd43-9fe6-f174-e437-7595ea5864d8@kaod.org> Message-ID: <273bf418-04c9-5e1a-b501-4324ee649a85@smile.fr> Hello, Le 04/01/2022 ? 10:05, C?dric Le Goater a ?crit?: > Hello, > > On 1/3/22 23:43, Romain Naour wrote: >> Le 03/01/2022 ? 23:20, C?dric Le Goater a ?crit?: >>> Hello, >>>> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >>>> >>>> Create a test branch named: qemu-6.2.0-defconfigs-qemu >>>> >>>> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >>>> Buildroot defconfis and "qemu" is a pattern. >>>> >>>> See: >>>> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >>>> >>>> >>>> >>>> "pushing a branch called "-defconfigs-" which will test all >>>> defconfigs whose name start with the pattern." >>> >>> That looks simple enough. Something is going wrong though : >>> >>> ?? https://gitlab.com/legoater/buildroot/-/jobs/1937752353 >>> >>> Am I missing something ? >> >> humm, maybe there is weakness in the script when foo is "qemu-6.2.0" >> ????????????????????????????????????????????????????????????? ^ >> Try again with something else like qemu_6.2.0-defconfigs-qemu > > Yes. That was it. @Thomas: maybe ignore all characters before "-defconfigs": sed 's%^.*-defconfigs-\(.*\)%\1%')sed 's%^.*-defconfigs-\(.*\)%\1%') Best regards, Romain > > Thanks, > > C. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Jan 6 10:53:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 11:53:56 +0100 Subject: [Buildroot] [PATCH 1/1] system/Config.in: introduce pre-build script In-Reply-To: <20200121230956.23129-2-mmayer@broadcom.com> References: <20200121230956.23129-1-mmayer@broadcom.com> <20200121230956.23129-2-mmayer@broadcom.com> Message-ID: <0e266f48-7464-84f1-e297-a5c6eb7d6f19@mind.be> Hi Markus, On 22/01/2020 00:09, Markus Mayer wrote: > We introduce the concept of a pre-build script that works similar to > the already existing post-build and post-image scripts. > > The pre-build script(s) are executed before the build commences. This > allows a user to run some preperatory tasks prior to the build. > > Signed-off-by: Markus Mayer Although the use case you presented in the cover letter is probably not a "good" one, as explained by Thomas, I'm pretty sure there are valid cases for having a pre-build script. I think in general it's actually better to have a wrapper script or Makefile around Buildroot, because that gives a lot more flexibility. Still, this proposal is symmetrical with the post-image script. And the overhead is negligible. So I applied to master after all. Regards, Arnout > --- > Makefile | 3 +++ > system/Config.in | 10 ++++++++++ > 2 files changed, 13 insertions(+) > > diff --git a/Makefile b/Makefile > index a58ca7821d2d..9bf9f1aa05ee 100644 > --- a/Makefile > +++ b/Makefile > @@ -579,6 +579,9 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) > > .PHONY: prepare > prepare: $(BUILD_DIR)/buildroot-config/auto.conf > + @$(foreach s, $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT)), \ > + $(call MESSAGE,"Executing pre-build script $(s)"); \ > + $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) > > .PHONY: world > world: target-post-image > diff --git a/system/Config.in b/system/Config.in > index c8c5be40e096..7b890aed1abb 100644 > --- a/system/Config.in > +++ b/system/Config.in > @@ -518,6 +518,16 @@ config BR2_ROOTFS_OVERLAY > They are copied as-is into the rootfs, excluding files ending > with ~ and .git, .svn and .hg directories. > > +config BR2_ROOTFS_PRE_BUILD_SCRIPT > + string "Custom scripts to run before commencing the build" > + default "" > + help > + Specify a space-separated list of scripts to be run before the > + build commences. > + > + This gives users the opportunity to do board-specific > + preparations before starting the build. > + > config BR2_ROOTFS_POST_BUILD_SCRIPT > string "Custom scripts to run before creating filesystem images" > default "" > From arnout at mind.be Thu Jan 6 10:43:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 11:43:40 +0100 Subject: [Buildroot] [git commit] system/Config.in: introduce pre-build script Message-ID: <20220106104801.6020782AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b2a377edb9e566aded20a0d9a25200416d873c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We introduce the concept of a pre-build script that works similar to the already existing post-build and post-image scripts. The pre-build script(s) are executed before the build commences. This allows a user to run some preperatory tasks prior to the build. Signed-off-by: Markus Mayer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 3 +++ system/Config.in | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index ac98b84425..3099d35158 100644 --- a/Makefile +++ b/Makefile @@ -599,6 +599,9 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) .PHONY: prepare prepare: $(BUILD_DIR)/buildroot-config/auto.conf + @$(foreach s, $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT)), \ + $(call MESSAGE,"Executing pre-build script $(s)"); \ + $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) .PHONY: world world: target-post-image diff --git a/system/Config.in b/system/Config.in index b3abeddd68..8c66cad12a 100644 --- a/system/Config.in +++ b/system/Config.in @@ -533,6 +533,16 @@ config BR2_ROOTFS_OVERLAY They are copied as-is into the rootfs, excluding files ending with ~ and .git, .svn and .hg directories. +config BR2_ROOTFS_PRE_BUILD_SCRIPT + string "Custom scripts to run before commencing the build" + default "" + help + Specify a space-separated list of scripts to be run before the + build commences. + + This gives users the opportunity to do board-specific + preparations before starting the build. + config BR2_ROOTFS_POST_BUILD_SCRIPT string "Custom scripts to run before creating filesystem images" default "" From romain.naour at smile.fr Thu Jan 6 11:24:25 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 12:24:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/ettercap: new package In-Reply-To: <652ca88f-a591-94b5-119a-14375ef3c850@smile.fr> References: <1597227392-9101-1-git-send-email-jugurtha.belkalem@smile.fr> <1597227392-9101-2-git-send-email-jugurtha.belkalem@smile.fr> <652ca88f-a591-94b5-119a-14375ef3c850@smile.fr> Message-ID: <3969d0bf-8292-9947-aa9a-42468a81f021@smile.fr> Hello Jugurtha, Le 15/09/2020 ? 23:13, Romain Naour a ?crit?: > Hi Heiko, > > Le 15/09/2020 ? 22:57, Heiko Thiery a ?crit?: >> Hi Jugurtha, Hi Romain, >> >> Am Mi., 12. Aug. 2020 um 12:16 Uhr schrieb Jugurtha BELKALEM >> : >>> >>> Signed-off-by: Jugurtha BELKALEM >>> --- >>> DEVELOPERS | 1 + >>> package/Config.in | 1 + >>> package/ettercap/Config.in | 32 ++++++++++++++++++++++++++++++++ >>> package/ettercap/ettercap.hash | 3 +++ >>> package/ettercap/ettercap.mk | 32 ++++++++++++++++++++++++++++++++ >>> 5 files changed, 69 insertions(+) >>> create mode 100644 package/ettercap/Config.in >>> create mode 100644 package/ettercap/ettercap.hash >>> create mode 100644 package/ettercap/ettercap.mk >>> >>> diff --git a/DEVELOPERS b/DEVELOPERS >>> index 42fa5a4..2097f4d 100644 >>> --- a/DEVELOPERS >>> +++ b/DEVELOPERS >>> @@ -1396,6 +1396,7 @@ N: Joshua Henderson >>> F: package/qt5/qt5wayland/ >>> >>> N: Jugurtha BELKALEM >>> +F: package/ettercap/ >>> F: package/python-cycler/ >>> F: package/python-matplotlib/ >>> >>> diff --git a/package/Config.in b/package/Config.in >>> index d7e79f4..db886a1 100644 >>> --- a/package/Config.in >>> +++ b/package/Config.in >>> @@ -2042,6 +2042,7 @@ menu "Networking applications" >>> source "package/ebtables/Config.in" >>> source "package/ejabberd/Config.in" >>> source "package/ethtool/Config.in" >>> + source "package/ettercap/Config.in" >>> source "package/faifa/Config.in" >>> source "package/fail2ban/Config.in" >>> source "package/fastd/Config.in" >>> diff --git a/package/ettercap/Config.in b/package/ettercap/Config.in >>> new file mode 100644 >>> index 0000000..e0693f4 >>> --- /dev/null >>> +++ b/package/ettercap/Config.in >>> @@ -0,0 +1,32 @@ >>> +config BR2_PACKAGE_ETTERCAP >>> + bool "ettercap" >>> + depends on !BR2_STATIC_LIBS >>> + depends on BR2_TOOLCHAIN_HAS_THREADS >>> + depends on BR2_USE_WCHAR # ncurses wchar >>> + select BR2_PACKAGE_ETHTOOL # runtime >>> + select BR2_PACKAGE_GEOIP >> >> As far as I can see in the CMakelist.txt this can be disabled. So this >> looks to me like an option for the package. > > Indeed, geoip is optional. But even when selected the geoip package doesn't > install MaxMind's GeoIP lite databases. > > Jugurtha, maybe we can just turn it off ? > >> >>> + select BR2_PACKAGE_LIBCURL >> >> Tried to build and failed due to missing: >> select BR2_PACKAGE_LIBICONV > > libiconv package is only used for uclibc based toolchain. The dependency must be > conditional. >> >>> + select BR2_PACKAGE_LIBNET >>> + select BR2_PACKAGE_LIBPCAP >>> + select BR2_PACKAGE_NCURSES >>> + select BR2_PACKAGE_NCURSES_WCHAR >> >> Same for ncurses support. This seems also to be optional. > > Jugurtha, can you have a look ? Based on the feedback from Heiko Thiery and I, I have marked this patch as "Changes Requested". Best regards, Romain > >> >>> + select BR2_PACKAGE_OPENSSL >>> + select BR2_PACKAGE_ZLIB >>> + help >>> + Ettercap is a comprehensive suite for man >>> + in the middle attacks. It features sniffing of >>> + live connections, content filtering on the fly >>> + and many other interesting tricks. It supports >>> + active and passive dissection of many protocols >>> + and includes many features for network and >>> + host analysis. >>> + >>> + Note : Ettercap can provide better tracking >>> + for IP addresses when GeoIP.dat is provided by >>> + users (GeoIP.dat is available on maxmind website). >>> + >>> + http://www.ettercap-project.org/ >>> + >>> +comment "ettercap needs a toolchain w/ threads, wchar, dynamic library" >>> + depends on BR2_TOOLCHAIN_HAS_THREADS \ >> ^ >> I think the "!" is missing?! > > Indeed > >> >>> + || !BR2_USE_WCHAR ||BR2_STATIC_LIBS > > need space between "||" and "BR2_STATIC_LIBS" > >> >>> diff --git a/package/ettercap/ettercap.hash b/package/ettercap/ettercap.hash >>> new file mode 100644 >>> index 0000000..61ecbec >>> --- /dev/null >>> +++ b/package/ettercap/ettercap.hash >>> @@ -0,0 +1,3 @@ >>> +# Locally calculated >>> +sha256 d0c3ef88dfc284b61d3d5b64d946c1160fd04276b448519c1ae4438a9cdffaf3 ettercap-0.8.3.1.tar.gz >>> +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE >>> diff --git a/package/ettercap/ettercap.mk b/package/ettercap/ettercap.mk >>> new file mode 100644 >>> index 0000000..ee8c8a2 >>> --- /dev/null >>> +++ b/package/ettercap/ettercap.mk >>> @@ -0,0 +1,32 @@ >>> +################################################################################ >>> +# >>> +# ettercap >>> +# >>> +################################################################################ >>> + >>> +ETTERCAP_VERSION = 0.8.3.1 >>> +ETTERCAP_SITE = $(call github,Ettercap,ettercap,v$(ETTERCAP_VERSION)) >>> +ETTERCAP_LICENSE = GPL-2.0+ >>> +ETTERCAP_LICENSE_FILES = LICENSE >>> +ETTERCAP_SUPPORTS_IN_SOURCE_BUILD = NO >>> +ETTERCAP_INSTALL_STAGING = YES >> >> Why do we need to install in staging? > > Ettercap should provide libettercap.so.0 (I need to check). > > https://rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/e/ettercap-0.8.3.1-1.fc33.i686.html > > Heiko, thanks for the review! > > Best regards, > Romain > >> >>> +ETTERCAP_DEPENDENCIES = geoip libcurl libnet libpcap ncurses openssl zlib \ >>> + host-bison host-flex host-pkgconf >> >> Add dependency for libiconv (see above). >> >>> + >>> +ETTERCAP_CONF_OPTS = -DENABLE_IPV6=ON -DENABLE_GTK=OFF -DBUNDLED_LIBS=OFF >>> + >>> +ifeq ($(BR2_PACKAGE_PCRE),y) >>> +ETTERCAP_DEPENDENCIES += pcre >>> +endif >>> + >>> +# Replaces default encoding set (ISO-8859-1) with UTF-8 in ettercap >>> +# configuration file installed by the package. >>> +# It ensures that all characters are properly decoded and avoids >>> +# any fatal errors while running in text mode (-T). >>> +define ETTERCAP_SET_UTF8_ENCODING >>> + $(SED) 's%^utf8_encoding.*%utf8_encoding = "UTF-8"%' \ >>> + $(TARGET_DIR)/etc/ettercap/etter.conf >>> +endef >>> +ETTERCAP_POST_INSTALL_TARGET_HOOKS += ETTERCAP_SET_UTF8_ENCODING >>> + >>> +$(eval $(cmake-package)) >> >> Thank you. >> > From romain.naour at smile.fr Thu Jan 6 12:34:49 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 13:34:49 +0100 Subject: [Buildroot] [PATCH v4] package/gitlab-runner: new package Message-ID: <20220106123449.344837-1-romain.naour@smile.fr> From: Marcin Niestroj We rely on config.toml to be created manually during first boot as setup stage. Even with an empty config.toml file, the gitlab-runner needs gitlab registration token to register to a gitlab server. Use the 14.5.1 release since 14.5.2 and 14.6.0 triggers a build error [1] due a patch for GO < 1.17. (helpers/patches/issue_28732/syscall.go:11:2: undefined: syscall.Issue28732Fix) Tested: https://gitlab.com/kubu93/buildroot/-/pipelines/442604876 [1] https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28766 Signed-off-by: Marcin Niestroj Signed-off-by: Romain Naour Cc: J?r?my Rosen --- Note: We used the gitlab-runner for shell or python jobs. Jobs using docker images (images: in gitlab-ci.yml) is not tested. v4: update to 14.5.1 Remove config.toml handling from .mk. We rely on config.toml to be created during first boot as setup stage. Even with an empty config.toml file, the gitlab-runner needs gitlab registration token to register to a gitlab server. (Marcin Niestroj) Remove alias gitlab-ci-multi-runner.service (Marcin Niestroj), gitlab-ci-multi-runner.service comme from Debian gitlab-runner systemd service file. v3: Change daemon process to gitlab-runner user. see as example: https://git.buildroot.net/buildroot/tree/package/tpm2-abrmd/S80tpm2-abrmd?h=2020.05-rc2#n31 [Romain: Tested only using systemd init on aarch64 target emulated by Qemu] v2: add service file, config file, gitlab user. add bash as runtime dependency. Add git, curl, ca-certificate, tar runtime dependencies from on debian control file for gitlab-runner package. Use gnu tar since we can expect tar options that are not supported by busybox tar implementation. Enable SSL/TLS library with openssl needed at runtime. Add me as "developer". test-pkg config: BR2_PACKAGE_GITLAB_RUNNER=y --- DEVELOPERS | 2 + package/Config.in | 1 + package/gitlab-runner/Config.in | 31 ++++++++++ package/gitlab-runner/S95gitlab-runner | 64 +++++++++++++++++++++ package/gitlab-runner/gitlab-runner.hash | 3 + package/gitlab-runner/gitlab-runner.mk | 33 +++++++++++ package/gitlab-runner/gitlab-runner.service | 18 ++++++ 7 files changed, 152 insertions(+) create mode 100644 package/gitlab-runner/Config.in create mode 100644 package/gitlab-runner/S95gitlab-runner create mode 100644 package/gitlab-runner/gitlab-runner.hash create mode 100644 package/gitlab-runner/gitlab-runner.mk create mode 100644 package/gitlab-runner/gitlab-runner.service diff --git a/DEVELOPERS b/DEVELOPERS index 4b04f90ccb..3b3c207495 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1722,6 +1722,7 @@ F: configs/orangepi_zero_plus_defconfig F: package/argparse/ F: package/dt-utils/ F: package/easydbus/ +F: package/gitlab-runner/ F: package/lua-flu/ F: package/lua-stdlib/ F: package/luaossl/ @@ -2407,6 +2408,7 @@ F: package/enlightenment/ F: package/flare-engine/ F: package/flare-game/ F: package/gcc/ +F: package/gitlab-runner/ F: package/glibc/ F: package/irrlicht/ F: package/liblinear/ diff --git a/package/Config.in b/package/Config.in index 9f4ab72a80..f43db927d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2098,6 +2098,7 @@ menu "Miscellaneous" source "package/collectl/Config.in" source "package/domoticz/Config.in" source "package/empty/Config.in" + source "package/gitlab-runner/Config.in" source "package/gnuradio/Config.in" source "package/googlefontdirectory/Config.in" source "package/gqrx/Config.in" diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in new file mode 100644 index 0000000000..72c2742562 --- /dev/null +++ b/package/gitlab-runner/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_GITLAB_RUNNER + bool "gitlab-runner" + 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_USE_MMU # git + depends on BR2_USE_WCHAR # tar + select BR2_PACKAGE_BASH # runtime, shells/bash.go probably want to support bashism. + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_CA_CERTIFICATES # runtime + select BR2_PACKAGE_GIT # runtime + select BR2_PACKAGE_LIBCURL # runtime + select BR2_PACKAGE_LIBCURL_CURL # runtime + select BR2_PACKAGE_LIBCURL_OPENSSL # runtime, for ca-certificates. + select BR2_PACKAGE_OPENSSL # runtime + select BR2_PACKAGE_LIBOPENSSL # runtime + select BR2_PACKAGE_LIBOPENSSL_BIN # runtime + select BR2_PACKAGE_TAR # runtime + help + GitLab Runner is the open source project that is used to run + your jobs and send the results back to GitLab. It is used in + conjunction with GitLab CI/CD, the open-source continuous + integration service included with GitLab that coordinates the + jobs. + + https://docs.gitlab.com/runner/ + +comment "gitlab-runner needs a toolchain w/ threads" + 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 diff --git a/package/gitlab-runner/S95gitlab-runner b/package/gitlab-runner/S95gitlab-runner new file mode 100644 index 0000000000..69dcb28cce --- /dev/null +++ b/package/gitlab-runner/S95gitlab-runner @@ -0,0 +1,64 @@ +#!/bin/sh + +DAEMON="gitlab-runner" +PIDFILE="/var/run/$DAEMON.pid" + +GITLAB_RUNNER_ARGS="run" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -m -b -p "$PIDFILE" -c "$DAEMON:$DAEMON" -x "/usr/bin/$DAEMON" \ + -- $GITLAB_RUNNER_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" -u "$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + printf 'Reloading %s: ' "$DAEMON" + start-stop-daemon -K -s HUP -q -p "$PIDFILE" -u "$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +case "$1" in + start|stop|restart|reload) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/gitlab-runner/gitlab-runner.hash b/package/gitlab-runner/gitlab-runner.hash new file mode 100644 index 0000000000..f4fab595b5 --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 63a7963f750ec45a7cb34a660b7247a0aa6def98706b7bd80efc95053e66822d gitlab-runner-14.5.1.tar.gz +sha256 0ae968b7ddd25da0209c3c6594aac1ac74ddf90385940b02b420463e2e0734de LICENSE diff --git a/package/gitlab-runner/gitlab-runner.mk b/package/gitlab-runner/gitlab-runner.mk new file mode 100644 index 0000000000..fde776e631 --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# gitlab-runner +# +################################################################################ + +GITLAB_RUNNER_VERSION = 14.5.1 +GITLAB_RUNNER_SITE = https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(GITLAB_RUNNER_VERSION) +GITLAB_RUNNER_LICENSE = MIT +GITLAB_RUNNER_LICENSE_FILES = LICENSE + +GITLAB_RUNNER_LDFLAGS = \ + -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=$(GITLAB_RUNNER_VERSION) + +# Don't run gitlab runner as root. +define GITLAB_RUNNER_USERS + gitlab-runner -1 gitlab-runner -1 * /var/run/dbus /bin/false - Gitlab Runner +endef + +define GITLAB_RUNNER_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/gitlab-runner/S95gitlab-runner \ + $(TARGET_DIR)/etc/init.d/S95gitlab-runner +endef + +define GITLAB_RUNNER_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/var/lib/gitlab-runner + $(INSTALL) -D -m 0644 package/gitlab-runner/gitlab-runner.service \ + $(TARGET_DIR)/usr/lib/systemd/system/gitlab-runner.service +endef + +GITLAB_RUNNER_POST_INSTALL_TARGET_HOOKS += GITLAB_RUNNER_INSTALL_CONFIG + +$(eval $(golang-package)) diff --git a/package/gitlab-runner/gitlab-runner.service b/package/gitlab-runner/gitlab-runner.service new file mode 100644 index 0000000000..cba751a3d6 --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.service @@ -0,0 +1,18 @@ +[Unit] +Description=GitLab Runner +After=network.target +ConditionFileIsExecutable=/usr/bin/gitlab-runner + +[Service] +Environment="DAEMON_ARGS=run --working-directory /var/lib/gitlab-runner --config /etc/gitlab-runner/config.toml --service gitlab-runner --syslog --user gitlab-runner" +EnvironmentFile=-/etc/default/%p +StartLimitInterval=5 +StartLimitBurst=10 +ExecStart=/usr/bin/gitlab-runner $DAEMON_ARGS +ExecReload=/bin/kill -HUP $MAINPID + +Restart=always +RestartSec=120 + +[Install] +WantedBy=multi-user.target -- 2.31.1 From romain.naour at smile.fr Thu Jan 6 13:07:14 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 14:07:14 +0100 Subject: [Buildroot] [PATCH] package/qt5: remove qt5webkit-examples from qt5/Config.in Message-ID: <20220106130714.347453-1-romain.naour@smile.fr> qt5webkit-examples was removed by commit [1] [1] b4841d722fb37f8c8c4715c7fe8b2502c9a3a9dd Signed-off-by: Romain Naour Cc: James Hilliard Cc: Yann E. MORIN --- package/qt5/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 6f2428d800..5751d6cb70 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -67,7 +67,6 @@ source "package/qt5/qt5virtualkeyboard/Config.in" source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5webengine/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" -- 2.31.1 From yann.morin.1998 at free.fr Thu Jan 6 13:35:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 14:35:27 +0100 Subject: [Buildroot] [git commit] package/qt5: remove qt5webkit-examples from qt5/Config.in Message-ID: <20220106132930.D76B0832CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0dc59ef8dca1965b3ed5d7b90f615a415ecbc863 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master qt5webkit-examples was removed by commit [1] [1] b4841d722fb37f8c8c4715c7fe8b2502c9a3a9dd Signed-off-by: Romain Naour Cc: James Hilliard Cc: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/qt5/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 6f2428d800..5751d6cb70 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -67,7 +67,6 @@ source "package/qt5/qt5virtualkeyboard/Config.in" source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5webengine/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" From yann.morin.1998 at free.fr Thu Jan 6 13:36:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 14:36:14 +0100 Subject: [Buildroot] [PATCH] package/qt5: remove qt5webkit-examples from qt5/Config.in In-Reply-To: <20220106130714.347453-1-romain.naour@smile.fr> References: <20220106130714.347453-1-romain.naour@smile.fr> Message-ID: <20220106133614.GO614810@scaer> Romain, All, On 2022-01-06 14:07 +0100, Romain Naour spake thusly: > qt5webkit-examples was removed by commit [1] > > [1] b4841d722fb37f8c8c4715c7fe8b2502c9a3a9dd > > Signed-off-by: Romain Naour > Cc: James Hilliard > Cc: Yann E. MORIN Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/qt5/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index 6f2428d800..5751d6cb70 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -67,7 +67,6 @@ source "package/qt5/qt5virtualkeyboard/Config.in" > source "package/qt5/qt5wayland/Config.in" > source "package/qt5/qt5webchannel/Config.in" > source "package/qt5/qt5webkit/Config.in" > -source "package/qt5/qt5webkit-examples/Config.in" > source "package/qt5/qt5webengine/Config.in" > source "package/qt5/qt5websockets/Config.in" > source "package/qt5/qt5webview/Config.in" > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thierry.bultel at linatsea.fr Thu Jan 6 13:48:52 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 6 Jan 2022 14:48:52 +0100 Subject: [Buildroot] [PATCH v3 3/3] fs/cpio: new option to use dracut tool In-Reply-To: <20220106103149.GN614810@scaer> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-3-thierry.bultel@linatsea.fr> <20220106103149.GN614810@scaer> Message-ID: <313f164a-4f58-3212-a75a-d64acbbc0168@linatsea.fr> >> + >> +show_modules=yes >> +i18n_install_all=no >> +lvmconf=no >> +mdadmconf=no >> +early_microcode=no >> +hostonly=no >> +hostonly_cmdline=no >> +use_fstab=no >> +kernel_cmdline="rd.break=initqueue" >> +do_strip=no >> + >> +# Dracut modules need >> +add_dracutmodules+=" \ >> +busybox-buildroot \ >> +bash >> +" >> + >> +# Modules to ignore >> +omit_dracutmodules+=" \ > [--SNIP big list of stuff--] >> +" > Rather than remove select stuff, can't we just start from an empty set > and add just what is needed? Yann, Unfortunately, This is not that simple. Dracut will unconditionally source a lot of unwanted modules present in host/usr/lib/modules.d (basically because it considers that the init system is systemd always) unless you tell it not to do it. There is no option to specify another directory to look in, nor a way to select the only needed modules. Only excluding them seems the way. Also, when you asked why I put the module-setup.sh as executable. You are right, it is not mandatory to do so, because dracut just sources these files. The fact is that all the ones that it provides are set as executables, with no real reason. Regards, Thierry From james.hilliard1 at gmail.com Thu Jan 6 06:24:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:24:06 -0700 Subject: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220106062407.3131530-1-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> Message-ID: <20220106062407.3131530-3-james.hilliard1@gmail.com> We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages. We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version. There are python3 patches available that apply to this version with minor modifications(to be added in a future patch). We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive. We need to add some new required dependencies to qt5webengine so that it will build. Signed-off-by: James Hilliard --- package/qt5/qt5.mk | 5 +- .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 22 + package/qt5/qt5webengine/Config.in | 2 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 8 files changed, 2561 insertions(+), 2012 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 0000000000..ced431c9e9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 0000000000..103e27d889 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 0000000000..e6ac2706f2 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..017c01a8e7 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). @@ -60,6 +61,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc deleted file mode 100644 index a5fdfdc1f1..0000000000 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ /dev/null @@ -1,1000 +0,0 @@ -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/cityhash/COPYING \ - src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ - src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ - src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ - src/3rdparty/chromium/third_party/dav1d/LICENSE \ - src/3rdparty/chromium/third_party/dawn/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/ink/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jacoco/LICENSE \ - src/3rdparty/chromium/third_party/javalang/LICENSE \ - src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ - src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ - src/3rdparty/chromium/third_party/libipp/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libxslt/src/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/lottie/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mako/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/nasm/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/perfetto/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/pffft/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/r8/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/rnnoise/COPYING \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/schema_org/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/six/src/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ - src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/test_fonts/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/turbine/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/unrar/LICENSE \ - src/3rdparty/chromium/third_party/unrar/src/license.txt \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ - src/3rdparty/chromium/third_party/weston/LICENSE \ - src/3rdparty/chromium/third_party/weston/src/COPYING \ - src/3rdparty/chromium/third_party/weston/src/data/COPYING \ - src/3rdparty/chromium/third_party/widevine/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ - src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ - src/3rdparty/gn/base/third_party/icu/LICENSE \ - src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb..1d2b70c4f6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..1b5529d2bb 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -5,18 +5,18 @@ ################################################################################ QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python + qt5declarative qt5webchannel host-bison host-flex host-freetype \ + host-gperf host-nodejs host-pkgconf host-python +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libxkbfile xlib_libXrandr xlib_libXtst endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss @@ -44,7 +44,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python @@ -53,12 +55,20 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty +endef +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -- 2.25.1 From romain.naour at smile.fr Thu Jan 6 14:08:08 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 15:08:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/liburing: new package In-Reply-To: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> Message-ID: <3c9b632e-aae8-5766-c961-42627109d70a@smile.fr> Hello Fabrice, Le 04/01/2022 ? 19:11, Fabrice Fontaine a ?crit?: > This is the io_uring library, liburing. liburing provides helpers to > setup and teardown io_uring instances, and also a simplified interface > for applications that don't need (or want) to deal with the full kernel > side implementation. > > https://git.kernel.dk/cgit/liburing liburing is an optional Qemu dependency, it allows to use io_uring instead of the thread pool. Archlinux provide some infos about other packages using liburing: https://archlinux.org/packages/extra/x86_64/liburing/ > > Signed-off-by: Fabrice Fontaine > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/liburing/Config.in | 13 ++++++++++++ > package/liburing/liburing.hash | 8 ++++++++ > package/liburing/liburing.mk | 36 ++++++++++++++++++++++++++++++++++ > 5 files changed, 59 insertions(+) > create mode 100644 package/liburing/Config.in > create mode 100644 package/liburing/liburing.hash > create mode 100644 package/liburing/liburing.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 444e58714c..5017dde56e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -904,6 +904,7 @@ F: package/librsync/ > F: package/libsoup/ > F: package/libsoxr/ > F: package/libupnp/ > +F: package/liburing/ > F: package/libv4l/ > F: package/libxslt/ > F: package/mbedtls/ > diff --git a/package/Config.in b/package/Config.in > index e09e4aad3f..1f3ec9a334 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2001,6 +2001,7 @@ menu "Other" > source "package/libuci/Config.in" > source "package/libunwind/Config.in" > source "package/liburcu/Config.in" > + source "package/liburing/Config.in" > source "package/libuv/Config.in" > source "package/lightning/Config.in" > source "package/linux-pam/Config.in" > diff --git a/package/liburing/Config.in b/package/liburing/Config.in > new file mode 100644 > index 0000000000..898d95cfa6 > --- /dev/null > +++ b/package/liburing/Config.in > @@ -0,0 +1,13 @@ > +config BR2_PACKAGE_LIBURING > + bool "liburing" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h Is any linux-headers dependency (5.0 maybe). > + help > + This is the io_uring library, liburing. liburing provides > + helpers to setup and teardown io_uring instances, and also a > + simplified interface for applications that don't need (or > + want) to deal with the full kernel side implementation. > + > + https://git.kernel.dk/cgit/liburing > + > +comment "liburing needs a toolchain w/ gcc >= 4.9" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash > new file mode 100644 > index 0000000000..56e90d71cc > --- /dev/null > +++ b/package/liburing/liburing.hash > @@ -0,0 +1,8 @@ > +# Locally calculated > +sha256 df7c8fd05fd39da622b2814e06f815f11f1beb429487a4330eed64bb7f353dbf liburing-2.1.tar.bz2 > + > +# Hash for license files > +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > +sha256 d0b225f17ef2d05d5cda6b25b2dc334ef6f5f12537c20edf6e391852a095ec19 LICENSE > +sha256 97d62ff5d7cf0b1cef34c33a89877352911278ca4ac1c6c4f24a835baa5ea10b README > diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk > new file mode 100644 > index 0000000000..a977e74b4f > --- /dev/null > +++ b/package/liburing/liburing.mk > @@ -0,0 +1,36 @@ > +################################################################################ > +# > +# liburing > +# > +################################################################################ > + > +LIBURING_VERSION = 2.1 > +LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 > +LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot > +LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT > +LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README > +LIBURING_INSTALL_STAGING = YES > + > +ifeq ($(BR2_STATIC_LIBS),y) > +LIBURING_MAKE_OPTS += ENABLE_SHARED=0 > +else > +LIBURING_MAKE_OPTS += ENABLE_SHARED=1 > +endif > + > +define LIBURING_CONFIGURE_CMDS > + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) > +endef Indeed, configure is a shell script. It's not generated by autotools. Best regards, Romain > + > +define LIBURING_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D)/src > +endef > + > +define LIBURING_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install > +endef > + > +define LIBURING_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install > +endef > + > +$(eval $(generic-package)) > From danomimanchego123 at gmail.com Thu Jan 6 14:20:50 2022 From: danomimanchego123 at gmail.com (Danomi Manchego) Date: Thu, 6 Jan 2022 09:20:50 -0500 Subject: [Buildroot] call with hooks In-Reply-To: References: Message-ID: Hu Arnout, Thanks for the explanation. I feel better now :) Danomi - On Thu, Jan 6, 2022 at 4:39 AM Arnout Vandecappelle wrote: > > > > On 05/01/2022 17:20, Danomi Manchego wrote: > > Hello all, > > > > I noticed a possible inconsistency, and thought I should post it. > > Looking at places where buildroot uses hooks: > > > > $ grep -r '$(hook))$(sep)' . > > [snip] > > > > Notice that the one hit in Makefile uses "$($(hook))$(sep)" while the > > hits in pkg-generic.mk use "$(call $(hook))$(sep)". My Make-fu isn't > > powerful enough to understand if there is an actual problem - should > > there be a "call" in the Makefile line? The general syntax for call > > is "$(call variable,param,param,?)" so I don't follow what the extra > > call in $(call $(hook) is doing for us. > > Historical accident. > > The person who first introduced the hooks back in the days didn't realize that > $(call ...) is not for "something that looks like a function", but rather it is > for "whenever you want to pass arguments". Reviewers also didn't realize this > and just applied, and when more hooks were added later they copied the pattern. > > Regards, > Arnout > > > > > Thanks, > > Danomi - > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From romain.naour at smile.fr Thu Jan 6 14:43:01 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 15:43:01 +0100 Subject: [Buildroot] [PATCHv6] board/mender: add a mender board example configuration. Message-ID: <20220106144301.1022644-1-romain.naour@smile.fr> From: Adam Duskett Buildroot currently has all of the needed packages to use Mender as the primary update system. However, there isn't any documentation or examples now that provide a starting point for users. This lack of documentation makes setting up a Mender based update system difficult and time-consuming. Provided in this patch series is a mender_x86_64_efi_defconfig of which sets up an x86_64 EFI based build that is ready to flash to a USB pen drive or use in a QEMU environment. The system partition schema comprises of two equally sized root partitions and a data partition that mounts to /var/lib/mender as a persistent data store partition. There is a board/mender/readme.txt provided, which gives users documentation on how to flash the built image or boot the image using QEMU as well. The post-build and post-image-efi scripts also have four options: -a --artifact-name: - The name of the artifact, this is added to /etc/mender/artifact_info -o --data-part-size: - The data partition size. -d --device-type - The device-type used by mender to catagorize registered devices. -g --generate-mender-image - Set to true to generate a mender image after a build. Signed-off-by: Adam Duskett Signed-off-by: Mikael Bourhis-Cloarec [Romain: rebase on master (01.2022) - update genimage-efi.cfg to use GPT partition table and genimage-15 syntax - bump the kernel to 5.15.13 - Add host-libelf kernel dependency - Use BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI after commit 82d1e8c628cc (boot/grub2: use none platform when building for host) - Add regexp grub mandatory module for mender-grubenv - remove startup.nsh from genimage-efi.cfg after commit 3efb5e31fc05 (board, boot, package: remove usage of startup.nsh in EFI partition)] Signed-off-by: Romain Naour --- Changes: v5 -> v6: - rebase on master (01.2022) - update genimage-efi.cfg to use GPT partition table and genimage-15 syntax - bump the kernel to 5.15.13 - Add host-libelf kernel dependency - Use BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI after commit 82d1e8c628cc (boot/grub2: use none platform when building for host) - Add regexp grub mandatory module for mender-grubenv - remove startup.nsh from genimage-efi.cfg after commit 3efb5e31fc05 (board, boot, package: remove usage of startup.nsh in EFI partition) Changes v4 -> v5: - Fix the patch format Changes v3 -> v4 (Mikael Bourhis-Cloarec): - Add fix: missing "=y" for SSP option in defconfig - Add fix: mounting point of '/dev/vda1' in 'overlay/etc/fstab' Changes v2 -> v3: - Bump kernel version to 5.5.7 - Move the board files form board/mender to board/mender/x86_64 - Add the four arguments to the post-build and post-image scripts. - Update genimage-efi.cfg to ensure that all partitions line up properly. - Update the readme.txt file to reflect the script argument changes. Changes v1 -> v2: - Remove uneeded entries in board/mender/overlays/etc/fstab - Rename post-image-efi-gpt.sh to post-image-efi.sh - Rename pre-image.sh to post-build.sh to keep with standard naming conventions. - Check if /var/lib/mender is a symlink, and if so; remove it and create a directory in its place. This change prevents the mender init script from doing the same thing and preventing the data partition from mounting correctly on the initial boot. - Make creating a mender artifact optional after the build. - Add more documentation in board/mender/readme.txt. - Add genimage-efi.cfg [Thomas] - Use genimage.sh instead of the old-style found in board/pc/post-image-efi-gpt.sh (Thomas) --- board/mender/x86_64/genimage-efi.cfg | 44 ++++++++++ board/mender/x86_64/linux.config | 64 ++++++++++++++ board/mender/x86_64/mender_grubenv_defines | 25 ++++++ board/mender/x86_64/overlay/etc/fstab | 7 ++ .../x86_64/overlay/etc/mender/mender.conf | 11 +++ board/mender/x86_64/post-build.sh | 54 ++++++++++++ board/mender/x86_64/post-image-efi.sh | 84 +++++++++++++++++++ board/mender/x86_64/readme.txt | 67 +++++++++++++++ configs/mender_x86_64_efi_defconfig | 81 ++++++++++++++++++ 9 files changed, 437 insertions(+) create mode 100644 board/mender/x86_64/genimage-efi.cfg create mode 100644 board/mender/x86_64/linux.config create mode 100644 board/mender/x86_64/mender_grubenv_defines create mode 100644 board/mender/x86_64/overlay/etc/fstab create mode 100644 board/mender/x86_64/overlay/etc/mender/mender.conf create mode 100755 board/mender/x86_64/post-build.sh create mode 100755 board/mender/x86_64/post-image-efi.sh create mode 100644 board/mender/x86_64/readme.txt create mode 100644 configs/mender_x86_64_efi_defconfig diff --git a/board/mender/x86_64/genimage-efi.cfg b/board/mender/x86_64/genimage-efi.cfg new file mode 100644 index 0000000000..73102d5c30 --- /dev/null +++ b/board/mender/x86_64/genimage-efi.cfg @@ -0,0 +1,44 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + file bzImage { + image = "bzImage" + } + } + + size = 16777216 +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32768 + size = 16777216 + image = "efi-part.vfat" + bootable = true + } + + partition roota { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + offset = 16809984 + image = "rootfs.ext2" + } + + partition rootb { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + offset = 151027712 + image = "rootfs.ext2" + } + + partition data { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + offset = 285245440 + image = "data-part.ext4" + } +} diff --git a/board/mender/x86_64/linux.config b/board/mender/x86_64/linux.config new file mode 100644 index 0000000000..f17fc18edb --- /dev/null +++ b/board/mender/x86_64/linux.config @@ -0,0 +1,64 @@ +CONFIG_SYSVIPC=y +CONFIG_SMP=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_EFI=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_NETFILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=m +CONFIG_PCI=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_ATH9K=m +CONFIG_ATH9K_HTC=m +CONFIG_CARL9170=m +CONFIG_ATH10K=m +CONFIG_RT2X00=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +# CONFIG_RTL_CARDS is not set +CONFIG_RTL8XXXU=m +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB_VESA=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VFAT_FS=y +CONFIG_SQUASHFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/board/mender/x86_64/mender_grubenv_defines b/board/mender/x86_64/mender_grubenv_defines new file mode 100644 index 0000000000..77f68fe6b2 --- /dev/null +++ b/board/mender/x86_64/mender_grubenv_defines @@ -0,0 +1,25 @@ +################################################################################ +# Mandatory +################################################################################ +# Warning: This file is an example and should be customized to fit your needs! + +# Partition index of root filesystem A +mender_rootfsa_part=2 + +# Partition index of root filesystem B +mender_rootfsb_part=3 + +# Device file corresponding to the root filesystem partitions, without index. +mender_kernel_root_base=/dev/vda + +# Name of the storage device containing root filesystem partitions in GRUB +# format. +mender_grub_storage_device=hd0 + +# Type of kernel (bzImage or zImage) +kernel_imagetype=bzImage + +# Type of initrd image. +# Note: An initrd image is not strictly necessary, and the system will boot and +# update without a initrd image. +# initrd_imagetype=initrd.img diff --git a/board/mender/x86_64/overlay/etc/fstab b/board/mender/x86_64/overlay/etc/fstab new file mode 100644 index 0000000000..45a7ba0260 --- /dev/null +++ b/board/mender/x86_64/overlay/etc/fstab @@ -0,0 +1,7 @@ +# +/dev/root / ext4 rw,noauto 0 1 +/dev/vda1 /boot vfat defaults 0 0 +/dev/vda4 /var/lib/mender ext4 rw,relatime 0 0 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0 +sysfs /sys sysfs defaults 0 0 diff --git a/board/mender/x86_64/overlay/etc/mender/mender.conf b/board/mender/x86_64/overlay/etc/mender/mender.conf new file mode 100644 index 0000000000..5f423fb2cb --- /dev/null +++ b/board/mender/x86_64/overlay/etc/mender/mender.conf @@ -0,0 +1,11 @@ +{ + "InventoryPollIntervalSeconds": 1800, + "UpdatePollIntervalSeconds": 1800, + "RetryPollIntervalSeconds": 300, + "RootfsPartA": "/dev/vda2", + "RootfsPartB": "/dev/vda3", + "ServerCertificate": "/etc/mender/server.crt", + "ServerURL": "https://docker.mender.io", + "TenantToken": "dummy", + "DeviceTypeFile": "/etc/mender/device_type" +} diff --git a/board/mender/x86_64/post-build.sh b/board/mender/x86_64/post-build.sh new file mode 100755 index 0000000000..e93a3cb1c2 --- /dev/null +++ b/board/mender/x86_64/post-build.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env bash +set -e +DEVICE_TYPE="buildroot-x86_64" +ARTIFACT_NAME="1.0" + +function parse_args(){ + local o O opts + o='a:o:d:g:' + O='artifact-name:,data-part-size:,device-type:,generate-mender-image:' + opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" + eval set -- "${opts}" + while [ ${#} -gt 0 ]; do + case "${1}" in + (-o|--data-part-size) + DATA_PART_SIZE="${2}"; shift 2 + ;; + (-d|--device-type) + DEVICE_TYPE="${2}"; shift 2 + ;; + (-g|--generate-mender-image) + GENERATE_MENDER_IMAGE="${2}"; shift 2 + ;; + (-a|--artifact-name) + ARTIFACT_NAME="${2}"; shift 2 + ;; + (--) + shift; break + ;; + esac + done +} + + # Create a persistent directory to mount the data partition at. +function mender_fixup(){ + cd ${TARGET_DIR} + if [[ -L var/lib/mender ]]; then + rm var/lib/mender + mkdir -p var/lib/mender + fi + + # The common paradigm is to have the persistent data volume at /data for mender. + if [[ ! -L data ]]; then + ln -s var/lib/mender data + fi +} + +function main(){ + parse_args "${@}" + mender_fixup + echo "device_type=${DEVICE_TYPE}" > ${TARGET_DIR}/etc/mender/device_type + echo "artifact_name=${ARTIFACT_NAME}" > ${TARGET_DIR}/etc/mender/artifact_info +} + +main "${@}" diff --git a/board/mender/x86_64/post-image-efi.sh b/board/mender/x86_64/post-image-efi.sh new file mode 100755 index 0000000000..2d3e36e614 --- /dev/null +++ b/board/mender/x86_64/post-image-efi.sh @@ -0,0 +1,84 @@ +#!/usr/bin/env bash +set -e +BOARD_DIR="$(realpath $(dirname $0))" +GENIMAGE_CFG="${BOARD_DIR}/genimage-efi.cfg" +DATA_PART_SIZE="32M" +DEVICE_TYPE="buildroot-x86_64" +GENERATE_MENDER_IMAGE="false" +ARTIFACT_NAME="1.0" + + +# Parse arguments. +function parse_args(){ + local o O opts + o='a:o:d:g:' + O='artifact-name:,data-part-size:,device-type:,generate-mender-image:' + opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" + eval set -- "${opts}" + while [ ${#} -gt 0 ]; do + case "${1}" in + (-o|--data-part-size) + DATA_PART_SIZE="${2}"; shift 2 + ;; + (-d|--device-type) + DEVICE_TYPE="${2}"; shift 2 + ;; + (-g|--generate-mender-image) + GENERATE_MENDER_IMAGE="${2}"; shift 2 + ;; + (-a|--artifact-name) + ARTIFACT_NAME="${2}"; shift 2 + ;; + (--) + shift; break + ;; + esac + done +} + +# Create the data partition +function make_data_partition(){ + rm -rf ${BINARIES_DIR}/data-part.ext4 + rm -rf ${BINARIES_DIR}/data-part + mkdir -p ${BINARIES_DIR}/data-part + + ${HOST_DIR}/sbin/mkfs.ext4 \ + -d ${BINARIES_DIR}/data-part \ + -r 1 \ + -N 0 \ + -m 5 \ + -L "data" \ + -O ^64bit ${BINARIES_DIR}/data-part.ext4 "${DATA_PART_SIZE}" + ${HOST_DIR}/sbin/e2fsck -y ${BINARIES_DIR}/data-part.ext4 +} + + +# Create a mender image. +function generate_mender_image(){ + if [[ ${GENERATE_MENDER_IMAGE} == "true" ]]; then + echo "Creating ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" + ${HOST_DIR}/bin/mender-artifact \ + --compression lzma \ + write rootfs-image \ + -t ${DEVICE_TYPE} \ + -n ${BR2_VERSION} \ + -f ${BINARIES_DIR}/rootfs.ext2 \ + -o ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender + fi +} + + +function generate_image(){ + sh support/scripts/genimage.sh -c ${BOARD_DIR}/genimage-efi.cfg +} + +# Main function. +function main(){ + parse_args "${@}" + make_data_partition + generate_image + generate_mender_image + exit $? + +} +main "${@}" diff --git a/board/mender/x86_64/readme.txt b/board/mender/x86_64/readme.txt new file mode 100644 index 0000000000..c006215e6f --- /dev/null +++ b/board/mender/x86_64/readme.txt @@ -0,0 +1,67 @@ +Mender UEFI PC sample config +===================== + +1. Build + + $ make mender_x86_64_efi_defconfig + + Add any additional packages required and build: + + $ make + +2. Write the Pendrive + + The build process will create a Pendrive image called disk.img in + output/images. + + Write the image to a pendrive: + + $ dd if=output/images/disk.img of=/dev/${pendrive}; sync + + Once the process is complete, insert it into the target PC and boot. + + Remember that if said PC has another boot device you might need to + select this alternative for it to boot. + + You might need to disable Secure Boot from the setup as well. + +3. Enjoy + +Emulation in qemu +======================== + +Run the emulation with: + +qemu-system-x86_64 \ + -M pc \ + -bios \ + -drive file=output/images/disk.img,if=virtio,format=raw \ + -net nic,model=virtio \ + -net user + +Note that needs to point to a valid x86_64 UEFI +firmware image for qemu. It may be provided by your distribution as an +edk2 or OVMF package, in a path such as /usr/share/edk2/ovmf/OVMF_CODE.fd. + +Optional arguments: + - -enable-kvm to speed up qemu. This requires a loaded kvm module on the host + system. + - Add -smp N to emulate an SMP system with N CPUs. + +The login prompt will appear in the serial window. + +Tested with QEMU 4.1.1 on Fedora 31 + +Creating a mender-artifact +======================== +In menuconfig -> System configuration, edit the field +"Extra arguments passed to custom scripts" +And change --generate-mender-image=false to --generate-mender-image=true + +You may wish to change --artifact-name=1.0 to a name that best suits your +particular needs, as this option changes the mender artifact name. + +Using mender +======================== +Please read the mender documentation at: +https://docs.mender.io/2.2/getting-started diff --git a/configs/mender_x86_64_efi_defconfig b/configs/mender_x86_64_efi_defconfig new file mode 100644 index 0000000000..aba1c38c7f --- /dev/null +++ b/configs/mender_x86_64_efi_defconfig @@ -0,0 +1,81 @@ +# Architecture +BR2_x86_64=y + +# Toolchain, required for eudev (to autoload drivers) +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +# Required for sysvinit +BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + +# Required as vda4 doesn't mount on first boot with busybox +BR2_INIT_SYSV=y + +# Required tools to create bootable media +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Bootloader +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +# Add mandatory modules from MENDER_GRUBENV_MANDATORY_MODULES +BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop loadenv hashsum echo halt gcry_sha256 test regexp" +BR2_TARGET_GRUB2_INSTALL_TOOLS=y + +# Required tools to create a mender image +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MENDER_ARTIFACT=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_OVERLAY="board/mender/x86_64/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/mender/x86_64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/mender/x86_64/post-image-efi.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--data-part-size=32M --device-type=buildroot-x86_64 --generate-mender-image=false --artifact-name=1.0" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/mender/x86_64/linux.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + +# Firmware +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y + +# Packages +# +# Use connman so that networking setup is simpler, via connmanctl tool +# acpid is for seamless power button support +BR2_PACKAGE_ACPID=y +BR2_PACKAGE_CONNMAN=y +BR2_PACKAGE_CONNMAN_CLIENT=y +BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_MENDER=y +BR2_PACKAGE_MENDER_GRUBENV=y +BR2_PACKAGE_MENDER_GRUBENV_DEFINES="board/mender/x86_64/mender_grubenv_defines" -- 2.31.1 From arnout at mind.be Thu Jan 6 14:45:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 15:45:38 +0100 Subject: [Buildroot] [PATCH v5 1/9] package/nxp: new package directory In-Reply-To: <20200207083857.28058-1-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> Message-ID: <737df820-79da-b710-22fc-dc8c53e9223c@mind.be> Hi Changming, I finally started picking up this series after two years. Unfortunately, I have a lot of requests for changes still. On 07/02/2020 09:38, Changming Huang wrote: > The "nxp" directory is intended to contain all NXP > QorIQ (including PowerPC and LayerScape serial) related packages, > together with their download site and version info. We try to avoid subdirectories in package/; we only add them in case there is some common functionality that needs to be factored out, like for e.g. qt5. In this series, the only commonality that I found is the binary extraction, but it ends up to be used only by qoriq-cadence-dp-firmware. That's not worth it IMHO. Therefore, I marked this patch and rejected. Note that it would make sense to do this if we would also move the freescale-imx stuff into the same directory (freescale is anyway nxp now so it should be OK to do that). > Signed-off-by: Changming Huang > --- > changes since v4: > no changes. > > changes since v3: > no changes. > > changes since v2: > 1. change the sub-direcotry to "nxp". > 2. add helper.mk macro to extract compressed file. > > changes since v1: > no changes. > --- > package/Config.in | 1 + > package/nxp/Config.in | 4 ++++ > package/nxp/helper.mk | 32 ++++++++++++++++++++++++++++++++ > 3 files changed, 37 insertions(+) > create mode 100644 package/nxp/Config.in > create mode 100644 package/nxp/helper.mk > > diff --git a/package/Config.in b/package/Config.in > index bad4f9cba6..f9827769a2 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -497,6 +497,7 @@ endmenu > source "package/nvidia-driver/Config.in" > source "package/nvidia-tegra23/Config.in" > source "package/nvme/Config.in" > + source "package/nxp/Config.in" > source "package/ofono/Config.in" > source "package/on2-8170-modules/Config.in" > source "package/open2300/Config.in" > diff --git a/package/nxp/Config.in b/package/nxp/Config.in > new file mode 100644 > index 0000000000..575542c7ab > --- /dev/null > +++ b/package/nxp/Config.in > @@ -0,0 +1,4 @@ > +menu "NXP QorIQ libraries" > + depends on BR2_aarch64 || BR2_arm || BR2_powerpc64 || BR2_powerpc > + > +endmenu > diff --git a/package/nxp/helper.mk b/package/nxp/helper.mk > new file mode 100644 > index 0000000000..79e4236249 > --- /dev/null > +++ b/package/nxp/helper.mk The .mk file should have the same name as the directory, so nxp.mk. Regards, Arnout > @@ -0,0 +1,32 @@ > +################################################################################ > +# > +# helper > +# > +################################################################################ > + > +# Helper for self-extracting binaries distributed by NXP. > +# > +# The --force option makes sure it doesn't fail if the source > +# directory already exists. The --auto-accept skips the license check, > +# as it is not needed in Buildroot because we have legal-info. Since > +# there's a EULA in the binary file, we extract it in this macro, and > +# it should therefore be added to the LICENSE_FILES variable of > +# packages using this macro. Also, remember to set REDISTRIBUTE to > +# "NO". Indeed, this is a legal minefield: the EULA specifies that the > +# Board Support Package includes software and hardware (sic!) for > +# which a separate license is needed... > +# > +# $(1): full path to the archive file > +# > +define NXP_EXTRACT_HELPER > + awk 'BEGIN { start = 0; } \ > + /^EOEULA/ { start = 0; } \ > + { if (start) print; } \ > + /< + $(1) > $(@D)/EULA > + cd $(@D) && sh $(1) --force --auto-accept > + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; > + rmdir $(@D)/$(basename $(notdir $(1))) > +endef > + > +include $(sort $(wildcard package/nxp/*/*.mk)) > From arnout at mind.be Thu Jan 6 14:48:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 15:48:21 +0100 Subject: [Buildroot] [PATCH v5 4/9] package/qoriq-rcw: add target rcw binary support In-Reply-To: <20200207083857.28058-4-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-4-jerry.huang@nxp.com> Message-ID: On 07/02/2020 09:38, Changming Huang wrote: > From: Jerry Huang > > For NXP QorIQ (PowerPC and Layerscape) platform, > we need to specify the RCW file and build it to binary. > > Introduce BR2_PACKAGE_HOST_QORIQ_RCW_BIN to specify the RCW binary file. It took me some time to understand: this is actually simply about an in-tree RCW source, rather than a custom one. So I heavily modified this patch: - rename the option to _RCW_INTREE; - update commit message, documentation, and internal variables accordingly; - reorganise condition tree so it becomes a little simpler; - add patsubst so the source can be specified as either %.rcw or %.bin; - always install it as PBL.bin, to be consistent with the custom option. Note that that last one (PBL.bin) also affects post-image scripts that use it. But I didn't get down to the ls1028ardb defconfig. Regards, Arnout > > Signed-off-by: Jerry Huang > --- > changes since v4: > no changes. > > changes since v3: > no changes. > > changes since v2: > 1. modify the patch descrition. > 2. more detail for BR2_PACKAGE_HOST_QORIQ_RCW_BIN. > 3. remove two options not used in this patch. > 4. add the condition detection in makefile for QorIQ RCW. > > changes since v1: > 1. add option BR2_PACKAGE_HOST_RCW_ATF for ATF. > --- > package/nxp/qoriq-rcw/Config.in.host | 12 ++++++++++++ > package/nxp/qoriq-rcw/qoriq-rcw.mk | 15 +++++++++++++++ > 2 files changed, 27 insertions(+) > > diff --git a/package/nxp/qoriq-rcw/Config.in.host b/package/nxp/qoriq-rcw/Config.in.host > index 8f78a40908..9bf55894e8 100644 > --- a/package/nxp/qoriq-rcw/Config.in.host > +++ b/package/nxp/qoriq-rcw/Config.in.host > @@ -25,4 +25,16 @@ config BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH > included for use in the SDK or with post scripts but no > RCW binary will not be generated. > > +config BR2_PACKAGE_HOST_QORIQ_RCW_BIN > + string "Custom RCW" > + depends on !BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH > + help > + This option is used to specify the RCW binary file for board. > + which is composed with platform/serdes_value/rcw_file, platform > + is the platform name, serdes_value is the setting of the Serdes, > + rcw_file is the file name of RCW, for example: > + "ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" > + > + If this option is empty, no rcw file is used. > + > endif > diff --git a/package/nxp/qoriq-rcw/qoriq-rcw.mk b/package/nxp/qoriq-rcw/qoriq-rcw.mk > index 7a0494adc6..bbd085f277 100644 > --- a/package/nxp/qoriq-rcw/qoriq-rcw.mk > +++ b/package/nxp/qoriq-rcw/qoriq-rcw.mk > @@ -37,6 +37,21 @@ endef > define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE > $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin > endef > +else > +QORIQ_RCW_PATH_FILE_BIN = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_BIN)) > + > +ifneq ($(QORIQ_RCW_PATH_FILE_BIN),) > +QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_PATH_FILE_BIN))) > +QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_PATH_FILE_BIN))) > + > +define HOST_QORIQ_RCW_BUILD_CMDS > + $(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM) > +endef > + > +define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE > + $(INSTALL) -D -m 0644 $(@D)/$(QORIQ_RCW_PATH_FILE_BIN) $(BINARIES_DIR)/$(QORIQ_RCW_FILE_BIN) > +endef > +endif > endif > > # Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer > From thierry.bultel at linatsea.fr Thu Jan 6 14:56:32 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 6 Jan 2022 15:56:32 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dracut: new host package In-Reply-To: <20220105231654.GL614810@scaer> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-2-thierry.bultel@linatsea.fr> <20220105231654.GL614810@scaer> Message-ID: <365b8f6c-18b5-e30b-3c94-4dff3c51215f@linatsea.fr> > And what about glibc? musl? > > Can we unconditionally install the modules and change their check() > functions to decide whther the moduels is usable or not? Or something > else dynamic? There is not extra work to do for glibc (this is my default configuration). I did not test with musl, yet. >> +ifeq ($(BR2_INIT_BUSYBOX),y) >> +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE >> + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ >> + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh >> +endef >> +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE > And what about systemd as an init system? openrc? sysv-init? Others? Keeping in mind that systemd is the officially supported init system by dracut, there is no extra work for it. However, I brought support for busybox init, through the above dracut module (05busybox-buildroot). Adding support for the other ones could be done later, so I suggest we simply disable dracut when the init system is not supported; by adding ??? depends on !BR2_INIT_SYSV ??? depends on !BR2_INIT_OPENRC in Config.in.host; with the appropriate comment. Does that sound acceptable ? From michael at walle.cc Thu Jan 6 15:00:37 2022 From: michael at walle.cc (Michael Walle) Date: Thu, 06 Jan 2022 16:00:37 +0100 Subject: [Buildroot] [PATCH v5 1/9] package/nxp: new package directory In-Reply-To: <737df820-79da-b710-22fc-dc8c53e9223c@mind.be> References: <20200207083857.28058-1-jerry.huang@nxp.com> <737df820-79da-b710-22fc-dc8c53e9223c@mind.be> Message-ID: <70c6686e301152345e96b4a199d2a96c@walle.cc> Am 2022-01-06 15:45, schrieb Arnout Vandecappelle: > In this series, the only commonality that I found is the binary > extraction, but it ends up to be used only by > qoriq-cadence-dp-firmware. That's not worth it IMHO. mh? all the imx stuff is using this method. > > Therefore, I marked this patch and rejected. > > Note that it would make sense to do this if we would also move the > freescale-imx stuff into the same directory (freescale is anyway nxp > now so it should be OK to do that). ah. yes. that was the idea back then IMHO. -michael From arnout at mind.be Thu Jan 6 15:05:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 16:05:36 +0100 Subject: [Buildroot] [PATCH v5 5/9] boot/arm-trusted-firmware: allow additional make dependencies In-Reply-To: <20200207083857.28058-5-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-5-jerry.huang@nxp.com> Message-ID: On 07/02/2020 09:38, Changming Huang wrote: > Allow specifying additional build dependencies for ATF. > > This might be more useful when using a custom git repository. > > For example, when using with the ATF repository from NXP QorIQ, > the qoriq-rcw is used to build the pbl binary image. This is not a very user-friendly way to do it. Since RCW support is something that is in upstream ATF, I think it makes a whole lot more sense to make it an explicit option. Something like: config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW bool "Include RCW" depends on BR2_HOST_QORIQ_RCW help Include the RCW in BL2. That way you can also add the RCW=$(BINARIES_DIR)/PBL.bin automatically to the variables (and this is an advantage of always calling it PBL.bin :-) I've marked this patch as Changes Requested. Regards, Arnout > > Signed-off-by: Changming Huang > --- > changes since v4: > 1. remove the option BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS. > 2. modify the description. > > changes since v3: > no changes. > > changes since v2: > 1. introduce option BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS. > 2. introduce option BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_DEPENDENCIES. > 3. rewrite the makefile with these two options > > changes since v1: > 1. Use option BR2_PACKAGE_HOST_RCW_ATF as the condition for RCW used by ATF. > --- > boot/arm-trusted-firmware/Config.in | 5 +++++ > boot/arm-trusted-firmware/arm-trusted-firmware.mk | 3 +++ > 2 files changed, 8 insertions(+) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in > index 373591d497..c9b74064d7 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -142,6 +142,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS > E.G. When using the QorIQ custom ATF repository from NXP, > the target 'pbl' can be used to build the pbl binary. > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_DEPENDENCIES > + string "Additional AFT dependencies" > + help > + Additional dependencies for ATF build, E.G. "host-qoriq-rcw" > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES > string "Additional ATF build variables" > help > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > index bf1ac46cf6..43be2fef99 100644 > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > @@ -92,6 +92,9 @@ endif > > ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all > > +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += \ > + $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_DEPENDENCIES)) > + > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) > ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip > ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-openssl > From thomas.petazzoni at bootlin.com Thu Jan 6 15:13:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 16:13:47 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dracut: new host package In-Reply-To: <365b8f6c-18b5-e30b-3c94-4dff3c51215f@linatsea.fr> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-2-thierry.bultel@linatsea.fr> <20220105231654.GL614810@scaer> <365b8f6c-18b5-e30b-3c94-4dff3c51215f@linatsea.fr> Message-ID: <20220106161347.014794a6@windsurf> On Thu, 6 Jan 2022 15:56:32 +0100 Thierry Bultel wrote: > Keeping in mind that systemd is the officially supported init system by > dracut, there is no extra work > for it. However, I brought support for busybox init, through the above > dracut module (05busybox-buildroot). > Adding support for the other ones could be done later, so I suggest we > simply disable dracut when the > init system is not supported; by adding > > ??? depends on !BR2_INIT_SYSV > ??? depends on !BR2_INIT_OPENRC > > in Config.in.host; with the appropriate comment. Does that sound > acceptable ? But is it just the init system that requires those special dracut "modules" ? Or other aspects of the system will also require some special modules ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From michael at walle.cc Thu Jan 6 15:14:01 2022 From: michael at walle.cc (Michael Walle) Date: Thu, 06 Jan 2022 16:14:01 +0100 Subject: [Buildroot] [PATCH v5 6/9] package/qoriq-cadence-dp-firmware: new package In-Reply-To: <20200207083857.28058-6-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-6-jerry.huang@nxp.com> Message-ID: <8c5bab4b73c9feeca842eef7c51f9b12@walle.cc> Am 2020-02-07 09:38, schrieb Changming Huang: > From: Jerry Huang > > This package provides the firmware for LS1028ARDB DP (display port). > > Signed-off-by: Jerry Huang Arnout, please note that upstream uboot and linux won't use this firmware. So this can be dropped. Proper support for the cadence phy will likely be using the request_firmware() method in linux (and i guess binaries will then end up in the linux-firmware package). -michael From arnout at mind.be Thu Jan 6 15:19:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 16:19:13 +0100 Subject: [Buildroot] [PATCH v5 6/9] package/qoriq-cadence-dp-firmware: new package In-Reply-To: <20200207083857.28058-6-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-6-jerry.huang@nxp.com> Message-ID: <630ac08b-3908-c4eb-a8ba-18518e27d8cc@mind.be> On 07/02/2020 09:38, Changming Huang wrote: > From: Jerry Huang > > This package provides the firmware for LS1028ARDB DP (display port). > > Signed-off-by: Jerry Huang Applied to master, with a few changes: - move out of nxp directory; - add extraction helper; - set REDISTRIBUTE to NO. Regards, Arnout > --- > changes since v4: > 1. remove the variable NXP_QORIQ_SITE. > 2. use the url for qoriq-cadence-dp-firmware site directly. > > changes since v3: > no changes. > > changes since v2: > 1. change the package name to qoriq-cadence-dp-firmware. > 2. add the hash of COPYING. > 3. modify makefile with new option. > 4. update DEVELOPERS with alphabetic ordering > > changes since v1: > 1. rename the package to fsl-qoriq-cadence-dp-fw. > 2. update DEVELOPERS. > 3. add the hash of package. > 4. modify the context fo config file to package name. > 5. re-write the makefile according to rule of buildroot. > 6. add the license message in makefile. > --- > DEVELOPERS | 3 +++ > package/nxp/Config.in | 2 ++ > .../nxp/qoriq-cadence-dp-firmware/Config.in | 4 ++++ > .../qoriq-cadence-dp-firmware.hash | 3 +++ > .../qoriq-cadence-dp-firmware.mk | 23 +++++++++++++++++++ > 5 files changed, 35 insertions(+) > create mode 100644 package/nxp/qoriq-cadence-dp-firmware/Config.in > create mode 100644 package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash > create mode 100644 package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index e555b9773b..ffb07d67ea 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -529,6 +529,9 @@ F: configs/nanopi_m1_plus_defconfig > F: configs/olimex_a13_olinuxino_defconfig > F: configs/orangepi_plus_defconfig > > +N: Changming Huang > +F: package/nxp/qoriq-cadence-dp-firmware/ > + > N: Chris Packham > F: package/gstreamer1/gst1-shark/ > F: package/micropython/ > diff --git a/package/nxp/Config.in b/package/nxp/Config.in > index 575542c7ab..855d62700b 100644 > --- a/package/nxp/Config.in > +++ b/package/nxp/Config.in > @@ -1,4 +1,6 @@ > menu "NXP QorIQ libraries" > depends on BR2_aarch64 || BR2_arm || BR2_powerpc64 || BR2_powerpc > > +source "package/nxp/qoriq-cadence-dp-firmware/Config.in" > + > endmenu > diff --git a/package/nxp/qoriq-cadence-dp-firmware/Config.in b/package/nxp/qoriq-cadence-dp-firmware/Config.in > new file mode 100644 > index 0000000000..3f494bd3a3 > --- /dev/null > +++ b/package/nxp/qoriq-cadence-dp-firmware/Config.in > @@ -0,0 +1,4 @@ > +config BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE > + bool "qoriq-cadence-dp-firmware" > + help > + NXP QorIQ cadence DP firmware, a resident EL3 firmware. > diff --git a/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash b/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash > new file mode 100644 > index 0000000000..89aaf1d71b > --- /dev/null > +++ b/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 5871c5717be32f14a59624d5699d405e8ce9ae2e9c9ef86fd16e13d264a40e58 firmware-cadence-lsdk1909.bin > +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING > diff --git a/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk > new file mode 100644 > index 0000000000..5c29602574 > --- /dev/null > +++ b/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk > @@ -0,0 +1,23 @@ > +################################################################################ > +# > +# qoriq-cadence-dp-firmware > +# > +################################################################################ > + > +QORIQ_CADENCE_DP_FIRMWARE_VERSION = lsdk1909 > +QORIQ_CADENCE_DP_FIRMWARE_SITE = http://www.nxp.com/lgfiles/sdk/$(QORIQ_CADENCE_DP_FIRMWARE_VERSION) > +QORIQ_CADENCE_DP_FIRMWARE_SOURCE = firmware-cadence-$(QORIQ_CADENCE_DP_FIRMWARE_VERSION).bin > +QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP-Binary-EULA > +QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING > +QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES > +QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO > + > +define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS > + $(call NXP_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) > +endef > + > +define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS > + $(INSTALL) -D -m 0644 $(@D)/dp/ls1028a-dp-fw.bin $(BINARIES_DIR)/ls1028a-dp-fw.bin > +endef > + > +$(eval $(generic-package)) > From john at metanate.com Thu Jan 6 15:19:42 2022 From: john at metanate.com (John Keeping) Date: Thu, 6 Jan 2022 15:19:42 +0000 Subject: [Buildroot] [PATCH] download/git: fix LFS support Message-ID: <20220106151942.1506534-1-john@metanate.com> The original patch for commit cff428fe31 ("download/git: support Git LFS") included a call to "git lfs install" but this was a problem as it could modify ~/.gitconfig outside the dl/ tree. When this was updated it was thought that the modification to gitconfig was unnecessary because the LFS fetch and checkout steps are performed manually. Unfortunately, this is not correct and the LFS checkout fails with: Cannot checkout LFS objects, Git LFS is not installed. Add the call to "git lfs install", with the --local option so that only the repository's .git/config is modified and not the user's global ~/.gitconfig. This is also required for submodules as the parent repository's config is not inherited. Cc: Arnout Vandecappelle Cc: Vincent Fazio Signed-off-by: John Keeping --- support/download/git | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/download/git b/support/download/git index 41c3160099..1a1c315f73 100755 --- a/support/download/git +++ b/support/download/git @@ -209,10 +209,12 @@ fi # If there are large files then fetch them. if [ ${large_file} -eq 1 ]; then + _git lfs install --local _git lfs fetch _git lfs checkout # If there are also submodules, recurse into them, if [ ${recurse} -eq 1 ]; then + _git submodule foreach --recursive ${GIT} lfs install --local _git submodule foreach --recursive ${GIT} lfs fetch _git submodule foreach --recursive ${GIT} lfs checkout fi -- 2.34.1 From john at metanate.com Thu Jan 6 15:03:50 2022 From: john at metanate.com (John Keeping) Date: Thu, 6 Jan 2022 15:03:50 +0000 Subject: [Buildroot] [PATCH 1/1] download/git: support Git LFS In-Reply-To: References: <20200121203337.30856-1-vfazio@xes-inc.com> Message-ID: Hi Arnout, On Thu, Jan 06, 2022 at 11:35:21AM +0100, Arnout Vandecappelle wrote: > I finally applied this to master, with a few minor changes. Thanks for merging this! > On 21/01/2020 21:33, Vincent Fazio wrote: > > From: John Keeping > > > > Git Large File Storage replaces large files with text pointers in the > > Git repository while storing the contents on a remote server. If a > > repository is using this extension, then git-lfs must be used to > > checkout the large files before the source archive is generated. > > > > Signed-off-by: John Keeping > > [vfazio: > > - add git-lfs to DL_TOOLS_DEPENDENCIES > > - fixup for 5a0d6813948fea2cdb88a2e35984520eec856dec > > ("infra/pkg-download: make the DOWNLOAD macro fully parameterised") > > ] > > Signed-off-by: Vincent Fazio > > [snip] > > > +# If there are large files then fetch them. > > +if [ ${large_file} -eq 1 ]; then > > + _git lfs install > > AFAICS an lfs install is not needed. IMHO it's pretty bad to do that > because it updates ~/.gitconfig, which Buildroot shouldn't do. We could do > lfs install --local, but even that is not needed. The lfs install just makes > sure that lfs is done automatically whenever you do commit or pull or > something like that, but in Buildroot we always do it explicitly so the > smudge filter isn't needed. I had a local update with --local. Unfortunately it seems that install is necessary as when testing the committed version (having removed the filter config from ~/.gitconfig) I get: Cannot checkout LFS objects, Git LFS is not installed. I'll send a patch to do `git lfs install --local` here. > > + _git lfs fetch > > + _git lfs checkout > > As already mentioned by Yann, this doesn't work when combined with > submodules. The solution is pretty trivial: > > # If there are also submodules, recurse into them, > if [ ${recurse} -eq 1 ]; then > _git submodule foreach --recursive ${GIT} lfs fetch > _git submodule foreach --recursive ${GIT} lfs checkout > fi > > I haven't actually tested this though. I have a test repo with LFS submodules and I can confirm this works (modulo the install concern above). > Vincent (or anybody), it would be nice to have a runtime test for this > feature. support/testing/tests/download/br2-external/git-refs/package/git-submodule-{enabled,disabled} > can be a good source of inspiration. Only I'm not sure if it's possible to > set up an LFS repository that is purely file-based. Yes, I think you're right that LFS requires HTTPS. It's possible to combine that with any Git protocol, but the LFS transfer is always HTTPS, so any runtime tests would require a temporary server. John From romain.naour at smile.fr Thu Jan 6 15:35:41 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 16:35:41 +0100 Subject: [Buildroot] [PATCHv3 1/2] package/mender: remove single hyphen command Message-ID: <20220106153542.1668688-1-romain.naour@smile.fr> Single hyphen commands has been removed since Mender 3.0.0 [1] [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 Signed-off-by: Romain Naour Cc: Adam Duskett --- package/mender/S42mender | 2 +- package/mender/mender-client.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mender/S42mender b/package/mender/S42mender index 108fecfea9..dc60f94f8b 100644 --- a/package/mender/S42mender +++ b/package/mender/S42mender @@ -25,7 +25,7 @@ start() { umask 077 start-stop-daemon -S -q -b -m -p /var/run/mender.pid \ - --exec /usr/bin/mender -- -daemon + --exec /usr/bin/mender -- daemon [ $? = 0 ] && echo "OK" || echo "FAIL" } stop() { diff --git a/package/mender/mender-client.service b/package/mender/mender-client.service index 2a5f476ee5..5539a56fd6 100644 --- a/package/mender/mender-client.service +++ b/package/mender/mender-client.service @@ -17,7 +17,7 @@ if [ -L /var/lib/mender \ mkdir -p "$(readlink /var/lib/mender)"; \ fi; \ fi' -ExecStart=/usr/bin/mender -daemon +ExecStart=/usr/bin/mender daemon Restart=on-abort [Install] -- 2.31.1 From jesse_dev at fastmail.com Thu Jan 6 15:37:49 2022 From: jesse_dev at fastmail.com (Jesse Millwood) Date: Thu, 06 Jan 2022 10:37:49 -0500 Subject: [Buildroot] Overriding Kconfig Values from external br2 In-Reply-To: <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> References: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> Message-ID: On Thu, 2022-01-06 at 10:45 +0100, Arnout Vandecappelle wrote: > > > On 05/01/2022 20:03, Jesse Millwood wrote: > > Hello, > > > > I have an external C/C++ toolchain that I've put together that uses > > MUSL. I've > > also built an external Rust toolchain that uses my MUSL toolchain. > > > > My issue is that there is a Rust Kconfig variable that specifies if > > a specific > > architecture supports Rust. > > > > The Kconfig variable in question is > > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > > in package/rustc/Config.in.host. > > [snip] > > > You may notice that I changed the libc depends line to be or'd with > > BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get considered > > when I > > choose my external musl toolchain option. In the menuconfig when I > > search for > > the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with the > > "/" key it > > looks like it is only getting it from the original file. Does > > buildroot have a > > mechanism for overwriting this kind of setting and if not, does > > anyone have an > > idea of how I would accomplish what I am trying to do (make > > buildroot honor my > > external rust toolchain)? > > ? No, there's no way to override the dependencies of an existing > Config.in > symbol in an external. > > ? However, this was corrected in upstream Buildroot in commit > d69d40c029dc7d8199b745eaee759d92b66c5d17. So you can try to backport > that commit > instead, or just update Buildroot to something more recent. Arnout, thanks for the pointer to the commit. That is a logical way to support other platforms. However, I have a powerpc musl rust toolchain that I've built externally. With the changes in that commit can I set BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS to "y" in my external now that there is no depends expressions and it is all default logic? Or would I have to still add another expression that maybe defaults to "y" if a new variable is true like "BR2_EXTERNAL_RUSTC_TARGET_ARCH_SUPPORTS" that is defined in my external? Thanks, Jesse > > ? Regards, > ? Arnout > > > > > > Thanks, > > Jesse > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Jan 6 15:54:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 16:54:51 +0100 Subject: [Buildroot] [PATCH v5 7/9] package/qoriq-rcw:Enable IIC5_PMUX and CLK_OUT_PMUX for GPIO In-Reply-To: <20200207083857.28058-7-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-7-jerry.huang@nxp.com> Message-ID: <835d05ab-20ed-8445-a2ef-285760b215a3@mind.be> On 07/02/2020 09:38, Changming Huang wrote: > From: Jerry Huang > > Because GPIO is used as interrupt for eNETC PHY and Micro-bus, > IIC5_PMUX and CLK_OUT_PMUX are enabled for GPIO. This sounds like something really board specific, which should be applied upstream first and lacking that, it's IMHO better to use BR2_GLOBAL_PATCH_DIR and do it in the board-specific defconfig instead of patching qoriq-rcw package. In addition, qoriq-rcw has been updated so the patch maybe doesn't apply any more. Therefore, I marked this one as Rejected. Regards, Arnout > > Signed-off-by: Jerry Huang > --- > changes since v4: > no changes. > > changes since v3: > no changes. > > changes since v2: > no changes. > > changes since v1: > 1. change to unconditional for these two patches. > --- > ...b-Enable-IIC5_PMUX-for-GPIO-function.patch | 42 +++++++++++++++++++ > ...nable-CLK_OUT_PMUX-for-GPIO-function.patch | 40 ++++++++++++++++++ > 2 files changed, 82 insertions(+) > create mode 100644 package/nxp/qoriq-rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch > create mode 100644 package/nxp/qoriq-rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch > > diff --git a/package/nxp/qoriq-rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch b/package/nxp/qoriq-rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch > new file mode 100644 > index 0000000000..21c6c84cbd > --- /dev/null > +++ b/package/nxp/qoriq-rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch > @@ -0,0 +1,42 @@ > +From 33b403cee1fa215927bc65dc14baf35a2fdbe7b3 Mon Sep 17 00:00:00 2001 > +From: Jerry Huang > +Date: Thu, 19 Sep 2019 12:12:20 +0800 > +Subject: [PATCH 1/2] ls1028ardb: Enable IIC5_PMUX for GPIO function > + > +Set IIC5_PMUX = 1 to enable GPIO function. > + > +Signed-off-by: Jianchao Wang > +Signed-off-by: Jerry Huang > +--- > + ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw | 2 +- > + ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > +index b46ea2e..5466a63 100644 > +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > +@@ -26,7 +26,7 @@ SYSCLK_FREQ=600 > + IIC2_PMUX=6 > + IIC3_PMUX=2 > + IIC4_PMUX=2 > +-IIC5_PMUX=2 > ++IIC5_PMUX=1 > + IIC6_PMUX=2 > + CLK_OUT_PMUX=2 > + EC1_SAI4_5_PMUX=5 > +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > +index 04e2208..1908d8c 100644 > +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > +@@ -26,7 +26,7 @@ SYSCLK_FREQ=600 > + IIC2_PMUX=6 > + IIC3_PMUX=2 > + IIC4_PMUX=2 > +-IIC5_PMUX=2 > ++IIC5_PMUX=1 > + IIC6_PMUX=3 > + CLK_OUT_PMUX=2 > + EC1_SAI4_5_PMUX=5 > +-- > +2.17.1 > diff --git a/package/nxp/qoriq-rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch b/package/nxp/qoriq-rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch > new file mode 100644 > index 0000000000..4f00541d69 > --- /dev/null > +++ b/package/nxp/qoriq-rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch > @@ -0,0 +1,40 @@ > +From 4a3c9ea5d0c7bf8eec8cb6276d6f4d940f3946db Mon Sep 17 00:00:00 2001 > +From: Jerry Huang > +Date: Thu, 19 Sep 2019 12:13:48 +0800 > +Subject: [PATCH 2/2] ls1028ardb/rcw: Enable CLK_OUT_PMUX for GPIO function > + > +Signed-off-by: Jianchao Wang > +Signed-off-by: Jerry Huang > +--- > + ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw | 2 +- > + ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > +index 5466a63..a5ed4d4 100644 > +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > +@@ -28,7 +28,7 @@ IIC3_PMUX=2 > + IIC4_PMUX=2 > + IIC5_PMUX=1 > + IIC6_PMUX=2 > +-CLK_OUT_PMUX=2 > ++CLK_OUT_PMUX=1 > + EC1_SAI4_5_PMUX=5 > + EC1_SAI3_6_PMUX=5 > + USB3_CLK_FSEL=39 > +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > +index 1908d8c..c930b83 100644 > +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > +@@ -28,7 +28,7 @@ IIC3_PMUX=2 > + IIC4_PMUX=2 > + IIC5_PMUX=1 > + IIC6_PMUX=3 > +-CLK_OUT_PMUX=2 > ++CLK_OUT_PMUX=1 > + EC1_SAI4_5_PMUX=5 > + EC1_SAI3_6_PMUX=5 > + USB3_CLK_FSEL=39 > +-- > +2.17.1 > From arnout at mind.be Thu Jan 6 15:55:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 16:55:41 +0100 Subject: [Buildroot] [PATCH v5 8/9] package/nxp/qoriq-rcw: introduce BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE for boot mode In-Reply-To: <20200207083857.28058-8-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-8-jerry.huang@nxp.com> Message-ID: <62235760-30ce-66a6-fe64-1ab11d3604e3@mind.be> On 07/02/2020 09:38, Changming Huang wrote: > Introduce BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE for the boot mode. > Because the RCW binary can be stored in different media, for example: > sd - RCW locate in SD card, boot the board from SD card > emmc - RCW locate in eMMC chip, boot the board from eMMC chip > qspi - RCW locate in QSPI flash, boot the board from QSPI flash > flexspi_nor - RCW locate in flexSPI, boot the board from flexSPI Nor/Nand flash > > Signed-off-by: Changming Huang > --- > changes since v4: > no changes. > > changes since v3: > 1. split this option from board patch. > --- > package/nxp/qoriq-rcw/Config.in.host | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/nxp/qoriq-rcw/Config.in.host b/package/nxp/qoriq-rcw/Config.in.host > index 9bf55894e8..7f5fbb3202 100644 > --- a/package/nxp/qoriq-rcw/Config.in.host > +++ b/package/nxp/qoriq-rcw/Config.in.host > @@ -37,4 +37,10 @@ config BR2_PACKAGE_HOST_QORIQ_RCW_BIN > > If this option is empty, no rcw file is used. > > +config BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE You introduce this symbol but it is not used anywhere. So what is the point? I marked it as rejected. Regards, Arnout > + string "QorIQ RCW Boot mode" > + depends on !BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH > + help > + Specify the boot mode, for example, sd, emmc, flexspi_nor. > + > endif > From thierry.bultel at linatsea.fr Thu Jan 6 15:56:52 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 6 Jan 2022 16:56:52 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dracut: new host package In-Reply-To: <20220106161347.014794a6@windsurf> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-2-thierry.bultel@linatsea.fr> <20220105231654.GL614810@scaer> <365b8f6c-18b5-e30b-3c94-4dff3c51215f@linatsea.fr> <20220106161347.014794a6@windsurf> Message-ID: Le 06/01/2022 ? 16:13, Thomas Petazzoni a ?crit?: > On Thu, 6 Jan 2022 15:56:32 +0100 > Thierry Bultel wrote: > >> Keeping in mind that systemd is the officially supported init system by >> dracut, there is no extra work >> for it. However, I brought support for busybox init, through the above >> dracut module (05busybox-buildroot). >> Adding support for the other ones could be done later, so I suggest we >> simply disable dracut when the >> init system is not supported; by adding >> >> ??? depends on !BR2_INIT_SYSV >> ??? depends on !BR2_INIT_OPENRC >> >> in Config.in.host; with the appropriate comment. Does that sound >> acceptable ? > But is it just the init system that requires those special dracut > "modules" ? Or other aspects of the system will also require some > special modules ? The dracut modules are used at build time. The rule is that any file that is expected in the dracut image must be handled by a dracut module. For instance, "host/lib/dracut/modules.d/00bash" "host/lib/dracut/modules.d/50sshd" work out of the box. The implicitely loaded "90kernel-modules" (that check modules dependencies to one another, and to firmwares) also work fine. But nothing handles /etc/init.d/rcS, typically. And all the wanted init scripts (/etc/init.d/S40network is a good example) must be taken individually. A huge work would be to contribute to dracut to bring whole support for initd scripts, but I think it is out of the scope. Another reason to write a module is when dracut does not support the feature, yet, for instance, I had to write one for hostapd. Apparently it is not a common case to have the wifi in an initramfs, but for a recovery system, that makes more sense. Adding support for SYSV or OPENRC basically consists in writing the appropriate rules in new modules to bring the expected files to the filesystem, nothing more. By the way, my suggestion to use "depends on !xxx" directives cannot work because it does an "unmet direct dependency detected", since BR2_PACKAGE_HOST_DRACUT is selected by BR2_TARGET_ROOTFS_CPIO_DRACUT I am a little bit confused about how to solve that properly. Thierry > Thomas From romain.naour at smile.fr Thu Jan 6 16:13:01 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 17:13:01 +0100 Subject: [Buildroot] [PATCHv3 2/2] support/testing: add package/test_mender.py Message-ID: <20220106161301.1910709-1-romain.naour@smile.fr> From: Mikael Bourhis-Cloarec Create a test to check Mender client at runtime. The aim of this test is: - to check the correct execution of simple Mender commands, in a minimal environment; - to validate there is no missing dependencies for runtime. This test is not a board integration test for Mender, including well-configured bootloader, partitioning, ... Check: - the daemon is started; - the current 'artifact name' (name of the image or update) of the active partition is read, without error. For that, we need to fake (see the 'overlay' directory): - some bootloader environment variables; - the name of an update. Signed-off-by: Mikael Bourhis-Cloarec [Romain: remove single hyphen command (Mender 3.0.0)] Signed-off-by: Romain Naour --- v3: remove single hyphen command (Mender 3.0.0) Changes v1 -> v2: - Update the test by removing unnecessary 'build' option (Thomas P.) - Remove a useless test case (Thomas P.) --- support/testing/tests/package/test_mender.py | 32 +++++++++++++++++++ .../rootfs-overlay/etc/mender/artifact_info | 1 + .../rootfs-overlay/usr/bin/fw_printenv | 6 ++++ 3 files changed, 39 insertions(+) create mode 100644 support/testing/tests/package/test_mender.py create mode 100644 support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info create mode 100755 support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv diff --git a/support/testing/tests/package/test_mender.py b/support/testing/tests/package/test_mender.py new file mode 100644 index 0000000000..fdf55ed616 --- /dev/null +++ b/support/testing/tests/package/test_mender.py @@ -0,0 +1,32 @@ +import os + +import infra.basetest + + +class TestMender(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MENDER=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_ROOTFS_OVERLAY="{}" + """.format( + # overlay to add a fake 'fw_printenv', used by Mender + infra.filepath("tests/package/test_mender/rootfs-overlay")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check if the Daemon is running + self.assertRunOk("ls /var/run/mender.pid") + self.assertRunOk("ps aux | egrep [m]ender") + + # Check if a simple Mender command is correctly executed + self.assertRunOk("mender -log-level debug show-artifact") + self.assertRunOk("mender -log-level debug show-artifact | grep 'RUNTIME_TEST_ARTIFACT_NAME'") + cmd = "mender show-artifact 2>&1 | grep -i 'err'" # Check if no 'error' among the traces + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 1) diff --git a/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info b/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info new file mode 100644 index 0000000000..4d54b8f89c --- /dev/null +++ b/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info @@ -0,0 +1 @@ +artifact_name=RUNTIME_TEST_ARTIFACT_NAME diff --git a/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv b/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv new file mode 100755 index 0000000000..c002a0f2b8 --- /dev/null +++ b/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv @@ -0,0 +1,6 @@ +#!/bin/sh + +# Fake 'fw_printenv' because UBoot is not installed: print some plausible 'key-value' +echo "bootcount=0" +echo "mender_boot_part=rootfs" +echo "upgrade_available=0" -- 2.31.1 From arnout at mind.be Thu Jan 6 16:27:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 17:27:51 +0100 Subject: [Buildroot] [PATCH v5 9/9] board/nxp/ls1028ardb: new board In-Reply-To: <20200207083857.28058-9-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-9-jerry.huang@nxp.com> Message-ID: <7bc67415-6ac6-de19-449c-a70c471e9b72@mind.be> On 07/02/2020 09:38, Changming Huang wrote: > This is to support NXP LS1028ARDB board in Buildroot. > The board is setup to track the Linux at 4.19 via NXP LSDK-19.09. > > The target will build uboot and RCW binary with arm-trusted-firmware support. > > board/nxp/ls1028ardb/: scripts related with ls1028ardb > nxp_ls1028ardb-64b_defconfig: defconfig boot from SD card > > Signed-off-by: Changming Huang Due to the changes in other packages and because some of the previous patches weren't applied, this defconfig wouldn't be valid any more so I marked it as Changes Requested. [snip] > diff --git a/board/nxp/common/ls/busybox.config b/board/nxp/common/ls/busybox.config > new file mode 100644 > index 0000000000..7074c65aa6 > --- /dev/null > +++ b/board/nxp/common/ls/busybox.config Since you're only adding a single board here, I prefer to put it in the board-specific directory, and to move it to common/ later if it turns out to be indeed shared. But that's a minor thing. > @@ -0,0 +1,9 @@ > +# > +# Additional Busybox Settings > +# > +CONFIG_TASKSET=y > +CONFIG_FEATURE_TASKSET_FANCY=y > +CONFIG_FEATURE_DF_FANCY=y > +CONFIG_FEATURE_SEAMLESS_GZ=y > +CONFIG_FEATURE_SEAMLESS_BZ2=y > +CONFIG_FEATURE_SEAMLESS_XZ=y I understand that you probably need taskset on a LayerScape (although, is it used by anything in this defconfig?). But I don't understand why you need all the rest. Please explain that in the commit message. > diff --git a/board/nxp/ls1028ardb/genimage.sd.cfg.template b/board/nxp/ls1028ardb/genimage.sd.cfg.template > new file mode 100644 > index 0000000000..ab50e103c1 > --- /dev/null > +++ b/board/nxp/ls1028ardb/genimage.sd.cfg.template > @@ -0,0 +1,52 @@ > +# Minimal SD card image for the NXP boards Template > +# > +# SD card image (sdcard.img) format: > +# * the SD card must have 4 kB free space at the beginning, > +# * U-Boot is dumped as is, > +# * a FAT partition at offset 64 MB is containing Image and DTB files I don't know if it's possible for this board, but generally we prefer to use the modern organisation with just a single rootfs partition which has the kernel and extlinux.conf in /boot. U-Boot should support that. But if that's an unusual configuration for this board, it's OK to keep it as is. > +# * a single root filesystem partition is required (ext2, ext3 or ext4) > +# > + > +image boot.vfat { > + vfat { > + files = { > + %FILES% > + } > + } > + size = 256M Isn't that way too much? I think it should fit in something like 16M, no? > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition rcw { > + in-partition-table = "no" > + image = "bl2_sd.pbl" > + offset = 4096 > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "fip.bin" > + offset = 1M > + } > + > + partition u-boot-environment { > + in-partition-table = "no" > + image = "uboot-env.bin" > + offset = 5M > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + offset = 64M Isnt this way too much? Everything before fits in 8M, so why such a large offset? > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext2" > + } > +} > diff --git a/board/nxp/ls1028ardb/post-image.sh b/board/nxp/ls1028ardb/post-image.sh > new file mode 100755 > index 0000000000..c655074386 > --- /dev/null > +++ b/board/nxp/ls1028ardb/post-image.sh > @@ -0,0 +1,57 @@ > +#!/usr/bin/env bash > +# args from BR2_ROOTFS_POST_SCRIPT_ARGS > +# $2 linux building directory > +# $3 buildroot top directory > +# $4 u-boot building directory AFAICS none of these arguments are actually used, so just remove them. > + > +# > +# dtb_list extracts the list of DTB files from BR2_LINUX_KERNEL_INTREE_DTS_NAME > +# in ${BR_CONFIG}, then prints the corresponding list of file names for the > +# genimage configuration file > +# > +dtb_file() > +{ > + local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" > + > + for dt in $DTB_LIST; do > + echo -n "\"`basename $dt`.dtb\", " > + done > +} Why not just ls $(BINARIES_DIR)/*.dtb ? > + > +# > +# genimage.sd.cfg.template: Boot from SD > +# genimage.emmc.cfg.template: Boot from eMMC > +# > +genimage_type() > +{ > + if grep -Eq "^BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE=\"emmc\"$" ${BR2_CONFIG}; then Ah, this is where you use boot mode! This is really not OK, we can't have a generic option in a package that gets used in a board specific config. In this case it's pretty simple: you only have sd support in this defconfig, so hardcode sd. If you later want to add another defconfig with emmc, you can add it as a BR2_ROOTFS_POST_SCRIPT_ARGS argument to the script. > + echo "genimage.emmc.cfg.template" > + elif grep -Eq "^BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE=\"sd\"$" ${BR2_CONFIG}; then > + echo "genimage.sd.cfg.template" > + fi > +} > + > +main() > +{ > + local FILES="$(dtb_file) "ls1028a-dp-fw.bin", "Image"" Just for my information: who is consuming that firmware file? Since it's in the FAT partition, I guess it's not loaded by the kernel, but by U-Boot or ATF or something? > + local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" > + local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > + sed -e "s/%FILES%/${FILES}/" \ > + board/nxp/ls1028ardb/$(genimage_type) > ${GENIMAGE_CFG} You can avoid the board/nxp/ls1028ardb hardcoding by using ${0%/*} ${0%/*}/genimage.$2.cfg.template > ${GENIMAGE_CFG} > + > + rm -rf "${GENIMAGE_TMP}" > + > + genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > + rm -f ${GENIMAGE_CFG} > + > + exit $? > +} > + > +main $@ main "$@" > diff --git a/board/nxp/ls1028ardb/readme.txt b/board/nxp/ls1028ardb/readme.txt > new file mode 100644 > index 0000000000..713babd7c3 > --- /dev/null > +++ b/board/nxp/ls1028ardb/readme.txt > @@ -0,0 +1,61 @@ > +LS1028ARDB board is one platform based on LS1028A silicon for industry, > +which is supported in LSDK-19.09. > + > +One simple image file is created by buildroot, which includes RCW, uboot, > +Linux kernel, rootfs and other necessary binaries for this board. > + > +To program the image file created by buildroot into the flash. > +There are two way to do it: > + > +1. Program the image file on PC machine for SD card boot > + $ sudo dd if=./output/images/sdcard.img of=/dev/sdx > + # or in some other host machine: > + $ sudo dd if=./output/images/sdcard.img of=/dev/mmcblkx > + > + # find the right SD Card device name in your host machine and replace the > + # ?sdx? or ?mmcblkx?. > + > +2. Program the image file on board for eMMC and XSPI boot > +Make sure your board has ipaddr, netmask, and serverip defined to reach your > +tftp server. > + > + 2.1 Program eMMC boot image file to eMMC chip > + # Make sure output/images/sdcard.img is stored to tftp server If you can simply use the SD image for eMMC as well, why do you distinguish between them? > + # Below command is one example > + => tftpboot 0xa0000000 sdcard.img > + => mmc dev 1 > + => mmc erase 0 0x200000 > + => mmc write 0xa0000000 0 0x200000 > + > + # The size "0x200000" will be changed when the image size is different. > + > + 2.2 Program XSPI boot image file to flash > + # Make sure output/images/xspi.cpio.img is stored to tftp server > + # Below command is one example > + => tftpboot 0xa0000000 xspi.cpio.img Where does this xspi.cpio.img come from? > + => sf probe > + => sf erase 0 $filesize > + => sf write 0xa0000000 0 $filesize > + > +3. Booting your new system > +Before booting the new system, we should make sure the switch setting is right. > +below switch setting is for each booting mode: > + +-----------+---------------------+ > + |Boot mode | Switch setting | > + +---------------------------------+ > + |SD boot | SW2[1~4] = 0b?1000 | > + +---------------------------------+ > + |eMMC boot | SW2[1~4] = 0b?1001 | > + +---------------------------------+ > + |XSPI boot | SW2[1~4] = 0b?1111 | > + +-----------+---------------------+ > + > +or we use following command to reset the board in uboot prompt: > + # boot from SD card > + => qixis_reset sd > + > + # boot from eMMC chip > + => qixis_reset emmc > + > + # boot from XSPI > + => qixis_reset qspi > diff --git a/board/nxp/ls1028ardb/rootfs_overlay/etc/udev/rules.d/10-network.rules b/board/nxp/ls1028ardb/rootfs_overlay/etc/udev/rules.d/10-network.rules > new file mode 100644 > index 0000000000..19f41634bd > --- /dev/null > +++ b/board/nxp/ls1028ardb/rootfs_overlay/etc/udev/rules.d/10-network.rules > @@ -0,0 +1,16 @@ > +# ENETC rules > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.0", DRIVERS=="fsl_enetc", NAME:="eno0" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.1", DRIVERS=="fsl_enetc", NAME:="eno1" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.2", DRIVERS=="fsl_enetc", NAME:="eno2" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.6", DRIVERS=="fsl_enetc", NAME:="eno3" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.0", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf0" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.1", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf1" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.2", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf0" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.3", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf1" > +# LS1028 switch rules > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p0", NAME="swp0" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p1", NAME="swp1" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p2", NAME="swp2" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p3", NAME="swp3" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p4", NAME="swp4" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p5", NAME="swp5" > diff --git a/board/nxp/ls1028ardb/u-boot-environment-sd.txt b/board/nxp/ls1028ardb/u-boot-environment-sd.txt > new file mode 100644 > index 0000000000..f91e6b585f > --- /dev/null > +++ b/board/nxp/ls1028ardb/u-boot-environment-sd.txt > @@ -0,0 +1,13 @@ > +baudrate=115200 > +bootcmd=setenv bootargs root=/dev/mmcblk0p2 rootwait rw earlycon=uart8250,0x21c0500 console=ttyS0,115200 cma=256M video=1920x1080-32 at 60;mmcinfo;fatload mmc 0:1 ${dp_load} ${dp_file}; hdp load ${dp_load} ${dp_offset};fatload mmc 0:1 ${loadaddr} ${bootfile};fatload mmc 0:1 ${fdtaddr} ${fdtfile};booti ${loadaddr} - ${fdtaddr} > +bootdelay=3 > +bootfile=Image > +fdtfile=fsl-ls1028a-rdb.dtb > +loadaddr=0xa0000000 > +fdtaddr=0xb0000000 > +dp_file=ls1028a-dp-fw.bin > +dp_load=0x90000000 > +dp_offset=0x2000 > +stderr=serial > +stdin=serial > +stdout=serial > diff --git a/configs/nxp_ls1028ardb-64b_defconfig b/configs/nxp_ls1028ardb-64b_defconfig > new file mode 100644 > index 0000000000..cb0131a35c > --- /dev/null > +++ b/configs/nxp_ls1028ardb-64b_defconfig > @@ -0,0 +1,85 @@ > +# Architecture > +BR2_aarch64=y > +BR2_cortex_a72=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Hostname and issue > +BR2_TARGET_GENERIC_HOSTNAME="LS1028ARDB" > + > +# toolchain > +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y Why a glibc toolchain? > +BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" This is a blind symbol, shouldn't be set in the defconfig. > + > +# Linux headers same as kernel > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y > + > +# bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BOARDNAME="ls1028ardb_tfa" > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="LSDK-19.09-update-311219" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_FORMAT_BIN=n > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-dtb.bin" > +BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE=y Why do you need mkimage on the target? (host-uboot-tools is built automatically by selecting envimage below). > +BR2_TARGET_UBOOT_ENVIMAGE=y > +BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/nxp/ls1028ardb/u-boot-environment-sd.txt" > +BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x2000" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/linux" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="LSDK-19.09-update-311219-V4.19" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-rdb" > +BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" Why doesn't BR2_LINUX_KERNEL_IMAGE work? > + > +# Serial port config > +BR2_TARGET_GENERIC_GETTY=y This is already the default. > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" The default "console" should work, doesn't it? > + > +# required tools to create the microSD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nxp/ls1028ardb/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="$(LINUX_DIR) $(TOPDIR) $(UBOOT_DIR)" > + > +# busybox setting > +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/nxp/common/ls/busybox.config" > +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > + > +# packages for rcw > +BR2_PACKAGE_HOST_QORIQ_RCW=y > +BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE="sd" > +BR2_PACKAGE_HOST_QORIQ_RCW_BIN="ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" > + > +#Display port firmware > +BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y > + > +#eudev support > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y It would be good to explain in the commit message why this is needed. Regards, Arnout > +BR2_ROOTFS_OVERLAY="board/nxp/ls1028ardb/rootfs_overlay" > + > +# Arm-Trusted-Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-dtb.bin" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/atf" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="LSDK-19.09-update-311219" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="pbl" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_DEPENDENCIES="host-qoriq-rcw" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd RCW=$(BINARIES_DIR)/rcw_1300_sdboot.bin" > From arnout at mind.be Thu Jan 6 14:35:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 15:35:28 +0100 Subject: [Buildroot] [git commit] package/qoriq-rcw: add in-tree rcw source support Message-ID: <20220106162435.B616C83460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d167f7006e724360994a88cb97ad65bec137db68 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The qoriq-rcw repository contains the RCW source for a lot of development boards already. Add a new option BR2_PACKAGE_HOST_QORIQ_RCW_INTREE to use one of these rather than a custom one. Signed-off-by: Jerry Huang [Arnout: - rename the option to _RCW_INTREE; - update commit message, documentation, and internal variables accordingly; - reorganise condition tree so it becomes a little simpler; - add patsubst so the source can be specified as either %.rcw or %.bin; - always install it as PBL.bin, to be consistent with the custom option. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qoriq-rcw/Config.in.host | 12 ++++++++++++ package/qoriq-rcw/qoriq-rcw.mk | 16 ++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/package/qoriq-rcw/Config.in.host b/package/qoriq-rcw/Config.in.host index 1f69c0389c..08fc83acd0 100644 --- a/package/qoriq-rcw/Config.in.host +++ b/package/qoriq-rcw/Config.in.host @@ -25,4 +25,16 @@ config BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH included for use in the SDK or with post scripts but no RCW binary will not be generated. +config BR2_PACKAGE_HOST_QORIQ_RCW_INTREE + string "In-tree RCW name" + depends on !BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH + help + This option is used to specify the RCW binary file for board. + which is composed as platform/serdes_value/rcw_file: platform + is the platform name, serdes_value is the setting of the + Serdes, and rcw_file is the file name of RCW. For example: + "ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" + + If this option is empty, no rcw file is used. + endif diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index bad4a451d3..93e660b1dd 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -13,8 +13,10 @@ QORIQ_RCW_LICENSE_FILES = LICENSE HOST_QORIQ_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) QORIQ_RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH)) +QORIQ_RCW_INTREE = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_INTREE)) ifneq ($(QORIQ_RCW_FILES),) + QORIQ_RCW_INCLUDES = $(filter-out %.rcw,$(QORIQ_RCW_FILES)) # Get the name of the custom rcw file from the custom list QORIQ_RCW_PROJECT = $(notdir $(filter %.rcw,$(QORIQ_RCW_FILES))) @@ -54,6 +56,20 @@ endef define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin endef + +else ifneq ($(QORIQ_RCW_INTREE),) + +QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_INTREE))) +QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_INTREE))) + +define HOST_QORIQ_RCW_BUILD_CMDS + $(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM) +endef + +define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE + $(INSTALL) -D -m 0644 $(@D)/$(patsubst %.rcw,%.bin,$(QORIQ_RCW_INTREE)) \ + $(BINARIES_DIR)/PBL.bin +endef endif # Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer From arnout at mind.be Thu Jan 6 15:17:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 16:17:27 +0100 Subject: [Buildroot] [git commit] package/qoriq-cadence-dp-firmware: new package Message-ID: <20220106162435.C1A9583470@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d164df0aefc121d4954d74d68491968a43ff73d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package provides the firmware for LS1028ARDB DP (display port). Signed-off-by: Jerry Huang [Arnout: - move out of nxp directory; - add extraction helper; - set REDISTRIBUTE to NO. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/qoriq-cadence-dp-firmware/Config.in | 4 ++ .../qoriq-cadence-dp-firmware.hash | 3 ++ .../qoriq-cadence-dp-firmware.mk | 49 ++++++++++++++++++++++ 5 files changed, 60 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a52a8cfa38..03918e4205 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -500,6 +500,9 @@ F: package/znc/ N: Charles Hardin F: package/alsa-plugins/ +N: Changming Huang +F: package/qoriq-cadence-dp-firmware/ + N: Chris Packham F: package/coremark/ F: package/coremark-pro/ diff --git a/package/Config.in b/package/Config.in index cb15574746..3c7340e27c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -544,6 +544,7 @@ endmenu source "package/pps-tools/Config.in" source "package/pru-software-support/Config.in" source "package/pulseview/Config.in" + source "package/qoriq-cadence-dp-firmware/Config.in" source "package/raspi-gpio/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" diff --git a/package/qoriq-cadence-dp-firmware/Config.in b/package/qoriq-cadence-dp-firmware/Config.in new file mode 100644 index 0000000000..3f494bd3a3 --- /dev/null +++ b/package/qoriq-cadence-dp-firmware/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE + bool "qoriq-cadence-dp-firmware" + help + NXP QorIQ cadence DP firmware, a resident EL3 firmware. diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash new file mode 100644 index 0000000000..89aaf1d71b --- /dev/null +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 5871c5717be32f14a59624d5699d405e8ce9ae2e9c9ef86fd16e13d264a40e58 firmware-cadence-lsdk1909.bin +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk new file mode 100644 index 0000000000..23643d24e0 --- /dev/null +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# qoriq-cadence-dp-firmware +# +################################################################################ + +QORIQ_CADENCE_DP_FIRMWARE_VERSION = lsdk1909 +QORIQ_CADENCE_DP_FIRMWARE_SITE = http://www.nxp.com/lgfiles/sdk/$(QORIQ_CADENCE_DP_FIRMWARE_VERSION) +QORIQ_CADENCE_DP_FIRMWARE_SOURCE = firmware-cadence-$(QORIQ_CADENCE_DP_FIRMWARE_VERSION).bin +QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP-Binary-EULA +QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING +QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO +QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES +QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO + +# Helper for self-extracting binaries distributed by NXP. +# +# The --force option makes sure it doesn't fail if the source +# directory already exists. The --auto-accept skips the license check, +# as it is not needed in Buildroot because we have legal-info. Since +# there's a EULA in the binary file, we extract it in this macro, and +# it should therefore be added to the LICENSE_FILES variable of +# packages using this macro. Also, remember to set REDISTRIBUTE to +# "NO". Indeed, this is a legal minefield: the EULA specifies that the +# Board Support Package includes software and hardware (sic!) for +# which a separate license is needed... +# +# $(1): full path to the archive file +# +define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER + awk 'BEGIN { start = 0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(@D) && sh $(1) --force --auto-accept + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; + rmdir $(@D)/$(basename $(notdir $(1))) +endef + +define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS + $(call QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) +endef + +define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 $(@D)/dp/ls1028a-dp-fw.bin $(BINARIES_DIR)/ls1028a-dp-fw.bin +endef + +$(eval $(generic-package)) From arnout at mind.be Thu Jan 6 17:09:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 18:09:47 +0100 Subject: [Buildroot] Overriding Kconfig Values from external br2 In-Reply-To: References: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> Message-ID: <4d73992c-3189-1989-525c-4506495c90ac@mind.be> On 06/01/2022 16:37, Jesse Millwood wrote: > On Thu, 2022-01-06 at 10:45 +0100, Arnout Vandecappelle wrote: >> >> >> On 05/01/2022 20:03, Jesse Millwood wrote: >>> Hello, >>> >>> I have an external C/C++ toolchain that I've put together that uses >>> MUSL. I've >>> also built an external Rust toolchain that uses my MUSL toolchain. >>> >>> My issue is that there is a Rust Kconfig variable that specifies if >>> a specific >>> architecture supports Rust. >>> >>> The Kconfig variable in question is >>> BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS >>> in package/rustc/Config.in.host. >> >> [snip] >> >>> You may notice that I changed the libc depends line to be or'd with >>> BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get considered >>> when I >>> choose my external musl toolchain option. In the menuconfig when I >>> search for >>> the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with the >>> "/" key it >>> looks like it is only getting it from the original file. Does >>> buildroot have a >>> mechanism for overwriting this kind of setting and if not, does >>> anyone have an >>> idea of how I would accomplish what I am trying to do (make >>> buildroot honor my >>> external rust toolchain)? >> >> ? No, there's no way to override the dependencies of an existing >> Config.in >> symbol in an external. >> >> ? However, this was corrected in upstream Buildroot in commit >> d69d40c029dc7d8199b745eaee759d92b66c5d17. So you can try to backport >> that commit >> instead, or just update Buildroot to something more recent. > > Arnout, thanks for the pointer to the commit. That is a logical way to > support other platforms. However, I have a powerpc musl rust toolchain > that I've built externally. > > With the changes in that commit can I set > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS to "y" in my external now Ah, no, you're right, powerpc-unknown-linux-musl is a Tier 3 platform and that patch only adds Tier 1 and 2. We could add a Tier 3 option as well (and disable the rust-bin option in that case). Note however that the stdlib status for this target is marked as "?" on [1], so I'm not sure it's ever going to work... > that there is no depends expressions and it is all default logic? Or > would I have to still add another expression that maybe defaults to "y" > if a new variable is true like > "BR2_EXTERNAL_RUSTC_TARGET_ARCH_SUPPORTS" that is defined in my > external? No, that's not going to work. I think you can make a hack: add "select BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS" to your BR2_TOOLCHAIN_EXTERNAL_MY_MUSL definition. I think that works. Regards, Arnout > > Thanks, > Jesse > >> >> ? Regards, >> ? Arnout >> >> >>> >>> Thanks, >>> Jesse >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From aduskett at gmail.com Thu Jan 6 17:17:20 2022 From: aduskett at gmail.com (Adam Duskett) Date: Thu, 6 Jan 2022 09:17:20 -0800 Subject: [Buildroot] [PATCH v4 1/1] package/pkg-generic.mk: fix absolute paths in per-package config files Message-ID: <20220106171720.12857-1-aduskett@gmail.com> Some packages (notably qmake packages) generate .cmake, .pc, and .pri files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in those files point outside the per-package sysroot for packages that have rsynced those same files. - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk to avoid more calls to ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) - Add .cmake, .pc, and .pri files to the files of which to find to sed the per-package paths. This simple fix allows qt5 submodule packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- changes v3 -> v4: - Further compress the method by simply adding the files to the already existing find command. (Yann) changes v2 -> v3: - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk (Yann) - Combine FIXUP_CONFIG_FILES_ABSOLUTE_PATHS with FIXUP_PER_PACKAGE_FILES (Yann) changes v1 -> v2 - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host directories in a single step. package/pkg-generic.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6a5fe5507b..9952ff1963 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -113,8 +113,16 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. +# +# When per-package is enabled, packages may generate files with absolute paths +# that point to the packages per-package sysroot. However, this breaks +# per-package isolation when the files are rsynced to a new package that depends +# on the first package. because the hard-coded paths point to directories +# outside the packages sysroot. Run sed on all .cmake, .pc, and .pri files in a +# given packages sysroot containing the word "per-package" and replace the path +# with the appropriate per-package directory. ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define FIXUP_PYTHON_SYSCONFIGDATA +define FIXUP_PER_PACKAGE_FILES $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ @@ -122,6 +130,9 @@ define FIXUP_PYTHON_SYSCONFIGDATA \( \( -name "_sysconfigdata*.pyc" -delete \) \ -o \( -name "_sysconfigdata*.py" -print0 \) \ \) \ + -o -name "*.cmake" -print0 \ + -o -name "*.pc" -print0 \ + -o -name "*.pri" -print0 \ | xargs -0 --no-run-if-empty \ $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef @@ -836,7 +847,7 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += FIXUP_PER_PACKAGE_FILES ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.33.1 From aduskett at gmail.com Thu Jan 6 17:33:21 2022 From: aduskett at gmail.com (Adam Duskett) Date: Thu, 6 Jan 2022 09:33:21 -0800 Subject: [Buildroot] [PATCH v2 4/4] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220106062407.3131530-4-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-4-james.hilliard1@gmail.com> Message-ID: Hello! Thanks again for your help in getting rid of the scourge that is Python2! A few issues with this patch series: - Qt5base is the package that installs syncqt.pl. This results in an immediate failure at the begging of the build: /bin/bash: /output/host/bin/syncqt.pl: No such file or directory A simple solution would be to have a post_extract_hook to install the script: define QT5BASE_INSTALL_SYNCQT $(INSTALL) -m 0775 -D $(@D)/bin/syncqt.pl $(HOST_DIR)/bin/syncqt.pl endef QT5BASE_POST_EXTRACT_HOOKS += QT5BASE_INSTALL_SYNCQT After that, I get a lot of: "fatal error: private/qiodevice_p.h: No such file or directory" errors when compiling. The environment is a ubuntu 20.04 docker environment with the bare minimum requirements installed to compile buildroot. You can find the Dockerfile here: https://github.com/aduskett/buildroot-docker-devel/blob/master/Ubuntu/20.04/ Thanks! Adam On Wed, Jan 5, 2022 at 10:24 PM James Hilliard wrote: > > This points all qt5 packages to the latest kde submodule versions > available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > We need to remove some patches applied upstream already. > > We need to rework qt5location to pull in the mapboxgl dependency from > a separate package as that dependency is only included in release > archives. > > We need to pin qt5 packages not available in the new upstream to the > previous 5.15.2 version. > > We need to set SYNC_QT_HEADERS for all qt5 packages in the new > upstream as headers are only copied in release archives which are > not provided in the kde upstream. > > Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which > should be the closest release to the kde patches that don't have > lts tags. > > Create a .git file so to trigger headers sync during configure. > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - fix headers sync and update MODULE_VERSION > --- > package/pkg-qmake.mk | 4 +- > package/qt5/qt53d/qt53d.hash | 4 +- > package/qt5/qt53d/qt53d.mk | 7 ++- > ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- > .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- > .../0008-Add-missing-limits-include.patch | 32 ---------- > .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- > package/qt5/qt5base/qt5base.hash | 4 +- > package/qt5/qt5base/qt5base.mk | 7 ++- > package/qt5/qt5charts/qt5charts.hash | 4 +- > package/qt5/qt5charts/qt5charts.mk | 7 ++- > package/qt5/qt5coap/qt5coap.mk | 2 +- > .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- > .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- > ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- > .../qt5/qt5declarative/qt5declarative.hash | 4 +- > package/qt5/qt5declarative/qt5declarative.mk | 7 ++- > .../qt5graphicaleffects.hash | 4 +- > .../qt5graphicaleffects.mk | 7 ++- > .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- > .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- > package/qt5/qt5knx/qt5knx.mk | 2 +- > ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- > .../qt5location-mapboxgl.hash | 16 +++++ > .../qt5location-mapboxgl.mk | 13 ++++ > ...ix-compilation-for-no-opengl-builds.patch} | 0 > package/qt5/qt5location/qt5location.hash | 4 +- > package/qt5/qt5location/qt5location.mk | 14 ++++- > package/qt5/qt5lottie/qt5lottie.hash | 4 +- > package/qt5/qt5lottie/qt5lottie.mk | 7 ++- > package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- > package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- > package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- > package/qt5/qt5opcua/qt5opcua.mk | 2 +- > .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- > .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- > .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- > .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- > .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- > .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- > .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- > .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- > package/qt5/qt5script/qt5script.hash | 4 +- > package/qt5/qt5script/qt5script.mk | 7 ++- > package/qt5/qt5scxml/qt5scxml.hash | 4 +- > package/qt5/qt5scxml/qt5scxml.mk | 7 ++- > package/qt5/qt5sensors/qt5sensors.hash | 4 +- > package/qt5/qt5sensors/qt5sensors.mk | 7 ++- > package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- > package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- > package/qt5/qt5serialport/qt5serialport.hash | 4 +- > package/qt5/qt5serialport/qt5serialport.mk | 7 ++- > package/qt5/qt5svg/qt5svg.hash | 4 +- > package/qt5/qt5svg/qt5svg.mk | 7 ++- > package/qt5/qt5tools/qt5tools.hash | 4 +- > package/qt5/qt5tools/qt5tools.mk | 7 ++- > .../qt5virtualkeyboard.hash | 4 +- > .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- > package/qt5/qt5wayland/qt5wayland.hash | 4 +- > package/qt5/qt5wayland/qt5wayland.mk | 7 ++- > package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- > package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- > .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- > package/qt5/qt5websockets/qt5websockets.hash | 4 +- > package/qt5/qt5websockets/qt5websockets.mk | 7 ++- > package/qt5/qt5webview/qt5webview.hash | 4 +- > package/qt5/qt5webview/qt5webview.mk | 7 ++- > package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- > package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- > .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- > 71 files changed, 216 insertions(+), 386 deletions(-) > delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch > delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) > create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) > > diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk > index 4dcaf6dd62..fdaddf08df 100644 > --- a/package/pkg-qmake.mk > +++ b/package/pkg-qmake.mk > @@ -24,7 +24,9 @@ > # Hook to sync Qt headers > # > define QT_HEADERS_SYNC_HOOK > - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) > + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ > + $($(PKG)_BUILDDIR)/.qmake.conf > + touch $($(PKG)_BUILDDIR)/.git > endef > > ################################################################################ > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 43b2132cc7..32d3675619 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index f3eff9edf0..9a07d189bd 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT53D_VERSION = $(QT5_VERSION) > -QT53D_SITE = $(QT5_SITE) > -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz > +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 > +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > +QT53D_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_ASSIMP),y) > QT53D_DEPENDENCIES += assimp > diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > deleted file mode 100644 > index f014a160d5..0000000000 > --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > +++ /dev/null > @@ -1,53 +0,0 @@ > -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 > -From: Thiago Macieira > -Date: Mon, 18 Jan 2021 07:40:54 -0800 > -Subject: [PATCH] Fix build with GCC 11: include > - > -Fixes: QTBUG-90395 > -Pick-to: 6.0 > -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 > -Reviewed-by: Edward Welbourne > - > -[Retrieved (and backported) from: > -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] > -Signed-off-by: Fabrice Fontaine > ---- > - src/corelib/global/qendian.h | 6 ++++-- > - src/corelib/global/qfloat16.h | 1 + > - 2 files changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h > -index 99b529f17cd..c874c5e47ab 100644 > ---- a/src/corelib/global/qendian.h > -+++ b/src/corelib/global/qendian.h > -@@ -1,7 +1,7 @@ > - /**************************************************************************** > - ** > --** Copyright (C) 2016 The Qt Company Ltd. > --** Copyright (C) 2016 Intel Corporation. > -+** Copyright (C) 2021 The Qt Company Ltd. > -+** Copyright (C) 2021 Intel Corporation. > - ** Contact: https://www.qt.io/licensing/ > - ** > - ** This file is part of the QtCore module of the Qt Toolkit. > -@@ -44,6 +44,8 @@ > - #include > - #include > - > -+#include > -+ > - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems > - #include > - #include > -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h > -index e9477d2ecec..a25fac28862 100644 > ---- a/src/corelib/global/qfloat16.h > -+++ b/src/corelib/global/qfloat16.h > -@@ -44,6 +44,7 @@ > - > - #include > - #include > -+#include > - #include > - > - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) > diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > deleted file mode 100644 > index d20600c6ce..0000000000 > --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > +++ /dev/null > @@ -1,61 +0,0 @@ > -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 > -From: Ville Voutilainen > -Date: Mon, 18 Jan 2021 09:58:17 +0200 > -Subject: [PATCH] Build fixes for GCC 11 > - > -Task-number: QTBUG-89977 > -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 > -Reviewed-by: Lars Knoll > -Reviewed-by: Thiago Macieira > -[Retrieved (and backported) from: > -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] > -Signed-off-by: Maxim Kochetkov > ---- > - src/corelib/text/qbytearraymatcher.h | 2 ++ > - src/corelib/tools/qsharedpointer_impl.h | 3 --- > - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- > - 3 files changed, 3 insertions(+), 4 deletions(-) > - > -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h > -index 0eedfc1d20..f5f9bef7b8 100644 > ---- a/src/corelib/text/qbytearraymatcher.h > -+++ b/src/corelib/text/qbytearraymatcher.h > -@@ -42,6 +42,8 @@ > - > - #include > - > -+#include > -+ > - QT_BEGIN_NAMESPACE > - > - > -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h > -index 790c187cb9..4aee98af53 100644 > ---- a/src/corelib/tools/qsharedpointer_impl.h > -+++ b/src/corelib/tools/qsharedpointer_impl.h > -@@ -155,9 +155,6 @@ namespace QtSharedPointer { > - #endif > - inline void checkQObjectShared(...) { } > - inline void setQObjectShared(...) { } > -- > -- inline void operator delete(void *ptr) { ::operator delete(ptr); } > -- inline void operator delete(void *, void *) { } > - }; > - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) > - > -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp > -index 9e7e1a5572..f0866a90ac 100644 > ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp > -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp > -@@ -698,7 +698,7 @@ void QXcbWindow::show() > - if (isTransient(window())) { > - const QWindow *tp = window()->transientParent(); > - if (tp && tp->handle()) > -- transientXcbParent = static_cast(tp->handle())->winId(); > -+ transientXcbParent = tp->handle()->winId(); > - // Default to client leader if there is no transient parent, else modal dialogs can > - // be hidden by their parents. > - if (!transientXcbParent) > --- > -2.31.1 > - > diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch > deleted file mode 100644 > index e489f2e551..0000000000 > --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 > -From: Nicolas Fella > -Date: Sun, 20 Jun 2021 17:36:41 +0200 > -Subject: [PATCH] Add missing limits include > - > -The code uses std::numeric_limits but is lacking the appropriate include > - > -Pick-to: 5.15 6.1 6.2 > -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd > -Reviewed-by: Giuseppe D'Angelo > - > -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] > -Signed-off-by: Peter Seiderer > ---- > - src/corelib/tools/qoffsetstringarray_p.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h > -index 4dd9e960..e26a57ff 100644 > ---- a/src/corelib/tools/qoffsetstringarray_p.h > -+++ b/src/corelib/tools/qoffsetstringarray_p.h > -@@ -55,6 +55,7 @@ > - > - #include > - #include > -+#include > - > - QT_BEGIN_NAMESPACE > - > --- > -2.32.0 > - > diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > deleted file mode 100644 > index 98c7210551..0000000000 > --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > +++ /dev/null > @@ -1,45 +0,0 @@ > -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 27 Aug 2021 16:28:32 +0200 > -Subject: Fix build on riscv32 > - > -riscv32 fails to build because __NR_futex is not defined on this > -architecture: > - > -In file included from thread/qmutex_linux.cpp:45, > - from thread/qmutex.cpp:804: > -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': > -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? > - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); > - | ^~~~~~~~~~ > - | _q_futex > - > -Pick-to: 6.1 6.2 > -Fixes: QTBUG-96067 > -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 > -Reviewed-by: Thiago Macieira > -[Retrieved from: > -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] > ---- > - src/corelib/thread/qfutex_p.h | 5 +++++ > - 1 file changed, 5 insertions(+) > - > -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h > -index 40482b6fc1..037207a5c0 100644 > ---- a/src/corelib/thread/qfutex_p.h > -+++ b/src/corelib/thread/qfutex_p.h > -@@ -103,6 +103,11 @@ QT_END_NAMESPACE > - // if not defined in linux/futex.h > - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 > - > -+// RISC-V does not supply __NR_futex > -+# ifndef __NR_futex > -+# define __NR_futex __NR_futex_time64 > -+# endif > -+ > - QT_BEGIN_NAMESPACE > - namespace QtLinuxFutex { > - constexpr inline bool futexAvailable() { return true; } > --- > -cgit v1.2.1 > - > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index a824890e3c..d10847ea04 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ba2971dc08..294542fabb 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5BASE_VERSION = $(QT5_VERSION) > -QT5BASE_SITE = $(QT5_SITE) > -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz > +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a > +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib > QT5BASE_INSTALL_STAGING = YES > +QT5BASE_SYNC_QT_HEADERS = YES > > # A few comments: > # * -no-pch to workaround the issue described at > diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash > index b52be714b7..021d4ea19f 100644 > --- a/package/qt5/qt5charts/qt5charts.hash > +++ b/package/qt5/qt5charts/qt5charts.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk > index 2c40ac1c89..24e635b93b 100644 > --- a/package/qt5/qt5charts/qt5charts.mk > +++ b/package/qt5/qt5charts/qt5charts.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5CHARTS_VERSION = $(QT5_VERSION) > -QT5CHARTS_SITE = $(QT5_SITE) > -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz > +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 > +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) > +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 > QT5CHARTS_INSTALL_STAGING = YES > +QT5CHARTS_SYNC_QT_HEADERS = YES > > QT5CHARTS_LICENSE = GPL-3.0 > QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 > diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk > index 24de869120..a50f19d7f2 100644 > --- a/package/qt5/qt5coap/qt5coap.mk > +++ b/package/qt5/qt5coap/qt5coap.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5COAP_VERSION = $(QT5_VERSION) > +QT5COAP_VERSION = 5.15.2 > QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git > QT5COAP_SITE_METHOD = git > QT5COAP_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash > index 3edc2d666a..12e9d637b2 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.hash > +++ b/package/qt5/qt5connectivity/qt5connectivity.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk > index 6402b505bf..a4c79be10b 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.mk > +++ b/package/qt5/qt5connectivity/qt5connectivity.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) > -QT5CONNECTIVITY_SITE = $(QT5_SITE) > -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz > +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 > +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) > +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 > QT5CONNECTIVITY_INSTALL_STAGING = YES > +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES > > QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > deleted file mode 100644 > index 0e6da652f9..0000000000 > --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > +++ /dev/null > @@ -1,45 +0,0 @@ > -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer > -Date: Thu, 22 Jul 2021 23:13:43 +0200 > -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 > - compile) > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Fixes: > - > - In file included from qqmlprofilertypedevent_p.h:43, > - from qqmlprofilertypedevent.cpp:40: > - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: > - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > - | ^~~~~~~~~~~~~~ > - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > - | ^ > - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > - | ^~~ > - | std::max > - > -Signed-off-by: Peter Seiderer > ---- > - src/qmldebug/qqmlprofilerevent_p.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h > -index a7e37d1964..01b2f58f16 100644 > ---- a/src/qmldebug/qqmlprofilerevent_p.h > -+++ b/src/qmldebug/qqmlprofilerevent_p.h > -@@ -48,6 +48,7 @@ > - #include > - > - #include > -+#include > - #include > - > - // > --- > -2.32.0 > - > diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash > index ab83b71814..f9dc08a6e0 100644 > --- a/package/qt5/qt5declarative/qt5declarative.hash > +++ b/package/qt5/qt5declarative/qt5declarative.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > index 3318cd24c8..036baed444 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5DECLARATIVE_VERSION = $(QT5_VERSION) > -QT5DECLARATIVE_SITE = $(QT5_SITE) > -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz > +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 > +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) > +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 > QT5DECLARATIVE_INSTALL_STAGING = YES > +QT5DECLARATIVE_SYNC_QT_HEADERS = YES > > QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > index 9d7a837b8b..e755f0848b 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > index a9ddff454e..542eb4de90 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) > -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) > -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz > +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e > +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) > +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 > QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative > QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES > +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES > > QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash > index b4281e712d..49690de3bb 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.hash > +++ b/package/qt5/qt5imageformats/qt5imageformats.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk > index ffb094d566..506cd123a8 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.mk > +++ b/package/qt5/qt5imageformats/qt5imageformats.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) > -QT5IMAGEFORMATS_SITE = $(QT5_SITE) > -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz > +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f > +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) > +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 > QT5IMAGEFORMATS_INSTALL_STAGING = YES > +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES > > QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL > diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk > index 9fc121111c..412e31c652 100644 > --- a/package/qt5/qt5knx/qt5knx.mk > +++ b/package/qt5/qt5knx/qt5knx.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5KNX_VERSION = $(QT5_VERSION) > +QT5KNX_VERSION = 5.15.2 > QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git > QT5KNX_SITE_METHOD = git > QT5KNX_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > similarity index 81% > rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > index 0894af9ce5..0f56a488e3 100644 > --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer > [yann.morin.1998 at free.fr: add uClibc] > Signed-off-by: Yann E. MORIN > --- > - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- > + platform/default/thread.cpp | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp > index c7c79b4..3f135eb 100644 > ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > +--- a/platform/default/thread.cpp > ++++ b/platform/default/thread.cpp > @@ -11,8 +11,9 @@ namespace platform { > > std::string getCurrentThreadName() { > diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > new file mode 100644 > index 0000000000..e44081c465 > --- /dev/null > +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > @@ -0,0 +1,16 @@ > +# Locally calculated > +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 > + > +# Hashes for license files: > +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md > +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt > +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt > +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt > +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt > +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt > +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt > +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt > +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt > +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt > +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt > +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt > diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > new file mode 100644 > index 0000000000..58e167e483 > --- /dev/null > +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > @@ -0,0 +1,13 @@ > +################################################################################ > +# > +# qt5location-mapboxgl > +# > +################################################################################ > + > +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d > +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) > +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 > +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib > +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt > + > +$(eval $(generic-package)) > diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch > similarity index 100% > rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch > rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch > diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash > index 0bb293305c..52649897b1 100644 > --- a/package/qt5/qt5location/qt5location.hash > +++ b/package/qt5/qt5location/qt5location.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk > index ea741d0df6..98af8b233b 100644 > --- a/package/qt5/qt5location/qt5location.mk > +++ b/package/qt5/qt5location/qt5location.mk > @@ -4,10 +4,12 @@ > # > ################################################################################ > > -QT5LOCATION_VERSION = $(QT5_VERSION) > -QT5LOCATION_SITE = $(QT5_SITE) > -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz > +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f > +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) > +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 > +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl > QT5LOCATION_INSTALL_STAGING = YES > +QT5LOCATION_SYNC_QT_HEADERS = YES > > QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5LOCATION_DEPENDENCIES += qt5declarative > endif > > +define QT5LOCATION_COPY_MAPBOXGL > + rm -rf $(@D)/src/3rdparty/mapbox-gl-native > + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native > +endef > +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL > + > $(eval $(qmake-package)) > diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash > index 740f9072f2..46ab3f60df 100644 > --- a/package/qt5/qt5lottie/qt5lottie.hash > +++ b/package/qt5/qt5lottie/qt5lottie.hash > @@ -1,5 +1,5 @@ > -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk > index 1423a629b9..e9614fbecf 100644 > --- a/package/qt5/qt5lottie/qt5lottie.mk > +++ b/package/qt5/qt5lottie/qt5lottie.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5LOTTIE_VERSION = $(QT5_VERSION) > -QT5LOTTIE_SITE = $(QT5_SITE) > -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz > +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 > +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) > +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 > QT5LOTTIE_DEPENDENCIES = qt5declarative > QT5LOTTIE_INSTALL_STAGING = YES > +QT5LOTTIE_SYNC_QT_HEADERS = YES > > QT5LOTTIE_LICENSE = GPL-3.0 > QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT > diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk > index 54cc1de632..0b62cf1bed 100644 > --- a/package/qt5/qt5mqtt/qt5mqtt.mk > +++ b/package/qt5/qt5mqtt/qt5mqtt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5MQTT_VERSION = $(QT5_VERSION) > +QT5MQTT_VERSION = 5.15.2 > QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git > QT5MQTT_SITE_METHOD = git > QT5MQTT_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash > index b70a4ecf51..1c4d930248 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.hash > +++ b/package/qt5/qt5multimedia/qt5multimedia.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > index 39eddc3afc..6695369063 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) > -QT5MULTIMEDIA_SITE = $(QT5_SITE) > -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz > +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 > +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) > +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 > QT5MULTIMEDIA_INSTALL_STAGING = YES > +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES > > QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk > index a58c4c5e14..ef51abddf8 100644 > --- a/package/qt5/qt5opcua/qt5opcua.mk > +++ b/package/qt5/qt5opcua/qt5opcua.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5OPCUA_VERSION = $(QT5_VERSION) > +QT5OPCUA_VERSION = 5.15.2 > QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git > QT5OPCUA_SITE_METHOD = git > QT5OPCUA_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > index 1fa0d6430a..2138b3e313 100644 > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > index 1ac8689d6e..c2b5ae182e 100644 > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) > -QT5QUICKCONTROLS_SITE = $(QT5_SITE) > -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz > +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 > +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) > +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 > QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative > QT5QUICKCONTROLS_INSTALL_STAGING = YES > +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES > > QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > index f66a1186ee..8c0e02152d 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 > > # Hashes for license files: > sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > index 2f6dcd1f2f..4bdb90b203 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) > -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) > -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz > +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 > +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) > +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 > QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative > QT5QUICKCONTROLS2_INSTALL_STAGING = YES > +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES > > QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > index ac97fc319c..c2d0b11f2b 100644 > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > index ef6927f928..49d0cb330b 100644 > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) > -QT5QUICKTIMELINE_SITE = $(QT5_SITE) > -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz > +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 > +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) > +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 > QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative > QT5QUICKTIMELINE_INSTALL_STAGING = YES > +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES > > QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) > QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > index 30c5bfc51d..a2573a018a 100644 > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > index a6b5f0954c..b7dee4f2f3 100644 > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > > -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) > -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) > -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz > +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 > +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) > +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 > QT5REMOTEOBJECTS_DEPENDENCIES = qt5base > QT5REMOTEOBJECTS_INSTALL_STAGING = YES > QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) > QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 > +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative > diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash > index 783598047b..0b34ff3e8f 100644 > --- a/package/qt5/qt5script/qt5script.hash > +++ b/package/qt5/qt5script/qt5script.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk > index 77254fec0f..4e51eacfc3 100644 > --- a/package/qt5/qt5script/qt5script.mk > +++ b/package/qt5/qt5script/qt5script.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5SCRIPT_VERSION = $(QT5_VERSION) > -QT5SCRIPT_SITE = $(QT5_SITE) > -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz > +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 > +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) > +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 > QT5SCRIPT_INSTALL_STAGING = YES > +QT5SCRIPT_SYNC_QT_HEADERS = YES > > # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. > # This is linked into libQt5Script, which also contains Qt sources under > diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash > index 6f816548e6..85e72f5378 100644 > --- a/package/qt5/qt5scxml/qt5scxml.hash > +++ b/package/qt5/qt5scxml/qt5scxml.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 > > # Hashes for license files: > sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT > diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk > index 186a2d381b..d5d26536a3 100644 > --- a/package/qt5/qt5scxml/qt5scxml.mk > +++ b/package/qt5/qt5scxml/qt5scxml.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5SCXML_VERSION = $(QT5_VERSION) > -QT5SCXML_SITE = $(QT5_SITE) > -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz > +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 > +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) > +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 > QT5SCXML_DEPENDENCIES = qt5declarative > QT5SCXML_INSTALL_STAGING = YES > +QT5SCXML_SYNC_QT_HEADERS = YES > > QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash > index 179c9833e0..6be87e8cf9 100644 > --- a/package/qt5/qt5sensors/qt5sensors.hash > +++ b/package/qt5/qt5sensors/qt5sensors.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk > index f928aad1c1..eebda912a9 100644 > --- a/package/qt5/qt5sensors/qt5sensors.mk > +++ b/package/qt5/qt5sensors/qt5sensors.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5SENSORS_VERSION = $(QT5_VERSION) > -QT5SENSORS_SITE = $(QT5_SITE) > -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz > +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 > +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) > +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 > QT5SENSORS_INSTALL_STAGING = YES > QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5SENSORS_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5SENSORS_DEPENDENCIES += qt5declarative > diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash > index 4f05049b99..8b560a8a83 100644 > --- a/package/qt5/qt5serialbus/qt5serialbus.hash > +++ b/package/qt5/qt5serialbus/qt5serialbus.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk > index 412a255612..fc62c85318 100644 > --- a/package/qt5/qt5serialbus/qt5serialbus.mk > +++ b/package/qt5/qt5serialbus/qt5serialbus.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5SERIALBUS_VERSION = $(QT5_VERSION) > -QT5SERIALBUS_SITE = $(QT5_SITE) > -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz > +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 > +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) > +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 > QT5SERIALBUS_DEPENDENCIES = qt5serialport > QT5SERIALBUS_INSTALL_STAGING = YES > +QT5SERIALBUS_SYNC_QT_HEADERS = YES > > QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash > index 37bc8401f8..6d821c387f 100644 > --- a/package/qt5/qt5serialport/qt5serialport.hash > +++ b/package/qt5/qt5serialport/qt5serialport.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk > index 902967c757..370093f6f8 100644 > --- a/package/qt5/qt5serialport/qt5serialport.mk > +++ b/package/qt5/qt5serialport/qt5serialport.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5SERIALPORT_VERSION = $(QT5_VERSION) > -QT5SERIALPORT_SITE = $(QT5_SITE) > -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz > +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 > +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) > +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 > QT5SERIALPORT_INSTALL_STAGING = YES > QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5SERIALPORT_SYNC_QT_HEADERS = YES > > $(eval $(qmake-package)) > diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash > index 7773a940bb..abffc2891d 100644 > --- a/package/qt5/qt5svg/qt5svg.hash > +++ b/package/qt5/qt5svg/qt5svg.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk > index d4b31c231e..d48a37fafe 100644 > --- a/package/qt5/qt5svg/qt5svg.mk > +++ b/package/qt5/qt5svg/qt5svg.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5SVG_VERSION = $(QT5_VERSION) > -QT5SVG_SITE = $(QT5_SITE) > -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz > +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e > +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) > +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 > QT5SVG_INSTALL_STAGING = YES > QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > +QT5SVG_SYNC_QT_HEADERS = YES > > $(eval $(qmake-package)) > diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash > index e52d8e6df7..a563801997 100644 > --- a/package/qt5/qt5tools/qt5tools.hash > +++ b/package/qt5/qt5tools/qt5tools.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk > index 0543afd8f7..e2385080ce 100644 > --- a/package/qt5/qt5tools/qt5tools.mk > +++ b/package/qt5/qt5tools/qt5tools.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5TOOLS_VERSION = $(QT5_VERSION) > -QT5TOOLS_SITE = $(QT5_SITE) > -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz > +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 > +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) > +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 > > QT5TOOLS_INSTALL_STAGING = YES > +QT5TOOLS_SYNC_QT_HEADERS = YES > > # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), > # but the condition is used only used to decide if lupdate will support > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > index 82f132378e..1e2c658109 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > index 3984c9866e..db0884fd18 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) > -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) > -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz > +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 > +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) > +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 > QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg > QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES > +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES > > QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 > QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > index b17dbdd10d..35708ec077 100644 > --- a/package/qt5/qt5wayland/qt5wayland.hash > +++ b/package/qt5/qt5wayland/qt5wayland.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > index 0076bbfe73..70e5b2655e 100644 > --- a/package/qt5/qt5wayland/qt5wayland.mk > +++ b/package/qt5/qt5wayland/qt5wayland.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5WAYLAND_VERSION = $(QT5_VERSION) > -QT5WAYLAND_SITE = $(QT5_SITE) > -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz > +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 > +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) > +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 > QT5WAYLAND_DEPENDENCIES = wayland > QT5WAYLAND_INSTALL_STAGING = YES > +QT5WAYLAND_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) > QT5WAYLAND_DEPENDENCIES += qt5declarative > diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash > index 47c7da3365..af195b32b3 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.hash > +++ b/package/qt5/qt5webchannel/qt5webchannel.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk > index 176c0fd7a3..042a28fca9 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.mk > +++ b/package/qt5/qt5webchannel/qt5webchannel.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > > -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) > -QT5WEBCHANNEL_SITE = $(QT5_SITE) > -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz > +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 > +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) > +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 > QT5WEBCHANNEL_DEPENDENCIES = qt5websockets > QT5WEBCHANNEL_INSTALL_STAGING = YES > QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) > diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > index 84bc291739..3b14284e37 100644 > --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > @@ -6,7 +6,7 @@ > > QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 > QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz > QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit > > QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 > diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash > index 29a9ebe439..3cc87865dc 100644 > --- a/package/qt5/qt5websockets/qt5websockets.hash > +++ b/package/qt5/qt5websockets/qt5websockets.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk > index a35cdc5799..d222f025ee 100644 > --- a/package/qt5/qt5websockets/qt5websockets.mk > +++ b/package/qt5/qt5websockets/qt5websockets.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) > -QT5WEBSOCKETS_SITE = $(QT5_SITE) > -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz > +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 > +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) > +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 > QT5WEBSOCKETS_INSTALL_STAGING = YES > QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) > QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 > +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) > diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash > index c1cee9cf85..51d0fb0d7a 100644 > --- a/package/qt5/qt5webview/qt5webview.hash > +++ b/package/qt5/qt5webview/qt5webview.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 > > # Hashes for license files: > sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL > diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk > index 0f37f3eb85..ed1cfe5065 100644 > --- a/package/qt5/qt5webview/qt5webview.mk > +++ b/package/qt5/qt5webview/qt5webview.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > > -QT5WEBVIEW_VERSION = $(QT5_VERSION) > -QT5WEBVIEW_SITE = $(QT5_SITE) > -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz > +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f > +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) > +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 > QT5WEBVIEW_DEPENDENCIES = qt5webengine > QT5WEBVIEW_INSTALL_STAGING = YES > QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) > QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > +QT5WEBVIEW_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) > diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash > index 08e6753f21..b854cedcb6 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.hash > +++ b/package/qt5/qt5x11extras/qt5x11extras.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk > index 075d36dcd8..7b1e32df17 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.mk > +++ b/package/qt5/qt5x11extras/qt5x11extras.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5X11EXTRAS_VERSION = $(QT5_VERSION) > -QT5X11EXTRAS_SITE = $(QT5_SITE) > -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz > +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f > +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) > +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 > QT5X11EXTRAS_INSTALL_STAGING = YES > QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5X11EXTRAS_SYNC_QT_HEADERS = YES > > $(eval $(qmake-package)) > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > index 682e114a7f..c0e3caa407 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > index 6845483327..27818ecb78 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) > -QT5XMLPATTERNS_SITE = $(QT5_SITE) > -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz > +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c > +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) > +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 > QT5XMLPATTERNS_INSTALL_STAGING = YES > QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5XMLPATTERNS_DEPENDENCIES += qt5declarative > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Thu Jan 6 17:49:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 6 Jan 2022 18:49:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/lttng-modules: bump to version 2.13.1 Message-ID: <20220106174949.1064731-1-fontaine.fabrice@gmail.com> - Add a dependency on kernel >= 3.0: https://github.com/lttng/lttng-modules/commit/88eafb709ac811960b1163482f5d537cb18b32df - Add CONFIG_KPROBES to Config.in for kernel >= 5.7: https://github.com/lttng/lttng-modules/commit/a65765406b03e4f3b7a4303e1c9ed83c86cdd358 - Update license files and their hash because SPDX v3.0 identifiers are used since https://github.com/lttng/lttng-modules/commit/b7cdc18250880cc44edeef4a4b42c8ac7a135a6d - This bump will fix a build failure with kernel >= 5.6 thanks to at least: https://github.com/lttng/lttng-modules/commit/edfdcb685c3f56dde803244449f79ad7bed03798 https://github.com/lttng/lttng-modules/blob/v2.13.1/ChangeLog Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14501 Signed-off-by: Fabrice Fontaine --- package/lttng-modules/Config.in | 12 +++++++++--- package/lttng-modules/lttng-modules.hash | 12 ++++++------ package/lttng-modules/lttng-modules.mk | 5 +++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/package/lttng-modules/Config.in b/package/lttng-modules/Config.in index e8ba9bad8c..cb56584155 100644 --- a/package/lttng-modules/Config.in +++ b/package/lttng-modules/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LTTNG_MODULES bool "lttng-modules" depends on BR2_LINUX_KERNEL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 help Linux kernel modules for the LTTng 2.x kernel tracing infrastructure. @@ -8,7 +9,8 @@ config BR2_PACKAGE_LTTNG_MODULES Make sure your target kernel has the following config options enabled: - * CONFIG_MODULES: loadable module support + * CONFIG_MODULES: loadable module support (not strictly + required when built into the kernel) * CONFIG_KALLSYMS: this is necessary until the few required missing symbols are exported to GPL modules from mainline @@ -17,6 +19,8 @@ config BR2_PACKAGE_LTTNG_MODULES * CONFIG_TRACEPOINTS: kernel tracepoint instrumentation (enabled as a side-effect of any of the perf/ftrace/blktrace instrumentation features) + * CONFIG_KPROBES (5.7+): use kallsyms for kernel 5.7 and + newer. The following kernel configuration options will affect the features available from LTTng: @@ -29,9 +33,11 @@ config BR2_PACKAGE_LTTNG_MODULES * CONFIG_KALLSYMS_ALL: state dump of mapping between block device number and name - The packaged version is compatible with Linux 2.6.38 to 3.16. - http://lttng.org comment "lttng-modules needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL + +comment "lttng-modules needs a toolchain w/ headers >= 3.0" + depends on BR2_LINUX_KERNEL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index f04247ab0b..fb253c9bf6 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,8 +1,8 @@ -# From https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2.sha256 -sha256 98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f lttng-modules-2.11.0.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.1.tar.bz2.sha256 +sha256 a7c86d91c9bbe66d27f025aa04b8cfc6d7785ed2fc7ef774930800ee44d7f343 lttng-modules-2.13.1.tar.bz2 # Hash for license files -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt -sha256 6334b377a5bd56b56a1e8a495830f2d28ed1b5cbedc7493aec9fba979efcdfe1 LICENSE +sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 +sha256 6841c85b94f9dab319356e3aaf9e969fcedad51d3aaadf665bf86f34f4186b62 LICENSES/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/MIT +sha256 0133d3c505f176845d7a8b4dcfe006ac615832c43c41e76fe3b365191bafca92 LICENSE diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index b8f9be8656..4c1c50d0a0 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,11 +4,12 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.11.0 +LTTNG_MODULES_VERSION = 2.13.1 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) -LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE +LTTNG_MODULES_LICENSE_FILES = \ + LICENSES/LGPL-2.1 LICENSES/GPL-2.0 LICENSES/MIT LICENSE LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $(eval $(kernel-module)) -- 2.34.1 From bugzilla at busybox.net Thu Jan 6 17:52:39 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 06 Jan 2022 17:52:39 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #4 from Fabrice Fontaine --- >From understanding, the issue is raised on kernel >= 5.6 and lttng-modules has fixed this issue with https://github.com/lttng/lttng-modules/commit/edfdcb685c3f56dde803244449f79ad7bed03798 But there is a lot of other commits needed to be able to build on newer kernels so I think that a bump is indeed the best course of action. You can find a patch here: https://patchwork.ozlabs.org/project/buildroot/patch/20220106174949.1064731-1-fontaine.fabrice at gmail.com/ -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Thu Jan 6 17:59:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 18:59:23 +0100 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: <20220106062407.3131530-1-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> Message-ID: <20220106185923.0cb1bb9c@windsurf> On Wed, 5 Jan 2022 23:24:04 -0700 James Hilliard wrote: > _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may > not need to be selected in kconfig in cases where building is not > desired, so only check that _FINAL_DEPENDENCIES are selected. Could you expand the commit log with some specific details of which packages/dependencies are causing issues? I haven't followed the problem and it's not obvious to me what this patch is fixing. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Thu Jan 6 18:02:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 19:02:09 +0100 Subject: [Buildroot] [git commit] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Message-ID: <20220106175627.348AB8346F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8324bf87c38ddc3a746c01346ca39477021fd83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package provides a Mali kernel driver for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing this driver. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline-driver into sunxi-mali-utgard-driver. Add a legacy entry. Signed-off-by: Miquel Raynal Signed-off-by: Giulio Benetti [Giulio: rebase on master. Add legacy entry instead of substituting the blob's one] Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 12 +++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 2 +- configs/olimex_a20_olinuxino_lime_defconfig | 2 +- package/Config.in | 2 +- .../sunxi-mali-mainline-driver.mk | 41 ---------------------- .../Config.in | 16 ++++----- .../sunxi-mali-utgard-driver.hash} | 2 +- .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++++++++ 9 files changed, 66 insertions(+), 54 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ad5c43fb62..141d43a479 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER + bool "sunxi-mali-mainline-driver package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + help + Since the removal of the sunxi-mali-driver package, the + sunxi-mali-mainline-driver package that coexisted became the + only package to provide the Sunxi Mali driver. The "-mainline" + suffix being undescriptive nowadays and before adding new + packages bringing Mali support for other SoCs/GPU flavors, it + is clearer to rename it SUNXI_MALI_UTGARD_DRIVER. + config BR2_PACKAGE_SUNXI_MALI_MAINLINE bool "sunxi-mali-mainline package was renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index fcc94a5cd8..3d5c01f795 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1082,8 +1082,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline-driver/ F: package/sunxi-mali-utgard/ +F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 319ac48c58..64a66de5c8 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 4cec5689ca..17da786a8c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/package/Config.in b/package/Config.in index a45a652c87..e9ee4d2ef1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -571,8 +571,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline-driver/Config.in" source "package/sunxi-mali-utgard/Config.in" + source "package/sunxi-mali-utgard-driver/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk deleted file mode 100644 index 6782ca7fc2..0000000000 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline-driver -# -################################################################################ - -SUNXI_MALI_MAINLINE_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 -SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) -SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux -SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 -SUNXI_MALI_MAINLINE_DRIVER_LICENSE_FILES = LICENSE - -SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ - $(LINUX_MAKE_FLAGS) \ - KDIR=$(LINUX_DIR) - -define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches - $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ - $(@D)/build.sh -endef - -SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - -define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b -endef - -define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i -endef - -define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) -endef - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-utgard-driver/Config.in similarity index 67% rename from package/sunxi-mali-mainline-driver/Config.in rename to package/sunxi-mali-utgard-driver/Config.in index 236470db53..244283f44d 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-utgard-driver/Config.in @@ -1,22 +1,22 @@ -comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" +comment "sunxi-mali-utgard-driver needs a Linux kernel to be built" depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER - bool "sunxi-mali-mainline-driver" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + bool "sunxi-mali-utgard-driver" default y depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help This package builds and installs the Linux kernel driver for - the Mali GPU on Allwinner platforms, compatible with recent - Linux kernels (>= 4.4). Note that it should be installed - together with the corresponding userspace OpenGL libraries, - which are provided as binaries only at: + the Mali Utgard GPU on Allwinner platforms, compatible with + recent Linux kernels (>= 4.4). Note that it should be + installed together with the corresponding userspace OpenGL + libraries, which are provided as binaries only at: https://github.com/bootlin/mali-blobs - sunxi-mali-mainline-driver requires a Linux kernel >= 4.4 + sunxi-mali-utgard-driver requires a Linux kernel >= 4.4 with the following options enabled: - CONFIG_CMA diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash similarity index 66% rename from package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash rename to package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index f08e80f114..4b276fecb7 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-mainline-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz +sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-utgard-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk new file mode 100644 index 0000000000..5f9090f492 --- /dev/null +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# sunxi-mali-utgard-driver +# +################################################################################ + +SUNXI_MALI_UTGARD_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 +SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) +SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux +SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 +SUNXI_MALI_UTGARD_DRIVER_LICENSE_FILES = LICENSE + +SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \ + $(LINUX_MAKE_FLAGS) \ + KDIR=$(LINUX_DIR) + +define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches + $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ + $(@D)/build.sh +endef + +SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + +define SUNXI_MALI_UTGARD_DRIVER_BUILD_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b +endef + +define SUNXI_MALI_UTGARD_DRIVER_INSTALL_TARGET_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i +endef + +define SUNXI_MALI_UTGARD_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) +endef + +$(eval $(generic-package)) From arnout at mind.be Thu Jan 6 18:01:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 19:01:51 +0100 Subject: [Buildroot] [git commit] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Message-ID: <20220106175627.26246832B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a7a652b143dfe8003c65e41ccb6914472023ee0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package provides Mali libraries for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing these libraries. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline into sunxi-mali-utgard. Add a legacy entry. Signed-off-by: Miquel Raynal Signed-off-by: Giulio Benetti [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in sunxi-mali-mainline-driver/Config.in to respect bisectability] Tested-by: Luca Ceresoli [Build tested only] Reviewed-by: Luca Ceresoli [Arnout: also update existing select in Config.in.legacy] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 32 +++++++++++++- DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 4 +- configs/olimex_a20_olinuxino_lime_defconfig | 4 +- docs/manual/adding-packages-virtual.txt | 2 +- package/Config.in | 2 +- package/glslsandbox-player/Config.in | 4 +- package/glslsandbox-player/glslsandbox-player.mk | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/sunxi-mali-mainline-driver/Config.in | 4 +- .../sunxi-mali-mainline-driver.mk | 6 +-- package/sunxi-mali-mainline/Config.in | 42 ------------------- package/sunxi-mali-mainline/sunxi-mali-mainline.mk | 49 ---------------------- package/sunxi-mali-utgard/Config.in | 43 +++++++++++++++++++ .../egl.pc | 0 .../glesv2.pc | 0 .../sunxi-mali-utgard.hash} | 2 +- package/sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 ++++++++++++++++++++++ 18 files changed, 140 insertions(+), 109 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 004506e4bb..ad5c43fb62 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,36 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_SUNXI_MALI_MAINLINE + bool "sunxi-mali-mainline package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD + help + Since the removal of the sunxi-mali package, the + sunxi-mali-mainline package that coexisted became the only + package to provide Mali blobs. The "-mainline" suffix being + undescriptive nowadays and before adding new packages bringing + Mali support for other SoCs/GPU flavors, it is clearer to + rename it SUNXI_MALI_UTGARD. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + bool "sunxi-mali-mainline-r6p2 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 + bool "sunxi-mali-mainline-r8p1 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" select BR2_LEGACY @@ -1451,7 +1481,7 @@ config BR2_PACKAGE_LIBUMP config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali package removed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_MAINLINE + select BR2_PACKAGE_SUNXI_MALI_UTGARD help The sunxi-mali package was removed, as the sunxi-mali-mainline package replaces it for mainline diff --git a/DEVELOPERS b/DEVELOPERS index 03918e4205..fcc94a5cd8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1082,8 +1082,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/sunxi-mali-utgard/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index ed279326bc..319ac48c58 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index cd88a2d19a..4cec5689ca 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/docs/manual/adding-packages-virtual.txt b/docs/manual/adding-packages-virtual.txt index 6326bb5455..722e6e3771 100644 --- a/docs/manual/adding-packages-virtual.txt +++ b/docs/manual/adding-packages-virtual.txt @@ -13,7 +13,7 @@ the provider used in the rootfs. For example, 'OpenGL ES' is an API for 2D and 3D graphics on embedded systems. The implementation of this API is different for the 'Allwinner Tech Sunxi' and the 'Texas Instruments OMAP35xx' platforms. So +libgles+ will be a virtual -package and +sunxi-mali+ and +ti-gfx+ will be the providers. +package and +sunxi-mali-utgard+ and +ti-gfx+ will be the providers. ==== +virtual-package+ tutorial diff --git a/package/Config.in b/package/Config.in index 3c7340e27c..a45a652c87 100644 --- a/package/Config.in +++ b/package/Config.in @@ -571,8 +571,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline/Config.in" source "package/sunxi-mali-mainline-driver/Config.in" + source "package/sunxi-mali-utgard/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 02d4c442ed..2d15a7e270 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -55,7 +55,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS choice prompt "Native windowing system" - default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_MAINLINE + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_UTGARD default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X if BR2_PACKAGE_MALI_T76X default BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI if BR2_PACKAGE_RPI_USERLAND default BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2 if BR2_PACKAGE_SDL2_OPENGLES @@ -73,7 +73,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI bool "Allwinner ARM/Mali Frame Buffer" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X bool "ARM/Mali T76x Frame Buffer" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index 1578608a42..c5fbf062b7 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) -GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-mainline +GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=mali else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += mali-t76x diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ba2971dc08..ec5264bfc9 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -271,7 +271,7 @@ endif ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv -else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +else ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in index 90bc308bc5..236470db53 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-mainline-driver/Config.in @@ -1,11 +1,11 @@ comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER bool "sunxi-mali-mainline-driver" default y - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE # runtime + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index feffaa7ae6..6782ca7fc2 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -15,7 +15,7 @@ SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ KDIR=$(LINUX_DIR) define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ $(@D)/build.sh endef @@ -24,12 +24,12 @@ SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_AP define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -b + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b endef define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i endef define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in deleted file mode 100644 index a2fb95bd79..0000000000 --- a/package/sunxi-mali-mainline/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI_MAINLINE - bool "sunxi-mali-mainline" - depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - help - Install userspace Allwinner OpenGL libraries. - - https://github.com/bootlin/mali-blobs - -if BR2_PACKAGE_SUNXI_MALI_MAINLINE - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali-mainline" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali-mainline" - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - help - Select the version of the userspace module. - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - bool "r6p2" -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - bool "r8p1" - -endchoice - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION - string - default "r6p2" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - default "r8p1" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - -endif - -comment "sunxi-mali needs an EABIhf glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk deleted file mode 100644 index b46f572311..0000000000 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline -# -################################################################################ - -SUNXI_MALI_MAINLINE_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d -SUNXI_MALI_MAINLINE_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION)) -SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES -SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles -SUNXI_MALI_MAINLINE_LICENSE = Allwinner End User Licence Agreement -SUNXI_MALI_MAINLINE_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf -SUNXI_MALI_MAINLINE_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf -SUNXI_MALI_MAINLINE_LICENSE_FILES = $(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) - -SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION)) - -ifeq ($(BR2_arm),y) -SUNXI_MALI_MAINLINE_ARCH=arm -else ifeq ($(BR2_aarch64),y) -SUNXI_MALI_MAINLINE_ARCH=arm64 -endif - -define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(STAGING_DIR)/usr/lib/ - cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ - - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(TARGET_DIR)/usr/lib/ -endef - -define SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - mv $(@D)/$(SUNXI_MALI_MAINLINE_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) -endef - -SUNXI_MALI_MAINLINE_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in new file mode 100644 index 0000000000..ff49ea03f1 --- /dev/null +++ b/package/sunxi-mali-utgard/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_SUNXI_MALI_UTGARD + bool "sunxi-mali-utgard" + depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + help + Install userspace Allwinner OpenGL libraries for Mali + Utgard GPUs. + + https://github.com/bootlin/mali-blobs + +if BR2_PACKAGE_SUNXI_MALI_UTGARD + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "sunxi-mali-utgard" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "sunxi-mali-utgard" + +choice + prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + Select the version of the userspace module. + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + bool "r6p2" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + bool "r8p1" + +endchoice + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION + string + default "r6p2" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + default "r8p1" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + +endif + +comment "sunxi-mali-utgard needs an EABIhf glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/egl.pc b/package/sunxi-mali-utgard/egl.pc similarity index 100% rename from package/sunxi-mali-mainline/egl.pc rename to package/sunxi-mali-utgard/egl.pc diff --git a/package/sunxi-mali-mainline/glesv2.pc b/package/sunxi-mali-utgard/glesv2.pc similarity index 100% rename from package/sunxi-mali-mainline/glesv2.pc rename to package/sunxi-mali-utgard/glesv2.pc diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash similarity index 70% rename from package/sunxi-mali-mainline/sunxi-mali-mainline.hash rename to package/sunxi-mali-utgard/sunxi-mali-utgard.hash index 96d8251f16..c86b927ea5 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-mainline-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz +sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-utgard-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf diff --git a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk new file mode 100644 index 0000000000..f693667955 --- /dev/null +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# sunxi-mali-utgard +# +################################################################################ + +SUNXI_MALI_UTGARD_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d +SUNXI_MALI_UTGARD_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_UTGARD_VERSION)) +SUNXI_MALI_UTGARD_INSTALL_STAGING = YES +SUNXI_MALI_UTGARD_PROVIDES = libegl libgles +SUNXI_MALI_UTGARD_LICENSE = Allwinner End User Licence Agreement +SUNXI_MALI_UTGARD_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf +SUNXI_MALI_UTGARD_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf +SUNXI_MALI_UTGARD_LICENSE_FILES = $(SUNXI_MALI_UTGARD_EULA_NO_SPACES) + +SUNXI_MALI_UTGARD_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION)) + +ifeq ($(BR2_arm),y) +SUNXI_MALI_UTGARD_ARCH=arm +else ifeq ($(BR2_aarch64),y) +SUNXI_MALI_UTGARD_ARCH=arm64 +endif + +define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include + + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(STAGING_DIR)/usr/lib/ + cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ + + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/egl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/glesv2.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef + +define SUNXI_MALI_UTGARD_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(TARGET_DIR)/usr/lib/ +endef + +define SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + mv $(@D)/$(SUNXI_MALI_UTGARD_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_UTGARD_EULA_NO_SPACES) +endef + +SUNXI_MALI_UTGARD_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + +$(eval $(generic-package)) From arnout at mind.be Thu Jan 6 18:03:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 19:03:16 +0100 Subject: [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading In-Reply-To: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> Message-ID: <5a11f784-6685-f33a-002d-654253e9bb61@mind.be> On 05/11/2021 23:17, Giulio Benetti wrote: > With this patchset I respin the first 2 patches. While testing on hardware > the patches they work, but I've left back an error while bumping linux > version to 5.14. The error is that Linux's sunxi_defconfig(used by both > a20_olinuxino_lime/2) enables Lima driver, but in this 2 boards we want > to use Mali driver, so when Mali driver tries to load(being it a module), > it finds that Lima already has taken gpu resources and fail. So here I add > 3 patches, 1 to add a Linux fragment to disable Lima in Linux and other 2 > to use that fragment in a20_olinuxino_lime/2. > > Giulio Benetti (3): > board/olimex/a20_olinuxino: add linux-disable-lima.fragment > configs/olimex_a20_olinuxino_lime2_defconfig: use > linux-disable-lima.fragment > configs/olimex_a20_olinuxino_lime_defconfig: use > linux-disable-lima.fragment > > Miquel Raynal (2): > package/sunxi-mali-utgard: rename from sunxi-mali-mainline > package/sunxi-mali-utgard-driver: rename from > sunxi-mali-mainline-driver I applied these two patches to master. Luca, your review was very much appreciated so if you could maybe review the rest of this series as well? :-) Regards, Arnout > > Config.in.legacy | 42 ++++++++++++++++ > DEVELOPERS | 4 +- > .../a20_olinuxino/linux-disable-lima.fragment | 2 + > configs/olimex_a20_olinuxino_lime2_defconfig | 7 +-- > configs/olimex_a20_olinuxino_lime_defconfig | 7 +-- > docs/manual/adding-packages-virtual.txt | 2 +- > package/Config.in | 4 +- > package/glslsandbox-player/Config.in | 4 +- > .../glslsandbox-player/glslsandbox-player.mk | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > .../sunxi-mali-mainline-driver.mk | 41 ---------------- > package/sunxi-mali-mainline/Config.in | 42 ---------------- > .../sunxi-mali-mainline.mk | 49 ------------------- > .../Config.in | 20 ++++---- > .../sunxi-mali-utgard-driver.hash} | 2 +- > .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++ > package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ > .../egl.pc | 0 > .../glesv2.pc | 0 > .../sunxi-mali-utgard.hash} | 2 +- > .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ > 21 files changed, 206 insertions(+), 159 deletions(-) > create mode 100644 board/olimex/a20_olinuxino/linux-disable-lima.fragment > delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk > delete mode 100644 package/sunxi-mali-mainline/Config.in > delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk > rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (60%) > rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) > create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk > create mode 100644 package/sunxi-mali-utgard/Config.in > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) > rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) > create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk > From james.hilliard1 at gmail.com Thu Jan 6 18:51:59 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 12:51:59 -0600 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: <20220106185923.0cb1bb9c@windsurf> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> Message-ID: On Thu, Jan 6, 2022 at 11:59 AM Thomas Petazzoni wrote: > > On Wed, 5 Jan 2022 23:24:04 -0700 > James Hilliard wrote: > > > _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may > > not need to be selected in kconfig in cases where building is not > > desired, so only check that _FINAL_DEPENDENCIES are selected. > > Could you expand the commit log with some specific details of which > packages/dependencies are causing issues? I haven't followed the > problem and it's not obvious to me what this patch is fixing. It's needed for this series: https://patchwork.ozlabs.org/project/buildroot/list/?series=279567 > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From aduskett at gmail.com Thu Jan 6 18:54:33 2022 From: aduskett at gmail.com (Adam Duskett) Date: Thu, 6 Jan 2022 10:54:33 -0800 Subject: [Buildroot] [PATCH v2 4/4] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-4-james.hilliard1@gmail.com> Message-ID: All; Ignore my previous email. I didn't realize I was responding to a v2. This builds correctly! On Thu, Jan 6, 2022 at 9:33 AM Adam Duskett wrote: > > Hello! > > Thanks again for your help in getting rid of the scourge that is Python2! > A few issues with this patch series: > > - Qt5base is the package that installs syncqt.pl. This results in an > immediate failure > at the begging of the build: > /bin/bash: /output/host/bin/syncqt.pl: No such file or directory > > A simple solution would be to have a post_extract_hook to install the script: > define QT5BASE_INSTALL_SYNCQT > $(INSTALL) -m 0775 -D $(@D)/bin/syncqt.pl $(HOST_DIR)/bin/syncqt.pl > endef > QT5BASE_POST_EXTRACT_HOOKS += QT5BASE_INSTALL_SYNCQT > > After that, I get a lot of: > "fatal error: private/qiodevice_p.h: No such file or directory" errors > when compiling. > > The environment is a ubuntu 20.04 docker environment with the bare > minimum requirements > installed to compile buildroot. You can find the Dockerfile here: > https://github.com/aduskett/buildroot-docker-devel/blob/master/Ubuntu/20.04/ > > Thanks! > Adam > > On Wed, Jan 5, 2022 at 10:24 PM James Hilliard > wrote: > > > > This points all qt5 packages to the latest kde submodule versions > > available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > > > We need to remove some patches applied upstream already. > > > > We need to rework qt5location to pull in the mapboxgl dependency from > > a separate package as that dependency is only included in release > > archives. > > > > We need to pin qt5 packages not available in the new upstream to the > > previous 5.15.2 version. > > > > We need to set SYNC_QT_HEADERS for all qt5 packages in the new > > upstream as headers are only copied in release archives which are > > not provided in the kde upstream. > > > > Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which > > should be the closest release to the kde patches that don't have > > lts tags. > > > > Create a .git file so to trigger headers sync during configure. > > > > Signed-off-by: James Hilliard > > --- > > Changes v1 -> v2: > > - fix headers sync and update MODULE_VERSION > > --- > > package/pkg-qmake.mk | 4 +- > > package/qt5/qt53d/qt53d.hash | 4 +- > > package/qt5/qt53d/qt53d.mk | 7 ++- > > ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- > > .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- > > .../0008-Add-missing-limits-include.patch | 32 ---------- > > .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- > > package/qt5/qt5base/qt5base.hash | 4 +- > > package/qt5/qt5base/qt5base.mk | 7 ++- > > package/qt5/qt5charts/qt5charts.hash | 4 +- > > package/qt5/qt5charts/qt5charts.mk | 7 ++- > > package/qt5/qt5coap/qt5coap.mk | 2 +- > > .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- > > .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- > > ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- > > .../qt5/qt5declarative/qt5declarative.hash | 4 +- > > package/qt5/qt5declarative/qt5declarative.mk | 7 ++- > > .../qt5graphicaleffects.hash | 4 +- > > .../qt5graphicaleffects.mk | 7 ++- > > .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- > > .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- > > package/qt5/qt5knx/qt5knx.mk | 2 +- > > ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- > > .../qt5location-mapboxgl.hash | 16 +++++ > > .../qt5location-mapboxgl.mk | 13 ++++ > > ...ix-compilation-for-no-opengl-builds.patch} | 0 > > package/qt5/qt5location/qt5location.hash | 4 +- > > package/qt5/qt5location/qt5location.mk | 14 ++++- > > package/qt5/qt5lottie/qt5lottie.hash | 4 +- > > package/qt5/qt5lottie/qt5lottie.mk | 7 ++- > > package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- > > package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- > > package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- > > package/qt5/qt5opcua/qt5opcua.mk | 2 +- > > .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- > > .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- > > .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- > > .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- > > .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- > > .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- > > .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- > > .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- > > package/qt5/qt5script/qt5script.hash | 4 +- > > package/qt5/qt5script/qt5script.mk | 7 ++- > > package/qt5/qt5scxml/qt5scxml.hash | 4 +- > > package/qt5/qt5scxml/qt5scxml.mk | 7 ++- > > package/qt5/qt5sensors/qt5sensors.hash | 4 +- > > package/qt5/qt5sensors/qt5sensors.mk | 7 ++- > > package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- > > package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- > > package/qt5/qt5serialport/qt5serialport.hash | 4 +- > > package/qt5/qt5serialport/qt5serialport.mk | 7 ++- > > package/qt5/qt5svg/qt5svg.hash | 4 +- > > package/qt5/qt5svg/qt5svg.mk | 7 ++- > > package/qt5/qt5tools/qt5tools.hash | 4 +- > > package/qt5/qt5tools/qt5tools.mk | 7 ++- > > .../qt5virtualkeyboard.hash | 4 +- > > .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- > > package/qt5/qt5wayland/qt5wayland.hash | 4 +- > > package/qt5/qt5wayland/qt5wayland.mk | 7 ++- > > package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- > > package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- > > .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- > > package/qt5/qt5websockets/qt5websockets.hash | 4 +- > > package/qt5/qt5websockets/qt5websockets.mk | 7 ++- > > package/qt5/qt5webview/qt5webview.hash | 4 +- > > package/qt5/qt5webview/qt5webview.mk | 7 ++- > > package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- > > package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- > > .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- > > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- > > 71 files changed, 216 insertions(+), 386 deletions(-) > > delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > > delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > > delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch > > delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > > delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > > rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) > > create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > > create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > > rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) > > > > diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk > > index 4dcaf6dd62..fdaddf08df 100644 > > --- a/package/pkg-qmake.mk > > +++ b/package/pkg-qmake.mk > > @@ -24,7 +24,9 @@ > > # Hook to sync Qt headers > > # > > define QT_HEADERS_SYNC_HOOK > > - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) > > + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ > > + $($(PKG)_BUILDDIR)/.qmake.conf > > + touch $($(PKG)_BUILDDIR)/.git > > endef > > > > ################################################################################ > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > > index 43b2132cc7..32d3675619 100644 > > --- a/package/qt5/qt53d/qt53d.hash > > +++ b/package/qt5/qt53d/qt53d.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 > > > > # Hashes for license files: > > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > > index f3eff9edf0..9a07d189bd 100644 > > --- a/package/qt5/qt53d/qt53d.mk > > +++ b/package/qt5/qt53d/qt53d.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT53D_VERSION = $(QT5_VERSION) > > -QT53D_SITE = $(QT5_SITE) > > -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz > > +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 > > +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > > +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > > QT53D_DEPENDENCIES = qt5declarative > > QT53D_INSTALL_STAGING = YES > > +QT53D_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_ASSIMP),y) > > QT53D_DEPENDENCIES += assimp > > diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > > deleted file mode 100644 > > index f014a160d5..0000000000 > > --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > > +++ /dev/null > > @@ -1,53 +0,0 @@ > > -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 > > -From: Thiago Macieira > > -Date: Mon, 18 Jan 2021 07:40:54 -0800 > > -Subject: [PATCH] Fix build with GCC 11: include > > - > > -Fixes: QTBUG-90395 > > -Pick-to: 6.0 > > -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 > > -Reviewed-by: Edward Welbourne > > - > > -[Retrieved (and backported) from: > > -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] > > -Signed-off-by: Fabrice Fontaine > > ---- > > - src/corelib/global/qendian.h | 6 ++++-- > > - src/corelib/global/qfloat16.h | 1 + > > - 2 files changed, 5 insertions(+), 2 deletions(-) > > - > > -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h > > -index 99b529f17cd..c874c5e47ab 100644 > > ---- a/src/corelib/global/qendian.h > > -+++ b/src/corelib/global/qendian.h > > -@@ -1,7 +1,7 @@ > > - /**************************************************************************** > > - ** > > --** Copyright (C) 2016 The Qt Company Ltd. > > --** Copyright (C) 2016 Intel Corporation. > > -+** Copyright (C) 2021 The Qt Company Ltd. > > -+** Copyright (C) 2021 Intel Corporation. > > - ** Contact: https://www.qt.io/licensing/ > > - ** > > - ** This file is part of the QtCore module of the Qt Toolkit. > > -@@ -44,6 +44,8 @@ > > - #include > > - #include > > - > > -+#include > > -+ > > - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems > > - #include > > - #include > > -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h > > -index e9477d2ecec..a25fac28862 100644 > > ---- a/src/corelib/global/qfloat16.h > > -+++ b/src/corelib/global/qfloat16.h > > -@@ -44,6 +44,7 @@ > > - > > - #include > > - #include > > -+#include > > - #include > > - > > - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) > > diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > > deleted file mode 100644 > > index d20600c6ce..0000000000 > > --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > > +++ /dev/null > > @@ -1,61 +0,0 @@ > > -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 > > -From: Ville Voutilainen > > -Date: Mon, 18 Jan 2021 09:58:17 +0200 > > -Subject: [PATCH] Build fixes for GCC 11 > > - > > -Task-number: QTBUG-89977 > > -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 > > -Reviewed-by: Lars Knoll > > -Reviewed-by: Thiago Macieira > > -[Retrieved (and backported) from: > > -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] > > -Signed-off-by: Maxim Kochetkov > > ---- > > - src/corelib/text/qbytearraymatcher.h | 2 ++ > > - src/corelib/tools/qsharedpointer_impl.h | 3 --- > > - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- > > - 3 files changed, 3 insertions(+), 4 deletions(-) > > - > > -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h > > -index 0eedfc1d20..f5f9bef7b8 100644 > > ---- a/src/corelib/text/qbytearraymatcher.h > > -+++ b/src/corelib/text/qbytearraymatcher.h > > -@@ -42,6 +42,8 @@ > > - > > - #include > > - > > -+#include > > -+ > > - QT_BEGIN_NAMESPACE > > - > > - > > -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h > > -index 790c187cb9..4aee98af53 100644 > > ---- a/src/corelib/tools/qsharedpointer_impl.h > > -+++ b/src/corelib/tools/qsharedpointer_impl.h > > -@@ -155,9 +155,6 @@ namespace QtSharedPointer { > > - #endif > > - inline void checkQObjectShared(...) { } > > - inline void setQObjectShared(...) { } > > -- > > -- inline void operator delete(void *ptr) { ::operator delete(ptr); } > > -- inline void operator delete(void *, void *) { } > > - }; > > - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) > > - > > -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp > > -index 9e7e1a5572..f0866a90ac 100644 > > ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp > > -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp > > -@@ -698,7 +698,7 @@ void QXcbWindow::show() > > - if (isTransient(window())) { > > - const QWindow *tp = window()->transientParent(); > > - if (tp && tp->handle()) > > -- transientXcbParent = static_cast(tp->handle())->winId(); > > -+ transientXcbParent = tp->handle()->winId(); > > - // Default to client leader if there is no transient parent, else modal dialogs can > > - // be hidden by their parents. > > - if (!transientXcbParent) > > --- > > -2.31.1 > > - > > diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch > > deleted file mode 100644 > > index e489f2e551..0000000000 > > --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch > > +++ /dev/null > > @@ -1,32 +0,0 @@ > > -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 > > -From: Nicolas Fella > > -Date: Sun, 20 Jun 2021 17:36:41 +0200 > > -Subject: [PATCH] Add missing limits include > > - > > -The code uses std::numeric_limits but is lacking the appropriate include > > - > > -Pick-to: 5.15 6.1 6.2 > > -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd > > -Reviewed-by: Giuseppe D'Angelo > > - > > -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] > > -Signed-off-by: Peter Seiderer > > ---- > > - src/corelib/tools/qoffsetstringarray_p.h | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h > > -index 4dd9e960..e26a57ff 100644 > > ---- a/src/corelib/tools/qoffsetstringarray_p.h > > -+++ b/src/corelib/tools/qoffsetstringarray_p.h > > -@@ -55,6 +55,7 @@ > > - > > - #include > > - #include > > -+#include > > - > > - QT_BEGIN_NAMESPACE > > - > > --- > > -2.32.0 > > - > > diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > > deleted file mode 100644 > > index 98c7210551..0000000000 > > --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > > +++ /dev/null > > @@ -1,45 +0,0 @@ > > -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 > > -From: Fabrice Fontaine > > -Date: Fri, 27 Aug 2021 16:28:32 +0200 > > -Subject: Fix build on riscv32 > > - > > -riscv32 fails to build because __NR_futex is not defined on this > > -architecture: > > - > > -In file included from thread/qmutex_linux.cpp:45, > > - from thread/qmutex.cpp:804: > > -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': > > -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? > > - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); > > - | ^~~~~~~~~~ > > - | _q_futex > > - > > -Pick-to: 6.1 6.2 > > -Fixes: QTBUG-96067 > > -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 > > -Reviewed-by: Thiago Macieira > > -[Retrieved from: > > -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] > > ---- > > - src/corelib/thread/qfutex_p.h | 5 +++++ > > - 1 file changed, 5 insertions(+) > > - > > -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h > > -index 40482b6fc1..037207a5c0 100644 > > ---- a/src/corelib/thread/qfutex_p.h > > -+++ b/src/corelib/thread/qfutex_p.h > > -@@ -103,6 +103,11 @@ QT_END_NAMESPACE > > - // if not defined in linux/futex.h > > - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 > > - > > -+// RISC-V does not supply __NR_futex > > -+# ifndef __NR_futex > > -+# define __NR_futex __NR_futex_time64 > > -+# endif > > -+ > > - QT_BEGIN_NAMESPACE > > - namespace QtLinuxFutex { > > - constexpr inline bool futexAvailable() { return true; } > > --- > > -cgit v1.2.1 > > - > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > > index a824890e3c..d10847ea04 100644 > > --- a/package/qt5/qt5base/qt5base.hash > > +++ b/package/qt5/qt5base/qt5base.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index ba2971dc08..294542fabb 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5BASE_VERSION = $(QT5_VERSION) > > -QT5BASE_SITE = $(QT5_SITE) > > -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz > > +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a > > +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > > +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > > > QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib > > QT5BASE_INSTALL_STAGING = YES > > +QT5BASE_SYNC_QT_HEADERS = YES > > > > # A few comments: > > # * -no-pch to workaround the issue described at > > diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash > > index b52be714b7..021d4ea19f 100644 > > --- a/package/qt5/qt5charts/qt5charts.hash > > +++ b/package/qt5/qt5charts/qt5charts.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk > > index 2c40ac1c89..24e635b93b 100644 > > --- a/package/qt5/qt5charts/qt5charts.mk > > +++ b/package/qt5/qt5charts/qt5charts.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5CHARTS_VERSION = $(QT5_VERSION) > > -QT5CHARTS_SITE = $(QT5_SITE) > > -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz > > +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 > > +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) > > +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 > > QT5CHARTS_INSTALL_STAGING = YES > > +QT5CHARTS_SYNC_QT_HEADERS = YES > > > > QT5CHARTS_LICENSE = GPL-3.0 > > QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 > > diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk > > index 24de869120..a50f19d7f2 100644 > > --- a/package/qt5/qt5coap/qt5coap.mk > > +++ b/package/qt5/qt5coap/qt5coap.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -QT5COAP_VERSION = $(QT5_VERSION) > > +QT5COAP_VERSION = 5.15.2 > > QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git > > QT5COAP_SITE_METHOD = git > > QT5COAP_INSTALL_STAGING = YES > > diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash > > index 3edc2d666a..12e9d637b2 100644 > > --- a/package/qt5/qt5connectivity/qt5connectivity.hash > > +++ b/package/qt5/qt5connectivity/qt5connectivity.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk > > index 6402b505bf..a4c79be10b 100644 > > --- a/package/qt5/qt5connectivity/qt5connectivity.mk > > +++ b/package/qt5/qt5connectivity/qt5connectivity.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) > > -QT5CONNECTIVITY_SITE = $(QT5_SITE) > > -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz > > +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 > > +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) > > +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 > > QT5CONNECTIVITY_INSTALL_STAGING = YES > > +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES > > > > QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > > deleted file mode 100644 > > index 0e6da652f9..0000000000 > > --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > > +++ /dev/null > > @@ -1,45 +0,0 @@ > > -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 > > -From: Peter Seiderer > > -Date: Thu, 22 Jul 2021 23:13:43 +0200 > > -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 > > - compile) > > -MIME-Version: 1.0 > > -Content-Type: text/plain; charset=UTF-8 > > -Content-Transfer-Encoding: 8bit > > - > > -Fixes: > > - > > - In file included from qqmlprofilertypedevent_p.h:43, > > - from qqmlprofilertypedevent.cpp:40: > > - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: > > - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? > > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > > - | ^~~~~~~~~~~~~~ > > - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token > > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > > - | ^ > > - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? > > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > > - | ^~~ > > - | std::max > > - > > -Signed-off-by: Peter Seiderer > > ---- > > - src/qmldebug/qqmlprofilerevent_p.h | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h > > -index a7e37d1964..01b2f58f16 100644 > > ---- a/src/qmldebug/qqmlprofilerevent_p.h > > -+++ b/src/qmldebug/qqmlprofilerevent_p.h > > -@@ -48,6 +48,7 @@ > > - #include > > - > > - #include > > -+#include > > - #include > > - > > - // > > --- > > -2.32.0 > > - > > diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash > > index ab83b71814..f9dc08a6e0 100644 > > --- a/package/qt5/qt5declarative/qt5declarative.hash > > +++ b/package/qt5/qt5declarative/qt5declarative.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > > index 3318cd24c8..036baed444 100644 > > --- a/package/qt5/qt5declarative/qt5declarative.mk > > +++ b/package/qt5/qt5declarative/qt5declarative.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5DECLARATIVE_VERSION = $(QT5_VERSION) > > -QT5DECLARATIVE_SITE = $(QT5_SITE) > > -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz > > +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 > > +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) > > +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 > > QT5DECLARATIVE_INSTALL_STAGING = YES > > +QT5DECLARATIVE_SYNC_QT_HEADERS = YES > > > > QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > > index 9d7a837b8b..e755f0848b 100644 > > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > > index a9ddff454e..542eb4de90 100644 > > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) > > -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) > > -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz > > +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e > > +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) > > +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 > > QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative > > QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES > > +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES > > > > QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash > > index b4281e712d..49690de3bb 100644 > > --- a/package/qt5/qt5imageformats/qt5imageformats.hash > > +++ b/package/qt5/qt5imageformats/qt5imageformats.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 > > > > # Hashes for license files: > > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > > diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk > > index ffb094d566..506cd123a8 100644 > > --- a/package/qt5/qt5imageformats/qt5imageformats.mk > > +++ b/package/qt5/qt5imageformats/qt5imageformats.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) > > -QT5IMAGEFORMATS_SITE = $(QT5_SITE) > > -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz > > +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f > > +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) > > +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 > > QT5IMAGEFORMATS_INSTALL_STAGING = YES > > +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES > > > > QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL > > diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk > > index 9fc121111c..412e31c652 100644 > > --- a/package/qt5/qt5knx/qt5knx.mk > > +++ b/package/qt5/qt5knx/qt5knx.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -QT5KNX_VERSION = $(QT5_VERSION) > > +QT5KNX_VERSION = 5.15.2 > > QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git > > QT5KNX_SITE_METHOD = git > > QT5KNX_INSTALL_STAGING = YES > > diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > similarity index 81% > > rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > index 0894af9ce5..0f56a488e3 100644 > > --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer > > [yann.morin.1998 at free.fr: add uClibc] > > Signed-off-by: Yann E. MORIN > > --- > > - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- > > + platform/default/thread.cpp | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > > +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp > > index c7c79b4..3f135eb 100644 > > ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > > -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > > +--- a/platform/default/thread.cpp > > ++++ b/platform/default/thread.cpp > > @@ -11,8 +11,9 @@ namespace platform { > > > > std::string getCurrentThreadName() { > > diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > > new file mode 100644 > > index 0000000000..e44081c465 > > --- /dev/null > > +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > > @@ -0,0 +1,16 @@ > > +# Locally calculated > > +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 > > + > > +# Hashes for license files: > > +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md > > +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt > > +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt > > +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt > > +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt > > +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt > > +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt > > +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt > > +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt > > +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt > > +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt > > +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt > > diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > > new file mode 100644 > > index 0000000000..58e167e483 > > --- /dev/null > > +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > > @@ -0,0 +1,13 @@ > > +################################################################################ > > +# > > +# qt5location-mapboxgl > > +# > > +################################################################################ > > + > > +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d > > +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) > > +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 > > +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib > > +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt > > + > > +$(eval $(generic-package)) > > diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch > > similarity index 100% > > rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch > > rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch > > diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash > > index 0bb293305c..52649897b1 100644 > > --- a/package/qt5/qt5location/qt5location.hash > > +++ b/package/qt5/qt5location/qt5location.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk > > index ea741d0df6..98af8b233b 100644 > > --- a/package/qt5/qt5location/qt5location.mk > > +++ b/package/qt5/qt5location/qt5location.mk > > @@ -4,10 +4,12 @@ > > # > > ################################################################################ > > > > -QT5LOCATION_VERSION = $(QT5_VERSION) > > -QT5LOCATION_SITE = $(QT5_SITE) > > -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz > > +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f > > +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) > > +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 > > +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl > > QT5LOCATION_INSTALL_STAGING = YES > > +QT5LOCATION_SYNC_QT_HEADERS = YES > > > > QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5LOCATION_DEPENDENCIES += qt5declarative > > endif > > > > +define QT5LOCATION_COPY_MAPBOXGL > > + rm -rf $(@D)/src/3rdparty/mapbox-gl-native > > + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native > > +endef > > +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL > > + > > $(eval $(qmake-package)) > > diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash > > index 740f9072f2..46ab3f60df 100644 > > --- a/package/qt5/qt5lottie/qt5lottie.hash > > +++ b/package/qt5/qt5lottie/qt5lottie.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk > > index 1423a629b9..e9614fbecf 100644 > > --- a/package/qt5/qt5lottie/qt5lottie.mk > > +++ b/package/qt5/qt5lottie/qt5lottie.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5LOTTIE_VERSION = $(QT5_VERSION) > > -QT5LOTTIE_SITE = $(QT5_SITE) > > -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz > > +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 > > +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) > > +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 > > QT5LOTTIE_DEPENDENCIES = qt5declarative > > QT5LOTTIE_INSTALL_STAGING = YES > > +QT5LOTTIE_SYNC_QT_HEADERS = YES > > > > QT5LOTTIE_LICENSE = GPL-3.0 > > QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT > > diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk > > index 54cc1de632..0b62cf1bed 100644 > > --- a/package/qt5/qt5mqtt/qt5mqtt.mk > > +++ b/package/qt5/qt5mqtt/qt5mqtt.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -QT5MQTT_VERSION = $(QT5_VERSION) > > +QT5MQTT_VERSION = 5.15.2 > > QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git > > QT5MQTT_SITE_METHOD = git > > QT5MQTT_INSTALL_STAGING = YES > > diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash > > index b70a4ecf51..1c4d930248 100644 > > --- a/package/qt5/qt5multimedia/qt5multimedia.hash > > +++ b/package/qt5/qt5multimedia/qt5multimedia.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > > index 39eddc3afc..6695369063 100644 > > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) > > -QT5MULTIMEDIA_SITE = $(QT5_SITE) > > -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz > > +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 > > +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) > > +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 > > QT5MULTIMEDIA_INSTALL_STAGING = YES > > +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES > > > > QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk > > index a58c4c5e14..ef51abddf8 100644 > > --- a/package/qt5/qt5opcua/qt5opcua.mk > > +++ b/package/qt5/qt5opcua/qt5opcua.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -QT5OPCUA_VERSION = $(QT5_VERSION) > > +QT5OPCUA_VERSION = 5.15.2 > > QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git > > QT5OPCUA_SITE_METHOD = git > > QT5OPCUA_INSTALL_STAGING = YES > > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > > index 1fa0d6430a..2138b3e313 100644 > > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > > index 1ac8689d6e..c2b5ae182e 100644 > > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) > > -QT5QUICKCONTROLS_SITE = $(QT5_SITE) > > -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz > > +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 > > +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) > > +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 > > QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative > > QT5QUICKCONTROLS_INSTALL_STAGING = YES > > +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES > > > > QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > > QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > > index f66a1186ee..8c0e02152d 100644 > > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 > > > > # Hashes for license files: > > sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 > > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > > index 2f6dcd1f2f..4bdb90b203 100644 > > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) > > -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) > > -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz > > +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 > > +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) > > +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 > > QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative > > QT5QUICKCONTROLS2_INSTALL_STAGING = YES > > +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES > > > > QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > > QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > > index ac97fc319c..c2d0b11f2b 100644 > > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > > index ef6927f928..49d0cb330b 100644 > > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) > > -QT5QUICKTIMELINE_SITE = $(QT5_SITE) > > -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz > > +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 > > +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) > > +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 > > QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative > > QT5QUICKTIMELINE_INSTALL_STAGING = YES > > +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES > > > > QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) > > QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 > > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > > index 30c5bfc51d..a2573a018a 100644 > > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > > index a6b5f0954c..b7dee4f2f3 100644 > > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > > @@ -4,13 +4,14 @@ > > # > > ################################################################################ > > > > -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) > > -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) > > -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz > > +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 > > +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) > > +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 > > QT5REMOTEOBJECTS_DEPENDENCIES = qt5base > > QT5REMOTEOBJECTS_INSTALL_STAGING = YES > > QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) > > QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 > > +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative > > diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash > > index 783598047b..0b34ff3e8f 100644 > > --- a/package/qt5/qt5script/qt5script.hash > > +++ b/package/qt5/qt5script/qt5script.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk > > index 77254fec0f..4e51eacfc3 100644 > > --- a/package/qt5/qt5script/qt5script.mk > > +++ b/package/qt5/qt5script/qt5script.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5SCRIPT_VERSION = $(QT5_VERSION) > > -QT5SCRIPT_SITE = $(QT5_SITE) > > -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz > > +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 > > +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) > > +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 > > QT5SCRIPT_INSTALL_STAGING = YES > > +QT5SCRIPT_SYNC_QT_HEADERS = YES > > > > # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. > > # This is linked into libQt5Script, which also contains Qt sources under > > diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash > > index 6f816548e6..85e72f5378 100644 > > --- a/package/qt5/qt5scxml/qt5scxml.hash > > +++ b/package/qt5/qt5scxml/qt5scxml.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 > > > > # Hashes for license files: > > sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT > > diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk > > index 186a2d381b..d5d26536a3 100644 > > --- a/package/qt5/qt5scxml/qt5scxml.mk > > +++ b/package/qt5/qt5scxml/qt5scxml.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5SCXML_VERSION = $(QT5_VERSION) > > -QT5SCXML_SITE = $(QT5_SITE) > > -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz > > +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 > > +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) > > +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 > > QT5SCXML_DEPENDENCIES = qt5declarative > > QT5SCXML_INSTALL_STAGING = YES > > +QT5SCXML_SYNC_QT_HEADERS = YES > > > > QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash > > index 179c9833e0..6be87e8cf9 100644 > > --- a/package/qt5/qt5sensors/qt5sensors.hash > > +++ b/package/qt5/qt5sensors/qt5sensors.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk > > index f928aad1c1..eebda912a9 100644 > > --- a/package/qt5/qt5sensors/qt5sensors.mk > > +++ b/package/qt5/qt5sensors/qt5sensors.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5SENSORS_VERSION = $(QT5_VERSION) > > -QT5SENSORS_SITE = $(QT5_SITE) > > -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz > > +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 > > +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) > > +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 > > QT5SENSORS_INSTALL_STAGING = YES > > QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5SENSORS_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5SENSORS_DEPENDENCIES += qt5declarative > > diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash > > index 4f05049b99..8b560a8a83 100644 > > --- a/package/qt5/qt5serialbus/qt5serialbus.hash > > +++ b/package/qt5/qt5serialbus/qt5serialbus.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 > > > > # Hashes for license files: > > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > > diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk > > index 412a255612..fc62c85318 100644 > > --- a/package/qt5/qt5serialbus/qt5serialbus.mk > > +++ b/package/qt5/qt5serialbus/qt5serialbus.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5SERIALBUS_VERSION = $(QT5_VERSION) > > -QT5SERIALBUS_SITE = $(QT5_SITE) > > -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz > > +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 > > +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) > > +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 > > QT5SERIALBUS_DEPENDENCIES = qt5serialport > > QT5SERIALBUS_INSTALL_STAGING = YES > > +QT5SERIALBUS_SYNC_QT_HEADERS = YES > > > > QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > > QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > > diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash > > index 37bc8401f8..6d821c387f 100644 > > --- a/package/qt5/qt5serialport/qt5serialport.hash > > +++ b/package/qt5/qt5serialport/qt5serialport.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk > > index 902967c757..370093f6f8 100644 > > --- a/package/qt5/qt5serialport/qt5serialport.mk > > +++ b/package/qt5/qt5serialport/qt5serialport.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5SERIALPORT_VERSION = $(QT5_VERSION) > > -QT5SERIALPORT_SITE = $(QT5_SITE) > > -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz > > +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 > > +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) > > +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 > > QT5SERIALPORT_INSTALL_STAGING = YES > > QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5SERIALPORT_SYNC_QT_HEADERS = YES > > > > $(eval $(qmake-package)) > > diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash > > index 7773a940bb..abffc2891d 100644 > > --- a/package/qt5/qt5svg/qt5svg.hash > > +++ b/package/qt5/qt5svg/qt5svg.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk > > index d4b31c231e..d48a37fafe 100644 > > --- a/package/qt5/qt5svg/qt5svg.mk > > +++ b/package/qt5/qt5svg/qt5svg.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5SVG_VERSION = $(QT5_VERSION) > > -QT5SVG_SITE = $(QT5_SITE) > > -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz > > +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e > > +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) > > +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 > > QT5SVG_INSTALL_STAGING = YES > > QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > > +QT5SVG_SYNC_QT_HEADERS = YES > > > > $(eval $(qmake-package)) > > diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash > > index e52d8e6df7..a563801997 100644 > > --- a/package/qt5/qt5tools/qt5tools.hash > > +++ b/package/qt5/qt5tools/qt5tools.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk > > index 0543afd8f7..e2385080ce 100644 > > --- a/package/qt5/qt5tools/qt5tools.mk > > +++ b/package/qt5/qt5tools/qt5tools.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5TOOLS_VERSION = $(QT5_VERSION) > > -QT5TOOLS_SITE = $(QT5_SITE) > > -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz > > +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 > > +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) > > +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 > > > > QT5TOOLS_INSTALL_STAGING = YES > > +QT5TOOLS_SYNC_QT_HEADERS = YES > > > > # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), > > # but the condition is used only used to decide if lupdate will support > > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > > index 82f132378e..1e2c658109 100644 > > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > > index 3984c9866e..db0884fd18 100644 > > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) > > -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) > > -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz > > +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 > > +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) > > +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 > > QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg > > QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES > > +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES > > > > QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 > > QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 > > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > > index b17dbdd10d..35708ec077 100644 > > --- a/package/qt5/qt5wayland/qt5wayland.hash > > +++ b/package/qt5/qt5wayland/qt5wayland.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > > index 0076bbfe73..70e5b2655e 100644 > > --- a/package/qt5/qt5wayland/qt5wayland.mk > > +++ b/package/qt5/qt5wayland/qt5wayland.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5WAYLAND_VERSION = $(QT5_VERSION) > > -QT5WAYLAND_SITE = $(QT5_SITE) > > -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz > > +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 > > +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) > > +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 > > QT5WAYLAND_DEPENDENCIES = wayland > > QT5WAYLAND_INSTALL_STAGING = YES > > +QT5WAYLAND_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) > > QT5WAYLAND_DEPENDENCIES += qt5declarative > > diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash > > index 47c7da3365..af195b32b3 100644 > > --- a/package/qt5/qt5webchannel/qt5webchannel.hash > > +++ b/package/qt5/qt5webchannel/qt5webchannel.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk > > index 176c0fd7a3..042a28fca9 100644 > > --- a/package/qt5/qt5webchannel/qt5webchannel.mk > > +++ b/package/qt5/qt5webchannel/qt5webchannel.mk > > @@ -4,13 +4,14 @@ > > # > > ################################################################################ > > > > -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) > > -QT5WEBCHANNEL_SITE = $(QT5_SITE) > > -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz > > +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 > > +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) > > +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 > > QT5WEBCHANNEL_DEPENDENCIES = qt5websockets > > QT5WEBCHANNEL_INSTALL_STAGING = YES > > QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > > QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) > > diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > > index 84bc291739..3b14284e37 100644 > > --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > > +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > > @@ -6,7 +6,7 @@ > > > > QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 > > QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > > -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > > +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz > > QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit > > > > QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 > > diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash > > index 29a9ebe439..3cc87865dc 100644 > > --- a/package/qt5/qt5websockets/qt5websockets.hash > > +++ b/package/qt5/qt5websockets/qt5websockets.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk > > index a35cdc5799..d222f025ee 100644 > > --- a/package/qt5/qt5websockets/qt5websockets.mk > > +++ b/package/qt5/qt5websockets/qt5websockets.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) > > -QT5WEBSOCKETS_SITE = $(QT5_SITE) > > -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz > > +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 > > +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) > > +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 > > QT5WEBSOCKETS_INSTALL_STAGING = YES > > QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) > > QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 > > +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > > QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) > > diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash > > index c1cee9cf85..51d0fb0d7a 100644 > > --- a/package/qt5/qt5webview/qt5webview.hash > > +++ b/package/qt5/qt5webview/qt5webview.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 > > > > # Hashes for license files: > > sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL > > diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk > > index 0f37f3eb85..ed1cfe5065 100644 > > --- a/package/qt5/qt5webview/qt5webview.mk > > +++ b/package/qt5/qt5webview/qt5webview.mk > > @@ -4,13 +4,14 @@ > > # > > ################################################################################ > > > > -QT5WEBVIEW_VERSION = $(QT5_VERSION) > > -QT5WEBVIEW_SITE = $(QT5_SITE) > > -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz > > +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f > > +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) > > +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 > > QT5WEBVIEW_DEPENDENCIES = qt5webengine > > QT5WEBVIEW_INSTALL_STAGING = YES > > QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) > > QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > > +QT5WEBVIEW_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > > QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) > > diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash > > index 08e6753f21..b854cedcb6 100644 > > --- a/package/qt5/qt5x11extras/qt5x11extras.hash > > +++ b/package/qt5/qt5x11extras/qt5x11extras.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk > > index 075d36dcd8..7b1e32df17 100644 > > --- a/package/qt5/qt5x11extras/qt5x11extras.mk > > +++ b/package/qt5/qt5x11extras/qt5x11extras.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5X11EXTRAS_VERSION = $(QT5_VERSION) > > -QT5X11EXTRAS_SITE = $(QT5_SITE) > > -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz > > +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f > > +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) > > +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 > > QT5X11EXTRAS_INSTALL_STAGING = YES > > QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5X11EXTRAS_SYNC_QT_HEADERS = YES > > > > $(eval $(qmake-package)) > > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > > index 682e114a7f..c0e3caa407 100644 > > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > > index 6845483327..27818ecb78 100644 > > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) > > -QT5XMLPATTERNS_SITE = $(QT5_SITE) > > -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz > > +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c > > +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) > > +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 > > QT5XMLPATTERNS_INSTALL_STAGING = YES > > QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5XMLPATTERNS_DEPENDENCIES += qt5declarative > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Jan 6 19:06:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 20:06:58 +0100 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> Message-ID: On 06/01/2022 19:51, James Hilliard wrote: > On Thu, Jan 6, 2022 at 11:59 AM Thomas Petazzoni > wrote: >> >> On Wed, 5 Jan 2022 23:24:04 -0700 >> James Hilliard wrote: >> >>> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may >>> not need to be selected in kconfig in cases where building is not >>> desired, so only check that _FINAL_DEPENDENCIES are selected. >> >> Could you expand the commit log with some specific details of which >> packages/dependencies are causing issues? I haven't followed the >> problem and it's not obvious to me what this patch is fixing. > > It's needed for this series: > https://patchwork.ozlabs.org/project/buildroot/list/?series=279567 Well, obviously, since it's part of that series. I think the patch is wrong though. A patch dependency is still a dependency, so the package should be selected. The problem is that you add two target packages which have no Config.in. That is simply a no go: target packages should always have a Config.in symbol. I'm going to reply with more explanation down the line though. Regards, Arnout > >> >> Thanks! >> >> Thomas >> -- >> Thomas Petazzoni, co-owner and CEO, Bootlin >> Embedded Linux and Kernel engineering and training >> https://bootlin.com > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Thu Jan 6 19:10:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 6 Jan 2022 20:10:28 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump to version 3.74 Message-ID: <20220106191028.146979-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 100d2d7870..819c272a30 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_73_1_RTM/src/SHA256SUMS -sha256 c768f9fe3129e8bcc2e9679456d7edd9453a225784a8fc7dc4501806f1fe9abe nss-3.73.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_74_RTM/src/SHA256SUMS +sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index b6279fa921..537f6dd9b6 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.73.1 +LIBNSS_VERSION = 3.74 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist -- 2.25.1 From arnout at mind.be Thu Jan 6 19:13:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 20:13:44 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220106062407.3131530-3-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-3-james.hilliard1@gmail.com> Message-ID: On 06/01/2022 07:24, James Hilliard wrote: > We need to switch to the kde upstream as the existing upstream no > longer updates the qt5 branch for most packages. > > We need to add a separate package for the chromium submodule so that > we can apply patches for python3 support to it and replace catapult > with a python3 compatible version. Creating a separate package that does nothing more than download something that is later copied into another package's subdirectory is not the right approach. For this, we have FOO_EXTRA_DOWNLOADS, which can be followed by a _POST_EXTRACT_HOOK to graft it in. So what I think you should do is download both chromium and catapult with QT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories in POST_EXTRACT_HOOK and untar the download over it. That would vastly simplify this patch as well... Regards, Arnout > > There are python3 patches available that apply to this version with > minor modifications(to be added in a future patch). > > We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building > from a repository archive instead of a release archive. > > We need to add some new required dependencies to qt5webengine so that > it will build. > > Signed-off-by: James Hilliard > --- > package/qt5/qt5.mk | 5 +- > .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ > .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ > .../qt5webengine-chromium.mk | 22 + > package/qt5/qt5webengine/Config.in | 2 + > package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- > package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ > package/qt5/qt5webengine/qt5webengine.mk | 30 +- > 8 files changed, 2561 insertions(+), 2012 deletions(-) > create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc > create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash > create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk > delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc [snip] From giulio.benetti at benettiengineering.com Thu Jan 6 19:14:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 6 Jan 2022 20:14:35 +0100 Subject: [Buildroot] =?utf-8?q?=5BPATCH=5D_DEVELOPERS=3A_remove_qt5webkit?= =?utf-8?q?-examples_entry_from_Ga=C3=ABl_Portay?= Message-ID: <20220106191435.147543-1-giulio.benetti@benettiengineering.com> This causes warning on ./utils/get-developers: WARNING: 'package/qt5/qt5webkit-examples/' doesn't match any file because 'package/qt5/qt5webkit-examples/' has been removed, so let's remove its entry in this file. Signed-off-by: Giulio Benetti --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3d5c01f795..630196fd54 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1021,7 +1021,6 @@ N: Ga?l Portay F: package/qt5/qt5virtualkeyboard/ F: package/qt5/qt5webengine/ F: package/qt5/qt5webkit/ -F: package/qt5/qt5webkit-examples/ N: Gao Xiang F: package/erofs-utils/ -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 6 19:14:59 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 13:14:59 -0600 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> Message-ID: On Thu, Jan 6, 2022 at 1:07 PM Arnout Vandecappelle wrote: > > > > On 06/01/2022 19:51, James Hilliard wrote: > > On Thu, Jan 6, 2022 at 11:59 AM Thomas Petazzoni > > wrote: > >> > >> On Wed, 5 Jan 2022 23:24:04 -0700 > >> James Hilliard wrote: > >> > >>> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may > >>> not need to be selected in kconfig in cases where building is not > >>> desired, so only check that _FINAL_DEPENDENCIES are selected. > >> > >> Could you expand the commit log with some specific details of which > >> packages/dependencies are causing issues? I haven't followed the > >> problem and it's not obvious to me what this patch is fixing. > > > > It's needed for this series: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=279567 > > Well, obviously, since it's part of that series. > > I think the patch is wrong though. A patch dependency is still a dependency, > so the package should be selected. Well I thought selection was to enable a package build, I thought selection was only for packages that need their build executed. > > The problem is that you add two target packages which have no Config.in. That > is simply a no go: target packages should always have a Config.in symbol. Well we don't want to actually build the package, only extract+patch it, I wasn't sure how else to do that. > > I'm going to reply with more explanation down the line though. > > Regards, > Arnout > > > > >> > >> Thanks! > >> > >> Thomas > >> -- > >> Thomas Petazzoni, co-owner and CEO, Bootlin > >> Embedded Linux and Kernel engineering and training > >> https://bootlin.com > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From romain.naour at smile.fr Thu Jan 6 19:22:35 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 20:22:35 +0100 Subject: [Buildroot] [PATCH 3/3] package/python-stegano : new package In-Reply-To: <20200905232559.53e7b9a9@windsurf.home> References: <20200901143731.2916-1-jugurtha.belkalem@smile.fr> <20200901143731.2916-4-jugurtha.belkalem@smile.fr> <20200905232559.53e7b9a9@windsurf.home> Message-ID: <424a55f7-27ea-e369-a753-1453214ef408@smile.fr> Hello Jugurtha, Thomas, Le 05/09/2020 ? 23:25, Thomas Petazzoni a ?crit?: > Hello Jugurtha, > > On Tue, 1 Sep 2020 16:37:31 +0200 > Jugurtha BELKALEM wrote: > >> Steganography is the art and science of writing hidden >> messages in such a way that no one , apart from the sender >> and intended recipient , suspects the existence of the message, >> a form of security through obscurity. >> Steganography is often used with cryptography. >> >> More about python-stegano is available at : >> https://pypi.org/project/stegano/. >> >> Stegano can be tested : >> $ python3 >>>>> from stegano import lsb >>>>> secret = lsb.hide("./image.png", "Hello World") >>>>> secret.save("./image-with-steganography.png") >> To get back text : >>>>> clear_message = lsb.reveal("./image-with-steganography") > > Not a strict requirement, but since you have a simple test case, what > about adding a runtime test in support/testing/ ? > >> diff --git a/package/python-stegano/Config.in b/package/python-stegano/Config.in >> new file mode 100644 >> index 0000000000..b0b209c5f8 >> --- /dev/null >> +++ b/package/python-stegano/Config.in >> @@ -0,0 +1,14 @@ >> +config BR2_PACKAGE_PYTHON_STEGANO >> + bool "python-stegano" >> + depends on BR2_PACKAGE_PYTHON3 >> + select BR2_PACKAGE_JPEG #runtime >> + select BR2_PACKAGE_LIBXML2 #runtime >> + select BR2_PACKAGE_OPENJPEG #runtime > > Could you give more details about the dependency on those 3 libraries? > Is it because python-pillow must be built with openjpeg support and > jpeg support? Or is it just because in your situation, you were using > jpg pictures? > > What about the libxml2 dependency? No reply since September 2020, I have marked this patch as "Changes Requested". Best regards, Romain > > Best regards, > > Thomas > From james.hilliard1 at gmail.com Thu Jan 6 19:23:33 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 13:23:33 -0600 Subject: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-3-james.hilliard1@gmail.com> Message-ID: On Thu, Jan 6, 2022 at 1:13 PM Arnout Vandecappelle wrote: > > > > On 06/01/2022 07:24, James Hilliard wrote: > > We need to switch to the kde upstream as the existing upstream no > > longer updates the qt5 branch for most packages. > > > > We need to add a separate package for the chromium submodule so that > > we can apply patches for python3 support to it and replace catapult > > with a python3 compatible version. > > Creating a separate package that does nothing more than download something > that is later copied into another package's subdirectory is not the right > approach. For this, we have FOO_EXTRA_DOWNLOADS, which can be followed by a > _POST_EXTRACT_HOOK to graft it in. > > So what I think you should do is download both chromium and catapult with > QT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories in POST_EXTRACT_HOOK > and untar the download over it. > > That would vastly simplify this patch as well... One reason for doing this approach is that the available patches for adding python3 support to the qt5chromium-webengine tree apply to that dependency rather than the parent qt5chromium. > > Regards, > Arnout > > > > > There are python3 patches available that apply to this version with > > minor modifications(to be added in a future patch). > > > > We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building > > from a repository archive instead of a release archive. > > > > We need to add some new required dependencies to qt5webengine so that > > it will build. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/qt5.mk | 5 +- > > .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ > > .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ > > .../qt5webengine-chromium.mk | 22 + > > package/qt5/qt5webengine/Config.in | 2 + > > package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- > > package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ > > package/qt5/qt5webengine/qt5webengine.mk | 30 +- > > 8 files changed, 2561 insertions(+), 2012 deletions(-) > > create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc > > create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash > > create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk > > delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc > > [snip] From yann.morin.1998 at free.fr Thu Jan 6 20:19:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 21:19:25 +0100 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> Message-ID: <20220106201925.GP614810@scaer> James, All, On 2022-01-06 13:14 -0600, James Hilliard spake thusly: > On Thu, Jan 6, 2022 at 1:07 PM Arnout Vandecappelle wrote: > > On 06/01/2022 19:51, James Hilliard wrote: > > > On Thu, Jan 6, 2022 at 11:59 AM Thomas Petazzoni > > > wrote: > > >> On Wed, 5 Jan 2022 23:24:04 -0700 > > >> James Hilliard wrote: > > >>> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may > > >>> not need to be selected in kconfig in cases where building is not > > >>> desired, so only check that _FINAL_DEPENDENCIES are selected. [--SNIP--] > > I think the patch is wrong though. A patch dependency is still a dependency, > > so the package should be selected. > Well I thought selection was to enable a package build, I thought selection > was only for packages that need their build executed. No, they are needed for all target packages. > > The problem is that you add two target packages which have no Config.in. That > > is simply a no go: target packages should always have a Config.in symbol. > Well we don't want to actually build the package, only extract+patch > it, I wasn't > sure how else to do that. >From what we discussed on IRC the other day, I thought I had udnerstood that qt5webengine-chromium-catapult was a hot package, that's why I suggested it to not have a Config.in entry. However, I might have misunderstood, and it really is a target package, so it needs to have a Config.in entry, even one that does not have a prompt we already have for a few packages in that situation, that are not user-selectable but are still target packages: glibc, mesa3d-headers, bluez5_utils-headers and a few others... Most interestingly, though, is that we already have a similar situation with linux extensions: they are packages that are present only to provide files that are copied into the kernel tree, like ev3dev-linux-drivers or fbtft. So, in your case, I believe that qt5webengine-chromium-catapult.mk is basically correct, but a simple Config.in is missing: # Not user-selectable, it is only needed to be copied # into the chromium source tree. config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT bool And then you should not have any issue anymore with patch-depednencies. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Thu Jan 6 20:34:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 21:34:52 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-3-james.hilliard1@gmail.com> Message-ID: <1b8ece72-bfa0-e320-df9c-4991a143d90e@mind.be> On 06/01/2022 20:23, James Hilliard wrote: > On Thu, Jan 6, 2022 at 1:13 PM Arnout Vandecappelle wrote: >> >> >> >> On 06/01/2022 07:24, James Hilliard wrote: >>> We need to switch to the kde upstream as the existing upstream no >>> longer updates the qt5 branch for most packages. >>> >>> We need to add a separate package for the chromium submodule so that >>> we can apply patches for python3 support to it and replace catapult >>> with a python3 compatible version. >> >> Creating a separate package that does nothing more than download something >> that is later copied into another package's subdirectory is not the right >> approach. For this, we have FOO_EXTRA_DOWNLOADS, which can be followed by a >> _POST_EXTRACT_HOOK to graft it in. >> >> So what I think you should do is download both chromium and catapult with >> QT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories in POST_EXTRACT_HOOK >> and untar the download over it. >> >> That would vastly simplify this patch as well... > > One reason for doing this approach is that the available patches for > adding python3 > support to the qt5chromium-webengine tree apply to that dependency rather than > the parent qt5chromium. My eyesight is getting worse because I can't see those patches :-) The only thing I see in this series is that you download and extract catapult, then download and extract chromium, then remove catapult from it and overwrite it with the catapult sources, then download and extract qt5webengine, and finally remove chromium and overwrite it with the chromium sources (including catapult). All of that can be done (and easier) with _EXTRA_DOWNLOADS and _POST_EXTRACT_HOOKS. And if there is some upstream patch to catapult that you need to apply, it's really easy to edit the patch manually. Just search/replace \b\([ab]\)/ with \1// Regards, Arnout > >> >> Regards, >> Arnout >> >>> >>> There are python3 patches available that apply to this version with >>> minor modifications(to be added in a future patch). >>> >>> We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building >>> from a repository archive instead of a release archive. >>> >>> We need to add some new required dependencies to qt5webengine so that >>> it will build. >>> >>> Signed-off-by: James Hilliard >>> --- >>> package/qt5/qt5.mk | 5 +- >>> .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ >>> .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ >>> .../qt5webengine-chromium.mk | 22 + >>> package/qt5/qt5webengine/Config.in | 2 + >>> package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- >>> package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ >>> package/qt5/qt5webengine/qt5webengine.mk | 30 +- >>> 8 files changed, 2561 insertions(+), 2012 deletions(-) >>> create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc >>> create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash >>> create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk >>> delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc >> >> [snip] From arnout at mind.be Thu Jan 6 20:38:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 21:38:34 +0100 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: <20220106201925.GP614810@scaer> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> <20220106201925.GP614810@scaer> Message-ID: <2f267f86-8749-8a23-e7eb-aee39e6641c9@mind.be> On 06/01/2022 21:19, Yann E. MORIN wrote: [snip] > we already have for a few packages in that situation, that are not > user-selectable but are still target packages: glibc, mesa3d-headers, > bluez5_utils-headers and a few others... Most interestingly, though, is > that we already have a similar situation with linux extensions: they are > packages that are present only to provide files that are copied into the > kernel tree, like ev3dev-linux-drivers or fbtft. Yeah, true. I find that solution ugly but for those there really is no other way. But Yann is right, I'm putting a bit too much stress on dropping those additional packages and using EXTRA_DOWNLOADS instead. I won't mention it again. Regards, Arnout > So, in your case, I believe that qt5webengine-chromium-catapult.mk is > basically correct, but a simple Config.in is missing: > > # Not user-selectable, it is only needed to be copied > # into the chromium source tree. > config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT > bool > > And then you should not have any issue anymore with patch-depednencies. > > Regards, > Yann E. MORIN. > From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:49 +0100 Subject: [Buildroot] [PATCH v3 01/11] support/download/dl-wrapper: add concept of download post-processing In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-2-thomas.petazzoni@bootlin.com> In order to support package managers such as Cargo (Rust) or Go, we want to run some custom logic after the main download, but before packing the tarball and checking the hash. To implement this, this commit introduces a concept of download post-processing: if -p is passed to the dl-wrapper, then support/download/-post-process will be called. Signed-off-by: Thomas Petazzoni --- support/download/dl-wrapper | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 3315bd410e..e6509e5671 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,7 +25,7 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:rf:u:q" OPT; do + while getopts ":c:d:D:o:n:N:H:rf:u:qp:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -37,6 +37,7 @@ main() { r) recurse="-r";; f) filename="${OPTARG}";; u) uris+=( "${OPTARG}" );; + p) post_process="${OPTARG}";; q) quiet="-q";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; @@ -135,6 +136,12 @@ main() { continue fi + if [ -n "${post_process}" ] ; then + ${OLDPWD}/support/download/${post_process}-post-process \ + -o "${tmpf}" \ + -n "${raw_base_name}" + fi + # cd back to free the temp-dir, so we can remove it later cd "${OLDPWD}" -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:48 +0100 Subject: [Buildroot] [PATCH v3 00/11] Support for Cargo and Go vendoring Message-ID: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Hello, Believe it or not, but here is a new version of my patch series adding support for Go vendoring, as well as a Cargo package infrastructure that also supports vendoring. This series builds on top of the work from Patrick Havelange who worked on the Cargo integration, but extends it to also cover the case of Go, showing that we have a solution solving both of these language-specific package managers. For the Go vendoring, I've also used the indication provided by Christian Stewart . I've also integrated some changes that Christian did in his series at: https://patchwork.ozlabs.org/project/buildroot/list/?series=266310 Overall, the solution consists in a concept of "download post-process helper" is introduced in the download infrastructure. These are shell scripts that can be invoked right after the download is done, but before the tarball is hash-checked and stored in DL_DIR. The idea is that such "download post-process helpers" can run the language-specific vendoring logic to fetch the package dependencies. Thanks to this, the tarball in DL_DIR for a given package not only contains the package source code itself, but also the source code of its Cargo or Go dependencies. The tarball hash covers the entire source code, the complete tarball is cached in DL_DIR, in the primary site and backup site, and the build can fully be done offline. Such "download post-process helpers" are registered by means of the _DOWNLOAD_POST_PROCESS variable by the appropriate package infrastructure. This new series is available at: https://github.com/tpetazzoni/buildroot/tree/pkg-vendoring A useful defconfig to test this series is: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_DELVE=y BR2_PACKAGE_RIPGREP=y BR2_PACKAGE_GOCRYPTFS=y BR2_PACKAGE_TINIFIER=y BR2_PACKAGE_FLANNEL=y BR2_PACKAGE_BALENA_ENGINE=y BR2_PACKAGE_DOCKER_CLI=y BR2_PACKAGE_DOCKER_ENGINE=y BR2_PACKAGE_EMBIGGEN_DISK=y BR2_PACKAGE_MENDER=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_MENDER_ARTIFACT=y BR2_PACKAGE_HOST_SENTRY_CLI=y It is useful because it builds: - All currently existing packages that use the golang-package or host-golang-package infrastructures. Those existing packages did not need vendoring support. - Builds the new tinifier, embiggen-disk and gocryptfs Go packages, which need vendoring. - Builds ripgrep, which is a target Cargo package. - Builds host-entry-cli, which is a host Cargo package. Here are the main changes compared to v2 (posted December 2020): - Use of the mk_tar_gz shell function to re-create the tarball after vendoring. This allows to benefit from the reproducible magic implemented by mk_tar_gz. - post-process download helpers moved to support/download/helpers instead of having their own files. - Usage of a proper timestamp for the re-created tarballs instead of a fixed hardcoded timestamp. - Keep the creation of go.mod in golang-package, as it is needed for Go packages that are already vendored in their upstream tarball. The creation of go.mod in the Go post-process download script, used for vendoring, now uses the same method to create a minimal go.mod file. - The Cargo infra is now added in one patch, with vendoring support, instead of adding it without vendoring support and add it after the fact. - For the same reason, the Cargo infrastructure documentation now comes through a single patch. - The ripgrep changes are modified to account for the ripgrep version bump. - The tinifier package (a Go package that needs vendoring) was version bumped. - The packages embiggen-disk and gocryptfs, which were submitted by Christian, are now part of this series. - host-sentry-cli, which had been removed previously due to the lack of Cargo vendoring support, is now re-added by this series. - Small formatting and coding style improvements. Best regards, Thomas Petazzoni Christian Stewart via buildroot (2): package/embiggen-disk: new package package/gocryptfs: new package Patrick Havelange (3): package/pkg-cargo.mk: introduce the cargo package infrastructure docs/manual/cargo: document the cargo-package infrastructure package/ripgrep: convert to cargo infrastructure Thomas Petazzoni (6): support/download/dl-wrapper: add concept of download post-processing package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable support/download/post-process-helpers: add helper function for post process scripts package/pkg-golang.mk: implement Go vendoring support package/sentry-cli: re-add package package/tinifier: new package DEVELOPERS | 4 + docs/manual/adding-packages-cargo.txt | 106 ++++++------ package/Config.in | 3 + package/Config.in.host | 1 + package/Makefile.in | 1 + ...-Fix-resizing-of-dev-mmcblk0pN-paths.patch | 45 ++++++ package/embiggen-disk/Config.in | 19 +++ package/embiggen-disk/embiggen-disk.hash | 3 + package/embiggen-disk/embiggen-disk.mk | 12 ++ package/gocryptfs/Config.in | 12 ++ package/gocryptfs/gocryptfs.hash | 3 + package/gocryptfs/gocryptfs.mk | 19 +++ package/pkg-cargo.mk | 153 ++++++++++++++++++ package/pkg-download.mk | 1 + package/pkg-golang.mk | 13 +- package/ripgrep/ripgrep.hash | 2 +- package/ripgrep/ripgrep.mk | 37 +---- package/sentry-cli/Config.in.host | 10 ++ package/sentry-cli/sentry-cli.hash | 3 + package/sentry-cli/sentry-cli.mk | 14 ++ package/tinifier/Config.in | 10 ++ package/tinifier/tinifier.hash | 3 + package/tinifier/tinifier.mk | 13 ++ support/download/cargo-post-process | 38 +++++ support/download/dl-wrapper | 9 +- support/download/go-post-process | 35 ++++ support/download/helpers | 22 +++ 27 files changed, 498 insertions(+), 93 deletions(-) create mode 100644 package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch create mode 100644 package/embiggen-disk/Config.in create mode 100644 package/embiggen-disk/embiggen-disk.hash create mode 100644 package/embiggen-disk/embiggen-disk.mk create mode 100644 package/gocryptfs/Config.in create mode 100644 package/gocryptfs/gocryptfs.hash create mode 100644 package/gocryptfs/gocryptfs.mk create mode 100644 package/pkg-cargo.mk create mode 100644 package/sentry-cli/Config.in.host create mode 100644 package/sentry-cli/sentry-cli.hash create mode 100644 package/sentry-cli/sentry-cli.mk create mode 100644 package/tinifier/Config.in create mode 100644 package/tinifier/tinifier.hash create mode 100644 package/tinifier/tinifier.mk create mode 100755 support/download/cargo-post-process create mode 100755 support/download/go-post-process -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:50 +0100 Subject: [Buildroot] [PATCH v3 02/11] package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-3-thomas.petazzoni@bootlin.com> This will allow packages to register than a download post-processing is needed. Note that this variable is intentionally not documented: it is an internal variable meant to be set by package infrastructures, not directly by packages. Signed-off-by: Thomas Petazzoni --- package/pkg-download.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2527ba5c60..66a415cce0 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -117,6 +117,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_DOWNLOAD_POST_PROCESS),-p '$($(2)_DOWNLOAD_POST_PROCESS)') \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ $(QUIET) \ -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:51 +0100 Subject: [Buildroot] [PATCH v3 03/11] support/download/post-process-helpers: add helper function for post process scripts In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-4-thomas.petazzoni@bootlin.com> download post process scripts will often need to unpack the source code tarball, do some operation, and then repack it. In order to help with this, post-process-helpers provide an unpack() function and a repack() function. Signed-off-by: Thomas Petazzoni --- support/download/helpers | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/support/download/helpers b/support/download/helpers index 40d5eea591..4c5eb466cc 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -72,5 +72,27 @@ mk_tar_gz() { popd >/dev/null } +post_process_unpack() { + local dest="${1}" + local tarball="${2}" + local one_file + + mkdir "${dest}" + tar -C "${dest}" --strip-components=1 -xf "${tarball}" + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |head -z -n1 |tr -d "\0")" + touch -r "${one_file}" "${dest}.timestamp" +} + +post_process_repack() { + local in_dir="${1}" + local base_dir="${2}" + local out="${3}" + local date + + date="@$(stat -c '%Y' "${in_dir}/${base_dir}.timestamp")" + + mk_tar_gz "${in_dir}/${base_dir}" "${base_dir}" "${date}" "${out}" +} + # Keep this line and the following as last lines in this file. # vim: ft=bash -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:53 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> From: Patrick Havelange In order to be package agnostic, the install phase is now using cargo instead of install. TARGET_CONFIGURE_OPTS is now also set when running cargo in order to support cross compiling C code within cargo. This commit also adds support/download/cargo-post-process to perform the vendoring on Cargo packages. The _LICENSE variable of cargo packages is expanded with ", vendored dependencies licenses probably not listed" as currently for all packages, the licenses of the vendored dependencies are not taken into account. Signed-off-by: Patrick Havelange [Thomas: add support for host-cargo-package and vendoring] Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 1 + package/pkg-cargo.mk | 153 ++++++++++++++++++++++++++++ support/download/cargo-post-process | 38 +++++++ 3 files changed, 192 insertions(+) create mode 100644 package/pkg-cargo.mk create mode 100755 support/download/cargo-post-process diff --git a/package/Makefile.in b/package/Makefile.in index dae7a859fd..0ca2a5844e 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -441,3 +441,4 @@ include package/pkg-waf.mk include package/pkg-golang.mk include package/pkg-meson.mk include package/pkg-qmake.mk +include package/pkg-cargo.mk diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk new file mode 100644 index 0000000000..bf1436a86b --- /dev/null +++ b/package/pkg-cargo.mk @@ -0,0 +1,153 @@ +################################################################################ +# Cargo package infrastructure +# +# This file implements an infrastructure that eases development of package +# .mk files for Cargo packages. It should be used for all packages that use +# Cargo as their build system. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this Cargo infrastructure requires the .mk file +# to only specify metadata information about the package: name, version, +# download URL, etc. +# +# We still allow the package .mk file to override what the different steps +# are doing, if needed. For example, if _BUILD_CMDS is already defined, +# it is used as the list of commands to perform to build the package, +# instead of the default Cargo behaviour. The package can also define some +# post operation hooks. +# +################################################################################ + +################################################################################ +# inner-cargo-package -- defines how the configuration, compilation and +# installation of a cargo package should be done, implements a few hooks +# to tune the build process for cargo specifities and calls the generic +# package infrastructure to generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix +# for host packages +# argument 4 is the type (target or host) +################################################################################ + +define inner-cargo-package + +# We need host-rustc to run cargo +$(2)_DOWNLOAD_DEPENDENCIES += host-rustc + +$(2)_CARGO_ENV += \ + CARGO_HOME=$$(HOST_DIR)/share/cargo \ + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_TARGET_APPLIES_TO_HOST="false" + +$(2)_DOWNLOAD_POST_PROCESS = cargo +$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo + +# Due to vendoring, it is pretty likely that not all licenses are +# listed in _LICENSE. +$(2)_LICENSE += , vendored dependencies licenses probably not listed + +# Note: in all the steps below, we "cd" into the build directory to +# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the +# manifest-path. Indeed while the latter seems to work, it in fact +# breaks in subtle ways as the way cargo searches for its +# configuration file is based (among other rules) on the current +# directory. This means that if cargo is started outside of a package +# directory, its configuration file will not be taken into account. +# +# Also, we pass: +# * --offline to prevent cargo from downloading anything: all +# dependencies should have been built by the download post +# process logic +# * --locked to force cargo to use the Cargo.lock file, which ensures +# that a fixed set of dependency versions is used + +# +# Build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +ifeq ($(4),target) +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) \ + $$(TARGET_CONFIGURE_OPTS) \ + $$($(2)_CARGO_ENV) \ + cargo build \ + --offline \ + --target $$(RUSTC_TARGET_NAME) \ + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ + --manifest-path Cargo.toml \ + --locked \ + -Z target-applies-to-host \ + $$($(2)_CARGO_BUILD_OPTS) +endef +else # ifeq ($(4),target) +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(HOST_MAKE_ENV) \ + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ + $$($(2)_CARGO_ENV) \ + cargo build \ + --offline \ + --release \ + --manifest-path Cargo.toml \ + --locked \ + $$($(2)_CARGO_BUILD_OPTS) +endef +endif # ifeq ($(4),target) +endif # ifndef $(2)_BUILD_CMDS + +# +# Target installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ + cargo install \ + --target $$(RUSTC_TARGET_NAME) \ + --offline \ + --root $$(TARGET_DIR)/usr/ \ + --bins \ + --path ./ \ + --force \ + --locked \ + $$($(2)_CARGO_INSTALL_OPTS) +endef +endif + +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + cd $$(@D) && \ + $$(HOST_MAKE_ENV) \ + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ + $$($(2)_CARGO_ENV) \ + cargo install \ + --offline \ + --root $$(HOST_DIR) \ + --bins \ + --path ./ \ + --force \ + --locked \ + $$($(2)_CARGO_INSTALL_OPTS) +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +################################################################################ +# cargo-package -- the target generator macro for Cargo packages +################################################################################ + +cargo-package = $(call inner-cargo-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) +host-cargo-package = $(call inner-cargo-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process new file mode 100755 index 0000000000..25dbbedbfa --- /dev/null +++ b/support/download/cargo-post-process @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +set -e + +. "${0%/*}/helpers" + +while getopts "n:o:" OPT; do + case "${OPT}" in + o) output="${OPTARG}";; + n) base_name="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac +done + +# Already vendored tarball, nothing to do +if tar tf ${output} | grep -q "^[^/]*/VENDOR" ; then + exit 0 +fi + +post_process_unpack ${base_name} ${output} + +# Do the Cargo vendoring +pushd ${base_name} > /dev/null +cargo vendor --locked VENDOR + +# Create the local .cargo/config with vendor info +mkdir -p .cargo/ +cat <.cargo/config +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "VENDOR" +EOF +popd > /dev/null + +post_process_repack $(pwd) ${base_name} ${output} -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:54 +0100 Subject: [Buildroot] [PATCH v3 06/11] docs/manual/cargo: document the cargo-package infrastructure In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-7-thomas.petazzoni@bootlin.com> From: Patrick Havelange The Buildroot manual was already providing some details on how to integrate Cargo packages, and those details now need to be updated with a proper documentation for the cargo-package infrastructure, as well as updates related to vendoring support, which affects how dependencies are handled. Signed-off-by: Patrick Havelange [Thomas: numerous updates and extensions.] Signed-off-by: Thomas Petazzoni docs/manual/adding-packages-cargo.txt: rewrite explanation about dependency management Now that we have vendoring support for Cargo packages, let's rewrite the dependency management section in a more accurate way. We drop the part about the local cache of the registry, because +CARGO_HOME+ in Buildroot points to $(HOST_DIR)/share/cargo, which is not shared between builds nor preserved accross builds, so its effect as a cache is limited. Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-cargo.txt | 106 ++++++++++++-------------- 1 file changed, 47 insertions(+), 59 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index 8fcc80bcc6..fb3e7d0780 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -1,7 +1,7 @@ // -*- mode:doc; -*- // vim: set syntax=asciidoc: -=== Integration of Cargo-based packages +=== Infrastructure for Cargo-based packages Cargo is the package manager for the Rust programming language. It allows the user to build programs or libraries written in Rust, but it also downloads and @@ -10,7 +10,7 @@ called "crates". [[cargo-package-tutorial]] -==== Cargo-based package's +Config.in+ file +==== +cargo-package+ tutorial The +Config.in+ file of Cargo-based package 'foo' should contain: @@ -25,11 +25,7 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 08: http://foosoftware.org/foo/ --------------------------- -==== Cargo-based package's +.mk+ file - -Buildroot does not (yet) provide a dedicated package infrastructure for -Cargo-based packages. So, we will explain how to write a +.mk+ file for such a -package. Let's start with an example: +And the +.mk+ file for this package should contain: ------------------------------ 01: ################################################################################ @@ -44,66 +40,58 @@ package. Let's start with an example: 10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: -13: FOO_DEPENDENCIES = host-rustc -14: -15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo -16: -17: FOO_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(FOO_CARGO_MODE) -18: -19: FOO_CARGO_OPTS = \ -20: $(if $(BR2_ENABLE_DEBUG),,--release) \ -21: --target=$(RUSTC_TARGET_NAME) \ -22: --manifest-path=$(@D)/Cargo.toml -23: -24: define FOO_BUILD_CMDS -25: $(TARGET_MAKE_ENV) $(FOO_CARGO_ENV) \ -26: cargo build $(FOO_CARGO_OPTS) -27: endef -28: -29: define FOO_INSTALL_TARGET_CMDS -30: $(INSTALL) -D -m 0755 $(@D)/$(FOO_BIN_DIR)/foo \ -31: $(TARGET_DIR)/usr/bin/foo -32: endef -33: -34: $(eval $(generic-package)) +13: $(eval $(cargo-package)) -------------------------------- -The Makefile starts with the definition of the standard variables for package -declaration (lines 7 to 11). +The Makefile starts with the definition of the standard variables for +package declaration (lines 7 to 11). -As seen in line 34, it is based on the -xref:generic-package-tutorial[+generic-package+ infrastructure]. So, it defines -the variables required by this particular infrastructure, where Cargo is -invoked: +As seen in line 13, it is based on the +cargo-package+ +infrastructure. Cargo will be invoked automatically by this +infrastructure to build and install the package. -* +FOO_BUILD_CMDS+: Cargo is invoked to perform the build. The options required - to configure the cross-compilation of the package are passed via - +FOO_CONF_OPTS+. +It is still possible to define custom build commands or install +commands (i.e. with FOO_BUILD_CMDS and FOO_INSTALL_TARGET_CMDS). +Those will then replace the commands from the cargo infrastructure. -* +FOO_INSTALL_TARGET_CMDS+: The binary executable generated is installed on - the target. +==== +cargo-package+ reference -In order to have Cargo available for the build, +FOO_DEPENDENCIES+ needs to -contain +host-cargo+. +The main macros for the Cargo package infrastructure are ++cargo-package+ for target packages and +host-cargo-package+ for host +packages. -To sum it up, to add a new Cargo-based package, the Makefile example can be -copied verbatim then edited to replace all occurences of +FOO+ with the -uppercase name of the new package and update the values of the standard -variables. +Just like the generic infrastructure, the Cargo infrastructure works +by defining a number of variables before calling the +cargo-package+ +or +host-cargo-package+ macros. -==== About Dependencies Management +First, all the package metadata information variables that exist in +the generic infrastructure also exist in the Cargo infrastructure: ++FOO_VERSION+, +FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, ++FOO_DEPENDENCIES+, +FOO_LICENSE+, +FOO_LICENSE_FILES+, etc. + +A few additional variables, specific to the Cargo infrastructure, can +also be defined. Many of them are only useful in very specific cases, +typical packages will therefore only use a few of them. + +* +FOO_CARGO_ENV+ can be used to pass additional variables in the + environment of +cargo+ invocations. It used at both build and + installation time -A crate can depend on other libraries from crates.io or git repositories, listed -in its Cargo.toml file. Before starting a build, Cargo usually downloads -automatically them. This step can also be performed independently, via the -+cargo fetch+ command. +* +FOO_CARGO_BUILD_OPTS+ can be used to pass additional options to + +cargo+ at build time. + +* +FOO_CARGO_INSTALL_OPTS+ can be used to pass additional options to + +cargo+ at install time. + +==== About Dependencies Management -Cargo maintains a local cache of the registry index and of git checkouts of the -crates, whose location is given by +$CARGO_HOME+. As seen in the package -Makefile example at line 15, this environment variable is set to -+$(HOST_DIR)/share/cargo+. +A crate can depend on other libraries from crates.io or git +repositories, listed in its Cargo.toml file. Buildroot automatically +takes care of downloading such dependencies as part of the download +step of packages that use the +cargo-package+ infrastructure. Such +dependencies are then kept together with the package source code in +the tarball cached in Buildroot's +DL_DIR+, and therefore the hash of +the package's tarball includes such dependencies. -This dependency download mechanism is not convenient when performing an offline -build, as Cargo will fail to fetch the dependencies. In that case, it is advised -to generate a tarball of the dependencies using the +cargo vendor+ and add it to -+FOO_EXTRA_DOWNLOADS+. +This mechanism ensures that any change in the dependencies will be +detected, and allows the build to be performed completely offline. -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:55 +0100 Subject: [Buildroot] [PATCH v3 07/11] package/ripgrep: convert to cargo infrastructure In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-8-thomas.petazzoni@bootlin.com> From: Patrick Havelange This commit converts the ripgrep package to the cargo infrastructure. This causes the vendoring mechanism to kick in, which changes the contents of the tarball. To avoid a clash on the hash, we change the version of ripgrep to the Git commit hash matching the 13.0.0 tag, so there are no functional changes, but the tarball name is different. Signed-off-by: Patrick Havelange Signed-off-by: Thomas Petazzoni --- package/ripgrep/ripgrep.hash | 2 +- package/ripgrep/ripgrep.mk | 37 ++++++------------------------------ 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index b2f03a95e6..cd2dbedfb4 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2 ripgrep-13.0.0.tar.gz +sha256 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 7c2b79a4a7..d587441cfa 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -4,7 +4,11 @@ # ################################################################################ -RIPGREP_VERSION = 13.0.0 +# Same as 13.0.0, we use a Git commit hash because the hash of this +# tarball changed when moving to the cargo-package infrastructure, and +# we can't change the hash of existing tarball. Please switch back to +# a Git tag at the next version bump. +RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT @@ -13,33 +17,4 @@ RIPGREP_CPE_ID_VENDOR = ripgrep_project # CVE only impacts ripgrep on Windows RIPGREP_IGNORE_CVES += CVE-2021-3013 -RIPGREP_DEPENDENCIES = host-rustc -RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo \ - __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ - CARGO_TARGET_APPLIES_TO_HOST="false" - -RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_BIN_SUBDIR) - -RIPGREP_CARGO_OPTS = \ - -Z target-applies-to-host \ - --target=$(RUSTC_TARGET_NAME) \ - --manifest-path=$(@D)/Cargo.toml - -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) -RIPGREP_CARGO_BIN_SUBDIR = debug -else -RIPGREP_CARGO_OPTS += --release -RIPGREP_CARGO_BIN_SUBDIR = release -endif - -define RIPGREP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \ - cargo build $(RIPGREP_CARGO_OPTS) -endef - -define RIPGREP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(RIPGREP_BIN_DIR)/rg \ - $(TARGET_DIR)/usr/bin/rg -endef - -$(eval $(generic-package)) +$(eval $(cargo-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:56 +0100 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-9-thomas.petazzoni@bootlin.com> This reverts commit d19077677fc71fc8c8cd73945606f773d907a99a, but the package now uses the cargo-package infrastructure with its vendoring mechanism, which allows us to avoid the problems that caused the package to be removed in d19077677fc71fc8c8cd73945606f773d907a99a. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/sentry-cli/Config.in.host | 10 ++++++++++ package/sentry-cli/sentry-cli.hash | 3 +++ package/sentry-cli/sentry-cli.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/sentry-cli/Config.in.host create mode 100644 package/sentry-cli/sentry-cli.hash create mode 100644 package/sentry-cli/sentry-cli.mk diff --git a/DEVELOPERS b/DEVELOPERS index a52a8cfa38..55ea7805f7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1508,6 +1508,7 @@ F: package/python-schedule/ F: package/python-sentry-sdk/ F: package/python-websockets/ F: package/python-xlib/ +F: package/sentry-cli/ F: package/sentry-native/ F: package/unclutter-xfixes/ diff --git a/package/Config.in.host b/package/Config.in.host index 7400da5894..b3e00bb482 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -81,6 +81,7 @@ menu "Host utilities" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" source "package/sdbusplus/Config.in.host" + source "package/sentry-cli/Config.in.host" source "package/sloci-image/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" diff --git a/package/sentry-cli/Config.in.host b/package/sentry-cli/Config.in.host new file mode 100644 index 0000000000..3124015367 --- /dev/null +++ b/package/sentry-cli/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_SENTRY_CLI + bool "host sentry-cli" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Official Sentry command line interface + + For managing debug information files and source maps. + + https://docs.sentry.io/cli/ diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash new file mode 100644 index 0000000000..73f818125f --- /dev/null +++ b/package/sentry-cli/sentry-cli.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 d687336379fd96c4ee73f24bd062d31672bd7453af53311b72977be3c8c78fef sentry-cli-1.59.0.tar.gz +sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk new file mode 100644 index 0000000000..58f5f1e325 --- /dev/null +++ b/package/sentry-cli/sentry-cli.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# sentry-cli +# +################################################################################ + +SENTRY_CLI_VERSION = 1.59.0 +SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) +SENTRY_CLI_LICENSE = BSD-3-clause +SENTRY_CLI_LICENSE_FILES = LICENSE + +HOST_SENTRY_CLI_DEPENDENCIES = host-zlib + +$(eval $(host-cargo-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:57 +0100 Subject: [Buildroot] [PATCH v3 09/11] package/tinifier: new package In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-10-thomas.petazzoni@bootlin.com> This is a Go package that needs vendor modules to be downloaded at build time. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tinifier/Config.in | 10 ++++++++++ package/tinifier/tinifier.hash | 3 +++ package/tinifier/tinifier.mk | 13 +++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/tinifier/Config.in create mode 100644 package/tinifier/tinifier.hash create mode 100644 package/tinifier/tinifier.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55ea7805f7..774deb012f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2765,6 +2765,7 @@ F: package/rtc-tools/ F: package/sam-ba/ F: package/scons/ F: package/squashfs/ +F: package/tinifier/ F: package/wayland/ F: package/weston/ F: support/testing/tests/boot/test_syslinux.py diff --git a/package/Config.in b/package/Config.in index cb15574746..e47c49ade5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -314,6 +314,7 @@ comment "Graphic applications" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" source "package/tesseract-ocr/Config.in" + source "package/tinifier/Config.in" comment "Graphic libraries" source "package/cegui/Config.in" diff --git a/package/tinifier/Config.in b/package/tinifier/Config.in new file mode 100644 index 0000000000..fbadfe6bd9 --- /dev/null +++ b/package/tinifier/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_TINIFIER + bool "tinifier" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + CLI tool for images compressing + + This tool uses tinypng.com API endpoint for compressing your + local jpg/png images (it supports parallel jobs). + + https://github.com/tarampampam/tinifier diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash new file mode 100644 index 0000000000..5681ed6a55 --- /dev/null +++ b/package/tinifier/tinifier.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 927e966f9d23ea7cc1942967a8fc16ef4c55c51bd096d44f54b418844a51aa12 tinifier-3.4.0.tar.gz +sha256 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 LICENSE diff --git a/package/tinifier/tinifier.mk b/package/tinifier/tinifier.mk new file mode 100644 index 0000000000..d7ed6f7c93 --- /dev/null +++ b/package/tinifier/tinifier.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# tinifier +# +################################################################################ + +TINIFIER_VERSION = 3.4.0 +TINIFIER_SITE = $(call github,tarampampam,tinifier,v$(TINIFIER_VERSION)) +TINIFIER_LICENSE = MIT +TINIFIER_LICENSE_FILES = LICENSE +TINIFIER_GOMOD = ./cmd/tinifier + +$(eval $(golang-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:59 +0100 Subject: [Buildroot] [PATCH v3 11/11] package/gocryptfs: new package In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-12-thomas.petazzoni@bootlin.com> From: Christian Stewart via buildroot Adds the gocryptfs encrypted FUSE filesystem. Currently uses without_openssl build tag, to use the native Go cryptography. However, the package could be improved by conditionally enabling openssl if it is also configured to be built by Buildroot. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/gocryptfs/Config.in | 12 ++++++++++++ package/gocryptfs/gocryptfs.hash | 3 +++ package/gocryptfs/gocryptfs.mk | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/gocryptfs/Config.in create mode 100644 package/gocryptfs/gocryptfs.hash create mode 100644 package/gocryptfs/gocryptfs.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2649cf4ac4..bf58a20fc4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -521,6 +521,7 @@ F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/gocryptfs/ F: package/mbpfan/ F: package/mosh/ F: package/pkg-golang.mk diff --git a/package/Config.in b/package/Config.in index 34a36279ea..2946ce7a4b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -221,6 +221,7 @@ menu "Filesystem and flash utilities" source "package/genext2fs/Config.in" source "package/genpart/Config.in" source "package/genromfs/Config.in" + source "package/gocryptfs/Config.in" source "package/imx-usb-loader/Config.in" source "package/mmc-utils/Config.in" source "package/mtd/Config.in" diff --git a/package/gocryptfs/Config.in b/package/gocryptfs/Config.in new file mode 100644 index 0000000000..2630cafdcf --- /dev/null +++ b/package/gocryptfs/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_GOCRYPTFS + bool "gocryptfs" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + gocryptfs is an encrypted FUSE overlay filesystem. + + https://github.com/rfjakob/gocryptfs + +comment "gocryptfs needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash new file mode 100644 index 0000000000..94487815f5 --- /dev/null +++ b/package/gocryptfs/gocryptfs.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk new file mode 100644 index 0000000000..2a00e9a959 --- /dev/null +++ b/package/gocryptfs/gocryptfs.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# gocryptfs +# +################################################################################ + +GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) +GOCRYPTFS_LICENSE = MIT +GOCRYPTFS_LICENSE_FILES = LICENSE + +GOCRYPTFS_GOMOD = github.com/rfjakob/gocryptfs/v2 + +GOCRYPTFS_LDFLAGS = \ + -X main.GitVersion=$(GOCRYPTFS_VERSION) \ + -X main.GitVersionFuse=[vendored] +GOCRYPTFS_TAGS = without_openssl + +$(eval $(golang-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:58 +0100 Subject: [Buildroot] [PATCH v3 10/11] package/embiggen-disk: new package In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-11-thomas.petazzoni@bootlin.com> From: Christian Stewart via buildroot embiggen-disk is a tool to automatically resize disks to fill available space. Patch submitted upstream: https://github.com/bradfitz/embiggen-disk/pull/13 Adds support for /dev/mmcblk0pN type paths. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...-Fix-resizing-of-dev-mmcblk0pN-paths.patch | 45 +++++++++++++++++++ package/embiggen-disk/Config.in | 19 ++++++++ package/embiggen-disk/embiggen-disk.hash | 3 ++ package/embiggen-disk/embiggen-disk.mk | 12 +++++ 6 files changed, 81 insertions(+) create mode 100644 package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch create mode 100644 package/embiggen-disk/Config.in create mode 100644 package/embiggen-disk/embiggen-disk.hash create mode 100644 package/embiggen-disk/embiggen-disk.mk diff --git a/DEVELOPERS b/DEVELOPERS index 774deb012f..2649cf4ac4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -518,6 +518,7 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-engine/ F: package/docker-proxy/ +F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ F: package/mbpfan/ diff --git a/package/Config.in b/package/Config.in index e47c49ade5..34a36279ea 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2516,6 +2516,7 @@ menu "System tools" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" + source "package/embiggen-disk/Config.in" source "package/emlog/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" diff --git a/package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch b/package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch new file mode 100644 index 0000000000..31cfea9dde --- /dev/null +++ b/package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch @@ -0,0 +1,45 @@ +From b628e4c561cb4d3ffc92a5d7aac8f4967e44977e Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Thu, 27 May 2021 20:07:07 -0700 +Subject: [PATCH] Fix resizing of /dev/mmcblk0pN paths + +Signed-off-by: Christian Stewart +--- + fs.go | 4 +++- + part.go | 5 +++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/fs.go b/fs.go +index 0b83e24..8ab3690 100644 +--- a/fs.go ++++ b/fs.go +@@ -67,7 +67,9 @@ func (e fsResizer) DepResizer() (Resizer, error) { + if dev == "/dev/root" { + return nil, errors.New("unexpected device /dev/root from statFS") + } +- if (strings.HasPrefix(dev, "/dev/sd") || strings.HasPrefix(dev, "/dev/nvme")) && ++ if (strings.HasPrefix(dev, "/dev/sd") || ++ strings.HasPrefix(dev, "/dev/mmcblk") || ++ strings.HasPrefix(dev, "/dev/nvme")) && + devEndsInNumber(dev) { + vlogf("fsResizer.DepResizer: returning partitionResizer(%q)", dev) + return partitionResizer(dev), nil +diff --git a/part.go b/part.go +index 0315a6e..f3e280f 100644 +--- a/part.go ++++ b/part.go +@@ -51,6 +51,11 @@ func diskDev(partDev string) string { + if strings.HasPrefix(partDev, "/dev/sd") { + return strings.TrimRight(partDev, "0123456789") + } ++ if strings.HasPrefix(partDev, "/dev/mmcblk") { ++ v := strings.TrimRight(partDev, "0123456789") ++ v = strings.TrimSuffix(v, "p") ++ return v ++ } + if strings.HasPrefix(partDev, "/dev/nvme") { + chopP := regexp.MustCompile(`p\d+$`) + if !chopP.MatchString(partDev) { +-- +2.31.1 + diff --git a/package/embiggen-disk/Config.in b/package/embiggen-disk/Config.in new file mode 100644 index 0000000000..667d71c86e --- /dev/null +++ b/package/embiggen-disk/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_EMBIGGEN_DISK + bool "embiggen-disk" + 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 # no fexecve + depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_UTIL_LINUX # sfdisk + select BR2_PACKAGE_UTIL_LINUX_BINARIES # sfdisk + help + embiggen-disk is a tool to resize disk partitions at runtime. + + https://github.com/bradfitz/embiggen-disk + +comment "embiggen-disk needs a glibc or musl toolchain w/ threads" + depends on BR2_USE_MMU + 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/embiggen-disk/embiggen-disk.hash b/package/embiggen-disk/embiggen-disk.hash new file mode 100644 index 0000000000..274958edc4 --- /dev/null +++ b/package/embiggen-disk/embiggen-disk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5ef943b1f6468cf0eaf9d7e6ca22d8b5692cbb5b80f19d95468fb41b675b986c embiggen-disk-c554fc1c93a4004ce0b6a3f69b0dabe0481a2308.tar.gz +sha256 063aedec1652c5a05c2d04c40e032b932453142ee8ef7fd53c04a9acc127fc95 LICENSE diff --git a/package/embiggen-disk/embiggen-disk.mk b/package/embiggen-disk/embiggen-disk.mk new file mode 100644 index 0000000000..5d5ac15ae8 --- /dev/null +++ b/package/embiggen-disk/embiggen-disk.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# embiggen-disk +# +################################################################################ + +EMBIGGEN_DISK_VERSION = c554fc1c93a4004ce0b6a3f69b0dabe0481a2308 +EMBIGGEN_DISK_SITE = $(call github,bradfitz,embiggen-disk,$(EMBIGGEN_DISK_VERSION)) +EMBIGGEN_DISK_LICENSE = Apache-2.0 +EMBIGGEN_DISK_LICENSE_FILES = LICENSE + +$(eval $(golang-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 21:05:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 22:05:59 +0100 Subject: [Buildroot] [PATCH-NEXT v3 1/6] support/download/dl-wrapper: add concept of download post-processing In-Reply-To: <20211010234655.585526-1-christian@paral.in> References: <20211010234655.585526-1-christian@paral.in> Message-ID: <20220106220559.68509598@windsurf> On Sun, 10 Oct 2021 16:46:50 -0700 Christian Stewart via buildroot wrote: > From: Thomas Petazzoni > > In order to support package managers such as Cargo (Rust) or Go, we > want to run some custom logic after the main download, but before > packing the tarball and checking the hash. > > To implement this, this commit introduces a concept of download > post-processing: if -p is passed to the dl-wrapper, then > support/download/-post-process will be called. > > Signed-off-by: Thomas Petazzoni > Signed-off-by: Christian Stewart > --- > support/download/dl-wrapper | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) I have marked this patch series as Superseded, as I have posted: https://patchwork.ozlabs.org/project/buildroot/list/?series=279698 which replaces it. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Thu Jan 6 21:05:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 22:05:03 +0100 Subject: [Buildroot] [git commit] support/testing: add runtime test for python-iptables Message-ID: <20220106205958.4FD627FE84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d7abbfed89683a7f1bef089c9fb5ab32b967cb0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/package/sample_python_iptables.py | 1 + support/testing/tests/package/test_python_iptables.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/support/testing/tests/package/sample_python_iptables.py b/support/testing/tests/package/sample_python_iptables.py new file mode 100644 index 0000000000..a3091cab31 --- /dev/null +++ b/support/testing/tests/package/sample_python_iptables.py @@ -0,0 +1 @@ +import iptc diff --git a/support/testing/tests/package/test_python_iptables.py b/support/testing/tests/package/test_python_iptables.py new file mode 100644 index 0000000000..a2ba365fa7 --- /dev/null +++ b/support/testing/tests/package/test_python_iptables.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Iptables(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_IPTABLES=y + """ + sample_scripts = ["tests/package/sample_python_iptables.py"] + timeout = 30 From arnout at mind.be Thu Jan 6 20:25:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 21:25:33 +0100 Subject: [Buildroot] [git commit] package/python-iptables: use installed iptables by default Message-ID: <20220106205958.46AFC81393@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d341ec035067120b456f669a826e26eb594c0237 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-iptables depends on ctypes.util.find_library() which does not work due to the absence of gcc and friends on target. The location of the xtables library and the iptables modules can be configured through environment variables. Within the scope of buildroot we can determine what these should be at build time and replace the calls to os.getenv() with the correct value. Fixes: https://bugs.busybox.net/show_bug.cgi?id=12271 Signed-off-by: Frank Vanbever Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-iptables/Config.in | 2 +- package/python-iptables/python-iptables.mk | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/python-iptables/Config.in b/package/python-iptables/Config.in index a35577bad3..0e24283d06 100644 --- a/package/python-iptables/Config.in +++ b/package/python-iptables/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_IPTABLES bool "python-iptables" depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_IPTABLES # runtime dependency + select BR2_PACKAGE_IPTABLES help Python bindings for iptables. diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk index 72bf292c77..0ccf064217 100644 --- a/package/python-iptables/python-iptables.mk +++ b/package/python-iptables/python-iptables.mk @@ -9,5 +9,14 @@ PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/ca/6e/cba9c6f4b5a PYTHON_IPTABLES_SETUP_TYPE = setuptools PYTHON_IPTABLES_LICENSE = Apache-2.0 PYTHON_IPTABLES_LICENSE_FILES = NOTICE +PYTHON_IPTABLES_DEPENDENCIES = iptables + +define PYTHON_IPTABLES_SET_XTABLES_ENV_VARS + XTABLES_VERSION=`awk '/XTABLES_VERSION_CODE/ {print $$NF}' $(STAGING_DIR)/usr/include/xtables-version.h`; \ + sed -i "s%os.getenv(\"PYTHON_IPTABLES_XTABLES_VERSION\")%$$XTABLES_VERSION%" $(@D)/iptc/xtables.py + sed -i "s%os.getenv(\"XTABLES_LIBDIR\")%\"/usr/lib/xtables\"%" $(@D)/iptc/xtables.py +endef + +PYTHON_IPTABLES_PRE_BUILD_HOOKS += PYTHON_IPTABLES_SET_XTABLES_ENV_VARS $(eval $(python-package)) From bugzilla at busybox.net Thu Jan 6 21:06:51 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 06 Jan 2022 21:06:51 +0000 Subject: [Buildroot] [Bug 12271] python-iptables runtime dependencies In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=12271 --- Comment #2 from Arnout Vandecappelle --- It was actually only fixed by https://git.buildroot.org/buildroot/commit/?id=d341ec035067120b456f669a826e26eb594c0237 -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:52 +0100 Subject: [Buildroot] [PATCH v3 04/11] package/pkg-golang.mk: implement Go vendoring support In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-5-thomas.petazzoni@bootlin.com> This commit introduces the download post-process script support/download/go-post-process, and hooks it into the Go package infrastructure. The -modcacherw flag is added to ensure that the Go cache is read/write, and can be deleted properly upon "make clean". The _LICENSE variable of golang packages is expanded with ", vendored dependencies licenses probably not listed" as currently for all packages, the licenses of the vendored dependencies are not taken into account. Signed-off-by: Thomas Petazzoni --- package/pkg-golang.mk | 13 +++++++++++- support/download/go-post-process | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100755 support/download/go-post-process diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index d07242310d..35bcb1673b 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -42,12 +42,13 @@ define inner-golang-package $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ + -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ -p $(PARALLEL_JOBS) # Target packages need the Go compiler on the host. -$(2)_DEPENDENCIES += host-go +$(2)_DOWNLOAD_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . @@ -81,6 +82,16 @@ define $(2)_GEN_GOMOD endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD +$(2)_DOWNLOAD_POST_PROCESS = go +$(2)_DL_ENV = \ + $(HOST_GO_COMMON_ENV) \ + GOPROXY=direct \ + BR_GOMOD=$$($(2)_GOMOD) + +# Due to vendoring, it is pretty likely that not all licenses are +# listed in _LICENSE. +$(2)_LICENSE += , vendored dependencies licenses probably not listed + # Build step. Only define it if not already defined by the package .mk # file. ifndef $(2)_BUILD_CMDS diff --git a/support/download/go-post-process b/support/download/go-post-process new file mode 100755 index 0000000000..a6e74e6221 --- /dev/null +++ b/support/download/go-post-process @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +set -e + +. "${0%/*}/helpers" + +# Parse our options +while getopts "n:o:" OPT; do + case "${OPT}" in + o) output="${OPTARG}";; + n) base_name="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac +done + +# Already vendored tarball, nothing to do +if tar tf ${output} | grep -q "^[^/]*/vendor" ; then + exit 0 +fi + +post_process_unpack ${base_name} ${output} + +# Do the Go vendoring +pushd ${base_name} > /dev/null + +# Generate go.mod if it doesn't exist +if [ ! -f go.mod ] && [ -n "${BR_GOMOD}" ]; then + printf "module ${BR_GOMOD}\n" > go.mod +fi + +go mod vendor -v -modcacherw +popd > /dev/null + +post_process_repack $(pwd) ${base_name} ${output} -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 21:08:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 22:08:24 +0100 Subject: [Buildroot] [PATCH-NEXT v3 4/6] support/download/go-post-process: implement Go vendoring support In-Reply-To: <20211010234655.585526-4-christian@paral.in> References: <20211010234655.585526-1-christian@paral.in> <20211010234655.585526-4-christian@paral.in> Message-ID: <20220106220824.31306aa6@windsurf> Hello, On Sun, 10 Oct 2021 16:46:53 -0700 Christian Stewart via buildroot wrote: > +# Do the Go vendoring > +pushd ${base_name} > /dev/null > +# modcacherw option leaves directories in the module cache at their default > +# permissions rather than making them read-only. > +if [ ! -f go.mod ] && [ -n "${gomod_init}" ]; then > + go mod init -modcacherw ${gomod_init} So here you're using "go mod init" to create the go.mod file, but in package/pkg-golang.mk, we're manually creating it. So for the sake of consistency, I tried using "go mod init" in package/pkg-golang.mk as well, but running that on balena-engine caused go mod init to start downloading stuff... which is wrong because balena-engine already comes with its vendored dependencies. So in the end, I ended up creating the go.mod manually (with the same logic) in both pkg-golang.mk and in this download post-process script. But if we find why "go mod init" didn't work in the context of pkg-golang.mk, we could switch back to using that. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Thu Jan 6 21:08:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 22:08:42 +0100 Subject: [Buildroot] [PATCH v3 3/4] package/python-iptables: use installed iptables by default In-Reply-To: <20200311105447.23808-3-frank.vanbever@essensium.com> References: <20200228163917.10596-1-frank.vanbever@essensium.com> <20200311105447.23808-1-frank.vanbever@essensium.com> <20200311105447.23808-3-frank.vanbever@essensium.com> Message-ID: On 11/03/2020 11:54, Frank Vanbever wrote: > python-iptables depends on ctypes.util.find_library() which does not work due to > the absence of gcc and friends on target. The location of the xtables library > and the iptables modules can be configured through environment variables. Within > the scope of buildroot we can determine what these should be at build time and > replace the calls to os.getenv() with the correct value. > > Fixes: https://bugs.busybox.net/show_bug.cgi?id=12271 > > Signed-off-by: Frank Vanbever This one had fallen through the cracks. I finally applied it to master. To verify that it really solves a bug, I also added a runtime test which indeed fails without this patch. Regards, Arnout > --- > v2 -> v3: > - None > v1 -> v2: > - Remove unnecessary continuation in pre-build hook > - Change sed separator to % > > Signed-off-by: Frank Vanbever > --- > package/python-iptables/Config.in | 2 +- > package/python-iptables/python-iptables.mk | 9 +++++++++ > 2 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/package/python-iptables/Config.in b/package/python-iptables/Config.in > index a35577bad3..0e24283d06 100644 > --- a/package/python-iptables/Config.in > +++ b/package/python-iptables/Config.in > @@ -1,7 +1,7 @@ > config BR2_PACKAGE_PYTHON_IPTABLES > bool "python-iptables" > depends on !BR2_STATIC_LIBS > - select BR2_PACKAGE_IPTABLES # runtime dependency > + select BR2_PACKAGE_IPTABLES > help > Python bindings for iptables. > > diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk > index 66e478a89a..38c6ee3950 100644 > --- a/package/python-iptables/python-iptables.mk > +++ b/package/python-iptables/python-iptables.mk > @@ -9,5 +9,14 @@ PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/08/5e/16a5ca35c42 > PYTHON_IPTABLES_SETUP_TYPE = setuptools > PYTHON_IPTABLES_LICENSE = Apache-2.0 > PYTHON_IPTABLES_LICENSE_FILES = NOTICE > +PYTHON_IPTABLES_DEPENDENCIES = iptables > + > +define PYTHON_IPTABLES_SET_XTABLES_ENV_VARS > + XTABLES_VERSION=`awk '/XTABLES_VERSION_CODE/ {print $$NF}' $(STAGING_DIR)/usr/include/xtables-version.h`; \ > + sed -i "s%os.getenv(\"PYTHON_IPTABLES_XTABLES_VERSION\")%$$XTABLES_VERSION%" $(@D)/iptc/xtables.py > + sed -i "s%os.getenv(\"XTABLES_LIBDIR\")%\"/usr/lib/xtables\"%" $(@D)/iptc/xtables.py > +endef > + > +PYTHON_IPTABLES_PRE_BUILD_HOOKS += PYTHON_IPTABLES_SET_XTABLES_ENV_VARS > > $(eval $(python-package)) > From thomas.petazzoni at bootlin.com Thu Jan 6 21:09:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 22:09:34 +0100 Subject: [Buildroot] [PATCH 1/1] pkg-rust: new infrastructure In-Reply-To: <20210610020632.236282-1-james.hilliard1@gmail.com> References: <20210610020632.236282-1-james.hilliard1@gmail.com> Message-ID: <20220106220934.24a8ba95@windsurf> Hello James, On Wed, 9 Jun 2021 20:06:32 -0600 James Hilliard wrote: > Add a new infrastructure to ease the development of packages that use > rust's cargo as their build system. > > Signed-off-by: James Hilliard > --- > package/Makefile.in | 1 + > package/pkg-rust.mk | 113 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 114 insertions(+) > create mode 100644 package/pkg-rust.mk I have re-submitted a new version of the Cargo package infrastructure, which I had submitted a long time ago. I think it's very close to what you have done, but also supports vendoring thanks to additional logic, also shared with the Go package infrastructure. Could you have a look at the series I just posted? Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Thu Jan 6 21:10:17 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 22:10:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: remove python2 support In-Reply-To: <20220104200904.1422985-1-aduskett@gmail.com> References: <20220104200904.1422985-1-aduskett@gmail.com> Message-ID: Hello Adam, Le 04/01/2022 ? 21:09, Adam Duskett a ?crit?: > According to the GDB 9.2 changelog, python3 has been supported since at least > 2019. > > - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host > > - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy > > - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to > depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in Agree on the principle but it seems that the gdb for csky is still based on gdb 7.12. https://github.com/c-sky/binutils-gdb/blob/4ecb98fbc2f94dbe01b69384afbc515107de73df/gdb/version.in But since csky toolchain has been removed recently, I guess we can remove the before applying your patch. For ARC, gdb is based on 10.x https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/blob/arc-2020.09-release-gdb/gdb/version.in Best regards, Romain > > Signed-off-by: Adam Duskett > --- > Config.in.legacy | 7 +++++++ > package/gdb/Config.in | 2 +- > package/gdb/Config.in.host | 5 ----- > package/gdb/gdb.mk | 10 +--------- > 4 files changed, 9 insertions(+), 15 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 5994d94487..a126d56052 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_HOST_GDB_PYTHON > + bool "GDB Python2 support removed" > + select BR2_LEGACY > + help > + Python2 is deprecated and no longer supported. > + Please migrate to Python3. > + > config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE > bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" > select BR2_LEGACY > diff --git a/package/gdb/Config.in b/package/gdb/Config.in > index 6f1a883de7..daad6c910d 100644 > --- a/package/gdb/Config.in > +++ b/package/gdb/Config.in > @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI > > config BR2_PACKAGE_GDB_PYTHON > bool "Python support" > - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 > + depends on BR2_PACKAGE_PYTHON3 > help > This option enables Python support in the target gdb. > > diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host > index a6e1d7f53c..2c6c78f20a 100644 > --- a/package/gdb/Config.in.host > +++ b/package/gdb/Config.in.host > @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON > help > This option disables Python support in the cross gdb. > > -config BR2_PACKAGE_HOST_GDB_PYTHON > - bool "Python 2" > - help > - This option enables the Python 2 support in the cross gdb. > - > config BR2_PACKAGE_HOST_GDB_PYTHON3 > bool "Python 3" > help > diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk > index 4ff498230a..2929eaf058 100644 > --- a/package/gdb/gdb.mk > +++ b/package/gdb/gdb.mk > @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) > GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) > GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) > GDB_DEPENDENCIES += python3 > -else > -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. > -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) > -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) > -GDB_DEPENDENCIES += python > endif > GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config > else > @@ -287,10 +282,7 @@ else > HOST_GDB_CONF_OPTS += --disable-tui > endif > > -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) > -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 > -HOST_GDB_DEPENDENCIES += host-python > -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) > +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) > HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 > HOST_GDB_DEPENDENCIES += host-python3 > else > From christian at paral.in Thu Jan 6 21:20:26 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 13:20:26 -0800 Subject: [Buildroot] [PATCH-NEXT v3 4/6] support/download/go-post-process: implement Go vendoring support In-Reply-To: <20220106220824.31306aa6@windsurf> References: <20211010234655.585526-1-christian@paral.in> <20211010234655.585526-4-christian@paral.in> <20220106220824.31306aa6@windsurf> Message-ID: Hi Thomas, The usage of "go mod init" converts package files from older package managers like Glide and vendor.conf into a go.mod and go.sum file with the checksums maintained. This is important for compatibility with some packages that don't have go.mod but use other approaches. On Thu, Jan 6, 2022 at 1:08 PM Thomas Petazzoni wrote: > On Sun, 10 Oct 2021 16:46:53 -0700 > Christian Stewart via buildroot wrote: > > > +# Do the Go vendoring > > +pushd ${base_name} > /dev/null > > +# modcacherw option leaves directories in the module cache at their default > > +# permissions rather than making them read-only. > > +if [ ! -f go.mod ] && [ -n "${gomod_init}" ]; then > > + go mod init -modcacherw ${gomod_init} > > So here you're using "go mod init" to create the go.mod file, but in > package/pkg-golang.mk, we're manually creating it. In this context it's OK to make network lookups and download things. GEN_GOMOD, it's not OK. > So for the sake of consistency, I tried using "go mod init" in > package/pkg-golang.mk as well, but running that on balena-engine caused > go mod init to start downloading stuff... which is wrong because > balena-engine already comes with its vendored dependencies. In this context we don't want downloads to occur, so generating manually makes sense. > So in the end, I ended up creating the go.mod manually (with the same > logic) in both pkg-golang.mk and in this download post-process script. > But if we find why "go mod init" didn't work in the context of > pkg-golang.mk, we could switch back to using that. I'd prefer to keep the "go mod init" in the download script for better compatibility with packages that don't yet use go.mod and go.sum. If you want to keep this in a separate patch & merge the manual-create in the meantime, that'd also work. Best regards, Christian From arnout at mind.be Thu Jan 6 21:28:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 22:28:56 +0100 Subject: [Buildroot] [PATCH] relocate-sdk: Allow relocating to any location In-Reply-To: <20200328234945.12552-1-glex.spb@gmail.com> References: <20200328234945.12552-1-glex.spb@gmail.com> Message-ID: <7a3b641c-93a1-4d20-b32e-8ff88bae8fef@mind.be> On 29/03/2020 00:49, Gleb Mazovetskiy wrote: > Previously, the script could only relocate to the current location. > > This caused issues for SDK maintainers, as the default target location > (e.g. /opt/my-sdk) would need to be created and the content copied > to it during the build process, which is error-prone. > > With this change you can now pass a target location argument to > ./relocate-sdk.sh (this does not move the directory). Even though, as Yann indicated, the use case is a bit iffy, the patch is simple enough. So I applied to master, thanks. Your Signed-off-by was missing, so I added that. Regards, Arnout > --- > support/misc/relocate-sdk.sh | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/support/misc/relocate-sdk.sh b/support/misc/relocate-sdk.sh > index caabeaa6f6..981d272425 100755 > --- a/support/misc/relocate-sdk.sh > +++ b/support/misc/relocate-sdk.sh > @@ -1,15 +1,20 @@ > #!/bin/sh > -# > -if [ "$#" -ne 0 ]; then > - echo "Run this script to relocate the buildroot SDK at that location" > + > +if [ "$#" -gt 1 ]; then > + echo "Usage: $0 [path]" > + echo "Run this script to relocate the buildroot SDK to the current location" > + echo "If [path] is given, sets the location to [path] (without moving it)" > exit 1 > fi > > -LOCFILE="share/buildroot/sdk-location" > -FILEPATH="$(readlink -f "$0")" > -NEWPATH="$(dirname "${FILEPATH}")" > +cd "$(dirname "$(readlink -f "$0")")" > +if [ "$#" -eq 1 ]; then > + NEWPATH="$1" > +else > + NEWPATH="${PWD}" > +fi > > -cd "${NEWPATH}" > +LOCFILE="share/buildroot/sdk-location" > if [ ! -r "${LOCFILE}" ]; then > echo "Previous location of the buildroot SDK not found!" > exit 1 > From arnout at mind.be Thu Jan 6 21:27:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 22:27:56 +0100 Subject: [Buildroot] [git commit] support/misc/relocate-sdk.sh: allow relocating to any directory Message-ID: <20220106212331.A4B96829F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd8f8f8e89b9e2fdfe3262bc685368ad77d96e2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, relocate-sdk.sh must be run _after_ relocating the SDK. There are cases where it is useful to already prepare the SDK _before_ relocating. For example, it allows to prepare a tarball that the user has to extract to a specific, pre-defined location and nothing more than that, which is simpler for the user than requiring the script to be run. In addition, it hides the build directory that was used by the SDK builder (somewhat). Add an optional argument to relocate-sdk.sh that gives the target directory. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/misc/relocate-sdk.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/support/misc/relocate-sdk.sh b/support/misc/relocate-sdk.sh index caabeaa6f6..981d272425 100755 --- a/support/misc/relocate-sdk.sh +++ b/support/misc/relocate-sdk.sh @@ -1,15 +1,20 @@ #!/bin/sh -# -if [ "$#" -ne 0 ]; then - echo "Run this script to relocate the buildroot SDK at that location" + +if [ "$#" -gt 1 ]; then + echo "Usage: $0 [path]" + echo "Run this script to relocate the buildroot SDK to the current location" + echo "If [path] is given, sets the location to [path] (without moving it)" exit 1 fi -LOCFILE="share/buildroot/sdk-location" -FILEPATH="$(readlink -f "$0")" -NEWPATH="$(dirname "${FILEPATH}")" +cd "$(dirname "$(readlink -f "$0")")" +if [ "$#" -eq 1 ]; then + NEWPATH="$1" +else + NEWPATH="${PWD}" +fi -cd "${NEWPATH}" +LOCFILE="share/buildroot/sdk-location" if [ ! -r "${LOCFILE}" ]; then echo "Previous location of the buildroot SDK not found!" exit 1 From christian at paral.in Thu Jan 6 21:30:14 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 13:30:14 -0800 Subject: [Buildroot] [PATCH 1/1] package/go: bump version to 1.17.6 Message-ID: <20220106213014.433782-1-christian@paral.in> View the release notes for more information: https://go.dev/doc/devel/release.html#go1.17.minor Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 39f8226aae..9111c8c9aa 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz +sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 0d9ceab2bb..062bec378c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.5 +GO_VERSION = 1.17.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.34.1 From romain.naour at smile.fr Thu Jan 6 21:37:53 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 22:37:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: remove python2 support In-Reply-To: References: <20220104200904.1422985-1-aduskett@gmail.com> Message-ID: Le 06/01/2022 ? 22:10, Romain Naour a ?crit?: > Hello Adam, > > Le 04/01/2022 ? 21:09, Adam Duskett a ?crit?: >> According to the GDB 9.2 changelog, python3 has been supported since at least >> 2019. Actually python3 support is available since gdb 7.8 for Linux: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=9a27f2c60d760a95a27e336750f26f69f91dd156 It's gdb python3 support for windows that is available since version 9.2. Best regards, Romain >> >> - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host >> >> - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy >> >> - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to >> depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in > > Agree on the principle but it seems that the gdb for csky is still based on gdb > 7.12. > > https://github.com/c-sky/binutils-gdb/blob/4ecb98fbc2f94dbe01b69384afbc515107de73df/gdb/version.in > > But since csky toolchain has been removed recently, I guess we can remove the > before applying your patch. > > For ARC, gdb is based on 10.x > > https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/blob/arc-2020.09-release-gdb/gdb/version.in > > Best regards, > Romain > >> >> Signed-off-by: Adam Duskett >> --- >> Config.in.legacy | 7 +++++++ >> package/gdb/Config.in | 2 +- >> package/gdb/Config.in.host | 5 ----- >> package/gdb/gdb.mk | 10 +--------- >> 4 files changed, 9 insertions(+), 15 deletions(-) >> >> diff --git a/Config.in.legacy b/Config.in.legacy >> index 5994d94487..a126d56052 100644 >> --- a/Config.in.legacy >> +++ b/Config.in.legacy >> @@ -146,6 +146,13 @@ endif >> >> comment "Legacy options removed in 2022.02" >> >> +config BR2_PACKAGE_HOST_GDB_PYTHON >> + bool "GDB Python2 support removed" >> + select BR2_LEGACY >> + help >> + Python2 is deprecated and no longer supported. >> + Please migrate to Python3. >> + >> config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE >> bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" >> select BR2_LEGACY >> diff --git a/package/gdb/Config.in b/package/gdb/Config.in >> index 6f1a883de7..daad6c910d 100644 >> --- a/package/gdb/Config.in >> +++ b/package/gdb/Config.in >> @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI >> >> config BR2_PACKAGE_GDB_PYTHON >> bool "Python support" >> - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 >> + depends on BR2_PACKAGE_PYTHON3 >> help >> This option enables Python support in the target gdb. >> >> diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host >> index a6e1d7f53c..2c6c78f20a 100644 >> --- a/package/gdb/Config.in.host >> +++ b/package/gdb/Config.in.host >> @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON >> help >> This option disables Python support in the cross gdb. >> >> -config BR2_PACKAGE_HOST_GDB_PYTHON >> - bool "Python 2" >> - help >> - This option enables the Python 2 support in the cross gdb. >> - >> config BR2_PACKAGE_HOST_GDB_PYTHON3 >> bool "Python 3" >> help >> diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk >> index 4ff498230a..2929eaf058 100644 >> --- a/package/gdb/gdb.mk >> +++ b/package/gdb/gdb.mk >> @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) >> GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) >> GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) >> GDB_DEPENDENCIES += python3 >> -else >> -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. >> -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) >> -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) >> -GDB_DEPENDENCIES += python >> endif >> GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config >> else >> @@ -287,10 +282,7 @@ else >> HOST_GDB_CONF_OPTS += --disable-tui >> endif >> >> -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) >> -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 >> -HOST_GDB_DEPENDENCIES += host-python >> -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) >> +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) >> HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 >> HOST_GDB_DEPENDENCIES += host-python3 >> else >> > From christian at paral.in Thu Jan 6 21:39:35 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 13:39:35 -0800 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.5 In-Reply-To: <20211212090107.2975294-1-christian@paral.in> References: <20211212090107.2975294-1-christian@paral.in> Message-ID: Hi maintainers, all, Currently 2021.11.x branch is at version 1.17.3 which is vulnerable to: - CVE-2021-44716 - CVE-2021-44717 Is it currently policy to backport security patches? Similarly the 2021.02.x LTS branch is at 1.16.10, when the security fixes landed in 1.16.12. I've just submitted 1.17.6 to the list and will submit 1.16.12 for 2021.02.x as well. On Sun, Dec 12, 2021 at 1:01 AM Christian Stewart wrote: > --- a/package/go/go.hash > +++ b/package/go/go.hash > @@ -1,3 +1,3 @@ > # From https://golang.org/dl/ > -sha256 705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0 go1.17.3.src.tar.gz > +sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz > sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE > diff --git a/package/go/go.mk b/package/go/go.mk > index 59177e54db..0d9ceab2bb 100644 > --- a/package/go/go.mk > +++ b/package/go/go.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GO_VERSION = 1.17.3 > +GO_VERSION = 1.17.5 > GO_SITE = https://storage.googleapis.com/golang > GO_SOURCE = go$(GO_VERSION).src.tar.gz Thanks & best regards, Christian Stewart From bernd.kuhls at t-online.de Thu Jan 6 21:44:11 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 6 Jan 2022 22:44:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.3-Matrix Message-ID: <20220106214411.2684476-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 5d0e2738bd..cd96feef70 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f5a2c0d4c742db3e8465369f4845faa87c76572290edc1792cf188ad977752b4 kodi-pvr-mythtv-19.0.2-Matrix.tar.gz +sha256 87f696fdb973602967c7dbcc1db5492616f29bfabe687fddd3a276f663a05d44 kodi-pvr-mythtv-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index b897667d67..6edca8db50 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.2-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.3-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From christian at paral.in Thu Jan 6 21:44:26 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 13:44:26 -0800 Subject: [Buildroot] [2021.02 1/1] package/go: security bump to version 1.16.13 Message-ID: <20220106214426.442534-1-christian@paral.in> go1.16.11 (released 2021-12-02) includes fixes to the compiler, runtime, and the net/http, net/http/httptest, and time packages. go1.16.12 (released 2021-12-09) includes security fixes to the syscall and net/http packages. go1.16.13 (released 2022-01-06) includes fixes to the compiler, linker, runtime, and the net/http package. Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 10bbb741e0..7071fcd99d 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 a905472011585e403d00d2a41de7ced29b8884309d73482a307f689fd0f320b5 go1.16.10.src.tar.gz +sha256 b0926654eaeb01ef43816638f42d7b1681f2d3f41b9559f07735522b7afad41a go1.16.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 8a65e20380..cac83c65ff 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.10 +GO_VERSION = 1.16.13 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.34.1 From arnout at mind.be Thu Jan 6 21:54:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 22:54:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.5 In-Reply-To: References: <20211212090107.2975294-1-christian@paral.in> Message-ID: On 06/01/2022 22:39, Christian Stewart via buildroot wrote: > Hi maintainers, all, > > Currently 2021.11.x branch is at version 1.17.3 which is vulnerable to: > > - CVE-2021-44716 > - CVE-2021-44717 > > Is it currently policy to backport security patches? Yes, of course. Peter regularly goes through the master branch and identifies commits for backporting. If he misses something, you can definitely ping him on it. Due to holidays, the last time he did that was somewhere mid-December, so the stable branches are running a bit behind. > Similarly the 2021.02.x LTS branch is at 1.16.10, when the security > fixes landed in 1.16.12. > > I've just submitted 1.17.6 to the list and will submit 1.16.12 for > 2021.02.x as well. A 1.1.6.12 bump for the 2021.02.x branch will definitely be welcome. Regards, Arnout > > On Sun, Dec 12, 2021 at 1:01 AM Christian Stewart wrote: >> --- a/package/go/go.hash >> +++ b/package/go/go.hash >> @@ -1,3 +1,3 @@ >> # From https://golang.org/dl/ >> -sha256 705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0 go1.17.3.src.tar.gz >> +sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz >> sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE >> diff --git a/package/go/go.mk b/package/go/go.mk >> index 59177e54db..0d9ceab2bb 100644 >> --- a/package/go/go.mk >> +++ b/package/go/go.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -GO_VERSION = 1.17.3 >> +GO_VERSION = 1.17.5 >> GO_SITE = https://storage.googleapis.com/golang >> GO_SOURCE = go$(GO_VERSION).src.tar.gz > > Thanks & best regards, > Christian Stewart > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From christian at paral.in Thu Jan 6 22:04:56 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:04:56 -0800 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: <20220106210000.397694-9-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-9-thomas.petazzoni@bootlin.com> Message-ID: Hi Thomas, all, I get a build error with "make host-sentry-cli": error: failed to run custom build command for `libc v0.2.71` Caused by: process didn't exit successfully: `/build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build` (exit status: 1) --- stderr /build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build: /lib64/libc.so.6: version `GLIBC_2.34' not found (required by /build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build) I guess this is a rust-related issue? I think it's complaining about the glibc version of my build system. On Thu, Jan 6, 2022 at 1:00 PM Thomas Petazzoni wrote: ############################################### > +SENTRY_CLI_VERSION = 1.59.0 > +SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) Thanks & best regards, Christian From christian at paral.in Thu Jan 6 22:11:31 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:11:31 -0800 Subject: [Buildroot] [PATCH v3 10/11] package/embiggen-disk: new package In-Reply-To: <20220106210000.397694-11-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-11-thomas.petazzoni@bootlin.com> Message-ID: Hi all, On Thu, Jan 6, 2022 at 1:00 PM Thomas Petazzoni wrote: > > From: Christian Stewart via buildroot > > embiggen-disk is a tool to automatically resize disks to fill available space. > > +EMBIGGEN_DISK_VERSION = c554fc1c93a4004ce0b6a3f69b0dabe0481a2308 > +EMBIGGEN_DISK_SITE = $(call github,bradfitz,embiggen-disk,$(EMBIGGEN_DISK_VERSION)) The PR to fix mmcblk resizing was just merged (thanks bradfitz): https://github.com/bradfitz/embiggen-disk/pull/13#event-5854783562 So the patch can be dropped and the VERSION changed to: 9e7b2fc7b99c4dece41a805489a6ca377ce55a62 Thanks & best, Christian Stewart From luca at lucaceresoli.net Thu Jan 6 22:24:49 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 6 Jan 2022 23:24:49 +0100 Subject: [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading In-Reply-To: <5a11f784-6685-f33a-002d-654253e9bb61@mind.be> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> <5a11f784-6685-f33a-002d-654253e9bb61@mind.be> Message-ID: <04340ad2-23fc-48e0-80da-54bded5158c8@lucaceresoli.net> Hi Arnout, On 06/01/22 19:03, Arnout Vandecappelle wrote: > > > On 05/11/2021 23:17, Giulio Benetti wrote: >> With this patchset I respin the first 2 patches. While testing on >> hardware >> the patches they work, but I've left back an error while bumping linux >> version to 5.14. The error is that Linux's sunxi_defconfig(used by both >> a20_olinuxino_lime/2) enables Lima driver, but in this 2 boards we want >> to use Mali driver, so when Mali driver tries to load(being it a module), >> it finds that Lima already has taken gpu resources and fail. So here I >> add >> 3 patches, 1 to add a Linux fragment to disable Lima in Linux and other 2 >> to use that fragment in a20_olinuxino_lime/2. >> >> Giulio Benetti (3): >> ?? board/olimex/a20_olinuxino: add linux-disable-lima.fragment >> ?? configs/olimex_a20_olinuxino_lime2_defconfig: use >> ???? linux-disable-lima.fragment >> ?? configs/olimex_a20_olinuxino_lime_defconfig: use >> ???? linux-disable-lima.fragment >> >> Miquel Raynal (2): >> ?? package/sunxi-mali-utgard: rename from sunxi-mali-mainline >> ?? package/sunxi-mali-utgard-driver: rename from >> ???? sunxi-mali-mainline-driver > > ?I applied these two patches to master. > > ?Luca, your review was very much appreciated so if you could maybe > review the rest of this series as well? :-) I'm afraid I'm unable to do so these days. Hopefully next week. -- Luca From christian at paral.in Thu Jan 6 22:26:13 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:26:13 -0800 Subject: [Buildroot] [PATCH v3 00/11] Support for Cargo and Go vendoring In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: Hi Thomas, Your time spent on this series is much appreciated. On Thu, Jan 6, 2022 at 1:00 PM Thomas Petazzoni wrote: > Christian Stewart via buildroot (2): > package/embiggen-disk: new package > package/gocryptfs: new package It'd be nice if the author on these commits could be edited to remove the "via buildroot" ... this was added by a Patchwork bug a while back. Best regards, Christian From thomas.petazzoni at bootlin.com Thu Jan 6 22:29:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 23:29:13 +0100 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-9-thomas.petazzoni@bootlin.com> Message-ID: <20220106232913.370ee876@windsurf> Hello Christian, On Thu, 6 Jan 2022 14:04:56 -0800 Christian Stewart wrote: > I get a build error with "make host-sentry-cli": > > error: failed to run custom build command for `libc v0.2.71` > > Caused by: > process didn't exit successfully: > `/build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build` > (exit status: 1) > --- stderr > /build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build: > /lib64/libc.so.6: version `GLIBC_2.34' not found (required by > /build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build) > > I guess this is a rust-related issue? I think it's complaining about > the glibc version of my build system. It build fine on two machines here. Could you provide more details about your host distribution? Perhaps provide a docker container that reproduces this? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 6 22:29:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 23:29:49 +0100 Subject: [Buildroot] [PATCH v3 00/11] Support for Cargo and Go vendoring In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106232949.636ec1ba@windsurf> On Thu, 6 Jan 2022 14:26:13 -0800 Christian Stewart wrote: > It'd be nice if the author on these commits could be edited to remove > the "via buildroot" > > ... this was added by a Patchwork bug a while back. ACK, will fix! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From christian at paral.in Thu Jan 6 22:30:08 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:30:08 -0800 Subject: [Buildroot] [PATCH v3 09/11] package/tinifier: new package In-Reply-To: <20220106210000.397694-10-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-10-thomas.petazzoni@bootlin.com> Message-ID: Hi all, On Thu, Jan 6, 2022 at 1:00 PM Thomas Petazzoni wrote: > > This is a Go package that needs vendor modules to be downloaded at > build time. > > Signed-off-by: Thomas Petazzoni > --- > +TINIFIER_VERSION = 3.4.0 > +TINIFIER_SITE = $(call github,tarampampam,tinifier,v$(TINIFIER_VERSION)) Build tested. Reviewed-by: Christian Stewart Thanks, Christian Stewart From fontaine.fabrice at gmail.com Thu Jan 6 22:30:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 6 Jan 2022 23:30:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/jitterentropy-library: needs threads Message-ID: <20220106223039.1065153-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 3.3.1 in commit 3965f09cb427af411055a783cd14b501b2b28285 and https://github.com/smuellerDD/jitterentropy-library/commit/1e94512db65450ffd950e04fac61408b5efb7e2d In file included from ./jitterentropy.h:98, from src/jitterentropy-gcd.c:22: ./jitterentropy-base-user.h:74:10: fatal error: pthread.h: No such file or directory 74 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7b01eca8f1442318dd35282605fc8815e6afb0d0 Signed-off-by: Fabrice Fontaine --- package/jitterentropy-library/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/jitterentropy-library/Config.in b/package/jitterentropy-library/Config.in index 02f8ff6164..f9ae1bac5a 100644 --- a/package/jitterentropy-library/Config.in +++ b/package/jitterentropy-library/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_JITTERENTROPY_LIBRARY bool "libjitterentropy" + depends on BR2_TOOLCHAIN_HAS_THREADS help Hardware RNG based on CPU timing jitter. https://github.com/smuellerDD/jitterentropy-library + +comment "libjitterentropy needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS -- 2.34.1 From christian at paral.in Thu Jan 6 22:38:06 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:38:06 -0800 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: <20220106232913.370ee876@windsurf> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-9-thomas.petazzoni@bootlin.com> <20220106232913.370ee876@windsurf> Message-ID: Hi Thomas, On Thu, Jan 6, 2022 at 2:29 PM Thomas Petazzoni wrote: > On Thu, 6 Jan 2022 14:04:56 -0800 > Christian Stewart wrote: > > > I get a build error with "make host-sentry-cli": > > > > error: failed to run custom build command for `libc v0.2.71` > > /lib64/libc.so.6: version `GLIBC_2.34' not found (required by > It build fine on two machines here. Could you provide more details > about your host distribution? Perhaps provide a docker container that > reproduces this? I'm running an up-to-date Gentoo system at version 2.33. Currently 2.34 is masked: https://packages.gentoo.org/packages/sys-libs/glibc I guess the host-rust packages expect at least glibc 2.34. Best regards, Christian Stewart From fontaine.fabrice at gmail.com Thu Jan 6 22:39:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 6 Jan 2022 23:39:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburiparser: security bump to version 0.9.6 Message-ID: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> - Fixed: [CVE-2021-46141] Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* functions where the text range in .hostText would not be duped using malloc but remain unchanged (and hence "not owned") for URIs with an IPv4 or IPv6 address hostname; depending on how an application uses uriparser, this could lead the application into a use-after-free situation. As the second half, fix uriFreeUriMembers* functions that would not free .hostText memory for URIs with an IPv4 or IPv6 address host; also, calling uriFreeUriMembers* multiple times on a URI of this very nature would result in trying to free pointers to stack (rather than heap) memory. - Fixed: [CVE-2021-46142] Fix functions uriNormalizeSyntax* for out-of-memory situations (i.e. malloc returning NULL) for URIs containing empty segments (any of user info, host text, query, or fragment) where previously pointers to stack (rather than heap) memory were freed. https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog Signed-off-by: Fabrice Fontaine --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 60acca2215..8b40807541 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c7bc604ece..c9903bd74f 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.5 -LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING -- 2.34.1 From romain.naour at smile.fr Thu Jan 6 22:42:20 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 23:42:20 +0100 Subject: [Buildroot] [PATCH v3 1/1] utils/check-package: add a check for the new spacing convention In-Reply-To: <20200603081253.14319-1-heiko.thiery@gmail.com> References: <20200603081253.14319-1-heiko.thiery@gmail.com> Message-ID: <9d963724-22c3-3f38-0535-8e0328e0f2f8@smile.fr> Hello, Le 03/06/2020 ? 10:12, Heiko Thiery a ?crit?: > The seperation of the fields in the hash file should be 2 spaces for > consistency. There are still a huge number of warnings when this patch is applied, because there are many packages still not fixed. Best regards, Romain > > Signed-off-by: Heiko Thiery > Cc: Yann E. MORIN > Cc: Thomas Petazzoni > --- > v1 -> v2: > removed re.escape() > > v2 -> v3: > re-add re.escape and removed '^' and '$' from regexp because they also are > escaped by re.escape(). > > Now 'make check-package' will not throw any exceptions. > > After conversion all hash files to the right format no more warnings > will occure: > > Oneliner provided by Yann will do that job: > $ find . -type f -name '*.hash' -print0 |xargs -0 sed -r -i -e 's/^(md5|sha(1|224|256|384|512))[[:space:]]+([^[:space:]]+)[[:space:]]+(.+)$/\1 \3 \4/' > > --- > utils/checkpackagelib/lib_hash.py | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py > index 3e381119a5..a72e8af0b9 100644 > --- a/utils/checkpackagelib/lib_hash.py > +++ b/utils/checkpackagelib/lib_hash.py > @@ -40,7 +40,7 @@ class HashType(_CheckFunction): > if len(fields) < 2: > return > > - htype, hexa = fields[:2] > + htype, hexa, filename = fields[:3] > if htype == "none": > return > if htype not in self.len_of_hash.keys(): > @@ -53,3 +53,7 @@ class HashType(_CheckFunction): > .format(self.filename, lineno, self.url_to_manual), > text, > "expected {} hex digits".format(self.len_of_hash[htype])] > + if not re.match(re.escape("{} {} {}".format(htype, hexa, filename)), text): > + return ["{}:{}: separation does not match expectation " > + "({}#adding-packages-hash)" > + .format(self.filename, lineno, self.url_to_manual), text] > From fontaine.fabrice at gmail.com Thu Jan 6 22:56:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 6 Jan 2022 23:56:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvdpau: bump to version 1.4 Message-ID: <20220106225647.1162108-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://gitlab.freedesktop.org/vdpau/libvdpau/-/tags/1.4 Signed-off-by: Fabrice Fontaine --- package/libvdpau/libvdpau.hash | 7 +++---- package/libvdpau/libvdpau.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libvdpau/libvdpau.hash b/package/libvdpau/libvdpau.hash index 0833d41bf4..653657322a 100644 --- a/package/libvdpau/libvdpau.hash +++ b/package/libvdpau/libvdpau.hash @@ -1,5 +1,4 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003021.html -sha256 b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e libvdpau-1.3.tar.bz2 -sha512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2 # Locally computed -sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING +sha256 4258824c5a4555ef31de0a7d82b3caf19e75a16a13949f1edafc5f6fb2d33f30 libvdpau-1.4.tar.bz2 +# Locally computed +sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING diff --git a/package/libvdpau/libvdpau.mk b/package/libvdpau/libvdpau.mk index 63aecaf744..ae2f388855 100644 --- a/package/libvdpau/libvdpau.mk +++ b/package/libvdpau/libvdpau.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVDPAU_VERSION = 1.3 +LIBVDPAU_VERSION = 1.4 LIBVDPAU_SOURCE = libvdpau-$(LIBVDPAU_VERSION).tar.bz2 LIBVDPAU_SITE = \ https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$(LIBVDPAU_VERSION) -- 2.34.1 From thomas.petazzoni at bootlin.com Thu Jan 6 22:59:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 23:59:26 +0100 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-9-thomas.petazzoni@bootlin.com> <20220106232913.370ee876@windsurf> Message-ID: <20220106235926.012b8ca8@windsurf> Hello, On Thu, 6 Jan 2022 14:38:06 -0800 Christian Stewart wrote: > I'm running an up-to-date Gentoo system at version 2.33. > > Currently 2.34 is masked: > > https://packages.gentoo.org/packages/sys-libs/glibc > > I guess the host-rust packages expect at least glibc 2.34. Seems unlikely, because I just built the following configuration in the buildroot/base:20200814.2228 container, which is very old Debian with glibc 2.24 (yes 2.24). BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_SENTRY_CLI=y $ dpkg -l | grep libc6 ii libc6:amd64 2.24-11+deb9u1 amd64 GNU C Library: Shared libraries ii libc6:i386 2.24-11+deb9u1 i386 GNU C Library: Shared libraries Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Fri Jan 7 00:14:04 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 01:14:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: fix blank entry in cross-compilation.conf In-Reply-To: References: <20201023061251.29900-1-derrick@meter.com> <20201024203231.36f8b4a5@gmx.net> Message-ID: Hello Derrick, Le 24/10/2020 ? 21:02, Derrick Pallas a ?crit?: > Thanks for looking Peter. > > On 10/24/20 11:32 AM, Peter Seiderer wrote: >> On my system (for a RPi4 configuration) already without your patch: >> >> ????$ grep cpu host/etc/meson/cross-compilation.conf >> cpu_family ='aarch64' >> cpu = 'cortex-a72' >> >> GCC_TARGET_CPU comes from arch/arch.mk: >> >> GCC_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU)) >> >> Anything special with your configuration/build environment (which >> buildroot version)? What is the BR2_GCC_TARGET_CPU entry in >> your .config file? > > I've tried this on both the development branch and on 2020.08.1 and I get the > same results. The target is an x86_64/silvermont. After taking a second look, > the problem seems to be that arch/Config.in.x86 does not actually set > BR2_GCC_TARGET_CPU; instead, it sets BR2_GCC_TARGET_ARCH with a value that might > better described as BR2_GCC_TARGET_CPU. Thus, my config has > > ????BR2_ARCH = x86_64 # because BR2_x86_64 > ????BR2_GCC_TARGET_ARCH = silvermont # because BR2_x86_silvermont > > Is the config variable misnamed for x86? Adding Thomas Petazzoni, since it looks > like he did the original breakout of BR2_GCC_TARGET_ARCH and then later removed > it from several archs (e.g. arm) in favor of cpu. > > Or should there be a fallback from BR2_GCC_TARGET_CPU to BR2_GCC_TARGET_ARCH if > the former does not exist? I don't see any change with this patch applied. Indeed, cpu is empty on x86_64 architecture: [host_machine] system = 'linux' cpu_family = 'x86_64' cpu = '' endian = 'little' On aach64: [host_machine] system = 'linux' cpu_family = 'aarch64' cpu = 'cortex-a53' endian = 'little' See meson documentation about cpu_family vs cpu: https://mesonbuild.com/Cross-compilation.html#machine-entries Yocto use TARGET_ARCH as cpu value: https://github.com/openembedded/openembedded-core/blob/dunfell/meta/classes/meson.bbclass#L119 Did you try to use BR2_GCC_TARGET_ARCH as cpu value ? Did you notice any change/improvement ? I not sure it's really annoying since Buildroot use a toolchain wrapper that provide -mcpu= or -march= flag on the gcc command line. Best regards, Romain > > Thanks, ~Derrick > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From christian at paral.in Fri Jan 7 00:45:37 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 16:45:37 -0800 Subject: [Buildroot] [PATCH-NEXT v3 4/6] support/download/go-post-process: implement Go vendoring support In-Reply-To: References: <20211010234655.585526-1-christian@paral.in> <20211010234655.585526-4-christian@paral.in> <20220106220824.31306aa6@windsurf> Message-ID: Hi all, On Thu, Jan 6, 2022 at 1:20 PM Christian Stewart wrote: > The usage of "go mod init" converts package files from older package > managers like Glide and vendor.conf into a go.mod and go.sum file with > the checksums maintained. > > > +# Do the Go vendoring > > > +pushd ${base_name} > /dev/null > > > +# modcacherw option leaves directories in the module cache at their default > > > +# permissions rather than making them read-only. > > > +if [ ! -f go.mod ] && [ -n "${gomod_init}" ]; then > > > + go mod init -modcacherw ${gomod_init} > > > So in the end, I ended up creating the go.mod manually (with the same > > logic) in both pkg-golang.mk and in this download post-process script. > > But if we find why "go mod init" didn't work in the context of > > pkg-golang.mk, we could switch back to using that. One other potential issue is Go will append a line with "go 1.16" - the major Go version - for compatibility reasons. So if we update Go to a new major version the go.mod might not be the same, causing a hash mismatch. Something to take a look at. Maybe when manually creating go.mod, we can append "go 1.16" to make the go.mod follow the 1.16 format. Best regards, Christian From james.hilliard1 at gmail.com Fri Jan 7 01:12:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 19:12:51 -0600 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: On Thu, Jan 6, 2022 at 3:00 PM Thomas Petazzoni wrote: > > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > cargo in order to support cross compiling C code within cargo. > > This commit also adds support/download/cargo-post-process to perform > the vendoring on Cargo packages. > > The _LICENSE variable of cargo packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Patrick Havelange > [Thomas: add support for host-cargo-package and vendoring] > Signed-off-by: Thomas Petazzoni > --- > package/Makefile.in | 1 + > package/pkg-cargo.mk | 153 ++++++++++++++++++++++++++++ > support/download/cargo-post-process | 38 +++++++ > 3 files changed, 192 insertions(+) > create mode 100644 package/pkg-cargo.mk > create mode 100755 support/download/cargo-post-process > > diff --git a/package/Makefile.in b/package/Makefile.in > index dae7a859fd..0ca2a5844e 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -441,3 +441,4 @@ include package/pkg-waf.mk > include package/pkg-golang.mk > include package/pkg-meson.mk > include package/pkg-qmake.mk > +include package/pkg-cargo.mk > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > new file mode 100644 > index 0000000000..bf1436a86b > --- /dev/null > +++ b/package/pkg-cargo.mk > @@ -0,0 +1,153 @@ > +################################################################################ > +# Cargo package infrastructure > +# > +# This file implements an infrastructure that eases development of package > +# .mk files for Cargo packages. It should be used for all packages that use > +# Cargo as their build system. > +# > +# See the Buildroot documentation for details on the usage of this > +# infrastructure > +# > +# In terms of implementation, this Cargo infrastructure requires the .mk file > +# to only specify metadata information about the package: name, version, > +# download URL, etc. > +# > +# We still allow the package .mk file to override what the different steps > +# are doing, if needed. For example, if _BUILD_CMDS is already defined, > +# it is used as the list of commands to perform to build the package, > +# instead of the default Cargo behaviour. The package can also define some > +# post operation hooks. > +# > +################################################################################ > + > +################################################################################ > +# inner-cargo-package -- defines how the configuration, compilation and > +# installation of a cargo package should be done, implements a few hooks > +# to tune the build process for cargo specifities and calls the generic > +# package infrastructure to generate the necessary make targets > +# > +# argument 1 is the lowercase package name > +# argument 2 is the uppercase package name, including a HOST_ prefix > +# for host packages > +# argument 3 is the uppercase package name, without the HOST_ prefix > +# for host packages > +# argument 4 is the type (target or host) > +################################################################################ > + > +define inner-cargo-package > + > +# We need host-rustc to run cargo > +$(2)_DOWNLOAD_DEPENDENCIES += host-rustc > + > +$(2)_CARGO_ENV += \ > + CARGO_HOME=$$(HOST_DIR)/share/cargo \ > + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > + CARGO_TARGET_APPLIES_TO_HOST="false" Maybe want to set these additional options as well so that packages using cargo can build with only the env variables set(in some cases at least I think), still probably need to pass some command line args but this should reduce the amount at least: RUSTC_TARGET_TRIPLE = $(subst -,_,$(call UPPERCASE,$(RUSTC_TARGET_NAME))) PKG_RUST_CARGO_ENV = \ CARGO_HOME=$(HOST_DIR)/share/cargo \ CARGO_BUILD_TARGET=$(RUSTC_TARGET_NAME) \ CARGO_INSTALL_ROOT=$(TARGET_DIR)/usr \ CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_RUST_CARGO_ENV = \ CARGO_HOME=$(HOST_DIR)/share/cargo \ CARGO_INSTALL_ROOT=$(HOST_DIR) \ RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" > + > +$(2)_DOWNLOAD_POST_PROCESS = cargo > +$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo > + > +# Due to vendoring, it is pretty likely that not all licenses are > +# listed in _LICENSE. > +$(2)_LICENSE += , vendored dependencies licenses probably not listed > + > +# Note: in all the steps below, we "cd" into the build directory to > +# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the > +# manifest-path. Indeed while the latter seems to work, it in fact > +# breaks in subtle ways as the way cargo searches for its > +# configuration file is based (among other rules) on the current > +# directory. This means that if cargo is started outside of a package > +# directory, its configuration file will not be taken into account. > +# > +# Also, we pass: > +# * --offline to prevent cargo from downloading anything: all > +# dependencies should have been built by the download post > +# process logic > +# * --locked to force cargo to use the Cargo.lock file, which ensures > +# that a fixed set of dependency versions is used > + > +# > +# Build step. Only define it if not already defined by the package .mk > +# file. > +# > +ifndef $(2)_BUILD_CMDS > +ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) \ > + $$(TARGET_CONFIGURE_OPTS) \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --target $$(RUSTC_TARGET_NAME) \ > + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ > + --manifest-path Cargo.toml \ > + --locked \ > + -Z target-applies-to-host \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +else # ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --release \ > + --manifest-path Cargo.toml \ > + --locked \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +endif # ifeq ($(4),target) > +endif # ifndef $(2)_BUILD_CMDS > + > +# > +# Target installation step. Only define it if not already defined by > +# the package .mk file. > +# > +ifndef $(2)_INSTALL_TARGET_CMDS > +define $(2)_INSTALL_TARGET_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ > + cargo install \ > + --target $$(RUSTC_TARGET_NAME) \ > + --offline \ > + --root $$(TARGET_DIR)/usr/ \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +ifndef $(2)_INSTALL_CMDS > +define $(2)_INSTALL_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo install \ > + --offline \ > + --root $$(HOST_DIR) \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +# Call the generic package infrastructure to generate the necessary > +# make targets > +$(call inner-generic-package,$(1),$(2),$(3),$(4)) > + > +endef > + > +################################################################################ > +# cargo-package -- the target generator macro for Cargo packages > +################################################################################ > + > +cargo-package = $(call inner-cargo-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) > +host-cargo-package = $(call inner-cargo-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) > diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process > new file mode 100755 > index 0000000000..25dbbedbfa > --- /dev/null > +++ b/support/download/cargo-post-process > @@ -0,0 +1,38 @@ > +#!/usr/bin/env bash > + > +set -e > + > +. "${0%/*}/helpers" > + > +while getopts "n:o:" OPT; do > + case "${OPT}" in > + o) output="${OPTARG}";; > + n) base_name="${OPTARG}";; > + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; > + \?) error "unknown option '%s'\n" "${OPTARG}";; > + esac > +done > + > +# Already vendored tarball, nothing to do > +if tar tf ${output} | grep -q "^[^/]*/VENDOR" ; then > + exit 0 > +fi > + > +post_process_unpack ${base_name} ${output} > + > +# Do the Cargo vendoring > +pushd ${base_name} > /dev/null > +cargo vendor --locked VENDOR > + > +# Create the local .cargo/config with vendor info > +mkdir -p .cargo/ > +cat <.cargo/config > +[source.crates-io] > +replace-with = "vendored-sources" > + > +[source.vendored-sources] > +directory = "VENDOR" > +EOF > +popd > /dev/null > + > +post_process_repack $(pwd) ${base_name} ${output} > -- > 2.33.1 > From david.oberhollenzer at sigma-star.at Fri Jan 7 03:24:59 2022 From: david.oberhollenzer at sigma-star.at (David Oberhollenzer) Date: Fri, 07 Jan 2022 03:24:59 +0000 Subject: [Buildroot] [ANNOUNCE] mtd-utils-2.1.4 is released Message-ID: Hi, mtd-utils-2.1.4 is released. Tarball: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.4.tar.bz2 Tarball gpg signature: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.4.tar.bz2.asc Signed git tag: git://git.infradead.org/mtd-utils.git v2.1.4 Alternatively also mirrored here: Tarball: https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2 Tarball gpg signature: https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2.asc Signed git tag: https://git.infraroot.at/mtd-utils.git v2.1.4 Roughly half a year after the last release, this is a smaller, patch level release that primarily consists of a hand full of fixes that have accumulated since then. This includes some fixes regarding the user space ports of mtd-tests using the wrong page size, and most recently a fix regarding a missing jffs2 kernel header in the last release tarball, causing build failures on some systems. Changes from 2.1.3 to 2.1.4: Features: - ubiscan debugging and statistics utility Fixes: - Some mtd-tests erroneously using sub-pages instead of the full page size - Buffer overrun in fectest - Missing jffs2 kernel header in the last release, leading to build failures on some systems. Raw short log since the 2.1.3 release: David Oberhollenzer (2): Fix: add missing new-line-escape in jffsX-utils Makemodule.am Diego Ismirlian (1): Add ubiscan utility Miquel Raynal (1): mtd-tests: Read and write pages during speed tests Ralph Siemsen (2): mtd-tests: use pages during readtest and stress fectest.c: fix buffer overrun Regards, David From james.hilliard1 at gmail.com Fri Jan 7 04:55:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 21:55:29 -0700 Subject: [Buildroot] [PATCH v3 1/3] package/qt5/qt5webengine-chromium-catapult: new package Message-ID: <20220107045531.3985241-1-james.hilliard1@gmail.com> This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entry --- package/qt5/Config.in | 1 + .../qt5/qt5webengine-chromium-catapult/Config.in | 4 ++++ .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 14 ++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/Config.in create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..143926b743 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" source "package/qt5/qt5x11extras/Config.in" diff --git a/package/qt5/qt5webengine-chromium-catapult/Config.in b/package/qt5/qt5webengine-chromium-catapult/Config.in new file mode 100644 index 0000000000..471c2a2dbc --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the chromium source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT + bool diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 0000000000..8190a6dd5d --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 0000000000..5d0db1e790 --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE +QT5WEBENGINE_CHROMIUM_CATAPULT_INSTALL_TARGET = NO + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 04:55:31 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 21:55:31 -0700 Subject: [Buildroot] [PATCH v3 3/3] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220107045531.3985241-1-james.hilliard1@gmail.com> References: <20220107045531.3985241-1-james.hilliard1@gmail.com> Message-ID: <20220107045531.3985241-3-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags. Create a .git file so to trigger headers sync during configure. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- package/qt5/qt5location-mapboxgl/Config.in | 4 ++ .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 14 +++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 73 files changed, 222 insertions(+), 385 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 54e6f7d6a6..20a4a4f4c2 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..d10847ea04 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ec5264bfc9..df5b11557c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..8c0e02152d 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4bdb90b203 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..abffc2891d 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..d48a37fafe 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Jan 7 07:02:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 07 Jan 2022 07:02:49 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-06 Message-ID: <20220107071117.AE25F429CC@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-06 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 66 | 7 | 0 | 73 | 2021.11.x | 38 | 10 | 0 | 48 | master | 68 | 35 | 0 | 103 | Classification of failures by reason for master ----------------------------------------------- host-file-5.41 | 6 xxhash-0.8.1 | 6 mdadm-4.2 | 4 rygel-0.40.2 | 4 gstreamer1-mm-1.10.0 | 2 guile-3.0.7 | 2 jitterentropy-library-3.3.1 | 2 cryptsetup-2.4.2 | 1 docker-cli-20.10.11 | 1 frr-8.1 | 1 kf5-kcoreaddons-5.47.0 | 1 ksmbd-tools-3.4.3 | 1 nodejs-14.18.2 | 1 perl-5.34.0 | 1 rtorrent-0.9.8 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/0eb2a70d70203734395013b1860c7a090b085b48 | x86_64 | docker-cli-20.10.11 | NOK | http://autobuild.buildroot.net/results/4babe36e71ed822c8ea74408c3a0ab1fd5a419da | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/33761c0d9f826a87ec08953fa2cc8e96d99b30c8 | powerpc64 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/7245413aed7a36fa037812cad4a4115235da42be | ORPH xtensa | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/a0bc8536bd0ee8a1b9b80a9ab43acec72694fd73 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/4f07b50bc1a94ea7f84dfb6892341347625acba8 | ORPH riscv64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/2ee44be4d20b04e77b330c062e1b238268640b43 | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/067d3fe614db9076abb4fe8da2a95884e9e0d17e | ORPH riscv64 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/6a431b6eea4cac9a5fd969a27f4d0ecd661b3d68 | ORPH mips64el | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/c0054a41166aeccd2bb9b6792f1ca69631b03e99 | ORPH s390x | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/047f4d82412a45c39964c55a7a7fa91519632cb0 | ORPH mips64el | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/fbfabd0fd0e2852b52f6814369d1427f855b68e9 | ORPH i686 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/e4dd9d7f21d39a790e37e0968c6a36f335b8092a | ORPH arm | jitterentropy-library-3.3.1 | NOK | http://autobuild.buildroot.net/results/7b01eca8f1442318dd35282605fc8815e6afb0d0 | arm | jitterentropy-library-3.3.1 | NOK | http://autobuild.buildroot.net/results/c4fbfb5ab21ae0d231eb639add70c18f6427b753 | x86_64 | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/b9c165cb8915a0d749577aacd58d6dba0b25aba2 | arm | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/388ef9d258a45426deef76498f29e789b454a87d | arc | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/e0162cfce67ce116d05cd47ebfd2fb25a962ed18 | ORPH mips64el | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/c36127c93fdc43af95ab803893232f3f185f694f | ORPH mips64el | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/dc4def3b013717d5429e37e624db7d64ef490fa6 | ORPH arm | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/6cfae1bf8ef5e5492c117f9cecf8cbef154e25bd | ORPH mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/59b11ede8b55bf0ad01f6482373844fda1575edb | arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/2be1e8a878049e404ca16b131332ec3271175ef5 | x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/4804a2698323e80da546475dbaed0898e7edc76a | ORPH arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7da3584682c284ce7c1aed929fadf0786f412653 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7be99ab4d2d660850c226a4b2202ba1ffccff32a | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/cb4c60102778473d85be7de10ea667c282a225ff | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6f10eefde86c697e39aa40830978d8f916d7f6ea | powerpc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/15e0a4d80f60efb4f5058895bdc96c30649b5567 | mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/2be27ebfe555fb067254527fc4dd9804373db0aa | ORPH sparc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9dd8e9166e4ac6979301ae5629b9c2e5df6c2b14 | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/d826274bec640e4666885da6806233441f7d2fde | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/7672d5790993e0a99cfead40b53123972e21381d | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/81542df98312d44e60b4aae23fc2b50f30e51717 | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/433ab91ed2c29a98bef64a681f651a56e48290c2 | ORPH Classification of failures by reason for 2021.02.x -------------------------------------------------- zeromq-4.3.4 | 3 erlang-jiffy-1.0.6 | 1 host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | erlang-jiffy-1.0.6 | NOK | http://autobuild.buildroot.net/results/03aa44f014b919119c3cec583ebcdf56d518d497 | sparc64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c7c726103fdf4af56089a367fde59653c60545c9 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/339c5fee3102ffe2387712bbaeaeb8b41c7dcbd0 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/129f77be3ded7087e398fea805e8a8d4339e030e | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/61d91e03c28249df0ffee84444a2f359d0a22647 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/2a4c382963bf9af63e440e4ff6beb5a07d38f9a9 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/87dc8827f24abe4629bb6b2be3bc48063b83a002 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 5 unknown | 3 wavemon-0.9.4 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/44b3609ec0d0ab303d9fc7e14ea12096ed1bf4e1 | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/9f3b9c2ae25c5c87f98b28a30cff1f295d4a855c | powerpc | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/dfb587e294434b2f64ab1cb803db58d9a36069d3 | mipsel | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/3f2888b177af38b1ef02949740d2cefbf2607a43 | i586 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/7c9b4e0e2a55ad0584b36abd52e47722eaa92785 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/90d94bff4f222b5560aa2eb8c6759e86fdddc17d | or1k | unknown | NOK | http://autobuild.buildroot.net/results/145f525743f74c364ac43df3dc304ee9d6d52f53 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/ce17b39b221506a90f7c4f644cece5ed50faf7fd | mips | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/28a08f675cc11242c2b5704cef90a4d3967f119c | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/27fe7985281bc05f6173c72b36ae6c7cd042e7a6 | Gitlab CI results for 2022-01-06 ================================ -- http://autobuild.buildroot.net From james.hilliard1 at gmail.com Fri Jan 7 08:00:55 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 01:00:55 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.43 Message-ID: <20220107080055.4003907-1-james.hilliard1@gmail.com> Add new meson configuration options and optional dependencies. Signed-off-by: James Hilliard --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index c41c0a3686..8464a56338 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b6a2eab8bda2f3cb87c3a0a714839696831ad27b5786674c4bd6c3776b9ebc97 pipewire-0.3.40.tar.bz2 +sha256 2e91f228ffb93494f2423956b930014de20e15639a03f3df4fca4ebf4bc51fc0 pipewire-0.3.43.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 7043745cc1..604d08f90d 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.40 +PIPEWIRE_VERSION = 0.3.43 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -28,7 +28,8 @@ PIPEWIRE_CONF_OPTS += \ -Dvideoconvert=enabled \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ - -Dsession-managers=[] + -Dsession-managers=[] \ + -Dlv2=disabled ifeq ($(BR2_PACKAGE_DBUS),y) PIPEWIRE_CONF_OPTS += -Ddbus=enabled @@ -174,6 +175,13 @@ else PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=disabled endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PIPEWIRE_CONF_OPTS += -Draop=enabled +PIPEWIRE_DEPENDENCIES += openssl +else +PIPEWIRE_CONF_OPTS += -Draop=disabled +endif + define PIPEWIRE_USERS pipewire -1 pipewire -1 * - - audio,video PipeWire System Daemon endef -- 2.25.1 From romain.naour at smile.fr Fri Jan 7 09:03:48 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 10:03:48 +0100 Subject: [Buildroot] [PATCHv4] package/bat: new package Message-ID: <20220107090348.3947187-1-romain.naour@smile.fr> From: David Pierret bat is a cat(1) clone with syntax highlighting and Git integration. Using the aarch64 ARM toolchain that use the prefix "aarch64-none-linux-gnu-", we need to set CC_aarch64_unknown_linux_gnu in the environment to provide the right toolchain prefix [1]. Otherwise the build fail because rust use aarch64-unknown-linux-gnu as default toolchain prefix. Indeed, the aarch64 ARM toolchain is not listed as supported toolchains [2][3]. The build succeed when the aarch64 Linaro toolchain is used (tuple "aarch64-unknown-linux-gnu-"). The problem occure during the package install step... For some reason bat is rebuilt during this step. A similar behavior has been observed for host-sentry-cli [4]. For now, only set CC_aarch64_unknown_linux_gnu in INSTALL_TARGET_CMDS (hack). Since we set CC_aarch64_unknown_linux_gnu, convert RUSTC_TARGET_NAME aarch64-unknown-linux-gnu to aarch64_unknown_linux_gnu since bash doesn't allow to minus characters in environement variables. [1] https://github.com/rust-lang/rust/blob/c367798cfd3817ca6ae908ce675d1d99242af148/src/ci/docker/dist-aarch64-linux/Dockerfile#L29 [2] https://github.com/rust-lang/rust/blob/52d2c7ac948d6abdc18eb9e05a53d03ddcaffd98/src/librustc_target/spec/mod.rs#L492 [3] https://doc.rust-lang.org/nightly/rustc/platform-support.html [4] https://lore.kernel.org/buildroot/20201210213122.035e149a at windsurf.home/ Signed-off-by: David Pierret Signed-off-by: Romain Naour [Romain: Use CC_$(RUSTC_TARGET_NAME)] Signed-off-by: Romain Naour Cc: Thomas Petazzoni ---- bat supports syntax highlighting for a large number of programming and markup languages. He can communicates with git to show modifications with respect to the index. For conveignance use, bat can pipe its own output to less if the output is too large for one screen. v4: Convert to cargo package infrastructure bump to version 0.18.3 remove "select BR2_PACKAGE_NCURSES" Improve the commit log about the issue between the aarch64-linaro and the aarch64-ARM toolchains ("aarch64-none-linux-gnu-" vs "aarch64-unknown-linux-gnu-") See: https://doc.rust-lang.org/nightly/rustc/platform-support.html This patch needs the series "Support for Cargo and Go vendoring" v3 http://lists.busybox.net/pipermail/buildroot/2022-January/632561.html v3: remove "env" and use CC_$(subst -,_,$(RUSTC_TARGET_NAME)) instead of CC_$(RUSTC_TARGET_NAME) v1 -> v2 Add selection of less out of busybox for command line option compatibility bat: bump to version 0.18 & switch to cargo infra --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/bat/Config.in | 11 +++++++++++ package/bat/bat.hash | 4 ++++ package/bat/bat.mk | 12 ++++++++++++ package/pkg-cargo.mk | 1 + 6 files changed, 32 insertions(+) create mode 100644 package/bat/Config.in create mode 100644 package/bat/bat.hash create mode 100644 package/bat/bat.mk diff --git a/DEVELOPERS b/DEVELOPERS index ff661e9357..99637c7ae3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -673,6 +673,9 @@ F: linux/linux-ext-ev3dev-linux-drivers.mk F: package/brickd/ F: package/ev3dev-linux-drivers/ +N: David Pierret +F: package/bat/ + N: Davide Viti F: board/friendlyarm/nanopi-r1/ F: configs/friendlyarm_nanopi_r1_defconfig diff --git a/package/Config.in b/package/Config.in index a88f0a6849..98a4d4c5f3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ menu "System tools" endmenu menu "Text editors and viewers" + source "package/bat/Config.in" source "package/ed/Config.in" source "package/joe/Config.in" source "package/less/Config.in" diff --git a/package/bat/Config.in b/package/bat/Config.in new file mode 100644 index 0000000000..515eaf591a --- /dev/null +++ b/package/bat/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_BAT + bool "bat" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + # we need a full version of less + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_LESS + help + A cat(1) clone with syntax highlighting and Git integration. + + https://github.com/sharkdp/bat diff --git a/package/bat/bat.hash b/package/bat/bat.hash new file mode 100644 index 0000000000..aa6c8d743d --- /dev/null +++ b/package/bat/bat.hash @@ -0,0 +1,4 @@ +# Locally generated +sha256 9c345788eb916777a60e7ff32031f1c92edc5565031e0c057bce860982768744 bat-0.18.3.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE +sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk new file mode 100644 index 0000000000..9b619af172 --- /dev/null +++ b/package/bat/bat.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# bat +# +################################################################################ + +BAT_VERSION = 0.18.3 +BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) +BAT_LICENSE = Apache-2.0 or MIT +BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index bf1436a86b..e2fe104cf3 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -110,6 +110,7 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ + CC_$$(subst -,_,$$(RUSTC_TARGET_NAME))=$$(TARGET_CC) \ cargo install \ --target $$(RUSTC_TARGET_NAME) \ --offline \ -- 2.31.1 From thomas.petazzoni at bootlin.com Fri Jan 7 09:52:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 10:52:23 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: <20220107105223.01912574@windsurf> Hello James, On Thu, 6 Jan 2022 19:12:51 -0600 James Hilliard wrote: > > +$(2)_CARGO_ENV += \ > > + CARGO_HOME=$$(HOST_DIR)/share/cargo \ > > + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > > + CARGO_TARGET_APPLIES_TO_HOST="false" > > Maybe want to set these additional options as well so that packages > using cargo can > build with only the env variables set(in some cases at least I think), Thanks for the suggestion. However, could you be more specific than "maybe" and "I think" ? The way you put it seems like we don't really know why those variables would be useful and what they do. > still probably > need to pass some command line args but this should reduce the amount at least: > RUSTC_TARGET_TRIPLE = $(subst -,_,$(call UPPERCASE,$(RUSTC_TARGET_NAME))) Which command line arguments would be replaced by those variables? > PKG_RUST_CARGO_ENV = \ > CARGO_HOME=$(HOST_DIR)/share/cargo \ This one we already pass. > CARGO_BUILD_TARGET=$(RUSTC_TARGET_NAME) \ This one would replace the --target argument? Just to understand, what would be the advantage of the variable compared to the comand line argument? > CARGO_INSTALL_ROOT=$(TARGET_DIR)/usr \ This would replace --root $$(TARGET_DIR)/usr/ I suppose. Here as well, any benefit/drawback of arguments vs. variables? > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc How come things are working today with this one? > > HOST_PKG_RUST_CARGO_ENV = \ > CARGO_HOME=$(HOST_DIR)/share/cargo \ This one already passed. > CARGO_INSTALL_ROOT=$(HOST_DIR) \ This would replace --root $$(HOST_DIR) I suppose. > RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" This is already passed, although replicated between the build and install steps of the host variant. So essentially the only questions is: - Advantage of variables vs. command line options - Relevance of CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 10:05:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 11:05:22 +0100 Subject: [Buildroot] [PATCHv4] package/bat: new package In-Reply-To: <20220107090348.3947187-1-romain.naour@smile.fr> References: <20220107090348.3947187-1-romain.naour@smile.fr> Message-ID: <20220107110522.523586ae@windsurf> Hello, On Fri, 7 Jan 2022 10:03:48 +0100 Romain Naour wrote: > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index bf1436a86b..e2fe104cf3 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -110,6 +110,7 @@ ifndef $(2)_INSTALL_TARGET_CMDS > define $(2)_INSTALL_TARGET_CMDS > cd $$(@D) && \ > $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ > + CC_$$(subst -,_,$$(RUSTC_TARGET_NAME))=$$(TARGET_CC) \ But we don't even pass this variable at build time.. why would it be needed at install time? Due to the fact that "bar" builds stuff during the install step, I understand that we might need extra variable during the installation step, but I would expect to only need variables that are already passed during the build step. Any idea? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Fri Jan 7 10:05:52 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 11:05:52 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: <8b8ad2f1-b915-ff0d-54c4-0e1c36112db0@smile.fr> Hello Thomas, All, Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > cargo in order to support cross compiling C code within cargo. > > This commit also adds support/download/cargo-post-process to perform > the vendoring on Cargo packages. > > The _LICENSE variable of cargo packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Patrick Havelange > [Thomas: add support for host-cargo-package and vendoring] > Signed-off-by: Thomas Petazzoni > --- > +# > +# Build step. Only define it if not already defined by the package .mk > +# file. > +# > +ifndef $(2)_BUILD_CMDS > +ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) \ > + $$(TARGET_CONFIGURE_OPTS) \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --target $$(RUSTC_TARGET_NAME) \ > + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ > + --manifest-path Cargo.toml \ > + --locked \ > + -Z target-applies-to-host \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +else # ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --release \ > + --manifest-path Cargo.toml \ > + --locked \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +endif # ifeq ($(4),target) > +endif # ifndef $(2)_BUILD_CMDS > + > +# > +# Target installation step. Only define it if not already defined by > +# the package .mk file. > +# > +ifndef $(2)_INSTALL_TARGET_CMDS > +define $(2)_INSTALL_TARGET_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ Removing "CC_$$(subst -,_,$$(RUSTC_TARGET_NAME))=$$(TARGET_CC) " [1] and adding $$(TARGET_CONFIGURE_OPTS) fixes the build of bat package. The package is still rebuild during the install step but at least it build... [1] http://lists.busybox.net/pipermail/buildroot/2022-January/632610.html Best regards, Romain > + cargo install \ > + --target $$(RUSTC_TARGET_NAME) \ > + --offline \ > + --root $$(TARGET_DIR)/usr/ \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +ifndef $(2)_INSTALL_CMDS > +define $(2)_INSTALL_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo install \ > + --offline \ > + --root $$(HOST_DIR) \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > From romain.naour at smile.fr Fri Jan 7 10:08:21 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 11:08:21 +0100 Subject: [Buildroot] [PATCHv4] package/bat: new package In-Reply-To: <20220107110522.523586ae@windsurf> References: <20220107090348.3947187-1-romain.naour@smile.fr> <20220107110522.523586ae@windsurf> Message-ID: <0ebbe6b2-2932-862f-52a1-a34ab7d0f11e@smile.fr> Le 07/01/2022 ? 11:05, Thomas Petazzoni a ?crit?: > Hello, > > On Fri, 7 Jan 2022 10:03:48 +0100 > Romain Naour wrote: > >> diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk >> index bf1436a86b..e2fe104cf3 100644 >> --- a/package/pkg-cargo.mk >> +++ b/package/pkg-cargo.mk >> @@ -110,6 +110,7 @@ ifndef $(2)_INSTALL_TARGET_CMDS >> define $(2)_INSTALL_TARGET_CMDS >> cd $$(@D) && \ >> $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ >> + CC_$$(subst -,_,$$(RUSTC_TARGET_NAME))=$$(TARGET_CC) \ > > But we don't even pass this variable at build time.. why would it be > needed at install time? Due to the fact that "bar" builds stuff during > the install step, I understand that we might need extra variable during > the installation step, but I would expect to only need variables that > are already passed during the build step. It seems we just need to add $$(TARGET_CONFIGURE_OPTS) to _INSTALL_TARGET_CMDS http://lists.busybox.net/pipermail/buildroot/2022-January/632613.html > > Any idea? > > Thomas > From thomas.petazzoni at bootlin.com Fri Jan 7 10:17:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 11:17:27 +0100 Subject: [Buildroot] [PATCHv4] package/bat: new package In-Reply-To: <0ebbe6b2-2932-862f-52a1-a34ab7d0f11e@smile.fr> References: <20220107090348.3947187-1-romain.naour@smile.fr> <20220107110522.523586ae@windsurf> <0ebbe6b2-2932-862f-52a1-a34ab7d0f11e@smile.fr> Message-ID: <20220107111727.1d021ffd@windsurf> Hello, On Fri, 7 Jan 2022 11:08:21 +0100 Romain Naour wrote: > > But we don't even pass this variable at build time.. why would it be > > needed at install time? Due to the fact that "bar" builds stuff during > > the install step, I understand that we might need extra variable during > > the installation step, but I would expect to only need variables that > > are already passed during the build step. > > It seems we just need to add $$(TARGET_CONFIGURE_OPTS) to _INSTALL_TARGET_CMDS > > http://lists.busybox.net/pipermail/buildroot/2022-January/632613.html Ah, OK. This indeed we are passing at build time, but not at install time currently. We can certainly add that at install time too. Though this "build during install step" thing is a bit annoying... Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Fri Jan 7 10:26:22 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 11:26:22 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > cargo in order to support cross compiling C code within cargo. > > This commit also adds support/download/cargo-post-process to perform > the vendoring on Cargo packages. Download post-processing does't work when we use _OVERRIDE_SRCDIR. Maybe we have to make sure that all download of vendor modules are already present in the source directory used by _OVERRIDE_SRCDIR. Best regards, Romain > > The _LICENSE variable of cargo packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Patrick Havelange > [Thomas: add support for host-cargo-package and vendoring] > Signed-off-by: Thomas Petazzoni From yann.morin.1998 at free.fr Fri Jan 7 10:21:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:21:06 +0100 Subject: [Buildroot] [git commit] package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable Message-ID: <20220107102059.7518F83486@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2da7b07a22fc2c610f670c153e987d35d966022b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will allow packages to register that a download post-processing is needed. Note that this variable is intentionally not documented: it is an internal variable meant to be set by package infrastructures, not directly by packages. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/pkg-download.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 823b34981c..a15e21e110 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -118,6 +118,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_DOWNLOAD_POST_PROCESS),-p '$($(2)_DOWNLOAD_POST_PROCESS)') \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ From yann.morin.1998 at free.fr Fri Jan 7 10:21:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:21:36 +0100 Subject: [Buildroot] [git commit] support/download/post-process-helpers: add helper function for post process scripts Message-ID: <20220107102059.7D10C83487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f42d06ecf350aaa2d20bf716bf549d55b95982e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master download post process scripts will often need to unpack the source code tarball, do some operation, and then repack it. In order to help with this, post-process-helpers provide an unpack() function and a repack() function. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/download/helpers | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/support/download/helpers b/support/download/helpers index 40d5eea591..4c5eb466cc 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -72,5 +72,27 @@ mk_tar_gz() { popd >/dev/null } +post_process_unpack() { + local dest="${1}" + local tarball="${2}" + local one_file + + mkdir "${dest}" + tar -C "${dest}" --strip-components=1 -xf "${tarball}" + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |head -z -n1 |tr -d "\0")" + touch -r "${one_file}" "${dest}.timestamp" +} + +post_process_repack() { + local in_dir="${1}" + local base_dir="${2}" + local out="${3}" + local date + + date="@$(stat -c '%Y' "${in_dir}/${base_dir}.timestamp")" + + mk_tar_gz "${in_dir}/${base_dir}" "${base_dir}" "${date}" "${out}" +} + # Keep this line and the following as last lines in this file. # vim: ft=bash From yann.morin.1998 at free.fr Fri Jan 7 10:19:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:19:10 +0100 Subject: [Buildroot] [git commit] support/download/dl-wrapper: add concept of download post-processing Message-ID: <20220107102059.6B7BC8296B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1db15e2853ff5a234e8ed1a70a75b5d426dceec5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to support package managers such as Cargo (Rust) or Go, we want to run some custom logic after the main download, but before packing the tarball and checking the hash. To implement this, this commit introduces a concept of download post-processing: if -p is passed to the dl-wrapper, then support/download/-post-process will be called. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - double-quote variable expansion when calling post-process script ] Signed-off-by: Yann E. MORIN --- support/download/dl-wrapper | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 3185887541..09a6ac1f1a 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,7 +25,7 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:lrf:u:q" OPT; do + while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -38,6 +38,7 @@ main() { r) recurse="-r";; f) filename="${OPTARG}";; u) uris+=( "${OPTARG}" );; + p) post_process="${OPTARG}";; q) quiet="-q";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; @@ -136,6 +137,12 @@ main() { continue fi + if [ -n "${post_process}" ] ; then + "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + fi + # cd back to free the temp-dir, so we can remove it later cd "${OLDPWD}" From yann.morin.1998 at free.fr Fri Jan 7 10:28:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:28:19 +0100 Subject: [Buildroot] [PATCH v3 01/11] support/download/dl-wrapper: add concept of download post-processing In-Reply-To: <20220106210000.397694-2-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-2-thomas.petazzoni@bootlin.com> Message-ID: <20220107102819.GA1268635@scaer> Thomas, All, On 2022-01-06 21:59 +0100, Thomas Petazzoni spake thusly: > In order to support package managers such as Cargo (Rust) or Go, we > want to run some custom logic after the main download, but before > packing the tarball and checking the hash. > > To implement this, this commit introduces a concept of download > post-processing: if -p is passed to the dl-wrapper, then > support/download/-post-process will be called. > > Signed-off-by: Thomas Petazzoni > --- > support/download/dl-wrapper | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper > index 3315bd410e..e6509e5671 100755 > --- a/support/download/dl-wrapper > +++ b/support/download/dl-wrapper > @@ -25,7 +25,7 @@ main() { > local -a uris > > # Parse our options; anything after '--' is for the backend > - while getopts ":c:d:D:o:n:N:H:rf:u:q" OPT; do > + while getopts ":c:d:D:o:n:N:H:rf:u:qp:" OPT; do > case "${OPT}" in > c) cset="${OPTARG}";; > d) dl_dir="${OPTARG}";; > @@ -37,6 +37,7 @@ main() { > r) recurse="-r";; > f) filename="${OPTARG}";; > u) uris+=( "${OPTARG}" );; > + p) post_process="${OPTARG}";; > q) quiet="-q";; > :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; > \?) error "unknown option '%s'\n" "${OPTARG}";; > @@ -135,6 +136,12 @@ main() { > continue > fi > > + if [ -n "${post_process}" ] ; then > + ${OLDPWD}/support/download/${post_process}-post-process \ I added double-quotes when expanding those variables. Applied to master, thanks. Regards, Yann E. MORIN. > + -o "${tmpf}" \ > + -n "${raw_base_name}" > + fi > + > # cd back to free the temp-dir, so we can remove it later > cd "${OLDPWD}" > > -- > 2.33.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 7 10:35:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:35:51 +0100 Subject: [Buildroot] [PATCH v3 02/11] package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable In-Reply-To: <20220106210000.397694-3-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-3-thomas.petazzoni@bootlin.com> Message-ID: <20220107103551.GB1268635@scaer> Thomas, All, On 2022-01-06 21:59 +0100, Thomas Petazzoni spake thusly: > This will allow packages to register than a download post-processing > is needed. Note that this variable is intentionally not documented: it > is an internal variable meant to be set by package infrastructures, > not directly by packages. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-download.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/pkg-download.mk b/package/pkg-download.mk > index 2527ba5c60..66a415cce0 100644 > --- a/package/pkg-download.mk > +++ b/package/pkg-download.mk > @@ -117,6 +117,7 @@ define DOWNLOAD > -n '$($(2)_BASENAME_RAW)' \ > -N '$($(2)_RAWNAME)' \ > -o '$($(2)_DL_DIR)/$(notdir $(1))' \ > + $(if $($(2)_DOWNLOAD_POST_PROCESS),-p '$($(2)_DOWNLOAD_POST_PROCESS)') \ > $(if $($(2)_GIT_SUBMODULES),-r) \ > $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ > $(QUIET) \ > -- > 2.33.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 7 10:36:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:36:13 +0100 Subject: [Buildroot] [PATCH v3 03/11] support/download/post-process-helpers: add helper function for post process scripts In-Reply-To: <20220106210000.397694-4-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-4-thomas.petazzoni@bootlin.com> Message-ID: <20220107103613.GC1268635@scaer> Thomas, All, On 2022-01-06 21:59 +0100, Thomas Petazzoni spake thusly: > download post process scripts will often need to unpack the source > code tarball, do some operation, and then repack it. In order to help > with this, post-process-helpers provide an unpack() function and a > repack() function. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/download/helpers | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/support/download/helpers b/support/download/helpers > index 40d5eea591..4c5eb466cc 100755 > --- a/support/download/helpers > +++ b/support/download/helpers > @@ -72,5 +72,27 @@ mk_tar_gz() { > popd >/dev/null > } > > +post_process_unpack() { > + local dest="${1}" > + local tarball="${2}" > + local one_file > + > + mkdir "${dest}" > + tar -C "${dest}" --strip-components=1 -xf "${tarball}" > + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |head -z -n1 |tr -d "\0")" > + touch -r "${one_file}" "${dest}.timestamp" > +} > + > +post_process_repack() { > + local in_dir="${1}" > + local base_dir="${2}" > + local out="${3}" > + local date > + > + date="@$(stat -c '%Y' "${in_dir}/${base_dir}.timestamp")" > + > + mk_tar_gz "${in_dir}/${base_dir}" "${base_dir}" "${date}" "${out}" > +} > + > # Keep this line and the following as last lines in this file. > # vim: ft=bash > -- > 2.33.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 7 10:44:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:44:59 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: <20220107104459.GD1268635@scaer> Romain, All, On 2022-01-07 11:26 +0100, Romain Naour spake thusly: > Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > > cargo in order to support cross compiling C code within cargo. > > > > This commit also adds support/download/cargo-post-process to perform > > the vendoring on Cargo packages. > > Download post-processing does't work when we use _OVERRIDE_SRCDIR. This is indeed expected: _OVERRIDE_SRCDIR is skipping all the download, extract and patch steps. Developers that are using an _OVERRIDE_SRCDIR are responsible for providing an source tree that is ready to be configured. So, this is probably something that should be added to the manual, if it is not already there, or to emphasise it if already there: When you are using OVERRIDE_SRCDIR, you are responsible for providing a source tree that is ready to be configured. Care to send a patch, please? Regards, Yann E. MORIN. > Maybe we have to make sure that all download of vendor modules are already > present in the source directory used by _OVERRIDE_SRCDIR. > > Best regards, > Romain > > > > > The _LICENSE variable of cargo packages is expanded with ", > > vendored dependencies licenses probably not listed" as currently for > > all packages, the licenses of the vendored dependencies are not taken > > into account. > > > > Signed-off-by: Patrick Havelange > > [Thomas: add support for host-cargo-package and vendoring] > > Signed-off-by: Thomas Petazzoni -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Fri Jan 7 11:03:40 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 12:03:40 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220107104459.GD1268635@scaer> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107104459.GD1268635@scaer> Message-ID: Le 07/01/2022 ? 11:44, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-07 11:26 +0100, Romain Naour spake thusly: >> Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: >>> From: Patrick Havelange >>> In order to be package agnostic, the install phase is now using cargo >>> instead of install. TARGET_CONFIGURE_OPTS is now also set when running >>> cargo in order to support cross compiling C code within cargo. >>> >>> This commit also adds support/download/cargo-post-process to perform >>> the vendoring on Cargo packages. >> >> Download post-processing does't work when we use _OVERRIDE_SRCDIR. > > This is indeed expected: _OVERRIDE_SRCDIR is skipping all the download, > extract and patch steps. > > Developers that are using an _OVERRIDE_SRCDIR are responsible for > providing an source tree that is ready to be configured. > > So, this is probably something that should be added to the manual, if it > is not already there, or to emphasise it if already there: > > When you are using OVERRIDE_SRCDIR, you are responsible for > providing a source tree that is ready to be configured. I did a try, It's not just adding vendor sources into package sources (in my case "bat" package). We have to execute "cargo vendor" from "bat" sources and use CARGO_HOME used by Buildroot: CARGO_HOME=$HOST_DIR/share/cargo cargo vendor Do we want to document this method ? Best regards, Romain > > Care to send a patch, please? > > Regards, > Yann E. MORIN. > >> Maybe we have to make sure that all download of vendor modules are already >> present in the source directory used by _OVERRIDE_SRCDIR. >> >> Best regards, >> Romain >> >>> >>> The _LICENSE variable of cargo packages is expanded with ", >>> vendored dependencies licenses probably not listed" as currently for >>> all packages, the licenses of the vendored dependencies are not taken >>> into account. >>> >>> Signed-off-by: Patrick Havelange >>> [Thomas: add support for host-cargo-package and vendoring] >>> Signed-off-by: Thomas Petazzoni > From thomas.claveirole at green-communications.fr Fri Jan 7 13:05:07 2022 From: thomas.claveirole at green-communications.fr (Thomas Claveirole) Date: Fri, 7 Jan 2022 14:05:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.10.0 Message-ID: <20220107130507.19541-1-thomas.claveirole@green-communications.fr> Signed-off-by: Thomas Claveirole --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index e29365fc91..11eae3de36 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 35a0b37a5c1e7c48553215c6e8c24a12bac8e9048f008fc61c4b329cf6611b5c v6.9.0-dist.zip +sha256 da3025279bbd6cfb0e82b7af95666bede8fd65e8c620a1bc54bba04cebb7e1d4 v6.10.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index b20ea9977c..781f9901ea 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.9.0 +OPENLAYERS_VERSION = 6.10.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause -- 2.34.1 From bugzilla at busybox.net Fri Jan 7 13:50:07 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 07 Jan 2022 13:50:07 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #5 from Sreedhar Mahadevan --- Thanks a lot for the response. I shall try this out and give a feedback. -- You are receiving this mail because: You are on the CC list for the bug. From sebastien.szymanski at armadeus.com Fri Jan 7 14:05:46 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Fri, 7 Jan 2022 15:05:46 +0100 Subject: [Buildroot] [PATCH 2/2] package/gstreamer1/gst1-plugins-bayer2rgb-neon: show comment on aarch64 In-Reply-To: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> References: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> Message-ID: <20220107140546.1921-2-sebastien.szymanski@armadeus.com> On aarch64, the Config.in comment for gst1-plugins-bayer2rgb-neon is not shown when a dependency is missing. Fix that. Signed-off-by: S?bastien Szymanski --- package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in index d3e4d0e243..68d7a2bc56 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -15,6 +15,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON https://gitlab-ext.sigma-chemnitz.de/ensc/gst-bayer2rgb-neon comment "gst1-plugins-bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" - depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.34.1 From sebastien.szymanski at armadeus.com Fri Jan 7 14:05:45 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Fri, 7 Jan 2022 15:05:45 +0100 Subject: [Buildroot] [PATCH 1/2] package/gstreamer1/gst1-plugins-bayer2rgb-neon: use "config" Message-ID: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> gst1-plugins-bayer2rgb-neon doesn't have sub-options so use "config" instead of "menuconfig". Signed-off-by: S?bastien Szymanski --- package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in index 570300a304..d3e4d0e243 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -1,4 +1,4 @@ -menuconfig BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON +config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON bool "gst1-plugins-bayer2rgb-neon" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 # bayer2rgb-neon depends on !BR2_STATIC_LIBS # bayer2rgb-neon -- 2.34.1 From peter at korsgaard.com Fri Jan 7 17:06:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:06:56 +0100 Subject: [Buildroot] [git commit] package/liburiparser: security bump to version 0.9.6 Message-ID: <20220107170226.7363D826D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e00379361e16f24a348c12bb26eab4dc0af94e84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fixed: [CVE-2021-46141] Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* functions where the text range in .hostText would not be duped using malloc but remain unchanged (and hence "not owned") for URIs with an IPv4 or IPv6 address hostname; depending on how an application uses uriparser, this could lead the application into a use-after-free situation. As the second half, fix uriFreeUriMembers* functions that would not free .hostText memory for URIs with an IPv4 or IPv6 address host; also, calling uriFreeUriMembers* multiple times on a URI of this very nature would result in trying to free pointers to stack (rather than heap) memory. - Fixed: [CVE-2021-46142] Fix functions uriNormalizeSyntax* for out-of-memory situations (i.e. malloc returning NULL) for URIs containing empty segments (any of user info, host text, query, or fragment) where previously pointers to stack (rather than heap) memory were freed. https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 60acca2215..8b40807541 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c7bc604ece..c9903bd74f 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.5 -LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 7 17:08:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:08:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburiparser: security bump to version 0.9.6 In-Reply-To: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 6 Jan 2022 23:39:05 +0100") References: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> Message-ID: <87tuefmq1p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fixed: [CVE-2021-46141] > Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* > functions where the text range in .hostText would not be duped using > malloc but remain unchanged (and hence "not owned") for URIs with > an IPv4 or IPv6 address hostname; depending on how an application > uses uriparser, this could lead the application into a use-after-free > situation. > As the second half, fix uriFreeUriMembers* functions that would not > free .hostText memory for URIs with an IPv4 or IPv6 address host; > also, calling uriFreeUriMembers* multiple times on a URI of this > very nature would result in trying to free pointers to stack > (rather than heap) memory. > - Fixed: [CVE-2021-46142] > Fix functions uriNormalizeSyntax* for out-of-memory situations > (i.e. malloc returning NULL) for URIs containing empty segments > (any of user info, host text, query, or fragment) where previously > pointers to stack (rather than heap) memory were freed. > https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 17:11:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:11:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvdpau: bump to version 1.4 In-Reply-To: <20220106225647.1162108-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 6 Jan 2022 23:56:47 +0100") References: <20220106225647.1162108-1-fontaine.fabrice@gmail.com> Message-ID: <87pmp3mpx8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://gitlab.freedesktop.org/vdpau/libvdpau/-/tags/1.4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 17:09:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:09:47 +0100 Subject: [Buildroot] [git commit] package/libvdpau: bump to version 1.4 Message-ID: <20220107170533.A6369826D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=211063b9534b498d581c0a1d6a0d4c2bb1bb0679 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://gitlab.freedesktop.org/vdpau/libvdpau/-/tags/1.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libvdpau/libvdpau.hash | 7 +++---- package/libvdpau/libvdpau.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libvdpau/libvdpau.hash b/package/libvdpau/libvdpau.hash index 0833d41bf4..653657322a 100644 --- a/package/libvdpau/libvdpau.hash +++ b/package/libvdpau/libvdpau.hash @@ -1,5 +1,4 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003021.html -sha256 b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e libvdpau-1.3.tar.bz2 -sha512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2 # Locally computed -sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING +sha256 4258824c5a4555ef31de0a7d82b3caf19e75a16a13949f1edafc5f6fb2d33f30 libvdpau-1.4.tar.bz2 +# Locally computed +sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING diff --git a/package/libvdpau/libvdpau.mk b/package/libvdpau/libvdpau.mk index 63aecaf744..ae2f388855 100644 --- a/package/libvdpau/libvdpau.mk +++ b/package/libvdpau/libvdpau.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVDPAU_VERSION = 1.3 +LIBVDPAU_VERSION = 1.4 LIBVDPAU_SOURCE = libvdpau-$(LIBVDPAU_VERSION).tar.bz2 LIBVDPAU_SITE = \ https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$(LIBVDPAU_VERSION) From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:11 +0100 Subject: [Buildroot] [PATCH 1/7] package/ca-certificates: remove dependency on host-python-cryptography In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-2-thomas.petazzoni@bootlin.com> The host-python-cryptography module is only used by ca-certificates for a check of the expiration date of certificates, which is only a warning not even causing the build to abort, i.e something that Buildroot users are most likely never going to see. Since the host-python-cryptography dependency would soon require a dependency on rust, it's a lot simpler to just patch the certdata2pem.py script to no longer require cryptography, but only make use of it if available. Signed-off-by: Thomas Petazzoni --- ...2pem.py-make-cryptography-module-opt.patch | 59 +++++++++++++++++++ package/ca-certificates/ca-certificates.mk | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch diff --git a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch new file mode 100644 index 0000000000..b76c1bfd7f --- /dev/null +++ b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch @@ -0,0 +1,59 @@ +From bf18b564122e8f976681a2398862fde1eafd84ba Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 6 Jan 2022 23:15:00 +0100 +Subject: [PATCH] mozilla/certdata2pem.py: make cryptography module optional + +The Python cryptography module is only used to verify if trusted +certificates have expired, but this is only a warning. For some build +systems and distributions, providing Python cryptography is costly, +especially since it's now partly written in Rust. + +As the check is only a warning, it's anyway going to be overlooked by +most people. This commit changes the check to be optional: if the +cryptography Python module is there, we perform the check, otherwise +the check is skipped. + +Signed-off-by: Thomas Petazzoni +--- + mozilla/certdata2pem.py | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index ede23d4..a6261f8 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -28,9 +28,6 @@ import sys + import textwrap + import io + +-from cryptography import x509 +- +- + objects = [] + + # Dirty file parser. +@@ -122,11 +119,16 @@ for obj in objects: + if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: + continue + +- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) +- if cert.not_valid_after < datetime.datetime.now(): +- print('!'*74) +- print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) +- print('!'*74) ++ try: ++ from cryptography import x509 ++ ++ cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) ++ if cert.not_valid_after < datetime.datetime.now(): ++ print('!'*74) ++ print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) ++ print('!'*74) ++ except ImportError: ++ pass + + bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ + .replace(' ', '_')\ +-- +2.33.1 + diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 7084ab781e..0b6962ab7b 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -7,7 +7,7 @@ CA_CERTIFICATES_VERSION = 20211016 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates -CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 host-python-cryptography +CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:10 +0100 Subject: [Buildroot] [PATCH 0/7] Bump of python-cryptography and other Rust related fun Message-ID: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Hello, This series bumps the python-cryptography package to a new version. It is based on earlier work from James Hilliard at: https://patchwork.ozlabs.org/project/buildroot/patch/20210318044253.3202355-2-james.hilliard1 at gmail.com/ But it did require quite some more work, which is presented in this patch series. The unique challenge caused by this version bump is that python-cryptography now has some Rust code integrated, so suddenly this package, and all its reverse dependencies need to depend on Rust being available. There is also a host variant of python-cryptography, which is used solely by ca-certificates, which has a significant number of reverse dependencies. To avoid adding Rust dependencies to these, we broke the dependency of ca-certificates on host-python-cryptography using a simple patch, and dropped host-python-cryptography altogether. This patch series depends on the "Go/Cargo vendoring" patch series posted recently. Indeed, the Rust code in python-cryptography depends on other Cargo crates, which we don't want to download during the build, but really during the download step. There is however still one problem with the last patch of the series, see below. This series is available at: https://github.com/tpetazzoni/buildroot/tree/python-cryptography The patch series goes like this: - PATCH 1 modifies ca-certificates to no longer need host-python-cryptography - PATCH 2 drops host-python-cryptography itselef - PATCH 3 and 4 fix some issues in package/rustc/ in the description of the ARMv5 and RISC-V 64-bit Rust support. We noticed this because Rust binaries were not working on ARMv5 ("Illegal instruction"), this was due to the fact that we were using the pre-compiled Rust standard library for ARMv6, due to a bogus architecture name. This is fixed by PATCH 3. And while reviewing this, we spotted a similar issue for RISC-V 64-bit, which is fixed in PATCH 4. - PATCH 5 slightly improves the Cargo download post-process script to make it possible to pass a custom path to the Cargo.toml file, instead of assuming it's located at the root of the package source tree. - PATCH 6 modifies the runtime test cases that involve python-cryptography directly or indirectly to use a glibc toolchain instead of the default uclibc toolchain. Indeed, Rust is for now not available on uClibc platforms. This could have been done in the patch doing the version bump, but the version bump patch is already quite large, and the update of the runtime tests could be done as a separate preparation step. - PATCH 7 finally bumps python-cryptography itself. python-cryptography itself requires a bit of trickery to leverage the Cargo download post-process logic, to vendor dependencies during the download step. Then the patch also touches the entire reverse dependency tree (sometimes up to 5 levels deep!). This patch should NOT be applied for now, due to issues (see below). This series was tested by building the following configuration: BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_PYTHON_CHANNELS_REDIS=y BR2_PACKAGE_PYTHON_CROSSBAR=y BR2_PACKAGE_PYTHON_KEYRING=y BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO=y BR2_PACKAGE_PYTHON_TXDBUS=y BR2_PACKAGE_DOCKER_COMPOSE=y # BR2_TARGET_ROOTFS_TAR is not set that builds all affected packages. It was also tested by running all Python runtime test cases: https://gitlab.com/tpetazzoni/buildroot/-/pipelines/443445436 The one thing that fails is when building python-cryptography on a target arch that is the same as the host. This can be reproduced by running the tests.package.test_docker_compose.TestDockerCompose test case. We get this: Running `/home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build` error: failed to run custom build command for `proc-macro-hack v0.5.19` Caused by: process didn't exit successfully: `/home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build` (exi t status: 1) --- stderr /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio n `GLIBC_2.33' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio n `GLIBC_2.32' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio n `GLIBC_2.34' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) warning: build failed, waiting for other jobs to finish... error: build failed Which looks terribly similar to the issue on ripgrep which was fixed by commit 4b2be770b8a853a7dd97b5788d837f0d84923fa1. So I tried doing the same, i.e passing: __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ CARGO_TARGET_APPLIES_TO_HOST="false" in the environment, and -Z target-applies-to-host to cargo (by passing it to the args argument of the RustExtension class in python-cryptography's setup.py). But cargo doesn't like that, the build log goes like this: >>> python-cryptography 36.0.1 BuildingESC[27m ... calling setup.py ... cargo rustc --lib --manifest-path src/rust/Cargo.toml --features pyo3/abi3-py36 pyo3/extension-module --target x86_64-unknown-linux-gnu -Z target-applies-to-host --release --verbose -- --crate-type cdylib ... error: unknown `-Z` flag specified: target-applies-to-host The difference that I see with the cargo infrastructure is that this is not using "cargo build" but "cargo rustc". I would really appreciate some help on solving this (last?) issue. Best regards, Thomas Petazzoni Thomas Petazzoni (7): package/ca-certificates: remove dependency on host-python-cryptography package/python-cryptography: drop host variant package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 package/rustc: fix the riscv64gc architecture handling support/download/cargo-post-process: make manifest path configurable support/testing/tests: switch python-cryptography related tests to glibc DO-NOT-APPLY package/python-cryptography: bump version to 36.0.1 ...2pem.py-make-cryptography-module-opt.patch | 59 +++++++++++++++++++ package/ca-certificates/ca-certificates.mk | 2 +- package/docker-compose/Config.in | 8 ++- package/python-autobahn/Config.in | 6 +- package/python-channels-redis/Config.in | 7 +-- package/python-channels/Config.in | 7 +-- package/python-crossbar/Config.in | 6 +- package/python-cryptography/Config.in | 14 +---- .../python-cryptography.hash | 5 +- .../python-cryptography.mk | 20 ++++--- package/python-daphne/Config.in | 7 +-- package/python-keyring/Config.in | 7 +-- package/python-opcua-asyncio/Config.in | 1 + package/python-paramiko/Config.in | 8 +-- package/python-pyopenssl/Config.in | 8 +-- package/python-secretstorage/Config.in | 6 +- package/python-service-identity/Config.in | 10 ++-- package/python-treq/Config.in | 10 ++-- package/python-twisted/Config.in | 6 +- package/python-txdbus/Config.in | 5 +- package/python-txtorcon/Config.in | 7 +-- package/rustc/Config.in.host | 4 +- support/download/cargo-post-process | 2 +- .../tests/package/test_python_autobahn.py | 10 +++- .../tests/package/test_python_crossbar.py | 10 +++- .../tests/package/test_python_cryptography.py | 10 +++- .../package/test_python_service_identity.py | 10 +++- .../testing/tests/package/test_python_treq.py | 10 +++- .../tests/package/test_python_txtorcon.py | 10 +++- 29 files changed, 170 insertions(+), 105 deletions(-) create mode 100644 package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:12 +0100 Subject: [Buildroot] [PATCH 2/7] package/python-cryptography: drop host variant In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-3-thomas.petazzoni@bootlin.com> The host variant was only needed by ca-certificates, which no longer needs it, so drop this variant. Signed-off-by: Thomas Petazzoni --- package/python-cryptography/python-cryptography.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 081dfc06a0..9c00efb44f 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -13,11 +13,5 @@ PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl -HOST_PYTHON_CRYPTOGRAPHY_NEEDS_HOST_PYTHON = python3 -HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ - host-python3-cffi \ - host-python3-six \ - host-openssl $(eval $(python-package)) -$(eval $(host-python-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:13 +0100 Subject: [Buildroot] [PATCH 3/7] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-4-thomas.petazzoni@bootlin.com> BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for BR2_ARM_CPU_ARMV7A, but it also needs a special value for BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for ARMv5TE is identified with the "armv5te" architecture name, see https://doc.rust-lang.org/nightly/rustc/platform-support.html. We noticed this because Rust binaries wouldn't work on an ARMv5 platform (Illegal instruction). This was due to the usage of the arm-unknown-linux-gnueabi variant of the Rust standard library, which is for ARMv6. Thanks to this commit, we correctly use the armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly on ARMv5TE. Signed-off-by: Thomas Petazzoni --- package/rustc/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 90ea56f626..05324ad755 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -102,6 +102,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH string + default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A default BR2_ARCH if !BR2_ARM_CPU_ARMV7A -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:14 +0100 Subject: [Buildroot] [PATCH 4/7] package/rustc: fix the riscv64gc architecture handling In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-5-thomas.petazzoni@bootlin.com> riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true when BR2_riscv is true. Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to allow rust-bin to download its pre-compiled standard library correctly. Signed-off-by: Thomas Petazzoni --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 05324ad755..8c8b75c0a2 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -49,7 +49,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC # riscv64gc-unknown-linux-gnu # "g" stands for imafd, and we also need "c". - default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ + default y if BR2_RISCV_64 && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ BR2_TOOLCHAIN_USES_GLIBC @@ -104,6 +104,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH string default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A + default "riscv64gc" if BR2_RISCV_64 default BR2_ARCH if !BR2_ARM_CPU_ARMV7A config BR2_PACKAGE_HOST_RUSTC_ABI -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:15 +0100 Subject: [Buildroot] [PATCH 5/7] support/download/cargo-post-process: make manifest path configurable In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-6-thomas.petazzoni@bootlin.com> In most pure Rust packages, the Cargo.toml manifest is at the root directory, which is why we could call "cargo vendor" without specifying the path of the manifest. However, other packages, such as python-cryptography, which have parts implemented in Rust, have their Cargo.toml located in a specific subdirectory. This commit extends the cargo-post-process download script to understand a BR_CARGO_MANIFEST_PATH environment variable, which allows a package to pass the location of the Cargo.toml file. If not passed, "Cargo.toml" is used, preserving the existing behavior for other packages. Signed-off-by: Thomas Petazzoni --- support/download/cargo-post-process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 25dbbedbfa..51d9dd24c1 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -22,7 +22,7 @@ post_process_unpack ${base_name} ${output} # Do the Cargo vendoring pushd ${base_name} > /dev/null -cargo vendor --locked VENDOR +cargo vendor --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} --locked VENDOR # Create the local .cargo/config with vendor info mkdir -p .cargo/ -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:16 +0100 Subject: [Buildroot] [PATCH 6/7] support/testing/tests: switch python-cryptography related tests to glibc In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-7-thomas.petazzoni@bootlin.com> In a follow-up commit, we are about to bump python-cryptography to a new version, which has the interesting charateristic of using Rust code. This means python-cryptography will now only be available on platforms supported by Rust, which for now excludes uclibc-based configurations (none of the Rust Tier1/Tier2 platforms use uClibc, there is some uClibc support in Tier3 platforms but they have not been added to Buildroot for now). So in preparation for this bump, we switch the few test cases of Python packages that directly or indirectly use python-cryptography to use a glibc toolchain. Another impacted test case is the docker-compose test case, but it already uses a glibc toolchain; Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_autobahn.py | 10 +++++++++- support/testing/tests/package/test_python_crossbar.py | 10 +++++++++- .../testing/tests/package/test_python_cryptography.py | 10 +++++++++- .../tests/package/test_python_service_identity.py | 10 +++++++++- support/testing/tests/package/test_python_treq.py | 10 +++++++++- support/testing/tests/package/test_python_txtorcon.py | 10 +++++++++- 6 files changed, 54 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_autobahn.py b/support/testing/tests/package/test_python_autobahn.py index a237ce465d..6c1678a615 100644 --- a/support/testing/tests/package/test_python_autobahn.py +++ b/support/testing/tests/package/test_python_autobahn.py @@ -3,9 +3,17 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Autobahn(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AUTOBAHN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_autobahn.py"] diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py index d7843ddd8b..83649aeec2 100644 --- a/support/testing/tests/package/test_python_crossbar.py +++ b/support/testing/tests/package/test_python_crossbar.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Crossbar(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_crossbar.py"] timeout = 60 diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py index 62f0ca0def..bf11c02e5c 100644 --- a/support/testing/tests/package/test_python_cryptography.py +++ b/support/testing/tests/package/test_python_cryptography.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Cryptography(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_cryptography.py"] timeout = 40 diff --git a/support/testing/tests/package/test_python_service_identity.py b/support/testing/tests/package/test_python_service_identity.py index 09cfbe0a26..dbad5f931f 100644 --- a/support/testing/tests/package/test_python_service_identity.py +++ b/support/testing/tests/package/test_python_service_identity.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3ServiceIdentity(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_service_identity.py"] timeout = 30 diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index 307c9932b2..515f1ea304 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -14,8 +14,16 @@ class TestPythonTreq(TestPythonPackageBase): class TestPythonPy3Treq(TestPythonTreq): __test__ = True - config = TestPythonTreq.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TREQ=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 8e74190ee1..6f0c4ca1ed 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TXTORCON=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_txtorcon.py"] timeout = 30 -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:17 +0100 Subject: [Buildroot] [PATCH 7/7] DO-NOT-APPLY package/python-cryptography: bump version to 36.0.1 In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-8-thomas.petazzoni@bootlin.com> This version bump requires significant changes because python-cryptography is now partially implemented in Rust. This means that: - The C++ dependency is no longer needed. - We need to ensure we are on an architecture where Rust is available (BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS) - Almost all Python dependencies are no longer relevant, except for the python-cffi. - A number of magic environment variables are needed to make the Rust part build correctly (CARGO_BUILD_TARGET, PYO3_CROSS_LIB_DIR, CARGO_HOME) - We need to invoke the "cargo" download post-process hook to vendor the Cargo dependencies at download time. - We need to propagate to relatively significant reverse dependency tree the changes of dependencies on python-cryptography. DO-NOT-APPLY: this commit is currently broken when host arch == target arch. Co-developed-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/docker-compose/Config.in | 8 +++++--- package/python-autobahn/Config.in | 6 +----- package/python-channels-redis/Config.in | 7 ++----- package/python-channels/Config.in | 7 ++----- package/python-crossbar/Config.in | 6 +----- package/python-cryptography/Config.in | 14 ++------------ .../python-cryptography/python-cryptography.hash | 5 ++--- package/python-cryptography/python-cryptography.mk | 14 +++++++++++--- package/python-daphne/Config.in | 7 ++----- package/python-keyring/Config.in | 7 ++----- package/python-opcua-asyncio/Config.in | 1 + package/python-paramiko/Config.in | 8 ++------ package/python-pyopenssl/Config.in | 8 ++------ package/python-secretstorage/Config.in | 6 +----- package/python-service-identity/Config.in | 10 ++++------ package/python-treq/Config.in | 10 ++++------ package/python-twisted/Config.in | 6 ++---- package/python-txdbus/Config.in | 5 ++++- package/python-txtorcon/Config.in | 7 ++----- 19 files changed, 52 insertions(+), 90 deletions(-) diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 8e16b60521..761befea4d 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -5,7 +5,8 @@ config BR2_PACKAGE_DOCKER_COMPOSE depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_THREADS # python depends on !BR2_STATIC_LIBS # python - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko -> python-cryptography + # python-paramiko -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime select BR2_PACKAGE_PYTHON_DOCOPT # runtime @@ -23,7 +24,8 @@ config BR2_PACKAGE_DOCKER_COMPOSE https://www.docker.com/ -comment "docker-compose needs a toolchain w/ C++, wchar, threads, dynamic library" +comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + BR2_STATIC_LIBS diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in index f719dcc8f1..92ddad0ea4 100644 --- a/package/python-autobahn/Config.in +++ b/package/python-autobahn/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography -> python-pyasn + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime @@ -11,7 +11,3 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN framework. https://pypi.python.org/pypi/autobahn - -comment "python-autobahn needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-channels-redis/Config.in b/package/python-channels-redis/Config.in index 8946670180..bab801d2a9 100644 --- a/package/python-channels-redis/Config.in +++ b/package/python-channels-redis/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS bool "python-channels-redis" - depends on BR2_INSTALL_LIBSTDCPP # python-channels -> python-daphne + # python-channels -> python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-channels select BR2_PACKAGE_PYTHON_AIOREDIS # runtime select BR2_PACKAGE_PYTHON_ASGIREF # runtime @@ -12,7 +13,3 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS sharded configurations, as well as group support. http://github.com/django/channels_redis/ - -comment "python-channels-redis needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-channels/Config.in b/package/python-channels/Config.in index 5c70f20d1c..6cd6e5f60d 100644 --- a/package/python-channels/Config.in +++ b/package/python-channels/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHANNELS bool "python-channels" - depends on BR2_INSTALL_LIBSTDCPP # python-daphne -> python-autobahn -> python-cryptography + # python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-daphne select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_DAPHNE # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_CHANNELS own protocols and needs. http://github.com/django/channels - -comment "python-channels needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in index 50b70b8e02..b72d64c19d 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 # All the following dependencies are runtime dependencies select BR2_PACKAGE_PYTHON_ATTRS @@ -48,7 +48,3 @@ config BR2_PACKAGE_PYTHON_CROSSBAR components that can talk in real-time with each other. https://pypi.python.org/pypi/crossbar - -comment "python-crossbar needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index da4252d6da..07a22bf846 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -1,21 +1,11 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" - depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime - select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON3_SSL # runtime help cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. https://cryptography.io - -comment "python-cryptography needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 7cb38c8d3d..1219fa9b5f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,6 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/cryptography/json -md5 e2ce2ec8a63965fad351f36ed70fde4b cryptography-3.3.2.tar.gz -sha256 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed cryptography-3.3.2.tar.gz +# Locally calculated after vendoring +sha256 196bba703cebc052a19f5353614fcfa9d680471990c10305f110adcc05744eeb cryptography-36.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 9c00efb44f..d302f87405 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,14 +4,22 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 3.3.2 +PYTHON_CRYPTOGRAPHY_VERSION = 36.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d559879912eb8a1c5d16ad9f25d35f7c4f4c +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/f9/4b/1cf8e281f7ae4046a59e5e39dd7471d46db9f61bb564fddbff9084c4334f PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-setuptools-rust host-python-cffi host-rustc +PYTHON_CRYPTOGRAPHY_ENV = CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" \ + CARGO_HOME="$(HOST_DIR)/share/cargo" +# We need to vendor the Cargo crates at download time +PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo +PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_CRYPTOGRAPHY_DL_ENV = \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in index 601b2e1db8..c4479417e9 100644 --- a/package/python-daphne/Config.in +++ b/package/python-daphne/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_DAPHNE bool "python-daphne" - depends on BR2_INSTALL_LIBSTDCPP # python-autobahn -> python-cryptography + # python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_DAPHNE versus HTTP endpoints. https://github.com/django/daphne - -comment "python-daphne needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-keyring/Config.in b/package/python-keyring/Config.in index f7bb1ae820..61cb98952f 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_KEYRING bool "python-keyring" + # python-secretstorage -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help @@ -9,7 +10,3 @@ config BR2_PACKAGE_PYTHON_KEYRING system keyring service from Python. https://pypi.python.org/pypi/keyring - -comment "python-keyring needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in index 3700e00e1d..95715fdd08 100644 --- a/package/python-opcua-asyncio/Config.in +++ b/package/python-opcua-asyncio/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO bool "python-opcua-asyncio" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOFILES # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index 4b8495d76d..e44237b0c2 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" - depends on BR2_PACKAGE_PYTHON3 # python-bcrypt - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-bcrypt, python-cryptography select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime @@ -10,7 +10,3 @@ config BR2_PACKAGE_PYTHON_PARAMIKO SSH2 protocol library. https://github.com/paramiko/paramiko/ - -comment "python-paramiko needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index 99ea4e9408..65d516813f 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -1,14 +1,10 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL bool "python-pyopenssl" - depends on BR2_PACKAGE_PYTHON3 # python-cryptography -> python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help Python wrapper module around the OpenSSL library. https://github.com/pyca/pyopenssl - -comment "python-pyopenssl needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in index 8ae8c2d598..059ea097bb 100644 --- a/package/python-secretstorage/Config.in +++ b/package/python-secretstorage/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE bool "python-secretstorage" depends on BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime help Python bindings to FreeDesktop.org Secret Service API. https://github.com/mitya57/secretstorage - -comment "python-secretstorage needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index ab012347dc..c571065e92 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" - depends on BR2_PACKAGE_PYTHON3 # python-pyopenssl -> python-cryptography -> python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime @@ -11,7 +13,3 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY Service identity verification for pyOpenSSL. https://pypi.python.org/pypi/service_identity - -comment "python-service-identify needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 02c26a53f7..6e54c19e16 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" - depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-idna, python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime @@ -16,7 +18,3 @@ config BR2_PACKAGE_PYTHON_TREQ API for making HTTP requests when using Twisted. https://github.com/twisted/treq - -comment "python-treq needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 29536ecf9d..89298b2e0c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -23,12 +23,10 @@ config BR2_PACKAGE_PYTHON_TWISTED_HTTP2 config BR2_PACKAGE_PYTHON_TWISTED_TLS bool "TLS support" - depends on BR2_INSTALL_LIBSTDCPP # python-{pyopenssl,service-identity} + # python-{pyopenssl,service-identity} + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime -comment "TLS support needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - endif diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index c7de322f91..ffd00f153e 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_PYTHON_TXDBUS bool "python-txdbus" - depends on BR2_PACKAGE_PYTHON3 # python-twisted -> python-cryptography -> python-idna + # python-twisted -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-twisted -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index e8a1a233db..0606e5f442 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_TXTORCON bool "python-txtorcon" + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_TXTORCON configuration abstractions. https://github.com/meejah/txtorcon - -comment "python-txtorcon needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP -- 2.33.1 From peter at korsgaard.com Fri Jan 7 17:14:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:14:01 +0100 Subject: [Buildroot] [git commit] package/jitterentropy-library: needs threads Message-ID: <20220107170908.250D9832B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c28b93248a2e4ee79dc42e20d904505e7310a15f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 3.3.1 in commit 3965f09cb427af411055a783cd14b501b2b28285 and https://github.com/smuellerDD/jitterentropy-library/commit/1e94512db65450ffd950e04fac61408b5efb7e2d In file included from ./jitterentropy.h:98, from src/jitterentropy-gcd.c:22: ./jitterentropy-base-user.h:74:10: fatal error: pthread.h: No such file or directory 74 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7b01eca8f1442318dd35282605fc8815e6afb0d0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jitterentropy-library/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/jitterentropy-library/Config.in b/package/jitterentropy-library/Config.in index 02f8ff6164..f9ae1bac5a 100644 --- a/package/jitterentropy-library/Config.in +++ b/package/jitterentropy-library/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_JITTERENTROPY_LIBRARY bool "libjitterentropy" + depends on BR2_TOOLCHAIN_HAS_THREADS help Hardware RNG based on CPU timing jitter. https://github.com/smuellerDD/jitterentropy-library + +comment "libjitterentropy needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Fri Jan 7 17:15:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:15:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/jitterentropy-library: needs threads In-Reply-To: <20220106223039.1065153-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 6 Jan 2022 23:30:39 +0100") References: <20220106223039.1065153-1-fontaine.fabrice@gmail.com> Message-ID: <87lezrmpqz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump to version 3.3.1 in > commit 3965f09cb427af411055a783cd14b501b2b28285 and > https://github.com/smuellerDD/jitterentropy-library/commit/1e94512db65450ffd950e04fac61408b5efb7e2d > In file included from ./jitterentropy.h:98, > from src/jitterentropy-gcd.c:22: > ./jitterentropy-base-user.h:74:10: fatal error: pthread.h: No such file or directory > 74 | #include > | ^~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/7b01eca8f1442318dd35282605fc8815e6afb0d0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Fri Jan 7 04:55:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 21:55:30 -0700 Subject: [Buildroot] [PATCH v3 2/3] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220107045531.3985241-1-james.hilliard1@gmail.com> References: <20220107045531.3985241-1-james.hilliard1@gmail.com> Message-ID: <20220107045531.3985241-2-james.hilliard1@gmail.com> We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages. We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version. There are python3 patches available that apply to this version with minor modifications(to be added in a future patch). We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive. We need to add some new required dependencies to qt5webengine so that it will build. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entries --- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 5 +- package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 23 + package/qt5/qt5webengine/Config.in | 3 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 10 files changed, 2569 insertions(+), 2012 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/Config.in create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 143926b743..54e6f7d6a6 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium/Config.in" source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine-chromium/Config.in b/package/qt5/qt5webengine-chromium/Config.in new file mode 100644 index 0000000000..8ba9ad7135 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/Config.in @@ -0,0 +1,5 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5webengine source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM + bool + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 0000000000..ced431c9e9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 0000000000..103e27d889 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 0000000000..2b061815b5 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult +QT5WEBENGINE_CHROMIUM_INSTALL_TARGET = NO + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..aded684ce2 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). @@ -57,9 +58,11 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_QT5QUICKCONTROLS2 select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5BASE_EXAMPLES select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc deleted file mode 100644 index a5fdfdc1f1..0000000000 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ /dev/null @@ -1,1000 +0,0 @@ -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/cityhash/COPYING \ - src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ - src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ - src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ - src/3rdparty/chromium/third_party/dav1d/LICENSE \ - src/3rdparty/chromium/third_party/dawn/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/ink/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jacoco/LICENSE \ - src/3rdparty/chromium/third_party/javalang/LICENSE \ - src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ - src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ - src/3rdparty/chromium/third_party/libipp/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libxslt/src/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/lottie/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mako/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/nasm/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/perfetto/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/pffft/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/r8/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/rnnoise/COPYING \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/schema_org/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/six/src/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ - src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/test_fonts/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/turbine/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/unrar/LICENSE \ - src/3rdparty/chromium/third_party/unrar/src/license.txt \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ - src/3rdparty/chromium/third_party/weston/LICENSE \ - src/3rdparty/chromium/third_party/weston/src/COPYING \ - src/3rdparty/chromium/third_party/weston/src/data/COPYING \ - src/3rdparty/chromium/third_party/widevine/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ - src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ - src/3rdparty/gn/base/third_party/icu/LICENSE \ - src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb..1d2b70c4f6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..1b5529d2bb 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -5,18 +5,18 @@ ################################################################################ QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python + qt5declarative qt5webchannel host-bison host-flex host-freetype \ + host-gperf host-nodejs host-pkgconf host-python +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libxkbfile xlib_libXrandr xlib_libXtst endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss @@ -44,7 +44,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python @@ -53,12 +55,20 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty +endef +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:37:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:37:18 +0100 Subject: [Buildroot] [git commit] package/lttng-modules: bump to version 2.13.1 Message-ID: <20220107173116.5352C83488@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48b77b25b71fa3c47b8d6fac1da46ea122715350 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Add a dependency on kernel >= 3.0: https://github.com/lttng/lttng-modules/commit/88eafb709ac811960b1163482f5d537cb18b32df - Add CONFIG_KPROBES to Config.in for kernel >= 5.7: https://github.com/lttng/lttng-modules/commit/a65765406b03e4f3b7a4303e1c9ed83c86cdd358 - Update license files and their hash because SPDX v3.0 identifiers are used since https://github.com/lttng/lttng-modules/commit/b7cdc18250880cc44edeef4a4b42c8ac7a135a6d - This bump will fix a build failure with kernel >= 5.6 thanks to at least: https://github.com/lttng/lttng-modules/commit/edfdcb685c3f56dde803244449f79ad7bed03798 https://github.com/lttng/lttng-modules/blob/v2.13.1/ChangeLog Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14501 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lttng-modules/Config.in | 12 +++++++++--- package/lttng-modules/lttng-modules.hash | 12 ++++++------ package/lttng-modules/lttng-modules.mk | 5 +++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/package/lttng-modules/Config.in b/package/lttng-modules/Config.in index e8ba9bad8c..cb56584155 100644 --- a/package/lttng-modules/Config.in +++ b/package/lttng-modules/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LTTNG_MODULES bool "lttng-modules" depends on BR2_LINUX_KERNEL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 help Linux kernel modules for the LTTng 2.x kernel tracing infrastructure. @@ -8,7 +9,8 @@ config BR2_PACKAGE_LTTNG_MODULES Make sure your target kernel has the following config options enabled: - * CONFIG_MODULES: loadable module support + * CONFIG_MODULES: loadable module support (not strictly + required when built into the kernel) * CONFIG_KALLSYMS: this is necessary until the few required missing symbols are exported to GPL modules from mainline @@ -17,6 +19,8 @@ config BR2_PACKAGE_LTTNG_MODULES * CONFIG_TRACEPOINTS: kernel tracepoint instrumentation (enabled as a side-effect of any of the perf/ftrace/blktrace instrumentation features) + * CONFIG_KPROBES (5.7+): use kallsyms for kernel 5.7 and + newer. The following kernel configuration options will affect the features available from LTTng: @@ -29,9 +33,11 @@ config BR2_PACKAGE_LTTNG_MODULES * CONFIG_KALLSYMS_ALL: state dump of mapping between block device number and name - The packaged version is compatible with Linux 2.6.38 to 3.16. - http://lttng.org comment "lttng-modules needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL + +comment "lttng-modules needs a toolchain w/ headers >= 3.0" + depends on BR2_LINUX_KERNEL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index f04247ab0b..fb253c9bf6 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,8 +1,8 @@ -# From https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2.sha256 -sha256 98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f lttng-modules-2.11.0.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.1.tar.bz2.sha256 +sha256 a7c86d91c9bbe66d27f025aa04b8cfc6d7785ed2fc7ef774930800ee44d7f343 lttng-modules-2.13.1.tar.bz2 # Hash for license files -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt -sha256 6334b377a5bd56b56a1e8a495830f2d28ed1b5cbedc7493aec9fba979efcdfe1 LICENSE +sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 +sha256 6841c85b94f9dab319356e3aaf9e969fcedad51d3aaadf665bf86f34f4186b62 LICENSES/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/MIT +sha256 0133d3c505f176845d7a8b4dcfe006ac615832c43c41e76fe3b365191bafca92 LICENSE diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index b8f9be8656..4c1c50d0a0 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,11 +4,12 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.11.0 +LTTNG_MODULES_VERSION = 2.13.1 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) -LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE +LTTNG_MODULES_LICENSE_FILES = \ + LICENSES/LGPL-2.1 LICENSES/GPL-2.0 LICENSES/MIT LICENSE LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $(eval $(kernel-module)) From thomas.petazzoni at bootlin.com Fri Jan 7 17:40:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:40:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/lttng-modules: bump to version 2.13.1 In-Reply-To: <20220106174949.1064731-1-fontaine.fabrice@gmail.com> References: <20220106174949.1064731-1-fontaine.fabrice@gmail.com> Message-ID: <20220107184041.5a39d4e1@windsurf> Hello, On Thu, 6 Jan 2022 18:49:49 +0100 Fabrice Fontaine wrote: > - Add a dependency on kernel >= 3.0: > https://github.com/lttng/lttng-modules/commit/88eafb709ac811960b1163482f5d537cb18b32df > - Add CONFIG_KPROBES to Config.in for kernel >= 5.7: > https://github.com/lttng/lttng-modules/commit/a65765406b03e4f3b7a4303e1c9ed83c86cdd358 > - Update license files and their hash because SPDX v3.0 identifiers are > used since > https://github.com/lttng/lttng-modules/commit/b7cdc18250880cc44edeef4a4b42c8ac7a135a6d > - This bump will fix a build failure with kernel >= 5.6 thanks to at > least: > https://github.com/lttng/lttng-modules/commit/edfdcb685c3f56dde803244449f79ad7bed03798 > > https://github.com/lttng/lttng-modules/blob/v2.13.1/ChangeLog > > Fixes: > - https://bugs.busybox.net/show_bug.cgi?id=14501 > > Signed-off-by: Fabrice Fontaine > --- > package/lttng-modules/Config.in | 12 +++++++++--- > package/lttng-modules/lttng-modules.hash | 12 ++++++------ > package/lttng-modules/lttng-modules.mk | 5 +++-- > 3 files changed, 18 insertions(+), 11 deletions(-) Applied to master, thanks. I suppose you will close the bug? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Fri Jan 7 17:43:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:43:21 +0100 Subject: [Buildroot] [git commit] package/mdadm: disable -Werror Message-ID: <20220107174006.2400782678@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5408db0d9fae1c7735ba339b30498303994ca07f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable -Werror by setting CWFLAGS to "" This will avoid the following build failure raised since bump to version 4.2 in commit b03fc7974536378ba102418451ba7e9801bc6251: mdadm.c: In function 'main': mdadm.c:156:28: error: this statement may fall through [-Werror=implicit-fallthrough=] 154 | if (mode == ASSEMBLE || mode == BUILD || | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c0f216b7aadb794110409d03dcef7fa58e833cd4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mdadm/mdadm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 6ee0bb60c9..0a2eb4e5bd 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -16,6 +16,7 @@ MDADM_BUILD_OPTS = \ CC=$(TARGET_CC) \ COROSYNC=-DNO_COROSYNC \ DLM=-DNO_DLM \ + CWFLAGS="" \ CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 From peter at korsgaard.com Fri Jan 7 17:46:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:46:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/mdadm: disable -Werror In-Reply-To: <20220105180453.388499-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 5 Jan 2022 19:04:53 +0100") References: <20220105180453.388499-1-fontaine.fabrice@gmail.com> Message-ID: <87czl3moal.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable -Werror by setting CWFLAGS to "" > This will avoid the following build failure raised since bump to version > 4.2 in commit b03fc7974536378ba102418451ba7e9801bc6251: > mdadm.c: In function 'main': > mdadm.c:156:28: error: this statement may fall through [-Werror=implicit-fallthrough=] > 154 | if (mode == ASSEMBLE || mode == BUILD || > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/c0f216b7aadb794110409d03dcef7fa58e833cd4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Fri Jan 7 17:49:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:49:03 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump to version 3.74 In-Reply-To: <20220106191028.146979-1-giulio.benetti@benettiengineering.com> References: <20220106191028.146979-1-giulio.benetti@benettiengineering.com> Message-ID: <20220107184903.65b34c20@windsurf> On Thu, 6 Jan 2022 20:10:28 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > package/libnss/libnss.hash | 4 ++-- > package/libnss/libnss.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 17:49:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:49:15 +0100 Subject: [Buildroot] [git commit] package/libnss: bump to version 3.74 Message-ID: <20220107174320.C457982DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dfce8d765cc8c7e1452493b7c02a8c014d2a6f1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 100d2d7870..819c272a30 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_73_1_RTM/src/SHA256SUMS -sha256 c768f9fe3129e8bcc2e9679456d7edd9453a225784a8fc7dc4501806f1fe9abe nss-3.73.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_74_RTM/src/SHA256SUMS +sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index b6279fa921..537f6dd9b6 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.73.1 +LIBNSS_VERSION = 3.74 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From thomas.petazzoni at bootlin.com Fri Jan 7 17:49:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:49:21 +0100 Subject: [git commit] DEVELOPERS: remove qt5webkit-examples entry from Gaël Portay Message-ID: <20220107174320.CF1A983493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07e0923b58c9dd0788c012f5106491c0acff56d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This causes warning on ./utils/get-developers: WARNING: 'package/qt5/qt5webkit-examples/' doesn't match any file because 'package/qt5/qt5webkit-examples/' has been removed, so let's remove its entry in this file. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3d5c01f795..630196fd54 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1021,7 +1021,6 @@ N: Ga??l Portay F: package/qt5/qt5virtualkeyboard/ F: package/qt5/qt5webengine/ F: package/qt5/qt5webkit/ -F: package/qt5/qt5webkit-examples/ N: Gao Xiang F: package/erofs-utils/ From peter at korsgaard.com Fri Jan 7 17:51:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:51:44 +0100 Subject: [Buildroot] [git commit] package/go: bump version to 1.17.6 Message-ID: <20220107174547.40BA683493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7af6659cb2cbd54b2ca6bad2d91291815e83fbc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master View the release notes for more information: https://go.dev/doc/devel/release.html#go1.17.minor Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 39f8226aae..9111c8c9aa 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz +sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 0d9ceab2bb..062bec378c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.5 +GO_VERSION = 1.17.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Fri Jan 7 17:52:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:52:32 +0100 Subject: [Buildroot] [git commit] package/4th: bump to version 3.64.0 Message-ID: <20220107174659.667D982DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30cefccaf7916b0b635071b3aa11c6b368607b2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/4th/4th.hash | 2 +- package/4th/4th.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/4th/4th.hash b/package/4th/4th.hash index 36d2941055..ae08a6bf5e 100644 --- a/package/4th/4th.hash +++ b/package/4th/4th.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f822f7dd8cfb0b1744a62d653c6efe933578ae1789ec60a088509a38bca4b4fc 4th-3.62.5-unix.tar.gz +sha256 c0905e92316c151224858fcfff21c143c85efa4f9f1b2ade3c64cfd988e0a6a8 4th-3.64.0-unix.tar.gz sha256 8c6111b645a02219579ea66e84aa8e78a0ed4f4dd80857ffb91bcda5528717d4 COPYING diff --git a/package/4th/4th.mk b/package/4th/4th.mk index aee59c463f..d031c0e4b4 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -4,7 +4,7 @@ # ################################################################################ -4TH_VERSION = 3.62.5 +4TH_VERSION = 3.64.0 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) 4TH_LICENSE = GPL-3.0+, LGPL-3.0+ From thomas.petazzoni at bootlin.com Fri Jan 7 17:55:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:55:05 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-mythtv: bump version to 19.0.3-Matrix Message-ID: <20220107174859.E8F3982B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8604c57da7e54bfd55747ed161b5c51a870d3549 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 5d0e2738bd..cd96feef70 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f5a2c0d4c742db3e8465369f4845faa87c76572290edc1792cf188ad977752b4 kodi-pvr-mythtv-19.0.2-Matrix.tar.gz +sha256 87f696fdb973602967c7dbcc1db5492616f29bfabe687fddd3a276f663a05d44 kodi-pvr-mythtv-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index b897667d67..6edca8db50 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.2-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.3-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Fri Jan 7 17:55:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:55:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.3-Matrix In-Reply-To: <20220106214411.2684476-1-bernd.kuhls@t-online.de> References: <20220106214411.2684476-1-bernd.kuhls@t-online.de> Message-ID: <20220107185519.4f7336d7@windsurf> On Thu, 6 Jan 2022 22:44:11 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- > package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 17:55:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:55:49 +0100 Subject: [Buildroot] [git commit] package/pipewire: bump to version 0.3.43 Message-ID: <20220107174943.B39B682B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0cfb1b90c1bb41dc95d7d3ab9cef1ae358a067c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new meson configuration options and optional dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index c41c0a3686..8464a56338 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b6a2eab8bda2f3cb87c3a0a714839696831ad27b5786674c4bd6c3776b9ebc97 pipewire-0.3.40.tar.bz2 +sha256 2e91f228ffb93494f2423956b930014de20e15639a03f3df4fca4ebf4bc51fc0 pipewire-0.3.43.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 7043745cc1..604d08f90d 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.40 +PIPEWIRE_VERSION = 0.3.43 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -28,7 +28,8 @@ PIPEWIRE_CONF_OPTS += \ -Dvideoconvert=enabled \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ - -Dsession-managers=[] + -Dsession-managers=[] \ + -Dlv2=disabled ifeq ($(BR2_PACKAGE_DBUS),y) PIPEWIRE_CONF_OPTS += -Ddbus=enabled @@ -174,6 +175,13 @@ else PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=disabled endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PIPEWIRE_CONF_OPTS += -Draop=enabled +PIPEWIRE_DEPENDENCIES += openssl +else +PIPEWIRE_CONF_OPTS += -Draop=disabled +endif + define PIPEWIRE_USERS pipewire -1 pipewire -1 * - - audio,video PipeWire System Daemon endef From peter at korsgaard.com Fri Jan 7 17:55:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:55:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/go: security bump to version 1.16.13 Message-ID: <20220107174948.E089B82B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b39532a1624b19ba66cadebd71cd51ef218f72f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x go1.16.11 (released 2021-12-02) includes fixes to the compiler, runtime, and the net/http, net/http/httptest, and time packages. go1.16.12 (released 2021-12-09) includes security fixes to the syscall and net/http packages. go1.16.13 (released 2022-01-06) includes fixes to the compiler, linker, runtime, and the net/http package. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 10bbb741e0..7071fcd99d 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 a905472011585e403d00d2a41de7ced29b8884309d73482a307f689fd0f320b5 go1.16.10.src.tar.gz +sha256 b0926654eaeb01ef43816638f42d7b1681f2d3f41b9559f07735522b7afad41a go1.16.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 8a65e20380..cac83c65ff 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.10 +GO_VERSION = 1.16.13 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Fri Jan 7 17:55:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:55:51 +0100 Subject: [Buildroot] [2021.02 1/1] package/go: security bump to version 1.16.13 In-Reply-To: <20220106214426.442534-1-christian@paral.in> (Christian Stewart's message of "Thu, 6 Jan 2022 13:44:26 -0800") References: <20220106214426.442534-1-christian@paral.in> Message-ID: <87zgo7l9aw.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.16.11 (released 2021-12-02) includes fixes to the compiler, runtime, and the > net/http, net/http/httptest, and time packages. > go1.16.12 (released 2021-12-09) includes security fixes to the syscall and > net/http packages. > go1.16.13 (released 2022-01-06) includes fixes to the compiler, linker, runtime, > and the net/http package. > Signed-off-by: Christian Stewart Committed to 2021.02.x, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Fri Jan 7 17:56:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:56:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.43 In-Reply-To: <20220107080055.4003907-1-james.hilliard1@gmail.com> References: <20220107080055.4003907-1-james.hilliard1@gmail.com> Message-ID: <20220107185600.79ce9000@windsurf> On Fri, 7 Jan 2022 01:00:55 -0700 James Hilliard wrote: > Add new meson configuration options and optional dependencies. > > Signed-off-by: James Hilliard > --- > package/pipewire/pipewire.hash | 2 +- > package/pipewire/pipewire.mk | 12 ++++++++++-- > 2 files changed, 11 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 17:56:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:56:08 +0100 Subject: [Buildroot] [git commit] package/openlayers: bump to version 6.10.0 Message-ID: <20220107175001.8501682B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=702ebf1704d8789a696fab25a518890f68720026 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index e29365fc91..11eae3de36 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 35a0b37a5c1e7c48553215c6e8c24a12bac8e9048f008fc61c4b329cf6611b5c v6.9.0-dist.zip +sha256 da3025279bbd6cfb0e82b7af95666bede8fd65e8c620a1bc54bba04cebb7e1d4 v6.10.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index b20ea9977c..781f9901ea 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.9.0 +OPENLAYERS_VERSION = 6.10.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From thomas.petazzoni at bootlin.com Fri Jan 7 17:57:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:57:13 +0100 Subject: [Buildroot] [PATCH 3/7] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 In-Reply-To: <20220107171318.1423075-4-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> <20220107171318.1423075-4-thomas.petazzoni@bootlin.com> Message-ID: <20220107185713.7b1d5224@windsurf> On Fri, 7 Jan 2022 18:13:13 +0100 Thomas Petazzoni wrote: > BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for > BR2_ARM_CPU_ARMV7A, but it also needs a special value for > BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for > ARMv5TE is identified with the "armv5te" architecture name, see > https://doc.rust-lang.org/nightly/rustc/platform-support.html. > > We noticed this because Rust binaries wouldn't work on an ARMv5 > platform (Illegal instruction). This was due to the usage of the > arm-unknown-linux-gnueabi variant of the Rust standard library, which > is for ARMv6. Thanks to this commit, we correctly use the > armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly > on ARMv5TE. > > Signed-off-by: Thomas Petazzoni > --- > package/rustc/Config.in.host | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host > index 90ea56f626..05324ad755 100644 > --- a/package/rustc/Config.in.host > +++ b/package/rustc/Config.in.host > @@ -102,6 +102,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > > config BR2_PACKAGE_HOST_RUSTC_ARCH > string > + default "armv5te" if BR2_ARM_CPU_ARMV5 > default "armv7" if BR2_ARM_CPU_ARMV7A > default BR2_ARCH if !BR2_ARM_CPU_ARMV7A I need to drop the "if !BR2_ARM_CPU_ARMV7A" here. Will do in the next iteration, or can be done when applying if there are no other comments. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Fri Jan 7 17:51:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:51:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: bump version to 1.17.6 In-Reply-To: <20220106213014.433782-1-christian@paral.in> (Christian Stewart's message of "Thu, 6 Jan 2022 13:30:14 -0800") References: <20220106213014.433782-1-christian@paral.in> Message-ID: <878rvrmo2g.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > View the release notes for more information: > https://go.dev/doc/devel/release.html#go1.17.minor > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Fri Jan 7 17:57:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:57:40 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gst1-plugins-bayer2rgb-neon: use "config" Message-ID: <20220107175523.D658282AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=685ef8d47a8dc8abe679600386a112f4b8bbf235 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gst1-plugins-bayer2rgb-neon doesn't have sub-options so use "config" instead of "menuconfig". Signed-off-by: S??bastien Szymanski Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in index 570300a304..d3e4d0e243 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -1,4 +1,4 @@ -menuconfig BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON +config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON bool "gst1-plugins-bayer2rgb-neon" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 # bayer2rgb-neon depends on !BR2_STATIC_LIBS # bayer2rgb-neon From thomas.petazzoni at bootlin.com Fri Jan 7 18:01:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:01:06 +0100 Subject: [Buildroot] [git commit] package/bayer2rgb-neon: introduce BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS Message-ID: <20220107175523.DE61083493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2af6bef9c11b6438338f4ddb2f968a7f0141adb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In both bayer2rgb-neon and gst1-plugins-bayer2rgb-neon, the Config.in comment was not displayed on aarch64, even though both packages are available on this architecture. To fix this, this commit introduces BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS, and makes use of it in both packages. Signed-off-by: S??bastien Szymanski [Thomas: add BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS, use it to fix both packages] Signed-off-by: Thomas Petazzoni --- package/bayer2rgb-neon/Config.in | 9 +++++++-- package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/bayer2rgb-neon/Config.in b/package/bayer2rgb-neon/Config.in index 7822171020..b0e3017b9f 100644 --- a/package/bayer2rgb-neon/Config.in +++ b/package/bayer2rgb-neon/Config.in @@ -1,6 +1,11 @@ +config BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS + bool + default y if BR2_arm && BR2_ARM_CPU_HAS_NEON + default y if BR2_aarch64 + config BR2_PACKAGE_BAYER2RGB_NEON bool "bayer2rgb-neon" - depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 + depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 @@ -12,6 +17,6 @@ config BR2_PACKAGE_BAYER2RGB_NEON https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb comment "bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" - depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in index d3e4d0e243..57bafd33e2 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON bool "gst1-plugins-bayer2rgb-neon" - depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 # bayer2rgb-neon + depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # bayer2rgb-neon depends on BR2_INSTALL_LIBSTDCPP # bayer2rgb-neon depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # bayer2rgb-neon @@ -15,6 +15,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON https://gitlab-ext.sigma-chemnitz.de/ensc/gst-bayer2rgb-neon comment "gst1-plugins-bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" - depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From thomas.petazzoni at bootlin.com Fri Jan 7 18:01:45 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:01:45 +0100 Subject: [Buildroot] [PATCH 1/2] package/gstreamer1/gst1-plugins-bayer2rgb-neon: use "config" In-Reply-To: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> References: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> Message-ID: <20220107190145.152cf1ec@windsurf> On Fri, 7 Jan 2022 15:05:45 +0100 S?bastien Szymanski wrote: > gst1-plugins-bayer2rgb-neon doesn't have sub-options so use "config" > instead of "menuconfig". > > Signed-off-by: S?bastien Szymanski > --- > package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:02:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:02:59 +0100 Subject: [Buildroot] [PATCH 2/2] package/gstreamer1/gst1-plugins-bayer2rgb-neon: show comment on aarch64 In-Reply-To: <20220107140546.1921-2-sebastien.szymanski@armadeus.com> References: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> <20220107140546.1921-2-sebastien.szymanski@armadeus.com> Message-ID: <20220107190259.5365b6ea@windsurf> Hello S?bastien, On Fri, 7 Jan 2022 15:05:46 +0100 S?bastien Szymanski wrote: > On aarch64, the Config.in comment for gst1-plugins-bayer2rgb-neon is not > shown when a dependency is missing. Fix that. > > Signed-off-by: S?bastien Szymanski > --- > package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This wasn't entirely correct, indeed the same problem exists in bayer2rgb-neon, which this package depends on. So to avoid this mistake, I've instead added a BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS blind option, and used it in both packages. Don't hesitate to double check that what I have committed is correct, of course! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Fri Jan 7 17:52:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:52:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/4th: bump to version 3.64.0 In-Reply-To: <20220104205204.3632035-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 21:52:04 +0100") References: <20220104205204.3632035-1-fontaine.fabrice@gmail.com> Message-ID: <874k6fmo0g.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Fri Jan 7 17:56:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:56:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.10.0 In-Reply-To: <20220107130507.19541-1-thomas.claveirole@green-communications.fr> References: <20220107130507.19541-1-thomas.claveirole@green-communications.fr> Message-ID: <20220107185636.3fa8681e@windsurf> On Fri, 7 Jan 2022 14:05:07 +0100 Thomas Claveirole wrote: > Signed-off-by: Thomas Claveirole > --- > package/openlayers/openlayers.hash | 2 +- > package/openlayers/openlayers.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:05:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:05:46 +0100 Subject: [Buildroot] [git commit] support/testing: add package/test_mender.py Message-ID: <20220107175940.D80247F903@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc91d35da7a04d8d28b20ba4ca32672a2dd1c736 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Create a test to check Mender client at runtime. The aim of this test is: - to check the correct execution of simple Mender commands, in a minimal environment; - to validate there is no missing dependencies for runtime. This test is not a board integration test for Mender, including well-configured bootloader, partitioning, ... Check: - the daemon is started; - the current 'artifact name' (name of the image or update) of the active partition is read, without error. For that, we need to fake (see the 'overlay' directory): - some bootloader environment variables; - the name of an update. Signed-off-by: Mikael Bourhis-Cloarec [Romain: remove single hyphen command (Mender 3.0.0)] Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_mender.py | 32 ++++++++++++++++++++++ .../rootfs-overlay/etc/mender/artifact_info | 1 + .../test_mender/rootfs-overlay/usr/bin/fw_printenv | 6 ++++ 3 files changed, 39 insertions(+) diff --git a/support/testing/tests/package/test_mender.py b/support/testing/tests/package/test_mender.py new file mode 100644 index 0000000000..fdf55ed616 --- /dev/null +++ b/support/testing/tests/package/test_mender.py @@ -0,0 +1,32 @@ +import os + +import infra.basetest + + +class TestMender(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MENDER=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_ROOTFS_OVERLAY="{}" + """.format( + # overlay to add a fake 'fw_printenv', used by Mender + infra.filepath("tests/package/test_mender/rootfs-overlay")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check if the Daemon is running + self.assertRunOk("ls /var/run/mender.pid") + self.assertRunOk("ps aux | egrep [m]ender") + + # Check if a simple Mender command is correctly executed + self.assertRunOk("mender -log-level debug show-artifact") + self.assertRunOk("mender -log-level debug show-artifact | grep 'RUNTIME_TEST_ARTIFACT_NAME'") + cmd = "mender show-artifact 2>&1 | grep -i 'err'" # Check if no 'error' among the traces + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 1) diff --git a/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info b/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info new file mode 100644 index 0000000000..4d54b8f89c --- /dev/null +++ b/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info @@ -0,0 +1 @@ +artifact_name=RUNTIME_TEST_ARTIFACT_NAME diff --git a/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv b/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv new file mode 100755 index 0000000000..c002a0f2b8 --- /dev/null +++ b/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv @@ -0,0 +1,6 @@ +#!/bin/sh + +# Fake 'fw_printenv' because UBoot is not installed: print some plausible 'key-value' +echo "bootcount=0" +echo "mender_boot_part=rootfs" +echo "upgrade_available=0" From thomas.petazzoni at bootlin.com Fri Jan 7 18:05:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:05:01 +0100 Subject: [Buildroot] [git commit] package/mender: remove single hyphen command Message-ID: <20220107175940.CC16B832FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97daba5781bf58a6476c76a2910254bd9cbd329e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Single hyphen commands has been removed since Mender 3.0.0 [1] [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 Signed-off-by: Romain Naour Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/mender/S42mender | 2 +- package/mender/mender-client.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mender/S42mender b/package/mender/S42mender index 108fecfea9..dc60f94f8b 100644 --- a/package/mender/S42mender +++ b/package/mender/S42mender @@ -25,7 +25,7 @@ start() { umask 077 start-stop-daemon -S -q -b -m -p /var/run/mender.pid \ - --exec /usr/bin/mender -- -daemon + --exec /usr/bin/mender -- daemon [ $? = 0 ] && echo "OK" || echo "FAIL" } stop() { diff --git a/package/mender/mender-client.service b/package/mender/mender-client.service index 2a5f476ee5..5539a56fd6 100644 --- a/package/mender/mender-client.service +++ b/package/mender/mender-client.service @@ -17,7 +17,7 @@ if [ -L /var/lib/mender \ mkdir -p "$(readlink /var/lib/mender)"; \ fi; \ fi' -ExecStart=/usr/bin/mender -daemon +ExecStart=/usr/bin/mender daemon Restart=on-abort [Install] From thomas.petazzoni at bootlin.com Fri Jan 7 18:05:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:05:57 +0100 Subject: [Buildroot] [PATCHv3 1/2] package/mender: remove single hyphen command In-Reply-To: <20220106153542.1668688-1-romain.naour@smile.fr> References: <20220106153542.1668688-1-romain.naour@smile.fr> Message-ID: <20220107190557.47711dfa@windsurf> On Thu, 6 Jan 2022 16:35:41 +0100 Romain Naour wrote: > Single hyphen commands has been removed since Mender 3.0.0 [1] > > [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 > > Signed-off-by: Romain Naour > Cc: Adam Duskett > --- > package/mender/S42mender | 2 +- > package/mender/mender-client.service | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:06:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:06:48 +0100 Subject: [Buildroot] [git commit] support/download/git: add missing "git lfs install" invocation for LFS support Message-ID: <20220107180129.1E5F283493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=338b2e58d46ac32ded7877e2f211515024bd881a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The original patch for commit cff428fe31 ("download/git: support Git LFS") included a call to "git lfs install" but this was a problem as it could modify ~/.gitconfig outside the dl/ tree. When this was updated it was thought that the modification to gitconfig was unnecessary because the LFS fetch and checkout steps are performed manually. Unfortunately, this is not correct and the LFS checkout fails with: Cannot checkout LFS objects, Git LFS is not installed. Add the call to "git lfs install", with the --local option so that only the repository's .git/config is modified and not the user's global ~/.gitconfig. This is also required for submodules as the parent repository's config is not inherited. Cc: Arnout Vandecappelle Cc: Vincent Fazio Signed-off-by: John Keeping Signed-off-by: Thomas Petazzoni --- support/download/git | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/download/git b/support/download/git index 41c3160099..1a1c315f73 100755 --- a/support/download/git +++ b/support/download/git @@ -209,10 +209,12 @@ fi # If there are large files then fetch them. if [ ${large_file} -eq 1 ]; then + _git lfs install --local _git lfs fetch _git lfs checkout # If there are also submodules, recurse into them, if [ ${recurse} -eq 1 ]; then + _git submodule foreach --recursive ${GIT} lfs install --local _git submodule foreach --recursive ${GIT} lfs fetch _git submodule foreach --recursive ${GIT} lfs checkout fi From thomas.petazzoni at bootlin.com Fri Jan 7 18:07:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:07:46 +0100 Subject: [Buildroot] [PATCH] download/git: fix LFS support In-Reply-To: <20220106151942.1506534-1-john@metanate.com> References: <20220106151942.1506534-1-john@metanate.com> Message-ID: <20220107190746.0b714e72@windsurf> On Thu, 6 Jan 2022 15:19:42 +0000 John Keeping wrote: > The original patch for commit cff428fe31 ("download/git: support Git > LFS") included a call to "git lfs install" but this was a problem as it > could modify ~/.gitconfig outside the dl/ tree. When this was > updated it was thought that the modification to gitconfig was > unnecessary because the LFS fetch and checkout steps are performed > manually. > > Unfortunately, this is not correct and the LFS checkout fails with: > > Cannot checkout LFS objects, Git LFS is not installed. > > Add the call to "git lfs install", with the --local option so that only > the repository's .git/config is modified and not the user's global > ~/.gitconfig. > > This is also required for submodules as the parent repository's config > is not inherited. > > Cc: Arnout Vandecappelle > Cc: Vincent Fazio > Signed-off-by: John Keeping > --- > support/download/git | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:08:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:08:08 +0100 Subject: [Buildroot] [git commit] package/file: fix build with gcc 4.8 Message-ID: <20220107180204.0658583465@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b07842e20d945649dec1815afffba253c7932211 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 5.41 in commit d38b72bcd75392a88b5100839ac410859d0a6a79: readelf.c: In function 'do_auxv_note': readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode for (size_t off = 0; off + elsize <= descsz; off += elsize) { ^ Fixes: - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/file/file.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/file/file.mk b/package/file/file.mk index 12647af8bb..62cec4b2c9 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -9,6 +9,7 @@ FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file HOST_FILE_DEPENDENCIES = host-zlib FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' +HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c From thomas.petazzoni at bootlin.com Fri Jan 7 18:08:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:08:25 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> Message-ID: <20220107190825.14a54177@windsurf> On Tue, 4 Jan 2022 21:54:55 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 5.41 in > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > readelf.c: In function 'do_auxv_note': > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Set ac_cv_prog_c99 for host as already done for target instead of > adding an upstreamable patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:08:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:08:40 +0100 Subject: [Buildroot] [git commit] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 Message-ID: <20220107180235.E9FB883465@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f27270705762b1c0c142127fb8b6007102f9c331 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 -------------------- .../0002-utils-text-scroller.cc-replace-uint.patch | 50 ---------------------- package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash | 2 +- package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 2 +- 4 files changed, 2 insertions(+), 98 deletions(-) diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch deleted file mode 100644 index f7a92f5fb2..0000000000 --- a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 -From: Grzegorz Blach -Date: Sat, 29 Aug 2020 20:48:57 +0200 -Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. - -This change allows additional flags to be added to the linker -from the command line. - -Signed-off-by: Grzegorz Blach ---- - utils/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/utils/Makefile b/utils/Makefile -index e751adc..e704442 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include - RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib - RGB_LIBRARY_NAME=rgbmatrix - RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a --LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread -+RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread - - # Imagemagic flags, only needed if actually compiled. - MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) -@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE - $(MAKE) -C $(RGB_LIBDIR) - - text-scroller: text-scroller.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) - - led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) -+ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) - - video-viewer: video-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) -+ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) - - %.o : %.cc - $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< --- -2.24.3 (Apple Git-128) - diff --git a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch deleted file mode 100644 index 627415bac8..0000000000 --- a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a56338db0f003d5236f2ce98c73a591d64a70852 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 22:57:11 +0100 -Subject: [PATCH] utils/text-scroller.cc: replace uint (#1383) - -Replace uint by uint64_t to avoid the following build failure on musl: - -text-scroller.cc: In function 'int main(int, char**)': -text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? - 220 | uint frame_counter = 0; - | ^~~~ - | rint - -Fixes: - - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/hzeller/rpi-rgb-led-matrix/commit/a56338db0f003d5236f2ce98c73a591d64a70852] ---- - utils/text-scroller.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/utils/text-scroller.cc b/utils/text-scroller.cc -index a64ba0c89..28d4f7182 100644 ---- a/utils/text-scroller.cc -+++ b/utils/text-scroller.cc -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -217,12 +218,12 @@ int main(int argc, char *argv[]) { - - struct timespec next_frame = {0, 0}; - -- uint frame_counter = 0; -+ uint64_t frame_counter = 0; - while (!interrupt_received && loops != 0) { - ++frame_counter; - offscreen_canvas->Fill(bg_color.r, bg_color.g, bg_color.b); - const bool draw_on_frame = (blink_on <= 0) -- || (frame_counter % (blink_on + blink_off) < (uint)blink_on); -+ || (frame_counter % (blink_on + blink_off) < (uint64_t)blink_on); - - if (draw_on_frame) { - if (outline_font) { diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash index 3b1cb5fd76..265e4c4249 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz +sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk index e436755121..499fb408c2 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 +RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Fri Jan 7 18:09:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:09:00 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 In-Reply-To: <20220104205746.3633354-1-fontaine.fabrice@gmail.com> References: <20220104205746.3633354-1-fontaine.fabrice@gmail.com> Message-ID: <20220107190900.20083430@windsurf> On Tue, 4 Jan 2022 21:57:46 +0100 Fabrice Fontaine wrote: > Drop patches (already in version) > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Drop second patch now that it has been applied Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:14:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:14:02 +0100 Subject: [Buildroot] [git commit] package/openipmi: fix musl build with libexecinfo Message-ID: <20220107180756.A000A826D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=feda801885091a9e41faa45aa0416afa67a0e2ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable execinfo to avoid the following musl build failure raised since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-configure.ac-add-without-execinfo-option.patch | 55 ++++++++++++++++++++++ package/openipmi/openipmi.mk | 1 + 2 files changed, 56 insertions(+) diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch new file mode 100644 index 0000000000..e1838a06f4 --- /dev/null +++ b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch @@ -0,0 +1,55 @@ +From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Jan 2022 23:27:21 +0100 +Subject: [PATCH] configure.ac: add --without-execinfo option + +Add an option to allow the user to disable execinfo to avoid the +following build failure on musl with +https://github.com/mikroskeem/libexecinfo: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' + +Fixes: + - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/openipmi/patches/36] +--- + configure.ac | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 607864b9..f369166f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, + POPTLIBS="$withval" + ) + ++tryexecinfo=yes ++AC_ARG_WITH(execinfo, ++[ --with-execinfo[[=yes|no]] Look for execinfo.], ++ if test "x$withval" = "xyes"; then ++ tryexecinfo=yes ++ elif test "x$withval" = "xno"; then ++ tryexecinfo=no ++ fi, ++) ++ + # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib + tryopenssl=yes + AC_ARG_WITH(openssl, +@@ -275,7 +285,9 @@ AM_PROG_CC_C_O + AC_PROG_LIBTOOL + AC_STDC_HEADERS + +-AC_CHECK_HEADERS(execinfo.h) ++if test "x$tryexecinfo" != "xno"; then ++ AC_CHECK_HEADERS(execinfo.h) ++fi + AC_CHECK_HEADERS([netinet/ether.h]) + AC_CHECK_HEADERS([sys/ethernet.h]) + +-- +2.34.1 + diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index ad2f2d2f4f..b3a4d90d4b 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,6 +15,7 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ + --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ From thomas.petazzoni at bootlin.com Fri Jan 7 18:14:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:14:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/openipmi: fix musl build with libexecinfo In-Reply-To: <20220104205948.3633747-1-fontaine.fabrice@gmail.com> References: <20220104205948.3633747-1-fontaine.fabrice@gmail.com> Message-ID: <20220107191419.612c37bd@windsurf> On Tue, 4 Jan 2022 21:59:48 +0100 Fabrice Fontaine wrote: > Disable execinfo to avoid the following musl build failure raised since > the addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 > > Signed-off-by: Fabrice Fontaine > --- > ...igure.ac-add-without-execinfo-option.patch | 55 +++++++++++++++++++ > package/openipmi/openipmi.mk | 1 + > 2 files changed, 56 insertions(+) > create mode 100644 package/openipmi/0002-configure.ac-add-without-execinfo-option.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:15:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:15:38 +0100 Subject: [Buildroot] [git commit] package/binutils: add patches to fix binutils bug 28735 for or1k Message-ID: <20220107180939.3DCB481882@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a1f18a85784da3e4243b1c54a18fa88f02a8a00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master After fixing binutils bug 21464, bug 28735 showed up. It got fixed very soon after my request: https://sourceware.org/pipermail/binutils/2022-January/119078.html So let's add patch and backported patches to all binutils versions to make Buildroot free from bug 28735. Unfortunately Bootlin toolchains have just been rebuilt and will fail for this bug. This happened because libgeos has been bumped few time ago and was masked by bug 21464 dependency that prevented to build. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...R_OR1K_GOT16-signed-overflow-by-using-spe.patch | 75 ++++++++++++++++++++++ ...R_OR1K_GOT16-signed-overflow-by-using-spe.patch | 75 ++++++++++++++++++++++ ...R_OR1K_GOT16-signed-overflow-by-using-spe.patch | 75 ++++++++++++++++++++++ ...R_OR1K_GOT16-signed-overflow-by-using-spe.patch | 75 ++++++++++++++++++++++ 4 files changed, 300 insertions(+) diff --git a/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..7e92e2bfd8 --- /dev/null +++ b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 51def3dc6a168d03d28e0d4e2935d9ddb2929192 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index cfa292f0032..ecb70753b6a 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1477,12 +1494,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..e96d49122a --- /dev/null +++ b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From fbab8933bca6b7dba2aa19190a71f799a370c3d4 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 2ff998066a8..3df31172fcb 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1508,12 +1525,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..c4fedb719a --- /dev/null +++ b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 190091f9c1ec4cb80f8106e45ab4125eefa4114b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 431a8ee479f..ea26cdf1033 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 362a20108782b87cd780a989c0dbd014fc2def8b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..7fd88d72442 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + false), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ false, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ false, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ false); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = true; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + From thomas.petazzoni at bootlin.com Fri Jan 7 18:15:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:15:43 +0100 Subject: [Buildroot] [git commit] toolchain: remove binutils bug 21464 Message-ID: <20220107180939.4685783493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55fcba2a7c41d29f3f93bb37eec1264af4b45fb0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Binutils bug 21464 is not present anymore in Buildroot so let's remove it and its depends on in libgeos and postgis packages. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/libgeos/Config.in | 4 +--- package/postgis/Config.in | 4 +--- toolchain/Config.in | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 5e861ab010..8411627d43 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 21464, 27597" +comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/postgis/Config.in b/package/postgis/Config.in index f4d913ece7..405c5c723a 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 # libgeos depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ @@ -19,8 +18,7 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 21464, 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/toolchain/Config.in b/toolchain/Config.in index 140d07ca38..fd005f4740 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=21464 -# Affect toolchains built with binutils 2.31.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 - bool - default y if BR2_or1k - # https://sourceware.org/bugzilla/show_bug.cgi?id=27597 # Affect toolchains built with binutils 2.36.1, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 From thomas.petazzoni at bootlin.com Fri Jan 7 18:16:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:16:05 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: add patches to fix binutils bug 28735(or1k) In-Reply-To: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> References: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> Message-ID: <20220107191605.78f71e6c@windsurf> On Sun, 2 Jan 2022 22:04:07 +0100 Giulio Benetti wrote: > After fixing binutils bug 21464, bug 28735 showed up. It got fixed very > soon after my request: > https://sourceware.org/pipermail/binutils/2022-January/119078.html > > So let's add patch and backported patches to all binutils versions to make > Buildroot free from bug 28735. Unfortunately Bootlin toolchains have just > been rebuilt and will fail for this bug. This happened because libgeos > has been bumped few time ago and was masked by bug 21464 dependency that > prevented to build. > > Signed-off-by: Giulio Benetti > --- > ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ > ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ > ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ > ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ > 4 files changed, 300 insertions(+) > create mode 100644 package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch > create mode 100644 package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch > create mode 100644 package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch > create mode 100644 package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Fri Jan 7 18:24:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 19:24:38 +0100 Subject: [Buildroot] [PATCH 1/2] package/libvirt: install in staging In-Reply-To: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 21:50:07 +0100") References: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> Message-ID: <87v8yvl7yx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Install libvirt in staging to allow collectd to use it > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 18:24:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 19:24:42 +0100 Subject: [Buildroot] [PATCH 2/2] package/collectd: add virt support In-Reply-To: <20220104205008.3631801-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 21:50:08 +0100") References: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> <20220104205008.3631801-2-fontaine.fabrice@gmail.com> Message-ID: <87r19jl7yt.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 18:23:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 19:23:04 +0100 Subject: [Buildroot] [git commit] package/libvirt: install in staging Message-ID: <20220107182140.E27B58344C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beac3aef6cf5ce9d09e5ace631faa3a3a9e41900 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Install libvirt in staging to allow collectd to use it Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 9a4788c905..41218c0e53 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -10,6 +10,7 @@ LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ LIBVIRT_LICENSE_FILES = COPYING LIBVIRT_CPE_ID_VENDOR = redhat +LIBVIRT_INSTALL_STAGING = YES LIBVIRT_DEPENDENCIES = \ host-libxslt \ host-nfs-utils \ From peter at korsgaard.com Fri Jan 7 18:23:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 19:23:16 +0100 Subject: [Buildroot] [git commit] package/collectd: add virt support Message-ID: <20220107182140.EC8C483493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=981e7b245aba835919300bb089013d3efe7e65d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 18 ++++++++++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 5e5dff6fe1..697dc51f7e 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -591,6 +591,24 @@ config BR2_PACKAGE_COLLECTD_USERS help Counts the number of users currently logged in. +config BR2_PACKAGE_COLLECTD_VIRT + bool "virt" + depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS # libvirt + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # libvirt + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 # libvirt + depends on BR2_PACKAGE_HAS_UDEV # libvirt + depends on BR2_USE_WCHAR # libvirt + select BR2_PACKAGE_LIBVIRT + select BR2_PACKAGE_LIBXML2 + help + Gather statistics about virtualized guests on a system. + +comment "virt needs udev /dev management, a toolchain w/ wchar, kernel headers >= 3.12 (4.11 for AArch64)" + depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR || \ + !(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \ + (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) + config BR2_PACKAGE_COLLECTD_VMEM bool "vmem" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 9d6f630fe3..5751757040 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -22,7 +22,7 @@ COLLECTD_PLUGINS_DISABLE = \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ - tokyotyrant turbostat uuid varnish virt vserver write_kafka \ + tokyotyrant turbostat uuid varnish vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone COLLECTD_CONF_ENV += LIBS="-lm" @@ -149,6 +149,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \ $(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \ $(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \ + $(if $(BR2_PACKAGE_COLLECTD_VIRT),--enable-virt,--disable-virt) \ $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ @@ -197,6 +198,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \ $(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ + $(if $(BR2_PACKAGE_COLLECTD_VIRT),libvirt libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) From peter at korsgaard.com Fri Jan 7 18:33:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 19:33:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcm-tools: fix static build In-Reply-To: <20220104180826.3171770-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 19:08:26 +0100") References: <20220104180826.3171770-1-fontaine.fabrice@gmail.com> Message-ID: <87mtk7l7jj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Don't build c_example which needs a dynamic library and so will raise > the following static build failure since bump to version 2021.10 in > commit d1d93d488c76d4bc2551270007096693d8194435 and > https://github.com/opcm/pcm/commit/12647a6ee579c29bd306fd034470eb62dcb3156e: > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: cannot find -lpcm > Fixes: > - http://autobuild.buildroot.org/results/1276a3d49c8848039f034e7f03632df365097e94 > Signed-off-by: Fabrice Fontaine > --- > package/pcm-tools/pcm-tools.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk > index 8a58034232..d676df57f9 100644 > --- a/package/pcm-tools/pcm-tools.mk > +++ b/package/pcm-tools/pcm-tools.mk > @@ -17,7 +17,8 @@ define PCM_TOOLS_BUILD_CMDS > touch $(@D)/daemon-binaries > $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ > CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" \ > - UNAME=Linux HOST=_LINUX > + UNAME=Linux HOST=_LINUX \ > + $(foreach f,$(PCM_TOOLS_EXE_FILES),$(f).x) This could also have used addsuffix, but OK. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 18:30:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 19:30:45 +0100 Subject: [Buildroot] [git commit] package/pcm-tools: fix static build Message-ID: <20220107182804.46EBD814EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93aa9db953f127509ed64b3a8caceca878963b6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Don't build c_example which needs a dynamic library and so will raise the following static build failure since bump to version 2021.10 in commit d1d93d488c76d4bc2551270007096693d8194435 and https://github.com/opcm/pcm/commit/12647a6ee579c29bd306fd034470eb62dcb3156e: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: cannot find -lpcm Fixes: - http://autobuild.buildroot.org/results/1276a3d49c8848039f034e7f03632df365097e94 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/pcm-tools/pcm-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index 8a58034232..d676df57f9 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -17,7 +17,8 @@ define PCM_TOOLS_BUILD_CMDS touch $(@D)/daemon-binaries $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" \ - UNAME=Linux HOST=_LINUX + UNAME=Linux HOST=_LINUX \ + $(foreach f,$(PCM_TOOLS_EXE_FILES),$(f).x) endef ifeq ($(BR2_PACKAGE_PCM_TOOLS_PMU_QUERY),y) From peter at korsgaard.com Fri Jan 7 18:39:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 19:39:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/liburing: new package In-Reply-To: <3c9b632e-aae8-5766-c961-42627109d70a@smile.fr> (Romain Naour's message of "Thu, 6 Jan 2022 15:08:08 +0100") References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> <3c9b632e-aae8-5766-c961-42627109d70a@smile.fr> Message-ID: <87iluvl79r.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: Hi, >> +++ b/package/liburing/Config.in >> @@ -0,0 +1,13 @@ >> +config BR2_PACKAGE_LIBURING >> + bool "liburing" >> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h > Is any linux-headers dependency (5.0 maybe). I believe io_uring was added in 5.1: https://kernelnewbies.org/Linux_5.1 -- Bye, Peter Korsgaard From festevam at gmail.com Fri Jan 7 18:42:05 2022 From: festevam at gmail.com (Fabio Estevam) Date: Fri, 7 Jan 2022 15:42:05 -0300 Subject: [Buildroot] [PATCH] configs/imx8mmevk_defconfig: new defconfig Message-ID: <20220107184205.971152-1-festevam@gmail.com> Add support for imx8mmevk_defconfig that allows booting a mainline kernel. This defconfig still relies on NXP ATF and U-Boot, but in the long term the plan is to switch to mainline ATF and U-Boot as well. Signed-off-by: Fabio Estevam --- DEVELOPERS | 1 + board/freescale/imx8mmevk/readme.txt | 6 ++++ configs/imx8mmevk_defconfig | 41 ++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 configs/imx8mmevk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 37c792816a1d..907600be7211 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -823,6 +823,7 @@ F: configs/imx6ullevk_defconfig F: configs/imx6ulpico_defconfig F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig +F: configs/imx8mmevk_defconfig F: configs/imx8mqevk_defconfig F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig diff --git a/board/freescale/imx8mmevk/readme.txt b/board/freescale/imx8mmevk/readme.txt index 7b69405d3030..a8e80a48f9ea 100644 --- a/board/freescale/imx8mmevk/readme.txt +++ b/board/freescale/imx8mmevk/readme.txt @@ -10,8 +10,14 @@ Build First, configure Buildroot for the i.MX8MM EVK board: +If you want to use the NXP kernel: + make freescale_imx8mmevk_defconfig +Or if you want to use a mainline kernel: + + make imx8mmevk_defconfig + Build all components: make diff --git a/configs/imx8mmevk_defconfig b/configs/imx8mmevk_defconfig new file mode 100644 index 000000000000..2b692342c559 --- /dev/null +++ b/configs/imx8mmevk_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Jan 7 18:51:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:51:36 +0100 Subject: [Buildroot] [PATCH 1/2] nodogsplash package added In-Reply-To: <20220102181525.9494-1-amrtmoh2006@gmail.com> References: <20220102181525.9494-1-amrtmoh2006@gmail.com> Message-ID: <20220107195136.183a4555@windsurf> Hello, First of all, thanks a lot for your contribution! Please see below a number of comments. It would be good if you could address those comments and send an updated version. On Sun, 2 Jan 2022 20:15:24 +0200 azxxza22 wrote: > Signed-off-by: azxxza22 We need contributions to be made under a real name. Could you adjust this? > package/Config.in | 1 + > package/nodogsplash/Config.in | 9 ++++++++ > package/nodogsplash/nodogsplash.mk | 37 ++++++++++++++++++++++++++++++ > 3 files changed, 47 insertions(+) You also need to add an entry in the DEVELOPERS file, so that we know who maintains this package. > diff --git a/package/nodogsplash/Config.in b/package/nodogsplash/Config.in > new file mode 100644 > index 0000000000..7a68bcccb0 > --- /dev/null > +++ b/package/nodogsplash/Config.in > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_NODOGSPLASH > + bool "nodogsplash" > + depends on BR2_PACKAGE_LIBMICROHTTPD This should be: select BR2_PACKAGE_LIBMICROHTTPD It would be useful to test the package with ./utils/test-pkg to make sure you have captured all toolchain dependencies. > + help > + Nodogsplash is a Captive Portal that offers > + a simple way to provide restricted access to the Internet by > + showing a splash page to the user before Internet access is granted I think this last line is too long. Could you run "make check-package" and make sure you haven't introduced new warnings? > + https://github.com/nodogsplash/nodogsplash/ > diff --git a/package/nodogsplash/nodogsplash.mk b/package/nodogsplash/nodogsplash.mk > new file mode 100644 > index 0000000000..3075b7e9f1 > --- /dev/null > +++ b/package/nodogsplash/nodogsplash.mk > @@ -0,0 +1,37 @@ > +################################################################################ > +# > +# nodogsplash > +# > +################################################################################ Empty new line needed here. > +NODOGSPLASH_VERSION = v4.5.1 Should be without the "v". > +NODOGSPLASH_SITE = git://github.com/nodogsplash/nodogsplash.git > +NODOGSPLASH_SITE_METHOD = git Instead of those two lines, use: NODOGSPLASH_SITE = $(call github,nodogsplash,nodogsplash,v$(NODOGSPLASH_VERSION)) > +NODOGSPLASH_LICENSE = GPL-2.0 > +NODOGSPLASH_LICENSE_FILES = COPYING > +NODOGSPLASH_DEPENDENCIES = libmicrohttpd > +NODOGSPLASH_INSTALL_STAGING = YES Why is this needed in staging? Does it install some library that another package will link against ? > + > +define NODOGSPLASH_BUILD_CMDS > + $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) Why is $(MAKE1) used? Isn't $(MAKE) working? Ideally, this should be: $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) > +endef > + > +define NODOGSPLASH_INSTALL_EXTRA_FILES > + mkdir -p $(TARGET_DIR)/usr/bin > + mkdir -p $(TARGET_DIR)/etc/nodogsplash/htdocs/images > + cp $(@D)/resources/nodogsplash.conf $(TARGET_DIR)/etc/nodogsplash/ > + cp $(@D)/resources/splash.html $(TARGET_DIR)/etc/nodogsplash/htdocs/ > + cp $(@D)/resources/splash.css $(TARGET_DIR)/etc/nodogsplash/htdocs/ > + cp $(@D)/resources/status.html $(TARGET_DIR)/etc/nodogsplash/htdocs/ > + cp $(@D)/resources/splash.jpg $(TARGET_DIR)/etc/nodogsplash/htdocs/images/ Use: $(INSTALL) -D -m 0644 src dst it will automatically create any missing destination directory for you. > +endef > + > +NODOGSPLASH_POST_INSTALL_TARGET_HOOKS += NODOGSPLASH_INSTALL_EXTRA_FILES There's no need for a post-install target hook, just put the commands directly inside NODOGSPLASH_INSTALL_TARGET_CMDS. > + > +define NODOGSPLASH_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/nodogsplash $(TARGET_DIR)/usr/bin > + $(INSTALL) -D -m 0755 $(@D)/ndsctl $(TARGET_DIR)/usr/bin Please use full destination paths, i.e: $(INSTALL) -D -m 0755 $(@D)/nodogsplash $(TARGET_DIR)/usr/bin/nodogsplash $(INSTALL) -D -m 0755 $(@D)/ndsctl $(TARGET_DIR)/usr/bin/ndsctl But I see the Makefile of the upstream project has an install target which seems to do the right thing. Why don't you use it? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:53:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:53:08 +0100 Subject: [Buildroot] [PATCH 2/2] hash file added In-Reply-To: <20220102181525.9494-2-amrtmoh2006@gmail.com> References: <20220102181525.9494-1-amrtmoh2006@gmail.com> <20220102181525.9494-2-amrtmoh2006@gmail.com> Message-ID: <20220107195308.282518bc@windsurf> Hello, On Sun, 2 Jan 2022 20:15:25 +0200 azxxza22 wrote: > Signed-off-by: azxxza22 > --- > package/nodogsplash/nodogsplash.hash | 2 ++ > 1 file changed, 2 insertions(+) > create mode 100644 package/nodogsplash/nodogsplash.hash This should be part of the patch adding the package. > diff --git a/package/nodogsplash/nodogsplash.hash b/package/nodogsplash/nodogsplash.hash > new file mode 100644 > index 0000000000..da059a854d > --- /dev/null > +++ b/package/nodogsplash/nodogsplash.hash > @@ -0,0 +1,2 @@ > +md5 edafdd4ef89218261f29a9074891cf7a nodogsplash-v4.5.1-br1.tar.gz > +md5 cbbd794e2a0a289b9dfcc9f513d1996e COPYING These should be sha256 hashes, and there should be a comment above that says: # Locally calculated Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 19:07:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 20:07:26 +0100 Subject: [Buildroot] [git commit] package/liburing: new package Message-ID: <20220107190148.C1E6882AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03ca6f4e39874583060317e7e15e9e360220877e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is the io_uring library, liburing. liburing provides helpers to setup and teardown io_uring instances, and also a simplified interface for applications that don't need (or want) to deal with the full kernel side implementation. https://git.kernel.dk/cgit/liburing Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/liburing/Config.in | 15 +++++++++++++++ package/liburing/liburing.hash | 8 ++++++++ package/liburing/liburing.mk | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 630196fd54..47ac7b5de6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -906,6 +906,7 @@ F: package/librsync/ F: package/libsoup/ F: package/libsoxr/ F: package/libupnp/ +F: package/liburing/ F: package/libv4l/ F: package/libxslt/ F: package/mbedtls/ diff --git a/package/Config.in b/package/Config.in index e9ee4d2ef1..193ccea1f7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2000,6 +2000,7 @@ menu "Other" source "package/libuci/Config.in" source "package/libunwind/Config.in" source "package/liburcu/Config.in" + source "package/liburing/Config.in" source "package/libuv/Config.in" source "package/lightning/Config.in" source "package/linux-pam/Config.in" diff --git a/package/liburing/Config.in b/package/liburing/Config.in new file mode 100644 index 0000000000..d65a3f1322 --- /dev/null +++ b/package/liburing/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBURING + bool "liburing" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + help + This is the io_uring library, liburing. liburing provides + helpers to setup and teardown io_uring instances, and also a + simplified interface for applications that don't need (or + want) to deal with the full kernel side implementation. + + https://git.kernel.dk/cgit/liburing + +comment "liburing needs a toolchain w/ gcc >= 4.9, headers >= 5.1" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash new file mode 100644 index 0000000000..56e90d71cc --- /dev/null +++ b/package/liburing/liburing.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 df7c8fd05fd39da622b2814e06f815f11f1beb429487a4330eed64bb7f353dbf liburing-2.1.tar.bz2 + +# Hash for license files +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 d0b225f17ef2d05d5cda6b25b2dc334ef6f5f12537c20edf6e391852a095ec19 LICENSE +sha256 97d62ff5d7cf0b1cef34c33a89877352911278ca4ac1c6c4f24a835baa5ea10b README diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk new file mode 100644 index 0000000000..a977e74b4f --- /dev/null +++ b/package/liburing/liburing.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# liburing +# +################################################################################ + +LIBURING_VERSION = 2.1 +LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 +LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot +LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT +LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README +LIBURING_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBURING_MAKE_OPTS += ENABLE_SHARED=0 +else +LIBURING_MAKE_OPTS += ENABLE_SHARED=1 +endif + +define LIBURING_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define LIBURING_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D)/src +endef + +define LIBURING_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install +endef + +define LIBURING_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Fri Jan 7 19:07:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 20:07:49 +0100 Subject: [Buildroot] [git commit] package/lxc: add liburing optional dependency Message-ID: <20220107190148.CB02E8349D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=352252149e5617e6e2c69d09f9e118786db6ffa8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master liburing is an optional dependency (enabed by default) since version 4.0.11 and https://github.com/lxc/lxc/commit/b1f9aee5c466b5a6d88582375ea15971d846d18b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lxc/lxc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4d63fc14cb..08f64bcec7 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -44,6 +44,13 @@ else LXC_CONF_OPTS += --disable-selinux endif +ifeq ($(BR2_PACKAGE_LIBURING),y) +LXC_CONF_OPTS += --enable-liburing +LXC_DEPENDENCIES += liburing +else +LXC_CONF_OPTS += --disable-liburing +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LXC_CONF_OPTS += --enable-openssl LXC_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Fri Jan 7 19:15:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 20:15:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/liburing: new package In-Reply-To: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> Message-ID: <20220107201544.39790a38@windsurf> On Tue, 4 Jan 2022 19:11:06 +0100 Fabrice Fontaine wrote: > This is the io_uring library, liburing. liburing provides helpers to > setup and teardown io_uring instances, and also a simplified interface > for applications that don't need (or want) to deal with the full kernel > side implementation. > > https://git.kernel.dk/cgit/liburing > > Signed-off-by: Fabrice Fontaine > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/liburing/Config.in | 13 ++++++++++++ > package/liburing/liburing.hash | 8 ++++++++ > package/liburing/liburing.mk | 36 ++++++++++++++++++++++++++++++++++ > 5 files changed, 59 insertions(+) > create mode 100644 package/liburing/Config.in > create mode 100644 package/liburing/liburing.hash > create mode 100644 package/liburing/liburing.mk I have applied, after adding a dependency on headers >= 5.1. I think this dependency is not strictly needed for building, because liburing apparently bundles a copy of the kernel header (if I understood correctly). But anyway, since it can't work on kernels < 5.1, this headers dependency also hints the user about this requirement. Maybe some kernel config fixup would be useful in liburing.mk, to ensure the kernel is built with the needed kernel config option; Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 19:15:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 20:15:48 +0100 Subject: [Buildroot] [PATCH 2/2] package/lxc: add liburing optional dependency In-Reply-To: <20220104181107.3171973-2-fontaine.fabrice@gmail.com> References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> <20220104181107.3171973-2-fontaine.fabrice@gmail.com> Message-ID: <20220107201548.7dde59bd@windsurf> On Tue, 4 Jan 2022 19:11:07 +0100 Fabrice Fontaine wrote: > liburing is an optional dependency (enabed by default) since version > 4.0.11 and > https://github.com/lxc/lxc/commit/b1f9aee5c466b5a6d88582375ea15971d846d18b > > Signed-off-by: Fabrice Fontaine > --- > package/lxc/lxc.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 7 19:29:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:29:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbuffer: bump to version 20211018 Message-ID: <20220107192952.1277336-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/mbuffer/mbuffer.hash | 4 ++-- package/mbuffer/mbuffer.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbuffer/mbuffer.hash b/package/mbuffer/mbuffer.hash index 7c200d543e..bab568d1d8 100644 --- a/package/mbuffer/mbuffer.hash +++ b/package/mbuffer/mbuffer.hash @@ -1,8 +1,8 @@ # From http://www.maier-komor.de/mbuffer.html -md5 4e4712db5fbd4e71bfbfa2c145c6c646 mbuffer-20210328.tgz +md5 b6787260112e3ac416c0febdb097caa8 mbuffer-20211018.tgz # Locally computed after checking signature upstream -sha256 51b5b8d8488991a55fe1dfce90130f9e47bc1ce286ba03b4f628c04b784fdc5d mbuffer-20210328.tgz +sha256 e240c1e4e4ac14c28be8c660ec47d44ce16b1e8ec92aa907ad13004ffd5db6e3 mbuffer-20211018.tgz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/mbuffer/mbuffer.mk b/package/mbuffer/mbuffer.mk index c7c4456651..bbf27579f1 100644 --- a/package/mbuffer/mbuffer.mk +++ b/package/mbuffer/mbuffer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBUFFER_VERSION = 20210328 +MBUFFER_VERSION = 20211018 MBUFFER_SOURCE = mbuffer-$(MBUFFER_VERSION).tgz MBUFFER_SITE = http://www.maier-komor.de/software/mbuffer MBUFFER_LICENSE = GPL-3.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 19:34:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:34:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: enable CONFIG_IO_URING Message-ID: <20220107193436.1278176-1-fontaine.fabrice@gmail.com> Enable CONFIG_IO_URING through LIBURING_LINUX_CONFIG_FIXUPS in case the user is also building a kernel Signed-off-by: Fabrice Fontaine --- package/liburing/liburing.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index a977e74b4f..74ce4156f8 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -11,6 +11,10 @@ LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README LIBURING_INSTALL_STAGING = YES +define LIBURING_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IO_URING) +endef + ifeq ($(BR2_STATIC_LIBS),y) LIBURING_MAKE_OPTS += ENABLE_SHARED=0 else -- 2.34.1 From bugzilla at busybox.net Fri Jan 7 19:39:32 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 07 Jan 2022 19:39:32 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #6 from Fabrice Fontaine --- FYI, patch was applied on master with https://git.buildroot.net/buildroot/commit/?id=48b77b25b71fa3c47b8d6fac1da46ea122715350 -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Fri Jan 7 19:49:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:49:56 +0100 Subject: [Buildroot] [PATCH 1/2] package/libosip2: bump to version 5.3.0 Message-ID: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> https://git.savannah.nongnu.org/cgit/osip.git/tree/ChangeLog?h=5.3.0 Signed-off-by: Fabrice Fontaine --- package/libosip2/libosip2.hash | 2 +- package/libosip2/libosip2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash index 7a08bf26a7..071ad7e61a 100644 --- a/package/libosip2/libosip2.hash +++ b/package/libosip2/libosip2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 ee3784bc8e7774f56ecd0e2ca6e3e11d38b373435115baf1f1aa0ca0bfd02bf2 libosip2-5.2.1.tar.gz +sha256 f4725916c22cf514969efb15c3c207233d64739383f7d42956038b78f6cae8c8 libosip2-5.3.0.tar.gz # Hash for license file: sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index 967602b426..2f9b7a9242 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSIP2_VERSION = 5.2.1 +LIBOSIP2_VERSION = 5.3.0 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 19:49:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:49:57 +0100 Subject: [Buildroot] [PATCH 2/2] package/libeXosip2: bump to version 5.3.0 In-Reply-To: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> References: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> Message-ID: <20220107194957.1320947-2-fontaine.fabrice@gmail.com> https://git.savannah.nongnu.org/cgit/exosip.git/tree/ChangeLog?h=5.3.0 Signed-off-by: Fabrice Fontaine --- package/libeXosip2/libeXosip2.hash | 2 +- package/libeXosip2/libeXosip2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libeXosip2/libeXosip2.hash b/package/libeXosip2/libeXosip2.hash index b88a5b4c21..5cfee3ab29 100644 --- a/package/libeXosip2/libeXosip2.hash +++ b/package/libeXosip2/libeXosip2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 87256b45a406f3c038e1e75e31372d526820366527c2af3bb89329bafd87ec42 libexosip2-5.2.1.tar.gz +sha256 5b7823986431ea5cedc9f095d6964ace966f093b2ae7d0b08404788bfcebc9c2 libexosip2-5.3.0.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index b550e293ae..86d821b02f 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEXOSIP2_VERSION = 5.2.1 +LIBEXOSIP2_VERSION = 5.3.0 # Since version 5.0, letter 'X' in library's name is in lower case LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 19:56:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:56:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/zlib-ng: bump to version 2.0.6 Message-ID: <20220107195605.1411244-1-fontaine.fabrice@gmail.com> RISC-V is supported since https://github.com/zlib-ng/zlib-ng/commit/81f1c8a41bd1427707f402450de8820816760fca https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.6 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.5 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.4 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.3 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.2 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.1 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.0 Signed-off-by: Fabrice Fontaine --- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- package/zlib/Config.in | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index 3e1dba35ba..a799cfe253 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 379723c0c954679a50d1d7df43084e2194dc51ecbc9987c889cb129d1f6734bc zlib-ng-1.9.9-b1.tar.gz +sha256 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6 zlib-ng-2.0.6.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index c56fa72d6f..fb497b8c11 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 1.9.9-b1 +ZLIB_NG_VERSION = 2.0.6 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md diff --git a/package/zlib/Config.in b/package/zlib/Config.in index 550c2efa93..d6d94889a7 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_i386 default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv default y if BR2_s390x default y if BR2_x86_64 -- 2.34.1 From marc.chalain at mailoo.org Fri Jan 7 20:08:47 2022 From: marc.chalain at mailoo.org (marc.chalain at mailoo.org) Date: Fri, 7 Jan 2022 21:08:47 +0100 (CET) Subject: [Buildroot] package/aravis: new package In-Reply-To: <20220106103759.1166357c@windsurf> Message-ID: Thank for all, I will send a new version quickly, but some questions first: > +ARAVIS_VERSION = 0.8.16 Aravis project is moving fast, there is a new version 0.8.20 already. I'm fine with this version since it was released recently: https://github.com/AravisProject/aravis/releases/tag/0.8.16 The 0.8.16 is available from June 2021. I had clearly well tested this version with several kernel configuration. What is it better ? the last version or the most tested version ? To send 0.8.20 I will need few weeks, to test. > +ARAVIS_SITE = $(call github,AravisProject,aravis,$(ARAVIS_VERSION)) > +ARAVIS_DEPENDENCIES = \ > +??? host-pkgconf \ > +??? libglib2 \ > +??? libxml2 There is a list of dependencies in the Readme: https://github.com/AravisProject/aravis/blob/main/README.md#install-dependencies-on-ubuntu-2004 especially gstreamer and plugins etc.. This rules is just for GigE Camera and not USB3Vision. I haven't tested this feature. The gstreamer is not mandator, it is only for the viewer. I am focused on Embeded system without any kind of display. If the gstreamer or libusb3 are availables, meson is able to detect and add them during the configuration process. To add as dependencies, forces to build the optionals features. What's the best ? Thank you., best regards, Marc. De : Thomas Petazzoni ? : Romain Naour Sujet : Re: [Buildroot] package/aravis: new package Date : 06/01/2022 10:37:59 Europe/Paris Copie ? : marc.chalain at mailoo.org; ???buildroot at buildroot.org; ???Eric Le Bihan ; ???Marc Chalain Hello, On Thu, 6 Jan 2022 10:24:53 +0100 Romain Naour wrote: > > diff --git a/package/aravis/Config.in b/package/aravis/Config.in > > new file mode 100644 > > index 0000000000..02c71c44da > > --- /dev/null > > +++ b/package/aravis/Config.in > > @@ -0,0 +1,16 @@ > > +config BR2_PACKAGE_ARAVIS > > +??? bool "aravis - GigE Camera" Just: bool "aravis" > > +??? depends on BR2_USE_WCHAR > > +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > > +??? depends on BR2_PACKAGE_PCRE_16 > > +??? depends on BR2_PACKAGE_PCRE_32 Please use "select" for pcre. > > +ARAVIS_LICENSE_FILES = COPYING > > +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) > > Is gettext a mandatory dependency ? > At least gettext should be in ARAVIS_DEPENDENCIES when NLS support is enabled. No, don't add gettext directly, use $(TARGET_NLS_DEPENDENCIES), which will automatically add (or not) host-gettext and/or gettext to the dependencies, depending on when it's needed or not. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Fri Jan 7 20:30:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:30:39 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: update openrisc toolchain Message-ID: <20220107202636.DF77682B53@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1fba3711d03687fb05c2c849ebe11a2761a7474 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Bootlin toolchains for the OpenRISC architecture have been rebuilt with the fix for binutils bug 28735, so let's update their definition in Buildroot. Signed-off-by: Thomas Petazzoni --- .../toolchain-external-bootlin/Config.in.options | 8 ++++---- .../toolchain-external-bootlin.hash | 16 ++++++++-------- .../toolchain-external-bootlin.mk | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 898a1ff511..94dea4a386 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -2400,7 +2400,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2021.11-1" + bool "openrisc musl bleeding-edge 2021.11-4" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -2423,7 +2423,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2021.11-1" + bool "openrisc musl stable 2021.11-4" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -2445,7 +2445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2021.11-1" + bool "openrisc uclibc bleeding-edge 2021.11-4" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -2468,7 +2468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2021.11-1" + bool "openrisc uclibc stable 2021.11-4" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 2a4c4179d4..638130d8b8 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -192,14 +192,14 @@ sha256 30d82c7ca41a0df9931a29a46ed881f21a889e9e59baf04e820c6679be87a7fb mips64 sha256 5c2dc11062f4817e81a328b12ab30be486b7e68c7c876eb45fffca72332a8804 nios2--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2021.11-1.sha256 sha256 f6f37f1e551edda0251ece8d906ed720bd8ec45da9d4b3e1d13721bdc9ef2882 nios2--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-1.sha256 -sha256 9b413c970bd3c92cd1c805e2fa1c5d86e808a18985f518be565afd9794a96c60 openrisc--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-1.sha256 -sha256 71ffaf12c0d8a317d301a236389483a12045064c088c213dd481eeab295e603d openrisc--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 85171daa8556bba550a48fe9ef7783ef465de79e2f41a2188cefea0c01dcb804 openrisc--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-1.sha256 -sha256 4f13b2ef95c3dfd886cd696de28bd29b20bc3379103fd6f76c9cf0816d34a5c6 openrisc--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-4.sha256 +sha256 9100a143a2f96c46d4d593fb25f4cab4a2efc61371f12bd1a686fbd52ee64c63 openrisc--musl--bleeding-edge-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-4.sha256 +sha256 72fce2be59c18a5b3a02f51ebb83119a0f3d29ab7f2d5cd560038ff6f94f137a openrisc--musl--stable-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-4.sha256 +sha256 ffbdedf741bcfeadaf0c52ac09af83b24eedca2e9a5fc563127c5fdbd10c79a6 openrisc--uclibc--bleeding-edge-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-4.sha256 +sha256 082ec406a6a516d582a092e63f9078e200a1e32dc24d47928f90c09b1e61819b openrisc--uclibc--stable-2021.11-4.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2021.11-1.sha256 sha256 53afdbe1e48d0c60d560db8d17042a99288661fe10eebbfcfec4e56a6c2ca594 powerpc-440fp--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2021.11-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 7093feb404..f28592272c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -583,25 +583,25 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif From thomas.petazzoni at bootlin.com Fri Jan 7 20:33:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:33:22 +0100 Subject: [Buildroot] [git commit] package/mbuffer: bump to version 20211018 Message-ID: <20220107202839.9283A82A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c86ec14d2aab1afe7815801d194d0da477e81db7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mbuffer/mbuffer.hash | 4 ++-- package/mbuffer/mbuffer.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbuffer/mbuffer.hash b/package/mbuffer/mbuffer.hash index 7c200d543e..bab568d1d8 100644 --- a/package/mbuffer/mbuffer.hash +++ b/package/mbuffer/mbuffer.hash @@ -1,8 +1,8 @@ # From http://www.maier-komor.de/mbuffer.html -md5 4e4712db5fbd4e71bfbfa2c145c6c646 mbuffer-20210328.tgz +md5 b6787260112e3ac416c0febdb097caa8 mbuffer-20211018.tgz # Locally computed after checking signature upstream -sha256 51b5b8d8488991a55fe1dfce90130f9e47bc1ce286ba03b4f628c04b784fdc5d mbuffer-20210328.tgz +sha256 e240c1e4e4ac14c28be8c660ec47d44ce16b1e8ec92aa907ad13004ffd5db6e3 mbuffer-20211018.tgz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/mbuffer/mbuffer.mk b/package/mbuffer/mbuffer.mk index c7c4456651..bbf27579f1 100644 --- a/package/mbuffer/mbuffer.mk +++ b/package/mbuffer/mbuffer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBUFFER_VERSION = 20210328 +MBUFFER_VERSION = 20211018 MBUFFER_SOURCE = mbuffer-$(MBUFFER_VERSION).tgz MBUFFER_SITE = http://www.maier-komor.de/software/mbuffer MBUFFER_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Fri Jan 7 20:33:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:33:34 +0100 Subject: [Buildroot] [git commit] package/libosip2: bump to version 5.3.0 Message-ID: <20220107202839.A8684834A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cb3475c5ad580adb9b783fd9684396281bca1fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.savannah.nongnu.org/cgit/osip.git/tree/ChangeLog?h=5.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libosip2/libosip2.hash | 2 +- package/libosip2/libosip2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash index 7a08bf26a7..071ad7e61a 100644 --- a/package/libosip2/libosip2.hash +++ b/package/libosip2/libosip2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 ee3784bc8e7774f56ecd0e2ca6e3e11d38b373435115baf1f1aa0ca0bfd02bf2 libosip2-5.2.1.tar.gz +sha256 f4725916c22cf514969efb15c3c207233d64739383f7d42956038b78f6cae8c8 libosip2-5.3.0.tar.gz # Hash for license file: sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index 967602b426..2f9b7a9242 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSIP2_VERSION = 5.2.1 +LIBOSIP2_VERSION = 5.3.0 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Fri Jan 7 20:33:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:33:29 +0100 Subject: [Buildroot] [git commit] package/liburing: enable CONFIG_IO_URING Message-ID: <20220107202839.9D94C8027C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b78e3a62477dad00a2c081883dae13d0f7e8856 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable CONFIG_IO_URING through LIBURING_LINUX_CONFIG_FIXUPS in case the user is also building a kernel Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/liburing/liburing.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index a977e74b4f..74ce4156f8 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -11,6 +11,10 @@ LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README LIBURING_INSTALL_STAGING = YES +define LIBURING_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IO_URING) +endef + ifeq ($(BR2_STATIC_LIBS),y) LIBURING_MAKE_OPTS += ENABLE_SHARED=0 else From thomas.petazzoni at bootlin.com Fri Jan 7 20:34:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:34:43 +0100 Subject: [Buildroot] [git commit] package/zlib-ng: bump to version 2.0.6 Message-ID: <20220107202839.BB31682A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d2249821d3f30202ca2a35ad24918378d9a0a0e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master RISC-V is supported since https://github.com/zlib-ng/zlib-ng/commit/81f1c8a41bd1427707f402450de8820816760fca https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.6 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.5 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.4 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.3 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.2 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.1 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- package/zlib/Config.in | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index 3e1dba35ba..a799cfe253 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 379723c0c954679a50d1d7df43084e2194dc51ecbc9987c889cb129d1f6734bc zlib-ng-1.9.9-b1.tar.gz +sha256 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6 zlib-ng-2.0.6.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index c56fa72d6f..fb497b8c11 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 1.9.9-b1 +ZLIB_NG_VERSION = 2.0.6 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md diff --git a/package/zlib/Config.in b/package/zlib/Config.in index 550c2efa93..d6d94889a7 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_i386 default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv default y if BR2_s390x default y if BR2_x86_64 From thomas.petazzoni at bootlin.com Fri Jan 7 20:33:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:33:38 +0100 Subject: [Buildroot] [git commit] package/libeXosip2: bump to version 5.3.0 Message-ID: <20220107202839.B2E97834A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7f2b73fa510fd247aaadcf250d154893bde044d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.savannah.nongnu.org/cgit/exosip.git/tree/ChangeLog?h=5.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libeXosip2/libeXosip2.hash | 2 +- package/libeXosip2/libeXosip2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libeXosip2/libeXosip2.hash b/package/libeXosip2/libeXosip2.hash index b88a5b4c21..5cfee3ab29 100644 --- a/package/libeXosip2/libeXosip2.hash +++ b/package/libeXosip2/libeXosip2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 87256b45a406f3c038e1e75e31372d526820366527c2af3bb89329bafd87ec42 libexosip2-5.2.1.tar.gz +sha256 5b7823986431ea5cedc9f095d6964ace966f093b2ae7d0b08404788bfcebc9c2 libexosip2-5.3.0.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index b550e293ae..86d821b02f 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEXOSIP2_VERSION = 5.2.1 +LIBEXOSIP2_VERSION = 5.3.0 # Since version 5.0, letter 'X' in library's name is in lower case LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip From fontaine.fabrice at gmail.com Fri Jan 7 20:33:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:33:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/libedit: bump to version 20210910-3.1 Message-ID: <20220107203332.1461209-1-fontaine.fabrice@gmail.com> Refresh patch https://www.thrysoee.dk/editline Signed-off-by: Fabrice Fontaine --- package/libedit/0001-check-bsd-functions-in-libbsd.patch | 4 ++-- package/libedit/libedit.hash | 2 +- package/libedit/libedit.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libedit/0001-check-bsd-functions-in-libbsd.patch b/package/libedit/0001-check-bsd-functions-in-libbsd.patch index 7438340d48..0af9472f17 100644 --- a/package/libedit/0001-check-bsd-functions-in-libbsd.patch +++ b/package/libedit/0001-check-bsd-functions-in-libbsd.patch @@ -1,7 +1,7 @@ configure: on Linux, the BSD functions require linking against libbsd Signed-off-by: "Fabrice Fontaine" -(Rebased against 20170329-3.1) +(Rebased against 20210910-3.1) Signed-off-by: "Yann E. MORIN" (Rebased against 20150325-3.1) Signed-off-by: Bernd Kuhls @@ -17,6 +17,6 @@ diff -durN libedit-20130712-3.1.orig/configure.ac libedit-20130712-3.1/configure +# Search for libbsd for *vis functions +AC_CHECK_LIB([bsd], [vis]) + - AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat getline vis strvis strunvis __secure_getenv secure_getenv]) + AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat vis strvis strunvis __secure_getenv secure_getenv]) # strlcpy diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index d405e47b42..6d139730e8 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071 libedit-20191231-3.1.tar.gz +sha256 6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5 libedit-20210910-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index cb18b97f6d..595a59f702 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20191231-3.1 +LIBEDIT_VERSION = 20210910-3.1 LIBEDIT_SITE = http://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 20:35:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:35:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/libnftnl: bump to version 1.2.1 Message-ID: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> https://www.netfilter.org/projects/libnftnl/files/changes-libnftnl-1.2.1.txt Signed-off-by: Fabrice Fontaine --- package/libnftnl/libnftnl.hash | 2 +- package/libnftnl/libnftnl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 9737da1878..0a183eedcf 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 90b01fddfe9be8c3245c3ba5ff5a4424a8df708828f92b2b361976b658c074f5 libnftnl-1.2.0.tar.bz2 +sha256 7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c libnftnl-1.2.1.tar.bz2 sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index eff93b895f..616afa6307 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.0 +LIBNFTNL_VERSION = 1.2.1 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPL-2.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 20:35:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:35:34 +0100 Subject: [Buildroot] [PATCH 2/2] package/nftables: bump to version 1.0.1 In-Reply-To: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> References: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> Message-ID: <20220107203534.1461378-2-fontaine.fabrice@gmail.com> Set --with-cli=readline to avoid a build failure since https://git.netfilter.org/nftables/commit/?id=b4dded0ca78df2a67245a3db1448a51207577ff1 https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.1.txt Signed-off-by: Fabrice Fontaine --- package/nftables/nftables.hash | 2 +- package/nftables/nftables.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index bbf7e5a2b1..53878abba9 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 58bf547daf967a2b88ecb4f425f126006ebde22711db806b25c1d6cf84fe45f4 nftables-1.0.0.tar.bz2 +sha256 3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423 nftables-1.0.1.tar.bz2 sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 2409eb0571..d5c16ac2be 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.0 +NFTABLES_VERSION = 1.0.1 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) @@ -21,6 +21,7 @@ NFTABLES_CONF_OPTS += --with-mini-gmp endif ifeq ($(BR2_PACKAGE_READLINE),y) +NFTABLES_CONF_OPTS += --with-cli=readline NFTABLES_DEPENDENCIES += readline NFTABLES_LIBS += -lncurses else -- 2.34.1 From thomas.petazzoni at bootlin.com Fri Jan 7 20:38:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:38:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbuffer: bump to version 20211018 In-Reply-To: <20220107192952.1277336-1-fontaine.fabrice@gmail.com> References: <20220107192952.1277336-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213855.0f6e605c@windsurf> On Fri, 7 Jan 2022 20:29:52 +0100 Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine > --- > package/mbuffer/mbuffer.hash | 4 ++-- > package/mbuffer/mbuffer.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 20:38:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:38:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: enable CONFIG_IO_URING In-Reply-To: <20220107193436.1278176-1-fontaine.fabrice@gmail.com> References: <20220107193436.1278176-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213859.54ea3b77@windsurf> On Fri, 7 Jan 2022 20:34:36 +0100 Fabrice Fontaine wrote: > Enable CONFIG_IO_URING through LIBURING_LINUX_CONFIG_FIXUPS in case the > user is also building a kernel > > Signed-off-by: Fabrice Fontaine > --- > package/liburing/liburing.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 20:39:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:39:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/libosip2: bump to version 5.3.0 In-Reply-To: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> References: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213928.18b0c875@windsurf> On Fri, 7 Jan 2022 20:49:56 +0100 Fabrice Fontaine wrote: > https://git.savannah.nongnu.org/cgit/osip.git/tree/ChangeLog?h=5.3.0 > > Signed-off-by: Fabrice Fontaine > --- > package/libosip2/libosip2.hash | 2 +- > package/libosip2/libosip2.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Both applied to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 20:39:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:39:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/zlib-ng: bump to version 2.0.6 In-Reply-To: <20220107195605.1411244-1-fontaine.fabrice@gmail.com> References: <20220107195605.1411244-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213933.506bab07@windsurf> On Fri, 7 Jan 2022 20:56:05 +0100 Fabrice Fontaine wrote: > RISC-V is supported since > https://github.com/zlib-ng/zlib-ng/commit/81f1c8a41bd1427707f402450de8820816760fca > > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.6 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.5 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.4 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.3 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.2 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.1 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.0 > > Signed-off-by: Fabrice Fontaine > --- > package/zlib-ng/zlib-ng.hash | 2 +- > package/zlib-ng/zlib-ng.mk | 2 +- > package/zlib/Config.in | 1 + > 3 files changed, 3 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 7 20:40:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:40:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/semodule-utils: bump to version 3.3 Message-ID: <20220107204054.1461571-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/semodule-utils/semodule-utils.hash | 4 ++-- package/semodule-utils/semodule-utils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index 595183924d..c252506df5 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757 semodule-utils-3.2.tar.gz +sha256 3098ec5e5f04a1dbbf4aa569b63a4570750a9fe0d4da14ce45954aa300a17063 semodule-utils-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index 426dbdb7b6..a9388f7ee8 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.2 +SEMODULE_UTILS_VERSION = 3.3 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 20:47:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:47:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: fix build with libexecinfo Message-ID: <20220107204754.1462472-1-fontaine.fabrice@gmail.com> Fix build failure raised since the addition of the libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4 Fixes: - Not autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/domoticz/domoticz.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 826e6f5e58..0d1088d395 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -41,6 +41,11 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +DOMOTICZ_DEPENDENCIES += libexecinfo +DOMOTICZ_CONF_OPTS += -DEXECINFO_LIBRARIES=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) DOMOTICZ_DEPENDENCIES += libusb DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON -- 2.34.1 From peter at korsgaard.com Fri Jan 7 20:50:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 21:50:43 +0100 Subject: [Buildroot] [git commit] package/python-mpd2: new package Message-ID: <20220107204438.524C082A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9647e423db4abcba315d37e2fe0caae32238ce2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A client interface for the Music Player Daemon. [Peter: license is LGPL-3.0+, add DEVELOPERS entry] Signed-off-by: Uladzimir Bely Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-mpd2/Config.in | 7 +++++++ package/python-mpd2/python-mpd2.hash | 5 +++++ package/python-mpd2/python-mpd2.mk | 13 +++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 47ac7b5de6..d049b99b91 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2801,6 +2801,9 @@ N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ +N: Uladzimir Bely +F: package/python-mpd2/ + N: Vadim Kochan F: package/brcm-patchram-plus/ F: package/frr/ diff --git a/package/Config.in b/package/Config.in index 193ccea1f7..3a0cc0c585 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1093,6 +1093,7 @@ menu "External python modules" source "package/python-mistune/Config.in" source "package/python-modbus-tk/Config.in" source "package/python-more-itertools/Config.in" + source "package/python-mpd2/Config.in" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in new file mode 100644 index 0000000000..823c82e52d --- /dev/null +++ b/package/python-mpd2/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MPD2 + bool "python-mpd2" + depends on BR2_PACKAGE_PYTHON3 + help + A Python MPD client library. + + https://github.com/Mic92/python-mpd2 diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash new file mode 100644 index 0000000000..83487257ee --- /dev/null +++ b/package/python-mpd2/python-mpd2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-mpd2/json +md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz +sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz +# Locally computed sha256 checksums +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk new file mode 100644 index 0000000000..f357e302fd --- /dev/null +++ b/package/python-mpd2/python-mpd2.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-mpd2 +# +################################################################################ + +PYTHON_MPD2_VERSION = 3.0.4 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 +PYTHON_MPD2_SETUP_TYPE = setuptools +PYTHON_MPD2_LICENSE = LGPL-3.0+ +PYTHON_MPD2_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From fontaine.fabrice at gmail.com Fri Jan 7 20:53:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:53:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: fix comment Message-ID: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that BR2_USE_WCHAR is due to flac dependency but flac is optional so remove this comment and add boost instead Signed-off-by: Fabrice Fontaine --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 89c53f60fa..473ac31fb1 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,7 +1,7 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac + depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC -- 2.34.1 From peter at korsgaard.com Fri Jan 7 20:50:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 21:50:35 +0100 Subject: [Buildroot] [PATCH] package/python-mpd2: new package In-Reply-To: <20220105231543.22467-1-wiselord1983@gmail.com> (Uladzimir Bely's message of "Thu, 6 Jan 2022 02:15:43 +0300") References: <20220105231543.22467-1-wiselord1983@gmail.com> Message-ID: <87ee5jl17o.fsf@dell.be.48ers.dk> >>>>> "Uladzimir" == Uladzimir Bely writes: > A client interface for the Music Player Daemon. > Signed-off-by: Uladzimir Bely > --- > package/Config.in | 1 + > package/python-mpd2/Config.in | 8 ++++++++ > package/python-mpd2/python-mpd2.hash | 5 +++++ > package/python-mpd2/python-mpd2.mk | 13 +++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-mpd2/Config.in > create mode 100644 package/python-mpd2/python-mpd2.hash > create mode 100644 package/python-mpd2/python-mpd2.mk > diff --git a/package/Config.in b/package/Config.in > index 7148639735..b9dc9b49e7 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1091,6 +1091,7 @@ menu "External python modules" > source "package/python-mistune/Config.in" > source "package/python-modbus-tk/Config.in" > source "package/python-more-itertools/Config.in" > + source "package/python-mpd2/Config.in" > source "package/python-msgfy/Config.in" > source "package/python-msgpack/Config.in" > source "package/python-multidict/Config.in" > diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in > new file mode 100644 > index 0000000000..015ca47610 > --- /dev/null > +++ b/package/python-mpd2/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_PYTHON_MPD2 > + bool "python-mpd2" > + depends on BR2_PACKAGE_PYTHON3 > + select BR2_PACKAGE_MPD # runtime This assumes that the MPD daemon must be running on the same machine as the client, which is probably not always the case, so I have removed this. > +++ b/package/python-mpd2/python-mpd2.mk > @@ -0,0 +1,13 @@ > +################################################################################ > +# > +# python-mpd2 > +# > +################################################################################ > + > +PYTHON_MPD2_VERSION = 3.0.4 > +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 > +PYTHON_MPD2_SETUP_TYPE = setuptools > +PYTHON_MPD2_LICENSE = GNU Library or Lesser General Public License (LGPL) We can be more specific than that. The license is actually version 3 (or later) of the LGPL, which is encoded as LGPL-3.0+ I also took the liberty to add an entry in DEVELOPERS for this package. Committed with these minor fixes, thanks! -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 20:59:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 21:59:45 +0100 Subject: [Buildroot] [git commit] package/mpd: fix comment Message-ID: <20220107205442.72D798349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20584d1ef270d5c1851c1cd537833ec5882edcba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that BR2_USE_WCHAR is due to flac dependency but flac is optional so remove this comment and add boost instead Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index ff2dd88d6c..eb10151df3 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,7 +1,7 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac + depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC From peter at korsgaard.com Fri Jan 7 21:00:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:00:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: fix comment In-Reply-To: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:53:14 +0100") References: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> Message-ID: <87a6g7l0qi.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that > BR2_USE_WCHAR is due to flac dependency but flac is optional so remove > this comment and add boost instead > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:01:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:01:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/semodule-utils: bump to version 3.3 In-Reply-To: <20220107204054.1461571-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:40:54 +0100") References: <20220107204054.1461571-1-fontaine.fabrice@gmail.com> Message-ID: <875yqvl0pp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/SELinuxProject/selinux/releases/tag/3.3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:01:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 22:01:17 +0100 Subject: [Buildroot] [git commit] package/semodule-utils: bump to version 3.3 Message-ID: <20220107205522.4A6A38349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fb16a85da1f5c1c34af0da4c247c79f8d76bcab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/semodule-utils/semodule-utils.hash | 4 ++-- package/semodule-utils/semodule-utils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index 595183924d..c252506df5 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757 semodule-utils-3.2.tar.gz +sha256 3098ec5e5f04a1dbbf4aa569b63a4570750a9fe0d4da14ce45954aa300a17063 semodule-utils-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index 426dbdb7b6..a9388f7ee8 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.2 +SEMODULE_UTILS_VERSION = 3.3 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 7 21:01:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:01:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libedit: bump to version 20210910-3.1 In-Reply-To: <20220107203332.1461209-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:33:32 +0100") References: <20220107203332.1461209-1-fontaine.fabrice@gmail.com> Message-ID: <871r1jl0oq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Refresh patch > https://www.thrysoee.dk/editline > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:02:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:02:12 +0100 Subject: [Buildroot] [PATCH 1/2] package/libnftnl: bump to version 1.2.1 In-Reply-To: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:35:33 +0100") References: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> Message-ID: <87wnjbjm3v.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://www.netfilter.org/projects/libnftnl/files/changes-libnftnl-1.2.1.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:02:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:02:52 +0100 Subject: [Buildroot] [PATCH 2/2] package/nftables: bump to version 1.0.1 In-Reply-To: <20220107203534.1461378-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:35:34 +0100") References: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> <20220107203534.1461378-2-fontaine.fabrice@gmail.com> Message-ID: <87sftzjm2r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set --with-cli=readline to avoid a build failure since > https://git.netfilter.org/nftables/commit/?id=b4dded0ca78df2a67245a3db1448a51207577ff1 > https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.1.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:02:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 22:02:34 +0100 Subject: [Buildroot] [git commit] package/nftables: bump to version 1.0.1 Message-ID: <20220107205655.2F4F2834C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10b8d6e512de293f60ccda989d593683b6ccc263 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set --with-cli=readline to avoid a build failure since https://git.netfilter.org/nftables/commit/?id=b4dded0ca78df2a67245a3db1448a51207577ff1 https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.1.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nftables/nftables.hash | 2 +- package/nftables/nftables.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index bbf7e5a2b1..53878abba9 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 58bf547daf967a2b88ecb4f425f126006ebde22711db806b25c1d6cf84fe45f4 nftables-1.0.0.tar.bz2 +sha256 3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423 nftables-1.0.1.tar.bz2 sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 2409eb0571..d5c16ac2be 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.0 +NFTABLES_VERSION = 1.0.1 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) @@ -21,6 +21,7 @@ NFTABLES_CONF_OPTS += --with-mini-gmp endif ifeq ($(BR2_PACKAGE_READLINE),y) +NFTABLES_CONF_OPTS += --with-cli=readline NFTABLES_DEPENDENCIES += readline NFTABLES_LIBS += -lncurses else From peter at korsgaard.com Fri Jan 7 21:02:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 22:02:06 +0100 Subject: [Buildroot] [git commit] package/libnftnl: bump to version 1.2.1 Message-ID: <20220107205655.2684D834B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a636b55f873bdd00c5aa405f00d887a3a6a0eedd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://www.netfilter.org/projects/libnftnl/files/changes-libnftnl-1.2.1.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libnftnl/libnftnl.hash | 2 +- package/libnftnl/libnftnl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 9737da1878..0a183eedcf 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 90b01fddfe9be8c3245c3ba5ff5a4424a8df708828f92b2b361976b658c074f5 libnftnl-1.2.0.tar.bz2 +sha256 7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c libnftnl-1.2.1.tar.bz2 sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index eff93b895f..616afa6307 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.0 +LIBNFTNL_VERSION = 1.2.1 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPL-2.0+ From peter at korsgaard.com Fri Jan 7 21:01:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 22:01:46 +0100 Subject: [Buildroot] [git commit] package/libedit: bump to version 20210910-3.1 Message-ID: <20220107205655.1E77082B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc1b52c53ec23ea10f5893914fb17339694b3c26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Refresh patch https://www.thrysoee.dk/editline Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libedit/0001-check-bsd-functions-in-libbsd.patch | 4 ++-- package/libedit/libedit.hash | 2 +- package/libedit/libedit.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libedit/0001-check-bsd-functions-in-libbsd.patch b/package/libedit/0001-check-bsd-functions-in-libbsd.patch index 7438340d48..0af9472f17 100644 --- a/package/libedit/0001-check-bsd-functions-in-libbsd.patch +++ b/package/libedit/0001-check-bsd-functions-in-libbsd.patch @@ -1,7 +1,7 @@ configure: on Linux, the BSD functions require linking against libbsd Signed-off-by: "Fabrice Fontaine" -(Rebased against 20170329-3.1) +(Rebased against 20210910-3.1) Signed-off-by: "Yann E. MORIN" (Rebased against 20150325-3.1) Signed-off-by: Bernd Kuhls @@ -17,6 +17,6 @@ diff -durN libedit-20130712-3.1.orig/configure.ac libedit-20130712-3.1/configure +# Search for libbsd for *vis functions +AC_CHECK_LIB([bsd], [vis]) + - AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat getline vis strvis strunvis __secure_getenv secure_getenv]) + AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat vis strvis strunvis __secure_getenv secure_getenv]) # strlcpy diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index d405e47b42..6d139730e8 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071 libedit-20191231-3.1.tar.gz +sha256 6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5 libedit-20210910-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index cb18b97f6d..595a59f702 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20191231-3.1 +LIBEDIT_VERSION = 20210910-3.1 LIBEDIT_SITE = http://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses From thomas.petazzoni at bootlin.com Fri Jan 7 21:05:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:05:52 +0100 Subject: [Buildroot] [git commit] package/avahi: add option to enable/disable default services Message-ID: <20220107205949.26CA6826D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebce685e1d60b47b8fc5490a5820b79fc3a913ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master By default, Avahi installs service definitions for SSH and SFTP, but those might not be present on all systems. This commit adds an option to control the installation of those Avahi services. Even though that potentially breaks backward compatibility with older configuration, we have chosen to make the option default to disable, which means that now the SSH and SFTP avahi services are no longer installed by default. As there is no way to tell the Avahi package not to install the service files in the first place, we have to manually remove them from the target directory. Signed-off-by: Florian Larysch [Thomas: make the option default to disabled, fix small formatting issues.] Signed-off-by: Thomas Petazzoni --- package/avahi/Config.in | 7 +++++++ package/avahi/avahi.mk | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 5e303d044e..95b01bfe92 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -42,6 +42,13 @@ config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY Enable the libdns_sd (Bonjour) compatibility library support for legacy applications. +config BR2_PACKAGE_AVAHI_DEFAULT_SERVICES + bool "install default service definitions" + depends on BR2_PACKAGE_AVAHI_DAEMON + help + Install the SSH/SFTP service definitions included with the + Avahi daemon by default. + endif comment "avahi needs a toolchain w/ threads" diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 9de6ebc4d2..13e2106014 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -193,4 +193,13 @@ endef AVAHI_POST_INSTALL_STAGING_HOOKS += AVAHI_STAGING_INSTALL_LIBDNSSD_LINK endif +ifeq ($(BR2_PACKAGE_AVAHI_DEFAULT_SERVICES),) +define AVAHI_REMOVE_DEFAULT_SERVICES + $(foreach service,ssh sftp-ssh, \ + $(RM) -f $(TARGET_DIR)/etc/avahi/services/$(service).service + ) +endef +AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_DEFAULT_SERVICES +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Fri Jan 7 21:07:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:07:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/avahi: allow disabling default services In-Reply-To: <20201204174507.8483-1-fl@n621.de> References: <20201204174507.8483-1-fl@n621.de> Message-ID: <20220107220711.2352f527@windsurf> Hello Florian, On Fri, 4 Dec 2020 18:45:08 +0100 Florian Larysch wrote: > By default, Avahi installs service definitions for SSH and SFTP, but > those might not be present on all systems. Add an option for disabling > them. > > As there is no way to tell the Avahi package not to install the service > files in the first place, we have to manually remove them from the > target directory. > > Signed-off-by: Florian Larysch > --- > package/avahi/Config.in | 8 ++++++++ > package/avahi/avahi.mk | 9 +++++++++ > 2 files changed, 17 insertions(+) I have finally applied this patch! With some changes: * I made the option default to disabled, following the discussion that took place * Fixed some formatting issues reported by "make check-package" * Used a make foreach loop instead of a shell for loop * Used $(...) to refer to the make variable instead of ${...} Thanks a lot, and sorry for the long delay! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Fri Jan 7 21:07:26 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 22:07:26 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> Hello, Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > cargo in order to support cross compiling C code within cargo. > > This commit also adds support/download/cargo-post-process to perform > the vendoring on Cargo packages. > > The _LICENSE variable of cargo packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Patrick Havelange > [Thomas: add support for host-cargo-package and vendoring] > Signed-off-by: Thomas Petazzoni > --- > package/Makefile.in | 1 + > package/pkg-cargo.mk | 153 ++++++++++++++++++++++++++++ > support/download/cargo-post-process | 38 +++++++ > 3 files changed, 192 insertions(+) > create mode 100644 package/pkg-cargo.mk > create mode 100755 support/download/cargo-post-process > > diff --git a/package/Makefile.in b/package/Makefile.in > index dae7a859fd..0ca2a5844e 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -441,3 +441,4 @@ include package/pkg-waf.mk > include package/pkg-golang.mk > include package/pkg-meson.mk > include package/pkg-qmake.mk > +include package/pkg-cargo.mk > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > new file mode 100644 > index 0000000000..bf1436a86b > --- /dev/null > +++ b/package/pkg-cargo.mk > @@ -0,0 +1,153 @@ > +################################################################################ > +# Cargo package infrastructure > +# > +# This file implements an infrastructure that eases development of package > +# .mk files for Cargo packages. It should be used for all packages that use > +# Cargo as their build system. > +# > +# See the Buildroot documentation for details on the usage of this > +# infrastructure > +# > +# In terms of implementation, this Cargo infrastructure requires the .mk file > +# to only specify metadata information about the package: name, version, > +# download URL, etc. > +# > +# We still allow the package .mk file to override what the different steps > +# are doing, if needed. For example, if _BUILD_CMDS is already defined, > +# it is used as the list of commands to perform to build the package, > +# instead of the default Cargo behaviour. The package can also define some > +# post operation hooks. > +# > +################################################################################ > + > +################################################################################ > +# inner-cargo-package -- defines how the configuration, compilation and > +# installation of a cargo package should be done, implements a few hooks > +# to tune the build process for cargo specifities and calls the generic > +# package infrastructure to generate the necessary make targets > +# > +# argument 1 is the lowercase package name > +# argument 2 is the uppercase package name, including a HOST_ prefix > +# for host packages > +# argument 3 is the uppercase package name, without the HOST_ prefix > +# for host packages > +# argument 4 is the type (target or host) > +################################################################################ > + > +define inner-cargo-package > + > +# We need host-rustc to run cargo > +$(2)_DOWNLOAD_DEPENDENCIES += host-rustc > + > +$(2)_CARGO_ENV += \ > + CARGO_HOME=$$(HOST_DIR)/share/cargo \ > + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > + CARGO_TARGET_APPLIES_TO_HOST="false" > + > +$(2)_DOWNLOAD_POST_PROCESS = cargo > +$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo > + > +# Due to vendoring, it is pretty likely that not all licenses are > +# listed in _LICENSE. > +$(2)_LICENSE += , vendored dependencies licenses probably not listed > + > +# Note: in all the steps below, we "cd" into the build directory to > +# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the > +# manifest-path. Indeed while the latter seems to work, it in fact > +# breaks in subtle ways as the way cargo searches for its > +# configuration file is based (among other rules) on the current > +# directory. This means that if cargo is started outside of a package > +# directory, its configuration file will not be taken into account. > +# > +# Also, we pass: > +# * --offline to prevent cargo from downloading anything: all > +# dependencies should have been built by the download post > +# process logic > +# * --locked to force cargo to use the Cargo.lock file, which ensures > +# that a fixed set of dependency versions is used > + > +# > +# Build step. Only define it if not already defined by the package .mk > +# file. > +# > +ifndef $(2)_BUILD_CMDS > +ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) \ > + $$(TARGET_CONFIGURE_OPTS) \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --target $$(RUSTC_TARGET_NAME) \ > + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ > + --manifest-path Cargo.toml \ > + --locked \ > + -Z target-applies-to-host \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +else # ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --release \ > + --manifest-path Cargo.toml \ > + --locked \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +endif # ifeq ($(4),target) > +endif # ifndef $(2)_BUILD_CMDS > + is _INSTALL_STAGING_CMDS is missing here ? Rust package may wand to install *.rlib files [1] (similar to .a) > +# > +# Target installation step. Only define it if not already defined by > +# the package .mk file. > +# > +ifndef $(2)_INSTALL_TARGET_CMDS > +define $(2)_INSTALL_TARGET_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ > + cargo install \ cargo install seems overingeneered and produce unwanted rebuild when packages are using cargo features [2]. meta-rust doesn't use cago install at all but use an cargo_do_install() function that use manual install commandes [3]. [1] https://doc.rust-lang.org/reference/linkage.html [2] https://github.com/rust-lang/cargo/issues/8703 [3] https://github.com/meta-rust/meta-rust/blob/master/classes/cargo.bbclass#L55 > + --target $$(RUSTC_TARGET_NAME) \ > + --offline \ > + --root $$(TARGET_DIR)/usr/ \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +ifndef $(2)_INSTALL_CMDS > +define $(2)_INSTALL_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo install \ > + --offline \ > + --root $$(HOST_DIR) \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +# Call the generic package infrastructure to generate the necessary > +# make targets > +$(call inner-generic-package,$(1),$(2),$(3),$(4)) > + > +endef > + From thomas.petazzoni at bootlin.com Fri Jan 7 21:08:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:08:05 +0100 Subject: [Buildroot] [git commit] package/qpdf: needs atomic Message-ID: <20220107210201.222E38349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abb9e8dae230dcd1024aacf53a41eed0efb06187 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master qpdf needs atomic since bump to version 10.5.0 in commit b5352c2177011ca389cbb7c68e78447549cbdaaa and https://github.com/qpdf/qpdf/commit/c5c1a028cdd3cf345046c46963fb0fdacfb2c33c: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-2/output-1/build/qpdf-10.5.0/libqpdf/build/.libs/libqpdf.a(QPDF.o): in function `QPDF::QPDF()': QPDF.cc:(.text+0x48de): undefined reference to `__atomic_fetch_add_8' Fixes: - http://autobuild.buildroot.org/results/7e18689670dcbe491c35f0597e5c3c787936263f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cups-filters/Config.in | 2 ++ package/qpdf/Config.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in index 32381e6c1f..ded99a4774 100644 --- a/package/cups-filters/Config.in +++ b/package/cups-filters/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qpdf + depends on BR2_TOOLCHAIN_HAS_ATOMIC # qpdf select BR2_PACKAGE_JPEG select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE @@ -33,6 +34,7 @@ config BR2_PACKAGE_CUPS_FILTERS comment "cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 5" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/qpdf/Config.in b/package/qpdf/Config.in index 047c4c8a75..accf2b5f34 100644 --- a/package/qpdf/Config.in +++ b/package/qpdf/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QPDF bool "qpdf" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_ZLIB select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL @@ -16,5 +17,6 @@ config BR2_PACKAGE_QPDF http://qpdf.sourceforge.net/ comment "qpdf needs a toolchain w/ C++, gcc >= 5" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From thomas.petazzoni at bootlin.com Fri Jan 7 21:08:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:08:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/qpdf: needs atomic In-Reply-To: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> References: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> Message-ID: <20220107220857.63b9a0da@windsurf> On Tue, 4 Jan 2022 22:07:27 +0100 Fabrice Fontaine wrote: > qpdf needs atomic since bump to version 10.5.0 in commit > b5352c2177011ca389cbb7c68e78447549cbdaaa and > https://github.com/qpdf/qpdf/commit/c5c1a028cdd3cf345046c46963fb0fdacfb2c33c: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-2/output-1/build/qpdf-10.5.0/libqpdf/build/.libs/libqpdf.a(QPDF.o): in function `QPDF::QPDF()': > QPDF.cc:(.text+0x48de): undefined reference to `__atomic_fetch_add_8' > > Fixes: > - http://autobuild.buildroot.org/results/7e18689670dcbe491c35f0597e5c3c787936263f > > Signed-off-by: Fabrice Fontaine > --- > package/cups-filters/Config.in | 2 ++ > package/qpdf/Config.in | 2 ++ > 2 files changed, 4 insertions(+) Applied to master, thanks. However, could you do a test build on sparcv8 ? Indeed normally when something needs atomic, it also needs to link with libatomic when available, as some architectures (such as sparcv8) have all atomic built-ins implemented in libatomic. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 21:09:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:09:11 +0100 Subject: [Buildroot] [git commit] package/rtorrent: disable execinfo Message-ID: <20220107210306.6FED48349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7fcfb71d7a2256a34554866e2b456a710b8ad0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable execinfo to avoid the following build failure raised since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: main.o: in function `do_panic(int)': /home/giuliobenetti/autobuild/run/instance-0/output-1/build/rtorrent-0.9.8/src/main.cc:606: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/10fc9016013931c58238240216c5950b23b56b30 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ded--disable-execinfo-option-to-configure.patch | 34 ++++++++++++++++++++++ package/rtorrent/rtorrent.mk | 3 ++ 2 files changed, 37 insertions(+) diff --git a/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch b/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch new file mode 100644 index 0000000000..4ff4182b61 --- /dev/null +++ b/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch @@ -0,0 +1,34 @@ +From 582e4e40256b43d3e5322168f1e1ed71ca70ab64 Mon Sep 17 00:00:00 2001 +From: rakshasa +Date: Wed, 16 Jun 2021 23:29:01 +0900 +Subject: [PATCH] Added '--disable-execinfo' option to configure. + +[Retrieved (and backported) from: +https://github.com/rakshasa/rtorrent/commit/582e4e40256b43d3e5322168f1e1ed71ca70ab64] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e3e7d3f1..0f45bc6a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,15 @@ TORRENT_WITHOUT_VARIABLE_FDSET + + AC_SYS_LARGEFILE + +-TORRENT_CHECK_EXECINFO ++AC_ARG_ENABLE(execinfo, ++ AC_HELP_STRING([--disable-execinfo], [disable libexecinfo [[default=enable]]]), ++ [ ++ if test "$enableval" = "yes"; then ++ TORRENT_CHECK_EXECINFO ++ fi ++ ],[ ++ TORRENT_CHECK_EXECINFO ++ ]) + + TORRENT_ENABLE_ARCH + TORRENT_WITH_SYSROOT + diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk index bc3afe8064..210b1d34dc 100644 --- a/package/rtorrent/rtorrent.mk +++ b/package/rtorrent/rtorrent.mk @@ -9,5 +9,8 @@ RTORRENT_SITE = http://rtorrent.net/downloads RTORRENT_DEPENDENCIES = host-pkgconf libcurl libtorrent ncurses RTORRENT_LICENSE = GPL-2.0 RTORRENT_LICENSE_FILES = COPYING +# We're patching configure.ac +RTORRENT_AUTORECONF = YES +RTORRENT_CONF_OPTS = --disable-execinfo $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Fri Jan 7 21:09:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:09:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtorrent: disable execinfo In-Reply-To: <20220105180645.388855-1-fontaine.fabrice@gmail.com> References: <20220105180645.388855-1-fontaine.fabrice@gmail.com> Message-ID: <20220107220919.74e9ab74@windsurf> On Wed, 5 Jan 2022 19:06:45 +0100 Fabrice Fontaine wrote: > Disable execinfo to avoid the following build failure raised since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: main.o: in function `do_panic(int)': > /home/giuliobenetti/autobuild/run/instance-0/output-1/build/rtorrent-0.9.8/src/main.cc:606: undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/10fc9016013931c58238240216c5950b23b56b30 > > Signed-off-by: Fabrice Fontaine > --- > ...disable-execinfo-option-to-configure.patch | 34 +++++++++++++++++++ > package/rtorrent/rtorrent.mk | 3 ++ > 2 files changed, 37 insertions(+) > create mode 100644 package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 21:09:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:09:47 +0100 Subject: [Buildroot] [git commit] package/xxhash: fix uclibc build Message-ID: <20220107210342.736A9834B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e518c47dd6a16d0dee66b208d365728453cc655 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following uclibc build failure raised since bump to version 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: xxhash.o: in function `XXH3_hashLong_128b_internal.constprop.0': (.text+0xcbc): undefined reference to `static_assert' Fixes: - http://autobuild.buildroot.org/results/559/5595b21a711b482b84e582fc9f56e5468c9eb6d6/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch new file mode 100644 index 0000000000..3b65ae1d6c --- /dev/null +++ b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch @@ -0,0 +1,29 @@ +From 6189ecd3d44a693460f86280ccf49d33cb4b18e1 Mon Sep 17 00:00:00 2001 +From: Yann Collet +Date: Sun, 26 Dec 2021 15:15:26 -0800 +Subject: [PATCH] do no longer depend on `` for XXH_STATIC_ASSERT + +since some versions are buggy. + +Use `_Static_assert` instead, which is part of the C11 language. +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1] +Signed-off-by: Fabrice Fontaine +--- + xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/xxhash.h b/xxhash.h +index 311a69c7..5dfd5c45 100644 +--- a/xxhash.h ++++ b/xxhash.h +@@ -1749,8 +1749,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else From thomas.petazzoni at bootlin.com Fri Jan 7 21:09:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:09:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: fix uclibc build In-Reply-To: <20220105180751.388943-1-fontaine.fabrice@gmail.com> References: <20220105180751.388943-1-fontaine.fabrice@gmail.com> Message-ID: <20220107220958.246f3c5f@windsurf> On Wed, 5 Jan 2022 19:07:51 +0100 Fabrice Fontaine wrote: > Fix the following uclibc build failure raised since bump to version > 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: xxhash.o: in function `XXH3_hashLong_128b_internal.constprop.0': > (.text+0xcbc): undefined reference to `static_assert' > > Fixes: > - http://autobuild.buildroot.org/results/559/5595b21a711b482b84e582fc9f56e5468c9eb6d6/build-end.log > > Signed-off-by: Fabrice Fontaine > --- > ...nd-on-assert-h-for-XXH_STATIC_ASSERT.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 7 21:16:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:16:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/qpdf: needs atomic In-Reply-To: <20220107220857.63b9a0da@windsurf> References: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> <20220107220857.63b9a0da@windsurf> Message-ID: Le ven. 7 janv. 2022 ? 22:08, Thomas Petazzoni a ?crit : > > On Tue, 4 Jan 2022 22:07:27 +0100 > Fabrice Fontaine wrote: > > > qpdf needs atomic since bump to version 10.5.0 in commit > > b5352c2177011ca389cbb7c68e78447549cbdaaa and > > https://github.com/qpdf/qpdf/commit/c5c1a028cdd3cf345046c46963fb0fdacfb2c33c: > > > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-2/output-1/build/qpdf-10.5.0/libqpdf/build/.libs/libqpdf.a(QPDF.o): in function `QPDF::QPDF()': > > QPDF.cc:(.text+0x48de): undefined reference to `__atomic_fetch_add_8' > > > > Fixes: > > - http://autobuild.buildroot.org/results/7e18689670dcbe491c35f0597e5c3c787936263f > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/cups-filters/Config.in | 2 ++ > > package/qpdf/Config.in | 2 ++ > > 2 files changed, 4 insertions(+) > > Applied to master, thanks. However, could you do a test build on > sparcv8 ? Indeed normally when something needs atomic, it also needs to > link with libatomic when available, as some architectures (such as > sparcv8) have all atomic built-ins implemented in libatomic. qpdf handles linking with atomic since version 10.0.2 and https://github.com/qpdf/qpdf/commit/66198f447f45a87718b6457756976baa8defb2fd > > Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice From arnout at mind.be Fri Jan 7 21:26:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Fri, 7 Jan 2022 22:26:08 +0100 Subject: [Buildroot] [git commit] package/python-pybind: switch to cmake package Message-ID: <20220107212044.5F31F8349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a19b822239c36cb40a632899bb5c3e848a5fc81e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pybind11 is not really a Python module; it is actually a set of headers that is used to wrap Python objects in C++. Since pybind version 2.6.1, it uses CMake internally. This causes a number of build issues for Buildroot because either no cmake is present or it is too old. pybind in fact has three parts: the C++ headers, a python module pybind11, and the tests. The python package's only purpose is to serve as a configure script for users of pybind. CMake is mainly used to build and run the tests, which use the (mock-installed) pybind11 module to find the (mock-installed) C++ headers. CMake is also used to install the headers. The setup.py script calls into CMake to install the headers and CMake support files to a temporary directory, then copies that together with the pybind11 module into the Python directory. The pybind11 module then returns the include and cmake paths relative to its install location (using __file__ to determine the install location). This is not at all compatible with how Buildroot expects things to be organised. - The include and CMake files are installed somewhere within the Python directories, where nobody will find them. - The Python module is installed for the target, but at build time Python modules are read from the host directory only. Therefore, a user of pybind can't actually load the module. To solve this, several options are possible: - Treat pybind as a host package. This causes users of pybind to build with an include path pointing into the host directory. This happens to work because pybind is a header-only library and because it is installed in a specific location which is not contaminated by other headers. However, it is philosophically wrong - a build for the target should never have an include path pointing to the host directory. - Install pybind in the usual way into staging, and add a stub module to the host directory that returns paths to the staging directory. This leaves a useless pybind11 module in the staging directory, and puts the headers and cmake files in an unusual location. In addition it is not so simple - we need to jump through hoops to make sure that cmake is called correctly when it goes through python-package. - Install the headers and cmake files using CMake, and add a (stub) python module in the host directory that points users to the staging directory. This puts the headers in the usual place (STAGING_DIR/usr/include) and still makes it possible to find them from a python package at build time. We choose the latter solution. First of all, convert to cmake-package. This installs just the headers and the cmake support files. We need to pass PYBIND11_NOPYTHON=ON because there is a cmake module that tries to find the python binary. It sometimes finds the system python, sometimes the host python. In either case, it checks whether this python's bitness and endianness correspond to that of the compiler - which generally it doesn't in cross-compilation. PYBIND_NOPYTHON bypasses this check. Install in staging and not in target. Before, it was installed to target but the python module would point to the target directory so it worked anyway; now, however, we can properly use the staging directory. Since it is no longer a python-package, the python module is not installed automatically. Install them manually in a post-staging-install hook. Since the python module is supposed to be used at build time, install it in the host directory rather than in staging. The python module normally looks in its current directory to find the include and cmake paths, but for cross-compilation this is wrong. Add a non-upstreamable patch that checks for STAGING_DIR in the environment. If it is set (which is the case in Buildroot), use that instead of the current directory. Add an explicit dependency on python3. The headers include Python.h, so any user of pybind needs to implicitly depend on python3. While we're at it, change it to support python3 only - even though pybind currently still supports python2, adding support for it in Buildroot is a little bit complicated and python2 will be removed soon anyway. Cc: Esben Haabendal Cc: Andreas Naumann Co-Developed-by: Jagan Teki Co-Developed-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-pybind11-commands.py-support-STAGING_DIR.patch | 36 ++++++++++++++++++++++ package/python-pybind/Config.in | 1 + package/python-pybind/python-pybind.mk | 19 ++++++++++-- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch new file mode 100644 index 0000000000..981a387be4 --- /dev/null +++ b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch @@ -0,0 +1,36 @@ +From 9feaba4792c1d0a28e560ae941fa9ebabbbe4013 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Fri, 7 Jan 2022 19:32:18 +0100 +Subject: [PATCH] pybind11/commands.py: support STAGING_DIR + +In Buildroot, we install build-time python scripts in the host directory +(otherwise they can't be run with host python), but when running +pybind11 --includes it should return the staging directory. + +Patch commands.py to use the STAGING_DIR environment variable instead of +the current directory, if it is set. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +Upstream-Status: N/A, Buildroot specific +--- + pybind11/commands.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pybind11/commands.py b/pybind11/commands.py +index 34dbaf8..8c4876d 100644 +--- a/pybind11/commands.py ++++ b/pybind11/commands.py +@@ -1,8 +1,8 @@ + # -*- coding: utf-8 -*- + import os + +- +-DIR = os.path.abspath(os.path.dirname(__file__)) ++DIR = os.environ.get('STAGING_DIR') or \ ++ os.path.abspath(os.path.dirname(__file__)) + + + def get_include(user=False): +-- +2.31.1 + diff --git a/package/python-pybind/Config.in b/package/python-pybind/Config.in index 604cb9ee67..27bc196e32 100644 --- a/package/python-pybind/Config.in +++ b/package/python-pybind/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYBIND bool "python-pybind" + depends on BR2_PACKAGE_PYTHON3 help PyBind is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index a6a1bdb976..4dd52003ad 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -8,6 +8,21 @@ PYTHON_PYBIND_VERSION = 2.6.1 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE -PYTHON_PYBIND_SETUP_TYPE = setuptools +PYTHON_PYBIND_INSTALL_STAGING = YES +PYTHON_PYBIND_INSTALL_TARGET = NO # Header-only library +PYTHON_PYBIND_DEPENDENCIES = python3 -$(eval $(python-package)) +PYTHON_PYBIND_CONF_OPTS = \ + -DPYBIND11_INSTALL=ON \ + -DPYBIND11_TEST=OFF \ + -DPYBIND11_NOPYTHON=ON + +PYTHON_PYBIND_INSTALL_PATH = $(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pybind11 + +define PYTHON_PYBIND_INSTALL_MODULE + mkdir -p $(PYTHON_PYBIND_INSTALL_PATH) + cp -dpf $(@D)/pybind11/*.py $(PYTHON_PYBIND_INSTALL_PATH) +endef +PYTHON_PYBIND_POST_INSTALL_STAGING_HOOKS += PYTHON_PYBIND_INSTALL_MODULE + +$(eval $(cmake-package)) From arnout at mind.be Fri Jan 7 21:26:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Fri, 7 Jan 2022 22:26:08 +0100 Subject: [Buildroot] [git commit] support/testing: add test for python-pybind Message-ID: <20220107212044.68E388177F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87f2b7004e6d40454d4b07bbe9b0058342c7767f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The way that python-pybind can be used is fairly complicated, so a runtime test for it is convenient. In addition, this test validates that the headers actually work at runtime. Signed-off-by: Guillaume W. Bres [Arnout: - Retain python3 only. - python-pybind is a target package, not host. - Select python-pybind instead of depend. - Simplify python-pybind-example package. - Check in python-pybind-example build if pybind11.get_include() produces output. - Don't use python3 -m pybind11 --includes: it includes the main python includes, which are for the host, not for the target. - Use TestPythonPackageBase instead of open-coding something imported with host python. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 ++ .../package/br2-external/python-pybind/Config.in | 1 + .../br2-external/python-pybind/external.desc | 1 + .../package/br2-external/python-pybind/external.mk | 1 + .../package/python-pybind-example/Config.in | 6 ++++ .../package/python-pybind-example/example.cpp | 16 +++++++++ .../python-pybind-example/python-pybind-example.mk | 41 ++++++++++++++++++++++ .../testing/tests/package/sample_python_pybind.py | 4 +++ .../testing/tests/package/test_python_pybind.py | 15 ++++++++ 9 files changed, 88 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d049b99b91..7874677f7e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1124,6 +1124,9 @@ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ F: package/reaver/ +F: support/testing/tests/package/br2-external/python-pybind +F: support/testing/tests/package/sample_python_pybind.py +F: support/testing/tests/package/test_python_pybind.py N: Guo Ren F: arch/Config.in.csky diff --git a/support/testing/tests/package/br2-external/python-pybind/Config.in b/support/testing/tests/package/br2-external/python-pybind/Config.in new file mode 100644 index 0000000000..70c77157b3 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in" diff --git a/support/testing/tests/package/br2-external/python-pybind/external.desc b/support/testing/tests/package/br2-external/python-pybind/external.desc new file mode 100644 index 0000000000..eef5e0f5a0 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/external.desc @@ -0,0 +1 @@ +name: PYTHON_PYBIND diff --git a/support/testing/tests/package/br2-external/python-pybind/external.mk b/support/testing/tests/package/br2-external/python-pybind/external.mk new file mode 100644 index 0000000000..3501f3135e --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in new file mode 100644 index 0000000000..1b4d1e0d2c --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE + bool "python-pybind-example" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYBIND + help + This test creates a cpp macro later used on target in python diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp new file mode 100644 index 0000000000..f2eea8e48d --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp @@ -0,0 +1,16 @@ +#include +namespace py = pybind11; + +int add (int i, int j) { + return i + j; +} + +PYBIND11_MODULE (example, m) { + // optional module description + m.doc() = "pybind11 example plugin"; + // test a module method + m.def("add", &add, "example::add adds two integer numbers"); + // test a module attribute + py::object hello = py::cast("Hello World"); + m.attr("says") = hello; +} diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk new file mode 100644 index 0000000000..a6d7e0daaf --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# python-pybind-example +# +################################################################################ + +# this builds a C++ macro "add(a,b)" +# that we expose to host-python with a custom install +# and that the python test script will later use +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = python-pybind + +PYTHON_PYBIND_EXAMPLE_PYBIND_INCLUDE = \ + $(shell $(HOST_DIR)/usr/bin/python3 -c 'import pybind11; print(pybind11.get_include())') + +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = \ + $(TARGET_CXXFLAGS) \ + -Wall -shared -std=c++11 -fPIC \ + -I$(PYTHON_PYBIND_EXAMPLE_PYBIND_INCLUDE) \ + $(shell $(STAGING_DIR)/usr/bin/python3-config --includes --libs --ldflags) + +# .so to be installed must have exact suffix +# otherwise import() in python will not work +HOST_LIB_BINARY_SUFFIX = \ + $(shell $(STAGING_DIR)/usr/bin/python3-config --extension-suffix) + +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS + if [ -z "$(PYTHON_PYBIND_EXAMPLE_PYBIND_INCLUDE)" ]; then \ + echo "pybind11.get_include() returned empty"; \ + exit 1; \ + fi + $(TARGET_CXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \ + $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp \ + -o $(@D)/example$(HOST_LIB_BINARY_SUFFIX) +endef + +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/example$(HOST_LIB_BINARY_SUFFIX) +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py new file mode 100644 index 0000000000..605c0bab15 --- /dev/null +++ b/support/testing/tests/package/sample_python_pybind.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import example +print(example.add(1, 2)) +print(example.says) diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py new file mode 100644 index 0000000000..5e3c3b9cc5 --- /dev/null +++ b/support/testing/tests/package/test_python_pybind.py @@ -0,0 +1,15 @@ +import os +import infra +import subprocess +from tests.package.test_python import TestPythonPackageBase + +class TestPythonPybind (TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y + """ + sample_scripts = ["tests/package/sample_python_pybind.py"] + # ship examples macro & installs it to host + br2_external = [infra.filepath("tests/package/br2-external/python-pybind")] From yann.morin.1998 at free.fr Fri Jan 7 21:31:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 22:31:10 +0100 Subject: [Buildroot] [PATCH v1 00/30] Add Chromium Embedded Framework library In-Reply-To: <20191205171517.96639-1-michael.drake@codethink.co.uk> References: <20191205171517.96639-1-michael.drake@codethink.co.uk> Message-ID: <20220107213110.GA1881783@scaer> Michael, Thomas, All, On 2019-12-05 17:14 +0000, Michael Drake spake thusly: > This patch series adds the Chromium Embedded Framework library to > Buildroot. We've discussed this series with the other maintainers today, and all we can say is that we are very sorry that we could not address it earlier. You are more than aware that this is a huge series, with a lot of complicated packages. I did not have the guts to delve into it initially, and as more time passed, I dreaded even more going back and look at it. The other maintainers also felt similarly... On the other hand, except for Romain who dared two comments, no one else ever replied or even pushed forward on that series; no one ever even sent a reply stating it was tested and worked for them.. It would have been nice to have chromium in the tree, I agree, but this is so big a stack that it is very hard to grasp and understand all that is going on in there... As a consequence, we have marked this series as rejected in patchwork... Thank you for contribution. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd.kuhls at t-online.de Fri Jan 7 21:32:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 7 Jan 2022 22:32:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-vdr-vnsi: bump version to 19.0.2-Matrix Message-ID: <20220107213253.75709-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index c6223fc8e4..4cd1f7ad6b 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz +sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index b281f00f19..65e69d2b23 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md -- 2.30.2 From ju.o at free.fr Fri Jan 7 21:35:01 2022 From: ju.o at free.fr (Julien Olivain) Date: Fri, 07 Jan 2022 22:35:01 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <20220105142924.4b11ed83@windsurf> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> Message-ID: Hi Thomas, Thierry, I would like to share some info about ROS in Buildroot. On 05/01/2022 14:29, Thomas Petazzoni wrote: > Hello Thierry, > > On Wed, 5 Jan 2022 10:46:46 +0100 > Thierry Bultel wrote: > >> For a number of companies, I can see a growing interest in having ros2 >> support in buildroot. >> Currently, people wanting to prototype (or make a product) a robotics >> applications, are stuck >> to either yocto, or, worse, to a desktop-like distribution. [...] >> What are your thought about these both packages ? Any ideas, or links >> to >> some WIP stuff ? > > These packages would certainly be very welcome. ROS2 especially makes a > lot of sense. > > Some prior work: > > https://github.com/mchalain/br_ros > http://lists.busybox.net/pipermail/buildroot/2019-March/246497.html > > I'll be happy to help in the review of such packages. In the context of the HoverGames https://www.hovergames.com/ drone challenge, I used ROS1 Noetic (last version for ROS1 series) with Buildroot on various boards (EMCraft NavQ, Technexion pico-pi, QEmu aarch64 and RV64). My actual need was the minimal dependencies to run "mavros" (at that time, mavros was not available for ROS2). I published my code here, for information: https://github.com/jolivain/buildroot/commits/navq See the demo defconfigs: https://github.com/jolivain/buildroot/commit/a50de54e721910a00ebe7192e37661cc0ad81b37 ROS1 can be tested in qemu Aarch64 virt with: make ros_defconfig make ./output/images/start-qemu.sh Login as root, then run a ros tutorial: roslaunch roscpp_tutorials talker_listener.launch or launch mavros: roslaunch mavros px4.launch fcu_url:=tcp-l://localhost While doing that, I did minor upstreaming work to let ROS play nicer with Buildroot, for example: https://github.com/ros-infrastructure/rospkg/commit/5ab4408e65f01bbb48971f6264f6c890b89cefa9 and few other buildroot fixes or updates. Prior that work, I was aware of a previous integration, like this one: https://github.com/flatmax/buildroot.rk3399.external/tree/master/package/rockchip/ros It was a bit outdated for what I wanted to do. I took some examples from it. While my Buildroot patches were sufficient to fulfill my needs, I don't think they were good enough to be upstreamed. Moreover, ROS1 Noetic is the last LTS version which will be EOL in 2025. See: https://wiki.ros.org/Distributions#List_of_Distributions This is why I didn't submitted my patches to Buildroot. For the next 2022 edition of the HoverGames challenge, I would like to switch to ROS2 in Buildroot. I'm currently exploring ways to regenerate ROS2 buildroot recipes automatically, using the ROS infrastructure packages. I believe this is the way the Gentoo and Yocto/OpenEmbedded recipes are currently generated. See: https://github.com/ros-infrastructure/superflore https://github.com/ros-infrastructure/superflore/tree/master/superflore/generators My current idea would be to: - Add in Buildroot the minimum changes, if needed (minimal infra things like pkg-catkin, other non-ROS package dependencies) - Propose a "buildroot" generator in superflore upstream that create an maintain some of the ROS2 recipes. Comments, ideas and suggestions are welcome! Do not hesitate to contact me to discuss that topic. Best regards, Julien. From thomas.petazzoni at bootlin.com Fri Jan 7 21:36:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:36:24 +0100 Subject: [Buildroot] [PATCH 1/3] package/refpolicy: Add patches pending the next release In-Reply-To: <20210107135307.1762186-2-maxime.chevallier@bootlin.com> References: <20210107135307.1762186-1-maxime.chevallier@bootlin.com> <20210107135307.1762186-2-maxime.chevallier@bootlin.com> Message-ID: <20220107223624.3ba7d348@windsurf> Hello Maxime, On Thu, 7 Jan 2021 14:53:05 +0100 Maxime Chevallier wrote: > In order to be able to run a basic system in enforcing mode, we need to > apply a few patches on top of RELEASE_2_20200818. > > This allows us to fix a few pending issues, most notably with systemd v246. > > Patch 0001 is a squash of a few patches written by Antoine Tenart that > are already in the refpolicy master branch. > > Patches 2, 3 and 4 are also in the master branch, and are needed by > subsequen patches so that systemd-tmpfiles and agetty can make use of > nsswitch. > > Patches 5 and 6 are part of a pull-request that haven't been merged yet, > that addresses the issues with agetty and systemd-tmpfiles : > https://github.com/SELinuxProject/refpolicy/pull/330 > > Patch 7 fixes the current issue with systemd v246 that is related to > sytemd-udevd now being a symlink to udevadm. > > The fix for that has been submitted on the refpolicy mailing-list, with > the review process ongoing : > https://lore.kernel.org/selinux-refpolicy/2b5b0f1e-2576-23f4-4ab4-26f8fcfb2c30 at ieee.org/T/#t > > Finally, Patch 8 addresses issues for which there's no clear strategy > yet for upstreaming in the refpolicy. So now, all of the patches except patch 8 are in upstream refpolicy, which is good. However, this patch 8 is really not good, it doesn't document anything about why those fixes are needed. I think it would be acceptable to have out of tree refpolicy patches, but they should be just a mixed bag of fixes all in a single patch that just says "Buildroot fixes". We need that patch 8 to be split up into multiple patches, each with a proper explanation of what it is fixing. Perhaps this would also help with the upstreaming. So I'm afraid we can't merge this patch series as it is, just because patch 8 isn't properly explained/detailed. Maxime: do you have that patch 8 broken down into smaller pieces with reasonable explanation about each piece? I really would like to see this being finalized. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Fri Jan 7 21:38:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:38:45 +0100 Subject: [Buildroot] [PATCH v8 4/5] support/testing: add python-pybind11 test In-Reply-To: <20200407111515.21131-5-jagan@amarulasolutions.com> References: <20200407111515.21131-1-jagan@amarulasolutions.com> <20200407111515.21131-5-jagan@amarulasolutions.com> Message-ID: On 07/04/2020 13:15, Jagan Teki wrote: > From: Adam Duskett > > This test is a simple integration test of the python-pybind11 package. > > It consists of the following: > - The python-pybind11-addition-example package compiles a simple cpp file > which adds two given numbers together and returns the results and installs > the compiled file to /root/ > This example is from the following URL: > https://pybind11.readthedocs.io/en/stable/basics.html > > - The python-pybind11-addition-example package installs the > sample_python_pybind11.py file which imports the above-compiled file and adds > 1 and 2 together to /root/ > > - Execute the sample_python_pybind11.py in an emulator with the expected output > of 3 and an exit code of 0. > > Signed-off-by: Adam Duskett > [jagan: rebase, fix trailing whitespace, new line warninings] > Signed-off-by: Jagan Teki I applied a heavily modified version of this to master. Unfortunately, Guillaume had posted a new version of this patch but had taken authorship of it, and I hadn't noticed that Adam was in fact the author. So it has gone in with just Guillaume as author and without credit to Adam or Jagan. Sorry for that. Regards, Arnout > --- > Changes for v8 > - new patch > > .gitlab-ci.yml | 2 + > DEVELOPERS | 2 + > .../br2-external/python-pybind11/Config.in | 1 + > .../python-pybind11/external.desc | 1 + > .../br2-external/python-pybind11/external.mk | 1 + > .../Config.in | 5 ++ > .../pybind11_addition_example.cpp | 9 +++ > .../python-pybind11-addition-example.mk | 39 ++++++++++ > .../sample_python_pybind11.py | 4 + > .../tests/package/test_python_pybind11.py | 76 +++++++++++++++++++ > 10 files changed, 140 insertions(+) > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/Config.in > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/external.desc > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/external.mk > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/Config.in > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/pybind11_addition_example.cpp > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/python-pybind11-addition-example.mk > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/sample_python_pybind11.py > create mode 100644 support/testing/tests/package/test_python_pybind11.py > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index d9519c3812..ce524337cb 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -471,6 +471,8 @@ tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test > tests.package.test_python_passlib.TestPythonPy3Passlib: { extends: .runtime_test } > tests.package.test_python_pexpect.TestPythonPy2Pexpect: { extends: .runtime_test } > tests.package.test_python_pexpect.TestPythonPy3Pexpect: { extends: .runtime_test } > +tests.package.test_python_pybind11.TestPythonPy2Pybind11: { extends: .runtime_test } > +tests.package.test_python_pybind11.TestPythonPy3Pybind11: { extends: .runtime_test } > tests.package.test_python_pynacl.TestPythonPy2Pynacl: { extends: .runtime_test } > tests.package.test_python_pynacl.TestPythonPy3Pynacl: { extends: .runtime_test } > tests.package.test_python_pyyaml.TestPythonPy2Pyyaml: { extends: .runtime_test } > diff --git a/DEVELOPERS b/DEVELOPERS > index 308a59b264..f06d54a662 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -85,6 +85,8 @@ F: package/sngrep/ > F: package/spidermonkey/ > F: package/systemd/ > F: support/testing/tests/package/test_python_gobject.py > +F: support/testing/tests/package/br2-external/python-pybind11/ > +F: support/testing/tests/package/test_python_pybind11.py > > N: Adam Heinrich > F: package/jack1/ > diff --git a/support/testing/tests/package/br2-external/python-pybind11/Config.in b/support/testing/tests/package/br2-external/python-pybind11/Config.in > new file mode 100644 > index 0000000000..27b502313b > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/Config.in > @@ -0,0 +1 @@ > +source "$BR2_EXTERNAL_PYTHON_PYBIND11_PATH/package/python-pybind11-addition-example/Config.in" > diff --git a/support/testing/tests/package/br2-external/python-pybind11/external.desc b/support/testing/tests/package/br2-external/python-pybind11/external.desc > new file mode 100644 > index 0000000000..04a636053a > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/external.desc > @@ -0,0 +1 @@ > +name: PYTHON_PYBIND11 > diff --git a/support/testing/tests/package/br2-external/python-pybind11/external.mk b/support/testing/tests/package/br2-external/python-pybind11/external.mk > new file mode 100644 > index 0000000000..db34e5f54d > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/external.mk > @@ -0,0 +1 @@ > +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND11_PATH)/package/*/*.mk)) > diff --git a/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/Config.in b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/Config.in > new file mode 100644 > index 0000000000..7860559a13 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/Config.in > @@ -0,0 +1,5 @@ > +config BR2_PACKAGE_PYTHON_PYBIND11_ADDITION_EXAMPLE > + bool "python-pybind11 addition example" > + depends on BR2_PACKAGE_PYTHON_PYBIND11 > + help > + Simple class for testing python-pybind11 > diff --git a/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/pybind11_addition_example.cpp b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/pybind11_addition_example.cpp > new file mode 100644 > index 0000000000..61b3fce051 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/pybind11_addition_example.cpp > @@ -0,0 +1,9 @@ > +#include > + > +int add(int i, int j) { > + return i + j; > +} > + > +PYBIND11_MODULE(pybind11_addition_example, m) { > + m.def("add", &add, "A function which adds two numbers"); > +} > diff --git a/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/python-pybind11-addition-example.mk b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/python-pybind11-addition-example.mk > new file mode 100644 > index 0000000000..f620424fca > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/python-pybind11-addition-example.mk > @@ -0,0 +1,39 @@ > +################################################################################ > +# > +# python-pybind11_addition_example > +# > +################################################################################ > + > +PYTHON_PYBIND11_ADDITION_EXAMPLE_DEPENDENCIES = python-pybind11 > + > +ifeq ($(BR2_PACKAGE_PYTHON),y) > +PYTHON_PYBIND11_ADDITION_EXAMPLE_INCLUDES=`$(STAGING_DIR)/usr/bin/python2-config --includes` > +PYTHON_PYBIND11_ADDITION_EXAMPLE_SUFFIX=`$(STAGING_DIR)/usr/bin/python2-config --extension-suffix` > +else > +PYTHON_PYBIND11_ADDITION_EXAMPLE_INCLUDES=`$(STAGING_DIR)/usr/bin/python3-config --includes` > +PYTHON_PYBIND11_ADDITION_EXAMPLE_SUFFIX=`$(STAGING_DIR)/usr/bin/python3-config --extension-suffix` > +endif > +PYTHON_PYBIND11_ADDITION_EXAMPLE_OUTPUT=pybind11_addition_example$(PYTHON_PYBIND11_ADDITION_EXAMPLE_SUFFIX) > + > +define PYTHON_PYBIND11_ADDITION_EXAMPLE_BUILD_CMDS > + $(INSTALL) -D $(PYTHON_PYBIND11_ADDITION_EXAMPLE_PKGDIR)/pybind11_addition_example.cpp \ > + $(@D)/pybind11_addition_example.cpp > + > + $(INSTALL) -D $(PYTHON_PYBIND11_ADDITION_EXAMPLE_PKGDIR)/sample_python_pybind11.py \ > + $(@D)/sample_python_pybind11.py > + > + cd $(@D); \ > + $(TARGET_CXX) -std=c++11 -fPIC -shared \ > + $(PYTHON_PYBIND11_ADDITION_EXAMPLE_INCLUDES) pybind11_addition_example.cpp \ > + -o $(PYTHON_PYBIND11_ADDITION_EXAMPLE_OUTPUT) > +endef > + > +define PYTHON_PYBIND11_ADDITION_EXAMPLE_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 755 $(@D)/$(PYTHON_PYBIND11_ADDITION_EXAMPLE_OUTPUT) \ > + $(TARGET_DIR)/root/$(PYTHON_PYBIND11_ADDITION_EXAMPLE_OUTPUT) > + > + $(INSTALL) -D -m 755 $(@D)/sample_python_pybind11.py \ > + $(TARGET_DIR)/root/sample_python_pybind11.py > +endef > + > +$(eval $(generic-package)) > diff --git a/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/sample_python_pybind11.py b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/sample_python_pybind11.py > new file mode 100644 > index 0000000000..29196481e1 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/sample_python_pybind11.py > @@ -0,0 +1,4 @@ > +#!/usr/bin/env python > +import pybind11_addition_example > + > +print(pybind11_addition_example.add(1, 2)) > diff --git a/support/testing/tests/package/test_python_pybind11.py b/support/testing/tests/package/test_python_pybind11.py > new file mode 100644 > index 0000000000..12bd77807e > --- /dev/null > +++ b/support/testing/tests/package/test_python_pybind11.py > @@ -0,0 +1,76 @@ > +import os > +import infra.basetest > + > +class TestPythonPy2Pybind11(infra.basetest.BRTest): > + br2_external = [infra.filepath("tests/package/br2-external/python-pybind11")] > + config = \ > + """ > + BR2_aarch64=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > + BR2_LINUX_KERNEL=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.86" > + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_GZIP=y > + BR2_PACKAGE_PYTHON=y > + BR2_PACKAGE_PYTHON_PYBIND11=y > + BR2_PACKAGE_PYTHON_PYBIND11_ADDITION_EXAMPLE=y > + """ > + > + def login(self): > + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") > + kern = os.path.join(self.builddir, "images", "Image") > + self.emulator.boot(arch="aarch64", > + kernel=kern, > + kernel_cmdline=["console=ttyAMA0"], > + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) > + self.emulator.login() > + > + def test_run(self): > + self.login() > + cmd = "python sample_python_pybind11.py" > + output, exit_code = self.emulator.run(cmd, 120) > + print(output) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output, ["3"]) > + > +class TestPythonPy3Pybind11(infra.basetest.BRTest): > + br2_external = [infra.filepath("tests/package/br2-external/python-pybind11")] > + config = \ > + """ > + BR2_aarch64=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > + BR2_LINUX_KERNEL=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.86" > + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_GZIP=y > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_PYBIND11=y > + BR2_PACKAGE_PYTHON_PYBIND11_ADDITION_EXAMPLE=y > + """ > + > + def login(self): > + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") > + kern = os.path.join(self.builddir, "images", "Image") > + self.emulator.boot(arch="aarch64", > + kernel=kern, > + kernel_cmdline=["console=ttyAMA0"], > + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) > + self.emulator.login() > + > + def test_run(self): > + self.login() > + cmd = "python3 sample_python_pybind11.py" > + output, exit_code = self.emulator.run(cmd, 120) > + print(output) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output, ["3"]) > From fontaine.fabrice at gmail.com Fri Jan 7 21:37:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:37:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/matchbox-lib: bump to version 1.12 Message-ID: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> Drop second and third patches (already in version) Signed-off-by: Fabrice Fontaine --- package/matchbox-lib/0002-libpng15.patch | 26 ------------------- .../matchbox-lib/0003-include-setjmp-h.patch | 17 ------------ package/matchbox-lib/matchbox-lib.hash | 3 +-- package/matchbox-lib/matchbox-lib.mk | 6 +++-- 4 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 package/matchbox-lib/0002-libpng15.patch delete mode 100644 package/matchbox-lib/0003-include-setjmp-h.patch diff --git a/package/matchbox-lib/0002-libpng15.patch b/package/matchbox-lib/0002-libpng15.patch deleted file mode 100644 index 3d68573b5f..0000000000 --- a/package/matchbox-lib/0002-libpng15.patch +++ /dev/null @@ -1,26 +0,0 @@ -Support for libpng 1.5+ shamelessly taken from Gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/libmb/mbpixbuf.c -+++ b/libmb/mbpixbuf.c -@@ -247,7 +247,7 @@ - return NULL; - } - -- if ( setjmp( png_ptr->jmpbuf ) ) { -+ if ( setjmp( png_jmpbuf(png_ptr) ) ) { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL); - fclose(fd); - return NULL; -@@ -269,8 +269,8 @@ - ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) - png_set_gray_to_rgb(png_ptr); - -- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA -- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA -+ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA -+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA - ) - *has_alpha = 1; - else diff --git a/package/matchbox-lib/0003-include-setjmp-h.patch b/package/matchbox-lib/0003-include-setjmp-h.patch deleted file mode 100644 index 72e1e45d8f..0000000000 --- a/package/matchbox-lib/0003-include-setjmp-h.patch +++ /dev/null @@ -1,17 +0,0 @@ -matchbox-lib: include setjmp.h - -Based on this upstream patch: - - http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d - -Signed-off-by: Vicente Olivert Riera ---- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000 -+++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000 -@@ -22,6 +22,7 @@ - - #include - #include "mbpixbuf.h" -+#include - - #define BYTE_ORD_24_RGB 0 - #define BYTE_ORD_24_RBG 1 diff --git a/package/matchbox-lib/matchbox-lib.hash b/package/matchbox-lib/matchbox-lib.hash index d48fb32043..8144c10258 100644 --- a/package/matchbox-lib/matchbox-lib.hash +++ b/package/matchbox-lib/matchbox-lib.hash @@ -1,4 +1,3 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5 -md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 # Locally computed +sha256 5c7795e46c24d848a2b960f3b994911165d95e5d5731e39105ee0d808d2373eb libmatchbox-1.12.tar.bz2 sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk index 5541867699..00ca4a0d15 100644 --- a/package/matchbox-lib/matchbox-lib.mk +++ b/package/matchbox-lib/matchbox-lib.mk @@ -4,11 +4,13 @@ # ################################################################################ -MATCHBOX_LIB_VERSION = 1.9 +MATCHBOX_LIB_VERSION = 1.12 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2 -MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION) +MATCHBOX_LIB_SITE = http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot MATCHBOX_LIB_LICENSE = LGPL-2.1+ MATCHBOX_LIB_LICENSE_FILES = COPYING +# From git +MATCHBOX_LIB_AUTORECONF = YES MATCHBOX_LIB_INSTALL_STAGING = YES MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 21:37:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:37:41 +0100 Subject: [Buildroot] [PATCH 2/2] package/matchbox-fakekey: bump to version 0.3 In-Reply-To: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> References: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213741.1668818-2-fontaine.fabrice@gmail.com> Use src/libfakekey.c as the license file because there is no COPYING in the git tarball Signed-off-by: Fabrice Fontaine --- package/matchbox-fakekey/matchbox-fakekey.hash | 5 ++--- package/matchbox-fakekey/matchbox-fakekey.mk | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/matchbox-fakekey/matchbox-fakekey.hash b/package/matchbox-fakekey/matchbox-fakekey.hash index 516e0b6362..3627b13913 100644 --- a/package/matchbox-fakekey/matchbox-fakekey.hash +++ b/package/matchbox-fakekey/matchbox-fakekey.hash @@ -1,4 +1,3 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2.md5 -md5 83dbde4d77e8baf0176fe4291d8a2303 libfakekey-0.1.tar.bz2 # Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 4e2fdc9bc20df469d53885c40e104122140131e06d4c184902070ec0b0f2ca9f libfakekey-0.3.tar.bz2 +sha256 3271662131760e9b30dd92495a0ea0b598fc457798cc67948947365299dd607d src/libfakekey.c diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk index e607c48c15..99921ef8e7 100644 --- a/package/matchbox-fakekey/matchbox-fakekey.mk +++ b/package/matchbox-fakekey/matchbox-fakekey.mk @@ -4,11 +4,14 @@ # ################################################################################ -MATCHBOX_FAKEKEY_VERSION = 0.1 +MATCHBOX_FAKEKEY_VERSION = 0.3 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2 -MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION) +MATCHBOX_FAKEKEY_SITE = \ + http://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot MATCHBOX_FAKEKEY_LICENSE = GPL-2.0+ -MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING +MATCHBOX_FAKEKEY_LICENSE_FILES = src/libfakekey.c +# From git +MATCHBOX_FAKEKEY_AUTORECONF = YES MATCHBOX_FAKEKEY_INSTALL_STAGING = YES MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat -- 2.34.1 From romain.naour at smile.fr Fri Jan 7 21:46:00 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 22:46:00 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 250.1 Message-ID: <20220107214600.54727-1-romain.naour@smile.fr> Remove upstream patch Fixes a build issue with toolchains using kernel headers < 5.6, when the openat2(2) syscall is not available [2]. Add a new patch to fix homework-mount with linux-headers < 5.2. [1] https://github.com/systemd/systemd-stable/commit/cd88d010e862d26ce816eb3bd6735a80999ac41e [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fddb5d430ad9fa91b49b1d34d0202ffe2fa0e179 Signed-off-by: Romain Naour Cc: Norbert Lange Cc: Yann E. MORIN --- ...define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 ++++++++ ...ll-define-all-MOUNT_ATTR_-if-missing.patch | 84 ------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 4 files changed, 35 insertions(+), 86 deletions(-) create mode 100644 package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch delete mode 100644 package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch new file mode 100644 index 0000000000..0934886acb --- /dev/null +++ b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch @@ -0,0 +1,33 @@ +From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 7 Jan 2022 22:25:23 +0100 +Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing + +MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] +but it's defined in kernel headers since version 5.2. + +[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 + +Signed-off-by: Romain Naour +--- + src/basic/missing_syscall.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h +index 8267b1a90c..793d111c55 100644 +--- a/src/basic/missing_syscall.h ++++ b/src/basic/missing_syscall.h +@@ -569,6 +569,10 @@ static inline int missing_open_tree( + #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ + #endif + ++#ifndef MOVE_MOUNT_T_EMPTY_PATH ++#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ ++#endif ++ + static inline int missing_move_mount( + int from_dfd, + const char *from_pathname, +-- +2.31.1 + diff --git a/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch b/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch deleted file mode 100644 index d0c4f6eaa0..0000000000 --- a/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0764e3a327573e7bda2f0e1a914f28482ab00574 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Fri, 24 Dec 2021 09:15:51 +0900 -Subject: [PATCH] missing-syscall: define all MOUNT_ATTR_* if missing - -Fixes #21876. - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -0764e3a327573e7bda2f0e1a914f28482ab00574] ---- - src/basic/missing_syscall.h | 48 ++++++++++++++++++++++++++++++++----- - 1 file changed, 42 insertions(+), 6 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 3da30e6f0e..0b0cc3cec2 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -462,20 +462,56 @@ struct mount_attr { - struct mount_attr; - #endif - -+#ifndef MOUNT_ATTR_RDONLY -+#define MOUNT_ATTR_RDONLY 0x00000001 /* Mount read-only */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOSUID -+#define MOUNT_ATTR_NOSUID 0x00000002 /* Ignore suid and sgid bits */ -+#endif -+ -+#ifndef MOUNT_ATTR_NODEV -+#define MOUNT_ATTR_NODEV 0x00000004 /* Disallow access to device special files */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOEXEC -+#define MOUNT_ATTR_NOEXEC 0x00000008 /* Disallow program execution */ -+#endif -+ -+#ifndef MOUNT_ATTR__ATIME -+#define MOUNT_ATTR__ATIME 0x00000070 /* Setting on how atime should be updated */ -+#endif -+ -+#ifndef MOUNT_ATTR_RELATIME -+#define MOUNT_ATTR_RELATIME 0x00000000 /* - Update atime relative to mtime/ctime. */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOATIME -+#define MOUNT_ATTR_NOATIME 0x00000010 /* - Do not update access times. */ -+#endif -+ -+#ifndef MOUNT_ATTR_STRICTATIME -+#define MOUNT_ATTR_STRICTATIME 0x00000020 /* - Always perform atime updates */ -+#endif -+ -+#ifndef MOUNT_ATTR_NODIRATIME -+#define MOUNT_ATTR_NODIRATIME 0x00000080 /* Do not update directory access times */ -+#endif -+ - #ifndef MOUNT_ATTR_IDMAP --#define MOUNT_ATTR_IDMAP 0x00100000 -+#define MOUNT_ATTR_IDMAP 0x00100000 /* Idmap mount to @userns_fd in struct mount_attr. */ - #endif - - #ifndef MOUNT_ATTR_NOSYMFOLLOW --#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 -+#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 /* Do not follow symlinks */ - #endif - --#ifndef AT_RECURSIVE --#define AT_RECURSIVE 0x8000 -+#ifndef MOUNT_ATTR_SIZE_VER0 -+#define MOUNT_ATTR_SIZE_VER0 32 /* sizeof first published struct */ - #endif - --#ifndef MOUNT_ATTR_SIZE_VER0 --#define MOUNT_ATTR_SIZE_VER0 32 -+#ifndef AT_RECURSIVE -+#define AT_RECURSIVE 0x8000 - #endif - - static inline int missing_mount_setattr( --- -2.25.1 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index cc33cd4c52..f89b2ce17d 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 41317fb443f7555de427aea69fda36c74661e77b58203cd6587eb8e1f612f46b systemd-250.tar.gz +sha256 ccfdd97679972cd3d9fb15bc3c647a3ee3351a434e20e1e3eec2851caa1b4849 systemd-250.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 0b52cc47d1..404943c45c 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 250 +SYSTEMD_VERSION = 250.1 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.31.1 From arnout at mind.be Fri Jan 7 21:49:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:49:08 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> Message-ID: <7605fae5-42db-115c-e87a-0dbc3597a99a@mind.be> On 03/01/2022 09:24, Tomi Valkeinen wrote: > Hi, > > On 06/12/2021 23:57, Yann E. MORIN wrote: > >> So I think we really, really need a package (like scipy) that actually >> makes use of pybind, so we can see how it works, and to fix it... > > Jfyi, there are two relatively simple packages in buildroot that can use pybind: > kmsxx and rwmem. Both use meson for building. > > I can test the next version of this series with those packages. I tried to do that. Unfortunately, it turns out that both of those packages use the CMake way of finding the pybind11 dependency, and apparently our cross-compilation.conf doesn't support cmake yet... So it's not that trivial. I merged the pybind stuff but wasn't able to test the cmake handling, so it's even possible that that is broken as well... Regards, Arnout From thomas.petazzoni at bootlin.com Fri Jan 7 21:50:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:50:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/qpdf: needs atomic In-Reply-To: References: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> <20220107220857.63b9a0da@windsurf> Message-ID: <20220107225029.1b8a5588@windsurf> On Fri, 7 Jan 2022 22:16:26 +0100 Fabrice Fontaine wrote: > qpdf handles linking with atomic since version 10.0.2 and > https://github.com/qpdf/qpdf/commit/66198f447f45a87718b6457756976baa8defb2fd Excellent, thanks for confirming! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 21:53:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:53:22 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> Message-ID: <20220107225322.43eb3e8b@windsurf> Hello, On Fri, 7 Jan 2022 22:07:26 +0100 Romain Naour wrote: > > +endef > > +endif # ifeq ($(4),target) > > +endif # ifndef $(2)_BUILD_CMDS > > + > > is _INSTALL_STAGING_CMDS is missing here ? > > Rust package may wand to install *.rlib files [1] (similar to .a) So far we haven't seen any package that needed staging installation, so I did not implement it (Yann asked a similar question today, live). > cargo install seems overingeneered and produce unwanted rebuild when packages > are using cargo features [2]. Why do you say "over engineered" ? Buggy perhaps, over-engineered, I'm not sure. > meta-rust doesn't use cago install at all but use an cargo_do_install() function > that use manual install commandes [3]. > > [1] https://doc.rust-lang.org/reference/linkage.html > [2] https://github.com/rust-lang/cargo/issues/8703 > [3] https://github.com/meta-rust/meta-rust/blob/master/classes/cargo.bbclass#L55 I was wondering how they knew what to install and how/where, but that link explains it. It would a lot simpler to be able to use "cargo install", but I agree those rebuilds during the install step are not very nice (and they are time consuming). Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 7 21:52:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:52:29 +0100 Subject: [Buildroot] [PATCH v6,1/2] package/libpcap: add host variant Message-ID: <20220107215230.1672766-1-fontaine.fabrice@gmail.com> host-libpcap is needed to build host-zeek Signed-off-by: Fabrice Fontaine --- package/libpcap/libpcap.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 1e02ec56e0..21422b2c0a 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -11,6 +11,7 @@ LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_CPE_ID_VENDOR = tcpdump LIBPCAP_INSTALL_STAGING = YES LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf +HOST_LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test # provided by autoconf relies on wchar_t. @@ -23,6 +24,13 @@ LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag \ --without-dpdk # Disable dbus to break recursive dependencies LIBPCAP_CONF_OPTS += --disable-dbus +HOST_LIBPCAP_CONF_OPTS = \ + --disable-bluetooth \ + --disable-dbus \ + --disable-yydebug \ + --with-pcap=linux \ + --without-dag \ + --without-libnl LIBPCAP_CONFIG_SCRIPTS = pcap-config # Omit -rpath from pcap-config output @@ -50,3 +58,4 @@ LIBPCAP_CFLAGS += -fPIC endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 21:52:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:52:30 +0100 Subject: [Buildroot] [PATCH v6,2/2] package/zeek: new package In-Reply-To: <20220107215230.1672766-1-fontaine.fabrice@gmail.com> References: <20220107215230.1672766-1-fontaine.fabrice@gmail.com> Message-ID: <20220107215230.1672766-2-fontaine.fabrice@gmail.com> The Zeek Network Security Monitor Zeek is a powerful network analysis framework that is much different from the typical IDS you may know. (Zeek is the new name for the long-established Bro system.) Signed-off-by: Fabrice Fontaine --- Changes v5 -> v6: ?- Set ZEEK_PYTHON_PREFIX Changes v4 -> v5: ?- host-python3 is mandatory Changes v3 -> v4: ?- Bump to latest version (4.1.1) and drop patch (already in version) ?- python 2 support dropped since ? ?https://github.com/zeek/zeek/commit/eeec219a66ed89235093fb63753d6baf6c21de78 ?- BSD-3-Clause added since ? ?https://github.com/zeek/zeek/commit/d070709c573fc01a40735a6c921a9095988306cc Changes v2 -> v3 (after review of Thomas Petazzoni): ?- Bump to version 3.2.2 (security fixes) ?- Add host-zeek dependencies ?- Install bifcl and binpac to HOST_DIR Changes v1 -> v2: ?- Bump to version 3.2.0 ?- Drop second and third patches (already in version) ?- Update ZEEK_SITE ?- Update indentation in hash file (two spaces) ?- Update third party licences DEVELOPERS | 1 + package/Config.in | 1 + package/zeek/Config.in | 43 ++++++++++++++++++++ package/zeek/zeek.hash | 6 +++ package/zeek/zeek.mk | 92 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 143 insertions(+) create mode 100644 package/zeek/Config.in create mode 100644 package/zeek/zeek.hash create mode 100644 package/zeek/zeek.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7874677f7e..bc82015789 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -935,6 +935,7 @@ F: package/tinycbor/ F: package/tinydtls/ F: package/tinymembench/ F: package/whois/ +F: package/zeek/ N: Fabrice Goucem F: board/freescale/imx6ullevk/ diff --git a/package/Config.in b/package/Config.in index 3a0cc0c585..3b37448a41 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2407,6 +2407,7 @@ endif source "package/xinetd/Config.in" source "package/xl2tp/Config.in" source "package/xtables-addons/Config.in" + source "package/zeek/Config.in" source "package/znc/Config.in" endmenu diff --git a/package/zeek/Config.in b/package/zeek/Config.in new file mode 100644 index 0000000000..e474251aeb --- /dev/null +++ b/package/zeek/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_ZEEK + bool "zeek" + depends on BR2_USE_MMU # fork() + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB + help + The Zeek Network Security Monitor + + Zeek is a powerful network analysis framework that is much + different from the typical IDS you may know. (Zeek is the new + name for the long-established Bro system.) + + https://www.zeek.org + +if BR2_PACKAGE_ZEEK + +config BR2_PACKAGE_ZEEK_ZEEKCTL + bool "zeekctl" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_PYTHON3_CURSES + select BR2_PACKAGE_PYTHON3_HASHLIB + select BR2_PACKAGE_PYTHON3_SQLITE + select BR2_PACKAGE_PYTHON3_ZLIB + help + Tool for managing Zeek deployments + +comment "zeekctl tools needs python3" + depends on !BR2_PACKAGE_PYTHON3 + +endif + +comment "zeek needs a toolchain w/ C++, wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/zeek/zeek.hash b/package/zeek/zeek.hash new file mode 100644 index 0000000000..05e57b5024 --- /dev/null +++ b/package/zeek/zeek.hash @@ -0,0 +1,6 @@ +# Locally computed: +sha256 8c0afc999a8dd1c1f677a5cf818479b99c2d527e679e1ef99fb1b03f989c0373 zeek-4.1.1.tar.gz + +# Hash for license files: +sha256 b2817e2fb935805ec9fc0e90c6b971efd810d9aedfc646bc5fcb535221e0266a COPYING +sha256 1a451eca7b3826a7df62991ba90dd6d23ff03d28c2eefb7f8c4f8b1eac97a61b COPYING.3rdparty diff --git a/package/zeek/zeek.mk b/package/zeek/zeek.mk new file mode 100644 index 0000000000..90f9584603 --- /dev/null +++ b/package/zeek/zeek.mk @@ -0,0 +1,92 @@ +################################################################################ +# +# zeek +# +################################################################################ + +ZEEK_VERSION = 4.1.1 +ZEEK_SITE = https://download.zeek.org +ZEEK_LICENSE = \ + BSD-3-Clause (zeek, C++ Actor Framework, ConvertUTF.c, CardinalityCounter.cc, pybind11), \ + Public Domain (sqlite), \ + MIT (doctest, libkqueue, RapidJSON, tsl-ordered-map, bro_inet_ntop.c), \ + LGPL-3.0+ (Multifast Project), \ + BSD-2-Clause (event.h), \ + BSD-3-Clause (in_cksum.cc) \ + BSD-4-Clause (Patricia.c, strsep.c, bsd-getopt-long.c), \ + Apache-2.0 (highwayhash, folly), \ + MPL-2.0 (mozilla-ca-list.zeek) +ZEEK_LICENSE_FILES = COPYING COPYING.3rdparty +ZEEK_SUPPORTS_IN_SOURCE_BUILD = NO +ZEEK_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-pkgconf \ + host-python3 \ + host-zeek \ + $(if $(BR2_PACKAGE_LIBKRB5),libkrb5) \ + $(if $(BR2_PACKAGE_LIBMAXMINDDB),libmaxminddb) \ + libpcap \ + openssl \ + $(if $(BR2_PACKAGE_ROCKSDB),rocksdb) \ + zlib +HOST_ZEEK_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-pkgconf \ + host-python3 \ + host-libpcap \ + host-openssl \ + host-zlib + +ZEEK_CONF_OPTS = \ + -DBIFCL_EXE_PATH=$(HOST_DIR)/bin/bifcl \ + -DBINPAC_EXE_PATH=$(HOST_DIR)/bin/binpac \ + -DBROKER_DISABLE_DOCS=ON \ + -DBROKER_DISABLE_TESTS=ON \ + -DINSTALL_AUX_TOOLS=ON \ + -DZEEK_ETC_INSTALL_DIR=/etc + +define ZEEK_FIX_PYTHON_PATH + $(SED) 's, at PYTHON_EXECUTABLE@,/usr/bin/python,' \ + $(@D)/auxil/zeekctl/ZeekControl/ssh_runner.py +endef + +ZEEK_POST_INSTALL_TARGET_HOOKS += ZEEK_FIX_PYTHON_PATH + +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +ZEEK_DEPENDENCIES += jemalloc +ZEEK_CONF_OPTS += -DENABLE_JEMALLOC=ON +else +ZEEK_CONF_OPTS += -DENABLE_JEMALLOC=OFF +endif + +ifeq ($(BR2_PACKAGE_ZEEK_ZEEKCTL),y) +ZEEK_DEPENDENCIES += host-swig python3 +ZEEK_CONF_OPTS += \ + -DDISABLE_PYTHON_BINDINGS=OFF \ + -DINSTALL_ZEEKCTL=ON \ + -DPY_MOD_INSTALL_DIR=/usr/lib/zeekctl \ + -DZEEK_PYTHON_PREFIX=/usr +else +ZEEK_CONF_OPTS += \ + -DDISABLE_PYTHON_BINDINGS=ON \ + -DINSTALL_ZEEKCTL=OFF +endif + +ifneq ($(BR2_TOOLCHAIN_USES_GLIBC),y) +ZEEK_DEPENDENCIES += musl-fts +ZEEK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lfts +endif + +HOST_ZEEK_MAKE_OPTS = binpac bifcl + +define HOST_ZEEK_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(HOST_ZEEK_BUILDDIR)/auxil/bifcl/bifcl \ + $(HOST_DIR)/bin/bifcl + $(INSTALL) -D -m 0755 $(HOST_ZEEK_BUILDDIR)/auxil/binpac/src/binpac \ + $(HOST_DIR)/bin/binpac +endef + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.34.1 From arnout at mind.be Fri Jan 7 21:55:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:55:24 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> <7d360d46-e4e5-bbf4-80a9-d5e1ff6a3ea1@mind.be> Message-ID: On 08/12/2021 12:19, Andreas Naumann wrote: [snip] > By chance I was playing with such a package just yesterday: zxing-cpp. Not the > version buildroot uses (from github glassechidna), but the nu-book one which > claims to be faster. (And is the one where the python bindings in the PyPi > package zxing-cpp originate from). > > Until recently they shipped their own pybind11 version, which throws an error > when included in a cmake project in a crosscompile environment. This is a known > problem, https://github.com/pybind/pybind11/issues/2139 but non of the proposed > fixes has been merged yet. > > However, the unreleased master version of zxing-cpp hast been changed so it can > be configured to use the a system pybind11. So I tried to include the br > packaged one (2.6.1 as well as 2.8.1). They both built on my system (no problem > with the hardcoded host cmake here) but I needed to change three things: > 1. Add PYTHON_PYBIND_INSTALL_STAGING = YES > 2. Set ZXING_CPP_CONF_OPTS += > -Dpybind11_DIR=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pybind11/share/cmake/pybind11 > > 3. Apply one of the proposed fixes for the pybind11 crosscompile problem (to > tools/pybind11Tools.cmake) > > So this patch here seems to help my (and possibly others) because 1. is already > included. If interested, I could send a patch for 3. I applied a slightly different approach to master [1]. If you'd like to give that one a go, we'd welcome an updated zxing-cpp package! Regards, Arnout [1] https://git.buildroot.org/buildroot/commit/?id=a19b822239c36cb40a632899bb5c3e848a5fc81e [snip] From arnout at mind.be Fri Jan 7 21:56:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:56:10 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/python-pybind: fix upgrade to 2.6.1 In-Reply-To: <20220104123901.23929-1-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> Message-ID: <64301b2b-e9c2-91b4-1906-d9e437251618@mind.be> On 04/01/2022 13:38, guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > Fixes > http://autobuild.buildroot.net/results/b89f1de64b308dffa73675f1f31ccb0b7be5a10d > http://autobuild.buildroot.net/results/d0287b7f64f206b0f074908c5780a3632e0cb799 > http://autobuild.buildroot.net/results/27efb545a5a719a5581c8f746d3a3555ff4216ce > http://autobuild.buildroot.net/results/d2f0a0ad8f6c7178517df109e7d885dac9134c3a > http://autobuild.buildroot.net/results/b57e9a3279260dae4a590f9421238fcabb2f7cab > http://autobuild.buildroot.net/results/515e6f2fc6b5780260d98d6bb52b541ce4bf1afe > http://autobuild.buildroot.net/results/d89c4ecc81222d4f80c951da2232d2e393fa1c69 > > Signed-off-by: Guillaume W. Bres I applied a completely reworked version to master, thanks. Regards, Arnout [snip] From arnout at mind.be Fri Jan 7 21:57:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:57:41 +0100 Subject: [Buildroot] [PATCH v2 3/3] support/testing: add test for python-pybind In-Reply-To: <20220104123901.23929-3-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> <20220104123901.23929-3-guillaume.bressaix@gmail.com> Message-ID: <267a64ba-8407-bcea-0e3b-994986433b0c@mind.be> On 04/01/2022 13:39, guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > python-pybind is a header only library, most of the time used as a host-package, > to customize the host/usr/python interpreter capacity (at build time) with C++ based features. > > Signed-off-by: Guillaume W. Bres I applied to master with many changes: - Retain python3 only. - python-pybind is a target package, not host. - Select python-pybind instead of depend. - Simplify python-pybind-example package. - Check in python-pybind-example build if pybind11.get_include() produces output. - Don't use python3 -m pybind11 --includes: it includes the main python includes, which are for the host, not for the target. - Use TestPythonPackageBase instead of open-coding something imported with host python. However, I hadn't noticed that the original author of this test was Adam. In the future, please make sure that you don't claim authorship on a patch that is actually from someone else! Regards, Arnout > --- > This test case enhances the /host/usr/python interpreter with a C++ macro. > > The test delivers a C++ macro contained in its br-external/example.cpp. > We compile it against the host context. > We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively contained > in the host-python system path (import is easy). > The macro is an integer adder, written in C++ that we can now call in host-python. > > The test infrastructure should actually be declared "host-generic-package" > instead of "generic-package", to be consistent with Buildroot infrastructure. > But I am not able to get this to actually do anything, if I declare this package > as a host-generic and "Config.in.host" instead of "Config.in". To me, this is > not too important > > * TestPythonPybind allows testing for both Py2 and Py3 like it is done > in many other packages > > * TestPythonPybind does not inherit from TestPythonPackageBase as usually done > (1) because I need the br2-external feature to ship the example.cpp containing the custom macro > (2) because TestPythonPackageBase always involves the emulator, which we do not want in our context > > * Although TestPythonPybind does have a TestPythonBase.config base at the same time, > as it is most convenient to have a valid python context > > * TestPythonPybind uses subprocess, as similarly done in 'core' on 'infra' test cases, > because we do not involve the emulator > > * TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3 > * TestPythonPybind tests a custom module attribute, written in C++, used in Python 2/3 > > --- > DEVELOPERS | 3 ++ > .../br2-external/python-pybind/Config.in | 1 + > .../br2-external/python-pybind/external.desc | 1 + > .../br2-external/python-pybind/external.mk | 1 + > .../package/python-pybind-example/Config.in | 5 ++ > .../package/python-pybind-example/example.cpp | 16 +++++++ > .../python-pybind-example.mk | 47 ++++++++++++++++++ > .../tests/package/sample_python_pybind.py | 4 ++ > .../tests/package/test_python_pybind.py | 48 +++++++++++++++++++ > 9 files changed, 126 insertions(+) > create mode 100644 support/testing/tests/package/br2-external/python-pybind/Config.in > create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.desc > create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.mk > create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk > create mode 100644 support/testing/tests/package/sample_python_pybind.py > create mode 100644 support/testing/tests/package/test_python_pybind.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index 21e4f2a84c..130ac3db73 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1120,6 +1120,9 @@ F: package/liquid-dsp/ > F: package/pixiewps/ > F: package/python-pybind/ > F: package/reaver/ > +F: support/testing/tests/package/br2-external/python-pybind > +F: support/testing/tests/package/sample_python_pybind.py > +F: support/testing/tests/package/test_python_pybind.py > > N: Guo Ren > F: arch/Config.in.csky > diff --git a/support/testing/tests/package/br2-external/python-pybind/Config.in b/support/testing/tests/package/br2-external/python-pybind/Config.in > new file mode 100644 > index 0000000000..70c77157b3 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in > @@ -0,0 +1 @@ > +source "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in" > diff --git a/support/testing/tests/package/br2-external/python-pybind/external.desc b/support/testing/tests/package/br2-external/python-pybind/external.desc > new file mode 100644 > index 0000000000..eef5e0f5a0 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/external.desc > @@ -0,0 +1 @@ > +name: PYTHON_PYBIND > diff --git a/support/testing/tests/package/br2-external/python-pybind/external.mk b/support/testing/tests/package/br2-external/python-pybind/external.mk > new file mode 100644 > index 0000000000..3501f3135e > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/external.mk > @@ -0,0 +1 @@ > +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk)) > diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > new file mode 100644 > index 0000000000..773d021a53 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > @@ -0,0 +1,5 @@ > +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE > + bool "python-pybind-example" > + depends on BR2_PACKAGE_PYTHON_PYBIND > + help > + This test creates a cpp macro later used on target in python > diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > new file mode 100644 > index 0000000000..f2eea8e48d > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > @@ -0,0 +1,16 @@ > +#include > +namespace py = pybind11; > + > +int add (int i, int j) { > + return i + j; > +} > + > +PYBIND11_MODULE (example, m) { > + // optional module description > + m.doc() = "pybind11 example plugin"; > + // test a module method > + m.def("add", &add, "example::add adds two integer numbers"); > + // test a module attribute > + py::object hello = py::cast("Hello World"); > + m.attr("says") = hello; > +} > diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk > new file mode 100644 > index 0000000000..85dd09d93f > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk > @@ -0,0 +1,47 @@ > +################################################################################ > +# > +# python-pybind-example > +# > +################################################################################ > + > +# this builds a C++ macro "add(a,b)" > +# that we expose to host-python with a custom install > +# and that the python test script will later use > +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind > + > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS) > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC > + > +ifeq ($(BR2_PACKAGE_PYTHON3),y) > +PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR) > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3 > +else > +PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR) > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2 > +endif > + > +# retrieve pybind11 include paths > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \ > + $(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes) > + > +# .so to be installed must have exact suffix > +# otherwise import() in python will not work > +HOST_LIB_BINARY_SUFFIX = \ > + $(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix) > + > +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS > + $(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D) > + cd $(@D); \ > + $(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \ > + example.cpp -o example$(HOST_LIB_BINARY_SUFFIX) > +endef > + > +# installs into host/python sys.path > +# so the new macro is naturally known > +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \ > + $(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX) > +endef > + > +$(eval $(generic-package)) > diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py > new file mode 100644 > index 0000000000..605c0bab15 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_pybind.py > @@ -0,0 +1,4 @@ > +#!/usr/bin/env python > +import example > +print(example.add(1, 2)) > +print(example.says) > diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py > new file mode 100644 > index 0000000000..7a68d6512a > --- /dev/null > +++ b/support/testing/tests/package/test_python_pybind.py > @@ -0,0 +1,48 @@ > +import os > +import infra > +import subprocess > +from tests.package.test_python import TestPythonPackageBase > + > +class TestPythonPybind (infra.basetest.BRTest): > + config = TestPythonPackageBase.config # python minimal requirements > + sample_script = "tests/package/sample_python_pybind.py" > + # ship examples macro & installs it to host > + br2_external = [infra.filepath("tests/package/br2-external/python-pybind")] > + > +class TestPythonPy2Pybind (TestPythonPybind): > + __test__ = True > + config = TestPythonPybind.config + \ > + """ > + BR2_PACKAGE_PYTHON=y > + BR2_PACKAGE_PYTHON_PYBIND=y > + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y > + """ > + > + def test_run(self): > + host_interpreter = os.path.join(self.builddir,"host","usr","bin","python") > + # test new c++->py macro exposed to host interpreter > + cmd = [host_interpreter, infra.filepath(self.sample_script)] > + output = subprocess.check_output(cmd) > + result = int(output.splitlines()[0]) > + attribute = output.splitlines()[1].decode("utf-8") > + self.assertEqual(result,3) # 2+1 using '+' macro from cpp > + self.assertEqual(attribute,"Hello World") # macro special attribute > + > +class TestPythonPy3Pybind (TestPythonPybind): > + __test__ = True > + config = TestPythonPybind.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_PYBIND=y > + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y > + """ > + > + def test_run(self): > + host_interpreter = os.path.join(self.builddir,"host","usr","bin","python") > + # test new c++->py macro exposed to host interpreter > + cmd = [host_interpreter, infra.filepath(self.sample_script)] > + output = subprocess.check_output(cmd) > + result = int(output.splitlines()[0]) > + attribute = output.splitlines()[1].decode("utf-8") > + self.assertEqual(result,3) # 2+1 using '+' macro from cpp > + self.assertEqual(attribute,"Hello World") # macro special attribute > From fontaine.fabrice at gmail.com Fri Jan 7 22:07:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 23:07:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: bump to version 5.0.1 Message-ID: <20220107220707.1679540-1-fontaine.fabrice@gmail.com> Drop first patch (already in version) Signed-off-by: Fabrice Fontaine --- package/mp4v2/0001-Fix-GCC7-build.patch | 33 ------------------- ...p4track.cpp-replace-nullptr-by-NULL.patch} | 2 +- ...atic-cast-to-unsigned-int-for-cases.patch} | 0 package/mp4v2/mp4v2.hash | 2 +- package/mp4v2/mp4v2.mk | 2 +- 5 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/mp4v2/0001-Fix-GCC7-build.patch rename package/mp4v2/{0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch => 0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch} (96%) rename package/mp4v2/{0003-Static-cast-to-unsigned-int-for-cases.patch => 0002-Static-cast-to-unsigned-int-for-cases.patch} (100%) diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch deleted file mode 100644 index 4e39be4a79..0000000000 --- a/package/mp4v2/0001-Fix-GCC7-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Wed, 8 Feb 2017 00:56:32 +0000 -Subject: [PATCH] Fix GCC7 build - -if (*pSlash != '\0') { - -As it stands the body of that if will always execute and when there are -no encoding parameters ppEncodingParams will be returned as a pointer to -an empty string rather than as a null pointer - -Signed-off-by: Peter Korsgaard -[Upstream status: https://github.com/TechSmith/mp4v2/pull/36] ---- - src/rtphint.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rtphint.cpp b/src/rtphint.cpp -index e07309d..1eb01f5 100644 ---- a/src/rtphint.cpp -+++ b/src/rtphint.cpp -@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( - pSlash = strchr(pSlash, '/'); - if (pSlash != NULL) { - pSlash++; -- if (pSlash != '\0') { -+ if (*pSlash != '\0') { - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); - *ppEncodingParams = (char *)MP4Calloc(length + 1); - strncpy(*ppEncodingParams, pSlash, length); --- -2.11.0 - diff --git a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch similarity index 96% rename from package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch rename to package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch index 72bae463c9..c279b9c56a 100644 --- a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch +++ b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] --- src/mp4track.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch similarity index 100% rename from package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch rename to package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 85fce49384..7aa5402c8f 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz +sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 478d10d472..6d29228a13 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MP4V2_VERSION = 4.1.3 +MP4V2_VERSION = 5.0.1 MP4V2_SITE = \ $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) MP4V2_INSTALL_STAGING = YES -- 2.34.1 From arnout at mind.be Fri Jan 7 21:41:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Fri, 7 Jan 2022 22:41:31 +0100 Subject: [Buildroot] [git commit] package/python-numpy: fixup npymath.ini for numpy extensions Message-ID: <20220107220414.EEAF8834B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2426002d6fc81d0b023e3f3b3ee4e94ab29438cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to build the numpy distutils extension packages like python-scipy, python-numba, it requires an explicit pkg-config path fixup for npymath.ini. This pkg-config path fixup would update the prefix path of npymath.ini with actual target staging area where numpy core was built, so that numpy distutils extension packages would explicitly link this config path for their package environment. Without this extension packages cannot find -lnpymath since it uses host libraries (like libnpymath.a). So, attach the post install staging hook with pkg-config path fixup for npymath.ini. Signed-off-by: Esben Haabendal Signed-off-by: Jagan Teki Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-numpy/python-numpy.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index ae72b87db0..f367b556ef 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -34,6 +34,21 @@ define PYTHON_NUMPY_CONFIGURE_CMDS echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg endef +# Fixup the npymath.ini prefix path with actual target staging area where +# numpy core was built. Without this, target builds using numpy distutils +# extensions like python-scipy, python-numba cannot find -lnpymath since +# it uses host libraries (like libnpymath.a). +# So, the numpy distutils extension packages would explicitly link this +# config path for their package environment. +PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy +PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config +define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES + sed -e '/^pkgdir=/d' \ + -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ + -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini +endef +PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES + # Some package may include few headers from NumPy, so let's install it # in the staging area. PYTHON_NUMPY_INSTALL_STAGING = YES From arnout at mind.be Fri Jan 7 22:03:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Fri, 7 Jan 2022 23:03:09 +0100 Subject: [Buildroot] [git commit] package/python-pybind: bump to version 2.9.0 Message-ID: <20220107220415.035CD834D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69255af2299cdde0a8d6276952a867a2cb58889a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Guillaume W. Bres [Arnout: bump to 2.9.0, refresh patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-pybind11-commands.py-support-STAGING_DIR.patch | 11 +++++------ package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch index 981a387be4..021321a9b7 100644 --- a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch +++ b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch @@ -1,4 +1,4 @@ -From 9feaba4792c1d0a28e560ae941fa9ebabbbe4013 Mon Sep 17 00:00:00 2001 +From bf9f0d619e2e0a424e471a2f9235d26ece5b348c Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Fri, 7 Jan 2022 19:32:18 +0100 Subject: [PATCH] pybind11/commands.py: support STAGING_DIR @@ -13,18 +13,17 @@ the current directory, if it is set. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Upstream-Status: N/A, Buildroot specific --- - pybind11/commands.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + pybind11/commands.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pybind11/commands.py b/pybind11/commands.py -index 34dbaf8..8c4876d 100644 +index 11f81d2..8c4876d 100644 --- a/pybind11/commands.py +++ b/pybind11/commands.py -@@ -1,8 +1,8 @@ +@@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- import os -- -DIR = os.path.abspath(os.path.dirname(__file__)) +DIR = os.environ.get('STAGING_DIR') or \ + os.path.abspath(os.path.dirname(__file__)) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index a68ac846e2..d5b4b4829e 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a python-pybind-2.6.1.tar.gz +sha256 057fb68dafd972bc13afb855f3b0d8cf0fa1a78ef053e815d9af79be7ff567cb python-pybind-2.9.0.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index 4dd52003ad..7448d246b2 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.6.1 +PYTHON_PYBIND_VERSION = 2.9.0 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE From arnout at mind.be Fri Jan 7 22:10:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 23:10:25 +0100 Subject: [Buildroot] [PATCH v8 2/5] package/python-numpy: fixup npymath.ini for numpy extensions In-Reply-To: <20200407111515.21131-3-jagan@amarulasolutions.com> References: <20200407111515.21131-1-jagan@amarulasolutions.com> <20200407111515.21131-3-jagan@amarulasolutions.com> Message-ID: <219ad3fa-0ae0-c979-b9cb-879dddf3f7f4@mind.be> On 07/04/2020 13:15, Jagan Teki wrote: > From: Esben Haabendal > > Inorder to build the numpy distutils extension packages like > python-scipy, python-numba, it require an explicit pkg-config > path fixup for npymath.ini. > > This pkg-config path fixup would update the prefix path of > npymath.ini with actual target staging area where numpy core > was built, so-that numpy distutils extension packages would > explicitly link this config path for their package environment. > > Without this extension packages cannot find -lnpymath since > it uses host libraries (like libnpymath.a). > > So, attach the post install staging hook with pkg-config > path fixup for npymath.ini. > > Signed-off-by: Esben Haabendal > Signed-off-by: Jagan Teki Applied to master, thanks. Regards, Arnout > --- > Changes for v8: > - none > Changes for v7: > - rephrase commit and comments of fixup npymath.ini > > package/python-numpy/python-numpy.mk | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk > index 3f0df7a640..4d2e852b43 100644 > --- a/package/python-numpy/python-numpy.mk > +++ b/package/python-numpy/python-numpy.mk > @@ -32,6 +32,21 @@ define PYTHON_NUMPY_CONFIGURE_CMDS > echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg > endef > > +# Fixup the npymath.ini prefix path with actual target staging area where > +# numpy core was built. Without this, target builds using numpy distutils > +# extensions like python-scipy, python-numba cannot find -lnpymath since > +# it uses host libraries (like libnpymath.a). > +# So, the numpy distutils extension packages would explicitly link this > +# config path for their package environment. > +PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy > +PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config > +define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES > + sed -e '/^pkgdir=/d' \ > + -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ > + -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini > +endef > +PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES > + > # Some package may include few headers from NumPy, so let's install it > # in the staging area. > PYTHON_NUMPY_INSTALL_STAGING = YES > From arnout at mind.be Fri Jan 7 22:10:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 23:10:32 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/python-pybind: bump to version 2.8.1 In-Reply-To: <20220104123901.23929-2-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> <20220104123901.23929-2-guillaume.bressaix@gmail.com> Message-ID: <4f884b01-32c1-5469-b650-2e80a5934989@mind.be> On 04/01/2022 13:39, guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > Signed-off-by: Guillaume W. Bres I bumped to 2.9.0 instead and applied to master, thanks. Regards, Arnout > --- > package/python-pybind/python-pybind.hash | 2 +- > package/python-pybind/python-pybind.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash > index a68ac846e2..e1d86a4494 100644 > --- a/package/python-pybind/python-pybind.hash > +++ b/package/python-pybind/python-pybind.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a python-pybind-2.6.1.tar.gz > +sha256 f1bcc07caa568eb312411dde5308b1e250bd0e1bc020fae855bf9f43209940cc python-pybind-2.8.1.tar.gz > # License files, locally calculated > sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE > diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk > index 442ed3328f..cf6a642922 100644 > --- a/package/python-pybind/python-pybind.mk > +++ b/package/python-pybind/python-pybind.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PYTHON_PYBIND_VERSION = 2.6.1 > +PYTHON_PYBIND_VERSION = 2.8.1 > PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) > PYTHON_PYBIND_LICENSE = BSD-3-Clause > PYTHON_PYBIND_LICENSE_FILES = LICENSE > From peter at korsgaard.com Fri Jan 7 22:10:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 23:10:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/netdata: add prometheus remote write backend support In-Reply-To: <20211105173048.2483666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 5 Nov 2021 18:30:48 +0100") References: <20211105173048.2483666-1-fontaine.fabrice@gmail.com> Message-ID: <87o84njixr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > prometheus remote write backend depends on protobuf and snappy and is > enabled by default since the addition of the package in commit > 1d2bb469078b5818aa2390b9868cd632200f17a2 > Signed-off-by: Fabrice Fontaine > --- > package/netdata/Config.in | 19 +++++++++++++++++++ > package/netdata/netdata.mk | 10 ++++++++++ > 2 files changed, 29 insertions(+) > diff --git a/package/netdata/Config.in b/package/netdata/Config.in > index 88f88cb7ed..34d139125d 100644 > --- a/package/netdata/Config.in > +++ b/package/netdata/Config.in > @@ -16,6 +16,25 @@ config BR2_PACKAGE_NETDATA > https://github.com/netdata/netdata > +if BR2_PACKAGE_NETDATA > + > +config BR2_PACKAGE_NETDATA_PROMETHEUS > + bool "prometheus remote write backend" > + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > + depends on BR2_INSTALL_LIBSTDCPP # protobuf, snappy > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf > + select BR2_PACKAGE_PROTOBUF > + select BR2_PACKAGE_SNAPPY > + help > + Enable prometheus remote write backend > + > +comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" > + depends on !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > + > +endif > + > comment "netdata needs a toolchain w/ NPTL, dynamic library" > depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > depends on BR2_USE_MMU > diff --git a/package/netdata/netdata.mk b/package/netdata/netdata.mk > index 34365cbf56..ac717d56b0 100644 > --- a/package/netdata/netdata.mk > +++ b/package/netdata/netdata.mk > @@ -60,6 +60,16 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > NETDATA_CONF_ENV += LIBS=-latomic > endif > +ifeq ($(BR2_PACKAGE_NETDATA_PROMETHEUS),y) > +# Override the result of AC_PATH_PROG([CXX_BINARY], [${CXX}], [no]) > +# which fails because CXX is set to the full CXX binary path > +NETDATA_CONF_ENV += ac_cv_path_CXX_BINARY=yes The issue is both the path issue and also the fact that the compiler may not be in the path. I guess they have used this odd check as you cannot do a conditional AC_PROG_CXX. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 22:10:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 23:10:52 +0100 Subject: [Buildroot] [git commit] package/netdata: add prometheus remote write backend support Message-ID: <20220107220447.87472814EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62c2da0e7a54e96a12190bcaa79e552b497e634b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master prometheus remote write backend depends on protobuf and snappy and is enabled by default since the addition of the package in commit 1d2bb469078b5818aa2390b9868cd632200f17a2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/netdata/Config.in | 19 +++++++++++++++++++ package/netdata/netdata.mk | 10 ++++++++++ 2 files changed, 29 insertions(+) diff --git a/package/netdata/Config.in b/package/netdata/Config.in index 88f88cb7ed..34d139125d 100644 --- a/package/netdata/Config.in +++ b/package/netdata/Config.in @@ -16,6 +16,25 @@ config BR2_PACKAGE_NETDATA https://github.com/netdata/netdata +if BR2_PACKAGE_NETDATA + +config BR2_PACKAGE_NETDATA_PROMETHEUS + bool "prometheus remote write backend" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # protobuf, snappy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_SNAPPY + help + Enable prometheus remote write backend + +comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +endif + comment "netdata needs a toolchain w/ NPTL, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU diff --git a/package/netdata/netdata.mk b/package/netdata/netdata.mk index b20d5ea37b..6def59764a 100644 --- a/package/netdata/netdata.mk +++ b/package/netdata/netdata.mk @@ -61,6 +61,16 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) NETDATA_CONF_ENV += LIBS=-latomic endif +ifeq ($(BR2_PACKAGE_NETDATA_PROMETHEUS),y) +# Override the result of AC_PATH_PROG([CXX_BINARY], [${CXX}], [no]) +# which fails because CXX is set to the full CXX binary path +NETDATA_CONF_ENV += ac_cv_path_CXX_BINARY=yes +NETDATA_CONF_OPTS += --enable-backend-prometheus-remote-write +NETDATA_DEPENDENCIES += protobuf snappy +else +NETDATA_CONF_OPTS += --disable-backend-prometheus-remote-write +endif + define NETDATA_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/netdata/S60netdata \ $(TARGET_DIR)/etc/init.d/S60netdata From james.hilliard1 at gmail.com Fri Jan 7 22:26:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:09 -0700 Subject: [Buildroot] [PATCH 1/5] package/serd: new package Message-ID: <20220107222613.4124764-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/serd/Config.in | 8 ++++++++ package/serd/serd.hash | 4 ++++ package/serd/serd.mk | 20 ++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/serd/Config.in create mode 100644 package/serd/serd.hash create mode 100644 package/serd/serd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3d5c01f795..d99d7798db 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1299,6 +1299,7 @@ F: package/python-tinycss2/ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ +F: package/serd/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index e9ee4d2ef1..18ae22f227 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1704,6 +1704,7 @@ menu "JSON/XML" source "package/rapidjson/Config.in" source "package/rapidxml/Config.in" source "package/raptor/Config.in" + source "package/serd/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" diff --git a/package/serd/Config.in b/package/serd/Config.in new file mode 100644 index 0000000000..7633a979e2 --- /dev/null +++ b/package/serd/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SERD + bool "serd" + help + Serd is a lightweight C library for RDF syntax which + supports reading and writing Turtle, TriG, NTriples, and + NQuads. + + https://drobilla.net/software/serd.html diff --git a/package/serd/serd.hash b/package/serd/serd.hash new file mode 100644 index 0000000000..d64a2aa271 --- /dev/null +++ b/package/serd/serd.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig +sha256 affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf serd-0.30.10.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/serd/serd.mk b/package/serd/serd.mk new file mode 100644 index 0000000000..85b16f6866 --- /dev/null +++ b/package/serd/serd.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# serd +# +################################################################################ + +SERD_VERSION = 0.30.10 +SERD_SITE = https://download.drobilla.net +SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2 +SERD_LICENSE = ISC +SERD_LICENSE_FILES = COPYING +SERD_INSTALL_STAGING = YES + +SERD_CONF_OPTS += --largefile --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SERD_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:26:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:10 -0700 Subject: [Buildroot] [PATCH 2/5] package/sord: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: <20220107222613.4124764-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sord/Config.in | 8 ++++++++ package/sord/sord.hash | 4 ++++ package/sord/sord.mk | 25 +++++++++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/sord/Config.in create mode 100644 package/sord/sord.hash create mode 100644 package/sord/sord.mk diff --git a/DEVELOPERS b/DEVELOPERS index d99d7798db..bc54ab590c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1300,6 +1300,7 @@ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ F: package/serd/ +F: package/sord/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index 18ae22f227..6133d6ce32 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1705,6 +1705,7 @@ menu "JSON/XML" source "package/rapidxml/Config.in" source "package/raptor/Config.in" source "package/serd/Config.in" + source "package/sord/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" diff --git a/package/sord/Config.in b/package/sord/Config.in new file mode 100644 index 0000000000..91dfb41d0b --- /dev/null +++ b/package/sord/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SORD + bool "sord" + select BR2_PACKAGE_SERD + help + Sord is a lightweight C library for storing RDF data in + memory. + + https://drobilla.net/software/sord.html diff --git a/package/sord/sord.hash b/package/sord/sord.hash new file mode 100644 index 0000000000..af175f91f0 --- /dev/null +++ b/package/sord/sord.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc +sha256 7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14 sord-0.16.8.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/sord/sord.mk b/package/sord/sord.mk new file mode 100644 index 0000000000..f805805e9d --- /dev/null +++ b/package/sord/sord.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# sord +# +################################################################################ + +SORD_VERSION = 0.16.8 +SORD_SITE = https://download.drobilla.net +SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2 +SORD_LICENSE = ISC +SORD_LICENSE_FILES = COPYING +SORD_DEPENDENCIES = host-pkgconf serd +SORD_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_PCRE),y) +SORD_DEPENDENCIES += pcre +endif + +SORD_CONF_OPTS += --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SORD_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:26:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:11 -0700 Subject: [Buildroot] [PATCH 3/5] package/lv2: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: <20220107222613.4124764-3-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/lv2/Config.in | 8 ++++++++ package/lv2/lv2.hash | 4 ++++ package/lv2/lv2.mk | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 46 insertions(+) create mode 100644 package/lv2/Config.in create mode 100644 package/lv2/lv2.hash create mode 100644 package/lv2/lv2.mk diff --git a/DEVELOPERS b/DEVELOPERS index bc54ab590c..6c6e93f089 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1254,6 +1254,7 @@ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/lv2/ F: package/pipewire/ F: package/python-aioconsole/ F: package/python-aiodns/ diff --git a/package/Config.in b/package/Config.in index 6133d6ce32..a439a456a4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1358,6 +1358,7 @@ menu "Audio/Sound" source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" + source "package/lv2/Config.in" source "package/mp4v2/Config.in" source "package/openal/Config.in" source "package/opencore-amr/Config.in" diff --git a/package/lv2/Config.in b/package/lv2/Config.in new file mode 100644 index 0000000000..aeeb6d0451 --- /dev/null +++ b/package/lv2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LV2 + bool "lv2" + help + LV2 is a plugin standard for audio systems. It defines + a minimal yet extensible C API for plugin code and a + format for plugin "bundles". + + https://lv2plug.in/ diff --git a/package/lv2/lv2.hash b/package/lv2/lv2.hash new file mode 100644 index 0000000000..ed21620bee --- /dev/null +++ b/package/lv2/lv2.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://lv2plug.in/spec/lv2-1.18.2.tar.bz2.asc +sha256 4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e lv2-1.18.2.tar.bz2 +sha256 0b0b07d852e3ce7fa04986e141f73001bd7f260683968f0a19e02dbcc4131aa6 COPYING diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk new file mode 100644 index 0000000000..589b518545 --- /dev/null +++ b/package/lv2/lv2.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# lv2 +# +################################################################################ + +LV2_VERSION = 1.18.2 +LV2_SITE = https://lv2plug.in/spec +LV2_SOURCE = lv2-$(LV2_VERSION).tar.bz2 +LV2_LICENSE = ISC +LV2_LICENSE_FILES = COPYING +LV2_DEPENDENCIES = host-pkgconf +LV2_INSTALL_STAGING = YES + +LV2_CONF_OPTS += \ + --no-coverage \ + --no-check-links \ + --copy-headers + +ifeq ($(BR2_PACKAGE_CAIRO),y) +LV2_DEPENDENCIES += cairo +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +LV2_DEPENDENCIES += libsndfile +endif + +ifeq ($(BR2_PACKAGE_LIBGTK2),y) +LV2_DEPENDENCIES += libgtk2 +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:26:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:12 -0700 Subject: [Buildroot] [PATCH 4/5] package/sratom: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: <20220107222613.4124764-4-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sratom/Config.in | 10 ++++++++++ package/sratom/sratom.hash | 4 ++++ package/sratom/sratom.mk | 21 +++++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/sratom/Config.in create mode 100644 package/sratom/sratom.hash create mode 100644 package/sratom/sratom.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6c6e93f089..f8aa809294 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1302,6 +1302,7 @@ F: package/python-yarl/ F: package/python-zopfli/ F: package/serd/ F: package/sord/ +F: package/sratom/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index a439a456a4..51a4180569 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1369,6 +1369,7 @@ menu "Audio/Sound" source "package/spandsp/Config.in" source "package/speex/Config.in" source "package/speexdsp/Config.in" + source "package/sratom/Config.in" source "package/taglib/Config.in" source "package/tinyalsa/Config.in" source "package/tremor/Config.in" diff --git a/package/sratom/Config.in b/package/sratom/Config.in new file mode 100644 index 0000000000..771e82073d --- /dev/null +++ b/package/sratom/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_SRATOM + bool "sratom" + select BR2_PACKAGE_LV2 + select BR2_PACKAGE_SERD + select BR2_PACKAGE_SORD + help + Sratom is a library for serialising LV2 atoms to and from + RDF, particularly the Turtle syntax. + + https://drobilla.net/software/sratom.html diff --git a/package/sratom/sratom.hash b/package/sratom/sratom.hash new file mode 100644 index 0000000000..64d460b2ea --- /dev/null +++ b/package/sratom/sratom.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/sratom-0.6.8.tar.bz2.asc +sha256 3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df sratom-0.6.8.tar.bz2 +sha256 3fc429d6b944fa20306357196a28bb4dd7c25e2d67edebec771f44de5bd7f9e8 COPYING diff --git a/package/sratom/sratom.mk b/package/sratom/sratom.mk new file mode 100644 index 0000000000..e1e0f4e033 --- /dev/null +++ b/package/sratom/sratom.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# sratom +# +################################################################################ + +SRATOM_VERSION = 0.6.8 +SRATOM_SITE = https://download.drobilla.net +SRATOM_SOURCE = sratom-$(SRATOM_VERSION).tar.bz2 +SRATOM_LICENSE = ISC +SRATOM_LICENSE_FILES = COPYING +SRATOM_DEPENDENCIES = host-pkgconf lv2 serd sord +SRATOM_INSTALL_STAGING = YES + +SRATOM_CONF_OPTS += --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SRATOM_CONF_OPTS += --static --no-shared +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:26:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:13 -0700 Subject: [Buildroot] [PATCH 5/5] package/lilv: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: <20220107222613.4124764-5-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/lilv/Config.in | 11 +++++++++++ package/lilv/lilv.hash | 4 ++++ package/lilv/lilv.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 package/lilv/Config.in create mode 100644 package/lilv/lilv.hash create mode 100644 package/lilv/lilv.mk diff --git a/DEVELOPERS b/DEVELOPERS index f8aa809294..c214abe209 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1254,6 +1254,7 @@ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/lilv/ F: package/lv2/ F: package/pipewire/ F: package/python-aioconsole/ diff --git a/package/Config.in b/package/Config.in index 51a4180569..1cf2bb5219 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1358,6 +1358,7 @@ menu "Audio/Sound" source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" + source "package/lilv/Config.in" source "package/lv2/Config.in" source "package/mp4v2/Config.in" source "package/openal/Config.in" diff --git a/package/lilv/Config.in b/package/lilv/Config.in new file mode 100644 index 0000000000..086125cdc9 --- /dev/null +++ b/package/lilv/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LILV + bool "lilv" + select BR2_PACKAGE_LV2 + select BR2_PACKAGE_SERD + select BR2_PACKAGE_SORD + select BR2_PACKAGE_SRATOM + help + Lilv is a C library to make the use of LV2 plugins as simple + as possible for applications. + + https://drobilla.net/software/lilv.html diff --git a/package/lilv/lilv.hash b/package/lilv/lilv.hash new file mode 100644 index 0000000000..afa20fc083 --- /dev/null +++ b/package/lilv/lilv.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/lilv-0.24.12.tar.bz2.asc +sha256 26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061 lilv-0.24.12.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/lilv/lilv.mk b/package/lilv/lilv.mk new file mode 100644 index 0000000000..651597953d --- /dev/null +++ b/package/lilv/lilv.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# lilv +# +################################################################################ + +LILV_VERSION = 0.24.12 +LILV_SITE = https://download.drobilla.net +LILV_SOURCE = lilv-$(LILV_VERSION).tar.bz2 +LILV_LICENSE = ISC +LILV_LICENSE_FILES = COPYING +LILV_DEPENDENCIES = host-pkgconf lv2 serd sord sratom +LILV_INSTALL_STAGING = YES + +LILV_CONF_OPTS += \ + --dyn-manifest \ + --no-bash-completion \ + --no-coverage + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LILV_DEPENDENCIES += python3 +else +LILV_CONF_OPTS += --no-bindings +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +LILV_DEPENDENCIES += libsndfile +endif + +ifeq ($(BR2_STATIC_LIBS),y) +LILV_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From colin.foster at in-advantage.com Fri Jan 7 22:26:44 2022 From: colin.foster at in-advantage.com (Colin Foster) Date: Fri, 7 Jan 2022 14:26:44 -0800 Subject: [Buildroot] [PATCH v1 next] package/mstpd: bump version to 0.1.0 Message-ID: <20220107222644.1612206-1-colin.foster@in-advantage.com> Shortly after MSTPd was added, version 0.1.0 was released. Update to the latest version. Signed-off-by: Colin Foster --- package/mstpd/mstpd.hash | 1 + package/mstpd/mstpd.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mstpd/mstpd.hash b/package/mstpd/mstpd.hash index fd76b959db..64e946d6d1 100644 --- a/package/mstpd/mstpd.hash +++ b/package/mstpd/mstpd.hash @@ -1,4 +1,5 @@ # locally computed sha256 91a1862548b5b509caa2e96e5fb9912bc98d4d58cc98e99a577824735756c14d mstpd-0.0.9.tar.gz +sha256 03d1ff4ca189d54322562cb2891888768af719d2c73ceafa5f1ca96133dffeb2 mstpd-0.1.0.tar.gz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 LICENSE sha256 c5cfd44652276184374adf454150d436ce958ce50acc4ef9ccb3605a5ca7a9d3 hmac_md5.c diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk index a870352869..907d094242 100644 --- a/package/mstpd/mstpd.mk +++ b/package/mstpd/mstpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSTPD_VERSION = 0.0.9 +MSTPD_VERSION = 0.1.0 MSTPD_SITE = $(call github,mstpd,mstpd,$(MSTPD_VERSION)) MSTPD_AUTORECONF = YES MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:30:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 16:30:12 -0600 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220107105223.01912574@windsurf> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107105223.01912574@windsurf> Message-ID: On Fri, Jan 7, 2022 at 3:52 AM Thomas Petazzoni wrote: > > Hello James, > > On Thu, 6 Jan 2022 19:12:51 -0600 > James Hilliard wrote: > > > > +$(2)_CARGO_ENV += \ > > > + CARGO_HOME=$$(HOST_DIR)/share/cargo \ > > > + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > > > + CARGO_TARGET_APPLIES_TO_HOST="false" > > > > Maybe want to set these additional options as well so that packages > > using cargo can > > build with only the env variables set(in some cases at least I think), > > Thanks for the suggestion. However, could you be more specific than > "maybe" and "I think" ? The way you put it seems like we don't really > know why those variables would be useful and what they do. > > > still probably > > need to pass some command line args but this should reduce the amount at least: > > RUSTC_TARGET_TRIPLE = $(subst -,_,$(call UPPERCASE,$(RUSTC_TARGET_NAME))) > > Which command line arguments would be replaced by those variables? > > > PKG_RUST_CARGO_ENV = \ > > CARGO_HOME=$(HOST_DIR)/share/cargo \ > > This one we already pass. > > > CARGO_BUILD_TARGET=$(RUSTC_TARGET_NAME) \ > > This one would replace the --target argument? Just to understand, what > would be the advantage of the variable compared to the comand line > argument? Might be better for reusing this env for indirect cargo build invocations like those done by python-setuptools-rust. > > > CARGO_INSTALL_ROOT=$(TARGET_DIR)/usr \ > > This would replace --root $$(TARGET_DIR)/usr/ I suppose. Here as well, > any benefit/drawback of arguments vs. variables? Yeah, mostly for indict invocations as well. > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > How come things are working today with this one? I think this is currently set in the cargo config file. > > > > > HOST_PKG_RUST_CARGO_ENV = \ > > CARGO_HOME=$(HOST_DIR)/share/cargo \ > > This one already passed. > > > CARGO_INSTALL_ROOT=$(HOST_DIR) \ > > This would replace --root $$(HOST_DIR) I suppose. Yeah, sounds right. > > > RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" > > This is already passed, although replicated between the build and > install steps of the host variant. > > So essentially the only questions is: > > - Advantage of variables vs. command line options Makes setting cargo variables when cargo is not directly invoked simpler. > > - Relevance of CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc Set via CARGO_HOME currently, but I think may allow the cargo config to not be required. > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From romain.naour at smile.fr Fri Jan 7 22:39:55 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 23:39:55 +0100 Subject: [Buildroot] [PATCH] support/scripts/generate-gitlab-ci-yml: ignore branch name prefix containing a single hyphen Message-ID: <20220107223955.148266-1-romain.naour@smile.fr> The commit [1] added a sed command used to retreive a pattern to keep only defconfigs whose name start with the pattern. "-defconfigs-" The sed command doesn't work as expected if contains a single hyphen [2]: "qemu-6.2.0-defconfigs-qemu" Update the sed command to ignore completely the part before "-defconfigs-". [1] 65d2f04c012af492a9b9da04dfa3b3cbd20347f1 [2] http://lists.busybox.net/pipermail/buildroot/2022-January/632507.html Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- support/scripts/generate-gitlab-ci-yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index 3e0c68091b..bd79807914 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -66,8 +66,8 @@ gen_tests() { (*-defconfigs) do_defconfigs=base ;; - (*-defconfigs-*) - pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%[^\-]*-defconfigs-\(.*\)%\1%') + (*-defconfigs-*) + pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%^.*-defconfigs-\(.*\)%\1%') defconfigs=( $(cd configs; LC_ALL=C ls -1 | grep ^${pattern}) ) do_defconfigs=base ;; -- 2.31.1 From fontaine.fabrice at gmail.com Fri Jan 7 22:57:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 23:57:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/xfsprogs: bump to version 5.14.2 Message-ID: <20220107225739.2145636-1-fontaine.fabrice@gmail.com> liburcu is a mandatory dependency since version 5.14.0 and https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e4da1b16e29f6fe6b34de9b9b0f97141fb2e1855 https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?h=v5.14.2 Signed-off-by: Fabrice Fontaine --- package/xfsprogs/Config.in | 3 +++ package/xfsprogs/xfsprogs.hash | 2 +- package/xfsprogs/xfsprogs.mk | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index b8e07cc83d..a382b63ff8 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -1,12 +1,15 @@ comment "xfsprogs needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_XFSPROGS bool "xfsprogs" + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH + select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index b379839e7e..bb546601dc 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9 xfsprogs-5.10.0.tar.xz +sha256 01ccd3ef9df2837753a5d876b8da84ea957d13d7a461b8c46e8afa4eb09aabc8 xfsprogs-5.14.2.tar.xz # Hash for license files sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 71d02278e9..695471bddc 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,13 +4,13 @@ # ################################################################################ -XFSPROGS_VERSION = 5.10.0 +XFSPROGS_VERSION = 5.14.2 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -XFSPROGS_DEPENDENCIES = inih util-linux +XFSPROGS_DEPENDENCIES = inih liburcu util-linux XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" XFSPROGS_CONF_OPTS = \ -- 2.34.1 From thomas.petazzoni at bootlin.com Fri Jan 7 22:59:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 23:59:59 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107105223.01912574@windsurf> Message-ID: <20220107235959.2638b513@windsurf> Hello James, On Fri, 7 Jan 2022 16:30:12 -0600 James Hilliard wrote: > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > > > How come things are working today with this one? > > I think this is currently set in the cargo config file. Ah, right: [target. at RUSTC_TARGET_NAME@] linker = "@CROSS_PREFIX at gcc" in package/rustc/cargo-config.in > > - Relevance of CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > Set via CARGO_HOME currently, but I think may allow the cargo config to not > be required. I'm no sure why you say this is set via CARGO_HOME? Because the config file is stored in $(CARGO_HOME)/config ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Fri Jan 7 23:10:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 00:10:34 +0100 Subject: [Buildroot] [WIP 1/4] package/python-gast: new host-only package Message-ID: <20220107231037.1380602-1-arnout@mind.be> Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-gast/python-gast.hash | 5 +++++ package/python-gast/python-gast.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-gast/python-gast.hash create mode 100644 package/python-gast/python-gast.mk diff --git a/package/python-gast/python-gast.hash b/package/python-gast/python-gast.hash new file mode 100644 index 0000000000..f16d001a6a --- /dev/null +++ b/package/python-gast/python-gast.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/gast/json +md5 fdff900805e03e9dd76d377eb4cbaed7 gast-0.5.3.tar.gz +sha256 cfbea25820e653af9c7d1807f659ce0a0a9c64f2439421a7bba4f0983f532dea gast-0.5.3.tar.gz +# Locally computed sha256 checksums +sha256 6a04bbabd9b48bea6bf7c0bd3f3a062e1476b3c403a746448fd69b0d902e148f LICENSE diff --git a/package/python-gast/python-gast.mk b/package/python-gast/python-gast.mk new file mode 100644 index 0000000000..e02e87fb23 --- /dev/null +++ b/package/python-gast/python-gast.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-gast +# +################################################################################ + +PYTHON_GAST_VERSION = 0.5.3 +PYTHON_GAST_SOURCE = gast-$(PYTHON_GAST_VERSION).tar.gz +PYTHON_GAST_SITE = https://files.pythonhosted.org/packages/48/a3/0bd844c54ae8141642088b7ae09dd38fec2ec7faa9b7d25bb6a23c1f266f +PYTHON_GAST_SETUP_TYPE = setuptools +PYTHON_GAST_LICENSE = BSD-3-Clause +PYTHON_GAST_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) -- 2.31.1 From arnout at mind.be Fri Jan 7 23:10:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 00:10:35 +0100 Subject: [Buildroot] [WIP 2/4] package/python-beniget: new host-only package In-Reply-To: <20220107231037.1380602-1-arnout@mind.be> References: <20220107231037.1380602-1-arnout@mind.be> Message-ID: <20220107231037.1380602-2-arnout@mind.be> Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-beniget/python-beniget.hash | 5 +++++ package/python-beniget/python-beniget.mk | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/python-beniget/python-beniget.hash create mode 100644 package/python-beniget/python-beniget.mk diff --git a/package/python-beniget/python-beniget.hash b/package/python-beniget/python-beniget.hash new file mode 100644 index 0000000000..cd4fa7b873 --- /dev/null +++ b/package/python-beniget/python-beniget.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/beniget/json +md5 a2bbe7f17f10f9c127d8ef00692ddc55 beniget-0.4.1.tar.gz +sha256 75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c beniget-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 64ad3e304e9d2d8731c26ac3e652335a6016e38be2f71fe30350be51c6d500b0 LICENSE diff --git a/package/python-beniget/python-beniget.mk b/package/python-beniget/python-beniget.mk new file mode 100644 index 0000000000..9970546b14 --- /dev/null +++ b/package/python-beniget/python-beniget.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-beniget +# +################################################################################ + +PYTHON_BENIGET_VERSION = 0.4.1 +PYTHON_BENIGET_SOURCE = beniget-$(PYTHON_BENIGET_VERSION).tar.gz +PYTHON_BENIGET_SITE = https://files.pythonhosted.org/packages/14/e7/50cbac38f77eca8efd39516be6651fdb9f3c4c0fab8cf2cf05f612578737 +PYTHON_BENIGET_SETUP_TYPE = setuptools +PYTHON_BENIGET_LICENSE = BSD-3-Clause +PYTHON_BENIGET_LICENSE_FILES = LICENSE +HOST_PYTHON_BENIGET_DEPENDENCIES = host-python-gast + +$(eval $(host-python-package)) -- 2.31.1 From arnout at mind.be Fri Jan 7 23:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 00:10:36 +0100 Subject: [Buildroot] [WIP 3/4] package/python-pythran: new host-only package In-Reply-To: <20220107231037.1380602-1-arnout@mind.be> References: <20220107231037.1380602-1-arnout@mind.be> Message-ID: <20220107231037.1380602-3-arnout@mind.be> Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pythran/python-pythran.hash | 6 ++++++ package/python-pythran/python-pythran.mk | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 package/python-pythran/python-pythran.hash create mode 100644 package/python-pythran/python-pythran.mk diff --git a/package/python-pythran/python-pythran.hash b/package/python-pythran/python-pythran.hash new file mode 100644 index 0000000000..a24bb4dc4c --- /dev/null +++ b/package/python-pythran/python-pythran.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/pythran/json +md5 e09e90484771937ab499380858bdb18d pythran-0.11.0.tar.gz +sha256 0b2cba712e09f7630879dff69f268460bfe34a6d6000451b47d598558a92a875 pythran-0.11.0.tar.gz +# Locally computed sha256 checksums +sha256 0be9f14c66a9a3cb66d5263a6495437862ce0c9cdf60d4a6c36d1e51b1244c6e LICENSE +sha256 e1c0ed0a99e4462016d79d835f1f479b78c4d4a07fe66598e97f449503ffd178 docs/LICENSE.rst diff --git a/package/python-pythran/python-pythran.mk b/package/python-pythran/python-pythran.mk new file mode 100644 index 0000000000..8234513af3 --- /dev/null +++ b/package/python-pythran/python-pythran.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-pythran +# +################################################################################ + +PYTHON_PYTHRAN_VERSION = 0.11.0 +PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/88/9f/161f08131abf7f23920cee29b691de27f10fd97ac09fb2f3532b3a7f9b96 +PYTHON_PYTHRAN_SETUP_TYPE = setuptools +PYTHON_PYTHRAN_LICENSE = BSD-3-Clause +PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst +HOST_PYTHON_PYTHRAN_DEPENDENCIES = \ + host-python-beniget \ + host-python-gast \ + host-python-numpy \ + host-python-ply + +$(eval $(host-python-package)) -- 2.31.1 From arnout at mind.be Fri Jan 7 23:10:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 00:10:37 +0100 Subject: [Buildroot] [WIP 4/4] package/python-scipy: new package In-Reply-To: <20220107231037.1380602-1-arnout@mind.be> References: <20220107231037.1380602-1-arnout@mind.be> Message-ID: <20220107231037.1380602-4-arnout@mind.be> From: Jagan Teki Signed-off-by: Jagan Teki [Arnout: - Indent hash file with two spaces. - Bump to 1.7.3 to fix build failure with recent GCC. - Get from github instead of PyPI. - Add host-meson and host-python-pythran dependencies. - Properly propagate Config.in dependencies. - Correct usage of BR2_INSTALL_LIBSTDCPP symbol. - Remove F77, no longer used. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- This is v9 but changed so much that it warrants starting anew :-) The build still fails in several ways that are due to broken cross-compilation. A few examples: compile options: '-c' extra options: '-march=native' CCompilerOpt.dist_test[581] : CCompilerOpt._dist_test_spawn[716] : Command (.../host/bin/aarch64-linux-gcc -Wno-unused-result -Wsign-compare -DNDEBUG ... -fPIC -c .../host/lib/python3.10/site-packages/numpy/distutils/checks/test_flags.c -o /tmp/.../distutils/checks/test_flags.o -MMD -MF /tmp/.../numpy/distutils/checks/test_flags.o.d -march=native) failed with exit status 1 output -> cc1: error: unknown value ?native? for ?-march? (more errors like this when trying to use SSE flags on ARM) compile options: '-I.../host/lib/python3.10/site-packages/numpy/core/include -Ibuild/src.linux-x86_64-3.10/numpy/distutils/include -c (i.e. using host includes for target build) --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/python-scipy/Config.in | 29 ++++++++++++++ package/python-scipy/python-scipy.hash | 9 +++++ package/python-scipy/python-scipy.mk | 52 ++++++++++++++++++++++++++ 5 files changed, 94 insertions(+) create mode 100644 package/python-scipy/Config.in create mode 100644 package/python-scipy/python-scipy.hash create mode 100644 package/python-scipy/python-scipy.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7874677f7e..51bdb6c857 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1123,6 +1123,7 @@ F: package/libxcrypt/ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ +F: package/python-scipy/ F: package/reaver/ F: support/testing/tests/package/br2-external/python-pybind F: support/testing/tests/package/sample_python_pybind.py @@ -1250,6 +1251,8 @@ F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig +F: package/python-pybind/ +F: package/python-scipy/ N: James Hilliard F: package/apcupsd/ diff --git a/package/Config.in b/package/Config.in index 3a0cc0c585..ad706a3587 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1213,6 +1213,7 @@ menu "External python modules" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" source "package/python-schedule/Config.in" + source "package/python-scipy/Config.in" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" source "package/python-see/Config.in" diff --git a/package/python-scipy/Config.in b/package/python-scipy/Config.in new file mode 100644 index 0000000000..98d02b28a8 --- /dev/null +++ b/package/python-scipy/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_PYTHON_SCIPY + bool "python-scipy" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # openblas + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS # lapack + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_HAS_FORTRAN # lapack + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_LAPACK + select BR2_PACKAGE_OPENBLAS + select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PYBIND + help + The SciPy library is one of the core packages that make up the + SciPy stack. It provides many user-friendly and efficient + numerical routines such as routines for numerical integration, + interpolation, optimization, linear algebra and statistics. + + https://www.scipy.org/scipylib/ + +comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \ + !BR2_INSTALL_LIBSTDCPP || \ + (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash new file mode 100644 index 0000000000..ef9a24e05d --- /dev/null +++ b/package/python-scipy/python-scipy.hash @@ -0,0 +1,9 @@ +# Locally generated +sha256 4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694 scipy-1.7.3.tar.xz +sha256 5cbdbe33385779958be8b9310497e32d2eec144d82ef425780d3e19f8af6de76 LICENSE.txt +sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE +sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt +sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE +sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/dsolve/SuperLU/License.txt +sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING +sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb scipy/spatial/qhull_src/COPYING.txt diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk new file mode 100644 index 0000000000..cadc58f6a9 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# python-scipy +# +################################################################################ + +PYTHON_SCIPY_VERSION = 1.7.3 +PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.xz +PYTHON_SCIPY_SITE = https://github.com/scipy/scipy/releases/download/v$(PYTHON_SCIPY_VERSION) +PYTHON_SCIPY_LICENSE = \ + BSD-3-Clause, \ + BSD-2-Clause, \ + BSD, \ + BSD-Style, \ + Apache-2.0, \ + MIT +PYTHON_SCIPY_LICENSE_FILES = \ + LICENSE.txt \ + scipy/linalg/src/lapack_deprecations/LICENSE \ + scipy/ndimage/LICENSE.txt \ + scipy/optimize/tnc/LICENSE \ + scipy/sparse/linalg/dsolve/SuperLU/License.txt \ + scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING \ + scipy/spatial/qhull_src/COPYING.txt +PYTHON_SCIPY_DEPENDENCIES += \ + host-meson \ + host-python-numpy \ + host-python-pythran \ + lapack \ + openblas \ + python-numpy \ + python-pybind +PYTHON_SCIPY_INSTALL_STAGING = YES + +PYTHON_SCIPY_SETUP_TYPE = setuptools +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib" + +# Provide system configuration options to numpy distutils extenions, telling +# to find all include files and libraries in staging directory. +define PYTHON_SCIPY_CONFIGURE_CMDS + -rm -f $(@D)/site.cfg + echo "[DEFAULT]" >> $(@D)/site.cfg + echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(@D)/site.cfg + echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg +endef + +$(eval $(python-package)) -- 2.31.1 From thomas.petazzoni at bootlin.com Fri Jan 7 23:10:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 00:10:47 +0100 Subject: [Buildroot] [PATCH v3] package/cryptopp: add a target build configuration In-Reply-To: <20200728095346.2103418-1-kamel.bouhara@bootlin.com> References: <20200728095346.2103418-1-kamel.bouhara@bootlin.com> Message-ID: <20220108001047.79e8bc24@windsurf> Hello Kamel, I finally applied, but with a good number of changes, see below. On Tue, 28 Jul 2020 11:53:46 +0200 Kamel Bouhara wrote: > diff --git a/package/cryptopp/0001-Add-fully-qualified-SONAME-to-shared-object-for-Linu.patch b/package/cryptopp/0001-Add-fully-qualified-SONAME-to-shared-object-for-Linu.patch > new file mode 100644 > index 0000000000..11f3090767 > --- /dev/null > +++ b/package/cryptopp/0001-Add-fully-qualified-SONAME-to-shared-object-for-Linu.patch > @@ -0,0 +1,30 @@ > +From 78eb43f50978ffd780cf31b1cea6736dadc6b155 Mon Sep 17 00:00:00 2001 > +From: Kamel Bouhara > +Date: Mon, 6 Jul 2020 17:10:55 +0200 > +Subject: [PATCH] Add fully-qualified SONAME to shared object for Linux That's not really what the patch does. What it does is create a symlink that matches with the SONAME of the library. The question is: how was it working before. Answer: because of the ldconfig call that creates such symlinks. But of course, we don't call ldconfig when cross-compiling, hence the need for your change. So, I improved the commit log, also changed the GNUmakefile-cross file, and submitted that upstream: https://github.com/weidai11/cryptopp/pull/1101 > define HOST_CRYPTOPP_INSTALL_CMDS > - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-lib > + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(HOST_DIR)" LDCONFIG=/bin/true install-lib These are unrelated changes, so I dropped them. > endef > > +define CRYPTOPP_EXTRACT_CMDS > + $(UNZIP) $(CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) > +endef > + > +CRYPTOPP_CXXFLAGS = $(TARGET_CFLAGS) -fPIC > + > +CRYPTOPP_MAKE_OPTS = \ > + $(TARGET_CONFIGURE_OPTS) \ > + CXXFLAGS="$(CRYPTOPP_CXXFLAGS)" You were missing the logic to handle gcc < 4.9 that exists for the host package, and that we also need for the target package. > + > +define CRYPTOPP_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CRYPTOPP_MAKE_OPTS) shared > +endef > + > +define CRYPTOPP_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true install-lib PREFIX=$(TARGET_DIR) is wrong. It should have been PREFIX=/usr DESTDIR=$(TARGET_DIR) > +endef > + > +define CRYPTOPP_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" libcryptopp.pc Building the libcryptopp.pc file is really a build step, so I moved this to the build step. > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" LDCONFIG=/bin/true install-lib Same as above, PREFIX=$(STAGING_DIR) is wrong, it should be PREFIX=/usr DESTDIR=$(STAGING_DIR) Applied with those changes. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Fri Jan 7 23:12:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 00:12:06 +0100 Subject: [Buildroot] [PATCH v8 5/5] package/python-scipy: new package In-Reply-To: <20200407111515.21131-6-jagan@amarulasolutions.com> References: <20200407111515.21131-1-jagan@amarulasolutions.com> <20200407111515.21131-6-jagan@amarulasolutions.com> Message-ID: <42fd555a-d9bc-c8be-8738-8bbdebf22497@mind.be> On 07/04/2020 13:15, Jagan Teki wrote: > Add python-scipy with 1.4.1 release version. > > Signed-off-by: Jagan Teki After merging the python-pybind changes, I tried to merge scipy as well. I made a bunch of fixes, updated the version, but unfortunately it still doesn't build due to cross-compilation issues. So I've sent a WIP version of the series and marked this one as superseded. I'll mark the WIP version as Changes Requested as well, since it doesn't work. Regards, Arnout > --- > Changes for v8: > - none > Changes for v7: > - update the commit message > - fix sha256 value of pybind11 LICENCE > > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-scipy/Config.in | 22 ++++++++++++ > package/python-scipy/python-scipy.hash | 9 +++++ > package/python-scipy/python-scipy.mk | 46 ++++++++++++++++++++++++++ > 5 files changed, 79 insertions(+) > create mode 100644 package/python-scipy/Config.in > create mode 100644 package/python-scipy/python-scipy.hash > create mode 100644 package/python-scipy/python-scipy.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index f06d54a662..3203b0bc47 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1154,6 +1154,7 @@ F: configs/orangepi_zero_plus2_defconfig > F: configs/pine64_defconfig > F: configs/pine64_sopine_defconfig > F: package/python-pybind11 > +F: package/python-scipy > > N: James Hilliard > F: package/gensio/ > diff --git a/package/Config.in b/package/Config.in > index afe32f52b4..f5af9b07ea 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1120,6 +1120,7 @@ menu "External python modules" > source "package/python-scandir/Config.in" > source "package/python-scapy/Config.in" > source "package/python-schedule/Config.in" > + source "package/python-scipy/Config.in" > source "package/python-sdnotify/Config.in" > source "package/python-secretstorage/Config.in" > source "package/python-see/Config.in" > diff --git a/package/python-scipy/Config.in b/package/python-scipy/Config.in > new file mode 100644 > index 0000000000..4d8227c31a > --- /dev/null > +++ b/package/python-scipy/Config.in > @@ -0,0 +1,22 @@ > +config BR2_PACKAGE_PYTHON_SCIPY > + bool "python-scipy" > + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy > + depends on BR2_TOOLCHAIN_HAS_FORTRAN > + depends on BR2_TOOLCHAIN_BUILDROOT_CXX > + depends on BR2_PACKAGE_PYTHON3 > + select BR2_PACKAGE_PYTHON_NUMPY > + select BR2_PACKAGE_LAPACK > + select BR2_PACKAGE_OPENBLAS > + help > + The SciPy library is one of the core packages that make up the SciPy > + stack. It provides many user-friendly and efficient numerical > + routines such as routines for numerical integration, interpolation, > + optimization, linear algebra and statistics. > + > + https://www.scipy.org/scipylib/ > + > +comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl" > + depends on BR2_PACKAGE_PYTHON3 > + depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \ > + !BR2_TOOLCHAIN_BUILDROOT_CXX || \ > + (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash > new file mode 100644 > index 0000000000..c9d295ef6b > --- /dev/null > +++ b/package/python-scipy/python-scipy.hash > @@ -0,0 +1,9 @@ > +# Locally generated > +sha256 dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59 scipy-1.4.1.tar.gz > +sha256 5cbdbe33385779958be8b9310497e32d2eec144d82ef425780d3e19f8af6de76 LICENSE.txt > +sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE > +sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt > +sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE > +sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/dsolve/SuperLU/License.txt > +sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING > +sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb scipy/spatial/qhull_src/COPYING.txt > diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk > new file mode 100644 > index 0000000000..1d66b146ec > --- /dev/null > +++ b/package/python-scipy/python-scipy.mk > @@ -0,0 +1,46 @@ > +################################################################################ > +# > +# python-scipy > +# > +################################################################################ > + > +PYTHON_SCIPY_VERSION = 1.4.1 > +PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz > +PYTHON_SCIPY_SITE = https://pypi.python.org/packages/04/ab/e2eb3e3f90b9363040a3d885ccc5c79fe20c5b8a3caa8fe3bf47ff653260 > +PYTHON_SCIPY_LICENSE = BSD-3-Clause, BSD-2-Clause, BSD, BSD-Style, \ > + Apache-2.0, MIT > +PYTHON_SCIPY_LICENSE_FILES = \ > + LICENSE.txt \ > + scipy/linalg/src/lapack_deprecations/LICENSE \ > + scipy/ndimage/LICENSE.txt \ > + scipy/optimize/tnc/LICENSE \ > + scipy/sparse/linalg/dsolve/SuperLU/License.txt \ > + scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING \ > + scipy/spatial/qhull_src/COPYING.txt > +PYTHON_SCIPY_SETUP_TYPE = setuptools > +PYTHON_SCIPY_DEPENDENCIES += \ > + host-python-numpy \ > + host-python-pybind11 \ > + lapack \ > + openblas \ > + python-numpy > + > +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 > +PYTHON_SCIPY_ENV += F90=$(TARGET_CROSS)gfortran F77=$(TARGET_CROSS)gfortran > + > +# Provide system configuration options to numpy distutils extenions, telling > +# to find all include files and libraries in staging directory. > +define PYTHON_SCIPY_CONFIGURE_CMDS > + -rm -f $(@D)/site.cfg > + echo "[DEFAULT]" >> $(@D)/site.cfg > + echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(@D)/site.cfg > + echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg > +endef > + > +# Use the target numpy pkg-config configuration files modified for target > +# cross-compilation. Without this, numpy distutils will cause the linker to > +# link with host libnpymath.a. > +PYTHON_SCIPY_ENV += NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH) > +PYTHON_SCIPY_INSTALL_STAGING = YES > + > +$(eval $(python-package)) > From thomas.petazzoni at bootlin.com Fri Jan 7 23:12:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 00:12:52 +0100 Subject: [Buildroot] [PATCH] package/python-numpy: simplify PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES Message-ID: <20220107231253.1546336-1-thomas.petazzoni@bootlin.com> The PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES macro was introduced in commit 2426002d6fc81d0b023e3f3b3ee4e94ab29438cb ("package/python-numpy: fixup npymath.ini for numpy extensions"). However, it turns out that by using $(PYTHON3_PATH), we can simplify the intermediate variables, to the point where they are no longer needed. Not having the intermediate variables makes the logic a bit easier to understand. Also, the logic is changed to use a single sed expression, which we pass to $(SED). Signed-off-by: Thomas Petazzoni --- package/python-numpy/python-numpy.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index f367b556ef..9e8b032b78 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -40,12 +40,9 @@ endef # it uses host libraries (like libnpymath.a). # So, the numpy distutils extension packages would explicitly link this # config path for their package environment. -PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy -PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES - sed -e '/^pkgdir=/d' \ - -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ - -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini + $(SED) '/^pkgdir=/d;/^prefix=/i pkgdir=$(PYTHON3_PATH)/site-packages/numpy/core' \ + $(PYTHON3_PATH)/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini endef PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 23:13:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 00:13:54 +0100 Subject: [Buildroot] [git commit] configs/imx6-sabresd: bump U-Boot and kernel Message-ID: <20220107230754.A5FB6834E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b7d2989db6a1347107235acb487f8660dfcd733 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump U-Boot to 2021.10 and kernel to 5.15.12 version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6-sabresd_defconfig | 9 +++++---- configs/imx6-sabresd_qt5_defconfig | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 5a39f333d1..19986f2cbb 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,15 +24,16 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 1330b5cfbf..38a86131dd 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,15 +30,16 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" From thomas.petazzoni at bootlin.com Fri Jan 7 22:28:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 23:28:05 +0100 Subject: [Buildroot] [git commit] package/cryptopp: add a target variant Message-ID: <20220107230754.9ECE38349A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf4cf9de833e2d571d98d1ca935ea08a3468e463 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master So far, cryptopp only had a host variant, but some use-cases require this library on the target, so this adjusts the cryptopp package accordingly. One patch (submitted upstream) is needed to have the proper symlink corresponding to the SONAME of the shared library. Signed-off-by: Kamel Bouhara Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...kefile-add-missing-shared-library-symlink.patch | 62 ++++++++++++++++++++++ package/cryptopp/Config.in | 8 +++ package/cryptopp/cryptopp.mk | 31 +++++++++++ 4 files changed, 102 insertions(+) diff --git a/package/Config.in b/package/Config.in index 3a0cc0c585..b424d20de4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1397,6 +1397,7 @@ menu "Crypto" source "package/botan/Config.in" source "package/ca-certificates/Config.in" source "package/cryptodev/Config.in" + source "package/cryptopp/Config.in" source "package/gcr/Config.in" source "package/gnutls/Config.in" source "package/libargon2/Config.in" diff --git a/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch b/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch new file mode 100644 index 0000000000..5f87414d53 --- /dev/null +++ b/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch @@ -0,0 +1,62 @@ +From e4c2e3bc8174f24cf63923619f5d06d85b84ae1d Mon Sep 17 00:00:00 2001 +From: Kamel Bouhara +Date: Fri, 7 Jan 2022 22:59:23 +0100 +Subject: [PATCH] GNUmakefile: add missing shared library symlink + +The GNUmakefile install-lib target currently installs the following +symlink: + + libcryptopp.so -> libcryptopp.so.8.6.0 + +However, it does not create the following symlink: + + libcryptopp.so.8 -> libcryptopp.so.8.6.0 + +This symlink is necessary at runtime because libcryptopp.so.8 is the +SONAME of the cryptopp library, and therefore this is what the dynamic +loader will search when starting a program that is linked against +cryptopp. + +For native compilation, the 'ldconfig' invocation that immediately +follows will create that symlink, so everything works. + +For cross-compilation however, ldconfig can't be used, and therefore +LDCONFIG is passed as /bin/true, and therefore it doesn't create the +symlink. So instead, create it directly inside the GNUmakefile, +without relying on ldconfig. + +Upstream: https://github.com/weidai11/cryptopp/pull/1101 +Signed-off-by: Kamel Bouhara +Signed-off-by: Thomas Petazzoni +--- + GNUmakefile | 1 + + GNUmakefile-cross | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/GNUmakefile b/GNUmakefile +index 23273edb..3b55e420 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -1412,6 +1412,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) + $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) + ifeq ($(HAS_SOLIB_VERSION),1) + -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so ++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + $(LDCONF) $(DESTDIR)$(LIBDIR) + endif + endif +diff --git a/GNUmakefile-cross b/GNUmakefile-cross +index 9847f04b..a2b87e4a 100644 +--- a/GNUmakefile-cross ++++ b/GNUmakefile-cross +@@ -856,6 +856,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) + $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) + ifeq ($(HAS_SOLIB_VERSION),1) + -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so ++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + $(LDCONF) $(DESTDIR)$(LIBDIR) + endif + endif +-- +2.33.1 + diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in new file mode 100644 index 0000000000..4ead5339ab --- /dev/null +++ b/package/cryptopp/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CRYPTOPP + bool "cryptopp" + depends on !BR2_STATIC_LIBS + help + A free C++ class library of cryptographic schemes + +comment "cryptopp needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 6711a37fbc..5e6eb9644d 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -36,4 +36,35 @@ define HOST_CRYPTOPP_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-lib endef +define CRYPTOPP_EXTRACT_CMDS + $(UNZIP) $(CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) +endef + +CRYPTOPP_CXXFLAGS = $(TARGET_CXXFLAGS) -fPIC + +# _mm256_broadcastsi128_si256 has been added only in gcc 4.9 +ifneq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_AVX2 +endif + +CRYPTOPP_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(CRYPTOPP_CXXFLAGS)" + +define CRYPTOPP_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CRYPTOPP_MAKE_OPTS) \ + PREFIX=/usr shared libcryptopp.pc +endef + +define CRYPTOPP_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) \ + LDCONFIG=/bin/true install-lib +endef + +define CRYPTOPP_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) \ + LDCONFIG=/bin/true install-lib +endef + +$(eval $(generic-package)) $(eval $(host-generic-package)) From thomas.petazzoni at bootlin.com Fri Jan 7 23:14:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 00:14:17 +0100 Subject: [Buildroot] [PATCH v2] configs/imx6-sabresd: Bump U-Boot and kernel In-Reply-To: <20220104203242.1175845-1-festevam@gmail.com> References: <20220104203242.1175845-1-festevam@gmail.com> Message-ID: <20220108001417.5c140682@windsurf> On Tue, 4 Jan 2022 17:32:42 -0300 Fabio Estevam wrote: > Bump U-Boot to 2021.10 and kernel to 5.15.12 version. > > Signed-off-by: Fabio Estevam > --- > Changes since v1: > - Also select BR2_TARGET_UBOOT_NEEDS_OPENSSL=y as a requirement for > U-Boot 2021.10. Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Fri Jan 7 23:24:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 00:24:31 +0100 Subject: [Buildroot] [PATCH 1/3] package/libks: new package In-Reply-To: <20211106111145.1648068-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 6 Nov 2021 12:11:43 +0100") References: <20211106111145.1648068-1-bernd.kuhls@t-online.de> Message-ID: <87k0fbjfio.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Needed to bump freeswitch to 1.10.7. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 23:24:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 00:24:40 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/sofia-sip: bump version to 1.13.6 In-Reply-To: <20211106111145.1648068-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 6 Nov 2021 12:11:44 +0100") References: <20211106111145.1648068-1-bernd.kuhls@t-online.de> <20211106111145.1648068-2-bernd.kuhls@t-online.de> Message-ID: <87fspzjfif.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Needed to bump freeswitch to 1.10.7. > Signed-off-by: Bernd Kuhls > --- > v2: no changes, added libks to v2 of this patch series Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 23:26:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 00:26:07 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/freeswitch: bump version to 1.10.7 In-Reply-To: <20211106111145.1648068-3-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 6 Nov 2021 12:11:45 +0100") References: <20211106111145.1648068-1-bernd.kuhls@t-online.de> <20211106111145.1648068-3-bernd.kuhls@t-online.de> Message-ID: <87bl0njfg0.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 > Removed patch, upstream applied a different fix: > https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b > Added optional dependency to libks, needed due to upstream commit > https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 > Added upstream patches to fix build errors. > Signed-off-by: Bernd Kuhls > --- > v2: no changes, added libks to v2 of this patch series This series was marked as superseeded in patchwork, but I applied it anyway as freeswitch 1.10.7 fixes a number of fairly serious security issues. Was there any specific reason why this was marked as superseeded? Updated the commit message to mention the security fixes and applied, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 23:26:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 00:26:20 +0100 Subject: [Buildroot] [git commit] package/libks: new package Message-ID: <20220107232021.F002C8225C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5752d18bfcdb060c9d3b8c13330344cbdee74b75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Needed to bump freeswitch to 1.10.7. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/libks/Config.in | 16 ++++++++++++++++ package/libks/libks.hash | 3 +++ package/libks/libks.mk | 14 ++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7874677f7e..25b6a56dc0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -371,6 +371,7 @@ F: package/libglfw/ F: package/libglu/ F: package/libhdhomerun/ F: package/libilbc/ +F: package/libks/ F: package/libldns/ F: package/libmicrohttpd/ F: package/libminiupnpc/ diff --git a/package/Config.in b/package/Config.in index b424d20de4..5afd7131fe 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1977,6 +1977,7 @@ menu "Other" source "package/libglob/Config.in" source "package/libical/Config.in" source "package/libite/Config.in" + source "package/libks/Config.in" source "package/liblinear/Config.in" source "package/libloki/Config.in" source "package/libnpth/Config.in" diff --git a/package/libks/Config.in b/package/libks/Config.in new file mode 100644 index 0000000000..366b5bda71 --- /dev/null +++ b/package/libks/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LIBKS + bool "libks" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Foundational support for signalwire C products + + https://github.com/signalwire/libks + +comment "libks needs a toolchain w/ C++, threads, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libks/libks.hash b/package/libks/libks.hash new file mode 100644 index 0000000000..5acbcd1ea6 --- /dev/null +++ b/package/libks/libks.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69 libks-1.7.0.tar.gz +sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk new file mode 100644 index 0000000000..adf0107b30 --- /dev/null +++ b/package/libks/libks.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libks +# +################################################################################ + +LIBKS_VERSION = 1.7.0 +LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) +LIBKS_LICENSE = MIT +LIBKS_LICENSE_FILES = copyright +LIBKS_INSTALL_STAGING = YES +LIBKS_DEPENDENCIES = openssl util-linux + +$(eval $(cmake-package)) From peter at korsgaard.com Fri Jan 7 23:26:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 00:26:21 +0100 Subject: [Buildroot] [git commit] package/sofia-sip: bump version to 1.13.6 Message-ID: <20220107232022.04480834E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30b2dbeae3930084634e126ead4e1e2930a58bad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Needed to bump freeswitch to 1.10.7. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 0484cc1501..6f6ff6d052 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.tar.gz +sha256 d39a3287038f1c9a747c1abc94a1379a726a9dfaf969285f955141883f7b810f sofia-sip-1.13.6-4152840260.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index fb565637eb..2bac480542 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.3-8071e8accd -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs +SOFIA_SIP_VERSION = 1.13.6-4152840260 +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Fri Jan 7 23:26:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 00:26:21 +0100 Subject: [Buildroot] [git commit] package/freeswitch: security bump version to 1.10.7 Message-ID: <20220107232022.0E707834E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=829777c1c9a0d40c8c5753e6fe86acfc78edfc92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: - CVE-2021-41105: FreeSWITCH susceptible to Denial of Service via invalid SRTP packets When handling SRTP calls, FreeSWITCH is susceptible to a DoS where calls can be terminated by remote attackers. This attack can be done continuously, thus denying encrypted calls during the attack. https://github.com/signalwire/freeswitch/security/advisories/GHSA-jh42-prph-gp36 - CVE-2021-41157: FreeSWITCH does not authenticate SIP SUBSCRIBE requests by default By default, SIP requests of the type SUBSCRIBE are not authenticated in the affected versions of FreeSWITCH. https://github.com/signalwire/freeswitch/security/advisories/GHSA-g7xg-7c54-rmpj - CVE-2021-37624: FreeSWITCH does not authenticate SIP MESSAGE requests, leading to spam and message spoofing By default, SIP requests of the type MESSAGE (RFC 3428) are not authenticated in the affected versions of FreeSWITCH. MESSAGE requests are relayed to SIP user agents registered with the FreeSWITCH server without requiring any authentication. Although this behaviour can be changed by setting the auth-messages parameter to true, it is not the default setting. https://github.com/signalwire/freeswitch/security/advisories/GHSA-mjcm-q9h8-9xv3 - CVE-2021-41145: FreeSWITCH susceptible to Denial of Service via SIP flooding When flooding FreeSWITCH with SIP messages, it was observed that after a number of seconds the process was killed by the operating system due to memory exhaustion https://github.com/signalwire/freeswitch/security/advisories/GHSA-jvpq-23v4-gp3m - CVE-2021-41158: FreeSWITCH vulnerable to SIP digest leak for configured gateways An attacker can perform a SIP digest leak attack against FreeSWITCH and receive the challenge response of a gateway configured on the FreeSWITCH server. This is done by challenging FreeSWITCH's SIP requests with the realm set to that of the gateway, thus forcing FreeSWITCH to respond with the challenge response which is based on the password of that targeted gateway. https://github.com/signalwire/freeswitch/security/advisories/GHSA-3v3f-99mv-qvj4 Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 Removed patch, upstream applied a different fix: https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b Added optional dependency to libks, needed due to upstream commit https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 Added upstream patches to fix build errors. Signed-off-by: Bernd Kuhls [Peter: mention security fixes] Signed-off-by: Peter Korsgaard --- ...-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch | 26 +++++ ...lications-mod_cv-mod_cv.cpp-fix-build-wit.patch | 44 ------- .../freeswitch/0002-core-fix--disable-libyuv.patch | 129 +++++++++++++++++++++ package/freeswitch/freeswitch.hash | 4 +- package/freeswitch/freeswitch.mk | 8 +- 5 files changed, 163 insertions(+), 48 deletions(-) diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch new file mode 100644 index 0000000000..57f6e660c1 --- /dev/null +++ b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch @@ -0,0 +1,26 @@ +From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 +From: Dragos Oancea +Date: Tue, 26 Oct 2021 08:42:58 +0000 +Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac + +Signed-off-by: Bernd Kuhls +--- + src/switch_rtp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/switch_rtp.c b/src/switch_rtp.c +index 1880bbb19c..843ee81381 100644 +--- a/src/switch_rtp.c ++++ b/src/switch_rtp.c +@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); + snprintf(header, sizeof(header), "Source-Lost"); + #if SWITCH_BYTE_ORDER == __BIG_ENDIAN +- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ ++ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ + #else + tmpLost = ntohl(rtcp_report_block->lost)>>8; + tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch b/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch deleted file mode 100644 index cd0a3ab4c2..0000000000 --- a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Oct 2020 23:06:36 +0200 -Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv - 3.4.9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use cvScalar instead of CV_RGB to avoid the following build failure with -opencv 3.4.9: - -mod_cv.cpp:693:24: error: conversion from ???cv::Scalar {aka cv::Scalar_}??? to non-scalar type ???CvScalar??? requested - CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); - ^ - -Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since -version 3.4.2 and -https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f - -It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/signalwire/freeswitch/pull/914] ---- - src/mod/applications/mod_cv/mod_cv.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp -index 582f925abf..bbec755e91 100644 ---- a/src/mod/applications/mod_cv/mod_cv.cpp -+++ b/src/mod/applications/mod_cv/mod_cv.cpp -@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context) - //printf("WTF %d\n", object_neighbors); - //cout << "Detected " << object_neighbors << " object neighbors" << endl; - const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors); -- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); -+ CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0); - rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1); - - parse_stats(&context->nestDetected, nestedObjects.size(), context->skip); --- -2.28.0 - diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch new file mode 100644 index 0000000000..137cb27cf8 --- /dev/null +++ b/package/freeswitch/0002-core-fix--disable-libyuv.patch @@ -0,0 +1,129 @@ +From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 +From: Sebastian Kemper +Date: Mon, 1 Nov 2021 09:59:09 +0100 +Subject: [PATCH] [core] fix "--disable-libyuv" + +Recent changes made it impossible to compile freeswitch without libyuv +support. + +src/switch_core_video.c: In function 'switch_img_read_from_file': +src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] +RAWToI420(data, width * 3, +^ +src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] +ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); +^ + +Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 + +Signed-off-by: Bernd Kuhls +Signed-off-by: Sebastian Kemper +--- + src/switch_core_video.c | 12 ++++++++++++ + tests/unit/switch_core_video.c | 4 ++++ + 2 files changed, 16 insertions(+) + +diff --git a/src/switch_core_video.c b/src/switch_core_video.c +index 7dbd685d6ee..0d377f9c3e4 100644 +--- a/src/switch_core_video.c ++++ b/src/switch_core_video.c +@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha + + SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) + { ++#ifdef SWITCH_HAVE_YUV + int width = 0, height = 0, channels = 0; + int comp = STBI_rgb; + unsigned char *data = NULL; +@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name + } else if (data) { + stbi_image_free(data); + } ++#endif + + return NULL; + } + + SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + const char *ext = strrchr(file_name, '.'); +@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co + free(data); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif + } + + typedef struct data_url_context_s { +@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { + char **urlP; + } data_url_context_t; + ++#ifdef SWITCH_HAVE_YUV + static void data_url_write_func(void *context, void *data, int size) + { + switch_buffer_t *buffer = (switch_buffer_t *)context; + switch_buffer_write(buffer, data, size); + } ++#endif + + SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + int stride_in_bytes = 0; +@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** + switch_buffer_destroy(&buffer); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif /* SWITCH_HAVE_YUV */ + } + + +diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c +index 27c96102929..e395db474d5 100644 +--- a/tests/unit/switch_core_video.c ++++ b/tests/unit/switch_core_video.c +@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEARDOWN_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(data_url_test) + { + char *data_url = NULL; +@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") + unlink(argb_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + + FST_TEST_BEGIN(img_patch) + { +@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEST_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(stb_data_url) + { + switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); +@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") + unlink(jpg_write_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + } + FST_SUITE_END() + } diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index dc5a67980f..8066c620c4 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 -sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 +sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 944867cc75..c576e5f267 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.6 +FREESWITCH_VERSION = 1.10.7 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -120,7 +120,6 @@ FREESWITCH_ENABLED_MODULES += \ endpoints/mod_rtc \ endpoints/mod_rtmp \ endpoints/mod_sofia \ - endpoints/mod_verto \ event_handlers/mod_cdr_csv \ event_handlers/mod_cdr_sqlite \ event_handlers/mod_event_socket \ @@ -209,6 +208,11 @@ FREESWITCH_DEPENDENCIES += libilbc FREESWITCH_ENABLED_MODULES += codecs/mod_ilbc endif +ifeq ($(BR2_PACKAGE_LIBKS),y) +FREESWITCH_DEPENDENCIES += libks +FREESWITCH_ENABLED_MODULES += endpoints/mod_verto +endif + ifeq ($(BR2_PACKAGE_LIBLDNS),y) FREESWITCH_DEPENDENCIES += libldns FREESWITCH_ENABLED_MODULES += applications/mod_enum From jesse_dev at fastmail.com Sat Jan 8 00:07:11 2022 From: jesse_dev at fastmail.com (Jesse Millwood) Date: Fri, 07 Jan 2022 19:07:11 -0500 Subject: [Buildroot] Overriding Kconfig Values from external br2 In-Reply-To: <4d73992c-3189-1989-525c-4506495c90ac@mind.be> References: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> <4d73992c-3189-1989-525c-4506495c90ac@mind.be> Message-ID: <99fefbe8119003202a02e7696a98711c71bd30c7.camel@fastmail.com> On Thu, 2022-01-06 at 18:09 +0100, Arnout Vandecappelle wrote: > > > On 06/01/2022 16:37, Jesse Millwood wrote: > > On Thu, 2022-01-06 at 10:45 +0100, Arnout Vandecappelle wrote: > > > > > > > > > On 05/01/2022 20:03, Jesse Millwood wrote: > > > > Hello, > > > > > > > > I have an external C/C++ toolchain that I've put together that > > > > uses > > > > MUSL. I've > > > > also built an external Rust toolchain that uses my MUSL > > > > toolchain. > > > > > > > > My issue is that there is a Rust Kconfig variable that > > > > specifies if > > > > a specific > > > > architecture supports Rust. > > > > > > > > The Kconfig variable in question is > > > > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > > > > in package/rustc/Config.in.host. > > > > > > [snip] > > > > > > > You may notice that I changed the libc depends line to be or'd > > > > with > > > > BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get > > > > considered > > > > when I > > > > choose my external musl toolchain option. In the menuconfig > > > > when I > > > > search for > > > > the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with > > > > the > > > > "/" key it > > > > looks like it is only getting it from the original file. Does > > > > buildroot have a > > > > mechanism for overwriting this kind of setting and if not, does > > > > anyone have an > > > > idea of how I would accomplish what I am trying to do (make > > > > buildroot honor my > > > > external rust toolchain)? > > > > > > ?? No, there's no way to override the dependencies of an existing > > > Config.in > > > symbol in an external. > > > > > > ?? However, this was corrected in upstream Buildroot in commit > > > d69d40c029dc7d8199b745eaee759d92b66c5d17. So you can try to > > > backport > > > that commit > > > instead, or just update Buildroot to something more recent. > > > > Arnout, thanks for the pointer to the commit. That is a logical way > > to > > support other platforms. However, I have a powerpc musl rust > > toolchain > > that I've built externally. > > > > With the changes in that commit can I set > > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS to "y" in my external > > now > > ? Ah, no, you're right, powerpc-unknown-linux-musl is a Tier 3 > platform and that > patch only adds Tier 1 and 2. We could add a Tier 3 option as well > (and disable > the rust-bin option in that case). > > ? Note however that the stdlib status for this target is marked as > "?" on [1], > so I'm not sure it's ever going to work... > I have it working actually. I had to patch my crosstool-ng toolchain to add an extra default macro so that libunwind builds. > > > that there is no depends expressions and it is all default logic? > > Or > > would I have to still add another expression that maybe defaults to > > "y" > > if a new variable is true like > > "BR2_EXTERNAL_RUSTC_TARGET_ARCH_SUPPORTS" that is defined in my > > external? > > ? No, that's not going to work. > > ? I think you can make a hack: add "select > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS" to your > BR2_TOOLCHAIN_EXTERNAL_MY_MUSL definition. I think that works. > > ? Regards, > ? Arnout > Thanks! I had to update some names of some things but I updated my buildroot repo and was able to use the select method to enable BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS. > > > > > Thanks, > > Jesse > > > > > > > > ?? Regards, > > > ?? Arnout > > > > > > > > > > > > > > Thanks, > > > > Jesse > > > > > > > > _______________________________________________ > > > > buildroot mailing list > > > > buildroot at buildroot.org > > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From alistair23 at gmail.com Sat Jan 8 00:23:15 2022 From: alistair23 at gmail.com (Alistair Francis) Date: Sat, 8 Jan 2022 10:23:15 +1000 Subject: [Buildroot] [PATCH 4/7] package/rustc: fix the riscv64gc architecture handling In-Reply-To: <20220107171318.1423075-5-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> <20220107171318.1423075-5-thomas.petazzoni@bootlin.com> Message-ID: On Sat, Jan 8, 2022 at 3:14 AM Thomas Petazzoni wrote: > > riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit > or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need > to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true > when BR2_riscv is true. > > Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to > allow rust-bin to download its pre-compiled standard library > correctly. > > Signed-off-by: Thomas Petazzoni Reviewed-by: Alistair Francis Alistair > --- > package/rustc/Config.in.host | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host > index 05324ad755..8c8b75c0a2 100644 > --- a/package/rustc/Config.in.host > +++ b/package/rustc/Config.in.host > @@ -49,7 +49,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS > default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC > # riscv64gc-unknown-linux-gnu > # "g" stands for imafd, and we also need "c". > - default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ > + default y if BR2_RISCV_64 && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ > BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ > BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ > BR2_TOOLCHAIN_USES_GLIBC > @@ -104,6 +104,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH > string > default "armv5te" if BR2_ARM_CPU_ARMV5 > default "armv7" if BR2_ARM_CPU_ARMV7A > + default "riscv64gc" if BR2_RISCV_64 > default BR2_ARCH if !BR2_ARM_CPU_ARMV7A > > config BR2_PACKAGE_HOST_RUSTC_ABI > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Sat Jan 8 03:21:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 21:21:17 -0600 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220107235959.2638b513@windsurf> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107105223.01912574@windsurf> <20220107235959.2638b513@windsurf> Message-ID: On Fri, Jan 7, 2022 at 5:00 PM Thomas Petazzoni wrote: > > Hello James, > > On Fri, 7 Jan 2022 16:30:12 -0600 > James Hilliard wrote: > > > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > > > > > How come things are working today with this one? > > > > I think this is currently set in the cargo config file. > > Ah, right: > > [target. at RUSTC_TARGET_NAME@] > linker = "@CROSS_PREFIX at gcc" > > in package/rustc/cargo-config.in > > > > - Relevance of CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > > > Set via CARGO_HOME currently, but I think may allow the cargo config to not > > be required. > > I'm no sure why you say this is set via CARGO_HOME? Because the > config file is stored in $(CARGO_HOME)/config ? Yeah, that's what I mean. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 07:05:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 08 Jan 2022 07:05:50 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-07 Message-ID: <20220108070555.8685C428E7@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-07 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 60 | 7 | 0 | 67 | 2021.11.x | 28 | 6 | 0 | 34 | master | 100 | 48 | 0 | 148 | Classification of failures by reason for master ----------------------------------------------- xxhash-0.8.1 | 10 host-file-5.41 | 7 rygel-0.40.2 | 6 frr-8.1 | 2 guile-3.0.7 | 2 ksmbd-tools-3.4.3 | 2 mdadm-4.2 | 2 unknown | 2 wavemon-0.9.4 | 2 gst1-rtsp-server-1.18.5 | 1 hiawatha-11.1 | 1 i2pd-2.40.0 | 1 ipmitool-1.8.18 | 1 libmicrohttpd-0.9.75 | 1 log4cxx-0.12.0 | 1 mongodb-4.2.11 | 1 nodejs-14.18.2 | 1 openipmi-2.0.32 | 1 perl-5.34.0 | 1 poppler-21.12.0 | 1 pulseview-0.4.2 | 1 ruby-3.1.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/837c592fd6f8432654d097362bcd3642eb1c3d80 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2ad3f23babdb7e398ff1b26728012f13651b0120 | riscv32 | gst1-rtsp-server-1.18.5 | NOK | http://autobuild.buildroot.net/results/da833542f6c53af80719107d3d76766a7bdc3464 | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/3de75297546b593adb0e9076486e47d51d75ccaf | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/f2dd39f0d4c5253c6c7584fae475b754d3b948bc | ORPH riscv64 | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/e255604dda0dc6567410e14690f58d00d093b498 | arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/dc5371f4e04257ba5e8f1ebf73483b52919d3b12 | ORPH i686 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/f148071bc55f2d8016295d0729e63c70b3f24c57 | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/78a56a35c0f30d007199d5bd32fdda337c33e6b3 | ORPH aarch64 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/97ce8deac2017cb7ea4af1af8265d373ea9451e9 | ORPH s390x | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/ff361fd57a4a7e80b492afa5594d7b342a278613 | ORPH i686 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/58d35b677928d73ece2bb791975d0500177b940d | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/2308143bed92f99a4fe7b7ee40f043e449177ce7 | ORPH x86_64 | i2pd-2.40.0 | NOK | http://autobuild.buildroot.net/results/3825ce0953558347fdf30b66b647660a77b8f095 | m68k | ipmitool-1.8.18 | NOK | http://autobuild.buildroot.net/results/af2ff8788b28bffd16a00d196dd0ed4da630788f | i686 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/ad4bb4644fb1968cd16a6f061768a14cbd098359 | xtensa | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/7b197aab2d53972e1e59cfd031a1c4fc331eeb5f | or1k | libmicrohttpd-0.9.75 | NOK | http://autobuild.buildroot.net/results/f7668104dd64a93f0b343ce3ebbe50b12584184d | arc | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/352528dcc0e919da399eb25875096874fe419f01 | arm | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/469306768ebb2d871dc20a3e3449ea25f08c2712 | ORPH riscv32 | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/c967262963fa141ac6d9336131b89b44789ffd3a | ORPH arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/d7035fcbe841d6820012b1cad49c470cbbfecb92 | arm | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/3a851d659dbb9d6bbc2df8f89448262cf22c1a2c | arc | openipmi-2.0.32 | NOK | http://autobuild.buildroot.net/results/b0eb44ddbe2f10053a8a769d22d231caf82c7612 | ORPH arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/74d25607bbe9f9a3ea222b2453604bf2f382dc63 | riscv64 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/072275c19cb896669cd144cbeeb2d81aedccf608 | riscv64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/65ea69a417e4103efd6004d7f6ec3fb589f527e0 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/599ca54e97eb913e1436f0cbf32e53368751c24e | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2818db2e0a5453a83cb5369493cc6f7fb01258c6 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/693dcd618eaada02218919f06032d1c3c907fca5 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/fc34ea2a7ab09ac6629ce72f7780c1496a69a2bb | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f2cc87e201456eb8f1b261436369f150cfe677cc | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/86e1592a15e36be97434bcfecf3d0304b22f92d2 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c4af583d23095a05cd1bc4b6f10bf570fd975477 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/731a1de84dbcd753d3dd27d5f37257ae2615e66c | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/5701f17df21c913ae6a6dd029fe27a3e57dede13 | mips | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/17aa64727cbf51f28a77b925c9aa0db93b5b4f97 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0e50e75f343d18c7a830c57d36912d43e6034a94 | powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/651ff4db1fd21bab6c7cbd575e6a742632320abf | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/3e03cb469a3f273ca5febe8e110cc74abc749c89 | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/057b2fdc14fd9bfabb3a5653a5ecca4c8411da3e | ORPH xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/22a8b531c66e25b005f568cd673f2a08121f38e7 | ORPH sparc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/665dd9d2f5efcacc04a0d9164eb2885b5378db21 | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9ec98624bfed3bf71eed8bd92a1060461d466bb6 | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/d5bb532a8a2f3f4fb20c4d81d4d88d2f2d4a06a6 | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/c099de5599d23970d4319927347a8c52c03d622f | ORPH m68k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/dce11718731c338ce290191c2241accf76c86bcc | ORPH m68k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/b542eee260e1769dde761e498d5d108743fbeed2 | ORPH Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 asterisk-16.21.1 | 1 gvfs-1.44.1 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 wolfssl-4.8.1-stable | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | asterisk-16.21.1 | NOK | http://autobuild.buildroot.net/results/03b47775fda00eb0ba86b89c0442253083a9d4e9 | x86_64 | gvfs-1.44.1 | NOK | http://autobuild.buildroot.net/results/fc155bfa7a3b67e815026dc60174d0c9d000c6c4 | ORPH mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/f8898c73ff2a30715e2613646c9449f324ba88d2 | microblazeel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/7fcc97aa5714aea4e1ee049ae1c4373e7f62d418 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/6b0c96edb8b6a0c9bcf89260db84043b1dfd1e6f | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/56653962e44a775bca2ac8111dc11dcda2f74ab6 | arm | wolfssl-4.8.1-stable | NOK | http://autobuild.buildroot.net/results/c9847ab9690acdd503404b0e50b313114d115e00 | Classification of failures by reason for 2021.11.x -------------------------------------------------- gstd-0.13.0 | 2 host-erlang-22.2 | 2 libqmi-1.30.2 | 1 mpd-0.22.11 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/25c5f4f54abd0387ab0edcafe91b06883d0e079c | ORPH microblazeel | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/9484e42e21284e7a8ce5c9b21f7362047fa5e362 | ORPH i686 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/d03d7e34ac0533fd3e827d7e71cb5d795310175c | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/b58daf25c60d7f45e1c1c5610671b095f204a1c7 | powerpc64le | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/c78d32ee24bd259c0d503b68106824f6c5d66b9c | arm | mpd-0.22.11 | NOK | http://autobuild.buildroot.net/results/f6b0c9a78d4938e9efc40a4472b35a19deb04269 | Gitlab CI results for 2022-01-07 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650508 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650510 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650511 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650513 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650516 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650518 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650523 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650524 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650525 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650526 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650528 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650529 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650530 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650531 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650532 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650533 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650534 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650535 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650536 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650537 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650538 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650540 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650541 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650542 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650543 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650544 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650547 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650548 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650549 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650550 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650552 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650554 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650555 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650560 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650563 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650564 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650567 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650569 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650570 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650571 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650572 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650574 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650576 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650577 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650604 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650605 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650606 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650607 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650608 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650609 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650611 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650612 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650615 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650613 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650614 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650616 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650617 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650618 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650624 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650628 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650644 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650646 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650659 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650661 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650664 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650665 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650667 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650669 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650672 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650674 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650675 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650677 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650686 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650782 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650790 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650797 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650800 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650801 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650804 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650806 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650809 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650810 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650812 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650816 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650819 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650820 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650821 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650904 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650915 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650916 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650918 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650919 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650922 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650923 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650924 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650925 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650928 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650930 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650931 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650938 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650940 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650941 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650953 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650955 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650960 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650969 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650970 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650971 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650972 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650974 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650976 | -- http://autobuild.buildroot.net From bernd.kuhls at t-online.de Sat Jan 8 07:50:18 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 08:50:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmicrohttpd: fix pthread detection Message-ID: <20220108075018.22567-1-bernd.kuhls@t-online.de> Fix autobuild failures after bumping the package to 0.9.75 in commit 8ec001b467e22904c0a7ec5780d83afd44ad78f3: conftest.c:64:26: error: #error "_REENTRANT must be defined" Fixes: http://autobuild.buildroot.net/results/f76/f7668104dd64a93f0b343ce3ebbe50b12584184d/ Signed-off-by: Bernd Kuhls --- package/libmicrohttpd/libmicrohttpd.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f75178bc0a..344e1443fd 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -12,6 +12,10 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBMICROHTTPD_CFLAGS += -D_REENTRANT +endif + LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 07:59:30 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 08:59:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.63 Message-ID: <20220108075930.213063-1-bernd.kuhls@t-online.de> Release notes: http://www.bluez.org/release-of-bluez-5-63/ Signed-off-by: Bernd Kuhls --- package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index e671431093..5bfc652355 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.62 +BLUEZ5_UTILS_HEADERS_VERSION = 5.63 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 3ec4acac7f..a8f5399fa6 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2 bluez-5.62.tar.xz +sha256 9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 bluez-5.63.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index cf46d6e0d6..8cb9e42d72 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.62 +BLUEZ5_UTILS_VERSION = 5.63 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 08:16:45 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 08 Jan 2022 09:16:45 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/freeswitch: bump version to 1.10.7 References: <20211106111145.1648068-1-bernd.kuhls@t-online.de> <20211106111145.1648068-3-bernd.kuhls@t-online.de> <87bl0njfg0.fsf__32796.2444674753$1641597992$gmane$org@dell.be.48ers.dk> Message-ID: Am Sat, 08 Jan 2022 00:26:07 +0100 schrieb Peter Korsgaard: > This series was marked as superseeded in patchwork, but I applied it > anyway as freeswitch 1.10.7 fixes a number of fairly serious security > issues. Was there any specific reason why this was marked as > superseeded? Hi Peter, when posting the series I had not conducted a thorough runtime test. In expectation of more backported patches needed from upstream I marked the series as superseeded and lost track of the topic in the meantime. But do not worry, the current package is fine, no other backported patches are needed for my usecase. Regards, Bernd From arnout at mind.be Sat Jan 8 08:15:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 09:15:36 +0100 Subject: [Buildroot] [git commit] support/testing: tyest_python_pybind.py: fix flake8 errors Message-ID: <20220108081426.0E6B382946@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0233b84204766f3e6eefbc773e121a71b827eaf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master support/testing/tests/package/test_python_pybind.py:1:1: F401 'os' imported but unused support/testing/tests/package/test_python_pybind.py:3:1: F401 'subprocess' imported but unused support/testing/tests/package/test_python_pybind.py:6:1: E302 expected 2 blank lines, found 1 1 E302 expected 2 blank lines, found 1 2 F401 'os' imported but unused Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/package/test_python_pybind.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py index 5e3c3b9cc5..c0af7331a2 100644 --- a/support/testing/tests/package/test_python_pybind.py +++ b/support/testing/tests/package/test_python_pybind.py @@ -1,8 +1,7 @@ -import os import infra -import subprocess from tests.package.test_python import TestPythonPackageBase + class TestPythonPybind (TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ From bernd.kuhls at t-online.de Sat Jan 8 08:47:04 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 09:47:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/unrar: bump version to 6.1.3 Message-ID: <20220108084704.804720-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index 7900c44d1d..e354753bb2 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300 unrarsrc-5.9.4.tar.gz +sha256 d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636 unrarsrc-6.1.3.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index 3c8e37a220..6923660153 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 5.9.4 +UNRAR_VERSION = 6.1.3 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 08:50:09 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 09:50:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/pngquant: bump version to 2.17.0 Message-ID: <20220108085009.819370-1-bernd.kuhls@t-online.de> Changelog: https://github.com/kornelski/pngquant/blob/master/CHANGELOG Signed-off-by: Bernd Kuhls --- package/pngquant/pngquant.hash | 2 +- package/pngquant/pngquant.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index 3a0dcfd457..a7ea4aa997 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,4 +1,4 @@ # From https://pngquant.org/releases.html -sha256 06c6fdded675753fbdbeacc2b63507fb30f42fae813e48a1684b240bb5b63522 pngquant-2.16.0-src.tar.gz +sha256 a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66 pngquant-2.17.0-src.tar.gz # Locally computed sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index 72efafe64e..87537aa18e 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.16.0 +PNGQUANT_VERSION = 2.17.0 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 08:55:32 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 09:55:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/mtools: bump version to 4.0.36 Message-ID: <20220108085532.831188-1-bernd.kuhls@t-online.de> Release notes: http://svn.savannah.gnu.org/viewvc/mtools/trunk/NEWS?view=markup Signed-off-by: Bernd Kuhls --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 86cfe693d9..c37d4df456 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d09cff66d7277ad36a7573fc3e9803bfa558cdda83baabaafbf7761317462283 mtools-4.0.26.tar.lz +sha256 78ac74b2d1cae77bb2da29461a13ed862ff6b7c1289d5bf80fdb09e039c2c48f mtools-4.0.36.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 6d63a565bd..4908c3fa2f 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.26 +MTOOLS_VERSION = 4.0.36 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:00:03 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:00:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/exfatprogs: bump version to 1.1.3 Message-ID: <20220108090003.837129-1-bernd.kuhls@t-online.de> Updated license hash due to whitespace changes in upstream commit https://github.com/exfatprogs/exfatprogs/commit/7e30487e6d92f98e1ab91b037f5285453359ec9a Release notes: https://github.com/exfatprogs/exfatprogs/blob/master/NEWS Signed-off-by: Bernd Kuhls --- package/exfatprogs/exfatprogs.hash | 6 +++--- package/exfatprogs/exfatprogs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 4dc18cd4b6..99f57c9deb 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.0/exfatprogs-1.1.0.tar.xz.sha256 -sha256 69e2cf6430fc1d083c6ae0aea5eb80bf1b8e9775ed833bcd8331aef0fcacaf85 exfatprogs-1.1.0.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.3/exfatprogs-1.1.3.tar.xz.sha256 +sha256 3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809 exfatprogs-1.1.3.tar.xz # Hash for license file -sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index e10acc9e5f..2911d21f4f 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.1.0 +EXFATPROGS_VERSION = 1.1.3 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:13:49 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:13:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: bump version to 5.15.1 Message-ID: <20220108091349.918259-1-bernd.kuhls@t-online.de> Reformatted hashes. Upstream relicensed libbtrfsutil to LGPL-2.1+ and removed libbtrfsutil/COPYING.LESSER: https://github.com/kdave/btrfs-progs/commit/9e30f779e3cbf12a88ebe309ee371851fdfd3aa0 Add optional support for udev: https://github.com/kdave/btrfs-progs/commit/f74ebeee5c239e007a0144e93f0eee26949a85ec https://github.com/kdave/btrfs-progs/commit/1d0fa3781ef9374388b683cf96f9c48245025cf6 Changelog: https://github.com/kdave/btrfs-progs/blob/master/CHANGES Signed-off-by: Bernd Kuhls --- package/btrfs-progs/btrfs-progs.hash | 7 +++---- package/btrfs-progs/btrfs-progs.mk | 15 +++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index aac144963e..339eab02aa 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137 btrfs-progs-v5.11.tar.xz +sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz # Locally computed -sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING -sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 libbtrfsutil/COPYING.LESSER +sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 96456d1238..50c8e59e50 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,14 +4,13 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.11 +BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python -BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-3.0+ (libbtrfsutil) -BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING \ - libbtrfsutil/COPYING.LESSER +BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) +BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES # Doesn't autodetect static-only and tries to build both @@ -31,9 +30,17 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +BTRFS_PROGS_CONF_OPTS += --enable-libudev +BTRFS_PROGS_DEPENDENCIES += udev +else +BTRFS_PROGS_CONF_OPTS += --disable-libudev +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ + --disable-libudev \ --disable-zstd \ --disable-python \ --disable-convert -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:17:39 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:17:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/e2fsprogs: bump version to 1.46.5 Message-ID: <20220108091739.927609-1-bernd.kuhls@t-online.de> Release notes: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.5 Signed-off-by: Bernd Kuhls --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 63c7c9929f..452c8d5689 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.3/sha256sums.asc -sha256 b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713 e2fsprogs-1.46.4.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/sha256sums.asc +sha256 2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e e2fsprogs-1.46.5.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 76215e8c34..cd70e3a034 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.46.4 +E2FSPROGS_VERSION = 1.46.5 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:25:54 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:25:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/eudev/: bump version to 3.2.11 Message-ID: <20220108092554.989783-1-bernd.kuhls@t-online.de> Switch upstream URL to github due to changes in project ownership: https://github.com/eudev-project/eudev/commit/06ac38e2b876427dfa2ef47e74b46b99927dfe34 Signed-off-by: Bernd Kuhls --- package/eudev/Config.in | 2 +- package/eudev/eudev.hash | 4 +--- package/eudev/eudev.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 0e5bd0cee9..6e7bbe4648 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_EUDEV Upstart, older kernels, various toolchains and anything else required by users and various distributions. - https://wiki.gentoo.org/wiki/Project:Eudev + https://github.com/eudev-project/eudev if BR2_PACKAGE_EUDEV diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index fda0481351..fe6c7ef008 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,5 +1,3 @@ -# From http://dev.gentoo.org/~blueness/eudev/ -md5 60b135a189523f333cea5f71a3345c8d eudev-3.2.10.tar.gz # Locally calculated -sha256 87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz +sha256 19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b eudev-3.2.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 5d18b388c7..705370689d 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,8 +4,8 @@ # ################################################################################ -EUDEV_VERSION = 3.2.10 -EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev +EUDEV_VERSION = 3.2.11 +EUDEV_SITE = https://github.com/eudev-project/eudev/releases/download/v$(EUDEV_VERSION) EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING EUDEV_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:32:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:32:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/freetype: bump version to 2.11.1 Message-ID: <20220108093206.999409-1-bernd.kuhls@t-online.de> Updated license hash and location of LICENSE.TXT due to upstream commit: https://gitlab.freedesktop.org/freetype/freetype/-/commit/0606350c2a08eec120e4557a07f252e1c72963ce Signed-off-by: Bernd Kuhls --- package/freetype/freetype.hash | 8 ++++---- package/freetype/freetype.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 36571b51af..7abc3d96da 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ -sha1 0181862673f7216ad2b5074f95fc131209e30b27 freetype-2.10.4.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.11.1/ +sha1 86bdc98b37efe447cf53420bf2c18402ff905112 freetype-2.11.1.tar.xz # Locally calculated -sha256 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784 freetype-2.10.4.tar.xz -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT +sha256 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 freetype-2.11.1.tar.xz +sha256 c85e842b7ff04d95dab7d68e812773de0f8b67940e5449d35b42c66eb0f619fe LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 59d6dc0eb8..912e6c4daa 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,13 +4,13 @@ # ################################################################################ -FREETYPE_VERSION = 2.10.4 +FREETYPE_VERSION = 2.11.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" FREETYPE_LICENSE = Dual FTL/GPL-2.0+ -FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_CONFIG_SCRIPTS = freetype-config -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:39:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:39:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/icu: bump version to 70-1 Message-ID: <20220108093953.1022178-1-bernd.kuhls@t-online.de> Removed patch which was applied upstream: https://github.com/unicode-org/icu/commit/2dc5bea9061b4fb05cd03e21b775dd944a0eb81d Updated license hash due to typo fixes: https://github.com/unicode-org/icu/commit/73eca0a9c927045a3b5eafdbec9c17d2fcacd5da Updated project URL as recommended in the release notes: https://github.com/unicode-org/icu/releases/tag/release-70-1 Signed-off-by: Bernd Kuhls --- ...-ICU-21587-Fix-memory-bug-w-baseName.patch | 112 ------------------ package/icu/Config.in | 2 +- package/icu/icu.hash | 4 +- package/icu/icu.mk | 2 +- 4 files changed, 4 insertions(+), 116 deletions(-) delete mode 100644 package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch diff --git a/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch b/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch deleted file mode 100644 index 15af976e49..0000000000 --- a/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 2dc5bea9061b4fb05cd03e21b775dd944a0eb81d Mon Sep 17 00:00:00 2001 -From: Frank Tang -Date: Tue, 13 Apr 2021 15:16:50 -0700 -Subject: [PATCH] ICU-21587 Fix memory bug w/ baseName - -Edge cases not fixed in assign and move assign operator -while the locale is long and call setKeywordValue with incorrect -keyword/values. - -Signed-off-by: Peter Korsgaard -[Peter: Fixes CVE-2021-30535, adjust paths for tarball] ---- - source/common/locid.cpp | 11 +++++++++-- - source/test/intltest/loctest.cpp | 26 ++++++++++++++++++++++++++ - source/test/intltest/loctest.h | 2 ++ - 3 files changed, 37 insertions(+), 2 deletions(-) - -diff --git a/source/common/locid.cpp b/source/common/locid.cpp -index 02cd82a7b8..3c6e5b0669 100644 ---- a/source/common/locid.cpp -+++ b/source/common/locid.cpp -@@ -469,14 +469,18 @@ Locale& Locale::operator=(Locale&& other) U_NOEXCEPT { - if ((baseName != fullName) && (baseName != fullNameBuffer)) uprv_free(baseName); - if (fullName != fullNameBuffer) uprv_free(fullName); - -- if (other.fullName == other.fullNameBuffer) { -+ if (other.fullName == other.fullNameBuffer || other.baseName == other.fullNameBuffer) { - uprv_strcpy(fullNameBuffer, other.fullNameBuffer); -+ } -+ if (other.fullName == other.fullNameBuffer) { - fullName = fullNameBuffer; - } else { - fullName = other.fullName; - } - -- if (other.baseName == other.fullName) { -+ if (other.baseName == other.fullNameBuffer) { -+ baseName = fullNameBuffer; -+ } else if (other.baseName == other.fullName) { - baseName = fullName; - } else { - baseName = other.baseName; -@@ -2681,6 +2685,9 @@ Locale::setKeywordValue(const char* keywordName, const char* keywordValue, UErro - if (fullName != fullNameBuffer) { - // if full Name is already on the heap, need to free it. - uprv_free(fullName); -+ if (baseName == fullName) { -+ baseName = newFullName; // baseName should not point to freed memory. -+ } - } - fullName = newFullName; - status = U_ZERO_ERROR; -diff --git a/source/test/intltest/loctest.cpp b/source/test/intltest/loctest.cpp -index ce41a4c00e..5503b008b0 100644 ---- a/source/test/intltest/loctest.cpp -+++ b/source/test/intltest/loctest.cpp -@@ -284,6 +284,8 @@ void LocaleTest::runIndexedTest( int32_t index, UBool exec, const char* &name, c - TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale); - TESTCASE_AUTO(TestCanonicalize); - TESTCASE_AUTO(TestLeak21419); -+ TESTCASE_AUTO(TestLongLocaleSetKeywordAssign); -+ TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign); - TESTCASE_AUTO_END; - } - -@@ -6520,6 +6522,30 @@ void LocaleTest::TestSetUnicodeKeywordValueInLongLocale() { - } - } - -+void LocaleTest::TestLongLocaleSetKeywordAssign() { -+ IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordAssign"); -+ // A long base name, with an illegal keyword and copy constructor -+ icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_" -+ "AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_" -+ "AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17_AAAAAA18"); -+ Locale l2; -+ l.setUnicodeKeywordValue("co", "12", status); // Cause an error -+ status.reset(); -+ l2 = l; // copy operator on such bogus locale. -+} -+ -+void LocaleTest::TestLongLocaleSetKeywordMoveAssign() { -+ IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordMoveAssign"); -+ // A long base name, with an illegal keyword and copy constructor -+ icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_" -+ "AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_" -+ "AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17"); -+ Locale l2; -+ l.setUnicodeKeywordValue("co", "12", status); // Cause an error -+ status.reset(); -+ Locale l3 = std::move(l); // move assign -+} -+ - void LocaleTest::TestSetUnicodeKeywordValueNullInLongLocale() { - IcuTestErrorCode status(*this, "TestSetUnicodeKeywordValueNullInLongLocale"); - const char *exts[] = {"cf", "cu", "em", "kk", "kr", "ks", "kv", "lb", "lw", -diff --git a/source/test/intltest/loctest.h b/source/test/intltest/loctest.h -index 05be4037bd..12a93bde53 100644 ---- a/source/test/intltest/loctest.h -+++ b/source/test/intltest/loctest.h -@@ -156,6 +156,8 @@ class LocaleTest: public IntlTest { - void TestSetUnicodeKeywordValueInLongLocale(); - void TestSetUnicodeKeywordValueNullInLongLocale(); - void TestLeak21419(); -+ void TestLongLocaleSetKeywordAssign(); -+ void TestLongLocaleSetKeywordMoveAssign(); - - private: - void _checklocs(const char* label, --- -2.20.1 - diff --git a/package/icu/Config.in b/package/icu/Config.in index b0c9eac83d..8b410bfdb6 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_ICU help International Components for Unicode. - http://site.icu-project.org/ + https://icu.unicode.org/ if BR2_PACKAGE_ICU diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 5ed7cc4217..56a0a5dd53 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 icu4c-69_1-src.tgz -sha256 7915b19db903070778581ae05d8bf4ea241b34a05deb51ca4f5cbb15ea1cbba3 LICENSE +sha256 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 icu4c-70_1-src.tgz +sha256 861671f8c712aa046f8f5ac89239e6c33821636516c5d0cc8c4e1973085f27a6 LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index c5d0c3eefb..7e0c96e43a 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 69-1 +ICU_VERSION = 70-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:45:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:45:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.63 In-Reply-To: <20220108075930.213063-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 08:59:30 +0100") References: <20220108075930.213063-1-bernd.kuhls@t-online.de> Message-ID: <877dbak1cr.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: http://www.bluez.org/release-of-bluez-5-63/ The release notes mentions new build options for sanitizers, and it looks to be enabled by default: checking whether /home/peko/source/buildroot/output-bluez/host/bin/aarch64-linux-gnu-gcc accepts -fPIE... yes checking whether /home/peko/source/buildroot/output-bluez/host/bin/aarch64-linux-gnu-gcc accepts -fsanitize=address... yes checking whether /home/peko/source/buildroot/output-bluez/host/bin/aarch64-linux-gnu-gcc accepts -fsanitize=leak... yes checking whether /home/peko/source/buildroot/output-bluez/host/bin/aarch64-linux-gnu-gcc accepts -fsanitize=undefined... yes So I've added explicit --disable-* options for those. I also see that we are not explicitly disabling the -fpie logic (where we want the Buildroot option to decide if it should be used or not), so I've also added --disable-pie. Committed with these fixes, thanks. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Sat Jan 8 09:45:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:45:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcap: bump version to 2.62 Message-ID: <20220108094533.1025401-1-bernd.kuhls@t-online.de> Removed patch which was applied upstream: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=afbc554d16a32ed352191e49b3673f2f72d0002f Release notes: https://sites.google.com/site/fullycapable/release-notes-for-libcap Signed-off-by: Bernd Kuhls --- ...don-t-overwrite-empty-when-generatin.patch | 50 ------------------- package/libcap/libcap.hash | 2 +- package/libcap/libcap.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch diff --git a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch b/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch deleted file mode 100644 index a47a2c788e..0000000000 --- a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dc507a812d931c24f1ac98c811fdd29bffa21da9 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 24 Aug 2021 00:36:40 +0200 -Subject: [PATCH] libcap/Makefile: don't overwrite 'empty' when generating - loader.txt - -objcopy takes an input file and an output file as arguments. If the -output file is left out, the input file will be overwritten. - -Since the objcopy command used to generate loader.txt only does a -dump-section and no filtering, in practice there is no change to empty. -However, as a side-effect, its timestamp is updated. The timestamp of -empty and of loader.txt will be more or less the same; however, -loader.txt is closed just before the output file is closed, so it's -possible that the timestamp of loader.txt is just a little bit earlier. -If this happens, it causes loader.txt to be rebuilt later, which in turn -causes a number of other object files to be rebuilt. - -Usually that's harmless, but it sometimes causes the rebuild to happen -during 'make install'. This is particularly annoying if 'make install' -is done as root, since loader.txt becomes owned by root in that case. - -Fix this by specifying a harmless output file: /dev/null. - -While we're at it, take in an upstream change that removes the redundant -redirect. - -Fixes: ee3b25c0a877fa74d1aec88f325ac45b09963c82 - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - libcap/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libcap/Makefile b/libcap/Makefile -index 47cf8f4..18e4f4f 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -105,7 +105,7 @@ empty: empty.c - $(CC) -o $@ $< - - loader.txt: empty -- $(OBJCOPY) --dump-section .interp=/dev/stdout $< > $@ -+ $(OBJCOPY) --dump-section .interp=$@ $< /dev/null - - cap_magic.o: execable.h execable.c loader.txt - $(CC) $(CFLAGS) $(IPATH) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@ --- -2.31.1 - diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index eb8fe43f6f..396e592c5b 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97 libcap-2.52.tar.xz +sha256 190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2 libcap-2.62.tar.xz # Hash for license file: sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 45700e56ec..42acca9082 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.52 +LIBCAP_VERSION = 2.62 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:45:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:45:17 +0100 Subject: [Buildroot] [git commit] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.63 Message-ID: <20220108093945.2DCED82A99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4c6cf4b1fc0f34e72ff047e76de53d3634f5184 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: http://www.bluez.org/release-of-bluez-5-63/ Signed-off-by: Bernd Kuhls [Peter: explicitly disable asan/lsan/pie/ubsan] Signed-off-by: Peter Korsgaard --- package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index e671431093..5bfc652355 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.62 +BLUEZ5_UTILS_HEADERS_VERSION = 5.63 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 3ec4acac7f..a8f5399fa6 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2 bluez-5.62.tar.xz +sha256 9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 bluez-5.63.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index cf46d6e0d6..49f6eaac13 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.62 +BLUEZ5_UTILS_VERSION = 5.63 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -23,6 +23,10 @@ BLUEZ5_UTILS_CONF_OPTS = \ --enable-library \ --disable-cups \ --disable-manpages \ + --disable-asan \ + --disable-lsan \ + --disable-ubsan \ + --disable-pie \ --with-dbusconfdir=/etc ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y) From peter at korsgaard.com Sat Jan 8 09:47:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:47:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/unrar: bump version to 6.1.3 In-Reply-To: <20220108084704.804720-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 09:47:04 +0100") References: <20220108084704.804720-1-bernd.kuhls@t-online.de> Message-ID: <8735lyk199.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:47:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:47:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/pngquant: bump version to 2.17.0 In-Reply-To: <20220108085009.819370-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 09:50:09 +0100") References: <20220108085009.819370-1-bernd.kuhls@t-online.de> Message-ID: <87y23qimob.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://github.com/kornelski/pngquant/blob/master/CHANGELOG > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Sat Jan 8 09:47:56 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:47:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.81.0 Message-ID: <20220108094756.1057296-1-bernd.kuhls@t-online.de> Changelog: https://curl.se/changes.html Signed-off-by: Bernd Kuhls --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c488df57b1..63d6ba306c 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-7.80.0.tar.xz.asc +# https://curl.se/download/curl-7.81.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab curl-7.80.0.tar.xz +sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 24591f2e0a..20ebb4f271 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.80.0 +LIBCURL_VERSION = 7.81.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:49:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:49:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/mtools: bump version to 4.0.36 In-Reply-To: <20220108085532.831188-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 09:55:32 +0100") References: <20220108085532.831188-1-bernd.kuhls@t-online.de> Message-ID: <87tueeimlq.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > http://svn.savannah.gnu.org/viewvc/mtools/trunk/NEWS?view=markup > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:49:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:49:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/exfatprogs: bump version to 1.1.3 In-Reply-To: <20220108090003.837129-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:00:03 +0100") References: <20220108090003.837129-1-bernd.kuhls@t-online.de> Message-ID: <87pmp2iml1.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Updated license hash due to whitespace changes in upstream commit > https://github.com/exfatprogs/exfatprogs/commit/7e30487e6d92f98e1ab91b037f5285453359ec9a > Release notes: https://github.com/exfatprogs/exfatprogs/blob/master/NEWS > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:47:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:47:28 +0100 Subject: [Buildroot] [git commit] package/pngquant: bump version to 2.17.0 Message-ID: <20220108094337.8946E82AB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=545e61fffa2b9f03bf08f39d59016e4ee4f1ab92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/kornelski/pngquant/blob/master/CHANGELOG Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pngquant/pngquant.hash | 2 +- package/pngquant/pngquant.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index 3a0dcfd457..a7ea4aa997 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,4 +1,4 @@ # From https://pngquant.org/releases.html -sha256 06c6fdded675753fbdbeacc2b63507fb30f42fae813e48a1684b240bb5b63522 pngquant-2.16.0-src.tar.gz +sha256 a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66 pngquant-2.17.0-src.tar.gz # Locally computed sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index 72efafe64e..87537aa18e 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.16.0 +PNGQUANT_VERSION = 2.17.0 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ From peter at korsgaard.com Sat Jan 8 09:47:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:47:03 +0100 Subject: [Buildroot] [git commit] package/unrar: bump version to 6.1.3 Message-ID: <20220108094337.8113982AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2550344f7991105f3896340332e2f2dba9e44294 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index 7900c44d1d..e354753bb2 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300 unrarsrc-5.9.4.tar.gz +sha256 d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636 unrarsrc-6.1.3.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index 3c8e37a220..6923660153 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 5.9.4 +UNRAR_VERSION = 6.1.3 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar From peter at korsgaard.com Sat Jan 8 09:48:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:48:05 +0100 Subject: [Buildroot] [git commit] package/mtools: bump version to 4.0.36 Message-ID: <20220108094337.9122882ACB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4206de33e0dee3044fa36c555c48b439c3eeb0c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: http://svn.savannah.gnu.org/viewvc/mtools/trunk/NEWS?view=markup Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 86cfe693d9..c37d4df456 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d09cff66d7277ad36a7573fc3e9803bfa558cdda83baabaafbf7761317462283 mtools-4.0.26.tar.lz +sha256 78ac74b2d1cae77bb2da29461a13ed862ff6b7c1289d5bf80fdb09e039c2c48f mtools-4.0.36.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 6d63a565bd..4908c3fa2f 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.26 +MTOOLS_VERSION = 4.0.36 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From peter at korsgaard.com Sat Jan 8 09:49:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:49:21 +0100 Subject: [Buildroot] [git commit] package/exfatprogs: bump version to 1.1.3 Message-ID: <20220108094337.99D0E82AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b636c507c64792d91df336eb5c379b0bff17977 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updated license hash due to whitespace changes in upstream commit https://github.com/exfatprogs/exfatprogs/commit/7e30487e6d92f98e1ab91b037f5285453359ec9a Release notes: https://github.com/exfatprogs/exfatprogs/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/exfatprogs/exfatprogs.hash | 6 +++--- package/exfatprogs/exfatprogs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 4dc18cd4b6..99f57c9deb 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.0/exfatprogs-1.1.0.tar.xz.sha256 -sha256 69e2cf6430fc1d083c6ae0aea5eb80bf1b8e9775ed833bcd8331aef0fcacaf85 exfatprogs-1.1.0.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.3/exfatprogs-1.1.3.tar.xz.sha256 +sha256 3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809 exfatprogs-1.1.3.tar.xz # Hash for license file -sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index e10acc9e5f..2911d21f4f 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.1.0 +EXFATPROGS_VERSION = 1.1.3 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ From bernd.kuhls at t-online.de Sat Jan 8 09:50:37 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:50:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/libfribidi: bump version to 1.0.11 Message-ID: <20220108095037.1065173-1-bernd.kuhls@t-online.de> Release notes: https://github.com/fribidi/fribidi/releases/tag/v1.0.11 Signed-off-by: Bernd Kuhls --- package/libfribidi/libfribidi.hash | 2 +- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 8e7eb49bcd..da25b2d24d 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01 fribidi-1.0.10.tar.xz +sha256 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d fribidi-1.0.11.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 97e875b4a2..adbd786db1 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.10 +LIBFRIBIDI_VERSION = 1.0.11 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:54:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:54:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/xfsprogs: bump to version 5.14.2 In-Reply-To: <20220107225739.2145636-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 23:57:39 +0100") References: <20220107225739.2145636-1-fontaine.fabrice@gmail.com> Message-ID: <87lezqimd2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > liburcu is a mandatory dependency since version 5.14.0 and > https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e4da1b16e29f6fe6b34de9b9b0f97141fb2e1855 > https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?h=v5.14.2 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:51:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:51:37 +0100 Subject: [Buildroot] [git commit] package/xfsprogs: bump to version 5.14.2 Message-ID: <20220108094831.4045382A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f8f69012e0eee7f3e98212fb3da118c211f3c0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master liburcu is a mandatory dependency since version 5.14.0 and https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e4da1b16e29f6fe6b34de9b9b0f97141fb2e1855 https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?h=v5.14.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xfsprogs/Config.in | 3 +++ package/xfsprogs/xfsprogs.hash | 2 +- package/xfsprogs/xfsprogs.mk | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index b8e07cc83d..a382b63ff8 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -1,12 +1,15 @@ comment "xfsprogs needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_XFSPROGS bool "xfsprogs" + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH + select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index b379839e7e..bb546601dc 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9 xfsprogs-5.10.0.tar.xz +sha256 01ccd3ef9df2837753a5d876b8da84ea957d13d7a461b8c46e8afa4eb09aabc8 xfsprogs-5.14.2.tar.xz # Hash for license files sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 71d02278e9..695471bddc 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,13 +4,13 @@ # ################################################################################ -XFSPROGS_VERSION = 5.10.0 +XFSPROGS_VERSION = 5.14.2 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -XFSPROGS_DEPENDENCIES = inih util-linux +XFSPROGS_DEPENDENCIES = inih liburcu util-linux XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" XFSPROGS_CONF_OPTS = \ From bernd.kuhls at t-online.de Sat Jan 8 09:54:51 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:54:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: bump version to 1.8.1 Message-ID: <20220108095451.1078507-1-bernd.kuhls@t-online.de> Reformatted hashes. Changelog: https://github.com/NLnetLabs/ldns/blob/develop/Changelog Signed-off-by: Bernd Kuhls --- package/libldns/libldns.hash | 10 +++++----- package/libldns/libldns.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash index c8fb39d478..cab8b7dbdf 100644 --- a/package/libldns/libldns.hash +++ b/package/libldns/libldns.hash @@ -1,7 +1,7 @@ -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha1 -sha1 d075a08972c0f573101fb4a6250471daaa53cb3e ldns-1.7.1.tar.gz -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha256 -sha256 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 ldns-1.7.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha1 +sha1 df19a0404a608821b571525214a18988bc88bb46 ldns-1.8.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha256 +sha256 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 ldns-1.8.1.tar.gz # Hash for license file: -sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE +sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 9c248bbc19..7deca978da 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLDNS_VERSION = 1.7.1 +LIBLDNS_VERSION = 1.8.1 LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:55:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:55:23 +0100 Subject: [Buildroot] [git commit] package/e2fsprogs: bump version to 1.46.5 Message-ID: <20220108095153.158F182A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16bfbeca6f4f2ec4a4fbb1a2325552190efcc687 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.5 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 63c7c9929f..452c8d5689 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.3/sha256sums.asc -sha256 b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713 e2fsprogs-1.46.4.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/sha256sums.asc +sha256 2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e e2fsprogs-1.46.5.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 76215e8c34..cd70e3a034 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.46.4 +E2FSPROGS_VERSION = 1.46.5 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) From peter at korsgaard.com Sat Jan 8 09:58:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:58:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/e2fsprogs: bump version to 1.46.5 In-Reply-To: <20220108091739.927609-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:17:39 +0100") References: <20220108091739.927609-1-bernd.kuhls@t-online.de> Message-ID: <87h7aeim6q.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.5 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Sat Jan 8 09:58:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 10:58:58 +0100 Subject: [Buildroot] [git commit] package/alsa-lib: disable versioned symbols only when unsupported Message-ID: <20220108095249.E414182ACB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21a1a5927004787217b19f09e6b113b68f91511e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Back in commit e90a4bf4af3b6466b2a2d8df12cfe84f5d364cca ("alsa-lib: don't use versioned symbols") from 2009, symbol versioning was disabled in alsa-lib, because it was causing problems with C libraries (such as uClibc) that doesn't support symbol versioning. The thread at http://mailman.alsa-project.org/pipermail/alsa-devel/2009-February/014999.html has some background discussion about this. Essentially, the issue was that alsa-lib in the new version of a given symbol calls into an old version of the same symbol. If your C library has symbol versioning, everything works fine. But if your C library doesn't support symbol versioning, the call from the new symbol into the old symbol will in fact end up in the new symbol, causing an infinite recursion. That problem was solved back then by unconditionally disabling symbol versioning in alsa-lib. However, some libraries such as CEF depend on versioned symbols from alsa-lib, and the build fails during linking with versioning disabled. This patch conditionally disables versioned symbols when unsupported by the toolchain, leaving them enabled otherwise. We assume only glibc has support for symbol versioning. uClibc has no support, and musl has some limited support, so we take the safe route of only enabling symbol versioning for glibc. Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- package/alsa-lib/alsa-lib.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index c43803f607..b5cd3f0d13 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -16,8 +16,11 @@ ALSA_LIB_AUTORECONF = YES ALSA_LIB_CONF_OPTS = \ --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \ --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \ - --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \ - --without-versioned + --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" + +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +ALSA_LIB_CONF_OPTS += --without-versioned +endif # Can't build with static & shared at the same time (1.0.25+) ifeq ($(BR2_STATIC_LIBS),y) From peter at korsgaard.com Sat Jan 8 09:59:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:59:40 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 250.1 In-Reply-To: <20220107214600.54727-1-romain.naour@smile.fr> (Romain Naour's message of "Fri, 7 Jan 2022 22:46:00 +0100") References: <20220107214600.54727-1-romain.naour@smile.fr> Message-ID: <87czl2im43.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Remove upstream patch > Fixes a build issue with toolchains using kernel headers < 5.6, > when the openat2(2) syscall is not available [2]. > Add a new patch to fix homework-mount with linux-headers < 5.2. > [1] https://github.com/systemd/systemd-stable/commit/cd88d010e862d26ce816eb3bd6735a80999ac41e > [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fddb5d430ad9fa91b49b1d34d0202ffe2fa0e179 > Signed-off-by: Romain Naour > Cc: Norbert Lange > Cc: Yann E. MORIN Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:59:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:59:10 +0100 Subject: [Buildroot] [git commit] package/systemd: bump to version 250.1 Message-ID: <20220108095426.DB02B82AB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=315ba5c26dd6bb0c01067e8346b4a7eceb7d0ee1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove upstream patch Fixes a build issue with toolchains using kernel headers < 5.6, when the openat2(2) syscall is not available [2]. Add a new patch to fix homework-mount with linux-headers < 5.2. [1] https://github.com/systemd/systemd-stable/commit/cd88d010e862d26ce816eb3bd6735a80999ac41e [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fddb5d430ad9fa91b49b1d34d0202ffe2fa0e179 Signed-off-by: Romain Naour Cc: Norbert Lange Cc: Yann E. MORIN Signed-off-by: Peter Korsgaard --- ...call-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 +++++++++ ...syscall-define-all-MOUNT_ATTR_-if-missing.patch | 84 ---------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 4 files changed, 35 insertions(+), 86 deletions(-) diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch new file mode 100644 index 0000000000..0934886acb --- /dev/null +++ b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch @@ -0,0 +1,33 @@ +From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 7 Jan 2022 22:25:23 +0100 +Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing + +MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] +but it's defined in kernel headers since version 5.2. + +[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 + +Signed-off-by: Romain Naour +--- + src/basic/missing_syscall.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h +index 8267b1a90c..793d111c55 100644 +--- a/src/basic/missing_syscall.h ++++ b/src/basic/missing_syscall.h +@@ -569,6 +569,10 @@ static inline int missing_open_tree( + #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ + #endif + ++#ifndef MOVE_MOUNT_T_EMPTY_PATH ++#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ ++#endif ++ + static inline int missing_move_mount( + int from_dfd, + const char *from_pathname, +-- +2.31.1 + diff --git a/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch b/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch deleted file mode 100644 index d0c4f6eaa0..0000000000 --- a/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0764e3a327573e7bda2f0e1a914f28482ab00574 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Fri, 24 Dec 2021 09:15:51 +0900 -Subject: [PATCH] missing-syscall: define all MOUNT_ATTR_* if missing - -Fixes #21876. - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -0764e3a327573e7bda2f0e1a914f28482ab00574] ---- - src/basic/missing_syscall.h | 48 ++++++++++++++++++++++++++++++++----- - 1 file changed, 42 insertions(+), 6 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 3da30e6f0e..0b0cc3cec2 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -462,20 +462,56 @@ struct mount_attr { - struct mount_attr; - #endif - -+#ifndef MOUNT_ATTR_RDONLY -+#define MOUNT_ATTR_RDONLY 0x00000001 /* Mount read-only */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOSUID -+#define MOUNT_ATTR_NOSUID 0x00000002 /* Ignore suid and sgid bits */ -+#endif -+ -+#ifndef MOUNT_ATTR_NODEV -+#define MOUNT_ATTR_NODEV 0x00000004 /* Disallow access to device special files */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOEXEC -+#define MOUNT_ATTR_NOEXEC 0x00000008 /* Disallow program execution */ -+#endif -+ -+#ifndef MOUNT_ATTR__ATIME -+#define MOUNT_ATTR__ATIME 0x00000070 /* Setting on how atime should be updated */ -+#endif -+ -+#ifndef MOUNT_ATTR_RELATIME -+#define MOUNT_ATTR_RELATIME 0x00000000 /* - Update atime relative to mtime/ctime. */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOATIME -+#define MOUNT_ATTR_NOATIME 0x00000010 /* - Do not update access times. */ -+#endif -+ -+#ifndef MOUNT_ATTR_STRICTATIME -+#define MOUNT_ATTR_STRICTATIME 0x00000020 /* - Always perform atime updates */ -+#endif -+ -+#ifndef MOUNT_ATTR_NODIRATIME -+#define MOUNT_ATTR_NODIRATIME 0x00000080 /* Do not update directory access times */ -+#endif -+ - #ifndef MOUNT_ATTR_IDMAP --#define MOUNT_ATTR_IDMAP 0x00100000 -+#define MOUNT_ATTR_IDMAP 0x00100000 /* Idmap mount to @userns_fd in struct mount_attr. */ - #endif - - #ifndef MOUNT_ATTR_NOSYMFOLLOW --#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 -+#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 /* Do not follow symlinks */ - #endif - --#ifndef AT_RECURSIVE --#define AT_RECURSIVE 0x8000 -+#ifndef MOUNT_ATTR_SIZE_VER0 -+#define MOUNT_ATTR_SIZE_VER0 32 /* sizeof first published struct */ - #endif - --#ifndef MOUNT_ATTR_SIZE_VER0 --#define MOUNT_ATTR_SIZE_VER0 32 -+#ifndef AT_RECURSIVE -+#define AT_RECURSIVE 0x8000 - #endif - - static inline int missing_mount_setattr( --- -2.25.1 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index cc33cd4c52..f89b2ce17d 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 41317fb443f7555de427aea69fda36c74661e77b58203cd6587eb8e1f612f46b systemd-250.tar.gz +sha256 ccfdd97679972cd3d9fb15bc3c647a3ee3351a434e20e1e3eec2851caa1b4849 systemd-250.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 0b52cc47d1..404943c45c 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 250 +SYSTEMD_VERSION = 250.1 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From peter at korsgaard.com Sat Jan 8 10:03:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:03:00 +0100 Subject: [Buildroot] [PATCH 1/2] package/matchbox-lib: bump to version 1.12 In-Reply-To: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 22:37:40 +0100") References: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> Message-ID: <878rvqilyj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop second and third patches (already in version) > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 10:03:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:03:05 +0100 Subject: [Buildroot] [PATCH 2/2] package/matchbox-fakekey: bump to version 0.3 In-Reply-To: <20220107213741.1668818-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 22:37:41 +0100") References: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> <20220107213741.1668818-2-fontaine.fabrice@gmail.com> Message-ID: <874k6eilye.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Use src/libfakekey.c as the license file because there is no COPYING in > the git tarball > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 10:01:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:01:48 +0100 Subject: [Buildroot] [git commit] package/matchbox-lib: bump to version 1.12 Message-ID: <20220108095719.B7B0882AB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21648affd254d1cfe9e10735d558832ecb576155 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop second and third patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/matchbox-lib/0002-libpng15.patch | 26 ------------------------ package/matchbox-lib/0003-include-setjmp-h.patch | 17 ---------------- package/matchbox-lib/matchbox-lib.hash | 3 +-- package/matchbox-lib/matchbox-lib.mk | 6 ++++-- 4 files changed, 5 insertions(+), 47 deletions(-) diff --git a/package/matchbox-lib/0002-libpng15.patch b/package/matchbox-lib/0002-libpng15.patch deleted file mode 100644 index 3d68573b5f..0000000000 --- a/package/matchbox-lib/0002-libpng15.patch +++ /dev/null @@ -1,26 +0,0 @@ -Support for libpng 1.5+ shamelessly taken from Gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/libmb/mbpixbuf.c -+++ b/libmb/mbpixbuf.c -@@ -247,7 +247,7 @@ - return NULL; - } - -- if ( setjmp( png_ptr->jmpbuf ) ) { -+ if ( setjmp( png_jmpbuf(png_ptr) ) ) { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL); - fclose(fd); - return NULL; -@@ -269,8 +269,8 @@ - ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) - png_set_gray_to_rgb(png_ptr); - -- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA -- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA -+ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA -+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA - ) - *has_alpha = 1; - else diff --git a/package/matchbox-lib/0003-include-setjmp-h.patch b/package/matchbox-lib/0003-include-setjmp-h.patch deleted file mode 100644 index 72e1e45d8f..0000000000 --- a/package/matchbox-lib/0003-include-setjmp-h.patch +++ /dev/null @@ -1,17 +0,0 @@ -matchbox-lib: include setjmp.h - -Based on this upstream patch: - - http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d - -Signed-off-by: Vicente Olivert Riera ---- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000 -+++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000 -@@ -22,6 +22,7 @@ - - #include - #include "mbpixbuf.h" -+#include - - #define BYTE_ORD_24_RGB 0 - #define BYTE_ORD_24_RBG 1 diff --git a/package/matchbox-lib/matchbox-lib.hash b/package/matchbox-lib/matchbox-lib.hash index d48fb32043..8144c10258 100644 --- a/package/matchbox-lib/matchbox-lib.hash +++ b/package/matchbox-lib/matchbox-lib.hash @@ -1,4 +1,3 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5 -md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 # Locally computed +sha256 5c7795e46c24d848a2b960f3b994911165d95e5d5731e39105ee0d808d2373eb libmatchbox-1.12.tar.bz2 sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk index 5541867699..00ca4a0d15 100644 --- a/package/matchbox-lib/matchbox-lib.mk +++ b/package/matchbox-lib/matchbox-lib.mk @@ -4,11 +4,13 @@ # ################################################################################ -MATCHBOX_LIB_VERSION = 1.9 +MATCHBOX_LIB_VERSION = 1.12 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2 -MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION) +MATCHBOX_LIB_SITE = http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot MATCHBOX_LIB_LICENSE = LGPL-2.1+ MATCHBOX_LIB_LICENSE_FILES = COPYING +# From git +MATCHBOX_LIB_AUTORECONF = YES MATCHBOX_LIB_INSTALL_STAGING = YES MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs From peter at korsgaard.com Sat Jan 8 10:02:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:02:11 +0100 Subject: [Buildroot] [git commit] package/matchbox-fakekey: bump to version 0.3 Message-ID: <20220108095719.C1BEE82AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5483ea9e972d8c18d63561cae5639b4510f2bb93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use src/libfakekey.c as the license file because there is no COPYING in the git tarball Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/matchbox-fakekey/matchbox-fakekey.hash | 5 ++--- package/matchbox-fakekey/matchbox-fakekey.mk | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/matchbox-fakekey/matchbox-fakekey.hash b/package/matchbox-fakekey/matchbox-fakekey.hash index 516e0b6362..3627b13913 100644 --- a/package/matchbox-fakekey/matchbox-fakekey.hash +++ b/package/matchbox-fakekey/matchbox-fakekey.hash @@ -1,4 +1,3 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2.md5 -md5 83dbde4d77e8baf0176fe4291d8a2303 libfakekey-0.1.tar.bz2 # Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 4e2fdc9bc20df469d53885c40e104122140131e06d4c184902070ec0b0f2ca9f libfakekey-0.3.tar.bz2 +sha256 3271662131760e9b30dd92495a0ea0b598fc457798cc67948947365299dd607d src/libfakekey.c diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk index e607c48c15..99921ef8e7 100644 --- a/package/matchbox-fakekey/matchbox-fakekey.mk +++ b/package/matchbox-fakekey/matchbox-fakekey.mk @@ -4,11 +4,14 @@ # ################################################################################ -MATCHBOX_FAKEKEY_VERSION = 0.1 +MATCHBOX_FAKEKEY_VERSION = 0.3 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2 -MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION) +MATCHBOX_FAKEKEY_SITE = \ + http://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot MATCHBOX_FAKEKEY_LICENSE = GPL-2.0+ -MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING +MATCHBOX_FAKEKEY_LICENSE_FILES = src/libfakekey.c +# From git +MATCHBOX_FAKEKEY_AUTORECONF = YES MATCHBOX_FAKEKEY_INSTALL_STAGING = YES MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat From bernd.kuhls at t-online.de Sat Jan 8 10:03:50 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 11:03:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsoundtouch: bump version to 2.3.1 Message-ID: <20220108100350.1102692-1-bernd.kuhls@t-online.de> Updated license hash due to upstream commit: https://codeberg.org/soundtouch/soundtouch/commit/d11a3adb2daddcdfafac2d86ec8de3b3f41d2f78 Updated _SITE: https://codeberg.org/soundtouch/soundtouch/commit/d063c0d9f9d29ef1f3302fbdee2f11f997bb2bce Signed-off-by: Bernd Kuhls --- package/libsoundtouch/libsoundtouch.hash | 4 ++-- package/libsoundtouch/libsoundtouch.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libsoundtouch/libsoundtouch.hash b/package/libsoundtouch/libsoundtouch.hash index fe6a108e33..9de72521bd 100644 --- a/package/libsoundtouch/libsoundtouch.hash +++ b/package/libsoundtouch/libsoundtouch.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f1ce96bac35779d3b752f4cc8696975b3d58f3deb9db47ffc45862767c2a2bdd libsoundtouch-2.2.tar.gz -sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT +sha256 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1 soundtouch-2.3.1.tar.gz +sha256 84c6d82dc7de80f5b73f231edfd3ddc5b53513908117452bfa37ea36bb4b7e0a COPYING.TXT diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk index 8a0e807d7a..c372c32ac7 100644 --- a/package/libsoundtouch/libsoundtouch.mk +++ b/package/libsoundtouch/libsoundtouch.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBSOUNDTOUCH_VERSION = 2.2 -LIBSOUNDTOUCH_SITE = $(call gitlab,soundtouch,soundtouch,$(LIBSOUNDTOUCH_VERSION)) +LIBSOUNDTOUCH_VERSION = 2.3.1 +LIBSOUNDTOUCH_SOURCE = soundtouch-$(LIBSOUNDTOUCH_VERSION).tar.gz +LIBSOUNDTOUCH_SITE = https://www.surina.net/soundtouch LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT LIBSOUNDTOUCH_AUTORECONF = YES -- 2.30.2 From thomas.petazzoni at bootlin.com Sat Jan 8 10:04:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 11:04:14 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/alsa-lib: disable versioned symbols only when unsupported In-Reply-To: <20200518051112.33798-1-joseph.kogut@gmail.com> References: <20200515183353.4183611-1-joseph.kogut@gmail.com> <20200518051112.33798-1-joseph.kogut@gmail.com> Message-ID: <20220108110414.69f9fb65@windsurf> Hello Joseph, On Sun, 17 May 2020 22:11:12 -0700 Joseph Kogut wrote: > Some libraries such as CEF depend on versioned symbols from alsa-lib, > and the build fails during linking with versioning disabled. > > Symbol versioning was originally disabled because some C libraries, such > as uClibc, don't support versioned symbols. > > This patch conditionally disables versioned symbols when unsupported by > the toolchain, leaving them enabled otherwise. > > Signed-off-by: Joseph Kogut > --- > package/alsa-lib/alsa-lib.mk | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Sorry for the delay. I have applied with a much more detailed commit log, and also after enabling versioned symbols only with glibc toolchains, as musl only has partial support for symbol versioning. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From bernd.kuhls at t-online.de Sat Jan 8 10:07:03 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 11:07:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/waf: bump version to 2.0.23 Message-ID: <20220108100703.1104859-1-bernd.kuhls@t-online.de> Changelog: https://gitlab.com/ita1024/waf/blob/master/ChangeLog Signed-off-by: Bernd Kuhls --- package/waf/waf.hash | 6 +++--- package/waf/waf.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/waf/waf.hash b/package/waf/waf.hash index e9d387e7d0..21f47f76d8 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,7 +1,7 @@ # Locally computed -sha1 494ada411468129ed229f946ecec3048400e320b waf-2.0.22 -sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf-2.0.22 +sha1 89b24f9c19328339c2c8103796755474b66f3a8d waf-2.0.23 +sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf-2.0.23 # The waf script also contains its license, but is renamed `waf` in the extract # step, so this is a synonym for the above, to check WAF_LICENSE -sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf +sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index 5cc0dc3714..2b1808ace4 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.0.22 +WAF_VERSION = 2.0.23 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io WAF_LICENSE = BSD-3-Clause -- 2.30.2 From tomi.valkeinen at ideasonboard.com Sat Jan 8 10:09:35 2022 From: tomi.valkeinen at ideasonboard.com (Tomi Valkeinen) Date: Sat, 8 Jan 2022 12:09:35 +0200 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: <7605fae5-42db-115c-e87a-0dbc3597a99a@mind.be> References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> <7605fae5-42db-115c-e87a-0dbc3597a99a@mind.be> Message-ID: On 07/01/2022 23:49, Arnout Vandecappelle wrote: > > > On 03/01/2022 09:24, Tomi Valkeinen wrote: >> Hi, >> >> On 06/12/2021 23:57, Yann E. MORIN wrote: >> >>> So I think we really, really need a package (like scipy) that actually >>> makes use of pybind, so we can see how it works, and to fix it... >> >> Jfyi, there are two relatively simple packages in buildroot that can >> use pybind: kmsxx and rwmem. Both use meson for building. >> >> I can test the next version of this series with those packages. > > ?I tried to do that. Unfortunately, it turns out that both of those > packages use the CMake way of finding the pybind11 dependency, and > apparently our cross-compilation.conf doesn't support cmake yet... So > it's not that trivial. Yes, I had a look at this also. kmsxx and rwmem use the plain meson dependency() to find the package. Works on Ubuntu, as Ubuntu's pybind11 installs the cmake files. I started testing with a more manual approach to finding pybind11, but didn't get it working yet. Tomi From guillaume.bressaix at gmail.com Sat Jan 8 10:26:14 2022 From: guillaume.bressaix at gmail.com (Guillaume Bres) Date: Sat, 8 Jan 2022 11:26:14 +0100 Subject: [Buildroot] [PATCH v2 3/3] support/testing: add test for python-pybind In-Reply-To: <267a64ba-8407-bcea-0e3b-994986433b0c@mind.be> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> <20220104123901.23929-3-guillaume.bressaix@gmail.com> <267a64ba-8407-bcea-0e3b-994986433b0c@mind.be> Message-ID: Hello Arnout, >In the future, please make sure that you don't claim authorship on a patch that is actually from someone else! well I don't understand how the first submitted test/example relates to a real use case or demonstrates something viable. For me pybind is a compile time feature to enhance the compiler capacity. So I was really confused as to what was submitted 2 years ago could actually demonstrate anything. Hence the different and kind of tweaked approach that I proposed. I think we will refer to these notes as the holy bible as of now https://git.busybox.net/buildroot/commit/?id=a19b822239c36cb40a632899bb5c3e848a5fc81e > Generated with scanpypi and converted to host. that seems a useful tool to use > I bumped [python-pybind] to 2.9.0 instead and applied to master, thanks. thanks I did not know it was out there Guillaume W. Bres Software engineer Le ven. 7 janv. 2022 ? 22:57, Arnout Vandecappelle a ?crit : > > > On 04/01/2022 13:39, guillaume.bressaix at gmail.com wrote: > > From: "Guillaume W. Bres" > > > > python-pybind is a header only library, most of the time used as a > host-package, > > to customize the host/usr/python interpreter capacity (at build time) > with C++ based features. > > > > Signed-off-by: Guillaume W. Bres > > I applied to master with many changes: > > - Retain python3 only. > - python-pybind is a target package, not host. > - Select python-pybind instead of depend. > - Simplify python-pybind-example package. > - Check in python-pybind-example build if pybind11.get_include() > produces output. > - Don't use python3 -m pybind11 --includes: it includes the main > python > includes, which are for the host, not for the target. > - Use TestPythonPackageBase instead of open-coding something imported > with host python. > > However, I hadn't noticed that the original author of this test was > Adam. In > the future, please make sure that you don't claim authorship on a patch > that is > actually from someone else! > > Regards, > Arnout > > > --- > > This test case enhances the /host/usr/python interpreter with a C++ > macro. > > > > The test delivers a C++ macro contained in its br-external/example.cpp. > > We compile it against the host context. > > We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively > contained > > in the host-python system path (import is easy). > > The macro is an integer adder, written in C++ that we can now call in > host-python. > > > > The test infrastructure should actually be declared > "host-generic-package" > > instead of "generic-package", to be consistent with Buildroot > infrastructure. > > But I am not able to get this to actually do anything, if I declare this > package > > as a host-generic and "Config.in.host" instead of "Config.in". To me, > this is > > not too important > > > > * TestPythonPybind allows testing for both Py2 and Py3 like it is done > > in many other packages > > > > * TestPythonPybind does not inherit from TestPythonPackageBase as > usually done > > (1) because I need the br2-external feature to ship the example.cpp > containing the custom macro > > (2) because TestPythonPackageBase always involves the emulator, which > we do not want in our context > > > > * Although TestPythonPybind does have a TestPythonBase.config base at > the same time, > > as it is most convenient to have a valid python context > > > > * TestPythonPybind uses subprocess, as similarly done in 'core' on > 'infra' test cases, > > because we do not involve the emulator > > > > * TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3 > > * TestPythonPybind tests a custom module attribute, written in C++, used > in Python 2/3 > > > > --- > > DEVELOPERS | 3 ++ > > .../br2-external/python-pybind/Config.in | 1 + > > .../br2-external/python-pybind/external.desc | 1 + > > .../br2-external/python-pybind/external.mk | 1 + > > .../package/python-pybind-example/Config.in | 5 ++ > > .../package/python-pybind-example/example.cpp | 16 +++++++ > > .../python-pybind-example.mk | 47 ++++++++++++++++++ > > .../tests/package/sample_python_pybind.py | 4 ++ > > .../tests/package/test_python_pybind.py | 48 +++++++++++++++++++ > > 9 files changed, 126 insertions(+) > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/Config.in > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/external.desc > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/external.mk > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/ > python-pybind-example.mk > > create mode 100644 > support/testing/tests/package/sample_python_pybind.py > > create mode 100644 support/testing/tests/package/test_python_pybind.py > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 21e4f2a84c..130ac3db73 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1120,6 +1120,9 @@ F: package/liquid-dsp/ > > F: package/pixiewps/ > > F: package/python-pybind/ > > F: package/reaver/ > > +F: support/testing/tests/package/br2-external/python-pybind > > +F: support/testing/tests/package/sample_python_pybind.py > > +F: support/testing/tests/package/test_python_pybind.py > > > > N: Guo Ren > > F: arch/Config.in.csky > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/Config.in > b/support/testing/tests/package/br2-external/python-pybind/Config.in > > new file mode 100644 > > index 0000000000..70c77157b3 > > --- /dev/null > > +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in > > @@ -0,0 +1 @@ > > +source > "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in" > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/external.desc > b/support/testing/tests/package/br2-external/python-pybind/external.desc > > new file mode 100644 > > index 0000000000..eef5e0f5a0 > > --- /dev/null > > +++ > b/support/testing/tests/package/br2-external/python-pybind/external.desc > > @@ -0,0 +1 @@ > > +name: PYTHON_PYBIND > > diff --git a/support/testing/tests/package/br2-external/python-pybind/ > external.mk b/support/testing/tests/package/br2-external/python-pybind/ > external.mk > > new file mode 100644 > > index 0000000000..3501f3135e > > --- /dev/null > > +++ b/support/testing/tests/package/br2-external/python-pybind/ > external.mk > > @@ -0,0 +1 @@ > > +include $(sort $(wildcard > $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk)) > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > > new file mode 100644 > > index 0000000000..773d021a53 > > --- /dev/null > > +++ > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > > @@ -0,0 +1,5 @@ > > +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE > > + bool "python-pybind-example" > > + depends on BR2_PACKAGE_PYTHON_PYBIND > > + help > > + This test creates a cpp macro later used on target in python > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > > new file mode 100644 > > index 0000000000..f2eea8e48d > > --- /dev/null > > +++ > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > > @@ -0,0 +1,16 @@ > > +#include > > +namespace py = pybind11; > > + > > +int add (int i, int j) { > > + return i + j; > > +} > > + > > +PYBIND11_MODULE (example, m) { > > + // optional module description > > + m.doc() = "pybind11 example plugin"; > > + // test a module method > > + m.def("add", &add, "example::add adds two integer numbers"); > > + // test a module attribute > > + py::object hello = py::cast("Hello World"); > > + m.attr("says") = hello; > > +} > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/ > python-pybind-example.mk > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/ > python-pybind-example.mk > > new file mode 100644 > > index 0000000000..85dd09d93f > > --- /dev/null > > +++ > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/ > python-pybind-example.mk > > @@ -0,0 +1,47 @@ > > > +################################################################################ > > +# > > +# python-pybind-example > > +# > > > +################################################################################ > > + > > +# this builds a C++ macro "add(a,b)" > > +# that we expose to host-python with a custom install > > +# and that the python test script will later use > > +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind > > + > > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS) > > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared > > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC > > + > > +ifeq ($(BR2_PACKAGE_PYTHON3),y) > > +PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR) > > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3 > > +else > > +PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR) > > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2 > > +endif > > + > > +# retrieve pybind11 include paths > > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \ > > + $(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes) > > + > > +# .so to be installed must have exact suffix > > +# otherwise import() in python will not work > > +HOST_LIB_BINARY_SUFFIX = \ > > + $(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix) > > + > > +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS > > + $(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D) > > + cd $(@D); \ > > + $(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \ > > + example.cpp -o > example$(HOST_LIB_BINARY_SUFFIX) > > +endef > > + > > +# installs into host/python sys.path > > +# so the new macro is naturally known > > +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS > > + $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \ > > + > $(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX) > > +endef > > + > > +$(eval $(generic-package)) > > diff --git a/support/testing/tests/package/sample_python_pybind.py > b/support/testing/tests/package/sample_python_pybind.py > > new file mode 100644 > > index 0000000000..605c0bab15 > > --- /dev/null > > +++ b/support/testing/tests/package/sample_python_pybind.py > > @@ -0,0 +1,4 @@ > > +#!/usr/bin/env python > > +import example > > +print(example.add(1, 2)) > > +print(example.says) > > diff --git a/support/testing/tests/package/test_python_pybind.py > b/support/testing/tests/package/test_python_pybind.py > > new file mode 100644 > > index 0000000000..7a68d6512a > > --- /dev/null > > +++ b/support/testing/tests/package/test_python_pybind.py > > @@ -0,0 +1,48 @@ > > +import os > > +import infra > > +import subprocess > > +from tests.package.test_python import TestPythonPackageBase > > + > > +class TestPythonPybind (infra.basetest.BRTest): > > + config = TestPythonPackageBase.config # python minimal requirements > > + sample_script = "tests/package/sample_python_pybind.py" > > + # ship examples macro & installs it to host > > + br2_external = > [infra.filepath("tests/package/br2-external/python-pybind")] > > + > > +class TestPythonPy2Pybind (TestPythonPybind): > > + __test__ = True > > + config = TestPythonPybind.config + \ > > + """ > > + BR2_PACKAGE_PYTHON=y > > + BR2_PACKAGE_PYTHON_PYBIND=y > > + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y > > + """ > > + > > + def test_run(self): > > + host_interpreter = > os.path.join(self.builddir,"host","usr","bin","python") > > + # test new c++->py macro exposed to host interpreter > > + cmd = [host_interpreter, > infra.filepath(self.sample_script)] > > + output = subprocess.check_output(cmd) > > + result = int(output.splitlines()[0]) > > + attribute = output.splitlines()[1].decode("utf-8") > > + self.assertEqual(result,3) # 2+1 using '+' macro from cpp > > + self.assertEqual(attribute,"Hello World") # macro special > attribute > > + > > +class TestPythonPy3Pybind (TestPythonPybind): > > + __test__ = True > > + config = TestPythonPybind.config + \ > > + """ > > + BR2_PACKAGE_PYTHON3=y > > + BR2_PACKAGE_PYTHON_PYBIND=y > > + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y > > + """ > > + > > + def test_run(self): > > + host_interpreter = > os.path.join(self.builddir,"host","usr","bin","python") > > + # test new c++->py macro exposed to host interpreter > > + cmd = [host_interpreter, > infra.filepath(self.sample_script)] > > + output = subprocess.check_output(cmd) > > + result = int(output.splitlines()[0]) > > + attribute = output.splitlines()[1].decode("utf-8") > > + self.assertEqual(result,3) # 2+1 using '+' macro from cpp > > + self.assertEqual(attribute,"Hello World") # macro special > attribute > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bernd.kuhls at t-online.de Sat Jan 8 10:26:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 11:26:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: bump version to 0.23.5 Message-ID: <20220108102620.1603341-1-bernd.kuhls@t-online.de> Switched project URL to https. Added upstream patch to fix build error wich uClibc: https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 https://github.com/MusicPlayerDaemon/MPD/pull/1382 Changelog: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.5/NEWS Signed-off-by: Bernd Kuhls --- ...2-lib-alsa-Error-add-missing-include.patch | 25 +++++++++++++++++++ package/mpd/Config.in | 2 +- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 package/mpd/0002-lib-alsa-Error-add-missing-include.patch diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch new file mode 100644 index 0000000000..c45a087a54 --- /dev/null +++ b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch @@ -0,0 +1,25 @@ +From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 +From: aeolio +Date: Tue, 14 Dec 2021 09:01:23 +0100 +Subject: [PATCH] lib/alsa/Error: add missing #include + +Downloaded from upstream commit: +https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 + +Signed-off-by: Bernd Kuhls +--- + src/lib/alsa/Error.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx +index cd351f37d1..8ceb4417ca 100644 +--- a/src/lib/alsa/Error.cxx ++++ b/src/lib/alsa/Error.cxx +@@ -29,6 +29,7 @@ + + #include "Error.hxx" + ++#include + #include + + namespace Alsa { diff --git a/package/mpd/Config.in b/package/mpd/Config.in index eb10151df3..fc0f409448 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -16,7 +16,7 @@ menuconfig BR2_PACKAGE_MPD it can play a variety of sound files while being controlled by its network protocol. - http://www.musicpd.org + https://www.musicpd.org if BR2_PACKAGE_MPD diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index cb9d05cd32..56f88490cf 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b300625701005c6b14649f11dac118d05540529a5385d05b7c3062c0ce08f399 mpd-0.23.3.tar.xz +sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 7bda0963c6..42165b1308 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).3 +MPD_VERSION = $(MPD_VERSION_MAJOR).5 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt -- 2.30.2 From romain.naour at smile.fr Sat Jan 8 10:31:52 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 11:31:52 +0100 Subject: [Buildroot] package/aravis: new package In-Reply-To: References: Message-ID: Hello Marc, Le 07/01/2022 ? 21:08, marc.chalain at mailoo.org a ?crit?: > Thank for all, > > I will send a new version quickly, but some questions first: > > > >> +ARAVIS_VERSION = 0.8.16 > > Aravis project is moving fast, there is a new version 0.8.20 already. > I'm fine with this version since it was released recently: > https://github.com/AravisProject/aravis/releases/tag/0.8.16 > > > The 0.8.16 is available from June 2021. I had clearly well tested this version with several kernel configuration. What is it better ? the last version or the most tested version ? > > To send 0.8.20 I will need few weeks, to test. Using a version you are confident with is OK. Maybe add a comment in the commit log about your choice to use a previous version than the latest one. > > > >> +ARAVIS_SITE = $(call github,AravisProject,aravis,$(ARAVIS_VERSION)) >> +ARAVIS_DEPENDENCIES = \ >> +??? host-pkgconf \ >> +??? libglib2 \ >> +??? libxml2 > > There is a list of dependencies in the Readme: > > https://github.com/AravisProject/aravis/blob/main/README.md#install-dependencies-on-ubuntu-2004 > > especially gstreamer and plugins etc.. > > > This rules is just for GigE Camera and not USB3Vision. I haven't tested this feature. The gstreamer is not mandator, it is only for the viewer. I am focused on Embeded system without any kind of display. > > If the gstreamer or libusb3 are availables, meson is able to detect and add them during the configuration process. > > To add as dependencies, forces to build the optionals features. > > What's the best ? If you don't use an optional dependency, we recommend to disable it explicitly. Letting an optional dependency auto detected by a package without any handling in the Buildroot package is a problem for the build reproducibility. Best regards, Romain > > > > Thank you., best regards, > > Marc. > > > > > > > > De : Thomas Petazzoni > ? : Romain Naour > Sujet : Re: [Buildroot] package/aravis: new package > Date : 06/01/2022 10:37:59 Europe/Paris > Copie ? : marc.chalain at mailoo.org; > ???buildroot at buildroot.org; > ???Eric Le Bihan ; > ???Marc Chalain > > Hello, > > On Thu, 6 Jan 2022 10:24:53 +0100 > Romain Naour wrote: > >>> diff --git a/package/aravis/Config.in b/package/aravis/Config.in >>> new file mode 100644 >>> index 0000000000..02c71c44da >>> --- /dev/null >>> +++ b/package/aravis/Config.in >>> @@ -0,0 +1,16 @@ >>> +config BR2_PACKAGE_ARAVIS >>> +??? bool "aravis - GigE Camera" > > Just: > > bool "aravis" > >>> +??? depends on BR2_USE_WCHAR >>> +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL >>> +??? depends on BR2_PACKAGE_PCRE_16 >>> +??? depends on BR2_PACKAGE_PCRE_32 > > Please use "select" for pcre. > >>> +ARAVIS_LICENSE_FILES = COPYING >>> +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) >> >> Is gettext a mandatory dependency ? >> At least gettext should be in ARAVIS_DEPENDENCIES when NLS support is enabled. > > No, don't add gettext directly, use $(TARGET_NLS_DEPENDENCIES), which > will automatically add (or not) host-gettext and/or gettext to the > dependencies, depending on when it's needed or not. > > Thomas > From peter at korsgaard.com Sat Jan 8 10:40:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:40:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/freetype: bump version to 2.11.1 In-Reply-To: <20220108093206.999409-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:32:06 +0100") References: <20220108093206.999409-1-bernd.kuhls@t-online.de> Message-ID: <87zgo6h5mw.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Updated license hash and location of LICENSE.TXT due to upstream commit: > https://gitlab.freedesktop.org/freetype/freetype/-/commit/0606350c2a08eec120e4557a07f252e1c72963ce > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 10:39:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:39:42 +0100 Subject: [Buildroot] [git commit] package/freetype: bump version to 2.11.1 Message-ID: <20220108103510.56A41811B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24999e2025fb53b237b4f8f79244e45b0b366ca0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updated license hash and location of LICENSE.TXT due to upstream commit: https://gitlab.freedesktop.org/freetype/freetype/-/commit/0606350c2a08eec120e4557a07f252e1c72963ce Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/freetype/freetype.hash | 8 ++++---- package/freetype/freetype.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 36571b51af..7abc3d96da 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ -sha1 0181862673f7216ad2b5074f95fc131209e30b27 freetype-2.10.4.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.11.1/ +sha1 86bdc98b37efe447cf53420bf2c18402ff905112 freetype-2.11.1.tar.xz # Locally calculated -sha256 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784 freetype-2.10.4.tar.xz -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT +sha256 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 freetype-2.11.1.tar.xz +sha256 c85e842b7ff04d95dab7d68e812773de0f8b67940e5449d35b42c66eb0f619fe LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 59d6dc0eb8..912e6c4daa 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,13 +4,13 @@ # ################################################################################ -FREETYPE_VERSION = 2.10.4 +FREETYPE_VERSION = 2.11.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" FREETYPE_LICENSE = Dual FTL/GPL-2.0+ -FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_CONFIG_SCRIPTS = freetype-config From peter at korsgaard.com Sat Jan 8 10:48:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:48:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.81.0 In-Reply-To: <20220108094756.1057296-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:47:56 +0100") References: <20220108094756.1057296-1-bernd.kuhls@t-online.de> Message-ID: <87v8yuh5a2.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://curl.se/changes.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sat Jan 8 10:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 11:49:20 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> <7605fae5-42db-115c-e87a-0dbc3597a99a@mind.be> Message-ID: <0652aacd-46ea-6d4d-0e0b-ee9c6c6ba399@mind.be> On 08/01/2022 11:09, Tomi Valkeinen wrote: > On 07/01/2022 23:49, Arnout Vandecappelle wrote: >> >> >> On 03/01/2022 09:24, Tomi Valkeinen wrote: >>> Hi, >>> >>> On 06/12/2021 23:57, Yann E. MORIN wrote: >>> >>>> So I think we really, really need a package (like scipy) that actually >>>> makes use of pybind, so we can see how it works, and to fix it... >>> >>> Jfyi, there are two relatively simple packages in buildroot that can use >>> pybind: kmsxx and rwmem. Both use meson for building. >>> >>> I can test the next version of this series with those packages. >> >> ??I tried to do that. Unfortunately, it turns out that both of those packages >> use the CMake way of finding the pybind11 dependency, and apparently our >> cross-compilation.conf doesn't support cmake yet... So it's not that trivial. > > Yes, I had a look at this also. kmsxx and rwmem use the plain meson dependency() > to find the package. Works on Ubuntu, as Ubuntu's pybind11 installs the cmake > files. I also made sure that python-pybind installs the cmake files. I just haven't tested if they actually work. I already noticed that there's one of the files that is not cross-compile friendly because it found /usr/bin/python. But maybe that one isn't actually used in practice. > I started testing with a more manual approach to finding pybind11, but didn't > get it working yet. No, the cmake approach should be fine. We just have to update the meson cross-compilation.conf so it points to STAGING_DIR/usr/share/cmake. Regards, Arnout From thomas.petazzoni at bootlin.com Sat Jan 8 10:51:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 11:51:40 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> Message-ID: <20220108115140.760e195f@windsurf> On Tue, 4 Jan 2022 21:54:55 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 5.41 in > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > readelf.c: In function 'do_auxv_note': > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > > Signed-off-by: Fabrice Fontaine I am afraid it seems like this didn't fix the problem, see: http://autobuild.buildroot.net/results/957/9573e8b01d8f21cd89a67475daabdeef533d31d7/build-end.log ac_cv_prog_cc_c99='-std=gnu99' is properly passed to the configure script, but it still fails. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sat Jan 8 10:53:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:53:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcap: bump version to 2.62 In-Reply-To: <20220108094533.1025401-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:45:33 +0100") References: <20220108094533.1025401-1-bernd.kuhls@t-online.de> Message-ID: <87r19ih51l.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Removed patch which was applied upstream: > https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=afbc554d16a32ed352191e49b3673f2f72d0002f > Release notes: > https://sites.google.com/site/fullycapable/release-notes-for-libcap > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 10:47:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:47:50 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 7.81.0 Message-ID: <20220108104742.9ECD082A00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efd0435add883e24b1a7053c12e2d71df7f5c247 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://curl.se/changes.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c488df57b1..63d6ba306c 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-7.80.0.tar.xz.asc +# https://curl.se/download/curl-7.81.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab curl-7.80.0.tar.xz +sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 24591f2e0a..20ebb4f271 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.80.0 +LIBCURL_VERSION = 7.81.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From peter at korsgaard.com Sat Jan 8 10:49:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:49:55 +0100 Subject: [Buildroot] [git commit] package/libcap: bump version to 2.62 Message-ID: <20220108104742.A7F1C82B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5260f3189b6479dac1aa07af41f55056352a3c40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which was applied upstream: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=afbc554d16a32ed352191e49b3673f2f72d0002f Release notes: https://sites.google.com/site/fullycapable/release-notes-for-libcap Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...file-don-t-overwrite-empty-when-generatin.patch | 50 ---------------------- package/libcap/libcap.hash | 2 +- package/libcap/libcap.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch b/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch deleted file mode 100644 index a47a2c788e..0000000000 --- a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dc507a812d931c24f1ac98c811fdd29bffa21da9 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 24 Aug 2021 00:36:40 +0200 -Subject: [PATCH] libcap/Makefile: don't overwrite 'empty' when generating - loader.txt - -objcopy takes an input file and an output file as arguments. If the -output file is left out, the input file will be overwritten. - -Since the objcopy command used to generate loader.txt only does a -dump-section and no filtering, in practice there is no change to empty. -However, as a side-effect, its timestamp is updated. The timestamp of -empty and of loader.txt will be more or less the same; however, -loader.txt is closed just before the output file is closed, so it's -possible that the timestamp of loader.txt is just a little bit earlier. -If this happens, it causes loader.txt to be rebuilt later, which in turn -causes a number of other object files to be rebuilt. - -Usually that's harmless, but it sometimes causes the rebuild to happen -during 'make install'. This is particularly annoying if 'make install' -is done as root, since loader.txt becomes owned by root in that case. - -Fix this by specifying a harmless output file: /dev/null. - -While we're at it, take in an upstream change that removes the redundant -redirect. - -Fixes: ee3b25c0a877fa74d1aec88f325ac45b09963c82 - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - libcap/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libcap/Makefile b/libcap/Makefile -index 47cf8f4..18e4f4f 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -105,7 +105,7 @@ empty: empty.c - $(CC) -o $@ $< - - loader.txt: empty -- $(OBJCOPY) --dump-section .interp=/dev/stdout $< > $@ -+ $(OBJCOPY) --dump-section .interp=$@ $< /dev/null - - cap_magic.o: execable.h execable.c loader.txt - $(CC) $(CFLAGS) $(IPATH) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@ --- -2.31.1 - diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index eb8fe43f6f..396e592c5b 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97 libcap-2.52.tar.xz +sha256 190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2 libcap-2.62.tar.xz # Hash for license file: sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 45700e56ec..42acca9082 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.52 +LIBCAP_VERSION = 2.62 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause From romain.naour at smile.fr Sat Jan 8 10:56:54 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 11:56:54 +0100 Subject: [Buildroot] [PATH v2 1/1] docs/manual: add qemu defconfigs gitlab test In-Reply-To: <20200915165156.179380a9@windsurf.hq.k.grp> References: <20200915103806.13785-1-jugurtha.belkalem@smile.fr> <20200915165156.179380a9@windsurf.hq.k.grp> Message-ID: <90d1cd65-6cb7-d708-9b57-2089c5485d63@smile.fr> Hello Thomas, Le 15/09/2020 ? 16:51, Thomas Petazzoni a ?crit?: > On Tue, 15 Sep 2020 12:38:06 +0200 > Jugurtha BELKALEM wrote: > >> +=== Adding qemu defconfig gitlab test >> + >> +Buildroot provides a test script (support/scripts/boot-qemu-image.py) >> +to validate all defconfigs under +board/qemu/. Every supported qemu >> +architecture should append the comment : # qemu_ARCH_defconfig >> +at the end of its command line entry in board/qemu/ARCH/readme.txt (for >> +example aarch64-virt includes : # qemu_aarch64_virt_defconfig). >> +Once a week, every defconfig is tested under gitlab's pipelines : >> +* Launches a qemu instance. >> +* Enters root credentials and checks if login shell is available. >> +* Powers off the instance. >> +The job fails if one of above steps returns unsuccessful status code. >> +to trigger qemu defconfigs test jobs: >> + >> +--------------------- >> + $ git push gitlab HEAD:_defconfig >> +--------------------- > > While I understand the idea of documenting this, I am wondering if the > Buildroot manual is really the right place for this. Indeed, this bit > of documentation is really only useful for the very specific/narrow use > case of qemu defconfigs. > > Should this be in board/qemu/readme.txt ? I'm not sure. Maybe the manual needs a new chapter about the gitlab-ci in general and document all pipeline trigger supported. For a new qemu defconfigs, we need to take care of: - define "# qemu_ARCH_defconfig" tag in the file board/qemu/ARCH/readme.txt - Use board/qemu/post-image.sh post image script and provide the name of the defconfig as argument of this script: BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - Enable host-qemu to use qemu built by Buildroot for the host: BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y Being in the manual would promote gitlab-ci testing with Qemu. Best regards, Romain > > Thomas > From thomas.petazzoni at bootlin.com Sat Jan 8 11:04:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:04:14 +0100 Subject: [Buildroot] [git commit] package/scons: explicitly specify host Python 3 Message-ID: <20220108105818.A2FFA82A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd448234d284dc42730bef0ffa1e6d9b8e5b0096 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All packages using scons are now using Python 3 to run it, so explicitly set scons as using host-python3. This avoids a spurious host Python 2 dependency if BR2_PACKAGE_PYTHON3 is not set (for example, if no Python is packaged for the target). Signed-off-by: Robert Hancock Signed-off-by: Thomas Petazzoni --- package/scons/scons.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/scons/scons.mk b/package/scons/scons.mk index da2ccceb08..a95fa7fd69 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -10,6 +10,8 @@ SCONS_LICENSE = MIT SCONS_LICENSE_FILES = LICENSE.txt SCONS_SETUP_TYPE = distutils +HOST_SCONS_NEEDS_HOST_PYTHON = python3 + HOST_SCONS_INSTALL_OPTS = \ --install-lib=$(HOST_DIR)/lib/scons-$(SCONS_VERSION) From thomas.petazzoni at bootlin.com Sat Jan 8 11:04:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:04:14 +0100 Subject: [Buildroot] [git commit] package/{gpsd, benejson}: drop host-python3 dependency Message-ID: <20220108105818.B72C382B60@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c240410d4b38c7946d2dd65c1c1eec6d172a0814 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These packages needed to depend on host-python3 because their Scons machinery was written in python3, but host-scons itself was depending on host-python. Now that host-scons depends on host-python3, the packages that use host-scons no longer have to carry a host-python3 dependency. The other package using scons, mongodb, does not have a direct dependency on host-python3, but on a number of host Python 3.x modules which are needed during the build, so no changes is necessary there. Signed-off-by: Thomas Petazzoni --- package/benejson/benejson.mk | 2 +- package/gpsd/gpsd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/benejson/benejson.mk b/package/benejson/benejson.mk index f6f936ec71..680e5b5bda 100644 --- a/package/benejson/benejson.mk +++ b/package/benejson/benejson.mk @@ -9,7 +9,7 @@ BENEJSON_SITE = $(call github,codehero,benejson,$(BENEJSON_VERSION)) BENEJSON_LICENSE = MIT BENEJSON_LICENSE_FILES = LICENSE BENEJSON_INSTALL_STAGING = YES -BENEJSON_DEPENDENCIES = host-python3 host-scons +BENEJSON_DEPENDENCIES = host-scons # wchar support needs to be manually disabled ifeq ($(BR2_USE_WCHAR),) diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 61391f0e9b..636c6c95ba 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -12,7 +12,7 @@ GPSD_CPE_ID_VENDOR = gpsd_project GPSD_SELINUX_MODULES = gpsd GPSD_INSTALL_STAGING = YES -GPSD_DEPENDENCIES = host-python3 host-scons host-pkgconf +GPSD_DEPENDENCIES = host-scons host-pkgconf GPSD_LDFLAGS = $(TARGET_LDFLAGS) GPSD_CFLAGS = $(TARGET_CFLAGS) From thomas.petazzoni at bootlin.com Sat Jan 8 11:04:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:04:14 +0100 Subject: [Buildroot] [git commit] package/scons: bring back Python interpreter call in SCONS variable Message-ID: <20220108105818.AE3C881323@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=726209fc7999986fa414d629ff60d1bc76c63a2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Back in commit f72be49830404fb69480a9e5db4381dfcc6dc8ec ("package/scons: remove python from SCONS"), we changed the SCONS variable to not explicitly invoke the Python interpreter, because some scons-based packages used python2, some python3. Now that the 3 remaining packages using scons (gpsd, mongodb and benejson) all use python3, we can bring back the python3 interpreter call into the SCONS variable, and slightly simplify those packages. Signed-off-by: Thomas Petazzoni --- package/benejson/benejson.mk | 2 +- package/gpsd/gpsd.mk | 6 +++--- package/mongodb/mongodb.mk | 4 ++-- package/scons/scons.mk | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/benejson/benejson.mk b/package/benejson/benejson.mk index 5bb57d028d..f6f936ec71 100644 --- a/package/benejson/benejson.mk +++ b/package/benejson/benejson.mk @@ -41,7 +41,7 @@ endif # Shared enabled define BENEJSON_BUILD_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ - $(HOST_DIR)/bin/python3 $(SCONS) $(BENEJSON_SCONS_TARGETS)) + $(SCONS) $(BENEJSON_SCONS_TARGETS)) endef define BENEJSON_INSTALL_STAGING_CMDS diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index ff924c49e0..61391f0e9b 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -211,7 +211,7 @@ GPSD_SCONS_ENV += \ define GPSD_BUILD_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS)) endef @@ -219,7 +219,7 @@ define GPSD_INSTALL_TARGET_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(TARGET_DIR) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS) \ $(if $(BR2_PACKAGE_HAS_UDEV),udev-install,install)) endef @@ -241,7 +241,7 @@ define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(STAGING_DIR) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS) \ install) endef diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index ede03e44d6..c33c3c2eb7 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -86,7 +86,7 @@ endif define MONGODB_BUILD_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ $(MONGODB_SCONS_TARGETS)) @@ -94,7 +94,7 @@ endef define MONGODB_INSTALL_TARGET_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ --prefix=$(TARGET_DIR)/usr \ diff --git a/package/scons/scons.mk b/package/scons/scons.mk index a95fa7fd69..bc5d2a1ef9 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -18,4 +18,4 @@ HOST_SCONS_INSTALL_OPTS = \ $(eval $(host-python-package)) # variables used by other packages -SCONS = $(HOST_DIR)/bin/scons $(if $(QUIET),-s) +SCONS = $(HOST_DIR)/bin/python3 $(HOST_DIR)/bin/scons $(if $(QUIET),-s) From romain.naour at smile.fr Sat Jan 8 11:04:30 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 12:04:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <20201126152832.1115350-1-nolange79@gmail.com> References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> Hello Norbert, Le 26/11/2020 ? 16:28, Norbert Lange a ?crit?: > Systemd has very many options, adding a way for the user > to set custom options can help customizations > without changing buildroot files. This is also true of any package in Buildroot. Users may want to provide a custom option that is not handled yet by Buildroot. What if the option provided in BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG requires a build dependency ? Best regards, Romain From romain.naour at smile.fr Sat Jan 8 11:20:01 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 12:20:01 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: <20201126144722.502163-1-nolange79@gmail.com> References: <20201126144722.502163-1-nolange79@gmail.com> Message-ID: Le 26/11/2020 ? 15:47, Norbert Lange a ?crit?: > Especially for read-only filesystems it is helpfull to > pre-create all folders for non-volatile paths. > > This needs to run under fakeroot to allow setting > uids/gids/perms for the target fs. > > As systemd-tmpfilesd also supports specifiers, but so far > only resolves those from the host, it is necessary > to specially handle entries that contain problematic > specifiers. > > Entries containing problematic specifiers are either skipped, > but in some cases its possible to instead manually replace > them with correct replacements from the target. > > Signed-off-by: Norbert Lange > --- > v1->v2 > * add a script to skip/handle specifiers that might > otherwise take information from the host > > package/systemd: tmpfilesv2 > > Signed-off-by: Norbert Lange > --- > package/systemd/fakeroot_tmpfiles.sh | 66 ++++++++++++++++++++++++++++ > package/systemd/systemd.mk | 9 +++- > 2 files changed, 73 insertions(+), 2 deletions(-) > create mode 100644 package/systemd/fakeroot_tmpfiles.sh > > diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh > new file mode 100644 > index 0000000000..f5e4fb234c > --- /dev/null > +++ b/package/systemd/fakeroot_tmpfiles.sh > @@ -0,0 +1,66 @@ > +#!/bin/sh > +# > +# until a solution like [1] is upstreamed, > +# its necessary to mask out specs which will infer properties > +# from the host. > +# > +# TMPDIR= TEMP= TMP= makes sure %T and %V are set to the default > +# > +# shell expansion is critical to be POSIX compliant, > +# this script wont work with zsh in its default mode for example. > +# > +# The script takes everal measures to handle more complex stuff > +# like passing this correctly: > +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n > +# > +# [1] - https://github.com/systemd/systemd/issues/16183 It seems that systemd now include what you need since version 249 containing the commit [1]. The fakeroot_tmpfiles.sh script seems not neceesary anymore. [1] https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 Best regards, Romain > + > +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || > + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles > + > +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || > + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } > + > +# read OS specific variables from file, > +# buildroot already wrote this in target-finalize, > +# users might replace it by using an overlay > +BUILD_ID=; ID=; VERSION_ID=; VARIANT_ID=; > +for f in /etc/os-release /usr/lib/os-release; do > + # dont blindly set all variables, only pick the ones we need > + [ -r "$1"/$f ] && > + eval "$(sed -n -e '/^BUILD_ID=/p' -e '/^ID=/p' -e '/^VERSION_ID=/p' -e '/^VARIANT_ID=/p' "$1"/$f)" && > + break > +done > + > +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | > + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | > + while read -r line; do > + # it is allowed to use quotes around arguments, > + # so let the shell pack the arguments > + eval "set -- $line" > + > + # dont output warnings for directories we dont process > + [ "${2#/dev}" = "${2}" ] && [ "${2#/dev}" = "${2}" ] && > + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && > + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || > + continue > + > + # blank out all specs that are ok to use, > + # test if some remain > + if echo "$2 ${7-}" | sed -e 's,%[%ChLStTgGuUV],,g' | grep -v -q '%'; then > + # no "bad" specifiers, pass the line unmodified > + eval "printf '%s\n' '$line'" > + elif echo "$2 ${7-}" | sed -e 's,%[%ChLStTgGuUVBowW],,g' | grep -v -q '%'; then > + # something we can fix > + eval "printf '%s\n' '$line'" | > + sed -e "s#%B#$BUILD_ID#g" -e "s#%o#$ID#g" -e "s#%w#$VERSION_ID#g" -e "s#%W#$VARIANT_ID#g" > + else > + # warn > + eval "printf 'ignored spec: %s\n' '$line' 1>&2" > + fi > + done | > +\ > +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ > + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ > + --exclude-prefix=/tmp --exclude-prefix=/mnt \ > + - > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index ae99c02abf..629f4022d7 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -654,10 +654,15 @@ endef > > SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > +define SYSTEMD_CREATE_TMPFILES_HOOK > + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ > + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) > +endef > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL > > SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) > SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) > @@ -717,7 +722,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dvconsole=false \ > -Dquotacheck=false \ > -Dsysusers=false \ > - -Dtmpfiles=false \ > + -Dtmpfiles=true \ > -Dimportd=false \ > -Dhwdb=false \ > -Drfkill=false \ > From thomas.petazzoni at bootlin.com Sat Jan 8 11:20:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:20:53 +0100 Subject: [Buildroot] [PATCH] package/scons: explicitly specify host Python 3 In-Reply-To: <20200714033927.1516172-1-hancock@sedsystems.ca> References: <20200714033927.1516172-1-hancock@sedsystems.ca> Message-ID: <20220108122053.5ac56167@windsurf> On Mon, 13 Jul 2020 21:39:27 -0600 Robert Hancock wrote: > All packages using scons are now using Python 3 to run it, so > explicitly set scons as using host-python3. This avoids a > spurious host Python 2 dependency if BR2_PACKAGE_PYTHON3 is not > set (for example, if no Python is packaged for the target). > > Signed-off-by: Robert Hancock > --- > package/scons/scons.mk | 2 ++ > 1 file changed, 2 insertions(+) After so much time: patch applied! I also took the opportunity of your patch to do two scons-related changes: https://git.buildroot.org/buildroot/commit/?id=726209fc7999986fa414d629ff60d1bc76c63a2c https://git.buildroot.org/buildroot/commit/?id=c240410d4b38c7946d2dd65c1c1eec6d172a0814 Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 11:21:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:21:59 +0100 Subject: [Buildroot] [git commit] package/rhash: fix activation of gettext Message-ID: <20220108111557.3CBB282A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5630e83c8452d3e9039feb15fd30ea005bfc6b55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rhash/rhash.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index d19c355cbb..02af0aa57b 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -15,9 +15,9 @@ RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) -RHASH_CONF_OPTS += --disable-gettext -else RHASH_CONF_OPTS += --enable-gettext +else +RHASH_CONF_OPTS += --disable-gettext endif ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) From thomas.petazzoni at bootlin.com Sat Jan 8 11:22:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:22:28 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/rhash: fix activation of gettext In-Reply-To: <20201113065124.30364-1-fontaine.fabrice@gmail.com> References: <20201113065124.30364-1-fontaine.fabrice@gmail.com> Message-ID: <20220108122228.6ec1433a@windsurf> On Fri, 13 Nov 2020 07:51:24 +0100 Fabrice Fontaine wrote: > Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is > wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set > > Signed-off-by: Fabrice Fontaine > --- > package/rhash/rhash.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Sat Jan 8 11:55:38 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 12:55:38 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: <20201126144745.502228-1-nolange79@gmail.com> References: <20201126144745.502228-1-nolange79@gmail.com> Message-ID: <06dd49b7-5abc-7a18-2d56-3f69e624e8b7@smile.fr> Hello Norbert, Le 26/11/2020 ? 15:47, Norbert Lange a ?crit?: > journald supports catalog files, or rather a binary database of > those. > Functionality added includes: > > - A config option allows enabling the binary database. > > - if the option is enabled, the database is built and moved to > /usr/share/factory. A symlink is created in /var pointing to > that file. > If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the > language whitelist are deleted first. > > - the service normally used for creating the DB during boot, > and the catalog source files used as input are deleted. > > The move to /usr/share/factory is helpful for having /usr as whole > system distribution. > > Signed-off-by: Norbert Lange > --- > v1->v2: > - Moved all logic into systemd.mk > - solved the LOCALE_PURGE order that way > - use the factory to store the file > - option to enable the DB (similar to udev HWDB) > - cant be anabled with !ROOTFS_RW, tons of > issues with that one > v2->v3: > - use backticks instead of $$() > - be more explicit about what happens in > SYSTEMD_LOCALE_PURGE_CATALOGS > > Signed-off-by: Norbert Lange > --- > package/systemd/Config.in | 14 +++++++++++++ > package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index ec34478e3d..d576e6035b 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD > > http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands > > +config BR2_PACKAGE_SYSTEMD_CATALOGDB > + bool "enable journal catalog database installation" > + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic > + help > + Build and install the journal catalog database. > + > + catalog files are used to provide extended and potentially localized > + messages for the journal. > + > + The original catalog files will be built into a DB at > + /usr/share/factory/var/lib/systemd/catalog/database. > + > + https://www.freedesktop.org/wiki/Software/systemd/catalog/ > + > config BR2_PACKAGE_SYSTEMD_LOCALED > bool "enable locale daemon" > help > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index cb12f667d6..ae99c02abf 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD > $(SYSTEMD_INSTALL_NETWORK_CONFS) > endef > > +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) > +define SYSTEMD_LOCALE_PURGE_CATALOGS > + # go through all files with scheme ..catalog > + # and remove those where is not in LOCALE_NOPURGE > + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ Why not "systemd.*.catalog" ? On my system, all catalog files with are nammed starting with "systemd." > + do \ > + basename=$${cfile##*/}; \ > + basename=$${basename%.catalog}; \ > + langext=$${basename#*.}; \ > + [ "$$langext" = "$${basename}" ] && continue; \ > + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ > + rm -f "$$cfile"; \ > + done > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) > +define SYSTEMD_UPDATE_CATALOGS > + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog > + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ > + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database > + rm $(TARGET_DIR)/var/lib/systemd/catalog/database > + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ > + $(TARGET_DIR)/var/lib/systemd/catalog/database > + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ > + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS > +endif > + > +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ So we remove this directory. Why adding SYSTEMD_LOCALE_PURGE_CATALOGS then ? Best regards, Romain > + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > From peter at korsgaard.com Sat Jan 8 12:30:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 13:30:37 +0100 Subject: [Buildroot] [PATCH] busybox: background udhcpc by default if no lease is obtained In-Reply-To: <20211216124048.5968-1-lothar.felten@gmail.com> (Lothar Felten's message of "Thu, 16 Dec 2021 13:40:48 +0100") References: <20211216124048.5968-1-lothar.felten@gmail.com> Message-ID: <87mtk6h0k2.fsf@dell.be.48ers.dk> >>>>> "Lothar" == Lothar Felten writes: > The current behavior for busybox' udhcpc is to terminate if no lease is > obtained at start up. Therefore no address is acquired if the link is > established afterwards. > By setting the -b flag udhcpc will background allowing the link to be > established at any time. > Signed-off-by: Lothar Felten I was afraid that this would break the avahi-autoipd fallback logic, but looking at the udhcpc logic it still triggers the leasefail action on timeout, so that should be fine. > --- > package/busybox/busybox.config | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config > index 1ea810e5be..a854747286 100644 > --- a/package/busybox/busybox.config > +++ b/package/busybox/busybox.config > @@ -970,7 +970,7 @@ CONFIG_UDHCP_DEBUG=0 > CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 > CONFIG_FEATURE_UDHCP_RFC3397=y > CONFIG_FEATURE_UDHCP_8021Q=y > -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n -O search" > +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R -n -O search" Using -b (background on lease fail) and -n (exit on lease fail) together doesn't make much sense, so I've dropped -n. We also have busybox-minimal.config, so I've added it there as well and applied, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 12:32:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 13:32:18 +0100 Subject: [Buildroot] [git commit] busybox: background udhcpc by default if no lease is obtained Message-ID: <20220108122611.743AD82AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f33654365ffa8fc1b3d8f9e5394a81abb776f66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The current behavior for busybox' udhcpc is to terminate if no lease is obtained at start up. Therefore no address is acquired if the link is established afterwards. By setting the -b flag udhcpc will background allowing the link to be established at any time. Signed-off-by: Lothar Felten [Peter: drop incompatible -n, also fixup busybox-minimal.config] Signed-off-by: Peter Korsgaard --- package/busybox/busybox-minimal.config | 2 +- package/busybox/busybox.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index a7aa19ea8a..65a347756d 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -961,7 +961,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" # # Print Utilities diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 1ea810e5be..3925521f28 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -970,7 +970,7 @@ CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n -O search" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R -O search" # # Print Utilities From romain.naour at smile.fr Sat Jan 8 12:49:22 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 13:49:22 +0100 Subject: [Buildroot] [PATCH] package/terminology: bump to version 1.12.1 Message-ID: <20220108124922.157020-1-romain.naour@smile.fr> See: https://www.enlightenment.org/news/2022-01-03-terminology-1.12.1 Signed-off-by: Romain Naour --- package/terminology/terminology.hash | 4 ++-- package/terminology/terminology.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index 7e9658482a..2ad10af76f 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum -sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.1.tar.xz.sha256sum +sha256 f8ced9584c2e9ae87452ce7425fd25b2d3e122c7489785d2917890215c6b5aa9 terminology-1.12.1.tar.xz sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index 787c9ad137..c3125c71ec 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.12.0 +TERMINOLOGY_VERSION = 1.12.1 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause -- 2.31.1 From arnout at mind.be Sat Jan 8 13:08:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 14:08:08 +0100 Subject: [Buildroot] [git commit] package/zabbix: new package Message-ID: <20220108130215.59E6982BC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42382a171277ead59e365f5920e757f01c04ac77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Agent is always enabled. Even though a server without agent is a valid use case, the agent doesn't take much space compared to the server so making it optional is not worth it. Optional dependencies (openssl, libcurl, ...) are set globally, even though they are supposedly only used for the server. However, this is not so obvious from configure.ac so it's easy to accidentally miss one. Setting them globally doesn't hurt. The proxy, agent2 and webservice features are left disabled. agent2 requires go. zabbix also has support for sqlite3 as database backend, but only for the proxy, not for the server. Signed-off-by: Alexey Lukyanchuk [Arnout: - BR2_TOOLCHAIN_USES_GLIBC implies the other glibc options. - Fix wrapping in Config.in help text. - Add upstream URL. - Protect comments with "depends on" instead of "if". - Select postgresl/mysql instead of depends (and propagate dependencies). - Remove redundant condition around BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS. - Select PHP extensions instead of depends. - Make optional dependencies automatic instead of Config.in. - Improve some of the help texts. - Bump to 5.4.9 and update hashes. - Add COPYING as license file. - Switch to actual upstream at zabbix.com. - Explicitly disable all unused features. - Disable zabbix user login with '*'. - Don't add user to zabbix group twice. - Do patch of zabbix_*.conf in post-patch hook and do it for all conf files in one shot. - Remove workarounds for pending patches (which were merged). - Put web ui in /var/www/zabbix and SQL files in /var/lib/zabbix. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 + package/Config.in | 1 + package/zabbix/Config.in | 82 +++++++++++++++++++++ package/zabbix/zabbix-agent.service | 17 +++++ package/zabbix/zabbix-server.service | 17 +++++ package/zabbix/zabbix.hash | 4 ++ package/zabbix/zabbix.mk | 133 +++++++++++++++++++++++++++++++++++ 7 files changed, 257 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 25b6a56dc0..f362df2637 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -110,6 +110,9 @@ N: Alexey Brodkin F: board/cubietech/cubieboard2/ F: configs/cubieboard2_defconfig +N: Alexey Lukyanchuk +F: package/zabbix/ + N: Alistair Francis F: board/sifive/ F: boot/opensbi/ diff --git a/package/Config.in b/package/Config.in index 5afd7131fe..0ff44dcd25 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2409,6 +2409,7 @@ endif source "package/xinetd/Config.in" source "package/xl2tp/Config.in" source "package/xtables-addons/Config.in" + source "package/zabbix/Config.in" source "package/znc/Config.in" endmenu diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in new file mode 100644 index 0000000000..f859471b1c --- /dev/null +++ b/package/zabbix/Config.in @@ -0,0 +1,82 @@ +config BR2_PACKAGE_ZABBIX + bool "zabbix" + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_PCRE + help + Zabbix is an enterprise-class open source distributed + monitoring solution.Zabbix is free of cost. Zabbix is written + and distributed under the GPL General Public License version + 2. + + https://zabbix.com + +comment "zabbix need glibc" + depends on !BR2_TOOLCHAIN_USES_GLIBC + +if BR2_PACKAGE_ZABBIX + +comment "zabbix server needs C++ and threads or wchar and dynamic libs" + depends on BR2_USE_MMU + depends on \ + !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) && \ + !(BR2_USE_WCHAR && !BR2_STATIC_LIBS) + +config BR2_PACKAGE_ZABBIX_SERVER + bool "zabbix server" + depends on BR2_USE_MMU # mysql, postgresql + depends on \ + (BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) || \ + (BR2_USE_WCHAR && !BR2_STATIC_LIBS) + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBEVENT + +if BR2_PACKAGE_ZABBIX_SERVER + +choice + prompt "server database backend" + +config BR2_PACKAGE_ZABBIX_SERVER_MYSQL + bool "mysql" + depends on BR2_INSTALL_LIBSTDCPP # mysql + depends on BR2_TOOLCHAIN_HAS_THREADS # mysql + select BR2_PACKAGE_MYSQL + +config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL + bool "postgresql" + depends on BR2_USE_WCHAR # postgresql + depends on !BR2_STATIC_LIBS # postgresql + select BR2_PACKAGE_POSTGRESQL + +endchoice + +config BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS + bool "install SQL dumps" + help + Copy initial database dumps to /var/lib/zabbix/schema + + These still need to be imported into the database by hand. + +config BR2_PACKAGE_ZABBIX_SERVER_COPY_FRONTEND + bool "install web UI to target" + depends on BR2_PACKAGE_PHP # runtime + select BR2_PACKAGE_PHP_EXT_MYSQLI if BR2_PACKAGE_ZABBIX_SERVER_MYSQL + select BR2_PACKAGE_PHP_EXT_PGSQL if BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL + select BR2_PACKAGE_PHP_EXT_BCMATH + select BR2_PACKAGE_PHP_EXT_SOCKETS + select BR2_PACKAGE_PHP_EXT_MBSTRING + select BR2_PACKAGE_PHP_EXT_GD + select BR2_PACKAGE_PHP_EXT_LIBXML2 + select BR2_PACKAGE_PHP_EXT_CTYPE + select BR2_PACKAGE_PHP_EXT_SESSION + select BR2_PACKAGE_PHP_EXT_XMLREADER + select BR2_PACKAGE_PHP_EXT_XMLWRITER + help + Copy web-UI to /var/www/zabbix. You need to set up a web + server to access it. + +comment "zabbix web UI requires PHP" + depends on !BR2_PACKAGE_PHP + +endif + +endif diff --git a/package/zabbix/zabbix-agent.service b/package/zabbix/zabbix-agent.service new file mode 100644 index 0000000000..8b4f45a4fc --- /dev/null +++ b/package/zabbix/zabbix-agent.service @@ -0,0 +1,17 @@ +[Unit] +Description=Zabbix Agent Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/zabbix_agentd +ExecReload=/usr/sbin/zabbix_agentd -R config_cache_reload +RuntimeDirectory=zabbix +PIDFile=/run/zabbix/zabbix_agentd.pid +User=zabbix +Group=zabbix +WatchdogSec=30s +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/package/zabbix/zabbix-server.service b/package/zabbix/zabbix-server.service new file mode 100644 index 0000000000..b8ba0d1707 --- /dev/null +++ b/package/zabbix/zabbix-server.service @@ -0,0 +1,17 @@ +[Unit] +Description=Zabbix Server Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/zabbix_server +ExecReload=/usr/sbin/zabbix_server -R config_cache_reload +RuntimeDirectory=zabbix +PIDFile=/run/zabbix/zabbix_server.pid +User=zabbix +Group=zabbix +WatchdogSec=30s +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash new file mode 100644 index 0000000000..42cc0bda57 --- /dev/null +++ b/package/zabbix/zabbix.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz +sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk new file mode 100644 index 0000000000..e72d831b46 --- /dev/null +++ b/package/zabbix/zabbix.mk @@ -0,0 +1,133 @@ +################################################################################ +# +# zabbix +# +################################################################################ + +ZABBIX_VERSION_MAJOR = 5.4 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) +ZABBIX_LICENSE = GPL-2.0+ +ZABBIX_LICENSE_FILES = README COPYING + +ZABBIX_DEPENDENCIES = pcre +ZABBIX_CONF_OPTS = \ + --with-libpcre=$(STAGING_DIR)/usr/bin/ \ + --without-sqlite3 \ + --enable-agent \ + --disable-agent2 \ + --disable-java \ + --disable-proxy \ + --disable-webservice + +define ZABBIX_USERS + zabbix -1 zabbix -1 * /var/lib/zabbix - - zabbix user +endef + +ZABBIX_SYSTEMD_UNITS += zabbix-agent.service + +define ZABBIX_CHANGE_PIDFILE_LOCATION + $(SED) 's%\#\ PidFile=/tmp/zabbix\(.*\).pid%PidFile=/run/zabbix/zabbix\1.pid%g' $(@D)/conf/zabbix_*.conf +endef +ZABBIX_POST_PATCH_HOOKS += ZABBIX_CHANGE_PIDFILE_LOCATION + +ifeq ($(BR2_PACKAGE_OPENIPMI),y) +ZABBIX_CONF_OPTS += --with-openipmi=$(STAGING_DIR)/usr +ZABBIX_DEPENDENCIES += openipmi +else +ZABBIX_CONF_OPTS += --without-openipmi +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +ZABBIX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config +ZABBIX_DEPENDENCIES += libcurl +else +ZABBIX_CONF_OPTS += --without-libcurl +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +ZABBIX_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr/bin/xml2-config +ZABBIX_DEPENDENCIES += libxml2 +else +ZABBIX_CONF_OPTS += --without-libxml2 +endif + +ifeq ($(BR2_PACKAGE_NETSNMP),y) +ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config +ZABBIX_DEPENDENCIES += netsnmp +else +ZABBIX_CONF_OPTS += --without-net-snmp +endif + +ifeq ($(BR2_PACKAGE_OPENLDAP),y) +ZABBIX_CONF_OPTS += --with-ldap=$(STAGING_DIR)/usr +ZABBIX_DEPENDENCIES += openldap +else +ZABBIX_CONF_OPTS += --without-ldap +endif + +ifeq ($(BR2_PACKAGE_LIBSSH2),y) +ZABBIX_CONF_OPTS += --with-ssh2=$(STAGING_DIR)/usr +ZABBIX_DEPENDENCIES += libssh2 +else +ZABBIX_CONF_OPTS += --without-ssh2 +endif + +# Only one of openssl or gnutls should be enabled +ifeq ($(BR2_PACKAGE_OPENSSL),y) +ZABBIX_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr --without-gnutls +ZABBIX_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +ZABBIX_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr --without-openssl +ZABBIX_DEPENDENCIES += gnutls +else +ZABBIX_CONF_OPTS += --without-gnutls --without-openssl +endif + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER),y) + +ZABBIX_DEPENDENCIES += libevent zlib +ZABBIX_CONF_OPTS += \ + --enable-server \ + --with-libevent=$(STAGING_DIR)/usr \ + --with-libpthread=$(STAGING_DIR)/usr \ + --with-zlib=$(STAGING_DIR)/usr +ZABBIX_SYSTEMD_UNITS += zabbix-server.service + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_FRONTEND),y) +define ZABBIX_SERVER_COPY_FRONTEND + mkdir -p $(TARGET_DIR)/var/www/zabbix/ + cp -dpfr $(@D)/ui/* $(TARGET_DIR)/var/www/zabbix/ +endef +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_FRONTEND +endif + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_MYSQL),y) +ZABBIX_DEPENDENCIES += mysql +ZABBIX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config --without-postgresql +ZABBIX_DATABASE = mysql +else ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL),y) +ZABBIX_DEPENDENCIES += postgresql +ZABBIX_CONF_OPTS += --with-postgresql=$(STAGING_DIR)/usr/bin/pg_config --without-mysql +ZABBIX_DATABASE = postgresql +endif + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS),y) +define ZABBIX_SERVER_COPY_DUMPS + mkdir -p $(TARGET_DIR)/var/lib/zabbix/schema/ + install -m 644 $(@D)/database/$(ZABBIX_DATABASE)/*.sql $(TARGET_DIR)/var/lib/zabbix/schema/ +endef +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_DUMPS +endif + +endif # BR2_PACKAGE_ZABBIX_SERVER + +define ZABBIX_INSTALL_INIT_SYSTEMD + $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ + $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants && \ + ln -fs -r $(TARGET_DIR)/usr/lib/systemd/system/$(unit) $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/$(unit) + ) +endef + +$(eval $(autotools-package)) From arnout at mind.be Sat Jan 8 13:09:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 14:09:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: new package In-Reply-To: <20200423071752.23893-1-skif@skif-web.ru> References: <20200423071752.23893-1-skif@skif-web.ru> Message-ID: <4e5386f0-4fda-d2ea-fcc8-12e05c509e64@mind.be> On 23/04/2020 09:17, Alexey Lukyanchuk wrote: > Signed-off-by: Alexey Lukyanchuk Applied to master, thanks. I made the following changes. - BR2_TOOLCHAIN_USES_GLIBC implies the other glibc options. - Fix wrapping in Config.in help text. - Add upstream URL. - Protect comments with "depends on" instead of "if". - Select postgresl/mysql instead of depends (and propagate dependencies). - Remove redundant condition around BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS. - Select PHP extensions instead of depends. - Make optional dependencies automatic instead of Config.in. - Improve some of the help texts. - Bump to 5.4.9 and update hashes. - Add COPYING as license file. - Switch to actual upstream at zabbix.com. - Explicitly disable all unused features. - Disable zabbix user login with '*'. - Don't add user to zabbix group twice. - Do patch of zabbix_*.conf in post-patch hook and do it for all conf files in one shot. - Remove workarounds for pending patches (which were merged). - Put web ui in /var/www/zabbix and SQL files in /var/lib/zabbix. Sorry it took so long, but it still took me three hours to make all of the above fixes and maintainer time is scarce. Regards, Arnout > --- > DEVELOPERS | 3 + > package/Config.in | 1 + > package/zabbix/Config.in | 122 +++++++++++++++++++++ > package/zabbix/zabbix-agent.service | 17 +++ > package/zabbix/zabbix-server.service | 17 +++ > package/zabbix/zabbix.hash | 3 + > package/zabbix/zabbix.mk | 154 +++++++++++++++++++++++++++ > 7 files changed, 317 insertions(+) > create mode 100644 package/zabbix/Config.in > create mode 100644 package/zabbix/zabbix-agent.service > create mode 100644 package/zabbix/zabbix-server.service > create mode 100644 package/zabbix/zabbix.hash > create mode 100644 package/zabbix/zabbix.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index c57bc1c5c9..08a9aadf72 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -155,6 +155,9 @@ N: Alexey Brodkin > F: board/cubietech/cubieboard2/ > F: configs/cubieboard2_defconfig > > +N: Alexey Lukyanchuk > +F: package/zabbix/ > + > N: Alistair Francis > F: board/sifive/ > F: boot/opensbi/ > diff --git a/package/Config.in b/package/Config.in > index a9c6f6fcbc..aa244812db 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2234,6 +2234,7 @@ endif > source "package/xinetd/Config.in" > source "package/xl2tp/Config.in" > source "package/xtables-addons/Config.in" > + source "package/zabbix/Config.in" > source "package/znc/Config.in" > > endmenu > diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in > new file mode 100644 > index 0000000000..0ce60a37e5 > --- /dev/null > +++ b/package/zabbix/Config.in > @@ -0,0 +1,122 @@ > +config BR2_PACKAGE_ZABBIX > + bool "zabbix" > + depends on BR2_TOOLCHAIN_USES_GLIBC=y || BR2_TOOLCHAIN_EXTERNAL_GLIBC=y || BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y > + select BR2_PACKAGE_PCRE > + help > + Zabbix is an enterprise-class open source distributed > + monitoring solution.Zabbix is free of cost. Zabbix > + is written and distributed under the GPL General Public > + License version 2. > + > +if (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_EXTERNAL_GLIBC && !BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC) > +comment "zabbix need glibc" > +endif > + > +if BR2_PACKAGE_ZABBIX > + > +if (!BR2_PACKAGE_POSTGRESQL && !BR2_PACKAGE_MYSQL) > +comment "zabbix server needs postgresql or mysql support" > +endif > + > +config BR2_PACKAGE_ZABBIX_SERVER > + bool "zabbix server" > + depends on BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_MYSQL > + select BR2_PACKAGE_ZLIB > + select BR2_PACKAGE_LIBEVENT > + > +if BR2_PACKAGE_ZABBIX_SERVER > + > +choice > + prompt "server database backend" > + > +config BR2_PACKAGE_ZABBIX_SERVER_MYSQL > + bool "mysql" > + depends on BR2_PACKAGE_MYSQL > + > +config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL > + bool "postgresql" > + depends on BR2_PACKAGE_POSTGRESQL > + > +endchoice > + > +if BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL || BR2_PACKAGE_ZABBIX_SERVER_MYSQL > +config BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS > + bool "install sql dumps" > + help > + Copy inicitial database dumps to /usr/zabbix/ > +endif > + > +if (!BR2_PACKAGE_PHP || (!BR2_PACKAGE_PHP_EXT_MYSQLI && !BR2_PACKAGE_PHP_EXT_PGSQL) || \ > + !BR2_PACKAGE_PHP_EXT_MBSTRING || !BR2_PACKAGE_PHP_EXT_BCMATH || \ > + !BR2_PACKAGE_PHP_EXT_SOCKETS || !BR2_PACKAGE_PHP_EXT_GD || \ > + !BR2_PACKAGE_PHP_EXT_LIBXML2 || !BR2_PACKAGE_PHP_EXT_CTYPE || \ > + !BR2_PACKAGE_PHP_EXT_SESSION || !BR2_PACKAGE_PHP_EXT_XMLREADER || \ > + !BR2_PACKAGE_PHP_EXT_XMLWRITER ) > +comment "zabbix-frontend need php with extensions(bc, sockets, " > +comment "mbstring, gd, libxml2, ctype, session, xmlreader, xmlwriter, mysql or postgresql" > +endif > + > +choice > + prompt "server ssl/tls backend" > + > +config BR2_PACKAGE_ZABBIX_SERVER_NOTLS > + bool "none" > + > +config BR2_PACKAGE_ZABBIX_SERVER_OPENSSL > + bool "openssl" > + depends on BR2_PACKAGE_OPENSSL > + > +config BR2_PACKAGE_ZABBIX_SERVER_GNUTLS > + bool "gnutls" > + depends on BR2_PACKAGE_GNUTLS > + > +endchoice > + > +config BR2_PACKAGE_ZABBIX_SERVER_OPENIPMI > + bool "openipmi support" > + select BR2_PACKAGE_OPENIPMI > + > +config BR2_PACKAGE_ZABBIX_SERVER_LIBSSH2 > + bool "libssh2 support" > + select BR2_PACKAGE_LIBSSH2 > + > +config BR2_PACKAGE_ZABBIX_SERVER_LDAP > + bool "openldap support" > + select BR2_PACKAGE_OPENLDAP > + > +if (!BR2_USE_MMU) > +comment "netsnmp support need MMU" > +endif > + > +config BR2_PACKAGE_ZABBIX_SERVER_NETSNMP > + bool "net-snmp support" > + depends on BR2_USE_MMU # netsnmp > + select BR2_PACKAGE_NETSNMP > + > +config BR2_PACKAGE_ZABBIX_SERVER_LIBCURL > + bool "libcurl support" > + select BR2_PACKAGE_LIBCURL > + > +config BR2_PACKAGE_ZABBIX_SERVER_LIBXML2 > + bool "libxml2 support" > + select BR2_PACKAGE_LIBXML2 > + > +config BR2_PACKAGE_ZABBIX_SERVER_COPY_FRONTEND > + bool "copy php-frontend to target" > + depends on BR2_PACKAGE_PHP > + depends on BR2_PACKAGE_PHP_EXT_MYSQLI || BR2_PACKAGE_PHP_EXT_PGSQL > + depends on BR2_PACKAGE_PHP_EXT_BCMATH > + depends on BR2_PACKAGE_PHP_EXT_SOCKETS > + depends on BR2_PACKAGE_PHP_EXT_MBSTRING > + depends on BR2_PACKAGE_PHP_EXT_GD > + depends on BR2_PACKAGE_PHP_EXT_LIBXML2 > + depends on BR2_PACKAGE_PHP_EXT_CTYPE > + depends on BR2_PACKAGE_PHP_EXT_SESSION > + depends on BR2_PACKAGE_PHP_EXT_XMLREADER > + depends on BR2_PACKAGE_PHP_EXT_XMLWRITER > + help > + copy web-frontend to /usr/zabbix/php-frontend > + > +endif > + > +endif > diff --git a/package/zabbix/zabbix-agent.service b/package/zabbix/zabbix-agent.service > new file mode 100644 > index 0000000000..8b4f45a4fc > --- /dev/null > +++ b/package/zabbix/zabbix-agent.service > @@ -0,0 +1,17 @@ > +[Unit] > +Description=Zabbix Agent Daemon > +After=network.target > + > +[Service] > +Type=forking > +ExecStart=/usr/sbin/zabbix_agentd > +ExecReload=/usr/sbin/zabbix_agentd -R config_cache_reload > +RuntimeDirectory=zabbix > +PIDFile=/run/zabbix/zabbix_agentd.pid > +User=zabbix > +Group=zabbix > +WatchdogSec=30s > +Restart=on-failure > + > +[Install] > +WantedBy=multi-user.target > diff --git a/package/zabbix/zabbix-server.service b/package/zabbix/zabbix-server.service > new file mode 100644 > index 0000000000..b8ba0d1707 > --- /dev/null > +++ b/package/zabbix/zabbix-server.service > @@ -0,0 +1,17 @@ > +[Unit] > +Description=Zabbix Server Daemon > +After=network.target > + > +[Service] > +Type=forking > +ExecStart=/usr/sbin/zabbix_server > +ExecReload=/usr/sbin/zabbix_server -R config_cache_reload > +RuntimeDirectory=zabbix > +PIDFile=/run/zabbix/zabbix_server.pid > +User=zabbix > +Group=zabbix > +WatchdogSec=30s > +Restart=on-failure > + > +[Install] > +WantedBy=multi-user.target > diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash > new file mode 100644 > index 0000000000..5c4207f168 > --- /dev/null > +++ b/package/zabbix/zabbix.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 22bb28e667424ad4688f47732853f4241df0e78a7607727b043d704ba726ae0e zabbix-4.4.6.tar.gz > +sha256 a823e00bc7f0844874f90fee97136f178e7debc76bace5f09e15ee8ed55f04c3 README > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > new file mode 100644 > index 0000000000..a75914a816 > --- /dev/null > +++ b/package/zabbix/zabbix.mk > @@ -0,0 +1,154 @@ > +################################################################################ > +# > +# zabbix > +# > +################################################################################ > + > +ZABBIX_VERSION = 4.4.6 > +ZABBIX_SITE = https://sourceforge.net/projects/zabbix/files > +ZABBIX_LICENSE = GPL-2.0 > +ZABBIX_LICENSE_FILES = README > + > +ZABBIX_DEPENDENCIES = pcre > +ZABBIX_CONF_OPTS = --with-libpcre=$(STAGING_DIR)/usr/bin/ \ > + --enable-agent > + > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_CLIENT_CHANGE_PIDFILE_LOCATION > +ZABBIX_SYSTEMD_UNITS += zabbix-agent.service > + > +define ZABBIX_INSTALL_INIT_SYSTEMD > + $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ > + $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ > + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants && \ > + ln -fs -r $(TARGET_DIR)/usr/lib/systemd/system/$(unit) $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/$(unit) > + ) > +endef > + > +define ZABBIX_USERS > + zabbix -1 zabbix -1 !- /var/lib/zabbix - zabbix zabbix user > +endef > + > +define ZABBIX_CLIENT_CHANGE_PIDFILE_LOCATION > + $(SED) 's%\#\ PidFile=/tmp/zabbix_agentd.pid%PidFile=/run/zabbix/zabbix_agentd.pid%g' $(TARGET_DIR)/etc/zabbix_agentd.conf > +endef > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER),y) > +ZABBIX_SYSTEMD_UNITS += zabbix-server.service > +ZABBIX_CONF_OPTS += --enable-server \ > + --with-libevent \ > + --with-libpthread=$(STAGING_DIR)/usr \ > + --with-zlib=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += libevent zlib > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_CHANGE_PIDFILE_LOCATION > + > +# Need openipmi in staging dir. Patch submitted at 2019.12.16 > +# Before this patch enabled, use this crutch > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_OPENIPMI),y) > +ZABBIX_CONF_OPTS += --with-openipmi=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += openipmi > +ZABBIX_PRE_CONFIGURE_HOOKS += BR2_PACKAGE_ZABBIX_SERVER_OPENIPMI_FIX_LIBS > + > +define BR2_PACKAGE_ZABBIX_SERVER_OPENIPMI_FIX_LIBS > + if [ ! -f $(STAGING_DIR)/usr/lib/libOpenIPMI.so ]; then \ > + cp -rf $(TARGET_DIR)/usr/lib/libOpenIPMI* $(STAGING_DIR)/usr/lib/ ;\ > + cp -rf $(TARGET_DIR)/usr/include/OpenIPMI $(STAGING_DIR)/usr/include/ ;\ > + fi > +endef > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_LIBCURL),y) > +ZABBIX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config > +ZABBIX_DEPENDENCIES += libcurl > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_LIBXML2),y) > +ZABBIX_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr/bin/xml2-config > +ZABBIX_DEPENDENCIES += libxml2 > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_NETSNMP),y) > +ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config > +ZABBIX_DEPENDENCIES += netsnmp > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_LDAP),y) > +ZABBIX_CONF_OPTS += --with-ldap=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += openldap > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_LIBSSH2),y) > +ZABBIX_CONF_OPTS += --with-ssh2=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += libssh2 > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_OPENSSL),y) > +ZABBIX_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += openssl > +else ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_GNUTLS),y) > +ZABBIX_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += gnutls > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_FRONTEND),y) > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_FRONTEND > + > +define ZABBIX_SERVER_COPY_FRONTEND > + mkdir -p $(TARGET_DIR)/usr/zabbix/php-frontend/ > + cp -r $(@D)/frontends/php/* $(TARGET_DIR)/usr/zabbix/php-frontend/ > +endef > + > +endif > + > +define ZABBIX_SERVER_CHANGE_PIDFILE_LOCATION > + $(SED) 's%\#\ PidFile=/tmp/zabbix_server.pid%PidFile=/run/zabbix/zabbix_server.pid%g' $(TARGET_DIR)/etc/zabbix_server.conf > +endef > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_MYSQL),y) > +ZABBIX_DEPENDENCIES += mysql > +ZABBIX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config > +# Need package/mariadb/0003-add-sysroot-path-to-mariadb_config.patch by Ryan Coe > +# While this patch not included, use this crutch > +ZABBIX_PRE_CONFIGURE_HOOKS += ZABBIX_DISABLE_MARIADB_CONFIG > +ZABBIX_POST_CONFIGURE_HOOKS += ZABBIX_ENABLE_MARIADB_CONFIG > + > +define ZABBIX_DISABLE_MARIADB_CONFIG > + if [ -f "$(STAGING_DIR)/usr/bin/mariadb_config" ]; then \ > + mv $(STAGING_DIR)/usr/bin/mariadb_config $(STAGING_DIR)/usr/bin/mariadb_config_save; \ > + fi > +endef > + > +define ZABBIX_ENABLE_MARIADB_CONFIG > + if [ -f "$(STAGING_DIR)/usr/bin/mariadb_confi_save" ]; then \ > + mv $(STAGING_DIR)/usr/bin/mariadb_config_save $(STAGING_DIR)/usr/bin/mariadb_config; \ > + fi > +endef > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS),y) > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_PREPARE_MYSQL > +endif > + > +define ZABBIX_SERVER_PREPARE_MYSQL > + mkdir -p $(TARGET_DIR)/usr/zabbix/mysql_schema/ > + cp -r $(@D) $(@D)/database/mysql/*\.sql $(TARGET_DIR)/usr/zabbix/mysql_schema/ > +endef > + > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL),y) > +ZABBIX_DEPENDENCIES += postgresql > +ZABBIX_CONF_OPTS += --with-postgresql=$(STAGING_DIR)/usr/bin/pg_config > + > +define ZABBIX_SERVER_PREPARE_POSTGRESQL > + mkdir -p $(TARGET_DIR)/usr/zabbix/postgresql_schema > + cp -r $(@D)/database/postgresql/*\.sql $(TARGET_DIR)/usr/zabbix/postgresql_schema/ > +endef > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS),y) > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_PREPARE_POSTGRESQL > +endif > + > +endif > + > +endif > + > +$(eval $(autotools-package)) > From peter at korsgaard.com Sat Jan 8 13:12:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 14:12:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: add options to enable features In-Reply-To: <20200515140209.1355747-1-erwan.gautron@bertin.fr> References: <20200515140209.1355747-1-erwan.gautron@bertin.fr> Message-ID: On Fri, May 15, 2020 at 4:02 PM Erwan GAUTRON wrote: Hi, Sorry for the slow response! > GnuTls implements old, unsafe or unused protocols and cyphers > Secure embedded systems shall disable them in order to be certified. > This patch allows to select/unselect SSLv2 protocol and gost cypher > To ensure backward compatibility, all items are selected by default > > Signed-off-by: Erwan GAUTRON > --- > package/gnutls/Config.in | 12 ++++++++++++ > package/gnutls/gnutls.mk | 4 +++- > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in > index 15b930b6bd..56ea558969 100644 > --- a/package/gnutls/Config.in > +++ b/package/gnutls/Config.in > @@ -29,6 +29,18 @@ config BR2_PACKAGE_GNUTLS_TOOLS > Install GnuTLS command line tools for various cryptographic > tasks. > > +config BR2_PACKAGE_GNUTLS_ENABLE_SSL2 > + bool "enable SSLv2" > + default y These features should only be needed in very special situations, so I've dropped the default y. > + help > + Enable SSLv2 protocol. > + > +config BR2_PACKAGE_GNUTLS_ENABLE_GOST > + bool "enable GOST" > + default y > + help > + Enable GOST cypher. Elsewhere we use the cipher spelling, so I've changed that. > +++ b/package/gnutls/gnutls.mk > @@ -36,7 +36,9 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ > GNUTLS_INSTALL_STAGING = YES > > # libpthread autodetection poison the linkpath > -GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) > +GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) \ > + $(if $(BR2_PACKAGE_GNUTLS_ENABLE_SSL2),,--disable-ssl2-support) \ > + $(if $(BR2_PACKAGE_GNUTLS_ENABLE_GOST),,--disable-gost) It makes more sense to have this in the "main" _CONF_OPTS handling just after the _GNUTLS_TOOLS logic, so I've moved it there. I have also added explicit --enable logic like we have for the other options. Committed with these fixes, thanks. -- Bye, Peter Korsgaard From festevam at gmail.com Sat Jan 8 13:14:09 2022 From: festevam at gmail.com (Fabio Estevam) Date: Sat, 8 Jan 2022 10:14:09 -0300 Subject: [Buildroot] [PATCH] configs/imx6slevk: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220108131409.990135-1-festevam@gmail.com> Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650628 Signed-off-by: Fabio Estevam --- configs/imx6slevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6slevk_defconfig b/configs/imx6slevk_defconfig index 6f0bae5aa94d..9448267e2b28 100644 --- a/configs/imx6slevk_defconfig +++ b/configs/imx6slevk_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6slevk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -- 2.25.1 From peter at korsgaard.com Sat Jan 8 13:14:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 14:14:23 +0100 Subject: [Buildroot] [git commit] package/gnutls: add options to enable/disable legacy features Message-ID: <20220108131019.F06F082B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c91359697ee19639ea1025940821b0e332e02174 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master GnuTls implements old, unsafe or unused protocols and cyphers Secure embedded systems shall disable them in order to be certified. This patch allows to select/deselect SSLv2 protocol and gost cipher. Signed-off-by: Erwan GAUTRON [Peter: default options to 'n', move next to _GNUTLS_TOOLS, explicit --enable] Signed-off-by: Peter Korsgaard --- package/gnutls/Config.in | 10 ++++++++++ package/gnutls/gnutls.mk | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index cd83b375aa..d57bb8d135 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -27,6 +27,16 @@ config BR2_PACKAGE_GNUTLS_TOOLS Install GnuTLS command line tools for various cryptographic tasks. +config BR2_PACKAGE_GNUTLS_ENABLE_SSL2 + bool "enable SSLv2" + help + Enable SSLv2 protocol. + +config BR2_PACKAGE_GNUTLS_ENABLE_GOST + bool "enable GOST" + help + Enable GOST cipher. + endif comment "gnutls needs a toolchain w/ wchar, dynamic library" diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 11c2d81e7d..dbf7593854 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -29,7 +29,9 @@ GNUTLS_CONF_OPTS = \ --with-librt-prefix=$(STAGING_DIR) \ --without-tpm \ $(if $(BR2_PACKAGE_GNUTLS_OPENSSL),--enable,--disable)-openssl-compatibility \ - $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) + $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) \ + $(if $(BR2_PACKAGE_GNUTLS_ENABLE_SSL2),--enable,--disable)-ssl2-support \ + $(if $(BR2_PACKAGE_GNUTLS_ENABLE_GOST),--enable,--disable)-gost GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \ From peter at korsgaard.com Sat Jan 8 13:19:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 14:19:21 +0100 Subject: [Buildroot] [git commit] package/zabbix: Fix white space in help text Message-ID: <20220108131356.4A0ED82897@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ced407bde0e45c34f3e464e73642f09a21d79abd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- package/zabbix/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index f859471b1c..6f8a952936 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -4,9 +4,9 @@ config BR2_PACKAGE_ZABBIX select BR2_PACKAGE_PCRE help Zabbix is an enterprise-class open source distributed - monitoring solution.Zabbix is free of cost. Zabbix is written - and distributed under the GPL General Public License version - 2. + monitoring solution. Zabbix is free of cost. Zabbix is + written and distributed under the GPL General Public License + version 2. https://zabbix.com From arnout at mind.be Sat Jan 8 13:27:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 14:27:14 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> Message-ID: <74102482-7c2d-b08b-f97e-80cc54f03722@mind.be> On 07/01/2022 22:35, Julien Olivain wrote: > For the next 2022 edition of the HoverGames challenge, I would like > to switch to ROS2 in Buildroot.? I'm currently exploring ways to > regenerate ROS2 buildroot recipes automatically, using the ROS > infrastructure packages.? I believe this is the way the Gentoo and > Yocto/OpenEmbedded recipes are currently generated. > > See: > https://github.com/ros-infrastructure/superflore > https://github.com/ros-infrastructure/superflore/tree/master/superflore/generators > > My current idea would be to: > - Add in Buildroot the minimum changes, if needed > ? (minimal infra things like pkg-catkin, other non-ROS package dependencies) > - Propose a "buildroot" generator in superflore upstream that create > ? an maintain some of the ROS2 recipes. We generally prefer to keep everything upstream in Buildroot, because it simplifies making changes to infrastructure (that may also affect packages). We do keep generators in Buildroot as well: utils/scancpan, utils/scanpypi. So the generator could be added there. Alternatively, you could add a section in the Buildroot manual about how to install superflore and run it to add a Buildroot package. Regards, Arnout From arnout at mind.be Sat Jan 8 13:28:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 14:28:58 +0100 Subject: [Buildroot] [PATCH 1/3] package/refpolicy: Add patches pending the next release In-Reply-To: <20220107223624.3ba7d348@windsurf> References: <20210107135307.1762186-1-maxime.chevallier@bootlin.com> <20210107135307.1762186-2-maxime.chevallier@bootlin.com> <20220107223624.3ba7d348@windsurf> Message-ID: <44537b02-fabc-6533-bb37-d20268ff508f@mind.be> On 07/01/2022 22:36, Thomas Petazzoni wrote: > Maxime: do you have that patch 8 broken down into smaller pieces with > reasonable explanation about each piece? Just to be clear: "reasonable explanation" means: - indicate what the problem is; - why this is different for Buildroot than for others (i.e. why it is a problem to begin with); - possible solutions; - why this specific solution was chosen (which can very well be: the others are too complicated). Regards, Arnout From thomas.petazzoni at bootlin.com Sat Jan 8 13:29:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 14:29:27 +0100 Subject: [Buildroot] [git commit] package/libest: new package Message-ID: <20220108132323.E437F82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f0e1e58168dfa9194db2e073efd20a98c15728 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libest is a C implementation of RFC 7030 (Enrollment over Secure Transport). It can be used to provision public key certificates from a certificate authority (CA) or registration authority (RA) to end-user devices and network infrastructure devices. https://github.com/cisco/libest Notes on patches included in this package: - libest bundles a stubbed version of libsafec, and has no provision to build against a system-installed full (non-stubbed) libsafec. We add a patch to make that possible. - Added a configuration option --{enable,disable}-examples to toggle examples build by a separate patch. - There's a configuration option `--enable-jni` which allows to build a JNI library for binding libest to Java programs. And that library would be using an outdated version of OpenSSL 1.0. We fix that by adding support for OpenSSL 1.1 API for that library. - Fixed a bug when specifying either `--enable-FEATURE` or `--disable-FEATURE` has always been enabling the feature. Signed-off-by: Aleksandr Makarov [Thomas: - Added comments about the upstream status in existing patches - Added a patch fixing an autoreconf issue - Added a patch adding a missing "extern" on a variable to fix build with gcc 10 - Removed the glibc dependency by using the new libexecinfo package - Drastically simplified the complex libcoap disabling and client-only mode vs. OpenJDK issue. libcoap support is now forcefully disabled, and client-mode only option is made invisible when OpenJDK is enabled. - Fixed the license information; - Added missing host-pkgconf ] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 + package/Config.in | 1 + ...-jni-client.c-add-support-for-OpenSSL-1.1.patch | 112 ++++++++++++++ ...disable-examples-flag-to-toggle-examples-.patch | 90 +++++++++++ ...stem-libsafec-flag-to-link-against-system.patch | 109 ++++++++++++++ ...e.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch | 164 +++++++++++++++++++++ ...c-remove-duplicate-invocation-of-AM_INIT_.patch | 36 +++++ ..._locl.h-add-missing-extern-on-e_ctx_ssl_e.patch | 42 ++++++ package/libest/Config.in | 26 ++++ package/libest/libest.hash | 3 + package/libest/libest.mk | 71 +++++++++ package/libest/libest.pc | 10 ++ 12 files changed, 667 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f362df2637..73664feb48 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -90,6 +90,9 @@ F: package/minimodem/ N: Alexander Lukichev F: package/openpgm/ +N: Aleksandr Makarov +F: package/libest/ + N: Alexander Mukhin F: package/tinyproxy/ diff --git a/package/Config.in b/package/Config.in index 0ff44dcd25..a555e6fd78 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1802,6 +1802,7 @@ menu "Networking" source "package/libcurl/Config.in" source "package/libdnet/Config.in" source "package/libeXosip2/Config.in" + source "package/libest/Config.in" source "package/libfcgi/Config.in" source "package/libgsasl/Config.in" source "package/libhtp/Config.in" diff --git a/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch b/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch new file mode 100644 index 0000000000..3c0d890d3f --- /dev/null +++ b/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch @@ -0,0 +1,112 @@ +From 8f152a6e47484056968973a71a16e4f2142213a9 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Mon, 13 Jul 2020 23:05:26 +0000 +Subject: [PATCH] java/jni/client.c: add support for OpenSSL 1.1 + +This shall allow the java/jni to build with and link against OpenSSL 1.1. + +Additionally, the configuration program will not attempt to process the +java/jni/ subdirectory if no --enable-jni has been specified. + +Upstream: https://github.com/cisco/libest/pull/81/. It was merged +upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this +commit mixes multiple patches in one. + +Signed-off-by: Aleksandr Makarov +--- + Makefile.am | 8 ++++++-- + configure.ac | 10 ++++++---- + java/jni/client.c | 21 ++++++++++++++++----- + 3 files changed, 28 insertions(+), 11 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 10e38fd..9601de6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,9 +1,13 @@ + ACLOCAL_AMFLAGS = -I m4 + ++if ENABLE_JNI ++libest_jni = java/jni ++endif ++ + if ENABLE_CLIENT_ONLY +-SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/client-brski ++SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/client-brski + else +-SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/server example/proxy example/client-brski ++SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/server example/proxy example/client-brski + endif + + EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle +diff --git a/configure.ac b/configure.ac +index e02a54d..d648030 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -35,9 +35,9 @@ AM_COND_IF([FREEBSD], AC_MSG_RESULT([Skipping libdl check]), + AC_ARG_ENABLE([jni], + [AS_HELP_STRING([--enable-jni], + [Enable support for JNI library])], +- [jni_on=1], +- [jni_on=0]) +-AM_CONDITIONAL([ENABLE_JNI], [test x$jni_on = x1]) ++ [], ++ [enable_jni="no"]) ++AM_CONDITIONAL([ENABLE_JNI], [test "$enable_jni" = "yes"]) + AM_COND_IF([ENABLE_JNI], + AC_MSG_RESULT([JNI support enabled]) + AC_DEFINE([ENABLE_JNI]), +@@ -198,5 +198,7 @@ AC_PREFIX_DEFAULT([/usr/local/est]) + + cp confdefs.h est_config.h + +-AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile java/jni/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) ++AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) ++AM_COND_IF([ENABLE_JNI], ++ [AC_CONFIG_FILES([java/jni/Makefile])]) + AC_OUTPUT +diff --git a/java/jni/client.c b/java/jni/client.c +index 9a8a34e..f7aeefc 100644 +--- a/java/jni/client.c ++++ b/java/jni/client.c +@@ -130,11 +130,18 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ + { + int rv; + EVP_PKEY_CTX *pkctx = NULL; +- EVP_MD_CTX mctx; ++ EVP_MD_CTX *mctx; + +- EVP_MD_CTX_init(&mctx); ++#ifdef HAVE_OLD_OPENSSL ++ EVP_MD_CTX md_ctx; ++ mctx = &md_ctx; + +- if (!EVP_DigestSignInit(&mctx, &pkctx, md, NULL, pkey)) { ++ EVP_MD_CTX_init(mctx); ++#else ++ mctx = EVP_MD_CTX_new(); ++#endif ++ ++ if (!EVP_DigestSignInit(mctx, &pkctx, md, NULL, pkey)) { + return 0; + } + +@@ -150,9 +157,13 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ + x->req_info->enc.modified = 1; + #endif + +- rv = X509_REQ_sign_ctx(x, &mctx); ++ rv = X509_REQ_sign_ctx(x, mctx); + +- EVP_MD_CTX_cleanup(&mctx); ++#ifdef HAVE_OLD_OPENSSL ++ EVP_MD_CTX_cleanup(mctx); ++#else ++ EVP_MD_CTX_free(mctx); ++#endif + + return (rv); + } +-- +2.17.1 + diff --git a/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch b/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch new file mode 100644 index 0000000000..9b35e8831d --- /dev/null +++ b/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch @@ -0,0 +1,90 @@ +From 4bd41ea12924161baca48add39ba5ecfab2cae30 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Mon, 13 Jul 2020 23:42:42 +0000 +Subject: [PATCH] Add --{enable,disable}-examples flag to toggle examples + compilation + +Upstream: https://github.com/cisco/libest/pull/81/. It was merged +upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this +commit mixes multiple patches in one. + +Signed-off-by: Aleksandr Makarov +--- + Makefile.am | 11 +++++++---- + configure.ac | 24 ++++++++++++++++++------ + 2 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 9601de6..e2561e7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,10 +4,13 @@ if ENABLE_JNI + libest_jni = java/jni + endif + +-if ENABLE_CLIENT_ONLY +-SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/client-brski +-else +-SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/server example/proxy example/client-brski ++if ENABLE_EXAMPLES ++if ENABLE_CLIENT_ONLY ++examples = example/client example/client-simple example/client-brski ++else ++examples = example/client example/client-simple example/client-brski example/server example/proxy ++endif + endif + ++SUBDIRS = safe_c_stub src $(libest_jni) $(examples) + EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle +diff --git a/configure.ac b/configure.ac +index d648030..95b3223 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,11 +2,6 @@ dnl Process this file with autoconf to produce a configure script. + AC_INIT([libest],[3.2.0p],[libest-dev]) + AC_CONFIG_AUX_DIR(config) + AC_CONFIG_SRCDIR(src/est/est.c) +-AC_CONFIG_SRCDIR(example/client/estclient.c) +-AC_CONFIG_SRCDIR(example/client-simple/estclient-simple.c) +-AC_CONFIG_SRCDIR(example/client-brski/estclient-brski.c) +-AC_CONFIG_SRCDIR(example/server/estserver.c) +-AC_CONFIG_SRCDIR(example/proxy/estproxy.c) + AC_CONFIG_MACRO_DIR([m4]) + + AM_INIT_AUTOMAKE +@@ -80,6 +75,15 @@ AM_COND_IF([DISABLE_PTHREAD], [], + [AC_CHECK_LIB([pthread], [pthread_create], [], + [AC_MSG_FAILURE([can't find pthread lib])])]) + ++AC_ARG_ENABLE([examples], ++ [AS_HELP_STRING([--disable-examples], ++ [Disable examples compilation])], ++ [], ++ [enable_examples="yes"]) ++AC_MSG_CHECKING(whether to build examples) ++AM_CONDITIONAL([ENABLE_EXAMPLES], [test "$enable_examples" = "yes"]) ++AM_COND_IF([ENABLE_EXAMPLES], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) ++ + AC_ARG_WITH([ssl-dir], + [AS_HELP_STRING([--with-ssl-dir], + [location of OpenSSL install folder, defaults to /usr/local/ssl])], +@@ -198,7 +202,15 @@ AC_PREFIX_DEFAULT([/usr/local/est]) + + cp confdefs.h est_config.h + +-AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) ++AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile]) + AM_COND_IF([ENABLE_JNI], + [AC_CONFIG_FILES([java/jni/Makefile])]) ++AM_COND_IF([ENABLE_EXAMPLES], ++[ ++ AC_CONFIG_FILES([example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile]) ++ AM_COND_IF([ENABLE_CLIENT_ONLY], ++ [], ++ [AC_CONFIG_FILES([example/server/Makefile example/proxy/Makefile])]) ++]) ++ + AC_OUTPUT +-- +2.17.1 + diff --git a/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch b/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch new file mode 100644 index 0000000000..66574cd937 --- /dev/null +++ b/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch @@ -0,0 +1,109 @@ +From 017155b98ff3722816a52953b1079c9c8704d2ff Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Tue, 14 Jul 2020 10:03:14 +0000 +Subject: [PATCH] Add --with-system-libsafec flag to link against system + libsafec + +Specifying the --with-system-libsafec flag shall allow the configuration +program to search for and, if found, to link against the libsafec library +that is installed in the system. + +Upstream: https://github.com/cisco/libest/pull/81/. It was merged +upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this +commit mixes multiple patches in one. + +Signed-off-by: Aleksandr Makarov +--- + Makefile.am | 6 +++++- + configure.ac | 41 +++++++++++++++++++++++++++++++---------- + 2 files changed, 36 insertions(+), 11 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e2561e7..d53b0d5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,5 +12,9 @@ examples = example/client example/client-simple example/client-brski example/ser + endif + endif + +-SUBDIRS = safe_c_stub src $(libest_jni) $(examples) ++if ! WITH_SYSTEM_LIBSAFEC ++builtin_libsafec = safe_c_stub ++endif ++ ++SUBDIRS = $(builtin_libsafec) src $(libest_jni) $(examples) + EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle +diff --git a/configure.ac b/configure.ac +index 95b3223..048aa3c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10,6 +10,7 @@ AM_INIT_AUTOMAKE([subdir-objects]) + + AC_PROG_CC + AM_PROG_CC_C_O ++PKG_PROG_PKG_CONFIG + LT_INIT + AC_CANONICAL_HOST + case $host in +@@ -187,22 +188,39 @@ AC_ARG_WITH([libcoap-dir], + ] + ) + +-SAFEC_STUB_DIR='$(abs_top_builddir)/safe_c_stub' +-AC_SUBST(SAFEC_STUB_DIR) +-safecdir="$SAFEC_STUB_DIR" +-AC_SUBST([SAFEC_DIR], "$safecdir") +-AC_SUBST([SAFEC_CFLAGS], "$safecdir/include") +-AC_SUBST([SAFEC_LDFLAGS], "$safecdir/lib") ++AC_ARG_WITH(system-libsafec, ++ AS_HELP_STRING([--with-system-libsafec], ++ [select to use libsafec installed in the system]), ++ [], ++ [with_system_libsafec="no"]) + +-CFLAGS="$CFLAGS -Wall -I$safecdir/include" +-LDFLAGS="$LDFLAGS -L$safecdir/lib" +-LIBS="$LIBS -lsafe_lib" ++AC_MSG_CHECKING(which libsafec to use) ++AM_CONDITIONAL([WITH_SYSTEM_LIBSAFEC], [test "$with_system_libsafec" = "yes"]) ++AM_COND_IF([WITH_SYSTEM_LIBSAFEC], AC_MSG_RESULT([system]), AC_MSG_RESULT([built-in])) ++AM_COND_IF([WITH_SYSTEM_LIBSAFEC], ++[ ++ PKG_CHECK_MODULES([libsafec], [libsafec]) ++ LIBS="$LIBS $libsafec_LIBS" ++ CFLAGS="$CFLAGS $libsafec_CFLAGS" ++ CPPFLAGS="$CPPFLAGS $libsafec_CFLAGS" ++],[ ++ SAFEC_STUB_DIR='$(abs_top_builddir)/safe_c_stub' ++ AC_SUBST(SAFEC_STUB_DIR) ++ safecdir="$SAFEC_STUB_DIR" ++ AC_SUBST([SAFEC_DIR], "$safecdir") ++ AC_SUBST([SAFEC_CFLAGS], "$safecdir/include") ++ AC_SUBST([SAFEC_LDFLAGS], "$safecdir/lib") ++ ++ CFLAGS="$CFLAGS -Wall -I$safecdir/include" ++ LDFLAGS="$LDFLAGS -L$safecdir/lib" ++ LIBS="$LIBS -lsafe_lib" ++]) + + AC_PREFIX_DEFAULT([/usr/local/est]) + + cp confdefs.h est_config.h + +-AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile]) ++AC_CONFIG_FILES([Makefile version src/Makefile src/est/Makefile]) + AM_COND_IF([ENABLE_JNI], + [AC_CONFIG_FILES([java/jni/Makefile])]) + AM_COND_IF([ENABLE_EXAMPLES], +@@ -212,5 +230,8 @@ AM_COND_IF([ENABLE_EXAMPLES], + [], + [AC_CONFIG_FILES([example/server/Makefile example/proxy/Makefile])]) + ]) ++AM_COND_IF([WITH_SYSTEM_LIBSAFEC], ++ [], ++ [AC_CONFIG_FILES([safe_c_stub/Makefile safe_c_stub/lib/Makefile])]) + + AC_OUTPUT +-- +2.17.1 + diff --git a/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch b/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch new file mode 100644 index 0000000000..f5e1b0c41a --- /dev/null +++ b/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch @@ -0,0 +1,164 @@ +From 9a76187aa4d779de39afa12024d5a73a14175371 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Wed, 15 Jul 2020 11:25:05 +0000 +Subject: [PATCH] configure.ac: Fix AC_ARG_ENABLE/AC_ARG_WITH macros + +Multiple tests in configure.ac are flawed: + +[--snip--] + AC_ARG_ENABLE([pthreads], + [AS_HELP_STRING([--disable-pthreads], + [Disable support for pthreads])], + [pthreads_on=1], + [pthreads_on=0]) +[--snip--] + +The third argument is "action-if-given" and the fourth argument +is "action-if-not-given" [0]. Which means that, whether you pass +--enable-pthreads or --disable-pthreads, the third argument will be +executed, that is "pthreads_on=1". And if you pass neither, the fourth +argument will be executed, i.e. "pthreads_on=0". + +We want `--enable-pthreads` and `--disable-pthreads` flags to do their job. +The right way to do that will be to eliminate "action-if-given" and replace +the user-defined `FEATURE_on=0|1` shell variables with the `enable_FEATURE` +and `with_PACKAGE` shell variables provided by Autotools. + +[0] https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/autoconf.html#Package-Options + +Upstream: https://github.com/cisco/libest/pull/81/. It was merged +upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this +commit mixes multiple patches in one. + +Signed-off-by: Aleksandr Makarov +--- + configure.ac | 60 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 30 insertions(+), 30 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 048aa3c..0b930bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,9 +43,9 @@ AM_CONDITIONAL([JAVA_HOME_SET], [test ! -z "$JAVA_HOME"]) + AC_ARG_ENABLE([client-only], + [AS_HELP_STRING([--enable-client-only], + [Enable the building of only the client mode of libEST])], +- [clientonly_on=1], +- [clientonly_on=0]) +-AM_CONDITIONAL([ENABLE_CLIENT_ONLY], [test x$clientonly_on = x1]) ++ [], ++ [enable_client_only="no"]) ++AM_CONDITIONAL([ENABLE_CLIENT_ONLY], [test "$enable_client_only" = "yes"]) + AM_COND_IF([ENABLE_CLIENT_ONLY], + AC_MSG_RESULT([Client only build enabled]) + AC_DEFINE([ENABLE_CLIENT_ONLY]), +@@ -54,9 +54,9 @@ AM_COND_IF([ENABLE_CLIENT_ONLY], + AC_ARG_ENABLE([brski], + [AS_HELP_STRING([--enable-brski], + [Enable support for brski bootstrap functionality])], +- [brski_on=1], +- [brski_on=0]) +-AM_CONDITIONAL([ENABLE_BRSKI], [test x$brski_on = x1]) ++ [], ++ [enable_brski="no"]) ++AM_CONDITIONAL([ENABLE_BRSKI], [test "$enable_brski" = "yes"]) + AM_COND_IF([ENABLE_BRSKI], + AC_MSG_RESULT([BRSKI support enabled]) + AC_DEFINE([ENABLE_BRSKI]), +@@ -65,9 +65,9 @@ AM_COND_IF([ENABLE_BRSKI], + AC_ARG_ENABLE([pthreads], + [AS_HELP_STRING([--disable-pthreads], + [Disable support for pthreads])], +- [pthreads_on=1], +- [pthreads_on=0]) +-AM_CONDITIONAL([DISABLE_PTHREAD], [test x$pthreads_on = x1]) ++ [], ++ [enable_pthreads="yes"]) ++AM_CONDITIONAL([DISABLE_PTHREAD], [test "$enable_pthreads" = "no"]) + AM_COND_IF([DISABLE_PTHREAD], + AC_MSG_RESULT([pthread support disabled]) + AC_DEFINE([DISABLE_PTHREADS]), +@@ -88,13 +88,13 @@ AM_COND_IF([ENABLE_EXAMPLES], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) + AC_ARG_WITH([ssl-dir], + [AS_HELP_STRING([--with-ssl-dir], + [location of OpenSSL install folder, defaults to /usr/local/ssl])], +- [ssldir="$withval"], +- [ssldir="/usr/local/ssl"]) +-AC_SUBST([SSL_CFLAGS], "$ssldir/include") +-AC_SUBST([SSL_LDFLAGS], "$ssldir/lib") ++ [], ++ [with_ssl_dir="/usr/local/ssl"]) ++AC_SUBST([SSL_CFLAGS], "$with_ssl_dir/include") ++AC_SUBST([SSL_LDFLAGS], "$with_ssl_dir/lib") + +-CFLAGS="$CFLAGS -Wall -I$ssldir/include" +-LDFLAGS="$LDFLAGS -L$ssldir/lib" ++CFLAGS="$CFLAGS -Wall -I$with_ssl_dir/include" ++LDFLAGS="$LDFLAGS -L$with_ssl_dir/lib" + if test "$is_freebsd" = "1" ; then + AC_CHECK_LIB([crypto], [EVP_EncryptInit], [], + [AC_MSG_FAILURE([can't find openssl crypto lib])] +@@ -120,13 +120,13 @@ AC_CHECK_LIB([crypto], [EVP_CIPHER_CTX_reset], [], + AC_ARG_WITH([libcurl-dir], + [AS_HELP_STRING([--with-libcurl-dir], + [enable support for client proxy using libcurl])], +- [libcurldir="$withval"], +- [with_libcurldir=no]) ++ [], ++ [with_libcurl_dir=no]) + + AS_IF( +- [test "x$with_libcurldir" != xno], +- [[CFLAGS="$CFLAGS -I$libcurldir/include"] +- [LDFLAGS="$LDFLAGS -L$libcurldir/lib -lcurl"] ++ [test "$with_libcurl_dir" != "no"], ++ [[CFLAGS="$CFLAGS -I$with_libcurl_dir/include"] ++ [LDFLAGS="$LDFLAGS -L$with_libcurl_dir/lib -lcurl"] + AC_CHECK_LIB( + [curl], + [curl_easy_init], +@@ -143,17 +143,17 @@ AC_ARG_WITH([libcurl-dir], + AC_ARG_WITH([uriparser-dir], + [AS_HELP_STRING([--with-uriparser-dir], + [enable support for path segments using uriparser])], +- [uriparserdir="$withval"], +- [with_uriparserdir=no]) ++ [], ++ [with_uriparser_dir=no]) + + dnl CFLAGS="$CFLAGS -Wall -I$uriparserdir/include" + dnl CPPFLAGS="$CPPFLAGS -I$uriparser/include" + dnl LDFLAGS="$LDFLAGS -L$uriparserdir/lib -luriparser" + + AS_IF( +- [test "x$with_uriparserdir" != xno], +- [[CFLAGS="$CFLAGS -I$uriparserdir/include"] +- [LDFLAGS="$LDFLAGS -L$uriparserdir/lib -luriparser"] ++ [test "$with_uriparser_dir" != "no"], ++ [[CFLAGS="$CFLAGS -I$with_uriparser_dir/include"] ++ [LDFLAGS="$LDFLAGS -L$with_uriparser_dir/lib -luriparser"] + AC_CHECK_LIB( + [uriparser], + [uriParseUriA], +@@ -170,13 +170,13 @@ AC_ARG_WITH([uriparser-dir], + AC_ARG_WITH([libcoap-dir], + [AS_HELP_STRING([--with-libcoap-dir], + [enable support for ESToCoAP using libcoap library])], +- [libcoapdir="$withval"], +- [with_libcoapdir=no]) ++ [], ++ [with_libcoap_dir=no]) + + AS_IF( +- [test "x$with_libcoapdir" != xno], +- [[CFLAGS="$CFLAGS -I$libcoapdir/include"] +- [LDFLAGS="$LDFLAGS -L$libcoapdir/lib -lcoap-2-openssl"] ++ [test "$with_libcoap_dir" != "no"], ++ [[CFLAGS="$CFLAGS -I$with_libcoap_dir/include"] ++ [LDFLAGS="$LDFLAGS -L$with_libcoap_dir/lib -lcoap-2-openssl"] + AC_CHECK_LIB( + [coap-2-openssl], + [coap_startup], +-- +2.17.1 + diff --git a/package/libest/0005-configure.ac-remove-duplicate-invocation-of-AM_INIT_.patch b/package/libest/0005-configure.ac-remove-duplicate-invocation-of-AM_INIT_.patch new file mode 100644 index 0000000000..1ee35ad7f9 --- /dev/null +++ b/package/libest/0005-configure.ac-remove-duplicate-invocation-of-AM_INIT_.patch @@ -0,0 +1,36 @@ +From bd4fad5e427f4d2828f2edbe8063f6d6c9276c7b Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 8 Jan 2022 13:30:58 +0100 +Subject: [PATCH] configure.ac: remove duplicate invocation of AM_INIT_AUTOMAKE + +autoreconf fails with: + +configure.ac:9: error: AM_INIT_AUTOMAKE expanded multiple times +/home/thomas/projets/buildroot/output/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... +configure.ac:7: the top level +/home/thomas/projets/buildroot/output/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... +configure.ac:9: the top level + +Drop the duplicate invocation to AM_INIT_AUTOMAKE to solve this. + +Upstream: https://github.com/cisco/libest/pull/106 +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0b930bf..66a91f2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,6 @@ AC_CONFIG_AUX_DIR(config) + AC_CONFIG_SRCDIR(src/est/est.c) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE + AM_INIT_AUTOMAKE([subdir-objects]) + +-- +2.33.1 + diff --git a/package/libest/0006-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch b/package/libest/0006-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch new file mode 100644 index 0000000000..ba0ecb4a86 --- /dev/null +++ b/package/libest/0006-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch @@ -0,0 +1,42 @@ +From 32fe99fa403d2f51931615745a64f8aede1ca46f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 8 Jan 2022 13:38:17 +0100 +Subject: [PATCH] src/est/est_locl.h: add missing extern on + e_ctx_ssl_exdata_index + +Without this extern, the variable gets re-declared in each compilation +unit including est_locl.h, causing gcc >= 10 to complain with: + +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client.o:(.data+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server.o:(.bss+0xc): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server_http.o:(.bss+0x3b8): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_proxy.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client_http.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_ossl_util.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client_proxy.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_enhcd_cert_auth.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server_coap.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +collect2: error: ld returned 1 exit status + +Upstream: https://github.com/cisco/libest/pull/107 +Signed-off-by: Thomas Petazzoni +--- + src/est/est_locl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/est/est_locl.h b/src/est/est_locl.h +index 62dcbea..b16f62d 100644 +--- a/src/est/est_locl.h ++++ b/src/est/est_locl.h +@@ -590,7 +590,7 @@ typedef struct est_oid_list { + /* + * Index used to link the EST Ctx into the SSL structures + */ +-int e_ctx_ssl_exdata_index; ++extern int e_ctx_ssl_exdata_index; + + LIBEST_TEST_API void est_log (EST_LOG_LEVEL lvl, char *format, ...); + LIBEST_TEST_API void est_log_backtrace (void); +-- +2.33.1 + diff --git a/package/libest/Config.in b/package/libest/Config.in new file mode 100644 index 0000000000..7ba2f32c09 --- /dev/null +++ b/package/libest/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_LIBEST + bool "libest" + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_OPENSSL + help + libest is a C implementation of RFC 7030 (Enrollment over + Secure Transport). + + It can be used to provision public key certificates from + a certificate authority (CA) or registration authority (RA) + to end-user devices and network infrastructure devices. + + https://github.com/cisco/libest + +if BR2_PACKAGE_LIBEST + +config BR2_PACKAGE_LIBEST_BRSKI + bool "BRSKI support" + +config BR2_PACKAGE_LIBEST_MODE_CLIENT_ONLY + bool "client-only mode" + # The client-only mode fails to build with OpenJDK/JNI + # bindings + depends on !BR2_PACKAGE_OPENJDK + +endif # BR2_PACKAGE_LIBEST diff --git a/package/libest/libest.hash b/package/libest/libest.hash new file mode 100644 index 0000000000..c902a9568f --- /dev/null +++ b/package/libest/libest.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 324b3a2b16cd14ea4234d75fa90f08b29509bac9cd3795c44268e22f906ee0ad libest-3.2.0.tar.gz +sha256 fbdb055f98babf8d86095d6f9b9e34d2ff21a8212e442b8f18bdcb403e44366c LICENSE diff --git a/package/libest/libest.mk b/package/libest/libest.mk new file mode 100644 index 0000000000..d9f3cf87bc --- /dev/null +++ b/package/libest/libest.mk @@ -0,0 +1,71 @@ +################################################################################ +# +# libest +# +################################################################################ + +LIBEST_VERSION = 3.2.0 +LIBEST_SITE = $(call github,cisco,libest,r$(LIBEST_VERSION)) +# We don't build examples, so we're not affected by the OpenSSL +# license +LIBEST_LICENSE = BSD-3-Clause, MIT, W3C +LIBEST_LICENSE_FILES = LICENSE +LIBEST_INSTALL_STAGING = YES +LIBEST_AUTORECONF = YES +LIBEST_DEPENDENCIES = openssl host-pkgconf +# libcoap support is explicitly disabled because it breaks the build +LIBEST_CONF_OPTS = \ + --with-ssl-dir=$(STAGING_DIR)/usr \ + $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-pthreads,--disable-pthreads) \ + $(if $(BR2_PACKAGE_LIBEST_BRSKI),--enable-brski,--disable-brski) \ + --disable-examples \ + --without-libcoap-dir + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LIBEST_DEPENDENCIES += libexecinfo +LIBEST_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + +ifeq ($(BR2_PACKAGE_LIBEST_MODE_CLIENT_ONLY),y) +LIBEST_CONF_OPTS += --enable-client-only +else +LIBEST_CONF_OPTS += --disable-client-only +endif + +ifeq ($(BR2_PACKAGE_OPENJDK),y) +LIBEST_MAKE_ENV += JAVA_HOME=$(HOST_DIR)/lib/jvm +LIBEST_CONF_ENV += JAVA_HOME=$(HOST_DIR)/lib/jvm +LIBEST_CONF_OPTS += --enable-jni +LIBEST_DEPENDENCIES += openjdk +else +LIBEST_CONF_OPTS += --disable-jni +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBEST_CONF_OPTS += --with-libcurl-dir=$(STAGING_DIR)/usr +LIBEST_DEPENDENCIES += libcurl +else +LIBEST_CONF_OPTS += --without-libcurl-dir +endif + +ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) +LIBEST_CONF_OPTS += --with-uriparser-dir=$(STAGING_DIR)/usr +LIBEST_DEPENDENCIES += liburiparser +else +LIBEST_CONF_OPTS += --without-uriparser-dir +endif + +ifeq ($(BR2_PACKAGE_SAFECLIB),y) +LIBEST_CONF_OPTS += --with-system-libsafec +LIBEST_DEPENDENCIES += safeclib +else +LIBEST_CONF_OPTS += --without-system-libsafec +endif + +define LIBEST_INSTALL_PC + $(INSTALL) -c -m 0644 $(LIBEST_PKGDIR)/libest.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/libest.pc +endef +LIBEST_POST_INSTALL_STAGING_HOOKS += LIBEST_INSTALL_PC + +$(eval $(autotools-package)) diff --git a/package/libest/libest.pc b/package/libest/libest.pc new file mode 100644 index 0000000000..166240f9d1 --- /dev/null +++ b/package/libest/libest.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libest +Description: implementation of RFC 7030 (Enrollment over Secure Transport) +Version: 2.1.0 +Libs: -lest +Cflags: -I${includedir}/est From thomas.petazzoni at bootlin.com Sat Jan 8 13:38:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 14:38:24 +0100 Subject: [Buildroot] [PATCH v2] package/libest: new package In-Reply-To: <20200715223514.15744-1-aleksandr.o.makarov@gmail.com> References: <20200715223514.15744-1-aleksandr.o.makarov@gmail.com> Message-ID: <20220108143824.2cdc9a29@windsurf> Hello Aleksandr, On Wed, 15 Jul 2020 16:35:14 -0600 Aleksandr Makarov wrote: > libest is a C implementation of RFC 7030 (Enrollment over > Secure Transport). > > It can be used to provision public key certificates from > a certificate authority (CA) or registration authority (RA) > to end-user devices and network infrastructure devices. > > https://github.com/cisco/libest > > Notes on patches included in this package: > > - libest bundles a stubbed version of libsafec, and has no provision > to build against a system-installed full (non-stubbed) libsafec. > We add a patch to make that possible. > > - Added a configuration option --{enable,disable}-examples to toggle > examples build by a separate patch. > > - There's a configuration option `--enable-jni` which allows to build > a JNI library for binding libest to Java programs. And that library > would be using an outdated version of OpenSSL 1.0. > We fix that by adding support for OpenSSL 1.1 API for that library. > > - Fixed a bug when specifying either `--enable-FEATURE` or `--disable-FEATURE` > has always been enabling the feature. Sorry for the long delay. I finally applied your patch, but after making some significant changes: [Thomas: - Added comments about the upstream status in existing patches - Added a patch fixing an autoreconf issue - Added a patch adding a missing "extern" on a variable to fix build with gcc 10 - Removed the glibc dependency by using the new libexecinfo package - Drastically simplified the complex libcoap disabling and client-only mode vs. OpenJDK issue. libcoap support is now forcefully disabled, and client-mode only option is made invisible when OpenJDK is enabled. - Fixed the license information; - Added missing host-pkgconf ] Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 13:40:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 14:40:38 +0100 Subject: [Buildroot] [git commit] package/libest: add !BR2_STATIC_LIBS dependency Message-ID: <20220108133456.4174882A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5ecbffe61594ea572da18d1550a7cbdc28b7e1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It should have been inherited from libexecinfo. Signed-off-by: Thomas Petazzoni --- package/libest/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libest/Config.in b/package/libest/Config.in index 7ba2f32c09..d8271ad69e 100644 --- a/package/libest/Config.in +++ b/package/libest/Config.in @@ -1,5 +1,9 @@ +comment "libest needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_LIBEST bool "libest" + depends on !BR2_STATIC_LIBS # libexecinfo or glibc select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL help From romain.naour at smile.fr Sat Jan 8 13:42:38 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 14:42:38 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: References: <20201126144722.502163-1-nolange79@gmail.com> Message-ID: <195311e2-38dc-53ee-80b8-09dca52320a0@smile.fr> Hello Norbert, >> +# >> +# [1] - https://github.com/systemd/systemd/issues/16183 > > It seems that systemd now include what you need since version 249 containing the > commit [1]. > > The fakeroot_tmpfiles.sh script seems not neceesary anymore. > > [1] > https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 I have marked this patch as "Changes Requested". Best regards, Romain > > Best regards, > Romain > > From peter at korsgaard.com Sat Jan 8 13:44:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 14:44:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: bump version to 0.23.5 In-Reply-To: <20220108102620.1603341-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 11:26:20 +0100") References: <20220108102620.1603341-1-bernd.kuhls@t-online.de> Message-ID: <87iluugx49.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Switched project URL to https. I added a short explaination why (HTTP redirects to HTTPS) > +++ b/package/mpd/mpd.mk > @@ -5,7 +5,7 @@ > ################################################################################ > MPD_VERSION_MAJOR = 0.23 > -MPD_VERSION = $(MPD_VERSION_MAJOR).3 > +MPD_VERSION = $(MPD_VERSION_MAJOR).5 > MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz > MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) And also changed it here. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 13:45:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 14:45:33 +0100 Subject: [Buildroot] [git commit] package/mpd: bump version to 0.23.5 Message-ID: <20220108133926.8C33582BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd84e1bcf9f116ccff2092124d56c1203d831a42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switched project URL to HTTPS as HTTP redirects to it. Added upstream patch to fix build error with uClibc: https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 https://github.com/MusicPlayerDaemon/MPD/pull/1382 Changelog: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.5/NEWS Signed-off-by: Bernd Kuhls [Peter: also update MPD_SITE] Signed-off-by: Peter Korsgaard --- .../0002-lib-alsa-Error-add-missing-include.patch | 25 ++++++++++++++++++++++ package/mpd/Config.in | 2 +- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 4 ++-- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch new file mode 100644 index 0000000000..c45a087a54 --- /dev/null +++ b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch @@ -0,0 +1,25 @@ +From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 +From: aeolio +Date: Tue, 14 Dec 2021 09:01:23 +0100 +Subject: [PATCH] lib/alsa/Error: add missing #include + +Downloaded from upstream commit: +https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 + +Signed-off-by: Bernd Kuhls +--- + src/lib/alsa/Error.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx +index cd351f37d1..8ceb4417ca 100644 +--- a/src/lib/alsa/Error.cxx ++++ b/src/lib/alsa/Error.cxx +@@ -29,6 +29,7 @@ + + #include "Error.hxx" + ++#include + #include + + namespace Alsa { diff --git a/package/mpd/Config.in b/package/mpd/Config.in index eb10151df3..fc0f409448 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -16,7 +16,7 @@ menuconfig BR2_PACKAGE_MPD it can play a variety of sound files while being controlled by its network protocol. - http://www.musicpd.org + https://www.musicpd.org if BR2_PACKAGE_MPD diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index cb9d05cd32..56f88490cf 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b300625701005c6b14649f11dac118d05540529a5385d05b7c3062c0ce08f399 mpd-0.23.3.tar.xz +sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 7bda0963c6..6f01b29c6d 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,9 +5,9 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).3 +MPD_VERSION = $(MPD_VERSION_MAJOR).5 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz -MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) +MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING From arnout at mind.be Sat Jan 8 13:49:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 14:49:19 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/toolchain-wrapper: Handle debug info paths in gcc7 or below for reproducibility In-Reply-To: <20200415220032.140083-1-brandon.maier@rockwellcollins.com> References: <20200415220032.140083-1-brandon.maier@rockwellcollins.com> Message-ID: On 16/04/2020 00:00, Brandon Maier wrote: > In GCC8 the flag -ffile-prefix-map handles cleaning up both the __FILE__ > macros and the debug info paths. In GCC7 or below we are manually > handling the __FILE__ macros, but not debug info paths. Use > -fdebug-prefix-map to clean them up. > > See for more detail: https://reproducible-builds.org/docs/build-path/ > > Signed-off-by: Brandon Maier Both applied to master, thanks. Sorry it took so long for such a simple patch. Regards, Arnout > --- > toolchain/toolchain-wrapper.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk > index 09dda17890..7d55050135 100644 > --- a/toolchain/toolchain-wrapper.mk > +++ b/toolchain/toolchain-wrapper.mk > @@ -26,6 +26,7 @@ TOOLCHAIN_WRAPPER_OPTS += -Wl,--build-id=none > ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) > TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot > else > +TOOLCHAIN_WRAPPER_OPTS += -fdebug-prefix-map=$(BASE_DIR)=buildroot > TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined > endif > endif > From arnout at mind.be Sat Jan 8 13:48:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 14:48:22 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-wrapper: reproducible builds: handle debug info paths in GCC <7 Message-ID: <20220108134319.8972182BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=409e30a70fc28e05a11c903dc7918eee92e424d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In GCC8 the flag -ffile-prefix-map handles cleaning up both the __FILE__ macros and the debug info paths. In GCC7 or below we are manually handling the __FILE__ macros, but not debug info paths. Use -fdebug-prefix-map to clean them up. This option exists since GCC 4.3.0, which is our minimal supported GCC version. See for more detail: https://reproducible-builds.org/docs/build-path/ Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/toolchain-wrapper.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index 8b551e3a18..bc8d77b892 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -26,6 +26,7 @@ TOOLCHAIN_WRAPPER_OPTS += -Wl,--build-id=none ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot else +TOOLCHAIN_WRAPPER_OPTS += -fdebug-prefix-map=$(BASE_DIR)=buildroot TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined endif ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),) From arnout at mind.be Sat Jan 8 13:48:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 14:48:22 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-wrapper: reproducible builds: omit absolute paths from debug symbols Message-ID: <20220108134319.914E882D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ec9b3abd9dc8d24bc75f2b5b365ad78e2b09b8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In GCC6 the compiler was made smarter to omit the flag -fdebug-prefix-map from the DWARF DW_AT_producer section[1]. That flag contains the absolute path '$(BASE_DIR)' which breaks reproducibility. Prior to GCC6 however, the only way to omit the flag is to use -gno-record-gcc-switches which omits all flags. [1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=266cc0c181549c2fb6b50f8f26213cdc89101026 Signed-off-by: Brandon Maier [Arnout: invert condition to ifeq (,) instead of ifneq (,y)] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/toolchain-wrapper.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index bc8d77b892..cbf46f15fa 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -32,6 +32,9 @@ endif ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),) TOOLCHAIN_WRAPPER_OPTS += -DBR_NEED_SOURCE_DATE_EPOCH endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_6),) +TOOLCHAIN_WRAPPER_OPTS += -gno-record-gcc-switches +endif endif # Disable -ftree-loop-distribute-patterns on microblaze to From juergen at jstuber.net Sat Jan 8 13:52:44 2022 From: juergen at jstuber.net (Juergen Stuber) Date: Sat, 8 Jan 2022 14:52:44 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220107235959.2638b513@windsurf> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107105223.01912574@windsurf> <20220107235959.2638b513@windsurf> Message-ID: <20220108145237.63a25b31@sju.home.jstuber.net> Hi Thomas, James, all, On Fri, 7 Jan 2022 23:59:59 +0100 Thomas Petazzoni wrote: > On Fri, 7 Jan 2022 16:30:12 -0600 > James Hilliard wrote: > > > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir > > > > $(TARGET_CROSS))gcc > > > > > > How come things are working today with this one? > > > > I think this is currently set in the cargo config file. > > Ah, right: > > [target. at RUSTC_TARGET_NAME@] > linker = "@CROSS_PREFIX at gcc" > > in package/rustc/cargo-config.in the config file has the problem that it is found via CARGO_HOME, which comes last in the search path, after searching upward in the directory hierarchy. When I used Rust under buildroot for the first time, a broken .cargo/config in my home directory which I had completely forgotten about caused the build to fail, and it took me a while to figure it out. Environment variables take precedence over config files, so IMHO they are the better choice. > > > - Relevance of > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir > > > $(TARGET_CROSS))gcc > > > > Set via CARGO_HOME currently, but I think may allow the cargo > > config to not be required. > > I'm no sure why you say this is set via CARGO_HOME? Because the > config file is stored in $(CARGO_HOME)/config ? Greetings J?rgen -- J?rgen Stuber http://www.jstuber.net/ Tel: +49-208-304 20 50 Mobil: +49-178-39 39 628 1B78 A579 E159 2A85 67BB 1314 C083 224B 0F9C DA21 From peter at korsgaard.com Sat Jan 8 14:02:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 15:02:39 +0100 Subject: [Buildroot] [PATCH] configs/imx6slevk: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20220108131409.990135-1-festevam@gmail.com> (Fabio Estevam's message of "Sat, 8 Jan 2022 10:14:09 -0300") References: <20220108131409.990135-1-festevam@gmail.com> Message-ID: <87ee5igwao.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650628 > Signed-off-by: Fabio Estevam Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 14:02:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 15:02:46 +0100 Subject: [Buildroot] [git commit] configs/imx6slevk: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220108135639.B0B0082BC9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf2a7663ccc6089e98e0d6ec39fa8623749c0c24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ After the update of u-boot in commit 9a04bbec1cd59b (configs/imx6slevk: bump U-Boot). Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650628 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/imx6slevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6slevk_defconfig b/configs/imx6slevk_defconfig index 6f0bae5aa9..9448267e2b 100644 --- a/configs/imx6slevk_defconfig +++ b/configs/imx6slevk_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6slevk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From romain.naour at smile.fr Sat Jan 8 14:09:56 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 15:09:56 +0100 Subject: [Buildroot] [PATCH 1/2] qemu_arm_versatile: switch to in-kernel defconfig + fragment In-Reply-To: <20210316143822.3421019-1-masahiroy@kernel.org> References: <20210316143822.3421019-1-masahiroy@kernel.org> Message-ID: <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> Hello Masahiro, All Le 16/03/2021 ? 15:38, Masahiro Yamada a ?crit?: > This platform has its own kernel defconfig in Buildroot, but we cannot > get quick idea about how much it diverged from the in-kernel defconfig. > > Let's use the upstream arch/arm/config/versatile_defconfig as a base, > and maintain the diff as a merge-config fragment. The same .config is > still generated based on the 5.10.7 kernel. > > The diff is quite big, but this is a good start-point for cleanups. > Follow-up works can drop diff lines unless we find a good reason for > divergence. We use a custom kernel defconfig for this defconfig since it was added to Buildroot [1]. I guess the aim of having a custom kernel defconfig is to reduce the build time. This defconfig is used for boot testing on Qemu, I'm not sure if it really used for other use case. Have you tested without any additional fragment? [1] https://git.buildroot.net/buildroot/commit/?id=d3789ce3b70aaaa5e180d041b2ad282b36d929ed Best regards, Romain From thomas.petazzoni at bootlin.com Sat Jan 8 14:09:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:09:49 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime_defconfig: use linux-disable-lima.fragment Message-ID: <20220108140349.7E68082D96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dbdd8971df4c6d57cdf27c89810b3b2c6893e82c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This defconfig enables sunxi-mali-mainline-driver so we need to disable Lima in Linux to prevent Mali to not load. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 17da786a8c..698137e46c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -26,6 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y From thomas.petazzoni at bootlin.com Sat Jan 8 14:09:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:09:48 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment Message-ID: <20220108140349.7346E82D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddc3f428afa51b935a6a48fba8533913543d77ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This defconfig enables sunxi-mali-mainline-driver so we need to disable Lima in Linux to prevent Mali to not load. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 64a66de5c8..b46cf37433 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -26,6 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y From thomas.petazzoni at bootlin.com Sat Jan 8 14:09:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:09:48 +0100 Subject: [Buildroot] [git commit] board/olimex/a20_olinuxino: add linux-disable-lima.fragment Message-ID: <20220108140349.6CD9F82BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8eec48376095310119e54a1516e8f8c2cfc0afb0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This Linux defconfig fragment is needed to disable Lima driver in favour of Mali(if enabled). This because Lima is enabled by default in Linux's sunxi_defconfig and if we enable Mali driver in Buildroot it will fail to load. So let's set CONFIG_DRM_LIMA=n. Of course this fragment is only used by Buildroot defconfigs that enable Mali driver. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/olimex/a20_olinuxino/linux-disable-lima.fragment | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/olimex/a20_olinuxino/linux-disable-lima.fragment b/board/olimex/a20_olinuxino/linux-disable-lima.fragment new file mode 100644 index 0000000000..4c36f8aab3 --- /dev/null +++ b/board/olimex/a20_olinuxino/linux-disable-lima.fragment @@ -0,0 +1,2 @@ +# Disable LIMA in favour of Mali +# CONFIG_DRM_LIMA is not set From thomas.petazzoni at bootlin.com Sat Jan 8 14:10:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:10:49 +0100 Subject: [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment In-Reply-To: <20211105221800.1451167-4-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> <20211105221800.1451167-4-giulio.benetti@benettiengineering.com> Message-ID: <20220108151049.4ad9c666@windsurf> On Fri, 5 Nov 2021 23:17:58 +0100 Giulio Benetti wrote: > +CONFIG_DRM_LIMA=n Changed to: # CONFIG_DRM_LIMA is not set and applied. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 14:10:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:10:59 +0100 Subject: [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: use linux-disable-lima.fragment In-Reply-To: <20211105221800.1451167-6-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> <20211105221800.1451167-6-giulio.benetti@benettiengineering.com> Message-ID: <20220108151059.56e74aa4@windsurf> On Fri, 5 Nov 2021 23:18:00 +0100 Giulio Benetti wrote: > This defconfig enables sunxi-mali-mainline-driver so we need to disable > Lima in Linux to prevent Mali to not load. > > Signed-off-by: Giulio Benetti > --- > configs/olimex_a20_olinuxino_lime_defconfig | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 14:10:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:10:54 +0100 Subject: [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment In-Reply-To: <20211105221800.1451167-5-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> <20211105221800.1451167-5-giulio.benetti@benettiengineering.com> Message-ID: <20220108151054.68321880@windsurf> On Fri, 5 Nov 2021 23:17:59 +0100 Giulio Benetti wrote: > This defconfig enables sunxi-mali-mainline-driver so we need to disable > Lima in Linux to prevent Mali to not load. > > Signed-off-by: Giulio Benetti > --- > configs/olimex_a20_olinuxino_lime2_defconfig | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sat Jan 8 14:12:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:12:35 +0100 Subject: [Buildroot] [git commit] qemu_arm_versatile: switch to in-kernel defconfig + fragment Message-ID: <20220108140633.6913D819F0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34b725c412d9771127405276052398d09f522613 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This platform has its own kernel defconfig in Buildroot, but we cannot get quick idea about how much it diverged from the in-kernel defconfig. Let's use the upstream arch/arm/config/versatile_defconfig as a base, and maintain the diff as a merge-config fragment. The same .config is still generated (based on the 5.10.7 kernel). The diff is quite big, but this is a good start-point for cleanups. Follow-up works can drop diff lines unless we find a good reason for divergence. Signed-off-by: Masahiro Yamada [Arnout: rename linux.config to linux.fragment] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/qemu/arm-versatile/linux.config | 43 --------------------- board/qemu/arm-versatile/linux.fragment | 66 +++++++++++++++++++++++++++++++++ configs/qemu_arm_versatile_defconfig | 4 +- 3 files changed, 68 insertions(+), 45 deletions(-) diff --git a/board/qemu/arm-versatile/linux.config b/board/qemu/arm-versatile/linux.config deleted file mode 100644 index b1001d84a7..0000000000 --- a/board/qemu/arm-versatile/linux.config +++ /dev/null @@ -1,43 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_VERSATILE=y -CONFIG_PCI=y -CONFIG_PCI_VERSATILE=y -CONFIG_AEABI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_NETDEVICES=y -CONFIG_8139CP=y -CONFIG_PHYLIB=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_ARMAACI=m -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_MAGIC_SYSRQ=y diff --git a/board/qemu/arm-versatile/linux.fragment b/board/qemu/arm-versatile/linux.fragment new file mode 100644 index 0000000000..0aed558315 --- /dev/null +++ b/board/qemu/arm-versatile/linux.fragment @@ -0,0 +1,66 @@ +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CMA is not set +# CONFIG_CRAMFS is not set +CONFIG_CMDLINE="" +CONFIG_CRC16=y +CONFIG_CRYPTO=y +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DEVTMPFS=y +# CONFIG_DRM is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EXT2_FS is not set +CONFIG_EXT4_FS=y +CONFIG_FB_ARMCLCD=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FTRACE is not set +# CONFIG_GPIOLIB is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HWMON=y +CONFIG_HZ_PERIODIC=y +# CONFIG_I2C_VERSATILE is not set +CONFIG_INET_DIAG=y +CONFIG_INPUT_EVDEV=y +CONFIG_IPV6=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_PNP is not set +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOGO is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_MDIO_DEVICE=y +# CONFIG_MINIX_FS is not set +# CONFIG_MMC is not set +# CONFIG_MTD is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_NFSD is not set +# CONFIG_NFS_FS is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_NVMEM is not set +# CONFIG_OABI_COMPAT is not set +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PCI=y +CONFIG_PCI_VERSATILE=y +CONFIG_PHYLIB=y +# CONFIG_ROMFS_FS is not set +# CONFIG_RTC_CLASS is not set +CONFIG_SCSI=y +CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_SYM53C8XX_2=y +CONFIG_SERIO_SERPORT=y +CONFIG_SLUB=y +# CONFIG_SPI is not set +# CONFIG_SYNC_FILE is not set +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +# CONFIG_VFP is not set +# CONFIG_XZ_DEC is not set +CONFIG_8139CP=y +CONFIG_BLK_DEV_SD=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index a039c47729..5e399d17de 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -21,8 +21,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" +BR2_LINUX_KERNEL_DEFCONFIG="versatile" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" From arnout at mind.be Sat Jan 8 14:12:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:12:35 +0100 Subject: [Buildroot] [git commit] qemu_arm_versatile_nommu: switch to in-kernel defconfig + fragment Message-ID: <20220108140633.7190282D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53d82096b67ac23185e7cbece9a93aff00f0986c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This platform has its own kernel defconfig in Buildroot, but we cannot get quick idea about how much it diverged from the in-kernel defconfig. Let's use the upstream arch/arm/config/versatile_defconfig as a base, and maintain the diff as a merge-config fragment. The same .config is still generated based on the 5.10.7 kernel. The diff is quite big, but this is a good start-point for cleanups. Follow-up works can drop diff lines unless we find a good reason for divergence. Signed-off-by: Masahiro Yamada [Arnout: rename linux-nommu.config to linux-nommu.fragment] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/qemu/arm-versatile/linux-nommu.config | 47 --------------------- board/qemu/arm-versatile/linux-nommu.fragment | 59 +++++++++++++++++++++++++++ configs/qemu_arm_versatile_nommu_defconfig | 4 +- 3 files changed, 61 insertions(+), 49 deletions(-) diff --git a/board/qemu/arm-versatile/linux-nommu.config b/board/qemu/arm-versatile/linux-nommu.config deleted file mode 100644 index 1d91d51a14..0000000000 --- a/board/qemu/arm-versatile/linux-nommu.config +++ /dev/null @@ -1,47 +0,0 @@ -# CONFIG_MMU is not set -CONFIG_ARCH_VERSATILE=y -CONFIG_ARM_SINGLE_ARCH_VERSATILE=y -CONFIG_SET_MEM_PARAM=y -CONFIG_DRAM_BASE=0x00000000 -CONFIG_DRAM_SIZE=0x08000000 -CONFIG_ARCH_VERSATILE_PB=y -CONFIG_MACH_VERSATILE_AB=y -CONFIG_MACH_VERSATILE_DT=y -CONFIG_BINFMT_FLAT=y -CONFIG_SYSVIPC=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_AEABI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_NETDEVICES=y -CONFIG_SMC91X=y -CONFIG_PHYLIB=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_ARMAACI=m -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_MAGIC_SYSRQ=y diff --git a/board/qemu/arm-versatile/linux-nommu.fragment b/board/qemu/arm-versatile/linux-nommu.fragment new file mode 100644 index 0000000000..6f1cc3f26d --- /dev/null +++ b/board/qemu/arm-versatile/linux-nommu.fragment @@ -0,0 +1,59 @@ +# CONFIG_ARM_SINGLE_ARMV7M is not set +CONFIG_ARM_SINGLE_ARCH_VERSATILE=y +CONFIG_BINFMT_ELF_FDPIC=y +CONFIG_BINFMT_FLAT=y +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CRAMFS is not set +CONFIG_CMDLINE="" +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DRM is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EXT2_FS is not set +CONFIG_EXT4_FS=y +CONFIG_FB_ARMCLCD=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FTRACE is not set +# CONFIG_GPIO_PL061 is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HWMON=y +# CONFIG_I2C_VERSATILE is not set +CONFIG_INET_DIAG=y +CONFIG_INPUT_EVDEV=y +CONFIG_IPV6=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_PNP is not set +# CONFIG_MMU is not set +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOGO is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_MDIO_DEVICE=y +# CONFIG_MINIX_FS is not set +# CONFIG_MMC is not set +# CONFIG_MTD is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_NFSD is not set +# CONFIG_NFS_FS is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_NVMEM is not set +CONFIG_DRAM_BASE=0x00000000 +CONFIG_DRAM_SIZE=0x08000000 +CONFIG_INITRAMFS_SOURCE="${BR_BINARIES_DIR}/rootfs.cpio" +# CONFIG_PARTITION_ADVANCED is not set +# CONFIG_OABI_COMPAT is not set +CONFIG_PHYLIB=y +# CONFIG_ROMFS_FS is not set +# CONFIG_RTC_CLASS is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIO_SERPORT=y +CONFIG_SET_MEM_PARAM=y +CONFIG_SLUB=y +# CONFIG_SPI is not set +# CONFIG_SYNC_FILE is not set +# CONFIG_VFP is not set diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig index 59a6efd04f..1357742703 100644 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -32,8 +32,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" +BR2_LINUX_KERNEL_DEFCONFIG="versatile" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" From thomas.petazzoni at bootlin.com Sat Jan 8 14:13:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:13:42 +0100 Subject: [Buildroot] [PATCH 1/2] qemu_arm_versatile: switch to in-kernel defconfig + fragment In-Reply-To: <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> References: <20210316143822.3421019-1-masahiroy@kernel.org> <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> Message-ID: <20220108151342.063a9bc6@windsurf> On Sat, 8 Jan 2022 15:09:56 +0100 Romain Naour wrote: > We use a custom kernel defconfig for this defconfig since it was added to > Buildroot [1]. > > I guess the aim of having a custom kernel defconfig is to reduce the build time. Most likely yes, but when I see the fragment, it indeed disables a lot of things, which is nice as it speed up the build. Just like on x86, you could build the full defconfig to have something that boots under qemu, but having a stripped down configuration is a lot more useful/practical; Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fperrad at gmail.com Sat Jan 8 14:14:59 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sat, 8 Jan 2022 15:14:59 +0100 Subject: [Buildroot] [PATCH] configs/olimex_stmp157: bump U-Boot version Message-ID: <20220108141459.2972-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- configs/olimex_stmp157_olinuxino_lime_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index f54d899b3..74e7f9ba6 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20210821, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="acda542100fa83e4bc82634e4668f8106af37a61" +# release-20211130, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1c29714bc643c299e2ed4ba870be8d4538124144" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y -- 2.32.0 From arnout at mind.be Sat Jan 8 14:16:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 15:16:44 +0100 Subject: [Buildroot] [PATCH 1/2] qemu_arm_versatile: switch to in-kernel defconfig + fragment In-Reply-To: <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> References: <20210316143822.3421019-1-masahiroy@kernel.org> <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> Message-ID: <7e1c98d7-4d7b-698c-47e2-f7754257023b@mind.be> On 08/01/2022 15:09, Romain Naour wrote: > Hello Masahiro, All > > Le 16/03/2021 ? 15:38, Masahiro Yamada a ?crit?: >> This platform has its own kernel defconfig in Buildroot, but we cannot >> get quick idea about how much it diverged from the in-kernel defconfig. >> >> Let's use the upstream arch/arm/config/versatile_defconfig as a base, >> and maintain the diff as a merge-config fragment. The same .config is >> still generated based on the 5.10.7 kernel. >> >> The diff is quite big, but this is a good start-point for cleanups. >> Follow-up works can drop diff lines unless we find a good reason for >> divergence. > > We use a custom kernel defconfig for this defconfig since it was added to > Buildroot [1]. ... And at that time I don't think we had infrastructure for fragments yet. > > I guess the aim of having a custom kernel defconfig is to reduce the build time. Even so, it's better to have the difference as a fragment rather than having a full config, so at least we can easily see the difference (as Masahiro mentions in the commit message). > This defconfig is used for boot testing on Qemu, I'm not sure if it really used > for other use case. > > Have you tested without any additional fragment? Masahiro mentions that it yields exactly the same full config, so this is perfect to keep the reduced build time. We can decide later whether or not we want to move closer to the upstream defconfig. So, applied both to master, thanks! Sorry it took so long. Regards, Arnout > > [1] > https://git.buildroot.net/buildroot/commit/?id=d3789ce3b70aaaa5e180d041b2ad282b36d929ed > > Best regards, > Romain > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Sat Jan 8 14:14:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 15:14:05 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: (Fabrice Fontaine's message of "Sun, 2 Jan 2022 21:36:34 +0100") References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> Message-ID: <874k6egvrm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: Hi, > Indeed, this is also an alternative, even if I think that adding > mbedtls3 would be a great addition. > For example, libcurl supports mbedts 3.0 since its version 7.79 and > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. > Otherwise, as requested by Thomas, I sent an email to mbedtls mailing > list: > https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ What is the plan from upstream regarding mbedtls 2.x? Will it be maintained in parallel with 3.x for some time (and for how long?) or is it effectively EOL already? If it is EOL then I guess we should just update the current mbedtls package to 3.x (and disable mbedtls support for packages not compatible with it yet), but if the plan is to support 2.x for quite some time then indeed a separate mbedtls3 package makes more sense. -- Bye, Peter Korsgaard From arnout at mind.be Sat Jan 8 14:23:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 15:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> References: <20201126152832.1115350-1-nolange79@gmail.com> <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> Message-ID: On 08/01/2022 12:04, Romain Naour wrote: > Hello Norbert, > > Le 26/11/2020 ? 16:28, Norbert Lange a ?crit?: >> Systemd has very many options, adding a way for the user >> to set custom options can help customizations >> without changing buildroot files. > > This is also true of any package in Buildroot. Users may want to provide a > custom option that is not handled yet by Buildroot. > > What if the option provided in BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG requires a build > dependency ? Also, I think it's possible to do this in a br2-external. Something like: systemd-overrides.mk: ifeq ($(BR2_PACKAGE_SYSTEMD_OVERRIDES),y) SYSTEMD_CONF_OPTS += -Dfoo -Dbar SYSTEMD_DEPENDENCIES = foobar endif Regards, Arnout From nolange79 at gmail.com Sat Jan 8 14:33:33 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 15:33:33 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: <06dd49b7-5abc-7a18-2d56-3f69e624e8b7@smile.fr> References: <20201126144745.502228-1-nolange79@gmail.com> <06dd49b7-5abc-7a18-2d56-3f69e624e8b7@smile.fr> Message-ID: Am Sa., 8. Jan. 2022 um 12:55 Uhr schrieb Romain Naour : > > Hello Norbert, > > Le 26/11/2020 ? 15:47, Norbert Lange a ?crit : > > journald supports catalog files, or rather a binary database of > > those. > > Functionality added includes: > > > > - A config option allows enabling the binary database. > > > > - if the option is enabled, the database is built and moved to > > /usr/share/factory. A symlink is created in /var pointing to > > that file. > > If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the > > language whitelist are deleted first. > > > > - the service normally used for creating the DB during boot, > > and the catalog source files used as input are deleted. > > > > The move to /usr/share/factory is helpful for having /usr as whole > > system distribution. > > > > Signed-off-by: Norbert Lange > > --- > > v1->v2: > > - Moved all logic into systemd.mk > > - solved the LOCALE_PURGE order that way > > - use the factory to store the file > > - option to enable the DB (similar to udev HWDB) > > - cant be anabled with !ROOTFS_RW, tons of > > issues with that one > > v2->v3: > > - use backticks instead of $$() > > - be more explicit about what happens in > > SYSTEMD_LOCALE_PURGE_CATALOGS > > > > Signed-off-by: Norbert Lange > > --- > > package/systemd/Config.in | 14 +++++++++++++ > > package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 55 insertions(+) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index ec34478e3d..d576e6035b 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD > > > > http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands > > > > +config BR2_PACKAGE_SYSTEMD_CATALOGDB > > + bool "enable journal catalog database installation" > > + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic > > + help > > + Build and install the journal catalog database. > > + > > + catalog files are used to provide extended and potentially localized > > + messages for the journal. > > + > > + The original catalog files will be built into a DB at > > + /usr/share/factory/var/lib/systemd/catalog/database. > > + > > + https://www.freedesktop.org/wiki/Software/systemd/catalog/ > > + > > config BR2_PACKAGE_SYSTEMD_LOCALED > > bool "enable locale daemon" > > help > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index cb12f667d6..ae99c02abf 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD > > $(SYSTEMD_INSTALL_NETWORK_CONFS) > > endef > > > > +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) > > +define SYSTEMD_LOCALE_PURGE_CATALOGS > > + # go through all files with scheme ..catalog > > + # and remove those where is not in LOCALE_NOPURGE > > + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ > > Why not "systemd.*.catalog" ? > > On my system, all catalog files with are nammed starting with "systemd." Cause the idea is that other packages could extend log messages by dropping catalogs there, there might be a dbus-broker.catalog for example, see [1]. > > > + do \ > > + basename=$${cfile##*/}; \ > > + basename=$${basename%.catalog}; \ > > + langext=$${basename#*.}; \ > > + [ "$$langext" = "$${basename}" ] && continue; \ > > + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ > > + rm -f "$$cfile"; \ > > + done > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS > > +endif > > + > > +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) > > +define SYSTEMD_UPDATE_CATALOGS > > + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog > > + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ > > + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database > > + rm $(TARGET_DIR)/var/lib/systemd/catalog/database > > + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ > > + $(TARGET_DIR)/var/lib/systemd/catalog/database > > + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ > > + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS > > +endif > > + > > +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ > > So we remove this directory. > > Why adding SYSTEMD_LOCALE_PURGE_CATALOGS then ? The order is relevant, assuming LOCALE_NOPURGE = de, then - first remove the source-files for other languages (SYSTEMD_LOCALE_PURGE_CATALOGS) - then build and install the database from the source-files with the chosen languages - then remove all language source-files > > Best regards, > Romain > > > > + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ > > + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > + > > define SYSTEMD_PRESET_ALL > > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > > endef > > > Norbert [1] - https://github.com/bus1/dbus-broker/tree/main/src/catalog From nolange79 at gmail.com Sat Jan 8 14:36:29 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 15:36:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> References: <20201126152832.1115350-1-nolange79@gmail.com> <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> Message-ID: Am Sa., 8. Jan. 2022 um 12:04 Uhr schrieb Romain Naour : > > Hello Norbert, > > Le 26/11/2020 ? 16:28, Norbert Lange a ?crit : > > Systemd has very many options, adding a way for the user > > to set custom options can help customizations > > without changing buildroot files. > > This is also true of any package in Buildroot. Users may want to provide a > custom option that is not handled yet by Buildroot. > > What if the option provided in BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG requires a build > dependency ? Responsibility for the guy using those extra options. You have those extra options for a few packages like QT5. systemd has a remarkable bunch of options, and upstreaming changes takes years (I dont have any blackmail on the maintainers, your experience may differ ;) ) > > Best regards, > Romain Norbert From nolange79 at gmail.com Sat Jan 8 14:44:40 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 15:44:40 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: <195311e2-38dc-53ee-80b8-09dca52320a0@smile.fr> References: <20201126144722.502163-1-nolange79@gmail.com> <195311e2-38dc-53ee-80b8-09dca52320a0@smile.fr> Message-ID: Am Sa., 8. Jan. 2022 um 14:42 Uhr schrieb Romain Naour : > > Hello Norbert, > > >> +# > >> +# [1] - https://github.com/systemd/systemd/issues/16183 > > > > It seems that systemd now include what you need since version 249 containing the > > commit [1]. > > > > The fakeroot_tmpfiles.sh script seems not neceesary anymore. It is, this particular change did *not* get upstreamed, see [1]. Runtime specifiers might leak to places they should not, the script is necessary to filter out those dangerous specs. Some discussion was at [2]. > > > > [1] > > https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 > > I have marked this patch as "Changes Requested". > > Best regards, > Romain > > > > > Best regards, > > Romain > > > > Norbert [1] - https://github.com/systemd/systemd/pull/16187 [2] - https://lists.buildroot.org/pipermail/buildroot/2020-June/587414.html From fontaine.fabrice at gmail.com Sat Jan 8 15:03:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 16:03:49 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: <874k6egvrm.fsf@dell.be.48ers.dk> References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> Message-ID: Hi, Le sam. 8 janv. 2022 ? 15:14, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > Hi, > > > Indeed, this is also an alternative, even if I think that adding > > mbedtls3 would be a great addition. > > For example, libcurl supports mbedts 3.0 since its version 7.79 and > > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. > > Otherwise, as requested by Thomas, I sent an email to mbedtls mailing > > list: > > https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ > > What is the plan from upstream regarding mbedtls 2.x? Will it be > maintained in parallel with 3.x for some time (and for how long?) or is > it effectively EOL already? 2.16.x is EOL since December 2021: https://tls.mbed.org/tech-updates/blog/announcing-lts-branch-mbedtls-2.16 The next LTS branch is 2.28 which will be maintained until end of 2024: https://github.com/ARMmbed/mbedtls/blob/development/BRANCHES.md > > If it is EOL then I guess we should just update the current mbedtls > package to 3.x (and disable mbedtls support for packages not compatible > with it yet), but if the plan is to support 2.x for quite some time then > indeed a separate mbedtls3 package makes more sense. > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From romain.naour at smile.fr Sat Jan 8 15:05:33 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 16:05:33 +0100 Subject: [Buildroot] [PATCH] support/testing: add a runtime test for the systemd unit tests In-Reply-To: References: <20200420085156.2930014-1-romain.naour@gmail.com> <20200423202028.GQ5035@scaer> Message-ID: Hello, J?r?my, All, Le 24/04/2020 ? 14:52, J?r?my ROSEN a ?crit?: > Well... > > I see your point, but as you said, buildroot is a bit of a special case and > systemd is a bit of a special case > > I have used systemd's test suite as non-regression testing when I bumped > systemd previously and it > did catch quite a few regression/improper integration on the BR side > (mainly incompatibilites between > util-linux and busybox) so I think it is important to check that when > bumping systemd I updated this test for systemd 250.1 and the main issue with the testsuite is releated to busybox. Some test scripts are using command not supported by busybox: rev (util-linux) mktemp --tmpdir touch --version Busybox 1.35.0 add the mktemp --tmpdir option [1] This patch allowed to detect two build issue with old toolchain [2] Anyway this patch needs a respin if we want to merge it to Buildroot. [1] https://git.busybox.net/busybox/commit/?id=ecac9853f29dcb2e5e0d70c0effaae2cabeefabf [2] https://git.buildroot.net/buildroot/commit/?id=315ba5c26dd6bb0c01067e8346b4a7eceb7d0ee1 Best regards, Romain > > Making the testsuite run in buildroot is a bit tricky (as this patchset > proves) and having it upstreamed is not > just about reg-testing but also about making it easy for devs that would > bump systemd to check that everything > is fine. > > If we go with your argument that running package non-reg is useless because > upstream is supposed to run it > itself, then we won't run any gcc non-reg (since gcc is supposed to run it) > nor any boot-testing (the kernel is > supposed to test that) so basically we do no testing except some very > buildroot-specific test. > > And we know from experience that upstream is not as reliable as it should > be, especially on exotic setups/arch > and buildroot need to test that if it wants to improve quality, because > nobody else will do it... > > Regards > Jeremy > > Le jeu. 23 avr. 2020 ? 22:20, Yann E. MORIN a > ?crit : > >> Romain, J?r?my, All, >> >> On 2020-04-20 10:51 +0200, Romain Naour spake thusly: >>> Initial work by Jeremy Rosen [1]. >>> >>> In order to allow building the testsuite, add an BR2_external >>> to add new flags in SYSTEMD_CONF_OPTS: >> >> Thanks for the effort. But I am not very much enthusiastic about it. >> >> What good does it do to us, Buildroot, that we are able to run systemd's >> test suite? >> >> Sure, we have runtime tests inBuildroot. But IMHO those runtime tests >> are for validating that the packaging and integration in Buildroot is >> correct. For example, it allows us to test that python pakcages have all >> their dependencies, or that a systemd-based system dos indeed boots >> correctly to bring up network, spawn a login, etc... >> >> Test- suites on the other hand are for upstream to valisdate they have >> no regression, and that the code they write behaves as they expect it >> to. Test suites are usually not meant for downstream consumptions. >> >> Yes, Buildroot is in a special spot as a downstream, in that it targets >> so many different targets that upstream may nt have, or may not be even >> aware of. Still, it is of my opinion that we should not be responsible >> for being able to run that test suite. >> >> So I am not very in favour of carrying such a thing in Buildroot, >> unfortunately... >> >> I'm leaving the patch as "new" in patchwork, though, in case another >> maintainer as a stronger opinion in favour of it, or in case you can >> make a very strgin argument explaining why we need it. >> >> Regards, >> Yann E. MORIN. >> >>> "SYSTEMD_CONF_OPTS += -Dslow-tests=true -Dinstall-tests=true >> -Dtests=true" >>> >>> This allow to install run-unit-tests.py on the target to execute >>> all tests installed to /lib/systemd/tests. While at it, enable usafe >> tests >>> since we are using a rootfs image built only to run these tests. >>> >>> The run-integration-tests.sh script is not executed since it's intended >>> to run from the systemd build directory on the host machine. >>> >>> The rootfsoverlay from [1] is removed since it contains some >>> customization not needed for the tests. >>> >>> Some tests needs a high entropy level, otherwise they are stuck. >>> Install rng-tools and add -device virtio-rng-pci in qemu command line. >>> >>> In order to run as many tests as possible, activate as many systemd >>> options as possible. cgroupv2 is enabled from the kernel command >>> line to pass test-bfp-device test. >>> >>> Use the latest LTS kernel 5.4. >>> >>> Some unit files used by the systemd testsuite are using some program >>> functionnality not implemented by the busybox variant (grep, find). >>> >>> The stat command with custom format (-c) and display of filesystem >> status (-f) >>> used by exec-protecthome-tmpfs-vs-protectsystem-strict.service can be >> provided >>> by busybox or coreutils. Add a busybox config fragment to add "stat -fc" >> since >>> it's not enabled by the busybox defconfig used by Buildroot. >>> >>> The ionice command used by exec-ioschedulingclass-none.service is >> provided by >>> util-linux schedutils. >>> >>> libcap tools needed to provide capsh binary for test-execute. >>> >>> Skipped tests: >>> test-barrier: This test requires a baremetal machine. >>> test-bus-chat: This test requires an user account. >>> >>> Tested on gitlab: >>> https://gitlab.com/kubu93/buildroot/pipelines/137689982 >>> >>> [1] https://github.com/boucman/buildroot-systemd >>> >>> Signed-off-by: Romain Naour >>> Cc: J?r?my Rosen >>> Cc: Adam Duskett >>> Cc: Maxime Hadjinlian >>> Cc: Yann E. MORIN >>> --- >>> On my machine, the runtime test is completed in 287.761s. >>> >>> OK: 203 SKIP: 2 FAIL: 0 >>> --- >>> .../testing/conf/busybox-stat-fragment.config | 3 + >>> .../package/br2-external/systemd/Config.in | 0 >>> .../br2-external/systemd/external.desc | 2 + >>> .../package/br2-external/systemd/external.mk | 5 + >>> support/testing/tests/package/test_systemd.py | 123 ++++++++++++++++++ >>> .../test_systemd/systemd-kernel.config | 111 ++++++++++++++++ >>> 6 files changed, 244 insertions(+) >>> create mode 100644 support/testing/conf/busybox-stat-fragment.config >>> create mode 100644 >> support/testing/tests/package/br2-external/systemd/Config.in >>> create mode 100644 >> support/testing/tests/package/br2-external/systemd/external.desc >>> create mode 100644 support/testing/tests/package/br2-external/systemd/ >> external.mk >>> create mode 100644 support/testing/tests/package/test_systemd.py >>> create mode 100644 >> support/testing/tests/package/test_systemd/systemd-kernel.config >>> >>> diff --git a/support/testing/conf/busybox-stat-fragment.config >> b/support/testing/conf/busybox-stat-fragment.config >>> new file mode 100644 >>> index 0000000000..55f64c761f >>> --- /dev/null >>> +++ b/support/testing/conf/busybox-stat-fragment.config >>> @@ -0,0 +1,3 @@ >>> +CONFIG_STAT=y >>> +CONFIG_FEATURE_STAT_FORMAT=y >>> +CONFIG_FEATURE_STAT_FILESYSTEM=y >>> diff --git >> a/support/testing/tests/package/br2-external/systemd/Config.in >> b/support/testing/tests/package/br2-external/systemd/Config.in >>> new file mode 100644 >>> index 0000000000..e69de29bb2 >>> diff --git >> a/support/testing/tests/package/br2-external/systemd/external.desc >> b/support/testing/tests/package/br2-external/systemd/external.desc >>> new file mode 100644 >>> index 0000000000..2c7317f301 >>> --- /dev/null >>> +++ b/support/testing/tests/package/br2-external/systemd/external.desc >>> @@ -0,0 +1,2 @@ >>> +name: BUILDROOT_SYSTEMD_TESTSUITE >>> +desc: Buildroot to easily test systemd changes or changes to the >> systemd recipe in buildroot >>> diff --git a/support/testing/tests/package/br2-external/systemd/ >> external.mk b/support/testing/tests/package/br2-external/systemd/ >> external.mk >>> new file mode 100644 >>> index 0000000000..780d79153b >>> --- /dev/null >>> +++ b/support/testing/tests/package/br2-external/systemd/external.mk >>> @@ -0,0 +1,5 @@ >>> +# Append SYSTEMD_CONF_OPTS from this BR2_EXTERNAL due to include order >> in the Buildroot main Makefile: >>> +# -include $(PACKAGE_OVERRIDE_FILE) >>> +# -include $(sort $(wildcard package/*/*.mk)) >>> +# include $(BR2_EXTERNAL_FILE) >>> +SYSTEMD_CONF_OPTS += -Dslow-tests=true -Dinstall-tests=true -Dtests=true >>> diff --git a/support/testing/tests/package/test_systemd.py >> b/support/testing/tests/package/test_systemd.py >>> new file mode 100644 >>> index 0000000000..891c464652 >>> --- /dev/null >>> +++ b/support/testing/tests/package/test_systemd.py >>> @@ -0,0 +1,123 @@ >>> +import os >>> + >>> +import infra.basetest >>> + >>> +SYSTEMD_TIMEOUT = 400 >>> + >>> +# https://www.freedesktop.org/wiki/Software/systemd/VirtualizedTesting/ >>> +# Some unit files used by the systemd testsuite are using some program >> functionnality >>> +# not implemented by the busybox variant (grep, find). >>> +# The stat command with custom format (-c) and display of filesystem >> status (-f) used by >>> +# exec-protecthome-tmpfs-vs-protectsystem-strict.service can be >> provided by busybox or coreutils. >>> +# The ionice command used by exec-ioschedulingclass-none.service is >> provided by util-linux schedutils. >>> +# libcap tools needed to provide capsh binary for test-execute. >>> + >>> +# Skipped tests: >>> +# test-barrier: This test requires a baremetal machine. >>> +# test-bus-chat: This test requires an user account. >>> + >>> + >>> +class TestSystemd(infra.basetest.BRTest): >>> + br2_external = >> [infra.filepath("tests/package/br2-external/systemd")] >>> + config = \ >>> + """ >>> + BR2_x86_core2=y >>> + BR2_TOOLCHAIN_EXTERNAL=y >>> + BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y >>> + BR2_TOOLCHAIN_EXTERNAL_URL=" >> http://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2020.02-2.tar.bz2 >> " >>> + BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y >>> + BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y >>> + BR2_TOOLCHAIN_EXTERNAL_CXX=y >>> + BR2_INIT_SYSTEMD=y >>> + BR2_SYSTEM_BIN_SH_BASH=y >>> + BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" >>> + BR2_SYSTEM_DHCP="eth0" >>> + BR2_ENABLE_LOCALE_WHITELIST="C en_US C_UTF8 fr_FR" >>> + BR2_SYSTEM_ENABLE_NLS=y >>> + BR2_LINUX_KERNEL=y >>> + BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.32" >>> + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y >>> + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" >>> + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{}" >>> + BR2_PACKAGE_FINDUTILS=y >>> + BR2_PACKAGE_GREP=y >>> + BR2_PACKAGE_RNG_TOOLS=y >>> + BR2_PACKAGE_PYTHON3=y >>> + BR2_PACKAGE_GNUTLS=y >>> + BR2_PACKAGE_LIBQRENCODE=y >>> + BR2_PACKAGE_LIBXKBCOMMON=y >>> + BR2_PACKAGE_LIBIDN2=y >>> + BR2_PACKAGE_ELFUTILS=y >>> + BR2_PACKAGE_ELFUTILS_PROGS=y >>> + BR2_PACKAGE_LIBCAP_TOOLS=y >>> + BR2_PACKAGE_LIBCGROUP=y >>> + BR2_PACKAGE_LIBCGROUP_TOOLS=y >>> + BR2_PACKAGE_LIBSECCOMP=y >>> + BR2_PACKAGE_LINUX_PAM=y >>> + BR2_PACKAGE_P11_KIT=y >>> + BR2_PACKAGE_LIBSELINUX=y >>> + BR2_PACKAGE_PCRE2=y >>> + BR2_PACKAGE_IPTABLES=y >>> + BR2_PACKAGE_BASH_COMPLETION=y >>> + BR2_PACKAGE_ACL=y >>> + BR2_PACKAGE_AUDIT=y >>> + BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y >>> + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y >>> + BR2_PACKAGE_SYSTEMD_BACKLIGHT=y >>> + BR2_PACKAGE_SYSTEMD_BINFMT=y >>> + BR2_PACKAGE_SYSTEMD_COREDUMP=y >>> + BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y >>> + BR2_PACKAGE_SYSTEMD_HIBERNATE=y >>> + BR2_PACKAGE_SYSTEMD_HOMED=y >>> + BR2_PACKAGE_SYSTEMD_IMPORTD=y >>> + BR2_PACKAGE_SYSTEMD_LOCALED=y >>> + BR2_PACKAGE_SYSTEMD_LOGIND=y >>> + BR2_PACKAGE_SYSTEMD_MACHINED=y >>> + BR2_PACKAGE_SYSTEMD_POLKIT=y >>> + BR2_PACKAGE_SYSTEMD_QUOTACHECK=y >>> + BR2_PACKAGE_SYSTEMD_RANDOMSEED=y >>> + BR2_PACKAGE_SYSTEMD_REPART=y >>> + BR2_PACKAGE_SYSTEMD_RFKILL=y >>> + BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT=y >>> + BR2_PACKAGE_SYSTEMD_SYSUSERS=y >>> + BR2_PACKAGE_SYSTEMD_USERDB=y >>> + BR2_PACKAGE_UTIL_LINUX_MINIX=y >>> + BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y >>> + BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y >>> + BR2_PACKAGE_UTIL_LINUX_UNSHARE=y >>> + BR2_TARGET_ROOTFS_EXT2=y >>> + BR2_TARGET_ROOTFS_EXT2_4=y >>> + BR2_TARGET_ROOTFS_EXT2_SIZE="1G" >>> + # BR2_TARGET_ROOTFS_TAR is not set >>> + """.format( >>> + >> infra.filepath("tests/package/test_systemd/systemd-kernel.config"), >>> + infra.filepath("conf/busybox-stat-fragment.config")) >>> + >>> + def login(self): >>> + img = os.path.join(self.builddir, "images", "rootfs.ext2") >>> + kern = os.path.join(self.builddir, "images", "bzImage") >>> + >>> + # the complete boot with systemd takes more time than what the >> default multipler permits >>> + self.emulator.timeout_multiplier *= 10 >>> + >>> + # systemd testsuite overallocate memory and the minimum that >> seemed to work was 1G >>> + # systemd.unified_cgroup_hierarchy=1 for cgroup v2 and >> test-execute >>> + self.emulator.boot(arch="i386", >>> + kernel=kern, >>> + kernel_cmdline=["root=/dev/vda", "ro", >> "console=ttyS0", >>> + >> "systemd.unified_cgroup_hierarchy=1", >>> + "audit=0 >> cgroup_no_v1=\"all\""], >>> + options=["-M", "pc", "-m", "1G", "-device", >>> + "virtio-rng-pci", "-drive", >>> + >> "file={},if=virtio,format=raw".format(img)]) >>> + self.emulator.login() >>> + >>> + def test_run(self): >>> + timeout = SYSTEMD_TIMEOUT * self.emulator.timeout_multiplier >>> + >>> + self.login() >>> + >>> + cmd = "/usr/lib/systemd/tests/run-unit-tests.py --unsafe" >>> + _, exit_code = self.emulator.run(cmd, timeout) >>> + self.assertEqual(exit_code, 0) >>> diff --git >> a/support/testing/tests/package/test_systemd/systemd-kernel.config >> b/support/testing/tests/package/test_systemd/systemd-kernel.config >>> new file mode 100644 >>> index 0000000000..0c4efed77f >>> --- /dev/null >>> +++ b/support/testing/tests/package/test_systemd/systemd-kernel.config >>> @@ -0,0 +1,111 @@ >>> +CONFIG_SYSVIPC=y >>> +CONFIG_POSIX_MQUEUE=y >>> +CONFIG_PSI=y >>> +CONFIG_CGROUPS=y >>> +CONFIG_MEMCG=y >>> +CONFIG_MEMCG_SWAP=y >>> +# CONFIG_MEMCG_SWAP_ENABLED is not set >>> +CONFIG_BLK_CGROUP=y >>> +CONFIG_CGROUP_SCHED=y >>> +CONFIG_CFS_BANDWIDTH=y >>> +CONFIG_RT_GROUP_SCHED=y >>> +CONFIG_CGROUP_PIDS=y >>> +CONFIG_CGROUP_RDMA=y >>> +CONFIG_CGROUP_FREEZER=y >>> +CONFIG_CGROUP_HUGETLB=y >>> +CONFIG_CPUSETS=y >>> +CONFIG_CGROUP_DEVICE=y >>> +CONFIG_CGROUP_CPUACCT=y >>> +CONFIG_CGROUP_PERF=y >>> +CONFIG_CGROUP_BPF=y >>> +CONFIG_NAMESPACES=y >>> +CONFIG_USER_NS=y >>> +CONFIG_CHECKPOINT_RESTORE=y >>> +CONFIG_EXPERT=y >>> +CONFIG_BPF_SYSCALL=y >>> +CONFIG_USERFAULTFD=y >>> +CONFIG_SMP=y >>> +CONFIG_HYPERVISOR_GUEST=y >>> +CONFIG_PARAVIRT=y >>> +CONFIG_DMI_SYSFS=y >>> +CONFIG_MODULES=y >>> +CONFIG_MODULE_UNLOAD=y >>> +CONFIG_BLK_CGROUP_IOLATENCY=y >>> +CONFIG_BINFMT_MISC=y >>> +CONFIG_NET=y >>> +CONFIG_PACKET=y >>> +CONFIG_UNIX=y >>> +CONFIG_INET=y >>> +CONFIG_NET_SCHED=y >>> +CONFIG_NET_CLS_CGROUP=y >>> +CONFIG_CGROUP_NET_PRIO=y >>> +# CONFIG_WIRELESS is not set >>> +CONFIG_PCI=y >>> +CONFIG_DEVTMPFS=y >>> +CONFIG_DEVTMPFS_MOUNT=y >>> +CONFIG_VIRTIO_BLK=y >>> +CONFIG_BLK_DEV_SD=y >>> +CONFIG_SCSI_VIRTIO=y >>> +CONFIG_ATA=y >>> +CONFIG_ATA_PIIX=y >>> +CONFIG_NETDEVICES=y >>> +CONFIG_VIRTIO_NET=y >>> +CONFIG_NE2K_PCI=y >>> +CONFIG_8139CP=y >>> +# CONFIG_WLAN is not set >>> +CONFIG_INPUT_EVDEV=y >>> +CONFIG_INPUT_MISC=y >>> +CONFIG_INPUT_UINPUT=m >>> +CONFIG_SERIAL_8250=y >>> +CONFIG_SERIAL_8250_CONSOLE=y >>> +CONFIG_VIRTIO_CONSOLE=y >>> +CONFIG_HW_RANDOM=y >>> +CONFIG_HW_RANDOM_VIRTIO=y >>> +CONFIG_DRM=y >>> +CONFIG_DRM_QXL=y >>> +CONFIG_DRM_BOCHS=y >>> +CONFIG_DRM_VIRTIO_GPU=y >>> +CONFIG_FRAMEBUFFER_CONSOLE=y >>> +CONFIG_SOUND=y >>> +CONFIG_SND=y >>> +CONFIG_SND_HDA_INTEL=y >>> +CONFIG_SND_HDA_GENERIC=y >>> +CONFIG_HID_A4TECH=y >>> +CONFIG_HID_APPLE=y >>> +CONFIG_HID_BELKIN=y >>> +CONFIG_HID_CHERRY=y >>> +CONFIG_HID_CHICONY=y >>> +CONFIG_HID_CYPRESS=y >>> +CONFIG_HID_EZKEY=y >>> +CONFIG_HID_ITE=y >>> +CONFIG_HID_KENSINGTON=y >>> +CONFIG_HID_LOGITECH=y >>> +CONFIG_HID_REDRAGON=y >>> +CONFIG_HID_MICROSOFT=y >>> +CONFIG_HID_MONTEREY=y >>> +CONFIG_USB=y >>> +CONFIG_USB_XHCI_HCD=y >>> +CONFIG_USB_EHCI_HCD=y >>> +CONFIG_USB_UHCI_HCD=y >>> +CONFIG_USB_STORAGE=y >>> +CONFIG_VIRTIO_PCI=y >>> +CONFIG_VIRTIO_BALLOON=y >>> +CONFIG_VIRTIO_INPUT=y >>> +CONFIG_VIRTIO_MMIO=y >>> +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y >>> +CONFIG_EXT4_FS=y >>> +CONFIG_EXT4_FS_POSIX_ACL=y >>> +CONFIG_EXT4_FS_SECURITY=y >>> +CONFIG_FANOTIFY=y >>> +CONFIG_AUTOFS4_FS=y >>> +CONFIG_TMPFS=y >>> +CONFIG_TMPFS_POSIX_ACL=y >>> +CONFIG_HUGETLBFS=y >>> +CONFIG_SECURITY=y >>> +CONFIG_SECURITY_SMACK=y >>> +CONFIG_DEFAULT_SECURITY_DAC=y >>> +CONFIG_CRYPTO_HMAC=y >>> +CONFIG_CRYPTO_SHA256=y >>> +CONFIG_CRYPTO_USER_API_HASH=y >>> +CONFIG_DEBUG_FS=y >>> +# CONFIG_FTRACE is not set >>> -- >>> 2.25.3 >>> >> >> -- >> >> .-----------------.--------------------.------------------.--------------------. >> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' >> conspiracy: | >> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ >> | >> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is >> no | >> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v >> conspiracy. | >> >> '------------------------------^-------^------------------^--------------------' >> > > > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > From romain.naour at smile.fr Sat Jan 8 15:10:06 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 16:10:06 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: References: <20201126144745.502228-1-nolange79@gmail.com> <06dd49b7-5abc-7a18-2d56-3f69e624e8b7@smile.fr> Message-ID: Le 08/01/2022 ? 15:33, Norbert Lange a ?crit?: > Am Sa., 8. Jan. 2022 um 12:55 Uhr schrieb Romain Naour : >> [...] >>> >>> +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) >>> +define SYSTEMD_LOCALE_PURGE_CATALOGS >>> + # go through all files with scheme ..catalog >>> + # and remove those where is not in LOCALE_NOPURGE >>> + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ >> >> Why not "systemd.*.catalog" ? >> >> On my system, all catalog files with are nammed starting with "systemd." > > Cause the idea is that other packages could extend log messages by > dropping catalogs there, > there might be a dbus-broker.catalog for example, see [1]. dbus-broker.catalog doesn't match the find regex '*.*.catalog', this file is not removed. > >> >>> + do \ >>> + basename=$${cfile##*/}; \ >>> + basename=$${basename%.catalog}; \ >>> + langext=$${basename#*.}; \ >>> + [ "$$langext" = "$${basename}" ] && continue; \ >>> + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ >>> + rm -f "$$cfile"; \ >>> + done >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS >>> +endif >>> + >>> +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) >>> +define SYSTEMD_UPDATE_CATALOGS >>> + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog >>> + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ >>> + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database >>> + rm $(TARGET_DIR)/var/lib/systemd/catalog/database >>> + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ >>> + $(TARGET_DIR)/var/lib/systemd/catalog/database >>> + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ >>> + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS >>> +endif >>> + >>> +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>> + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ >> >> So we remove this directory. >> >> Why adding SYSTEMD_LOCALE_PURGE_CATALOGS then ? > > The order is relevant, assuming LOCALE_NOPURGE = de, then > > - first remove the source-files for other languages > (SYSTEMD_LOCALE_PURGE_CATALOGS) > - then build and install the database from the source-files with the > chosen languages > - then remove all language source-files Ok, maybe a comment would be necessary here. Best regards, Romain > >> >> Best regards, >> Romain >> >> >>> + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ >>> + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>> + >>> define SYSTEMD_PRESET_ALL >>> $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all >>> endef >>> >> > > Norbert > > [1] - https://github.com/bus1/dbus-broker/tree/main/src/catalog > From arnout at mind.be Sat Jan 8 15:11:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:11:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: fix build with libexecinfo In-Reply-To: <20220107204754.1462472-1-fontaine.fabrice@gmail.com> References: <20220107204754.1462472-1-fontaine.fabrice@gmail.com> Message-ID: On 07/01/2022 21:47, Fabrice Fontaine wrote: > Fix build failure raised since the addition of the libexecinfo package > in commit eea8ba446c10701a273432552108d80fb2224ef4 > > Fixes: > - Not autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/domoticz/domoticz.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk > index 826e6f5e58..0d1088d395 100644 > --- a/package/domoticz/domoticz.mk > +++ b/package/domoticz/domoticz.mk > @@ -41,6 +41,11 @@ DOMOTICZ_CONF_OPTS += \ > -DUSE_BUILTIN_SQLITE=OFF \ > -DUSE_BUILTIN_MQTT=OFF > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +DOMOTICZ_DEPENDENCIES += libexecinfo > +DOMOTICZ_CONF_OPTS += -DEXECINFO_LIBRARIES=-lexecinfo > +endif > + > ifeq ($(BR2_PACKAGE_LIBUSB),y) > DOMOTICZ_DEPENDENCIES += libusb > DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON > From arnout at mind.be Sat Jan 8 15:11:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:11:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-vdr-vnsi: bump version to 19.0.2-Matrix In-Reply-To: <20220107213253.75709-1-bernd.kuhls@t-online.de> References: <20220107213253.75709-1-bernd.kuhls@t-online.de> Message-ID: On 07/01/2022 22:32, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- > package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > index c6223fc8e4..4cd1f7ad6b 100644 > --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz > +sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > index b281f00f19..65e69d2b23 100644 > --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix > +KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix > KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) > KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ > KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md > From arnout at mind.be Sat Jan 8 15:11:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:11:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: bump to version 5.0.1 In-Reply-To: <20220107220707.1679540-1-fontaine.fabrice@gmail.com> References: <20220107220707.1679540-1-fontaine.fabrice@gmail.com> Message-ID: <2cd945fe-b535-fd6c-3439-c65c7c9a5c44@mind.be> On 07/01/2022 23:07, Fabrice Fontaine wrote: > Drop first patch (already in version) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/mp4v2/0001-Fix-GCC7-build.patch | 33 ------------------- > ...p4track.cpp-replace-nullptr-by-NULL.patch} | 2 +- > ...atic-cast-to-unsigned-int-for-cases.patch} | 0 > package/mp4v2/mp4v2.hash | 2 +- > package/mp4v2/mp4v2.mk | 2 +- > 5 files changed, 3 insertions(+), 36 deletions(-) > delete mode 100644 package/mp4v2/0001-Fix-GCC7-build.patch > rename package/mp4v2/{0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch => 0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch} (96%) > rename package/mp4v2/{0003-Static-cast-to-unsigned-int-for-cases.patch => 0002-Static-cast-to-unsigned-int-for-cases.patch} (100%) > > diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch > deleted file mode 100644 > index 4e39be4a79..0000000000 > --- a/package/mp4v2/0001-Fix-GCC7-build.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= > -Date: Wed, 8 Feb 2017 00:56:32 +0000 > -Subject: [PATCH] Fix GCC7 build > - > -if (*pSlash != '\0') { > - > -As it stands the body of that if will always execute and when there are > -no encoding parameters ppEncodingParams will be returned as a pointer to > -an empty string rather than as a null pointer > - > -Signed-off-by: Peter Korsgaard > -[Upstream status: https://github.com/TechSmith/mp4v2/pull/36] > ---- > - src/rtphint.cpp | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/rtphint.cpp b/src/rtphint.cpp > -index e07309d..1eb01f5 100644 > ---- a/src/rtphint.cpp > -+++ b/src/rtphint.cpp > -@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( > - pSlash = strchr(pSlash, '/'); > - if (pSlash != NULL) { > - pSlash++; > -- if (pSlash != '\0') { > -+ if (*pSlash != '\0') { > - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); > - *ppEncodingParams = (char *)MP4Calloc(length + 1); > - strncpy(*ppEncodingParams, pSlash, length); > --- > -2.11.0 > - > diff --git a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > similarity index 96% > rename from package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch > rename to package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > index 72bae463c9..c279b9c56a 100644 > --- a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch > +++ b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > @@ -16,7 +16,7 @@ Fixes: > - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 > > Signed-off-by: Fabrice Fontaine > -[Upstream status: not sent yet] > +[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] > --- > src/mp4track.cpp | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > diff --git a/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch > similarity index 100% > rename from package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch > rename to package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch > diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash > index 85fce49384..7aa5402c8f 100644 > --- a/package/mp4v2/mp4v2.hash > +++ b/package/mp4v2/mp4v2.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz > +sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz > sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING > diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk > index 478d10d472..6d29228a13 100644 > --- a/package/mp4v2/mp4v2.mk > +++ b/package/mp4v2/mp4v2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MP4V2_VERSION = 4.1.3 > +MP4V2_VERSION = 5.0.1 > MP4V2_SITE = \ > $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) > MP4V2_INSTALL_STAGING = YES > From arnout at mind.be Sat Jan 8 15:12:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:12:13 +0100 Subject: [Buildroot] [PATCH v1 next] package/mstpd: bump version to 0.1.0 In-Reply-To: <20220107222644.1612206-1-colin.foster@in-advantage.com> References: <20220107222644.1612206-1-colin.foster@in-advantage.com> Message-ID: <89aa2f7a-5293-89ec-cdeb-89039cb1992c@mind.be> On 07/01/2022 23:26, Colin Foster wrote: > Shortly after MSTPd was added, version 0.1.0 was released. Update to the > latest version. > > Signed-off-by: Colin Foster Applied to master, thanks. Regards, Arnout > --- > package/mstpd/mstpd.hash | 1 + > package/mstpd/mstpd.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/mstpd/mstpd.hash b/package/mstpd/mstpd.hash > index fd76b959db..64e946d6d1 100644 > --- a/package/mstpd/mstpd.hash > +++ b/package/mstpd/mstpd.hash > @@ -1,4 +1,5 @@ > # locally computed > sha256 91a1862548b5b509caa2e96e5fb9912bc98d4d58cc98e99a577824735756c14d mstpd-0.0.9.tar.gz > +sha256 03d1ff4ca189d54322562cb2891888768af719d2c73ceafa5f1ca96133dffeb2 mstpd-0.1.0.tar.gz > sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 LICENSE > sha256 c5cfd44652276184374adf454150d436ce958ce50acc4ef9ccb3605a5ca7a9d3 hmac_md5.c > diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk > index a870352869..907d094242 100644 > --- a/package/mstpd/mstpd.mk > +++ b/package/mstpd/mstpd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MSTPD_VERSION = 0.0.9 > +MSTPD_VERSION = 0.1.0 > MSTPD_SITE = $(call github,mstpd,mstpd,$(MSTPD_VERSION)) > MSTPD_AUTORECONF = YES > MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5) > From arnout at mind.be Sat Jan 8 15:12:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:12:31 +0100 Subject: [Buildroot] [PATCH] support/scripts/generate-gitlab-ci-yml: ignore branch name prefix containing a single hyphen In-Reply-To: <20220107223955.148266-1-romain.naour@smile.fr> References: <20220107223955.148266-1-romain.naour@smile.fr> Message-ID: On 07/01/2022 23:39, Romain Naour wrote: > The commit [1] added a sed command used to retreive a pattern > to keep only defconfigs whose name start with the pattern. > > "-defconfigs-" > > The sed command doesn't work as expected if contains a > single hyphen [2]: > > "qemu-6.2.0-defconfigs-qemu" > > Update the sed command to ignore completely the part before > "-defconfigs-". > > [1] 65d2f04c012af492a9b9da04dfa3b3cbd20347f1 > [2] http://lists.busybox.net/pipermail/buildroot/2022-January/632507.html > > Signed-off-by: Romain Naour > Cc: Thomas Petazzoni Applied to master, thanks. Regards, Arnout > --- > support/scripts/generate-gitlab-ci-yml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml > index 3e0c68091b..bd79807914 100755 > --- a/support/scripts/generate-gitlab-ci-yml > +++ b/support/scripts/generate-gitlab-ci-yml > @@ -66,8 +66,8 @@ gen_tests() { > (*-defconfigs) > do_defconfigs=base > ;; > - (*-defconfigs-*) > - pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%[^\-]*-defconfigs-\(.*\)%\1%') > + (*-defconfigs-*) > + pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%^.*-defconfigs-\(.*\)%\1%') > defconfigs=( $(cd configs; LC_ALL=C ls -1 | grep ^${pattern}) ) > do_defconfigs=base > ;; > From arnout at mind.be Sat Jan 8 15:12:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:12:44 +0100 Subject: [Buildroot] [PATCH] package/python-numpy: simplify PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES In-Reply-To: <20220107231253.1546336-1-thomas.petazzoni@bootlin.com> References: <20220107231253.1546336-1-thomas.petazzoni@bootlin.com> Message-ID: <3f5b1b5f-5c4d-0968-923b-43b8c004ca49@mind.be> On 08/01/2022 00:12, Thomas Petazzoni wrote: > The PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES macro was introduced in > commit > 2426002d6fc81d0b023e3f3b3ee4e94ab29438cb ("package/python-numpy: fixup > npymath.ini for numpy extensions"). > > However, it turns out that by using $(PYTHON3_PATH), we can simplify > the intermediate variables, to the point where they are no longer > needed. Not having the intermediate variables makes the logic a bit > easier to understand. > > Also, the logic is changed to use a single sed expression, which we > pass to $(SED). > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Arnout > --- > package/python-numpy/python-numpy.mk | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk > index f367b556ef..9e8b032b78 100644 > --- a/package/python-numpy/python-numpy.mk > +++ b/package/python-numpy/python-numpy.mk > @@ -40,12 +40,9 @@ endef > # it uses host libraries (like libnpymath.a). > # So, the numpy distutils extension packages would explicitly link this > # config path for their package environment. > -PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy > -PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config > define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES > - sed -e '/^pkgdir=/d' \ > - -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ > - -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini > + $(SED) '/^pkgdir=/d;/^prefix=/i pkgdir=$(PYTHON3_PATH)/site-packages/numpy/core' \ > + $(PYTHON3_PATH)/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini > endef > PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES > > From arnout at mind.be Sat Jan 8 15:12:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:12:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmicrohttpd: fix pthread detection In-Reply-To: <20220108075018.22567-1-bernd.kuhls@t-online.de> References: <20220108075018.22567-1-bernd.kuhls@t-online.de> Message-ID: <37ccb64c-8d9b-ae34-1822-ed3aad14a047@mind.be> On 08/01/2022 08:50, Bernd Kuhls wrote: > Fix autobuild failures after bumping the package to 0.9.75 in commit > 8ec001b467e22904c0a7ec5780d83afd44ad78f3: > > conftest.c:64:26: error: #error "_REENTRANT must be defined" > > Fixes: > http://autobuild.buildroot.net/results/f76/f7668104dd64a93f0b343ce3ebbe50b12584184d/ > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libmicrohttpd/libmicrohttpd.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk > index f75178bc0a..344e1443fd 100644 > --- a/package/libmicrohttpd/libmicrohttpd.mk > +++ b/package/libmicrohttpd/libmicrohttpd.mk > @@ -12,6 +12,10 @@ LIBMICROHTTPD_INSTALL_STAGING = YES > LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples > LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 > > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) > +LIBMICROHTTPD_CFLAGS += -D_REENTRANT > +endif > + > LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" > > ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) > From arnout at mind.be Sat Jan 8 15:13:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:13:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: bump version to 5.15.1 In-Reply-To: <20220108091349.918259-1-bernd.kuhls@t-online.de> References: <20220108091349.918259-1-bernd.kuhls@t-online.de> Message-ID: On 08/01/2022 10:13, Bernd Kuhls wrote: > Reformatted hashes. > > Upstream relicensed libbtrfsutil to LGPL-2.1+ and removed > libbtrfsutil/COPYING.LESSER: > https://github.com/kdave/btrfs-progs/commit/9e30f779e3cbf12a88ebe309ee371851fdfd3aa0 > > Add optional support for udev: > https://github.com/kdave/btrfs-progs/commit/f74ebeee5c239e007a0144e93f0eee26949a85ec > https://github.com/kdave/btrfs-progs/commit/1d0fa3781ef9374388b683cf96f9c48245025cf6 > > Changelog: > https://github.com/kdave/btrfs-progs/blob/master/CHANGES > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/btrfs-progs/btrfs-progs.hash | 7 +++---- > package/btrfs-progs/btrfs-progs.mk | 15 +++++++++++---- > 2 files changed, 14 insertions(+), 8 deletions(-) > > diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash > index aac144963e..339eab02aa 100644 > --- a/package/btrfs-progs/btrfs-progs.hash > +++ b/package/btrfs-progs/btrfs-progs.hash > @@ -1,6 +1,5 @@ > # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc > -sha256 d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137 btrfs-progs-v5.11.tar.xz > +sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz > # Locally computed > -sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING > -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING > -sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 libbtrfsutil/COPYING.LESSER > +sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING > +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index 96456d1238..50c8e59e50 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -4,14 +4,13 @@ > # > ################################################################################ > > -BTRFS_PROGS_VERSION = 5.11 > +BTRFS_PROGS_VERSION = 5.15.1 > BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs > BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz > BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib > BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python > -BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-3.0+ (libbtrfsutil) > -BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING \ > - libbtrfsutil/COPYING.LESSER > +BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) > +BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING > BTRFS_PROGS_INSTALL_STAGING = YES > > # Doesn't autodetect static-only and tries to build both > @@ -31,9 +30,17 @@ else > BTRFS_PROGS_CONF_OPTS += --disable-convert > endif > > +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > +BTRFS_PROGS_CONF_OPTS += --enable-libudev > +BTRFS_PROGS_DEPENDENCIES += udev > +else > +BTRFS_PROGS_CONF_OPTS += --disable-libudev > +endif > + > HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib > HOST_BTRFS_PROGS_CONF_OPTS = \ > --disable-backtrace \ > + --disable-libudev \ > --disable-zstd \ > --disable-python \ > --disable-convert > From arnout at mind.be Sat Jan 8 15:13:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:13:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/eudev/: bump version to 3.2.11 In-Reply-To: <20220108092554.989783-1-bernd.kuhls@t-online.de> References: <20220108092554.989783-1-bernd.kuhls@t-online.de> Message-ID: <377ced22-7ea9-db41-4e7c-1df864d48308@mind.be> On 08/01/2022 10:25, Bernd Kuhls wrote: > Switch upstream URL to github due to changes in project ownership: > https://github.com/eudev-project/eudev/commit/06ac38e2b876427dfa2ef47e74b46b99927dfe34 > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/eudev/Config.in | 2 +- > package/eudev/eudev.hash | 4 +--- > package/eudev/eudev.mk | 4 ++-- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/package/eudev/Config.in b/package/eudev/Config.in > index 0e5bd0cee9..6e7bbe4648 100644 > --- a/package/eudev/Config.in > +++ b/package/eudev/Config.in > @@ -16,7 +16,7 @@ config BR2_PACKAGE_EUDEV > Upstart, older kernels, various toolchains and anything else > required by users and various distributions. > > - https://wiki.gentoo.org/wiki/Project:Eudev > + https://github.com/eudev-project/eudev > > if BR2_PACKAGE_EUDEV > > diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash > index fda0481351..fe6c7ef008 100644 > --- a/package/eudev/eudev.hash > +++ b/package/eudev/eudev.hash > @@ -1,5 +1,3 @@ > -# From http://dev.gentoo.org/~blueness/eudev/ > -md5 60b135a189523f333cea5f71a3345c8d eudev-3.2.10.tar.gz > # Locally calculated > -sha256 87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz > +sha256 19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b eudev-3.2.11.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING > diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk > index 5d18b388c7..705370689d 100644 > --- a/package/eudev/eudev.mk > +++ b/package/eudev/eudev.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -EUDEV_VERSION = 3.2.10 > -EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev > +EUDEV_VERSION = 3.2.11 > +EUDEV_SITE = https://github.com/eudev-project/eudev/releases/download/v$(EUDEV_VERSION) > EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) > EUDEV_LICENSE_FILES = COPYING > EUDEV_INSTALL_STAGING = YES > From arnout at mind.be Sat Jan 8 15:14:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:14:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/libfribidi: bump version to 1.0.11 In-Reply-To: <20220108095037.1065173-1-bernd.kuhls@t-online.de> References: <20220108095037.1065173-1-bernd.kuhls@t-online.de> Message-ID: <83ee7af9-fcfb-740f-412d-97b93787b265@mind.be> On 08/01/2022 10:50, Bernd Kuhls wrote: > Release notes: https://github.com/fribidi/fribidi/releases/tag/v1.0.11 > > Signed-off-by: Bernd Kuhls > --- Applied to master, thanks. Regards, Arnout > package/libfribidi/libfribidi.hash | 2 +- > package/libfribidi/libfribidi.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash > index 8e7eb49bcd..da25b2d24d 100644 > --- a/package/libfribidi/libfribidi.hash > +++ b/package/libfribidi/libfribidi.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01 fribidi-1.0.10.tar.xz > +sha256 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d fribidi-1.0.11.tar.xz > sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING > diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk > index 97e875b4a2..adbd786db1 100644 > --- a/package/libfribidi/libfribidi.mk > +++ b/package/libfribidi/libfribidi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBFRIBIDI_VERSION = 1.0.10 > +LIBFRIBIDI_VERSION = 1.0.11 > LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz > LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) > LIBFRIBIDI_LICENSE = LGPL-2.1+ > From arnout at mind.be Sat Jan 8 15:14:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: bump version to 1.8.1 In-Reply-To: <20220108095451.1078507-1-bernd.kuhls@t-online.de> References: <20220108095451.1078507-1-bernd.kuhls@t-online.de> Message-ID: <9e32dc06-12ef-02e9-619a-aaf2bbf4acc5@mind.be> On 08/01/2022 10:54, Bernd Kuhls wrote: > Reformatted hashes. > > Changelog: https://github.com/NLnetLabs/ldns/blob/develop/Changelog > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libldns/libldns.hash | 10 +++++----- > package/libldns/libldns.mk | 2 +- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash > index c8fb39d478..cab8b7dbdf 100644 > --- a/package/libldns/libldns.hash > +++ b/package/libldns/libldns.hash > @@ -1,7 +1,7 @@ > -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha1 > -sha1 d075a08972c0f573101fb4a6250471daaa53cb3e ldns-1.7.1.tar.gz > -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha256 > -sha256 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 ldns-1.7.1.tar.gz > +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha1 > +sha1 df19a0404a608821b571525214a18988bc88bb46 ldns-1.8.1.tar.gz > +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha256 > +sha256 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 ldns-1.8.1.tar.gz > > # Hash for license file: > -sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE > +sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE > diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk > index 9c248bbc19..7deca978da 100644 > --- a/package/libldns/libldns.mk > +++ b/package/libldns/libldns.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBLDNS_VERSION = 1.7.1 > +LIBLDNS_VERSION = 1.8.1 > LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz > LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns > LIBLDNS_LICENSE = BSD-3-Clause > From arnout at mind.be Sat Jan 8 15:14:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:14:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsoundtouch: bump version to 2.3.1 In-Reply-To: <20220108100350.1102692-1-bernd.kuhls@t-online.de> References: <20220108100350.1102692-1-bernd.kuhls@t-online.de> Message-ID: <6cfa041f-d61a-215e-246f-d0beb752f386@mind.be> On 08/01/2022 11:03, Bernd Kuhls wrote: > Updated license hash due to upstream commit: > https://codeberg.org/soundtouch/soundtouch/commit/d11a3adb2daddcdfafac2d86ec8de3b3f41d2f78 > > Updated _SITE: > https://codeberg.org/soundtouch/soundtouch/commit/d063c0d9f9d29ef1f3302fbdee2f11f997bb2bce > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libsoundtouch/libsoundtouch.hash | 4 ++-- > package/libsoundtouch/libsoundtouch.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/libsoundtouch/libsoundtouch.hash b/package/libsoundtouch/libsoundtouch.hash > index fe6a108e33..9de72521bd 100644 > --- a/package/libsoundtouch/libsoundtouch.hash > +++ b/package/libsoundtouch/libsoundtouch.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 f1ce96bac35779d3b752f4cc8696975b3d58f3deb9db47ffc45862767c2a2bdd libsoundtouch-2.2.tar.gz > -sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT > +sha256 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1 soundtouch-2.3.1.tar.gz > +sha256 84c6d82dc7de80f5b73f231edfd3ddc5b53513908117452bfa37ea36bb4b7e0a COPYING.TXT > diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk > index 8a0e807d7a..c372c32ac7 100644 > --- a/package/libsoundtouch/libsoundtouch.mk > +++ b/package/libsoundtouch/libsoundtouch.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -LIBSOUNDTOUCH_VERSION = 2.2 > -LIBSOUNDTOUCH_SITE = $(call gitlab,soundtouch,soundtouch,$(LIBSOUNDTOUCH_VERSION)) > +LIBSOUNDTOUCH_VERSION = 2.3.1 > +LIBSOUNDTOUCH_SOURCE = soundtouch-$(LIBSOUNDTOUCH_VERSION).tar.gz > +LIBSOUNDTOUCH_SITE = https://www.surina.net/soundtouch > LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ > LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT > LIBSOUNDTOUCH_AUTORECONF = YES > From arnout at mind.be Sat Jan 8 15:14:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:14:57 +0100 Subject: [Buildroot] [PATCH] package/terminology: bump to version 1.12.1 In-Reply-To: <20220108124922.157020-1-romain.naour@smile.fr> References: <20220108124922.157020-1-romain.naour@smile.fr> Message-ID: <3ecdadc4-142b-2806-69d1-43675bc81814@mind.be> On 08/01/2022 13:49, Romain Naour wrote: > See: > https://www.enlightenment.org/news/2022-01-03-terminology-1.12.1 > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Arnout > --- > package/terminology/terminology.hash | 4 ++-- > package/terminology/terminology.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash > index 7e9658482a..2ad10af76f 100644 > --- a/package/terminology/terminology.hash > +++ b/package/terminology/terminology.hash > @@ -1,3 +1,3 @@ > -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum > -sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz > +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.1.tar.xz.sha256sum > +sha256 f8ced9584c2e9ae87452ce7425fd25b2d3e122c7489785d2917890215c6b5aa9 terminology-1.12.1.tar.xz > sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING > diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk > index 787c9ad137..c3125c71ec 100644 > --- a/package/terminology/terminology.mk > +++ b/package/terminology/terminology.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TERMINOLOGY_VERSION = 1.12.0 > +TERMINOLOGY_VERSION = 1.12.1 > TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz > TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology > TERMINOLOGY_LICENSE = BSD-2-Clause > From arnout at mind.be Sat Jan 8 15:15:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:15:10 +0100 Subject: [Buildroot] [PATCH] configs/olimex_stmp157: bump U-Boot version In-Reply-To: <20220108141459.2972-1-francois.perrad@gadz.org> References: <20220108141459.2972-1-francois.perrad@gadz.org> Message-ID: <5f1bf6cc-7a01-327d-e91a-d0933924f1f2@mind.be> On 08/01/2022 15:14, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > configs/olimex_stmp157_olinuxino_lime_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig > index f54d899b3..74e7f9ba6 100644 > --- a/configs/olimex_stmp157_olinuxino_lime_defconfig > +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig > @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" > -# release-20210821, based on 2021.04 > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="acda542100fa83e4bc82634e4668f8106af37a61" > +# release-20211130, based on 2021.04 > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1c29714bc643c299e2ed4ba870be8d4538124144" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" > # BR2_TARGET_UBOOT_FORMAT_BIN is not set > BR2_TARGET_UBOOT_FORMAT_IMG=y > From arnout at mind.be Sat Jan 8 14:48:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:37 +0100 Subject: [Buildroot] [git commit] package/domoticz: fix build with libexecinfo Message-ID: <20220108150928.21B6782AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9be2c73c59c1f4082040ab0d4fce12a867edd080 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix build failure raised since the addition of the libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4 Fixes: - Not autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/domoticz/domoticz.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index ee5a41b8c1..f142791830 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -41,6 +41,11 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +DOMOTICZ_DEPENDENCIES += libexecinfo +DOMOTICZ_CONF_OPTS += -DEXECINFO_LIBRARIES=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) DOMOTICZ_DEPENDENCIES += libusb DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON From arnout at mind.be Sat Jan 8 14:48:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:40 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-vdr-vnsi: bump version to 19.0.2-Matrix Message-ID: <20220108150928.2AA2A82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff375358383f3a355b022d1061f5ad43b5920fe4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index c6223fc8e4..4cd1f7ad6b 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz +sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index b281f00f19..65e69d2b23 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Jan 8 14:48:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:48 +0100 Subject: [Buildroot] [git commit] support/scripts/generate-gitlab-ci-yml: ignore branch name prefix containing a single hyphen Message-ID: <20220108150928.43E1182DF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1cc6061fd368b987d8b03e63cd06a1f792492e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The commit [1] added a sed command used to retreive a pattern to keep only defconfigs whose name start with the pattern. "-defconfigs-" The sed command doesn't work as expected if contains a single hyphen [2]: "qemu-6.2.0-defconfigs-qemu" Update the sed command to ignore completely the part before "-defconfigs-". [1] 65d2f04c012af492a9b9da04dfa3b3cbd20347f1 [2] http://lists.busybox.net/pipermail/buildroot/2022-January/632507.html Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/generate-gitlab-ci-yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index 3e0c68091b..bd79807914 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -66,8 +66,8 @@ gen_tests() { (*-defconfigs) do_defconfigs=base ;; - (*-defconfigs-*) - pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%[^\-]*-defconfigs-\(.*\)%\1%') + (*-defconfigs-*) + pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%^.*-defconfigs-\(.*\)%\1%') defconfigs=( $(cd configs; LC_ALL=C ls -1 | grep ^${pattern}) ) do_defconfigs=base ;; From arnout at mind.be Sat Jan 8 14:48:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:51 +0100 Subject: [Buildroot] [git commit] package/python-numpy: simplify PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES Message-ID: <20220108150928.4CA9482DF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3093444e9cf0c5343677799c9130d3aeb342dc3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES macro was introduced in commit 2426002d6fc81d0b023e3f3b3ee4e94ab29438cb ("package/python-numpy: fixup npymath.ini for numpy extensions"). However, it turns out that by using $(PYTHON3_PATH), we can simplify the intermediate variables, to the point where they are no longer needed. Not having the intermediate variables makes the logic a bit easier to understand. Also, the logic is changed to use a single sed expression, which we pass to $(SED). Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-numpy/python-numpy.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index f367b556ef..9e8b032b78 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -40,12 +40,9 @@ endef # it uses host libraries (like libnpymath.a). # So, the numpy distutils extension packages would explicitly link this # config path for their package environment. -PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy -PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES - sed -e '/^pkgdir=/d' \ - -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ - -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini + $(SED) '/^pkgdir=/d;/^prefix=/i pkgdir=$(PYTHON3_PATH)/site-packages/numpy/core' \ + $(PYTHON3_PATH)/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini endef PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES From arnout at mind.be Sat Jan 8 14:48:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:46 +0100 Subject: [Buildroot] [git commit] package/mstpd: bump version to 0.1.0 Message-ID: <20220108150928.3BD5582AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7244efa8284627412a0385d9f07c2110717ee2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Shortly after MSTPd was added, version 0.1.0 was released. Update to the latest version. Signed-off-by: Colin Foster Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mstpd/mstpd.hash | 1 + package/mstpd/mstpd.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mstpd/mstpd.hash b/package/mstpd/mstpd.hash index fd76b959db..64e946d6d1 100644 --- a/package/mstpd/mstpd.hash +++ b/package/mstpd/mstpd.hash @@ -1,4 +1,5 @@ # locally computed sha256 91a1862548b5b509caa2e96e5fb9912bc98d4d58cc98e99a577824735756c14d mstpd-0.0.9.tar.gz +sha256 03d1ff4ca189d54322562cb2891888768af719d2c73ceafa5f1ca96133dffeb2 mstpd-0.1.0.tar.gz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 LICENSE sha256 c5cfd44652276184374adf454150d436ce958ce50acc4ef9ccb3605a5ca7a9d3 hmac_md5.c diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk index a870352869..907d094242 100644 --- a/package/mstpd/mstpd.mk +++ b/package/mstpd/mstpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSTPD_VERSION = 0.0.9 +MSTPD_VERSION = 0.1.0 MSTPD_SITE = $(call github,mstpd,mstpd,$(MSTPD_VERSION)) MSTPD_AUTORECONF = YES MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5) From arnout at mind.be Sat Jan 8 14:48:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:55 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: bump version to 5.15.1 Message-ID: <20220108150928.5DBCD82DF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Reformatted hashes. Upstream relicensed libbtrfsutil to LGPL-2.1+ and removed libbtrfsutil/COPYING.LESSER: https://github.com/kdave/btrfs-progs/commit/9e30f779e3cbf12a88ebe309ee371851fdfd3aa0 Add optional support for udev: https://github.com/kdave/btrfs-progs/commit/f74ebeee5c239e007a0144e93f0eee26949a85ec https://github.com/kdave/btrfs-progs/commit/1d0fa3781ef9374388b683cf96f9c48245025cf6 Changelog: https://github.com/kdave/btrfs-progs/blob/master/CHANGES Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/btrfs-progs/btrfs-progs.hash | 7 +++---- package/btrfs-progs/btrfs-progs.mk | 15 +++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index aac144963e..339eab02aa 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137 btrfs-progs-v5.11.tar.xz +sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz # Locally computed -sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING -sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 libbtrfsutil/COPYING.LESSER +sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 96456d1238..50c8e59e50 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,14 +4,13 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.11 +BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python -BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-3.0+ (libbtrfsutil) -BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING \ - libbtrfsutil/COPYING.LESSER +BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) +BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES # Doesn't autodetect static-only and tries to build both @@ -31,9 +30,17 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +BTRFS_PROGS_CONF_OPTS += --enable-libudev +BTRFS_PROGS_DEPENDENCIES += udev +else +BTRFS_PROGS_CONF_OPTS += --disable-libudev +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ + --disable-libudev \ --disable-zstd \ --disable-python \ --disable-convert From arnout at mind.be Sat Jan 8 14:48:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:43 +0100 Subject: [Buildroot] [git commit] package/mp4v2: bump to version 5.0.1 Message-ID: <20220108150928.32E9A82DF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df22a9d6b77d9e245dceb7c8fd3f9d80c8917ca0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop first patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mp4v2/0001-Fix-GCC7-build.patch | 33 ---------------------- ...src-mp4track.cpp-replace-nullptr-by-NULL.patch} | 2 +- ...02-Static-cast-to-unsigned-int-for-cases.patch} | 0 package/mp4v2/mp4v2.hash | 2 +- package/mp4v2/mp4v2.mk | 2 +- 5 files changed, 3 insertions(+), 36 deletions(-) diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch deleted file mode 100644 index 4e39be4a79..0000000000 --- a/package/mp4v2/0001-Fix-GCC7-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Wed, 8 Feb 2017 00:56:32 +0000 -Subject: [PATCH] Fix GCC7 build - -if (*pSlash != '\0') { - -As it stands the body of that if will always execute and when there are -no encoding parameters ppEncodingParams will be returned as a pointer to -an empty string rather than as a null pointer - -Signed-off-by: Peter Korsgaard -[Upstream status: https://github.com/TechSmith/mp4v2/pull/36] ---- - src/rtphint.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rtphint.cpp b/src/rtphint.cpp -index e07309d..1eb01f5 100644 ---- a/src/rtphint.cpp -+++ b/src/rtphint.cpp -@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( - pSlash = strchr(pSlash, '/'); - if (pSlash != NULL) { - pSlash++; -- if (pSlash != '\0') { -+ if (*pSlash != '\0') { - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); - *ppEncodingParams = (char *)MP4Calloc(length + 1); - strncpy(*ppEncodingParams, pSlash, length); --- -2.11.0 - diff --git a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch similarity index 96% rename from package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch rename to package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch index 72bae463c9..c279b9c56a 100644 --- a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch +++ b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] --- src/mp4track.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch similarity index 100% rename from package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch rename to package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 85fce49384..7aa5402c8f 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz +sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 478d10d472..6d29228a13 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MP4V2_VERSION = 4.1.3 +MP4V2_VERSION = 5.0.1 MP4V2_SITE = \ $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) MP4V2_INSTALL_STAGING = YES From arnout at mind.be Sat Jan 8 14:48:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:53 +0100 Subject: [Buildroot] [git commit] package/libmicrohttpd: fix pthread detection Message-ID: <20220108150928.559D182AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=834464792e691a243d456335083b2a8b3363e261 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix autobuild failures after bumping the package to 0.9.75 in commit 8ec001b467e22904c0a7ec5780d83afd44ad78f3: conftest.c:64:26: error: #error "_REENTRANT must be defined" Fixes: http://autobuild.buildroot.net/results/f76/f7668104dd64a93f0b343ce3ebbe50b12584184d/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libmicrohttpd/libmicrohttpd.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f75178bc0a..344e1443fd 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -12,6 +12,10 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBMICROHTTPD_CFLAGS += -D_REENTRANT +endif + LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) From arnout at mind.be Sat Jan 8 14:49:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:08 +0100 Subject: [Buildroot] [git commit] package/libsoundtouch: bump version to 2.3.1 Message-ID: <20220108150928.88A0782DF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6afe7b1da38df60792302af82cd1069972c8613f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updated license hash due to upstream commit: https://codeberg.org/soundtouch/soundtouch/commit/d11a3adb2daddcdfafac2d86ec8de3b3f41d2f78 Updated _SITE: https://codeberg.org/soundtouch/soundtouch/commit/d063c0d9f9d29ef1f3302fbdee2f11f997bb2bce Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libsoundtouch/libsoundtouch.hash | 4 ++-- package/libsoundtouch/libsoundtouch.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libsoundtouch/libsoundtouch.hash b/package/libsoundtouch/libsoundtouch.hash index fe6a108e33..9de72521bd 100644 --- a/package/libsoundtouch/libsoundtouch.hash +++ b/package/libsoundtouch/libsoundtouch.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f1ce96bac35779d3b752f4cc8696975b3d58f3deb9db47ffc45862767c2a2bdd libsoundtouch-2.2.tar.gz -sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT +sha256 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1 soundtouch-2.3.1.tar.gz +sha256 84c6d82dc7de80f5b73f231edfd3ddc5b53513908117452bfa37ea36bb4b7e0a COPYING.TXT diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk index 8a0e807d7a..c372c32ac7 100644 --- a/package/libsoundtouch/libsoundtouch.mk +++ b/package/libsoundtouch/libsoundtouch.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBSOUNDTOUCH_VERSION = 2.2 -LIBSOUNDTOUCH_SITE = $(call gitlab,soundtouch,soundtouch,$(LIBSOUNDTOUCH_VERSION)) +LIBSOUNDTOUCH_VERSION = 2.3.1 +LIBSOUNDTOUCH_SOURCE = soundtouch-$(LIBSOUNDTOUCH_VERSION).tar.gz +LIBSOUNDTOUCH_SITE = https://www.surina.net/soundtouch LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT LIBSOUNDTOUCH_AUTORECONF = YES From arnout at mind.be Sat Jan 8 14:49:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:03 +0100 Subject: [Buildroot] [git commit] package/libfribidi: bump version to 1.0.11 Message-ID: <20220108150928.77B4582AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a67ba062a01be9262926a689178fe5ea9ae89d2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/fribidi/fribidi/releases/tag/v1.0.11 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libfribidi/libfribidi.hash | 2 +- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 8e7eb49bcd..da25b2d24d 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01 fribidi-1.0.10.tar.xz +sha256 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d fribidi-1.0.11.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 97e875b4a2..adbd786db1 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.10 +LIBFRIBIDI_VERSION = 1.0.11 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ From arnout at mind.be Sat Jan 8 14:49:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:05 +0100 Subject: [Buildroot] [git commit] package/libldns: bump version to 1.8.1 Message-ID: <20220108150928.8038F82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2cb372e0851f149d2c0c70667be369a4c09a2bc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Reformatted hashes. Changelog: https://github.com/NLnetLabs/ldns/blob/develop/Changelog Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libldns/libldns.hash | 10 +++++----- package/libldns/libldns.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash index c8fb39d478..cab8b7dbdf 100644 --- a/package/libldns/libldns.hash +++ b/package/libldns/libldns.hash @@ -1,7 +1,7 @@ -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha1 -sha1 d075a08972c0f573101fb4a6250471daaa53cb3e ldns-1.7.1.tar.gz -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha256 -sha256 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 ldns-1.7.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha1 +sha1 df19a0404a608821b571525214a18988bc88bb46 ldns-1.8.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha256 +sha256 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 ldns-1.8.1.tar.gz # Hash for license file: -sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE +sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 9c248bbc19..7deca978da 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLDNS_VERSION = 1.7.1 +LIBLDNS_VERSION = 1.8.1 LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause From arnout at mind.be Sat Jan 8 14:49:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:15 +0100 Subject: [Buildroot] [git commit] configs/olimex_stmp157: bump U-Boot version Message-ID: <20220108150928.A285E82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c49342adf1f72a1ca1745f02c7aca13d8145a3f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/olimex_stmp157_olinuxino_lime_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index f54d899b3e..74e7f9ba67 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20210821, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="acda542100fa83e4bc82634e4668f8106af37a61" +# release-20211130, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1c29714bc643c299e2ed4ba870be8d4538124144" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y From arnout at mind.be Sat Jan 8 14:49:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:00 +0100 Subject: [Buildroot] [git commit] package/icu: bump version to 70-1 Message-ID: <20220108150928.6EE8282AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7549e05bf83cf0b6a9db4c2c40122e676fb07e7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which was applied upstream: https://github.com/unicode-org/icu/commit/2dc5bea9061b4fb05cd03e21b775dd944a0eb81d Updated license hash due to typo fixes: https://github.com/unicode-org/icu/commit/73eca0a9c927045a3b5eafdbec9c17d2fcacd5da Updated project URL as recommended in the release notes: https://github.com/unicode-org/icu/releases/tag/release-70-1 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0005-ICU-21587-Fix-memory-bug-w-baseName.patch | 112 --------------------- package/icu/Config.in | 2 +- package/icu/icu.hash | 4 +- package/icu/icu.mk | 2 +- 4 files changed, 4 insertions(+), 116 deletions(-) diff --git a/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch b/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch deleted file mode 100644 index 15af976e49..0000000000 --- a/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 2dc5bea9061b4fb05cd03e21b775dd944a0eb81d Mon Sep 17 00:00:00 2001 -From: Frank Tang -Date: Tue, 13 Apr 2021 15:16:50 -0700 -Subject: [PATCH] ICU-21587 Fix memory bug w/ baseName - -Edge cases not fixed in assign and move assign operator -while the locale is long and call setKeywordValue with incorrect -keyword/values. - -Signed-off-by: Peter Korsgaard -[Peter: Fixes CVE-2021-30535, adjust paths for tarball] ---- - source/common/locid.cpp | 11 +++++++++-- - source/test/intltest/loctest.cpp | 26 ++++++++++++++++++++++++++ - source/test/intltest/loctest.h | 2 ++ - 3 files changed, 37 insertions(+), 2 deletions(-) - -diff --git a/source/common/locid.cpp b/source/common/locid.cpp -index 02cd82a7b8..3c6e5b0669 100644 ---- a/source/common/locid.cpp -+++ b/source/common/locid.cpp -@@ -469,14 +469,18 @@ Locale& Locale::operator=(Locale&& other) U_NOEXCEPT { - if ((baseName != fullName) && (baseName != fullNameBuffer)) uprv_free(baseName); - if (fullName != fullNameBuffer) uprv_free(fullName); - -- if (other.fullName == other.fullNameBuffer) { -+ if (other.fullName == other.fullNameBuffer || other.baseName == other.fullNameBuffer) { - uprv_strcpy(fullNameBuffer, other.fullNameBuffer); -+ } -+ if (other.fullName == other.fullNameBuffer) { - fullName = fullNameBuffer; - } else { - fullName = other.fullName; - } - -- if (other.baseName == other.fullName) { -+ if (other.baseName == other.fullNameBuffer) { -+ baseName = fullNameBuffer; -+ } else if (other.baseName == other.fullName) { - baseName = fullName; - } else { - baseName = other.baseName; -@@ -2681,6 +2685,9 @@ Locale::setKeywordValue(const char* keywordName, const char* keywordValue, UErro - if (fullName != fullNameBuffer) { - // if full Name is already on the heap, need to free it. - uprv_free(fullName); -+ if (baseName == fullName) { -+ baseName = newFullName; // baseName should not point to freed memory. -+ } - } - fullName = newFullName; - status = U_ZERO_ERROR; -diff --git a/source/test/intltest/loctest.cpp b/source/test/intltest/loctest.cpp -index ce41a4c00e..5503b008b0 100644 ---- a/source/test/intltest/loctest.cpp -+++ b/source/test/intltest/loctest.cpp -@@ -284,6 +284,8 @@ void LocaleTest::runIndexedTest( int32_t index, UBool exec, const char* &name, c - TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale); - TESTCASE_AUTO(TestCanonicalize); - TESTCASE_AUTO(TestLeak21419); -+ TESTCASE_AUTO(TestLongLocaleSetKeywordAssign); -+ TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign); - TESTCASE_AUTO_END; - } - -@@ -6520,6 +6522,30 @@ void LocaleTest::TestSetUnicodeKeywordValueInLongLocale() { - } - } - -+void LocaleTest::TestLongLocaleSetKeywordAssign() { -+ IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordAssign"); -+ // A long base name, with an illegal keyword and copy constructor -+ icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_" -+ "AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_" -+ "AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17_AAAAAA18"); -+ Locale l2; -+ l.setUnicodeKeywordValue("co", "12", status); // Cause an error -+ status.reset(); -+ l2 = l; // copy operator on such bogus locale. -+} -+ -+void LocaleTest::TestLongLocaleSetKeywordMoveAssign() { -+ IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordMoveAssign"); -+ // A long base name, with an illegal keyword and copy constructor -+ icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_" -+ "AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_" -+ "AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17"); -+ Locale l2; -+ l.setUnicodeKeywordValue("co", "12", status); // Cause an error -+ status.reset(); -+ Locale l3 = std::move(l); // move assign -+} -+ - void LocaleTest::TestSetUnicodeKeywordValueNullInLongLocale() { - IcuTestErrorCode status(*this, "TestSetUnicodeKeywordValueNullInLongLocale"); - const char *exts[] = {"cf", "cu", "em", "kk", "kr", "ks", "kv", "lb", "lw", -diff --git a/source/test/intltest/loctest.h b/source/test/intltest/loctest.h -index 05be4037bd..12a93bde53 100644 ---- a/source/test/intltest/loctest.h -+++ b/source/test/intltest/loctest.h -@@ -156,6 +156,8 @@ class LocaleTest: public IntlTest { - void TestSetUnicodeKeywordValueInLongLocale(); - void TestSetUnicodeKeywordValueNullInLongLocale(); - void TestLeak21419(); -+ void TestLongLocaleSetKeywordAssign(); -+ void TestLongLocaleSetKeywordMoveAssign(); - - private: - void _checklocs(const char* label, --- -2.20.1 - diff --git a/package/icu/Config.in b/package/icu/Config.in index b0c9eac83d..8b410bfdb6 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_ICU help International Components for Unicode. - http://site.icu-project.org/ + https://icu.unicode.org/ if BR2_PACKAGE_ICU diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 5ed7cc4217..56a0a5dd53 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 icu4c-69_1-src.tgz -sha256 7915b19db903070778581ae05d8bf4ea241b34a05deb51ca4f5cbb15ea1cbba3 LICENSE +sha256 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 icu4c-70_1-src.tgz +sha256 861671f8c712aa046f8f5ac89239e6c33821636516c5d0cc8c4e1973085f27a6 LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index c5d0c3eefb..7e0c96e43a 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 69-1 +ICU_VERSION = 70-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) From arnout at mind.be Sat Jan 8 14:48:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:58 +0100 Subject: [Buildroot] [git commit] package/eudev/: bump version to 3.2.11 Message-ID: <20220108150928.665A082DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af1781844f853c0875093f1c71fd8dc8142fa3be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch upstream URL to github due to changes in project ownership: https://github.com/eudev-project/eudev/commit/06ac38e2b876427dfa2ef47e74b46b99927dfe34 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/eudev/Config.in | 2 +- package/eudev/eudev.hash | 4 +--- package/eudev/eudev.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 0e5bd0cee9..6e7bbe4648 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_EUDEV Upstart, older kernels, various toolchains and anything else required by users and various distributions. - https://wiki.gentoo.org/wiki/Project:Eudev + https://github.com/eudev-project/eudev if BR2_PACKAGE_EUDEV diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index fda0481351..fe6c7ef008 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,5 +1,3 @@ -# From http://dev.gentoo.org/~blueness/eudev/ -md5 60b135a189523f333cea5f71a3345c8d eudev-3.2.10.tar.gz # Locally calculated -sha256 87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz +sha256 19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b eudev-3.2.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 5d18b388c7..705370689d 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,8 +4,8 @@ # ################################################################################ -EUDEV_VERSION = 3.2.10 -EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev +EUDEV_VERSION = 3.2.11 +EUDEV_SITE = https://github.com/eudev-project/eudev/releases/download/v$(EUDEV_VERSION) EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING EUDEV_INSTALL_STAGING = YES From arnout at mind.be Sat Jan 8 14:49:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:10 +0100 Subject: [Buildroot] [git commit] package/waf: bump version to 2.0.23 Message-ID: <20220108150928.927BB82AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=027f172c8a8ef5784bd0e0650b3e9778a4040671 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://gitlab.com/ita1024/waf/blob/master/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/waf/waf.hash | 6 +++--- package/waf/waf.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/waf/waf.hash b/package/waf/waf.hash index e9d387e7d0..21f47f76d8 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,7 +1,7 @@ # Locally computed -sha1 494ada411468129ed229f946ecec3048400e320b waf-2.0.22 -sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf-2.0.22 +sha1 89b24f9c19328339c2c8103796755474b66f3a8d waf-2.0.23 +sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf-2.0.23 # The waf script also contains its license, but is renamed `waf` in the extract # step, so this is a synonym for the above, to check WAF_LICENSE -sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf +sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index 5cc0dc3714..2b1808ace4 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.0.22 +WAF_VERSION = 2.0.23 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io WAF_LICENSE = BSD-3-Clause From arnout at mind.be Sat Jan 8 14:49:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:13 +0100 Subject: [Buildroot] [git commit] package/terminology: bump to version 1.12.1 Message-ID: <20220108150928.9B15282AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf476b1e9584265dc7bec8cdba02444a31db837f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See: https://www.enlightenment.org/news/2022-01-03-terminology-1.12.1 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/terminology/terminology.hash | 4 ++-- package/terminology/terminology.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index 7e9658482a..2ad10af76f 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum -sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.1.tar.xz.sha256sum +sha256 f8ced9584c2e9ae87452ce7425fd25b2d3e122c7489785d2917890215c6b5aa9 terminology-1.12.1.tar.xz sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index 787c9ad137..c3125c71ec 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.12.0 +TERMINOLOGY_VERSION = 1.12.1 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause From romain.naour at smile.fr Sat Jan 8 15:19:44 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 16:19:44 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: References: <20201126144722.502163-1-nolange79@gmail.com> <195311e2-38dc-53ee-80b8-09dca52320a0@smile.fr> Message-ID: <67705a4b-cf84-ef2d-f073-4ea0a497902a@smile.fr> Le 08/01/2022 ? 15:44, Norbert Lange a ?crit?: > Am Sa., 8. Jan. 2022 um 14:42 Uhr schrieb Romain Naour : >> >> Hello Norbert, >> >>>> +# >>>> +# [1] - https://github.com/systemd/systemd/issues/16183 >>> >>> It seems that systemd now include what you need since version 249 containing the >>> commit [1]. >>> >>> The fakeroot_tmpfiles.sh script seems not neceesary anymore. > > It is, this particular change did *not* get upstreamed, see [1]. > Runtime specifiers might leak > to places they should not, the script is necessary to filter out those > dangerous specs. > Some discussion was at [2]. Ok, can you respin this patch with at least an updated comment in the script. We are now using systemd 250.1 and the issue in the comment has been closed by upstream. Best regards, Romain > >>> >>> [1] >>> https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 >> >> I have marked this patch as "Changes Requested". >> >> Best regards, >> Romain >> >>> >>> Best regards, >>> Romain >>> >>> > > Norbert > > [1] - https://github.com/systemd/systemd/pull/16187 > [2] - https://lists.buildroot.org/pipermail/buildroot/2020-June/587414.html > From fontaine.fabrice at gmail.com Sat Jan 8 15:19:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 16:19:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: bump to version 2.28.0 Message-ID: <20220108151954.2235611-1-fontaine.fabrice@gmail.com> 2.16.12 was the last release of the 2.16 long-time support branch. Users who want a long-time branch should move to mbedtls-2.28, which is backward-compatible and will be supported for at least 3 years. Use LICENSE file as apache-2.0.txt was dropped with https://github.com/ARMmbed/mbedtls/commit/c76a54554ca8bffedf0e78a1cbdb64451e4ae957 https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0 Signed-off-by: Fabrice Fontaine --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 8247748afd..80ae173aff 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12: -sha256 294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393 mbedtls-2.16.12.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0: +sha256 6519579b836ed78cc549375c7c18b111df5717e86ca0eeff4cb64b2674f424cc mbedtls-2.28.0.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 93ac1bb163..c238d664f8 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,14 +4,14 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.12 +MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 -MBEDTLS_LICENSE_FILES = apache-2.0.txt +MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls -- 2.34.1 From arnout at mind.be Sat Jan 8 15:38:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 16:38:36 +0100 Subject: [Buildroot] [git commit] package/python-numpy: use fortran compiler when available Message-ID: <20220108153408.E2F7582A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1842a1cb2c7baebbc6e0f78993dac7953fd3309c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-numpy can be built using fortran compiler if available. Pass the F90 environment variable to setup.py to make sure it picks up the cross-compiler. Otherwise, use --fcompiler to make sure it doesn't accidentally pick up the host compiler. Don't do anything like this for host compilation. We don't care whether or not it uses fortran. Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-numpy/python-numpy.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 9e8b032b78..417fe81f57 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -25,7 +25,12 @@ else PYTHON_NUMPY_ENV += BLAS=None LAPACK=None endif +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) +PYTHON_NUMPY_BUILD_OPTS = --fcompiler=gnu95 +PYTHON_NUMPY_ENV += F90=$(TARGET_FC) +else PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None +endif define PYTHON_NUMPY_CONFIGURE_CMDS -rm -f $(@D)/site.cfg From arnout at mind.be Sat Jan 8 15:41:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:41:52 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-numpy: use fortran compiler when available In-Reply-To: <20200627130805.8615-2-guillaume.bressaix@gmail.com> References: <20200627130805.8615-1-guillaume.bressaix@gmail.com> <20200627130805.8615-2-guillaume.bressaix@gmail.com> Message-ID: On 27/06/2020 15:08, guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > python-numpy can be built using fortran compiler if > available, this is the correct configure flag to do it > > Signed-off-by: Guillaume W. Bres > --- > package/python-numpy/python-numpy.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk > index f9c55c9f3c..9e08fd5f2e 100644 > --- a/package/python-numpy/python-numpy.mk > +++ b/package/python-numpy/python-numpy.mk > @@ -23,6 +23,10 @@ else > PYTHON_NUMPY_ENV += BLAS=None LAPACK=None > endif > > +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) > +PYTHON_NUMPY_ENV += F90=$(TARGET_FC) It's better to still explicitly pass --fcompiler=gnu95; same when fortran is not available, pass --fcompiler=None. That way, we get an error if it accidentally picks up the wrong compiler (e.g. from the host). Therefore, I squashed the two patches, and applied to master, thanks. Regards, Arnout > +endif > + > define PYTHON_NUMPY_CONFIGURE_CMDS > -rm -f $(@D)/site.cfg > echo "[DEFAULT]" >> $(@D)/site.cfg > From peter at korsgaard.com Sat Jan 8 15:42:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 16:42:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/crash: new package In-Reply-To: <20200926200021.28930-1-egorenar-dev@posteo.net> References: <20200926200021.28930-1-egorenar-dev@posteo.net> Message-ID: Hi, Sorry for the slow response. On Sat, Sep 26, 2020 at 10:00 PM Alexander Egorenkov wrote: > diff --git a/package/crash/0001-Support-cross-compilation.patch b/package/crash/0001-Support-cross-compilation.patch > new file mode 100644 > index 0000000000..7e1bd3f861 > --- /dev/null > +++ b/package/crash/0001-Support-cross-compilation.patch > @@ -0,0 +1,134 @@ > +From 44cb56ad5bbd78203fb6f346299ccfe45f2568fe Mon Sep 17 00:00:00 2001 > +From: Alexander Egorenkov > +Date: Sat, 26 Sep 2020 14:29:49 +0200 > +Subject: [PATCH 1/1] Support cross-compilation > + > +- Introduce CONF_CC variable to compile configure.c > +- Introduce CONF_HOST_ARCH to configure.c to enable overriding target > + at compile time > + > +Signed-off-by: Alexander Egorenkov I noticed that this patch is not yet upstream / I don't see a PR for it. Are you still interested in this package? The patch could be quite a bit smaller if you didn't move the ! CONF_HOST_ARCH lines, but otherwise it looks fine to me. > +++ b/package/crash/Config.in > +config BR2_PACKAGE_CRASH > + bool "crash" > + depends on BR2_PACKAGE_CRASH_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS # dlopen > + depends on BR2_USE_WCHAR > + depends on BR2_TOOLCHAIN_USES_GLIBC > + select BR2_PACKAGE_LESS The dependency on less looks odd. Presumably you mean this as a runtime dependency which we normally mark with a # runtime comment and then don't add to _DEPENDENCIES, but looking at the code it seems to work without less as well or with the busybox less applet? > +++ b/package/crash/crash.mk > @@ -0,0 +1,50 @@ > +################################################################################ > +# > +# crash > +# > +################################################################################ > + > +CRASH_VERSION = 7.2.8 > +CRASH_SITE = $(call github,crash-utility,crash,$(CRASH_VERSION)) > +CRASH_DEPENDENCIES = host-bison less ncurses zlib > +CRASH_LICENSE = GPL-3.0 Most of the code seems to come from the kernel and is marked as GPL-2.0+. > +CRASH_LICENSE_FILES = COPYING3 > + > +CRASH_GDB_CONF_FLAGS = \ > + --host=$(GNU_TARGET_NAME) That looked odd to me. It apparently downloads a GDB tarball during the build step, patches and builds that, completely sidestepping the download / mirror logic of Buildroot (and our existing gdb patches), so that is not good. What is this needed for exactly? Can it instead use our existing gdb package? > +ifeq ($(BR2_i386),y) > +CRASH_TARGET = X86 > +else ifeq ($(BR2_x86_64),y) > +CRASH_TARGET = X86_64 > +else ifeq ($(BR2_arm)$(BR2_armeb),y) > +CRASH_TARGET = ARM > +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) > +CRASH_TARGET = ARM64 > +else ifeq ($(BR2_powerpc),y) > +CRASH_TARGET = PPC > +else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > +CRASH_TARGET = PPC64 > +else ifeq ($(BR2_s390x),y) > +CRASH_TARGET = S390X > +else ifeq ($(BR2_sparc64),y) > +CRASH_TARGET = SPARC64 > +endif NIT: such conditional logic is a bit clearer / shorter in Config.in instead of in the .mk. What is the use case for this exactly? You are building it for the target, but wouldn't this make more sense as a host utility? The gdb download is a show stopper, so I have marked this as changes requested. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 8 15:41:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 16:41:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/trinity: fix build with libexecinfo Message-ID: <20220108154118.2320814-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: debug.o: in function `__show_backtrace': debug.c:(.text+0x10): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/bf78e4be9b9d9ca7d32f922d72ea6cd39a78d3d8 Signed-off-by: Fabrice Fontaine --- package/trinity/trinity.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index befb8de826..4dca50c0b6 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -11,16 +11,24 @@ TRINITY_LICENSE = GPL-2.0 TRINITY_LICENSE_FILES = COPYING TRINITY_CPE_ID_VENDOR = trinity_project +TRINITY_LDFLAGS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +TRINITY_DEPENDENCIES += libexecinfo +TRINITY_LDFLAGS += -lexecinfo +endif + define TRINITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) endef define TRINITY_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LDFLAGS="$(TRINITY_LDFLAGS)" endef define TRINITY_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + LDFLAGS="$(TRINITY_LDFLAGS)" DESTDIR=$(TARGET_DIR)/usr install endef # Install helper scripts -- 2.34.1 From romain.naour at smile.fr Sat Jan 8 16:07:31 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 17:07:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gpiod: add gpiod hardware handling daemon In-Reply-To: <20200626112919.27946-1-marc.chalain@gmail.com> References: <20200626112919.27946-1-marc.chalain@gmail.com> Message-ID: Hello Marc, Le 26/06/2020 ? 13:29, Marc Chalain a ?crit?: > Gpiod is a little daemon to trig gpio event and launch scripts on level > changing events. > As udev or mdev, it reads rules files to attach scripts on events. and > launch the scripts with environment variables to describe the event. > It uses libgpiod to monitor the gpio and libconfig to read the rules. > It is tested on Raspberry Pi (0,3,4) with success. Did you had some feedback from libgpiod upstream project about merging your work ? [1] Your gpiod daemon provided by libgpiod would be nice. [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587769.html > > Signed-off-by: Marc Chalain > --- > package/Config.in | 1 + > package/gpiod/Config.in | 14 +++++++++ > package/gpiod/S20gpiod.in | 56 ++++++++++++++++++++++++++++++++++ > package/gpiod/gpiod.hash | 2 ++ > package/gpiod/gpiod.mk | 52 +++++++++++++++++++++++++++++++ > package/gpiod/gpiod.service.in | 11 +++++++ > 6 files changed, 136 insertions(+) > create mode 100644 package/gpiod/Config.in > create mode 100755 package/gpiod/S20gpiod.in > create mode 100644 package/gpiod/gpiod.hash > create mode 100644 package/gpiod/gpiod.mk > create mode 100644 package/gpiod/gpiod.service.in > > diff --git a/package/Config.in b/package/Config.in > index 6a34a895af..c86315630f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -458,6 +458,7 @@ endmenu > source "package/freescale-imx/Config.in" > source "package/fxload/Config.in" > source "package/gcnano-binaries/Config.in" > + source "package/gpiod/Config.in" > source "package/gpm/Config.in" > source "package/gpsd/Config.in" > source "package/gptfdisk/Config.in" > diff --git a/package/gpiod/Config.in b/package/gpiod/Config.in > new file mode 100644 > index 0000000000..e9ba5bdba3 > --- /dev/null > +++ b/package/gpiod/Config.in > @@ -0,0 +1,14 @@ > +config BR2_PACKAGE_GPIOD > + bool "gpiod: gpio monitor daemon" > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod > + select BR2_PACKAGE_LIBGPIOD > + select BR2_PACKAGE_LIBCONFIG > + help > + GPIOD monitors gpio events and start scripts. > + The daemon loads rules defining a gpio and > + the scripts to launch when the level of gpio changes. Add the url to the project: https://github.com/mchalain/gpiod > + > +comment "gpiod needs a toolchain w/ kernel headers >= 4.8" > + depends on !BR2_USE_MMU > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 > diff --git a/package/gpiod/S20gpiod.in b/package/gpiod/S20gpiod.in > new file mode 100755 > index 0000000000..2cc77af145 > --- /dev/null > +++ b/package/gpiod/S20gpiod.in > @@ -0,0 +1,56 @@ > +#!/bin/sh > +# > +# Starts gpiod. > +# > + > +DAEMON="gpiod" > +PIDFILE="/var/run/$DAEMON.pid" > + > +OPTIONS="" > + > +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" > + > +start() { > + printf 'Starting %s: ' "$DAEMON" > + OPTIONS="${OPTIONS} -p ${PIDFILE}" > + OPTIONS="${OPTIONS} -D" > + start-stop-daemon -S -q -x "@PREFIX@/sbin/$DAEMON" \ > + -- $OPTIONS > + status=$? > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > + fi > + return "$status" > +} > + > +stop() { > + printf 'Stopping %s: ' "$DAEMON" > + start-stop-daemon -K -q -p "$PIDFILE" > + status=$? > + if [ "$status" -eq 0 ]; then > + rm -f "$PIDFILE" > + echo "OK" > + else > + echo "FAIL" > + fi > + return "$status" > +} > + > +restart() { > + stop > + sleep 1 > + start > +} > + > +case "$1" in > + start|stop|restart) > + "$1";; > + reload) > + # Restart, since there is no true "reload" feature. > + restart;; > + *) > + echo "Usage: $0 {start|stop|restart|reload}" > + exit 1 > +esac > diff --git a/package/gpiod/gpiod.hash b/package/gpiod/gpiod.hash > new file mode 100644 > index 0000000000..af0486f792 > --- /dev/null > +++ b/package/gpiod/gpiod.hash > @@ -0,0 +1,2 @@ > +sha256 d042c0394071ea8fc7464f02c2e599021d15a9891bd378677b000aa373436c89 gpiod-1.1.tar.gz > +sha256 dfba39760e099e2a64567309f0c6ceacaf9e6473bf79835fe0f8a8580651ff49 LICENSE > diff --git a/package/gpiod/gpiod.mk b/package/gpiod/gpiod.mk > new file mode 100644 > index 0000000000..cef3a58fd5 > --- /dev/null > +++ b/package/gpiod/gpiod.mk > @@ -0,0 +1,52 @@ > +################################################################################ > +# > +# gpiod > +# > +################################################################################ > + > +GPIOD_VERSION = 1.1 > +GPIOD_SITE = $(call github,mchalain,gpiod,$(GPIOD_VERSION)) > +GPIOD_LICENSE = BSD > +GPIOD_LICENSE_FILES = LICENSE > + > +PREFIX=/usr > +SYSCONFDIR=/etc/gpiod > + > +GPIOD_MAKE_OPTS = \ > + prefix=$(PREFIX) \ > + sysconfdir=$(SYSCONFDIR) > + > +GPIOD_DEPENDENCIES = \ > + libgpiod \ > + libconfig > + > +define GPIOD_CONFIGURE_CMDS > + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) \ > + $(MAKE1) -C $(@D) $(GPIOD_MAKE_OPTS) defconfig > +endef > + > +define GPIOD_BUILD_CMDS > + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) \ > + $(MAKE1) -C $(@D) $(GPIOD_MAKE_OPTS) > +endef > + > +define GPIOD_INSTALL_TARGET_CMDS > + $(INSTALL) -d -m 755 $(TARGET_DIR)$(SYSCONFDIR)/rules.d > + $(MAKE) -C $(@D) $(GPIOD_MAKE_OPTS) \ > + DESTDIR="$(TARGET_DIR)" install > +endef > + > +define GPIOD_INSTALL_INIT_SYSTEMD > + cp $(GPIOD_PKGDIR)/gpiod.service.in $(@D)/gpiod.service > + $(SED) "s, at PREFIX@,$(PREFIX),g" $(@D)/gpiod.service > + $(INSTALL) -D -m 644 $(@D)/gpiod.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/gpiod.service > +endef > +define GPIOD_INSTALL_INIT_SYSV > + cp $(GPIOD_PKGDIR)/S20gpiod.in $(@D)/S20gpiod > + $(SED) "s, at PREFIX@,$(PREFIX),g" $(@D)/S20gpiod > + $(INSTALL) -D -m 755 $(@D)/S20gpiod \ > + $(TARGET_DIR)/etc/init.d/S20gpiod > +endef > + > +$(eval $(generic-package)) > diff --git a/package/gpiod/gpiod.service.in b/package/gpiod/gpiod.service.in > new file mode 100644 > index 0000000000..38a573ccf4 > --- /dev/null > +++ b/package/gpiod/gpiod.service.in > @@ -0,0 +1,11 @@ > +[Unit] > +Description=GPIO event handler daemon > + > +[Service] > +Type=forking > +ExecStart=@PREFIX@/sbin/gpiod -D -p /var/run/gpiod.pid > +ExecStop=@PREFIX@/sbin/gpiod -K -p /var/run/gpiod.pid > +Restart=always > + > +[Install] > +WantedBy=multi-user.target > From fontaine.fabrice at gmail.com Sat Jan 8 16:13:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:13:47 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220108115140.760e195f@windsurf> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> Message-ID: Hi, Le sam. 8 janv. 2022 ? 11:51, Thomas Petazzoni a ?crit : > > On Tue, 4 Jan 2022 21:54:55 +0100 > Fabrice Fontaine wrote: > > > Fix the following build failure raised since bump to version 5.41 in > > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > > > readelf.c: In function 'do_auxv_note': > > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > > ^ > > > > Fixes: > > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > > > > Signed-off-by: Fabrice Fontaine > > I am afraid it seems like this didn't fix the problem, see: > > http://autobuild.buildroot.net/results/957/9573e8b01d8f21cd89a67475daabdeef533d31d7/build-end.log > > ac_cv_prog_cc_c99='-std=gnu99' is properly passed to the configure > script, but it still fails. Indeed, I suggest to revert this commit and apply the version 1 of this patch instead of trying to understand what is "broken" in the configure script. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From thomas.petazzoni at bootlin.com Sat Jan 8 16:14:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 17:14:55 +0100 Subject: [Buildroot] [git commit] package/opengl/libgbm: clarify option comments Message-ID: <20220108160854.2EB0F831C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b5f7ce29288e2ba393ca7cd4768a83cdb5dec48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The comments were *after* the option they applied to, which was confusing, so bring back the comments before the option they apply to. In addition, instead of saying "this option", explicitly name the option to clear any ambiguity. Signed-off-by: Thomas Petazzoni --- package/opengl/libgbm/Config.in | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/package/opengl/libgbm/Config.in b/package/opengl/libgbm/Config.in index 7aa3efb97a..6eb39761c4 100644 --- a/package/opengl/libgbm/Config.in +++ b/package/opengl/libgbm/Config.in @@ -5,20 +5,21 @@ config BR2_PACKAGE_PROVIDES_LIBGBM string depends on BR2_PACKAGE_HAS_LIBGBM +# gbm implementations should select +# BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT if they +# provide the format modifier plane count feature. This API was +# initially introduced in mesa3d version 17. A gbm implementation +# provides this feature if it is implement function +# gbm_device_get_format_modifier_plane_count. config BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT bool depends on BR2_PACKAGE_HAS_LIBGBM -# gbm implementations should select this option if they provide the -# format modifier plane count feature. This API was initially introduced -# in mesa3d version 17. A gbm implementation provides this feature if it -# is implement function gbm_device_get_format_modifier_plane_count. - +# gbm implementations should select +# BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF if they provide the dma +# buffer feature. This API was initially introduced in mesa3d version +# 10. A gbm implementation provides this feature if it is implement +# function gbm_bo_get_fd. config BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF bool depends on BR2_PACKAGE_HAS_LIBGBM - -# gbm implementations should select this option if they provide the -# dma buffer feature. This API was initially introduced in mesa3d -# version 10. A gbm implementation provides this feature if it -# is implement function gbm_bo_get_fd. From thomas.petazzoni at bootlin.com Sat Jan 8 16:14:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 17:14:40 +0100 Subject: [Buildroot] [git commit] package/rockchip-mali: new package Message-ID: <20220108160854.25EB282E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97c74a73e5dee17530647f89b2c7d8692781eb14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There is already a package adding Mali blobs for Sunxi Mali Utgard GPUs. Many Rockchip SoCs feature a Mali Bifrost GPU and need specific libraries provided under binary form with a non-GPL compliant license by Rockchip. Package these libraries. While the repository at https://github.com/rockchip-linux/libmali supports many GPU variants, this package for now only supports the Bifrost GPU blob. Support for other GPU blobs can be added later. Signed-off-by: Maxime Chevallier Signed-off-by: Miquel Raynal [Thomas: - Rename to rockchip-mali, because it contains other blobs than Bifrost ones - Add missing entry in DEVELOPERS file - Change BR2_arm to BR2_ARM_EABIHF as only EABIhf blobs are provided for arm32 - Add BR2_TOOLCHAIN_HAS_THREADS inherited from libdrm. - Expose as a libgbm provider. - Drop the patch, which was not necessary. - Rework the entire installation logic, to be much simpler.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/rockchip-mali/Config.in | 31 +++++++++++++ package/rockchip-mali/rockchip-mali.hash | 2 + package/rockchip-mali/rockchip-mali.mk | 77 ++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 73664feb48..a64a9ef384 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2020,6 +2020,9 @@ F: package/libfribidi/ N: Min Xu F: package/shadowsocks-libev/ +N: Miqu??l Raynal +F: package/rockchip-mali/ + N: Mircea Gliga F: package/mbuffer/ diff --git a/package/Config.in b/package/Config.in index a555e6fd78..bf7a346f75 100644 --- a/package/Config.in +++ b/package/Config.in @@ -548,6 +548,7 @@ endmenu source "package/raspi-gpio/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" + source "package/rockchip-mali/Config.in" source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in new file mode 100644 index 0000000000..b2033652a8 --- /dev/null +++ b/package/rockchip-mali/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_ROCKCHIP_MALI + bool "rockchip-mali" + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_ARM_EABIHF || BR2_aarch64 + # lidbrm. This would normally need a Config.in comment, but + # these blobs are linked against glibc, so we are sure to have + # thread support, so don't bother. + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + select BR2_PACKAGE_LIBDRM + help + Install the binary user-space libraries for the ARM Mali GPU + suitable for Rockchip platforrms. This package requires a + kernel with the ARM Mali GPU kernel driver enabled, as found + in the 'mali-driver' package. + +if BR2_PACKAGE_ROCKCHIP_MALI + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "rockchip-mali" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "rockchip-mali" + +config BR2_PACKAGE_PROVIDES_LIBGBM + default "rockchip-mali" + +endif diff --git a/package/rockchip-mali/rockchip-mali.hash b/package/rockchip-mali/rockchip-mali.hash new file mode 100644 index 0000000000..38efcb3077 --- /dev/null +++ b/package/rockchip-mali/rockchip-mali.hash @@ -0,0 +1,2 @@ +sha256 ee440d859e9d7dfdf29b9a00c7a633337913c407be567d3651c29c12eb75fd9c rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427.tar.gz +sha256 a78acc73de9909efb879800d4daa4640c4aaa55cd751238a133954aba15e4285 END_USER_LICENCE_AGREEMENT.txt diff --git a/package/rockchip-mali/rockchip-mali.mk b/package/rockchip-mali/rockchip-mali.mk new file mode 100644 index 0000000000..6200191a73 --- /dev/null +++ b/package/rockchip-mali/rockchip-mali.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# rockchip-mali +# +################################################################################ + +ROCKCHIP_MALI_VERSION = 721653b5b3b525a4f80d15aa7e2f9df7b7e60427 +ROCKCHIP_MALI_SITE = $(call github,rockchip-linux,libmali,$(ROCKCHIP_MALI_VERSION)) +ROCKCHIP_MALI_LICENSE = Proprietary +ROCKCHIP_MALI_LICENSE_FILES = END_USER_LICENCE_AGREEMENT.txt +ROCKCHIP_MALI_INSTALL_STAGING = YES +ROCKCHIP_MALI_DEPENDENCIES = host-patchelf libdrm +ROCKCHIP_MALI_PROVIDES = libegl libgles libgbm + +ROCKCHIP_MALI_LIB = libmali-bifrost-g31-rxp0$(ROCKCHIP_MALI_SUFFIX).so +ROCKCHIP_MALI_PKGCONFIG_FILES = egl gbm glesv2 mali +ROCKCHIP_MALI_ARCH_DIR = $(if $(BR2_arm),arm-linux-gnueabihf,aarch64-linux-gnu) +ROCKCHIP_MALI_HEADERS = EGL FBDEV GLES GLES2 GLES3 KHR gbm.h + +# We need to create: +# - The symlink that matches the library SONAME (libmali.so.1) +# - The .so symlinks needed at compile time by the compiler (*.so) +ROCKCHIP_MALI_LIB_SYMLINKS = \ + libmali.so.1 \ + libMali.so \ + libEGL.so \ + libgbm.so \ + libGLESv1_CM.so \ + libGLESv2.so + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +ROCKCHIP_MALI_SUFFIX = -wayland-gbm +ROCKCHIP_MALI_PKGCONFIG_FILES += wayland-egl +ROCKCHIP_MALI_LIB_SYMLINKS += libwayland-egl.so +ROCKCHIP_MALI_DEPENDENCIES += wayland +else +ROCKCHIP_MALI_SUFFIX = -gbm +endif + +define ROCKCHIP_MALI_INSTALL_CMDS +# Install the library + $(INSTALL) -D -m 0755 \ + $(@D)/lib/$(ROCKCHIP_MALI_ARCH_DIR)/$(ROCKCHIP_MALI_LIB) \ + $(1)/usr/lib/$(ROCKCHIP_MALI_LIB) + +# Ensure it has a proper soname + $(HOST_DIR)/bin/patchelf --set-soname libmali.so.1 \ + $(1)/usr/lib/$(ROCKCHIP_MALI_LIB) + +# Generate and install the .pc files + mkdir -p $(1)/usr/lib/pkgconfig + $(foreach pkgconfig,$(ROCKCHIP_MALI_PKGCONFIG_FILES), \ + sed -e 's%@CMAKE_INSTALL_LIBDIR@%lib%;s%@CMAKE_INSTALL_INCLUDEDIR@%include%' \ + $(@D)/pkgconfig/$(pkgconfig).pc.cmake > \ + $(1)/usr/lib/pkgconfig/$(pkgconfig).pc + ) + +# Install all headers + $(foreach d,$(ROCKCHIP_MALI_HEADERS), \ + cp -dpfr $(@D)/include/$(d) $(1)/usr/include/ + ) + +# Create symlinks + $(foreach symlink,$(ROCKCHIP_MALI_LIB_SYMLINKS), \ + ln -sf $(ROCKCHIP_MALI_LIB) $(1)/usr/lib/$(symlink) + ) +endef + +define ROCKCHIP_MALI_INSTALL_TARGET_CMDS + $(call ROCKCHIP_MALI_INSTALL_CMDS,$(TARGET_DIR)) +endef + +define ROCKCHIP_MALI_INSTALL_STAGING_CMDS + $(call ROCKCHIP_MALI_INSTALL_CMDS,$(STAGING_DIR)) +endef + +$(eval $(generic-package)) From fontaine.fabrice at gmail.com Sat Jan 8 16:16:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:16:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libeastl: drop duplicated sentence Message-ID: <20220108161630.2730118-1-fontaine.fabrice@gmail.com> Drop duplicated sentence from Config.in Signed-off-by: Fabrice Fontaine --- package/libeastl/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 7609434519..5abea8f810 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help EASTL stands for Electronic Arts Standard Template - Library. EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is an extensive -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Jan 8 16:20:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 17:20:19 +0100 Subject: [Buildroot] [PATCH 3/7] package/rockchip-mali-bifrost: new package with binary blobs In-Reply-To: <20200306071440.30433-4-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-4-miquel.raynal@bootlin.com> Message-ID: <20220108172019.4cb27c8e@windsurf> On Fri, 6 Mar 2020 08:14:36 +0100 Miquel Raynal wrote: > From: Maxime Chevallier > > There is already a package adding Mali blobs for Sunxi Mali Utgard > GPUs. Many Rockchip SoCs feature a Mali Bifrost GPU and need specific > libraries provided under binary form with a non-GPL compliant license > by Rockchip. Package these libraries. > > Define a common *_INSTALL_CMDS macro, which takes as argument the base > destination path, and use it to implement *_INSTALL_TARGET_CMDS and > *_INSTALL_STAGING_CMDS. > > Signed-off-by: Maxime Chevallier > Signed-off-by: Miquel Raynal > --- > package/Config.in | 1 + > ...4-binaries-and-only-install-the-bifr.patch | 169 ++++++++++++++++++ > package/rockchip-mali-bifrost/Config.in | 20 +++ > .../rockchip-mali-bifrost.hash | 2 + > .../rockchip-mali-bifrost.mk | 85 +++++++++ > 5 files changed, 277 insertions(+) > create mode 100644 package/rockchip-mali-bifrost/0001-cmake-Use-AArch64-binaries-and-only-install-the-bifr.patch > create mode 100644 package/rockchip-mali-bifrost/Config.in > create mode 100644 package/rockchip-mali-bifrost/rockchip-mali-bifrost.hash > create mode 100644 package/rockchip-mali-bifrost/rockchip-mali-bifrost.mk Thanks for this patch, which we have finally applied! I did a large number of changes, almost rewriting it entirely: [Thomas: - Rename to rockchip-mali, because it contains other blobs than Bifrost ones - Add missing entry in DEVELOPERS file - Change BR2_arm to BR2_ARM_EABIHF as only EABIhf blobs are provided for arm32 - Add BR2_TOOLCHAIN_HAS_THREADS inherited from libdrm. - Expose as a libgbm provider. - Drop the patch, which was not necessary. - Rework the entire installation logic, to be much simpler.] Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sat Jan 8 16:21:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:21:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump to version 2021.07.01 Message-ID: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- package/raspberrypi-usbboot/raspberrypi-usbboot.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 3f66b12ff1..cedc5fb7e1 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz +sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 5d7b433c64..2e4194da0b 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,8 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) +RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 +RASPBERRYPI_USBBOOT_SITE = \ + $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Sat Jan 8 16:29:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 8 Jan 2022 17:29:49 +0100 Subject: [Buildroot] [PATCH v2] configs/olimex_a20_olinuxino: fix mali not working because Linux version >= 4.20 In-Reply-To: <20211018234037.3e1ec4cc@windsurf> References: <20211018214535.5743fd67@windsurf> <41CC9CB4-4706-4071-B3A4-3268638ADFC8@benettiengineering.com> <20211018234037.3e1ec4cc@windsurf> Message-ID: On 18/10/21 23:40, Thomas Petazzoni wrote: > On Mon, 18 Oct 2021 21:59:41 +0200 > Giulio Benetti wrote: > >> They instead enable specifically sunxi-mali-mainline* in lime and >> lime2 defconfigs. So at the moment sunxi-mali-mainline is built but >> it can?t work and it doesn?t make sense. Also up to Linux 4.20 this >> neither worked because of lack of double buffer. So basically here >> sunxi-mali-mainline I?m pretty sure never worked. > > Aah, I hadn't realized/verified that they enabled sunxi-mali-mainline*. > In this case, obviously your patch makes sense. I've switched it back > to "New" in patchwork. > > Thanks for the additional explanation! > > Thomas > Ping. This is still needed for having Mali working with other applied patches: https://patchwork.ozlabs.org/project/buildroot/list/?series=270656&state=* -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sat Jan 8 16:46:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:46:46 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig Message-ID: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> .defconfig has not been updated since 2016 with commit 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't seem to be used Signed-off-by: Fabrice Fontaine --- .defconfig | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 .defconfig diff --git a/.defconfig b/.defconfig deleted file mode 100644 index 7ab0c3fbf0..0000000000 --- a/.defconfig +++ /dev/null @@ -1,51 +0,0 @@ -# -# Automatically generated make config: don't edit -# Mon Feb 18 09:11:56 2008 -# -BR2_HAVE_DOT_CONFIG=y -# BR2_alpha is not set -# BR2_arm is not set -# BR2_armeb is not set -# BR2_cris is not set -# BR2_ia64 is not set -BR2_i386=y -# BR2_m68k is not set -# BR2_mips is not set -# BR2_mipsel is not set -# BR2_nios2 is not set -# BR2_powerpc is not set -# BR2_sh is not set -# BR2_sparc is not set -# BR2_sparc64 is not set -# BR2_x86_64 is not set -# BR2_x86_i486 is not set -# BR2_x86_i586 is not set -BR2_x86_i686=y -# BR2_x86_pentiumpro is not set -# BR2_x86_pentium_mmx is not set -# BR2_x86_pentium_m is not set -# BR2_x86_pentium2 is not set -# BR2_x86_pentium3 is not set -# BR2_x86_pentium4 is not set -# BR2_x86_prescott is not set -# BR2_x86_nocona is not set -# BR2_x86_core2 is not set -# BR2_x86_k6 is not set -# BR2_x86_k6_2 is not set -# BR2_x86_athlon is not set -# BR2_x86_athlon_4 is not set -# BR2_x86_opteron is not set -# BR2_x86_opteron_sse3 is not set -# BR2_x86_barcelona is not set -# BR2_x86_geode is not set -# BR2_x86_c3 is not set -# BR2_x86_winchip_c6 is not set -# BR2_x86_winchip2 is not set -BR2_ARCH="i686" -BR2_ENDIAN="LITTLE" -BR2_GCC_TARGET_TUNE="i686" -BR2_GCC_TARGET_ARCH="i686" - -# -# Target options -# -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 16:50:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:50:03 +0100 Subject: [Buildroot] [PATCH 1/3] package/libpri: add Linux in comment Message-ID: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine --- package/libpri/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpri/Config.in b/package/libpri/Config.in index de2d96fcc4..0684d2ac83 100644 --- a/package/libpri/Config.in +++ b/package/libpri/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI http://www.asterisk.org/downloads/libpri -comment "libpri needs a kernel to be built" +comment "libpri needs a Linux kernel to be built" depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 16:50:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:50:04 +0100 Subject: [Buildroot] [PATCH 2/3] package/libss7: add Linux in comment In-Reply-To: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> References: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> Message-ID: <20220108165005.2737902-2-fontaine.fabrice@gmail.com> Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine --- package/libss7/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index bdf5fbe3a8..d8bcf11ce7 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBSS7 http://www.asterisk.org/downloads/libss7 -comment "libss7 needs a kernel to be built" +comment "libss7 needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL comment "libss7 needs a toolchain w/ threads" -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 16:50:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:50:05 +0100 Subject: [Buildroot] [PATCH 3/3] package/nvidia-driver: add Linux in comment In-Reply-To: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> References: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> Message-ID: <20220108165005.2737902-3-fontaine.fabrice@gmail.com> Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine --- package/nvidia-driver/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 9631b3e70c..a8617a939b 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -75,7 +75,7 @@ config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA -comment "nvidia kernel module needs a kernel to be built" +comment "nvidia kernel module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_NVIDIA_DRIVER_MODULE -- 2.34.1 From arnout at mind.be Sat Jan 8 16:51:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:51:24 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: drop host variant Message-ID: <20220108164622.91FA78324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9bf97cf16fa6945466a6712028c9a74104ff426 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The host variant was only needed by ca-certificates, which no longer needs it, so drop this variant. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-cryptography/python-cryptography.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 081dfc06a0..9c00efb44f 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -13,11 +13,5 @@ PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl -HOST_PYTHON_CRYPTOGRAPHY_NEEDS_HOST_PYTHON = python3 -HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ - host-python3-cffi \ - host-python3-six \ - host-openssl $(eval $(python-package)) -$(eval $(host-python-package)) From arnout at mind.be Sat Jan 8 16:51:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:51:24 +0100 Subject: [Buildroot] [git commit] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 Message-ID: <20220108164622.9ABE7832B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ed4147e76fe56322c47468be8a222204c459adf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for BR2_ARM_CPU_ARMV7A, but it also needs a special value for BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for ARMv5TE is identified with the "armv5te" architecture name, see https://doc.rust-lang.org/nightly/rustc/platform-support.html. We noticed this because Rust binaries wouldn't work on an ARMv5 platform (Illegal instruction). This was due to the usage of the arm-unknown-linux-gnueabi variant of the Rust standard library, which is for ARMv6. Thanks to this commit, we correctly use the armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly on ARMv5TE. A better approach would be to do the conversion from architecture options to Rust tuples in a single string symbol that also defines the supported architectures, similar to how it's done in e.g. openblas. However, that's a much bigger change. So for now, just do the easy thing and fix this one issue. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 90ea56f626..fe7404b3bd 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -102,8 +102,9 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH string + default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A - default BR2_ARCH if !BR2_ARM_CPU_ARMV7A + default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI string From arnout at mind.be Sat Jan 8 16:51:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:51:24 +0100 Subject: [Buildroot] [git commit] package/rustc: fix the riscv64gc architecture handling Message-ID: <20220108164622.A463581DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79c5639597e961a36ee10e55b0479e642013448f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true when BR2_riscv is true. Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to allow rust-bin to download its pre-compiled standard library correctly. Signed-off-by: Thomas Petazzoni Reviewed-by: Alistair Francis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index fe7404b3bd..80d1d1a3d8 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -49,7 +49,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC # riscv64gc-unknown-linux-gnu # "g" stands for imafd, and we also need "c". - default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ + default y if BR2_RISCV_64 && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ BR2_TOOLCHAIN_USES_GLIBC @@ -104,6 +104,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH string default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A + default "riscv64gc" if BR2_RISCV_64 default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI From arnout at mind.be Sat Jan 8 16:51:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:51:24 +0100 Subject: [Buildroot] [git commit] package/ca-certificates: remove dependency on host-python-cryptography Message-ID: <20220108164622.89A0281DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=363dd649f31c7e7732f3cd509d43cebbb53e51ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The host-python-cryptography module is only used by ca-certificates for a check of the expiration date of certificates, which is only a warning not even causing the build to abort, i.e something that Buildroot users are most likely never going to see. Since the host-python-cryptography dependency would soon require a dependency on rust, it's a lot simpler to just patch the certdata2pem.py script to no longer require cryptography, but only make use of it if available. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...tdata2pem.py-make-cryptography-module-opt.patch | 59 ++++++++++++++++++++++ package/ca-certificates/ca-certificates.mk | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch new file mode 100644 index 0000000000..b76c1bfd7f --- /dev/null +++ b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch @@ -0,0 +1,59 @@ +From bf18b564122e8f976681a2398862fde1eafd84ba Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 6 Jan 2022 23:15:00 +0100 +Subject: [PATCH] mozilla/certdata2pem.py: make cryptography module optional + +The Python cryptography module is only used to verify if trusted +certificates have expired, but this is only a warning. For some build +systems and distributions, providing Python cryptography is costly, +especially since it's now partly written in Rust. + +As the check is only a warning, it's anyway going to be overlooked by +most people. This commit changes the check to be optional: if the +cryptography Python module is there, we perform the check, otherwise +the check is skipped. + +Signed-off-by: Thomas Petazzoni +--- + mozilla/certdata2pem.py | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index ede23d4..a6261f8 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -28,9 +28,6 @@ import sys + import textwrap + import io + +-from cryptography import x509 +- +- + objects = [] + + # Dirty file parser. +@@ -122,11 +119,16 @@ for obj in objects: + if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: + continue + +- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) +- if cert.not_valid_after < datetime.datetime.now(): +- print('!'*74) +- print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) +- print('!'*74) ++ try: ++ from cryptography import x509 ++ ++ cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) ++ if cert.not_valid_after < datetime.datetime.now(): ++ print('!'*74) ++ print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) ++ print('!'*74) ++ except ImportError: ++ pass + + bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ + .replace(' ', '_')\ +-- +2.33.1 + diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 7084ab781e..0b6962ab7b 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -7,7 +7,7 @@ CA_CERTIFICATES_VERSION = 20211016 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates -CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 host-python-cryptography +CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright From arnout at mind.be Sat Jan 8 16:52:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 17:52:40 +0100 Subject: [Buildroot] [PATCH 0/7] Bump of python-cryptography and other Rust related fun In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <6147f82e-21fa-ad1e-5c89-96e1844c621e@mind.be> On 07/01/2022 18:13, Thomas Petazzoni wrote: > Hello, > > This series bumps the python-cryptography package to a new version. It > is based on earlier work from James Hilliard at: > > https://patchwork.ozlabs.org/project/buildroot/patch/20210318044253.3202355-2-james.hilliard1 at gmail.com/ > > But it did require quite some more work, which is presented in this > patch series. > > The unique challenge caused by this version bump is that > python-cryptography now has some Rust code integrated, so suddenly > this package, and all its reverse dependencies need to depend on Rust > being available. > > There is also a host variant of python-cryptography, which is used > solely by ca-certificates, which has a significant number of reverse > dependencies. To avoid adding Rust dependencies to these, we broke the > dependency of ca-certificates on host-python-cryptography using a > simple patch, and dropped host-python-cryptography altogether. > > This patch series depends on the "Go/Cargo vendoring" patch series > posted recently. Indeed, the Rust code in python-cryptography depends > on other Cargo crates, which we don't want to download during the > build, but really during the download step. > > There is however still one problem with the last patch of the series, > see below. > > This series is available at: > > https://github.com/tpetazzoni/buildroot/tree/python-cryptography > > The patch series goes like this: > > - PATCH 1 modifies ca-certificates to no longer need > host-python-cryptography > > - PATCH 2 drops host-python-cryptography itselef > > - PATCH 3 and 4 fix some issues in package/rustc/ in the description > of the ARMv5 and RISC-V 64-bit Rust support. We noticed this > because Rust binaries were not working on ARMv5 ("Illegal > instruction"), this was due to the fact that we were using the > pre-compiled Rust standard library for ARMv6, due to a bogus > architecture name. This is fixed by PATCH 3. And while reviewing > this, we spotted a similar issue for RISC-V 64-bit, which is fixed > in PATCH 4. First four patches applied to master, with the fixup that you mentioned on patch 3. Regards, Arnout > > - PATCH 5 slightly improves the Cargo download post-process script to > make it possible to pass a custom path to the Cargo.toml file, > instead of assuming it's located at the root of the package source > tree. > > - PATCH 6 modifies the runtime test cases that involve > python-cryptography directly or indirectly to use a glibc toolchain > instead of the default uclibc toolchain. Indeed, Rust is for now > not available on uClibc platforms. This could have been done in the > patch doing the version bump, but the version bump patch is already > quite large, and the update of the runtime tests could be done as a > separate preparation step. > > - PATCH 7 finally bumps python-cryptography > itself. python-cryptography itself requires a bit of trickery to > leverage the Cargo download post-process logic, to vendor > dependencies during the download step. Then the patch also touches > the entire reverse dependency tree (sometimes up to 5 levels > deep!). This patch should NOT be applied for now, due to issues > (see below). > > This series was tested by building the following configuration: > > BR2_arm=y > BR2_cortex_a9=y > BR2_ARM_ENABLE_VFP=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_PYTHON_CHANNELS_REDIS=y > BR2_PACKAGE_PYTHON_CROSSBAR=y > BR2_PACKAGE_PYTHON_KEYRING=y > BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO=y > BR2_PACKAGE_PYTHON_TXDBUS=y > BR2_PACKAGE_DOCKER_COMPOSE=y > # BR2_TARGET_ROOTFS_TAR is not set > > that builds all affected packages. > > It was also tested by running all Python runtime test cases: > > https://gitlab.com/tpetazzoni/buildroot/-/pipelines/443445436 > > The one thing that fails is when building python-cryptography on a > target arch that is the same as the host. This can be reproduced by > running the tests.package.test_docker_compose.TestDockerCompose test > case. > > We get this: > > Running `/home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build` > error: failed to run custom build command for `proc-macro-hack v0.5.19` > > Caused by: > process didn't exit successfully: `/home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build` (exi > t status: 1) > --- stderr > /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio > n `GLIBC_2.33' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) > /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio > n `GLIBC_2.32' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) > /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio > n `GLIBC_2.34' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) > warning: build failed, waiting for other jobs to finish... > error: build failed > > Which looks terribly similar to the issue on ripgrep which was fixed > by commit 4b2be770b8a853a7dd97b5788d837f0d84923fa1. So I tried doing > the same, i.e passing: > > __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > CARGO_TARGET_APPLIES_TO_HOST="false" > > in the environment, and -Z target-applies-to-host to cargo (by passing > it to the args argument of the RustExtension class in > python-cryptography's setup.py). But cargo doesn't like that, the > build log goes like this: > >>>> python-cryptography 36.0.1 BuildingESC[27m > ... calling setup.py ... > cargo rustc --lib --manifest-path src/rust/Cargo.toml --features pyo3/abi3-py36 pyo3/extension-module --target x86_64-unknown-linux-gnu -Z target-applies-to-host --release --verbose -- --crate-type cdylib > ... > error: unknown `-Z` flag specified: target-applies-to-host > > The difference that I see with the cargo infrastructure is that this > is not using "cargo build" but "cargo rustc". I would really > appreciate some help on solving this (last?) issue. > > Best regards, > > Thomas Petazzoni > > > Thomas Petazzoni (7): > package/ca-certificates: remove dependency on host-python-cryptography > package/python-cryptography: drop host variant > package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 > package/rustc: fix the riscv64gc architecture handling > support/download/cargo-post-process: make manifest path configurable > support/testing/tests: switch python-cryptography related tests to > glibc > DO-NOT-APPLY package/python-cryptography: bump version to 36.0.1 > > ...2pem.py-make-cryptography-module-opt.patch | 59 +++++++++++++++++++ > package/ca-certificates/ca-certificates.mk | 2 +- > package/docker-compose/Config.in | 8 ++- > package/python-autobahn/Config.in | 6 +- > package/python-channels-redis/Config.in | 7 +-- > package/python-channels/Config.in | 7 +-- > package/python-crossbar/Config.in | 6 +- > package/python-cryptography/Config.in | 14 +---- > .../python-cryptography.hash | 5 +- > .../python-cryptography.mk | 20 ++++--- > package/python-daphne/Config.in | 7 +-- > package/python-keyring/Config.in | 7 +-- > package/python-opcua-asyncio/Config.in | 1 + > package/python-paramiko/Config.in | 8 +-- > package/python-pyopenssl/Config.in | 8 +-- > package/python-secretstorage/Config.in | 6 +- > package/python-service-identity/Config.in | 10 ++-- > package/python-treq/Config.in | 10 ++-- > package/python-twisted/Config.in | 6 +- > package/python-txdbus/Config.in | 5 +- > package/python-txtorcon/Config.in | 7 +-- > package/rustc/Config.in.host | 4 +- > support/download/cargo-post-process | 2 +- > .../tests/package/test_python_autobahn.py | 10 +++- > .../tests/package/test_python_crossbar.py | 10 +++- > .../tests/package/test_python_cryptography.py | 10 +++- > .../package/test_python_service_identity.py | 10 +++- > .../testing/tests/package/test_python_treq.py | 10 +++- > .../tests/package/test_python_txtorcon.py | 10 +++- > 29 files changed, 170 insertions(+), 105 deletions(-) > create mode 100644 package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch > From peter at korsgaard.com Sat Jan 8 16:54:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 17:54:13 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: (Fabrice Fontaine's message of "Sat, 8 Jan 2022 16:03:49 +0100") References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> Message-ID: <87zgo6f9sa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Hi, > Le sam. 8 janv. 2022 ? 15:14, Peter Korsgaard a ?crit : >> >> >>>>> "Fabrice" == Fabrice Fontaine writes: >> >> Hi, >> >> > Indeed, this is also an alternative, even if I think that adding >> > mbedtls3 would be a great addition. >> > For example, libcurl supports mbedts 3.0 since its version 7.79 and >> > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. >> > Otherwise, as requested by Thomas, I sent an email to mbedtls mailing >> > list: >> > https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ >> >> What is the plan from upstream regarding mbedtls 2.x? Will it be >> maintained in parallel with 3.x for some time (and for how long?) or is >> it effectively EOL already? > 2.16.x is EOL since December 2021: > https://tls.mbed.org/tech-updates/blog/announcing-lts-branch-mbedtls-2.16 > The next LTS branch is 2.28 which will be maintained until end of > 2024: https://github.com/ARMmbed/mbedtls/blob/development/BRANCHES.md Ok, so we should ideally move our mbedtls version to 2.28.x before 2022.02. What about 3.x, is that also a LTS or is that considered a not-yet-stable development version? For the question if we need to maintain both 2.28.x and 3.x in parallel I guess it really depends on if the packages we have depending on mbedtls (E.G. bctoolbox, bmx7, mongrel2, shadowsocks-libev) can (be patched to) work with mbedtls 3.x or not? If they can (or are no longer maintained upstream), then I would prefer to only support mbedtls 3.x going forward. If on the other hand mbedtls 3.x isn't really stable yet and only needed for hiawatha, then indeed we should perhaps just postpone it a bit and use the internal mbedtls copy in hiawatha or downgrade / drop TLS support. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 16:57:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 17:57:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: bump version to 1.8.1 In-Reply-To: <20220108095451.1078507-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:54:51 +0100") References: <20220108095451.1078507-1-bernd.kuhls@t-online.de> Message-ID: <87v8yuf9n0.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Reformatted hashes. > Changelog: https://github.com/NLnetLabs/ldns/blob/develop/Changelog > Signed-off-by: Bernd Kuhls Do you use libldns? I notice we have a comment in the .mk file: # --disable-dane-verify can be removed after openssl bump to 1.1.x Which sounds like something that could be updated? Please verify that it also works with libressl. -- Bye, Peter Korsgaard From arnout at mind.be Sat Jan 8 16:59:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 17:59:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-memory-profiler: new package In-Reply-To: <20201024145750.267540-1-asafka7@gmail.com> References: <20201024145750.267540-1-asafka7@gmail.com> Message-ID: <5bd067df-5e7b-1248-7dad-bf790a57ee68@mind.be> On 24/10/2020 16:57, Asaf Kahlon wrote: > A module for monitoring memory usage of a python program. > > Signed-off-by: Asaf Kahlon A bit late, but: applied to master, thanks. Sorry it took so long. Regards, Arnout > --- > package/Config.in | 1 + > package/python-memory-profiler/Config.in | 8 ++++++++ > .../python-memory-profiler.hash | 5 +++++ > .../python-memory-profiler.mk | 14 ++++++++++++++ > 4 files changed, 28 insertions(+) > create mode 100644 package/python-memory-profiler/Config.in > create mode 100644 package/python-memory-profiler/python-memory-profiler.hash > create mode 100644 package/python-memory-profiler/python-memory-profiler.mk > > diff --git a/package/Config.in b/package/Config.in > index 504cfec98e..4da49ad179 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1037,6 +1037,7 @@ menu "External python modules" > source "package/python-matplotlib/Config.in" > source "package/python-mbstrdecoder/Config.in" > source "package/python-meld3/Config.in" > + source "package/python-memory-profiler/Config.in" > source "package/python-mimeparse/Config.in" > source "package/python-mistune/Config.in" > source "package/python-modbus-tk/Config.in" > diff --git a/package/python-memory-profiler/Config.in b/package/python-memory-profiler/Config.in > new file mode 100644 > index 0000000000..60833304ae > --- /dev/null > +++ b/package/python-memory-profiler/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_PYTHON_MEMORY_PROFILER > + bool "python-memory-profiler" > + depends on BR2_PACKAGE_PYTHON3 > + select BR2_PACKAGE_PYTHON_PSUTIL # runtime > + help > + A module for monitoring memory usage of a python program. > + > + https://github.com/pythonprofilers/memory_profiler > diff --git a/package/python-memory-profiler/python-memory-profiler.hash b/package/python-memory-profiler/python-memory-profiler.hash > new file mode 100644 > index 0000000000..9ee515b529 > --- /dev/null > +++ b/package/python-memory-profiler/python-memory-profiler.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/memory-profiler/json > +md5 b1d1783064a1198fb21bc877e535ec1b memory_profiler-0.58.0.tar.gz > +sha256 01385ac0fec944fcf7969814ec4406c6d8a9c66c079d09276723c5a7680f44e5 memory_profiler-0.58.0.tar.gz > +# Locally computed sha256 checksums > +sha256 51926ce91b8283532efa9dfb02518582c15f49c105a3ac18cce1f7a4947e96ae COPYING > diff --git a/package/python-memory-profiler/python-memory-profiler.mk b/package/python-memory-profiler/python-memory-profiler.mk > new file mode 100644 > index 0000000000..053b0e2d62 > --- /dev/null > +++ b/package/python-memory-profiler/python-memory-profiler.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-memory-profiler > +# > +################################################################################ > + > +PYTHON_MEMORY_PROFILER_VERSION = 0.58.0 > +PYTHON_MEMORY_PROFILER_SOURCE = memory_profiler-$(PYTHON_MEMORY_PROFILER_VERSION).tar.gz > +PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/8f/fd/d92b3295657f8837e0177e7b48b32d6651436f0293af42b76d134c3bb489 > +PYTHON_MEMORY_PROFILER_SETUP_TYPE = setuptools > +PYTHON_MEMORY_PROFILER_LICENSE = BSD-3-Clause > +PYTHON_MEMORY_PROFILER_LICENSE_FILES = COPYING > + > +$(eval $(python-package)) > From arnout at mind.be Sat Jan 8 16:57:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:57:46 +0100 Subject: [Buildroot] [git commit] package/python-memory-profiler: new package Message-ID: <20220108165256.77BE482DF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c17a9b2de86ace9754ca874707736705865dd309 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A module for monitoring memory usage of a python program. Signed-off-by: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/python-memory-profiler/Config.in | 8 ++++++++ package/python-memory-profiler/python-memory-profiler.hash | 5 +++++ package/python-memory-profiler/python-memory-profiler.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/package/Config.in b/package/Config.in index bf7a346f75..bf18d5f4fb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1090,6 +1090,7 @@ menu "External python modules" source "package/python-markupsafe/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" + source "package/python-memory-profiler/Config.in" source "package/python-mimeparse/Config.in" source "package/python-mistune/Config.in" source "package/python-modbus-tk/Config.in" diff --git a/package/python-memory-profiler/Config.in b/package/python-memory-profiler/Config.in new file mode 100644 index 0000000000..60833304ae --- /dev/null +++ b/package/python-memory-profiler/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MEMORY_PROFILER + bool "python-memory-profiler" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PSUTIL # runtime + help + A module for monitoring memory usage of a python program. + + https://github.com/pythonprofilers/memory_profiler diff --git a/package/python-memory-profiler/python-memory-profiler.hash b/package/python-memory-profiler/python-memory-profiler.hash new file mode 100644 index 0000000000..9ee515b529 --- /dev/null +++ b/package/python-memory-profiler/python-memory-profiler.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/memory-profiler/json +md5 b1d1783064a1198fb21bc877e535ec1b memory_profiler-0.58.0.tar.gz +sha256 01385ac0fec944fcf7969814ec4406c6d8a9c66c079d09276723c5a7680f44e5 memory_profiler-0.58.0.tar.gz +# Locally computed sha256 checksums +sha256 51926ce91b8283532efa9dfb02518582c15f49c105a3ac18cce1f7a4947e96ae COPYING diff --git a/package/python-memory-profiler/python-memory-profiler.mk b/package/python-memory-profiler/python-memory-profiler.mk new file mode 100644 index 0000000000..053b0e2d62 --- /dev/null +++ b/package/python-memory-profiler/python-memory-profiler.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-memory-profiler +# +################################################################################ + +PYTHON_MEMORY_PROFILER_VERSION = 0.58.0 +PYTHON_MEMORY_PROFILER_SOURCE = memory_profiler-$(PYTHON_MEMORY_PROFILER_VERSION).tar.gz +PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/8f/fd/d92b3295657f8837e0177e7b48b32d6651436f0293af42b76d134c3bb489 +PYTHON_MEMORY_PROFILER_SETUP_TYPE = setuptools +PYTHON_MEMORY_PROFILER_LICENSE = BSD-3-Clause +PYTHON_MEMORY_PROFILER_LICENSE_FILES = COPYING + +$(eval $(python-package)) From arnout at mind.be Sat Jan 8 17:04:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 18:04:40 +0100 Subject: [Buildroot] [PATCH] package/lua-inotify: new package In-Reply-To: <20200518052345.1721724-1-francois.perrad@gadz.org> References: <20200518052345.1721724-1-francois.perrad@gadz.org> Message-ID: On 18/05/2020 07:23, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Sorry it took so long. I also added you to DEVELOPERS for this package. Regards, Arnout > --- > .gitlab-ci.yml | 2 ++ > package/Config.in | 1 + > package/lua-inotify/Config.in | 6 +++++ > package/lua-inotify/lua-inotify.hash | 3 +++ > package/lua-inotify/lua-inotify.mk | 14 +++++++++++ > .../testing/tests/package/test_lua_inotify.py | 25 +++++++++++++++++++ > 6 files changed, 51 insertions(+) > create mode 100644 package/lua-inotify/Config.in > create mode 100644 package/lua-inotify/lua-inotify.hash > create mode 100644 package/lua-inotify/lua-inotify.mk > create mode 100644 support/testing/tests/package/test_lua_inotify.py > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index fa8e077a0..85dadd00d 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -421,6 +421,8 @@ tests.package.test_lua_gd.TestLuaLuaGD: { extends: .runtime_test } > tests.package.test_lua_gd.TestLuajitLuaGD: { extends: .runtime_test } > tests.package.test_lua_http.TestLuaHttp: { extends: .runtime_test } > tests.package.test_lua_http.TestLuajitHttp: { extends: .runtime_test } > +tests.package.test_lua_inotify.TestLuaInotify: { extends: .runtime_test } > +tests.package.test_lua_inotify.TestLuajitInotify: { extends: .runtime_test } > tests.package.test_lua_lyaml.TestLuaLuaLyaml: { extends: .runtime_test } > tests.package.test_lua_lyaml.TestLuajitLuaLyaml: { extends: .runtime_test } > tests.package.test_lua_sdl2.TestLuaLuaSDL2: { extends: .runtime_test } > diff --git a/package/Config.in b/package/Config.in > index c12676d85..191eea859 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -653,6 +653,7 @@ menu "Lua libraries/modules" > source "package/lua-gd/Config.in" > source "package/lua-http/Config.in" > source "package/lua-iconv/Config.in" > + source "package/lua-inotify/Config.in" > source "package/lua-livr/Config.in" > source "package/lua-livr-extra/Config.in" > source "package/lua-lpeg-patterns/Config.in" > diff --git a/package/lua-inotify/Config.in b/package/lua-inotify/Config.in > new file mode 100644 > index 000000000..2b0c943c6 > --- /dev/null > +++ b/package/lua-inotify/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_LUA_INOTIFY > + bool "lua-inotify" > + help > + Inotify bindings for Lua. > + > + http://hoelz.ro/projects/linotify > diff --git a/package/lua-inotify/lua-inotify.hash b/package/lua-inotify/lua-inotify.hash > new file mode 100644 > index 000000000..183638954 > --- /dev/null > +++ b/package/lua-inotify/lua-inotify.hash > @@ -0,0 +1,3 @@ > +# computed by luarocks/buildroot > +sha256 9164b5777b132d7e1e073478d8837a526262991c57e32d75d517100f533eb436 inotify-0.5-1.src.rock > +sha256 b02158adb3c7763e1183a9386672f4f037bfeaab0cb0c73d684f34f3ea1993d8 linotify-0.5/COPYRIGHT > diff --git a/package/lua-inotify/lua-inotify.mk b/package/lua-inotify/lua-inotify.mk > new file mode 100644 > index 000000000..dde7fc0fa > --- /dev/null > +++ b/package/lua-inotify/lua-inotify.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# lua-inotify > +# > +################################################################################ > + > +LUA_INOTIFY_VERSION_UPSTREAM = 0.5 > +LUA_INOTIFY_VERSION = $(LUA_INOTIFY_VERSION_UPSTREAM)-1 > +LUA_INOTIFY_NAME_UPSTREAM = inotify > +LUA_INOTIFY_SUBDIR = linotify-$(LUA_INOTIFY_VERSION_UPSTREAM) > +LUA_INOTIFY_LICENSE = MIT > +LUA_INOTIFY_LICENSE_FILES = $(LUA_INOTIFY_SUBDIR)/COPYRIGHT > + > +$(eval $(luarocks-package)) > diff --git a/support/testing/tests/package/test_lua_inotify.py b/support/testing/tests/package/test_lua_inotify.py > new file mode 100644 > index 000000000..c951a9c5d > --- /dev/null > +++ b/support/testing/tests/package/test_lua_inotify.py > @@ -0,0 +1,25 @@ > +from tests.package.test_lua import TestLuaBase > + > + > +class TestLuaInotify(TestLuaBase): > + config = TestLuaBase.config + \ > + """ > + BR2_PACKAGE_LUA=y > + BR2_PACKAGE_LUA_INOTIFY=y > + """ > + > + def test_run(self): > + self.login() > + self.module_test("inotify") > + > + > +class TestLuajitInotify(TestLuaBase): > + config = TestLuaBase.config + \ > + """ > + BR2_PACKAGE_LUAJIT=y > + BR2_PACKAGE_LUA_INOTIFY=y > + """ > + > + def test_run(self): > + self.login() > + self.module_test("inotify") > From arnout at mind.be Sat Jan 8 17:03:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 18:03:59 +0100 Subject: [Buildroot] [git commit] package/lua-inotify: new package Message-ID: <20220108165832.A627B82A9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e39379ff595d189c714bb758f5da1a0882fa1a2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/lua-inotify/Config.in | 6 ++++++ package/lua-inotify/lua-inotify.hash | 3 +++ package/lua-inotify/lua-inotify.mk | 14 +++++++++++++ support/testing/tests/package/test_lua_inotify.py | 25 +++++++++++++++++++++++ 6 files changed, 50 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a64a9ef384..eb605b9170 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -983,6 +983,7 @@ F: package/libtommath/ F: package/libwpe/ F: package/linenoise/ F: package/ljlinenoise/ +F: package/lua-inotify/ F: package/lpeg/ F: package/lpty/ F: package/lrandom/ diff --git a/package/Config.in b/package/Config.in index bf18d5f4fb..3b1c38db47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -685,6 +685,7 @@ menu "Lua libraries/modules" source "package/lua-gd/Config.in" source "package/lua-http/Config.in" source "package/lua-iconv/Config.in" + source "package/lua-inotify/Config.in" source "package/lua-livr/Config.in" source "package/lua-livr-extra/Config.in" source "package/lua-lpeg-patterns/Config.in" diff --git a/package/lua-inotify/Config.in b/package/lua-inotify/Config.in new file mode 100644 index 0000000000..2b0c943c60 --- /dev/null +++ b/package/lua-inotify/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_INOTIFY + bool "lua-inotify" + help + Inotify bindings for Lua. + + http://hoelz.ro/projects/linotify diff --git a/package/lua-inotify/lua-inotify.hash b/package/lua-inotify/lua-inotify.hash new file mode 100644 index 0000000000..183638954c --- /dev/null +++ b/package/lua-inotify/lua-inotify.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 9164b5777b132d7e1e073478d8837a526262991c57e32d75d517100f533eb436 inotify-0.5-1.src.rock +sha256 b02158adb3c7763e1183a9386672f4f037bfeaab0cb0c73d684f34f3ea1993d8 linotify-0.5/COPYRIGHT diff --git a/package/lua-inotify/lua-inotify.mk b/package/lua-inotify/lua-inotify.mk new file mode 100644 index 0000000000..dde7fc0fa4 --- /dev/null +++ b/package/lua-inotify/lua-inotify.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# lua-inotify +# +################################################################################ + +LUA_INOTIFY_VERSION_UPSTREAM = 0.5 +LUA_INOTIFY_VERSION = $(LUA_INOTIFY_VERSION_UPSTREAM)-1 +LUA_INOTIFY_NAME_UPSTREAM = inotify +LUA_INOTIFY_SUBDIR = linotify-$(LUA_INOTIFY_VERSION_UPSTREAM) +LUA_INOTIFY_LICENSE = MIT +LUA_INOTIFY_LICENSE_FILES = $(LUA_INOTIFY_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/support/testing/tests/package/test_lua_inotify.py b/support/testing/tests/package/test_lua_inotify.py new file mode 100644 index 0000000000..c951a9c5d6 --- /dev/null +++ b/support/testing/tests/package/test_lua_inotify.py @@ -0,0 +1,25 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaInotify(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_INOTIFY=y + """ + + def test_run(self): + self.login() + self.module_test("inotify") + + +class TestLuajitInotify(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_LUA_INOTIFY=y + """ + + def test_run(self): + self.login() + self.module_test("inotify") From fontaine.fabrice at gmail.com Sat Jan 8 17:15:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:15:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: <87zgo6f9sa.fsf@dell.be.48ers.dk> References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> <87zgo6f9sa.fsf@dell.be.48ers.dk> Message-ID: Le sam. 8 janv. 2022 ? 17:54, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > > Hi, > > Le sam. 8 janv. 2022 ? 15:14, Peter Korsgaard a ?crit : > >> > >> >>>>> "Fabrice" == Fabrice Fontaine writes: > >> > >> Hi, > >> > >> > Indeed, this is also an alternative, even if I think that adding > >> > mbedtls3 would be a great addition. > >> > For example, libcurl supports mbedts 3.0 since its version 7.79 and > >> > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. > >> > Otherwise, as requested by Thomas, I sent an email to mbedtls mailing > >> > list: > >> > https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ > >> > >> What is the plan from upstream regarding mbedtls 2.x? Will it be > >> maintained in parallel with 3.x for some time (and for how long?) or is > >> it effectively EOL already? > > 2.16.x is EOL since December 2021: > > https://tls.mbed.org/tech-updates/blog/announcing-lts-branch-mbedtls-2.16 > > The next LTS branch is 2.28 which will be maintained until end of > > 2024: https://github.com/ARMmbed/mbedtls/blob/development/BRANCHES.md > > Ok, so we should ideally move our mbedtls version to 2.28.x before > 2022.02. What about 3.x, is that also a LTS or is that considered a > not-yet-stable development version? > > For the question if we need to maintain both 2.28.x and 3.x in > parallel I guess it really depends on if the packages we have depending > on mbedtls (E.G. bctoolbox, bmx7, mongrel2, shadowsocks-libev) can (be > patched to) work with mbedtls 3.x or not? It is really unlikely that all these packages will be patched to work with mbedtls 3.x. To my knowledge, only hiawatha and curl have been patched to support mbedtls 3.x. and it should be noted that curl supports mbedtls 2.x and 3.x: https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad lighttpd is trying to migrate but has a lot of issues: https://github.com/ARMmbed/mbedtls/issues/5331 > > If they can (or are no longer maintained upstream), then I would prefer > to only support mbedtls 3.x going forward. If on the other hand mbedtls > 3.x isn't really stable yet and only needed for hiawatha, then indeed we > should perhaps just postpone it a bit and use the internal mbedtls copy > in hiawatha or downgrade / drop TLS support. 3.x is more "secure" because many obsolete cryptographic mechanisms and TLS protocol versions and options have been removed. However, it is probably ok to postpone the addition of mbedtls 3.x until more packages support it. It should be noted that we'll have the same issue/question with openssl 3.x ... > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From peter at korsgaard.com Sat Jan 8 17:26:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:26:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump to version 2021.07.01 In-Reply-To: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 17:21:46 +0100") References: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> Message-ID: <87mtk6f8aj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Sat Jan 8 17:26:43 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 18:26:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-argustv: bump version to 19.2.0-Matrix Message-ID: <20220108172643.3465687-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 47ecd18975..e58f9a4608 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 31f0ac72c8549339c18c828e51ce2531c24686c6ce6c734db0f2b0ce67ff41a3 kodi-pvr-argustv-19.1.1-Matrix.tar.gz +sha256 dfd19f9c1c4efe556d3764a5bec7842092b246932159ff69cf5bb1f64c8b9473 kodi-pvr-argustv-19.2.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 793f7f1adc..230ef1067c 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.1.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.2.0-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From fontaine.fabrice at gmail.com Sat Jan 8 17:24:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:24:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: bump to version 02092020 Message-ID: <20220108172441.2819559-1-fontaine.fabrice@gmail.com> - Update indentation in hash file (two spaces) - This bump will fix the following build failure with libest which was added with commit f6f0e1e58168dfa9194db2e073efd20a98c15728: In file included from /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_lib.h:43:0, from est_server_http.c:39: /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_types.h:42:9: error: unknown type name 'size_t' typedef size_t rsize_t; ^~~~~~ https://github.com/rurban/safeclib/blob/v02092020/ChangeLog Fixes: - http://autobuild.buildroot.org/results/5a12f1cb4153834078522b6068ff24ac0300d51d Signed-off-by: Fabrice Fontaine --- package/safeclib/safeclib.hash | 6 +++--- package/safeclib/safeclib.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/safeclib/safeclib.hash b/package/safeclib/safeclib.hash index 7e1c6794e4..af732f93fd 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,5 +1,5 @@ -# From https://github.com/rurban/safeclib/releases/tag/v08112019 -sha256 bc2f25875522c50a3a5901981020d906db0b6a7d365619b8d72412c126be3923 libsafec-08112019.0-gad76c7.tar.bz2 +# From https://github.com/rurban/safeclib/releases/tag/v02092020 +sha256 d374bdcbfcdc4c9a76abed3707667372ca212fd87a369e7bcaaa54e716d27c0a libsafec-02092020.tar.xz # Hash for license file -sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING +sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 3af8fbb167..032a73bf67 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,10 +4,10 @@ # ################################################################################ -SAFECLIB_VERSION = 08112019 +SAFECLIB_VERSION = 02092020 SAFECLIB_SITE = \ https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) -SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).0-gad76c7.tar.bz2 +SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES -- 2.34.1 From peter at korsgaard.com Sat Jan 8 17:28:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:28:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libeastl: drop duplicated sentence In-Reply-To: <20220108161630.2730118-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 17:16:30 +0100") References: <20220108161630.2730118-1-fontaine.fabrice@gmail.com> Message-ID: <87iluuf87c.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop duplicated sentence from Config.in > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sat Jan 8 17:28:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 18:28:30 +0100 Subject: [Buildroot] [PATCH 0/1] [RFC] add support for icecc In-Reply-To: <20200429140729.3325-1-cturner@igalia.com> References: <20200429140729.3325-1-cturner@igalia.com> Message-ID: Hi Charlie, Sorry that you didn't get any reaction to this for almost two years. Covid was burning the maintainers out a bit :-( Anyway, here are some answers in case it's still relevant. Also, IceCC support would really be welcome in Buildroot. There are some users that need to build really big configurations so parallel build is welcome. Note of course that you'll have to combine it with top-level parallel build to be fully efficient, otherwise you're quickly going to run into serialisation. On 29/04/2020 16:07, Charlie Turner wrote: > ? Host packages are still compiled locally, I would like this to > extend to host builds as well. Could just prepend icecc in the > $PATH on the host. Need to test, potential complication is > switching icecc's toolchain mid-build. Might not be an issue, just > not gone there yet. What we do for ccache is simply use the wrapper for target compile and have it as part of HOSTCC for host builds. There are some packages that don't support CC with spaces, so there's HOSTCC_NOCCACHE for that. You can simply add icecc to HOSTCC (and leave HOSTCC_NOCCACHE without either ccache or icecc). > ? Generating the `ICECC_VERSION' tarball from the Makefiles. Ideally > it would all be transparent to the user if, say, > `BR2_ICECC=y'. It's inconvenient for the user to have to call > `--build-native' and arrange for `ICECC_VERSION' to be in the > `make' environment. You need to first build the cross-toolchain, > setup the tarball, and then so long as your toolchain doesn't > change, subsequent rebuilds are distributed. This all needs > automation. Yeah, I think that that's pretty essential. If you want to avoid that complexity and get something merged to start with, you could start with having icecc depend on BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED (and the assumption that the toolchain is already installed on all builders). That should simplify things a bit, no? > ? Number of jobs to simultaneously run has be manually selected, I > don't know of a method to find out how many remote CPUs you have > available with Icecream automatically. Not a big deal. Ideally it should be possible to do this both from the .config but make it possible to override from the environment, similar like how it's with BR2_DL_DIR. But that's a minor nit. Regards, Arnout From peter at korsgaard.com Sat Jan 8 17:28:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:28:20 +0100 Subject: [Buildroot] [git commit] package/libeastl: drop duplicated sentence Message-ID: <20220108172225.2F0708324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59bbe7cc7418d61a5d2963f1d30e558c3111a95e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop duplicated sentence from Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libeastl/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 7609434519..5abea8f810 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help EASTL stands for Electronic Arts Standard Template - Library. EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is an extensive From peter at korsgaard.com Sat Jan 8 17:26:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:26:01 +0100 Subject: [Buildroot] [git commit] package/raspberrypi-usbboot: bump to version 2021.07.01 Message-ID: <20220108172225.2381182A9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1a48f1bac19ac679803353bd048d91d02ffd75d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- package/raspberrypi-usbboot/raspberrypi-usbboot.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 3f66b12ff1..cedc5fb7e1 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz +sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 5d7b433c64..2e4194da0b 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,8 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) +RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 +RASPBERRYPI_USBBOOT_SITE = \ + $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Jan 8 17:29:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:29:56 +0100 Subject: [Buildroot] [git commit] package/mbedtls: bump to version 2.28.0 Message-ID: <20220108172418.A830682AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f8aab08e762742d753d5920718f31c629d0f8d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 2.16.12 was the last release of the 2.16 long-time support branch. Users who want a long-time branch should move to mbedtls-2.28, which is backward-compatible and will be supported for at least 3 years. Use LICENSE file as apache-2.0.txt was dropped with https://github.com/ARMmbed/mbedtls/commit/c76a54554ca8bffedf0e78a1cbdb64451e4ae957 https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 8247748afd..80ae173aff 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12: -sha256 294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393 mbedtls-2.16.12.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0: +sha256 6519579b836ed78cc549375c7c18b111df5717e86ca0eeff4cb64b2674f424cc mbedtls-2.28.0.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 93ac1bb163..c238d664f8 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,14 +4,14 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.12 +MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 -MBEDTLS_LICENSE_FILES = apache-2.0.txt +MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls From peter at korsgaard.com Sat Jan 8 17:30:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:30:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: bump to version 2.28.0 In-Reply-To: <20220108151954.2235611-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 16:19:54 +0100") References: <20220108151954.2235611-1-fontaine.fabrice@gmail.com> Message-ID: <87ee5if83r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 2.16.12 was the last release of the 2.16 long-time support branch. > Users who want a long-time branch should move to mbedtls-2.28, which > is backward-compatible and will be supported for at least 3 years. > Use LICENSE file as apache-2.0.txt was dropped with > https://github.com/ARMmbed/mbedtls/commit/c76a54554ca8bffedf0e78a1cbdb64451e4ae957 > https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 8 17:34:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:34:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/hackrf: add a comma between licenses Message-ID: <20220108173403.2819830-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/hackrf/hackrf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 391bddcdb0..d80f87e6b9 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -7,7 +7,7 @@ HACKRF_VERSION = 2018.01.1 HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz -HACKRF_LICENSE = GPL-2.0+ BSD-3-Clause +HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host -- 2.34.1 From peter at korsgaard.com Sat Jan 8 17:35:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:35:26 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: (Fabrice Fontaine's message of "Sat, 8 Jan 2022 18:15:46 +0100") References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> <87zgo6f9sa.fsf@dell.be.48ers.dk> Message-ID: <87a6g6f7vl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: Hi, >> For the question if we need to maintain both 2.28.x and 3.x in >> parallel I guess it really depends on if the packages we have depending >> on mbedtls (E.G. bctoolbox, bmx7, mongrel2, shadowsocks-libev) can (be >> patched to) work with mbedtls 3.x or not? > It is really unlikely that all these packages will be patched to work > with mbedtls 3.x. > To my knowledge, only hiawatha and curl have been patched to support > mbedtls 3.x. > and it should be noted that curl supports mbedtls 2.x and 3.x: > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad > lighttpd is trying to migrate but has a lot of issues: > https://github.com/ARMmbed/mbedtls/issues/5331 Ok, thanks. >> If they can (or are no longer maintained upstream), then I would prefer >> to only support mbedtls 3.x going forward. If on the other hand mbedtls >> 3.x isn't really stable yet and only needed for hiawatha, then indeed we >> should perhaps just postpone it a bit and use the internal mbedtls copy >> in hiawatha or downgrade / drop TLS support. > 3.x is more "secure" because many obsolete cryptographic mechanisms and > TLS protocol versions and options have been removed. However, it is probably > ok to postpone the addition of mbedtls 3.x until more packages support it. Yes, I agree. What will we do about hiawatha? Patch it to work with 2.x as well, move to the internal mbedtls copy or revert the bump? Did you try contacting upstream about the issue? > It should be noted that we'll have the same issue/question with openssl 3.x ... Indeed, that is another can of worms that has been on my TODO list for a while... -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 8 17:35:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:35:39 +0100 Subject: [Buildroot] [PATCH 0/3] core: fixup PPD paths (branch yem/ppd-fixup-paths) Message-ID: Hello All! This series builds upon previous good work from Andreas [0], Louis-Paul [1], and Adam [2]. The second patch is the core of the change: rather than have multiple hooks that each cater for different types of files (.py, .pc, .pri, .cmake and so on), we jut do what we already do in relocate-sdk: we just look for all text files that have a PPD prefix in them, and replace tht with the cirrent package's PPD. The third patch ensures that we can build reliable filrs lists, so that files we tweak in the infra are not believed to be installed/modified by the current package. The first patch is just a little formatting cleanup. [0] https://lore.kernel.org/buildroot/20200217212350.29750-21-anaumann at ultratronik.de/ [1] https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ [2] https://lore.kernel.org/buildroot/20220106171720.12857-1-aduskett at gmail.com/ Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (3): core/pkg-utils: properly indent per-package-rsync core/pkg-generic: fixup all PPD paths in a generic fashion core/pkg-generic: apply post-prepare hooks before monitoring directories package/pkg-generic.mk | 45 ++++++++++++++++++++++----------------------- package/pkg-utils.mk | 4 ++-- 2 files changed, 24 insertions(+), 25 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 8 17:35:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:35:40 +0100 Subject: [Buildroot] [PATCH 1/3] core/pkg-utils: properly indent per-package-rsync In-Reply-To: References: Message-ID: Continuation lines should be indented one level more than the line the are the continuation of. Signed-off-by: Yann E. MORIN --- package/pkg-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 38ba5bca93..6aa64a2096 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -213,8 +213,8 @@ define per-package-rsync mkdir -p $(3) $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3)$(sep)) + $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ + $(3) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 8 17:35:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:35:41 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: References: Message-ID: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> Some files contain hard-coded absolute paths that point to the host and/or staging directories. With per-package directories (aka. PPD), these paths point to the PPD of the package that created the files, when we want them to point to the PPD of the package that uses them. Up until now, we had two hooks that attempted to fix those files: - a libtool-specific hook that searches for all .la files and seds them with the proper PPD, - a python-specific hook that tweaks just the sysconfigdata and removes the byte-compiled version of the sysconfigdata. But now, we also have a few other kinds of files for which we need to fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others as well. We solve this issue by just replacing any PPD in text files, with the current package's PPD. This is very similar to, and inspired from what is done when relocating the SDK. However, we can't use the existing relocate-sdk script, because that needs to know the original location, which we do not have when we aggregate the PPD (we could store it, but we can easily do without it). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Adam Duskett Cc: Louis-Paul CORDIER Cc: Andreas Naumann --- package/pkg-generic.mk | 43 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6a5fe5507b..1022062bcf 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -90,21 +90,24 @@ endif ####################################### # Helper functions -# Make sure .la files only reference the current per-package -# directory. - -# $1: package name (lower case) -# $2: staging directory of the package ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define fixup-libtool-files - $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ - -name "*.la" -print0 | xargs -0 --no-run-if-empty \ - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" + +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the +# proper staging and host directories for the current package: find +# all text files that contain the PPD root, and replace it with the +# current package's PPD. +define PPD_FIXUP_PATHS + $(Q)grep -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ + |while read -d '' f; do \ + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ + printf '%s\0' "$${f}"; \ + done \ + |xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef -endif -# Make sure python _sysconfigdata*.py files only reference the current -# per-package directory. +# Remove python's pre-compiled "sysconfigdata", as it may contain paths to +# the original staging or host dirs. # # Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) # because those directories may be created in the same recipe this macro will @@ -113,19 +116,15 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define FIXUP_PYTHON_SYSCONFIGDATA $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ \) \ - \( \( -name "_sysconfigdata*.pyc" -delete \) \ - -o \( -name "_sysconfigdata*.py" -print0 \) \ - \) \ - | xargs -0 --no-run-if-empty \ - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + \( -name "_sysconfigdata*.pyc" -delete \) endef -endif + +endif # PPD # Functions to collect statistics about installed files @@ -278,8 +277,6 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) - $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) @@ -836,7 +833,9 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += \ + PPD_FIXUP_PATHS \ + FIXUP_PYTHON_SYSCONFIGDATA ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 8 17:35:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:35:42 +0100 Subject: [Buildroot] [PATCH 3/3] core/pkg-generic: apply post-prepare hooks before monitoring directories In-Reply-To: References: Message-ID: <13e59bc22d9299b2f829d541c1ecdd995f583f95.1641663315.git.yann.morin.1998@free.fr> Monitoring the target/ and host/ directories and so on, will serve to generate lists of files installed by the packages. Those lists are then used to generate graphs of the size those package take on the target for example. With PPD, we will also want to use those lists to only copy those files actually installed by each dependencies of a package, recursively. Currently, those lists are not entirely reliable, as the starting points are established before we apply PPD fixup hooks. As such, at the end of a package installation, fixed up files will be found to belong to the current package, while they were in fact provided by one of its dependency. While this does no big harm, if at all, for the size graphs, it will trigger overwrite detection when we eventually gather packages together to aggregate a PPD or te final host and target. So, we better have the lists of files be reliable. So, we only start monitoring the directories after we apply the PPD fixups (or seen the other way around for a smaller diff: we apply the PPD fixups before we start monitoring the directories). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Herve Codina --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 1022062bcf..b1f4d219bb 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call MESSAGE,"Configuring") $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) @$(call pkg_size_before,$(TARGET_DIR)) @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) -- 2.25.1 From arnout at mind.be Sat Jan 8 17:37:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 18:37:15 +0100 Subject: [Buildroot] [PATCH 1/1] [RFC] add support for icecc In-Reply-To: <20200429140729.3325-2-cturner@igalia.com> References: <20200429140729.3325-1-cturner@igalia.com> <20200429140729.3325-2-cturner@igalia.com> Message-ID: <6baa15d6-7df0-1aa7-71c5-dea500fe9bfb@mind.be> On 29/04/2020 16:07, Charlie Turner wrote: > Signed-off-by: Charlie Turner > --- > Config.in | 9 +++++++++ > Makefile | 2 ++ > toolchain/toolchain-wrapper.c | 26 ++++++++++++++++++++++++++ > toolchain/toolchain-wrapper.mk | 4 ++++ > 4 files changed, 41 insertions(+) > > diff --git a/Config.in b/Config.in > index 48fd36ff98..bda65e8daf 100644 > --- a/Config.in > +++ b/Config.in > @@ -367,6 +367,15 @@ config BR2_CCACHE_USE_BASEDIR > > endif > > +config BR2_ICECC > + bool "Enable distributed compilation" > + help > + Write a nice explanation. > + > +if BR2_ICECC > + > +endif > + > config BR2_ENABLE_DEBUG > bool "build packages with debugging symbols" > help > diff --git a/Makefile b/Makefile > index ae29b042ec..30000b2390 100644 > --- a/Makefile > +++ b/Makefile > @@ -472,6 +472,8 @@ BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)" > # should not be used as the root filesystem. > TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM > > +# FIXME: Add the appropriate stuff for BR2_ICECC for accelerated host > +# builds? > ifeq ($(BR2_CCACHE),y) > CCACHE = $(HOST_DIR)/bin/ccache > BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR)) > diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c > index 8cfc963ccd..3e6c9c2603 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -28,6 +28,9 @@ > #ifdef BR_CCACHE > static char ccache_path[PATH_MAX]; > #endif > +#ifdef BR_ICECC > +static char icecc_path[PATH_MAX]; > +#endif > static char path[PATH_MAX]; > static char sysroot[PATH_MAX]; > /* As would be defined by gcc: > @@ -59,6 +62,13 @@ static char _date_[sizeof("-D__DATE__=\"MMM DD YYYY\"")]; > static char *predef_args[] = { > #ifdef BR_CCACHE > ccache_path, > +#endif > +#if defined(BR_ICECC) && !defined(BR_CCACHE) > +/* When icecc and ccache are used together, ccache is used as the Actually, I expect that combining the two (with a cluster of >5 machines) and with top-level parallel build) will slow down the build because the ccache calculations are not serialized and they're relatively expensive (on most object files, ccache is only a few times faster than just doing the compilation). So to simplify our life we could just make ccache and icecc mutually exclusive. > + * wrapper, which then rewraps with icecc via the CCACHE_PREFIX > + * environment variable, see below. > + */ > + icecc_path, > #endif > path, > "--sysroot", sysroot, > @@ -312,6 +322,15 @@ int main(int argc, char **argv) > return 3; > } > #endif > + > +#ifdef BR_ICECC > + /* FIXME: hardcoding. Copy how ccache is installed in the abspath in output/host? */ ccache is built by Buildroot itself. If you assume that icecc is pre-installed, you could just make the path a Config.in option and pass it in with a -D option, similar to e.g. BR_ABI. You can even reuse the BR_ICECC macro, i.e. -DBR_ICECC=\"$(call qstrip, $(BR2_ICECC_PATH))\" > + ret = snprintf(icecc_path, sizeof(icecc_path), "/home/cht/local/bin/icecc"); > + if (ret >= sizeof(icecc_path)) { > + perror(__FILE__ ": overflow"); > + return 3; > + } > +#endif > ret = snprintf(sysroot, sizeof(sysroot), "%s/" BR_SYSROOT, absbasedir); > if (ret >= sizeof(sysroot)) { > perror(__FILE__ ": overflow"); > @@ -532,6 +551,13 @@ int main(int argc, char **argv) > } > #endif > > +#if defined(BR_CCACHE) && defined(BR_ICECC) > + if (setenv("CCACHE_PREFIX", icecc_path, 0)) { Again, I don't think it's worth supporting the combination of the two. Regards, Arnout > + perror(__FILE__ ": Failed to set CCACHE_PREFIX"); > + return 3; > + } > +#endif > + > if (execv(exec_args[0], exec_args)) > perror(path); > > diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk > index 09dda17890..1a8532208c 100644 > --- a/toolchain/toolchain-wrapper.mk > +++ b/toolchain/toolchain-wrapper.mk > @@ -39,6 +39,10 @@ ifeq ($(BR2_CCACHE),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE > endif > > +ifeq ($(BR2_ICECC),y) > +TOOLCHAIN_WRAPPER_ARGS += -DBR_ICECC > +endif > + > ifeq ($(BR2_x86_x1000),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR_OMIT_LOCK_PREFIX > endif > From fontaine.fabrice at gmail.com Sat Jan 8 17:36:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:36:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburcu: bump to version 0.13.1 Message-ID: <20220108173613.2820050-1-fontaine.fabrice@gmail.com> https://github.com/urcu/userspace-rcu/blob/v0.13.1/ChangeLog Signed-off-by: Fabrice Fontaine --- package/liburcu/liburcu.hash | 4 ++-- package/liburcu/liburcu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburcu/liburcu.hash b/package/liburcu/liburcu.hash index 8ff11623d0..1968c3784e 100644 --- a/package/liburcu/liburcu.hash +++ b/package/liburcu/liburcu.hash @@ -1,5 +1,5 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.13.0.tar.bz2.sha256 -sha256 cbb20dbe1a892c2a4d8898bac4316176e585392693d498766ccbbc68cf20ba20 userspace-rcu-0.13.0.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2.sha256 +sha256 3213f33d2b8f710eb920eb1abb279ec04bf8ae6361f44f2513c28c20d3363083 userspace-rcu-0.13.1.tar.bz2 # Hash for license files sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk index e29784abe4..895dd6bb66 100644 --- a/package/liburcu/liburcu.mk +++ b/package/liburcu/liburcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURCU_VERSION = 0.13.0 +LIBURCU_VERSION = 0.13.1 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) -- 2.34.1 From ps.report at gmx.net Sat Jan 8 17:39:19 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 8 Jan 2022 18:39:19 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> Message-ID: <20220108183919.238c1885@gmx.net> Hello Fabrice, *, On Sat, 8 Jan 2022 17:13:47 +0100, Fabrice Fontaine wrote: > Hi, > > Le sam. 8 janv. 2022 ? 11:51, Thomas Petazzoni > a ?crit : > > > > On Tue, 4 Jan 2022 21:54:55 +0100 > > Fabrice Fontaine wrote: > > > > > Fix the following build failure raised since bump to version 5.41 in > > > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > > > > > readelf.c: In function 'do_auxv_note': > > > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > > > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > > > ^ > > > > > > Fixes: > > > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > > > > > > Signed-off-by: Fabrice Fontaine > > > > I am afraid it seems like this didn't fix the problem, see: > > > > http://autobuild.buildroot.net/results/957/9573e8b01d8f21cd89a67475daabdeef533d31d7/build-end.log > > > > ac_cv_prog_cc_c99='-std=gnu99' is properly passed to the configure > > script, but it still fails. > Indeed, I suggest to revert this commit and apply the version 1 of > this patch instead of trying to understand what is "broken" in the > configure script. The difference seems to be: $ diff -ru file-5.38/configure.ac file-5.41/configure.ac [...] @@ -88,7 +88,7 @@ AC_SUBST(WARNINGS) dnl Checks for programs. -AC_PROG_CC_STDC +AC_PROG_CC AC_USE_SYSTEM_EXTENSIONS AM_PROG_CC_C_O AC_C_BIGENDIAN [...] According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 feature is gone (still used for target/host in package/file/file.mk)... Regards, Peter [1] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/C-Compiler.html > > > > Thomas > > -- > > Thomas Petazzoni, co-owner and CEO, Bootlin > > Embedded Linux and Kernel engineering and training > > https://bootlin.com > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From yann.morin.1998 at free.fr Sat Jan 8 17:39:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:39:25 +0100 Subject: [Buildroot] [git commit] package/libpri: add Linux in comment Message-ID: <20220108173322.F35FB83242@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0730b8b8228391ec36ace6e1d1d0831590b8d0cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libpri/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpri/Config.in b/package/libpri/Config.in index de2d96fcc4..0684d2ac83 100644 --- a/package/libpri/Config.in +++ b/package/libpri/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI http://www.asterisk.org/downloads/libpri -comment "libpri needs a kernel to be built" +comment "libpri needs a Linux kernel to be built" depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL From yann.morin.1998 at free.fr Sat Jan 8 17:39:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:39:25 +0100 Subject: [Buildroot] [git commit] package/libss7: add Linux in comment Message-ID: <20220108173323.0886D832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0de6291e3fe8d9f6c572a5206b8ead3719f6829 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libss7/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index bdf5fbe3a8..d8bcf11ce7 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBSS7 http://www.asterisk.org/downloads/libss7 -comment "libss7 needs a kernel to be built" +comment "libss7 needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL comment "libss7 needs a toolchain w/ threads" From yann.morin.1998 at free.fr Sat Jan 8 17:39:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:39:25 +0100 Subject: [Buildroot] [git commit] package/nvidia-driver: add Linux in comment Message-ID: <20220108173323.11DED832CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=956cd5b9b7136344bc2641fbe3e1abfa2eff1bc8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nvidia-driver/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 9631b3e70c..a8617a939b 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -75,7 +75,7 @@ config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA -comment "nvidia kernel module needs a kernel to be built" +comment "nvidia kernel module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_NVIDIA_DRIVER_MODULE From yann.morin.1998 at free.fr Sat Jan 8 17:40:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:40:37 +0100 Subject: [Buildroot] [PATCH 1/3] package/libpri: add Linux in comment In-Reply-To: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> References: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> Message-ID: <20220108174037.GB1881783@scaer> Fabrice, All, On 2022-01-08 17:50 +0100, Fabrice Fontaine spake thusly: > Add "Linux" before kernel in comment to be consistent with other > packages and manual > > Signed-off-by: Fabrice Fontaine Series of 3 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libpri/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libpri/Config.in b/package/libpri/Config.in > index de2d96fcc4..0684d2ac83 100644 > --- a/package/libpri/Config.in > +++ b/package/libpri/Config.in > @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI > > http://www.asterisk.org/downloads/libpri > > -comment "libpri needs a kernel to be built" > +comment "libpri needs a Linux kernel to be built" > depends on BR2_USE_MMU > depends on !BR2_LINUX_KERNEL > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 8 17:48:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:48:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-argustv: bump version to 19.2.0-Matrix In-Reply-To: <20220108172643.3465687-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 18:26:43 +0100") References: <20220108172643.3465687-1-bernd.kuhls@t-online.de> Message-ID: <875yquf79p.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 17:48:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:48:24 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-argustv: bump version to 19.2.0-Matrix Message-ID: <20220108174233.D4D248324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e9479aa0a734791c20a44d133e31828a807baa7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 47ecd18975..e58f9a4608 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 31f0ac72c8549339c18c828e51ce2531c24686c6ce6c734db0f2b0ce67ff41a3 kodi-pvr-argustv-19.1.1-Matrix.tar.gz +sha256 dfd19f9c1c4efe556d3764a5bec7842092b246932159ff69cf5bb1f64c8b9473 kodi-pvr-argustv-19.2.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 793f7f1adc..230ef1067c 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.1.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.2.0-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md From fontaine.fabrice at gmail.com Sat Jan 8 17:47:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:47:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/refpolicy: bump to version 2.20220106 Message-ID: <20220108174749.2898891-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20220106 Signed-off-by: Fabrice Fontaine --- ...ervices-samba.te-make-crack-optional.patch | 83 ------------------- ...ervices-wireguard.te-make-iptables-o.patch | 54 ------------ package/refpolicy/refpolicy.hash | 2 +- package/refpolicy/refpolicy.mk | 2 +- 4 files changed, 2 insertions(+), 139 deletions(-) delete mode 100644 package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch delete mode 100644 package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch diff --git a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch b/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch deleted file mode 100644 index 2dae5d4a76..0000000000 --- a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 7c58f2508efc115dea03e18e1fa611ebf81f6ee6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:12:01 +0200 -Subject: [PATCH] policy/modules/services/samba.te: make crack optional - -Make crack optional to avoid the following build failure: - - Compiling targeted policy.31 - env LD_LIBRARY_PATH="/tmp/instance-5/output-1/host/lib:/tmp/instance-5/output-1/host/usr/lib" /tmp/instance-5/output-1/host/usr/bin/checkpolicy -c 31 -U deny -S -O -E policy.conf -o policy.31 - policy/modules/services/samba.te:399:ERROR 'type crack_db_t is not within scope' at token ';' on line 360232: - allow smbd_t crack_db_t:dir { getattr search open }; - #line 399 - checkpolicy: error(s) encountered while parsing configuration - -Fixes: - - http://autobuild.buildroot.org/results/ab7098948d1920e42fa587e07f0513f23ba7fc74 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/407] ---- - policy/modules/services/samba.te | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) - -diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te -index 9d4665ae6..6c37625a9 100644 ---- a/policy/modules/services/samba.te -+++ b/policy/modules/services/samba.te -@@ -396,8 +396,6 @@ userdom_signal_all_users(smbd_t) - userdom_home_filetrans_user_home_dir(smbd_t) - userdom_user_home_dir_filetrans_user_home_content(smbd_t, { dir file lnk_file sock_file fifo_file }) - --usermanage_read_crack_db(smbd_t) -- - ifdef(`hide_broken_symptoms',` - files_dontaudit_getattr_default_dirs(smbd_t) - files_dontaudit_getattr_boot_dirs(smbd_t) -@@ -413,18 +411,6 @@ tunable_policy(`samba_create_home_dirs',` - userdom_create_user_home_dirs(smbd_t) - ') - --tunable_policy(`samba_domain_controller',` -- gen_require(` -- class passwd passwd; -- ') -- -- usermanage_domtrans_passwd(smbd_t) -- usermanage_kill_passwd(smbd_t) -- usermanage_domtrans_useradd(smbd_t) -- usermanage_domtrans_groupadd(smbd_t) -- allow smbd_t self:passwd passwd; --') -- - tunable_policy(`samba_enable_home_dirs',` - userdom_manage_user_home_content_dirs(smbd_t) - userdom_manage_user_home_content_files(smbd_t) -@@ -505,6 +491,24 @@ optional_policy(` - seutil_sigchld_newrole(smbd_t) - ') - -+optional_policy(` -+ usermanage_read_crack_db(smbd_t) -+') -+ -+optional_policy(` -+ tunable_policy(`samba_domain_controller',` -+ gen_require(` -+ class passwd passwd; -+ ') -+ -+ usermanage_domtrans_passwd(smbd_t) -+ usermanage_kill_passwd(smbd_t) -+ usermanage_domtrans_useradd(smbd_t) -+ usermanage_domtrans_groupadd(smbd_t) -+ allow smbd_t self:passwd passwd; -+ ') -+') -+ - ######################################## - # - # Nmbd Local policy --- -2.30.2 - diff --git a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch b/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch deleted file mode 100644 index 4cd1f96558..0000000000 --- a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 67394d078c2e1438293b25d08cf408b0b0d55755 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 22 Sep 2021 23:55:59 +0200 -Subject: [PATCH] policy/modules/services/wireguard.te: make iptables optional - -Make iptables optional to avoid the following build failure raised since -version 2.20210908 and -https://github.com/SELinuxProject/refpolicy/commit/7f1a7b1cacd5d211077ce62fbb4e91890e65c820: - - Compiling targeted policy.33 - env LD_LIBRARY_PATH="/tmp/instance-0/output-1/host/lib:/tmp/instance-0/output-1/host/usr/lib" /tmp/instance-0/output-1/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 - policy/modules/services/wireguard.te:66:ERROR 'type iptables_exec_t is not within scope' at token ';' on line 591892: - #line 66 - allow wireguard_t iptables_exec_t:file { getattr open map read execute ioctl }; - checkpolicy: error(s) encountered while parsing configuration - make[1]: *** [Rules.monolithic:79: policy.33] Error 1 - -Fixes: - - http://autobuild.buildroot.org/results/a4223accc6adb70b06fd4e74ca4f28484446b6fa - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/408] ---- - policy/modules/services/wireguard.te | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/policy/modules/services/wireguard.te b/policy/modules/services/wireguard.te -index 7241f65e6..33fd3c55d 100644 ---- a/policy/modules/services/wireguard.te -+++ b/policy/modules/services/wireguard.te -@@ -61,10 +61,6 @@ corecmd_exec_shell(wireguard_t) - - domain_use_interactive_fds(wireguard_t) - --# wg-quick can be configured to run iptables and other networking --# config tools when bringing up/down the wg interfaces --iptables_domtrans(wireguard_t) -- - # wg-quick tries to read /proc/filesystem when running "stat" and "mv" commands - kernel_dontaudit_read_system_state(wireguard_t) - kernel_dontaudit_search_kernel_sysctl(wireguard_t) -@@ -75,3 +71,9 @@ miscfiles_read_localization(wireguard_t) - sysnet_run_ifconfig(wireguard_t, wireguard_roles) - - userdom_use_user_terminals(wireguard_t) -+ -+# wg-quick can be configured to run iptables and other networking -+# config tools when bringing up/down the wg interfaces -+optional_policy(` -+ iptables_domtrans(wireguard_t) -+') --- -2.33.0 - diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index b8f6f023eb..b08c22ed4e 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 4d3140d9fbb91322f5de36d73959464ce1d8946dcd149e36fcaf60e92444e902 refpolicy-2.20210908.tar.bz2 +sha256 965f98f0b68a24fd0b8e8d973d319332aea88973e1d6c455ef9c2a31aefaeaa6 refpolicy-2.20220106.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 975c3b584c..44c50af278 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20210908 +REFPOLICY_VERSION = 2.20220106 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) endif -- 2.34.1 From peter at korsgaard.com Sat Jan 8 17:49:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:49:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: bump to version 02092020 In-Reply-To: <20220108172441.2819559-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 18:24:41 +0100") References: <20220108172441.2819559-1-fontaine.fabrice@gmail.com> Message-ID: <871r1if77w.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Update indentation in hash file (two spaces) > - This bump will fix the following build failure with libest which was > added with commit f6f0e1e58168dfa9194db2e073efd20a98c15728: > In file included from /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_lib.h:43:0, > from est_server_http.c:39: > /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_types.h:42:9: error: unknown type name 'size_t' > typedef size_t rsize_t; > ^~~~~~ > https://github.com/rurban/safeclib/blob/v02092020/ChangeLog > Fixes: > - http://autobuild.buildroot.org/results/5a12f1cb4153834078522b6068ff24ac0300d51d > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 17:49:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:49:28 +0100 Subject: [Buildroot] [git commit] package/safeclib: bump to version 02092020 Message-ID: <20220108174338.A04838324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebe808ac4071395b4d1e90d617c33a5e6e514af1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update indentation in hash file (two spaces) - This bump will fix the following build failure with libest which was added with commit f6f0e1e58168dfa9194db2e073efd20a98c15728: In file included from /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_lib.h:43:0, from est_server_http.c:39: /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_types.h:42:9: error: unknown type name 'size_t' typedef size_t rsize_t; ^~~~~~ https://github.com/rurban/safeclib/blob/v02092020/ChangeLog Fixes: - http://autobuild.buildroot.org/results/5a12f1cb4153834078522b6068ff24ac0300d51d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/safeclib/safeclib.hash | 6 +++--- package/safeclib/safeclib.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/safeclib/safeclib.hash b/package/safeclib/safeclib.hash index 7e1c6794e4..af732f93fd 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,5 +1,5 @@ -# From https://github.com/rurban/safeclib/releases/tag/v08112019 -sha256 bc2f25875522c50a3a5901981020d906db0b6a7d365619b8d72412c126be3923 libsafec-08112019.0-gad76c7.tar.bz2 +# From https://github.com/rurban/safeclib/releases/tag/v02092020 +sha256 d374bdcbfcdc4c9a76abed3707667372ca212fd87a369e7bcaaa54e716d27c0a libsafec-02092020.tar.xz # Hash for license file -sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING +sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 3af8fbb167..032a73bf67 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,10 +4,10 @@ # ################################################################################ -SAFECLIB_VERSION = 08112019 +SAFECLIB_VERSION = 02092020 SAFECLIB_SITE = \ https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) -SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).0-gad76c7.tar.bz2 +SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sat Jan 8 17:52:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 18:52:12 +0100 Subject: [Buildroot] [PATH v2 1/1] docs/manual: add qemu defconfigs gitlab test In-Reply-To: <90d1cd65-6cb7-d708-9b57-2089c5485d63@smile.fr> References: <20200915103806.13785-1-jugurtha.belkalem@smile.fr> <20200915165156.179380a9@windsurf.hq.k.grp> <90d1cd65-6cb7-d708-9b57-2089c5485d63@smile.fr> Message-ID: <20220108185212.49ba2aae@windsurf> Hello Romain, On Sat, 8 Jan 2022 11:56:54 +0100 Romain Naour wrote: > Maybe the manual needs a new chapter about the gitlab-ci in general and document > all pipeline trigger supported. > > For a new qemu defconfigs, we need to take care of: > > - define "# qemu_ARCH_defconfig" tag in the file board/qemu/ARCH/readme.txt > > - Use board/qemu/post-image.sh post image script and provide the name of the > defconfig as argument of this script: > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > - Enable host-qemu to use qemu built by Buildroot for the host: > BR2_PACKAGE_HOST_QEMU=y > BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y > > Being in the manual would promote gitlab-ci testing with Qemu. Yes, I agree! We need a single place in the chapter with all the Gitlab CI details. Like the test-pkg integration, testing of defconfigs, testing of runtime tests, etc. I'll mark this patch as Changes Requested, because we don't want just a section/chapter specifically for the qemu defconfig testing in Gitlab CI, but a broader section; Please note that Gitlab CI testing of runtime tests is already documented in the manual, so it will have to be refactored. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sat Jan 8 17:52:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:52:17 +0100 Subject: [Buildroot] [PATCH 1/3] core/pkg-utils: properly indent per-package-rsync In-Reply-To: (Yann E. MORIN's message of "Sat, 8 Jan 2022 18:35:40 +0100") References: Message-ID: <87wnjadsj2.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Continuation lines should be indented one level more than the line the > are the continuation of. > Signed-off-by: Yann E. MORIN Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 17:52:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:52:12 +0100 Subject: [Buildroot] [git commit] core/pkg-utils: properly indent per-package-rsync Message-ID: <20220108174616.5D91C8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Continuation lines should be indented one level more than the line the are the continuation of. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 38ba5bca93..6aa64a2096 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -213,8 +213,8 @@ define per-package-rsync mkdir -p $(3) $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3)$(sep)) + $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ + $(3) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current From peter at korsgaard.com Sat Jan 8 17:52:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:52:44 +0100 Subject: [Buildroot] [git commit] package/liburcu: bump to version 0.13.1 Message-ID: <20220108174643.D307B8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=babd5bdadbf249d8e0baa06987e33b042b2b3fe5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/urcu/userspace-rcu/blob/v0.13.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/liburcu/liburcu.hash | 4 ++-- package/liburcu/liburcu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburcu/liburcu.hash b/package/liburcu/liburcu.hash index 8ff11623d0..1968c3784e 100644 --- a/package/liburcu/liburcu.hash +++ b/package/liburcu/liburcu.hash @@ -1,5 +1,5 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.13.0.tar.bz2.sha256 -sha256 cbb20dbe1a892c2a4d8898bac4316176e585392693d498766ccbbc68cf20ba20 userspace-rcu-0.13.0.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2.sha256 +sha256 3213f33d2b8f710eb920eb1abb279ec04bf8ae6361f44f2513c28c20d3363083 userspace-rcu-0.13.1.tar.bz2 # Hash for license files sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk index e29784abe4..895dd6bb66 100644 --- a/package/liburcu/liburcu.mk +++ b/package/liburcu/liburcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURCU_VERSION = 0.13.0 +LIBURCU_VERSION = 0.13.1 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) From peter at korsgaard.com Sat Jan 8 17:52:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:52:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburcu: bump to version 0.13.1 In-Reply-To: <20220108173613.2820050-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 18:36:13 +0100") References: <20220108173613.2820050-1-fontaine.fabrice@gmail.com> Message-ID: <87sftydshz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/urcu/userspace-rcu/blob/v0.13.1/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 8 17:58:11 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:58:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/babeltrace2: bump to version 2.0.4 Message-ID: <20220108175811.2978380-1-fontaine.fabrice@gmail.com> - Drop second patch (already in version) - Update indentation in hash file (two spaces) https://github.com/efficios/babeltrace/releases/tag/v2.0.4 Signed-off-by: Fabrice Fontaine --- ...trace_ir_ref.c-rename-user-structure.patch | 57 ------------------- package/babeltrace2/babeltrace2.hash | 12 ++-- package/babeltrace2/babeltrace2.mk | 2 +- 3 files changed, 7 insertions(+), 64 deletions(-) delete mode 100644 package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch diff --git a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch b/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch deleted file mode 100644 index ac9eee82d8..0000000000 --- a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 26 Sep 2020 22:03:10 +0200 -Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure - -Rename user structure to bt_user to avoid the following build failure -with uclibc: - -test_trace_ir_ref.c:41:8: error: redefinition of 'struct user' - struct user { - ^ -In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34, - from ../../src/common/assert.h:28, - from ../../src/lib/object.h:28, - from test_trace_ir_ref.c:25: -/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here - struct user - ^~~~ - -Fixes: - - http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/efficios/babeltrace/pull/115] ---- - tests/lib/test_trace_ir_ref.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c -index d5dfa9cf..70caf29c 100644 ---- a/tests/lib/test_trace_ir_ref.c -+++ b/tests/lib/test_trace_ir_ref.c -@@ -25,7 +25,7 @@ - - #define NR_TESTS 37 - --struct user { -+struct bt_user { - bt_trace_class *tc; - bt_stream_class *sc; - bt_event_class *ec; -@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp) - bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL; - bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL, - *weak_ec3 = NULL; -- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; -+ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; - - /* The only reference which exists at this point is on TC1. */ - tc1 = create_tc1(self_comp); --- -2.28.0 - diff --git a/package/babeltrace2/babeltrace2.hash b/package/babeltrace2/babeltrace2.hash index 27c47ba26f..164e65cded 100644 --- a/package/babeltrace2/babeltrace2.hash +++ b/package/babeltrace2/babeltrace2.hash @@ -1,8 +1,8 @@ -# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.3.tar.bz2.sha256 -sha256 a53625152554102d868ba8395347d0daba0bec9c4b854c3e9bd97c77b0bf04a0 babeltrace2-2.0.3.tar.bz2 +# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2.sha256 +sha256 774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca babeltrace2-2.0.4.tar.bz2 # Hash for license files -sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt +sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk index 1e03f5fdd2..eedfc72b8c 100644 --- a/package/babeltrace2/babeltrace2.mk +++ b/package/babeltrace2/babeltrace2.mk @@ -5,7 +5,7 @@ ################################################################################ BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace -BABELTRACE2_VERSION = 2.0.3 +BABELTRACE2_VERSION = 2.0.4 BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2 BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code) BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE -- 2.34.1 From ps.report at gmx.net Sat Jan 8 18:04:14 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 8 Jan 2022 19:04:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump to version 2021.07.01 In-Reply-To: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> References: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> Message-ID: <20220108190414.6b638ea8@gmx.net> Hello Fabrice, On Sat, 8 Jan 2022 17:21:46 +0100, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine > --- > package/raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- > package/raspberrypi-usbboot/raspberrypi-usbboot.mk | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > index 3f66b12ff1..cedc5fb7e1 100644 > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz > +sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz > > # License files > sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > index 5d7b433c64..2e4194da0b 100644 > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e > -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) > +RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 $ git log --oneline --reverse [...] 9324fd7 Add native Raspberry Pi Imager port - beta ead3e30 readme: add macOS build step 2048ae6 (2021.07.01) Merge pull request #83 from mrpollo/patch-1 6c4d444 Update Raspberry Pi 4 EEPROM to pieeprom-2021-07-06 59830ea Merge pull request #85 from timg236/pieeprom-2021-07-06 8b1ccc1 Update changelog 9a4887e Fix `install` and `uninstall` targets in Makefile. 3840f3b Merge pull request #86 from cpb-/feature/add-install-target-in-makefile ff986e4 bootloader: Remove NVMe beta files c2da05c Merge pull request #88 from peterharperuk/remove_nvme 4608d57 Update bootcode4.bin 76e856d Merge pull request #89 from peterharperuk/master_update 8bcd5ce Bump bootcode.bin d1a9a5c beta: Add support for secure-boot - see Readme.md 6eb9976 secure-boot: Added example boot.img 78e1830 make-boot-image: Fix typo in docs AFT_SIZE -> FAT_SIZE 58bdaf4 make-boot-image: Use losetup instead of udisksctl 4bdd032 secure-boot BETA documentation updates 5247ffe Merge pull request #77 from nils-werner/patch-1 dc1b95f secure-boot: Move the example PEM file to secure-boot-example 80945ed secure-boot: Update recovery,bootcode4 + EEPROM to latest beta - 2021-10-27 a6e0d8b secure-boot: Update Readme to update max ramdisk size to 96MB 14e28be Corrected the board flag 7b429ab Merge pull request #96 from Dodain/master 09852a9 Corrected the -b flag in the readme.md 879641f Readme: Add docs for examining the contents of boot.img 5f8c233 secure-boot: Add more documentation about the RSA signatures and add optional public key argument d1ad057 Merge pull request #98 from timg236/secure-boot-hsm 6154fe2 make-boot-image: Fix unmount and set GID 8b390fe make-boot-image: Enable the image size to be specified fc4035e Update the default EEPROM image to 2021-11-22 a7ed8d1 rpi-eeprom-config: Pull in --edit fixes from rpi-eeprom repo 83c9a96 Merge pull request #103 from timg236/pieeprom-2021-11-22 396b98f secure-boot-recovery: Update to latest 2021-11-22 EEPROM 14ea684 msd: Fix non-2711 MSD support 515b972 Update the default EEPROM image to 2021-12-02 1aca6bc Merge pull request #104 from peterharperuk/update_dec e5e4994 Remove imager beta release 8bb5820 Use pkg-config to locate libusb-1.0 6b05a3a bootloader: Enable revoke_devkey in secure-boot recovery.bin a7d4ec4 (HEAD) Merge pull request #108 from timg236/secure-boot-revoke-devkey The version bump to 2021.07.01 gains one readme update, why not bump to head/latest (after testing the result)? Regards, Peter > +RASPBERRYPI_USBBOOT_SITE = \ > + $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) > RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 > RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE > From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:33 +0100 Subject: [Buildroot] [git commit] package/rockchip-mali: select the kernel driver Message-ID: <20220108175845.B0419832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc715b13b50d2f19c2d534f794a5345e61ee179f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If the rockchip-mali blobs are enabled, we also want the corresponding kernel driver. Signed-off-by: Thomas Petazzoni --- package/rockchip-mali/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index b2033652a8..2a8cd786be 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_ROCKCHIP_MALI select BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_MALI_DRIVER if BR2_LINUX_KERNEL help Install the binary user-space libraries for the ARM Mali GPU suitable for Rockchip platforrms. This package requires a From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:32 +0100 Subject: [Buildroot] [git commit] package/mali-driver: new package Message-ID: <20220108175845.89D9C82BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3ecd9ea4a40d601317f3b7195be4f5d1bdb3146 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a new package to build and install the Mali kernel driver for Midgard and Bifrost GPU. Signed-off-by: Miquel Raynal Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/mali-driver/Config.in | 14 ++++++++++++++ package/mali-driver/mali-driver.hash | 3 +++ package/mali-driver/mali-driver.mk | 15 +++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/package/Config.in b/package/Config.in index 3b1c38db47..d32a87fe20 100644 --- a/package/Config.in +++ b/package/Config.in @@ -512,6 +512,7 @@ endmenu source "package/lsuio/Config.in" source "package/luksmeta/Config.in" source "package/lvm2/Config.in" + source "package/mali-driver/Config.in" source "package/mali-t76x/Config.in" source "package/mbpfan/Config.in" source "package/mdadm/Config.in" diff --git a/package/mali-driver/Config.in b/package/mali-driver/Config.in new file mode 100644 index 0000000000..fee67096c8 --- /dev/null +++ b/package/mali-driver/Config.in @@ -0,0 +1,14 @@ +comment "mali-driver needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_MALI_DRIVER + bool "mali-driver" + depends on BR2_LINUX_KERNEL + help + This package builds and installs the Linux kernel driver for + the Mali Midgard/Bifrost GPU, compatible with recent Linux + kernels (>= 5.4). Note that it should be installed together + with the corresponding userspace OpenGL libraries, which are + usually provided as binaries only by hardware vendors. + + mali-driver requires a Linux kernel >= 5.4. diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash new file mode 100644 index 0000000000..a144d5189e --- /dev/null +++ b/package/mali-driver/mali-driver.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 76464e5ed55e9d21062cf154733ce61217211172629ec8742af902607f14d41a mali-driver-a742530232d1de41b57465744a1259fa6c35049e.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk new file mode 100644 index 0000000000..b12bfec69d --- /dev/null +++ b/package/mali-driver/mali-driver.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# mali-driver +# +################################################################################ + +MALI_DRIVER_VERSION = a742530232d1de41b57465744a1259fa6c35049e +MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) +MALI_DRIVER_DEPENDENCIES = linux +MALI_DRIVER_LICENSE = GPL-2.0 +MALI_DRIVER_LICENSE_FILE = LICENSE +MALI_DRIVER_MODULE_SUBDIRS = r8p0/drivers/gpu/arm/midgard + +$(eval $(kernel-module)) +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:32 +0100 Subject: [Buildroot] [git commit] package/ti-sgx-um: add missing _PROVIDES variable Message-ID: <20220108175845.938CC832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=203f0a917d2f726f7af241025c10663c01ae5c53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The ti-sgx-um package provides 3 virtual packages, but doesn't have the TI_SGX_UM_PROVIDES variable. This commit fixes that by adding the missing variable. Signed-off-by: Thomas Petazzoni --- package/ti-sgx-um/ti-sgx-um.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ti-sgx-um/ti-sgx-um.mk b/package/ti-sgx-um/ti-sgx-um.mk index 83dbc6804c..0a1d46c384 100644 --- a/package/ti-sgx-um/ti-sgx-um.mk +++ b/package/ti-sgx-um/ti-sgx-um.mk @@ -11,6 +11,7 @@ TI_SGX_UM_SITE_METHOD = git TI_SGX_UM_LICENSE = TI TSPA License TI_SGX_UM_LICENSE_FILES = TI-Linux-Graphics-DDK-UM-Manifest.doc TI_SGX_UM_INSTALL_STAGING = YES +TI_SGX_UM_PROVIDES = libegl libgles powervr TI_SGX_UM_TARGET=ti335x # ti-sgx-um is a egl/gles provider only if libdrm is installed From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:32 +0100 Subject: [Buildroot] [git commit] package/ti-sgx-um: make it a provider of libgbm Message-ID: <20220108175845.9D162832CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8b6d3931ffdb83833590ba596d595e661b0156c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The OpenGL ES implementation provides a libgbm implementation, so provide the corresponding virtual package. Signed-off-by: Thomas Petazzoni --- package/ti-sgx-um/Config.in | 5 +++++ package/ti-sgx-um/ti-sgx-um.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ti-sgx-um/Config.in b/package/ti-sgx-um/Config.in index b97469a364..2dea104b58 100644 --- a/package/ti-sgx-um/Config.in +++ b/package/ti-sgx-um/Config.in @@ -15,6 +15,8 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_OMAP select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_POWERVR select BR2_PACKAGE_LIBFFI @@ -31,6 +33,9 @@ if BR2_PACKAGE_TI_SGX_UM config BR2_PACKAGE_PROVIDES_LIBEGL default "ti-sgx-um" +config BR2_PACKAGE_PROVIDES_LIBGBM + default "ti-sgx-um" + config BR2_PACKAGE_PROVIDES_LIBGLES default "ti-sgx-um" diff --git a/package/ti-sgx-um/ti-sgx-um.mk b/package/ti-sgx-um/ti-sgx-um.mk index 0a1d46c384..aeee90686b 100644 --- a/package/ti-sgx-um/ti-sgx-um.mk +++ b/package/ti-sgx-um/ti-sgx-um.mk @@ -11,7 +11,7 @@ TI_SGX_UM_SITE_METHOD = git TI_SGX_UM_LICENSE = TI TSPA License TI_SGX_UM_LICENSE_FILES = TI-Linux-Graphics-DDK-UM-Manifest.doc TI_SGX_UM_INSTALL_STAGING = YES -TI_SGX_UM_PROVIDES = libegl libgles powervr +TI_SGX_UM_PROVIDES = libegl libgbm libgles powervr TI_SGX_UM_TARGET=ti335x # ti-sgx-um is a egl/gles provider only if libdrm is installed From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:32 +0100 Subject: [Buildroot] [git commit] package/ti-sgx-um: do not depend on the kernel driver, select it Message-ID: <20220108175845.A6FB782BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f19ea10137e204d2478a7221053122b4e12e54b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Depending on the kernel driver is annoying because it means you can't build ti-sgx-um without enabling a kernel. This prevents easy testing of ti-sgx-um, and it also means ti-sgx-um is never built by the autobuilders. So instead, we select the kernel driver if a kernel is built by Buildroot. This requires propagating the BR2_arm dependency from ti-sgx-km to ti-sgx-um. Signed-off-by: Thomas Petazzoni --- package/ti-sgx-um/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/ti-sgx-um/Config.in b/package/ti-sgx-um/Config.in index 2dea104b58..13c7cc8856 100644 --- a/package/ti-sgx-um/Config.in +++ b/package/ti-sgx-um/Config.in @@ -1,17 +1,15 @@ -comment "ti-sgx-um needs the ti-sgx-km driver" - depends on !BR2_PACKAGE_TI_SGX_KM - comment "ti-sgx-um needs udev and a glibc toolchain w/ threads" + depends on BR2_arm depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC \ || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_TI_SGX_UM bool "ti-sgx-um" - depends on BR2_PACKAGE_TI_SGX_KM depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_HAS_UDEV # pre-built binaries depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_arm select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_OMAP select BR2_PACKAGE_HAS_LIBEGL @@ -21,6 +19,7 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_HAS_POWERVR select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_TI_SGX_KM if BR2_LINUX_KERNEL help Graphics libraries for TI CPUs with SGX5xx GPU. This package supports AM335x, AM437x, AM4430 and AM5430. From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:33 +0100 Subject: [Buildroot] [git commit] package/freescale-imx/imx-gpu-viv: declare as a libgbm provider Message-ID: <20220108175845.B9354832CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=627464367ea7a3ea76a25beebed9a8f069b3cfc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Interestingly, only the aarch64 blobs provide libgbm support. This will help in fixing an issue that exists today, where ARM32 + imx-gpu-viv + wayland + qt5 fails to build, because qt5 is told that libgbm is available, i.e the following configuration: BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_GUI=y BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y BR2_PACKAGE_IMX_GPU_VIV=y BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL=y # BR2_TARGET_ROOTFS_TAR is not set fails to build during the qt5base configure step with: ERROR: Feature 'gbm' was enabled, but the pre-condition 'libs.gbm' failed. Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/Config.in | 11 +++++++++++ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index f465167acd..9ba3d0428e 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -17,6 +17,10 @@ config BR2_PACKAGE_IMX_GPU_VIV select BR2_PACKAGE_LIBDRM if !(BR2_arm && BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB) select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES + # gbm is only available in the aarch64 blobs + select BR2_PACKAGE_HAS_LIBGBM if BR2_aarch64 + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF if BR2_aarch64 + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT if BR2_aarch64 select BR2_PACKAGE_HAS_LIBOPENCL select BR2_PACKAGE_HAS_LIBOPENVG help @@ -82,6 +86,13 @@ config BR2_PACKAGE_PROVIDES_LIBOPENCL config BR2_PACKAGE_PROVIDES_LIBOPENVG default "imx-gpu-viv" +if BR2_aarch64 + +config BR2_PACKAGE_PROVIDES_LIBGBM + default "imx-gpu-viv" + +endif + config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES bool "install examples" # example binaries are linked against libstdc++.so.6 diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index ace025c656..1d76d79e2b 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -19,6 +19,11 @@ IMX_GPU_VIV_LICENSE_FILES = EULA COPYING IMX_GPU_VIV_REDISTRIBUTE = NO IMX_GPU_VIV_PROVIDES = libegl libgles libopencl libopenvg + +ifeq ($(BR2_aarch64),y) +IMX_GPU_VIV_PROVIDES += libgbm +endif + IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:33 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: use the libgbm virtual package Message-ID: <20220108175845.C27DB82BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ba2ee0b7a756c6499febf30f7db0346f2c1e6f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that we have a libgbm virtual package, it makes sense to use it to replace the open-coded list of gbm providers in qt5base. All of mesa3d, gcnano-binaries, ti-sgx-um and imx-gpu-viv are libgbm providers now. Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ec5264bfc9..4db2294ad3 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -69,19 +69,9 @@ else QT5BASE_CONFIGURE_OPTS += -no-kms endif -# Uses libgbm from mesa3d -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += mesa3d -else ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) -QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += gcnano-binaries -else ifeq ($(BR2_PACKAGE_TI_SGX_UM),y) -QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += ti-sgx-um -else ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) -QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += imx-gpu-viv +QT5BASE_DEPENDENCIES += libgbm else QT5BASE_CONFIGURE_OPTS += -no-gbm endif From thomas.petazzoni at bootlin.com Sat Jan 8 18:07:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:07:07 +0100 Subject: [git commit] DEVELOPERS: add entry for mali-driver to Miquèl Raynal Message-ID: <20220108180112.D651882BDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d41f020bdc974a44b3e83da0daaa42ff109d157e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index eb605b9170..2eeba07002 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2022,6 +2022,7 @@ N: Min Xu F: package/shadowsocks-libev/ N: Miqu??l Raynal +F: package/mali-driver/ F: package/rockchip-mali/ N: Mircea Gliga From thomas.petazzoni at bootlin.com Sat Jan 8 18:07:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:07:43 +0100 Subject: [Buildroot] [PATCH 4/7] package/mali-bifrost-driver: new package In-Reply-To: <20200306071440.30433-5-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-5-miquel.raynal@bootlin.com> Message-ID: <20220108190743.3ccfc87c@windsurf> On Fri, 6 Mar 2020 08:14:37 +0100 Miquel Raynal wrote: > Add a new package to build and install a generic ARM Mali Bifrost GPU > Linux kernel module. > > This module is compliant with the standard kernel-module > infrastructure. > > Signed-off-by: Miquel Raynal > --- > package/Config.in | 1 + > package/mali-bifrost-driver/Config.in | 17 +++++++++++++++++ > .../mali-bifrost-driver.hash | 3 +++ > .../mali-bifrost-driver/mali-bifrost-driver.mk | 15 +++++++++++++++ > 4 files changed, 36 insertions(+) > create mode 100644 package/mali-bifrost-driver/Config.in > create mode 100644 package/mali-bifrost-driver/mali-bifrost-driver.hash > create mode 100644 package/mali-bifrost-driver/mali-bifrost-driver.mk I finally applied, after renaming to "mali-driver", updating to the latest version, and doing a few small changes. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 18:07:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 19:07:51 +0100 Subject: [Buildroot] [git commit] package/hackrf: add a comma between licenses Message-ID: <20220108180145.BF08482BDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4afa6fd8c1457dce95b830da3ad3b0d255ca1d09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/hackrf/hackrf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 391bddcdb0..d80f87e6b9 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -7,7 +7,7 @@ HACKRF_VERSION = 2018.01.1 HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz -HACKRF_LICENSE = GPL-2.0+ BSD-3-Clause +HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host From thomas.petazzoni at bootlin.com Sat Jan 8 18:08:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:08:53 +0100 Subject: [Buildroot] [PATCH 5/7] package/qt5: make it possible to use rockchip-mali-bifrost as GBM provider In-Reply-To: <20200306071440.30433-6-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-6-miquel.raynal@bootlin.com> Message-ID: <20220108190853.79d9922f@windsurf> On Fri, 6 Mar 2020 08:14:38 +0100 Miquel Raynal wrote: > From: Thomas Petazzoni > > Signed-off-by: Thomas Petazzoni > Signed-off-by: Miquel Raynal I did not apply this patch. Instead, I reworked qt5base.mk to use the libgbm virtual package. And since the rockhip-mali package is a provider of libgbm, qt5base is able to use it. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 18:10:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 19:10:37 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig In-Reply-To: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> References: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> Message-ID: <20220108181037.GC1881783@scaer> Fabrice, All, On 2022-01-08 17:46 +0100, Fabrice Fontaine spake thusly: > .defconfig has not been updated since 2016 with commit > 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't > seem to be used This breaks out-of-tree builds: $ mkdir /tmp/foo $ cd /tmp/foo $ make -C /path/to/buildroot O=$(pwd) defconfig [...] *** *** Can't find default configuration ".defconfig"! *** make[1]: *** [Makefile:1024: defconfig] Error 1 make: *** [Makefile:23: _all] Error 2 So, rejected (although I do agree that this should work...) Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > .defconfig | 51 --------------------------------------------------- > 1 file changed, 51 deletions(-) > delete mode 100644 .defconfig > > diff --git a/.defconfig b/.defconfig > deleted file mode 100644 > index 7ab0c3fbf0..0000000000 > --- a/.defconfig > +++ /dev/null > @@ -1,51 +0,0 @@ > -# > -# Automatically generated make config: don't edit > -# Mon Feb 18 09:11:56 2008 > -# > -BR2_HAVE_DOT_CONFIG=y > -# BR2_alpha is not set > -# BR2_arm is not set > -# BR2_armeb is not set > -# BR2_cris is not set > -# BR2_ia64 is not set > -BR2_i386=y > -# BR2_m68k is not set > -# BR2_mips is not set > -# BR2_mipsel is not set > -# BR2_nios2 is not set > -# BR2_powerpc is not set > -# BR2_sh is not set > -# BR2_sparc is not set > -# BR2_sparc64 is not set > -# BR2_x86_64 is not set > -# BR2_x86_i486 is not set > -# BR2_x86_i586 is not set > -BR2_x86_i686=y > -# BR2_x86_pentiumpro is not set > -# BR2_x86_pentium_mmx is not set > -# BR2_x86_pentium_m is not set > -# BR2_x86_pentium2 is not set > -# BR2_x86_pentium3 is not set > -# BR2_x86_pentium4 is not set > -# BR2_x86_prescott is not set > -# BR2_x86_nocona is not set > -# BR2_x86_core2 is not set > -# BR2_x86_k6 is not set > -# BR2_x86_k6_2 is not set > -# BR2_x86_athlon is not set > -# BR2_x86_athlon_4 is not set > -# BR2_x86_opteron is not set > -# BR2_x86_opteron_sse3 is not set > -# BR2_x86_barcelona is not set > -# BR2_x86_geode is not set > -# BR2_x86_c3 is not set > -# BR2_x86_winchip_c6 is not set > -# BR2_x86_winchip2 is not set > -BR2_ARCH="i686" > -BR2_ENDIAN="LITTLE" > -BR2_GCC_TARGET_TUNE="i686" > -BR2_GCC_TARGET_ARCH="i686" > - > -# > -# Target options > -# > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 8 18:10:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:10:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump to version 2021.07.01 In-Reply-To: <20220108190414.6b638ea8@gmx.net> References: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> <20220108190414.6b638ea8@gmx.net> Message-ID: Hi Peter, Le sam. 8 janv. 2022 ? 19:04, Peter Seiderer a ?crit : > > Hello Fabrice, > > On Sat, 8 Jan 2022 17:21:46 +0100, Fabrice Fontaine wrote: > > > Signed-off-by: Fabrice Fontaine > > --- > > package/raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- > > package/raspberrypi-usbboot/raspberrypi-usbboot.mk | 5 +++-- > > 2 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > > index 3f66b12ff1..cedc5fb7e1 100644 > > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > > @@ -1,5 +1,5 @@ > > # Locally calculated > > -sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz > > +sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz > > > > # License files > > sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > > index 5d7b433c64..2e4194da0b 100644 > > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > > @@ -4,8 +4,9 @@ > > # > > ################################################################################ > > > > -RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e > > -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) > > +RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 > > $ git log --oneline --reverse > [...] > 9324fd7 Add native Raspberry Pi Imager port - beta > ead3e30 readme: add macOS build step > > 2048ae6 (2021.07.01) Merge pull request #83 from mrpollo/patch-1 > > 6c4d444 Update Raspberry Pi 4 EEPROM to pieeprom-2021-07-06 > 59830ea Merge pull request #85 from timg236/pieeprom-2021-07-06 > 8b1ccc1 Update changelog > 9a4887e Fix `install` and `uninstall` targets in Makefile. > 3840f3b Merge pull request #86 from cpb-/feature/add-install-target-in-makefile > ff986e4 bootloader: Remove NVMe beta files > c2da05c Merge pull request #88 from peterharperuk/remove_nvme > 4608d57 Update bootcode4.bin > 76e856d Merge pull request #89 from peterharperuk/master_update > 8bcd5ce Bump bootcode.bin > d1a9a5c beta: Add support for secure-boot - see Readme.md > 6eb9976 secure-boot: Added example boot.img > 78e1830 make-boot-image: Fix typo in docs AFT_SIZE -> FAT_SIZE > 58bdaf4 make-boot-image: Use losetup instead of udisksctl > 4bdd032 secure-boot BETA documentation updates > 5247ffe Merge pull request #77 from nils-werner/patch-1 > dc1b95f secure-boot: Move the example PEM file to secure-boot-example > 80945ed secure-boot: Update recovery,bootcode4 + EEPROM to latest beta - 2021-10-27 > a6e0d8b secure-boot: Update Readme to update max ramdisk size to 96MB > 14e28be Corrected the board flag > 7b429ab Merge pull request #96 from Dodain/master > 09852a9 Corrected the -b flag in the readme.md > 879641f Readme: Add docs for examining the contents of boot.img > 5f8c233 secure-boot: Add more documentation about the RSA signatures and add optional public key argument > d1ad057 Merge pull request #98 from timg236/secure-boot-hsm > 6154fe2 make-boot-image: Fix unmount and set GID > 8b390fe make-boot-image: Enable the image size to be specified > fc4035e Update the default EEPROM image to 2021-11-22 > a7ed8d1 rpi-eeprom-config: Pull in --edit fixes from rpi-eeprom repo > 83c9a96 Merge pull request #103 from timg236/pieeprom-2021-11-22 > 396b98f secure-boot-recovery: Update to latest 2021-11-22 EEPROM > 14ea684 msd: Fix non-2711 MSD support > 515b972 Update the default EEPROM image to 2021-12-02 > 1aca6bc Merge pull request #104 from peterharperuk/update_dec > e5e4994 Remove imager beta release > 8bb5820 Use pkg-config to locate libusb-1.0 > 6b05a3a bootloader: Enable revoke_devkey in secure-boot recovery.bin > a7d4ec4 (HEAD) Merge pull request #108 from timg236/secure-boot-revoke-devkey > > The version bump to 2021.07.01 gains one readme update, why not bump > to head/latest (after testing the result)? Because I prefer to bump to a stable release. This is "safer" and release-monitoring.org will warn us when a new version will be made available by usptream. For example, it is pretty likely that commit 8bb5820 will raise a build failure as pkg-config is hard-coded (but I have not tested it to confirm it). > > Regards, > Peter > > > > +RASPBERRYPI_USBBOOT_SITE = \ > > + $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) > > RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 > > RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE > > > Best Regards, Fabrice From thomas.petazzoni at bootlin.com Sat Jan 8 18:12:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:12:02 +0100 Subject: [Buildroot] [PATCH 6/7] package/qt5: generalize the condition on which EGLFS KMS gets supported In-Reply-To: <20200306071440.30433-7-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-7-miquel.raynal@bootlin.com> Message-ID: <20220108191202.374d45ae@windsurf> On Fri, 6 Mar 2020 08:14:39 +0100 Miquel Raynal wrote: > BR2_PACKAGE_HAS_LIBEGL indicates that the virtual libegl packet is > enabled. This packet may be provided by mesa3d (this is actually what > happens when selecting BR2_PACKAGE_MESA3D_OPENGL_EGL) but > other providers may exist. > > Generalize the condition on which EGLFS KMS support is added to Qt5 to > allow rockchip-mali-bifrost (and potentially other) to use the KMS > back-end. > > Suggested-by: Thomas Petazzoni > Signed-off-by: Miquel Raynal > --- > package/qt5/qt5base/qt5base.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This is no longer needed since commit 469829d9c55b7f5461e29f3f6436417836504410. All that conditional logic to determine which Qt libraries and plugins to install is gone, as we now use the Qt "make install" logic. So I'll mark this patch as Superseded. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 18:12:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 19:12:51 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig In-Reply-To: <20220108181037.GC1881783@scaer> References: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> <20220108181037.GC1881783@scaer> Message-ID: <20220108181251.GD1881783@scaer> Fabrice, All, On 2022-01-08 19:10 +0100, Yann E. MORIN spake thusly: > Fabrice, All, > > On 2022-01-08 17:46 +0100, Fabrice Fontaine spake thusly: > > .defconfig has not been updated since 2016 with commit > > 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't > > seem to be used > This breaks out-of-tree builds: Well, this is also broken for in-tree builds: $ git clean -dX $ make defconfig [...] *** *** Can't find default configuration ".defconfig"! *** make[1]: *** [Makefile:1024: defconfig] Error 1 make: *** [Makefile:84: _all] Error 2 So, meh... This file should indeed not be needed... Regards, Yann E. MORIN. > Regards, > Yann E. MORIN. > > > Signed-off-by: Fabrice Fontaine > > --- > > .defconfig | 51 --------------------------------------------------- > > 1 file changed, 51 deletions(-) > > delete mode 100644 .defconfig > > > > diff --git a/.defconfig b/.defconfig > > deleted file mode 100644 > > index 7ab0c3fbf0..0000000000 > > --- a/.defconfig > > +++ /dev/null > > @@ -1,51 +0,0 @@ > > -# > > -# Automatically generated make config: don't edit > > -# Mon Feb 18 09:11:56 2008 > > -# > > -BR2_HAVE_DOT_CONFIG=y > > -# BR2_alpha is not set > > -# BR2_arm is not set > > -# BR2_armeb is not set > > -# BR2_cris is not set > > -# BR2_ia64 is not set > > -BR2_i386=y > > -# BR2_m68k is not set > > -# BR2_mips is not set > > -# BR2_mipsel is not set > > -# BR2_nios2 is not set > > -# BR2_powerpc is not set > > -# BR2_sh is not set > > -# BR2_sparc is not set > > -# BR2_sparc64 is not set > > -# BR2_x86_64 is not set > > -# BR2_x86_i486 is not set > > -# BR2_x86_i586 is not set > > -BR2_x86_i686=y > > -# BR2_x86_pentiumpro is not set > > -# BR2_x86_pentium_mmx is not set > > -# BR2_x86_pentium_m is not set > > -# BR2_x86_pentium2 is not set > > -# BR2_x86_pentium3 is not set > > -# BR2_x86_pentium4 is not set > > -# BR2_x86_prescott is not set > > -# BR2_x86_nocona is not set > > -# BR2_x86_core2 is not set > > -# BR2_x86_k6 is not set > > -# BR2_x86_k6_2 is not set > > -# BR2_x86_athlon is not set > > -# BR2_x86_athlon_4 is not set > > -# BR2_x86_opteron is not set > > -# BR2_x86_opteron_sse3 is not set > > -# BR2_x86_barcelona is not set > > -# BR2_x86_geode is not set > > -# BR2_x86_c3 is not set > > -# BR2_x86_winchip_c6 is not set > > -# BR2_x86_winchip2 is not set > > -BR2_ARCH="i686" > > -BR2_ENDIAN="LITTLE" > > -BR2_GCC_TARGET_TUNE="i686" > > -BR2_GCC_TARGET_ARCH="i686" > > - > > -# > > -# Target options > > -# > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 8 18:19:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:19:20 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig In-Reply-To: <20220108181251.GD1881783@scaer> References: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> <20220108181037.GC1881783@scaer> <20220108181251.GD1881783@scaer> Message-ID: Yann, Le sam. 8 janv. 2022 ? 19:12, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-01-08 19:10 +0100, Yann E. MORIN spake thusly: > > Fabrice, All, > > > > On 2022-01-08 17:46 +0100, Fabrice Fontaine spake thusly: > > > .defconfig has not been updated since 2016 with commit > > > 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't > > > seem to be used > > This breaks out-of-tree builds: > > Well, this is also broken for in-tree builds: > > $ git clean -dX > $ make defconfig > [...] > *** > *** Can't find default configuration ".defconfig"! > *** > make[1]: *** [Makefile:1024: defconfig] Error 1 > make: *** [Makefile:84: _all] Error 2 > > So, meh... OK so this file is needed for "make defconfig". I'm always running "make xxx_defconfig" and "make menuconfig" However, perhaps it would be better to use a symlink for .defconfig? We could symlink it to raspberrypi4_defconfig or any other config. I found it strange that this file wasn't updated for so long. > > This file should indeed not be needed... > > Regards, > Yann E. MORIN. > > > Regards, > > Yann E. MORIN. > > > > > Signed-off-by: Fabrice Fontaine > > > --- > > > .defconfig | 51 --------------------------------------------------- > > > 1 file changed, 51 deletions(-) > > > delete mode 100644 .defconfig > > > > > > diff --git a/.defconfig b/.defconfig > > > deleted file mode 100644 > > > index 7ab0c3fbf0..0000000000 > > > --- a/.defconfig > > > +++ /dev/null > > > @@ -1,51 +0,0 @@ > > > -# > > > -# Automatically generated make config: don't edit > > > -# Mon Feb 18 09:11:56 2008 > > > -# > > > -BR2_HAVE_DOT_CONFIG=y > > > -# BR2_alpha is not set > > > -# BR2_arm is not set > > > -# BR2_armeb is not set > > > -# BR2_cris is not set > > > -# BR2_ia64 is not set > > > -BR2_i386=y > > > -# BR2_m68k is not set > > > -# BR2_mips is not set > > > -# BR2_mipsel is not set > > > -# BR2_nios2 is not set > > > -# BR2_powerpc is not set > > > -# BR2_sh is not set > > > -# BR2_sparc is not set > > > -# BR2_sparc64 is not set > > > -# BR2_x86_64 is not set > > > -# BR2_x86_i486 is not set > > > -# BR2_x86_i586 is not set > > > -BR2_x86_i686=y > > > -# BR2_x86_pentiumpro is not set > > > -# BR2_x86_pentium_mmx is not set > > > -# BR2_x86_pentium_m is not set > > > -# BR2_x86_pentium2 is not set > > > -# BR2_x86_pentium3 is not set > > > -# BR2_x86_pentium4 is not set > > > -# BR2_x86_prescott is not set > > > -# BR2_x86_nocona is not set > > > -# BR2_x86_core2 is not set > > > -# BR2_x86_k6 is not set > > > -# BR2_x86_k6_2 is not set > > > -# BR2_x86_athlon is not set > > > -# BR2_x86_athlon_4 is not set > > > -# BR2_x86_opteron is not set > > > -# BR2_x86_opteron_sse3 is not set > > > -# BR2_x86_barcelona is not set > > > -# BR2_x86_geode is not set > > > -# BR2_x86_c3 is not set > > > -# BR2_x86_winchip_c6 is not set > > > -# BR2_x86_winchip2 is not set > > > -BR2_ARCH="i686" > > > -BR2_ENDIAN="LITTLE" > > > -BR2_GCC_TARGET_TUNE="i686" > > > -BR2_GCC_TARGET_ARCH="i686" > > > - > > > -# > > > -# Target options > > > -# > > > -- > > > 2.34.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > -- > > .-----------------.--------------------.------------------.--------------------. > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > '------------------------------^-------^------------------^--------------------' > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From yann.morin.1998 at free.fr Sat Jan 8 18:22:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 19:22:19 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/pkg-generic.mk: fix absolute paths in per-package config files In-Reply-To: <20220106171720.12857-1-aduskett@gmail.com> References: <20220106171720.12857-1-aduskett@gmail.com> Message-ID: <20220108182219.GE1881783@scaer> Adam, All, On 2022-01-06 09:17 -0800, Adam Duskett spake thusly: > Some packages (notably qmake packages) generate .cmake, .pc, and .pri files > with absolute paths. Unfortunately, doing so breaks per-package builds because > the paths in those files point outside the per-package sysroot for packages > that have rsynced those same files. > > - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk > to avoid more calls to ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > > - Add .cmake, .pc, and .pri files to the files of which to find to sed the > per-package paths. > > This simple fix allows qt5 submodule packages to build with per-package enabled. > > Based off of Louis-Paul's earlier work found here: > https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ > > And Yann Morin's feedback found here: > https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ > > Signed-off-by: Adam Duskett Thanks for this iteration! While discussing with the otehr maintainers int he room, we concluded that we did want an even more generic soltuion, so I've sent a further series; https://lore.kernel.org/buildroot/cover.1641663315.git.yann.morin.1998 at free.fr/T/#t Thanks for your persistence! ;-) Regards, Yann E. MORIN. > --- > changes v3 -> v4: > - Further compress the method by simply adding the files to the already > existing find command. (Yann) > > changes v2 -> v3: > - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in > pkg-generic.mk (Yann) > > - Combine FIXUP_CONFIG_FILES_ABSOLUTE_PATHS with FIXUP_PER_PACKAGE_FILES (Yann) > > changes v1 -> v2 > - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk > - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs > - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS > - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host > directories in a single step. > > package/pkg-generic.mk | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 6a5fe5507b..9952ff1963 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -113,8 +113,16 @@ endif > # fail. > # So we just use HOST_DIR as a starting point, and filter on the two directories > # of interest. > +# > +# When per-package is enabled, packages may generate files with absolute paths > +# that point to the packages per-package sysroot. However, this breaks > +# per-package isolation when the files are rsynced to a new package that depends > +# on the first package. because the hard-coded paths point to directories > +# outside the packages sysroot. Run sed on all .cmake, .pc, and .pri files in a > +# given packages sysroot containing the word "per-package" and replace the path > +# with the appropriate per-package directory. > ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define FIXUP_PYTHON_SYSCONFIGDATA > +define FIXUP_PER_PACKAGE_FILES > $(Q)find $(HOST_DIR) \ > \( -path '$(HOST_DIR)/lib/python*' \ > -o -path '$(STAGING_DIR)/usr/lib/python*' \ > @@ -122,6 +130,9 @@ define FIXUP_PYTHON_SYSCONFIGDATA > \( \( -name "_sysconfigdata*.pyc" -delete \) \ > -o \( -name "_sysconfigdata*.py" -print0 \) \ > \) \ > + -o -name "*.cmake" -print0 \ > + -o -name "*.pc" -print0 \ > + -o -name "*.pri" -print0 \ > | xargs -0 --no-run-if-empty \ > $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' > endef > @@ -836,7 +847,7 @@ $(2)_EXTRACT_CMDS ?= \ > $$(TAR_OPTIONS) -) > > # pre/post-steps hooks > -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA > +$(2)_POST_PREPARE_HOOKS += FIXUP_PER_PACKAGE_FILES > > ifeq ($$($(2)_TYPE),target) > ifneq ($$(HOST_$(2)_KCONFIG_VAR),) > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sat Jan 8 18:25:12 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 19:25:12 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external: Allow relative paths in BR2_TOOLCHAIN_EXTERNAL_PATH. In-Reply-To: <20210527145118.31373-1-juergen@jstuber.net> References: <20210527145118.31373-1-juergen@jstuber.net> Message-ID: Hello Juergen, Le 27/05/2021 ? 16:51, Juergen Stuber a ?crit?: > Convert BR2_TOOLCHAIN_EXTERNAL_PATH to an absolute path when used. > > Otherwise the symbolic links to the external toolchain binaries are > not installed in host/bin when BR2_TOOLCHAIN_EXTERNAL_PATH is relative. > This happens because TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER > changes directory into host/bin to create the symbolic links. > From there the tools are no longer found via the relative path and > a single symbolic link host/bin/$(prefix)-* is created instead. Indeed, using a relative path for BR2_TOOLCHAIN_EXTERNAL_PATH doesn't work $ ls -l test/ext-preinstalled-relative-toolchain/host/bin/* lrwxrwxrwx. 1 romnao romnao 95 8 janv. 19:18 'test/ext-preinstalled-relative-toolchain/host/bin/arm-none-linux-gnueabihf-*' -> '../toolchain/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-*' -rwxr-xr-x. 1 romnao romnao 21288 8 janv. 19:17 test/ext-preinstalled-relative-toolchain/host/bin/toolchain-wrapper With your patch applied the toolchain is imported correctly (busybox build). Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Juergen Stuber > --- > toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk > index 6d91cb5d1e..2b70007a34 100644 > --- a/toolchain/toolchain-external/pkg-toolchain-external.mk > +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk > @@ -68,7 +68,7 @@ TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain > ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) > TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) > else > -TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) > +TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(abspath $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))) > endif > > ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),) > From thomas.petazzoni at bootlin.com Sat Jan 8 18:27:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:27:51 +0100 Subject: [Buildroot] [git commit] package/qt5: enable eglfs_kms integration plugin for rockchip-mali Message-ID: <20220108182146.5A82E82D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e070d606675ce3750496128b50227673d5a47944 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to be able to use OpenGL with QT5 with a Rockchip Mali Bifrost GPU, a device integration provider has to be selected. We are interested in the KMS integration that works well with Mali Bifrost, make sure it gets build when using rockchip-mali-bifrost as OpenGL provider. Signed-off-by: Maxime Chevallier Signed-off-by: Miquel Raynal Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4db2294ad3..bcdf036f00 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -264,6 +264,9 @@ QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv else ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali +else ifeq ($(BR2_PACKAGE_ROCKCHIP_MALI),y) +# use kms backend +QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_kms endif ifneq ($(QT5BASE_CONFIG_FILE),) From thomas.petazzoni at bootlin.com Sat Jan 8 18:28:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:28:34 +0100 Subject: [Buildroot] [PATCH 7/7] package/qt5: allows using rockchip-mali-bifrost as OpenGL/KMS provider In-Reply-To: <20200306071440.30433-8-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-8-miquel.raynal@bootlin.com> Message-ID: <20220108192834.424eeeed@windsurf> On Fri, 6 Mar 2020 08:14:40 +0100 Miquel Raynal wrote: > From: Maxime Chevallier > > In order to be able to use OpenGL with QT5 with a Rockchip Mali > Bifrost GPU, a device integration provider has to be selected. We are > interested in the KMS integration that works well with Mali Bifrost, > make sure it gets build when using rockchip-mali-bifrost as OpenGL > provider. > > Signed-off-by: Maxime Chevallier > Signed-off-by: Miquel Raynal > --- > package/qt5/qt5base/qt5base.mk | 3 +++ > 1 file changed, 3 insertions(+) Applied to master, thanks. Ideally, I would like to understand better when this eglfs_kms device integration plugin can be used. If you (or Paul) have more insights about this, it would be very useful. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sat Jan 8 18:28:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 19:28:59 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: pre-create directories for services In-Reply-To: <20200726202449.7108-1-nolange79@gmail.com> References: <20200726202449.7108-1-nolange79@gmail.com> Message-ID: <8c4e865d-62e3-7e33-87f2-36547df54a1c@mind.be> On 26/07/2020 22:24, Norbert Lange wrote: > various services need directories in /var when they are started, > and create them if necessary. Creating those before, allows > those services to start even if /var is read-only. > > Signed-off-by: Norbert Lange I in the end applied this to master, but I think we should instead follow Jeremy's suggestion, as I'll explain in the v1 thread. Regards, Arnout > --- > v1->v2: > - dont use a new hook, use SYSTEMD_PERMISSIONS > - no conditionals, but variables that are set or not > --- > package/systemd/systemd.mk | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index c49922d78f..42da1c889f 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -317,12 +317,14 @@ endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) > SYSTEMD_CONF_OPTS += -Dlogind=true > +SYSTEMD_LOGIND_PERMISSIONS = /var/lib/systemd/linger d 755 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dlogind=false > endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) > SYSTEMD_CONF_OPTS += -Dmachined=true -Dnss-mymachines=true > +SYSTEMD_MACHINED_PERMISSIONS = /var/lib/machines d 700 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dmachined=false -Dnss-mymachines=false > endif > @@ -336,6 +338,7 @@ endif > ifeq ($(BR2_PACKAGE_SYSTEMD_HOMED),y) > SYSTEMD_CONF_OPTS += -Dhomed=true > SYSTEMD_DEPENDENCIES += cryptsetup openssl > +SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/home d 755 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dhomed=false > endif > @@ -380,12 +383,14 @@ endif > ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) > SYSTEMD_CONF_OPTS += -Dcoredump=true > SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing > +SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dcoredump=false > endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_PSTORE),y) > SYSTEMD_CONF_OPTS += -Dpstore=true > +SYSTEMD_PSTORE_PERMISSIONS = /var/lib/systemd/pstore d 755 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dpstore=false > endif > @@ -436,6 +441,7 @@ endif > ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) > SYSTEMD_CONF_OPTS += -Dtimesyncd=true > SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization > +SYSTEMD_TIMESYNCD_PERMISSIONS = /var/lib/systemd/timesync d 755 systemd-timesync systemd-timesync - - - - - > else > SYSTEMD_CONF_OPTS += -Dtimesyncd=false > endif > @@ -503,6 +509,19 @@ define SYSTEMD_INSTALL_IMAGES_CMDS > $(SYSTEMD_INSTALL_BOOT_FILES) > endef > > +define SYSTEMD_PERMISSIONS > + /var/spool d 755 0 0 - - - - - > + /var/lib d 755 0 0 - - - - - > + /var/lib/private d 700 0 0 - - - - - > + /var/log/private d 700 0 0 - - - - - > + /var/cache/private d 700 0 0 - - - - - > + $(SYSTEMD_LOGIND_PERMISSIONS) > + $(SYSTEMD_MACHINED_PERMISSIONS) > + $(SYSTEMD_HOMED_PERMISSIONS) > + $(SYSTEMD_PSTORE_PERMISSIONS) > + $(SYSTEMD_TIMESYNCD_PERMISSIONS) > +endef > + > define SYSTEMD_USERS > # udev user groups > - - input -1 * - - - Input device group > From thomas.petazzoni at bootlin.com Sat Jan 8 18:33:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:33:07 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/libcap: drop host-gperf dependency In-Reply-To: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> References: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> Message-ID: <20220108193307.6db645fa@windsurf> On Sun, 30 Aug 2020 12:00:57 +0200 Fabrice Fontaine wrote: > host-gperf dependency was added in commit > 5d8926add5da1b0bdfb90a41f4d7f857864c5524 without any explanation in the > commit message but gperf can be disabled through BUILD_GPERF since > https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=3c22870c762f7925b5ff143d76f9affbade275ba > > So use this variable and drop this unneeded dependency > > Signed-off-by: Fabrice Fontaine > --- > package/libcap/libcap.mk | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) So we discussed this with Yann, Peter and Arnout and found that host-gperf is really quick to build, and provides a better way for libcap to lookup symbols, thanks to a hash table. So we prefer to keep things as they are with the host-gperf dependency. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sat Jan 8 18:32:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:32:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/squid: bump to version 5.3 Message-ID: <20220108183241.3051683-1-fontaine.fabrice@gmail.com> 5.x is the latest stable version, 4.x is provided for archival purpose only and is not intended for general use in new installations. http://www.squid-cache.org/Versions/v5/squid-5.3-RELEASENOTES.html Signed-off-by: Fabrice Fontaine --- package/squid/squid.hash | 8 ++++---- package/squid/squid.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/squid/squid.hash b/package/squid/squid.hash index b1a8feb78e..e18ed8961e 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.17.tar.xz.asc -md5 47b94b2d27516f1764c9d5dc1b9645e5 squid-4.17.tar.xz -sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 squid-4.17.tar.xz +# From http://www.squid-cache.org/Versions/v5/squid-5.3.tar.xz.asc +md5 9249f30169ab6600e53b4f9b8129b3b0 squid-5.3.tar.xz +sha1 d3a8310c725616fa7565d60f3bf8fdf5fa20b15a squid-5.3.tar.xz # Locally calculated -sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418 squid-4.17.tar.xz +sha256 45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715 squid-5.3.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index a30a87e20d..3847fb49dc 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,9 +4,9 @@ # ################################################################################ -SQUID_VERSION = 4.17 +SQUID_VERSION = 5.3 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz -SQUID_SITE = http://www.squid-cache.org/Versions/v4 +SQUID_SITE = http://www.squid-cache.org/Versions/v5 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING SQUID_CPE_ID_VENDOR = squid-cache -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Jan 8 18:38:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:38:00 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220108183919.238c1885@gmx.net> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> <20220108183919.238c1885@gmx.net> Message-ID: <20220108193800.5f91ac3b@windsurf> On Sat, 8 Jan 2022 18:39:19 +0100 Peter Seiderer wrote: > The difference seems to be: > > $ diff -ru file-5.38/configure.ac file-5.41/configure.ac > [...] > @@ -88,7 +88,7 @@ > AC_SUBST(WARNINGS) > > dnl Checks for programs. > -AC_PROG_CC_STDC > +AC_PROG_CC > AC_USE_SYSTEM_EXTENSIONS > AM_PROG_CC_C_O > AC_C_BIGENDIAN > [...] > > According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or > use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 > feature is gone (still used for target/host in package/file/file.mk)... But why the solution we use for the target package doesn't work for the host package? Or perhaps we're no longer testing the target package with gcc 4.8 ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Sat Jan 8 18:43:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 19:43:07 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: pre-create directories for services In-Reply-To: <8c4e865d-62e3-7e33-87f2-36547df54a1c@mind.be> References: <20200726202449.7108-1-nolange79@gmail.com> <8c4e865d-62e3-7e33-87f2-36547df54a1c@mind.be> Message-ID: <4ef1b31c-9d29-1c05-5ce4-fbe6457bfc95@mind.be> On 08/01/2022 19:28, Arnout Vandecappelle wrote: > > > On 26/07/2020 22:24, Norbert Lange wrote: >> various services need directories in /var when they are started, >> and create them if necessary. Creating those before, allows >> those services to start even if /var is read-only. >> >> Signed-off-by: Norbert Lange > > ?I in the end applied this to master, but I think we should instead follow > Jeremy's suggestion, as I'll explain in the v1 thread. ?Never mind, after reading your reply to Jeremy in full, I think you have the greater authority there so I believe you if you say this is the proper approach. ?Regards, ?Arnout [snip] From romain.naour at smile.fr Sat Jan 8 18:43:11 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 19:43:11 +0100 Subject: [Buildroot] [PATCH] package/python-greenlet: enable as host package In-Reply-To: <20210623145231.19243-1-cyrilbur@gmail.com> References: <20210623145231.19243-1-cyrilbur@gmail.com> Message-ID: <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> Hello, Le 23/06/2021 ? 16:52, Cyril Bur a ?crit?: Why? There is not package using host-python-greenlet in the tree. Best regards, Romain > Signed-off-by: Cyril Bur > --- > package/python-greenlet/python-greenlet.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk > index 01d578a183..e90d1c0f56 100644 > --- a/package/python-greenlet/python-greenlet.mk > +++ b/package/python-greenlet/python-greenlet.mk > @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > > $(eval $(python-package)) > +$(eval $(host-python-package)) > From arnout at mind.be Sat Jan 8 18:45:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 19:45:38 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig In-Reply-To: References: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> <20220108181037.GC1881783@scaer> <20220108181251.GD1881783@scaer> Message-ID: <50ba83a8-df9d-0146-ad7b-acc27545d1ef@mind.be> On 08/01/2022 19:19, Fabrice Fontaine wrote: > Yann, > > Le sam. 8 janv. 2022 ? 19:12, Yann E. MORIN a ?crit : >> >> Fabrice, All, >> >> On 2022-01-08 19:10 +0100, Yann E. MORIN spake thusly: >>> Fabrice, All, >>> >>> On 2022-01-08 17:46 +0100, Fabrice Fontaine spake thusly: >>>> .defconfig has not been updated since 2016 with commit >>>> 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't >>>> seem to be used >>> This breaks out-of-tree builds: >> >> Well, this is also broken for in-tree builds: >> >> $ git clean -dX >> $ make defconfig >> [...] >> *** >> *** Can't find default configuration ".defconfig"! >> *** >> make[1]: *** [Makefile:1024: defconfig] Error 1 >> make: *** [Makefile:84: _all] Error 2 >> >> So, meh... > OK so this file is needed for "make defconfig". > I'm always running "make xxx_defconfig" and "make menuconfig" > However, perhaps it would be better to use a symlink for .defconfig? > We could symlink it to raspberrypi4_defconfig or any other config. > I found it strange that this file wasn't updated for so long. >> >> This file should indeed not be needed... Apparently the file is needed but the contents doesn't matter, so maybe replace it with just # This file is needed to make 'make defconfig' work. Regards, Arnout >> >> Regards, >> Yann E. MORIN. >> >>> Regards, >>> Yann E. MORIN. >>> >>>> Signed-off-by: Fabrice Fontaine >>>> --- >>>> .defconfig | 51 --------------------------------------------------- >>>> 1 file changed, 51 deletions(-) >>>> delete mode 100644 .defconfig >>>> >>>> diff --git a/.defconfig b/.defconfig >>>> deleted file mode 100644 >>>> index 7ab0c3fbf0..0000000000 >>>> --- a/.defconfig >>>> +++ /dev/null >>>> @@ -1,51 +0,0 @@ >>>> -# >>>> -# Automatically generated make config: don't edit >>>> -# Mon Feb 18 09:11:56 2008 >>>> -# >>>> -BR2_HAVE_DOT_CONFIG=y >>>> -# BR2_alpha is not set >>>> -# BR2_arm is not set >>>> -# BR2_armeb is not set >>>> -# BR2_cris is not set >>>> -# BR2_ia64 is not set >>>> -BR2_i386=y >>>> -# BR2_m68k is not set >>>> -# BR2_mips is not set >>>> -# BR2_mipsel is not set >>>> -# BR2_nios2 is not set >>>> -# BR2_powerpc is not set >>>> -# BR2_sh is not set >>>> -# BR2_sparc is not set >>>> -# BR2_sparc64 is not set >>>> -# BR2_x86_64 is not set >>>> -# BR2_x86_i486 is not set >>>> -# BR2_x86_i586 is not set >>>> -BR2_x86_i686=y >>>> -# BR2_x86_pentiumpro is not set >>>> -# BR2_x86_pentium_mmx is not set >>>> -# BR2_x86_pentium_m is not set >>>> -# BR2_x86_pentium2 is not set >>>> -# BR2_x86_pentium3 is not set >>>> -# BR2_x86_pentium4 is not set >>>> -# BR2_x86_prescott is not set >>>> -# BR2_x86_nocona is not set >>>> -# BR2_x86_core2 is not set >>>> -# BR2_x86_k6 is not set >>>> -# BR2_x86_k6_2 is not set >>>> -# BR2_x86_athlon is not set >>>> -# BR2_x86_athlon_4 is not set >>>> -# BR2_x86_opteron is not set >>>> -# BR2_x86_opteron_sse3 is not set >>>> -# BR2_x86_barcelona is not set >>>> -# BR2_x86_geode is not set >>>> -# BR2_x86_c3 is not set >>>> -# BR2_x86_winchip_c6 is not set >>>> -# BR2_x86_winchip2 is not set >>>> -BR2_ARCH="i686" >>>> -BR2_ENDIAN="LITTLE" >>>> -BR2_GCC_TARGET_TUNE="i686" >>>> -BR2_GCC_TARGET_ARCH="i686" >>>> - >>>> -# >>>> -# Target options >>>> -# >>>> -- >>>> 2.34.1 >>>> >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> -- >>> .-----------------.--------------------.------------------.--------------------. >>> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | >>> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | >>> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | >>> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | >>> '------------------------------^-------^------------------^--------------------' >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> >> -- >> .-----------------.--------------------.------------------.--------------------. >> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | >> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | >> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | >> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | >> '------------------------------^-------^------------------^--------------------' > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From fontaine.fabrice at gmail.com Sat Jan 8 18:46:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:46:26 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220108193800.5f91ac3b@windsurf> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> <20220108183919.238c1885@gmx.net> <20220108193800.5f91ac3b@windsurf> Message-ID: Le sam. 8 janv. 2022 ? 19:38, Thomas Petazzoni a ?crit : > > On Sat, 8 Jan 2022 18:39:19 +0100 > Peter Seiderer wrote: > > > The difference seems to be: > > > > $ diff -ru file-5.38/configure.ac file-5.41/configure.ac > > [...] > > @@ -88,7 +88,7 @@ > > AC_SUBST(WARNINGS) > > > > dnl Checks for programs. > > -AC_PROG_CC_STDC > > +AC_PROG_CC > > AC_USE_SYSTEM_EXTENSIONS > > AM_PROG_CC_C_O > > AC_C_BIGENDIAN > > [...] > > > > According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or > > use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 > > feature is gone (still used for target/host in package/file/file.mk)... > > But why the solution we use for the target package doesn't work for the > host package? > > Or perhaps we're no longer testing the target package with gcc 4.8 ? host-file is a dependency of file that's why we have only build failure with host-file. Build failures are raised only since the bump. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From arnout at mind.be Sat Jan 8 18:50:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 19:50:10 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220108193800.5f91ac3b@windsurf> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> <20220108183919.238c1885@gmx.net> <20220108193800.5f91ac3b@windsurf> Message-ID: On 08/01/2022 19:38, Thomas Petazzoni wrote: > On Sat, 8 Jan 2022 18:39:19 +0100 > Peter Seiderer wrote: > >> The difference seems to be: >> >> $ diff -ru file-5.38/configure.ac file-5.41/configure.ac >> [...] >> @@ -88,7 +88,7 @@ >> AC_SUBST(WARNINGS) >> >> dnl Checks for programs. >> -AC_PROG_CC_STDC >> +AC_PROG_CC >> AC_USE_SYSTEM_EXTENSIONS >> AM_PROG_CC_C_O >> AC_C_BIGENDIAN >> [...] >> >> According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or >> use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 >> feature is gone (still used for target/host in package/file/file.mk)... > > But why the solution we use for the target package doesn't work for the > host package? > > Or perhaps we're no longer testing the target package with gcc 4.8 ? sourcery-arm*.config uses the CodeSourcery toolchain which has gcc 4.8, so yes we should be testing it with gcc 4.8... Regards, Arnout From arnout at mind.be Sat Jan 8 18:33:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:33:39 +0100 Subject: [Buildroot] [git commit] package/systemd: pre-create directories for services Message-ID: <20220108185105.A359082693@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be256690788fefad93ab00f0233ddb9414d29727 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master various services need directories in /var when they are started, and create them if necessary. Creating those before, allows those services to start even if /var is read-only. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 404943c45c..17bb922f51 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -353,12 +353,14 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) SYSTEMD_CONF_OPTS += -Dlogind=true +SYSTEMD_LOGIND_PERMISSIONS = /var/lib/systemd/linger d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dlogind=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) SYSTEMD_CONF_OPTS += -Dmachined=true -Dnss-mymachines=true +SYSTEMD_MACHINED_PERMISSIONS = /var/lib/machines d 700 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dmachined=false -Dnss-mymachines=false endif @@ -372,6 +374,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HOMED),y) SYSTEMD_CONF_OPTS += -Dhomed=true SYSTEMD_DEPENDENCIES += cryptsetup openssl +SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/home d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dhomed=false endif @@ -416,12 +419,14 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing +SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dcoredump=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_PSTORE),y) SYSTEMD_CONF_OPTS += -Dpstore=true +SYSTEMD_PSTORE_PERMISSIONS = /var/lib/systemd/pstore d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dpstore=false endif @@ -502,6 +507,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization +SYSTEMD_TIMESYNCD_PERMISSIONS = /var/lib/systemd/timesync d 755 systemd-timesync systemd-timesync - - - - - else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif @@ -565,6 +571,19 @@ define SYSTEMD_INSTALL_IMAGES_CMDS $(SYSTEMD_INSTALL_BOOT_FILES) endef +define SYSTEMD_PERMISSIONS + /var/spool d 755 0 0 - - - - - + /var/lib d 755 0 0 - - - - - + /var/lib/private d 700 0 0 - - - - - + /var/log/private d 700 0 0 - - - - - + /var/cache/private d 700 0 0 - - - - - + $(SYSTEMD_LOGIND_PERMISSIONS) + $(SYSTEMD_MACHINED_PERMISSIONS) + $(SYSTEMD_HOMED_PERMISSIONS) + $(SYSTEMD_PSTORE_PERMISSIONS) + $(SYSTEMD_TIMESYNCD_PERMISSIONS) +endef + define SYSTEMD_USERS # udev user groups # systemd user groups From fontaine.fabrice at gmail.com Sat Jan 8 18:57:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:57:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: disable zoned on host Message-ID: <20220108185713.3193240-1-fontaine.fabrice@gmail.com> Disable zoned on host variant to avoid the following build failure since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 and https://github.com/kdave/btrfs-progs/commit/7953f4357bfc6c6526451bc889527b07f0840816: checking linux/blkzoned.h usability... yes checking linux/blkzoned.h presence... yes checking for linux/blkzoned.h... yes checking for struct blk_zone.capacity... no checking for BLKGETZONESZ defined in linux/blkzoned.h... no configure: error: linux/blkzoned.h does not provide blk_zone.capacity Fixes: - http://autobuild.buildroot.org/results/03235edd829436d784a9b214050cc97584f372fb Signed-off-by: Fabrice Fontaine --- package/btrfs-progs/btrfs-progs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 50c8e59e50..4c26cf0df5 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -41,6 +41,7 @@ HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ --disable-libudev \ + --disable-zoned \ --disable-zstd \ --disable-python \ --disable-convert -- 2.34.1 From arnout at mind.be Sat Jan 8 18:57:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:57:22 +0100 Subject: [Buildroot] [git commit] package/trinity: fix build with libexecinfo Message-ID: <20220108185255.76D4A81D36@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7dc225c38a0c81c2202bbfca1c5e674b47d09f26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: debug.o: in function `__show_backtrace': debug.c:(.text+0x10): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/bf78e4be9b9d9ca7d32f922d72ea6cd39a78d3d8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/trinity/trinity.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index befb8de826..4dca50c0b6 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -11,16 +11,24 @@ TRINITY_LICENSE = GPL-2.0 TRINITY_LICENSE_FILES = COPYING TRINITY_CPE_ID_VENDOR = trinity_project +TRINITY_LDFLAGS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +TRINITY_DEPENDENCIES += libexecinfo +TRINITY_LDFLAGS += -lexecinfo +endif + define TRINITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) endef define TRINITY_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LDFLAGS="$(TRINITY_LDFLAGS)" endef define TRINITY_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + LDFLAGS="$(TRINITY_LDFLAGS)" DESTDIR=$(TARGET_DIR)/usr install endef # Install helper scripts From arnout at mind.be Sat Jan 8 18:58:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:58:28 +0100 Subject: [Buildroot] [git commit] package/squid: bump to version 5.3 Message-ID: <20220108185255.91BC281D36@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efc07b7a1818787229ddb335ca26ff2cf03820ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 5.x is the latest stable version, 4.x is provided for archival purpose only and is not intended for general use in new installations. http://www.squid-cache.org/Versions/v5/squid-5.3-RELEASENOTES.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/squid/squid.hash | 8 ++++---- package/squid/squid.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/squid/squid.hash b/package/squid/squid.hash index b1a8feb78e..e18ed8961e 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.17.tar.xz.asc -md5 47b94b2d27516f1764c9d5dc1b9645e5 squid-4.17.tar.xz -sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 squid-4.17.tar.xz +# From http://www.squid-cache.org/Versions/v5/squid-5.3.tar.xz.asc +md5 9249f30169ab6600e53b4f9b8129b3b0 squid-5.3.tar.xz +sha1 d3a8310c725616fa7565d60f3bf8fdf5fa20b15a squid-5.3.tar.xz # Locally calculated -sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418 squid-4.17.tar.xz +sha256 45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715 squid-5.3.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index a30a87e20d..3847fb49dc 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,9 +4,9 @@ # ################################################################################ -SQUID_VERSION = 4.17 +SQUID_VERSION = 5.3 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz -SQUID_SITE = http://www.squid-cache.org/Versions/v4 +SQUID_SITE = http://www.squid-cache.org/Versions/v5 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING SQUID_CPE_ID_VENDOR = squid-cache From arnout at mind.be Sat Jan 8 18:57:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:57:59 +0100 Subject: [Buildroot] [git commit] package/babeltrace2: bump to version 2.0.4 Message-ID: <20220108185255.88EE3832FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f88a08aeedfb1d0ad57ee6b7f8ff306252308d6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop second patch (already in version) - Update indentation in hash file (two spaces) https://github.com/efficios/babeltrace/releases/tag/v2.0.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...test_trace_ir_ref.c-rename-user-structure.patch | 57 ---------------------- package/babeltrace2/babeltrace2.hash | 12 ++--- package/babeltrace2/babeltrace2.mk | 2 +- 3 files changed, 7 insertions(+), 64 deletions(-) diff --git a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch b/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch deleted file mode 100644 index ac9eee82d8..0000000000 --- a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 26 Sep 2020 22:03:10 +0200 -Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure - -Rename user structure to bt_user to avoid the following build failure -with uclibc: - -test_trace_ir_ref.c:41:8: error: redefinition of 'struct user' - struct user { - ^ -In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34, - from ../../src/common/assert.h:28, - from ../../src/lib/object.h:28, - from test_trace_ir_ref.c:25: -/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here - struct user - ^~~~ - -Fixes: - - http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/efficios/babeltrace/pull/115] ---- - tests/lib/test_trace_ir_ref.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c -index d5dfa9cf..70caf29c 100644 ---- a/tests/lib/test_trace_ir_ref.c -+++ b/tests/lib/test_trace_ir_ref.c -@@ -25,7 +25,7 @@ - - #define NR_TESTS 37 - --struct user { -+struct bt_user { - bt_trace_class *tc; - bt_stream_class *sc; - bt_event_class *ec; -@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp) - bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL; - bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL, - *weak_ec3 = NULL; -- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; -+ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; - - /* The only reference which exists at this point is on TC1. */ - tc1 = create_tc1(self_comp); --- -2.28.0 - diff --git a/package/babeltrace2/babeltrace2.hash b/package/babeltrace2/babeltrace2.hash index 27c47ba26f..164e65cded 100644 --- a/package/babeltrace2/babeltrace2.hash +++ b/package/babeltrace2/babeltrace2.hash @@ -1,8 +1,8 @@ -# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.3.tar.bz2.sha256 -sha256 a53625152554102d868ba8395347d0daba0bec9c4b854c3e9bd97c77b0bf04a0 babeltrace2-2.0.3.tar.bz2 +# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2.sha256 +sha256 774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca babeltrace2-2.0.4.tar.bz2 # Hash for license files -sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt +sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk index 1e03f5fdd2..eedfc72b8c 100644 --- a/package/babeltrace2/babeltrace2.mk +++ b/package/babeltrace2/babeltrace2.mk @@ -5,7 +5,7 @@ ################################################################################ BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace -BABELTRACE2_VERSION = 2.0.3 +BABELTRACE2_VERSION = 2.0.4 BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2 BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code) BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE From arnout at mind.be Sat Jan 8 18:57:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:57:33 +0100 Subject: [Buildroot] [git commit] package/refpolicy: bump to version 2.20220106 Message-ID: <20220108185255.80475832E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6691d122ce25fc580ca88243f79f75cc2808ca7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20220106 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...les-services-samba.te-make-crack-optional.patch | 83 ---------------------- ...les-services-wireguard.te-make-iptables-o.patch | 54 -------------- package/refpolicy/refpolicy.hash | 2 +- package/refpolicy/refpolicy.mk | 2 +- 4 files changed, 2 insertions(+), 139 deletions(-) diff --git a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch b/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch deleted file mode 100644 index 2dae5d4a76..0000000000 --- a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 7c58f2508efc115dea03e18e1fa611ebf81f6ee6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:12:01 +0200 -Subject: [PATCH] policy/modules/services/samba.te: make crack optional - -Make crack optional to avoid the following build failure: - - Compiling targeted policy.31 - env LD_LIBRARY_PATH="/tmp/instance-5/output-1/host/lib:/tmp/instance-5/output-1/host/usr/lib" /tmp/instance-5/output-1/host/usr/bin/checkpolicy -c 31 -U deny -S -O -E policy.conf -o policy.31 - policy/modules/services/samba.te:399:ERROR 'type crack_db_t is not within scope' at token ';' on line 360232: - allow smbd_t crack_db_t:dir { getattr search open }; - #line 399 - checkpolicy: error(s) encountered while parsing configuration - -Fixes: - - http://autobuild.buildroot.org/results/ab7098948d1920e42fa587e07f0513f23ba7fc74 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/407] ---- - policy/modules/services/samba.te | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) - -diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te -index 9d4665ae6..6c37625a9 100644 ---- a/policy/modules/services/samba.te -+++ b/policy/modules/services/samba.te -@@ -396,8 +396,6 @@ userdom_signal_all_users(smbd_t) - userdom_home_filetrans_user_home_dir(smbd_t) - userdom_user_home_dir_filetrans_user_home_content(smbd_t, { dir file lnk_file sock_file fifo_file }) - --usermanage_read_crack_db(smbd_t) -- - ifdef(`hide_broken_symptoms',` - files_dontaudit_getattr_default_dirs(smbd_t) - files_dontaudit_getattr_boot_dirs(smbd_t) -@@ -413,18 +411,6 @@ tunable_policy(`samba_create_home_dirs',` - userdom_create_user_home_dirs(smbd_t) - ') - --tunable_policy(`samba_domain_controller',` -- gen_require(` -- class passwd passwd; -- ') -- -- usermanage_domtrans_passwd(smbd_t) -- usermanage_kill_passwd(smbd_t) -- usermanage_domtrans_useradd(smbd_t) -- usermanage_domtrans_groupadd(smbd_t) -- allow smbd_t self:passwd passwd; --') -- - tunable_policy(`samba_enable_home_dirs',` - userdom_manage_user_home_content_dirs(smbd_t) - userdom_manage_user_home_content_files(smbd_t) -@@ -505,6 +491,24 @@ optional_policy(` - seutil_sigchld_newrole(smbd_t) - ') - -+optional_policy(` -+ usermanage_read_crack_db(smbd_t) -+') -+ -+optional_policy(` -+ tunable_policy(`samba_domain_controller',` -+ gen_require(` -+ class passwd passwd; -+ ') -+ -+ usermanage_domtrans_passwd(smbd_t) -+ usermanage_kill_passwd(smbd_t) -+ usermanage_domtrans_useradd(smbd_t) -+ usermanage_domtrans_groupadd(smbd_t) -+ allow smbd_t self:passwd passwd; -+ ') -+') -+ - ######################################## - # - # Nmbd Local policy --- -2.30.2 - diff --git a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch b/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch deleted file mode 100644 index 4cd1f96558..0000000000 --- a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 67394d078c2e1438293b25d08cf408b0b0d55755 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 22 Sep 2021 23:55:59 +0200 -Subject: [PATCH] policy/modules/services/wireguard.te: make iptables optional - -Make iptables optional to avoid the following build failure raised since -version 2.20210908 and -https://github.com/SELinuxProject/refpolicy/commit/7f1a7b1cacd5d211077ce62fbb4e91890e65c820: - - Compiling targeted policy.33 - env LD_LIBRARY_PATH="/tmp/instance-0/output-1/host/lib:/tmp/instance-0/output-1/host/usr/lib" /tmp/instance-0/output-1/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 - policy/modules/services/wireguard.te:66:ERROR 'type iptables_exec_t is not within scope' at token ';' on line 591892: - #line 66 - allow wireguard_t iptables_exec_t:file { getattr open map read execute ioctl }; - checkpolicy: error(s) encountered while parsing configuration - make[1]: *** [Rules.monolithic:79: policy.33] Error 1 - -Fixes: - - http://autobuild.buildroot.org/results/a4223accc6adb70b06fd4e74ca4f28484446b6fa - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/408] ---- - policy/modules/services/wireguard.te | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/policy/modules/services/wireguard.te b/policy/modules/services/wireguard.te -index 7241f65e6..33fd3c55d 100644 ---- a/policy/modules/services/wireguard.te -+++ b/policy/modules/services/wireguard.te -@@ -61,10 +61,6 @@ corecmd_exec_shell(wireguard_t) - - domain_use_interactive_fds(wireguard_t) - --# wg-quick can be configured to run iptables and other networking --# config tools when bringing up/down the wg interfaces --iptables_domtrans(wireguard_t) -- - # wg-quick tries to read /proc/filesystem when running "stat" and "mv" commands - kernel_dontaudit_read_system_state(wireguard_t) - kernel_dontaudit_search_kernel_sysctl(wireguard_t) -@@ -75,3 +71,9 @@ miscfiles_read_localization(wireguard_t) - sysnet_run_ifconfig(wireguard_t, wireguard_roles) - - userdom_use_user_terminals(wireguard_t) -+ -+# wg-quick can be configured to run iptables and other networking -+# config tools when bringing up/down the wg interfaces -+optional_policy(` -+ iptables_domtrans(wireguard_t) -+') --- -2.33.0 - diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index b8f6f023eb..b08c22ed4e 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 4d3140d9fbb91322f5de36d73959464ce1d8946dcd149e36fcaf60e92444e902 refpolicy-2.20210908.tar.bz2 +sha256 965f98f0b68a24fd0b8e8d973d319332aea88973e1d6c455ef9c2a31aefaeaa6 refpolicy-2.20220106.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 975c3b584c..44c50af278 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20210908 +REFPOLICY_VERSION = 2.20220106 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) endif From arnout at mind.be Sat Jan 8 19:00:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:00:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/squid: bump to version 5.3 In-Reply-To: <20220108183241.3051683-1-fontaine.fabrice@gmail.com> References: <20220108183241.3051683-1-fontaine.fabrice@gmail.com> Message-ID: <22056f35-a7a1-a900-b8e5-4cb5735a9eb7@mind.be> On 08/01/2022 19:32, Fabrice Fontaine wrote: > 5.x is the latest stable version, 4.x is provided for archival purpose > only and is not intended for general use in new installations. > > http://www.squid-cache.org/Versions/v5/squid-5.3-RELEASENOTES.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/squid/squid.hash | 8 ++++---- > package/squid/squid.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/squid/squid.hash b/package/squid/squid.hash > index b1a8feb78e..e18ed8961e 100644 > --- a/package/squid/squid.hash > +++ b/package/squid/squid.hash > @@ -1,6 +1,6 @@ > -# From http://www.squid-cache.org/Versions/v4/squid-4.17.tar.xz.asc > -md5 47b94b2d27516f1764c9d5dc1b9645e5 squid-4.17.tar.xz > -sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 squid-4.17.tar.xz > +# From http://www.squid-cache.org/Versions/v5/squid-5.3.tar.xz.asc > +md5 9249f30169ab6600e53b4f9b8129b3b0 squid-5.3.tar.xz > +sha1 d3a8310c725616fa7565d60f3bf8fdf5fa20b15a squid-5.3.tar.xz > # Locally calculated > -sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418 squid-4.17.tar.xz > +sha256 45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715 squid-5.3.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/squid/squid.mk b/package/squid/squid.mk > index a30a87e20d..3847fb49dc 100644 > --- a/package/squid/squid.mk > +++ b/package/squid/squid.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -SQUID_VERSION = 4.17 > +SQUID_VERSION = 5.3 > SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz > -SQUID_SITE = http://www.squid-cache.org/Versions/v4 > +SQUID_SITE = http://www.squid-cache.org/Versions/v5 > SQUID_LICENSE = GPL-2.0+ > SQUID_LICENSE_FILES = COPYING > SQUID_CPE_ID_VENDOR = squid-cache > From arnout at mind.be Sat Jan 8 19:00:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:00:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/babeltrace2: bump to version 2.0.4 In-Reply-To: <20220108175811.2978380-1-fontaine.fabrice@gmail.com> References: <20220108175811.2978380-1-fontaine.fabrice@gmail.com> Message-ID: On 08/01/2022 18:58, Fabrice Fontaine wrote: > - Drop second patch (already in version) > - Update indentation in hash file (two spaces) > > https://github.com/efficios/babeltrace/releases/tag/v2.0.4 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...trace_ir_ref.c-rename-user-structure.patch | 57 ------------------- > package/babeltrace2/babeltrace2.hash | 12 ++-- > package/babeltrace2/babeltrace2.mk | 2 +- > 3 files changed, 7 insertions(+), 64 deletions(-) > delete mode 100644 package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch > > diff --git a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch b/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch > deleted file mode 100644 > index ac9eee82d8..0000000000 > --- a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch > +++ /dev/null > @@ -1,57 +0,0 @@ > -From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 26 Sep 2020 22:03:10 +0200 > -Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure > - > -Rename user structure to bt_user to avoid the following build failure > -with uclibc: > - > -test_trace_ir_ref.c:41:8: error: redefinition of 'struct user' > - struct user { > - ^ > -In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33, > - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25, > - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329, > - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, > - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34, > - from ../../src/common/assert.h:28, > - from ../../src/lib/object.h:28, > - from test_trace_ir_ref.c:25: > -/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here > - struct user > - ^~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/efficios/babeltrace/pull/115] > ---- > - tests/lib/test_trace_ir_ref.c | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c > -index d5dfa9cf..70caf29c 100644 > ---- a/tests/lib/test_trace_ir_ref.c > -+++ b/tests/lib/test_trace_ir_ref.c > -@@ -25,7 +25,7 @@ > - > - #define NR_TESTS 37 > - > --struct user { > -+struct bt_user { > - bt_trace_class *tc; > - bt_stream_class *sc; > - bt_event_class *ec; > -@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp) > - bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL; > - bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL, > - *weak_ec3 = NULL; > -- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; > -+ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; > - > - /* The only reference which exists at this point is on TC1. */ > - tc1 = create_tc1(self_comp); > --- > -2.28.0 > - > diff --git a/package/babeltrace2/babeltrace2.hash b/package/babeltrace2/babeltrace2.hash > index 27c47ba26f..164e65cded 100644 > --- a/package/babeltrace2/babeltrace2.hash > +++ b/package/babeltrace2/babeltrace2.hash > @@ -1,8 +1,8 @@ > -# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.3.tar.bz2.sha256 > -sha256 a53625152554102d868ba8395347d0daba0bec9c4b854c3e9bd97c77b0bf04a0 babeltrace2-2.0.3.tar.bz2 > +# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2.sha256 > +sha256 774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca babeltrace2-2.0.4.tar.bz2 > > # Hash for license files > -sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE > -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt > -sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt > -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt > +sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE > +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt > +sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt > +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt > diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk > index 1e03f5fdd2..eedfc72b8c 100644 > --- a/package/babeltrace2/babeltrace2.mk > +++ b/package/babeltrace2/babeltrace2.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace > -BABELTRACE2_VERSION = 2.0.3 > +BABELTRACE2_VERSION = 2.0.4 > BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2 > BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code) > BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE > From arnout at mind.be Sat Jan 8 19:00:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:00:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/refpolicy: bump to version 2.20220106 In-Reply-To: <20220108174749.2898891-1-fontaine.fabrice@gmail.com> References: <20220108174749.2898891-1-fontaine.fabrice@gmail.com> Message-ID: <5d4ae946-0cca-183e-c6ee-ad08518d4e78@mind.be> On 08/01/2022 18:47, Fabrice Fontaine wrote: > Drop patches (already in version) > > https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20220106 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...ervices-samba.te-make-crack-optional.patch | 83 ------------------- > ...ervices-wireguard.te-make-iptables-o.patch | 54 ------------ > package/refpolicy/refpolicy.hash | 2 +- > package/refpolicy/refpolicy.mk | 2 +- > 4 files changed, 2 insertions(+), 139 deletions(-) > delete mode 100644 package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch > delete mode 100644 package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch > > diff --git a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch b/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch > deleted file mode 100644 > index 2dae5d4a76..0000000000 > --- a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch > +++ /dev/null > @@ -1,83 +0,0 @@ > -From 7c58f2508efc115dea03e18e1fa611ebf81f6ee6 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Wed, 4 Aug 2021 11:12:01 +0200 > -Subject: [PATCH] policy/modules/services/samba.te: make crack optional > - > -Make crack optional to avoid the following build failure: > - > - Compiling targeted policy.31 > - env LD_LIBRARY_PATH="/tmp/instance-5/output-1/host/lib:/tmp/instance-5/output-1/host/usr/lib" /tmp/instance-5/output-1/host/usr/bin/checkpolicy -c 31 -U deny -S -O -E policy.conf -o policy.31 > - policy/modules/services/samba.te:399:ERROR 'type crack_db_t is not within scope' at token ';' on line 360232: > - allow smbd_t crack_db_t:dir { getattr search open }; > - #line 399 > - checkpolicy: error(s) encountered while parsing configuration > - > -Fixes: > - - http://autobuild.buildroot.org/results/ab7098948d1920e42fa587e07f0513f23ba7fc74 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/407] > ---- > - policy/modules/services/samba.te | 32 ++++++++++++++++++-------------- > - 1 file changed, 18 insertions(+), 14 deletions(-) > - > -diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te > -index 9d4665ae6..6c37625a9 100644 > ---- a/policy/modules/services/samba.te > -+++ b/policy/modules/services/samba.te > -@@ -396,8 +396,6 @@ userdom_signal_all_users(smbd_t) > - userdom_home_filetrans_user_home_dir(smbd_t) > - userdom_user_home_dir_filetrans_user_home_content(smbd_t, { dir file lnk_file sock_file fifo_file }) > - > --usermanage_read_crack_db(smbd_t) > -- > - ifdef(`hide_broken_symptoms',` > - files_dontaudit_getattr_default_dirs(smbd_t) > - files_dontaudit_getattr_boot_dirs(smbd_t) > -@@ -413,18 +411,6 @@ tunable_policy(`samba_create_home_dirs',` > - userdom_create_user_home_dirs(smbd_t) > - ') > - > --tunable_policy(`samba_domain_controller',` > -- gen_require(` > -- class passwd passwd; > -- ') > -- > -- usermanage_domtrans_passwd(smbd_t) > -- usermanage_kill_passwd(smbd_t) > -- usermanage_domtrans_useradd(smbd_t) > -- usermanage_domtrans_groupadd(smbd_t) > -- allow smbd_t self:passwd passwd; > --') > -- > - tunable_policy(`samba_enable_home_dirs',` > - userdom_manage_user_home_content_dirs(smbd_t) > - userdom_manage_user_home_content_files(smbd_t) > -@@ -505,6 +491,24 @@ optional_policy(` > - seutil_sigchld_newrole(smbd_t) > - ') > - > -+optional_policy(` > -+ usermanage_read_crack_db(smbd_t) > -+') > -+ > -+optional_policy(` > -+ tunable_policy(`samba_domain_controller',` > -+ gen_require(` > -+ class passwd passwd; > -+ ') > -+ > -+ usermanage_domtrans_passwd(smbd_t) > -+ usermanage_kill_passwd(smbd_t) > -+ usermanage_domtrans_useradd(smbd_t) > -+ usermanage_domtrans_groupadd(smbd_t) > -+ allow smbd_t self:passwd passwd; > -+ ') > -+') > -+ > - ######################################## > - # > - # Nmbd Local policy > --- > -2.30.2 > - > diff --git a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch b/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch > deleted file mode 100644 > index 4cd1f96558..0000000000 > --- a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch > +++ /dev/null > @@ -1,54 +0,0 @@ > -From 67394d078c2e1438293b25d08cf408b0b0d55755 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Wed, 22 Sep 2021 23:55:59 +0200 > -Subject: [PATCH] policy/modules/services/wireguard.te: make iptables optional > - > -Make iptables optional to avoid the following build failure raised since > -version 2.20210908 and > -https://github.com/SELinuxProject/refpolicy/commit/7f1a7b1cacd5d211077ce62fbb4e91890e65c820: > - > - Compiling targeted policy.33 > - env LD_LIBRARY_PATH="/tmp/instance-0/output-1/host/lib:/tmp/instance-0/output-1/host/usr/lib" /tmp/instance-0/output-1/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 > - policy/modules/services/wireguard.te:66:ERROR 'type iptables_exec_t is not within scope' at token ';' on line 591892: > - #line 66 > - allow wireguard_t iptables_exec_t:file { getattr open map read execute ioctl }; > - checkpolicy: error(s) encountered while parsing configuration > - make[1]: *** [Rules.monolithic:79: policy.33] Error 1 > - > -Fixes: > - - http://autobuild.buildroot.org/results/a4223accc6adb70b06fd4e74ca4f28484446b6fa > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/408] > ---- > - policy/modules/services/wireguard.te | 10 ++++++---- > - 1 file changed, 6 insertions(+), 4 deletions(-) > - > -diff --git a/policy/modules/services/wireguard.te b/policy/modules/services/wireguard.te > -index 7241f65e6..33fd3c55d 100644 > ---- a/policy/modules/services/wireguard.te > -+++ b/policy/modules/services/wireguard.te > -@@ -61,10 +61,6 @@ corecmd_exec_shell(wireguard_t) > - > - domain_use_interactive_fds(wireguard_t) > - > --# wg-quick can be configured to run iptables and other networking > --# config tools when bringing up/down the wg interfaces > --iptables_domtrans(wireguard_t) > -- > - # wg-quick tries to read /proc/filesystem when running "stat" and "mv" commands > - kernel_dontaudit_read_system_state(wireguard_t) > - kernel_dontaudit_search_kernel_sysctl(wireguard_t) > -@@ -75,3 +71,9 @@ miscfiles_read_localization(wireguard_t) > - sysnet_run_ifconfig(wireguard_t, wireguard_roles) > - > - userdom_use_user_terminals(wireguard_t) > -+ > -+# wg-quick can be configured to run iptables and other networking > -+# config tools when bringing up/down the wg interfaces > -+optional_policy(` > -+ iptables_domtrans(wireguard_t) > -+') > --- > -2.33.0 > - > diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash > index b8f6f023eb..b08c22ed4e 100644 > --- a/package/refpolicy/refpolicy.hash > +++ b/package/refpolicy/refpolicy.hash > @@ -1,5 +1,5 @@ > # From https://github.com/SELinuxProject/refpolicy/releases > -sha256 4d3140d9fbb91322f5de36d73959464ce1d8946dcd149e36fcaf60e92444e902 refpolicy-2.20210908.tar.bz2 > +sha256 965f98f0b68a24fd0b8e8d973d319332aea88973e1d6c455ef9c2a31aefaeaa6 refpolicy-2.20220106.tar.bz2 > > # Locally computed > sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING > diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk > index 975c3b584c..44c50af278 100644 > --- a/package/refpolicy/refpolicy.mk > +++ b/package/refpolicy/refpolicy.mk > @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) > REFPOLICY_SITE_METHOD = git > BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) > else > -REFPOLICY_VERSION = 2.20210908 > +REFPOLICY_VERSION = 2.20220106 > REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 > REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) > endif > From arnout at mind.be Sat Jan 8 19:01:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:01:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/trinity: fix build with libexecinfo In-Reply-To: <20220108154118.2320814-1-fontaine.fabrice@gmail.com> References: <20220108154118.2320814-1-fontaine.fabrice@gmail.com> Message-ID: <2d3fc713-d7dd-3821-338d-768a17102abc@mind.be> On 08/01/2022 16:41, Fabrice Fontaine wrote: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: debug.o: in function `__show_backtrace': > debug.c:(.text+0x10): undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/bf78e4be9b9d9ca7d32f922d72ea6cd39a78d3d8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/trinity/trinity.mk | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk > index befb8de826..4dca50c0b6 100644 > --- a/package/trinity/trinity.mk > +++ b/package/trinity/trinity.mk > @@ -11,16 +11,24 @@ TRINITY_LICENSE = GPL-2.0 > TRINITY_LICENSE_FILES = COPYING > TRINITY_CPE_ID_VENDOR = trinity_project > > +TRINITY_LDFLAGS = $(TARGET_LDFLAGS) > + > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +TRINITY_DEPENDENCIES += libexecinfo > +TRINITY_LDFLAGS += -lexecinfo > +endif > + > define TRINITY_CONFIGURE_CMDS > (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) > endef > > define TRINITY_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) > + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LDFLAGS="$(TRINITY_LDFLAGS)" > endef > > define TRINITY_INSTALL_TARGET_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install > + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ > + LDFLAGS="$(TRINITY_LDFLAGS)" DESTDIR=$(TARGET_DIR)/usr install > endef > > # Install helper scripts > From cyrilbur at gmail.com Sat Jan 8 19:03:17 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Sat, 8 Jan 2022 19:03:17 +0000 Subject: [Buildroot] [PATCH] package/python-greenlet: enable as host package In-Reply-To: <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> References: <20210623145231.19243-1-cyrilbur@gmail.com> <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> Message-ID: Hi Romain, Thanks for your interest. My employer has some custom packages which do depend on host python greenlet. I'm keen to avoid any forks (however small) of buildroot internally, it just makes life easier. Cyril On Sat, 8 Jan 2022, 18:43 Romain Naour, wrote: > Hello, > > Le 23/06/2021 ? 16:52, Cyril Bur a ?crit : > > Why? > > There is not package using host-python-greenlet in the tree. > > Best regards, > Romain > > > Signed-off-by: Cyril Bur > > --- > > package/python-greenlet/python-greenlet.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/python-greenlet/python-greenlet.mk > b/package/python-greenlet/python-greenlet.mk > > index 01d578a183..e90d1c0f56 100644 > > --- a/package/python-greenlet/python-greenlet.mk > > +++ b/package/python-greenlet/python-greenlet.mk > > @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > > PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > > > > $(eval $(python-package)) > > +$(eval $(host-python-package)) > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Sat Jan 8 19:04:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 12:04:04 -0700 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <20201126152832.1115350-1-nolange79@gmail.com> References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange wrote: > > Systemd has very many options, adding a way for the user > to set custom options can help customizations > without changing buildroot files. I'm not sure this is a good idea, if a configuration option needs customizability it probably needs a specific kconfig option. Systemd config options tend to require dependency selection and special handling so this seems likely to cause spurious errors due to improper usage. Seems to be a pretty big footgun IMO. What systemd configure option would you want to be using that isn't currently able to be enabled? > > Signed-off-by: Norbert Lange > --- > package/systemd/Config.in | 8 ++++++++ > package/systemd/systemd.mk | 2 ++ > 2 files changed, 10 insertions(+) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 2c89538987..946b2d9905 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -89,6 +89,14 @@ if BR2_PACKAGE_SYSTEMD > config BR2_PACKAGE_PROVIDES_UDEV > default "systemd" > > +config BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG > + string "Additional target systemd options" > + default "" > + help > + Any additional systemd configure options you may want to > + include. The options are appended to Buildroot generated > + options and can override these. > + > config BR2_PACKAGE_SYSTEMD_BOOT > bool "systemd-boot" > depends on BR2_i386 || BR2_x86_64 > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 2f1d898e0d..878e99ed00 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -500,6 +500,8 @@ ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) > SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) > endif > > +SYSTEMD_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG)) > + > define SYSTEMD_INSTALL_INIT_HOOK > ln -fs multi-user.target \ > $(TARGET_DIR)/usr/lib/systemd/system/default.target > -- > 2.29.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From arnout at mind.be Sat Jan 8 19:08:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 20:08:02 +0100 Subject: [Buildroot] [git commit] systemd: ensure tmpfiles.d/legacy.conf is installed Message-ID: <20220108190207.B98B1832C7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e71f5111988fe57531d1c84bdf631f1932b14bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity isn't enabled. This config sets up /var/lock, which many programs such as uboot's fw_printenv/setenv still depend on by default. Signed-off-by: Joseph Kogut Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 17bb922f51..b3b5ed600d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -563,9 +563,17 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef +# systemd doesn't install legacy.conf without sysv-compat +# This config ensures /var/lock is created +define SYSTEMD_INSTALL_LEGACY_CONF_HOOK + $(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \ + $(TARGET_DIR)/usr/lib/tmpfiles.d +endef + SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_INIT_HOOK \ - SYSTEMD_INSTALL_MACHINEID_HOOK + SYSTEMD_INSTALL_MACHINEID_HOOK \ + SYSTEMD_INSTALL_LEGACY_CONF_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS $(SYSTEMD_INSTALL_BOOT_FILES) From arnout at mind.be Sat Jan 8 19:12:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:12:16 +0100 Subject: [Buildroot] [PATCH 1/1] systemd: ensure tmpfiles.d/legacy.conf is installed In-Reply-To: <20200825000246.4035-1-joseph.kogut@gmail.com> References: <20200825000246.4035-1-joseph.kogut@gmail.com> Message-ID: <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> On 25/08/2020 02:02, Joseph Kogut wrote: > Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity > isn't enabled. This config sets up /var/lock, which many programs such > as uboot's fw_printenv/setenv still depend on by default. > > Signed-off-by: Joseph Kogut After all the discussion, I did finally apply to master, thanks. For Norbert: we simply have legacy packages that write to /var/lock instead of /run/lock. In an ideal world, we'd patch all of them to do the right thing. However, that's not realistic. So let's enable this legacy stuff to make sure that those legacy packages don't actually write to disk. We could indeed instead enable sysv compatibility, for maximum support of legacy packages. What exactly would be the effects of that? Regards, Arnout > --- > package/systemd/systemd.mk | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index e356cb1add..8454993823 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -512,10 +512,18 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK > touch $(TARGET_DIR)/etc/machine-id > endef > > +# systemd doesn't install legacy.conf without sysv-compat > +# This config ensures /var/lock is created > +define SYSTEMD_INSTALL_LEGACY_CONF_HOOK > + $(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \ > + $(TARGET_DIR)/usr/lib/tmpfiles.d > +endef > + > SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ > SYSTEMD_INSTALL_INIT_HOOK \ > SYSTEMD_INSTALL_MACHINEID_HOOK \ > - SYSTEMD_INSTALL_RESOLVCONF_HOOK > + SYSTEMD_INSTALL_RESOLVCONF_HOOK \ > + SYSTEMD_INSTALL_LEGACY_CONF_HOOK > > define SYSTEMD_INSTALL_IMAGES_CMDS > $(SYSTEMD_INSTALL_BOOT_FILES) > From romain.naour at smile.fr Sat Jan 8 19:13:17 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 20:13:17 +0100 Subject: [Buildroot] [PATCH] package/python-greenlet: enable as host package In-Reply-To: References: <20210623145231.19243-1-cyrilbur@gmail.com> <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> Message-ID: Hello Cyril, Le 08/01/2022 ? 20:03, Cyril Bur a ?crit?: > Hi Romain, > > Thanks for your interest. > > My employer has some custom packages which do depend on host python > greenlet. > > I'm keen to avoid any forks (however small) of buildroot internally, it > just makes life easier. I understand. It seems there is an exception in the tree (host-python-lxml), but you have to add at least a Config.in.host: https://git.buildroot.net/buildroot/commit/?id=4f147ae0a0f940dfc7ec93af8e70b6625821d91d Also add a comment to explain why we don't have any package using it in the tree. I have marked this patch as "Changes Requested". Best regards, Romain > > Cyril > > > On Sat, 8 Jan 2022, 18:43 Romain Naour, wrote: > >> Hello, >> >> Le 23/06/2021 ? 16:52, Cyril Bur a ?crit : >> >> Why? >> >> There is not package using host-python-greenlet in the tree. >> >> Best regards, >> Romain >> >>> Signed-off-by: Cyril Bur >>> --- >>> package/python-greenlet/python-greenlet.mk | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/package/python-greenlet/python-greenlet.mk >> b/package/python-greenlet/python-greenlet.mk >>> index 01d578a183..e90d1c0f56 100644 >>> --- a/package/python-greenlet/python-greenlet.mk >>> +++ b/package/python-greenlet/python-greenlet.mk >>> @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 >>> PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF >>> >>> $(eval $(python-package)) >>> +$(eval $(host-python-package)) >>> >> >> > From cyrilbur at gmail.com Sat Jan 8 19:16:10 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Sat, 8 Jan 2022 19:16:10 +0000 Subject: [Buildroot] [PATCH] package/python-greenlet: enable as host package In-Reply-To: References: <20210623145231.19243-1-cyrilbur@gmail.com> <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> Message-ID: On Sat, 8 Jan 2022, 19:13 Romain Naour, wrote: > Hello Cyril, > > Le 08/01/2022 ? 20:03, Cyril Bur a ?crit : > > Hi Romain, > > > > Thanks for your interest. > > > > My employer has some custom packages which do depend on host python > > greenlet. > > > > I'm keen to avoid any forks (however small) of buildroot internally, it > > just makes life easier. > > I understand. > > It seems there is an exception in the tree (host-python-lxml), but you > have to > add at least a Config.in.host: > Ah sorry! Yep will do. > > > https://git.buildroot.net/buildroot/commit/?id=4f147ae0a0f940dfc7ec93af8e70b6625821d91d > > Also add a comment to explain why we don't have any package using it in > the tree. > Perfect will do. Thanks, Cyril > > I have marked this patch as "Changes Requested". > > Best regards, > Romain > > > > > > Cyril > > > > > > On Sat, 8 Jan 2022, 18:43 Romain Naour, wrote: > > > >> Hello, > >> > >> Le 23/06/2021 ? 16:52, Cyril Bur a ?crit : > >> > >> Why? > >> > >> There is not package using host-python-greenlet in the tree. > >> > >> Best regards, > >> Romain > >> > >>> Signed-off-by: Cyril Bur > >>> --- > >>> package/python-greenlet/python-greenlet.mk | 1 + > >>> 1 file changed, 1 insertion(+) > >>> > >>> diff --git a/package/python-greenlet/python-greenlet.mk > >> b/package/python-greenlet/python-greenlet.mk > >>> index 01d578a183..e90d1c0f56 100644 > >>> --- a/package/python-greenlet/python-greenlet.mk > >>> +++ b/package/python-greenlet/python-greenlet.mk > >>> @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > >>> PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > >>> > >>> $(eval $(python-package)) > >>> +$(eval $(host-python-package)) > >>> > >> > >> > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Sat Jan 8 19:18:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 20:18:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/civetweb: drop BR2_PACKAGE_CIVETWEB_WITH_LUA In-Reply-To: <20201104074311.491932-1-fontaine.fabrice@gmail.com> References: <20201104074311.491932-1-fontaine.fabrice@gmail.com> Message-ID: Hi, Sorry for the very slow response. On Wed, Nov 4, 2020 at 8:44 AM Fabrice Fontaine wrote: > > Drop BR2_PACKAGE_CIVETWEB_WITH_LUA and enable Lua support depending on > BR2_PACKAGE_LUA and BR2_PACKAGE_LUAJIT > > It should be noted that civetweb will still use its embedded version of > sqlite > > Signed-off-by: Fabrice Fontaine > --- > Config.in.legacy | 9 +++++++++ > package/civetweb/Config.in | 12 ------------ > package/civetweb/civetweb.mk | 20 +++++++++++++++++--- > 3 files changed, 26 insertions(+), 15 deletions(-) > +++ b/package/civetweb/civetweb.mk > @@ -25,9 +25,23 @@ ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),) > CIVETWEB_COPT += -DNO_ATOMICS=1 > endif > > -ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y) > -CIVETWEB_CONF_OPTS += WITH_LUA=1 > -CIVETWEB_LIBS += -ldl > +ifeq ($(BR2_PACKAGE_LUA),y) You forgot about the !BR2_STATIC_LIBS dependency. > +CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUA_SHARED=1 I also had to pass LUA_SHARED_LIB_FLAG='' to not get civetweb to pass -llua5.3 or similar (we only install liblua.so*) > +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs lua` > +CIVETWEB_DEPENDENCIES += host-pkgconf lua > +ifeq ($(BR2_PACKAGE_LUA_5_1),y) > +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=501 > +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) > +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=503 > +else ifeq ($(BR2_PACKAGE_LUA_5_4),y) > +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=504 > +endif > +endif > + > +ifeq ($(BR2_PACKAGE_LUAJIT),y) I know that you cannot enable luajit and lua at the same time, but I still find it easier to reason about if these two are mutually exclusive, so I reworked it to do that. > +CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUAJIT_SHARED=1 > +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs luajit` The luajit .pc file doesn't add -ldl, so I had to maually add that as well. Committed with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 19:26:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 20:26:07 +0100 Subject: [Buildroot] [git commit] package/civetweb: drop BR2_PACKAGE_CIVETWEB_WITH_LUA Message-ID: <20220108192000.9F710832B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=329f71ed3038af9403d606ec1f1b0d2d96c6f340 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop BR2_PACKAGE_CIVETWEB_WITH_LUA and enable Lua support depending on BR2_PACKAGE_LUA and BR2_PACKAGE_LUAJIT It should be noted that civetweb will still use its embedded version of sqlite Signed-off-by: Fabrice Fontaine [Peter: add !BR2_STATIC_LIBS, pass LUA_SHARED_LIB_FLAG, explicitly link with -ldl, rework order] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 9 +++++++++ package/civetweb/Config.in | 12 ------------ package/civetweb/civetweb.mk | 18 +++++++++++++++--- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 141d43a479..75873ff74b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_CIVETWEB_WITH_LUA + bool "civetweb lua support option removed" + select BR2_LEGACY + help + Lua support does not depend on a version of Lua bundled + within the Civetweb sources anymore. Lua support is + automatically enabled if an Lua interpreter (lua or luajit) + is enabled in Buildroot. + config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER bool "sunxi-mali-mainline-driver package was renamed" select BR2_LEGACY diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in index 9e43969085..6bca5ed8fd 100644 --- a/package/civetweb/Config.in +++ b/package/civetweb/Config.in @@ -21,18 +21,6 @@ config BR2_PACKAGE_CIVETWEB_LIB Enable the civetweb library for embedding in another application. -config BR2_PACKAGE_CIVETWEB_WITH_LUA - bool "enable Lua support" - # required by the bundled Sqlite3 and Lua code - depends on !BR2_STATIC_LIBS - help - Enable Lua support in Civetweb. Note that this will use a - version of Lua and Sqlite bundled within the Civetweb - sources, and not the packages from Buildroot. - -comment "lua support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - endif comment "civetweb needs a toolchain w/ threads" diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 22618fb443..a299de85e9 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -26,9 +26,21 @@ ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),) CIVETWEB_COPT += -DNO_ATOMICS=1 endif -ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y) -CIVETWEB_CONF_OPTS += WITH_LUA=1 -CIVETWEB_LIBS += -ldl +ifeq ($(BR2_PACKAGE_LUAJIT),y) +CIVETWEB_CONF_OPTS += WITH_LUAJIT_SHARED=1 +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs luajit` -ldl +CIVETWEB_DEPENDENCIES += host-pkgconf luajit +else ifeq ($(BR2_PACKAGE_LUA):$(BR2_STATIC_LIBS),y:) +CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUA_SHARED=1 LUA_SHARED_LIB_FLAG='' +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs lua` +CIVETWEB_DEPENDENCIES += host-pkgconf lua +ifeq ($(BR2_PACKAGE_LUA_5_1),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=501 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=503 +else ifeq ($(BR2_PACKAGE_LUA_5_4),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=504 +endif endif ifeq ($(BR2_PACKAGE_OPENSSL),y) From yann.morin.1998 at free.fr Sat Jan 8 19:40:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 20:40:00 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: disable zoned on host Message-ID: <20220108193401.304D88345B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=188f8c836d9a3224c8cc6dda429108b0938c8cc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable zoned on host variant to avoid the following build failure since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 and https://github.com/kdave/btrfs-progs/commit/7953f4357bfc6c6526451bc889527b07f0840816: checking linux/blkzoned.h usability... yes checking linux/blkzoned.h presence... yes checking for linux/blkzoned.h... yes checking for struct blk_zone.capacity... no checking for BLKGETZONESZ defined in linux/blkzoned.h... no configure: error: linux/blkzoned.h does not provide blk_zone.capacity Fixes: - http://autobuild.buildroot.org/results/03235edd829436d784a9b214050cc97584f372fb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/btrfs-progs/btrfs-progs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 50c8e59e50..4c26cf0df5 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -41,6 +41,7 @@ HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ --disable-libudev \ + --disable-zoned \ --disable-zstd \ --disable-python \ --disable-convert From thomas.petazzoni at bootlin.com Sat Jan 8 19:40:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 20:40:22 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add option to define custom dependencies In-Reply-To: <20200425000629.2068191-1-heiko@sntech.de> References: <20200425000629.2068191-1-heiko@sntech.de> Message-ID: <20220108204022.550a7909@windsurf> Hello Heiko, On Sat, 25 Apr 2020 02:06:29 +0200 Heiko Stuebner wrote: > From: Heiko Stuebner > > A custom uboot version my depend on additional unspecified packages > to be built before the uboot build is attempted. > > One example is an additional config fragment referencing things > from other packages, so add an option similar to the config fragments > where these can be defined. > > Signed-off-by: Heiko Stuebner > --- > boot/uboot/Config.in | 8 ++++++++ > boot/uboot/uboot.mk | 1 + > 2 files changed, 9 insertions(+) Sorry to come back to you so long after the patch was submitted. We finally had a discussion, and decided that we would prefer to see the actual practical use cases of this, before merging this option. Maybe this option is a good idea, but we really want to hear about specific use cases first. If you have one, we're definitely interested to hear about it! Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 19:40:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 20:40:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: disable zoned on host In-Reply-To: <20220108185713.3193240-1-fontaine.fabrice@gmail.com> References: <20220108185713.3193240-1-fontaine.fabrice@gmail.com> Message-ID: <20220108194035.GF1881783@scaer> Fabrice, All, On 2022-01-08 19:57 +0100, Fabrice Fontaine spake thusly: > Disable zoned on host variant to avoid the following build failure since > bump to version 5.15.1 in commit > 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 and > https://github.com/kdave/btrfs-progs/commit/7953f4357bfc6c6526451bc889527b07f0840816: > > checking linux/blkzoned.h usability... yes > checking linux/blkzoned.h presence... yes > checking for linux/blkzoned.h... yes > checking for struct blk_zone.capacity... no > checking for BLKGETZONESZ defined in linux/blkzoned.h... no > configure: error: linux/blkzoned.h does not provide blk_zone.capacity > > Fixes: > - http://autobuild.buildroot.org/results/03235edd829436d784a9b214050cc97584f372fb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/btrfs-progs/btrfs-progs.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index 50c8e59e50..4c26cf0df5 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -41,6 +41,7 @@ HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib > HOST_BTRFS_PROGS_CONF_OPTS = \ > --disable-backtrace \ > --disable-libudev \ > + --disable-zoned \ > --disable-zstd \ > --disable-python \ > --disable-convert > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Jan 8 19:41:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:41:27 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: <20201126144745.502228-1-nolange79@gmail.com> References: <20201126144745.502228-1-nolange79@gmail.com> Message-ID: Hi Norbert, On 26/11/2020 15:47, Norbert Lange wrote: > journald supports catalog files, or rather a binary database of > those. > Functionality added includes: > > - A config option allows enabling the binary database. > > - if the option is enabled, the database is built and moved to > /usr/share/factory. A symlink is created in /var pointing to > that file. > If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the > language whitelist are deleted first. > > - the service normally used for creating the DB during boot, > and the catalog source files used as input are deleted. > > The move to /usr/share/factory is helpful for having /usr as whole > system distribution. > > Signed-off-by: Norbert Lange I was going to apply a second time, but then I noticed that I made some comments on v2 [1] that you haven't answered to and I still think they're valid. So I've marked this patch as Changes Requested. If you respin, please also include in the commit message the additional explanations you made in reply to Romain. Regards, Arnout [1] https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ > --- > v1->v2: > - Moved all logic into systemd.mk > - solved the LOCALE_PURGE order that way > - use the factory to store the file > - option to enable the DB (similar to udev HWDB) > - cant be anabled with !ROOTFS_RW, tons of > issues with that one > v2->v3: > - use backticks instead of $$() > - be more explicit about what happens in > SYSTEMD_LOCALE_PURGE_CATALOGS > > Signed-off-by: Norbert Lange > --- > package/systemd/Config.in | 14 +++++++++++++ > package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index ec34478e3d..d576e6035b 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD > > http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands > > +config BR2_PACKAGE_SYSTEMD_CATALOGDB > + bool "enable journal catalog database installation" > + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic > + help > + Build and install the journal catalog database. > + > + catalog files are used to provide extended and potentially localized > + messages for the journal. > + > + The original catalog files will be built into a DB at > + /usr/share/factory/var/lib/systemd/catalog/database. > + > + https://www.freedesktop.org/wiki/Software/systemd/catalog/ > + > config BR2_PACKAGE_SYSTEMD_LOCALED > bool "enable locale daemon" > help > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index cb12f667d6..ae99c02abf 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD > $(SYSTEMD_INSTALL_NETWORK_CONFS) > endef > > +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) > +define SYSTEMD_LOCALE_PURGE_CATALOGS > + # go through all files with scheme ..catalog > + # and remove those where is not in LOCALE_NOPURGE > + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ > + do \ > + basename=$${cfile##*/}; \ > + basename=$${basename%.catalog}; \ > + langext=$${basename#*.}; \ > + [ "$$langext" = "$${basename}" ] && continue; \ > + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ > + rm -f "$$cfile"; \ > + done > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) > +define SYSTEMD_UPDATE_CATALOGS > + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog > + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ > + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database > + rm $(TARGET_DIR)/var/lib/systemd/catalog/database > + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ > + $(TARGET_DIR)/var/lib/systemd/catalog/database > + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ > + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS > +endif > + > +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ > + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > From thomas.petazzoni at bootlin.com Sat Jan 8 19:42:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 20:42:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyext: new package In-Reply-To: <20210213102055.24378-1-guillaume.bresaix@gmail.com> References: <20210213102055.24378-1-guillaume.bresaix@gmail.com> Message-ID: <20220108204223.2e904905@windsurf> Hello Guillaume, On Sat, 13 Feb 2021 11:20:55 +0100 guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > Python-pyext is a set of scripts to enhance python. > This includes features such as function overloading, > the "switch" statement.. > > Signed-off-by: Guillaume W. Bres > --- We looked at this package, and upstream has not made any release since 2014, and there is apparently no publicly available version control system. With python moving so fast, a package that hasn't been touched since 2014 doesn't seem like a good idea. So I'll mark this patch as Rejected. If you have a reason to think this is still maintained, could you provide some more details? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sat Jan 8 20:40:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 21:40:39 +0100 Subject: [Buildroot] [PATCH 1/1] systemd: ensure tmpfiles.d/legacy.conf is installed In-Reply-To: <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> References: <20200825000246.4035-1-joseph.kogut@gmail.com> <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> Message-ID: <0570b1f3-5229-5c0e-796a-53f8747b540a@mind.be> On 08/01/2022 20:12, Arnout Vandecappelle wrote: > > > On 25/08/2020 02:02, Joseph Kogut wrote: >> Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity >> isn't enabled. This config sets up /var/lock, which many programs such >> as uboot's fw_printenv/setenv still depend on by default. >> >> Signed-off-by: Joseph Kogut > > ?After all the discussion, I did finally apply to master, thanks. ?And I ended up reverting it again - legacy.conf is now legacy.conf.in and it needs to be preprocessed, but that is only done if sysv-compat is enabled. ?So if we want this, our only option is to enable sysv-compat (which is probably something we should do anyway). ?Regards, ?Arnout > > ?For Norbert: we simply have legacy packages that write to /var/lock instead > of /run/lock. In an ideal world, we'd patch all of them to do the right thing. > However, that's not realistic. So let's enable this legacy stuff to make sure > that those legacy packages don't actually write to disk. > > ?We could indeed instead enable sysv compatibility, for maximum support of > legacy packages. What exactly would be the effects of that? > > ?Regards, > ?Arnout > > >> --- >> ? package/systemd/systemd.mk | 10 +++++++++- >> ? 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >> index e356cb1add..8454993823 100644 >> --- a/package/systemd/systemd.mk >> +++ b/package/systemd/systemd.mk >> @@ -512,10 +512,18 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK >> ????? touch $(TARGET_DIR)/etc/machine-id >> ? endef >> ? +# systemd doesn't install legacy.conf without sysv-compat >> +# This config ensures /var/lock is created >> +define SYSTEMD_INSTALL_LEGACY_CONF_HOOK >> +??? $(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \ >> +??????? $(TARGET_DIR)/usr/lib/tmpfiles.d >> +endef >> + >> ? SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ >> ????? SYSTEMD_INSTALL_INIT_HOOK \ >> ????? SYSTEMD_INSTALL_MACHINEID_HOOK \ >> -??? SYSTEMD_INSTALL_RESOLVCONF_HOOK >> +??? SYSTEMD_INSTALL_RESOLVCONF_HOOK \ >> +??? SYSTEMD_INSTALL_LEGACY_CONF_HOOK >> ? ? define SYSTEMD_INSTALL_IMAGES_CMDS >> ????? $(SYSTEMD_INSTALL_BOOT_FILES) >> From arnout at mind.be Sat Jan 8 20:40:44 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 21:40:44 +0100 Subject: [Buildroot] [git commit] Revert "systemd: ensure tmpfiles.d/legacy.conf is installed" Message-ID: <20220108203441.1B53583456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fc0d98699b91bbdc9e6fe7064ecb1d966aaa4a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master legacy.conf no longer exists, it's now legacy.conf.in that has to be preprocessed. The preprocessing is only done if sysv-compat is enabled. This reverts commit 0e71f5111988fe57531d1c84bdf631f1932b14bc. --- package/systemd/systemd.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b3b5ed600d..17bb922f51 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -563,17 +563,9 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef -# systemd doesn't install legacy.conf without sysv-compat -# This config ensures /var/lock is created -define SYSTEMD_INSTALL_LEGACY_CONF_HOOK - $(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \ - $(TARGET_DIR)/usr/lib/tmpfiles.d -endef - SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_INIT_HOOK \ - SYSTEMD_INSTALL_MACHINEID_HOOK \ - SYSTEMD_INSTALL_LEGACY_CONF_HOOK + SYSTEMD_INSTALL_MACHINEID_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS $(SYSTEMD_INSTALL_BOOT_FILES) From thomas.petazzoni at bootlin.com Sat Jan 8 20:41:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 21:41:33 +0100 Subject: [Buildroot] [git commit] package/libcap: drop host-libcap dependency Message-ID: <20220108203526.DA7AC83456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0651b22d638faecb3688f1fd4e0760c31bfba893 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-libcap was added as a dependency of libcap in commit efae605c88deb15d9c50fd67bdd80f46a78b06c1 because back then at installation time, the setcap utility was called. However, since commit 57155c6b6a7a40523075626353375109fe159c04, we use RAISE_SETFCAP=no, which disables calling setcap at install time. Therefore, having host-libcap built before libcap is no longer needed. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcap/libcap.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 42acca9082..1207995333 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -11,7 +11,7 @@ LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause LIBCAP_LICENSE_FILES = License LIBCAP_CPE_ID_VENDOR = libcap_project -LIBCAP_DEPENDENCIES = host-libcap host-gperf +LIBCAP_DEPENDENCIES = host-gperf LIBCAP_INSTALL_STAGING = YES HOST_LIBCAP_DEPENDENCIES = host-gperf From fontaine.fabrice at gmail.com Sat Jan 8 20:41:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 21:41:06 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> <20220108183919.238c1885@gmx.net> <20220108193800.5f91ac3b@windsurf> Message-ID: Le sam. 8 janv. 2022 ? 19:50, Arnout Vandecappelle a ?crit : > > > > On 08/01/2022 19:38, Thomas Petazzoni wrote: > > On Sat, 8 Jan 2022 18:39:19 +0100 > > Peter Seiderer wrote: > > > >> The difference seems to be: > >> > >> $ diff -ru file-5.38/configure.ac file-5.41/configure.ac > >> [...] > >> @@ -88,7 +88,7 @@ > >> AC_SUBST(WARNINGS) > >> > >> dnl Checks for programs. > >> -AC_PROG_CC_STDC > >> +AC_PROG_CC > >> AC_USE_SYSTEM_EXTENSIONS > >> AM_PROG_CC_C_O > >> AC_C_BIGENDIAN > >> [...] > >> > >> According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or > >> use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 > >> feature is gone (still used for target/host in package/file/file.mk)... > > > > But why the solution we use for the target package doesn't work for the > > host package? > > > > Or perhaps we're no longer testing the target package with gcc 4.8 ? > > sourcery-arm*.config uses the CodeSourcery toolchain which has gcc 4.8, so yes > we should be testing it with gcc 4.8... Here is the first build failure with gcc 4.8: http://autobuild.buildroot.org/results/9e7/9e7868be00f2cd18205b2ce664be95f8b9e2b063/build-end.log > > Regards, > Arnout Best Regards, Fabrice From romain.naour at smile.fr Sat Jan 8 20:44:49 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 21:44:49 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/libcap: drop host-libcap dependency In-Reply-To: <20200830100058.4180798-2-fontaine.fabrice@gmail.com> References: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> <20200830100058.4180798-2-fontaine.fabrice@gmail.com> Message-ID: <04eb7314-3beb-c40f-483d-aa142f63a0c6@smile.fr> Hello Fabrice, Le 30/08/2020 ? 12:00, Fabrice Fontaine a ?crit?: > host-libcap was added as a dependency of libcap in commit > efae605c88deb15d9c50fd67bdd80f46a78b06c1 without any explanation in the > commit message. Drop this dependency that does seem to be needed. I dont see why host-libcap would be needed to build libcap for the target. libcap in Yocto doesn't add libcap-native in dependency: https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-support/libcap/libcap_2.62.bb This patch needs to be rebased on master since host-gperf has been added rencently. Best regards, Romain > > Signed-off-by: Fabrice Fontaine > --- > package/libcap/libcap.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk > index 208f8eade1..ead5a17dcc 100644 > --- a/package/libcap/libcap.mk > +++ b/package/libcap/libcap.mk > @@ -10,7 +10,6 @@ LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz > LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause > LIBCAP_LICENSE_FILES = License > > -LIBCAP_DEPENDENCIES = host-libcap > LIBCAP_INSTALL_STAGING = YES > > ifeq ($(BR2_STATIC_LIBS),y) > From thomas.petazzoni at bootlin.com Sat Jan 8 20:54:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 21:54:47 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/libcap: drop host-libcap dependency In-Reply-To: <20200830100058.4180798-2-fontaine.fabrice@gmail.com> References: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> <20200830100058.4180798-2-fontaine.fabrice@gmail.com> Message-ID: <20220108215447.3c858d9e@windsurf> On Sun, 30 Aug 2020 12:00:58 +0200 Fabrice Fontaine wrote: > host-libcap was added as a dependency of libcap in commit > efae605c88deb15d9c50fd67bdd80f46a78b06c1 without any explanation in the > commit message. Drop this dependency that does seem to be needed. > > Signed-off-by: Fabrice Fontaine > --- > package/libcap/libcap.mk | 1 - > 1 file changed, 1 deletion(-) We did some research, and figured out why the dependency was needed back then, and is no longer now. I've expanded the commit log with the explanation, and applied. See the final commit at: https://git.buildroot.org/buildroot/commit/?id=0651b22d638faecb3688f1fd4e0760c31bfba893 Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sat Jan 8 20:55:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 21:55:32 +0100 Subject: [Buildroot] [PATCH 1/1] rtl8189es: new package In-Reply-To: <20200511181051.9347-1-aussedat.louis@gmail.com> References: <20200511181051.9347-1-aussedat.louis@gmail.com> Message-ID: <5af07a98-a5dd-6ca5-2f78-75aed51c70f1@mind.be> On 11/05/2020 20:10, Louis Aussedat wrote: > This package adds the rtl8189es WiFi driver. > repo: https://github.com/jwrdegoede/rtl8189ES_linux.git > branch: master > > Driver is known to support Realtek RTL8189ES-VB-CG chip. > > Signed-off-by: Louis Aussedat Applied to master, thanks. Sorry it took so long. Regards, Arnout > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/rtl8189es/Config.in | 10 ++++++++++ > package/rtl8189es/rtl8189es.hash | 2 ++ > package/rtl8189es/rtl8189es.mk | 17 +++++++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/rtl8189es/Config.in > create mode 100644 package/rtl8189es/rtl8189es.hash > create mode 100644 package/rtl8189es/rtl8189es.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index e427ab15d4..83b47b77b6 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1520,6 +1520,7 @@ F: package/python-dnspython/ > F: package/python-future/ > F: package/python-huepy/ > F: package/python-tqdm/ > +F: package/rtl8189es/ > > N: Louis-Paul Cordier > F: package/intel-gmmlib/ > diff --git a/package/Config.in b/package/Config.in > index c12676d859..32f4b21625 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -525,6 +525,7 @@ endmenu > source "package/rs485conf/Config.in" > source "package/rtc-tools/Config.in" > source "package/rtl8188eu/Config.in" > + source "package/rtl8189es/Config.in" > source "package/rtl8189fs/Config.in" > source "package/rtl8723bs/Config.in" > source "package/rtl8723bu/Config.in" > diff --git a/package/rtl8189es/Config.in b/package/rtl8189es/Config.in > new file mode 100644 > index 0000000000..2e3474e5e1 > --- /dev/null > +++ b/package/rtl8189es/Config.in > @@ -0,0 +1,10 @@ > +config BR2_PACKAGE_RTL8189ES > + bool "rtl8189es" > + depends on BR2_LINUX_KERNEL > + help > + Wireless driver rtl8189es. > + > + https://github.com/jwrdegoede/rtl8189ES_linux.git > + > +comment "rtl8189es needs a Linux kernel to be built" > + depends on !BR2_LINUX_KERNEL > diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash > new file mode 100644 > index 0000000000..624c51ac0d > --- /dev/null > +++ b/package/rtl8189es/rtl8189es.hash > @@ -0,0 +1,2 @@ > +# Locally calculated > +sha256 bf972b6494844c66885dc6846228994fac6075477cf9a7122ffd521e25ac791c rtl8189es-2c8d44ae26485052f39d933a3a132b3ff395803a.tar.gz > diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk > new file mode 100644 > index 0000000000..9e4053ae83 > --- /dev/null > +++ b/package/rtl8189es/rtl8189es.mk > @@ -0,0 +1,17 @@ > +################################################################################ > +# > +# rtl8189es > +# > +################################################################################ > + > +RTL8189ES_VERSION = 2c8d44ae26485052f39d933a3a132b3ff395803a > +RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) > +RTL8189ES_LICENSE = GPL-2.0 > + > +RTL8189ES_MODULE_MAKE_OPTS = \ > + CONFIG_RTL8189ES=m \ > + KVER=$(LINUX_VERSION_PROBED) \ > + KSRC=$(LINUX_DIR) > + > +$(eval $(kernel-module)) > +$(eval $(generic-package)) > From arnout at mind.be Sat Jan 8 20:54:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 21:54:08 +0100 Subject: [Buildroot] [git commit] rtl8189es: new package Message-ID: <20220108204928.0BC928345E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65da7755d9266f245b711a19dd97499594415bde branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package adds the rtl8189es WiFi driver. repo: https://github.com/jwrdegoede/rtl8189ES_linux.git branch: master Driver is known to support Realtek RTL8189ES-VB-CG chip. Signed-off-by: Louis Aussedat Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8189es/Config.in | 10 ++++++++++ package/rtl8189es/rtl8189es.hash | 2 ++ package/rtl8189es/rtl8189es.mk | 17 +++++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eeba07002..c0ea5777f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1665,6 +1665,7 @@ F: package/python-dnspython/ F: package/python-future/ F: package/python-huepy/ F: package/python-tqdm/ +F: package/rtl8189es/ N: Louis-Paul Cordier F: package/intel-gmmlib/ diff --git a/package/Config.in b/package/Config.in index d32a87fe20..c933f51d10 100644 --- a/package/Config.in +++ b/package/Config.in @@ -554,6 +554,7 @@ endmenu source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" source "package/rtl8188eu/Config.in" + source "package/rtl8189es/Config.in" source "package/rtl8189fs/Config.in" source "package/rtl8723bs/Config.in" source "package/rtl8723bu/Config.in" diff --git a/package/rtl8189es/Config.in b/package/rtl8189es/Config.in new file mode 100644 index 0000000000..2e3474e5e1 --- /dev/null +++ b/package/rtl8189es/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_RTL8189ES + bool "rtl8189es" + depends on BR2_LINUX_KERNEL + help + Wireless driver rtl8189es. + + https://github.com/jwrdegoede/rtl8189ES_linux.git + +comment "rtl8189es needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash new file mode 100644 index 0000000000..624c51ac0d --- /dev/null +++ b/package/rtl8189es/rtl8189es.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 bf972b6494844c66885dc6846228994fac6075477cf9a7122ffd521e25ac791c rtl8189es-2c8d44ae26485052f39d933a3a132b3ff395803a.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk new file mode 100644 index 0000000000..9e4053ae83 --- /dev/null +++ b/package/rtl8189es/rtl8189es.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# rtl8189es +# +################################################################################ + +RTL8189ES_VERSION = 2c8d44ae26485052f39d933a3a132b3ff395803a +RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) +RTL8189ES_LICENSE = GPL-2.0 + +RTL8189ES_MODULE_MAKE_OPTS = \ + CONFIG_RTL8189ES=m \ + KVER=$(LINUX_VERSION_PROBED) \ + KSRC=$(LINUX_DIR) + +$(eval $(kernel-module)) +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 20:56:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 21:56:55 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino: fix mali not working because Linux version >= 4.20 Message-ID: <20220108205052.4509883456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=220716ab67736311209e3b7a4c7d1c12f569dc95 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since on olinuxino_lime/lime2 we have a Linux version >= 4.20 we need to pass drm_kms_helper.drm_leak_fbdev_smem=1 to kernel command-line that really enables DRM_FBDEV_LEAK_PHYS_SMEM. CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM only adds the code for this, but drm_leak_fbdev_smem is 0 by default, so we need to override it with 1. Same goes for drm_fbdev_overalloc that must be at least 200 for having a double buffer that is required by Mali. This fixes both olimex_a20_olinuxino_lime and lime2 that use extlinux.conf. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf b/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf index f754da3623..358bda056b 100644 --- a/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf +++ b/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label Olinuxino kernel /boot/zImage fdtdir /boot - append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} + append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 drm_kms_helper.drm_leak_fbdev_smem=1 drm_kms_helper.drm_fbdev_overalloc=200 ${extra} From thomas.petazzoni at bootlin.com Sat Jan 8 20:57:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 21:57:15 +0100 Subject: [Buildroot] [PATCH] configs/olimex_a20_olinuxino: fix mali not working because Linux version >= 4.20 In-Reply-To: <20211014213630.2436055-1-giulio.benetti@benettiengineering.com> References: <20211014213630.2436055-1-giulio.benetti@benettiengineering.com> Message-ID: <20220108215715.68e72a50@windsurf> On Thu, 14 Oct 2021 23:36:30 +0200 Giulio Benetti wrote: > Since on olinuxino_lime/lime2 we have a Linux version >= 4.20 we need to > pass drm_kms_helper.drm_leak_fbdev_smem=1 to kernel command-line that > really enables DRM_FBDEV_LEAK_PHYS_SMEM. CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM > only adds the code for this, but drm_leak_fbdev_smem is 0 by default, so we > need to override it. This fixes both olimex_a20_olinuxino_lime and lime2 > that use extlinux.conf. > > Signed-off-by: Giulio Benetti > --- > .../a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Sat Jan 8 20:58:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 21:58:32 +0100 Subject: [Buildroot] [git commit] package/sdbus-cpp: new package Message-ID: <20220108205250.3C5E883456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1025766c8a2c9d0a5956ca0d720bb07b9a47076d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master sdbus-c++ is a high-level C++ D-Bus library for Linux. Signed-off-by: Sergey Bobrenok [Peter: add host-pkgconf, drop host package] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/sdbus-cpp/Config.in | 16 ++++++++++++++++ package/sdbus-cpp/sdbus-cpp.hash | 3 +++ package/sdbus-cpp/sdbus-cpp.mk | 15 +++++++++++++++ 5 files changed, 38 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c0ea5777f2..b80d886809 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2502,6 +2502,9 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ +N: Sergey Bobrenok +F: package/sdbus-cpp/ + N: Sergey Matyukevich F: boot/arm-trusted-firmware/ F: board/linksprite/pcduino diff --git a/package/Config.in b/package/Config.in index c933f51d10..15a831c1bf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2576,6 +2576,7 @@ menu "System tools" source "package/s6-rc/Config.in" source "package/scrub/Config.in" source "package/scrypt/Config.in" + source "package/sdbus-cpp/Config.in" source "package/sdbusplus/Config.in" source "package/seatd/Config.in" source "package/smack/Config.in" diff --git a/package/sdbus-cpp/Config.in b/package/sdbus-cpp/Config.in new file mode 100644 index 0000000000..85f149eaa1 --- /dev/null +++ b/package/sdbus-cpp/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_SDBUS_CPP + bool "sdbus-c++" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_SYSTEMD + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + help + sdbus-c++ is a high-level C++ D-Bus library for Linux + designed to provide expressive, easy-to-use API in modern C++. + + This will build the target library. + + https://github.com/Kistler-Group/sdbus-cpp + +comment "sdbus-c++ needs systemd and a toolchain w/ C++, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_SYSTEMD || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash new file mode 100644 index 0000000000..8b87653dfd --- /dev/null +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 0fd575ae0f463773dd9141242d1133731e2b780fd6526650ce992ba711d88628 v0.8.3.tar.gz +sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk new file mode 100644 index 0000000000..24904ee26f --- /dev/null +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# sdbus-c++ +# +################################################################################ + +SDBUS_CPP_VERSION = 0.8.3 +SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz +SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) +SDBUS_CPP_INSTALL_STAGING = YES +SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd +SDBUS_CPP_LICENSE = LGPL-2.1+ +SDBUS_CPP_LICENSE_FILES = COPYING + +$(eval $(cmake-package)) From fontaine.fabrice at gmail.com Sat Jan 8 21:07:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 22:07:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix build without stack-protector Message-ID: <20220108210752.3245794-1-fontaine.fabrice@gmail.com> Fix the following build failure without stack-protector raised since bump to version 02092020 in commit ebe808ac4071395b4d1e90d617c33a5e6e514af1 and https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function `handle_mem_bos_chk_warn': safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' If stack-protector is enabled in the Buildroot config, the toolchain wrapper will make sure it is used, so there's no need for the safeclib configure to handle it. Fixes: - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 Signed-off-by: Fabrice Fontaine --- ...gure.ac-add-disable-hardening-option.patch | 63 +++++++++++++++++++ package/safeclib/safeclib.mk | 3 + 2 files changed, 66 insertions(+) create mode 100644 package/safeclib/0001-configure.ac-add-disable-hardening-option.patch diff --git a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch new file mode 100644 index 0000000000..e851fce993 --- /dev/null +++ b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch @@ -0,0 +1,63 @@ +From 94c612016834d7bdc2b721ff5f4f5e158bda6fdd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 8 Jan 2022 21:49:22 +0100 +Subject: [PATCH] configure.ac: add --disable-hardening option + +Allow the user to disable hardening which is enabled by default since +version 02092020 and +https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa +to avoid the following build failure when the toolchain doesn't support +stack-protector: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function `handle_mem_bos_chk_warn': +safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rurban/safeclib/pull/107] +--- + configure.ac | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 55756b06..f852ed44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -383,6 +383,21 @@ AC_ARG_ENABLE(debug-build, + esac], [enable_debug_build=false ]) + AM_CONDITIONAL(ENABLE_DEBUG_BUILD, test "x$enable_debug_build" = "xtrue") + ++AC_ARG_ENABLE(hardening, ++ AS_HELP_STRING([--disable-hardening], ++ [disable hardening @<:@default=no@:>@]), ++ [case "${enableval}" in ++ yes) enable_hardening=true ;; ++ no) enable_hardening=false ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-hardening]) ;; ++ esac], [enable_hardening=true]) ++ ++if test "x$enable_hardening" = "xtrue" ; then ++ AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], ++ [WARN_CFLAGS],[$ax_ccf_err]) ++ AX_APPEND_LINK_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], ++ [WARN_LDFLAGS],[$ax_ccf_err]) ++fi + + AC_MSG_NOTICE([Check programs]) + # =============================================== +@@ -543,10 +562,6 @@ case $host_os in + [],[$ax_ccf_err]) + ;; + esac +-AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], +- [WARN_CFLAGS],[$ax_ccf_err]) +-AX_APPEND_LINK_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], +- [WARN_LDFLAGS],[$ax_ccf_err]) + + if test x$ax_cv_check_cflags__Wrestrict = xyes; then + AC_DEFINE([HAVE_WARNING_RESTRICT], 1, [Have -Wrestrict]) +-- +2.34.1 + diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 032a73bf67..87b710b37d 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,5 +11,8 @@ SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES +# We're patching configure.ac +SAFECLIB_AUTORECONF = YES +SAFECLIB_CONF_OPTS = --disable-hardening $(eval $(autotools-package)) -- 2.34.1 From guillaume.bressaix at gmail.com Sat Jan 8 21:14:47 2022 From: guillaume.bressaix at gmail.com (Guillaume Bres) Date: Sat, 8 Jan 2022 22:14:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyext: new package In-Reply-To: <20220108204223.2e904905@windsurf> References: <20210213102055.24378-1-guillaume.bresaix@gmail.com> <20220108204223.2e904905@windsurf> Message-ID: > If you have a reason to think this is still maintained, could you provide some more details? Hello Thomas, Please discard this package. I thought it was a requirement for ntpsec that i was about to submit at the time. But it turns out ntpsec does not require it, or at least, not in modern versions Guillaume W. Bres Software engineer Le sam. 8 janv. 2022 ? 20:42, Thomas Petazzoni a ?crit : > Hello Guillaume, > > On Sat, 13 Feb 2021 11:20:55 +0100 > guillaume.bressaix at gmail.com wrote: > > > From: "Guillaume W. Bres" > > > > Python-pyext is a set of scripts to enhance python. > > This includes features such as function overloading, > > the "switch" statement.. > > > > Signed-off-by: Guillaume W. Bres > > --- > > We looked at this package, and upstream has not made any release since > 2014, and there is apparently no publicly available version control > system. With python moving so fast, a package that hasn't been touched > since 2014 doesn't seem like a good idea. > > So I'll mark this patch as Rejected. If you have a reason to think this > is still maintained, could you provide some more details? > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From nolange79 at gmail.com Sat Jan 8 21:17:27 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 22:17:27 +0100 Subject: [Buildroot] [PATCH 1/1] systemd: ensure tmpfiles.d/legacy.conf is installed In-Reply-To: <0570b1f3-5229-5c0e-796a-53f8747b540a@mind.be> References: <20200825000246.4035-1-joseph.kogut@gmail.com> <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> <0570b1f3-5229-5c0e-796a-53f8747b540a@mind.be> Message-ID: Am Sa., 8. Jan. 2022 um 21:40 Uhr schrieb Arnout Vandecappelle : > > > On 08/01/2022 20:12, Arnout Vandecappelle wrote: > > > > > > On 25/08/2020 02:02, Joseph Kogut wrote: > >> Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity > >> isn't enabled. This config sets up /var/lock, which many programs such > >> as uboot's fw_printenv/setenv still depend on by default. > >> > >> Signed-off-by: Joseph Kogut > > > > After all the discussion, I did finally apply to master, thanks. > > And I ended up reverting it again - legacy.conf is now legacy.conf.in and it > needs to be preprocessed, but that is only done if sysv-compat is enabled. > > So if we want this, our only option is to enable sysv-compat (which is > probably something we should do anyway). Why the only option? you should just ship your own legacy.conf, it wont change. Adding sysv compatibility, which is alot more than just the mkdir and symlink, would mean adding alot baggage. Baggage that wont even work as Yann spake thusly [1] a tmpfile.conf with those 3 lines would be enough: d /run/lock 0755 root root - L /var/lock - - - - ../run/lock d /run/lock/subsys 0755 root root - Norbert. PS. I am too lazy to google everything up, but I believe I brought up this very topic before. [1] - https://lists.buildroot.org/pipermail/buildroot/2020-July/287275.html From nolange79 at gmail.com Sat Jan 8 21:31:32 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 22:31:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: Am Sa., 8. Jan. 2022 um 20:04 Uhr schrieb James Hilliard : > > On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange wrote: > > > > Systemd has very many options, adding a way for the user > > to set custom options can help customizations > > without changing buildroot files. > > I'm not sure this is a good idea, if a configuration option needs > customizability it > probably needs a specific kconfig option. Systemd config options tend to require > dependency selection and special handling so this seems likely to cause > spurious errors due to improper usage. Seems to be a pretty big footgun IMO. Sure, you are aware that many of my buildroot patches are stuck in limbo since early 2020? Just doesnt seem feasible to timely fix everything and version bumps often leave more untapped options. Some part of the necessity would be just being pragmatic. One example would be using the unified cgroups hierarchy (-Ddefault-hierarchy=unified), hybrid is pretty much deprecated, and some systemd features that buildroot allows to enable (OOMD for example) wont work without it. > > What systemd configure option would you want to be using that isn't > currently able to be enabled? FYI those are the ones I currently use: -Ddefault-hierarchy=unified \ -Dutmp=false \ -Ddefault-dnssec=no \ -Didn=false \ -Denvironment-d=false \ -Dxdg-autostart=false \ -Ddns-over-tls=false \ -Ddefault-llmnr=no \ -Ddns-over-tls=false \ -Ddefault-mdns=no \ -Dlz4=false Norbert From nolange79 at gmail.com Sat Jan 8 21:46:54 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 22:46:54 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: References: <20201126144745.502228-1-nolange79@gmail.com> Message-ID: Am Sa., 8. Jan. 2022 um 20:41 Uhr schrieb Arnout Vandecappelle : > > Hi Norbert, > > On 26/11/2020 15:47, Norbert Lange wrote: > > journald supports catalog files, or rather a binary database of > > those. > > Functionality added includes: > > > > - A config option allows enabling the binary database. > > > > - if the option is enabled, the database is built and moved to > > /usr/share/factory. A symlink is created in /var pointing to > > that file. > > If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the > > language whitelist are deleted first. > > > > - the service normally used for creating the DB during boot, > > and the catalog source files used as input are deleted. > > > > The move to /usr/share/factory is helpful for having /usr as whole > > system distribution. > > > > Signed-off-by: Norbert Lange > > I was going to apply a second time, but then I noticed that I made some > comments on v2 [1] that you haven't answered to and I still think they're valid. > So I've marked this patch as Changes Requested. I did reply and cover the comments in [2], not sure whats missing? Separating into 2 independent patches is not really helpfull IMHO. > > If you respin, please also include in the commit message the additional > explanations you made in reply to Romain. > > Regards, > Arnout > > [1] https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ > > > > --- > > v1->v2: > > - Moved all logic into systemd.mk > > - solved the LOCALE_PURGE order that way > > - use the factory to store the file > > - option to enable the DB (similar to udev HWDB) > > - cant be anabled with !ROOTFS_RW, tons of > > issues with that one > > v2->v3: > > - use backticks instead of $$() > > - be more explicit about what happens in > > SYSTEMD_LOCALE_PURGE_CATALOGS > > > > Signed-off-by: Norbert Lange > > --- > > package/systemd/Config.in | 14 +++++++++++++ > > package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 55 insertions(+) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index ec34478e3d..d576e6035b 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD > > > > http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands > > > > +config BR2_PACKAGE_SYSTEMD_CATALOGDB > > + bool "enable journal catalog database installation" > > + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic > > + help > > + Build and install the journal catalog database. > > + > > + catalog files are used to provide extended and potentially localized > > + messages for the journal. > > + > > + The original catalog files will be built into a DB at > > + /usr/share/factory/var/lib/systemd/catalog/database. > > + > > + https://www.freedesktop.org/wiki/Software/systemd/catalog/ > > + > > config BR2_PACKAGE_SYSTEMD_LOCALED > > bool "enable locale daemon" > > help > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index cb12f667d6..ae99c02abf 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD > > $(SYSTEMD_INSTALL_NETWORK_CONFS) > > endef > > > > +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) > > +define SYSTEMD_LOCALE_PURGE_CATALOGS > > + # go through all files with scheme ..catalog > > + # and remove those where is not in LOCALE_NOPURGE > > + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ > > + do \ > > + basename=$${cfile##*/}; \ > > + basename=$${basename%.catalog}; \ > > + langext=$${basename#*.}; \ > > + [ "$$langext" = "$${basename}" ] && continue; \ > > + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ > > + rm -f "$$cfile"; \ > > + done > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS > > +endif > > + > > +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) > > +define SYSTEMD_UPDATE_CATALOGS > > + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog > > + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ > > + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database > > + rm $(TARGET_DIR)/var/lib/systemd/catalog/database > > + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ > > + $(TARGET_DIR)/var/lib/systemd/catalog/database > > + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ > > + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS > > +endif > > + > > +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ > > + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ > > + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > + > > define SYSTEMD_PRESET_ALL > > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > > endef > > Norbert [2] - https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ From fontaine.fabrice at gmail.com Sat Jan 8 21:48:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 22:48:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/jimtcl: bump to version 0.81 Message-ID: <20220108214815.3492490-1-fontaine.fabrice@gmail.com> http://jim.tcl.tk/index.html/doc/www/www/articles/jim-release-0-81/ Signed-off-by: Fabrice Fontaine --- package/jimtcl/jimtcl.hash | 2 +- package/jimtcl/jimtcl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jimtcl/jimtcl.hash b/package/jimtcl/jimtcl.hash index 7960f4fddb..d4174a3da6 100644 --- a/package/jimtcl/jimtcl.hash +++ b/package/jimtcl/jimtcl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9e79a960de925552eeb4df51121f0ea017e34409568117b1ac461f4c3071289e jimtcl-0.80.tar.gz +sha256 ab7eb3680ba0d16f4a9eb1e05b7fcbb7d23438e25185462c55cd032a1954a985 jimtcl-0.81.tar.gz sha256 419f1146334e57fb258d6c957d1f94d43455ec0d24b1b54c4447e5f61a353950 LICENSE diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 5d6b379260..2f8e0e6c69 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -4,7 +4,7 @@ # ################################################################################ -JIMTCL_VERSION = 0.80 +JIMTCL_VERSION = 0.81 JIMTCL_SITE = $(call github,msteveb,jimtcl,$(JIMTCL_VERSION)) JIMTCL_INSTALL_STAGING = YES JIMTCL_LICENSE = BSD-2-Clause -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 21:49:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 22:49:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: add zstd support Message-ID: <20220108214952.3493782-1-fontaine.fabrice@gmail.com> zstd is supported since version 4.13.1 and https://github.com/kdave/btrfs-progs/commit/717a8b1e5d1ba69154ef84b35be75c9cf7730e1d Signed-off-by: Fabrice Fontaine --- package/btrfs-progs/btrfs-progs.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 4c26cf0df5..b010a0e0be 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -8,7 +8,7 @@ BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib -BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python +BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-python BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES @@ -30,6 +30,13 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +BTRFS_PROGS_CONF_OPTS += --enable-zstd +BTRFS_PROGS_DEPENDENCIES += zstd +else +BTRFS_PROGS_CONF_OPTS += --disable-zstd +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) BTRFS_PROGS_CONF_OPTS += --enable-libudev BTRFS_PROGS_DEPENDENCIES += udev -- 2.34.1 From yann.morin.1998 at free.fr Sat Jan 8 21:48:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 22:48:07 +0100 Subject: [Buildroot] [git commit] package/file: reorganise variables in a more logical fashion Message-ID: <20220108215501.0919383455@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99adfe6750fbe7485a90473cccae0f37cbe14d83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yann E. MORIN --- package/file/file.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/file/file.mk b/package/file/file.mk index 62cec4b2c9..b7e833e834 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -6,15 +6,17 @@ FILE_VERSION = 5.41 FILE_SITE = ftp://ftp.astron.com/pub/file -FILE_DEPENDENCIES = host-file -HOST_FILE_DEPENDENCIES = host-zlib -FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c FILE_CPE_ID_VENDOR = file_project + +FILE_DEPENDENCIES = host-file +FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' +FILE_INSTALL_STAGING = YES + +HOST_FILE_DEPENDENCIES = host-zlib HOST_FILE_CONF_OPTS = --disable-libseccomp +HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' ifeq ($(BR2_PACKAGE_BZIP2),y) FILE_CONF_OPTS += --enable-bzlib From yann.morin.1998 at free.fr Sat Jan 8 21:48:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 22:48:16 +0100 Subject: [Buildroot] [git commit] package/file: fix build with gcc-4.8 Message-ID: <20220108215501.113EC83460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=590d89fdad50f48c120b91ac008cc2ea4b625e15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master file-5.41 uses AC_PROG_CC, and was generated with autoconf 2.69. That oldish version of autoconf does not check the C standard when AC_PROG_CC is called, and standard-specific macros must be called instead: AC_PROG_CC_C89, AC_PROG_CC_C99, or AC_PROG_CC_STDC. So we would need to patch configure.ac to call either of those options, and then we'd have to autoreocnf. However, that would autoreconf with our autoconf, version 2.71. In that version, AC_PROG_CC always check what C standards are available and sets the appropriate ac_cv_XXX variables, and the previous macros, AC_PROG_CC_C89, AC_PROG_CC_C99, and AC_PROG_CC_STDC are deprecated. So it turns out that we just need to autoreconf. Fixes: - http://autobuild.buildroot.org/results/9e7868be00f2cd18205b2ce664be95f8b9e2b063 - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/file/file.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/file/file.mk b/package/file/file.mk index b7e833e834..c06975460f 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -10,6 +10,8 @@ FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c FILE_CPE_ID_VENDOR = file_project +FILE_AUTORECONF = YES + FILE_DEPENDENCIES = host-file FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES From peter at korsgaard.com Sat Jan 8 22:01:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 23:01:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/jimtcl: bump to version 0.81 In-Reply-To: <20220108214815.3492490-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 22:48:15 +0100") References: <20220108214815.3492490-1-fontaine.fabrice@gmail.com> Message-ID: <87lezpevju.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > http://jim.tcl.tk/index.html/doc/www/www/articles/jim-release-0-81/ > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 22:01:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 23:01:54 +0100 Subject: [Buildroot] [git commit] package/jimtcl: bump to version 0.81 Message-ID: <20220108215546.A8C3282626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6fc1b09211abc1c724e3665cec606c3bbdb209e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master http://jim.tcl.tk/index.html/doc/www/www/articles/jim-release-0-81/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jimtcl/jimtcl.hash | 2 +- package/jimtcl/jimtcl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jimtcl/jimtcl.hash b/package/jimtcl/jimtcl.hash index 7960f4fddb..d4174a3da6 100644 --- a/package/jimtcl/jimtcl.hash +++ b/package/jimtcl/jimtcl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9e79a960de925552eeb4df51121f0ea017e34409568117b1ac461f4c3071289e jimtcl-0.80.tar.gz +sha256 ab7eb3680ba0d16f4a9eb1e05b7fcbb7d23438e25185462c55cd032a1954a985 jimtcl-0.81.tar.gz sha256 419f1146334e57fb258d6c957d1f94d43455ec0d24b1b54c4447e5f61a353950 LICENSE diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 5d6b379260..2f8e0e6c69 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -4,7 +4,7 @@ # ################################################################################ -JIMTCL_VERSION = 0.80 +JIMTCL_VERSION = 0.81 JIMTCL_SITE = $(call github,msteveb,jimtcl,$(JIMTCL_VERSION)) JIMTCL_INSTALL_STAGING = YES JIMTCL_LICENSE = BSD-2-Clause From thomas.petazzoni at bootlin.com Sat Jan 8 22:03:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:03:52 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/libcap: drop host-libcap dependency In-Reply-To: <04eb7314-3beb-c40f-483d-aa142f63a0c6@smile.fr> References: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> <20200830100058.4180798-2-fontaine.fabrice@gmail.com> <04eb7314-3beb-c40f-483d-aa142f63a0c6@smile.fr> Message-ID: <20220108230352.17e5d57e@windsurf> On Sat, 8 Jan 2022 21:44:49 +0100 Romain Naour wrote: > Hello Fabrice, > > Le 30/08/2020 ? 12:00, Fabrice Fontaine a ?crit?: > > host-libcap was added as a dependency of libcap in commit > > efae605c88deb15d9c50fd67bdd80f46a78b06c1 without any explanation in the > > commit message. Drop this dependency that does seem to be needed. > > I dont see why host-libcap would be needed to build libcap for the target. > > libcap in Yocto doesn't add libcap-native in dependency: > > https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-support/libcap/libcap_2.62.bb > > This patch needs to be rebased on master since host-gperf has been added rencently. See https://git.buildroot.org/buildroot/commit/?id=0651b22d638faecb3688f1fd4e0760c31bfba893 Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 22:04:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 23:04:13 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> Message-ID: <20220108220413.GG1881783@scaer> Fabrice, All, On 2022-01-04 21:54 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 5.41 in > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > readelf.c: In function 'do_auxv_note': > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc It turned out that all that was needed is to tun autoreconf. See the commti for the explanations: https://git.buildroot.org/buildroot/commit/package/file/file.mk?id=590d89fdad50f48c120b91ac008cc2ea4b625e15 Thanks! Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Set ac_cv_prog_c99 for host as already done for target instead of > adding an upstreamable patch > > package/file/file.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/file/file.mk b/package/file/file.mk > index 12647af8bb..62cec4b2c9 100644 > --- a/package/file/file.mk > +++ b/package/file/file.mk > @@ -9,6 +9,7 @@ FILE_SITE = ftp://ftp.astron.com/pub/file > FILE_DEPENDENCIES = host-file > HOST_FILE_DEPENDENCIES = host-zlib > FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' > +HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' > FILE_INSTALL_STAGING = YES > FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) > FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 8 22:05:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 23:05:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix build without stack-protector In-Reply-To: <20220108210752.3245794-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 22:07:52 +0100") References: <20220108210752.3245794-1-fontaine.fabrice@gmail.com> Message-ID: <87h7adevcz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without stack-protector raised since > bump to version 02092020 in commit > ebe808ac4071395b4d1e90d617c33a5e6e514af1 and > https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa: > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: > ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function > `handle_mem_bos_chk_warn': > safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' > If stack-protector is enabled in the Buildroot config, the toolchain > wrapper will make sure it is used, so there's no need for the safeclib > configure to handle it. > Fixes: > - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 > Signed-off-by: Fabrice Fontaine > --- > +++ b/package/safeclib/safeclib.mk > @@ -11,5 +11,8 @@ SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz > SAFECLIB_LICENSE = MIT > SAFECLIB_LICENSE_FILES = COPYING > SAFECLIB_INSTALL_STAGING = YES > +# We're patching configure.ac > +SAFECLIB_AUTORECONF = YES > +SAFECLIB_CONF_OPTS = --disable-hardening I've added a comment explaining why this is done, similar to how we do it in tpm2-tools.mk and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 22:04:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 23:04:54 +0100 Subject: [Buildroot] [git commit] package/safeclib: fix build without stack-protector Message-ID: <20220108215947.D4B4E82972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fac3b2b88574e605d713ac917024ba39d444563 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without stack-protector raised since bump to version 02092020 in commit ebe808ac4071395b4d1e90d617c33a5e6e514af1 and https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function `handle_mem_bos_chk_warn': safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' If stack-protector is enabled in the Buildroot config, the toolchain wrapper will make sure it is used, so there's no need for the safeclib configure to handle it. Fixes: - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 Signed-off-by: Fabrice Fontaine [Peter: add comment explaining why this is done] Signed-off-by: Peter Korsgaard --- ...configure.ac-add-disable-hardening-option.patch | 63 ++++++++++++++++++++++ package/safeclib/safeclib.mk | 5 ++ 2 files changed, 68 insertions(+) diff --git a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch new file mode 100644 index 0000000000..e851fce993 --- /dev/null +++ b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch @@ -0,0 +1,63 @@ +From 94c612016834d7bdc2b721ff5f4f5e158bda6fdd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 8 Jan 2022 21:49:22 +0100 +Subject: [PATCH] configure.ac: add --disable-hardening option + +Allow the user to disable hardening which is enabled by default since +version 02092020 and +https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa +to avoid the following build failure when the toolchain doesn't support +stack-protector: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function `handle_mem_bos_chk_warn': +safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rurban/safeclib/pull/107] +--- + configure.ac | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 55756b06..f852ed44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -383,6 +383,21 @@ AC_ARG_ENABLE(debug-build, + esac], [enable_debug_build=false ]) + AM_CONDITIONAL(ENABLE_DEBUG_BUILD, test "x$enable_debug_build" = "xtrue") + ++AC_ARG_ENABLE(hardening, ++ AS_HELP_STRING([--disable-hardening], ++ [disable hardening @<:@default=no@:>@]), ++ [case "${enableval}" in ++ yes) enable_hardening=true ;; ++ no) enable_hardening=false ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-hardening]) ;; ++ esac], [enable_hardening=true]) ++ ++if test "x$enable_hardening" = "xtrue" ; then ++ AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], ++ [WARN_CFLAGS],[$ax_ccf_err]) ++ AX_APPEND_LINK_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], ++ [WARN_LDFLAGS],[$ax_ccf_err]) ++fi + + AC_MSG_NOTICE([Check programs]) + # =============================================== +@@ -543,10 +562,6 @@ case $host_os in + [],[$ax_ccf_err]) + ;; + esac +-AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], +- [WARN_CFLAGS],[$ax_ccf_err]) +-AX_APPEND_LINK_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], +- [WARN_LDFLAGS],[$ax_ccf_err]) + + if test x$ax_cv_check_cflags__Wrestrict = xyes; then + AC_DEFINE([HAVE_WARNING_RESTRICT], 1, [Have -Wrestrict]) +-- +2.34.1 + diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 032a73bf67..29ffea7f2e 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,5 +11,10 @@ SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES +# We're patching configure.ac +SAFECLIB_AUTORECONF = YES +# -fstack-protector-strong is used by default. Disable that so the +# BR2_SSP_* options in the toolchain wrapper are used instead +SAFECLIB_CONF_OPTS = --disable-hardening $(eval $(autotools-package)) From yann.morin.1998 at free.fr Sat Jan 8 22:07:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 23:07:25 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: add zstd support Message-ID: <20220108220140.D1167832D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9437db2720c64b55d67178fc678f7bf8e6c5fd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master zstd is supported since version 4.13.1 and https://github.com/kdave/btrfs-progs/commit/717a8b1e5d1ba69154ef84b35be75c9cf7730e1d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/btrfs-progs/btrfs-progs.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 4c26cf0df5..b010a0e0be 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -8,7 +8,7 @@ BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib -BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python +BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-python BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES @@ -30,6 +30,13 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +BTRFS_PROGS_CONF_OPTS += --enable-zstd +BTRFS_PROGS_DEPENDENCIES += zstd +else +BTRFS_PROGS_CONF_OPTS += --disable-zstd +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) BTRFS_PROGS_CONF_OPTS += --enable-libudev BTRFS_PROGS_DEPENDENCIES += udev From yann.morin.1998 at free.fr Sat Jan 8 22:13:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 23:13:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: add zstd support In-Reply-To: <20220108214952.3493782-1-fontaine.fabrice@gmail.com> References: <20220108214952.3493782-1-fontaine.fabrice@gmail.com> Message-ID: <20220108221314.GH1881783@scaer> Fabrice, All, On 2022-01-08 22:49 +0100, Fabrice Fontaine spake thusly: > zstd is supported since version 4.13.1 and > https://github.com/kdave/btrfs-progs/commit/717a8b1e5d1ba69154ef84b35be75c9cf7730e1d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/btrfs-progs/btrfs-progs.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index 4c26cf0df5..b010a0e0be 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -8,7 +8,7 @@ BTRFS_PROGS_VERSION = 5.15.1 > BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs > BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz > BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib > -BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python > +BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-python > BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) > BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING > BTRFS_PROGS_INSTALL_STAGING = YES > @@ -30,6 +30,13 @@ else > BTRFS_PROGS_CONF_OPTS += --disable-convert > endif > > +ifeq ($(BR2_PACKAGE_ZSTD),y) > +BTRFS_PROGS_CONF_OPTS += --enable-zstd > +BTRFS_PROGS_DEPENDENCIES += zstd > +else > +BTRFS_PROGS_CONF_OPTS += --disable-zstd > +endif > + > ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > BTRFS_PROGS_CONF_OPTS += --enable-libudev > BTRFS_PROGS_DEPENDENCIES += udev > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Jan 8 22:15:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 23:15:56 +0100 Subject: [Buildroot] [PATCH] support/testing: add a runtime test for the systemd unit tests In-Reply-To: References: <20200420085156.2930014-1-romain.naour@gmail.com> <20200423202028.GQ5035@scaer> Message-ID: <25bf60fe-d8d9-08dc-0fac-d7508ae22eff@mind.be> On 08/01/2022 16:05, Romain Naour wrote: > Hello, J?r?my, All, > > Le 24/04/2020 ? 14:52, J?r?my ROSEN a ?crit?: >> Well... >> >> I see your point, but as you said, buildroot is a bit of a special case and >> systemd is a bit of a special case >> >> I have used systemd's test suite as non-regression testing when I bumped >> systemd previously and it >> did catch quite a few regression/improper integration on the BR side >> (mainly incompatibilites between >> util-linux and busybox) so I think it is important to check that when >> bumping systemd > > I updated this test for systemd 250.1 and the main issue with the testsuite is > releated to busybox. > > Some test scripts are using command not supported by busybox: > > rev (util-linux) > mktemp --tmpdir > touch --version > > Busybox 1.35.0 add the mktemp --tmpdir option [1] > > This patch allowed to detect two build issue with old toolchain [2] Yeah, but that's just because the toolchain we use as default for the runtime tests just happens to be one with older headres. To really capture regressions with this test suite, we would have to run it with various toolchains and system configurations. But that's not what the runtime tests are currently doing. To support such a scenario what we should do instead is to run the package tests from the autobuilders, with the various different configurations that are tried out there. Of course, at the moment that is not really possible because the results that are produced by the autobuilders can't necessarily easily be loaded into qemu. Plus of course we'd need to have a kernel for each of the various configurations. Regards, Arnout > > Anyway this patch needs a respin if we want to merge it to Buildroot. > > [1] > https://git.busybox.net/busybox/commit/?id=ecac9853f29dcb2e5e0d70c0effaae2cabeefabf > [2] > https://git.buildroot.net/buildroot/commit/?id=315ba5c26dd6bb0c01067e8346b4a7eceb7d0ee1 > > Best regards, > Romain > >> >> Making the testsuite run in buildroot is a bit tricky (as this patchset >> proves) and having it upstreamed is not >> just about reg-testing but also about making it easy for devs that would >> bump systemd to check that everything >> is fine. >> >> If we go with your argument that running package non-reg is useless because >> upstream is supposed to run it >> itself, then we won't run any gcc non-reg (since gcc is supposed to run it) >> nor any boot-testing (the kernel is >> supposed to test that) so basically we do no testing except some very >> buildroot-specific test. >> >> And we know from experience that upstream is not as reliable as it should >> be, especially on exotic setups/arch >> and buildroot need to test that if it wants to improve quality, because >> nobody else will do it... >> >> Regards >> Jeremy >> >> Le jeu. 23 avr. 2020 ? 22:20, Yann E. MORIN a >> ?crit : >> >>> Romain, J?r?my, All, >>> >>> On 2020-04-20 10:51 +0200, Romain Naour spake thusly: >>>> Initial work by Jeremy Rosen [1]. >>>> >>>> In order to allow building the testsuite, add an BR2_external >>>> to add new flags in SYSTEMD_CONF_OPTS: >>> >>> Thanks for the effort. But I am not very much enthusiastic about it. >>> >>> What good does it do to us, Buildroot, that we are able to run systemd's >>> test suite? >>> >>> Sure, we have runtime tests inBuildroot. But IMHO those runtime tests >>> are for validating that the packaging and integration in Buildroot is >>> correct. For example, it allows us to test that python pakcages have all >>> their dependencies, or that a systemd-based system dos indeed boots >>> correctly to bring up network, spawn a login, etc... >>> >>> Test- suites on the other hand are for upstream to valisdate they have >>> no regression, and that the code they write behaves as they expect it >>> to. Test suites are usually not meant for downstream consumptions. >>> >>> Yes, Buildroot is in a special spot as a downstream, in that it targets >>> so many different targets that upstream may nt have, or may not be even >>> aware of. Still, it is of my opinion that we should not be responsible >>> for being able to run that test suite. >>> >>> So I am not very in favour of carrying such a thing in Buildroot, >>> unfortunately... >>> >>> I'm leaving the patch as "new" in patchwork, though, in case another >>> maintainer as a stronger opinion in favour of it, or in case you can >>> make a very strgin argument explaining why we need it. >>> >>> Regards, >>> Yann E. MORIN. >>> >>>> "SYSTEMD_CONF_OPTS += -Dslow-tests=true -Dinstall-tests=true >>> -Dtests=true" >>>> >>>> This allow to install run-unit-tests.py on the target to execute >>>> all tests installed to /lib/systemd/tests. While at it, enable usafe >>> tests >>>> since we are using a rootfs image built only to run these tests. >>>> >>>> The run-integration-tests.sh script is not executed since it's intended >>>> to run from the systemd build directory on the host machine. >>>> >>>> The rootfsoverlay from [1] is removed since it contains some >>>> customization not needed for the tests. >>>> >>>> Some tests needs a high entropy level, otherwise they are stuck. >>>> Install rng-tools and add -device virtio-rng-pci in qemu command line. >>>> >>>> In order to run as many tests as possible, activate as many systemd >>>> options as possible. cgroupv2 is enabled from the kernel command >>>> line to pass test-bfp-device test. >>>> >>>> Use the latest LTS kernel 5.4. >>>> >>>> Some unit files used by the systemd testsuite are using some program >>>> functionnality not implemented by the busybox variant (grep, find). >>>> >>>> The stat command with custom format (-c) and display of filesystem >>> status (-f) >>>> used by exec-protecthome-tmpfs-vs-protectsystem-strict.service can be >>> provided >>>> by busybox or coreutils. Add a busybox config fragment to add "stat -fc" >>> since >>>> it's not enabled by the busybox defconfig used by Buildroot. >>>> >>>> The ionice command used by exec-ioschedulingclass-none.service is >>> provided by >>>> util-linux schedutils. >>>> >>>> libcap tools needed to provide capsh binary for test-execute. >>>> >>>> Skipped tests: >>>> test-barrier: This test requires a baremetal machine. >>>> test-bus-chat: This test requires an user account. >>>> >>>> Tested on gitlab: >>>> https://gitlab.com/kubu93/buildroot/pipelines/137689982 >>>> >>>> [1] https://github.com/boucman/buildroot-systemd >>>> >>>> Signed-off-by: Romain Naour >>>> Cc: J?r?my Rosen >>>> Cc: Adam Duskett >>>> Cc: Maxime Hadjinlian >>>> Cc: Yann E. MORIN >>>> --- >>>> On my machine, the runtime test is completed in 287.761s. >>>> >>>> OK: 203 SKIP: 2 FAIL: 0 >>>> --- >>>> .../testing/conf/busybox-stat-fragment.config | 3 + >>>> .../package/br2-external/systemd/Config.in | 0 >>>> .../br2-external/systemd/external.desc | 2 + >>>> .../package/br2-external/systemd/external.mk | 5 + >>>> support/testing/tests/package/test_systemd.py | 123 ++++++++++++++++++ >>>> .../test_systemd/systemd-kernel.config | 111 ++++++++++++++++ >>>> 6 files changed, 244 insertions(+) >>>> create mode 100644 support/testing/conf/busybox-stat-fragment.config >>>> create mode 100644 >>> support/testing/tests/package/br2-external/systemd/Config.in >>>> create mode 100644 >>> support/testing/tests/package/br2-external/systemd/external.desc >>>> create mode 100644 support/testing/tests/package/br2-external/systemd/ >>> external.mk >>>> create mode 100644 support/testing/tests/package/test_systemd.py >>>> create mode 100644 >>> support/testing/tests/package/test_systemd/systemd-kernel.config >>>> >>>> diff --git a/support/testing/conf/busybox-stat-fragment.config >>> b/support/testing/conf/busybox-stat-fragment.config >>>> new file mode 100644 >>>> index 0000000000..55f64c761f >>>> --- /dev/null >>>> +++ b/support/testing/conf/busybox-stat-fragment.config >>>> @@ -0,0 +1,3 @@ >>>> +CONFIG_STAT=y >>>> +CONFIG_FEATURE_STAT_FORMAT=y >>>> +CONFIG_FEATURE_STAT_FILESYSTEM=y >>>> diff --git >>> a/support/testing/tests/package/br2-external/systemd/Config.in >>> b/support/testing/tests/package/br2-external/systemd/Config.in >>>> new file mode 100644 >>>> index 0000000000..e69de29bb2 >>>> diff --git >>> a/support/testing/tests/package/br2-external/systemd/external.desc >>> b/support/testing/tests/package/br2-external/systemd/external.desc >>>> new file mode 100644 >>>> index 0000000000..2c7317f301 >>>> --- /dev/null >>>> +++ b/support/testing/tests/package/br2-external/systemd/external.desc >>>> @@ -0,0 +1,2 @@ >>>> +name: BUILDROOT_SYSTEMD_TESTSUITE >>>> +desc: Buildroot to easily test systemd changes or changes to the >>> systemd recipe in buildroot >>>> diff --git a/support/testing/tests/package/br2-external/systemd/ >>> external.mk b/support/testing/tests/package/br2-external/systemd/ >>> external.mk >>>> new file mode 100644 >>>> index 0000000000..780d79153b >>>> --- /dev/null >>>> +++ b/support/testing/tests/package/br2-external/systemd/external.mk >>>> @@ -0,0 +1,5 @@ >>>> +# Append SYSTEMD_CONF_OPTS from this BR2_EXTERNAL due to include order >>> in the Buildroot main Makefile: >>>> +# -include $(PACKAGE_OVERRIDE_FILE) >>>> +# -include $(sort $(wildcard package/*/*.mk)) >>>> +# include $(BR2_EXTERNAL_FILE) >>>> +SYSTEMD_CONF_OPTS += -Dslow-tests=true -Dinstall-tests=true -Dtests=true >>>> diff --git a/support/testing/tests/package/test_systemd.py >>> b/support/testing/tests/package/test_systemd.py >>>> new file mode 100644 >>>> index 0000000000..891c464652 >>>> --- /dev/null >>>> +++ b/support/testing/tests/package/test_systemd.py >>>> @@ -0,0 +1,123 @@ >>>> +import os >>>> + >>>> +import infra.basetest >>>> + >>>> +SYSTEMD_TIMEOUT = 400 >>>> + >>>> +# https://www.freedesktop.org/wiki/Software/systemd/VirtualizedTesting/ >>>> +# Some unit files used by the systemd testsuite are using some program >>> functionnality >>>> +# not implemented by the busybox variant (grep, find). >>>> +# The stat command with custom format (-c) and display of filesystem >>> status (-f) used by >>>> +# exec-protecthome-tmpfs-vs-protectsystem-strict.service can be >>> provided by busybox or coreutils. >>>> +# The ionice command used by exec-ioschedulingclass-none.service is >>> provided by util-linux schedutils. >>>> +# libcap tools needed to provide capsh binary for test-execute. >>>> + >>>> +# Skipped tests: >>>> +# test-barrier: This test requires a baremetal machine. >>>> +# test-bus-chat: This test requires an user account. >>>> + >>>> + >>>> +class TestSystemd(infra.basetest.BRTest): >>>> + br2_external = >>> [infra.filepath("tests/package/br2-external/systemd")] >>>> + config = \ >>>> + """ >>>> + BR2_x86_core2=y >>>> + BR2_TOOLCHAIN_EXTERNAL=y >>>> + BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y >>>> + BR2_TOOLCHAIN_EXTERNAL_URL=" >>> http://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2020.02-2.tar.bz2 >>> " >>>> + BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y >>>> + BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y >>>> + BR2_TOOLCHAIN_EXTERNAL_CXX=y >>>> + BR2_INIT_SYSTEMD=y >>>> + BR2_SYSTEM_BIN_SH_BASH=y >>>> + BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" >>>> + BR2_SYSTEM_DHCP="eth0" >>>> + BR2_ENABLE_LOCALE_WHITELIST="C en_US C_UTF8 fr_FR" >>>> + BR2_SYSTEM_ENABLE_NLS=y >>>> + BR2_LINUX_KERNEL=y >>>> + BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>>> + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.32" >>>> + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y >>>> + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" >>>> + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{}" >>>> + BR2_PACKAGE_FINDUTILS=y >>>> + BR2_PACKAGE_GREP=y >>>> + BR2_PACKAGE_RNG_TOOLS=y >>>> + BR2_PACKAGE_PYTHON3=y >>>> + BR2_PACKAGE_GNUTLS=y >>>> + BR2_PACKAGE_LIBQRENCODE=y >>>> + BR2_PACKAGE_LIBXKBCOMMON=y >>>> + BR2_PACKAGE_LIBIDN2=y >>>> + BR2_PACKAGE_ELFUTILS=y >>>> + BR2_PACKAGE_ELFUTILS_PROGS=y >>>> + BR2_PACKAGE_LIBCAP_TOOLS=y >>>> + BR2_PACKAGE_LIBCGROUP=y >>>> + BR2_PACKAGE_LIBCGROUP_TOOLS=y >>>> + BR2_PACKAGE_LIBSECCOMP=y >>>> + BR2_PACKAGE_LINUX_PAM=y >>>> + BR2_PACKAGE_P11_KIT=y >>>> + BR2_PACKAGE_LIBSELINUX=y >>>> + BR2_PACKAGE_PCRE2=y >>>> + BR2_PACKAGE_IPTABLES=y >>>> + BR2_PACKAGE_BASH_COMPLETION=y >>>> + BR2_PACKAGE_ACL=y >>>> + BR2_PACKAGE_AUDIT=y >>>> + BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y >>>> + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y >>>> + BR2_PACKAGE_SYSTEMD_BACKLIGHT=y >>>> + BR2_PACKAGE_SYSTEMD_BINFMT=y >>>> + BR2_PACKAGE_SYSTEMD_COREDUMP=y >>>> + BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y >>>> + BR2_PACKAGE_SYSTEMD_HIBERNATE=y >>>> + BR2_PACKAGE_SYSTEMD_HOMED=y >>>> + BR2_PACKAGE_SYSTEMD_IMPORTD=y >>>> + BR2_PACKAGE_SYSTEMD_LOCALED=y >>>> + BR2_PACKAGE_SYSTEMD_LOGIND=y >>>> + BR2_PACKAGE_SYSTEMD_MACHINED=y >>>> + BR2_PACKAGE_SYSTEMD_POLKIT=y >>>> + BR2_PACKAGE_SYSTEMD_QUOTACHECK=y >>>> + BR2_PACKAGE_SYSTEMD_RANDOMSEED=y >>>> + BR2_PACKAGE_SYSTEMD_REPART=y >>>> + BR2_PACKAGE_SYSTEMD_RFKILL=y >>>> + BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT=y >>>> + BR2_PACKAGE_SYSTEMD_SYSUSERS=y >>>> + BR2_PACKAGE_SYSTEMD_USERDB=y >>>> + BR2_PACKAGE_UTIL_LINUX_MINIX=y >>>> + BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y >>>> + BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y >>>> + BR2_PACKAGE_UTIL_LINUX_UNSHARE=y >>>> + BR2_TARGET_ROOTFS_EXT2=y >>>> + BR2_TARGET_ROOTFS_EXT2_4=y >>>> + BR2_TARGET_ROOTFS_EXT2_SIZE="1G" >>>> + # BR2_TARGET_ROOTFS_TAR is not set >>>> + """.format( >>>> + >>> infra.filepath("tests/package/test_systemd/systemd-kernel.config"), >>>> + infra.filepath("conf/busybox-stat-fragment.config")) >>>> + >>>> + def login(self): >>>> + img = os.path.join(self.builddir, "images", "rootfs.ext2") >>>> + kern = os.path.join(self.builddir, "images", "bzImage") >>>> + >>>> + # the complete boot with systemd takes more time than what the >>> default multipler permits >>>> + self.emulator.timeout_multiplier *= 10 >>>> + >>>> + # systemd testsuite overallocate memory and the minimum that >>> seemed to work was 1G >>>> + # systemd.unified_cgroup_hierarchy=1 for cgroup v2 and >>> test-execute >>>> + self.emulator.boot(arch="i386", >>>> + kernel=kern, >>>> + kernel_cmdline=["root=/dev/vda", "ro", >>> "console=ttyS0", >>>> + >>> "systemd.unified_cgroup_hierarchy=1", >>>> + "audit=0 >>> cgroup_no_v1=\"all\""], >>>> + options=["-M", "pc", "-m", "1G", "-device", >>>> + "virtio-rng-pci", "-drive", >>>> + >>> "file={},if=virtio,format=raw".format(img)]) >>>> + self.emulator.login() >>>> + >>>> + def test_run(self): >>>> + timeout = SYSTEMD_TIMEOUT * self.emulator.timeout_multiplier >>>> + >>>> + self.login() >>>> + >>>> + cmd = "/usr/lib/systemd/tests/run-unit-tests.py --unsafe" >>>> + _, exit_code = self.emulator.run(cmd, timeout) >>>> + self.assertEqual(exit_code, 0) >>>> diff --git >>> a/support/testing/tests/package/test_systemd/systemd-kernel.config >>> b/support/testing/tests/package/test_systemd/systemd-kernel.config >>>> new file mode 100644 >>>> index 0000000000..0c4efed77f >>>> --- /dev/null >>>> +++ b/support/testing/tests/package/test_systemd/systemd-kernel.config >>>> @@ -0,0 +1,111 @@ >>>> +CONFIG_SYSVIPC=y >>>> +CONFIG_POSIX_MQUEUE=y >>>> +CONFIG_PSI=y >>>> +CONFIG_CGROUPS=y >>>> +CONFIG_MEMCG=y >>>> +CONFIG_MEMCG_SWAP=y >>>> +# CONFIG_MEMCG_SWAP_ENABLED is not set >>>> +CONFIG_BLK_CGROUP=y >>>> +CONFIG_CGROUP_SCHED=y >>>> +CONFIG_CFS_BANDWIDTH=y >>>> +CONFIG_RT_GROUP_SCHED=y >>>> +CONFIG_CGROUP_PIDS=y >>>> +CONFIG_CGROUP_RDMA=y >>>> +CONFIG_CGROUP_FREEZER=y >>>> +CONFIG_CGROUP_HUGETLB=y >>>> +CONFIG_CPUSETS=y >>>> +CONFIG_CGROUP_DEVICE=y >>>> +CONFIG_CGROUP_CPUACCT=y >>>> +CONFIG_CGROUP_PERF=y >>>> +CONFIG_CGROUP_BPF=y >>>> +CONFIG_NAMESPACES=y >>>> +CONFIG_USER_NS=y >>>> +CONFIG_CHECKPOINT_RESTORE=y >>>> +CONFIG_EXPERT=y >>>> +CONFIG_BPF_SYSCALL=y >>>> +CONFIG_USERFAULTFD=y >>>> +CONFIG_SMP=y >>>> +CONFIG_HYPERVISOR_GUEST=y >>>> +CONFIG_PARAVIRT=y >>>> +CONFIG_DMI_SYSFS=y >>>> +CONFIG_MODULES=y >>>> +CONFIG_MODULE_UNLOAD=y >>>> +CONFIG_BLK_CGROUP_IOLATENCY=y >>>> +CONFIG_BINFMT_MISC=y >>>> +CONFIG_NET=y >>>> +CONFIG_PACKET=y >>>> +CONFIG_UNIX=y >>>> +CONFIG_INET=y >>>> +CONFIG_NET_SCHED=y >>>> +CONFIG_NET_CLS_CGROUP=y >>>> +CONFIG_CGROUP_NET_PRIO=y >>>> +# CONFIG_WIRELESS is not set >>>> +CONFIG_PCI=y >>>> +CONFIG_DEVTMPFS=y >>>> +CONFIG_DEVTMPFS_MOUNT=y >>>> +CONFIG_VIRTIO_BLK=y >>>> +CONFIG_BLK_DEV_SD=y >>>> +CONFIG_SCSI_VIRTIO=y >>>> +CONFIG_ATA=y >>>> +CONFIG_ATA_PIIX=y >>>> +CONFIG_NETDEVICES=y >>>> +CONFIG_VIRTIO_NET=y >>>> +CONFIG_NE2K_PCI=y >>>> +CONFIG_8139CP=y >>>> +# CONFIG_WLAN is not set >>>> +CONFIG_INPUT_EVDEV=y >>>> +CONFIG_INPUT_MISC=y >>>> +CONFIG_INPUT_UINPUT=m >>>> +CONFIG_SERIAL_8250=y >>>> +CONFIG_SERIAL_8250_CONSOLE=y >>>> +CONFIG_VIRTIO_CONSOLE=y >>>> +CONFIG_HW_RANDOM=y >>>> +CONFIG_HW_RANDOM_VIRTIO=y >>>> +CONFIG_DRM=y >>>> +CONFIG_DRM_QXL=y >>>> +CONFIG_DRM_BOCHS=y >>>> +CONFIG_DRM_VIRTIO_GPU=y >>>> +CONFIG_FRAMEBUFFER_CONSOLE=y >>>> +CONFIG_SOUND=y >>>> +CONFIG_SND=y >>>> +CONFIG_SND_HDA_INTEL=y >>>> +CONFIG_SND_HDA_GENERIC=y >>>> +CONFIG_HID_A4TECH=y >>>> +CONFIG_HID_APPLE=y >>>> +CONFIG_HID_BELKIN=y >>>> +CONFIG_HID_CHERRY=y >>>> +CONFIG_HID_CHICONY=y >>>> +CONFIG_HID_CYPRESS=y >>>> +CONFIG_HID_EZKEY=y >>>> +CONFIG_HID_ITE=y >>>> +CONFIG_HID_KENSINGTON=y >>>> +CONFIG_HID_LOGITECH=y >>>> +CONFIG_HID_REDRAGON=y >>>> +CONFIG_HID_MICROSOFT=y >>>> +CONFIG_HID_MONTEREY=y >>>> +CONFIG_USB=y >>>> +CONFIG_USB_XHCI_HCD=y >>>> +CONFIG_USB_EHCI_HCD=y >>>> +CONFIG_USB_UHCI_HCD=y >>>> +CONFIG_USB_STORAGE=y >>>> +CONFIG_VIRTIO_PCI=y >>>> +CONFIG_VIRTIO_BALLOON=y >>>> +CONFIG_VIRTIO_INPUT=y >>>> +CONFIG_VIRTIO_MMIO=y >>>> +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y >>>> +CONFIG_EXT4_FS=y >>>> +CONFIG_EXT4_FS_POSIX_ACL=y >>>> +CONFIG_EXT4_FS_SECURITY=y >>>> +CONFIG_FANOTIFY=y >>>> +CONFIG_AUTOFS4_FS=y >>>> +CONFIG_TMPFS=y >>>> +CONFIG_TMPFS_POSIX_ACL=y >>>> +CONFIG_HUGETLBFS=y >>>> +CONFIG_SECURITY=y >>>> +CONFIG_SECURITY_SMACK=y >>>> +CONFIG_DEFAULT_SECURITY_DAC=y >>>> +CONFIG_CRYPTO_HMAC=y >>>> +CONFIG_CRYPTO_SHA256=y >>>> +CONFIG_CRYPTO_USER_API_HASH=y >>>> +CONFIG_DEBUG_FS=y >>>> +# CONFIG_FTRACE is not set >>>> -- >>>> 2.25.3 >>>> >>> >>> -- >>> >>> .-----------------.--------------------.------------------.--------------------. >>> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' >>> conspiracy: | >>> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ >>> | >>> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is >>> no | >>> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v >>> conspiracy. | >>> >>> '------------------------------^-------^------------------^--------------------' >>> >> >> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at busybox.net >> http://lists.busybox.net/mailman/listinfo/buildroot >> > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From fontaine.fabrice at gmail.com Sat Jan 8 22:17:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:17:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/janus-gateway: bump to version 0.11.6 Message-ID: <20220108221707.3626671-1-fontaine.fabrice@gmail.com> - Add upstream status (rejected) to first and second patches - Drop third patch (already in version) https://github.com/meetecho/janus-gateway/blob/v0.11.6/CHANGELOG.md Signed-off-by: Fabrice Fontaine --- package/janus-gateway/0001-disable-ssp.patch | 2 + ...dd-test-for-Wunused-but-set-variable.patch | 2 + ...site-Scripting-XSS-exploits-in-demos.patch | 357 ------------------ ...> 0003-Fixed-missing-XSS-mitigation.patch} | 0 package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 7 +- 6 files changed, 7 insertions(+), 363 deletions(-) delete mode 100644 package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch rename package/janus-gateway/{0004-Fixed-missing-XSS-mitigation.patch => 0003-Fixed-missing-XSS-mitigation.patch} (100%) diff --git a/package/janus-gateway/0001-disable-ssp.patch b/package/janus-gateway/0001-disable-ssp.patch index 22f7f1a417..0c9b006ed9 100644 --- a/package/janus-gateway/0001-disable-ssp.patch +++ b/package/janus-gateway/0001-disable-ssp.patch @@ -12,6 +12,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[Upstream status: rejected +(https://github.com/meetecho/janus-gateway/pull/1801)] --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index b54c8cbec6..2dfcc76d68 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -18,6 +18,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[Upstream status: rejected +(https://github.com/meetecho/janus-gateway/pull/1789)] --- Makefile.am | 1 + configure.ac | 6 ++- diff --git a/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch b/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch deleted file mode 100644 index 9f3adfcc8e..0000000000 --- a/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch +++ /dev/null @@ -1,357 +0,0 @@ -From ba166e9adebfe5343f826c6a9e02299d35414ffd Mon Sep 17 00:00:00 2001 -From: Lorenzo Miniero -Date: Thu, 25 Nov 2021 17:20:53 +0100 -Subject: [PATCH] Fix potential Cross-site Scripting (XSS) exploits in demos - (#2817) - -[Retrieved (and backported) from: -https://github.com/meetecho/janus-gateway/commit/ba166e9adebfe5343f826c6a9e02299d35414ffd] -Signed-off-by: Fabrice Fontaine ---- - html/audiobridgetest.js | 17 +++++++++++++---- - html/recordplaytest.js | 13 +++++++++++-- - html/screensharingtest.js | 11 ++++++++++- - html/streamingtest.js | 13 +++++++++++-- - html/textroomtest.js | 23 ++++++++++++++--------- - html/videocalltest.js | 15 ++++++++++++--- - html/videoroomtest.js | 13 +++++++++++-- - html/vp9svctest.js | 13 +++++++++++-- - 8 files changed, 93 insertions(+), 25 deletions(-) - -diff --git a/html/audiobridgetest.js b/html/audiobridgetest.js -index 18e1cc1839..f757789708 100644 ---- a/html/audiobridgetest.js -+++ b/html/audiobridgetest.js -@@ -178,7 +178,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -222,7 +222,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -267,7 +267,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -429,7 +429,7 @@ function registerUsername() { - return; - } - var register = { request: "join", room: myroom, display: username }; -- myusername = username; -+ myusername = escapeXmlTags(username); - mixertest.send({ message: register}); - } - } -@@ -448,3 +448,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/recordplaytest.js b/html/recordplaytest.js -index 74ee7bed95..52b5ccbc4c 100644 ---- a/html/recordplaytest.js -+++ b/html/recordplaytest.js -@@ -423,11 +423,11 @@ function updateRecsList() { - Janus.debug("Got a list of available recordings:", list); - for(var mp in list) { - Janus.debug(" >> [" + list[mp]["id"] + "] " + list[mp]["name"] + " (" + list[mp]["date"] + ")"); -- $('#recslist').append("
  • " + list[mp]["name"] + " [" + list[mp]["date"] + "]" + "
    • "); -+ $('#recslist').append("
  • " + escapeXmlTags(list[mp]["name"]) + " [" + list[mp]["date"] + "]" + "
    • "); - } - $('#recslist a').unbind('click').click(function() { - selectedRecording = $(this).attr("id"); -- selectedRecordingInfo = $(this).text(); -+ selectedRecordingInfo = escapeXmlTags($(this).text()); - $('#recset').html($(this).html()).parent().removeClass('open'); - $('#play').removeAttr('disabled').click(startPlayout); - return false; -@@ -545,3 +545,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/screensharingtest.js b/html/screensharingtest.js -index 61eac70f43..c64d8dbd67 100644 ---- a/html/screensharingtest.js -+++ b/html/screensharingtest.js -@@ -161,7 +161,7 @@ $(document).ready(function() { - if(event === "joined") { - myid = msg["id"]; - $('#session').html(room); -- $('#title').html(msg["description"]); -+ $('#title').html(escapeXmlTags(msg["description"])); - Janus.log("Successfully joined room " + msg["room"] + " with ID " + myid); - if(role === "publisher") { - // This is our session, publish our stream -@@ -514,3 +514,12 @@ function newRemoteFeed(id, display) { - } - }); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/streamingtest.js b/html/streamingtest.js -index 7dd2e1f681..3f9937f11c 100644 ---- a/html/streamingtest.js -+++ b/html/streamingtest.js -@@ -323,7 +323,7 @@ function updateStreamsList() { - Janus.debug(list); - for(var mp in list) { - Janus.debug(" >> [" + list[mp]["id"] + "] " + list[mp]["description"] + " (" + list[mp]["type"] + ")"); -- $('#streamslist').append("
  • " + list[mp]["description"] + " (" + list[mp]["type"] + ")" + "
    • "); -+ $('#streamslist').append("
  • " + escapeXmlTags(list[mp]["description"]) + " (" + list[mp]["type"] + ")" + "
    • "); - } - $('#streamslist a').unbind('click').click(function() { - selectedStream = $(this).attr("id"); -@@ -345,7 +345,7 @@ function getStreamInfo() { - var body = { request: "info", id: parseInt(selectedStream) || selectedStream }; - streaming.send({ message: body, success: function(result) { - if(result && result.info && result.info.metadata) { -- $('#metadata').html(result.info.metadata); -+ $('#metadata').html(escapeXmlTags(result.info.metadata)); - $('#info').removeClass('hide').show(); - } - }}); -@@ -394,6 +394,15 @@ function stopStream() { - simulcastStarted = false; - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons() { - $('#curres').parent().append( -diff --git a/html/textroomtest.js b/html/textroomtest.js -index 082ae44905..3d0697e35a 100644 ---- a/html/textroomtest.js -+++ b/html/textroomtest.js -@@ -153,9 +153,7 @@ $(document).ready(function() { - var what = json["textroom"]; - if(what === "message") { - // Incoming message: public or private? -- var msg = json["text"]; -- msg = msg.replace(new RegExp('<', 'g'), '<'); -- msg = msg.replace(new RegExp('>', 'g'), '>'); -+ var msg = escapeXmlTags(json["text"]); - var from = json["from"]; - var dateString = getDateString(json["date"]); - var whisper = json["whisper"]; -@@ -170,9 +168,7 @@ $(document).ready(function() { - } - } else if(what === "announcement") { - // Room announcement -- var msg = json["text"]; -- msg = msg.replace(new RegExp('<', 'g'), '<'); -- msg = msg.replace(new RegExp('>', 'g'), '>'); -+ var msg = escapeXmlTags(json["text"]); - var dateString = getDateString(json["date"]); - $('#chatroom').append('

    [' + dateString + '] ' + msg + ''); - $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; -@@ -180,7 +176,7 @@ $(document).ready(function() { - // Somebody joined - var username = json["username"]; - var display = json["display"]; -- participants[username] = display ? display : username; -+ participants[username] = escapeXmlTags(display ? display : username); - if(username !== myid && $('#rp' + username).length === 0) { - // Add to the participants list - $('#list').append('

  • ' + participants[username] + '
    • '); -@@ -282,7 +278,7 @@ function registerUsername() { - username: myid, - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - transactions[transaction] = function(response) { - if(response["textroom"] === "error") { - // Something went wrong -@@ -312,7 +308,7 @@ function registerUsername() { - if(response.participants && response.participants.length > 0) { - for(var i in response.participants) { - var p = response.participants[i]; -- participants[p.username] = p.display ? p.display : p.username; -+ participants[p.username] = escapeXmlTags(p.display ? p.display : p.username); - if(p.username !== myid && $('#rp' + p.username).length === 0) { - // Add to the participants list - $('#list').append('
  • ' + participants[p.username] + '
    • '); -@@ -418,3 +414,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/videocalltest.js b/html/videocalltest.js -index d1c1ab8d07..18ccbc2c47 100644 ---- a/html/videocalltest.js -+++ b/html/videocalltest.js -@@ -148,7 +148,7 @@ $(document).ready(function() { - } else if(result["event"]) { - var event = result["event"]; - if(event === 'registered') { -- myusername = result["username"]; -+ myusername = escapeXmlTags(result["username"]); - Janus.log("Successfully registered as " + myusername + "!"); - $('#youok').removeClass('hide').show().html("Registered as '" + myusername + "'"); - // Get a list of available peers, just for fun -@@ -163,7 +163,7 @@ $(document).ready(function() { - bootbox.alert("Waiting for the peer to answer..."); - } else if(event === 'incomingcall') { - Janus.log("Incoming call from " + result["username"] + "!"); -- yourusername = result["username"]; -+ yourusername = escapeXmlTags(result["username"]); - // Notify user - bootbox.hideAll(); - incoming = bootbox.dialog({ -@@ -213,7 +213,7 @@ $(document).ready(function() { - }); - } else if(event === 'accepted') { - bootbox.hideAll(); -- var peer = result["username"]; -+ var peer = escapeXmlTags(result["username"]); - if(!peer) { - Janus.log("Call started!"); - } else { -@@ -598,6 +598,15 @@ function getQueryStringValue(name) { - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons(temporal) { - $('#curres').parent().append( -diff --git a/html/videoroomtest.js b/html/videoroomtest.js -index 6a566891d8..5a3ade9be9 100644 ---- a/html/videoroomtest.js -+++ b/html/videoroomtest.js -@@ -400,7 +400,7 @@ function registerUsername() { - ptype: "publisher", - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - sfutest.send({ message: register }); - } - } -@@ -530,7 +530,7 @@ function newRemoteFeed(id, display, audio, video) { - } - } - remoteFeed.rfid = msg["id"]; -- remoteFeed.rfdisplay = msg["display"]; -+ remoteFeed.rfdisplay = escapeXmlTags(msg["display"]); - if(!remoteFeed.spinner) { - var target = document.getElementById('videoremote'+remoteFeed.rfindex); - remoteFeed.spinner = new Spinner({top:100}).spin(target); -@@ -685,6 +685,15 @@ function getQueryStringValue(name) { - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons(feed, temporal) { - var index = feed; -diff --git a/html/vp9svctest.js b/html/vp9svctest.js -index eca0239c32..b22ccf3340 100644 ---- a/html/vp9svctest.js -+++ b/html/vp9svctest.js -@@ -387,7 +387,7 @@ function registerUsername() { - ptype: "publisher", - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - sfutest.send({ message: register }); - } - } -@@ -486,7 +486,7 @@ function newRemoteFeed(id, display, audio, video) { - } - } - remoteFeed.rfid = msg["id"]; -- remoteFeed.rfdisplay = msg["display"]; -+ remoteFeed.rfdisplay = escapeXmlTags(msg["display"]); - if(!remoteFeed.spinner) { - var target = document.getElementById('videoremote'+remoteFeed.rfindex); - remoteFeed.spinner = new Spinner({top:100}).spin(target); -@@ -630,6 +630,15 @@ function newRemoteFeed(id, display, audio, video) { - }); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create SVC-related UI for a new viewer - function addSvcButtons(feed) { - var index = feed; diff --git a/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch similarity index 100% rename from package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch rename to package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 83afc72c98..7aec3d2aa3 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 21e2fc7dee4b20ed8d749a69577eccd961b0bfe5b863d42f39ddfcd2af903718 janus-gateway-0.10.10.tar.gz +sha256 b5fe70d95b9288200df15d5f75cb8eb6db66484c6ded159422a81e880ecb7104 janus-gateway-0.11.6.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 83d28ff6c7..84ca0bc116 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,17 +4,14 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 0.10.10 +JANUS_GATEWAY_VERSION = 0.11.6 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING JANUS_GATEWAY_CPE_ID_VENDOR = meetecho JANUS_GATEWAY_CPE_ID_PRODUCT = janus -# 0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch -JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4020 - -# 0004-Fixed-missing-XSS-mitigation.patch +# 0003-Fixed-missing-XSS-mitigation.patch JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 # ding-libs provides the ini_config library -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 22:21:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:21:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/snort: bump to version 2.9.19 Message-ID: <20220108222153.3689389-1-fontaine.fabrice@gmail.com> https://snort.org/downloads/snort/release_notes_2.9.19.txt Signed-off-by: Fabrice Fontaine --- package/snort/snort.hash | 4 ++-- package/snort/snort.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snort/snort.hash b/package/snort/snort.hash index 6df7ae5229..ac098564aa 100644 --- a/package/snort/snort.hash +++ b/package/snort/snort.hash @@ -1,8 +1,8 @@ # From https://www.snort.org/downloads/snort/md5s -md5 2b4e30300ef6feca1f60c267e727c6c0 snort-2.9.18.1.tar.gz +md5 b0350425e0c1e9c044c25aa13b47edf8 snort-2.9.19.tar.gz # Locally computed: -sha256 da8af0f1b2e4f247d970c6a3c0e83fb6dcd5c84faa21aea49f306f269e8e28aa snort-2.9.18.1.tar.gz +sha256 b12fc6db72afb58987a2bf1954b8f45bde02047c235513c7663857b9506369c7 snort-2.9.19.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 54017d3460..41f450541f 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.18.1 +SNORT_VERSION = 2.9.19 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING -- 2.34.1 From arnout at mind.be Sat Jan 8 22:28:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 23:28:46 +0100 Subject: [Buildroot] [PATCH 1/1] systemd: ensure tmpfiles.d/legacy.conf is installed In-Reply-To: References: <20200825000246.4035-1-joseph.kogut@gmail.com> <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> <0570b1f3-5229-5c0e-796a-53f8747b540a@mind.be> Message-ID: <516a0c55-6d67-f46a-b60b-4475b043c971@mind.be> On 08/01/2022 22:17, Norbert Lange wrote: > Am Sa., 8. Jan. 2022 um 21:40 Uhr schrieb Arnout Vandecappelle : >> >> >> On 08/01/2022 20:12, Arnout Vandecappelle wrote: >>> >>> >>> On 25/08/2020 02:02, Joseph Kogut wrote: >>>> Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity >>>> isn't enabled. This config sets up /var/lock, which many programs such >>>> as uboot's fw_printenv/setenv still depend on by default. >>>> >>>> Signed-off-by: Joseph Kogut >>> >>> After all the discussion, I did finally apply to master, thanks. >> >> And I ended up reverting it again - legacy.conf is now legacy.conf.in and it >> needs to be preprocessed, but that is only done if sysv-compat is enabled. >> >> So if we want this, our only option is to enable sysv-compat (which is >> probably something we should do anyway). > > Why the only option? you should just ship your own legacy.conf, it wont change. I meant: if we want to use the legacy.conf from upstream. But you're right it's not the only option, we could also manually sed out stuff from the .in file. > Adding sysv compatibility, which is alot more than just the mkdir and > symlink, would mean adding alot baggage. Ack. > Baggage that wont even work as Yann spake thusly [1] > > a tmpfile.conf with those 3 lines would be enough: > d /run/lock 0755 root root - > L /var/lock - - - - ../run/lock > d /run/lock/subsys 0755 root root - All right, I hope I remember this by the time a see the patch :-) > > Norbert. > > PS. I am too lazy to google everything up, but I believe I brought up > this very topic before. I'm also too lazy to google it. Regards, Arnout > > [1] - https://lists.buildroot.org/pipermail/buildroot/2020-July/287275.html > From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-golang.txt: add some details about vendoring Message-ID: <20220108222949.4FB2583466@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad034892d8b8748eea52b45aa05dbeb271645dbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-golang.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/manual/adding-packages-golang.txt b/docs/manual/adding-packages-golang.txt index 3b34579200..c952cde577 100644 --- a/docs/manual/adding-packages-golang.txt +++ b/docs/manual/adding-packages-golang.txt @@ -120,3 +120,14 @@ possible to customize what is done in any particular step: +FOO_BUILD_CMDS+ variable, it will be used instead of the default Go one. However, using this method should be restricted to very specific cases. Do not use it in the general case. + +A Go package can depend on other Go modules, listed in its +go.mod+ +file. Buildroot automatically takes care of downloading such +dependencies as part of the download step of packages that use the ++golang-package+ infrastructure. Such dependencies are then kept +together with the package source code in the tarball cached in +Buildroot's +DL_DIR+, and therefore the hash of the package's tarball +includes such dependencies. + +This mechanism ensures that any change in the dependencies will be +detected, and allows the build to be performed completely offline. From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] support/download/helpers: use tar xzf in post_process_unpack() Message-ID: <20220108222949.3E50A832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ccff780f49a24f01c44d31f4fe3bc1ea0a36d5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For now, the download post-process logic uses mk_tar_gz, which repacks a tarball compressed with gzip. So we can only accept as input a tarball also compressed with gzip. To enforce that, this commit changes post_process_unpack() to use tar xzf. This makes sure that if a tarball compressed with something else than gzip gets used, it will bail out and we will notice. Support for other compression schemes can be added later on. Signed-off-by: Thomas Petazzoni --- support/download/helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/helpers b/support/download/helpers index 4c5eb466cc..ab31e27a69 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -78,7 +78,7 @@ post_process_unpack() { local one_file mkdir "${dest}" - tar -C "${dest}" --strip-components=1 -xf "${tarball}" + tar -C "${dest}" --strip-components=1 -xzf "${tarball}" one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |head -z -n1 |tr -d "\0")" touch -r "${one_file}" "${dest}.timestamp" } From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] package/sentry-cli: re-add package Message-ID: <20220108222949.72A05832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=049ca10248a4c5a808e7d96acd8711563916d318 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit d19077677fc71fc8c8cd73945606f773d907a99a, but the package now uses the cargo-package infrastructure with its vendoring mechanism, which allows us to avoid the problems that caused the package to be removed in d19077677fc71fc8c8cd73945606f773d907a99a. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/sentry-cli/Config.in.host | 10 ++++++++++ package/sentry-cli/sentry-cli.hash | 3 +++ package/sentry-cli/sentry-cli.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b80d886809..df7d988279 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1522,6 +1522,7 @@ F: package/python-schedule/ F: package/python-sentry-sdk/ F: package/python-websockets/ F: package/python-xlib/ +F: package/sentry-cli/ F: package/sentry-native/ F: package/unclutter-xfixes/ diff --git a/package/Config.in.host b/package/Config.in.host index 7400da5894..b3e00bb482 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -81,6 +81,7 @@ menu "Host utilities" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" source "package/sdbusplus/Config.in.host" + source "package/sentry-cli/Config.in.host" source "package/sloci-image/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" diff --git a/package/sentry-cli/Config.in.host b/package/sentry-cli/Config.in.host new file mode 100644 index 0000000000..3124015367 --- /dev/null +++ b/package/sentry-cli/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_SENTRY_CLI + bool "host sentry-cli" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Official Sentry command line interface + + For managing debug information files and source maps. + + https://docs.sentry.io/cli/ diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash new file mode 100644 index 0000000000..73f818125f --- /dev/null +++ b/package/sentry-cli/sentry-cli.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 d687336379fd96c4ee73f24bd062d31672bd7453af53311b72977be3c8c78fef sentry-cli-1.59.0.tar.gz +sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk new file mode 100644 index 0000000000..58f5f1e325 --- /dev/null +++ b/package/sentry-cli/sentry-cli.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# sentry-cli +# +################################################################################ + +SENTRY_CLI_VERSION = 1.59.0 +SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) +SENTRY_CLI_LICENSE = BSD-3-clause +SENTRY_CLI_LICENSE_FILES = LICENSE + +HOST_SENTRY_CLI_DEPENDENCIES = host-zlib + +$(eval $(host-cargo-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] package/pkg-golang.mk: implement Go vendoring support Message-ID: <20220108222949.470D683460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24ac316ff58e2c1deca8dc329705b0810414c8db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit introduces the download post-process script support/download/go-post-process, and hooks it into the Go package infrastructure. The -modcacherw flag is added to ensure that the Go cache is read/write, and can be deleted properly upon "make clean". The _LICENSE variable of golang packages is expanded with ", vendored dependencies licenses probably not listed" as currently for all packages, the licenses of the vendored dependencies are not taken into account. Signed-off-by: Thomas Petazzoni --- package/pkg-golang.mk | 13 ++++++++++++- support/download/go-post-process | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index d07242310d..35bcb1673b 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -42,12 +42,13 @@ define inner-golang-package $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ + -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ -p $(PARALLEL_JOBS) # Target packages need the Go compiler on the host. -$(2)_DEPENDENCIES += host-go +$(2)_DOWNLOAD_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . @@ -81,6 +82,16 @@ define $(2)_GEN_GOMOD endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD +$(2)_DOWNLOAD_POST_PROCESS = go +$(2)_DL_ENV = \ + $(HOST_GO_COMMON_ENV) \ + GOPROXY=direct \ + BR_GOMOD=$$($(2)_GOMOD) + +# Due to vendoring, it is pretty likely that not all licenses are +# listed in _LICENSE. +$(2)_LICENSE += , vendored dependencies licenses probably not listed + # Build step. Only define it if not already defined by the package .mk # file. ifndef $(2)_BUILD_CMDS diff --git a/support/download/go-post-process b/support/download/go-post-process new file mode 100755 index 0000000000..be202a4c0f --- /dev/null +++ b/support/download/go-post-process @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +. "${0%/*}/helpers" + +# Parse our options +while getopts "n:o:" OPT; do + case "${OPT}" in + o) output="${OPTARG}";; + n) base_name="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac +done + +# Already vendored tarball, nothing to do +if tar tf "${output}" | grep -q "^[^/]*/vendor" ; then + exit 0 +fi + +post_process_unpack "${base_name}" "${output}" + +# Do the Go vendoring +pushd "${base_name}" > /dev/null + +if [ ! -f go.mod ]; then + echo "ERROR: no vendor/ folder and no go.mod, aborting" + exit 1 +fi + +go mod vendor -v -modcacherw +popd > /dev/null + +post_process_repack $(pwd) "${base_name}" "${output}" From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:41 +0100 Subject: [Buildroot] [git commit] package/gocryptfs: new package Message-ID: <20220108222949.92D9A832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffc503fab767c9d2381f7152bcaab024a6358748 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Adds the gocryptfs encrypted FUSE filesystem. Currently uses without_openssl build tag, to use the native Go cryptography. However, the package could be improved by conditionally enabling openssl if it is also configured to be built by Buildroot. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/gocryptfs/Config.in | 12 ++++++++++++ package/gocryptfs/gocryptfs.hash | 3 +++ package/gocryptfs/gocryptfs.mk | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2e3500e788..259cace487 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -531,6 +531,7 @@ F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/gocryptfs/ F: package/mbpfan/ F: package/mosh/ F: package/pkg-golang.mk diff --git a/package/Config.in b/package/Config.in index f127b6bf45..081268527c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -221,6 +221,7 @@ menu "Filesystem and flash utilities" source "package/genext2fs/Config.in" source "package/genpart/Config.in" source "package/genromfs/Config.in" + source "package/gocryptfs/Config.in" source "package/imx-usb-loader/Config.in" source "package/mmc-utils/Config.in" source "package/mtd/Config.in" diff --git a/package/gocryptfs/Config.in b/package/gocryptfs/Config.in new file mode 100644 index 0000000000..2630cafdcf --- /dev/null +++ b/package/gocryptfs/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_GOCRYPTFS + bool "gocryptfs" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + gocryptfs is an encrypted FUSE overlay filesystem. + + https://github.com/rfjakob/gocryptfs + +comment "gocryptfs needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash new file mode 100644 index 0000000000..94487815f5 --- /dev/null +++ b/package/gocryptfs/gocryptfs.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk new file mode 100644 index 0000000000..2a00e9a959 --- /dev/null +++ b/package/gocryptfs/gocryptfs.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# gocryptfs +# +################################################################################ + +GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) +GOCRYPTFS_LICENSE = MIT +GOCRYPTFS_LICENSE_FILES = LICENSE + +GOCRYPTFS_GOMOD = github.com/rfjakob/gocryptfs/v2 + +GOCRYPTFS_LDFLAGS = \ + -X main.GitVersion=$(GOCRYPTFS_VERSION) \ + -X main.GitVersionFuse=[vendored] +GOCRYPTFS_TAGS = without_openssl + +$(eval $(golang-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:41 +0100 Subject: [Buildroot] [git commit] package/tinifier: new package Message-ID: <20220108222949.7D75D832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43c580ac9f848449333ecbe4336c2c9f2ba12158 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a Go package that needs vendor modules to be downloaded at build time. Signed-off-by: Thomas Petazzoni Reviewed-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/tinifier/Config.in | 10 ++++++++++ package/tinifier/tinifier.hash | 3 +++ package/tinifier/tinifier.mk | 13 +++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index df7d988279..ab6648cec2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2787,6 +2787,7 @@ F: package/rtc-tools/ F: package/sam-ba/ F: package/scons/ F: package/squashfs/ +F: package/tinifier/ F: package/wayland/ F: package/weston/ F: support/testing/tests/boot/test_syslinux.py diff --git a/package/Config.in b/package/Config.in index 15a831c1bf..ad6741f74c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -314,6 +314,7 @@ comment "Graphic applications" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" source "package/tesseract-ocr/Config.in" + source "package/tinifier/Config.in" comment "Graphic libraries" source "package/cegui/Config.in" diff --git a/package/tinifier/Config.in b/package/tinifier/Config.in new file mode 100644 index 0000000000..fbadfe6bd9 --- /dev/null +++ b/package/tinifier/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_TINIFIER + bool "tinifier" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + CLI tool for images compressing + + This tool uses tinypng.com API endpoint for compressing your + local jpg/png images (it supports parallel jobs). + + https://github.com/tarampampam/tinifier diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash new file mode 100644 index 0000000000..5681ed6a55 --- /dev/null +++ b/package/tinifier/tinifier.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 927e966f9d23ea7cc1942967a8fc16ef4c55c51bd096d44f54b418844a51aa12 tinifier-3.4.0.tar.gz +sha256 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 LICENSE diff --git a/package/tinifier/tinifier.mk b/package/tinifier/tinifier.mk new file mode 100644 index 0000000000..d7ed6f7c93 --- /dev/null +++ b/package/tinifier/tinifier.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# tinifier +# +################################################################################ + +TINIFIER_VERSION = 3.4.0 +TINIFIER_SITE = $(call github,tarampampam,tinifier,v$(TINIFIER_VERSION)) +TINIFIER_LICENSE = MIT +TINIFIER_LICENSE_FILES = LICENSE +TINIFIER_GOMOD = ./cmd/tinifier + +$(eval $(golang-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] package/ripgrep: convert to cargo infrastructure Message-ID: <20220108222949.6945883466@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=342fd3e7350479dc368541ac77a5130ebb53194c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit converts the ripgrep package to the cargo infrastructure. This causes the vendoring mechanism to kick in, which changes the contents of the tarball. To avoid a clash on the hash, we change the version of ripgrep to the Git commit hash matching the 13.0.0 tag, so there are no functional changes, but the tarball name is different. Signed-off-by: Patrick Havelange Signed-off-by: Thomas Petazzoni --- package/ripgrep/ripgrep.hash | 2 +- package/ripgrep/ripgrep.mk | 37 ++++++------------------------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index b2f03a95e6..cd2dbedfb4 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2 ripgrep-13.0.0.tar.gz +sha256 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 7c2b79a4a7..d587441cfa 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -4,7 +4,11 @@ # ################################################################################ -RIPGREP_VERSION = 13.0.0 +# Same as 13.0.0, we use a Git commit hash because the hash of this +# tarball changed when moving to the cargo-package infrastructure, and +# we can't change the hash of existing tarball. Please switch back to +# a Git tag at the next version bump. +RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT @@ -13,33 +17,4 @@ RIPGREP_CPE_ID_VENDOR = ripgrep_project # CVE only impacts ripgrep on Windows RIPGREP_IGNORE_CVES += CVE-2021-3013 -RIPGREP_DEPENDENCIES = host-rustc -RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo \ - __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ - CARGO_TARGET_APPLIES_TO_HOST="false" - -RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_BIN_SUBDIR) - -RIPGREP_CARGO_OPTS = \ - -Z target-applies-to-host \ - --target=$(RUSTC_TARGET_NAME) \ - --manifest-path=$(@D)/Cargo.toml - -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) -RIPGREP_CARGO_BIN_SUBDIR = debug -else -RIPGREP_CARGO_OPTS += --release -RIPGREP_CARGO_BIN_SUBDIR = release -endif - -define RIPGREP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \ - cargo build $(RIPGREP_CARGO_OPTS) -endef - -define RIPGREP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(RIPGREP_BIN_DIR)/rg \ - $(TARGET_DIR)/usr/bin/rg -endef - -$(eval $(generic-package)) +$(eval $(cargo-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:41 +0100 Subject: [Buildroot] [git commit] package/embiggen-disk: new package Message-ID: <20220108222949.8752983460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e5d2c0b9559f1aef62c8d547f9b38cc2ebb2099 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master embiggen-disk is a tool to automatically resize disks to fill available space. Patch submitted upstream: https://github.com/bradfitz/embiggen-disk/pull/13 Adds support for /dev/mmcblk0pN type paths. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/embiggen-disk/Config.in | 19 +++++++++++++++++++ package/embiggen-disk/embiggen-disk.hash | 3 +++ package/embiggen-disk/embiggen-disk.mk | 12 ++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ab6648cec2..2e3500e788 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -528,6 +528,7 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-engine/ F: package/docker-proxy/ +F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ F: package/mbpfan/ diff --git a/package/Config.in b/package/Config.in index ad6741f74c..f127b6bf45 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2528,6 +2528,7 @@ menu "System tools" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" + source "package/embiggen-disk/Config.in" source "package/emlog/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" diff --git a/package/embiggen-disk/Config.in b/package/embiggen-disk/Config.in new file mode 100644 index 0000000000..667d71c86e --- /dev/null +++ b/package/embiggen-disk/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_EMBIGGEN_DISK + bool "embiggen-disk" + 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 # no fexecve + depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_UTIL_LINUX # sfdisk + select BR2_PACKAGE_UTIL_LINUX_BINARIES # sfdisk + help + embiggen-disk is a tool to resize disk partitions at runtime. + + https://github.com/bradfitz/embiggen-disk + +comment "embiggen-disk needs a glibc or musl toolchain w/ threads" + depends on BR2_USE_MMU + 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/embiggen-disk/embiggen-disk.hash b/package/embiggen-disk/embiggen-disk.hash new file mode 100644 index 0000000000..3a290e2ec8 --- /dev/null +++ b/package/embiggen-disk/embiggen-disk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 514cde66ab9fe6af91b97f17acc19b37976f675ebea0e1be741d6bd621811d87 embiggen-disk-9e7b2fc7b99c4dece41a805489a6ca377ce55a62.tar.gz +sha256 063aedec1652c5a05c2d04c40e032b932453142ee8ef7fd53c04a9acc127fc95 LICENSE diff --git a/package/embiggen-disk/embiggen-disk.mk b/package/embiggen-disk/embiggen-disk.mk new file mode 100644 index 0000000000..66f2087dbd --- /dev/null +++ b/package/embiggen-disk/embiggen-disk.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# embiggen-disk +# +################################################################################ + +EMBIGGEN_DISK_VERSION = 9e7b2fc7b99c4dece41a805489a6ca377ce55a62 +EMBIGGEN_DISK_SITE = $(call github,bradfitz,embiggen-disk,$(EMBIGGEN_DISK_VERSION)) +EMBIGGEN_DISK_LICENSE = Apache-2.0 +EMBIGGEN_DISK_LICENSE_FILES = LICENSE + +$(eval $(golang-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:41 +0100 Subject: [Buildroot] [git commit] package/bat: new package Message-ID: <20220108222949.9CB40832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fd3770cc64679d5ff541fdaa5d0fdb2f9d16111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master bat is a cat(1) clone with syntax highlighting and Git integration. Signed-off-by: David Pierret Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/bat/Config.in | 11 +++++++++++ package/bat/bat.hash | 4 ++++ package/bat/bat.mk | 12 ++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 259cace487..bc07fdbde3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -680,6 +680,9 @@ F: linux/linux-ext-ev3dev-linux-drivers.mk F: package/brickd/ F: package/ev3dev-linux-drivers/ +N: David Pierret +F: package/bat/ + N: Davide Viti F: board/friendlyarm/nanopi-r1/ F: configs/friendlyarm_nanopi_r1_defconfig diff --git a/package/Config.in b/package/Config.in index 081268527c..dbfdcf6ce3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2607,6 +2607,7 @@ menu "System tools" endmenu menu "Text editors and viewers" + source "package/bat/Config.in" source "package/ed/Config.in" source "package/joe/Config.in" source "package/less/Config.in" diff --git a/package/bat/Config.in b/package/bat/Config.in new file mode 100644 index 0000000000..515eaf591a --- /dev/null +++ b/package/bat/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_BAT + bool "bat" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + # we need a full version of less + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_LESS + help + A cat(1) clone with syntax highlighting and Git integration. + + https://github.com/sharkdp/bat diff --git a/package/bat/bat.hash b/package/bat/bat.hash new file mode 100644 index 0000000000..aa6c8d743d --- /dev/null +++ b/package/bat/bat.hash @@ -0,0 +1,4 @@ +# Locally generated +sha256 9c345788eb916777a60e7ff32031f1c92edc5565031e0c057bce860982768744 bat-0.18.3.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE +sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk new file mode 100644 index 0000000000..9b619af172 --- /dev/null +++ b/package/bat/bat.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# bat +# +################################################################################ + +BAT_VERSION = 0.18.3 +BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) +BAT_LICENSE = Apache-2.0 or MIT +BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: introduce the cargo package infrastructure Message-ID: <20220108222949.59034832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=301a8eae0c2aded1821b44da1ab051c53df60486 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to be package agnostic, the install phase is now using cargo instead of install. TARGET_CONFIGURE_OPTS is now also set when running cargo in order to support cross compiling C code within cargo. This commit also adds support/download/cargo-post-process to perform the vendoring on Cargo packages. The _LICENSE variable of cargo packages is expanded with ", vendored dependencies licenses probably not listed" as currently for all packages, the licenses of the vendored dependencies are not taken into account. Signed-off-by: Patrick Havelange [Thomas: add support for host-cargo-package and vendoring] Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 1 + package/pkg-cargo.mk | 166 ++++++++++++++++++++++++++++++++++++ support/download/cargo-post-process | 38 +++++++++ 3 files changed, 205 insertions(+) diff --git a/package/Makefile.in b/package/Makefile.in index dae7a859fd..0ca2a5844e 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -441,3 +441,4 @@ include package/pkg-waf.mk include package/pkg-golang.mk include package/pkg-meson.mk include package/pkg-qmake.mk +include package/pkg-cargo.mk diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk new file mode 100644 index 0000000000..47ae86bfae --- /dev/null +++ b/package/pkg-cargo.mk @@ -0,0 +1,166 @@ +################################################################################ +# Cargo package infrastructure +# +# This file implements an infrastructure that eases development of package +# .mk files for Cargo packages. It should be used for all packages that use +# Cargo as their build system. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this Cargo infrastructure requires the .mk file +# to only specify metadata information about the package: name, version, +# download URL, etc. +# +# We still allow the package .mk file to override what the different steps +# are doing, if needed. For example, if _BUILD_CMDS is already defined, +# it is used as the list of commands to perform to build the package, +# instead of the default Cargo behaviour. The package can also define some +# post operation hooks. +# +################################################################################ + +# __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS is needed to allow +# passing the -Z target-applies-to-host, which is needed together with +# CARGO_TARGET_APPLIES_TO_HOST to fix build problems when target +# architecture == host architecture. +PKG_CARGO_ENV = \ + CARGO_HOME=$(HOST_DIR)/share/cargo \ + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_TARGET_APPLIES_TO_HOST="false" + +################################################################################ +# inner-cargo-package -- defines how the configuration, compilation and +# installation of a cargo package should be done, implements a few hooks +# to tune the build process for cargo specifities and calls the generic +# package infrastructure to generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix +# for host packages +# argument 4 is the type (target or host) +################################################################################ + +define inner-cargo-package + +# We need host-rustc to run cargo +$(2)_DOWNLOAD_DEPENDENCIES += host-rustc + +$(2)_DOWNLOAD_POST_PROCESS = cargo +$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo + +# Due to vendoring, it is pretty likely that not all licenses are +# listed in _LICENSE. +$(2)_LICENSE += , vendored dependencies licenses probably not listed + +# Note: in all the steps below, we "cd" into the build directory to +# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the +# manifest-path. Indeed while the latter seems to work, it in fact +# breaks in subtle ways as the way cargo searches for its +# configuration file is based (among other rules) on the current +# directory. This means that if cargo is started outside of a package +# directory, its configuration file will not be taken into account. +# +# Also, we pass: +# * --offline to prevent cargo from downloading anything: all +# dependencies should have been built by the download post +# process logic +# * --locked to force cargo to use the Cargo.lock file, which ensures +# that a fixed set of dependency versions is used + +# +# Build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +ifeq ($(4),target) +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) \ + $$(TARGET_CONFIGURE_OPTS) \ + $$(PKG_CARGO_ENV) \ + $$($(2)_CARGO_ENV) \ + cargo build \ + --offline \ + --target $$(RUSTC_TARGET_NAME) \ + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ + --manifest-path Cargo.toml \ + --locked \ + -Z target-applies-to-host \ + $$($(2)_CARGO_BUILD_OPTS) +endef +else # ifeq ($(4),target) +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(HOST_MAKE_ENV) \ + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ + $$(HOST_CONFIGURE_OPTS) \ + $$(PKG_CARGO_ENV) \ + $$($(2)_CARGO_ENV) \ + cargo build \ + --offline \ + --release \ + --manifest-path Cargo.toml \ + --locked \ + $$($(2)_CARGO_BUILD_OPTS) +endef +endif # ifeq ($(4),target) +endif # ifndef $(2)_BUILD_CMDS + +# +# Target installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) \ + $$(TARGET_CONFIGURE_OPTS) \ + $$(PKG_CARGO_ENV) \ + $$($(2)_CARGO_ENV) \ + cargo install \ + --target $$(RUSTC_TARGET_NAME) \ + --offline \ + --root $$(TARGET_DIR)/usr/ \ + --bins \ + --path ./ \ + --force \ + --locked \ + -Z target-applies-to-host \ + $$($(2)_CARGO_INSTALL_OPTS) +endef +endif + +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + cd $$(@D) && \ + $$(HOST_MAKE_ENV) \ + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ + $$(HOST_CONFIGURE_OPTS) \ + $$(PKG_CARGO_ENV) \ + $$($(2)_CARGO_ENV) \ + cargo install \ + --offline \ + --root $$(HOST_DIR) \ + --bins \ + --path ./ \ + --force \ + --locked \ + $$($(2)_CARGO_INSTALL_OPTS) +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +################################################################################ +# cargo-package -- the target generator macro for Cargo packages +################################################################################ + +cargo-package = $(call inner-cargo-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) +host-cargo-package = $(call inner-cargo-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process new file mode 100755 index 0000000000..2d1c66661d --- /dev/null +++ b/support/download/cargo-post-process @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +set -e + +. "${0%/*}/helpers" + +while getopts "n:o:" OPT; do + case "${OPT}" in + o) output="${OPTARG}";; + n) base_name="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac +done + +# Already vendored tarball, nothing to do +if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then + exit 0 +fi + +post_process_unpack "${base_name}" "${output}" + +# Do the Cargo vendoring +pushd "${base_name}" > /dev/null +cargo vendor --locked VENDOR + +# Create the local .cargo/config with vendor info +mkdir -p .cargo/ +cat <.cargo/config +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "VENDOR" +EOF +popd > /dev/null + +post_process_repack "$(pwd)" "${base_name}" "${output}" From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] docs/manual/cargo: document the cargo-package infrastructure Message-ID: <20220108222949.6133583460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d5749d2de9f2d4b0681593fbe0d95096612a1c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Buildroot manual was already providing some details on how to integrate Cargo packages, and those details now need to be updated with a proper documentation for the cargo-package infrastructure, as well as updates related to vendoring support, which affects how dependencies are handled. In addition, now that we have vendoring support for Cargo packages, let's rewrite the dependency management section in a more accurate way. We drop the part about the local cache of the registry, because +CARGO_HOME+ in Buildroot points to $(HOST_DIR)/share/cargo, which is not shared between builds nor preserved accross builds, so its effect as a cache is limited. Signed-off-by: Patrick Havelange [Thomas: numerous updates and extensions.] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-cargo.txt | 104 +++++++++++++++------------------- 1 file changed, 45 insertions(+), 59 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index 8fcc80bcc6..5343fbd4e6 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -1,7 +1,7 @@ // -*- mode:doc; -*- // vim: set syntax=asciidoc: -=== Integration of Cargo-based packages +=== Infrastructure for Cargo-based packages Cargo is the package manager for the Rust programming language. It allows the user to build programs or libraries written in Rust, but it also downloads and @@ -10,7 +10,7 @@ called "crates". [[cargo-package-tutorial]] -==== Cargo-based package's +Config.in+ file +==== +cargo-package+ tutorial The +Config.in+ file of Cargo-based package 'foo' should contain: @@ -25,11 +25,7 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 08: http://foosoftware.org/foo/ --------------------------- -==== Cargo-based package's +.mk+ file - -Buildroot does not (yet) provide a dedicated package infrastructure for -Cargo-based packages. So, we will explain how to write a +.mk+ file for such a -package. Let's start with an example: +And the +.mk+ file for this package should contain: ------------------------------ 01: ################################################################################ @@ -44,66 +40,56 @@ package. Let's start with an example: 10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: -13: FOO_DEPENDENCIES = host-rustc -14: -15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo -16: -17: FOO_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(FOO_CARGO_MODE) -18: -19: FOO_CARGO_OPTS = \ -20: $(if $(BR2_ENABLE_DEBUG),,--release) \ -21: --target=$(RUSTC_TARGET_NAME) \ -22: --manifest-path=$(@D)/Cargo.toml -23: -24: define FOO_BUILD_CMDS -25: $(TARGET_MAKE_ENV) $(FOO_CARGO_ENV) \ -26: cargo build $(FOO_CARGO_OPTS) -27: endef -28: -29: define FOO_INSTALL_TARGET_CMDS -30: $(INSTALL) -D -m 0755 $(@D)/$(FOO_BIN_DIR)/foo \ -31: $(TARGET_DIR)/usr/bin/foo -32: endef -33: -34: $(eval $(generic-package)) +13: $(eval $(cargo-package)) -------------------------------- -The Makefile starts with the definition of the standard variables for package -declaration (lines 7 to 11). +The Makefile starts with the definition of the standard variables for +package declaration (lines 7 to 11). + +As seen in line 13, it is based on the +cargo-package+ +infrastructure. Cargo will be invoked automatically by this +infrastructure to build and install the package. + +It is still possible to define custom build commands or install +commands (i.e. with FOO_BUILD_CMDS and FOO_INSTALL_TARGET_CMDS). +Those will then replace the commands from the cargo infrastructure. + +==== +cargo-package+ reference -As seen in line 34, it is based on the -xref:generic-package-tutorial[+generic-package+ infrastructure]. So, it defines -the variables required by this particular infrastructure, where Cargo is -invoked: +The main macros for the Cargo package infrastructure are ++cargo-package+ for target packages and +host-cargo-package+ for host +packages. -* +FOO_BUILD_CMDS+: Cargo is invoked to perform the build. The options required - to configure the cross-compilation of the package are passed via - +FOO_CONF_OPTS+. +Just like the generic infrastructure, the Cargo infrastructure works +by defining a number of variables before calling the +cargo-package+ +or +host-cargo-package+ macros. -* +FOO_INSTALL_TARGET_CMDS+: The binary executable generated is installed on - the target. +First, all the package metadata information variables that exist in +the generic infrastructure also exist in the Cargo infrastructure: ++FOO_VERSION+, +FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, ++FOO_DEPENDENCIES+, +FOO_LICENSE+, +FOO_LICENSE_FILES+, etc. -In order to have Cargo available for the build, +FOO_DEPENDENCIES+ needs to -contain +host-cargo+. +A few additional variables, specific to the Cargo infrastructure, can +also be defined. Many of them are only useful in very specific cases, +typical packages will therefore only use a few of them. -To sum it up, to add a new Cargo-based package, the Makefile example can be -copied verbatim then edited to replace all occurences of +FOO+ with the -uppercase name of the new package and update the values of the standard -variables. +* +FOO_CARGO_ENV+ can be used to pass additional variables in the + environment of +cargo+ invocations. It used at both build and + installation time -==== About Dependencies Management +* +FOO_CARGO_BUILD_OPTS+ can be used to pass additional options to + +cargo+ at build time. -A crate can depend on other libraries from crates.io or git repositories, listed -in its Cargo.toml file. Before starting a build, Cargo usually downloads -automatically them. This step can also be performed independently, via the -+cargo fetch+ command. +* +FOO_CARGO_INSTALL_OPTS+ can be used to pass additional options to + +cargo+ at install time. -Cargo maintains a local cache of the registry index and of git checkouts of the -crates, whose location is given by +$CARGO_HOME+. As seen in the package -Makefile example at line 15, this environment variable is set to -+$(HOST_DIR)/share/cargo+. +A crate can depend on other libraries from crates.io or git +repositories, listed in its +Cargo.toml+ file. Buildroot automatically +takes care of downloading such dependencies as part of the download +step of packages that use the +cargo-package+ infrastructure. Such +dependencies are then kept together with the package source code in +the tarball cached in Buildroot's +DL_DIR+, and therefore the hash of +the package's tarball includes such dependencies. -This dependency download mechanism is not convenient when performing an offline -build, as Cargo will fail to fetch the dependencies. In that case, it is advised -to generate a tarball of the dependencies using the +cargo vendor+ and add it to -+FOO_EXTRA_DOWNLOADS+. +This mechanism ensures that any change in the dependencies will be +detected, and allows the build to be performed completely offline. From arnout at mind.be Sat Jan 8 22:37:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 23:37:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: <00e4f4ae-de7d-d159-c557-18a56b66b499@mind.be> On 08/01/2022 22:31, Norbert Lange wrote: > Am Sa., 8. Jan. 2022 um 20:04 Uhr schrieb James Hilliard > : >> >> On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange wrote: >>> >>> Systemd has very many options, adding a way for the user >>> to set custom options can help customizations >>> without changing buildroot files. >> >> I'm not sure this is a good idea, if a configuration option needs >> customizability it >> probably needs a specific kconfig option. Systemd config options tend to require >> dependency selection and special handling so this seems likely to cause >> spurious errors due to improper usage. Seems to be a pretty big footgun IMO. > > Sure, you are aware that many of my buildroot patches are stuck in limbo > since early 2020? Yes, due to various circumstances, maintainer time between Feb 2020 and May 2021 has been very limited, and nobody in the community stepped up to review patches. We finally have a hackaton again where we're processing the backlog and we're making good progress. But we're not going to be able to fully catch up, so unless someone reviews and acks your patches, or unless they're trivial, they're likely to still face long delays in the coming months. It doesn't help to get your patches in faster, but it does help the community in general if you do reviews. Another thing that may help you get patches merged is if you collect them in a series and repost the entire series when something changes. Ideally you also carry patches from other people in that series. This makes life easier for the maintainers because it shows that it the series makes the whole more cohesive. > Just doesnt seem feasible to timely fix everything and version bumps often leave > more untapped options. Some part of the necessity would be just being pragmatic. > > One example would be using the unified cgroups hierarchy > (-Ddefault-hierarchy=unified), hybrid is pretty much deprecated, > and some systemd features that buildroot allows to enable (OOMD for example) > wont work without it. That's still a fairly recent series :-) >> What systemd configure option would you want to be using that isn't >> currently able to be enabled? > > FYI those are the ones I currently use: > > -Ddefault-hierarchy=unified \ > -Dutmp=false \ > -Ddefault-dnssec=no \ > -Didn=false \ > -Denvironment-d=false \ > -Dxdg-autostart=false \ > -Ddns-over-tls=false \ > -Ddefault-llmnr=no \ > -Ddns-over-tls=false \ > -Ddefault-mdns=no \ > -Dlz4=false Except for the unified hierarchy, all of these look like they should have been added when systemd was bumped and the option was created... Regards, Arnout > > Norbert > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From romain.naour at smile.fr Sat Jan 8 22:37:31 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 23:37:31 +0100 Subject: [Buildroot] [PATCH-next 1/4] utils/checkpackagelib: add unit tests In-Reply-To: <20211205105318.2755542-1-ricardo.martincoski@gmail.com> References: <20211205105318.2755542-1-ricardo.martincoski@gmail.com> Message-ID: <30b13507-5744-de89-0e04-503e264bc1e5@smile.fr> Hello Ricardo, Le 05/12/2021 ? 11:53, Ricardo Martincoski a ?crit?: > So anyone willing to contribute to check-package can run all tests in > less than 1 second by using: > $ python3 -m pytest -v utils/checkpackagelib/ > > Most test cases are in the form: > @pytest.mark.parametrize('testname,filename,string,expected', function) > - testname: a short description of the scenario tested, added in order > to improve readability of the log when some tests fail > - filename: the filename the check-package function being tested thinks > it is testing > - string: the content of the file being sent to the function under test > - expect: all expected warnings that a given function from > check-package should generate for a given file named filename and > with string as its content. I spend some time to review this patch to find something to say :) Actually the test_lib_hash tests are not checking with the new spacing convention we want to use in .hash files. I applied this patch [1] after your series and some tests failed. I would recommand to use the new spacing convention by default in this testsuite. [1] http://patchwork.ozlabs.org/project/buildroot/patch/20200603081253.14319-1-heiko.thiery at gmail.com/ Best regards, Romain > > Signed-off-by: Ricardo Martincoski > Cc: Arnout Vandecappelle > --- > NOTICE there are 2 tests failing, see the fix in: > http://patchwork.ozlabs.org/project/buildroot/patch/20211115235336.3814968-1-ricardo.martincoski at gmail.com/ > > See a sample running in the GitLab CI: > without the fix: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/422862195 > with the fix: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/422862127 > > Example of a failure, showing enough information to track down the test > that fails: > |testname = 'immediate assignment inside conditional and unconditional override outside' > |filename = 'any.mk' > |string = 'VAR_1 = VALUE1\nifeq (condition)\nVAR_1 := $(VAR_1), VALUE2\nendif\nVAR_1 := $(VAR_1), VALUE2\n' > |expected = [['any.mk:3: immediate assignment to append to variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'], ['any.mk:5: unconditional override of variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n']] > | > | @pytest.mark.parametrize('testname,filename,string,expected', overridden_variable) > | def test_overridden_variable(testname, filename, string, expected): > | warnings = util.check_file(m.OverriddenVariable, filename, string) > |> assert warnings == expected > |E AssertionError: assert [['any.mk:3: ...), VALUE2\n']] == [['any.mk:3: i...), VALUE2\n']] > |E At index 0 diff: ['any.mk:3: conditional override of variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'] != ['any.mk:3: immediate assignment to append to variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'] > |E Full diff: > |E - [['any.mk:3: conditional override of variable VAR_1', > |E + [['any.mk:3: immediate assignment to append to variable VAR_1', > |E 'VAR_1 := $(VAR_1), VALUE2\n'], > |E ['any.mk:5: unconditional override of variable VAR_1', > |E 'VAR_1 := $(VAR_1), VALUE2\n']] > | > |utils/checkpackagelib/test_lib_mk.py:168: AssertionError > |===================== 2 failed, 180 passed in 0.79 seconds ===================== > --- > utils/checkpackagelib/test_lib.py | 212 ++++++++ > utils/checkpackagelib/test_lib_config.py | 387 +++++++++++++++ > utils/checkpackagelib/test_lib_hash.py | 137 ++++++ > utils/checkpackagelib/test_lib_mk.py | 590 +++++++++++++++++++++++ > utils/checkpackagelib/test_lib_patch.py | 96 ++++ > utils/checkpackagelib/test_util.py | 8 + > 6 files changed, 1430 insertions(+) > create mode 100644 utils/checkpackagelib/test_lib.py > create mode 100644 utils/checkpackagelib/test_lib_config.py > create mode 100644 utils/checkpackagelib/test_lib_hash.py > create mode 100644 utils/checkpackagelib/test_lib_mk.py > create mode 100644 utils/checkpackagelib/test_lib_patch.py > create mode 100644 utils/checkpackagelib/test_util.py > > diff --git a/utils/checkpackagelib/test_lib.py b/utils/checkpackagelib/test_lib.py > new file mode 100644 > index 0000000000..976a63d84d > --- /dev/null > +++ b/utils/checkpackagelib/test_lib.py > @@ -0,0 +1,212 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib as m > + > + > +ConsecutiveEmptyLines = [ > + ('1 line (no newline)', > + 'any', > + '', > + []), > + ('1 line', > + 'any', > + '\n', > + []), > + ('2 lines', > + 'any', > + '\n' > + '\n', > + [['any:2: consecutive empty lines']]), > + ('more than 2 consecutive', > + 'any', > + '\n' > + '\n' > + '\n', > + [['any:2: consecutive empty lines'], > + ['any:3: consecutive empty lines']]), > + ('ignore whitespace 1', > + 'any', > + '\n' > + ' ', > + [['any:2: consecutive empty lines']]), > + ('ignore whitespace 2', > + 'any', > + ' \n' > + '\t\n', > + [['any:2: consecutive empty lines']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', ConsecutiveEmptyLines) > +def test_ConsecutiveEmptyLines(testname, filename, string, expected): > + warnings = util.check_file(m.ConsecutiveEmptyLines, filename, string) > + assert warnings == expected > + > + > +EmptyLastLine = [ > + ('ignore empty file', > + 'any', > + '', > + []), > + ('empty line (newline)', > + 'any', > + '\n', > + [['any:1: empty line at end of file']]), > + ('empty line (space, newline)', > + 'any', > + ' \n', > + [['any:1: empty line at end of file']]), > + ('empty line (space, no newline)', > + 'any', > + ' ', > + [['any:1: empty line at end of file']]), > + ('warn for the last of 2', > + 'any', > + '\n' > + '\n', > + [['any:2: empty line at end of file']]), > + ('warn for the last of 3', > + 'any', > + '\n' > + '\n' > + '\n', > + [['any:3: empty line at end of file']]), > + ('ignore whitespace', > + 'any', > + ' \n' > + '\t\n', > + [['any:2: empty line at end of file']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', EmptyLastLine) > +def test_EmptyLastLine(testname, filename, string, expected): > + warnings = util.check_file(m.EmptyLastLine, filename, string) > + assert warnings == expected > + > + > +NewlineAtEof = [ > + ('good', > + 'any', > + 'text\n', > + []), > + ('text (bad)', > + 'any', > + '\n' > + 'text', > + [['any:2: missing newline at end of file', > + 'text']]), > + ('space (bad)', > + 'any', > + '\n' > + ' ', > + [['any:2: missing newline at end of file', > + ' ']]), > + ('tab (bad)', > + 'any', > + '\n' > + '\t', > + [['any:2: missing newline at end of file', > + '\t']]), > + ('even for file with one line', > + 'any', > + ' ', > + [['any:1: missing newline at end of file', > + ' ']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', NewlineAtEof) > +def test_NewlineAtEof(testname, filename, string, expected): > + warnings = util.check_file(m.NewlineAtEof, filename, string) > + assert warnings == expected > + > + > +TrailingSpace = [ > + ('good', > + 'any', > + 'text\n', > + []), > + ('ignore missing newline', > + 'any', > + '\n' > + 'text', > + []), > + ('spaces', > + 'any', > + 'text \n', > + [['any:1: line contains trailing whitespace', > + 'text \n']]), > + ('tabs after text', > + 'any', > + 'text\t\t\n', > + [['any:1: line contains trailing whitespace', > + 'text\t\t\n']]), > + ('mix of tabs and spaces', > + 'any', > + ' \n' > + ' ', > + [['any:1: line contains trailing whitespace', > + ' \n'], > + ['any:2: line contains trailing whitespace', > + ' ']]), > + ('blank line with tabs', > + 'any', > + '\n' > + '\t', > + [['any:2: line contains trailing whitespace', > + '\t']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', TrailingSpace) > +def test_TrailingSpace(testname, filename, string, expected): > + warnings = util.check_file(m.TrailingSpace, filename, string) > + assert warnings == expected > + > + > +Utf8Characters = [ > + ('usual', > + 'any', > + 'text\n', > + []), > + ('acceptable character', > + 'any', > + '\x60', > + []), > + ('unacceptable character', > + 'any', > + '\x81', > + [['any:1: line contains UTF-8 characters', > + '\x81']]), > + ('2 warnings', > + 'any', > + 'text\n' > + 'text \xc8 text\n' > + '\xc9\n', > + [['any:2: line contains UTF-8 characters', > + 'text \xc8 text\n'], > + ['any:3: line contains UTF-8 characters', > + '\xc9\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', Utf8Characters) > +def test_Utf8Characters(testname, filename, string, expected): > + warnings = util.check_file(m.Utf8Characters, filename, string) > + assert warnings == expected > + > + > +def test_all_check_functions_are_used(): > + import inspect > + import checkpackagelib.lib_config as lib_config > + import checkpackagelib.lib_hash as lib_hash > + import checkpackagelib.lib_mk as lib_mk > + import checkpackagelib.lib_patch as lib_patch > + c_config = [c[0] for c in inspect.getmembers(lib_config, inspect.isclass)] > + c_hash = [c[0] for c in inspect.getmembers(lib_hash, inspect.isclass)] > + c_mk = [c[0] for c in inspect.getmembers(lib_mk, inspect.isclass)] > + c_patch = [c[0] for c in inspect.getmembers(lib_patch, inspect.isclass)] > + c_all = c_config + c_hash + c_mk + c_patch > + c_common = [c[0] for c in inspect.getmembers(m, inspect.isclass)] > + assert set(c_common) <= set(c_all) > diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py > new file mode 100644 > index 0000000000..91a549adf2 > --- /dev/null > +++ b/utils/checkpackagelib/test_lib_config.py > @@ -0,0 +1,387 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib_config as m > + > + > +AttributesOrder = [ > + ('good example', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'default y\n' > + 'depends on BR2_USE_BAR # runtime\n' > + 'select BR2_PACKAGE_BAZ\n' > + 'help\n' > + '\t help text\n', > + []), > + ('depends before default', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'depends on BR2_USE_BAR\n' > + 'default y\n', > + [['any:4: attributes order: type, default, depends on, select, help (url#_config_files)', > + 'default y\n']]), > + ('select after help', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'help\n' > + '\t help text\n' > + 'select BR2_PACKAGE_BAZ\n', > + [['any:5: attributes order: type, default, depends on, select, help (url#_config_files)', > + 'select BR2_PACKAGE_BAZ\n']]), > + ('string', > + 'any', > + 'config BR2_PACKAGE_FOO_PLUGINS\n' > + 'string "foo plugins"\n' > + 'default "all"\n', > + []), > + ('ignore tabs', > + 'any', > + 'config\tBR2_PACKAGE_FOO_PLUGINS\n' > + 'default\t"all"\n' > + 'string\t"foo plugins"\n', > + [['any:3: attributes order: type, default, depends on, select, help (url#_config_files)', > + 'string\t"foo plugins"\n']]), > + ('choice', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'if BR2_PACKAGE_FOO\n' > + '\n' > + 'choice\n' > + 'prompt "type of foo"\n' > + 'default BR2_PACKAGE_FOO_STRING\n' > + '\n' > + 'config BR2_PACKAGE_FOO_NONE\n' > + 'bool "none"\n' > + '\n' > + 'config BR2_PACKAGE_FOO_STRING\n' > + 'bool "string"\n' > + '\n' > + 'endchoice\n' > + '\n' > + 'endif\n' > + '\n', > + []), > + ('type after default', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'if BR2_PACKAGE_FOO\n' > + '\n' > + 'choice\n' > + 'default BR2_PACKAGE_FOO_STRING\n' > + 'prompt "type of foo"\n', > + [['any:7: attributes order: type, default, depends on, select, help (url#_config_files)', > + 'prompt "type of foo"\n']]), > + ('menu', > + 'any', > + 'menuconfig BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'help\n' > + '\t help text\n' > + '\t help text\n' > + '\n' > + 'if BR2_PACKAGE_FOO\n' > + '\n' > + 'menu "foo plugins"\n' > + 'config BR2_PACKAGE_FOO_COUNTER\n' > + 'bool "counter"\n' > + '\n' > + 'endmenu\n' > + '\n' > + 'endif\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', AttributesOrder) > +def test_AttributesOrder(testname, filename, string, expected): > + warnings = util.check_file(m.AttributesOrder, filename, string) > + assert warnings == expected > + > + > +CommentsMenusPackagesOrder = [ > + ('top menu (good)', > + 'package/Config.in', > + 'menu "Target packages"\n' > + 'source "package/busybox/Config.in"\n' > + 'source "package/skeleton/Config.in"\n', > + []), > + ('top menu (bad)', > + 'package/Config.in', > + 'source "package/skeleton/Config.in"\n' > + 'source "package/busybox/Config.in"\n', > + [['package/Config.in:2: Packages in: The top level menu,\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: busybox', > + 'source "package/busybox/Config.in"\n']]), > + ('menu (bad)', > + 'package/Config.in', > + 'menu "Target packages"\n' > + 'source "package/skeleton/Config.in"\n' > + 'source "package/busybox/Config.in"\n', > + [['package/Config.in:3: Packages in: menu "Target packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: busybox', > + 'source "package/busybox/Config.in"\n']]), > + ('underscore (good)', > + 'package/Config.in.host', > + 'menu "Hardware handling"\n' > + 'menu "Firmware"\n' > + 'endmenu\n' > + 'source "package/usb_modeswitch/Config.in"\n' > + 'source "package/usbmount/Config.in"\n', > + []), > + ('underscore (bad)', > + 'package/Config.in.host', > + 'menu "Hardware handling"\n' > + 'menu "Firmware"\n' > + 'endmenu\n' > + 'source "package/usbmount/Config.in"\n' > + 'source "package/usb_modeswitch/Config.in"\n', > + [['package/Config.in.host:5: Packages in: menu "Hardware handling",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: usb_modeswitch', > + 'source "package/usb_modeswitch/Config.in"\n']]), > + ('ignore other files', > + 'any other file', > + 'menu "Hardware handling"\n' > + 'source "package/bbb/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + []), > + ('dash (bad)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/aAa/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + [['package/Config.in:3: Packages in: menu "packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: a-a', > + 'source "package/a-a/Config.in"\n']]), > + ('underscore (bad)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/aAa/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + [['package/Config.in:4: Packages in: menu "packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: a_a', > + 'source "package/a_a/Config.in"\n']]), > + ('digit (bad)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/aAa/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + [['package/Config.in:5: Packages in: menu "packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: a1a', > + 'source "package/a1a/Config.in"\n']]), > + ('capitals (bad)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/aaa/Config.in"\n' > + 'source "package/aAa/Config.in"\n', > + [['package/Config.in:6: Packages in: menu "packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: aAa', > + 'source "package/aAa/Config.in"\n']]), > + ('digits, capitals, underscore (good)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/aAa/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + []), > + ('conditional menu (good)', > + 'package/Config.in', > + 'menu "Other"\n' > + 'source "package/linux-pam/Config.in"\n' > + 'if BR2_PACKAGE_LINUX_PAM\n' > + 'comment "linux-pam plugins"\n' > + 'source "package/libpam-radius-auth/Config.in"\n' > + 'source "package/libpam-tacplus/Config.in"\n' > + 'endif\n' > + 'source "package/liquid-dsp/Config.in"\n', > + []), > + ('conditional menu (bad)', > + 'package/Config.in', > + 'menu "Other"\n' > + 'source "package/linux-pam/Config.in"\n' > + 'if BR2_PACKAGE_LINUX_PAM\n' > + 'comment "linux-pam plugins"\n' > + 'source "package/libpam-tacplus/Config.in"\n' > + 'source "package/libpam-radius-auth/Config.in"\n' > + 'endif\n' > + 'source "package/liquid-dsp/Config.in"\n', > + [['package/Config.in:6: Packages in: comment "linux-pam plugins",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: libpam-radius-auth', > + 'source "package/libpam-radius-auth/Config.in"\n']]), > + ('no conditional (bad)', > + 'package/Config.in', > + 'menu "Other"\n' > + 'source "package/linux-pam/Config.in"\n' > + 'source "package/libpam-radius-auth/Config.in"\n' > + 'source "package/libpam-tacplus/Config.in"\n' > + 'source "package/liquid-dsp/Config.in"\n', > + [['package/Config.in:3: Packages in: menu "Other",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: libpam-radius-auth', > + 'source "package/libpam-radius-auth/Config.in"\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', CommentsMenusPackagesOrder) > +def test_CommentsMenusPackagesOrder(testname, filename, string, expected): > + warnings = util.check_file(m.CommentsMenusPackagesOrder, filename, string) > + assert warnings == expected > + > + > +HelpText = [ > + ('single line', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'default y\n' > + 'depends on BR2_USE_BAR # runtime\n' > + 'select BR2_PACKAGE_BAZ\n' > + 'help\n' > + '\t help text\n', > + []), > + ('larger than 72', > + 'any', > + 'help\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 123\n' > + '\t help text\n', > + [['any:3: help text: <2 spaces><62 chars> (url#writing-rules-config-in)', > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 123\n', > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12']]), > + ('long url at beginning of line', > + 'any', > + 'help\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' > + '\t http://url.that.is.longer.than.seventy.two.characthers/folder_name\n' > + '\t https://url.that.is.longer.than.seventy.two.characthers/folder_name\n' > + '\t git://url.that.is.longer.than.seventy.two.characthers/folder_name\n', > + []), > + ('long url not at beginning of line', > + 'any', > + 'help\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' > + '\t refer to http://url.that.is.longer.than.seventy.two.characthers/folder_name\n' > + '\n' > + '\t http://url.that.is.longer.than.seventy.two.characthers/folder_name\n', > + [['any:3: help text: <2 spaces><62 chars> (url#writing-rules-config-in)', > + '\t refer to http://url.that.is.longer.than.seventy.two.characthers/folder_name\n', > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12']]), > + ('allow beautified items', > + 'any', > + 'help\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' > + '\t summary:\n' > + '\t - enable that config\n' > + '\t - built it\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', HelpText) > +def test_HelpText(testname, filename, string, expected): > + warnings = util.check_file(m.HelpText, filename, string) > + assert warnings == expected > + > + > +Indent = [ > + ('good example', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + '\tbool "foo"\n' > + '\tdefault y\n' > + '\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n' > + '\tdepends on BR2_INSTALL_LIBSTDCPP\n' > + '# very useful comment\n' > + '\tselect BR2_PACKAGE_BAZ\n' > + '\thelp\n' > + '\t help text\n' > + '\n' > + 'comment "foo needs toolchain w/ C++, threads"\n' > + '\tdepends on !BR2_INSTALL_LIBSTDCPP || \\\n' > + '\t\t!BR2_TOOLCHAIN_HAS_THREADS\n' > + '\n' > + 'source "package/foo/bar/Config.in"\n', > + []), > + ('spaces', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + ' bool "foo"\n', > + [['any:2: should be indented with one tab (url#_config_files)', > + ' bool "foo"\n']]), > + ('without indent', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'default y\n', > + [['any:2: should be indented with one tab (url#_config_files)', > + 'default y\n']]), > + ('too much tabs', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + '\t\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n', > + [['any:2: should be indented with one tab (url#_config_files)', > + '\t\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n']]), > + ('help', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + ' help\n', > + [['any:2: should be indented with one tab (url#_config_files)', > + ' help\n']]), > + ('continuation line', > + 'any', > + 'comment "foo needs toolchain w/ C++, threads"\n' > + '\tdepends on !BR2_INSTALL_LIBSTDCPP || \\\n' > + ' !BR2_TOOLCHAIN_HAS_THREADS\n', > + [['any:3: continuation line should be indented using tabs', > + ' !BR2_TOOLCHAIN_HAS_THREADS\n']]), > + ('comment with tabs', > + 'any', > + '\tcomment "foo needs toolchain w/ C++, threads"\n', > + [['any:1: should not be indented', > + '\tcomment "foo needs toolchain w/ C++, threads"\n']]), > + ('comment with spaces', > + 'any', > + ' comment "foo needs toolchain w/ C++, threads"\n', > + [['any:1: should not be indented', > + ' comment "foo needs toolchain w/ C++, threads"\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', Indent) > +def test_Indent(testname, filename, string, expected): > + warnings = util.check_file(m.Indent, filename, string) > + assert warnings == expected > diff --git a/utils/checkpackagelib/test_lib_hash.py b/utils/checkpackagelib/test_lib_hash.py > new file mode 100644 > index 0000000000..c160a394e9 > --- /dev/null > +++ b/utils/checkpackagelib/test_lib_hash.py > @@ -0,0 +1,137 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib_hash as m > + > + > +HashNumberOfFields = [ > + ('empty file', > + 'any', > + '', > + []), > + ('empty line', > + 'any', > + '\n', > + []), > + ('ignore whitespace', > + 'any', > + '\t\n', > + []), > + ('ignore comments', > + 'any', > + '# text\n', > + []), > + ('1 field', > + 'any', > + 'field1\n', > + [['any:1: expected three fields (url#adding-packages-hash)', > + 'field1\n']]), > + ('2 fields', > + 'any', > + 'field1 field2\n', > + [['any:1: expected three fields (url#adding-packages-hash)', > + 'field1 field2\n']]), > + ('4 fields', > + 'any', > + 'field1 field2 field3 field4\n', > + [['any:1: expected three fields (url#adding-packages-hash)', > + 'field1 field2 field3 field4\n']]), > + ('with 1 space', > + 'any', > + 'field1 field2 field3\n', > + []), > + ('many spaces', > + 'any', > + ' field1 field2 field3\n', > + []), > + ('tabs', > + 'any', > + 'field1\tfield2\tfield3\n', > + []), > + ('mix of tabs and spaces', > + 'any', > + '\tfield1\t field2\t field3 \n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', HashNumberOfFields) > +def test_HashNumberOfFields(testname, filename, string, expected): > + warnings = util.check_file(m.HashNumberOfFields, filename, string) > + assert warnings == expected > + > + > +HashType = [ > + ('ignore empty files', > + 'any', > + '', > + []), > + ('ignore 1 field', > + 'any', > + 'text\n', > + []), > + ('wrong type', > + 'any', > + 'text text\n', > + [['any:1: unexpected type of hash (url#adding-packages-hash)', > + 'text text\n']]), > + ('none', > + 'any', > + 'none text\n', > + []), > + ('md5 (good)', > + 'any', > + 'md5 12345678901234567890123456789012\n', > + []), > + ('md5 (short)', > + 'any', > + 'md5 123456\n', > + [['any:1: hash size does not match type (url#adding-packages-hash)', > + 'md5 123456\n', > + 'expected 32 hex digits']]), > + ('ignore space before', > + 'any', > + ' md5 12345678901234567890123456789012\n', > + []), > + ('2 spaces', > + 'any', > + 'md5 12345678901234567890123456789012\n', > + []), > + ('ignore tabs', > + 'any', > + 'md5\t12345678901234567890123456789012\n', > + []), > + ('common typo', > + 'any', > + 'md5sum 12345678901234567890123456789012\n', > + [['any:1: unexpected type of hash (url#adding-packages-hash)', > + 'md5sum 12345678901234567890123456789012\n']]), > + ('md5 (too long)', > + 'any', > + 'md5 123456789012345678901234567890123\n', > + [['any:1: hash size does not match type (url#adding-packages-hash)', > + 'md5 123456789012345678901234567890123\n', > + 'expected 32 hex digits']]), > + ('sha1 (good)', > + 'any', > + 'sha1 1234567890123456789012345678901234567890\n', > + []), > + ('sha256', > + 'any', > + 'sha256 1234567890123456789012345678901234567890123456789012345678901234\n', > + []), > + ('sha384', > + 'any', > + 'sha384 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456\n', > + []), > + ('sha512', > + 'any', > + 'sha512 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678' > + '9012345678\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', HashType) > +def test_HashType(testname, filename, string, expected): > + warnings = util.check_file(m.HashType, filename, string) > + assert warnings == expected > diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py > new file mode 100644 > index 0000000000..49fa216fcd > --- /dev/null > +++ b/utils/checkpackagelib/test_lib_mk.py > @@ -0,0 +1,590 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib_mk as m > + > + > +Indent = [ > + ('ignore comment at beginning of line', > + 'any', > + '# very useful comment\n', > + []), > + ('ignore comment at end of line', > + 'any', > + ' # very useful comment\n', > + []), > + ('do not indent on conditional (good)', > + 'any', > + 'ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)\n' > + 'FOO_CONF_OPTS += something\n' > + 'endef\n', > + []), > + ('do not indent on conditional (bad)', > + 'any', > + 'ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)\n' > + '\tFOO_CONF_OPTS += something\n' > + 'endef\n', > + [['any:2: unexpected indent with tabs', > + '\tFOO_CONF_OPTS += something\n']]), > + ('indent after line that ends in backslash (good)', > + 'any', > + 'FOO_CONF_OPTS += \\\n' > + '\tsomething\n', > + []), > + ('indent after line that ends in backslash (bad)', > + 'any', > + 'FOO_CONF_OPTS += \\\n' > + 'something\n', > + [['any:2: expected indent with tabs', > + 'something\n']]), > + ('indent after 2 lines that ends in backslash (good)', > + 'any', > + 'FOO_CONF_OPTS += \\\n' > + '\tsomething \\\n' > + '\tsomething_else\n', > + []), > + ('indent after 2 lines that ends in backslash (bad)', > + 'any', > + 'FOO_CONF_OPTS += \\\n' > + '\tsomething \\\n' > + '\tsomething_else \\\n' > + 'FOO_CONF_OPTS += another_thing\n', > + [['any:4: expected indent with tabs', > + 'FOO_CONF_OPTS += another_thing\n']]), > + ('indent inside define (good)', > + 'any', > + 'define FOO_SOMETHING\n' > + '\tcommand\n' > + '\tcommand \\\n' > + '\t\targuments\n' > + 'endef\n' > + 'FOO_POST_PATCH_HOOKS += FOO_SOMETHING\n', > + []), > + ('indent inside define (bad, no indent)', > + 'any', > + 'define FOO_SOMETHING\n' > + 'command\n' > + 'endef\n', > + [['any:2: expected indent with tabs', > + 'command\n']]), > + ('indent inside define (bad, spaces)', > + 'any', > + 'define FOO_SOMETHING\n' > + ' command\n' > + 'endef\n', > + [['any:2: expected indent with tabs', > + ' command\n']]), > + ('indent make target (good)', > + 'any', > + 'make_target:\n' > + '\tcommand\n' > + '\n', > + []), > + ('indent make target (bad)', > + 'any', > + 'make_target:\n' > + ' command\n' > + '\n', > + [['any:2: expected indent with tabs', > + ' command\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', Indent) > +def test_Indent(testname, filename, string, expected): > + warnings = util.check_file(m.Indent, filename, string) > + assert warnings == expected > + > + > +OverriddenVariable = [ > + ('simple assignment', > + 'any.mk', > + 'VAR_1 = VALUE1\n', > + []), > + ('unconditional override (variable without underscore)', > + 'any.mk', > + 'VAR1 = VALUE1\n' > + 'VAR1 = VALUE1\n', > + [['any.mk:2: unconditional override of variable VAR1', > + 'VAR1 = VALUE1\n']]), > + ('unconditional override (variable with underscore, same value)', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 = VALUE1\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 = VALUE1\n']]), > + ('unconditional override (variable with underscore, different value)', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 = VALUE2\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 = VALUE2\n']]), > + ('warn for unconditional override even with wrong number of spaces', > + 'any.mk', > + 'VAR_1= VALUE1\n' > + 'VAR_1 =VALUE2\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 =VALUE2\n']]), > + ('warn for := override', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 := VALUE2\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 := VALUE2\n']]), > + ('append values outside conditional (good)', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 += VALUE2\n', > + []), > + ('append values outside conditional (bad)', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 := $(VAR_1), VALUE2\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 := $(VAR_1), VALUE2\n']]), > + ('immediate assignment inside conditional', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'ifeq (condition)\n' > + 'VAR_1 := $(VAR_1), VALUE2\n', > + [['any.mk:3: immediate assignment to append to variable VAR_1', > + 'VAR_1 := $(VAR_1), VALUE2\n']]), > + ('immediate assignment inside conditional and unconditional override outside', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'ifeq (condition)\n' > + 'VAR_1 := $(VAR_1), VALUE2\n' > + 'endif\n' > + 'VAR_1 := $(VAR_1), VALUE2\n', > + [['any.mk:3: immediate assignment to append to variable VAR_1', > + 'VAR_1 := $(VAR_1), VALUE2\n'], > + ['any.mk:5: unconditional override of variable VAR_1', > + 'VAR_1 := $(VAR_1), VALUE2\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', OverriddenVariable) > +def test_OverriddenVariable(testname, filename, string, expected): > + warnings = util.check_file(m.OverriddenVariable, filename, string) > + assert warnings == expected > + > + > +PackageHeader = [ > + ('first line (good)', > + 'any', > + 80 * '#' + '\n', > + []), > + ('first line (bad)', > + 'any', > + '# very useful comment\n', > + [['any:1: should be 80 hashes (url#writing-rules-mk)', > + '# very useful comment\n', > + 80 * '#']]), > + ('second line (bad)', > + 'any', > + 80 * '#' + '\n' > + '# package\n', > + [['any:2: should be 1 hash (url#writing-rules-mk)', > + '# package\n']]), > + ('full header (good)', > + 'any', > + 80 * '#' + '\n' > + '#\n' > + '# package\n' > + '#\n' + > + 80 * '#' + '\n' > + '\n', > + []), > + ('blank line after header (good)', > + 'any', > + 80 * '#' + '\n' > + '#\n' > + '# package\n' > + '#\n' + > + 80 * '#' + '\n' > + '\n' > + 'FOO_VERSION = 1\n', > + []), > + ('blank line after header (bad)', > + 'any', > + 80 * '#' + '\n' > + '#\n' > + '# package\n' > + '#\n' + > + 80 * '#' + '\n' > + 'FOO_VERSION = 1\n', > + [['any:6: should be a blank line (url#writing-rules-mk)', > + 'FOO_VERSION = 1\n']]), > + ('wrong number of hashes', > + 'any', > + 79 * '#' + '\n' > + '#\n' > + '# package\n' > + '#\n' + > + 81 * '#' + '\n' > + '\n', > + [['any:1: should be 80 hashes (url#writing-rules-mk)', > + 79 * '#' + '\n', > + 80 * '#'], > + ['any:5: should be 80 hashes (url#writing-rules-mk)', > + 81 * '#' + '\n', > + 80 * '#']]), > + ('allow include without header', > + 'any', > + 'include $(sort $(wildcard package/foo/*/*.mk))\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', PackageHeader) > +def test_PackageHeader(testname, filename, string, expected): > + warnings = util.check_file(m.PackageHeader, filename, string) > + assert warnings == expected > + > + > +RemoveDefaultPackageSourceVariable = [ > + ('bad', > + 'any.mk', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', > + [['any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), > + ('bad with path', > + './any.mk', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', > + [['./any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), > + ('warn for correct line', > + './any.mk', > + '\n' > + '\n' > + '\n' > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', > + [['./any.mk:4: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), > + ('warn ignoring missing spaces', > + './any.mk', > + 'ANY_SOURCE=any-$(ANY_VERSION).tar.gz\n', > + [['./any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'ANY_SOURCE=any-$(ANY_VERSION).tar.gz\n']]), > + ('good', > + './any.mk', > + 'ANY_SOURCE = aNy-$(ANY_VERSION).tar.gz\n', > + []), > + ('gcc exception', > + 'gcc.mk', > + 'GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz\n', > + []), > + ('binutils exception', > + './binutils.mk', > + 'BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz\n', > + []), > + ('gdb exception', > + 'gdb/gdb.mk', > + 'GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz\n', > + []), > + ('package name with dash', > + 'python-subprocess32.mk', > + 'PYTHON_SUBPROCESS32_SOURCE = python-subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz\n', > + [['python-subprocess32.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'PYTHON_SUBPROCESS32_SOURCE = python-subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', RemoveDefaultPackageSourceVariable) > +def test_RemoveDefaultPackageSourceVariable(testname, filename, string, expected): > + warnings = util.check_file(m.RemoveDefaultPackageSourceVariable, filename, string) > + assert warnings == expected > + > + > +SpaceBeforeBackslash = [ > + ('no backslash', > + 'any.mk', > + '\n', > + []), > + ('ignore missing indent', > + 'any.mk', > + 'define ANY_SOME_FIXUP\n' > + 'for i in $$(find $(STAGING_DIR)/usr/lib* -name "any*.la"); do \\\n', > + []), > + ('ignore missing space', > + 'any.mk', > + 'ANY_CONF_ENV= \\\n' > + '\tap_cv_void_ptr_lt_long=no \\\n', > + []), > + ('variable', > + 'any.mk', > + '\n' > + 'ANY = \\\n', > + []), > + ('2 spaces', > + 'any.mk', > + 'ANY = \\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY = \\\n']]), > + ('warn about correct line', > + 'any.mk', > + '\n' > + 'ANY = \\\n', > + [['any.mk:2: use only one space before backslash', > + 'ANY = \\\n']]), > + ('tab', > + 'any.mk', > + 'ANY =\t\\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY =\t\\\n']]), > + ('tabs', > + 'any.mk', > + 'ANY =\t\t\\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY =\t\t\\\n']]), > + ('spaces and tabs', > + 'any.mk', > + 'ANY = \t\t\\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY = \t\t\\\n']]), > + ('mixed spaces and tabs 1', > + 'any.mk', > + 'ANY = \t \t\\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY = \t \t\\\n']]), > + ('mixed spaces and tabs 2', > + 'any.mk', > + 'ANY = \t \\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY = \t \\\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', SpaceBeforeBackslash) > +def test_SpaceBeforeBackslash(testname, filename, string, expected): > + warnings = util.check_file(m.SpaceBeforeBackslash, filename, string) > + assert warnings == expected > + > + > +TrailingBackslash = [ > + ('no backslash', > + 'any.mk', > + 'ANY = \n', > + []), > + ('one line', > + 'any.mk', > + 'ANY = \\\n', > + []), > + ('2 lines', > + 'any.mk', > + 'ANY = \\\n' > + '\\\n', > + []), > + ('empty line after', > + 'any.mk', > + 'ANY = \\\n' > + '\n', > + [['any.mk:1: remove trailing backslash', > + 'ANY = \\\n']]), > + ('line with spaces after', > + 'any.mk', > + 'ANY = \\\n' > + ' \n', > + [['any.mk:1: remove trailing backslash', > + 'ANY = \\\n']]), > + ('line with tabs after', > + 'any.mk', > + 'ANY = \\\n' > + '\t\n', > + [['any.mk:1: remove trailing backslash', > + 'ANY = \\\n']]), > + ('ignore if commented', > + 'any.mk', > + '# ANY = \\\n' > + '\n', > + []), > + ('real example', > + 'any.mk', > + 'ANY_CONF_ENV= \t\\\n' > + '\tap_cv_void_ptr_lt_long=no \\\n' > + '\n', > + [['any.mk:2: remove trailing backslash', > + '\tap_cv_void_ptr_lt_long=no \\\n']]), > + ('ignore whitespace 1', > + 'any.mk', > + 'ANY = \t\t\\\n', > + []), > + ('ignore whitespace 2', > + 'any.mk', > + 'ANY = \t \t\\\n', > + []), > + ('ignore whitespace 3', > + 'any.mk', > + 'ANY = \t \\\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', TrailingBackslash) > +def test_TrailingBackslash(testname, filename, string, expected): > + warnings = util.check_file(m.TrailingBackslash, filename, string) > + assert warnings == expected > + > + > +TypoInPackageVariable = [ > + ('good', > + 'any.mk', > + 'ANY_VAR = \n', > + []), > + ('good with path 1', > + './any.mk', > + 'ANY_VAR += \n', > + []), > + ('good with path 2', > + 'any/any.mk', > + 'ANY_VAR = \n', > + []), > + ('bad =', > + 'any.mk', > + 'OTHER_VAR = \n', > + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', > + 'OTHER_VAR = \n']]), > + ('bad +=', > + 'any.mk', > + 'OTHER_VAR += \n', > + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', > + 'OTHER_VAR += \n']]), > + ('ignore missing space', > + 'any.mk', > + 'OTHER_VAR= \n', > + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', > + 'OTHER_VAR= \n']]), > + ('use path in the warning', > + './any.mk', > + 'OTHER_VAR = \n', > + [['./any.mk:1: possible typo: OTHER_VAR -> *ANY*', > + 'OTHER_VAR = \n']]), > + ('another name', > + 'other.mk', > + 'ANY_VAR = \n', > + [['other.mk:1: possible typo: ANY_VAR -> *OTHER*', > + 'ANY_VAR = \n']]), > + ('libc exception', > + './any.mk', > + 'BR_LIBC = \n', > + []), > + ('rootfs exception', > + 'any.mk', > + 'ROOTFS_ANY_VAR += \n', > + []), > + ('host (good)', > + 'any.mk', > + 'HOST_ANY_VAR += \n', > + []), > + ('host (bad)', > + 'any.mk', > + 'HOST_OTHER_VAR = \n', > + [['any.mk:1: possible typo: HOST_OTHER_VAR -> *ANY*', > + 'HOST_OTHER_VAR = \n']]), > + ('provides', > + 'any.mk', > + 'ANY_PROVIDES = other thing\n' > + 'OTHER_VAR = \n', > + []), > + ('ignore space', > + 'any.mk', > + 'ANY_PROVIDES = thing other \n' > + 'OTHER_VAR = \n', > + []), > + ('wrong provides', > + 'any.mk', > + 'ANY_PROVIDES = other\n' > + 'OTHERS_VAR = \n', > + [['any.mk:2: possible typo: OTHERS_VAR -> *ANY*', > + 'OTHERS_VAR = \n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', TypoInPackageVariable) > +def test_TypoInPackageVariable(testname, filename, string, expected): > + warnings = util.check_file(m.TypoInPackageVariable, filename, string) > + assert warnings == expected > + > + > +UselessFlag = [ > + ('autoreconf no', > + 'any.mk', > + 'ANY_AUTORECONF=NO\n', > + [['any.mk:1: useless default value (url#_infrastructure_for_autotools_based_packages)', > + 'ANY_AUTORECONF=NO\n']]), > + ('host autoreconf no', > + 'any.mk', > + 'HOST_ANY_AUTORECONF\n', > + []), > + ('autoreconf yes', > + 'any.mk', > + 'ANY_AUTORECONF=YES\n', > + []), > + ('libtool_patch yes', > + 'any.mk', > + 'ANY_LIBTOOL_PATCH\t= YES\n', > + [['any.mk:1: useless default value (url#_infrastructure_for_autotools_based_packages)', > + 'ANY_LIBTOOL_PATCH\t= YES\n']]), > + ('libtool_patch no', > + 'any.mk', > + 'ANY_LIBTOOL_PATCH= \t NO\n', > + []), > + ('generic', > + 'any.mk', > + 'ANY_INSTALL_IMAGES = NO\n' > + 'ANY_INSTALL_REDISTRIBUTE = YES\n' > + 'ANY_INSTALL_STAGING = NO\n' > + 'ANY_INSTALL_TARGET = YES\n', > + [['any.mk:1: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_IMAGES = NO\n'], > + ['any.mk:2: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_REDISTRIBUTE = YES\n'], > + ['any.mk:3: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_STAGING = NO\n'], > + ['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_TARGET = YES\n']]), > + ('conditional', > + 'any.mk', > + 'ifneq (condition)\n' > + 'ANY_INSTALL_IMAGES = NO\n' > + 'endif\n' > + 'ANY_INSTALL_REDISTRIBUTE = YES\n', > + [['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_REDISTRIBUTE = YES\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', UselessFlag) > +def test_UselessFlag(testname, filename, string, expected): > + warnings = util.check_file(m.UselessFlag, filename, string) > + assert warnings == expected > + > + > +VariableWithBraces = [ > + ('good', > + 'xmlstarlet.mk', > + 'XMLSTARLET_CONF_OPTS += \\\n' > + '\t--with-libxml-prefix=$(STAGING_DIR)/usr \\\n', > + []), > + ('bad', > + 'xmlstarlet.mk', > + 'XMLSTARLET_CONF_OPTS += \\\n' > + '\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n', > + [['xmlstarlet.mk:2: use $() to delimit variables, not ${}', > + '\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n']]), > + ('expanded by the shell', > + 'sg3_utils.mk', > + '\tfor prog in xcopy zone; do \\\n' > + '\t\t$(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \\\n' > + '\tdone\n', > + []), > + ('comments', > + 'any.mk', > + '#\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', VariableWithBraces) > +def test_VariableWithBraces(testname, filename, string, expected): > + warnings = util.check_file(m.VariableWithBraces, filename, string) > + assert warnings == expected > diff --git a/utils/checkpackagelib/test_lib_patch.py b/utils/checkpackagelib/test_lib_patch.py > new file mode 100644 > index 0000000000..3b6fadf38c > --- /dev/null > +++ b/utils/checkpackagelib/test_lib_patch.py > @@ -0,0 +1,96 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib_patch as m > + > + > +ApplyOrder = [ > + ('standard', # catches https://bugs.busybox.net/show_bug.cgi?id=11271 > + '0001-description.patch', > + '', > + []), > + ('standard with path', > + 'path/0001-description.patch', > + '', > + []), > + ('acceptable format', > + '1-description.patch', > + '', > + []), > + ('acceptable format with path', > + 'path/1-description.patch', > + '', > + []), > + ('old format', > + 'package-0001-description.patch', > + '', > + [['package-0001-description.patch:0: use name -.patch (url#_providing_patches)']]), > + ('old format with path', > + 'path/package-0001-description.patch', > + '', > + [['path/package-0001-description.patch:0: use name -.patch (url#_providing_patches)']]), > + ('missing number', > + 'description.patch', > + '', > + [['description.patch:0: use name -.patch (url#_providing_patches)']]), > + ('missing number with path', > + 'path/description.patch', > + '', > + [['path/description.patch:0: use name -.patch (url#_providing_patches)']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', ApplyOrder) > +def test_ApplyOrder(testname, filename, string, expected): > + warnings = util.check_file(m.ApplyOrder, filename, string) > + assert warnings == expected > + > + > +NumberedSubject = [ > + ('no subject', > + 'patch', > + '', > + []), > + ('acceptable because it is not a git patch', > + 'patch', > + 'Subject: [PATCH 24/105] text\n', > + []), > + ('good', > + 'patch', > + 'Subject: [PATCH] text\n' > + 'diff --git a/configure.ac b/configure.ac\n', > + []), > + ('bad', > + 'patch', > + 'Subject: [PATCH 24/105] text\n' > + 'diff --git a/configure.ac b/configure.ac\n', > + [["patch:1: generate your patches with 'git format-patch -N'", > + 'Subject: [PATCH 24/105] text\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', NumberedSubject) > +def test_NumberedSubject(testname, filename, string, expected): > + warnings = util.check_file(m.NumberedSubject, filename, string) > + assert warnings == expected > + > + > +Sob = [ > + ('good', > + 'patch', > + 'Signed-off-by: John Doe \n', > + []), > + ('empty', > + 'patch', > + '', > + [['patch:0: missing Signed-off-by in the header (url#_format_and_licensing_of_the_package_patches)']]), > + ('bad', > + 'patch', > + 'Subject: [PATCH 24/105] text\n', > + [['patch:0: missing Signed-off-by in the header (url#_format_and_licensing_of_the_package_patches)']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', Sob) > +def test_Sob(testname, filename, string, expected): > + warnings = util.check_file(m.Sob, filename, string) > + assert warnings == expected > diff --git a/utils/checkpackagelib/test_util.py b/utils/checkpackagelib/test_util.py > new file mode 100644 > index 0000000000..23f2995e27 > --- /dev/null > +++ b/utils/checkpackagelib/test_util.py > @@ -0,0 +1,8 @@ > +def check_file(check_function, filename, string): > + obj = check_function(filename, 'url') > + result = [] > + result.append(obj.before()) > + for i, line in enumerate(string.splitlines(True)): > + result.append(obj.check_line(i + 1, line)) > + result.append(obj.after()) > + return [r for r in result if r is not None] > From arnout at mind.be Sat Jan 8 22:38:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 23:38:29 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: References: <20201126144745.502228-1-nolange79@gmail.com> Message-ID: <6025dff1-66cb-f56e-21ad-41042efc5517@mind.be> On 08/01/2022 22:46, Norbert Lange wrote: > Am Sa., 8. Jan. 2022 um 20:41 Uhr schrieb Arnout Vandecappelle : >> >> Hi Norbert, >> >> On 26/11/2020 15:47, Norbert Lange wrote: >>> journald supports catalog files, or rather a binary database of >>> those. >>> Functionality added includes: >>> >>> - A config option allows enabling the binary database. >>> >>> - if the option is enabled, the database is built and moved to >>> /usr/share/factory. A symlink is created in /var pointing to >>> that file. >>> If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the >>> language whitelist are deleted first. >>> >>> - the service normally used for creating the DB during boot, >>> and the catalog source files used as input are deleted. >>> >>> The move to /usr/share/factory is helpful for having /usr as whole >>> system distribution. >>> >>> Signed-off-by: Norbert Lange >> >> I was going to apply a second time, but then I noticed that I made some >> comments on v2 [1] that you haven't answered to and I still think they're valid. >> So I've marked this patch as Changes Requested. > > I did reply and cover the comments in [2], not sure whats missing? > Separating into 2 independent patches is not really helpfull IMHO. Oops, you're right. I'll look at the patch again tomorrow morning. Regards, Arnout > >> >> If you respin, please also include in the commit message the additional >> explanations you made in reply to Romain. >> >> Regards, >> Arnout >> >> [1] https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ >> >> >>> --- >>> v1->v2: >>> - Moved all logic into systemd.mk >>> - solved the LOCALE_PURGE order that way >>> - use the factory to store the file >>> - option to enable the DB (similar to udev HWDB) >>> - cant be anabled with !ROOTFS_RW, tons of >>> issues with that one >>> v2->v3: >>> - use backticks instead of $$() >>> - be more explicit about what happens in >>> SYSTEMD_LOCALE_PURGE_CATALOGS >>> >>> Signed-off-by: Norbert Lange >>> --- >>> package/systemd/Config.in | 14 +++++++++++++ >>> package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ >>> 2 files changed, 55 insertions(+) >>> >>> diff --git a/package/systemd/Config.in b/package/systemd/Config.in >>> index ec34478e3d..d576e6035b 100644 >>> --- a/package/systemd/Config.in >>> +++ b/package/systemd/Config.in >>> @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD >>> >>> http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands >>> >>> +config BR2_PACKAGE_SYSTEMD_CATALOGDB >>> + bool "enable journal catalog database installation" >>> + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic >>> + help >>> + Build and install the journal catalog database. >>> + >>> + catalog files are used to provide extended and potentially localized >>> + messages for the journal. >>> + >>> + The original catalog files will be built into a DB at >>> + /usr/share/factory/var/lib/systemd/catalog/database. >>> + >>> + https://www.freedesktop.org/wiki/Software/systemd/catalog/ >>> + >>> config BR2_PACKAGE_SYSTEMD_LOCALED >>> bool "enable locale daemon" >>> help >>> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >>> index cb12f667d6..ae99c02abf 100644 >>> --- a/package/systemd/systemd.mk >>> +++ b/package/systemd/systemd.mk >>> @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD >>> $(SYSTEMD_INSTALL_NETWORK_CONFS) >>> endef >>> >>> +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) >>> +define SYSTEMD_LOCALE_PURGE_CATALOGS >>> + # go through all files with scheme ..catalog >>> + # and remove those where is not in LOCALE_NOPURGE >>> + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ >>> + do \ >>> + basename=$${cfile##*/}; \ >>> + basename=$${basename%.catalog}; \ >>> + langext=$${basename#*.}; \ >>> + [ "$$langext" = "$${basename}" ] && continue; \ >>> + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ >>> + rm -f "$$cfile"; \ >>> + done >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS >>> +endif >>> + >>> +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) >>> +define SYSTEMD_UPDATE_CATALOGS >>> + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog >>> + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ >>> + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database >>> + rm $(TARGET_DIR)/var/lib/systemd/catalog/database >>> + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ >>> + $(TARGET_DIR)/var/lib/systemd/catalog/database >>> + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ >>> + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS >>> +endif >>> + >>> +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>> + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ >>> + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ >>> + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>> + >>> define SYSTEMD_PRESET_ALL >>> $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all >>> endef >>> > > Norbert > > [2] - https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ > From fontaine.fabrice at gmail.com Sat Jan 8 22:38:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:38:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/libmd: new package Message-ID: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> This library provides message digest functions found on BSD systems either on their libc (NetBSD, OpenBSD) or libmd (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking on others like GNU systems. https://www.hadrons.org/software/libmd/ Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/libmd/Config.in | 9 +++++++++ package/libmd/libmd.hash | 5 +++++ package/libmd/libmd.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/libmd/Config.in create mode 100644 package/libmd/libmd.hash create mode 100644 package/libmd/libmd.mk diff --git a/DEVELOPERS b/DEVELOPERS index cb06de820d..c1ccab966c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -899,6 +899,7 @@ F: package/libidn2/ F: package/libjpeg/ F: package/liblockfile/ F: package/libmatroska/ +F: package/libmd/ F: package/libmpdclient/ F: package/libnetfilter_conntrack/ F: package/libnetfilter_queue/ diff --git a/package/Config.in b/package/Config.in index ad542ac8bc..d8ee96a588 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1412,6 +1412,7 @@ menu "Crypto" source "package/libgpgme/Config.in" source "package/libkcapi/Config.in" source "package/libksba/Config.in" + source "package/libmd/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libolm/Config.in" diff --git a/package/libmd/Config.in b/package/libmd/Config.in new file mode 100644 index 0000000000..63139ad69b --- /dev/null +++ b/package/libmd/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBMD + bool "libmd" + help + This library provides message digest functions found on BSD + systems either on their libc (NetBSD, OpenBSD) or libmd + (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking + on others like GNU systems. + + https://www.hadrons.org/software/libmd/ diff --git a/package/libmd/libmd.hash b/package/libmd/libmd.hash new file mode 100644 index 0000000000..1a3c9d80df --- /dev/null +++ b/package/libmd/libmd.hash @@ -0,0 +1,5 @@ +# From https://lists.freedesktop.org/archives/libbsd/2021-October/000311.html +sha512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3 libmd-1.0.4.tar.xz + +# Hash for license file +sha256 4365ef6255ad553fce69dd4bc0e093472c5d0e41b8ea493a545cc926ce171aa6 COPYING diff --git a/package/libmd/libmd.mk b/package/libmd/libmd.mk new file mode 100644 index 0000000000..19a2458982 --- /dev/null +++ b/package/libmd/libmd.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libmd +# +################################################################################ + +LIBMD_VERSION = 1.0.4 +LIBMD_SOURCE = libmd-$(LIBMD_VERSION).tar.xz +LIBMD_SITE = https://archive.hadrons.org/software/libmd +LIBMD_LICENSE = BSD-2-Clause, BSD-3-Clause, Beerware, ISC, Public Domain +LIBMD_LICENSE_FILES = COPYING +LIBMD_INSTALL_STAGING = YES + +$(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 22:38:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:38:29 +0100 Subject: [Buildroot] [PATCH 2/2] package/libbsd: bump to version 0.11.3 In-Reply-To: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> References: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> Message-ID: <20220108223829.3701891-2-fontaine.fabrice@gmail.com> - Update indentation in hash file (two spaces) - Update hash of COPYING: - files added and year updated with https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/01f0d1ea1e71f1018a009ebd9203dd48e6d90c45 https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/37a9b56c05339301510213c41fc507ea31cc2464 https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/d54ceb37ce9d7c04fa450a6638eaee31375bbde1 - files removed with https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/847e682f8de452d5f0038458f06ae68ae3959b3a - libmmd is a mandatory dependency since version 0.11 and https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/847e682f8de452d5f0038458f06ae68ae3959b3a https://lists.freedesktop.org/archives/libbsd/2021-February/000298.html https://lists.freedesktop.org/archives/libbsd/2021-February/000302.html https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html Signed-off-by: Fabrice Fontaine --- package/libbsd/Config.in | 1 + package/libbsd/libbsd.hash | 6 +++--- package/libbsd/libbsd.mk | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index 845a22162b..093a2e646c 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_LIBBSD depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBMD help This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 95887bd607..17bb32e01c 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,3 +1,3 @@ -# From https://lists.freedesktop.org/archives/libbsd/2019-August/000229.html -sha256 34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887 libbsd-0.10.0.tar.xz -sha256 933d14a6bc89ee1fd7adbf5b6ec97f6ff0e002549d0b0c164f8a8895371d78f8 COPYING +# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html +sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz +sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 256a75f15e..86df8a97a2 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBSD_VERSION = 0.10.0 +LIBBSD_VERSION = 0.11.3 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = https://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ @@ -12,5 +12,6 @@ LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ LIBBSD_LICENSE_FILES = COPYING LIBBSD_CPE_ID_VENDOR = freedesktop LIBBSD_INSTALL_STAGING = YES +LIBBSD_DEPENDENCIES = libmd $(eval $(autotools-package)) -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Jan 8 22:39:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:39:56 +0100 Subject: [Buildroot] [PATCH v3 00/11] Support for Cargo and Go vendoring In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220108233956.3f145631@windsurf> Hello, On Thu, 6 Jan 2022 21:59:48 +0100 Thomas Petazzoni wrote: > Christian Stewart via buildroot (2): > package/embiggen-disk: new package > package/gocryptfs: new package > > Patrick Havelange (3): > package/pkg-cargo.mk: introduce the cargo package infrastructure > docs/manual/cargo: document the cargo-package infrastructure > package/ripgrep: convert to cargo infrastructure > > Thomas Petazzoni (6): > support/download/dl-wrapper: add concept of download post-processing > package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable > support/download/post-process-helpers: add helper function for post > process scripts > package/pkg-golang.mk: implement Go vendoring support > package/sentry-cli: re-add package > package/tinifier: new package So, this series has been applied, with some additional tweaks based on your feedback + review from Yann and Arnout. Here are the things that have *not* yet been taken into account, and left for future work: * We still use "cargo install" even though that causes rebuilds with some packages. Either we switch to a manual installation, or we "wait" for some better solution from cargo maintainers. * We don't use environment variables for everything, and some flags are passed through a cargo config file, which is not ideal. * We only support cargo/go packages that use .tar.gz tarballs, because the repacking with mk_tar_gz assumes .tar.gz is used. These 3 limitations have been captured in the TODO list at https://elinux.org/Buildroot#Core_Buildroot_infrastructure. Patches welcome to implement these things of course, but we wanted to get the initial infrastructure in place and merged, so that we can build on top of it. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Sat Jan 8 22:43:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:43:36 +0100 Subject: [Buildroot] [PATCH 1/2] package/minizip: add minizip-zlib support Message-ID: <20220108224337.3702128-1-fontaine.fabrice@gmail.com> Add a virtual package to allow the user to select the minizip provider: - the current minizip (which has been renamed minizip-ng since https://github.com/zlib-ng/minizip-ng/commit/db95894646b87f6178ceaa389cbdb5b1ba8cd97a) - the 'legacy' minizip provided by zlib which is still widely supported by various opensource packages such as domoticz There is no need to add entries in Config.legacy as the previous options are kept and the default provider of minizip is minizip-ng. Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 2 + .../minizip-ng.hash} | 2 +- package/minizip-ng/minizip-ng.mk | 76 +++++++++++++++++++ package/minizip-zlib/minizip-zlib.hash | 4 + package/minizip-zlib/minizip-zlib.mk | 24 ++++++ package/minizip/Config.in | 40 +++++++++- package/minizip/minizip.mk | 69 +---------------- 7 files changed, 144 insertions(+), 73 deletions(-) rename package/{minizip/minizip.hash => minizip-ng/minizip-ng.hash} (82%) create mode 100644 package/minizip-ng/minizip-ng.mk create mode 100644 package/minizip-zlib/minizip-zlib.hash create mode 100644 package/minizip-zlib/minizip-zlib.mk diff --git a/DEVELOPERS b/DEVELOPERS index bbbb47f6ac..47a3d4bfe0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -922,6 +922,8 @@ F: package/mbedtls/ F: package/mbedtls3/ F: package/minissdpd/ F: package/minizip/ +F: package/minizip-ng/ +F: package/minizip-zlib/ F: package/mongodb/ F: package/motion/ F: package/mutt/ diff --git a/package/minizip/minizip.hash b/package/minizip-ng/minizip-ng.hash similarity index 82% rename from package/minizip/minizip.hash rename to package/minizip-ng/minizip-ng.hash index 3e87e64dae..f866363c93 100644 --- a/package/minizip/minizip.hash +++ b/package/minizip-ng/minizip-ng.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2ab219f651901a337a7d3c268128711b80330a99ea36bdc528c76b591a624c3c minizip-3.0.4.tar.gz +sha256 2ab219f651901a337a7d3c268128711b80330a99ea36bdc528c76b591a624c3c minizip-ng-3.0.4.tar.gz sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE diff --git a/package/minizip-ng/minizip-ng.mk b/package/minizip-ng/minizip-ng.mk new file mode 100644 index 0000000000..ec3903d226 --- /dev/null +++ b/package/minizip-ng/minizip-ng.mk @@ -0,0 +1,76 @@ +################################################################################ +# +# minizip-ng +# +################################################################################ + +MINIZIP_NG_VERSION = 3.0.4 +MINIZIP_NG_SITE = $(call github,zlib-ng,minizip-ng,$(MINIZIP_NG_VERSION)) +MINIZIP_NG_LICENSE = Zlib +MINIZIP_NG_LICENSE_FILES = LICENSE +MINIZIP_NG_CPE_ID_VENDOR = minizip_project +MINIZIP_NG_CPE_ID_PRODUCT = minizip +MINIZIP_NG_INSTALL_STAGING = YES +MINIZIP_NG_PROVIDES = minizip +MINIZIP_NG_DEPENDENCIES = host-pkgconf +MINIZIP_NG_CONF_OPTS = \ + $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \ + -DMZ_COMPAT=OFF \ + -DMZ_FETCH_LIBS=OFF + +ifeq ($(BR2_PACKAGE_BZIP2),y) +MINIZIP_NG_DEPENDENCIES += bzip2 +MINIZIP_NG_CONF_OPTS += -DMZ_BZIP2=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_BZIP2=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +MINIZIP_NG_DEPENDENCIES += libiconv +MINIZIP_NG_CONF_OPTS += -DMZ_ICONV=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_ICONV=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBBSD),y) +MINIZIP_NG_DEPENDENCIES += libbsd +MINIZIP_NG_CONF_OPTS += -DMZ_LIBBSD=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_LIBBSD=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MINIZIP_NG_DEPENDENCIES += openssl +MINIZIP_NG_CONF_OPTS += \ + -DMZ_OPENSSL=ON \ + -DMZ_PKCRYPT=ON \ + -DMZ_WZAES=ON +else +MINIZIP_NG_CONF_OPTS += \ + -DMZ_OPENSSL=OFF \ + -DMZ_PKCRYPT=OFF \ + -DMZ_WZAES=OFF +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +MINIZIP_NG_DEPENDENCIES += xz +MINIZIP_NG_CONF_OPTS += -DMZ_LZMA=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_LZMA=OFF +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +MINIZIP_NG_DEPENDENCIES += zlib +MINIZIP_NG_CONF_OPTS += -DMZ_ZLIB=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_ZLIB=OFF +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +MINIZIP_NG_DEPENDENCIES += zstd +MINIZIP_NG_CONF_OPTS += -DMZ_ZSTD=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_ZSTD=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/minizip-zlib/minizip-zlib.hash b/package/minizip-zlib/minizip-zlib.hash new file mode 100644 index 0000000000..4d2c5c29d3 --- /dev/null +++ b/package/minizip-zlib/minizip-zlib.hash @@ -0,0 +1,4 @@ +# From http://www.zlib.net/ +sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +# License files, locally calculated +sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README diff --git a/package/minizip-zlib/minizip-zlib.mk b/package/minizip-zlib/minizip-zlib.mk new file mode 100644 index 0000000000..67d4e31f41 --- /dev/null +++ b/package/minizip-zlib/minizip-zlib.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# minizip-zlib +# +################################################################################ + +MINIZIP_ZLIB_VERSION = 1.2.11 +MINIZIP_ZLIB_SOURCE = zlib-$(MINIZIP_ZLIB_VERSION).tar.xz +MINIZIP_ZLIB_SITE = http://www.zlib.net +MINIZIP_ZLIB_LICENSE = Zlib +MINIZIP_ZLIB_LICENSE_FILES = README +MINIZIP_ZLIB_INSTALL_STAGING = YES +MINIZIP_ZLIB_PROVIDES = minizip +MINIZIP_ZLIB_SUBDIR = contrib/minizip +MINIZIP_ZLIB_AUTORECONF = YES +MINIZIP_ZLIB_DEPENDENCIES = zlib + +ifeq ($(BR2_PACKAGE_MINIZIP_DEMOS),y) +MINIZIP_ZLIB_CONF_OPTS += --enable-demos +else +MINIZIP_ZLIB_CONF_OPTS += --disable-demos +endif + +$(eval $(autotools-package)) diff --git a/package/minizip/Config.in b/package/minizip/Config.in index e4d185d9d7..b88091e809 100644 --- a/package/minizip/Config.in +++ b/package/minizip/Config.in @@ -1,13 +1,38 @@ config BR2_PACKAGE_MINIZIP - bool "minizip" + bool "minizip support" + help + Select the desired minizip provider. + +if BR2_PACKAGE_MINIZIP + +choice + prompt "minizip variant" + default BR2_PACKAGE_MINIZIP_NG + help + Select the desired minizip provider. + +config BR2_PACKAGE_MINIZIP_NG + bool "minizip-ng" depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_HAS_MINIZIP help Enables to extract files from a .zip archive file. It is compatible with PKZip 2.04g, WinZip, InfoZip, MimarSinan Codex Suite 2002 tools, and compatible sofware. - https://github.com/nmoinvaz/minizip + https://github.com/zlib-ng/minizip-ng + +config BR2_PACKAGE_MINIZIP_ZLIB + bool "minizip-zlib" + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_HAS_MINIZIP + help + Legacy minizip provided in contrib/minizip of zlib. + + https://www.winimage.com/zLibDll/minizip.html + +endchoice config BR2_PACKAGE_MINIZIP_DEMOS bool "minizip" @@ -15,5 +40,12 @@ config BR2_PACKAGE_MINIZIP_DEMOS help Enable minizip binary tool. -comment "minizip needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +config BR2_PACKAGE_HAS_MINIZIP + bool + +config BR2_PACKAGE_PROVIDES_MINIZIP + string + default "minizip-zlib" if BR2_PACKAGE_MINIZIP_ZLIB + default "minizip-ng" if BR2_PACKAGE_MINIZIP_NG + +endif diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 07f67c1354..95f1a17156 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -4,71 +4,4 @@ # ################################################################################ -MINIZIP_VERSION = 3.0.4 -MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = host-pkgconf -MINIZIP_INSTALL_STAGING = YES -MINIZIP_CONF_OPTS = \ - $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \ - -DMZ_COMPAT=OFF \ - -DMZ_FETCH_LIBS=OFF -MINIZIP_LICENSE = Zlib -MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project - -ifeq ($(BR2_PACKAGE_BZIP2),y) -MINIZIP_DEPENDENCIES += bzip2 -MINIZIP_CONF_OPTS += -DMZ_BZIP2=ON -else -MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -MINIZIP_DEPENDENCIES += libiconv -MINIZIP_CONF_OPTS += -DMZ_ICONV=ON -else -MINIZIP_CONF_OPTS += -DMZ_ICONV=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBBSD),y) -MINIZIP_DEPENDENCIES += libbsd -MINIZIP_CONF_OPTS += -DMZ_LIBBSD=ON -else -MINIZIP_CONF_OPTS += -DMZ_LIBBSD=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MINIZIP_DEPENDENCIES += openssl -MINIZIP_CONF_OPTS += \ - -DMZ_OPENSSL=ON \ - -DMZ_PKCRYPT=ON \ - -DMZ_WZAES=ON -else -MINIZIP_CONF_OPTS += \ - -DMZ_OPENSSL=OFF \ - -DMZ_PKCRYPT=OFF \ - -DMZ_WZAES=OFF -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -MINIZIP_DEPENDENCIES += xz -MINIZIP_CONF_OPTS += -DMZ_LZMA=ON -else -MINIZIP_CONF_OPTS += -DMZ_LZMA=OFF -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -MINIZIP_DEPENDENCIES += zlib -MINIZIP_CONF_OPTS += -DMZ_ZLIB=ON -else -MINIZIP_CONF_OPTS += -DMZ_ZLIB=OFF -endif - -ifeq ($(BR2_PACKAGE_ZSTD),y) -MINIZIP_DEPENDENCIES += zstd -MINIZIP_CONF_OPTS += -DMZ_ZSTD=ON -else -MINIZIP_CONF_OPTS += -DMZ_ZSTD=OFF -endif - -$(eval $(cmake-package)) +$(eval $(virtual-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 22:43:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:43:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/domoticz: depends on minizip-zlib In-Reply-To: <20220108224337.3702128-1-fontaine.fabrice@gmail.com> References: <20220108224337.3702128-1-fontaine.fabrice@gmail.com> Message-ID: <20220108224337.3702128-2-fontaine.fabrice@gmail.com> Depends on minizip-zlib and so drop git submodules Signed-off-by: Fabrice Fontaine --- package/domoticz/Config.in | 4 ++++ package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 4324d13cee..fa7fd546fa 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_DOMOTICZ depends on BR2_PACKAGE_LUA_5_3 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_PACKAGE_MINIZIP_ZLIB select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME @@ -43,3 +44,6 @@ comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 6, NPTL, wchar, d comment "domoticz needs exception_ptr" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +comment "domoticz needs minizip-zlib" + depends on !BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index dcd5bead1e..2c6c837e64 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d8e99e0f96873aa105b57f73656ef7a14c89e0acf2649b2d4ef1167b14bab4b2 domoticz-2021.1-br1.tar.gz +sha256 c4dc3455edae8bf00d2e950002f70d5b90ac577b1559ef7ada6870d970069fbb domoticz-2021.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index f142791830..0d1088d395 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -5,9 +5,7 @@ ################################################################################ DOMOTICZ_VERSION = 2021.1 -DOMOTICZ_SITE = https://github.com/domoticz/domoticz -DOMOTICZ_SITE_METHOD = git -DOMOTICZ_GIT_SUBMODULES = YES +DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt DOMOTICZ_CPE_ID_VENDOR = domoticz @@ -19,6 +17,7 @@ DOMOTICZ_DEPENDENCIES = \ jsoncpp \ libcurl \ lua \ + minizip \ mosquitto \ openssl \ sqlite \ @@ -34,10 +33,11 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_OPENSSL_STATIC=OFF # Do not use any built-in libraries which are enabled by default for -# jsoncpp, fmt, sqlite and mqtt +# jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ -DUSE_BUILTIN_LIBFMT=OFF \ + -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF -- 2.34.1 From peter at korsgaard.com Sat Jan 8 22:47:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 23:47:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/janus-gateway: bump to version 0.11.6 In-Reply-To: <20220108221707.3626671-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 23:17:07 +0100") References: <20220108221707.3626671-1-fontaine.fabrice@gmail.com> Message-ID: <87czl1etfw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Add upstream status (rejected) to first and second patches > - Drop third patch (already in version) > https://github.com/meetecho/janus-gateway/blob/v0.11.6/CHANGELOG.md > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 22:42:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 23:42:08 +0100 Subject: [Buildroot] [git commit] package/janus-gateway: bump to version 0.11.6 Message-ID: <20220108224114.84A4D807EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65b351fc9b7d70c96a0efc96182685899c5b9111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Add upstream status (rejected) to first and second patches - Drop third patch (already in version) https://github.com/meetecho/janus-gateway/blob/v0.11.6/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/janus-gateway/0001-disable-ssp.patch | 2 + ...002-Add-test-for-Wunused-but-set-variable.patch | 2 + ...ross-site-Scripting-XSS-exploits-in-demos.patch | 357 --------------------- ...tch => 0003-Fixed-missing-XSS-mitigation.patch} | 0 package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 7 +- 6 files changed, 7 insertions(+), 363 deletions(-) diff --git a/package/janus-gateway/0001-disable-ssp.patch b/package/janus-gateway/0001-disable-ssp.patch index 22f7f1a417..0c9b006ed9 100644 --- a/package/janus-gateway/0001-disable-ssp.patch +++ b/package/janus-gateway/0001-disable-ssp.patch @@ -12,6 +12,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[Upstream status: rejected +(https://github.com/meetecho/janus-gateway/pull/1801)] --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index b54c8cbec6..2dfcc76d68 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -18,6 +18,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[Upstream status: rejected +(https://github.com/meetecho/janus-gateway/pull/1789)] --- Makefile.am | 1 + configure.ac | 6 ++- diff --git a/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch b/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch deleted file mode 100644 index 9f3adfcc8e..0000000000 --- a/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch +++ /dev/null @@ -1,357 +0,0 @@ -From ba166e9adebfe5343f826c6a9e02299d35414ffd Mon Sep 17 00:00:00 2001 -From: Lorenzo Miniero -Date: Thu, 25 Nov 2021 17:20:53 +0100 -Subject: [PATCH] Fix potential Cross-site Scripting (XSS) exploits in demos - (#2817) - -[Retrieved (and backported) from: -https://github.com/meetecho/janus-gateway/commit/ba166e9adebfe5343f826c6a9e02299d35414ffd] -Signed-off-by: Fabrice Fontaine ---- - html/audiobridgetest.js | 17 +++++++++++++---- - html/recordplaytest.js | 13 +++++++++++-- - html/screensharingtest.js | 11 ++++++++++- - html/streamingtest.js | 13 +++++++++++-- - html/textroomtest.js | 23 ++++++++++++++--------- - html/videocalltest.js | 15 ++++++++++++--- - html/videoroomtest.js | 13 +++++++++++-- - html/vp9svctest.js | 13 +++++++++++-- - 8 files changed, 93 insertions(+), 25 deletions(-) - -diff --git a/html/audiobridgetest.js b/html/audiobridgetest.js -index 18e1cc1839..f757789708 100644 ---- a/html/audiobridgetest.js -+++ b/html/audiobridgetest.js -@@ -178,7 +178,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -222,7 +222,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -267,7 +267,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -429,7 +429,7 @@ function registerUsername() { - return; - } - var register = { request: "join", room: myroom, display: username }; -- myusername = username; -+ myusername = escapeXmlTags(username); - mixertest.send({ message: register}); - } - } -@@ -448,3 +448,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/recordplaytest.js b/html/recordplaytest.js -index 74ee7bed95..52b5ccbc4c 100644 ---- a/html/recordplaytest.js -+++ b/html/recordplaytest.js -@@ -423,11 +423,11 @@ function updateRecsList() { - Janus.debug("Got a list of available recordings:", list); - for(var mp in list) { - Janus.debug(" >> [" + list[mp]["id"] + "] " + list[mp]["name"] + " (" + list[mp]["date"] + ")"); -- $('#recslist').append("
  • " + list[mp]["name"] + " [" + list[mp]["date"] + "]" + "
    • "); -+ $('#recslist').append("
  • " + escapeXmlTags(list[mp]["name"]) + " [" + list[mp]["date"] + "]" + "
    • "); - } - $('#recslist a').unbind('click').click(function() { - selectedRecording = $(this).attr("id"); -- selectedRecordingInfo = $(this).text(); -+ selectedRecordingInfo = escapeXmlTags($(this).text()); - $('#recset').html($(this).html()).parent().removeClass('open'); - $('#play').removeAttr('disabled').click(startPlayout); - return false; -@@ -545,3 +545,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/screensharingtest.js b/html/screensharingtest.js -index 61eac70f43..c64d8dbd67 100644 ---- a/html/screensharingtest.js -+++ b/html/screensharingtest.js -@@ -161,7 +161,7 @@ $(document).ready(function() { - if(event === "joined") { - myid = msg["id"]; - $('#session').html(room); -- $('#title').html(msg["description"]); -+ $('#title').html(escapeXmlTags(msg["description"])); - Janus.log("Successfully joined room " + msg["room"] + " with ID " + myid); - if(role === "publisher") { - // This is our session, publish our stream -@@ -514,3 +514,12 @@ function newRemoteFeed(id, display) { - } - }); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/streamingtest.js b/html/streamingtest.js -index 7dd2e1f681..3f9937f11c 100644 ---- a/html/streamingtest.js -+++ b/html/streamingtest.js -@@ -323,7 +323,7 @@ function updateStreamsList() { - Janus.debug(list); - for(var mp in list) { - Janus.debug(" >> [" + list[mp]["id"] + "] " + list[mp]["description"] + " (" + list[mp]["type"] + ")"); -- $('#streamslist').append("
  • " + list[mp]["description"] + " (" + list[mp]["type"] + ")" + "
    • "); -+ $('#streamslist').append("
  • " + escapeXmlTags(list[mp]["description"]) + " (" + list[mp]["type"] + ")" + "
    • "); - } - $('#streamslist a').unbind('click').click(function() { - selectedStream = $(this).attr("id"); -@@ -345,7 +345,7 @@ function getStreamInfo() { - var body = { request: "info", id: parseInt(selectedStream) || selectedStream }; - streaming.send({ message: body, success: function(result) { - if(result && result.info && result.info.metadata) { -- $('#metadata').html(result.info.metadata); -+ $('#metadata').html(escapeXmlTags(result.info.metadata)); - $('#info').removeClass('hide').show(); - } - }}); -@@ -394,6 +394,15 @@ function stopStream() { - simulcastStarted = false; - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons() { - $('#curres').parent().append( -diff --git a/html/textroomtest.js b/html/textroomtest.js -index 082ae44905..3d0697e35a 100644 ---- a/html/textroomtest.js -+++ b/html/textroomtest.js -@@ -153,9 +153,7 @@ $(document).ready(function() { - var what = json["textroom"]; - if(what === "message") { - // Incoming message: public or private? -- var msg = json["text"]; -- msg = msg.replace(new RegExp('<', 'g'), '<'); -- msg = msg.replace(new RegExp('>', 'g'), '>'); -+ var msg = escapeXmlTags(json["text"]); - var from = json["from"]; - var dateString = getDateString(json["date"]); - var whisper = json["whisper"]; -@@ -170,9 +168,7 @@ $(document).ready(function() { - } - } else if(what === "announcement") { - // Room announcement -- var msg = json["text"]; -- msg = msg.replace(new RegExp('<', 'g'), '<'); -- msg = msg.replace(new RegExp('>', 'g'), '>'); -+ var msg = escapeXmlTags(json["text"]); - var dateString = getDateString(json["date"]); - $('#chatroom').append('

    [' + dateString + '] ' + msg + ''); - $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; -@@ -180,7 +176,7 @@ $(document).ready(function() { - // Somebody joined - var username = json["username"]; - var display = json["display"]; -- participants[username] = display ? display : username; -+ participants[username] = escapeXmlTags(display ? display : username); - if(username !== myid && $('#rp' + username).length === 0) { - // Add to the participants list - $('#list').append('

  • ' + participants[username] + '
    • '); -@@ -282,7 +278,7 @@ function registerUsername() { - username: myid, - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - transactions[transaction] = function(response) { - if(response["textroom"] === "error") { - // Something went wrong -@@ -312,7 +308,7 @@ function registerUsername() { - if(response.participants && response.participants.length > 0) { - for(var i in response.participants) { - var p = response.participants[i]; -- participants[p.username] = p.display ? p.display : p.username; -+ participants[p.username] = escapeXmlTags(p.display ? p.display : p.username); - if(p.username !== myid && $('#rp' + p.username).length === 0) { - // Add to the participants list - $('#list').append('
  • ' + participants[p.username] + '
    • '); -@@ -418,3 +414,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/videocalltest.js b/html/videocalltest.js -index d1c1ab8d07..18ccbc2c47 100644 ---- a/html/videocalltest.js -+++ b/html/videocalltest.js -@@ -148,7 +148,7 @@ $(document).ready(function() { - } else if(result["event"]) { - var event = result["event"]; - if(event === 'registered') { -- myusername = result["username"]; -+ myusername = escapeXmlTags(result["username"]); - Janus.log("Successfully registered as " + myusername + "!"); - $('#youok').removeClass('hide').show().html("Registered as '" + myusername + "'"); - // Get a list of available peers, just for fun -@@ -163,7 +163,7 @@ $(document).ready(function() { - bootbox.alert("Waiting for the peer to answer..."); - } else if(event === 'incomingcall') { - Janus.log("Incoming call from " + result["username"] + "!"); -- yourusername = result["username"]; -+ yourusername = escapeXmlTags(result["username"]); - // Notify user - bootbox.hideAll(); - incoming = bootbox.dialog({ -@@ -213,7 +213,7 @@ $(document).ready(function() { - }); - } else if(event === 'accepted') { - bootbox.hideAll(); -- var peer = result["username"]; -+ var peer = escapeXmlTags(result["username"]); - if(!peer) { - Janus.log("Call started!"); - } else { -@@ -598,6 +598,15 @@ function getQueryStringValue(name) { - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons(temporal) { - $('#curres').parent().append( -diff --git a/html/videoroomtest.js b/html/videoroomtest.js -index 6a566891d8..5a3ade9be9 100644 ---- a/html/videoroomtest.js -+++ b/html/videoroomtest.js -@@ -400,7 +400,7 @@ function registerUsername() { - ptype: "publisher", - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - sfutest.send({ message: register }); - } - } -@@ -530,7 +530,7 @@ function newRemoteFeed(id, display, audio, video) { - } - } - remoteFeed.rfid = msg["id"]; -- remoteFeed.rfdisplay = msg["display"]; -+ remoteFeed.rfdisplay = escapeXmlTags(msg["display"]); - if(!remoteFeed.spinner) { - var target = document.getElementById('videoremote'+remoteFeed.rfindex); - remoteFeed.spinner = new Spinner({top:100}).spin(target); -@@ -685,6 +685,15 @@ function getQueryStringValue(name) { - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons(feed, temporal) { - var index = feed; -diff --git a/html/vp9svctest.js b/html/vp9svctest.js -index eca0239c32..b22ccf3340 100644 ---- a/html/vp9svctest.js -+++ b/html/vp9svctest.js -@@ -387,7 +387,7 @@ function registerUsername() { - ptype: "publisher", - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - sfutest.send({ message: register }); - } - } -@@ -486,7 +486,7 @@ function newRemoteFeed(id, display, audio, video) { - } - } - remoteFeed.rfid = msg["id"]; -- remoteFeed.rfdisplay = msg["display"]; -+ remoteFeed.rfdisplay = escapeXmlTags(msg["display"]); - if(!remoteFeed.spinner) { - var target = document.getElementById('videoremote'+remoteFeed.rfindex); - remoteFeed.spinner = new Spinner({top:100}).spin(target); -@@ -630,6 +630,15 @@ function newRemoteFeed(id, display, audio, video) { - }); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create SVC-related UI for a new viewer - function addSvcButtons(feed) { - var index = feed; diff --git a/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch similarity index 100% rename from package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch rename to package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 83afc72c98..7aec3d2aa3 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 21e2fc7dee4b20ed8d749a69577eccd961b0bfe5b863d42f39ddfcd2af903718 janus-gateway-0.10.10.tar.gz +sha256 b5fe70d95b9288200df15d5f75cb8eb6db66484c6ded159422a81e880ecb7104 janus-gateway-0.11.6.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 83d28ff6c7..84ca0bc116 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,17 +4,14 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 0.10.10 +JANUS_GATEWAY_VERSION = 0.11.6 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING JANUS_GATEWAY_CPE_ID_VENDOR = meetecho JANUS_GATEWAY_CPE_ID_PRODUCT = janus -# 0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch -JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4020 - -# 0004-Fixed-missing-XSS-mitigation.patch +# 0003-Fixed-missing-XSS-mitigation.patch JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 # ding-libs provides the ini_config library From peter at korsgaard.com Sat Jan 8 22:53:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 23:53:28 +0100 Subject: [Buildroot] [git commit] package/snort: bump to version 2.9.19 Message-ID: <20220108224729.AA20580462@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65ed981ce0135379b7faeb69519f4e3e666c0717 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://snort.org/downloads/snort/release_notes_2.9.19.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/snort/snort.hash | 4 ++-- package/snort/snort.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snort/snort.hash b/package/snort/snort.hash index 6df7ae5229..ac098564aa 100644 --- a/package/snort/snort.hash +++ b/package/snort/snort.hash @@ -1,8 +1,8 @@ # From https://www.snort.org/downloads/snort/md5s -md5 2b4e30300ef6feca1f60c267e727c6c0 snort-2.9.18.1.tar.gz +md5 b0350425e0c1e9c044c25aa13b47edf8 snort-2.9.19.tar.gz # Locally computed: -sha256 da8af0f1b2e4f247d970c6a3c0e83fb6dcd5c84faa21aea49f306f269e8e28aa snort-2.9.18.1.tar.gz +sha256 b12fc6db72afb58987a2bf1954b8f45bde02047c235513c7663857b9506369c7 snort-2.9.19.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 54017d3460..41f450541f 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.18.1 +SNORT_VERSION = 2.9.19 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING From peter at korsgaard.com Sat Jan 8 22:53:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 23:53:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/snort: bump to version 2.9.19 In-Reply-To: <20220108222153.3689389-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 23:21:53 +0100") References: <20220108222153.3689389-1-fontaine.fabrice@gmail.com> Message-ID: <878rvpet52.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://snort.org/downloads/snort/release_notes_2.9.19.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Sat Jan 8 23:03:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:03:12 +0100 Subject: [Buildroot] [PATCH] external-toolchain: Detect linux/version.h via cross compiler In-Reply-To: <20201023093641.619746-1-raj.khem@gmail.com> References: <20201023093641.619746-1-raj.khem@gmail.com> Message-ID: <20220109000312.6b307c17@windsurf> Hello Khem, On Fri, 23 Oct 2020 02:36:41 -0700 Khem Raj wrote: > Using linux/version.h is assumed to be hardcoded inside sysroot but this > does not consider the case where toolchains might be built with > --with-native-system-header-dir which means the header directories will > not be under /usr/include but customized, archlinux, debian > built cross toolchains use these install settings ( due to multiarch ) > they have the headers installed like /usr/aarch64-linux-gnu/include and > not /usr/aarch64-linux-gnu/usr/include > > This patch adds logic to use cross compiler to compute the path to > linux/version.h on the fly, it means we do not really need to assume the > install structure > > Fixes built when using external toolchains provided by archlinux e.g. > > Signed-off-by: Khem Raj > Cc: Thomas Petazzoni > --- > support/scripts/check-kernel-headers.sh | 15 ++++++++++++++- > toolchain/helpers.mk | 2 +- > .../toolchain-external/pkg-toolchain-external.mk | 3 ++- > 3 files changed, 17 insertions(+), 3 deletions(-) We finally took some time to review and discuss this patch. As you can probably imagine due to the delay, we are (at least in its current form) not going to apply it. While it would be nice to not hardcode /usr/include/linux/version.h, we would need: - To account for CFLAGS, as they can affect which sysroot is used by the toolchain in case of multilib toolchains. - A solution that also uses the cross-compiler to detect where is in the case of the internal toolchain backend. However, overall, the motivation of using distribution toolchains is dubious. We still believe that it cannot work, because distribution toolchains can contain any number of random libraries. The sysroot of those toolchains (including the random set of libraries that have been installed) will be copied to Buildroot STAGING_DIR, causing confusion with the packages that Buildroot will build. So overall, we feel that the benefit of the patch is not sufficient compared to the extra effort to fix the remaining comments that we have on it. If you're still interested in pursuing this, we would welcome a new patch that addresses the above two issues. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sat Jan 8 23:02:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 00:02:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrok: fix C++ build with glibmm 2.68 Message-ID: <20220108230259.3703237-1-fontaine.fabrice@gmail.com> cxx bindings are, silently, disabled since bump of glibmm to version 2.68.2 in commit dddb65efbdf2c7952f22a1e51009f17f1676db4a resulting in the following build failure with pulseview: -- Package 'libsigrokcxx', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf Signed-off-by: Fabrice Fontaine --- .../libsigrok/0001-Support-glibmm-2.68.patch | 129 ++++++++++++++++++ package/libsigrok/libsigrok.mk | 3 + 2 files changed, 132 insertions(+) create mode 100644 package/libsigrok/0001-Support-glibmm-2.68.patch diff --git a/package/libsigrok/0001-Support-glibmm-2.68.patch b/package/libsigrok/0001-Support-glibmm-2.68.patch new file mode 100644 index 0000000000..14d14ec406 --- /dev/null +++ b/package/libsigrok/0001-Support-glibmm-2.68.patch @@ -0,0 +1,129 @@ +From 31ad5ec50ec0c9cc7a92f009925c5f58aecdcce1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 Dec 2021 14:58:11 +0100 +Subject: [PATCH] Support glibmm 2.68 + +Support glibmm 2.68 which has been released one year ago and is the +first stable release in the glibmm-2.68 ABI series: +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS + +As TimeVal is not available with glibmm 2.68, use DateTime which is +available since version 2.26 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceforge.net/p/sigrok/mailman/message/37410614] +--- + README | 2 +- + bindings/cxx/classes.cpp | 13 ++++++------- + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp | 4 ++-- + bindings/cxx/libsigrokcxx.pc.in | 2 +- + configure.ac | 7 ++++++- + 5 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/README b/README +index 768c8ca2..2515f059 100644 +--- a/README ++++ b/README +@@ -63,7 +63,7 @@ Requirements for the C++ bindings: + - doxygen (required for building the bindings, not only for C++ API docs!) + - graphviz (optional, only needed for the C++ API docs) + - Python (2 or 3) executable (development files are not needed) +- - glibmm-2.4 (>= 2.32.0) ++ - glibmm-2.4 (>= 2.32.0) or glibmm-2.68 (>= 2.68.0) + + Requirements for the Python bindings: + +diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp +index f9f79273..de600d03 100644 +--- a/bindings/cxx/classes.cpp ++++ b/bindings/cxx/classes.cpp +@@ -287,12 +287,12 @@ shared_ptr Context::create_user_device( + default_delete{}}; + } + +-shared_ptr Context::create_header_packet(Glib::TimeVal start_time) ++shared_ptr Context::create_header_packet(Glib::DateTime start_time) + { + auto header = g_new(struct sr_datafeed_header, 1); + header->feed_version = 1; +- header->starttime.tv_sec = start_time.tv_sec; +- header->starttime.tv_usec = start_time.tv_usec; ++ header->starttime.tv_sec = start_time.to_unix(); ++ header->starttime.tv_usec = start_time.get_microsecond(); + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_HEADER; + packet->payload = header; +@@ -1154,11 +1154,10 @@ int Header::feed_version() const + return _structure->feed_version; + } + +-Glib::TimeVal Header::start_time() const ++Glib::DateTime Header::start_time() const + { +- return Glib::TimeVal( +- _structure->starttime.tv_sec, +- _structure->starttime.tv_usec); ++ Glib::DateTime time = Glib::DateTime::create_now_utc(_structure->starttime.tv_sec); ++ return time.add_seconds(_structure->starttime.tv_usec / 1.0e6); + } + + Meta::Meta(const struct sr_datafeed_meta *structure) : +diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +index 97e54e17..d090c379 100644 +--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp ++++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +@@ -274,7 +274,7 @@ public: + std::shared_ptr create_user_device( + std::string vendor, std::string model, std::string version); + /** Create a header packet. */ +- std::shared_ptr create_header_packet(Glib::TimeVal start_time); ++ std::shared_ptr create_header_packet(Glib::DateTime start_time); + /** Create a meta packet. */ + std::shared_ptr create_meta_packet( + std::map config); +@@ -711,7 +711,7 @@ public: + /* Feed version number. */ + int feed_version() const; + /* Start time of this session. */ +- Glib::TimeVal start_time() const; ++ Glib::DateTime start_time() const; + private: + explicit Header(const struct sr_datafeed_header *structure); + ~Header(); +diff --git a/bindings/cxx/libsigrokcxx.pc.in b/bindings/cxx/libsigrokcxx.pc.in +index 10a92f2d..7d2723fc 100644 +--- a/bindings/cxx/libsigrokcxx.pc.in ++++ b/bindings/cxx/libsigrokcxx.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: libsigrokcxx + Description: C++ bindings for libsigrok + URL: http://www.sigrok.org +-Requires: libsigrok glibmm-2.4 ++Requires: libsigrok @SR_GLIBMM_REQUIRES@ + Version: @SR_PACKAGE_VERSION@ + Libs: -L${libdir} -lsigrokcxx + Libs.private: -lm +diff --git a/configure.ac b/configure.ac +index 424b0002..d70575b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -407,9 +407,14 @@ AS_IF([test "x$HAVE_CXX11" != x1], + [SR_APPEND([sr_cxx_missing], [', '], ['C++11'])]) + + # The C++ bindings need glibmm. +-SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0]) ++SR_GLIBMM_REQUIRES=glibmm-2.4 ++SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.32.0]) ++AS_IF([test "x$sr_have_glibmm" != xyes], ++ [SR_GLIBMM_REQUIRES=glibmm-2.68 ++ SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.68.0])]) + AS_IF([test "x$sr_have_glibmm" != xyes], + [SR_APPEND([sr_cxx_missing], [', '], [glibmm])]) ++AC_SUBST(SR_GLIBMM_REQUIRES) + + # The C++ bindings use Doxygen to parse libsigrok symbols. + AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no]) +-- +2.34.1 + diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 8e7c355fd0..2a26518614 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -11,6 +11,8 @@ LIBSIGROK_LICENSE_FILES = COPYING LIBSIGROK_INSTALL_STAGING = YES LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf LIBSIGROK_CONF_OPTS = --disable-java --disable-python +# We're patching configure.ac +LIBSIGROK_AUTORECONF = YES ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) LIBSIGROK_CONF_OPTS += --with-libbluez @@ -52,6 +54,7 @@ LIBSIGROK_DEPENDENCIES += glibmm endif ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) +LIBSIGROK_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++17" LIBSIGROK_CONF_OPTS += --enable-cxx # host-doxygen is used by C++ bindings to parse libsigrok symbols LIBSIGROK_DEPENDENCIES += \ -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Jan 8 23:08:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:08:39 +0100 Subject: [Buildroot] [git commit] package/python-packaging: fix host variant Message-ID: <20220108230234.BF7858136C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f5ce3ad2c833d2025b2202a4fdcbb06629f1ece branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The host variant of python-packaging was added in commit 4cc445fd5fbb83c2b55f679f3d92223f34f214cb, but has two missing things: - It's a python3 only package, so it should have HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3 - It depends on the pyparsing module, so it should have a dependency on it. Signed-off-by: Thomas Petazzoni --- package/python-packaging/python-packaging.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 1fd6f26d64..e2fb9b120b 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -10,6 +10,8 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3a PYTHON_PACKAGING_SETUP_TYPE = setuptools PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD +HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing $(eval $(python-package)) $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:15:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:15:11 +0100 Subject: [Buildroot] [git commit] package/python-pyparsing: enable host build Message-ID: <20220108231001.D1609813CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea077d89ec4af31d5203a50b451f0fba28c5e1fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will be required by host-python-packaging. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- package/python-pyparsing/python-pyparsing.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 0dacf2371d..5741458d65 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -10,5 +10,7 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools +HOST_PYTHON_PYPARSING_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:15:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:15:15 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm: bump to version 6.3.2 Message-ID: <20220108231001.DD70E813F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12e3527fd97df9ae1b60b892c61d10ce291b7a00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new host-python-packaging and host-python-tomli dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 79999fca0d..22b9afd2c2 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 c11bf23d80224691a46ee5deb84c42db setuptools_scm-5.0.1.tar.gz -sha256 c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a setuptools_scm-5.0.1.tar.gz +md5 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz +sha256 a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 setuptools_scm-6.3.2.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index caca6d4314..f7f4e3ef27 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 5.0.1 +PYTHON_SETUPTOOLS_SCM_VERSION = 6.3.2 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/af/df/f8aa8a78d4d29e0cffa4512e9bc223ed02f24893fe1837c6cee2749ebd67 +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4b/0d/ecb9595fae02467edba5023eb8a23c688d2b438a6a8d1a9e2b8649faf23d PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools +HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:15:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:15:22 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-rust: bump to version 1.1.2 Message-ID: <20220108231002.02F58813CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5138621497a9a6621d1ef36faf66a3e1ac1677f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni --- package/python-setuptools-rust/python-setuptools-rust.hash | 4 ++-- package/python-setuptools-rust/python-setuptools-rust.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.hash b/package/python-setuptools-rust/python-setuptools-rust.hash index a93e98e8c8..6bb42d918c 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.hash +++ b/package/python-setuptools-rust/python-setuptools-rust.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-rust/json -md5 33c3fd3bcde2877483ab782353bee54c setuptools-rust-0.12.1.tar.gz -sha256 647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e setuptools-rust-0.12.1.tar.gz +md5 479fcd267ff48929bec9a7270e1a96d7 setuptools-rust-1.1.2.tar.gz +sha256 a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1 setuptools-rust-1.1.2.tar.gz # Locally computed sha256 checksums sha256 b20668c1590582b3882854050ccfbdb7aee1f71a1ffe9eacc4c5aeb08a14161b LICENSE diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index fe299e8057..c87a0da3c7 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_SETUPTOOLS_RUST_VERSION = 0.12.1 +PYTHON_SETUPTOOLS_RUST_VERSION = 1.1.2 PYTHON_SETUPTOOLS_RUST_SOURCE = setuptools-rust-$(PYTHON_SETUPTOOLS_RUST_VERSION).tar.gz -PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/12/22/6ba3031e7cbd6eb002e13ffc7397e136df95813b6a2bd71ece52a8f89613 +PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-setuptools-scm host-python-toml host-python-semantic-version +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-setuptools-scm host-python-toml host-python-semantic-version host-python-typing-extensions HOST_PYTHON_SETUPTOOLS_RUST_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:15:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:15:19 +0100 Subject: [Buildroot] [git commit] package/python-typing-extensions: add host variant Message-ID: <20220108231001.EB8AA813AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf0cc7d7b4fecde6c350bd886e7f60b95660ef10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Needed by a newer version of host-python-setuptools-rust. Signed-off-by: Thomas Petazzoni --- package/python-typing-extensions/python-typing-extensions.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 46c2977cd7..407fe99b54 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -10,5 +10,7 @@ PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/ed/12/c5 PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = setuptools PYTHON_TYPING_EXTENSIONS_LICENSE = Python-2.0 PYTHON_TYPING_EXTENSIONS_LICENSE_FILES = LICENSE +HOST_PYTHON_TYPING_EXTENSIONS_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:14:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:14:52 +0100 Subject: [Buildroot] [git commit] package/python-tomli: new package Message-ID: <20220108231001.C77C6813AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fff307fc4a4c58c8ba2faafd69614d0bb2d75a93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-tomli/Config.in | 7 +++++++ package/python-tomli/python-tomli.hash | 5 +++++ package/python-tomli/python-tomli.mk | 16 ++++++++++++++++ 5 files changed, 30 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bc07fdbde3..690a43f81b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1312,6 +1312,7 @@ F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ +F: package/python-tomli/ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ diff --git a/package/Config.in b/package/Config.in index dbfdcf6ce3..54d9f81e87 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1264,6 +1264,7 @@ menu "External python modules" source "package/python-tinyrpc/Config.in" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" + source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in new file mode 100644 index 0000000000..e1cecaaa36 --- /dev/null +++ b/package/python-tomli/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TOMLI + bool "python-tomli" + depends on BR2_PACKAGE_PYTHON3 + help + A lil' TOML parser. + + https://github.com/hukkin/tomli diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash new file mode 100644 index 0000000000..1a274c8a40 --- /dev/null +++ b/package/python-tomli/python-tomli.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tomli/json +md5 2ecbc7a23b8c8dc2fe96f588f88463d9 tomli-1.2.0.tar.gz +sha256 d60e681734099207a6add7a10326bc2ddd1fdc36c1b0f547d00ef73ac63739c2 tomli-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk new file mode 100644 index 0000000000..4e6b023ef7 --- /dev/null +++ b/package/python-tomli/python-tomli.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-tomli +# +################################################################################ + +PYTHON_TOMLI_VERSION = 1.2.0 +PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa +PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_LICENSE = MIT +PYTHON_TOMLI_LICENSE_FILES = LICENSE +HOST_PYTHON_TOMLI_NEEDS_HOST_PYTHON = python3 + +$(eval $(python-package)) +$(eval $(host-python-package)) From yann.morin.1998 at free.fr Sat Jan 8 23:17:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 00:17:09 +0100 Subject: [Buildroot] [git commit] package/libbsd: bump to version 0.11.3 Message-ID: <20220108231108.F1D18813F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcaed85304d14d3d0a8020e17af2d6daeca0be58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update indentation in hash file (two spaces) - Update hash of COPYING: - files added and year updated with https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/01f0d1ea1e71f1018a009ebd9203dd48e6d90c45 https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/37a9b56c05339301510213c41fc507ea31cc2464 https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/d54ceb37ce9d7c04fa450a6638eaee31375bbde1 - files removed with https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/847e682f8de452d5f0038458f06ae68ae3959b3a - libmmd is a mandatory dependency since version 0.11 and https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/847e682f8de452d5f0038458f06ae68ae3959b3a https://lists.freedesktop.org/archives/libbsd/2021-February/000298.html https://lists.freedesktop.org/archives/libbsd/2021-February/000302.html https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libbsd/Config.in | 1 + package/libbsd/libbsd.hash | 6 +++--- package/libbsd/libbsd.mk | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index 845a22162b..093a2e646c 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_LIBBSD depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBMD help This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 95887bd607..17bb32e01c 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,3 +1,3 @@ -# From https://lists.freedesktop.org/archives/libbsd/2019-August/000229.html -sha256 34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887 libbsd-0.10.0.tar.xz -sha256 933d14a6bc89ee1fd7adbf5b6ec97f6ff0e002549d0b0c164f8a8895371d78f8 COPYING +# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html +sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz +sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 256a75f15e..86df8a97a2 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBSD_VERSION = 0.10.0 +LIBBSD_VERSION = 0.11.3 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = https://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ @@ -12,5 +12,6 @@ LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ LIBBSD_LICENSE_FILES = COPYING LIBBSD_CPE_ID_VENDOR = freedesktop LIBBSD_INSTALL_STAGING = YES +LIBBSD_DEPENDENCIES = libmd $(eval $(autotools-package)) From yann.morin.1998 at free.fr Sat Jan 8 23:17:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 00:17:09 +0100 Subject: [Buildroot] [git commit] package/libmd: new package Message-ID: <20220108231108.E7FB6813CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc232de771baf51f17f59264246d722ff241e125 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This library provides message digest functions found on BSD systems either on their libc (NetBSD, OpenBSD) or libmd (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking on others like GNU systems. https://www.hadrons.org/software/libmd/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/libmd/Config.in | 9 +++++++++ package/libmd/libmd.hash | 5 +++++ package/libmd/libmd.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 690a43f81b..3b544cae6b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -904,6 +904,7 @@ F: package/libidn2/ F: package/libjpeg/ F: package/liblockfile/ F: package/libmatroska/ +F: package/libmd/ F: package/libmpdclient/ F: package/libnetfilter_conntrack/ F: package/libnetfilter_queue/ diff --git a/package/Config.in b/package/Config.in index 54d9f81e87..378d6e8c0c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1415,6 +1415,7 @@ menu "Crypto" source "package/libgpgme/Config.in" source "package/libkcapi/Config.in" source "package/libksba/Config.in" + source "package/libmd/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libolm/Config.in" diff --git a/package/libmd/Config.in b/package/libmd/Config.in new file mode 100644 index 0000000000..63139ad69b --- /dev/null +++ b/package/libmd/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBMD + bool "libmd" + help + This library provides message digest functions found on BSD + systems either on their libc (NetBSD, OpenBSD) or libmd + (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking + on others like GNU systems. + + https://www.hadrons.org/software/libmd/ diff --git a/package/libmd/libmd.hash b/package/libmd/libmd.hash new file mode 100644 index 0000000000..1a3c9d80df --- /dev/null +++ b/package/libmd/libmd.hash @@ -0,0 +1,5 @@ +# From https://lists.freedesktop.org/archives/libbsd/2021-October/000311.html +sha512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3 libmd-1.0.4.tar.xz + +# Hash for license file +sha256 4365ef6255ad553fce69dd4bc0e093472c5d0e41b8ea493a545cc926ce171aa6 COPYING diff --git a/package/libmd/libmd.mk b/package/libmd/libmd.mk new file mode 100644 index 0000000000..19a2458982 --- /dev/null +++ b/package/libmd/libmd.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libmd +# +################################################################################ + +LIBMD_VERSION = 1.0.4 +LIBMD_SOURCE = libmd-$(LIBMD_VERSION).tar.xz +LIBMD_SITE = https://archive.hadrons.org/software/libmd +LIBMD_LICENSE = BSD-2-Clause, BSD-3-Clause, Beerware, ISC, Public Domain +LIBMD_LICENSE_FILES = COPYING +LIBMD_INSTALL_STAGING = YES + +$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:17:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:17:21 +0100 Subject: [Buildroot] [PATCH 1/5] package/python-tomli: new package In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220109001721.739a76ba@windsurf> On Sat, 1 Jan 2022 12:30:14 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-tomli/Config.in | 7 +++++++ > package/python-tomli/python-tomli.hash | 5 +++++ > package/python-tomli/python-tomli.mk | 16 ++++++++++++++++ > 5 files changed, 30 insertions(+) > create mode 100644 package/python-tomli/Config.in > create mode 100644 package/python-tomli/python-tomli.hash > create mode 100644 package/python-tomli/python-tomli.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 23:17:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:17:27 +0100 Subject: [Buildroot] [PATCH 2/5] package/python-pyparsing: enable host build In-Reply-To: <20220101193018.404937-2-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-2-james.hilliard1@gmail.com> Message-ID: <20220109001727.7fc225c6@windsurf> On Sat, 1 Jan 2022 12:30:15 -0700 James Hilliard wrote: > This will be required by host-python-packaging. > > Signed-off-by: James Hilliard > --- > package/python-pyparsing/python-pyparsing.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 23:17:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:17:49 +0100 Subject: [Buildroot] [PATCH 3/5] package/python-packaging: enable host build In-Reply-To: <20220101193018.404937-3-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-3-james.hilliard1@gmail.com> Message-ID: <20220109001749.6bf44252@windsurf> On Sat, 1 Jan 2022 12:30:16 -0700 James Hilliard wrote: > This is required by python-setuptools-scm. > > Signed-off-by: James Hilliard > --- > package/python-packaging/python-packaging.mk | 3 +++ > 1 file changed, 3 insertions(+) Something similar was separately applied, but had issues, so I fixed it up so that it is similar to what you had posted. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 23:17:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:17:53 +0100 Subject: [Buildroot] [PATCH 4/5] package/python-setuptools-scm: bump to version 6.3.2 In-Reply-To: <20220101193018.404937-4-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-4-james.hilliard1@gmail.com> Message-ID: <20220109001753.4c25ed12@windsurf> On Sat, 1 Jan 2022 12:30:17 -0700 James Hilliard wrote: > Add new host-python-packaging and host-python-tomli dependencies. > > Signed-off-by: James Hilliard > --- > package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- > package/python-setuptools-scm/python-setuptools-scm.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 23:17:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 00:17:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/libmd: new package In-Reply-To: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> References: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> Message-ID: <20220108231754.GI1881783@scaer> Fabrice, All, On 2022-01-08 23:38 +0100, Fabrice Fontaine spake thusly: > This library provides message digest functions found on BSD systems > either on their libc (NetBSD, OpenBSD) or libmd (FreeBSD, DragonflyBSD, > macOS, Solaris) libraries and lacking on others like GNU systems. > > https://www.hadrons.org/software/libmd/ > > Signed-off-by: Fabrice Fontaine Series of 2 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/libmd/Config.in | 9 +++++++++ > package/libmd/libmd.hash | 5 +++++ > package/libmd/libmd.mk | 14 ++++++++++++++ > 5 files changed, 30 insertions(+) > create mode 100644 package/libmd/Config.in > create mode 100644 package/libmd/libmd.hash > create mode 100644 package/libmd/libmd.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index cb06de820d..c1ccab966c 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -899,6 +899,7 @@ F: package/libidn2/ > F: package/libjpeg/ > F: package/liblockfile/ > F: package/libmatroska/ > +F: package/libmd/ > F: package/libmpdclient/ > F: package/libnetfilter_conntrack/ > F: package/libnetfilter_queue/ > diff --git a/package/Config.in b/package/Config.in > index ad542ac8bc..d8ee96a588 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1412,6 +1412,7 @@ menu "Crypto" > source "package/libgpgme/Config.in" > source "package/libkcapi/Config.in" > source "package/libksba/Config.in" > + source "package/libmd/Config.in" > source "package/libmhash/Config.in" > source "package/libnss/Config.in" > source "package/libolm/Config.in" > diff --git a/package/libmd/Config.in b/package/libmd/Config.in > new file mode 100644 > index 0000000000..63139ad69b > --- /dev/null > +++ b/package/libmd/Config.in > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_LIBMD > + bool "libmd" > + help > + This library provides message digest functions found on BSD > + systems either on their libc (NetBSD, OpenBSD) or libmd > + (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking > + on others like GNU systems. > + > + https://www.hadrons.org/software/libmd/ > diff --git a/package/libmd/libmd.hash b/package/libmd/libmd.hash > new file mode 100644 > index 0000000000..1a3c9d80df > --- /dev/null > +++ b/package/libmd/libmd.hash > @@ -0,0 +1,5 @@ > +# From https://lists.freedesktop.org/archives/libbsd/2021-October/000311.html > +sha512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3 libmd-1.0.4.tar.xz > + > +# Hash for license file > +sha256 4365ef6255ad553fce69dd4bc0e093472c5d0e41b8ea493a545cc926ce171aa6 COPYING > diff --git a/package/libmd/libmd.mk b/package/libmd/libmd.mk > new file mode 100644 > index 0000000000..19a2458982 > --- /dev/null > +++ b/package/libmd/libmd.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# libmd > +# > +################################################################################ > + > +LIBMD_VERSION = 1.0.4 > +LIBMD_SOURCE = libmd-$(LIBMD_VERSION).tar.xz > +LIBMD_SITE = https://archive.hadrons.org/software/libmd > +LIBMD_LICENSE = BSD-2-Clause, BSD-3-Clause, Beerware, ISC, Public Domain > +LIBMD_LICENSE_FILES = COPYING > +LIBMD_INSTALL_STAGING = YES > + > +$(eval $(autotools-package)) > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 8 23:39:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 00:39:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongrel2: bump to version 1.13.0 Message-ID: <20220108233910.114777-1-fontaine.fabrice@gmail.com> - Drop third patch (already in version) - Drop fourth patch (not needed since https://github.com/mongrel2/mongrel2/commit/8a6db3beb32da1d66757a746f440d92edff166f9) https://github.com/mongrel2/mongrel2/blob/v1.13.0/changelog.txt Signed-off-by: Fabrice Fontaine --- ...ition-error-when-building-with-gcc10.patch | 25 ---- .../0004-Support-urandom-inside-chroot.patch | 113 ------------------ package/mongrel2/mongrel2.hash | 4 +- package/mongrel2/mongrel2.mk | 2 +- 4 files changed, 3 insertions(+), 141 deletions(-) delete mode 100644 package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch delete mode 100644 package/mongrel2/0004-Support-urandom-inside-chroot.patch diff --git a/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch b/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch deleted file mode 100644 index e1b5788494..0000000000 --- a/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c51815b10c39c6e802bd1b56549f1d479b480fcc Mon Sep 17 00:00:00 2001 -From: Andrew Sun -Date: Sat, 18 Jul 2020 09:11:11 -0400 -Subject: [PATCH] fix multiple definition error when building with gcc10 - -[Retrieved from: -https://github.com/mongrel2/mongrel2/pull/343/commits/c51815b10c39c6e802bd1b56549f1d479b480fcc] -Signed-off-by: Fabrice Fontaine ---- - src/unixy.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unixy.h b/src/unixy.h -index 045e7c28..4225220c 100644 ---- a/src/unixy.h -+++ b/src/unixy.h -@@ -38,7 +38,7 @@ - #include - #include - --char *m2program; -+extern char *m2program; - - int Unixy_chroot(bstring path); - diff --git a/package/mongrel2/0004-Support-urandom-inside-chroot.patch b/package/mongrel2/0004-Support-urandom-inside-chroot.patch deleted file mode 100644 index 468ddb83fe..0000000000 --- a/package/mongrel2/0004-Support-urandom-inside-chroot.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 330e8c8352eb0ed3c178ac6e0102403c0a835492 Mon Sep 17 00:00:00 2001 -From: Jason Miller -Date: Thu, 5 Jul 2018 20:53:51 -0700 -Subject: [PATCH] Support urandom inside chroot - -This adds a new default entropy function that uses a /dev/urandom stream -opened before the chroot. If initializing that fails, it fallsback on -HAVEGE only if HAVEGE is supported by the mbedTLS. - -This should remove the hard requirement on HAVEGE - -resolves #326 -resolves #327 - -[Upstream status: https://github.com/mongrel2/mongrel2/pull/328] -Signed-off-by: Fabrice Fontaine ---- - src/mongrel2.c | 7 ------- - src/server.c | 36 +++++++++++++++++++++++------------- - 2 files changed, 23 insertions(+), 20 deletions(-) - -diff --git a/src/mongrel2.c b/src/mongrel2.c -index da632d95..48ece8a5 100644 ---- a/src/mongrel2.c -+++ b/src/mongrel2.c -@@ -404,13 +404,6 @@ void taskmain(int argc, char **argv) - rc = attempt_chroot_drop(srv); - check(rc == 0, "Major failure in chroot/droppriv, aborting."); - -- // set up rng after chroot -- // TODO: once mbedtls is updated, we can move this back into Server_create -- if(srv->use_ssl) { -- rc = Server_init_rng(srv); -- check(rc == 0, "Failed to initialize rng for server %s", bdata(srv->uuid)); -- } -- - final_setup(); - - taskcreate(tickertask, NULL, TICKER_TASK_STACK); -diff --git a/src/server.c b/src/server.c -index 45761db4..e44e199b 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -149,35 +149,45 @@ static int Server_load_ciphers(Server *srv, bstring ssl_ciphers_val) - return -1; - } - -+static int urandom_entropy_func(void *data, unsigned char *output, size_t len) -+{ -+ FILE* urandom = (FILE *)data; -+ size_t rc = fread(output, 1, len, urandom); -+ -+ if (rc != len) return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED; -+ -+ return 0; -+} -+ - int Server_init_rng(Server *srv) - { - int rc; -- unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE]; - void *ctx = NULL; - -- mbedtls_entropy_init( &srv->entropy ); -+ FILE *urandom = fopen("/dev/urandom","r"); - -- // test the entropy source -- rc = mbedtls_entropy_func(&srv->entropy, buf, MBEDTLS_ENTROPY_BLOCK_SIZE); -- -- if(rc == 0) { -+ if(urandom != NULL) { - ctx = calloc(sizeof(mbedtls_ctr_drbg_context), 1); - - mbedtls_ctr_drbg_init((mbedtls_ctr_drbg_context *)ctx); - rc = mbedtls_ctr_drbg_seed((mbedtls_ctr_drbg_context *)ctx, -- mbedtls_entropy_func, &srv->entropy, NULL, 0); -+ urandom_entropy_func, urandom, NULL, 0); - check(rc == 0, "Init rng failed: ctr_drbg_init returned %d\n", rc); - - srv->rng_func = mbedtls_ctr_drbg_random; - srv->rng_ctx = ctx; - } else { -- log_warn("entropy source unavailable. falling back to havege rng"); - -+#if defined(MBEDTLS_HAVEGE_C) -+ log_warn("entropy source unavailable. falling back to havege rng"); - ctx = calloc(sizeof(mbedtls_havege_state), 1); - mbedtls_havege_init((mbedtls_havege_state *)ctx); -- - srv->rng_func = mbedtls_havege_random; - srv->rng_ctx = ctx; -+#else -+ log_err("Unable to initialize urandom entropy source, and mbedTLS compiled without HAVEGE"); -+ goto error; -+#endif - } - - return 0; -@@ -278,10 +288,10 @@ Server *Server_create(bstring uuid, bstring default_host, - - // TODO: once mbedtls supports opening urandom early and keeping it open, - // put the rng initialization back here (before chroot) -- //if(use_ssl) { -- // rc = Server_init_rng(srv); -- // check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); -- //} -+ if(use_ssl) { -+ rc = Server_init_rng(srv); -+ check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); -+ } - - if(blength(chroot) > 0) { - srv->chroot = bstrcpy(chroot); check_mem(srv->chroot); diff --git a/package/mongrel2/mongrel2.hash b/package/mongrel2/mongrel2.hash index ea3a1cb426..f4f094ea03 100644 --- a/package/mongrel2/mongrel2.hash +++ b/package/mongrel2/mongrel2.hash @@ -1,6 +1,6 @@ # From https://mongrel2.org -sha1 6f81fa747a1e198d1a655c3677b6de686a5a51f7 mongrel2-v1.12.2.tar.bz2 +sha1 6057f9cbfae41e2cdef1e0f715df3c1a4d3a1884 mongrel2-v1.13.0.tar.bz2 # Locally computed -sha256 3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f mongrel2-v1.12.2.tar.bz2 +sha256 b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10 mongrel2-v1.13.0.tar.bz2 sha256 eb6e2a2baa637d06f6aa762886fbc8939934eb5fdb0b3a5b3882f2a61e9a4357 LICENSE diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk index cbe7e3fb91..07914ad0fe 100644 --- a/package/mongrel2/mongrel2.mk +++ b/package/mongrel2/mongrel2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGREL2_VERSION = 1.12.2 +MONGREL2_VERSION = 1.13.0 MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2 # Do not use the github helper here, the generated tarball is *NOT* the same # as the one uploaded by upstream for the release. -- 2.34.1 From james.hilliard1 at gmail.com Sun Jan 9 03:55:59 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:55:59 -0700 Subject: [Buildroot] [PATCH v3 1/3] package/python-pep517: new package In-Reply-To: <20220109035601.2483360-1-james.hilliard1@gmail.com> References: <20220109035601.2483360-1-james.hilliard1@gmail.com> Message-ID: <20220109035601.2483360-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-pep517/python-pep517.hash | 5 +++++ package/python-pep517/python-pep517.mk | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/python-pep517/python-pep517.hash create mode 100644 package/python-pep517/python-pep517.mk diff --git a/package/python-pep517/python-pep517.hash b/package/python-pep517/python-pep517.hash new file mode 100644 index 0000000000..4dd4c47fa0 --- /dev/null +++ b/package/python-pep517/python-pep517.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pep517/json +md5 7ed0adb5f737c316e071d48d66329a5d pep517-0.12.0.tar.gz +sha256 931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 pep517-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk new file mode 100644 index 0000000000..da0431a637 --- /dev/null +++ b/package/python-pep517/python-pep517.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pep517 +# +################################################################################ + +PYTHON_PEP517_VERSION = 0.12.0 +PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz +PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 +PYTHON_PEP517_LICENSE = MIT +PYTHON_PEP517_LICENSE_FILES = LICENSE +PYTHON_PEP517_SETUP_TYPE = distutils +HOST_PYTHON_PEP517_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli + +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 03:56:00 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:56:00 -0700 Subject: [Buildroot] [PATCH v3 2/3] package/python-pypa-build: new package In-Reply-To: <20220109035601.2483360-1-james.hilliard1@gmail.com> References: <20220109035601.2483360-1-james.hilliard1@gmail.com> Message-ID: <20220109035601.2483360-3-james.hilliard1@gmail.com> Due to a namespace clash with python-build we need to use a different package name. Signed-off-by: James Hilliard --- .../python-pypa-build/python-pypa-build.hash | 5 +++++ .../python-pypa-build/python-pypa-build.mk | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 package/python-pypa-build/python-pypa-build.hash create mode 100644 package/python-pypa-build/python-pypa-build.mk diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash new file mode 100644 index 0000000000..c7daedc6b3 --- /dev/null +++ b/package/python-pypa-build/python-pypa-build.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/build/json +md5 ec3dbe55359ee735b45766b30dfad877 build-0.7.0.tar.gz +sha256 1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f build-0.7.0.tar.gz +# Locally computed sha256 checksums +sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk new file mode 100644 index 0000000000..6babade672 --- /dev/null +++ b/package/python-pypa-build/python-pypa-build.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-pypa-build +# +################################################################################ + +PYTHON_PYPA_BUILD_VERSION = 0.7.0 +PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b775216bb1f34962beaf005f38460c6161177fef6e068a7a0c30a1597 +PYTHON_PYPA_BUILD_LICENSE = MIT +PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE +PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools +HOST_PYTHON_PYPA_BUILD_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ + host-python-packaging \ + host-python-pep517 \ + host-python-tomli + +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 03:55:58 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:55:58 -0700 Subject: [Buildroot] [PATCH v3 0/3] PEP517 host packages Message-ID: <20220109035601.2483360-1-james.hilliard1@gmail.com> This series adds host packages that will be used for PEP517 based python-package infrastructure in a future series. See: https://www.python.org/dev/peps/pep-0517/ --- Changes v2 -> v3: - rebase on master James Hilliard (3): package/python-pep517: new package package/python-pypa-build: new package package/python-installer: new package .../python-installer/python-installer.hash | 5 +++++ package/python-installer/python-installer.mk | 15 +++++++++++++++ package/python-pep517/python-pep517.hash | 5 +++++ package/python-pep517/python-pep517.mk | 16 ++++++++++++++++ .../python-pypa-build/python-pypa-build.hash | 5 +++++ .../python-pypa-build/python-pypa-build.mk | 19 +++++++++++++++++++ 6 files changed, 65 insertions(+) create mode 100644 package/python-installer/python-installer.hash create mode 100644 package/python-installer/python-installer.mk create mode 100644 package/python-pep517/python-pep517.hash create mode 100644 package/python-pep517/python-pep517.mk create mode 100644 package/python-pypa-build/python-pypa-build.hash create mode 100644 package/python-pypa-build/python-pypa-build.mk -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 03:56:01 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:56:01 -0700 Subject: [Buildroot] [PATCH v3 3/3] package/python-installer: new package In-Reply-To: <20220109035601.2483360-1-james.hilliard1@gmail.com> References: <20220109035601.2483360-1-james.hilliard1@gmail.com> Message-ID: <20220109035601.2483360-4-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-installer/python-installer.hash | 5 +++++ package/python-installer/python-installer.mk | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/python-installer/python-installer.hash create mode 100644 package/python-installer/python-installer.mk diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash new file mode 100644 index 0000000000..68af457664 --- /dev/null +++ b/package/python-installer/python-installer.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/installer/json +md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz +sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk new file mode 100644 index 0000000000..2c1d371dab --- /dev/null +++ b/package/python-installer/python-installer.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-installer +# +################################################################################ + +PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_LICENSE = MIT +PYTHON_INSTALLER_LICENSE_FILES = LICENSE +PYTHON_INSTALLER_SETUP_TYPE = distutils +HOST_PYTHON_INSTALLER_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 03:59:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:59:35 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-argon2-cffi-bindings: new package Message-ID: <20220109035935.2698421-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - rebase on master --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-argon2-cffi-bindings/Config.in | 11 ++++++++ .../python-argon2-cffi-bindings.hash | 5 ++++ .../python-argon2-cffi-bindings.mk | 25 +++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/python-argon2-cffi-bindings/Config.in create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3b544cae6b..c5186e029a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1291,6 +1291,7 @@ F: package/python-aiorwlock/ F: package/python-aiosignal/ F: package/python-aiozipkin/ F: package/python-argon2-cffi/ +F: package/python-argon2-cffi-bindings/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-bidict/ diff --git a/package/Config.in b/package/Config.in index 378d6e8c0c..bc2113765b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -925,6 +925,7 @@ menu "External python modules" source "package/python-ansicolors/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" + source "package/python-argon2-cffi-bindings/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in new file mode 100644 index 0000000000..3d409759e0 --- /dev/null +++ b/package/python-argon2-cffi-bindings/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS + bool "python-argon2-cffi-bindings" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU # libargon2 + depends on !BR2_STATIC_LIBS # libargon2 + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_LIBARGON2 + help + Low-level CFFI bindings for Argon2. + + https://github.com/hynek/argon2-cffi-bindings diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash new file mode 100644 index 0000000000..e088d3dad1 --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/argon2-cffi-bindings/json +md5 f1591e1af7dea9ef3e5b982e2c196c1d argon2-cffi-bindings-21.2.0.tar.gz +sha256 bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 argon2-cffi-bindings-21.2.0.tar.gz +# Locally computed sha256 checksums +sha256 9c158d4f433627f48ac24b6b4d37970afe4172514673c5318014d7cca157c6df LICENSE diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk new file mode 100644 index 0000000000..f0d71e803a --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# python-argon2-cffi-bindings +# +################################################################################ + +PYTHON_ARGON2_CFFI_BINDINGS_VERSION = 21.2.0 +PYTHON_ARGON2_CFFI_BINDINGS_SOURCE = argon2-cffi-bindings-$(PYTHON_ARGON2_CFFI_BINDINGS_VERSION).tar.gz +PYTHON_ARGON2_CFFI_BINDINGS_SITE = https://files.pythonhosted.org/packages/b9/e9/184b8ccce6683b0aa2fbb7ba5683ea4b9c5763f1356347f1312c32e3c66e +PYTHON_ARGON2_CFFI_BINDINGS_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE = MIT +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE_FILES = LICENSE +PYTHON_ARGON2_CFFI_BINDINGS_DEPENDENCIES = \ + host-python-cffi \ + host-python-setuptools-scm \ + libargon2 +PYTHON_ARGON2_CFFI_BINDINGS_ENV = ARGON2_CFFI_USE_SYSTEM=1 + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=1 +else +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=0 +endif + +$(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 06:36:01 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 23:36:01 -0700 Subject: [Buildroot] [PATCH 1/1] core/pkg-utils: add missing bracket Message-ID: <20220109063601.4133447-1-james.hilliard1@gmail.com> This appears to have been incorrectly removed in: 03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df Fixes: package/pkg-utils.mk:212: *** unterminated call to function 'foreach': missing ')'. Stop. make: *** [Makefile:84: _all] Error 2 Signed-off-by: James Hilliard --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 6aa64a2096..df55ab685b 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -214,7 +214,7 @@ define per-package-rsync $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3) + $(3)) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 06:44:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 23:44:06 -0700 Subject: [Buildroot] [PATCH v2 1/1] core/pkg-utils: add missing bracket/sep Message-ID: <20220109064406.122409-1-james.hilliard1@gmail.com> This appears to have been incorrectly removed in: 03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df Fixes: package/pkg-utils.mk:212: *** unterminated call to function 'foreach': missing ')'. Stop. make: *** [Makefile:84: _all] Error 2 Signed-off-by: James Hilliard --- Changes v1 -> v2: - add sep as well --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 6aa64a2096..7d1aea7710 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -214,7 +214,7 @@ define per-package-rsync $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3) + $(3)$(sep)) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current -- 2.25.1 From thomas.petazzoni at bootlin.com Sun Jan 9 07:08:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 09 Jan 2022 07:08:08 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-08 Message-ID: <20220109070813.5796960A93@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-01-08 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 59 | 10 | 0 | 69 | 2021.11.x | 26 | 2 | 0 | 28 | master | 114 | 53 | 0 | 167 | Classification of failures by reason for master ----------------------------------------------- unknown | 8 rygel-0.40.2 | 7 frr-8.1 | 4 gstreamer1-mm-1.10.0 | 3 host-file-5.41 | 3 wavemon-0.9.4 | 3 host-btrfs-progs-5.15.1 | 2 poppler-21.12.0 | 2 rtorrent-0.9.8 | 2 safeclib-02092020 | 2 apcupsd-3.14.14 | 1 bluez5_utils-5.63 | 1 efl-1.26.0 | 1 file-5.41 | 1 google-breakpad-7515ab13768... | 1 hiawatha-11.1 | 1 ksmbd-tools-3.4.3 | 1 libcamera-40f5fddca7f774944... | 1 libest-3.2.0 | 1 libupnp-1.14.12 | 1 log4cxx-0.12.0 | 1 ndisc6-1.0.5 | 1 pcsc-lite-1.9.5 | 1 qt5webkit-5.212.0-alpha4 | 1 rabbitmq-server-3.8.2 | 1 tpm2-pkcs11-1.7.0 | 1 trinity-1.9 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/89405f6a1516c8eb30cba204753113d635c12db6 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/5cb75bd1fe0e21c53db9fe092d59d392f85dd933 | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/748bae634f8f968447473efccfb9546d20f435d6 | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/9e7868be00f2cd18205b2ce664be95f8b9e2b063 | ORPH mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b6afa559edbea07a73571d84cb6733f07c2fe234 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f2c10861616442974e441f6315a813d93297a2b5 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a901769c168d704b30ace5be43f9cb8ce4d34502 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2b4c58ec3fb0567de0fb334a24f86b6815406fb4 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/f923a7262425961343dcca992007458b2ec7746f | arm | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/f55df28f1b7174f7606a75f00090334541c0873c | ORPH i686 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/cba0f064628ce842ac21aacb60aad767fd62440c | ORPH riscv32 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/8dd0ef5864a66a4b13819c855b6b349d3db840fd | ORPH aarch64 | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/51f5c021e8e67ffba1a0d1e77db5cb1dd6ea0474 | or1k | host-btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/03235edd829436d784a9b214050cc97584f372fb | ORPH powerpc | host-btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/3677d943d048915c0fcd81ab9666dbf792962f4d | ORPH powerpc | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/47c7d17c343dec2a8a534d15f44f53ab3aa06f41 | ORPH mips64el | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/9573e8b01d8f21cd89a67475daabdeef533d31d7 | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/c35b141140c0bd600753b9596482ceeb1935e49f | ORPH xtensa | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/a1806b5aede0c92ff13b4846157dec654abe217e | i686 | libcamera-40f5fddca7f774944... | NOK | http://autobuild.buildroot.net/results/3155e9c22d3789efd16724e9d0098909c6be4876 | nios2 | libest-3.2.0 | NOK | http://autobuild.buildroot.net/results/5a12f1cb4153834078522b6068ff24ac0300d51d | or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/585ea0a093280a522b5aaaf0947b9d4588815eef | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/be07b31f6b8ecb49921be154a30aab3721cce94a | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/ed78a5c7621b324944fc2121306844127c7a95a9 | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/ba29ee57ff8a329c05f7a29a97a18a9768b6237c | ORPH x86_64 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/67102ac2716b3cd19c092fe6381dea035a213a12 | arc | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/9610685ab49a9739a8cc4c748da64d07647c4668 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/eefcf9badadbbec8c756c8161407f51f421bb7ee | riscv64 | rabbitmq-server-3.8.2 | NOK | http://autobuild.buildroot.net/results/e6c743af815948f90960e294a615af4294bead82 | i586 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/98e698ce57ea85737fc72322d036a76495dda75d | ORPH arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/30e60c354c918acbcec23ccb74b8a7d3ff1fce1d | ORPH xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/910b583f1e2007c19ccc9470e98bdea4d32e2440 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1f7ca12def09125503898d95c11ddb8cbeec6f0b | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/42319fbb0a43f2473127447ccc4b3585b5b53b3f | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/830608ff93a7bb3600de3e6ffabd1dfabf880867 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c02ec04c71a4c1c3d67666a9a6f267b1987f5feb | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/45396bce4f40bf01d21c044be0ba4384bebc97c6 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5f99e3fde4402e1324e5a453396c71c8608420b6 | m68k | safeclib-02092020 | NOK | http://autobuild.buildroot.net/results/a481ee2d26a094358b0298617cce691be3077f22 | arm | safeclib-02092020 | NOK | http://autobuild.buildroot.net/results/fc9e4dd08b653af1fd988323eb20293d5dbb579c | or1k | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/51009a0e648813833f5102ac3f9ab8979ef91929 | mipsel | trinity-1.9 | NOK | http://autobuild.buildroot.net/results/bf78e4be9b9d9ca7d32f922d72ea6cd39a78d3d8 | ORPH sparc | unknown | NOK | http://autobuild.buildroot.net/results/e32211fbfbbd5b614f582d12b988d48a69ae85ca | arm | unknown | NOK | http://autobuild.buildroot.net/results/234779f7136c72af997a09d61b9201762834b1e6 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/60c7eff8810c4d0bc057cfabed2e0311dc860ee9 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/ad8691bef1cbe03de2ebf7574105948d103a1ec4 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/4abea4e63c0a9244a8aa22e3d2cfe48dce877540 | arm | unknown | NOK | http://autobuild.buildroot.net/results/093729bba8788bd4cbe33fd7a651028d6a23c485 | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/3b71087f743d4d0b23eb4ac52cd741eba0370d87 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/41cabe55edf3c0e8321f77066a47b454d5ef8caf | powerpc64le | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/776f0bbdae9db3dd940f4b29858c21c9fc325e32 | xtensa | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9486bbc10ceff9fe9a3de00dcbc280b14de2433c | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0dc3298e1125708cafeb56dd95ffcfd035ea2ca3 | Classification of failures by reason for 2021.02.x -------------------------------------------------- monkey-f54856ce250c4e257354... | 2 ndisc6-1.0.4 | 2 glib-networking-2.66.0 | 1 host-sentry-cli-1.57.0 | 1 mesa3d-20.3.5 | 1 openal-1.20.1 | 1 rocksdb-6.13.3 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/fd6dc9122a2d6d88afb92d1ef0f193b98ada3522 | ORPH microblazeel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/55b24023a7f28af397499b4f8e33a67d889b6d07 | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/a85c36357e364c6370e76b7ea5e947c6099520cd | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/92c5e7a376afe3161f330b2e2267b1bf89f9d7d9 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/623c67cb53a1b62f7d3be9616936127cbbbd2809 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/3d641651e7b4a869461d02eff169df1b5bbe9d6b | ORPH arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/90c75c76205cd84d72c4d527cea8dca41a46c330 | ORPH or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/012d4bd6c596593389650457bda967e7c9eb7293 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/09d43fc0bd1a8df8b8a4ae740836213149df3991 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/4ef4f5e434ee4a52c508540732cc50f2a6a0f747 | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 libqmi-1.30.2 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/ec1be36aea617d496b21c92d18593b9675dc8b18 | powerpc64le | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/e17210a5131de2ad56fe539944e39bba02c05847 | -- http://autobuild.buildroot.net From arnout at mind.be Sun Jan 9 07:26:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 08:26:51 +0100 Subject: [Buildroot] [git commit] core/pkg-utils: add missing bracket/sep Message-ID: <20220109072048.8FA0082962@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e27a700f3e140015c02be05853d94b7f3dcc0f28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This appears to have been incorrectly removed in: 03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df Fixes: package/pkg-utils.mk:212: *** unterminated call to function 'foreach': missing ')'. Stop. make: *** [Makefile:84: _all] Error 2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 6aa64a2096..7d1aea7710 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -214,7 +214,7 @@ define per-package-rsync $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3) + $(3)$(sep)) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current From arnout at mind.be Sun Jan 9 07:27:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 08:27:10 +0100 Subject: [Buildroot] [PATCH v2 1/1] core/pkg-utils: add missing bracket/sep In-Reply-To: <20220109064406.122409-1-james.hilliard1@gmail.com> References: <20220109064406.122409-1-james.hilliard1@gmail.com> Message-ID: On 09/01/2022 07:44, James Hilliard wrote: > This appears to have been incorrectly removed in: > 03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df > > Fixes: > package/pkg-utils.mk:212: *** unterminated call to function 'foreach': missing ')'. Stop. > make: *** [Makefile:84: _all] Error 2 > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - add sep as well > --- > package/pkg-utils.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk > index 6aa64a2096..7d1aea7710 100644 > --- a/package/pkg-utils.mk > +++ b/package/pkg-utils.mk > @@ -214,7 +214,7 @@ define per-package-rsync > $(foreach pkg,$(1),\ > rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ > $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ > - $(3) > + $(3)$(sep)) > endef > > # prepares the per-package HOST_DIR and TARGET_DIR of the current > From peter at korsgaard.com Sun Jan 9 07:44:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 08:44:36 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/iwd: enable required kernel dependencies In-Reply-To: <20211204234005.2051254-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 4 Dec 2021 16:40:05 -0700") References: <20211204234005.2051254-1-james.hilliard1@gmail.com> Message-ID: <874k6de4kb.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Required kernel options are listed in check_crypto() in srv/main.c: > https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/src/main.c?h=1.20#n268 > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - remove optional kconfig options > - remove a duplicate option Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 07:42:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 08:42:47 +0100 Subject: [Buildroot] [git commit] package/iwd: enable required kernel dependencies Message-ID: <20220109073836.1833282A01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c12a6bf51bc4b166948b4392e96344259a64778 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required kernel options are listed in check_crypto() in srv/main.c: https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/src/main.c?h=1.20#n268 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/iwd/iwd.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 7b122811c5..42f176b05b 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -63,4 +63,27 @@ define IWD_INSTALL_INIT_SYSV ln -sf /tmp/iwd/hotspot $(TARGET_DIR)/var/lib/iwd/hotspot endef +define IWD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_ASYMMETRIC_KEY_TYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_AES) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_CBC) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_CMAC) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_DES) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_ECB) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_HMAC) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MD4) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MD5) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_SHA1) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_SHA256) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_SHA512) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_USER_API_HASH) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_USER_API_SKCIPHER) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEY_DH_OPERATIONS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PKCS7_MESSAGE_PARSER) + $(call KCONFIG_ENABLE_OPT,CONFIG_PKCS8_PRIVATE_KEY_PARSER) + $(call KCONFIG_ENABLE_OPT,CONFIG_X509_CERTIFICATE_PARSER) +endef + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Sun Jan 9 08:01:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 09:01:22 +0100 Subject: [Buildroot] [PATCH 1/2] arch/Config.in.x86: add option for -march=x86-64 Message-ID: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> We already have support for a wide range of x86-64 CPUs, but we don't have any option to build for the most generic possible x86-64 CPU, as made available by the -march=x86-64 GCC option. This commit makes this option available in Buildroot. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 7aae3cafb7..794d808d96 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -81,6 +81,16 @@ config BR2_x86_prescott select BR2_X86_CPU_HAS_SSE select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 +config BR2_x86_x86_64 + bool "x86-64" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + help + This option corresponds to -march=x86-64, documented as a + "Generic CPU with 64-bit extensions" by the GCC + documentation. It is a 64-bit CPU with MMX, SSE and SSE2 + support. config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -281,6 +291,7 @@ config BR2_GCC_TARGET_ARCH default "pentium3" if BR2_x86_pentium3 default "pentium4" if BR2_x86_pentium4 default "prescott" if BR2_x86_prescott + default "x86-64" if BR2_x86_x86_64 default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 -- 2.33.1 From thomas.petazzoni at bootlin.com Sun Jan 9 08:01:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 09:01:23 +0100 Subject: [Buildroot] [PATCH 2/2] arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4 In-Reply-To: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> References: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> Message-ID: <20220109080124.2271241-2-thomas.petazzoni@bootlin.com> In the face of the vast amount of x86-64 CPU architecture variants, Linux distributions have worked together to define "micro-architecture levels" in the x86-64 psABI, called x86-64-v2, x86-64-v3 and x86-64-v4. They standardize a set of CPU features, and GCC since its version 11.x has support for these micro-architecture levels as -march= options. It makes sense to support them in Buildroot, especially for those who want to build toolchains that aim at targeting a reasonably broad family of x86-64 processors. More details: https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 794d808d96..153c8bad38 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -91,6 +91,63 @@ config BR2_x86_x86_64 "Generic CPU with 64-bit extensions" by the GCC documentation. It is a 64-bit CPU with MMX, SSE and SSE2 support. +config BR2_x86_x86_64_v2 + bool "x86-64-v2" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v2 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is close to the Nehalem CPU architecture, and is + applicable for CPUs that support CMPXCHG16B, LAHF-SAHF, + POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3. +config BR2_x86_x86_64_v3 + bool "x86-64-v3" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v3 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is close to the Haswell CPU architecture, and is + applicable for CPUs that support all of x86-64-v2 plus AVX, + AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE. +config BR2_x86_x86_64_v4 + bool "x86-64-v4" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v4 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is applicable for CPUs that support all of x86-64-v3 plus + AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL. config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -292,6 +349,9 @@ config BR2_GCC_TARGET_ARCH default "pentium4" if BR2_x86_pentium4 default "prescott" if BR2_x86_prescott default "x86-64" if BR2_x86_x86_64 + default "x86-64-v2" if BR2_x86_x86_64_v2 + default "x86-64-v3" if BR2_x86_x86_64_v3 + default "x86-64-v4" if BR2_x86_x86_64_v4 default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 -- 2.33.1 From arnout at mind.be Sun Jan 9 08:04:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 09:04:48 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: <6025dff1-66cb-f56e-21ad-41042efc5517@mind.be> References: <20201126144745.502228-1-nolange79@gmail.com> <6025dff1-66cb-f56e-21ad-41042efc5517@mind.be> Message-ID: On 08/01/2022 23:38, Arnout Vandecappelle wrote: > > > On 08/01/2022 22:46, Norbert Lange wrote: >> Am Sa., 8. Jan. 2022 um 20:41 Uhr schrieb Arnout Vandecappelle : >>> >>> ?? Hi Norbert, >>> >>> On 26/11/2020 15:47, Norbert Lange wrote: >>>> journald supports catalog files, or rather a binary database of >>>> those. >>>> Functionality added includes: >>>> >>>> -?? A config option allows enabling the binary database. >>>> >>>> -?? if the option is enabled, the database is built and moved to >>>> ????? /usr/share/factory. A symlink is created in /var pointing to >>>> ????? that file. >>>> ????? If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the >>>> ????? language whitelist are deleted first. >>>> >>>> -?? the service normally used for creating the DB during boot, >>>> ????? and the catalog source files used as input are deleted. >>>> >>>> The move to /usr/share/factory is helpful for having /usr as whole >>>> system distribution. >>>> >>>> Signed-off-by: Norbert Lange >>> >>> ?? I was going to apply a second time, but then I noticed that I made some >>> comments on v2 [1] that you haven't answered to and I still think they're >>> valid. >>> So I've marked this patch as Changes Requested. >> >> I did reply and cover the comments in [2], not sure whats missing? >> Separating into 2 independent patches is not really helpfull IMHO. > > ?Oops, you're right. I'll look at the patch again tomorrow morning. ?As promised, I applied to master now. I changed the commit message quite a bit to (hopefully) better explain what is going on. package/systemd: add support for creating journal catalog DB ???journald supports catalog files, or rather a binary database of ???those. ???Functionality added includes: ???- ??A config option allows enabling the binary database. ???- ??If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the ???????language whitelist are deleted first. This is done independently ???????of the new option, since the catalogs are removed later anyway. ???- ??If the option is enabled, the database is built and moved to ???????/usr/share/factory. This makes sure that /usr contains the entire ???????system. A symlink is created in /var pointing to that file. ???- ??The catalog source files are deleted. They serve no purpose on the ???????target once the database exists. ???- ??All of the above is done in a ROOTFS_PRE_CMD_HOOK rather than in the ???????build/install step, because other packages than systemd itself may ???????also install catalogs. This also makes sure that it is possible to ???????do a re-build, because the catalog files are not removed in ???????$(TARGET_DIR) itself, only in the temporary copy for rootfs creation. ???- ??The service normally used for creating the DB during boot is ???????deleted. If the DB is not enabled, we also don't want to waste time ???????and space on re-generating every boot. Conversely, if the DB is ???????enabled, it is already there so doesn't need to be re-done on every ???????boot either. ???The new option depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW because ???if the rootfs is not RW, /var is overmounted with a tmpfs. The factory ???should handle this, but this only half-works [1]. ???[1] http://lists.busybox.net/pipermail/buildroot/2020-July/287016.html ???Signed-off-by: Norbert Lange ???Reviewed-by: Je?re?my Rosen ???Reviewed-by: Adam Duskett ???Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ?Two remarks about this: - By digging deeply into the mailing list archives, I discovered that in fact Je?re?my and Adam had already approved this patch. In this case, it helps a lot if you carry the Reviewed-by tag in follow-up versions. With a Reviewed-by we can have a lot more confidence about applying something (that we don't fully understand anyway). And you can't expect the maintainers to either remember everything that was ever posted on the list, or to go digging through the mailing list to find such details (we often do do that, but it's exactly because we have to do that that it takes a long time before patches get applied). - In the patch changelog, it helps if you mention that a change is due to a review request, e.g.: v2->v3: - use backticks instead of $$() [Arnout] ?And one final thing. This BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW thing is really shitty. I hope we can one day have a properly working systemd with readonly rootfs... ?Regards, ?Arnout > > ?Regards, > ?Arnout > >> >>> >>> ?? If you respin, please also include in the commit message the additional >>> explanations you made in reply to Romain. >>> >>> ?? Regards, >>> ?? Arnout >>> >>> [1] >>> https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ >>> >>> >>>> --- >>>> v1->v2: >>>> -?? Moved all logic into systemd.mk >>>> -?? solved the LOCALE_PURGE order that way >>>> -?? use the factory to store the file >>>> -?? option to enable the DB (similar to udev HWDB) >>>> -?? cant be anabled with !ROOTFS_RW, tons of >>>> ????? issues with that one >>>> v2->v3: >>>> -?? use backticks instead of $$() >>>> -?? be more explicit about what happens in >>>> ????? SYSTEMD_LOCALE_PURGE_CATALOGS >>>> >>>> Signed-off-by: Norbert Lange >>>> --- >>>> ?? package/systemd/Config.in? | 14 +++++++++++++ >>>> ?? package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ >>>> ?? 2 files changed, 55 insertions(+) >>>> >>>> diff --git a/package/systemd/Config.in b/package/systemd/Config.in >>>> index ec34478e3d..d576e6035b 100644 >>>> --- a/package/systemd/Config.in >>>> +++ b/package/systemd/Config.in >>>> @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD >>>> >>>> http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands >>>> >>>> +config BR2_PACKAGE_SYSTEMD_CATALOGDB >>>> +???? bool "enable journal catalog database installation" >>>> +???? depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting >>>> tmpfiles magic >>>> +???? help >>>> +?????? Build and install the journal catalog database. >>>> + >>>> +?????? catalog files are used to provide extended and potentially localized >>>> +?????? messages for the journal. >>>> + >>>> +?????? The original catalog files will be built into a DB at >>>> +?????? /usr/share/factory/var/lib/systemd/catalog/database. >>>> + >>>> + https://www.freedesktop.org/wiki/Software/systemd/catalog/ >>>> + >>>> ?? config BR2_PACKAGE_SYSTEMD_LOCALED >>>> ?????? bool "enable locale daemon" >>>> ?????? help >>>> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >>>> index cb12f667d6..ae99c02abf 100644 >>>> --- a/package/systemd/systemd.mk >>>> +++ b/package/systemd/systemd.mk >>>> @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD >>>> ?????? $(SYSTEMD_INSTALL_NETWORK_CONFS) >>>> ?? endef >>>> >>>> +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) >>>> +define SYSTEMD_LOCALE_PURGE_CATALOGS >>>> +???? # go through all files with scheme ..catalog >>>> +???? # and remove those where is not in LOCALE_NOPURGE >>>> +???? for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name >>>> '*.*.catalog'`; \ >>>> +???? do \ >>>> +???????????? basename=$${cfile##*/}; \ >>>> +???????????? basename=$${basename%.catalog}; \ >>>> +???????????? langext=$${basename#*.}; \ >>>> +???????????? [ "$$langext" = "$${basename}" ] && continue; \ >>>> +???????????? expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && >>>> continue; \ >>>> +???????????? rm -f "$$cfile"; \ >>>> +???? done >>>> +endef >>>> + >>>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS >>>> +endif >>>> + >>>> +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) >>>> +define SYSTEMD_UPDATE_CATALOGS >>>> +???? $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog >>>> +???? install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ >>>> + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database >>>> +???? rm $(TARGET_DIR)/var/lib/systemd/catalog/database >>>> +???? ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ >>>> +???????????? $(TARGET_DIR)/var/lib/systemd/catalog/database >>>> +???? grep -q '^L /var/lib/systemd/catalog/database' >>>> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ >>>> +???????????? printf "\nL /var/lib/systemd/catalog/database\n" >> >>>> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf >>>> +endef >>>> + >>>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS >>>> +endif >>>> + >>>> +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>>> +???? rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ >>>> + >>>> $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ >>>> + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service >>>> +endef >>>> + >>>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>>> + >>>> ?? define SYSTEMD_PRESET_ALL >>>> ?????? $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all >>>> ?? endef >>>> >> >> Norbert >> >> [2] - >> https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ >> From arnout at mind.be Sun Jan 9 08:43:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 09:43:28 +0100 Subject: [Buildroot] [git commit] package/systemd: add support for creating journal catalog DB Message-ID: <20220109083723.B68F882A95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01a7e1a9f8bcfa4d7f8b1dab85f84ec53797ea2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master journald supports catalog files, or rather a binary database of those. Functionality added includes: - A config option allows enabling the binary database. - If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the language whitelist are deleted first. This is done independently of the new option, since the catalogs are removed later anyway. - If the option is enabled, the database is built and moved to /usr/share/factory. This makes sure that /usr contains the entire system. A symlink is created in /var pointing to that file. - The catalog source files are deleted. They serve no purpose on the target once the database exists. - All of the above is done in a ROOTFS_PRE_CMD_HOOK rather than in the build/install step, because other packages than systemd itself may also install catalogs. This also makes sure that it is possible to do a re-build, because the catalog files are not removed in $(TARGET_DIR) itself, only in the temporary copy for rootfs creation. - The service normally used for creating the DB during boot is deleted. If the DB is not enabled, we also don't want to waste time and space on re-generating every boot. Conversely, if the DB is enabled, it is already there so doesn't need to be re-done on every boot either. The new option depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW because if the rootfs is not RW, /var is overmounted with a tmpfs. The factory should handle this, but this only half-works [1]. [1] http://lists.busybox.net/pipermail/buildroot/2020-July/287016.html Signed-off-by: Norbert Lange Reviewed-by: Je??re??my Rosen Reviewed-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/Config.in | 14 ++++++++++++++ package/systemd/systemd.mk | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 0148cad791..c8c5a9c47b 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands +config BR2_PACKAGE_SYSTEMD_CATALOGDB + bool "enable journal catalog database installation" + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic + help + Build and install the journal catalog database. + + catalog files are used to provide extended and potentially + localized messages for the journal. + + The original catalog files will be built into a DB at + /usr/share/factory/var/lib/systemd/catalog/database. + + https://www.freedesktop.org/wiki/Software/systemd/catalog/ + config BR2_PACKAGE_SYSTEMD_LOCALED bool "enable locale daemon" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 17bb922f51..a2417ebe19 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -678,6 +678,44 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD $(SYSTEMD_INSTALL_NETWORK_CONFS) endef +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) +# Go through all files with scheme ..catalog +# and remove those where is not in LOCALE_NOPURGE +define SYSTEMD_LOCALE_PURGE_CATALOGS + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ + do \ + basename=$${cfile##*/}; \ + basename=$${basename%.catalog}; \ + langext=$${basename#*.}; \ + [ "$$langext" = "$${basename}" ] && continue; \ + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ + rm -f "$$cfile"; \ + done +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) +define SYSTEMD_UPDATE_CATALOGS + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database + rm $(TARGET_DIR)/var/lib/systemd/catalog/database + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ + $(TARGET_DIR)/var/lib/systemd/catalog/database + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS +endif + +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE + define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef From james.hilliard1 at gmail.com Sun Jan 9 08:47:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 01:47:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env Message-ID: <20220109084732.2567404-1-james.hilliard1@gmail.com> This should be more reliable and fix the host == target bug when doing indirect invocations using the cargo env. Signed-off-by: James Hilliard --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 47ae86bfae..b6cb65c4f0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -27,6 +27,7 @@ PKG_CARGO_ENV = \ CARGO_HOME=$(HOST_DIR)/share/cargo \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" ################################################################################ @@ -88,7 +89,6 @@ define $(2)_BUILD_CMDS $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ --manifest-path Cargo.toml \ --locked \ - -Z target-applies-to-host \ $$($(2)_CARGO_BUILD_OPTS) endef else # ifeq ($(4),target) -- 2.25.1 From peter at korsgaard.com Sun Jan 9 08:57:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 09:57:12 +0100 Subject: [Buildroot] [PATCH next 2/3] package/inadyn: refactor start script In-Reply-To: <20211205102907.2836980-3-troglobit@gmail.com> (Joachim Wiberg's message of "Sun, 5 Dec 2021 11:29:05 +0100") References: <20211205102907.2836980-1-troglobit@gmail.com> <20211205102907.2836980-3-troglobit@gmail.com> Message-ID: <87zgo5cmmv.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > This patch is a complete rewrite of the Inadyn start script, based on > the BusyBox S01syslogd template. Additional features, compared to the > template, are limited to the ability to: > - Check if enabled, using an ENABLED="yes" from /etc/default/inadyn, > this for compatibility with the previous version of the script > - Override INADYN_ARGS from /etc/default/inadyn > - A reload command that sends SIGHUP, since that works and is both > quicker and a less resource intensive operation > Signed-off-by: Joachim Wiberg > --- > package/inadyn/S70inadyn | 100 +++++++++++++++++++++++++-------------- > 1 file changed, 65 insertions(+), 35 deletions(-) > mode change 100644 => 100755 package/inadyn/S70inadyn > diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn > old mode 100644 > new mode 100755 > index ca7b414678..d44acacec3 > --- a/package/inadyn/S70inadyn > +++ b/package/inadyn/S70inadyn > @@ -1,44 +1,74 @@ > #!/bin/sh > +# Customizations are sourced from /etc/default/inadyn. For example, > +# override INADYN_ARGS to adjust log level, add a startup delay, etc. > # > -# Start & stop the inadyn client > -# > +# NOTE: to start, add a line ENABLED="yes" to /etc/default/inadyn > + > +DAEMON="inadyn" > +PIDFILE="/var/run/$DAEMON.pid" > + > +INADYN_ARGS="" > -CONFIG=/etc/inadyn.conf > +# shellcheck source=/dev/null > +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" > -# check if CONFIG exists, print message & exit if it doesn't > -[ ! -f $CONFIG ] && ( echo "The config file "$CONFIG" is missing...exiting now." && exit 2 ) > +start() > +{ Our other init scripts have the { on the same line as the function, so changed that and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 08:56:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 09:56:13 +0100 Subject: [Buildroot] [git commit] package/inadyn: refactor start script Message-ID: <20220109085114.8F3B482A95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=787f7b58a7fb7c68e1f54573b6c0a29defdc5dcb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch is a complete rewrite of the Inadyn start script, based on the BusyBox S01syslogd template. Additional features, compared to the template, are limited to the ability to: - Check if enabled, using an ENABLED="yes" from /etc/default/inadyn, this for compatibility with the previous version of the script - Override INADYN_ARGS from /etc/default/inadyn - A reload command that sends SIGHUP, since that works and is both quicker and a less resource intensive operation Signed-off-by: Joachim Wiberg Signed-off-by: Peter Korsgaard --- package/inadyn/S70inadyn | 96 ++++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 35 deletions(-) diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn old mode 100644 new mode 100755 index ca7b414678..8a71693cba --- a/package/inadyn/S70inadyn +++ b/package/inadyn/S70inadyn @@ -1,44 +1,70 @@ #!/bin/sh +# Customizations are sourced from /etc/default/inadyn. For example, +# override INADYN_ARGS to adjust log level, add a startup delay, etc. # -# Start & stop the inadyn client -# +# NOTE: to start, add a line ENABLED="yes" to /etc/default/inadyn + +DAEMON="inadyn" +PIDFILE="/var/run/$DAEMON.pid" + +INADYN_ARGS="" -CONFIG=/etc/inadyn.conf +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" -# check if CONFIG exists, print message & exit if it doesn't -[ ! -f $CONFIG ] && ( echo "The config file "$CONFIG" is missing...exiting now." && exit 2 ) +start() { + printf 'Starting %s: ' "$DAEMON" + if [ "$ENABLED" != "yes" ]; then + echo "SKIPPED" + exit 0 + fi + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $INADYN_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} -# Allow a few customizations from a config file. Especially inadyn -# must be explicitly enabled by adding ENABLED="yes" in this file. -test -r /etc/default/inadyn && . /etc/default/inadyn +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + printf 'Reloading %s: ' "$DAEMON" + start-stop-daemon -K -s HUP -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} case "$1" in - start) - printf "Starting inadyn: " - if test "${ENABLED}" != "yes" ; then - echo "SKIPPED" - exit 0 - fi - start-stop-daemon -b -q -S -p /var/run/inadyn.pid -x /usr/sbin/inadyn - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping inadyn: " - if test "${ENABLED}" != "yes" ; then - echo "SKIPPED" - exit 0 - fi - start-stop-daemon -q -K -p /var/run/inadyn.pid -x /usr/sbin/inadyn - [ $? = 0 ] && echo "OK" || echo "FAIL" - rm -f /var/run/inadyn.pid - ;; - restart) - "$0" stop - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" + start|stop|restart|reload) + "$1";; + *) + echo "Usage: $0 {start|stop|restart|reload}" exit 1 esac - -exit $? From thomas.petazzoni at bootlin.com Sun Jan 9 08:58:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 09:58:48 +0100 Subject: [Buildroot] [git commit] package/simple-mail: new package Message-ID: <20220109085442.D6F6E8269E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32ecd0242de75a1c01e295d30f78f155a8da1d17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Zoltan Gyarmati [Thomas: - bump to 2.3.0 - don't build demos, they need QtWidgets] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/simple-mail/Config.in | 9 +++++++++ package/simple-mail/simple-mail.hash | 5 +++++ package/simple-mail/simple-mail.mk | 15 +++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3b544cae6b..ed65c74319 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3017,4 +3017,5 @@ F: package/python-iniparse/ F: package/qjson/ F: package/quazip/ F: package/shapelib/ +F: package/simple-mail/ F: package/tinc/ diff --git a/package/Config.in b/package/Config.in index 378d6e8c0c..2d3ca6a3b6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -364,6 +364,7 @@ comment "QT libraries and helper libraries" source "package/qjson/Config.in" source "package/quazip/Config.in" source "package/qwt/Config.in" + source "package/simple-mail/Config.in" endif source "package/tekui/Config.in" source "package/weston/Config.in" diff --git a/package/simple-mail/Config.in b/package/simple-mail/Config.in new file mode 100644 index 0000000000..681a8410db --- /dev/null +++ b/package/simple-mail/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SIMPLE_MAIL + bool "simple-mail" + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_NETWORK + select BR2_PACKAGE_OPENSSL + help + An SMTP library written in C++ for Qt. + + https://github.com/cutelyst/simple-mail diff --git a/package/simple-mail/simple-mail.hash b/package/simple-mail/simple-mail.hash new file mode 100644 index 0000000000..67d6caff87 --- /dev/null +++ b/package/simple-mail/simple-mail.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 2026f2017662508b0f25da72694f1dd13ab3ccf82c0454f7c40f8a6cc450c410 simple-mail-2.3.0.tar.gz + +# Hash for license file +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c LICENSE diff --git a/package/simple-mail/simple-mail.mk b/package/simple-mail/simple-mail.mk new file mode 100644 index 0000000000..68484f79b0 --- /dev/null +++ b/package/simple-mail/simple-mail.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# simple-mail +# +################################################################################ + +SIMPLE_MAIL_VERSION = 2.3.0 +SIMPLE_MAIL_SITE = $(call github,cutelyst,simple-mail,v$(SIMPLE_MAIL_VERSION)) +SIMPLE_MAIL_INSTALL_STAGING = YES +SIMPLE_MAIL_LICENSE = LGPL-2.1+ +SIMPLE_MAIL_LICENSE_FILES = LICENSE +SIMPLE_MAIL_DEPENDENCIES = qt5base +SIMPLE_MAIL_CONF_OPTS = -DBUILD_DEMOS=OFF + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Sun Jan 9 09:02:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 10:02:08 +0100 Subject: [Buildroot] [PATCH] package/simple-mail: new package In-Reply-To: <20210106205206.433749-1-zgyarmati@zgyarmati.de> References: <20210106205206.433749-1-zgyarmati@zgyarmati.de> Message-ID: <20220109100208.2a1d351d@windsurf> On Wed, 6 Jan 2021 21:52:06 +0100 Zoltan Gyarmati wrote: > Signed-off-by: Zoltan Gyarmati > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/simple-mail/Config.in | 9 +++++++++ > package/simple-mail/simple-mail.hash | 5 +++++ > package/simple-mail/simple-mail.mk | 14 ++++++++++++++ > 5 files changed, 30 insertions(+) > create mode 100644 package/simple-mail/Config.in > create mode 100644 package/simple-mail/simple-mail.hash > create mode 100644 package/simple-mail/simple-mail.mk After almost one year, patch is applied! I bumped to the latest version, 2.3.0, and had to disable the demos because some of them need QtWidgets, which this package doesn't require. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sun Jan 9 09:04:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 10:04:34 +0100 Subject: [Buildroot] [git commit] fs: clean the volatile /run and /tmp directories Message-ID: <20220109090438.04CA982940@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e78e7e97d772124f0d31653aca33731abe5b4db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master At run time, /run and /tmp get overmounted with a tmpfs, so anything that is there becomes inaccessible. Scripts in the fakeroot environment could call tools preparing the early environment, leaving traces in /run or /tmp. For example, mkusers might create home directories in /run: openssh sets the sshd home directory to /run/sshd, so mkusers creates it. But since a tmpfs is mounted over it, it doesn't exist at runtime, so the openssh service creates it at startup (and deletes it when the service is stopped). In addition, packages or rootfs overlay may leave things there as well. Those may actually pose a runtime problem because the created file or directory is missing - or it may not be a problem because the package creates the missing files/directories on startup. In this situation, it's better not to have them in the rootfs image (because they're not functional anyway), but it's good to leave them in TARGET_DIR to make it easier to debug the situation. Therefore, remove the contents of /run and /tmp in the fakeroot environment after ROOTFS_PRE_GEN_HOOKS, so they are still left in TARGET_DIR. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- fs/common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/common.mk b/fs/common.mk index afab7b50fb..45beb5ae7b 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,6 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) From arnout at mind.be Sun Jan 9 09:11:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 10:11:23 +0100 Subject: [Buildroot] [PATCH 2/2] fs: clean the volatile /run and /tmp directories In-Reply-To: <20200605224858.12870-2-nolange79@gmail.com> References: <20200605224858.12870-1-nolange79@gmail.com> <20200605224858.12870-2-nolange79@gmail.com> Message-ID: Hi Norbert, On 06/06/2020 00:48, Norbert Lange wrote: > Scripts in the fakeroot environment could call > tools preparing the early environment, leaving > traces in /run or /tmp. > > mkusers might create home directories in /run for > example. > > Signed-off-by: Norbert Lange I finally applied to master, thanks. I extended the commit message based on the discussion on the patch. Regards, Arnout > --- > fs/common.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/common.mk b/fs/common.mk > index 842ea924a5..a5c6b4ea96 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -171,6 +171,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > chmod a+x $$(FAKEROOT_SCRIPT) > From peter at korsgaard.com Sun Jan 9 09:37:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 10:37:33 +0100 Subject: [Buildroot] [PATCH] package/poppler: use HTTPS for upstream URL Message-ID: <20220109093735.4860-1-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget versions (E.G. s.b.o): wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz DEBUG output created by Wget 1.14 on linux-gnu. URI encoding = ?UTF-8? Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 Caching poppler.freedesktop.org => 147.75.198.156 Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. Created socket 3. Releasing 0x0000000001ceda80 (new refcount 1). ---request begin--- GET /poppler-21.12.0.tar.xz HTTP/1.1 User-Agent: Wget/1.14 (linux-gnu) Accept: */* Host: poppler.freedesktop.org Connection: Keep-Alive ---request end--- HTTP request sent, awaiting response... ---response begin--- HTTP/1.1 308 Permanent Redirect Date: Sun, 09 Jan 2022 09:28:02 GMT Content-Type: text/html Content-Length: 164 Connection: keep-alive Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz ---response end--- 308 Permanent Redirect Registered socket 3 for persistent reuse. Skipping 164 bytes of body: [ 308 Permanent Redirect

    308 Permanent Redirect

    nginx
    ] done. 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. Signed-off-by: Peter Korsgaard --- package/poppler/Config.in | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index f59115813d..21c4d86cf6 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POPPLER Poppler is a PDF rendering library based on the xpdf-3.0 code base. - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ if BR2_PACKAGE_POPPLER diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 23f04f6e51..9e9bfc9cba 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -6,7 +6,7 @@ POPPLER_VERSION = 21.12.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org +POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING -- 2.20.1 From thomas.petazzoni at bootlin.com Sun Jan 9 10:04:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 11:04:18 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> Message-ID: <20220109110418.0c7fc038@windsurf> On Fri, 7 Jan 2022 22:07:26 +0100 Romain Naour wrote: > > +endif # ifeq ($(4),target) > > +endif # ifndef $(2)_BUILD_CMDS > > + > > is _INSTALL_STAGING_CMDS is missing here ? > > Rust package may wand to install *.rlib files [1] (similar to .a) But will Cargo pick up .rlib files from STAGING_DIR ? I don't see how Cargo/Rust knows about STAGING_DIR. Aren't those .rlib files anyway installed in CARGO_HOME, and Cargo picks them up from here, or something like that? Installing to STAGING_DIR is one thing, but what's important is to figure out if Cargo is really going to use what we install in STAGING_DIR. Do we have a specific example where one package installs a .rlib and another package uses it? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 10:07:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 11:07:37 +0100 Subject: [Buildroot] [git commit] support/download/go-post-process: drop -o pipefail Message-ID: <20220109100242.803BA82B60@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfd1a31d0e590c8545df7159a9e61febbd220370 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This breaks the post_process_unpack() function in support/download/helpers, which had a sequence of pipe, with "head" that can abort early and cause the pipe to fail. Fixes intermitent: make[1]: *** [package/pkg-generic.mk:190: /builds/tpetazzoni/buildroot/test-output/TestDockerCompose/build/containerd-1.5.8/.stamp_downloaded] Error 141 Signed-off-by: Thomas Petazzoni --- support/download/go-post-process | 1 - 1 file changed, 1 deletion(-) diff --git a/support/download/go-post-process b/support/download/go-post-process index be202a4c0f..ef96a76948 100755 --- a/support/download/go-post-process +++ b/support/download/go-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" From arnout at mind.be Sun Jan 9 10:29:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 11:29:32 +0100 Subject: [Buildroot] [PATCH] skeleton + init: prepare /run/lock and adjust compat symlinks In-Reply-To: <20201004224137.193808-1-nolange79@gmail.com> References: <20201004224137.193808-1-nolange79@gmail.com> Message-ID: On 05/10/2020 00:41, Norbert Lange wrote: > Linux distros changed /var/run and /var/lock to reside on an tmpfs in > /run a long time ago, and buildroot seems to agree by providing this > tmpfs on all supported init systems. > > Packages on the other hand are currently free to either use /var/run > or /run, and similarly using /var/lock should be identical to the > replacement /run/lock. > > This series aims to ensure that *if* /var/lock is needed, then > it will be a symlink to /run/lock. Allowing packages to continue > working and allowing them to migrate to using /run/lock. > > If all relevant packages are fixed, > the compatibility symlinks in /var can be dropped. > > Status before this patch: > > * Systemd > > /run will be mounted by PID1, /var/run will be recreated by > /usr/lib/tmpfiles.d/var.conf. > > Creating /run/lock/subsys and the compatibility symlink is handled > in /usr/lib/tmpfiles.d/legacy.conf. > But this is *currently not installed* by Buildroot, see [1]. > > * OpenRC > > Seems to check for existence of a /run directory and does all > necessary setup. > > * SysV > > /var/lock is currently a symlink to /tmp. > > * Busybox > > Same as sysv (Buildroot uses the sysv skeleton) > > Note that we create /run/lock/subsys, so sysv scrips could expect this > directory to exist. Apart from simplifying scripts, creating the dir > early as root adds some security. > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Arnout > --- > package/busybox/inittab | 1 + > package/skeleton-init-openrc/skeleton/var/lock | 2 +- > package/skeleton-init-sysv/skeleton/var/lock | 2 +- > package/sysvinit/inittab | 13 +++++++------ > 4 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/package/busybox/inittab b/package/busybox/inittab > index ff1725c775..f2b4df801b 100644 > --- a/package/busybox/inittab > +++ b/package/busybox/inittab > @@ -18,6 +18,7 @@ > ::sysinit:/bin/mount -o remount,rw / > ::sysinit:/bin/mkdir -p /dev/pts /dev/shm > ::sysinit:/bin/mount -a > +::sysinit:/bin/mkdir -p /run/lock/subsys > ::sysinit:/sbin/swapon -a > null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd > null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin > diff --git a/package/skeleton-init-openrc/skeleton/var/lock b/package/skeleton-init-openrc/skeleton/var/lock > index 1431b0e432..386c09e727 120000 > --- a/package/skeleton-init-openrc/skeleton/var/lock > +++ b/package/skeleton-init-openrc/skeleton/var/lock > @@ -1 +1 @@ > -../tmp > \ No newline at end of file > +../run/lock > \ No newline at end of file > diff --git a/package/skeleton-init-sysv/skeleton/var/lock b/package/skeleton-init-sysv/skeleton/var/lock > index 1431b0e432..386c09e727 120000 > --- a/package/skeleton-init-sysv/skeleton/var/lock > +++ b/package/skeleton-init-sysv/skeleton/var/lock > @@ -1 +1 @@ > -../tmp > \ No newline at end of file > +../run/lock > \ No newline at end of file > diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab > index a31471031f..afc28e6c03 100644 > --- a/package/sysvinit/inittab > +++ b/package/sysvinit/inittab > @@ -8,12 +8,13 @@ si0::sysinit:/bin/mount -t proc proc /proc > si1::sysinit:/bin/mount -o remount,rw / > si2::sysinit:/bin/mkdir -p /dev/pts /dev/shm > si3::sysinit:/bin/mount -a > -si4::sysinit:/sbin/swapon -a > -si5::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null > -si6::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null > -si7::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null > -si8::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null > -si9::sysinit:/bin/hostname -F /etc/hostname > +si4::sysinit:/bin/mkdir -p /run/lock/subsys > +si5::sysinit:/sbin/swapon -a > +si6::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null > +si7::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null > +si8::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null > +si9::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null > +si10::sysinit:/bin/hostname -F /etc/hostname > rcS:12345:wait:/etc/init.d/rcS > > # S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL > From arnout at mind.be Sun Jan 9 10:28:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 11:28:56 +0100 Subject: [Buildroot] [git commit] skeleton + init: prepare /run/lock and adjust compat symlinks Message-ID: <20220109102332.4052482963@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf01e51f3c626c2235f587b561af4bfac192c05e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Linux distros changed /var/run and /var/lock to reside on an tmpfs in /run a long time ago, and buildroot seems to agree by providing this tmpfs on all supported init systems. Packages on the other hand are currently free to either use /var/run or /run, and similarly using /var/lock should be identical to the replacement /run/lock. This series aims to ensure that *if* /var/lock is needed, then it will be a symlink to /run/lock. Allowing packages to continue working and allowing them to migrate to using /run/lock. If all relevant packages are fixed, the compatibility symlinks in /var can be dropped. Status before this patch: * Systemd /run will be mounted by PID1, /var/run will be recreated by /usr/lib/tmpfiles.d/var.conf. Creating /run/lock/subsys and the compatibility symlink is handled in /usr/lib/tmpfiles.d/legacy.conf. But this is *currently not installed* by Buildroot, see [1]. * OpenRC Seems to check for existence of a /run directory and does all necessary setup. * SysV /var/lock is currently a symlink to /tmp. * Busybox Same as sysv (Buildroot uses the sysv skeleton) Note that we create /run/lock/subsys, so sysv scrips could expect this directory to exist. Apart from simplifying scripts, creating the dir early as root adds some security. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/inittab | 1 + package/skeleton-init-openrc/skeleton/var/lock | 2 +- package/skeleton-init-sysv/skeleton/var/lock | 2 +- package/sysvinit/inittab | 13 +++++++------ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/busybox/inittab b/package/busybox/inittab index ff1725c775..f2b4df801b 100644 --- a/package/busybox/inittab +++ b/package/busybox/inittab @@ -18,6 +18,7 @@ ::sysinit:/bin/mount -o remount,rw / ::sysinit:/bin/mkdir -p /dev/pts /dev/shm ::sysinit:/bin/mount -a +::sysinit:/bin/mkdir -p /run/lock/subsys ::sysinit:/sbin/swapon -a null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin diff --git a/package/skeleton-init-openrc/skeleton/var/lock b/package/skeleton-init-openrc/skeleton/var/lock index 1431b0e432..386c09e727 120000 --- a/package/skeleton-init-openrc/skeleton/var/lock +++ b/package/skeleton-init-openrc/skeleton/var/lock @@ -1 +1 @@ -../tmp \ No newline at end of file +../run/lock \ No newline at end of file diff --git a/package/skeleton-init-sysv/skeleton/var/lock b/package/skeleton-init-sysv/skeleton/var/lock index 1431b0e432..386c09e727 120000 --- a/package/skeleton-init-sysv/skeleton/var/lock +++ b/package/skeleton-init-sysv/skeleton/var/lock @@ -1 +1 @@ -../tmp \ No newline at end of file +../run/lock \ No newline at end of file diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab index a31471031f..afc28e6c03 100644 --- a/package/sysvinit/inittab +++ b/package/sysvinit/inittab @@ -8,12 +8,13 @@ si0::sysinit:/bin/mount -t proc proc /proc si1::sysinit:/bin/mount -o remount,rw / si2::sysinit:/bin/mkdir -p /dev/pts /dev/shm si3::sysinit:/bin/mount -a -si4::sysinit:/sbin/swapon -a -si5::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null -si6::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null -si7::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null -si8::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null -si9::sysinit:/bin/hostname -F /etc/hostname +si4::sysinit:/bin/mkdir -p /run/lock/subsys +si5::sysinit:/sbin/swapon -a +si6::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null +si7::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null +si8::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null +si9::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null +si10::sysinit:/bin/hostname -F /etc/hostname rcS:12345:wait:/etc/init.d/rcS # S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL From yann.morin.1998 at free.fr Sun Jan 9 10:30:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 11:30:26 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4 Message-ID: <20220109102523.6DBBB82B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eeace1cc13ce09a0c88ce177465b836d6eb58298 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In the face of the vast amount of x86-64 CPU architecture variants, Linux distributions have worked together to define "micro-architecture levels" in the x86-64 psABI, called x86-64-v2, x86-64-v3 and x86-64-v4. They standardize a set of CPU features, and GCC since its version 11.x has support for these micro-architecture levels as -march= options. It makes sense to support them in Buildroot, especially for those who want to build toolchains that aim at targeting a reasonably broad family of x86-64 processors. It only really makes sense to use as 64-bit CPUs, and not as 32-bit ones, so we guard them behind BR2_x86_64. More details: https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=59482fa1e7243bd905c7e27c92ae2b89c79fff87 Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - they are x86-64-only CPUs - add gcc commit URL ] Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 34564c1ed1..0ba9ecbcea 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -92,6 +92,66 @@ config BR2_x86_x86_64 "Generic CPU with 64-bit extensions" by the GCC documentation. It is a 64-bit CPU with MMX, SSE and SSE2 support. +config BR2_x86_x86_64_v2 + bool "x86-64-v2" + depends on BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v2 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is close to the Nehalem CPU architecture, and is + applicable for CPUs that support CMPXCHG16B, LAHF-SAHF, + POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3. +config BR2_x86_x86_64_v3 + bool "x86-64-v3" + depends on BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v3 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is close to the Haswell CPU architecture, and is + applicable for CPUs that support all of x86-64-v2 plus AVX, + AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE. +config BR2_x86_x86_64_v4 + bool "x86-64-v4" + depends on BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v4 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is applicable for CPUs that support all of x86-64-v3 plus + AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL. config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -293,6 +353,9 @@ config BR2_GCC_TARGET_ARCH default "pentium4" if BR2_x86_pentium4 default "prescott" if BR2_x86_prescott default "x86-64" if BR2_x86_x86_64 + default "x86-64-v2" if BR2_x86_x86_64_v2 + default "x86-64-v3" if BR2_x86_x86_64_v3 + default "x86-64-v4" if BR2_x86_x86_64_v4 default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 From yann.morin.1998 at free.fr Sun Jan 9 10:30:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 11:30:26 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add option for -march=x86-64 Message-ID: <20220109102523.65CEC812B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6ce2a16814fd96a45888a774da6a4db74cd540a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We already have support for a wide range of x86-64 CPUs, but we don't have any option to build for the most generic possible x86-64 CPU, as made available by the -march=x86-64 GCC option. This commit makes this option available in Buildroot. It only really makes sense to use as a 64-bit CPU, and not as a 32-bit one, so we guard it behind BR2_x86_64. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: it's an x86-64-only CPU] Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 7aae3cafb7..34564c1ed1 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -81,6 +81,17 @@ config BR2_x86_prescott select BR2_X86_CPU_HAS_SSE select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 +config BR2_x86_x86_64 + bool "x86-64" + depends on BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + help + This option corresponds to -march=x86-64, documented as a + "Generic CPU with 64-bit extensions" by the GCC + documentation. It is a 64-bit CPU with MMX, SSE and SSE2 + support. config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -281,6 +292,7 @@ config BR2_GCC_TARGET_ARCH default "pentium3" if BR2_x86_pentium3 default "pentium4" if BR2_x86_pentium4 default "prescott" if BR2_x86_prescott + default "x86-64" if BR2_x86_x86_64 default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 From yann.morin.1998 at free.fr Sun Jan 9 10:33:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 11:33:51 +0100 Subject: [Buildroot] [PATCH 1/2] arch/Config.in.x86: add option for -march=x86-64 In-Reply-To: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> References: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> Message-ID: <20220109103351.GJ1881783@scaer> Thomas, All, On 2022-01-09 09:01 +0100, Thomas Petazzoni spake thusly: > We already have support for a wide range of x86-64 CPUs, but we don't > have any option to build for the most generic possible x86-64 CPU, as > made available by the -march=x86-64 GCC option. As discussed, it only really makes sense to use them as a 64-bit CPU, so I've added a dependency on BR2_x86_64. > This commit makes this option available in Buildroot. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > arch/Config.in.x86 | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 > index 7aae3cafb7..794d808d96 100644 > --- a/arch/Config.in.x86 > +++ b/arch/Config.in.x86 > @@ -81,6 +81,16 @@ config BR2_x86_prescott > select BR2_X86_CPU_HAS_SSE > select BR2_X86_CPU_HAS_SSE2 > select BR2_X86_CPU_HAS_SSE3 > +config BR2_x86_x86_64 > + bool "x86-64" > + select BR2_X86_CPU_HAS_MMX > + select BR2_X86_CPU_HAS_SSE > + select BR2_X86_CPU_HAS_SSE2 > + help > + This option corresponds to -march=x86-64, documented as a > + "Generic CPU with 64-bit extensions" by the GCC > + documentation. It is a 64-bit CPU with MMX, SSE and SSE2 > + support. > config BR2_x86_nocona > bool "nocona" > select BR2_X86_CPU_HAS_MMX > @@ -281,6 +291,7 @@ config BR2_GCC_TARGET_ARCH > default "pentium3" if BR2_x86_pentium3 > default "pentium4" if BR2_x86_pentium4 > default "prescott" if BR2_x86_prescott > + default "x86-64" if BR2_x86_x86_64 > default "nocona" if BR2_x86_nocona > default "core2" if BR2_x86_core2 > default "corei7" if BR2_x86_corei7 > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 10:36:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 11:36:07 +0100 Subject: [Buildroot] [PATCH 2/2] arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4 In-Reply-To: <20220109080124.2271241-2-thomas.petazzoni@bootlin.com> References: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> <20220109080124.2271241-2-thomas.petazzoni@bootlin.com> Message-ID: <20220109103607.GK1881783@scaer> Thomas, All, On 2022-01-09 09:01 +0100, Thomas Petazzoni spake thusly: > In the face of the vast amount of x86-64 CPU architecture variants, > Linux distributions have worked together to define "micro-architecture > levels" in the x86-64 psABI, called x86-64-v2, x86-64-v3 and > x86-64-v4. They standardize a set of CPU features, and GCC since its > version 11.x has support for these micro-architecture levels as > -march= options. > > It makes sense to support them in Buildroot, especially for those who > want to build toolchains that aim at targeting a reasonably broad > family of x86-64 processors. As for x86-64, I've added a dependency on BR2_x86_64. > More details: > > https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex > https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level > https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels I've added a URL to the upstream commit too. > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > arch/Config.in.x86 | 60 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 > index 794d808d96..153c8bad38 100644 > --- a/arch/Config.in.x86 > +++ b/arch/Config.in.x86 > @@ -91,6 +91,63 @@ config BR2_x86_x86_64 > "Generic CPU with 64-bit extensions" by the GCC > documentation. It is a 64-bit CPU with MMX, SSE and SSE2 > support. > +config BR2_x86_x86_64_v2 > + bool "x86-64-v2" > + select BR2_X86_CPU_HAS_MMX > + select BR2_X86_CPU_HAS_SSE > + select BR2_X86_CPU_HAS_SSE2 > + select BR2_X86_CPU_HAS_SSE3 > + select BR2_X86_CPU_HAS_SSSE3 > + select BR2_X86_CPU_HAS_SSE4 > + select BR2_X86_CPU_HAS_SSE42 > + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 > + help > + This option corresponds to the x86-64-v2 micro-architecture > + level, as defined by the x86-64 psABI document, see > + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. > + > + It is close to the Nehalem CPU architecture, and is > + applicable for CPUs that support CMPXCHG16B, LAHF-SAHF, > + POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3. > +config BR2_x86_x86_64_v3 > + bool "x86-64-v3" > + select BR2_X86_CPU_HAS_MMX > + select BR2_X86_CPU_HAS_SSE > + select BR2_X86_CPU_HAS_SSE2 > + select BR2_X86_CPU_HAS_SSE3 > + select BR2_X86_CPU_HAS_SSSE3 > + select BR2_X86_CPU_HAS_SSE4 > + select BR2_X86_CPU_HAS_SSE42 > + select BR2_X86_CPU_HAS_AVX > + select BR2_X86_CPU_HAS_AVX2 > + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 > + help > + This option corresponds to the x86-64-v3 micro-architecture > + level, as defined by the x86-64 psABI document, see > + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. > + > + It is close to the Haswell CPU architecture, and is > + applicable for CPUs that support all of x86-64-v2 plus AVX, > + AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE. > +config BR2_x86_x86_64_v4 > + bool "x86-64-v4" > + select BR2_X86_CPU_HAS_MMX > + select BR2_X86_CPU_HAS_SSE > + select BR2_X86_CPU_HAS_SSE2 > + select BR2_X86_CPU_HAS_SSE3 > + select BR2_X86_CPU_HAS_SSSE3 > + select BR2_X86_CPU_HAS_SSE4 > + select BR2_X86_CPU_HAS_SSE42 > + select BR2_X86_CPU_HAS_AVX > + select BR2_X86_CPU_HAS_AVX2 > + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 > + help > + This option corresponds to the x86-64-v4 micro-architecture > + level, as defined by the x86-64 psABI document, see > + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. > + > + It is applicable for CPUs that support all of x86-64-v3 plus > + AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL. > config BR2_x86_nocona > bool "nocona" > select BR2_X86_CPU_HAS_MMX > @@ -292,6 +349,9 @@ config BR2_GCC_TARGET_ARCH > default "pentium4" if BR2_x86_pentium4 > default "prescott" if BR2_x86_prescott > default "x86-64" if BR2_x86_x86_64 > + default "x86-64-v2" if BR2_x86_x86_64_v2 > + default "x86-64-v3" if BR2_x86_x86_64_v3 > + default "x86-64-v4" if BR2_x86_x86_64_v4 > default "nocona" if BR2_x86_nocona > default "core2" if BR2_x86_core2 > default "corei7" if BR2_x86_corei7 > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sun Jan 9 10:46:07 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 11:46:07 +0100 Subject: [Buildroot] [PATCH 2/2] arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4 In-Reply-To: <20220109103607.GK1881783@scaer> References: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> <20220109080124.2271241-2-thomas.petazzoni@bootlin.com> <20220109103607.GK1881783@scaer> Message-ID: <43cb4bd6-d40d-5a58-051a-75c9f4b1e1c2@smile.fr> Hello Thomas, Yann, Le 09/01/2022 ? 11:36, Yann E. MORIN a ?crit?: > Thomas, All, > > On 2022-01-09 09:01 +0100, Thomas Petazzoni spake thusly: >> In the face of the vast amount of x86-64 CPU architecture variants, >> Linux distributions have worked together to define "micro-architecture >> levels" in the x86-64 psABI, called x86-64-v2, x86-64-v3 and >> x86-64-v4. They standardize a set of CPU features, and GCC since its >> version 11.x has support for these micro-architecture levels as >> -march= options. >> >> It makes sense to support them in Buildroot, especially for those who >> want to build toolchains that aim at targeting a reasonably broad >> family of x86-64 processors. > > As for x86-64, I've added a dependency on BR2_x86_64. > >> More details: >> >> https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex >> https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level >> https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels > > I've added a URL to the upstream commit too. Sorry I'm late, but I had a look at this series to use x86-64-v3 and x86-64-v4 for Qemu runtime testing. There are some limitation with the current version of Qemu (6.2.0): "Note that TCG is not capable of supporting the 2 newest ABI levels currently: * x86-64-abi3: CPUID.01H:ECX.fma [bit 12] CPUID.01H:ECX.avx [bit 28] CPUID.01H:ECX.f16c [bit 29] CPUID.07H:EBX.avx2 [bit 5] * x86-64-abi4: CPUID.01H:ECX.pcid [bit 17] CPUID.01H:ECX.x2apic [bit 21] CPUID.01H:ECX.tsc-deadline [bit 24] CPUID.07H:EBX.invpcid [bit 10] CPUID.07H:EBX.avx512f [bit 16] CPUID.07H:EBX.avx512dq [bit 17] CPUID.07H:EBX.rdseed [bit 18] CPUID.07H:EBX.avx512cd [bit 28] CPUID.07H:EBX.avx512bw [bit 30] CPUID.07H:EBX.avx512vl [bit 31] CPUID.80000001H:ECX.3dnowprefetch [bit 8] CPUID.0DH:EAX.xsavec [bit 1]" https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg00170.html I wanted to reply to add this info in the commit log. Best regards, Romain > >> Signed-off-by: Thomas Petazzoni > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > From romain.naour at smile.fr Sun Jan 9 10:51:37 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 11:51:37 +0100 Subject: [Buildroot] [PATCH-next 2/4] support/docker: add python3-pytest In-Reply-To: <20211205105318.2755542-2-ricardo.martincoski@gmail.com> References: <20211205105318.2755542-1-ricardo.martincoski@gmail.com> <20211205105318.2755542-2-ricardo.martincoski@gmail.com> Message-ID: <66959117-0faa-1e56-3bb0-54b2167c9175@smile.fr> Hello Ricardo, In order to be ready for merging your series, add python3-pytest to the docker image now. Acked-by: Romain Naour Best regards, Romain Le 05/12/2021 ? 11:53, Ricardo Martincoski a ?crit?: > ... so the unit tests for check-package can run in the GitLab CI. > > Signed-off-by: Ricardo Martincoski > --- > support/docker/Dockerfile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile > index 2aee129668..a5d54b6e9d 100644 > --- a/support/docker/Dockerfile > +++ b/support/docker/Dockerfile > @@ -40,6 +40,7 @@ RUN apt-get install -y --no-install-recommends \ > python3-flake8 \ > python3-nose2 \ > python3-pexpect \ > + python3-pytest \ > qemu-system-arm \ > qemu-system-x86 \ > rsync \ > From romain.naour at smile.fr Sun Jan 9 10:52:39 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 11:52:39 +0100 Subject: [Buildroot] [PATCH 4/5] support/docker: add shellcheck In-Reply-To: <20211226184919.2753591-5-ricardo.martincoski@gmail.com> References: <20211226184919.2753591-1-ricardo.martincoski@gmail.com> <20211226184919.2753591-5-ricardo.martincoski@gmail.com> Message-ID: <4a065445-d2a7-4796-2b54-570260095ad4@smile.fr> Hello Ricardo, Acked-by: Romain Naour Best regards, Romain Le 26/12/2021 ? 19:49, Ricardo Martincoski a ?crit?: > Allow developers to run check-package for init scripts, that call > shellcheck, without having to install the tool. > > Since the docker have a fixed version of the tool, there will be no > difference between runs in different machines. > > One can call: > $ utils/docker-run utils/check-package package/package/S* > $ utils/docker-run shellcheck package/package/S* > > This change also allows to eventually run check-package for init scripts > in the GitLab CI. > > Signed-off-by: Ricardo Martincoski > --- > Please read the cover letter before applying. > --- > support/docker/Dockerfile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile > index 792e70e292..2b14f0f7a7 100644 > --- a/support/docker/Dockerfile > +++ b/support/docker/Dockerfile > @@ -44,6 +44,7 @@ RUN apt-get install -y --no-install-recommends \ > qemu-system-arm \ > qemu-system-x86 \ > rsync \ > + shellcheck \ > subversion \ > unzip \ > wget \ > From peter at korsgaard.com Sun Jan 9 10:53:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 11:53:04 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/openblas: security bump to version 0.3.18 In-Reply-To: <20211216070925.123117-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Dec 2021 08:09:25 +0100") References: <20211216070925.123117-1-fontaine.fabrice@gmail.com> Message-ID: <87v8ytch9r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, > DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, > as also used in OpenBLAS before version 0.3.18. Specially crafted > inputs passed to these functions could cause an application using > lapack to crash or possibly disclose portions of its memory. > - Drop first and second patches (already in version) > https://github.com/xianyi/OpenBLAS/blob/v0.3.18/Changelog.txt > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 10:38:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 11:38:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/openblas: security bump to version 0.3.18 Message-ID: <20220109104743.F003982B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0f648eb6bf3602d9e34691bea43cd6fae1eb40f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. - Drop first and second patches (already in version) https://github.com/xianyi/OpenBLAS/blob/v0.3.18/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...o-consider-Os-when-determining-LAPACK_NO.patch} | 0 package/openblas/0001-fix-gfortran-detection.patch | 30 -------------- ...x-support-for-passing-FFLAGS-on-the-make-.patch | 47 ---------------------- ...tem-don-t-specify-optimization-level-bui.patch} | 0 package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 4 +- 6 files changed, 3 insertions(+), 80 deletions(-) diff --git a/package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch similarity index 100% rename from package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch rename to package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch diff --git a/package/openblas/0001-fix-gfortran-detection.patch b/package/openblas/0001-fix-gfortran-detection.patch deleted file mode 100644 index 1fecdac3e5..0000000000 --- a/package/openblas/0001-fix-gfortran-detection.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ece3ce581e3ec530eaccfe7f284c52e115ec7aa9 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker -Date: Wed, 10 Feb 2021 14:22:59 +0100 -Subject: [PATCH] Strip parenthesized (pkgversion) data from GCC version string - to avoid misinterpretation - -See https://github.com/xianyi/OpenBLAS/issues/3099 for details. - -Upstream-status: backport - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire - - ---- - f_check | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/f_check b/f_check -index e9aca4ff9..ffe9c6b46 100644 ---- a/f_check -+++ b/f_check -@@ -75,6 +75,7 @@ if ($compiler eq "") { - - } elsif ($data =~ /GNU/ || $data =~ /GCC/ ) { - -+ $data =~ s/\(+.*?\)+//g; - $data =~ /(\d+)\.(\d+).(\d+)/; - $major = $1; - $minor = $2; diff --git a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch b/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch deleted file mode 100644 index 72b387b93e..0000000000 --- a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4d3829fa52240c2b7e48770ab19584db33ba7863 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:17:59 +0100 -Subject: [PATCH] Makefile: fix support for passing FFLAGS on the make - command line - -When openblas is built while passing FFLAGS on the make command line, the -compilation of lapack objects will not contain the flags specified in -Makefile but _only_ those passed in FFLAGS. - -This can lead to build failure, e.g. because -fPIC is not passed to the -compilation of most lapack objects, but is given to the link command: - -.../buildroot/output/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -O2 -DMAX_STACK_ALLOC=2048 -Wall -m64 -DF_INTERFACE_GFORT -fPIC -DNO_WARMUP -DMAX_CPU_NUMBER=4 -DMAX_PARALLEL_NUMBER=1 -DVERSION=\"0.3.9\" -DASMNAME= -DASMFNAME=_ -DNAME=_ -DCNAME= -DCHAR_NAME=\"_\" -DCHAR_CNAME=\"\" -DNO_AFFINITY -I.. -shared -o ../libopenblas_nehalem-r0.3.9.so \ --Wl,--whole-archive ../libopenblas_nehalem-r0.3.9.a -Wl,--no-whole-archive \ --Wl,-soname,libopenblas.so.0 -lm -lgfortran -lm -lgfortran -.../buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/9.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: ../libopenblas_nehalem-r0.3.9.a(sbdsvdx.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC - -In the initial support for this principle, added in commit -d0e731e8b825e7a554f245aa8f1118dcec9e2728, the flags specified in the -makefile were appended to the flags specified on the command-line. - -Fix this situation by using 'override' for 'FFLAGS' in -lapack-netlib/make.inc. The flags passed on the command-line are already -part of the LAPACK_FFLAGS variable, so no '+=' is needed here. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index fc5fe3f5..8ae1ff47 100644 ---- a/Makefile -+++ b/Makefile -@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild - lapack_prebuild : - ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) - - at echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc -- - at echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -+ - at echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc --- -2.26.2 - diff --git a/package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 100% rename from package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index c58def9d5d..a1e35f4fc4 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17d4677264dfbc4433e97076220adc79b050e4f8a083ea3f853a53af253bc380 openblas-0.3.9.tar.gz +sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 60b9d9b15b..4d506fa618 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.9 -OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION)) +OPENBLAS_VERSION = 0.3.18 +OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES From peter at korsgaard.com Sun Jan 9 10:40:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 11:40:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openblas: security bump to version 0.3.18 Message-ID: <20220109104813.DC21D82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=095ba6763a9516158924d969276c131736148518 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. - Drop first and second patches (already in version) https://github.com/xianyi/OpenBLAS/blob/v0.3.18/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...o-consider-Os-when-determining-LAPACK_NO.patch} | 0 package/openblas/0001-fix-gfortran-detection.patch | 30 -------------- ...x-support-for-passing-FFLAGS-on-the-make-.patch | 47 ---------------------- ...tem-don-t-specify-optimization-level-bui.patch} | 0 package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 4 +- 6 files changed, 3 insertions(+), 80 deletions(-) diff --git a/package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch similarity index 100% rename from package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch rename to package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch diff --git a/package/openblas/0001-fix-gfortran-detection.patch b/package/openblas/0001-fix-gfortran-detection.patch deleted file mode 100644 index 1fecdac3e5..0000000000 --- a/package/openblas/0001-fix-gfortran-detection.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ece3ce581e3ec530eaccfe7f284c52e115ec7aa9 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker -Date: Wed, 10 Feb 2021 14:22:59 +0100 -Subject: [PATCH] Strip parenthesized (pkgversion) data from GCC version string - to avoid misinterpretation - -See https://github.com/xianyi/OpenBLAS/issues/3099 for details. - -Upstream-status: backport - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire - - ---- - f_check | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/f_check b/f_check -index e9aca4ff9..ffe9c6b46 100644 ---- a/f_check -+++ b/f_check -@@ -75,6 +75,7 @@ if ($compiler eq "") { - - } elsif ($data =~ /GNU/ || $data =~ /GCC/ ) { - -+ $data =~ s/\(+.*?\)+//g; - $data =~ /(\d+)\.(\d+).(\d+)/; - $major = $1; - $minor = $2; diff --git a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch b/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch deleted file mode 100644 index 72b387b93e..0000000000 --- a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4d3829fa52240c2b7e48770ab19584db33ba7863 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:17:59 +0100 -Subject: [PATCH] Makefile: fix support for passing FFLAGS on the make - command line - -When openblas is built while passing FFLAGS on the make command line, the -compilation of lapack objects will not contain the flags specified in -Makefile but _only_ those passed in FFLAGS. - -This can lead to build failure, e.g. because -fPIC is not passed to the -compilation of most lapack objects, but is given to the link command: - -.../buildroot/output/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -O2 -DMAX_STACK_ALLOC=2048 -Wall -m64 -DF_INTERFACE_GFORT -fPIC -DNO_WARMUP -DMAX_CPU_NUMBER=4 -DMAX_PARALLEL_NUMBER=1 -DVERSION=\"0.3.9\" -DASMNAME= -DASMFNAME=_ -DNAME=_ -DCNAME= -DCHAR_NAME=\"_\" -DCHAR_CNAME=\"\" -DNO_AFFINITY -I.. -shared -o ../libopenblas_nehalem-r0.3.9.so \ --Wl,--whole-archive ../libopenblas_nehalem-r0.3.9.a -Wl,--no-whole-archive \ --Wl,-soname,libopenblas.so.0 -lm -lgfortran -lm -lgfortran -.../buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/9.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: ../libopenblas_nehalem-r0.3.9.a(sbdsvdx.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC - -In the initial support for this principle, added in commit -d0e731e8b825e7a554f245aa8f1118dcec9e2728, the flags specified in the -makefile were appended to the flags specified on the command-line. - -Fix this situation by using 'override' for 'FFLAGS' in -lapack-netlib/make.inc. The flags passed on the command-line are already -part of the LAPACK_FFLAGS variable, so no '+=' is needed here. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index fc5fe3f5..8ae1ff47 100644 ---- a/Makefile -+++ b/Makefile -@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild - lapack_prebuild : - ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) - - at echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc -- - at echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -+ - at echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc --- -2.26.2 - diff --git a/package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 100% rename from package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index c58def9d5d..a1e35f4fc4 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17d4677264dfbc4433e97076220adc79b050e4f8a083ea3f853a53af253bc380 openblas-0.3.9.tar.gz +sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 21d05cf30d..2a9bd8b18c 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.9 -OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION)) +OPENBLAS_VERSION = 0.3.18 +OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES From nolange79 at gmail.com Sun Jan 9 11:01:30 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:01:30 +0100 Subject: [Buildroot] [PATCH] package/skeleton-init-systemd: support /var/lock again Message-ID: <20220109110132.3430-1-nolange79@gmail.com> systemd's own configuration file is not installed anymore, as side effect of disabling sysv support. the funtionality is added back in skeleton-init-systemd, since this is a buildroot feature to support software expecting this directories to exist, as well as trying to be similar to other init systems. Signed-off-by: Norbert Lange --- package/skeleton-init-systemd/legacy.conf | 7 +++++++ package/skeleton-init-systemd/skeleton-init-systemd.mk | 1 + 2 files changed, 8 insertions(+) create mode 100644 package/skeleton-init-systemd/legacy.conf diff --git a/package/skeleton-init-systemd/legacy.conf b/package/skeleton-init-systemd/legacy.conf new file mode 100644 index 0000000000..0a5393408c --- /dev/null +++ b/package/skeleton-init-systemd/legacy.conf @@ -0,0 +1,7 @@ +# Create legacy directories for buildroot +# This is a subset of systemd's legacy.conf + +d /run/lock 0755 root root - +d /run/lock/subsys 0755 root root - + +L /var/lock - - - - ../run/lock diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 5d6b716f7a..1e212cc2f7 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,7 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef -- 2.34.1 From peter at korsgaard.com Sun Jan 9 11:02:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 12:02:03 +0100 Subject: [Buildroot] [git commit] package/mongrel2: bump to version 1.13.0 Message-ID: <20220109105604.E141C82A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0a7bffad9e041d9920171802621b67903f9389e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop third patch (already in version) - Drop fourth patch (not needed since https://github.com/mongrel2/mongrel2/commit/8a6db3beb32da1d66757a746f440d92edff166f9) https://github.com/mongrel2/mongrel2/blob/v1.13.0/changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...definition-error-when-building-with-gcc10.patch | 25 ----- .../0004-Support-urandom-inside-chroot.patch | 113 --------------------- package/mongrel2/mongrel2.hash | 4 +- package/mongrel2/mongrel2.mk | 2 +- 4 files changed, 3 insertions(+), 141 deletions(-) diff --git a/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch b/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch deleted file mode 100644 index e1b5788494..0000000000 --- a/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c51815b10c39c6e802bd1b56549f1d479b480fcc Mon Sep 17 00:00:00 2001 -From: Andrew Sun -Date: Sat, 18 Jul 2020 09:11:11 -0400 -Subject: [PATCH] fix multiple definition error when building with gcc10 - -[Retrieved from: -https://github.com/mongrel2/mongrel2/pull/343/commits/c51815b10c39c6e802bd1b56549f1d479b480fcc] -Signed-off-by: Fabrice Fontaine ---- - src/unixy.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unixy.h b/src/unixy.h -index 045e7c28..4225220c 100644 ---- a/src/unixy.h -+++ b/src/unixy.h -@@ -38,7 +38,7 @@ - #include - #include - --char *m2program; -+extern char *m2program; - - int Unixy_chroot(bstring path); - diff --git a/package/mongrel2/0004-Support-urandom-inside-chroot.patch b/package/mongrel2/0004-Support-urandom-inside-chroot.patch deleted file mode 100644 index 468ddb83fe..0000000000 --- a/package/mongrel2/0004-Support-urandom-inside-chroot.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 330e8c8352eb0ed3c178ac6e0102403c0a835492 Mon Sep 17 00:00:00 2001 -From: Jason Miller -Date: Thu, 5 Jul 2018 20:53:51 -0700 -Subject: [PATCH] Support urandom inside chroot - -This adds a new default entropy function that uses a /dev/urandom stream -opened before the chroot. If initializing that fails, it fallsback on -HAVEGE only if HAVEGE is supported by the mbedTLS. - -This should remove the hard requirement on HAVEGE - -resolves #326 -resolves #327 - -[Upstream status: https://github.com/mongrel2/mongrel2/pull/328] -Signed-off-by: Fabrice Fontaine ---- - src/mongrel2.c | 7 ------- - src/server.c | 36 +++++++++++++++++++++++------------- - 2 files changed, 23 insertions(+), 20 deletions(-) - -diff --git a/src/mongrel2.c b/src/mongrel2.c -index da632d95..48ece8a5 100644 ---- a/src/mongrel2.c -+++ b/src/mongrel2.c -@@ -404,13 +404,6 @@ void taskmain(int argc, char **argv) - rc = attempt_chroot_drop(srv); - check(rc == 0, "Major failure in chroot/droppriv, aborting."); - -- // set up rng after chroot -- // TODO: once mbedtls is updated, we can move this back into Server_create -- if(srv->use_ssl) { -- rc = Server_init_rng(srv); -- check(rc == 0, "Failed to initialize rng for server %s", bdata(srv->uuid)); -- } -- - final_setup(); - - taskcreate(tickertask, NULL, TICKER_TASK_STACK); -diff --git a/src/server.c b/src/server.c -index 45761db4..e44e199b 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -149,35 +149,45 @@ static int Server_load_ciphers(Server *srv, bstring ssl_ciphers_val) - return -1; - } - -+static int urandom_entropy_func(void *data, unsigned char *output, size_t len) -+{ -+ FILE* urandom = (FILE *)data; -+ size_t rc = fread(output, 1, len, urandom); -+ -+ if (rc != len) return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED; -+ -+ return 0; -+} -+ - int Server_init_rng(Server *srv) - { - int rc; -- unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE]; - void *ctx = NULL; - -- mbedtls_entropy_init( &srv->entropy ); -+ FILE *urandom = fopen("/dev/urandom","r"); - -- // test the entropy source -- rc = mbedtls_entropy_func(&srv->entropy, buf, MBEDTLS_ENTROPY_BLOCK_SIZE); -- -- if(rc == 0) { -+ if(urandom != NULL) { - ctx = calloc(sizeof(mbedtls_ctr_drbg_context), 1); - - mbedtls_ctr_drbg_init((mbedtls_ctr_drbg_context *)ctx); - rc = mbedtls_ctr_drbg_seed((mbedtls_ctr_drbg_context *)ctx, -- mbedtls_entropy_func, &srv->entropy, NULL, 0); -+ urandom_entropy_func, urandom, NULL, 0); - check(rc == 0, "Init rng failed: ctr_drbg_init returned %d\n", rc); - - srv->rng_func = mbedtls_ctr_drbg_random; - srv->rng_ctx = ctx; - } else { -- log_warn("entropy source unavailable. falling back to havege rng"); - -+#if defined(MBEDTLS_HAVEGE_C) -+ log_warn("entropy source unavailable. falling back to havege rng"); - ctx = calloc(sizeof(mbedtls_havege_state), 1); - mbedtls_havege_init((mbedtls_havege_state *)ctx); -- - srv->rng_func = mbedtls_havege_random; - srv->rng_ctx = ctx; -+#else -+ log_err("Unable to initialize urandom entropy source, and mbedTLS compiled without HAVEGE"); -+ goto error; -+#endif - } - - return 0; -@@ -278,10 +288,10 @@ Server *Server_create(bstring uuid, bstring default_host, - - // TODO: once mbedtls supports opening urandom early and keeping it open, - // put the rng initialization back here (before chroot) -- //if(use_ssl) { -- // rc = Server_init_rng(srv); -- // check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); -- //} -+ if(use_ssl) { -+ rc = Server_init_rng(srv); -+ check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); -+ } - - if(blength(chroot) > 0) { - srv->chroot = bstrcpy(chroot); check_mem(srv->chroot); diff --git a/package/mongrel2/mongrel2.hash b/package/mongrel2/mongrel2.hash index ea3a1cb426..f4f094ea03 100644 --- a/package/mongrel2/mongrel2.hash +++ b/package/mongrel2/mongrel2.hash @@ -1,6 +1,6 @@ # From https://mongrel2.org -sha1 6f81fa747a1e198d1a655c3677b6de686a5a51f7 mongrel2-v1.12.2.tar.bz2 +sha1 6057f9cbfae41e2cdef1e0f715df3c1a4d3a1884 mongrel2-v1.13.0.tar.bz2 # Locally computed -sha256 3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f mongrel2-v1.12.2.tar.bz2 +sha256 b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10 mongrel2-v1.13.0.tar.bz2 sha256 eb6e2a2baa637d06f6aa762886fbc8939934eb5fdb0b3a5b3882f2a61e9a4357 LICENSE diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk index cbe7e3fb91..07914ad0fe 100644 --- a/package/mongrel2/mongrel2.mk +++ b/package/mongrel2/mongrel2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGREL2_VERSION = 1.12.2 +MONGREL2_VERSION = 1.13.0 MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2 # Do not use the github helper here, the generated tarball is *NOT* the same # as the one uploaded by upstream for the release. From peter at korsgaard.com Sun Jan 9 11:02:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 12:02:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongrel2: bump to version 1.13.0 In-Reply-To: <20220108233910.114777-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 00:39:10 +0100") References: <20220108233910.114777-1-fontaine.fabrice@gmail.com> Message-ID: <87r19hcgu6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop third patch (already in version) > - Drop fourth patch (not needed since > https://github.com/mongrel2/mongrel2/commit/8a6db3beb32da1d66757a746f440d92edff166f9) > https://github.com/mongrel2/mongrel2/blob/v1.13.0/changelog.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From nolange79 at gmail.com Sun Jan 9 11:05:55 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:05:55 +0100 Subject: [Buildroot] [PATCH v2] package/openrc: add patch to create /run/lock/subsys Message-ID: <20220109110555.3789-1-nolange79@gmail.com> Together with changes to sysv/busybox init, this directory will already exist on all init systems before any service scripts are run. Signed-off-by: Norbert Lange --- v1->v2: * refresh patch --- ...lso-create-run-lock-subsys-directory.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/openrc/0006-Also-create-run-lock-subsys-directory.patch diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch new file mode 100644 index 0000000000..cf592a88b0 --- /dev/null +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch @@ -0,0 +1,29 @@ +From 49e5929b468f604d80a0c04a6ce78eb96ca36090 Mon Sep 17 00:00:00 2001 +From: Norbert Lange +Date: Sun, 9 Jan 2022 00:22:40 +0100 +Subject: [PATCH] Also create /run/lock/subsys directory + +Buildroot service scripts regularly use this directory, so +create it in the most appropriate spot. + +Signed-off-by: Norbert Lange +--- + sh/init.sh.Linux.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in +index e8afc1fb..662ab223 100644 +--- a/sh/init.sh.Linux.in ++++ b/sh/init.sh.Linux.in +@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then + fi + + checkpath -d "$RC_SVCDIR" +-checkpath -d -m 0775 -o root:daemon /run/lock ++checkpath -d -m 0775 -o root:daemon /run/lock /run/lock/subsys + + # Try to mount xenfs as early as possible, otherwise rc_sys() will always + # return RC_SYS_XENU and will think that we are in a domU while it's not. +-- +2.34.1 + -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 11:07:35 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:07:35 +0100 Subject: [Buildroot] [PATCH v3] package/systemd: invoke systemd-tmpfilesd on final image Message-ID: <20220109110736.3963-1-nolange79@gmail.com> Especially for read-only filesystems it is helpfull to pre-create all folders for non-volatile paths. This needs to run under fakeroot to allow setting uids/gids/perms for the target fs. systemd-tmpfilesd supports specifiers and target rootfs, but some specifiers resolve to information from the host, it is necessary to specially handle (skip) entries that contain problematic specifiers. Signed-off-by: Norbert Lange --- v1->v2 * add a script to skip/handle specifiers that might otherwise take information from the host v2->v3 * adopt fakeroot_tmpfiles.sh to current systemd-tmpfilesd (v250), several more specifiers are supported directly for our usecase. --- package/systemd/fakeroot_tmpfiles.sh | 57 ++++++++++++++++++++++++++++ package/systemd/systemd.mk | 9 ++++- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 package/systemd/fakeroot_tmpfiles.sh diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh new file mode 100644 index 0000000000..7e9b02cc0a --- /dev/null +++ b/package/systemd/fakeroot_tmpfiles.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# +# The systemd-tmpfiles has the ability to grab information +# from the filesystem (instead from the running system). +# +# However there are a few specifiers that *always* will grab +# information from the running system examples are %a, %b, %m, %H +# (Architecture, Boot UUID, Machine UUID, Hostname). +# +# See [1] for historic information. +# +# This script will (conservatively) skip tmpfiles lines that have +# such an specifier to prevent leaking host information. +# +# shell expansion is critical to be POSIX compliant, +# this script wont work with zsh in its default mode for example. +# +# The script takes several measures to handle more complex stuff +# like passing this correctly: +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n +# +# [1] - https://github.com/systemd/systemd/pull/16187 + +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles + +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } + +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | + while read -r line; do + # it is allowed to use quotes around arguments, + # so let the shell pack the arguments + eval "set -- $line" + + # dont output warnings for directories we dont process + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || + continue + + # blank out all specs that are ok to use, + # test if some remain. (Specs up to date with v250) + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then + # no "bad" specifiers, pass the line unmodified + eval "printf '%s\n' '$line'" + else + # warn + eval "printf 'ignored spec: %s\n' '$line' 1>&2" + fi + done | +\ +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ + --exclude-prefix=/tmp --exclude-prefix=/mnt \ + - diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 7bf8018438..e136229c8e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -709,10 +709,15 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE +define SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef + define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) @@ -783,7 +788,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dvconsole=false \ -Dquotacheck=false \ -Dsysusers=false \ - -Dtmpfiles=false \ + -Dtmpfiles=true \ -Dimportd=false \ -Dhwdb=false \ -Drfkill=false \ -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 11:09:57 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:09:57 +0100 Subject: [Buildroot] [PATCH] package/systemd: add systemd-oomd user Message-ID: <20220109110958.4251-1-nolange79@gmail.com> add the missing user if homed is enabled. Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 13520126d6..f5ddd928c9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -428,6 +428,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_OOMD),y) SYSTEMD_CONF_OPTS += -Doomd=true +SYSTEMD_OOMD_USER = systemd-oom -1 systemd-oom -1 * - - - systemd Userspace OOM Killer else SYSTEMD_CONF_OPTS += -Doomd=false endif @@ -586,6 +587,7 @@ define SYSTEMD_USERS - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) + $(SYSTEMD_OOMD_USER) $(SYSTEMD_NETWORKD_USER) $(SYSTEMD_RESOLVED_USER) $(SYSTEMD_TIMESYNCD_USER) -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 11:09:58 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:09:58 +0100 Subject: [Buildroot] [PATCH] package/systemd: fix pre-create directories for coredump In-Reply-To: <20220109110958.4251-1-nolange79@gmail.com> References: <20220109110958.4251-1-nolange79@gmail.com> Message-ID: <20220109110958.4251-2-nolange79@gmail.com> Fix a copy-pasta bug Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e136229c8e..13520126d6 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -414,7 +414,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing -SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - +SYSTEMD_COREDUMP_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -575,6 +575,7 @@ define SYSTEMD_PERMISSIONS $(SYSTEMD_LOGIND_PERMISSIONS) $(SYSTEMD_MACHINED_PERMISSIONS) $(SYSTEMD_HOMED_PERMISSIONS) + $(SYSTEMD_COREDUMP_PERMISSIONS) $(SYSTEMD_PSTORE_PERMISSIONS) $(SYSTEMD_TIMESYNCD_PERMISSIONS) endef -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: use CARGO_BUILD_TARGET instead of --target Message-ID: <20220109110756.9242882B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91a5a2d317a02d7fb41e706a490fe5063039d55c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will allow PKG_CARGO_ENV to be used in other contexts, such as the upcoming python-cryptography version bump. Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index c8dfc62db2..7f63595831 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -42,7 +42,8 @@ PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ - CARGO_TARGET_APPLIES_TO_HOST="false" + CARGO_TARGET_APPLIES_TO_HOST="false" \ + CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) @@ -102,7 +103,6 @@ define $(2)_BUILD_CMDS $$($(2)_CARGO_ENV) \ cargo build \ --offline \ - --target $$(RUSTC_TARGET_NAME) \ $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ --manifest-path Cargo.toml \ --locked \ @@ -138,7 +138,6 @@ define $(2)_INSTALL_TARGET_CMDS $$(PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ cargo install \ - --target $$(RUSTC_TARGET_NAME) \ --offline \ --root $$(TARGET_DIR)/usr/ \ --bins \ From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: split PKG_CARGO_ENV into target/host variables Message-ID: <20220109110756.7F7DC82B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0894937f7fc4ac9d04d65bc6cdd5fc1927483976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some variables should only be passed for target packages, such as the target-applies-to-host variable. Additional target-specific variables will also be added. Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 47ae86bfae..5f09f39a3f 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -20,15 +20,21 @@ # ################################################################################ +PKG_COMMON_CARGO_ENV = \ + CARGO_HOME=$(HOST_DIR)/share/cargo + # __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS is needed to allow # passing the -Z target-applies-to-host, which is needed together with # CARGO_TARGET_APPLIES_TO_HOST to fix build problems when target # architecture == host architecture. PKG_CARGO_ENV = \ - CARGO_HOME=$(HOST_DIR)/share/cargo \ + $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ CARGO_TARGET_APPLIES_TO_HOST="false" +HOST_PKG_CARGO_ENV = \ + $(PKG_COMMON_CARGO_ENV) + ################################################################################ # inner-cargo-package -- defines how the configuration, compilation and # installation of a cargo package should be done, implements a few hooks @@ -97,7 +103,7 @@ define $(2)_BUILD_CMDS $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ - $$(PKG_CARGO_ENV) \ + $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ cargo build \ --offline \ @@ -139,7 +145,7 @@ define $(2)_INSTALL_CMDS $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ - $$(PKG_CARGO_ENV) \ + $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ cargo install \ --offline \ From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: use CARGO_TARGET__LINKER instead of cargo config file Message-ID: <20220109110756.9AD6A82B96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6378631c2609742382984f6f7b93c1d9d2cdb78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master package/rustc/rustc.mk produces a config file in $(CARGO_HOME) that points to the linker. We can simplify that by using the CARGO_TARGET__LINKER environment variable. This will also fix problems when host == target, where the target linker gets picked up incorrectly. Fixes: http://autobuild.buildroot.net/results/2183f1835f2ef553e45e83959910205127b2b259/ Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 3 ++- package/rustc/cargo-config.in | 2 -- package/rustc/rustc.mk | 12 ------------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 7f63595831..77d2f66b17 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -43,7 +43,8 @@ PKG_CARGO_ENV = \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ - CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" + CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ + CARGO_TARGET_$(subst,-,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) diff --git a/package/rustc/cargo-config.in b/package/rustc/cargo-config.in deleted file mode 100644 index 47fad026be..0000000000 --- a/package/rustc/cargo-config.in +++ /dev/null @@ -1,2 +0,0 @@ -[target. at RUSTC_TARGET_NAME@] -linker = "@CROSS_PREFIX at gcc" diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 52860b7eff..0513dd0b40 100644 --- a/package/rustc/rustc.mk +++ b/package/rustc/rustc.mk @@ -20,15 +20,3 @@ endif RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu $(eval $(host-virtual-package)) - -ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) -define RUSTC_INSTALL_CARGO_CONFIG - mkdir -p $(HOST_DIR)/share/cargo - sed -e 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ - -e 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ - package/rustc/cargo-config.in \ - > $(HOST_DIR)/share/cargo/config -endef -# check-package disable TypoInPackageVariable - TOOLCHAIN intended -TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += RUSTC_INSTALL_CARGO_CONFIG -endif From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] support/testing/tests: switch python-cryptography related tests to glibc Message-ID: <20220109110756.769C882941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5ead094e18cd4a5a9a22b69a42e687f43ee8a8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In a follow-up commit, we are about to bump python-cryptography to a new version, which has the interesting charateristic of using Rust code. This means python-cryptography will now only be available on platforms supported by Rust, which for now excludes uclibc-based configurations (none of the Rust Tier1/Tier2 platforms use uClibc, there is some uClibc support in Tier3 platforms but they have not been added to Buildroot for now). So in preparation for this bump, we switch the few test cases of Python packages that directly or indirectly use python-cryptography to use a glibc toolchain. Another impacted test case is the docker-compose test case, but it already uses a glibc toolchain; Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_autobahn.py | 10 +++++++++- support/testing/tests/package/test_python_crossbar.py | 10 +++++++++- support/testing/tests/package/test_python_cryptography.py | 10 +++++++++- support/testing/tests/package/test_python_service_identity.py | 10 +++++++++- support/testing/tests/package/test_python_treq.py | 10 +++++++++- support/testing/tests/package/test_python_txtorcon.py | 10 +++++++++- 6 files changed, 54 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_autobahn.py b/support/testing/tests/package/test_python_autobahn.py index a237ce465d..6c1678a615 100644 --- a/support/testing/tests/package/test_python_autobahn.py +++ b/support/testing/tests/package/test_python_autobahn.py @@ -3,9 +3,17 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Autobahn(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AUTOBAHN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_autobahn.py"] diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py index d7843ddd8b..83649aeec2 100644 --- a/support/testing/tests/package/test_python_crossbar.py +++ b/support/testing/tests/package/test_python_crossbar.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Crossbar(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_crossbar.py"] timeout = 60 diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py index 62f0ca0def..bf11c02e5c 100644 --- a/support/testing/tests/package/test_python_cryptography.py +++ b/support/testing/tests/package/test_python_cryptography.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Cryptography(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_cryptography.py"] timeout = 40 diff --git a/support/testing/tests/package/test_python_service_identity.py b/support/testing/tests/package/test_python_service_identity.py index 09cfbe0a26..dbad5f931f 100644 --- a/support/testing/tests/package/test_python_service_identity.py +++ b/support/testing/tests/package/test_python_service_identity.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3ServiceIdentity(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_service_identity.py"] timeout = 30 diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index 307c9932b2..515f1ea304 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -14,8 +14,16 @@ class TestPythonTreq(TestPythonPackageBase): class TestPythonPy3Treq(TestPythonTreq): __test__ = True - config = TestPythonTreq.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TREQ=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 8e74190ee1..6f0c4ca1ed 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TXTORCON=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_txtorcon.py"] timeout = 30 From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:48 +0100 Subject: [Buildroot] [git commit] support/download/cargo-post-process: make manifest path configurable Message-ID: <20220109110756.6E22D82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36e8743da181420775b79d5be9bbe872b00f2c01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In most pure Rust packages, the Cargo.toml manifest is at the root directory, which is why we could call "cargo vendor" without specifying the path of the manifest. However, other packages, such as python-cryptography, which have parts implemented in Rust, have their Cargo.toml located in a specific subdirectory. This commit extends the cargo-post-process download script to understand a BR_CARGO_MANIFEST_PATH environment variable, which allows a package to pass the location of the Cargo.toml file. If not passed, "Cargo.toml" is used, preserving the existing behavior for other packages. Signed-off-by: Thomas Petazzoni --- support/download/cargo-post-process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 2d1c66661d..a4a4718a2a 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -22,7 +22,7 @@ post_process_unpack "${base_name}" "${output}" # Do the Cargo vendoring pushd "${base_name}" > /dev/null -cargo vendor --locked VENDOR +cargo vendor --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} --locked VENDOR # Create the local .cargo/config with vendor info mkdir -p .cargo/ From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: enable -Z target-applies-to-host via env Message-ID: <20220109110756.8863282BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98c7ea3ddf11d08acd11e30be36b4b56c682d239 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This should be more reliable and fix the host == target bug when doing indirect invocations using the cargo env. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 5f09f39a3f..c8dfc62db2 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -27,9 +27,21 @@ PKG_COMMON_CARGO_ENV = \ # passing the -Z target-applies-to-host, which is needed together with # CARGO_TARGET_APPLIES_TO_HOST to fix build problems when target # architecture == host architecture. + +# __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" is to allow +# using nighly features on stable releases, i.e features that are not +# yet considered stable. +# +# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" "enables the nightly +# configuration option target-applies-to-host value to be set +# +# CARGO_TARGET_APPLIES_TO_HOST="false" is actually setting the value +# for this feature, which we disable, to make sure builds where target +# arch == host arch work correctly PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" HOST_PKG_CARGO_ENV = \ @@ -94,7 +106,6 @@ define $(2)_BUILD_CMDS $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ --manifest-path Cargo.toml \ --locked \ - -Z target-applies-to-host \ $$($(2)_CARGO_BUILD_OPTS) endef else # ifeq ($(4),target) From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: bump version to 36.0.1 Message-ID: <20220109110756.A5D1C82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01764876e3d4e7ab95c8365f1c83e6c12d49757c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version bump requires significant changes because python-cryptography is now partially implemented in Rust. This means that: - The C++ dependency is no longer needed. - We need to ensure we are on an architecture where Rust is available (BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS) - Almost all Python dependencies are no longer relevant, except for the python-cffi. - A number of environment variables are needed to make the Rust part build correctly. - We need to invoke the "cargo" download post-process hook to vendor the Cargo dependencies at download time. - We need to propagate to relatively significant reverse dependency tree the changes of dependencies on python-cryptography. Co-developed-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/docker-compose/Config.in | 8 +++++--- package/python-autobahn/Config.in | 6 +----- package/python-channels-redis/Config.in | 7 ++----- package/python-channels/Config.in | 7 ++----- package/python-crossbar/Config.in | 6 +----- package/python-cryptography/Config.in | 14 ++------------ package/python-cryptography/python-cryptography.hash | 5 ++--- package/python-cryptography/python-cryptography.mk | 14 +++++++++++--- package/python-daphne/Config.in | 7 ++----- package/python-keyring/Config.in | 7 ++----- package/python-opcua-asyncio/Config.in | 1 + package/python-paramiko/Config.in | 8 ++------ package/python-pyopenssl/Config.in | 8 ++------ package/python-secretstorage/Config.in | 6 +----- package/python-service-identity/Config.in | 10 ++++------ package/python-treq/Config.in | 10 ++++------ package/python-twisted/Config.in | 6 ++---- package/python-txdbus/Config.in | 5 ++++- package/python-txtorcon/Config.in | 7 ++----- 19 files changed, 52 insertions(+), 90 deletions(-) diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 8e16b60521..761befea4d 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -5,7 +5,8 @@ config BR2_PACKAGE_DOCKER_COMPOSE depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_THREADS # python depends on !BR2_STATIC_LIBS # python - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko -> python-cryptography + # python-paramiko -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime select BR2_PACKAGE_PYTHON_DOCOPT # runtime @@ -23,7 +24,8 @@ config BR2_PACKAGE_DOCKER_COMPOSE https://www.docker.com/ -comment "docker-compose needs a toolchain w/ C++, wchar, threads, dynamic library" +comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + BR2_STATIC_LIBS diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in index f719dcc8f1..92ddad0ea4 100644 --- a/package/python-autobahn/Config.in +++ b/package/python-autobahn/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography -> python-pyasn + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime @@ -11,7 +11,3 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN framework. https://pypi.python.org/pypi/autobahn - -comment "python-autobahn needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-channels-redis/Config.in b/package/python-channels-redis/Config.in index 8946670180..bab801d2a9 100644 --- a/package/python-channels-redis/Config.in +++ b/package/python-channels-redis/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS bool "python-channels-redis" - depends on BR2_INSTALL_LIBSTDCPP # python-channels -> python-daphne + # python-channels -> python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-channels select BR2_PACKAGE_PYTHON_AIOREDIS # runtime select BR2_PACKAGE_PYTHON_ASGIREF # runtime @@ -12,7 +13,3 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS sharded configurations, as well as group support. http://github.com/django/channels_redis/ - -comment "python-channels-redis needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-channels/Config.in b/package/python-channels/Config.in index 5c70f20d1c..6cd6e5f60d 100644 --- a/package/python-channels/Config.in +++ b/package/python-channels/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHANNELS bool "python-channels" - depends on BR2_INSTALL_LIBSTDCPP # python-daphne -> python-autobahn -> python-cryptography + # python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-daphne select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_DAPHNE # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_CHANNELS own protocols and needs. http://github.com/django/channels - -comment "python-channels needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in index 50b70b8e02..b72d64c19d 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 # All the following dependencies are runtime dependencies select BR2_PACKAGE_PYTHON_ATTRS @@ -48,7 +48,3 @@ config BR2_PACKAGE_PYTHON_CROSSBAR components that can talk in real-time with each other. https://pypi.python.org/pypi/crossbar - -comment "python-crossbar needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index da4252d6da..07a22bf846 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -1,21 +1,11 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" - depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime - select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON3_SSL # runtime help cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. https://cryptography.io - -comment "python-cryptography needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 7cb38c8d3d..1219fa9b5f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,6 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/cryptography/json -md5 e2ce2ec8a63965fad351f36ed70fde4b cryptography-3.3.2.tar.gz -sha256 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed cryptography-3.3.2.tar.gz +# Locally calculated after vendoring +sha256 196bba703cebc052a19f5353614fcfa9d680471990c10305f110adcc05744eeb cryptography-36.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 9c00efb44f..fc1686af9a 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,14 +4,22 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 3.3.2 +PYTHON_CRYPTOGRAPHY_VERSION = 36.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d559879912eb8a1c5d16ad9f25d35f7c4f4c +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/f9/4b/1cf8e281f7ae4046a59e5e39dd7471d46db9f61bb564fddbff9084c4334f PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-setuptools-rust host-python-cffi host-rustc +PYTHON_CRYPTOGRAPHY_ENV = \ + $(PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +# We need to vendor the Cargo crates at download time +PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo +PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_CRYPTOGRAPHY_DL_ENV = \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in index 601b2e1db8..c4479417e9 100644 --- a/package/python-daphne/Config.in +++ b/package/python-daphne/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_DAPHNE bool "python-daphne" - depends on BR2_INSTALL_LIBSTDCPP # python-autobahn -> python-cryptography + # python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_DAPHNE versus HTTP endpoints. https://github.com/django/daphne - -comment "python-daphne needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-keyring/Config.in b/package/python-keyring/Config.in index f7bb1ae820..61cb98952f 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_KEYRING bool "python-keyring" + # python-secretstorage -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help @@ -9,7 +10,3 @@ config BR2_PACKAGE_PYTHON_KEYRING system keyring service from Python. https://pypi.python.org/pypi/keyring - -comment "python-keyring needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in index 3700e00e1d..95715fdd08 100644 --- a/package/python-opcua-asyncio/Config.in +++ b/package/python-opcua-asyncio/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO bool "python-opcua-asyncio" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOFILES # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index 4b8495d76d..e44237b0c2 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" - depends on BR2_PACKAGE_PYTHON3 # python-bcrypt - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-bcrypt, python-cryptography select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime @@ -10,7 +10,3 @@ config BR2_PACKAGE_PYTHON_PARAMIKO SSH2 protocol library. https://github.com/paramiko/paramiko/ - -comment "python-paramiko needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index 99ea4e9408..65d516813f 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -1,14 +1,10 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL bool "python-pyopenssl" - depends on BR2_PACKAGE_PYTHON3 # python-cryptography -> python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help Python wrapper module around the OpenSSL library. https://github.com/pyca/pyopenssl - -comment "python-pyopenssl needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in index 8ae8c2d598..059ea097bb 100644 --- a/package/python-secretstorage/Config.in +++ b/package/python-secretstorage/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE bool "python-secretstorage" depends on BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime help Python bindings to FreeDesktop.org Secret Service API. https://github.com/mitya57/secretstorage - -comment "python-secretstorage needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index ab012347dc..c571065e92 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" - depends on BR2_PACKAGE_PYTHON3 # python-pyopenssl -> python-cryptography -> python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime @@ -11,7 +13,3 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY Service identity verification for pyOpenSSL. https://pypi.python.org/pypi/service_identity - -comment "python-service-identify needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 02c26a53f7..6e54c19e16 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" - depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-idna, python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime @@ -16,7 +18,3 @@ config BR2_PACKAGE_PYTHON_TREQ API for making HTTP requests when using Twisted. https://github.com/twisted/treq - -comment "python-treq needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 29536ecf9d..89298b2e0c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -23,12 +23,10 @@ config BR2_PACKAGE_PYTHON_TWISTED_HTTP2 config BR2_PACKAGE_PYTHON_TWISTED_TLS bool "TLS support" - depends on BR2_INSTALL_LIBSTDCPP # python-{pyopenssl,service-identity} + # python-{pyopenssl,service-identity} + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime -comment "TLS support needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - endif diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index c7de322f91..ffd00f153e 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_PYTHON_TXDBUS bool "python-txdbus" - depends on BR2_PACKAGE_PYTHON3 # python-twisted -> python-cryptography -> python-idna + # python-twisted -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-twisted -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index e8a1a233db..0606e5f442 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_TXTORCON bool "python-txtorcon" + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_TXTORCON configuration abstractions. https://github.com/meejah/txtorcon - -comment "python-txtorcon needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP From thomas.petazzoni at bootlin.com Sun Jan 9 11:14:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:14:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env In-Reply-To: <20220109084732.2567404-1-james.hilliard1@gmail.com> References: <20220109084732.2567404-1-james.hilliard1@gmail.com> Message-ID: <20220109121440.7b2fb23c@windsurf> On Sun, 9 Jan 2022 01:47:32 -0700 James Hilliard wrote: > This should be more reliable and fix the host == target bug when > doing indirect invocations using the cargo env. > > Signed-off-by: James Hilliard > --- > package/pkg-cargo.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I've applied, after integrating that into a larger series, and adding more comments in the code about all those variables. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 11:16:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:16:00 +0100 Subject: [Buildroot] [PATCH 0/7] Bump of python-cryptography and other Rust related fun In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220109121600.21fb8f5d@windsurf> Hello, On Fri, 7 Jan 2022 18:13:10 +0100 Thomas Petazzoni wrote: > Thomas Petazzoni (7): > package/ca-certificates: remove dependency on host-python-cryptography > package/python-cryptography: drop host variant > package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 > package/rustc: fix the riscv64gc architecture handling > support/download/cargo-post-process: make manifest path configurable > support/testing/tests: switch python-cryptography related tests to > glibc > DO-NOT-APPLY package/python-cryptography: bump version to 36.0.1 Thanks to the help of James, we were able to figure out the last issues, so I pushed those last 3 patches, but with a number of additional preparation patches: 01764876e3d4e7ab95c8365f1c83e6c12d49757c package/python-cryptography: bump version to 36.0.1 b6378631c2609742382984f6f7b93c1d9d2cdb78 package/pkg-cargo.mk: use CARGO_TARGET__LINKER instead of cargo config file 91a5a2d317a02d7fb41e706a490fe5063039d55c package/pkg-cargo.mk: use CARGO_BUILD_TARGET instead of --target 98c7ea3ddf11d08acd11e30be36b4b56c682d239 package/pkg-cargo.mk: enable -Z target-applies-to-host via env 0894937f7fc4ac9d04d65bc6cdd5fc1927483976 package/pkg-cargo.mk: split PKG_CARGO_ENV into target/host variables e5ead094e18cd4a5a9a22b69a42e687f43ee8a8b support/testing/tests: switch python-cryptography related tests to glibc 36e8743da181420775b79d5be9bbe872b00f2c01 support/download/cargo-post-process: make manifest path configurable Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sun Jan 9 11:22:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 12:22:25 +0100 Subject: [Buildroot] [PATCH] package/poppler: use HTTPS for upstream URL In-Reply-To: <20220109093735.4860-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 9 Jan 2022 10:37:33 +0100") References: <20220109093735.4860-1-peter@korsgaard.com> Message-ID: <87mtk5cfwu.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ > The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget > versions (E.G. s.b.o): > wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz > DEBUG output created by Wget 1.14 on linux-gnu. > URI encoding = ?UTF-8? > Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) > Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) > --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz > Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 > Caching poppler.freedesktop.org => 147.75.198.156 > Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. > Created socket 3. > Releasing 0x0000000001ceda80 (new refcount 1). > ---request begin--- > GET /poppler-21.12.0.tar.xz HTTP/1.1 > User-Agent: Wget/1.14 (linux-gnu) > Accept: */* > Host: poppler.freedesktop.org > Connection: Keep-Alive > ---request end--- > HTTP request sent, awaiting response... > ---response begin--- > HTTP/1.1 308 Permanent Redirect > Date: Sun, 09 Jan 2022 09:28:02 GMT > Content-Type: text/html > Content-Length: 164 > Connection: keep-alive > Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz > ---response end--- > 308 Permanent Redirect > Registered socket 3 for persistent reuse. > Skipping 164 bytes of body: [ > 308 Permanent Redirect > >

    308 Permanent Redirect

    >
    nginx
    > > > ] done. > 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 11:21:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 12:21:50 +0100 Subject: [Buildroot] [git commit] package/poppler: use HTTPS for upstream URL Message-ID: <20220109111822.50FE882A93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c39e0abba945dcc52e2e9e70b92fc94f1c351c0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget versions (E.G. s.b.o): wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz DEBUG output created by Wget 1.14 on linux-gnu. URI encoding = ???UTF-8??? Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 Caching poppler.freedesktop.org => 147.75.198.156 Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. Created socket 3. Releasing 0x0000000001ceda80 (new refcount 1). ---request begin--- GET /poppler-21.12.0.tar.xz HTTP/1.1 User-Agent: Wget/1.14 (linux-gnu) Accept: */* Host: poppler.freedesktop.org Connection: Keep-Alive ---request end--- HTTP request sent, awaiting response... ---response begin--- HTTP/1.1 308 Permanent Redirect Date: Sun, 09 Jan 2022 09:28:02 GMT Content-Type: text/html Content-Length: 164 Connection: keep-alive Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz ---response end--- 308 Permanent Redirect Registered socket 3 for persistent reuse. Skipping 164 bytes of body: [ 308 Permanent Redirect

    308 Permanent Redirect

    nginx
    ] done. 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. Signed-off-by: Peter Korsgaard --- package/poppler/Config.in | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index f59115813d..21c4d86cf6 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POPPLER Poppler is a PDF rendering library based on the xpdf-3.0 code base. - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ if BR2_PACKAGE_POPPLER diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 23f04f6e51..9e9bfc9cba 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -6,7 +6,7 @@ POPPLER_VERSION = 21.12.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org +POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING From fontaine.fabrice at gmail.com Sun Jan 9 11:23:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 12:23:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix build on kernel < 5.10 Message-ID: <20220109112337.294418-1-fontaine.fabrice@gmail.com> zoned depends on kernel >= 5.10: https://github.com/kdave/btrfs-progs/commit/d4b4baf312ff083fb1e85de92167ea3e968c684c Fix the following build failure raised since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: checking linux/blkzoned.h usability... yes checking linux/blkzoned.h presence... yes checking for linux/blkzoned.h... yes checking for struct blk_zone.capacity... no checking for BLKGETZONESZ defined in linux/blkzoned.h... yes configure: error: linux/blkzoned.h does not provide blk_zone.capacity Fixes: - http://autobuild.buildroot.org/results/381c7e8b4bfa624c3eca3ce072cfa412aba57f84 Signed-off-by: Fabrice Fontaine --- package/btrfs-progs/btrfs-progs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index b010a0e0be..54922df839 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -44,6 +44,12 @@ else BTRFS_PROGS_CONF_OPTS += --disable-libudev endif +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10),y) +BTRFS_PROGS_CONF_OPTS += --enable-zoned +else +BTRFS_PROGS_CONF_OPTS += --disable-zoned +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ -- 2.34.1 From gilles.talis at gmail.com Sun Jan 9 11:32:23 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 9 Jan 2022 12:32:23 +0100 Subject: [Buildroot] [PATCH] package/libolm: bump to version 3.2.9 Message-ID: <20220109113223.755567-1-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/libolm/libolm.hash | 2 +- package/libolm/libolm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 80210a2e5f..044bb24f06 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9b61bd9182bb0ae0c5a800a8b0496b69600a0a22e3a21fce0aad119d2b1c99ae olm-3.2.6.tar.gz +sha256 614c0e4dc4721f57e56c3385bd8def2f71c6631f928a480efd0b4bd8e5435df9 olm-3.2.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 0049fb6001..607e50702f 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.2.6 +LIBOLM_VERSION = 3.2.9 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 -- 2.32.0 From gilles.talis at gmail.com Sun Jan 9 11:33:12 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 9 Jan 2022 12:33:12 +0100 Subject: [Buildroot] [PATCH] package/xapian: bump to version 1.4.19 Message-ID: <20220109113312.755637-1-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/xapian/xapian.hash | 4 ++-- package/xapian/xapian.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index 192032e6db..e570f7e2f2 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2021-January/009856.html -sha256 196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 xapian-core-1.4.18.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2022-January/009934.html +sha256 1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3 xapian-core-1.4.19.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 4f40babcf9..464e5478df 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.18 +XAPIAN_VERSION = 1.4.19 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ -- 2.32.0 From gilles.talis at gmail.com Sun Jan 9 11:47:57 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 9 Jan 2022 12:47:57 +0100 Subject: [Buildroot] [PATCH] package/tesseract-ocr: bump to version 5.0.1 Message-ID: <20220109114757.785223-1-gilles.talis@gmail.com> - Updated language training data version to 4.1.0 - Removed current patch as not required anymore - Added patch to fix uclibc failures - Supported C++ version has moved from C++11 to C++17 Signed-off-by: Gilles Talis --- ...-if-platform-supports-feenableexcept.patch | 42 +++++++++++++++++++ ...-Fix-timeval-structure-build-failure.patch | 27 ------------ package/tesseract-ocr/Config.in | 6 +-- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 4 +- 5 files changed, 48 insertions(+), 33 deletions(-) create mode 100644 package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch delete mode 100644 package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch diff --git a/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch new file mode 100644 index 0000000000..5280f01aba --- /dev/null +++ b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch @@ -0,0 +1,42 @@ +From 52484af83a58664c3cc91b8af07aeeea271f67ef Mon Sep 17 00:00:00 2001 +From: Gilles Talis +Date: Sun, 9 Jan 2022 10:58:36 +0100 +Subject: [PATCH] Check if platform supports feenableexcept + +Signed-off-by: Gilles Talis +--- + configure.ac | 4 ++++ + src/tesseract.cpp | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9177d64..80cd735 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,10 @@ case "${host_cpu}" in + + esac + ++# check whether feenableexcept is supported. some C libraries (e.g. uclibc) don't. ++AC_CHECK_FUNC(feenableexcept, [feenableexcept=true], [feenableexcept=false]) ++AM_CONDITIONAL([HAVE_FEENABLEEXCEPT], $feenableexcept) ++ + AX_CHECK_COMPILE_FLAG([-fopenmp-simd], [openmp_simd=true], [openmp_simd=false], [$WERROR]) + AM_CONDITIONAL([OPENMP_SIMD], $openmp_simd) + +diff --git a/src/tesseract.cpp b/src/tesseract.cpp +index 933116e..9154db8 100644 +--- a/src/tesseract.cpp ++++ b/src/tesseract.cpp +@@ -629,7 +629,7 @@ static void PreloadRenderers(tesseract::TessBaseAPI &api, + **********************************************************************/ + + int main(int argc, char **argv) { +-#if defined(__USE_GNU) ++#if defined(__USE_GNU) && defined(HAVE_FEENABLEEXCEPT) + // Raise SIGFPE. + # if defined(__clang__) + // clang creates code which causes some FP exceptions, so don't enable those. +-- +2.32.0 + diff --git a/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch b/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch deleted file mode 100644 index 0b0bb1a899..0000000000 --- a/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ea1e1ddfc0af9966a0c613a93087bc3e0a5979a7 Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Fri, 19 Jul 2019 18:52:03 +0200 -Subject: [PATCH] Fix timeval structure build failure - -timeval structure definition requires to be included - -Signed-off-by: Gilles Talis ---- - src/ccutil/ocrclass.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h -index d39a6dd..2a01118 100644 ---- a/src/ccutil/ocrclass.h -+++ b/src/ccutil/ocrclass.h -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #ifdef _WIN32 - #include // for timeval - #endif --- -2.7.4 - diff --git a/package/tesseract-ocr/Config.in b/package/tesseract-ocr/Config.in index 3afaca771a..4d9b78733e 100644 --- a/package/tesseract-ocr/Config.in +++ b/package/tesseract-ocr/Config.in @@ -1,13 +1,13 @@ -comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 4.8, dynamic library, wchar" +comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, wchar" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR menuconfig BR2_PACKAGE_TESSERACT_OCR bool "tesseract-ocr" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 808ea174ef..9e526423d3 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb tesseract-ocr-4.1.1.tar.gz +sha256 b5b0e561650ed67feb1e9de38d4746121d302ae4c876c95b99b8b6f9f89d5c58 tesseract-ocr-5.0.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index fc083c27f6..7e23e64136 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,8 +4,8 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 4.1.1 -TESSERACT_OCR_DATA_VERSION = 4.0.0 +TESSERACT_OCR_VERSION = 5.0.1 +TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 TESSERACT_OCR_LICENSE_FILES = LICENSE -- 2.32.0 From romain.naour at smile.fr Sun Jan 9 11:49:59 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 12:49:59 +0100 Subject: [Buildroot] [PATCH v3 04/11] package/pkg-golang.mk: implement Go vendoring support In-Reply-To: <20220106210000.397694-5-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-5-thomas.petazzoni@bootlin.com> Message-ID: <92584bdf-0c5c-2d32-45af-01f80a584189@smile.fr> Hello Thomas, Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > This commit introduces the download post-process script > support/download/go-post-process, and hooks it into the Go package > infrastructure. > > The -modcacherw flag is added to ensure that the Go cache is > read/write, and can be deleted properly upon "make clean". > > The _LICENSE variable of golang packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Thomas Petazzoni > --- I'm testing the golang infra with telegraf package and I got an error while downloading go modules: "verifying collectd.org at v0.5.0: checksum mismatch downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= SECURITY ERROR This download does NOT match an earlier download recorded in go.sum. The bits may have been replaced on the origin server, or an attacker may have intercepted the download attempt. For more information, see 'go help module-auth'." It seems there is something wrong in go.sum file from telegraf... but we are in download step not in patch step. It seems there is no way to fix locally (by patching) this problem. This is not the first time that infludb/telegraf releases are broken due to change in git repo listed in go.sum. Best regards, Romain From herve.codina at bootlin.com Sun Jan 9 12:14:22 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Sun, 9 Jan 2022 13:14:22 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> References: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> Message-ID: <20220109131422.4f774dfd@bootlin.com> On Sat, 8 Jan 2022 18:35:41 +0100 "Yann E. MORIN" wrote: > Some files contain hard-coded absolute paths that point to the host > and/or staging directories. > > With per-package directories (aka. PPD), these paths point to the PPD > of the package that created the files, when we want them to point to the > PPD of the package that uses them. > > Up until now, we had two hooks that attempted to fix those files: > > - a libtool-specific hook that searches for all .la files and seds > them with the proper PPD, > > - a python-specific hook that tweaks just the sysconfigdata and > removes the byte-compiled version of the sysconfigdata. > > But now, we also have a few other kinds of files for which we need to > fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others > as well. > > We solve this issue by just replacing any PPD in text files, with the > current package's PPD. > > This is very similar to, and inspired from what is done when relocating > the SDK. However, we can't use the existing relocate-sdk script, because > that needs to know the original location, which we do not have when we > aggregate the PPD (we could store it, but we can easily do without it). > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle (Essensium/Mind) > Cc: Adam Duskett > Cc: Louis-Paul CORDIER > Cc: Andreas Naumann > --- > package/pkg-generic.mk | 43 +++++++++++++++++++++--------------------- > 1 file changed, 21 insertions(+), 22 deletions(-) > [...] Acked-by: Herve Codina Best regards, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From herve.codina at bootlin.com Sun Jan 9 12:11:15 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Sun, 9 Jan 2022 13:11:15 +0100 Subject: [Buildroot] [PATCH 3/3] core/pkg-generic: apply post-prepare hooks before monitoring directories In-Reply-To: <13e59bc22d9299b2f829d541c1ecdd995f583f95.1641663315.git.yann.morin.1998@free.fr> References: <13e59bc22d9299b2f829d541c1ecdd995f583f95.1641663315.git.yann.morin.1998@free.fr> Message-ID: <20220109131115.57c37cbd@bootlin.com> On Sat, 8 Jan 2022 18:35:42 +0100 "Yann E. MORIN" wrote: > Monitoring the target/ and host/ directories and so on, will serve to > generate lists of files installed by the packages. Those lists are then > used to generate graphs of the size those package take on the target > for example. > > With PPD, we will also want to use those lists to only copy those files > actually installed by each dependencies of a package, recursively. > > Currently, those lists are not entirely reliable, as the starting points > are established before we apply PPD fixup hooks. As such, at the end of > a package installation, fixed up files will be found to belong to the > current package, while they were in fact provided by one of its > dependency. > > While this does no big harm, if at all, for the size graphs, it will > trigger overwrite detection when we eventually gather packages together > to aggregate a PPD or te final host and target. So, we better have the > lists of files be reliable. > > So, we only start monitoring the directories after we apply the PPD > fixups (or seen the other way around for a smaller diff: we apply the > PPD fixups before we start monitoring the directories). > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Herve Codina > --- > package/pkg-generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 1022062bcf..b1f4d219bb 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: > @$(call MESSAGE,"Configuring") > $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) > $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) > + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) > @$(call pkg_size_before,$(TARGET_DIR)) > @$(call pkg_size_before,$(STAGING_DIR),-staging) > @$(call pkg_size_before,$(BINARIES_DIR),-images) > @$(call pkg_size_before,$(HOST_DIR),-host) > - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) > $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) > $($(PKG)_CONFIGURE_CMDS) > $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) Acked-by: Herve Codina Best regards, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Jan 9 12:43:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 13:43:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: needs python3 Message-ID: <20220109124335.302679-1-fontaine.fabrice@gmail.com> python-setuptools-scm dropped python 2 support since https://github.com/pypa/setuptools_scm/commit/f0be71fbcf150bfc68e4169226399d6ae4da8f1b resulting in the following build failure since bump to version 6.3.2 in commit 12e3527fd97df9ae1b60b892c61d10ce291b7a00: /buildroot/autobuild/instance-2/output-1/host/lib" INTLTOOL_PERL=/usr/bin/perl /home/buildroot/autobuild/instance-2/output-1/host/bin/python setup.py build ) File "setup.py", line 22 f"{type(self).__name__} is forbidden, " ^ Fixes: - http://autobuild.buildroot.org/results/2f6125993de364b4a44d259f16806e6dfd792402 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - .../Config.in | 7 ------- .../python-backports-functools-lru-cache.hash | 5 ----- .../python-backports-functools-lru-cache.mk | 15 --------------- package/python-crontab/Config.in | 1 + package/python-dateutil/Config.in | 1 + package/python-jaraco-classes/Config.in | 1 + package/python-jsonmodels/Config.in | 1 + package/python-py/Config.in | 1 + .../python-setuptools-scm-git-archive.mk | 1 + .../python-setuptools-scm.mk | 1 + package/python-xlib/Config.in | 1 + 13 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 package/python-backports-functools-lru-cache/Config.in delete mode 100644 package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash delete mode 100644 package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk diff --git a/Config.in.legacy b/Config.in.legacy index 75873ff74b..d36eac3302 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE + bool "python-backports-functools-lru-cache package removed" + select BR2_LEGACY + help + This package has been removed as python-setuptools-scm + dropped support of python 2 since version 6.0.0. + config BR2_PACKAGE_CIVETWEB_WITH_LUA bool "civetweb lua support option removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 8a7dd446b7..2f6b03841f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -938,7 +938,6 @@ menu "External python modules" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" source "package/python-backports-abc/Config.in" - source "package/python-backports-functools-lru-cache/Config.in" source "package/python-backports-shutil-get-terminal-size/Config.in" source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" diff --git a/package/python-backports-functools-lru-cache/Config.in b/package/python-backports-functools-lru-cache/Config.in deleted file mode 100644 index a5b7771e4d..0000000000 --- a/package/python-backports-functools-lru-cache/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE - bool "python-backports-functools-lru-cache" - depends on BR2_PACKAGE_PYTHON - help - Backport of functools.lru_cache from Python 3.3 - - https://github.com/jaraco/backports.functools_lru_cache diff --git a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash b/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash deleted file mode 100644 index 3db4aec1fb..0000000000 --- a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/backports.functools_lru_cache/json -md5 20f53f54cd3f04b3346ce75a54959754 backports.functools_lru_cache-1.5.tar.gz -sha256 9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a backports.functools_lru_cache-1.5.tar.gz -# Localy computed sha256 checksumms -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk b/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk deleted file mode 100644 index 334d6d8c49..0000000000 --- a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-backports-functools-lru-cache -# -################################################################################ - -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION = 1.5 -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SOURCE = backports.functools_lru_cache-$(PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION).tar.gz -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SITE = https://files.pythonhosted.org/packages/57/d4/156eb5fbb08d2e85ab0a632e2bebdad355798dece07d4752f66a8d02d1ea -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SETUP_TYPE = setuptools -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_DEPENDENCIES = host-python-setuptools-scm -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE = MIT -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package/python-crontab/Config.in b/package/python-crontab/Config.in index 102dbbdb6b..7514a3866b 100644 --- a/package/python-crontab/Config.in +++ b/package/python-crontab/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CRONTAB bool "python-crontab" + depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm select BR2_PACKAGE_PYTHON_DATEUTIL # runtime help Crontab module for reading and writing crontab files and diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in index 1a36a150b1..bbf61f6813 100644 --- a/package/python-dateutil/Config.in +++ b/package/python-dateutil/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_DATEUTIL bool "python-dateutil" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX help Extensions to the standard Python datetime module. diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in index 05c11237ab..271e085c6f 100644 --- a/package/python-jaraco-classes/Config.in +++ b/package/python-jaraco-classes/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JARACO_CLASSES bool "python-jaraco-classes" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX # runtime help Utility functions for Python class constructs. diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in index f66982874a..84a269f171 100644 --- a/package/python-jsonmodels/Config.in +++ b/package/python-jsonmodels/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JSONMODELS bool "python-jsonmodels" + depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-py/Config.in b/package/python-py/Config.in index 354372f5b4..0e3c3390a0 100644 --- a/package/python-py/Config.in +++ b/package/python-py/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PY bool "python-py" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm help library with cross-python path, ini-parsing, io, code, log facilities. diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 032e2d3fc9..48ca9c89ae 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index f7f4e3ef27..b2990a56cb 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli +HOST_PYTHON_SETUPTOOLS_SCM_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-xlib/Config.in b/package/python-xlib/Config.in index 081af6a2fc..20e585db9a 100644 --- a/package/python-xlib/Config.in +++ b/package/python-xlib/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_XLIB bool "python-xlib" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX # runtime help XLib in pure Python (Py2/Py3 compatible) -- 2.34.1 From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: set cgroups default-hierarchy to unified Message-ID: <20220109124415.7EF1582C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f90d23112d2b9d52d2368a0a3f907ba37e2c60ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use the unified hierarchy, which is systemds default since v243. The biggest holdover was docker which now supports the unified layout. Note that systemd will automatically fallback to hybrid if the kernel is too old or the unified hierarchy fails for other reasons. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a2417ebe19..d7d5e5289b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -46,7 +46,7 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ - -Ddefault-hierarchy=hybrid \ + -Ddefault-hierarchy=unified \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: always enable systemd-tmpfilesd Message-ID: <20220109124415.A248D82D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7a928f883b7f4c783b966fd6832332976517885 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master this tool and service is pretty much expected to be enabled, making this a certainty will enable future improvements. The config variable BR2_PACKAGE_SYSTEMD_TMPFILES is still availabe and always set. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dhcp/Config.in | 1 - package/systemd/Config.in | 9 +-------- package/systemd/systemd.mk | 7 +------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in index e6e70908dd..515040c612 100644 --- a/package/dhcp/Config.in +++ b/package/dhcp/Config.in @@ -13,7 +13,6 @@ if BR2_PACKAGE_DHCP config BR2_PACKAGE_DHCP_SERVER bool "dhcp server" - select BR2_PACKAGE_SYSTEMD_TMPFILES if BR2_PACKAGE_SYSTEMD help DHCP server from the ISC DHCP distribution. diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 27a12bc947..833c89eaa2 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -501,15 +501,8 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html config BR2_PACKAGE_SYSTEMD_TMPFILES - bool "enable tmpfiles support" + bool default y - help - systemd-tmpfiles creates, deletes, and cleans up volatile - and temporary files and directories, based on the - configuration file format and location specified in - tmpfiles.d(5). - - http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 540a4d64f9..7bf8018438 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -71,6 +71,7 @@ SYSTEMD_CONF_OPTS += \ -Dsysvrcnd-path= \ -Dtelinit-path= \ -Dtests=false \ + -Dtmpfiles=true \ -Dumount-path=/usr/bin/umount \ -Dutmp=false @@ -315,12 +316,6 @@ else SYSTEMD_CONF_OPTS += -Dquotacheck=false endif -ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) -SYSTEMD_CONF_OPTS += -Dtmpfiles=true -else -SYSTEMD_CONF_OPTS += -Dtmpfiles=false -endif - ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y) SYSTEMD_CONF_OPTS += -Dsysusers=true else From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: remove BR2_PACKAGE_SYSTEMD_TMPFILES completely Message-ID: <20220109124415.B1CC082C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83319384fdb5d6666cb21ad915576385f232efb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since tmpfiles is no longer optional, the Config.in symbol serves no purpose. It was only used in cryptsetup.mk, where we replace it with BR2_PACKAGE_SYSTEMD. Advise to do the same in Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 9 +++++++++ package/cryptsetup/cryptsetup.mk | 4 +--- package/systemd/Config.in | 4 ---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 75873ff74b..a9e95d6f58 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_SYSTEMD_TMPFILES + bool "systemd tmpfiles support always enabled" + select BR2_LEGACY + help + The systemd tmpfiles support is always enabled, so the symbol + to make it optional has been removed. You need to update any + external packages that use this symbol to use + BR2_PACKAGE_SYSTEMD instead. + config BR2_PACKAGE_CIVETWEB_WITH_LUA bool "civetweb lua support option removed" select BR2_LEGACY diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 676cd25be4..9cfd647ac6 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -42,10 +42,8 @@ else CRYPTSETUP_CONF_OPTS += --disable-ssh-token endif -ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) +ifeq ($(BR2_PACKAGE_SYSTEMD),y) CRYPTSETUP_CONF_OPTS += --with-tmpfilesdir=/usr/lib/tmpfiles.d -else -CRYPTSETUP_CONF_OPTS += --without-tmpfilesdir endif HOST_CRYPTSETUP_DEPENDENCIES = \ diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 833c89eaa2..cc0736561e 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -500,10 +500,6 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html -config BR2_PACKAGE_SYSTEMD_TMPFILES - bool - default y - config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" help From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: Update description and kernel options Message-ID: <20220109124415.8A8BF82CFA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb49354eb34842f88218fcf9ef60576b85653e38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master realign the configuration to the README. enable CONFIG_AUTOFS_FS (kernel >= 4.18) as well as the someday to be removed CONFIG_AUTOFS4_FS option. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/Config.in | 22 +++++++++++++++++----- package/systemd/systemd.mk | 16 ++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index c8c5a9c47b..27a12bc947 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV @@ -51,13 +51,25 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Systemd requires a Linux kernel >= 3.0 with the following + Systemd requires a Linux kernel >= 3.13 with the following options enabled: - - CONFIG_CGROUPS + - CONFIG_DEVTMPFS + - CONFIG_CGROUPS (it is OK to disable all controllers) - CONFIG_INOTIFY_USER - - CONFIG_FHANDLE - - CONFIG_AUTOFS4_FS + - CONFIG_SIGNALFD + - CONFIG_TIMERFD + - CONFIG_EPOLL + - CONFIG_UNIX (it requires CONFIG_NET, but every other flag in + it is not necessary) + - CONFIG_SYSFS + - CONFIG_PROC_FS + - CONFIG_FHANDLE (libudev, mount and bind mount handling) + + - CONFIG_NET_NS (needed by PrivateNetwork=, used in some + systemd units) + + - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS - CONFIG_TMPFS_POSIX_ACL - CONFIG_TMPFS_XATTR diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d7d5e5289b..330619e206 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -725,14 +725,22 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) define SYSTEMD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE) - $(call KCONFIG_ENABLE_OPT,CONFIG_EPOLL) + $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER) $(call KCONFIG_ENABLE_OPT,CONFIG_SIGNALFD) $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERFD) - $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER) - $(call KCONFIG_ENABLE_OPT,CONFIG_PROC_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_EPOLL) + $(call KCONFIG_ENABLE_OPT,CONFIG_UNIX) $(call KCONFIG_ENABLE_OPT,CONFIG_SYSFS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PROC_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE) + + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + + $(call KCONFIG_DISABLE_OPT,CONFIG_SYSFS_DEPRECATED) + + $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR) From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: adopt odering in nsswitch to newer versions Message-ID: <20220109124415.9601282C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f9828e5cf2a58f3f9be78ff32e97601c31356aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This modifies the order of the nss modules, reflecting the current state of the documentation. nss-mymachines lost support for resolution of users and groups, and now only does resolution of hostnames. Changed in v246. Multiple changes in regards to nss-myhostname now recommend placement after nss-files and before nss-dns. See commits ce266330, f918c67. nss-resolve handles the nss-files logic itself, and its suggested to move in front of nss-files. Changed in v249. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 330619e206..540a4d64f9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -602,13 +602,11 @@ define SYSTEMD_INSTALL_NSSCONFIG_HOOK -e '/^gshadow:/ {/systemd/! s/$$/ systemd/}' \ $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ -e '/^hosts:/ s/[[:space:]]*mymachines//' \ - -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ + -e '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' ) \ $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ - -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ + -e '/^hosts:/ {/myhostname/! s/files/files myhostname/}' ) \ $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ - -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ - -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ - -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ + -e '/^hosts:/ {/mymachines/! s/^\(hosts:[[:space:]]*\)/\1mymachines /}' ) \ $(TARGET_DIR)/etc/nsswitch.conf endef From arnout at mind.be Sun Jan 9 12:55:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 13:55:45 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/systemd: adopt odering in nsswitch to newer versions In-Reply-To: <20211203223127.274985-3-nolange79@gmail.com> References: <20211203223127.274985-1-nolange79@gmail.com> <20211203223127.274985-3-nolange79@gmail.com> Message-ID: On 03/12/2021 23:31, Norbert Lange wrote: > This modifies the order of the nss modules, reflecting the current > state of the documentation. > > nss-mymachines lost support for resolution of users and groups, > and now only does resolution of hostnames. Changed in v246. > > Multiple changes in regards to nss-myhostname now recommend placement > after nss-files and before nss-dns. See commits ce266330, f918c67. > > nss-resolve handles the nss-files logic itself, and its suggested to > move in front of nss-files. Changed in v249. > > Signed-off-by: Norbert Lange This patch was superseded by [1], which is marked as v2 just like this patch. I hope you understand that this is a little confusing for the maintainers (or for anyone reviewing it). If you want to make life easier for use, please: - Re-post the entire series when one patch changes. - Make sure you include a patch changelog (you do that, I'm just saying it here for completeness). Patches which haven't changed can have a "No changes" version, but personally I don't care too much about that (it's implied by the fact that there is a patch changelog but this particular version is not included). That saves a bit of time during the rebase since you don't have to reword every commit. - Mark the old series as Superseded in patchwork. When you create an account, you can always update your own patches. I applied the series (including the [1]) to master. There's one comment I'll post separately. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20211203230919.683527-1-nolange79 at gmail.com/ > --- > package/systemd/systemd.mk | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 373e5c82bb..16202d4ac9 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -563,13 +563,11 @@ define SYSTEMD_INSTALL_NSSCONFIG_HOOK > -e '/^gshadow:/ {/systemd/! s/$$/ systemd/}' \ > $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ > -e '/^hosts:/ s/[[:space:]]*mymachines//' \ > - -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ > + -e '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' ) \ > $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ > - -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ > + -e '/^hosts:/ {/myhostname/! s/files/files myhostname/}' ) \ > $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ > - -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ > - -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ > - -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ > + -e '/^hosts:/ {/mymachines/! s/^\(hosts:[[:space:]]*\)/\1 mymachines/}' ) \ > $(TARGET_DIR)/etc/nsswitch.conf > endef > > From fontaine.fabrice at gmail.com Sun Jan 9 12:54:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 13:54:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuchess: security bump to version 6.2.9 Message-ID: <20220109125456.316484-1-fontaine.fabrice@gmail.com> Fixed potential buffer overflow in pgnload and pgnreplay (CVE-2021-30184) https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 Signed-off-by: Fabrice Fontaine --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index b68eb6e0ee..0248abcf71 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 29d3590849..630b3aefa7 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.8 +GNUCHESS_VERSION = 6.2.9 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING -- 2.34.1 From arnout at mind.be Sun Jan 9 12:59:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 13:59:07 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/systemd: always enable systemd-tmpfilesd In-Reply-To: <20211203223127.274985-4-nolange79@gmail.com> References: <20211203223127.274985-1-nolange79@gmail.com> <20211203223127.274985-4-nolange79@gmail.com> Message-ID: On 03/12/2021 23:31, Norbert Lange wrote: > this tool and service is pretty much expected to be enabled, > making this a certainty will enable future improvements. > > The config variable BR2_PACKAGE_SYSTEMD_TMPFILES is still > availabe and always set. I don't understand why it's not simply removed. (The commit message should primarily explain *why* things are done, not so much *what* is done.) Since I think that the symbol can be removed entirely, I pushed a follow-up patch that - removes the symbol; - removes its use in cryptsetup.mk; - adds it in Config.in.legacy, with an explanation of what to do if it's used in br2-external. It's a separate commit, so if you think that it really shouldn't have been removed we can easily revert it. Regards, Arnout > > Signed-off-by: Norbert Lange > --- > v1->v2 > - dont remove the config, instead just set it to 1 > --- > package/dhcp/Config.in | 1 - > package/systemd/Config.in | 9 +-------- > package/systemd/systemd.mk | 7 +------ > 3 files changed, 2 insertions(+), 15 deletions(-) > > diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in > index e6e70908dd..515040c612 100644 > --- a/package/dhcp/Config.in > +++ b/package/dhcp/Config.in > @@ -13,7 +13,6 @@ if BR2_PACKAGE_DHCP > > config BR2_PACKAGE_DHCP_SERVER > bool "dhcp server" > - select BR2_PACKAGE_SYSTEMD_TMPFILES if BR2_PACKAGE_SYSTEMD > help > DHCP server from the ISC DHCP distribution. > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 6f622c73f3..52c86aad59 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -485,15 +485,8 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD > http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html > > config BR2_PACKAGE_SYSTEMD_TMPFILES > - bool "enable tmpfiles support" > + bool > default y > - help > - systemd-tmpfiles creates, deletes, and cleans up volatile > - and temporary files and directories, based on the > - configuration file format and location specified in > - tmpfiles.d(5). > - > - http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html > > config BR2_PACKAGE_SYSTEMD_USERDB > bool "enable userdb daemon" > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 16202d4ac9..dfe9a1a5c7 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -49,6 +49,7 @@ SYSTEMD_CONF_OPTS += \ > -Dsysvrcnd-path= \ > -Dtelinit-path= \ > -Dtests=false \ > + -Dtmpfiles=true \ > -Dumount-path=/usr/bin/umount \ > -Dutmp=false > > @@ -307,12 +308,6 @@ else > SYSTEMD_CONF_OPTS += -Dquotacheck=false > endif > > -ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) > -SYSTEMD_CONF_OPTS += -Dtmpfiles=true > -else > -SYSTEMD_CONF_OPTS += -Dtmpfiles=false > -endif > - > ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y) > SYSTEMD_CONF_OPTS += -Dsysusers=true > else > From peter at korsgaard.com Sun Jan 9 13:01:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 14:01:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuchess: security bump to version 6.2.9 In-Reply-To: <20220109125456.316484-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 13:54:56 +0100") References: <20220109125456.316484-1-fontaine.fabrice@gmail.com> Message-ID: <87ilutcbbq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fixed potential buffer overflow in pgnload and pgnreplay > (CVE-2021-30184) > https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html > https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 13:01:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 14:01:17 +0100 Subject: [Buildroot] [git commit] package/gnuchess: security bump to version 6.2.9 Message-ID: <20220109125532.53FBE82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85aab41ef9f818216635c9b0f64bf9c20c176135 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixed potential buffer overflow in pgnload and pgnreplay (CVE-2021-30184) https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index b68eb6e0ee..0248abcf71 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 29d3590849..630b3aefa7 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.8 +GNUCHESS_VERSION = 6.2.9 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From arnout at mind.be Sun Jan 9 13:04:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 14:04:17 +0100 Subject: [Buildroot] [PATCH] package/skeleton-init-systemd: support /var/lock again In-Reply-To: <20220109110132.3430-1-nolange79@gmail.com> References: <20220109110132.3430-1-nolange79@gmail.com> Message-ID: <8f621d1a-c021-13ed-18c6-fbd800f03ce3@mind.be> On 09/01/2022 12:01, Norbert Lange wrote: > systemd's own configuration file is not installed anymore, > as side effect of disabling sysv support. > > the funtionality is added back in skeleton-init-systemd, > since this is a buildroot feature to support software expecting > this directories to exist, as well as trying to be similar to > other init systems. > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Arnout > --- > package/skeleton-init-systemd/legacy.conf | 7 +++++++ > package/skeleton-init-systemd/skeleton-init-systemd.mk | 1 + > 2 files changed, 8 insertions(+) > create mode 100644 package/skeleton-init-systemd/legacy.conf > > diff --git a/package/skeleton-init-systemd/legacy.conf b/package/skeleton-init-systemd/legacy.conf > new file mode 100644 > index 0000000000..0a5393408c > --- /dev/null > +++ b/package/skeleton-init-systemd/legacy.conf > @@ -0,0 +1,7 @@ > +# Create legacy directories for buildroot > +# This is a subset of systemd's legacy.conf > + > +d /run/lock 0755 root root - > +d /run/lock/subsys 0755 root root - > + > +L /var/lock - - - - ../run/lock > diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk > index 5d6b716f7a..1e212cc2f7 100644 > --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk > +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk > @@ -62,6 +62,7 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS > mkdir -p $(TARGET_DIR)/srv > mkdir -p $(TARGET_DIR)/var > ln -s ../run $(TARGET_DIR)/var/run > + install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf > $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) > endef > > From arnout at mind.be Sun Jan 9 13:04:21 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 14:04:21 +0100 Subject: [Buildroot] [git commit] package/skeleton-init-systemd: support /var/lock again Message-ID: <20220109125818.5984E82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97eb7d0c131feb060a6f55fffbcda8a82c9b5bb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master systemd's own configuration file is not installed anymore, as side effect of disabling sysv support in commit 96f0d9969e6220154b39d9d80cda97998d41f670. Add the legacy.conf functionality back in skeleton-init-systemd, since this is a buildroot feature to support software expecting these directories to exist, as well as trying to be similar to other init systems. Create our own legacy.conf instead of using the one from upstream, because: - upstream has legacy.conf.in which has to be preprocessed; - we don't want to enable upstream's full sysv support as explained in commit 96f0d9969e6220154b39d9d80cda97998d41f670; - we would probably need to post-process upstream's legacy.conf anyway since it doesn't fully match with buildroot expectations. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/skeleton-init-systemd/legacy.conf | 7 +++++++ package/skeleton-init-systemd/skeleton-init-systemd.mk | 1 + 2 files changed, 8 insertions(+) diff --git a/package/skeleton-init-systemd/legacy.conf b/package/skeleton-init-systemd/legacy.conf new file mode 100644 index 0000000000..0a5393408c --- /dev/null +++ b/package/skeleton-init-systemd/legacy.conf @@ -0,0 +1,7 @@ +# Create legacy directories for buildroot +# This is a subset of systemd's legacy.conf + +d /run/lock 0755 root root - +d /run/lock/subsys 0755 root root - + +L /var/lock - - - - ../run/lock diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 5d6b716f7a..1e212cc2f7 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,7 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef From fontaine.fabrice at gmail.com Sun Jan 9 13:07:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:07:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/gupnp-av: bump to version 0.14.0 In-Reply-To: <20220109130732.430160-1-fontaine.fabrice@gmail.com> References: <20220109130732.430160-1-fontaine.fabrice@gmail.com> Message-ID: <20220109130732.430160-2-fontaine.fabrice@gmail.com> https://gitlab.gnome.org/GNOME/gupnp-av/-/blob/gupnp-av-0.14.0/NEWS Signed-off-by: Fabrice Fontaine --- package/gupnp-av/gupnp-av.hash | 4 ++-- package/gupnp-av/gupnp-av.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index 570f8ab3d0..ceab42ef52 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.13/gupnp-av-0.13.0.sha256sum: -sha256 578b8f562b0f7e908416a41efbe2b7e6b892cd2ed7eac61ac63c48fdc8d7e6c8 gupnp-av-0.13.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: +sha256 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156 gupnp-av-0.14.0.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index c2d3c3ba18..655de87608 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUPNP_AV_VERSION_MAJOR = 0.13 +GUPNP_AV_VERSION_MAJOR = 0.14 GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 13:07:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:07:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/gupnp: bump to version 1.4.2 Message-ID: <20220109130732.430160-1-fontaine.fabrice@gmail.com> https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.2/NEWS Signed-off-by: Fabrice Fontaine --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 1825298f24..cc78be7d5d 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.1.sha256sum: -sha256 899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c gupnp-1.4.1.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.2.sha256sum: +sha256 bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc gupnp-1.4.2.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index 02d9b289e0..aebf9225a8 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ -- 2.34.1 From arnout at mind.be Sun Jan 9 13:04:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 14:04:48 +0100 Subject: [Buildroot] [git commit] package/openrc: add patch to create /run/lock/subsys Message-ID: <20220109130244.6DD2D82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92297637d7e408be927c6ca5994751549eba7bf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Together with changes to sysv/busybox init, this directory will already exist on all init systems before any service scripts are run. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...006-Also-create-run-lock-subsys-directory.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch new file mode 100644 index 0000000000..cf592a88b0 --- /dev/null +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch @@ -0,0 +1,29 @@ +From 49e5929b468f604d80a0c04a6ce78eb96ca36090 Mon Sep 17 00:00:00 2001 +From: Norbert Lange +Date: Sun, 9 Jan 2022 00:22:40 +0100 +Subject: [PATCH] Also create /run/lock/subsys directory + +Buildroot service scripts regularly use this directory, so +create it in the most appropriate spot. + +Signed-off-by: Norbert Lange +--- + sh/init.sh.Linux.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in +index e8afc1fb..662ab223 100644 +--- a/sh/init.sh.Linux.in ++++ b/sh/init.sh.Linux.in +@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then + fi + + checkpath -d "$RC_SVCDIR" +-checkpath -d -m 0775 -o root:daemon /run/lock ++checkpath -d -m 0775 -o root:daemon /run/lock /run/lock/subsys + + # Try to mount xenfs as early as possible, otherwise rc_sys() will always + # return RC_SYS_XENU and will think that we are in a domU while it's not. +-- +2.34.1 + From peter at korsgaard.com Sun Jan 9 13:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 14:09:08 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm: needs python3 Message-ID: <20220109130308.F2AC282B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31848ba595bfd77e5471601edc35cf587de4ce34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-setuptools-scm dropped python 2 support since https://github.com/pypa/setuptools_scm/commit/f0be71fbcf150bfc68e4169226399d6ae4da8f1b resulting in the following build failure since bump to version 6.3.2 in commit 12e3527fd97df9ae1b60b892c61d10ce291b7a00: /buildroot/autobuild/instance-2/output-1/host/lib" INTLTOOL_PERL=/usr/bin/perl /home/buildroot/autobuild/instance-2/output-1/host/bin/python setup.py build ) File "setup.py", line 22 f"{type(self).__name__} is forbidden, " ^ Fixes: - http://autobuild.buildroot.org/results/2f6125993de364b4a44d259f16806e6dfd792402 With python 2 support dropped, python-backports-functools-lru-cache can no longer be built, so drop it. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/python-backports-functools-lru-cache/Config.in | 7 ------- .../python-backports-functools-lru-cache.hash | 5 ----- .../python-backports-functools-lru-cache.mk | 15 --------------- package/python-crontab/Config.in | 1 + package/python-dateutil/Config.in | 1 + package/python-jaraco-classes/Config.in | 1 + package/python-jsonmodels/Config.in | 1 + package/python-py/Config.in | 1 + .../python-setuptools-scm-git-archive.mk | 1 + package/python-setuptools-scm/python-setuptools-scm.mk | 1 + package/python-xlib/Config.in | 1 + 13 files changed, 15 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a9e95d6f58..5a3e9b5cc7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE + bool "python-backports-functools-lru-cache package removed" + select BR2_LEGACY + help + This package has been removed as python-setuptools-scm + dropped support of python 2 since version 6.0.0. + config BR2_PACKAGE_SYSTEMD_TMPFILES bool "systemd tmpfiles support always enabled" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 2d3ca6a3b6..85193f7802 100644 --- a/package/Config.in +++ b/package/Config.in @@ -939,7 +939,6 @@ menu "External python modules" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" source "package/python-backports-abc/Config.in" - source "package/python-backports-functools-lru-cache/Config.in" source "package/python-backports-shutil-get-terminal-size/Config.in" source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" diff --git a/package/python-backports-functools-lru-cache/Config.in b/package/python-backports-functools-lru-cache/Config.in deleted file mode 100644 index a5b7771e4d..0000000000 --- a/package/python-backports-functools-lru-cache/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE - bool "python-backports-functools-lru-cache" - depends on BR2_PACKAGE_PYTHON - help - Backport of functools.lru_cache from Python 3.3 - - https://github.com/jaraco/backports.functools_lru_cache diff --git a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash b/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash deleted file mode 100644 index 3db4aec1fb..0000000000 --- a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/backports.functools_lru_cache/json -md5 20f53f54cd3f04b3346ce75a54959754 backports.functools_lru_cache-1.5.tar.gz -sha256 9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a backports.functools_lru_cache-1.5.tar.gz -# Localy computed sha256 checksumms -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk b/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk deleted file mode 100644 index 334d6d8c49..0000000000 --- a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-backports-functools-lru-cache -# -################################################################################ - -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION = 1.5 -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SOURCE = backports.functools_lru_cache-$(PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION).tar.gz -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SITE = https://files.pythonhosted.org/packages/57/d4/156eb5fbb08d2e85ab0a632e2bebdad355798dece07d4752f66a8d02d1ea -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SETUP_TYPE = setuptools -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_DEPENDENCIES = host-python-setuptools-scm -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE = MIT -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package/python-crontab/Config.in b/package/python-crontab/Config.in index 102dbbdb6b..7514a3866b 100644 --- a/package/python-crontab/Config.in +++ b/package/python-crontab/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CRONTAB bool "python-crontab" + depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm select BR2_PACKAGE_PYTHON_DATEUTIL # runtime help Crontab module for reading and writing crontab files and diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in index 1a36a150b1..bbf61f6813 100644 --- a/package/python-dateutil/Config.in +++ b/package/python-dateutil/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_DATEUTIL bool "python-dateutil" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX help Extensions to the standard Python datetime module. diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in index 05c11237ab..271e085c6f 100644 --- a/package/python-jaraco-classes/Config.in +++ b/package/python-jaraco-classes/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JARACO_CLASSES bool "python-jaraco-classes" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX # runtime help Utility functions for Python class constructs. diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in index f66982874a..84a269f171 100644 --- a/package/python-jsonmodels/Config.in +++ b/package/python-jsonmodels/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JSONMODELS bool "python-jsonmodels" + depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-py/Config.in b/package/python-py/Config.in index 354372f5b4..0e3c3390a0 100644 --- a/package/python-py/Config.in +++ b/package/python-py/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PY bool "python-py" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm help library with cross-python path, ini-parsing, io, code, log facilities. diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 032e2d3fc9..48ca9c89ae 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index f7f4e3ef27..b2990a56cb 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli +HOST_PYTHON_SETUPTOOLS_SCM_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-xlib/Config.in b/package/python-xlib/Config.in index 081af6a2fc..20e585db9a 100644 --- a/package/python-xlib/Config.in +++ b/package/python-xlib/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_XLIB bool "python-xlib" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX # runtime help XLib in pure Python (Py2/Py3 compatible) From peter at korsgaard.com Sun Jan 9 13:09:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 14:09:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: needs python3 In-Reply-To: <20220109124335.302679-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 13:43:35 +0100") References: <20220109124335.302679-1-fontaine.fabrice@gmail.com> Message-ID: <87ee5hcayb.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > python-setuptools-scm dropped python 2 support since > https://github.com/pypa/setuptools_scm/commit/f0be71fbcf150bfc68e4169226399d6ae4da8f1b > resulting in the following build failure since bump to version 6.3.2 in > commit 12e3527fd97df9ae1b60b892c61d10ce291b7a00: > /buildroot/autobuild/instance-2/output-1/host/lib" INTLTOOL_PERL=/usr/bin/perl /home/buildroot/autobuild/instance-2/output-1/host/bin/python setup.py build ) > File "setup.py", line 22 > f"{type(self).__name__} is forbidden, " > ^ > Fixes: > - http://autobuild.buildroot.org/results/2f6125993de364b4a44d259f16806e6dfd792402 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sun Jan 9 13:12:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 14:12:16 +0100 Subject: [Buildroot] [PATCH v2] package/openrc: add patch to create /run/lock/subsys In-Reply-To: <20220109110555.3789-1-nolange79@gmail.com> References: <20220109110555.3789-1-nolange79@gmail.com> Message-ID: On 09/01/2022 12:05, Norbert Lange wrote: > Together with changes to sysv/busybox init, this directory > will already exist on all init systems before any service > scripts are run. > > Signed-off-by: Norbert Lange Applied to master, thanks. Normally we require patches to be upstreamed first, but there are already plenty of other patches that haven't been sent upstream. It could also be a bit buildroot-specific (though I think the subsys is there because some packages actually use that directory). Still, Micha?, do you think this patch would be acceptable upstream? Obviously not in its current form since upstream has group uucp rather than daemon. Regards, Arnout > --- > v1->v2: > * refresh patch > --- > ...lso-create-run-lock-subsys-directory.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/openrc/0006-Also-create-run-lock-subsys-directory.patch > > diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch > new file mode 100644 > index 0000000000..cf592a88b0 > --- /dev/null > +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch > @@ -0,0 +1,29 @@ > +From 49e5929b468f604d80a0c04a6ce78eb96ca36090 Mon Sep 17 00:00:00 2001 > +From: Norbert Lange > +Date: Sun, 9 Jan 2022 00:22:40 +0100 > +Subject: [PATCH] Also create /run/lock/subsys directory > + > +Buildroot service scripts regularly use this directory, so > +create it in the most appropriate spot. > + > +Signed-off-by: Norbert Lange > +--- > + sh/init.sh.Linux.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in > +index e8afc1fb..662ab223 100644 > +--- a/sh/init.sh.Linux.in > ++++ b/sh/init.sh.Linux.in > +@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then > + fi > + > + checkpath -d "$RC_SVCDIR" > +-checkpath -d -m 0775 -o root:daemon /run/lock > ++checkpath -d -m 0775 -o root:daemon /run/lock /run/lock/subsys > + > + # Try to mount xenfs as early as possible, otherwise rc_sys() will always > + # return RC_SYS_XENU and will think that we are in a domU while it's not. > +-- > +2.34.1 > + > From fontaine.fabrice at gmail.com Sun Jan 9 13:11:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:11:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbytesize: bump to version 2.6 Message-ID: <20220109131128.468829-1-fontaine.fabrice@gmail.com> https://github.com/storaged-project/libbytesize/releases/tag/2.6 https://github.com/storaged-project/libbytesize/blob/2.6/NEWS.rst Signed-off-by: Fabrice Fontaine --- package/libbytesize/libbytesize.hash | 2 +- package/libbytesize/libbytesize.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbytesize/libbytesize.hash b/package/libbytesize/libbytesize.hash index 51fa43aef1..2dfa97dd6a 100644 --- a/package/libbytesize/libbytesize.hash +++ b/package/libbytesize/libbytesize.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6305addae2b7be313dbfc36b96094ec0544d5144859ab4a5685ca6d314d6fdda libbytesize-2.5.tar.gz +sha256 efaa2b35b2bb3b52bf7b4ff5d0ed2c5c61360a5196053808d615dd0aa2cf0741 libbytesize-2.6.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libbytesize/libbytesize.mk b/package/libbytesize/libbytesize.mk index 0ba380dc74..2ef08211c5 100644 --- a/package/libbytesize/libbytesize.mk +++ b/package/libbytesize/libbytesize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.5 +LIBBYTESIZE_VERSION = 2.6 LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) LIBBYTESIZE_LICENSE = LGPL-2.1+ LIBBYTESIZE_LICENSE_FILES = LICENSE -- 2.34.1 From peter at korsgaard.com Sun Jan 9 13:19:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 14:19:00 +0100 Subject: [Buildroot] [git commit] package/pkg-python.mk: fix typos Message-ID: <20220109131517.5AC4782B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65054d1a1964548a72c320b075cb20a122117952 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s/interperter/interpreter/ and drop 'use use' / 'depend on use'. Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 4cc416cea0..22ea77352c 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -155,8 +155,8 @@ endif # - for target packages, we always depend on the default python interpreter # (the one selected by the config); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we depend on use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) @@ -215,8 +215,8 @@ endif # SETUP_TYPE # - for target packages, we always use the default python interpreter (which # is the same version as the one built and installed on the target); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we use use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) From peter at korsgaard.com Sun Jan 9 13:27:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 14:27:15 +0100 Subject: [Buildroot] [git commit] package/systemd: Update description and kernel options In-Reply-To: <20220109124415.8A8BF82CFA@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sun, 9 Jan 2022 13:48:26 +0100") References: <20220109124415.8A8BF82CFA@busybox.osuosl.org> Message-ID: <8735lxca4s.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=eb49354eb34842f88218fcf9ef60576b85653e38 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > realign the configuration to the README. > enable CONFIG_AUTOFS_FS (kernel >= 4.18) as well as the someday > to be removed CONFIG_AUTOFS4_FS option. > Signed-off-by: Norbert Lange > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/systemd/Config.in | 22 +++++++++++++++++----- > package/systemd/systemd.mk | 16 ++++++++++++---- > 2 files changed, 29 insertions(+), 9 deletions(-) > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index c8c5a9c47b..27a12bc947 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > depends on !BR2_STATIC_LIBS # kmod > depends on BR2_TOOLCHAIN_USES_GLIBC > depends on BR2_TOOLCHAIN_HAS_SSP > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 Is that correct? The corresponding BR2_INIT_SYSTEMD dependency was not updated. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Sun Jan 9 13:27:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 14:27:48 +0100 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20201221203952.22168-3-ps.report@gmx.net> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> Message-ID: <20220109142748.4f7c1a59@windsurf> On Mon, 21 Dec 2020 21:39:51 +0100 Peter Seiderer wrote: > - add optional host-freetype dependency > > Fixes: > > Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 > Returned 1. > stderr: > > Package freetype2 was not found in the pkg-config search path. > Perhaps you should add the directory containing `freetype2.pc' > to the PKG_CONFIG_PATH environment variable > Package 'freetype2', required by 'virtual:world', not found > Could not run pkg-config. > > See //build/linux/BUILD.gn:24:3: whence it was called. > pkg_config("freetype_from_pkgconfig") { > ^-------------------------------------- > See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included. > public_configs = [ "//build/linux:freetype_from_pkgconfig" ] > ^-------------------------------------- > Project ERROR: GN run error! > make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 I am falling into this issue while building the following defconfig: BR2_arm=y BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5WEBENGINE=y BR2_PACKAGE_RPI_USERLAND=y Did you had the chance to investigate more deeply why having fontconfig support in Qt leads qt5webengine wanting to find freetype2 on the host? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Jan 9 13:39:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:39:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/hiawatha: disable system mbedtls Message-ID: <20220109133939.496946-1-fontaine.fabrice@gmail.com> hiawatha needs mbedtls3 since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e: /home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory 39 | #include "mbedtls/psa_util.h" | ^~~~~~~~~~~~~~~~~~~~ As mbedtls 3.x is not backward compatible with mbedtls 2.x, disable system mbedtls to let hiawatha uses its own copy (which will be installed in $(TARGET_DIR)/usr/lib/hiawatha) Fixes: - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a Signed-off-by: Fabrice Fontaine --- package/hiawatha/Config.in | 1 - package/hiawatha/hiawatha.mk | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 8f1908f6f4..4b1a3ca86c 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -32,6 +32,5 @@ if BR2_PACKAGE_HIAWATHA config BR2_PACKAGE_HIAWATHA_SSL bool "hiawatha TLS support" - select BR2_PACKAGE_MBEDTLS endif diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 5618e6900d..017592de1e 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -20,8 +20,11 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON -HIAWATHA_DEPENDENCIES += mbedtls +# Disable system mbedtls as hiawatha needs mbedtls 3.x +HIAWATHA_CONF_OPTS += \ + -DENABLE_TLS=ON \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 13:41:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:41:29 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: <87a6g6f7vl.fsf@dell.be.48ers.dk> References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> <87zgo6f9sa.fsf@dell.be.48ers.dk> <87a6g6f7vl.fsf@dell.be.48ers.dk> Message-ID: Le sam. 8 janv. 2022 ? 18:35, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > Hi, > > >> For the question if we need to maintain both 2.28.x and 3.x in > >> parallel I guess it really depends on if the packages we have depending > >> on mbedtls (E.G. bctoolbox, bmx7, mongrel2, shadowsocks-libev) can (be > >> patched to) work with mbedtls 3.x or not? > > > It is really unlikely that all these packages will be patched to work > > with mbedtls 3.x. > > To my knowledge, only hiawatha and curl have been patched to support > > mbedtls 3.x. > > and it should be noted that curl supports mbedtls 2.x and 3.x: > > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad > > lighttpd is trying to migrate but has a lot of issues: > > https://github.com/ARMmbed/mbedtls/issues/5331 > > Ok, thanks. > > >> If they can (or are no longer maintained upstream), then I would prefer > >> to only support mbedtls 3.x going forward. If on the other hand mbedtls > >> 3.x isn't really stable yet and only needed for hiawatha, then indeed we > >> should perhaps just postpone it a bit and use the internal mbedtls copy > >> in hiawatha or downgrade / drop TLS support. > > > 3.x is more "secure" because many obsolete cryptographic mechanisms and > > TLS protocol versions and options have been removed. However, it is probably > > ok to postpone the addition of mbedtls 3.x until more packages support it. > > Yes, I agree. What will we do about hiawatha? Patch it to work with 2.x > as well, move to the internal mbedtls copy or revert the bump? Did you > try contacting upstream about the issue? I didn't try to contact hiawatha but I think the easiest course of action would be to use the internal copy. I sent a patch. > > > > It should be noted that we'll have the same issue/question with openssl 3.x ... > > Indeed, that is another can of worms that has been on my TODO list for a > while... > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From thomas.petazzoni at bootlin.com Sun Jan 9 13:44:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 14:44:30 +0100 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20220109142748.4f7c1a59@windsurf> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> <20220109142748.4f7c1a59@windsurf> Message-ID: <20220109144430.1064ea1c@windsurf> On Sun, 9 Jan 2022 14:27:48 +0100 Thomas Petazzoni wrote: > I am falling into this issue while building the following defconfig: > > BR2_arm=y > BR2_arm1176jzf_s=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_QT5WEBENGINE=y > BR2_PACKAGE_RPI_USERLAND=y > > Did you had the chance to investigate more deeply why having fontconfig > support in Qt leads qt5webengine wanting to find freetype2 on the host? Interestingly, in commit https://github.com/meta-qt5/meta-qt5/commit/280487f20bca829527a597d6263b0344a01917ac#diff-f0ffde666f6ff0282f8400203b3ba20968494d3c7245106eca761bd79baa1c78R26 the meta-qt5 layer, when upgrading Qt to 5.15.2 added jpeg-native and freetype-native as new unconditional dependencies. But there are no explanations. Is it really because the Chromium stuff is building a host tool with freetype/jpeg, or is it just a workaround for some incorrect behavior of the Chromium build process that needs freetype/jpeg on the target, but checks for them on the host? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 14:03:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 15:03:04 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/qt5webengine: fix compile flags for arm In-Reply-To: <20200306203410.25008-1-ps.report@gmx.net> References: <20200306203410.25008-1-ps.report@gmx.net> Message-ID: <20220109150304.45e12aea@windsurf> Hello Peter, On Fri, 6 Mar 2020 21:34:09 +0100 Peter Seiderer wrote: > The qt5webengine configure simple takes QT_ARCH ('arm') to determine the > chromium compiler flags and uses some hard coded ARMv7 default values > for the compiler command line: '... -march=armv7-a -mfloat-abi=hard > -mtune=generic-armv7-a -mfpu=vfpv3-d16 ...'. > > This results e.g. in an illegal instruction failure for rpi zero > (reported on the mailing list, see [1]). > > Disable all arm custom cpu flags (march/mfloat-abi/mtune/mfpu/mthumb) as > these are already set by the compiler wrapper (via a patch to the chromium > GN build system BUILD.gn file). > > Despite the patch set all known values in the chromium GN build > system config file chromium/build/config/arm.gni to not disturb > the compile defines settings logic. It's been a very long time since this patch was posted. Does the problem still occur? There is a patch series from James Hilliard upgrading qt5webengine: https://patchwork.ozlabs.org/project/buildroot/list/?series=279766 Some more questions below. > +diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn > +index d223a4f6f..16dec5c6a 100644 > +--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn > ++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn > +@@ -672,7 +672,8 @@ config("compiler") { > + # TODO(pcc): The contents of .ARM.attributes should be based on the > + # -march flag passed at compile time (see llvm.org/pr36291). > + if (current_cpu == "arm") { > +- ldflags += [ "-march=$arm_arch" ] > ++ # disabled for the buildroot compile > ++ # ldflags += [ "-march=$arm_arch" ] > + } > + } > + > +@@ -752,13 +753,15 @@ config("compiler_cpu_abi") { > + ldflags += [ "--target=arm-linux-gnueabihf" ] > + } > + if (!is_nacl) { > +- cflags += [ > +- "-march=$arm_arch", > +- "-mfloat-abi=$arm_float_abi", > +- ] > ++ # disabled for the buildroot compile > ++ # cflags += [ > ++ # "-march=$arm_arch", > ++ # "-mfloat-abi=$arm_float_abi", > ++ # ] > + } > + if (arm_tune != "") { > +- cflags += [ "-mtune=$arm_tune" ] > ++ # disabled for the buildroot compile > ++ # cflags += [ "-mtune=$arm_tune" ] > + } > + } else if (current_cpu == "arm64") { > + if (is_clang && !is_android && !is_nacl && !is_fuchsia) { > +@@ -1130,7 +1133,9 @@ config("clang_revision") { > + > + config("compiler_arm_fpu") { > + if (current_cpu == "arm" && !is_ios && !is_nacl) { > +- cflags = [ "-mfpu=$arm_fpu" ] > ++ # disabled for the buildroot compile > ++ # cflags = [ "-mfpu=$arm_fpu" ] > ++ cflags = [] > + asmflags = cflags > + } > + } > +@@ -1138,7 +1143,9 @@ config("compiler_arm_fpu") { > + config("compiler_arm_thumb") { > + if (current_cpu == "arm" && arm_use_thumb && is_posix && > + !(is_mac || is_ios || is_nacl)) { > +- cflags = [ "-mthumb" ] > ++ # disabled for the buildroot compile > ++ # cflags = [ "-mthumb" ] > ++ cflags = [] > + if (is_android && !is_clang) { > + # Clang doesn't support this option. > + cflags += [ "-mthumb-interwork" ] You're fixing the problem for ARM, but is there some similar mess for other CPU architectures? > +# configure arm architecture paramter for chromium compile > +ifeq ($(BR2_arm),y) > +ifeq ($(BR2_ARM_CPU_ARMV4),y) > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > + $(SED) 's/^ arm_version = 7$$/ arm_version = 4/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV5),y) > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > + $(SED) 's/^ arm_version = 7$$/ arm_version = 5/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV6),y) > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > + $(SED) 's/^ arm_version = 7$$/ arm_version = 6/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +# no entriy for BR2_ARM_CPU_ARMV7A/BR2_ARM_CPU_ARMV7M, arm_vesion = 7 is already set by default > + > +ifeq ($(BR2_ARM_CPU_ARMV8A),y) > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > + $(SED) 's/^ arm_version = 7$$/ arm_version = 8/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +# not known by buildroot, set to some dummy to disable all default logic > +define QT5WEBENGINE_CONFIGURE_ARM_ARCH > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "arm-dummy-arch"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +define QT5WEBENGINE_CONFIGURE_ARM_FPU > + $(SED) 's/^ arm_fpu = ""$$/ arm_fpu = $(BR2_GCC_TARGET_FPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +define QT5WEBENGINE_CONFIGURE_ARM_FLOAT_ABI > + $(SED) 's/^ arm_float_abi = ""$$/ arm_float_abi = $(BR2_GCC_TARGET_FLOAT_ABI)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +define QT5WEBENGINE_CONFIGURE_ARM_TUNE > + $(SED) 's/^ arm_tune = ""$$/ arm_tune = $(BR2_GCC_TARGET_CPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "true"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +else > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "false"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_HAS_THUMB),) > +define QT5WEBENGINE_CONFIGURE_ARM_THUMB > + $(SED) 's/^ arm_use_thumb = true$$/ arm_use_thumb = false/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > +endif What are all those variables doing in the GN Chromium stuff? I'm kind of worried by two aspects: - This is all very ARM specific, but we have other CPU architectures supported in Buildroot - We already pass the proper CFLAGS, so it's always annoying to duplicate this logic into package-specific flags Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 14:03:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 15:03:59 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/qt5webengine: use buildroot cflags/ldflags for arm In-Reply-To: <20200306203410.25008-2-ps.report@gmx.net> References: <20200306203410.25008-1-ps.report@gmx.net> <20200306203410.25008-2-ps.report@gmx.net> Message-ID: <20220109150359.1c4a717b@windsurf> On Fri, 6 Mar 2020 21:34:10 +0100 Peter Seiderer wrote: > +define QT5WEBENGINE_CONFIGURE_COMPILER_FLAGS > + $(SED) 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))%g' $(@D)/src/3rdparty/chromium/build/config/compiler/BUILD.gn > + $(SED) 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))%g' $(@D)/src/3rdparty/chromium/build/config/compiler/BUILD.gn > +endef This looks like a good thing. Could it replace the ARM-specific logic you had in your PATCH 1/2 ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yegorslists at googlemail.com Sun Jan 9 14:04:21 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Sun, 9 Jan 2022 15:04:21 +0100 Subject: [Buildroot] [PATCH] package/avrdude: bump to version 6.4 Message-ID: <20220109140421.27820-1-yegorslists@googlemail.com> From: Yegor Yefremov The project moved to GitHub, hence change the download location. Signed-off-by: Yegor Yefremov --- package/avrdude/avrdude.hash | 4 ++-- package/avrdude/avrdude.mk | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index ec43355451..1c7758afcd 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a09913450c6457c3fe8d43d5141de579d4e57d67e593e7399a4cd3768cc60f9 avrdude-r1450-br2.tar.gz -sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 avrdude/COPYING +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz +sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index ae623a7929..5bbbc4e8c2 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,13 +4,12 @@ # ################################################################################ -AVRDUDE_VERSION = r1450 -AVRDUDE_SITE_METHOD = svn -AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk +AVRDUDE_VERSION = v6.4 +AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ -AVRDUDE_LICENSE_FILES = avrdude/COPYING -AVRDUDE_SUBDIR = avrdude -# Sources coming from svn, without generated configure and Makefile.in +AVRDUDE_LICENSE_FILES = COPYING + +# Sources coming from git, without generated configure and Makefile.in # files. AVRDUDE_AUTORECONF = YES AVRDUDE_CONF_OPTS = --enable-linuxgpio -- 2.17.0 From fontaine.fabrice at gmail.com Sun Jan 9 14:03:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 15:03:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/gvfs: bump to version 1.48.1 Message-ID: <20220109140301.663692-1-fontaine.fabrice@gmail.com> Drop patch (not needed since https://gitlab.gnome.org/GNOME/gvfs/-/commit/eee4bb846038e4440ffc8a591869974639c72bb0) https://gitlab.gnome.org/GNOME/gvfs/-/blob/1.48.1/NEWS Signed-off-by: Fabrice Fontaine --- ...n.build-fix-linking-with-libmetadata.patch | 78 ------------------- package/gvfs/gvfs.hash | 4 +- package/gvfs/gvfs.mk | 2 +- 3 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch diff --git a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch b/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch deleted file mode 100644 index 3ee4a28e94..0000000000 --- a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 731256d7517f0d9cf0b999bb22f864080d5e8690 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 18 Jul 2020 10:00:50 +0200 -Subject: [PATCH] meson.build: fix linking with libmetadata - -libmetadata is built as a static library and depends on libgvfscommon so -change the dependencies order to put libgvfscommon_dep after -libmetadata_dep or gvfsd-metadata will fail to link on: - -FAILED: metadata/gvfsd-metadata -/home/naourr/work/instance-3/output-1/host/bin/arm-none-linux-gnueabi-gcc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata at exe/meta-daemon.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgio-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgobject-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/common -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/metadata -metadata/libmetadata.a(metatree.c.o): In function `safe_open': -metatree.c:(.text+0x9c8): undefined reference to `gvfs_randomize_string' -collect2: error: ld returned 1 exit status - -Apply this change in the whole source code and not only for -gvfsd-metadata to avoid any other build failures. - -Fixes: - - http://autobuild.buildroot.org/results//fa892c41b6b9285839a0164b000e37fb04dcc194 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/92] ---- - client/meson.build | 2 +- - metadata/meson.build | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/client/meson.build b/client/meson.build -index 8f57d0d3..1d251481 100644 ---- a/client/meson.build -+++ b/client/meson.build -@@ -33,8 +33,8 @@ sources = uri_parser_sources + uri_utils + files( - - deps = [ - gio_unix_dep, -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ] - - cflags = [ -diff --git a/metadata/meson.build b/metadata/meson.build -index 4e120d18..5699e6f2 100644 ---- a/metadata/meson.build -+++ b/metadata/meson.build -@@ -72,8 +72,8 @@ libmetadata_dep = declare_dependency( - ) - - deps = [ -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ] - - if enable_gudev -@@ -105,8 +105,8 @@ if enable_devel_utils - app + '.c', - include_directories: top_inc, - dependencies: [ -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ], - c_args: cflags, - ) -@@ -119,6 +119,7 @@ if enable_devel_utils - include_directories: top_inc, - dependencies: [ - libmetadata_dep, -+ libgvfscommon_dep, - libxml_dep, - ], - c_args: cflags, --- -2.27.0 - diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 2ee945e710..f4a5364f1f 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.44/gvfs-1.44.1.sha256sum -sha256 50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46 gvfs-1.44.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.48/gvfs-1.48.1.sha256sum +sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz # Hash for license file sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index fc77e8e1aa..4174592455 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.44 +GVFS_VERSION_MAJOR = 1.48 GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 14:10:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 15:10:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/atop: bump to version 2.7.1 Message-ID: <20220109141050.665536-1-fontaine.fabrice@gmail.com> https://www.atoptool.nl/downloadatop.php Signed-off-by: Fabrice Fontaine --- package/atop/atop.hash | 2 +- package/atop/atop.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index fb2eb1c727..18ba42340c 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 a606705aaca940a6d44d67c886529a75db98fd88140f743eb0aaebb184c38af7 atop-2.7.0.tar.gz +sha256 ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e atop-2.7.1.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index f2a1f1de51..8a0fcda33b 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.7.0 +ATOP_VERSION = 2.7.1 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Jan 9 14:19:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 15:19:12 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5declarative: remove optional quick module option In-Reply-To: <20200923182300.58950-1-b.bilas@grinn-global.com> References: <20200923182300.58950-1-b.bilas@grinn-global.com> Message-ID: <20220109151912.6423b8f1@windsurf> On Wed, 23 Sep 2020 20:23:00 +0200 Bartosz Bilas wrote: > Since commit [1] we are not able to disable/enable this module > so let's force to set Qt5 OpenGL support by default > if it's possible because currently quick's components > are being built anyway. > > This should fix the build errors with qt5location package > which includes couple of built-in components that require > OpenGL support [2] when Qt Quick module is detected. > > http://autobuild.buildroot.net/results/ddd/ddda7cdb9400f6ca7d548e9b5ada18674fbe42e0/ > http://autobuild.buildroot.net/results/ddb/ddb25ebb591ed6029a7bd4934464171358553936/ > > [1] https://git.buildroot.net/buildroot/commit/package/qt5/qt5declarative/qt5declarative.mk?id=1bdceb5d735aad5fbf32b35e3a7f573ecb727e20 > [2] https://code.woboq.org/qt5/qtdeclarative/src/quick/scenegraph/coreapi/qsgmaterialshader.h.html#105 > > Signed-off-by: Bartosz Bilas > --- > package/qt5/qt5declarative/Config.in | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) Sorry for the slow feedback/decision. The proper fix for this issue has been committed in December: https://git.buildroot.net/buildroot/commit/package/qt5/qt5location?id=cea2b082eb35d9fd466833098463e2adcbb40022 This allows qt5location to build without opengl, so there's no longer a need to force qt5declarative to enable opengl support. The BR2_PACKAGE_QT5DECLARATIVE_QUICK indeed no longer does anything in qt5declarative.mk itself, but it does ensure that the necessary dependencies for the quick module are enabled, and that therefore the quick module will be built. So I've marked the patch as Superseded. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sun Jan 9 14:49:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 15:49:07 +0100 Subject: [Buildroot] [PATCH v3] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: <20220109110736.3963-1-nolange79@gmail.com> References: <20220109110736.3963-1-nolange79@gmail.com> Message-ID: Hi Norbert, Applied to master, thanks. I have a bunch of stylistic remarks, but it's nitpicky so I didn't apply them. The only thing I did is the indentation (4 spaces in shell scripts). On 09/01/2022 12:07, Norbert Lange wrote: [snip] > diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh > new file mode 100644 > index 0000000000..7e9b02cc0a > --- /dev/null > +++ b/package/systemd/fakeroot_tmpfiles.sh > @@ -0,0 +1,57 @@ > +#!/bin/sh > +# > +# The systemd-tmpfiles has the ability to grab information > +# from the filesystem (instead from the running system). > +# > +# However there are a few specifiers that *always* will grab > +# information from the running system examples are %a, %b, %m, %H > +# (Architecture, Boot UUID, Machine UUID, Hostname). > +# > +# See [1] for historic information. > +# > +# This script will (conservatively) skip tmpfiles lines that have > +# such an specifier to prevent leaking host information. Instead of skipping, perhaps we should terminate with an error? Or would that mean that it never passes with current systemd? > +# > +# shell expansion is critical to be POSIX compliant, > +# this script wont work with zsh in its default mode for example. I don't get this... If the script doesn't work with /bin/sh == zsh, maybe use /usr/bin/env bash instead? (We already check for bash in dependencies.sh so it's fine to require it.) > +# > +# The script takes several measures to handle more complex stuff > +# like passing this correctly: > +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n > +# > +# [1] - https://github.com/systemd/systemd/pull/16187 The end of that is that Lennart merged something which does (AFAIU) part of what you need done. Would it be possible to rebase your changes on top of that? > + > +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || > + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles > + > +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || I don't understand why you need "${1-}" and not simply "$1". In this context (with the quotes around it) there is no difference at all between the two, right? Also, I prefer ROOTFS="$1" and use $ROOTFS further down; IMHO that's more readable. > + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } > + > +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | > + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | > + while read -r line; do > + # it is allowed to use quotes around arguments, > + # so let the shell pack the arguments > + eval "set -- $line" > + > + # dont output warnings for directories we dont process > + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && > + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && > + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || > + continue > + > + # blank out all specs that are ok to use, > + # test if some remain. (Specs up to date with v250) > + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then > + # no "bad" specifiers, pass the line unmodified > + eval "printf '%s\n' '$line'" > + else > + # warn > + eval "printf 'ignored spec: %s\n' '$line' 1>&2" > + fi > + done | > +\ > +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ > + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ > + --exclude-prefix=/tmp --exclude-prefix=/mnt \ All these excludes are already excluded above from the "directories we don't process" block, so maybe it can be removed? OTOH, if we can later get upstream to no longer have those ignored specs, we can remove the preprocessing and it's handy to have the exclude statements already. Anyway, I added a comment to the comment block in the beginning to explain why they're excluded: # tmpfs directories (/tmp, /proc, ...) are skipped since they're not # relevant for the rootfs image. > + - > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 7bf8018438..e136229c8e 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -709,10 +709,15 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > endef > SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > +define SYSTEMD_CREATE_TMPFILES_HOOK > + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ > + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) Since the script has a shebang line, I remove the /bin/sh here and made it executable. > +endef > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL We normally add the hook immediately after the definition of the hook, so I changed that as well. Regards, Arnout PS There's no need to keep Maxime in Cc, he's no longer involved in Buildroot at all. > > SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) > SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) > @@ -783,7 +788,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dvconsole=false \ > -Dquotacheck=false \ > -Dsysusers=false \ > - -Dtmpfiles=false \ > + -Dtmpfiles=true \ > -Dimportd=false \ > -Dhwdb=false \ > -Drfkill=false \ > From arnout at mind.be Sun Jan 9 14:29:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 15:29:28 +0100 Subject: [Buildroot] [git commit] package/systemd: add systemd-oomd user Message-ID: <20220109144258.0858082DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b94dab2ee4f7467e017ebd8aaa8b26aaa1cc70e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master add the missing user if oomd is enabled. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 4cf8dd5707..a72ed04aeb 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -428,6 +428,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_OOMD),y) SYSTEMD_CONF_OPTS += -Doomd=true +SYSTEMD_OOMD_USER = systemd-oom -1 systemd-oom -1 * - - - systemd Userspace OOM Killer else SYSTEMD_CONF_OPTS += -Doomd=false endif @@ -585,6 +586,7 @@ define SYSTEMD_USERS - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) + $(SYSTEMD_OOMD_USER) $(SYSTEMD_NETWORKD_USER) $(SYSTEMD_RESOLVED_USER) $(SYSTEMD_TIMESYNCD_USER) From arnout at mind.be Sun Jan 9 14:30:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 15:30:12 +0100 Subject: [Buildroot] [git commit] package/systemd: fix pre-creation of directories for coredump Message-ID: <20220109144258.11CCD82DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99dabffc096c81bcd01198edc81b7ce262091ffb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix a copy-paste bug in commit be256690788fefad93ab00f0233ddb9414d29727. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a72ed04aeb..3811dbae42 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -414,7 +414,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing -SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - +SYSTEMD_COREDUMP_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -576,6 +576,7 @@ define SYSTEMD_PERMISSIONS $(SYSTEMD_LOGIND_PERMISSIONS) $(SYSTEMD_MACHINED_PERMISSIONS) $(SYSTEMD_HOMED_PERMISSIONS) + $(SYSTEMD_COREDUMP_PERMISSIONS) $(SYSTEMD_PSTORE_PERMISSIONS) $(SYSTEMD_TIMESYNCD_PERMISSIONS) endef From arnout at mind.be Sun Jan 9 14:09:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 15:09:39 +0100 Subject: [Buildroot] [git commit] package/systemd: invoke systemd-tmpfilesd on final image Message-ID: <20220109144257.F34A7817B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d9b84b7a83fef1048a026a3d1804c8b32a0990d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Especially for read-only filesystems it is helpful to pre-create all folders for non-volatile paths. This needs to run under fakeroot to allow setting uids/gids/perms for the target fs. systemd-tmpfilesd supports specifiers and target rootfs, but some specifiers resolve to information from the host, it is necessary to specially handle (skip) entries that contain problematic specifiers. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/fakeroot_tmpfiles.sh | 59 ++++++++++++++++++++++++++++++++++++ package/systemd/systemd.mk | 8 ++++- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh new file mode 100755 index 0000000000..9498638f0b --- /dev/null +++ b/package/systemd/fakeroot_tmpfiles.sh @@ -0,0 +1,59 @@ +#!/bin/sh +# +# The systemd-tmpfiles has the ability to grab information +# from the filesystem (instead from the running system). +# +# tmpfs directories (/tmp, /proc, ...) are skipped since they're not +# relevant for the rootfs image. +# +# However there are a few specifiers that *always* will grab +# information from the running system examples are %a, %b, %m, %H +# (Architecture, Boot UUID, Machine UUID, Hostname). +# +# See [1] for historic information. +# +# This script will (conservatively) skip tmpfiles lines that have +# such an specifier to prevent leaking host information. +# +# shell expansion is critical to be POSIX compliant, +# this script wont work with zsh in its default mode for example. +# +# The script takes several measures to handle more complex stuff +# like passing this correctly: +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n +# +# [1] - https://github.com/systemd/systemd/pull/16187 + +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles + +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } + +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | + while read -r line; do + # it is allowed to use quotes around arguments, + # so let the shell pack the arguments + eval "set -- $line" + + # dont output warnings for directories we dont process + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || + continue + + # blank out all specs that are ok to use, + # test if some remain. (Specs up to date with v250) + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then + # no "bad" specifiers, pass the line unmodified + eval "printf '%s\n' '$line'" + else + # warn + eval "printf 'ignored spec: %s\n' '$line' 1>&2" + fi + done | + TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run \ + --exclude-prefix=/sys --exclude-prefix=/tmp --exclude-prefix=/mnt \ + - diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 7bf8018438..4cf8dd5707 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -709,6 +709,12 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE +define SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK + define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef @@ -783,7 +789,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dvconsole=false \ -Dquotacheck=false \ -Dsysusers=false \ - -Dtmpfiles=false \ + -Dtmpfiles=true \ -Dimportd=false \ -Dhwdb=false \ -Drfkill=false \ From arnout at mind.be Sun Jan 9 14:49:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 15:49:24 +0100 Subject: [Buildroot] [PATCH v2] package/openrc: add patch to create /run/lock/subsys In-Reply-To: <20220109110555.3789-1-nolange79@gmail.com> References: <20220109110555.3789-1-nolange79@gmail.com> Message-ID: <7fb03a8b-f75f-8318-ce76-0ad5a96e6bc5@mind.be> On 09/01/2022 12:05, Norbert Lange wrote: > Together with changes to sysv/busybox init, this directory > will already exist on all init systems before any service > scripts are run. > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Arnout > --- > v1->v2: > * refresh patch > --- > ...lso-create-run-lock-subsys-directory.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/openrc/0006-Also-create-run-lock-subsys-directory.patch > > diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch > new file mode 100644 > index 0000000000..cf592a88b0 > --- /dev/null > +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch > @@ -0,0 +1,29 @@ > +From 49e5929b468f604d80a0c04a6ce78eb96ca36090 Mon Sep 17 00:00:00 2001 > +From: Norbert Lange > +Date: Sun, 9 Jan 2022 00:22:40 +0100 > +Subject: [PATCH] Also create /run/lock/subsys directory > + > +Buildroot service scripts regularly use this directory, so > +create it in the most appropriate spot. > + > +Signed-off-by: Norbert Lange > +--- > + sh/init.sh.Linux.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in > +index e8afc1fb..662ab223 100644 > +--- a/sh/init.sh.Linux.in > ++++ b/sh/init.sh.Linux.in > +@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then > + fi > + > + checkpath -d "$RC_SVCDIR" > +-checkpath -d -m 0775 -o root:daemon /run/lock > ++checkpath -d -m 0775 -o root:daemon /run/lock /run/lock/subsys > + > + # Try to mount xenfs as early as possible, otherwise rc_sys() will always > + # return RC_SYS_XENU and will think that we are in a domU while it's not. > +-- > +2.34.1 > + > From arnout at mind.be Sun Jan 9 14:49:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 15:49:34 +0100 Subject: [Buildroot] [PATCH v3] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: <20220109110736.3963-1-nolange79@gmail.com> References: <20220109110736.3963-1-nolange79@gmail.com> Message-ID: <41020492-1207-aaae-4a38-03f096c5b0e1@mind.be> On 09/01/2022 12:07, Norbert Lange wrote: > Especially for read-only filesystems it is helpfull to > pre-create all folders for non-volatile paths. > > This needs to run under fakeroot to allow setting > uids/gids/perms for the target fs. > > systemd-tmpfilesd supports specifiers and target rootfs, > but some specifiers resolve to information from the host, > it is necessary to specially handle (skip) entries that > contain problematic specifiers. > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Arnout > --- > v1->v2 > * add a script to skip/handle specifiers that might > otherwise take information from the host > v2->v3 > * adopt fakeroot_tmpfiles.sh to current systemd-tmpfilesd (v250), > several more specifiers are supported directly for our usecase. > --- > package/systemd/fakeroot_tmpfiles.sh | 57 ++++++++++++++++++++++++++++ > package/systemd/systemd.mk | 9 ++++- > 2 files changed, 64 insertions(+), 2 deletions(-) > create mode 100644 package/systemd/fakeroot_tmpfiles.sh > > diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh > new file mode 100644 > index 0000000000..7e9b02cc0a > --- /dev/null > +++ b/package/systemd/fakeroot_tmpfiles.sh > @@ -0,0 +1,57 @@ > +#!/bin/sh > +# > +# The systemd-tmpfiles has the ability to grab information > +# from the filesystem (instead from the running system). > +# > +# However there are a few specifiers that *always* will grab > +# information from the running system examples are %a, %b, %m, %H > +# (Architecture, Boot UUID, Machine UUID, Hostname). > +# > +# See [1] for historic information. > +# > +# This script will (conservatively) skip tmpfiles lines that have > +# such an specifier to prevent leaking host information. > +# > +# shell expansion is critical to be POSIX compliant, > +# this script wont work with zsh in its default mode for example. > +# > +# The script takes several measures to handle more complex stuff > +# like passing this correctly: > +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n > +# > +# [1] - https://github.com/systemd/systemd/pull/16187 > + > +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || > + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles > + > +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || > + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } > + > +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | > + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | > + while read -r line; do > + # it is allowed to use quotes around arguments, > + # so let the shell pack the arguments > + eval "set -- $line" > + > + # dont output warnings for directories we dont process > + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && > + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && > + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || > + continue > + > + # blank out all specs that are ok to use, > + # test if some remain. (Specs up to date with v250) > + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then > + # no "bad" specifiers, pass the line unmodified > + eval "printf '%s\n' '$line'" > + else > + # warn > + eval "printf 'ignored spec: %s\n' '$line' 1>&2" > + fi > + done | > +\ > +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ > + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ > + --exclude-prefix=/tmp --exclude-prefix=/mnt \ > + - > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 7bf8018438..e136229c8e 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -709,10 +709,15 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > endef > SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > +define SYSTEMD_CREATE_TMPFILES_HOOK > + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ > + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) > +endef > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL > > SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) > SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) > @@ -783,7 +788,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dvconsole=false \ > -Dquotacheck=false \ > -Dsysusers=false \ > - -Dtmpfiles=false \ > + -Dtmpfiles=true \ > -Dimportd=false \ > -Dhwdb=false \ > -Drfkill=false \ > From arnout at mind.be Sun Jan 9 14:54:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 15:54:17 +0100 Subject: [Buildroot] [PATCH 1/1] boot/uboot/: Name U-Boot boot script image In-Reply-To: References: Message-ID: <5a29a382-a3c4-cd0a-24e2-85d478f79ece@mind.be> Hi Yair, On 24/06/2020 01:04, Yair Ben-Avraham wrote: > Signed-off-by: Yair Ben Avraham Shortly after you submitted this patch, the logic for U-boot scripts moved from boot/uboot to package/u-boot-tools. Could you update this patch to take that into account? Also, please update the commit message to explain the use case. Why would you want the name field in the script image to be set to anything? AFAIK it is not visible or used anywhere. > --- > boot/uboot/Config.in | 5 +++++ > boot/uboot/uboot.mk | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index 8cce9b1bae..310c4f8186 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -568,6 +568,11 @@ config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE > help > Source file to generate the U-Boot boot script. > > +config BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME > + string "U-Boot boot script image name" > + help > + Image (*not* file) name. > + > endif > > if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 71689207e3..ab945eb159 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -340,6 +340,7 @@ define UBOOT_INSTALL_IMAGES_CMDS > $(UBOOT_GENERATE_ENV_IMAGE) > $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT), > $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \ > + -n $(BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME) \ We generally prefer explicit quoting, i.e. -n "$(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_SCRIPT_IMAGE_NAME))" Regards, Arnout > -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \ > $(BINARIES_DIR)/boot.scr) > endef > -- > 2.20.1 > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > From peter at korsgaard.com Sun Jan 9 14:57:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:57:48 +0100 Subject: [Buildroot] [PATCH] package/xapian: bump to version 1.4.19 In-Reply-To: <20220109113312.755637-1-gilles.talis@gmail.com> (Gilles Talis's message of "Sun, 9 Jan 2022 12:33:12 +0100") References: <20220109113312.755637-1-gilles.talis@gmail.com> Message-ID: <87y23pardf.fsf@dell.be.48ers.dk> >>>>> "Gilles" == Gilles Talis writes: > Signed-off-by: Gilles Talis Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:58:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:58:00 +0100 Subject: [Buildroot] [PATCH] package/libolm: bump to version 3.2.9 In-Reply-To: <20220109113223.755567-1-gilles.talis@gmail.com> (Gilles Talis's message of "Sun, 9 Jan 2022 12:32:23 +0100") References: <20220109113223.755567-1-gilles.talis@gmail.com> Message-ID: <87tuedard3.fsf@dell.be.48ers.dk> >>>>> "Gilles" == Gilles Talis writes: > Signed-off-by: Gilles Talis Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:58:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:58:50 +0100 Subject: [Buildroot] [PATCH] package/tesseract-ocr: bump to version 5.0.1 In-Reply-To: <20220109114757.785223-1-gilles.talis@gmail.com> (Gilles Talis's message of "Sun, 9 Jan 2022 12:47:57 +0100") References: <20220109114757.785223-1-gilles.talis@gmail.com> Message-ID: <87pmp1arbp.fsf@dell.be.48ers.dk> >>>>> "Gilles" == Gilles Talis writes: > - Updated language training data version to 4.1.0 > - Removed current patch as not required anymore > - Added patch to fix uclibc failures > - Supported C++ version has moved from C++11 to C++17 > Signed-off-by: Gilles Talis Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:59:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:59:15 +0100 Subject: [Buildroot] [PATCH 1/2] package/gupnp: bump to version 1.4.2 In-Reply-To: <20220109130732.430160-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 14:07:31 +0100") References: <20220109130732.430160-1-fontaine.fabrice@gmail.com> Message-ID: <87lezparb0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.2/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:59:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:59:30 +0100 Subject: [Buildroot] [PATCH 2/2] package/gupnp-av: bump to version 0.14.0 In-Reply-To: <20220109130732.430160-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 14:07:32 +0100") References: <20220109130732.430160-1-fontaine.fabrice@gmail.com> <20220109130732.430160-2-fontaine.fabrice@gmail.com> Message-ID: <87h7adaral.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://gitlab.gnome.org/GNOME/gupnp-av/-/blob/gupnp-av-0.14.0/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:59:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:59:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbytesize: bump to version 2.6 In-Reply-To: <20220109131128.468829-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 14:11:28 +0100") References: <20220109131128.468829-1-fontaine.fabrice@gmail.com> Message-ID: <87czl1ar9t.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/storaged-project/libbytesize/releases/tag/2.6 > https://github.com/storaged-project/libbytesize/blob/2.6/NEWS.rst > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:57:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:57:30 +0100 Subject: [Buildroot] [git commit] package/xapian: bump to version 1.4.19 Message-ID: <20220109145350.C1C4E82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ed3288e44e12817d1ea8bd56956f1af0a209798 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/xapian/xapian.hash | 4 ++-- package/xapian/xapian.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index 192032e6db..e570f7e2f2 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2021-January/009856.html -sha256 196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 xapian-core-1.4.18.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2022-January/009934.html +sha256 1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3 xapian-core-1.4.19.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 4f40babcf9..464e5478df 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.18 +XAPIAN_VERSION = 1.4.19 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Jan 9 14:59:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:59:08 +0100 Subject: [Buildroot] [git commit] package/gupnp: bump to version 1.4.2 Message-ID: <20220109145350.E10FE82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e89b555a4d20799990f954d545d180832bb3cd05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 1825298f24..cc78be7d5d 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.1.sha256sum: -sha256 899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c gupnp-1.4.1.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.2.sha256sum: +sha256 bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc gupnp-1.4.2.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index 02d9b289e0..aebf9225a8 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sun Jan 9 14:57:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:57:58 +0100 Subject: [Buildroot] [git commit] package/libolm: bump to version 3.2.9 Message-ID: <20220109145350.CC0FD82DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6050df28b225a686d750b6f9d6825de977735ad1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/libolm/libolm.hash | 2 +- package/libolm/libolm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 80210a2e5f..044bb24f06 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9b61bd9182bb0ae0c5a800a8b0496b69600a0a22e3a21fce0aad119d2b1c99ae olm-3.2.6.tar.gz +sha256 614c0e4dc4721f57e56c3385bd8def2f71c6631f928a480efd0b4bd8e5435df9 olm-3.2.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 0049fb6001..607e50702f 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.2.6 +LIBOLM_VERSION = 3.2.9 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 From peter at korsgaard.com Sun Jan 9 14:59:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:59:26 +0100 Subject: [Buildroot] [git commit] package/gupnp-av: bump to version 0.14.0 Message-ID: <20220109145350.EC30982DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=490d8b13b16f32d23fc69ebf00ac1c98d9f523e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.gnome.org/GNOME/gupnp-av/-/blob/gupnp-av-0.14.0/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gupnp-av/gupnp-av.hash | 4 ++-- package/gupnp-av/gupnp-av.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index 570f8ab3d0..ceab42ef52 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.13/gupnp-av-0.13.0.sha256sum: -sha256 578b8f562b0f7e908416a41efbe2b7e6b892cd2ed7eac61ac63c48fdc8d7e6c8 gupnp-av-0.13.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: +sha256 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156 gupnp-av-0.14.0.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index c2d3c3ba18..655de87608 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUPNP_AV_VERSION_MAJOR = 0.13 +GUPNP_AV_VERSION_MAJOR = 0.14 GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) From peter at korsgaard.com Sun Jan 9 14:59:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:59:45 +0100 Subject: [Buildroot] [git commit] package/libbytesize: bump to version 2.6 Message-ID: <20220109145351.00FF082DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4353279ce2231c702eac1d1c6f875e3e6708375 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/storaged-project/libbytesize/releases/tag/2.6 https://github.com/storaged-project/libbytesize/blob/2.6/NEWS.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libbytesize/libbytesize.hash | 2 +- package/libbytesize/libbytesize.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbytesize/libbytesize.hash b/package/libbytesize/libbytesize.hash index 51fa43aef1..2dfa97dd6a 100644 --- a/package/libbytesize/libbytesize.hash +++ b/package/libbytesize/libbytesize.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6305addae2b7be313dbfc36b96094ec0544d5144859ab4a5685ca6d314d6fdda libbytesize-2.5.tar.gz +sha256 efaa2b35b2bb3b52bf7b4ff5d0ed2c5c61360a5196053808d615dd0aa2cf0741 libbytesize-2.6.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libbytesize/libbytesize.mk b/package/libbytesize/libbytesize.mk index 0ba380dc74..2ef08211c5 100644 --- a/package/libbytesize/libbytesize.mk +++ b/package/libbytesize/libbytesize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.5 +LIBBYTESIZE_VERSION = 2.6 LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) LIBBYTESIZE_LICENSE = LGPL-2.1+ LIBBYTESIZE_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Jan 9 14:58:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:58:45 +0100 Subject: [Buildroot] [git commit] package/tesseract-ocr: bump to version 5.0.1 Message-ID: <20220109145350.D5EB882DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df3f0c226fccd8d6143b09a1e05a0f5f23587136 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Updated language training data version to 4.1.0 - Removed current patch as not required anymore - Added patch to fix uclibc failures - Supported C++ version has moved from C++11 to C++17 Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- ...Check-if-platform-supports-feenableexcept.patch | 42 ++++++++++++++++++++++ .../0001-Fix-timeval-structure-build-failure.patch | 27 -------------- package/tesseract-ocr/Config.in | 6 ++-- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 4 +-- 5 files changed, 48 insertions(+), 33 deletions(-) diff --git a/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch new file mode 100644 index 0000000000..5280f01aba --- /dev/null +++ b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch @@ -0,0 +1,42 @@ +From 52484af83a58664c3cc91b8af07aeeea271f67ef Mon Sep 17 00:00:00 2001 +From: Gilles Talis +Date: Sun, 9 Jan 2022 10:58:36 +0100 +Subject: [PATCH] Check if platform supports feenableexcept + +Signed-off-by: Gilles Talis +--- + configure.ac | 4 ++++ + src/tesseract.cpp | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9177d64..80cd735 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,10 @@ case "${host_cpu}" in + + esac + ++# check whether feenableexcept is supported. some C libraries (e.g. uclibc) don't. ++AC_CHECK_FUNC(feenableexcept, [feenableexcept=true], [feenableexcept=false]) ++AM_CONDITIONAL([HAVE_FEENABLEEXCEPT], $feenableexcept) ++ + AX_CHECK_COMPILE_FLAG([-fopenmp-simd], [openmp_simd=true], [openmp_simd=false], [$WERROR]) + AM_CONDITIONAL([OPENMP_SIMD], $openmp_simd) + +diff --git a/src/tesseract.cpp b/src/tesseract.cpp +index 933116e..9154db8 100644 +--- a/src/tesseract.cpp ++++ b/src/tesseract.cpp +@@ -629,7 +629,7 @@ static void PreloadRenderers(tesseract::TessBaseAPI &api, + **********************************************************************/ + + int main(int argc, char **argv) { +-#if defined(__USE_GNU) ++#if defined(__USE_GNU) && defined(HAVE_FEENABLEEXCEPT) + // Raise SIGFPE. + # if defined(__clang__) + // clang creates code which causes some FP exceptions, so don't enable those. +-- +2.32.0 + diff --git a/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch b/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch deleted file mode 100644 index 0b0bb1a899..0000000000 --- a/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ea1e1ddfc0af9966a0c613a93087bc3e0a5979a7 Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Fri, 19 Jul 2019 18:52:03 +0200 -Subject: [PATCH] Fix timeval structure build failure - -timeval structure definition requires to be included - -Signed-off-by: Gilles Talis ---- - src/ccutil/ocrclass.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h -index d39a6dd..2a01118 100644 ---- a/src/ccutil/ocrclass.h -+++ b/src/ccutil/ocrclass.h -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #ifdef _WIN32 - #include // for timeval - #endif --- -2.7.4 - diff --git a/package/tesseract-ocr/Config.in b/package/tesseract-ocr/Config.in index 3afaca771a..4d9b78733e 100644 --- a/package/tesseract-ocr/Config.in +++ b/package/tesseract-ocr/Config.in @@ -1,13 +1,13 @@ -comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 4.8, dynamic library, wchar" +comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, wchar" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR menuconfig BR2_PACKAGE_TESSERACT_OCR bool "tesseract-ocr" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 808ea174ef..9e526423d3 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb tesseract-ocr-4.1.1.tar.gz +sha256 b5b0e561650ed67feb1e9de38d4746121d302ae4c876c95b99b8b6f9f89d5c58 tesseract-ocr-5.0.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index fc083c27f6..7e23e64136 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,8 +4,8 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 4.1.1 -TESSERACT_OCR_DATA_VERSION = 4.0.0 +TESSERACT_OCR_VERSION = 5.0.1 +TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 TESSERACT_OCR_LICENSE_FILES = LICENSE From romain.naour at smile.fr Sun Jan 9 15:00:11 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 16:00:11 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org Message-ID: <20220109150012.1907226-1-romain.naour@smile.fr> While packaging telegraf [1] the download step failed due to a checksum mismatch: go: downloading collectd.org v0.5.0 get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 verifying collectd.org at v0.5.0: checksum mismatch downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= SECURITY ERROR This download does NOT match an earlier download recorded in go.sum. The bits may have been replaced on the origin server, or an attacker may have intercepted the download attempt. For more information, see 'go help module-auth'. go-collectd was bumped in telegraf since several releases (since v1.19.0) without any changes regarding the go-collectd hash. Some users reported an issue [3] when using "GOPROXY=direct" and used "GOPROXY=proxy.golang.org" as a workaround. [1] https://github.com/influxdata/telegraf/ [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- package/pkg-golang.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 35bcb1673b..e23778d96a 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV = \ $(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ + GOPROXY=proxy.golang.org \ BR_GOMOD=$$($(2)_GOMOD) # Due to vendoring, it is pretty likely that not all licenses are -- 2.31.1 From romain.naour at smile.fr Sun Jan 9 15:00:12 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 16:00:12 +0100 Subject: [Buildroot] [PATCH 2/2] package/telegraf: new package In-Reply-To: <20220109150012.1907226-1-romain.naour@smile.fr> References: <20220109150012.1907226-1-romain.naour@smile.fr> Message-ID: <20220109150012.1907226-2-romain.naour@smile.fr> Install the telegraf default configuration and the systemd service files provided by the project [1]. [1] https://github.com/influxdata/telegraf/blob/v1.21.2/scripts/deb/post-install.sh Signed-off-by: Romain Naour --- Telegraf also provide an SysVinit script but I didn't tested it. --- DEVELOPERS | 1 + package/Config.in | 1 + package/telegraf/Config.in | 19 +++++++++++++++++++ package/telegraf/telegraf.hash | 3 +++ package/telegraf/telegraf.mk | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 package/telegraf/Config.in create mode 100644 package/telegraf/telegraf.hash create mode 100644 package/telegraf/telegraf.mk diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..ab4d5ba446 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2462,6 +2462,7 @@ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ F: package/supertuxkart/ +F: package/telegraf/ F: package/terminology/ F: package/tk/ F: package/upower/ diff --git a/package/Config.in b/package/Config.in index 2d3ca6a3b6..d77c843465 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ menu "System tools" source "package/systemd-bootchart/Config.in" source "package/sysvinit/Config.in" source "package/tar/Config.in" + source "package/telegraf/Config.in" source "package/thermald/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" diff --git a/package/telegraf/Config.in b/package/telegraf/Config.in new file mode 100644 index 0000000000..c95145f386 --- /dev/null +++ b/package/telegraf/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_TELEGRAF + bool "telegraf" + 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_USE_MMU # logrotate + depends on BR2_USE_WCHAR # logrotate + select BR2_PACKAGE_LOGROTATE # runtime + help + Telegraf is the open source server agent to help you + collect metrics from your stacks, sensors and systems. + + https://www.influxdata.com/time-series-platform/telegraf + +comment "telegraf needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU diff --git a/package/telegraf/telegraf.hash b/package/telegraf/telegraf.hash new file mode 100644 index 0000000000..0547621ea4 --- /dev/null +++ b/package/telegraf/telegraf.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 bdd33f9248872dca282f8649713dedf7fc0eafd8876664031fb37a0350059ab6 v1.21.2.tar.gz +sha256 29d6b3c9c5671e8375a42bf4c5d4e85e05efd314ef363a56bb1728621e9cad5a LICENSE diff --git a/package/telegraf/telegraf.mk b/package/telegraf/telegraf.mk new file mode 100644 index 0000000000..42b19a11e9 --- /dev/null +++ b/package/telegraf/telegraf.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# telegraf +# +################################################################################ + +TELEGRAF_VERSION = 1.21.2 +TELEGRAF_SITE = https://github.com/influxdata/telegraf/archive +TELEGRAF_SOURCE = v$(TELEGRAF_VERSION).tar.gz +TELEGRAF_LICENSE = MIT +TELEGRAF_LICENSE_FILES = LICENSE + +TELEGRAF_LDFLAGS = -X main.version=$(TELEGRAF_VERSION) +TELEGRAF_BUILD_TARGETS = cmd/telegraf + +define TELEGRAF_INSTALL_TARGET_FIXUP + mkdir -p $(TARGET_DIR)/etc/telegraf/telegraf.d + $(INSTALL) -D -m 644 $(@D)/etc/telegraf.conf $(TARGET_DIR)/etc/telegraf.conf + mkdir -p $(TARGET_DIR)/etc/logrotate.d + $(INSTALL) -D -m 644 $(@D)/etc/logrotate.d/telegraf $(TARGET_DIR)/etc/logrotate.d/telegraf + mkdir -p $(TARGET_DIR)/etc/default + touch $(TARGET_DIR)/etc/default/telegraf +endef + +TELEGRAF_POST_INSTALL_TARGET_HOOKS += TELEGRAF_INSTALL_TARGET_FIXUP + +define TELEGRAF_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/scripts/telegraf.service \ + $(TARGET_DIR)/usr/lib/systemd/system/telegraf.service +endef + +$(eval $(golang-package)) -- 2.31.1 From peter at korsgaard.com Sun Jan 9 15:01:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 16:01:18 +0100 Subject: [Buildroot] [git commit] package/atop: bump to version 2.7.1 Message-ID: <20220109145517.EF29B82C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=353483b1e71a5169ca97315dae7d1814740070ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://www.atoptool.nl/downloadatop.php Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/atop/atop.hash | 2 +- package/atop/atop.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index fb2eb1c727..18ba42340c 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 a606705aaca940a6d44d67c886529a75db98fd88140f743eb0aaebb184c38af7 atop-2.7.0.tar.gz +sha256 ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e atop-2.7.1.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index f2a1f1de51..8a0fcda33b 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.7.0 +ATOP_VERSION = 2.7.1 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Jan 9 15:01:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 16:01:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/atop: bump to version 2.7.1 In-Reply-To: <20220109141050.665536-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 15:10:50 +0100") References: <20220109141050.665536-1-fontaine.fabrice@gmail.com> Message-ID: <878rvpar79.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://www.atoptool.nl/downloadatop.php > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Jan 9 15:04:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 16:04:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: add mysql_config to MARIADB_CONFIG_SCRIPTS Message-ID: <20220109150422.792641-1-fontaine.fabrice@gmail.com> Add mysql_config to MARIADB_CONFIG_SCRIPTS, this won't fix any build failure at the moment but will avoid possible issues in the future Signed-off-by: Fabrice Fontaine --- package/mariadb/mariadb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d08b768a2e..db967ca3ed 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -14,6 +14,7 @@ MARIADB_CPE_ID_VENDOR = mariadb MARIADB_SELINUX_MODULES = mysql MARIADB_INSTALL_STAGING = YES MARIADB_PROVIDES = mysql +MARIADB_CONFIG_SCRIPTS = mysql_config MARIADB_DEPENDENCIES = \ host-mariadb \ -- 2.34.1 From yann.morin.1998 at free.fr Sun Jan 9 15:03:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:03:38 +0100 Subject: [Buildroot] [git commit] package/busybox: explicitly state binutils paths Message-ID: <20220109150224.C229D82DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c669bd5115d748a76018490af0c798df2747657d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We are not passing TARGET_CONFIGURE_OPTS when building busybox; instead we are passing variables explicitly. As thus, it is missing the ar, nm, and ranlib that we are using. We add explicit AR, NM, and RANLIB, so that the ones we want to use (i.e. the gcc-wrapped ones) are actually used. Signed-off-by: Norbert Lange [yann.morin.1998 at free.fr: - reword the commit log to explain why we need that ] Signed-off-by: Yann E. MORIN --- package/busybox/busybox.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 3523cf21d0..60ebc4985f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -91,6 +91,9 @@ BUSYBOX_MAKE_ENV += \ endif BUSYBOX_MAKE_OPTS = \ + AR="$(TARGET_AR)" \ + NM="$(TARGET_NM)" \ + RANLIB="$(TARGET_RANLIB)" \ CC="$(TARGET_CC)" \ ARCH=$(KERNEL_ARCH) \ PREFIX="$(TARGET_DIR)" \ From yann.morin.1998 at free.fr Sun Jan 9 15:03:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:03:23 +0100 Subject: [Buildroot] [git commit] package/Makefile.in: use gcc wrappers for binutils tools Message-ID: <20220109150224.B7C1982C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c08fa13d363b7e3faa2f065f6261af6fa52445f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will use gcc-ar, gcc-nm and gcc-ranlib instead of the normal binutils tools. The difference is that with the wrappers, gcc plugins will be automatically picked up. gcc 4.7 introduced these wrappers, to detect the prefix and keep gcc specifics out of Makefile.in, a new variable BR2_TOOLCHAIN_BUTILS_PREFIX will be used to carry the prefix on supported versions. Note that binutils added some automatic loading with the 'bfd-plugins' directory (somewhere around 2.28), but the first implementation had issues, and generally depends on correctly setup symlinks (often broken, may point to some other gcc's library). The wrappers always work painless. The original motivation (now ~2 years in use) was to add "-flto -ffat-lto-objects" to both BR2_TARGET_OPTIMIZATION and BR2_TARGET_LDFLAGS, and have target binaries lto optimized. Not all packages will compile with this option, further work could white/blacklist packages (adding -fno-lto to the options). Signed-off-by: Norbert Lange [yann.morin.1998 at free.fr: don't introduce a Config.in blind option] Signed-off-by: Yann E. MORIN --- package/Makefile.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 0ca2a5844e..508ea7c366 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -210,16 +210,23 @@ else TARGET_CROSS = $(HOST_DIR)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- endif +# gcc-4.7 and later ships with wrappers that will automatically pass +# arguments to the binutils tools. Those are paths to necessary linker +# plugins. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +TARGET_GCC_WRAPPERS_PREFIX = gcc- +endif + # Define TARGET_xx variables for all common binutils/gcc -TARGET_AR = $(TARGET_CROSS)ar +TARGET_AR = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)ar TARGET_AS = $(TARGET_CROSS)as TARGET_CC = $(TARGET_CROSS)gcc TARGET_CPP = $(TARGET_CROSS)cpp TARGET_CXX = $(TARGET_CROSS)g++ TARGET_FC = $(TARGET_CROSS)gfortran TARGET_LD = $(TARGET_CROSS)ld -TARGET_NM = $(TARGET_CROSS)nm -TARGET_RANLIB = $(TARGET_CROSS)ranlib +TARGET_NM = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)nm +TARGET_RANLIB = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)ranlib TARGET_READELF = $(TARGET_CROSS)readelf TARGET_OBJCOPY = $(TARGET_CROSS)objcopy TARGET_OBJDUMP = $(TARGET_CROSS)objdump From yann.morin.1998 at free.fr Sun Jan 9 15:08:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:08:40 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/Makefile.in: use gcc wrappers for binutils tools In-Reply-To: <20201017221743.160029-1-nolange79@gmail.com> References: <20201017221743.160029-1-nolange79@gmail.com> Message-ID: <20220109150840.GA1477939@scaer> Norbert, All, On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > This will use gcc-ar, gcc-nm and gcc-ranlib instead of the > normal binutils tools. The difference is that with the > wrappers, gcc plugins will be automatically picked up. > > gcc 4.7 introduced these wrappers, to detect the prefix and > keep gcc specifics out of Makefile.in, a new variable > BR2_TOOLCHAIN_BUTILS_PREFIX will be used to carry the > prefix on supported versions. > > Note that binutils added some automatic loading with the > 'bfd-plugins' directory (somewhere around 2.28), but > the first implementation had issues, and generally depends on > correctly setup symlinks (often broken, may point to some > other gcc's library). The wrappers always work painless. > > The original motivation (now ~2 years in use) was to add > "-flto -ffat-lto-objects" to both BR2_TARGET_OPTIMIZATION and > BR2_TARGET_LDFLAGS, and have target binaries lto optimized. > > Not all packages will compile with this option, further work > could white/blacklist packages (adding -fno-lto to the > options). > > Signed-off-by: Norbert Lange > --- > v1->v2: > * support older gcc versions missing those wrappers > --- > package/Makefile.in | 6 +++--- > toolchain/Config.in | 7 +++++++ > 2 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/package/Makefile.in b/package/Makefile.in > index 51f5cbce4f..665edec539 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -198,15 +198,15 @@ TARGET_CROSS = $(HOST_DIR)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- > endif > > # Define TARGET_xx variables for all common binutils/gcc > -TARGET_AR = $(TARGET_CROSS)ar > +TARGET_AR = $(TARGET_CROSS)$(call qstrip,$(BR2_TOOLCHAIN_BUTILS_PREFIX))ar > TARGET_AS = $(TARGET_CROSS)as > TARGET_CC = $(TARGET_CROSS)gcc > TARGET_CPP = $(TARGET_CROSS)cpp > TARGET_CXX = $(TARGET_CROSS)g++ > TARGET_FC = $(TARGET_CROSS)gfortran > TARGET_LD = $(TARGET_CROSS)ld > -TARGET_NM = $(TARGET_CROSS)nm > -TARGET_RANLIB = $(TARGET_CROSS)ranlib > +TARGET_NM = $(TARGET_CROSS)$(call qstrip,$(BR2_TOOLCHAIN_BUTILS_PREFIX))nm > +TARGET_RANLIB = $(TARGET_CROSS)$(call qstrip,$(BR2_TOOLCHAIN_BUTILS_PREFIX))ranlib > TARGET_READELF = $(TARGET_CROSS)readelf > TARGET_OBJCOPY = $(TARGET_CROSS)objcopy > TARGET_OBJDUMP = $(TARGET_CROSS)objdump > diff --git a/toolchain/Config.in b/toolchain/Config.in > index db2ab0f059..7a2becc09a 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -732,4 +732,11 @@ config BR2_TOOLCHAIN_HAS_LIBQUADMATH > bool > default y if BR2_i386 || BR2_x86_64 > > +# gcc ships with wrappers that will automatically pass arguments > +# to the binutils tools. > +# So far, those are paths to necessary linker plugins > +config BR2_TOOLCHAIN_BUTILS_PREFIX > + string > + default "gcc-" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 There was no need for a Kconfig option, so I moved that to the Makefile side. Applied to master, thanks. Regards, Yann E. MORIN. > endmenu > -- > 2.28.0 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 15:09:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:09:14 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/busybox: explicitly state binutil paths In-Reply-To: <20201017221743.160029-3-nolange79@gmail.com> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-3-nolange79@gmail.com> Message-ID: <20220109150914.GB1477939@scaer> Norbet, All, On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > Pass paths to ar, nm, ranlib binaries. This allows linker-plugins > to be used. I have expanded/reworded the commit log to explain why this is needed specifically for busybox. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Norbert Lange > --- > package/busybox/busybox.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index 01f7331221..221b8adf59 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -94,6 +94,9 @@ BUSYBOX_MAKE_ENV += \ > endif > > BUSYBOX_MAKE_OPTS = \ > + AR="$(TARGET_AR)" \ > + NM="$(TARGET_NM)" \ > + RANLIB="$(TARGET_RANLIB)" \ > CC="$(TARGET_CC)" \ > ARCH=$(KERNEL_ARCH) \ > PREFIX="$(TARGET_DIR)" \ > -- > 2.28.0 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sun Jan 9 15:14:13 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 16:14:13 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org Message-ID: <20220109151414.1908259-1-romain.naour@smile.fr> While packaging telegraf [1] the download step failed due to a checksum mismatch: go: downloading collectd.org v0.5.0 get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 verifying collectd.org at v0.5.0: checksum mismatch downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= SECURITY ERROR This download does NOT match an earlier download recorded in go.sum. The bits may have been replaced on the origin server, or an attacker may have intercepted the download attempt. For more information, see 'go help module-auth'. go-collectd was bumped in telegraf since several releases (since v1.19.0) without any changes regarding the go-collectd hash. Some users reported an issue [3] when using "GOPROXY=direct" and used "GOPROXY=proxy.golang.org" as a workaround. [1] https://github.com/influxdata/telegraf/ [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- package/pkg-golang.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 35bcb1673b..e23778d96a 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV = \ $(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ + GOPROXY=proxy.golang.org \ BR_GOMOD=$$($(2)_GOMOD) # Due to vendoring, it is pretty likely that not all licenses are -- 2.31.1 From romain.naour at smile.fr Sun Jan 9 15:14:14 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 16:14:14 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/telegraf: new package In-Reply-To: <20220109151414.1908259-1-romain.naour@smile.fr> References: <20220109151414.1908259-1-romain.naour@smile.fr> Message-ID: <20220109151414.1908259-2-romain.naour@smile.fr> Install the telegraf default configuration and the systemd service files provided by the project [1]. [1] https://github.com/influxdata/telegraf/blob/v1.21.2/scripts/deb/post-install.sh Signed-off-by: Romain Naour --- Telegraf also provide an SysVinit script but I didn't tested it. v2: re-add TELEGRAF_USERS removed while cleaning the package. --- DEVELOPERS | 1 + package/Config.in | 1 + package/telegraf/Config.in | 19 +++++++++++++++++ package/telegraf/telegraf.hash | 3 +++ package/telegraf/telegraf.mk | 37 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) create mode 100644 package/telegraf/Config.in create mode 100644 package/telegraf/telegraf.hash create mode 100644 package/telegraf/telegraf.mk diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..ab4d5ba446 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2462,6 +2462,7 @@ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ F: package/supertuxkart/ +F: package/telegraf/ F: package/terminology/ F: package/tk/ F: package/upower/ diff --git a/package/Config.in b/package/Config.in index 2d3ca6a3b6..d77c843465 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ menu "System tools" source "package/systemd-bootchart/Config.in" source "package/sysvinit/Config.in" source "package/tar/Config.in" + source "package/telegraf/Config.in" source "package/thermald/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" diff --git a/package/telegraf/Config.in b/package/telegraf/Config.in new file mode 100644 index 0000000000..c95145f386 --- /dev/null +++ b/package/telegraf/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_TELEGRAF + bool "telegraf" + 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_USE_MMU # logrotate + depends on BR2_USE_WCHAR # logrotate + select BR2_PACKAGE_LOGROTATE # runtime + help + Telegraf is the open source server agent to help you + collect metrics from your stacks, sensors and systems. + + https://www.influxdata.com/time-series-platform/telegraf + +comment "telegraf needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU diff --git a/package/telegraf/telegraf.hash b/package/telegraf/telegraf.hash new file mode 100644 index 0000000000..0547621ea4 --- /dev/null +++ b/package/telegraf/telegraf.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 bdd33f9248872dca282f8649713dedf7fc0eafd8876664031fb37a0350059ab6 v1.21.2.tar.gz +sha256 29d6b3c9c5671e8375a42bf4c5d4e85e05efd314ef363a56bb1728621e9cad5a LICENSE diff --git a/package/telegraf/telegraf.mk b/package/telegraf/telegraf.mk new file mode 100644 index 0000000000..90156e4ca7 --- /dev/null +++ b/package/telegraf/telegraf.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# telegraf +# +################################################################################ + +TELEGRAF_VERSION = 1.21.2 +TELEGRAF_SITE = https://github.com/influxdata/telegraf/archive +TELEGRAF_SOURCE = v$(TELEGRAF_VERSION).tar.gz +TELEGRAF_LICENSE = MIT +TELEGRAF_LICENSE_FILES = LICENSE + +TELEGRAF_LDFLAGS = -X main.version=$(TELEGRAF_VERSION) +TELEGRAF_BUILD_TARGETS = cmd/telegraf + +define TELEGRAF_INSTALL_TARGET_FIXUP + mkdir -p $(TARGET_DIR)/etc/telegraf/telegraf.d + $(INSTALL) -D -m 644 $(@D)/etc/telegraf.conf $(TARGET_DIR)/etc/telegraf.conf + mkdir -p $(TARGET_DIR)/etc/logrotate.d + $(INSTALL) -D -m 644 $(@D)/etc/logrotate.d/telegraf $(TARGET_DIR)/etc/logrotate.d/telegraf + mkdir -p $(TARGET_DIR)/etc/default + touch $(TARGET_DIR)/etc/default/telegraf +endef + +TELEGRAF_POST_INSTALL_TARGET_HOOKS += TELEGRAF_INSTALL_TARGET_FIXUP + +define TELEGRAF_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/scripts/telegraf.service \ + $(TARGET_DIR)/usr/lib/systemd/system/telegraf.service +endef + +# telegraf.service provided by telegraf use "telegraf" user to start the service. +define TELEGRAF_USERS + telegraf -1 telegraf -1 * /etc/telegraf - - Telegraf user +endef + +$(eval $(golang-package)) -- 2.31.1 From yann.morin.1998 at free.fr Sun Jan 9 15:16:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:16:53 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/gcc: use binutils wrappers for target libs In-Reply-To: <20201017221743.160029-2-nolange79@gmail.com> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-2-nolange79@gmail.com> Message-ID: <20220109151653.GC1477939@scaer> Nrobert, All, On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > This will use gcc-ar, gcc-nm and gcc-ranlib instead of the > normal binutils tools. The difference is that with the > wrappers, gcc plugins will be automatically picked up, > which might be necessary with some flags. > > Signed-off-by: Norbert Lange > --- > v1->v2: > * Only set those wrappers if gc 4.7 or newer > --- > package/gcc/gcc.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > index 114c2887a0..a24ffe3ee2 100644 > --- a/package/gcc/gcc.mk > +++ b/package/gcc/gcc.mk > @@ -99,6 +99,9 @@ GCC_COMMON_TARGET_CFLAGS += -Wno-error > endif > > # Propagate options used for target software building to GCC target libs > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) > +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib So we were a bit skeptical about this one. First, we believe that only the final gcc should be using those. Indeed, we do not need much of the initial gcc, except libgcc.a, which anyway gets overwitten by the final gcc, so we do not care that the libgcc.a is built with LTO (and thus the gcc wrappers). Second, gcc initial is only used to build glibc, and as your patch 4 states, glibc must not be built with LTO, we we also do not care that the initial gcc uses its wrappers to build libgcc. Third, shouldn't we be using the tupple-prefixed wrappers? Or does it just happens that gcc will internally add its build directory to PATH so that it can find the un-prefixed just-built ones? For that last point, I added gcc-ar, gcc-nm, and gcc-ranlib in my PATH, that are just simple wrapper scripts that trace their being called, and then call to the actual gcca-r et al.: #!/bin/sh me="${0}" my_name="${0##*/}" found=false for i in $(which -a "${my_name}"); do if [ "${i}" -ef "${me}" ]; then found=true elif ${found}; then me="${i}" fi done if ! ${found}; then exit 42 fi printf "YEM: wrapped %s\n" "${me}" exec "${me}" "${@}" Turns out that the 'YEM: wrapped' string occurs nowhere in the build directory (so it does not end up in config.log or whatever), and it does not even appear on the stdout/stderr either. So I am wondering how we can exercise these... Any hint? Regards, Yann E. MORIN. > +endif > HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" > HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" > > -- > 2.28.0 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From herve.codina at bootlin.com Sun Jan 9 15:17:49 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Sun, 9 Jan 2022 16:17:49 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/alchemy: new host package In-Reply-To: <20220101155022.GD2777@scaer> References: <20211112131258.2671293-1-herve.codina@bootlin.com> <20211112131258.2671293-2-herve.codina@bootlin.com> <20220101155022.GD2777@scaer> Message-ID: <20220109161749.758edd3c@bootlin.com> Hi Yann, On Sat, 1 Jan 2022 16:50:22 +0100 "Yann E. MORIN" wrote: > Herv?, All, > > On 2021-11-12 14:12 +0100, Herve Codina spake thusly: > > Alchemy is a build system developed by Parrot. > > > > It is a new build system based on the one used in Android. > > A central makefile instance scans a workspace to find user > > makefiles, includes them and register modules to be built. > > > > https://github.com/Parrot-Developers/alchemy > > > > Signed-off-by: Herve Codina > > I was about to push this, with a few changes, but I have some questions > about the packages, so here's the patch of the changes I did: > > [yann.morin.1998 at free.fr: > - use ALCHEMY_HOME everywhere rather than repeating the location in > the install macro > - don't remove install dir before installing > - use a template for atom.mk, not in-line in alchemy.mk > ] > > diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk > index 63d5a941c5..f802c62425 100644 > --- a/package/alchemy/alchemy.mk > +++ b/package/alchemy/alchemy.mk > @@ -10,19 +10,19 @@ ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) > ALCHEMY_LICENSE_FILES = COPYING README > HOST_ALCHEMY_DEPENDENCIES = host-python3 > > +ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy > ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk > > define HOST_ALCHEMY_INSTALL_CMDS > - rm -rf $(HOST_DIR)/opt/alchemy > - mkdir -p $(HOST_DIR)/opt/alchemy > - cp -rf $(@D)/* $(HOST_DIR)/opt/alchemy/ > + mkdir -p $(ALCHEMY_HOME) > + cp -rf $(@D)/* $(ALCHEMY_HOME) > + cp $(ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOM E)/atom.mk.in > endef > > $(eval $(host-generic-package)) > > # Variables used by other packages > > -ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy > ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake > > # TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture. > @@ -59,14 +59,11 @@ endif > # $2: Alchemy module name > # $3: Alchemy module file name > define ALCHEMY_INSTALL_LIB_SDK_FILE > - mkdir -p $(ALCHEMY_SDK_BASEDIR)/$(strip $(1)) > - ( \ > - echo 'LOCAL_PATH := $$(call my-dir)'; \ > - echo 'include $$(CLEAR_VARS)'; \ > - echo 'LOCAL_MODULE := $(strip $(2))'; \ > - echo 'LOCAL_SDK := $(STAGING_DIR)'; \ > - echo 'LOCAL_DESTDIR := usr/lib'; \ > - echo 'LOCAL_MODULE_FILENAME := $(strip $(3))'; \ > - echo 'include $$(BUILD_LIBRARY)'; \ > - ) > $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk > + $(INSTALL) -m 0644 -D \ > + $(ALCHEMY_HOME)/atom.mk.in \ > + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk > + $(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \ > + -e 's#@MODULE@#$(strip $(2))#' \ > + -e 's#@MODULE_FILENAME@#$(strip $(3))#' \ > + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk > endef > diff --git a/package/alchemy/atom.mk.in b/package/alchemy/atom.mk.in > new file mode 100644 > index 0000000000..30eb6d5e23 > --- /dev/null > +++ b/package/alchemy/atom.mk.in > @@ -0,0 +1,7 @@ > +LOCAL_PATH := $(call my-dir) > +include $(CLEAR_VARS) > +LOCAL_MODULE := @MODULE@ > +LOCAL_SDK := @STAGING_DIR@ > +LOCAL_DESTDIR := usr/lib > +LOCAL_MODULE_FILENAME := @MODULE_FILENAME@ > +include $(BUILD_LIBRARY) > I take these modifications with a few changes. They will be part of the v3 series. Thanks, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Sun Jan 9 15:35:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 16:35:50 +0100 Subject: [Buildroot] [git commit] package/hiawatha: disable system mbedtls Message-ID: <20220109153345.8414082D9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e36e8f2081a66f477dd038793082045876d65ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master hiawatha needs mbedtls3 since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e: /home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory 39 | #include "mbedtls/psa_util.h" | ^~~~~~~~~~~~~~~~~~~~ As mbedtls 3.x is not backward compatible with mbedtls 2.x, disable system mbedtls to let hiawatha uses its own copy (which will be installed in $(TARGET_DIR)/usr/lib/hiawatha) Fixes: - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/hiawatha/Config.in | 1 - package/hiawatha/hiawatha.mk | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 8f1908f6f4..4b1a3ca86c 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -32,6 +32,5 @@ if BR2_PACKAGE_HIAWATHA config BR2_PACKAGE_HIAWATHA_SSL bool "hiawatha TLS support" - select BR2_PACKAGE_MBEDTLS endif diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 5618e6900d..017592de1e 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -20,8 +20,11 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON -HIAWATHA_DEPENDENCIES += mbedtls +# Disable system mbedtls as hiawatha needs mbedtls 3.x +HIAWATHA_CONF_OPTS += \ + -DENABLE_TLS=ON \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif From peter at korsgaard.com Sun Jan 9 15:40:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 16:40:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/hiawatha: disable system mbedtls In-Reply-To: <20220109133939.496946-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 14:39:39 +0100") References: <20220109133939.496946-1-fontaine.fabrice@gmail.com> Message-ID: <874k6cc3z6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > hiawatha needs mbedtls3 since bump to version 11.1 in commit > 24e4c888c3d36e3943206ea55894b84344cc8b2e: > /home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory > 39 | #include "mbedtls/psa_util.h" > | ^~~~~~~~~~~~~~~~~~~~ > As mbedtls 3.x is not backward compatible with mbedtls 2.x, disable > system mbedtls to let hiawatha uses its own copy (which will be > installed in $(TARGET_DIR)/usr/lib/hiawatha) > Fixes: > - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sun Jan 9 15:46:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 16:46:20 +0100 Subject: [Buildroot] [git commit] package/mesa3d: select vc4 driver for gallium v3d Message-ID: <20220109154018.8A02A82BA1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcf114234b00a07d45de63f7321fd47a66ed4c43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Although the Gallium V3D driver for RPi4 can be built independently, in practice the accelaration doesn't work unless the VC4 driver is also enabled. Select VC4 automatically when V3D is selected. Signed-off-by: Howard Mitchell Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7c3a1beff3..c01f12529a 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -262,7 +262,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_LIBDRM_VC4 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 # runtime select BR2_PACKAGE_MESA3D_OPENGL_EGL help Driver for Broadcom VC6 (rpi4) GPUs (needs vc4). From arnout at mind.be Sun Jan 9 15:46:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 16:46:20 +0100 Subject: [Buildroot] [git commit] package/mesa3d: always enable glx-direct if glx is enabled Message-ID: <20220109154018.94FCC82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a51177af14a2ddaa6431bb7fc618fe138b59b72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Many applications that use GLX want to combine it with DRI3 to bypass the X server and send GL commands directly to the graphics driver. This is only available in mesa3d if glx-direct=true. Up to now, we only enabled glx-direct when a DRI driver was enabled. Historically, this is either because only DRI drivers had DRI3, or because we didn't know better at the time. However, glx-direct is not related to DRI drivers at all. Setting it for a DRI driver when there is no GLX is effectively a NOP. Conversely, we also want to set it for Gallium drivers when GLX is enabled, otherwise GLX-direct applications don't work. Note that glx-direct is only functional if glx=dri. If glx=xlib or glx=gallium-xlib, GLX always goes through the X server so direct is not possible (as far as we understand). Set glx-direct=true unconditionally when GLX is selected. Remove it from DRI drivers. Reported-by: Howard Mitchell Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/mesa3d.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 28ff0669e0..cd3a33a38e 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -73,7 +73,10 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. -MESA3D_CONF_OPTS += -Dglx=dri +# Always enable glx-direct; without it, amy GLX applications don't work. +MESA3D_CONF_OPTS += \ + -Dglx=dri \ + -Dglx-direct=true ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) MESA3D_CONF_OPTS += -Dgallium-xa=enabled else @@ -136,7 +139,6 @@ MESA3D_CONF_OPTS += \ else MESA3D_CONF_OPTS += \ -Dshared-glapi=enabled \ - -Dglx-direct=true \ -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif From arnout at mind.be Sun Jan 9 15:47:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 16:47:42 +0100 Subject: [Buildroot] [PATCH 1/2] package/mesa3d: select vc4 and kmsro driver for gallium v3d In-Reply-To: <20200306092504.30340-1-hm@hmbedded.co.uk> References: <20200306092504.30340-1-hm@hmbedded.co.uk> Message-ID: <44832a2e-18c5-568d-9085-73efce59b1fc@mind.be> On 06/03/2020 10:25, Howard Mitchell wrote: > Currently, when building for rpi2/3 it is only necessary to to select > vc4 to get acceleration working. However, when building for rpi4 v3d, > vc4 and kmsro have to be selected. Therefore this commit forces the > selection of vc4 and kmsro when v3d is selected. > > Signed-off-by: Howard Mitchell (Finally) applied to master, thanks. I had to fix it up a little since the KMSRO option was removed. Regards, Arnout > --- > package/mesa3d/Config.in | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 13e516e452..3950170533 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -257,12 +257,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D > bool "Gallium v3d driver" > depends on BR2_arm || BR2_aarch64 > - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO > - select BR2_PACKAGE_LIBDRM_VC4 > - select BR2_PACKAGE_MESA3D_OPENGL_EGL > + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 > + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO > help > - Driver for Broadcom VC6 (rpi4) GPUs (needs kmsro and vc4). > + Driver for Broadcom VC6 (rpi4) GPUs. > > It requires a kernel 4.18+ with DRM V3D support enabled: > > From peter at korsgaard.com Sun Jan 9 15:48:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 16:48:54 +0100 Subject: [Buildroot] [git commit] package/gvfs: bump to version 1.48.1 Message-ID: <20220109154316.6A69582AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2e1a39a203c5476fb464d8ec164a9c6b0fc4aa0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (not needed since https://gitlab.gnome.org/GNOME/gvfs/-/commit/eee4bb846038e4440ffc8a591869974639c72bb0) https://gitlab.gnome.org/GNOME/gvfs/-/blob/1.48.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-meson.build-fix-linking-with-libmetadata.patch | 78 ---------------------- package/gvfs/gvfs.hash | 4 +- package/gvfs/gvfs.mk | 2 +- 3 files changed, 3 insertions(+), 81 deletions(-) diff --git a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch b/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch deleted file mode 100644 index 3ee4a28e94..0000000000 --- a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 731256d7517f0d9cf0b999bb22f864080d5e8690 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 18 Jul 2020 10:00:50 +0200 -Subject: [PATCH] meson.build: fix linking with libmetadata - -libmetadata is built as a static library and depends on libgvfscommon so -change the dependencies order to put libgvfscommon_dep after -libmetadata_dep or gvfsd-metadata will fail to link on: - -FAILED: metadata/gvfsd-metadata -/home/naourr/work/instance-3/output-1/host/bin/arm-none-linux-gnueabi-gcc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata at exe/meta-daemon.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgio-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgobject-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/common -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/metadata -metadata/libmetadata.a(metatree.c.o): In function `safe_open': -metatree.c:(.text+0x9c8): undefined reference to `gvfs_randomize_string' -collect2: error: ld returned 1 exit status - -Apply this change in the whole source code and not only for -gvfsd-metadata to avoid any other build failures. - -Fixes: - - http://autobuild.buildroot.org/results//fa892c41b6b9285839a0164b000e37fb04dcc194 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/92] ---- - client/meson.build | 2 +- - metadata/meson.build | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/client/meson.build b/client/meson.build -index 8f57d0d3..1d251481 100644 ---- a/client/meson.build -+++ b/client/meson.build -@@ -33,8 +33,8 @@ sources = uri_parser_sources + uri_utils + files( - - deps = [ - gio_unix_dep, -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ] - - cflags = [ -diff --git a/metadata/meson.build b/metadata/meson.build -index 4e120d18..5699e6f2 100644 ---- a/metadata/meson.build -+++ b/metadata/meson.build -@@ -72,8 +72,8 @@ libmetadata_dep = declare_dependency( - ) - - deps = [ -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ] - - if enable_gudev -@@ -105,8 +105,8 @@ if enable_devel_utils - app + '.c', - include_directories: top_inc, - dependencies: [ -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ], - c_args: cflags, - ) -@@ -119,6 +119,7 @@ if enable_devel_utils - include_directories: top_inc, - dependencies: [ - libmetadata_dep, -+ libgvfscommon_dep, - libxml_dep, - ], - c_args: cflags, --- -2.27.0 - diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 2ee945e710..f4a5364f1f 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.44/gvfs-1.44.1.sha256sum -sha256 50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46 gvfs-1.44.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.48/gvfs-1.48.1.sha256sum +sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz # Hash for license file sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index fc77e8e1aa..4174592455 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.44 +GVFS_VERSION_MAJOR = 1.48 GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) From peter at korsgaard.com Sun Jan 9 15:49:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 16:49:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/gvfs: bump to version 1.48.1 In-Reply-To: <20220109140301.663692-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 15:03:01 +0100") References: <20220109140301.663692-1-fontaine.fabrice@gmail.com> Message-ID: <87zgo4aoz7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (not needed since > https://gitlab.gnome.org/GNOME/gvfs/-/commit/eee4bb846038e4440ffc8a591869974639c72bb0) > https://gitlab.gnome.org/GNOME/gvfs/-/blob/1.48.1/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sun Jan 9 15:55:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 16:55:31 +0100 Subject: [Buildroot] [PATCH 2/2] package/mesa3d: get glxgears working for v3d/vc4 minimal builds In-Reply-To: <20200306092504.30340-2-hm@hmbedded.co.uk> References: <20200306092504.30340-1-hm@hmbedded.co.uk> <20200306092504.30340-2-hm@hmbedded.co.uk> Message-ID: On 06/03/2020 10:25, Howard Mitchell wrote: > Currently a minimal build for rpi2/3/4 (i.e. only v3d and/or vc4 > selected, no dri drivers selected) results in working X11 except that > glxgears shows a blank window. This commit effectively results in the > following conf options being added: -Dglx-direct=true -Ddri3=true > > Signed-off-by: Howard Mitchell Instead of this patch, I applied [1]. Based on Howard's observation, the key is in fact the -Dglx-direct=true. I did a bit of investigation and I concluded that we can always enable that if GLX is enabled. Bernd, Peter, could you shout if that doesn't work for you? Regards, Arnout [1] https://git.buildroot.org/buildroot/commit/?id=6a51177af14a2ddaa6431bb7fc618fe138b59b72 > --- > package/mesa3d/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 3950170533..59b8f60773 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -274,6 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 > select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO > select BR2_PACKAGE_LIBDRM_VC4 > select BR2_PACKAGE_MESA3D_OPENGL_EGL > + select BR2_PACKAGE_MESA3D_DRI_DRIVER > help > Driver for Broadcom VC4 (rpi2/3) GPUs. > It requires a vanilla 4.5+ kernel with drm vc4 (open) support. > From peter at korsgaard.com Sun Jan 9 16:26:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 17:26:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: force host-python3 In-Reply-To: <20211222140737.1179968-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 22 Dec 2021 15:07:37 +0100") References: <20211222140737.1179968-1-fontaine.fabrice@gmail.com> Message-ID: <87sftwan9z.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Build of nodejs fails if python 3.10 is installed on host. > As suggested by Arnout in > https://bugs.buildroot.org/show_bug.cgi?id=14451, use the same > workaround than in qt5webkit to force host-python3 (which is in version > 3.9) > It should be noted that python 3.10 support has been added in version > 14.18.2: https://github.com/nodejs/node/releases/tag/v14.18.2 > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14451 > Signed-off-by: Fabrice Fontaine 14.18.2 has in the mean time been applied, but the build should indeed use our host-python3 - So committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 16:24:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 17:24:08 +0100 Subject: [Buildroot] [git commit] package/nodejs: force host-python3 Message-ID: <20220109162027.CAF9882DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ad7eb6c61d281912a8c692f0b69d46726394b10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Build of nodejs fails if python 3.10 is installed on host. As suggested by Arnout in https://bugs.buildroot.org/show_bug.cgi?id=14451, use the same workaround than in qt5webkit to force host-python3 (which is in version 3.9) It should be noted that python 3.10 support has been added in version 14.18.2: https://github.com/nodejs/node/releases/tag/v14.18.2 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14451 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.mk | 54 ++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 44bf786dfd..7d5c93eb93 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -27,6 +27,30 @@ NODEJS_CONF_OPTS = \ --cross-compiling \ --dest-os=linux +HOST_NODEJS_MAKE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ + LDFLAGS.host="$(HOST_LDFLAGS)" \ + NO_LOAD=cctest.target.mk \ + PATH=$(@D)/bin:$(BR_PATH) + +NODEJS_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + NO_LOAD=cctest.target.mk \ + PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ + LD="$(TARGET_CXX)" + +# nodejs's build system uses python which can be a symlink to an unsupported +# python version (e.g. python 3.10 with nodejs 14.18.1). We work around this by +# forcing host-python3 early in the PATH, via a python->python3 symlink. +define NODEJS_PYTHON3_SYMLINK + mkdir -p $(@D)/bin + ln -sf $(HOST_DIR)/bin/python3 $(@D)/bin/python +endef +HOST_NODEJS_PRE_CONFIGURE_HOOKS += NODEJS_PYTHON3_SYMLINK +NODEJS_PRE_CONFIGURE_HOOKS += NODEJS_PYTHON3_SYMLINK + ifeq ($(BR2_PACKAGE_OPENSSL),y) NODEJS_DEPENDENCIES += openssl NODEJS_CONF_OPTS += --shared-openssl @@ -75,21 +99,13 @@ HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) \ - $(HOST_CONFIGURE_OPTS) \ - CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ - LDFLAGS.host="$(HOST_LDFLAGS)" \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) + $(HOST_NODEJS_MAKE_OPTS) endef define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) install \ - $(HOST_CONFIGURE_OPTS) \ - CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ - LDFLAGS.host="$(HOST_LDFLAGS)" \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) + $(HOST_NODEJS_MAKE_OPTS) $(foreach f,$(NODEJS_HOST_TOOLS), \ $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f) @@ -195,11 +211,7 @@ endef define NODEJS_BUILD_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) \ - LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + $(NODEJS_MAKE_OPTS) endef # @@ -236,22 +248,14 @@ define NODEJS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) install \ DESTDIR=$(STAGING_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) \ - LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + $(NODEJS_MAKE_OPTS) endef define NODEJS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) install \ DESTDIR=$(TARGET_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) \ - LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + $(NODEJS_MAKE_OPTS) $(NODEJS_INSTALL_MODULES) endef From bugzilla at busybox.net Sun Jan 9 16:28:13 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 09 Jan 2022 16:28:13 +0000 Subject: [Buildroot] [Bug 14451] nodejs won't build on Fedora 35 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14451 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Peter Korsgaard --- Fixed by https://git.buildroot.org/buildroot/commit/?id=5ad7eb6c61d281912a8c692f0b69d46726394b10, thanks -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Sun Jan 9 16:31:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:31:55 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: add --disable option Message-ID: <20220109162602.991D282DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b102352b62917b053cae1f5d0591fe6507d81522 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When debugging pkg-stats, it's quite useful to be able to disable some features that are quite long (checking upstream URL, checking latest version, checking CVE). This commit adds a --disable option, which can take a comma-separated list of features to disable, such as: ./support/scripts/pkg-stats --disable url,upstream Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 00ca5647ee..7e20ccc0da 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1099,6 +1099,10 @@ def resolvepath(path): return os.path.abspath(os.path.expanduser(path)) +def list_str(values): + return values.split(',') + + def parse_args(): parser = argparse.ArgumentParser() output = parser.add_argument_group('output', 'Output file(s)') @@ -1115,6 +1119,9 @@ def parse_args(): help='List of packages (comma separated)') parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) + parser.add_argument('--disable', type=list_str, + help='Features to disable, comma-separated (cve, upstream, url)', + default=[]) args = parser.parse_args() if not args.html and not args.json: parser.error('at least one of --html or --json (or both) is required') @@ -1161,13 +1168,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - print("Checking URL status") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_urls(packages)) - print("Getting latest versions ...") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_latest_version(packages)) - if args.nvd_path: + if not "url" in args.disable: + print("Checking URL status") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_urls(packages)) + if not "upstream" in args.disable: + print("Getting latest versions ...") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_latest_version(packages)) + if not "cve" in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From thomas.petazzoni at bootlin.com Sun Jan 9 16:31:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:31:55 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: account for unsure CVEs Message-ID: <20220109162602.909E582A93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a206bbc5fe3453f8763268261c4a7aa6ba2c275d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The .affects() method of the CVE class in support/scripts/cve.py can return 3 values: CVE_AFFECTS, CVE_DOESNT_AFFECT and CVE_UNKNOWN. We of course properly account for CVEs where .affects() return CVE_AFFECTS, but the ones for which CVE_UNKNOWN is returned are currently ignored, and therefore treated as if they did not affect the package. However CVE_UNKNOWN in fact indicates that the v_start/v_end fields of the CPE entry could not be parsed by distutils.version.LooseVersion(). Instead of ignoring such cases, this commit adds support for the concept of "unsure CVEs", which will be listed next to CVEs known to affect the package, so that we are aware of them and can investigate the version issue. Signed-off-by: Gregory CLEMENT Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index a435abff3d..00ca5647ee 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -101,6 +101,7 @@ class Package: self.cpeid = None self.cves = list() self.ignored_cves = list() + self.unsure_cves = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -580,8 +581,11 @@ def check_package_cve_affects(cve, cpe_product_pkgs): if product not in cpe_product_pkgs: continue for pkg in cpe_product_pkgs[product]: - if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS: + cve_status = cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) + if cve_status == cve.CVE_AFFECTS: pkg.cves.append(cve.identifier) + elif cve_status == cve.CVE_UNKNOWN: + pkg.unsure_cves.append(cve.identifier) def check_package_cves(nvd_path, packages): @@ -607,7 +611,7 @@ def check_package_cves(nvd_path, packages): for pkg in packages: if 'cve' not in pkg.status: - if pkg.cves: + if pkg.cves or pkg.unsure_cves: pkg.status['cve'] = ("error", "affected by CVEs") else: pkg.status['cve'] = ("ok", "not affected by CVEs") @@ -662,8 +666,11 @@ def calculate_stats(packages): stats["version-not-uptodate"] += 1 stats["patches"] += pkg.patch_count stats["total-cves"] += len(pkg.cves) + stats["total-unsure-cves"] += len(pkg.unsure_cves) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 + if len(pkg.unsure_cves) != 0: + stats["pkg-unsure-cves"] += 1 if pkg.cpeid: stats["cpe-id"] += 1 else: @@ -921,6 +928,8 @@ def dump_html_pkg(f, pkg): if pkg.is_status_error("cve"): for cve in pkg.cves: f.write(" %s
    \n" % (cve, cve)) + for cve in pkg.unsure_cves: + f.write("     %s (unsure)
    \n" % (cve, cve)) elif pkg.is_status_na("cve"): f.write(" %s" % pkg.status['cve'][1]) else: @@ -1024,6 +1033,10 @@ def dump_html_stats(f, stats): stats["pkg-cves"]) f.write("Total number of CVEs affecting all packages%s\n" % stats["total-cves"]) + f.write("Packages affected by unsure CVEs%s\n" % + stats["pkg-unsure-cves"]) + f.write("Total number of unsure CVEs affecting all packages%s\n" % + stats["total-unsure-cves"]) f.write("Packages with CPE ID%s\n" % stats["cpe-id"]) f.write("Packages without CPE ID%s\n" % From thomas.petazzoni at bootlin.com Sun Jan 9 16:33:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:33:22 +0100 Subject: [Buildroot] [PATCH v5 1/3] support/script/pkg-stats: Manage the CVEs that need to be check In-Reply-To: <20200921101515.132359-2-gregory.clement@bootlin.com> References: <20200921101515.132359-1-gregory.clement@bootlin.com> <20200921101515.132359-2-gregory.clement@bootlin.com> Message-ID: <20220109173322.7be771ad@windsurf> On Mon, 21 Sep 2020 12:15:13 +0200 Gregory CLEMENT wrote: > When looking for if a package is affected, the version comparison can > fail. This means that we don't know if the version of the package used > is affected or not and we need to check manually the version. > > This patch exposes this new information in json and html format. > > Signed-off-by: Gregory CLEMENT > --- > support/scripts/pkg-stats | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) I finally applied this patch, but after renaming the concept from "CVEs to check" to "unsure CVEs", and listing them in the same column as normal CVEs in the HTML rendering, but with a "(unsure)" notice next to them. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 16:33:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:33:49 +0100 Subject: [Buildroot] [PATCH v5 2/3] support/script/cve-checker: Manage the CVEs that need to be check In-Reply-To: <20200921101515.132359-3-gregory.clement@bootlin.com> References: <20200921101515.132359-1-gregory.clement@bootlin.com> <20200921101515.132359-3-gregory.clement@bootlin.com> Message-ID: <20220109173349.62a8d794@windsurf> On Mon, 21 Sep 2020 12:15:14 +0200 Gregory CLEMENT wrote: > When looking for if a package is affected, the version comparison can > fail. This means that we don't know if the version of the package used > is affected or not and we need to check manually the version. > > This patch exposes this new information in json and html format. > > Signed-off-by: Gregory CLEMENT > --- > support/scripts/cve-checker | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) The cve-checker script was removed and merged back into pkg-stats, for which this feature was added by PATCH 1/3 in this series, so I've marked this patch as Rejected. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 16:34:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:34:27 +0100 Subject: [Buildroot] [PATCH v5 3/3] package/pkg-utils/cve.py: Manage case when package version doesn't exist In-Reply-To: <20200921101515.132359-4-gregory.clement@bootlin.com> References: <20200921101515.132359-1-gregory.clement@bootlin.com> <20200921101515.132359-4-gregory.clement@bootlin.com> Message-ID: <20220109173427.07372dae@windsurf> On Mon, 21 Sep 2020 12:15:15 +0200 Gregory CLEMENT wrote: > Until now, when a package didn't report a version, then the CVE > comparison was just skipped. It leads most of the time to declare the > package not affected by the CVE. > > Instead of it, report the CVE_UNKNOWN status in order to be aware that > the CVE related to this package has to be checked. > > Signed-off-by: Gregory CLEMENT Do you remember which packages/cases this was handling? > if not pkg_version: > + unknown_pkg_version = True I've added a print() here, and did a full run of pkg-stats on all packages, and did not get any match. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Sun Jan 9 16:47:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 17:47:05 +0100 Subject: [Buildroot] [git commit] package/libglvnd: new package Message-ID: <20220109164105.40F1D82DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0378e2e5d9ce9d5676975dfbff501360094fdc1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libglvnd is the GL Vendor-Neutral Dispatch library, used to dispatch GL calls across multiple GL implementations at runtime. Full GL support, as usual, requires (parts of) the X11 stack: libX11, libXext, and xorgproto (for glproto). However, with just libX11, it is possible to do EGL on X11. EGL and GLES have no dependencies. Note: x11 and glx are 'features', so need to be 'enabled' or 'disabled' (or 'auto', but we don't care in Buildroot), while egl and gles1/2 are 'booleans', so need to be 'true' or 'false'. When an actual provider for GL, EGL, or GLES is enabled, so must the corresponding flavour be enabled in libglvnd. Conversely, when there is no actual provider, the corresponding support must be disabled in libglvnd. So we make each flavour selectable with hidden options, which actual providers will have to select. The license for libglvnd itself is a custom license by NVidia. It is pretty close to MIT, but it's different (although Debian does classify it as MIT); SPDX has no identifier for that license either. As such, we choose to just identify it as 'libglvnd license', and let users deal that with their legal department. Additionally, libglvnd bundles some code from other projects, so we list them explicitly as well. Signed-off-by: Jakub Skrzypnik [yann.morin.1998 at free.fr: - provide help text - don't force X11 libraries, split them between X11 and full GL - make each flavour selectable - fix make check-package issues - fix and complete licensing information - bump to 1.3.2 - expand commit log ] Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/libglvnd/Config.in | 44 +++++++++++++++++++++++++++++++++++ package/libglvnd/libglvnd.hash | 7 ++++++ package/libglvnd/libglvnd.mk | 53 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..2ad76a80e4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1265,6 +1265,9 @@ F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig +N: Jakub Skrzypnik +F: package/libglvnd/ + N: James Hilliard F: package/apcupsd/ F: package/exfatprogs/ diff --git a/package/Config.in b/package/Config.in index 85193f7802..edae7e4f62 100644 --- a/package/Config.in +++ b/package/Config.in @@ -331,6 +331,7 @@ comment "Graphic libraries" source "package/freerdp/Config.in" source "package/graphicsmagick/Config.in" source "package/imagemagick/Config.in" + source "package/libglvnd/Config.in" source "package/linux-fusion/Config.in" source "package/lite/Config.in" source "package/mesa3d/Config.in" diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in new file mode 100644 index 0000000000..acf6247e94 --- /dev/null +++ b/package/libglvnd/Config.in @@ -0,0 +1,44 @@ +config BR2_PACKAGE_LIBGLVND + bool "libglvnd" + help + The GL Vendor-Neutral Dispatch library + + libglvnd is a vendor-neutral dispatch layer for arbitrating + OpenGL API calls between multiple vendors. It allows multiple + drivers from different vendors to coexist on the same + filesystem, and determines which vendor to dispatch each API + call to at runtime. + + Both GLX and EGL are supported, in any combination with OpenGL + and OpenGL ES. + +if BR2_PACKAGE_LIBGLVND + +# The following symbols should be selected by the libglvnd-aware +# GL/EGL/GLES providers. +config BR2_PACKAGE_LIBGLVND_DISPATCH_GL + bool + depends on BR2_PACKAGE_XORG7 # libx11, libXext, xorgproto + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_XORGPROTO + select BR2_PACKAGE_HAS_LIBGL + +config BR2_PACKAGE_LIBGLVND_DISPATCH_EGL + bool + select BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_LIBGLVND_DISPATCH_GLES + bool + select BR2_PACKAGE_HAS_LIBGLES + +config BR2_PACKAGE_PROVIDES_LIBGL + default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_GL + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_EGL + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_GLES + +endif diff --git a/package/libglvnd/libglvnd.hash b/package/libglvnd/libglvnd.hash new file mode 100644 index 0000000000..15e76ea9e8 --- /dev/null +++ b/package/libglvnd/libglvnd.hash @@ -0,0 +1,7 @@ +# Locally computed +sha256 6332c27f4c792b09a3eb1d7ae18c2d6ff6a0acaf3a746489caf859e659fca2f7 libglvnd-v1.3.2.tar.gz + +# Locally computed hashes for license files +sha256 224534547628a9e5e889d8808385bd38839e6bdb77d89c90ac04dad6891a4f5f README.md +sha256 bebdc0fd27cd37af8406e47af23c113866b7856c3f7349ffcbc672029ec8acf7 src/util/uthash/LICENSE +sha256 f6f207863675ca5a5128fd120b9aef4f4bbab73ffa57e5f771ccffc8e3cc56b7 src/util/cJSON/LICENSE diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk new file mode 100644 index 0000000000..3df609f6eb --- /dev/null +++ b/package/libglvnd/libglvnd.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# libglvnd +# +################################################################################ + +LIBGLVND_VERSION = 1.3.2 +LIBGLVND_SOURCE = libglvnd-v$(LIBGLVND_VERSION).tar.gz +LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$(LIBGLVND_VERSION) + +LIBGLVND_LICENSE = \ + libglvnd license, \ + Apache-2.0 (Khronos headers), \ + MIT (Xorg; mesa; cJSON), \ + BSD-1=Clause (uthash) + +LIBGLVND_LICENSE_FILES = \ + README.md \ + src/util/uthash/LICENSE \ + src/util/cJSON/LICENSE + +LIBGLVND_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +LIBGLVND_DEPENDENCIES += xlib_libX11 +LIBGLVND_CONF_OPTS += -Dx11=enabled +else +LIBGLVND_CONF_OPTS += -Dx11=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GL),y) +LIBGLVND_DEPENDENCIES += xlib_libXext xorgproto +LIBGLVND_CONF_OPTS += -Dglx=enabled +LIBGLVND_PROVIDES += libgl +else +LIBGLVND_CONF_OPTS += -Dglx=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) +LIBGLVND_CONF_OPTS = -Degl=true +LIBGLVND_PROVIDES += libegl +else +LIBGLVND_CONF_OPTS = -Degl=false +endif + +ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) +LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true +LIBGLVND_PROVIDES += libgles +else +LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false +endif + +$(eval $(meson-package)) From arnout at mind.be Sun Jan 9 16:47:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 17:47:05 +0100 Subject: [Buildroot] [git commit] package/mesa3d: make it aware of libglvnd and support it when present Message-ID: <20220109164105.49CF382DF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f8fd984d89e25a2e1a2cc6d25c915ecd39c444b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When libglvnd is enabled, mesa3d must be told so, so as it installs its libraries with the vendor suffix (e.g. libEGL_mesa.so instead of libEGL.so). Additionally, the provider (in Buildroot parlance) is libglvnd, not mesa3d. Signed-off-by: Jakub Skrzypnik [yann.morin.1998 at free.fr: - don't override the _PROVIDES variable, only assign when needed ] Signed-off-by: Yann E. MORIN Tested-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 15 +++++++++------ package/mesa3d/mesa3d.mk | 15 +++++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index c01f12529a..34b0352056 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -423,7 +423,8 @@ comment "gbm support needs a dri driver or a gallium driver w/ EGL support." config BR2_PACKAGE_MESA3D_OPENGL_GLX bool "OpenGL GLX" depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_HAS_LIBGL if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_GL if BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_MESA3D_NEEDS_X11 help Enable GLX graphic acceleration (OpenGL + X11). @@ -433,7 +434,8 @@ comment "OpenGL GLX support needs X11" config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" - select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_HAS_LIBEGL_WAYLAND select BR2_PACKAGE_MESA3D_GBM help @@ -442,7 +444,8 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL config BR2_PACKAGE_MESA3D_OPENGL_ES bool "OpenGL ES" - select BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_HAS_LIBGLES if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_GLES if BR2_PACKAGE_LIBGLVND help Use the Khronos OpenGL ES APIs. This is commonly used on embedded systems and represents a subset of the OpenGL API. @@ -453,13 +456,13 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "mesa3d" if BR2_PACKAGE_MESA3D_GBM config BR2_PACKAGE_PROVIDES_LIBGL - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX && !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBEGL - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBGLES - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES && !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBOPENCL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index cd3a33a38e..e34ed4264f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -167,9 +167,9 @@ MESA3D_CONF_OPTS += -Dopengl=true # we do not need libva support in mesa3d, therefore disable this option MESA3D_CONF_OPTS += -Dgallium-va=disabled -# libGL is only provided for a full xorg stack +# libGL is only provided for a full xorg stack, without libglvnd ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) -MESA3D_PROVIDES += libgl +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgl) else define MESA3D_REMOVE_OPENGL_HEADERS rm -rf $(STAGING_DIR)/usr/include/GL/ @@ -207,7 +207,7 @@ MESA3D_CONF_OPTS += \ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -MESA3D_PROVIDES += libegl +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libegl) MESA3D_CONF_OPTS += \ -Degl=enabled else @@ -216,7 +216,7 @@ MESA3D_CONF_OPTS += \ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) -MESA3D_PROVIDES += libgles +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgles) MESA3D_CONF_OPTS += -Dgles1=enabled -Dgles2=enabled else MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled @@ -271,4 +271,11 @@ ifeq ($(BR2_m68k),y) MESA3D_CFLAGS += -mlong-jump-table-offsets endif +ifeq ($(BR2_PACKAGE_LIBGLVND),y) +MESA3D_DEPENDENCIES += libglvnd +MESA3D_CONF_OPTS += -Dglvnd=true +else +MESA3D_CONF_OPTS += -Dglvnd=false +endif + $(eval $(meson-package)) From ju.o at free.fr Sun Jan 9 16:47:55 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 9 Jan 2022 17:47:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/riscv-isa-sim: new package Message-ID: <20220109164756.1312023-1-ju.o@free.fr> Spike, the RISC-V ISA Simulator, implements a functional model of one or more RISC-V harts. The host package provides an alternative solution to qemu. https://github.com/riscv-software-src/riscv-isa-sim Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/Config.in.host | 1 + ...01-riscv-disable-precompiled-headers.patch | 34 +++++++++++++++++++ package/riscv-isa-sim/Config.in | 18 ++++++++++ package/riscv-isa-sim/Config.in.host | 13 +++++++ package/riscv-isa-sim/riscv-isa-sim.hash | 3 ++ package/riscv-isa-sim/riscv-isa-sim.mk | 13 +++++++ 8 files changed, 84 insertions(+) create mode 100644 package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch create mode 100644 package/riscv-isa-sim/Config.in create mode 100644 package/riscv-isa-sim/Config.in.host create mode 100644 package/riscv-isa-sim/riscv-isa-sim.hash create mode 100644 package/riscv-isa-sim/riscv-isa-sim.mk diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..59a8dba2ab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1588,6 +1588,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ F: package/python-pyalsa/ +F: package/riscv-isa-sim/ N: Julien Viard de Galbert F: package/dieharder/ diff --git a/package/Config.in b/package/Config.in index 85193f7802..b20cf45698 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2126,6 +2126,7 @@ menu "Miscellaneous" source "package/proj/Config.in" source "package/qemu/Config.in" source "package/qpdf/Config.in" + source "package/riscv-isa-sim/Config.in" source "package/rtl_433/Config.in" source "package/shared-mime-info/Config.in" source "package/sunwait/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..22aafb858a 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -77,6 +77,7 @@ menu "Host utilities" source "package/qoriq-rcw/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" + source "package/riscv-isa-sim/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch new file mode 100644 index 0000000000..461f34e3a1 --- /dev/null +++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch @@ -0,0 +1,34 @@ +From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sun, 9 Jan 2022 13:38:48 +0100 +Subject: [PATCH] riscv: disable precompiled headers + +While precompiling header, some toolchains fail with the message: + + /path/to/toolchain/bin/ld: /path/to/sysroot/usr/lib/Scrt1.o: in function `_start': + (.text+0x54): undefined reference to `main' + +The patch totally disable precompiled headers. + +Signed-off-by: Julien Olivain +--- + riscv/riscv.mk.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in +index 2347ce6..4f56eaf 100644 +--- a/riscv/riscv.mk.in ++++ b/riscv/riscv.mk.in +@@ -35,9 +35,6 @@ riscv_hdrs = \ + + riscv_install_hdrs = mmio_plugin.h + +-riscv_precompiled_hdrs = \ +- insn_template.h \ +- + riscv_srcs = \ + processor.cc \ + execute.cc \ +-- +2.34.1 + diff --git a/package/riscv-isa-sim/Config.in b/package/riscv-isa-sim/Config.in new file mode 100644 index 0000000000..1f5c8aad18 --- /dev/null +++ b/package/riscv-isa-sim/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_RISCV_ISA_SIM + bool "riscv-isa-sim" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + help + Spike, the RISC-V ISA Simulator, implements a functional + model of one or more RISC-V harts. + + https://github.com/riscv-software-src/riscv-isa-sim + +comment "riscv-isa-sim needs a toolchain w/ C++11, threads, wchar and dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || \ + BR2_STATIC diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host new file mode 100644 index 0000000000..01a189a075 --- /dev/null +++ b/package/riscv-isa-sim/Config.in.host @@ -0,0 +1,13 @@ +config BR2_PACKAGE_HOST_RISCV_ISA_SIM + bool "host riscv-isa-sim" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + help + Spike, the RISC-V ISA Simulator, implements a functional + model of one or more RISC-V harts. + + The host package provides an alternative solution to qemu. + + https://github.com/riscv-software-src/riscv-isa-sim + +comment "host riscv-isa-sim needs a toolchain w/ C++11" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/riscv-isa-sim/riscv-isa-sim.hash b/package/riscv-isa-sim/riscv-isa-sim.hash new file mode 100644 index 0000000000..d787a03e4c --- /dev/null +++ b/package/riscv-isa-sim/riscv-isa-sim.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9b29c220fed1e867e3bea4b5c565f2629237d525a4d9fe1668699c4406003a1f riscv-isa-sim-1.1.0.tar.gz +sha256 c65e436d18972c9c4bd192494fe4870bd2e158179474975b80a3559f27631632 LICENSE diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk new file mode 100644 index 0000000000..df5d4db9a2 --- /dev/null +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# riscv-isa-sim +# +################################################################################ + +RISCV_ISA_SIM_VERSION = 1.1.0 +RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) +RISCV_ISA_SIM_LICENSE = BSD-3-Clause +RISCV_ISA_SIM_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.34.1 From ju.o at free.fr Sun Jan 9 16:47:56 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 9 Jan 2022 17:47:56 +0100 Subject: [Buildroot] [PATCH 2/2] configs/spike_riscv64: new defconfig In-Reply-To: <20220109164756.1312023-1-ju.o@free.fr> References: <20220109164756.1312023-1-ju.o@free.fr> Message-ID: <20220109164756.1312023-2-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 ++ board/spike/riscv64/readme.txt | 39 +++++++++++++++++++++++++++++++++ board/spike/riscv64/start.sh | 13 +++++++++++ configs/spike_riscv64_defconfig | 12 ++++++++++ 4 files changed, 66 insertions(+) create mode 100644 board/spike/riscv64/readme.txt create mode 100755 board/spike/riscv64/start.sh create mode 100644 configs/spike_riscv64_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 59a8dba2ab..bf495be538 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1578,10 +1578,12 @@ F: package/paho-mqtt-c N: Julien Olivain F: board/qmtech/zynq/ +F: board/spike/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig +F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ diff --git a/board/spike/riscv64/readme.txt b/board/spike/riscv64/readme.txt new file mode 100644 index 0000000000..5ad7df46df --- /dev/null +++ b/board/spike/riscv64/readme.txt @@ -0,0 +1,39 @@ +Linux on Spike RISC-V ISA simulator +=================================== + +This configuration provides a minimal working setup to run a Linux +kernel in the Spike RISC-V ISA simulator. + +The Spike ISA simulator can be an interresting alternative to Qemu, in +some specific cases. For example: simulating new instructions (see [1]), +simulating riscv-openocd/gdb debug sessions (see [2], [3]), or +generating an accurate per-instruction log of execution (see +riscv-isa-sim spike -l option)... + +To run Buildroot Linux in Spike, use the commands: + + make spike_riscv64_defconfig + make + ./board/spike/riscv64/start.sh + +The boot is made with the standard RISC-V OpenSBI boot loader. In +order to keep the simulation simple, the rootfs is passed as an initrd +ramfs. + +Note: at the time of this writing, Spike v1.1.0 and OpenSBI v1.0 does +not support console input emulation for 32bit RISC-V systems. A 32bit +Linux system can boot and reach the login, but it's not possible to +login. See [4]. + + +[1]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new-instruction + +[2]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#debugging-with-gdb + +[3]. +https://github.com/riscv/riscv-openocd + +[4]. +https://github.com/riscv-software-src/opensbi/blob/v1.0/lib/utils/sys/htif.c#L127 diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh new file mode 100755 index 0000000000..75b1412df8 --- /dev/null +++ b/board/spike/riscv64/start.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +SCRIPT_DIR="$(dirname "$0")" +BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" + +# Use Buildroot host spike by default, but allow the caller to +# redefine another spike binary +: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" + +exec "${SPIKE}" \ + --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ + "${@}" \ + "${BR_BASEDIR}"/output/images/fw_payload.elf diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig new file mode 100644 index 0000000000..4cce20b360 --- /dev/null +++ b/configs/spike_riscv64_defconfig @@ -0,0 +1,12 @@ +BR2_riscv=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_TARGET_ROOTFS_CPIO=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y +BR2_PACKAGE_HOST_RISCV_ISA_SIM=y -- 2.34.1 From arnout at mind.be Sun Jan 9 16:50:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 17:50:46 +0100 Subject: [Buildroot] [PATCH 0/2 v4] package/libglvnd: introduce the GL vendor-neutral proxy (branch yem/libglvnd) In-Reply-To: References: Message-ID: <3ed33c49-e94e-9573-450d-9bddd1fb9610@mind.be> On 27/07/2020 10:46, Yann E. MORIN wrote: > Hello All! > > This is a respin from the original series by Jakub, heavily massaged > by me (Yann); thanks Jakub for your initial work! :-) What follows is > Jakub's original cover letter (tweaked to drop the reference to other > patches not include in this respin): > > Here comes support for GLVND which is a GL Vendor-Neutral disaptches, > initially proposed by NVidia, currently done within the Freedestop/ > RedHat project team as libglvnd. > > It's useful not only for NVidia (they were first to adopt it though) > but might be also beneficial for others, for example allowing you to > deliver an image running on multiple machines with different GPUs and > their respective OpenGL providers, which happens quite often on x86_64 > and was the major reason to implement it in Buildroot for me. > > On the other hand, if your board has multiple GPUs it also helps a lot > - for example when you have a "display" unit and "compute/accel" > graphics units from different vendors. Happens on some ARM boards > recently and there are already efforts to integrate it in these GL > stacks. > > The only EXT needed by GL provider is to implement GL_EXT_libglvnd > which is a dummy extension allowing GL lib to "register" to let it > receive GL calls. > > In practive it's very simple, the libglvnd delivers its own set of > "dummy" libraries: > > - libGL.so > - libGLX.so > - libOpenGL.so > - libEGL.so > > and needs the actual providers to be present as they already are but > with names like libGLX_nvidia.so. > > It allows developers to link against vendor-neutral dummy libs and > openGL contexts without thinking about target GPU too much as long as > it supports desired GL/EGL standard. > > Also delivers GL API headers (GL/gl.h, GL/egl.h, etc.) so removes need > of mesa3d-headers in GLVND-supported drivers. > > Currently it's supported by all Mesa-compatible drivers and NVidia. For > simplicity sake, and to ease introduction of libglvnd, only mesa3d is > converted to be compatible with libglvnd. Other providers, like NVidia, > can be converted (or added!) in follow-up patches. > > Changes v3 -> v4: > - bump to libglvnd 1.3.2 > > > Regards, > Yann E. MORIN. > > > The following changes since commit 1640b0c1f967e394f87eb7a0ca04ae40aade11b4 > > package/mbpfan: new package (2020-07-27 10:13:06 +0200) > > > are available in the git repository at: > > https://git.busybox.net/~ymorin/git/buildroot > > for you to fetch changes up to c48baa11cd0c06ec5af3fd4989306c3ec581d0e9 > > package/mesa3d: make it aware of libglvnd and support it when present (2020-07-27 10:45:34 +0200) > > > ---------------------------------------------------------------- > Jakub Skrzypnik (2): > package/libglvnd: new package > package/mesa3d: make it aware of libglvnd and support it when present Series (finally) applied to master, thanks. Jakub, I also added you to DEVELOPERS for the package. Regards, Arnout > > package/Config.in | 1 + > package/libglvnd/Config.in | 42 +++++++++++++++++++++++++++++++++ > package/libglvnd/libglvnd.hash | 7 ++++++ > package/libglvnd/libglvnd.mk | 53 ++++++++++++++++++++++++++++++++++++++++++ > package/mesa3d/Config.in | 15 +++++++----- > package/mesa3d/mesa3d.mk | 15 ++++++++---- > 6 files changed, 123 insertions(+), 10 deletions(-) > create mode 100644 package/libglvnd/Config.in > create mode 100644 package/libglvnd/libglvnd.hash > create mode 100644 package/libglvnd/libglvnd.mk > From ju.o at free.fr Sun Jan 9 17:02:00 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 9 Jan 2022 18:02:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: new package Message-ID: <20220109170200.1315505-1-ju.o@free.fr> python-distro provides information about the OS distribution it runs on, such as a reliable machine-readable ID, or version information. It is the recommended replacement for Python's original platform.linux_distribution function (removed in Python 3.8). It also provides much more functionality which isn't necessarily Python bound, like a command-line interface. https://github.com/nir0s/distro Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-distro/Config.in | 13 +++++++++++++ package/python-distro/python-distro.hash | 3 +++ package/python-distro/python-distro.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/python-distro/Config.in create mode 100644 package/python-distro/python-distro.hash create mode 100644 package/python-distro/python-distro.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2ad76a80e4..a44f07be97 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1590,6 +1590,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ +F: package/python-distro/ F: package/python-pyalsa/ N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index edae7e4f62..47087f52cb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -999,6 +999,7 @@ menu "External python modules" source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" + source "package/python-distro/Config.in" source "package/python-django/Config.in" source "package/python-django-enumfields/Config.in" source "package/python-dnspython/Config.in" diff --git a/package/python-distro/Config.in b/package/python-distro/Config.in new file mode 100644 index 0000000000..bb4151541e --- /dev/null +++ b/package/python-distro/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_DISTRO + bool "python distro" + help + distro provides information about the OS distribution it + runs on, such as a reliable machine-readable ID, or version + information. + + It is the recommended replacement for Python's original + platform.linux_distribution function (removed in Python + 3.8). It also provides much more functionality which isn't + necessarily Python bound, like a command-line interface. + + https://github.com/nir0s/distro diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash new file mode 100644 index 0000000000..e2b3c0a444 --- /dev/null +++ b/package/python-distro/python-distro.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk new file mode 100644 index 0000000000..753e74d020 --- /dev/null +++ b/package/python-distro/python-distro.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-distro +# +################################################################################ + +PYTHON_DISTRO_VERSION = 1.6.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz +PYTHON_DISTRO_LICENSE = Apache-2.0 +PYTHON_DISTRO_LICENSE_FILES = LICENSE +PYTHON_DISTRO_SETUP_TYPE = setuptools + +$(eval $(python-package)) -- 2.34.1 From arnout at mind.be Sun Jan 9 17:15:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 18:15:11 +0100 Subject: [Buildroot] [PATCH] package/mesa3d: Gallium VC4 driver depends on NEON Message-ID: <20220109171511.3293111-1-arnout@mind.be> Since version 21.3.0 of mesa3d, the generic broadcom infrastructure (which is called v3d but is used also for VC4) started using NEON instructions. This leads to assembler failures when VC4 is built for 32-bit ARM without NEON: FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c /tmp/ccAvufNv.s: Assembler messages: /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode [...] /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has NEON, so no condition is needed there. Fixes: http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 34b0352056..37c4f8078e 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" - depends on BR2_arm || BR2_aarch64 + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER -- 2.31.1 From fontaine.fabrice at gmail.com Sun Jan 9 17:16:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 18:16:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/vte: bump to version 0.66.2 Message-ID: <20220109171609.2527192-1-fontaine.fabrice@gmail.com> - Switch to meson-package and so replace host-intltool dependency by TARGET_NLS_DEPENDENCIES: https://gitlab.gnome.org/GNOME/vte/-/issues/87 - Retrieve upstream hash - Switch license file to LGPL-3.0+: https://gitlab.gnome.org/GNOME/vte/-/commit/5e14529d4219f3792690566ef7ec70febd87e070 - Drop libxml2 dependency (not needed with meson) - Add uclibc or glibc dependency, upstream doesn't want to support musl: https://gitlab.gnome.org/GNOME/vte/-/issues/72 https://gitlab.gnome.org/GNOME/vte/-/issues/247 - Add optional icu dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/9e4fbae2cabcd937ac4d1a984ba844d24b44b83f - Add optional libfribidi dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/7d3704f1c54e58443624355835f675ec22c6b9d3 - Add optional systemd dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/81bd158c24ef1d716d3cbf801e72fda2e11b81b4 - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...-with-kernel-headers-from-linux-4-13.patch | 54 +++++++++++++++++++ ...or-fstack-protector-compiler-support.patch | 43 +++++++++++++++ package/vte/Config.in | 7 +-- package/vte/vte.hash | 8 +-- package/vte/vte.mk | 45 +++++++++++----- 5 files changed, 139 insertions(+), 18 deletions(-) create mode 100644 package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch create mode 100644 package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch diff --git a/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch new file mode 100644 index 0000000000..7c3a5ab05e --- /dev/null +++ b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch @@ -0,0 +1,54 @@ +From 91123bb5201156e3d3adbe24305488f5eea2c8d7 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Mon, 27 Sep 2021 22:46:47 +0200 +Subject: [PATCH] build: Fix build with kernel headers from linux < 4.13 + +We already support running with a kernel that doesn't support this +ioctl, so let's also support building with one. Add the missing +ioctl definition to missing.hh. + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2514 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/vte/-/commit/91123bb5201156e3d3adbe24305488f5eea2c8d7] +Signed-off-by: Fabrice Fontaine +--- + src/missing.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/missing.hh b/src/missing.hh +index e5a58727..7902e41e 100644 +--- a/src/missing.hh ++++ b/src/missing.hh +@@ -23,11 +23,14 @@ + #include + + #ifdef __linux__ ++ ++#include + #include + + #if defined(__mips__) || defined(__mips64__) + #include + #endif ++ + #endif + + /* NSIG isn't in POSIX, so if it doesn't exist use this here. See bug #759196 */ +@@ -128,4 +131,13 @@ char* strchrnul(char const* s, + #define CLOSE_RANGE_CLOEXEC (1u << 2) + #endif + ++#if !defined(TIOCGPTPEER) ++/* See linux commit 54ebbfb1603415d9953c150535850d30609ef077 */ ++#if defined(__sparc__) ++#define TIOCGPTPEER _IOR('t', 137, int) ++#else ++#define TIOCGPTPEER _IOR('T', 0x41, int) ++#endif ++#endif /* !TIOCGPTPEER */ ++ + #endif /* __linux__ */ +-- +GitLab + diff --git a/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch new file mode 100644 index 0000000000..67b6c47482 --- /dev/null +++ b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch @@ -0,0 +1,43 @@ +From e32dba1d5cf884959af5b2c0691db00c263ea048 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Mon, 27 Dec 2021 19:24:46 +0100 +Subject: [PATCH] build: Fix check for -fstack-protector* compiler support + +Need to use has_link_argument() on some platforms. + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2535 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/vte/-/commit/e32dba1d5cf884959af5b2c0691db00c263ea048] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 93b7f376..381d5d58 100644 +--- a/meson.build ++++ b/meson.build +@@ -461,8 +461,6 @@ compiler_flags_common = [ + '-fdiagnostics-show-option', + '-fno-common', + '-fno-semantic-interposition', +- '-fstack-protector', +- '-fstack-protector-strong', + ] + + if enable_debug +@@ -550,6 +548,10 @@ add_project_arguments(global_cxxflags, language: 'cpp') + linker_flags = [ + ['-Wl,-Bsymbolic', false,], + ['-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),], ++ ++ # See issue vte#2535. ++ ['-fstack-protector', false], ++ ['-fstack-protector-strong', false], + ] + + foreach flag: linker_flags +-- +GitLab + diff --git a/package/vte/Config.in b/package/vte/Config.in index 96de3d38cc..2635a6007c 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -7,11 +7,11 @@ config BR2_PACKAGE_VTE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PCRE2 help VTE is a library (libvte) implementing a terminal emulator @@ -22,13 +22,14 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte -comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + BR2_TOOLCHAIN_USES_MUSL comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS diff --git a/package/vte/vte.hash b/package/vte/vte.hash index 3fbc5acab0..90818d31f3 100644 --- a/package/vte/vte.hash +++ b/package/vte/vte.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 vte-0.48.3.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum +sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz + +# Hash for license file: +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LGPL3 diff --git a/package/vte/vte.mk b/package/vte/vte.mk index 6c8d1433f5..07e813685e 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -4,26 +4,47 @@ # ################################################################################ -VTE_VERSION = 0.48.3 +VTE_VERSION_MAJOR = 0.66 +VTE_VERSION = $(VTE_VERSION_MAJOR).2 VTE_SOURCE = vte-$(VTE_VERSION).tar.xz -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48 -VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2 -VTE_LICENSE = LGPL-2.1+ -VTE_LICENSE_FILES = COPYING -VTE_CONF_OPTS += --disable-vala +VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) +VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) +VTE_LICENSE = LGPL-3.0+ +VTE_LICENSE_FILES = COPYING.LGPL3 + +ifeq ($(BR2_PACKAGE_ICU),y) +VTE_CONF_OPTS += -Dicu=true +VTE_DEPENDENCIES += icu +else +VTE_CONF_OPTS += -Dicu=false +endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -VTE_CONF_OPTS += --enable-introspection -VTE_DEPENDENCIES += gobject-introspection +VTE_CONF_OPTS += -Dgir=true -Dvapi=true +VTE_DEPENDENCIES += host-vala gobject-introspection else -VTE_CONF_OPTS += --disable-introspection +VTE_CONF_OPTS += -Dgir=false -Dvapi=false endif ifeq ($(BR2_PACKAGE_GNUTLS),y) -VTE_CONF_OPTS += --with-gnutls +VTE_CONF_OPTS += -Dgnutls=true VTE_DEPENDENCIES += gnutls else -VTE_CONF_OPTS += --without-gnutls +VTE_CONF_OPTS += -Dgnutls=false +endif + +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) +VTE_CONF_OPTS += -Dfribidi=true +VTE_DEPENDENCIES += libfribidi +else +VTE_CONF_OPTS += -Dfribidi=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +VTE_CONF_OPTS += -D_systemd=true +VTE_DEPENDENCIES += systemd +else +VTE_CONF_OPTS += -D_systemd=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.34.1 From romain.naour at smile.fr Sun Jan 9 17:24:04 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 18:24:04 +0100 Subject: [Buildroot] [PATCH] package/mesa3d: Gallium VC4 driver depends on NEON In-Reply-To: <20220109171511.3293111-1-arnout@mind.be> References: <20220109171511.3293111-1-arnout@mind.be> Message-ID: <73b148ec-c6bd-fb58-64fd-fd4e224f966e@smile.fr> Hello Arnout, Le 09/01/2022 ? 18:15, Arnout Vandecappelle (Essensium/Mind) a ?crit?: > Since version 21.3.0 of mesa3d, the generic broadcom infrastructure > (which is called v3d but is used also for VC4) started using NEON > instructions. This leads to assembler failures when VC4 is built for > 32-bit ARM without NEON: > > FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o > /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c > /tmp/ccAvufNv.s: Assembler messages: > /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode > [...] > /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode > > Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has > NEON, so no condition is needed there. BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D selecting BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 already requires NEON. Reviewed-by: Romain Naour Best regards, Romain > > Fixes: > http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ > http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/mesa3d/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 34b0352056..37c4f8078e 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D > > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 > bool "Gallium vc4 driver" > - depends on BR2_arm || BR2_aarch64 > + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence > select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > From arnout at mind.be Sun Jan 9 17:35:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 18:35:42 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: remove BR2_PACKAGE_SYSTEMD_TMPFILES Message-ID: <20220109173436.F2E0982DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7818ba0d6fde9ce9836e6c869d2a5faa5f32586d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When the BR2_PACKAGE_SYSTEMD_TMPFILES was removed, it was added to Config.in. The idea was to warn users who use the symbol in their br2-external. However, most users don't have a br2-external that uses this symbol. Since the symbol defaults to y when systemd is enabled, they'll get this legacy warning - which is completely meaningless for them since nothing changes. The annoyance of the many is worse than the possible unexpected change for the few. And anyone actually relying on BR2_PACKAGE_SYSTEMD_TMPFILES will probably easily discover the issue in testing (e.g. because the tmpfiles conf is missing in the target). Therefore, remove BR2_PACKAGE_SYSTEMD_TMPFILES from Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5a3e9b5cc7..d36eac3302 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,15 +153,6 @@ config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE This package has been removed as python-setuptools-scm dropped support of python 2 since version 6.0.0. -config BR2_PACKAGE_SYSTEMD_TMPFILES - bool "systemd tmpfiles support always enabled" - select BR2_LEGACY - help - The systemd tmpfiles support is always enabled, so the symbol - to make it optional has been removed. You need to update any - external packages that use this symbol to use - BR2_PACKAGE_SYSTEMD instead. - config BR2_PACKAGE_CIVETWEB_WITH_LUA bool "civetweb lua support option removed" select BR2_LEGACY From arnout at mind.be Sun Jan 9 17:33:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 18:33:02 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: correctly call $(subst ...) Message-ID: <20220109173436.E8E2F82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56d50e835441f384cc2d1b29ccbeed0b1f936728 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b6378631c2609742382984f6f7b93c1d9d2cdb78 introduced a call to the subst make function, but did it incorrectly (followed by comma instead of space). The result is that it expands to empty. Fix the call. Fixes: http://autobuild.buildroot.net/results/8ea/8eacd455e4767cc7b1e912a3f910c940110c3be0/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 77d2f66b17..067c45a920 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -44,7 +44,7 @@ PKG_CARGO_ENV = \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ - CARGO_TARGET_$(subst,-,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc + CARGO_TARGET_$(subst -,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) From arnout at mind.be Sun Jan 9 17:42:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 18:42:53 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Jakub Skrzypnik Message-ID: <20220109173711.1CDE38105A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=106aa6ce0e92f367226f6aba3caa1a84ff7a9640 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The e-mail bounces. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2ad76a80e4..ed65c74319 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1265,9 +1265,6 @@ F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig -N: Jakub Skrzypnik -F: package/libglvnd/ - N: James Hilliard F: package/apcupsd/ F: package/exfatprogs/ From giulio.benetti at benettiengineering.com Sun Jan 9 17:52:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 9 Jan 2022 18:52:59 +0100 Subject: [Buildroot] [PATCH] package/pkg-cargo: convert to uppercase RUSTC_TARGET_NAME Message-ID: <20220109175259.86238-1-giulio.benetti@benettiengineering.com> RUSTC_TARGET_NAME's dashes are substituted with underscores, but this is not enough to fix building, we also need to make it UPPERCASE. So let make it like that by using UPPERCASE macro. Fixes: http://autobuild.buildroot.net/results/498/498b96224c8bcff91542ca3731dfd66891f4ec23/ Signed-off-by: Giulio Benetti --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 067c45a920..71f4dc4c91 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -44,7 +44,7 @@ PKG_CARGO_ENV = \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ - CARGO_TARGET_$(subst -,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc + CARGO_TARGET_$(call UPPERCASE,$(subst -,_,$(RUSTC_TARGET_NAME)))_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) -- 2.25.1 From fontaine.fabrice at gmail.com Sun Jan 9 18:06:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 19:06:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: disable MBEDTLS_FATAL_WARNINGS Message-ID: <20220109180657.2765079-1-fontaine.fabrice@gmail.com> Disable MBEDTLS_FATAL_WARNINGS to avoid the following build failure since bump to version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:412:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] 412 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/af017382bb5772de7383d71ed7b8af44717981f9 Signed-off-by: Fabrice Fontaine --- package/mbedtls/mbedtls.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index c238d664f8..5facb99b2a 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -8,7 +8,8 @@ MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ - -DENABLE_TESTING=OFF + -DENABLE_TESTING=OFF \ + -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 MBEDTLS_LICENSE_FILES = LICENSE -- 2.34.1 From arnout at mind.be Sun Jan 9 18:08:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 19:08:25 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: convert to uppercase RUSTC_TARGET_NAME Message-ID: <20220109180238.CB79282E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac573c55aac3cbb4257f5388c91321c81095c654 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master RUSTC_TARGET_NAME's dashes are substituted with underscores, but this is not enough to fix building, we also need to make it UPPERCASE. So let make it like that by using UPPERCASE macro. Fixes: http://autobuild.buildroot.net/results/498/498b96224c8bcff91542ca3731dfd66891f4ec23/ Signed-off-by: Giulio Benetti [Arnout: remove subst, implied by UPPERCASE] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 067c45a920..614d46ad64 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -44,7 +44,7 @@ PKG_CARGO_ENV = \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ - CARGO_TARGET_$(subst -,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc + CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) From arnout at mind.be Sun Jan 9 18:01:32 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 19:01:32 +0100 Subject: [Buildroot] [git commit] package/mesa3d: fix vulkan intel dependencies Message-ID: <20220109180238.BF0BF82D96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7178fd1ca0340d0fad34734ab5a462c7f95debd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It is possible to build the vulkan intel driver without X11/GLX. - remove xorgproto dependency; it is already given via BR2_PACKAGE_MESA3D_OPENGL_GLX/BR2_PACKAGE_MESA3D_NEEDS_X11 and was already gone from the .mk file - enable DRI3 automatically when X11 is enabled, like we do for other drivers - libxshmfence is implied by DRI3 (both in Config.in and mesa3d.mk), but we need to propagate dependencies (RISCV_32 doesn't apply since it's x86 only) Signed-off-by: Peter Seiderer [Arnout: select DRI3 like other drivers though, which simplifies the whole thing] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 12 +++++------- package/mesa3d/mesa3d.mk | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 34b0352056..b9a5574b63 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -378,21 +378,19 @@ comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL bool "Vulkan Intel driver" depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert - depends on BR2_PACKAGE_XORG7 # xorgproto - select BR2_PACKAGE_MESA3D_DRI3 + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER - select BR2_PACKAGE_XORGPROTO help Vulkan driver for Intel hardware from Ivy Bridge onward. -comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= 3.17" +comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 + !BR2_TOOLCHAIN_USES_GLIBC comment "Off-screen Rendering" diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index e34ed4264f..aa365838ab 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -146,7 +146,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= else -MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif From arnout at mind.be Sun Jan 9 18:09:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 19:09:08 +0100 Subject: [Buildroot] [RFC v2 02/12] package/mesa3d: fix vulkan/intel dependencies In-Reply-To: <20210110222833.26301-3-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-3-ps.report@gmx.net> Message-ID: Hi Peter, I'm finally reviewing this series. Since it's RFC, I'm going to mark it as changes requested right away. On 10/01/2021 23:28, Peter Seiderer wrote: > - enable X11/GLX free build > > - remove xorgproto dependency is already given via BR2_PACKAGE_MESA3D_OPENGL_GLX/BR2_PACKAGE_MESA3D_NEEDS_X11 > > - libxshmfence only needed in case BR2_PACKAGE_MESA3D_OPENGL_GLX is enabled > > - the correct dependency for BR2_PACKAGE_XLIB_LIBXSHMFENCE would > be 'depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX', > but this results in: > > package/mesa3d/Config.in:81:error: recursive dependency detected! > package/mesa3d/Config.in:81: symbol BR2_PACKAGE_MESA3D_DRIVER is selected by BR2_PACKAGE_MESA3D_VULKAN_DRIVER > package/mesa3d/Config.in:77: symbol BR2_PACKAGE_MESA3D_VULKAN_DRIVER is selected by BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL > package/mesa3d/Config.in:406: symbol BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL depends on BR2_PACKAGE_MESA3D_OPENGL_GLX > package/mesa3d/Config.in:461: symbol BR2_PACKAGE_MESA3D_OPENGL_GLX depends on BR2_PACKAGE_MESA3D_DRIVER > For a resolution refer to Documentation/kbuild/kconfig-language.txt > subsection "Kconfig recursive dependency limitations" > > so use unconditional 'depends on BR2_TOOLCHAIN_HAS_SYNC_4' instead > > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/mesa3d/Config.in | 10 ++++++---- > package/mesa3d/mesa3d.mk | 2 ++ > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 347b1a2726..d9c27f8b5c 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -398,15 +398,17 @@ comment "Vulkan drivers" > config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL > bool "Vulkan Intel driver" > depends on BR2_i386 || BR2_x86_64 > + # depends on BR2_TOOLCHAIN_HAS_SYNC_4 because of libxshmfence only > + # in case GLX is enabled but the following results in 'recursive > + # dependency detected!', so simple depend always on BR2_TOOLCHAIN_HAS_SYNC_4 > + # depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX # libxshmfence in case GLX is enabled > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h > depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert > - depends on BR2_PACKAGE_XORG7 # xorgproto > select BR2_PACKAGE_EXPAT > - select BR2_PACKAGE_MESA3D_DRI3 > + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_MESA3D_OPENGL_GLX In other drivers we enable DRI3 uncondtionally when X11 is enabled, i.e. even if GLX is not enabled: select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 I am not entirely sure if DRI3 makes any sense at all without GLX, but why not I'd say. Anyway, by working that way, you can resolve the circular dependency, because it simply becomes (as you see in many other drivers) depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_MESA3D_VULKAN_DRIVER > - select BR2_PACKAGE_XORGPROTO > - select BR2_PACKAGE_XLIB_LIBXSHMFENCE > + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_MESA3D_OPENGL_GLX > help > Vulkan driver for Intel hardware from Ivy Bridge onward. > > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index ea6265d723..967b86810f 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -146,7 +146,9 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers= > else > +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)$(BR2_PACKAGE_MESA3D_OPENGL_GLX),yy) > MESA3D_DEPENDENCIES += xlib_libxshmfence That also means that this can simply be removed, since it's already done by DRI3. Actually, I don't need feedback on those changes, so applied to master, thanks! Regards, Arnout > +endif > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) > endif > From arnout at mind.be Sun Jan 9 18:11:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 19:11:29 +0100 Subject: [Buildroot] [PATCH] package/pkg-cargo: convert to uppercase RUSTC_TARGET_NAME In-Reply-To: <20220109175259.86238-1-giulio.benetti@benettiengineering.com> References: <20220109175259.86238-1-giulio.benetti@benettiengineering.com> Message-ID: On 09/01/2022 18:52, Giulio Benetti wrote: > RUSTC_TARGET_NAME's dashes are substituted with underscores, but this is > not enough to fix building, we also need to make it UPPERCASE. So let make > it like that by using UPPERCASE macro. > > Fixes: > http://autobuild.buildroot.net/results/498/498b96224c8bcff91542ca3731dfd66891f4ec23/ > > Signed-off-by: Giulio Benetti > --- > package/pkg-cargo.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index 067c45a920..71f4dc4c91 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -44,7 +44,7 @@ PKG_CARGO_ENV = \ > CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ > CARGO_TARGET_APPLIES_TO_HOST="false" \ > CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ > - CARGO_TARGET_$(subst -,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc > + CARGO_TARGET_$(call UPPERCASE,$(subst -,_,$(RUSTC_TARGET_NAME)))_LINKER=$(notdir $(TARGET_CROSS))gcc UPPERCASE already does the subst, so that's redundant. Applied to master with that fixed, thanks. With the two of us working together, the autobuilder failure should finally be fixed! Regards, Arnout > > HOST_PKG_CARGO_ENV = \ > $(PKG_COMMON_CARGO_ENV) > From arnout at mind.be Sun Jan 9 18:11:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 19:11:54 +0100 Subject: [Buildroot] [PATCH] package/mesa3d: Gallium VC4 driver depends on NEON In-Reply-To: <73b148ec-c6bd-fb58-64fd-fd4e224f966e@smile.fr> References: <20220109171511.3293111-1-arnout@mind.be> <73b148ec-c6bd-fb58-64fd-fd4e224f966e@smile.fr> Message-ID: On 09/01/2022 18:24, Romain Naour wrote: > Hello Arnout, > > Le 09/01/2022 ? 18:15, Arnout Vandecappelle (Essensium/Mind) a ?crit?: >> Since version 21.3.0 of mesa3d, the generic broadcom infrastructure >> (which is called v3d but is used also for VC4) started using NEON >> instructions. This leads to assembler failures when VC4 is built for >> 32-bit ARM without NEON: >> >> FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o >> /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c >> /tmp/ccAvufNv.s: Assembler messages: >> /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode >> [...] >> /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode >> >> Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has >> NEON, so no condition is needed there. > > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D selecting > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 already requires NEON. Yeah, but VC4 doesn't select V3D so that doesn't mean anything. Regards, Arnout > > Reviewed-by: Romain Naour > > Best regards, > Romain > > >> >> Fixes: >> http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ >> http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ >> >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) >> --- >> package/mesa3d/Config.in | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in >> index 34b0352056..37c4f8078e 100644 >> --- a/package/mesa3d/Config.in >> +++ b/package/mesa3d/Config.in >> @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D >> >> config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 >> bool "Gallium vc4 driver" >> - depends on BR2_arm || BR2_aarch64 >> + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 >> depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence >> select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 >> select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER >> > From romain.naour at smile.fr Sun Jan 9 18:13:42 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 19:13:42 +0100 Subject: [Buildroot] [PATCH v9] package/freeradius-server: new package In-Reply-To: <20220104215541.23003-1-matthew.weber@collins.com> References: <20220104215541.23003-1-matthew.weber@collins.com> Message-ID: <6344a4e4-129c-dc79-6257-aa54da908093@smile.fr> Hello Matt, Le 04/01/2022 ? 22:55, Matthew Weber via buildroot a ?crit?: > From: David GOUARIN > > FreeRADIUS is an open source server which implements > a protocol for remote user Authorization, Authentication > and Accounting. > > Signed-off-by: David GOUARIN > Signed-off-by: Kalpesh Panchal > Signed-off-by: Matt Weber > --- > Changes > v8 -> v9: > - A systemd unit is installed if systemd is enabled. The default provided > by `freeradius-server/redhat/radiusd.service` was not used because of > extra options not compatible with Buildroot. The unit is instead based > on a simplified version of that upstream file. > [...] > diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk > new file mode 100644 > index 0000000000..0c071a2378 > --- /dev/null > +++ b/package/freeradius-server/freeradius-server.mk > @@ -0,0 +1,124 @@ > +################################################################################ > +# > +# freeradius-server > +# > +################################################################################ > + > +FREERADIUS_SERVER_VERSION = 3.0.25 > +FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius > +FREERADIUS_SERVER_LICENSE = GPL-2.0 > +FREERADIUS_SERVER_LICENSE_FILES = COPYRIGHT > +FREERADIUS_SERVER_DEPENDENCIES = libtalloc > + > +# some compiler checks are not supported while cross compiling. > +# instead of removing those checks, we cache the answers > +FREERADIUS_SERVER_CONF_OPTS += \ > + ax_cv_cc_bounded_attribute=no \ > + ax_cv_cc_builtin_bswap64=no \ > + ax_cv_cc_builtin_choose_expr=no \ > + ax_cv_cc_builtin_types_compatible_p=no > + > +ifeq ($(BR2_PACKAGE_LIBCAP),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-libcap > +FREERADIUS_SERVER_DEPENDENCIES += libcap > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-libcap > +endif > + > +ifeq ($(BR2_PACKAGE_LIBPCAP),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-libpcap > +FREERADIUS_SERVER_DEPENDENCIES += libpcap > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-libpcap > +endif > + > +ifeq ($(BR2_PACKAGE_LIBKRB5),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_krb5 > +FREERADIUS_SERVER_DEPENDENCIES += libkrb5 > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_krb5 > +endif > + > +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_pam > +FREERADIUS_SERVER_DEPENDENCIES += linux-pam > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_pam > +endif > + > +ifeq ($(BR2_PACKAGE_OPENLDAP),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ldap > +FREERADIUS_SERVER_DEPENDENCIES += openldap > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ldap > +endif > + > +ifeq ($(BR2_PACKAGE_MYSQL),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_mysql > +FREERADIUS_SERVER_DEPENDENCIES += mysql > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_mysql > +endif > + > +ifeq ($(BR2_PACKAGE_SQLITE),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_sqlite > +FREERADIUS_SERVER_DEPENDENCIES += sqlite > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_sqlite > +endif > + > +ifeq ($(BR2_PACKAGE_UNIXODBC),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_unixodbc > +FREERADIUS_SERVER_DEPENDENCIES += unixodbc > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_unixodbc > +endif > + > +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_postgresql > +FREERADIUS_SERVER_DEPENDENCIES += postgresql > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_postgresql > +endif > + > +ifeq ($(BR2_PACKAGE_HAS_OPENSSL),y) > +FREERADIUS_SERVER_DEPENDENCIES += openssl > +FREERADIUS_SERVER_CONF_OPTS += --with-openssl > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-openssl > +endif > + > +ifeq ($(BR2_PACKAGE_PCRE),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-pcre > +FREERADIUS_SERVER_DEPENDENCIES += pcre > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-pcre > +endif > + > +ifeq ($(BR2_PACKAGE_RUBY),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ruby > +FREERADIUS_SERVER_DEPENDENCIES += ruby > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ruby > +endif > + > +ifeq ($(BR2_INIT_SYSTEMD),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-systemd > +FREERADIUS_SERVER_DEPENDENCIES += systemd > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-systemd > +endif > + > +# TARGET_DIR is set to empty to avoid creation of symlinks in hardcoded host directories > +# freeradius Makefile does not support an alternate DESTDIR, instead it uses the magic $(R) variable > +FREERADIUS_SERVER_MAKE_ENV = R=$(TARGET_DIR) TARGET_DIR="" > + > +# use MAKE1 because make install does not support parallel build > +FREERADIUS_SERVER_MAKE = $(MAKE1) > + > +define FREERADIUS_SERVER_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 644 package/freeradius-server/radiusd.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/radiusd.service > +endef > + > +$(eval $(autotools-package)) > diff --git a/package/freeradius-server/radiusd.service b/package/freeradius-server/radiusd.service > new file mode 100644 > index 0000000000..a55bce62d3 > --- /dev/null > +++ b/package/freeradius-server/radiusd.service > @@ -0,0 +1,38 @@ > +# Reference from: freeradius-server/redhat/radiusd.service > + > +[Unit] > +Description=FreeRADIUS multi-protocol policy server > +After=network-online.target > +Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ http://networkradius.com/doc/ > + > +[Service] > +Type=notify > +WatchdogSec=60 > +NotifyAccess=all > +EnvironmentFile=-/etc/sysconfig/radiusd /etc/sysconfig is a redhat things. I don't think it apply to Buildroot. This file is not installed by the package. Otherwise the package seems ok even if it requires some magic $(R). Best regards, Romain > + > +# FreeRADIUS can do static evaluation of policy language rules based > +# on environmental variables which is very useful for doing per-host > +# customization. > +# Unfortunately systemd does not allow variable substitutions such > +# as %H or $(hostname) in the EnvironmentFile. > +# We provide HOSTNAME here for convenience. > +Environment=HOSTNAME=%H > + > +# Limit memory to 2G this is fine for %99.99 of deployments. FreeRADIUS > +# is not memory hungry, if it's using more than this, then there's probably > +# a leak somewhere. > +MemoryLimit=2G > + > +ExecStartPre=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cx -lstdout > +ExecStart=/usr/sbin/radiusd -f $FREERADIUS_OPTIONS > +Restart=on-failure > +RestartSec=5 > +ExecReload=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cxm -lstdout > +ExecReload=/bin/kill -HUP $MAINPID > + > +# Only allow native system calls > +SystemCallArchitectures=native > + > +[Install] > +WantedBy=multi-user.target > From peter at korsgaard.com Sun Jan 9 18:18:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 19:18:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: disable MBEDTLS_FATAL_WARNINGS In-Reply-To: <20220109180657.2765079-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 19:06:57 +0100") References: <20220109180657.2765079-1-fontaine.fabrice@gmail.com> Message-ID: <87o84kai3h.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable MBEDTLS_FATAL_WARNINGS to avoid the following build failure > since bump to version 2.28.0 in commit > 0f8aab08e762742d753d5920718f31c629d0f8d7: > /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:412:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] > 412 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) > | ^~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/af017382bb5772de7383d71ed7b8af44717981f9 Committed, thanks. The error message is a bit odd as we should be building with -Os. Do you know what is going on? -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 18:17:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 19:17:07 +0100 Subject: [Buildroot] [git commit] package/mbedtls: disable MBEDTLS_FATAL_WARNINGS Message-ID: <20220109181211.7F87B82DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf9dcd3b08fd88ef21550f75dc57de212fcea26c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable MBEDTLS_FATAL_WARNINGS to avoid the following build failure since bump to version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:412:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] 412 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/af017382bb5772de7383d71ed7b8af44717981f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index c238d664f8..5facb99b2a 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -8,7 +8,8 @@ MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ - -DENABLE_TESTING=OFF + -DENABLE_TESTING=OFF \ + -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 MBEDTLS_LICENSE_FILES = LICENSE From tambewilliam at gmail.com Sun Jan 9 18:18:36 2022 From: tambewilliam at gmail.com (William Tambe) Date: Sun, 9 Jan 2022 12:18:36 -0600 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory Message-ID: I am attempting to build: +BR2_PACKAGE_DHCP=y +BR2_PACKAGE_DHCP_CLIENT=y However it fails as follow complaining about not finding readline/history.h: making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include -I../../lib/lwres/unix/include -I../../lib/lwres/include -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include -I../../lib/dns/include -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include -I../../lib/bind9/include -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks \ -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ -c ./nsupdate.c ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory 104 | #include | ^~~~~~~~~~~~~~~~~~~~ compilation terminated. make[5]: *** [Makefile:473: nsupdate.o] Error 1 make[4]: *** [Makefile:79: subdirs] Error 1 make[3]: *** [Makefile:88: subdirs] Error 1 make[2]: *** [package/pkg-generic.mk:270: /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] Error 2 make[1]: *** [Makefile:23: _all] Error 2 make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 From peter at korsgaard.com Sun Jan 9 18:31:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 19:31:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: add mysql_config to MARIADB_CONFIG_SCRIPTS In-Reply-To: <20220109150422.792641-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 16:04:22 +0100") References: <20220109150422.792641-1-fontaine.fabrice@gmail.com> Message-ID: <87k0f8ahh8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Add mysql_config to MARIADB_CONFIG_SCRIPTS, this won't fix any build > failure at the moment but will avoid possible issues in the future > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 18:31:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 19:31:07 +0100 Subject: [Buildroot] [git commit] package/mariadb: add mysql_config to MARIADB_CONFIG_SCRIPTS Message-ID: <20220109182532.38C4E82DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee8ccad5d7cbb4981e6960d5712e9936eb28724e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add mysql_config to MARIADB_CONFIG_SCRIPTS, this won't fix any build failure at the moment but will avoid possible issues in the future Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d08b768a2e..db967ca3ed 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -14,6 +14,7 @@ MARIADB_CPE_ID_VENDOR = mariadb MARIADB_SELINUX_MODULES = mysql MARIADB_INSTALL_STAGING = YES MARIADB_PROVIDES = mysql +MARIADB_CONFIG_SCRIPTS = mysql_config MARIADB_DEPENDENCIES = \ host-mariadb \ From romain.naour at smile.fr Sun Jan 9 18:32:02 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 19:32:02 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/moby-buildkit: new package In-Reply-To: <20201216084058.102180-1-christian@paral.in> References: <20201216084058.102180-1-christian@paral.in> Message-ID: Hello Christian, Le 16/12/2020 ? 09:40, Christian Stewart a ?crit?: > Signed-off-by: Christian Stewart > --- > package/Config.in | 1 + > package/moby-buildkit/Config.in | 19 +++++++++++++++++++ > package/moby-buildkit/moby-buildkit.hash | 3 +++ > package/moby-buildkit/moby-buildkit.mk | 24 ++++++++++++++++++++++++ > 4 files changed, 47 insertions(+) > create mode 100644 package/moby-buildkit/Config.in > create mode 100644 package/moby-buildkit/moby-buildkit.hash > create mode 100644 package/moby-buildkit/moby-buildkit.mk > > diff --git a/package/Config.in b/package/Config.in > index dc7139a49a..ce37a2ed35 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2414,6 +2414,7 @@ menu "System tools" > source "package/mender/Config.in" > source "package/mender-grubenv/Config.in" > source "package/mfoc/Config.in" > + source "package/moby-buildkit/Config.in" > source "package/monit/Config.in" > source "package/multipath-tools/Config.in" > source "package/ncdu/Config.in" > diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in > new file mode 100644 > index 0000000000..14134aa7ae > --- /dev/null > +++ b/package/moby-buildkit/Config.in > @@ -0,0 +1,19 @@ > +config BR2_PACKAGE_MOBY_BUILDKIT > + bool "moby-buildkit" > + 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 > + depends on BR2_USE_MMU > + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency > + help > + BuildKit is a toolkit for converting source code to build artifacts in an This line is trigger a check-package warning: $ ./utils/check-package package/moby-buildkit/* package/moby-buildkit/Config.in:10: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > + efficient, expressive and repeatable manner. > + > + https://github.com/moby/buildkit > + > +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" > + 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 || BR2_TOOLCHAIN_USES_UCLIBC > + depends on BR2_USE_MMU > diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash > new file mode 100644 > index 0000000000..a6bfdce4f1 > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz > +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE Checking legal-info report a problem with the LICENSE file hash: ERROR: LICENSE has wrong sha256 hash: ERROR: expected: 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 ERROR: got : c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 > diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk > new file mode 100644 > index 0000000000..fb4e78e3a6 > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.mk > @@ -0,0 +1,24 @@ > +################################################################################ > +# > +# moby-buildkit > +# > +################################################################################ > + > +MOBY_BUILDKIT_VERSION = 0.8.1 > +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) > + > +MOBY_BUILDKIT_LICENSE = Apache-2.0 > +MOBY_BUILDKIT_LICENSE_FILES = LICENSE > + > +MOBY_BUILDKIT_DEPENDENCIES = host-pkgconf Why host-pkgconfig is needed ? It doesn't seems used by the build system. Best regards, Romain > +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit > + > +MOBY_BUILDKIT_TAGS = cgo > +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd > + > +MOBY_BUILDKIT_LDFLAGS = \ > + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" > + > +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) > + > +$(eval $(golang-package)) > From romain.naour at smile.fr Sun Jan 9 19:06:18 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 20:06:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/daemonize: new package In-Reply-To: <87d2f33b-08cc-6b84-35d4-11e5140bb222@gmail.com> References: <20210124102241.1207866-1-christian@paral.in> <87d2f33b-08cc-6b84-35d4-11e5140bb222@gmail.com> Message-ID: <2c1bf212-6ec5-6fca-2df4-cee2b0a5e117@smile.fr> Hello Christian, Le 31/12/2021 ? 10:45, Joachim Wiberg a ?crit?: > Hi, > > sorry for the late review: > > On 1/24/21 11:22 AM, Christian Stewart wrote: >> Daemonize is a command line utility to run a program as a Unix daemon. >> Signed-off-by: Christian Stewart >> --- > > Missing entry in DEVELOPERS. > >> package/Config.in | 1 + >> ...de-setpgrp-to-enable-cross-compiling.patch | 55 +++++++++++++++++++ >> package/daemonize/Config.in | 5 ++ >> package/daemonize/daemonize.hash | 1 + >> package/daemonize/daemonize.mk | 12 ++++ >> 5 files changed, 74 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 f42cc01032..b335aa4dd8 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -2413,6 +2413,7 @@ menu "System tools" >> source "package/coreutils/Config.in" >> source "package/cpuload/Config.in" >> source "package/daemon/Config.in" >> + source "package/daemonize/Config.in" > > How does this program differ from the already existing daemon(1) we have > in Buildroot? Are there programs that depend on it perhaps, or does it > offer more functionality than daemon(1)? > >> 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 > > We don't usually allow for patches in the tree that are not submitted > upstream, i.e. only backported patches. However, issues like these are > usually better solved by instead overriding the autoconf cache value > (ac_cv_foo) from the .mk file. There are lots of examples of this in > the tree, e.g. package/mtools/mtools.mk There is a configure.in, if possible patch this file instead and use DAEMONIZE_AUTORECONF = YES. > >> diff --git a/package/daemonize/Config.in b/package/daemonize/Config.in >> new file mode 100644 >> index 0000000000..f7f3288d9a >> --- /dev/null >> +++ b/package/daemonize/Config.in >> @@ -0,0 +1,5 @@ >> +menuconfig BR2_PACKAGE_DAEMONIZE >> + bool "daemonize" is there any toolchain dependency ? glibc, uclibc-ng, musl ? Have you check with test-pkg ? >> + help >> + Command line utility to run a daemon. >> + > > Here would be a good place to mention any added value in this package, > as compared to BR2_PACKAGE_DAEMON. Alse add the link to the project: http://software.clapper.org/daemonize (Use check-package) > >> 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 license file hash is missing. >> 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 Maybe we should add the getopt.c license: https://github.com/bmc/daemonize/blob/master/LICENSE.md#license-for-getoptc >> +DAEMONIZE_LICENSE_FILES = LICENSE.md >> + >> +$(eval $(autotools-package)) > > Other than my comments above, the packaging looks fine to me. > > Reviewed-by: Joachim Wiberg I have marked this patch as "Changes Requested". Best regards, Romain > > Best regards > /Joachim > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sun Jan 9 19:55:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 20:55:39 +0100 Subject: [Buildroot] [git commit] system/Config.in: update systemd dependencies Message-ID: <20220109195041.1ADDA82DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efa07944c59acd312d392d4e39f8470b38735282 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit eb49354eb34842f88218fcf9ef60576b85653e38 updated systemd's minimal kernel headers version to 3.13, but forgot to update the dependencies of BR2_INIT_SYSTEMD. Update BR2_INIT_SYSTEMD kernel headers dependency to 3.13. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- system/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 8c66cad12a..a4ffbfa18c 100644 --- a/system/Config.in +++ b/system/Config.in @@ -125,7 +125,7 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR From arnout at mind.be Sun Jan 9 19:57:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 20:57:32 +0100 Subject: [Buildroot] [git commit] package/systemd: Update description and kernel options In-Reply-To: <8735lxca4s.fsf@dell.be.48ers.dk> References: <20220109124415.8A8BF82CFA@busybox.osuosl.org> <8735lxca4s.fsf@dell.be.48ers.dk> Message-ID: <84bd72d3-426f-f028-b4fc-a5337fa8defc@mind.be> On 09/01/2022 14:27, Peter Korsgaard wrote: >>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > > > commit: https://git.buildroot.net/buildroot/commit/?id=eb49354eb34842f88218fcf9ef60576b85653e38 > > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > > realign the configuration to the README. > > > enable CONFIG_AUTOFS_FS (kernel >= 4.18) as well as the someday > > to be removed CONFIG_AUTOFS4_FS option. > > > Signed-off-by: Norbert Lange > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > > --- > > package/systemd/Config.in | 22 +++++++++++++++++----- > > package/systemd/systemd.mk | 16 ++++++++++++---- > > 2 files changed, 29 insertions(+), 9 deletions(-) > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index c8c5a9c47b..27a12bc947 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > > depends on !BR2_STATIC_LIBS # kmod > > depends on BR2_TOOLCHAIN_USES_GLIBC > > depends on BR2_TOOLCHAIN_HAS_SSP > > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 > > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > > Is that correct? The corresponding BR2_INIT_SYSTEMD dependency was not > updated. My bad, fixed in efa07944c59acd312d392d4e39f8470b38735282. Regards, Arnout From arnout at mind.be Sun Jan 9 20:00:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 21:00:56 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: fix flake8 errors Message-ID: <20220109195612.5354B82DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02e679d8bf8acae9e110820858d1f242ff971af8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master support/scripts/pkg-stats:1171:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1175:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1179:8: E713 test for membership should be 'not in' 3 E713 test for membership should be 'not in' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1955772278 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7e20ccc0da..abd36a3dd5 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1168,15 +1168,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - if not "url" in args.disable: + if "url" not in args.disable: print("Checking URL status") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_urls(packages)) - if not "upstream" in args.disable: + if "upstream" not in args.disable: print("Getting latest versions ...") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_latest_version(packages)) - if not "cve" in args.disable and args.nvd_path: + if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From fontaine.fabrice at gmail.com Sun Jan 9 20:00:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 21:00:37 +0100 Subject: [Buildroot] [PATCH 1/3] package/libvirt: fix ssh2 option Message-ID: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 41218c0e53..0c1ee82f43 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -220,10 +220,10 @@ LIBVIRT_CONF_OPTS += -Dsasl=disabled endif ifeq ($(BR2_PACKAGE_LIBSSH2),y) -LIBVIRT_CONF_OPTS += -Dssh2=enabled +LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 else -LIBVIRT_CONF_OPTS += -Dssh2=disabled +LIBVIRT_CONF_OPTS += -Dlibssh2=disabled endif ifeq ($(BR2_PACKAGE_LIBVIRT_LXC),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 20:00:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 21:00:38 +0100 Subject: [Buildroot] [PATCH 2/3] package/libvirt: disable sasl In-Reply-To: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Message-ID: <20220109200039.3188788-2-fontaine.fabrice@gmail.com> sasl depends on libsasl2 (https://github.com/cyrusimap/cyrus-sasl) which is not packaged yet in buildroot and will result in the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1212:2: ERROR: Dependency "libsasl2" not found, tried pkgconfig Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 0c1ee82f43..816bb0760d 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -63,6 +63,7 @@ LIBVIRT_CONF_OPTS = \ -Dpciaccess=enabled \ -Dpm_utils=disabled \ -Dsanlock=disabled \ + -Dsasl=disabled \ -Dsecdriver_apparmor=disabled \ -Dstorage_iscsi=disabled \ -Dstorage_iscsi_direct=disabled \ @@ -212,13 +213,6 @@ else LIBVIRT_CONF_OPTS += -Dnss=disabled endif -ifeq ($(BR2_PACKAGE_LIBGSASL),y) -LIBVIRT_CONF_OPTS += -Dsasl=enabled -LIBVIRT_DEPENDENCIES += libgsasl -else -LIBVIRT_CONF_OPTS += -Dsasl=disabled -endif - ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 20:00:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 21:00:39 +0100 Subject: [Buildroot] [PATCH 3/3] package/libvirt: bump to version 7.10.0 In-Reply-To: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Message-ID: <20220109200039.3188788-3-fontaine.fabrice@gmail.com> https://gitlab.com/libvirt/libvirt/-/blob/v7.10.0/NEWS.rst Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.hash | 2 +- package/libvirt/libvirt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.hash b/package/libvirt/libvirt.hash index e8cbb34e2a..de9ebff564 100644 --- a/package/libvirt/libvirt.hash +++ b/package/libvirt/libvirt.hash @@ -1,3 +1,3 @@ # locally computed -sha256 1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2 libvirt-7.7.0.tar.xz +sha256 cb318014af097327928c6e3d72922e3be02a3e6401247b2aa52d9ab8e0b480f9 libvirt-7.10.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 816bb0760d..7b0ed5e52e 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVIRT_VERSION = 7.7.0 +LIBVIRT_VERSION = 7.10.0 LIBVIRT_SITE = https://libvirt.org/sources LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ -- 2.34.1 From yann.morin.1998 at free.fr Sun Jan 9 20:08:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:08:06 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org In-Reply-To: <20220109151414.1908259-1-romain.naour@smile.fr> References: <20220109151414.1908259-1-romain.naour@smile.fr> Message-ID: <20220109200806.GD1477939@scaer> Romain, All, On 2022-01-09 16:14 +0100, Romain Naour spake thusly: > While packaging telegraf [1] the download step failed due to a checksum > mismatch: > > go: downloading collectd.org v0.5.0 > get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 > verifying collectd.org at v0.5.0: checksum mismatch > downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= > go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= > > SECURITY ERROR > This download does NOT match an earlier download recorded in go.sum. > The bits may have been replaced on the origin server, or an attacker may > have intercepted the download attempt. > > For more information, see 'go help module-auth'. > > go-collectd was bumped in telegraf since several releases (since v1.19.0) without > any changes regarding the go-collectd hash. > > Some users reported an issue [3] when using "GOPROXY=direct" and used > "GOPROXY=proxy.golang.org" as a workaround. I'll put down what we discussed on IRC: Unfortunately, there are cases the other way around: using a proxy broke the vendoring, while a direct connection solved it. So we won't be able to satisfy both cases. Furthermore, relying on a proxy having a cached archive risks breaking in the future anyway, as that archived may get eventually get evicted out of the cache of the proxy. Or the proxy may disapear in the future, or whatever. In any case, a bad hash is most probably due to one of the following issues: - upstream messed up when adding the dependency and incorrectly copied the hash (but that should not happen as adding a dependency is supposed to be done with go tools already), - the upstream of the dependency changed their release (i.e. they re-tagged a release) - the go proxy is caching an incorrect archive (e.g. a partial download, or an older archive, or is malicious, or whatever). In any case, we can't do anything about it, and the upstream of the project has to fix the mess. So, from my point of view, this is a NACK on this patch. Regards, Yann E. MORIN. > [1] https://github.com/influxdata/telegraf/ > [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e > [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 > > Signed-off-by: Romain Naour > Cc: Thomas Petazzoni > --- > package/pkg-golang.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index 35bcb1673b..e23778d96a 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD > $(2)_DOWNLOAD_POST_PROCESS = go > $(2)_DL_ENV = \ > $(HOST_GO_COMMON_ENV) \ > - GOPROXY=direct \ > + GOPROXY=proxy.golang.org \ > BR_GOMOD=$$($(2)_GOMOD) > > # Due to vendoring, it is pretty likely that not all licenses are > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Jan 9 20:08:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 21:08:34 +0100 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory In-Reply-To: References: Message-ID: On 09/01/2022 19:18, William Tambe wrote: > I am attempting to build: > > +BR2_PACKAGE_DHCP=y > +BR2_PACKAGE_DHCP_CLIENT=y > > However it fails as follow complaining about not finding readline/history.h: > > making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate > /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc pu32 doesn't exist in Buildroot, so this may very well be due to external changes. > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 > -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include > -I../../lib/lwres/unix/include -I../../lib/lwres/include > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include > -I../../lib/dns/include > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include > -I../../lib/bind9/include > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include > -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include > -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include > -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" > -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall > -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat > -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks > \ > -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ > -c ./nsupdate.c > ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory > 104 | #include > | ^~~~~~~~~~~~~~~~~~~~ This sounds like you changed your configuration without doing 'make clean'. Is that possible? Is BR2_PACKAGE_READLINE enabled in your configuration? Has it been built? Regards, Arnout > compilation terminated. > make[5]: *** [Makefile:473: nsupdate.o] Error 1 > make[4]: *** [Makefile:79: subdirs] Error 1 > make[3]: *** [Makefile:88: subdirs] Error 1 > make[2]: *** [package/pkg-generic.mk:270: > /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] > Error 2 > make[1]: *** [Makefile:23: _all] Error 2 > make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' > make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Sun Jan 9 20:13:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:13:25 +0100 Subject: [Buildroot] [git commit] package/mesa3d: Gallium VC4 driver depends on NEON Message-ID: <20220109200716.79FDC82AB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5cdb54ed78b136c83dd44aebfa27f715cda5ea3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since version 21.3.0 of mesa3d, the generic broadcom infrastructure (which is called v3d but is used also for VC4) started using NEON instructions. This leads to assembler failures when VC4 is built for 32-bit ARM without NEON: FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c /tmp/ccAvufNv.s: Assembler messages: /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode [...] /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has NEON, so no condition is needed there. Fixes: http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/mesa3d/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index b9a5574b63..7cf5c26227 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" - depends on BR2_arm || BR2_aarch64 + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER From yann.morin.1998 at free.fr Sun Jan 9 20:14:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:14:02 +0100 Subject: [Buildroot] [PATCH] package/mesa3d: Gallium VC4 driver depends on NEON In-Reply-To: <20220109171511.3293111-1-arnout@mind.be> References: <20220109171511.3293111-1-arnout@mind.be> Message-ID: <20220109201402.GE1477939@scaer> Arnout, All, On 2022-01-09 18:15 +0100, Arnout Vandecappelle (Essensium/Mind) spake thusly: > Since version 21.3.0 of mesa3d, the generic broadcom infrastructure > (which is called v3d but is used also for VC4) started using NEON > instructions. This leads to assembler failures when VC4 is built for > 32-bit ARM without NEON: > > FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o > /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c > /tmp/ccAvufNv.s: Assembler messages: > /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode > [...] > /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode > > Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has > NEON, so no condition is needed there. > > Fixes: > http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ > http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/mesa3d/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 34b0352056..37c4f8078e 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D > > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 > bool "Gallium vc4 driver" > - depends on BR2_arm || BR2_aarch64 > + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence > select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 20:16:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:16:02 +0100 Subject: [Buildroot] [git commit] package/libvirt: disable sasl Message-ID: <20220109201037.1519B831C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba2016dc04271844416088b766284f9a22a6b58d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master sasl depends on libsasl2 (https://github.com/cyrusimap/cyrus-sasl) which is not packaged yet in buildroot and will result in the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1212:2: ERROR: Dependency "libsasl2" not found, tried pkgconfig Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libvirt/libvirt.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 0c1ee82f43..816bb0760d 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -63,6 +63,7 @@ LIBVIRT_CONF_OPTS = \ -Dpciaccess=enabled \ -Dpm_utils=disabled \ -Dsanlock=disabled \ + -Dsasl=disabled \ -Dsecdriver_apparmor=disabled \ -Dstorage_iscsi=disabled \ -Dstorage_iscsi_direct=disabled \ @@ -212,13 +213,6 @@ else LIBVIRT_CONF_OPTS += -Dnss=disabled endif -ifeq ($(BR2_PACKAGE_LIBGSASL),y) -LIBVIRT_CONF_OPTS += -Dsasl=enabled -LIBVIRT_DEPENDENCIES += libgsasl -else -LIBVIRT_CONF_OPTS += -Dsasl=disabled -endif - ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 From yann.morin.1998 at free.fr Sun Jan 9 20:15:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:15:59 +0100 Subject: [Buildroot] [git commit] package/libvirt: fix ssh2 option Message-ID: <20220109201037.0BAD382D9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c077b4a919d697c0b4f5c0c30d945418691e2e23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libvirt/libvirt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 41218c0e53..0c1ee82f43 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -220,10 +220,10 @@ LIBVIRT_CONF_OPTS += -Dsasl=disabled endif ifeq ($(BR2_PACKAGE_LIBSSH2),y) -LIBVIRT_CONF_OPTS += -Dssh2=enabled +LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 else -LIBVIRT_CONF_OPTS += -Dssh2=disabled +LIBVIRT_CONF_OPTS += -Dlibssh2=disabled endif ifeq ($(BR2_PACKAGE_LIBVIRT_LXC),y) From arnout at mind.be Sun Jan 9 20:19:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 21:19:56 +0100 Subject: [Buildroot] [RFC v2 03/12] package/mesa3d: fix gbm config warning In-Reply-To: <20210110222833.26301-4-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-4-ps.report@gmx.net> Message-ID: On 10/01/2021 23:28, Peter Seiderer wrote: > Fixes for the following defconfig: > > BR2_x86_64=y > BR2_TOOLCHAIN_BUILDROOT_GLIBC=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_TARGET_GENERIC_GETTY_PORT="tty1" > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > > this warning: > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM > Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y]) > Selected by [y]: > - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM > Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y]) > Selected by [y]: > - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] > > as BR2_PACKAGE_MESA3D_VULKAN_DRIVER selects BR2_PACKAGE_MESA3D_DRIVER which > enables possible selection of BR2_PACKAGE_MESA3D_OPENGL_EGL selecting > BR2_PACKAGE_MESA3D_GBM. > > Selecting EGL with only a vulkan driver selected gives the following configure > failure: > > .../build/mesa3d-20.3.2/meson.build:424:4: ERROR: Problem encountered: EGL requires dri > > Note dri means here an dri or gallium driver (see meson.build and look > for with_dri). > > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/mesa3d/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index d9c27f8b5c..7a976f4b2c 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -452,6 +452,8 @@ config BR2_PACKAGE_MESA3D_OPENGL_GLX > comment "OpenGL GLX support needs X11" > depends on !BR2_PACKAGE_XORG7 > > +if BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER Since there's only one symbol inside, we prefer "depends on" Applied to master with that fixed, thanks. Regards, Arnout > + > config BR2_PACKAGE_MESA3D_OPENGL_EGL > bool "OpenGL EGL" > select BR2_PACKAGE_HAS_LIBEGL > @@ -461,6 +463,8 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL > Use the Khronos EGL APIs. EGL is a window manager for OpenGL > applications similar to GLX, for X, and WGL, for Windows. > > +endif # BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > + > config BR2_PACKAGE_MESA3D_OPENGL_ES > bool "OpenGL ES" > select BR2_PACKAGE_HAS_LIBGLES > From fontaine.fabrice at gmail.com Sun Jan 9 20:20:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 21:20:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: libvirtd needs C++ Message-ID: <20220109202003.3338357-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] Selected by [y]: - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libvirt/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index a35295bc97..d7ca5f8db5 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -37,6 +37,7 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y + depends on BR2_INSTALL_LIBSTDCPP # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES @@ -50,6 +51,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. +comment "libvirtd needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON -- 2.34.1 From arnout at mind.be Sun Jan 9 20:23:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 21:23:06 +0100 Subject: [Buildroot] [RFC v2 04/12] package/mesa3d: DRI3 with GLX needs xshmfence In-Reply-To: <20210110222833.26301-5-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-5-ps.report@gmx.net> Message-ID: On 10/01/2021 23:28, Peter Seiderer wrote: > Fixes for the following defconfig: > > BR2_arm=y > BR2_cortex_a72=y > BR2_ARM_FPU_NEON_VFPV4=y > BR2_TOOLCHAIN_BUILDROOT_GLIBC=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_DRI3=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y > BR2_PACKAGE_MESA3D_OPENGL_GLX=y > > this configure error: > > .../build/mesa3d-20.3.2/meson.build:1772:6: ERROR: Dependency "xshmfence" not found, tried pkgconfig and cmake > > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/mesa3d/Config.in | 5 +++-- > package/mesa3d/mesa3d.mk | 6 +++--- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 7a976f4b2c..8a01fa95e2 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -17,6 +17,8 @@ if BR2_PACKAGE_MESA3D > > config BR2_PACKAGE_MESA3D_DRI3 > bool "Enable DRI3 support" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX > + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_MESA3D_OPENGL_GLX This was already done, but without the depends on and without the if GLX. I'm not entirely sure if the if GLX is actually needed. But really, mesa3d needs a big overhaul where the Config.in is compared to the meson.build to check how the dependencies and interactions *really* work. Therefore, I've marked this patch as Superseded. Regards, Arnout > help > Enable DRI3 support. > > @@ -398,7 +400,7 @@ comment "Vulkan drivers" > config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL > bool "Vulkan Intel driver" > depends on BR2_i386 || BR2_x86_64 > - # depends on BR2_TOOLCHAIN_HAS_SYNC_4 because of libxshmfence only > + # depends on BR2_TOOLCHAIN_HAS_SYNC_4 because of dri3/libxshmfence only > # in case GLX is enabled but the following results in 'recursive > # dependency detected!', so simple depend always on BR2_TOOLCHAIN_HAS_SYNC_4 > # depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX # libxshmfence in case GLX is enabled > @@ -408,7 +410,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL > select BR2_PACKAGE_EXPAT > select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_MESA3D_OPENGL_GLX > select BR2_PACKAGE_MESA3D_VULKAN_DRIVER > - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_MESA3D_OPENGL_GLX > help > Vulkan driver for Intel hardware from Ivy Bridge onward. > > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 967b86810f..31f1c12d63 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -38,6 +38,9 @@ endif > > ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) > MESA3D_CONF_OPTS += -Ddri3=enabled > +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) > +MESA3D_DEPENDENCIES += xlib_libxshmfence > +endif > else > MESA3D_CONF_OPTS += -Ddri3=disabled > endif > @@ -146,9 +149,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers= > else > -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)$(BR2_PACKAGE_MESA3D_OPENGL_GLX),yy) > -MESA3D_DEPENDENCIES += xlib_libxshmfence > -endif > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) > endif > From yann.morin.1998 at free.fr Sun Jan 9 20:17:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:17:52 +0100 Subject: [Buildroot] [git commit] package/libvirt: bump to version 7.10.0 Message-ID: <20220109201729.CD73382B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5c69dc19fb0f6c7aabadb6700dac527304f54a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.com/libvirt/libvirt/-/blob/v7.10.0/NEWS.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libvirt/libvirt.hash | 2 +- package/libvirt/libvirt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.hash b/package/libvirt/libvirt.hash index e8cbb34e2a..de9ebff564 100644 --- a/package/libvirt/libvirt.hash +++ b/package/libvirt/libvirt.hash @@ -1,3 +1,3 @@ # locally computed -sha256 1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2 libvirt-7.7.0.tar.xz +sha256 cb318014af097327928c6e3d72922e3be02a3e6401247b2aa52d9ab8e0b480f9 libvirt-7.10.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 816bb0760d..7b0ed5e52e 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVIRT_VERSION = 7.7.0 +LIBVIRT_VERSION = 7.10.0 LIBVIRT_SITE = https://libvirt.org/sources LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Sun Jan 9 20:24:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:24:19 +0100 Subject: [Buildroot] [PATCH 1/3] package/libvirt: fix ssh2 option In-Reply-To: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Message-ID: <20220109202419.GF1477939@scaer> Fabrice, All, On 2022-01-09 21:00 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since commit > fbf25acfbfd5a73b3560918bea081768abbe5723: > > output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Series of 3 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libvirt/libvirt.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk > index 41218c0e53..0c1ee82f43 100644 > --- a/package/libvirt/libvirt.mk > +++ b/package/libvirt/libvirt.mk > @@ -220,10 +220,10 @@ LIBVIRT_CONF_OPTS += -Dsasl=disabled > endif > > ifeq ($(BR2_PACKAGE_LIBSSH2),y) > -LIBVIRT_CONF_OPTS += -Dssh2=enabled > +LIBVIRT_CONF_OPTS += -Dlibssh2=enabled > LIBVIRT_DEPENDENCIES += libssh2 > else > -LIBVIRT_CONF_OPTS += -Dssh2=disabled > +LIBVIRT_CONF_OPTS += -Dlibssh2=disabled > endif > > ifeq ($(BR2_PACKAGE_LIBVIRT_LXC),y) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Jan 9 20:25:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 21:25:16 +0100 Subject: [Buildroot] [git commit] package/mesa3d: fix gbm config warning Message-ID: <20220109201912.7439582B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69d5165bc44276e580690dad234abe9a4298f3b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes for the following defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y this warning: WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y]) Selected by [y]: - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y]) Selected by [y]: - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] as BR2_PACKAGE_MESA3D_VULKAN_DRIVER selects BR2_PACKAGE_MESA3D_DRIVER which enables possible selection of BR2_PACKAGE_MESA3D_OPENGL_EGL selecting BR2_PACKAGE_MESA3D_GBM. Selecting EGL with only a vulkan driver selected gives the following configure failure: .../build/mesa3d-20.3.2/meson.build:424:4: ERROR: Problem encountered: EGL requires dri Note dri means here an dri or gallium driver (see meson.build and look for with_dri). Signed-off-by: Peter Seiderer [Arnout: convert if to depends] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7cf5c26227..e41da562dc 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -432,6 +432,7 @@ comment "OpenGL GLX support needs X11" config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_HAS_LIBEGL_WAYLAND From arnout at mind.be Sun Jan 9 20:29:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 21:29:31 +0100 Subject: [Buildroot] [git commit] package/vulkan-headers: new package Message-ID: <20220109202417.2D2F282AB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb588f078045082e48ebcf8e62f486888ad2956b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer [Arnout: update to 1.2.203] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/vulkan-headers/Config.in | 7 +++++++ package/vulkan-headers/vulkan-headers.hash | 3 +++ package/vulkan-headers/vulkan-headers.mk | 13 +++++++++++++ 4 files changed, 24 insertions(+) diff --git a/package/Config.in b/package/Config.in index edae7e4f62..5e01187b83 100644 --- a/package/Config.in +++ b/package/Config.in @@ -353,6 +353,7 @@ comment "Graphic libraries" source "package/sdl2_net/Config.in" source "package/sdl2_ttf/Config.in" source "package/tk/Config.in" + source "package/vulkan-headers/Config.in" comment "Other GUIs" source "package/qt5/Config.in" diff --git a/package/vulkan-headers/Config.in b/package/vulkan-headers/Config.in new file mode 100644 index 0000000000..c0fc8f20b0 --- /dev/null +++ b/package/vulkan-headers/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_VULKAN_HEADERS + bool "vulkan-headers" + help + The Khronos official Vulkan header files and API + registry. + + https://github.com/KhronosGroup/Vulkan-Headers diff --git a/package/vulkan-headers/vulkan-headers.hash b/package/vulkan-headers/vulkan-headers.hash new file mode 100644 index 0000000000..c43736405c --- /dev/null +++ b/package/vulkan-headers/vulkan-headers.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7239108c372f1fbe365bd8d1610ca2bb4e72b73b2151f2551bf9df54dd539639 vulkan-headers-1.2.203.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/vulkan-headers/vulkan-headers.mk b/package/vulkan-headers/vulkan-headers.mk new file mode 100644 index 0000000000..13cae1e685 --- /dev/null +++ b/package/vulkan-headers/vulkan-headers.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# vulkan-headers +# +################################################################################ + +VULKAN_HEADERS_VERSION = 1.2.203 +VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,v$(VULKAN_HEADERS_VERSION)) +VULKAN_HEADERS_LICENSE = Apache-2.0 +VULKAN_HEADERS_LICENSE_FILES = LICENSE.txt +VULKAN_HEADERS_INSTALL_STAGING = YES + +$(eval $(cmake-package)) From arnout at mind.be Sun Jan 9 20:30:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 21:30:35 +0100 Subject: [Buildroot] [RFC v2 05/12] package/vulkan-headers: new package In-Reply-To: <20210110222833.26301-6-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-6-ps.report@gmx.net> Message-ID: On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - fix license SPDX (Yann E. MORIN) > --- > package/Config.in | 1 + > package/vulkan-headers/Config.in | 7 +++++++ > package/vulkan-headers/vulkan-headers.hash | 3 +++ > package/vulkan-headers/vulkan-headers.mk | 13 +++++++++++++ > 4 files changed, 24 insertions(+) > create mode 100644 package/vulkan-headers/Config.in > create mode 100644 package/vulkan-headers/vulkan-headers.hash > create mode 100644 package/vulkan-headers/vulkan-headers.mk > > diff --git a/package/Config.in b/package/Config.in > index 9ed02ec890..9a91e6324c 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -338,6 +338,7 @@ comment "Graphic libraries" > source "package/sdl2_net/Config.in" > source "package/sdl2_ttf/Config.in" > source "package/tk/Config.in" > + source "package/vulkan-headers/Config.in" > > comment "Other GUIs" > source "package/qt5/Config.in" > diff --git a/package/vulkan-headers/Config.in b/package/vulkan-headers/Config.in > new file mode 100644 > index 0000000000..c0fc8f20b0 > --- /dev/null > +++ b/package/vulkan-headers/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_VULKAN_HEADERS > + bool "vulkan-headers" > + help > + The Khronos official Vulkan header files and API > + registry. > + > + https://github.com/KhronosGroup/Vulkan-Headers > diff --git a/package/vulkan-headers/vulkan-headers.hash b/package/vulkan-headers/vulkan-headers.hash > new file mode 100644 > index 0000000000..678a38e0d4 > --- /dev/null > +++ b/package/vulkan-headers/vulkan-headers.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 3f9435a93ba13d94d0c3265a47e0436579e46bb9ca085e9b16a753458e4d79d2 vulkan-headers-1.2.165.tar.gz > +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt > diff --git a/package/vulkan-headers/vulkan-headers.mk b/package/vulkan-headers/vulkan-headers.mk > new file mode 100644 > index 0000000000..48d390a581 > --- /dev/null > +++ b/package/vulkan-headers/vulkan-headers.mk > @@ -0,0 +1,13 @@ > +################################################################################ > +# > +# vulkan-headers > +# > +################################################################################ > + > +VULKAN_HEADERS_VERSION = 1.2.165 There's a 1.2.203 now, so I bumped to that version and applied to master, thanks. Regards, Arnout > +VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,v$(VULKAN_HEADERS_VERSION)) > +VULKAN_HEADERS_LICENSE = Apache-2.0 > +VULKAN_HEADERS_LICENSE_FILES = LICENSE.txt > +VULKAN_HEADERS_INSTALL_STAGING = YES > + > +$(eval $(cmake-package)) > From nolange79 at gmail.com Sun Jan 9 20:37:53 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 21:37:53 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/systemd: adopt odering in nsswitch to newer versions In-Reply-To: References: <20211203223127.274985-1-nolange79@gmail.com> <20211203223127.274985-3-nolange79@gmail.com> Message-ID: Am So., 9. Jan. 2022 um 13:55 Uhr schrieb Arnout Vandecappelle : > > > > On 03/12/2021 23:31, Norbert Lange wrote: > > This modifies the order of the nss modules, reflecting the current > > state of the documentation. > > > > nss-mymachines lost support for resolution of users and groups, > > and now only does resolution of hostnames. Changed in v246. > > > > Multiple changes in regards to nss-myhostname now recommend placement > > after nss-files and before nss-dns. See commits ce266330, f918c67. > > > > nss-resolve handles the nss-files logic itself, and its suggested to > > move in front of nss-files. Changed in v249. > > > > Signed-off-by: Norbert Lange > > This patch was superseded by [1], which is marked as v2 just like this patch. > I hope you understand that this is a little confusing for the maintainers (or > for anyone reviewing it). Yeah sorry, still got my troubles with the mailing list conventions. > > If you want to make life easier for use, please: > > - Re-post the entire series when one patch changes. > > - Make sure you include a patch changelog (you do that, I'm just saying it here > for completeness). Patches which haven't changed can have a "No changes" > version, but personally I don't care too much about that (it's implied by the > fact that there is a patch changelog but this particular version is not > included). That saves a bit of time during the rebase since you don't have to > reword every commit. ok, so far I thought I should not change the version unless the commit changed. > > - Mark the old series as Superseded in patchwork. When you create an account, > you can always update your own patches. > > I applied the series (including the [1]) to master. There's one comment I'll > post separately. > > Regards, > Arnout > > [1] > https://patchwork.ozlabs.org/project/buildroot/patch/20211203230919.683527-1-nolange79 at gmail.com/ > > > > > --- > > package/systemd/systemd.mk | 8 +++----- > > 1 file changed, 3 insertions(+), 5 deletions(-) > > > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index 373e5c82bb..16202d4ac9 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -563,13 +563,11 @@ define SYSTEMD_INSTALL_NSSCONFIG_HOOK > > -e '/^gshadow:/ {/systemd/! s/$$/ systemd/}' \ > > $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ > > -e '/^hosts:/ s/[[:space:]]*mymachines//' \ > > - -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ > > + -e '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' ) \ > > $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ > > - -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ > > + -e '/^hosts:/ {/myhostname/! s/files/files myhostname/}' ) \ > > $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ > > - -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ > > - -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ > > - -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ > > + -e '/^hosts:/ {/mymachines/! s/^\(hosts:[[:space:]]*\)/\1 mymachines/}' ) \ > > $(TARGET_DIR)/etc/nsswitch.conf > > endef > > > > From yann.morin.1998 at free.fr Sun Jan 9 20:37:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:37:54 +0100 Subject: [Buildroot] [git commit] package/avrdude: bump to version 6.4 Message-ID: <20220109203223.54E6E82156@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7f3b75d59bd3ae480fe99fc435ae0c715f9f204 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The project moved to GitHub, hence change the download location. Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- package/avrdude/avrdude.hash | 4 ++-- package/avrdude/avrdude.mk | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index ec43355451..1c7758afcd 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a09913450c6457c3fe8d43d5141de579d4e57d67e593e7399a4cd3768cc60f9 avrdude-r1450-br2.tar.gz -sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 avrdude/COPYING +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz +sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index ae623a7929..5bbbc4e8c2 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,13 +4,12 @@ # ################################################################################ -AVRDUDE_VERSION = r1450 -AVRDUDE_SITE_METHOD = svn -AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk +AVRDUDE_VERSION = v6.4 +AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ -AVRDUDE_LICENSE_FILES = avrdude/COPYING -AVRDUDE_SUBDIR = avrdude -# Sources coming from svn, without generated configure and Makefile.in +AVRDUDE_LICENSE_FILES = COPYING + +# Sources coming from git, without generated configure and Makefile.in # files. AVRDUDE_AUTORECONF = YES AVRDUDE_CONF_OPTS = --enable-linuxgpio From yann.morin.1998 at free.fr Sun Jan 9 20:39:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:39:16 +0100 Subject: [Buildroot] [PATCH] package/avrdude: bump to version 6.4 In-Reply-To: <20220109140421.27820-1-yegorslists@googlemail.com> References: <20220109140421.27820-1-yegorslists@googlemail.com> Message-ID: <20220109203916.GG1477939@scaer> Yegor, All, On 2022-01-09 15:04 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > The project moved to GitHub, hence change the download location. > > Signed-off-by: Yegor Yefremov Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/avrdude/avrdude.hash | 4 ++-- > package/avrdude/avrdude.mk | 11 +++++------ > 2 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash > index ec43355451..1c7758afcd 100644 > --- a/package/avrdude/avrdude.hash > +++ b/package/avrdude/avrdude.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 2a09913450c6457c3fe8d43d5141de579d4e57d67e593e7399a4cd3768cc60f9 avrdude-r1450-br2.tar.gz > -sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 avrdude/COPYING > +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz > +sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index ae623a7929..5bbbc4e8c2 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -4,13 +4,12 @@ > # > ################################################################################ > > -AVRDUDE_VERSION = r1450 > -AVRDUDE_SITE_METHOD = svn > -AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk > +AVRDUDE_VERSION = v6.4 > +AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) > AVRDUDE_LICENSE = GPL-2.0+ > -AVRDUDE_LICENSE_FILES = avrdude/COPYING > -AVRDUDE_SUBDIR = avrdude > -# Sources coming from svn, without generated configure and Makefile.in > +AVRDUDE_LICENSE_FILES = COPYING > + > +# Sources coming from git, without generated configure and Makefile.in > # files. > AVRDUDE_AUTORECONF = YES > AVRDUDE_CONF_OPTS = --enable-linuxgpio > -- > 2.17.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 20:47:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:47:19 +0100 Subject: [Buildroot] [git commit] package/libvirt: libvirtd needs C++ for nmap-ncat Message-ID: <20220109204212.4FD7E82984@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dff1be05e906f5c3cfd56ebc1458579635b4ca7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] Selected by [y]: - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: C++ only needed without NETCAT_OPENBSD] Signed-off-by: Yann E. MORIN --- package/libvirt/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index e75f1cf15f..103d1b9543 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,6 +44,7 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y + depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES @@ -57,6 +58,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. +comment "libvirtd needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD + # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON From yann.morin.1998 at free.fr Sun Jan 9 20:48:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:48:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: libvirtd needs C++ In-Reply-To: <20220109202003.3338357-1-fontaine.fabrice@gmail.com> References: <20220109202003.3338357-1-fontaine.fabrice@gmail.com> Message-ID: <20220109204853.GH1477939@scaer> Fabrice, All, You little joker, sending a fix right when I was applying your bump... ;-) On 2022-01-09 21:20 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since commit > fbf25acfbfd5a73b3560918bea081768abbe5723: > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP > Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] > Selected by [y]: > - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/libvirt/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in > index a35295bc97..d7ca5f8db5 100644 > --- a/package/libvirt/Config.in > +++ b/package/libvirt/Config.in > @@ -37,6 +37,7 @@ if BR2_PACKAGE_LIBVIRT > config BR2_PACKAGE_LIBVIRT_DAEMON > bool "libvirtd" > default y > + depends on BR2_INSTALL_LIBSTDCPP # nmap In fact, the requirement on C++ is due to nmap-ncat, which is enabled only if netcat-openbsd is not available, so I relaxed the requirement accordingly. Applied to master, thanks. Regards, Yann E. MORIN. > select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > select BR2_PACKAGE_DNSMASQ > select BR2_PACKAGE_EBTABLES > @@ -50,6 +51,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON > Build the libvirt daemon (libvirtd) otherwise build only the > utility programs. > > +comment "libvirtd needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > + > # Stateful drivers are useful only when building the daemon. > if BR2_PACKAGE_LIBVIRT_DAEMON > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 20:53:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:53:40 +0100 Subject: [Buildroot] [git commit] package/gtest: host-gtest install like a normal cmake package Message-ID: <20220109205306.8D25B82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0f9e2447d57194f0b02edb93cd16a677ebb326c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, host-gtest does not actually build and install gtest libraries or header files; it just installs the gmock_gen stuff. Host gtest can however be used by packages to build and run their unit-tests natively. This patch will now build and install gtest to the host like a normal cmake package. To limit the disruption for existing users of host-gtest, the gmock_gen stuff is still installed (as a post-install hook now). Signed-off-by: Paul Soucy Signed-off-by: Yann E. MORIN --- package/gtest/gtest.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 6447954e36..673e626c45 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -52,14 +52,14 @@ else GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF endif -define HOST_GTEST_INSTALL_CMDS +define HOST_GTEST_POST_INSTALL_PYTHON $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ $(HOST_DIR)/bin/gmock_gen cp -rp $(@D)/googlemock/scripts/generator/cpp \ $(HOST_GTEST_GMOCK_PYTHONPATH) endef +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON + $(eval $(cmake-package)) -# The host package does not build anything, just installs gmock_gen stuff, so -# it does not need to be a host-cmake-package. -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From yegorslists at googlemail.com Sun Jan 9 20:59:46 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Sun, 9 Jan 2022 21:59:46 +0100 Subject: [Buildroot] [PATCH] package/avrdude: add support for hidapi Message-ID: <20220109205946.14456-1-yegorslists@googlemail.com> From: Yegor Yefremov If BR2_PACKAGE_HIDAPI is selected, add it to avrdude build dependencies. Signed-off-by: Yegor Yefremov --- package/avrdude/avrdude.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 5bbbc4e8c2..63cc3bbc7e 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -28,6 +28,10 @@ else ifeq ($(BR2_PACKAGE_LIBFTDI),y) AVRDUDE_DEPENDENCIES += libftdi endif +ifeq ($(BR2_PACKAGE_HIDAPI),y) +AVRDUDE_DEPENDENCIES += hidapi +endif + # if /etc/avrdude.conf exists, the installation process creates a # backup file, which we do not want in the context of Buildroot. define AVRDUDE_REMOVE_BACKUP_FILE -- 2.17.0 From yann.morin.1998 at free.fr Sun Jan 9 21:00:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 22:00:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package In-Reply-To: <20201216174404.47363-1-paul.soucy@sense.com> References: <20201216174404.47363-1-paul.soucy@sense.com> Message-ID: <20220109210020.GI1477939@scaer> Paul, All, Sorry for the long delay... On 2020-12-16 12:44 -0500, Paul Soucy spake thusly: > host-gtest does not actually build and install gtest libraries or header files, it just installs the gmock_gen stuff. This patch will now build and install gtest to the host like a normal cmake package. I rewrapped the commit log, and slightly extended it with the information you rpovided elsewhere in the thread. > Signed-off-by: Paul Soucy > --- > package/gtest/gtest.mk | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk > index 7f967b8bfb..f35ae63383 100644 > --- a/package/gtest/gtest.mk > +++ b/package/gtest/gtest.mk > @@ -88,14 +88,15 @@ else > GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF > endif > > -define HOST_GTEST_INSTALL_CMDS > +define HOST_GTEST_POST_INSTALL_PYTHON > $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ > $(HOST_DIR)/bin/gmock_gen > cp -rp $(@D)/googlemock/scripts/generator/cpp \ > $(HOST_GTEST_GMOCK_PYTHONPATH) > endef > > +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON > + > + $ make check-package package/gtest/gtest.mk:64: consecutive empty lines Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > $(eval $(cmake-package)) > -# The host package does not build anything, just installs gmock_gen stuff, so > -# it does not need to be a host-cmake-package. > -$(eval $(host-generic-package)) > +$(eval $(host-cmake-package)) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Jan 9 21:00:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:00:31 +0100 Subject: [Buildroot] [RFC v2 06/12] package/vulkan-loader: new package In-Reply-To: <20210110222833.26301-7-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-7-ps.report@gmx.net> Message-ID: <0945e7b9-2741-2ecc-1ad5-8fbe54c46da5@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - fix license SPDX (Yann E. MORIN) > - add sob line > --- > package/Config.in | 1 + > .../0001-loader-fix-asm_offset-call.patch | 32 +++++++++++++++++++ > package/vulkan-loader/Config.in | 14 ++++++++ > package/vulkan-loader/vulkan-loader.hash | 3 ++ > package/vulkan-loader/vulkan-loader.mk | 22 +++++++++++++ > 5 files changed, 72 insertions(+) > create mode 100644 package/vulkan-loader/0001-loader-fix-asm_offset-call.patch > create mode 100644 package/vulkan-loader/Config.in > create mode 100644 package/vulkan-loader/vulkan-loader.hash > create mode 100644 package/vulkan-loader/vulkan-loader.mk > > diff --git a/package/Config.in b/package/Config.in > index 9a91e6324c..86676b57ef 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -339,6 +339,7 @@ comment "Graphic libraries" > source "package/sdl2_ttf/Config.in" > source "package/tk/Config.in" > source "package/vulkan-headers/Config.in" > + source "package/vulkan-loader/Config.in" > > comment "Other GUIs" > source "package/qt5/Config.in" > diff --git a/package/vulkan-loader/0001-loader-fix-asm_offset-call.patch b/package/vulkan-loader/0001-loader-fix-asm_offset-call.patch > new file mode 100644 > index 0000000000..d62b9390d8 > --- /dev/null > +++ b/package/vulkan-loader/0001-loader-fix-asm_offset-call.patch > @@ -0,0 +1,32 @@ > +From 45098898f7fa25dfd12d2c4f1aed889f678aa870 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Wed, 23 Dec 2020 14:46:02 +0100 > +Subject: [PATCH] loader: fix asm_offset call > + > +Disable assembler usage (not cross compile capable): > + > + [ 21%] Generating gen_defines.asm > + /bin/sh: asm_offset: command not found > + make[3]: *** [loader/CMakeFiles/loader_asm_gen_files.dir/build.make:80: loader/gen_defines.asm] Error 127 > + > +Signed-off-by: Peter Seiderer > +--- > + loader/CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt > +index ba9f460f1..dbebfb058 100644 > +--- a/loader/CMakeLists.txt > ++++ b/loader/CMakeLists.txt > +@@ -187,7 +187,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux > + endif() > + set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) > + try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/asm_test.S) > +- if(ASSEMBLER_WORKS) > ++ if(FALSE) This doesn't look OK to me. With the assembler disabled, you get this warning: Note that this may be unsafe, as the C code requires tail-call optimizations to remove the stack frame for certain calls. If the compiler does not do this, then unknown device extensions will suffer from a corrupted stack. Since CMake doesn't make mixed host and target compilation possible, I see two solutions. 1. A simple solution that is a bit of a hack. In a _PRE_BUILD_HOOK, manually build the asm_offset offset program. It actually needs the Vulkan headers, so we also need host-vulkan-headers. We would normally use host-vulkan-loader to build the program, but in this case it's so simple that manual compilation is much easier. Install the program in the source directory where it's expected. Most likely it will already work like that because the program is more recent than the source. If not, solution 2 is needed. 2. Add host-vulkan-loader to build asm_offset. Since we only need asm_offset, it's easier to use a generic-package rather than cmake-package - especially since the program doesn't get installed by cmake anyway. In this case, you'll need to add a new variable to CMakeLists.txt that allows to pass the path to an external asm_offset and point that to HOST_DIR. In addition, the loader only supports aarch64 and x86, so I think the whole package should depend on that. I've marked as Changes Requested. > + set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas.S) > + add_executable(asm_offset asm_offset.c) > + target_link_libraries(asm_offset Vulkan::Headers) > +-- > +2.29.2 > + > diff --git a/package/vulkan-loader/Config.in b/package/vulkan-loader/Config.in > new file mode 100644 > index 0000000000..9c215dc9ce > --- /dev/null > +++ b/package/vulkan-loader/Config.in > @@ -0,0 +1,14 @@ > +config BR2_PACKAGE_VULKAN_LOADER > + bool "vulkan-loader" > + depends on BR2_INSTALL_LIBSTDCPP AFAICS C++ is only needed for tests, so you could patch CMakeLists.txt with enable_language(C) and only add enable_language(CXX) if BUILD_TESTS is ON. Regards, Arnout > + depends on !BR2_STATIC_LIBS # dlfcn.h > + depends on BR2_TOOLCHAIN_HAS_THREADS > + select BR2_PACKAGE_VULKAN_HEADERS > + help > + The Khronos official Vulkan ICD desktop loader. > + > + https://github.com/KhronosGroup/Vulkan-Loader > + > +comment "vulkan-loader needs a toolchain w/ C++, dynamic library, threads" > + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/vulkan-loader/vulkan-loader.hash b/package/vulkan-loader/vulkan-loader.hash > new file mode 100644 > index 0000000000..c70ed90be6 > --- /dev/null > +++ b/package/vulkan-loader/vulkan-loader.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 e582dce35051a34af82db2a8fcd38fbc5837b4506e76e6cda685dca02dee01c7 vulkan-loader-1.2.162.tar.gz > +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece LICENSE.txt > diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk > new file mode 100644 > index 0000000000..9c9ccb2458 > --- /dev/null > +++ b/package/vulkan-loader/vulkan-loader.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# vulkan-loader > +# > +################################################################################ > + > +VULKAN_LOADER_VERSION = 1.2.162 > +VULKAN_LOADER_SITE = $(call github,KhronosGroup,Vulkan-Loader,v$(VULKAN_LOADER_VERSION)) > +VULKAN_LOADER_LICENSE = Apache-2.0 > +VULKAN_LOADER_LICENSE_FILES = LICENSE.txt > +VULKAN_LOADER_INSTALL_STAGING = YES > + > +VULKAN_LOADER_DEPENDENCIES = vulkan-headers > + > +VULKAN_LOADER_CONF_OPTS += \ > + -DBUILD_WSI_XCB_SUPPORT=OFF \ > + -DBUILD_WSI_XLIB_SUPPORT=OFF \ > + -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ > + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > + -DUSE_CCACHE=OFF > + > +$(eval $(cmake-package)) > From nolange79 at gmail.com Sun Jan 9 21:01:42 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 22:01:42 +0100 Subject: [Buildroot] [PATCH v3] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: References: <20220109110736.3963-1-nolange79@gmail.com> Message-ID: Am So., 9. Jan. 2022 um 15:49 Uhr schrieb Arnout Vandecappelle : > > Hi Norbert, > > Applied to master, thanks. I have a bunch of stylistic remarks, but it's > nitpicky so I didn't apply them. The only thing I did is the indentation (4 > spaces in shell scripts). > > > On 09/01/2022 12:07, Norbert Lange wrote: > [snip] > > diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh > > new file mode 100644 > > index 0000000000..7e9b02cc0a > > --- /dev/null > > +++ b/package/systemd/fakeroot_tmpfiles.sh > > @@ -0,0 +1,57 @@ > > +#!/bin/sh > > +# > > +# The systemd-tmpfiles has the ability to grab information > > +# from the filesystem (instead from the running system). > > +# > > +# However there are a few specifiers that *always* will grab > > +# information from the running system examples are %a, %b, %m, %H > > +# (Architecture, Boot UUID, Machine UUID, Hostname). > > +# > > +# See [1] for historic information. > > +# > > +# This script will (conservatively) skip tmpfiles lines that have > > +# such an specifier to prevent leaking host information. > > Instead of skipping, perhaps we should terminate with an error? Or would that > mean that it never passes with current systemd? Nope, there are for example directories created for each boot with an boot uuid, those should be skipped. systemd-tmpfilesd will create those on the real boot, so its no error, just something you cant do ahead of time. > > > +# > > +# shell expansion is critical to be POSIX compliant, > > +# this script wont work with zsh in its default mode for example. > > I don't get this... If the script doesn't work with /bin/sh == zsh, maybe use > /usr/bin/env bash instead? (We already check for bash in dependencies.sh so it's > fine to require it.) Sorry, worded badly. the script should run with any shell, as they will use a POSIX compliant mode if run as /bin/sh. You cant copy paste the lines into a zsh terminal, as then it would not work due to some differences in parameter expansion. > > > +# > > +# The script takes several measures to handle more complex stuff > > +# like passing this correctly: > > +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n > > +# > > +# [1] - https://github.com/systemd/systemd/pull/16187 > > The end of that is that Lennart merged something which does (AFAIU) part of > what you need done. Would it be possible to rebase your changes on top of that? That's more or less what I did with v3 of the buildroot patch. Lennart did his own Implementation of handling a staged rootfs. The things he did not include, he did so on purpose (as noted in the PR). Notably, you will end up creating some directories containing the boot UUID of your running system. Filtering out the offending lines seems to me the smallest amount of pain. > > > + > > +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || > > + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles > > + > > +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || > > I don't understand why you need "${1-}" and not simply "$1". In this context > (with the quotes around it) there is no difference at all between the two, right? Yes, I typically write my scripts to not fault on "set -e". No difference if this mode is not enabled. > > Also, I prefer > > ROOTFS="$1" > > and use $ROOTFS further down; IMHO that's more readable. Yeah, its a reasonably simple script tho ;) > > > > + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } > > + > > +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | > > + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | > > + while read -r line; do > > + # it is allowed to use quotes around arguments, > > + # so let the shell pack the arguments > > + eval "set -- $line" > > + > > + # dont output warnings for directories we dont process > > + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && > > + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && > > + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || > > + continue > > + > > + # blank out all specs that are ok to use, > > + # test if some remain. (Specs up to date with v250) > > + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then > > + # no "bad" specifiers, pass the line unmodified > > + eval "printf '%s\n' '$line'" > > + else > > + # warn > > + eval "printf 'ignored spec: %s\n' '$line' 1>&2" > > + fi > > + done | > > +\ > > +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ > > + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ > > + --exclude-prefix=/tmp --exclude-prefix=/mnt \ > > All these excludes are already excluded above from the "directories we don't > process" block, so maybe it can be removed? Yep. doesn't hurt having them tho > > OTOH, if we can later get upstream to no longer have those ignored specs, we > can remove the preprocessing and it's handy to have the exclude statements already. upstream does just do the wrong thing *for us* on those specs and its unlikely to change, the way it is now makes sense for running in containers. > Anyway, I added a comment to the comment block in the beginning to explain why > they're excluded: > > # tmpfs directories (/tmp, /proc, ...) are skipped since they're not > # relevant for the rootfs image. > > > + - > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index 7bf8018438..e136229c8e 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -709,10 +709,15 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > endef > > SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > > > +define SYSTEMD_CREATE_TMPFILES_HOOK > > + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ > > + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) > > Since the script has a shebang line, I remove the /bin/sh here and made it > executable. Sure > > > +endef > > + > > define SYSTEMD_PRESET_ALL > > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > > endef > > -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL > > We normally add the hook immediately after the definition of the hook, so I > changed that as well. Ok > Regards, > Arnout > > PS There's no need to keep Maxime in Cc, he's no longer involved in Buildroot > at all. > > > > > SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) > > SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) > > @@ -783,7 +788,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > > -Dvconsole=false \ > > -Dquotacheck=false \ > > -Dsysusers=false \ > > - -Dtmpfiles=false \ > > + -Dtmpfiles=true \ > > -Dimportd=false \ > > -Dhwdb=false \ > > -Drfkill=false \ > > Maybe its easier with an example, these are the lines I get when running buildroot: PATH="/tmp/ZBuild/host/bin:/tmp/ZBuild/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" FAKEROOTDONTTRYCHOWN=1 /tmp/ZBuild/host/bin/fakeroot -- /tmp/ZBuild/build/buildroot-fs/tar/fakeroot rootdir=/tmp/ZBuild/build/buildroot-fs/tar/target table='/tmp/ZBuild/build/buildroot-fs/full_devices_table.txt' ignored spec: h /var/log/journal/%m - - - - +C ignored spec: x /var/tmp/systemd-private-%b-* ignored spec: X /var/tmp/systemd-private-%b-*/tmp ignored spec: x /var/lib/systemd/coredump/.#core*.%b* ignored spec: z /var/log/journal/%m 2755 root systemd-journal - - ignored spec: z /var/log/journal/%m/system.journal 0640 root systemd-journal - - Norbert From arnout at mind.be Sun Jan 9 21:02:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:02:38 +0100 Subject: [Buildroot] [RFC v2 07/12] package/vulkan-tools: new package In-Reply-To: <20210110222833.26301-8-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-8-ps.report@gmx.net> Message-ID: <249a1325-0fe2-0691-b599-950d839665d4@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Rest of the series is Changes Requested because it all depends on vulkan-loader. Regards, Arnout > --- > Changes v1 -> v2: > - fix license SPDX (Yann E. MORIN) > - disable ICD (as it is only a mock ICD for testing purpouse) > --- > package/Config.in | 1 + > package/vulkan-tools/Config.in | 17 +++++++++++++++++ > package/vulkan-tools/vulkan-tools.hash | 3 +++ > package/vulkan-tools/vulkan-tools.mk | 25 +++++++++++++++++++++++++ > 4 files changed, 46 insertions(+) > create mode 100644 package/vulkan-tools/Config.in > create mode 100644 package/vulkan-tools/vulkan-tools.hash > create mode 100644 package/vulkan-tools/vulkan-tools.mk > > diff --git a/package/Config.in b/package/Config.in > index 86676b57ef..b156d8de1a 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -340,6 +340,7 @@ comment "Graphic libraries" > source "package/tk/Config.in" > source "package/vulkan-headers/Config.in" > source "package/vulkan-loader/Config.in" > + source "package/vulkan-tools/Config.in" > > comment "Other GUIs" > source "package/qt5/Config.in" > diff --git a/package/vulkan-tools/Config.in b/package/vulkan-tools/Config.in > new file mode 100644 > index 0000000000..54fa539dab > --- /dev/null > +++ b/package/vulkan-tools/Config.in > @@ -0,0 +1,17 @@ > +config BR2_PACKAGE_VULKAN_TOOLS > + bool "vulkan-tools" > + depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader > + depends on !BR2_STATIC_LIBS # vullan-loader > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 > + depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader > + select BR2_PACKAGE_VULKAN_HEADERS > + select BR2_PACKAGE_VULKAN_LOADER > + > + help > + The Khronos official Vulkan Tools and Utilities. > + > + https://github.com/KhronosGroup/Vulkan-Tools > + > +comment "vulkan-tools needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.9" > + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/vulkan-tools/vulkan-tools.hash b/package/vulkan-tools/vulkan-tools.hash > new file mode 100644 > index 0000000000..a4cf97ab34 > --- /dev/null > +++ b/package/vulkan-tools/vulkan-tools.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 98a3a00471da65df833b4ffeb1ab29ec1d169d5feab54270cf4cd8f50f82e682 vulkan-tools-1.2.162.tar.gz > +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt > diff --git a/package/vulkan-tools/vulkan-tools.mk b/package/vulkan-tools/vulkan-tools.mk > new file mode 100644 > index 0000000000..129efddf3b > --- /dev/null > +++ b/package/vulkan-tools/vulkan-tools.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# vulkan-tools > +# > +################################################################################ > + > +VULKAN_TOOLS_VERSION = 1.2.162 > +VULKAN_TOOLS_SITE = $(call github,KhronosGroup,Vulkan-Tools,v$(VULKAN_TOOLS_VERSION)) > +VULKAN_TOOLS_LICENSE = Apache-2.0 > +VULKAN_TOOLS_LICENSE_FILES = LICENSE.txt > + > +VULKAN_TOOLS_DEPENDENCIES = vulkan-headers vulkan-loader > + > +VULKAN_TOOLS_CONF_OPTS += \ > + -DBUILD_CUBE=OFF \ > + -DBUILD_VULKANINFO=ON \ > + -DBUILD_ICD=OFF \ > + -DINSTALL_ICD=OFF \ > + -DBUILD_WSI_XCB_SUPPORT=OFF \ > + -DBUILD_WSI_XLIB_SUPPORT=OFF \ > + -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ > + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > + -DUSE_CCACHE=OFF > + > +$(eval $(cmake-package)) > From romain.naour at smile.fr Sun Jan 9 21:06:07 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 22:06:07 +0100 Subject: [Buildroot] [PATCH v2] package/moby-buildkit: new package Message-ID: <20220109210607.2270978-1-romain.naour@smile.fr> From: Christian Stewart Signed-off-by: Christian Stewart [Romain: - remove host-pkgconf dependency - Add the license file hash - Fix the check-package warning in Config.in] Signed-off-by: Romain Naour --- The license file hash was a copy past error. The 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 belong to balena-engine package from [1] [1] https://git.buildroot.net/buildroot/commit/?id=cb0d87004c824dc6bb421fe8316428d51e1335bd --- package/Config.in | 1 + package/moby-buildkit/Config.in | 19 +++++++++++++++++++ package/moby-buildkit/moby-buildkit.hash | 3 +++ package/moby-buildkit/moby-buildkit.mk | 22 ++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 package/moby-buildkit/Config.in create mode 100644 package/moby-buildkit/moby-buildkit.hash create mode 100644 package/moby-buildkit/moby-buildkit.mk diff --git a/package/Config.in b/package/Config.in index edae7e4f62..7bf17f486e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2554,6 +2554,7 @@ menu "System tools" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" + source "package/moby-buildkit/Config.in" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in new file mode 100644 index 0000000000..93c852bcdb --- /dev/null +++ b/package/moby-buildkit/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_MOBY_BUILDKIT + bool "moby-buildkit" + 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 + depends on BR2_USE_MMU + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + help + BuildKit is a toolkit for converting source code to build + artifacts in an efficient, expressive and repeatable manner. + + https://github.com/moby/buildkit + +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" + 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 || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_USE_MMU diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash new file mode 100644 index 0000000000..3015e479f6 --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk new file mode 100644 index 0000000000..3f0df351ef --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# moby-buildkit +# +################################################################################ + +MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) +MOBY_BUILDKIT_LICENSE = Apache-2.0 +MOBY_BUILDKIT_LICENSE_FILES = LICENSE + +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit + +MOBY_BUILDKIT_TAGS = cgo +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd + +MOBY_BUILDKIT_LDFLAGS = \ + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" + +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) + +$(eval $(golang-package)) -- 2.31.1 From nolange79 at gmail.com Sun Jan 9 21:08:57 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 22:08:57 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/gcc: use binutils wrappers for target libs In-Reply-To: <20220109151653.GC1477939@scaer> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-2-nolange79@gmail.com> <20220109151653.GC1477939@scaer> Message-ID: Am So., 9. Jan. 2022 um 16:16 Uhr schrieb Yann E. MORIN : > > Nrobert, All, > > On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > > This will use gcc-ar, gcc-nm and gcc-ranlib instead of the > > normal binutils tools. The difference is that with the > > wrappers, gcc plugins will be automatically picked up, > > which might be necessary with some flags. > > > > Signed-off-by: Norbert Lange > > --- > > v1->v2: > > * Only set those wrappers if gc 4.7 or newer > > --- > > package/gcc/gcc.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > > index 114c2887a0..a24ffe3ee2 100644 > > --- a/package/gcc/gcc.mk > > +++ b/package/gcc/gcc.mk > > @@ -99,6 +99,9 @@ GCC_COMMON_TARGET_CFLAGS += -Wno-error > > endif > > > > # Propagate options used for target software building to GCC target libs > > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) > > +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib > > So we were a bit skeptical about this one. > > First, we believe that only the final gcc should be using those. Indeed, > we do not need much of the initial gcc, except libgcc.a, which anyway > gets overwitten by the final gcc, so we do not care that the libgcc.a is > built with LTO (and thus the gcc wrappers). > > Second, gcc initial is only used to build glibc, and as your patch 4 > states, glibc must not be built with LTO, we we also do not care that > the initial gcc uses its wrappers to build libgcc. > > Third, shouldn't we be using the tupple-prefixed wrappers? Or does it > just happens that gcc will internally add its build directory to PATH so > that it can find the un-prefixed just-built ones? > > For that last point, I added gcc-ar, gcc-nm, and gcc-ranlib in my PATH, > that are just simple wrapper scripts that trace their being called, and > then call to the actual gcca-r et al.: > > #!/bin/sh > me="${0}" > my_name="${0##*/}" > found=false > for i in $(which -a "${my_name}"); do > if [ "${i}" -ef "${me}" ]; then > found=true > elif ${found}; then > me="${i}" > fi > done > if ! ${found}; then > exit 42 > fi > printf "YEM: wrapped %s\n" "${me}" > exec "${me}" "${@}" > > Turns out that the 'YEM: wrapped' string occurs nowhere in the build > directory (so it does not end up in config.log or whatever), and it > does not even appear on the stdout/stderr either. > > So I am wondering how we can exercise these... Any hint? Can't tell anymore, I went to crosstool-ng for the compiler some time ago, so unlike my other patches I dont use them anymore. >From my memory, it affected some of the additional libs gcc builds, libstdc++, some sanitizers maybe. there was not absolute paths or tuples as the various stages should use the wrappers from the previous ones. I believe the final compiler ignores PATH and uses the stage2-compiler with abs path to build the included target libraries. I am just sure it was very deliberately done *this* way. Norbert From arnout at mind.be Sun Jan 9 21:31:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:31:43 +0100 Subject: [Buildroot] [RFC v2 09/12] package/qt5base: add vulkan option In-Reply-To: <20210110222833.26301-10-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-10-ps.report@gmx.net> Message-ID: <09e43668-2c6a-05c2-cb54-c2a2468f1ed8@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - no changes > > Notes: > - eglfs/vulkan is only implemented for eglfs_viv > (see stub implementation for QEglFSDeviceIntegration::createPlatformVulkanInstance() > in src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp and > real implementation for QEglFSVivIntegration::createPlatformVulkanInstance() > in src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp) > - or for xcb (see QXcbIntegration::createPlatformVulkanInstance() > in src/plugins/platforms/xcb/qxcbintegration.cpp) > --- > package/qt5/qt5base/Config.in | 11 +++++++++++ > package/qt5/qt5base/qt5base.mk | 7 +++++++ > 2 files changed, 18 insertions(+) > > diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in > index ee7c757c60..377a754f37 100644 > --- a/package/qt5/qt5base/Config.in > +++ b/package/qt5/qt5base/Config.in > @@ -175,6 +175,17 @@ config BR2_PACKAGE_QT5BASE_OPENGL_LIB > > endif > > +config BR2_PACKAGE_QT5BASE_VULKAN > + bool "Vulkan support" > + # all vulkan-loader introduced dependencies superseeded by qt5 own ones > + # depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader > + # depends on !BR2_STATIC_LIBS # vulkan-loader > + # depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader Just keep them, doesn't matter that qt5 already has them. Only if it becomes very complicated it's worth optimising it. However, shouldn't we have a virtual package to make sure there's also a vulkan provider, similar like we have for GL? Or isn't that needed because it's mediated through the loader library? It indeed doesn't look like Qt needs to link with the vulkan provider (i.e. mesa3d at this point). Regards, Arnout > + select BR2_PACKAGE_VULKAN_HEADERS > + select BR2_PACKAGE_VULKAN_LOADER > + help > + This option enables Vulkan support. > + > config BR2_PACKAGE_QT5BASE_LINUXFB > bool "linuxfb support" > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 84e9fa4edb..3755e306d1 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -196,6 +196,13 @@ else > QT5BASE_CONFIGURE_OPTS += -no-opengl > endif > > +ifeq ($(BR2_PACKAGE_QT5BASE_VULKAN),y) > +QT5BASE_CONFIGURE_OPTS += -feature-vulkan > +QT5BASE_DEPENDENCIES += vulkan-headers vulkan-loader > +else > +QT5BASE_CONFIGURE_OPTS += -no-feature-vulkan > +endif > + > QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) > QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) > > From arnout at mind.be Sun Jan 9 21:33:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:33:59 +0100 Subject: [Buildroot] [RFC v2 10/12] package/vulkan-loader: add XCB support In-Reply-To: <20210110222833.26301-11-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-11-ps.report@gmx.net> Message-ID: <08d28504-394a-9857-084b-b7cb107c87a8@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/vulkan-loader/Config.in | 12 ++++++++++++ > package/vulkan-loader/vulkan-loader.mk | 8 +++++++- > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/package/vulkan-loader/Config.in b/package/vulkan-loader/Config.in > index 9c215dc9ce..6ec4b13030 100644 > --- a/package/vulkan-loader/Config.in > +++ b/package/vulkan-loader/Config.in > @@ -9,6 +9,18 @@ config BR2_PACKAGE_VULKAN_LOADER > > https://github.com/KhronosGroup/Vulkan-Loader > > +if BR2_PACKAGE_VULKAN_LOADER > + > +config BR2_PACKAGE_VULKAN_LOADER_XCB > + bool "X.org XCB support" I don't think it makes much sense to make this a user-visible option. > + depends on BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_LIBXCB > + > +comment "X.org XCB support available if X.org is enabled" > + depends on !BR2_PACKAGE_XORG7 > + > +endif # BR2_PACKAGE_VULKAN_LOADER > + > comment "vulkan-loader needs a toolchain w/ C++, dynamic library, threads" > depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk > index 9c9ccb2458..f0c20f5687 100644 > --- a/package/vulkan-loader/vulkan-loader.mk > +++ b/package/vulkan-loader/vulkan-loader.mk > @@ -13,10 +13,16 @@ VULKAN_LOADER_INSTALL_STAGING = YES > VULKAN_LOADER_DEPENDENCIES = vulkan-headers > > VULKAN_LOADER_CONF_OPTS += \ > - -DBUILD_WSI_XCB_SUPPORT=OFF \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ > -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > -DUSE_CCACHE=OFF > > +ifeq ($(BR2_PACKAGE_VULKAN_LOADER_XCB),y) Just use BR2_PACKAGE_LIBXCB here. With that, this can be squashed in the patch that adds vulkan-loader (it's not complicated). Regards, Arnout > +VULKAN_LOADER_DEPENDENCIES += libxcb > +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON > +else > +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF > +endif > + > $(eval $(cmake-package)) > From arnout at mind.be Sun Jan 9 21:36:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:36:28 +0100 Subject: [Buildroot] [RFC v2 11/12] package/vulkan-tools: add XCB support In-Reply-To: <20210110222833.26301-12-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-12-ps.report@gmx.net> Message-ID: On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/vulkan-tools/Config.in | 14 ++++++++++++++ > package/vulkan-tools/vulkan-tools.mk | 8 +++++++- > 2 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/package/vulkan-tools/Config.in b/package/vulkan-tools/Config.in > index 54fa539dab..14c4059074 100644 > --- a/package/vulkan-tools/Config.in > +++ b/package/vulkan-tools/Config.in > @@ -12,6 +12,20 @@ config BR2_PACKAGE_VULKAN_TOOLS > > https://github.com/KhronosGroup/Vulkan-Tools > > +if BR2_PACKAGE_VULKAN_TOOLS > + > +config BR2_PACKAGE_VULKAN_TOOLS_XCB > + bool "X.org XCB support" > + depends on BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBX11 > + select BR2_PACKAGE_LIBXCB > + select BR2_PACKAGE_VULKAN_LOADER_XCB > + > +comment "X.org XCB support available if X.org is enabled" > + depends on !BR2_PACKAGE_XORG7 > + > +endif # BR2_PACKAGE_VULKAN_TOOLS > + > comment "vulkan-tools needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.9" > depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/vulkan-tools/vulkan-tools.mk b/package/vulkan-tools/vulkan-tools.mk > index 129efddf3b..5b4d761ddb 100644 > --- a/package/vulkan-tools/vulkan-tools.mk > +++ b/package/vulkan-tools/vulkan-tools.mk > @@ -16,10 +16,16 @@ VULKAN_TOOLS_CONF_OPTS += \ > -DBUILD_VULKANINFO=ON \ > -DBUILD_ICD=OFF \ > -DINSTALL_ICD=OFF \ > - -DBUILD_WSI_XCB_SUPPORT=OFF \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ > -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > -DUSE_CCACHE=OFF > > +ifeq ($(BR2_PACKAGE_VULKAN_TOOLS_XCB),y) Same, BR2_PACKAGE_LIBXCB. > +VULKAN_TOOLS_DEPENDENCIES += libxcb xlib_libX11 Hm, maybe this should go together with BUILD_WSI_XLIB_SUPPORT ? Regards, Arnout > +VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON > +else > +VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF > +endif > + > $(eval $(cmake-package)) > From romain.naour at smile.fr Sun Jan 9 21:42:53 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 22:42:53 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org In-Reply-To: <20220109200806.GD1477939@scaer> References: <20220109151414.1908259-1-romain.naour@smile.fr> <20220109200806.GD1477939@scaer> Message-ID: <7c25f4d7-309c-6eb1-00de-552242a64a97@smile.fr> Hello Yann, All, Le 09/01/2022 ? 21:08, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-09 16:14 +0100, Romain Naour spake thusly: >> While packaging telegraf [1] the download step failed due to a checksum >> mismatch: >> >> go: downloading collectd.org v0.5.0 >> get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 >> verifying collectd.org at v0.5.0: checksum mismatch >> downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= >> go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= >> >> SECURITY ERROR >> This download does NOT match an earlier download recorded in go.sum. >> The bits may have been replaced on the origin server, or an attacker may >> have intercepted the download attempt. >> >> For more information, see 'go help module-auth'. >> >> go-collectd was bumped in telegraf since several releases (since v1.19.0) without >> any changes regarding the go-collectd hash. >> >> Some users reported an issue [3] when using "GOPROXY=direct" and used >> "GOPROXY=proxy.golang.org" as a workaround. > > I'll put down what we discussed on IRC: > > Unfortunately, there are cases the other way around: using a proxy broke > the vendoring, while a direct connection solved it. So we won't be able > to satisfy both cases. Sure, at least I posted the workaround on the ml. > > Furthermore, relying on a proxy having a cached archive risks breaking > in the future anyway, as that archived may get eventually get evicted > out of the cache of the proxy. Or the proxy may disapear in the future, > or whatever. > > In any case, a bad hash is most probably due to one of the following > issues: > > - upstream messed up when adding the dependency and incorrectly copied > the hash (but that should not happen as adding a dependency is > supposed to be done with go tools already), > > - the upstream of the dependency changed their release (i.e. they > re-tagged a release) > > - the go proxy is caching an incorrect archive (e.g. a partial > download, or an older archive, or is malicious, or whatever). > > In any case, we can't do anything about it, and the upstream of the > project has to fix the mess. > > So, from my point of view, this is a NACK on this patch. I created an issue on Telegraf github: https://github.com/influxdata/telegraf/issues/10408 Best regards, Romain > > Regards, > Yann E. MORIN. > >> [1] https://github.com/influxdata/telegraf/ >> [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e >> [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 >> >> Signed-off-by: Romain Naour >> Cc: Thomas Petazzoni >> --- >> package/pkg-golang.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk >> index 35bcb1673b..e23778d96a 100644 >> --- a/package/pkg-golang.mk >> +++ b/package/pkg-golang.mk >> @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD >> $(2)_DOWNLOAD_POST_PROCESS = go >> $(2)_DL_ENV = \ >> $(HOST_GO_COMMON_ENV) \ >> - GOPROXY=direct \ >> + GOPROXY=proxy.golang.org \ >> BR_GOMOD=$$($(2)_GOMOD) >> >> # Due to vendoring, it is pretty likely that not all licenses are >> -- >> 2.31.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Sun Jan 9 21:47:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 9 Jan 2022 22:47:24 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Giulio Benetti as co-maintainer to mali-driver and rockchip-mali packages Message-ID: <20220109214724.94900-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..09da2dda1a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1093,9 +1093,11 @@ F: package/harfbuzz/ F: package/libfuse3/ F: package/libnspr/ F: package/libnss/ +F: package/mali-driver/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ +F: package/rockchip-mali/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ -- 2.25.1 From arnout at mind.be Sun Jan 9 21:47:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:47:42 +0100 Subject: [Buildroot] [RFC v2 12/12] WIP: package/mesa3d: add vulkan swrast driver support In-Reply-To: <20210110222833.26301-13-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-13-ps.report@gmx.net> Message-ID: <74914dd5-1c62-1e3c-fd8b-a57bc33e5293@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - no changes (besides clearifying notes comment) > > Notes: > - link failure when selected stand alone, fine in case > vulkan-broadcom is selected too (selecting vulkan-intel > instead does not work) In future submissions, paste the link error so others can give some idea about debugging it. > --- > package/mesa3d/Config.in | 13 +++++++++++++ > package/mesa3d/mesa3d.mk | 1 + > 2 files changed, 14 insertions(+) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 5da9bfe08a..66776c9ad9 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -429,6 +429,19 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= > depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ > !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 > > +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST > + bool "Vulkan swrast driver" > + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST These kind of dependencies are somewhat annoying, but OK. Fortunately, dri-swrast was removed upstream, so it's no longer relevant. > + select BR2_PACKAGE_EXPAT > + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER Implied by gallium-swrast. Regards, Arnout > + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST > + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER > + help > + Vulkan swrast driver. > + > +comment "Vulkan swrast: Only one swrast provider can be built" > + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST > + > comment "Off-screen Rendering" > > config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 62dc7db91d..4679416b4d 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -121,6 +121,7 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 > # Vulkan Drivers > MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom > MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel > +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast > > ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) > MESA3D_CONF_OPTS += \ > From yann.morin.1998 at free.fr Sun Jan 9 21:52:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 22:52:05 +0100 Subject: [Buildroot] [git commit] package/libvirtd: fix recursive dependency in Kconfig Message-ID: <20220109214950.95CF3812D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f81242ae4fb64ab85af5d38e70246222276552ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4dff1be05e90 (package/libvirt: libvirtd needs C++ for nmap-ncat) introduce a recursive dependency (really: a circular dependency): package/busybox/Config.in:33:error: recursive dependency detected! package/busybox/Config.in:33: symbol BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is selected by BR2_PACKAGE_EBTABLES_UTILS_SAVE package/ebtables/Config.in:11: symbol BR2_PACKAGE_EBTABLES_UTILS_SAVE depends on BR2_PACKAGE_EBTABLES package/ebtables/Config.in:1: symbol BR2_PACKAGE_EBTABLES is selected by BR2_PACKAGE_LIBVIRT_DAEMON package/libvirt/Config.in:44: symbol BR2_PACKAGE_LIBVIRT_DAEMON depends on BR2_PACKAGE_NETCAT_OPENBSD package/netcat-openbsd/Config.in:1: symbol BR2_PACKAGE_NETCAT_OPENBSD depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS As usual with this kind of circular depednency, it is not trivial to see what the real cuplrit is, or where to cut the circle. A simple solution in this case is to drop the C++ dependency, and switch the netcat-openbsd and nmap-ncat dependencies conditions. Signed-off-by: Yann E. MORIN --- package/libvirt/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 103d1b9543..b91b8e2c1c 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,15 +44,13 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y - depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES select BR2_PACKAGE_IPTABLES select BR2_PACKAGE_IPROUTE2 # These are required because there is no way to unequivocally select a modern netcat - select BR2_PACKAGE_NMAP if !BR2_PACKAGE_NETCAT_OPENBSD - select BR2_PACKAGE_NMAP_NCAT if !BR2_PACKAGE_NETCAT_OPENBSD + select BR2_PACKAGE_NETCAT_OPENBSD if !BR2_PACKAGE_NMAP_NCAT select BR2_PACKAGE_RADVD help Build the libvirt daemon (libvirtd) otherwise build only the From yann.morin.1998 at free.fr Sun Jan 9 21:58:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 22:58:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: libvirtd needs C++ In-Reply-To: <20220109204853.GH1477939@scaer> References: <20220109202003.3338357-1-fontaine.fabrice@gmail.com> <20220109204853.GH1477939@scaer> Message-ID: <20220109215803.GJ1477939@scaer> Fabrice, All, On 2022-01-09 21:48 +0100, Yann E. MORIN spake thusly: > On 2022-01-09 21:20 +0100, Fabrice Fontaine spake thusly: > > Fix the following build failure raised since commit > > fbf25acfbfd5a73b3560918bea081768abbe5723: > > > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP > > Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] > > Selected by [y]: > > - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] > > > > Fixes: > > - No autobuilder failures (yet) > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/libvirt/Config.in | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in > > index a35295bc97..d7ca5f8db5 100644 > > --- a/package/libvirt/Config.in > > +++ b/package/libvirt/Config.in > > @@ -37,6 +37,7 @@ if BR2_PACKAGE_LIBVIRT > > config BR2_PACKAGE_LIBVIRT_DAEMON > > bool "libvirtd" > > default y > > + depends on BR2_INSTALL_LIBSTDCPP # nmap > > In fact, the requirement on C++ is due to nmap-ncat, which is enabled > only if netcat-openbsd is not available, so I relaxed the requirement > accordingly. This introduced a messy circular dependency, so I pushed another patch that; - remove the C++ dependency - switches the nmap-ncat and netcat-openbsd conditional dependnecies Regards, Yann E. MORIN. > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > > select BR2_PACKAGE_DNSMASQ > > select BR2_PACKAGE_EBTABLES > > @@ -50,6 +51,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON > > Build the libvirt daemon (libvirtd) otherwise build only the > > utility programs. > > > > +comment "libvirtd needs a toolchain w/ C++" > > + depends on !BR2_INSTALL_LIBSTDCPP > > + > > # Stateful drivers are useful only when building the daemon. > > if BR2_PACKAGE_LIBVIRT_DAEMON > > > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Jan 9 22:01:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:01:53 +0100 Subject: [Buildroot] [git commit] utils/check-package: add a check for the new spacing convention Message-ID: <20220109215941.06D9F80250@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f35a4b4ae22046fb04edc165edbb27ee5439aa4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The seperation of the fields in the hash file should be 2 spaces for consistency. Since a large number of hash files still violate this rule, exclude it from "make check-package" (and thus from CI). Signed-off-by: Heiko Thiery Cc: Yann E. MORIN Cc: Thomas Petazzoni [Arnout: - Move it to a separate class, so it can be excluded. - Exclude it from "make check-package" ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 2 +- utils/checkpackagelib/lib_hash.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3099d35158..5fc7137e5a 100644 --- a/Makefile +++ b/Makefile @@ -1258,7 +1258,7 @@ check-flake8: check-package: find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -exec ./utils/check-package --exclude=Sob {} + + -exec ./utils/check-package --exclude=Sob --exclude=HashSpaces {} + include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py index 3e381119a5..698d24fd6b 100644 --- a/utils/checkpackagelib/lib_hash.py +++ b/utils/checkpackagelib/lib_hash.py @@ -53,3 +53,19 @@ class HashType(_CheckFunction): .format(self.filename, lineno, self.url_to_manual), text, "expected {} hex digits".format(self.len_of_hash[htype])] + + +class HashSpaces(_CheckFunction): + def check_line(self, lineno, text): + if _empty_line_or_comment(text): + return + + fields = text.split() + if len(fields) != 3: + # Handled by HashNumberOfFields + return + + if not re.match(re.escape("{} {} {}".format(*fields)), text): + return ["{}:{}: separation does not match expectation " + "({}#adding-packages-hash)" + .format(self.filename, lineno, self.url_to_manual), text] From nolange79 at gmail.com Sun Jan 9 22:16:47 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:16:47 +0100 Subject: [Buildroot] [PATCH v6 1/4] package/dbus-broker: new package Message-ID: <20220109221650.777610-1-nolange79@gmail.com> dbus-broker is an alternate implementation of a dbus dameon. It can be used as a drop-in replacement for the system bus daemon, as well as the session bus daemon. dbus-broker is (basically, and as far as we're concerned in Buildroot) split in two components: - the actual message bus daemon, that relays messages across clients - a launcher, which is responsible for setting various aspects of the bus, like setting the policy et al. and opening the socket(s) the message bus daemon will have to listen on... The launcher can only be used in a systemd setup (it makes heavy use of systemd facilities), while the message bus is generic. However, the message bus daemon is useless without a launcher. There does not exist a non-systemd launcher, which makes dbus-broker actually a systemd-only package; this can be revisited when/if a non-systemd launcher appears. Note, however, that libdbus is not provided by dbus-borker. People who want to use dbus-broker as the bus daemon, and need libdbus, will have to enable both, see below. There are two cases: 1. original dbus disabled Here, we install the config files and systemd socket activation units; dbus-broker provides the system and sessions bus daemons. In this case, libdbus is not available. 2. original dbus enabled In this case, we do not install the config files and systemd socket activation units, or define a user: they all are provided by the original dbus, and we piggy-back on those. In this situation, the default system and sessions message bus are the original dbus, and libdbus is available; dbus-broker is not enabled. So far, we believe it would be over-engineered to provide a way to allow choosing the bus daemon in the configuraiton. However, users may opt-in to use dbus-broker in a few ways: - at build-time: by calling systemctl enable/disable from a post-build script (preferred), or by providing drop-in units or presets in an overlay (less preferred) or custom skeleton (as a last resort), - at runtime (on a RW filesystem): by calling systemctl enable/disable Note about the user: the path to the system bus socket is a so-called "well-known location": it is expected to be there, by spec. Moving it elsewhere is going to break existing programs. So, the user running the system bus daemon must be able to create that socket. As we may have two packages providing a system bus daemon, they have to be both able to create the socket, and thus must both be able to write in the directory containing the socket. And since they can be switched at runtime, they must be running as the same user. We can't just reference the original dbus user, so we duplicate the entry. What is important, is that the user be named 'dbus', as that's what we use in both cases. Finally, the licensing terms are pretty trivial for dbus-broker itself, but it makes use of third-party code that it inherits as git submodules (that are bundled in the release archive). Thus the licensing is a bit convoluted... The third-party codes claim to be licensed as "Apache-2.0 and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files. The individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the situation with "Apache-2.0 and/or LGPL-2.1+". Signed-off-by: Norbert Lange [yann.morin.1998 at free.fr: - don't select systemd; depend on it instead - only install config files and systemd units without original dbus - install a user to run the message bus as - fix licensing info - entirely reword and extend the commit log - add myself to DEVELOPERS as well ] Signed-off-by: Yann E. MORIN --- Changes v5 -> v6 (Norbert, respinning after Yann): - bump version to v29 - Linux 4.17 is now a hard requirement, drop passing option - sync dbus_broker user to dbus package ( home = /run/dbus ) Changes v4 -> v5 (Yann, after review by Norbert): - define the user to run as directly in system.conf - as a consequence, drop the unit drop-in - add myself to DEVELOPERS as well Changes v3 -> v4 (Yann, respining after review by Norbert): - drop the non-systemd case - drop the launcher option - reinstate BR2_COREUTILS_HOST_DEPENDENCY and ln --relative - reinstate the user, explain it Changes v2 -> v3 (Norbert, respinning after Yann): - add an own config entry for dbus-broker-launch enabled by default if systemd init is used - undo BR2_COREUTILS_HOST_DEPENDENCY - undo adding dbus user - never used by this package - add condtional audit dependency - cleanup conditional logic a bit Changes v1 -> v2 (Yann): - make launcher conditional - don't select systemd; don't depend on it either - don't install systemd units without systemd - only install config files and systemd units wihtout original dbus - rename hooks with meaningful names - fix licensing info - entirely reword and extend the commit log --- DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 23 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 71 ++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123 +++++++++++++++++++++++++++ 8 files changed, 293 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.conf diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..02ba98e410 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2111,6 +2111,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange +F: package/dbus-broker/ F: package/systemd/ F: package/tcf-agent/ @@ -2914,6 +2915,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/ diff --git a/package/Config.in b/package/Config.in index 5e01187b83..ebc64a25f2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -459,6 +459,7 @@ endmenu source "package/dahdi-tools/Config.in" source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in" diff --git a/package/dbus-broker/Config.in b/package/dbus-broker/Config.in new file mode 100644 index 0000000000..c7206232da --- /dev/null +++ b/package/dbus-broker/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of a message bus + as defined by the D-Bus specification. Its aim is to provide + high performance and reliability, while keeping compatibility + to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makes use of + many modern features provided by recent linux kernel releases. + + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMD diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash new file mode 100644 index 0000000000..26ebab7ac1 --- /dev/null +++ b/package/dbus-broker/dbus-broker.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4eca425db52b7ab1027153e93fea9b3f11759db9e93ffbf88759b73ddfb8026a dbus-broker-29.tar.xz +sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk new file mode 100644 index 0000000000..547b79eb84 --- /dev/null +++ b/package/dbus-broker/dbus-broker.mk @@ -0,0 +1,71 @@ +################################################################################ +# +# dbus-broker +# +################################################################################ + +DBUS_BROKER_VERSION = 29 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) + +# For the third-party code, the licensing legla-info is inconsistent between +# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list, c-rbtree, c-shquote, c-stdaux, c-utf8) +DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ + subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ + subprojects/c-list/AUTHORS subprojects/c-list/README.md \ + subprojects/c-rbtree/AUTHORS subprojects/c-rbtree/README.md \ + subprojects/c-shquote/AUTHORS subprojects/c-shquote/README.md \ + subprojects/c-stdaux/AUTHORS subprojects/c-stdaux/README.md \ + subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_BROKER_DEPENDENCIES += audit +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +else +DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we can share +# the home directory and create a socket there. As a consequence, the +# username and groupname must be dbus:dbus, and they both need to have +# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /run/dbus - dbus DBus messagebus user +endef + +# Only install units for system bus daemon socket if original dbus is not present +# Only install config and service files if original dbus is not present +# +# Note: BR2_COREUTILS_HOST_DEPENDENCY to be able to use ln --relative +ifeq ($(BR2_PACKAGE_DBUS),) +DBUS_BROKER_DEPENDENCIES += $(BR2_COREUTILS_HOST_DEPENDENCY) + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \ + $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf --relative \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket +endef +endif # !BR2_PACKAGE_DBUS + +$(eval $(meson-package)) diff --git a/package/dbus-broker/dbus.socket b/package/dbus-broker/dbus.socket new file mode 100644 index 0000000000..5c373cf450 --- /dev/null +++ b/package/dbus-broker/dbus.socket @@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socket diff --git a/package/dbus-broker/session.conf b/package/dbus-broker/session.conf new file mode 100644 index 0000000000..e4758fa218 --- /dev/null +++ b/package/dbus-broker/session.conf @@ -0,0 +1,65 @@ + + + + + + session + + + + + + + + + + + + + + + + + session.d + + /etc/dbus-1/session.d + + + /etc/dbus-1/session-local.conf + + contexts/dbus_contexts + + + + + 1000000000 + 250000000 + 1000000000 + 250000000 + 1000000000 + + 120000 + 240000 + 150000 + 100000 + 10000 + 100000 + 10000 + 50000 + 50000 + 50000 + + diff --git a/package/dbus-broker/system.conf b/package/dbus-broker/system.conf new file mode 100644 index 0000000000..4b17fbd90e --- /dev/null +++ b/package/dbus-broker/system.conf @@ -0,0 +1,123 @@ + + + + + + + + + system + + + + + + dbus + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + system.d + + /etc/dbus-1/system.d + + + /etc/dbus-1/system-local.conf + + contexts/dbus_contexts + + -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 22:16:48 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:16:48 +0100 Subject: [Buildroot] [PATCH v6 2/4] package/systemd: do not force dbus if dbus-broker is available In-Reply-To: <20220109221650.777610-1-nolange79@gmail.com> References: <20220109221650.777610-1-nolange79@gmail.com> Message-ID: <20220109221650.777610-2-nolange79@gmail.com> From: "Yann E. MORIN" dbus-broker fits the bill as a message bus daemon, so only enable the original dbus if dbus-broker is not enabled. Signed-off-by: Yann E. MORIN Cc: Norbert Lange --- package/systemd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index cc0736561e..1c227bb07f 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -26,7 +26,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_DBUS # runtime dependency only + select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBS -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 22:16:49 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:16:49 +0100 Subject: [Buildroot] [PATCH v6 3/4] support/testsuite: de-duplicate the systemd runtime tests In-Reply-To: <20220109221650.777610-1-nolange79@gmail.com> References: <20220109221650.777610-1-nolange79@gmail.com> Message-ID: <20220109221650.777610-3-nolange79@gmail.com> From: "Yann E. MORIN" Of all the systemd init tests, only one does some additional tests, and for just this lone wolf, we duplicate the test function. Signed-off-by: Yann E. MORIN --- support/testing/tests/init/test_systemd.py | 32 ++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index f0cc52bac8..80c6776f59 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -21,8 +21,9 @@ class InitSystemSystemdBase(InitSystemBase): # BR2_TARGET_ROOTFS_TAR is not set """.format(infra.filepath("conf/binfmt-misc-kernel-fragment.config")) - def check_init(self): - super(InitSystemSystemdBase, self).check_init("/lib/systemd/systemd") + def check_systemd(self, fs): + self.start_emulator(fs, "zImage", "vexpress-v2p-ca9") + self.check_init("/lib/systemd/systemd") # Test all units are OK output, _ = self.emulator.run("systemctl --no-pager --failed --no-legend") @@ -35,6 +36,9 @@ class InitSystemSystemdBase(InitSystemBase): output, _ = self.emulator.run("journalctl --no-pager --lines 1 --quiet") self.assertEqual(len(output), 1) + # Check the network is up + self.check_network("eth0") + class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ @@ -46,9 +50,7 @@ class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase): """.format(infra.filepath("tests/init/systemd-factory")) def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") # This one must be executed on the target, to check that # the factory feature works as expected @@ -65,9 +67,7 @@ class TestInitSystemSystemdRwNetworkd(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): @@ -80,9 +80,7 @@ class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): @@ -94,9 +92,7 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") class TestInitSystemSystemdRoFull(InitSystemSystemdBase): @@ -125,9 +121,7 @@ class TestInitSystemSystemdRoFull(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") class TestInitSystemSystemdRwFull(InitSystemSystemdBase): @@ -155,6 +149,4 @@ class TestInitSystemSystemdRwFull(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 22:16:50 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:16:50 +0100 Subject: [Buildroot] [PATCH v6 4/4] support/run-test: add test for systemd using dbus-broker In-Reply-To: <20220109221650.777610-1-nolange79@gmail.com> References: <20220109221650.777610-1-nolange79@gmail.com> Message-ID: <20220109221650.777610-4-nolange79@gmail.com> From: "Yann E. MORIN" Add four new tests for systemd (rw and ro in each case): - use dbus-broker instead of the original dbus - use the original dbus, with dbus-broker installed The first two extend the existing IfUpDown test cases by just enabling dbus-broker; the second ones extend this further, by explicitly enabling the original dbus. For one of the tests, we overload the test_run() function to test that the dbus-broker daemon is indeed running as root. We need not replicate that check in the other dbus-broker-only test, and it does not make sense to test that in tests that have the original dbus enabled. Presence of the original dbus and dbus-broker on the same system is valid: the original dbus is used as the default system bus daemon. We do not test switching between the two at runtime, though as this is really too corner-case specific. We just test to ensure the original dbus system bus daemon is not impacted by the presence of dbus-broker. Note: the 'full' test-case enables all systemd options, and some of them do pull the original dbus package, so we can't use that to test the integration of dbus-broker; instead, we extend the ifupdown case, which does not enable the original dbus. Signed-off-by: Yann E. MORIN Cc: Norbert Lange --- support/testing/tests/init/test_systemd.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 80c6776f59..80d172e5e2 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -83,6 +83,29 @@ class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): self.check_systemd("squashfs") +class TestInitSystemSystemdRoIfupdownDbusbroker(TestInitSystemSystemdRoIfupdown): + config = TestInitSystemSystemdRoIfupdown.config + \ + """ + BR2_PACKAGE_DBUS_BROKER=y + """ + + def test_run(self): + # Parent class' test_run() method does exactly that, no more: + self.check_systemd("squashfs") + + # Check that the dbus-broker daemon is running as non-root + cmd = "find /proc/$(pidof dbus-broker) -maxdepth 1 -name exe -user dbus" + out, _ = self.emulator.run(cmd) + self.assertEqual(len(out), 1) + + +class TestInitSystemSystemdRoIfupdownDbusbrokerDbus(TestInitSystemSystemdRoIfupdownDbusbroker): + config = TestInitSystemSystemdRoIfupdownDbusbroker.config + \ + """ + BR2_PACKAGE_DBUS=y + """ + + class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ """ @@ -95,6 +118,20 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): self.check_systemd("ext2") +class TestInitSystemSystemdRwIfupdownDbusbroker(TestInitSystemSystemdRwIfupdown): + config = TestInitSystemSystemdRwIfupdown.config + \ + """ + BR2_PACKAGE_DBUS_BROKER=y + """ + + +class TestInitSystemSystemdRwIfupdownDbusbrokerDbus(TestInitSystemSystemdRwIfupdownDbusbroker): + config = TestInitSystemSystemdRwIfupdownDbusbroker.config + \ + """ + BR2_PACKAGE_DBUS=y + """ + + class TestInitSystemSystemdRoFull(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ """ -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 22:16:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:16:32 +0100 Subject: [Buildroot] [PATCH 1/2] package/hiawatha: mbedtls is mandatory, not optional Message-ID: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> hiawatha is unconditionally using mbedtls since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e (e.g. wigwam.c includes "mbedtls/md5.h") Signed-off-by: Fabrice Fontaine --- package/hiawatha/hiawatha.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 017592de1e..ed9f8aba54 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -11,7 +11,10 @@ HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver +# Disable system mbedtls as hiawatha needs mbedtls 3.x HIAWATHA_CONF_OPTS = \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF \ -DENABLE_TOOLKIT=OFF \ -DCONFIG_DIR=/etc/hiawatha \ -DLOG_DIR=/var/log \ @@ -20,11 +23,7 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -# Disable system mbedtls as hiawatha needs mbedtls 3.x -HIAWATHA_CONF_OPTS += \ - -DENABLE_TLS=ON \ - -DINSTALL_MBEDTLS_HEADERS=OFF \ - -DUSE_SYSTEM_MBEDTLS=OFF +HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 22:16:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:16:33 +0100 Subject: [Buildroot] [PATCH 2/2] package/hiawatha: disable ASM if needed In-Reply-To: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> References: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> Message-ID: <20220109221633.1307381-2-fontaine.fabrice@gmail.com> Disable ASM as already done in mbedtls package to avoid the following build failure raised since commit 4e36e8f2081a66f477dd038793082045876d65ee: In file included from /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c:41: /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c: In function 'mpi_mul_hlp': /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bn_mul.h:86:13: error: the register 'hi' cannot be clobbered in 'asm' for the current target 86 | #define asm __asm | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/5436b44777c5d417ae427b99602f516fd8f9489d Signed-off-by: Fabrice Fontaine --- package/hiawatha/hiawatha.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index ed9f8aba54..14d3c9f1ee 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -22,6 +22,24 @@ HIAWATHA_CONF_OPTS = \ -DWEBROOT_DIR=/var/www/hiawatha \ -DWORK_DIR=/var/lib/hiawatha +define HIAWATHA_MBEDTLS_DISABLE_ASM + $(SED) '/^#define MBEDTLS_AESNI_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h +endef + +# ARM in thumb mode breaks debugging with asm optimizations +# Microblaze asm optimizations are broken in general +# MIPS R6 asm is not yet supported +ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +endif + ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 22:18:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:18:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: drop C++ comment Message-ID: <20220109221830.1343278-1-fontaine.fabrice@gmail.com> Commit f81242ae4fb64ab85af5d38e70246222276552ae forgot to drop C++ comment Signed-off-by: Fabrice Fontaine --- package/libvirt/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index aeb560a498..5a6b067a0d 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -50,9 +50,6 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. -comment "libvirtd needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD - # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 22:22:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:22:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/avrdude: fix version Message-ID: <20220109222203.1397934-1-fontaine.fabrice@gmail.com> Fix AVRDUDE_VERSION so that it matches what is returned by release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/avrdude/avrdude.hash | 2 +- package/avrdude/avrdude.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index 1c7758afcd..d53d4dd60d 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-6.4.tar.gz sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 5bbbc4e8c2..6a8e9074b7 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,8 +4,8 @@ # ################################################################################ -AVRDUDE_VERSION = v6.4 -AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) +AVRDUDE_VERSION = 6.4 +AVRDUDE_SITE = $(call github,avrdudes,avrdude,v$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ AVRDUDE_LICENSE_FILES = COPYING -- 2.34.1 From yann.morin.1998 at free.fr Sun Jan 9 22:26:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:26:36 +0100 Subject: [Buildroot] [git commit] package/glibc: force -fno-lto Message-ID: <20220109222042.3C1C1829F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7a00b39bca0df9737890145b7f59b9c1c3d2e4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master glibc requires compilation barriers between files, and will fail with LTO enabled. So force LTO off by appending -fno-lto to the flags, but only if the GCC version is recent enough that an LTO build would be possible. Signed-off-by: Norbert Lange Signed-off-by: Yann E. MORIN --- package/glibc/glibc.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 3862e0624b..5c26b0e6df 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -53,6 +53,11 @@ ifeq ($(BR2_ENABLE_DEBUG),y) GLIBC_EXTRA_CFLAGS += -g endif +# glibc explicitly requires compile barriers between files +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +GLIBC_EXTRA_CFLAGS += -fno-lto +endif + # The stubs.h header is not installed by install-headers, but is # needed for the gcc build. An empty stubs.h will work, as explained # in http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html. The same trick From yann.morin.1998 at free.fr Sun Jan 9 22:31:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:31:45 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/glibc: force -fno-lto In-Reply-To: <20201017221743.160029-4-nolange79@gmail.com> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-4-nolange79@gmail.com> Message-ID: <20220109223145.GK1477939@scaer> Norbert, All, On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > glibc requires compilation barriers between files, and will > fail with LTO enabled. > So force LTO off by appending -fno-lto to the flags, but only > if the GCC version is recent enough that an LTO build would > be possible. > > Signed-off-by: Norbert Lange Applied to master, thanks. Are the other C libraries (uClibc, musl) also affected by such an issue? Regards, Yann E. MORIN. > --- > package/glibc/glibc.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 4721177d83..6d07495edc 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -67,6 +67,11 @@ ifeq ($(BR2_ENABLE_DEBUG),y) > GLIBC_EXTRA_CFLAGS += -g > endif > > +# glibc explicitly requires compile barriers between files > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) > +GLIBC_EXTRA_CFLAGS += -fno-lto > +endif > + > # The stubs.h header is not installed by install-headers, but is > # needed for the gcc build. An empty stubs.h will work, as explained > # in http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html. The same trick > -- > 2.28.0 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Jan 9 22:31:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:31:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/squid: needs threads Message-ID: <20220109223135.1409181-1-fontaine.fabrice@gmail.com> squid needs threads and https://github.com/squid-cache/squid/commit/7dba4ac446341548a0b101489785f2cef9a33caa to avoid the following build failure raised since bump to version 5.3 in commit efc07b7a1818787229ddb335ca26ff2cf03820ae: ntlm_fake_auth.cc: In function 'int main(int, char**)': ntlm_fake_auth.cc:187:18: error: 'std::this_thread' has not been declared 187 | std::this_thread::sleep_for(std::chrono::milliseconds(response_delay)); | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/2aabc8375d41ad4d047d20ff8ee4fe1c978e7ee1 Signed-off-by: Fabrice Fontaine --- package/squid/Config.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 0df2aedef6..6272140768 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,13 +1,16 @@ -comment "squid needs a toolchain w/ C++, gcc >= 4.8 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 # needs fork() -- 2.34.1 From yann.morin.1998 at free.fr Sun Jan 9 22:34:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:34:56 +0100 Subject: [Buildroot] [git commit] package/libvirt: drop C++ comment Message-ID: <20220109222851.F177C82B53@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb9a65d98b128c1b06069013e0ab874779ef5228 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit f81242ae4fb64ab85af5d38e70246222276552ae forgot to drop C++ comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libvirt/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index b91b8e2c1c..af0fc36aea 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -56,9 +56,6 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. -comment "libvirtd needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD - # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON From yann.morin.1998 at free.fr Sun Jan 9 22:34:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:34:58 +0100 Subject: [Buildroot] [git commit] package/avrdude: fix version Message-ID: <20220109222852.059EF812B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcfce11044212166fc164d68f1dfdb01f3517a4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix AVRDUDE_VERSION so that it matches what is returned by release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/avrdude/avrdude.hash | 2 +- package/avrdude/avrdude.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index 1c7758afcd..d53d4dd60d 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-6.4.tar.gz sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 5bbbc4e8c2..6a8e9074b7 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,8 +4,8 @@ # ################################################################################ -AVRDUDE_VERSION = v6.4 -AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) +AVRDUDE_VERSION = 6.4 +AVRDUDE_SITE = $(call github,avrdudes,avrdude,v$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ AVRDUDE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sun Jan 9 22:35:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:35:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: drop C++ comment In-Reply-To: <20220109221830.1343278-1-fontaine.fabrice@gmail.com> References: <20220109221830.1343278-1-fontaine.fabrice@gmail.com> Message-ID: <20220109223548.GL1477939@scaer> Fabrice, All, On 2022-01-09 23:18 +0100, Fabrice Fontaine spake thusly: > Commit f81242ae4fb64ab85af5d38e70246222276552ae forgot to drop C++ > comment Yeah, thanks for fixing my mess! :-) > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libvirt/Config.in | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in > index aeb560a498..5a6b067a0d 100644 > --- a/package/libvirt/Config.in > +++ b/package/libvirt/Config.in > @@ -50,9 +50,6 @@ config BR2_PACKAGE_LIBVIRT_DAEMON > Build the libvirt daemon (libvirtd) otherwise build only the > utility programs. > > -comment "libvirtd needs a toolchain w/ C++" > - depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD > - > # Stateful drivers are useful only when building the daemon. > if BR2_PACKAGE_LIBVIRT_DAEMON > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 22:36:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:36:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/avrdude: fix version In-Reply-To: <20220109222203.1397934-1-fontaine.fabrice@gmail.com> References: <20220109222203.1397934-1-fontaine.fabrice@gmail.com> Message-ID: <20220109223625.GM1477939@scaer> Fabrice, All, On 2022-01-09 23:22 +0100, Fabrice Fontaine spake thusly: > Fix AVRDUDE_VERSION so that it matches what is returned by > release-monitoring.org Thanks for spotting that, I totally missed it... > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/avrdude/avrdude.hash | 2 +- > package/avrdude/avrdude.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash > index 1c7758afcd..d53d4dd60d 100644 > --- a/package/avrdude/avrdude.hash > +++ b/package/avrdude/avrdude.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz > +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-6.4.tar.gz > sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index 5bbbc4e8c2..6a8e9074b7 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -AVRDUDE_VERSION = v6.4 > -AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) > +AVRDUDE_VERSION = 6.4 > +AVRDUDE_SITE = $(call github,avrdudes,avrdude,v$(AVRDUDE_VERSION)) > AVRDUDE_LICENSE = GPL-2.0+ > AVRDUDE_LICENSE_FILES = COPYING > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Sun Jan 9 22:40:56 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 15:40:56 -0700 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: On Sat, Jan 8, 2022 at 2:31 PM Norbert Lange wrote: > > Am Sa., 8. Jan. 2022 um 20:04 Uhr schrieb James Hilliard > : > > > > On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange wrote: > > > > > > Systemd has very many options, adding a way for the user > > > to set custom options can help customizations > > > without changing buildroot files. > > > > I'm not sure this is a good idea, if a configuration option needs > > customizability it > > probably needs a specific kconfig option. Systemd config options tend to require > > dependency selection and special handling so this seems likely to cause > > spurious errors due to improper usage. Seems to be a pretty big footgun IMO. > > Sure, you are aware that many of my buildroot patches are stuck in limbo > since early 2020? Different issue IMO. > Just doesnt seem feasible to timely fix everything and version bumps often leave > more untapped options. Some part of the necessity would be just being pragmatic. I generally try to add any new options when bumping but I sometimes miss some. > > One example would be using the unified cgroups hierarchy > (-Ddefault-hierarchy=unified), hybrid is pretty much deprecated, > and some systemd features that buildroot allows to enable (OOMD for example) > wont work without it. I mean, this sounds like something that needs to be fixed in upstream buildroot. > > > > > What systemd configure option would you want to be using that isn't > > currently able to be enabled? > > FYI those are the ones I currently use: > > -Ddefault-hierarchy=unified \ > -Dutmp=false \ > -Ddefault-dnssec=no \ > -Didn=false \ > -Denvironment-d=false \ > -Dxdg-autostart=false \ > -Ddns-over-tls=false \ > -Ddefault-llmnr=no \ > -Ddns-over-tls=false \ > -Ddefault-mdns=no \ > -Dlz4=false I'm seeing a lot of these added though(I remember adding some of them myself), are you trying to use a newer systemd than the version supported by the buildroot version you are building from? Note that systemd defaults can generally be overridden via configs in the overlay as well. > > Norbert From arnout at mind.be Sun Jan 9 22:41:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:41:17 +0100 Subject: [Buildroot] [PATCH v2] package/moby-buildkit: new package In-Reply-To: <20220109210607.2270978-1-romain.naour@smile.fr> References: <20220109210607.2270978-1-romain.naour@smile.fr> Message-ID: On 09/01/2022 22:06, Romain Naour wrote: > From: Christian Stewart > > Signed-off-by: Christian Stewart > [Romain: > - remove host-pkgconf dependency > - Add the license file hash > - Fix the check-package warning in Config.in] > Signed-off-by: Romain Naour Applied to master, thanks. I also added Christian to DEVELOPERS. Regards, Arnout > --- > > The license file hash was a copy past error. > The 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 belong to > balena-engine package from [1] > > [1] https://git.buildroot.net/buildroot/commit/?id=cb0d87004c824dc6bb421fe8316428d51e1335bd > --- > package/Config.in | 1 + > package/moby-buildkit/Config.in | 19 +++++++++++++++++++ > package/moby-buildkit/moby-buildkit.hash | 3 +++ > package/moby-buildkit/moby-buildkit.mk | 22 ++++++++++++++++++++++ > 4 files changed, 45 insertions(+) > create mode 100644 package/moby-buildkit/Config.in > create mode 100644 package/moby-buildkit/moby-buildkit.hash > create mode 100644 package/moby-buildkit/moby-buildkit.mk > > diff --git a/package/Config.in b/package/Config.in > index edae7e4f62..7bf17f486e 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2554,6 +2554,7 @@ menu "System tools" > source "package/mender/Config.in" > source "package/mender-grubenv/Config.in" > source "package/mfoc/Config.in" > + source "package/moby-buildkit/Config.in" > source "package/monit/Config.in" > source "package/multipath-tools/Config.in" > source "package/ncdu/Config.in" > diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in > new file mode 100644 > index 0000000000..93c852bcdb > --- /dev/null > +++ b/package/moby-buildkit/Config.in > @@ -0,0 +1,19 @@ > +config BR2_PACKAGE_MOBY_BUILDKIT > + bool "moby-buildkit" > + 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 > + depends on BR2_USE_MMU > + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency > + help > + BuildKit is a toolkit for converting source code to build > + artifacts in an efficient, expressive and repeatable manner. > + > + https://github.com/moby/buildkit > + > +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" > + 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 || BR2_TOOLCHAIN_USES_UCLIBC > + depends on BR2_USE_MMU > diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash > new file mode 100644 > index 0000000000..3015e479f6 > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz > +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk > new file mode 100644 > index 0000000000..3f0df351ef > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# moby-buildkit > +# > +################################################################################ > + > +MOBY_BUILDKIT_VERSION = 0.8.1 > +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) > +MOBY_BUILDKIT_LICENSE = Apache-2.0 > +MOBY_BUILDKIT_LICENSE_FILES = LICENSE > + > +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit > + > +MOBY_BUILDKIT_TAGS = cgo > +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd > + > +MOBY_BUILDKIT_LDFLAGS = \ > + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" > + > +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) > + > +$(eval $(golang-package)) > From arnout at mind.be Sun Jan 9 22:41:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:41:43 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Giulio Benetti as co-maintainer to mali-driver and rockchip-mali packages In-Reply-To: <20220109214724.94900-1-giulio.benetti@benettiengineering.com> References: <20220109214724.94900-1-giulio.benetti@benettiengineering.com> Message-ID: <68cd9523-d7f3-3f7d-0cc0-cddb7711a1f9@mind.be> On 09/01/2022 22:47, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ed65c74319..09da2dda1a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1093,9 +1093,11 @@ F: package/harfbuzz/ > F: package/libfuse3/ > F: package/libnspr/ > F: package/libnss/ > +F: package/mali-driver/ > F: package/minicom/ > F: package/nfs-utils/ > F: package/python-uvloop/ > +F: package/rockchip-mali/ > F: package/sunxi-mali-utgard/ > F: package/sunxi-mali-utgard-driver/ > F: package/trace-cmd/ > From arnout at mind.be Sun Jan 9 22:45:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:45:53 +0100 Subject: [Buildroot] [PATCH] package/avrdude: add support for hidapi In-Reply-To: <20220109205946.14456-1-yegorslists@googlemail.com> References: <20220109205946.14456-1-yegorslists@googlemail.com> Message-ID: <3a7818ff-a958-0bce-2d08-10fe8f000721@mind.be> On 09/01/2022 21:59, yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > If BR2_PACKAGE_HIDAPI is selected, add it to avrdude build > dependencies. > > Signed-off-by: Yegor Yefremov Applied to master, thanks. Regards, Arnout > --- > package/avrdude/avrdude.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index 5bbbc4e8c2..63cc3bbc7e 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -28,6 +28,10 @@ else ifeq ($(BR2_PACKAGE_LIBFTDI),y) > AVRDUDE_DEPENDENCIES += libftdi > endif > > +ifeq ($(BR2_PACKAGE_HIDAPI),y) > +AVRDUDE_DEPENDENCIES += hidapi > +endif > + > # if /etc/avrdude.conf exists, the installation process creates a > # backup file, which we do not want in the context of Buildroot. > define AVRDUDE_REMOVE_BACKUP_FILE > From arnout at mind.be Sun Jan 9 22:46:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:46:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrok: fix C++ build with glibmm 2.68 In-Reply-To: <20220108230259.3703237-1-fontaine.fabrice@gmail.com> References: <20220108230259.3703237-1-fontaine.fabrice@gmail.com> Message-ID: <77b3c32f-3794-7504-de10-6c9a11beeb24@mind.be> On 09/01/2022 00:02, Fabrice Fontaine wrote: > cxx bindings are, silently, disabled since bump of glibmm to version > 2.68.2 in commit dddb65efbdf2c7952f22a1e51009f17f1676db4a resulting in > the following build failure with pulseview: > > -- Package 'libsigrokcxx', required by 'virtual:world', not found > > Fixes: > - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../libsigrok/0001-Support-glibmm-2.68.patch | 129 ++++++++++++++++++ > package/libsigrok/libsigrok.mk | 3 + > 2 files changed, 132 insertions(+) > create mode 100644 package/libsigrok/0001-Support-glibmm-2.68.patch > > diff --git a/package/libsigrok/0001-Support-glibmm-2.68.patch b/package/libsigrok/0001-Support-glibmm-2.68.patch > new file mode 100644 > index 0000000000..14d14ec406 > --- /dev/null > +++ b/package/libsigrok/0001-Support-glibmm-2.68.patch > @@ -0,0 +1,129 @@ > +From 31ad5ec50ec0c9cc7a92f009925c5f58aecdcce1 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 30 Dec 2021 14:58:11 +0100 > +Subject: [PATCH] Support glibmm 2.68 > + > +Support glibmm 2.68 which has been released one year ago and is the > +first stable release in the glibmm-2.68 ABI series: > +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS > + > +As TimeVal is not available with glibmm 2.68, use DateTime which is > +available since version 2.26 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://sourceforge.net/p/sigrok/mailman/message/37410614] > +--- > + README | 2 +- > + bindings/cxx/classes.cpp | 13 ++++++------- > + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp | 4 ++-- > + bindings/cxx/libsigrokcxx.pc.in | 2 +- > + configure.ac | 7 ++++++- > + 5 files changed, 16 insertions(+), 12 deletions(-) > + > +diff --git a/README b/README > +index 768c8ca2..2515f059 100644 > +--- a/README > ++++ b/README > +@@ -63,7 +63,7 @@ Requirements for the C++ bindings: > + - doxygen (required for building the bindings, not only for C++ API docs!) > + - graphviz (optional, only needed for the C++ API docs) > + - Python (2 or 3) executable (development files are not needed) > +- - glibmm-2.4 (>= 2.32.0) > ++ - glibmm-2.4 (>= 2.32.0) or glibmm-2.68 (>= 2.68.0) > + > + Requirements for the Python bindings: > + > +diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp > +index f9f79273..de600d03 100644 > +--- a/bindings/cxx/classes.cpp > ++++ b/bindings/cxx/classes.cpp > +@@ -287,12 +287,12 @@ shared_ptr Context::create_user_device( > + default_delete{}}; > + } > + > +-shared_ptr Context::create_header_packet(Glib::TimeVal start_time) > ++shared_ptr Context::create_header_packet(Glib::DateTime start_time) > + { > + auto header = g_new(struct sr_datafeed_header, 1); > + header->feed_version = 1; > +- header->starttime.tv_sec = start_time.tv_sec; > +- header->starttime.tv_usec = start_time.tv_usec; > ++ header->starttime.tv_sec = start_time.to_unix(); > ++ header->starttime.tv_usec = start_time.get_microsecond(); > + auto packet = g_new(struct sr_datafeed_packet, 1); > + packet->type = SR_DF_HEADER; > + packet->payload = header; > +@@ -1154,11 +1154,10 @@ int Header::feed_version() const > + return _structure->feed_version; > + } > + > +-Glib::TimeVal Header::start_time() const > ++Glib::DateTime Header::start_time() const > + { > +- return Glib::TimeVal( > +- _structure->starttime.tv_sec, > +- _structure->starttime.tv_usec); > ++ Glib::DateTime time = Glib::DateTime::create_now_utc(_structure->starttime.tv_sec); > ++ return time.add_seconds(_structure->starttime.tv_usec / 1.0e6); > + } > + > + Meta::Meta(const struct sr_datafeed_meta *structure) : > +diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp > +index 97e54e17..d090c379 100644 > +--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp > ++++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp > +@@ -274,7 +274,7 @@ public: > + std::shared_ptr create_user_device( > + std::string vendor, std::string model, std::string version); > + /** Create a header packet. */ > +- std::shared_ptr create_header_packet(Glib::TimeVal start_time); > ++ std::shared_ptr create_header_packet(Glib::DateTime start_time); > + /** Create a meta packet. */ > + std::shared_ptr create_meta_packet( > + std::map config); > +@@ -711,7 +711,7 @@ public: > + /* Feed version number. */ > + int feed_version() const; > + /* Start time of this session. */ > +- Glib::TimeVal start_time() const; > ++ Glib::DateTime start_time() const; > + private: > + explicit Header(const struct sr_datafeed_header *structure); > + ~Header(); > +diff --git a/bindings/cxx/libsigrokcxx.pc.in b/bindings/cxx/libsigrokcxx.pc.in > +index 10a92f2d..7d2723fc 100644 > +--- a/bindings/cxx/libsigrokcxx.pc.in > ++++ b/bindings/cxx/libsigrokcxx.pc.in > +@@ -6,7 +6,7 @@ includedir=@includedir@ > + Name: libsigrokcxx > + Description: C++ bindings for libsigrok > + URL: http://www.sigrok.org > +-Requires: libsigrok glibmm-2.4 > ++Requires: libsigrok @SR_GLIBMM_REQUIRES@ > + Version: @SR_PACKAGE_VERSION@ > + Libs: -L${libdir} -lsigrokcxx > + Libs.private: -lm > +diff --git a/configure.ac b/configure.ac > +index 424b0002..d70575b7 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -407,9 +407,14 @@ AS_IF([test "x$HAVE_CXX11" != x1], > + [SR_APPEND([sr_cxx_missing], [', '], ['C++11'])]) > + > + # The C++ bindings need glibmm. > +-SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0]) > ++SR_GLIBMM_REQUIRES=glibmm-2.4 > ++SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.32.0]) > ++AS_IF([test "x$sr_have_glibmm" != xyes], > ++ [SR_GLIBMM_REQUIRES=glibmm-2.68 > ++ SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.68.0])]) > + AS_IF([test "x$sr_have_glibmm" != xyes], > + [SR_APPEND([sr_cxx_missing], [', '], [glibmm])]) > ++AC_SUBST(SR_GLIBMM_REQUIRES) > + > + # The C++ bindings use Doxygen to parse libsigrok symbols. > + AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no]) > +-- > +2.34.1 > + > diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk > index 8e7c355fd0..2a26518614 100644 > --- a/package/libsigrok/libsigrok.mk > +++ b/package/libsigrok/libsigrok.mk > @@ -11,6 +11,8 @@ LIBSIGROK_LICENSE_FILES = COPYING > LIBSIGROK_INSTALL_STAGING = YES > LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf > LIBSIGROK_CONF_OPTS = --disable-java --disable-python > +# We're patching configure.ac > +LIBSIGROK_AUTORECONF = YES > > ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) > LIBSIGROK_CONF_OPTS += --with-libbluez > @@ -52,6 +54,7 @@ LIBSIGROK_DEPENDENCIES += glibmm > endif > > ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) > +LIBSIGROK_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++17" > LIBSIGROK_CONF_OPTS += --enable-cxx > # host-doxygen is used by C++ bindings to parse libsigrok symbols > LIBSIGROK_DEPENDENCIES += \ > From romain.naour at smile.fr Sun Jan 9 22:46:12 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 23:46:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmapnik: new package In-Reply-To: <20210205051640.9602-1-fido_max@inbox.ru> References: <20210205051640.9602-1-fido_max@inbox.ru> Message-ID: Hello Maxim, All Le 05/02/2021 ? 06:16, Maxim Kochetkov via buildroot a ?crit?: > Mapnik is an open source toolkit for developing mapping applications. > At the core is a C++ shared library providing algorithms and patterns > for spatial data access and visualization. Mapnik is basically > a collection of geographic objects like maps, layers, datasources, > features, and geometries. > The library doesn't rely on any OS specific "windowing systems" and > it can be deployed to any server environment. It is intended to play fair > in a multi-threaded environment and is aimed primarily, but > not exclusively, at web-based development. > For further information see http://mapnik.org and also our wiki > documentation. > > https://github.com/mapnik/mapnik > > Signed-off-by: Maxim Kochetkov > --- > package/Config.in | 1 + > ...-to-check-dlfcn-when-cross-compiling.patch | 34 ++++++ > ...-libs-detection-when-cross-compiling.patch | 50 +++++++++ > ...-data-detection-when-cross-compiling.patch | 70 ++++++++++++ > package/libmapnik/Config.in | 29 +++++ > package/libmapnik/libmapnik.mk | 100 ++++++++++++++++++ > 6 files changed, 284 insertions(+) > create mode 100644 package/libmapnik/0001-Allow-to-check-dlfcn-when-cross-compiling.patch > create mode 100644 package/libmapnik/0002-Allow-optional-libs-detection-when-cross-compiling.patch > create mode 100644 package/libmapnik/0003-Allow-lib-data-detection-when-cross-compiling.patch > create mode 100644 package/libmapnik/Config.in > create mode 100644 package/libmapnik/libmapnik.mk > > diff --git a/package/Config.in b/package/Config.in > index 06dfc32cc6..7ef9d9d1dd 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1909,6 +1909,7 @@ menu "Other" > source "package/libite/Config.in" > source "package/liblinear/Config.in" > source "package/libloki/Config.in" > + source "package/libmapnik/Config.in" > source "package/libnpth/Config.in" > source "package/libnspr/Config.in" > source "package/libpfm4/Config.in" > diff --git a/package/libmapnik/0001-Allow-to-check-dlfcn-when-cross-compiling.patch b/package/libmapnik/0001-Allow-to-check-dlfcn-when-cross-compiling.patch > new file mode 100644 > index 0000000000..fa25de7346 > --- /dev/null > +++ b/package/libmapnik/0001-Allow-to-check-dlfcn-when-cross-compiling.patch > @@ -0,0 +1,34 @@ > +From 45441e99809ee6cd75b9691bff35127936e96f28 Mon Sep 17 00:00:00 2001 > +From: fidomax > +Date: Thu, 28 Jan 2021 14:34:34 +0300 > +Subject: [PATCH 1/3] Allow to check dlfcn when cross-compiling > + > +Signed-off-by: Maxim Kochetkov > +Fetch from: https://github.com/mapnik/mapnik/commit/28ff0be6b91db2891e040b482fce45a532ab0add.patch > +--- > + SConstruct | 9 ++++----- > + 1 file changed, 4 insertions(+), 5 deletions(-) > + > +diff --git a/SConstruct b/SConstruct > +index 35b68f73c..6e169e34c 100644 > +--- a/SConstruct > ++++ b/SConstruct > +@@ -1545,11 +1545,10 @@ if not preconfigured: > + else: > + env['MISSING_DEPS'].append('libxml2') > + > +- if not env['HOST']: > +- if conf.CheckHasDlfcn(): > +- env.Append(CPPDEFINES = '-DMAPNIK_HAS_DLCFN') > +- else: > +- env['SKIPPED_DEPS'].append('dlfcn') > ++ if conf.CheckHasDlfcn(): > ++ env.Append(CPPDEFINES = '-DMAPNIK_HAS_DLCFN') > ++ else: > ++ env['SKIPPED_DEPS'].append('dlfcn') > + > + if env['JPEG']: > + OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG']) > +-- > +2.29.2 > + > diff --git a/package/libmapnik/0002-Allow-optional-libs-detection-when-cross-compiling.patch b/package/libmapnik/0002-Allow-optional-libs-detection-when-cross-compiling.patch > new file mode 100644 > index 0000000000..1291f6de66 > --- /dev/null > +++ b/package/libmapnik/0002-Allow-optional-libs-detection-when-cross-compiling.patch > @@ -0,0 +1,50 @@ > +From 3ef9f8296e5308c00b6558e750f7f7fbff45a743 Mon Sep 17 00:00:00 2001 > +From: fidomax > +Date: Thu, 28 Jan 2021 14:48:32 +0300 > +Subject: [PATCH 2/3] Allow optional libs detection when cross-compiling > + > +Signed-off-by: Maxim Kochetkov > +Fetch from: https://github.com/mapnik/mapnik/commit/cf9bde7bf1033f800e5bc9640c586369d45814c6.patch > +--- > + SConstruct | 17 +++++++---------- > + 1 file changed, 7 insertions(+), 10 deletions(-) > + > +diff --git a/SConstruct b/SConstruct > +index 6e169e34c..9e03db662 100644 > +--- a/SConstruct > ++++ b/SConstruct > +@@ -1692,7 +1692,7 @@ if not preconfigured: > + elif boost_version < [1, 57]: > + env.Append(CXXFLAGS = '-DBOOST_NO_CXX11_SCOPED_ENUMS') > + > +- if not env['HOST'] and env['ICU_LIB_NAME'] not in env['MISSING_DEPS']: > ++ if env['ICU_LIB_NAME'] not in env['MISSING_DEPS']: > + # http://lists.boost.org/Archives/boost/2009/03/150076.php > + # we need libicui18n if using static boost libraries, so it is > + # important to try this check with the library linked > +@@ -1703,16 +1703,13 @@ if not preconfigured: > + env['SKIPPED_DEPS'].append('boost_regex_icu') > + > + for libname, headers, required, lang, define in OPTIONAL_LIBSHEADERS: > +- if not env['HOST']: > +- if not conf.CheckLibWithHeader(libname, headers, lang): > +- if required: > +- color_print(1, 'Could not find required header or shared library for %s' % libname) > +- env['MISSING_DEPS'].append(libname) > +- else: > +- color_print(4, 'Could not find optional header or shared library for %s' % libname) > +- env['SKIPPED_DEPS'].append(libname) > ++ if not conf.CheckLibWithHeader(libname, headers, lang): > ++ if required: > ++ color_print(1, 'Could not find required header or shared library for %s' % libname) > ++ env['MISSING_DEPS'].append(libname) > + else: > +- env.Append(CPPDEFINES = define) > ++ color_print(4, 'Could not find optional header or shared library for %s' % libname) > ++ env['SKIPPED_DEPS'].append(libname) > + else: > + env.Append(CPPDEFINES = define) > + > +-- > +2.29.2 > + > diff --git a/package/libmapnik/0003-Allow-lib-data-detection-when-cross-compiling.patch b/package/libmapnik/0003-Allow-lib-data-detection-when-cross-compiling.patch > new file mode 100644 > index 0000000000..5a6d503dc6 > --- /dev/null > +++ b/package/libmapnik/0003-Allow-lib-data-detection-when-cross-compiling.patch > @@ -0,0 +1,70 @@ > +From 3e48998d7beb2f6277ed955b1698c6ce581fad01 Mon Sep 17 00:00:00 2001 > +From: fidomax > +Date: Thu, 28 Jan 2021 15:15:19 +0300 > +Subject: [PATCH 3/3] Allow lib/data detection when cross-compiling generate your patches with 'git format-patch -N'. > + > +Signed-off-by: Maxim Kochetkov > +Fetch from: https://github.com/mapnik/mapnik/commit/4b0d181f6e3dbfe9fdb59fd1fdbd1a6986aaafda.patch Usually we add the patch upstream status: Upstream status: Pending Your patch come from the PR you created: https://github.com/mapnik/mapnik/pull/4208 > +--- > + SConstruct | 45 ++++++++++++++++++++++----------------------- > + 1 file changed, 22 insertions(+), 23 deletions(-) > + > +diff --git a/SConstruct b/SConstruct > +index 9e03db662..4989e6607 100644 > +--- a/SConstruct > ++++ b/SConstruct > +@@ -1719,29 +1719,28 @@ if not preconfigured: > + if env['HOST']: > + SQLITE_HAS_RTREE = True > + > +- if not env['HOST']: > +- env['QUERIED_PROJ_LIB'] = conf.CheckProjData() > +- if os.environ.get('PROJ_LIB'): > +- env['QUERIED_PROJ_LIB'] = os.environ['PROJ_LIB'] > +- color_print(4,'Detected PROJ_LIB in environ, using env value instead: %s' % os.environ['PROJ_LIB'] ) > +- env['QUERIED_ICU_DATA'] = conf.CheckIcuData() > +- if os.environ.get('ICU_DATA'): > +- env['QUERIED_ICU_DATA'] = os.environ['ICU_DATA'] > +- color_print(4,'Detected ICU_DATA in environ, using env value instead: %s' % os.environ['ICU_DATA'] ) > +- env['QUERIED_GDAL_DATA'] = conf.CheckGdalData() > +- if os.environ.get('GDAL_DATA'): > +- env['QUERIED_GDAL_DATA'] = os.environ['GDAL_DATA'] > +- color_print(4,'Detected GDAL_DATA in environ, using env value instead: %s' % os.environ['GDAL_DATA'] ) > +- # now validate the paths actually exist > +- if env['QUERIED_PROJ_LIB'] and not os.path.exists(env['QUERIED_PROJ_LIB']): > +- color_print(1,'%s not detected on your system' % env['QUERIED_PROJ_LIB'] ) > +- env['MISSING_DEPS'].append('PROJ_LIB') > +- if env['QUERIED_GDAL_DATA'] and not os.path.exists(env['QUERIED_GDAL_DATA']): > +- color_print(1,'%s not detected on your system' % env['QUERIED_GDAL_DATA'] ) > +- env['MISSING_DEPS'].append('GDAL_DATA') > +- if env['QUERIED_ICU_DATA'] and not os.path.exists(env['QUERIED_ICU_DATA']): > +- color_print(1,'%s not detected on your system' % env['QUERIED_ICU_DATA'] ) > +- env['MISSING_DEPS'].append('ICU_DATA') > ++ env['QUERIED_PROJ_LIB'] = conf.CheckProjData() > ++ if os.environ.get('PROJ_LIB'): > ++ env['QUERIED_PROJ_LIB'] = os.environ['PROJ_LIB'] > ++ color_print(4,'Detected PROJ_LIB in environ, using env value instead: %s' % os.environ['PROJ_LIB'] ) > ++ env['QUERIED_ICU_DATA'] = conf.CheckIcuData() > ++ if os.environ.get('ICU_DATA'): > ++ env['QUERIED_ICU_DATA'] = os.environ['ICU_DATA'] > ++ color_print(4,'Detected ICU_DATA in environ, using env value instead: %s' % os.environ['ICU_DATA'] ) > ++ env['QUERIED_GDAL_DATA'] = conf.CheckGdalData() > ++ if os.environ.get('GDAL_DATA'): > ++ env['QUERIED_GDAL_DATA'] = os.environ['GDAL_DATA'] > ++ color_print(4,'Detected GDAL_DATA in environ, using env value instead: %s' % os.environ['GDAL_DATA'] ) > ++ # now validate the paths actually exist > ++ if env['QUERIED_PROJ_LIB'] and not os.path.exists(env['QUERIED_PROJ_LIB']): > ++ color_print(1,'%s not detected on your system' % env['QUERIED_PROJ_LIB'] ) > ++ env['MISSING_DEPS'].append('PROJ_LIB') > ++ if env['QUERIED_GDAL_DATA'] and not os.path.exists(env['QUERIED_GDAL_DATA']): > ++ color_print(1,'%s not detected on your system' % env['QUERIED_GDAL_DATA'] ) > ++ env['MISSING_DEPS'].append('GDAL_DATA') > ++ if env['QUERIED_ICU_DATA'] and not os.path.exists(env['QUERIED_ICU_DATA']): > ++ color_print(1,'%s not detected on your system' % env['QUERIED_ICU_DATA'] ) > ++ env['MISSING_DEPS'].append('ICU_DATA') > + > + if len(env['REQUESTED_PLUGINS']): > + if env['HOST']: > +-- > +2.29.2 > + > diff --git a/package/libmapnik/Config.in b/package/libmapnik/Config.in > new file mode 100644 > index 0000000000..06428e59a2 > --- /dev/null > +++ b/package/libmapnik/Config.in > @@ -0,0 +1,29 @@ > +config BR2_PACKAGE_LIBMAPNIK > + bool "libmapnik" There is not dependency ? At least you have to add all reverse dependencies. For example icu package needs the following dependencies: depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 PR56019 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 PR56019 depends on BR2_TOOLCHAIN_HAS_THREADS Same for all other package selected by libmapnik. The SConstruct seems to add -std=c++14 for C++14. This requires a more recent gcc compiler (BR2_TOOLCHAIN_GCC_AT_LEAST_5) > + select BR2_PACKAGE_ICU> + select BR2_PACKAGE_HARFBUZZ > + select BR2_PACKAGE_CAIRO > + select BR2_PACKAGE_CAIRO_PNG > + select BR2_PACKAGE_CAIRO_SVG > + select BR2_PACKAGE_POSTGRESQL > + select BR2_PACKAGE_BOOST > + select BR2_PACKAGE_BOOST_FILESYSTEM > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > + select BR2_PACKAGE_BOOST_REGEX > + select BR2_PACKAGE_LIBXML2 > + select BR2_PACKAGE_SQLITE Have you tested with several toolchains ? You can use the script ./utils/test-pkg to do a build test for all supported architectures, supported libc and different gcc compiler versions. > + > + help > + Mapnik is an open source toolkit for developing mapping applications. > + At the core is a C++ shared library providing algorithms and patterns > + for spatial data access and visualization. Mapnik is basically > + a collection of geographic objects like maps, layers, datasources, > + features, and geometries. > + The library doesn't rely on any OS specific "windowing systems" and > + it can be deployed to any server environment. It is intended to play fair > + in a multi-threaded environment and is aimed primarily, but > + not exclusively, at web-based development. > + For further information see http://mapnik.org and also our wiki > + documentation. Use ./utils/check-package package/libmapnik/* to check the coding style: package/libmapnik/Config.in:17: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:18: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:20: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:22: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:22: line contains trailing whitespace package/libmapnik/Config.in:23: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:24: line contains trailing whitespace package/libmapnik/Config.in:26: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > + > + https://github.com/mapnik/mapnik > diff --git a/package/libmapnik/libmapnik.mk b/package/libmapnik/libmapnik.mk > new file mode 100644 > index 0000000000..2a019375fd > --- /dev/null > +++ b/package/libmapnik/libmapnik.mk > @@ -0,0 +1,100 @@ > +################################################################################ > +# > +# libmapnik > +# > +################################################################################ > + > +LIBMAPNIK_VERSION = 3.1.0 > +LIBMAPNIK_SITE = https://github.com/mapnik/mapnik/releases/download/v$(LIBMAPNIK_VERSION) > +LIBMAPNIK_SOURCE = mapnik-v$(LIBMAPNIK_VERSION).tar.bz2 > +LIBMAPNIK_LICENSE = LGPL It's a LGPL-2.1 license Use SPDX-License-Identifier. > +LIBMAPNIK_LICENSE_FILES = $(LIBMAPNIK_SUBDIR)/COPYING LIBMAPNIK_SUBDIR is not needed here. The COPYING file is in the main source directory. > +LIBMAPNIK_DEPENDENCIES += host-python3 host-scons icu harfbuzz freetype postgresql boost cairo libxml2 sqlite > +LIBMAPNIK_SCONS_ENV = $(TARGET_CONFIGURE_OPTS) > +LIBMAPNIK_INSTALL_STAGING = YES > + > +ifeq ($(BR2_PACKAGE_JPEG),y) > +LIBMAPNIK_DEPENDENCIES += jpeg > +endif For all optionnal dependencies we needs to handle explicitely the variable provided by the build system. ifeq ($(BR2_PACKAGE_JPEG),y) LIBMAPNIK_DEPENDENCIES += jpeg LIBMAPNIK_SCONS_OPTS += JPEG="True" else LIBMAPNIK_SCONS_OPTS += JPEG="False" endif > + > +ifeq ($(BR2_PACKAGE_PROJ),y) > +LIBMAPNIK_DEPENDENCIES += proj > +endif > + > +ifeq ($(BR2_PACKAGE_LIBPNG),y) > +LIBMAPNIK_DEPENDENCIES += libpng > +endif > + > +ifeq ($(BR2_PACKAGE_WEBP),y) > +LIBMAPNIK_DEPENDENCIES += webp > +endif > + > +ifeq ($(BR2_PACKAGE_TIFF),y) > +LIBMAPNIK_DEPENDENCIES += tiff > +endif > + > + > +LIBMAPNIK_SCONS_OPTS = \ Be carefull with previous LIBMAPNIK_SCONS_OPTS already set by optional dependencies. Maybe move this block before optional dependencies handling. > + CC="$(TARGET_CC)" \ > + CXX="$(TARGET_CXX)" \ Using $(TARGET_CONFIGURE_OPTS) whould set most common values used to cross-build a package. > + HOST="$(GNU_TARGET_NAME)" \ > + CUSTOM_CXXFLAGS="$(TARGET_CXXFLAGS) -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" \ > + CUSTOM_CFLAGS="$(TARGET_CFLAGS) -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" \ > + PLUGIN_LINKING=shared \ > + PREFIX=/usr \ > + DEMO=no \ > + CPP_TESTS=no \ > + PRIORITIZE_LINKING=no \ > + INPUT_PLUGINS=postgis,pgraster,sqlite,shape,csv,raster,geojson,topojson \ > + ICU_INCLUDES=$(STAGING_DIR)/usr/include \ > + ICU_LIBS=$(TARGET_DIR)/usr/lib \ > + SQLITE_INCLUDES=$(STAGING_DIR)/usr/include \ > + SQLITE_LIBS=$(TARGET_DIR)/usr/lib \ > + HB_INCLUDES=$(STAGING_DIR)/usr/include \ > + HB_LIBS=$(TARGET_DIR)/usr/lib \ > + JPEG_INCLUDES=$(STAGING_DIR)/usr/include \ > + JPEG_LIBS=$(TARGET_DIR)/usr/lib \ > + PROJ_INCLUDES=$(STAGING_DIR)/usr/include \ > + PROJ_LIBS=$(TARGET_DIR)/usr/lib \ > + PNG_INCLUDES=$(STAGING_DIR)/usr/include \ > + PNG_LIBS=$(TARGET_DIR)/usr/lib \ > + WEBP_INCLUDES=$(STAGING_DIR)/usr/include \ > + WEBP_LIBS=$(TARGET_DIR)/usr/lib \ > + TIFF_INCLUDES=$(STAGING_DIR)/usr/include \ > + TIFF_LIBS=$(TARGET_DIR)/usr/lib \ > + BOOST_INCLUDES=$(STAGING_DIR)/usr/include/boost \ > + BOOST_LIBS=$(TARGET_DIR)/usr/lib \ > + RASTERLITE_LIBS=$(TARGET_DIR)/usr/lib \ > + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig \ > + FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config The scons build system really needs all the above... > + > +define LIBMAPNIK_CONFIGURE_CMDS > + (export PROJ_LIB=$(TARGET_DIR)/usr/lib; cd $(@D); $(LIBMAPNIK_SCONS_ENV) $(HOST_DIR)/bin/python3 scons/scons.py configure Add PROJ_LIB directly in LIBMAPNIK_SCONS_ENV Maybe you can provide -j$(PARALLEL_JOBS) but the build system seems fragile... Try to replace "$(HOST_DIR)/bin/python3 scons/scons.py" by $(SCONS) $(LIBMAPNIK_SCONS_OPTS)) > +endef > + > +define LIBMAPNIK_BUILD_CMDS > + (cd $(@D); $(LIBMAPNIK_SCONS_ENV) $(HOST_DIR)/bin/python3 scons/scons.py) > +endef > + > +define LIBMAPNIK_INSTALL_STAGING_CMDS > + cp -rdpf $(@D)/src/libmapnik.* \ > + $(STAGING_DIR)/usr/lib/ > + $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/mapnik > + cp -rdpf $(@D)/include/mapnik/. \ > + $(STAGING_DIR)/usr/include/mapnik > + $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/mapbox > + cp -rdpf $(@D)/deps/mapbox/variant/include/mapbox/. \ > + $(STAGING_DIR)/usr/include/mapbox > + When possible use the intall command provided by the build system: DESTDIR=$(STAGING_DIR) $(SCONS) -j$(JOBS) --config=cache --implicit-cache --max-drift=1 install (see the install command from the Makefile) > +endef > + > +define LIBMAPNIK_INSTALL_TARGET_CMDS > + cp -rdpf $(@D)/src/libmapnik.* \ > + $(TARGET_DIR)/usr/lib/ > + $(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/lib/mapnik/input > + cp -rdpf $(@D)/plugins/input/*.input \ > + $(TARGET_DIR)/usr/lib/mapnik/input > + > +endef DESTDIR=$(STAGING_DIR) $(SCONS) -j$(JOBS) --config=cache --implicit-cache --max-drift=1 install I have marked this patch as "Changes Requested". Please use test-pkg script and post the test result. For example: https://gitlab.com/buildroot.org/buildroot/-/commit/c7e23ecd442032cc860b77135eda8bb8888d8f70 Best regards, Romain > + > +$(eval $(generic-package)) > From arnout at mind.be Sun Jan 9 22:48:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:48:56 +0100 Subject: [Buildroot] [PATCH v3 0/3] PEP517 host packages In-Reply-To: <20220109035601.2483360-1-james.hilliard1@gmail.com> References: <20220109035601.2483360-1-james.hilliard1@gmail.com> Message-ID: <34f36744-bb9d-f638-512a-ca42e711986c@mind.be> On 09/01/2022 04:55, James Hilliard wrote: > This series adds host packages that will be used for PEP517 based > python-package infrastructure in a future series. > > See: > https://www.python.org/dev/peps/pep-0517/ > > --- > Changes v2 -> v3: > - rebase on master > > James Hilliard (3): > package/python-pep517: new package > package/python-pypa-build: new package > package/python-installer: new package Series applied to master, after adding you to DEVELOPERS. Regards, Arnout > > .../python-installer/python-installer.hash | 5 +++++ > package/python-installer/python-installer.mk | 15 +++++++++++++++ > package/python-pep517/python-pep517.hash | 5 +++++ > package/python-pep517/python-pep517.mk | 16 ++++++++++++++++ > .../python-pypa-build/python-pypa-build.hash | 5 +++++ > .../python-pypa-build/python-pypa-build.mk | 19 +++++++++++++++++++ > 6 files changed, 65 insertions(+) > create mode 100644 package/python-installer/python-installer.hash > create mode 100644 package/python-installer/python-installer.mk > create mode 100644 package/python-pep517/python-pep517.hash > create mode 100644 package/python-pep517/python-pep517.mk > create mode 100644 package/python-pypa-build/python-pypa-build.hash > create mode 100644 package/python-pypa-build/python-pypa-build.mk > From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/python-pep517: new package Message-ID: <20220109224247.4E89D832B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=860e9b3f553511d772573427ebaa6371e205aa9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/python-pep517/python-pep517.hash | 5 +++++ package/python-pep517/python-pep517.mk | 16 ++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..260dcce912 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1306,6 +1306,7 @@ F: package/python-greenlet/ F: package/python-janus/ F: package/python-logstash/ F: package/python-multidict/ +F: package/python-pep517/ F: package/python-pycares/ F: package/python-pydyf/ F: package/python-pyphen/ diff --git a/package/python-pep517/python-pep517.hash b/package/python-pep517/python-pep517.hash new file mode 100644 index 0000000000..4dd4c47fa0 --- /dev/null +++ b/package/python-pep517/python-pep517.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pep517/json +md5 7ed0adb5f737c316e071d48d66329a5d pep517-0.12.0.tar.gz +sha256 931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 pep517-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk new file mode 100644 index 0000000000..da0431a637 --- /dev/null +++ b/package/python-pep517/python-pep517.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pep517 +# +################################################################################ + +PYTHON_PEP517_VERSION = 0.12.0 +PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz +PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 +PYTHON_PEP517_LICENSE = MIT +PYTHON_PEP517_LICENSE_FILES = LICENSE +PYTHON_PEP517_SETUP_TYPE = distutils +HOST_PYTHON_PEP517_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli + +$(eval $(host-python-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/python-installer: new package Message-ID: <20220109224247.634AC832C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f51c6f6b5c75499bb55be913b5c3533d5a8f648 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/python-installer/python-installer.hash | 5 +++++ package/python-installer/python-installer.mk | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1c83c53658..e715d8d353 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1303,6 +1303,7 @@ F: package/python-flatbuffers/ F: package/python-fonttools/ F: package/python-frozenlist/ F: package/python-greenlet/ +F: package/python-installer/ F: package/python-janus/ F: package/python-logstash/ F: package/python-multidict/ diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash new file mode 100644 index 0000000000..68af457664 --- /dev/null +++ b/package/python-installer/python-installer.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/installer/json +md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz +sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk new file mode 100644 index 0000000000..2c1d371dab --- /dev/null +++ b/package/python-installer/python-installer.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-installer +# +################################################################################ + +PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_LICENSE = MIT +PYTHON_INSTALLER_LICENSE_FILES = LICENSE +PYTHON_INSTALLER_SETUP_TYPE = distutils +HOST_PYTHON_INSTALLER_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/avrdude: add support for hidapi Message-ID: <20220109224247.87B10832C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7bdb65b3109a8256c6052f2cb35a989432f7a508 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If BR2_PACKAGE_HIDAPI is selected, add it to avrdude build dependencies. Signed-off-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/avrdude/avrdude.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 6a8e9074b7..accd92c1d5 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -28,6 +28,10 @@ else ifeq ($(BR2_PACKAGE_LIBFTDI),y) AVRDUDE_DEPENDENCIES += libftdi endif +ifeq ($(BR2_PACKAGE_HIDAPI),y) +AVRDUDE_DEPENDENCIES += hidapi +endif + # if /etc/avrdude.conf exists, the installation process creates a # backup file, which we do not want in the context of Buildroot. define AVRDUDE_REMOVE_BACKUP_FILE From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/libsigrok: fix C++ build with glibmm 2.68 Message-ID: <20220109224247.3B9328324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4872d527319d710d5ebc04ed0b93b4e4a733e035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cxx bindings are, silently, disabled since bump of glibmm to version 2.68.2 in commit dddb65efbdf2c7952f22a1e51009f17f1676db4a resulting in the following build failure with pulseview: -- Package 'libsigrokcxx', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libsigrok/0001-Support-glibmm-2.68.patch | 129 +++++++++++++++++++++++ package/libsigrok/libsigrok.mk | 3 + 2 files changed, 132 insertions(+) diff --git a/package/libsigrok/0001-Support-glibmm-2.68.patch b/package/libsigrok/0001-Support-glibmm-2.68.patch new file mode 100644 index 0000000000..14d14ec406 --- /dev/null +++ b/package/libsigrok/0001-Support-glibmm-2.68.patch @@ -0,0 +1,129 @@ +From 31ad5ec50ec0c9cc7a92f009925c5f58aecdcce1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 Dec 2021 14:58:11 +0100 +Subject: [PATCH] Support glibmm 2.68 + +Support glibmm 2.68 which has been released one year ago and is the +first stable release in the glibmm-2.68 ABI series: +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS + +As TimeVal is not available with glibmm 2.68, use DateTime which is +available since version 2.26 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceforge.net/p/sigrok/mailman/message/37410614] +--- + README | 2 +- + bindings/cxx/classes.cpp | 13 ++++++------- + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp | 4 ++-- + bindings/cxx/libsigrokcxx.pc.in | 2 +- + configure.ac | 7 ++++++- + 5 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/README b/README +index 768c8ca2..2515f059 100644 +--- a/README ++++ b/README +@@ -63,7 +63,7 @@ Requirements for the C++ bindings: + - doxygen (required for building the bindings, not only for C++ API docs!) + - graphviz (optional, only needed for the C++ API docs) + - Python (2 or 3) executable (development files are not needed) +- - glibmm-2.4 (>= 2.32.0) ++ - glibmm-2.4 (>= 2.32.0) or glibmm-2.68 (>= 2.68.0) + + Requirements for the Python bindings: + +diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp +index f9f79273..de600d03 100644 +--- a/bindings/cxx/classes.cpp ++++ b/bindings/cxx/classes.cpp +@@ -287,12 +287,12 @@ shared_ptr Context::create_user_device( + default_delete{}}; + } + +-shared_ptr Context::create_header_packet(Glib::TimeVal start_time) ++shared_ptr Context::create_header_packet(Glib::DateTime start_time) + { + auto header = g_new(struct sr_datafeed_header, 1); + header->feed_version = 1; +- header->starttime.tv_sec = start_time.tv_sec; +- header->starttime.tv_usec = start_time.tv_usec; ++ header->starttime.tv_sec = start_time.to_unix(); ++ header->starttime.tv_usec = start_time.get_microsecond(); + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_HEADER; + packet->payload = header; +@@ -1154,11 +1154,10 @@ int Header::feed_version() const + return _structure->feed_version; + } + +-Glib::TimeVal Header::start_time() const ++Glib::DateTime Header::start_time() const + { +- return Glib::TimeVal( +- _structure->starttime.tv_sec, +- _structure->starttime.tv_usec); ++ Glib::DateTime time = Glib::DateTime::create_now_utc(_structure->starttime.tv_sec); ++ return time.add_seconds(_structure->starttime.tv_usec / 1.0e6); + } + + Meta::Meta(const struct sr_datafeed_meta *structure) : +diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +index 97e54e17..d090c379 100644 +--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp ++++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +@@ -274,7 +274,7 @@ public: + std::shared_ptr create_user_device( + std::string vendor, std::string model, std::string version); + /** Create a header packet. */ +- std::shared_ptr create_header_packet(Glib::TimeVal start_time); ++ std::shared_ptr create_header_packet(Glib::DateTime start_time); + /** Create a meta packet. */ + std::shared_ptr create_meta_packet( + std::map config); +@@ -711,7 +711,7 @@ public: + /* Feed version number. */ + int feed_version() const; + /* Start time of this session. */ +- Glib::TimeVal start_time() const; ++ Glib::DateTime start_time() const; + private: + explicit Header(const struct sr_datafeed_header *structure); + ~Header(); +diff --git a/bindings/cxx/libsigrokcxx.pc.in b/bindings/cxx/libsigrokcxx.pc.in +index 10a92f2d..7d2723fc 100644 +--- a/bindings/cxx/libsigrokcxx.pc.in ++++ b/bindings/cxx/libsigrokcxx.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: libsigrokcxx + Description: C++ bindings for libsigrok + URL: http://www.sigrok.org +-Requires: libsigrok glibmm-2.4 ++Requires: libsigrok @SR_GLIBMM_REQUIRES@ + Version: @SR_PACKAGE_VERSION@ + Libs: -L${libdir} -lsigrokcxx + Libs.private: -lm +diff --git a/configure.ac b/configure.ac +index 424b0002..d70575b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -407,9 +407,14 @@ AS_IF([test "x$HAVE_CXX11" != x1], + [SR_APPEND([sr_cxx_missing], [', '], ['C++11'])]) + + # The C++ bindings need glibmm. +-SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0]) ++SR_GLIBMM_REQUIRES=glibmm-2.4 ++SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.32.0]) ++AS_IF([test "x$sr_have_glibmm" != xyes], ++ [SR_GLIBMM_REQUIRES=glibmm-2.68 ++ SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.68.0])]) + AS_IF([test "x$sr_have_glibmm" != xyes], + [SR_APPEND([sr_cxx_missing], [', '], [glibmm])]) ++AC_SUBST(SR_GLIBMM_REQUIRES) + + # The C++ bindings use Doxygen to parse libsigrok symbols. + AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no]) +-- +2.34.1 + diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 8e7c355fd0..2a26518614 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -11,6 +11,8 @@ LIBSIGROK_LICENSE_FILES = COPYING LIBSIGROK_INSTALL_STAGING = YES LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf LIBSIGROK_CONF_OPTS = --disable-java --disable-python +# We're patching configure.ac +LIBSIGROK_AUTORECONF = YES ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) LIBSIGROK_CONF_OPTS += --with-libbluez @@ -52,6 +54,7 @@ LIBSIGROK_DEPENDENCIES += glibmm endif ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) +LIBSIGROK_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++17" LIBSIGROK_CONF_OPTS += --enable-cxx # host-doxygen is used by C++ bindings to parse libsigrok symbols LIBSIGROK_DEPENDENCIES += \ From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/python-argon2-cffi-bindings: new package Message-ID: <20220109224247.6F02C8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7be02d67a939a42e323cd199798f215197bf5f87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-argon2-cffi-bindings/Config.in | 11 ++++++++++ .../python-argon2-cffi-bindings.hash | 5 +++++ .../python-argon2-cffi-bindings.mk | 25 ++++++++++++++++++++++ 5 files changed, 43 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e715d8d353..2aeb80844e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1291,6 +1291,7 @@ F: package/python-aiorwlock/ F: package/python-aiosignal/ F: package/python-aiozipkin/ F: package/python-argon2-cffi/ +F: package/python-argon2-cffi-bindings/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-bidict/ diff --git a/package/Config.in b/package/Config.in index 5e01187b83..c9d099bd39 100644 --- a/package/Config.in +++ b/package/Config.in @@ -928,6 +928,7 @@ menu "External python modules" source "package/python-ansicolors/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" + source "package/python-argon2-cffi-bindings/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in new file mode 100644 index 0000000000..3d409759e0 --- /dev/null +++ b/package/python-argon2-cffi-bindings/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS + bool "python-argon2-cffi-bindings" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU # libargon2 + depends on !BR2_STATIC_LIBS # libargon2 + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_LIBARGON2 + help + Low-level CFFI bindings for Argon2. + + https://github.com/hynek/argon2-cffi-bindings diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash new file mode 100644 index 0000000000..e088d3dad1 --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/argon2-cffi-bindings/json +md5 f1591e1af7dea9ef3e5b982e2c196c1d argon2-cffi-bindings-21.2.0.tar.gz +sha256 bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 argon2-cffi-bindings-21.2.0.tar.gz +# Locally computed sha256 checksums +sha256 9c158d4f433627f48ac24b6b4d37970afe4172514673c5318014d7cca157c6df LICENSE diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk new file mode 100644 index 0000000000..f0d71e803a --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# python-argon2-cffi-bindings +# +################################################################################ + +PYTHON_ARGON2_CFFI_BINDINGS_VERSION = 21.2.0 +PYTHON_ARGON2_CFFI_BINDINGS_SOURCE = argon2-cffi-bindings-$(PYTHON_ARGON2_CFFI_BINDINGS_VERSION).tar.gz +PYTHON_ARGON2_CFFI_BINDINGS_SITE = https://files.pythonhosted.org/packages/b9/e9/184b8ccce6683b0aa2fbb7ba5683ea4b9c5763f1356347f1312c32e3c66e +PYTHON_ARGON2_CFFI_BINDINGS_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE = MIT +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE_FILES = LICENSE +PYTHON_ARGON2_CFFI_BINDINGS_DEPENDENCIES = \ + host-python-cffi \ + host-python-setuptools-scm \ + libargon2 +PYTHON_ARGON2_CFFI_BINDINGS_ENV = ARGON2_CFFI_USE_SYSTEM=1 + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=1 +else +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=0 +endif + +$(eval $(python-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: fix build on kernel < 5.10 Message-ID: <20220109224247.772EB8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=570ed7b8229222de70c11c2550f4694475445997 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master zoned depends on kernel >= 5.10: https://github.com/kdave/btrfs-progs/commit/d4b4baf312ff083fb1e85de92167ea3e968c684c Fix the following build failure raised since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: checking linux/blkzoned.h usability... yes checking linux/blkzoned.h presence... yes checking for linux/blkzoned.h... yes checking for struct blk_zone.capacity... no checking for BLKGETZONESZ defined in linux/blkzoned.h... yes configure: error: linux/blkzoned.h does not provide blk_zone.capacity Fixes: - http://autobuild.buildroot.org/results/381c7e8b4bfa624c3eca3ce072cfa412aba57f84 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/btrfs-progs/btrfs-progs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index b010a0e0be..54922df839 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -44,6 +44,12 @@ else BTRFS_PROGS_CONF_OPTS += --disable-libudev endif +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10),y) +BTRFS_PROGS_CONF_OPTS += --enable-zoned +else +BTRFS_PROGS_CONF_OPTS += --disable-zoned +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Giulio Benetti as co-maintainer to mali-driver and rockchip-mali packages Message-ID: <20220109224247.9B301832B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=622a1f7140b5148031c16c40e2323e11af12da99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 933736de7d..55f37dfe62 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1094,9 +1094,11 @@ F: package/harfbuzz/ F: package/libfuse3/ F: package/libnspr/ F: package/libnss/ +F: package/mali-driver/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ +F: package/rockchip-mali/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/moby-buildkit: new package Message-ID: <20220109224247.92DB88324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e33104c26139f7a6cfc14d5a1b71ac552630e14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart [Romain: - remove host-pkgconf dependency - Add the license file hash - Fix the check-package warning in Config.in] Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/moby-buildkit/Config.in | 19 +++++++++++++++++++ package/moby-buildkit/moby-buildkit.hash | 3 +++ package/moby-buildkit/moby-buildkit.mk | 22 ++++++++++++++++++++++ 5 files changed, 46 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2aeb80844e..933736de7d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -533,6 +533,7 @@ F: package/fuse-overlayfs/ F: package/go/ F: package/gocryptfs/ F: package/mbpfan/ +F: package/moby-buildkit/ F: package/mosh/ F: package/pkg-golang.mk F: package/rtl8821au/ diff --git a/package/Config.in b/package/Config.in index c9d099bd39..a1924f96df 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2556,6 +2556,7 @@ menu "System tools" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" + source "package/moby-buildkit/Config.in" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in new file mode 100644 index 0000000000..93c852bcdb --- /dev/null +++ b/package/moby-buildkit/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_MOBY_BUILDKIT + bool "moby-buildkit" + 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 + depends on BR2_USE_MMU + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + help + BuildKit is a toolkit for converting source code to build + artifacts in an efficient, expressive and repeatable manner. + + https://github.com/moby/buildkit + +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" + 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 || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_USE_MMU diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash new file mode 100644 index 0000000000..3015e479f6 --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk new file mode 100644 index 0000000000..3f0df351ef --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# moby-buildkit +# +################################################################################ + +MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) +MOBY_BUILDKIT_LICENSE = Apache-2.0 +MOBY_BUILDKIT_LICENSE_FILES = LICENSE + +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit + +MOBY_BUILDKIT_TAGS = cgo +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd + +MOBY_BUILDKIT_LDFLAGS = \ + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" + +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) + +$(eval $(golang-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/vte: bump to version 0.66.2 Message-ID: <20220109224247.7FABD832B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53c0c7dd01228122c7ceb44d65f2800dbcf473f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to meson-package and so replace host-intltool dependency by TARGET_NLS_DEPENDENCIES: https://gitlab.gnome.org/GNOME/vte/-/issues/87 - Retrieve upstream hash - Switch license file to LGPL-3.0+: https://gitlab.gnome.org/GNOME/vte/-/commit/5e14529d4219f3792690566ef7ec70febd87e070 - Drop libxml2 dependency (not needed with meson) - Add uclibc or glibc dependency, upstream doesn't want to support musl: https://gitlab.gnome.org/GNOME/vte/-/issues/72 https://gitlab.gnome.org/GNOME/vte/-/issues/247 - Add optional icu dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/9e4fbae2cabcd937ac4d1a984ba844d24b44b83f - Add optional libfribidi dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/7d3704f1c54e58443624355835f675ec22c6b9d3 - Add optional systemd dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/81bd158c24ef1d716d3cbf801e72fda2e11b81b4 - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...build-with-kernel-headers-from-linux-4-13.patch | 54 ++++++++++++++++++++++ ...eck-for-fstack-protector-compiler-support.patch | 43 +++++++++++++++++ package/vte/Config.in | 7 +-- package/vte/vte.hash | 8 ++-- package/vte/vte.mk | 45 +++++++++++++----- 5 files changed, 139 insertions(+), 18 deletions(-) diff --git a/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch new file mode 100644 index 0000000000..7c3a5ab05e --- /dev/null +++ b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch @@ -0,0 +1,54 @@ +From 91123bb5201156e3d3adbe24305488f5eea2c8d7 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Mon, 27 Sep 2021 22:46:47 +0200 +Subject: [PATCH] build: Fix build with kernel headers from linux < 4.13 + +We already support running with a kernel that doesn't support this +ioctl, so let's also support building with one. Add the missing +ioctl definition to missing.hh. + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2514 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/vte/-/commit/91123bb5201156e3d3adbe24305488f5eea2c8d7] +Signed-off-by: Fabrice Fontaine +--- + src/missing.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/missing.hh b/src/missing.hh +index e5a58727..7902e41e 100644 +--- a/src/missing.hh ++++ b/src/missing.hh +@@ -23,11 +23,14 @@ + #include + + #ifdef __linux__ ++ ++#include + #include + + #if defined(__mips__) || defined(__mips64__) + #include + #endif ++ + #endif + + /* NSIG isn't in POSIX, so if it doesn't exist use this here. See bug #759196 */ +@@ -128,4 +131,13 @@ char* strchrnul(char const* s, + #define CLOSE_RANGE_CLOEXEC (1u << 2) + #endif + ++#if !defined(TIOCGPTPEER) ++/* See linux commit 54ebbfb1603415d9953c150535850d30609ef077 */ ++#if defined(__sparc__) ++#define TIOCGPTPEER _IOR('t', 137, int) ++#else ++#define TIOCGPTPEER _IOR('T', 0x41, int) ++#endif ++#endif /* !TIOCGPTPEER */ ++ + #endif /* __linux__ */ +-- +GitLab + diff --git a/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch new file mode 100644 index 0000000000..67b6c47482 --- /dev/null +++ b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch @@ -0,0 +1,43 @@ +From e32dba1d5cf884959af5b2c0691db00c263ea048 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Mon, 27 Dec 2021 19:24:46 +0100 +Subject: [PATCH] build: Fix check for -fstack-protector* compiler support + +Need to use has_link_argument() on some platforms. + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2535 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/vte/-/commit/e32dba1d5cf884959af5b2c0691db00c263ea048] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 93b7f376..381d5d58 100644 +--- a/meson.build ++++ b/meson.build +@@ -461,8 +461,6 @@ compiler_flags_common = [ + '-fdiagnostics-show-option', + '-fno-common', + '-fno-semantic-interposition', +- '-fstack-protector', +- '-fstack-protector-strong', + ] + + if enable_debug +@@ -550,6 +548,10 @@ add_project_arguments(global_cxxflags, language: 'cpp') + linker_flags = [ + ['-Wl,-Bsymbolic', false,], + ['-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),], ++ ++ # See issue vte#2535. ++ ['-fstack-protector', false], ++ ['-fstack-protector-strong', false], + ] + + foreach flag: linker_flags +-- +GitLab + diff --git a/package/vte/Config.in b/package/vte/Config.in index 96de3d38cc..2635a6007c 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -7,11 +7,11 @@ config BR2_PACKAGE_VTE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PCRE2 help VTE is a library (libvte) implementing a terminal emulator @@ -22,13 +22,14 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte -comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + BR2_TOOLCHAIN_USES_MUSL comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS diff --git a/package/vte/vte.hash b/package/vte/vte.hash index 3fbc5acab0..90818d31f3 100644 --- a/package/vte/vte.hash +++ b/package/vte/vte.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 vte-0.48.3.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum +sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz + +# Hash for license file: +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LGPL3 diff --git a/package/vte/vte.mk b/package/vte/vte.mk index 6c8d1433f5..07e813685e 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -4,26 +4,47 @@ # ################################################################################ -VTE_VERSION = 0.48.3 +VTE_VERSION_MAJOR = 0.66 +VTE_VERSION = $(VTE_VERSION_MAJOR).2 VTE_SOURCE = vte-$(VTE_VERSION).tar.xz -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48 -VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2 -VTE_LICENSE = LGPL-2.1+ -VTE_LICENSE_FILES = COPYING -VTE_CONF_OPTS += --disable-vala +VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) +VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) +VTE_LICENSE = LGPL-3.0+ +VTE_LICENSE_FILES = COPYING.LGPL3 + +ifeq ($(BR2_PACKAGE_ICU),y) +VTE_CONF_OPTS += -Dicu=true +VTE_DEPENDENCIES += icu +else +VTE_CONF_OPTS += -Dicu=false +endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -VTE_CONF_OPTS += --enable-introspection -VTE_DEPENDENCIES += gobject-introspection +VTE_CONF_OPTS += -Dgir=true -Dvapi=true +VTE_DEPENDENCIES += host-vala gobject-introspection else -VTE_CONF_OPTS += --disable-introspection +VTE_CONF_OPTS += -Dgir=false -Dvapi=false endif ifeq ($(BR2_PACKAGE_GNUTLS),y) -VTE_CONF_OPTS += --with-gnutls +VTE_CONF_OPTS += -Dgnutls=true VTE_DEPENDENCIES += gnutls else -VTE_CONF_OPTS += --without-gnutls +VTE_CONF_OPTS += -Dgnutls=false +endif + +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) +VTE_CONF_OPTS += -Dfribidi=true +VTE_DEPENDENCIES += libfribidi +else +VTE_CONF_OPTS += -Dfribidi=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +VTE_CONF_OPTS += -D_systemd=true +VTE_DEPENDENCIES += systemd +else +VTE_CONF_OPTS += -D_systemd=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/python-pypa-build: new package Message-ID: <20220109224247.595AC8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7786524be67e98ffa88f75581b41531fb69c4372 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Due to a namespace clash with python-build we need to use a different package name. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/python-pypa-build/python-pypa-build.hash | 5 +++++ package/python-pypa-build/python-pypa-build.mk | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 260dcce912..1c83c53658 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1309,6 +1309,7 @@ F: package/python-multidict/ F: package/python-pep517/ F: package/python-pycares/ F: package/python-pydyf/ +F: package/python-pypa-build/ F: package/python-pyphen/ F: package/python-snappy/ F: package/python-sockjs/ diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash new file mode 100644 index 0000000000..c7daedc6b3 --- /dev/null +++ b/package/python-pypa-build/python-pypa-build.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/build/json +md5 ec3dbe55359ee735b45766b30dfad877 build-0.7.0.tar.gz +sha256 1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f build-0.7.0.tar.gz +# Locally computed sha256 checksums +sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk new file mode 100644 index 0000000000..6babade672 --- /dev/null +++ b/package/python-pypa-build/python-pypa-build.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-pypa-build +# +################################################################################ + +PYTHON_PYPA_BUILD_VERSION = 0.7.0 +PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b775216bb1f34962beaf005f38460c6161177fef6e068a7a0c30a1597 +PYTHON_PYPA_BUILD_LICENSE = MIT +PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE +PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools +HOST_PYTHON_PYPA_BUILD_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ + host-python-packaging \ + host-python-pep517 \ + host-python-tomli + +$(eval $(host-python-package)) From arnout at mind.be Sun Jan 9 22:49:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:49:11 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-argon2-cffi-bindings: new package In-Reply-To: <20220109035935.2698421-1-james.hilliard1@gmail.com> References: <20220109035935.2698421-1-james.hilliard1@gmail.com> Message-ID: <756040b6-aff4-da3f-f6c8-468c58517288@mind.be> On 09/01/2022 04:59, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - rebase on master > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-argon2-cffi-bindings/Config.in | 11 ++++++++ > .../python-argon2-cffi-bindings.hash | 5 ++++ > .../python-argon2-cffi-bindings.mk | 25 +++++++++++++++++++ > 5 files changed, 43 insertions(+) > create mode 100644 package/python-argon2-cffi-bindings/Config.in > create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash > create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 3b544cae6b..c5186e029a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1291,6 +1291,7 @@ F: package/python-aiorwlock/ > F: package/python-aiosignal/ > F: package/python-aiozipkin/ > F: package/python-argon2-cffi/ > +F: package/python-argon2-cffi-bindings/ > F: package/python-async-lru/ > F: package/python-async-timeout/ > F: package/python-bidict/ > diff --git a/package/Config.in b/package/Config.in > index 378d6e8c0c..bc2113765b 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -925,6 +925,7 @@ menu "External python modules" > source "package/python-ansicolors/Config.in" > source "package/python-argh/Config.in" > source "package/python-argon2-cffi/Config.in" > + source "package/python-argon2-cffi-bindings/Config.in" > source "package/python-arrow/Config.in" > source "package/python-asgiref/Config.in" > source "package/python-asn1crypto/Config.in" > diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in > new file mode 100644 > index 0000000000..3d409759e0 > --- /dev/null > +++ b/package/python-argon2-cffi-bindings/Config.in > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS > + bool "python-argon2-cffi-bindings" > + depends on BR2_PACKAGE_PYTHON3 > + depends on BR2_USE_MMU # libargon2 > + depends on !BR2_STATIC_LIBS # libargon2 > + select BR2_PACKAGE_PYTHON_CFFI # runtime > + select BR2_PACKAGE_LIBARGON2 > + help > + Low-level CFFI bindings for Argon2. > + > + https://github.com/hynek/argon2-cffi-bindings > diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash > new file mode 100644 > index 0000000000..e088d3dad1 > --- /dev/null > +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/argon2-cffi-bindings/json > +md5 f1591e1af7dea9ef3e5b982e2c196c1d argon2-cffi-bindings-21.2.0.tar.gz > +sha256 bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 argon2-cffi-bindings-21.2.0.tar.gz > +# Locally computed sha256 checksums > +sha256 9c158d4f433627f48ac24b6b4d37970afe4172514673c5318014d7cca157c6df LICENSE > diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk > new file mode 100644 > index 0000000000..f0d71e803a > --- /dev/null > +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# python-argon2-cffi-bindings > +# > +################################################################################ > + > +PYTHON_ARGON2_CFFI_BINDINGS_VERSION = 21.2.0 > +PYTHON_ARGON2_CFFI_BINDINGS_SOURCE = argon2-cffi-bindings-$(PYTHON_ARGON2_CFFI_BINDINGS_VERSION).tar.gz > +PYTHON_ARGON2_CFFI_BINDINGS_SITE = https://files.pythonhosted.org/packages/b9/e9/184b8ccce6683b0aa2fbb7ba5683ea4b9c5763f1356347f1312c32e3c66e > +PYTHON_ARGON2_CFFI_BINDINGS_SETUP_TYPE = setuptools > +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE = MIT > +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE_FILES = LICENSE > +PYTHON_ARGON2_CFFI_BINDINGS_DEPENDENCIES = \ > + host-python-cffi \ > + host-python-setuptools-scm \ > + libargon2 > +PYTHON_ARGON2_CFFI_BINDINGS_ENV = ARGON2_CFFI_USE_SYSTEM=1 > + > +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) > +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=1 > +else > +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=0 > +endif > + > +$(eval $(python-package)) > From arnout at mind.be Sun Jan 9 22:49:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:49:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/vte: bump to version 0.66.2 In-Reply-To: <20220109171609.2527192-1-fontaine.fabrice@gmail.com> References: <20220109171609.2527192-1-fontaine.fabrice@gmail.com> Message-ID: <65a72688-6b48-47f0-f4b7-fffd5346e7ee@mind.be> On 09/01/2022 18:16, Fabrice Fontaine wrote: > - Switch to meson-package and so replace host-intltool dependency by > TARGET_NLS_DEPENDENCIES: > https://gitlab.gnome.org/GNOME/vte/-/issues/87 > - Retrieve upstream hash > - Switch license file to LGPL-3.0+: > https://gitlab.gnome.org/GNOME/vte/-/commit/5e14529d4219f3792690566ef7ec70febd87e070 > - Drop libxml2 dependency (not needed with meson) > - Add uclibc or glibc dependency, upstream doesn't want to support musl: > https://gitlab.gnome.org/GNOME/vte/-/issues/72 > https://gitlab.gnome.org/GNOME/vte/-/issues/247 > - Add optional icu dependency: > https://gitlab.gnome.org/GNOME/vte/-/commit/9e4fbae2cabcd937ac4d1a984ba844d24b44b83f > - Add optional libfribidi dependency: > https://gitlab.gnome.org/GNOME/vte/-/commit/7d3704f1c54e58443624355835f675ec22c6b9d3 > - Add optional systemd dependency: > https://gitlab.gnome.org/GNOME/vte/-/commit/81bd158c24ef1d716d3cbf801e72fda2e11b81b4 > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-with-kernel-headers-from-linux-4-13.patch | 54 +++++++++++++++++++ > ...or-fstack-protector-compiler-support.patch | 43 +++++++++++++++ > package/vte/Config.in | 7 +-- > package/vte/vte.hash | 8 +-- > package/vte/vte.mk | 45 +++++++++++----- > 5 files changed, 139 insertions(+), 18 deletions(-) > create mode 100644 package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch > create mode 100644 package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch > > diff --git a/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch > new file mode 100644 > index 0000000000..7c3a5ab05e > --- /dev/null > +++ b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch > @@ -0,0 +1,54 @@ > +From 91123bb5201156e3d3adbe24305488f5eea2c8d7 Mon Sep 17 00:00:00 2001 > +From: Christian Persch > +Date: Mon, 27 Sep 2021 22:46:47 +0200 > +Subject: [PATCH] build: Fix build with kernel headers from linux < 4.13 > + > +We already support running with a kernel that doesn't support this > +ioctl, so let's also support building with one. Add the missing > +ioctl definition to missing.hh. > + > +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2514 > + > +[Retrieved from: > +https://gitlab.gnome.org/GNOME/vte/-/commit/91123bb5201156e3d3adbe24305488f5eea2c8d7] > +Signed-off-by: Fabrice Fontaine > +--- > + src/missing.hh | 12 ++++++++++++ > + 1 file changed, 12 insertions(+) > + > +diff --git a/src/missing.hh b/src/missing.hh > +index e5a58727..7902e41e 100644 > +--- a/src/missing.hh > ++++ b/src/missing.hh > +@@ -23,11 +23,14 @@ > + #include > + > + #ifdef __linux__ > ++ > ++#include > + #include > + > + #if defined(__mips__) || defined(__mips64__) > + #include > + #endif > ++ > + #endif > + > + /* NSIG isn't in POSIX, so if it doesn't exist use this here. See bug #759196 */ > +@@ -128,4 +131,13 @@ char* strchrnul(char const* s, > + #define CLOSE_RANGE_CLOEXEC (1u << 2) > + #endif > + > ++#if !defined(TIOCGPTPEER) > ++/* See linux commit 54ebbfb1603415d9953c150535850d30609ef077 */ > ++#if defined(__sparc__) > ++#define TIOCGPTPEER _IOR('t', 137, int) > ++#else > ++#define TIOCGPTPEER _IOR('T', 0x41, int) > ++#endif > ++#endif /* !TIOCGPTPEER */ > ++ > + #endif /* __linux__ */ > +-- > +GitLab > + > diff --git a/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch > new file mode 100644 > index 0000000000..67b6c47482 > --- /dev/null > +++ b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch > @@ -0,0 +1,43 @@ > +From e32dba1d5cf884959af5b2c0691db00c263ea048 Mon Sep 17 00:00:00 2001 > +From: Christian Persch > +Date: Mon, 27 Dec 2021 19:24:46 +0100 > +Subject: [PATCH] build: Fix check for -fstack-protector* compiler support > + > +Need to use has_link_argument() on some platforms. > + > +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2535 > + > +[Retrieved from: > +https://gitlab.gnome.org/GNOME/vte/-/commit/e32dba1d5cf884959af5b2c0691db00c263ea048] > +Signed-off-by: Fabrice Fontaine > +--- > + meson.build | 6 ++++-- > + 1 file changed, 4 insertions(+), 2 deletions(-) > + > +diff --git a/meson.build b/meson.build > +index 93b7f376..381d5d58 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -461,8 +461,6 @@ compiler_flags_common = [ > + '-fdiagnostics-show-option', > + '-fno-common', > + '-fno-semantic-interposition', > +- '-fstack-protector', > +- '-fstack-protector-strong', > + ] > + > + if enable_debug > +@@ -550,6 +548,10 @@ add_project_arguments(global_cxxflags, language: 'cpp') > + linker_flags = [ > + ['-Wl,-Bsymbolic', false,], > + ['-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),], > ++ > ++ # See issue vte#2535. > ++ ['-fstack-protector', false], > ++ ['-fstack-protector-strong', false], > + ] > + > + foreach flag: linker_flags > +-- > +GitLab > + > diff --git a/package/vte/Config.in b/package/vte/Config.in > index 96de3d38cc..2635a6007c 100644 > --- a/package/vte/Config.in > +++ b/package/vte/Config.in > @@ -7,11 +7,11 @@ config BR2_PACKAGE_VTE > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_TOOLCHAIN_USES_MUSL > depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > BR2_PACKAGE_HAS_LIBGL > depends on BR2_PACKAGE_XORG7 > select BR2_PACKAGE_LIBGTK3 > - select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_PCRE2 > help > VTE is a library (libvte) implementing a terminal emulator > @@ -22,13 +22,14 @@ config BR2_PACKAGE_VTE > > http://github.com/GNOME/vte > > -comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" > +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" > depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > depends on BR2_USE_MMU > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_HAS_THREADS || \ > - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ > + BR2_TOOLCHAIN_USES_MUSL > > comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" > depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > diff --git a/package/vte/vte.hash b/package/vte/vte.hash > index 3fbc5acab0..90818d31f3 100644 > --- a/package/vte/vte.hash > +++ b/package/vte/vte.hash > @@ -1,3 +1,5 @@ > -# Locally calculated > -sha256 a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 vte-0.48.3.tar.xz > -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > +# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum > +sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz > + > +# Hash for license file: > +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LGPL3 > diff --git a/package/vte/vte.mk b/package/vte/vte.mk > index 6c8d1433f5..07e813685e 100644 > --- a/package/vte/vte.mk > +++ b/package/vte/vte.mk > @@ -4,26 +4,47 @@ > # > ################################################################################ > > -VTE_VERSION = 0.48.3 > +VTE_VERSION_MAJOR = 0.66 > +VTE_VERSION = $(VTE_VERSION_MAJOR).2 > VTE_SOURCE = vte-$(VTE_VERSION).tar.xz > -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48 > -VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2 > -VTE_LICENSE = LGPL-2.1+ > -VTE_LICENSE_FILES = COPYING > -VTE_CONF_OPTS += --disable-vala > +VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) > +VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) > +VTE_LICENSE = LGPL-3.0+ > +VTE_LICENSE_FILES = COPYING.LGPL3 > + > +ifeq ($(BR2_PACKAGE_ICU),y) > +VTE_CONF_OPTS += -Dicu=true > +VTE_DEPENDENCIES += icu > +else > +VTE_CONF_OPTS += -Dicu=false > +endif > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -VTE_CONF_OPTS += --enable-introspection > -VTE_DEPENDENCIES += gobject-introspection > +VTE_CONF_OPTS += -Dgir=true -Dvapi=true > +VTE_DEPENDENCIES += host-vala gobject-introspection > else > -VTE_CONF_OPTS += --disable-introspection > +VTE_CONF_OPTS += -Dgir=false -Dvapi=false > endif > > ifeq ($(BR2_PACKAGE_GNUTLS),y) > -VTE_CONF_OPTS += --with-gnutls > +VTE_CONF_OPTS += -Dgnutls=true > VTE_DEPENDENCIES += gnutls > else > -VTE_CONF_OPTS += --without-gnutls > +VTE_CONF_OPTS += -Dgnutls=false > +endif > + > +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) > +VTE_CONF_OPTS += -Dfribidi=true > +VTE_DEPENDENCIES += libfribidi > +else > +VTE_CONF_OPTS += -Dfribidi=false > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > +VTE_CONF_OPTS += -D_systemd=true > +VTE_DEPENDENCIES += systemd > +else > +VTE_CONF_OPTS += -D_systemd=false > endif > > -$(eval $(autotools-package)) > +$(eval $(meson-package)) > From arnout at mind.be Sun Jan 9 22:49:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:49:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix build on kernel < 5.10 In-Reply-To: <20220109112337.294418-1-fontaine.fabrice@gmail.com> References: <20220109112337.294418-1-fontaine.fabrice@gmail.com> Message-ID: <2c1b9114-6723-d670-3031-2345735d2b58@mind.be> On 09/01/2022 12:23, Fabrice Fontaine wrote: > zoned depends on kernel >= 5.10: > https://github.com/kdave/btrfs-progs/commit/d4b4baf312ff083fb1e85de92167ea3e968c684c > > Fix the following build failure raised since bump to version 5.15.1 in > commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: > > checking linux/blkzoned.h usability... yes > checking linux/blkzoned.h presence... yes > checking for linux/blkzoned.h... yes > checking for struct blk_zone.capacity... no > checking for BLKGETZONESZ defined in linux/blkzoned.h... yes > configure: error: linux/blkzoned.h does not provide blk_zone.capacity > > Fixes: > - http://autobuild.buildroot.org/results/381c7e8b4bfa624c3eca3ce072cfa412aba57f84 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/btrfs-progs/btrfs-progs.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index b010a0e0be..54922df839 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -44,6 +44,12 @@ else > BTRFS_PROGS_CONF_OPTS += --disable-libudev > endif > > +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10),y) > +BTRFS_PROGS_CONF_OPTS += --enable-zoned > +else > +BTRFS_PROGS_CONF_OPTS += --disable-zoned > +endif > + > HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib > HOST_BTRFS_PROGS_CONF_OPTS = \ > --disable-backtrace \ > From nolange79 at gmail.com Sun Jan 9 22:52:31 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:52:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: James Hilliard schrieb am So., 9. Jan. 2022, 23:41: > On Sat, Jan 8, 2022 at 2:31 PM Norbert Lange wrote: > > > > Am Sa., 8. Jan. 2022 um 20:04 Uhr schrieb James Hilliard > > : > > > > > > On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange > wrote: > > > > > > > > Systemd has very many options, adding a way for the user > > > > to set custom options can help customizations > > > > without changing buildroot files. > > > > > > I'm not sure this is a good idea, if a configuration option needs > > > customizability it > > > probably needs a specific kconfig option. Systemd config options tend > to require > > > dependency selection and special handling so this seems likely to cause > > > spurious errors due to improper usage. Seems to be a pretty big > footgun IMO. > > > > Sure, you are aware that many of my buildroot patches are stuck in limbo > > since early 2020? > > Different issue IMO. > Yep, but seemed reasonable way out to me. > > Just doesnt seem feasible to timely fix everything and version bumps > often leave > > more untapped options. Some part of the necessity would be just being > pragmatic. > > I generally try to add any new options when bumping but I sometimes miss > some. > > > > > One example would be using the unified cgroups hierarchy > > (-Ddefault-hierarchy=unified), hybrid is pretty much deprecated, > > and some systemd features that buildroot allows to enable (OOMD for > example) > > wont work without it. > > I mean, this sounds like something that needs to be fixed in upstream > buildroot. > And it did finally. > > > > > > > > What systemd configure option would you want to be using that isn't > > > currently able to be enabled? > > > > FYI those are the ones I currently use: > > > > -Ddefault-hierarchy=unified \ > > -Dutmp=false \ > > -Ddefault-dnssec=no \ > > -Didn=false \ > > -Denvironment-d=false \ > > -Dxdg-autostart=false \ > > -Ddns-over-tls=false \ > > -Ddefault-llmnr=no \ > > -Ddns-over-tls=false \ > > -Ddefault-mdns=no \ > > -Dlz4=false > > I'm seeing a lot of these added though(I remember adding some of them > myself), are you > trying to use a newer systemd than the version supported by the > buildroot version you are > building from? > Not only missing, but I sometimes need a *different* config. For example i don't want to link against lz4, since I use zstd instead. > Note that systemd defaults can generally be overridden via configs in > the overlay as well. > Yeah, gonna have to look that up. News to me. I will shelve that one in patchwork then Norbert. -------------- next part -------------- An HTML attachment was scrubbed... URL: From nolange79 at gmail.com Sun Jan 9 23:09:45 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Mon, 10 Jan 2022 00:09:45 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/glibc: force -fno-lto In-Reply-To: <20220109223145.GK1477939@scaer> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-4-nolange79@gmail.com> <20220109223145.GK1477939@scaer> Message-ID: Yann E. MORIN schrieb am So., 9. Jan. 2022, 23:31: > Norbert, All, > > On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > > glibc requires compilation barriers between files, and will > > fail with LTO enabled. > > So force LTO off by appending -fno-lto to the flags, but only > > if the GCC version is recent enough that an LTO build would > > be possible. > > > > Signed-off-by: Norbert Lange > > Applied to master, thanks. > > Are the other C libraries (uClibc, musl) also affected by such an issue? > Likely, and unless they are tested with LTO I would not trust them to not have weird runtime issues. Ideally there would be a whitelist for packages doing fine with LTO, for now I can only vouch for the couple I am using LTOed since years. Since a few distros now use LTO by default, hopefully things will get better. Norbert -------------- next part -------------- An HTML attachment was scrubbed... URL: From romain.naour at smile.fr Sun Jan 9 23:13:37 2022 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 10 Jan 2022 00:13:37 +0100 Subject: [Buildroot] [PATCH 1/2] package/dotnet-sdk: new package In-Reply-To: <20210113074647.1826-1-deinok@deinok.com> References: <20210113074647.1826-1-deinok@deinok.com> Message-ID: Hello Raul, Your SoB line is missing. It was present on your v1: http://lists.busybox.net/pipermail/buildroot/2021-January/300681.html Le 13/01/2021 ? 08:46, Raul Hidalgo Caballero a ?crit?: > --- > DEVELOPERS | 5 ++++ > package/Config.in.host | 1 + > package/dotnet-sdk/dotnet-sdk.hash | 3 ++ > package/dotnet-sdk/dotnet-sdk.mk | 20 +++++++++++++ > package/dotnet/Config.in.host | 15 ++++++++++ > .../testing/tests/package/test_dotnet_sdk.py | 28 +++++++++++++++++++ > 6 files changed, 72 insertions(+) > create mode 100644 package/dotnet-sdk/dotnet-sdk.hash > create mode 100644 package/dotnet-sdk/dotnet-sdk.mk > create mode 100644 package/dotnet/Config.in.host > create mode 100644 support/testing/tests/package/test_dotnet_sdk.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index 05b509c9c4..ea85f7c9c3 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2206,6 +2206,11 @@ F: package/python-botocore/ > F: package/python-jmespath/ > F: package/python-s3transfer/ > > +N: Raul Hidalgo Caballero > +F: package/dotnet/ > +F: package/dotnet-sdk/ > +F: support/testing/tests/package/test_dotnet_sdk.py > + > N: Refik Tuzakli > F: package/freescale-imx/ > F: package/paho-mqtt-cpp/ > diff --git a/package/Config.in.host b/package/Config.in.host > index ba6a68c728..16f0e9f690 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -16,6 +16,7 @@ menu "Host utilities" > source "package/dfu-util/Config.in.host" > source "package/dos2unix/Config.in.host" > source "package/dosfstools/Config.in.host" > + source "package/dotnet/Config.in.host" Must be "dotnet-sdk" here. > source "package/doxygen/Config.in.host" > source "package/dtc/Config.in.host" > source "package/e2fsprogs/Config.in.host" > diff --git a/package/dotnet-sdk/dotnet-sdk.hash b/package/dotnet-sdk/dotnet-sdk.hash > new file mode 100644 > index 0000000000..a3016b2e49 > --- /dev/null > +++ b/package/dotnet-sdk/dotnet-sdk.hash > @@ -0,0 +1,3 @@ > +sha256 cfc21f5e8bd655ae997eec916138b707b1d290b83272c02a95c9f821b8c87310 LICENSE.txt > +sha256 01564961f8ca9744d0ecc5d3e72d7c1659df95898f3a077fd9140fd4023f3579 ThirdPartyNotices.txt > +sha256 23df1eca7eb1302dfb10f4edce7edf7150e57698576f61b2dcb777c833cbd80c dotnet-sdk-5.0.101-linux-x64.tar.gz > diff --git a/package/dotnet-sdk/dotnet-sdk.mk b/package/dotnet-sdk/dotnet-sdk.mk > new file mode 100644 > index 0000000000..133b39b3f5 > --- /dev/null > +++ b/package/dotnet-sdk/dotnet-sdk.mk > @@ -0,0 +1,20 @@ > +################################################################################ > +# > +# dotnet-sdk > +# > +################################################################################ > + > +HOST_DOTNET_SDK_VERSION = 5.0.101 > +HOST_DOTNET_SDK_SITE = https://dotnetcli.azureedge.net/dotnet/Sdk/$(HOST_DOTNET_SDK_VERSION) > +HOST_DOTNET_SDK_SOURCE = dotnet-sdk-$(HOST_DOTNET_SDK_VERSION)-$(call qstrip,$(BR2_PACKAGE_HOST_DOTNET_RID)).tar.gz > +HOST_DOTNET_SDK_LICENSE = MIT > +HOST_DOTNET_SDK_LICENSE_FILES = LICENSE.txt ThirdPartyNotices.txt > + > +define HOST_DOTNET_SDK_INSTALL_CMDS > + mkdir -p $(HOST_DIR)/usr/share/dotnet/ > + cp -dpfr $(@D)/* $(HOST_DIR)/usr/share/dotnet/ > + mkdir -p $(HOST_DIR)/usr/bin/ > + ln -s ../share/dotnet/dotnet $(HOST_DIR)/usr/bin/dotnet The dotnet is a binary blob, there is no sources for it ? > +endef > + > +$(eval $(host-generic-package)) > diff --git a/package/dotnet/Config.in.host b/package/dotnet/Config.in.host > new file mode 100644 > index 0000000000..90b477a6a1 > --- /dev/null > +++ b/package/dotnet/Config.in.host > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_HOST_DOTNET_ARCH_SUPPORTS > + bool > + default y if BR2_HOSTARCH = "x86_64" > + > +config BR2_PACKAGE_HOST_DOTNET_RID > + string > + default "linux-x64" if BR2_HOSTARCH = "x86_64" > + > +config BR2_PACKAGE_HOST_DOTNET_SDK > + bool "host dotnet-sdk" > + depends on BR2_PACKAGE_HOST_DOTNET_ARCH_SUPPORTS > + help > + Dotnet SDK > + > + https://dotnet.microsoft.com/ Indent the help text with on tab and two spaces. You can check the coding style with ./utils/check-package script > diff --git a/support/testing/tests/package/test_dotnet_sdk.py b/support/testing/tests/package/test_dotnet_sdk.py > new file mode 100644 > index 0000000000..288e873597 > --- /dev/null > +++ b/support/testing/tests/package/test_dotnet_sdk.py > @@ -0,0 +1,28 @@ > +import os > +import tempfile > +import subprocess > +import shutil > + > +import infra.basetest > + > + > +class TestDotnetSdkBase(infra.basetest.BRTest): > + > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_TARGET_ROOTFS_CPIO=y > + """ > + > +class TestHostDotnetSdk(TestDotnetSdkBase): > + config = TestDotnetSdkBase.config + \ > + """ > + BR2_PACKAGE_HOST_DOTNET_SDK=y > + """ > + > + def test_run(self): > + env = os.environ.copy() You second patch remove this line [1]. Squash you two patch into one. > + hostdir = os.path.join(self.builddir, 'host') > + dotnet = os.path.join(hostdir, 'usr', 'bin', 'dotnet') > + cmd = [dotnet, '--version'] Running "dotnet --version" on the host is really worth it ? Have you made some progress on dotnet-runtime and dotnet-aspnet [2] I have marked your patches as "Changes Requested". [1] http://patchwork.ozlabs.org/project/buildroot/patch/20210113074647.1826-2-deinok at deinok.com/ [2] http://lists.busybox.net/pipermail/buildroot/2021-January/603271.html Best regards, Romain > + exit_code = subprocess.call(cmd, stdout=self.b.logfile, stderr=self.b.logfile, env=env) > + self.assertEqual(exit_code, 0) > From romain.naour at smile.fr Sun Jan 9 23:27:14 2022 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 10 Jan 2022 00:27:14 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <20210518113652.29609-4-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> Message-ID: <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> Hello Thomas, Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > There are cases where a 64-bit architecture is running a 64-bit kernel but > 32-bit userspace. Examples include: > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace Can you provide a new qemu defconfig that cover this use case? This is for gitlab-ci runtime testing. Best regards, Romain PS: (This email doesn't count as a review of this series :)) > > In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to > the 32-bit architecture, but the kernel needs to be built with the 64-bit > architecture. > > Make it possible to define the correct architecture to be used for the > kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is > expected to know the valid values. > > Signed-off-by: Thomas De Schampheleire > --- > Makefile | 4 ++++ > arch/Config.in | 15 +++++++++++++++ > 2 files changed, 19 insertions(+) > > diff --git a/Makefile b/Makefile > index c5399e9a35..d09cf7c958 100644 > --- a/Makefile > +++ b/Makefile > @@ -434,7 +434,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > # Strip off the annoying quoting > ARCH := $(call qstrip,$(BR2_ARCH)) > NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > +else > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) > +endif > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > BZCAT := $(call qstrip,$(BR2_BZCAT)) > diff --git a/arch/Config.in b/arch/Config.in > index 7575acf48c..c82100f541 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -329,6 +329,21 @@ config BR2_ARCH > config BR2_KERNEL_ARCH > string > > +config BR2_KERNEL_ARCH_OVERRIDE > + string "Kernel architecture override" > + help > + Normally, the correct kernel architecture value is derived > + from the selected architecture, and you should keep this > + option empty. > + However, there are cases where you may want to enter a custom > + value, for example when using a 64-bit architecture but > + running userspace in 32-bit mode. > + As an example, in case of an x86_64 processor where you want > + 32-bit userspace, BR2_ARCH will be 'i386'/'i486'/'i686' and > + BR2_KERNEL_ARCH_OVERRIDE should be set to 'x86_64'. Note that > + in this example you will also need a multilib toolchain and > + pass '-m32' via BR2_TARGET_OPTIMIZATION. > + > config BR2_ENDIAN > string > > From tambewilliam at gmail.com Sun Jan 9 23:46:59 2022 From: tambewilliam at gmail.com (William Tambe) Date: Sun, 9 Jan 2022 17:46:59 -0600 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory In-Reply-To: References: Message-ID: On Sun, Jan 9, 2022 at 2:08 PM Arnout Vandecappelle wrote: > > > > On 09/01/2022 19:18, William Tambe wrote: > > I am attempting to build: > > > > +BR2_PACKAGE_DHCP=y > > +BR2_PACKAGE_DHCP_CLIENT=y > > > > However it fails as follow complaining about not finding readline/history.h: > > > > making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate > > /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc > > pu32 doesn't exist in Buildroot, so this may very well be due to external changes. > > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 > > -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include > > -I../../lib/lwres/unix/include -I../../lib/lwres/include > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include > > -I../../lib/dns/include > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include > > -I../../lib/bind9/include > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include > > -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include > > -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include > > -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" > > -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > > -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall > > -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat > > -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks > > \ > > -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ > > -c ./nsupdate.c > > ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory > > 104 | #include > > | ^~~~~~~~~~~~~~~~~~~~ > > This sounds like you changed your configuration without doing 'make clean'. Is > that possible? I am building from clean or from scratch. > > Is BR2_PACKAGE_READLINE enabled in your configuration? Has it been built? Yes, BR2_PACKAGE_READLINE is enabled in my configuration. > > Regards, > Arnout > > > compilation terminated. > > make[5]: *** [Makefile:473: nsupdate.o] Error 1 > > make[4]: *** [Makefile:79: subdirs] Error 1 > > make[3]: *** [Makefile:88: subdirs] Error 1 > > make[2]: *** [package/pkg-generic.mk:270: > > /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] > > Error 2 > > make[1]: *** [Makefile:23: _all] Error 2 > > make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' > > make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From michal.lyszczek at bofc.pl Sun Jan 9 23:52:22 2022 From: michal.lyszczek at bofc.pl (michal.lyszczek at bofc.pl) Date: Mon, 10 Jan 2022 00:52:22 +0100 Subject: [Buildroot] [PATCH v2] package/openrc: add patch to create /run/lock/subsys In-Reply-To: References: <20220109110555.3789-1-nolange79@gmail.com> Message-ID: <20220109235222.ylomtonoeuzcak2c@marchewa.kurwinet.pl> On 2022-01-09 14:12:16, Arnout Vandecappelle wrote: > > > On 09/01/2022 12:05, Norbert Lange wrote: > > Together with changes to sysv/busybox init, this directory > > will already exist on all init systems before any service > > scripts are run. > > > > Signed-off-by: Norbert Lange > > Applied to master, thanks. > > Normally we require patches to be upstreamed first, but there are already > plenty of other patches that haven't been sent upstream. It could also be a > bit buildroot-specific (though I think the subsys is there because some > packages actually use that directory). > > Still, Micha?, do you think this patch would be acceptable upstream? > Obviously not in its current form since upstream has group uucp rather than > daemon. I think it won't be accepted by upstream. Seems that openrc does not use /var/lock/subsys anywhere, nor does Gentoo. I also think that /var/lock/susbsys is used mainly by redhat/rpm packages with plain rc.d scripts. So in that case this rather seem like buildroot specific change and is not really related to openrc, thus I don't see why openrc would commit this patch. But bear in mind, I am not a Gentoo nor openrc developer, so that might not be true. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: From jose.pekkarinen at unikie.com Mon Jan 10 05:29:04 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Mon, 10 Jan 2022 07:29:04 +0200 Subject: [Buildroot] [PATCH] package/opensc: new package In-Reply-To: <20220105215908.1d8677b3@windsurf> References: <20211213061551.4110-1-jose.pekkarinen@unikie.com> <20220105215908.1d8677b3@windsurf> Message-ID: On Wed, Jan 5, 2022 at 10:59 PM Thomas Petazzoni wrote: > > Hello Jos?, > > On Mon, 13 Dec 2021 08:15:51 +0200 > Jos? Pekkarinen wrote: > > > The patch will add opensc package. > > > > Signed-off-by: Jos? Pekkarinen > > I'm afraid that when I read the feedback from upstream in your patches, > saying that they introduce memory leaks (and indeed they do), I'm not > really keen on merging this. > > However, I saw you told upstream: > > It is a bit of a chiken and egg problem. Buildroot wants me to > upstream the patches before the package would be accesible to you, > you want me to give a testing case that doesn't come easy without > upstreaming the package. > > This is not totally correct for two reason: > > * we don't require patches to be accepted upstream, except if we have > serious doubts about the patches. > > * the package doesn't have to be accepted in Buildroot upstream to > provide an easy way for the opensc developers to reproduce the > issue. You can provide a Buildroot branch on a public Git > repository, with the opensc package, and a very simple > opensc_demo_defconfig in configs/ that uses some external toolchain > and builds just opensc to demonstrate the build failure. Then for > the opensc people, reproducing is as easy as: > > git clone -b git://your.repository.com > cd buildroot/ > make opensc_demo_defconfig > make > > Could you resolve the remaining issues and send an updated patch? Also, > please remember to add a version to your patches when submitting, it > really makes things easier. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Ack! Thanks for the comments! Jos?. From jose.pekkarinen at unikie.com Mon Jan 10 05:36:03 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Mon, 10 Jan 2022 07:36:03 +0200 Subject: [Buildroot] [PATCH 3/7] package/bmx7: new package In-Reply-To: <20220105232348.68986536@windsurf> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-3-jose.pekkarinen@unikie.com> <20220105232348.68986536@windsurf> Message-ID: On Thu, Jan 6, 2022 at 12:23 AM Thomas Petazzoni wrote: > > Hello Jos?, > > On Fri, 10 Dec 2021 16:12:05 +0200 > Jos? Pekkarinen wrote: > > > This patch will provide an initial package > > for bmx7 project. > > > > Signed-off-by: Jos? Pekkarinen > > I have applied this patch, with a few changes (see below). But I must > say I hesitated. Do you really use this? This project has not seen any > updates since July 2019, there is a simple pull request fixing the > SIOCGSTAMP issue that has never been looked at, and there are > alternatives such as olsr and batman-adv which are actively maintained. Hi, Thanks! I took some time to ask the project participants to confirm they use these packages before starting the upstreaming process. Apparently this may be of use in communications over wifi mesh networks. Best regards. Jos?. From james.hilliard1 at gmail.com Mon Jan 10 05:41:42 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 22:41:42 -0700 Subject: [Buildroot] [PATCH v4 1/3] package/qt5/qt5webengine-chromium-catapult: new package Message-ID: <20220110054144.1294907-1-james.hilliard1@gmail.com> This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entry --- package/qt5/Config.in | 1 + .../qt5/qt5webengine-chromium-catapult/Config.in | 4 ++++ .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 14 ++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/Config.in create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..143926b743 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" source "package/qt5/qt5x11extras/Config.in" diff --git a/package/qt5/qt5webengine-chromium-catapult/Config.in b/package/qt5/qt5webengine-chromium-catapult/Config.in new file mode 100644 index 0000000000..471c2a2dbc --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the chromium source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT + bool diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 0000000000..8190a6dd5d --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 0000000000..5d0db1e790 --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE +QT5WEBENGINE_CHROMIUM_CATAPULT_INSTALL_TARGET = NO + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 10 05:41:44 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 22:41:44 -0700 Subject: [Buildroot] [PATCH v4 3/3] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220110054144.1294907-1-james.hilliard1@gmail.com> References: <20220110054144.1294907-1-james.hilliard1@gmail.com> Message-ID: <20220110054144.1294907-3-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags. Create a .git file so to trigger headers sync during configure. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- package/qt5/qt5location-mapboxgl/Config.in | 4 ++ .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 14 +++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 73 files changed, 222 insertions(+), 385 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 54e6f7d6a6..20a4a4f4c2 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..d10847ea04 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..3b0362f383 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..8c0e02152d 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4bdb90b203 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..abffc2891d 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..d48a37fafe 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 10 06:20:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 23:20:15 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-packaging: bump to version 21.3 Message-ID: <20220110062015.1299719-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-packaging/python-packaging.hash | 4 ++-- package/python-packaging/python-packaging.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 0c23a5f71c..0f353a9e36 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 240ba5823ed31051a1254e74c9d18d55 packaging-21.0.tar.gz -sha256 7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 packaging-21.0.tar.gz +md5 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz +sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index e2fb9b120b..569dc0bf58 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 21.0 +PYTHON_PACKAGING_VERSION = 21.3 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3afd461faecf9955a6501c4999933a48394e90f03cd512aad844 +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c PYTHON_PACKAGING_SETUP_TYPE = setuptools PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 10 06:23:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 23:23:27 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: bump to version 3.0.6 Message-ID: <20220110062327.1302104-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-pyparsing/python-pyparsing.hash | 4 ++-- package/python-pyparsing/python-pyparsing.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index 2c52ff0843..a21baf46e5 100644 --- a/package/python-pyparsing/python-pyparsing.hash +++ b/package/python-pyparsing/python-pyparsing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyparsing/json -md5 f0953e47a0112f7a65aec2305ffdf7b4 pyparsing-2.4.7.tar.gz -sha256 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz +md5 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz +sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz # Locally computed sha256 checksums sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 5741458d65..b6ab353a6d 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 2.4.7 +PYTHON_PYPARSING_VERSION = 3.0.6 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210 +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools -- 2.25.1 From thomas.petazzoni at bootlin.com Mon Jan 10 07:07:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 10 Jan 2022 07:07:23 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-09 Message-ID: <20220110070733.A70B381426@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-01-09 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 67 | 3 | 1 | 71 | 2021.11.x | 27 | 6 | 0 | 33 | master | 83 | 61 | 0 | 144 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 6 gstreamer1-mm-1.10.0 | 5 bluez5_utils-5.63 | 4 unknown | 4 bat-0.18.3 | 3 cryptopp-8.6.0 | 3 drbd-utils-9.19.0 | 3 hiawatha-11.1 | 3 host-python-setuptools-scm-... | 3 mbedtls-2.28.0 | 3 poppler-21.12.0 | 3 btrfs-progs-5.15.1 | 2 frr-8.1 | 2 host-mender-artifact-3.6.1 | 2 apitrace-10.0 | 1 babeltrace2-2.0.4 | 1 balena-engine-19.03.14 | 1 belle-sip-4.4.8 | 1 efl-1.26.0 | 1 ejabberd-20.07 | 1 libkrb5-1.18.4 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.3 | 1 nodejs-14.18.2 | 1 perl-5.34.0 | 1 pulseview-0.4.2 | 1 ripgrep-af6b6c543b224d348a8... | 1 rtorrent-0.9.8 | 1 squid-5.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-10.0 | NOK | http://autobuild.buildroot.net/results/984c38f176594654ada3dc1cff18e193f276c7e8 | or1k | babeltrace2-2.0.4 | NOK | http://autobuild.buildroot.net/results/cdf8191a07a9bac5bd63c9938fe97d9c9b903ea9 | aarch64 | balena-engine-19.03.14 | NOK | http://autobuild.buildroot.net/results/438bb2252f7c5052c7f945401aea053c55a60994 | ORPH i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/8eacd455e4767cc7b1e912a3f910c940110c3be0 | x86_64 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/ff16a74ac395379ce74059d6d763fd921a4afa30 | aarch64 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/498b96224c8bcff91542ca3731dfd66891f4ec23 | xtensa | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/4b3480a21c3909abd6e1331662addbf63db8cf70 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c0a44dead5fb46d6f4475856889d43bff9578a00 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/47f63871cad5ae6038c9ef8614c631cdacdf5b7a | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c71b8313e495fdb5e001a0bf8aa2a381e8a4ccc4 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e36e33956d1e5b4b5209624d045313046fe649d7 | aarch64 | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/381c7e8b4bfa624c3eca3ce072cfa412aba57f84 | ORPH i586 | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc | ORPH arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/cfc80eed73f608dc37ac234a9918a9558b3b9bad | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/36bf881a2eabc408f22247e1baa0e3036bc30ff3 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/d9af96474b331632e315063c63d581f493334d09 | microblazeel | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/8c524590b1454f8853593baefb53d8859106fa3a | powerpc | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/c46e2eae822db8529e68e73726a28dbfb2e9a509 | nios2 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/b1fd8a6393f0f514ba8b88684dd0c467e5f10b25 | powerpc | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/0fa47366a7280535ee556014171f0003e706be70 | riscv64 | ejabberd-20.07 | NOK | http://autobuild.buildroot.net/results/4816301ddfb03504051ee8cca1ddad03b53f1d1f | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8fc5ea2b29a678800ca36d1903b66b369ea2f48f | mips | frr-8.1 | NOK | http://autobuild.buildroot.net/results/758deec2e33f50afda15d27b22a6bfeae933fc14 | sparc64 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/6b88f1057dcce4b8bab778d75dca10d9eaa267cc | ORPH i686 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/e7a3bb6e9e13cb4d1dd9250cb41c33d3deac9672 | ORPH mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/d4f2247f23ad84022cbf549b4d5038fe59b8b31b | ORPH microblazeel | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/26f1d08370c4be3dc91dd3f2e3bbbedd675a041e | ORPH powerpc | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/efb03fdd1c26fd992c98ce758a1a8f6e73efeeb9 | ORPH xtensa | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/2861bbc2c52a20d95ed406f59baab7cabe56a4cf | mipsel | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/5436b44777c5d417ae427b99602f516fd8f9489d | mips64el | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/2bbf26fe49038c29f7ee1270ad1fff148ab0224a | microblazeel | host-mender-artifact-3.6.1 | NOK | http://autobuild.buildroot.net/results/81ea143dc110d65581e583dc14562bc6d8dbf8b6 | riscv64 | host-mender-artifact-3.6.1 | NOK | http://autobuild.buildroot.net/results/e54c7afaf336e7010d808c2506cedff566a78609 | riscv64 | host-python-setuptools-scm-... | NOK | http://autobuild.buildroot.net/results/e0b0f6c8633ec218d9d3e0d02053832bf48027dd | powerpc | host-python-setuptools-scm-... | NOK | http://autobuild.buildroot.net/results/2f6125993de364b4a44d259f16806e6dfd792402 | mipsel | host-python-setuptools-scm-... | NOK | http://autobuild.buildroot.net/results/772bd9946e7820a6d939a0de991d70ae23875d42 | or1k | libkrb5-1.18.4 | NOK | http://autobuild.buildroot.net/results/b68b23d143308a8411e730dbb0308b756b199841 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/04518ed512bea107a649ab1ff8e8c4c13771d098 | arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/0f5b9b439cfff48d3275a1f65999c06dd97ac597 | arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/56ac0a8726d09eed8f45f865934fa7781a0e667a | arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/af017382bb5772de7383d71ed7b8af44717981f9 | arm | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/2b531f7aa4506ee31a7252c87a2e401fffab9dfb | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/f52a4de8f3a6b3eef7cf79a9ef24802ef99c7066 | microblazeel | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/c7fd9159edc86c119973ed191abea1162cc01f9e | arc | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/3d886fe0ef628ed5becb20dc89f80e0b189c745e | x86_64 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/c7716d3979d330078d030f21dd9cfd2820cecf2e | riscv32 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/1456f9512371ecb5a0a374943178e4bd7b0967e8 | xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/f3ae94835b874ecd22928ee5f05f11d190c31a44 | x86_64 | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/772ebdd6a39950457a59419bdc1376cb0e0a3611 | xtensa | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/d8bc5c25f53012955ccd5ec1a59524279eaddf39 | ORPH riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/af8c4cb700fbdf263bcd78a183a6ea51617b7d28 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c8a9be8677ce45b3344dc45cbee13088542fe473 | microblazeel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b6ba900bcade6920513bb2c6e3753da5b5d83ec4 | i686 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/57960ed2419bbd3ae6b9c2a90ab26266171cca6b | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/17f7afb627a4658b85e9c6beee7a94ae5853dd57 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e5aa94be49463f3a3202410478caaaeaae9c50e6 | arm | squid-5.3 | NOK | http://autobuild.buildroot.net/results/2aabc8375d41ad4d047d20ff8ee4fe1c978e7ee1 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/6d8e63e0f26a11f7d76dba5de9f7eabf558284fa | arm | unknown | NOK | http://autobuild.buildroot.net/results/94d6fd886b0a984c962002d4ce2fc88c97e47ad7 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/69871d3d0b66b0bb480956a1398cd0367b5004f4 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/0cbcce0ef372c29f34769f0eb5047c8203098e96 | Classification of failures by reason for 2021.02.x -------------------------------------------------- cutelyst-2.11.0 | 1 python-lxml | 1 rocksdb-6.13.3 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | cutelyst-2.11.0 | NOK | http://autobuild.buildroot.net/results/986c4d66902adea7da570ec4f1bba031a2f19fad | m68k | python-lxml | TIM | http://autobuild.buildroot.net/results/74ba5ca5cc916170c8b81d7ac7581fdaf8ab15d5 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/7ad5bd178b331ce8d468f6807cb20cc46faa4422 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/777589411c7e8e82e2c02e3d50941981d89262a4 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 2 libnss-3.73 | 1 ndisc6-1.0.5 | 1 nodejs-14.18.1 | 1 suricata-6.0.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/59ed3d9a339bc5c2bad4980a2bed34f3c218b5ab | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/8e2b532e80f56133ba41f30f2367a6c76c21103f | powerpc64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/c0083245b7a7e19c713e31113a4817fd28f04c28 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/97403793ff837e920cef3d8c0f0ad6f7ac740eb6 | ORPH mipsel | nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/fb9d3832d0520d81cae5517018e625d4289a9aad | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/2183f1835f2ef553e45e83959910205127b2b259 | Gitlab CI results for 2022-01-09 ================================ Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- acpica | DISTRO | https://release-monitoring.org/project/00018 | 20200717 | 20211217 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 41.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.3.1 | 4.5.2 | alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.6 | 1.2.6.1 | alsa-plugins | DISTRO | https://release-monitoring.org/project/00041 | 1.2.5 | 1.2.6 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 12.0.0_r26 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.0 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.5 | 5.1.6 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.42.0 | avro-c | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.10 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 19.03.14 | 20.10.11 | ORPH bash | DISTRO | https://release-monitoring.org/project/00166 | 5.1 | 5.1.16 | ORPH bat | DISTRO | https://release-monitoring.org/project/241901 | 0.18.3 | 0.19.0 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2021.4 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.1 | 2021.4 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.5.0 | bcg729 | DISTRO | https://release-monitoring.org/project/14743 | 1.0.4 | 1.1.1 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.0.66 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.66 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.66 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.4 | ORPH bind | DISTRO | https://release-monitoring.org/project/14923 | 9.11.36 | 9.17.21 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.37 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 22.0 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.1.3 | bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.09 | 3.21 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.34.1 | 1.35.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.7 | 0.5.9 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.4 | 0.5.5 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.4 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.5.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.4.34 | 1.4.36 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.1 | 4.2 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.13 | 6.14 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.17.1 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.4 | 0.104.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.0 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.1 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.2 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.8 | 1.5.9 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.2.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.11.3 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.1.1 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.0.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.5 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.6.1 | 1.8.0 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20211214 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.11 | 20.10.12 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.11 | 20.10.12 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.19.1 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.0 | 1.26.1 | eigen | DISTRO | https://release-monitoring.org/project/00666 | 3.3.7 | 3.4.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 20.07 | 21.12 | elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.13.1 | ell | DISTRO | https://release-monitoring.org/project/17781 | 0.46 | 0.47 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.0 | 0.25.1 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.17 | 1.0.21 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-idna | DISTRO | https://release-monitoring.org/project/45374 | 6.0.0 | 6.1.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.9.0 | 1.11.2 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.6.10 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.9 | 1.0.16 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.25 | 1.0.29 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.10 | 1.0.14 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.7 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.6 | 1.0.8 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.38 | 1.0.45 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.23 | 1.0.27 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.39 | 1.1.0 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.9 | 1.1.13 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.20 | 1.0.24 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.44 | 1.1.48 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.4.10 | 1.5.6 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.28 | 1.0.32 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.8 | 1.0.12 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.9 | 1.0.10 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.3 | 1.4 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.8.0.1 | 2.8.2.0 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.8 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.24 | 6.4.26 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.29 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.16.1 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.2 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | fsl-sdk-v2.0 | 0.2.0 | fmt | DISTRO | https://release-monitoring.org/project/11526 | 8.0.1 | 8.1.1 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 5.15.4 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.94 | ORPH fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 21.12.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.10 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdk-pixbuf | DISTRO | https://release-monitoring.org/project/09533 | 2.42.4 | 2.42.6 | ORPH gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.2.9 | 2.3.5 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.53.3 | 9.55.0 | git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.34.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.66.0 | 2.70.1 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.70.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.10 | 3.0.14 | gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.2.32 | 2.3.4 | ORPH gnuplot | DISTRO | https://release-monitoring.org/project/01216 | 5.4.2 | 5.4.3 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.8.2.0 | 3.9.5.0 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.68.0 | 1.70.0 | ORPH gocryptfs | DISTRO | https://release-monitoring.org/project/21085 | 2.2.0 | 2.2.1 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.2 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grub2 | DISTRO | https://release-monitoring.org/project/01257 | 2.04 | 2.06 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 41.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gst-omx | DISTRO | https://release-monitoring.org/project/21845 | 1.18.5 | 1.19.3 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.5 | 1.19.3 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-libav | DISTRO | https://release-monitoring.org/project/21848 | 1.18.5 | 1.19.3 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.5 | 1.19.3 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.2 | ORPH gtkmm3 | DISTRO | https://release-monitoring.org/project/07963 | 3.22.0 | 4.4.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.49.1 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2018.01.1 | 2021.03.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.4.8 | 2.5.0 | haveged | DISTRO | https://release-monitoring.org/project/11695 | 1.9.15 | 1.9.17 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.11.2 | ORPH hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.21.12 | ORPH hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.354 | 0.355 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.4.1 | 2.7.0 | ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.36+nmu1 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.0.11-13 | 7.1.0-19 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.7.5 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.21.9.6 | ORPH iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.492 | 3.493 | ipmiutil | DISTRO | https://release-monitoring.org/project/01391 | 3.1.7 | 3.1.8 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | isl | DISTRO | https://release-monitoring.org/project/13286 | 0.23 | 0.24 | ORPH iwd | DISTRO | https://release-monitoring.org/project/18380 | 1.20 | 1.21 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.17 | 1.9.19 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.18.1 | 1.19.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.28 | 2.0.33 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.4 | 1.6 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.3 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.10.4 | 1.13.0 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.0 | json-glib | DISTRO | https://release-monitoring.org/project/13144 | 1.4.4 | 1.6.6 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.2.2 | 3.7.1 | keepalived | DISTRO | https://release-monitoring.org/project/01504 | 2.1.4 | 2.2.4 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.0-Ma... | 20.4.1-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.4-Ma... | 20.2.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.3-Ma... | 20.2.2-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.1.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.10-M... | 20.2.1-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.2.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.2-Ma... | 20.1.0-Nexus | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 1.2.0 | 2.1.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | lft | DISTRO | https://release-monitoring.org/project/21863 | 3.8 | 3.91 | ORPH libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.25 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.4.0 | 0.6.1 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 2.0 | libcodec2 | DISTRO | https://release-monitoring.org/project/14605 | 1.0.1 | 1.03 | libev | DISTRO | https://release-monitoring.org/project/01605 | 4.27 | 4.33 | ORPH libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgeotiff | DISTRO | https://release-monitoring.org/project/21361 | 1.6.0 | 1.7.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.2 | 3.3.6 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.68.4 | 2.70.2 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.3.2 | 1.4.0 | ORPH libgpg-error | DISTRO | https://release-monitoring.org/project/01628 | 1.42 | 1.43 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.28 | ORPH libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.6.0 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.37 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.12 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.16 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.1 | 0.11.3 | libmhash | DISTRO | https://release-monitoring.org/project/21488 | 0.9.9.9 | 1.4 | ORPH libminiupnpc | DISTRO | https://release-monitoring.org/project/01986 | 2.1.20201016 | 2.2.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.6 | 3.1.7 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.1.5 | 4.2.1 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 1.1.1m | 3.0.1 | libostree | DISTRO | https://release-monitoring.org/project/10899 | 2021.6 | 2022.1 | libpagekite | DISTRO | https://release-monitoring.org/project/21366 | 0.91.190530 | 0.91.201110 | libpam-radius-auth | DISTRO | https://release-monitoring.org/project/57834 | 1.4.0 | 2.0.0 | ORPH libpjsip | DISTRO | https://release-monitoring.org/project/15701 | 2.10 | 2.11.1 | libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.6.1 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.5.0 | 1.6.0 | libqb | DISTRO | https://release-monitoring.org/project/09399 | 2.0.3 | 2.0.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.53.0 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigsegv | DISTRO | https://release-monitoring.org/project/01722 | 2.13 | 2.14 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.0 | 3.0.4 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.1 | 2.4.2 | libss7 | DISTRO | https://release-monitoring.org/project/21690 | 2.0.0 | 2.0.1 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.5 | libuhttpd | DISTRO | https://release-monitoring.org/project/89386 | 3.12.1 | 3.14.1 | libunistring | DISTRO | https://release-monitoring.org/project/01747 | 0.9.10 | 1.0 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.5.0 | 1.6.2 | ORPH libuv | DISTRO | https://release-monitoring.org/project/10784 | 1.42.0 | 1.43.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.1 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.0.21 | 4.3.0 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.26 | 4.4.27 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.66 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20210919 | 20211216 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.01.06 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.9 | 1.0.13 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.12.0 | 0.12.1 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.18.0 | 3.19.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.3 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.8 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.3 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.12 | 2.03.14 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.3 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.30 | 10.7.1 | ORPH matchbox-keyboard | DISTRO | https://release-monitoring.org/project/230595 | 0.1 | 0.1.1 | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.0 | 3.1.0 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.4.0 | 0.1.5.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.0.66 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 5.31b | memtester | DISTRO | https://release-monitoring.org/project/01967 | 4.5.0 | 4.5.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.42.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2021.12 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20190618 | 20210805 | ORPH modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.16.10 | 1.18.4 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.11 | 5.1.1 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.5 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.29.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.164 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.0 | 2.5.1 | mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.29.3 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.34.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 4.0.3 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.14 | 1.8.19 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtd | DISTRO | https://release-monitoring.org/project/02026 | 2.1.3 | 2.1.4 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.36 | 4.0.37 | multipath-tools | DISTRO | https://release-monitoring.org/project/00424 | 0.8.7 | 0.8.8 | mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.0.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220101 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.30.2 | 0.32.1 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | debian_1.... | 1.218 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.32.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.6.1 | 0.7.3 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9 | 5.9.1 | ORPH network-manager-openvpn | DISTRO | https://release-monitoring.org/project/69977 | 1.8.14 | 1.8.16 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.46.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.5 | nmon | DISTRO | https://release-monitoring.org/project/02097 | 16m | 16n | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.2 | 17.3.0 | nss-mdns | DISTRO | https://release-monitoring.org/project/05491 | 0.14.1 | 0.15.1 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.132 | 390.147 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 495.46 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 1.16 | ORPH ocf-linux | DISTRO | https://release-monitoring.org/project/21541 | 20120127 | 20171122 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.31 | 1.34 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.2.4 | omniorb | DISTRO | https://release-monitoring.org/project/21545 | 4.2.4 | 4.3.0 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.3 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.19 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.5.5 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.7.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.13+8 | 19+4 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.10.0 | 6.11.0 | openldap | DISTRO | https://release-monitoring.org/project/02551 | 2.4.59 | 2.6.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.2 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.44.10 | opentracing-cpp | DISTRO | https://release-monitoring.org/project/21553 | 1.5.1 | 1.6.0 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 10.3.5-10... | 11.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.5.0 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.27 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.0.66 | ORPH p11-kit | DISTRO | https://release-monitoring.org/project/02582 | 0.23.22 | 0.24.0 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.0 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH parted | DISTRO | https://release-monitoring.org/project/02596 | 3.3 | 3.4 | patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.9 | 0.14.3 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.3 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202112 | ORPH perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-guess | DISTRO | https://release-monitoring.org/project/17375 | 0.12 | 0.14 | perl-crypt-openssl-rsa | DISTRO | https://release-monitoring.org/project/02748 | 0.31 | 0.32 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.85 | 6.86 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-http-message | DISTRO | https://release-monitoring.org/project/02977 | 6.33 | 6.36 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.072 | 2.074 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.57 | 6.60 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20200907 | perl-net-dns | DISTRO | https://release-monitoring.org/project/03147 | 1.32 | 1.33 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.85 | 1.90 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-try-tiny | DISTRO | https://release-monitoring.org/project/11921 | 0.30 | 0.31 | perl-uri | DISTRO | https://release-monitoring.org/project/03485 | 5.09 | 5.10 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0207 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.0.14 | 8.1.1 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.21 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-imagick | DISTRO | https://release-monitoring.org/project/17401 | 3.5.0 | 3.6.0 | ORPH php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.1.2 | php-yaml | DISTRO | https://release-monitoring.org/project/12515 | 2.2.1 | 2.2.2 | ORPH pigpio | DISTRO | https://release-monitoring.org/project/21577 | 79 | 7301 | pinentry | DISTRO | https://release-monitoring.org/project/03643 | 1.1.1 | 1.2.0 | ORPH pkcs11-helper | DISTRO | https://release-monitoring.org/project/91990 | 1.27 | 1.28 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.8.0 | ORPH poco | DISTRO | https://release-monitoring.org/project/05418 | 1.10.1 | 1.11.1 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.01.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.8 | 1.3.9 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.14 | proftpd | DISTRO | https://release-monitoring.org/project/07609 | 1.3.6e | 1.3.7c | proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 8.2.1 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.2 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.15 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 14.2 | 15.0 | python-aenum | DISTRO | https://release-monitoring.org/project/34074 | 3.1.0 | 3.1.5 | python-aioblescan | DISTRO | https://release-monitoring.org/project/21242 | 0.2.8 | 0.2.10 | python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.1 | 0.4.3 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiojobs | DISTRO | https://release-monitoring.org/project/21252 | 0.3.0 | 1.0.0 | python-alsaaudio | DISTRO | https://release-monitoring.org/project/10072 | 0.8.4 | 0.9.0 | python-argon2-cffi | DISTRO | https://release-monitoring.org/project/33377 | 21.1.0 | 21.3.0 | python-arrow | DISTRO | https://release-monitoring.org/project/05314 | 1.2.0 | 1.2.1 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.4.1 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 21.2.0 | 21.4.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 21.3.1 | 21.11.1 | python-avro | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | python-bidict | DISTRO | https://release-monitoring.org/project/114352 | 0.21.3 | 0.21.4 | python-bleak | DISTRO | https://release-monitoring.org/project/26271 | 0.12.1 | 0.13.0 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.31 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.31 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2021.5.30 | 2021.10.8 | python-channels | DISTRO | https://release-monitoring.org/project/21937 | 2.3.1 | 3.0.4 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 2.4.1 | 3.3.1 | python-charset-normalizer | DISTRO | https://release-monitoring.org/project/55366 | 2.0.7 | 2.0.10 | python-cheroot | DISTRO | https://release-monitoring.org/project/20163 | 8.2.1 | 8.6.0 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 12.0.1 | 18.6.1 | python-click | DISTRO | https://release-monitoring.org/project/03802 | 7.1.2 | 8.0.3 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.4.1 | 6.6.0 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.fb18 | 1.5 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 1.0.2 | 2.3.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python-daemon | DISTRO | https://release-monitoring.org/project/03816 | 2.2.3 | 2.3.0 | python-daphne | DISTRO | https://release-monitoring.org/project/21939 | 2.4.1 | 3.0.2 | python-dataproperty | DISTRO | https://release-monitoring.org/project/21697 | 0.53.0 | 0.54.2 | python-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog | DISTRO | https://release-monitoring.org/project/03823 | 3.4.0 | 3.5.3 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 3.2.10 | 4.0.1 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 4.1.0 | 5.0.3 | python-docutils | DISTRO | https://release-monitoring.org/project/03849 | 0.15.2 | 0.18.1 | python-ecdsa | DISTRO | https://release-monitoring.org/project/08370 | 0.17.0 | 0.18.0b2 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.2.1 | 4.3.0 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.4.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.2 | python-flask-expects-json | DISTRO | https://release-monitoring.org/project/127659 | 1.5.0 | 1.7.0 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 0.3.1 | 2.1.0 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 2.4.1 | 2.5.1 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 0.15.1 | 1.0.0 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.28.2 | 4.28.5 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.25 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.9 | python-h2 | DISTRO | https://release-monitoring.org/project/19033 | 3.2.0 | 4.1.0 | python-hpack | DISTRO | https://release-monitoring.org/project/19034 | 3.0.0 | 4.0.0 | python-httplib2 | DISTRO | https://release-monitoring.org/project/03887 | 0.19.1 | 0.20.2 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.13.1 | python-hyperframe | DISTRO | https://release-monitoring.org/project/19035 | 5.2.0 | 6.0.1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.2 | 3.3 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.28.0 | 8.0.0b1 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 1.1.0 | 2.0.1 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-janus | DISTRO | https://release-monitoring.org/project/56567 | 0.6.1 | 1.0.0 | python-jaraco-classes | DISTRO | https://release-monitoring.org/project/20150 | 2.0 | 3.2.1 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 2.0 | 3.5.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.0.2 | 3.0.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 2.5.1 | 4.3.3 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 19.2.0 | 23.5.0 | python-kiwisolver | DISTRO | https://release-monitoring.org/project/16910 | 1.1.0 | 1.3.2 | python-lmdb | DISTRO | https://release-monitoring.org/project/15512 | 1.2.1 | 1.3.0 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.6.5 | 4.7.1 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.1.5 | 1.1.6 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.3.4 | 3.3.6 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.1 | 2.4.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.5.1 | python-memory-profiler | DISTRO | https://release-monitoring.org/project/38508 | 0.58.0 | 0.60.0 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 0.8.4 | 2.0.1 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 8.10.0 | 8.12.0 | python-msgfy | DISTRO | https://release-monitoring.org/project/29716 | 0.1.0 | 0.2.0 | python-msgpack | DISTRO | https://release-monitoring.org/project/21831 | 1.0.2 | 1.0.3 | python-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-nfc | DISTRO | https://release-monitoring.org/project/21829 | 0.13.5 | 1.0.3 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.0 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 0.8.4 | 0.98.9 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 21.0 | 21.3 | python-paho-mqtt | DISTRO | https://release-monitoring.org/project/06084 | 1.4.0 | 1.6.1 | python-pam | DISTRO | https://release-monitoring.org/project/05725 | 0.5.0 | 1.8.4 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | python-pathlib2 | DISTRO | https://release-monitoring.org/project/12723 | 2.3.5 | 2.3.6 | python-pathpy | DISTRO | https://release-monitoring.org/project/21703 | 12.0.1 | 12.5.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.6.0 | 5.8.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 8.4.0 | 9.0.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 21.3.1 | python-portend | DISTRO | https://release-monitoring.org/project/20203 | 2.5 | 3.1.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.20 | 3.0.24 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.2 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python-psycopg2 | DISTRO | https://release-monitoring.org/project/03979 | 2.9.1 | 2.9.3 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2021.1 | 2022.1 | python-py | DISTRO | https://release-monitoring.org/project/03981 | 1.10.0 | 1.11.0 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0a2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.5 | 1.5.6 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.7.4 | 2.11.2 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.2 | 2.0.3 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 1.9.7 | 2.8 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.19.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 2.2.0 | 2.5.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.18.14 | 1.19.4 | python-pynacl | DISTRO | https://release-monitoring.org/project/12703 | 1.4.0 | 1.5.0 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 19.1.0 | 21.0.0 | python-pyparsing | DISTRO | https://release-monitoring.org/project/03756 | 2.4.7 | 3.0.6 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.11.6 | 3.11.7 | python-pyphen | DISTRO | https://release-monitoring.org/project/19681 | 0.11.0 | 0.12.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.7 | 5.15.6 | python-pyro | DISTRO | https://release-monitoring.org/project/19993 | 3.16 | 4.82 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.5 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.1 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.16.0 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2019.3 | 2021.3 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | python-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 19.0.2 | 22.3.0 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 3.5.3 | 4.1.0 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.26.0 | 2.27.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.1 | python-rsa | DISTRO | https://release-monitoring.org/project/08808 | 4.7.2 | 4.8 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.fb57 | 2.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.1 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 18.1.0 | 21.1.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 44.0.0 | 60.5.0 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.17.5 | 3.17.6 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 0.45.2 | 1.3.0 | python-singledispatch | DISTRO | https://release-monitoring.org/project/12013 | 3.4.0.3 | 3.7.0 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.18 | 5.0.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 4.0.0 | 5.0.0 | python-snappy | DISTRO | https://release-monitoring.org/project/07203 | 0.5.4 | 0.6.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.0 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.2.1 | 2.3.1 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.3.10 | 1.4.29 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.2.0 | 1.2.1 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.3.0 | 0.4.2 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 1.14.1 | 5.0.0 | python-terminaltables | DISTRO | https://release-monitoring.org/project/15542 | 3.1.0 | 3.1.10 | python-thrift | DISTRO | https://release-monitoring.org/project/21614 | 0.13.0 | 0.15.0 | python-tinycss2 | DISTRO | https://release-monitoring.org/project/16655 | 1.1.0 | 1.1.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.1 | 1.1.3 | python-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.0 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.0.4 | 6.1 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.40.1 | 4.62.3 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.1.0 | 5.1.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 20.3.0 | 21.5.0 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 20.3.0 | 21.7.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.0.1 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 4.2.0 | 5.1.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.7 | 1.26.8 | python-validators | DISTRO | https://release-monitoring.org/project/19818 | 0.15.0 | 0.18.2 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.1.9 | 0.2.5 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 53.4 | 54.0b1 | python-webpy | DISTRO | https://release-monitoring.org/project/04090 | 0.40 | 0.62 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 0.58.0 | 1.2.3 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.2 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.12.1 | 1.13.3 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 2.3.3 | 3.0.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.27 | 0.31 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.1 | 3.0.2 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.1 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python3-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 59.8.0 | 60.5.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt53d | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5base | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5charts | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5connectivity | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5declarative | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5graphicaleffects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5imageformats | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5location | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5lottie | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5multimedia | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols2 | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quicktimeline | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5remoteobjects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5script | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5scxml | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5sensors | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialbus | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialport | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5svg | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5tools | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5virtualkeyboard | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5wayland | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webchannel | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.212.0-a... | 6.2.2 | qt5websockets | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webview | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5x11extras | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5xmlpatterns | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.1 | 1.2 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-server | DISTRO | https://release-monitoring.org/project/05585 | 3.8.2 | 3.9.12 | ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | readline | DISTRO | https://release-monitoring.org/project/04173 | 8.1 | 8.1.2 | ORPH restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.4 | 1.10.5 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.27.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2112.0 | rtai | DISTRO | https://release-monitoring.org/project/21658 | 4.0.1 | 5.3 | ORPH rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.0.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.57.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.57.0 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.10.0.3 | 2.11.0.1 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.1 | 2.3.5.3 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.6.3 | 1.0.7.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.5.1.5 | 2.5.1.7 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.4.1.1 | 2.5.1.0 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.3.2 | 2.2.3.4 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.2.2 | 0.5.3.0 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.3.0 | sdbus-cpp | DISTRO | https://release-monitoring.org/project/70626 | 0.8.3 | 1.1.0 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | sedutil | DISTRO | https://release-monitoring.org/project/15203 | 1.15.1 | 1.20.0 | sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 1.59.0 | 1.71.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.13 | sg3_utils | DISTRO | https://release-monitoring.org/project/04801 | 1.47 | 1.47r915 | shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.1 | ORPH skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.10.0.3 | 2.11.1.0 | snappy | DISTRO | https://release-monitoring.org/project/04844 | 1.1.8 | 1.1.9 | sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.4.7 | 1.4.10 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.2 | 3.4.8 | socat | DISTRO | https://release-monitoring.org/project/04848 | 1.7.4.2 | 1.7.4.3 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | speexdsp | DISTRO | https://release-monitoring.org/project/08419 | SpeexDSP-... | 1.2.0 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.1 | 3.37.2 | sshfs | DISTRO | https://release-monitoring.org/project/11058 | 3.7.1 | 3.7.2 | ORPH start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.1 | ORPH startup-notification | DISTRO | https://release-monitoring.org/project/10089 | 0.9 | 0.12 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.4 | 1.0.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.61 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.4 | ORPH synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.23.1 | 0.28.0 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.34.1 | 3.35.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.42.1 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.4.2 | 12.5.5 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.01 | ORPH targetcli-fb | DISTRO | https://release-monitoring.org/project/09174 | 2.1.fb41 | 2.1.54 | tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.4.6 | 2.4.7 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.15.0 | ORPH tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.2a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 2.4.0 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | trace-cmd... | 2.9.4 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.1 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2021.10 | udpcast | DISTRO | https://release-monitoring.org/project/10206 | 20200328 | 20211207 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.10 | 0.11 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 3.15.0.0 | 4.1.0.5 | umtprd | DISTRO | https://release-monitoring.org/project/46129 | 1.3.10 | 1.6.2 | unclutter-xfixes | DISTRO | https://release-monitoring.org/project/09206 | 1.5 | 1.6 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 2.2 | upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.54.6 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.3930 | 8.2.4046 | ORPH vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.22 | 3.2.26 | waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.6.1 | 1.7.0 | wayland | DISTRO | https://release-monitoring.org/project/10061 | 1.19.0 | 1.20.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.23 | 1.24 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.32.4 | 2.34.3 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.10 | 5.5.11 | wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 6.23 | wireguard-linux-compat | DISTRO | https://release-monitoring.org/project/62379 | 1.0.20210606 | 1.0.20211208 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.2 | 0.4.6 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.10 | 3.6.1 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.0 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.1.1 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.3 | 2.35.1 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20210218 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 21.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.3 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xml-security-c | DISTRO | https://release-monitoring.org/project/05197 | 2.0.2 | 2.0.4 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 5.45 | 6.02 | xserver_xorg-server | DISTRO | https://release-monitoring.org/project/05250 | 21.1.2 | 21.1.3 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.17 | 3.18 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.0 | 0.3.1 | yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2020f | 2021e | zynq-boot-bin | DISTRO | https://release-monitoring.org/project/21623 | 2015.1 | 2021.2 | ORPH Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 bash | CVE-2019-18276 | https://security-tracker.debian.org/tracker/CVE-2019-18276 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-3487 | https://security-tracker.debian.org/tracker/CVE-2021-3487 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bird | CVE-2021-26928 | https://security-tracker.debian.org/tracker/CVE-2021-26928 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2021-42376 | https://security-tracker.debian.org/tracker/CVE-2021-42376 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 civetweb | CVE-2020-27304 | https://security-tracker.debian.org/tracker/CVE-2020-27304 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exim | CVE-2021-38371 | https://security-tracker.debian.org/tracker/CVE-2021-38371 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2020-35965 | https://security-tracker.debian.org/tracker/CVE-2020-35965 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 flatbuffers | CVE-2020-35864 | https://security-tracker.debian.org/tracker/CVE-2020-35864 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41157 | https://security-tracker.debian.org/tracker/CVE-2021-41157 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-27645 | https://security-tracker.debian.org/tracker/CVE-2021-27645 glibc | CVE-2021-33574 | https://security-tracker.debian.org/tracker/CVE-2021-33574 glibc | CVE-2021-38604 | https://security-tracker.debian.org/tracker/CVE-2021-38604 gnuchess | CVE-2021-30184 | https://security-tracker.debian.org/tracker/CVE-2021-30184 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 go | CVE-2021-29923 | https://security-tracker.debian.org/tracker/CVE-2021-29923 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2020-6624 | https://security-tracker.debian.org/tracker/CVE-2020-6624 jhead | CVE-2020-6625 | https://security-tracker.debian.org/tracker/CVE-2020-6625 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 keepalived | CVE-2021-44225 | https://security-tracker.debian.org/tracker/CVE-2021-44225 kodi | CVE-2021-42917 | https://security-tracker.debian.org/tracker/CVE-2021-42917 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libesmtp | CVE-2019-19977 | https://security-tracker.debian.org/tracker/CVE-2019-19977 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libnss | CVE-2021-43527 | https://security-tracker.debian.org/tracker/CVE-2021-43527 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libressl | CVE-2021-41581 | https://security-tracker.debian.org/tracker/CVE-2021-41581 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 monkey | CVE-2013-1771 | https://security-tracker.debian.org/tracker/CVE-2013-1771 monkey | CVE-2013-2183 | https://security-tracker.debian.org/tracker/CVE-2013-2183 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 mutt | CVE-2021-32055 | https://security-tracker.debian.org/tracker/CVE-2021-32055 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 network-manager | CVE-2021-20297 | https://security-tracker.debian.org/tracker/CVE-2021-20297 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvpn | CVE-2021-3606 | https://security-tracker.debian.org/tracker/CVE-2021-3606 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php-imagick | CVE-2019-11037 | https://security-tracker.debian.org/tracker/CVE-2019-11037 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 privoxy | CVE-2021-44540 | https://security-tracker.debian.org/tracker/CVE-2021-44540 privoxy | CVE-2021-44541 | https://security-tracker.debian.org/tracker/CVE-2021-44541 privoxy | CVE-2021-44542 | https://security-tracker.debian.org/tracker/CVE-2021-44542 privoxy | CVE-2021-44543 | https://security-tracker.debian.org/tracker/CVE-2021-44543 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-autobahn | CVE-2020-35678 | https://security-tracker.debian.org/tracker/CVE-2020-35678 python-cryptography | CVE-2020-36242 | https://security-tracker.debian.org/tracker/CVE-2020-36242 python-django | CVE-2021-44420 | https://security-tracker.debian.org/tracker/CVE-2021-44420 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2020-35503 | https://security-tracker.debian.org/tracker/CVE-2020-35503 qemu | CVE-2020-35504 | https://security-tracker.debian.org/tracker/CVE-2020-35504 qemu | CVE-2020-35505 | https://security-tracker.debian.org/tracker/CVE-2020-35505 qemu | CVE-2020-35506 | https://security-tracker.debian.org/tracker/CVE-2020-35506 qemu | CVE-2020-35517 | https://security-tracker.debian.org/tracker/CVE-2020-35517 qemu | CVE-2021-20181 | https://security-tracker.debian.org/tracker/CVE-2021-20181 qemu | CVE-2021-20196 | https://security-tracker.debian.org/tracker/CVE-2021-20196 qemu | CVE-2021-20203 | https://security-tracker.debian.org/tracker/CVE-2021-20203 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-20263 | https://security-tracker.debian.org/tracker/CVE-2021-20263 qemu | CVE-2021-3392 | https://security-tracker.debian.org/tracker/CVE-2021-3392 qemu | CVE-2021-3409 | https://security-tracker.debian.org/tracker/CVE-2021-3409 qemu | CVE-2021-3416 | https://security-tracker.debian.org/tracker/CVE-2021-3416 qemu | CVE-2021-3507 | https://security-tracker.debian.org/tracker/CVE-2021-3507 qemu | CVE-2021-3527 | https://security-tracker.debian.org/tracker/CVE-2021-3527 qemu | CVE-2021-3544 | https://security-tracker.debian.org/tracker/CVE-2021-3544 qemu | CVE-2021-3545 | https://security-tracker.debian.org/tracker/CVE-2021-3545 qemu | CVE-2021-3546 | https://security-tracker.debian.org/tracker/CVE-2021-3546 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 qpid-proton | CVE-2016-2166 | https://security-tracker.debian.org/tracker/CVE-2016-2166 qpid-proton | CVE-2016-4467 | https://security-tracker.debian.org/tracker/CVE-2016-4467 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2021-28966 | https://security-tracker.debian.org/tracker/CVE-2021-28966 runc | CVE-2021-43784 | https://security-tracker.debian.org/tracker/CVE-2021-43784 rust | CVE-2021-29922 | https://security-tracker.debian.org/tracker/CVE-2021-29922 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2021-3156 | https://security-tracker.debian.org/tracker/CVE-2021-3156 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tools | CVE-2021-3565 | https://security-tracker.debian.org/tracker/CVE-2021-3565 uboot-tools | CVE-2021-27097 | https://security-tracker.debian.org/tracker/CVE-2021-27097 uboot-tools | CVE-2021-27138 | https://security-tracker.debian.org/tracker/CVE-2021-27138 util-linux | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 util-linux-libs | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 vim | CVE-2021-4069 | https://security-tracker.debian.org/tracker/CVE-2021-4069 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 webkitgtk | CVE-2021-45481 | https://security-tracker.debian.org/tracker/CVE-2021-45481 webkitgtk | CVE-2021-45482 | https://security-tracker.debian.org/tracker/CVE-2021-45482 webkitgtk | CVE-2021-45483 | https://security-tracker.debian.org/tracker/CVE-2021-45483 wget | CVE-2021-31879 | https://security-tracker.debian.org/tracker/CVE-2021-31879 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28705 | https://security-tracker.debian.org/tracker/CVE-2021-28705 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28709 | https://security-tracker.debian.org/tracker/CVE-2021-28709 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 keepalived | CVE-2021-44225 | https://security-tracker.debian.org/tracker/CVE-2021-44225 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 privoxy | CVE-2021-44540 | https://security-tracker.debian.org/tracker/CVE-2021-44540 privoxy | CVE-2021-44541 | https://security-tracker.debian.org/tracker/CVE-2021-44541 privoxy | CVE-2021-44542 | https://security-tracker.debian.org/tracker/CVE-2021-44542 privoxy | CVE-2021-44543 | https://security-tracker.debian.org/tracker/CVE-2021-44543 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-django | CVE-2021-44420 | https://security-tracker.debian.org/tracker/CVE-2021-44420 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 runc | CVE-2021-43784 | https://security-tracker.debian.org/tracker/CVE-2021-43784 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2021-36690 | https://security-tracker.debian.org/tracker/CVE-2021-36690 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4069 | https://security-tracker.debian.org/tracker/CVE-2021-4069 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28705 | https://security-tracker.debian.org/tracker/CVE-2021-28705 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28709 | https://security-tracker.debian.org/tracker/CVE-2021-28709 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From arnout at mind.be Mon Jan 10 07:13:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:13:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/gensio: add avahi optional dependency In-Reply-To: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> References: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> Message-ID: On 04/01/2022 21:41, Fabrice Fontaine wrote: > avahi-client is an optional dependency which is enabled by default since > version 2.2.0 and > https://github.com/cminyard/gensio/commit/5ab117c9743fd4719f610cf9f1ba45023cc25d7c > > Signed-off-by: Fabrice Fontaine > --- > package/gensio/gensio.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk > index 389de1e263..b4936d5f21 100644 > --- a/package/gensio/gensio.mk > +++ b/package/gensio/gensio.mk > @@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net > GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) > GENSIO_LICENSE_FILES = COPYING.LIB COPYING > GENSIO_INSTALL_STAGING = YES > +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) In the commit message you talk about avahi-client, but here it's avahi-daemon. That looks a bit weird... Can you explain? Regards, Arnout > GENSIO_CONF_OPTS = \ > --without-openipmi \ > --without-swig \ > From arnout at mind.be Mon Jan 10 07:18:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:18:37 +0100 Subject: [Buildroot] [PATCH] package/linux-firmware: add option for Cypress FullMAC In-Reply-To: <20220105214046.14890-1-wiselord1983@gmail.com> References: <20220105214046.14890-1-wiselord1983@gmail.com> Message-ID: <2a9ec923-a4dc-8555-1c98-3562c2f7d3ef@mind.be> On 05/01/2022 22:40, Uladzimir Bely wrote: > Since 2016, Cypress is in charge of supporting old Broadcom wireless > chips and producing new ones. Newer firmwares for now come with > a different license and have anoter location in a package. > > Now, most of Broadcom FullMac firmwares in brcm/ directory should now > be just symlinks to the corresponding files in cypress/ directory. It's not actually most, just about half. > > Respectively, it also makes sence to autoselect corresponding CYPRESS > options if user selectes BRCM wireless stuff. This looked very suspicious at first, but indeed, with our linux-firmware infrastructure, this is the only reasonable way we can make sure that all the BCM firmware blobs are actually installed. Applied to master, thanks. Regards, Arnout > > This patch was created as a result of investigation the issue with > broken wireless support for such popular boards as Raspberry Pi Zero W > and BananaPi M2 Zero. > > Signed-off-by: Uladzimir Bely > --- > package/linux-firmware/Config.in | 17 ++++++++++ > package/linux-firmware/linux-firmware.hash | 1 + > package/linux-firmware/linux-firmware.mk | 39 ++++++++++++++++++++++ > 3 files changed, 57 insertions(+) > > diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in > index 622b1ee685..c94ffe24de 100644 > --- a/package/linux-firmware/Config.in > +++ b/package/linux-firmware/Config.in > @@ -140,11 +140,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X > > config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX > bool "Broadcom BRCM bcm43xx" > + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX > help > Firmware files for the Broadcom bcm43xx SoftMAC and FullMAC. > > config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > bool "Broadcom BRCM bcm43xxx" > + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX > help > Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. > > @@ -158,6 +160,21 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0 > help > Firmware file for the Broadcom 4366c0 FullMAC chip. > > +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX > + bool "Cypress CY cyw43xx" > + help > + Firmware files for the Cypress cyw43xx FullMAC. > + > +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX > + bool "Cypress CY cyw43xxx" > + help > + Firmware files for the Cypress cyw43xxx FullMAC. > + > +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX > + bool "Cypress CY cyw54xxx" > + help > + Firmware files for the Cypress cyw54xxx FullMAC. > + > config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 > bool "Intel iwlwifi 22260" > help > diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash > index d8edb37628..4c73374138 100644 > --- a/package/linux-firmware/linux-firmware.hash > +++ b/package/linux-firmware/linux-firmware.hash > @@ -11,6 +11,7 @@ sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k > sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt > sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx > sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware > +sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress > sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 > sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware > sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk > index 281ed0189d..ac45bc8282 100644 > --- a/package/linux-firmware/linux-firmware.mk > +++ b/package/linux-firmware/linux-firmware.mk > @@ -675,6 +675,45 @@ LINUX_FIRMWARE_FILES += brcm/brcmfmac4366c-pcie.bin > LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx > endif > > +# cyfmac43xx > +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX),y) > +LINUX_FIRMWARE_FILES += \ > + cypress/cyfmac4339-sdio.bin \ > + cypress/cyfmac4354-sdio.bin \ > + cypress/cyfmac4354-sdio.clm_blob \ > + cypress/cyfmac4356-pcie.bin \ > + cypress/cyfmac4356-pcie.clm_blob \ > + cypress/cyfmac4356-sdio.bin \ > + cypress/cyfmac4356-sdio.clm_blob \ > + cypress/cyfmac4373-sdio.bin \ > + cypress/cyfmac4373-sdio.clm_blob > +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress > +endif > + > +# cyfmac43xxx > +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX),y) > +LINUX_FIRMWARE_FILES += \ > + cypress/cyfmac43012-sdio.bin \ > + cypress/cyfmac43012-sdio.clm_blob \ > + cypress/cyfmac43340-sdio.bin \ > + cypress/cyfmac43362-sdio.bin \ > + cypress/cyfmac43430-sdio.bin \ > + cypress/cyfmac43430-sdio.clm_blob \ > + cypress/cyfmac43455-sdio.bin \ > + cypress/cyfmac43455-sdio.clm_blob \ > + cypress/cyfmac43570-pcie.bin \ > + cypress/cyfmac43570-pcie.clm_blob > +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress > +endif > + > +# cyfmac54xxx > +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX),y) > +LINUX_FIRMWARE_FILES += \ > + cypress/cyfmac54591-pcie.bin \ > + cypress/cyfmac54591-pcie.clm_blob > +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress > +endif > + > # ql2xxx > ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX),y) > LINUX_FIRMWARE_FILES += \ > From arnout at mind.be Mon Jan 10 07:19:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:19:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: new package In-Reply-To: <20220109170200.1315505-1-ju.o@free.fr> References: <20220109170200.1315505-1-ju.o@free.fr> Message-ID: On 09/01/2022 18:02, Julien Olivain wrote: > python-distro provides information about the OS distribution it runs on, > such as a reliable machine-readable ID, or version information. > > It is the recommended replacement for Python's original > platform.linux_distribution function (removed in Python 3.8). It also > provides much more functionality which isn't necessarily Python bound, > like a command-line interface. > > https://github.com/nir0s/distro > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-distro/Config.in | 13 +++++++++++++ > package/python-distro/python-distro.hash | 3 +++ > package/python-distro/python-distro.mk | 14 ++++++++++++++ > 5 files changed, 32 insertions(+) > create mode 100644 package/python-distro/Config.in > create mode 100644 package/python-distro/python-distro.hash > create mode 100644 package/python-distro/python-distro.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 2ad76a80e4..a44f07be97 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1590,6 +1590,7 @@ F: package/fluid-soundfont/ > F: package/fluidsynth/ > F: package/glslsandbox-player/ > F: package/ptm2human/ > +F: package/python-distro/ > F: package/python-pyalsa/ > > N: Julien Viard de Galbert > diff --git a/package/Config.in b/package/Config.in > index edae7e4f62..47087f52cb 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -999,6 +999,7 @@ menu "External python modules" > source "package/python-dialog/Config.in" > source "package/python-dialog3/Config.in" > source "package/python-dicttoxml/Config.in" > + source "package/python-distro/Config.in" > source "package/python-django/Config.in" > source "package/python-django-enumfields/Config.in" > source "package/python-dnspython/Config.in" > diff --git a/package/python-distro/Config.in b/package/python-distro/Config.in > new file mode 100644 > index 0000000000..bb4151541e > --- /dev/null > +++ b/package/python-distro/Config.in > @@ -0,0 +1,13 @@ > +config BR2_PACKAGE_PYTHON_DISTRO > + bool "python distro" > + help > + distro provides information about the OS distribution it > + runs on, such as a reliable machine-readable ID, or version > + information. > + > + It is the recommended replacement for Python's original > + platform.linux_distribution function (removed in Python > + 3.8). It also provides much more functionality which isn't > + necessarily Python bound, like a command-line interface. > + > + https://github.com/nir0s/distro > diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash > new file mode 100644 > index 0000000000..e2b3c0a444 > --- /dev/null > +++ b/package/python-distro/python-distro.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz > +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE > diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk > new file mode 100644 > index 0000000000..753e74d020 > --- /dev/null > +++ b/package/python-distro/python-distro.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-distro > +# > +################################################################################ > + > +PYTHON_DISTRO_VERSION = 1.6.0 > +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 > +PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz > +PYTHON_DISTRO_LICENSE = Apache-2.0 > +PYTHON_DISTRO_LICENSE_FILES = LICENSE > +PYTHON_DISTRO_SETUP_TYPE = setuptools > + > +$(eval $(python-package)) > From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/hiawatha: disable ASM if needed Message-ID: <20220110071316.C1D1E82ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89ecfb3c789b57552373eb323e6b2ac9001295a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable ASM as already done in mbedtls package to avoid the following build failure raised since commit 4e36e8f2081a66f477dd038793082045876d65ee: In file included from /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c:41: /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c: In function 'mpi_mul_hlp': /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bn_mul.h:86:13: error: the register 'hi' cannot be clobbered in 'asm' for the current target 86 | #define asm __asm | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/5436b44777c5d417ae427b99602f516fd8f9489d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/hiawatha/hiawatha.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index ed9f8aba54..14d3c9f1ee 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -22,6 +22,24 @@ HIAWATHA_CONF_OPTS = \ -DWEBROOT_DIR=/var/www/hiawatha \ -DWORK_DIR=/var/lib/hiawatha +define HIAWATHA_MBEDTLS_DISABLE_ASM + $(SED) '/^#define MBEDTLS_AESNI_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h +endef + +# ARM in thumb mode breaks debugging with asm optimizations +# Microblaze asm optimizations are broken in general +# MIPS R6 asm is not yet supported +ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +endif + ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/hiawatha: mbedtls is mandatory, not optional Message-ID: <20220110071316.B786D82DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4043bc0c9c55e1bcac58677c361cd1b8724716b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master hiawatha is unconditionally using mbedtls since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e (e.g. wigwam.c includes "mbedtls/md5.h") Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/hiawatha/hiawatha.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 017592de1e..ed9f8aba54 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -11,7 +11,10 @@ HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver +# Disable system mbedtls as hiawatha needs mbedtls 3.x HIAWATHA_CONF_OPTS = \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF \ -DENABLE_TOOLKIT=OFF \ -DCONFIG_DIR=/etc/hiawatha \ -DLOG_DIR=/var/log \ @@ -20,11 +23,7 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -# Disable system mbedtls as hiawatha needs mbedtls 3.x -HIAWATHA_CONF_OPTS += \ - -DENABLE_TLS=ON \ - -DINSTALL_MBEDTLS_HEADERS=OFF \ - -DUSE_SYSTEM_MBEDTLS=OFF +HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: add option for Cypress FullMAC Message-ID: <20220110071316.A3D0182ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27cbd680cb6386a2326a3a95f41de80deba440b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since 2016, Cypress is in charge of supporting old Broadcom wireless chips and producing new ones. Newer firmwares for now come with a different license and have anoter location in a package. Now, most of Broadcom FullMac firmwares in brcm/ directory should now be just symlinks to the corresponding files in cypress/ directory. Respectively, it also makes sence to autoselect corresponding CYPRESS options if user selectes BRCM wireless stuff. This patch was created as a result of investigation the issue with broken wireless support for such popular boards as Raspberry Pi Zero W and BananaPi M2 Zero. Signed-off-by: Uladzimir Bely Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/linux-firmware/Config.in | 17 +++++++++++++ package/linux-firmware/linux-firmware.hash | 1 + package/linux-firmware/linux-firmware.mk | 39 ++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 622b1ee685..c94ffe24de 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -140,11 +140,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX bool "Broadcom BRCM bcm43xx" + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX help Firmware files for the Broadcom bcm43xx SoftMAC and FullMAC. config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX bool "Broadcom BRCM bcm43xxx" + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX help Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. @@ -158,6 +160,21 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0 help Firmware file for the Broadcom 4366c0 FullMAC chip. +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX + bool "Cypress CY cyw43xx" + help + Firmware files for the Cypress cyw43xx FullMAC. + +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX + bool "Cypress CY cyw43xxx" + help + Firmware files for the Cypress cyw43xxx FullMAC. + +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX + bool "Cypress CY cyw54xxx" + help + Firmware files for the Cypress cyw54xxx FullMAC. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index d8edb37628..4c73374138 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -11,6 +11,7 @@ sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware +sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 281ed0189d..ac45bc8282 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -675,6 +675,45 @@ LINUX_FIRMWARE_FILES += brcm/brcmfmac4366c-pcie.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif +# cyfmac43xx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac4339-sdio.bin \ + cypress/cyfmac4354-sdio.bin \ + cypress/cyfmac4354-sdio.clm_blob \ + cypress/cyfmac4356-pcie.bin \ + cypress/cyfmac4356-pcie.clm_blob \ + cypress/cyfmac4356-sdio.bin \ + cypress/cyfmac4356-sdio.clm_blob \ + cypress/cyfmac4373-sdio.bin \ + cypress/cyfmac4373-sdio.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + +# cyfmac43xxx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac43012-sdio.bin \ + cypress/cyfmac43012-sdio.clm_blob \ + cypress/cyfmac43340-sdio.bin \ + cypress/cyfmac43362-sdio.bin \ + cypress/cyfmac43430-sdio.bin \ + cypress/cyfmac43430-sdio.clm_blob \ + cypress/cyfmac43455-sdio.bin \ + cypress/cyfmac43455-sdio.clm_blob \ + cypress/cyfmac43570-pcie.bin \ + cypress/cyfmac43570-pcie.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + +# cyfmac54xxx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac54591-pcie.bin \ + cypress/cyfmac54591-pcie.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + # ql2xxx ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX),y) LINUX_FIRMWARE_FILES += \ From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/python-distro: new package Message-ID: <20220110071316.AEA1682DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d01f3401320077c6d572135e47ffc4ae218a6ef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-distro provides information about the OS distribution it runs on, such as a reliable machine-readable ID, or version information. It is the recommended replacement for Python's original platform.linux_distribution function (removed in Python 3.8). It also provides much more functionality which isn't necessarily Python bound, like a command-line interface. https://github.com/nir0s/distro Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-distro/Config.in | 13 +++++++++++++ package/python-distro/python-distro.hash | 3 +++ package/python-distro/python-distro.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 55f37dfe62..cd0b54b041 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1594,6 +1594,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ +F: package/python-distro/ F: package/python-pyalsa/ N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index a1924f96df..3a2ad30df9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1001,6 +1001,7 @@ menu "External python modules" source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" + source "package/python-distro/Config.in" source "package/python-django/Config.in" source "package/python-django-enumfields/Config.in" source "package/python-dnspython/Config.in" diff --git a/package/python-distro/Config.in b/package/python-distro/Config.in new file mode 100644 index 0000000000..bb4151541e --- /dev/null +++ b/package/python-distro/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_DISTRO + bool "python distro" + help + distro provides information about the OS distribution it + runs on, such as a reliable machine-readable ID, or version + information. + + It is the recommended replacement for Python's original + platform.linux_distribution function (removed in Python + 3.8). It also provides much more functionality which isn't + necessarily Python bound, like a command-line interface. + + https://github.com/nir0s/distro diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash new file mode 100644 index 0000000000..e2b3c0a444 --- /dev/null +++ b/package/python-distro/python-distro.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk new file mode 100644 index 0000000000..753e74d020 --- /dev/null +++ b/package/python-distro/python-distro.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-distro +# +################################################################################ + +PYTHON_DISTRO_VERSION = 1.6.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz +PYTHON_DISTRO_LICENSE = Apache-2.0 +PYTHON_DISTRO_LICENSE_FILES = LICENSE +PYTHON_DISTRO_SETUP_TYPE = setuptools + +$(eval $(python-package)) From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/python-packaging: bump to version 21.3 Message-ID: <20220110071316.D4A0782DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f56ecaad4b5a771ea97275c33e3bcb2497d289bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-packaging/python-packaging.hash | 4 ++-- package/python-packaging/python-packaging.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 0c23a5f71c..0f353a9e36 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 240ba5823ed31051a1254e74c9d18d55 packaging-21.0.tar.gz -sha256 7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 packaging-21.0.tar.gz +md5 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz +sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index e2fb9b120b..569dc0bf58 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 21.0 +PYTHON_PACKAGING_VERSION = 21.3 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3afd461faecf9955a6501c4999933a48394e90f03cd512aad844 +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c PYTHON_PACKAGING_SETUP_TYPE = setuptools PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/squid: needs threads Message-ID: <20220110071316.CAF4A82DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90be89396bcbdd529f4cff64e44aa9fa3b0983e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master squid needs threads and https://github.com/squid-cache/squid/commit/7dba4ac446341548a0b101489785f2cef9a33caa to avoid the following build failure raised since bump to version 5.3 in commit efc07b7a1818787229ddb335ca26ff2cf03820ae: ntlm_fake_auth.cc: In function 'int main(int, char**)': ntlm_fake_auth.cc:187:18: error: 'std::this_thread' has not been declared 187 | std::this_thread::sleep_for(std::chrono::milliseconds(response_delay)); | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/2aabc8375d41ad4d047d20ff8ee4fe1c978e7ee1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/squid/Config.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 0df2aedef6..6272140768 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,13 +1,16 @@ -comment "squid needs a toolchain w/ C++, gcc >= 4.8 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 # needs fork() From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/python-pyparsing: bump to version 3.0.6 Message-ID: <20220110071316.DD32982ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7affc7827aee0e07ec94d3b4d91c2e23bda8d937 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pyparsing/python-pyparsing.hash | 4 ++-- package/python-pyparsing/python-pyparsing.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index 2c52ff0843..a21baf46e5 100644 --- a/package/python-pyparsing/python-pyparsing.hash +++ b/package/python-pyparsing/python-pyparsing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyparsing/json -md5 f0953e47a0112f7a65aec2305ffdf7b4 pyparsing-2.4.7.tar.gz -sha256 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz +md5 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz +sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz # Locally computed sha256 checksums sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 5741458d65..b6ab353a6d 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 2.4.7 +PYTHON_PYPARSING_VERSION = 3.0.6 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210 +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools From arnout at mind.be Mon Jan 10 07:20:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:20:25 +0100 Subject: [Buildroot] [PATCH 1/2] package/hiawatha: mbedtls is mandatory, not optional In-Reply-To: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> References: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> Message-ID: <1151a8f7-e692-6fc7-9bae-44b39ae0ad21@mind.be> On 09/01/2022 23:16, Fabrice Fontaine wrote: > hiawatha is unconditionally using mbedtls since bump to version 11.1 in > commit 24e4c888c3d36e3943206ea55894b84344cc8b2e (e.g. wigwam.c includes > "mbedtls/md5.h") > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/hiawatha/hiawatha.mk | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk > index 017592de1e..ed9f8aba54 100644 > --- a/package/hiawatha/hiawatha.mk > +++ b/package/hiawatha/hiawatha.mk > @@ -11,7 +11,10 @@ HIAWATHA_LICENSE = GPL-2.0 > HIAWATHA_LICENSE_FILES = LICENSE > HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver > > +# Disable system mbedtls as hiawatha needs mbedtls 3.x > HIAWATHA_CONF_OPTS = \ > + -DINSTALL_MBEDTLS_HEADERS=OFF \ > + -DUSE_SYSTEM_MBEDTLS=OFF \ > -DENABLE_TOOLKIT=OFF \ > -DCONFIG_DIR=/etc/hiawatha \ > -DLOG_DIR=/var/log \ > @@ -20,11 +23,7 @@ HIAWATHA_CONF_OPTS = \ > -DWORK_DIR=/var/lib/hiawatha > > ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) > -# Disable system mbedtls as hiawatha needs mbedtls 3.x > -HIAWATHA_CONF_OPTS += \ > - -DENABLE_TLS=ON \ > - -DINSTALL_MBEDTLS_HEADERS=OFF \ > - -DUSE_SYSTEM_MBEDTLS=OFF > +HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON > else > HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF > endif > From arnout at mind.be Mon Jan 10 07:20:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:20:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/squid: needs threads In-Reply-To: <20220109223135.1409181-1-fontaine.fabrice@gmail.com> References: <20220109223135.1409181-1-fontaine.fabrice@gmail.com> Message-ID: <47d73898-1b4a-322d-a2e5-432d00eb1f91@mind.be> On 09/01/2022 23:31, Fabrice Fontaine wrote: > squid needs threads and > https://github.com/squid-cache/squid/commit/7dba4ac446341548a0b101489785f2cef9a33caa > to avoid the following build failure raised since > bump to version 5.3 in commit efc07b7a1818787229ddb335ca26ff2cf03820ae: > > ntlm_fake_auth.cc: In function 'int main(int, char**)': > ntlm_fake_auth.cc:187:18: error: 'std::this_thread' has not been declared > 187 | std::this_thread::sleep_for(std::chrono::milliseconds(response_delay)); > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/2aabc8375d41ad4d047d20ff8ee4fe1c978e7ee1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/squid/Config.in | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/package/squid/Config.in b/package/squid/Config.in > index 0df2aedef6..6272140768 100644 > --- a/package/squid/Config.in > +++ b/package/squid/Config.in > @@ -1,13 +1,16 @@ > -comment "squid needs a toolchain w/ C++, gcc >= 4.8 not affected by bug 64735" > +comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" > depends on BR2_USE_MMU > depends on BR2_TOOLCHAIN_HAS_ATOMIC > depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ > - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > > config BR2_PACKAGE_SQUID > bool "squid" > depends on BR2_TOOLCHAIN_HAS_ATOMIC > depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 > # needs fork() > From arnout at mind.be Mon Jan 10 07:21:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:21:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-packaging: bump to version 21.3 In-Reply-To: <20220110062015.1299719-1-james.hilliard1@gmail.com> References: <20220110062015.1299719-1-james.hilliard1@gmail.com> Message-ID: On 10/01/2022 07:20, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-packaging/python-packaging.hash | 4 ++-- > package/python-packaging/python-packaging.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash > index 0c23a5f71c..0f353a9e36 100644 > --- a/package/python-packaging/python-packaging.hash > +++ b/package/python-packaging/python-packaging.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/packaging/json > -md5 240ba5823ed31051a1254e74c9d18d55 packaging-21.0.tar.gz > -sha256 7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 packaging-21.0.tar.gz > +md5 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz > +sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz > # Locally computed sha256 checksums > sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE > sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE > diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk > index e2fb9b120b..569dc0bf58 100644 > --- a/package/python-packaging/python-packaging.mk > +++ b/package/python-packaging/python-packaging.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PACKAGING_VERSION = 21.0 > +PYTHON_PACKAGING_VERSION = 21.3 > PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz > -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3afd461faecf9955a6501c4999933a48394e90f03cd512aad844 > +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c > PYTHON_PACKAGING_SETUP_TYPE = setuptools > PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause > PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD > From arnout at mind.be Mon Jan 10 07:21:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:21:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: bump to version 3.0.6 In-Reply-To: <20220110062327.1302104-1-james.hilliard1@gmail.com> References: <20220110062327.1302104-1-james.hilliard1@gmail.com> Message-ID: <83376eb4-465e-c603-b989-26b0684520b2@mind.be> On 10/01/2022 07:23, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyparsing/python-pyparsing.hash | 4 ++-- > package/python-pyparsing/python-pyparsing.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash > index 2c52ff0843..a21baf46e5 100644 > --- a/package/python-pyparsing/python-pyparsing.hash > +++ b/package/python-pyparsing/python-pyparsing.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyparsing/json > -md5 f0953e47a0112f7a65aec2305ffdf7b4 pyparsing-2.4.7.tar.gz > -sha256 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz > +md5 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz > +sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz > # Locally computed sha256 checksums > sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE > diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk > index 5741458d65..b6ab353a6d 100644 > --- a/package/python-pyparsing/python-pyparsing.mk > +++ b/package/python-pyparsing/python-pyparsing.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYPARSING_VERSION = 2.4.7 > +PYTHON_PYPARSING_VERSION = 3.0.6 > PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz > -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210 > +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb > PYTHON_PYPARSING_LICENSE = MIT > PYTHON_PYPARSING_LICENSE_FILES = LICENSE > PYTHON_PYPARSING_SETUP_TYPE = setuptools > From arnout at mind.be Mon Jan 10 07:26:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:26:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: <7229983a-cbde-eb3f-83cb-984544f3b355@mind.be> On 09/01/2022 23:52, Norbert Lange wrote: > Not only missing, but I sometimes need a *different* config. For example i don't > want to link against lz4, since I use zstd instead. Which is a great example of why the option doesn't work: it would affect dependencies as well. However, specifically for this one, we have in the .mk file: ifeq ($(BR2_PACKAGE_ZSTD),y) SYSTEMD_DEPENDENCIES += zstd SYSTEMD_CONF_OPTS += -Dzstd=true else SYSTEMD_CONF_OPTS += -Dzstd=false endif ifeq ($(BR2_PACKAGE_LZ4),y) SYSTEMD_DEPENDENCIES += lz4 SYSTEMD_CONF_OPTS += -Dlz4=true else SYSTEMD_CONF_OPTS += -Dlz4=false endif So it should already do what you need, no? Regards, Arnout From arnout at mind.be Mon Jan 10 07:29:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:29:43 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/glibc: force -fno-lto In-Reply-To: References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-4-nolange79@gmail.com> <20220109223145.GK1477939@scaer> Message-ID: On 10/01/2022 00:09, Norbert Lange wrote: > > > Yann E. MORIN > schrieb > am So., 9. Jan. 2022, 23:31: > > Norbert, All, > > On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > > glibc requires compilation barriers between files, and will > > fail with LTO enabled. > > So force LTO off by appending -fno-lto to the flags, but only > > if the GCC version is recent enough that an LTO build would > > be possible. > > > > Signed-off-by: Norbert Lange > > > Applied to master, thanks. > > Are the other C libraries (uClibc, musl) also affected by such an issue? > > > Likely, and unless they are tested with LTO I would not trust them to not have > weird runtime issues. > > Ideally there would be a whitelist for packages doing fine with LTO, for now I > can only vouch for the couple I am using LTOed since years. Up to now, the idea was that packages that support LTO would check for it themselves in their configure step and enable it if available. It would be a good idea though to add a global option to enable LTO, similar to SSP etc. The first step for that would be to add a hidden symbol that indicates if the toolchain has LTO, and that gets selected by the toolchains that have LTO. Then we have to look at each external toolchain to verify if LTO is available, and add a checker function to validate that it is correct. Finally, we can randomly turn on the LTO option in the genrandconfig script, and fix the fallout on abo. Regards, Arnout > > Since a few distros now use LTO by default, hopefully things will get better. > > Norbert > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Mon Jan 10 07:33:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:33:12 +0100 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory In-Reply-To: References: Message-ID: <420ac869-6aea-a492-7a74-3014b7bb4cf3@mind.be> On 10/01/2022 00:46, William Tambe wrote: > On Sun, Jan 9, 2022 at 2:08 PM Arnout Vandecappelle wrote: >> >> >> >> On 09/01/2022 19:18, William Tambe wrote: >>> I am attempting to build: >>> >>> +BR2_PACKAGE_DHCP=y >>> +BR2_PACKAGE_DHCP_CLIENT=y >>> >>> However it fails as follow complaining about not finding readline/history.h: >>> >>> making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate >>> /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc >> >> pu32 doesn't exist in Buildroot, so this may very well be due to external changes. So, do you have external changes that may be the cause of this? IOW, can you reproduce the problem on upstream Buildroot? >> >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 >>> -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include >>> -I../../lib/lwres/unix/include -I../../lib/lwres/include >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include >>> -I../../lib/dns/include >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include >>> -I../../lib/bind9/include >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include >>> -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include >>> -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include >>> -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" >>> -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE >>> -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall >>> -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat >>> -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks >>> \ >>> -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ >>> -c ./nsupdate.c >>> ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory >>> 104 | #include >>> | ^~~~~~~~~~~~~~~~~~~~ >> >> This sounds like you changed your configuration without doing 'make clean'. Is >> that possible? > > I am building from clean or from scratch. > >> >> Is BR2_PACKAGE_READLINE enabled in your configuration? Has it been built? > > Yes, BR2_PACKAGE_READLINE is enabled in my configuration. And does it get built? Does output/build/readline/.stamp_staging_installed exist? The bind.mk file has this: ifeq ($(BR2_PACKAGE_READLINE),y) BIND_DEPENDENCIES += readline else BIND_CONF_OPTS += --with-readline=no endif which should make sure that readline is built and installed before bind. This in turn should make sure that output/host/*/sysroot/usr/include/readline/history.h exists. Regards, Arnout > >> >> Regards, >> Arnout >> >>> compilation terminated. >>> make[5]: *** [Makefile:473: nsupdate.o] Error 1 >>> make[4]: *** [Makefile:79: subdirs] Error 1 >>> make[3]: *** [Makefile:88: subdirs] Error 1 >>> make[2]: *** [package/pkg-generic.mk:270: >>> /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] >>> Error 2 >>> make[1]: *** [Makefile:23: _all] Error 2 >>> make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' >>> make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> From james.hilliard1 at gmail.com Mon Jan 10 07:38:50 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 00:38:50 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-tinycss2: bump to version 1.1.1 In-Reply-To: <20220110073850.1603711-1-james.hilliard1@gmail.com> References: <20220110073850.1603711-1-james.hilliard1@gmail.com> Message-ID: <20220110073850.1603711-2-james.hilliard1@gmail.com> This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard --- package/python-tinycss2/Config.in | 2 ++ package/python-tinycss2/python-tinycss2.hash | 4 ++-- package/python-tinycss2/python-tinycss2.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index e6c992b8c5..e7a5bb3659 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -4,3 +4,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. + + https://www.courtbouillon.org/tinycss2 diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash index eeb3754752..e8e1d93f83 100644 --- a/package/python-tinycss2/python-tinycss2.hash +++ b/package/python-tinycss2/python-tinycss2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinycss2/json -md5 7caf513c4e87fc2449dcfbf407a8416f tinycss2-1.1.0.tar.gz -sha256 fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a tinycss2-1.1.0.tar.gz +md5 60272f58f8d5834b2e09ffbc9bd5de53 tinycss2-1.1.1.tar.gz +sha256 b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf tinycss2-1.1.1.tar.gz # Locally computed sha256 checksums sha256 6b94acee20ec9f2709333134f3ba70322535fb420af0ce8c1455d9cbe297f1d5 LICENSE diff --git a/package/python-tinycss2/python-tinycss2.mk b/package/python-tinycss2/python-tinycss2.mk index 4bf5b97766..e4fc5dc9c5 100644 --- a/package/python-tinycss2/python-tinycss2.mk +++ b/package/python-tinycss2/python-tinycss2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_TINYCSS2_VERSION = 1.1.0 +PYTHON_TINYCSS2_VERSION = 1.1.1 PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz -PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8 -PYTHON_TINYCSS2_SETUP_TYPE = distutils +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/1e/5a/576828164b5486f319c4323915b915a8af3fa4a654bbb6f8fc8e87b5cb17 +PYTHON_TINYCSS2_SETUP_TYPE = flit PYTHON_TINYCSS2_LICENSE = BSD-3-Clause PYTHON_TINYCSS2_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 10 07:38:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 00:38:49 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-flit-core: new package/infrastructure Message-ID: <20220110073850.1603711-1-james.hilliard1@gmail.com> This adds pep517(needed for flit-core to build itself) and flit python package types. We need to add an installer script and pass it appropriate options for installing pep517 wheels generated by python-pypa-build during the build stage. Unfortunately it seems pep517 does not support builds without using the wheel format. We also need to add a patch fixing the version parser in flit-core. Signed-off-by: James Hilliard --- package/pkg-python.mk | 99 +++++++++++++++++++ ...sion-parser-for-multiple-assignments.patch | 80 +++++++++++++++ .../python-flit-core/python-flit-core.hash | 3 + package/python-flit-core/python-flit-core.mk | 15 +++ support/scripts/pyinstaller.py | 69 +++++++++++++ 5 files changed, 266 insertions(+) create mode 100644 package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch create mode 100644 package/python-flit-core/python-flit-core.hash create mode 100644 package/python-flit-core/python-flit-core.mk create mode 100755 support/scripts/pyinstaller.py diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 22ea77352c..6bd3f43286 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -92,6 +92,47 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ + _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ + PATH=$(BR_PATH) \ + $(TARGET_CONFIGURE_OPTS) \ + PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONNOUSERSITE=1 \ + _python_sysroot=$(STAGING_DIR) \ + _python_prefix=/usr \ + _python_exec_prefix=/usr + +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) + +HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/usr/bin \ + --data=$(HOST_DIR)/usr + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -141,6 +182,19 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_TGT = build $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +ifeq ($(4),target) +$(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_TGT = -w +$(2)_BASE_BUILD_OPTS = +$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) +else +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_TGT = -w +$(2)_BASE_BUILD_OPTS = +$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") endif @@ -203,6 +257,12 @@ $(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3 else $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) endif +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-pypa-build,$(1)),,host-python-pypa-build) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-installer,$(1)),,host-python-installer) +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) +endif endif # SETUP_TYPE # Python interpreter to use for building the package. @@ -234,6 +294,15 @@ endif # file. # ifndef $(2)_BUILD_CMDS +ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +define $(2)_BUILD_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) -m build -n \ + $$($$(PKG)_BASE_BUILD_TGT) \ + $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) +endef +else define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ @@ -242,12 +311,21 @@ define $(2)_BUILD_CMDS $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef endif +endif # # Host installation step. Only define it if not already defined by the # package .mk file. # ifndef $(2)_INSTALL_CMDS +ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +define $(2)_INSTALL_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) $(TOPDIR)/support/scripts/pyinstaller.py dist/* \ + $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) +endef +else define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ @@ -255,12 +333,22 @@ define $(2)_INSTALL_CMDS $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) endef endif +endif # # Target installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_TARGET_CMDS +ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +define $(2)_INSTALL_TARGET_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) $(TOPDIR)/support/scripts/pyinstaller.py dist/* \ + $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ + $$($$(PKG)_INSTALL_TARGET_OPTS)) +endef +else define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ @@ -269,12 +357,22 @@ define $(2)_INSTALL_TARGET_CMDS $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif +endif # # Staging installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_STAGING_CMDS +ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +define $(2)_INSTALL_STAGING_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) $(TOPDIR)/support/scripts/pyinstaller.py dist/* \ + $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($$(PKG)_INSTALL_STAGING_OPTS)) +endef +else define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ @@ -283,6 +381,7 @@ define $(2)_INSTALL_STAGING_CMDS $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif +endif # Call the generic package infrastructure to generate the necessary # make targets diff --git a/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch new file mode 100644 index 0000000000..5a94e1dcab --- /dev/null +++ b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch @@ -0,0 +1,80 @@ +From 2cd8b5708be88b90ea2fa0fb35407a5ec2038c8e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 27 Nov 2021 02:36:15 -0700 +Subject: [PATCH] Fix ast version parser for multiple assignments + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/takluyver/flit/pull/474] +--- + flit_core/common.py | 21 +++++++++++-------- + .../tests/samples/moduleunimportabledouble.py | 8 +++++++ + flit_core/tests/test_common.py | 5 +++++ + 3 files changed, 25 insertions(+), 9 deletions(-) + create mode 100644 flit_core/tests/samples/moduleunimportabledouble.py + +diff --git a/flit_core/common.py b/flit_core/common.py +index f1f378f..86bcf4b 100644 +--- a/flit_core/common.py ++++ b/flit_core/common.py +@@ -132,15 +132,18 @@ def get_docstring_and_version_via_ast(target): + for child in node.body: + # Only use the version from the given module if it's a simple + # string assignment to __version__ +- is_version_str = ( +- isinstance(child, ast.Assign) +- and len(child.targets) == 1 +- and isinstance(child.targets[0], ast.Name) +- and child.targets[0].id == "__version__" +- and isinstance(child.value, ast.Str) +- ) +- if is_version_str: +- version = child.value.s ++ if isinstance(child, ast.Assign): ++ for target in child.targets: ++ is_version_str = ( ++ isinstance(target, ast.Name) ++ and target.id == "__version__" ++ and isinstance(child.value, ast.Str) ++ ) ++ if is_version_str: ++ version = child.value.s ++ break ++ else: ++ continue + break + else: + version = None +diff --git a/flit_core/tests/samples/moduleunimportabledouble.py b/flit_core/tests/samples/moduleunimportabledouble.py +new file mode 100644 +index 0000000..42d51f3 +--- /dev/null ++++ b/flit_core/tests/samples/moduleunimportabledouble.py +@@ -0,0 +1,8 @@ ++ ++""" ++A sample unimportable module with double assignment ++""" ++ ++raise ImportError() ++ ++VERSION = __version__ = "0.1" +diff --git a/flit_core/tests/test_common.py b/flit_core/tests/test_common.py +index 02cfab7..42e230b 100644 +--- a/flit_core/tests/test_common.py ++++ b/flit_core/tests/test_common.py +@@ -70,6 +70,11 @@ class ModuleTests(TestCase): + 'version': '0.1'} + ) + ++ info = get_info_from_module(Module('moduleunimportabledouble', samples_dir)) ++ self.assertEqual(info, {'summary': 'A sample unimportable module with double assignment', ++ 'version': '0.1'} ++ ) ++ + info = get_info_from_module(Module('module1', samples_dir / 'constructed_version')) + self.assertEqual(info, {'summary': 'This module has a __version__ that requires runtime interpretation', + 'version': '1.2.3'} +-- +2.33.1 + diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash new file mode 100644 index 0000000000..bd47fd4f6b --- /dev/null +++ b/package/python-flit-core/python-flit-core.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/flit_core/json +md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz +sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk new file mode 100644 index 0000000000..539a6c99fe --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-flit-core +# +################################################################################ + +PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_SETUP_TYPE = pep517 +PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +HOST_PYTHON_FLIT_CORE_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_FLIT_CORE_DEPENDENCIES = host-python-pypa-build + +$(eval $(host-python-package)) diff --git a/support/scripts/pyinstaller.py b/support/scripts/pyinstaller.py new file mode 100755 index 0000000000..6dd9242327 --- /dev/null +++ b/support/scripts/pyinstaller.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 + +import argparse +import glob + +from installer import install +from installer.destinations import SchemeDictionaryDestination +from installer.sources import WheelFile + + +def main(): + """Entry point for CLI.""" + ap = argparse.ArgumentParser("python pyinstaller.py") + ap.add_argument("wheel_file", help="Path to a .whl file to install") + + ap.add_argument( + "--interpreter", required=True, help="Interpreter path to be used in scripts" + ) + ap.add_argument( + "--script-kind", + required=True, + choices=["posix", "win-ia32", "win-amd64", "win-arm", "win-arm64"], + help="Kind of launcher to create for each script", + ) + + dest_args = ap.add_argument_group("Destination directories") + dest_args.add_argument( + "--purelib", + required=True, + help="Directory for platform-independent Python modules", + ) + dest_args.add_argument( + "--platlib", + help="Directory for platform-dependent Python modules (same as purelib " + "if not specified)", + ) + dest_args.add_argument( + "--headers", required=True, help="Directory for C header files" + ) + dest_args.add_argument( + "--scripts", required=True, help="Directory for executable scripts" + ) + dest_args.add_argument( + "--data", required=True, help="Directory for external data files" + ) + args = ap.parse_args() + + destination = SchemeDictionaryDestination( + { + "purelib": args.purelib, + "platlib": args.platlib if args.platlib is not None else args.purelib, + "headers": args.headers, + "scripts": args.scripts, + "data": args.data, + }, + interpreter=args.interpreter, + script_kind=args.script_kind, + ) + + with WheelFile.open(glob.glob(args.wheel_file)[0]) as source: + install( + source=source, + destination=destination, + additional_metadata={}, + ) + + +if __name__ == "__main__": + main() -- 2.25.1 From fontaine.fabrice at gmail.com Mon Jan 10 07:45:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 08:45:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/gensio: add avahi optional dependency In-Reply-To: References: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> Message-ID: Le lun. 10 janv. 2022 ? 08:13, Arnout Vandecappelle a ?crit : > > > > On 04/01/2022 21:41, Fabrice Fontaine wrote: > > avahi-client is an optional dependency which is enabled by default since > > version 2.2.0 and > > https://github.com/cminyard/gensio/commit/5ab117c9743fd4719f610cf9f1ba45023cc25d7c > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/gensio/gensio.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk > > index 389de1e263..b4936d5f21 100644 > > --- a/package/gensio/gensio.mk > > +++ b/package/gensio/gensio.mk > > @@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net > > GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) > > GENSIO_LICENSE_FILES = COPYING.LIB COPYING > > GENSIO_INSTALL_STAGING = YES > > +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) > > In the commit message you talk about avahi-client, but here it's avahi-daemon. > That looks a bit weird... Can you explain? avahi-client needs avahi-daemon and dbus but perhaps we should add a BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT hidden option. > > Regards, > Arnout > > > GENSIO_CONF_OPTS = \ > > --without-openipmi \ > > --without-swig \ > > Best Regards, Fabrice From arnout at mind.be Mon Jan 10 07:52:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:52:58 +0100 Subject: [Buildroot] [git commit] utils/test-pkg: add check that show-info is proper json Message-ID: <20220110074744.C56A782DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f29239cf9bc21d9632031077354b6ba5c868cc1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master JSON parser are usually rather strict when parsing their input. Both jq and the python json module choke on non-conformant inputs. Commit e4c284e6b9 (package/pkg-utils: escape \ in generated legal-info) fixed the \-escaping case, but we want to ensure that we do not have other data that would be improperly encoded. To more easily catch issues, also run show-info and send its output through jq, to try and validate the output. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/test-pkg | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/utils/test-pkg b/utils/test-pkg index 526b95b1fb..ce6e43b965 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -13,7 +13,7 @@ do_clean() { main() { local o O opts local cfg dir pkg random toolchains_csv toolchain all number mode prepare_only - local ret nb nb_skip nb_fail nb_legal nb_tc build_dir keep + local ret nb nb_skip nb_fail nb_legal nb_show nb_tc build_dir keep local -a toolchains local pkg_br_name @@ -126,6 +126,7 @@ main() { nb_skip=0 nb_fail=0 nb_legal=0 + nb_show=0 for toolchainconfig in "${toolchains[@]}"; do : $((nb++)) toolchain="$(basename "${toolchainconfig}" .config)" @@ -137,11 +138,12 @@ main() { (1) : $((nb_skip++)); printf "SKIPPED\n";; (2) : $((nb_fail++)); printf "FAILED\n";; (3) : $((nb_legal++)); printf "FAILED\n";; + (4) : $((nb_show++)); printf "FAILED\n";; esac done - printf "%d builds, %d skipped, %d build failed, %d legal-info failed\n" \ - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} + printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ + ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} return $((nb_fail + nb_legal)) } @@ -197,6 +199,20 @@ build_one() { return 3 fi + # Validate that we generate proper json as show-info + { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; + JQ="$(which jq)" + if [ -z "${JQ}" ]; then + make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 + JQ="${dir}/host/bin/jq" + fi + if ! make O="${dir}" "${pkg:+${pkg}-}show-info" > "${dir}/info.json" 2>> "${dir}/logfile"; then + return 4 + fi + if ! "${JQ}" . < "${dir}/info.json" >> "${dir}/logfile" 2>&1; then + return 4 + fi + # If we get here, the build was successful. Clean up the build/host # directories to save disk space, unless 'keep' was set. if [ ${keep} -ne 1 ]; then From arnout at mind.be Mon Jan 10 07:54:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:54:29 +0100 Subject: [Buildroot] [PATCH] utils/test-pkg: add check that show-info is proper json In-Reply-To: <20210207212101.1527766-1-yann.morin.1998@free.fr> References: <20210207212101.1527766-1-yann.morin.1998@free.fr> Message-ID: <3edd836c-3bb1-4ed7-c312-459d3eda75cb@mind.be> On 07/02/2021 22:21, Yann E. MORIN wrote: > JSON parser are usually rather strict when parsing their input. Both > jq and the python json module choke on non-conformant inputs. > > Commit e4c284e6b9 (package/pkg-utils: escape \ in generated legal-info) > fixed the \-escaping case, but we want to ensure that we do not have > other data that would be improperly encoded. > > To more easily catch issues, also run show-info and send its output > through jq, to try and validate the output. > > Reported-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN Applied to master, thanks. The same thing should be added to the autobuilder tests as well. Regards, Arnout > --- > utils/test-pkg | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index a317d8c17a..5e00b589b8 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -13,7 +13,7 @@ do_clean() { > main() { > local o O opts > local cfg dir pkg random toolchains_csv toolchain all number mode > - local ret nb nb_skip nb_fail nb_legal nb_tc build_dir keep > + local ret nb nb_skip nb_fail nb_legal nb_show nb_tc build_dir keep > local -a toolchains > local pkg_br_name > > @@ -122,6 +122,7 @@ main() { > nb_skip=0 > nb_fail=0 > nb_legal=0 > + nb_show=0 > for toolchainconfig in "${toolchains[@]}"; do > : $((nb++)) > toolchain="$(basename "${toolchainconfig}" .config)" > @@ -133,11 +134,12 @@ main() { > (1) : $((nb_skip++)); printf "SKIPPED\n";; > (2) : $((nb_fail++)); printf "FAILED\n";; > (3) : $((nb_legal++)); printf "FAILED\n";; > + (4) : $((nb_show++)); printf "FAILED\n";; > esac > done > > - printf "%d builds, %d skipped, %d build failed, %d legal-info failed\n" \ > - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} > + printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ > + ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} > > return $((nb_fail + nb_legal)) > } > @@ -183,6 +185,20 @@ build_one() { > return 3 > fi > > + # Validate that we generate proper json as show-info > + { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; > + JQ="$(which jq)" > + if [ -z "${JQ}" ]; then > + make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 > + JQ="${dir}/host/bin/jq" > + fi > + if ! make O="${dir}" "${pkg:+${pkg}-}show-info" > "${dir}/info.json" 2>> "${dir}/logfile"; then > + return 4 > + fi > + if ! "${JQ}" . < "${dir}/info.json" >> "${dir}/logfile" 2>&1; then > + return 4 > + fi > + > # If we get here, the build was successful. Clean up the build/host > # directories to save disk space, unless 'keep' was set. > if [ ${keep} -ne 1 ]; then > From fontaine.fabrice at gmail.com Mon Jan 10 07:58:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 08:58:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/git: add xdg SELinux module Message-ID: <20220110075804.1499122-1-fontaine.fabrice@gmail.com> xdg SELinux module is needed to avoid the following build failure raised since bump of refpolicy to version 2.20220106 in commit f6691d122ce25fc580ca88243f79f75cc2808ca7 and https://github.com/SELinuxProject/refpolicy/commit/64e637d895c516d7a6b6cbcd46b187136279fddd: policy/modules/services/git.te:121:ERROR 'attribute xdg_config_type is not declared' at token ';' on line 115358: typeattribute git_xdg_config_t xdg_config_type; #line 121 checkpolicy: error(s) encountered while parsing configuration Rules.monolithic:78: recipe for target 'policy.30' failed Fixes: - http://autobuild.buildroot.org/results/98d5b3db313000855721c0ad994951fe8cc781c0 Signed-off-by: Fabrice Fontaine --- package/git/git.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/git/git.mk b/package/git/git.mk index 556921a9fc..90b1acd6a4 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -10,7 +10,7 @@ GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_CPE_ID_VENDOR = git-scm -GIT_SELINUX_MODULES = apache git +GIT_SELINUX_MODULES = apache git xdg GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) # We're patching configure.ac GIT_AUTORECONF = YES -- 2.34.1 From marcus.folkesson at gmail.com Mon Jan 10 08:03:01 2022 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 10 Jan 2022 09:03:01 +0100 Subject: [Buildroot] [PATCH] package/libostree: bump to version 2022.1 Message-ID: <20220110080301.2805134-1-marcus.folkesson@gmail.com> Signed-off-by: Marcus Folkesson --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index e81deb82a6..3a06340575 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e80631cb1363d4734fe9d0c91f69a68be3848166d6e0481db19ce44a9cb4f531 libostree-2021.6.tar.xz +sha256 43a00e7856842b8a34f6616fc2ce1ce238ef43210cca41f70e6b4b0d2a9fcad5 libostree-2022.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index a6b09f95e5..22cb83d039 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2021.6 +LIBOSTREE_VERSION = 2022.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) -- 2.33.0 From arnout at mind.be Mon Jan 10 08:11:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 09:11:56 +0100 Subject: [Buildroot] [git commit] package/libostree: bump to version 2022.1 Message-ID: <20220110080616.442B783241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26e886ac9088c284553afbd08128b332e5f5096c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Folkesson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index e81deb82a6..3a06340575 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e80631cb1363d4734fe9d0c91f69a68be3848166d6e0481db19ce44a9cb4f531 libostree-2021.6.tar.xz +sha256 43a00e7856842b8a34f6616fc2ce1ce238ef43210cca41f70e6b4b0d2a9fcad5 libostree-2022.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index a6b09f95e5..22cb83d039 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2021.6 +LIBOSTREE_VERSION = 2022.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From arnout at mind.be Mon Jan 10 08:13:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 09:13:20 +0100 Subject: [Buildroot] [PATCH] package/libostree: bump to version 2022.1 In-Reply-To: <20220110080301.2805134-1-marcus.folkesson@gmail.com> References: <20220110080301.2805134-1-marcus.folkesson@gmail.com> Message-ID: On 10/01/2022 09:03, Marcus Folkesson wrote: > Signed-off-by: Marcus Folkesson Applied to master, thanks. Regards, Arnout > --- > package/libostree/libostree.hash | 2 +- > package/libostree/libostree.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash > index e81deb82a6..3a06340575 100644 > --- a/package/libostree/libostree.hash > +++ b/package/libostree/libostree.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 e80631cb1363d4734fe9d0c91f69a68be3848166d6e0481db19ce44a9cb4f531 libostree-2021.6.tar.xz > +sha256 43a00e7856842b8a34f6616fc2ce1ce238ef43210cca41f70e6b4b0d2a9fcad5 libostree-2022.1.tar.xz > sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING > diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk > index a6b09f95e5..22cb83d039 100644 > --- a/package/libostree/libostree.mk > +++ b/package/libostree/libostree.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBOSTREE_VERSION = 2021.6 > +LIBOSTREE_VERSION = 2022.1 > LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz > LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) > > From yann.morin.1998 at free.fr Mon Jan 10 08:14:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 09:14:17 +0100 Subject: [Buildroot] [PATCH for-next] package/gtest: remove partial host package In-Reply-To: <20210802123300.564709-1-arnout@mind.be> References: <20210802123300.564709-1-arnout@mind.be> Message-ID: <20220110081417.GN1477939@scaer> Arnout, All, On 2021-08-02 14:33 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly: > gmock (which is part of the gtest package) has a host variant that is > not actually the full host package, but instead just installs a single > python script. > > This script, however, is no longer maintained and is not needed for most > practical uses of gmock. Even if it is used, its output is meant to be > hand-edited, so it shouldn't be used as part of the build flow. > > Therefore, remove the host-gtest package. A proper, full host package > may make sense (for building other host packages that use gtest), but > this single script really doesn't. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > Cc: Norbert Lange > Reviewed-by: Norbert Lange In fact, we applied a different patch that makes host-gtests a proper host package; https://git.buildroot.org/buildroot/commit/?id=c0f9e2447d57194f0b02edb93cd16a677ebb326c I marked your patch as rejected, then. Thanks! ;-) Regards, Yann E. MORIN. > --- > Since we're so close to the 2021.08 release, this should probably be > delayed a little. > --- > package/gtest/gtest.mk | 27 --------------------------- > 1 file changed, 27 deletions(-) > > diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk > index 6447954e36..a9ac49957b 100644 > --- a/package/gtest/gtest.mk > +++ b/package/gtest/gtest.mk > @@ -13,23 +13,6 @@ GTEST_LICENSE_FILES = LICENSE > GTEST_CPE_ID_VENDOR = google > GTEST_CPE_ID_PRODUCT = google_test > > -ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) > -GTEST_DEPENDENCIES += host-gtest > -endif > - > -HOST_GTEST_LICENSE = Apache-2.0 > -HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE > -ifeq ($(BR2_PACKAGE_PYTHON3),y) > -HOST_GTEST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) > -HOST_GTEST_DEPENDENCIES += host-python3 > -else > -HOST_GTEST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) > -HOST_GTEST_DEPENDENCIES += host-python > -endif > - > -HOST_GTEST_GMOCK_PYTHONPATH = \ > - $(HOST_DIR)/lib/python$(HOST_GTEST_PYTHON_VERSION)/site-packages > - > # While it is possible to build gtest as shared library, using this gtest shared > # library requires to set some special configure option in the project using > # gtest. > @@ -52,14 +35,4 @@ else > GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF > endif > > -define HOST_GTEST_INSTALL_CMDS > - $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ > - $(HOST_DIR)/bin/gmock_gen > - cp -rp $(@D)/googlemock/scripts/generator/cpp \ > - $(HOST_GTEST_GMOCK_PYTHONPATH) > -endef > - > $(eval $(cmake-package)) > -# The host package does not build anything, just installs gmock_gen stuff, so > -# it does not need to be a host-cmake-package. > -$(eval $(host-generic-package)) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From nolange79 at gmail.com Mon Jan 10 08:28:00 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Mon, 10 Jan 2022 09:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <7229983a-cbde-eb3f-83cb-984544f3b355@mind.be> References: <20201126152832.1115350-1-nolange79@gmail.com> <7229983a-cbde-eb3f-83cb-984544f3b355@mind.be> Message-ID: Arnout Vandecappelle schrieb am Mo., 10. Jan. 2022, 08:26: > > > On 09/01/2022 23:52, Norbert Lange wrote: > > Not only missing, but I sometimes need a *different* config. For example > i don't > > want to link against lz4, since I use zstd instead. > > Which is a great example of why the option doesn't work: it would affect > dependencies as well. > > However, specifically for this one, we have in the .mk file: > > ifeq ($(BR2_PACKAGE_ZSTD),y) > SYSTEMD_DEPENDENCIES += zstd > SYSTEMD_CONF_OPTS += -Dzstd=true > else > SYSTEMD_CONF_OPTS += -Dzstd=false > endif > > ifeq ($(BR2_PACKAGE_LZ4),y) > SYSTEMD_DEPENDENCIES += lz4 > SYSTEMD_CONF_OPTS += -Dlz4=true > else > SYSTEMD_CONF_OPTS += -Dlz4=false > endif > > So it should already do what you need, no? > I want lz4 in the rootfs, i don't want systemd to be linked against it (doesn't add anything for me, if zstd is available too) Norbert -------------- next part -------------- An HTML attachment was scrubbed... URL: From yegorslists at googlemail.com Mon Jan 10 08:58:49 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Mon, 10 Jan 2022 09:58:49 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: add entry for avrdude to Yegor Yefremov Message-ID: <20220110085850.11095-1-yegorslists@googlemail.com> From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index cd0b54b041..7a9f0f7370 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2968,6 +2968,7 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ +F: package/avrdude/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ -- 2.17.0 From yegorslists at googlemail.com Mon Jan 10 08:58:50 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Mon, 10 Jan 2022 09:58:50 +0100 Subject: [Buildroot] [PATCH 2/2] package/avrdude: add support for Linux sysfs GPIO interface In-Reply-To: <20220110085850.11095-1-yegorslists@googlemail.com> References: <20220110085850.11095-1-yegorslists@googlemail.com> Message-ID: <20220110085850.11095-2-yegorslists@googlemail.com> From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- package/avrdude/Config.in | 3 +++ package/avrdude/avrdude.mk | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in index 89558a5ff5..57a8df66ea 100644 --- a/package/avrdude/Config.in +++ b/package/avrdude/Config.in @@ -17,6 +17,9 @@ config BR2_PACKAGE_AVRDUDE if BR2_PACKAGE_AVRDUDE +config BR2_PACKAGE_AVRDUDE_LINUXGPIO + bool "Linux sysfs GPIO interface support" + config BR2_PACKAGE_AVRDUDE_SPI bool "SPI support" default y # Backward compatibility diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index accd92c1d5..3ccba80d8e 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -16,6 +16,12 @@ AVRDUDE_CONF_OPTS = --enable-linuxgpio AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ host-flex host-bison +ifeq ($(BR2_PACKAGE_AVRDUDE_LINUXGPIO),y) +AVRDUDE_CONF_OPTS += --enable-linuxgpio +else +AVRDUDE_CONF_OPTS += --disable-linuxgpio +endif + ifeq ($(BR2_PACKAGE_AVRDUDE_SPI),y) AVRDUDE_CONF_OPTS += --enable-linuxspi else -- 2.17.0 From herve.codina at bootlin.com Mon Jan 10 09:02:18 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 10:02:18 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/ulog: new package In-Reply-To: <20220101160533.GE2777@scaer> References: <20211112131258.2671293-1-herve.codina@bootlin.com> <20211112131258.2671293-3-herve.codina@bootlin.com> <20220101160533.GE2777@scaer> Message-ID: <20220110100218.1a1319ec@bootlin.com> Hi Yann, On Sat, 1 Jan 2022 17:05:33 +0100 "Yann E. MORIN" wrote: > Herv?, All, > > On 2021-11-12 14:12 +0100, Herve Codina spake thusly: > > The ulog library is a minimalistic logging library derived from > > Android logger. > > > > https://github.com/Parrot-Developers/ulog > > > > Signed-off-by: Herve Codina > [--SNIP--] > > diff --git a/package/ulog/ulog.mk b/package/ulog/ulog.mk > > new file mode 100644 > > index 0000000000..fab16e80d8 > > --- /dev/null > > +++ b/package/ulog/ulog.mk > > @@ -0,0 +1,44 @@ > > +################################################################################ > > +# > > +# ulog > > +# > > +################################################################################ > > + > > +ULOG_VERSION = 0389d243352255f6182326dccdae3d56dadc078f > > +ULOG_SITE = $(call github,Parrot-Developers,ulog,$(ULOG_VERSION)) > > +ULOG_LICENSE = Apache-2.0 > > +ULOG_LICENSE_FILES = COPYING > > +ULOG_DEPENDENCIES = host-alchemy > > +ULOG_INSTALL_STAGING = YES > > + > > +define ULOG_BUILD_CMDS > > + $(ALCHEMY_TARGET_ENV) \ > > + $(ALCHEMY_MAKE) libulog > > +endef > > + > > +define ULOG_INSTALL_STATIC_LIBS > > + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.a $(1)/usr/lib/ > > +endef > > So, it looks like you are always going to install the static library, > but the package does not have: depends on !BR2_STATIC_LIBS The v3 series will take care of BR2_STATIC_LIBS. > > > + > > +define ULOG_INSTALL_HEADERS > > + cp -Raf $(@D)/libulog/include/* $(1)/usr/include/ > > +endef > > + > > +ifeq ($(BR2_STATIC_LIBS),) > > +define ULOG_INSTALL_SHARED_LIBS > > + $(INSTALL) -m 755 $(@D)/alchemy-out/staging/usr/lib/libulog.so* $(1)/usr/lib/ > > Although it is very improbable that the destination directory does not > already exist, that is still a possibility, especially in target/. And > for consistency with all the other packages, you must create the > destination directory first before you start copying multiple files in > there. Will be fixed in v3 > > Also for consistency, use either 'cp' or '$(INSTALL)', not both , in the > same .mk (you used 'cp' for headers, and '$(INSTALL)' for libs, although > I don't see a reason not to use them consistently). > > Oh, and shared libraries do not need to be +x, so -m 644 is enough. Ok, I will use '$(INSTALL) -m 644 ' in v3 series > > > +endef > > +endif > > + > > +define ULOG_INSTALL_TARGET_CMDS > > + $(call ULOG_INSTALL_SHARED_LIBS, $(TARGET_DIR)) > > +endef > > + > > +define ULOG_INSTALL_STAGING_CMDS > > + $(call ULOG_INSTALL_STATIC_LIBS, $(STAGING_DIR)) > > + $(call ULOG_INSTALL_SHARED_LIBS, $(STAGING_DIR)) > > + $(call ULOG_INSTALL_HEADERS, $(STAGING_DIR)) > > + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, ulog, libulog, libulog.so) > > So, what happens with BR2_STATIC_LIBS=y? The .so would not exist in that > case, would it? But then, this is what would be registered in the > atom.mk... The file passed to Alchemy must be the .so. Internally, the static name will be deduced by replacing the shared suffix (.so) by the static suffix (.a) > > And with BR2_STATIC_LIBS not set, then the .a should not be built (or at > least not installed!), yet the installation of the static lib is > unconditional (and see the first comment too). > > It is difficult to understand if all of the static-shared combinations > are supported, so could you please check/clarify this? > > If the three combinations are indeed supported, then both the shared and > the staic install macros should be conditional. Otherwise, proper guards > should be added in the Config.in. In the next version (v3) of this series, I will install .a and .so according to flags set (BR2_{STATIC,SHARED}_LIBS). I will have one exception: libshdata, libshdata-section-lookup.a. This static lib is needed to use libshdata and cannot be a shared library. It is forced as static in libshdata atom.mk file (include $(BUILD_STATIC_LIBRARY)) So, I choose to install it even if we supposed to be shared library only (ie BR2_SHARED_LIBS=y) > > Those comments apply to all the pakcages in this series. > Thanks for the review, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Jan 10 09:10:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 10:10:36 +0100 Subject: [Buildroot] [PATCH 2/2] package/musl: disable LTO unconditionally In-Reply-To: <20220110091036.4165679-1-yann.morin.1998@free.fr> References: <20220110091036.4165679-1-yann.morin.1998@free.fr> Message-ID: <20220110091036.4165679-2-yann.morin.1998@free.fr> Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered for glibc, but all C libraries, like musl, are impacted, for very similar reasons. Disable LTO unconditionally for musl too. Signed-off-by: Yann E. MORIN Cc: Norbert Lange --- package/musl/musl.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/musl/musl.mk b/package/musl/musl.mk index d4f26b50a7..b89945e3be 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -26,6 +26,12 @@ MUSL_ADD_TOOLCHAIN_DEPENDENCY = NO MUSL_INSTALL_STAGING = YES +# musl does not build with LTO, so explicitly disable it +# when using a compiler that may have support for LTO +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +MUSL_EXTRA_CFLAGS += -fno-lto +endif + # Thumb build is broken, build in ARM mode, since all architectures # that support Thumb1 also support ARM. ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -- 2.25.1 From yann.morin.1998 at free.fr Mon Jan 10 09:10:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 10:10:35 +0100 Subject: [Buildroot] [PATCH 1/2] package/uclibc: disable LTO unconditionally Message-ID: <20220110091036.4165679-1-yann.morin.1998@free.fr> Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered for glibc, but all C libraries, like uClibc-NG, are impacted, for very similar reasons. Disable LTO unconditionally for uClibc-NG too. Signed-off-by: Yann E. MORIN Cc: Norbert Lange --- package/uclibc/uclibc.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 87e283de2a..0feedb6cfa 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -362,10 +362,18 @@ endif # Commands # +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) + +# uClibc-ng does not build with LTO, so explicitly disable it +# when using a compiler that may have support for LTO +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +UCLIBC_EXTRA_CFLAGS += -fno-lto +endif + UCLIBC_MAKE_FLAGS = \ ARCH="$(UCLIBC_TARGET_ARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \ + UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS)" \ HOSTCC="$(HOSTCC)" define UCLIBC_KCONFIG_FIXUP_CMDS -- 2.25.1 From thomas.claveirole at green-communications.fr Mon Jan 10 09:23:52 2022 From: thomas.claveirole at green-communications.fr (Thomas Claveirole) Date: Mon, 10 Jan 2022 10:23:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.11.0 Message-ID: <20220110092352.1247528-1-thomas.claveirole@green-communications.fr> Signed-off-by: Thomas Claveirole --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 11eae3de36..b72d5fcde8 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 da3025279bbd6cfb0e82b7af95666bede8fd65e8c620a1bc54bba04cebb7e1d4 v6.10.0-dist.zip +sha256 8c4751915808a5a84adcd760fff453429a95993cadf77003ac94eae127240c1a v6.11.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 781f9901ea..1f8b485018 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.10.0 +OPENLAYERS_VERSION = 6.11.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause -- 2.34.1 From michael at walle.cc Mon Jan 10 09:50:39 2022 From: michael at walle.cc (Michael Walle) Date: Mon, 10 Jan 2022 10:50:39 +0100 Subject: [Buildroot] [PATCH 1/2] {linux, linux-headers}: add version 5.16 Message-ID: <20220110095040.2212639-1-michael@walle.cc> Signed-off-by: Michael Walle --- linux/Config.in | 4 ++-- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 6c30100921..d2dc33209a 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,7 +28,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.15)" + bool "Latest version (5.16)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.83-cip1)" @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.16" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" 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 2f144427f4..86dc8d7af9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9bc3c873c5..fb0f147752 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_15 + default BR2_KERNEL_HEADERS_5_16 help Select the kernel version to get headers from. @@ -65,6 +65,10 @@ config BR2_KERNEL_HEADERS_5_14 config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + +config BR2_KERNEL_HEADERS_5_16 + bool "Linux 5.16.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -139,8 +143,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 + bool "5.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 - bool "5.15.x or later" + bool "5.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14 @@ -382,6 +390,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.83" if BR2_KERNEL_HEADERS_5_10 default "5.14.21" if BR2_KERNEL_HEADERS_5_14 default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index fd005f4740..adc93ab725 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -566,6 +566,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -579,6 +583,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 default "5.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 default "5.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1cea64d105..9346fa3feb 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -123,8 +123,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_16 + bool "5.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_15 - bool "5.15.x or later" + bool "5.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_14 -- 2.30.2 From michael at walle.cc Mon Jan 10 09:50:40 2022 From: michael at walle.cc (Michael Walle) Date: Mon, 10 Jan 2022 10:50:40 +0100 Subject: [Buildroot] [PATCH 2/2] configs/kontron_smarc_sal28: use kernel 5.16 In-Reply-To: <20220110095040.2212639-1-michael@walle.cc> References: <20220110095040.2212639-1-michael@walle.cc> Message-ID: <20220110095040.2212639-2-michael@walle.cc> Signed-off-by: Michael Walle --- configs/kontron_smarc_sal28_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index ce8f8323ae..37e415cf32 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3-ads2 freescale/fsl-ls1028a-kontron-sl28-var4 freescale/fsl-ls1028a-kontron-kbox-a-230-ls" -- 2.30.2 From m.niestroj at grinn-global.com Mon Jan 10 10:01:16 2022 From: m.niestroj at grinn-global.com (Marcin =?utf-8?Q?Niestr=C3=B3j?=) Date: Mon, 10 Jan 2022 11:01:16 +0100 Subject: [Buildroot] [PATCH v4] package/gitlab-runner: new package In-Reply-To: <20220106123449.344837-1-romain.naour@smile.fr> References: <20220106123449.344837-1-romain.naour@smile.fr> Message-ID: <87mtk3vrg6.fsf@grinn-global.com> Romain Naour writes: > From: Marcin Niestroj > > We rely on config.toml to be created manually during first boot as setup stage. > Even with an empty config.toml file, the gitlab-runner needs gitlab > registration token to register to a gitlab server. > > Use the 14.5.1 release since 14.5.2 and 14.6.0 triggers a build error [1] > due a patch for GO < 1.17. > (helpers/patches/issue_28732/syscall.go:11:2: undefined: syscall.Issue28732Fix) > > Tested: > https://gitlab.com/kubu93/buildroot/-/pipelines/442604876 > > [1] https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28766 > > Signed-off-by: Marcin Niestroj > Signed-off-by: Romain Naour > Cc: J?r?my Rosen > --- > Note: We used the gitlab-runner for shell or python jobs. > Jobs using docker images (images: in gitlab-ci.yml) is not tested. > > v4: update to 14.5.1 > Remove config.toml handling from .mk. > We rely on config.toml to be created during first boot as setup stage. > Even with an empty config.toml file, the gitlab-runner needs gitlab > registration token to register to a gitlab server. (Marcin Niestroj) > Remove alias gitlab-ci-multi-runner.service (Marcin Niestroj), > gitlab-ci-multi-runner.service comme from Debian gitlab-runner systemd > service file. > > v3: Change daemon process to gitlab-runner user. > see as example: https://git.buildroot.net/buildroot/tree/package/tpm2-abrmd/S80tpm2-abrmd?h=2020.05-rc2#n31 > > [Romain: Tested only using systemd init on aarch64 target emulated by Qemu] > v2: add service file, config file, gitlab user. > add bash as runtime dependency. > Add git, curl, ca-certificate, tar runtime dependencies from on debian control file for gitlab-runner package. > Use gnu tar since we can expect tar options that are not supported by busybox tar implementation. > Enable SSL/TLS library with openssl needed at runtime. > Add me as "developer". > > test-pkg config: > BR2_PACKAGE_GITLAB_RUNNER=y > --- Thanks Romain for updating and resending this patch! Looks fine to me as it is! -- Regards, Marcin Niestr?j From arnout at mind.be Mon Jan 10 10:43:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 11:43:45 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/gcc: use binutils wrappers for target libs In-Reply-To: References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-2-nolange79@gmail.com> <20220109151653.GC1477939@scaer> Message-ID: On 09/01/2022 22:08, Norbert Lange wrote: > Am So., 9. Jan. 2022 um 16:16 Uhr schrieb Yann E. MORIN > : >> >> Nrobert, All, >> >> On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: >>> This will use gcc-ar, gcc-nm and gcc-ranlib instead of the >>> normal binutils tools. The difference is that with the >>> wrappers, gcc plugins will be automatically picked up, >>> which might be necessary with some flags. >>> >>> Signed-off-by: Norbert Lange >>> --- >>> v1->v2: >>> * Only set those wrappers if gc 4.7 or newer >>> --- >>> package/gcc/gcc.mk | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk >>> index 114c2887a0..a24ffe3ee2 100644 >>> --- a/package/gcc/gcc.mk >>> +++ b/package/gcc/gcc.mk >>> @@ -99,6 +99,9 @@ GCC_COMMON_TARGET_CFLAGS += -Wno-error >>> endif >>> >>> # Propagate options used for target software building to GCC target libs >>> +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) >>> +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib >> >> So we were a bit skeptical about this one. >> >> First, we believe that only the final gcc should be using those. Indeed, >> we do not need much of the initial gcc, except libgcc.a, which anyway >> gets overwitten by the final gcc, so we do not care that the libgcc.a is >> built with LTO (and thus the gcc wrappers). >> >> Second, gcc initial is only used to build glibc, and as your patch 4 >> states, glibc must not be built with LTO, we we also do not care that >> the initial gcc uses its wrappers to build libgcc. Although I may have been the one to make this obvservation to begin with, I'm starting to come back on that. Even though indeed it is probably not very useful to apply the wrappers to gcc-initial, it doesn't hurt either. And by putting it in _COMMON_CONF_ENV, we make sure that (almost) all of the options are together in gcc.mk. Note that --enable-lto is also in COMMON_OPTS. >> >> Third, shouldn't we be using the tupple-prefixed wrappers? Or does it >> just happens that gcc will internally add its build directory to PATH so >> that it can find the un-prefixed just-built ones? >> >> For that last point, I added gcc-ar, gcc-nm, and gcc-ranlib in my PATH, >> that are just simple wrapper scripts that trace their being called, and >> then call to the actual gcca-r et al.: >> >> #!/bin/sh >> me="${0}" >> my_name="${0##*/}" >> found=false >> for i in $(which -a "${my_name}"); do >> if [ "${i}" -ef "${me}" ]; then >> found=true >> elif ${found}; then >> me="${i}" >> fi >> done >> if ! ${found}; then >> exit 42 >> fi >> printf "YEM: wrapped %s\n" "${me}" >> exec "${me}" "${@}" >> >> Turns out that the 'YEM: wrapped' string occurs nowhere in the build >> directory (so it does not end up in config.log or whatever), and it >> does not even appear on the stdout/stderr either. >> >> So I am wondering how we can exercise these... Any hint? > > Can't tell anymore, I went to crosstool-ng for the compiler some time ago, > so unlike my other patches I dont use them anymore. > > From my memory, it affected some of the additional libs gcc builds, > libstdc++, some sanitizers maybe. > there was not absolute paths or tuples as the various stages should > use the wrappers from the previous ones. I believe the final compiler > ignores PATH and uses the stage2-compiler with abs path to build the > included target libraries. That it doesn't look in PATH indeed sounds feasible. However, what is very surprising is that GCC doesn't automatically use the plugins when --enable-lto is passed. Before blindly adding some random options, we want to really understand why it is needed, in case maybe things are already broken in some other way, and to be able in the future to make changes and understand if they're OK or not. That said, I have checked and indeed, without these options it seems to use plain ar instead of gcc-ar. So I looked a bit deeper, and found this really old bug about enabling lto for libgcc [1]. It refers to a bunch of other issues found while doing this. For me, however, the conclusion is that the patch should be applied, but with better explanation. That way, you can set BR2_TARGET_OPTIMIZATION to -flto and get an LTO'ed libgcc/libstdc++/etc. If LTO is not used, it doesn't harm to use the wrapper. There's just one little concern though: I think the wrappers aren't even generated unless LTO is enabled. But that point is moot - since GCC N (where N > 4.9 and < 9), LTO is enabled by default, and we don't pass --disable-lto if LTO is not enabled. In other words, nowadays the BR2_GCC_ENABLE_LTO symbol is useless. Regards, Arnout [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59893 > > I am just sure it was very deliberately done *this* way. > > Norbert > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From post at lespocky.de Mon Jan 10 12:17:16 2022 From: post at lespocky.de (Alexander Dahl) Date: Mon, 10 Jan 2022 13:17:16 +0100 Subject: [Buildroot] [ANNOUNCE] mtd-utils-2.1.4 is released In-Reply-To: References: Message-ID: <20220110121715.GA6032@falbala.internal.home.lespocky.de> Hello David, On Fri, Jan 07, 2022 at 03:24:59AM +0000, David Oberhollenzer wrote: > mtd-utils-2.1.4 is released. > > Tarball: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.4.tar.bz2 > Tarball gpg signature: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.4.tar.bz2.asc > Signed git tag: git://git.infradead.org/mtd-utils.git v2.1.4 > > Alternatively also mirrored here: > > Tarball: https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2 > Tarball gpg signature: https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2.asc > Signed git tag: https://git.infraroot.at/mtd-utils.git v2.1.4 I tried to verify the gpg signature, but I could not find a public key. At https://keys.openpgp.org/ you only get a not working key: gpg: key BCE5DC3C741A02D1: new key but contains no user ID - skipped I also searched at http://www.linux-mtd.infradead.org/index.html and could not find a key, could you please point us to a recent version? Greets Alex -- /"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From thierry.bultel at linatsea.fr Mon Jan 10 12:46:42 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Mon, 10 Jan 2022 13:46:42 +0100 Subject: [Buildroot] [PATCH v4 1/3] package/cross-ldd: new package Message-ID: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> cross-ldd works just as ldd, but supports other architectures. It is needed by dracut, for instance. It is suffixed with "-ldd-buildroot" to avoid conflicts with toolchains that already implement it. Signed-off-by: Thierry Bultel --- Changes v1 -> v2: - simplified the download (suggested by Arnoult) Changes v2 -> v3 - changed the name to -ldd-cross, in order to avoid a conflict with the external toolchains that implement it Changes v3 -> v4 - No more Config.in. It is just a bind host-only package - cross-ldd.mk: added pointer to dracut documentation in the comment - Changed the suffix to -ldd-buildroot - No longer uses SED, but uses an actual patch for that Signed-off-by: Thierry Bultel --- .../cross-ldd/000-change-extension-name.patch | 12 ++++++++++ package/cross-ldd/cross-ldd.mk | 23 +++++++++++++++++++ package/dracut/dracut | 15 ++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 package/cross-ldd/000-change-extension-name.patch create mode 100644 package/cross-ldd/cross-ldd.mk create mode 100644 package/dracut/dracut diff --git a/package/cross-ldd/000-change-extension-name.patch b/package/cross-ldd/000-change-extension-name.patch new file mode 100644 index 0000000000..74364adc88 --- /dev/null +++ b/package/cross-ldd/000-change-extension-name.patch @@ -0,0 +1,12 @@ +diff -purN host-cross-ldd-6c9c724ebd6a29c279c6e5734e44c07f067808ec.orig/cross-compile-ldd host-cross-ldd-6c9c724ebd6a29c279c6e5734e44c07f067808ec/cross-compile-ldd +--- host-cross-ldd-6c9c724ebd6a29c279c6e5734e44c07f067808ec.orig/cross-compile-ldd 2022-01-06 12:25:40.144852639 +0000 ++++ host-cross-ldd-6c9c724ebd6a29c279c6e5734e44c07f067808ec/cross-compile-ldd 2022-01-06 12:25:40.148852681 +0000 +@@ -19,7 +19,7 @@ sed="${SED:-sed}" + grep="${GREP:-grep}" + + my_name="$( basename "${0}" )" +-prefix="${0%-ldd}" ++prefix="${0%-ldd-buildroot}" + gcc="${prefix}-gcc" + readelf="${prefix}-readelf" + fake_load_addr_root="$((0xdeadbeef))" diff --git a/package/cross-ldd/cross-ldd.mk b/package/cross-ldd/cross-ldd.mk new file mode 100644 index 0000000000..845e819aee --- /dev/null +++ b/package/cross-ldd/cross-ldd.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# cross-ldd +# +# ldd drop-in replacement for cross-compilation toolchains. +# This is the officially supported version mentioned +# in the dracut documentation (see dracut/docs/README.cross) +# +################################################################################ + +CROSS_LDD_VERSION = 6c9c724ebd6a29c279c6e5734e44c07f067808ec +CROSS_LDD_SOURCE = $(CROSS_LDD_VERSION).tar.gz +CROSS_LDD_SITE = https://gist.github.com/jerome-pouiller/c403786c1394f53f44a3b61214489e6f/archive +CROSS_LDD_LICENSE = GPL-2.0 + +# Notice that we change the name to '-ldd-buildroot', in order to avoid conflict +# with some external toolchains that implement it + +define HOST_CROSS_LDD_INSTALL_CMDS + install -D -m 755 $(@D)/cross-compile-ldd $(TARGET_CROSS)ldd-buildroot +endef + +$(eval $(host-generic-package)) diff --git a/package/dracut/dracut b/package/dracut/dracut new file mode 100644 index 0000000000..9d3db3b58e --- /dev/null +++ b/package/dracut/dracut @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -x + +if [ -z "$*" ]; then + echo "No argument supplied" + exit +fi + +DRACUT_LDD=${TARGET_CROSS}ldd-cross \ +DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ +dracutbasedir=${HOST_DIR}/usr/lib/dracut \ +dracutsysrootdir=${TARGET_DIR} \ +${HOST_DIR}/bin/dracut "$@" -- 2.25.1 From thierry.bultel at linatsea.fr Mon Jan 10 12:46:44 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Mon, 10 Jan 2022 13:46:44 +0100 Subject: [Buildroot] [PATCH v4 3/3] fs/cpio: new option to use dracut tool In-Reply-To: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> Message-ID: <20220110124644.1388438-3-thierry.bultel@linatsea.fr> Adds an option to invoke the dracut host tool, providing a configuration file, instead of having a full cpio archive of the whole target directory. Signed-off-by: Thierry Bultel Changes v1 -> v2 (suggested by Arnoult and Yann) - was a new fs type, now an option of cpio - deals with the case of a build with no kernel - gets the kernel name in a smarter way - checks for the name of dracut configuration file Changes v2 -> v3 - fixed a typo on the --no-kernel option for dracut - removed the unneeded dependency to kernel - added tests for cpio, for both full, and dracut modes Changes v3 -> v4 - Config.in: applied Yann's comments on syntax and option in choice - do no export TARGET_CROSS but give it in command line instead - use $(ROOTFS_CPIO_DIR) as base for tmp directory - let original, full cpio, first in the code, and dracut mode after - removed unwanted comment in dracut.conf (in tests) Signed-off-by: Thierry Bultel --- fs/cpio/Config.in | 35 ++++++++++ fs/cpio/cpio.mk | 36 +++++++++++ support/testing/conf/dracut.conf | 93 +++++++++++++++++++++++++++ support/testing/tests/fs/test_cpio.py | 44 +++++++++++++ 4 files changed, 208 insertions(+) create mode 100644 support/testing/conf/dracut.conf create mode 100644 support/testing/tests/fs/test_cpio.py diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index c1151a2881..efc5bd7857 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -7,6 +7,41 @@ config BR2_TARGET_ROOTFS_CPIO if BR2_TARGET_ROOTFS_CPIO +choice + prompt "cpio type" + default BR2_TARGET_ROOTFS_CPIO_FULL + +config BR2_TARGET_ROOTFS_CPIO_FULL + bool "cpio the whole root filesystem (ie the content of 'target')" + help + Build a cpio archive containing the whole the root filesystem. + +comment "dracut cpio needs busybox, or systemd init system" + depends on !BR2_INIT_BUSYBOX + depends on !BR2_INIT_SYSTEMD + +config BR2_TARGET_ROOTFS_CPIO_DRACUT + bool "Invoke dracut to make an initramfs" + select BR2_PACKAGE_HOST_DRACUT + select BR2_PACKAGE_HOST_UBOOT_TOOLS + depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSTEMD + help + Builds an additional initramfs using dracut. + This can be useful to create a recovery system, + for instance. + +endchoice + +if BR2_TARGET_ROOTFS_CPIO_DRACUT +config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE + string "configuration file" +endif + + +endif # BR2_TARGET_ROOTFS_CPIO + +if BR2_TARGET_ROOTFS_CPIO_FULL + choice prompt "Compression method" default BR2_TARGET_ROOTFS_CPIO_NONE diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 81f8c393d1..62e73de8be 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -29,6 +29,8 @@ endif # BR2_ROOTFS_DEVICE_CREATION_STATIC ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT +ifeq ($(BR2_TARGET_ROOTFS_CPIO_FULL),y) + # --reproducible option was introduced in cpio v2.12, which may not be # available in some old distributions, so we build host-cpio ifeq ($(BR2_REPRODUCIBLE),y) @@ -53,4 +55,38 @@ endef ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE endif +else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) + +ROOTFS_CPIO_DEPENDENCIES += host-dracut + +ifeq ($(BR2_LINUX_KERNEL),y) +ROOTFS_CPIO_DEPENDENCIES += linux +endif + +ifeq ($(BR_BUILDING).$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE),y.) +$(error No dracut config file name specified, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE setting) +endif + +ifeq ($(BR2_LINUX_KERNEL),y) +ROOTFS_CPIO_DRACUT_CMD_OPTS += --kver $(LINUX_VERSION_PROBED) +else +ROOTFS_CPIO_DRACUT_CMD_OPTS += --no-kernel +endif + +define ROOTFS_CPIO_CMD + mkdir -p $(ROOTFS_CPIO_DIR)/tmp + + TARGET_CROSS="$(TARGET_CROSS)" \ + $(HOST_DIR)/sbin/dracut \ + $(ROOTFS_CPIO_DRACUT_CMD_OPTS) \ + -c $(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE) \ + --tmpdir $(ROOTFS_CPIO_DIR)/tmp \ + -M \ + --force \ + --keep \ + $@ +endef + +endif #BR2_TARGET_ROOTFS_CPIO_DRACUT + $(eval $(rootfs)) diff --git a/support/testing/conf/dracut.conf b/support/testing/conf/dracut.conf new file mode 100644 index 0000000000..5aeecd18ce --- /dev/null +++ b/support/testing/conf/dracut.conf @@ -0,0 +1,93 @@ +#Simple dracut config for a system without systemd + +#Dracut configuration + +show_modules=yes +i18n_install_all=no +lvmconf=no +mdadmconf=no +early_microcode=no +hostonly=no +hostonly_cmdline=no +use_fstab=no +kernel_cmdline="rd.break=initqueue" +do_strip=no + +# Dracut modules need +add_dracutmodules+=" \ +busybox-buildroot \ +bash +" + +# Modules to ignore +omit_dracutmodules+=" \ +biosdevname \ +btrfs \ +bluetooth \ +busybox \ +caps \ +cifs \ +crypt \ +crypt-gpg \ +dash \ +dbus-broker \ +dbus-daemon \ +dm \ +dmraid \ +dmsquash-live-ntfs \ +dracut-systemd \ +fcoe \ +fcoe-uefi \ +fs-lib \ +iscsi \ +i18n \ +lvmmerge \ +lvm \ +lunmask \ +mdraid \ +memstrack \ +mksh \ +modsign \ +mount-root \ +multipath \ +nbd \ +network-legacy \ +network-wicked \ +nfs \ +nvdimm \ +nvmf \ +parse-lunmask \ +qemu \ +qemu-net \ +resume \ +rootfs-block \ +rngd \ +systemd \ +systemd-udevd \ +systemd-coredump \ +systemd-ask-password \ +systemd-timedated \ +systemd-rfkill \ +systemd-resolved \ +systemd-hostnamed \ +systemd-initrd \ +systemd-journald \ +systemd-ldconfig \ +systemd-networkd \ +systemd-timesyncd \ +systemd-veritysetup \ +systemd-modules-load \ +systemd-sysctl \ +systemd-repart \ +systemd-sysext \ +systemd-sysusers \ +systemd-tmpfiles \ +squash \ +ssh-client \ +stratis \ +tpm2-tss \ +udev-rules \ +url-lib \ +usrmount \ +" + diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py new file mode 100644 index 0000000000..5570693dc2 --- /dev/null +++ b/support/testing/tests/fs/test_cpio.py @@ -0,0 +1,44 @@ +import os +import infra.basetest + +CHECK_FS_CMD = "mount | grep 'rootfs on / type rootfs'" + +def boot_img(emulator, builddir): + img = os.path.join(builddir, "images", "rootfs.cpio") + emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", "{}".format(img)]) + emulator.login() + _, exit_code = emulator.run(CHECK_FS_CMD) + return exit_code + +class TestCpioDracut(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_INIT_BUSYBOX=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_DRACUT=y + BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE="{}" + """.format(infra.filepath("conf/dracut.conf")) + + def test_run(self): + + exit_code = boot_img(self.emulator, + self.builddir) + self.assertEqual(exit_code, 0) + +class TestCpioFull(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_INIT_BUSYBOX=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_FULL=y + """ + + def test_run(self): + + exit_code = boot_img(self.emulator, + self.builddir) + self.assertEqual(exit_code, 0) + + -- 2.25.1 From thierry.bultel at linatsea.fr Mon Jan 10 12:46:43 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Mon, 10 Jan 2022 13:46:43 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/dracut: new host package In-Reply-To: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> Message-ID: <20220110124644.1388438-2-thierry.bultel@linatsea.fr> Dracut is the tool used by desktop distributions to build initrds. In the embedded world, it can be very usefull, too, for instance when wanting to create an initramfs for a system recovery mode. Whereas it is definitively possible to achieve this with buildroot, the process is to have a dedicated buildroot configuration for that, and perform a full build. Instead of doing that, the idea is to use dracut to pick the needed binaries/shared libraries, configuration files, or kernel modules from the 'target' directory. The advantage is to save build time, and also to have a consistency between the packages versions taken for the recovery and the production filesystem. The principle of dracut is based on the so-called 'dracut modules' On the host, they are on host/lib/dracut/modules.d Each directory as a prefix number for the order of execution, and at least a "module-setup.sh" script. Dracut sources all of them, and typically calls the "check()" function, which is the placeholder for required binaries (that are aimed to be polulated in the initrd), then the "depends()" function, that lists other modules to depend on, and the "install()" function, that makes the actual work. Dracut was initially thought to work with systems using systemd, but it can also work without it. Do to so, every "systemd-xxx" modules must be disabled in the dracut configuration file. For convenience, the 05busybox-buildroot module is provided, to support busybox init system. Signed-off-by: Thierry Bultel --- Changes v1 -> v2 (all suggested by Arnoult) - added a wrapper script Changes v2 -> v3 - added modules for: - supporting busybox system init type - fixing a missing symlink for uClibc Changes v3 -> v4 - some explanations on the dracut modules in the commit log - fixed a bug on the 'require_binary' line in busybox module - expanded variables with double quotes and curly braces - removed commented out code - fixes for 'fakeroot' and 'uclibc' and 'musl' as patches - musl and uclibc dynamic fix - renamed dracut wrapper - disabled when using another init system than systemd or busybox Signed-off-by: Thierry Bultel --- package/Config.in.host | 1 + package/dracut/0000-enable-fakeroot.patch | 12 ++++ ...01-add-a-module-to-fix-libc-ld-links.patch | 56 +++++++++++++++++ .../05busybox-buildroot/module-setup.sh | 60 +++++++++++++++++++ package/dracut/Config.in.host | 10 ++++ package/dracut/dracut | 2 +- package/dracut/dracut.mk | 41 +++++++++++++ package/dracut/dracut_wrapper.sh | 15 +++++ 8 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 package/dracut/0000-enable-fakeroot.patch create mode 100644 package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch create mode 100644 package/dracut/05busybox-buildroot/module-setup.sh create mode 100644 package/dracut/Config.in.host create mode 100644 package/dracut/dracut.mk create mode 100644 package/dracut/dracut_wrapper.sh diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..caa28262be 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/cramfs/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" + source "package/dracut/Config.in.host" source "package/dfu-util/Config.in.host" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" diff --git a/package/dracut/0000-enable-fakeroot.patch b/package/dracut/0000-enable-fakeroot.patch new file mode 100644 index 0000000000..e148485135 --- /dev/null +++ b/package/dracut/0000-enable-fakeroot.patch @@ -0,0 +1,12 @@ +diff -purN host-dracut-055.orig/dracut.sh host-dracut-055/dracut.sh +--- host-dracut-055.orig/dracut.sh 2021-05-27 12:34:19.000000000 +0000 ++++ host-dracut-055/dracut.sh 2022-01-06 14:17:57.022317138 +0000 +@@ -868,8 +868,6 @@ export LC_ALL=C + export LANG=C + unset LC_MESSAGES + unset LC_CTYPE +-unset LD_LIBRARY_PATH +-unset LD_PRELOAD + unset GREP_OPTIONS + + export DRACUT_LOG_LEVEL=warning diff --git a/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch new file mode 100644 index 0000000000..ad5e97b34a --- /dev/null +++ b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch @@ -0,0 +1,56 @@ +From 2c0188164223563adfce4852faa83d2553bee367 Mon Sep 17 00:00:00 2001 +From: Thierry Bultel +Date: Mon, 10 Jan 2022 09:09:43 +0100 +Subject: [PATCH] add a module to fix libc ld links + +When using uClibc or musl, there must +be "ls-uClibc.so.1" or "ld-musl-x.so" symlinks, +respectively (else the init process cannot +start) + +Signed-off-by: Thierry Bultel +--- + modules.d/05libc-links/module-setup.sh | 31 ++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + create mode 100755 modules.d/05libc-links/module-setup.sh + +diff --git a/modules.d/05libc-links/module-setup.sh b/modules.d/05libc-links/module-setup.sh +new file mode 100755 +index 00000000..249bb80c +--- /dev/null ++++ b/modules.d/05libc-links/module-setup.sh +@@ -0,0 +1,31 @@ ++#!/bin/bash ++ ++# Adds the missing links for uClibc or musl, if needed ++ ++check() { ++ return 0 ++} ++ ++depends() { ++ return 0 ++} ++ ++install() { ++ ++ # Despite of the fact that the listed dependency (reported by readelf -d) ++ # is purely /lib/libc.so, the musl symlink is needed anyway. ++ ++ musl_link=$(find "${dracutsysrootdir}"/lib -name "ld-musl-*.so*") ++ if [ $? -eq 0 ] ; then ++ ln -s /lib/libc.so ${initdir}/lib/`basename "${musl_link}"` ++ fi ++ ++ # Same for uClibc, the listed dependency ++ # is ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too ++ ++ uclibc_link = $(find "${dracutsysrootdir}"/lib -name "ld-uClibc-*.so*") ++ if [ $? -eq 0 ] ; then ++ ln -s ld-uClibc.so.1 "${initdir}"/`basename "${uclibc_link}"` ++ fi ++ ++} +-- +2.25.1 + diff --git a/package/dracut/05busybox-buildroot/module-setup.sh b/package/dracut/05busybox-buildroot/module-setup.sh new file mode 100644 index 0000000000..ab4e0a5c50 --- /dev/null +++ b/package/dracut/05busybox-buildroot/module-setup.sh @@ -0,0 +1,60 @@ +#!/bin/bash + +check() { + require_binaries busybox || return 1 + return 0 +} + +depends() { + return 0 +} + +install_busybox_links() { + dir=$1 + linkname=$2 + + (cd "${dracutsysrootdir}${dir}" && + for x in *; do + if [ "$(readlink "$x")" = "${linkname}" ]; then + ln -sf "${linkname}" "${initdir}/${dir}/$x" + fi + done + ) +} + +install() { + inst_multiple /bin/busybox + + # wrapper script for early console; will launch /sbin/init + # after having mounted devtmpfs + inst_multiple /init + + ln -s ../bin/busybox "${initdir}"/sbin/init + + if [ -e "${dracutsysrootdir}/lib64" ]; then + ln -s lib "${initdir}/lib64" + ln -s lib "${initdir}/usr/lib64" + fi + + if [ -e "${dracutsysrootdir}/lib32" ]; then + ln -s lib "${initdir}/lib32" + ln -s lib "${initdir}/usr/lib32" + fi + + install_busybox_links "/bin" "busybox" + install_busybox_links "/sbin" "../bin/busybox" + install_busybox_links "/usr/bin" "../../bin/busybox" + install_busybox_links "/usr/sbin" "../../bin/busybox" + + inst_multiple \ + /etc/inittab \ + /etc/init.d/rcS \ + /etc/init.d/rcK \ + /etc/issue \ + /etc/fstab \ + /etc/group \ + /etc/passwd \ + /etc/shadow \ + /etc/hostname +} + diff --git a/package/dracut/Config.in.host b/package/dracut/Config.in.host new file mode 100644 index 0000000000..074d46f623 --- /dev/null +++ b/package/dracut/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_DRACUT + bool + select BR2_PACKAGE_HOST_KMOD + select BR2_PACKAGE_HOST_CROSS_LDD + help + dracut is used to create an initramfs image by + copying tools and files from an installed system + and combining it with the dracut framework. + + https://dracut.wiki.kernel.org diff --git a/package/dracut/dracut b/package/dracut/dracut index 9d3db3b58e..eb15ea9abd 100644 --- a/package/dracut/dracut +++ b/package/dracut/dracut @@ -8,7 +8,7 @@ if [ -z "$*" ]; then exit fi -DRACUT_LDD=${TARGET_CROSS}ldd-cross \ +DRACUT_LDD=${TARGET_CROSS}ldd-buildroot \ DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ dracutbasedir=${HOST_DIR}/usr/lib/dracut \ dracutsysrootdir=${TARGET_DIR} \ diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk new file mode 100644 index 0000000000..5a9e154ccc --- /dev/null +++ b/package/dracut/dracut.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# dracut +# +################################################################################ + +DRACUT_VERSION = 055 +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut +DRACUT_LICENSE = GPL-2.0 +DRACUT_LICENSE_FILES = COPYING + +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd + +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + $(INSTALL) -D -m 0755 package/dracut/dracut \ + $(HOST_DIR)/sbin/dracut +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + + +# Dracut does not support busybox init (systemd init is assumed to work +# out of the box, though). It provides a busybox module, that does not +# use the same paths as buildroot, and is not meant to be used as an init +# system. +# So it is simplier for users to disable the standard 'busybox' module in +# the configuration file, and enable the "busybox-buildroot' module +# instead. +# Notice that setting the script as executable (0755) is not mandatory, +# but this is what dracut does on all its modules, so lets just conform +# to it. + +ifeq ($(BR2_INIT_BUSYBOX),y) +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE +endif + +$(eval $(host-autotools-package)) diff --git a/package/dracut/dracut_wrapper.sh b/package/dracut/dracut_wrapper.sh new file mode 100644 index 0000000000..9d3db3b58e --- /dev/null +++ b/package/dracut/dracut_wrapper.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -x + +if [ -z "$*" ]; then + echo "No argument supplied" + exit +fi + +DRACUT_LDD=${TARGET_CROSS}ldd-cross \ +DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ +dracutbasedir=${HOST_DIR}/usr/lib/dracut \ +dracutsysrootdir=${TARGET_DIR} \ +${HOST_DIR}/bin/dracut "$@" -- 2.25.1 From cyrilbur at gmail.com Mon Jan 10 13:02:49 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Mon, 10 Jan 2022 13:02:49 +0000 Subject: [Buildroot] [PATCH v2] package/python-greenlet: enable as host package In-Reply-To: <20210623145231.19243-1-cyrilbur@gmail.com> References: <20210623145231.19243-1-cyrilbur@gmail.com> Message-ID: <20220110130249.5b897804@camb691.localdomain> While currently there is no in-tree Buildroot package which depends on host-python-lxml, we (Adder Technology) have some proprietary modules that use it as part of their builds. I've tested python-greenlet as host package and confirmed that it builds and works correctly. Someone else might require it, so we are proposing its inclusion. Signed-off-by: Cyril Bur --- V2: Added Config.in.host and a better commit message package/Config.in.host | 1 + package/python-greenlet/Config.in.host | 7 +++++++ package/python-greenlet/python-greenlet.mk | 1 + 3 files changed, 9 insertions(+) create mode 100644 package/python-greenlet/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..6e027d96c2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,6 +69,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" + source "package/python-greenlet/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host new file mode 100644 index 0000000000..673fee8cc5 --- /dev/null +++ b/package/python-greenlet/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_GREENLET + bool "host python-greenlet" + help + Greenlets are lightweight coroutines for in-process concurrent + programming. + + https://greenlet.readthedocs.io/ diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 7b983ff0ef..3b1ef7e314 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From arnout at mind.be Mon Jan 10 13:16:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 14:16:24 +0100 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats Message-ID: <20220110131624.3639727-1-arnout@mind.be> Bumping the version of systemd is a little more complicated than the usual package, and it's easy to forget some of the things that need to be done - and this has happened several times in the past. Add a checklist of things to worry about when updating systemd. Note that there are many other complicated packages that also need a lot of attention when upgrading. However, systemd is a really critical package so it's more important that we get that one right than, say, valgrind. Cc: Norbert Lange Cc: J?r?my ROSEN Cc: Adam Duskett Cc: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 3811dbae42..4d82d2ab81 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,6 +4,18 @@ # ################################################################################ +# When updating systemd, take care of the following: +# - Check if the requirements have changed (see README), in particular +# arch and headers +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD +# - If the required kernel options have changed, update the Config.in +# help text and the list of KCONFIG_ENABLE_OPT. +# - Check if there are new meson_options. Make sure all options are set +# explicitly (usually to default value). +# - If there are new services: +# - create new options for them (if they really are optional); +# - create a new _USER if necessary; +# - create new directionry (with _PERMISSIONS) if necessary. SYSTEMD_VERSION = 250.1 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ -- 2.31.1 From arnout at mind.be Mon Jan 10 13:26:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 14:26:21 +0100 Subject: [Buildroot] Buildroot hackaton and how to help Message-ID: ?Hi all, ?Over the past two years, the backlog of not-yet-applied patches has accumulated very badly, to the level that we reached more than 500 "New" patches in patchwork by mid-December 2021. Worse still, there were about 150 patches of more than a year old. One important reason for this is that the maintainers haven't been able to meet face-to-face during all that time. This makes it difficult to handle contributions that are not completely ready yet, or not perfectly aligned with the Buildroot philosophy. ?Over the past four days, we have finally been able to to get together again. We had dedicated time to look at complicated situations, and we had the opportunity to discuss individual patches and come to decisions. We also had Giulio and Romain helping out remotely. This has allowed us to reduce the backlog from about 350 on Wednesday down to only 128 this morning. In this time, we've applied 293 patches. ?THe picture is a bit less rosy than it seems, however. Of the 128 remaining patches, more than half (78) are more than 2 months old, and one third (42) are more than 6 months old. Older patches are always more difficult to treat because it isn't fair to ask the original submitter for some trivial changes after such a long time. ?The good news, on the other hand, is that we are fairly good with applying trivial patches and patches that have been reviewed. It can take a week, sometimes two, but they don't linger for months in patchwork. Trivial patches are: version bumps, documentation, spelling and whitespace fixes, DEVELOPERS entries, simple fixes that either add toolchain exclusions or take an upstream patch, simple new packages (python packages for example), etc. ?There is a lot that you can do to improve the situation for the non-trivial patches that still stay behind in patchwork for a long time. - Review patches. Even if you don't feel comfortable to assert that a patch is entirely perfect, you can still do a review and catch some of the obvious problems, and it's one less thing for the maintainers to have to fix. - Add your Reviewed-by, Acked-by or Tested-by tag if you think the patch is good enough. The maintainers will still take a look at it, so don't worry if you don't feel experienced enough to approve patches, just go ahead and do it. These tags help because they make a patch stand out in patchwork. To make sure it stands out, please reply to each individual patch of the series, or at least the first ones. - Adopt a patch. When reviewing, it is often easier to fix the issues than to explain what needs to be done in a reply. You can easily get and apply a patch with pwclient (pip install pwclient to get it). Make the fixes, send the new version (make sure you keep the original authorship information and Signed-off-by, and add your own), and let someone on IRC know that the old one is to be marked as Superseded (talk to y_morin, Kubu, jacmet, kos_tom and/or arnout). - When submitting patches, take into account the submission policies. This reduces the work for maintainers to process your patch. ? * Write a good commit message that describes the problem and why this ??? particular solution is chosen. ? * Run check-package and (if necessary) flake8. ? * Put people who might be interested in Cc. Use get-developers, ??? possibly also git log. ? * When re-submitting: ??? - Add people who previously reviewed it in Cc. ??? - Keep Reviewed/Tested/Acked-by tags that people previously gave it. ??? - Mark the previous one as Superseded in patchwork. ??? - Include a version number (and increment it, obviously). ??? - Include a patch changelog. ??? - When it's part of a series, resubmit the entire series, including ????? patches that haven't changed. - Add tests. They make it easier to feel safe about making changes. - All of the above should of course be in our manual. Most of it already is, but you could help by looking at docs/manual/contribute.txt and extend where needed. ?Most importantly however: thank you everybody for your continued contributions. It is thanks to all of you that Buildroot is such a great project! Yann, Thomas, Peter and Arnout From santosh.multhalli at rockwellcollins.com Mon Jan 10 13:42:29 2022 From: santosh.multhalli at rockwellcollins.com (Santosh Multhalli) Date: Mon, 10 Jan 2022 19:12:29 +0530 Subject: [Buildroot] [PATCH 1/1] Removed Santosh Multhalli (santosh.multhalli@rockwellcollins.com) as active developer of valjson Message-ID: <20220110134229.1381-1-santosh.multhalli@rockwellcollins.com> Signed-off-by: Santosh Multhalli --- DEVELOPERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 215506c71c..3a530aa3f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1761,8 +1761,6 @@ F: package/urg/ F: package/ussp-push/ F: support/misc/toolchainfile.cmake.in -N: Santosh Multhalli -F: package/valijson/ N: Scott Fan F: package/libssh/ -- 2.25.1 From yann.morin.1998 at free.fr Mon Jan 10 14:04:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:04:50 +0100 Subject: [Buildroot] [PATCH 2/2] package/avrdude: add support for Linux sysfs GPIO interface In-Reply-To: <20220110085850.11095-2-yegorslists@googlemail.com> References: <20220110085850.11095-1-yegorslists@googlemail.com> <20220110085850.11095-2-yegorslists@googlemail.com> Message-ID: <20220110140450.GO1477939@scaer> Yegor, All, On 2022-01-10 09:58 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > Signed-off-by: Yegor Yefremov > --- > package/avrdude/Config.in | 3 +++ > package/avrdude/avrdude.mk | 6 ++++++ > 2 files changed, 9 insertions(+) > > diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in > index 89558a5ff5..57a8df66ea 100644 > --- a/package/avrdude/Config.in > +++ b/package/avrdude/Config.in > @@ -17,6 +17,9 @@ config BR2_PACKAGE_AVRDUDE > > if BR2_PACKAGE_AVRDUDE > > +config BR2_PACKAGE_AVRDUDE_LINUXGPIO > + bool "Linux sysfs GPIO interface support" > + > config BR2_PACKAGE_AVRDUDE_SPI > bool "SPI support" > default y # Backward compatibility > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index accd92c1d5..3ccba80d8e 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -16,6 +16,12 @@ AVRDUDE_CONF_OPTS = --enable-linuxgpio > AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ > host-flex host-bison > > +ifeq ($(BR2_PACKAGE_AVRDUDE_LINUXGPIO),y) > +AVRDUDE_CONF_OPTS += --enable-linuxgpio > +else > +AVRDUDE_CONF_OPTS += --disable-linuxgpio > +endif We already have an unconditional activation of those: https://github.com/buildroot/buildroot/blob/master/package/avrdude/avrdude.mk#L15 (which you can btw. incidentally also notice as part the hunk header). So, if the intention was to be able to enable linux-gpio, then this is a noop as they are already enabled. If the intention was to be able to disable them, then the unconditional enable should be dropped. But then, does it make sense to be able to disable linux GPIO? And what if both SPI and GPIO are disabled? Regards, Yann E. MORIN. > ifeq ($(BR2_PACKAGE_AVRDUDE_SPI),y) > AVRDUDE_CONF_OPTS += --enable-linuxspi > else > -- > 2.17.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From cyrilbur at gmail.com Mon Jan 10 14:07:37 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Mon, 10 Jan 2022 14:07:37 +0000 Subject: [Buildroot] [PATCH v2] package/python-greenlet: enable as host package In-Reply-To: <20220110130249.5b897804@camb691.localdomain> References: <20210623145231.19243-1-cyrilbur@gmail.com> <20220110130249.5b897804@camb691.localdomain> Message-ID: Sorry ignore me, sent a version with mistakes. I'll send v3. On Mon, 10 Jan 2022 at 13:02, Cyril Bur wrote: > > While currently there is no in-tree Buildroot package which depends on > host-python-lxml, we (Adder Technology) have some proprietary modules > that use it as part of their builds. > > I've tested python-greenlet as host package and confirmed that it builds > and works correctly. Someone else might require it, so we are proposing > its inclusion. > > Signed-off-by: Cyril Bur > --- > V2: Added Config.in.host and a better commit message > > package/Config.in.host | 1 + > package/python-greenlet/Config.in.host | 7 +++++++ > package/python-greenlet/python-greenlet.mk | 1 + > 3 files changed, 9 insertions(+) > create mode 100644 package/python-greenlet/Config.in.host > > diff --git a/package/Config.in.host b/package/Config.in.host > index b3e00bb482..6e027d96c2 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -69,6 +69,7 @@ menu "Host utilities" > source "package/pwgen/Config.in.host" > source "package/python/Config.in.host" > source "package/python-cython/Config.in.host" > + source "package/python-greenlet/Config.in.host" > source "package/python-lxml/Config.in.host" > source "package/python-six/Config.in.host" > source "package/python-xlrd/Config.in.host" > diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host > new file mode 100644 > index 0000000000..673fee8cc5 > --- /dev/null > +++ b/package/python-greenlet/Config.in.host > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_HOST_PYTHON_GREENLET > + bool "host python-greenlet" > + help > + Greenlets are lightweight coroutines for in-process concurrent > + programming. > + > + https://greenlet.readthedocs.io/ > diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk > index 7b983ff0ef..3b1ef7e314 100644 > --- a/package/python-greenlet/python-greenlet.mk > +++ b/package/python-greenlet/python-greenlet.mk > @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.34.1 > -- Cyril From cyrilbur at gmail.com Mon Jan 10 14:11:40 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Mon, 10 Jan 2022 14:11:40 +0000 Subject: [Buildroot] [PATCH v3] package/python-greenlet: enable as host package In-Reply-To: <20210623145231.19243-1-cyrilbur@gmail.com> References: <20210623145231.19243-1-cyrilbur@gmail.com> Message-ID: <20220110141140.77224ac0@camb691.localdomain> While currently there is no in-tree Buildroot package which depends on host-python-greenlet, we (Adder Technology) have some proprietary modules that use it as part of their builds. I've tested python-greenlet as host package and confirmed that it builds and works correctly. Someone else might require it, so I'm proposing its inclusion. Signed-off-by: Cyril Bur --- v2: Half completed commit message update - sorry v3: Updated commit message and Config.in.host package/Config.in.host | 1 + package/python-greenlet/Config.in.host | 7 +++++++ package/python-greenlet/python-greenlet.mk | 1 + 3 files changed, 9 insertions(+) create mode 100644 package/python-greenlet/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..6e027d96c2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,6 +69,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" + source "package/python-greenlet/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host new file mode 100644 index 0000000000..673fee8cc5 --- /dev/null +++ b/package/python-greenlet/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_GREENLET + bool "host python-greenlet" + help + Greenlets are lightweight coroutines for in-process concurrent + programming. + + https://greenlet.readthedocs.io/ diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 7b983ff0ef..3b1ef7e314 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From yann.morin.1998 at free.fr Mon Jan 10 14:09:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:09:25 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add entry for avrdude to Yegor Yefremov Message-ID: <20220110140611.1F28D82A2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=922fdcd47d092e9d2f7000afcb7997a2a2ed2111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index cd0b54b041..7a9f0f7370 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2968,6 +2968,7 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ +F: package/avrdude/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ From yann.morin.1998 at free.fr Mon Jan 10 14:11:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:11:53 +0100 Subject: [Buildroot] [git commit] Developpers: remove Santosh Multhalli for valjson Message-ID: <20220110140611.2CCBF83241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31fd98c6ae7c39d779e7f9729e55ec65a7f847ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Santosh Multhalli Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7a9f0f7370..12777e8d61 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2503,9 +2503,6 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Santosh Multhalli -F: package/valijson/ - N: S??bastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ From yann.morin.1998 at free.fr Mon Jan 10 14:13:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:13:49 +0100 Subject: [Buildroot] [PATCH 1/1] Removed Santosh Multhalli (santosh.multhalli@rockwellcollins.com) as active developer of valjson In-Reply-To: <20220110134229.1381-1-santosh.multhalli@rockwellcollins.com> References: <20220110134229.1381-1-santosh.multhalli@rockwellcollins.com> Message-ID: <20220110141349.GP1477939@scaer> Santosh, All, On 2022-01-10 19:12 +0530, Santosh Multhalli spake thusly: > Signed-off-by: Santosh Multhalli Applied to master, thanks. Thanks you for taking care of it until now! :-) Regards, Yann E. MORIN. > --- > DEVELOPERS | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 215506c71c..3a530aa3f2 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1761,8 +1761,6 @@ F: package/urg/ > F: package/ussp-push/ > F: support/misc/toolchainfile.cmake.in > > -N: Santosh Multhalli > -F: package/valijson/ > > N: Scott Fan > F: package/libssh/ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 10 14:14:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:14:09 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: add entry for avrdude to Yegor Yefremov In-Reply-To: <20220110085850.11095-1-yegorslists@googlemail.com> References: <20220110085850.11095-1-yegorslists@googlemail.com> Message-ID: <20220110141409.GQ1477939@scaer> Yegor, All, On 2022-01-10 09:58 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > Signed-off-by: Yegor Yefremov Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index cd0b54b041..7a9f0f7370 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2968,6 +2968,7 @@ F: configs/beaglebone_defconfig > F: configs/beaglebone_qt5_defconfig > F: package/acl/ > F: package/attr/ > +F: package/avrdude/ > F: package/boost/ > F: package/bootstrap/ > F: package/cannelloni/ > -- > 2.17.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From herve.codina at bootlin.com Mon Jan 10 14:50:02 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:02 +0100 Subject: [Buildroot] [PATCH v3 0/5] Add Alchemy build system and some related libs Message-ID: <20220110145007.133329-1-herve.codina@bootlin.com> Hi, This patch series introduces the Parrot Alchemy build system as a host tool (patch 1). This tool is then used to build several libs (patch 2, 3 and 4). Finaly (patch 5), a test is provided to check that the binaries were correctly built. As it was mentionned by Thomas Peteazzoni in the previous review, a new package infrastructure was not added for the Alchemy build system. Indeed, we do not expect to have a significant number of packages that will rely on the Alchemy build system. Of course, should we have more of these packages in the future, we can consider adding a package infrastructure. This v3 series takes care of the Yann Morin's review. Changes v2->v3 are detailed in each patch. Best regards, Herv? Codina Herve Codina (5): package/alchemy: new host package package/ulog: new package package/libfutils: new package package/libshdata: new package support/testing/tests/package/test_libshdata: new test DEVELOPERS | 5 ++ package/Config.in | 3 + ...lchains-remove-hash-style-management.patch | 36 +++++++++ package/alchemy/alchemy.hash | 4 + package/alchemy/alchemy.mk | 71 ++++++++++++++++++ package/alchemy/atom.mk.in | 8 ++ package/libfutils/Config.in | 15 ++++ package/libfutils/libfutils.hash | 3 + package/libfutils/libfutils.mk | 56 ++++++++++++++ ...01-backend-Add-missing-include-files.patch | 47 ++++++++++++ ...stress_test-Fix-build-with-musl-libc.patch | 34 +++++++++ package/libshdata/Config.in | 29 +++++++ package/libshdata/libshdata.hash | 3 + package/libshdata/libshdata.mk | 75 +++++++++++++++++++ package/ulog/Config.in | 12 +++ package/ulog/ulog.hash | 3 + package/ulog/ulog.mk | 50 +++++++++++++ .../testing/tests/package/test_libshdata.py | 25 +++++++ 18 files changed, 479 insertions(+) create mode 100644 package/alchemy/0001-toolchains-remove-hash-style-management.patch create mode 100644 package/alchemy/alchemy.hash create mode 100644 package/alchemy/alchemy.mk create mode 100644 package/alchemy/atom.mk.in create mode 100644 package/libfutils/Config.in create mode 100644 package/libfutils/libfutils.hash create mode 100644 package/libfutils/libfutils.mk create mode 100644 package/libshdata/0001-backend-Add-missing-include-files.patch create mode 100644 package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch create mode 100644 package/libshdata/Config.in create mode 100644 package/libshdata/libshdata.hash create mode 100644 package/libshdata/libshdata.mk create mode 100644 package/ulog/Config.in create mode 100644 package/ulog/ulog.hash create mode 100644 package/ulog/ulog.mk create mode 100644 support/testing/tests/package/test_libshdata.py -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:03 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:03 +0100 Subject: [Buildroot] [PATCH v3 1/5] package/alchemy: new host package In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-2-herve.codina@bootlin.com> Alchemy is a build system developed by Parrot. It is a new build system based on the one used in Android. A central makefile instance scans a workspace to find user makefiles, includes them and register modules to be built. https://github.com/Parrot-Developers/alchemy Signed-off-by: Herve Codina --- Changes v1 -> v2 - Fixed missing license information related to kconfig - Installed Alchemy in $(HOST_DIR)/opt/alchemy - Renamed ALCHEMY_TARGET_CONFIGURE_ENV to ALCHEMY_TARGET_ENV - Removed ALCHEMY_TARGET_CONFIGURE_SDKS macro Changes v2 -> v3 - Introduced atom.mk.in as suggested by Yann - Added LIBRARIES in atom.mk.in to set Alchemy dependencies chain. This is needed to have a complete .a file list for the link command in case of static lib only. DEVELOPERS | 1 + ...lchains-remove-hash-style-management.patch | 36 ++++++++++ package/alchemy/alchemy.hash | 4 ++ package/alchemy/alchemy.mk | 71 +++++++++++++++++++ package/alchemy/atom.mk.in | 8 +++ 5 files changed, 120 insertions(+) create mode 100644 package/alchemy/0001-toolchains-remove-hash-style-management.patch create mode 100644 package/alchemy/alchemy.hash create mode 100644 package/alchemy/alchemy.mk create mode 100644 package/alchemy/atom.mk.in diff --git a/DEVELOPERS b/DEVELOPERS index cd0b54b041..79b33e9f22 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1187,6 +1187,7 @@ N: Henrique Camargo F: package/json-glib/ N: Herv? Codina +F: package/alchemy/ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ diff --git a/package/alchemy/0001-toolchains-remove-hash-style-management.patch b/package/alchemy/0001-toolchains-remove-hash-style-management.patch new file mode 100644 index 0000000000..522766b977 --- /dev/null +++ b/package/alchemy/0001-toolchains-remove-hash-style-management.patch @@ -0,0 +1,36 @@ +From 4cb9681ab99db3d8e330ac789e17ec69583aecd4 Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Thu, 28 Oct 2021 18:39:18 +0200 +Subject: [PATCH] toolchains: remove --hash-style management + +Using an external toolchain, with an external configuration given +using TARGET_GLOBAL_XXXX variables, having '--hash-style=both' +in Alchemy toolchains can lead to compilation failure. + +This patch simply removes all --hash-style settings. + +Signed-off-by: Herve Codina +--- + toolchains/linux/eglibc/flags.mk | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/toolchains/linux/eglibc/flags.mk b/toolchains/linux/eglibc/flags.mk +index 95c0a46..4474729 100644 +--- a/toolchains/linux/eglibc/flags.mk ++++ b/toolchains/linux/eglibc/flags.mk +@@ -11,11 +11,4 @@ TARGET_GLOBAL_LDLIBS += -pthread -lrt + TARGET_GLOBAL_CFLAGS += -funwind-tables + + # Enable link optimization for binutils's ld. +-# gnu hash not supported by mips ABI +-ifeq ("$(TARGET_ARCH)","mips") +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-else ifeq ("$(TARGET_ARCH)","mips64") +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-else +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1,--hash-style=both +-endif ++TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-- +2.31.1 + diff --git a/package/alchemy/alchemy.hash b/package/alchemy/alchemy.hash new file mode 100644 index 0000000000..33895263cc --- /dev/null +++ b/package/alchemy/alchemy.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 346c06b9317691a9371d878b850e61f8bcec4f20132ac95340b9d2571be25ee8 alchemy-d95b3c38cd37814a1b98d0bbf813de7adaaecfbc.tar.gz +sha256 542f44eecd9f8806ec1ae285201e442ab547c82d9f8c70e44c977d6332a2bea0 COPYING +sha256 49872815ee3de163f07a83737c996e77a5bffa186d06b1e3bb969bfb68c251df README diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk new file mode 100644 index 0000000000..33d40478b7 --- /dev/null +++ b/package/alchemy/alchemy.mk @@ -0,0 +1,71 @@ +################################################################################ +# +# alchemy +# +################################################################################ + +ALCHEMY_VERSION = d95b3c38cd37814a1b98d0bbf813de7adaaecfbc +ALCHEMY_SITE = $(call github,Parrot-Developers,alchemy,$(ALCHEMY_VERSION)) +ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) +ALCHEMY_LICENSE_FILES = COPYING README +HOST_ALCHEMY_DEPENDENCIES = host-python3 + +ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy +ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk + +define HOST_ALCHEMY_INSTALL_CMDS + mkdir -p $(ALCHEMY_HOME) + cp -rf $(@D)/* $(ALCHEMY_HOME) + cp $(HOST_ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOME)/atom.mk.in +endef + +$(eval $(host-generic-package)) + +# Variables used by other packages + +ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake + +# TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture. +# When Alchemy manages the architecture, it can add some flags to CFGLAGS and +# can lead to incorrect result with the toolchain provided in TARGET_CROSS. +# 'xxx' is an unknown architecture for Alchemy. Using this value is a simple +# way to disable the Alchemy architecture management. +ALCHEMY_TARGET_ENV = \ + $(TARGET_MAKE_ENV) \ + ALCHEMY_HOME=$(ALCHEMY_HOME) \ + ALCHEMY_WORKSPACE_DIR="$(@D)" \ + ALCHEMY_TARGET_OUT=alchemy-out \ + TARGET_OS=linux \ + TARGET_OS_FLAVOUR=buildroot \ + TARGET_CROSS="$(TARGET_CROSS)" \ + TARGET_ARCH=xxx \ + TARGET_GLOBAL_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + TARGET_GLOBAL_LDFLAGS="$(TARGET_LDFLAGS)" \ + TARGET_GLOBAL_FFLAGS="$(TARGET_FCFLAGS)" \ + TARGET_GLOBAL_FCFLAGS="$(TARGET_FCFLAGS)" + +ifeq ($(BR2_STATIC_LIBS),y) +ALCHEMY_TARGET_ENV += \ + TARGET_FORCE_STATIC=1 \ + TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS)" +else +ALCHEMY_TARGET_ENV += \ + TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS) -fPIC" +endif + +# Install an Alchemy SDK file. +# This macro can be used by Alchemy packages +# $1: Buildroot package name +# $2: Alchemy module name +# $3: Alchemy module file name +# $4: Alchemy module libraries this module depends on +define ALCHEMY_INSTALL_LIB_SDK_FILE + $(INSTALL) -m 0644 -D \ + $(ALCHEMY_HOME)/atom.mk.in \ + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk + $(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \ + -e 's#@MODULE@#$(strip $(2))#' \ + -e 's#@MODULE_FILENAME@#$(strip $(3))#' \ + -e 's#@LIBRARIES@#$(strip $(4))#' \ + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk +endef diff --git a/package/alchemy/atom.mk.in b/package/alchemy/atom.mk.in new file mode 100644 index 0000000000..084ae0e89f --- /dev/null +++ b/package/alchemy/atom.mk.in @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE := @MODULE@ +LOCAL_SDK := @STAGING_DIR@ +LOCAL_DESTDIR := usr/lib +LOCAL_MODULE_FILENAME := @MODULE_FILENAME@ +LOCAL_LIBRARIES := @LIBRARIES@ +include $(BUILD_LIBRARY) -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:04 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:04 +0100 Subject: [Buildroot] [PATCH v3 2/5] package/ulog: new package In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-3-herve.codina@bootlin.com> The ulog library is a minimalistic logging library derived from Android logger. https://github.com/Parrot-Developers/ulog Signed-off-by: Herve Codina --- Changes v1 -> v2 - Renamed ALCHEMY_TARGET_CONFIGURE_ENV to ALCHEMY_TARGET_ENV - Removed $(strip ...) - Fixed indentation Changes v2 -> v3 - Installed .a files when needed (ie not shared lib only) - Used $(INSTALL) in all installation commands - Created installation directories when needed DEVELOPERS | 1 + package/Config.in | 1 + package/ulog/Config.in | 12 ++++++++++ package/ulog/ulog.hash | 3 +++ package/ulog/ulog.mk | 50 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 package/ulog/Config.in create mode 100644 package/ulog/ulog.hash create mode 100644 package/ulog/ulog.mk diff --git a/DEVELOPERS b/DEVELOPERS index 79b33e9f22..31ca7bf608 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1197,6 +1197,7 @@ F: package/php-apcu/ F: package/php-lua/ F: package/php-pam/ F: package/php-pecl-dbus/ +F: package/ulog/ F: support/testing/tests/package/test_dtbocfg.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..39a98fcc66 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1738,6 +1738,7 @@ menu "Logging" source "package/log4qt/Config.in" source "package/opentracing-cpp/Config.in" source "package/spdlog/Config.in" + source "package/ulog/Config.in" source "package/zlog/Config.in" endmenu diff --git a/package/ulog/Config.in b/package/ulog/Config.in new file mode 100644 index 0000000000..ef155005c2 --- /dev/null +++ b/package/ulog/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_ULOG + bool "ulog" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + help + This is a minimalistic logging library derived from + Android logger. + + https://github.com/Parrot-Developers/ulog + +comment "ulog needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ulog/ulog.hash b/package/ulog/ulog.hash new file mode 100644 index 0000000000..47adc093b9 --- /dev/null +++ b/package/ulog/ulog.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 14e5773b32a79fa5380bdc7ac73a39a7cd3ab182830f57cf6f2994fb49cf38dc ulog-0389d243352255f6182326dccdae3d56dadc078f.tar.gz +sha256 cbb97dd2528af2aa2b9aee6c1b3ff1caed758044c17b2c811cf44b2528c496da COPYING diff --git a/package/ulog/ulog.mk b/package/ulog/ulog.mk new file mode 100644 index 0000000000..4bfb913499 --- /dev/null +++ b/package/ulog/ulog.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# ulog +# +################################################################################ + +ULOG_VERSION = 0389d243352255f6182326dccdae3d56dadc078f +ULOG_SITE = $(call github,Parrot-Developers,ulog,$(ULOG_VERSION)) +ULOG_LICENSE = Apache-2.0 +ULOG_LICENSE_FILES = COPYING +ULOG_DEPENDENCIES = host-alchemy +ULOG_INSTALL_STAGING = YES + +define ULOG_BUILD_CMDS + $(ALCHEMY_TARGET_ENV) \ + $(ALCHEMY_MAKE) libulog +endef + +ifeq ($(BR2_SHARED_LIBS),) +define ULOG_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.a \ + $(1)/usr/lib/libulog.a +endef +endif + +define ULOG_INSTALL_HEADERS + mkdir -p $(1)/usr/include/ + $(INSTALL) -m 644 $(@D)/libulog/include/* $(1)/usr/include/ +endef + +ifeq ($(BR2_STATIC_LIBS),) +define ULOG_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.so* \ + $(1)/usr/lib/ +endef +endif + +define ULOG_INSTALL_TARGET_CMDS + $(call ULOG_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +define ULOG_INSTALL_STAGING_CMDS + $(call ULOG_INSTALL_STATIC_LIBS, $(STAGING_DIR)) + $(call ULOG_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call ULOG_INSTALL_HEADERS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, ulog, libulog, libulog.so) +endef + +$(eval $(generic-package)) -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:05 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:05 +0100 Subject: [Buildroot] [PATCH v3 3/5] package/libfutils: new package In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-4-herve.codina@bootlin.com> The libfutils library is a library that contains some common useful functions (list, hash, time). https://github.com/Parrot-Developers/libfutils Signed-off-by: Herve Codina --- Changes v1 -> v2 - Renamed ALCHEMY_TARGET_CONFIGURE_ENV to ALCHEMY_TARGET_ENV - Removed ALCHEMY_TARGET_CONFIGURE_SDKS and set ALCHEMY_TARGET_SDK_DIRS - Removed $(strip ...) - Fixed indentation - Added missing "depends on" in Config.in comment Changes v2 -> v3 - Installed .a files when needed (ie not shared lib only) - Used $(INSTALL) in all installation commands - Created installation directories when needed - Fixed dependencies chain in Alchemy atom.mk DEVELOPERS | 1 + package/Config.in | 1 + package/libfutils/Config.in | 15 +++++++++ package/libfutils/libfutils.hash | 3 ++ package/libfutils/libfutils.mk | 56 ++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 package/libfutils/Config.in create mode 100644 package/libfutils/libfutils.hash create mode 100644 package/libfutils/libfutils.mk diff --git a/DEVELOPERS b/DEVELOPERS index 31ca7bf608..ecb0837398 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1191,6 +1191,7 @@ F: package/alchemy/ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ +F: package/libfutils/ F: package/lua-augeas/ F: package/modsecurity2/ F: package/php-apcu/ diff --git a/package/Config.in b/package/Config.in index 39a98fcc66..163fd53e12 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1986,6 +1986,7 @@ menu "Other" source "package/libevent/Config.in" source "package/libexecinfo/Config.in" source "package/libffi/Config.in" + source "package/libfutils/Config.in" source "package/libgee/Config.in" source "package/libgeos/Config.in" source "package/libglib2/Config.in" diff --git a/package/libfutils/Config.in b/package/libfutils/Config.in new file mode 100644 index 0000000000..7f795fc7e0 --- /dev/null +++ b/package/libfutils/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBFUTILS + bool "libfutils" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP # ulog + depends on BR2_TOOLCHAIN_HAS_THREADS # ulog + select BR2_PACKAGE_ULOG + help + This library contains some common useful functions (list, + hash, time) + + https://github.com/Parrot-Developers/libfutils + +comment "libfutils needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_ATOMIC diff --git a/package/libfutils/libfutils.hash b/package/libfutils/libfutils.hash new file mode 100644 index 0000000000..1fdcd84b13 --- /dev/null +++ b/package/libfutils/libfutils.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 b38d40c46b83e448d8c1716ddfb04b7ecd384f5cd2cb773db5c26c0589accdb3 libfutils-c326ce0cc2a7354381265a7664bb215be587fac6.tar.gz +sha256 eca11a1c62fae8d64a1247d93271375baecff8396141d7ff8d89671ee7e3ed0d COPYING diff --git a/package/libfutils/libfutils.mk b/package/libfutils/libfutils.mk new file mode 100644 index 0000000000..0772d16ad7 --- /dev/null +++ b/package/libfutils/libfutils.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# libfutils +# +################################################################################ + +LIBFUTILS_VERSION = c326ce0cc2a7354381265a7664bb215be587fac6 +LIBFUTILS_SITE = $(call github,Parrot-Developers,libfutils,$(LIBFUTILS_VERSION)) +LIBFUTILS_LICENSE = BSD-3-Clause +LIBFUTILS_LICENSE_FILES = COPYING +LIBFUTILS_DEPENDENCIES = ulog host-alchemy +LIBFUTILS_INSTALL_STAGING = YES + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBFUTILS_CONF_ENV += TARGET_GLOBAL_LDLIBS='-latomic' +endif + +define LIBFUTILS_BUILD_CMDS + $(ALCHEMY_TARGET_ENV) \ + ALCHEMY_TARGET_SDK_DIRS="$(ALCHEMY_SDK_BASEDIR)/ulog" \ + $(LIBFUTILS_CONF_ENV) \ + $(ALCHEMY_MAKE) libfutils +endef + +ifeq ($(BR2_SHARED_LIBS),) +define LIBFUTILS_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libfutils.a \ + $(1)/usr/lib/libfutils.a +endef +endif + +define LIBFUTILS_INSTALL_HEADERS + mkdir -p $(1)/usr/include/futils + $(INSTALL) -m 644 $(@D)/include/futils/* $(1)/usr/include/futils/ +endef + +ifeq ($(BR2_STATIC_LIBS),) +define LIBFUTILS_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libfutils.so* \ + $(1)/usr/lib/ +endef +endif + +define LIBFUTILS_INSTALL_TARGET_CMDS + $(call LIBFUTILS_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +define LIBFUTILS_INSTALL_STAGING_CMDS + $(call LIBFUTILS_INSTALL_STATIC_LIBS, $(STAGING_DIR)) + $(call LIBFUTILS_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call LIBFUTILS_INSTALL_HEADERS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libfutils, libfutils, libfutils.so, libulog) +endef + +$(eval $(generic-package)) -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:07 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:07 +0100 Subject: [Buildroot] [PATCH v3 5/5] support/testing/tests/package/test_libshdata: new test In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-6-herve.codina@bootlin.com> This new test ensures that libraries and binaries generated using Parrot Alchemy build system are correct. Indeed, the test uses libshdata-stress. This binary depends on libshdata. libshdata depends on libfutils and libfutils depends on ulog. All of these binaries and libraries are built using Alchemy. Signed-off-by: Herve Codina --- Changed v1 -> v2: none Changed v2 -> v3: none DEVELOPERS | 1 + .../testing/tests/package/test_libshdata.py | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 support/testing/tests/package/test_libshdata.py diff --git a/DEVELOPERS b/DEVELOPERS index 8d0258d7e8..68d66e08a7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1201,6 +1201,7 @@ F: package/php-pam/ F: package/php-pecl-dbus/ F: package/ulog/ F: support/testing/tests/package/test_dtbocfg.py +F: support/testing/tests/package/test_libshdata.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py F: support/testing/tests/package/test_php_lua.py diff --git a/support/testing/tests/package/test_libshdata.py b/support/testing/tests/package/test_libshdata.py new file mode 100644 index 0000000000..80b032ac69 --- /dev/null +++ b/support/testing/tests/package/test_libshdata.py @@ -0,0 +1,25 @@ +import os + +import infra.basetest + + +class TestLibshdata(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LIBSHDATA=y + BR2_PACKAGE_LIBSHDATA_STRESS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", img]) + self.emulator.login() + + # Just run libshdata-stress. + # This ensures that library are well compiled and that all dependencies + # are met using Parrot Alchemy build system. + self.assertRunOk("libshdata-stress") -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:06 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:06 +0100 Subject: [Buildroot] [PATCH v3 4/5] package/libshdata: new package In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-5-herve.codina@bootlin.com> The libshdata library provides lock free shared-memory tools. https://github.com/Parrot-Developers/libshdata libshdata-stress utility does not compile using static libs only (BR2_STATIC_LIBS=y). The issue was raised upstream: https://github.com/Parrot-Developers/libshdata/issues/2 For now, libshdata-stress simply depends on !BR2_STATIC_LIBS. Signed-off-by: Herve Codina --- Changes v1 -> v2 - Added comment related to "patch submitted upstream" in the patch itself - Renamed ALCHEMY_TARGET_CONFIGURE_ENV to ALCHEMY_TARGET_ENV - Removed ALCHEMY_TARGET_CONFIGURE_SDKS and set ALCHEMY_TARGET_SDK_DIRS - Removed $(strip ...) - Fixed indentation - Added missing "depends on" in Config.in comment - Moved the Config.in "comment" block after the if...endif block - Removed unneeded LIBSHDATA_CONF_ENV Changes v2 -> v3 - Installed .a files when needed (ie not shared lib only) - Used $(INSTALL) in all installation commands - Created installation directories when needed - Added ulog as buildroot package dependency and fixed the dependencies chain in Alchemy atom.mk - Added 0002-examples-stress_test-Fix-build-with-musl-libc.patch - Added 'depends on !BR2_STATIC_LIBS' for libshdata-stress DEVELOPERS | 1 + package/Config.in | 1 + ...01-backend-Add-missing-include-files.patch | 47 ++++++++++++ ...stress_test-Fix-build-with-musl-libc.patch | 37 +++++++++ package/libshdata/Config.in | 30 ++++++++ package/libshdata/libshdata.hash | 3 + package/libshdata/libshdata.mk | 75 +++++++++++++++++++ 7 files changed, 194 insertions(+) create mode 100644 package/libshdata/0001-backend-Add-missing-include-files.patch create mode 100644 package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch create mode 100644 package/libshdata/Config.in create mode 100644 package/libshdata/libshdata.hash create mode 100644 package/libshdata/libshdata.mk diff --git a/DEVELOPERS b/DEVELOPERS index ecb0837398..8d0258d7e8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1192,6 +1192,7 @@ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ F: package/libfutils/ +F: package/libshdata/ F: package/lua-augeas/ F: package/modsecurity2/ F: package/php-apcu/ diff --git a/package/Config.in b/package/Config.in index 163fd53e12..2a1bc0dfb8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2030,6 +2030,7 @@ comment "linux-pam plugins" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" + source "package/libshdata/Config.in" source "package/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/libshdata/0001-backend-Add-missing-include-files.patch b/package/libshdata/0001-backend-Add-missing-include-files.patch new file mode 100644 index 0000000000..78c9e669c3 --- /dev/null +++ b/package/libshdata/0001-backend-Add-missing-include-files.patch @@ -0,0 +1,47 @@ +From 3eaf11bd957555674f5993435ef79dd4717ce890 Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Tue, 26 Oct 2021 08:45:10 +0200 +Subject: [PATCH] backend: Add missing include files + +With some libc library (musl), shd_dev_mem.c and shd_shm.c do not +compile. Indeed, open() needs (Cf. man open). + +This patch fixes the compilation issue adding this +include file. + +This patch was submitted upstream. +https://github.com/Parrot-Developers/libshdata/issues/1 + +Signed-off-by: Herve Codina +--- + src/backend/shd_dev_mem.c | 1 + + src/backend/shd_shm.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/backend/shd_dev_mem.c b/src/backend/shd_dev_mem.c +index 14573c1..a65f052 100644 +--- a/src/backend/shd_dev_mem.c ++++ b/src/backend/shd_dev_mem.c +@@ -33,6 +33,7 @@ + #include + #include + #include /* For ftruncate */ ++#include /* For open */ + #include /* for flock */ + #include /* For shm and PROT flags */ + #include +diff --git a/src/backend/shd_shm.c b/src/backend/shd_shm.c +index 117bf01..1e5a38c 100644 +--- a/src/backend/shd_shm.c ++++ b/src/backend/shd_shm.c +@@ -35,6 +35,7 @@ + #include + #include + #include /* For ftruncate */ ++#include /* For open */ + #include /* For NAME_MAX macro */ + #include /* for flock */ + #include /* For shm and PROT flags */ +-- +2.31.1 + diff --git a/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch b/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..c2a8e5f240 --- /dev/null +++ b/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch @@ -0,0 +1,37 @@ +From ddded7337812a2797d31f276624da98932d8e17f Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Sun, 9 Jan 2022 14:59:27 +0100 +Subject: [PATCH] examples/stress_test: Fix build with musl libc + +The musl C library uses sched_priority instead of +__sched_priority as GNU libc and uClibc do. +Use sched_priority instead. + +This does not break compilation with GNU libc and uClibc +because they both define in sched.h: + #define sched_priority __sched_priority + +This patch was submitted upstream. +https://github.com/Parrot-Developers/libshdata/issues/3 + +Signed-off-by: Herve Codina +--- + examples/stress_test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/stress_test.c b/examples/stress_test.c +index a859115..cfb5418 100644 +--- a/examples/stress_test.c ++++ b/examples/stress_test.c +@@ -617,7 +617,7 @@ static void launch_test(int timer_fd, struct test_setup *setup) + if (ret < 0) + ULOGI("Error setting the timer : %s", strerror(errno)); + struct sched_param sched_params; +- sched_params.__sched_priority = sched_get_priority_max(SCHED_RR); ++ sched_params.sched_priority = sched_get_priority_max(SCHED_RR); + + pid_t pid = fork(); + +-- +2.33.1 + diff --git a/package/libshdata/Config.in b/package/libshdata/Config.in new file mode 100644 index 0000000000..b2c24c94c5 --- /dev/null +++ b/package/libshdata/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_LIBSHDATA + bool "libshdata" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC # libfutils + depends on BR2_INSTALL_LIBSTDCPP # libfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # libfutils + select BR2_PACKAGE_LIBFUTILS + select BR2_PACKAGE_ULOG + help + This library provides lock free shared-memory tools + + https://github.com/Parrot-Developers/libshdata + +if BR2_PACKAGE_LIBSHDATA + +config BR2_PACKAGE_LIBSHDATA_STRESS + bool "libshdata-stress binary" + depends on !BR2_STATIC_LIBS + help + Install libshdata-stress binary as well + +comment "libshdata-stress needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +endif + +comment "libshdata needs a toolchain w/ C++, threads" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libshdata/libshdata.hash b/package/libshdata/libshdata.hash new file mode 100644 index 0000000000..880404cf52 --- /dev/null +++ b/package/libshdata/libshdata.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 1ae83ac73c2b5b17c726067737b8d446b99f190e16fe6198eb464368796ecce3 libshdata-d9ec4bdba834d8f3daf6bf9aa6da374bc462961f.tar.gz +sha256 eca11a1c62fae8d64a1247d93271375baecff8396141d7ff8d89671ee7e3ed0d COPYING diff --git a/package/libshdata/libshdata.mk b/package/libshdata/libshdata.mk new file mode 100644 index 0000000000..dc0937e11e --- /dev/null +++ b/package/libshdata/libshdata.mk @@ -0,0 +1,75 @@ +################################################################################ +# +# libshdata +# +################################################################################ + +LIBSHDATA_VERSION = d9ec4bdba834d8f3daf6bf9aa6da374bc462961f +LIBSHDATA_SITE = $(call github,Parrot-Developers,libshdata,$(LIBSHDATA_VERSION)) +LIBSHDATA_LICENSE = BSD-3-Clause +LIBSHDATA_LICENSE_FILES = COPYING +LIBSHDATA_DEPENDENCIES = libfutils ulog host-alchemy +LIBSHDATA_INSTALL_STAGING = YES + +LIBSHDATA_TARGETS = libshdata +ifeq ($(BR2_PACKAGE_LIBSHDATA_STRESS),y) +LIBSHDATA_TARGETS += libshdata-stress +endif + +define LIBSHDATA_BUILD_CMDS + $(ALCHEMY_TARGET_ENV) \ + ALCHEMY_TARGET_SDK_DIRS="$(ALCHEMY_SDK_BASEDIR)/libfutils \ + $(ALCHEMY_SDK_BASEDIR)/ulog" \ + $(ALCHEMY_MAKE) $(LIBSHDATA_TARGETS) +endef + +ifeq ($(BR2_SHARED_LIBS),) +define LIBSHDATA_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata.a \ + $(1)/usr/lib/libshdata.a + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata-section-lookup.a \ + $(1)/usr/lib/libshdata-section-lookup.a +endef +else +# We should be dynamic libraries only but libshdata-section-lookup is only +# build as a static lib (include $(BUILD_STATIC_LIBRARY) in atom.mk) and it +# is needed for libshdata usage. +define LIBSHDATA_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata-section-lookup.a \ + $(1)/usr/lib/libshdata-section-lookup.a +endef +endif + +define LIBSHDATA_INSTALL_HEADERS + mkdir -p $(1)/usr/include/ + $(INSTALL) -m 644 $(@D)/include/* $(1)/usr/include/ +endef + +ifeq ($(BR2_STATIC_LIBS),) +define LIBSHDATA_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata.so* \ + $(1)/usr/lib/ +endef +endif + +ifeq ($(BR2_PACKAGE_LIBSHDATA_STRESS),y) +define LIBSHDATA_INSTALL_BIN + $(INSTALL) -D -m 755 $(@D)/alchemy-out/staging/usr/bin/libshdata-stress \ + $(1)/usr/bin/libshdata-stress +endef +endif + +define LIBSHDATA_INSTALL_TARGET_CMDS + $(call LIBSHDATA_INSTALL_SHARED_LIBS, $(TARGET_DIR)) + $(call LIBSHDATA_INSTALL_BIN, $(TARGET_DIR)) +endef + +define LIBSHDATA_INSTALL_STAGING_CMDS + $(call LIBSHDATA_INSTALL_STATIC_LIBS, $(STAGING_DIR)) + $(call LIBSHDATA_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call LIBSHDATA_INSTALL_HEADERS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libshdata, libshdata, libshdata.so, libfutils, libulog) +endef + +$(eval $(generic-package)) -- 2.33.1 From mf at go-sys.de Mon Jan 10 15:13:02 2022 From: mf at go-sys.de (Michael Fischer) Date: Mon, 10 Jan 2022 16:13:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl8723bu: bump version to d34603a39a7c925d810fe17c6e8dea5063d43a33 Message-ID: <20220110151302.21093-1-mf@go-sys.de> patch 0001: Disable concurrrent mode. This causes disconnections. Signed-off-by: Michael Fischer --- package/rtl8723bu/0001-disable_concurent_mode.patch | 12 ++++++++++++ package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 package/rtl8723bu/0001-disable_concurent_mode.patch diff --git a/package/rtl8723bu/0001-disable_concurent_mode.patch b/package/rtl8723bu/0001-disable_concurent_mode.patch new file mode 100644 index 0000000000..037b1642fc --- /dev/null +++ b/package/rtl8723bu/0001-disable_concurent_mode.patch @@ -0,0 +1,12 @@ +diff -purN a/Makefile b/Makefile +--- a/Makefile 2021-11-04 20:36:55.000000000 +0100 ++++ b/Makefile 2022-01-10 14:35:17.333934039 +0100 +@@ -18,7 +18,7 @@ EXTRA_CFLAGS += -Wno-unused-label + EXTRA_CFLAGS += -Wno-unused-parameter + EXTRA_CFLAGS += -Wno-unused-function + EXTRA_CFLAGS += -Wno-unused +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE ++#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE + + ccflags-y += -D__CHECK_ENDIAN__ + diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 04bc776a07..df990a8d63 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz +sha256 c9cde757941c88c6117560a2c350dc9c4382dcd6a313b1cae7c6e7eade7055bf rtl8723bu-d34603a39a7c925d810fe17c6e8dea5063d43a33.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index c35fad5832..e73987cfeb 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 +RTL8723BU_VERSION = d34603a39a7c925d810fe17c6e8dea5063d43a33 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) -- 2.20.1 From james.hilliard1 at gmail.com Mon Jan 10 05:41:43 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 22:41:43 -0700 Subject: [Buildroot] [PATCH v4 2/3] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220110054144.1294907-1-james.hilliard1@gmail.com> References: <20220110054144.1294907-1-james.hilliard1@gmail.com> Message-ID: <20220110054144.1294907-2-james.hilliard1@gmail.com> We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages. We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version. There are python3 patches available that apply to this version with minor modifications(to be added in a future patch). We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive. We need to add some new required dependencies to qt5webengine so that it will build. Signed-off-by: James Hilliard --- Changes v3 -> v4: - linker fixes Changes v2 -> v3: - add kconfig entries --- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 5 +- package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 23 + package/qt5/qt5webengine/Config.in | 3 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 39 +- 10 files changed, 2565 insertions(+), 2025 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/Config.in create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 143926b743..54e6f7d6a6 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium/Config.in" source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine-chromium/Config.in b/package/qt5/qt5webengine-chromium/Config.in new file mode 100644 index 0000000000..8ba9ad7135 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/Config.in @@ -0,0 +1,5 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5webengine source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM + bool + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 0000000000..ced431c9e9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 0000000000..103e27d889 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 0000000000..2b061815b5 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult +QT5WEBENGINE_CHROMIUM_INSTALL_TARGET = NO + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..aded684ce2 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). @@ -57,9 +58,11 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_QT5QUICKCONTROLS2 select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5BASE_EXAMPLES select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc deleted file mode 100644 index a5fdfdc1f1..0000000000 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ /dev/null @@ -1,1000 +0,0 @@ -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/cityhash/COPYING \ - src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ - src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ - src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ - src/3rdparty/chromium/third_party/dav1d/LICENSE \ - src/3rdparty/chromium/third_party/dawn/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/ink/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jacoco/LICENSE \ - src/3rdparty/chromium/third_party/javalang/LICENSE \ - src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ - src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ - src/3rdparty/chromium/third_party/libipp/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libxslt/src/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/lottie/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mako/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/nasm/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/perfetto/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/pffft/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/r8/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/rnnoise/COPYING \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/schema_org/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/six/src/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ - src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/test_fonts/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/turbine/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/unrar/LICENSE \ - src/3rdparty/chromium/third_party/unrar/src/license.txt \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ - src/3rdparty/chromium/third_party/weston/LICENSE \ - src/3rdparty/chromium/third_party/weston/src/COPYING \ - src/3rdparty/chromium/third_party/weston/src/data/COPYING \ - src/3rdparty/chromium/third_party/widevine/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ - src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ - src/3rdparty/gn/base/third_party/icu/LICENSE \ - src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb..1d2b70c4f6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..42f54cbbc6 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -5,18 +5,18 @@ ################################################################################ QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python + qt5declarative qt5webchannel host-bison host-flex host-freetype \ + host-gperf host-nodejs host-pkgconf host-python +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libxkbfile xlib_libXrandr xlib_libXtst endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss @@ -41,24 +41,17 @@ else QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa endif -# QtWebengine's build system uses python, but only supports python2. We work -# around this by forcing python2 early in the PATH, via a python->python2 -# symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -define QT5WEBENGINE_PYTHON2_SYMLINK - mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python -endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK - QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" -define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG - sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config - chmod +x $(@D)/host-bin/host-pkg-config +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST="$(HOST_DIR)/bin/pkgconf" \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS) $(HOST_LDFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -- 2.25.1 From yann.morin.1998 at free.fr Mon Jan 10 15:40:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 16:40:30 +0100 Subject: [Buildroot] [git commit] package/python-greenlet: enable as host package Message-ID: <20220110154005.68A7682B46@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb104bc0777926528e1e3a29bea7d32320ef2173 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While currently there is no in-tree Buildroot package which depends on host-python-greenlet, we (Adder Technology) have some proprietary modules that use it as part of their builds. I've tested python-greenlet as host package and confirmed that it builds and works correctly. Someone else might require it, so I'm proposing its inclusion. Signed-off-by: Cyril Bur Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/python-greenlet/Config.in.host | 7 +++++++ package/python-greenlet/python-greenlet.mk | 1 + 3 files changed, 9 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..6e027d96c2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,6 +69,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" + source "package/python-greenlet/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host new file mode 100644 index 0000000000..673fee8cc5 --- /dev/null +++ b/package/python-greenlet/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_GREENLET + bool "host python-greenlet" + help + Greenlets are lightweight coroutines for in-process concurrent + programming. + + https://greenlet.readthedocs.io/ diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 7b983ff0ef..3b1ef7e314 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF $(eval $(python-package)) +$(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Jan 10 15:49:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 16:49:54 +0100 Subject: [Buildroot] [PATCH v3] package/python-greenlet: enable as host package In-Reply-To: <20220110141140.77224ac0@camb691.localdomain> References: <20220110141140.77224ac0@camb691.localdomain> Message-ID: <20220110154954.GR1477939@scaer> Cyril, All, On 2022-01-10 14:11 +0000, Cyril Bur spake thusly: > While currently there is no in-tree Buildroot package which depends on > host-python-greenlet, we (Adder Technology) have some proprietary > modules that use it as part of their builds. > > I've tested python-greenlet as host package and confirmed that it builds > and works correctly. Someone else might require it, so I'm proposing its > inclusion. In all theory, host-python-greenlet should have the same dependencies toward the host that the target variant has toward the target: config BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS bool default y if BR2_arm || BR2_armeb default y if BR2_aarch64 default y if BR2_csky default y if BR2_m68k default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if BR2_riscv default y if BR2_sparc || BR2_sparc64 default y if BR2_i386 || BR2_x86_64 However, in practice, hosts that are commonly used to run Buildroot are virtually all in that list: x86 or x86_64, AArch64 (and maybe a very few arms just for the fun), PPC, and maybe a few adventurous on riscv. So in practice, we do not care. > Signed-off-by: Cyril Bur Applied to master, thanks. Regards, Yann E. MORIN. > --- > v2: Half completed commit message update - sorry > v3: Updated commit message and Config.in.host > > package/Config.in.host | 1 + > package/python-greenlet/Config.in.host | 7 +++++++ > package/python-greenlet/python-greenlet.mk | 1 + > 3 files changed, 9 insertions(+) > create mode 100644 package/python-greenlet/Config.in.host > > diff --git a/package/Config.in.host b/package/Config.in.host > index b3e00bb482..6e027d96c2 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -69,6 +69,7 @@ menu "Host utilities" > source "package/pwgen/Config.in.host" > source "package/python/Config.in.host" > source "package/python-cython/Config.in.host" > + source "package/python-greenlet/Config.in.host" > source "package/python-lxml/Config.in.host" > source "package/python-six/Config.in.host" > source "package/python-xlrd/Config.in.host" > diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host > new file mode 100644 > index 0000000000..673fee8cc5 > --- /dev/null > +++ b/package/python-greenlet/Config.in.host > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_HOST_PYTHON_GREENLET > + bool "host python-greenlet" > + help > + Greenlets are lightweight coroutines for in-process concurrent > + programming. > + > + https://greenlet.readthedocs.io/ > diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk > index 7b983ff0ef..3b1ef7e314 100644 > --- a/package/python-greenlet/python-greenlet.mk > +++ b/package/python-greenlet/python-greenlet.mk > @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.34.1 > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 10 15:58:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 16:58:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl8723bu: bump version to d34603a39a7c925d810fe17c6e8dea5063d43a33 In-Reply-To: <20220110151302.21093-1-mf@go-sys.de> References: <20220110151302.21093-1-mf@go-sys.de> Message-ID: <20220110155823.GS1477939@scaer> Michael, All, On 2022-01-10 16:13 +0100, Michael Fischer spake thusly: > patch 0001: Disable concurrrent mode. This causes disconnections. That patch is missing a commit log and a sign-off for itself: # ./utils/check-package package/rtl8723bu/0001-disable_concurent_mode.patch package/rtl8723bu/0001-disable_concurent_mode.patch:0: missing Signed-off-by in the header (http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches) But see below... > Signed-off-by: Michael Fischer > --- > package/rtl8723bu/0001-disable_concurent_mode.patch | 12 ++++++++++++ > package/rtl8723bu/rtl8723bu.hash | 2 +- > package/rtl8723bu/rtl8723bu.mk | 2 +- > 3 files changed, 14 insertions(+), 2 deletions(-) > create mode 100644 package/rtl8723bu/0001-disable_concurent_mode.patch > > diff --git a/package/rtl8723bu/0001-disable_concurent_mode.patch b/package/rtl8723bu/0001-disable_concurent_mode.patch > new file mode 100644 > index 0000000000..037b1642fc > --- /dev/null > +++ b/package/rtl8723bu/0001-disable_concurent_mode.patch > @@ -0,0 +1,12 @@ > +diff -purN a/Makefile b/Makefile > +--- a/Makefile 2021-11-04 20:36:55.000000000 +0100 > ++++ b/Makefile 2022-01-10 14:35:17.333934039 +0100 > +@@ -18,7 +18,7 @@ EXTRA_CFLAGS += -Wno-unused-label > + EXTRA_CFLAGS += -Wno-unused-parameter > + EXTRA_CFLAGS += -Wno-unused-function > + EXTRA_CFLAGS += -Wno-unused > +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE > ++#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE When patching out unused code, don't comment it; just remove it. Can you fix those two issues and resubmit, plese? Regards, Yann E. MORIN. > + ccflags-y += -D__CHECK_ENDIAN__ > + > diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash > index 04bc776a07..df990a8d63 100644 > --- a/package/rtl8723bu/rtl8723bu.hash > +++ b/package/rtl8723bu/rtl8723bu.hash > @@ -1,2 +1,2 @@ > # Locally computed > -sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz > +sha256 c9cde757941c88c6117560a2c350dc9c4382dcd6a313b1cae7c6e7eade7055bf rtl8723bu-d34603a39a7c925d810fe17c6e8dea5063d43a33.tar.gz > diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk > index c35fad5832..e73987cfeb 100644 > --- a/package/rtl8723bu/rtl8723bu.mk > +++ b/package/rtl8723bu/rtl8723bu.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 > +RTL8723BU_VERSION = d34603a39a7c925d810fe17c6e8dea5063d43a33 > RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) > RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) > > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 10 16:23:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 17:23:19 +0100 Subject: [Buildroot] [PATCH] support/download: drop support for the 'none' hash Message-ID: <20220110162319.294088-1-yann.morin.1998@free.fr> Commit 1ba85b7f874d (support/download: add explicit no-hash support) introduced the 'none' hash type, in an attempt to make hash files mandatory, but not failing on archives localy generated, like those for git or svn repositories, especially for those packages where a version choice was present, which would allow for either remote archives for which we'd have a hash or VCS trees for which we could not have a hash for the localy generated archive. Indeed, back in the time, we did not have a mean to generate reproducible archives, so having a hash file without a hash for thosel ocally generated archives would trigger an error in the hash0-checking machinery. But now, low-and-behold, we do know how to generate those archives, and we have a mechanism to explicitly exclude some archives from being hash-checked (e.g. when the verison string itself can be user-provided). As such, the 'none' hash type no longer has any raison d'?tre, we do not use it in-tree, and its use in a br2-external tree is most probably inexistent (as is the use of hash files alotgether most probably). So we simply drop the support for that. Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-directory.txt | 9 +-------- support/download/check-hash | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 4ceb3fd772..6c68d7aa67 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -464,9 +464,8 @@ The format of this file is one line for each file for which to check the hash, each line with the following three fields separated by two spaces: * the type of hash, one of: -** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+, +none+ +** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+ * the hash of the file: -** for +none+, one or more non-space chars, usually just the string +xxx+ ** for +md5+, 32 hexadecimal characters ** for +sha1+, 40 hexadecimal characters ** for +sha224+, 56 hexadecimal characters @@ -500,9 +499,6 @@ target run. For a package with multiple versions (like Qt5), create the hash file in a subdirectory ++ of that package (see also xref:patch-apply-order[]). -The +none+ hash type is reserved to those archives downloaded from a -repository, like a 'git clone', a 'subversion checkout'... - The example below defines a +sha1+ and a +sha256+ published by upstream for the main +libfoo-1.2.3.tar.bz2+ tarball, an +md5+ from upstream and a locally-computed +sha256+ hashes for a binary blob, a +sha256+ for a @@ -520,9 +516,6 @@ sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo # Locally computed: sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch -# No hash for 1234: -none xxx libfoo-1234.tar.gz - # Hash for license files: sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL diff --git a/support/download/check-hash b/support/download/check-hash index fe9c10570e..5a47f49bc3 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -53,11 +53,7 @@ check_one_hash() { # Note: md5 is supported, but undocumented on purpose. # Note: sha3 is not supported, since there is currently no implementation # (the NIST has yet to publish the parameters). - # Note: 'none' means there is explicitly no hash for that file. case "${_h}" in - none) - return 0 - ;; md5|sha1) ;; sha224|sha256|sha384|sha512) ;; *) # Unknown hash, exit with error -- 2.25.1 From baruch at tkos.co.il Mon Jan 10 16:35:55 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 10 Jan 2022 18:35:55 +0200 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats In-Reply-To: <20220110131624.3639727-1-arnout@mind.be> References: <20220110131624.3639727-1-arnout@mind.be> Message-ID: <871r1fy2ca.fsf@tarshish> Hi Arnout, On Mon, Jan 10 2022, Arnout Vandecappelle (Essensium/Mind) wrote: > Bumping the version of systemd is a little more complicated than the > usual package, and it's easy to forget some of the things that need to > be done - and this has happened several times in the past. > > Add a checklist of things to worry about when updating systemd. > > Note that there are many other complicated packages that also need a lot > of attention when upgrading. However, systemd is a really critical > package so it's more important that we get that one right than, say, > valgrind. > > Cc: Norbert Lange > Cc: J?r?my ROSEN > Cc: Adam Duskett > Cc: James Hilliard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/systemd/systemd.mk | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 3811dbae42..4d82d2ab81 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -4,6 +4,18 @@ > # > ################################################################################ > > +# When updating systemd, take care of the following: > +# - Check if the requirements have changed (see README), in particular > +# arch and headers > +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD > +# - If the required kernel options have changed, update the Config.in > +# help text and the list of KCONFIG_ENABLE_OPT. > +# - Check if there are new meson_options. Make sure all options are set > +# explicitly (usually to default value). > +# - If there are new services: > +# - create new options for them (if they really are optional); > +# - create a new _USER if necessary; > +# - create new directionry (with _PERMISSIONS) if necessary. s/directionry/directory/ baruch > SYSTEMD_VERSION = 250.1 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From nolange79 at gmail.com Mon Jan 10 17:25:21 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Mon, 10 Jan 2022 18:25:21 +0100 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats In-Reply-To: <20220110131624.3639727-1-arnout@mind.be> References: <20220110131624.3639727-1-arnout@mind.be> Message-ID: Hello, Am Mo., 10. Jan. 2022 um 14:16 Uhr schrieb Arnout Vandecappelle (Essensium/Mind) : > > Bumping the version of systemd is a little more complicated than the > usual package, and it's easy to forget some of the things that need to > be done - and this has happened several times in the past. > > Add a checklist of things to worry about when updating systemd. > > Note that there are many other complicated packages that also need a lot > of attention when upgrading. However, systemd is a really critical > package so it's more important that we get that one right than, say, > valgrind. > > Cc: Norbert Lange > Cc: J?r?my ROSEN > Cc: Adam Duskett > Cc: James Hilliard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/systemd/systemd.mk | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 3811dbae42..4d82d2ab81 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -4,6 +4,18 @@ > # > ################################################################################ > > +# When updating systemd, take care of the following: > +# - Check if the requirements have changed (see README), in particular > +# arch and headers > +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD > +# - If the required kernel options have changed, update the Config.in > +# help text and the list of KCONFIG_ENABLE_OPT. > +# - Check if there are new meson_options. Make sure all options are set > +# explicitly (usually to default value). > +# - If there are new services: > +# - create new options for them (if they really are optional); > +# - create a new _USER if necessary; > +# - create new directionry (with _PERMISSIONS) if necessary. > SYSTEMD_VERSION = 250.1 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > -- > 2.31.1 > I wouldd add these: # - diff sysusers.d with the previous version # - diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) and, somewhat more cynical: # - dont bother with x.0 versions Norbert From fontaine.fabrice at gmail.com Mon Jan 10 17:35:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 18:35:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: needs wchar Message-ID: <20220110173542.1748804-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: In file included from seckey.h:11, from 3way.h:10, from 3way.cpp:5: misc.h:1528:6: error: 'wstring' in namespace 'std' does not name a type 1528 | std::wstring StringWiden(const char *str, bool throwOnError = true); | ^~~~~~~ In file included from seckey.h:11, from 3way.h:10, from 3way.cpp:5: misc.h:14:1: note: 'std::wstring' is defined in header ''; did you forget to '#include '? 13 | #include "smartptr.h" +++ |+#include 14 | #include "stdcpp.h" Fixes: - http://autobuild.buildroot.org/results/174fe03da7a40dd152703de93af6a213d9cac698 Signed-off-by: Fabrice Fontaine --- package/cryptopp/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index 4ead5339ab..feb945db2f 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_CRYPTOPP bool "cryptopp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR help A free C++ class library of cryptographic schemes -comment "cryptopp needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "cryptopp needs a toolchain w/ dynamic library, wchar" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 10 17:36:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 18:36:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: disable neon if needed Message-ID: <20220110173640.1748895-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: In file included from aria_simd.cpp:18:0: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/lib/gcc/arm-none-linux-gnueabi/4.8.3/include/arm_neon.h:32:2: error: #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h ^ Fixes: - http://autobuild.buildroot.org/results/e4fd947c118174a4fad62cbed18816f02d39ec25 Signed-off-by: Fabrice Fontaine --- package/cryptopp/cryptopp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 5e6eb9644d..4353e35e0a 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -47,6 +47,10 @@ ifneq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),y) CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_AVX2 endif +ifneq ($(BR2_ARM_CPU_HAS_NEON),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON +endif + CRYPTOPP_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ CXXFLAGS="$(CRYPTOPP_CXXFLAGS)" -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 10 17:44:11 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 18:44:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: fix build with gcc 4.8 Message-ID: <20220110174411.1761440-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c: In function 'mpi_select': /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: error: 'for' loop initial declarations are only allowed in C99 mode for( size_t i = 0; i < T_size; i++ ) ^ /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: - http://autobuild.buildroot.org/results/56ac0a8726d09eed8f45f865934fa7781a0e667a Signed-off-by: Fabrice Fontaine --- package/mbedtls/mbedtls.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 5facb99b2a..8745ff33f4 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -7,6 +7,7 @@ MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF -- 2.34.1 From yegorslists at googlemail.com Mon Jan 10 17:59:55 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 10 Jan 2022 18:59:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/avrdude: add support for Linux sysfs GPIO interface In-Reply-To: <20220110140450.GO1477939@scaer> References: <20220110085850.11095-1-yegorslists@googlemail.com> <20220110085850.11095-2-yegorslists@googlemail.com> <20220110140450.GO1477939@scaer> Message-ID: Hi Yann, all, On Mon, Jan 10, 2022 at 3:04 PM Yann E. MORIN wrote: > > Yegor, All, > > On 2022-01-10 09:58 +0100, yegorslists--- via buildroot spake thusly: > > From: Yegor Yefremov > > > > Signed-off-by: Yegor Yefremov > > --- > > package/avrdude/Config.in | 3 +++ > > package/avrdude/avrdude.mk | 6 ++++++ > > 2 files changed, 9 insertions(+) > > > > diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in > > index 89558a5ff5..57a8df66ea 100644 > > --- a/package/avrdude/Config.in > > +++ b/package/avrdude/Config.in > > @@ -17,6 +17,9 @@ config BR2_PACKAGE_AVRDUDE > > > > if BR2_PACKAGE_AVRDUDE > > > > +config BR2_PACKAGE_AVRDUDE_LINUXGPIO > > + bool "Linux sysfs GPIO interface support" > > + > > config BR2_PACKAGE_AVRDUDE_SPI > > bool "SPI support" > > default y # Backward compatibility > > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > > index accd92c1d5..3ccba80d8e 100644 > > --- a/package/avrdude/avrdude.mk > > +++ b/package/avrdude/avrdude.mk > > @@ -16,6 +16,12 @@ AVRDUDE_CONF_OPTS = --enable-linuxgpio > > AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ > > host-flex host-bison > > > > +ifeq ($(BR2_PACKAGE_AVRDUDE_LINUXGPIO),y) > > +AVRDUDE_CONF_OPTS += --enable-linuxgpio > > +else > > +AVRDUDE_CONF_OPTS += --disable-linuxgpio > > +endif > > We already have an unconditional activation of those: > > https://github.com/buildroot/buildroot/blob/master/package/avrdude/avrdude.mk#L15 > > (which you can btw. incidentally also notice as part the hunk header). My bad. I have just overlooked this setting. You can drop the patch. Regards, Yegor > So, if the intention was to be able to enable linux-gpio, then this is a > noop as they are already enabled. If the intention was to be able to > disable them, then the unconditional enable should be dropped. > > But then, does it make sense to be able to disable linux GPIO? > > And what if both SPI and GPIO are disabled? > > Regards, > Yann E. MORIN. > > > ifeq ($(BR2_PACKAGE_AVRDUDE_SPI),y) > > AVRDUDE_CONF_OPTS += --enable-linuxspi > > else > > -- > > 2.17.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From buildroot at heine.tech Mon Jan 10 18:51:40 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 10 Jan 2022 19:51:40 +0100 Subject: [Buildroot] [PATCH v5] package/networkd-dispatcher: new package Message-ID: <20220110185147.84697-1-buildroot@heine.tech> From: Michael Nosthoff via buildroot Networkd-dispatcher is a dispatcher daemon for systemd-networkd connection status changes. This daemon is similar to NetworkManager-dispatcher, but is much more limited in the types of events it supports due to the limited nature of systemd-networkd. Signed-off-by: Michael Nosthoff --- Changes v1 -> v2 - add .hash file - use tabs for DEVELOPERS indentation v2 -> v3 - bump version to 2.1 (fixes an issue with systemd 246) - resolve merge conflict in DEVELOPERS v3 -> v4 - adjust to changed dependencies of python-gobject - removed dependencies already covered by depends on BR2_PACKAGE_DBUS - sorted dependencies - resolve merge conflict in DEVELOPERS v4 -> v5 - update dependencies of gobject-introspection --- DEVELOPERS | 1 + package/Config.in | 1 + package/networkd-dispatcher/Config.in | 21 ++++++++++++++++ .../networkd-dispatcher.hash | 3 +++ .../networkd-dispatcher.mk | 25 +++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 package/networkd-dispatcher/Config.in create mode 100644 package/networkd-dispatcher/networkd-dispatcher.hash create mode 100644 package/networkd-dispatcher/networkd-dispatcher.mk diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..4b65d219c9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1991,6 +1991,7 @@ N: Michael Nosthoff F: package/grpc/ F: package/gtest/ F: package/libabseil-cpp/ +F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..23264afd9d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2294,6 +2294,7 @@ endif source "package/netstat-nat/Config.in" source "package/network-manager/Config.in" source "package/network-manager-openvpn/Config.in" + source "package/networkd-dispatcher/Config.in" source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in new file mode 100644 index 0000000000..1dfa12ba45 --- /dev/null +++ b/package/networkd-dispatcher/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_NETWORKD_DISPATCHER + bool "networkd-dispatcher" + depends on BR2_USE_WCHAR # dbus-python -> glib2 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python -> glib2 + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_DBUS # dbus-python + depends on BR2_PACKAGE_PYTHON3 # runtime, python-gobject + depends on BR2_PACKAGE_SYSTEMD_NETWORKD # runtime + select BR2_PACKAGE_DBUS_PYTHON + select BR2_PACKAGE_PYTHON_GOBJECT + help + Networkd-dispatcher is a dispatcher daemon for + systemd-networkd connection status changes. + This daemon is similar to NetworkManager-dispatcher, + but is much more limited in the types of events it + supports due to the limited nature of systemd-networkd. + + https://gitlab.com/craftyguy/networkd-dispatcher diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash new file mode 100644 index 0000000000..ca7c300783 --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk new file mode 100644 index 0000000000..4f609db73a --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# networkd-dispatcher +# +################################################################################ + +NETWORKD_DISPATCHER_VERSION = 2.1 +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE + +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d +endef + +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf +endef + +$(eval $(generic-package)) -- 2.25.1 From buildroot at heine.tech Mon Jan 10 18:51:40 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 10 Jan 2022 19:51:40 +0100 Subject: [Buildroot] [PATCH v5] package/networkd-dispatcher: new package Message-ID: <20220110185147.84697-1-buildroot@heine.tech> From: Michael Nosthoff via buildroot Networkd-dispatcher is a dispatcher daemon for systemd-networkd connection status changes. This daemon is similar to NetworkManager-dispatcher, but is much more limited in the types of events it supports due to the limited nature of systemd-networkd. Signed-off-by: Michael Nosthoff --- Changes v1 -> v2 - add .hash file - use tabs for DEVELOPERS indentation v2 -> v3 - bump version to 2.1 (fixes an issue with systemd 246) - resolve merge conflict in DEVELOPERS v3 -> v4 - adjust to changed dependencies of python-gobject - removed dependencies already covered by depends on BR2_PACKAGE_DBUS - sorted dependencies - resolve merge conflict in DEVELOPERS v4 -> v5 - update dependencies of gobject-introspection --- DEVELOPERS | 1 + package/Config.in | 1 + package/networkd-dispatcher/Config.in | 21 ++++++++++++++++ .../networkd-dispatcher.hash | 3 +++ .../networkd-dispatcher.mk | 25 +++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 package/networkd-dispatcher/Config.in create mode 100644 package/networkd-dispatcher/networkd-dispatcher.hash create mode 100644 package/networkd-dispatcher/networkd-dispatcher.mk diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..4b65d219c9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1991,6 +1991,7 @@ N: Michael Nosthoff F: package/grpc/ F: package/gtest/ F: package/libabseil-cpp/ +F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..23264afd9d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2294,6 +2294,7 @@ endif source "package/netstat-nat/Config.in" source "package/network-manager/Config.in" source "package/network-manager-openvpn/Config.in" + source "package/networkd-dispatcher/Config.in" source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in new file mode 100644 index 0000000000..1dfa12ba45 --- /dev/null +++ b/package/networkd-dispatcher/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_NETWORKD_DISPATCHER + bool "networkd-dispatcher" + depends on BR2_USE_WCHAR # dbus-python -> glib2 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python -> glib2 + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_DBUS # dbus-python + depends on BR2_PACKAGE_PYTHON3 # runtime, python-gobject + depends on BR2_PACKAGE_SYSTEMD_NETWORKD # runtime + select BR2_PACKAGE_DBUS_PYTHON + select BR2_PACKAGE_PYTHON_GOBJECT + help + Networkd-dispatcher is a dispatcher daemon for + systemd-networkd connection status changes. + This daemon is similar to NetworkManager-dispatcher, + but is much more limited in the types of events it + supports due to the limited nature of systemd-networkd. + + https://gitlab.com/craftyguy/networkd-dispatcher diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash new file mode 100644 index 0000000000..ca7c300783 --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk new file mode 100644 index 0000000000..4f609db73a --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# networkd-dispatcher +# +################################################################################ + +NETWORKD_DISPATCHER_VERSION = 2.1 +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE + +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d +endef + +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf +endef + +$(eval $(generic-package)) -- 2.25.1 From festevam at gmail.com Mon Jan 10 19:44:39 2022 From: festevam at gmail.com (Fabio Estevam) Date: Mon, 10 Jan 2022 16:44:39 -0300 Subject: [Buildroot] [PATCH] boot/uboot: bump to version 2022.01 Message-ID: <20220110194439.1809166-1-festevam@gmail.com> Signed-off-by: Fabio Estevam --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index bffb7cfb19b9..c630fc655291 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2021.10" + bool "2022.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2021.10" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 68259f69f26e..9171a794a168 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4 u-boot-2021.10.tar.bz2 +sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.25.1 From fperrad at gmail.com Mon Jan 10 19:51:31 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 10 Jan 2022 20:51:31 +0100 Subject: [Buildroot] [PATCH] configs/mx6cubox: bump Linux and U-Boot versions Message-ID: <20220110195131.78165-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- configs/mx6cubox_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index e80d99552..6ea4f6e41 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -6,8 +6,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y # Toolchain -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.70" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" @@ -32,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -- 2.32.0 From ju.o at free.fr Mon Jan 10 20:01:51 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 10 Jan 2022 21:01:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package Message-ID: <20220110200151.830192-1-ju.o@free.fr> A wrapper for the Gnu Privacy Guard (GPG or GnuPG). The gnupg module allows Python programs to make use of the functionality provided by the GNU Privacy Guard (abbreviated GPG or GnuPG). Using this module, Python programs can encrypt and decrypt data, digitally sign documents and verify digital signatures, manage (generate, list and delete) encryption keys, using Public Key Infrastructure (PKI) encryption technology based on OpenPGP. https://docs.red-dove.com/python-gnupg/ Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-gnupg/Config.in | 15 +++++++++++++++ package/python-gnupg/python-gnupg.hash | 5 +++++ package/python-gnupg/python-gnupg.mk | 13 +++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/python-gnupg/Config.in create mode 100644 package/python-gnupg/python-gnupg.hash create mode 100644 package/python-gnupg/python-gnupg.mk diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..036e752d84 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1595,6 +1595,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ F: package/python-distro/ +F: package/python-gnupg/ F: package/python-pyalsa/ N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..af09209905 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1038,6 +1038,7 @@ menu "External python modules" source "package/python-futures/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" + source "package/python-gnupg/Config.in" source "package/python-gobject/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in new file mode 100644 index 0000000000..54f8fb6a29 --- /dev/null +++ b/package/python-gnupg/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_GNUPG + bool "python-gnupg" + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime + help + A wrapper for the Gnu Privacy Guard (GPG or GnuPG). + + The gnupg module allows Python programs to make use of the + functionality provided by the GNU Privacy Guard (abbreviated + GPG or GnuPG). Using this module, Python programs can + encrypt and decrypt data, digitally sign documents and + verify digital signatures, manage (generate, list and + delete) encryption keys, using Public Key Infrastructure + (PKI) encryption technology based on OpenPGP. + + https://docs.red-dove.com/python-gnupg/ diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash new file mode 100644 index 0000000000..fa0e8ae6e5 --- /dev/null +++ b/package/python-gnupg/python-gnupg.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-gnupg/json +md5 02c5d77b8db9dfba0741627560d89bd5 python-gnupg-0.4.8.tar.gz +sha256 b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7 python-gnupg-0.4.8.tar.gz +# Locally computed sha256 checksums +sha256 9620da3d3afdfca7dea53c4375c1507ab2d3a4af4e706827023acb49a9ec4a5e LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk new file mode 100644 index 0000000000..f16910e517 --- /dev/null +++ b/package/python-gnupg/python-gnupg.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-gnupg +# +################################################################################ + +PYTHON_GNUPG_VERSION = 0.4.8 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 +PYTHON_GNUPG_LICENSE = BSD-3-Clause +PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt +PYTHON_GNUPG_SETUP_TYPE = setuptools + +$(eval $(python-package)) -- 2.34.1 From festevam at gmail.com Mon Jan 10 20:18:10 2022 From: festevam at gmail.com (Fabio Estevam) Date: Mon, 10 Jan 2022 17:18:10 -0300 Subject: [Buildroot] [PATCH] configs/mx6sx_udoo: Bump U-Boot and kernel Message-ID: <20220110201810.2277642-1-festevam@gmail.com> Bump U-Boot to 2022.01 and kernel to 5.15.13. After the conversion to U-Boot device model, the SD card is device '1', so change the boot script accordingly. Signed-off-by: Fabio Estevam --- board/udoo/common/boot.scr.txt | 6 +++--- configs/mx6sx_udoo_neo_defconfig | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/udoo/common/boot.scr.txt b/board/udoo/common/boot.scr.txt index 7acceed0fb29..7a7d756c3c71 100644 --- a/board/udoo/common/boot.scr.txt +++ b/board/udoo/common/boot.scr.txt @@ -1,7 +1,7 @@ -setenv finduuid "part uuid mmc 0:1 uuid" +setenv finduuid "part uuid mmc 1:1 uuid" run finduuid run findfdt setenv bootargs "console=${console} root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage +load mmc 1:1 ${fdt_addr} boot/${fdtfile} +load mmc 1:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdt_addr} diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 2bdcade25296..3e1dc33bd4ba 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y @@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" -- 2.25.1 From clg at kaod.org Mon Jan 10 20:58:42 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 21:58:42 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration Message-ID: <20220110205844.815899-1-clg@kaod.org> PowerNV is the platform using the OPAL [1] firmware on OpenPOWER systems. OPAL first loads a kernel and an initramfs image based on buildroot including a second boot loader petitboot [2]. The latter does device discovery and kexecs a new Linux image from disk or network. QEMU implements PowerNV machines [3] for the POWER8, POWER9 and Power10 processors which are used for dev and tests. POWER8 images being compatible with POWER9 and Power10, simply add a single qemu_ppc64le_powernv8 board for all. The QEMU script boots directly from a nvme disk because it is simple enough but a real system would boot from a ramfs first. [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst [2] https://github.com/open-power/petitboot/ [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html Signed-off-by: C?dric Le Goater --- board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 board/qemu/ppc64le-powernv8/readme.txt create mode 100644 configs/qemu_ppc64le_powernv8_defconfig diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt new file mode 100644 index 000000000000..059f55fbc917 --- /dev/null +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig + +The login prompt will appear in the terminal window. diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig new file mode 100644 index 000000000000..d8ea6655fce0 --- /dev/null +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -0,0 +1,29 @@ +# Architecture +BR2_powerpc64le=y +BR2_powerpc_power8=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="hvc0" +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="powernv" +BR2_LINUX_KERNEL_VMLINUX=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.31.1 From clg at kaod.org Mon Jan 10 20:58:44 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 21:58:44 +0100 Subject: [Buildroot] [PATCH 3/3] package/qemu: Add support for PPC970 processors In-Reply-To: <20220110205844.815899-1-clg@kaod.org> References: <20220110205844.815899-1-clg@kaod.org> Message-ID: <20220110205844.815899-3-clg@kaod.org> PPC970 processors are well supported by the QEMU pseries and macbook machines. The latest debian 11 (big endian) runs with SMP. Re-add support. Fixes: efc67deef38c ("qemu: remove support for some PowerPC processors in host qemu") Signed-off-by: C?dric Le Goater --- package/qemu/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index df5d92112582..f9cdb9b70371 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -22,7 +22,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_xtensa default y if BR2_x86_64 depends on !BR2_x86_steamroller && !BR2_x86_core_avx2 - depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 + depends on !BR2_powerpc_620 && !BR2_powerpc_630 config BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS bool -- 2.31.1 From clg at kaod.org Mon Jan 10 21:04:02 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Mon, 10 Jan 2022 22:04:02 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration In-Reply-To: <20220110210235.817082-1-clg@kaod.org> References: <20220110210235.817082-1-clg@kaod.org> Message-ID: oops. I sent the patchset twice. Sorry for the noise. C. On 1/10/22 22:02, C?dric Le Goater wrote: > PowerNV is the platform using the OPAL [1] firmware on OpenPOWER > systems. OPAL first loads a kernel and an initramfs image based on > buildroot including a second boot loader petitboot [2]. The latter > does device discovery and kexecs a new Linux image from disk or > network. > > QEMU implements PowerNV machines [3] for the POWER8, POWER9 and > Power10 processors which are used for dev and tests. POWER8 images > being compatible with POWER9 and Power10, simply add a single > qemu_ppc64le_powernv8 board for all. > > The QEMU script boots directly from a nvme disk because it is simple > enough but a real system would boot from a ramfs first. > > [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst > [2] https://github.com/open-power/petitboot/ > [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html > > Signed-off-by: C?dric Le Goater > --- > board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ > configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++ > 2 files changed, 34 insertions(+) > create mode 100644 board/qemu/ppc64le-powernv8/readme.txt > create mode 100644 configs/qemu_ppc64le_powernv8_defconfig > > diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt > new file mode 100644 > index 000000000000..059f55fbc917 > --- /dev/null > +++ b/board/qemu/ppc64le-powernv8/readme.txt > @@ -0,0 +1,5 @@ > +Run the emulation with: > + > +qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig > + > +The login prompt will appear in the terminal window. > diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig > new file mode 100644 > index 000000000000..d8ea6655fce0 > --- /dev/null > +++ b/configs/qemu_ppc64le_powernv8_defconfig > @@ -0,0 +1,29 @@ > +# Architecture > +BR2_powerpc64le=y > +BR2_powerpc_power8=y > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="hvc0" > +BR2_SYSTEM_DHCP="eth0" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +# BR2_TARGET_ROOTFS_TAR is not set > + > +# Image > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > + > +# Linux headers same as kernel > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > +BR2_LINUX_KERNEL_DEFCONFIG="powernv" > +BR2_LINUX_KERNEL_VMLINUX=y > + > +# host-qemu for gitlab testing > +BR2_PACKAGE_HOST_QEMU=y > +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y > From clg at kaod.org Mon Jan 10 21:02:33 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 22:02:33 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration Message-ID: <20220110210235.817082-1-clg@kaod.org> PowerNV is the platform using the OPAL [1] firmware on OpenPOWER systems. OPAL first loads a kernel and an initramfs image based on buildroot including a second boot loader petitboot [2]. The latter does device discovery and kexecs a new Linux image from disk or network. QEMU implements PowerNV machines [3] for the POWER8, POWER9 and Power10 processors which are used for dev and tests. POWER8 images being compatible with POWER9 and Power10, simply add a single qemu_ppc64le_powernv8 board for all. The QEMU script boots directly from a nvme disk because it is simple enough but a real system would boot from a ramfs first. [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst [2] https://github.com/open-power/petitboot/ [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html Signed-off-by: C?dric Le Goater --- board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 board/qemu/ppc64le-powernv8/readme.txt create mode 100644 configs/qemu_ppc64le_powernv8_defconfig diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt new file mode 100644 index 000000000000..059f55fbc917 --- /dev/null +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig + +The login prompt will appear in the terminal window. diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig new file mode 100644 index 000000000000..d8ea6655fce0 --- /dev/null +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -0,0 +1,29 @@ +# Architecture +BR2_powerpc64le=y +BR2_powerpc_power8=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="hvc0" +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="powernv" +BR2_LINUX_KERNEL_VMLINUX=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.31.1 From james.hilliard1 at gmail.com Mon Jan 10 21:13:23 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 14:13:23 -0700 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 Message-ID: <20220110211323.1828141-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 02d8900003..c9be54be05 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.60.3/meson-0.60.3.tar.gz.asc -sha256 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e meson-0.60.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz.asc +sha256 ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c meson-0.61.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e8443eacba..e63dc725bf 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.60.3 +MESON_VERSION = 0.61.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From clg at kaod.org Mon Jan 10 20:58:43 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 21:58:43 +0100 Subject: [Buildroot] [PATCH 2/3] configs/qemu: Add a ppc-bamboo configuration In-Reply-To: <20220110205844.815899-1-clg@kaod.org> References: <20220110205844.815899-1-clg@kaod.org> Message-ID: <20220110205844.815899-2-clg@kaod.org> The Bamboo board is an evaluation board for PowerPC 440EP CPUs. Signed-off-by: C?dric Le Goater --- board/qemu/ppc-bamboo/linux.fragment | 6 +++++ board/qemu/ppc-bamboo/readme.txt | 5 ++++ configs/qemu_ppc_bamboo_defconfig | 36 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 board/qemu/ppc-bamboo/linux.fragment create mode 100644 board/qemu/ppc-bamboo/readme.txt create mode 100644 configs/qemu_ppc_bamboo_defconfig diff --git a/board/qemu/ppc-bamboo/linux.fragment b/board/qemu/ppc-bamboo/linux.fragment new file mode 100644 index 000000000000..cc272d0541f0 --- /dev/null +++ b/board/qemu/ppc-bamboo/linux.fragment @@ -0,0 +1,6 @@ +# Enable virtio (blk, rng and net devices) +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_NET=y diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt new file mode 100644 index 000000000000..0b70d2fa5443 --- /dev/null +++ b/board/qemu/ppc-bamboo/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc -nographic -M bamboo -kernel vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig + +The login prompt will appear in the terminal that started Qemu. diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig new file mode 100644 index 000000000000..d6abbeb45296 --- /dev/null +++ b/configs/qemu_ppc_bamboo_defconfig @@ -0,0 +1,36 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_440fp=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" +BR2_LINUX_KERNEL_VMLINUX=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.31.1 From ps.report at gmx.net Mon Jan 10 21:39:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 22:39:00 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/ell: bump version to 0.47 Message-ID: <20220110213901.13597-1-ps.report@gmx.net> - Changelog (since 0.46, from [1]): ver 0.47: Fix issue with memory leaking from DHCP leases. Fix issue with NULL terminating of Base64 encoding. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 20b568dde4..cd724eae2d 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 f4fc647eff32f622e21f8851ed0c8b7270f4800149c91be601754e22d82cbb4d ell-0.46.tar.xz +sha256 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 4fad6e8d1b..3ce64b6f2f 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.46 +ELL_VERSION = 0.47 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Mon Jan 10 21:39:01 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 22:39:01 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/iwd: bump version to 1.21 In-Reply-To: <20220110213901.13597-1-ps.report@gmx.net> References: <20220110213901.13597-1-ps.report@gmx.net> Message-ID: <20220110213901.13597-2-ps.report@gmx.net> - add 0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch - Changelog (since 1.20, from [1]): ver 1.21: Fix issue with handling disconnect events issued by AP. Add experimental support for DPP feature. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer --- ...-declaration-of-function-explicit_bz.patch | 39 +++++++++++++++++++ package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch new file mode 100644 index 0000000000..fc1e67fe9c --- /dev/null +++ b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch @@ -0,0 +1,39 @@ +From 6805884743645d8d16186dbb0de7d9cd50cfd9a5 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 10 Jan 2022 22:20:53 +0100 +Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero + warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- add missing src/missing.h include for explicit_bzero, fixes uclibc + compile/linking + +Fixes: + + src/dpp.c:166:2: warning: implicit declaration of function ?explicit_bzero? [-Wimplicit-function-declaration] + 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); + | ^~~~~~~~~~~~~~ + +[Upstream: https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/HXV2B7L3RXDIFMKFZTI72TKZRK2IMUPP] +Signed-off-by: Peter Seiderer +--- + src/dpp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dpp.c b/src/dpp.c +index 84e89f6c..8091ded1 100644 +--- a/src/dpp.c ++++ b/src/dpp.c +@@ -30,6 +30,7 @@ + + #include "linux/nl80211.h" + ++#include "src/missing.h" + #include "src/dbus.h" + #include "src/netdev.h" + #include "src/module.h" +-- +2.34.1 + diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 58224170e6..8e34d2983f 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz +sha256 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 42f176b05b..a70da86ecc 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.20 +IWD_VERSION = 1.21 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Mon Jan 10 21:43:56 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 22:43:56 +0100 Subject: [Buildroot] [PATCH v1] package/linux-firmware: bump version to 20211216 Message-ID: <20220110214356.14562-1-ps.report@gmx.net> - update hash of WHENCE file Signed-off-by: Peter Seiderer --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 4c73374138..83275ec6d7 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 2fb22a5d7d23bf1f5800ab8152b39a00a445fbf4923de5a01b59d3f6253f0a9f linux-firmware-20210919.tar.xz +sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 a06edfd3649df6b0cbac8304d6d53f661963381f1231fd02da259806763d4162 WHENCE +sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b 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 ac45bc8282..2d103df05c 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20210919 +LINUX_FIRMWARE_VERSION = 20211216 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -- 2.34.1 From ps.report at gmx.net Mon Jan 10 22:05:15 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 23:05:15 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.1.6 Message-ID: <20220110220515.10921-1-ps.report@gmx.net> For details see [1]. [1] https://github.com/assimp/assimp/releases/tag/v5.1.6 Signed-off-by: Peter Seiderer --- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 8f6d613bb4..50f0b3e6d6 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz +sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index b5f84ef56f..766b2c9b5a 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.5 +ASSIMP_VERSION = 5.1.6 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE -- 2.34.1 From yann.morin.1998 at free.fr Mon Jan 10 22:10:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 23:10:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: <20211231202620.3521230-1-james.hilliard1@gmail.com> References: <20211231202620.3521230-1-james.hilliard1@gmail.com> Message-ID: <20220110221051.GT1477939@scaer> James, All, On 2021-12-31 13:26 -0700, James Hilliard spake thusly: > The zynq-boot-bin.py script is no longer maintained upstream, so move > it to support/scripts/zynq-boot-bin.py and port to python3. > > The python3 version produces the same output as the original python2 > version. So, zynq-boot-bin.py has disapeared in upstream repository [0] somewhere between v2015.4 and v2016.1 (they are mreging branches here and there, and git-bisect gets lost and finds spurious bad commits... meh...) Use of zynq-boot-bin.py in Buildroot is guarded by BR2_TARGET_UBOOT_ZYNQ_IMAGE and none of our defconfigs, not even any of our 5 zynq defconfigs. In 2016, with commit 6b669b61a84f (zynq_microzed: bump U-Boot to xilinx-v2016.2), we eventually got rid of the latest defconfig that used BR2_TARGET_UBOOT_ZYNQ_IMAGE. What's more, in commit 6dd5a33c485c (zynq_zed: bump U-Boot to xilinx-v2016.2), Masahiro stated: - Replace BR2_TARGET_UBOOT_ZYNQ_IMAGE with BR2_TARGET_UBOOT_SPL_NAME since U-Boot can natively generate the Zynq boot image now. The Zynq image support for mkimage tool was upstreamed at v2016.01 (so xilinx-v2016.1 as well), so no additional tool is needed any more. So I wonder if it even makes sense to keep package/zynq-boot-bin now. [0] https://github.com/Xilinx/u-boot-xlnx Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > boot/uboot/uboot.mk | 6 +- > package/zynq-boot-bin/zynq-boot-bin.hash | 2 - > package/zynq-boot-bin/zynq-boot-bin.mk | 22 --- > support/scripts/zynq-boot-bin.py | 230 +++++++++++++++++++++++ > 4 files changed, 233 insertions(+), 27 deletions(-) > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk > create mode 100755 support/scripts/zynq-boot-bin.py > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 574fc7089a..9ff2ccda68 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -434,12 +434,12 @@ endif > > ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y) > define UBOOT_GENERATE_ZYNQ_IMAGE > - $(HOST_DIR)/bin/python2 \ > - $(HOST_DIR)/bin/zynq-boot-bin.py \ > + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \ > + $(TOPDIR)/support/scripts/zynq-boot-bin.py \ > -u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \ > -o $(BINARIES_DIR)/BOOT.BIN > endef > -UBOOT_DEPENDENCIES += host-zynq-boot-bin > +UBOOT_DEPENDENCIES += host-python3 > UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE > endif > > diff --git a/package/zynq-boot-bin/zynq-boot-bin.hash b/package/zynq-boot-bin/zynq-boot-bin.hash > deleted file mode 100644 > index 0bc23de197..0000000000 > --- a/package/zynq-boot-bin/zynq-boot-bin.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# From https://raw.githubusercontent.com/Xilinx/u-boot-xlnx > -sha1 940331ee02b0007099effa61e382fe7ea4174054 zynq-boot-bin.py > diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk > deleted file mode 100644 > index deba5f4096..0000000000 > --- a/package/zynq-boot-bin/zynq-boot-bin.mk > +++ /dev/null > @@ -1,22 +0,0 @@ > -################################################################################ > -# > -# zynq-boot-bin > -# > -################################################################################ > - > -ZYNQ_BOOT_BIN_VERSION = 2015.1 > -ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py > -ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/xilinx-v$(ZYNQ_BOOT_BIN_VERSION)/tools > -ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ > - > -HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python > - > -define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS > - cp $(HOST_ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) > -endef > - > -define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS > - $(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/bin/$(ZYNQ_BOOT_BIN_SOURCE) > -endef > - > -$(eval $(host-generic-package)) > diff --git a/support/scripts/zynq-boot-bin.py b/support/scripts/zynq-boot-bin.py > new file mode 100755 > index 0000000000..f7fb18225d > --- /dev/null > +++ b/support/scripts/zynq-boot-bin.py > @@ -0,0 +1,230 @@ > +#!/usr/bin/env python3 > +# -*- coding: utf-8 -*- > +# Copyright (C) 2014, Xilinx.inc. > +# > +# Hack origin version and just take the part which generate boot.bin > +# for U-BOOT SPL. > +# > +# Copyright (C) 2013, Elphel.inc. > +# pre-u-boot configuration of the Xilinx Zynq(R) SoC > +# This program is free software: you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation, either version 3 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see . > + > +__author__ = "Andrey Filippov" > +__copyright__ = "Copyright 2013, Elphel, Inc." > +__license__ = "GPL" > +__version__ = "3.0+" > +__maintainer__ = "Andrey Filippov" > +__email__ = "andrey at elphel.com" > +__status__ = "Development" > +import os > +import struct > +import sys, getopt > +from functools import reduce > + > +inputfile = '' > +outputfile = '' > +argv = sys.argv[1:] > +try: > + opts, args = getopt.getopt(argv,"hu:o:",["uboot=","outfile="]) > +except getopt.GetoptError: > + print('test.py -u -o ') > + sys.exit(2) > + > +if len(argv) == 0: > + print('test.py -u -o ') > + sys.exit() > + > +for opt, arg in opts: > + if opt == '-h': > + print('test.py -u -o ') > + sys.exit() > + elif opt in ("-u", "--uboot"): > + inputfile = arg > + elif opt in ("-o", "--outfile"): > + outputfile = arg > +print('Input file is:', inputfile) > +print('Output file is:', outputfile) > + > +exit > + > +ACCESSIBLE_REGISTERS=((0xe0001000,0xe0001fff), # UART1 controller registers > + (0xe000d000,0xe000efff), # QUAD SPI controller registers > + (0xe0100004,0xe0100057), # SDIO 0 controller registers > + (0xe0100059,0xe0100fff), # SDIO 0 controller registers > + (0xe000e000,0xe000efff), # SMC controller > + (0xf8006000,0xf8006fff), # DDR controller > + # SLCR_LOCK disables all (0xf8000000,0xf8000b74), but it is locked at reset seems to be unlocked, http://www.xilinx.com/support/answers/47570.html > + #prohibited: SLCR_SCL, SLCR_LOCK, SLCR_UNLOCK, SLCR_STA > + (0xf8000100,0xf80001b0), # SLCR registers > + #DOes not seem to be any gap between 0xf80001b0 and 0xf80001b4 > + (0xf80001b4,0xf80001ff), # SLCR registers > + #prohibited SLCR_PSS_RST_CTRL 0xf8000200 > + (0xf8000204,0xf8000234), # SLCR registers - is SLCR_SMC_RST_CTRL 0xf8000234 also prohibited? > + #prohibited? SLCR_OCM_RST_CTRL 0xf8000238 SLCR_FPGA_RST_CTRL 0xf8000240 > + (0xf800024c,0xf800024c), # SLCR registers SLCR_AWDT_CTRL - watchdog timer reset control > + #prohibited SLSR_REBOOT_STATUS 0xf8000258, SLCR_BOOT_MODE 0xf800025c, SLCR_APU_CTRL 0xf8000300, > + (0xf8000304,0xf8000834), # SLCR registers SLCR_AWDT_CLK_SEL, DDR, MIO > + #prohibited SLCR_LVL_SHFTR_ON 0xf8000900, SLCR_OCM_CFG 0xf8000910, > + (0xf8000a00,0xf8000a8c), # SLCR registers All shown "reserved" ??? > + (0xf8000ab0,0xf8000b74)) # SLCR registers iostd, voltages, - more DDR stuff > + > +def verify_register_accessible(address): > + for interval in ACCESSIBLE_REGISTERS: > + if (address >= interval[0]) and (address <= interval[1]): > + print('Register accessible:' , hex(interval[0]),'<=', hex(address), '<=', hex(interval[1])) > + return True > + else: > + return False > + > +def image_generator (image, > + reg_sets, # registers, > + options, > + user_def, > + ocm_offset, > + ocm_len, > + start_exec): > + reserved0044=0; > + > + rfi_word=0xeafffffe #from actual image > + waddr=0 > + for _ in range (0x20//4): > + image[waddr]=rfi_word # fill reserved for interrupts fields > + waddr+=1 > + #width detection > + image[waddr]=0xaa995566 # offset 0x20 > + waddr+=1 > + > + #image identification > + image[waddr]=0x584c4e58 # offset 0x24, XLNX > + waddr+=1 > + > + #encryption status > + image[waddr]=0x0 # offset 0x28, no encryption > + waddr+=1 > + > + #User defined word > + image[waddr]=user_def # offset 0x2c > + waddr+=1 > + > + #ocm_offset > + if ocm_offset<0x8c0: > + print('Start offset should be >= 0x8c0, specified', hex(ocm_offset)) > + exit (ERROR_DEFS['HEAD']) > + elif (ocm_offset & 0x3f) != 0: > + print('Start offset should be 64-bytes aligned, specified', hex(ocm_offset)) > + exit (ERROR_DEFS['HEAD']) > + image[waddr]=ocm_offset # offset 0x30 > + waddr+=1 > + > + #ocm_len > + if ocm_len>0x30000: > + print('Loaded to the OCM image should fit into 3 mapped pages of OCM - 192K (0x30000), specified ',hex(ocm_len)) > + exit (ERROR_DEFS['HEAD']) > + image[waddr]=ocm_len # offset 0x34 > + waddr+=1 > + > + #reserved 0 > + image[waddr]=0 # offset 0x38 > + waddr+=1 > + > + #start_exec > + if (start_exec>0x30000) or (start_exec<0): > + print('Start address is relative to OCM and should fit there - in 192K (0x30000), specified ',hex(start_exec)) > + exit (ERROR_DEFS['HEAD']) > + image[waddr]=start_exec # offset 0x3c > + waddr+=1 > + > + #img_len == ocm_len for unsecure images > + img_len = ocm_len > + image[waddr]=img_len # offset 0x40 > + waddr+=1 > + > + #reserved 0 > + image[waddr]=reserved0044 #0 # offset 0x44 > + waddr+=1 > + > + #calculate image checksum > + def add (x,y): return x+y > + checksum=(reduce(add,image[0x20//4:0x48//4]) ^ 0xffffffff) & 0xffffffff > + image[waddr]=checksum # offset 0x48 > + waddr+=1 > + print('After checksum waddr=',hex(waddr),' byte addr=',hex(4*waddr)) > + > + > + #initialize registers > + print('Number of registers to initialize',len(reg_sets)) > + if len (reg_sets)>256: > + print('Too many registers to initialize, only 256 allowed,',len(reg_sets),'> 256') > + waddr=0xa0//4 > + # new_sets.append((addr,data,mask,self.module_name,register_name,self.defs[register_name])) > + > + for register in reg_sets: > + op=register[0] > + addr=register[1] > + data=register[2] > + if (op != 's'): > + raise Exception ('Can not test registers (0x%08x) in RBL, it should be done in user code'%addr) > + if not verify_register_accessible (addr): > + print('Tried to set non-accessible register', hex(addr),' with data ', hex(data)) > + exit (ERROR_DEFS['NONACCESSIBLE_REGISTER']) > + image[waddr]=addr > + waddr+=1 > + image[waddr]=data > + waddr+=1 > + #Fill in FFs for unused registers > + while waddr < (0x8c0//4): > + image[waddr]=0xffffffff > + waddr+=1 > + image[waddr]=0 > + waddr+=1 > + > +if (inputfile): > + try: > + uboot_image_len=os.path.getsize(inputfile) > + print('Using %s to get image length - it is %i (0x%x) bytes'%(os.path.abspath(inputfile),uboot_image_len,uboot_image_len)) > + except: > + print('Specified u-boot.bin file: %s (%s) not found'%(inputfile,os.path.abspath(inputfile))) > + sys.exit() > +else: > + uboot_image_len=int(raw_options['CONFIG_EZYNQ_BOOT_OCM_IMAGE_LENGTH'],0) > + print('No u-boot.bin path specified, using provided CONFIG_EZYNQ_BOOT_OCM_IMAGE_LENGTH as image size of %i (0x%x) bytes for the RBL header'%(uboot_image_len,uboot_image_len)) > + > +image =[ 0 for k in range (0x8c0//4)] > +reg_sets=[] > +num_rbl_regs=0 > + > +raw_configs="" > +raw_options={} > + > + > +image_generator (image, > + reg_sets[:num_rbl_regs], # > + #registers, > + raw_options, > + 0x1010000, # user_def > + 0x8c0, # ocm_offset, > + uboot_image_len, #ocm_len, > + 0) #start_exec) > + > +if outputfile: > + print('Generating binary output ',os.path.abspath(outputfile)) > + bf=open(outputfile,'wb') > + data=struct.pack('I' * len(image), *image) > + bf.write(data) > + > + spl=open(inputfile,'rb') > + bf.write(spl.read()) > + > + bf.close() > + spl.close() > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From clg at kaod.org Mon Jan 10 21:02:34 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 22:02:34 +0100 Subject: [Buildroot] [PATCH 2/3] configs/qemu: Add a ppc-bamboo configuration In-Reply-To: <20220110210235.817082-1-clg@kaod.org> References: <20220110210235.817082-1-clg@kaod.org> Message-ID: <20220110210235.817082-2-clg@kaod.org> The Bamboo board is an evaluation board for PowerPC 440EP CPUs. Signed-off-by: C?dric Le Goater --- board/qemu/ppc-bamboo/linux.fragment | 6 +++++ board/qemu/ppc-bamboo/readme.txt | 5 ++++ configs/qemu_ppc_bamboo_defconfig | 36 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 board/qemu/ppc-bamboo/linux.fragment create mode 100644 board/qemu/ppc-bamboo/readme.txt create mode 100644 configs/qemu_ppc_bamboo_defconfig diff --git a/board/qemu/ppc-bamboo/linux.fragment b/board/qemu/ppc-bamboo/linux.fragment new file mode 100644 index 000000000000..cc272d0541f0 --- /dev/null +++ b/board/qemu/ppc-bamboo/linux.fragment @@ -0,0 +1,6 @@ +# Enable virtio (blk, rng and net devices) +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_NET=y diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt new file mode 100644 index 000000000000..0b70d2fa5443 --- /dev/null +++ b/board/qemu/ppc-bamboo/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc -nographic -M bamboo -kernel vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig + +The login prompt will appear in the terminal that started Qemu. diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig new file mode 100644 index 000000000000..d6abbeb45296 --- /dev/null +++ b/configs/qemu_ppc_bamboo_defconfig @@ -0,0 +1,36 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_440fp=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" +BR2_LINUX_KERNEL_VMLINUX=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.31.1 From james.hilliard1 at gmail.com Mon Jan 10 22:18:56 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 15:18:56 -0700 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: <20220110221051.GT1477939@scaer> References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> Message-ID: On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: > > James, All, > > On 2021-12-31 13:26 -0700, James Hilliard spake thusly: > > The zynq-boot-bin.py script is no longer maintained upstream, so move > > it to support/scripts/zynq-boot-bin.py and port to python3. > > > > The python3 version produces the same output as the original python2 > > version. > > So, zynq-boot-bin.py has disapeared in upstream repository [0] somewhere > between v2015.4 and v2016.1 (they are mreging branches here and there, > and git-bisect gets lost and finds spurious bad commits... meh...) > > Use of zynq-boot-bin.py in Buildroot is guarded by BR2_TARGET_UBOOT_ZYNQ_IMAGE > and none of our defconfigs, not even any of our 5 zynq defconfigs. In 2016, > with commit 6b669b61a84f (zynq_microzed: bump U-Boot to xilinx-v2016.2), > we eventually got rid of the latest defconfig that used > BR2_TARGET_UBOOT_ZYNQ_IMAGE. > > What's more, in commit 6dd5a33c485c (zynq_zed: bump U-Boot to > xilinx-v2016.2), Masahiro stated: > > - Replace BR2_TARGET_UBOOT_ZYNQ_IMAGE with BR2_TARGET_UBOOT_SPL_NAME > since U-Boot can natively generate the Zynq boot image now. The > Zynq image support for mkimage tool was upstreamed at v2016.01 > (so xilinx-v2016.1 as well), so no additional tool is needed > any more. Yeah, it's somewhat unclear if this is equivalent to what the zynq-boot-bin script does. > > So I wonder if it even makes sense to keep package/zynq-boot-bin now. Well if someone is using an older uboot that doesn't have the generation capability integrated then it's probably still needed right? > > [0] https://github.com/Xilinx/u-boot-xlnx > > Regards, > Yann E. MORIN. > > > Signed-off-by: James Hilliard > > --- > > boot/uboot/uboot.mk | 6 +- > > package/zynq-boot-bin/zynq-boot-bin.hash | 2 - > > package/zynq-boot-bin/zynq-boot-bin.mk | 22 --- > > support/scripts/zynq-boot-bin.py | 230 +++++++++++++++++++++++ > > 4 files changed, 233 insertions(+), 27 deletions(-) > > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash > > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk > > create mode 100755 support/scripts/zynq-boot-bin.py > > > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index 574fc7089a..9ff2ccda68 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -434,12 +434,12 @@ endif > > > > ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y) > > define UBOOT_GENERATE_ZYNQ_IMAGE > > - $(HOST_DIR)/bin/python2 \ > > - $(HOST_DIR)/bin/zynq-boot-bin.py \ > > + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \ > > + $(TOPDIR)/support/scripts/zynq-boot-bin.py \ > > -u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \ > > -o $(BINARIES_DIR)/BOOT.BIN > > endef > > -UBOOT_DEPENDENCIES += host-zynq-boot-bin > > +UBOOT_DEPENDENCIES += host-python3 > > UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE > > endif > > > > diff --git a/package/zynq-boot-bin/zynq-boot-bin.hash b/package/zynq-boot-bin/zynq-boot-bin.hash > > deleted file mode 100644 > > index 0bc23de197..0000000000 > > --- a/package/zynq-boot-bin/zynq-boot-bin.hash > > +++ /dev/null > > @@ -1,2 +0,0 @@ > > -# From https://raw.githubusercontent.com/Xilinx/u-boot-xlnx > > -sha1 940331ee02b0007099effa61e382fe7ea4174054 zynq-boot-bin.py > > diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk > > deleted file mode 100644 > > index deba5f4096..0000000000 > > --- a/package/zynq-boot-bin/zynq-boot-bin.mk > > +++ /dev/null > > @@ -1,22 +0,0 @@ > > -################################################################################ > > -# > > -# zynq-boot-bin > > -# > > -################################################################################ > > - > > -ZYNQ_BOOT_BIN_VERSION = 2015.1 > > -ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py > > -ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/xilinx-v$(ZYNQ_BOOT_BIN_VERSION)/tools > > -ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ > > - > > -HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python > > - > > -define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS > > - cp $(HOST_ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) > > -endef > > - > > -define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS > > - $(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/bin/$(ZYNQ_BOOT_BIN_SOURCE) > > -endef > > - > > -$(eval $(host-generic-package)) > > diff --git a/support/scripts/zynq-boot-bin.py b/support/scripts/zynq-boot-bin.py > > new file mode 100755 > > index 0000000000..f7fb18225d > > --- /dev/null > > +++ b/support/scripts/zynq-boot-bin.py > > @@ -0,0 +1,230 @@ > > +#!/usr/bin/env python3 > > +# -*- coding: utf-8 -*- > > +# Copyright (C) 2014, Xilinx.inc. > > +# > > +# Hack origin version and just take the part which generate boot.bin > > +# for U-BOOT SPL. > > +# > > +# Copyright (C) 2013, Elphel.inc. > > +# pre-u-boot configuration of the Xilinx Zynq(R) SoC > > +# This program is free software: you can redistribute it and/or modify > > +# it under the terms of the GNU General Public License as published by > > +# the Free Software Foundation, either version 3 of the License, or > > +# (at your option) any later version. > > +# > > +# This program is distributed in the hope that it will be useful, > > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > +# GNU General Public License for more details. > > +# > > +# You should have received a copy of the GNU General Public License > > +# along with this program. If not, see . > > + > > +__author__ = "Andrey Filippov" > > +__copyright__ = "Copyright 2013, Elphel, Inc." > > +__license__ = "GPL" > > +__version__ = "3.0+" > > +__maintainer__ = "Andrey Filippov" > > +__email__ = "andrey at elphel.com" > > +__status__ = "Development" > > +import os > > +import struct > > +import sys, getopt > > +from functools import reduce > > + > > +inputfile = '' > > +outputfile = '' > > +argv = sys.argv[1:] > > +try: > > + opts, args = getopt.getopt(argv,"hu:o:",["uboot=","outfile="]) > > +except getopt.GetoptError: > > + print('test.py -u -o ') > > + sys.exit(2) > > + > > +if len(argv) == 0: > > + print('test.py -u -o ') > > + sys.exit() > > + > > +for opt, arg in opts: > > + if opt == '-h': > > + print('test.py -u -o ') > > + sys.exit() > > + elif opt in ("-u", "--uboot"): > > + inputfile = arg > > + elif opt in ("-o", "--outfile"): > > + outputfile = arg > > +print('Input file is:', inputfile) > > +print('Output file is:', outputfile) > > + > > +exit > > + > > +ACCESSIBLE_REGISTERS=((0xe0001000,0xe0001fff), # UART1 controller registers > > + (0xe000d000,0xe000efff), # QUAD SPI controller registers > > + (0xe0100004,0xe0100057), # SDIO 0 controller registers > > + (0xe0100059,0xe0100fff), # SDIO 0 controller registers > > + (0xe000e000,0xe000efff), # SMC controller > > + (0xf8006000,0xf8006fff), # DDR controller > > + # SLCR_LOCK disables all (0xf8000000,0xf8000b74), but it is locked at reset seems to be unlocked, http://www.xilinx.com/support/answers/47570.html > > + #prohibited: SLCR_SCL, SLCR_LOCK, SLCR_UNLOCK, SLCR_STA > > + (0xf8000100,0xf80001b0), # SLCR registers > > + #DOes not seem to be any gap between 0xf80001b0 and 0xf80001b4 > > + (0xf80001b4,0xf80001ff), # SLCR registers > > + #prohibited SLCR_PSS_RST_CTRL 0xf8000200 > > + (0xf8000204,0xf8000234), # SLCR registers - is SLCR_SMC_RST_CTRL 0xf8000234 also prohibited? > > + #prohibited? SLCR_OCM_RST_CTRL 0xf8000238 SLCR_FPGA_RST_CTRL 0xf8000240 > > + (0xf800024c,0xf800024c), # SLCR registers SLCR_AWDT_CTRL - watchdog timer reset control > > + #prohibited SLSR_REBOOT_STATUS 0xf8000258, SLCR_BOOT_MODE 0xf800025c, SLCR_APU_CTRL 0xf8000300, > > + (0xf8000304,0xf8000834), # SLCR registers SLCR_AWDT_CLK_SEL, DDR, MIO > > + #prohibited SLCR_LVL_SHFTR_ON 0xf8000900, SLCR_OCM_CFG 0xf8000910, > > + (0xf8000a00,0xf8000a8c), # SLCR registers All shown "reserved" ??? > > + (0xf8000ab0,0xf8000b74)) # SLCR registers iostd, voltages, - more DDR stuff > > + > > +def verify_register_accessible(address): > > + for interval in ACCESSIBLE_REGISTERS: > > + if (address >= interval[0]) and (address <= interval[1]): > > + print('Register accessible:' , hex(interval[0]),'<=', hex(address), '<=', hex(interval[1])) > > + return True > > + else: > > + return False > > + > > +def image_generator (image, > > + reg_sets, # registers, > > + options, > > + user_def, > > + ocm_offset, > > + ocm_len, > > + start_exec): > > + reserved0044=0; > > + > > + rfi_word=0xeafffffe #from actual image > > + waddr=0 > > + for _ in range (0x20//4): > > + image[waddr]=rfi_word # fill reserved for interrupts fields > > + waddr+=1 > > + #width detection > > + image[waddr]=0xaa995566 # offset 0x20 > > + waddr+=1 > > + > > + #image identification > > + image[waddr]=0x584c4e58 # offset 0x24, XLNX > > + waddr+=1 > > + > > + #encryption status > > + image[waddr]=0x0 # offset 0x28, no encryption > > + waddr+=1 > > + > > + #User defined word > > + image[waddr]=user_def # offset 0x2c > > + waddr+=1 > > + > > + #ocm_offset > > + if ocm_offset<0x8c0: > > + print('Start offset should be >= 0x8c0, specified', hex(ocm_offset)) > > + exit (ERROR_DEFS['HEAD']) > > + elif (ocm_offset & 0x3f) != 0: > > + print('Start offset should be 64-bytes aligned, specified', hex(ocm_offset)) > > + exit (ERROR_DEFS['HEAD']) > > + image[waddr]=ocm_offset # offset 0x30 > > + waddr+=1 > > + > > + #ocm_len > > + if ocm_len>0x30000: > > + print('Loaded to the OCM image should fit into 3 mapped pages of OCM - 192K (0x30000), specified ',hex(ocm_len)) > > + exit (ERROR_DEFS['HEAD']) > > + image[waddr]=ocm_len # offset 0x34 > > + waddr+=1 > > + > > + #reserved 0 > > + image[waddr]=0 # offset 0x38 > > + waddr+=1 > > + > > + #start_exec > > + if (start_exec>0x30000) or (start_exec<0): > > + print('Start address is relative to OCM and should fit there - in 192K (0x30000), specified ',hex(start_exec)) > > + exit (ERROR_DEFS['HEAD']) > > + image[waddr]=start_exec # offset 0x3c > > + waddr+=1 > > + > > + #img_len == ocm_len for unsecure images > > + img_len = ocm_len > > + image[waddr]=img_len # offset 0x40 > > + waddr+=1 > > + > > + #reserved 0 > > + image[waddr]=reserved0044 #0 # offset 0x44 > > + waddr+=1 > > + > > + #calculate image checksum > > + def add (x,y): return x+y > > + checksum=(reduce(add,image[0x20//4:0x48//4]) ^ 0xffffffff) & 0xffffffff > > + image[waddr]=checksum # offset 0x48 > > + waddr+=1 > > + print('After checksum waddr=',hex(waddr),' byte addr=',hex(4*waddr)) > > + > > + > > + #initialize registers > > + print('Number of registers to initialize',len(reg_sets)) > > + if len (reg_sets)>256: > > + print('Too many registers to initialize, only 256 allowed,',len(reg_sets),'> 256') > > + waddr=0xa0//4 > > + # new_sets.append((addr,data,mask,self.module_name,register_name,self.defs[register_name])) > > + > > + for register in reg_sets: > > + op=register[0] > > + addr=register[1] > > + data=register[2] > > + if (op != 's'): > > + raise Exception ('Can not test registers (0x%08x) in RBL, it should be done in user code'%addr) > > + if not verify_register_accessible (addr): > > + print('Tried to set non-accessible register', hex(addr),' with data ', hex(data)) > > + exit (ERROR_DEFS['NONACCESSIBLE_REGISTER']) > > + image[waddr]=addr > > + waddr+=1 > > + image[waddr]=data > > + waddr+=1 > > + #Fill in FFs for unused registers > > + while waddr < (0x8c0//4): > > + image[waddr]=0xffffffff > > + waddr+=1 > > + image[waddr]=0 > > + waddr+=1 > > + > > +if (inputfile): > > + try: > > + uboot_image_len=os.path.getsize(inputfile) > > + print('Using %s to get image length - it is %i (0x%x) bytes'%(os.path.abspath(inputfile),uboot_image_len,uboot_image_len)) > > + except: > > + print('Specified u-boot.bin file: %s (%s) not found'%(inputfile,os.path.abspath(inputfile))) > > + sys.exit() > > +else: > > + uboot_image_len=int(raw_options['CONFIG_EZYNQ_BOOT_OCM_IMAGE_LENGTH'],0) > > + print('No u-boot.bin path specified, using provided CONFIG_EZYNQ_BOOT_OCM_IMAGE_LENGTH as image size of %i (0x%x) bytes for the RBL header'%(uboot_image_len,uboot_image_len)) > > + > > +image =[ 0 for k in range (0x8c0//4)] > > +reg_sets=[] > > +num_rbl_regs=0 > > + > > +raw_configs="" > > +raw_options={} > > + > > + > > +image_generator (image, > > + reg_sets[:num_rbl_regs], # > > + #registers, > > + raw_options, > > + 0x1010000, # user_def > > + 0x8c0, # ocm_offset, > > + uboot_image_len, #ocm_len, > > + 0) #start_exec) > > + > > +if outputfile: > > + print('Generating binary output ',os.path.abspath(outputfile)) > > + bf=open(outputfile,'wb') > > + data=struct.pack('I' * len(image), *image) > > + bf.write(data) > > + > > + spl=open(inputfile,'rb') > > + bf.write(spl.read()) > > + > > + bf.close() > > + spl.close() > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 10 22:28:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 23:28:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> Message-ID: <20220110222808.GU1477939@scaer> James, All, On 2022-01-10 15:18 -0700, James Hilliard spake thusly: > On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: [--SNIP--] > > So I wonder if it even makes sense to keep package/zynq-boot-bin now. > Well if someone is using an older uboot that doesn't have the > generation capability > integrated then it's probably still needed right? But then, they would have that tool in their uboot tree, and then nothing would prevent them from running it as a post-build (or post-image) script. Yes, they would need to have a python2 on their host. But that will be the case if they stick to such older tools which may break on more recent systems, not just uboot... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Mon Jan 10 22:31:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 15:31:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: <20220110222808.GU1477939@scaer> References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> <20220110222808.GU1477939@scaer> Message-ID: On Mon, Jan 10, 2022 at 3:28 PM Yann E. MORIN wrote: > > James, All, > > On 2022-01-10 15:18 -0700, James Hilliard spake thusly: > > On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: > [--SNIP--] > > > So I wonder if it even makes sense to keep package/zynq-boot-bin now. > > Well if someone is using an older uboot that doesn't have the > > generation capability > > integrated then it's probably still needed right? > > But then, they would have that tool in their uboot tree, and then > nothing would prevent them from running it as a post-build (or > post-image) script. > > Yes, they would need to have a python2 on their host. But that will be > the case if they stick to such older tools which may break on more > recent systems, not just uboot... Yeah, the advantage here is that it works with python3 as is with older uboot versions. I guess the main issue is that vendor uboot trees are often ancient and rarely updated so this would be mostly useful for those situations. > > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From ricardo.martincoski at gmail.com Mon Jan 10 22:42:07 2022 From: ricardo.martincoski at gmail.com (ricardo.martincoski at gmail.com) Date: Mon, 10 Jan 2022 19:42:07 -0300 Subject: [Buildroot] [PATCH-next 1/4] utils/checkpackagelib: add unit tests References: <30b13507-5744-de89-0e04-503e264bc1e5@smile.fr> Message-ID: <61dcb63fc08f3_8fcf9ec-3fa@xultri.mail> Hello Romain, On Sat, Jan 08, 2022 at 07:37 PM, Romain Naour wrote: > Hello Ricardo, > > Le 05/12/2021 ? 11:53, Ricardo Martincoski a ?crit?: >> So anyone willing to contribute to check-package can run all tests in >> less than 1 second by using: >> $ python3 -m pytest -v utils/checkpackagelib/ >> >> Most test cases are in the form: >> @pytest.mark.parametrize('testname,filename,string,expected', function) >> - testname: a short description of the scenario tested, added in order >> to improve readability of the log when some tests fail >> - filename: the filename the check-package function being tested thinks >> it is testing >> - string: the content of the file being sent to the function under test >> - expect: all expected warnings that a given function from >> check-package should generate for a given file named filename and >> with string as its content. > > I spend some time to review this patch to find something to say :) Thank you for your time. I imagine how boring was to review this patch :) > > Actually the test_lib_hash tests are not checking with the new spacing > convention we want to use in .hash files. > > I applied this patch [1] after your series and some tests failed. Now it landed on master. > > I would recommand to use the new spacing convention by default in this testsuite. Sure. I will send v2. Regards, Ricardo From ricardo.martincoski at gmail.com Mon Jan 10 22:43:13 2022 From: ricardo.martincoski at gmail.com (ricardo.martincoski at gmail.com) Date: Mon, 10 Jan 2022 19:43:13 -0300 Subject: [Buildroot] [PATCH] support/download: drop support for the 'none' hash References: <20220110162319.294088-1-yann.morin.1998@free.fr> Message-ID: <61dcb681410a7_8fcfa78-19a@xultri.mail> Hello Yann, On Mon, Jan 10, 2022 at 01:23 PM, Yann E. MORIN wrote: [snip] > --- > docs/manual/adding-packages-directory.txt | 9 +-------- > support/download/check-hash | 4 ---- > 2 files changed, 1 insertion(+), 12 deletions(-) Another file to change: utils/checkpackagelib/lib_hash.py: if htype == "none": Regards, Ricardo From luca at lucaceresoli.net Mon Jan 10 22:46:30 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 10 Jan 2022 23:46:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> <20220110222808.GU1477939@scaer> Message-ID: <2846b399-f095-acb3-c086-e44b3b74698e@lucaceresoli.net> Hi James, Yann, On 10/01/22 23:31, James Hilliard wrote: > On Mon, Jan 10, 2022 at 3:28 PM Yann E. MORIN wrote: >> >> James, All, >> >> On 2022-01-10 15:18 -0700, James Hilliard spake thusly: >>> On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: >> [--SNIP--] >>>> So I wonder if it even makes sense to keep package/zynq-boot-bin now. >>> Well if someone is using an older uboot that doesn't have the >>> generation capability >>> integrated then it's probably still needed right? >> >> But then, they would have that tool in their uboot tree, and then >> nothing would prevent them from running it as a post-build (or >> post-image) script. >> >> Yes, they would need to have a python2 on their host. But that will be >> the case if they stick to such older tools which may break on more >> recent systems, not just uboot... > > Yeah, the advantage here is that it works with python3 as is with older uboot > versions. I guess the main issue is that vendor uboot trees are often ancient > and rarely updated so this would be mostly useful for those situations. Is upgrading to python 3 just to simplify potential legacy users the only motivation for this patch? Then I would not touch this package at all and avoid keeping our own copy of the script. -- Luca From ps.report at gmx.net Mon Jan 10 22:49:48 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 23:49:48 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/iwd: bump version to 1.21 In-Reply-To: <20220110213901.13597-2-ps.report@gmx.net> References: <20220110213901.13597-1-ps.report@gmx.net> <20220110213901.13597-2-ps.report@gmx.net> Message-ID: <20220110234948.347edf2d@gmx.net> On Mon, 10 Jan 2022 22:39:01 +0100, Peter Seiderer wrote: > - add 0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch > > - Changelog (since 1.20, from [1]): > > ver 1.21: > Fix issue with handling disconnect events issued by AP. > Add experimental support for DPP feature. > > [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog > > Signed-off-by: Peter Seiderer > --- > ...-declaration-of-function-explicit_bz.patch | 39 +++++++++++++++++++ > package/iwd/iwd.hash | 2 +- > package/iwd/iwd.mk | 2 +- > 3 files changed, 41 insertions(+), 2 deletions(-) > create mode 100644 package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch > > diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch > new file mode 100644 > index 0000000000..fc1e67fe9c > --- /dev/null > +++ b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch > @@ -0,0 +1,39 @@ > +From 6805884743645d8d16186dbb0de7d9cd50cfd9a5 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Mon, 10 Jan 2022 22:20:53 +0100 > +Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero > + warning > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +- add missing src/missing.h include for explicit_bzero, fixes uclibc > + compile/linking > + > +Fixes: > + > + src/dpp.c:166:2: warning: implicit declaration of function ?explicit_bzero? [-Wimplicit-function-declaration] > + 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); > + | ^~~~~~~~~~~~~~ > + > +[Upstream: https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/HXV2B7L3RXDIFMKFZTI72TKZRK2IMUPP] Upstream applied: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=6ce41f621154eff0145dab41308bc145c0440f16 Regards, Peter > +Signed-off-by: Peter Seiderer > +--- > + src/dpp.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/dpp.c b/src/dpp.c > +index 84e89f6c..8091ded1 100644 > +--- a/src/dpp.c > ++++ b/src/dpp.c > +@@ -30,6 +30,7 @@ > + > + #include "linux/nl80211.h" > + > ++#include "src/missing.h" > + #include "src/dbus.h" > + #include "src/netdev.h" > + #include "src/module.h" > +-- > +2.34.1 > + > diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash > index 58224170e6..8e34d2983f 100644 > --- a/package/iwd/iwd.hash > +++ b/package/iwd/iwd.hash > @@ -1,5 +1,5 @@ > # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc > -sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz > +sha256 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk > index 42f176b05b..a70da86ecc 100644 > --- a/package/iwd/iwd.mk > +++ b/package/iwd/iwd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -IWD_VERSION = 1.20 > +IWD_VERSION = 1.21 > IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz > IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless > IWD_LICENSE = LGPL-2.1+ From fontaine.fabrice at gmail.com Mon Jan 10 22:52:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 23:52:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix musl build Message-ID: <20220110225200.2000095-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: In file included from /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, from ./kerncompat.h:31, from common/utils.c:42: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' 7 | struct sysinfo { | ^~~~~~~ In file included from common/utils.c:27: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here 10 | struct sysinfo { | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc Signed-off-by: Fabrice Fontaine --- ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ++++++++++++++++ ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch create mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch new file mode 100644 index 0000000000..b6c1a42456 --- /dev/null +++ b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch @@ -0,0 +1,43 @@ +From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Thu, 30 Dec 2021 15:23:59 +0200 +Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ + headers + +btrfs-tools compile fails with mips, musl and 5.12+ headers. + +The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we +add an explicit include of const.h to pickup the macro: + + | make: *** [Makefile:595: mkfs.btrfs] Error 1 + | make: *** Waiting for unfinished jobs.... + | libbtrfs.a(volumes.o): in function `dev_extent_search_start': + | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' + | collect2: error: ld returned 1 exit status + +This is safe for older kernel's as well, since the header still +exists, and is valid to include. + +Signed-off-by: Bruce Ashfield +[remove invalid OE Upstream-status] +Signed-off-by: Stijn Tintel +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] +Signed-off-by: Fabrice Fontaine +--- + kerncompat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kerncompat.h b/kerncompat.h +index df167fe6c..2503d1afa 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch new file mode 100644 index 0000000000..7473fe67cb --- /dev/null +++ b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch @@ -0,0 +1,49 @@ +From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 8 Jan 2022 22:44:44 +0100 +Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl + +Make inclusion of sys/sysinfo.h conditional to avoid the following build +failure on musl: + +In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, + from ./kerncompat.h:31, + from common/utils.c:42: +.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' + 7 | struct sysinfo { + | ^~~~~~~ +In file included from common/utils.c:27: +.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + 10 | struct sysinfo { + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc + +The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, +while both must not be included at the same time. Stop including +linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and +causes the double definition for some reason. As we now include +linux/const.h directly, there's no other effective change. + +Pull-request: #433 +Signed-off-by: Fabrice Fontaine +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] +--- + kerncompat.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 2503d1afa..6ca1526e2 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #include + #include + -- 2.34.1 From james.hilliard1 at gmail.com Mon Jan 10 22:55:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 15:55:22 -0700 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: <2846b399-f095-acb3-c086-e44b3b74698e@lucaceresoli.net> References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> <20220110222808.GU1477939@scaer> <2846b399-f095-acb3-c086-e44b3b74698e@lucaceresoli.net> Message-ID: On Mon, Jan 10, 2022 at 3:46 PM Luca Ceresoli wrote: > > Hi James, Yann, > > On 10/01/22 23:31, James Hilliard wrote: > > On Mon, Jan 10, 2022 at 3:28 PM Yann E. MORIN wrote: > >> > >> James, All, > >> > >> On 2022-01-10 15:18 -0700, James Hilliard spake thusly: > >>> On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: > >> [--SNIP--] > >>>> So I wonder if it even makes sense to keep package/zynq-boot-bin now. > >>> Well if someone is using an older uboot that doesn't have the > >>> generation capability > >>> integrated then it's probably still needed right? > >> > >> But then, they would have that tool in their uboot tree, and then > >> nothing would prevent them from running it as a post-build (or > >> post-image) script. > >> > >> Yes, they would need to have a python2 on their host. But that will be > >> the case if they stick to such older tools which may break on more > >> recent systems, not just uboot... > > > > Yeah, the advantage here is that it works with python3 as is with older uboot > > versions. I guess the main issue is that vendor uboot trees are often ancient > > and rarely updated so this would be mostly useful for those situations. > > Is upgrading to python 3 just to simplify potential legacy users the > only motivation for this patch? Then I would not touch this package at > all and avoid keeping our own copy of the script. Well the motivation is that we want to drop python 2 from the toolchain entirely, so leaving this package as is would not be an option(since it depends on the host python2 interpreter support we want to remove). We either need to remove it or use the python3 ported version(which due to the simplicity of the script should not cause any significant maintenance issues for us IMO). > > -- > Luca From peter at korsgaard.com Mon Jan 10 22:56:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 10 Jan 2022 23:56:46 +0100 Subject: [Buildroot] [PATCH 2/2] configs/kontron_smarc_sal28: use kernel 5.16 In-Reply-To: <20220110095040.2212639-2-michael@walle.cc> (Michael Walle's message of "Mon, 10 Jan 2022 10:50:40 +0100") References: <20220110095040.2212639-1-michael@walle.cc> <20220110095040.2212639-2-michael@walle.cc> Message-ID: <877db79p3l.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Walle writes: > Signed-off-by: Michael Walle Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 10 22:56:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 10 Jan 2022 23:56:38 +0100 Subject: [Buildroot] [PATCH 1/2] {linux, linux-headers}: add version 5.16 In-Reply-To: <20220110095040.2212639-1-michael@walle.cc> (Michael Walle's message of "Mon, 10 Jan 2022 10:50:39 +0100") References: <20220110095040.2212639-1-michael@walle.cc> Message-ID: <87bl0j9p3t.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Walle writes: > Signed-off-by: Michael Walle I've kept the default at 5.15.x given that it is a LTS and we are almost ready to release 2022.02 and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 10 22:54:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 10 Jan 2022 23:54:53 +0100 Subject: [Buildroot] [git commit] configs/kontron_smarc_sal28: use kernel 5.16 Message-ID: <20220110225049.D72B483467@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c27065870a9ff8dac23b94fcf24699c003df4f2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Walle Signed-off-by: Peter Korsgaard --- configs/kontron_smarc_sal28_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index ce8f8323ae..37e415cf32 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3-ads2 freescale/fsl-ls1028a-kontron-sl28-var4 freescale/fsl-ls1028a-kontron-kbox-a-230-ls" From peter at korsgaard.com Mon Jan 10 22:54:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 10 Jan 2022 23:54:16 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: add version 5.16 Message-ID: <20220110225049.CF3A982984@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85459426d9f4f5909b359d9456f71bdeac3c46ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Walle [Peter: Keep default at 5.15.x for 2022.02] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 11 ++++++++++- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 2f144427f4..86dc8d7af9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9bc3c873c5..8ee86e09af 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -65,6 +65,10 @@ config BR2_KERNEL_HEADERS_5_14 config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + +config BR2_KERNEL_HEADERS_5_16 + bool "Linux 5.16.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -139,8 +143,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 + bool "5.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 - bool "5.15.x or later" + bool "5.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14 @@ -382,6 +390,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.83" if BR2_KERNEL_HEADERS_5_10 default "5.14.21" if BR2_KERNEL_HEADERS_5_14 default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index fd005f4740..adc93ab725 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -566,6 +566,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -579,6 +583,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 default "5.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 default "5.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1cea64d105..9346fa3feb 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -123,8 +123,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_16 + bool "5.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_15 - bool "5.15.x or later" + bool "5.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_14 From peter at korsgaard.com Mon Jan 10 23:13:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 11 Jan 2022 00:13:01 +0100 Subject: [Buildroot] [PATCH 1/2] package/linux-headers: drop 5.14.x headers Message-ID: <20220110231303.31275-1-peter@korsgaard.com> The 5.14.x series is now EOL, so drop it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index d36eac3302..b3e8d5a6d8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_KERNEL_HEADERS_5_14 + bool "kernel headers version 5.14.x are no longer supported" + select BR2_LEGACY + help + Version 5.14.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE bool "python-backports-functools-lru-cache package removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 86dc8d7af9..c40c26c1b2 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz -sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8ee86e09af..115ff0d3f9 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,7 +388,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.219" if BR2_KERNEL_HEADERS_4_19 default "5.4.163" if BR2_KERNEL_HEADERS_5_4 default "5.10.83" if BR2_KERNEL_HEADERS_5_10 - default "5.14.21" if BR2_KERNEL_HEADERS_5_14 default "5.15.6" if BR2_KERNEL_HEADERS_5_15 default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION -- 2.20.1 From peter at korsgaard.com Mon Jan 10 23:13:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 11 Jan 2022 00:13:02 +0100 Subject: [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series In-Reply-To: <20220110231303.31275-1-peter@korsgaard.com> References: <20220110231303.31275-1-peter@korsgaard.com> Message-ID: <20220110231303.31275-2-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 6c30100921..891e2cdcb6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" 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 c40c26c1b2..d0813e5db4 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz -sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz +sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 115ff0d3f9..1c24afed97 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -382,13 +382,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 - default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 + default "5.15.13" if BR2_KERNEL_HEADERS_5_15 default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL -- 2.20.1 From peterlin at andestech.com Tue Jan 11 03:58:58 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 11 Jan 2022 11:58:58 +0800 Subject: [Buildroot] [PATCH 1/2] board/andes: rearrange nds32 folder structure Message-ID: <20220111035859.12895-1-peterlin@andestech.com> Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 board/andes/{ => ae3xx}/readme.txt | 0 configs/andes_ae3xx_defconfig | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae3xx}/readme.txt (100%) diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae3xx/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch similarity index 100% rename from board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch rename to board/andes/ae3xx/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/readme.txt b/board/andes/ae3xx/readme.txt similarity index 100% rename from board/andes/readme.txt rename to board/andes/ae3xx/readme.txt diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae3xx_defconfig index 52634caa50..18051115c3 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae3xx_defconfig @@ -1,5 +1,5 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae3xx/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y -- 2.17.1 From peterlin at andestech.com Tue Jan 11 03:58:59 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 11 Jan 2022 11:58:59 +0800 Subject: [Buildroot] [PATCH 2/2] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220111035859.12895-1-peterlin@andestech.com> References: <20220111035859.12895-1-peterlin@andestech.com> Message-ID: <20220111035859.12895-2-peterlin@andestech.com> This patch provides defconfig and basic support for the Andes 45 series RISC-V architecture. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- DEVELOPERS | 3 +- board/andes/ae350/ae350.dts | 274 ++ board/andes/ae350/boot.cmd | 3 + board/andes/ae350/genimage_sdcard.cfg | 29 + board/andes/ae350/linux.config.fragment | 2 + .../0001-Add-AE350-platform-defconfig.patch | 158 + ...002-Andes-support-for-Faraday-ATCMAC.patch | 510 +++ .../0003-Andes-support-for-ATCDMAC.patch | 3301 +++++++++++++++++ .../linux/0004-Andes-support-for-FTSDC.patch | 1884 ++++++++++ ...5-Non-cacheability-and-Cache-support.patch | 1132 ++++++ ...-Add-andes-sbi-call-vendor-extension.patch | 231 ++ ...e-update-function-local_flush_tlb_al.patch | 101 + ...rt-time32-stat64-sys_clone3-syscalls.patch | 47 + .../0009-dma-Support-smp-up-with-dma.patch | 120 + ...ix-atcdmac300-chained-irq-mapping-is.patch | 300 ++ .../linux/0011-DMA-Add-msb-bit-patch.patch | 387 ++ .../0012-Remove-unused-Andes-SBI-call.patch | 147 + ...isable-PIC-explicitly-for-assembling.patch | 29 + ...2-Enable-cache-for-opensbi-jump-mode.patch | 25 + ...001-Fix-mmc-no-partition-table-error.patch | 27 + ...2-Prevent-fw_dynamic-from-relocation.patch | 27 + ...0003-Fix-u-boot-proper-booting-issue.patch | 26 + ...04-Enable-printing-OpenSBI-boot-logo.patch | 25 + board/andes/ae350/readme.txt | 66 + board/andes/ae350/uboot.config.fragment | 5 + configs/ae350_andestar45_defconfig | 46 + 26 files changed, 8904 insertions(+), 1 deletion(-) create mode 100755 board/andes/ae350/ae350.dts create mode 100644 board/andes/ae350/boot.cmd create mode 100644 board/andes/ae350/genimage_sdcard.cfg create mode 100644 board/andes/ae350/linux.config.fragment create mode 100644 board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch create mode 100644 board/andes/ae350/patches/linux/0002-Andes-support-for-Faraday-ATCMAC.patch create mode 100644 board/andes/ae350/patches/linux/0003-Andes-support-for-ATCDMAC.patch create mode 100644 board/andes/ae350/patches/linux/0004-Andes-support-for-FTSDC.patch create mode 100644 board/andes/ae350/patches/linux/0005-Non-cacheability-and-Cache-support.patch create mode 100644 board/andes/ae350/patches/linux/0006-Add-andes-sbi-call-vendor-extension.patch create mode 100644 board/andes/ae350/patches/linux/0007-riscv-Porting-pte-update-function-local_flush_tlb_al.patch create mode 100644 board/andes/ae350/patches/linux/0008-Support-time32-stat64-sys_clone3-syscalls.patch create mode 100644 board/andes/ae350/patches/linux/0009-dma-Support-smp-up-with-dma.patch create mode 100644 board/andes/ae350/patches/linux/0010-riscv-platform-Fix-atcdmac300-chained-irq-mapping-is.patch create mode 100644 board/andes/ae350/patches/linux/0011-DMA-Add-msb-bit-patch.patch create mode 100644 board/andes/ae350/patches/linux/0012-Remove-unused-Andes-SBI-call.patch create mode 100644 board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch create mode 100644 board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch create mode 100644 board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch create mode 100644 board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch create mode 100644 board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch create mode 100644 board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/uboot.config.fragment create mode 100644 configs/ae350_andestar45_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..18b0444c72 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2122,10 +2122,11 @@ N: Norbert Lange F: package/systemd/ F: package/tcf-agent/ -N: Nylon Chen +N: Yu Chien Peter Lin F: arch/Config.in.nds32 F: board/andes F: configs/andes_ae3xx_defconfig +F: configs/ae350_andestar45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel diff --git a/board/andes/ae350/ae350.dts b/board/andes/ae350/ae350.dts new file mode 100755 index 0000000000..fe64234eef --- /dev/null +++ b/board/andes/ae350/ae350.dts @@ -0,0 +1,274 @@ +/dts-v1/; + +/ { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,ae350"; + model = "andestech,ax45"; + aliases { + uart0 = &serial0; + spi0 = &spi; + }; + + chosen { + bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7"; + stdout-path = "uart0:38400n8"; + }; + cpus { + #address-cells = <1>; + #size-cells = <0>; + timebase-frequency = <60000000>; + CPU0: cpu at 0 { + device_type = "cpu"; + reg = <0>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU0_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU1: cpu at 1 { + device_type = "cpu"; + reg = <1>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU1_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU2: cpu at 2 { + device_type = "cpu"; + reg = <2>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU2_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU3: cpu at 3 { + device_type = "cpu"; + reg = <3>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU3_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + }; + L2: l2-cache at e0500000 { + compatible = "cache"; + cache-level = <2>; + cache-size = <0x80000>; + reg = <0x00000000 0xe0500000 0x00000000 0x00001000>; + andes,inst-prefetch = <3>; + andes,data-prefetch = <3>; + // The value format is + andes,tag-ram-ctl = <0 0>; + andes,data-ram-ctl = <0 0>; + }; + memory at 0 { + reg = <0x00000000 0x00000000 0x00000000 0x80000000>; + device_type = "memory"; + }; + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,riscv-ae350-soc", "simple-bus"; + ranges; + plic0: interrupt-controller at e4000000 { + compatible = "riscv,plic0"; + reg = <0x00000000 0xe4000000 0x00000000 0x02000000>; + interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <71>; + }; + plic1: interrupt-controller at e6400000 { + compatible = "riscv,plic1"; + reg = <0x00000000 0xe6400000 0x00000000 0x00400000>; + interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <4>; + }; + plmt0: plmt0 at e6000000 { + compatible = "riscv,plmt0"; + reg = <0x00000000 0xe6000000 0x00000000 0x00100000>; + interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>; + }; + spiclk: virt_100mhz { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; + timer0: timer at f0400000 { + compatible = "andestech,atcpit100"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + }; + pwm: pwm at f0400000 { + compatible = "andestech,atcpit100-pwm"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + pwm-cells = <2>; + }; + wdt: wdt at f0500000 { + compatible = "andestech,atcwdt200"; + reg = <0x00000000 0xf0500000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <15000000>; + }; + serial0: serial at f0300000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x00000000 0xf0300000 0x00000000 0x00001000>; + interrupts = <9 4>; + interrupt-parent = <&plic0>; + clock-frequency = <19660800>; + reg-shift = <2>; + reg-offset = <32>; + no-loopback-test = <1>; + }; + rtc0: rtc at f0600000 { + compatible = "andestech,atcrtc100"; + reg = <0x00000000 0xf0600000 0x00000000 0x00001000>; + interrupts = <1 4 2 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + gpio: gpio at f0700000 { + compatible = "andestech,atcgpio100"; + reg = <0x00000000 0xf0700000 0x00000000 0x00001000>; + interrupts = <7 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + mac0: mac at e0100000 { + compatible = "andestech,atmac100"; + reg = <0x00000000 0xe0100000 0x00000000 0x00001000>; + interrupts = <19 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + smu: smu at f0100000 { + compatible = "andestech,atcsmu"; + reg = <0x00000000 0xf0100000 0x00000000 0x00001000>; + }; + mmc0: mmc at f0e00000 { + compatible = "andestech,atfsdc010"; + reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>; + interrupts = <18 4>; + interrupt-parent = <&plic0>; + clock-freq-min-max = <400000 100000000>; + max-frequency = <100000000>; + fifo-depth = <16>; + cap-sd-highspeed; + dma-coherent; + }; + dma0: dma at f0c00000 { + compatible = "andestech,atcdmac300"; + reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>; + interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>; + interrupt-parent = <&plic0>; + dma-channels = <8>; + }; + lcd0: lcd at e0200000 { + compatible = "andestech,atflcdc100"; + reg = <0x00000000 0xe0200000 0x00000000 0x00001000>; + interrupts = <20 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + pmu: pmu { + compatible = "riscv,andes-pmu"; + device_type = "pmu"; + }; + spi: spi at f0b00000 { + compatible = "andestech,atcspi200"; + reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>; + interrupts = <4 4>; + interrupt-parent = <&plic0>; + #address-cells = <1>; + #size-cells = <0>; + num-cs = <1>; + clocks = <&spiclk>; + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0x00000000>; + spi-max-frequency = <50000000>; + spi-cpol; + spi-cpha; + }; + }; + }; +}; diff --git a/board/andes/ae350/boot.cmd b/board/andes/ae350/boot.cmd new file mode 100644 index 0000000000..2a046c6c7a --- /dev/null +++ b/board/andes/ae350/boot.cmd @@ -0,0 +1,3 @@ +setenv bootargs earlycon=sbi root=/dev/mmcblk0p2 rootwait +load mmc 0:1 0x600000 Image +booti 0x600000 - $fdtcontroladdr diff --git a/board/andes/ae350/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..e8bb3d4903 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,29 @@ +image boot.vfat { + vfat { + files = { + "Image", + "boot.scr", + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 128M +} + +image sdcard.img { + hdimage { + gpt = true + } + + partition u-boot { + partition-type-uuid = ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4 + image = "rootfs.ext4" + } +} diff --git a/board/andes/ae350/linux.config.fragment b/board/andes/ae350/linux.config.fragment new file mode 100644 index 0000000000..299b75d2f4 --- /dev/null +++ b/board/andes/ae350/linux.config.fragment @@ -0,0 +1,2 @@ +CONFIG_INITRAMFS_SOURCE="" +CONFIG_EFI_PARTITION=y diff --git a/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch b/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch new file mode 100644 index 0000000000..1384369972 --- /dev/null +++ b/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch @@ -0,0 +1,158 @@ +From 8a9097c1be79fdab3d907a8bbc66a222807cb81a Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 09:05:34 +0800 +Subject: [PATCH 01/12] Add AE350 platform defconfig + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/configs/ae350_rv64_smp_defconfig | 138 ++++++++++++++++++++ + 1 file changed, 138 insertions(+) + create mode 100755 arch/riscv/configs/ae350_rv64_smp_defconfig + +diff --git a/arch/riscv/configs/ae350_rv64_smp_defconfig b/arch/riscv/configs/ae350_rv64_smp_defconfig +new file mode 100755 +index 000000000000..8c6b84b2b9fe +--- /dev/null ++++ b/arch/riscv/configs/ae350_rv64_smp_defconfig +@@ -0,0 +1,138 @@ ++CONFIG_SMP=y ++CONFIG_NR_CPUS=4 ++CONFIG_ANDES_PMU=y ++CONFIG_PREEMPT=y ++CONFIG_HZ_100=y ++CONFIG_CROSS_COMPILE="riscv64-linux-" ++CONFIG_DEFAULT_HOSTNAME="andes-test" ++# CONFIG_SWAP is not set ++CONFIG_SYSVIPC=y ++CONFIG_POSIX_MQUEUE=y ++CONFIG_HIGH_RES_TIMERS=y ++CONFIG_BSD_PROCESS_ACCT=y ++CONFIG_BSD_PROCESS_ACCT_V3=y ++CONFIG_IKCONFIG=y ++CONFIG_IKCONFIG_PROC=y ++CONFIG_LOG_BUF_SHIFT=14 ++CONFIG_CGROUPS=y ++CONFIG_CGROUP_SCHED=y ++CONFIG_CFS_BANDWIDTH=y ++CONFIG_CGROUP_CPUACCT=y ++CONFIG_NAMESPACES=y ++CONFIG_USER_NS=y ++CONFIG_BLK_DEV_INITRD=y ++CONFIG_INITRAMFS_SOURCE="rootfs-lite initramfs.txt.lite" ++# CONFIG_RD_BZIP2 is not set ++# CONFIG_RD_LZMA is not set ++# CONFIG_RD_XZ is not set ++# CONFIG_RD_LZO is not set ++# CONFIG_RD_LZ4 is not set ++CONFIG_INITRAMFS_COMPRESSION_GZIP=y ++CONFIG_SYSCTL_SYSCALL=y ++CONFIG_CHECKPOINT_RESTORE=y ++CONFIG_KALLSYMS_ALL=y ++CONFIG_EMBEDDED=y ++CONFIG_PROFILING=y ++CONFIG_MODULES=y ++CONFIG_MODULE_UNLOAD=y ++# CONFIG_BLK_DEV_BSG is not set ++CONFIG_PARTITION_ADVANCED=y ++# CONFIG_EFI_PARTITION is not set ++# CONFIG_IOSCHED_DEADLINE is not set ++CONFIG_NET=y ++CONFIG_PACKET=y ++CONFIG_UNIX=y ++CONFIG_NET_KEY=y ++CONFIG_INET=y ++# CONFIG_INET_XFRM_MODE_TRANSPORT is not set ++# CONFIG_INET_XFRM_MODE_TUNNEL is not set ++# CONFIG_INET_XFRM_MODE_BEET is not set ++# CONFIG_INET_DIAG is not set ++# CONFIG_WIRELESS is not set ++CONFIG_DEVTMPFS=y ++CONFIG_DEVTMPFS_MOUNT=y ++CONFIG_BLK_DEV_LOOP=y ++CONFIG_NETDEVICES=y ++CONFIG_TUN=y ++CONFIG_FTMAC100=y ++# CONFIG_WLAN is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_KEYBOARD is not set ++# CONFIG_INPUT_MOUSE is not set ++CONFIG_INPUT_TOUCHSCREEN=y ++CONFIG_DEVKMEM=y ++CONFIG_SERIAL_8250=y ++# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set ++CONFIG_SERIAL_8250_CONSOLE=y ++CONFIG_SERIAL_OF_PLATFORM=y ++# CONFIG_HW_RANDOM is not set ++CONFIG_GPIOLIB=y ++CONFIG_DEBUG_GPIO=y ++CONFIG_GPIO_SYSFS=y ++CONFIG_GPIO_ATCGPIO100=y ++# CONFIG_HWMON is not set ++CONFIG_I2C=y ++CONFIG_I2C_CHARDEV=y ++CONFIG_I2C_ATCIIC100=y ++CONFIG_FB=y ++CONFIG_FB_FTLCDC100=y ++CONFIG_DUMMY_CONSOLE_COLUMNS=40 ++CONFIG_DUMMY_CONSOLE_ROWS=30 ++CONFIG_FRAMEBUFFER_CONSOLE=y ++CONFIG_LOGO=y ++CONFIG_SOUND=y ++CONFIG_SND=y ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_PCM_OSS=y ++CONFIG_SND_FTSSP010=y ++# CONFIG_USB_SUPPORT is not set ++CONFIG_MMC=y ++CONFIG_MMC_FTSDC=y ++# CONFIG_IOMMU_SUPPORT is not set ++CONFIG_GENERIC_PHY=y ++CONFIG_EXT2_FS=y ++CONFIG_EXT4_FS=y ++CONFIG_EXT4_FS_POSIX_ACL=y ++CONFIG_EXT4_FS_SECURITY=y ++CONFIG_EXT4_ENCRYPTION=y ++CONFIG_FANOTIFY=y ++CONFIG_MSDOS_FS=y ++CONFIG_VFAT_FS=y ++CONFIG_TMPFS=y ++CONFIG_TMPFS_POSIX_ACL=y ++CONFIG_CONFIGFS_FS=y ++# CONFIG_MISC_FILESYSTEMS is not set ++CONFIG_NFS_FS=y ++CONFIG_NFS_V3_ACL=y ++CONFIG_NFS_V4=y ++CONFIG_NFS_V4_1=y ++CONFIG_NFS_V4_2=y ++CONFIG_NFS_USE_LEGACY_DNS=y ++CONFIG_NLS_CODEPAGE_437=y ++CONFIG_NLS_ISO8859_1=y ++CONFIG_DEBUG_INFO=y ++CONFIG_DEBUG_INFO_DWARF4=y ++CONFIG_GDB_SCRIPTS=y ++CONFIG_READABLE_ASM=y ++CONFIG_DEBUG_FS=y ++CONFIG_HEADERS_CHECK=y ++CONFIG_DEBUG_SECTION_MISMATCH=y ++CONFIG_PANIC_ON_OOPS=y ++# CONFIG_DEBUG_PREEMPT is not set ++CONFIG_STACKTRACE=y ++CONFIG_RCU_CPU_STALL_TIMEOUT=300 ++# CONFIG_FTRACE is not set ++CONFIG_CRYPTO_ECHAINIV=y ++# CONFIG_CRYPTO_HW is not set ++CONFIG_SOC_SIFIVE=y ++CONFIG_SERIAL_SIFIVE=y ++CONFIG_SERIAL_SIFIVE_CONSOLE=y ++CONFIG_CLK_SIFIVE=y ++CONFIG_CLK_ANALOGBITS_WRPLL_CLN28HPC=y ++CONFIG_CLK_SIFIVE_FU540_PRCI=y ++CONFIG_SIFIVE_PLIC=y ++CONFIG_PRINTK_TIME=y ++CONFIG_RISCV_BASE_PMU=n ++CONFIG_PERF_EVENTS=n ++CONFIG_MODULES_TREE_LOOKUP=n ++CONFIG_SERIAL_EARLYCON_RISCV_SBI=y +\ No newline at end of file +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0002-Andes-support-for-Faraday-ATCMAC.patch b/board/andes/ae350/patches/linux/0002-Andes-support-for-Faraday-ATCMAC.patch new file mode 100644 index 0000000000..772700ba55 --- /dev/null +++ b/board/andes/ae350/patches/linux/0002-Andes-support-for-Faraday-ATCMAC.patch @@ -0,0 +1,510 @@ +From 1966040a640c5629cd8a437111072e092caad205 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 09:06:19 +0800 +Subject: [PATCH 02/12] Andes support for Faraday ATCMAC + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/net/ethernet/faraday/Kconfig | 13 +- + drivers/net/ethernet/faraday/ftmac100.c | 154 ++++++++++++++---------- + drivers/net/ethernet/faraday/ftmac100.h | 28 ++++- + 3 files changed, 121 insertions(+), 74 deletions(-) + +diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig +index 3d1e9a302148..d3ed03cc984d 100644 +--- a/drivers/net/ethernet/faraday/Kconfig ++++ b/drivers/net/ethernet/faraday/Kconfig +@@ -6,7 +6,7 @@ + config NET_VENDOR_FARADAY + bool "Faraday devices" + default y +- depends on ARM || NDS32 || COMPILE_TEST ++ depends on ARM || RISCV || COMPILE_TEST + help + If you have a network (Ethernet) card belonging to this class, say Y. + +@@ -19,24 +19,21 @@ if NET_VENDOR_FARADAY + + config FTMAC100 + tristate "Faraday FTMAC100 10/100 Ethernet support" +- depends on ARM || NDS32 || COMPILE_TEST +- depends on !64BIT || BROKEN ++ depends on ARM || RISCV || COMPILE_TEST + select MII + help + This driver supports the FTMAC100 10/100 Ethernet controller + from Faraday. It is used on Faraday A320, Andes AG101 and some +- other ARM/NDS32 SoC's. ++ other ARM/RISCV SoC's. + + config FTGMAC100 + tristate "Faraday FTGMAC100 Gigabit Ethernet support" +- depends on ARM || NDS32 || COMPILE_TEST +- depends on !64BIT || BROKEN ++ depends on ARM || RISCV || COMPILE_TEST + select PHYLIB + select MDIO_ASPEED if MACH_ASPEED_G6 +- select CRC32 + help + This driver supports the FTGMAC100 Gigabit Ethernet controller + from Faraday. It is used on Faraday A369, Andes AG102 and some +- other ARM/NDS32 SoC's. ++ other ARM/RISCV SoC's. + + endif # NET_VENDOR_FARADAY +diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c +index 473b337b2e3b..49a9d4ea5826 100644 +--- a/drivers/net/ethernet/faraday/ftmac100.c ++++ b/drivers/net/ethernet/faraday/ftmac100.c +@@ -4,6 +4,20 @@ + * + * (C) Copyright 2009-2011 Faraday Technology + * Po-Yu Chuang ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +@@ -38,12 +52,25 @@ + #error invalid RX_BUF_SIZE + #endif + ++#define xprintk(...) ++ ++#define FTMAC100_RX_DESC(priv, index) (&priv->descs->rxdes[index]) ++#define FTMAC100_RX_DESC_EXT(priv, index) (&priv->descs->rxdes_ext[index]) ++#define FTMAC100_TX_DESC(priv, index) (&priv->descs->txdes[index]) ++#define FTMAC100_TX_DESC_EXT(priv, index) (&priv->descs->txdes_ext[index]) ++ ++#define FTMAC100_CURRENT_RX_DESC_INDEX(priv) (priv->rx_pointer) ++#define FTMAC100_CURRENT_TX_DESC_INDEX(priv) (priv->tx_pointer); ++#define FTMAC100_CURRENT_CLEAN_TX_DESC_INDEX(priv) (priv->tx_clean_pointer); ++ + /****************************************************************************** + * private data + *****************************************************************************/ + struct ftmac100_descs { + struct ftmac100_rxdes rxdes[RX_QUEUE_ENTRIES]; + struct ftmac100_txdes txdes[TX_QUEUE_ENTRIES]; ++ struct ftmac100_rxdes_ext rxdes_ext[RX_QUEUE_ENTRIES]; ++ struct ftmac100_txdes_ext txdes_ext[TX_QUEUE_ENTRIES]; + }; + + struct ftmac100 { +@@ -69,7 +96,7 @@ struct ftmac100 { + }; + + static int ftmac100_alloc_rx_page(struct ftmac100 *priv, +- struct ftmac100_rxdes *rxdes, gfp_t gfp); ++ int index, gfp_t gfp); + + /****************************************************************************** + * internal functions (hardware register access) +@@ -96,11 +123,13 @@ static void ftmac100_disable_all_int(struct ftmac100 *priv) + + static void ftmac100_set_rx_ring_base(struct ftmac100 *priv, dma_addr_t addr) + { ++ xprintk("%s: addr %p\n", __func__, (void*)addr); + iowrite32(addr, priv->base + FTMAC100_OFFSET_RXR_BADR); + } + + static void ftmac100_set_tx_ring_base(struct ftmac100 *priv, dma_addr_t addr) + { ++ xprintk("%s: addr %p\n", __func__, (void*)addr); + iowrite32(addr, priv->base + FTMAC100_OFFSET_TXR_BADR); + } + +@@ -259,25 +288,22 @@ static void ftmac100_rxdes_set_dma_addr(struct ftmac100_rxdes *rxdes, + dma_addr_t addr) + { + rxdes->rxdes2 = cpu_to_le32(addr); ++ rxdes->rxdes3 = cpu_to_le32(addr >> 32); + } + + static dma_addr_t ftmac100_rxdes_get_dma_addr(struct ftmac100_rxdes *rxdes) + { +- return le32_to_cpu(rxdes->rxdes2); ++ return le32_to_cpu(rxdes->rxdes2) | (dma_addr_t)le32_to_cpu(rxdes->rxdes3) << 32; + } + +-/* +- * rxdes3 is not used by hardware. We use it to keep track of page. +- * Since hardware does not touch it, we can skip cpu_to_le32()/le32_to_cpu(). +- */ +-static void ftmac100_rxdes_set_page(struct ftmac100_rxdes *rxdes, struct page *page) ++static void ftmac100_rxdes_set_page(struct ftmac100 *priv, int index, struct page *page) + { +- rxdes->rxdes3 = (unsigned int)page; ++ FTMAC100_RX_DESC_EXT(priv, index)->page = page; + } + +-static struct page *ftmac100_rxdes_get_page(struct ftmac100_rxdes *rxdes) ++static struct page *ftmac100_rxdes_get_page(struct ftmac100 *priv, int index) + { +- return (struct page *)rxdes->rxdes3; ++ return (struct page *)FTMAC100_RX_DESC_EXT(priv, index)->page; + } + + /****************************************************************************** +@@ -293,26 +319,23 @@ static void ftmac100_rx_pointer_advance(struct ftmac100 *priv) + priv->rx_pointer = ftmac100_next_rx_pointer(priv->rx_pointer); + } + +-static struct ftmac100_rxdes *ftmac100_current_rxdes(struct ftmac100 *priv) +-{ +- return &priv->descs->rxdes[priv->rx_pointer]; +-} +- +-static struct ftmac100_rxdes * ++static int + ftmac100_rx_locate_first_segment(struct ftmac100 *priv) + { +- struct ftmac100_rxdes *rxdes = ftmac100_current_rxdes(priv); ++ int index = FTMAC100_CURRENT_RX_DESC_INDEX(priv); ++ struct ftmac100_rxdes *rxdes = FTMAC100_RX_DESC(priv, index); + + while (!ftmac100_rxdes_owned_by_dma(rxdes)) { + if (ftmac100_rxdes_first_segment(rxdes)) +- return rxdes; ++ return index; + + ftmac100_rxdes_set_dma_own(rxdes); + ftmac100_rx_pointer_advance(priv); +- rxdes = ftmac100_current_rxdes(priv); ++ index = FTMAC100_CURRENT_RX_DESC_INDEX(priv); ++ rxdes = FTMAC100_RX_DESC(priv, index); + } + +- return NULL; ++ return -1; + } + + static bool ftmac100_rx_packet_error(struct ftmac100 *priv, +@@ -363,9 +386,13 @@ static bool ftmac100_rx_packet_error(struct ftmac100 *priv, + static void ftmac100_rx_drop_packet(struct ftmac100 *priv) + { + struct net_device *netdev = priv->netdev; +- struct ftmac100_rxdes *rxdes = ftmac100_current_rxdes(priv); ++ struct ftmac100_rxdes *rxdes; ++ int index; + bool done = false; + ++ index = FTMAC100_CURRENT_RX_DESC_INDEX(priv); ++ rxdes = FTMAC100_RX_DESC(priv, index); ++ + if (net_ratelimit()) + netdev_dbg(netdev, "drop packet %p\n", rxdes); + +@@ -375,7 +402,8 @@ static void ftmac100_rx_drop_packet(struct ftmac100 *priv) + + ftmac100_rxdes_set_dma_own(rxdes); + ftmac100_rx_pointer_advance(priv); +- rxdes = ftmac100_current_rxdes(priv); ++ index = FTMAC100_CURRENT_RX_DESC_INDEX(priv); ++ rxdes = FTMAC100_RX_DESC(priv, index); + } while (!done && !ftmac100_rxdes_owned_by_dma(rxdes)); + + netdev->stats.rx_dropped++; +@@ -389,11 +417,12 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed) + struct page *page; + dma_addr_t map; + int length; +- bool ret; ++ int index; + +- rxdes = ftmac100_rx_locate_first_segment(priv); +- if (!rxdes) ++ index = ftmac100_rx_locate_first_segment(priv); ++ if (index < 0) + return false; ++ rxdes = FTMAC100_RX_DESC(priv, index); + + if (unlikely(ftmac100_rx_packet_error(priv, rxdes))) { + ftmac100_rx_drop_packet(priv); +@@ -404,8 +433,8 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed) + * It is impossible to get multi-segment packets + * because we always provide big enough receive buffers. + */ +- ret = ftmac100_rxdes_last_segment(rxdes); +- BUG_ON(!ret); ++ if (unlikely(!ftmac100_rxdes_last_segment(rxdes))) ++ BUG(); + + /* start processing */ + skb = netdev_alloc_skb_ip_align(netdev, 128); +@@ -424,7 +453,7 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed) + dma_unmap_page(priv->dev, map, RX_BUF_SIZE, DMA_FROM_DEVICE); + + length = ftmac100_rxdes_frame_length(rxdes); +- page = ftmac100_rxdes_get_page(rxdes); ++ page = ftmac100_rxdes_get_page(priv, index); + skb_fill_page_desc(skb, 0, page, 0, length); + skb->len += length; + skb->data_len += length; +@@ -437,7 +466,7 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed) + /* Small frames are copied into linear part to free one page */ + __pskb_pull_tail(skb, length); + } +- ftmac100_alloc_rx_page(priv, rxdes, GFP_ATOMIC); ++ ftmac100_alloc_rx_page(priv, index, GFP_ATOMIC); + + ftmac100_rx_pointer_advance(priv); + +@@ -520,25 +549,27 @@ static void ftmac100_txdes_set_dma_addr(struct ftmac100_txdes *txdes, + dma_addr_t addr) + { + txdes->txdes2 = cpu_to_le32(addr); ++ txdes->txdes3 = cpu_to_le32(addr >> 32); + } + + static dma_addr_t ftmac100_txdes_get_dma_addr(struct ftmac100_txdes *txdes) + { +- return le32_to_cpu(txdes->txdes2); ++ return le32_to_cpu(txdes->txdes2) | (dma_addr_t)le32_to_cpu(txdes->txdes3) << 32; + } + +-/* +- * txdes3 is not used by hardware. We use it to keep track of socket buffer. +- * Since hardware does not touch it, we can skip cpu_to_le32()/le32_to_cpu(). +- */ +-static void ftmac100_txdes_set_skb(struct ftmac100_txdes *txdes, struct sk_buff *skb) ++static void ftmac100_txdes_skb_reset(struct ftmac100_txdes *txdes) + { +- txdes->txdes3 = (unsigned int)skb; ++ txdes->txdes3 = 0; + } + +-static struct sk_buff *ftmac100_txdes_get_skb(struct ftmac100_txdes *txdes) ++static void ftmac100_txdes_set_skb(struct ftmac100 *priv, int index, struct sk_buff *skb) + { +- return (struct sk_buff *)txdes->txdes3; ++ FTMAC100_TX_DESC_EXT(priv, index)->skb = skb; ++} ++ ++static struct sk_buff *ftmac100_txdes_get_skb(struct ftmac100 *priv, int index) ++{ ++ return (struct sk_buff *)FTMAC100_TX_DESC_EXT(priv, index)->skb; + } + + /****************************************************************************** +@@ -559,32 +590,24 @@ static void ftmac100_tx_clean_pointer_advance(struct ftmac100 *priv) + priv->tx_clean_pointer = ftmac100_next_tx_pointer(priv->tx_clean_pointer); + } + +-static struct ftmac100_txdes *ftmac100_current_txdes(struct ftmac100 *priv) +-{ +- return &priv->descs->txdes[priv->tx_pointer]; +-} +- +-static struct ftmac100_txdes *ftmac100_current_clean_txdes(struct ftmac100 *priv) +-{ +- return &priv->descs->txdes[priv->tx_clean_pointer]; +-} +- + static bool ftmac100_tx_complete_packet(struct ftmac100 *priv) + { + struct net_device *netdev = priv->netdev; + struct ftmac100_txdes *txdes; + struct sk_buff *skb; + dma_addr_t map; ++ int index; + + if (priv->tx_pending == 0) + return false; + +- txdes = ftmac100_current_clean_txdes(priv); ++ index = FTMAC100_CURRENT_CLEAN_TX_DESC_INDEX(priv); ++ txdes = FTMAC100_TX_DESC(priv, index); + + if (ftmac100_txdes_owned_by_dma(txdes)) + return false; + +- skb = ftmac100_txdes_get_skb(txdes); ++ skb = ftmac100_txdes_get_skb(priv, index); + map = ftmac100_txdes_get_dma_addr(txdes); + + if (unlikely(ftmac100_txdes_excessive_collision(txdes) || +@@ -603,6 +626,7 @@ static bool ftmac100_tx_complete_packet(struct ftmac100 *priv) + dev_kfree_skb(skb); + + ftmac100_txdes_reset(txdes); ++ ftmac100_txdes_skb_reset(txdes); + + ftmac100_tx_clean_pointer_advance(priv); + +@@ -620,18 +644,20 @@ static void ftmac100_tx_complete(struct ftmac100 *priv) + ; + } + +-static netdev_tx_t ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb, ++static int ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb, + dma_addr_t map) + { + struct net_device *netdev = priv->netdev; + struct ftmac100_txdes *txdes; + unsigned int len = (skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len; ++ int index; + +- txdes = ftmac100_current_txdes(priv); ++ index = FTMAC100_CURRENT_TX_DESC_INDEX(priv); ++ txdes = FTMAC100_TX_DESC(priv, index); + ftmac100_tx_pointer_advance(priv); + + /* setup TX descriptor */ +- ftmac100_txdes_set_skb(txdes, skb); ++ ftmac100_txdes_set_skb(priv, index, skb); + ftmac100_txdes_set_dma_addr(txdes, map); + + ftmac100_txdes_set_first_segment(txdes); +@@ -656,9 +682,10 @@ static netdev_tx_t ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb, + * internal functions (buffer) + *****************************************************************************/ + static int ftmac100_alloc_rx_page(struct ftmac100 *priv, +- struct ftmac100_rxdes *rxdes, gfp_t gfp) ++ int index, gfp_t gfp) + { + struct net_device *netdev = priv->netdev; ++ struct ftmac100_rxdes *rxdes = FTMAC100_RX_DESC(priv, index); + struct page *page; + dma_addr_t map; + +@@ -677,7 +704,7 @@ static int ftmac100_alloc_rx_page(struct ftmac100 *priv, + return -ENOMEM; + } + +- ftmac100_rxdes_set_page(rxdes, page); ++ ftmac100_rxdes_set_page(priv, index, page); + ftmac100_rxdes_set_dma_addr(rxdes, map); + ftmac100_rxdes_set_buffer_size(rxdes, RX_BUF_SIZE); + ftmac100_rxdes_set_dma_own(rxdes); +@@ -689,8 +716,8 @@ static void ftmac100_free_buffers(struct ftmac100 *priv) + int i; + + for (i = 0; i < RX_QUEUE_ENTRIES; i++) { +- struct ftmac100_rxdes *rxdes = &priv->descs->rxdes[i]; +- struct page *page = ftmac100_rxdes_get_page(rxdes); ++ struct ftmac100_rxdes *rxdes = FTMAC100_RX_DESC(priv, i); ++ struct page *page = ftmac100_rxdes_get_page(priv, i); + dma_addr_t map = ftmac100_rxdes_get_dma_addr(rxdes); + + if (!page) +@@ -701,8 +728,8 @@ static void ftmac100_free_buffers(struct ftmac100 *priv) + } + + for (i = 0; i < TX_QUEUE_ENTRIES; i++) { +- struct ftmac100_txdes *txdes = &priv->descs->txdes[i]; +- struct sk_buff *skb = ftmac100_txdes_get_skb(txdes); ++ struct ftmac100_txdes *txdes = FTMAC100_TX_DESC(priv, i); ++ struct sk_buff *skb = ftmac100_txdes_get_skb(priv, i); + dma_addr_t map = ftmac100_txdes_get_dma_addr(txdes); + + if (!skb) +@@ -722,7 +749,8 @@ static int ftmac100_alloc_buffers(struct ftmac100 *priv) + + priv->descs = dma_alloc_coherent(priv->dev, + sizeof(struct ftmac100_descs), +- &priv->descs_dma_addr, GFP_KERNEL); ++ &priv->descs_dma_addr, ++ GFP_KERNEL); + if (!priv->descs) + return -ENOMEM; + +@@ -730,9 +758,7 @@ static int ftmac100_alloc_buffers(struct ftmac100 *priv) + ftmac100_rxdes_set_end_of_ring(&priv->descs->rxdes[RX_QUEUE_ENTRIES - 1]); + + for (i = 0; i < RX_QUEUE_ENTRIES; i++) { +- struct ftmac100_rxdes *rxdes = &priv->descs->rxdes[i]; +- +- if (ftmac100_alloc_rx_page(priv, rxdes, GFP_KERNEL)) ++ if (ftmac100_alloc_rx_page(priv, i, GFP_KERNEL)) + goto err; + } + +@@ -999,7 +1025,7 @@ static int ftmac100_stop(struct net_device *netdev) + return 0; + } + +-static netdev_tx_t ++static int + ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev) + { + struct ftmac100 *priv = netdev_priv(netdev); +diff --git a/drivers/net/ethernet/faraday/ftmac100.h b/drivers/net/ethernet/faraday/ftmac100.h +index fe986f1673fc..1e65a7ef27ba 100644 +--- a/drivers/net/ethernet/faraday/ftmac100.h ++++ b/drivers/net/ethernet/faraday/ftmac100.h +@@ -4,6 +4,20 @@ + * + * (C) Copyright 2009-2011 Faraday Technology + * Po-Yu Chuang ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + #ifndef __FTMAC100_H +@@ -22,6 +36,8 @@ + #define FTMAC100_OFFSET_ITC 0x28 + #define FTMAC100_OFFSET_APTC 0x2c + #define FTMAC100_OFFSET_DBLAC 0x30 ++#define FTMAC100_OFFSET_TXR_BADR_H 0x40 ++#define FTMAC100_OFFSET_RXR_BADR_H 0x44 + #define FTMAC100_OFFSET_MACCR 0x88 + #define FTMAC100_OFFSET_MACSR 0x8c + #define FTMAC100_OFFSET_PHYCR 0x90 +@@ -125,7 +141,7 @@ struct ftmac100_txdes { + unsigned int txdes0; + unsigned int txdes1; + unsigned int txdes2; /* TXBUF_BADR */ +- unsigned int txdes3; /* not used by HW */ ++ unsigned int txdes3; /* TXBUF_BADR_H */ + } __attribute__ ((aligned(16))); + + #define FTMAC100_TXDES0_TXPKT_LATECOL (1 << 0) +@@ -146,7 +162,7 @@ struct ftmac100_rxdes { + unsigned int rxdes0; + unsigned int rxdes1; + unsigned int rxdes2; /* RXBUF_BADR */ +- unsigned int rxdes3; /* not used by HW */ ++ unsigned int rxdes3; /* RXBUF_BADR_H */ + } __attribute__ ((aligned(16))); + + #define FTMAC100_RXDES0_RFL 0x7ff +@@ -164,4 +180,12 @@ struct ftmac100_rxdes { + #define FTMAC100_RXDES1_RXBUF_SIZE(x) ((x) & 0x7ff) + #define FTMAC100_RXDES1_EDORR (1 << 31) + ++struct ftmac100_txdes_ext { ++ void *skb; ++}; ++ ++struct ftmac100_rxdes_ext { ++ void *page; ++}; ++ + #endif /* __FTMAC100_H */ +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0003-Andes-support-for-ATCDMAC.patch b/board/andes/ae350/patches/linux/0003-Andes-support-for-ATCDMAC.patch new file mode 100644 index 0000000000..eb50c1f02d --- /dev/null +++ b/board/andes/ae350/patches/linux/0003-Andes-support-for-ATCDMAC.patch @@ -0,0 +1,3301 @@ +From ddc5b4035397fcdc91afc3a008b6632fa82e3715 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 10:55:06 +0800 +Subject: [PATCH 03/12] Andes support for ATCDMAC + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/include/asm/atcdmac300.h | 543 +++++ + arch/riscv/include/asm/dmad.h | 71 + + arch/riscv/platforms/Kconfig | 21 + + arch/riscv/platforms/Makefile | 2 + + arch/riscv/platforms/ae350/Kconfig | 7 + + arch/riscv/platforms/ae350/Makefile | 1 + + arch/riscv/platforms/ae350/atcdmac300.c | 2531 +++++++++++++++++++++++ + arch/riscv/platforms/dmad_intc.c | 49 + + 8 files changed, 3225 insertions(+) + create mode 100644 arch/riscv/include/asm/atcdmac300.h + create mode 100644 arch/riscv/include/asm/dmad.h + create mode 100644 arch/riscv/platforms/Kconfig + create mode 100644 arch/riscv/platforms/Makefile + create mode 100644 arch/riscv/platforms/ae350/Kconfig + create mode 100644 arch/riscv/platforms/ae350/Makefile + create mode 100644 arch/riscv/platforms/ae350/atcdmac300.c + create mode 100644 arch/riscv/platforms/dmad_intc.c + +diff --git a/arch/riscv/include/asm/atcdmac300.h b/arch/riscv/include/asm/atcdmac300.h +new file mode 100644 +index 000000000000..20fe88212dfc +--- /dev/null ++++ b/arch/riscv/include/asm/atcdmac300.h +@@ -0,0 +1,543 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018 Andes Technology Corporation ++ * ++ */ ++ ++#ifndef __NDS_DMAD_ATF_INC__ ++#define __NDS_DMAD_ATF_INC__ ++ ++/***************************************************************************** ++ * Configuration section ++*****************************************************************************/ ++/* Debug trace enable switch */ ++#define DMAD_ERROR_TRACE 1 /* message for fatal errors */ ++#define DMAD_DEBUG_TRACE 0 /* message for debug trace */ ++typedef u32 addr_t; ++ ++/* Device base address */ ++ ++extern resource_size_t dmac_base; ++#define DMAC_BASE (dmac_base) ++ ++/* ID and Revision Register */ ++#define ID_REV (DMAC_BASE + 0x00) ++/* DMAC Configuration Register*/ ++#define CFG (DMAC_BASE + 0x10) ++#define REQSYNC 30 ++#define CTL (DMAC_BASE + 0x20) ++#define CH_ABT (DMAC_BASE + 0x24) ++/* Interrupt Status Register */ ++#define INT_STA (DMAC_BASE + 0x30) ++#define TC_OFFSET 16 ++#define ABT_OFFSET 8 ++#define ERR_OFFSET 0 ++ ++ ++#define CH_EN (DMAC_BASE + 0x34) ++ ++ ++ ++#define DMAC_CH_OFFSET 0x40 ++#define CH_CTL_OFF 0x0 ++#define CH_SIZE_OFF 0x4 ++#define CH_SRC_LOW_OFF 0x8 ++#define CH_SRC_HIGH_OFF 0xc ++#define CH_DST_LOW_OFF 0x10 ++#define CH_DST_HIGH_OFF 0x14 ++#define CH_LLP_LOW_OFF 0x18 ++#define CH_LLP_HIGH_OFF 0x1c ++ ++ ++#define DMAC_C0_BASE (DMAC_BASE + DMAC_CH_OFFSET) ++#define DMAC_MAX_CHANNELS 8 ++#define DMAC_BASE_CH(n) (DMAC_C0_BASE + n*0x20) ++ ++/***** Channel n Control Register ******/ ++#define CH_CTL(n) DMAC_BASE_CH(n)+CH_CTL_OFF ++#define PRIORITY_SHIFT 29 ++#define PRIORITY_LOW 0 ++#define PRIORITY_HIGH 1 ++#define DMAC_CSR_CHPRI_0 PRIORITY_LOW ++#define DMAC_CSR_CHPRI_1 PRIORITY_LOW ++#define DMAC_CSR_CHPRI_2 PRIORITY_HIGH ++#define DMAC_CSR_CHPRI_3 PRIORITY_HIGH ++ ++ ++#define SBURST_SIZE_SHIFT 24 ++#define SBURST_SIZE_MASK (0xf<<24) ++#define DMAC_CSR_SIZE_1 0x0 ++#define DMAC_CSR_SIZE_2 0x1 ++#define DMAC_CSR_SIZE_4 0x2 ++#define DMAC_CSR_SIZE_8 0x3 ++#define DMAC_CSR_SIZE_16 0x4 ++#define DMAC_CSR_SIZE_32 0x5 ++#define DMAC_CSR_SIZE_64 0x6 ++#define DMAC_CSR_SIZE_128 0x7 ++#define DMAC_CSR_SIZE_256 0x8 ++#define DMAC_CSR_SIZE_512 0x9 ++#define DMAC_CSR_SIZE_1024 0xa ++/* Source transfer width */ ++#define SRCWIDTH 21 ++#define SRCWIDTH_MASK (0x7<> (width)) ++#else ++#define DMAC_CYCLE_TO_BYTES(cycle, width) 0 ++#define DMAC_BYTES_TO_CYCLE(bytes, width) 0 ++#endif /* CONFIG_PLATFORM_AHBDMA */ ++ ++ ++/* Assignment of DMA hardware handshake ID */ ++#define DMAC_REQN_SPITX 0 ++#define DMAC_REQN_SPIRX 1 ++#ifdef CONFIG_PLAT_AE350 ++#define DMAC_REQN_I2SAC97TX 14 ++#define DMAC_REQN_I2SAC97RX 15 ++#else ++ ++#define DMAC_REQN_I2SAC97TX 2 ++#define DMAC_REQN_I2SAC97RX 3 ++#endif ++#define DMAC_REQN_UART1TX 4 ++#define DMAC_REQN_UART1RX 5 ++#define DMAC_REQN_UART2TX 6 ++#define DMAC_REQN_UART2RX 7 ++#define DMAC_REQN_I2C 8 ++#define DMAC_REQN_SDC 9 ++#define DMAC_REQN_NONE 15 ++ ++ ++enum DMAD_DMAC_CORE { ++ DMAD_DMAC_AHB_CORE, ++ DMAD_DMAC_APB_CORE ++}; ++ ++enum DMAD_CHREG_FLAGS { ++ DMAD_FLAGS_NON_BLOCK = 0x00000000, ++ DMAD_FLAGS_SLEEP_BLOCK = 0x00000001, ++ DMAD_FLAGS_SPIN_BLOCK = 0x00000002, ++ DMAD_FLAGS_RING_MODE = 0x00000008, /* ring submission mode */ ++ DMAD_FLAGS_BIDIRECTION = 0x00000010, /* indicates both tx and rx */ ++}; ++ ++enum DMAD_CHDIR ++{ ++ DMAD_DIR_A0_TO_A1 = 0, ++ DMAD_DIR_A1_TO_A0 = 1, ++}; ++ ++/* AHB Channel Request ++ * ++ * Notes for developers: ++ * These should be channel-only properties. Controller-specific properties ++ * should be separated as other driver structure or driver buildin-hardcode. ++ * If controller properties are embeded in this union, request for a channel ++ * may unexpectedly override the controller setting of the request of other ++ * channels. ++ */ ++typedef struct dmad_ahb_chreq ++{ ++ /* channel property */ ++ u32 sync; /* (in) different clock domain */ ++ u32 priority; /* (in) DMAC_CSR_CHPRI_xxx */ ++ u32 hw_handshake; /* (in) hardware handshaking on/off */ ++ u32 burst_size; /* (in) DMAC_CSR_SIZE_xxx */ ++ ++ /* source property */ ++ union { ++ u32 src_width; /* (in) DMAC_CSR_WIDTH_xxx */ ++ u32 addr0_width; /* (in) bi-direction mode alias */ ++ u32 ring_width; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 src_ctrl; /* (in) DMAC_CSR_AD_xxx */ ++ u32 addr0_ctrl; /* (in) bi-direction mode alias */ ++ u32 ring_ctrl; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 src_reqn; /* (in) DMAC_REQN_xxx */ ++ u32 addr0_reqn; /* (in) bi-direction mode alias */ ++ u32 ring_reqn; /* (in) ring-mode alias */ ++ }; ++ ++ /* destination property */ ++ union { ++ u32 dst_width; /* (in) DMAC_CSR_WIDTH_xxx */ ++ u32 addr1_width; /* (in) bi-direction mode alias */ ++ u32 dev_width; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 dst_ctrl; /* (in) DMAC_CSR_AD_xxx */ ++ u32 addr1_ctrl; /* (in) bi-direction mode alias */ ++ u32 dev_ctrl; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 dst_reqn; /* (in) DMAC_REQN_xxx */ ++ u32 addr1_reqn; /* (in) bi-direction mode alias */ ++ u32 dev_reqn; /* (in) ring-mode alias */ ++ }; ++ ++ /* (in) transfer direction, valid only if following flags were set ... ++ * DMAD_FLAGS_BIDIRECTION or ++ * DMAD_FLAGS_RING_MODE ++ * value: ++ * 0 (addr0 -> addr1, or ring-buff to device) ++ * 1 (addr0 <- addr1, or device to ring-buff) ++ */ ++ u32 tx_dir; ++ ++} dmad_ahb_chreq; ++ ++/* APB Channel Request ++ * ++ * Notes for developers: ++ * These should be channel-only properties. Controller-specific properties ++ * should be separated as other driver structure or driver buildin-hardcode. ++ * If controller properties are embeded in this union, request for a channel ++ * may unexpectedly override the controller setting of the request of other ++ * channels. ++ */ ++typedef struct dmad_apb_chreq ++{ ++ /* controller property (removed! should not exist in this struct) */ ++ ++ /* channel property */ ++ u32 burst_mode; /* (in) Burst mode (0/1) */ ++ u32 data_width; /* (in) APBBR_DATAWIDTH_xxx */ ++ ++ /* source property */ ++ union { ++ u32 src_ctrl; /* (in) APBBR_ADDRINC_xxx */ ++ u32 addr0_ctrl; /* (in) bi-direction mode alias */ ++ u32 ring_ctrl; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 src_reqn; /* (in) APBBR_REQN_xxx */ ++ u32 addr0_reqn; /* (in) bi-direction mode alias */ ++ u32 ring_reqn; /* (in) ring-mode alias */ ++ }; ++ ++ /* destination property */ ++ union { ++ u32 dst_ctrl; /* (in) APBBR_ADDRINC_xxx */ ++ u32 addr1_ctrl; /* (in) bi-direction mode alias */ ++ u32 dev_ctrl; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 dst_reqn; /* (in) APBBR_REQN_xxx */ ++ u32 addr1_reqn; /* (in) bi-direction mode alias */ ++ u32 dev_reqn; /* (in) ring-mode alias */ ++ }; ++ ++ /* (in) transfer direction, valid only if following flags were set ... ++ * DMAD_FLAGS_BIDIRECTION or ++ * DMAD_FLAGS_RING_MODE ++ * value: ++ * 0 (addr0 -> addr1, or ring-buff to device) ++ * 1 (addr0 <- addr1, or device to ring-buff) ++ */ ++ u32 tx_dir; ++ ++} dmad_apb_chreq; ++ ++/* Channel Request Descriptor */ ++typedef struct dmad_chreq ++{ ++ /* common fields */ ++ u32 controller; /* (in) enum DMAD_DMAC_CORE */ ++ u32 flags; /* (in) enum DMAD_CHREQ_FLAGS */ ++ ++ /********************************************************************** ++ * ring mode specific fields (valid only for DMAD_FLAGS_RING_MODE) ++ * note: ++ * - size fields are in unit of data width ++ * * for AHB, ring size is limited to 4K * data_width of data if ++ * hw-LLP is not used ++ * * for AHB, ring size is limited to 4K * data_width * LLP-count ++ * hw-if LLP is used ++ * * for APB, ring size is limited to 16M * data_width of data ++ * - currently sw ring mode dma supports only fixed or incremental ++ * src/dst addressing ++ * - ring_size shoule >= periods * period_size ++ */ ++ dma_addr_t ring_base; /* (in) ring buffer base (pa) */ ++ dma_addr_t ring_size; /* (in) unit of data width */ ++ dma_addr_t dev_addr; /* (in) device data port address */ ++ dma_addr_t periods; /* (in) number of ints per ring */ ++ dma_addr_t period_size; /* (in) size per int, data-width */ ++ ++ ++ /* channel-wise completion callback - called when hw-ptr catches sw-ptr ++ * (i.e., channel stops) ++ * ++ * completion_cb: (in) client supplied callback function, executed in ++ * interrupt context. ++ * completion_data: (in) client private data to be passed to data ++ * argument of completion_cb(). ++ */ ++ void (*completion_cb)(int channel, u16 status, void *data); ++ void *completion_data; ++ /*********************************************************************/ ++ ++ /* channel allocation output */ ++ u32 channel; /* (out) allocated channel */ ++ void *drq; /* (out) internal use (DMAD_DRQ *)*/ ++ ++ /* channel-alloc parameters (channel-wise properties) */ ++ union { ++#ifdef CONFIG_PLATFORM_AHBDMA ++ dmad_ahb_chreq ahb_req; /* (in) for AHB DMA parameters */ ++#endif ++#ifdef CONFIG_PLATFORM_APBDMA ++ dmad_apb_chreq apb_req; /* (in) APB Bridge DMA params */ ++#endif ++ }; ++ ++} dmad_chreq; ++ ++/* drb states are mutual exclusive */ ++enum DMAD_DRB_STATE ++{ ++ DMAD_DRB_STATE_FREE = 0, ++ DMAD_DRB_STATE_READY = 0x00000001, ++ DMAD_DRB_STATE_SUBMITTED = 0x00000002, ++ DMAD_DRB_STATE_EXECUTED = 0x00000004, ++ DMAD_DRB_STATE_COMPLETED = 0x00000008, ++ //DMAD_DRB_STATE_ERROR = 0x00000010, ++ DMAD_DRB_STATE_ABORT = 0x00000020, ++}; ++ ++/* DMA request block ++ * todo: replaced link with kernel struct list_head ?? ++ */ ++typedef struct dmad_drb ++{ ++ u32 prev; /* (internal) previous node */ ++ u32 next; /* (internal) next node */ ++ u32 node; /* (internal) this node */ ++ ++ u32 state; /* (out) DRB's current state */ ++ ++ union { ++ dma_addr_t src_addr; /* (in) source pa */ ++ dma_addr_t addr0; /* (in) bi-direction mode alias */ ++ }; ++ ++ union { ++ dma_addr_t dst_addr; /* (in) destination pa */ ++ dma_addr_t addr1; /* (in) bi-direction mode alias */ ++ }; ++ ++ /* (in) AHB DMA (22 bits): 0 ~ 4M-1, unit is "data width" ++ * APB DMA (24 bits): 0 ~ 16M-1, unit is "data width * burst size" ++ * => for safe without mistakes, use dmad_make_req_cycles() to ++ * compose this value if the addressing mode is incremental ++ * mode (not working yet for decremental mode). ++ */ ++ dma_addr_t req_cycle; ++ ++ /* (in) if non-null, this sync object will be signaled upon dma ++ * completion (for blocked-waiting dma completion) ++ */ ++ struct completion *sync; ++ ++} dmad_drb; ++ ++ ++/****************************************************************************** ++ * Debug Trace Mechanism ++ */ ++#if (DMAD_ERROR_TRACE) ++#define dmad_err(format, arg...) printk(KERN_ERR format , ## arg) ++#else ++#define dmad_err(format, arg...) (void)(0) ++#endif ++ ++#if (DMAD_DEBUG_TRACE) ++#define dmad_dbg(format, arg...) printk(KERN_INFO format , ## arg) ++#else ++#define dmad_dbg(format, arg...) (void)(0) ++#endif ++ ++#if (defined(CONFIG_PLATFORM_AHBDMA) || defined(CONFIG_PLATFORM_APBDMA)) ++ ++/****************************************************************************** ++ * DMAD Driver Interface ++******************************************************************************/ ++ ++extern int dmad_channel_alloc(dmad_chreq *ch_req); ++extern int dmad_channel_free(dmad_chreq *ch_req); ++extern int dmad_channel_enable(const dmad_chreq *ch_req, u8 enable); ++extern u32 dmad_max_size_per_drb(dmad_chreq *ch_req); ++extern u32 dmad_bytes_to_cycles(dmad_chreq *ch_req, u32 byte_size); ++ ++extern int dmad_kickoff_requests(dmad_chreq *ch_req); ++extern int dmad_drain_requests(dmad_chreq *ch_req, u8 shutdown); ++ ++/* for performance reason, these two functions are platform-specific */ ++#ifdef CONFIG_PLATFORM_AHBDMA ++extern int dmad_probe_irq_source_ahb(void); ++#endif ++#ifdef CONFIG_PLATFORM_APBDMA ++extern int dmad_probe_irq_source_apb(void); ++#endif ++ ++/* note: hw_ptr here is phyical address of dma source or destination */ ++extern dma_addr_t dmad_probe_hw_ptr_src(dmad_chreq *ch_req); ++extern dma_addr_t dmad_probe_hw_ptr_dst(dmad_chreq *ch_req); ++ ++/***************************************************************************** ++ * routines only valid in discrete (non-ring) mode ++ */ ++extern int dmad_config_channel_dir(dmad_chreq *ch_req, u8 dir); ++extern int dmad_alloc_drb(dmad_chreq *ch_req, dmad_drb **drb); ++extern int dmad_free_drb(dmad_chreq *ch_req, dmad_drb *drb); ++extern int dmad_submit_request(dmad_chreq *ch_req, ++ dmad_drb *drb, u8 keep_fired); ++extern int dmad_withdraw_request(dmad_chreq *ch_req, dmad_drb *drb); ++/****************************************************************************/ ++ ++/***************************************************************************** ++ * routines only valid in ring mode ++ * note: sw_ptr and hw_ptr are values offset from the ring buffer base ++ * unit of sw_ptr is data-width ++ * unit of hw_ptr returned is byte ++ */ ++extern int dmad_update_ring(dmad_chreq *ch_req); ++extern int dmad_update_ring_sw_ptr(dmad_chreq *ch_req, ++ dma_addr_t sw_ptr, u8 keep_fired); ++extern dma_addr_t dmad_probe_ring_hw_ptr(dmad_chreq *ch_req); ++/****************************************************************************/ ++ ++#else /* CONFIG_PLATFORM_AHBDMA || CONFIG_PLATFORM_APBDMA */ ++ ++static inline int dmad_channel_alloc(dmad_chreq *ch_req) { return -EFAULT; } ++static inline int dmad_channel_free(dmad_chreq *ch_req) { return -EFAULT; } ++static inline int dmad_channel_enable(const dmad_chreq *ch_req, u8 enable) ++ { return -EFAULT; } ++static inline u32 dmad_max_size_per_drb(dmad_chreq *ch_req) { return 0; } ++static inline u32 dmad_bytes_to_cycles(dmad_chreq *ch_req, u32 byte_size) ++ { return 0; } ++static inline int dmad_kickoff_requests(dmad_chreq *ch_req) { return -EFAULT; } ++static inline int dmad_drain_requests(dmad_chreq *ch_req, u8 shutdown) ++ { return -EFAULT; } ++static inline int dmad_probe_irq_source_ahb(void) { return -EFAULT; } ++static inline int dmad_probe_irq_source_apb(void) { return -EFAULT; } ++static inline dma_addr_t dmad_probe_hw_ptr_src(dmad_chreq *ch_req) ++ { return (dma_addr_t)NULL; } ++static inline dma_addr_t dmad_probe_hw_ptr_dst(dmad_chreq *ch_req) ++ { return (dma_addr_t)NULL; } ++static inline int dmad_config_channel_dir(dmad_chreq *ch_req, u8 dir) ++ { return -EFAULT; } ++static inline int dmad_alloc_drb(dmad_chreq *ch_req, dmad_drb **drb) ++ { return -EFAULT; } ++static inline int dmad_free_drb(dmad_chreq *ch_req, dmad_drb *drb) ++ { return -EFAULT; } ++static inline int dmad_submit_request(dmad_chreq *ch_req, ++ dmad_drb *drb, u8 keep_fired) { return -EFAULT; } ++static inline int dmad_withdraw_request(dmad_chreq *ch_req, dmad_drb *drb) ++ { return -EFAULT; } ++static inline int dmad_update_ring(dmad_chreq *ch_req) ++ { return -EFAULT; } ++static inline int dmad_update_ring_sw_ptr(dmad_chreq *ch_req, ++ dma_addr_t sw_ptr, u8 keep_fired) { return -EFAULT; } ++static inline dma_addr_t dmad_probe_ring_hw_ptr(dmad_chreq *ch_req) ++ { return (dma_addr_t)NULL; } ++ ++#endif /* CONFIG_PLATFORM_AHBDMA || CONFIG_PLATFORM_APBDMA */ ++ ++#endif /* __NDS_DMAD_ATF_INC__ */ +diff --git a/arch/riscv/include/asm/dmad.h b/arch/riscv/include/asm/dmad.h +new file mode 100644 +index 000000000000..44c87b49e606 +--- /dev/null ++++ b/arch/riscv/include/asm/dmad.h +@@ -0,0 +1,71 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018 Andes Technology Corporation ++ * ++ */ ++ ++#ifndef __NDS_DMAD_INC__ ++#define __NDS_DMAD_INC__ ++ ++#include ++ ++#ifdef CONFIG_PLATFORM_AHBDMA ++int intc_ftdmac020_init_irq(int irq); ++#endif ++ ++extern resource_size_t ahb_base; ++extern resource_size_t pmu_base; ++ ++#define AMERALD_PRODUCT_ID 0x41471000 ++#define AMERALD_MASK 0xFFFFF000 ++ ++/* DMAC */ ++#define DMAC_FTDMAC020_IRQ_COUNT 8 ++#define DMAC_FTDMAC020_IRQ0 64 ++#define DMAC_FTDMAC020_IRQ1 65 ++#define DMAC_FTDMAC020_IRQ2 66 ++#define DMAC_FTDMAC020_IRQ3 67 ++#define DMAC_FTDMAC020_IRQ4 68 ++#define DMAC_FTDMAC020_IRQ5 69 ++#define DMAC_FTDMAC020_IRQ6 70 ++#define DMAC_FTDMAC020_IRQ7 71 ++ ++/* APBBRG */ ++#define APBBRG_FTAPBBRG020S_IRQ_COUNT 4 ++#define APBBRG_FTAPBBRG020S_IRQ0 72 ++#define APBBRG_FTAPBBRG020S_IRQ1 73 ++#define APBBRG_FTAPBBRG020S_IRQ2 74 ++#define APBBRG_FTAPBBRG020S_IRQ3 75 ++ ++ ++/* Dma irq */ ++#define DMA_IRQ_COUNT DMAC_FTDMAC020_IRQ_COUNT ++#define DMA_IRQ0 DMAC_FTDMAC020_IRQ0 ++#define DMA_IRQ1 DMAC_FTDMAC020_IRQ1 ++#define DMA_IRQ2 DMAC_FTDMAC020_IRQ2 ++#define DMA_IRQ3 DMAC_FTDMAC020_IRQ3 ++#define DMA_IRQ4 DMAC_FTDMAC020_IRQ4 ++#define DMA_IRQ5 DMAC_FTDMAC020_IRQ5 ++#define DMA_IRQ6 DMAC_FTDMAC020_IRQ6 ++#define DMA_IRQ7 DMAC_FTDMAC020_IRQ7 ++ ++ ++struct at_dma_platform_data { ++ unsigned int nr_channels; ++ bool is_private; ++#define CHAN_ALLOCATION_ASCENDING 0 /* zero to seven */ ++#define CHAN_ALLOCATION_DESCENDING 1 /* seven to zero */ ++ unsigned char chan_allocation_order; ++#define CHAN_PRIORITY_ASCENDING 0 /* chan0 highest */ ++#define CHAN_PRIORITY_DESCENDING 1 /* chan7 highest */ ++ unsigned char chan_priority; ++ unsigned short block_size; ++ unsigned char nr_masters; ++ unsigned char data_width[4]; ++ struct resource *io; ++ void __iomem *dmac_regs; ++ void __iomem *pmu_regs; ++ void __iomem *apb_regs; ++}; ++ ++#endif /* __NDS_DMAD_INC__ */ +diff --git a/arch/riscv/platforms/Kconfig b/arch/riscv/platforms/Kconfig +new file mode 100644 +index 000000000000..96462808c5ef +--- /dev/null ++++ b/arch/riscv/platforms/Kconfig +@@ -0,0 +1,21 @@ ++choice ++ prompt "platform type" ++ default PLAT_AE350 ++ ++config PLAT_AE350 ++ bool "ae350 platform" ++ ++endchoice ++ ++if PLAT_AE350 ++source "arch/riscv/platforms/ae350/Kconfig" ++endif ++ ++menu "Common Platform Options" ++ ++config PLATFORM_AHBDMA ++ prompt "platform AHB DMA support" ++ bool ++ default y ++ ++endmenu +diff --git a/arch/riscv/platforms/Makefile b/arch/riscv/platforms/Makefile +new file mode 100644 +index 000000000000..a95c2e44a903 +--- /dev/null ++++ b/arch/riscv/platforms/Makefile +@@ -0,0 +1,2 @@ ++obj-$(CONFIG_PLATFORM_AHBDMA) += dmad_intc.o ++obj-$(CONFIG_PLAT_AE350) += ae350/ +\ No newline at end of file +diff --git a/arch/riscv/platforms/ae350/Kconfig b/arch/riscv/platforms/ae350/Kconfig +new file mode 100644 +index 000000000000..57d3a9aa5508 +--- /dev/null ++++ b/arch/riscv/platforms/ae350/Kconfig +@@ -0,0 +1,7 @@ ++menu "AE3XX Platform Options" ++ ++config ATCDMAC300 ++ def_bool y ++ depends on PLATFORM_AHBDMA ++ ++endmenu +diff --git a/arch/riscv/platforms/ae350/Makefile b/arch/riscv/platforms/ae350/Makefile +new file mode 100644 +index 000000000000..36c86ca38e3b +--- /dev/null ++++ b/arch/riscv/platforms/ae350/Makefile +@@ -0,0 +1 @@ ++obj-y = atcdmac300.o +diff --git a/arch/riscv/platforms/ae350/atcdmac300.c b/arch/riscv/platforms/ae350/atcdmac300.c +new file mode 100644 +index 000000000000..e635328f9362 +--- /dev/null ++++ b/arch/riscv/platforms/ae350/atcdmac300.c +@@ -0,0 +1,2531 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018 Andes Technology Corporation ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++resource_size_t dmac_base; ++ ++static inline addr_t REG_READ(unsigned long r) ++{ ++ return readl((volatile void __iomem *) (unsigned long) r); ++} ++ ++static inline void REG_WRITE(addr_t d, unsigned long r) ++{ ++ writel(d, (volatile void __iomem *) (unsigned long) r); ++} ++ ++#if (defined(CONFIG_PLATFORM_AHBDMA)) ++#define DMAD_AHB_MAX_CHANNELS DMAC_MAX_CHANNELS ++ ++#define DMAD_DRB_POOL_SIZE 32 /* 128 */ ++ ++ ++static inline addr_t din(unsigned long r) ++{ ++ return REG_READ(r); ++} ++ ++static inline void dout(addr_t d, unsigned long r) ++{ ++ REG_WRITE(d,r); ++} ++ ++/* reg/io supplementals */ ++ ++static void setbl(addr_t bit, unsigned long reg) ++{ ++ REG_WRITE(REG_READ(reg) | (addr_t) ((addr_t) 1 << bit), reg); ++} ++ ++static inline void clrbl(addr_t bit, unsigned long reg) ++{ ++ REG_WRITE(REG_READ(reg) & (~((addr_t) ((addr_t) 1 << bit))), reg); ++} ++ ++static inline addr_t getbl(addr_t bit, unsigned long reg) ++{ ++ return REG_READ(reg) & (addr_t) ((addr_t) 1 << bit); ++} ++/******************************************************************************/ ++ ++enum DMAD_DRQ_FLAGS { ++ DMAD_DRQ_STATE_READY = 0x00000001, /* channel allocation status */ ++ DMAD_DRQ_STATE_ABORT = 0x00000002, /* abort drb alloc block-wait */ ++ DMAD_DRQ_DIR_A1_TO_A0 = 0x00000004, /* Transfer direction */ ++}; ++ ++#define DMAD_DRQ_DIR_MASK DMAD_DRQ_DIR_A1_TO_A0 ++ ++/* DMA request queue, one instance per channel */ ++typedef struct dmad_drq { ++ u32 state; /* enum DMAD_DRQ_STATE */ ++ ++ unsigned long channel_base; /* register base address */ ++ unsigned long enable_port; /* enable register */ ++ unsigned long src_port; /* source address register */ ++ unsigned long dst_port; /* dest address register */ ++ unsigned long cyc_port; /* size(cycle) register */ ++ ++ u32 flags; /* enum DMAD_CHREQ_FLAGS */ ++ ++ spinlock_t drb_pool_lock; ++ dmad_drb *drb_pool; /* drb pool */ ++ ++ unsigned long fre_head; /* free list head */ ++ unsigned long fre_tail; /* free list tail */ ++ ++ unsigned long rdy_head; /* ready list head */ ++ unsigned long rdy_tail; /* ready list tail */ ++ ++ unsigned long sbt_head; /* submitted list head */ ++ unsigned long sbt_tail; /* submitted list tail */ ++ ++ u32 data_width; /* dma transfer data width */ ++ ++ struct completion drb_alloc_sync; ++ ++ /* client supplied callback function, executed in interrupt context ++ * client private data to be passed to data argument of completion_cb(). ++ */ ++ void (*completion_cb) (int channel, u16 status, void *data); ++ void *completion_data; ++ ++ /* ring-mode fields are valid for DMAD_FLAGS_RING_MODE */ ++ dma_addr_t ring_base; /* ring buffer base address */ ++ int ring_size; /* size (of data width) */ ++ unsigned long ring_port; /* for setup/fetch hw_ptr */ ++ dmad_drb *ring_drb; ++ ++ addr_t dev_addr; /* device data port */ ++ ++ int periods; /* interrupts periods */ ++ int period_size; /* of dma data with */ ++ dma_addr_t period_bytes; /* Period size, in bytes */ ++ ++ /* ring_size - period_size * periods */ ++ dma_addr_t remnant_size; ++ ++ dma_addr_t sw_ptr; /* sw pointer */ ++ int sw_p_idx; /* current ring_ptr */ ++ dma_addr_t sw_p_off; /* offset to period base */ ++ ++} dmad_drq; ++ ++static inline void dmad_enable_channel(dmad_drq * drq) ++{ ++ setbl(CHEN, drq->enable_port); ++} ++ ++static inline void dmad_disable_channel(dmad_drq * drq) ++{ ++ clrbl(CHEN, drq->enable_port); ++} ++ ++static inline addr_t dmad_is_channel_enabled(dmad_drq * drq) ++{ ++ return (addr_t) getbl(CHEN, drq->enable_port); ++} ++ ++/* system irq number (per channel, ahb) */ ++static const unsigned int ahb_irqs[DMAD_AHB_MAX_CHANNELS] = { ++ DMA_IRQ0, ++ DMA_IRQ1, ++ DMA_IRQ2, ++ DMA_IRQ3, ++ DMA_IRQ4, ++ DMA_IRQ5, ++ DMA_IRQ6, ++ DMA_IRQ7, ++}; ++ ++/* Driver data structure, one instance per system */ ++typedef struct DMAD_DATA_STRUCT { ++ /* Driver data initialization flag */ ++ ++ /* DMA queue pool access control object */ ++ spinlock_t drq_pool_lock; ++ ++ /* DMA queue base address, to ease alloc/free flow */ ++ dmad_drq *drq_pool; ++ /* DMA queue for AHB DMA channels */ ++ dmad_drq *ahb_drq_pool; ++ void *plat; ++} DMAD_DATA; ++ ++/* Driver data structure instance, one instance per system */ ++ ++static DMAD_DATA dmad __attribute__ ((aligned(8))) = { ++ ++ .drq_pool_lock = __SPIN_LOCK_UNLOCKED(dmad.drq_pool_lock), ++ .drq_pool = 0, ++ .ahb_drq_pool = 0, ++ .plat = 0, ++}; ++ ++/** ++ * dmad_next_drb - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @node : [in] The node number to lookup its next node ++ * @drb : [out] The drb next to the "node" node number ++ * ++ * Lookup next DRB of the specified node number. "drb" is null if reaches end ++ * of the list. ++ */ ++static inline void dmad_next_drb(dmad_drb * drb_pool, u32 node, dmad_drb ** drb) ++{ ++ if (likely(drb_pool[node].next != 0)) ++ *drb = &drb_pool[drb_pool[node].next]; ++ else ++ *drb = 0; ++} ++ ++/** ++ * dmad_prev_drb - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @node : [in] The node number to lookup its previous node ++ * @drb : [out] The drb previous to the "node" node number ++ * ++ * Lookup previous DRB of the specified node number. "drb" is null if reaches ++ * head-end of the list. ++ */ ++static inline void dmad_prev_drb(dmad_drb * drb_pool, u32 node, dmad_drb ** drb) ++{ ++ if (unlikely(drb_pool[node].prev != 0)) ++ *drb = &drb_pool[drb_pool[node].prev]; ++ else ++ *drb = 0; ++} ++ ++/** ++ * dmad_detach_node - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @node : [in] The node to be dettached from the queue ++ * ++ * Detached a DRB specified by the node number from the queue. The head and ++ * tail records will be updated accordingly. ++ */ ++static inline void dmad_detach_node(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, u32 node) ++{ ++ if (likely(drb_pool[node].prev != 0)) { ++ /* prev->next = this->next (= 0, if this is a tail) */ ++ drb_pool[drb_pool[node].prev].next = drb_pool[node].next; ++ } else { ++ /* this node is head, move head to next node ++ * (= 0, if this is the only one node) */ ++ *head = drb_pool[node].next; ++ } ++ ++ if (unlikely(drb_pool[node].next != 0)) { ++ /* next->prev = this->prev (= 0, if this is a head) */ ++ drb_pool[drb_pool[node].next].prev = drb_pool[node].prev; ++ } else { ++ /* this node is tail, move tail to previous node ++ * (= 0, if this is the only one node) */ ++ *tail = drb_pool[node].prev; ++ } ++ ++ drb_pool[node].prev = drb_pool[node].next = 0; ++} ++ ++/** ++ * dmad_detach_head - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @drb : [out] The detached head node; null if the queue is empty ++ * ++ * Detached a DRB from the head of the queue. The head and tail records will ++ * be updated accordingly. ++ */ ++static inline void dmad_detach_head(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, dmad_drb ** drb) ++{ ++ if (unlikely(*head == 0)) { ++ *drb = NULL; ++ return; ++ } ++ ++ *drb = &drb_pool[*head]; ++ ++ if (likely((*drb)->next != 0)) { ++ /* next->prev = this->prev (= 0, if this is a head) */ ++ drb_pool[(*drb)->next].prev = 0; ++ ++ /* prev->next = this->next (do nothing, if this is a head) */ ++ ++ /* head = this->next */ ++ *head = (*drb)->next; ++ } else { ++ /* head = tail = 0 */ ++ *head = 0; ++ *tail = 0; ++ } ++ ++ /* this->prev = this->next = 0 (do nothing, if save code size) */ ++ (*drb)->prev = (*drb)->next = 0; ++} ++ ++/** ++ * dmad_get_head - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @drb : [out] The head node; null if the queue is empty ++ * ++ * Get a DRB from the head of the queue. The head and tail records remain ++ * unchanged. ++ */ ++static inline void dmad_get_head(dmad_drb * drb_pool, const unsigned long * head, ++ const unsigned long * tail, dmad_drb ** drb) ++{ ++ if (unlikely(*head == 0)) { ++ *drb = NULL; ++ return; ++ } ++ ++ *drb = &drb_pool[*head]; ++} ++ ++/** ++ * dmad_detach_tail - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @drb : [out] The tail node; null if the queue is empty ++ * ++ * Detached a DRB from the head of the queue. The head and tail records will ++ * be updated accordingly. ++ */ ++static inline void dmad_detach_tail(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, dmad_drb ** drb) ++{ ++ if (unlikely(*tail == 0)) { ++ *drb = NULL; ++ return; ++ } ++ ++ *drb = &drb_pool[*tail]; ++ ++ if (likely((*drb)->prev != 0)) { ++ /* prev->next = this->next (= 0, if this is a tail) */ ++ drb_pool[(*drb)->prev].next = 0; ++ ++ /* next->prev = this->prev (do nothing, if this is a tail) */ ++ ++ /* tail = this->prev */ ++ *tail = (*drb)->prev; ++ } else { ++ /* head = tail = 0 */ ++ *head = 0; ++ *tail = 0; ++ } ++ ++ /* this->next = this->prev = 0 (do nothing, if save code size) */ ++ (*drb)->prev = (*drb)->next = 0; ++} ++ ++/** ++ * dmad_get_tail - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @drb : [out] The tail node; null if the queue is empty ++ * ++ * Get a DRB from the tail of the queue. The head and tail records remain ++ * unchanged. ++ */ ++static inline void dmad_get_tail(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, dmad_drb ** drb) ++{ ++ if (unlikely(*tail == 0)) { ++ *drb = NULL; ++ return; ++ } ++ ++ *drb = &drb_pool[*tail]; ++} ++ ++/** ++ * dmad_attach_head - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @node : [in] The node to be attached ++ * ++ * Attach a DRB node to the head of the queue. The head and tail records will ++ * be updated accordingly. ++ */ ++static inline void dmad_attach_head(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, u32 node) ++{ ++ if (likely(*head != 0)) { ++ /* head->prev = this */ ++ drb_pool[*head].prev = node; ++ ++ /* this->next = head */ ++ drb_pool[node].next = *head; ++ /* this->prev = 0 */ ++ drb_pool[node].prev = 0; ++ ++ /* head = node */ ++ *head = node; ++ } else { ++ /* head = tail = node */ ++ *head = *tail = node; ++ drb_pool[node].prev = drb_pool[node].next = 0; ++ } ++} ++ ++/** ++ * dmad_attach_head - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @node : [in] The node to be attached ++ * ++ * Attach a DRB node to the tail of the queue. The head and tail records will ++ * be updated accordingly. ++ */ ++static inline void dmad_attach_tail(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, u32 node) ++{ ++ if (likely(*tail != 0)) { ++ /* tail->next = this */ ++ drb_pool[*tail].next = node; ++ ++ /* this->prev = tail */ ++ drb_pool[node].prev = *tail; ++ /* this->next = 0 */ ++ drb_pool[node].next = 0; ++ ++ /* tail = node */ ++ *tail = node; ++ } else { ++ /* head = tail = node */ ++ *head = *tail = node; ++ drb_pool[node].prev = drb_pool[node].next = 0; ++ } ++} ++ ++#ifdef CONFIG_PLATFORM_AHBDMA ++ ++/** ++ * dmad_ahb_isr - AHB DMA interrupt service routine ++ * ++ * @irq : [in] The irq number ++ * @dev_id : [in] The identifier to identify the asserted channel ++ * ++ * This is the ISR that services all AHB DMA channels. ++ */ ++static irqreturn_t dmad_ahb_isr(int irq, void *dev_id) ++{ ++ dmad_drq *drq; ++ dmad_drb *drb, *drb_iter; ++ u32 channel = ((unsigned long) dev_id) - 1; ++ u8 tc_int = 0; ++ u8 err_int = 0; ++ u8 abt_int = 0; ++ u8 cpl_events = 1; ++ ++ dmad_dbg("%s() >> channel(%d)\n", __func__, channel); ++ ++ if (channel >= DMAD_AHB_MAX_CHANNELS) { ++ dmad_err("%s() invlaid channel number: %d!\n", ++ __func__, channel); ++ return IRQ_HANDLED; ++ } ++ ++ /* Fetch channel's DRQ struct (DMA Request Queue) */ ++ drq = (dmad_drq *) & dmad.ahb_drq_pool[channel]; ++ ++ /* Check DMA status register to get channel number */ ++ if (likely(getbl(channel+TC_OFFSET, (unsigned long)INT_STA))) { ++ ++ /* Mark as TC int */ ++ tc_int = 1; ++ ++ /* DMAC INT TC status clear */ ++ setbl(channel+TC_OFFSET, (unsigned long)INT_STA); ++ ++ } else if (getbl(channel+ERR_OFFSET, (unsigned long)INT_STA)) { ++ ++ /* Mark as ERR int */ ++ err_int = 1; ++ ++ /* DMAC INT ERR status clear */ ++ setbl(channel+ERR_OFFSET, (unsigned long)INT_STA); ++ ++ } else if (getbl(channel+ABT_OFFSET, (unsigned long)INT_STA)) { ++ ++ /* Mark as ABT int */ ++ abt_int = 1; ++ ++ /* DMAC INT ABT status clear */ ++ setbl(channel+INT_STA, (unsigned long)INT_STA); ++ ++ } else { ++ ++ dmad_err("%s() possible false-fired ahb dma int," ++ "channel %d status-reg: status(0x%08x)\n", ++ __func__, channel,din((unsigned long)INT_STA)); ++ ++ /* Stop DMA channel (make sure the channel will be stopped) */ ++ clrbl(CH_EN, drq->enable_port); ++ return IRQ_HANDLED; ++ } ++ ++ /* DMAC ++ * Stop DMA channel temporarily */ ++ dmad_disable_channel(drq); ++ ++ spin_lock(&drq->drb_pool_lock); ++ ++ /* Lookup/detach latest submitted DRB (DMA Request Block) from ++ * the DRQ (DMA Request Queue), so ISR could kick off next DRB */ ++ dmad_detach_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); ++ if (drb == NULL) { ++ spin_unlock(&drq->drb_pool_lock); ++ /* submitted list could be empty if client cancel all requests ++ * of the channel. */ ++ return IRQ_HANDLED; ++ } ++ ++ /* release blocking of drb-allocation, if any ... */ ++ if (unlikely((drq->fre_head == 0) && ++ (drq->flags & DMAD_FLAGS_SLEEP_BLOCK))) { ++ complete_all(&drq->drb_alloc_sync); ++ } ++ ++ /* Process DRBs according to interrupt reason */ ++ if (tc_int) { ++ ++ dmad_dbg("dma finish\n"); ++ ++ dmad_dbg("finish drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x)\n", ++ drb->node, (u32) drb, drb->src_addr, ++ drb->dst_addr, drb->req_cycle); ++ ++ if (drb->req_cycle == 0) ++ cpl_events = 0; ++ ++ // Mark DRB state as completed ++ drb->state = DMAD_DRB_STATE_COMPLETED; ++ if (cpl_events && drb->sync) ++ complete_all(drb->sync); ++ ++ dmad_attach_tail(drq->drb_pool, &drq->fre_head, ++ &drq->fre_tail, drb->node); ++ ++ // Check whether there are pending requests in the DRQ ++ if (drq->sbt_head != 0) { ++ ++ // Lookup next DRB (DMA Request Block) ++ drb_iter = &drq->drb_pool[drq->sbt_head]; ++ ++ dmad_dbg("exec drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x)\n", ++ drb_iter->node, (u32) drb_iter, ++ drb_iter->src_addr, drb_iter->dst_addr, ++ drb_iter->req_cycle); ++ ++ // Kick-off DMA for next DRB ++ // - Source and destination address ++ if (drq->flags & DMAD_DRQ_DIR_A1_TO_A0) { ++ dout(drb_iter->addr1, (unsigned long)drq->src_port); ++ dout(drb_iter->addr0, (unsigned long)drq->dst_port); ++ } else { ++ dout(drb_iter->addr0, (unsigned long)drq->src_port); ++ dout(drb_iter->addr1, (unsigned long)drq->dst_port); ++ } ++ ++ /* - Transfer size (in units of source width) */ ++ dout(drb_iter->req_cycle, (unsigned long)drq->cyc_port); ++ ++ /* Kick off next request */ ++ dmad_enable_channel(drq); ++ ++ drb_iter->state = DMAD_DRB_STATE_EXECUTED; ++ ++ } else { ++ /* No pending requests, keep the DMA channel stopped */ ++ } ++ ++ } else { ++ ++ dmad_err("%s() ahb dma channel %d error!\n", __func__, channel); ++ ++ /* Zero out src, dst, and size */ ++ dout(0, (unsigned long)drq->src_port); ++ dout(0, (unsigned long)drq->dst_port); ++ dout(0, (unsigned long)drq->cyc_port); ++ ++ /* Remove all pending requests in the queue */ ++ drb_iter = drb; ++ while (drb_iter) { ++ ++ dmad_err("abort drb "); ++ ++ if (drb_iter->req_cycle == 0) ++ cpl_events = 0; ++ ++ /* Mark DRB state as abort */ ++ drb_iter->state = DMAD_DRB_STATE_ABORT; ++ ++ if (cpl_events && drb_iter->sync) ++ complete_all(drb_iter->sync); ++ ++ dmad_attach_tail(drq->drb_pool, &drq->fre_head, ++ &drq->fre_tail, drb_iter->node); ++ ++ /* Detach next submitted DRB (DMA Request Block) ++ * from the DRQ (DMA Request Queue) */ ++ dmad_detach_head(drq->drb_pool, &drq->sbt_head, ++ &drq->sbt_tail, &drb_iter); ++ } ++ } ++ ++ spin_unlock(&drq->drb_pool_lock); ++ ++ /* dispatch interrupt-context level callbacks */ ++ if (cpl_events && drq->completion_cb) { ++ /* signal DMA driver that new node is available */ ++ drq->completion_cb(channel, tc_int, drq->completion_data); ++ } ++ ++ dmad_dbg("%s() <<\n", __func__); ++ ++ return IRQ_HANDLED; ++} ++ ++/** ++ * dmad_ahb_config_dir - prepare command reg according to tx direction ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @channel_cmds : [out] Reference to array of command words to be prepared with ++ * @return : none ++ * ++ * Prepare command registers according to transfer direction ... ++ * channel_cmd[0] DMAC_CSR ++ * channel_cmd[1] DMAC_CFG ++ * ++ * This function only serves as local helper. No protection wrappers. ++ */ ++static void dmad_ahb_config_dir(dmad_chreq * ch_req, unsigned long * channel_cmds) ++{ ++ dmad_drq *drq = (dmad_drq *) ch_req->drq; ++ dmad_ahb_chreq *ahb_req = (dmad_ahb_chreq *) (&ch_req->ahb_req); ++ channel_control ch_ctl; ++ dmad_dbg("%s() channel_cmds(0x%08x)\n",__func__, channel_cmds[0]); ++ channel_cmds[0] &= ~(u32)(SRCWIDTH_MASK|SRCADDRCTRL_MASK| ++ DSTWIDTH_MASK|DSTADDRCTRL_MASK| ++ SRC_HS|DST_HS|SRCREQSEL_MASK|DSTREQSEL_MASK); ++ ++ if (ahb_req->tx_dir == 0) { ++ dmad_dbg("%s() addr0 --> addr1\n", __func__); ++ memcpy((u8 *)&ch_ctl.sWidth,(u8 *)&ahb_req->addr0_width,12); ++ memcpy((u8 *)&ch_ctl.dWidth,(u8 *)&ahb_req->addr1_width,12); ++ drq->flags &= ~(addr_t) DMAD_DRQ_DIR_A1_TO_A0; ++ }else{ ++ dmad_dbg("%s() addr0 <-- addr1\n", __func__); ++ memcpy((u8 *)&ch_ctl.sWidth,(u8 *)&ahb_req->addr1_width,12); ++ memcpy((u8 *)&ch_ctl.dWidth,(u8 *)&ahb_req->addr0_width,12); ++ drq->flags |= (addr_t) DMAD_DRQ_DIR_A1_TO_A0; ++ } ++ channel_cmds[0] |=(((ch_ctl.sWidth << SRCWIDTH) &SRCWIDTH_MASK) | ++ ((ch_ctl.sCtrl << SRCADDRCTRL) &SRCADDRCTRL_MASK) | ++ ((ch_ctl.dWidth << DSTWIDTH) &DSTWIDTH_MASK) | ++ ((ch_ctl.dCtrl << DSTADDRCTRL) &DSTADDRCTRL_MASK)); ++ drq->data_width = ch_ctl.sWidth; ++ if (likely(ahb_req->hw_handshake != 0)) { ++ if (ch_ctl.sReqn != DMAC_REQN_NONE) ++ { ++ channel_cmds[0] |= (SRC_HS | ++ ((ch_ctl.sReqn <drq; ++ dmad_ahb_chreq *ahb_req = (dmad_ahb_chreq *) (&ch_req->ahb_req); ++ u32 channel = (u32) ch_req->channel; ++ ++ unsigned long channel_base = drq->channel_base; ++ addr_t channel_cmds[1]; ++ unsigned long lock_flags; ++ dmad_dbg("%s()\n", __func__); ++ /* register interrupt handler */ ++ err = request_irq(ahb_irqs[channel], dmad_ahb_isr, 0, ++ "AHB_DMA", (void *)(unsigned long)(channel + 1)); ++ if (unlikely(err != 0)) { ++ dmad_err("unable to request IRQ %d for AHB DMA " ++ "(error %d)\n", ahb_irqs[channel], err); ++ free_irq(ahb_irqs[channel], (void *)(unsigned long)(channel + 1)); ++ return err; ++ } ++ spin_lock_irqsave(&dmad.drq_pool_lock, lock_flags); ++ ++ /* - INT TC/ERR/ABT status clear */ ++ setbl(channel+TC_OFFSET, (unsigned long)INT_STA); ++ setbl(channel+ABT_OFFSET, (unsigned long)INT_STA); ++ setbl(channel+ERR_OFFSET, (unsigned long)INT_STA); ++ ++ /* - SYNC */ ++ if (ahb_req->sync != (getbl(REQSYNC, CFG)>>REQSYNC)) ++ { ++ printk("sync configuration error !\n"); ++ return EINVAL; ++ } ++ if(ahb_req->priority > PRIORITY_HIGH) ++ ahb_req->priority = PRIORITY_HIGH; ++ ++ channel_cmds[0] = (ahb_req->priority << PRIORITY_SHIFT); ++ channel_cmds[0] |= (ahb_req->burst_size << SBURST_SIZE_SHIFT) & ++ SBURST_SIZE_MASK; ++ ++ if (0 == ++ (ch_req->flags & (DMAD_FLAGS_RING_MODE | DMAD_FLAGS_BIDIRECTION))) ++ ahb_req->tx_dir = 0; ++ ++ dmad_ahb_config_dir(ch_req, (unsigned long *)channel_cmds); ++ dout(channel_cmds[0], (unsigned long)drq->enable_port); ++ ++ /* SRCADR and DESADR */ ++ dout(0, (unsigned long) drq->src_port); ++ dout(0, (unsigned long) drq->dst_port); ++ /* CYC (transfer size) */ ++ dout(0, (unsigned long) drq->cyc_port); ++ /* LLP */ ++ dout(0, (unsigned long)channel_base + CH_LLP_LOW_OFF); ++ ++ /* TOT_SIZE - not now */ ++ spin_unlock_irqrestore(&dmad.drq_pool_lock, lock_flags); ++ ++ return err; ++} ++ ++#endif /* CONFIG_PLATFORM_AHBDMA */ ++/** ++ * dmad_channel_init - initialize given dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * This function serves as the abstraction layer of dmad_ahb_init() ++ * and dmad_apb_init() functions. ++ */ ++static int dmad_channel_init(dmad_chreq * ch_req) ++{ ++ int err = 0; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) ++ return -EFAULT; ++ ++ if (unlikely(ch_req->drq == NULL)) ++ return -EBADR; ++ ++ /* Initialize DMA controller */ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ err = dmad_ahb_init(ch_req); ++ return err; ++} ++ ++static inline void dmad_reset_channel(dmad_drq * drq) ++{ ++ /* disable dma controller */ ++ dmad_disable_channel(drq); ++ ++ /* Source and destination address */ ++ dout(0, (unsigned long)drq->src_port); ++ dout(0, (unsigned long)drq->dst_port); ++ ++ /* Transfer size (in units of source width) */ ++ dout(0, (unsigned long)drq->cyc_port); ++} ++ ++/** ++ * dmad_channel_reset - reset given dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * This function serves as the abstraction layer of dmad_ahb_reset() ++ * and dmad_apb_reset() functions. ++ */ ++static int dmad_channel_reset(dmad_chreq * ch_req) ++{ ++ u32 channel = (u32) ch_req->channel; ++ unsigned long lock_flags; ++ int err = 0; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) ++ return -EFAULT; ++ ++ if (unlikely(ch_req->drq == NULL)) ++ return -EBADR; ++ ++ spin_lock_irqsave(&((dmad_drq *) ch_req->drq)->drb_pool_lock, ++ lock_flags); ++ ++ /* stop DMA channel */ ++ dmad_reset_channel((dmad_drq *) ch_req->drq); ++ ++ spin_unlock_irqrestore(&((dmad_drq *) ch_req->drq)->drb_pool_lock, ++ lock_flags); ++ ++ /* unregister interrupt handler */ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ free_irq(ahb_irqs[channel], (void *)(unsigned long)(channel + 1)); ++ ++ return err; ++} ++ ++/** ++ * dmad_channel_alloc - allocates and initialize a dma channel ++ * @ch_req : [in/out] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * This function allocates a DMA channel according to client's request ++ * parameters. ISR and HW state will also be initialized accordingly. ++ */ ++int dmad_channel_alloc(dmad_chreq * ch_req) ++{ ++ dmad_drq *drq_iter = NULL; ++ dmad_drb *drb_iter; ++ int err = 0; ++ u32 i = 0; ++ dmad_dbg("%s()\n", __func__); ++ ++ if (ch_req == NULL) { ++ printk(KERN_ERR "%s() invalid argument!\n", __func__); ++ return -EFAULT; ++ } ++ ++ spin_lock(&dmad.drq_pool_lock); ++ ++ /* locate an available DMA channel */ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ ++ drq_iter = dmad.ahb_drq_pool; ++ ++ if ((ch_req->ahb_req.src_reqn != DMAC_REQN_NONE) || ++ (ch_req->ahb_req.dst_reqn != DMAC_REQN_NONE)) { ++ /* [2007-12-03] It looks current board have problem to ++ * do dma traffic for APB devices on DMAC channel 0/1. ++ * Redirect all APB devices to start from channel 2. ++ */ ++ ++ /* [todo] include USB controller ? */ ++ drq_iter = &dmad.ahb_drq_pool[2]; ++ for (i = 2; i < DMAD_AHB_MAX_CHANNELS; ++i, ++drq_iter) { ++ if (!(drq_iter->state & DMAD_DRQ_STATE_READY)) ++ break; ++ } ++ } else { ++ /* channel for other devices is free to allocate */ ++ for (i = 0; i < DMAD_AHB_MAX_CHANNELS; ++i, ++drq_iter) { ++ if (!(drq_iter->state & DMAD_DRQ_STATE_READY)) ++ break; ++ } ++ } ++ if (unlikely(i == DMAD_AHB_MAX_CHANNELS)) { ++ spin_unlock(&dmad.drq_pool_lock); ++ dmad_err("out of available channels (AHB DMAC)!\n"); ++ return -ENOSPC; ++ } ++ ++ dmad_dbg("allocated channel: %d (AHB DMAC)\n", i); ++ } ++ ++ if (drq_iter == NULL) { ++ spin_unlock(&dmad.drq_pool_lock); ++ printk(KERN_ERR "%s() invalid argument!\n", __func__); ++ return -EFAULT; ++ } ++ ++ spin_unlock(&dmad.drq_pool_lock); ++ memset(drq_iter, 0, sizeof(dmad_drq)); ++ ++ /* Initialize DMA channel's DRB pool as list of free DRBs */ ++ drq_iter->drb_pool = ++ kmalloc(DMAD_DRB_POOL_SIZE * sizeof(dmad_drb), GFP_ATOMIC); ++ ++ if (drq_iter->drb_pool == NULL) { ++ printk(KERN_ERR "%s() failed to allocate drb pool!\n", ++ __func__); ++ return -ENOMEM; ++ } ++ ++ /* Allocate the DMA channel */ ++ drq_iter->state = DMAD_DRQ_STATE_READY; ++ drq_iter->flags = ch_req->flags; ++ ++ /* Initialize synchronization object for DMA queue access control */ ++ spin_lock_init(&drq_iter->drb_pool_lock); ++ ++ /* Initialize synchronization object for free drb notification */ ++ init_completion(&drq_iter->drb_alloc_sync); ++ ++ /* Record the channel number in client's struct */ ++ ch_req->channel = i; ++ /* Record the channel's queue handle in client's struct */ ++ ch_req->drq = drq_iter; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ drq_iter->channel_base = (unsigned long) DMAC_BASE_CH(i); ++ drq_iter->enable_port = (unsigned long) CH_CTL(i); ++ drq_iter->src_port = (unsigned long) CH_SRC_L(i); ++ drq_iter->dst_port = (unsigned long) CH_DST_L(i); ++ drq_iter->cyc_port = (unsigned long) CH_SIZE(i); ++ } ++ /* drb-0 is an invalid node - for node validation */ ++ drb_iter = &drq_iter->drb_pool[0]; ++ drb_iter->prev = 0; ++ drb_iter->next = 0; ++ drb_iter->node = 0; ++ ++drb_iter; ++ ++ /* init other drbs - link in order */ ++ for (i = 1; i < DMAD_DRB_POOL_SIZE; ++i, ++drb_iter) { ++ drb_iter->prev = i - 1; ++ drb_iter->next = i + 1; ++ drb_iter->node = i; ++ } ++ drq_iter->drb_pool[DMAD_DRB_POOL_SIZE - 1].next = 0; ++ ++ /* Initialize channel's DRB free-list, ready-list, and submitted-list */ ++ drq_iter->fre_head = 1; ++ drq_iter->fre_tail = DMAD_DRB_POOL_SIZE - 1; ++ drq_iter->rdy_head = drq_iter->rdy_tail = 0; ++ drq_iter->sbt_head = drq_iter->sbt_tail = 0; ++ ++ /* initialize ring buffer mode resources */ ++ if (ch_req->flags & DMAD_FLAGS_RING_MODE) { ++ ++ int remnant = (int)ch_req->ring_size - ++ (int)ch_req->periods * (int)ch_req->period_size; ++ if (remnant == 0) { ++ drq_iter->periods = ch_req->periods; ++ } else if (remnant > 0) { ++ drq_iter->periods = ch_req->periods; // + 1; ++ } else { ++ dmad_err("%s() Error - buffer_size < " ++ "periods * period_size!\n", __func__); ++ err = -EFAULT; ++ goto _err_exit; ++ } ++ ++ drq_iter->ring_size = ch_req->ring_size; ++ drq_iter->period_size = ch_req->period_size; ++ drq_iter->remnant_size = (dma_addr_t) remnant; ++ ++ drq_iter->ring_base = (dma_addr_t) ch_req->ring_base; ++ drq_iter->dev_addr = (dma_addr_t) ch_req->dev_addr; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ if ((ch_req->ahb_req.ring_ctrl == DMAC_CSR_AD_DEC) || ++ (ch_req->ahb_req.dev_ctrl == DMAC_CSR_AD_DEC)) { ++ dmad_err("%s() Error - decremental" ++ " addressing DMA is not supported in" ++ " ring mode currently!\n", __func__); ++ err = -EFAULT; ++ goto _err_exit; ++ } ++ ++ if (ch_req->ahb_req.ring_ctrl == DMAC_CSR_AD_FIX) { ++ dmad_err("%s() Error - ring address control is " ++ "fixed in ring DMA mode!\n", __func__); ++ err = -EFAULT; ++ goto _err_exit; ++ } ++ ++ drq_iter->period_bytes = ++ DMAC_CYCLE_TO_BYTES(ch_req->period_size, ++ ch_req->ahb_req.ring_width); ++ ++ /* 0 - addr0 to addr1; 1 - addr1 to addr0 */ ++ if (ch_req->ahb_req.tx_dir == 0) ++ drq_iter->ring_port =(unsigned long) drq_iter->src_port; ++ else ++ drq_iter->ring_port =(unsigned long) drq_iter->dst_port; ++ ++ } ++ ++ dmad_dbg("%s() ring: base(0x%08x) port(0x%08x) periods(0x%08x)" ++ " period_size(0x%08x) period_bytes(0x%08x)" ++ " remnant_size(0x%08x)\n", ++ __func__, drq_iter->ring_base, drq_iter->ring_port, ++ drq_iter->periods, drq_iter->period_size, ++ drq_iter->period_bytes, drq_iter->remnant_size); ++ } ++ ++ drq_iter->completion_cb = ch_req->completion_cb; ++ drq_iter->completion_data = ch_req->completion_data; ++ ++ /* Initialize the channel && register isr */ ++ err = dmad_channel_init(ch_req); ++ ++_err_exit: ++ ++ if (err != 0) { ++ spin_lock(&dmad.drq_pool_lock); ++ ++ kfree(drq_iter->drb_pool); ++ memset(drq_iter, 0, sizeof(dmad_drq)); ++ ++ ch_req->channel = -1; ++ ch_req->drq = (void *)0; ++ ++ spin_unlock(&dmad.drq_pool_lock); ++ ++ dmad_err("Failed to initialize APB DMA! " ++ "Channel allocation aborted!\n"); ++ } ++ ++ return err; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_channel_alloc); ++ ++/** ++ * dmad_channel_free - release a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * This function releases a DMA channel. The channel is available for future ++ * allocation after the invokation. ++ */ ++int dmad_channel_free(dmad_chreq * ch_req) ++{ ++ dmad_drq *drq; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ if (unlikely((ch_req->channel < 0) || ++ ((drq->state & DMAD_DRQ_STATE_READY) == 0))) { ++ dmad_err("try to free a free channel!\n"); ++ return -EBADR; ++ } ++ ++ /* Stop/abort channel I/O ++ * (forced to shutdown and should be protected against isr) ++ */ ++ dmad_drain_requests(ch_req, 1); ++ dmad_channel_reset(ch_req); ++ ++ dmad_dbg("freed channel: %d\n", ch_req->channel); ++ ++ spin_lock(&dmad.drq_pool_lock); ++ ++ kfree(drq->drb_pool); ++ memset(drq, 0, sizeof(dmad_drq)); ++ ++ ch_req->drq = 0; ++ ch_req->channel = (u32) - 1; ++ ++ spin_unlock(&dmad.drq_pool_lock); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_channel_free); ++ ++/** ++ * dmad_channel_enable - enable/disable a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @enable : [in] 1 to enable the channel, 0 to disable ++ * @return : 0 if success, non-zero if any error ++ * ++ * Enable or disable the given DMA channel. ++ */ ++int dmad_channel_enable(const dmad_chreq * ch_req, u8 enable) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) ++ return -EFAULT; ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) ++ return -EBADR; ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* Enable/disable DMA channel */ ++ if (enable) ++ dmad_enable_channel(drq); ++ else ++ dmad_disable_channel(drq); ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_channel_enable); ++ ++/** ++ * dmad_config_channel_dir - config dma channel transfer direction ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @dir : [in] DMAD_DRQ_DIR_A0_TO_A1 or DMAD_DRQ_DIR_A1_TO_A0 ++ * @return : 0 if success, non-zero if any error ++ * ++ * Reconfigure the channel transfer direction. This function works only if ++ * the channel was allocated with the DMAD_FLAGS_BIDIRECTION flags. Note ++ * that bi-direction mode and ring mode are mutual-exclusive from user's ++ * perspective. ++ */ ++int dmad_config_channel_dir(dmad_chreq * ch_req, u8 dir) ++{ ++ dmad_drq *drq; ++ addr_t channel_cmds[1]; ++ unsigned long lock_flags; ++ u8 cur_dir; ++ ++ if (unlikely(ch_req == NULL)) ++ return -EFAULT; ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) ++ return -EBADR; ++ ++ if (unlikely(!(ch_req->flags & DMAD_FLAGS_BIDIRECTION))) { ++ dmad_err("%s() Channel is not configured as" ++ " bidirectional!\n", __func__); ++ return -EFAULT; ++ } ++ ++ cur_dir = drq->flags & DMAD_DRQ_DIR_MASK; ++ if (dir == cur_dir) { ++ dmad_dbg("%s() cur_dir(%d) == dir(%d) skip reprogramming hw.\n", ++ __func__, cur_dir, dir); ++ return 0; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ if (unlikely((drq->sbt_head != 0) /*||dmad_is_channel_enabled(drq) */ )) { ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ dmad_err("%s() Cannot change direction while the " ++ "channel has pending requests!\n", __func__); ++ return -EFAULT; ++ } ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ channel_cmds[0] = din((unsigned long)drq->enable_port); ++ ch_req->ahb_req.tx_dir = dir; ++ dmad_ahb_config_dir(ch_req, (unsigned long *)channel_cmds); ++ dout(channel_cmds[0], (unsigned long)drq->enable_port); ++ } ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_config_channel_dir); ++ ++/** ++ * dmad_max_size_per_drb - return maximum transfer size per drb ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : The maximum transfer size per drb, in bytes. ++ * ++ * Calculate the maximum transfer size per drb according to the setting of ++ * data width during channel initialization. ++ * ++ * Return size is aligned to 4-byte boundary; this ensures the alignment ++ * requirement of dma starting address if the function was used in a loop to ++ * separate a large size dma transfer. ++ */ ++u32 dmad_max_size_per_drb(dmad_chreq * ch_req) ++{ ++ addr_t size = 0; ++ addr_t data_width = (addr_t) ((dmad_drq *) ch_req->drq)->data_width; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ size = DMAC_CYCLE_TO_BYTES(DMAC_TOT_SIZE_MASK & ((addr_t) ~ 3), ++ data_width); ++ } ++ ++ dmad_dbg("%s() - 0x%08x bytes\n", __func__, size); ++ ++ return size; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_max_size_per_drb); ++ ++/** ++ * dmad_bytes_to_cycles - calculate drb transfer size, in cycles ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @byte_size : [in] The DMA transfer size to be converted, in bytes ++ * @return : The drb transfer size, in cycles. ++ * ++ * Calculate the drb transfer cycle according to the setting of channel data ++ * width and burst setting. ++ * ++ * AHB DMA : unit is number of "data width". ++ * APB DMA : unit is number of "data width * burst size" ++ * ++ * APB Note: According to specification, decrement addressing seems to regard ++ * the burst size setting. For code efficiency, ++ * dmad_make_req_cycles() does not take care of this case and might ++ * produce wrong result. ++ */ ++u32 dmad_bytes_to_cycles(dmad_chreq * ch_req, u32 byte_size) ++{ ++ addr_t cycle = 0; ++ addr_t data_width = (addr_t) ((dmad_drq *) ch_req->drq)->data_width; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ cycle = DMAC_BYTES_TO_CYCLE(byte_size, data_width); ++ } ++ ++ dmad_dbg("%s() - 0x%08x bytes --> 0x%08x cycles\n", ++ __func__, byte_size, cycle); ++ return cycle; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_bytes_to_cycles); ++ ++/** ++ * dmad_alloc_drb_internal - allocate a dma-request-block of a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [out] Reference to a drb pointer to receive the allocated drb ++ * @return : 0 if success, non-zero if any error ++ * ++ * Allocates a DRB (DMA request block) of the given DMA channel. DRB is a ++ * single dma request which will be pushed into the submission queue of the ++ * given DMA channel. This is a lightweight internal version of ++ * dmad_alloc_drb() majorly for use in ring mode. Critical access to the ++ * drb pool should be protected before entering this function. ++ */ ++static inline int dmad_alloc_drb_internal(dmad_drq * drq, dmad_drb ** drb) ++{ ++ /* Initialize drb ptr in case of fail allocation */ ++ *drb = NULL; ++ ++ if (unlikely(drq->fre_head == 0)) { ++ return -EAGAIN; ++ } ++ ++ dmad_detach_head(drq->drb_pool, &drq->fre_head, &drq->fre_tail, drb); ++ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, (*drb)->node); ++ ++ (*drb)->state = DMAD_DRB_STATE_READY; ++ (*drb)->sync = 0; ++ ++ dmad_dbg("%s() drb(%d 0x%08x)\n", __func__, (*drb)->node, (u32) (*drb)); ++ ++ return 0; ++} ++ ++/** ++ * dmad_alloc_drb - allocate a dma-request-block of a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [out] Reference to a drb pointer to receive the allocated drb ++ * @return : 0 if success, non-zero if any error ++ * ++ * Allocates a DRB (DMA request block) of the given DMA channel. DRB is a ++ * single dma request which will be pushed into the submission queue of the ++ * given DMA channel. ++ */ ++int dmad_alloc_drb(dmad_chreq * ch_req, dmad_drb ** drb) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (likely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* Initialize drb ptr in case of fail allocation */ ++ *drb = NULL; ++ ++ if (unlikely(drq->fre_head == 0)) { ++ ++ drq->state &= (u32) ~ DMAD_DRQ_STATE_ABORT; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++_wait_for_free_drbs: ++ ++ /* Wait for free urbs */ ++ if (drq->flags & DMAD_FLAGS_SLEEP_BLOCK) { ++ ++ int timeout = ++ wait_for_completion_interruptible_timeout(&drq-> ++ drb_alloc_sync, ++ msecs_to_jiffies ++ (6000)); ++ ++ /* reset sync object */ ++ reinit_completion(&drq->drb_alloc_sync); ++ ++ if (timeout < 0) { ++ dmad_err("%s() wait for" ++ " completion error! (%d)\n", ++ __func__, timeout); ++ return timeout; ++ } ++ ++ } else if (drq->flags & DMAD_FLAGS_SPIN_BLOCK) { ++ ++ u32 timeout = 0x00ffffff; ++ ++ while ((drq->fre_head == 0) && (--timeout != 0)) { ++ } ++ if (timeout == 0) { ++ dmad_err("%s() polling wait for " ++ "completion timeout!\n", __func__); ++ return -EAGAIN; ++ } ++ ++ } else { ++ return -EAGAIN; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* check whether all the requests of the channel has been ++ * abandoned or not */ ++ if (unlikely(drq->state & DMAD_DRQ_STATE_ABORT)) { ++ dmad_dbg("%s() drb-allocation aborted due" ++ " to cancel-request ...\n", __func__); ++ drq->state &= (u32) ~ DMAD_DRQ_STATE_ABORT; ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -ECANCELED; ++ } ++ ++ /* check again to avoid non-atomic operation between above ++ * two calls */ ++ if (unlikely(drq->fre_head == 0)) { ++ dmad_dbg("%s() lost free drbs ... " ++ "continue waiting ...\n", __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ goto _wait_for_free_drbs; ++ } ++ } ++ ++ dmad_detach_head(drq->drb_pool, &drq->fre_head, &drq->fre_tail, drb); ++ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, (*drb)->node); ++ ++ (*drb)->state = DMAD_DRB_STATE_READY; ++ (*drb)->sync = 0; ++ ++ dmad_dbg("%s() drb(%d 0x%08x)\n", __func__, (*drb)->node, (u32) (*drb)); ++ ++ drq->state &= (u32) ~ DMAD_DRQ_STATE_ABORT; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_alloc_drb); ++ ++/** ++ * dmad_free_drb - free a dma-request-block of a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [in] Reference to a drb to be freed ++ * @return : 0 if success, non-zero if any error ++ * ++ * Frees a DRB (DMA request block) of the given DMA channel. DRB is a ++ * single dma request which will be pushed into the submission queue of the ++ * given DMA channel. ++ */ ++int dmad_free_drb(dmad_chreq * ch_req, dmad_drb * drb) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /**************************************************** ++ * Following code requires _safe_exit return path ++ */ ++ ++ if (unlikely((drq->rdy_head == 0) || (drb->node == 0) || ++ (drb->state != DMAD_DRB_STATE_READY) || ++ (drb->node >= DMAD_DRB_POOL_SIZE))) { ++ dmad_err("Ready-queue is empty or invalid node!\n"); ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -EBADR; ++ } ++ ++ dmad_detach_node(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, drb->node); ++ dmad_attach_tail(drq->drb_pool, ++ &drq->fre_head, &drq->fre_tail, drb->node); ++ ++ drb->state = DMAD_DRB_STATE_FREE; ++ drb->sync = 0; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_free_drb); ++ ++/** ++ * dmad_submit_request_internal - submit a dma-request-block to the dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [in] Reference to a drb to be submitted ++ * @keep_fired : [in] non-zero to kickoff dma even the channel has stopped due ++ * to finishing its previous request ++ * @return : 0 if success, non-zero if any error ++ * ++ * Submit a DRB (DMA request block) of the given DMA channel to submission ++ * queue. DRB is a single dma request which will be pushed into the ++ * submission queue of the given DMA channel. This is a lightweight internal ++ * version of dmad_alloc_drb() majorly for use in ring mode. Critical access to ++ * the drb pool should be protected before entering this function. ++ */ ++static inline int dmad_submit_request_internal(dmad_drq * drq, dmad_drb * drb) ++{ ++ if (drb->state == DMAD_DRB_STATE_READY) { ++ /* Detach user node from ready list */ ++ dmad_detach_node(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, drb->node); ++ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->sbt_head, &drq->sbt_tail, drb->node); ++ ++ drb->state = DMAD_DRB_STATE_SUBMITTED; ++ ++ dmad_dbg("%s() submit drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x) state(%d)\n", __func__, ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, drb->state); ++ } else { ++ dmad_dbg("%s() skip drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x)" ++ " size(0x%08x) state(%d)\n", __func__, ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, drb->state); ++ } ++ ++ return 0; ++} ++ ++/** ++ * dmad_submit_request - submit a dma-request-block to the dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [in] Reference to a drb to be submitted ++ * @keep_fired : [in] non-zero to kickoff dma even the channel has stopped due ++ * to finishing its previous request ++ * @return : 0 if success, non-zero if any error ++ * ++ * Submit a DRB (DMA request block) of the given DMA channel to submission ++ * queue. DRB is a single dma request which will be pushed into the ++ * submission queue of the given DMA channel. ++ */ ++int dmad_submit_request(dmad_chreq * ch_req, dmad_drb * drb, u8 keep_fired) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /****************************************************** ++ * Following code require _safe_exit return path ++ */ ++ ++ if (unlikely((drq->rdy_head == 0) || (drb->node == 0) || ++ (drb->node >= DMAD_DRB_POOL_SIZE))) { ++ printk("node error\n"); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -EBADR; ++ } ++ ++ /* Detach user node from ready list */ ++ dmad_detach_node(drq->drb_pool, &drq->rdy_head, &drq->rdy_tail, ++ drb->node); ++ ++ /* Queue DRB to the end of the submitted list */ ++ dmad_dbg("submit drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) sync(0x%08x) fire(%d)\n", ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, (u32) drb->sync, keep_fired); ++ ++ /* Check if submission is performed to an empty queue */ ++ if (unlikely(keep_fired && (drq->sbt_head == 0))) { ++ /* DMA is not running, so kick off transmission */ ++ dmad_dbg("kickoff dma engine.\n"); ++ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->sbt_head, &drq->sbt_tail, drb->node); ++ /* Source and destination address */ ++ if (drq->flags & DMAD_DRQ_DIR_A1_TO_A0) { ++ dout(drb->addr1, (unsigned long) drq->src_port); ++ dout(drb->addr0, (unsigned long) drq->dst_port); ++ } else { ++ dout(drb->addr0, (unsigned long) drq->src_port); ++ dout(drb->addr1, (unsigned long) drq->dst_port); ++ } ++ ++ /* Transfer size (in units of source width) */ ++ dout(drb->req_cycle, (unsigned long) drq->cyc_port); ++ ++ /* Enable DMA channel (Kick off transmission when client ++ * enable it's transfer state) */ ++ dmad_enable_channel(drq); ++ drb->state = DMAD_DRB_STATE_EXECUTED; ++ } else { ++ /* DMA is already running, so only queue DRB to the end of the ++ * list */ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->sbt_head, &drq->sbt_tail, drb->node); ++ drb->state = DMAD_DRB_STATE_SUBMITTED; ++ } ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_submit_request); ++ ++/** ++ * dmad_withdraw_request - cancel a submitted dma-request-block ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [in] Reference to a drb to be submitted ++ * @keep_fired : [in] non-zero to kickoff dma even the channel has stopped due ++ * to finishing its previous request ++ * @return : 0 if success, non-zero if any error ++ * ++ * Cancel a submitted DRB (DMA request block) of the given DMA channel in its ++ * submission queue. DRB is a single dma request which will be pushed into the ++ * submission queue of the given DMA channel. Cancellation fails if the DRB has ++ * already been kicked off. ++ */ ++int dmad_withdraw_request(dmad_chreq * ch_req, dmad_drb * drb) ++{ ++ dmad_drq *drq = 0; ++ unsigned long lock_flags; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ if (unlikely(drq->sbt_head == 0)) ++ return -EBADR; ++ ++ if (unlikely((drb->node == 0) || (drb->node >= DMAD_DRB_POOL_SIZE))) ++ return -EBADR; ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ if (unlikely((drq->sbt_head == 0) || (drb->node == 0) || ++ (drb->state != DMAD_DRB_STATE_SUBMITTED) || ++ (drb->node >= DMAD_DRB_POOL_SIZE))) { ++ dmad_err("Submitted-queue is empty or invalid node!\n"); ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -EBADR; ++ } ++ ++ dmad_dbg("cancel drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, drb->state); ++ ++ if (unlikely(drb->state == DMAD_DRB_STATE_EXECUTED)) { ++ dmad_dbg("Already running drb cannot be stopped currently!\n"); ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return 0;/*-EBADR; */ ++ } ++ ++ dmad_detach_node(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, drb->node); ++ dmad_attach_tail(drq->drb_pool, ++ &drq->fre_head, &drq->fre_tail, drb->node); ++ ++ drb->state = DMAD_DRB_STATE_FREE; ++ ++ if (drb->sync) ++ complete_all(drb->sync); ++ drb->sync = 0; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_withdraw_request); ++ ++/** ++ * dmad_kickoff_requests_internal - kickoff hw DMA transmission ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * Kickoff hw DMA transmission of the given DMA channel. This function is ++ * valid for both ring & non-ring mode. This is a lightweight internal version ++ * of dmad_kickoff_requests() majorly for use in ring mode. Critical access to ++ * the drb pool should be protected before entering this function. ++ */ ++static inline int dmad_kickoff_requests_internal(dmad_drq * drq) ++{ ++ dmad_drb *drb; ++ ++ dmad_get_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); ++ ++ if (!drb) { ++ dmad_err("%s() null drb!\n", __func__); ++ return -EBADR; ++ } ++ ++ dmad_dbg("%s() drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", __func__, ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, drb->state); ++ ++ if (drb->state == DMAD_DRB_STATE_SUBMITTED) { ++ /* Transfer size (in units of source width) */ ++ dout(drb->req_cycle, (unsigned long) drq->cyc_port); ++ ++ /* Source and destination address */ ++ if (drq->flags & DMAD_DRQ_DIR_A1_TO_A0) { ++ dout(drb->addr1, (unsigned long) drq->src_port); ++ dout(drb->addr0, (unsigned long) drq->dst_port); ++ } else { ++ dout(drb->addr0, (unsigned long) drq->src_port); ++ dout(drb->addr1, (unsigned long) drq->dst_port); ++ } ++ ++ drb->state = DMAD_DRB_STATE_EXECUTED; ++ } ++ ++ /* Enable DMA channel */ ++ if (!dmad_is_channel_enabled(drq)) { ++ dmad_enable_channel(drq); ++ } ++ ++ return 0; ++} ++ ++/** ++ * dmad_kickoff_requests - kickoff hw DMA transmission of the given DMA channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * Kickoff hw DMA transmission of the given DMA channel. This function is ++ * valid for both ring & non-ring mode. ++ */ ++int dmad_kickoff_requests(dmad_chreq * ch_req) ++{ ++ dmad_drq *drq = 0; ++ dmad_drb *drb = 0; ++ unsigned long lock_flags; ++ dma_addr_t req_cycle; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ dmad_get_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); ++ ++ dmad_dbg("drq(0x%08x) channel_base(0x%08x)\n", ++ (u32) drq, drq->channel_base); ++ dmad_dbg("kick off drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d) a1_to_a0(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, ++ drb->req_cycle, drb->state, ++ drq->flags & DMAD_DRQ_DIR_A1_TO_A0); ++ ++ /* do nothing if no drbs are in the submission queue */ ++ if (unlikely((drb == 0) || (drb->state != DMAD_DRB_STATE_SUBMITTED))) { ++ dmad_dbg("%s() invalid drb(%d 0x%08x) or drb-state(%d)!\n", ++ __func__, ++ drb->node, (u32) drb, drb ? drb->state : 0xffffffff); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return 0; ++ } ++ ++ req_cycle = drb->req_cycle; ++ ++ if (unlikely(req_cycle == 0)) { ++ dmad_dbg("%s() zero transfer size!\n", __func__); ++ goto _safe_exit; ++ } ++ ++ /* Transfer size (in units of source width) */ ++ dout(req_cycle, (unsigned long) drq->cyc_port); ++ ++ /* Source and destination address */ ++ if (drq->flags & DMAD_DRQ_DIR_A1_TO_A0) { ++ dout(drb->addr1, (unsigned long) drq->src_port); ++ dout(drb->addr0, (unsigned long) drq->dst_port); ++ } else { ++ dout(drb->addr0, (unsigned long) drq->src_port); ++ dout(drb->addr1, (unsigned long) drq->dst_port); ++ } ++ ++ drb->state = DMAD_DRB_STATE_EXECUTED; ++ ++ /* Enable DMA channel */ ++ dmad_enable_channel(drq); ++ ++_safe_exit: ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_kickoff_requests); ++ ++/** ++ * dmad_probe_hw_ptr_src - probe DMA source hw-address of the given channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : physical address of current HW source pointer ++ * ++ * Probe DMA source hw-address of the given channel. ++ */ ++dma_addr_t dmad_probe_hw_ptr_src(dmad_chreq * ch_req) ++{ ++ return (dma_addr_t) din(((dmad_drq *) ch_req->drq)->src_port); ++} ++ ++EXPORT_SYMBOL_GPL(dmad_probe_hw_ptr_src); ++ ++/** ++ * dmad_probe_hw_ptr_dst - probe DMA destination hw-address of the given channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : physical address of current HW destination pointer ++ * ++ * Probe DMA destination hw-address of the given channel. ++ */ ++dma_addr_t dmad_probe_hw_ptr_dst(dmad_chreq * ch_req) ++{ ++ return (dma_addr_t) din(((dmad_drq *) ch_req->drq)->dst_port); ++} ++ ++EXPORT_SYMBOL_GPL(dmad_probe_hw_ptr_dst); ++ ++/** ++ * dmad_update_ring - update DMA ring buffer base && size of the given channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @size : [in] The new ring buffer size, in unit of data width (cycles) ++ * @return : 0 if success, non-zero if any error ++ * ++ * Update DMA ring buffer size of the given channel. This function is valid ++ * only if the channel is initialized as ring buffer mode. ++ */ ++int dmad_update_ring(dmad_chreq * ch_req) ++{ ++ unsigned long lock_flags; ++ dmad_drq *drq = (dmad_drq *) ch_req->drq; ++ int remnant; ++ ++ if (unlikely(dmad_is_channel_enabled(drq))) { ++ dmad_err("%s() Error - dma channel should be " ++ "disabled before updating ring size!\n", __func__); ++ return -EFAULT; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* todo: range checking */ ++ ++ remnant = (int)ch_req->ring_size - ++ (int)ch_req->periods * (int)ch_req->period_size; ++ if (remnant == 0) { ++ drq->periods = ch_req->periods; ++ } else if (remnant > 0) { ++ drq->periods = ch_req->periods; // + 1; ++ } else { ++ dmad_err("%s() Error - buffer_size < " ++ "periods * period_size!\n", __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -EFAULT; ++ } ++ ++ drq->ring_base = ch_req->ring_base; ++ drq->ring_size = ch_req->ring_size; ++ drq->period_size = ch_req->period_size; ++ drq->remnant_size = (dma_addr_t) remnant; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ drq->period_bytes = ++ DMAC_CYCLE_TO_BYTES(drq->period_size, drq->data_width); ++ } ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ dmad_dbg("%s() ring: base(0x%08x) port(0x%08x) periods(0x%08x) " ++ "period_size(0x%08x) period_bytes(0x%08x) " ++ "remnant_size(0x%08x)\n", ++ __func__, drq->ring_base, drq->ring_port, ++ drq->periods, drq->period_size, drq->period_bytes, ++ drq->remnant_size); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_update_ring); ++ ++/** ++ * dmad_update_ring_sw_ptr - update DMA ring buffer sw-pointer ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @sw_ptr : [in] The new sw-pointer for the hw-pointer to chase of ++ * @keep_fired : [in] non-zero to kickoff dma even the channel has stopped due ++ * to finishing its previous request ++ * @return : 0 if success, non-zero if any error ++ * ++ * Update DMA ring buffer sw-pointer of the given channel on the fly. This ++ * function is valid only if the channel is initialized as ring buffer mode. ++ * Uint of sw_ptr is in number of dma data width. ++ */ ++int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, ++ dma_addr_t sw_ptr, u8 keep_fired) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ dma_addr_t hw_off = 0, ring_ptr; ++ dma_addr_t sw_p_off, ring_p_off, period_bytes; ++ dma_addr_t remnant_size; ++ int period_size; ++ int sw_p_idx, ring_p_idx, period, periods; ++ dmad_drb *drb = NULL; ++ ++ /*if (ch_req == NULL) { */ ++ /* dmad_dbg("%s() null ch_req!\n", __func__); */ ++ /* return -EFAULT; */ ++ /*} */ ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ /*if (drq == NULL) { */ ++ /* dmad_dbg("%s() null ch_req->drq!\n", __func__); */ ++ /* return -EBADR; */ ++ /*} */ ++ ++ if (unlikely(sw_ptr > drq->ring_size)) { ++// dmad_err("%s() Invalid ring buffer sw-pointer "); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ periods = drq->periods; ++ period_size = drq->period_size; ++ period_bytes = drq->period_bytes; ++ remnant_size = drq->remnant_size; ++ ++ ring_ptr = drq->sw_ptr; ++ ring_p_idx = drq->sw_p_idx; ++ ring_p_off = drq->sw_p_off; ++ ++ sw_p_idx = div_u64(sw_ptr, period_size); ++ __iter_div_u64_rem(sw_ptr, period_size, &sw_p_off); ++ ++ if (remnant_size && (sw_p_idx == periods)) { ++ --sw_p_idx; ++ sw_p_off += period_size; ++ } ++ ++ dmad_dbg("%s() ring_ptr(0x%08x) ring_p_idx(0x%08x) " ++ "ring_p_off(0x%08x)\n", ++ __func__, ring_ptr, ring_p_idx, ring_p_off); ++ dmad_dbg("%s() sw_ptr(0x%08x) sw_p_idx(0x%08x) sw_p_off(0x%08x)\n", ++ __func__, sw_ptr, sw_p_idx, sw_p_off); ++ ++ if (drq->ring_drb && ++ (drq->ring_drb->state & (DMAD_DRB_STATE_READY | ++ DMAD_DRB_STATE_SUBMITTED | ++ DMAD_DRB_STATE_EXECUTED))) { ++ drb = drq->ring_drb; ++ } else { ++ /* alloc new drb if there is none yet at ring_ptr */ ++ if (0 != dmad_alloc_drb_internal(drq, &drb)) { ++ dmad_err("%s() drb allocation failed!\n", __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -ENOSPC; ++ } ++ drb->addr0 = ((dma_addr_t) ring_p_idx * period_bytes) + ++ drq->ring_base; ++ drb->addr1 = drq->dev_addr; ++ drb->req_cycle = 0; // redundent, though, no harm to performance ++ ++ dmad_dbg("init_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->src_addr, ++ drb->dst_addr, drb->req_cycle, drb->state); ++ ++ drq->ring_drb = drb; ++ } ++ ++ /* Following code-path has been optimized. The design flow is expanded ++ * below for reference. ++ * ++ * if (sw_ptr >= ring_ptr) ++ * if (sw_p_idx == ring_p_idx) ++ * ring_drb::req_cycle <- sw_p_off ++ * if (ring_drb::state == executed) ++ * hw_cycle <- sw_p_idx ++ * fi ++ * else ++ * ring_drb::req_cycle <- period_size ++ * if (ring_drb::state == executed) ++ * hw_cycle <- period_size ++ * fi ++ * for (i = ring_p_idx+1 ~ sw_p_idx-1) ++ * new_drb::ring_addr <- i * period_bytes + ring_base ++ * new_drb::req_cycle <- period_size ++ * rof ++ * sw_drb::ring_addr <- sw_p_idx * period_bytes + ring_base ++ * sw_drb::req_cycle <- sw_p_off ++ * else ++ * // sw_ptr < ring_ptr ++ * ring_drb::req_cycle <- period_size ++ * if (ring_drb::state == executed) ++ * hw_cycle <- period_size ++ * fi ++ * for (i = ring_p_idx+1 ~ idx_max) ++ * new_drb::ring_addr <- i * period_bytes + ring_base ++ * new_drb::req_cycle <- period_size ++ * rof ++ * for (i = 0 ~ sw_p_idx-1) ++ * new_drb::ring_addr <- i * period_bytes + ring_base ++ * new_drb::req_cycle <- period_size ++ * rof ++ * sw_drb::ring_addr <- sw_p_idx * period_bytes + ring_base ++ * sw_drb::req_cycle <- sw_p_off ++ * fi ++ */ ++ if ((sw_ptr >= ring_ptr) && (sw_p_idx == ring_p_idx) && (sw_p_off != 0)) { ++ ++ dmad_dbg("update ring drb\n"); ++ ++ /* update drb size at ring_ptr */ ++ drb->req_cycle = sw_p_off; ++ ++ dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, ++ drb->req_cycle, drb->state); ++ ++ /* update hw dma size of this drb if it has been sent to the ++ * controller */ ++ if (drb->state == DMAD_DRB_STATE_EXECUTED) { ++ dmad_disable_channel(drq); ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ hw_off = DMAC_BYTES_TO_CYCLE((addr_t) ++ din((addr_t) drq-> ++ ring_port) - ++ (addr_t) drb-> ++ addr0, ++ drq->data_width); ++ ++ dmad_dbg("hw_off(0x%08x) sw_p_off(0x%08x)\n", ++ (u32) hw_off, (u32) sw_p_off); ++ ++ if (sw_p_off < hw_off) ++ dmad_err("%s() underrun! sw_p_off(0x%08x) <" ++ " hw_off(0x%08x)\n", __func__, ++ (u32) sw_p_off, (u32) hw_off); ++ else ++ dout(sw_p_off - hw_off, (unsigned long)drq->cyc_port); ++ ++ dmad_enable_channel(drq); ++ ++ } else { ++ dmad_submit_request_internal(drq, drb); ++ } ++ ++ } else { ++ ++ dmad_dbg("fulfill ring drb - sw_ptr(0x%08x) ring_ptr(0x%08x)\n", ++ (u32) sw_ptr, (u32) ring_ptr); ++ ++ /* fulfill last drb at ring_ptr */ ++ if (ring_p_idx == (periods - 1)) ++ drb->req_cycle = period_size + remnant_size; ++ else ++ drb->req_cycle = period_size; ++ ++ dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, ++ drb->req_cycle, drb->state); ++ ++ if (drb->state == DMAD_DRB_STATE_EXECUTED) { ++ dmad_disable_channel(drq); ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ hw_off = DMAC_BYTES_TO_CYCLE((addr_t) ++ din((addr_t) drq-> ++ ring_port) - ++ (addr_t) drb-> ++ addr0, ++ drq->data_width); ++ ++ dmad_dbg("hw_off(0x%08x) period_size(0x%08x)\n", ++ (u32) hw_off, (u32) period_size); ++ ++ if (ring_p_idx == (periods - 1)) { ++ if (period_size < hw_off) ++ dmad_err("%s() illegal! " ++ "period_size(0x%08x) + " ++ "remnant_size(0x%08x) < " ++ "hw_off(0x%08x)\n", __func__, ++ (u32) period_size, ++ (u32) remnant_size, ++ (u32) hw_off); ++ else ++ dout(period_size + remnant_size - ++ hw_off, (unsigned long)drq->cyc_port); ++ } else { ++ if (period_size < hw_off) ++ dmad_err("%s() illegal! " ++ "period_size(0x%08x) < " ++ "hw_off(0x%08x)\n", __func__, ++ (u32) period_size, ++ (u32) hw_off); ++ else ++ dout(period_size - hw_off, ++ (unsigned long)drq->cyc_port); ++ } ++ ++ dmad_enable_channel(drq); ++ ++ } else { ++ dmad_submit_request_internal(drq, drb); ++ } ++ ++ ++ring_p_idx; ++ ++ /* adjust sw_ptr period index ahead by one ring cycle */ ++ //if (sw_ptr < ring_ptr) { ++ if (sw_p_idx < ring_p_idx) { ++ sw_p_idx += periods; ++ } ++ ++ /* allocate in-between (ring_ptr+1 to sw_ptr-1) ++ * full-cycle drbs */ ++ for (period = ring_p_idx; period < sw_p_idx; ++period) { ++ if (0 != dmad_alloc_drb_internal(drq, &drb)) { ++ dmad_err("%s() drb allocation failed!\n", ++ __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, ++ lock_flags); ++ return -ENOSPC; ++ } ++ ++ drb->addr0 = (dma_addr_t) (period % periods) * ++ period_bytes + drq->ring_base; ++ drb->addr1 = drq->dev_addr; ++ ++ if (period == (periods - 1)) { ++ drb->req_cycle = period_size + remnant_size; ++ } else { ++ drb->req_cycle = period_size; ++ } ++ ++ dmad_dbg("inbtw_drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, ++ drb->addr1, drb->req_cycle, drb->state); ++ ++ dmad_submit_request_internal(drq, drb); ++ } ++ ++ /* allocate drb right at sw_ptr */ ++ if (0 != dmad_alloc_drb_internal(drq, &drb)) { ++ dmad_err("%s() drb allocation failed!\n", __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -ENOSPC; ++ } ++ drb->addr0 = (dma_addr_t) (sw_p_idx % periods) * ++ period_bytes + drq->ring_base; ++ drb->addr1 = drq->dev_addr; ++ drb->req_cycle = sw_p_off; ++ ++ dmad_dbg("swptr_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, ++ drb->req_cycle, drb->state); ++ ++ drq->ring_drb = drb; ++ ++ if (sw_p_off > 0) ++ dmad_submit_request_internal(drq, drb); ++ } ++ ++ __iter_div_u64_rem(sw_ptr, drq->ring_size, &drq->sw_ptr); ++ drq->sw_p_idx = sw_p_idx % periods; ++ drq->sw_p_off = sw_p_off; ++ ++ if (likely(keep_fired)) { ++ dmad_kickoff_requests_internal(drq); ++ } ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_update_ring_sw_ptr); ++ ++/** ++ * dmad_probe_ring_hw_ptr - probe DMA ring buffer position of the given channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : Ring buffer position of current HW ring buffer pointer ++ * ++ * Probe DMA ring buffer position of the given channel. The position is ++ * relative to the ring buffer base. This function is valid only if the ++ * channel is initialized as ring buffer mode. ++ */ ++dma_addr_t dmad_probe_ring_hw_ptr(dmad_chreq * ch_req) ++{ ++ dmad_drq *drq = (dmad_drq *) ch_req->drq; ++ dma_addr_t cycles = ++ (dma_addr_t) din(drq->ring_port) - (dma_addr_t) drq->ring_base; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ cycles = DMAC_BYTES_TO_CYCLE(cycles, drq->data_width); ++ ++ return cycles; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_probe_ring_hw_ptr); ++ ++/** ++ * dmad_channel_drain - cancel DMA transmission of the given DMA channel ++ * @controller : [in] One of the enum value of DMAD_DMAC_CORE ++ * @drq : [in] Reference to the DMA queue structure (dmad_drq) ++ * @shutdown : [in] Non-zero to force a immediate channel shutdown ++ * @return : 0 if success, non-zero if any error ++ * ++ * Stop the DMA transmission and cancel all submitted requests of the given ++ * DMA channel. This function drains a single channel and is the internal ++ * implementation of the interface routine dmad_drain_requests() and the ++ * module_exit function. ++ */ ++static int dmad_channel_drain(u32 controller, dmad_drq * drq, u8 shutdown) ++{ ++ dmad_drb *drb = 0; ++ unsigned long lock_flags; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* Stop DMA channel if forced to shutdown immediately */ ++ if (shutdown) { ++ /* disable dma controller */ ++ dmad_reset_channel(drq); ++ ++ /* todo: more settings to stop DMA controller ?? */ ++ ++ /*if (drb->state == DMAD_DRB_STATE_EXECUTED) { */ ++ /*} */ ++ } ++ ++ /* Detach DRBs in submit queue */ ++ dmad_detach_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); ++ ++ while (drb) { ++ dmad_dbg("cancel sbt drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, (u32) drb->state); ++ ++ /* Mark DRB state as abort */ ++ drb->state = DMAD_DRB_STATE_ABORT; ++ ++ if (drb->sync) ++ complete_all(drb->sync); ++ ++ dmad_attach_tail(drq->drb_pool, &drq->fre_head, &drq->fre_tail, ++ drb->node); ++ ++ dmad_detach_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, ++ &drb); ++ } ++ ++ /* Detach DRBs in ready queue */ ++ dmad_detach_head(drq->drb_pool, &drq->rdy_head, &drq->rdy_tail, &drb); ++ ++ while (drb) { ++ dmad_dbg("cancel rdy drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, (u32) drb->state); ++ ++ /* Mark DRB state as abort */ ++ drb->state = DMAD_DRB_STATE_ABORT; ++ ++ dmad_attach_tail(drq->drb_pool, &drq->fre_head, &drq->fre_tail, ++ drb->node); ++ ++ /* Detach next submitted DRB (DMA Request Block) from the ++ * DRQ (DMA Request Queue) */ ++ dmad_detach_head(drq->drb_pool, &drq->rdy_head, &drq->rdy_tail, ++ &drb); ++ } ++ ++ drq->state |= DMAD_DRQ_STATE_ABORT; ++ ++ drq->ring_drb = NULL; ++ drq->sw_ptr = 0; ++ drq->sw_p_idx = 0; ++ drq->sw_p_off = 0; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ if ( /*(drq->fre_head == 0) && */ (drq->flags & DMAD_FLAGS_SLEEP_BLOCK)) { ++ complete_all(&drq->drb_alloc_sync); ++ } ++ ++ return 0; ++} ++ ++/** ++ * dmad_cancel_requests - cancel DMA transmission of the given DMA channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @shutdown : [in] Non-zero to force a immediate channel shutdown ++ * @return : 0 if success, non-zero if any error ++ * ++ * Stop the DMA transmission and cancel all submitted requests of the given ++ * DMA channel. ++ */ ++int dmad_drain_requests(dmad_chreq * ch_req, u8 shutdown) ++{ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (ch_req == NULL) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ return dmad_channel_drain(ch_req->controller, ch_req->drq, shutdown); ++} ++ ++EXPORT_SYMBOL_GPL(dmad_drain_requests); ++ ++/** ++ * dmad_probe_irq_source - probe DMA channel who asserts the shared sw-irq line ++ * @return : The channel number which asserts the shared sw-irq line ++ * ++ * Probe DMA channel who asserts the shared sw-irq line. ++ */ ++int dmad_probe_irq_source_ahb(void) ++{ ++ int channel; /* interrupt channel number */ ++ ++ /* todo: spin_lock */ ++ ++ /* - Check DMA status register to get channel number */ ++ for (channel = 0; channel < DMAD_AHB_MAX_CHANNELS; ++channel) { ++ if (getbl(channel+TC_OFFSET, (unsigned long)INT_STA)) ++ return channel; ++ } ++ ++ /* Perform DMA error checking if no valid channel was found who ++ * assert the finish signal. */ ++ for (channel = 0; channel < DMAD_AHB_MAX_CHANNELS; ++channel) { ++ if (getbl(channel+ERR_OFFSET, (unsigned long)INT_STA)) ++ return channel; ++ if (getbl(channel+ABT_OFFSET, (unsigned long)INT_STA)) ++ return channel; ++ } ++ ++ /* todo: spin_unlock */ ++ ++ return -EFAULT; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_probe_irq_source_ahb); ++ ++ ++/** ++ * dmad_module_init - dma module-init function ++ * @return : 0 if success, non-zero if any error ++ */ ++int dmad_module_init(void) ++{ ++ int err = 0; ++ dmad_dbg("%s() >>\n", __func__); ++ ++ /* clear device struct since the module may be load/unload many times */ ++ memset(&dmad, 0, sizeof(dmad)-4); ++ dmad.drq_pool = ++ kmalloc(DMAD_AHB_MAX_CHANNELS * sizeof(dmad_drq), GFP_KERNEL); ++ if (dmad.drq_pool == NULL) { ++ dmad_err("%s() failed to allocate drb pool!\n", __func__); ++ return -ENOMEM; ++ } ++ memset(dmad.drq_pool, 0,DMAD_AHB_MAX_CHANNELS*sizeof(dmad_drq)); ++ spin_lock_init(&dmad.drq_pool_lock); ++ dmad.ahb_drq_pool = dmad.drq_pool; ++ dmad_dbg("DMA module init result: (%d)\n", err); ++ dmad_dbg(" AHB channels: %d\n;" ++ "DRBs per channel: %d\n", ++ DMAC_MAX_CHANNELS, DMAD_DRB_POOL_SIZE); ++ ++ dmad_dbg("%s() return code (%d) <<\n", __func__, err); ++ return err; ++} ++ ++/** ++ * dmad_module_init - dma module clean up function ++ */ ++int __exit dmad_module_exit(struct platform_device *pdev) ++{ ++ dmad_drq *drq; ++ u32 channel; ++ struct at_dma_platform_data *pdata; ++ pdata = dev_get_platdata(&pdev->dev); ++ ++ dmad_dbg("%s() >>\n", __func__); ++ ++ spin_lock(&dmad.drq_pool_lock); ++ ++ /* cancel existing requests and unregister interrupt handler */ ++ for (channel = 0; channel < DMAD_AHB_MAX_CHANNELS; ++channel) { ++ ++ /* shutdown dma requests */ ++ drq = (dmad_drq *) & dmad.ahb_drq_pool[channel]; ++ ++ if ((drq->state & DMAD_DRQ_STATE_READY) != 0) ++ dmad_channel_drain(DMAD_DMAC_AHB_CORE, drq, 1); ++ ++ /* free registered irq handlers */ ++ free_irq(ahb_irqs[channel], (void *)(unsigned long)(channel + 1)); ++ } ++ ++ spin_unlock(&dmad.drq_pool_lock); ++ ++ if (dmad.drq_pool) ++ kfree(dmad.drq_pool); ++ memset(&dmad, 0, sizeof(dmad)); ++ ++ /* release I/O space */ ++ release_region((uintptr_t)pdata->dmac_regs, resource_size(pdata->io)); ++ dmad_dbg("DMA module unloaded!\n"); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_OF ++static const struct of_device_id atcdma100_of_id_table[] = { ++ { .compatible = "andestech,atcdmac300" }, ++ {} ++}; ++MODULE_DEVICE_TABLE(of, atcdma100_of_id_table); ++ ++static struct at_dma_platform_data * ++at_dma_parse_dt(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ struct at_dma_platform_data *pdata; ++ ++ if (!np) { ++ dev_err(&pdev->dev, "Missing DT data\n"); ++ return NULL; ++ } ++ ++ pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); ++ if (!pdata) ++ return NULL; ++ ++ if (of_property_read_u32(np, "dma-channels", &pdata->nr_channels)) ++ return NULL; ++ ++ return pdata; ++} ++#else ++static inline struct at_dma_platform_data * ++at_dma_parse_dt(struct platform_device *pdev) ++{ ++ return NULL; ++} ++#endif ++ ++static int atcdma_probe(struct platform_device *pdev) ++{ ++ struct at_dma_platform_data *pdata; ++ struct resource *io=0; ++ struct resource *mem = NULL; ++ int irq; ++ ++ pdata = dev_get_platdata(&pdev->dev); ++ dmad.plat = pdev; ++ ++ if (!pdata) ++ pdata = at_dma_parse_dt(pdev); ++ pdev->dev.platform_data = pdata; ++ io = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ pdata->io = io; ++ mem = request_mem_region(io->start, resource_size(io), pdev->name); ++ ++ if (!mem){ ++ printk("failed to get io memory region resouce.\n"); ++ return -EINVAL; ++ } ++ ++ pdata->dmac_regs = (void __iomem *) ioremap(mem->start, resource_size(io)); ++ dmac_base = (uintptr_t)pdata->dmac_regs; ++ ++ irq = platform_get_irq(pdev, 0); ++ ++ if (irq < 0) ++ return irq; ++ ++ intc_ftdmac020_init_irq(irq); ++ ++ return dmad_module_init(); ++ ++} ++ ++static int __exit atcdma_remove(struct platform_device *pdev) ++{ ++ return dmad_module_exit(pdev); ++} ++ ++ ++static struct platform_driver atcdma100_driver = { ++ .probe = atcdma_probe, ++ .remove = __exit_p(atcdma_remove), ++ .driver = { ++ .name = "atcdmac100", ++ .of_match_table = of_match_ptr(atcdma100_of_id_table), ++ }, ++}; ++ ++static int __init atcdma_init(void) ++{ ++ return platform_driver_register(&atcdma100_driver); ++} ++subsys_initcall(atcdma_init); ++ ++#endif /* CONFIG_PLATFORM_AHBDMA */ +diff --git a/arch/riscv/platforms/dmad_intc.c b/arch/riscv/platforms/dmad_intc.c +new file mode 100644 +index 000000000000..5f831add709a +--- /dev/null ++++ b/arch/riscv/platforms/dmad_intc.c +@@ -0,0 +1,49 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018 Andes Technology Corporation ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef CONFIG_PLATFORM_AHBDMA ++extern int dmad_probe_irq_source_ahb(void); ++void AHBDMA_irq_rounter(struct irq_desc *desc) ++{ ++ int ahb_irq; ++ struct irq_desc *ahb_desc; ++ ++ raw_spin_lock(&desc->lock); ++ ahb_irq = dmad_probe_irq_source_ahb(); ++ ++ if (ahb_irq >= 0) { ++ ahb_irq += DMA_IRQ0; ++ ahb_desc = irq_to_desc(ahb_irq); ++ ahb_desc->irq_data.irq = ahb_irq; ++ raw_spin_unlock(&desc->lock); ++ ahb_desc->handle_irq(ahb_desc); ++ raw_spin_lock(&desc->lock); ++ } ++ desc->irq_data.chip->irq_unmask(&desc->irq_data); ++ raw_spin_unlock(&desc->lock); ++} ++ ++int intc_ftdmac020_init_irq(int irq) ++{ ++ int i; ++ int ret; ++ /* Register all IRQ */ ++ for (i = DMA_IRQ0; ++ i < DMA_IRQ0 + DMA_IRQ_COUNT; i++) { ++ // level trigger ++ ret = irq_set_chip(i, &dummy_irq_chip); ++ irq_set_handler(i, handle_simple_irq); ++ } ++ irq_set_chained_handler(irq, AHBDMA_irq_rounter); ++ return 0; ++} ++#endif /* CONFIG_PLATFORM_AHBDMA */ +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0004-Andes-support-for-FTSDC.patch b/board/andes/ae350/patches/linux/0004-Andes-support-for-FTSDC.patch new file mode 100644 index 0000000000..9e0fd7303b --- /dev/null +++ b/board/andes/ae350/patches/linux/0004-Andes-support-for-FTSDC.patch @@ -0,0 +1,1884 @@ +From 8ffdbcee891ea3b127f34d0ff745d7578b487a71 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:16:45 +0800 +Subject: [PATCH 04/12] Andes support for FTSDC + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/host/Kconfig | 11 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/ftsdc010.c | 1557 +++++++++++++++++++++++++++++++++++ + drivers/mmc/host/ftsdc010.h | 257 ++++++ + 4 files changed, 1825 insertions(+), 1 deletion(-) + create mode 100644 drivers/mmc/host/ftsdc010.c + create mode 100644 drivers/mmc/host/ftsdc010.h + +diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig +index 30ff42fd173e..834cdb8b73cc 100644 +--- a/drivers/mmc/host/Kconfig ++++ b/drivers/mmc/host/Kconfig +@@ -503,7 +503,7 @@ config MMC_OMAP_HS + + config MMC_WBSD + tristate "Winbond W83L51xD SD/MMC Card Interface support" +- depends on ISA_DMA_API && !M68K ++ depends on ISA_DMA_API + help + This selects the Winbond(R) W83L51xD Secure digital and + Multimedia card Interface. +@@ -608,6 +608,15 @@ config MMC_DAVINCI + If you have an DAVINCI board with a Multimedia Card slot, + say Y or M here. If unsure, say N. + ++config MMC_FTSDC ++ tristate "Andestech SDC Multimedia Card Interface support" ++ depends on RISCV ++ help ++ This selects the TI DAVINCI Multimedia card Interface. ++ If you have an DAVINCI board with a Multimedia Card slot, ++ say Y or M here. If unsure, say N. ++ ++ + config MMC_GOLDFISH + tristate "goldfish qemu Multimedia Card Interface support" + depends on GOLDFISH || COMPILE_TEST +diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile +index 451c25fc2c69..fbc58512f23a 100644 +--- a/drivers/mmc/host/Makefile ++++ b/drivers/mmc/host/Makefile +@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o + obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o + obj-$(CONFIG_MMC_MVSDIO) += mvsdio.o + obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o ++obj-$(CONFIG_MMC_FTSDC) += ftsdc010.o + obj-$(CONFIG_MMC_GOLDFISH) += android-goldfish.o + obj-$(CONFIG_MMC_SPI) += mmc_spi.o + ifeq ($(CONFIG_OF),y) +diff --git a/drivers/mmc/host/ftsdc010.c b/drivers/mmc/host/ftsdc010.c +new file mode 100644 +index 000000000000..940b4c03787c +--- /dev/null ++++ b/drivers/mmc/host/ftsdc010.c +@@ -0,0 +1,1557 @@ ++/* drivers/mmc/host/ftsdc010.c ++ * Copyright (C) 2010 Andestech ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "ftsdc010.h" ++#include "../core/core.h" ++ ++#define DRIVER_NAME "ftsdc010" ++#define REG_READ(addr) readl((host->base + addr)) ++#define REG_WRITE(data, addr) writel((data), (host->base + addr)) ++ ++enum dbg_channels { ++ dbg_err = (1 << 0), ++ dbg_debug = (1 << 1), ++ dbg_info = (1 << 2), ++ dbg_irq = (1 << 3), ++ dbg_sg = (1 << 4), ++ dbg_dma = (1 << 5), ++ dbg_pio = (1 << 6), ++ dbg_fail = (1 << 7), ++ dbg_conf = (1 << 8), ++}; ++ ++static struct workqueue_struct *mywq; ++ ++static const int dbgmap_err = dbg_fail; ++static const int dbgmap_info = dbg_info | dbg_conf; ++static const int dbgmap_debug = dbg_err | dbg_debug | dbg_info | dbg_conf; ++#define dbg(host, channels, args...) \ ++ do { \ ++ if (dbgmap_err & channels) \ ++ dev_err(&host->pdev->dev, args); \ ++ else if (dbgmap_info & channels) \ ++ dev_info(&host->pdev->dev, args); \ ++ else if (dbgmap_debug & channels) \ ++ dev_dbg(&host->pdev->dev, args); \ ++ } while (0) ++static void finalize_request(struct ftsdc_host *host); ++static void ftsdc_send_request(struct mmc_host *mmc); ++#ifdef CONFIG_MMC_DEBUG ++static void dbg_dumpregs(struct ftsdc_host *host, char *prefix) ++{ ++ u32 con, cmdarg, r0, r1, r2, r3, rcmd, dcon, dtimer, ++ dlen, sta, clr, imask, pcon, ccon, bwidth, scon1, ++ scon2, ssta, fea; ++ ++ con = REG_READ(SDC_CMD_REG); ++ cmdarg = REG_READ(SDC_ARGU_REG); ++ r0 = REG_READ(SDC_RESPONSE0_REG); ++ r1 = REG_READ(SDC_RESPONSE1_REG); ++ r2 = REG_READ(SDC_RESPONSE2_REG); ++ r3 = REG_READ(SDC_RESPONSE3_REG); ++ rcmd = REG_READ(SDC_RSP_CMD_REG); ++ dcon = REG_READ(SDC_DATA_CTRL_REG); ++ dtimer = REG_READ(SDC_DATA_TIMER_REG); ++ dlen = REG_READ(SDC_DATA_LEN_REG); ++ sta = REG_READ(SDC_STATUS_REG); ++ clr = REG_READ(SDC_CLEAR_REG); ++ imask = REG_READ(SDC_INT_MASK_REG); ++ pcon = REG_READ(SDC_POWER_CTRL_REG); ++ ccon = REG_READ(SDC_CLOCK_CTRL_REG); ++ bwidth = REG_READ(SDC_BUS_WIDTH_REG); ++ scon1 = REG_READ(SDC_SDIO_CTRL1_REG); ++ scon2 = REG_READ(SDC_SDIO_CTRL2_REG); ++ ssta = REG_READ(SDC_SDIO_STATUS_REG); ++ fea = REG_READ(SDC_FEATURE_REG); ++ ++ dbg(host, dbg_debug, "%s CON:[%08x] STA:[%08x] INT:[%08x], PWR:[%08x], CLK:[%08x]\n", ++ prefix, con, sta, imask, pcon, ccon); ++ ++ dbg(host, dbg_debug, "%s DCON:[%08x] DTIME:[%08x]" ++ " DLEN:[%08x] DWIDTH:[%08x]\n", ++ prefix, dcon, dtimer, dlen, bwidth); ++ ++ dbg(host, dbg_debug, "%s R0:[%08x] R1:[%08x]" ++ " R2:[%08x] R3:[%08x]\n", ++ prefix, r0, r1, r2, r3); ++ ++ dbg(host, dbg_debug, "%s SCON1:[%08x] SCON2:[%08x]" ++ " SSTA:[%08x] FEA:[%08x]\n", ++ prefix, scon1, scon2, ssta, fea); ++} ++ ++static void prepare_dbgmsg(struct ftsdc_host *host, struct mmc_command *cmd, ++ int stop) ++{ ++ snprintf(host->dbgmsg_cmd, 300, ++ "#%u%s op:%i arg:0x%08x flags:0x08%x retries:%u", ++ host->ccnt, (stop ? " (STOP)" : ""), ++ cmd->opcode, cmd->arg, cmd->flags, cmd->retries); ++ ++ if (cmd->data) { ++ snprintf(host->dbgmsg_dat, 300, ++ "#%u bsize:%u blocks:%u bytes:%u", ++ host->dcnt, cmd->data->blksz, ++ cmd->data->blocks, ++ cmd->data->blocks * cmd->data->blksz); ++ } else { ++ host->dbgmsg_dat[0] = '\0'; ++ } ++} ++ ++static void dbg_dumpcmd(struct ftsdc_host *host, struct mmc_command *cmd, ++ int fail) ++{ ++ unsigned int dbglvl = fail ? dbg_fail : dbg_debug; ++ ++ if (!cmd) ++ return; ++ ++ if (cmd->error == 0) { ++ dbg(host, dbglvl, "CMD[OK] %s R0:0x%08x\n", ++ host->dbgmsg_cmd, cmd->resp[0]); ++ } else { ++ dbg(host, dbglvl, "CMD[ERR %i] %s Status:%s\n", ++ cmd->error, host->dbgmsg_cmd, host->status); ++ } ++ ++ if (!cmd->data) ++ return; ++ ++ if (cmd->data->error == 0) { ++ dbg(host, dbglvl, "DAT[OK] %s\n", host->dbgmsg_dat); ++ } else { ++ dbg(host, dbglvl, "DAT[ERR %i] %s DCNT:0x%08x\n", ++ cmd->data->error, host->dbgmsg_dat, ++ REG_READ(SDC_DATA_LEN_REG)); ++ } ++} ++#else ++static void dbg_dumpcmd(struct ftsdc_host *host, ++ struct mmc_command *cmd, int fail) { } ++ ++static void prepare_dbgmsg(struct ftsdc_host *host, struct mmc_command *cmd, ++ int stop) { } ++ ++static void dbg_dumpregs(struct ftsdc_host *host, char *prefix) { } ++ ++#endif /* CONFIG_MMC_DEBUG */ ++ ++static inline bool ftsdc_dmaexist(struct ftsdc_host *host) ++{ ++ return (host->dma_req != NULL); ++} ++ ++static inline u32 enable_imask(struct ftsdc_host *host, u32 imask) ++{ ++ u32 newmask; ++ ++#ifdef CONFIG_MMC_DEBUG ++ if (imask & SDC_STATUS_REG_SDIO_INTR) printk("\n*** E ***\n"); ++#endif ++ newmask = REG_READ(SDC_INT_MASK_REG); ++ newmask |= imask; ++ ++ REG_WRITE(newmask, SDC_INT_MASK_REG); ++ ++ return newmask; ++} ++ ++static inline u32 disable_imask(struct ftsdc_host *host, u32 imask) ++{ ++ u32 newmask; ++ ++#ifdef CONFIG_MMC_DEBUG ++ if (imask & SDC_STATUS_REG_SDIO_INTR) printk("\n*** D ***\n"); ++#endif ++ newmask = REG_READ(SDC_INT_MASK_REG); ++ newmask &= ~imask; ++ ++ REG_WRITE(newmask, SDC_INT_MASK_REG); ++ ++ return newmask; ++} ++ ++static inline void clear_imask(struct ftsdc_host *host) ++{ ++ u32 mask = REG_READ(SDC_INT_MASK_REG); ++ ++ /* preserve the SDIO IRQ mask state */ ++ mask &= (SDC_INT_MASK_REG_SDIO_INTR | SDC_INT_MASK_REG_CARD_CHANGE); ++ REG_WRITE(mask, SDC_INT_MASK_REG); ++} ++ ++static inline void get_data_buffer(struct ftsdc_host *host) ++{ ++ struct scatterlist *sg; ++ ++ BUG_ON(host->buf_sgptr >= host->mrq->data->sg_len); ++ ++ sg = &host->mrq->data->sg[host->buf_sgptr]; ++ ++ host->buf_bytes = sg->length; ++ host->buf_ptr = host->dodma ? (u32 *)sg->dma_address : sg_virt(sg); ++ host->buf_sgptr++; ++} ++ ++static inline u32 cal_blksz(unsigned int blksz) ++{ ++ u32 blksztwo = 0; ++ ++ while (blksz >>= 1) ++ blksztwo++; ++ ++ return blksztwo; ++} ++ ++/** ++ * ftsdc_enable_irq - enable IRQ, after having disabled it. ++ * @host: The device state. ++ * @more: True if more IRQs are expected from transfer. ++ * ++ * Enable the main IRQ if needed after it has been disabled. ++ * ++ * The IRQ can be one of the following states: ++ * - enable after data read/write ++ * - disable when handle data read/write ++ */ ++static void ftsdc_enable_irq(struct ftsdc_host *host, bool enable) ++{ ++ unsigned long flags; ++ local_irq_save(flags); ++ ++ host->irq_enabled = enable; ++ ++ if (enable) ++ enable_irq(host->irq); ++ else ++ disable_irq(host->irq); ++ ++ local_irq_restore(flags); ++} ++ ++static void do_pio_read(struct ftsdc_host *host) ++{ ++ u32 fifo; ++ u32 fifo_words; ++ u32 *ptr; ++ u32 status; ++ u32 retry = 0; ++ ++ BUG_ON(host->buf_bytes != 0); ++ ++ while (host->buf_sgptr < host->mrq->data->sg_len) { ++ get_data_buffer(host); ++ ++ dbg(host, dbg_pio, ++ "pio_read(): new target: [%i]@[%p]\n", ++ host->buf_bytes, host->buf_ptr); ++ ++ while (host->buf_bytes) { ++ status = REG_READ(SDC_STATUS_REG); ++ if (status & SDC_STATUS_REG_FIFO_OVERRUN) { ++ fifo = host->fifo_len > host->buf_bytes ? ++ host->buf_bytes : host->fifo_len; ++ dbg(host, dbg_pio, ++ "pio_read(): fifo:[%02i] buffer:[%03i] dcnt:[%08X]\n", ++ fifo, host->buf_bytes, ++ REG_READ(SDC_DATA_LEN_REG)); ++ host->buf_bytes -= fifo; ++ host->buf_count += fifo; ++ fifo_words = fifo >> 2; ++ ptr = host->buf_ptr; ++ while (fifo_words--) ++ *ptr++ = REG_READ(SDC_DATA_WINDOW_REG); ++ host->buf_ptr = ptr; ++ if (fifo & 3) { ++ u32 n = fifo & 3; ++ u32 data = REG_READ(SDC_DATA_WINDOW_REG); ++ u8 *p = (u8 *)host->buf_ptr; ++ ++ while (n--) { ++ *p++ = data; ++ data >>= 8; ++ } ++ } ++ } else { ++ udelay(1); ++ if (++retry >= SDC_PIO_RETRY) { ++ host->mrq->data->error = -EIO; ++ goto err; ++ } ++ } ++ } ++ } ++err: ++ ++ host->buf_active = XFER_NONE; ++ host->complete_what = COMPLETION_FINALIZE; ++} ++ ++static void do_pio_write(struct ftsdc_host *host) ++{ ++ u32 fifo; ++ u32 *ptr; ++ u32 status; ++ u32 retry = 0; ++ ++ BUG_ON(host->buf_bytes != 0); ++ ++ while (host->buf_sgptr < host->mrq->data->sg_len) { ++ get_data_buffer(host); ++ ++ dbg(host, dbg_pio, ++ "pio_write(): new source: [%i]@[%p]\n", ++ host->buf_bytes, host->buf_ptr); ++ ++ while (host->buf_bytes) { ++ status = REG_READ(SDC_STATUS_REG); ++ if (status & SDC_STATUS_REG_FIFO_UNDERRUN) { ++ fifo = host->fifo_len > host->buf_bytes ? ++ host->buf_bytes : host->fifo_len; ++ ++ dbg(host, dbg_pio, ++ "pio_write(): fifo:[%02i] buffer:[%03i] dcnt:[%08X]\n", ++ fifo, host->buf_bytes, ++ REG_READ(SDC_DATA_LEN_REG)); ++ ++ host->buf_bytes -= fifo; ++ host->buf_count += fifo; ++ ++ fifo = (fifo + 3) >> 2; ++ ptr = host->buf_ptr; ++ while (fifo--) { ++ REG_WRITE(*ptr, SDC_DATA_WINDOW_REG); ++ ptr++; ++ } ++ host->buf_ptr = ptr; ++ } else { ++ udelay(1); ++ if (++retry >= SDC_PIO_RETRY) { ++ host->mrq->data->error = -EIO; ++ goto err; ++ } ++ } ++ } ++ } ++ ++err: ++ host->buf_active = XFER_NONE; ++ host->complete_what = COMPLETION_FINALIZE; ++} ++ ++static void do_dma_access(struct ftsdc_host *host) ++{ ++ int res; ++ unsigned long timeout; ++ dmad_chreq *req = host->dma_req; ++ dmad_drb *drb = 0; ++ ++ while (host->buf_sgptr < host->mrq->data->sg_len) { ++ ++ reinit_completion(&host->dma_complete); ++ get_data_buffer(host); ++ ++ dbg(host, dbg_dma, ++ "dma_%s(): new target: [%i]@[%p]\n", ++ host->buf_active == XFER_READ ? "read" : "write", ++ host->buf_bytes, host->buf_ptr); ++ ++ res = dmad_alloc_drb(req, &drb); ++ ++ if (res != 0 || (drb == 0)) { ++ dbg(host, dbg_err, "%s() Failed to allocate dma request block!\n", __func__); ++ host->mrq->data->error = -ENODEV; ++ goto err; ++ } ++ drb->addr0 = host->mem->start + SDC_DATA_WINDOW_REG; ++ drb->addr1 = (dma_addr_t)host->buf_ptr; ++ drb->req_cycle = dmad_bytes_to_cycles(req, host->buf_bytes); ++ drb->sync = &host->dma_complete; ++ timeout = SDC_TIMEOUT_BASE*((host->buf_bytes+511)>>9); ++ res = dmad_submit_request(req, drb, 1); ++ if (res != 0) { ++ dbg(host, dbg_err, "%s() Failed to submit dma request block!\n", __func__); ++ host->mrq->data->error = -ENODEV; ++ goto err; ++ } ++ dbg(host, dbg_err, "reach here!\n"); ++ if (wait_for_completion_timeout(&host->dma_complete, timeout) == 0) { ++ dbg(host, dbg_err, "%s: read timeout\n", __func__); ++ host->mrq->data->error = -ETIMEDOUT; ++ goto err; ++ } ++ } ++ ++ host->dma_finish = true; ++err: ++ host->buf_active = XFER_NONE; ++ host->complete_what = COMPLETION_FINALIZE; ++} ++ ++static void ftsdc_work(struct work_struct *work) ++{ ++ struct ftsdc_host *host = ++ container_of(work, struct ftsdc_host, work); ++ ++ ftsdc_enable_irq(host, false); ++ if (host->dodma) { ++ do_dma_access(host); ++ } else { ++ if (host->buf_active == XFER_WRITE) ++ do_pio_write(host); ++ ++ if (host->buf_active == XFER_READ) ++ do_pio_read(host); ++ } ++ ++ tasklet_schedule(&host->pio_tasklet); ++ ftsdc_enable_irq(host, true); ++} ++ ++static void pio_tasklet(unsigned long data) ++{ ++ struct ftsdc_host *host = (struct ftsdc_host *) data; ++ ++ if (host->complete_what == COMPLETION_XFER_PROGRESS) { ++ queue_work(mywq, (struct work_struct *)&host->work); ++ return; ++ } ++ ++ if (host->complete_what == COMPLETION_FINALIZE) { ++ clear_imask(host); ++ if (host->buf_active != XFER_NONE) { ++ dbg(host, dbg_err, "unfinished %s " ++ "- buf_count:[%u] buf_bytes:[%u]\n", ++ (host->buf_active == XFER_READ) ? "read" : "write", ++ host->buf_count, host->buf_bytes); ++ ++ if (host->mrq->data) ++ host->mrq->data->error = -EINVAL; ++ } ++ ++ finalize_request(host); ++ } ++} ++ ++static void finalize_request(struct ftsdc_host *host) ++{ ++ struct mmc_request *mrq = host->mrq; ++ struct mmc_command *cmd; ++ u32 con; ++ int debug_as_failure = 0; ++ if (host->complete_what != COMPLETION_FINALIZE) ++ return; ++ ++ if (!mrq) ++ return; ++ ++ cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd; ++ ++ if (cmd->data && (cmd->error == 0) && ++ (cmd->data->error == 0)) { ++ if (host->dodma && (!host->dma_finish)) { ++ dbg(host, dbg_dma, "DMA Missing (%d)!\n", ++ host->dma_finish); ++ return; ++ } ++ host->dodma = false; ++ } ++ ++ /* Read response from controller. */ ++ if (cmd->flags & MMC_RSP_136) { ++ cmd->resp[3] = REG_READ(SDC_RESPONSE0_REG); ++ cmd->resp[2] = REG_READ(SDC_RESPONSE1_REG); ++ cmd->resp[1] = REG_READ(SDC_RESPONSE2_REG); ++ cmd->resp[0] = REG_READ(SDC_RESPONSE3_REG); ++ } else if (cmd->flags & MMC_RSP_PRESENT) { ++ cmd->resp[0] = REG_READ(SDC_RESPONSE0_REG); ++ } ++ ++ if (cmd->error) ++ debug_as_failure = 1; ++ ++ if (cmd->data && cmd->data->error) ++ debug_as_failure = 1; ++ ++ dbg_dumpcmd(host, cmd, debug_as_failure); ++ ++ clear_imask(host); ++ con = REG_READ(SDC_STATUS_REG); ++ con &= ~SDC_CLEAR_REG_SDIO_INTR; ++ REG_WRITE(con, SDC_CLEAR_REG); ++ ++ if (cmd->data && cmd->error) ++ cmd->data->error = cmd->error; ++ ++ if (cmd->data && cmd->data->stop && (!host->cmd_is_stop)) { ++ host->cmd_is_stop = 1; ++ ftsdc_send_request(host->mmc); ++ return; ++ } ++ ++ /* If we have no data transfer we are finished here */ ++ if (!mrq->data) ++ goto request_done; ++ ++ /* Calulate the amout of bytes transfer if there was no error */ ++ if (mrq->data->error == 0) { ++ mrq->data->bytes_xfered = ++ (mrq->data->blocks * mrq->data->blksz); ++ } else { ++ mrq->data->bytes_xfered = 0; ++ } ++ ++request_done: ++ host->complete_what = COMPLETION_NONE; ++ host->mrq = NULL; ++ ++ host->last_opcode = mrq->cmd->opcode; ++ mmc_request_done(host->mmc, mrq); ++} ++ ++static void ftsdc_send_command(struct ftsdc_host *host, ++ struct mmc_command *cmd) ++{ ++ u32 ccon = 0; ++ u32 newmask = 0; ++ u32 scon; ++ ++ if (cmd->data) { ++ host->complete_what = COMPLETION_XFER_PROGRESS; ++ newmask |= SDC_INT_MASK_REG_RSP_TIMEOUT; ++ } else if (cmd->flags & MMC_RSP_PRESENT) { ++ host->complete_what = COMPLETION_RSPFIN; ++ newmask |= SDC_INT_MASK_REG_RSP_TIMEOUT; ++ } else { ++ host->complete_what = COMPLETION_CMDSENT; ++ newmask |= SDC_INT_MASK_REG_CMD_SEND; ++ } ++ ++ ccon |= cmd->opcode & SDC_CMD_REG_INDEX; ++ ccon |= SDC_CMD_REG_CMD_EN; ++ ++ if (cmd->flags & MMC_RSP_PRESENT) { ++ ccon |= SDC_CMD_REG_NEED_RSP; ++ newmask |= SDC_INT_MASK_REG_RSP_CRC_OK | ++ SDC_INT_MASK_REG_RSP_CRC_FAIL; ++ } ++ ++ if (cmd->flags & MMC_RSP_136) ++ ccon |= SDC_CMD_REG_LONG_RSP; ++ ++ /* applicatiion specific cmd must follow an MMC_APP_CMD. The ++ * value will be updated in finalize_request function */ ++ if (host->last_opcode == MMC_APP_CMD) ++ ccon |= SDC_CMD_REG_APP_CMD; ++ ++ enable_imask(host, newmask); ++ REG_WRITE(cmd->arg, SDC_ARGU_REG); ++ ++ scon = REG_READ(SDC_SDIO_CTRL1_REG); ++ if (host->mmc->card != NULL && mmc_card_sdio(host->mmc->card)) ++ scon |= SDC_SDIO_CTRL1_REG_SDIO_ENABLE; ++ else ++ scon &= ~SDC_SDIO_CTRL1_REG_SDIO_ENABLE; ++ REG_WRITE(scon, SDC_SDIO_CTRL1_REG); ++ ++ dbg_dumpregs(host, ""); ++ dbg(host, dbg_debug, "CON[%x]\n", ccon); ++ ++ REG_WRITE(ccon, SDC_CMD_REG); ++} ++ ++static int ftsdc_setup_data(struct ftsdc_host *host, struct mmc_data *data) ++{ ++ u32 dcon, newmask = 0; ++ ++ /* configure data transfer paramter */ ++ if (!data) ++ return 0; ++ if(host->mmc->card && host->mmc->card->type==(unsigned int)MMC_TYPE_SD){ ++ if (((data->blksz - 1) & data->blksz) != 0) { ++ pr_warn("%s: can't do non-power-of 2 sized block transfers (blksz %d)\n", __func__, data->blksz); ++ return -EINVAL; ++ } ++ } ++ ++ if (data->blksz <= 2) { ++ /* We cannot deal with unaligned blocks with more than ++ * one block being transfered. */ ++ ++ if (data->blocks > 1) { ++ pr_warn("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz); ++ return -EINVAL; ++ } ++ } ++ ++ /* data length */ ++ dcon = data->blksz * data->blocks; ++ REG_WRITE(dcon, SDC_DATA_LEN_REG); ++ ++ /* write data control */ ++ dcon = 0; ++ dcon = cal_blksz(data->blksz); ++ ++ /* enable UNDERFUN will trigger interrupt immediatedly ++ * So setup it when rsp is received successfully ++ */ ++ if (data->flags & MMC_DATA_WRITE) { ++ dcon |= SDC_DATA_CTRL_REG_DATA_WRITE; ++ } else { ++ dcon &= ~SDC_DATA_CTRL_REG_DATA_WRITE; ++ newmask |= SDC_INT_MASK_REG_FIFO_OVERRUN; ++ } ++ ++ /* always reset fifo since last transfer may fail */ ++ dcon |= SDC_DATA_CTRL_REG_FIFO_RST; ++ ++ /* enable data transfer which will be pended until cmd is send */ ++ dcon |= SDC_DATA_CTRL_REG_DATA_EN; ++ if (ftsdc_dmaexist(host) && ++ ((data->blksz * data->blocks) & 0xf) == 0) { ++ newmask &= ~SDC_INT_MASK_REG_FIFO_OVERRUN; ++ dcon |= SDC_DATA_CTRL_REG_DMA_EN; ++ dcon |= SDC_DMA_TYPE_4; ++ host->dodma = true; ++ ++ } ++ REG_WRITE(dcon, SDC_DATA_CTRL_REG); ++ /* add to IMASK register */ ++ newmask |= SDC_INT_MASK_REG_DATA_CRC_FAIL | ++ SDC_INT_MASK_REG_DATA_TIMEOUT; ++ ++ enable_imask(host, newmask); ++ /* handle sdio */ ++ dcon = SDC_SDIO_CTRL1_REG_READ_WAIT_ENABLE & REG_READ(SDC_SDIO_CTRL1_REG); ++ dcon |= data->blksz | data->blocks << 15; ++ if (1 < data->blocks) ++ dcon |= SDC_SDIO_CTRL1_REG_SDIO_BLK_MODE; ++ REG_WRITE(dcon, SDC_SDIO_CTRL1_REG); ++ ++ return 0; ++} ++ ++#define BOTH_DIR (MMC_DATA_WRITE | MMC_DATA_READ) ++ ++static int ftsdc_prepare_buffer(struct ftsdc_host *host, struct mmc_data *data) ++{ ++ int rw = (data->flags & MMC_DATA_WRITE) ? 1 : 0; ++ ++ if ((!host->mrq) || (!host->mrq->data)) ++ return -EINVAL; ++ ++ BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR); ++ host->buf_sgptr = 0; ++ host->buf_bytes = 0; ++ host->buf_count = 0; ++ host->buf_active = rw ? XFER_WRITE : XFER_READ; ++ if (host->dodma) { ++ u32 dma_len; ++ u32 drb_size; ++ dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len, ++ rw ? DMA_TO_DEVICE : DMA_FROM_DEVICE); ++ if (dma_len == 0) ++ return -ENOMEM; ++ ++ dmad_config_channel_dir(host->dma_req, ++ rw ? DMAD_DIR_A1_TO_A0 : DMAD_DIR_A0_TO_A1); ++ drb_size = dmad_max_size_per_drb(host->dma_req); ++ if (drb_size < (data->blksz & data->blocks)) ++ return -ENODEV; ++ ++ host->dma_finish = false; ++ } ++ return 0; ++} ++ ++static irqreturn_t ftsdc_irq(int irq, void *dev_id) ++{ ++ struct ftsdc_host *host = dev_id; ++ struct mmc_command *cmd; ++ u32 mci_status; ++ u32 mci_clear; ++ u32 mci_imsk; ++ unsigned long iflags; ++ ++ mci_status = REG_READ(SDC_STATUS_REG); ++ mci_imsk = REG_READ(SDC_INT_MASK_REG); ++ ++ dbg(host, dbg_debug, "irq: status:0x%08x, mask : %08x\n", mci_status, mci_imsk); ++ ++ if (mci_status & SDC_STATUS_REG_SDIO_INTR) { ++ if (mci_imsk & SDC_INT_MASK_REG_SDIO_INTR) { ++ mci_clear = SDC_CLEAR_REG_SDIO_INTR; ++ REG_WRITE(mci_clear, SDC_CLEAR_REG); ++ ++ mmc_signal_sdio_irq(host->mmc); ++ return IRQ_HANDLED; ++ } ++ } ++ ++ spin_lock_irqsave(&host->complete_lock, iflags); ++ ++ mci_status = REG_READ(SDC_STATUS_REG); ++ mci_clear = 0; ++ ++ if (mci_status & SDC_STATUS_REG_CARD_CHANGE) { ++ if ((mci_status & SDC_STATUS_REG_CARD_DETECT) ++ == SDC_CARD_INSERT) { ++ host->status = "card insert"; ++ mmc_detect_change(host->mmc, msecs_to_jiffies(500)); ++ } else { ++ host->status = "card remove"; ++ } ++ mci_clear |= SDC_CLEAR_REG_CARD_CHANGE; ++ dbg(host, dbg_irq, "%s\n", host->status); ++ ++ if (host->complete_what != COMPLETION_NONE) { ++ host->mrq->cmd->error = -EIO; ++ goto close_transfer; ++ } ++ ++ goto irq_out; ++ } ++ ++ if ((host->complete_what == COMPLETION_NONE) || ++ (host->complete_what == COMPLETION_FINALIZE)) { ++ host->status = "nothing to complete"; ++ mci_clear = -1u; ++ goto irq_out; ++ } ++ ++ if (!host->mrq) { ++ host->status = "no active mrq"; ++ clear_imask(host); ++ goto irq_out; ++ } ++ ++ cmd = host->cmd_is_stop ? host->mrq->stop : host->mrq->cmd; ++ ++ if (!cmd) { ++ host->status = "no active cmd"; ++ clear_imask(host); ++ goto irq_out; ++ } ++ ++ if (mci_status & SDC_STATUS_REG_CMD_SEND) { ++ mci_clear |= SDC_CLEAR_REG_CMD_SEND; ++ ++ if (host->complete_what == COMPLETION_CMDSENT) { ++ host->status = "ok: command sent"; ++ goto close_transfer; ++ } else { ++ host->status = "error: command sent(status not match)"; ++ cmd->error = -EINVAL; ++ goto fail_transfer; ++ } ++ } ++ ++ /* handle error status */ ++ if (mci_status & SDC_STATUS_REG_RSP_TIMEOUT) { ++ dbg(host, dbg_err, "CMDSTAT: error RSP TIMEOUT\n"); ++ mci_clear |= SDC_CLEAR_REG_RSP_TIMEOUT; ++ cmd->error = -ETIMEDOUT; ++ host->status = "error: response timeout"; ++ goto fail_transfer; ++ } ++ ++ if (mci_status & SDC_STATUS_REG_RSP_CRC_FAIL) { ++ mci_clear |= SDC_CLEAR_REG_RSP_CRC_FAIL; ++ /* This is wierd hack */ ++ if (cmd->flags & MMC_RSP_CRC) { ++ dbg(host, dbg_err, "CMDSTAT: error RSP CRC\n"); ++ cmd->error = -EILSEQ; ++ host->status = "error: RSP CRC failed"; ++ goto fail_transfer; ++ } else { ++ host->status = "R3 or R4 type command"; ++ goto close_transfer; ++ } ++ } ++ ++ if (mci_status & SDC_STATUS_REG_RSP_CRC_OK) { ++ mci_clear |= SDC_CLEAR_REG_RSP_CRC_OK; ++ ++ if (host->complete_what == COMPLETION_XFER_PROGRESS) { ++ REG_WRITE(mci_clear, SDC_CLEAR_REG); ++ ++ host->status = "RSP recv OK"; ++ if (!cmd->data) ++ goto close_transfer; ++ ++ if (host->dodma) { ++ tasklet_schedule(&host->pio_tasklet); ++ host->status = "dma access"; ++ goto irq_out; ++ } ++ ++ if (host->buf_active == XFER_WRITE) ++ enable_imask(host, SDC_INT_MASK_REG_FIFO_UNDERRUN); ++ } else if (host->complete_what == COMPLETION_RSPFIN) { ++ goto close_transfer; ++ } ++ } ++ ++ /* handler data transfer */ ++ if (mci_status & SDC_STATUS_REG_DATA_TIMEOUT) { ++ dbg(host, dbg_err, "CMDSTAT: error DATA TIMEOUT\n"); ++ mci_clear |= SDC_CLEAR_REG_DATA_TIMEOUT; ++ cmd->error = -ETIMEDOUT; ++ host->status = "error: data timeout"; ++ goto fail_transfer; ++ } ++ ++ if (mci_status & SDC_STATUS_REG_DATA_CRC_FAIL) { ++ dbg(host, dbg_err, "CMDSTAT: error DATA CRC\n"); ++ mci_clear |= SDC_CLEAR_REG_DATA_CRC_FAIL; ++ cmd->error = -EILSEQ; ++ host->status = "error: data CRC fail"; ++ goto fail_transfer; ++ } ++ ++ if ((mci_status & SDC_STATUS_REG_FIFO_UNDERRUN) || ++ mci_status & SDC_STATUS_REG_FIFO_OVERRUN) { ++ ++ disable_imask(host, SDC_INT_MASK_REG_FIFO_OVERRUN | ++ SDC_INT_MASK_REG_FIFO_UNDERRUN); ++ ++ if (!host->dodma) { ++ if (host->buf_active == XFER_WRITE) { ++ tasklet_schedule(&host->pio_tasklet); ++ host->status = "pio tx"; ++ } else if (host->buf_active == XFER_READ) { ++ ++ tasklet_schedule(&host->pio_tasklet); ++ host->status = "pio rx"; ++ } ++ } ++ } ++ ++ goto irq_out; ++ ++fail_transfer: ++ host->buf_active = XFER_NONE; ++ ++close_transfer: ++ host->complete_what = COMPLETION_FINALIZE; ++ ++ clear_imask(host); ++ tasklet_schedule(&host->pio_tasklet); ++ ++irq_out: ++ REG_WRITE(mci_clear, SDC_CLEAR_REG); ++ ++ dbg(host, dbg_debug, "irq: %s\n", host->status); ++ spin_unlock_irqrestore(&host->complete_lock, iflags); ++ return IRQ_HANDLED; ++} ++ ++static void ftsdc_send_request(struct mmc_host *mmc) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ struct mmc_request *mrq = host->mrq; ++ struct mmc_command *cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd; ++ ++ host->ccnt++; ++ prepare_dbgmsg(host, cmd, host->cmd_is_stop); ++ dbg(host, dbg_debug, "%s\n", host->dbgmsg_cmd); ++ ++ if (cmd->data) { ++ int res = ftsdc_setup_data(host, cmd->data); ++ ++ host->dcnt++; ++ ++ if (res) { ++ dbg(host, dbg_err, "setup data error %d\n", res); ++ cmd->error = res; ++ cmd->data->error = res; ++ ++ mmc_request_done(mmc, mrq); ++ return; ++ } ++ ++ res = ftsdc_prepare_buffer(host, cmd->data); ++ ++ if (res) { ++ dbg(host, dbg_err, "data prepare error %d\n", res); ++ cmd->error = res; ++ cmd->data->error = res; ++ ++ mmc_request_done(mmc, mrq); ++ return; ++ } ++ } ++ ++ /* Send command */ ++ ftsdc_send_command(host, cmd); ++} ++ ++static int ftsdc_get_cd(struct mmc_host *mmc) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ ++ u32 con = REG_READ(SDC_STATUS_REG); ++ dbg(host, dbg_debug, "get_cd status:%.8x\n\n", con); ++ ++ return (con & SDC_STATUS_REG_CARD_DETECT) ? 0 : 1; ++} ++ ++static void ftsdc_request(struct mmc_host *mmc, struct mmc_request *mrq) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ host->status = "mmc request"; ++ host->cmd_is_stop = 0; ++ host->mrq = mrq; ++ if (ftsdc_get_cd(mmc) == 0) { ++ dbg(host, dbg_err, "%s: no medium present\n", __func__); ++ host->mrq->cmd->error = -ENOMEDIUM; ++ mmc_request_done(mmc, mrq); ++ } else { ++ ftsdc_send_request(mmc); ++ } ++ dbg(host, dbg_debug, "send request \n"); ++} ++ ++static void ftsdc_set_clk(struct ftsdc_host *host, struct mmc_ios *ios) ++{ ++ u32 clk_div = 0; ++ u32 con; ++ struct ftsdc_mmc_config *pdata = host->pdev->dev.platform_data; ++ u32 freq = pdata->max_freq; ++ ++ dbg(host, dbg_debug, "request clk : %u \n", ios->clock); ++ con = REG_READ(SDC_CLOCK_CTRL_REG); ++ if (ios->clock == 0) { ++ host->real_rate = 0; ++ con |= SDC_CLOCK_CTRL_REG_CLK_DIS; ++ } else { ++ clk_div = (freq / (ios->clock << 1)) - 1; ++ host->real_rate = freq / ((clk_div+1)<<1); ++ if (host->real_rate > ios->clock) { ++ ++clk_div; ++ host->real_rate = freq / ((clk_div+1)<<1); ++ } ++ if (clk_div > 127) ++ dbg(host, dbg_err, "%s: no match clock rate, %u\n", __func__, ios->clock); ++ ++ con = (con & ~SDC_CLOCK_CTRL_REG_CLK_DIV) | (clk_div & SDC_CLOCK_CTRL_REG_CLK_DIV); ++ con &= ~SDC_CLOCK_CTRL_REG_CLK_DIS; ++ } ++ ++ REG_WRITE(con, SDC_CLOCK_CTRL_REG); ++} ++ ++static void ftsdc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ u32 con; ++ ++ con = REG_READ(SDC_POWER_CTRL_REG); ++ switch (ios->power_mode) { ++ case MMC_POWER_ON: ++ case MMC_POWER_UP: ++ con |= SDC_POWER_CTRL_REG_POWER_ON; ++ break; ++ case MMC_POWER_OFF: ++ default: ++ con &= ~SDC_POWER_CTRL_REG_POWER_ON; ++ break; ++ } ++ ++ REG_WRITE(con, SDC_POWER_CTRL_REG); ++ ++ ftsdc_set_clk(host, ios); ++ ++ if ((ios->power_mode == MMC_POWER_ON) || ++ (ios->power_mode == MMC_POWER_UP)) { ++ dbg(host, dbg_debug, "running at %ukHz (requested: %ukHz).\n", ++ host->real_rate/1000, ios->clock/1000); ++ } else { ++ dbg(host, dbg_debug, "powered down.\n"); ++ } ++ ++ host->bus_width = ios->bus_width; ++ /* write bus configure */ ++ con = REG_READ(SDC_BUS_WIDTH_REG); ++ ++ con &= ~(SDC_BUS_WIDTH_REG_SINGLE_BUS | ++ SDC_BUS_WIDTH_REG_WIDE_4_BUS | ++ SDC_BUS_WIDTH_REG_WIDE_8_BUS); ++ if (host->bus_width == MMC_BUS_WIDTH_1) ++ con |= SDC_BUS_WIDTH_REG_SINGLE_BUS; ++ else if (host->bus_width == MMC_BUS_WIDTH_4) ++ con |= SDC_BUS_WIDTH_REG_WIDE_4_BUS; ++ else if (host->bus_width == MMC_BUS_WIDTH_8) ++ con |= SDC_BUS_WIDTH_REG_WIDE_8_BUS; ++ else { ++ dbg(host, dbg_err, "set_ios: can't support bus mode"); ++ } ++ REG_WRITE(con, SDC_BUS_WIDTH_REG); ++ ++ /*set rsp and data timeout */ ++ con = -1; ++ REG_WRITE(con, SDC_DATA_TIMER_REG); ++ if (ios->power_mode == MMC_POWER_UP) ++ mmc_delay(250); ++} ++ ++static int ftsdc_get_ro(struct mmc_host *mmc) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ u32 con = REG_READ(SDC_STATUS_REG); ++ dbg(host, dbg_debug, "get_ro status:%.8x\n", con); ++ ++ return (con & SDC_STATUS_REG_CARD_LOCK) ? 1 : 0; ++} ++ ++ ++static void ftsdc_enable_sdio_irq(struct mmc_host *mmc, int enable) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ unsigned long flags; ++ u32 con; ++#ifdef CONFIG_MMC_DEBUG ++ u32 ena; ++#endif ++ ++ local_irq_save(flags); ++ ++ con = REG_READ(SDC_INT_MASK_REG); ++#ifdef CONFIG_MMC_DEBUG ++ ena = (con & SDC_STATUS_REG_SDIO_INTR) ? 1:0; ++ if (ena == enable) ++ printk("\n*** XXX ***\n"); ++#endif ++ ++ con = enable ? (con | SDC_STATUS_REG_SDIO_INTR) : (con & ~SDC_STATUS_REG_SDIO_INTR); ++ REG_WRITE(con, SDC_INT_MASK_REG); ++ ++#ifdef CONFIG_MMC_DEBUG ++ //check and ensure data out to SD host controller ++ ena = (REG_READ(SDC_INT_MASK_REG) & SDC_STATUS_REG_SDIO_INTR) ? 1:0; ++ if (ena != enable) { ++ printk("\n*** YYY ***\n"); ++ } ++#endif ++ ++ local_irq_restore(flags); ++} ++ ++static struct mmc_host_ops ftsdc_ops = { ++ .request = ftsdc_request, ++ .set_ios = ftsdc_set_ios, ++ .get_ro = ftsdc_get_ro, ++ .get_cd = ftsdc_get_cd, ++ .enable_sdio_irq = ftsdc_enable_sdio_irq, ++}; ++ ++#ifdef CONFIG_DEBUG_FS ++ ++static int ftsdc_state_show(struct seq_file *seq, void *v) ++{ ++ struct ftsdc_host *host = seq->private; ++ ++ seq_printf(seq, "Register base = 0x%08x\n", (u32)host->base); ++ seq_printf(seq, "Clock rate = %u\n", host->real_rate); ++ seq_printf(seq, "host status = %s\n", host->status); ++ seq_printf(seq, "IRQ = %d\n", host->irq); ++ seq_printf(seq, "IRQ enabled = %d\n", host->irq_enabled); ++ seq_printf(seq, "complete what = %d\n", host->complete_what); ++ seq_printf(seq, "dma support = %d\n", ftsdc_dmaexist(host)); ++ seq_printf(seq, "use dma = %d\n", host->dodma); ++ ++ return 0; ++} ++ ++static int ftsdc_state_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, ftsdc_state_show, inode->i_private); ++} ++ ++static const struct file_operations ftsdc_fops_state = { ++ .owner = THIS_MODULE, ++ .open = ftsdc_state_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++#define DBG_REG(_r) { .addr = SDC_## _r ## _REG, .name = #_r } ++ ++struct ftsdc_reg { ++ unsigned short addr; ++ unsigned char *name; ++} debug_regs[] = { ++ DBG_REG(CMD), ++ DBG_REG(ARGU), ++ DBG_REG(RESPONSE0), ++ DBG_REG(RESPONSE1), ++ DBG_REG(RESPONSE2), ++ DBG_REG(RESPONSE3), ++ DBG_REG(RSP_CMD), ++ DBG_REG(DATA_CTRL), ++ DBG_REG(DATA_TIMER), ++ DBG_REG(DATA_LEN), ++ DBG_REG(STATUS), ++ DBG_REG(CLEAR), ++ DBG_REG(INT_MASK), ++ DBG_REG(POWER_CTRL), ++ DBG_REG(CLOCK_CTRL), ++ DBG_REG(BUS_WIDTH), ++ DBG_REG(SDIO_CTRL1), ++ DBG_REG(SDIO_CTRL2), ++ DBG_REG(SDIO_STATUS), ++ DBG_REG(FEATURE), ++ DBG_REG(REVISION), ++ {} ++}; ++ ++static int ftsdc_regs_show(struct seq_file *seq, void *v) ++{ ++ struct ftsdc_host *host = seq->private; ++ struct ftsdc_reg *rptr = debug_regs; ++ ++ for (; rptr->name; rptr++) ++ seq_printf(seq, "SDI%s\t=0x%08x\n", rptr->name, ++ REG_READ(rptr->addr)); ++ ++ return 0; ++} ++ ++static int ftsdc_regs_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, ftsdc_regs_show, inode->i_private); ++} ++ ++static const struct file_operations ftsdc_fops_regs = { ++ .owner = THIS_MODULE, ++ .open = ftsdc_regs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++static void ftsdc_debugfs_attach(struct ftsdc_host *host) ++{ ++ struct device *dev = &host->pdev->dev; ++ ++ host->debug_root = debugfs_create_dir(dev_name(dev), NULL); ++ if (IS_ERR(host->debug_root)) { ++ dev_err(dev, "failed to create debugfs root\n"); ++ return; ++ } ++ ++ host->debug_state = debugfs_create_file("state", 0444, ++ host->debug_root, host, ++ &ftsdc_fops_state); ++ ++ if (IS_ERR(host->debug_state)) ++ dev_err(dev, "failed to create debug state file\n"); ++ ++ host->debug_regs = debugfs_create_file("regs", 0444, ++ host->debug_root, host, ++ &ftsdc_fops_regs); ++ ++ if (IS_ERR(host->debug_regs)) ++ dev_err(dev, "failed to create debug regs file\n"); ++} ++ ++static void ftsdc_debugfs_remove(struct ftsdc_host *host) ++{ ++ debugfs_remove(host->debug_regs); ++ debugfs_remove(host->debug_state); ++ debugfs_remove(host->debug_root); ++} ++ ++#else ++static inline void ftsdc_debugfs_attach(struct ftsdc_host *host) { } ++static inline void ftsdc_debugfs_remove(struct ftsdc_host *host) { } ++ ++#endif /* CONFIG_DEBUG_FS */ ++ ++#if (defined(CONFIG_PLATFORM_AHBDMA) || defined(CONFIG_PLATFORM_APBDMA)) ++static int ftsdc_alloc_dma(struct ftsdc_host *host) ++{ ++ dmad_chreq *req = host->dma_req; ++ req = kzalloc(sizeof(dmad_chreq), GFP_KERNEL); ++#ifdef CONFIG_PLATFORM_APBDMA ++ req->apb_req.addr0_ctrl = APBBR_ADDRINC_FIXED; /* (in) APBBR_ADDRINC_xxx */ ++/* for amerald */ ++#if !defined(CONFIG_PLAT_AE3XX) ++ if((inl(pmu_base) & AMERALD_MASK) == AMERALD_PRODUCT_ID){ ++ req->apb_req.addr0_reqn = APBBR_REQN_SDC_AMERALD; ++ }else ++#endif ++ { ++ req->apb_req.addr0_reqn = APBBR_REQN_SDC; /* (in) APBBR_REQN_xxx (also used to help determine bus selection) */ ++ } ++ req->apb_req.addr1_ctrl = APBBR_ADDRINC_I4X; /* (in) APBBR_ADDRINC_xxx */ ++ req->apb_req.addr1_reqn = APBBR_REQN_NONE; /* (in) APBBR_REQN_xxx (also used to help determine bus selection) */ ++ req->apb_req.burst_mode = 1; /* (in) Burst mode (0: no burst 1-, 1: burst 4- data cycles per dma cycle) */ ++ req->apb_req.data_width = APBBR_DATAWIDTH_4; /* (in) APBBR_DATAWIDTH_4(word), APBBR_DATAWIDTH_2(half-word), APBBR_DATAWIDTH_1(byte) */ ++ req->apb_req.tx_dir = DMAD_DIR_A0_TO_A1; /* (in) DMAD_DIR_A0_TO_A1, DMAD_DIR_A1_TO_A0 */ ++ req->controller = DMAD_DMAC_APB_CORE; /* (in) DMAD_DMAC_AHB_CORE, DMAD_DMAC_APB_CORE */ ++ req->flags = DMAD_FLAGS_SLEEP_BLOCK | DMAD_FLAGS_BIDIRECTION; ++ ++ if (dmad_channel_alloc(req) == 0) { ++ dbg(host, dbg_debug, "%s: APB dma channel allocated (ch: %d)\n", __func__, req->channel); ++ host->dma_req = req; ++ return 0; ++ } ++ ++ memset(req, 0, sizeof(dmad_chreq)); ++ dbg(host, dbg_info, "%s: APB dma channel allocation failed\n", __func__); ++#endif /* CONFIG_PLATFORM_APBDMA */ ++ ++#ifdef CONFIG_PLATFORM_AHBDMA ++ req->ahb_req.sync = 1; /* (in) non-zero if src and dst have different clock domain */ ++ req->ahb_req.priority = DMAC_CSR_CHPRI_1; /* (in) DMAC_CSR_CHPRI_0 (lowest) ~ DMAC_CSR_CHPRI_3 (highest) */ ++ req->ahb_req.hw_handshake = 1; /* (in) non-zero to enable hardware handshake mode */ ++ req->ahb_req.burst_size = DMAC_CSR_SIZE_4; /* (in) DMAC_CSR_SIZE_1 ~ DMAC_CSR_SIZE_256 */ ++ req->ahb_req.addr0_width = DMAC_CSR_WIDTH_32; /* (in) DMAC_CSR_WIDTH_8, DMAC_CSR_WIDTH_16, or DMAC_CSR_WIDTH_32 */ ++ req->ahb_req.addr0_ctrl = DMAC_CSR_AD_FIX; /* (in) DMAC_CSR_AD_INC, DMAC_CSR_AD_DEC, or DMAC_CSR_AD_FIX */ ++ req->ahb_req.addr0_reqn = DMAC_REQN_SDC; /* (in) DMAC_REQN_xxx (also used to help determine channel number) */ ++ req->ahb_req.addr1_width = DMAC_CSR_WIDTH_32; /* (in) DMAC_CSR_WIDTH_8, DMAC_CSR_WIDTH_16, or DMAC_CSR_WIDTH_32 */ ++ req->ahb_req.addr1_ctrl = DMAC_CSR_AD_INC; /* (in) DMAC_CSR_AD_INC, DMAC_CSR_AD_DEC, or DMAC_CSR_AD_FIX */ ++ req->ahb_req.addr1_reqn = DMAC_REQN_NONE; /* (in) DMAC_REQN_xxx (also used to help determine channel number) */ ++ req->ahb_req.tx_dir = DMAD_DIR_A0_TO_A1; /* (in) DMAD_DIR_A0_TO_A1, DMAD_DIR_A1_TO_A0 */ ++ ++ req->controller = DMAD_DMAC_AHB_CORE; /* (in) DMAD_DMAC_AHB_CORE, DMAD_DMAC_APB_CORE */ ++ req->flags = DMAD_FLAGS_SLEEP_BLOCK | DMAD_FLAGS_BIDIRECTION; ++ ++ if (dmad_channel_alloc(req) == 0) { ++ dbg(host, dbg_debug, "%s: AHB dma channel allocated (ch: %d)\n", __func__, req->channel); ++ host->dma_req = req; ++ return 0; ++ } ++ dbg(host, dbg_info, "%s: AHB dma channel allocation failed\n", __func__); ++#endif ++ ++ kfree(req); ++ return -ENODEV; ++ ++} ++#endif ++ ++enum { ++ MMC_CTLR_VERSION_1 = 0, ++ MMC_CTLR_VERSION_2, ++}; ++ ++ ++static struct platform_device_id ftsdc_mmc_devtype[] = { ++ { ++ .name = "ag101p", ++ .driver_data = MMC_CTLR_VERSION_1, ++ }, { ++ .name = "ae3xx", ++ .driver_data = MMC_CTLR_VERSION_2, ++ }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(platform, ftsdc_mmc_devtype); ++ ++static const struct of_device_id ftsdc_mmc_dt_ids[] = { ++ { ++ .compatible = "andestech,atfsdc010", ++ .data = &ftsdc_mmc_devtype[MMC_CTLR_VERSION_1], ++ }, ++ { ++ .compatible = "andestech,atfsdc010", ++ .data = &ftsdc_mmc_devtype[MMC_CTLR_VERSION_2], ++ }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, ftsdc_mmc_dt_ids); ++ ++ ++static struct ftsdc_mmc_config ++ *mmc_parse_pdata(struct platform_device *pdev) ++{ ++ struct device_node *np; ++ struct ftsdc_mmc_config *pdata = pdev->dev.platform_data; ++ const struct of_device_id *match = ++ of_match_device(of_match_ptr(ftsdc_mmc_dt_ids), &pdev->dev); ++ u32 data; ++ ++ np = pdev->dev.of_node; ++ if (!np) ++ return pdata; ++ ++ pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); ++ pdev->dev.platform_data = (void *)pdata; ++ ++ if (!pdata) { ++ dev_err(&pdev->dev, "Failed to allocate memory for struct ftsdc_mmc_config\n"); ++ goto nodata; ++ } ++ ++ if (match) ++ pdev->id_entry = match->data; ++ ++ if (of_property_read_u32(np, "max-frequency", &pdata->max_freq)) ++ dev_info(&pdev->dev, "'max-frequency' property not specified, defaulting to 25MHz\n"); ++ ++ of_property_read_u32(np, "bus-width", &data); ++ switch (data) { ++ case 1: ++ case 4: ++ case 8: ++ pdata->wires = data; ++ break; ++ default: ++ pdata->wires = 1; ++/* ++ dev_info(&pdev->dev, "Unsupported buswidth, defaulting to 1 bit\n"); ++*/ ++ } ++nodata: ++ return pdata; ++} ++ ++static int __init ftsdc_probe(struct platform_device *pdev) ++{ ++ struct ftsdc_host *host; ++ struct mmc_host *mmc; ++ struct ftsdc_mmc_config *pdata = NULL; ++ struct resource *r, *mem = NULL; ++ int ret = -ENOMEM; ++ u32 con; ++ int irq = 0; ++ size_t mem_size; ++ ++ pdata = mmc_parse_pdata(pdev); ++ if (pdata == NULL) { ++ dev_err(&pdev->dev, "Couldn't get platform data\n"); ++ return -ENOENT; ++ } ++ ret = -ENODEV; ++ r = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ irq = platform_get_irq(pdev, 0); ++ ++ if (!r || irq == NO_IRQ) ++ goto probe_out; ++ ++ ret = -EBUSY; ++ mem_size = resource_size(r); ++ mem = request_mem_region(r->start, mem_size, pdev->name); ++ ++ if (!mem){ ++ dev_err(&pdev->dev, ++ "failed to get io memory region resouce.\n"); ++ goto probe_out; ++ } ++ ret = -ENOMEM; ++ mmc = mmc_alloc_host(sizeof(struct ftsdc_host), &pdev->dev); ++ if (!mmc) { ++ goto probe_out; ++ } ++ ++ host = mmc_priv(mmc); ++ host->mmc = mmc; ++ host->pdev = pdev; ++ mywq = create_workqueue("atcsdc_queue"); ++ if (NULL == mywq) ++ goto probe_free_host; ++ ++ spin_lock_init(&host->complete_lock); ++ tasklet_init(&host->pio_tasklet, pio_tasklet, (unsigned long) host); ++ init_completion(&host->dma_complete); ++ INIT_WORK(&host->work, ftsdc_work); ++ ++ host->complete_what = COMPLETION_NONE; ++ host->buf_active = XFER_NONE; ++ ++#if (defined(CONFIG_PLATFORM_AHBDMA) || defined(CONFIG_PLATFORM_APBDMA)) ++ ftsdc_alloc_dma(host); ++#endif ++ host->mem = mem; ++ host->base = (void __iomem *) ioremap(mem->start, mem_size); ++ if (IS_ERR(host->base)){ ++ ret = PTR_ERR(host->base); ++ goto probe_free_mem_region; ++ } ++ host->irq = irq; ++ ++ ret = request_irq(host->irq, ftsdc_irq, 0, DRIVER_NAME, host); ++ if (ret) { ++ dev_err(&pdev->dev, "failed to request mci interrupt.\n"); ++ ret = -ENOENT; ++ goto probe_free_mem_region; ++ } ++ host->irq_enabled = true; ++ /* enable card change interruption */ ++ con = REG_READ(SDC_INT_MASK_REG); ++ con |= SDC_INT_MASK_REG_CARD_CHANGE; ++ REG_WRITE(con, SDC_INT_MASK_REG); ++ ++ con = REG_READ(SDC_BUS_WIDTH_REG); ++ mmc->ops = &ftsdc_ops; ++ mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; ++ ++ if (con & SDC_WIDE_4_BUS_SUPPORT) ++ mmc->caps |= MMC_CAP_4_BIT_DATA; ++ else if (con & SDC_WIDE_8_BUS_SUPPORT) ++ mmc->caps |= MMC_CAP_8_BIT_DATA; ++ ++#ifndef A320D_BUILDIN_SDC ++ mmc->caps |= MMC_CAP_SDIO_IRQ; ++#endif ++ mmc->f_min = pdata->max_freq / (2 * 128); ++ mmc->f_max = pdata->max_freq / 2; ++ /* limit SDIO mode max size */ ++ mmc->max_req_size = 128 * 1024 * 1024 - 1; ++ mmc->max_blk_size = 2047; ++ mmc->max_req_size = (mmc->max_req_size + 1) / (mmc->max_blk_size + 1); ++ mmc->max_seg_size = mmc->max_req_size; ++ mmc->max_blk_count = (1<<17)-1; ++ ++ /* kernel default value. see Doc/block/biodocs.txt */ ++ /* ++ 'struct mmc_host' has no member named 'max_phys_segs' ++ 'struct mmc_host' has no member named 'max_hw_segs' ++ */ ++// mmc->max_phys_segs = 128; ++// mmc->max_hw_segs = 128; ++ ++ /* set fifo lenght and default threshold half */ ++ con = REG_READ(SDC_FEATURE_REG); ++ host->fifo_len = (con & SDC_FEATURE_REG_FIFO_DEPTH) * sizeof(u32); ++ ++ dbg(host, dbg_debug, ++ "probe: mapped mci_base:%p irq:%u.\n", ++ host->base, host->irq); ++ ++ dbg_dumpregs(host, ""); ++ ret = mmc_add_host(mmc); ++ if (ret) { ++ dev_err(&pdev->dev, "failed to add mmc host.\n"); ++ goto probe_free_irq; ++ } ++ ftsdc_debugfs_attach(host); ++ platform_set_drvdata(pdev, mmc); ++ dev_info(&pdev->dev, "%s - using %s SDIO IRQ\n", mmc_hostname(mmc), ++ mmc->caps & MMC_CAP_SDIO_IRQ ? "hw" : "sw"); ++ return 0; ++ ++ probe_free_irq: ++ free_irq(host->irq, host); ++ ++ probe_free_mem_region: ++ release_mem_region(host->mem->start, resource_size(host->mem)); ++ destroy_workqueue(mywq); ++ ++ probe_free_host: ++ mmc_free_host(mmc); ++ ++ probe_out: ++ return ret; ++} ++ ++static void ftsdc_shutdown(struct platform_device *pdev) ++{ ++ struct mmc_host *mmc = platform_get_drvdata(pdev); ++ struct ftsdc_host *host = mmc_priv(mmc); ++ ++ flush_workqueue(mywq); ++ destroy_workqueue(mywq); ++ ++ ftsdc_debugfs_remove(host); ++ mmc_remove_host(mmc); ++} ++ ++static int __exit ftsdc_remove(struct platform_device *pdev) ++{ ++ struct mmc_host *mmc = platform_get_drvdata(pdev); ++ struct ftsdc_host *host = mmc_priv(mmc); ++ ++ ftsdc_shutdown(pdev); ++ ++ tasklet_disable(&host->pio_tasklet); ++ ++ if (ftsdc_dmaexist(host)) ++ kfree(host->dma_req); ++ ++ free_irq(host->irq, host); ++ ++ iounmap(host->base); ++ release_mem_region(host->mem->start, resource_size(host->mem)); ++ ++ mmc_free_host(mmc); ++ return 0; ++} ++ ++#ifdef CONFIG_PM ++static int ftsdc_free_dma(struct ftsdc_host *host) ++{ ++ dmad_channel_free(host->dma_req); ++ return 0; ++} ++ ++static int ftsdc_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ struct mmc_host *mmc = platform_get_drvdata(pdev); ++ struct ftsdc_host *host = mmc_priv(mmc); ++ int ret = 0; ++ if (mmc) { ++ ftsdc_free_dma(host); ++ } ++ return ret; ++ ++} ++ ++static int ftsdc_resume(struct platform_device *pdev) ++{ ++ struct mmc_host *mmc = platform_get_drvdata(pdev); ++ int ret = 0; ++ struct ftsdc_host *host = mmc_priv(mmc); ++ if (mmc) { ++#if (defined(CONFIG_PLATFORM_AHBDMA) || defined(CONFIG_PLATFORM_APBDMA)) ++ ftsdc_alloc_dma(host); ++#endif ++ } ++ return ret; ++} ++ ++#else ++#define ftsdc_suspend NULL ++#define ftsdc_resume NULL ++#endif ++ ++static struct platform_driver ftsdc_driver = { ++ .driver = { ++ .name = "ftsdc010", ++ .owner = THIS_MODULE, ++ .of_match_table = of_match_ptr(ftsdc_mmc_dt_ids), ++ }, ++ .remove = __exit_p(ftsdc_remove), ++ .shutdown = ftsdc_shutdown, ++ .suspend = ftsdc_suspend, ++ .resume = ftsdc_resume, ++}; ++ ++module_platform_driver_probe(ftsdc_driver, ftsdc_probe); ++MODULE_DESCRIPTION("Andestech Leopard MMC/SD Card Interface driver"); ++MODULE_LICENSE("GPL v2"); +diff --git a/drivers/mmc/host/ftsdc010.h b/drivers/mmc/host/ftsdc010.h +new file mode 100644 +index 000000000000..d8cbe57fab1d +--- /dev/null ++++ b/drivers/mmc/host/ftsdc010.h +@@ -0,0 +1,257 @@ ++/* ++ * linux/driver/mmc/ftsdc010.h - Andestech MMC/SD driver ++ * Andestech FTSDC010 Device Driver ++ * ++ * Andestech (C) 2005 Faraday Corp. (http://www.Andestech.com) ++ * ++ * All Rights Reserved ++ */ ++#ifndef _FTSDC010_H_ ++#define _FTSDC010_H_ ++ ++#define DELAY_FOR_DMA_READ ++ ++#ifdef SD_DEBUG ++ #define P_DEBUG(fmt, args...) printk(KERN_ALERT "SD: " fmt, ## args) ++#else ++ #define P_DEBUG(a...) ++#endif ++#define P_DEBUGG(a...) ++ ++/* used for dma timeout */ ++#define SDC_TIMEOUT_BASE (HZ/2) // Unit is 500 ms ++ ++/* used for pio retry times */ ++#define SDC_PIO_RETRY 0x300000 ++ ++/* sd controller register */ ++#define SDC_CMD_REG 0x00000000 ++#define SDC_ARGU_REG 0x00000004 ++#define SDC_RESPONSE0_REG 0x00000008 ++#define SDC_RESPONSE1_REG 0x0000000C ++#define SDC_RESPONSE2_REG 0x00000010 ++#define SDC_RESPONSE3_REG 0x00000014 ++#define SDC_RSP_CMD_REG 0x00000018 ++#define SDC_DATA_CTRL_REG 0x0000001C ++#define SDC_DATA_TIMER_REG 0x00000020 ++#define SDC_DATA_LEN_REG 0x00000024 ++#define SDC_STATUS_REG 0x00000028 ++#define SDC_CLEAR_REG 0x0000002C ++#define SDC_INT_MASK_REG 0x00000030 ++#define SDC_POWER_CTRL_REG 0x00000034 ++#define SDC_CLOCK_CTRL_REG 0x00000038 ++#define SDC_BUS_WIDTH_REG 0x0000003C ++#define SDC_DATA_WINDOW_REG 0x00000040 ++ ++#ifdef A320D_BUILDIN_SDC ++#define SDC_FEATURE_REG 0x00000044 ++#define SDC_REVISION_REG 0x00000048 ++#else ++#define SDC_MMC_INT_RSP_REG 0x00000044 ++#define SDC_GP_OUTPUT_REG 0x00000048 ++#define SDC_FEATURE_REG 0x0000009C ++#define SDC_REVISION_REG 0x000000A0 ++#endif ++ ++#define SDC_SDIO_CTRL1_REG 0x0000006C ++#define SDC_SDIO_CTRL2_REG 0x00000070 ++#define SDC_SDIO_STATUS_REG 0x00000074 ++ ++/* bit mapping of command register */ ++#define SDC_CMD_REG_INDEX 0x0000003F ++#define SDC_CMD_REG_NEED_RSP 0x00000040 ++#define SDC_CMD_REG_LONG_RSP 0x00000080 ++#define SDC_CMD_REG_APP_CMD 0x00000100 ++#define SDC_CMD_REG_CMD_EN 0x00000200 ++#define SDC_CMD_REG_SDC_RST 0x00000400 ++#define SDC_CMD_MMC_INT_STOP 0x00000800 ++ ++/* bit mapping of response command register */ ++#define SDC_RSP_CMD_REG_INDEX 0x0000003F ++#define SDC_RSP_CMD_REG_APP 0x00000040 ++ ++/* bit mapping of data control register */ ++#define SDC_DATA_CTRL_REG_BLK_SIZE 0x0000000F ++#define SDC_DATA_CTRL_REG_DATA_WRITE 0x00000010 ++#define SDC_DATA_CTRL_REG_DMA_EN 0x00000020 ++#define SDC_DATA_CTRL_REG_DATA_EN 0x00000040 ++#define SDC_DATA_CTRL_REG_FIFOTH 0x00000080 ++#define SDC_DATA_CTRL_REG_DMA_TYPE 0x00000300 ++#define SDC_DATA_CTRL_REG_FIFO_RST 0x00000400 ++#define SDC_CPRM_DATA_CHANGE_ENDIAN_EN 0x00000800 ++#define SDC_CPRM_DATA_SWAP_HL_EN 0x00001000 ++ ++#define SDC_DMA_TYPE_1 0x00000000 ++#define SDC_DMA_TYPE_4 0x00000100 ++#define SDC_DMA_TYPE_8 0x00000200 ++ ++/* bit mapping of status register */ ++#define SDC_STATUS_REG_RSP_CRC_FAIL 0x00000001 ++#define SDC_STATUS_REG_DATA_CRC_FAIL 0x00000002 ++#define SDC_STATUS_REG_RSP_TIMEOUT 0x00000004 ++#define SDC_STATUS_REG_DATA_TIMEOUT 0x00000008 ++#define SDC_STATUS_REG_RSP_CRC_OK 0x00000010 ++#define SDC_STATUS_REG_DATA_CRC_OK 0x00000020 ++#define SDC_STATUS_REG_CMD_SEND 0x00000040 ++#define SDC_STATUS_REG_DATA_END 0x00000080 ++#define SDC_STATUS_REG_FIFO_UNDERRUN 0x00000100 ++#define SDC_STATUS_REG_FIFO_OVERRUN 0x00000200 ++#define SDC_STATUS_REG_CARD_CHANGE 0x00000400 ++#define SDC_STATUS_REG_CARD_DETECT 0x00000800 ++#define SDC_STATUS_REG_CARD_LOCK 0x00001000 ++#define SDC_STATUS_REG_CP_READY 0x00002000 ++#define SDC_STATUS_REG_CP_BUF_READY 0x00004000 ++#define SDC_STATUS_REG_PLAIN_TEXT_READY 0x00008000 ++#define SDC_STATUS_REG_SDIO_INTR 0x00010000 ++ ++/* bit mapping of clear register */ ++#define SDC_CLEAR_REG_RSP_CRC_FAIL 0x00000001 ++#define SDC_CLEAR_REG_DATA_CRC_FAIL 0x00000002 ++#define SDC_CLEAR_REG_RSP_TIMEOUT 0x00000004 ++#define SDC_CLEAR_REG_DATA_TIMEOUT 0x00000008 ++#define SDC_CLEAR_REG_RSP_CRC_OK 0x00000010 ++#define SDC_CLEAR_REG_DATA_CRC_OK 0x00000020 ++#define SDC_CLEAR_REG_CMD_SEND 0x00000040 ++#define SDC_CLEAR_REG_DATA_END 0x00000080 ++#define SDC_CLEAR_REG_CARD_CHANGE 0x00000400 ++#define SDC_CLEAR_REG_SDIO_INTR 0x00010000 ++ ++/* bit mapping of int_mask register */ ++#define SDC_INT_MASK_REG_RSP_CRC_FAIL 0x00000001 ++#define SDC_INT_MASK_REG_DATA_CRC_FAIL 0x00000002 ++#define SDC_INT_MASK_REG_RSP_TIMEOUT 0x00000004 ++#define SDC_INT_MASK_REG_DATA_TIMEOUT 0x00000008 ++#define SDC_INT_MASK_REG_RSP_CRC_OK 0x00000010 ++#define SDC_INT_MASK_REG_DATA_CRC_OK 0x00000020 ++#define SDC_INT_MASK_REG_CMD_SEND 0x00000040 ++#define SDC_INT_MASK_REG_DATA_END 0x00000080 ++#define SDC_INT_MASK_REG_FIFO_UNDERRUN 0x00000100 ++#define SDC_INT_MASK_REG_FIFO_OVERRUN 0x00000200 ++#define SDC_INT_MASK_REG_CARD_CHANGE 0x00000400 ++#define SDC_INT_MASK_REG_CARD_LOCK 0x00001000 ++#define SDC_INT_MASK_REG_CP_READY 0x00002000 ++#define SDC_INT_MASK_REG_CP_BUF_READY 0x00004000 ++#define SDC_INT_MASK_REG_PLAIN_TEXT_READY 0x00008000 ++#define SDC_INT_MASK_REG_SDIO_INTR 0x00010000 ++ ++ ++#define SDC_CARD_INSERT 0x0 ++#define SDC_CARD_REMOVE SDC_STATUS_REG_CARD_DETECT ++ ++/* bit mapping of power control register */ ++#define SDC_POWER_CTRL_REG_POWER_ON 0x00000010 ++#define SDC_POWER_CTRL_REG_POWER_BITS 0x0000000F ++ ++/* bit mapping of clock control register */ ++#define SDC_CLOCK_CTRL_REG_CLK_DIV 0x0000007F ++#define SDC_CLOCK_CTRL_REG_CARD_TYPE 0x00000080 ++#define SDC_CLOCK_CTRL_REG_CLK_DIS 0x00000100 ++ ++/* card type */ ++#define SDC_CARD_TYPE_SD SDC_CLOCK_REG_CARD_TYPE ++#define SDC_CARD_TYPE_MMC 0x0 ++ ++/* bit mapping of bus width register */ ++#define SDC_BUS_WIDTH_REG_SINGLE_BUS 0x00000001 ++#define SDC_BUS_WIDTH_REG_WIDE_8_BUS 0x00000002 ++#define SDC_BUS_WIDTH_REG_WIDE_4_BUS 0x00000004 ++#define SDC_BUS_WIDTH_REG_WIDE_BUS_SUPPORT 0x00000018 ++#define SDC_BUS_WIDTH_REG_CARD_DETECT 0x00000020 ++ ++#define SDC_WIDE_4_BUS_SUPPORT 0x00000008 ++#define SDC_WIDE_8_BUS_SUPPORT 0x00000010 ++ ++/* bit mapping of feature register */ ++#define SDC_FEATURE_REG_FIFO_DEPTH 0x000000FF ++#define SDC_FEATURE_REG_CPRM_FUNCTION 0x00000100 ++ ++/* bit mapping of sdio control register */ ++#define SDC_SDIO_CTRL1_REG_SDIO_BLK_NO 0xFFFF8000 ++#define SDC_SDIO_CTRL1_REG_SDIO_ENABLE 0x00004000 ++#define SDC_SDIO_CTRL1_REG_READ_WAIT_ENABLE 0x00002000 ++#define SDC_SDIO_CTRL1_REG_SDIO_BLK_MODE 0x00001000 ++#define SDC_SDIO_CTRL1_REG_SDIO_BLK_SIZE 0x00000FFF ++ ++/* bit mapping of sdio status register */ ++#define SDC_SDIO_SDIO_STATUS_REG_FIFO_REMAIN_NO 0x00FE0000 ++#define SDC_SDIO_SDIO_STATUS_REG_SDIO_BLK_CNT 0x0001FFFF ++ ++enum ftsdc_waitfor { ++ COMPLETION_NONE, ++ COMPLETION_FINALIZE, ++ COMPLETION_CMDSENT, ++ COMPLETION_RSPFIN, ++ COMPLETION_XFER_PROGRESS, ++}; ++ ++struct ftsdc_host { ++ struct platform_device *pdev; ++ struct mmc_host *mmc; ++ struct resource *mem; ++ struct clk *clk; ++ void __iomem *base; ++ int irq; ++ ++ unsigned int real_rate; ++ bool irq_enabled; ++ unsigned int fifo_len; /* bytes */ ++ unsigned int last_opcode; /* keep last successful cmd to judge application specific command */ ++ ++ struct mmc_request *mrq; ++ int cmd_is_stop; ++ ++ spinlock_t complete_lock; ++ enum ftsdc_waitfor complete_what; ++ ++ struct completion dma_complete; ++ dmad_chreq *dma_req; ++ bool dodma; ++ bool dma_finish; ++ ++ ++ u32 buf_sgptr; /* keep next scallterlist buffer index */ ++ u32 buf_bytes; /* keep current total scallterlist buffer length */ ++ u32 buf_count; /* keep real data size rw from sd */ ++ u32 *buf_ptr; /* keep current scallterlist buffer address */ ++#define XFER_NONE 0 ++#define XFER_READ 1 ++#define XFER_WRITE 2 ++ u32 buf_active; /* keep current transfer mode */ ++ ++ int bus_width; ++ ++ char dbgmsg_cmd[301]; ++ char dbgmsg_dat[301]; ++ char *status; ++ ++ unsigned int ccnt, dcnt; ++ struct tasklet_struct pio_tasklet; ++ struct work_struct work; ++ ++#ifdef CONFIG_DEBUG_FS ++ struct dentry *debug_root; ++ struct dentry *debug_state; ++ struct dentry *debug_regs; ++#endif ++}; ++ ++struct ftsdc_mmc_config { ++ /* get_cd()/get_wp() may sleep */ ++ int (*get_cd)(int module); ++ int (*get_ro)(int module); ++ ++ void (*set_power)(int module, bool on); ++ ++ /* wires == 0 is equivalent to wires == 4 (4-bit parallel) */ ++ u8 wires; ++ ++ u32 max_freq; ++ ++ /* any additional host capabilities: OR'd in to mmc->f_caps */ ++ u32 caps; ++ ++ /* Number of sg segments */ ++ u8 nr_sg; ++}; ++ ++#endif +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0005-Non-cacheability-and-Cache-support.patch b/board/andes/ae350/patches/linux/0005-Non-cacheability-and-Cache-support.patch new file mode 100644 index 0000000000..326bbb71c7 --- /dev/null +++ b/board/andes/ae350/patches/linux/0005-Non-cacheability-and-Cache-support.patch @@ -0,0 +1,1132 @@ +From e0f510874201d32d720fc94948a266a29d9b4b52 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:20:40 +0800 +Subject: [PATCH 05/12] Non-cacheability and Cache support + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/andesv5/Makefile | 4 + + arch/riscv/andesv5/cache.c | 414 ++++++++++++++++++++++++++ + arch/riscv/andesv5/cctl.c | 260 ++++++++++++++++ + arch/riscv/andesv5/noncache_dma.c | 113 +++++++ + arch/riscv/include/asm/andesv5/csr.h | 160 ++++++++++ + arch/riscv/include/asm/andesv5/proc.h | 36 +++ + arch/riscv/include/asm/andesv5/smu.h | 78 +++++ + 7 files changed, 1065 insertions(+) + create mode 100644 arch/riscv/andesv5/Makefile + create mode 100644 arch/riscv/andesv5/cache.c + create mode 100644 arch/riscv/andesv5/cctl.c + create mode 100644 arch/riscv/andesv5/noncache_dma.c + create mode 100644 arch/riscv/include/asm/andesv5/csr.h + create mode 100644 arch/riscv/include/asm/andesv5/proc.h + create mode 100644 arch/riscv/include/asm/andesv5/smu.h + +diff --git a/arch/riscv/andesv5/Makefile b/arch/riscv/andesv5/Makefile +new file mode 100644 +index 000000000000..6188956ae944 +--- /dev/null ++++ b/arch/riscv/andesv5/Makefile +@@ -0,0 +1,4 @@ ++obj-y += cctl.o ++obj-y += cache.o ++obj-y += noncache_dma.o ++obj-y += sbi.o +diff --git a/arch/riscv/andesv5/cache.c b/arch/riscv/andesv5/cache.c +new file mode 100644 +index 000000000000..3d4e82f3525e +--- /dev/null ++++ b/arch/riscv/andesv5/cache.c +@@ -0,0 +1,414 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_PERF_EVENTS ++#include ++#endif ++ ++#define MAX_CACHE_LINE_SIZE 256 ++#define EVSEL_MASK 0xff ++#define SEL_PER_CTL 8 ++#define SEL_OFF(id) (8 * (id % 8)) ++ ++static void __iomem *l2c_base; ++ ++DEFINE_PER_CPU(struct andesv5_cache_info, cpu_cache_info) = { ++ .init_done = 0, ++ .dcache_line_size = SZ_32 ++}; ++static void fill_cpu_cache_info(struct andesv5_cache_info *cpu_ci) ++{ ++ struct cpu_cacheinfo *this_cpu_ci = ++ get_cpu_cacheinfo(smp_processor_id()); ++ struct cacheinfo *this_leaf = this_cpu_ci->info_list; ++ unsigned int i = 0; ++ ++ for(; i< this_cpu_ci->num_leaves ; i++, this_leaf++) ++ if(this_leaf->type == CACHE_TYPE_DATA) { ++ cpu_ci->dcache_line_size = this_leaf->coherency_line_size; ++ } ++ cpu_ci->init_done = true; ++} ++ ++ ++inline int get_cache_line_size(void) ++{ ++ struct andesv5_cache_info *cpu_ci = ++ &per_cpu(cpu_cache_info, smp_processor_id()); ++ ++ if(unlikely(cpu_ci->init_done == false)) ++ fill_cpu_cache_info(cpu_ci); ++ return cpu_ci->dcache_line_size; ++} ++ ++static uint32_t cpu_l2c_get_cctl_status(void) ++{ ++ return readl((void*)(l2c_base + L2C_REG_STATUS_OFFSET)); ++} ++ ++void cpu_dcache_wb_range(unsigned long start, unsigned long end, int line_size) ++{ ++ int mhartid = smp_processor_id(); ++ unsigned long pa; ++ while (end > start) { ++ custom_csr_write(CCTL_REG_UCCTLBEGINADDR_NUM, start); ++ custom_csr_write(CCTL_REG_UCCTLCOMMAND_NUM, CCTL_L1D_VA_WB); ++ ++ if (l2c_base) { ++ pa = virt_to_phys((void*)start); ++ writel(pa, (void*)(l2c_base + L2C_REG_CN_ACC_OFFSET(mhartid))); ++ writel(CCTL_L2_PA_WB, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ } ++ ++ start += line_size; ++ } ++} ++ ++void cpu_dcache_inval_range(unsigned long start, unsigned long end, int line_size) ++{ ++ int mhartid = smp_processor_id(); ++ unsigned long pa; ++ while (end > start) { ++ custom_csr_write(CCTL_REG_UCCTLBEGINADDR_NUM, start); ++ custom_csr_write(CCTL_REG_UCCTLCOMMAND_NUM, CCTL_L1D_VA_INVAL); ++ ++ if (l2c_base) { ++ pa = virt_to_phys((void*)start); ++ writel(pa, (void*)(l2c_base + L2C_REG_CN_ACC_OFFSET(mhartid))); ++ writel(CCTL_L2_PA_INVAL, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ } ++ ++ start += line_size; ++ } ++} ++void cpu_dma_inval_range(unsigned long start, unsigned long end) ++{ ++ unsigned long flags; ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long old_start = start; ++ unsigned long old_end = end; ++ char cache_buf[2][MAX_CACHE_LINE_SIZE]={0}; ++ ++ if (unlikely(start == end)) ++ return; ++ ++ start = start & (~(line_size - 1)); ++ end = ((end + line_size - 1) & (~(line_size - 1))); ++ ++ local_irq_save(flags); ++ if (unlikely(start != old_start)) { ++ memcpy(&cache_buf[0][0], (void *)start, line_size); ++ } ++ if (unlikely(end != old_end)) { ++ memcpy(&cache_buf[1][0], (void *)(old_end & (~(line_size - 1))), line_size); ++ } ++ cpu_dcache_inval_range(start, end, line_size); ++ if (unlikely(start != old_start)) { ++ memcpy((void *)start, &cache_buf[0][0], (old_start & (line_size - 1))); ++ } ++ if (unlikely(end != old_end)) { ++ memcpy((void *)(old_end + 1), &cache_buf[1][(old_end & (line_size - 1)) + 1], end - old_end - 1); ++ } ++ local_irq_restore(flags); ++ ++} ++EXPORT_SYMBOL(cpu_dma_inval_range); ++ ++void cpu_dma_wb_range(unsigned long start, unsigned long end) ++{ ++ unsigned long flags; ++ unsigned long line_size = get_cache_line_size(); ++ ++ local_irq_save(flags); ++ start = start & (~(line_size - 1)); ++ cpu_dcache_wb_range(start, end, line_size); ++ local_irq_restore(flags); ++} ++EXPORT_SYMBOL(cpu_dma_wb_range); ++ ++/* L1 Cache */ ++int cpu_l1c_status(void) ++{ ++ /* TODO */ ++ // return SBI_CALL_0(SBI_L1CACHE_STATUS); ++ return 0; ++} ++ ++void cpu_icache_enable(void *info) ++{ ++ /* TODO */ ++ // SBI_CALL_1(SBI_ICACHE_OP, 1); ++} ++ ++void cpu_icache_disable(void *info) ++{ ++ /* TODO */ ++ // unsigned long flags; ++ ++ // local_irq_save(flags); ++ // SBI_CALL_1(SBI_ICACHE_OP, 0); ++ // local_irq_restore(flags); ++} ++ ++void cpu_dcache_enable(void *info) ++{ ++ /* TODO */ ++ // SBI_CALL_1(SBI_DCACHE_OP, 1); ++} ++ ++void cpu_dcache_disable(void *info) ++{ ++ /* TODO */ ++ // unsigned long flags; ++ ++ // local_irq_save(flags); ++ // SBI_CALL_1(SBI_DCACHE_OP, 0); ++ // local_irq_restore(flags); ++} ++ ++/* L2 Cache */ ++uint32_t cpu_l2c_ctl_status(void) ++{ ++ return readl((void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++} ++ ++void cpu_l2c_enable(void) ++{ ++#ifdef CONFIG_SMP ++ int mhartid = smp_processor_id(); ++#else ++ int mhartid = 0; ++#endif ++ unsigned int val; ++ ++ /* No l2 cache */ ++ if(!l2c_base) ++ return; ++ ++ /* l2 cache has enabled */ ++ if(cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN) ++ return; ++ ++ /* Enable l2 cache*/ ++ val = readl((void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++ val |= L2_CACHE_CTL_mskCEN; ++ ++ writel(val, (void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++} ++ ++void cpu_l2c_disable(void) ++{ ++#ifdef CONFIG_SMP ++ int mhartid = smp_processor_id(); ++#else ++ int mhartid = 0; ++#endif ++ unsigned int val; ++ ++ /*No l2 cache */ ++ if(!l2c_base) ++ return; ++ ++ /*l2 cache has disabled*/ ++ if(!(cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN)) ++ return; ++ ++ /*L2 write-back and invalidate all*/ ++ writel(CCTL_L2_WBINVAL_ALL, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ ++ /*Disable L2 cache*/ ++ val = readl((void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++ val &= (~L2_CACHE_CTL_mskCEN); ++ ++ writel(val, (void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++} ++ ++#ifndef CONFIG_SMP ++void cpu_l2c_inval_range(unsigned long pa, unsigned long size) ++{ ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long start = pa, end = pa + size; ++ unsigned long align_start, align_end; ++ ++ align_start = start & ~(line_size - 1); ++ align_end = (end + line_size - 1) & ~(line_size - 1); ++ ++ while(align_end > align_start){ ++ writel(align_start, (void*)(l2c_base + L2C_REG_C0_ACC_OFFSET)); ++ writel(CCTL_L2_PA_INVAL, (void*)(l2c_base + L2C_REG_C0_CMD_OFFSET)); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_C0_MASK) ++ != CCTL_L2_STATUS_IDLE); ++ align_start += line_size; ++ } ++} ++EXPORT_SYMBOL(cpu_l2c_inval_range); ++ ++void cpu_l2c_wb_range(unsigned long pa, unsigned long size) ++{ ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long start = pa, end = pa + size; ++ unsigned long align_start, align_end; ++ ++ align_start = start & ~(line_size - 1); ++ align_end = (end + line_size - 1) & ~(line_size - 1); ++ ++ while(align_end > align_start){ ++ writel(align_start, (void*)(l2c_base + L2C_REG_C0_ACC_OFFSET)); ++ writel(CCTL_L2_PA_WB, (void*)(l2c_base + L2C_REG_C0_CMD_OFFSET)); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_C0_MASK) ++ != CCTL_L2_STATUS_IDLE); ++ align_start += line_size; ++ } ++} ++EXPORT_SYMBOL(cpu_l2c_wb_range); ++#else ++void cpu_l2c_inval_range(unsigned long pa, unsigned long size) ++{ ++ int mhartid = smp_processor_id(); ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long start = pa, end = pa + size; ++ unsigned long align_start, align_end; ++ ++ align_start = start & ~(line_size - 1); ++ align_end = (end + line_size - 1) & ~(line_size - 1); ++ ++ while(align_end > align_start){ ++ writel(align_start, (void*)(l2c_base + L2C_REG_CN_ACC_OFFSET(mhartid))); ++ writel(CCTL_L2_PA_INVAL, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ align_start += line_size; ++ } ++} ++EXPORT_SYMBOL(cpu_l2c_inval_range); ++ ++void cpu_l2c_wb_range(unsigned long pa, unsigned long size) ++{ ++ int mhartid = smp_processor_id(); ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long start = pa, end = pa + size; ++ unsigned long align_start, align_end; ++ ++ align_start = start & ~(line_size - 1); ++ align_end = (end + line_size - 1) & ~(line_size - 1); ++ ++ while(align_end > align_start){ ++ writel(align_start, (void*)(l2c_base + L2C_REG_CN_ACC_OFFSET(mhartid))); ++ writel(CCTL_L2_PA_WB, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ align_start += line_size; ++ } ++} ++EXPORT_SYMBOL(cpu_l2c_wb_range); ++#endif ++ ++#ifdef CONFIG_PERF_EVENTS ++int cpu_l2c_get_counter_idx(struct l2c_hw_events *l2c) ++{ ++ int idx; ++ ++ idx = find_next_zero_bit(l2c->used_mask, L2C_MAX_COUNTERS - 1, 0); ++ return idx; ++} ++ ++void l2c_write_counter(int idx, u64 value) ++{ ++ u32 vall = value; ++ u32 valh = value >> 32; ++ ++ writel(vall, (void*)(l2c_base + L2C_REG_CN_HPM_OFFSET(idx))); ++ writel(valh, (void*)(l2c_base + L2C_REG_CN_HPM_OFFSET(idx) + 0x4)); ++} ++ ++u64 l2c_read_counter(int idx) ++{ ++ u32 vall = readl((void*)(l2c_base + L2C_REG_CN_HPM_OFFSET(idx))); ++ u32 valh = readl((void*)(l2c_base + L2C_REG_CN_HPM_OFFSET(idx) + 0x4)); ++ u64 val = ((u64)valh << 32) | vall; ++ ++ return val; ++} ++ ++void l2c_pmu_disable_counter(int idx) ++{ ++ int n = idx / SEL_PER_CTL; ++ u32 vall = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ u32 valh = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++ u64 val = ((u64)valh << 32) | vall; ++ ++ val |= (EVSEL_MASK << SEL_OFF(idx)); ++ vall = val; ++ valh = val >> 32; ++ writel(vall, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ writel(valh, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++} ++ ++#ifndef CONFIG_SMP ++void l2c_pmu_event_enable(u64 config, int idx) ++{ ++ int n = idx / SEL_PER_CTL; ++ u32 vall = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ u32 valh = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++ u64 val = ((u64)valh << 32) | vall; ++ ++ val = val & ~(EVSEL_MASK << SEL_OFF(idx)); ++ val = val | (config << SEL_OFF(idx)); ++ vall = val; ++ valh = val >> 32; ++ writel(vall, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ writel(valh, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++} ++#else ++void l2c_pmu_event_enable(u64 config, int idx) ++{ ++ int n = idx / SEL_PER_CTL; ++ int mhartid = smp_processor_id(); ++ u32 vall = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ u32 valh = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++ u64 val = ((u64)valh << 32) | vall; ++ ++ if (config <= (CN_RECV_SNOOP_DATA(NR_CPUS - 1) & EVSEL_MASK)) ++ config = config + mhartid * L2C_REG_PER_CORE_OFFSET; ++ ++ val = val & ~(EVSEL_MASK << SEL_OFF(idx)); ++ val = val | (config << SEL_OFF(idx)); ++ vall = val; ++ valh = val >> 32; ++ writel(vall, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ writel(valh, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++} ++#endif ++#endif ++ ++int __init l2c_init(void) ++{ ++ struct device_node *node ; ++ ++ node = of_find_compatible_node(NULL, NULL, "cache"); ++ l2c_base = of_iomap(node, 0); ++ ++ return 0; ++} ++arch_initcall(l2c_init) +diff --git a/arch/riscv/andesv5/cctl.c b/arch/riscv/andesv5/cctl.c +new file mode 100644 +index 000000000000..f3f61db29e0d +--- /dev/null ++++ b/arch/riscv/andesv5/cctl.c +@@ -0,0 +1,260 @@ ++/* ++ * Copyright (C) 2009 Andes Technology Corporation ++ * Copyright (C) 2019 Andes Technology Corporation ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define INPUTLEN 32 ++ ++struct entry_struct{ ++ ++ char *name; ++ int perm; ++ const struct proc_ops *fops; ++}; ++ ++static struct proc_dir_entry *proc_cctl; ++ ++#define DEBUG( enable, tagged, ...) \ ++ do{ \ ++ if(enable){ \ ++ if(tagged) \ ++ printk( "[ %30s() ] ", __func__); \ ++ printk( __VA_ARGS__); \ ++ } \ ++ } while( 0) ++ ++static int debug = 0; ++module_param(debug, int, 0); ++ ++void cpu_icache_smp_enable(void) ++{ ++ int cpu_num = num_online_cpus(); ++ int id = smp_processor_id(); ++ int i, ret; ++ ++ for(i = 0; i < cpu_num; i++){ ++ if(i == id) ++ continue; ++ ret = smp_call_function_single(i, cpu_icache_enable, ++ NULL, true); ++ if(ret) ++ pr_err("Core %d enable I-cache Fail\n" ++ "Error Code:%d \n", i, ret); ++ } ++ cpu_icache_enable(NULL); ++} ++ ++void cpu_icache_smp_disable(void) ++{ ++ int cpu_num = num_online_cpus(); ++ int id = smp_processor_id(); ++ int i, ret; ++ ++ for(i = 0; i < cpu_num; i++){ ++ if(i == id) ++ continue; ++ ret = smp_call_function_single(i, cpu_icache_disable, ++ NULL, true); ++ if(ret) ++ pr_err("Core %d disable I-cache Fail \n" ++ "Error Code:%d \n", i, ret); ++ } ++ cpu_icache_disable(NULL); ++} ++ ++void cpu_dcache_smp_enable(void) ++{ ++ int cpu_num = num_online_cpus(); ++ int id = smp_processor_id(); ++ int i, ret; ++ ++ for(i = 0; i < cpu_num; i++){ ++ if(i == id) ++ continue; ++ ret = smp_call_function_single(i, cpu_dcache_enable, ++ NULL, true); ++ if(ret) ++ pr_err("Core %d disable D-cache Fail \n" ++ "Error Code:%d \n", i, ret); ++ } ++ cpu_dcache_enable(NULL); ++} ++ ++void cpu_dcache_smp_disable(void) ++{ ++ int cpu_num = num_online_cpus(); ++ int id = smp_processor_id(); ++ int i, ret; ++ ++ for(i = 0; i < cpu_num; i++){ ++ if(i == id) ++ continue; ++ ret = smp_call_function_single(i, cpu_dcache_disable, ++ NULL, true); ++ if(ret) ++ pr_err("Core %d disable D-cache Fail \n" ++ "Error Code:%d \n", i, ret); ++ } ++ cpu_dcache_disable(NULL); ++} ++ ++static ssize_t proc_read_cache_en(struct file *file, char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ int ret; ++ char buf[18]; ++ if (!strncmp(file->f_path.dentry->d_name.name, "ic_en", 7)) ++ ret = sprintf(buf, "I-cache: %s\n", (cpu_l1c_status() & CACHE_CTL_mskIC_EN) ? "Enabled" : "Disabled"); ++ else if(!strncmp(file->f_path.dentry->d_name.name, "dc_en", 7)) ++ ret = sprintf(buf, "D-cache: %s\n", (cpu_l1c_status() & CACHE_CTL_mskDC_EN) ? "Enabled" : "Disabled"); ++ else if(!strncmp(file->f_path.dentry->d_name.name, "l2c_en", 7)) ++ ret = sprintf(buf, "L2-cache: %s\n", (cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN) ? "Enabled" : "Disabled"); ++ else ++ return -EFAULT; ++ ++ return simple_read_from_buffer(userbuf, count, ppos, buf, ret); ++} ++ ++static ssize_t proc_write_cache_en(struct file *file, ++ const char __user *buffer, size_t count, loff_t *ppos) ++{ ++ ++ unsigned long en; ++ char inbuf[INPUTLEN]; ++ ++ if (count > INPUTLEN - 1) ++ count = INPUTLEN - 1; ++ ++ if (copy_from_user(inbuf, buffer, count)) ++ return -EFAULT; ++ ++ inbuf[count] = '\0'; ++ ++ if (!sscanf(inbuf, "%lu", &en) || en > 1) ++ return -EFAULT; ++ ++ if (!strncmp(file->f_path.dentry->d_name.name, "ic_en", 7)) { ++ if (en && !(cpu_l1c_status() & CACHE_CTL_mskIC_EN)) { ++#ifdef CONFIG_SMP ++ cpu_icache_smp_enable(); ++#else ++ cpu_icache_enable(NULL); ++#endif ++ DEBUG(debug, 1, "I-cache: Enabled\n"); ++ } else if (!en && (cpu_l1c_status() & CACHE_CTL_mskIC_EN)) { ++#ifdef CONFIG_SMP ++ cpu_icache_smp_disable(); ++#else ++ cpu_icache_disable(NULL); ++#endif ++ DEBUG(debug, 1, "I-cache: Disabled\n"); ++ } ++ } else if(!strncmp(file->f_path.dentry->d_name.name, "dc_en", 7)) { ++ if (en && !(cpu_l1c_status() & CACHE_CTL_mskDC_EN)) { ++#ifdef CONFIG_SMP ++ cpu_dcache_smp_enable(); ++#else ++ cpu_dcache_enable(NULL); ++#endif ++ DEBUG(debug, 1, "D-cache: Enabled\n"); ++ } else if (!en && (cpu_l1c_status() & CACHE_CTL_mskDC_EN)) { ++#ifdef CONFIG_SMP ++ cpu_dcache_smp_disable(); ++#else ++ cpu_dcache_disable(NULL); ++#endif ++ DEBUG(debug, 1, "D-cache: Disabled\n"); ++ } ++ }else if(!strncmp(file->f_path.dentry->d_name.name, "l2c_en", 7)){ ++ if (en && !(cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN)) { ++ cpu_l2c_enable(); ++ DEBUG(debug, 1, "L2-cache: Enabled\n"); ++ } else if (!en && (cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN)) { ++ cpu_l2c_disable(); ++ DEBUG(debug, 1, "L2-cache: Disabled\n"); ++ } ++ }else{ ++ return -EFAULT; ++ } ++ ++ return count; ++} ++ ++static const struct proc_ops en_fops = { ++ .proc_open = simple_open, ++ .proc_read = proc_read_cache_en, ++ .proc_write = proc_write_cache_en, ++}; ++ ++static void create_seq_entry(struct entry_struct *e, mode_t mode, ++ struct proc_dir_entry *parent) ++{ ++ ++ struct proc_dir_entry *entry = proc_create(e->name, mode, parent, e->fops); ++ ++ if (!entry) ++ printk(KERN_ERR "invalid %s register.\n", e->name); ++} ++ ++static void install_proc_table(struct entry_struct *table) ++{ ++ while (table->name) { ++ ++ create_seq_entry(table, table->perm, proc_cctl); ++ table++; ++ } ++} ++ ++static void remove_proc_table(struct entry_struct *table) ++{ ++ ++ while (table->name) { ++ remove_proc_entry(table->name, proc_cctl); ++ table++; ++ } ++} ++ ++struct entry_struct proc_table_cache[] = { ++ ++ {"ic_en", 0644, &en_fops}, ++ {"dc_en", 0644, &en_fops}, ++ {"l2c_en", 0644, &en_fops}, ++ {NULL, 0, 0} ++}; ++static int __init init_cctl(void) ++{ ++ ++ DEBUG(debug, 0, "CCTL module registered\n"); ++ ++ if(!(proc_cctl = proc_mkdir("cctl", NULL))) ++ return -ENOMEM; ++ ++ install_proc_table(proc_table_cache); ++ ++ return 0; ++} ++ ++static void __exit cleanup_cctl(void) ++{ ++ ++ remove_proc_table(proc_table_cache); ++ remove_proc_entry("cctl", NULL); ++ ++ DEBUG(debug, 1, "CCTL module unregistered\n"); ++} ++ ++module_init(init_cctl); ++module_exit(cleanup_cctl); ++ ++MODULE_LICENSE("GPL"); ++MODULE_DESCRIPTION("Userspace Cache Control Module"); +diff --git a/arch/riscv/andesv5/noncache_dma.c b/arch/riscv/andesv5/noncache_dma.c +new file mode 100644 +index 000000000000..fa83cebad777 +--- /dev/null ++++ b/arch/riscv/andesv5/noncache_dma.c +@@ -0,0 +1,113 @@ ++/* ++ * Copyright (C) 2017 SiFive ++ * Wesley Terpstra ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see the file COPYING, or write ++ * to the Free Software Foundation, Inc., ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static void dma_flush_page(struct page *page, size_t size) ++{ ++ unsigned long k_d_vaddr; ++ /* ++ * Invalidate any data that might be lurking in the ++ * kernel direct-mapped region for device DMA. ++ */ ++ k_d_vaddr = (unsigned long)page_address(page); ++ memset((void *)k_d_vaddr, 0, size); ++ cpu_dma_wb_range(k_d_vaddr, k_d_vaddr + size); ++ cpu_dma_inval_range(k_d_vaddr, k_d_vaddr + size); ++ ++} ++ ++ ++static inline void cache_op(phys_addr_t paddr, size_t size, ++ void (*fn)(unsigned long start, unsigned long end)) ++{ ++ unsigned long start; ++ ++ start = (unsigned long)phys_to_virt(paddr); ++ fn(start, start + size); ++} ++ ++void arch_sync_dma_for_device(phys_addr_t paddr, ++ size_t size, enum dma_data_direction dir) ++{ ++ switch (dir) { ++ case DMA_FROM_DEVICE: ++ cache_op(paddr, size, cpu_dma_inval_range); ++ break; ++ case DMA_TO_DEVICE: ++ case DMA_BIDIRECTIONAL: ++ cache_op(paddr, size, cpu_dma_wb_range); ++ break; ++ default: ++ BUG(); ++ } ++} ++ ++void arch_sync_dma_for_cpu(phys_addr_t paddr, ++ size_t size, enum dma_data_direction dir) ++{ ++ switch (dir) { ++ case DMA_TO_DEVICE: ++ break; ++ case DMA_FROM_DEVICE: ++ case DMA_BIDIRECTIONAL: ++ cache_op(paddr, size, cpu_dma_inval_range); ++ break; ++ default: ++ BUG(); ++ } ++} ++ ++void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, ++ gfp_t gfp, unsigned long attrs) ++{ ++ void* kvaddr, *coherent_kvaddr; ++ size = PAGE_ALIGN(size); ++ ++ kvaddr = dma_direct_alloc_pages(dev, size, handle, gfp, attrs); ++ if (!kvaddr) ++ goto no_mem; ++ coherent_kvaddr = ioremap_nocache(dma_to_phys(dev, *handle), size); ++ if (!coherent_kvaddr) ++ goto no_map; ++ ++ dma_flush_page(virt_to_page(kvaddr),size); ++ return coherent_kvaddr; ++no_map: ++ dma_direct_free_pages(dev, size, kvaddr, *handle, attrs); ++no_mem: ++ return NULL; ++} ++ ++void arch_dma_free(struct device *dev, size_t size, void *vaddr, ++ dma_addr_t handle, unsigned long attrs) ++{ ++ void *kvaddr = phys_to_virt(dma_to_phys(dev, handle)); ++ ++ size = PAGE_ALIGN(size); ++ iounmap(vaddr); ++ dma_direct_free_pages(dev, size, kvaddr, handle, attrs); ++ ++ return; ++} +diff --git a/arch/riscv/include/asm/andesv5/csr.h b/arch/riscv/include/asm/andesv5/csr.h +new file mode 100644 +index 000000000000..43936e1fb658 +--- /dev/null ++++ b/arch/riscv/include/asm/andesv5/csr.h +@@ -0,0 +1,160 @@ ++/* micm_cfg: Instruction Cache/Memory Configuration Register */ ++#define MICM_CFG 0xfc0 ++ ++#define MICM_CFG_ISET_OFFSET 0 ++#define MICM_CFG_IWAY_OFFSET 3 ++#define MICM_CFG_ISZ_OFFSET 6 ++#define MICM_CFG_ILCK_OFFSET 9 ++#define MICM_CFG_IC_ECC_OFFSET 10 ++#define MICM_CFG_ILMB_OFFSET 12 ++#define MICM_CFG_ILMSZ_OFFSET 15 ++#define MICM_CFG_ULM_2BANK_OFFSET 20 ++#define MICM_CFG_ILM_ECC_OFFSET 21 ++ ++ ++#define MICM_CFG_ISET_MASK (0x7 << MICM_CFG_ISET_OFFSET) ++#define MICM_CFG_IWAY_MASK (0x7 << MICM_CFG_IWAY_OFFSET) ++#define MICM_CFG_ISZ_MASK (0x7 << MICM_CFG_ISZ_OFFSET) ++#define MICM_CFG_ILCK_MASK (0x1 << MICM_CFG_ILCK_OFFSET) ++#define MICM_CFG_IC_ECC_MASK (0x3 << MICM_CFG_IC_ECC_OFFSET) ++#define MICM_CFG_ILMB_MASK (0x7 << MICM_CFG_ILMB_OFFSET) ++#define MICM_CFG_ILMSZ_MASK (0x1f << MICM_CFG_ILMSZ_OFFSET) ++#define MICM_CFG_ULM_2BANK_MASK (0x1 << MICM_CFG_ULM_2BANK_OFFSET) ++#define MICM_CFG_ILM_ECC_MASK (0x3 << MICM_CFG_ILM_ECC_OFFSET) ++ ++/* mdcm_cfg: Data Cache/Memory Configuration Register */ ++#define MDCM_CFG 0xfc1 ++ ++#define MDCM_CFG_DSET_OFFSET 0 ++#define MDCM_CFG_DWAY_OFFSET 3 ++#define MDCM_CFG_DSZ_OFFSET 6 ++#define MDCM_CFG_DLCK_OFFSET 9 ++#define MDCM_CFG_DC_ECC_OFFSET 10 ++#define MDCM_CFG_DLMB_OFFSET 12 ++#define MDCM_CFG_DLMSZ_OFFSET 15 ++#define MDCM_CFG_ULM_2BANK_OFFSET 20 ++#define MDCM_CFG_DLM_ECC_OFFSET 21 ++ ++ ++#define MDCM_CFG_DSET_MASK (0x7 << MDCM_CFG_DSET_OFFSET) ++#define MDCM_CFG_DWAY_MASK (0x7 << MDCM_CFG_DWAY_OFFSET) ++#define MDCM_CFG_DSZ_MASK (0x7 << MDCM_CFG_DSZ_OFFSET) ++#define MDCM_CFG_DLCK_MASK (0x1 << MDCM_CFG_DLCK_OFFSET) ++#define MDCM_CFG_DC_ECC_MASK (0x3 << MDCM_CFG_DC_ECC_OFFSET) ++#define MDCM_CFG_DLMB_MASK (0x7 << MDCM_CFG_DLMB_OFFSET) ++#define MDCM_CFG_DLMSZ_MASK (0x1f << MDCM_CFG_DLMSZ_OFFSET) ++#define MDCM_CFG_ULM_2BANK_MASK (0x1 << MDCM_CFG_ULM_2BANK_OFFSET) ++#define MDCM_CFG_DLM_ECC_MASK (0x3 << MDCM_CFG_DLM_ECC_OFFSET) ++ ++/* User mode control registers */ ++#define CSR_UITB 0x800 ++#define CSR_UCODE 0x801 ++#define CSR_UDCAUSE 0x809 ++#define CCTL_REG_UCCTLBEGINADDR_NUM 0x80b ++#define CCTL_REG_UCCTLCOMMAND_NUM 0x80c ++#define CSR_WFE 0x810 ++#define CSR_SLEEPVALUE 0x811 ++#define CSR_TXEVT 0x812 ++ ++#define custom_csr_write(csr_num,val) csr_write(csr_num,val) ++/* ucctlcommand */ ++/* D-cache operation */ ++#define CCTL_L1D_VA_INVAL 0 ++#define CCTL_L1D_VA_WB 1 ++#define CCTL_L1D_VA_WBINVAL 2 ++ ++/* non-blocking & write around */ ++#define MMISC_CTL_NON_BLOCKING_ENABLE (0x1 << MMISC_CTL_NON_BLOCKING_OFFSET) ++#define MMISC_CTL_NON_BLOCKING_OFFSET 0x8 ++ ++#define MCACHE_CTL_L1I_PREFETCH_OFFSET 9 ++#define MCACHE_CTL_L1D_PREFETCH_OFFSET 10 ++#define MCACHE_CTL_DC_WAROUND_OFFSET_1 13 ++#define MCACHE_CTL_DC_WAROUND_OFFSET_2 14 ++#define MCACHE_CTL_L1I_PREFETCH_EN (0x1 << MCACHE_CTL_L1I_PREFETCH_OFFSET) ++#define MCACHE_CTL_L1D_PREFETCH_EN (0x1 << MCACHE_CTL_L1D_PREFETCH_OFFSET) ++#define MCACHE_CTL_DC_WAROUND_1_EN (0x1 << MCACHE_CTL_DC_WAROUND_OFFSET_1) ++#define MCACHE_CTL_DC_WAROUND_2_EN (0x1 << MCACHE_CTL_DC_WAROUND_OFFSET_2) ++#define WRITE_AROUND_ENABLE (MCACHE_CTL_L1I_PREFETCH_EN | MCACHE_CTL_L1D_PREFETCH_EN | MCACHE_CTL_DC_WAROUND_1_EN) ++ ++/* L1 I-cache , D-cache */ ++#define CACHE_CTL_offIC_EN 0 /* Enable I-cache */ ++#define CACHE_CTL_offDC_EN 1 /* Enable D-cache */ ++#define CACHE_CTL_mskIC_EN ( 0x1 << CACHE_CTL_offIC_EN ) ++#define CACHE_CTL_mskDC_EN ( 0x1 << CACHE_CTL_offDC_EN ) ++ ++ ++/* L2 cache */ ++#define L2_CACHE_CTL_mskCEN 1 ++/* L2 cache registers */ ++#define L2C_REG_CFG_OFFSET 0 ++#define L2C_REG_CTL_OFFSET 0x8 ++#define L2C_HPM_C0_CTL_OFFSET 0x10 ++#define L2C_HPM_C1_CTL_OFFSET 0x18 ++#define L2C_HPM_C2_CTL_OFFSET 0x20 ++#define L2C_HPM_C3_CTL_OFFSET 0x28 ++#define L2C_REG_C0_CMD_OFFSET 0x40 ++#define L2C_REG_C0_ACC_OFFSET 0x48 ++#define L2C_REG_C1_CMD_OFFSET 0x50 ++#define L2C_REG_C1_ACC_OFFSET 0x58 ++#define L2C_REG_C2_CMD_OFFSET 0x60 ++#define L2C_REG_C2_ACC_OFFSET 0x68 ++#define L2C_REG_C3_CMD_OFFSET 0x70 ++#define L2C_REG_C3_ACC_OFFSET 0x78 ++#define L2C_REG_STATUS_OFFSET 0x80 ++#define L2C_REG_C0_HPM_OFFSET 0x200 ++ ++/* L2 CCTL status */ ++#define CCTL_L2_STATUS_IDLE 0 ++#define CCTL_L2_STATUS_PROCESS 1 ++#define CCTL_L2_STATUS_ILLEGAL 2 ++/* L2 CCTL status cores mask */ ++#define CCTL_L2_STATUS_C0_MASK 0xF ++#define CCTL_L2_STATUS_C1_MASK 0xF0 ++#define CCTL_L2_STATUS_C2_MASK 0xF00 ++#define CCTL_L2_STATUS_C3_MASK 0xF000 ++ ++/* L2 cache operation */ ++#define CCTL_L2_PA_INVAL 0x8 ++#define CCTL_L2_PA_WB 0x9 ++#define CCTL_L2_PA_WBINVAL 0xA ++#define CCTL_L2_WBINVAL_ALL 0x12 ++ ++#define L2C_HPM_PER_CORE_OFFSET 0x8 ++#define L2C_REG_PER_CORE_OFFSET 0x10 ++#define CCTL_L2_STATUS_PER_CORE_OFFSET 4 ++#define L2C_REG_CN_CMD_OFFSET(n) \ ++ L2C_REG_C0_CMD_OFFSET + (n * L2C_REG_PER_CORE_OFFSET) ++#define L2C_REG_CN_ACC_OFFSET(n) \ ++ L2C_REG_C0_ACC_OFFSET + (n * L2C_REG_PER_CORE_OFFSET) ++#define CCTL_L2_STATUS_CN_MASK(n) \ ++ CCTL_L2_STATUS_C0_MASK << (n * CCTL_L2_STATUS_PER_CORE_OFFSET) ++#define L2C_HPM_CN_CTL_OFFSET(n) \ ++ L2C_HPM_C0_CTL_OFFSET + (n * L2C_HPM_PER_CORE_OFFSET) ++#define L2C_REG_CN_HPM_OFFSET(n) \ ++ L2C_REG_C0_HPM_OFFSET + (n * L2C_HPM_PER_CORE_OFFSET) ++ ++ ++/* Debug/Trace Registers (shared with Debug Mode) */ ++#define CSR_SCONTEXT 0x7aa ++ ++/* Supervisor trap registers */ ++#define CSR_SLIE 0x9c4 ++#define CSR_SLIP 0x9c5 ++#define CSR_SDCAUSE 0x9c9 ++ ++/* Supervisor counter registers */ ++#define CSR_SCOUNTERINTEN 0x9cf ++#define CSR_SCOUNTERMASK_M 0x9d1 ++#define CSR_SCOUNTERMASK_S 0x9d2 ++#define CSR_SCOUNTERMASK_U 0x9d3 ++#define CSR_SCOUNTEROVF 0x9d4 ++#define CSR_SCOUNTINHIBIT 0x9e0 ++#define CSR_SHPMEVENT3 0x9e3 ++#define CSR_SHPMEVENT4 0x9e4 ++#define CSR_SHPMEVENT5 0x9e5 ++#define CSR_SHPMEVENT6 0x9e6 ++ ++/* Supervisor control registers */ ++#define CSR_SCCTLDATA 0x9cd ++#define CSR_SMISC_CTL 0x9d0 +diff --git a/arch/riscv/include/asm/andesv5/proc.h b/arch/riscv/include/asm/andesv5/proc.h +new file mode 100644 +index 000000000000..d06fbff65ad0 +--- /dev/null ++++ b/arch/riscv/include/asm/andesv5/proc.h +@@ -0,0 +1,36 @@ ++#include ++#include ++ ++int cpu_l1c_status(void); ++void cpu_icache_enable(void *info); ++void cpu_icache_disable(void *info); ++void cpu_dcache_enable(void *info); ++void cpu_dcache_disable(void *info); ++uint32_t cpu_l2c_ctl_status(void); ++void cpu_l2c_enable(void); ++void cpu_l2c_disable(void); ++ ++void cpu_dma_inval_range(unsigned long start, unsigned long end); ++void cpu_dma_wb_range(unsigned long start, unsigned long end); ++void cpu_l2c_inval_range(unsigned long pa, unsigned long size); ++void cpu_l2c_wb_range(unsigned long pa, unsigned long size); ++ ++extern phys_addr_t pa_msb;; ++ ++#define dma_remap(pa, size) ioremap((pa|(pa_msb << PAGE_SHIFT)), size) ++ ++#define dma_unmap(vaddr) iounmap((void __force __iomem *)vaddr) ++ ++ ++/* ++ * struct andesv5_cache_info ++ * The member of this struct is dupilcated to some content of struct cacheinfo ++ * to reduce the latence of searching dcache inforamtion in andesv5/cache.c. ++ * At current only dcache-line-size is needed. when the content of ++ * andesv5_cache_info has been initilized by function fill_cpu_cache_info(), ++ * member init_done is set as true ++ */ ++struct andesv5_cache_info { ++ bool init_done; ++ int dcache_line_size; ++}; +diff --git a/arch/riscv/include/asm/andesv5/smu.h b/arch/riscv/include/asm/andesv5/smu.h +new file mode 100644 +index 000000000000..14813492c159 +--- /dev/null ++++ b/arch/riscv/include/asm/andesv5/smu.h +@@ -0,0 +1,78 @@ ++#ifndef _ASM_RISCV_SMU_H ++#define _ASM_RISCV_SMU_H ++ ++#include ++#define MAX_PCS_SLOT 7 ++ ++#define PCS0_WE_OFF 0x90 ++#define PCS0_CTL_OFF 0x94 ++#define PCS0_STATUS_OFF 0x98 ++ ++/* ++ * PCS0 --> Always on power domain, includes the JTAG tap and DMI_AHB bus in ++ * ncejdtm200. ++ * PCS1 --> Power domain for debug subsystem ++ * PCS2 --> Main power domain, includes the system bus and AHB, APB peripheral ++ * IPs. ++ * PCS3 --> Power domain for Core0 and L2C. ++ * PCSN --> Power domain for Core (N-3) ++ */ ++ ++#define PCSN_WE_OFF(n) n * 0x20 + PCS0_WE_OFF ++#define CN_PCS_WE_OFF(n) (n + 3) * 0x20 + PCS0_WE_OFF ++#define CN_PCS_STATUS_OFF(n) (n + 3) * 0x20 + PCS0_STATUS_OFF ++#define CN_PCS_CTL_OFF(n) (n + 3) * 0x20 + PCS0_CTL_OFF ++ ++ ++#define PD_TYPE_MASK 0x7 ++#define PD_STATUS_MASK 0xf8 ++#define GET_PD_TYPE(val) val & PD_TYPE_MASK ++#define GET_PD_STATUS(val) (val & PD_STATUS_MASK) >> 3 ++ ++// PD_type ++#define ACTIVE 0 ++#define RESET 1 ++#define SLEEP 2 ++#define TIMEOUT 7 ++ ++// PD_status for sleep type ++#define LightSleep_STATUS 0 ++#define DeepSleep_STATUS 16 ++ ++// param of PCS_CTL for sleep cmd ++#define LightSleep_CTL 0 ++#define DeepSleep_CTL 1 ++ ++// PCS_CTL ++#define PCS_CTL_PARAM_OFF 3 ++#define SLEEP_CMD 3 ++ ++// wakeup events source offset ++#define PCS_WAKE_DBG_OFF 28 ++#define PCS_WAKE_MSIP_OFF 29 ++ ++#define L2_CTL_OFF 0x8 ++#define L2_COMMAND_OFF(cpu) 0x40 + 0x10 * cpu ++#define L2_STATUS_REG 0x80 ++#define L2_WBINVAL_COMMAND 0x12 ++ ++extern unsigned int *wake_mask; ++extern void __iomem *l2c_base; ++ ++void set_wakeup_enable(int cpu, unsigned int events); ++void set_sleep(int cpu, unsigned char sleep); ++void andes_suspend2standby(void); ++void andes_suspend2ram(void); ++ ++static inline void sbi_suspend_prepare(char main_core, char enable) ++{ ++ /* TODO */ ++ // SBI_CALL_2(SBI_SUSPEND_PREPARE, main_core, enable); ++} ++ ++static inline void sbi_suspend_mem(void) ++{ ++ /* TODO */ ++ // SBI_CALL_0(SBI_SUSPEND_MEM); ++} ++#endif +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0006-Add-andes-sbi-call-vendor-extension.patch b/board/andes/ae350/patches/linux/0006-Add-andes-sbi-call-vendor-extension.patch new file mode 100644 index 0000000000..51b4277930 --- /dev/null +++ b/board/andes/ae350/patches/linux/0006-Add-andes-sbi-call-vendor-extension.patch @@ -0,0 +1,231 @@ +From d4d9304e009a8c754e16e1ebb17c0ec3071eb68e Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:22:56 +0800 +Subject: [PATCH 06/12] Add andes sbi call vendor extension + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/andesv5/sbi.c | 111 +++++++++++++++++++++++++++++++++++ + arch/riscv/include/asm/sbi.h | 59 ++++++++++++++++++- + 2 files changed, 168 insertions(+), 2 deletions(-) + create mode 100755 arch/riscv/andesv5/sbi.c + +diff --git a/arch/riscv/andesv5/sbi.c b/arch/riscv/andesv5/sbi.c +new file mode 100755 +index 000000000000..c5d2afd83ae0 +--- /dev/null ++++ b/arch/riscv/andesv5/sbi.c +@@ -0,0 +1,111 @@ ++/* ++ * Copyright (C) 2020 Andes Technology Corporation ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++ ++void sbi_suspend_prepare(char main_core, char enable) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SUSPEND_PREPARE, main_core, enable, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_suspend_prepare); ++ ++void sbi_suspend_mem(void) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SUSPEND_MEM, 0, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_suspend_mem); ++ ++void sbi_restart(int cpu_num) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_RESTART, cpu_num, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_restart); ++ ++void sbi_write_powerbrake(int val) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_WRITE_POWERBRAKE, val, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_write_powerbrake); ++ ++int sbi_read_powerbrake(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_READ_POWERBRAKE, 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_read_powerbrake); ++ ++void sbi_set_suspend_mode(int suspend_mode) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_SUSPEND_MODE, suspend_mode, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_set_suspend_mode); ++ ++void sbi_set_reset_vec(int val) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_RESET_VEC, val, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_set_reset_vec); ++ ++void sbi_set_pma(void *arg) ++{ ++ phys_addr_t offset = ((struct pma_arg_t*)arg)->offset; ++ unsigned long vaddr = ((struct pma_arg_t*)arg)->vaddr; ++ size_t size = ((struct pma_arg_t*)arg)->size; ++ size_t entry_id = ((struct pma_arg_t*)arg)->entry_id; ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_PMA, offset, vaddr, size, entry_id, 0, 0); ++} ++EXPORT_SYMBOL(sbi_set_pma); ++ ++void sbi_free_pma(unsigned long entry_id) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_FREE_PMA, entry_id, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_free_pma); ++ ++long sbi_probe_pma(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_PROBE_PMA, 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_probe_pma); ++ ++void sbi_set_trigger(unsigned int type, uintptr_t data, int enable) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_TRIGGER, type, data, enable, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_set_trigger); ++ ++long sbi_get_marchid(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_BASE, SBI_EXT_BASE_GET_MARCHID, 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_get_marchid); ++ ++long sbi_get_micm_cfg(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_GET_MICM_CFG, ++ 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_get_micm_cfg); ++ ++long sbi_get_mdcm_cfg(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_GET_MDCM_CFG, ++ 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_get_mdcm_cfg); +diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h +index c0fdb05ffa0b..d3b2d34136f0 100644 +--- a/arch/riscv/include/asm/sbi.h ++++ b/arch/riscv/include/asm/sbi.h +@@ -10,6 +10,14 @@ + #include + + #ifdef CONFIG_RISCV_SBI ++ ++struct pma_arg_t { ++ phys_addr_t offset; ++ unsigned long vaddr; ++ size_t size; ++ size_t entry_id; ++}; ++ + enum sbi_ext_id { + #ifdef CONFIG_RISCV_SBI_V01 + SBI_EXT_0_1_SET_TIMER = 0x0, +@@ -27,6 +35,7 @@ enum sbi_ext_id { + SBI_EXT_IPI = 0x735049, + SBI_EXT_RFENCE = 0x52464E43, + SBI_EXT_HSM = 0x48534D, ++ SBI_EXT_ANDES = 0x0900031E, + }; + + enum sbi_ext_base_fid { +@@ -51,10 +60,10 @@ enum sbi_ext_rfence_fid { + SBI_EXT_RFENCE_REMOTE_FENCE_I = 0, + SBI_EXT_RFENCE_REMOTE_SFENCE_VMA, + SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID, +- SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID, + SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA, +- SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID, ++ SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID, + SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA, ++ SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID, + }; + + enum sbi_ext_hsm_fid { +@@ -63,6 +72,35 @@ enum sbi_ext_hsm_fid { + SBI_EXT_HSM_HART_STATUS, + }; + ++enum sbi_ext_andes_fid { ++ SBI_EXT_ANDES_GET_MCACHE_CTL_STATUS = 0, ++ SBI_EXT_ANDES_GET_MMISC_CTL_STATUS, ++ SBI_EXT_ANDES_SET_MCACHE_CTL, ++ SBI_EXT_ANDES_SET_MMISC_CTL, ++ SBI_EXT_ANDES_ICACHE_OP, ++ SBI_EXT_ANDES_DCACHE_OP, ++ SBI_EXT_ANDES_L1CACHE_I_PREFETCH, ++ SBI_EXT_ANDES_L1CACHE_D_PREFETCH, ++ SBI_EXT_ANDES_NON_BLOCKING_LOAD_STORE, ++ SBI_EXT_ANDES_WRITE_AROUND, ++ SBI_EXT_ANDES_TRIGGER, ++ SBI_EXT_ANDES_SET_PFM, ++ SBI_EXT_ANDES_READ_POWERBRAKE, ++ SBI_EXT_ANDES_WRITE_POWERBRAKE, ++ SBI_EXT_ANDES_SUSPEND_PREPARE, ++ SBI_EXT_ANDES_SUSPEND_MEM, ++ SBI_EXT_ANDES_SET_SUSPEND_MODE, ++ SBI_EXT_ANDES_ENTER_SUSPEND_MODE, ++ SBI_EXT_ANDES_RESTART, ++ SBI_EXT_ANDES_SET_RESET_VEC, ++ SBI_EXT_ANDES_SET_PMA, ++ SBI_EXT_ANDES_FREE_PMA, ++ SBI_EXT_ANDES_PROBE_PMA, ++ SBI_EXT_ANDES_DCACHE_WBINVAL_ALL, ++ SBI_EXT_ANDES_GET_MICM_CFG, ++ SBI_EXT_ANDES_GET_MDCM_CFG, ++}; ++ + enum sbi_hsm_hart_status { + SBI_HSM_HART_STATUS_STARTED = 0, + SBI_HSM_HART_STATUS_STOPPED, +@@ -146,6 +184,23 @@ static inline unsigned long sbi_minor_version(void) + } + + int sbi_err_map_linux_errno(int err); ++ ++void sbi_suspend_prepare(char main_core, char enable); ++void sbi_suspend_mem(void); ++void sbi_restart(int cpu_num); ++void sbi_write_powerbrake(int val); ++int sbi_read_powerbrake(void); ++void sbi_set_suspend_mode(int suspend_mode); ++void sbi_set_reset_vec(int val); ++void sbi_set_pma(void *arg); ++void sbi_free_pma(unsigned long entry_id); ++long sbi_probe_pma(void); ++void sbi_set_trigger(unsigned int type, uintptr_t data, int enable); ++long sbi_get_marchid(void); ++int get_custom_csr_cacheinfo(const char *propname, u32 *out_value); ++long sbi_get_micm_cfg(void); ++long sbi_get_mdcm_cfg(void); ++ + #else /* CONFIG_RISCV_SBI */ + /* stubs for code that is only reachable under IS_ENABLED(CONFIG_RISCV_SBI): */ + void sbi_set_timer(uint64_t stime_value); +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0007-riscv-Porting-pte-update-function-local_flush_tlb_al.patch b/board/andes/ae350/patches/linux/0007-riscv-Porting-pte-update-function-local_flush_tlb_al.patch new file mode 100644 index 0000000000..238a71841d --- /dev/null +++ b/board/andes/ae350/patches/linux/0007-riscv-Porting-pte-update-function-local_flush_tlb_al.patch @@ -0,0 +1,101 @@ +From 7c7587775d5b86d5822777e226a6bf0bb3704bed Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:44:26 +0800 +Subject: [PATCH 07/12] riscv: Porting pte update function + "local_flush_tlb_all" + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/include/asm/pgtable-64.h | 1 + + arch/riscv/include/asm/pgtable.h | 20 ++++++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h +index f3b0da64c6c8..69a9a87b3365 100644 +--- a/arch/riscv/include/asm/pgtable-64.h ++++ b/arch/riscv/include/asm/pgtable-64.h +@@ -53,6 +53,7 @@ static inline int pud_leaf(pud_t pud) + static inline void set_pud(pud_t *pudp, pud_t pud) + { + *pudp = pud; ++ local_flush_tlb_all(); + } + + static inline void pud_clear(pud_t *pudp) +diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h +index 73e8b5e5bb65..0fa3fc6658ed 100644 +--- a/arch/riscv/include/asm/pgtable.h ++++ b/arch/riscv/include/asm/pgtable.h +@@ -7,7 +7,6 @@ + #define _ASM_RISCV_PGTABLE_H + + #include +-#include + + #include + +@@ -18,6 +17,7 @@ + #include + #include + #include ++#include + + #ifdef CONFIG_MMU + +@@ -99,6 +99,7 @@ + | _PAGE_DIRTY) + + #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) ++#define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL | _PAGE_EXEC) + #define PAGE_KERNEL_READ __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) + #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL | _PAGE_EXEC) + #define PAGE_KERNEL_READ_EXEC __pgprot((_PAGE_KERNEL & ~_PAGE_WRITE) \ +@@ -134,6 +135,12 @@ extern pgd_t swapper_pg_dir[]; + #define __S110 PAGE_SHARED_EXEC + #define __S111 PAGE_SHARED_EXEC + ++#define pgprot_noncached pgprot_noncached ++static inline pgprot_t pgprot_noncached(pgprot_t _prot) ++{ ++ return __pgprot(pgprot_val(_prot) | _PAGE_NONCACHEABLE); ++} ++ + static inline int pmd_present(pmd_t pmd) + { + return (pmd_val(pmd) & (_PAGE_PRESENT | _PAGE_PROT_NONE)); +@@ -159,6 +166,7 @@ static inline int pmd_leaf(pmd_t pmd) + static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) + { + *pmdp = pmd; ++ local_flush_tlb_all(); + } + + static inline void pmd_clear(pmd_t *pmdp) +@@ -195,9 +203,16 @@ static inline unsigned long pte_pfn(pte_t pte) + #define pte_page(x) pfn_to_page(pte_pfn(x)) + + /* Constructs a page table entry */ ++extern phys_addr_t pa_msb; + static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot) + { +- return __pte((pfn << _PAGE_PFN_SHIFT) | pgprot_val(prot)); ++ pte_t ret; ++ if (pgprot_val(prot) & _PAGE_NONCACHEABLE) { ++ ret = __pte(((pfn|pa_msb) << _PAGE_PFN_SHIFT) | (pgprot_val(prot) & ~_PAGE_NONCACHEABLE)); ++ } else { ++ ret = __pte((pfn << _PAGE_PFN_SHIFT) | pgprot_val(prot)); ++ } ++ return ret; + } + + #define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot) +@@ -327,6 +342,7 @@ static inline int pte_same(pte_t pte_a, pte_t pte_b) + static inline void set_pte(pte_t *ptep, pte_t pteval) + { + *ptep = pteval; ++ local_flush_tlb_all(); + } + + void flush_icache_pte(pte_t pte); +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0008-Support-time32-stat64-sys_clone3-syscalls.patch b/board/andes/ae350/patches/linux/0008-Support-time32-stat64-sys_clone3-syscalls.patch new file mode 100644 index 0000000000..9d604ae5bc --- /dev/null +++ b/board/andes/ae350/patches/linux/0008-Support-time32-stat64-sys_clone3-syscalls.patch @@ -0,0 +1,47 @@ +From 4d02088e32ecb5abb3c84d9364f15db2044fadf3 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:47:28 +0800 +Subject: [PATCH 08/12] Support time32, stat64, sys_clone3 syscalls + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/include/asm/unistd.h | 3 +++ + arch/riscv/include/uapi/asm/unistd.h | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/arch/riscv/include/asm/unistd.h b/arch/riscv/include/asm/unistd.h +index 977ee6181dab..42ebae0693b1 100644 +--- a/arch/riscv/include/asm/unistd.h ++++ b/arch/riscv/include/asm/unistd.h +@@ -9,6 +9,9 @@ + */ + + #define __ARCH_WANT_SYS_CLONE ++#define __ARCH_WANT_STAT64 ++#define __ARCH_WANT_SYS_CLONE3 ++#define __ARCH_WANT_TIME32_SYSCALLS + + #include + +diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h +index 8062996c2dfd..c05ce62b2b33 100644 +--- a/arch/riscv/include/uapi/asm/unistd.h ++++ b/arch/riscv/include/uapi/asm/unistd.h +@@ -15,12 +15,12 @@ + * along with this program. If not, see . + */ + +-#ifdef __LP64__ + #define __ARCH_WANT_NEW_STAT + #define __ARCH_WANT_SET_GET_RLIMIT +-#endif /* __LP64__ */ +- ++#define __ARCH_WANT_SYS_NEWFSTATAT + #define __ARCH_WANT_SYS_CLONE3 ++#define __ARCH_WANT_TIME32_SYSCALLS ++#define __ARCH_WANT_STAT64 + + #include + +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0009-dma-Support-smp-up-with-dma.patch b/board/andes/ae350/patches/linux/0009-dma-Support-smp-up-with-dma.patch new file mode 100644 index 0000000000..9c731f003b --- /dev/null +++ b/board/andes/ae350/patches/linux/0009-dma-Support-smp-up-with-dma.patch @@ -0,0 +1,120 @@ +From 27a98deea31b3d724fccb2728f43053ee1a814df Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:59:12 +0800 +Subject: [PATCH 09/12] dma: Support smp/up with dma + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/mm/dma-mapping.c | 101 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 101 insertions(+) + create mode 100755 arch/riscv/mm/dma-mapping.c + +diff --git a/arch/riscv/mm/dma-mapping.c b/arch/riscv/mm/dma-mapping.c +new file mode 100755 +index 000000000000..8072e765f3ae +--- /dev/null ++++ b/arch/riscv/mm/dma-mapping.c +@@ -0,0 +1,101 @@ ++#include ++#include ++ ++ ++/******************************************** ++ * The following APIs are for dummy DMA ops * ++ ********************************************/ ++ ++static void *__dummy_alloc(struct device *dev, size_t size, ++ dma_addr_t *dma_handle, gfp_t flags, ++ unsigned long attrs) ++{ ++ return NULL; ++} ++ ++static void __dummy_free(struct device *dev, size_t size, ++ void *vaddr, dma_addr_t dma_handle, ++ unsigned long attrs) ++{ ++} ++ ++static int __dummy_mmap(struct device *dev, ++ struct vm_area_struct *vma, ++ void *cpu_addr, dma_addr_t dma_addr, size_t size, ++ unsigned long attrs) ++{ ++ return -ENXIO; ++} ++ ++static dma_addr_t __dummy_map_page(struct device *dev, struct page *page, ++ unsigned long offset, size_t size, ++ enum dma_data_direction dir, ++ unsigned long attrs) ++{ ++ return 0; ++} ++ ++static void __dummy_unmap_page(struct device *dev, dma_addr_t dev_addr, ++ size_t size, enum dma_data_direction dir, ++ unsigned long attrs) ++{ ++} ++ ++static int __dummy_map_sg(struct device *dev, struct scatterlist *sgl, ++ int nelems, enum dma_data_direction dir, ++ unsigned long attrs) ++{ ++ return 0; ++} ++ ++static void __dummy_unmap_sg(struct device *dev, ++ struct scatterlist *sgl, int nelems, ++ enum dma_data_direction dir, ++ unsigned long attrs) ++{ ++} ++ ++static void __dummy_sync_single(struct device *dev, ++ dma_addr_t dev_addr, size_t size, ++ enum dma_data_direction dir) ++{ ++} ++ ++static void __dummy_sync_sg(struct device *dev, ++ struct scatterlist *sgl, int nelems, ++ enum dma_data_direction dir) ++{ ++} ++ ++// static int __dummy_mapping_error(struct device *hwdev, dma_addr_t dma_addr) ++// { ++// return 1; ++// } ++ ++static int __dummy_dma_supported(struct device *hwdev, u64 mask) ++{ ++ return 0; ++} ++ ++const struct dma_map_ops dummy_dma_ops = { ++ .alloc = __dummy_alloc, ++ .free = __dummy_free, ++ .mmap = __dummy_mmap, ++ .map_page = __dummy_map_page, ++ .unmap_page = __dummy_unmap_page, ++ .map_sg = __dummy_map_sg, ++ .unmap_sg = __dummy_unmap_sg, ++ .sync_single_for_cpu = __dummy_sync_single, ++ .sync_single_for_device = __dummy_sync_single, ++ .sync_sg_for_cpu = __dummy_sync_sg, ++ .sync_sg_for_device = __dummy_sync_sg, ++ // .mapping_error = __dummy_mapping_error, ++ .dma_supported = __dummy_dma_supported, ++}; ++EXPORT_SYMBOL(dummy_dma_ops); ++ ++void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, ++ const struct iommu_ops *iommu, bool coherent) ++{ ++ dev->dma_coherent = coherent; ++} +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0010-riscv-platform-Fix-atcdmac300-chained-irq-mapping-is.patch b/board/andes/ae350/patches/linux/0010-riscv-platform-Fix-atcdmac300-chained-irq-mapping-is.patch new file mode 100644 index 0000000000..b81c9dce8b --- /dev/null +++ b/board/andes/ae350/patches/linux/0010-riscv-platform-Fix-atcdmac300-chained-irq-mapping-is.patch @@ -0,0 +1,300 @@ +From 356bf37d40fb4b9f9044cb872d3ebd74a3b0c4ff Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 17:02:35 +0800 +Subject: [PATCH 10/12] riscv/platform: Fix atcdmac300 chained irq mapping + issue + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/include/asm/atcdmac300.h | 2 +- + arch/riscv/platforms/ae350/atcdmac300.c | 95 +++++++++++++------------ + 2 files changed, 51 insertions(+), 46 deletions(-) + +diff --git a/arch/riscv/include/asm/atcdmac300.h b/arch/riscv/include/asm/atcdmac300.h +index 20fe88212dfc..0d4dcc08e7f3 100644 +--- a/arch/riscv/include/asm/atcdmac300.h ++++ b/arch/riscv/include/asm/atcdmac300.h +@@ -198,7 +198,7 @@ typedef struct channel_control + #define DMAC_REQN_UART2RX 7 + #define DMAC_REQN_I2C 8 + #define DMAC_REQN_SDC 9 +-#define DMAC_REQN_NONE 15 ++#define DMAC_REQN_NONE 16 + + + enum DMAD_DMAC_CORE { +diff --git a/arch/riscv/platforms/ae350/atcdmac300.c b/arch/riscv/platforms/ae350/atcdmac300.c +index e635328f9362..8f434b1f8845 100644 +--- a/arch/riscv/platforms/ae350/atcdmac300.c ++++ b/arch/riscv/platforms/ae350/atcdmac300.c +@@ -526,8 +526,8 @@ static irqreturn_t dmad_ahb_isr(int irq, void *dev_id) + + dmad_dbg("dma finish\n"); + +- dmad_dbg("finish drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x)\n", ++ dmad_dbg("finish drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx)\n", + drb->node, (u32) drb, drb->src_addr, + drb->dst_addr, drb->req_cycle); + +@@ -548,8 +548,8 @@ static irqreturn_t dmad_ahb_isr(int irq, void *dev_id) + // Lookup next DRB (DMA Request Block) + drb_iter = &drq->drb_pool[drq->sbt_head]; + +- dmad_dbg("exec drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x)\n", ++ dmad_dbg("exec drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx)\n", + drb_iter->node, (u32) drb_iter, + drb_iter->src_addr, drb_iter->dst_addr, + drb_iter->req_cycle); +@@ -640,7 +640,7 @@ static void dmad_ahb_config_dir(dmad_chreq * ch_req, unsigned long * channel_cmd + dmad_drq *drq = (dmad_drq *) ch_req->drq; + dmad_ahb_chreq *ahb_req = (dmad_ahb_chreq *) (&ch_req->ahb_req); + channel_control ch_ctl; +- dmad_dbg("%s() channel_cmds(0x%08x)\n",__func__, channel_cmds[0]); ++ dmad_dbg("%s() channel_cmds(0x%08lx)\n",__func__, channel_cmds[0]); + channel_cmds[0] &= ~(u32)(SRCWIDTH_MASK|SRCADDRCTRL_MASK| + DSTWIDTH_MASK|DSTADDRCTRL_MASK| + SRC_HS|DST_HS|SRCREQSEL_MASK|DSTREQSEL_MASK); +@@ -656,6 +656,7 @@ static void dmad_ahb_config_dir(dmad_chreq * ch_req, unsigned long * channel_cmd + memcpy((u8 *)&ch_ctl.dWidth,(u8 *)&ahb_req->addr0_width,12); + drq->flags |= (addr_t) DMAD_DRQ_DIR_A1_TO_A0; + } ++ + channel_cmds[0] |=(((ch_ctl.sWidth << SRCWIDTH) &SRCWIDTH_MASK) | + ((ch_ctl.sCtrl << SRCADDRCTRL) &SRCADDRCTRL_MASK) | + ((ch_ctl.dWidth << DSTWIDTH) &DSTWIDTH_MASK) | +@@ -673,7 +674,7 @@ static void dmad_ahb_config_dir(dmad_chreq * ch_req, unsigned long * channel_cmd + ((ch_ctl.dReqn <ahb_req); + u32 channel = (u32) ch_req->channel; + ++ int virq=0; ++ + unsigned long channel_base = drq->channel_base; + addr_t channel_cmds[1]; + unsigned long lock_flags; + dmad_dbg("%s()\n", __func__); + /* register interrupt handler */ +- err = request_irq(ahb_irqs[channel], dmad_ahb_isr, 0, ++ virq = ftdmac020_find_irq(ahb_irqs[channel]); ++ err = request_irq(virq, dmad_ahb_isr, 0, + "AHB_DMA", (void *)(unsigned long)(channel + 1)); + if (unlikely(err != 0)) { + dmad_err("unable to request IRQ %d for AHB DMA " +- "(error %d)\n", ahb_irqs[channel], err); ++ "(error %d)\n", virq, err); + free_irq(ahb_irqs[channel], (void *)(unsigned long)(channel + 1)); + return err; + } +@@ -995,9 +999,9 @@ int dmad_channel_alloc(dmad_chreq * ch_req) + + } + +- dmad_dbg("%s() ring: base(0x%08x) port(0x%08x) periods(0x%08x)" +- " period_size(0x%08x) period_bytes(0x%08x)" +- " remnant_size(0x%08x)\n", ++ dmad_dbg("%s() ring: base(0x%08llx) port(0x%08lx) periods(0x%08x)" ++ " period_size(0x%08x) period_bytes(0x%08llx)" ++ " remnant_size(0x%08llx)\n", + __func__, drq_iter->ring_base, drq_iter->ring_port, + drq_iter->periods, drq_iter->period_size, + drq_iter->period_bytes, drq_iter->remnant_size); +@@ -1484,13 +1488,13 @@ static inline int dmad_submit_request_internal(dmad_drq * drq, dmad_drb * drb) + + drb->state = DMAD_DRB_STATE_SUBMITTED; + +- dmad_dbg("%s() submit drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x) state(%d)\n", __func__, ++ dmad_dbg("%s() submit drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx) state(%d)\n", __func__, + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, drb->state); + } else { +- dmad_dbg("%s() skip drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x)" +- " size(0x%08x) state(%d)\n", __func__, ++ dmad_dbg("%s() skip drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx)" ++ " size(0x%08llx) state(%d)\n", __func__, + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, drb->state); + } +@@ -1545,8 +1549,8 @@ int dmad_submit_request(dmad_chreq * ch_req, dmad_drb * drb, u8 keep_fired) + drb->node); + + /* Queue DRB to the end of the submitted list */ +- dmad_dbg("submit drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) sync(0x%08x) fire(%d)\n", ++ dmad_dbg("submit drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) sync(0x%08x) fire(%d)\n", + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, (u32) drb->sync, keep_fired); + +@@ -1636,8 +1640,8 @@ int dmad_withdraw_request(dmad_chreq * ch_req, dmad_drb * drb) + return -EBADR; + } + +- dmad_dbg("cancel drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("cancel drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, drb->state); + +@@ -1687,8 +1691,8 @@ static inline int dmad_kickoff_requests_internal(dmad_drq * drq) + return -EBADR; + } + +- dmad_dbg("%s() drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", __func__, ++ dmad_dbg("%s() drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", __func__, + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, drb->state); + +@@ -1749,10 +1753,10 @@ int dmad_kickoff_requests(dmad_chreq * ch_req) + + dmad_get_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); + +- dmad_dbg("drq(0x%08x) channel_base(0x%08x)\n", ++ dmad_dbg("drq(0x%08x) channel_base(0x%08lx)\n", + (u32) drq, drq->channel_base); +- dmad_dbg("kick off drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d) a1_to_a0(%d)\n", ++ dmad_dbg("kick off drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d) a1_to_a0(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, + drb->req_cycle, drb->state, + drq->flags & DMAD_DRQ_DIR_A1_TO_A0); +@@ -1876,9 +1880,9 @@ int dmad_update_ring(dmad_chreq * ch_req) + + spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); + +- dmad_dbg("%s() ring: base(0x%08x) port(0x%08x) periods(0x%08x) " +- "period_size(0x%08x) period_bytes(0x%08x) " +- "remnant_size(0x%08x)\n", ++ dmad_dbg("%s() ring: base(0x%08llx) port(0x%08lx) periods(0x%08x) " ++ "period_size(0x%08x) period_bytes(0x%08llx) " ++ "remnant_size(0x%08llx)\n", + __func__, drq->ring_base, drq->ring_port, + drq->periods, drq->period_size, drq->period_bytes, + drq->remnant_size); +@@ -1948,10 +1952,10 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + sw_p_off += period_size; + } + +- dmad_dbg("%s() ring_ptr(0x%08x) ring_p_idx(0x%08x) " +- "ring_p_off(0x%08x)\n", ++ dmad_dbg("%s() ring_ptr(0x%08llx) ring_p_idx(0x%08x) " ++ "ring_p_off(0x%08llx)\n", + __func__, ring_ptr, ring_p_idx, ring_p_off); +- dmad_dbg("%s() sw_ptr(0x%08x) sw_p_idx(0x%08x) sw_p_off(0x%08x)\n", ++ dmad_dbg("%s() sw_ptr(0x%08llx) sw_p_idx(0x%08x) sw_p_off(0x%08llx)\n", + __func__, sw_ptr, sw_p_idx, sw_p_off); + + if (drq->ring_drb && +@@ -1971,8 +1975,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + drb->addr1 = drq->dev_addr; + drb->req_cycle = 0; // redundent, though, no harm to performance + +- dmad_dbg("init_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("init_drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->src_addr, + drb->dst_addr, drb->req_cycle, drb->state); + +@@ -2024,8 +2028,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + /* update drb size at ring_ptr */ + drb->req_cycle = sw_p_off; + +- dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, + drb->req_cycle, drb->state); + +@@ -2069,8 +2073,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + else + drb->req_cycle = period_size; + +- dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, + drb->req_cycle, drb->state); + +@@ -2147,8 +2151,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + drb->req_cycle = period_size; + } + +- dmad_dbg("inbtw_drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ dmad_dbg("inbtw_drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, + drb->addr1, drb->req_cycle, drb->state); + +@@ -2166,8 +2170,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + drb->addr1 = drq->dev_addr; + drb->req_cycle = sw_p_off; + +- dmad_dbg("swptr_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("swptr_drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, + drb->req_cycle, drb->state); + +@@ -2254,8 +2258,8 @@ static int dmad_channel_drain(u32 controller, dmad_drq * drq, u8 shutdown) + dmad_detach_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); + + while (drb) { +- dmad_dbg("cancel sbt drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ dmad_dbg("cancel sbt drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx) state(%d)\n", + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, (u32) drb->state); + +@@ -2276,8 +2280,8 @@ static int dmad_channel_drain(u32 controller, dmad_drq * drq, u8 shutdown) + dmad_detach_head(drq->drb_pool, &drq->rdy_head, &drq->rdy_tail, &drb); + + while (drb) { +- dmad_dbg("cancel rdy drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ dmad_dbg("cancel rdy drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx) state(%d)\n", + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, (u32) drb->state); + +@@ -2474,6 +2478,7 @@ at_dma_parse_dt(struct platform_device *pdev) + static int atcdma_probe(struct platform_device *pdev) + { + struct at_dma_platform_data *pdata; ++ struct device_node *np = pdev->dev.of_node; + struct resource *io=0; + struct resource *mem = NULL; + int irq; +@@ -2501,7 +2506,7 @@ static int atcdma_probe(struct platform_device *pdev) + if (irq < 0) + return irq; + +- intc_ftdmac020_init_irq(irq); ++ ftdmac020_init(np, irq); + + return dmad_module_init(); + +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0011-DMA-Add-msb-bit-patch.patch b/board/andes/ae350/patches/linux/0011-DMA-Add-msb-bit-patch.patch new file mode 100644 index 0000000000..3f60ce850e --- /dev/null +++ b/board/andes/ae350/patches/linux/0011-DMA-Add-msb-bit-patch.patch @@ -0,0 +1,387 @@ +From 6a328cfbcec652d8a56eb4103ace8b818b76240d Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 17:04:05 +0800 +Subject: [PATCH 11/12] DMA: Add msb bit patch + +Reformed from the commit: +c32ef675cffe7a609d7afe2eb1ae92981a503144 + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/Kconfig | 5 ++ + arch/riscv/Makefile | 2 +- + arch/riscv/include/asm/device.h | 11 ++++ + arch/riscv/include/asm/dmad.h | 3 + + arch/riscv/include/asm/io.h | 14 ++++ + arch/riscv/include/asm/irq.h | 14 ++++ + arch/riscv/include/asm/perf_event.h | 7 +- + arch/riscv/include/asm/pgtable-bits.h | 6 ++ + arch/riscv/kernel/head.S | 1 + + arch/riscv/kernel/setup.c | 7 ++ + arch/riscv/mm/Makefile | 5 +- + arch/riscv/mm/ioremap_nocache.c | 16 +++++ + arch/riscv/platforms/dmad_intc.c | 93 +++++++++++++++++++++++---- + 13 files changed, 169 insertions(+), 15 deletions(-) + create mode 100755 arch/riscv/include/asm/device.h + create mode 100644 arch/riscv/mm/ioremap_nocache.c + +diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig +index 1b894c327578..84a83f3a1af6 100644 +--- a/arch/riscv/Kconfig ++++ b/arch/riscv/Kconfig +@@ -14,6 +14,7 @@ config RISCV + def_bool y + select ARCH_CLOCKSOURCE_INIT + select ARCH_SUPPORTS_ATOMIC_RMW ++ select PHYS_ADDR_T_64BIT + select ARCH_HAS_BINFMT_FLAT + select ARCH_HAS_DEBUG_VM_PGTABLE + select ARCH_HAS_DEBUG_VIRTUAL if MMU +@@ -88,6 +89,9 @@ config RISCV + select SYSCTL_EXCEPTION_TRACE + select THREAD_INFO_IN_TASK + select UACCESS_MEMCPY if !MMU ++ select ARCH_HAS_SETUP_DMA_OPS ++ select ARCH_HAS_SYNC_DMA_FOR_CPU ++ select ARCH_HAS_SYNC_DMA_FOR_DEVICE + + config ARCH_MMAP_RND_BITS_MIN + default 18 if 64BIT +@@ -204,6 +208,7 @@ source "arch/riscv/Kconfig.socs" + + menu "Platform type" + ++source "arch/riscv/platforms/Kconfig" + choice + prompt "Base ISA" + default ARCH_RV64I +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 226c366072da..2d539750c20e 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -83,7 +83,7 @@ KBUILD_IMAGE := $(boot)/Image.gz + + head-y := arch/riscv/kernel/head.o + +-core-y += arch/riscv/ ++core-y += arch/riscv/kernel/ arch/riscv/mm/ arch/riscv/net/ arch/riscv/platforms/ arch/riscv/andesv5/ + + libs-y += arch/riscv/lib/ + libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a +diff --git a/arch/riscv/include/asm/device.h b/arch/riscv/include/asm/device.h +new file mode 100755 +index 000000000000..122a483f7f03 +--- /dev/null ++++ b/arch/riscv/include/asm/device.h +@@ -0,0 +1,11 @@ ++#ifndef __ASM_DEVICE_H ++#define __ASM_DEVICE_H ++ ++struct dev_archdata { ++ bool dma_coherent; ++}; ++ ++struct pdev_archdata { ++}; ++ ++#endif +\ No newline at end of file +diff --git a/arch/riscv/include/asm/dmad.h b/arch/riscv/include/asm/dmad.h +index 44c87b49e606..54b47c410915 100644 +--- a/arch/riscv/include/asm/dmad.h ++++ b/arch/riscv/include/asm/dmad.h +@@ -68,4 +68,7 @@ struct at_dma_platform_data { + void __iomem *apb_regs; + }; + ++int ftdmac020_find_irq(int hwirq); ++int ftdmac020_init(struct device_node *node, int irq); ++ + #endif /* __NDS_DMAD_INC__ */ +diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h +index c025a746a148..328afc17b1f6 100644 +--- a/arch/riscv/include/asm/io.h ++++ b/arch/riscv/include/asm/io.h +@@ -16,6 +16,20 @@ + #include + #include + ++/* ++ * The RISC-V ISA doesn't yet specify how to query or modify PMAs, so we can't ++ * change the properties of memory regions. This should be fixed by the ++ * upcoming platform spec. ++ */ ++/* ++ * That being said, before PMA is ready, Andes augmented PA with an MSB bit ++ * to indicate the non-cacheability. ++ */ ++#define ioremap_nocache ioremap_nocache ++extern void __iomem *ioremap_nocache(phys_addr_t offset, size_t size); ++#define ioremap_wc(addr, size) ioremap_nocache((addr), (size)) ++#define ioremap_wt(addr, size) ioremap_nocache((addr), (size)) ++ + /* + * MMIO access functions are separated out to break dependency cycles + * when using {read,write}* fns in low-level headers +diff --git a/arch/riscv/include/asm/irq.h b/arch/riscv/include/asm/irq.h +index 9807ad164015..65e5d0514bfc 100644 +--- a/arch/riscv/include/asm/irq.h ++++ b/arch/riscv/include/asm/irq.h +@@ -10,6 +10,20 @@ + #include + #include + ++#define NR_IRQS 72 ++ ++/* ++ * Use this value to indicate lack of interrupt ++ * capability ++ */ ++#ifndef NO_IRQ ++#define NO_IRQ ((unsigned int)(-1)) ++#endif ++ ++#define INTERRUPT_CAUSE_PMU 274 ++ ++void riscv_software_interrupt(void); ++ + #include + + #endif /* _ASM_RISCV_IRQ_H */ +diff --git a/arch/riscv/include/asm/perf_event.h b/arch/riscv/include/asm/perf_event.h +index 062efd3a1d5d..216462b7578a 100644 +--- a/arch/riscv/include/asm/perf_event.h ++++ b/arch/riscv/include/asm/perf_event.h +@@ -18,8 +18,13 @@ + /* + * The RISCV_MAX_COUNTERS parameter should be specified. + */ +- ++#ifdef CONFIG_ANDES_PMU ++#define RISCV_MAX_COUNTERS 7 ++#define L2C_MAX_COUNTERS 32 ++#define BASE_COUNTERS 3 ++#else + #define RISCV_MAX_COUNTERS 2 ++#endif /* CONFIG_ANDES_PMU */ + + /* + * These are the indexes of bits in counteren register *minus* 1, +diff --git a/arch/riscv/include/asm/pgtable-bits.h b/arch/riscv/include/asm/pgtable-bits.h +index bbaeb5d35842..5a04317040bf 100644 +--- a/arch/riscv/include/asm/pgtable-bits.h ++++ b/arch/riscv/include/asm/pgtable-bits.h +@@ -24,6 +24,12 @@ + #define _PAGE_DIRTY (1 << 7) /* Set by hardware on any write */ + #define _PAGE_SOFT (1 << 8) /* Reserved for software */ + ++#ifdef CONFIG_ANDES_QEMU_SUPPORT ++#define _PAGE_NONCACHEABLE 0 ++#else ++#define _PAGE_NONCACHEABLE (1 << 31) ++#endif ++ + #define _PAGE_SPECIAL _PAGE_SOFT + #define _PAGE_TABLE _PAGE_PRESENT + +diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S +index 1a819c18bede..dd0e3280c62c 100644 +--- a/arch/riscv/kernel/head.S ++++ b/arch/riscv/kernel/head.S +@@ -263,6 +263,7 @@ clear_bss_done: + /* Initialize page tables and relocate to virtual addresses */ + la sp, init_thread_union + THREAD_SIZE + mv a0, s1 ++ call setup_maxpa + call setup_vm + #ifdef CONFIG_MMU + la a0, early_pg_dir +diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c +index 117f3212a8e4..115a5c91bdae 100644 +--- a/arch/riscv/kernel/setup.c ++++ b/arch/riscv/kernel/setup.c +@@ -48,6 +48,13 @@ struct screen_info screen_info __section(".data") = { + * BSS. + */ + atomic_t hart_lottery __section(".sdata"); ++phys_addr_t pa_msb; ++asmlinkage void __init setup_maxpa(void) ++{ ++ csr_write(satp, SATP_PPN); ++ pa_msb = (csr_read(satp) + 1) >>1; ++} ++ + unsigned long boot_cpu_hartid; + static DEFINE_PER_CPU(struct cpu, cpu_devices); + +diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile +index 7ebaef10ea1b..2c154ae85b10 100644 +--- a/arch/riscv/mm/Makefile ++++ b/arch/riscv/mm/Makefile +@@ -2,8 +2,7 @@ + + CFLAGS_init.o := -mcmodel=medany + ifdef CONFIG_FTRACE +-CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE) +-CFLAGS_REMOVE_cacheflush.o = $(CC_FLAGS_FTRACE) ++CFLAGS_REMOVE_init.o = -pg + endif + + KCOV_INSTRUMENT_init.o := n +@@ -12,7 +11,9 @@ obj-y += init.o + obj-y += extable.o + obj-$(CONFIG_MMU) += fault.o pageattr.o + obj-y += cacheflush.o ++obj-y += dma-mapping.o + obj-y += context.o ++obj-y += ioremap_nocache.o + + ifeq ($(CONFIG_MMU),y) + obj-$(CONFIG_SMP) += tlbflush.o +diff --git a/arch/riscv/mm/ioremap_nocache.c b/arch/riscv/mm/ioremap_nocache.c +new file mode 100644 +index 000000000000..c7422219d561 +--- /dev/null ++++ b/arch/riscv/mm/ioremap_nocache.c +@@ -0,0 +1,16 @@ ++// SPDX-License-Identifier: GPL-2.0-only ++/* ++ * (C) Copyright 1995 1996 Linus Torvalds ++ * (C) Copyright 2012 Regents of the University of California ++ */ ++#include ++ ++#include ++void __iomem *ioremap_nocache(phys_addr_t offset, size_t size) ++{ ++ void __iomem *ret; ++ pgprot_t pgprot = pgprot_noncached(PAGE_KERNEL); ++ ret = ioremap_prot(offset, size, pgprot.pgprot); ++ return ret; ++} ++EXPORT_SYMBOL(ioremap_nocache); +diff --git a/arch/riscv/platforms/dmad_intc.c b/arch/riscv/platforms/dmad_intc.c +index 5f831add709a..e270e31e999b 100644 +--- a/arch/riscv/platforms/dmad_intc.c ++++ b/arch/riscv/platforms/dmad_intc.c +@@ -5,6 +5,9 @@ + */ + + #include ++#include ++#include ++#include + #include + #include + #include +@@ -12,7 +15,49 @@ + + #ifdef CONFIG_PLATFORM_AHBDMA + extern int dmad_probe_irq_source_ahb(void); +-void AHBDMA_irq_rounter(struct irq_desc *desc) ++ ++/* ++ * Generic dummy implementation which can be used for ++ * real dumb interrupt sources ++ */ ++struct irq_chip atcdmac_irq_chip = { ++ .name = "Andes DMAC", ++}; ++ ++struct ftdmac020_info { ++ int parent_irq; ++ struct irq_domain *irq_domain; ++}; ++ ++struct ftdmac020_info *ftdmac020; ++ ++static int ftdmac020_irq_map(struct irq_domain *domain, unsigned int virq, ++ irq_hw_number_t hwirq) ++{ ++ irq_set_chip_and_handler(virq, &atcdmac_irq_chip, handle_simple_irq); ++ irq_set_chip_data(virq, domain->host_data); ++ ++ return 0; ++} ++ ++static void ftdmac020_irq_unmap(struct irq_domain *d, unsigned int virq) ++{ ++ irq_set_chip_and_handler(virq, NULL, NULL); ++ irq_set_chip_data(virq, NULL); ++} ++ ++static const struct irq_domain_ops ftdmac020_irq_ops = { ++ .map = ftdmac020_irq_map, ++ .unmap = ftdmac020_irq_unmap, ++}; ++ ++ ++/* ++ * The atcdmac300 provides a single hardware interrupt for all of the dmad ++ * channel, so we use a self-defined interrupt chip to translate this single interrupt ++ * into multiple interrupts, each associated with a single dma channel. ++ */ ++static void AHBDMA_irq_rounter(struct irq_desc *desc) + { + int ahb_irq; + struct irq_desc *ahb_desc; +@@ -29,21 +74,47 @@ void AHBDMA_irq_rounter(struct irq_desc *desc) + raw_spin_lock(&desc->lock); + } + desc->irq_data.chip->irq_unmask(&desc->irq_data); ++ desc->irq_data.chip->irq_eoi(&desc->irq_data); + raw_spin_unlock(&desc->lock); + } + +-int intc_ftdmac020_init_irq(int irq) ++int ftdmac020_find_irq(int hwirq){ ++ int virq; ++ ++ virq = irq_find_mapping(ftdmac020->irq_domain, hwirq); ++ printk("[ftdmac020_irq_mapping]: virq=%d, hwirq=%d,\n",virq,hwirq); ++ if (!virq) ++ return -EINVAL; ++ ++ return virq; ++} ++ ++int ftdmac020_init(struct device_node *node, int irq) + { +- int i; +- int ret; +- /* Register all IRQ */ +- for (i = DMA_IRQ0; +- i < DMA_IRQ0 + DMA_IRQ_COUNT; i++) { +- // level trigger +- ret = irq_set_chip(i, &dummy_irq_chip); +- irq_set_handler(i, handle_simple_irq); ++ int ret=0; ++ ++ ftdmac020 = kzalloc(sizeof(struct ftdmac020_info), GFP_KERNEL); ++ ++ ftdmac020->parent_irq=irq; ++ ++ ftdmac020->irq_domain = __irq_domain_add(of_node_to_fwnode(node), DMA_IRQ_COUNT, DMA_IRQ0+DMA_IRQ_COUNT, ++ ~0, &ftdmac020_irq_ops, ftdmac020); ++ if (!ftdmac020->irq_domain) { ++ printk("ftdmac020: Failed to create irqdomain\n"); ++ return -EINVAL; ++ } ++ ++ ret = irq_create_strict_mappings(ftdmac020->irq_domain, DMA_IRQ0, DMA_IRQ0, DMA_IRQ_COUNT); ++ if(unlikely(ret < 0)){ ++ printk("ftdmac020: Failed to create irq_create_strict_mappings()\n"); ++ return -EINVAL; + } +- irq_set_chained_handler(irq, AHBDMA_irq_rounter); ++ ++ ftdmac020->irq_domain->name = "ftdmac020-domain"; ++ irq_set_chained_handler_and_data(ftdmac020->parent_irq, ++ AHBDMA_irq_rounter, ftdmac020); ++ + return 0; + } ++ + #endif /* CONFIG_PLATFORM_AHBDMA */ +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0012-Remove-unused-Andes-SBI-call.patch b/board/andes/ae350/patches/linux/0012-Remove-unused-Andes-SBI-call.patch new file mode 100644 index 0000000000..22a278ddff --- /dev/null +++ b/board/andes/ae350/patches/linux/0012-Remove-unused-Andes-SBI-call.patch @@ -0,0 +1,147 @@ +From f476cc67c2821f931ff6ffd841327417b9967909 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 17:34:59 +0800 +Subject: [PATCH 12/12] Remove unused Andes SBI call + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/andesv5/sbi.c | 92 ------------------------------------ + arch/riscv/include/asm/sbi.h | 16 ------- + 2 files changed, 108 deletions(-) + +diff --git a/arch/riscv/andesv5/sbi.c b/arch/riscv/andesv5/sbi.c +index c5d2afd83ae0..647587b81988 100755 +--- a/arch/riscv/andesv5/sbi.c ++++ b/arch/riscv/andesv5/sbi.c +@@ -10,80 +10,6 @@ + #include + #include + +-void sbi_suspend_prepare(char main_core, char enable) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SUSPEND_PREPARE, main_core, enable, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_suspend_prepare); +- +-void sbi_suspend_mem(void) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SUSPEND_MEM, 0, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_suspend_mem); +- +-void sbi_restart(int cpu_num) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_RESTART, cpu_num, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_restart); +- +-void sbi_write_powerbrake(int val) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_WRITE_POWERBRAKE, val, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_write_powerbrake); +- +-int sbi_read_powerbrake(void) +-{ +- struct sbiret ret; +- ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_READ_POWERBRAKE, 0, 0, 0, 0, 0, 0); +- return ret.value; +-} +-EXPORT_SYMBOL(sbi_read_powerbrake); +- +-void sbi_set_suspend_mode(int suspend_mode) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_SUSPEND_MODE, suspend_mode, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_set_suspend_mode); +- +-void sbi_set_reset_vec(int val) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_RESET_VEC, val, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_set_reset_vec); +- +-void sbi_set_pma(void *arg) +-{ +- phys_addr_t offset = ((struct pma_arg_t*)arg)->offset; +- unsigned long vaddr = ((struct pma_arg_t*)arg)->vaddr; +- size_t size = ((struct pma_arg_t*)arg)->size; +- size_t entry_id = ((struct pma_arg_t*)arg)->entry_id; +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_PMA, offset, vaddr, size, entry_id, 0, 0); +-} +-EXPORT_SYMBOL(sbi_set_pma); +- +-void sbi_free_pma(unsigned long entry_id) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_FREE_PMA, entry_id, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_free_pma); +- +-long sbi_probe_pma(void) +-{ +- struct sbiret ret; +- ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_PROBE_PMA, 0, 0, 0, 0, 0, 0); +- return ret.value; +-} +-EXPORT_SYMBOL(sbi_probe_pma); +- +-void sbi_set_trigger(unsigned int type, uintptr_t data, int enable) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_TRIGGER, type, data, enable, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_set_trigger); +- + long sbi_get_marchid(void) + { + struct sbiret ret; +@@ -91,21 +17,3 @@ long sbi_get_marchid(void) + return ret.value; + } + EXPORT_SYMBOL(sbi_get_marchid); +- +-long sbi_get_micm_cfg(void) +-{ +- struct sbiret ret; +- ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_GET_MICM_CFG, +- 0, 0, 0, 0, 0, 0); +- return ret.value; +-} +-EXPORT_SYMBOL(sbi_get_micm_cfg); +- +-long sbi_get_mdcm_cfg(void) +-{ +- struct sbiret ret; +- ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_GET_MDCM_CFG, +- 0, 0, 0, 0, 0, 0); +- return ret.value; +-} +-EXPORT_SYMBOL(sbi_get_mdcm_cfg); +diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h +index d3b2d34136f0..40dc3a54a32c 100644 +--- a/arch/riscv/include/asm/sbi.h ++++ b/arch/riscv/include/asm/sbi.h +@@ -83,22 +83,6 @@ enum sbi_ext_andes_fid { + SBI_EXT_ANDES_L1CACHE_D_PREFETCH, + SBI_EXT_ANDES_NON_BLOCKING_LOAD_STORE, + SBI_EXT_ANDES_WRITE_AROUND, +- SBI_EXT_ANDES_TRIGGER, +- SBI_EXT_ANDES_SET_PFM, +- SBI_EXT_ANDES_READ_POWERBRAKE, +- SBI_EXT_ANDES_WRITE_POWERBRAKE, +- SBI_EXT_ANDES_SUSPEND_PREPARE, +- SBI_EXT_ANDES_SUSPEND_MEM, +- SBI_EXT_ANDES_SET_SUSPEND_MODE, +- SBI_EXT_ANDES_ENTER_SUSPEND_MODE, +- SBI_EXT_ANDES_RESTART, +- SBI_EXT_ANDES_SET_RESET_VEC, +- SBI_EXT_ANDES_SET_PMA, +- SBI_EXT_ANDES_FREE_PMA, +- SBI_EXT_ANDES_PROBE_PMA, +- SBI_EXT_ANDES_DCACHE_WBINVAL_ALL, +- SBI_EXT_ANDES_GET_MICM_CFG, +- SBI_EXT_ANDES_GET_MDCM_CFG, + }; + + enum sbi_hsm_hart_status { +-- +2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch new file mode 100644 index 0000000000..aeafed4c9f --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch @@ -0,0 +1,29 @@ +From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 29 Dec 2021 16:04:54 +0800 +Subject: [PATCH] Disable PIC explicitly for assembling + +This patch is necessary if the fw_dynamic load address +is not equal to link address. +However, they are equal currently, since we include an u-boot +patch for preventing fw_dynamic relocation. + +Signed-off-by: Yu Chien Peter Lin +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index d6f097d..441518d 100644 +--- a/Makefile ++++ b/Makefile +@@ -225,6 +225,7 @@ ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + ASFLAGS += $(GENFLAGS) + ASFLAGS += $(platform-asflags-y) + ASFLAGS += $(firmware-asflags-y) ++ASFLAGS += -fno-pic + + ARFLAGS = rcs + +-- +2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch new file mode 100644 index 0000000000..ae48a760c8 --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch @@ -0,0 +1,25 @@ +From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 30 Dec 2021 08:47:34 +0800 +Subject: [PATCH] Enable cache for opensbi jump mode + +Signed-off-by: Yu Chien Peter Lin +--- + firmware/fw_base.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/firmware/fw_base.S b/firmware/fw_base.S +index ab33e11..155d230 100644 +--- a/firmware/fw_base.S ++++ b/firmware/fw_base.S +@@ -46,6 +46,8 @@ + .globl _start + .globl _start_warm + _start: ++ li t0, 0x80003 ++ csrw 0x7ca, t0 + /* Find preferred boot HART id */ + MOV_3R s0, a0, s1, a1, s2, a2 + call fw_boot_hart +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch new file mode 100644 index 0000000000..2b0bae875e --- /dev/null +++ b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch @@ -0,0 +1,27 @@ +From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:00:59 +0800 +Subject: [PATCH 1/3] Fix mmc no partition table error + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf..3b1e0aa0 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev) + return ret; + #endif + +- if (dev_read_bool(dev, "cap-mmc-highspeed") || \ +- dev_read_bool(dev, "cap-sd-highspeed")) +- chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz; +- + ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps, + priv->minmax[1] , priv->minmax[0]); + chip->mmc = &plat->mmc; +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch new file mode 100644 index 0000000000..8ee4240619 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch @@ -0,0 +1,27 @@ +From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:02:26 +0800 +Subject: [PATCH 2/3] Prevent fw_dynamic from relocation + +This patch prevents OpenSBI relocation, load fw_dynamic to link address + +Signed-off-by: Yu Chien Peter Lin +--- + board/AndesTech/ax25-ae350/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig +index e50f505a..385c4c11 100644 +--- a/board/AndesTech/ax25-ae350/Kconfig ++++ b/board/AndesTech/ax25-ae350/Kconfig +@@ -25,7 +25,7 @@ config SPL_TEXT_BASE + default 0x800000 + + config SPL_OPENSBI_LOAD_ADDR +- default 0x01000000 ++ default 0x0 + + config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch new file mode 100644 index 0000000000..81870647b8 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch @@ -0,0 +1,26 @@ +From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 18:17:39 +0800 +Subject: [PATCH 3/3] Fix u-boot proper booting issue + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/cpu/start.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S +index 76850ec9..2ccda4f5 100644 +--- a/arch/riscv/cpu/start.S ++++ b/arch/riscv/cpu/start.S +@@ -139,7 +139,9 @@ call_harts_early_init: + * accesses gd). + */ + mv gp, s0 ++#if !CONFIG_IS_ENABLED(RISCV_SMODE) + bnez tp, secondary_hart_loop ++#endif + #endif + + jal board_init_f_init_reserve +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch new file mode 100644 index 0000000000..efd78ab26d --- /dev/null +++ b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch @@ -0,0 +1,25 @@ +From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 6 Jan 2022 13:50:07 +0800 +Subject: [PATCH] Enable printing OpenSBI boot logo + +Signed-off-by: Yu Chien Peter Lin +--- + include/opensbi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/opensbi.h b/include/opensbi.h +index d812cc8c..91fb8fd9 100644 +--- a/include/opensbi.h ++++ b/include/opensbi.h +@@ -20,7 +20,7 @@ + + enum sbi_scratch_options { + /** Disable prints during boot */ +- SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0), ++ SBI_SCRATCH_NO_BOOT_PRINTS = 0, + }; + + /** Representation dynamic info passed by previous booting stage */ +-- +2.25.1 diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..19cfa721a7 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,66 @@ +Intro +===== + +Andestech AE350 Platform + +The AE350 prototype demonstrates the AE350 platform on the FPGA. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make ae350_andestar45_defconfig + +If you want to customize your configuration: + + $ make menuconfig + +Build everything +---------------- +Note: you will need to access to the network, since Buildroot will +download the packages' sources. + + $ make + +Result of the build +------------------- + +After building, you should obtain the following files: + + output/images/ + |-- Image + |-- ae350.dtb + |-- boot.scr + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- rootfs.cpio + |-- rootfs.ext2 + |-- rootfs.ext4 -> rootfs.ext2 + |-- rootfs.tar + |-- sdcard.img + |-- u-boot-spl.bin + `-- u-boot.itb + + +Copy the sdcard.img to a SD card with "dd": + + $ sudo dd if=sdcard.img of=/dev/sdX bs=4096 + +Your SD card partition should be: + + Disk /dev/mmcblk0: 31457280 sectors, 3072M + Logical sector size: 512 + Disk identifier (GUID): 546663ee-d2f1-427f-93a5-5c7b69dd801c + Partition table holds up to 128 entries + First usable sector is 34, last usable sector is 385062 + + Number Start (sector) End (sector) Size Name + 1 34 262177 128M u-boot + 2 262178 385057 60.0M rootfs + +Insert SD card and reset the board, should boot Linux from mmc. diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment new file mode 100644 index 0000000000..4992d712a5 --- /dev/null +++ b/board/andes/ae350/uboot.config.fragment @@ -0,0 +1,5 @@ +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_MMC=y +# CONFIG_SPL_RAM_SUPPORT is not set +# CONFIG_OF_BOARD is not set +CONFIG_OF_SEPARATE=y diff --git a/configs/ae350_andestar45_defconfig b/configs/ae350_andestar45_defconfig new file mode 100644 index 0000000000..fb4587b1a7 --- /dev/null +++ b/configs/ae350_andestar45_defconfig @@ -0,0 +1,46 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_BINUTILS_VERSION_2_37_X=y +BR2_GCC_VERSION_11_X=y +BR2_GCC_ENABLE_OPENMP=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.84" +BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae350/linux.config.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" +BR2_PACKAGE_OPENSSL=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="andes/ae350" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/andes/ae350/boot.cmd" -- 2.17.1 From thomas.petazzoni at bootlin.com Tue Jan 11 06:58:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 06:58:10 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-10 Message-ID: <20220111065815.9358382D07@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-01-10 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 51 | 7 | 0 | 58 | 2021.11.x | 28 | 3 | 0 | 31 | master | 98 | 61 | 0 | 159 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 6 vtun-3.0.4 | 6 cryptopp-8.6.0 | 5 drbd-utils-9.19.0 | 5 unknown | 4 gstreamer1-mm-1.10.0 | 2 guile-3.0.7 | 2 ksmbd-tools-3.4.3 | 2 package/tinifier/tinifier.m... | 2 refpolicy-2.20220106 | 2 samba4-4.15.3 | 2 apparmor-3.0.3 | 1 bat-0.18.3 | 1 bird-2.0.8 | 1 domoticz-2021.1 | 1 efl-1.26.0 | 1 ejabberd-20.07 | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 host-go-1.17.6 | 1 libqb-2.0.3 | 1 libupnp-1.14.12 | 1 mbedtls-2.28.0 | 1 mesa3d-21.3.3 | 1 mongodb-4.2.11 | 1 nodejs-14.18.2 | 1 opencv4-4.5.5 | 1 pcsc-lite-1.9.5 | 1 pulseview-0.4.2 | 1 tesseract-ocr-5.0.1 | 1 tinifier-legal-info | 1 tinyalsa-2.0.0 | 1 vlc-3.0.16 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | apparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/ec5251d05fc25e46dd33d2ea38d400438fcdbec8 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/88cccf3fe4bb22322f1d36cf7f16e920b758df4d | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/a3e189c5eee2de216f59ccad3d56dc1a6753dd00 | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/e9dab1bfd05ea7e659a0ec751c6467bc8186fccc | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/1fd47187c9936ae385a12cd74c70eb8aa440fc81 | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/e4fd947c118174a4fad62cbed18816f02d39ec25 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/c22c5fc939f11e034c350dfc76d138fa0506a856 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/174fe03da7a40dd152703de93af6a213d9cac698 | arc | domoticz-2021.1 | NOK | http://autobuild.buildroot.net/results/302f65e535a6a29c7458dce4ff4676219f487df8 | x86_64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/c63252f08544ccbad1bb72e7ea1f44091451544d | riscv64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/42d078006ff98aa25c4f8b3a015cf96568ae29b5 | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/68ffaffcf4e8d05f9aed75147104cca5a0ac60e9 | microblazeel | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/b03b4315cbcefedd68d6a68f8a895f55a6b1ab17 | mips | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/bb6fdc13b137261924f879591bec9ddf3a7ebde0 | aarch64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/0a8616ff8a496719875d21103ac390782ca42e19 | aarch64 | ejabberd-20.07 | NOK | http://autobuild.buildroot.net/results/0adc757a364ebd375d40df536130cc4ca0c02f80 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/41bbbba582d14be454943ad0ff097edaa84e9947 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/b202f65426be25e7aad196a0a05fbca94da1e847 | aarch64 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/e7f943ad6f2a94d4d82ac65e4c611723e369dac4 | ORPH x86_64 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/3c4ccc87fb09f40862b66e03afa8cc6d9723de4d | ORPH sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/d2b5949b3f82b946fb33135ba06569191c49c5f9 | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/779b98575eb8d0c154f3f3e3804e19b15ee8edcb | ORPH mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/0945b3caea98be6c77aaab4fec9f11b3ecc3b2f6 | riscv64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/f667cbf81163cc11d4abe0f06b83e628139e2865 | mips | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/d7390217cce0efadee0d62a0e668bba18dd014a3 | or1k | libqb-2.0.3 | NOK | http://autobuild.buildroot.net/results/2e438c1317188373b99b9a7ffd19ca3693112fb3 | or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/478b1664555820657aedbe3f6eb5aec3a5247660 | arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/cecdcd64da211dd235efda7a1ba33c1208907c66 | sh4 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/036d827be5c044f421f95dcc061f33b76789e006 | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/12b89bdee71411b9ec850ef5e8d7632f3c87f6ef | x86_64 | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/6c6cc3fb07152172da87e5e15763c34bc228e96c | mips64el | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/817d9f6ffdab34d57396c3bd390fcba96820885e | arm | package/tinifier/tinifier.m... | NOK | http://autobuild.buildroot.net/results/2757e70e92860a7bf636dcd444c97aafdf5868ad | x86_64 | package/tinifier/tinifier.m... | NOK | http://autobuild.buildroot.net/results/2056ba96424806eb8c2e41f29a014b6beff467ab | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/14503c57268616aff87159bfc5ad5153e7fd8cc7 | ORPH xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/32b3d88d01ea4b6aad099fa90970bf3074b5837d | xtensa | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/98d5b3db313000855721c0ad994951fe8cc781c0 | arc | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/b476a32b5d0518f35c9fac62485e7ede408d8fb7 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f17d305be7bf5535e0c758fac66b27498900eef2 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/0c71db6d4c0d951ed78432d3c3898e46a4d82288 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/040c5e1314e0e7575e8e0de06bdcae0844bc6282 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3a145a742ab1dd243b82c8fa6a10242372bffbc2 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/4977bb11825095aec159d44f01e662aeb458eeac | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/32f0a8e1392e98e3ab8045792733510a233c587d | i686 | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/542ade6fe1cd6e8c22e33ba9632c19018c8a634a | x86_64 | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/5944753efc113a7c76225458c11c7faafc6c3542 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/f6e310728b00ae13d0889e4ad1f7d0cd4e92ebc1 | x86_64 | tinifier-legal-info | NOK | http://autobuild.buildroot.net/results/8d74a1d6698c1522d1eded771bdc50e80a63529a | i586 | tinyalsa-2.0.0 | NOK | http://autobuild.buildroot.net/results/a75e23dc585bd071f4d65face5489ed6ac22edbe | ORPH powerpc | unknown | NOK | http://autobuild.buildroot.net/results/0898a310aa19dd1770042fba0cd4c2e9030864f2 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/a5e154d16dc192ba5e89fb5030004b7b7b0808ba | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/f67aba89e1764024cead72d8f64138ed36f51df0 | arm | unknown | NOK | http://autobuild.buildroot.net/results/7608338a8372c93a9f20229be95c2ca640e1357e | powerpc64 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/5841b5f1ed771923b4c99067b55bc11c052dfb89 | arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/d6eb63493c5023d35ed54f1a06484f8d072728be | ORPH mips64el | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/d7166d32f17ad1a9d3f296bac39ea231c94aea6e | ORPH xtensa | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/8491ec3f852043d18867760c7adf6349e8db2e8d | ORPH arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/3a1bb52324d9bea7e138806f63edf728ba9eeb42 | ORPH arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/b406284bd013566452b33302a9332f8b23ff3c36 | ORPH i686 | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/0db342fbca14447849569676f2c77ba79f294502 | ORPH mipsel | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/672427e5711be790bb3164b79f8589f73f459060 | Classification of failures by reason for 2021.02.x -------------------------------------------------- bluez5_utils-5.62 | 1 gobject-introspection-1.64.1 | 1 host-sentry-cli-1.57.0 | 1 libtheora-1.1.1 | 1 ndisc6-1.0.4 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | bluez5_utils-5.62 | NOK | http://autobuild.buildroot.net/results/d050dc909f9e1fe6db29f20d69cdd404f609cb4c | nios2 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/bfb56d315dfe9b6a9d7ac5e156f157450eb51b52 | ORPH i686 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/460b16121d528b307a7d266c564c77a5ba2708fd | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/2e4f84c318ce0c99378682b59a3f57b51f4de1c4 | ORPH arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/b3c6881b1bcac64fdc1f8a09ff34153a523d6067 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/3db274858f5556e163eccbe4bd7a3329f069c356 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/d7ee6d14377583cb1b5d80c76f6220ccc577f0cc | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 log4cxx-0.12.0 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/5cabce045fde39370269d9da7693a837cfafec42 | mips64el | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/74b8a7439b1bfb2a9e25e89f8dd0cfa71e3e805c | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a1ad5d09002131eea6f48ea36ed9374c0b2884c1 | Gitlab CI results for 2022-01-10 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/1956557939 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1956558084 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/1956558205 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/1956558206 | ORPH -- http://autobuild.buildroot.net From fontaine.fabrice at gmail.com Tue Jan 11 07:28:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 08:28:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: needs python3 Message-ID: <20220111072809.2133986-1-fontaine.fabrice@gmail.com> python-pyparsing dropped python2 support since version 3.0.0: https://github.com/pyparsing/pyparsing/blob/master/docs/whats_new_in_3_0_0.rst#python-2-x-no-longer-supported resulting in the following build failure since bump to version 3.0.6 in commit 7affc7827aee0e07ec94d3b4d91c2e23bda8d937: File "setup.py", line 8, in from pyparsing import __version__ as pyparsing_version File "/home/buildroot/autobuild/instance-0/output-1/build/python-pyparsing-3.0.6/pyparsing/__init__.py", line 100 major: int ^ SyntaxError: invalid syntax Fixes: - http://autobuild.buildroot.org/results/8ac5224f4b6c2c59035dbfb53541e76f58b15e47 Signed-off-by: Fabrice Fontaine --- package/python-httplib2/Config.in | 7 +++---- package/python-pyparsing/Config.in | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in index 39671f2386..0095d95b51 100644 --- a/package/python-httplib2/Config.in +++ b/package/python-httplib2/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_PYTHON_HTTPLIB2 bool "python-httplib2" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 # python-pyparsing + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL select BR2_PACKAGE_PYTHON_PYPARSING # runtime help httplib2 is a comprehensive HTTP client library, httplib2.py diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 926ca07ed7..9b5894116d 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYPARSING bool "python-pyparsing" + depends on BR2_PACKAGE_PYTHON3 help The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc -- 2.34.1 From mf at go-sys.de Tue Jan 11 08:36:18 2022 From: mf at go-sys.de (Michael Fischer) Date: Tue, 11 Jan 2022 08:36:18 +0000 Subject: [Buildroot] [PATCH 1/1] package/rtl8723bu: bump version to d34603a39a7c925d810fe17c6e8dea5063d43a33 In-Reply-To: <20220110155823.GS1477939@scaer> References: <20220110151302.21093-1-mf@go-sys.de> <20220110155823.GS1477939@scaer> Message-ID: <1988ce33e1294da4ad3f35d32eec3ab8@go-sys.de> Yann E.,All > When patching out unused code, don't comment it; just remove it. I just followed the README.md, but no problem i'll change that. - Step 2: Find the line that contains `EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE` and insert a `#` symbol at the beginning of that line. This comments that line and disables concurrent mode. PS: Is there something wrong with the mailing list ? I have not received any mails for a week now. Regards, Michael Fischer > -----Urspr?ngliche Nachricht----- > Von: Yann E. MORIN [mailto:yann.morin.1998 at free.fr] > Gesendet: Montag, 10. Januar 2022 16:58 > An: Michael Fischer > Cc: buildroot at busybox.net > Betreff: Re: [Buildroot] [PATCH 1/1] package/rtl8723bu: bump version to > d34603a39a7c925d810fe17c6e8dea5063d43a33 > > Michael, All, > > On 2022-01-10 16:13 +0100, Michael Fischer spake thusly: > > patch 0001: Disable concurrrent mode. This causes disconnections. > > That patch is missing a commit log and a sign-off for itself: > > # ./utils/check-package package/rtl8723bu/0001- > disable_concurent_mode.patch > package/rtl8723bu/0001-disable_concurent_mode.patch:0: missing Signed- > off-by in the header > > (http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches) > > But see below... > > > Signed-off-by: Michael Fischer > > --- > > package/rtl8723bu/0001-disable_concurent_mode.patch | 12 ++++++++++++ > > package/rtl8723bu/rtl8723bu.hash | 2 +- > > package/rtl8723bu/rtl8723bu.mk | 2 +- > > 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 > > package/rtl8723bu/0001-disable_concurent_mode.patch > > > > diff --git a/package/rtl8723bu/0001-disable_concurent_mode.patch > > b/package/rtl8723bu/0001-disable_concurent_mode.patch > > new file mode 100644 > > index 0000000000..037b1642fc > > --- /dev/null > > +++ b/package/rtl8723bu/0001-disable_concurent_mode.patch > > @@ -0,0 +1,12 @@ > > +diff -purN a/Makefile b/Makefile > > +--- a/Makefile 2021-11-04 20:36:55.000000000 +0100 > > ++++ b/Makefile 2022-01-10 14:35:17.333934039 +0100 > > +@@ -18,7 +18,7 @@ EXTRA_CFLAGS += -Wno-unused-label EXTRA_CFLAGS > += > > +-Wno-unused-parameter EXTRA_CFLAGS += -Wno-unused-function > > +EXTRA_CFLAGS += -Wno-unused -EXTRA_CFLAGS += - > DCONFIG_CONCURRENT_MODE > > ++#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE > > When patching out unused code, don't comment it; just remove it. > > Can you fix those two issues and resubmit, plese? > > Regards, > Yann E. MORIN. > > > + ccflags-y += -D__CHECK_ENDIAN__ > > + > > diff --git a/package/rtl8723bu/rtl8723bu.hash > > b/package/rtl8723bu/rtl8723bu.hash > > index 04bc776a07..df990a8d63 100644 > > --- a/package/rtl8723bu/rtl8723bu.hash > > +++ b/package/rtl8723bu/rtl8723bu.hash > > @@ -1,2 +1,2 @@ > > # Locally computed > > -sha256 > > 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc > > rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz > > +sha256 > > +c9cde757941c88c6117560a2c350dc9c4382dcd6a313b1cae7c6e7eade7055bf > > +rtl8723bu-d34603a39a7c925d810fe17c6e8dea5063d43a33.tar.gz > > diff --git a/package/rtl8723bu/rtl8723bu.mk > > b/package/rtl8723bu/rtl8723bu.mk index c35fad5832..e73987cfeb 100644 > > --- a/package/rtl8723bu/rtl8723bu.mk > > +++ b/package/rtl8723bu/rtl8723bu.mk > > @@ -4,7 +4,7 @@ > > # > > > > > ################################################################ > ###### > > ########## > > > > -RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 > > +RTL8723BU_VERSION = d34603a39a7c925d810fe17c6e8dea5063d43a33 > > RTL8723BU_SITE = $(call > > github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) > > RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) > > > > -- > > 2.20.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > | conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > > From luca at lucaceresoli.net Tue Jan 11 09:10:06 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Tue, 11 Jan 2022 10:10:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> <20220110222808.GU1477939@scaer> <2846b399-f095-acb3-c086-e44b3b74698e@lucaceresoli.net> Message-ID: <7659ce4e-a509-8ff3-1f98-17b7d2766623@lucaceresoli.net> Hi James, Yann, On 10/01/22 23:55, James Hilliard wrote: > On Mon, Jan 10, 2022 at 3:46 PM Luca Ceresoli wrote: >> >> Hi James, Yann, >> >> On 10/01/22 23:31, James Hilliard wrote: >>> On Mon, Jan 10, 2022 at 3:28 PM Yann E. MORIN wrote: >>>> >>>> James, All, >>>> >>>> On 2022-01-10 15:18 -0700, James Hilliard spake thusly: >>>>> On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: >>>> [--SNIP--] >>>>>> So I wonder if it even makes sense to keep package/zynq-boot-bin now. >>>>> Well if someone is using an older uboot that doesn't have the >>>>> generation capability >>>>> integrated then it's probably still needed right? >>>> >>>> But then, they would have that tool in their uboot tree, and then >>>> nothing would prevent them from running it as a post-build (or >>>> post-image) script. >>>> >>>> Yes, they would need to have a python2 on their host. But that will be >>>> the case if they stick to such older tools which may break on more >>>> recent systems, not just uboot... >>> >>> Yeah, the advantage here is that it works with python3 as is with older uboot >>> versions. I guess the main issue is that vendor uboot trees are often ancient >>> and rarely updated so this would be mostly useful for those situations. >> >> Is upgrading to python 3 just to simplify potential legacy users the >> only motivation for this patch? Then I would not touch this package at >> all and avoid keeping our own copy of the script. > > Well the motivation is that we want to drop python 2 from the > toolchain entirely, > so leaving this package as is would not be an option(since it depends > on the host > python2 interpreter support we want to remove). I see. I'm currently unable to keep up to date with current Buildroot development, apologies for the noise. > We either need to > remove it or use > the python3 ported version(which due to the simplicity of the script > should not cause > any significant maintenance issues for us IMO). I agree it would not create much maintenance burden, especially since the script it is unchanged since ages. But the question is for how long we want to maintain this tool in Buildroot. There is no in-tree user, there is an alternative in U-Boot since many years, even Xilinx removed their script years from their repo and looking for info about this tool on the Internet leads to almost nothing after ~2015. Users using this script nowadays with recent Buildroot are most probably zero or close to zero. And, as Yann pointed out, such users can still handle it with just a small annoyance. For the above I'm in favor of removal, with a small paragraph in Config.in.legacy saying it's been removed but one can still download it from and call it in a post-build script after installing python2 on the host. -- Luca From bugzilla at busybox.net Tue Jan 11 13:20:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 11 Jan 2022 13:20:10 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 Sreedhar Mahadevan changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #7 from Sreedhar Mahadevan --- Thanks a lot for the solutions and sorry for the late reply. I was able to get it built successfully using the v2.11.9 version of lttng-modules by changing the versions in the lttng-modules.mk and lttng-modules.hash files. Thanks again for the information about the patch on master. Really appreciate it. The bug report can be closed. -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Tue Jan 11 14:46:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 15:46:59 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: drop Henrique Camargo Message-ID: <20220111144110.01B1D82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f51be73f25bdc9b370db42996475136098ebd251 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master He has privately requested to no longer be notified regarding this package. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..44911a7d94 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1183,9 +1183,6 @@ F: package/linuxptp/ F: package/netopeer2/ F: package/sysrepo/ -N: Henrique Camargo -F: package/json-glib/ - N: Herv?? Codina F: package/dtbocfg/ F: package/libdbi/ From aperez at igalia.com Tue Jan 11 14:55:27 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Tue, 11 Jan 2022 16:55:27 +0200 Subject: [Buildroot] [PATCH RFC 1/1] package/wpewebkit: use ninja for faster builds Message-ID: <20220111145527.3422053-1-aperez@igalia.com> Instruct CMake to use the Ninja generator, and override build/install commands to use Ninja instead, which results in faster builds. The host-ninja package is required to build some of the dependencies used by wpewebkit (e.g. libepoxy) so in practice this is not introducing a new host dependency that would slow down the build. Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.mk | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 64c179534f..2cbed60cb3 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,11 +14,12 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit -WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ +WPEWEBKIT_DEPENDENCIES = host-gperf host-ninja host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo WPEWEBKIT_CONF_OPTS = \ + -GNinja \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ @@ -101,4 +102,24 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \ + $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -- $(NINJA_OPTS) $(WPEWEBKIT_NINJA_OPTS) +endef + +define WPEWEBKIT_INSTALL_CMDS + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \ + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) DESTDIR=$(STAGING_DIR) \ + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(WPEWEBKIT_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) -- 2.34.1 From Murali.Karicheri at sandc.com Tue Jan 11 16:01:42 2022 From: Murali.Karicheri at sandc.com (Karicheri, Murali) Date: Tue, 11 Jan 2022 16:01:42 +0000 Subject: [Buildroot] creating packages for opkg for buildroot based embedded platform software Message-ID: Hello, buildroot experts, I am new to buildroot and was working with a buildroot expert for migrating our yocto based build system to use buildroot. Unfortunately, he has left our company for another oppotunity. Ever since I have started using buildroot for our build, I am very happy with its simplicity compared to yocto based build system. However, I have learned that buildroot expect the entire rootfs to be updated on a running system for updating fixes which is very expensive for deployment where there is limited bandwidth available to update the system. So that is the challenge that I am facing. Good news is opkg tools are supported in buildroot which is good. Typically, we would like to let our customer do periodic update to the system to have vulnerability fixes and other fixes released by buildroot. For example, let us say we base our system on 2021.02.x. So, when there is a maintenance update to this branch say, 2021.02.06, we would like to create an ipk file with the changes and provide that for system update. Idea is the file will be smaller and thus requires less bandwidth and will result in quicker update to the system. Do you have information on any project that is working to create a package manager for systems that uses buildroot for their build? My research showed one resource but is for open embedded or yocto or openwrt and is here. https://raymii.org/s/tutorials/Building_IPK_packages_by_hand.html Do you think this is what I should try or any other relevant information on this topic? Thanks Murali Karicheri, Software Architect S&C Electric Company ________________________________ NOTICE OF CONFIDENTIALITY: This message may contain information that is considered confidential and which may be prohibited from disclosure under applicable law or by contractual agreement. The information is intended solely for the use of the individual or entity named above. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution or use of the information contained in or attached to this message is strictly prohibited. If you have received this email transmission in error, please notify the sender by replying to this email and then delete it from your system. From grant.b.edwards at gmail.com Tue Jan 11 16:11:41 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Tue, 11 Jan 2022 16:11:41 -0000 (UTC) Subject: [Buildroot] Diagnosing conflicts due to new Python version Message-ID: It seems that every time a new Python version is unmasks, it breaks things. This time it's a python-exec version conflict that prevents emerge -u. FAICT, Python 3.10 requires python-exec 2.4.8, and some other package requires 2.4.6. I've fixed things temporarily with: package.use: */* PYTHON_TARGETS: -python3_10 */* PYTHON_SINGLE_TARGET -python3_10 package.mask: =dev-lang/python-3.10 No, at least I can continue to update the machine. When I eventually get the spare time to try to get Python 3.10 working, how does one figure out which package is causing the problem by requring the older version of python-exec? I've tried adding a 't' to the emerge flags, but that doesn't seem to show anything useful. Is there any documentation on how to determine the cause of a package version conflict? -- Grant From baruch at tkos.co.il Tue Jan 11 16:13:15 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Tue, 11 Jan 2022 18:13:15 +0200 Subject: [Buildroot] creating packages for opkg for buildroot based embedded platform software In-Reply-To: References: Message-ID: <87o84iw8qc.fsf@tarshish> Hi Murali, On Tue, Jan 11 2022, Karicheri, Murali wrote: > Hello, buildroot experts, > > I am new to buildroot and was working with a buildroot expert for migrating > our yocto based build system to use buildroot. Unfortunately, he has left our > company for another oppotunity. Ever since I have started using buildroot for > our build, I am very happy with its simplicity compared to yocto based build > system. However, I have learned that buildroot expect the entire rootfs to be > updated on a running system for updating fixes which is very expensive for > deployment where there is limited bandwidth available to update the system. So > that is the challenge that I am facing. Good news is opkg tools are supported > in buildroot which is good. Typically, we would like to let our customer do > periodic update to the system to have vulnerability fixes and other fixes > released by buildroot. For example, let us say we base our system on > 2021.02.x. So, when there is a maintenance update to this branch say, > 2021.02.06, we would like to create an ipk file with the changes and provide > that for syst > em update. Idea is the file will be smaller and thus requires less bandwidth > and will result in quicker update to the system. Do you have information on > any project that is working to create a package manager for systems that uses > buildroot for their build? > > My research showed one resource but is for open embedded or yocto or openwrt > and is here. https://raymii.org/s/tutorials/Building_IPK_packages_by_hand.html > > Do you think this is what I should try or any other relevant information on this topic? This Buildroot FAQ is relevant: https://buildroot.org/downloads/manual/manual.html#faq-no-binary-packages baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From yann.morin.1998 at free.fr Tue Jan 11 17:09:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 18:09:18 +0100 Subject: [Buildroot] [PATCH RFC 1/1] package/wpewebkit: use ninja for faster builds In-Reply-To: <20220111145527.3422053-1-aperez@igalia.com> References: <20220111145527.3422053-1-aperez@igalia.com> Message-ID: <20220111170918.GV1477939@scaer> Adrian, All, On 2022-01-11 16:55 +0200, Adrian Perez de Castro spake thusly: > Instruct CMake to use the Ninja generator, and override build/install > commands to use Ninja instead, which results in faster builds. The > host-ninja package is required to build some of the dependencies used > by wpewebkit (e.g. libepoxy) so in practice this is not introducing > a new host dependency that would slow down the build. As discussed on IRC, we concluded that a better option is to make the cmake-package infrastructure in Buildroot ninja-aware, and that you were going to have a look at it. Thanks! :-) So, I've marked this patch as rejected in patchwork. Regards, Yann E. MORIN. > Signed-off-by: Adrian Perez de Castro > --- > package/wpewebkit/wpewebkit.mk | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk > index 64c179534f..2cbed60cb3 100644 > --- a/package/wpewebkit/wpewebkit.mk > +++ b/package/wpewebkit/wpewebkit.mk > @@ -14,11 +14,12 @@ WPEWEBKIT_LICENSE_FILES = \ > Source/WebCore/LICENSE-LGPL-2.1 > WPEWEBKIT_CPE_ID_VENDOR = wpewebkit > WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit > -WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ > +WPEWEBKIT_DEPENDENCIES = host-gperf host-ninja host-python3 host-ruby \ > harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ > libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo > > WPEWEBKIT_CONF_OPTS = \ > + -GNinja \ > -DPORT=WPE \ > -DENABLE_ACCESSIBILITY=OFF \ > -DENABLE_API_TESTS=OFF \ > @@ -101,4 +102,24 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS > WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF > endif > > +define WPEWEBKIT_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \ > + $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -- $(NINJA_OPTS) $(WPEWEBKIT_NINJA_OPTS) > +endef > + > +define WPEWEBKIT_INSTALL_CMDS > + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \ > + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) > +endef > + > +define WPEWEBKIT_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) DESTDIR=$(STAGING_DIR) \ > + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) > +endef > + > +define WPEWEBKIT_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(WPEWEBKIT_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ > + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) > +endef > + > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From Murali.Karicheri at sandc.com Tue Jan 11 17:37:37 2022 From: Murali.Karicheri at sandc.com (Karicheri, Murali) Date: Tue, 11 Jan 2022 17:37:37 +0000 Subject: [Buildroot] creating packages for opkg for buildroot based embedded platform software Message-ID: Hi Baruch, -----Original Message----- From: buildroot On Behalf Of Baruch Siach via buildroot Sent: Tuesday, January 11, 2022 11:13 AM To: Karicheri, Murali Cc: buildroot at buildroot.org Subject: Re: [Buildroot] creating packages for opkg for buildroot based embedded platform software Hi Murali, On Tue, Jan 11 2022, Karicheri, Murali wrote: > Hello, buildroot experts, > > I am new to buildroot and was working with a buildroot expert for > migrating our yocto based build system to use buildroot. > Unfortunately, he has left our company for another oppotunity. Ever > since I have started using buildroot for our build, I am very happy > with its simplicity compared to yocto based build system. However, I > have learned that buildroot expect the entire rootfs to be updated on > a running system for updating fixes which is very expensive for > deployment where there is limited bandwidth available to update the > system. So that is the challenge that I am facing. Good news is opkg > tools are supported in buildroot which is good. Typically, we would > like to let our customer do periodic update to the system to have > vulnerability fixes and other fixes released by buildroot. For > example, let us say we base our system on 2021.02.x. So, when there is > a maintenance update to this branch say, 2021.02.06, we would like to > create an ipk file with the changes and provide that for syst em > update. Idea is the file will be smaller and thus requires less > bandwidth and will result in quicker update to the system. Do you have > information on any project that is working to create a package manager for systems that uses buildroot for their build? > > My research showed one resource but is for open embedded or yocto or > openwrt and is here. > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fraym > ii.org%2Fs%2Ftutorials%2FBuilding_IPK_packages_by_hand.html&data=0 > 4%7C01%7Cmurali.karicheri%40sandc.com%7Ced2996e04284449528fe08d9d51d6d > f3%7C21c4b724f908455e813c11c8d17f3e9a%7C0%7C0%7C637775144649082517%7CU > nknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1ha > WwiLCJXVCI6Mn0%3D%7C3000&sdata=VUvduRq9pPaHLRGnflGcQNzDo8ihorz8hOG > GJp%2Bd%2FhA%3D&reserved=0 > > Do you think this is what I should try or any other relevant information on this topic? This Buildroot FAQ is relevant: https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbuildroot.org%2Fdownloads%2Fmanual%2Fmanual.html%23faq-no-binary-packages&data=04%7C01%7Cmurali.karicheri%40sandc.com%7Ced2996e04284449528fe08d9d51d6df3%7C21c4b724f908455e813c11c8d17f3e9a%7C0%7C0%7C637775144649082517%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=4XHwDcvvpLQiwcSTMDuJ3vF%2Bammr84VU013NXlhwoxM%3D&reserved=0 Thanks for your quick response! Hope my email client (Outlook) doesn't create any annoying email format. My company also process these emails. So not sure if it messes up the format. I fully appreciate the intentions of buildroot to keep it simple. I had already reviewed the FAQ you had pointed out. What I am looking for is something outside buildroot. Typically, embedded systems that I am working with have firmware update mechanism in place. System doesn't modify the active rootfs but update an alternate set of partitions and switch to that once update is successful. So, we could potentially generate two rootfs contents using buildroot. One using say version 2021.02.02 and another with 2021.02.06 for example. We are using ARM tool chain for our build and assume we will keep it same for incremental updates. Understand that we might have to change the tool chain as well since there could be vulnerability fixes to tool chain. So, wondering if we could do a diff of both rootfs contents and create an ipk for the diff and update the alternate media for this purpose. Also, we will do extensive testing of our product software. So, this will be QA tested before pushing to field. Is there anything work done for this type of use cases? Regards, Murali baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.tkos.co.il%2F&data=04%7C01%7Cmurali.karicheri%40sandc.com%7Ced2996e04284449528fe08d9d51d6df3%7C21c4b724f908455e813c11c8d17f3e9a%7C0%7C0%7C637775144649082517%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=CI61wXVl0JJizrtYTd16lsPIUvw6s5nRLm0ez7XVZDQ%3D&reserved=0 - _______________________________________________ buildroot mailing list buildroot at buildroot.org https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.buildroot.org%2Fmailman%2Flistinfo%2Fbuildroot&data=04%7C01%7Cmurali.karicheri%40sandc.com%7Ced2996e04284449528fe08d9d51d6df3%7C21c4b724f908455e813c11c8d17f3e9a%7C0%7C0%7C637775144649082517%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=SVbBPgU%2B%2FMgWtx%2BDdXQ3AlSlkMBi2D96hDxDXXk6IMA%3D&reserved=0 ________________________________ NOTICE OF CONFIDENTIALITY: This message may contain information that is considered confidential and which may be prohibited from disclosure under applicable law or by contractual agreement. The information is intended solely for the use of the individual or entity named above. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution or use of the information contained in or attached to this message is strictly prohibited. If you have received this email transmission in error, please notify the sender by replying to this email and then delete it from your system. From fontaine.fabrice at gmail.com Tue Jan 11 17:43:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 18:43:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-mm: drop package Message-ID: <20220111174345.2482393-1-fontaine.fabrice@gmail.com> gstreamer1-mm is not compatible with glibmm-2.68 API and not actively maintained anymore (one commit during the last 3 years): https://gitlab.gnome.org/GNOME/gstreamermm/-/issues/17 https://gitlab.gnome.org/GNOME/gstreamermm/-/commits/master As this is the only package that doesn't support glibmm-2.68 and because it can't be easily patched, drop it to avoid the following build failure raised since commit dddb65efbdf2c7952f22a1e51009f17f1676db4a: Package 'giomm-2.4', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/3479688334765fbbe4cb9620f4d3596f7d710404 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++ package/gstreamer1/Config.in | 1 - .../0001-Fix-build-against-glib-2-68.patch | 44 ------------------- package/gstreamer1/gstreamer1-mm/Config.in | 29 ------------ .../gstreamer1-mm/gstreamer1-mm.hash | 6 --- .../gstreamer1/gstreamer1-mm/gstreamer1-mm.mk | 24 ---------- 6 files changed, 7 insertions(+), 104 deletions(-) delete mode 100644 package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch delete mode 100644 package/gstreamer1/gstreamer1-mm/Config.in delete mode 100644 package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash delete mode 100644 package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk diff --git a/Config.in.legacy b/Config.in.legacy index d36eac3302..a548ebf1a9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_GSTREAMER1_MM + bool "gstreamer1-mm package removed" + select BR2_LEGACY + help + This package has been removed as it is not actively + maintained anymore and does not support glibmm-2.68 API. + config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE bool "python-backports-functools-lru-cache package removed" select BR2_LEGACY diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index a2a15397e9..8fe8a34395 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -2,7 +2,6 @@ source "package/gstreamer1/gstreamer1/Config.in" if BR2_PACKAGE_GSTREAMER1 -source "package/gstreamer1/gstreamer1-mm/Config.in" source "package/gstreamer1/gst1-plugins-base/Config.in" source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in" source "package/gstreamer1/gst1-plugins-good/Config.in" diff --git a/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch b/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch deleted file mode 100644 index 3ffdbb9cbf..0000000000 --- a/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0c0b5f8cef3b1f0a06f56c34340e210e0f23d1b0 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Tue, 13 Jul 2021 10:32:30 +0000 -Subject: [PATCH] Fix build against glib 2.68 - -volatile has been misused in the past - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gstreamermm/-/merge_requests/4] -Signed-off-by: Fabrice Fontaine ---- - gstreamer/gstreamermm/register.h | 2 +- - tests/integration/test-integration-seekonstartup.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gstreamer/gstreamermm/register.h b/gstreamer/gstreamermm/register.h -index db66d172..a7ab3a63 100644 ---- a/gstreamer/gstreamermm/register.h -+++ b/gstreamer/gstreamermm/register.h -@@ -110,7 +110,7 @@ register_mm_type(const gchar * type_name) - /* The typedef for GType may be gulong or gsize, depending on the - * system and whether the compiler is c++ or not. The g_once_init_* - * functions always take a gsize * though ... */ -- static volatile gsize gonce_data = 0; -+ static gsize gonce_data = 0; - if (g_once_init_enter (&gonce_data)) { - GTypeInfo info; - -diff --git a/tests/integration/test-integration-seekonstartup.cc b/tests/integration/test-integration-seekonstartup.cc -index 247ac499..cd43a125 100644 ---- a/tests/integration/test-integration-seekonstartup.cc -+++ b/tests/integration/test-integration-seekonstartup.cc -@@ -18,7 +18,7 @@ RefPtr mainloop; - RefPtr bus; - RefPtr pipeline; - RefPtr sink_pad; --static volatile gint counter; -+static gint counter; - bool prerolled = false; - gboolean was_check = 0; - --- -GitLab - diff --git a/package/gstreamer1/gstreamer1-mm/Config.in b/package/gstreamer1/gstreamer1-mm/Config.in deleted file mode 100644 index 3225e394f4..0000000000 --- a/package/gstreamer1/gstreamer1-mm/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_GSTREAMER1_MM - bool "gstreamer1-mm" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # glibmm -> libsigc - depends on BR2_INSTALL_LIBSTDCPP # glibmm - depends on BR2_USE_WCHAR # glibmm -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # glibmm -> libglib2 - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_GSTREAMER1_CHECK - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - gstreamermm provides C++ bindings for the GStreamer streaming - multimedia library (http://gstreamer.freedesktop.org). With - gstreamermm it is possible to develop applications that work - with multimedia in C++. - - gstreamermm is developed over glibmm, libsigc++ and libxml++ - and the functionalities they provide. This means that, among - other things, referencing and unreferencing of GObjects is - handled automatically via glibmm's automatic pointer class, - Glib::RefPtr, and libsigc++'s slots are used for callbacks and - signals. - - https://gstreamer.freedesktop.org/bindings/cplusplus.html - -comment "gstreamer1-mm needs a toolchain w/ C++, wchar, threads, gcc >= 7" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash b/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash deleted file mode 100644 index 425cf05f39..0000000000 --- a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gstreamermm/1.10/gstreamermm-1.10.0.sha256sum -sha256 be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60 gstreamermm-1.10.0.tar.xz - -# Locally computed -sha256 7c78a8d7fc6781d51402d5a6036bedda9cffb0e5d28757e25d54d6eacbb1949f COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.examples diff --git a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk b/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk deleted file mode 100644 index 539c9df1cb..0000000000 --- a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# gstreamer1-mm -# -################################################################################ - -GSTREAMER1_MM_VERSION_MAJOR = 1.10 -GSTREAMER1_MM_VERSION = $(GSTREAMER1_MM_VERSION_MAJOR).0 -GSTREAMER1_MM_SITE = http://ftp.gnome.org/pub/gnome/sources/gstreamermm/$(GSTREAMER1_MM_VERSION_MAJOR) -GSTREAMER1_MM_SOURCE = gstreamermm-$(GSTREAMER1_MM_VERSION).tar.xz -GSTREAMER1_MM_LICENSE = LGPL-2.1+ (library), GPL-2.0 (examples) -GSTREAMER1_MM_LICENSE_FILES = COPYING COPYING.examples -GSTREAMER1_MM_INSTALL_STAGING = YES -GSTREAMER1_MM_DEPENDENCIES += \ - glibmm \ - gstreamer1 \ - gst1-plugins-base - -GSTREAMER1_MM_CONF_OPTS += \ - --disable-gl \ - --enable-unittests=no \ - --disable-deprecated-api - -$(eval $(autotools-package)) -- 2.34.1 From yann.morin.1998 at free.fr Tue Jan 11 18:28:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 19:28:06 +0100 Subject: [Buildroot] [git commit] package/linux-headers: drop 5.14.x headers Message-ID: <20220111182359.DE1A282A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27eb296a202b6559e8b6d363effb36af4319cb9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 5.14.x series is now EOL, so drop it. Signed-off-by: Peter Korsgaard [yann.morin.1998 at free.fr: actualyl drop it from the choice list] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index d36eac3302..b3e8d5a6d8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_KERNEL_HEADERS_5_14 + bool "kernel headers version 5.14.x are no longer supported" + select BR2_LEGACY + help + Version 5.14.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE bool "python-backports-functools-lru-cache package removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 86dc8d7af9..c40c26c1b2 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz -sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8ee86e09af..bf306faf92 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -58,10 +58,6 @@ config BR2_KERNEL_HEADERS_5_10 bool "Linux 5.10.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 -config BR2_KERNEL_HEADERS_5_14 - bool "Linux 5.14.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 - config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 @@ -388,7 +384,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.219" if BR2_KERNEL_HEADERS_4_19 default "5.4.163" if BR2_KERNEL_HEADERS_5_4 default "5.10.83" if BR2_KERNEL_HEADERS_5_10 - default "5.14.21" if BR2_KERNEL_HEADERS_5_14 default "5.15.6" if BR2_KERNEL_HEADERS_5_15 default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From yann.morin.1998 at free.fr Tue Jan 11 18:28:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 19:28:47 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series Message-ID: <20220111182359.E72F1811E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db14f7d71505aad2ae1e4aefc5c0ece97f5eacec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 6c30100921..891e2cdcb6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" 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 c40c26c1b2..d0813e5db4 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz -sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz +sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index bf306faf92..248a9a2d97 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -378,13 +378,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 - default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 + default "5.15.13" if BR2_KERNEL_HEADERS_5_15 default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From yann.morin.1998 at free.fr Tue Jan 11 18:31:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 19:31:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/linux-headers: drop 5.14.x headers In-Reply-To: <20220110231303.31275-1-peter@korsgaard.com> References: <20220110231303.31275-1-peter@korsgaard.com> Message-ID: <20220111183119.GW1477939@scaer> Peter, All, On 2022-01-11 00:13 +0100, Peter Korsgaard spake thusly: > The 5.14.x series is now EOL, so drop it. You forgot to remove it from the choice list, so I did. Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > Signed-off-by: Peter Korsgaard > --- > Config.in.legacy | 7 +++++++ > linux/linux.hash | 1 - > package/linux-headers/Config.in.host | 1 - > 3 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index d36eac3302..b3e8d5a6d8 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_KERNEL_HEADERS_5_14 > + bool "kernel headers version 5.14.x are no longer supported" > + select BR2_LEGACY > + help > + Version 5.14.x of the Linux kernel headers are no longer > + maintained upstream and are now removed. > + > config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE > bool "python-backports-functools-lru-cache package removed" > select BR2_LEGACY > diff --git a/linux/linux.hash b/linux/linux.hash > index 86dc8d7af9..c40c26c1b2 100644 > --- a/linux/linux.hash > +++ b/linux/linux.hash > @@ -1,7 +1,6 @@ > # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc > sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz > sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz > -sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz > sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz > sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc > diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host > index 8ee86e09af..115ff0d3f9 100644 > --- a/package/linux-headers/Config.in.host > +++ b/package/linux-headers/Config.in.host > @@ -388,7 +388,6 @@ config BR2_DEFAULT_KERNEL_HEADERS > default "4.19.219" if BR2_KERNEL_HEADERS_4_19 > default "5.4.163" if BR2_KERNEL_HEADERS_5_4 > default "5.10.83" if BR2_KERNEL_HEADERS_5_10 > - default "5.14.21" if BR2_KERNEL_HEADERS_5_14 > default "5.15.6" if BR2_KERNEL_HEADERS_5_15 > default "5.16" if BR2_KERNEL_HEADERS_5_16 > default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 11 18:31:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 19:31:33 +0100 Subject: [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series In-Reply-To: <20220110231303.31275-2-peter@korsgaard.com> References: <20220110231303.31275-1-peter@korsgaard.com> <20220110231303.31275-2-peter@korsgaard.com> Message-ID: <20220111183133.GX1477939@scaer> Peter, All, On 2022-01-11 00:13 +0100, Peter Korsgaard spake thusly: > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > linux/Config.in | 2 +- > linux/linux.hash | 14 +++++++------- > package/linux-headers/Config.in.host | 14 +++++++------- > 3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/linux/Config.in b/linux/Config.in > index 6c30100921..891e2cdcb6 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -125,7 +125,7 @@ endif > > config BR2_LINUX_KERNEL_VERSION > string > - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION > + default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION > default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION > default "5.10.83-cip1-rt1" 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 c40c26c1b2..d0813e5db4 100644 > --- a/linux/linux.hash > +++ b/linux/linux.hash > @@ -1,13 +1,13 @@ > # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc > sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz > -sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz > -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz > -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz > +sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz > +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz > +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc > -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz > -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz > -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz > -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz > +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz > +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz > +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz > +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz > # Locally computed > sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz > sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz > diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host > index 115ff0d3f9..1c24afed97 100644 > --- a/package/linux-headers/Config.in.host > +++ b/package/linux-headers/Config.in.host > @@ -382,13 +382,13 @@ endchoice > > config BR2_DEFAULT_KERNEL_HEADERS > string > - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 > - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 > - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 > - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 > - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 > - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 > - default "5.15.6" if BR2_KERNEL_HEADERS_5_15 > + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 > + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 > + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 > + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 > + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 > + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 > + default "5.15.13" if BR2_KERNEL_HEADERS_5_15 > default "5.16" if BR2_KERNEL_HEADERS_5_16 > default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION > default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fperrad at gmail.com Tue Jan 11 19:17:12 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 11 Jan 2022 20:17:12 +0100 Subject: [Buildroot] [PATCH 1/2] package/zic: bump to version 2021e Message-ID: <20220111191713.11473-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- .../zic/0001-remove-dependency-check-on-version-file.patch | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index 193c26304..62adc59c8 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,7 +18,7 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 +@@ -593,7 +593,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 3cee80bcd..9e17621de 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html -sha512 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed tzcode2020f.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html +sha512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a tzcode2021e.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 7529b682a..13f3a83bc 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2020f +ZIC_VERSION = 2021e ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 -- 2.32.0 From fperrad at gmail.com Tue Jan 11 19:17:13 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 11 Jan 2022 20:17:13 +0100 Subject: [Buildroot] [PATCH 2/2] package/tzdata: bump to version 2021e In-Reply-To: <20220111191713.11473-1-francois.perrad@gadz.org> References: <20220111191713.11473-1-francois.perrad@gadz.org> Message-ID: <20220111191713.11473-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index f70627481..55346539a 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html -sha512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 tzdata2021a.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html +sha512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 tzdata2021e.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 922e7420b..9cf8c2ea4 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2021a +TZDATA_VERSION = 2021e TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 -- 2.32.0 From ps.report at gmx.net Tue Jan 11 19:53:14 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 11 Jan 2022 20:53:14 +0100 Subject: [Buildroot] [PATCH v1] package/dhcp: change download URL to https Message-ID: <20220111195314.25173-1-ps.report@gmx.net> - change download URL to https Signed-off-by: Peter Seiderer --- package/dhcp/dhcp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 1edb3c5e99..18765a3639 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -5,7 +5,7 @@ ################################################################################ DHCP_VERSION = 4.4.2-P1 -DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) +DHCP_SITE = https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 11 19:59:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 20:59:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinifier: fix license hash Message-ID: <20220111195948.2565030-1-fontaine.fabrice@gmail.com> license hash is wrong since the addition of the package in commit 43c580ac9f848449333ecbe4336c2c9f2ba12158: >>> tinifier 3.4.0 Collecting legal info ERROR: LICENSE has wrong sha256 hash: ERROR: expected: 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 ERROR: got : 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c Fixes: - http://autobuild.buildroot.org/results/5fce7f16daca17216d786391ea0fffff856c5404 Signed-off-by: Fabrice Fontaine --- package/tinifier/tinifier.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash index 5681ed6a55..0c35508ebc 100644 --- a/package/tinifier/tinifier.hash +++ b/package/tinifier/tinifier.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 927e966f9d23ea7cc1942967a8fc16ef4c55c51bd096d44f54b418844a51aa12 tinifier-3.4.0.tar.gz -sha256 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 LICENSE +sha256 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Jan 11 20:06:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:06:48 +0100 Subject: [Buildroot] [git commit] package/tzdata: bump to version 2021e Message-ID: <20220111200043.7F5228348D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15e20ace94a1c2ecd2e843e7e628bfdecc58c295 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index f70627481a..55346539ab 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html -sha512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 tzdata2021a.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html +sha512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 tzdata2021e.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 922e7420bc..9cf8c2ea45 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2021a +TZDATA_VERSION = 2021e TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 From thomas.petazzoni at bootlin.com Tue Jan 11 20:06:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:06:59 +0100 Subject: [Buildroot] [git commit] package/tinifier: fix license hash Message-ID: <20220111200043.91B3F83483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=184e710c82b87bf2eaf1d200e148e686263945e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master license hash is wrong since the addition of the package in commit 43c580ac9f848449333ecbe4336c2c9f2ba12158: >>> tinifier 3.4.0 Collecting legal info ERROR: LICENSE has wrong sha256 hash: ERROR: expected: 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 ERROR: got : 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c Fixes: - http://autobuild.buildroot.org/results/5fce7f16daca17216d786391ea0fffff856c5404 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinifier/tinifier.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash index 5681ed6a55..0c35508ebc 100644 --- a/package/tinifier/tinifier.hash +++ b/package/tinifier/tinifier.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 927e966f9d23ea7cc1942967a8fc16ef4c55c51bd096d44f54b418844a51aa12 tinifier-3.4.0.tar.gz -sha256 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 LICENSE +sha256 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c LICENSE From thomas.petazzoni at bootlin.com Tue Jan 11 20:06:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:06:39 +0100 Subject: [Buildroot] [git commit] package/zic: bump to version 2021e Message-ID: <20220111200043.77B3183483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c99c961629fff186849c8340a9da5da2ae85a3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/zic/0001-remove-dependency-check-on-version-file.patch | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index 193c263049..62adc59c83 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,7 +18,7 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 +@@ -593,7 +593,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 3cee80bcdd..9e17621de8 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html -sha512 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed tzcode2020f.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html +sha512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a tzcode2021e.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 7529b682a2..13f3a83bce 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2020f +ZIC_VERSION = 2021e ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From thomas.petazzoni at bootlin.com Tue Jan 11 20:06:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:06:54 +0100 Subject: [Buildroot] [git commit] package/dhcp: change download URL to https Message-ID: <20220111200043.87E7A83492@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e93068e049c85df6ac2777ca58539e2fced51f01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - change download URL to https Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/dhcp/dhcp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 1edb3c5e99..18765a3639 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -5,7 +5,7 @@ ################################################################################ DHCP_VERSION = 4.4.2-P1 -DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) +DHCP_SITE = https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Jan 11 20:08:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:08:14 +0100 Subject: [Buildroot] [PATCH 1/2] package/zic: bump to version 2021e In-Reply-To: <20220111191713.11473-1-francois.perrad@gadz.org> References: <20220111191713.11473-1-francois.perrad@gadz.org> Message-ID: <20220111210814.4a68b0d4@windsurf> On Tue, 11 Jan 2022 20:17:12 +0100 Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > .../zic/0001-remove-dependency-check-on-version-file.patch | 2 +- > package/zic/zic.hash | 4 ++-- > package/zic/zic.mk | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) Both applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:08:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:08:21 +0100 Subject: [Buildroot] [PATCH v1] package/dhcp: change download URL to https In-Reply-To: <20220111195314.25173-1-ps.report@gmx.net> References: <20220111195314.25173-1-ps.report@gmx.net> Message-ID: <20220111210821.786840a1@windsurf> On Tue, 11 Jan 2022 20:53:14 +0100 Peter Seiderer wrote: > - change download URL to https > > Signed-off-by: Peter Seiderer > --- > package/dhcp/dhcp.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:08:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:08:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinifier: fix license hash In-Reply-To: <20220111195948.2565030-1-fontaine.fabrice@gmail.com> References: <20220111195948.2565030-1-fontaine.fabrice@gmail.com> Message-ID: <20220111210825.4fd0fb22@windsurf> On Tue, 11 Jan 2022 20:59:48 +0100 Fabrice Fontaine wrote: > license hash is wrong since the addition of the package in commit > 43c580ac9f848449333ecbe4336c2c9f2ba12158: > > >>> tinifier 3.4.0 Collecting legal info > ERROR: LICENSE has wrong sha256 hash: > ERROR: expected: 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 > ERROR: got : 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c > > Fixes: > - http://autobuild.buildroot.org/results/5fce7f16daca17216d786391ea0fffff856c5404 > > Signed-off-by: Fabrice Fontaine > --- > package/tinifier/tinifier.hash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:10:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:10:18 +0100 Subject: [Buildroot] Diagnosing conflicts due to new Python version In-Reply-To: References: Message-ID: <20220111211018.4d236002@windsurf> Hello Grant, On Tue, 11 Jan 2022 16:11:41 -0000 (UTC) Grant Edwards wrote: > It seems that every time a new Python version is unmasks, it breaks > things. > > This time it's a python-exec version conflict that prevents emerge > -u. FAICT, Python 3.10 requires python-exec 2.4.8, and some other > package requires 2.4.6. > > I've fixed things temporarily with: > > package.use: > > */* PYTHON_TARGETS: -python3_10 > */* PYTHON_SINGLE_TARGET -python3_10 > > package.mask: > > =dev-lang/python-3.10 > > No, at least I can continue to update the machine. I am confused by your e-mail. It seems to be a Gentoo question, but you sent it to the Buildroot mailing list. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Jan 11 20:11:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 21:11:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs dynamic library Message-ID: <20220111201129.2568175-1-fontaine.fabrice@gmail.com> libglvnd needs dynamic library since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: /libglvnd_pthread.a.p/glvnd_pthread.c.o -c ../src/util/glvnd_pthread.c ../src/util/glvnd_pthread.c:33:10: fatal error: dlfcn.h: No such file or directory 33 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c5e92f0b355c91cdcebe0070499889473996f337 Signed-off-by: Fabrice Fontaine --- package/libglvnd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index acf6247e94..2d99be8632 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" + depends on !BR2_STATIC_LIBS # dlfcn.h help The GL Vendor-Neutral Dispatch library @@ -42,3 +43,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_GLES endif + +comment "libglvnd needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Jan 11 20:13:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:13:16 +0100 Subject: [Buildroot] [PATCH 1/2] board/andes: rearrange nds32 folder structure In-Reply-To: <20220111035859.12895-1-peterlin@andestech.com> References: <20220111035859.12895-1-peterlin@andestech.com> Message-ID: <20220111211316.7f94cb45@windsurf> Hello Yu, On Tue, 11 Jan 2022 11:58:58 +0800 Yu Chien Peter Lin wrote: > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao > --- > .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 > board/andes/{ => ae3xx}/readme.txt | 0 > configs/andes_ae3xx_defconfig | 2 +- > 3 files changed, 1 insertion(+), 1 deletion(-) > rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > rename board/andes/{ => ae3xx}/readme.txt (100%) Thanks for your patch. However, I am a bit confused, because after your two patches, we will have: board/andes/ae3xx/ => the NDS32 platform board/andes/ae350/ => the RISC-V platform but the ae3xx wildcard matches ae350, so it feels really odd. Could you clarify? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:21:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:21:44 +0100 Subject: [Buildroot] [PATCH 2/2] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220111035859.12895-2-peterlin@andestech.com> References: <20220111035859.12895-1-peterlin@andestech.com> <20220111035859.12895-2-peterlin@andestech.com> Message-ID: <20220111212144.5ed9fc6f@windsurf> Hello Yu, On Tue, 11 Jan 2022 11:58:59 +0800 Yu Chien Peter Lin wrote: > This patch provides defconfig and basic support for the Andes > 45 series RISC-V architecture. > > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao Thanks for your patch! See below a number of comments. > --- > DEVELOPERS | 3 +- > board/andes/ae350/ae350.dts | 274 ++ > board/andes/ae350/boot.cmd | 3 + > board/andes/ae350/genimage_sdcard.cfg | 29 + > board/andes/ae350/linux.config.fragment | 2 + > .../0001-Add-AE350-platform-defconfig.patch | 158 + > ...002-Andes-support-for-Faraday-ATCMAC.patch | 510 +++ > .../0003-Andes-support-for-ATCDMAC.patch | 3301 +++++++++++++++++ > .../linux/0004-Andes-support-for-FTSDC.patch | 1884 ++++++++++ > ...5-Non-cacheability-and-Cache-support.patch | 1132 ++++++ > ...-Add-andes-sbi-call-vendor-extension.patch | 231 ++ > ...e-update-function-local_flush_tlb_al.patch | 101 + > ...rt-time32-stat64-sys_clone3-syscalls.patch | 47 + > .../0009-dma-Support-smp-up-with-dma.patch | 120 + > ...ix-atcdmac300-chained-irq-mapping-is.patch | 300 ++ > .../linux/0011-DMA-Add-msb-bit-patch.patch | 387 ++ > .../0012-Remove-unused-Andes-SBI-call.patch | 147 + > ...isable-PIC-explicitly-for-assembling.patch | 29 + > ...2-Enable-cache-for-opensbi-jump-mode.patch | 25 + > ...001-Fix-mmc-no-partition-table-error.patch | 27 + > ...2-Prevent-fw_dynamic-from-relocation.patch | 27 + > ...0003-Fix-u-boot-proper-booting-issue.patch | 26 + > ...04-Enable-printing-OpenSBI-boot-logo.patch | 25 + That is really a *huge* number of patches, and some of them are very large. I'm not sure we want all of them in Buildroot. It's of course nice to see that it allows your defconfig to use the upstream Linux kernel, but I think at this point it would be nicer to have a Git repository with your Linux kernel code, and fetch that code. Have all those patches been submitted to their respective upstream projects? > diff --git a/DEVELOPERS b/DEVELOPERS > index 12777e8d61..18b0444c72 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2122,10 +2122,11 @@ N: Norbert Lange > F: package/systemd/ > F: package/tcf-agent/ > > -N: Nylon Chen > +N: Yu Chien Peter Lin It would be nicer to have a separate patch to re-assign yourself on this DEVELOPERS entry. > F: arch/Config.in.nds32 > F: board/andes > F: configs/andes_ae3xx_defconfig > +F: configs/ae350_andestar45_defconfig It would probably be nicer to have a defconfig that starts with "andes", to match the previous defconfig? > diff --git a/board/andes/ae350/linux.config.fragment b/board/andes/ae350/linux.config.fragment > new file mode 100644 > index 0000000000..299b75d2f4 > --- /dev/null > +++ b/board/andes/ae350/linux.config.fragment > @@ -0,0 +1,2 @@ > +CONFIG_INITRAMFS_SOURCE="" > +CONFIG_EFI_PARTITION=y It feels quite odd that you need a linux configuration fragment, while just below there is a patch adding the Linux kernel defconfig. Why not adjust the Linux kernel defconfig directly? > diff --git a/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch b/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch > new file mode 100644 > index 0000000000..1384369972 > --- /dev/null > +++ b/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch > @@ -0,0 +1,158 @@ > +From 8a9097c1be79fdab3d907a8bbc66a222807cb81a Mon Sep 17 00:00:00 2001 > +From: Yu Chien Peter Lin > +Date: Tue, 28 Dec 2021 09:05:34 +0800 > +Subject: [PATCH 01/12] Add AE350 platform defconfig Please use "git format-patch -N" to generate patches. > diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt > new file mode 100644 > index 0000000000..19cfa721a7 > --- /dev/null > +++ b/board/andes/ae350/readme.txt > @@ -0,0 +1,66 @@ > +Intro > +===== > + > +Andestech AE350 Platform > + > +The AE350 prototype demonstrates the AE350 platform on the FPGA. Is this platform publicly available? The way I read this sentence, it seems like it's an internal prototyping platform. If that's the case, I'm not sure what's the value for you to upstream these patches in Buildroot, and what's the value for Buildroot to have this defconfig. > diff --git a/configs/ae350_andestar45_defconfig b/configs/ae350_andestar45_defconfig > new file mode 100644 > index 0000000000..fb4587b1a7 > --- /dev/null > +++ b/configs/ae350_andestar45_defconfig > @@ -0,0 +1,46 @@ > +BR2_riscv=y > +BR2_riscv_custom=y > +BR2_RISCV_ISA_CUSTOM_RVM=y > +BR2_RISCV_ISA_CUSTOM_RVF=y > +BR2_RISCV_ISA_CUSTOM_RVD=y > +BR2_RISCV_ISA_CUSTOM_RVC=y > +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" > +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y Any reason to override the default C library? > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_BINUTILS_VERSION_2_37_X=y > +BR2_GCC_VERSION_11_X=y > +BR2_GCC_ENABLE_OPENMP=y Please keep the default binutils and gcc version, and don't enable OpenMP support. The defconfigs should be minimal. > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.84" > +BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae350/linux.config.fragment" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" > +BR2_PACKAGE_OPENSSL=y Please remove OpenSSL. > +BR2_TARGET_ROOTFS_CPIO=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y Why both cpio and ext4 ? Only one of them should be needed. > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_PLAT="andes/ae350" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/andes/ae350/boot.cmd" Could you rework your patch to take into account those comments and post an updated version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:32:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:32:38 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: fix musl build Message-ID: <20220111202622.EC60F83465@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f363bc2958812539cf248f6cf44fe519445adf7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following musl build failure raised since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: In file included from /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, from ./kerncompat.h:31, from common/utils.c:42: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' 7 | struct sysinfo { | ^~~~~~~ In file included from common/utils.c:27: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here 10 | struct sysinfo { | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ux-const-h-to-fix-build-with-5-12-headers.patch | 43 +++++++++++++++++++ ...clude-sys-sysinfo-h-conditionally-on-musl.patch | 49 ++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch new file mode 100644 index 0000000000..b6c1a42456 --- /dev/null +++ b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch @@ -0,0 +1,43 @@ +From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Thu, 30 Dec 2021 15:23:59 +0200 +Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ + headers + +btrfs-tools compile fails with mips, musl and 5.12+ headers. + +The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we +add an explicit include of const.h to pickup the macro: + + | make: *** [Makefile:595: mkfs.btrfs] Error 1 + | make: *** Waiting for unfinished jobs.... + | libbtrfs.a(volumes.o): in function `dev_extent_search_start': + | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' + | collect2: error: ld returned 1 exit status + +This is safe for older kernel's as well, since the header still +exists, and is valid to include. + +Signed-off-by: Bruce Ashfield +[remove invalid OE Upstream-status] +Signed-off-by: Stijn Tintel +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] +Signed-off-by: Fabrice Fontaine +--- + kerncompat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kerncompat.h b/kerncompat.h +index df167fe6c..2503d1afa 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch new file mode 100644 index 0000000000..7473fe67cb --- /dev/null +++ b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch @@ -0,0 +1,49 @@ +From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 8 Jan 2022 22:44:44 +0100 +Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl + +Make inclusion of sys/sysinfo.h conditional to avoid the following build +failure on musl: + +In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, + from ./kerncompat.h:31, + from common/utils.c:42: +.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' + 7 | struct sysinfo { + | ^~~~~~~ +In file included from common/utils.c:27: +.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + 10 | struct sysinfo { + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc + +The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, +while both must not be included at the same time. Stop including +linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and +causes the double definition for some reason. As we now include +linux/const.h directly, there's no other effective change. + +Pull-request: #433 +Signed-off-by: Fabrice Fontaine +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] +--- + kerncompat.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 2503d1afa..6ca1526e2 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #include + #include + From thomas.petazzoni at bootlin.com Tue Jan 11 20:32:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:32:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix musl build In-Reply-To: <20220110225200.2000095-1-fontaine.fabrice@gmail.com> References: <20220110225200.2000095-1-fontaine.fabrice@gmail.com> Message-ID: <20220111213254.0073693d@windsurf> On Mon, 10 Jan 2022 23:52:00 +0100 Fabrice Fontaine wrote: > Fix the following musl build failure raised since bump to version 5.15.1 > in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: > > In file included from /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, > from ./kerncompat.h:31, > from common/utils.c:42: > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' > 7 | struct sysinfo { > | ^~~~~~~ > In file included from common/utils.c:27: > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here > 10 | struct sysinfo { > | ^~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc > > Signed-off-by: Fabrice Fontaine > --- > ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ++++++++++++++++ > ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 +++++++++++++++++++ > 2 files changed, 92 insertions(+) > create mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch > create mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:33:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:33:03 +0100 Subject: [Buildroot] [git commit] package/assimp: bump version to 5.1.6 Message-ID: <20220111202939.7D6F58324B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7194084e99676a1792e5ff7b8dfc6469337508e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/assimp/assimp/releases/tag/v5.1.6 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 8f6d613bb4..50f0b3e6d6 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz +sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index b5f84ef56f..766b2c9b5a 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.5 +ASSIMP_VERSION = 5.1.6 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Jan 11 20:36:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:36:06 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.1.6 In-Reply-To: <20220110220515.10921-1-ps.report@gmx.net> References: <20220110220515.10921-1-ps.report@gmx.net> Message-ID: <20220111213606.44a74adc@windsurf> On Mon, 10 Jan 2022 23:05:15 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] https://github.com/assimp/assimp/releases/tag/v5.1.6 > > Signed-off-by: Peter Seiderer > --- > package/assimp/assimp.hash | 2 +- > package/assimp/assimp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:36:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:36:16 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: bump version to 20211216 Message-ID: <20220111203000.8E9288324B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdb390085f212f3d6a243249cccb32bff018ea93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - update hash of WHENCE file Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 4c73374138..83275ec6d7 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 2fb22a5d7d23bf1f5800ab8152b39a00a445fbf4923de5a01b59d3f6253f0a9f linux-firmware-20210919.tar.xz +sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 a06edfd3649df6b0cbac8304d6d53f661963381f1231fd02da259806763d4162 WHENCE +sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b 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 ac45bc8282..2d103df05c 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20210919 +LINUX_FIRMWARE_VERSION = 20211216 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES From thomas.petazzoni at bootlin.com Tue Jan 11 20:36:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:36:28 +0100 Subject: [Buildroot] [PATCH v1] package/linux-firmware: bump version to 20211216 In-Reply-To: <20220110214356.14562-1-ps.report@gmx.net> References: <20220110214356.14562-1-ps.report@gmx.net> Message-ID: <20220111213628.53f85a7e@windsurf> On Mon, 10 Jan 2022 22:43:56 +0100 Peter Seiderer wrote: > - update hash of WHENCE file > > Signed-off-by: Peter Seiderer > --- > package/linux-firmware/linux-firmware.hash | 4 ++-- > package/linux-firmware/linux-firmware.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:37:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:37:28 +0100 Subject: [Buildroot] [git commit] configs/qemu_ppc64le_powernv8: new defconfig Message-ID: <20220111203211.C07FD81476@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d914839a4ff8c1dd4672b68dac445634cce230f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PowerNV is the platform using the OPAL [1] firmware on OpenPOWER systems. OPAL first loads a kernel and an initramfs image based on buildroot including a second boot loader petitboot [2]. The latter does device discovery and kexecs a new Linux image from disk or network. QEMU implements PowerNV machines [3] for the POWER8, POWER9 and Power10 processors which are used for dev and tests. POWER8 images being compatible with POWER9 and Power10, simply add a single qemu_ppc64le_powernv8 board for all. The QEMU script boots directly from a nvme disk because it is simple enough but a real system would boot from a ramfs first. [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst [2] https://github.com/open-power/petitboot/ [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html Signed-off-by: C??dric Le Goater Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 44911a7d94..bac58ffc7b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -504,6 +504,10 @@ F: package/libsvg-cairo/ N: C??dric Ch??pied F: package/znc/ +N: C??dric Le Goater +F: board/qemu/ppc64le-powernv8/readme.txt +F: configs/qemu_ppc64le_powernv8_defconfig + N: Charles Hardin F: package/alsa-plugins/ diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt new file mode 100644 index 0000000000..059f55fbc9 --- /dev/null +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig + +The login prompt will appear in the terminal window. diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig new file mode 100644 index 0000000000..d8ea6655fc --- /dev/null +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -0,0 +1,29 @@ +# Architecture +BR2_powerpc64le=y +BR2_powerpc_power8=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="hvc0" +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="powernv" +BR2_LINUX_KERNEL_VMLINUX=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From yann.morin.1998 at free.fr Tue Jan 11 20:38:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 21:38:48 +0100 Subject: [Buildroot] [git commit] package/libglvnd: needs dynamic library Message-ID: <20220111203235.0A4A681476@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=965d19386dfa0659ed0b1668085df1918b020281 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libglvnd needs dynamic library since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: /libglvnd_pthread.a.p/glvnd_pthread.c.o -c ../src/util/glvnd_pthread.c ../src/util/glvnd_pthread.c:33:10: fatal error: dlfcn.h: No such file or directory 33 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c5e92f0b355c91cdcebe0070499889473996f337 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libglvnd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index acf6247e94..2d99be8632 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" + depends on !BR2_STATIC_LIBS # dlfcn.h help The GL Vendor-Neutral Dispatch library @@ -42,3 +43,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_GLES endif + +comment "libglvnd needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS From thomas.petazzoni at bootlin.com Tue Jan 11 20:44:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:44:33 +0100 Subject: [Buildroot] [git commit] configs/qemu_ppc_bamboo: new defconfig Message-ID: <20220111203818.65DDF832DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ac0775130426e1ebc6d291bb3b131e19afc92fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Bamboo board is an evaluation board for PowerPC 440EP CPUs. Signed-off-by: C??dric Le Goater Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ board/qemu/ppc-bamboo/linux.fragment | 6 ++++++ board/qemu/ppc-bamboo/readme.txt | 5 +++++ configs/qemu_ppc_bamboo_defconfig | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bac58ffc7b..c8242df8a6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -505,7 +505,9 @@ N: C??dric Ch??pied F: package/znc/ N: C??dric Le Goater +F: board/qemu/ppc-bamboo/ F: board/qemu/ppc64le-powernv8/readme.txt +F: configs/qemu_ppc_bamboo_defconfig F: configs/qemu_ppc64le_powernv8_defconfig N: Charles Hardin diff --git a/board/qemu/ppc-bamboo/linux.fragment b/board/qemu/ppc-bamboo/linux.fragment new file mode 100644 index 0000000000..cc272d0541 --- /dev/null +++ b/board/qemu/ppc-bamboo/linux.fragment @@ -0,0 +1,6 @@ +# Enable virtio (blk, rng and net devices) +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_NET=y diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt new file mode 100644 index 0000000000..0b70d2fa54 --- /dev/null +++ b/board/qemu/ppc-bamboo/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc -nographic -M bamboo -kernel vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig + +The login prompt will appear in the terminal that started Qemu. diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig new file mode 100644 index 0000000000..d6abbeb452 --- /dev/null +++ b/configs/qemu_ppc_bamboo_defconfig @@ -0,0 +1,36 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_440fp=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" +BR2_LINUX_KERNEL_VMLINUX=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From thomas.petazzoni at bootlin.com Tue Jan 11 20:44:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:44:33 +0100 Subject: [Buildroot] [git commit] package/qemu: add support for PPC970 processors Message-ID: <20220111203818.6EEF7834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0662d0ec61e83581a96f162bb32637c01304a47d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PPC970 processors are well supported by the QEMU pseries and macbook machines. The latest debian 11 (big endian) runs with SMP. Re-add support. Fixes: efc67deef38c ("qemu: remove support for some PowerPC processors in host qemu") Signed-off-by: C??dric Le Goater Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index df5d921125..f9cdb9b703 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -22,7 +22,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_xtensa default y if BR2_x86_64 depends on !BR2_x86_steamroller && !BR2_x86_core_avx2 - depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 + depends on !BR2_powerpc_620 && !BR2_powerpc_630 config BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS bool From thomas.petazzoni at bootlin.com Tue Jan 11 20:45:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:45:09 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration In-Reply-To: <20220110210235.817082-1-clg@kaod.org> References: <20220110210235.817082-1-clg@kaod.org> Message-ID: <20220111214509.79c5c88e@windsurf> Hello C?dric, On Mon, 10 Jan 2022 22:02:33 +0100 C?dric Le Goater wrote: > PowerNV is the platform using the OPAL [1] firmware on OpenPOWER > systems. OPAL first loads a kernel and an initramfs image based on > buildroot including a second boot loader petitboot [2]. The latter > does device discovery and kexecs a new Linux image from disk or > network. > > QEMU implements PowerNV machines [3] for the POWER8, POWER9 and > Power10 processors which are used for dev and tests. POWER8 images > being compatible with POWER9 and Power10, simply add a single > qemu_ppc64le_powernv8 board for all. > > The QEMU script boots directly from a nvme disk because it is simple > enough but a real system would boot from a ramfs first. > > [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst > [2] https://github.com/open-power/petitboot/ > [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html > > Signed-off-by: C?dric Le Goater > --- > board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ > configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++ > 2 files changed, 34 insertions(+) > create mode 100644 board/qemu/ppc64le-powernv8/readme.txt > create mode 100644 configs/qemu_ppc64le_powernv8_defconfig Thanks, entire patch series applied. One small change was done: add appropriate entries to the DEVELOPERS file, so that we know who to contact for those defconfigs :-) Especially if our Gitlab CI infrastructure detects build issues, you will be notified. Since you are a PowerPC expert, I'd like to take this opportunity to ask you about the toolchains we're providing at https://toolchains.bootlin.com/. For the moment for PowerPC, we are providing the following toolchains: powerpc-440fp, not tested powerpc64-e5500, tested with qemu_ppc64_e5500_defconfig powerpc64-e6500, not tested powerpc64le-power8, tested with qemu_ppc64le_pseries_defconfig powerpc64-power8, tested with qemu_ppc64_pseries_defconfig powerpc-e300c3, not tested powerpc-e500mc, not tested I suppose I could now test the powerpc-440fp toolchain with the qemu_ppc_bamboo_defconfig you have added. Is that correct? What about the other toolchain configurations? Is there some matching Qemu emulation? And generally speaking, does this selection of PowerPC architecture variants make sense to offer pre-compiled toolchains? For quite a while, we've had requests for other PowerPC variants: https://github.com/bootlin/toolchains-builder/issues/2. Your input would be very welcome :-) Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Jan 11 20:48:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 21:48:23 +0100 Subject: [Buildroot] [git commit] package/python-pyparsing: needs python3 Message-ID: <20220111204311.E3062834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4705dfdd43d9e62c11d42bc2fb3f6600a5a7e33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-pyparsing dropped python2 support since version 3.0.0: https://github.com/pyparsing/pyparsing/blob/master/docs/whats_new_in_3_0_0.rst#python-2-x-no-longer-supported resulting in the following build failure since bump to version 3.0.6 in commit 7affc7827aee0e07ec94d3b4d91c2e23bda8d937: File "setup.py", line 8, in from pyparsing import __version__ as pyparsing_version File "/home/buildroot/autobuild/instance-0/output-1/build/python-pyparsing-3.0.6/pyparsing/__init__.py", line 100 major: int ^ SyntaxError: invalid syntax Fixes: - http://autobuild.buildroot.org/results/8ac5224f4b6c2c59035dbfb53541e76f58b15e47 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-httplib2/Config.in | 7 +++---- package/python-pyparsing/Config.in | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in index 39671f2386..0095d95b51 100644 --- a/package/python-httplib2/Config.in +++ b/package/python-httplib2/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_PYTHON_HTTPLIB2 bool "python-httplib2" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 # python-pyparsing + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL select BR2_PACKAGE_PYTHON_PYPARSING # runtime help httplib2 is a comprehensive HTTP client library, httplib2.py diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 926ca07ed7..9b5894116d 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYPARSING bool "python-pyparsing" + depends on BR2_PACKAGE_PYTHON3 help The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc From yann.morin.1998 at free.fr Tue Jan 11 20:51:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 21:51:38 +0100 Subject: [Buildroot] [git commit] package/ell: bump version to 0.47 Message-ID: <20220111204945.9B93C8345B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84781152c98ceff1c6872d1b87cf59f2fca45af8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Changelog (since 0.46, from [1]): ver 0.47: Fix issue with memory leaking from DHCP leases. Fix issue with NULL terminating of Base64 encoding. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 20b568dde4..cd724eae2d 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 f4fc647eff32f622e21f8851ed0c8b7270f4800149c91be601754e22d82cbb4d ell-0.46.tar.xz +sha256 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 4fad6e8d1b..3ce64b6f2f 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.46 +ELL_VERSION = 0.47 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Tue Jan 11 20:55:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 21:55:53 +0100 Subject: [Buildroot] [git commit] package/iwd: bump version to 1.21 Message-ID: <20220111204945.A3BE5832DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a3bdbb88094a7ffc2edc5d94cb2f7af8be360b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add 0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch - Changelog (since 1.20, from [1]): ver 1.21: Fix issue with handling disconnect events issued by AP. Add experimental support for DPP feature. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...licit-declaration-of-function-explicit_bz.patch | 41 ++++++++++++++++++++++ package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch new file mode 100644 index 0000000000..6b9cfb3e70 --- /dev/null +++ b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch @@ -0,0 +1,41 @@ +From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 10 Jan 2022 22:32:18 +0100 +Subject: [PATCH 1/1] dpp: fix implicit declaration of function explicit_bzero + warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- add missing src/missing.h include for explicit_bzero, fixes uclibc + compile/linking + +Fixes: + + src/dpp.c:166:2: warning: implicit declaration of function ???explicit_bzero??? [-Wimplicit-function-declaration] + 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); + | ^~~~~~~~~~~~~~ + +[backport from upstream] +Signed-off-by: Peter Seiderer +[yann.morin.1998 at free.fr: actual backport now upstreamn applied] +Signed-off-by: Yann E. MORIN +--- + src/dpp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dpp.c b/src/dpp.c +index 84e89f6c..8091ded1 100644 +--- a/src/dpp.c ++++ b/src/dpp.c +@@ -30,6 +30,7 @@ + + #include "linux/nl80211.h" + ++#include "src/missing.h" + #include "src/dbus.h" + #include "src/netdev.h" + #include "src/module.h" +-- +2.34.1 + diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 58224170e6..8e34d2983f 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz +sha256 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 42f176b05b..a70da86ecc 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.20 +IWD_VERSION = 1.21 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Tue Jan 11 20:59:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:59:12 +0100 Subject: [Buildroot] [PATCH] support/download: drop support for the 'none' hash In-Reply-To: <61dcb681410a7_8fcfa78-19a@xultri.mail> References: <20220110162319.294088-1-yann.morin.1998@free.fr> <61dcb681410a7_8fcfa78-19a@xultri.mail> Message-ID: <20220111215912.40bea95e@windsurf> On Mon, 10 Jan 2022 19:43:13 -0300 ricardo.martincoski at gmail.com wrote: > Hello Yann, > > On Mon, Jan 10, 2022 at 01:23 PM, Yann E. MORIN wrote: > > [snip] > > --- > > docs/manual/adding-packages-directory.txt | 9 +-------- > > support/download/check-hash | 4 ---- > > 2 files changed, 1 insertion(+), 12 deletions(-) > > Another file to change: > utils/checkpackagelib/lib_hash.py: if htype == "none": Good point, I fixed that when applying. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:59:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:59:22 +0100 Subject: [Buildroot] [git commit] package/cryptopp: needs wchar Message-ID: <20220111205334.07D6A834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7425450ba27ecd3dacf795e42bb70ef0c98684e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: In file included from seckey.h:11, from 3way.h:10, from 3way.cpp:5: misc.h:1528:6: error: 'wstring' in namespace 'std' does not name a type 1528 | std::wstring StringWiden(const char *str, bool throwOnError = true); | ^~~~~~~ In file included from seckey.h:11, from 3way.h:10, from 3way.cpp:5: misc.h:14:1: note: 'std::wstring' is defined in header ''; did you forget to '#include '? 13 | #include "smartptr.h" +++ |+#include 14 | #include "stdcpp.h" Fixes: - http://autobuild.buildroot.org/results/174fe03da7a40dd152703de93af6a213d9cac698 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cryptopp/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index 4ead5339ab..feb945db2f 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_CRYPTOPP bool "cryptopp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR help A free C++ class library of cryptographic schemes -comment "cryptopp needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "cryptopp needs a toolchain w/ dynamic library, wchar" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR From thomas.petazzoni at bootlin.com Tue Jan 11 20:58:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:58:01 +0100 Subject: [Buildroot] [git commit] support/download: drop support for the 'none' hash Message-ID: <20220111205334.0013A82BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5da82181846b81a967c48f02f7404812a8acd60a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 1ba85b7f874d (support/download: add explicit no-hash support) introduced the 'none' hash type, in an attempt to make hash files mandatory, but not failing on archives localy generated, like those for git or svn repositories, especially for those packages where a version choice was present, which would allow for either remote archives for which we'd have a hash or VCS trees for which we could not have a hash for the localy generated archive. Indeed, back in the time, we did not have a mean to generate reproducible archives, so having a hash file without a hash for thosel ocally generated archives would trigger an error in the hash-checking machinery. But now, low-and-behold, we do know how to generate those archives, and we have a mechanism to explicitly exclude some archives from being hash-checked (e.g. when the version string itself can be user-provided). As such, the 'none' hash type no longer has any raison d'??tre, we do not use it in-tree, and its use in a br2-external tree is most probably inexistent (as is the use of hash files alotgether most probably). So we simply drop the support for that. Signed-off-by: Yann E. MORIN [Thomas: drop support in checkpackagelib, as reported by Ricardo.] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.txt | 9 +-------- support/download/check-hash | 4 ---- utils/checkpackagelib/lib_hash.py | 2 -- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 4ceb3fd772..6c68d7aa67 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -464,9 +464,8 @@ The format of this file is one line for each file for which to check the hash, each line with the following three fields separated by two spaces: * the type of hash, one of: -** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+, +none+ +** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+ * the hash of the file: -** for +none+, one or more non-space chars, usually just the string +xxx+ ** for +md5+, 32 hexadecimal characters ** for +sha1+, 40 hexadecimal characters ** for +sha224+, 56 hexadecimal characters @@ -500,9 +499,6 @@ target run. For a package with multiple versions (like Qt5), create the hash file in a subdirectory ++ of that package (see also xref:patch-apply-order[]). -The +none+ hash type is reserved to those archives downloaded from a -repository, like a 'git clone', a 'subversion checkout'... - The example below defines a +sha1+ and a +sha256+ published by upstream for the main +libfoo-1.2.3.tar.bz2+ tarball, an +md5+ from upstream and a locally-computed +sha256+ hashes for a binary blob, a +sha256+ for a @@ -520,9 +516,6 @@ sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo # Locally computed: sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch -# No hash for 1234: -none xxx libfoo-1234.tar.gz - # Hash for license files: sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL diff --git a/support/download/check-hash b/support/download/check-hash index fe9c10570e..5a47f49bc3 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -53,11 +53,7 @@ check_one_hash() { # Note: md5 is supported, but undocumented on purpose. # Note: sha3 is not supported, since there is currently no implementation # (the NIST has yet to publish the parameters). - # Note: 'none' means there is explicitly no hash for that file. case "${_h}" in - none) - return 0 - ;; md5|sha1) ;; sha224|sha256|sha384|sha512) ;; *) # Unknown hash, exit with error diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py index 698d24fd6b..1c595e84b8 100644 --- a/utils/checkpackagelib/lib_hash.py +++ b/utils/checkpackagelib/lib_hash.py @@ -41,8 +41,6 @@ class HashType(_CheckFunction): return htype, hexa = fields[:2] - if htype == "none": - return if htype not in self.len_of_hash.keys(): return ["{}:{}: unexpected type of hash ({}#adding-packages-hash)" .format(self.filename, lineno, self.url_to_manual), From thomas.petazzoni at bootlin.com Tue Jan 11 20:59:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:59:27 +0100 Subject: [Buildroot] [git commit] package/cryptopp: disable neon if needed Message-ID: <20220111205334.0FC89834E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81945bde7c282d0ab5f304dc9795e2d68033cd98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: In file included from aria_simd.cpp:18:0: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/lib/gcc/arm-none-linux-gnueabi/4.8.3/include/arm_neon.h:32:2: error: #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h ^ Fixes: - http://autobuild.buildroot.org/results/e4fd947c118174a4fad62cbed18816f02d39ec25 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cryptopp/cryptopp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 5e6eb9644d..4353e35e0a 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -47,6 +47,10 @@ ifneq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),y) CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_AVX2 endif +ifneq ($(BR2_ARM_CPU_HAS_NEON),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON +endif + CRYPTOPP_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ CXXFLAGS="$(CRYPTOPP_CXXFLAGS)" From thomas.petazzoni at bootlin.com Tue Jan 11 21:00:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:00:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: needs wchar In-Reply-To: <20220110173542.1748804-1-fontaine.fabrice@gmail.com> References: <20220110173542.1748804-1-fontaine.fabrice@gmail.com> Message-ID: <20220111220007.50a69ce1@windsurf> On Mon, 10 Jan 2022 18:35:42 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since commit > bf4cf9de833e2d571d98d1ca935ea08a3468e463: > > In file included from seckey.h:11, > from 3way.h:10, > from 3way.cpp:5: > misc.h:1528:6: error: 'wstring' in namespace 'std' does not name a type > 1528 | std::wstring StringWiden(const char *str, bool throwOnError = true); > | ^~~~~~~ > In file included from seckey.h:11, > from 3way.h:10, > from 3way.cpp:5: > misc.h:14:1: note: 'std::wstring' is defined in header ''; did you forget to '#include '? > 13 | #include "smartptr.h" > +++ |+#include > 14 | #include "stdcpp.h" > > Fixes: > - http://autobuild.buildroot.org/results/174fe03da7a40dd152703de93af6a213d9cac698 > > Signed-off-by: Fabrice Fontaine > --- > package/cryptopp/Config.in | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:00:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:00:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: disable neon if needed In-Reply-To: <20220110173640.1748895-1-fontaine.fabrice@gmail.com> References: <20220110173640.1748895-1-fontaine.fabrice@gmail.com> Message-ID: <20220111220010.75401b91@windsurf> On Mon, 10 Jan 2022 18:36:40 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since commit > bf4cf9de833e2d571d98d1ca935ea08a3468e463: > > In file included from aria_simd.cpp:18:0: > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/lib/gcc/arm-none-linux-gnueabi/4.8.3/include/arm_neon.h:32:2: error: #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h > #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h > ^ > > Fixes: > - http://autobuild.buildroot.org/results/e4fd947c118174a4fad62cbed18816f02d39ec25 > > Signed-off-by: Fabrice Fontaine > --- > package/cryptopp/cryptopp.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:01:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:01:40 +0100 Subject: [Buildroot] [git commit] package/mbedtls: fix build with gcc 4.8 Message-ID: <20220111205543.4DCF682DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef4dfe8fcee9fff152d938619562776a9ae03c18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since bump to version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c: In function 'mpi_select': /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: error: 'for' loop initial declarations are only allowed in C99 mode for( size_t i = 0; i < T_size; i++ ) ^ /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: - http://autobuild.buildroot.org/results/56ac0a8726d09eed8f45f865934fa7781a0e667a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mbedtls/mbedtls.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 5facb99b2a..8745ff33f4 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -7,6 +7,7 @@ MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF From thomas.petazzoni at bootlin.com Tue Jan 11 21:01:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:01:58 +0100 Subject: [Buildroot] [git commit] boot/uboot: bump to version 2022.01 Message-ID: <20220111205543.56E39834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf009f31ef317af3ca9f9f5508a818f871b4159e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index bffb7cfb19..c630fc6552 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2021.10" + bool "2022.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2021.10" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 68259f69f2..9171a794a1 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4 u-boot-2021.10.tar.bz2 +sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt From thomas.petazzoni at bootlin.com Tue Jan 11 21:02:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:02:08 +0100 Subject: [Buildroot] [PATCH] boot/uboot: bump to version 2022.01 In-Reply-To: <20220110194439.1809166-1-festevam@gmail.com> References: <20220110194439.1809166-1-festevam@gmail.com> Message-ID: <20220111220208.3faa3a86@windsurf> On Mon, 10 Jan 2022 16:44:39 -0300 Fabio Estevam wrote: > Signed-off-by: Fabio Estevam > --- > boot/uboot/Config.in | 4 ++-- > boot/uboot/uboot.hash | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:02:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:02:18 +0100 Subject: [Buildroot] [git commit] configs/mx6cubox: bump Linux and U-Boot versions Message-ID: <20220111205604.1310E82DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcbd1ed224ac61cc7be8db0f5eb5f26da4e2ddc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/mx6cubox_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index e80d995525..6ea4f6e416 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -6,8 +6,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y # Toolchain -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.70" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" @@ -32,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From thomas.petazzoni at bootlin.com Tue Jan 11 21:02:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:02:29 +0100 Subject: [Buildroot] [PATCH] configs/mx6cubox: bump Linux and U-Boot versions In-Reply-To: <20220110195131.78165-1-francois.perrad@gadz.org> References: <20220110195131.78165-1-francois.perrad@gadz.org> Message-ID: <20220111220229.6a2ab660@windsurf> On Mon, 10 Jan 2022 20:51:31 +0100 Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > configs/mx6cubox_defconfig | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:14 +0100 Subject: [Buildroot] [git commit] package/musl: disable LTO unconditionally Message-ID: <20220111205658.B50F3834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5a4de201bf0f747ba438c6f1d45fb4bd2c4dfbc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered for glibc, but all C libraries, like musl, are impacted, for very similar reasons. Disable LTO unconditionally for musl too. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/musl/musl.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/musl/musl.mk b/package/musl/musl.mk index d4f26b50a7..b89945e3be 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -26,6 +26,12 @@ MUSL_ADD_TOOLCHAIN_DEPENDENCY = NO MUSL_INSTALL_STAGING = YES +# musl does not build with LTO, so explicitly disable it +# when using a compiler that may have support for LTO +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +MUSL_EXTRA_CFLAGS += -fno-lto +endif + # Thumb build is broken, build in ARM mode, since all architectures # that support Thumb1 also support ARM. ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:10 +0100 Subject: [Buildroot] [git commit] package/uclibc: disable LTO unconditionally Message-ID: <20220111205658.AD1DE82DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54bd9691c876ff12780a3d6e7f8de900d8cbd14e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered for glibc, but all C libraries, like uClibc-NG, are impacted, for very similar reasons. Disable LTO unconditionally for uClibc-NG too. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 87e283de2a..0feedb6cfa 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -362,10 +362,18 @@ endif # Commands # +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) + +# uClibc-ng does not build with LTO, so explicitly disable it +# when using a compiler that may have support for LTO +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +UCLIBC_EXTRA_CFLAGS += -fno-lto +endif + UCLIBC_MAKE_FLAGS = \ ARCH="$(UCLIBC_TARGET_ARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \ + UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS)" \ HOSTCC="$(HOSTCC)" define UCLIBC_KCONFIG_FIXUP_CMDS From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:27 +0100 Subject: [Buildroot] [PATCH 1/2] package/uclibc: disable LTO unconditionally In-Reply-To: <20220110091036.4165679-1-yann.morin.1998@free.fr> References: <20220110091036.4165679-1-yann.morin.1998@free.fr> Message-ID: <20220111220327.4819a1ba@windsurf> On Mon, 10 Jan 2022 10:10:35 +0100 "Yann E. MORIN" wrote: > Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered > for glibc, but all C libraries, like uClibc-NG, are impacted, for very > similar reasons. > > Disable LTO unconditionally for uClibc-NG too. > > Signed-off-by: Yann E. MORIN > Cc: Norbert Lange > --- > package/uclibc/uclibc.mk | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) Series applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:43 +0100 Subject: [Buildroot] [git commit] package/openlayers: bump to version 6.11.0 Message-ID: <20220111205726.7541B82DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=baf74fe3df91e7b2d53a5533d06057965423ba7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 11eae3de36..b72d5fcde8 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 da3025279bbd6cfb0e82b7af95666bede8fd65e8c620a1bc54bba04cebb7e1d4 v6.10.0-dist.zip +sha256 8c4751915808a5a84adcd760fff453429a95993cadf77003ac94eae127240c1a v6.11.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 781f9901ea..1f8b485018 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.10.0 +OPENLAYERS_VERSION = 6.11.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.11.0 In-Reply-To: <20220110092352.1247528-1-thomas.claveirole@green-communications.fr> References: <20220110092352.1247528-1-thomas.claveirole@green-communications.fr> Message-ID: <20220111220349.44fdfef8@windsurf> On Mon, 10 Jan 2022 10:23:52 +0100 Thomas Claveirole wrote: > Signed-off-by: Thomas Claveirole > --- > package/openlayers/openlayers.hash | 2 +- > package/openlayers/openlayers.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Jan 11 21:04:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 11 Jan 2022 22:04:09 +0100 Subject: [Buildroot] [PATCH 1/2] package/linux-headers: drop 5.14.x headers In-Reply-To: <20220111183119.GW1477939@scaer> (Yann E. MORIN's message of "Tue, 11 Jan 2022 19:31:19 +0100") References: <20220110231303.31275-1-peter@korsgaard.com> <20220111183119.GW1477939@scaer> Message-ID: <871r1e9e7q.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2022-01-11 00:13 +0100, Peter Korsgaard spake thusly: >> The 5.14.x series is now EOL, so drop it. > You forgot to remove it from the choice list, so I did. > Applied to master with the above fixed, thanks. Ups, thanks for fixing it! -- Bye, Peter Korsgaard From ps.report at gmx.net Tue Jan 11 21:05:26 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 11 Jan 2022 22:05:26 +0100 Subject: [Buildroot] [PATCH v1] package/imagemagick: bump version to 7.1.0-19 Message-ID: <20220111210526.23536-1-ps.report@gmx.net> For details see [1]. [1] https://github.com/ImageMagick/ImageMagick/blob/main/ChangeLog Signed-off-by: Peter Seiderer --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index b787643fde..278becd2ab 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fc454be622724c6224fa6c8230bb9c50191a05fbf05b9c9c25aa3e5497090b83 imagemagick-7.0.11-13.tar.gz +sha256 385ca5bd8ce9b37e685779c46868171af949265c9db40067c1c4d7442dbc723e imagemagick-7.1.0-19.tar.gz sha256 040badb77b659e751ea16113490a937e1e01f3f5d32181e966b8982413533fb2 LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index a6eaf99887..64a530c6d2 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.11-13 +IMAGEMAGICK_VERSION = 7.1.0-19 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Jan 11 20:58:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:58:59 +0100 Subject: [Buildroot] [PATCH] support/download: drop support for the 'none' hash In-Reply-To: <20220110162319.294088-1-yann.morin.1998@free.fr> References: <20220110162319.294088-1-yann.morin.1998@free.fr> Message-ID: <20220111215859.15821eda@windsurf> On Mon, 10 Jan 2022 17:23:19 +0100 "Yann E. MORIN" wrote: > Commit 1ba85b7f874d (support/download: add explicit no-hash support) > introduced the 'none' hash type, in an attempt to make hash files > mandatory, but not failing on archives localy generated, like those > for git or svn repositories, especially for those packages where a > version choice was present, which would allow for either remote > archives for which we'd have a hash or VCS trees for which we could > not have a hash for the localy generated archive. > > Indeed, back in the time, we did not have a mean to generate > reproducible archives, so having a hash file without a hash for > thosel ocally generated archives would trigger an error in the > hash0-checking machinery. > > But now, low-and-behold, we do know how to generate those archives, > and we have a mechanism to explicitly exclude some archives from being > hash-checked (e.g. when the verison string itself can be user-provided). > > As such, the 'none' hash type no longer has any raison d'?tre, we do not > use it in-tree, and its use in a br2-external tree is most probably > inexistent (as is the use of hash files alotgether most probably). > > So we simply drop the support for that. > > Signed-off-by: Yann E. MORIN > --- > docs/manual/adding-packages-directory.txt | 9 +-------- > support/download/check-hash | 4 ---- > 2 files changed, 1 insertion(+), 12 deletions(-) Applied to master, with the fix suggested by Ricardo. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:01:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:01:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: fix build with gcc 4.8 In-Reply-To: <20220110174411.1761440-1-fontaine.fabrice@gmail.com> References: <20220110174411.1761440-1-fontaine.fabrice@gmail.com> Message-ID: <20220111220147.2aa99684@windsurf> On Mon, 10 Jan 2022 18:44:11 +0100 Fabrice Fontaine wrote: > Fix the following build failure with gcc 4.8 raised since bump to > version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: > > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c: In function 'mpi_select': > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: error: 'for' loop initial declarations are only allowed in C99 mode > for( size_t i = 0; i < T_size; i++ ) > ^ > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: note: use option -std=c99 or -std=gnu99 to compile your code > > Fixes: > - http://autobuild.buildroot.org/results/56ac0a8726d09eed8f45f865934fa7781a0e667a > > Signed-off-by: Fabrice Fontaine > --- > package/mbedtls/mbedtls.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:14:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:14:20 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gstreamer1-mm: drop package Message-ID: <20220111210816.ABAEE82BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdb8cbb15c8f55da9a2d98ed206f8dfb10f2c8e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gstreamer1-mm is not compatible with glibmm-2.68 API and not actively maintained anymore (one commit during the last 3 years): https://gitlab.gnome.org/GNOME/gstreamermm/-/issues/17 https://gitlab.gnome.org/GNOME/gstreamermm/-/commits/master As this is the only package that doesn't support glibmm-2.68 and because it can't be easily patched, drop it to avoid the following build failure raised since commit dddb65efbdf2c7952f22a1e51009f17f1676db4a: Package 'giomm-2.4', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/3479688334765fbbe4cb9620f4d3596f7d710404 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 ++++ package/gstreamer1/Config.in | 1 - .../0001-Fix-build-against-glib-2-68.patch | 44 ---------------------- package/gstreamer1/gstreamer1-mm/Config.in | 29 -------------- .../gstreamer1/gstreamer1-mm/gstreamer1-mm.hash | 6 --- package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk | 24 ------------ 6 files changed, 7 insertions(+), 104 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b3e8d5a6d8..6c6aca5ac9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_GSTREAMER1_MM + bool "gstreamer1-mm package removed" + select BR2_LEGACY + help + This package has been removed as it is not actively + maintained anymore and does not support glibmm-2.68 API. + config BR2_KERNEL_HEADERS_5_14 bool "kernel headers version 5.14.x are no longer supported" select BR2_LEGACY diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index a2a15397e9..8fe8a34395 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -2,7 +2,6 @@ source "package/gstreamer1/gstreamer1/Config.in" if BR2_PACKAGE_GSTREAMER1 -source "package/gstreamer1/gstreamer1-mm/Config.in" source "package/gstreamer1/gst1-plugins-base/Config.in" source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in" source "package/gstreamer1/gst1-plugins-good/Config.in" diff --git a/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch b/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch deleted file mode 100644 index 3ffdbb9cbf..0000000000 --- a/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0c0b5f8cef3b1f0a06f56c34340e210e0f23d1b0 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Tue, 13 Jul 2021 10:32:30 +0000 -Subject: [PATCH] Fix build against glib 2.68 - -volatile has been misused in the past - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gstreamermm/-/merge_requests/4] -Signed-off-by: Fabrice Fontaine ---- - gstreamer/gstreamermm/register.h | 2 +- - tests/integration/test-integration-seekonstartup.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gstreamer/gstreamermm/register.h b/gstreamer/gstreamermm/register.h -index db66d172..a7ab3a63 100644 ---- a/gstreamer/gstreamermm/register.h -+++ b/gstreamer/gstreamermm/register.h -@@ -110,7 +110,7 @@ register_mm_type(const gchar * type_name) - /* The typedef for GType may be gulong or gsize, depending on the - * system and whether the compiler is c++ or not. The g_once_init_* - * functions always take a gsize * though ... */ -- static volatile gsize gonce_data = 0; -+ static gsize gonce_data = 0; - if (g_once_init_enter (&gonce_data)) { - GTypeInfo info; - -diff --git a/tests/integration/test-integration-seekonstartup.cc b/tests/integration/test-integration-seekonstartup.cc -index 247ac499..cd43a125 100644 ---- a/tests/integration/test-integration-seekonstartup.cc -+++ b/tests/integration/test-integration-seekonstartup.cc -@@ -18,7 +18,7 @@ RefPtr mainloop; - RefPtr bus; - RefPtr pipeline; - RefPtr sink_pad; --static volatile gint counter; -+static gint counter; - bool prerolled = false; - gboolean was_check = 0; - --- -GitLab - diff --git a/package/gstreamer1/gstreamer1-mm/Config.in b/package/gstreamer1/gstreamer1-mm/Config.in deleted file mode 100644 index 3225e394f4..0000000000 --- a/package/gstreamer1/gstreamer1-mm/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_GSTREAMER1_MM - bool "gstreamer1-mm" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # glibmm -> libsigc - depends on BR2_INSTALL_LIBSTDCPP # glibmm - depends on BR2_USE_WCHAR # glibmm -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # glibmm -> libglib2 - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_GSTREAMER1_CHECK - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - gstreamermm provides C++ bindings for the GStreamer streaming - multimedia library (http://gstreamer.freedesktop.org). With - gstreamermm it is possible to develop applications that work - with multimedia in C++. - - gstreamermm is developed over glibmm, libsigc++ and libxml++ - and the functionalities they provide. This means that, among - other things, referencing and unreferencing of GObjects is - handled automatically via glibmm's automatic pointer class, - Glib::RefPtr, and libsigc++'s slots are used for callbacks and - signals. - - https://gstreamer.freedesktop.org/bindings/cplusplus.html - -comment "gstreamer1-mm needs a toolchain w/ C++, wchar, threads, gcc >= 7" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash b/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash deleted file mode 100644 index 425cf05f39..0000000000 --- a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gstreamermm/1.10/gstreamermm-1.10.0.sha256sum -sha256 be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60 gstreamermm-1.10.0.tar.xz - -# Locally computed -sha256 7c78a8d7fc6781d51402d5a6036bedda9cffb0e5d28757e25d54d6eacbb1949f COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.examples diff --git a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk b/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk deleted file mode 100644 index 539c9df1cb..0000000000 --- a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# gstreamer1-mm -# -################################################################################ - -GSTREAMER1_MM_VERSION_MAJOR = 1.10 -GSTREAMER1_MM_VERSION = $(GSTREAMER1_MM_VERSION_MAJOR).0 -GSTREAMER1_MM_SITE = http://ftp.gnome.org/pub/gnome/sources/gstreamermm/$(GSTREAMER1_MM_VERSION_MAJOR) -GSTREAMER1_MM_SOURCE = gstreamermm-$(GSTREAMER1_MM_VERSION).tar.xz -GSTREAMER1_MM_LICENSE = LGPL-2.1+ (library), GPL-2.0 (examples) -GSTREAMER1_MM_LICENSE_FILES = COPYING COPYING.examples -GSTREAMER1_MM_INSTALL_STAGING = YES -GSTREAMER1_MM_DEPENDENCIES += \ - glibmm \ - gstreamer1 \ - gst1-plugins-base - -GSTREAMER1_MM_CONF_OPTS += \ - --disable-gl \ - --enable-unittests=no \ - --disable-deprecated-api - -$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Tue Jan 11 21:14:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:14:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-mm: drop package In-Reply-To: <20220111174345.2482393-1-fontaine.fabrice@gmail.com> References: <20220111174345.2482393-1-fontaine.fabrice@gmail.com> Message-ID: <20220111221456.6b96cc93@windsurf> On Tue, 11 Jan 2022 18:43:45 +0100 Fabrice Fontaine wrote: > gstreamer1-mm is not compatible with glibmm-2.68 API and not actively > maintained anymore (one commit during the last 3 years): > https://gitlab.gnome.org/GNOME/gstreamermm/-/issues/17 > https://gitlab.gnome.org/GNOME/gstreamermm/-/commits/master > > As this is the only package that doesn't support glibmm-2.68 and because > it can't be easily patched, drop it to avoid the following build failure > raised since commit dddb65efbdf2c7952f22a1e51009f17f1676db4a: > > Package 'giomm-2.4', required by 'virtual:world', not found > > Fixes: > - http://autobuild.buildroot.org/results/3479688334765fbbe4cb9620f4d3596f7d710404 > > Signed-off-by: Fabrice Fontaine > --- > Config.in.legacy | 7 +++ > package/gstreamer1/Config.in | 1 - > .../0001-Fix-build-against-glib-2-68.patch | 44 ------------------- > package/gstreamer1/gstreamer1-mm/Config.in | 29 ------------ > .../gstreamer1-mm/gstreamer1-mm.hash | 6 --- > .../gstreamer1/gstreamer1-mm/gstreamer1-mm.mk | 24 ---------- > 6 files changed, 7 insertions(+), 104 deletions(-) > delete mode 100644 package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch > delete mode 100644 package/gstreamer1/gstreamer1-mm/Config.in > delete mode 100644 package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash > delete mode 100644 package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:15:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:15:02 +0100 Subject: [Buildroot] [git commit] package/meson: bump to version 0.61.0 Message-ID: <20220111210902.D71FD82941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 02d8900003..c9be54be05 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.60.3/meson-0.60.3.tar.gz.asc -sha256 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e meson-0.60.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz.asc +sha256 ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c meson-0.61.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e8443eacba..e63dc725bf 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.60.3 +MESON_VERSION = 0.61.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Tue Jan 11 21:15:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:15:03 +0100 Subject: [Buildroot] [git commit] package/imagemagick: bump version to 7.1.0-19 Message-ID: <20220111210902.DF41F834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ead58eaad3cab6593356a1a254fac1eb15f8ef7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/ImageMagick/ImageMagick/blob/main/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index b787643fde..278becd2ab 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fc454be622724c6224fa6c8230bb9c50191a05fbf05b9c9c25aa3e5497090b83 imagemagick-7.0.11-13.tar.gz +sha256 385ca5bd8ce9b37e685779c46868171af949265c9db40067c1c4d7442dbc723e imagemagick-7.1.0-19.tar.gz sha256 040badb77b659e751ea16113490a937e1e01f3f5d32181e966b8982413533fb2 LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index a6eaf99887..64a530c6d2 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.11-13 +IMAGEMAGICK_VERSION = 7.1.0-19 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Jan 11 21:15:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:15:11 +0100 Subject: [Buildroot] [git commit] configs/mx6sx_udoo: bump U-Boot and kernel Message-ID: <20220111210902.E6AEB834E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=350bddf7efa17f5cc67023d2f4537b7f6d65fb41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump U-Boot to 2022.01 and kernel to 5.15.13. After the conversion to U-Boot device model, the SD card is device '1', so change the boot script accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/udoo/common/boot.scr.txt | 6 +++--- configs/mx6sx_udoo_neo_defconfig | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/udoo/common/boot.scr.txt b/board/udoo/common/boot.scr.txt index 7acceed0fb..7a7d756c3c 100644 --- a/board/udoo/common/boot.scr.txt +++ b/board/udoo/common/boot.scr.txt @@ -1,7 +1,7 @@ -setenv finduuid "part uuid mmc 0:1 uuid" +setenv finduuid "part uuid mmc 1:1 uuid" run finduuid run findfdt setenv bootargs "console=${console} root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage +load mmc 1:1 ${fdt_addr} boot/${fdtfile} +load mmc 1:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdt_addr} diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 2bdcade252..3e1dc33bd4 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y @@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" From yann.morin.1998 at free.fr Tue Jan 11 21:17:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 22:17:08 +0100 Subject: [Buildroot] [PATCH] package/zynq-boot-bin: drop legacy package Message-ID: <20220111211708.517341-1-yann.morin.1998@free.fr> Since commit 6dd5a33c485c (zynq_zed: bump U-Boot to xilinx-v2016.2), we have no in-tree users of zynq-boot-bin.py, as U-Boot has since v2016.01 been able to natively generate Xilinx images. zynq-boot-bin.py is python2-only and there is zero chance that upstream will move it to python3. WE could carry a pytohn3-compatible copy, but that tool is now virtually unused. 6 years have passed now; let it rest in peace at last. Signed-off-by: Yann E. MORIN Cc: James Hilliard Cc: Thomas Petazzoni Cc: Masahiro Yamada Cc: Luca Ceresoli --- Config.in.legacy | 7 +++++++ boot/uboot/Config.in | 12 ------------ boot/uboot/uboot.mk | 11 ----------- package/zynq-boot-bin/zynq-boot-bin.hash | 2 -- package/zynq-boot-bin/zynq-boot-bin.mk | 22 ---------------------- 5 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk diff --git a/Config.in.legacy b/Config.in.legacy index b3e8d5a6d8..16d5ac40b3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_TARGET_UBOOT_ZYNQ_IMAGE + bool "Generate image for Xilinx Zynq" + select BR2_LEGACY + help + Since 2016.1, U-Boot can natively generate the Zynq boot image, + and so the Xilinx-specific format and tools have been removed. + config BR2_KERNEL_HEADERS_5_14 bool "kernel headers version 5.14.x are no longer supported" select BR2_LEGACY diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index c630fc6552..1fd4dede92 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -455,18 +455,6 @@ config BR2_TARGET_UBOOT_SPL_NAME and TPL name is tpl/u-boot-tpl.bin but not always. SPL name is MLO on OMAP and SPL on i.MX6 for example. -config BR2_TARGET_UBOOT_ZYNQ_IMAGE - bool "Generate image for Xilinx Zynq" - depends on BR2_arm - depends on BR2_TARGET_UBOOT_SPL - depends on BR2_TARGET_UBOOT_FORMAT_DTB_IMG - help - Generate the BOOT.BIN file from U-Boot's SPL. The image - boots the Xilinx Zynq chip without any FPGA bitstream. - A bitstream can be loaded by the U-Boot. The SPL searchs - for u-boot-dtb.img file so this U-Boot format is required - to be set. - config BR2_TARGET_UBOOT_ZYNQMP bool "Boot on the Xilinx ZynqMP SoCs" depends on BR2_aarch64 diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 574fc7089a..a61d1c8135 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -432,17 +432,6 @@ UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE endif -ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y) -define UBOOT_GENERATE_ZYNQ_IMAGE - $(HOST_DIR)/bin/python2 \ - $(HOST_DIR)/bin/zynq-boot-bin.py \ - -u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \ - -o $(BINARIES_DIR)/BOOT.BIN -endef -UBOOT_DEPENDENCIES += host-zynq-boot-bin -UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE -endif - ifeq ($(BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC),y) ifeq ($(BR2_TARGET_UBOOT_SPL),y) UBOOT_CRC_ALTERA_SOCFPGA_INPUT_IMAGES = $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)) diff --git a/package/zynq-boot-bin/zynq-boot-bin.hash b/package/zynq-boot-bin/zynq-boot-bin.hash deleted file mode 100644 index 0bc23de197..0000000000 --- a/package/zynq-boot-bin/zynq-boot-bin.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://raw.githubusercontent.com/Xilinx/u-boot-xlnx -sha1 940331ee02b0007099effa61e382fe7ea4174054 zynq-boot-bin.py diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk deleted file mode 100644 index deba5f4096..0000000000 --- a/package/zynq-boot-bin/zynq-boot-bin.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# zynq-boot-bin -# -################################################################################ - -ZYNQ_BOOT_BIN_VERSION = 2015.1 -ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py -ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/xilinx-v$(ZYNQ_BOOT_BIN_VERSION)/tools -ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ - -HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python - -define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS - cp $(HOST_ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) -endef - -define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/bin/$(ZYNQ_BOOT_BIN_SOURCE) -endef - -$(eval $(host-generic-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Tue Jan 11 21:21:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:21:27 +0100 Subject: [Buildroot] [PATCH v1] package/imagemagick: bump version to 7.1.0-19 In-Reply-To: <20220111210526.23536-1-ps.report@gmx.net> References: <20220111210526.23536-1-ps.report@gmx.net> Message-ID: <20220111222127.65d7e1ba@windsurf> On Tue, 11 Jan 2022 22:05:26 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] https://github.com/ImageMagick/ImageMagick/blob/main/ChangeLog > > Signed-off-by: Peter Seiderer > --- > package/imagemagick/imagemagick.hash | 2 +- > package/imagemagick/imagemagick.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:21:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:21:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 In-Reply-To: <20220110211323.1828141-1-james.hilliard1@gmail.com> References: <20220110211323.1828141-1-james.hilliard1@gmail.com> Message-ID: <20220111222135.693a88f2@windsurf> On Mon, 10 Jan 2022 14:13:23 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:21:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:21:56 +0100 Subject: [Buildroot] [PATCH] configs/mx6sx_udoo: Bump U-Boot and kernel In-Reply-To: <20220110201810.2277642-1-festevam@gmail.com> References: <20220110201810.2277642-1-festevam@gmail.com> Message-ID: <20220111222156.5e5993d2@windsurf> On Mon, 10 Jan 2022 17:18:10 -0300 Fabio Estevam wrote: > Bump U-Boot to 2022.01 and kernel to 5.15.13. > > After the conversion to U-Boot device model, the SD card is > device '1', so change the boot script accordingly. > > Signed-off-by: Fabio Estevam > --- > board/udoo/common/boot.scr.txt | 6 +++--- > configs/mx6sx_udoo_neo_defconfig | 8 ++++---- > 2 files changed, 7 insertions(+), 7 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:22:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:22:17 +0100 Subject: [Buildroot] [git commit] package/git: add xdg SELinux module Message-ID: <20220111211601.898B782DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c60df47735e2bfc91f7dbaf5642fc82744feeb86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master xdg SELinux module is needed to avoid the following build failure raised since bump of refpolicy to version 2.20220106 in commit f6691d122ce25fc580ca88243f79f75cc2808ca7 and https://github.com/SELinuxProject/refpolicy/commit/64e637d895c516d7a6b6cbcd46b187136279fddd: policy/modules/services/git.te:121:ERROR 'attribute xdg_config_type is not declared' at token ';' on line 115358: typeattribute git_xdg_config_t xdg_config_type; #line 121 checkpolicy: error(s) encountered while parsing configuration Rules.monolithic:78: recipe for target 'policy.30' failed Fixes: - http://autobuild.buildroot.org/results/98d5b3db313000855721c0ad994951fe8cc781c0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/git/git.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/git/git.mk b/package/git/git.mk index 556921a9fc..90b1acd6a4 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -10,7 +10,7 @@ GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_CPE_ID_VENDOR = git-scm -GIT_SELINUX_MODULES = apache git +GIT_SELINUX_MODULES = apache git xdg GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) # We're patching configure.ac GIT_AUTORECONF = YES From thomas.petazzoni at bootlin.com Tue Jan 11 21:22:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:22:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/git: add xdg SELinux module In-Reply-To: <20220110075804.1499122-1-fontaine.fabrice@gmail.com> References: <20220110075804.1499122-1-fontaine.fabrice@gmail.com> Message-ID: <20220111222224.221ef0da@windsurf> On Mon, 10 Jan 2022 08:58:04 +0100 Fabrice Fontaine wrote: > xdg SELinux module is needed to avoid the following build failure raised > since bump of refpolicy to version 2.20220106 in commit > f6691d122ce25fc580ca88243f79f75cc2808ca7 and > https://github.com/SELinuxProject/refpolicy/commit/64e637d895c516d7a6b6cbcd46b187136279fddd: > > policy/modules/services/git.te:121:ERROR 'attribute xdg_config_type is not declared' at token ';' on line 115358: > typeattribute git_xdg_config_t xdg_config_type; > #line 121 > checkpolicy: error(s) encountered while parsing configuration > Rules.monolithic:78: recipe for target 'policy.30' failed > > Fixes: > - http://autobuild.buildroot.org/results/98d5b3db313000855721c0ad994951fe8cc781c0 > > Signed-off-by: Fabrice Fontaine > --- > package/git/git.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From luca at lucaceresoli.net Tue Jan 11 22:00:04 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Tue, 11 Jan 2022 23:00:04 +0100 Subject: [Buildroot] [PATCH] package/zynq-boot-bin: drop legacy package In-Reply-To: <20220111211708.517341-1-yann.morin.1998@free.fr> References: <20220111211708.517341-1-yann.morin.1998@free.fr> Message-ID: <5c2d7de5-56e5-d98a-3f13-3ef18ffcaa5e@lucaceresoli.net> Hi Yann, On 11/01/22 22:17, Yann E. MORIN wrote: > Since commit 6dd5a33c485c (zynq_zed: bump U-Boot to xilinx-v2016.2), we > have no in-tree users of zynq-boot-bin.py, as U-Boot has since v2016.01 > been able to natively generate Xilinx images. > > zynq-boot-bin.py is python2-only and there is zero chance that upstream > will move it to python3. WE could carry a pytohn3-compatible copy, but s/pytohn3/python3/ > that tool is now virtually unused. > > 6 years have passed now; let it rest in peace at last. > > Signed-off-by: Yann E. MORIN > Cc: James Hilliard > Cc: Thomas Petazzoni > Cc: Masahiro Yamada > Cc: Luca Ceresoli > --- > Config.in.legacy | 7 +++++++ > boot/uboot/Config.in | 12 ------------ > boot/uboot/uboot.mk | 11 ----------- > package/zynq-boot-bin/zynq-boot-bin.hash | 2 -- > package/zynq-boot-bin/zynq-boot-bin.mk | 22 ---------------------- > 5 files changed, 7 insertions(+), 47 deletions(-) > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index b3e8d5a6d8..16d5ac40b3 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_TARGET_UBOOT_ZYNQ_IMAGE > + bool "Generate image for Xilinx Zynq" > + select BR2_LEGACY > + help > + Since 2016.1, U-Boot can natively generate the Zynq boot image, > + and so the Xilinx-specific format and tools have been removed. As said in the discussion after James' patch, I would add something like: Should you still need zynq-boot-bin.py you can download it at and call it from a post-build script. You will need to install python2 on your host to run it. -- Luca From thomas.petazzoni at bootlin.com Tue Jan 11 21:55:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:55:08 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: new package Message-ID: <20220111220020.EA83A83478@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea033cecf990ed3f86619647523a9ad2ccb09adb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Spike, the RISC-V ISA Simulator, implements a functional model of one or more RISC-V harts. The host package provides an alternative solution to qemu. https://github.com/riscv-software-src/riscv-isa-sim Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in.host | 1 + .../0001-riscv-disable-precompiled-headers.patch | 34 ++++++++++++++++++++++ package/riscv-isa-sim/Config.in.host | 13 +++++++++ package/riscv-isa-sim/riscv-isa-sim.hash | 3 ++ package/riscv-isa-sim/riscv-isa-sim.mk | 12 ++++++++ 6 files changed, 64 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c8242df8a6..13464178c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1599,6 +1599,7 @@ F: package/glslsandbox-player/ F: package/ptm2human/ F: package/python-distro/ F: package/python-pyalsa/ +F: package/riscv-isa-sim/ N: Julien Viard de Galbert F: package/dieharder/ diff --git a/package/Config.in.host b/package/Config.in.host index 6e027d96c2..c390ae3e7d 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -78,6 +78,7 @@ menu "Host utilities" source "package/qoriq-rcw/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" + source "package/riscv-isa-sim/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch new file mode 100644 index 0000000000..461f34e3a1 --- /dev/null +++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch @@ -0,0 +1,34 @@ +From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sun, 9 Jan 2022 13:38:48 +0100 +Subject: [PATCH] riscv: disable precompiled headers + +While precompiling header, some toolchains fail with the message: + + /path/to/toolchain/bin/ld: /path/to/sysroot/usr/lib/Scrt1.o: in function `_start': + (.text+0x54): undefined reference to `main' + +The patch totally disable precompiled headers. + +Signed-off-by: Julien Olivain +--- + riscv/riscv.mk.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in +index 2347ce6..4f56eaf 100644 +--- a/riscv/riscv.mk.in ++++ b/riscv/riscv.mk.in +@@ -35,9 +35,6 @@ riscv_hdrs = \ + + riscv_install_hdrs = mmio_plugin.h + +-riscv_precompiled_hdrs = \ +- insn_template.h \ +- + riscv_srcs = \ + processor.cc \ + execute.cc \ +-- +2.34.1 + diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host new file mode 100644 index 0000000000..35e404caf0 --- /dev/null +++ b/package/riscv-isa-sim/Config.in.host @@ -0,0 +1,13 @@ +config BR2_PACKAGE_HOST_RISCV_ISA_SIM + bool "host riscv-isa-sim" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++1 + help + Spike, the RISC-V ISA Simulator, implements a functional + model of one or more RISC-V harts. + + The host package provides an alternative solution to qemu. + + https://github.com/riscv-software-src/riscv-isa-sim + +comment "host riscv-isa-sim needs host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/riscv-isa-sim/riscv-isa-sim.hash b/package/riscv-isa-sim/riscv-isa-sim.hash new file mode 100644 index 0000000000..d787a03e4c --- /dev/null +++ b/package/riscv-isa-sim/riscv-isa-sim.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9b29c220fed1e867e3bea4b5c565f2629237d525a4d9fe1668699c4406003a1f riscv-isa-sim-1.1.0.tar.gz +sha256 c65e436d18972c9c4bd192494fe4870bd2e158179474975b80a3559f27631632 LICENSE diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk new file mode 100644 index 0000000000..e10dd4c662 --- /dev/null +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# riscv-isa-sim +# +################################################################################ + +RISCV_ISA_SIM_VERSION = 1.1.0 +RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) +RISCV_ISA_SIM_LICENSE = BSD-3-Clause +RISCV_ISA_SIM_LICENSE_FILES = LICENSE + +$(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Tue Jan 11 21:58:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:58:52 +0100 Subject: [Buildroot] [git commit] configs/spike_riscv64: new defconfig Message-ID: <20220111220020.F3EB9825F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24d07fdc1404901fb1872ac55f875fe1d555cbb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ board/spike/riscv64/readme.txt | 39 +++++++++++++++++++++++++++++++++++++++ board/spike/riscv64/start.sh | 13 +++++++++++++ configs/spike_riscv64_defconfig | 13 +++++++++++++ 4 files changed, 67 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 13464178c0..bcc54bd11b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1588,10 +1588,12 @@ F: package/paho-mqtt-c N: Julien Olivain F: board/qmtech/zynq/ +F: board/spike/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig +F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ diff --git a/board/spike/riscv64/readme.txt b/board/spike/riscv64/readme.txt new file mode 100644 index 0000000000..5ad7df46df --- /dev/null +++ b/board/spike/riscv64/readme.txt @@ -0,0 +1,39 @@ +Linux on Spike RISC-V ISA simulator +=================================== + +This configuration provides a minimal working setup to run a Linux +kernel in the Spike RISC-V ISA simulator. + +The Spike ISA simulator can be an interresting alternative to Qemu, in +some specific cases. For example: simulating new instructions (see [1]), +simulating riscv-openocd/gdb debug sessions (see [2], [3]), or +generating an accurate per-instruction log of execution (see +riscv-isa-sim spike -l option)... + +To run Buildroot Linux in Spike, use the commands: + + make spike_riscv64_defconfig + make + ./board/spike/riscv64/start.sh + +The boot is made with the standard RISC-V OpenSBI boot loader. In +order to keep the simulation simple, the rootfs is passed as an initrd +ramfs. + +Note: at the time of this writing, Spike v1.1.0 and OpenSBI v1.0 does +not support console input emulation for 32bit RISC-V systems. A 32bit +Linux system can boot and reach the login, but it's not possible to +login. See [4]. + + +[1]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new-instruction + +[2]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#debugging-with-gdb + +[3]. +https://github.com/riscv/riscv-openocd + +[4]. +https://github.com/riscv-software-src/opensbi/blob/v1.0/lib/utils/sys/htif.c#L127 diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh new file mode 100755 index 0000000000..75b1412df8 --- /dev/null +++ b/board/spike/riscv64/start.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +SCRIPT_DIR="$(dirname "$0")" +BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" + +# Use Buildroot host spike by default, but allow the caller to +# redefine another spike binary +: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" + +exec "${SPIKE}" \ + --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ + "${@}" \ + "${BR_BASEDIR}"/output/images/fw_payload.elf diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig new file mode 100644 index 0000000000..cc145bcd8e --- /dev/null +++ b/configs/spike_riscv64_defconfig @@ -0,0 +1,13 @@ +BR2_riscv=y +BR2_RISCV_64=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_TARGET_ROOTFS_CPIO=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y +BR2_PACKAGE_HOST_RISCV_ISA_SIM=y From thomas.petazzoni at bootlin.com Tue Jan 11 22:08:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 23:08:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/riscv-isa-sim: new package In-Reply-To: <20220109164756.1312023-1-ju.o@free.fr> References: <20220109164756.1312023-1-ju.o@free.fr> Message-ID: <20220111230808.5c9f298e@windsurf> On Sun, 9 Jan 2022 17:47:55 +0100 Julien Olivain wrote: > Spike, the RISC-V ISA Simulator, implements a functional model of one > or more RISC-V harts. > > The host package provides an alternative solution to qemu. > > https://github.com/riscv-software-src/riscv-isa-sim > > Signed-off-by: Julien Olivain Thanks for your patch! > diff --git a/package/Config.in b/package/Config.in > index 85193f7802..b20cf45698 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2126,6 +2126,7 @@ menu "Miscellaneous" > source "package/proj/Config.in" > source "package/qemu/Config.in" > source "package/qpdf/Config.in" > + source "package/riscv-isa-sim/Config.in" > source "package/rtl_433/Config.in" > source "package/shared-mime-info/Config.in" > source "package/sunwait/Config.in" It wasn't clear to me what was the use-case/reasoning for having a target variant of this package, so I've dropped the target variant and kept only the host variant. > diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch > new file mode 100644 > index 0000000000..461f34e3a1 > --- /dev/null > +++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch > @@ -0,0 +1,34 @@ > +From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Sun, 9 Jan 2022 13:38:48 +0100 > +Subject: [PATCH] riscv: disable precompiled headers > + > +While precompiling header, some toolchains fail with the message: > + > + /path/to/toolchain/bin/ld: /path/to/sysroot/usr/lib/Scrt1.o: in function `_start': > + (.text+0x54): undefined reference to `main' Has this been reported upstream? Will it be fixed upstream? Anyway: patch applied to master, with the target variant dropped. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 22:08:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 23:08:46 +0100 Subject: [Buildroot] [PATCH 2/2] configs/spike_riscv64: new defconfig In-Reply-To: <20220109164756.1312023-2-ju.o@free.fr> References: <20220109164756.1312023-1-ju.o@free.fr> <20220109164756.1312023-2-ju.o@free.fr> Message-ID: <20220111230846.2460ac6a@windsurf> On Sun, 9 Jan 2022 17:47:56 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 2 ++ > board/spike/riscv64/readme.txt | 39 +++++++++++++++++++++++++++++++++ > board/spike/riscv64/start.sh | 13 +++++++++++ > configs/spike_riscv64_defconfig | 12 ++++++++++ > 4 files changed, 66 insertions(+) > create mode 100644 board/spike/riscv64/readme.txt > create mode 100755 board/spike/riscv64/start.sh > create mode 100644 configs/spike_riscv64_defconfig Applied to master, thanks. I've just added an explicit BR2_RISCV_64=y in the defconfig to really clarify that this is a RISC-V 64-bit configuration (even though BR2_RISCV_64=y is indeed the default). Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Tue Jan 11 22:08:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 23:08:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: fix host dependencies Message-ID: <20220111220815.2570293-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit 78d7c5f803c2f59385b57525e2d1d09da15e22a6: WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU Depends on [n]: (BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS [=n] || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n]) && BR2_HOST_GCC_AT_LEAST_8 [=y] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Depends on [n]: BR2_PACKAGE_HOST_QEMU [=y] && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU Depends on [n]: (BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS [=n] || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n]) && BR2_HOST_GCC_AT_LEAST_8 [=y] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Depends on [n]: BR2_PACKAGE_HOST_QEMU [=y] && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] Fixes: - http://autobuild.buildroot.org/results/d78f660ca4a609a0a072b3f2e04d456bf8cf663f Signed-off-by: Fabrice Fontaine --- package/nodejs/Config.in.host | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 86eaf21dac..4ceaf0c73e 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_NODEJS bool "host nodejs" - depends on BR2_HOST_GCC_AT_LEAST_7 + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_8 select BR2_PACKAGE_HOST_PYTHON3 select BR2_PACKAGE_HOST_PYTHON3_BZIP2 select BR2_PACKAGE_HOST_PYTHON3_SSL @@ -11,3 +12,7 @@ config BR2_PACKAGE_HOST_NODEJS V8. http://nodejs.org/ + +comment "host nodejs needs a host gcc >= 8" + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_8 -- 2.34.1 From james.hilliard1 at gmail.com Tue Jan 11 22:10:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 11 Jan 2022 15:10:39 -0700 Subject: [Buildroot] [PATCH] package/zynq-boot-bin: drop legacy package In-Reply-To: <5c2d7de5-56e5-d98a-3f13-3ef18ffcaa5e@lucaceresoli.net> References: <20220111211708.517341-1-yann.morin.1998@free.fr> <5c2d7de5-56e5-d98a-3f13-3ef18ffcaa5e@lucaceresoli.net> Message-ID: On Tue, Jan 11, 2022 at 3:00 PM Luca Ceresoli wrote: > > Hi Yann, > > On 11/01/22 22:17, Yann E. MORIN wrote: > > Since commit 6dd5a33c485c (zynq_zed: bump U-Boot to xilinx-v2016.2), we > > have no in-tree users of zynq-boot-bin.py, as U-Boot has since v2016.01 > > been able to natively generate Xilinx images. > > > > zynq-boot-bin.py is python2-only and there is zero chance that upstream > > will move it to python3. WE could carry a pytohn3-compatible copy, but > > s/pytohn3/python3/ > > > that tool is now virtually unused. > > > > 6 years have passed now; let it rest in peace at last. > > > > Signed-off-by: Yann E. MORIN > > Cc: James Hilliard > > Cc: Thomas Petazzoni > > Cc: Masahiro Yamada > > Cc: Luca Ceresoli > > --- > > Config.in.legacy | 7 +++++++ > > boot/uboot/Config.in | 12 ------------ > > boot/uboot/uboot.mk | 11 ----------- > > package/zynq-boot-bin/zynq-boot-bin.hash | 2 -- > > package/zynq-boot-bin/zynq-boot-bin.mk | 22 ---------------------- > > 5 files changed, 7 insertions(+), 47 deletions(-) > > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash > > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk > > > > diff --git a/Config.in.legacy b/Config.in.legacy > > index b3e8d5a6d8..16d5ac40b3 100644 > > --- a/Config.in.legacy > > +++ b/Config.in.legacy > > @@ -146,6 +146,13 @@ endif > > > > comment "Legacy options removed in 2022.02" > > > > +config BR2_TARGET_UBOOT_ZYNQ_IMAGE > > + bool "Generate image for Xilinx Zynq" > > + select BR2_LEGACY > > + help > > + Since 2016.1, U-Boot can natively generate the Zynq boot image, > > + and so the Xilinx-specific format and tools have been removed. > > As said in the discussion after James' patch, I would add something like: > > Should you still need zynq-boot-bin.py you can download it at > and call it from a post-build script. You will need to install python2 > on your host to run it. I uploaded the python3 version here if anyone needs it: https://gist.githubusercontent.com/jameshilliard/e09235dfc6f96c11418a134e6ebf7890/raw/135b7480c405ae8a77a9db615e495f9a9f2d3242/zynq-boot-bin.py > > -- > Luca From fontaine.fabrice at gmail.com Tue Jan 11 22:24:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 23:24:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: fix typo in comment Message-ID: <20220111222428.2711661-1-fontaine.fabrice@gmail.com> Fix typo in comment added by commit ea033cecf990ed3f86619647523a9ad2ccb09adb Signed-off-by: Fabrice Fontaine --- package/riscv-isa-sim/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host index 35e404caf0..4ccf6e9546 100644 --- a/package/riscv-isa-sim/Config.in.host +++ b/package/riscv-isa-sim/Config.in.host @@ -1,6 +1,6 @@ config BR2_PACKAGE_HOST_RISCV_ISA_SIM bool "host riscv-isa-sim" - depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++1 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 help Spike, the RISC-V ISA Simulator, implements a functional model of one or more RISC-V harts. -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 11 22:41:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 23:41:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/snappy: bump to version 1.1.9 Message-ID: <20220111224156.2800195-1-fontaine.fabrice@gmail.com> - Disable benchmarks through option added by https://github.com/google/snappy/commit/4ebd8b2f23dd4ab67ca695256a128cd796d39ce6 - Update indentation in hash file (two spaces) https://github.com/google/snappy/releases/tag/1.1.9 Signed-off-by: Fabrice Fontaine --- ...-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch | 71 +++++++++++++++++++ package/snappy/snappy.hash | 4 +- package/snappy/snappy.mk | 4 +- 3 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch diff --git a/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch new file mode 100644 index 0000000000..bd2ef07794 --- /dev/null +++ b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch @@ -0,0 +1,71 @@ +From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001 +From: "Georgi D. Sotirov" +Date: Wed, 5 May 2021 14:16:46 +0300 +Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE + +Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to +fix the following compilation errors and a warning with GCC: + +[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o +/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS +-I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 +-march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 +-DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c +/tmp/snappy-1.1.9/snappy.cc +/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline +function might not be inlinable [-Wattributes] + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair snappy::DecompressBranchless(const uint8_t*, const +uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned +char; ptrdiff_t = int]': +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +CMakeFiles/snappy.dir/build.make:137: recipe for target +'CMakeFiles/snappy.dir/snappy.cc.o' failed + +Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE +macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ +inline specifier. + +[Retrieved from: +https://github.com/google/snappy/pull/128/commits/0c716d435abe65250100c2caea0e5126ac4e14bd] +Signed-off-by: Fabrice Fontaine +--- + snappy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snappy.cc b/snappy.cc +index 79dc0e8d..51157be2 100644 +--- a/snappy.cc ++++ b/snappy.cc +@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { + } + + SNAPPY_ATTRIBUTE_ALWAYS_INLINE +-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { ++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + const uint8_t*& ip = *ip_p; + // This section is crucial for the throughput of the decompression loop. + // The latency of an iteration is fundamentally constrained by the diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index c08c5b7fe4..b49b0e7e3b 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f snappy-1.1.8.tar.gz -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING +sha256 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 snappy-1.1.9.tar.gz +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index e1fa28fbce..d31dcdd5fe 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,12 +4,12 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.8 +SNAPPY_VERSION = 1.1.9 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING SNAPPY_CPE_ID_VENDOR = google SNAPPY_INSTALL_STAGING = YES -SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_TESTS=OFF +SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_BENCHMARKS=OFF -DSNAPPY_BUILD_TESTS=OFF $(eval $(cmake-package)) -- 2.34.1 From grant.b.edwards at gmail.com Tue Jan 11 22:57:32 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Tue, 11 Jan 2022 22:57:32 -0000 (UTC) Subject: [Buildroot] Diagnosing conflicts due to new Python version References: <20220111211018.4d236002@windsurf> Message-ID: On 2022-01-11, Thomas Petazzoni wrote: > I am confused by your e-mail. It seems to be a Gentoo question, but > you sent it to the Buildroot mailing list. Doh! That message was indeed intended for the gentoo mailing list. Sorry about that. [I was wondering why it hadn't showed up on that list.] -- Grant From grant.b.edwards at gmail.com Tue Jan 11 22:57:32 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Tue, 11 Jan 2022 22:57:32 -0000 (UTC) Subject: [Buildroot] Diagnosing conflicts due to new Python version References: <20220111211018.4d236002@windsurf> Message-ID: On 2022-01-11, Thomas Petazzoni wrote: > I am confused by your e-mail. It seems to be a Gentoo question, but > you sent it to the Buildroot mailing list. Doh! That message was indeed intended for the gentoo mailing list. Sorry about that. [I was wondering why it hadn't showed up on that list.] -- Grant From yann.morin.1998 at free.fr Tue Jan 11 23:30:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 00:30:06 +0100 Subject: [Buildroot] [git commit] support/testing/tests/package/test_libshdata: new test Message-ID: <20220111232835.8DE2383508@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af5b1ec68bf0af0af61de6b58e3c64d632a9a1e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This new test ensures that libraries and binaries generated using Parrot Alchemy build system are correct. Indeed, the test uses libshdata-stress. This binary depends on libshdata. libshdata depends on libfutils and libfutils depends on ulog. All of these binaries and libraries are built using Alchemy. Signed-off-by: Herve Codina Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + support/testing/tests/package/test_libshdata.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b5be1d6352..c0bfde69da 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1204,6 +1204,7 @@ F: package/php-pam/ F: package/php-pecl-dbus/ F: package/ulog/ F: support/testing/tests/package/test_dtbocfg.py +F: support/testing/tests/package/test_libshdata.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py F: support/testing/tests/package/test_php_lua.py diff --git a/support/testing/tests/package/test_libshdata.py b/support/testing/tests/package/test_libshdata.py new file mode 100644 index 0000000000..80b032ac69 --- /dev/null +++ b/support/testing/tests/package/test_libshdata.py @@ -0,0 +1,25 @@ +import os + +import infra.basetest + + +class TestLibshdata(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LIBSHDATA=y + BR2_PACKAGE_LIBSHDATA_STRESS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", img]) + self.emulator.login() + + # Just run libshdata-stress. + # This ensures that library are well compiled and that all dependencies + # are met using Parrot Alchemy build system. + self.assertRunOk("libshdata-stress") From yann.morin.1998 at free.fr Tue Jan 11 23:25:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 00:25:05 +0100 Subject: [Buildroot] [git commit] package/ulog: new package Message-ID: <20220111232835.6C4C883508@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e88d6570f18748111e3ec81a3121e3e0376a277 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The ulog library is a minimalistic logging library derived from Android logger. https://github.com/Parrot-Developers/ulog Signed-off-by: Herve Codina [yann.morin.1998 at free.fr: - do not macro-ify headers install - do not parameterise static libs install dest - reordr macros decaration and use - implicit module name - BUILD_CMDS fit on a single line ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/ulog/Config.in | 12 ++++++++++++ package/ulog/ulog.hash | 3 +++ package/ulog/ulog.mk | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 33b9c1cd73..563f6df3ff 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1200,6 +1200,7 @@ F: package/php-apcu/ F: package/php-lua/ F: package/php-pam/ F: package/php-pecl-dbus/ +F: package/ulog/ F: support/testing/tests/package/test_dtbocfg.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..39a98fcc66 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1738,6 +1738,7 @@ menu "Logging" source "package/log4qt/Config.in" source "package/opentracing-cpp/Config.in" source "package/spdlog/Config.in" + source "package/ulog/Config.in" source "package/zlog/Config.in" endmenu diff --git a/package/ulog/Config.in b/package/ulog/Config.in new file mode 100644 index 0000000000..ef155005c2 --- /dev/null +++ b/package/ulog/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_ULOG + bool "ulog" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + help + This is a minimalistic logging library derived from + Android logger. + + https://github.com/Parrot-Developers/ulog + +comment "ulog needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ulog/ulog.hash b/package/ulog/ulog.hash new file mode 100644 index 0000000000..47adc093b9 --- /dev/null +++ b/package/ulog/ulog.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 14e5773b32a79fa5380bdc7ac73a39a7cd3ab182830f57cf6f2994fb49cf38dc ulog-0389d243352255f6182326dccdae3d56dadc078f.tar.gz +sha256 cbb97dd2528af2aa2b9aee6c1b3ff1caed758044c17b2c811cf44b2528c496da COPYING diff --git a/package/ulog/ulog.mk b/package/ulog/ulog.mk new file mode 100644 index 0000000000..8e8b1aa1c1 --- /dev/null +++ b/package/ulog/ulog.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# ulog +# +################################################################################ + +ULOG_VERSION = 0389d243352255f6182326dccdae3d56dadc078f +ULOG_SITE = $(call github,Parrot-Developers,ulog,$(ULOG_VERSION)) +ULOG_LICENSE = Apache-2.0 +ULOG_LICENSE_FILES = COPYING +ULOG_DEPENDENCIES = host-alchemy +ULOG_INSTALL_STAGING = YES + +define ULOG_BUILD_CMDS + $(ALCHEMY_TARGET_ENV) $(ALCHEMY_MAKE) libulog +endef + +ifeq ($(BR2_SHARED_LIBS),) +define ULOG_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.a \ + $(STAGING_DIR)/usr/lib/libulog.a +endef +endif + +ifeq ($(BR2_STATIC_LIBS),) +# $(1): destination directory: target or staging +define ULOG_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.so* \ + $(1)/usr/lib/ +endef +endif + +define ULOG_INSTALL_TARGET_CMDS + $(call ULOG_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +define ULOG_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/ + $(INSTALL) -m 644 $(@D)/libulog/include/* $(STAGING_DIR)/usr/include/ + $(ULOG_INSTALL_STATIC_LIBS) + $(call ULOG_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libulog, libulog.so) +endef + +$(eval $(generic-package)) From yann.morin.1998 at free.fr Tue Jan 11 23:29:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 00:29:54 +0100 Subject: [Buildroot] [git commit] package/libshdata: new package Message-ID: <20220111232835.84BDC82650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1e8f787e97e4576509143d5c65f02bdf4ffcea4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The libshdata library provides lock free shared-memory tools. https://github.com/Parrot-Developers/libshdata libshdata-stress utility does not compile using static libs only (BR2_STATIC_LIBS=y). The issue was raised upstream: https://github.com/Parrot-Developers/libshdata/issues/2 For now, libshdata-stress simply depends on !BR2_STATIC_LIBS. Signed-off-by: Herve Codina [yann.morin.1998 at free.fr: - do not macro-ify headers install - do not parameterise static libs install dest - do not parameterise binaries install dest - reorder macros decaration and use - remove spurious comma between module dependencies - implicit module name ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-backend-Add-missing-include-files.patch | 47 +++++++++++++++ ...ples-stress_test-Fix-build-with-musl-libc.patch | 37 ++++++++++++ package/libshdata/Config.in | 30 ++++++++++ package/libshdata/libshdata.hash | 3 + package/libshdata/libshdata.mk | 68 ++++++++++++++++++++++ 7 files changed, 187 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e0385c7b81..b5be1d6352 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1195,6 +1195,7 @@ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ F: package/libfutils/ +F: package/libshdata/ F: package/lua-augeas/ F: package/modsecurity2/ F: package/php-apcu/ diff --git a/package/Config.in b/package/Config.in index 163fd53e12..59297c3f3d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2008,6 +2008,7 @@ menu "Other" source "package/libpwquality/Config.in" source "package/libqb/Config.in" source "package/libseccomp/Config.in" + source "package/libshdata/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" source "package/libspatialindex/Config.in" diff --git a/package/libshdata/0001-backend-Add-missing-include-files.patch b/package/libshdata/0001-backend-Add-missing-include-files.patch new file mode 100644 index 0000000000..78c9e669c3 --- /dev/null +++ b/package/libshdata/0001-backend-Add-missing-include-files.patch @@ -0,0 +1,47 @@ +From 3eaf11bd957555674f5993435ef79dd4717ce890 Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Tue, 26 Oct 2021 08:45:10 +0200 +Subject: [PATCH] backend: Add missing include files + +With some libc library (musl), shd_dev_mem.c and shd_shm.c do not +compile. Indeed, open() needs (Cf. man open). + +This patch fixes the compilation issue adding this +include file. + +This patch was submitted upstream. +https://github.com/Parrot-Developers/libshdata/issues/1 + +Signed-off-by: Herve Codina +--- + src/backend/shd_dev_mem.c | 1 + + src/backend/shd_shm.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/backend/shd_dev_mem.c b/src/backend/shd_dev_mem.c +index 14573c1..a65f052 100644 +--- a/src/backend/shd_dev_mem.c ++++ b/src/backend/shd_dev_mem.c +@@ -33,6 +33,7 @@ + #include + #include + #include /* For ftruncate */ ++#include /* For open */ + #include /* for flock */ + #include /* For shm and PROT flags */ + #include +diff --git a/src/backend/shd_shm.c b/src/backend/shd_shm.c +index 117bf01..1e5a38c 100644 +--- a/src/backend/shd_shm.c ++++ b/src/backend/shd_shm.c +@@ -35,6 +35,7 @@ + #include + #include + #include /* For ftruncate */ ++#include /* For open */ + #include /* For NAME_MAX macro */ + #include /* for flock */ + #include /* For shm and PROT flags */ +-- +2.31.1 + diff --git a/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch b/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..c2a8e5f240 --- /dev/null +++ b/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch @@ -0,0 +1,37 @@ +From ddded7337812a2797d31f276624da98932d8e17f Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Sun, 9 Jan 2022 14:59:27 +0100 +Subject: [PATCH] examples/stress_test: Fix build with musl libc + +The musl C library uses sched_priority instead of +__sched_priority as GNU libc and uClibc do. +Use sched_priority instead. + +This does not break compilation with GNU libc and uClibc +because they both define in sched.h: + #define sched_priority __sched_priority + +This patch was submitted upstream. +https://github.com/Parrot-Developers/libshdata/issues/3 + +Signed-off-by: Herve Codina +--- + examples/stress_test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/stress_test.c b/examples/stress_test.c +index a859115..cfb5418 100644 +--- a/examples/stress_test.c ++++ b/examples/stress_test.c +@@ -617,7 +617,7 @@ static void launch_test(int timer_fd, struct test_setup *setup) + if (ret < 0) + ULOGI("Error setting the timer : %s", strerror(errno)); + struct sched_param sched_params; +- sched_params.__sched_priority = sched_get_priority_max(SCHED_RR); ++ sched_params.sched_priority = sched_get_priority_max(SCHED_RR); + + pid_t pid = fork(); + +-- +2.33.1 + diff --git a/package/libshdata/Config.in b/package/libshdata/Config.in new file mode 100644 index 0000000000..b2c24c94c5 --- /dev/null +++ b/package/libshdata/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_LIBSHDATA + bool "libshdata" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC # libfutils + depends on BR2_INSTALL_LIBSTDCPP # libfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # libfutils + select BR2_PACKAGE_LIBFUTILS + select BR2_PACKAGE_ULOG + help + This library provides lock free shared-memory tools + + https://github.com/Parrot-Developers/libshdata + +if BR2_PACKAGE_LIBSHDATA + +config BR2_PACKAGE_LIBSHDATA_STRESS + bool "libshdata-stress binary" + depends on !BR2_STATIC_LIBS + help + Install libshdata-stress binary as well + +comment "libshdata-stress needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +endif + +comment "libshdata needs a toolchain w/ C++, threads" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libshdata/libshdata.hash b/package/libshdata/libshdata.hash new file mode 100644 index 0000000000..880404cf52 --- /dev/null +++ b/package/libshdata/libshdata.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 1ae83ac73c2b5b17c726067737b8d446b99f190e16fe6198eb464368796ecce3 libshdata-d9ec4bdba834d8f3daf6bf9aa6da374bc462961f.tar.gz +sha256 eca11a1c62fae8d64a1247d93271375baecff8396141d7ff8d89671ee7e3ed0d COPYING diff --git a/package/libshdata/libshdata.mk b/package/libshdata/libshdata.mk new file mode 100644 index 0000000000..2e600359c1 --- /dev/null +++ b/package/libshdata/libshdata.mk @@ -0,0 +1,68 @@ +################################################################################ +# +# libshdata +# +################################################################################ + +LIBSHDATA_VERSION = d9ec4bdba834d8f3daf6bf9aa6da374bc462961f +LIBSHDATA_SITE = $(call github,Parrot-Developers,libshdata,$(LIBSHDATA_VERSION)) +LIBSHDATA_LICENSE = BSD-3-Clause +LIBSHDATA_LICENSE_FILES = COPYING +LIBSHDATA_DEPENDENCIES = libfutils ulog host-alchemy +LIBSHDATA_INSTALL_STAGING = YES + +LIBSHDATA_TARGETS = libshdata +ifeq ($(BR2_PACKAGE_LIBSHDATA_STRESS),y) +LIBSHDATA_TARGETS += libshdata-stress +endif + +LIBSHDATA_TARGET_ENV = \ + $(ALCHEMY_TARGET_ENV) \ + ALCHEMY_TARGET_SDK_DIRS="$(ALCHEMY_SDK_BASEDIR)/libfutils $(ALCHEMY_SDK_BASEDIR)/ulog" + +define LIBSHDATA_BUILD_CMDS + $(LIBSHDATA_TARGET_ENV) $(ALCHEMY_MAKE) $(LIBSHDATA_TARGETS) +endef + +ifeq ($(BR2_SHARED_LIBS),) +define LIBSHDATA_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata.a \ + $(STAGING_DIR)/usr/lib/libshdata.a +endef +endif + +ifeq ($(BR2_STATIC_LIBS),) +# $(1): destination directory: target or staging +define LIBSHDATA_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata.so* \ + $(1)/usr/lib/ +endef +endif + +ifeq ($(BR2_PACKAGE_LIBSHDATA_STRESS),y) +define LIBSHDATA_INSTALL_BIN + $(INSTALL) -D -m 755 $(@D)/alchemy-out/staging/usr/bin/libshdata-stress \ + $(TARGET_DIR)/usr/bin/libshdata-stress +endef +endif + +define LIBSHDATA_INSTALL_TARGET_CMDS + $(LIBSHDATA_INSTALL_BIN) + $(call LIBSHDATA_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +# Even in dynamic libraries only, libshdata-section-lookup is only built as +# a static lib (include $(BUILD_STATIC_LIBRARY) in atom.mk) and it is needed +# for libshdata usage. +define LIBSHDATA_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/ + $(INSTALL) -m 644 $(@D)/include/* $(STAGING_DIR)/usr/include/ + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata-section-lookup.a \ + $(STAGING_DIR)/usr/lib/libshdata-section-lookup.a + $(LIBSHDATA_INSTALL_STATIC_LIBS) + $(call LIBSHDATA_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libshdata, libshdata.so, libfutils libulog) +endef + +$(eval $(generic-package)) From yann.morin.1998 at free.fr Tue Jan 11 22:39:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 23:39:37 +0100 Subject: [Buildroot] [git commit] package/alchemy: new host package Message-ID: <20220111232835.60E3582650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f1f3f87868fa333833dbba9f4f07adc338b34ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Alchemy is a build system developed by Parrot. It is a new build system based on the one used in Android. A central makefile instance scans a workspace to find user makefiles, includes them and register modules to be built. https://github.com/Parrot-Developers/alchemy Signed-off-by: Herve Codina [yann.morin.1998 at free.fr: implicit package name with $($(PKG)_NAME)] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + ...1-toolchains-remove-hash-style-management.patch | 36 +++++++++++ package/alchemy/alchemy.hash | 4 ++ package/alchemy/alchemy.mk | 70 ++++++++++++++++++++++ package/alchemy/atom.mk.in | 8 +++ 5 files changed, 119 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bcc54bd11b..33b9c1cd73 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1190,6 +1190,7 @@ F: package/netopeer2/ F: package/sysrepo/ N: Herv?? Codina +F: package/alchemy/ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ diff --git a/package/alchemy/0001-toolchains-remove-hash-style-management.patch b/package/alchemy/0001-toolchains-remove-hash-style-management.patch new file mode 100644 index 0000000000..522766b977 --- /dev/null +++ b/package/alchemy/0001-toolchains-remove-hash-style-management.patch @@ -0,0 +1,36 @@ +From 4cb9681ab99db3d8e330ac789e17ec69583aecd4 Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Thu, 28 Oct 2021 18:39:18 +0200 +Subject: [PATCH] toolchains: remove --hash-style management + +Using an external toolchain, with an external configuration given +using TARGET_GLOBAL_XXXX variables, having '--hash-style=both' +in Alchemy toolchains can lead to compilation failure. + +This patch simply removes all --hash-style settings. + +Signed-off-by: Herve Codina +--- + toolchains/linux/eglibc/flags.mk | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/toolchains/linux/eglibc/flags.mk b/toolchains/linux/eglibc/flags.mk +index 95c0a46..4474729 100644 +--- a/toolchains/linux/eglibc/flags.mk ++++ b/toolchains/linux/eglibc/flags.mk +@@ -11,11 +11,4 @@ TARGET_GLOBAL_LDLIBS += -pthread -lrt + TARGET_GLOBAL_CFLAGS += -funwind-tables + + # Enable link optimization for binutils's ld. +-# gnu hash not supported by mips ABI +-ifeq ("$(TARGET_ARCH)","mips") +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-else ifeq ("$(TARGET_ARCH)","mips64") +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-else +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1,--hash-style=both +-endif ++TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-- +2.31.1 + diff --git a/package/alchemy/alchemy.hash b/package/alchemy/alchemy.hash new file mode 100644 index 0000000000..33895263cc --- /dev/null +++ b/package/alchemy/alchemy.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 346c06b9317691a9371d878b850e61f8bcec4f20132ac95340b9d2571be25ee8 alchemy-d95b3c38cd37814a1b98d0bbf813de7adaaecfbc.tar.gz +sha256 542f44eecd9f8806ec1ae285201e442ab547c82d9f8c70e44c977d6332a2bea0 COPYING +sha256 49872815ee3de163f07a83737c996e77a5bffa186d06b1e3bb969bfb68c251df README diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk new file mode 100644 index 0000000000..18cdd0a645 --- /dev/null +++ b/package/alchemy/alchemy.mk @@ -0,0 +1,70 @@ +################################################################################ +# +# alchemy +# +################################################################################ + +ALCHEMY_VERSION = d95b3c38cd37814a1b98d0bbf813de7adaaecfbc +ALCHEMY_SITE = $(call github,Parrot-Developers,alchemy,$(ALCHEMY_VERSION)) +ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) +ALCHEMY_LICENSE_FILES = COPYING README +HOST_ALCHEMY_DEPENDENCIES = host-python3 + +ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy +ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk + +define HOST_ALCHEMY_INSTALL_CMDS + mkdir -p $(ALCHEMY_HOME) + cp -rf $(@D)/* $(ALCHEMY_HOME) + cp $(HOST_ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOME)/atom.mk.in +endef + +$(eval $(host-generic-package)) + +# Variables used by other packages + +ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake + +# TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture. +# When Alchemy manages the architecture, it can add some flags to CFGLAGS and +# can lead to incorrect result with the toolchain provided in TARGET_CROSS. +# 'xxx' is an unknown architecture for Alchemy. Using this value is a simple +# way to disable the Alchemy architecture management. +ALCHEMY_TARGET_ENV = \ + $(TARGET_MAKE_ENV) \ + ALCHEMY_HOME=$(ALCHEMY_HOME) \ + ALCHEMY_WORKSPACE_DIR="$(@D)" \ + ALCHEMY_TARGET_OUT=alchemy-out \ + TARGET_OS=linux \ + TARGET_OS_FLAVOUR=buildroot \ + TARGET_CROSS="$(TARGET_CROSS)" \ + TARGET_ARCH=xxx \ + TARGET_GLOBAL_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + TARGET_GLOBAL_LDFLAGS="$(TARGET_LDFLAGS)" \ + TARGET_GLOBAL_FFLAGS="$(TARGET_FCFLAGS)" \ + TARGET_GLOBAL_FCFLAGS="$(TARGET_FCFLAGS)" + +ifeq ($(BR2_STATIC_LIBS),y) +ALCHEMY_TARGET_ENV += \ + TARGET_FORCE_STATIC=1 \ + TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS)" +else +ALCHEMY_TARGET_ENV += \ + TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS) -fPIC" +endif + +# Install an Alchemy SDK file. +# This macro can be used by Alchemy packages +# $1: Alchemy module name +# $2: Alchemy module file name +# $3: Alchemy module libraries this module depends on +define ALCHEMY_INSTALL_LIB_SDK_FILE + $(INSTALL) -m 0644 -D \ + $(ALCHEMY_HOME)/atom.mk.in \ + $(ALCHEMY_SDK_BASEDIR)/$($(PKG)_NAME)/atom.mk + $(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \ + -e 's#@MODULE@#$(strip $(1))#' \ + -e 's#@MODULE_FILENAME@#$(strip $(2))#' \ + -e 's#@LIBRARIES@#$(strip $(3))#' \ + $(ALCHEMY_SDK_BASEDIR)/$($(PKG)_NAME)/atom.mk +endef diff --git a/package/alchemy/atom.mk.in b/package/alchemy/atom.mk.in new file mode 100644 index 0000000000..084ae0e89f --- /dev/null +++ b/package/alchemy/atom.mk.in @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE := @MODULE@ +LOCAL_SDK := @STAGING_DIR@ +LOCAL_DESTDIR := usr/lib +LOCAL_MODULE_FILENAME := @MODULE_FILENAME@ +LOCAL_LIBRARIES := @LIBRARIES@ +include $(BUILD_LIBRARY) From yann.morin.1998 at free.fr Tue Jan 11 23:27:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 00:27:39 +0100 Subject: [Buildroot] [git commit] package/libfutils: new package Message-ID: <20220111232835.78D4E83509@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef5d311a84a71e52e4163c3df7277bd70286fca4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The libfutils library is a library that contains some common useful functions (list, hash, time). https://github.com/Parrot-Developers/libfutils Signed-off-by: Herve Codina [yann.morin.1998 at free.fr: - do not macro-ify headers install - do not parameterise static libs install dest - reorder macros decaration and use - implicit module name - BUILD_CMDS fit on a single line - LIBFUTILS_TARGET_ENV is all env, not just extra env - add missing mkdir in shared-libs case ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/libfutils/Config.in | 15 +++++++++++ package/libfutils/libfutils.hash | 3 +++ package/libfutils/libfutils.mk | 56 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 563f6df3ff..e0385c7b81 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1194,6 +1194,7 @@ F: package/alchemy/ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ +F: package/libfutils/ F: package/lua-augeas/ F: package/modsecurity2/ F: package/php-apcu/ diff --git a/package/Config.in b/package/Config.in index 39a98fcc66..163fd53e12 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1986,6 +1986,7 @@ menu "Other" source "package/libevent/Config.in" source "package/libexecinfo/Config.in" source "package/libffi/Config.in" + source "package/libfutils/Config.in" source "package/libgee/Config.in" source "package/libgeos/Config.in" source "package/libglib2/Config.in" diff --git a/package/libfutils/Config.in b/package/libfutils/Config.in new file mode 100644 index 0000000000..7f795fc7e0 --- /dev/null +++ b/package/libfutils/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBFUTILS + bool "libfutils" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP # ulog + depends on BR2_TOOLCHAIN_HAS_THREADS # ulog + select BR2_PACKAGE_ULOG + help + This library contains some common useful functions (list, + hash, time) + + https://github.com/Parrot-Developers/libfutils + +comment "libfutils needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_ATOMIC diff --git a/package/libfutils/libfutils.hash b/package/libfutils/libfutils.hash new file mode 100644 index 0000000000..1fdcd84b13 --- /dev/null +++ b/package/libfutils/libfutils.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 b38d40c46b83e448d8c1716ddfb04b7ecd384f5cd2cb773db5c26c0589accdb3 libfutils-c326ce0cc2a7354381265a7664bb215be587fac6.tar.gz +sha256 eca11a1c62fae8d64a1247d93271375baecff8396141d7ff8d89671ee7e3ed0d COPYING diff --git a/package/libfutils/libfutils.mk b/package/libfutils/libfutils.mk new file mode 100644 index 0000000000..84b53cca3c --- /dev/null +++ b/package/libfutils/libfutils.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# libfutils +# +################################################################################ + +LIBFUTILS_VERSION = c326ce0cc2a7354381265a7664bb215be587fac6 +LIBFUTILS_SITE = $(call github,Parrot-Developers,libfutils,$(LIBFUTILS_VERSION)) +LIBFUTILS_LICENSE = BSD-3-Clause +LIBFUTILS_LICENSE_FILES = COPYING +LIBFUTILS_DEPENDENCIES = host-alchemy ulog +LIBFUTILS_INSTALL_STAGING = YES + +LIBFUTILS_TARGET_ENV = \ + $(ALCHEMY_TARGET_ENV) \ + ALCHEMY_TARGET_SDK_DIRS="$(ALCHEMY_SDK_BASEDIR)/ulog" + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBFUTILS_TARGET_ENV += TARGET_GLOBAL_LDLIBS='-latomic' +endif + +define LIBFUTILS_BUILD_CMDS + $(LIBFUTILS_TARGET_ENV) $(ALCHEMY_MAKE) libfutils +endef + +ifeq ($(BR2_STATIC_LIBS),) +# $(1): destination directory: target or staging +define LIBFUTILS_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libfutils.so* \ + $(1)/usr/lib/ +endef +endif + +ifeq ($(BR2_SHARED_LIBS),) +define LIBFUTILS_INSTALL_STATIC_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libfutils.a \ + $(STAGING_DIR)/usr/lib/libfutils.a +endef +endif + +define LIBFUTILS_INSTALL_TARGET_CMDS + $(call LIBFUTILS_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +define LIBFUTILS_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/futils + $(INSTALL) -m 644 $(@D)/include/futils/* \ + $(STAGING_DIR)/usr/include/futils/ + $(LIBFUTILS_INSTALL_STATIC_LIBS) + $(call LIBFUTILS_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libfutils, libfutils.so, libulog) +endef + +$(eval $(generic-package)) From james.hilliard1 at gmail.com Wed Jan 12 01:25:37 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 11 Jan 2022 18:25:37 -0700 Subject: [Buildroot] [PATCH 1/1] package/gobject-introspection: bump to version 1.70.0 Message-ID: <20220112012537.1362197-1-james.hilliard1@gmail.com> Rebase patches. Backport a patch to fix a build error on latest meson. giscanner/scannerlexer.l license hash change due to add float types: https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/60b0cf2fc2fdc74d13832d1fdde21cfdc813b84e Signed-off-by: James Hilliard --- .../0001-disable-tests.patch | 10 +- .../0002-Add-rpath-links-to-ccompiler.patch | 6 +- ...error-return-codes-from-ldd-wrapper.patch} | 7 +- ...04-build-Avoid-the-doctemplates-hack.patch | 221 ++++++++++++++++++ .../gobject-introspection.hash | 6 +- .../gobject-introspection.mk | 2 +- 6 files changed, 238 insertions(+), 14 deletions(-) rename package/gobject-introspection/{0003-ignore-error-return-codes-from-ldd-wrapper.patch => 0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch} (90%) create mode 100644 package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index 01b11998bd..ed2d9d6fc0 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -1,4 +1,4 @@ -From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001 +From c87faf380ddf44da9d624dabd28178c9065f0f76 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 3 Feb 2020 10:07:15 -0800 Subject: [PATCH] disable tests @@ -13,22 +13,22 @@ Signed-off-by: Adam Duskett 1 file changed, 6 deletions(-) diff --git a/meson.build b/meson.build -index eed4d6b..5058664 100644 +index c2cb577f..65ce7adf 100644 --- a/meson.build +++ b/meson.build -@@ -222,12 +222,6 @@ if get_option('build_introspection_data') == true +@@ -225,12 +225,6 @@ else endif subdir('docs') -# The tests will also run, which is not possible if they -# were built for a different architecture. -if not meson.is_cross_build() -- subdir('tests') +- subdir('tests') -endif - install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) -- -2.24.1 +2.25.1 diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch index 9b9ae99779..e21da42ce7 100644 --- a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch +++ b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch @@ -1,4 +1,4 @@ -From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001 +From 952e2e2bb6a22ec8824223b03b65cb28361c6e34 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 14 Mar 2018 12:07:10 -0400 Subject: [PATCH] Add rpath links to ccompiler @@ -12,7 +12,7 @@ Signed-off-by: Adam Duskett 1 file changed, 2 insertions(+) diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index a8bd5b1..51bb9bc 100644 +index cb97e76f..d29b28c8 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -231,6 +231,8 @@ class CCompiler(object): @@ -25,5 +25,5 @@ index a8bd5b1..51bb9bc 100644 os.pathsep.join(runtime_paths + [os.environ[envvar]]) else: -- -2.14.3 +2.25.1 diff --git a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch similarity index 90% rename from package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch rename to package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch index d43dc1393e..f1ea518954 100644 --- a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch +++ b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch @@ -1,4 +1,4 @@ -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 +From e0fc4a2a5161a36483ddc518be9bb14390f11b19 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 5 Sep 2018 16:46:52 +0200 Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper @@ -14,7 +14,7 @@ Signed-off-by: Adam Duskett 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index d67df95..80352a6 100644 +index 9f8ab5df..7a1a72fe 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries): @@ -26,3 +26,6 @@ index d67df95..80352a6 100644 if isinstance(output, bytes): output = output.decode("utf-8", "replace") +-- +2.25.1 + diff --git a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch new file mode 100644 index 0000000000..0b70b5c4c0 --- /dev/null +++ b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch @@ -0,0 +1,221 @@ +From 0504b26ec2adb13dfdff51679d84ad2f69af5918 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:51:10 +0000 +Subject: [PATCH] build: Avoid the doctemplates hack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The hack that copies the doctemplates directory into the build +directory has stopped working with newer versions of Meson; while it's +possible to copy files, custom_target() cannot depend on a directory. +Additionally, the dependency has always been broken. + +Instead, we enumerate the template files?after all, it's not like they +change a lot?and then we list them as dependencies for the test targets. + +Fixes: #414 + +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +effb1e09dee263cdac4ec593e8caf316e6f01fe2] +--- + giscanner/doctemplates/devdocs/meson.build | 19 +++++++ + giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ + giscanner/meson.build | 14 ++--- + tests/scanner/meson.build | 24 +++++---- + 4 files changed, 98 insertions(+), 22 deletions(-) + create mode 100644 giscanner/doctemplates/devdocs/meson.build + create mode 100644 giscanner/doctemplates/mallard/meson.build + +diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build +new file mode 100644 +index 00000000..2037182a +--- /dev/null ++++ b/giscanner/doctemplates/devdocs/meson.build +@@ -0,0 +1,19 @@ ++doc_templates += files([ ++ 'Gjs/_doc.tmpl', ++ 'Gjs/_index.tmpl', ++ 'Gjs/_method.tmpl', ++ 'Gjs/_methods.tmpl', ++ 'Gjs/_properties.tmpl', ++ 'Gjs/_signals.tmpl', ++ 'Gjs/_staticmethods.tmpl', ++ 'Gjs/_vfuncs.tmpl', ++ 'Gjs/base.tmpl', ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++]) +diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build +new file mode 100644 +index 00000000..5fe4e2af +--- /dev/null ++++ b/giscanner/doctemplates/mallard/meson.build +@@ -0,0 +1,63 @@ ++base_templates = files([ ++ 'base.tmpl', ++ 'class.tmpl', ++ 'namespace.tmpl', ++]) ++ ++c_templates = files([ ++ 'C/callback.tmpl', ++ 'C/class.tmpl', ++ 'C/constructor.tmpl', ++ 'C/default.tmpl', ++ 'C/enum.tmpl', ++ 'C/field.tmpl', ++ 'C/function.tmpl', ++ 'C/interface.tmpl', ++ 'C/method.tmpl', ++ 'C/namespace.tmpl', ++ 'C/property.tmpl', ++ 'C/record.tmpl', ++ 'C/signal.tmpl', ++ 'C/vfunc.tmpl', ++]) ++ ++gjs_templates = files([ ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/constructor.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/field.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++ 'Gjs/property.tmpl', ++ 'Gjs/record.tmpl', ++ 'Gjs/signal.tmpl', ++ 'Gjs/vfunc.tmpl', ++]) ++ ++py_templates = files([ ++ 'Python/callback.tmpl', ++ 'Python/class.tmpl', ++ 'Python/constructor.tmpl', ++ 'Python/default.tmpl', ++ 'Python/enum.tmpl', ++ 'Python/field.tmpl', ++ 'Python/function.tmpl', ++ 'Python/interface.tmpl', ++ 'Python/method.tmpl', ++ 'Python/namespace.tmpl', ++ 'Python/property.tmpl', ++ 'Python/record.tmpl', ++ 'Python/signal.tmpl', ++ 'Python/vfunc.tmpl', ++]) ++ ++doc_templates += [ ++ base_templates, ++ c_templates, ++ gjs_templates, ++ py_templates, ++] +diff --git a/giscanner/meson.build b/giscanner/meson.build +index 41edcd44..3d7dc678 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', + + install_subdir('doctemplates', install_dir: giscannerdir) + +-# XXX: this doesn't track the input, but there is nothing to copy many files +-# in meson. +-doc_templates = custom_target('copy-templates', +- input : 'doctemplates', +- output : 'doctemplates', +- command : [ +- python, '-c', +- 'import sys, shutil;' + +- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + +- 'shutil.copytree(sys.argv[1], sys.argv[2])', +- '@INPUT@', '@OUTPUT@']) ++doc_templates = [] ++subdir('doctemplates/devdocs') ++subdir('doctemplates/mallard') + + flex = find_program('flex', 'win_flex') + bison = find_program('bison', 'win_bison') +diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build +index 5176b957..b81b3fd5 100644 +--- a/tests/scanner/meson.build ++++ b/tests/scanner/meson.build +@@ -525,19 +525,26 @@ foreach gir : test_girs + endforeach + + if has_girdoctool and glib_dep.type_name() == 'pkgconfig' ++ doctool_env = environment() ++ doctool_env.set('srcdir', meson.current_source_dir()) ++ doctool_env.set('builddir', meson.current_build_dir()) ++ + foreach language : ['C', 'Python', 'Gjs'] + regress_docs = custom_target( + 'generate-docs-' + language, + input: regress_gir, +- depends: [doc_templates], ++ depend_files: doc_templates, + build_by_default: not cairo_deps_found, ++ env: doctool_env, + output: 'Regress-1.0-' + language, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), + '--add-include-path=' + meson.current_build_dir(), + '--language', language, +- '@INPUT@', '-o', '@OUTPUT@'], ++ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), ++ '@INPUT@', '-o', '@OUTPUT@', ++ ], + ) + + if cairo_deps_found +@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-' + language], + depends: [regress_docs], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endforeach +@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + regress_sections = custom_target( + 'generate-docs-sections', + input: regress_gir, +- depends: [doc_templates], ++ depend_files: [doc_templates], + build_by_default: not cairo_deps_found, + output: 'Regress-1.0-sections.txt', ++ env: doctool_env, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), +@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-sections.txt'], + depends: [regress_sections], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endif +-- +2.25.1 + diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index e859ba1d3b..5b76df6b40 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.sha256sum -sha256 d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 gobject-introspection-1.68.0.tar.xz +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.sha256sum +sha256 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a gobject-introspection-1.70.0.tar.xz sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad35e98ae9342a3539c36f2171e84d175394ddcff625887290c751302cb02983 giscanner/scannerlexer.l +sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 6a3d321cc7..41d64171a7 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.68 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.70 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz -- 2.25.1 From yann.morin.1998 at free.fr Wed Jan 12 06:43:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 07:43:16 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: fix typo in comment Message-ID: <20220112063713.1B60C82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=280ad2e3d3b85bca5a45e8ff365445fe3f111d4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix typo in comment added by commit ea033cecf990ed3f86619647523a9ad2ccb09adb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/riscv-isa-sim/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host index 35e404caf0..4ccf6e9546 100644 --- a/package/riscv-isa-sim/Config.in.host +++ b/package/riscv-isa-sim/Config.in.host @@ -1,6 +1,6 @@ config BR2_PACKAGE_HOST_RISCV_ISA_SIM bool "host riscv-isa-sim" - depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++1 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 help Spike, the RISC-V ISA Simulator, implements a functional model of one or more RISC-V harts. From yann.morin.1998 at free.fr Wed Jan 12 06:47:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 07:47:50 +0100 Subject: [Buildroot] [git commit] package/nodejs: fix host dependencies Message-ID: <20220112064136.B90CD82582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1bbe25437f3120a26067e6f08e4258510f644a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit 78d7c5f803c2f59385b57525e2d1d09da15e22a6: WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU Depends on [n]: (BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS [=n] || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n]) && BR2_HOST_GCC_AT_LEAST_8 [=y] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Depends on [n]: BR2_PACKAGE_HOST_QEMU [=y] && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU Depends on [n]: (BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS [=n] || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n]) && BR2_HOST_GCC_AT_LEAST_8 [=y] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Depends on [n]: BR2_PACKAGE_HOST_QEMU [=y] && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] Fixes: - http://autobuild.buildroot.org/results/d78f660ca4a609a0a072b3f2e04d456bf8cf663f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nodejs/Config.in.host | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 86eaf21dac..4ceaf0c73e 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_NODEJS bool "host nodejs" - depends on BR2_HOST_GCC_AT_LEAST_7 + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_8 select BR2_PACKAGE_HOST_PYTHON3 select BR2_PACKAGE_HOST_PYTHON3_BZIP2 select BR2_PACKAGE_HOST_PYTHON3_SSL @@ -11,3 +12,7 @@ config BR2_PACKAGE_HOST_NODEJS V8. http://nodejs.org/ + +comment "host nodejs needs a host gcc >= 8" + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_8 From thomas.petazzoni at bootlin.com Wed Jan 12 07:09:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 07:09:52 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-11 Message-ID: <20220112070957.64A2D4054B@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-11 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 67 | 9 | 0 | 76 | 2021.11.x | 26 | 9 | 0 | 35 | master | 78 | 70 | 0 | 148 | Classification of failures by reason for master ----------------------------------------------- drbd-utils-9.19.0 | 9 unknown | 6 ksmbd-tools-3.4.3 | 4 python-pyparsing-3.0.6 | 4 refpolicy-2.20220106 | 4 bluez5_utils-5.63 | 3 frr-8.1 | 3 gstreamer1-mm-1.10.0 | 3 libglvnd-1.3.2 | 3 rygel-0.40.2 | 3 vtun-3.0.4 | 3 cryptopp-8.6.0 | 2 package/tinifier/tinifier.m... | 2 qt5base-5.15.2 | 2 samba4-4.15.3 | 2 tinifier-legal-info | 2 vlc-3.0.16 | 2 wavemon-0.9.4 | 2 bat-0.18.3 | 1 btrfs-progs-5.15.1 | 1 cryptsetup-2.4.2 | 1 guile-3.0.7 | 1 host-go-1.17.6 | 1 host-qemu-6.2.0 | 1 libsecret-0.20.4 | 1 linux-pam-1.5.2 | 1 mbedtls-2.28.0 | 1 mesa3d-21.3.3 | 1 tinyalsa-2.0.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/15a9cf2aa8430a4bebd8158e927c281546cb65c9 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b50d796c443371c14792b81e9c3e032bd859fc2b | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/fb8aa5c0705596cebb058b2c8045926dfa70a249 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1b5af409c76708a4a92280f2f09cae0a620f934d | i586 | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/eed8a4b3043dfd851710206c7d8053213f8b6600 | ORPH arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/dd8a0c44a60733d8cbe503a2aadbc2ab90658e7c | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/3b9bc115d4b9b93033fd84d4780a811fe9514f0a | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/888ba0afbd0da0b791e39773eb192319e4e65eac | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/ca008268443235d3f2db19e97bab7f57d576d2ed | or1k | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/33d873317031b09dfcd626cc9745c3565919cb2a | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/24cd2d2b494e215990c94bdb053e6bcefc3ac723 | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/68005d98331f60b567f4ae396af48cd4d562d051 | powerpc64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/ab70984a2f3fc01b028ab27371e7ca7001a6e312 | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/5cb46f3472da8fa51cfc7a82cf77064f5143a062 | riscv64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/bf3b2067d1eb48287aec6d7cd44da3bf11a93aad | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/5e0c47e5c0ab1bfc9874dcfe48313da69789de0a | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/3172057672e33315ceb36732ba9ac59d79a86a48 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b709eec5b78ffa60d9d81e98e2e25cd3234978a4 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9fefef4acf1c3f43544c164b2ee1611e9148d47f | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a9f32f9a09f31e5aed6e2deba1c624b2eb074abf | arm | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/15beae9ce27e5778bd00a4cc77096394583c5f0d | ORPH sparc | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/2c6ee2af3b4cd125b4ffab3bdecc5be22a1fb84c | ORPH microblazeel | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/3479688334765fbbe4cb9620f4d3596f7d710404 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/82a1eb9b63ab62d4cb1a6beae662fcaf1849f950 | ORPH mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/0a509b6ea5b96380f54769b6a82a218669082a89 | arc | host-qemu-6.2.0 | NOK | http://autobuild.buildroot.net/results/d78f660ca4a609a0a072b3f2e04d456bf8cf663f | i586 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/ee8cf10252470ba3ca18eeb7806d4572ddc3e300 | aarch64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/845e3286a8c74ffe909430e6c35fc0e57fe6deee | mipsel | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/56dfc95f1409c9bd738a55d8195cb4a76d988d77 | mips | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/d3fe227349f6f609651e645bb52a62cdc6d98a69 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/c15a522e0696103638a0059860a33d5c29f98c15 | ORPH arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/c5e92f0b355c91cdcebe0070499889473996f337 | ORPH arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/d4cab434d75e3e32d116e040d626704a039618e8 | ORPH arm | libsecret-0.20.4 | NOK | http://autobuild.buildroot.net/results/165b12da9c7f24dada875686fb70b395024db008 | ORPH xtensa | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/ce74a0b093a0e4745877175444cd4d7a7727eadd | ORPH arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/94498587c121bdfa7d92552f994502766c8f664b | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/0e79790f4d97f4dd91311c4798be17dbe195f745 | i586 | package/tinifier/tinifier.m... | NOK | http://autobuild.buildroot.net/results/6e79e832d6e0752aac39127d731021899b750d1b | arm | package/tinifier/tinifier.m... | NOK | http://autobuild.buildroot.net/results/7d25a2f37a9c9fe2b52da92756653dfd715576a9 | xtensa | python-pyparsing-3.0.6 | NOK | http://autobuild.buildroot.net/results/7f3cadaf55eb05e1bcc8035ebb95e1318f1cb61e | xtensa | python-pyparsing-3.0.6 | NOK | http://autobuild.buildroot.net/results/8ac5224f4b6c2c59035dbfb53541e76f58b15e47 | xtensa | python-pyparsing-3.0.6 | NOK | http://autobuild.buildroot.net/results/1112d9fb6f822f797dad5ca95a6ab60ae9d52146 | mipsel | python-pyparsing-3.0.6 | NOK | http://autobuild.buildroot.net/results/86107109b574a5640ee591e9b578e014b4093785 | riscv64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/8edd742299ef151bb0c247483821666ff4c647a0 | arm | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/87bbab66b99e3cb69aabb86bbb86602a8f53fb8f | s390x | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/d262c9c49afb5fb502fe4a0bd03cf8e09bb9b12d | sh4 | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/b069e816d290459f6ccd4e397b9102a692f4264b | sparc64 | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/a926e27bcd4a3dc416436dcfc3925cbb46e722a4 | sparc | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/d76c128e73beb2d7f6eafdd415bd7016810c41e7 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a1148517ab0a5b7df108869b7f0f5266fcbae52d | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6a0ba5394dd8ae893435aa804f3647b9e6941ea2 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7cad4263866c9566cf592fea2f00ad4a9b0976fb | arc | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/60f435a9b24e0b4907766287c42f1ca6d0574681 | riscv64 | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/5403db8ae628a54c03191b54c16d9fb28e85937d | x86_64 | tinifier-legal-info | NOK | http://autobuild.buildroot.net/results/02260de5d46506e75b9edc682d2d0361a545125c | powerpc64le | tinifier-legal-info | NOK | http://autobuild.buildroot.net/results/5fce7f16daca17216d786391ea0fffff856c5404 | arm | tinyalsa-2.0.0 | NOK | http://autobuild.buildroot.net/results/14f5860a67d54eda2c492b1ba273a52d481c2a7a | ORPH powerpc | unknown | NOK | http://autobuild.buildroot.net/results/b9901e1bce6c69f57013647527cc128d024ff193 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/df276776863b58d5ded93bf934512944305c4a06 | i586 | unknown | NOK | http://autobuild.buildroot.net/results/1ad5951bf63fe4f2b5c09b10a4931df1dd79c4e2 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/736b119603a7939e96327245e0d3d7c1b950d141 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/e2de9096dc52e242b6684c20aad548aeb77a8bd7 | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/a122834187fc7a3b8bb7d5cf2c6cae9c7ba837bc | mips | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/756e1403005de8edce4130234774ab2399fbcbb6 | nios2 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/6f6d72e1f927031c76f87291c68895125a46024c | nios2 | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/fd48559118993d5f86141f0b3a2c548c42912ece | ORPH riscv64 | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/d62427d04dd468265e2981a57eb708394653a02e | ORPH arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/12417b4769fa29094837f76fca2e5e7c4ba0c4b3 | ORPH s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/4e1cb1fb9b09aa374463aed4ff0c6b355fe6a79d | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/67c03ff8555b892bd89a54eb4ccad47b0b6badcc | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 4 gstreamer1-mm-1.10.0 | 1 host-meson-tools-0a02e2d344... | 1 mesa3d-20.3.5 | 1 monkey-f54856ce250c4e257354... | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/e86de759cfb0b1c73afd84eb050fe5c5ee1ab50c | ORPH arc | host-meson-tools-0a02e2d344... | NOK | http://autobuild.buildroot.net/results/bb2bb006c3c6d3c83902d90be2b1363f9cd590fa | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/82b6df5a1b01489249e306e72305fe4a55787b96 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/8c56ea9f82b536179f3443d507cf057b23126f11 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e7b7d1698bfe494dfcd8c9421f5112a20a04fd84 | arc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/d36384e0fb1fa6c57bd774b186831b6de15e47d6 | sh4 | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/2bf60016ecdb68e549911b6e712ffc91ea61d293 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/312c5aa2809f5d0e43c679a54fa247c140cf0e89 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/f24096094fdebd2951fca67dc057ba78039a6f87 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 4 azmq-1.0.2 | 1 bird-2.0.8 | 1 nodejs-14.18.1 | 1 pipewire-0.3.39 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | azmq-1.0.2 | NOK | http://autobuild.buildroot.net/results/811cf7fe70ab39e8f9408d3ad7803cbcb20de76b | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/3cf8a099bcc8f6ec3e93b288342a95847bcc1424 | aarch64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/a282914cedc659f3d5cad38fac0da02dbac1458d | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/7594eb3a733380be8703b7a243e7a26c1090fedb | riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/70c3c80c346aa723600a2b2ef7af6a7525917a2d | powerpc | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/59bdb605f108641300cf5cf4a72acb16fb46b9b0 | arm | nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/1fcaf3c2f3c37e9cd578054ac84eaaa35be21df3 | mips | pipewire-0.3.39 | NOK | http://autobuild.buildroot.net/results/d3dbca9b909a8cfef9a8d56abe4bc7c2c7dbc9e4 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/52d98e1cec9c4ac71c9c35c2b6e22babd17c8147 | Gitlab CI results for 2022-01-11 ================================ -- http://autobuild.buildroot.net From clg at kaod.org Wed Jan 12 07:07:40 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Wed, 12 Jan 2022 08:07:40 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration In-Reply-To: <20220111214509.79c5c88e@windsurf> References: <20220110210235.817082-1-clg@kaod.org> <20220111214509.79c5c88e@windsurf> Message-ID: <09709dad-59ac-23b6-e3f0-3ec3457c7a14@kaod.org> Hello Thomas, > Thanks, entire patch series applied. One small change was done: add > appropriate entries to the DEVELOPERS file, so that we know who to > contact for those defconfigs :-) Especially if our Gitlab CI > infrastructure detects build issues, you will be notified. sure. I have a generated set here : https://github.com/legoater/qemu-ppc-boot/tree/main/buildroot that I use for non regression on QEMU PPC. > Since you are a PowerPC expert, I'd like to take this opportunity to > ask you about the toolchains we're providing at > https://toolchains.bootlin.com/. For the moment for PowerPC, we are > providing the following toolchains: > > powerpc-440fp, not tested The bamboo machine uses a 440EP CPU implementation, which has a floating point unit. > powerpc64-e5500, tested with qemu_ppc64_e5500_defconfig > powerpc64-e6500, not tested e6500 is nearly the same CPU as e5500. AFAIK, the main differences are altivec instructions and more HV support for guest translations. More info here : https://www.linux-kvm.org/page/E500_virtual_CPU_specification > powerpc64le-power8, tested with qemu_ppc64le_pseries_defconfig > powerpc64-power8, tested with qemu_ppc64_pseries_defconfig > powerpc-e300c3, not tested > powerpc-e500mc, not tested you could use the 32bit ppce500 machine for that. > I suppose I could now test the powerpc-440fp toolchain with the > qemu_ppc_bamboo_defconfig you have added. Is that correct? yes. > What about the other toolchain configurations? Is there some matching > Qemu emulation?> > And generally speaking, does this selection of PowerPC architecture > variants make sense to offer pre-compiled toolchains? For quite a Here is a quick status of machine/CPUs that QEMU implements : * prep prep: 604 CPU (we might remove 601-603 CPUs) * embedded ref405ep: 405EP (user space segfaults but same image works on 44x CPUs I hope to get that one fixed by QEMU 7.0 ) bambo: 440FP sam460ex: 460EP is very much like the 440fp * Mac g3beige: G3 (or 75x CPU) family mac99: G4 (7400 7410 7441 7447 7448 7450 7451 7455 7457) family * book3e 32bit: ppce500: e500mc mpc8544ds: mpc8544 * book3e 64bit: ppce500 (KVM): e5500, e6500 * book3s 64bit (para virtualized and baremetal): mac99: PPC970 pseries (BE only): PPC970, PPC970mp, POWER5+ pseries (LE, BE and KVM) : POWER7, POWER8, POWER9, POWER10 powernv: POWER8, POWER9, POWER10 Most of the attention is on book3s 64bit CPUs. MAC emulation is well maintained. Embedded world is not. > while, we've had requests for other PowerPC variants: > https://github.com/bootlin/toolchains-builder/issues/2. Your input > would be very welcome :-) OK. I will take a look. Thanks, C. From thomas.petazzoni at bootlin.com Wed Jan 12 08:10:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 09:10:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 In-Reply-To: <20220110211323.1828141-1-james.hilliard1@gmail.com> References: <20220110211323.1828141-1-james.hilliard1@gmail.com> Message-ID: <20220112091058.76318df8@windsurf> Hello James, On Mon, 10 Jan 2022 14:13:23 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) I am wondering if this update hasn't broken some meson packages: * polkit http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f/build-end.log ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. * host-gobject-introspection http://autobuild.buildroot.net/results/95e/95e4a23c16f6bd96566dc497663f38a0858c5a6e/build-end.log ../output-1/build/host-gobject-introspection-1.68.0/giscanner/meson.build:51:0: ERROR: File doctemplates does not exist. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 08:14:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 09:14:22 +0100 Subject: [Buildroot] [PATCH] skeleton + init: prepare /run/lock and adjust compat symlinks In-Reply-To: <20201004224137.193808-1-nolange79@gmail.com> References: <20201004224137.193808-1-nolange79@gmail.com> Message-ID: <20220112091422.1cd29c1f@windsurf> Hello Norbert, On Mon, 5 Oct 2020 00:41:36 +0200 Norbert Lange wrote: > Linux distros changed /var/run and /var/lock to reside on an tmpfs in > /run a long time ago, and buildroot seems to agree by providing this > tmpfs on all supported init systems. I am not 100% sure but it seems like this patch has potentially broken the build of vtun, which now fails with: /usr/bin/install: cannot create directory '/home/giuliobenetti/autobuild/run/instance-0/output-1/target/var/lock': File exists If you look at http://autobuild.buildroot.net/?reason=vtun%, vtun version 3.0.4 restarted failing to build on January 10, with this error. Could you have a look ? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From nolange79 at gmail.com Wed Jan 12 08:53:44 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 12 Jan 2022 09:53:44 +0100 Subject: [Buildroot] [PATCH] skeleton + init: prepare /run/lock and adjust compat symlinks In-Reply-To: <20220112091422.1cd29c1f@windsurf> References: <20201004224137.193808-1-nolange79@gmail.com> <20220112091422.1cd29c1f@windsurf> Message-ID: Thomas Petazzoni schrieb am Mi., 12. Jan. 2022, 09:14: > Hello Norbert, > > On Mon, 5 Oct 2020 00:41:36 +0200 > Norbert Lange wrote: > > > Linux distros changed /var/run and /var/lock to reside on an tmpfs in > > /run a long time ago, and buildroot seems to agree by providing this > > tmpfs on all supported init systems. > > I am not 100% sure but it seems like this patch has potentially broken > the build of vtun, which now fails with: > > /usr/bin/install: cannot create directory > '/home/giuliobenetti/autobuild/run/instance-0/output-1/target/var/lock': > File exists > > If you look at http://autobuild.buildroot.net/?reason=vtun%, vtun > version 3.0.4 restarted failing to build on January 10, with this error. > > Could you have a look ? > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Seems like the issue is, that run/lock is not existing when installing. Anything installed there will be gone (already before this commit), so it's kinda pointless to do so. I don't know how many packages have this issue, imho it would be better to fix them instead of making a run/lock directory for broken packages (that will get removed later) Norbert -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Jan 12 09:11:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 02:11:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 In-Reply-To: <20220112091058.76318df8@windsurf> References: <20220110211323.1828141-1-james.hilliard1@gmail.com> <20220112091058.76318df8@windsurf> Message-ID: On Wed, Jan 12, 2022 at 1:11 AM Thomas Petazzoni wrote: > > Hello James, > > On Mon, 10 Jan 2022 14:13:23 -0700 > James Hilliard wrote: > > > Signed-off-by: James Hilliard > > --- > > package/meson/meson.hash | 4 ++-- > > package/meson/meson.mk | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > I am wondering if this update hasn't broken some meson packages: > > * polkit > http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f/build-end.log > > ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. > > * host-gobject-introspection > http://autobuild.buildroot.net/results/95e/95e4a23c16f6bd96566dc497663f38a0858c5a6e/build-end.log > > ../output-1/build/host-gobject-introspection-1.68.0/giscanner/meson.build:51:0: ERROR: File doctemplates does not exist. That one should be fixed by this update: https://patchwork.ozlabs.org/project/buildroot/patch/20220112012537.1362197-1-james.hilliard1 at gmail.com/ > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From sebastien.szymanski at armadeus.com Wed Jan 12 09:42:50 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Wed, 12 Jan 2022 10:42:50 +0100 Subject: [Buildroot] [PATCH 3/3] package/gstreamer1/gst1-imx2: new package In-Reply-To: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> Message-ID: <20220112094250.27022-3-sebastien.szymanski@armadeus.com> This is version 2 of gst1-imx. Signed-off-by: S?bastien Szymanski --- package/gstreamer1/Config.in | 1 + package/gstreamer1/gst1-imx2/Config.in | 75 +++++++++++++++++++++ package/gstreamer1/gst1-imx2/gst1-imx2.hash | 3 + package/gstreamer1/gst1-imx2/gst1-imx2.mk | 75 +++++++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 package/gstreamer1/gst1-imx2/Config.in create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.hash create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.mk diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index 8fe8a34395..436c76379d 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -9,6 +9,7 @@ source "package/gstreamer1/gst1-plugins-bad/Config.in" source "package/gstreamer1/gst1-plugins-ugly/Config.in" source "package/gstreamer1/gst1-devtools/Config.in" source "package/gstreamer1/gst1-imx/Config.in" +source "package/gstreamer1/gst1-imx2/Config.in" source "package/gstreamer1/gst1-interpipe/Config.in" source "package/gstreamer1/gst1-libav/Config.in" source "package/gstreamer1/gst1-python/Config.in" diff --git a/package/gstreamer1/gst1-imx2/Config.in b/package/gstreamer1/gst1-imx2/Config.in new file mode 100644 index 0000000000..b95e6bdb21 --- /dev/null +++ b/package/gstreamer1/gst1-imx2/Config.in @@ -0,0 +1,75 @@ +menuconfig BR2_PACKAGE_GST1_IMX2 + bool "gst1-imx2" + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX + depends on BR2_PACKAGE_LIBIMXDMABUFFER + select BR2_PACKAGE_GST1_PLUGINS_BASE + help + This is a set of GStreamer 1.0 plugins for plugins for + Freescale's i.MX platforms, which make use of the i.MX + multimedia capabilities. + + https://github.com/Freescale/gstreamer-imx + +if BR2_PACKAGE_GST1_IMX2 + +config BR2_PACKAGE_GST1_IMX2_G2D + bool "imxg2d" + depends on BR2_PACKAGE_IMX_GPU_G2D + help + Elements leveraging the 2D GPU + +comment "imxg2d needs the G2D libraries" + depends on !BR2_PACKAGE_IMX_GPU_G2D + +config BR2_PACKAGE_GST1_IMX2_IPU + bool "imxipu" + depends on BR2_LINUX_KERNEL + help + Elements leveraging the IPU + +comment "imxipu needs an imx-specific Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_GST1_IMX2_MP3ENCODER + bool "mp3encoder" + depends on BR2_PACKAGE_IMX_CODEC + help + Elements for MP3 encoding + +comment "mp3encoder needs the i.MX codec binaries" + depends on !BR2_PACKAGE_IMX_CODEC + +config BR2_PACKAGE_GST1_IMX2_PXP + bool "imxpxp" + depends on BR2_LINUX_KERNEL + help + Elements leveraging the PXP + +comment "imxpxp needs an imx-specific Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_GST1_IMX2_UNIAUDIODEC + bool "uniaudiodec" + depends on BR2_PACKAGE_IMX_CODEC + help + Elements for audio decoding + +comment "uniaudiodec needs the i.MX codec binaries" + depends on !BR2_PACKAGE_IMX_CODEC + +config BR2_PACKAGE_GST1_IMX2_VPU + bool "imxvpu" + depends on BR2_PACKAGE_LIBIMXVPUAPI2 + help + Elements leveraging the VPU + +comment "imxvpu needs the VPU imxvpuapi2 library" + depends on !BR2_PACKAGE_LIBIMXVPUAPI2 + +config BR2_PACKAGE_GST1_IMX2_V4L2 + bool "imxv4l2" + select BR2_PACKAGE_GST1_PLUGINS_BAD + help + Elements for V4L2 capture and output + +endif diff --git a/package/gstreamer1/gst1-imx2/gst1-imx2.hash b/package/gstreamer1/gst1-imx2/gst1-imx2.hash new file mode 100644 index 0000000000..cc0734fd52 --- /dev/null +++ b/package/gstreamer1/gst1-imx2/gst1-imx2.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 57c0e05b3d57f90df8a16760f4373e04ed60c3a7fab7844c00392f67f889d196 gst1-imx2-9a200b1551c4531234f9b6437eac2c42a07334b0.tar.gz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE diff --git a/package/gstreamer1/gst1-imx2/gst1-imx2.mk b/package/gstreamer1/gst1-imx2/gst1-imx2.mk new file mode 100644 index 0000000000..f71aeae4f6 --- /dev/null +++ b/package/gstreamer1/gst1-imx2/gst1-imx2.mk @@ -0,0 +1,75 @@ +################################################################################ +# +# gst1-imx2 +# +################################################################################ + +GST1_IMX2_VERSION = 9a200b1551c4531234f9b6437eac2c42a07334b0 +GST1_IMX2_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX2_VERSION)) +GST1_IMX2_LICENSE = LGPL-2.0+ +GST1_IMX2_LICENSE_FILES = LICENSE +GST1_IMX2_INSTALL_STAGING = YES + +GST1_IMX2_DEPENDENCIES = \ + host-pkgconf \ + gstreamer1 \ + gst1-plugins-base \ + libimxdmabuffer + +GST1_IMX2_CONF_OPTS = -Dsysroot=$(STAGING_DIR) + +ifeq ($(BR2_LINUX_KERNEL),y) +# IPU and PXP need access to imx-specific kernel headers +GST1_IMX2_DEPENDENCIES += linux +endif + +ifeq ($(BR2_PACKAGE_IMX_CODEC),y) +GST1_IMX2_DEPENDENCIES += imx-codec +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_G2D),y) +GST1_IMX2_CONF_OPTS += -Dg2d=enabled +GST1_IMX2_DEPENDENCIES += imx-gpu-g2d +else +GST1_IMX2_CONF_OPTS += -Dg2d=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_IPU),y) +GST1_IMX2_CONF_OPTS += -Dipu=enabled +else +GST1_IMX2_CONF_OPTS += -Dipu=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_MP3ENCODER),y) +GST1_IMX2_CONF_OPTS += -Dmp3encoder=enabled +else +GST1_IMX2_CONF_OPTS += -Dmp3encoder=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_PXP),y) +GST1_IMX2_CONF_OPTS += -Dpxp=enabled +else +GST1_IMX2_CONF_OPTS += -Dpxp=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_UNIAUDIODEC),y) +GST1_IMX2_CONF_OPTS += -Duniaudiodec=enabled +else +GST1_IMX2_CONF_OPTS += -Duniaudiodec=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_VPU),y) +GST1_IMX2_DEPENDENCIES += libimxvpuapi2 +GST1_IMX2_CONF_OPTS += -Dvpu=enabled +else +GST1_IMX2_CONF_OPTS += -Dvpu=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_V4L2),y) +GST1_IMX2_DEPENDENCIES += gst1-plugins-bad +GST1_IMX2_CONF_OPTS += -Dv4l2=true +else +GST1_IMX2_CONF_OPTS += -Dv4l2=false +endif + +$(eval $(meson-package)) -- 2.34.1 From james.hilliard1 at gmail.com Wed Jan 12 09:47:31 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 02:47:31 -0700 Subject: [Buildroot] [PATCH 1/1] package/polkit: fix build on meson 0.61.0 Message-ID: <20220112094731.2117910-1-james.hilliard1@gmail.com> Backport a patch removing invalid positional arguments: ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. Fixes: - http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f Signed-off-by: James Hilliard --- ...tional-parameters-to-i18n.merge_file.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch diff --git a/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch new file mode 100644 index 0000000000..25fa4ef19b --- /dev/null +++ b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch @@ -0,0 +1,45 @@ +From 30c368a6b729bc8a0a9d0d023739c4fa07b0928b Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 25 Oct 2021 20:21:27 +0100 +Subject: [PATCH] Don't pass positional parameters to i18n.merge_file + +These were always ignored, and Meson 0.60.0 disallowed them. + +Resolves: https://gitlab.freedesktop.org/polkit/polkit/-/issues/160 +Reference: https://github.com/mesonbuild/meson/pull/9445 +Signed-off-by: Simon McVittie +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99] +--- + actions/meson.build | 1 - + src/examples/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/actions/meson.build b/actions/meson.build +index 2abaaf3..1e3f370 100644 +--- a/actions/meson.build ++++ b/actions/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +diff --git a/src/examples/meson.build b/src/examples/meson.build +index c6305ab..8c18de5 100644 +--- a/src/examples/meson.build ++++ b/src/examples/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.examples.pkexec.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +2.25.1 + -- 2.25.1 From james.hilliard1 at gmail.com Wed Jan 12 09:48:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 02:48:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 In-Reply-To: <20220112091058.76318df8@windsurf> References: <20220110211323.1828141-1-james.hilliard1@gmail.com> <20220112091058.76318df8@windsurf> Message-ID: On Wed, Jan 12, 2022 at 1:11 AM Thomas Petazzoni wrote: > > Hello James, > > On Mon, 10 Jan 2022 14:13:23 -0700 > James Hilliard wrote: > > > Signed-off-by: James Hilliard > > --- > > package/meson/meson.hash | 4 ++-- > > package/meson/meson.mk | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > I am wondering if this update hasn't broken some meson packages: > > * polkit > http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f/build-end.log > > ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. Yeah, this should fix that bug: https://patchwork.ozlabs.org/project/buildroot/patch/20220112094731.2117910-1-james.hilliard1 at gmail.com/ > > * host-gobject-introspection > http://autobuild.buildroot.net/results/95e/95e4a23c16f6bd96566dc497663f38a0858c5a6e/build-end.log > > ../output-1/build/host-gobject-introspection-1.68.0/giscanner/meson.build:51:0: ERROR: File doctemplates does not exist. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From sebastien.szymanski at armadeus.com Wed Jan 12 09:42:49 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Wed, 12 Jan 2022 10:42:49 +0100 Subject: [Buildroot] [PATCH 2/3] package/libimxvpuapi2: new package In-Reply-To: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> Message-ID: <20220112094250.27022-2-sebastien.szymanski@armadeus.com> This is version 2 of libimxvpuapi. The API has been rewritten, and is incompatible with the older one. Currently, the following platforms are supported (listed with their VPUs): * i.MX6 (Chips&Media CODA960 codec) * i.MX8m (Hantro G1/G2 decoder, no encoder) * i.MX8mm (Hantro G1/G2 decoder, Hantro H1 encoder) Signed-off-by: S?bastien Szymanski --- package/Config.in | 1 + package/libimxvpuapi2/Config.in | 48 ++++++++++++++++++++++++ package/libimxvpuapi2/libimxvpuapi2.hash | 3 ++ package/libimxvpuapi2/libimxvpuapi2.mk | 28 ++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 package/libimxvpuapi2/Config.in create mode 100644 package/libimxvpuapi2/libimxvpuapi2.hash create mode 100644 package/libimxvpuapi2/libimxvpuapi2.mk diff --git a/package/Config.in b/package/Config.in index 8d844aa11e..009d2006f0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1763,6 +1763,7 @@ menu "Multimedia" source "package/libebml/Config.in" source "package/libhdhomerun/Config.in" source "package/libimxvpuapi/Config.in" + source "package/libimxvpuapi2/Config.in" source "package/libmatroska/Config.in" source "package/libmms/Config.in" source "package/libmpeg2/Config.in" diff --git a/package/libimxvpuapi2/Config.in b/package/libimxvpuapi2/Config.in new file mode 100644 index 0000000000..0954718cc0 --- /dev/null +++ b/package/libimxvpuapi2/Config.in @@ -0,0 +1,48 @@ +comment "libimxvpuapi2 needs an i.MX platform with VPU support and libimxdmabuffer" + depends on BR2_arm || BR2_aarch64 + depends on (!BR2_PACKAGE_FREESCALE_IMX_HAS_VPU \ + && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO) \ + || !BR2_PACKAGE_LIBIMXDMABUFFER + +config BR2_PACKAGE_LIBIMXVPUAPI2 + bool "libimxvpuapi2" + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU || BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO + depends on BR2_PACKAGE_LIBIMXDMABUFFER + select BR2_PACKAGE_IMX_VPU if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + select BR2_PACKAGE_IMX_VPU_HANTRO if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO + help + This library provides an API for using hardware video codecs + on i.MX platforms. The API abstracts away platform specific + details and allows for using the same code with different + hardware video codecs on different i.MX platforms. + + This is version 2 of libimxvpuapi. The API has been rewritten, + and is incompatible with the older one. + + https://github.com/Freescale/libimxvpuapi + +if BR2_PACKAGE_LIBIMXVPUAPI2 +choice + prompt "Platform" + +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 + bool "i.MX6 (Coda)" + depends on BR2_PACKAGE_IMX_VPU + +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M + bool "i.MX8M (Hantro)" + depends on BR2_PACKAGE_IMX_VPU_HANTRO + +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM + bool "i.MX8MM (Hantro)" + depends on BR2_PACKAGE_IMX_VPU_HANTRO +endchoice + +config BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM + string + default "imx6" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 + default "imx8m" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M + default "imx8mm" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM + +endif diff --git a/package/libimxvpuapi2/libimxvpuapi2.hash b/package/libimxvpuapi2/libimxvpuapi2.hash new file mode 100644 index 0000000000..d26cf8767b --- /dev/null +++ b/package/libimxvpuapi2/libimxvpuapi2.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 611a5176e37e5132d97817e6d6048acf229f67efd2201e3f4aab6f720e7b67d1 libimxvpuapi2-2.2.0.tar.gz +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE diff --git a/package/libimxvpuapi2/libimxvpuapi2.mk b/package/libimxvpuapi2/libimxvpuapi2.mk new file mode 100644 index 0000000000..6957171ad3 --- /dev/null +++ b/package/libimxvpuapi2/libimxvpuapi2.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# libimxvpuapi2 +# +################################################################################ + +LIBIMXVPUAPI2_VERSION = 2.2.0 +LIBIMXVPUAPI2_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI2_VERSION)) +LIBIMXVPUAPI2_LICENSE = LGPL-2.1+ +LIBIMXVPUAPI2_LICENSE_FILES = LICENSE +LIBIMXVPUAPI2_DEPENDENCIES = host-pkgconf host-python3 libimxdmabuffer +LIBIMXVPUAPI2_INSTALL_STAGING = YES +LIBIMXVPUAPI2_NEEDS_EXTERNAL_WAF = NO + +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX6),y) +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu +endif + +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M)$(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM),y) +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu-hantro +endif + +LIBIMXVPUAPI2_CONF_OPTS += \ + --imx-headers=$(STAGING_DIR)/usr/include/ \ + --sysroot-path=$(STAGING_DIR) \ + --imx-platform=$(BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM) + +$(eval $(waf-package)) -- 2.34.1 From nolange79 at gmail.com Wed Jan 12 10:10:20 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 12 Jan 2022 11:10:20 +0100 Subject: [Buildroot] [PATCH] system/skeleton: provide run/lock directory Message-ID: <20220112101021.456463-1-nolange79@gmail.com> We changed the skeletons in bf01e51f3c, so that var/lock points to run/lock. This resulted in build failures as some packages want to work with these paths. - Create run/lock, the run directory will be purged later anyway (since 5e78e7e97d). - for init == systemd, create the var/lock symlink early to prevent packages creating this path as directory. Signed-off-by: Norbert Lange --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 2 ++ system/skeleton/run/{ => lock}/.empty | 0 2 files changed, 2 insertions(+) rename system/skeleton/run/{ => lock}/.empty (100%) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 1e212cc2f7..795a171809 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,8 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + # prevent install scripts to create var/lock as directory + ln -s ../run/lock $(TARGET_DIR)/var/lock install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef diff --git a/system/skeleton/run/.empty b/system/skeleton/run/lock/.empty similarity index 100% rename from system/skeleton/run/.empty rename to system/skeleton/run/lock/.empty -- 2.34.1 From nolange79 at gmail.com Wed Jan 12 10:19:18 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 12 Jan 2022 11:19:18 +0100 Subject: [Buildroot] [PATCH] system/skeleton: provide run/lock directory In-Reply-To: <20220112101021.456463-1-nolange79@gmail.com> References: <20220112101021.456463-1-nolange79@gmail.com> Message-ID: Am Mi., 12. Jan. 2022 um 11:10 Uhr schrieb Norbert Lange : > > We changed the skeletons in bf01e51f3c, so that var/lock > points to run/lock. This resulted in build failures as > some packages want to work with these paths. > > - Create run/lock, the run directory will be purged > later anyway (since 5e78e7e97d). > - for init == systemd, create the var/lock symlink early > to prevent packages creating this path as directory. > > Signed-off-by: Norbert Lange > --- > package/skeleton-init-systemd/skeleton-init-systemd.mk | 2 ++ > system/skeleton/run/{ => lock}/.empty | 0 > 2 files changed, 2 insertions(+) > rename system/skeleton/run/{ => lock}/.empty (100%) > > diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk > index 1e212cc2f7..795a171809 100644 > --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk > +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk > @@ -62,6 +62,8 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS > mkdir -p $(TARGET_DIR)/srv > mkdir -p $(TARGET_DIR)/var > ln -s ../run $(TARGET_DIR)/var/run > + # prevent install scripts to create var/lock as directory > + ln -s ../run/lock $(TARGET_DIR)/var/lock > install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf > $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) > endef > diff --git a/system/skeleton/run/.empty b/system/skeleton/run/lock/.empty > similarity index 100% > rename from system/skeleton/run/.empty > rename to system/skeleton/run/lock/.empty > -- > 2.34.1 > Fixes: http://autobuild.buildroot.net/results/3ee/3ee8f9ee55e51af38e9dbe7b9840c9589d88a30f (and alot more containing the vtun package) For someone not fluent with mailing list workflows, and working with a couple projects, it might help having a few example commit messages (-templates) in the docs. ie for respins, bug fixes, versioning (potentially of series) Norbert From baruch at tkos.co.il Wed Jan 12 10:31:58 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Wed, 12 Jan 2022 12:31:58 +0200 Subject: [Buildroot] [PATCH 2/3] package/libimxvpuapi2: new package In-Reply-To: <20220112094250.27022-2-sebastien.szymanski@armadeus.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> <20220112094250.27022-2-sebastien.szymanski@armadeus.com> Message-ID: <87bl0hw8ek.fsf@tarshish> Hi S?bastien, On Wed, Jan 12 2022, S?bastien Szymanski wrote: > This is version 2 of libimxvpuapi. > The API has been rewritten, and is incompatible with the older one. > Currently, the following platforms are supported (listed with their VPUs): > * i.MX6 (Chips&Media CODA960 codec) > * i.MX8m (Hantro G1/G2 decoder, no encoder) > * i.MX8mm (Hantro G1/G2 decoder, Hantro H1 encoder) Is there patch 1/3 in this series? I didn't show up in the list. Thanks, baruch > > Signed-off-by: S?bastien Szymanski > --- > package/Config.in | 1 + > package/libimxvpuapi2/Config.in | 48 ++++++++++++++++++++++++ > package/libimxvpuapi2/libimxvpuapi2.hash | 3 ++ > package/libimxvpuapi2/libimxvpuapi2.mk | 28 ++++++++++++++ > 4 files changed, 80 insertions(+) > create mode 100644 package/libimxvpuapi2/Config.in > create mode 100644 package/libimxvpuapi2/libimxvpuapi2.hash > create mode 100644 package/libimxvpuapi2/libimxvpuapi2.mk > > diff --git a/package/Config.in b/package/Config.in > index 8d844aa11e..009d2006f0 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1763,6 +1763,7 @@ menu "Multimedia" > source "package/libebml/Config.in" > source "package/libhdhomerun/Config.in" > source "package/libimxvpuapi/Config.in" > + source "package/libimxvpuapi2/Config.in" > source "package/libmatroska/Config.in" > source "package/libmms/Config.in" > source "package/libmpeg2/Config.in" > diff --git a/package/libimxvpuapi2/Config.in b/package/libimxvpuapi2/Config.in > new file mode 100644 > index 0000000000..0954718cc0 > --- /dev/null > +++ b/package/libimxvpuapi2/Config.in > @@ -0,0 +1,48 @@ > +comment "libimxvpuapi2 needs an i.MX platform with VPU support and libimxdmabuffer" > + depends on BR2_arm || BR2_aarch64 > + depends on (!BR2_PACKAGE_FREESCALE_IMX_HAS_VPU \ > + && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO) \ > + || !BR2_PACKAGE_LIBIMXDMABUFFER > + > +config BR2_PACKAGE_LIBIMXVPUAPI2 > + bool "libimxvpuapi2" > + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX > + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU || BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO > + depends on BR2_PACKAGE_LIBIMXDMABUFFER > + select BR2_PACKAGE_IMX_VPU if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU > + select BR2_PACKAGE_IMX_VPU_HANTRO if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO > + help > + This library provides an API for using hardware video codecs > + on i.MX platforms. The API abstracts away platform specific > + details and allows for using the same code with different > + hardware video codecs on different i.MX platforms. > + > + This is version 2 of libimxvpuapi. The API has been rewritten, > + and is incompatible with the older one. > + > + https://github.com/Freescale/libimxvpuapi > + > +if BR2_PACKAGE_LIBIMXVPUAPI2 > +choice > + prompt "Platform" > + > +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 > + bool "i.MX6 (Coda)" > + depends on BR2_PACKAGE_IMX_VPU > + > +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M > + bool "i.MX8M (Hantro)" > + depends on BR2_PACKAGE_IMX_VPU_HANTRO > + > +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM > + bool "i.MX8MM (Hantro)" > + depends on BR2_PACKAGE_IMX_VPU_HANTRO > +endchoice > + > +config BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM > + string > + default "imx6" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 > + default "imx8m" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M > + default "imx8mm" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM > + > +endif > diff --git a/package/libimxvpuapi2/libimxvpuapi2.hash b/package/libimxvpuapi2/libimxvpuapi2.hash > new file mode 100644 > index 0000000000..d26cf8767b > --- /dev/null > +++ b/package/libimxvpuapi2/libimxvpuapi2.hash > @@ -0,0 +1,3 @@ > +# locally computed hash > +sha256 611a5176e37e5132d97817e6d6048acf229f67efd2201e3f4aab6f720e7b67d1 libimxvpuapi2-2.2.0.tar.gz > +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE > diff --git a/package/libimxvpuapi2/libimxvpuapi2.mk b/package/libimxvpuapi2/libimxvpuapi2.mk > new file mode 100644 > index 0000000000..6957171ad3 > --- /dev/null > +++ b/package/libimxvpuapi2/libimxvpuapi2.mk > @@ -0,0 +1,28 @@ > +################################################################################ > +# > +# libimxvpuapi2 > +# > +################################################################################ > + > +LIBIMXVPUAPI2_VERSION = 2.2.0 > +LIBIMXVPUAPI2_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI2_VERSION)) > +LIBIMXVPUAPI2_LICENSE = LGPL-2.1+ > +LIBIMXVPUAPI2_LICENSE_FILES = LICENSE > +LIBIMXVPUAPI2_DEPENDENCIES = host-pkgconf host-python3 libimxdmabuffer > +LIBIMXVPUAPI2_INSTALL_STAGING = YES > +LIBIMXVPUAPI2_NEEDS_EXTERNAL_WAF = NO > + > +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX6),y) > +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu > +endif > + > +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M)$(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM),y) > +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu-hantro > +endif > + > +LIBIMXVPUAPI2_CONF_OPTS += \ > + --imx-headers=$(STAGING_DIR)/usr/include/ \ > + --sysroot-path=$(STAGING_DIR) \ > + --imx-platform=$(BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM) > + > +$(eval $(waf-package)) -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From thomas.petazzoni at bootlin.com Wed Jan 12 10:36:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:36:00 +0100 Subject: [Buildroot] [git commit] package/snappy: bump to version 1.1.9 Message-ID: <20220112103044.4B7238349D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4317b1f9f21eda6d01c10da1ed15a2d87cfc666c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Disable benchmarks through option added by https://github.com/google/snappy/commit/4ebd8b2f23dd4ab67ca695256a128cd796d39ce6 - Update indentation in hash file (two spaces) https://github.com/google/snappy/releases/tag/1.1.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...nline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch | 71 ++++++++++++++++++++++ package/snappy/snappy.hash | 4 +- package/snappy/snappy.mk | 4 +- 3 files changed, 75 insertions(+), 4 deletions(-) diff --git a/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch new file mode 100644 index 0000000000..bd2ef07794 --- /dev/null +++ b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch @@ -0,0 +1,71 @@ +From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001 +From: "Georgi D. Sotirov" +Date: Wed, 5 May 2021 14:16:46 +0300 +Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE + +Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to +fix the following compilation errors and a warning with GCC: + +[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o +/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS +-I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 +-march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 +-DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c +/tmp/snappy-1.1.9/snappy.cc +/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline +function might not be inlinable [-Wattributes] + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair snappy::DecompressBranchless(const uint8_t*, const +uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned +char; ptrdiff_t = int]': +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +CMakeFiles/snappy.dir/build.make:137: recipe for target +'CMakeFiles/snappy.dir/snappy.cc.o' failed + +Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE +macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ +inline specifier. + +[Retrieved from: +https://github.com/google/snappy/pull/128/commits/0c716d435abe65250100c2caea0e5126ac4e14bd] +Signed-off-by: Fabrice Fontaine +--- + snappy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snappy.cc b/snappy.cc +index 79dc0e8d..51157be2 100644 +--- a/snappy.cc ++++ b/snappy.cc +@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { + } + + SNAPPY_ATTRIBUTE_ALWAYS_INLINE +-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { ++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + const uint8_t*& ip = *ip_p; + // This section is crucial for the throughput of the decompression loop. + // The latency of an iteration is fundamentally constrained by the diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index c08c5b7fe4..b49b0e7e3b 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f snappy-1.1.8.tar.gz -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING +sha256 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 snappy-1.1.9.tar.gz +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index e1fa28fbce..d31dcdd5fe 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,12 +4,12 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.8 +SNAPPY_VERSION = 1.1.9 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING SNAPPY_CPE_ID_VENDOR = google SNAPPY_INSTALL_STAGING = YES -SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_TESTS=OFF +SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_BENCHMARKS=OFF -DSNAPPY_BUILD_TESTS=OFF $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Jan 12 10:36:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:36:03 +0100 Subject: [Buildroot] [git commit] package/polkit: fix build on meson 0.61.0 Message-ID: <20220112103044.6999E82A79@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e0118a6a7d85081529ad66aa72f74025d682c60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Backport a patch removing invalid positional arguments: ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. Fixes: - http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...-positional-parameters-to-i18n.merge_file.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch new file mode 100644 index 0000000000..25fa4ef19b --- /dev/null +++ b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch @@ -0,0 +1,45 @@ +From 30c368a6b729bc8a0a9d0d023739c4fa07b0928b Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 25 Oct 2021 20:21:27 +0100 +Subject: [PATCH] Don't pass positional parameters to i18n.merge_file + +These were always ignored, and Meson 0.60.0 disallowed them. + +Resolves: https://gitlab.freedesktop.org/polkit/polkit/-/issues/160 +Reference: https://github.com/mesonbuild/meson/pull/9445 +Signed-off-by: Simon McVittie +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99] +--- + actions/meson.build | 1 - + src/examples/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/actions/meson.build b/actions/meson.build +index 2abaaf3..1e3f370 100644 +--- a/actions/meson.build ++++ b/actions/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +diff --git a/src/examples/meson.build b/src/examples/meson.build +index c6305ab..8c18de5 100644 +--- a/src/examples/meson.build ++++ b/src/examples/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.examples.pkexec.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +2.25.1 + From thomas.petazzoni at bootlin.com Wed Jan 12 10:36:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:36:02 +0100 Subject: [Buildroot] [git commit] package/gobject-introspection: bump to version 1.70.0 Message-ID: <20220112103044.59AD77FC20@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c97b8925ed01bfa18d66da9ab01863191c591f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Rebase patches. Backport a patch to fix a build error on latest meson. giscanner/scannerlexer.l license hash change due to add float types: https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/60b0cf2fc2fdc74d13832d1fdde21cfdc813b84e Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../gobject-introspection/0001-disable-tests.patch | 10 +- .../0002-Add-rpath-links-to-ccompiler.patch | 6 +- ...nore-error-return-codes-from-ldd-wrapper.patch} | 7 +- .../0004-build-Avoid-the-doctemplates-hack.patch | 221 +++++++++++++++++++++ .../gobject-introspection.hash | 6 +- .../gobject-introspection/gobject-introspection.mk | 2 +- 6 files changed, 238 insertions(+), 14 deletions(-) diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index 01b11998bd..ed2d9d6fc0 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -1,4 +1,4 @@ -From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001 +From c87faf380ddf44da9d624dabd28178c9065f0f76 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 3 Feb 2020 10:07:15 -0800 Subject: [PATCH] disable tests @@ -13,22 +13,22 @@ Signed-off-by: Adam Duskett 1 file changed, 6 deletions(-) diff --git a/meson.build b/meson.build -index eed4d6b..5058664 100644 +index c2cb577f..65ce7adf 100644 --- a/meson.build +++ b/meson.build -@@ -222,12 +222,6 @@ if get_option('build_introspection_data') == true +@@ -225,12 +225,6 @@ else endif subdir('docs') -# The tests will also run, which is not possible if they -# were built for a different architecture. -if not meson.is_cross_build() -- subdir('tests') +- subdir('tests') -endif - install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) -- -2.24.1 +2.25.1 diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch index 9b9ae99779..e21da42ce7 100644 --- a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch +++ b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch @@ -1,4 +1,4 @@ -From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001 +From 952e2e2bb6a22ec8824223b03b65cb28361c6e34 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 14 Mar 2018 12:07:10 -0400 Subject: [PATCH] Add rpath links to ccompiler @@ -12,7 +12,7 @@ Signed-off-by: Adam Duskett 1 file changed, 2 insertions(+) diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index a8bd5b1..51bb9bc 100644 +index cb97e76f..d29b28c8 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -231,6 +231,8 @@ class CCompiler(object): @@ -25,5 +25,5 @@ index a8bd5b1..51bb9bc 100644 os.pathsep.join(runtime_paths + [os.environ[envvar]]) else: -- -2.14.3 +2.25.1 diff --git a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch similarity index 90% rename from package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch rename to package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch index d43dc1393e..f1ea518954 100644 --- a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch +++ b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch @@ -1,4 +1,4 @@ -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 +From e0fc4a2a5161a36483ddc518be9bb14390f11b19 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 5 Sep 2018 16:46:52 +0200 Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper @@ -14,7 +14,7 @@ Signed-off-by: Adam Duskett 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index d67df95..80352a6 100644 +index 9f8ab5df..7a1a72fe 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries): @@ -26,3 +26,6 @@ index d67df95..80352a6 100644 if isinstance(output, bytes): output = output.decode("utf-8", "replace") +-- +2.25.1 + diff --git a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch new file mode 100644 index 0000000000..0b70b5c4c0 --- /dev/null +++ b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch @@ -0,0 +1,221 @@ +From 0504b26ec2adb13dfdff51679d84ad2f69af5918 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:51:10 +0000 +Subject: [PATCH] build: Avoid the doctemplates hack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The hack that copies the doctemplates directory into the build +directory has stopped working with newer versions of Meson; while it's +possible to copy files, custom_target() cannot depend on a directory. +Additionally, the dependency has always been broken. + +Instead, we enumerate the template files???after all, it's not like they +change a lot???and then we list them as dependencies for the test targets. + +Fixes: #414 + +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +effb1e09dee263cdac4ec593e8caf316e6f01fe2] +--- + giscanner/doctemplates/devdocs/meson.build | 19 +++++++ + giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ + giscanner/meson.build | 14 ++--- + tests/scanner/meson.build | 24 +++++---- + 4 files changed, 98 insertions(+), 22 deletions(-) + create mode 100644 giscanner/doctemplates/devdocs/meson.build + create mode 100644 giscanner/doctemplates/mallard/meson.build + +diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build +new file mode 100644 +index 00000000..2037182a +--- /dev/null ++++ b/giscanner/doctemplates/devdocs/meson.build +@@ -0,0 +1,19 @@ ++doc_templates += files([ ++ 'Gjs/_doc.tmpl', ++ 'Gjs/_index.tmpl', ++ 'Gjs/_method.tmpl', ++ 'Gjs/_methods.tmpl', ++ 'Gjs/_properties.tmpl', ++ 'Gjs/_signals.tmpl', ++ 'Gjs/_staticmethods.tmpl', ++ 'Gjs/_vfuncs.tmpl', ++ 'Gjs/base.tmpl', ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++]) +diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build +new file mode 100644 +index 00000000..5fe4e2af +--- /dev/null ++++ b/giscanner/doctemplates/mallard/meson.build +@@ -0,0 +1,63 @@ ++base_templates = files([ ++ 'base.tmpl', ++ 'class.tmpl', ++ 'namespace.tmpl', ++]) ++ ++c_templates = files([ ++ 'C/callback.tmpl', ++ 'C/class.tmpl', ++ 'C/constructor.tmpl', ++ 'C/default.tmpl', ++ 'C/enum.tmpl', ++ 'C/field.tmpl', ++ 'C/function.tmpl', ++ 'C/interface.tmpl', ++ 'C/method.tmpl', ++ 'C/namespace.tmpl', ++ 'C/property.tmpl', ++ 'C/record.tmpl', ++ 'C/signal.tmpl', ++ 'C/vfunc.tmpl', ++]) ++ ++gjs_templates = files([ ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/constructor.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/field.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++ 'Gjs/property.tmpl', ++ 'Gjs/record.tmpl', ++ 'Gjs/signal.tmpl', ++ 'Gjs/vfunc.tmpl', ++]) ++ ++py_templates = files([ ++ 'Python/callback.tmpl', ++ 'Python/class.tmpl', ++ 'Python/constructor.tmpl', ++ 'Python/default.tmpl', ++ 'Python/enum.tmpl', ++ 'Python/field.tmpl', ++ 'Python/function.tmpl', ++ 'Python/interface.tmpl', ++ 'Python/method.tmpl', ++ 'Python/namespace.tmpl', ++ 'Python/property.tmpl', ++ 'Python/record.tmpl', ++ 'Python/signal.tmpl', ++ 'Python/vfunc.tmpl', ++]) ++ ++doc_templates += [ ++ base_templates, ++ c_templates, ++ gjs_templates, ++ py_templates, ++] +diff --git a/giscanner/meson.build b/giscanner/meson.build +index 41edcd44..3d7dc678 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', + + install_subdir('doctemplates', install_dir: giscannerdir) + +-# XXX: this doesn't track the input, but there is nothing to copy many files +-# in meson. +-doc_templates = custom_target('copy-templates', +- input : 'doctemplates', +- output : 'doctemplates', +- command : [ +- python, '-c', +- 'import sys, shutil;' + +- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + +- 'shutil.copytree(sys.argv[1], sys.argv[2])', +- '@INPUT@', '@OUTPUT@']) ++doc_templates = [] ++subdir('doctemplates/devdocs') ++subdir('doctemplates/mallard') + + flex = find_program('flex', 'win_flex') + bison = find_program('bison', 'win_bison') +diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build +index 5176b957..b81b3fd5 100644 +--- a/tests/scanner/meson.build ++++ b/tests/scanner/meson.build +@@ -525,19 +525,26 @@ foreach gir : test_girs + endforeach + + if has_girdoctool and glib_dep.type_name() == 'pkgconfig' ++ doctool_env = environment() ++ doctool_env.set('srcdir', meson.current_source_dir()) ++ doctool_env.set('builddir', meson.current_build_dir()) ++ + foreach language : ['C', 'Python', 'Gjs'] + regress_docs = custom_target( + 'generate-docs-' + language, + input: regress_gir, +- depends: [doc_templates], ++ depend_files: doc_templates, + build_by_default: not cairo_deps_found, ++ env: doctool_env, + output: 'Regress-1.0-' + language, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), + '--add-include-path=' + meson.current_build_dir(), + '--language', language, +- '@INPUT@', '-o', '@OUTPUT@'], ++ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), ++ '@INPUT@', '-o', '@OUTPUT@', ++ ], + ) + + if cairo_deps_found +@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-' + language], + depends: [regress_docs], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endforeach +@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + regress_sections = custom_target( + 'generate-docs-sections', + input: regress_gir, +- depends: [doc_templates], ++ depend_files: [doc_templates], + build_by_default: not cairo_deps_found, + output: 'Regress-1.0-sections.txt', ++ env: doctool_env, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), +@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-sections.txt'], + depends: [regress_sections], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endif +-- +2.25.1 + diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index e859ba1d3b..5b76df6b40 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.sha256sum -sha256 d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 gobject-introspection-1.68.0.tar.xz +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.sha256sum +sha256 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a gobject-introspection-1.70.0.tar.xz sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad35e98ae9342a3539c36f2171e84d175394ddcff625887290c751302cb02983 giscanner/scannerlexer.l +sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 6a3d321cc7..41d64171a7 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.68 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.70 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz From thomas.petazzoni at bootlin.com Wed Jan 12 10:37:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:37:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/snappy: bump to version 1.1.9 In-Reply-To: <20220111224156.2800195-1-fontaine.fabrice@gmail.com> References: <20220111224156.2800195-1-fontaine.fabrice@gmail.com> Message-ID: <20220112113735.6c6e4c9b@windsurf> On Tue, 11 Jan 2022 23:41:56 +0100 Fabrice Fontaine wrote: > - Disable benchmarks through option added by > https://github.com/google/snappy/commit/4ebd8b2f23dd4ab67ca695256a128cd796d39ce6 > - Update indentation in hash file (two spaces) > > https://github.com/google/snappy/releases/tag/1.1.9 > > Signed-off-by: Fabrice Fontaine > --- > ...-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch | 71 +++++++++++++++++++ > package/snappy/snappy.hash | 4 +- > package/snappy/snappy.mk | 4 +- > 3 files changed, 75 insertions(+), 4 deletions(-) > create mode 100644 package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 10:37:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:37:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/gobject-introspection: bump to version 1.70.0 In-Reply-To: <20220112012537.1362197-1-james.hilliard1@gmail.com> References: <20220112012537.1362197-1-james.hilliard1@gmail.com> Message-ID: <20220112113746.2fe95d2c@windsurf> On Tue, 11 Jan 2022 18:25:37 -0700 James Hilliard wrote: > Rebase patches. > > Backport a patch to fix a build error on latest meson. > > giscanner/scannerlexer.l license hash change due to add float types: > https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/60b0cf2fc2fdc74d13832d1fdde21cfdc813b84e > > Signed-off-by: James Hilliard > --- > .../0001-disable-tests.patch | 10 +- > .../0002-Add-rpath-links-to-ccompiler.patch | 6 +- > ...error-return-codes-from-ldd-wrapper.patch} | 7 +- > ...04-build-Avoid-the-doctemplates-hack.patch | 221 ++++++++++++++++++ > .../gobject-introspection.hash | 6 +- > .../gobject-introspection.mk | 2 +- > 6 files changed, 238 insertions(+), 14 deletions(-) > rename package/gobject-introspection/{0003-ignore-error-return-codes-from-ldd-wrapper.patch => 0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch} (90%) > create mode 100644 package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 10:38:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:38:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/polkit: fix build on meson 0.61.0 In-Reply-To: <20220112094731.2117910-1-james.hilliard1@gmail.com> References: <20220112094731.2117910-1-james.hilliard1@gmail.com> Message-ID: <20220112113800.659a0ee4@windsurf> On Wed, 12 Jan 2022 02:47:31 -0700 James Hilliard wrote: > Backport a patch removing invalid positional arguments: > ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. > > Fixes: > - http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f > > Signed-off-by: James Hilliard > --- > ...tional-parameters-to-i18n.merge_file.patch | 45 +++++++++++++++++++ > 1 file changed, 45 insertions(+) > create mode 100644 package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 10:51:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:51:00 +0100 Subject: [Buildroot] [PATCHv2] package/grpc: restrict host-grpc to the absolute minimum In-Reply-To: <20210525182044.13785-1-patrickdepinguin@gmail.com> References: <20210525182044.13785-1-patrickdepinguin@gmail.com> Message-ID: <20220112115100.4bab9b25@windsurf> Hello Thomas, +Yann, Arnout, Peter, to raise their attention on this patch. On Tue, 25 May 2021 20:20:44 +0200 Thomas De Schampheleire wrote: > From: Thomas De Schampheleire > > Currently, grpc depends on the full host-grpc, which in turn depends on host > versions of many other libraries. One of these, host-libabseil-cpp, also > requires a host gcc 4.9 or larger, a dependency which is not met on CentOS > 7. > But in fact, the target grpc only needs the 'grpc_cpp_plugin' binary from > host-grpc. And that binary does not depend on host-libabseil-cpp or other > libraries, only on host-protobuf. > > Given the above, simplify the grpc/host-grpc situation. > - Add a patch to the (host-)grpc CMakeLists.txt file to add an option to > only build grpc_cpp_plugin. > - Update grpc.mk and Config.in to remove the unnecessary dependencies, and > change the host-grpc configure options to make cmake happy. > > The advantages of these changes are: > - making grpc available to older hosts with gcc < 4.8, like CentOS 7 > - significantly reducing the build time of host-grpc and its dependencies > > The patch was proposed upstream but not accepted with below rationale. > Perhaps input from others can help in persuading upstream in a future > attempt. > > 'What you're doing sounds like quite a narrow use case. But we simply > cannot provide a cmake option for every possible scenario in the world. > Introducing a new cmake option isn't for free and requires careful > design and maintenance.' > > Nevertheless, given the benefits in terms of build time and dependency > reduction, it makes sense to apply this patch in spite of the disadvantage > of a local non-upstreamed patch. > > Signed-off-by: Thomas De Schampheleire So I had a look at this, and indeed, upstream has not been very supportive. The patch on CMakeLists.txt that you have is not too crazy, but it would certainly be a bit annoying to maintain forever (even though for some packages, like python3, we do have many more patches than that). I have thought of enabling the download of the git submodules for just the host variant, and use the make target that builds just the native tool that is needed. However, using the git submodules just for the host variant doesn't work: the tarball has to be the same between host and target. An option would be to have a separate package, for just the host variant. A bit meh. Perhaps we should just take your patch in fact? :-) Yann, Peter, Arnout, any opinion on this? Best regards, Thomas > --- > > v2: fix typo in Config.in comment (Baruch Siach) > > > .../grpc/0004-host-grpc-only-cpp-plugin.patch | 223 ++++++++++++++++++ > package/grpc/Config.in | 6 +- > package/grpc/grpc.mk | 27 ++- > 3 files changed, 244 insertions(+), 12 deletions(-) > create mode 100644 package/grpc/0004-host-grpc-only-cpp-plugin.patch > > diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch > new file mode 100644 > index 0000000000..43fad7e3d6 > --- /dev/null > +++ b/package/grpc/0004-host-grpc-only-cpp-plugin.patch > @@ -0,0 +1,223 @@ > +From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 Mon Sep 17 00:00:00 2001 > +From: Thomas De Schampheleire > +Date: Tue, 25 May 2021 14:55:23 +0200 > +Subject: [PATCH] Add option to restrict building of (host-)grpc to > + grpc_cpp_plugin only. > + > +This avoids unnecessary dependencies on big packages like libabseil-cpp and > +others. > + > +Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) > + > +Signed-off-by: Thomas De Schampheleire > +--- > + CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- > + 1 file changed, 35 insertions(+), 8 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index e8934a3e03..c2df332cc6 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -48,12 +48,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) > + option(gRPC_BUILD_CODEGEN "Build codegen" ON) > + option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) > + option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) > ++option(gRPC_BUILD_PLUGIN_SUPPORT_ONLY "Build plugin support only" OFF) > + > + set(gRPC_INSTALL_default ON) > + if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) > + # Disable gRPC_INSTALL by default if building as a submodule > + set(gRPC_INSTALL_default OFF) > + endif() > ++if(gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ set(gRPC_INSTALL_default OFF) > ++endif() > + set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL > + "Generate installation target") > + > +@@ -367,6 +371,8 @@ add_custom_target(plugins > + DEPENDS ${_gRPC_PLUGIN_LIST} > + ) > + > ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_custom_target(tools_c > + DEPENDS > + check_epollexclusive > +@@ -382,6 +388,8 @@ add_custom_target(tools_cxx > + add_custom_target(tools > + DEPENDS tools_c tools_cxx) > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + protobuf_generate_grpc_cpp( > + src/proto/grpc/channelz/channelz.proto > + ) > +@@ -1000,6 +1008,7 @@ if(gRPC_BUILD_TESTS) > + DEPENDS buildtests_c buildtests_cxx) > + endif() > + > ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > + > + add_library(address_sorting > + third_party/address_sorting/address_sorting.c > +@@ -1051,6 +1060,8 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + if(gRPC_BUILD_TESTS) > + > + add_library(end2end_nosec_tests > +@@ -1313,6 +1324,8 @@ target_link_libraries(end2end_tests > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(gpr > + src/core/lib/gpr/alloc.cc > + src/core/lib/gpr/atm.cc > +@@ -2106,6 +2119,8 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + if(gRPC_BUILD_CSHARP_EXT) > + > + add_library(grpc_csharp_ext SHARED > +@@ -2288,6 +2303,8 @@ endif() > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(grpc_unsecure > + src/core/ext/filters/census/grpc_context.cc > + src/core/ext/filters/client_channel/backend_metric.cc > +@@ -2650,6 +2667,8 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + if(gRPC_BUILD_TESTS) > + > + if(gRPC_BUILD_CODEGEN) > +@@ -2717,6 +2736,8 @@ endif() > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(grpc++ > + src/cpp/client/channel_cc.cc > + src/cpp/client/client_callback.cc > +@@ -3134,6 +3155,7 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > + > + if(gRPC_BUILD_CODEGEN) > + add_library(grpc++_reflection > +@@ -3374,6 +3396,8 @@ target_link_libraries(grpc++_test_util > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(grpc++_unsecure > + src/cpp/client/channel_cc.cc > + src/cpp/client/client_callback.cc > +@@ -3656,6 +3680,7 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > + > + add_library(grpc_plugin_support > + src/compiler/cpp_generator.cc > +@@ -3715,7 +3740,7 @@ foreach(_hdr > + endforeach() > + > + > +-if(gRPC_INSTALL) > ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > + install(TARGETS grpc_plugin_support EXPORT gRPCTargets > + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > +@@ -3795,6 +3820,8 @@ endif() > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(upb > + third_party/upb/upb/decode_fast.c > + third_party/upb/upb/decode.c > +@@ -3852,8 +3879,6 @@ if(gRPC_INSTALL) > + ) > + endif() > + > +- > +- > + add_executable(check_epollexclusive > + test/build/check_epollexclusive.c > + ) > +@@ -3906,8 +3931,6 @@ target_link_libraries(gen_hpack_tables > + gpr > + ) > + > +- > +- > + add_executable(gen_legal_metadata_characters > + tools/codegen/core/gen_legal_metadata_characters.cc > + ) > +@@ -3958,6 +3981,8 @@ target_link_libraries(gen_percent_encoding_tables > + ${_gRPC_ALLTARGETS_LIBRARIES} > + ) > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + > + if(gRPC_BUILD_TESTS) > + > +@@ -10722,7 +10747,7 @@ target_link_libraries(grpc_cli > + > + > + endif() > +-if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN) > ++if(gRPC_BUILD_GRPC_CPP_PLUGIN) > + > + add_executable(grpc_cpp_plugin > + src/compiler/cpp_plugin.cc > +@@ -10752,7 +10777,7 @@ target_link_libraries(grpc_cpp_plugin > + > + > + > +-if(gRPC_INSTALL) > ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > + install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets > + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > +@@ -15420,7 +15445,7 @@ endif() > + > + > + > +- > ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > + > + if(gRPC_INSTALL) > + install(EXPORT gRPCTargets > +@@ -15517,3 +15542,5 @@ generate_pkgconfig( > + "-lgrpc++_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" > + "" > + "grpc++_unsecure.pc") > ++ > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > +-- > +2.26.3 > + > diff --git a/package/grpc/Config.in b/package/grpc/Config.in > index d1bf0d078d..ad3ddbcf19 100644 > --- a/package/grpc/Config.in > +++ b/package/grpc/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_GRPC > depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 > depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp > - depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libabseil-cpp > depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC > depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS > @@ -20,10 +19,9 @@ config BR2_PACKAGE_GRPC > > http://github.com/grpc/grpc > > -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" > +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9" > depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ > - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ > - || !BR2_HOST_GCC_AT_LEAST_4_9 > + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > index ee8dc38e70..8718b0e956 100644 > --- a/package/grpc/grpc.mk > +++ b/package/grpc/grpc.mk > @@ -14,8 +14,7 @@ GRPC_INSTALL_STAGING = YES > > # Need to use host grpc_cpp_plugin during cross compilation. > GRPC_DEPENDENCIES = c-ares host-grpc libabseil-cpp openssl protobuf re2 zlib > -HOST_GRPC_DEPENDENCIES = host-c-ares host-libabseil-cpp host-openssl host-protobuf \ > - host-re2 host-zlib > +HOST_GRPC_DEPENDENCIES = host-protobuf > > # gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have > # installed a cmake config file, but buildroot uses c-ares' autotools build, > @@ -70,14 +69,26 @@ GRPC_CONF_OPTS += \ > -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ > -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" > > +# For host-grpc, we only need the 'grpc_cpp_plugin' binary, which is needed for > +# target grpc compilation. To avoid unnecessary build steps and host > +# dependencies, supply enough options to pass the configure checks without > +# requiring other host packages, unless those needed by grpc_cpp_plugin. > HOST_GRPC_CONF_OPTS = \ > - -DgRPC_ABSL_PROVIDER=package \ > - -D_gRPC_CARES_LIBRARIES=cares \ > - -DgRPC_CARES_PROVIDER=none \ > -DgRPC_PROTOBUF_PROVIDER=package \ > - -DgRPC_RE2_PROVIDER=package \ > - -DgRPC_SSL_PROVIDER=package \ > - -DgRPC_ZLIB_PROVIDER=package > + -DgRPC_ABSL_PROVIDER=none \ > + -DgRPC_CARES_PROVIDER=none \ > + -DgRPC_RE2_PROVIDER=none \ > + -DgRPC_SSL_PROVIDER=none \ > + -DgRPC_ZLIB_PROVIDER=none \ > + -DgRPC_BUILD_CODEGEN=OFF \ > + -DgRPC_BUILD_CSHARP_EXT=OFF \ > + -DgRPC_BUILD_PLUGIN_SUPPORT_ONLY=ON \ > + -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF > > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From patrickdepinguin at gmail.com Wed Jan 12 11:04:31 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Wed, 12 Jan 2022 12:04:31 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> Message-ID: Hi Romain, El lun, 10 ene 2022 a las 0:27, Romain Naour () escribi?: > > Hello Thomas, > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > There are cases where a 64-bit architecture is running a 64-bit kernel but > > 32-bit userspace. Examples include: > > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > Can you provide a new qemu defconfig that cover this use case? > This is for gitlab-ci runtime testing. > > Best regards, > Romain > > PS: (This email doesn't count as a review of this series :)) Thanks for your interest in this series :-) Currently the qemu defconfig that I use uses an external toolchain built via crosstool-ng. Crosstool-ng is capable of creating a multilib toolchain supporting 32-bit and 64-bit binaries. However, Buildroot does not currently support this for internal toolchains. How do you suggest to proceed here? Could we perhaps add a crosstool-ng-built multilib toolchain to the Bootlin toolchains? Thanks, Thomas From sebastien.szymanski at armadeus.com Wed Jan 12 09:42:48 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Wed, 12 Jan 2022 10:42:48 +0100 Subject: [Buildroot] [PATCH 1/3] package/libimxdmabuffer: new package Message-ID: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> Library for allocating and managing physically contiguous memory ("DMA memory" or "DMA buffers") on i.MX devices. Needed for libimxvpuapi2 and gst1-imx2. The user has to choose an allocator depending on the i.MX device. Signed-off-by: S?bastien Szymanski --- package/Config.in | 1 + package/libimxdmabuffer/Config.in | 59 ++++++++++++++++++++ package/libimxdmabuffer/libimxdmabuffer.hash | 3 + package/libimxdmabuffer/libimxdmabuffer.mk | 51 +++++++++++++++++ 4 files changed, 114 insertions(+) create mode 100644 package/libimxdmabuffer/Config.in create mode 100644 package/libimxdmabuffer/libimxdmabuffer.hash create mode 100644 package/libimxdmabuffer/libimxdmabuffer.mk diff --git a/package/Config.in b/package/Config.in index 59297c3f3d..8d844aa11e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -505,6 +505,7 @@ endmenu source "package/kbd/Config.in" source "package/lcdproc/Config.in" source "package/libiec61850/Config.in" + source "package/libimxdmabuffer/Config.in" source "package/libubootenv/Config.in" source "package/libuio/Config.in" source "package/linux-backports/Config.in" diff --git a/package/libimxdmabuffer/Config.in b/package/libimxdmabuffer/Config.in new file mode 100644 index 0000000000..9e81a69123 --- /dev/null +++ b/package/libimxdmabuffer/Config.in @@ -0,0 +1,59 @@ +comment "libimxdmabuffer needs an imx-specific Linux kernel to be built" + depends on (BR2_arm || BR2_aarch64) && !BR2_LINUX_KERNEL + +config BR2_PACKAGE_LIBIMXDMABUFFER + bool "libimxdmabuffer" + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX + depends on BR2_LINUX_KERNEL + help + Library for allocating and managing physically contiguous + memory ("DMA memory" or "DMA buffers") on i.MX devices. + + It requires a kernel that includes the i.MX specific headers + to be built. + + https://github.com/Freescale/libimxdmabuffer + +if BR2_PACKAGE_LIBIMXDMABUFFER +choice + prompt "Allocator" + +config BR2_PACKAGE_LIBIMXDMABUFFER_DWL + bool "dwl" + depends on BR2_PACKAGE_IMX_VPU_HANTRO + +comment "dwl allocator needs imx-vpu-hantro" + depends on !BR2_PACKAGE_IMX_VPU_HANTRO + +config BR2_PACKAGE_LIBIMXDMABUFFER_IPU + bool "ipu" + +config BR2_PACKAGE_LIBIMXDMABUFFER_G2D + bool "g2d" + depends on BR2_PACKAGE_IMX_GPU_G2D + +comment "g2d allocator needs imx-gpu-g2d" + depends on !BR2_PACKAGE_IMX_GPU_G2D + +config BR2_PACKAGE_LIBIMXDMABUFFER_PXP + bool "pxp" +endchoice + +if BR2_PACKAGE_LIBIMXDMABUFFER_DWL +choice + prompt "Hantro decoder version" + +config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G1 + bool "G1" + +config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G2 + bool "G2" +endchoice + +config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_HANTRO_DEC_VERSION + string + default "G1" if BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G1 + default "G2" if BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G2 +endif + +endif diff --git a/package/libimxdmabuffer/libimxdmabuffer.hash b/package/libimxdmabuffer/libimxdmabuffer.hash new file mode 100644 index 0000000000..7d317005df --- /dev/null +++ b/package/libimxdmabuffer/libimxdmabuffer.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 cea163d213206f5451eb75a4501b52d861ed00bfd14cd3e4e8734c6181edb6cc libimxdmabuffer-1.0.1.tar.gz +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE diff --git a/package/libimxdmabuffer/libimxdmabuffer.mk b/package/libimxdmabuffer/libimxdmabuffer.mk new file mode 100644 index 0000000000..c8adf03365 --- /dev/null +++ b/package/libimxdmabuffer/libimxdmabuffer.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# libimxdmabuffer +# +################################################################################ + +LIBIMXDMABUFFER_VERSION = 1.0.1 +LIBIMXDMABUFFER_SITE = $(call github,Freescale,libimxdmabuffer,$(LIBIMXDMABUFFER_VERSION)) +LIBIMXDMABUFFER_LICENSE = LGPL-2.1+ +LIBIMXDMABUFFER_LICENSE_FILES = LICENSE +LIBIMXDMABUFFER_DEPENDENCIES = host-pkgconf host-python3 +LIBIMXDMABUFFER_INSTALL_STAGING = YES +LIBIMXDMABUFFER_NEEDS_EXTERNAL_WAF = NO + +# libimxdmabuffer needs access to imx-specific kernel headers +LIBIMXDMABUFFER_DEPENDENCIES += linux + +LIBIMXDMABUFFER_CONF_OPTS += \ + --imx-linux-headers-path=$(STAGING_DIR)/usr/include/ \ + --with-ion-allocator=no + +ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_DWL),y) +LIBIMXDMABUFFER_CONF_OPTS += \ + --with-dwl-allocator=yes \ + --hantro-headers-path=$(STAGING_DIR)/usr/include/hantro_dec \ + --hantro-decoder-version=$(BR2_PACKAGE_LIBIMXDMABUFFER_DWL_HANTRO_DEC_VERSION) +LIBIMXDMABUFFER_DEPENDENCIES += imx-vpu-hantro +else +LIBIMXDMABUFFER_CONF_OPTS += --with-dwl-allocator=no +endif + +ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_IPU),y) +LIBIMXDMABUFFER_CONF_OPTS += --with-ipu-allocator=yes +else +LIBIMXDMABUFFER_CONF_OPTS += --with-ipu-allocator=no +endif + +ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_G2D),y) +LIBIMXDMABUFFER_CONF_OPTS += --with-g2d-allocator=yes +LIBIMXDMABUFFER_DEPENDENCIES += imx-gpu-g2d +else +LIBIMXDMABUFFER_CONF_OPTS += --with-g2d-allocator=no +endif + +ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_PXP),y) +LIBIMXDMABUFFER_CONF_OPTS += --with-pxp-allocator=yes +else +LIBIMXDMABUFFER_CONF_OPTS += --with-pxp-allocator=no +endif + +$(eval $(waf-package)) -- 2.34.1 From sebastien.szymanski at armadeus.com Wed Jan 12 12:53:40 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=c3=a9bastien_Szymanski?=) Date: Wed, 12 Jan 2022 13:53:40 +0100 Subject: [Buildroot] [PATCH 2/3] package/libimxvpuapi2: new package In-Reply-To: <87bl0hw8ek.fsf@tarshish> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> <20220112094250.27022-2-sebastien.szymanski@armadeus.com> <87bl0hw8ek.fsf@tarshish> Message-ID: <551de001-1c47-7f9a-998f-37c9088b2670@armadeus.com> Hi Baruch, On 1/12/22 11:31, Baruch Siach wrote: > Hi S?bastien, > > On Wed, Jan 12 2022, S?bastien Szymanski wrote: >> This is version 2 of libimxvpuapi. >> The API has been rewritten, and is incompatible with the older one. >> Currently, the following platforms are supported (listed with their VPUs): >> * i.MX6 (Chips&Media CODA960 codec) >> * i.MX8m (Hantro G1/G2 decoder, no encoder) >> * i.MX8mm (Hantro G1/G2 decoder, Hantro H1 encoder) > > Is there patch 1/3 in this series? I didn't show up in the list. Yes. Looks like it took more time to reach the mailing list. Regards, > > Thanks, > baruch > >> >> Signed-off-by: S?bastien Szymanski >> --- >> package/Config.in | 1 + >> package/libimxvpuapi2/Config.in | 48 ++++++++++++++++++++++++ >> package/libimxvpuapi2/libimxvpuapi2.hash | 3 ++ >> package/libimxvpuapi2/libimxvpuapi2.mk | 28 ++++++++++++++ >> 4 files changed, 80 insertions(+) >> create mode 100644 package/libimxvpuapi2/Config.in >> create mode 100644 package/libimxvpuapi2/libimxvpuapi2.hash >> create mode 100644 package/libimxvpuapi2/libimxvpuapi2.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index 8d844aa11e..009d2006f0 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -1763,6 +1763,7 @@ menu "Multimedia" >> source "package/libebml/Config.in" >> source "package/libhdhomerun/Config.in" >> source "package/libimxvpuapi/Config.in" >> + source "package/libimxvpuapi2/Config.in" >> source "package/libmatroska/Config.in" >> source "package/libmms/Config.in" >> source "package/libmpeg2/Config.in" >> diff --git a/package/libimxvpuapi2/Config.in b/package/libimxvpuapi2/Config.in >> new file mode 100644 >> index 0000000000..0954718cc0 >> --- /dev/null >> +++ b/package/libimxvpuapi2/Config.in >> @@ -0,0 +1,48 @@ >> +comment "libimxvpuapi2 needs an i.MX platform with VPU support and libimxdmabuffer" >> + depends on BR2_arm || BR2_aarch64 >> + depends on (!BR2_PACKAGE_FREESCALE_IMX_HAS_VPU \ >> + && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO) \ >> + || !BR2_PACKAGE_LIBIMXDMABUFFER >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2 >> + bool "libimxvpuapi2" >> + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX >> + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU || BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO >> + depends on BR2_PACKAGE_LIBIMXDMABUFFER >> + select BR2_PACKAGE_IMX_VPU if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU >> + select BR2_PACKAGE_IMX_VPU_HANTRO if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO >> + help >> + This library provides an API for using hardware video codecs >> + on i.MX platforms. The API abstracts away platform specific >> + details and allows for using the same code with different >> + hardware video codecs on different i.MX platforms. >> + >> + This is version 2 of libimxvpuapi. The API has been rewritten, >> + and is incompatible with the older one. >> + >> + https://github.com/Freescale/libimxvpuapi >> + >> +if BR2_PACKAGE_LIBIMXVPUAPI2 >> +choice >> + prompt "Platform" >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 >> + bool "i.MX6 (Coda)" >> + depends on BR2_PACKAGE_IMX_VPU >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M >> + bool "i.MX8M (Hantro)" >> + depends on BR2_PACKAGE_IMX_VPU_HANTRO >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM >> + bool "i.MX8MM (Hantro)" >> + depends on BR2_PACKAGE_IMX_VPU_HANTRO >> +endchoice >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM >> + string >> + default "imx6" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 >> + default "imx8m" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M >> + default "imx8mm" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM >> + >> +endif >> diff --git a/package/libimxvpuapi2/libimxvpuapi2.hash b/package/libimxvpuapi2/libimxvpuapi2.hash >> new file mode 100644 >> index 0000000000..d26cf8767b >> --- /dev/null >> +++ b/package/libimxvpuapi2/libimxvpuapi2.hash >> @@ -0,0 +1,3 @@ >> +# locally computed hash >> +sha256 611a5176e37e5132d97817e6d6048acf229f67efd2201e3f4aab6f720e7b67d1 libimxvpuapi2-2.2.0.tar.gz >> +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE >> diff --git a/package/libimxvpuapi2/libimxvpuapi2.mk b/package/libimxvpuapi2/libimxvpuapi2.mk >> new file mode 100644 >> index 0000000000..6957171ad3 >> --- /dev/null >> +++ b/package/libimxvpuapi2/libimxvpuapi2.mk >> @@ -0,0 +1,28 @@ >> +################################################################################ >> +# >> +# libimxvpuapi2 >> +# >> +################################################################################ >> + >> +LIBIMXVPUAPI2_VERSION = 2.2.0 >> +LIBIMXVPUAPI2_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI2_VERSION)) >> +LIBIMXVPUAPI2_LICENSE = LGPL-2.1+ >> +LIBIMXVPUAPI2_LICENSE_FILES = LICENSE >> +LIBIMXVPUAPI2_DEPENDENCIES = host-pkgconf host-python3 libimxdmabuffer >> +LIBIMXVPUAPI2_INSTALL_STAGING = YES >> +LIBIMXVPUAPI2_NEEDS_EXTERNAL_WAF = NO >> + >> +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX6),y) >> +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu >> +endif >> + >> +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M)$(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM),y) >> +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu-hantro >> +endif >> + >> +LIBIMXVPUAPI2_CONF_OPTS += \ >> + --imx-headers=$(STAGING_DIR)/usr/include/ \ >> + --sysroot-path=$(STAGING_DIR) \ >> + --imx-platform=$(BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM) >> + >> +$(eval $(waf-package)) > > -- S?bastien Szymanski, Armadeus Systems Software engineer From thomas.petazzoni at bootlin.com Wed Jan 12 12:56:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 13:56:37 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220107045531.3985241-1-james.hilliard1@gmail.com> References: <20220107045531.3985241-1-james.hilliard1@gmail.com> Message-ID: <20220112135637.12c5edc4@windsurf> Hello James, On Thu, 6 Jan 2022 21:55:29 -0700 James Hilliard wrote: > This version of catapult is python3 compatible and will be used to > replace the python2 only version in qt5webengine-chromium. > > Signed-off-by: James Hilliard > --- > Changes v2 -> v3: > - add kconfig entry > --- > package/qt5/Config.in | 1 + > .../qt5/qt5webengine-chromium-catapult/Config.in | 4 ++++ > .../qt5webengine-chromium-catapult.hash | 3 +++ > .../qt5webengine-chromium-catapult.mk | 14 ++++++++++++++ > 4 files changed, 22 insertions(+) > create mode 100644 package/qt5/qt5webengine-chromium-catapult/Config.in > create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash > create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk I have tested this patch series (I'm replying to the v3 because that's the one I tested) with the following defconfig: BR2_arm=y BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5WEBENGINE=y BR2_PACKAGE_RPI_USERLAND=y and it failed to build like this: FAILED: host/obj/crypto/crypto/nss_key_util.o /usr/bin/g++ -MMD -MF host/obj/crypto/crypto/nss_key_util.o.d -DCRYPTO_IMPLEMENTATION -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Ihost/gen -I../../3rdparty/chromium -I../../3rdparty/chromium/third_party/perfetto/include -Ihost/gen/third_party/perfetto/build_config -Ihost/gen/third_party/perfetto -I../../3rdparty/chromium/third_party/boringssl/src/include -I../../3rdparty/chromium/third_party/abseil-cpp -I../../3rdparty/chromium/third_party/protobuf/src -Ihost/gen/protoc_out -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointe r-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -I/usr/include/nss -I/usr/include/nspr -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -I/home/thomas/buildroot/buildroot/output/host/include -c ../../3rdparty/chromium/crypto/nss_key_util.cc -o host/obj/crypto/crypto/nss_key_util.o In file included from ../../3rdparty/chromium/crypto/nss_key_util.cc:5: ../../3rdparty/chromium/crypto/nss_key_util.h:8:10: fatal error: secoidt.h: No such file or directory 8 | #include | ^~~~~~~~~~~ compilation terminated. [19912/23484] CXX host/obj/crypto/crypto/sha2.o [19913/23484] CXX host/obj/crypto/crypto/secure_hash.o [19914/23484] CXX host/obj/base/base/base_jumbo_7.o [19915/23484] CXX host/obj/crypto/crypto/signature_creator.o [19916/23484] CXX host/obj/base/base/base_jumbo_11.o [19917/23484] CXX host/obj/crypto/crypto/symmetric_key.o [19918/23484] CXX host/obj/crypto/crypto/signature_verifier.o [19919/23484] CXX host/obj/base/base/base_jumbo_4.o In file included from host/gen/base/base_jumbo_4.cc:6: ./../../3rdparty/chromium/base/debug/alias.cc:11: warning: ignoring #pragma clang max_tokens_here [-Wunknown-pragmas] 11 | #pragma clang max_tokens_here 250 | ninja: build stopped: subcommand failed. make[5]: *** [Makefile.gn_run:356: run_ninja] Error 1 make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 2 make[3]: *** [Makefile:79: sub-core-make_first] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.8/.stamp_built] Error 2 make: *** [Makefile:84: _all] Error 2 Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Jan 12 13:02:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 14:02:25 +0100 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats In-Reply-To: References: <20220110131624.3639727-1-arnout@mind.be> Message-ID: <38cad31f-a5ed-6054-9fb3-f2abd5edae92@mind.be> On 10/01/2022 18:25, Norbert Lange wrote: > Hello, > > Am Mo., 10. Jan. 2022 um 14:16 Uhr schrieb Arnout Vandecappelle > (Essensium/Mind) : >> >> Bumping the version of systemd is a little more complicated than the >> usual package, and it's easy to forget some of the things that need to >> be done - and this has happened several times in the past. >> >> Add a checklist of things to worry about when updating systemd. >> >> Note that there are many other complicated packages that also need a lot >> of attention when upgrading. However, systemd is a really critical >> package so it's more important that we get that one right than, say, >> valgrind. >> >> Cc: Norbert Lange >> Cc: J?r?my ROSEN >> Cc: Adam Duskett >> Cc: James Hilliard >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) >> --- >> package/systemd/systemd.mk | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >> index 3811dbae42..4d82d2ab81 100644 >> --- a/package/systemd/systemd.mk >> +++ b/package/systemd/systemd.mk >> @@ -4,6 +4,18 @@ >> # >> ################################################################################ >> >> +# When updating systemd, take care of the following: >> +# - Check if the requirements have changed (see README), in particular >> +# arch and headers >> +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD >> +# - If the required kernel options have changed, update the Config.in >> +# help text and the list of KCONFIG_ENABLE_OPT. >> +# - Check if there are new meson_options. Make sure all options are set >> +# explicitly (usually to default value). >> +# - If there are new services: >> +# - create new options for them (if they really are optional); >> +# - create a new _USER if necessary; >> +# - create new directionry (with _PERMISSIONS) if necessary. >> SYSTEMD_VERSION = 250.1 >> SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) >> SYSTEMD_LICENSE = \ >> -- >> 2.31.1 >> > > I wouldd add these: > > # - diff sysusers.d with the previous version > # - diff factory/etc/nsswitch.conf with the previous version > # (details are often sprinkled around in README and manpages) If you think a patch is good to go with some changes applied, please add something like: With those changes applied, you can add my Reviewed-by: ... If you reply with just a few comments (or worse, if you don't reply at all), it's hard to know for us as maintainers if we should consider the patch approved or not. Regards, Arnout > > and, somewhat more cynical: > > # - dont bother with x.0 versions > > Norbert > From aperez at igalia.com Wed Jan 12 13:26:16 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 15:26:16 +0200 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages Message-ID: <20220112132618.2634250-1-aperez@igalia.com> Hello everybody, As discussed yesterday, here is a quick stab for testing and getting the conversation started about using Ninja for CMake-based packages (hence the missing documentation updates and the "RFC" tag in the subject :-D). In order to avoid the circular dependency of host-ninja requiring itself, ninja.mk gets changed to use host-generic-package with a build command that plainly runs the compiler on the set of sources we know are needed to build a minimal usable version of it under Unix-y systems. This is basically the list of sources that CMake would have picked (as per the CMakeLists.txt file) passed straight to $(HOSTCXX). The next change modifies pkg-cmake.mk to always pass -GNinja and removes the $(_INSTALL[_STAGING,_TARGET]_OPTS) variables, because when using Ninja the "install/fast" targets are not generated by CMake (those are an internal detail of the Makefile generator, it seems). For consistency with the Meson package infrastructure variables $(NINJA), $(_NINJA_ENV) and $(NINJA_OPTS) are honored by the default set of build/install commands. Now, there might be packages that break with this, and I would be particularly concerned about things like packages which use CMake and build out-of-tree kernel modules (as the kernel build infrastructure is all Make, and only Make!) but the changes included were enough for me to get Raspberry Pi images built with WebKit (both GTK and WPE ports) in it, which results in the following built using [host-]cmake-package: - brotli - cog - jpeg-turbo - openjpeg - webkitgtk - webp - woff2 - wpewebkit While not a long list by any means, I think it shows a decent sample of packages coming from different development teams that work just fine switching to Ninja. If anybody can suggest something with a bigger number of CMake packages to build (or a .config file to share) I will be more than happy to give it a test this with these patches applied :) Cheers, -Adrian Adrian Perez de Castro (2): package/ninja: do not require cmake package/pkg-cmake.mk: use ninja instead of make package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- package/pkg-cmake.mk | 24 ++++++++++++++---------- 2 files changed, 49 insertions(+), 11 deletions(-) -- 2.34.1 From aperez at igalia.com Wed Jan 12 13:26:17 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 15:26:17 +0200 Subject: [Buildroot] [PATCH RFC 1/2] package/ninja: do not require cmake In-Reply-To: <20220112132618.2634250-1-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> Message-ID: <20220112132618.2634250-2-aperez@igalia.com> Use host-generic-package to manually build ninja. This avoids the need for host-cmake in preparation for the CMake build system machinery being changed to use ninja instead of make. Signed-off-by: Adrian Perez de Castro --- package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index ab1941023e..ae3be6a14f 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -9,8 +9,42 @@ NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING +# Ninja is used by CMake-based packages, avoid a circular dependency by +# by using host-generic-package instead and using a single command to +# compile the binary. This does in essence the same as the "bootstrap.py" +# included in the distribution avoiding the need for host-python. +define HOST_NINJA_BUILD_CMDS + cd $(@D) && $(HOSTCXX) $(HOST_CXXFLAGS) $(HOST_LDFLAGS) \ + src/build_log.cc \ + src/build.cc \ + src/clean.cc \ + src/clparser.cc \ + src/dyndep.cc \ + src/dyndep_parser.cc \ + src/debug_flags.cc \ + src/deps_log.cc \ + src/disk_interface.cc \ + src/edit_distance.cc \ + src/eval_env.cc \ + src/graph.cc \ + src/graphviz.cc \ + src/line_printer.cc \ + src/manifest_parser.cc \ + src/metrics.cc \ + src/parser.cc \ + src/state.cc \ + src/string_piece_util.cc \ + src/util.cc \ + src/version.cc \ + src/depfile_parser.cc \ + src/lexer.cc \ + src/subprocess-posix.cc \ + src/ninja.cc \ + -o ninja +endef + define HOST_NINJA_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja endef -$(eval $(host-cmake-package)) +$(eval $(host-generic-package)) -- 2.34.1 From aperez at igalia.com Wed Jan 12 13:26:18 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 15:26:18 +0200 Subject: [Buildroot] [PATCH RFC 2/2] package/pkg-cmake.mk: use ninja instead of make In-Reply-To: <20220112132618.2634250-1-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> Message-ID: <20220112132618.2634250-3-aperez@igalia.com> Switch to ninja as the build tool for the CMake package infrastructure. Note that the changes make packages which use [host-]cmake-package depend on host-ninja. Signed-off-by: Adrian Perez de Castro --- package/pkg-cmake.mk | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..65f005a914 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -88,6 +83,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ @@ -117,6 +113,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -154,6 +151,8 @@ endif # primitives to find {C,LD}FLAGS, add it to the dependency list. $(2)_DEPENDENCIES += host-pkgconf +$(2)_DEPENDENCIES += host-ninja + $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # @@ -163,11 +162,13 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif endif @@ -178,7 +179,8 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -188,7 +190,8 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -198,7 +201,8 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif -- 2.34.1 From aperez at igalia.com Wed Jan 12 13:29:40 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 15:29:40 +0200 Subject: [Buildroot] [PATCH RFC 1/1] package/wpewebkit: use ninja for faster builds In-Reply-To: <20220111170918.GV1477939@scaer> References: <20220111145527.3422053-1-aperez@igalia.com> <20220111170918.GV1477939@scaer> Message-ID: <20220112152940.GC1050037@momiji> Hi Yann, all, On Tue, 11 Jan 2022 18:09:18 +0100 "Yann E. MORIN" wrote: > Adrian, All, > > On 2022-01-11 16:55 +0200, Adrian Perez de Castro spake thusly: > > Instruct CMake to use the Ninja generator, and override build/install > > commands to use Ninja instead, which results in faster builds. The > > host-ninja package is required to build some of the dependencies used > > by wpewebkit (e.g. libepoxy) so in practice this is not introducing > > a new host dependency that would slow down the build. > > As discussed on IRC, we concluded that a better option is to make the > cmake-package infrastructure in Buildroot ninja-aware, and that you were > going to have a look at it. Thanks! :-) Here goes: https://patchwork.ozlabs.org/project/buildroot/list/?series=280723 > So, I've marked this patch as rejected in patchwork. Good, as said on IRC, I also agree it worth it to take the long route and try to get all CMake packages (or most, if all is not possible) working with Ninja :) Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From jose.pekkarinen at unikie.com Wed Jan 12 14:15:16 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Wed, 12 Jan 2022 16:15:16 +0200 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: <20220105214129.2f5fffae@windsurf> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> Message-ID: On Wed, Jan 5, 2022 at 10:41 PM Thomas Petazzoni wrote: > > Hello Jos?, > > On Fri, 10 Dec 2021 16:12:04 +0200 > Jos? Pekkarinen wrote: > > > This patch adds a new package for minijail. > > > > Signed-off-by: Jos? Pekkarinen > > I wanted to apply after fixing the issues pointed by others, but there > are in fact other issues, which I cannot resolve directly. See below. > > > diff --git a/package/minijail/0001-Fix-prlimit-call.patch b/package/minijail/0001-Fix-prlimit-call.patch > > new file mode 100644 > > index 0000000000..9f6902ed43 > > --- /dev/null > > +++ b/package/minijail/0001-Fix-prlimit-call.patch > > @@ -0,0 +1,29 @@ > > +From 09348f06104bf8101a24a0bce235a75a214e1380 Mon Sep 17 00:00:00 2001 > > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > > +Date: Fri, 10 Dec 2021 14:20:30 +0200 > > +Subject: [PATCH] Fix prlimit call > > What are you "fixing"? You're replacing a prlimit() call by by > setrlimit(), but why? What problem does it solve? Why is it correct to > do that? The problem is shown from as this: /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c: In function ?set_rlimits_or_die?: /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:1911:7: error: implicit declaration of function ?prlimit?; did you mean ?setrlimit?? [-Werror=implicit-function-declaration] 1911 | if (prlimit(j->initpid, j->rlimits[i].type, &limit, NULL)) | ^~~~~~~ | setrlimit So I followed the suggestion, no more, no less. > > diff --git a/package/minijail/0002-Fix-static-assert.patch b/package/minijail/0002-Fix-static-assert.patch > > new file mode 100644 > > index 0000000000..48139e8baa > > --- /dev/null > > +++ b/package/minijail/0002-Fix-static-assert.patch > > @@ -0,0 +1,30 @@ > > +From b5d91b793942747e5126e75abca2eebad60ab478 Mon Sep 17 00:00:00 2001 > > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > > +Date: Fri, 10 Dec 2021 14:21:38 +0200 > > +Subject: [PATCH] Fix static assert > > +MIME-Version: 1.0 > > +Content-Type: text/plain; charset=UTF-8 > > +Content-Transfer-Encoding: 8bit > > + > > +Signed-off-by: Jos? Pekkarinen > > +--- > > + libminijail.c | 3 --- > > + 1 file changed, 3 deletions(-) > > + > > +diff --git a/libminijail.c b/libminijail.c > > +index 45f133e..8323742 100644 > > +--- a/libminijail.c > > ++++ b/libminijail.c > > +@@ -2620,9 +2620,6 @@ static int fd_is_open(int fd) > > + return fcntl(fd, F_GETFD) != -1 || errno != EBADF; > > + } > > + > > +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > > +- "If true, ensure_no_fd_conflict will always find an unused fd."); > > You're not fixing the static_assert() here but simply dropping it. Why? > When does it fail? What is the problem with it? Why is it safe to drop > it? It fails like this: /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2623:15: error: expected declaration specifiers or ?...? before numeric constant 2623 | static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, | ^~~~~~~~~~ /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2624:8: error: expected declaration specifiers or ?...? before string constant 2624 | "If true, ensure_no_fd_conflict will always find an unused fd."); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So my understanding is that this platform may define static_assert in a different manner, and I find no traces of the purpose of that isolated assert, so the easier way to get around this was removing it. Best regards Jos?. From thomas.petazzoni at bootlin.com Wed Jan 12 14:35:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 15:35:16 +0100 Subject: [Buildroot] [PATCH RFC 2/2] package/pkg-cmake.mk: use ninja instead of make In-Reply-To: <20220112132618.2634250-3-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112132618.2634250-3-aperez@igalia.com> Message-ID: <20220112153516.239321c8@windsurf> Hello, On Wed, 12 Jan 2022 15:26:18 +0200 Adrian Perez de Castro wrote: > Switch to ninja as the build tool for the CMake package infrastructure. > Note that the changes make packages which use [host-]cmake-package > depend on host-ninja. > > Signed-off-by: Adrian Perez de Castro > --- > package/pkg-cmake.mk | 24 ++++++++++++++---------- > 1 file changed, 14 insertions(+), 10 deletions(-) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 3b1db35fb6..65f005a914 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -51,11 +51,6 @@ endif > > define inner-cmake-package > > -$(2)_MAKE ?= $$(MAKE) > -$(2)_INSTALL_OPTS ?= install > -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast This means an audit of all cmake-package packages need to be done to see if any of those variables is used. I could spot: MUSEPACK_MAKE = $(MAKE1) But also: HOST_MARIADB_MAKE_OPTS = import_executables Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 14:36:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 15:36:34 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112132618.2634250-1-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> Message-ID: <20220112153634.3e604cbc@windsurf> Hello Adrian, On Wed, 12 Jan 2022 15:26:16 +0200 Adrian Perez de Castro wrote: > While not a long list by any means, I think it shows a decent sample of > packages coming from different development teams that work just fine > switching to Ninja. > > If anybody can suggest something with a bigger number of CMake packages to > build (or a .config file to share) I will be more than happy to give it a > test this with these patches applied :) Packages that need to be tested: ./package/alure/alure.mk ./package/apitrace/apitrace.mk ./package/armadillo/armadillo.mk ./package/assimp/assimp.mk ./package/avro-c/avro-c.mk ./package/azmq/azmq.mk ./package/azure-iot-sdk-c/azure-iot-sdk-c.mk ./package/bcg729/bcg729.mk ./package/bctoolbox/bctoolbox.mk ./package/belle-sip/belle-sip.mk ./package/belr/belr.mk ./package/bento4/bento4.mk ./package/brickd/brickd.mk ./package/brotli/brotli.mk ./package/bullet/bullet.mk ./package/cannelloni/cannelloni.mk ./package/cctz/cctz.mk ./package/cdrkit/cdrkit.mk ./package/cegui/cegui.mk ./package/cereal/cereal.mk ./package/cfm/cfm.mk ./package/chipmunk/chipmunk.mk ./package/cjson/cjson.mk ./package/clang/clang.mk ./package/cmake/cmake.mk ./package/cmocka/cmocka.mk ./package/cog/cog.mk ./package/c-periphery/c-periphery.mk ./package/cppcms/cppcms.mk ./package/cppdb/cppdb.mk ./package/cppzmq/cppzmq.mk ./package/curlpp/curlpp.mk ./package/cutelyst/cutelyst.mk ./package/domoticz/domoticz.mk ./package/doxygen/doxygen.mk ./package/easydbus/easydbus.mk ./package/easyframes/easyframes.mk ./package/eigen/eigen.mk ./package/exiv2/exiv2.mk ./package/fatcat/fatcat.mk ./package/firmware-utils/firmware-utils.mk ./package/flann/flann.mk ./package/flare-engine/flare-engine.mk ./package/flare-game/flare-game.mk ./package/flatbuffers/flatbuffers.mk ./package/flatcc/flatcc.mk ./package/fluidsynth/fluidsynth.mk ./package/fmt/fmt.mk ./package/freerdp/freerdp.mk ./package/gerbera/gerbera.mk ./package/gflags/gflags.mk ./package/gli/gli.mk ./package/glm/glm.mk ./package/glog/glog.mk ./package/gnuradio/gnuradio.mk ./package/gqrx/gqrx.mk ./package/grantlee/grantlee.mk ./package/graphite2/graphite2.mk ./package/gr-osmosdr/gr-osmosdr.mk ./package/grpc/grpc.mk ./package/gtest/gtest.mk ./package/hackrf/hackrf.mk ./package/hiawatha/hiawatha.mk ./package/hiredis/hiredis.mk ./package/i2pd/i2pd.mk ./package/intel-gmmlib/intel-gmmlib.mk ./package/intel-mediadriver/intel-mediadriver.mk ./package/intel-mediasdk/intel-mediasdk.mk ./package/jasper/jasper.mk ./package/jpeg-turbo/jpeg-turbo.mk ./package/json-c/json-c.mk ./package/json-for-modern-cpp/json-for-modern-cpp.mk ./package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk ./package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk ./package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk ./package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk ./package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk ./package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk ./package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk ./package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk ./package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk ./package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk ./package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk ./package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk ./package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk ./package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk ./package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk ./package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk ./package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk ./package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk ./package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk ./package/kodi/kodi.mk ./package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk ./package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk ./package/kodi-pvr-argustv/kodi-pvr-argustv.mk ./package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk ./package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk ./package/kodi-pvr-filmon/kodi-pvr-filmon.mk ./package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk ./package/kodi-pvr-hts/kodi-pvr-hts.mk ./package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk ./package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk ./package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk ./package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk ./package/kodi-pvr-njoy/kodi-pvr-njoy.mk ./package/kodi-pvr-octonet/kodi-pvr-octonet.mk ./package/kodi-pvr-pctv/kodi-pvr-pctv.mk ./package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk ./package/kodi-pvr-stalker/kodi-pvr-stalker.mk ./package/kodi-pvr-vbox/kodi-pvr-vbox.mk ./package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk ./package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk ./package/kodi-pvr-waipu/kodi-pvr-waipu.mk ./package/kodi-pvr-wmc/kodi-pvr-wmc.mk ./package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk ./package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk ./package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk ./package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk ./package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk ./package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk ./package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk ./package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk ./package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk ./package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk ./package/kodi-screensaver-stars/kodi-screensaver-stars.mk ./package/kodi-texturepacker/kodi-texturepacker.mk ./package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk ./package/kodi-vfs-rar/kodi-vfs-rar.mk ./package/kodi-vfs-sftp/kodi-vfs-sftp.mk ./package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk ./package/kodi-visualisation-goom/kodi-visualisation-goom.mk ./package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk ./package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk ./package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk ./package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk ./package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk ./package/lapack/lapack.mk ./package/lensfun/lensfun.mk ./package/let-me-create/let-me-create.mk ./package/leveldb/leveldb.mk ./package/libabseil-cpp/libabseil-cpp.mk ./package/libasplib/libasplib.mk ./package/libcec/libcec.mk ./package/libcgi/libcgi.mk ./package/libcodec2/libcodec2.mk ./package/libcorrect/libcorrect.mk ./package/libcpprestsdk/libcpprestsdk.mk ./package/libcuefile/libcuefile.mk ./package/libcue/libcue.mk ./package/libeastl/libeastl.mk ./package/libebml/libebml.mk ./package/libebur128/libebur128.mk ./package/libfreeglut/libfreeglut.mk ./package/libftdi1/libftdi1.mk ./package/libgeos/libgeos.mk ./package/libgit2/libgit2.mk ./package/libglfw/libglfw.mk ./package/libgta/libgta.mk ./package/libical/libical.mk ./package/libiec61850/libiec61850.mk ./package/libiio/libiio.mk ./package/libiqrf/libiqrf.mk ./package/libks/libks.mk ./package/libmatroska/libmatroska.mk ./package/libmdbx/libmdbx.mk ./package/libminiupnpc/libminiupnpc.mk ./package/libnetconf2/libnetconf2.mk ./package/libolm/libolm.mk ./package/libosmium/libosmium.mk ./package/libplatform/libplatform.mk ./package/libressl/libressl.mk ./package/librsync/librsync.mk ./package/librtlsdr/librtlsdr.mk ./package/libsoxr/libsoxr.mk ./package/libspatialindex/libspatialindex.mk ./package/libssh/libssh.mk ./package/libubootenv/libubootenv.mk ./package/libubox/libubox.mk ./package/libuci/libuci.mk ./package/libuecc/libuecc.mk ./package/libuhttpd/libuhttpd.mk ./package/liburiparser/liburiparser.mk ./package/libuwsc/libuwsc.mk ./package/libvncserver/libvncserver.mk ./package/libwebsockets/libwebsockets.mk ./package/libyang/libyang.mk ./package/libyuv/libyuv.mk ./package/libzip/libzip.mk ./package/linphone/linphone.mk ./package/linux-serial-test/linux-serial-test.mk ./package/lld/lld.mk ./package/llvm/llvm.mk ./package/log4cxx/log4cxx.mk ./package/log4qt/log4qt.mk ./package/lua-ev/lua-ev.mk ./package/lua-sdl2/lua-sdl2.mk ./package/lugaru/lugaru.mk ./package/luvi/luvi.mk ./package/luv/luv.mk ./package/lzlib/lzlib.mk ./package/lzo/lzo.mk ./package/mariadb/mariadb.mk ./package/mbedtls/mbedtls.mk ./package/mediastreamer/mediastreamer.mk ./package/mfgtools/mfgtools.mk ./package/midori/midori.mk ./package/minetest/minetest.mk ./package/minizip/minizip.mk ./package/mjpg-streamer/mjpg-streamer.mk ./package/mraa/mraa.mk ./package/mrp/mrp.mk ./package/msgpack/msgpack.mk ./package/musepack/musepack.mk ./package/nanomsg/nanomsg.mk ./package/ne10/ne10.mk ./package/netopeer2/netopeer2.mk ./package/ninja/ninja.mk ./package/odhcp6c/odhcp6c.mk ./package/ogre/ogre.mk ./package/open62541/open62541.mk ./package/openal/openal.mk ./package/opencv3/opencv3.mk ./package/opencv4/opencv4.mk ./package/openfpgaloader/openfpgaloader.mk ./package/openjpeg/openjpeg.mk ./package/openobex/openobex.mk ./package/openpowerlink/openpowerlink.mk ./package/opentracing-cpp/opentracing-cpp.mk ./package/optee-benchmark/optee-benchmark.mk ./package/optee-client/optee-client.mk ./package/optee-examples/optee-examples.mk ./package/optee-test/optee-test.mk ./package/ortp/ortp.mk ./package/osm2pgsql/osm2pgsql.mk ./package/paho-mqtt-c/paho-mqtt-c.mk ./package/paho-mqtt-cpp/paho-mqtt-cpp.mk ./package/physfs/physfs.mk ./package/piglit/piglit.mk ./package/pistache/pistache.mk ./package/pkg-cmake.mk ./package/poppler/poppler.mk ./package/protozero/protozero.mk ./package/pugixml/pugixml.mk ./package/pulseview/pulseview.mk ./package/python-pybind/python-pybind.mk ./package/qhull/qhull.mk ./package/qjson/qjson.mk ./package/qpid-proton/qpid-proton.mk ./package/qt5/qt5webkit/qt5webkit.mk ./package/quazip/quazip.mk ./package/rabbitmq-c/rabbitmq-c.mk ./package/racehound/racehound.mk ./package/rapidjson/rapidjson.mk ./package/re2/re2.mk ./package/read-edid/read-edid.mk ./package/rpi-userland/rpi-userland.mk ./package/rtl_433/rtl_433.mk ./package/rtty/rtty.mk ./package/sdbus-cpp/sdbus-cpp.mk ./package/sentry-native/sentry-native.mk ./package/simple-mail/simple-mail.mk ./package/snappy/snappy.mk ./package/snort3/snort3.mk ./package/solarus/solarus.mk ./package/spdlog/spdlog.mk ./package/stellarium/stellarium.mk ./package/supertuxkart/supertuxkart.mk ./package/supertux/supertux.mk ./package/synergy/synergy.mk ./package/sysdig/sysdig.mk ./package/sysrepo/sysrepo.mk ./package/taglib/taglib.mk ./package/taskd/taskd.mk ./package/tcf-agent/tcf-agent.mk ./package/thrift/thrift.mk ./package/timescaledb/timescaledb.mk ./package/tinyxml2/tinyxml2.mk ./package/ttyd/ttyd.mk ./package/ubus/ubus.mk ./package/uhd/uhd.mk ./package/uhttpd/uhttpd.mk ./package/unionfs/unionfs.mk ./package/unzip/unzip.mk ./package/uqmi/uqmi.mk ./package/ustream-ssl/ustream-ssl.mk ./package/utf8proc/utf8proc.mk ./package/uvw/uvw.mk ./package/valijson/valijson.mk ./package/vulkan-headers/vulkan-headers.mk ./package/waffle/waffle.mk ./package/wampcc/wampcc.mk ./package/waylandpp/waylandpp.mk ./package/webkitgtk/webkitgtk.mk ./package/websocketpp/websocketpp.mk ./package/wireshark/wireshark.mk ./package/woff2/woff2.mk ./package/wpewebkit/wpewebkit.mk ./package/x265/x265.mk ./package/xerces/xerces.mk ./package/xmrig/xmrig.mk ./package/yajl/yajl.mk ./package/yaml-cpp/yaml-cpp.mk ./package/ympd/ympd.mk ./package/zlib-ng/zlib-ng.mk ./package/znc/znc.mk ./package/zxing-cpp/zxing-cpp.mk ./package/zziplib/zziplib.mk The list is much longer than the ~10 samples you have taken I'm afraid :-) Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 14:51:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 15:51:03 +0100 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> Message-ID: <20220112155103.7e6c11c0@windsurf> Hello, On Wed, 12 Jan 2022 16:15:16 +0200 Jos? Pekkarinen wrote: > > What are you "fixing"? You're replacing a prlimit() call by by > > setrlimit(), but why? What problem does it solve? Why is it correct to > > do that? > > The problem is shown from as this: > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c: > In function ?set_rlimits_or_die?: > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:1911:7: > error: implicit declaration of function ?prlimit?; did you mean > ?setrlimit?? [-Werror=implicit-function-declaration] > 1911 | if (prlimit(j->initpid, j->rlimits[i].type, &limit, NULL)) > | ^~~~~~~ > | setrlimit > > So I followed the suggestion, no more, no less. You shouldn't blindly follow compiler suggestions :-) prlimit() exists in musl. Was included, as suggested by the prlimit() man page ? > > > +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > > > +- "If true, ensure_no_fd_conflict will always find an unused fd."); > > > > You're not fixing the static_assert() here but simply dropping it. Why? > > When does it fail? What is the problem with it? Why is it safe to drop > > it? > > It fails like this: > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2623:15: > error: expected declaration specifiers or ?...? before numeric > constant > 2623 | static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > | ^~~~~~~~~~ > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2624:8: > error: expected declaration specifiers or ?...? before string constant > 2624 | "If true, ensure_no_fd_conflict will always find an unused fd."); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > So my understanding is that this platform may > define static_assert in a different manner, and I > find no traces of the purpose of that isolated assert, > so the easier way to get around this was removing it. Well, the assert is there for a reason, so we need to understand what it is verifying, and whether it is safe to drop it. After checking, FD_SETSIZE seems to be defined to 1024 by glibc, musl and uclibc-ng, and MAX_PRESERVED_FDS is defined as 128 by the minijail code. Can you try using _Static_assert() instead, which is part of the C11 standard? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From jose.pekkarinen at unikie.com Wed Jan 12 15:08:26 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Wed, 12 Jan 2022 17:08:26 +0200 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: <20220112155103.7e6c11c0@windsurf> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> <20220112155103.7e6c11c0@windsurf> Message-ID: On Wed, Jan 12, 2022 at 4:51 PM Thomas Petazzoni wrote: > > Hello, > > On Wed, 12 Jan 2022 16:15:16 +0200 > Jos? Pekkarinen wrote: > > > > What are you "fixing"? You're replacing a prlimit() call by by > > > setrlimit(), but why? What problem does it solve? Why is it correct to > > > do that? > > > > The problem is shown from as this: > > > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c: > > In function ?set_rlimits_or_die?: > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:1911:7: > > error: implicit declaration of function ?prlimit?; did you mean > > ?setrlimit?? [-Werror=implicit-function-declaration] > > 1911 | if (prlimit(j->initpid, j->rlimits[i].type, &limit, NULL)) > > | ^~~~~~~ > > | setrlimit > > > > So I followed the suggestion, no more, no less. > > You shouldn't blindly follow compiler suggestions :-) > > prlimit() exists in musl. Was included, as suggested > by the prlimit() man page ? It is: $ cat libminijail.c [...] #include [...] > > > > +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > > > > +- "If true, ensure_no_fd_conflict will always find an unused fd."); > > > > > > You're not fixing the static_assert() here but simply dropping it. Why? > > > When does it fail? What is the problem with it? Why is it safe to drop > > > it? > > > > It fails like this: > > > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2623:15: > > error: expected declaration specifiers or ?...? before numeric > > constant > > 2623 | static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > > | ^~~~~~~~~~ > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2624:8: > > error: expected declaration specifiers or ?...? before string constant > > 2624 | "If true, ensure_no_fd_conflict will always find an unused fd."); > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > So my understanding is that this platform may > > define static_assert in a different manner, and I > > find no traces of the purpose of that isolated assert, > > so the easier way to get around this was removing it. > > Well, the assert is there for a reason, so we need to understand what > it is verifying, and whether it is safe to drop it. > > After checking, FD_SETSIZE seems to be defined to 1024 by glibc, musl > and uclibc-ng, and MAX_PRESERVED_FDS is defined as 128 by the minijail > code. > > Can you try using _Static_assert() instead, which is part of the C11 > standard? I'll do. Thanks! Jos?. From aperez at igalia.com Wed Jan 12 15:09:38 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 17:09:38 +0200 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112153634.3e604cbc@windsurf> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112153634.3e604cbc@windsurf> Message-ID: <20220112170938.GB2519@momiji> Hi Thomas, all, On Wed, 12 Jan 2022 15:36:34 +0100 Thomas Petazzoni wrote: > On Wed, 12 Jan 2022 15:26:16 +0200 > Adrian Perez de Castro wrote: > > > While not a long list by any means, I think it shows a decent sample of > > packages coming from different development teams that work just fine > > switching to Ninja. > > > > If anybody can suggest something with a bigger number of CMake packages to > > build (or a .config file to share) I will be more than happy to give it a > > test this with these patches applied :) > > Packages that need to be tested: > > ./package/alure/alure.mk > ./package/apitrace/apitrace.mk > ./package/armadillo/armadillo.mk > ./package/assimp/assimp.mk > ./package/avro-c/avro-c.mk > ./package/azmq/azmq.mk > ./package/azure-iot-sdk-c/azure-iot-sdk-c.mk > ./package/bcg729/bcg729.mk > ./package/bctoolbox/bctoolbox.mk > ./package/belle-sip/belle-sip.mk > ./package/belr/belr.mk > ./package/bento4/bento4.mk > ./package/brickd/brickd.mk > ./package/brotli/brotli.mk > ./package/bullet/bullet.mk > ./package/cannelloni/cannelloni.mk > ./package/cctz/cctz.mk > ./package/cdrkit/cdrkit.mk > ./package/cegui/cegui.mk > ./package/cereal/cereal.mk > ./package/cfm/cfm.mk > ./package/chipmunk/chipmunk.mk > ./package/cjson/cjson.mk > ./package/clang/clang.mk > ./package/cmake/cmake.mk > ./package/cmocka/cmocka.mk > ./package/cog/cog.mk > ./package/c-periphery/c-periphery.mk > ./package/cppcms/cppcms.mk > ./package/cppdb/cppdb.mk > ./package/cppzmq/cppzmq.mk > ./package/curlpp/curlpp.mk > ./package/cutelyst/cutelyst.mk > ./package/domoticz/domoticz.mk > ./package/doxygen/doxygen.mk > ./package/easydbus/easydbus.mk > ./package/easyframes/easyframes.mk > ./package/eigen/eigen.mk > ./package/exiv2/exiv2.mk > ./package/fatcat/fatcat.mk > ./package/firmware-utils/firmware-utils.mk > ./package/flann/flann.mk > ./package/flare-engine/flare-engine.mk > ./package/flare-game/flare-game.mk > ./package/flatbuffers/flatbuffers.mk > ./package/flatcc/flatcc.mk > ./package/fluidsynth/fluidsynth.mk > ./package/fmt/fmt.mk > ./package/freerdp/freerdp.mk > ./package/gerbera/gerbera.mk > ./package/gflags/gflags.mk > ./package/gli/gli.mk > ./package/glm/glm.mk > ./package/glog/glog.mk > ./package/gnuradio/gnuradio.mk > ./package/gqrx/gqrx.mk > ./package/grantlee/grantlee.mk > ./package/graphite2/graphite2.mk > ./package/gr-osmosdr/gr-osmosdr.mk > ./package/grpc/grpc.mk > ./package/gtest/gtest.mk > ./package/hackrf/hackrf.mk > ./package/hiawatha/hiawatha.mk > ./package/hiredis/hiredis.mk > ./package/i2pd/i2pd.mk > ./package/intel-gmmlib/intel-gmmlib.mk > ./package/intel-mediadriver/intel-mediadriver.mk > ./package/intel-mediasdk/intel-mediasdk.mk > ./package/jasper/jasper.mk > ./package/jpeg-turbo/jpeg-turbo.mk > ./package/json-c/json-c.mk > ./package/json-for-modern-cpp/json-for-modern-cpp.mk > ./package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk > ./package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk > ./package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk > ./package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk > ./package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk > ./package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk > ./package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk > ./package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk > ./package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk > ./package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk > ./package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk > ./package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk > ./package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk > ./package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk > ./package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk > ./package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > ./package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk > ./package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk > ./package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > ./package/kodi/kodi.mk > ./package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk > ./package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk > ./package/kodi-pvr-argustv/kodi-pvr-argustv.mk > ./package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk > ./package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk > ./package/kodi-pvr-filmon/kodi-pvr-filmon.mk > ./package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk > ./package/kodi-pvr-hts/kodi-pvr-hts.mk > ./package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk > ./package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk > ./package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk > ./package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk > ./package/kodi-pvr-njoy/kodi-pvr-njoy.mk > ./package/kodi-pvr-octonet/kodi-pvr-octonet.mk > ./package/kodi-pvr-pctv/kodi-pvr-pctv.mk > ./package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk > ./package/kodi-pvr-stalker/kodi-pvr-stalker.mk > ./package/kodi-pvr-vbox/kodi-pvr-vbox.mk > ./package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > ./package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk > ./package/kodi-pvr-waipu/kodi-pvr-waipu.mk > ./package/kodi-pvr-wmc/kodi-pvr-wmc.mk > ./package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk > ./package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk > ./package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk > ./package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk > ./package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk > ./package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk > ./package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk > ./package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk > ./package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk > ./package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk > ./package/kodi-screensaver-stars/kodi-screensaver-stars.mk > ./package/kodi-texturepacker/kodi-texturepacker.mk > ./package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk > ./package/kodi-vfs-rar/kodi-vfs-rar.mk > ./package/kodi-vfs-sftp/kodi-vfs-sftp.mk > ./package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk > ./package/kodi-visualisation-goom/kodi-visualisation-goom.mk > ./package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk > ./package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk > ./package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk > ./package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk > ./package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk > ./package/lapack/lapack.mk > ./package/lensfun/lensfun.mk > ./package/let-me-create/let-me-create.mk > ./package/leveldb/leveldb.mk > ./package/libabseil-cpp/libabseil-cpp.mk > ./package/libasplib/libasplib.mk > ./package/libcec/libcec.mk > ./package/libcgi/libcgi.mk > ./package/libcodec2/libcodec2.mk > ./package/libcorrect/libcorrect.mk > ./package/libcpprestsdk/libcpprestsdk.mk > ./package/libcuefile/libcuefile.mk > ./package/libcue/libcue.mk > ./package/libeastl/libeastl.mk > ./package/libebml/libebml.mk > ./package/libebur128/libebur128.mk > ./package/libfreeglut/libfreeglut.mk > ./package/libftdi1/libftdi1.mk > ./package/libgeos/libgeos.mk > ./package/libgit2/libgit2.mk > ./package/libglfw/libglfw.mk > ./package/libgta/libgta.mk > ./package/libical/libical.mk > ./package/libiec61850/libiec61850.mk > ./package/libiio/libiio.mk > ./package/libiqrf/libiqrf.mk > ./package/libks/libks.mk > ./package/libmatroska/libmatroska.mk > ./package/libmdbx/libmdbx.mk > ./package/libminiupnpc/libminiupnpc.mk > ./package/libnetconf2/libnetconf2.mk > ./package/libolm/libolm.mk > ./package/libosmium/libosmium.mk > ./package/libplatform/libplatform.mk > ./package/libressl/libressl.mk > ./package/librsync/librsync.mk > ./package/librtlsdr/librtlsdr.mk > ./package/libsoxr/libsoxr.mk > ./package/libspatialindex/libspatialindex.mk > ./package/libssh/libssh.mk > ./package/libubootenv/libubootenv.mk > ./package/libubox/libubox.mk > ./package/libuci/libuci.mk > ./package/libuecc/libuecc.mk > ./package/libuhttpd/libuhttpd.mk > ./package/liburiparser/liburiparser.mk > ./package/libuwsc/libuwsc.mk > ./package/libvncserver/libvncserver.mk > ./package/libwebsockets/libwebsockets.mk > ./package/libyang/libyang.mk > ./package/libyuv/libyuv.mk > ./package/libzip/libzip.mk > ./package/linphone/linphone.mk > ./package/linux-serial-test/linux-serial-test.mk > ./package/lld/lld.mk > ./package/llvm/llvm.mk > ./package/log4cxx/log4cxx.mk > ./package/log4qt/log4qt.mk > ./package/lua-ev/lua-ev.mk > ./package/lua-sdl2/lua-sdl2.mk > ./package/lugaru/lugaru.mk > ./package/luvi/luvi.mk > ./package/luv/luv.mk > ./package/lzlib/lzlib.mk > ./package/lzo/lzo.mk > ./package/mariadb/mariadb.mk > ./package/mbedtls/mbedtls.mk > ./package/mediastreamer/mediastreamer.mk > ./package/mfgtools/mfgtools.mk > ./package/midori/midori.mk > ./package/minetest/minetest.mk > ./package/minizip/minizip.mk > ./package/mjpg-streamer/mjpg-streamer.mk > ./package/mraa/mraa.mk > ./package/mrp/mrp.mk > ./package/msgpack/msgpack.mk > ./package/musepack/musepack.mk > ./package/nanomsg/nanomsg.mk > ./package/ne10/ne10.mk > ./package/netopeer2/netopeer2.mk > ./package/ninja/ninja.mk > ./package/odhcp6c/odhcp6c.mk > ./package/ogre/ogre.mk > ./package/open62541/open62541.mk > ./package/openal/openal.mk > ./package/opencv3/opencv3.mk > ./package/opencv4/opencv4.mk > ./package/openfpgaloader/openfpgaloader.mk > ./package/openjpeg/openjpeg.mk > ./package/openobex/openobex.mk > ./package/openpowerlink/openpowerlink.mk > ./package/opentracing-cpp/opentracing-cpp.mk > ./package/optee-benchmark/optee-benchmark.mk > ./package/optee-client/optee-client.mk > ./package/optee-examples/optee-examples.mk > ./package/optee-test/optee-test.mk > ./package/ortp/ortp.mk > ./package/osm2pgsql/osm2pgsql.mk > ./package/paho-mqtt-c/paho-mqtt-c.mk > ./package/paho-mqtt-cpp/paho-mqtt-cpp.mk > ./package/physfs/physfs.mk > ./package/piglit/piglit.mk > ./package/pistache/pistache.mk > ./package/pkg-cmake.mk > ./package/poppler/poppler.mk > ./package/protozero/protozero.mk > ./package/pugixml/pugixml.mk > ./package/pulseview/pulseview.mk > ./package/python-pybind/python-pybind.mk > ./package/qhull/qhull.mk > ./package/qjson/qjson.mk > ./package/qpid-proton/qpid-proton.mk > ./package/qt5/qt5webkit/qt5webkit.mk > ./package/quazip/quazip.mk > ./package/rabbitmq-c/rabbitmq-c.mk > ./package/racehound/racehound.mk > ./package/rapidjson/rapidjson.mk > ./package/re2/re2.mk > ./package/read-edid/read-edid.mk > ./package/rpi-userland/rpi-userland.mk > ./package/rtl_433/rtl_433.mk > ./package/rtty/rtty.mk > ./package/sdbus-cpp/sdbus-cpp.mk > ./package/sentry-native/sentry-native.mk > ./package/simple-mail/simple-mail.mk > ./package/snappy/snappy.mk > ./package/snort3/snort3.mk > ./package/solarus/solarus.mk > ./package/spdlog/spdlog.mk > ./package/stellarium/stellarium.mk > ./package/supertuxkart/supertuxkart.mk > ./package/supertux/supertux.mk > ./package/synergy/synergy.mk > ./package/sysdig/sysdig.mk > ./package/sysrepo/sysrepo.mk > ./package/taglib/taglib.mk > ./package/taskd/taskd.mk > ./package/tcf-agent/tcf-agent.mk > ./package/thrift/thrift.mk > ./package/timescaledb/timescaledb.mk > ./package/tinyxml2/tinyxml2.mk > ./package/ttyd/ttyd.mk > ./package/ubus/ubus.mk > ./package/uhd/uhd.mk > ./package/uhttpd/uhttpd.mk > ./package/unionfs/unionfs.mk > ./package/unzip/unzip.mk > ./package/uqmi/uqmi.mk > ./package/ustream-ssl/ustream-ssl.mk > ./package/utf8proc/utf8proc.mk > ./package/uvw/uvw.mk > ./package/valijson/valijson.mk > ./package/vulkan-headers/vulkan-headers.mk > ./package/waffle/waffle.mk > ./package/wampcc/wampcc.mk > ./package/waylandpp/waylandpp.mk > ./package/webkitgtk/webkitgtk.mk > ./package/websocketpp/websocketpp.mk > ./package/wireshark/wireshark.mk > ./package/woff2/woff2.mk > ./package/wpewebkit/wpewebkit.mk > ./package/x265/x265.mk > ./package/xerces/xerces.mk > ./package/xmrig/xmrig.mk > ./package/yajl/yajl.mk > ./package/yaml-cpp/yaml-cpp.mk > ./package/ympd/ympd.mk > ./package/zlib-ng/zlib-ng.mk > ./package/znc/znc.mk > ./package/zxing-cpp/zxing-cpp.mk > ./package/zziplib/zziplib.mk Ah, I guess you grepped the *.mk files for "cmake-package"; that didn't cross my mind but now that it crossed my mind I feel silly for not thinking about it before ^_^ > The list is much longer than the ~10 samples you have taken I'm afraid :-) Of course I knew it would be way longer, but I wanted to show something quick after yesterday's discussion on IRC. I'll keep poking at things to see how it fares for the rest of packages above and publish updated versions of the patch set as I go fixing things. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From thomas.petazzoni at bootlin.com Wed Jan 12 16:00:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 17:00:43 +0100 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> <20220112155103.7e6c11c0@windsurf> Message-ID: <20220112170043.03abd8c1@windsurf> On Wed, 12 Jan 2022 17:08:26 +0200 Jos? Pekkarinen wrote: > > prlimit() exists in musl. Was included, as suggested > > by the prlimit() man page ? > > It is: > > $ cat libminijail.c > [...] > #include > [...] Ah, it's uClibc that is missing prlimit(). Can you confirm that minijail builds fine with glibc and musl, but breaks on uClibc due to prlimit() being missing? I'm not sure it's possible to replace prlimit() by setrlimit(). Indeed, prlimit() has a PID as the first argument, which allows to ste resource limits on other processes, while setrlimit() only takes care of the current process. I'm afraid it seems we will have to disallow the use of minijail with uClibc toolchains. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 16:02:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 17:02:34 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112170938.GB2519@momiji> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112153634.3e604cbc@windsurf> <20220112170938.GB2519@momiji> Message-ID: <20220112170226.1f5c8cea@windsurf> On Wed, 12 Jan 2022 17:09:38 +0200 Adrian Perez de Castro wrote: > Ah, I guess you grepped the *.mk files for "cmake-package"; that didn't > cross my mind but now that it crossed my mind I feel silly for not thinking > about it before ^_^ Exactly what I did, indeed. Please note that we do not require that absolutely all packages are tested before merging this. The autobuilders will not their amount of work there to validate everything. But it would be good to have tested a wider configuration with more CMake packages enabled. Make sure to include the defconfig you have tested in the cover letter. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From post at lespocky.de Wed Jan 12 16:05:13 2022 From: post at lespocky.de (Alexander Dahl) Date: Wed, 12 Jan 2022 17:05:13 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112132618.2634250-1-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> Message-ID: <20220112160512.GC6032@falbala.internal.home.lespocky.de> Hello Adrian, On Wed, Jan 12, 2022 at 03:26:16PM +0200, Adrian Perez de Castro wrote: > As discussed yesterday, here is a quick stab for testing and getting the > conversation started about using Ninja for CMake-based packages (hence the > missing documentation updates and the "RFC" tag in the subject :-D). I miss some general motivation for switching from Makefile to Ninja generator. Can you add some reasoning or numbers to upcoming patch set revisions? Thanks and greets Alex > > In order to avoid the circular dependency of host-ninja requiring itself, > ninja.mk gets changed to use host-generic-package with a build command > that plainly runs the compiler on the set of sources we know are needed > to build a minimal usable version of it under Unix-y systems. This is > basically the list of sources that CMake would have picked (as per the > CMakeLists.txt file) passed straight to $(HOSTCXX). > > The next change modifies pkg-cmake.mk to always pass -GNinja and removes > the $(_INSTALL[_STAGING,_TARGET]_OPTS) variables, because when using > Ninja the "install/fast" targets are not generated by CMake (those are > an internal detail of the Makefile generator, it seems). For consistency > with the Meson package infrastructure variables $(NINJA), $(_NINJA_ENV) > and $(NINJA_OPTS) are honored by the default set of build/install commands. > > Now, there might be packages that break with this, and I would be > particularly concerned about things like packages which use CMake and > build out-of-tree kernel modules (as the kernel build infrastructure is > all Make, and only Make!) but the changes included were enough for me > to get Raspberry Pi images built with WebKit (both GTK and WPE ports) > in it, which results in the following built using [host-]cmake-package: > > - brotli > - cog > - jpeg-turbo > - openjpeg > - webkitgtk > - webp > - woff2 > - wpewebkit > > While not a long list by any means, I think it shows a decent sample of > packages coming from different development teams that work just fine > switching to Ninja. > > If anybody can suggest something with a bigger number of CMake packages to > build (or a .config file to share) I will be more than happy to give it a > test this with these patches applied :) > > Cheers, > -Adrian > > > Adrian Perez de Castro (2): > package/ninja: do not require cmake > package/pkg-cmake.mk: use ninja instead of make > > package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- > package/pkg-cmake.mk | 24 ++++++++++++++---------- > 2 files changed, 49 insertions(+), 11 deletions(-) > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- /"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From aperez at igalia.com Wed Jan 12 16:47:29 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 18:47:29 +0200 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112160512.GC6032@falbala.internal.home.lespocky.de> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112160512.GC6032@falbala.internal.home.lespocky.de> Message-ID: <20220112184729.GB23006@momiji> Hi Alexander, On Wed, 12 Jan 2022 17:05:13 +0100 Alexander Dahl wrote: > On Wed, Jan 12, 2022 at 03:26:16PM +0200, Adrian Perez de Castro wrote: > > As discussed yesterday, here is a quick stab for testing and getting the > > conversation started about using Ninja for CMake-based packages (hence the > > missing documentation updates and the "RFC" tag in the subject :-D). > > I miss some general motivation for switching from Makefile to Ninja > generator. Can you add some reasoning or numbers to upcoming patch set > revisions? Ninja is generally faster, tends to make better use of parallelism, and in my experience less likely to break in odd ways. Once I have a defconfig with a bigger set of CMake-based packages working I'll do some numbers as well to compare build times before and after the switch to Ninja. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From aperez at igalia.com Wed Jan 12 16:51:43 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 18:51:43 +0200 Subject: [Buildroot] [PATCH RFC 2/2] package/pkg-cmake.mk: use ninja instead of make In-Reply-To: <20220112153516.239321c8@windsurf> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112132618.2634250-3-aperez@igalia.com> <20220112153516.239321c8@windsurf> Message-ID: <20220112185143.GE23006@momiji> Hi, On Wed, 12 Jan 2022 15:35:16 +0100 Thomas Petazzoni wrote: > On Wed, 12 Jan 2022 15:26:18 +0200 > Adrian Perez de Castro wrote: > > > Switch to ninja as the build tool for the CMake package infrastructure. > > Note that the changes make packages which use [host-]cmake-package > > depend on host-ninja. > > > > Signed-off-by: Adrian Perez de Castro > > --- > > package/pkg-cmake.mk | 24 ++++++++++++++---------- > > 1 file changed, 14 insertions(+), 10 deletions(-) > > > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > > index 3b1db35fb6..65f005a914 100644 > > --- a/package/pkg-cmake.mk > > +++ b/package/pkg-cmake.mk > > @@ -51,11 +51,6 @@ endif > > > > define inner-cmake-package > > > > -$(2)_MAKE ?= $$(MAKE) > > -$(2)_INSTALL_OPTS ?= install > > -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > > -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > > This means an audit of all cmake-package packages need to be done to > see if any of those variables is used. I will be going through the packages in the next days, for now a couple of notes on the ones you mentioned already, below. > I could spot: > > MUSEPACK_MAKE = $(MAKE1) I fixed this locally using: MUSEPACK_NINJA_OPTS = -j1 Sadly, switching to Ninja does not fix parallel builds for this package. > But also: > > HOST_MARIADB_MAKE_OPTS = import_executables Replacing with the following works, because the CMake Ninja generator also produces top-level phony targets: HOST_MARIADB_NINJA_OPTS = import_executables Both these tweaks (and likely a bunch more) will be part of v2 of the patch set :) Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From frank.vanbever at essensium.com Wed Jan 12 16:59:12 2022 From: frank.vanbever at essensium.com (Frank Vanbever) Date: Wed, 12 Jan 2022 17:59:12 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/fluentbit: new package In-Reply-To: <20211230155334.16da5582@windsurf> References: <20200217133806.21237-1-frank.vanbever@essensium.com> <20200217145805.18815-1-frank.vanbever@essensium.com> <20211230155334.16da5582@windsurf> Message-ID: <2116555.irdbgypaU6@wintermute> Hi Thomas, On Thursday, 30 December 2021 15:53:34 CET Thomas Petazzoni wrote: > If you're still interested in this package, could you have a look? I took another look and basically came to the same conclusion as you. In an ideal world I'd see it through, but my situation changed in the meantime and right now I don't have the bandwidth to dive into fixing those problems. Sorry about that. Best regards, Frank From fontaine.fabrice at gmail.com Wed Jan 12 17:21:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 18:21:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: needs host-dtc Message-ID: <20220112172100.2991140-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: configure: error: device-tree-compiler not found Fixes: - http://autobuild.buildroot.org/results/d35ff4a0ca0a8463121d717a9727e0d863ca83e8 Signed-off-by: Fabrice Fontaine --- package/riscv-isa-sim/riscv-isa-sim.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index e10dd4c662..59f70fc432 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -8,5 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc $(eval $(host-autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 17:23:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 18:23:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinycbor: disable -Werror Message-ID: <20220112172302.2991419-1-fontaine.fabrice@gmail.com> Disable -Werror to avoid the following build failure with gcc 4.8 raised since bump to version 0.6.0 in commit ee1a2826dcf7ff75f90b0bf9f7aa53d19ce19cf6 and https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types cc1: error: -Werror=int-conversion: no option -Wint-conversion Fixes: - http://autobuild.buildroot.org/results/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa Signed-off-by: Fabrice Fontaine --- .../0001-Makefile-add-DISABLE_WERROR.patch | 44 +++++++++++++++++++ package/tinycbor/tinycbor.mk | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch diff --git a/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch new file mode 100644 index 0000000000..334bea7eb0 --- /dev/null +++ b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch @@ -0,0 +1,44 @@ +From 5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 10 Jan 2022 23:17:45 +0100 +Subject: [PATCH] Makefile: add DISABLE_WERROR + +Allow the user to disable -Werror to avoid the following build failure +with gcc 4.8 raised since version 0.6.0 and +https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: + +/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c +cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types +cc1: error: -Werror=int-conversion: no option -Wint-conversion + +Fixes: + - http://autobuild.buildroot.org/results/a9f/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/intel/tinycbor/commit/5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0] +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6492ea16..3cde2b3d 100644 +--- a/Makefile ++++ b/Makefile +@@ -236,10 +236,15 @@ tag: distcheck + .SECONDARY: + + cflags := $(CPPFLAGS) -I$(SRCDIR)src +-cflags += -std=gnu99 $(CFLAGS) \ ++cflags += -std=gnu99 $(CFLAGS) ++ ++ifneq ($(DISABLE_WERROR),1) ++cflags += \ + -Werror=incompatible-pointer-types \ + -Werror=implicit-function-declaration \ + -Werror=int-conversion ++endif ++ + %.o: %.c + @test -d $(@D) || $(MKDIR) $(@D) + $(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $< diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index bf6e8e4c1e..cad50e633b 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_CJSON),y) TINYCBOR_DEPENDENCIES += cjson endif -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 +TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 ifeq ($(BR2_STATIC_LIBS),y) TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 18:28:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 19:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.5.0 Message-ID: <20220112182800.3128945-1-fontaine.fabrice@gmail.com> https://github.com/FreeRDP/FreeRDP/releases/tag/2.5.0 Signed-off-by: Fabrice Fontaine --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 637e57e8b0..e31b8d5b96 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.4.1.tar.gz.sha256 -sha256 ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf freerdp-2.4.1.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 +sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 40a3904024..c536f6cb1c 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.4.1 +FREERDP_VERSION = 2.5.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 -- 2.34.1 From arnout at mind.be Wed Jan 12 18:39:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 19:39:43 +0100 Subject: [Buildroot] [PATCH] skeleton + init: prepare /run/lock and adjust compat symlinks In-Reply-To: References: <20201004224137.193808-1-nolange79@gmail.com> <20220112091422.1cd29c1f@windsurf> Message-ID: <077dd60c-f482-da24-1718-7d75688a5f8a@mind.be> On 12/01/2022 09:53, Norbert Lange wrote: > > > > Thomas Petazzoni > schrieb am Mi., 12. Jan. 2022, 09:14: > > Hello Norbert, > > On Mon,? 5 Oct 2020 00:41:36 +0200 > Norbert Lange > wrote: > > > Linux distros changed /var/run and /var/lock to reside on an tmpfs in > > /run a long time ago, and buildroot seems to agree by providing this > > tmpfs on all supported init systems. > > I am not 100% sure but it seems like this patch has potentially broken > the build of vtun, which now fails with: > > ? /usr/bin/install: cannot create directory > '/home/giuliobenetti/autobuild/run/instance-0/output-1/target/var/lock': > File exists > > If you look at http://autobuild.buildroot.net/?reason=vtun% > , vtun > version 3.0.4 restarted failing to build on January 10, with this error. > > Could you have a look ? > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > > > Seems like the issue is, that run/lock is not existing when installing. > Anything installed there will be gone (already before this commit), so it's > kinda pointless to do so. Ah, yes, there are many packages that require a directory in a tmpfs and that create it at build time (because they dont "know" that it's going to be a tmpfs) and at runtime (in the init script, through tmpfiles, or by the application itself). > I don't know how many packages have this issue, imho it would be better to fix > them instead of making a run/lock directory for broken packages (that will get > removed later) We're not going to patch packages just for that, because unavoidably some upstreams are not going to be receptive. Creating the directory is a much simpler solution. Regards, Arnout From heiko.thiery at gmail.com Wed Jan 12 18:48:22 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Wed, 12 Jan 2022 19:48:22 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220112184821.916646-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- DEVELOPERS | 2 + board/kontron/bl-imx8mm/boot.cmd | 8 + board/kontron/bl-imx8mm/genimage.cfg | 16 + ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 4 + board/kontron/bl-imx8mm/post-image.sh | 3 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 60 ++++ 9 files changed, 508 insertions(+) create mode 100644 board/kontron/bl-imx8mm/boot.cmd create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100755 board/kontron/bl-imx8mm/post-image.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..93c5760489 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1179,7 +1179,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/boot.cmd b/board/kontron/bl-imx8mm/boot.cmd new file mode 100644 index 0000000000..7ce3198dbc --- /dev/null +++ b/board/kontron/bl-imx8mm/boot.cmd @@ -0,0 +1,8 @@ +echo "Root File Sytem on MMC${devnum}" +setenv rootfs /dev/mmcblk${devnum}p1 +setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} + +load ${devtype} ${devnum} ${kernel_addr_r} boot/Image +load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mm-kontron-n801x-s.dtb + +booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..3a83aa1f03 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33k + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 8M + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..ed088dd0f8 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,28 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..3bc71325c6 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,302 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..4574221fe5 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +mkdir -p $TARGET_DIR/boot/ +cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/kontron/bl-imx8mm/post-image.sh b/board/kontron/bl-imx8mm/post-image.sh new file mode 100755 index 0000000000..564211c829 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-image.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..bebc6f0763 --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,60 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/kontron/bl-imx8mm/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/bl-imx8mm/boot.cmd" -- 2.30.2 From arnout at mind.be Wed Jan 12 18:55:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 19:55:03 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112184729.GB23006@momiji> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112160512.GC6032@falbala.internal.home.lespocky.de> <20220112184729.GB23006@momiji> Message-ID: <53b29654-5d59-26e6-4635-a1ecb87babe0@mind.be> On 12/01/2022 17:47, Adrian Perez de Castro wrote: > Hi Alexander, > > On Wed, 12 Jan 2022 17:05:13 +0100 Alexander Dahl wrote: > >> On Wed, Jan 12, 2022 at 03:26:16PM +0200, Adrian Perez de Castro wrote: >>> As discussed yesterday, here is a quick stab for testing and getting the >>> conversation started about using Ninja for CMake-based packages (hence the >>> missing documentation updates and the "RFC" tag in the subject :-D). >> >> I miss some general motivation for switching from Makefile to Ninja >> generator. Can you add some reasoning or numbers to upcoming patch set >> revisions? > > Ninja is generally faster, tends to make better use of parallelism, and > in my experience less likely to break in odd ways. Once I have a defconfig > with a bigger set of CMake-based packages working I'll do some numbers as > well to compare build times before and after the switch to Ninja. There's one disadvantage to Ninja in Buildroot context: until [1] is fixed, it doesn't collaborate well with top-level parallel build. This means that if you run with a toplevel JLEVEL of e.g. 24, you can easil end up with 40-100 compiles running in parallel. The problem already exists for meson packages, but these are sufficiently rare that they don't pose a problem in practice. I don't know if it's going to become a problem if cmake packages are added to the mix. I don't think this is blocker at all, but it's worth considering. Regards, Arnout [1] https://github.com/ninja-build/ninja/issues/1139 From arnout at mind.be Wed Jan 12 19:01:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:01:27 +0100 Subject: [Buildroot] [PATCHv2] package/grpc: restrict host-grpc to the absolute minimum In-Reply-To: <20220112115100.4bab9b25@windsurf> References: <20210525182044.13785-1-patrickdepinguin@gmail.com> <20220112115100.4bab9b25@windsurf> Message-ID: <1a7148cd-c9fd-c444-8a78-83984f67af4c@mind.be> On 12/01/2022 11:51, Thomas Petazzoni wrote: > Hello Thomas, > > +Yann, Arnout, Peter, to raise their attention on this patch. > > On Tue, 25 May 2021 20:20:44 +0200 > Thomas De Schampheleire wrote: > >> From: Thomas De Schampheleire >> >> Currently, grpc depends on the full host-grpc, which in turn depends on host >> versions of many other libraries. One of these, host-libabseil-cpp, also >> requires a host gcc 4.9 or larger, a dependency which is not met on CentOS >> 7. >> But in fact, the target grpc only needs the 'grpc_cpp_plugin' binary from >> host-grpc. And that binary does not depend on host-libabseil-cpp or other >> libraries, only on host-protobuf. >> >> Given the above, simplify the grpc/host-grpc situation. >> - Add a patch to the (host-)grpc CMakeLists.txt file to add an option to >> only build grpc_cpp_plugin. >> - Update grpc.mk and Config.in to remove the unnecessary dependencies, and >> change the host-grpc configure options to make cmake happy. >> >> The advantages of these changes are: >> - making grpc available to older hosts with gcc < 4.8, like CentOS 7 >> - significantly reducing the build time of host-grpc and its dependencies >> >> The patch was proposed upstream but not accepted with below rationale. >> Perhaps input from others can help in persuading upstream in a future >> attempt. >> >> 'What you're doing sounds like quite a narrow use case. But we simply >> cannot provide a cmake option for every possible scenario in the world. >> Introducing a new cmake option isn't for free and requires careful >> design and maintenance.' >> >> Nevertheless, given the benefits in terms of build time and dependency >> reduction, it makes sense to apply this patch in spite of the disadvantage >> of a local non-upstreamed patch. >> >> Signed-off-by: Thomas De Schampheleire > > So I had a look at this, and indeed, upstream has not been very > supportive. The patch on CMakeLists.txt that you have is not too crazy, > but it would certainly be a bit annoying to maintain forever (even > though for some packages, like python3, we do have many more patches > than that). > > I have thought of enabling the download of the git submodules for just > the host variant, and use the make target that builds just the native > tool that is needed. However, using the git submodules just for the > host variant doesn't work: the tarball has to be the same between host > and target. An option would be to have a separate package, for just the > host variant. A bit meh. > > Perhaps we should just take your patch in fact? :-) Yes, I'd go for accepting the patch. Sometimes we just have to live with it. Regards, Arnout > > Yann, Peter, Arnout, any opinion on this? > > Best regards, > > Thomas > >> --- >> >> v2: fix typo in Config.in comment (Baruch Siach) >> >> >> .../grpc/0004-host-grpc-only-cpp-plugin.patch | 223 ++++++++++++++++++ >> package/grpc/Config.in | 6 +- >> package/grpc/grpc.mk | 27 ++- >> 3 files changed, 244 insertions(+), 12 deletions(-) >> create mode 100644 package/grpc/0004-host-grpc-only-cpp-plugin.patch >> >> diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch >> new file mode 100644 >> index 0000000000..43fad7e3d6 >> --- /dev/null >> +++ b/package/grpc/0004-host-grpc-only-cpp-plugin.patch >> @@ -0,0 +1,223 @@ >> +From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 Mon Sep 17 00:00:00 2001 >> +From: Thomas De Schampheleire >> +Date: Tue, 25 May 2021 14:55:23 +0200 >> +Subject: [PATCH] Add option to restrict building of (host-)grpc to >> + grpc_cpp_plugin only. >> + >> +This avoids unnecessary dependencies on big packages like libabseil-cpp and >> +others. >> + >> +Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) >> + >> +Signed-off-by: Thomas De Schampheleire >> +--- >> + CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- >> + 1 file changed, 35 insertions(+), 8 deletions(-) >> + >> +diff --git a/CMakeLists.txt b/CMakeLists.txt >> +index e8934a3e03..c2df332cc6 100644 >> +--- a/CMakeLists.txt >> ++++ b/CMakeLists.txt >> +@@ -48,12 +48,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) >> + option(gRPC_BUILD_CODEGEN "Build codegen" ON) >> + option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) >> + option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) >> ++option(gRPC_BUILD_PLUGIN_SUPPORT_ONLY "Build plugin support only" OFF) >> + >> + set(gRPC_INSTALL_default ON) >> + if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) >> + # Disable gRPC_INSTALL by default if building as a submodule >> + set(gRPC_INSTALL_default OFF) >> + endif() >> ++if(gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ set(gRPC_INSTALL_default OFF) >> ++endif() >> + set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL >> + "Generate installation target") >> + >> +@@ -367,6 +371,8 @@ add_custom_target(plugins >> + DEPENDS ${_gRPC_PLUGIN_LIST} >> + ) >> + >> ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_custom_target(tools_c >> + DEPENDS >> + check_epollexclusive >> +@@ -382,6 +388,8 @@ add_custom_target(tools_cxx >> + add_custom_target(tools >> + DEPENDS tools_c tools_cxx) >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + protobuf_generate_grpc_cpp( >> + src/proto/grpc/channelz/channelz.proto >> + ) >> +@@ -1000,6 +1008,7 @@ if(gRPC_BUILD_TESTS) >> + DEPENDS buildtests_c buildtests_cxx) >> + endif() >> + >> ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> + >> + add_library(address_sorting >> + third_party/address_sorting/address_sorting.c >> +@@ -1051,6 +1060,8 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + if(gRPC_BUILD_TESTS) >> + >> + add_library(end2end_nosec_tests >> +@@ -1313,6 +1324,8 @@ target_link_libraries(end2end_tests >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(gpr >> + src/core/lib/gpr/alloc.cc >> + src/core/lib/gpr/atm.cc >> +@@ -2106,6 +2119,8 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + if(gRPC_BUILD_CSHARP_EXT) >> + >> + add_library(grpc_csharp_ext SHARED >> +@@ -2288,6 +2303,8 @@ endif() >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(grpc_unsecure >> + src/core/ext/filters/census/grpc_context.cc >> + src/core/ext/filters/client_channel/backend_metric.cc >> +@@ -2650,6 +2667,8 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + if(gRPC_BUILD_TESTS) >> + >> + if(gRPC_BUILD_CODEGEN) >> +@@ -2717,6 +2736,8 @@ endif() >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(grpc++ >> + src/cpp/client/channel_cc.cc >> + src/cpp/client/client_callback.cc >> +@@ -3134,6 +3155,7 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> + >> + if(gRPC_BUILD_CODEGEN) >> + add_library(grpc++_reflection >> +@@ -3374,6 +3396,8 @@ target_link_libraries(grpc++_test_util >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(grpc++_unsecure >> + src/cpp/client/channel_cc.cc >> + src/cpp/client/client_callback.cc >> +@@ -3656,6 +3680,7 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> + >> + add_library(grpc_plugin_support >> + src/compiler/cpp_generator.cc >> +@@ -3715,7 +3740,7 @@ foreach(_hdr >> + endforeach() >> + >> + >> +-if(gRPC_INSTALL) >> ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> + install(TARGETS grpc_plugin_support EXPORT gRPCTargets >> + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} >> + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} >> +@@ -3795,6 +3820,8 @@ endif() >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(upb >> + third_party/upb/upb/decode_fast.c >> + third_party/upb/upb/decode.c >> +@@ -3852,8 +3879,6 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> +- >> +- >> + add_executable(check_epollexclusive >> + test/build/check_epollexclusive.c >> + ) >> +@@ -3906,8 +3931,6 @@ target_link_libraries(gen_hpack_tables >> + gpr >> + ) >> + >> +- >> +- >> + add_executable(gen_legal_metadata_characters >> + tools/codegen/core/gen_legal_metadata_characters.cc >> + ) >> +@@ -3958,6 +3981,8 @@ target_link_libraries(gen_percent_encoding_tables >> + ${_gRPC_ALLTARGETS_LIBRARIES} >> + ) >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + >> + if(gRPC_BUILD_TESTS) >> + >> +@@ -10722,7 +10747,7 @@ target_link_libraries(grpc_cli >> + >> + >> + endif() >> +-if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN) >> ++if(gRPC_BUILD_GRPC_CPP_PLUGIN) >> + >> + add_executable(grpc_cpp_plugin >> + src/compiler/cpp_plugin.cc >> +@@ -10752,7 +10777,7 @@ target_link_libraries(grpc_cpp_plugin >> + >> + >> + >> +-if(gRPC_INSTALL) >> ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> + install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets >> + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} >> + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} >> +@@ -15420,7 +15445,7 @@ endif() >> + >> + >> + >> +- >> ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> + >> + if(gRPC_INSTALL) >> + install(EXPORT gRPCTargets >> +@@ -15517,3 +15542,5 @@ generate_pkgconfig( >> + "-lgrpc++_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" >> + "" >> + "grpc++_unsecure.pc") >> ++ >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> +-- >> +2.26.3 >> + >> diff --git a/package/grpc/Config.in b/package/grpc/Config.in >> index d1bf0d078d..ad3ddbcf19 100644 >> --- a/package/grpc/Config.in >> +++ b/package/grpc/Config.in >> @@ -4,7 +4,6 @@ config BR2_PACKAGE_GRPC >> depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 >> depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf >> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp >> - depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libabseil-cpp >> depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp >> depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC >> depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS >> @@ -20,10 +19,9 @@ config BR2_PACKAGE_GRPC >> >> http://github.com/grpc/grpc >> >> -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" >> +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9" >> depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS >> depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC >> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ >> - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ >> - || !BR2_HOST_GCC_AT_LEAST_4_9 >> + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 >> depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS >> diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk >> index ee8dc38e70..8718b0e956 100644 >> --- a/package/grpc/grpc.mk >> +++ b/package/grpc/grpc.mk >> @@ -14,8 +14,7 @@ GRPC_INSTALL_STAGING = YES >> >> # Need to use host grpc_cpp_plugin during cross compilation. >> GRPC_DEPENDENCIES = c-ares host-grpc libabseil-cpp openssl protobuf re2 zlib >> -HOST_GRPC_DEPENDENCIES = host-c-ares host-libabseil-cpp host-openssl host-protobuf \ >> - host-re2 host-zlib >> +HOST_GRPC_DEPENDENCIES = host-protobuf >> >> # gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have >> # installed a cmake config file, but buildroot uses c-ares' autotools build, >> @@ -70,14 +69,26 @@ GRPC_CONF_OPTS += \ >> -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ >> -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" >> >> +# For host-grpc, we only need the 'grpc_cpp_plugin' binary, which is needed for >> +# target grpc compilation. To avoid unnecessary build steps and host >> +# dependencies, supply enough options to pass the configure checks without >> +# requiring other host packages, unless those needed by grpc_cpp_plugin. >> HOST_GRPC_CONF_OPTS = \ >> - -DgRPC_ABSL_PROVIDER=package \ >> - -D_gRPC_CARES_LIBRARIES=cares \ >> - -DgRPC_CARES_PROVIDER=none \ >> -DgRPC_PROTOBUF_PROVIDER=package \ >> - -DgRPC_RE2_PROVIDER=package \ >> - -DgRPC_SSL_PROVIDER=package \ >> - -DgRPC_ZLIB_PROVIDER=package >> + -DgRPC_ABSL_PROVIDER=none \ >> + -DgRPC_CARES_PROVIDER=none \ >> + -DgRPC_RE2_PROVIDER=none \ >> + -DgRPC_SSL_PROVIDER=none \ >> + -DgRPC_ZLIB_PROVIDER=none \ >> + -DgRPC_BUILD_CODEGEN=OFF \ >> + -DgRPC_BUILD_CSHARP_EXT=OFF \ >> + -DgRPC_BUILD_PLUGIN_SUPPORT_ONLY=ON \ >> + -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF >> >> $(eval $(cmake-package)) >> $(eval $(host-cmake-package)) > > > From arnout at mind.be Wed Jan 12 19:10:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:10:40 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> Message-ID: <0abbcb3c-e2db-ae06-a065-2bcb71b74f8d@mind.be> On 12/01/2022 12:04, Thomas De Schampheleire wrote: > Hi Romain, > > El lun, 10 ene 2022 a las 0:27, Romain Naour () escribi?: >> >> Hello Thomas, >> >> Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : >>> From: Thomas De Schampheleire >>> >>> There are cases where a 64-bit architecture is running a 64-bit kernel but >>> 32-bit userspace. Examples include: >>> * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace >>> * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace >> >> Can you provide a new qemu defconfig that cover this use case? >> This is for gitlab-ci runtime testing. >> >> Best regards, >> Romain >> >> PS: (This email doesn't count as a review of this series :)) > > > Thanks for your interest in this series :-) > > Currently the qemu defconfig that I use uses an external toolchain > built via crosstool-ng. Crosstool-ng is capable of creating a multilib > toolchain supporting 32-bit and 64-bit binaries. > However, Buildroot does not currently support this for internal > toolchains. How do you suggest to proceed here? > Could we perhaps add a crosstool-ng-built multilib toolchain to the > Bootlin toolchains? Bootlin toolchains no - they are generated by Buildroot. However, it would be useful to have such a toolchain as an autobuilder toolchain. We could use it both in a 32-bit and 64-bit config. We can simply add your binary to autobuild.buildroot.org/toolchains/tarballs and add two config fragments to support/config-fragments/autobuild. The same toolchain tarball can then also be used for a runtime test. Regards, Arnout From bernd.kuhls at t-online.de Wed Jan 12 19:17:08 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 12 Jan 2022 20:17:08 +0100 Subject: [Buildroot] [PATCH 3/3] package/kodi-pvr-mythtv: bump version to 19.0.6-Matrix In-Reply-To: <20220112191708.77947-1-bernd.kuhls@t-online.de> References: <20220112191708.77947-1-bernd.kuhls@t-online.de> Message-ID: <20220112191708.77947-3-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index cd96feef70..cb10d24a4f 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 87f696fdb973602967c7dbcc1db5492616f29bfabe687fddd3a276f663a05d44 kodi-pvr-mythtv-19.0.3-Matrix.tar.gz +sha256 8e63e85e055ec1e2d727506c939c4f53f6aef8b714f5c18f73c58102355f2e14 kodi-pvr-mythtv-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 6edca8db50..351fbc4eae 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.3-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.6-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Wed Jan 12 19:17:07 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 12 Jan 2022 20:17:07 +0100 Subject: [Buildroot] [PATCH 2/3] package/kodi-pvr-argustv: bump version to 19.2.1-Matrix In-Reply-To: <20220112191708.77947-1-bernd.kuhls@t-online.de> References: <20220112191708.77947-1-bernd.kuhls@t-online.de> Message-ID: <20220112191708.77947-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index e58f9a4608..33de7d6ca0 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfd19f9c1c4efe556d3764a5bec7842092b246932159ff69cf5bb1f64c8b9473 kodi-pvr-argustv-19.2.0-Matrix.tar.gz +sha256 027e49b56c03d182fbf69ce71a84270dddb06e537814cd9ea209d4baca8d16fe kodi-pvr-argustv-19.2.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 230ef1067c..90d0a53002 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.2.0-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.2.1-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Wed Jan 12 19:17:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 12 Jan 2022 20:17:06 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi-inputstream-adaptive: bump version to 19.0.2-Matrix Message-ID: <20220112191708.77947-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index d193a0c4f8..c7a081f887 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d389af940011887378d1e6ad0ad91b81cfc138b862cf4a43593388c33308cb55 kodi-inputstream-adaptive-19.0.1-Matrix.tar.gz +sha256 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 6044ed07fb..f632a42adb 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.1-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.2-Matrix KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL -- 2.30.2 From arnout at mind.be Wed Jan 12 19:39:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:39:57 +0100 Subject: [Buildroot] [PATCH] system/skeleton: provide run/lock directory In-Reply-To: References: <20220112101021.456463-1-nolange79@gmail.com> Message-ID: <9e39bdad-16dd-1fb4-2c5e-2de0e032fcbc@mind.be> On 12/01/2022 11:19, Norbert Lange wrote: > Am Mi., 12. Jan. 2022 um 11:10 Uhr schrieb Norbert Lange : >> >> We changed the skeletons in bf01e51f3c, so that var/lock >> points to run/lock. This resulted in build failures as >> some packages want to work with these paths. >> >> - Create run/lock, the run directory will be purged >> later anyway (since 5e78e7e97d). >> - for init == systemd, create the var/lock symlink early >> to prevent packages creating this path as directory. >> >> Signed-off-by: Norbert Lange >> --- >> package/skeleton-init-systemd/skeleton-init-systemd.mk | 2 ++ >> system/skeleton/run/{ => lock}/.empty | 0 >> 2 files changed, 2 insertions(+) >> rename system/skeleton/run/{ => lock}/.empty (100%) >> >> diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk >> index 1e212cc2f7..795a171809 100644 >> --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk >> +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk >> @@ -62,6 +62,8 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS >> mkdir -p $(TARGET_DIR)/srv >> mkdir -p $(TARGET_DIR)/var >> ln -s ../run $(TARGET_DIR)/var/run >> + # prevent install scripts to create var/lock as directory >> + ln -s ../run/lock $(TARGET_DIR)/var/lock >> install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf >> $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) >> endef >> diff --git a/system/skeleton/run/.empty b/system/skeleton/run/lock/.empty >> similarity index 100% >> rename from system/skeleton/run/.empty >> rename to system/skeleton/run/lock/.empty >> -- >> 2.34.1 >> > > Fixes: http://autobuild.buildroot.net/results/3ee/3ee8f9ee55e51af38e9dbe7b9840c9589d88a30f Applied to master with that added, thanks. > (and alot more containing the vtun package) > > For someone not fluent with mailing list workflows, and working with a > couple projects, > it might help having a few example commit messages (-templates) in the docs. > ie for respins, bug fixes, versioning (potentially of series) Absolutely! I'm waiting for a really nice example to turn up on the list and steal that for the documentation. Regards, Arnout From arnout at mind.be Wed Jan 12 19:38:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:38:09 +0100 Subject: [Buildroot] [git commit] system/skeleton: provide run/lock directory Message-ID: <20220112193444.1158482A98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02d35007472675c147be79b4ca06959c83ae4128 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We changed the skeletons in bf01e51f3c, so that var/lock points to run/lock. This resulted in build failures as some packages want to work with these paths. - Create run/lock, the run directory will be purged later anyway (since 5e78e7e97d). - for init == systemd, create the var/lock symlink early to prevent packages creating this path as directory. Fixes: http://autobuild.buildroot.net/results/3ee/3ee8f9ee55e51af38e9dbe7b9840c9589d88a30f Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 2 ++ system/skeleton/run/{ => lock}/.empty | 0 2 files changed, 2 insertions(+) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 1e212cc2f7..795a171809 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,8 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + # prevent install scripts to create var/lock as directory + ln -s ../run/lock $(TARGET_DIR)/var/lock install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef diff --git a/system/skeleton/run/.empty b/system/skeleton/run/lock/.empty similarity index 100% rename from system/skeleton/run/.empty rename to system/skeleton/run/lock/.empty From arnout at mind.be Wed Jan 12 19:45:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:45:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.5.0 In-Reply-To: <20220112182800.3128945-1-fontaine.fabrice@gmail.com> References: <20220112182800.3128945-1-fontaine.fabrice@gmail.com> Message-ID: <546b5c8e-2b49-b3bc-2e91-d8210f21d9c5@mind.be> On 12/01/2022 19:28, Fabrice Fontaine wrote: > https://github.com/FreeRDP/FreeRDP/releases/tag/2.5.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/freerdp/freerdp.hash | 4 ++-- > package/freerdp/freerdp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash > index 637e57e8b0..e31b8d5b96 100644 > --- a/package/freerdp/freerdp.hash > +++ b/package/freerdp/freerdp.hash > @@ -1,5 +1,5 @@ > -# From https://pub.freerdp.com/releases/freerdp-2.4.1.tar.gz.sha256 > -sha256 ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf freerdp-2.4.1.tar.gz > +# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 > +sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz > > # Locally calculated > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > index 40a3904024..c536f6cb1c 100644 > --- a/package/freerdp/freerdp.mk > +++ b/package/freerdp/freerdp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FREERDP_VERSION = 2.4.1 > +FREERDP_VERSION = 2.5.0 > FREERDP_SITE = https://pub.freerdp.com/releases > FREERDP_DEPENDENCIES = libglib2 openssl zlib > FREERDP_LICENSE = Apache-2.0 > From arnout at mind.be Wed Jan 12 19:45:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:45:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinycbor: disable -Werror In-Reply-To: <20220112172302.2991419-1-fontaine.fabrice@gmail.com> References: <20220112172302.2991419-1-fontaine.fabrice@gmail.com> Message-ID: <84f17b9f-471f-be29-2fea-5bde1d100389@mind.be> On 12/01/2022 18:23, Fabrice Fontaine wrote: > Disable -Werror to avoid the following build failure with gcc 4.8 raised > since bump to version 0.6.0 in commit > ee1a2826dcf7ff75f90b0bf9f7aa53d19ce19cf6 and > https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: > > /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c > cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types > cc1: error: -Werror=int-conversion: no option -Wint-conversion > > Fixes: > - http://autobuild.buildroot.org/results/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0001-Makefile-add-DISABLE_WERROR.patch | 44 +++++++++++++++++++ > package/tinycbor/tinycbor.mk | 2 +- > 2 files changed, 45 insertions(+), 1 deletion(-) > create mode 100644 package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch > > diff --git a/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch > new file mode 100644 > index 0000000000..334bea7eb0 > --- /dev/null > +++ b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch > @@ -0,0 +1,44 @@ > +From 5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 10 Jan 2022 23:17:45 +0100 > +Subject: [PATCH] Makefile: add DISABLE_WERROR > + > +Allow the user to disable -Werror to avoid the following build failure > +with gcc 4.8 raised since version 0.6.0 and > +https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: > + > +/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c > +cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types > +cc1: error: -Werror=int-conversion: no option -Wint-conversion > + > +Fixes: > + - http://autobuild.buildroot.org/results/a9f/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa > + > +Signed-off-by: Fabrice Fontaine > +[Retrieved from: > +https://github.com/intel/tinycbor/commit/5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0] > +--- > + Makefile | 7 ++++++- > + 1 file changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index 6492ea16..3cde2b3d 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -236,10 +236,15 @@ tag: distcheck > + .SECONDARY: > + > + cflags := $(CPPFLAGS) -I$(SRCDIR)src > +-cflags += -std=gnu99 $(CFLAGS) \ > ++cflags += -std=gnu99 $(CFLAGS) > ++ > ++ifneq ($(DISABLE_WERROR),1) > ++cflags += \ > + -Werror=incompatible-pointer-types \ > + -Werror=implicit-function-declaration \ > + -Werror=int-conversion > ++endif > ++ > + %.o: %.c > + @test -d $(@D) || $(MKDIR) $(@D) > + $(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $< > diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk > index bf6e8e4c1e..cad50e633b 100644 > --- a/package/tinycbor/tinycbor.mk > +++ b/package/tinycbor/tinycbor.mk > @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_CJSON),y) > TINYCBOR_DEPENDENCIES += cjson > endif > > -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 > +TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 > > ifeq ($(BR2_STATIC_LIBS),y) > TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 > From arnout at mind.be Wed Jan 12 19:45:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:45:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: needs host-dtc In-Reply-To: <20220112172100.2991140-1-fontaine.fabrice@gmail.com> References: <20220112172100.2991140-1-fontaine.fabrice@gmail.com> Message-ID: On 12/01/2022 18:21, Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: > > configure: error: device-tree-compiler not found > > Fixes: > - http://autobuild.buildroot.org/results/d35ff4a0ca0a8463121d717a9727e0d863ca83e8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/riscv-isa-sim/riscv-isa-sim.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk > index e10dd4c662..59f70fc432 100644 > --- a/package/riscv-isa-sim/riscv-isa-sim.mk > +++ b/package/riscv-isa-sim/riscv-isa-sim.mk > @@ -8,5 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 > RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) > RISCV_ISA_SIM_LICENSE = BSD-3-Clause > RISCV_ISA_SIM_LICENSE_FILES = LICENSE > +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc > > $(eval $(host-autotools-package)) > From arnout at mind.be Wed Jan 12 19:45:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:45:59 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi-inputstream-adaptive: bump version to 19.0.2-Matrix In-Reply-To: <20220112191708.77947-1-bernd.kuhls@t-online.de> References: <20220112191708.77947-1-bernd.kuhls@t-online.de> Message-ID: On 12/01/2022 20:17, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied series to master, thanks. Regards, Arnout > --- > .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- > package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash > index d193a0c4f8..c7a081f887 100644 > --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash > +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 d389af940011887378d1e6ad0ad91b81cfc138b862cf4a43593388c33308cb55 kodi-inputstream-adaptive-19.0.1-Matrix.tar.gz > +sha256 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz > sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL > diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > index 6044ed07fb..f632a42adb 100644 > --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.1-Matrix > +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.2-Matrix > KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) > KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ > KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL > From arnout at mind.be Wed Jan 12 19:42:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:42:58 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: needs host-dtc Message-ID: <20220112193954.28BB482B45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d0f84d2004b04bc93d5ceb58c86640f190e5d78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: configure: error: device-tree-compiler not found Fixes: - http://autobuild.buildroot.org/results/d35ff4a0ca0a8463121d717a9727e0d863ca83e8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/riscv-isa-sim/riscv-isa-sim.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index e10dd4c662..59f70fc432 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -8,5 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc $(eval $(host-autotools-package)) From arnout at mind.be Wed Jan 12 19:43:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:05 +0100 Subject: [Buildroot] [git commit] package/freerdp: bump to version 2.5.0 Message-ID: <20220112193954.3C6488353B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60e27aee9b089de451c0dc3fe9e3fa3afb329447 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/FreeRDP/FreeRDP/releases/tag/2.5.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 637e57e8b0..e31b8d5b96 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.4.1.tar.gz.sha256 -sha256 ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf freerdp-2.4.1.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 +sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 40a3904024..c536f6cb1c 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.4.1 +FREERDP_VERSION = 2.5.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From arnout at mind.be Wed Jan 12 19:43:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:13 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-mythtv: bump version to 19.0.6-Matrix Message-ID: <20220112193954.599BF82B45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8a5f4ecd89a2bd84ab0a7a72f3c367a0980af4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index cd96feef70..cb10d24a4f 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 87f696fdb973602967c7dbcc1db5492616f29bfabe687fddd3a276f663a05d44 kodi-pvr-mythtv-19.0.3-Matrix.tar.gz +sha256 8e63e85e055ec1e2d727506c939c4f53f6aef8b714f5c18f73c58102355f2e14 kodi-pvr-mythtv-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 6edca8db50..351fbc4eae 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.3-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.6-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From arnout at mind.be Wed Jan 12 19:43:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:08 +0100 Subject: [Buildroot] [git commit] package/kodi-inputstream-adaptive: bump version to 19.0.2-Matrix Message-ID: <20220112193954.45E5B82B45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9197cfa5a589a7cc152d249001ad69db4214917c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index d193a0c4f8..c7a081f887 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d389af940011887378d1e6ad0ad91b81cfc138b862cf4a43593388c33308cb55 kodi-inputstream-adaptive-19.0.1-Matrix.tar.gz +sha256 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 6044ed07fb..f632a42adb 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.1-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.2-Matrix KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL From arnout at mind.be Wed Jan 12 19:43:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:02 +0100 Subject: [Buildroot] [git commit] package/tinycbor: disable -Werror Message-ID: <20220112193954.32EE08345C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b5e90c3203f944cb7f7ccad766f38580b9b2b6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable -Werror to avoid the following build failure with gcc 4.8 raised since bump to version 0.6.0 in commit ee1a2826dcf7ff75f90b0bf9f7aa53d19ce19cf6 and https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types cc1: error: -Werror=int-conversion: no option -Wint-conversion Fixes: - http://autobuild.buildroot.org/results/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-Makefile-add-DISABLE_WERROR.patch | 44 ++++++++++++++++++++++ package/tinycbor/tinycbor.mk | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch new file mode 100644 index 0000000000..334bea7eb0 --- /dev/null +++ b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch @@ -0,0 +1,44 @@ +From 5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 10 Jan 2022 23:17:45 +0100 +Subject: [PATCH] Makefile: add DISABLE_WERROR + +Allow the user to disable -Werror to avoid the following build failure +with gcc 4.8 raised since version 0.6.0 and +https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: + +/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c +cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types +cc1: error: -Werror=int-conversion: no option -Wint-conversion + +Fixes: + - http://autobuild.buildroot.org/results/a9f/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/intel/tinycbor/commit/5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0] +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6492ea16..3cde2b3d 100644 +--- a/Makefile ++++ b/Makefile +@@ -236,10 +236,15 @@ tag: distcheck + .SECONDARY: + + cflags := $(CPPFLAGS) -I$(SRCDIR)src +-cflags += -std=gnu99 $(CFLAGS) \ ++cflags += -std=gnu99 $(CFLAGS) ++ ++ifneq ($(DISABLE_WERROR),1) ++cflags += \ + -Werror=incompatible-pointer-types \ + -Werror=implicit-function-declaration \ + -Werror=int-conversion ++endif ++ + %.o: %.c + @test -d $(@D) || $(MKDIR) $(@D) + $(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $< diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index bf6e8e4c1e..cad50e633b 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_CJSON),y) TINYCBOR_DEPENDENCIES += cjson endif -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 +TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 ifeq ($(BR2_STATIC_LIBS),y) TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 From arnout at mind.be Wed Jan 12 19:43:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:10 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-argustv: bump version to 19.2.1-Matrix Message-ID: <20220112193954.4FC948345C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=95717ff91b6d20e51a45e3843f089eb08acd91d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index e58f9a4608..33de7d6ca0 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfd19f9c1c4efe556d3764a5bec7842092b246932159ff69cf5bb1f64c8b9473 kodi-pvr-argustv-19.2.0-Matrix.tar.gz +sha256 027e49b56c03d182fbf69ce71a84270dddb06e537814cd9ea209d4baca8d16fe kodi-pvr-argustv-19.2.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 230ef1067c..90d0a53002 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.2.0-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.2.1-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md From romain.naour at smile.fr Wed Jan 12 20:06:54 2022 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 12 Jan 2022 21:06:54 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <0abbcb3c-e2db-ae06-a065-2bcb71b74f8d@mind.be> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> <0abbcb3c-e2db-ae06-a065-2bcb71b74f8d@mind.be> Message-ID: <7ac86017-7b00-cc39-d6dc-a2dac0028382@smile.fr> Hello Thomas, Arnout, Le 12/01/2022 ? 20:10, Arnout Vandecappelle a ?crit?: > > > On 12/01/2022 12:04, Thomas De Schampheleire wrote: >> Hi Romain, >> >> El lun, 10 ene 2022 a las 0:27, Romain Naour () escribi?: >>> >>> Hello Thomas, >>> >>> Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : >>>> From: Thomas De Schampheleire >>>> >>>> There are cases where a 64-bit architecture is running a 64-bit kernel but >>>> 32-bit userspace. Examples include: >>>> ???? * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace >>>> ???? * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace >>> >>> Can you provide a new qemu defconfig that cover this use case? >>> This is for gitlab-ci runtime testing. >>> >>> Best regards, >>> Romain >>> >>> PS: (This email doesn't count as a review of this series :)) >> >> >> Thanks for your interest in this series :-) >> >> Currently the qemu defconfig that I use uses an external toolchain >> built via crosstool-ng. Crosstool-ng is capable of creating a multilib >> toolchain supporting 32-bit and 64-bit binaries. >> However, Buildroot does not currently support this for internal >> toolchains. How do you suggest to proceed here? >> Could we perhaps add a crosstool-ng-built multilib toolchain to the >> Bootlin toolchains? > > ?Bootlin toolchains no - they are generated by Buildroot. Indeed. > ?However, it would be useful to have such a toolchain as an autobuilder > toolchain. We could use it both in a 32-bit and 64-bit config. We can simply add > your binary to autobuild.buildroot.org/toolchains/tarballs and add two config > fragments to support/config-fragments/autobuild. > > ?The same toolchain tarball can then also be used for a runtime test. Agree, but we have to be able to rebuild them when needed. A script or a simple text would be ok. Best regards, Romain > > ?Regards, > ?Arnout > From arnout at mind.be Wed Jan 12 20:16:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 21:16:23 +0100 Subject: [Buildroot] [git commit] package/networkd-dispatcher: new package Message-ID: <20220112201255.E8D6083456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27856dfd1af18161af84783c785481de9c7e8d94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Networkd-dispatcher is a dispatcher daemon for systemd-networkd connection status changes. This daemon is similar to NetworkManager-dispatcher, but is much more limited in the types of events it supports due to the limited nature of systemd-networkd. To simplify the large number of transitive dependencies, remove the ones that are implied by glibc. To simplify the comment, simply don't show it if python is selected. Python 2 is going to be removed soon anyway. Signed-off-by: Michael Nosthoff [Arnout: add Config.in comment and rework/simplify dependencies] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/networkd-dispatcher/Config.in | 29 ++++++++++++++++++++++ .../networkd-dispatcher/networkd-dispatcher.hash | 3 +++ package/networkd-dispatcher/networkd-dispatcher.mk | 25 +++++++++++++++++++ 5 files changed, 59 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..c15b117610 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2002,6 +2002,7 @@ N: Michael Nosthoff F: package/grpc/ F: package/gtest/ F: package/libabseil-cpp/ +F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ diff --git a/package/Config.in b/package/Config.in index 59297c3f3d..b76f50e565 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2297,6 +2297,7 @@ endif source "package/netstat-nat/Config.in" source "package/network-manager/Config.in" source "package/network-manager-openvpn/Config.in" + source "package/networkd-dispatcher/Config.in" source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in new file mode 100644 index 0000000000..ab8c473951 --- /dev/null +++ b/package/networkd-dispatcher/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_NETWORKD_DISPATCHER + bool "networkd-dispatcher" + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection + depends on !BR2_PACKAGE_PYTHON # python3 + depends on BR2_PACKAGE_SYSTEMD # runtime + select BR2_PACKAGE_DBUS # dbus-python + select BR2_PACKAGE_DBUS_PYTHON # runtime + select BR2_PACKAGE_PYTHON3 # python-gobject + select BR2_PACKAGE_PYTHON_GOBJECT # runtime + select BR2_PACKAGE_SYSTEMD_NETWORKD # runtime + help + Networkd-dispatcher is a dispatcher daemon for + systemd-networkd connection status changes. + This daemon is similar to NetworkManager-dispatcher, + but is much more limited in the types of events it + supports due to the limited nature of systemd-networkd. + + https://gitlab.com/craftyguy/networkd-dispatcher + +comment "networkd-dispatcher needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on BR2_PACKAGE_SYSTEMD + depends on !BR2_PACKAGE_PYTHON + depends on !BR2_HOST_GCC_AT_LEAST_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash new file mode 100644 index 0000000000..ca7c300783 --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk new file mode 100644 index 0000000000..4f609db73a --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# networkd-dispatcher +# +################################################################################ + +NETWORKD_DISPATCHER_VERSION = 2.1 +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE + +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d +endef + +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf +endef + +$(eval $(generic-package)) From arnout at mind.be Wed Jan 12 20:18:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 21:18:03 +0100 Subject: [Buildroot] [git commit] package/iwd: remove numbering from patch Message-ID: <20220112201255.F05678353A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=feb9185fc185c1f76e3789b0dc521e3cf98c1ebb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master check-package says package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch:4: generate your patches with 'git format-patch -N' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch index 6b9cfb3e70..3e808deb88 100644 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch @@ -1,7 +1,7 @@ From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 10 Jan 2022 22:32:18 +0100 -Subject: [PATCH 1/1] dpp: fix implicit declaration of function explicit_bzero +Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From arnout at mind.be Wed Jan 12 20:24:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 21:24:12 +0100 Subject: [Buildroot] [PATCH v5] package/networkd-dispatcher: new package In-Reply-To: <20220110185147.84697-1-buildroot@heine.tech> References: <20220110185147.84697-1-buildroot@heine.tech> Message-ID: <3b7552fe-af31-cab3-b9ec-cfa9fa4076e9@mind.be> On 10/01/2022 19:51, Michael Nosthoff via buildroot wrote: > From: Michael Nosthoff via buildroot > > Networkd-dispatcher is a dispatcher daemon for systemd-networkd > connection status changes. This daemon is similar to > NetworkManager-dispatcher, but is much more limited in the types of > events it supports due to the limited nature of systemd-networkd. > > Signed-off-by: Michael Nosthoff Applied to master, thanks. I reworked the Config.in quite a lot, it's a complicated one! [snip] > diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in > new file mode 100644 > index 0000000000..1dfa12ba45 > --- /dev/null > +++ b/package/networkd-dispatcher/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_NETWORKD_DISPATCHER > + bool "networkd-dispatcher" > + depends on BR2_USE_WCHAR # dbus-python -> glib2 > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection > + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python -> glib2 > + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu > + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection > + depends on BR2_PACKAGE_DBUS # dbus-python dbus-python depends on dbus instead of selecting it because it's a suboption of dbus (though actually implemented in a separate package, which is not really relevant for the user). So here we should instead select dbus. > + depends on BR2_PACKAGE_PYTHON3 # runtime, python-gobject Since this is not a python package, but just a tool that happens to be implemented in python, python3 should be selected instead of depended upon. > + depends on BR2_PACKAGE_SYSTEMD_NETWORKD # runtime > + select BR2_PACKAGE_DBUS_PYTHON > + select BR2_PACKAGE_PYTHON_GOBJECT > + help > + Networkd-dispatcher is a dispatcher daemon for > + systemd-networkd connection status changes. > + This daemon is similar to NetworkManager-dispatcher, > + but is much more limited in the types of events it > + supports due to the limited nature of systemd-networkd. > + > + https://gitlab.com/craftyguy/networkd-dispatcher There should be a comment for the dependencies. Because it become quite complicated, I removed all the dependencies that are implicit from glibc. Regards, Arnout > diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash > new file mode 100644 > index 0000000000..ca7c300783 > --- /dev/null > +++ b/package/networkd-dispatcher/networkd-dispatcher.hash > @@ -0,0 +1,3 @@ > +# locally computed > +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 > +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE > diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk > new file mode 100644 > index 0000000000..4f609db73a > --- /dev/null > +++ b/package/networkd-dispatcher/networkd-dispatcher.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# networkd-dispatcher > +# > +################################################################################ > + > +NETWORKD_DISPATCHER_VERSION = 2.1 > +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 > +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) > +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 > +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE > + > +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher > + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d > +endef > + > +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service > + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ > + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf > +endef > + > +$(eval $(generic-package)) > From arnout at mind.be Wed Jan 12 20:24:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 21:24:12 +0100 Subject: [Buildroot] [PATCH v5] package/networkd-dispatcher: new package In-Reply-To: <20220110185147.84697-1-buildroot@heine.tech> References: <20220110185147.84697-1-buildroot@heine.tech> Message-ID: <3b7552fe-af31-cab3-b9ec-cfa9fa4076e9@mind.be> On 10/01/2022 19:51, Michael Nosthoff via buildroot wrote: > From: Michael Nosthoff via buildroot > > Networkd-dispatcher is a dispatcher daemon for systemd-networkd > connection status changes. This daemon is similar to > NetworkManager-dispatcher, but is much more limited in the types of > events it supports due to the limited nature of systemd-networkd. > > Signed-off-by: Michael Nosthoff Applied to master, thanks. I reworked the Config.in quite a lot, it's a complicated one! [snip] > diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in > new file mode 100644 > index 0000000000..1dfa12ba45 > --- /dev/null > +++ b/package/networkd-dispatcher/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_NETWORKD_DISPATCHER > + bool "networkd-dispatcher" > + depends on BR2_USE_WCHAR # dbus-python -> glib2 > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection > + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python -> glib2 > + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu > + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection > + depends on BR2_PACKAGE_DBUS # dbus-python dbus-python depends on dbus instead of selecting it because it's a suboption of dbus (though actually implemented in a separate package, which is not really relevant for the user). So here we should instead select dbus. > + depends on BR2_PACKAGE_PYTHON3 # runtime, python-gobject Since this is not a python package, but just a tool that happens to be implemented in python, python3 should be selected instead of depended upon. > + depends on BR2_PACKAGE_SYSTEMD_NETWORKD # runtime > + select BR2_PACKAGE_DBUS_PYTHON > + select BR2_PACKAGE_PYTHON_GOBJECT > + help > + Networkd-dispatcher is a dispatcher daemon for > + systemd-networkd connection status changes. > + This daemon is similar to NetworkManager-dispatcher, > + but is much more limited in the types of events it > + supports due to the limited nature of systemd-networkd. > + > + https://gitlab.com/craftyguy/networkd-dispatcher There should be a comment for the dependencies. Because it become quite complicated, I removed all the dependencies that are implicit from glibc. Regards, Arnout > diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash > new file mode 100644 > index 0000000000..ca7c300783 > --- /dev/null > +++ b/package/networkd-dispatcher/networkd-dispatcher.hash > @@ -0,0 +1,3 @@ > +# locally computed > +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 > +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE > diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk > new file mode 100644 > index 0000000000..4f609db73a > --- /dev/null > +++ b/package/networkd-dispatcher/networkd-dispatcher.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# networkd-dispatcher > +# > +################################################################################ > + > +NETWORKD_DISPATCHER_VERSION = 2.1 > +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 > +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) > +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 > +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE > + > +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher > + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d > +endef > + > +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service > + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ > + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf > +endef > + > +$(eval $(generic-package)) > From ju.o at free.fr Wed Jan 12 20:26:40 2022 From: ju.o at free.fr (Julien Olivain) Date: Wed, 12 Jan 2022 21:26:40 +0100 Subject: [Buildroot] [PATCH 1/1] board/spike/riscv64/start.sh: add buildroot host dir in PATH Message-ID: <20220112202640.7064-1-ju.o@free.fr> commit 0d0f84d2004b04bc93d5ceb58c86640f190e5d78 added the missing host-dtc dependency to riscv-isa-sim. The spike simulator calls the dtc binary at its startup. The host dtc command needs to be in the PATH at that time. This commit add the buildroot host binary directory into the PATH of the start.sh helper script. It make sure spike will use the buildroot dtc version. This commit fixes this start.sh script on host not providing the dtc command. Since the "spike" binary is now in the PATH, the binary name is also simplified. Signed-off-by: Julien Olivain --- board/spike/riscv64/start.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh index 75b1412df8..6fbbced806 100755 --- a/board/spike/riscv64/start.sh +++ b/board/spike/riscv64/start.sh @@ -3,9 +3,13 @@ SCRIPT_DIR="$(dirname "$0")" BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" +# spike uses dtc at runtime startup, so make sure buildroot host +# directory is in the PATH +export PATH="${BR_BASEDIR}/output/host/usr/bin:$PATH" + # Use Buildroot host spike by default, but allow the caller to # redefine another spike binary -: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" +: "${SPIKE:=spike}" exec "${SPIKE}" \ --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 20:31:17 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 21:31:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/avahi: add hidden libavahi-client option Message-ID: <20220112203117.3133159-1-fontaine.fabrice@gmail.com> This hidden option will simplify packages depending on libavahi-client Signed-off-by: Fabrice Fontaine --- package/avahi/Config.in | 6 ++++++ package/cups-filters/cups-filters.mk | 3 +-- package/libiio/libiio.mk | 3 +-- package/libostree/libostree.mk | 6 +----- package/pipewire/pipewire.mk | 3 +-- package/shairport-sync/shairport-sync.mk | 6 +----- package/vlc/vlc.mk | 3 +-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 95b01bfe92..67722d04a2 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -34,6 +34,12 @@ config BR2_PACKAGE_AVAHI_DAEMON The daemon registers local IP addresses and services using mDNS/DNS-SD. +config BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT + bool + default y + depends on BR2_PACKAGE_AVAHI_DAEMON + depends on BR2_PACKAGE_DBUS + config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY bool "libdns_sd compatibility (Bonjour)" depends on BR2_PACKAGE_AVAHI_DAEMON diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 63b85f0b8b..c8f2dd0aae 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -45,8 +45,7 @@ else CUPS_FILTERS_CONF_OPTS += --disable-dbus endif -# avahi support requires avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) CUPS_FILTERS_DEPENDENCIES += avahi CUPS_FILTERS_CONF_OPTS += --enable-avahi else diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 38b2f83e6e..a4fe0d4541 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -65,8 +65,7 @@ else LIBIIO_CONF_OPTS += -DWITH_AIO=OFF endif -# Avahi support in libiio requires avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) LIBIIO_DEPENDENCIES += avahi LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=ON else diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 22cb83d039..9cbf2848c9 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -37,11 +37,7 @@ else LIBOSTREE_CONF_OPTS += --without-openssl endif -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus config symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) LIBOSTREE_CONF_OPTS += --with-avahi LIBOSTREE_DEPENDENCIES += avahi else diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 604d08f90d..b05ce2bcc2 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -83,8 +83,7 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -# avahi support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index cf49f2b2ed..487e0c05e5 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -22,11 +22,7 @@ SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \ SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)" # Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns). -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus congig symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) SHAIRPORT_SYNC_DEPENDENCIES += avahi SHAIRPORT_SYNC_CONF_OPTS += --with-avahi --without-tinysvcmdns else diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index fe338fcbe8..b793e0efe0 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -117,8 +117,7 @@ else VLC_CONF_OPTS += --disable-alsa endif -# avahi support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) VLC_CONF_OPTS += --enable-avahi VLC_DEPENDENCIES += avahi else -- 2.34.1 From james.hilliard1 at gmail.com Wed Jan 12 20:39:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 13:39:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220112203939.606775-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. Signed-off-by: James Hilliard --- package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- package/qt5/qt5base/qt5base.mk | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..db9ab0c364 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,18 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..6c05e710d8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ -- 2.25.1 From arnout at mind.be Wed Jan 12 20:42:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 21:42:51 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> References: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> Message-ID: On 08/01/2022 18:35, Yann E. MORIN wrote: > Some files contain hard-coded absolute paths that point to the host > and/or staging directories. > > With per-package directories (aka. PPD), these paths point to the PPD > of the package that created the files, when we want them to point to the > PPD of the package that uses them. > > Up until now, we had two hooks that attempted to fix those files: > > - a libtool-specific hook that searches for all .la files and seds > them with the proper PPD, > > - a python-specific hook that tweaks just the sysconfigdata and > removes the byte-compiled version of the sysconfigdata. > > But now, we also have a few other kinds of files for which we need to > fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others > as well. > > We solve this issue by just replacing any PPD in text files, with the > current package's PPD. > > This is very similar to, and inspired from what is done when relocating > the SDK. However, we can't use the existing relocate-sdk script, because > that needs to know the original location, which we do not have when we > aggregate the PPD (we could store it, but we can easily do without it). Looking at the resulting code, it's so small that it's not worth factoring out. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle (Essensium/Mind) > Cc: Adam Duskett > Cc: Louis-Paul CORDIER > Cc: Andreas Naumann > --- > package/pkg-generic.mk | 43 +++++++++++++++++++++--------------------- > 1 file changed, 21 insertions(+), 22 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 6a5fe5507b..1022062bcf 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -90,21 +90,24 @@ endif > ####################################### > # Helper functions > > -# Make sure .la files only reference the current per-package > -# directory. > - > -# $1: package name (lower case) > -# $2: staging directory of the package > ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define fixup-libtool-files > - $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ > - -name "*.la" -print0 | xargs -0 --no-run-if-empty \ > - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" > + > +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the > +# proper staging and host directories for the current package: find > +# all text files that contain the PPD root, and replace it with the > +# current package's PPD. > +define PPD_FIXUP_PATHS > + $(Q)grep -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ This will trawl to large binary files and potentially take a long time... > + |while read -d '' f; do \ > + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ ... just to be ignored here. More importantly though: if a file is a symlink, it's going to be hit twice. Worse, if it's a symlink to an absolute path (which most likely points *outside* of STAGING_DIR), we may end up sed'ing something on the host... I notice now that the same (theoretical) issue exists in relocate-sdk.sh. Obviously that script doesn't get thoroughly tested so it may very well be the wrong thing to do... Do you remember perhaps why we don't simply do find $(HOST_DIR) -type f -print0 \ ? I was going to say that we can skip the grep, but then we're back at the large (text) file thing. > + printf '%s\0' "$${f}"; \ Why not do the sed right here, like is done in relocate-sdk.sh? In fact, I'd keep the code as close as possible to relocate-sdk.sh to make later refactoring easier. > + done \ > + |xargs -0 --no-run-if-empty \ > + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' > endef > -endif > > -# Make sure python _sysconfigdata*.py files only reference the current > -# per-package directory. > +# Remove python's pre-compiled "sysconfigdata", as it may contain paths to > +# the original staging or host dirs. > # > # Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) > # because those directories may be created in the same recipe this macro will > @@ -113,19 +116,15 @@ endif > # fail. > # So we just use HOST_DIR as a starting point, and filter on the two directories > # of interest. > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > define FIXUP_PYTHON_SYSCONFIGDATA Maybe rename to REMOVE_PYTHON_SYSCONFIGATA_PYC Regards, Arnout > $(Q)find $(HOST_DIR) \ > \( -path '$(HOST_DIR)/lib/python*' \ > -o -path '$(STAGING_DIR)/usr/lib/python*' \ > \) \ > - \( \( -name "_sysconfigdata*.pyc" -delete \) \ > - -o \( -name "_sysconfigdata*.py" -print0 \) \ > - \) \ > - | xargs -0 --no-run-if-empty \ > - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' > + \( -name "_sysconfigdata*.pyc" -delete \) > endef > -endif > + > +endif # PPD > > # Functions to collect statistics about installed files > > @@ -278,8 +277,6 @@ $(BUILD_DIR)/%/.stamp_configured: > @$(call pkg_size_before,$(STAGING_DIR),-staging) > @$(call pkg_size_before,$(BINARIES_DIR),-images) > @$(call pkg_size_before,$(HOST_DIR),-host) > - $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) > - $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) > $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) > $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) > $($(PKG)_CONFIGURE_CMDS) > @@ -836,7 +833,9 @@ $(2)_EXTRACT_CMDS ?= \ > $$(TAR_OPTIONS) -) > > # pre/post-steps hooks > -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA > +$(2)_POST_PREPARE_HOOKS += \ > + PPD_FIXUP_PATHS \ > + FIXUP_PYTHON_SYSCONFIGDATA > > ifeq ($$($(2)_TYPE),target) > ifneq ($$(HOST_$(2)_KCONFIG_VAR),) > From fontaine.fabrice at gmail.com Wed Jan 12 21:02:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:02:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/omniorb: bump to version 4.3.0 Message-ID: <20220112210219.3160627-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0 Signed-off-by: Fabrice Fontaine --- package/omniorb/omniorb.hash | 12 ++++++------ package/omniorb/omniorb.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/omniorb/omniorb.hash b/package/omniorb/omniorb.hash index 5ac8614689..f522c1ef67 100644 --- a/package/omniorb/omniorb.hash +++ b/package/omniorb/omniorb.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.4/ -sha1 a6f3c8e96fc09c4ef8d75bd495bbc5256a4773ee omniORB-4.2.4.tar.bz2 -md5 de961e8aa29f3eed95ea40a94c1cccdf omniORB-4.2.4.tar.bz2 +# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0/ +sha1 c3f12c2278f8c4603910c02c8fe892c1dde7217e omniORB-4.3.0.tar.bz2 +md5 8889ab13b444b495ca2c2b48ea6a6bd7 omniORB-4.3.0.tar.bz2 # Locally generated -sha256 28c01cd0df76c1e81524ca369dc9e6e75f57dc70f30688c99c67926e4bdc7a6f omniORB-4.2.4.tar.bz2 -sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING -sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB +sha256 976045a2341f4e9a85068b21f4bd928993292933eeecefea372db09e0219eadd omniORB-4.3.0.tar.bz2 +sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING +sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index 4ecbb9d2c9..a1943968f1 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.2.4 +OMNIORB_VERSION = 4.3.0 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 21:28:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:28:45 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-h2: bump to version 4.1.0 Message-ID: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> - Update site in Config.in - Reorder select - python 2.7 support has been dropped since version 4.0.0 https://github.com/python-hyper/h2/blob/v4.1.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- package/python-h2/Config.in | 5 +++-- package/python-h2/python-h2.hash | 6 +++--- package/python-h2/python-h2.mk | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-h2/Config.in b/package/python-h2/Config.in index dccee9b909..d88ad36761 100644 --- a/package/python-h2/Config.in +++ b/package/python-h2/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_H2 bool "python-h2" - select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_HPACK # runtime + select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime help HTTP/2 State-Machine based protocol implementation. - http://hyper.rtfd.org + https://github.com/python-hyper/h2 diff --git a/package/python-h2/python-h2.hash b/package/python-h2/python-h2.hash index 4193567d37..2f9c8f647f 100644 --- a/package/python-h2/python-h2.hash +++ b/package/python-h2/python-h2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/h2/json -md5 197a99c09f344a0dd987fab9801dc8d0 h2-3.2.0.tar.gz -sha256 875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14 h2-3.2.0.tar.gz +md5 4274f9619c0a43bb4ae01b6b02bf0c99 h2-4.1.0.tar.gz +sha256 a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb h2-4.1.0.tar.gz # Locally computed sha256 checksums -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE +sha256 7a65a5af0cbabf1c16251c7c6b2b7cb46d16a7222e79975b9b61fcd66a2e3f28 LICENSE diff --git a/package/python-h2/python-h2.mk b/package/python-h2/python-h2.mk index 81397bbb10..699e8baece 100644 --- a/package/python-h2/python-h2.mk +++ b/package/python-h2/python-h2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H2_VERSION = 3.2.0 +PYTHON_H2_VERSION = 4.1.0 PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz -PYTHON_H2_SITE = https://files.pythonhosted.org/packages/08/0a/033df0fc05fe94f72517ccd393dd9ff99b1773fd198307638e6d3568a518 +PYTHON_H2_SITE = https://files.pythonhosted.org/packages/2a/32/fec683ddd10629ea4ea46d206752a95a2d8a48c22521edd70b142488efe1 PYTHON_H2_SETUP_TYPE = setuptools PYTHON_H2_LICENSE = MIT PYTHON_H2_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 21:28:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:28:46 +0100 Subject: [Buildroot] [PATCH 2/3] package/python-hpack: bump to version 4.0.0 In-Reply-To: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> References: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> Message-ID: <20220112212847.3166081-2-fontaine.fabrice@gmail.com> - Drop patch (HISTORY.rst removed) - Update site in Config.in - python 2.7 has been dropped - Update indentation in hash file (two spaces) https://github.com/python-hyper/hpack/blob/v4.0.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- ...STORY.rst-from-UTF-8-format-to-ASCII.patch | 40 ------------------- package/python-hpack/Config.in | 3 +- package/python-hpack/python-hpack.hash | 8 ++-- package/python-hpack/python-hpack.mk | 4 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch diff --git a/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch b/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch deleted file mode 100644 index 015b8a24da..0000000000 --- a/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3d195f4f599f37c89419f1db1302f94acb38c264 Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Tue, 1 Aug 2017 10:15:33 +0200 -Subject: [PATCH] Convert HISTORY.rst from UTF-8 format to ASCII -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -UTF-8 formatted file breaks installations on some systems: - -Traceback (most recent call last): - File "setup.py", line 34, in - long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(), - File "/home/peko/autobuild/instance-1/output/target/usr/lib/python3.6/encodings/ascii.py", line 26, in decode - return codecs.ascii_decode(input, self.errors)[0] -UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 1125: ordinal not in range(128) - -To fix this error just replace '?' with 'S' meaning 'Section'. - -Signed-off-by: Yegor Yefremov ---- - HISTORY.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/HISTORY.rst b/HISTORY.rst -index 37b2d9c..b9310f5 100644 ---- a/HISTORY.rst -+++ b/HISTORY.rst -@@ -27,7 +27,7 @@ Release History - - HPACK now tolerates receiving multiple header table size changes in sequence, - rather than only one. - - HPACK now forbids header table size changes anywhere but first in a header -- block, as required by RFC 7541 ? 4.2. -+ block, as required by RFC 7541 S 4.2. - - Other miscellaneous performance improvements. - - 2.3.0 (2016-08-04) --- -2.11.0 - diff --git a/package/python-hpack/Config.in b/package/python-hpack/Config.in index b0ea03bc42..0608f97281 100644 --- a/package/python-hpack/Config.in +++ b/package/python-hpack/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_HPACK bool "python-hpack" + depends on BR2_PACKAGE_PYTHON3 help Pure-Python HPACK header compression. - http://hyper.rtfd.org + https://github.com/python-hyper/hpack diff --git a/package/python-hpack/python-hpack.hash b/package/python-hpack/python-hpack.hash index 72886b0edd..988cbaae0b 100644 --- a/package/python-hpack/python-hpack.hash +++ b/package/python-hpack/python-hpack.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/hpack/json -md5 556b0ae66180f54c2ce8029a0952088b hpack-3.0.0.tar.gz -# Locally computed -sha256 8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2 hpack-3.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/hpack/json +md5 27e01514ef06dc9fa0798d3dcb7de47c hpack-4.0.0.tar.gz +sha256 fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095 hpack-4.0.0.tar.gz +# Locally computed sha256 checksums sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index d6b96649e9..3cf534d055 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HPACK_VERSION = 3.0.0 +PYTHON_HPACK_VERSION = 4.0.0 PYTHON_HPACK_SOURCE = hpack-$(PYTHON_HPACK_VERSION).tar.gz -PYTHON_HPACK_SITE = https://pypi.python.org/packages/44/f1/b4440e46e265a29c0cb7b09b6daec6edf93c79eae713cfed93fbbf8716c5 +PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db19b0f6b370e79d586b3e8528b20252c729c476a2c02954 PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 21:28:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:28:47 +0100 Subject: [Buildroot] [PATCH 3/3] package/python-hyperframe: bump to version 6.0.1 In-Reply-To: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> References: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> Message-ID: <20220112212847.3166081-3-fontaine.fabrice@gmail.com> - Update site in Config.in - python 2.7 support has been dropped since version 6.0.0 - Update indentation in hash file (two spaces) https://github.com/python-hyper/hyperframe/blob/v6.0.1/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- package/python-hyperframe/Config.in | 3 ++- package/python-hyperframe/python-hyperframe.hash | 6 +++--- package/python-hyperframe/python-hyperframe.mk | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-hyperframe/Config.in b/package/python-hyperframe/Config.in index f3318a20e2..30457fe86e 100644 --- a/package/python-hyperframe/Config.in +++ b/package/python-hyperframe/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_HYPERFRAME bool "python-hyperframe" + depends on BR2_PACKAGE_PYTHON3 help HTTP/2 framing layer for Python. - http://hyper.rtfd.org + https://github.com/python-hyper/hyperframe/ diff --git a/package/python-hyperframe/python-hyperframe.hash b/package/python-hyperframe/python-hyperframe.hash index 3e686a4aa2..b39ab51a72 100644 --- a/package/python-hyperframe/python-hyperframe.hash +++ b/package/python-hyperframe/python-hyperframe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hyperframe/json -md5 6919183242feb26d8bce3b4cba81defd hyperframe-5.2.0.tar.gz -sha256 a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f hyperframe-5.2.0.tar.gz +md5 153c064e8ac654aaf136b3388c36de48 hyperframe-6.0.1.tar.gz +sha256 ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914 hyperframe-6.0.1.tar.gz # Locally computed sha256 checksums -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hyperframe/python-hyperframe.mk b/package/python-hyperframe/python-hyperframe.mk index 7640ade5fd..4b13ca51a3 100644 --- a/package/python-hyperframe/python-hyperframe.mk +++ b/package/python-hyperframe/python-hyperframe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HYPERFRAME_VERSION = 5.2.0 +PYTHON_HYPERFRAME_VERSION = 6.0.1 PYTHON_HYPERFRAME_SOURCE = hyperframe-$(PYTHON_HYPERFRAME_VERSION).tar.gz -PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/e6/7f/9a4834af1010dc1d570d5f394dfd9323a7d7ada7d25586bd299fc4cb0356 +PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/5a/2a/4747bff0a17f7281abe73e955d60d80aae537a5d203f417fa1c2e7578ebb PYTHON_HYPERFRAME_SETUP_TYPE = setuptools PYTHON_HYPERFRAME_LICENSE = MIT PYTHON_HYPERFRAME_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 21:56:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:56:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: add mips64el support Message-ID: <20220112215637.3179786-1-fontaine.fabrice@gmail.com> mips64el is supported since https://sourceforge.net/p/gnu-efi/code/ci/3f234f5b6ff5c16c6ddd5f2c2513fb329aecd30a Signed-off-by: Fabrice Fontaine --- package/gnu-efi/Config.in | 1 + package/gnu-efi/gnu-efi.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index d456a23837..8e35fddbcb 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_aarch64_be default y if BR2_i386 + default y if BR2_mips64el default y if BR2_x86_64 config BR2_PACKAGE_GNU_EFI diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 69618029f4..06bf254738 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -24,6 +24,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) GNU_EFI_PLATFORM = arm else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) GNU_EFI_PLATFORM = aarch64 +else ifeq ($(BR2_mips64el),y) +GNU_EFI_PLATFORM = mips64el endif GNU_EFI_MAKE_OPTS = \ -- 2.34.1 From james.hilliard1 at gmail.com Thu Jan 13 00:09:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 17:09:35 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions Message-ID: <20220113000935.2353800-1-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches which don't have proper version tags. Create a .git file so to trigger headers sync during configure. Hold back updating qt5webengine for now since the latest version requires significant changes to build, just tweak existing version to be compatible with latest kde versions for now. Signed-off-by: James Hilliard --- Changes v4 -> v5: - leave qt5webengine on current version - add minimal tweaks to qt5webengine to build with updated kde deps Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 +- ...Fix-build-with-GCC-11-include-limits.patch | 53 ------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 --------------- .../0008-Add-missing-limits-include.patch | 32 -------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 ----------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 +- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 +- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 +- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 ----------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 +- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 +- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +- package/qt5/qt5location-mapboxgl/Config.in | 4 + .../qt5location-mapboxgl.hash | 16 ++++ .../qt5location-mapboxgl.mk | 14 ++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 +++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 +- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 +- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 +- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 +- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 +- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 +- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 +- ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 +++++++++++++++++++ package/qt5/qt5webengine/qt5webengine.mk | 9 ++- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 +- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 +- 76 files changed, 306 insertions(+), 390 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..3e498f6a28 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..656e3067dc 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,9 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 +QT5_VERSION = $(QT5_VERSION_MAJOR).8 QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..a4ffd6b9a2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 13d3f871973033b24cd0b4a563812277153835897c61152aaebb6e468b3f8233 qtbase-7ec73b4e75eb4359f49e5dd2be291d459a685ace.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..a3206f67bb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 7ec73b4e75eb4359f49e5dd2be291d459a685ace +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..fd616b74a6 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 9237818f2202d9473b035750b2aa598b9c31ea19abf8ae898957d33da03d0553 qtquickcontrols2-0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4be6cd9117 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = 0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..1e4dc54c67 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..849a2b7f1b 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 728012f7762ecd5762d493f8796907c6456f31e7 +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..cebd6d0fe2 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,8 +4,9 @@ # ################################################################################ -QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) +QT5WEBENGINE_VERSION_MAJOR = 5.15 +QT5WEBENGINE_VERSION = $(QT5WEBENGINE_VERSION_MAJOR).2 +QT5WEBENGINE_SITE = https://download.qt.io/archive/qt/$(QT5WEBENGINE_VERSION_MAJOR)/$(QT5WEBENGINE_VERSION)/submodules QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ @@ -44,7 +45,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 13 00:19:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 17:19:46 -0700 Subject: [Buildroot] [PATCH v3 1/3] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220112135637.12c5edc4@windsurf> References: <20220107045531.3985241-1-james.hilliard1@gmail.com> <20220112135637.12c5edc4@windsurf> Message-ID: On Wed, Jan 12, 2022 at 5:56 AM Thomas Petazzoni wrote: > > Hello James, > > On Thu, 6 Jan 2022 21:55:29 -0700 > James Hilliard wrote: > > > This version of catapult is python3 compatible and will be used to > > replace the python2 only version in qt5webengine-chromium. > > > > Signed-off-by: James Hilliard > > --- > > Changes v2 -> v3: > > - add kconfig entry > > --- > > package/qt5/Config.in | 1 + > > .../qt5/qt5webengine-chromium-catapult/Config.in | 4 ++++ > > .../qt5webengine-chromium-catapult.hash | 3 +++ > > .../qt5webengine-chromium-catapult.mk | 14 ++++++++++++++ > > 4 files changed, 22 insertions(+) > > create mode 100644 package/qt5/qt5webengine-chromium-catapult/Config.in > > create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash > > create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk > > I have tested this patch series (I'm replying to the v3 because that's > the one I tested) with the following defconfig: > > BR2_arm=y > BR2_arm1176jzf_s=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_QT5WEBENGINE=y > BR2_PACKAGE_RPI_USERLAND=y > > and it failed to build like this: Yeah, there's quite a few issues with the qt5webengine update build in general, I've split out the kde qt5 deps update so that it can be reviewed/tested/merged before the qt5webengine update as the other updates require much more minimal changes and should make it easier to test the qt5webengine update issues separately once the kde are verified to not create regressions: https://patchwork.ozlabs.org/project/buildroot/patch/20220113000935.2353800-1-james.hilliard1 at gmail.com/ I also think I fixed a potentially related issue with qmake sysrootify path generation by disabling it and setting sysroot paths manually, this seems to work better and appears to fix per-package directory builds on a number of the qt5 modules(although some seem to still have issues), this should hopefully make it easier to fix the qt5webengine issues as well: https://patchwork.ozlabs.org/project/buildroot/patch/20220112203939.606775-1-james.hilliard1 at gmail.com/ Both of these should apply on top of master and should not depend on each other. > > FAILED: host/obj/crypto/crypto/nss_key_util.o > /usr/bin/g++ -MMD -MF host/obj/crypto/crypto/nss_key_util.o.d -DCRYPTO_IMPLEMENTATION -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Ihost/gen -I../../3rdparty/chromium -I../../3rdparty/chromium/third_party/perfetto/include -Ihost/gen/third_party/perfetto/build_config -Ihost/gen/third_party/perfetto -I../../3rdparty/chromium/third_party/boringssl/src/include -I../../3rdparty/chromium/third_party/abseil-cpp -I../../3rdparty/chromium/third_party/protobuf/src -Ihost/gen/protoc_out -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointe > r-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -I/usr/include/nss -I/usr/include/nspr -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -I/home/thomas/buildroot/buildroot/output/host/include -c ../../3rdparty/chromium/crypto/nss_key_util.cc -o host/obj/crypto/crypto/nss_key_util.o > In file included from ../../3rdparty/chromium/crypto/nss_key_util.cc:5: > ../../3rdparty/chromium/crypto/nss_key_util.h:8:10: fatal error: secoidt.h: No such file or directory > 8 | #include > | ^~~~~~~~~~~ > compilation terminated. > [19912/23484] CXX host/obj/crypto/crypto/sha2.o > [19913/23484] CXX host/obj/crypto/crypto/secure_hash.o > [19914/23484] CXX host/obj/base/base/base_jumbo_7.o > [19915/23484] CXX host/obj/crypto/crypto/signature_creator.o > [19916/23484] CXX host/obj/base/base/base_jumbo_11.o > [19917/23484] CXX host/obj/crypto/crypto/symmetric_key.o > [19918/23484] CXX host/obj/crypto/crypto/signature_verifier.o > [19919/23484] CXX host/obj/base/base/base_jumbo_4.o > In file included from host/gen/base/base_jumbo_4.cc:6: > ./../../3rdparty/chromium/base/debug/alias.cc:11: warning: ignoring #pragma clang max_tokens_here [-Wunknown-pragmas] > 11 | #pragma clang max_tokens_here 250 > | > ninja: build stopped: subcommand failed. > make[5]: *** [Makefile.gn_run:356: run_ninja] Error 1 > make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 2 > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 > make[1]: *** [package/pkg-generic.mk:295: /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.8/.stamp_built] Error 2 > make: *** [Makefile:84: _all] Error 2 > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From jose.pekkarinen at unikie.com Thu Jan 13 05:12:37 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Thu, 13 Jan 2022 07:12:37 +0200 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: <20220112170043.03abd8c1@windsurf> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> <20220112155103.7e6c11c0@windsurf> <20220112170043.03abd8c1@windsurf> Message-ID: On Wed, Jan 12, 2022 at 6:00 PM Thomas Petazzoni wrote: > > On Wed, 12 Jan 2022 17:08:26 +0200 > Jos? Pekkarinen wrote: > > > > prlimit() exists in musl. Was included, as suggested > > > by the prlimit() man page ? > > > > It is: > > > > $ cat libminijail.c > > [...] > > #include > > [...] > > Ah, it's uClibc that is missing prlimit(). Can you confirm that > minijail builds fine with glibc and musl, but breaks on uClibc due to > prlimit() being missing? > > I'm not sure it's possible to replace prlimit() by setrlimit(). Indeed, > prlimit() has a PID as the first argument, which allows to ste resource > limits on other processes, while setrlimit() only takes care of the > current process. > > I'm afraid it seems we will have to disallow the use of minijail with > uClibc toolchains. Hi, Yes, it is only uclibc, this is the out of test-pkg: $ utils/test-pkg -c minijail.cfg -p minijail bootlin-armv5-uclibc [1/6]: FAILED bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 1 build failed, 0 legal-info failed Thanks! Jos?. From gilles.talis at gmail.com Thu Jan 13 06:51:36 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 07:51:36 +0100 Subject: [Buildroot] [PATCH 1/5] package/serd: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: Hi James, all, Le ven. 7 janv. 2022 ? 23:26, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/serd/Config.in | 8 ++++++++ > package/serd/serd.hash | 4 ++++ > package/serd/serd.mk | 20 ++++++++++++++++++++ > 5 files changed, 34 insertions(+) > create mode 100644 package/serd/Config.in > create mode 100644 package/serd/serd.hash > create mode 100644 package/serd/serd.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 3d5c01f795..d99d7798db 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1299,6 +1299,7 @@ F: package/python-tinycss2/ > F: package/python-weasyprint/ > F: package/python-yarl/ > F: package/python-zopfli/ > +F: package/serd/ > F: package/zchunk/ > > N: James Knight > diff --git a/package/Config.in b/package/Config.in > index e9ee4d2ef1..18ae22f227 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1704,6 +1704,7 @@ menu "JSON/XML" > source "package/rapidjson/Config.in" > source "package/rapidxml/Config.in" > source "package/raptor/Config.in" > + source "package/serd/Config.in" > source "package/tinyxml/Config.in" > source "package/tinyxml2/Config.in" > source "package/valijson/Config.in" > diff --git a/package/serd/Config.in b/package/serd/Config.in > new file mode 100644 > index 0000000000..7633a979e2 > --- /dev/null > +++ b/package/serd/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_SERD > + bool "serd" > + help > + Serd is a lightweight C library for RDF syntax which > + supports reading and writing Turtle, TriG, NTriples, and > + NQuads. > + > + https://drobilla.net/software/serd.html > diff --git a/package/serd/serd.hash b/package/serd/serd.hash > new file mode 100644 > index 0000000000..d64a2aa271 > --- /dev/null > +++ b/package/serd/serd.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig > +sha256 affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf serd-0.30.10.tar.bz2 > +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING > diff --git a/package/serd/serd.mk b/package/serd/serd.mk > new file mode 100644 > index 0000000000..85b16f6866 > --- /dev/null > +++ b/package/serd/serd.mk > @@ -0,0 +1,20 @@ > +################################################################################ > +# > +# serd > +# > +################################################################################ > + > +SERD_VERSION = 0.30.10 > +SERD_SITE = https://download.drobilla.net > +SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2 > +SERD_LICENSE = ISC > +SERD_LICENSE_FILES = COPYING > +SERD_INSTALL_STAGING = YES > + > +SERD_CONF_OPTS += --largefile --no-coverage > + > +ifeq ($(BR2_STATIC_LIBS),y) > +SERD_CONF_OPTS += --static --no-shared --static-progs > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Ran compilation test on arm64 with external toolchain. Also ran the test-pkg utility. Tested-by: Gilles Talis From gilles.talis at gmail.com Thu Jan 13 06:52:16 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 07:52:16 +0100 Subject: [Buildroot] [PATCH 2/5] package/sord: new package In-Reply-To: <20220107222613.4124764-2-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> <20220107222613.4124764-2-james.hilliard1@gmail.com> Message-ID: Hi James, all Le ven. 7 janv. 2022 ? 23:26, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/sord/Config.in | 8 ++++++++ > package/sord/sord.hash | 4 ++++ > package/sord/sord.mk | 25 +++++++++++++++++++++++++ > 5 files changed, 39 insertions(+) > create mode 100644 package/sord/Config.in > create mode 100644 package/sord/sord.hash > create mode 100644 package/sord/sord.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index d99d7798db..bc54ab590c 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1300,6 +1300,7 @@ F: package/python-weasyprint/ > F: package/python-yarl/ > F: package/python-zopfli/ > F: package/serd/ > +F: package/sord/ > F: package/zchunk/ > > N: James Knight > diff --git a/package/Config.in b/package/Config.in > index 18ae22f227..6133d6ce32 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1705,6 +1705,7 @@ menu "JSON/XML" > source "package/rapidxml/Config.in" > source "package/raptor/Config.in" > source "package/serd/Config.in" > + source "package/sord/Config.in" > source "package/tinyxml/Config.in" > source "package/tinyxml2/Config.in" > source "package/valijson/Config.in" > diff --git a/package/sord/Config.in b/package/sord/Config.in > new file mode 100644 > index 0000000000..91dfb41d0b > --- /dev/null > +++ b/package/sord/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_SORD > + bool "sord" > + select BR2_PACKAGE_SERD > + help > + Sord is a lightweight C library for storing RDF data in > + memory. > + > + https://drobilla.net/software/sord.html > diff --git a/package/sord/sord.hash b/package/sord/sord.hash > new file mode 100644 > index 0000000000..af175f91f0 > --- /dev/null > +++ b/package/sord/sord.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc > +sha256 7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14 sord-0.16.8.tar.bz2 > +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING > diff --git a/package/sord/sord.mk b/package/sord/sord.mk > new file mode 100644 > index 0000000000..f805805e9d > --- /dev/null > +++ b/package/sord/sord.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# sord > +# > +################################################################################ > + > +SORD_VERSION = 0.16.8 > +SORD_SITE = https://download.drobilla.net > +SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2 > +SORD_LICENSE = ISC > +SORD_LICENSE_FILES = COPYING > +SORD_DEPENDENCIES = host-pkgconf serd > +SORD_INSTALL_STAGING = YES > + > +ifeq ($(BR2_PACKAGE_PCRE),y) > +SORD_DEPENDENCIES += pcre > +endif > + > +SORD_CONF_OPTS += --no-coverage > + > +ifeq ($(BR2_STATIC_LIBS),y) > +SORD_CONF_OPTS += --static --no-shared --static-progs > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Ran compilation test on arm64 with external toolchain. Also ran the test-pkg utility. Tested-by: Gilles Talis From gilles.talis at gmail.com Thu Jan 13 06:57:41 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 07:57:41 +0100 Subject: [Buildroot] [PATCH 3/5] package/lv2: new package In-Reply-To: <20220107222613.4124764-3-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> <20220107222613.4124764-3-james.hilliard1@gmail.com> Message-ID: Hi James, all Le ven. 7 janv. 2022 ? 23:26, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/lv2/Config.in | 8 ++++++++ > package/lv2/lv2.hash | 4 ++++ > package/lv2/lv2.mk | 32 ++++++++++++++++++++++++++++++++ > 5 files changed, 46 insertions(+) > create mode 100644 package/lv2/Config.in > create mode 100644 package/lv2/lv2.hash > create mode 100644 package/lv2/lv2.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index bc54ab590c..6c6e93f089 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1254,6 +1254,7 @@ F: package/exfatprogs/ > F: package/gensio/ > F: package/lua-std-debug/ > F: package/lua-std-normalize/ > +F: package/lv2/ > F: package/pipewire/ > F: package/python-aioconsole/ > F: package/python-aiodns/ > diff --git a/package/Config.in b/package/Config.in > index 6133d6ce32..a439a456a4 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1358,6 +1358,7 @@ menu "Audio/Sound" > source "package/libsoundtouch/Config.in" > source "package/libsoxr/Config.in" > source "package/libvorbis/Config.in" > + source "package/lv2/Config.in" > source "package/mp4v2/Config.in" > source "package/openal/Config.in" > source "package/opencore-amr/Config.in" > diff --git a/package/lv2/Config.in b/package/lv2/Config.in > new file mode 100644 > index 0000000000..aeeb6d0451 > --- /dev/null > +++ b/package/lv2/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_LV2 > + bool "lv2" > + help > + LV2 is a plugin standard for audio systems. It defines > + a minimal yet extensible C API for plugin code and a > + format for plugin "bundles". > + > + https://lv2plug.in/ > diff --git a/package/lv2/lv2.hash b/package/lv2/lv2.hash > new file mode 100644 > index 0000000000..ed21620bee > --- /dev/null > +++ b/package/lv2/lv2.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# https://lv2plug.in/spec/lv2-1.18.2.tar.bz2.asc > +sha256 4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e lv2-1.18.2.tar.bz2 > +sha256 0b0b07d852e3ce7fa04986e141f73001bd7f260683968f0a19e02dbcc4131aa6 COPYING > diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk > new file mode 100644 > index 0000000000..589b518545 > --- /dev/null > +++ b/package/lv2/lv2.mk > @@ -0,0 +1,32 @@ > +################################################################################ > +# > +# lv2 > +# > +################################################################################ > + > +LV2_VERSION = 1.18.2 > +LV2_SITE = https://lv2plug.in/spec > +LV2_SOURCE = lv2-$(LV2_VERSION).tar.bz2 > +LV2_LICENSE = ISC > +LV2_LICENSE_FILES = COPYING > +LV2_DEPENDENCIES = host-pkgconf > +LV2_INSTALL_STAGING = YES > + > +LV2_CONF_OPTS += \ > + --no-coverage \ > + --no-check-links \ > + --copy-headers > + > +ifeq ($(BR2_PACKAGE_CAIRO),y) > +LV2_DEPENDENCIES += cairo > +endif > + > +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) > +LV2_DEPENDENCIES += libsndfile > +endif > + > +ifeq ($(BR2_PACKAGE_LIBGTK2),y) > +LV2_DEPENDENCIES += libgtk2 > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot I'm OK with your patch. Looks good to me. test-pkg utility reported two failures though: bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: FAILED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: FAILED sourcery-arm [6/6]: OK I will let you and the maintainers decide if the patch can be committed. From gilles.talis at gmail.com Thu Jan 13 07:00:07 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 08:00:07 +0100 Subject: [Buildroot] [PATCH 4/5] package/sratom: new package In-Reply-To: <20220107222613.4124764-4-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> <20220107222613.4124764-4-james.hilliard1@gmail.com> Message-ID: Hi James, all, Le ven. 7 janv. 2022 ? 23:27, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/sratom/Config.in | 10 ++++++++++ > package/sratom/sratom.hash | 4 ++++ > package/sratom/sratom.mk | 21 +++++++++++++++++++++ > 5 files changed, 37 insertions(+) > create mode 100644 package/sratom/Config.in > create mode 100644 package/sratom/sratom.hash > create mode 100644 package/sratom/sratom.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 6c6e93f089..f8aa809294 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1302,6 +1302,7 @@ F: package/python-yarl/ > F: package/python-zopfli/ > F: package/serd/ > F: package/sord/ > +F: package/sratom/ > F: package/zchunk/ > > N: James Knight > diff --git a/package/Config.in b/package/Config.in > index a439a456a4..51a4180569 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1369,6 +1369,7 @@ menu "Audio/Sound" > source "package/spandsp/Config.in" > source "package/speex/Config.in" > source "package/speexdsp/Config.in" > + source "package/sratom/Config.in" > source "package/taglib/Config.in" > source "package/tinyalsa/Config.in" > source "package/tremor/Config.in" > diff --git a/package/sratom/Config.in b/package/sratom/Config.in > new file mode 100644 > index 0000000000..771e82073d > --- /dev/null > +++ b/package/sratom/Config.in > @@ -0,0 +1,10 @@ > +config BR2_PACKAGE_SRATOM > + bool "sratom" > + select BR2_PACKAGE_LV2 > + select BR2_PACKAGE_SERD > + select BR2_PACKAGE_SORD > + help > + Sratom is a library for serialising LV2 atoms to and from > + RDF, particularly the Turtle syntax. > + > + https://drobilla.net/software/sratom.html > diff --git a/package/sratom/sratom.hash b/package/sratom/sratom.hash > new file mode 100644 > index 0000000000..64d460b2ea > --- /dev/null > +++ b/package/sratom/sratom.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# https://download.drobilla.net/sratom-0.6.8.tar.bz2.asc > +sha256 3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df sratom-0.6.8.tar.bz2 > +sha256 3fc429d6b944fa20306357196a28bb4dd7c25e2d67edebec771f44de5bd7f9e8 COPYING > diff --git a/package/sratom/sratom.mk b/package/sratom/sratom.mk > new file mode 100644 > index 0000000000..e1e0f4e033 > --- /dev/null > +++ b/package/sratom/sratom.mk > @@ -0,0 +1,21 @@ > +################################################################################ > +# > +# sratom > +# > +################################################################################ > + > +SRATOM_VERSION = 0.6.8 > +SRATOM_SITE = https://download.drobilla.net > +SRATOM_SOURCE = sratom-$(SRATOM_VERSION).tar.bz2 > +SRATOM_LICENSE = ISC > +SRATOM_LICENSE_FILES = COPYING > +SRATOM_DEPENDENCIES = host-pkgconf lv2 serd sord > +SRATOM_INSTALL_STAGING = YES > + > +SRATOM_CONF_OPTS += --no-coverage > + > +ifeq ($(BR2_STATIC_LIBS),y) > +SRATOM_CONF_OPTS += --static --no-shared > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Ran compilation test on arm64 with external toolchain. Also ran the test-pkg utility which did not go through for two configurations due to dependency failure. But: Tested-by: Gilles Talis anyway. From gilles.talis at gmail.com Thu Jan 13 07:00:34 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 08:00:34 +0100 Subject: [Buildroot] [PATCH 5/5] package/lilv: new package In-Reply-To: <20220107222613.4124764-5-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> <20220107222613.4124764-5-james.hilliard1@gmail.com> Message-ID: Hi James, all Le ven. 7 janv. 2022 ? 23:27, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/lilv/Config.in | 11 +++++++++++ > package/lilv/lilv.hash | 4 ++++ > package/lilv/lilv.mk | 34 ++++++++++++++++++++++++++++++++++ > 5 files changed, 51 insertions(+) > create mode 100644 package/lilv/Config.in > create mode 100644 package/lilv/lilv.hash > create mode 100644 package/lilv/lilv.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index f8aa809294..c214abe209 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1254,6 +1254,7 @@ F: package/exfatprogs/ > F: package/gensio/ > F: package/lua-std-debug/ > F: package/lua-std-normalize/ > +F: package/lilv/ > F: package/lv2/ > F: package/pipewire/ > F: package/python-aioconsole/ > diff --git a/package/Config.in b/package/Config.in > index 51a4180569..1cf2bb5219 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1358,6 +1358,7 @@ menu "Audio/Sound" > source "package/libsoundtouch/Config.in" > source "package/libsoxr/Config.in" > source "package/libvorbis/Config.in" > + source "package/lilv/Config.in" > source "package/lv2/Config.in" > source "package/mp4v2/Config.in" > source "package/openal/Config.in" > diff --git a/package/lilv/Config.in b/package/lilv/Config.in > new file mode 100644 > index 0000000000..086125cdc9 > --- /dev/null > +++ b/package/lilv/Config.in > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_LILV > + bool "lilv" > + select BR2_PACKAGE_LV2 > + select BR2_PACKAGE_SERD > + select BR2_PACKAGE_SORD > + select BR2_PACKAGE_SRATOM > + help > + Lilv is a C library to make the use of LV2 plugins as simple > + as possible for applications. > + > + https://drobilla.net/software/lilv.html > diff --git a/package/lilv/lilv.hash b/package/lilv/lilv.hash > new file mode 100644 > index 0000000000..afa20fc083 > --- /dev/null > +++ b/package/lilv/lilv.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# https://download.drobilla.net/lilv-0.24.12.tar.bz2.asc > +sha256 26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061 lilv-0.24.12.tar.bz2 > +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING > diff --git a/package/lilv/lilv.mk b/package/lilv/lilv.mk > new file mode 100644 > index 0000000000..651597953d > --- /dev/null > +++ b/package/lilv/lilv.mk > @@ -0,0 +1,34 @@ > +################################################################################ > +# > +# lilv > +# > +################################################################################ > + > +LILV_VERSION = 0.24.12 > +LILV_SITE = https://download.drobilla.net > +LILV_SOURCE = lilv-$(LILV_VERSION).tar.bz2 > +LILV_LICENSE = ISC > +LILV_LICENSE_FILES = COPYING > +LILV_DEPENDENCIES = host-pkgconf lv2 serd sord sratom > +LILV_INSTALL_STAGING = YES > + > +LILV_CONF_OPTS += \ > + --dyn-manifest \ > + --no-bash-completion \ > + --no-coverage > + > +ifeq ($(BR2_PACKAGE_PYTHON3),y) > +LILV_DEPENDENCIES += python3 > +else > +LILV_CONF_OPTS += --no-bindings > +endif > + > +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) > +LILV_DEPENDENCIES += libsndfile > +endif > + > +ifeq ($(BR2_STATIC_LIBS),y) > +LILV_CONF_OPTS += --static --no-shared --static-progs > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Ran compilation test on arm64 with external toolchain. Also ran the test-pkg utility which did not go through for two configurations due to dependency failure. But: Tested-by: Gilles Talis anyway. From thomas.petazzoni at bootlin.com Thu Jan 13 07:06:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 07:06:44 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-12 Message-ID: <20220113071133.371F0415E6@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-12 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 62 | 7 | 0 | 69 | 2021.11.x | 29 | 8 | 0 | 37 | master | 111 | 50 | 0 | 161 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 6 host-riscv-isa-sim-1.1.0 | 4 ksmbd-tools-3.4.3 | 4 polkit-0.120 | 4 guile-3.0.7 | 3 vtun-3.0.4 | 3 bird-2.0.8 | 2 bluez5_utils-5.63 | 2 btrfs-progs-5.15.1 | 2 drbd-utils-9.19.0 | 2 gcr-3.40.0 | 2 samba4-4.15.3 | 2 bat-0.18.3 | 1 boinc-7.18.1 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 host-btrfs-progs-5.15.1 | 1 host-gobject-introspection-... | 1 libqb-2.0.3 | 1 libupnp-1.14.12 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.3 | 1 pcsc-lite-1.9.5 | 1 qt5webkit-5.212.0-alpha4 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/c2dd780f4b0b7ff7fde3289cec4ffc2ed254f72b | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/d4cdcb7da3c038a55d306c2ac5621e40beaf4ae4 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/072068f83a62630eb9ba79312b1960b5c459d32e | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c918b7e9ede9545749f958d33b2f79bde6b7c30e | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ca37e3f96909f2f3da5d2a54fd3d5783c06cc9c0 | riscv32 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/62160c222a5cc38d728b9d1cc177dd39ef602032 | mips64el | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/30a96db548b53d14c38b8d368bb252ed74e30d4d | ORPH powerpc | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/13d570c7318f2ad7b05c2fb196f04ecb86f1bcc9 | ORPH microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/c2abf60c045c69c7ecbc71df19348de6b3e10139 | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/307780e79cc4c95a19562cebe91b2204bf9bc970 | powerpc64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/1968724aa0b3d9560c877329f7a12fead1fdf0e4 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1e467d0960206b56a33c0a108e0e76387db09604 | arm | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b | ORPH riscv64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de | ORPH mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/2de13e5fcb9e08ee53f9a2a9907f5c9ea03dad23 | riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/59715e297ef705b72ca20684f466ab03a86c707e | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/7ec31a52659ea37af7f3d118787914fd4e7a6b25 | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/ef724481d44f43539055260af795dd88a6f86f28 | ORPH arm | host-btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/e1efb2b9038858df20ecfb0a91eb5519683b44c3 | ORPH powerpc64le | host-gobject-introspection-... | NOK | http://autobuild.buildroot.net/results/95e4a23c16f6bd96566dc497663f38a0858c5a6e | ORPH mipsel | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/e9658a6cf9feba9473ec3ed1225974bb83feea42 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6339da1618a1b0fec3888c7a5e21a2a07adb6e4b | mips64el | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/d35ff4a0ca0a8463121d717a9727e0d863ca83e8 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6c67db526d31c7e4c31515068d7fa0fc9cc6e72c | arc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/73f3b0d74835ac6e20898f7c4cb69e1f6f4a2e9a | aarch64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/6932c83e2459176d37397b9aadd7679f56497c19 | arc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/3a38fbfaa719860d230d6687f25941202bf3317b | arm | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/3da7ce45b3db98dd81ba41ffd097820b13640f8a | or1k | libqb-2.0.3 | NOK | http://autobuild.buildroot.net/results/bdd35eded20f61261a98cc50681dac3ccdd3cf53 | or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/6448543da06072830417181a49c6cf52f131ffbc | mipsel | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/820b1be882335481584f5d57b3490eda978e3107 | mipsel | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/e97ad48f20a325f5757754a8be2bdb613c86e4ea | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/757cbbbfeddd460bce6f86c1f2f27eea0fcd53a0 | ORPH s390x | polkit-0.120 | NOK | http://autobuild.buildroot.net/results/70243c99f84c4a663ca3d8823572abd97bc53b79 | aarch64 | polkit-0.120 | NOK | http://autobuild.buildroot.net/results/e03385e21f905785a07c105e78eb8a91a81a9819 | mips64el | polkit-0.120 | NOK | http://autobuild.buildroot.net/results/b2d2b27844b32b3609e11005966d85dc0dfb7a9f | powerpc | polkit-0.120 | NOK | http://autobuild.buildroot.net/results/0de79cd0ba25fdd466f5a27d9de3645d99d3632d | mipsel | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/743c25004421363ec79cef28640c3ee636a6bad6 | powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/dcd737a4cb315e4bf1525b9b52fa3727befcdc4f | riscv32 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/db011d6a124817bb603d33a6b4571046abf84bdb | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/20a99570e9df86173074c6f8f6b1fe244540d755 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/31ec8edadd25f2cfec66b7ef02423fff6a3b699b | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/eadf56f38dfd0e6c8242c957d0eedcc5a4ec2433 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e6038719a8a4276ef7e9d3a68699911b37de28d8 | arm | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/5417abef2b9aa14a01400f48fb308519c618a94a | powerpc64 | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/c1e2ebbaec6e6871d6e2ea2222d6fb9c79187c4b | arc | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/1f710e331e32c808796fc524f844d636d7de1746 | ORPH riscv64 | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/3ee8f9ee55e51af38e9dbe7b9840c9589d88a30f | ORPH arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/bd8dda42fb51c821d54742488d088e9bf144604e | ORPH s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/8518113229f7e0c0af978246d57638c19fb53474 | Classification of failures by reason for 2021.02.x -------------------------------------------------- bluez5_utils-5.62 | 1 cegui-0-8-7 | 1 erlang-jiffy-1.0.6 | 1 glib-networking-2.66.0 | 1 host-sentry-cli-1.57.0 | 1 mesa3d-20.3.5 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | bluez5_utils-5.62 | NOK | http://autobuild.buildroot.net/results/68ed580fdb328e3d83a53fa131bfc77362afa5dd | powerpc | cegui-0-8-7 | NOK | http://autobuild.buildroot.net/results/c25526ee0b8fef36a36d0b385617519e27803208 | x86_64 | erlang-jiffy-1.0.6 | NOK | http://autobuild.buildroot.net/results/c4315cf66a4f247804e44b2bb95a972b85825495 | riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/60c996364269a0f6a14d6c34a8b9ae521c657203 | ORPH riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/afc061bd98a0798ac8d3365fc8d26acc95787d9c | xtensa | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/581273576b75f2c89b825b1fa78b2e6565c53806 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/a6d57724d0b5e4f8ddc1b4a7549d6fda59d91091 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 3 bird-2.0.8 | 1 host-go-1.17.3 | 1 libnss-3.73 | 1 mono-6.12.0.90 | 1 qt5webkit-5.9.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/a4e9fc5f8cbc0eddb16f3d32507b95ea764ba9cb | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/de56a02b34e8ba5598b3a3139c0a1568c1726b5b | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/7ce1e639b4eb17b0d8fe1eb00887fc49e4f77836 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/4ca3501d84a9840d155f0ef6d7403d1595e0faf3 | mips64el | host-go-1.17.3 | NOK | http://autobuild.buildroot.net/results/8f815942d6c927e69d9dcf23b00d54b1706336f9 | x86_64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/787e66fd3f2c6ff68ab7d3b6fcc23894e6362405 | arm | mono-6.12.0.90 | NOK | http://autobuild.buildroot.net/results/7785ed0d745a74fb290fdd34715c9f93baf91532 | mipsel | qt5webkit-5.9.1 | NOK | http://autobuild.buildroot.net/results/58258163b8488ed83af381fbb21d18357474247e | Gitlab CI results for 2022-01-12 ================================ -- http://autobuild.buildroot.net From x1gxi9rirbxbkr4c1t48310 at uclibc.org Thu Jan 13 05:15:32 2022 From: x1gxi9rirbxbkr4c1t48310 at uclibc.org (reports) Date: Thu, 13 Jan 2022 06:15:32 +0100 Subject: [Buildroot] delivery failure Message-ID: Email Protection Report You have 3 message(s) received to buildroot at uclibc.org in your quarantine during the last 24 hours. ? 01/13/2022 06:15:32 am sistema at suministrosmega.com ?? Your Have a File On ... 01/13/2022 06:15:32 am giupuml at heroncabinets.com uclibc.org sample order for ... 01/13/2022 06:15:32 am jedomb at detonfan.com Re: wire details for s... View Quarantine ? How do I Blacklist emails as Spam? Click on 'View My Quarantine' above and enter your Email and Email Password. 'Select' the email you want to mark as Spam. Click 'Blacklist' from the top left corner to stop receiving emails from this person. ? How do I Whitelist emails being set as Spam? Click on 'View My Quarantine' above and enter your Email and Email Password. 'Select' the Spam email you want to start receiving. Click 'Whitelist' from the top left corner to start receiving emails from this person. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Thu Jan 13 07:58:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 08:58:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs __sync_*_4 intrinsics Message-ID: <20220113075847.3267080-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/EGL/libEGL.so.1.1.0.p/libegl.c.o: in function `AtomicIncrement': libegl.c:(.text+0x614): undefined reference to `__sync_add_and_fetch_4' Fixes: - http://autobuild.buildroot.org/results/a204953020a714057ec6690e63a3ad8ac621acd5 Signed-off-by: Fabrice Fontaine --- package/libglvnd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index 2d99be8632..cd19fde582 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on !BR2_STATIC_LIBS # dlfcn.h help The GL Vendor-Neutral Dispatch library @@ -45,4 +46,5 @@ config BR2_PACKAGE_PROVIDES_LIBGLES endif comment "libglvnd needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS -- 2.34.1 From aperez at igalia.com Thu Jan 13 08:53:18 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 10:53:18 +0200 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-12 In-Reply-To: <20220113071133.371F0415E6@smtp4.osuosl.org> References: <20220113071133.371F0415E6@smtp4.osuosl.org> Message-ID: <20220113105318.GC97860@momiji> On Thu, 13 Jan 2022 07:06:44 +0000 Thomas Petazzoni wrote: > Detail of failures for master > ----------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > > [...] > > arm | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b | ORPH > riscv64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de | ORPH I ran into the same issue while trying out the switch to Ninja for CMake packages, because trying to build "midori" pulls in "gcr" as a dependency. These build failures in "gcr" have been caused by the update to Meson 0.61; there is an upstream fix here: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81.patch Applying this patch locally made the configure step complete, but then the build step ran into this other issue: [1/114] Generating gck/gck-1.vapi with a custom command FAILED: gck/gck-1.vapi [...] Unknown option --metadatdir=/home/aperez/buildroot/output-cmake/build/gcr-3.40.0/gck Run '/home/aperez/buildroot/output-cmake/per-package/gcr/host/bin/vapigen-0.52 --help' to see a full list of available command line options. ninja: build stopped: subcommand failed. I am trying to fix this other issue before submitting a patch for the "gcr" package. If this second failure rings a bell to anyone, I am all ears^W eyes. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From aperez at igalia.com Thu Jan 13 09:12:30 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 11:12:30 +0200 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-12 In-Reply-To: <20220113105318.GC97860@momiji> References: <20220113071133.371F0415E6@smtp4.osuosl.org> <20220113105318.GC97860@momiji> Message-ID: <20220113111230.GB172867@momiji> On Thu, 13 Jan 2022 10:53:18 +0200 Adrian Perez de Castro wrote: > On Thu, 13 Jan 2022 07:06:44 +0000 Thomas Petazzoni wrote: > > > Detail of failures for master > > ----------------------------- > > > > arch | reason | OK? | url | orph? > > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > > > > [...] > > > > arm | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b | ORPH > > riscv64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de | ORPH > > I ran into the same issue while trying out the switch to Ninja for CMake > packages, because trying to build "midori" pulls in "gcr" as a dependency. > > These build failures in "gcr" have been caused by the update to Meson 0.61; > there is an upstream fix here: > > https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81.patch > > Applying this patch locally made the configure step complete, but then the > build step ran into this other issue: > > [1/114] Generating gck/gck-1.vapi with a custom command > FAILED: gck/gck-1.vapi > [...] > Unknown option --metadatdir=/home/aperez/buildroot/output-cmake/build/gcr-3.40.0/gck > Run '/home/aperez/buildroot/output-cmake/per-package/gcr/host/bin/vapigen-0.52 --help' to see a full list of available command line options. > ninja: build stopped: subcommand failed. > > I am trying to fix this other issue before submitting a patch for the "gcr" > package. If this second failure rings a bell to anyone, I am all ears^W eyes. Found it, this second one is a typo in the Meson source code, the following upstream patch fixes the issue alright: https://github.com/mesonbuild/meson/pull/9806 I'll submit patches for both issues momentarily. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From aperez at igalia.com Thu Jan 13 09:46:30 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 11:46:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/gcr: add upstream patch to fix build with meson 0.61 Message-ID: <20220113094630.2322090-1-aperez@igalia.com> Import an upstream patch which removes usage of an invalid keyword that was being passed to Meson's gnome.generate_gir() function. This fixes the following autobuilder issues: http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de Signed-off-by: Adrian Perez de Castro --- ...wn-kw-argument-in-gnome.generate_gir.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch new file mode 100644 index 0000000000..e672b5e2ac --- /dev/null +++ b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch @@ -0,0 +1,62 @@ +From 145bea264bed98cd435d8babfdee702c06c0afaa Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka +Date: Wed, 12 Jan 2022 00:24:20 +0100 +Subject: [PATCH 1/1] meson: Fix unknown kw argument in gnome.generate_gir + +This argument has been removed in Meson 0.61.0: + + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" + +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: + +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. + +Fixes #89 + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 +--- + gck/meson.build | 1 - + gcr/meson.build | 1 - + ui/meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a21a1e9 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -131,7 +131,6 @@ if get_option('introspection') + sources: gck_gir_sources, + namespace: 'Gck', + nsversion: '@0@'.format(gck_major_version), +- packages: gck_deps, + export_packages: 'gck- at 0@'.format(gck_major_version), + includes: [ 'GObject-2.0', 'Gio-2.0' ], + header: 'gck/gck.h', +diff --git a/gcr/meson.build b/gcr/meson.build +index 06c3a63..f998336 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -189,7 +189,6 @@ if get_option('introspection') + sources: [ gcr_base_public_sources, gcr_base_headers ], + namespace: 'Gcr', + nsversion: '@0@'.format(gcr_major_version), +- packages: gcr_base_deps, + export_packages: 'gcr-base- at 0@'.format(gcr_major_version), + includes: [ + 'GObject-2.0', +diff --git a/ui/meson.build b/ui/meson.build +index e656ea2..32ee057 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -152,7 +152,6 @@ if get_option('introspection') + export_packages: 'gcr-ui- at 0@'.format(gcr_major_version), + identifier_prefix: 'Gcr', + symbol_prefix: 'gcr', +- packages: gcr_ui_deps, + includes: [ + 'GObject-2.0', + 'Gio-2.0', +-- +2.34.1 + -- 2.34.1 From jose.pekkarinen at unikie.com Thu Jan 13 10:05:06 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?q?Jos=C3=A9=20Pekkarinen?=) Date: Thu, 13 Jan 2022 12:05:06 +0200 Subject: [Buildroot] [PATCH] package/minijail: new package Message-ID: <20220113100506.89687-1-jose.pekkarinen@unikie.com> This patch adds package minijail Minijail depends in a toolchain different from uclibc thanks to it's lack of support for prlimits. Signed-off-by: Jos? Pekkarinen --- [ v1 -> v2 ] - Fixed hash file - Fixed static assert patch - Depend in toolchain distinct of uclibc - Remove redundant host libpcap dependency - Remove redundant parenthesis on MINIJAIL_BUILD_CMDS DEVELOPERS | 1 + package/Config.in | 1 + ...te-static_assert-with-_Static_assert.patch | 35 +++++++++++++++++++ package/minijail/Config.in | 12 +++++++ package/minijail/minijail.hash | 5 +++ package/minijail/minijail.mk | 28 +++++++++++++++ 6 files changed, 82 insertions(+) create mode 100644 package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch create mode 100644 package/minijail/Config.in create mode 100644 package/minijail/minijail.hash create mode 100644 package/minijail/minijail.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55f37dfe62..3631021077 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1515,6 +1515,7 @@ F: support/testing/tests/package/test_zfs.py N: Jos? Pekkarinen F: package/alfred/ F: package/bmx7/ +F: package/minijail/ F: package/python-aexpect/ F: package/softhsm2/ F: support/testing/tests/package/sample_python_aexpect.py diff --git a/package/Config.in b/package/Config.in index a1924f96df..3b11b003fb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2556,6 +2556,7 @@ menu "System tools" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" + source "package/minijail/Config.in" source "package/moby-buildkit/Config.in" source "package/monit/Config.in" source "package/multipath-tools/Config.in" diff --git a/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch new file mode 100644 index 0000000000..ff85995114 --- /dev/null +++ b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch @@ -0,0 +1,35 @@ +From 8a6d5a1c48b85fb49f0d68ec31ecc51fd22e7201 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Wed, 12 Jan 2022 17:09:27 +0200 +Subject: [PATCH] Substitute static_assert with _Static_assert +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Substitute static_assert with _Static_assert + +static_assert behaves differently for uclibc +toolchains. Substituting it with the standard +_Static_assert builds on all toolchains tested. + +Signed-off-by: Jos? Pekkarinen +--- + libminijail.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libminijail.c b/libminijail.c +index b935dfd..b154f1c 100644 +--- a/libminijail.c ++++ b/libminijail.c +@@ -2620,7 +2620,7 @@ static int fd_is_open(int fd) + return fcntl(fd, F_GETFD) != -1 || errno != EBADF; + } + +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, ++_Static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, + "If true, ensure_no_fd_conflict will always find an unused fd."); + + /* If parent_fd will be used by a child fd, move it to an unused fd. */ +-- +2.25.1 + diff --git a/package/minijail/Config.in b/package/minijail/Config.in new file mode 100644 index 0000000000..24d307ed54 --- /dev/null +++ b/package/minijail/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_MINIJAIL + bool "minijail" + depends on !BR2_STATIC_LIBS # dlopen() + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_LIBCAP + help + Minijail is a sandboxing tool maintained by google. + + https://google.github.io/minijail/ + +comment "minijail needs a glibc or musl toolchain with dynamic library support" + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/minijail/minijail.hash b/package/minijail/minijail.hash new file mode 100644 index 0000000000..d9f497a86c --- /dev/null +++ b/package/minijail/minijail.hash @@ -0,0 +1,5 @@ +# Locally computed from https://github.com/google/minijail/releases/ +sha256 1ee5a5916491a32c121c7422b4d8c16481c0396a3acab34bf1c44589dcf810ae linux-v17.tar.gz + +# Locally computed +sha256 c6f439c5cf07263f71f01d29b79c79172ee529088e51ab434b22baad0988fe57 LICENSE diff --git a/package/minijail/minijail.mk b/package/minijail/minijail.mk new file mode 100644 index 0000000000..78898865fb --- /dev/null +++ b/package/minijail/minijail.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# minijail +# +################################################################################ + +MINIJAIL_VERSION = linux-v17 +MINIJAIL_SOURCE = $(MINIJAIL_VERSION).tar.gz +MINIJAIL_SITE = "https://github.com/google/minijail/archive/refs/tags" +MINIJAIL_LICENSE = BSD-Style +MINIJAIL_LICENSE_FILES = LICENSE +MINIJAIL_DEPENDENCIES=libcap + +define MINIJAIL_BUILD_CMDS + cd $(@D); \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) CC="$(TARGET_CC)" +endef + +define MINIJAIL_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/minijail0 \ + $(TARGET_DIR)/usr/bin/minijail0 + $(INSTALL) -m 0755 -D $(@D)/libminijailpreload.so \ + $(TARGET_DIR)/lib/libminijailpreload.so + $(INSTALL) -m 0755 -D $(@D)/libminijail.so \ + $(TARGET_DIR)/lib/libminijail.so +endef + +$(eval $(generic-package)) -- 2.25.1 From jose.pekkarinen at unikie.com Thu Jan 13 11:49:51 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?q?Jos=C3=A9=20Pekkarinen?=) Date: Thu, 13 Jan 2022 13:49:51 +0200 Subject: [Buildroot] [PATCH v3] package/opensc: new package Message-ID: <20220113114951.549960-1-jose.pekkarinen@unikie.com> The patch will add package opensc. sourcery-arm toolchain triggers strict aliasing rules that upstream finds no easy way to fix. It is disabled for now until a proper solution is found upstream. Signed-off-by: Jos? Pekkarinen --- [ v1 -> v2 ] Fix hash file, and patches messages. [ v2 -> v3 ] - Remove strict aliasing patch - Add approved patch for maybe uninitialized errors - Disable sourcery-arm toolchain DEVELOPERS | 1 + package/Config.in | 1 + .../0001-Fix-maybe-uninitialized-errors.patch | 83 +++++++++++++++++++ package/opensc/Config.in | 15 ++++ package/opensc/opensc.hash | 5 ++ package/opensc/opensc.mk | 14 ++++ 6 files changed, 119 insertions(+) create mode 100644 package/opensc/0001-Fix-maybe-uninitialized-errors.patch create mode 100644 package/opensc/Config.in create mode 100644 package/opensc/opensc.hash create mode 100644 package/opensc/opensc.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55f37dfe62..45e7192e65 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1515,6 +1515,7 @@ F: support/testing/tests/package/test_zfs.py N: Jos? Pekkarinen F: package/alfred/ F: package/bmx7/ +F: package/opensc/ F: package/python-aexpect/ F: package/softhsm2/ F: support/testing/tests/package/sample_python_aexpect.py diff --git a/package/Config.in b/package/Config.in index a1924f96df..b40909ef89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1643,6 +1643,7 @@ menu "Hardware handling" source "package/mtdev/Config.in" source "package/ne10/Config.in" source "package/neardal/Config.in" + source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" source "package/rpi-rgb-led-matrix/Config.in" diff --git a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch new file mode 100644 index 0000000000..01b7a39818 --- /dev/null +++ b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch @@ -0,0 +1,83 @@ +From bcb39d6f4d2dee6beb035cb2f3618174ec1cb2b0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 13:54:26 +0200 +Subject: [PATCH] Fix maybe uninitialized errors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PR: https://github.com/OpenSC/OpenSC/pull/2466 + +Signed-off-by: Jos? Pekkarinen +--- + src/libopensc/pkcs15-coolkey.c | 12 ++++++------ + src/pkcs15init/pkcs15-asepcos.c | 2 +- + src/tools/opensc-explorer.c | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c +index 586475dd..15684cef 100644 +--- a/src/libopensc/pkcs15-coolkey.c ++++ b/src/libopensc/pkcs15-coolkey.c +@@ -147,9 +147,9 @@ coolkey_find_matching_cert(sc_card_t *card, sc_cardctl_coolkey_object_t *in_obj, + static int + coolkey_get_attribute_ulong(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, CK_ULONG *value) + { +- const u8 *val; +- size_t val_len; +- u8 data_type; ++ const u8 *val = NULL; ++ size_t val_len = 0; ++ u8 data_type = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, &data_type); +@@ -168,8 +168,8 @@ static int + coolkey_get_attribute_boolean(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE attr_type) + { + int r; +- const u8 *val; +- size_t val_len; ++ const u8 *val = NULL; ++ size_t val_len = 0; + + r = coolkey_get_attribute(card, obj, attr_type, &val, &val_len, NULL); + if (r < 0) { +@@ -186,7 +186,7 @@ static int + coolkey_get_attribute_bytes(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, u8 *data, size_t *data_len, size_t max_data_len) + { + const u8 *val; +- size_t val_len; ++ size_t val_len = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, NULL); +diff --git a/src/pkcs15init/pkcs15-asepcos.c b/src/pkcs15init/pkcs15-asepcos.c +index d7122012..bc0efb5c 100644 +--- a/src/pkcs15init/pkcs15-asepcos.c ++++ b/src/pkcs15init/pkcs15-asepcos.c +@@ -221,7 +221,7 @@ static int asepcos_do_store_pin(sc_profile_t *profile, sc_card_t *card, + { + sc_file_t *nfile = NULL; + u8 buf[64], sbuf[64], *p = buf, *q = sbuf; +- int r, akn; ++ int r, akn = 0; + + if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) + return SC_ERROR_OBJECT_NOT_VALID; +diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c +index 9ec4daa1..04efdf8f 100644 +--- a/src/tools/opensc-explorer.c ++++ b/src/tools/opensc-explorer.c +@@ -2472,7 +2472,7 @@ int main(int argc, char *argv[]) + char *line; + int cargc; + char *cargv[260]; +- int multiple; ++ int multiple = 0; + struct command *cmd; + char prompt[3*SC_MAX_PATH_STRING_SIZE]; + +-- +2.25.1 + diff --git a/package/opensc/Config.in b/package/opensc/Config.in new file mode 100644 index 0000000000..5ee52d1de6 --- /dev/null +++ b/package/opensc/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_OPENSC + bool "opensc" + depends on !BR2_STATIC_LIBS # dlopen() + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM + select BR2_PACKAGE_PCSC_LITE + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + help + OpenSC provides a set of libraries and utilities to work + with smart cards. + + https://github.com/OpenSC/OpenSC/wiki + +comment "opensc needs a toolchain with dynamic library support distinct from sourcery-arm" + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash new file mode 100644 index 0000000000..517cfe503a --- /dev/null +++ b/package/opensc/opensc.hash @@ -0,0 +1,5 @@ +# Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ +sha256 8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 opensc-0.22.0.tar.gz + +# Computed locally +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk new file mode 100644 index 0000000000..7221eee944 --- /dev/null +++ b/package/opensc/opensc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# opensc +# +################################################################################ + +OPENSC_VERSION = 0.22.0 +OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) +OPENSC_LICENSE = LGPL-2.1+ +OPENSC_LICENSE_FILES = COPYING +OPENSC_DEPENDENCIES = openssl pcsc-lite +OPENSC_INSTALL_STAGING = YES + +$(eval $(autotools-package)) -- 2.25.1 From aperez at igalia.com Thu Jan 13 11:57:04 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 13:57:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: add upstream patch to fix vapigen support Message-ID: <20220113115704.2354150-1-aperez@igalia.com> Import an upstream patch which fixes a typo in the Meson source code which caused a wrong command line option to be passed to the vapigen program. This fixes the build for all packages which use Meson and provide API bindings generated using said tool. Signed-off-by: Adrian Perez de Castro --- ...x-typo-in-vapigen-option-metadatadir.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch new file mode 100644 index 0000000000..f8cc30ec29 --- /dev/null +++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch @@ -0,0 +1,31 @@ +From 5385e4c0a4dd4f9cf1e15c9c321b22d19cc0011a Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 10 Jan 2022 21:27:30 +0100 +Subject: [PATCH] gnome: fix typo in vapigen option metadatadir + +This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and +can cause a build failure, because --metadatdir is not a valid vapigen +option. + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: https://github.com/mesonbuild/meson/pull/9806 +--- + mesonbuild/modules/gnome.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 1125e56e7..dfc66c2e3 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): + cmd: T.List[T.Union[str, 'ExternalProgram']] + cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] + cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) +- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) ++ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) + cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) + cmd += pkg_cmd + cmd += ['--metadatadir=' + source_dir] +-- +2.34.1 + -- 2.34.1 From aperez at igalia.com Thu Jan 13 12:02:48 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 14:02:48 +0200 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-12 In-Reply-To: <20220113111230.GB172867@momiji> References: <20220113071133.371F0415E6@smtp4.osuosl.org> <20220113105318.GC97860@momiji> <20220113111230.GB172867@momiji> Message-ID: <20220113140248.GB219766@momiji> Hi again, On Thu, 13 Jan 2022 11:12:30 +0200 Adrian Perez de Castro wrote: > On Thu, 13 Jan 2022 10:53:18 +0200 Adrian Perez de Castro wrote: > > On Thu, 13 Jan 2022 07:06:44 +0000 Thomas Petazzoni wrote: > > > > > Detail of failures for master > > > ----------------------------- > > > > > > arch | reason | OK? | url | orph? > > > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > > > > > > [...] > > > > > > arm | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b | ORPH > > > riscv64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de | ORPH > > > > I ran into the same issue while trying out the switch to Ninja for CMake > > packages, because trying to build "midori" pulls in "gcr" as a dependency. > > > > These build failures in "gcr" have been caused by the update to Meson 0.61; > > there is an upstream fix here: > > > > https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81.patch > > Applying this patch locally made the configure step complete, but then the > > build step ran into this other issue: > > > > [1/114] Generating gck/gck-1.vapi with a custom command > > FAILED: gck/gck-1.vapi > > [...] > > Unknown option --metadatdir=/home/aperez/buildroot/output-cmake/build/gcr-3.40.0/gck > > Run '/home/aperez/buildroot/output-cmake/per-package/gcr/host/bin/vapigen-0.52 --help' to see a full list of available command line options. > > ninja: build stopped: subcommand failed. > > > > I am trying to fix this other issue before submitting a patch for the "gcr" > > package. If this second failure rings a bell to anyone, I am all ears^W eyes. > > Found it, this second one is a typo in the Meson source code, the following > upstream patch fixes the issue alright: > > https://github.com/mesonbuild/meson/pull/9806 > > I'll submit patches for both issues momentarily. Fixes sent: - gcr: https://patchwork.ozlabs.org/project/buildroot/patch/20220113094630.2322090-1-aperez at igalia.com/ - meson: https://patchwork.ozlabs.org/project/buildroot/patch/20220113115704.2354150-1-aperez at igalia.com/ Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From charles at steinkuehler.net Thu Jan 13 12:18:48 2022 From: charles at steinkuehler.net (Charles Steinkuehler) Date: Thu, 13 Jan 2022 06:18:48 -0600 Subject: [Buildroot] creating packages for opkg for buildroot based embedded platform software In-Reply-To: References: Message-ID: <2fc839d4-9c06-0197-dc15-58893d78afe9@steinkuehler.net> On 1/11/2022 11:37 AM, Karicheri, Murali wrote: > Hi Baruch, > > > > I fully appreciate the intentions of buildroot to keep it simple. I > had already reviewed the FAQ you had pointed out. What I am looking > for is something outside buildroot. Typically, embedded systems that > I am working with have firmware update mechanism in place. System > doesn't modify the active rootfs but update an alternate set of > partitions and switch to that once update is successful. So, we could > potentially generate two rootfs contents using buildroot. One using > say version 2021.02.02 and another with 2021.02.06 for example. We > are using ARM tool chain for our build and assume we will keep it > same for incremental updates. Understand that we might have to change > the tool chain as well since there could be vulnerability fixes to > tool chain. So, wondering if we could do a diff of both rootfs > contents and create an ipk for the diff and update the alternate > media for this purpose. Also, we will do extensive testing of our > product software. So, this will be QA tested before pushing to field. > > Is there anything work done for this type of use cases? As you have discovered, buildroot is focused on building a complete root filesystem. There are many tools available to manage updates and handle firmware upgrades. Buildroot can build these tools for you (eg: RAUC, SWupdate, etc), but configuration of the embedded system, the update process, and generating the update packages is up to you. There is almost infinite flexibility, which means you can probably do exactly what you want, but that can also make it hard to get something running. I needed a mechanism to do "A B" firmware updates and recently put together a Buildroot + RAUC example for the Raspberry Pi that generates a working basic system that can be updated: https://github.com/cdsteinkuehler/br2rauc This does full rootfs updates and allows for atomic boot loader updates, using the post-image.sh script to build the RAUC bundles needed for performing an update along with the root filesystem image generated by Buildroot. If you want to do partial updates, you can setup RAUC differently, perhaps with an overlay partition to hold your point release updates. -- Charles Steinkuehler charles at steinkuehler.net From thomas.petazzoni at bootlin.com Thu Jan 13 15:49:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 16:49:06 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <53b29654-5d59-26e6-4635-a1ecb87babe0@mind.be> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112160512.GC6032@falbala.internal.home.lespocky.de> <20220112184729.GB23006@momiji> <53b29654-5d59-26e6-4635-a1ecb87babe0@mind.be> Message-ID: <20220113164906.5db00b20@windsurf> On Wed, 12 Jan 2022 19:55:03 +0100 Arnout Vandecappelle wrote: > There's one disadvantage to Ninja in Buildroot context: until [1] is fixed, it > doesn't collaborate well with top-level parallel build. This means that if you > run with a toplevel JLEVEL of e.g. 24, you can easil end up with 40-100 compiles > running in parallel. The problem already exists for meson packages, but these > are sufficiently rare that they don't pose a problem in practice. I don't know > if it's going to become a problem if cmake packages are added to the mix. meson-based packages are no longer rare: we now have 116 packages using the meson-package infrastructure, including very high profile packages such as systemd, mesa3d, libglib2, and more. It is still higher than the 328 cmake-based package we have of course, but I wouldn't say that meson is "sufficiently rare" :-) Annoying that this problem hasn't been resolved in upstream ninja :-/ Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From baruch at tkos.co.il Thu Jan 13 16:36:58 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Thu, 13 Jan 2022 18:36:58 +0200 Subject: [Buildroot] [PATCH] package/socat: bump to version 1.7.4.3 Message-ID: <541525e413f6b72c67b8602fc88e916486931d5f.1642091818.git.baruch@tkos.co.il> Update README hash for version number change. Add a patch fixing build with musl. Signed-off-by: Baruch Siach --- ...-correct-the-getprotobynumber_r-test.patch | 43 +++++++++++++++++++ package/socat/socat.hash | 6 +-- package/socat/socat.mk | 2 +- 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch new file mode 100644 index 000000000000..de9540553191 --- /dev/null +++ b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch @@ -0,0 +1,43 @@ +From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 13 Jan 2022 17:56:10 +0200 +Subject: [PATCH] configure.ac: correct the getprotobynumber_r test + +The AC_TRY_COMPILE test succeeds even when libc does not provide the +tested symbol. The compiler produces a warning, but exits successfully. +Use AC_TRY_LINK that will only succeeds if libc provides the symbol. + +This fixes build with musl libc that does not support +getprotobynumber_r(). + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to socat at dest-unreach.org + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d4acc9e7e6f5..973a7f2218c9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) + # getprotobynumber_r() is not standardized + AC_MSG_CHECKING(for getprotobynumber_r() variant) + AC_CACHE_VAL(sc_cv_getprotobynumber_r, +-[AC_TRY_COMPILE([#include ++[AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], + [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024);], + [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL);], + [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], + +-- +2.34.1 + diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 0d9d0ba76c9d..4f7ff5328e28 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 003686f80d820072649660b85f80c58f socat-1.7.4.2.tar.bz2 +md5 5c28dd258ba928326d0716fcb4895cc2 socat-1.7.4.3.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763 socat-1.7.4.2.tar.bz2 +sha256 d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007 socat-1.7.4.3.tar.bz2 # Locally calculated -sha256 062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644 README +sha256 432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index cf2a31b0969c..e20577492d86 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.2 +SOCAT_VERSION = 1.7.4.3 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception -- 2.34.1 From raj.khem at gmail.com Thu Jan 13 17:02:17 2022 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Jan 2022 09:02:17 -0800 Subject: [Buildroot] [PATCH] external-toolchain: Detect linux/version.h via cross compiler In-Reply-To: <20220109000312.6b307c17@windsurf> References: <20201023093641.619746-1-raj.khem@gmail.com> <20220109000312.6b307c17@windsurf> Message-ID: Hi Thomas On Sat, Jan 8, 2022 at 3:03 PM Thomas Petazzoni wrote: > > Hello Khem, > > On Fri, 23 Oct 2020 02:36:41 -0700 > Khem Raj wrote: > > > Using linux/version.h is assumed to be hardcoded inside sysroot but this > > does not consider the case where toolchains might be built with > > --with-native-system-header-dir which means the header directories will > > not be under /usr/include but customized, archlinux, debian > > built cross toolchains use these install settings ( due to multiarch ) > > they have the headers installed like /usr/aarch64-linux-gnu/include and > > not /usr/aarch64-linux-gnu/usr/include > > > > This patch adds logic to use cross compiler to compute the path to > > linux/version.h on the fly, it means we do not really need to assume the > > install structure > > > > Fixes built when using external toolchains provided by archlinux e.g. > > > > Signed-off-by: Khem Raj > > Cc: Thomas Petazzoni > > --- > > support/scripts/check-kernel-headers.sh | 15 ++++++++++++++- > > toolchain/helpers.mk | 2 +- > > .../toolchain-external/pkg-toolchain-external.mk | 3 ++- > > 3 files changed, 17 insertions(+), 3 deletions(-) > > We finally took some time to review and discuss this patch. As you can > probably imagine due to the delay, we are (at least in its current > form) not going to apply it. > > While it would be nice to not hardcode /usr/include/linux/version.h, we > would need: > > - To account for CFLAGS, as they can affect which sysroot is used by > the toolchain in case of multilib toolchains. > > - A solution that also uses the cross-compiler to detect where > is in the case of the internal toolchain backend. > > However, overall, the motivation of using distribution toolchains is > dubious. We still believe that it cannot work, because distribution > toolchains can contain any number of random libraries. The sysroot of > those toolchains (including the random set of libraries that have been > installed) will be copied to Buildroot STAGING_DIR, causing confusion > with the packages that Buildroot will build. > > So overall, we feel that the benefit of the patch is not sufficient > compared to the extra effort to fix the remaining comments that we have > on it. If you're still interested in pursuing this, we would welcome a > new patch that addresses the above two issues. > I think its fine to drop this patch. I was trying to prove that how easy and fast it could be to build buildroot but this is not a real world usecase. > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From yann.morin.1998 at free.fr Thu Jan 13 17:37:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:37:31 +0100 Subject: [Buildroot] [git commit] package/meson: add upstream patch to fix vapigen support Message-ID: <20220113173150.A82798352F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dda369e7e8a4bb77b4449818a16b13c4f530e07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Import an upstream patch which fixes a typo in the Meson source code which caused a wrong command line option to be passed to the vapigen program. This fixes the build for all packages which use Meson and provide API bindings generated using said tool. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...me-fix-typo-in-vapigen-option-metadatadir.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch new file mode 100644 index 0000000000..3788ee0f11 --- /dev/null +++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch @@ -0,0 +1,33 @@ +From 9952446a2a28ea2b009f4b8b2a14ad50f0878bdd Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 10 Jan 2022 21:27:30 +0100 +Subject: [PATCH] gnome: fix typo in vapigen option metadatadir + +This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and +can cause a build failure, because --metadatdir is not a valid vapigen +option. + +[aperez at igalia.com: backport from upstream] +Signed-off-by: Adrian Perez de Castro +[yann.morin.1998 at free.fr: make it an actual backport] +Signed-off-by: Yann E. MORIN +--- + mesonbuild/modules/gnome.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 1125e56e7..dfc66c2e3 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): + cmd: T.List[T.Union[str, 'ExternalProgram']] + cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] + cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) +- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) ++ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) + cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) + cmd += pkg_cmd + cmd += ['--metadatadir=' + source_dir] +-- +2.25.1 + From yann.morin.1998 at free.fr Thu Jan 13 17:41:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:41:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: add upstream patch to fix vapigen support In-Reply-To: <20220113115704.2354150-1-aperez@igalia.com> References: <20220113115704.2354150-1-aperez@igalia.com> Message-ID: <20220113174130.GI1477939@scaer> Adrian, All, On 2022-01-13 13:57 +0200, Adrian Perez de Castro spake thusly: > Import an upstream patch which fixes a typo in the Meson source code > which caused a wrong command line option to be passed to the vapigen > program. This fixes the build for all packages which use Meson and > provide API bindings generated using said tool. > > Signed-off-by: Adrian Perez de Castro > --- > ...x-typo-in-vapigen-option-metadatadir.patch | 31 +++++++++++++++++++ > 1 file changed, 31 insertions(+) > create mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > > diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > new file mode 100644 > index 0000000000..f8cc30ec29 > --- /dev/null > +++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > @@ -0,0 +1,31 @@ > +From 5385e4c0a4dd4f9cf1e15c9c321b22d19cc0011a Mon Sep 17 00:00:00 2001 > +From: Michal Vasilek > +Date: Mon, 10 Jan 2022 21:27:30 +0100 > +Subject: [PATCH] gnome: fix typo in vapigen option metadatadir > + > +This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and > +can cause a build failure, because --metadatdir is not a valid vapigen > +option. > + > +Signed-off-by: Adrian Perez de Castro > +Upstream-Status: https://github.com/mesonbuild/meson/pull/9806 When an upstream PR/MR has been merged, we prefer that an actual backport is made, so that the patch has the proper upstream hash, which helps in the future ases if a version bump includes that commit. So I've made that a proper backport: $ git format-patch -n1 --start-number=3 --no-numbered 9952446a2 Applied to master with this backport, thanks. Regards, Yann E. MORIN. > +--- > + mesonbuild/modules/gnome.py | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py > +index 1125e56e7..dfc66c2e3 100644 > +--- a/mesonbuild/modules/gnome.py > ++++ b/mesonbuild/modules/gnome.py > +@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): > + cmd: T.List[T.Union[str, 'ExternalProgram']] > + cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] > + cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) > +- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) > ++ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) > + cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) > + cmd += pkg_cmd > + cmd += ['--metadatadir=' + source_dir] > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Thu Jan 13 17:47:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 13 Jan 2022 18:47:18 +0100 Subject: [Buildroot] [PATCH 1/2] configs/roseapplypi_defconfig: really change to ext4 rootfs Message-ID: <20220113174721.22549-1-peter@korsgaard.com> Commit b8aebcfd823f83c16 (configs/roseapplypi_defconfig: bump kernel to 5.15.10) adjusted the board to use an ext4 rootfs, but forgot to update the defconfig to enable ext4 rootfs, breaking the build. Correct that. Signed-off-by: Peter Korsgaard --- configs/roseapplepi_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index f4efacf80d..00bdf69d8a 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -21,7 +21,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="owl-s500-roseapplepi" # Filesystem / image -BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloaders -- 2.20.1 From peter at korsgaard.com Thu Jan 13 17:47:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 13 Jan 2022 18:47:19 +0100 Subject: [Buildroot] [PATCH 2/2] configs/roseapplypi_defconfig: bump kernel to 5.15.14 In-Reply-To: <20220113174721.22549-1-peter@korsgaard.com> References: <20220113174721.22549-1-peter@korsgaard.com> Message-ID: <20220113174721.22549-2-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- configs/roseapplepi_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index 00bdf69d8a..0f37d5dc0b 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y -- 2.20.1 From yann.morin.1998 at free.fr Thu Jan 13 17:47:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:47:42 +0100 Subject: [Buildroot] [git commit] package/gcr: add upstream patch to fix build with meson 0.61 Message-ID: <20220113174146.4D77F82127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4eec4c13633500fb4688b2c28d033551dda5ea9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Import an upstream patch which removes usage of an invalid keyword that was being passed to Meson's gnome.generate_gir() function. This fixes the following autobuilder issues: http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...unknown-kw-argument-in-gnome.generate_gir.patch | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch new file mode 100644 index 0000000000..a1d4e1b46f --- /dev/null +++ b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch @@ -0,0 +1,64 @@ +From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka +Date: Wed, 12 Jan 2022 00:24:20 +0100 +Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir + +This argument has been removed in Meson 0.61.0: + + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" + +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: + +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. + +Fixes #89 + +[aperez at igalia.com: backport from upstream] +Signed-off-by: Adrian Perez de Castro +[yann.morin.1998 at free.fr: make it an actual backport] +Signed-off-by: Yann E. MORIN +--- + gck/meson.build | 1 - + gcr/meson.build | 1 - + ui/meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a21a1e9 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -131,7 +131,6 @@ if get_option('introspection') + sources: gck_gir_sources, + namespace: 'Gck', + nsversion: '@0@'.format(gck_major_version), +- packages: gck_deps, + export_packages: 'gck- at 0@'.format(gck_major_version), + includes: [ 'GObject-2.0', 'Gio-2.0' ], + header: 'gck/gck.h', +diff --git a/gcr/meson.build b/gcr/meson.build +index 2233a44..c83641b 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -190,7 +190,6 @@ if get_option('introspection') + sources: [ gcr_base_public_sources, gcr_base_headers ], + namespace: 'Gcr', + nsversion: '@0@'.format(gcr_major_version), +- packages: gcr_base_deps, + export_packages: 'gcr-base- at 0@'.format(gcr_major_version), + includes: [ + 'GObject-2.0', +diff --git a/ui/meson.build b/ui/meson.build +index e656ea2..32ee057 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -152,7 +152,6 @@ if get_option('introspection') + export_packages: 'gcr-ui- at 0@'.format(gcr_major_version), + identifier_prefix: 'Gcr', + symbol_prefix: 'gcr', +- packages: gcr_ui_deps, + includes: [ + 'GObject-2.0', + 'Gio-2.0', +-- +2.25.1 + From yann.morin.1998 at free.fr Thu Jan 13 17:48:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:48:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcr: add upstream patch to fix build with meson 0.61 In-Reply-To: <20220113094630.2322090-1-aperez@igalia.com> References: <20220113094630.2322090-1-aperez@igalia.com> Message-ID: <20220113174820.GJ1477939@scaer> Adrian, All, On 2022-01-13 11:46 +0200, Adrian Perez de Castro spake thusly: > Import an upstream patch which removes usage of an invalid keyword that > was being passed to Meson's gnome.generate_gir() function. > > This fixes the following autobuilder issues: > > http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b > http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de > > Signed-off-by: Adrian Perez de Castro > --- > ...wn-kw-argument-in-gnome.generate_gir.patch | 62 +++++++++++++++++++ > 1 file changed, 62 insertions(+) > create mode 100644 package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch > > diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch > new file mode 100644 > index 0000000000..e672b5e2ac > --- /dev/null > +++ b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch > @@ -0,0 +1,62 @@ > +From 145bea264bed98cd435d8babfdee702c06c0afaa Mon Sep 17 00:00:00 2001 > +From: Jakub Jirutka > +Date: Wed, 12 Jan 2022 00:24:20 +0100 > +Subject: [PATCH 1/1] meson: Fix unknown kw argument in gnome.generate_gir $ make check-package package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch:4: generate your patches with 'git format-patch -N' So I've done that, and done a proper backport. Applied to master, thanks. Regards, Yann E. MORIN. > +This argument has been removed in Meson 0.61.0: > + > + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" > + > +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: > + > +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. > + > +Fixes #89 > + > +Signed-off-by: Adrian Perez de Castro > +Upstream-Status: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 > +--- > + gck/meson.build | 1 - > + gcr/meson.build | 1 - > + ui/meson.build | 1 - > + 3 files changed, 3 deletions(-) > + > +diff --git a/gck/meson.build b/gck/meson.build > +index 756b486..a21a1e9 100644 > +--- a/gck/meson.build > ++++ b/gck/meson.build > +@@ -131,7 +131,6 @@ if get_option('introspection') > + sources: gck_gir_sources, > + namespace: 'Gck', > + nsversion: '@0@'.format(gck_major_version), > +- packages: gck_deps, > + export_packages: 'gck- at 0@'.format(gck_major_version), > + includes: [ 'GObject-2.0', 'Gio-2.0' ], > + header: 'gck/gck.h', > +diff --git a/gcr/meson.build b/gcr/meson.build > +index 06c3a63..f998336 100644 > +--- a/gcr/meson.build > ++++ b/gcr/meson.build > +@@ -189,7 +189,6 @@ if get_option('introspection') > + sources: [ gcr_base_public_sources, gcr_base_headers ], > + namespace: 'Gcr', > + nsversion: '@0@'.format(gcr_major_version), > +- packages: gcr_base_deps, > + export_packages: 'gcr-base- at 0@'.format(gcr_major_version), > + includes: [ > + 'GObject-2.0', > +diff --git a/ui/meson.build b/ui/meson.build > +index e656ea2..32ee057 100644 > +--- a/ui/meson.build > ++++ b/ui/meson.build > +@@ -152,7 +152,6 @@ if get_option('introspection') > + export_packages: 'gcr-ui- at 0@'.format(gcr_major_version), > + identifier_prefix: 'Gcr', > + symbol_prefix: 'gcr', > +- packages: gcr_ui_deps, > + includes: [ > + 'GObject-2.0', > + 'Gio-2.0', > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 13 17:52:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:52:19 +0100 Subject: [Buildroot] [git commit] package/libglvnd: needs __sync_*_4 intrinsics Message-ID: <20220113174620.D79168353E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7996a1a18b7ea8102c7a0ddae57de9624902594f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/EGL/libEGL.so.1.1.0.p/libegl.c.o: in function `AtomicIncrement': libegl.c:(.text+0x614): undefined reference to `__sync_add_and_fetch_4' Fixes: - http://autobuild.buildroot.org/results/a204953020a714057ec6690e63a3ad8ac621acd5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libglvnd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index 2d99be8632..cd19fde582 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on !BR2_STATIC_LIBS # dlfcn.h help The GL Vendor-Neutral Dispatch library @@ -45,4 +46,5 @@ config BR2_PACKAGE_PROVIDES_LIBGLES endif comment "libglvnd needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS From yann.morin.1998 at free.fr Thu Jan 13 17:52:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:52:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs __sync_*_4 intrinsics In-Reply-To: <20220113075847.3267080-1-fontaine.fabrice@gmail.com> References: <20220113075847.3267080-1-fontaine.fabrice@gmail.com> Message-ID: <20220113175240.GK1477939@scaer> Fabrice, All, On 2022-01-13 08:58 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since the addition of the package > in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: > > /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/EGL/libEGL.so.1.1.0.p/libegl.c.o: in function `AtomicIncrement': > libegl.c:(.text+0x614): undefined reference to `__sync_add_and_fetch_4' > > Fixes: > - http://autobuild.buildroot.org/results/a204953020a714057ec6690e63a3ad8ac621acd5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libglvnd/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in > index 2d99be8632..cd19fde582 100644 > --- a/package/libglvnd/Config.in > +++ b/package/libglvnd/Config.in > @@ -1,5 +1,6 @@ > config BR2_PACKAGE_LIBGLVND > bool "libglvnd" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics > depends on !BR2_STATIC_LIBS # dlfcn.h > help > The GL Vendor-Neutral Dispatch library > @@ -45,4 +46,5 @@ config BR2_PACKAGE_PROVIDES_LIBGLES > endif > > comment "libglvnd needs a toolchain w/ dynamic library" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on BR2_STATIC_LIBS > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From jlyda at carnegierobotics.com Thu Jan 13 17:48:57 2022 From: jlyda at carnegierobotics.com (Jeremy Lyda) Date: Thu, 13 Jan 2022 17:48:57 +0000 Subject: [Buildroot] [PATCH 1/1] package/lvm2: LC_ALL set to "C" locale before generating cmds Message-ID: <03d134dec448470eb60d56a0c8a6ceb5@carnegierobotics.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: package-lvm2-LC_ALL-set-to-C-locale-before-generatin.patch Type: text/x-patch Size: 2475 bytes Desc: package-lvm2-LC_ALL-set-to-C-locale-before-generatin.patch URL: From yann.morin.1998 at free.fr Thu Jan 13 17:58:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:58:15 +0100 Subject: [Buildroot] [git commit] package/socat: bump to version 1.7.4.3 Message-ID: <20220113175219.63C4A83537@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b7ea7a67a3b693cb42c5a981b163f6dfa9e24b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update README hash for version number change. Add a patch fixing build with musl. Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- ...re.ac-correct-the-getprotobynumber_r-test.patch | 43 ++++++++++++++++++++++ package/socat/socat.hash | 6 +-- package/socat/socat.mk | 2 +- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch new file mode 100644 index 0000000000..de95405531 --- /dev/null +++ b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch @@ -0,0 +1,43 @@ +From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 13 Jan 2022 17:56:10 +0200 +Subject: [PATCH] configure.ac: correct the getprotobynumber_r test + +The AC_TRY_COMPILE test succeeds even when libc does not provide the +tested symbol. The compiler produces a warning, but exits successfully. +Use AC_TRY_LINK that will only succeeds if libc provides the symbol. + +This fixes build with musl libc that does not support +getprotobynumber_r(). + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to socat at dest-unreach.org + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d4acc9e7e6f5..973a7f2218c9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) + # getprotobynumber_r() is not standardized + AC_MSG_CHECKING(for getprotobynumber_r() variant) + AC_CACHE_VAL(sc_cv_getprotobynumber_r, +-[AC_TRY_COMPILE([#include ++[AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], + [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024);], + [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL);], + [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], + +-- +2.34.1 + diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 0d9d0ba76c..4f7ff5328e 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 003686f80d820072649660b85f80c58f socat-1.7.4.2.tar.bz2 +md5 5c28dd258ba928326d0716fcb4895cc2 socat-1.7.4.3.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763 socat-1.7.4.2.tar.bz2 +sha256 d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007 socat-1.7.4.3.tar.bz2 # Locally calculated -sha256 062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644 README +sha256 432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index cf2a31b096..e20577492d 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.2 +SOCAT_VERSION = 1.7.4.3 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception From yann.morin.1998 at free.fr Thu Jan 13 17:58:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:58:57 +0100 Subject: [Buildroot] [PATCH] package/socat: bump to version 1.7.4.3 In-Reply-To: <541525e413f6b72c67b8602fc88e916486931d5f.1642091818.git.baruch@tkos.co.il> References: <541525e413f6b72c67b8602fc88e916486931d5f.1642091818.git.baruch@tkos.co.il> Message-ID: <20220113175857.GL1477939@scaer> Baruch, All, On 2022-01-13 18:36 +0200, Baruch Siach via buildroot spake thusly: > Update README hash for version number change. > > Add a patch fixing build with musl. > > Signed-off-by: Baruch Siach Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-correct-the-getprotobynumber_r-test.patch | 43 +++++++++++++++++++ > package/socat/socat.hash | 6 +-- > package/socat/socat.mk | 2 +- > 3 files changed, 47 insertions(+), 4 deletions(-) > create mode 100644 package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch > > diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch > new file mode 100644 > index 000000000000..de9540553191 > --- /dev/null > +++ b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch > @@ -0,0 +1,43 @@ > +From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001 > +From: Baruch Siach > +Date: Thu, 13 Jan 2022 17:56:10 +0200 > +Subject: [PATCH] configure.ac: correct the getprotobynumber_r test > + > +The AC_TRY_COMPILE test succeeds even when libc does not provide the > +tested symbol. The compiler produces a warning, but exits successfully. > +Use AC_TRY_LINK that will only succeeds if libc provides the symbol. > + > +This fixes build with musl libc that does not support > +getprotobynumber_r(). > + > +Signed-off-by: Baruch Siach > +--- > +Upstream status: sent to socat at dest-unreach.org > + > + configure.ac | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index d4acc9e7e6f5..973a7f2218c9 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) > + # getprotobynumber_r() is not standardized > + AC_MSG_CHECKING(for getprotobynumber_r() variant) > + AC_CACHE_VAL(sc_cv_getprotobynumber_r, > +-[AC_TRY_COMPILE([#include > ++[AC_TRY_LINK([#include > + #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], > + [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], > +- [AC_TRY_COMPILE([#include > ++ [AC_TRY_LINK([#include > + #include ],[getprotobynumber_r(1,NULL,NULL,1024);], > + [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], > +- [AC_TRY_COMPILE([#include > ++ [AC_TRY_LINK([#include > + #include ],[getprotobynumber_r(1,NULL,NULL);], > + [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], > + > +-- > +2.34.1 > + > diff --git a/package/socat/socat.hash b/package/socat/socat.hash > index 0d9d0ba76c9d..4f7ff5328e28 100644 > --- a/package/socat/socat.hash > +++ b/package/socat/socat.hash > @@ -1,8 +1,8 @@ > # From http://www.dest-unreach.org/socat/download.md5sum > -md5 003686f80d820072649660b85f80c58f socat-1.7.4.2.tar.bz2 > +md5 5c28dd258ba928326d0716fcb4895cc2 socat-1.7.4.3.tar.bz2 > # From http://www.dest-unreach.org/socat/download.sha256sum > -sha256 6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763 socat-1.7.4.2.tar.bz2 > +sha256 d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007 socat-1.7.4.3.tar.bz2 > # Locally calculated > -sha256 062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644 README > +sha256 432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb README > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL > diff --git a/package/socat/socat.mk b/package/socat/socat.mk > index cf2a31b0969c..e20577492d86 100644 > --- a/package/socat/socat.mk > +++ b/package/socat/socat.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SOCAT_VERSION = 1.7.4.2 > +SOCAT_VERSION = 1.7.4.3 > SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 > SOCAT_SITE = http://www.dest-unreach.org/socat/download > SOCAT_LICENSE = GPL-2.0 with OpenSSL exception > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Thu Jan 13 18:05:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 19:05:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix build with kernel < 5.11 Message-ID: <20220113180518.232197-1-fontaine.fabrice@gmail.com> Fix the following build failure with kernel < 5.11 raised since commit f363bc2958812539cf248f6cf44fe519445adf7a: /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/9.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: kernel-shared/volumes.o: in function `create_chunk': volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' Fixes: - http://autobuild.buildroot.org/results/b630dbd078656a974c6ac9645b2e87279ef2adc0 Signed-off-by: Fabrice Fontaine --- ...ocal-definition-for-alignment-macros.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch new file mode 100644 index 0000000000..86c63edc30 --- /dev/null +++ b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch @@ -0,0 +1,46 @@ +From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Thu, 13 Jan 2022 14:47:08 +0100 +Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment + macros + +There's still problem left with compilation on musl and kernel < 5.11, +because __ALIGN_KERNEL is not defined anymore: + +../bin/ld: kernel-shared/volumes.o: in function `create_chunk': +volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' + +Due to the entangled includes and unconditional definition of +__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it +eventually (as kerncompat.h is the first include). Instead add local +definitions of the macros and rename them to avoid name clashes. + +Pull-request: #433 +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] +Signed-off-by: Fabrice Fontaine +--- + kerncompat.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 6ca1526e2..f0a6e196e 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -359,7 +359,14 @@ do { \ + + /* Alignment check */ + #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) +-#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) ++ ++/* ++ * Alignment, copied and renamed from /usr/include/linux/const.h to work around ++ * issues caused by moving the definition in 5.12 ++ */ ++#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) ++#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) + + static inline int is_power_of_2(unsigned long n) + { -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 13 18:07:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 19:07:37 +0100 Subject: [Buildroot] [PATCH 1/2] package/boost: enable regex on host Message-ID: <20220113180738.232377-1-fontaine.fabrice@gmail.com> regex is needed on host for host-riscv-isa-sim Signed-off-by: Fabrice Fontaine --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6e026f4781..6d1046e9a2 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ - python random regex serialization stacktrace system test thread timer \ + python random serialization stacktrace system test thread timer \ type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 13 18:07:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 19:07:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/riscv-isa-sim: needs host-boost In-Reply-To: <20220113180738.232377-1-fontaine.fabrice@gmail.com> References: <20220113180738.232377-1-fontaine.fabrice@gmail.com> Message-ID: <20220113180738.232377-2-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure: error: Could not link against boost_system ! Fixes: - http://autobuild.buildroot.org/results/d1ec407d3a9106be1271e4897d6f578d501439fe Signed-off-by: Fabrice Fontaine --- package/riscv-isa-sim/riscv-isa-sim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index 59f70fc432..ee9067d304 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -8,6 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE -HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc $(eval $(host-autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 13 18:09:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 19:09:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: fix musl build Message-ID: <20220113180940.232530-1-fontaine.fabrice@gmail.com> Fix the following build failure on musl raised since bump to version 2.0.0 in commit 3b9c8f8cb53e449e39899a40712703c272c5eeff: In file included from ../src/pcm_hw.c:42: /home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ | ^~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe Signed-off-by: Fabrice Fontaine --- .../0001-include-time.h-before-asound.h.patch | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 package/tinyalsa/0001-include-time.h-before-asound.h.patch diff --git a/package/tinyalsa/0001-include-time.h-before-asound.h.patch b/package/tinyalsa/0001-include-time.h-before-asound.h.patch new file mode 100644 index 0000000000..c91213e2eb --- /dev/null +++ b/package/tinyalsa/0001-include-time.h-before-asound.h.patch @@ -0,0 +1,76 @@ +From d91e947bda590765e1c791f40e8ffb4135ab1cd3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 11 Jan 2022 00:01:49 +0100 +Subject: [PATCH] include time.h before asound.h + +Include time.h before asound.h to avoid the following build failure on +musl that was already fixed a long time with +https://github.com/tinyalsa/tinyalsa/commit/c8333f8c7a4e4b9549abeef7530b2cd20a18e537 +but reappeared on version 2.0.0: + +In file included from ../src/pcm_hw.c:42: +/home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type + 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ + | ^~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/tinyalsa/tinyalsa/commit/c127110249967e0722d80bb41e33713accdcff8f] +--- + src/mixer.c | 1 + + src/mixer_hw.c | 1 + + src/pcm_hw.c | 1 + + src/pcm_plugin.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/src/mixer.c b/src/mixer.c +index afbc015..029fc84 100644 +--- a/src/mixer.c ++++ b/src/mixer.c +@@ -55,6 +55,7 @@ + #define __user + #endif + ++#include + #include + + #include +diff --git a/src/mixer_hw.c b/src/mixer_hw.c +index da5a390..50e9d07 100644 +--- a/src/mixer_hw.c ++++ b/src/mixer_hw.c +@@ -42,6 +42,7 @@ + #include + + #include ++#include + #include + + #include "mixer_io.h" +diff --git a/src/pcm_hw.c b/src/pcm_hw.c +index 5eb53be..2383ae0 100644 +--- a/src/pcm_hw.c ++++ b/src/pcm_hw.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/pcm_plugin.c b/src/pcm_plugin.c +index 47bf4a5..b6b69aa 100644 +--- a/src/pcm_plugin.c ++++ b/src/pcm_plugin.c +@@ -40,6 +40,7 @@ + + #include + #include ++#include + #include + #include + #include -- 2.34.1 From thomas.petazzoni at bootlin.com Thu Jan 13 19:34:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:34:36 +0100 Subject: [Buildroot] [git commit] package/boost: enable regex on host Message-ID: <20220113192846.2882A8292D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f3a4a5d57bc5e020729de52169765acfb0bea18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master regex is needed on host for host-riscv-isa-sim Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6e026f4781..6d1046e9a2 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ - python random regex serialization stacktrace system test thread timer \ + python random serialization stacktrace system test thread timer \ type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) From thomas.petazzoni at bootlin.com Thu Jan 13 19:34:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:34:39 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: needs host-boost Message-ID: <20220113192846.31D367FDB0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a10835fac773e68eef18d48cb89d76f9f553c33a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure: error: Could not link against boost_system ! Fixes: - http://autobuild.buildroot.org/results/d1ec407d3a9106be1271e4897d6f578d501439fe Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/riscv-isa-sim/riscv-isa-sim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index 59f70fc432..ee9067d304 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -8,6 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE -HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc $(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Thu Jan 13 19:36:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:36:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/boost: enable regex on host In-Reply-To: <20220113180738.232377-1-fontaine.fabrice@gmail.com> References: <20220113180738.232377-1-fontaine.fabrice@gmail.com> Message-ID: <20220113203607.047f32a1@windsurf> On Thu, 13 Jan 2022 19:07:37 +0100 Fabrice Fontaine wrote: > regex is needed on host for host-riscv-isa-sim > > Signed-off-by: Fabrice Fontaine > --- > package/boost/boost.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:36:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:36:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: LC_ALL set to "C" locale before generating cmds In-Reply-To: <03d134dec448470eb60d56a0c8a6ceb5@carnegierobotics.com> References: <03d134dec448470eb60d56a0c8a6ceb5@carnegierobotics.com> Message-ID: <20220113203646.1b921877@windsurf> Hello Jeremy, On Thu, 13 Jan 2022 17:48:57 +0000 Jeremy Lyda via buildroot wrote: > Thanks a lot for your patch. Did you submit this patch to the upstream lvm2 project? Also, could you send the patch with "git send-email", so that it appears inline, and not as an attached file? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:37:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:37:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix build with kernel < 5.11 In-Reply-To: <20220113180518.232197-1-fontaine.fabrice@gmail.com> References: <20220113180518.232197-1-fontaine.fabrice@gmail.com> Message-ID: <20220113203713.50bec51a@windsurf> On Thu, 13 Jan 2022 19:05:18 +0100 Fabrice Fontaine wrote: > Fix the following build failure with kernel < 5.11 raised since commit > f363bc2958812539cf248f6cf44fe519445adf7a: > > /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/9.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: kernel-shared/volumes.o: in function `create_chunk': > volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' > > Fixes: > - http://autobuild.buildroot.org/results/b630dbd078656a974c6ac9645b2e87279ef2adc0 > > Signed-off-by: Fabrice Fontaine > --- > ...ocal-definition-for-alignment-macros.patch | 46 +++++++++++++++++++ > 1 file changed, 46 insertions(+) > create mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:37:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:37:07 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: fix build with kernel < 5.11 Message-ID: <20220113193119.92D7E831C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57ea2264d78dcc66dff1e904c538fa8c23ae3a0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with kernel < 5.11 raised since commit f363bc2958812539cf248f6cf44fe519445adf7a: /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/9.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: kernel-shared/volumes.o: in function `create_chunk': volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' Fixes: - http://autobuild.buildroot.org/results/b630dbd078656a974c6ac9645b2e87279ef2adc0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...add-local-definition-for-alignment-macros.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch new file mode 100644 index 0000000000..86c63edc30 --- /dev/null +++ b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch @@ -0,0 +1,46 @@ +From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Thu, 13 Jan 2022 14:47:08 +0100 +Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment + macros + +There's still problem left with compilation on musl and kernel < 5.11, +because __ALIGN_KERNEL is not defined anymore: + +../bin/ld: kernel-shared/volumes.o: in function `create_chunk': +volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' + +Due to the entangled includes and unconditional definition of +__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it +eventually (as kerncompat.h is the first include). Instead add local +definitions of the macros and rename them to avoid name clashes. + +Pull-request: #433 +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] +Signed-off-by: Fabrice Fontaine +--- + kerncompat.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 6ca1526e2..f0a6e196e 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -359,7 +359,14 @@ do { \ + + /* Alignment check */ + #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) +-#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) ++ ++/* ++ * Alignment, copied and renamed from /usr/include/linux/const.h to work around ++ * issues caused by moving the definition in 5.12 ++ */ ++#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) ++#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) + + static inline int is_power_of_2(unsigned long n) + { From thomas.petazzoni at bootlin.com Thu Jan 13 19:37:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:37:38 +0100 Subject: [Buildroot] [git commit] package/tinyalsa: fix musl build Message-ID: <20220113193119.9BAAA8356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=495440cf267962501753c19dab8da0714079261f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on musl raised since bump to version 2.0.0 in commit 3b9c8f8cb53e449e39899a40712703c272c5eeff: In file included from ../src/pcm_hw.c:42: /home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ | ^~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-include-time.h-before-asound.h.patch | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/package/tinyalsa/0001-include-time.h-before-asound.h.patch b/package/tinyalsa/0001-include-time.h-before-asound.h.patch new file mode 100644 index 0000000000..c91213e2eb --- /dev/null +++ b/package/tinyalsa/0001-include-time.h-before-asound.h.patch @@ -0,0 +1,76 @@ +From d91e947bda590765e1c791f40e8ffb4135ab1cd3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 11 Jan 2022 00:01:49 +0100 +Subject: [PATCH] include time.h before asound.h + +Include time.h before asound.h to avoid the following build failure on +musl that was already fixed a long time with +https://github.com/tinyalsa/tinyalsa/commit/c8333f8c7a4e4b9549abeef7530b2cd20a18e537 +but reappeared on version 2.0.0: + +In file included from ../src/pcm_hw.c:42: +/home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type + 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ + | ^~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/tinyalsa/tinyalsa/commit/c127110249967e0722d80bb41e33713accdcff8f] +--- + src/mixer.c | 1 + + src/mixer_hw.c | 1 + + src/pcm_hw.c | 1 + + src/pcm_plugin.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/src/mixer.c b/src/mixer.c +index afbc015..029fc84 100644 +--- a/src/mixer.c ++++ b/src/mixer.c +@@ -55,6 +55,7 @@ + #define __user + #endif + ++#include + #include + + #include +diff --git a/src/mixer_hw.c b/src/mixer_hw.c +index da5a390..50e9d07 100644 +--- a/src/mixer_hw.c ++++ b/src/mixer_hw.c +@@ -42,6 +42,7 @@ + #include + + #include ++#include + #include + + #include "mixer_io.h" +diff --git a/src/pcm_hw.c b/src/pcm_hw.c +index 5eb53be..2383ae0 100644 +--- a/src/pcm_hw.c ++++ b/src/pcm_hw.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/pcm_plugin.c b/src/pcm_plugin.c +index 47bf4a5..b6b69aa 100644 +--- a/src/pcm_plugin.c ++++ b/src/pcm_plugin.c +@@ -40,6 +40,7 @@ + + #include + #include ++#include + #include + #include + #include From thomas.petazzoni at bootlin.com Thu Jan 13 19:37:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:37:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: fix musl build In-Reply-To: <20220113180940.232530-1-fontaine.fabrice@gmail.com> References: <20220113180940.232530-1-fontaine.fabrice@gmail.com> Message-ID: <20220113203747.0f423736@windsurf> On Thu, 13 Jan 2022 19:09:40 +0100 Fabrice Fontaine wrote: > Fix the following build failure on musl raised since bump to version > 2.0.0 in commit 3b9c8f8cb53e449e39899a40712703c272c5eeff: > > In file included from ../src/pcm_hw.c:42: > /home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type > 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ > | ^~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe > > Signed-off-by: Fabrice Fontaine > --- > .../0001-include-time.h-before-asound.h.patch | 76 +++++++++++++++++++ > 1 file changed, 76 insertions(+) > create mode 100644 package/tinyalsa/0001-include-time.h-before-asound.h.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:19 +0100 Subject: [Buildroot] [PATCH 1/2] configs/roseapplypi_defconfig: really change to ext4 rootfs In-Reply-To: <20220113174721.22549-1-peter@korsgaard.com> References: <20220113174721.22549-1-peter@korsgaard.com> Message-ID: <20220113203819.64feec86@windsurf> On Thu, 13 Jan 2022 18:47:18 +0100 Peter Korsgaard wrote: > Commit b8aebcfd823f83c16 (configs/roseapplypi_defconfig: bump kernel to > 5.15.10) adjusted the board to use an ext4 rootfs, but forgot to update the > defconfig to enable ext4 rootfs, breaking the build. Correct that. > > Signed-off-by: Peter Korsgaard > --- > configs/roseapplepi_defconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:09 +0100 Subject: [Buildroot] [git commit] configs/roseapplypi_defconfig: bump kernel to 5.15.14 Message-ID: <20220113193229.16BA48356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba46964b85b26b6c6537b6339140b353d3e0bdb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- configs/roseapplepi_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index 00bdf69d8a..0f37d5dc0b 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:05 +0100 Subject: [Buildroot] [git commit] configs/roseapplypi_defconfig: really change to ext4 rootfs Message-ID: <20220113193229.0BA18821EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e2a38d38d30c9caab7da55a24f0ffacf7a19e50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b8aebcfd823f83c16 (configs/roseapplypi_defconfig: bump kernel to 5.15.10) adjusted the board to use an ext4 rootfs, but forgot to update the defconfig to enable ext4 rootfs, breaking the build. Correct that. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- configs/roseapplepi_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index f4efacf80d..00bdf69d8a 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -21,7 +21,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="owl-s500-roseapplepi" # Filesystem / image -BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloaders From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:49 +0100 Subject: [Buildroot] [git commit] board/spike/riscv64/start.sh: add buildroot host dir in PATH Message-ID: <20220113193229.20D7A821EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc819438f61c693ffe01cd6827f23372570cb7c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master commit 0d0f84d2004b04bc93d5ceb58c86640f190e5d78 added the missing host-dtc dependency to riscv-isa-sim. The spike simulator calls the dtc binary at its startup. The host dtc command needs to be in the PATH at that time. This commit add the buildroot host binary directory into the PATH of the start.sh helper script. It make sure spike will use the buildroot dtc version. This commit fixes this start.sh script on host not providing the dtc command. Since the "spike" binary is now in the PATH, the binary name is also simplified. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- board/spike/riscv64/start.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh index 75b1412df8..6fbbced806 100755 --- a/board/spike/riscv64/start.sh +++ b/board/spike/riscv64/start.sh @@ -3,9 +3,13 @@ SCRIPT_DIR="$(dirname "$0")" BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" +# spike uses dtc at runtime startup, so make sure buildroot host +# directory is in the PATH +export PATH="${BR_BASEDIR}/output/host/usr/bin:$PATH" + # Use Buildroot host spike by default, but allow the caller to # redefine another spike binary -: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" +: "${SPIKE:=spike}" exec "${SPIKE}" \ --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:59 +0100 Subject: [Buildroot] [PATCH 1/1] board/spike/riscv64/start.sh: add buildroot host dir in PATH In-Reply-To: <20220112202640.7064-1-ju.o@free.fr> References: <20220112202640.7064-1-ju.o@free.fr> Message-ID: <20220113203859.763aee2f@windsurf> On Wed, 12 Jan 2022 21:26:40 +0100 Julien Olivain wrote: > commit 0d0f84d2004b04bc93d5ceb58c86640f190e5d78 > added the missing host-dtc dependency to riscv-isa-sim. > > The spike simulator calls the dtc binary at its startup. The host dtc > command needs to be in the PATH at that time. > > This commit add the buildroot host binary directory into the PATH of the > start.sh helper script. It make sure spike will use the buildroot dtc > version. This commit fixes this start.sh script on host not providing > the dtc command. Since the "spike" binary is now in the PATH, the > binary name is also simplified. > > Signed-off-by: Julien Olivain > --- > board/spike/riscv64/start.sh | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:40:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:40:40 +0100 Subject: [Buildroot] [git commit] package/avahi: add hidden libavahi-client option Message-ID: <20220113193430.E733B82DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55f7c2a580a202638b5c0c9042b24b434632b6a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This hidden option will simplify packages depending on libavahi-client Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/avahi/Config.in | 6 ++++++ package/cups-filters/cups-filters.mk | 3 +-- package/libiio/libiio.mk | 3 +-- package/libostree/libostree.mk | 6 +----- package/pipewire/pipewire.mk | 3 +-- package/shairport-sync/shairport-sync.mk | 6 +----- package/vlc/vlc.mk | 3 +-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 95b01bfe92..2484d8ce5c 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -34,6 +34,12 @@ config BR2_PACKAGE_AVAHI_DAEMON The daemon registers local IP addresses and services using mDNS/DNS-SD. +# This hidden option allows packages that need the libavahi-client to +# more easily determine if it's available or not. +config BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT + bool + default y if BR2_PACKAGE_AVAHI_DAEMON && BR2_PACKAGE_DBUS + config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY bool "libdns_sd compatibility (Bonjour)" depends on BR2_PACKAGE_AVAHI_DAEMON diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 63b85f0b8b..c8f2dd0aae 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -45,8 +45,7 @@ else CUPS_FILTERS_CONF_OPTS += --disable-dbus endif -# avahi support requires avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) CUPS_FILTERS_DEPENDENCIES += avahi CUPS_FILTERS_CONF_OPTS += --enable-avahi else diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 38b2f83e6e..a4fe0d4541 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -65,8 +65,7 @@ else LIBIIO_CONF_OPTS += -DWITH_AIO=OFF endif -# Avahi support in libiio requires avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) LIBIIO_DEPENDENCIES += avahi LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=ON else diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 22cb83d039..9cbf2848c9 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -37,11 +37,7 @@ else LIBOSTREE_CONF_OPTS += --without-openssl endif -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus config symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) LIBOSTREE_CONF_OPTS += --with-avahi LIBOSTREE_DEPENDENCIES += avahi else diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 604d08f90d..b05ce2bcc2 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -83,8 +83,7 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -# avahi support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index cf49f2b2ed..487e0c05e5 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -22,11 +22,7 @@ SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \ SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)" # Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns). -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus congig symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) SHAIRPORT_SYNC_DEPENDENCIES += avahi SHAIRPORT_SYNC_CONF_OPTS += --with-avahi --without-tinysvcmdns else diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index fe338fcbe8..b793e0efe0 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -117,8 +117,7 @@ else VLC_CONF_OPTS += --disable-alsa endif -# avahi support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) VLC_CONF_OPTS += --enable-avahi VLC_DEPENDENCIES += avahi else From thomas.petazzoni at bootlin.com Thu Jan 13 19:41:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:41:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/avahi: add hidden libavahi-client option In-Reply-To: <20220112203117.3133159-1-fontaine.fabrice@gmail.com> References: <20220112203117.3133159-1-fontaine.fabrice@gmail.com> Message-ID: <20220113204127.553738dc@windsurf> On Wed, 12 Jan 2022 21:31:17 +0100 Fabrice Fontaine wrote: > +config BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT > + bool > + default y > + depends on BR2_PACKAGE_AVAHI_DAEMON > + depends on BR2_PACKAGE_DBUS Changed to: default y if BR2_PACKAGE_AVAHI_DAEMON && BR2_PACKAGE_DBUS and applied to master. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:42:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:42:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: add mips64el support In-Reply-To: <20220112215637.3179786-1-fontaine.fabrice@gmail.com> References: <20220112215637.3179786-1-fontaine.fabrice@gmail.com> Message-ID: <20220113204201.0a0329f7@windsurf> On Wed, 12 Jan 2022 22:56:37 +0100 Fabrice Fontaine wrote: > mips64el is supported since > https://sourceforge.net/p/gnu-efi/code/ci/3f234f5b6ff5c16c6ddd5f2c2513fb329aecd30a > > Signed-off-by: Fabrice Fontaine > --- > package/gnu-efi/Config.in | 1 + > package/gnu-efi/gnu-efi.mk | 2 ++ > 2 files changed, 3 insertions(+) Applied to master, thanks. I'm wondering who is using EFI on mips64el though :-) Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:41:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:41:49 +0100 Subject: [Buildroot] [git commit] package/gnu-efi: add mips64el support Message-ID: <20220113193542.987E38356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11b347c03ab0b38389ec11b48f63236a3b4d6547 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master mips64el is supported since https://sourceforge.net/p/gnu-efi/code/ci/3f234f5b6ff5c16c6ddd5f2c2513fb329aecd30a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gnu-efi/Config.in | 1 + package/gnu-efi/gnu-efi.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index d456a23837..8e35fddbcb 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_aarch64_be default y if BR2_i386 + default y if BR2_mips64el default y if BR2_x86_64 config BR2_PACKAGE_GNU_EFI diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 69618029f4..06bf254738 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -24,6 +24,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) GNU_EFI_PLATFORM = arm else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) GNU_EFI_PLATFORM = aarch64 +else ifeq ($(BR2_mips64el),y) +GNU_EFI_PLATFORM = mips64el endif GNU_EFI_MAKE_OPTS = \ From thomas.petazzoni at bootlin.com Thu Jan 13 19:42:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:42:40 +0100 Subject: [Buildroot] [git commit] package/omniorb: bump to version 4.3.0 Message-ID: <20220113193713.943B18356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b051086ab11b2aeeb57465ce3d861ab526846a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/omniorb/omniorb.hash | 12 ++++++------ package/omniorb/omniorb.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/omniorb/omniorb.hash b/package/omniorb/omniorb.hash index 5ac8614689..f522c1ef67 100644 --- a/package/omniorb/omniorb.hash +++ b/package/omniorb/omniorb.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.4/ -sha1 a6f3c8e96fc09c4ef8d75bd495bbc5256a4773ee omniORB-4.2.4.tar.bz2 -md5 de961e8aa29f3eed95ea40a94c1cccdf omniORB-4.2.4.tar.bz2 +# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0/ +sha1 c3f12c2278f8c4603910c02c8fe892c1dde7217e omniORB-4.3.0.tar.bz2 +md5 8889ab13b444b495ca2c2b48ea6a6bd7 omniORB-4.3.0.tar.bz2 # Locally generated -sha256 28c01cd0df76c1e81524ca369dc9e6e75f57dc70f30688c99c67926e4bdc7a6f omniORB-4.2.4.tar.bz2 -sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING -sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB +sha256 976045a2341f4e9a85068b21f4bd928993292933eeecefea372db09e0219eadd omniORB-4.3.0.tar.bz2 +sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING +sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index 4ecbb9d2c9..a1943968f1 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.2.4 +OMNIORB_VERSION = 4.3.0 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:32 +0100 Subject: [Buildroot] [git commit] package/python-hyperframe: bump to version 6.0.1 Message-ID: <20220113193713.BCBCD8356E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eee3a1ed92f47d833fe620b1e28cdbc35f5b1ae8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update site in Config.in - python 2.7 support has been dropped since version 6.0.0 - Update indentation in hash file (two spaces) https://github.com/python-hyper/hyperframe/blob/v6.0.1/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-hyperframe/Config.in | 3 ++- package/python-hyperframe/python-hyperframe.hash | 6 +++--- package/python-hyperframe/python-hyperframe.mk | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-hyperframe/Config.in b/package/python-hyperframe/Config.in index f3318a20e2..30457fe86e 100644 --- a/package/python-hyperframe/Config.in +++ b/package/python-hyperframe/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_HYPERFRAME bool "python-hyperframe" + depends on BR2_PACKAGE_PYTHON3 help HTTP/2 framing layer for Python. - http://hyper.rtfd.org + https://github.com/python-hyper/hyperframe/ diff --git a/package/python-hyperframe/python-hyperframe.hash b/package/python-hyperframe/python-hyperframe.hash index 3e686a4aa2..b39ab51a72 100644 --- a/package/python-hyperframe/python-hyperframe.hash +++ b/package/python-hyperframe/python-hyperframe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hyperframe/json -md5 6919183242feb26d8bce3b4cba81defd hyperframe-5.2.0.tar.gz -sha256 a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f hyperframe-5.2.0.tar.gz +md5 153c064e8ac654aaf136b3388c36de48 hyperframe-6.0.1.tar.gz +sha256 ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914 hyperframe-6.0.1.tar.gz # Locally computed sha256 checksums -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hyperframe/python-hyperframe.mk b/package/python-hyperframe/python-hyperframe.mk index 7640ade5fd..4b13ca51a3 100644 --- a/package/python-hyperframe/python-hyperframe.mk +++ b/package/python-hyperframe/python-hyperframe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HYPERFRAME_VERSION = 5.2.0 +PYTHON_HYPERFRAME_VERSION = 6.0.1 PYTHON_HYPERFRAME_SOURCE = hyperframe-$(PYTHON_HYPERFRAME_VERSION).tar.gz -PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/e6/7f/9a4834af1010dc1d570d5f394dfd9323a7d7ada7d25586bd299fc4cb0356 +PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/5a/2a/4747bff0a17f7281abe73e955d60d80aae537a5d203f417fa1c2e7578ebb PYTHON_HYPERFRAME_SETUP_TYPE = setuptools PYTHON_HYPERFRAME_LICENSE = MIT PYTHON_HYPERFRAME_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:23 +0100 Subject: [Buildroot] [git commit] package/python-hpack: bump to version 4.0.0 Message-ID: <20220113193713.B02538356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4e3ef223f72f035f4bf84cba85f0d0b924bf937 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (HISTORY.rst removed) - Update site in Config.in - python 2.7 has been dropped - Update indentation in hash file (two spaces) https://github.com/python-hyper/hpack/blob/v4.0.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...rt-HISTORY.rst-from-UTF-8-format-to-ASCII.patch | 40 ---------------------- package/python-hpack/Config.in | 3 +- package/python-hpack/python-hpack.hash | 8 ++--- package/python-hpack/python-hpack.mk | 4 +-- 4 files changed, 8 insertions(+), 47 deletions(-) diff --git a/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch b/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch deleted file mode 100644 index 015b8a24da..0000000000 --- a/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3d195f4f599f37c89419f1db1302f94acb38c264 Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Tue, 1 Aug 2017 10:15:33 +0200 -Subject: [PATCH] Convert HISTORY.rst from UTF-8 format to ASCII -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -UTF-8 formatted file breaks installations on some systems: - -Traceback (most recent call last): - File "setup.py", line 34, in - long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(), - File "/home/peko/autobuild/instance-1/output/target/usr/lib/python3.6/encodings/ascii.py", line 26, in decode - return codecs.ascii_decode(input, self.errors)[0] -UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 1125: ordinal not in range(128) - -To fix this error just replace '??' with 'S' meaning 'Section'. - -Signed-off-by: Yegor Yefremov ---- - HISTORY.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/HISTORY.rst b/HISTORY.rst -index 37b2d9c..b9310f5 100644 ---- a/HISTORY.rst -+++ b/HISTORY.rst -@@ -27,7 +27,7 @@ Release History - - HPACK now tolerates receiving multiple header table size changes in sequence, - rather than only one. - - HPACK now forbids header table size changes anywhere but first in a header -- block, as required by RFC 7541 ?? 4.2. -+ block, as required by RFC 7541 S 4.2. - - Other miscellaneous performance improvements. - - 2.3.0 (2016-08-04) --- -2.11.0 - diff --git a/package/python-hpack/Config.in b/package/python-hpack/Config.in index b0ea03bc42..0608f97281 100644 --- a/package/python-hpack/Config.in +++ b/package/python-hpack/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_HPACK bool "python-hpack" + depends on BR2_PACKAGE_PYTHON3 help Pure-Python HPACK header compression. - http://hyper.rtfd.org + https://github.com/python-hyper/hpack diff --git a/package/python-hpack/python-hpack.hash b/package/python-hpack/python-hpack.hash index 72886b0edd..988cbaae0b 100644 --- a/package/python-hpack/python-hpack.hash +++ b/package/python-hpack/python-hpack.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/hpack/json -md5 556b0ae66180f54c2ce8029a0952088b hpack-3.0.0.tar.gz -# Locally computed -sha256 8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2 hpack-3.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/hpack/json +md5 27e01514ef06dc9fa0798d3dcb7de47c hpack-4.0.0.tar.gz +sha256 fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095 hpack-4.0.0.tar.gz +# Locally computed sha256 checksums sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index d6b96649e9..3cf534d055 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HPACK_VERSION = 3.0.0 +PYTHON_HPACK_VERSION = 4.0.0 PYTHON_HPACK_SOURCE = hpack-$(PYTHON_HPACK_VERSION).tar.gz -PYTHON_HPACK_SITE = https://pypi.python.org/packages/44/f1/b4440e46e265a29c0cb7b09b6daec6edf93c79eae713cfed93fbbf8716c5 +PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db19b0f6b370e79d586b3e8528b20252c729c476a2c02954 PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:00 +0100 Subject: [Buildroot] [git commit] package/python-h2: bump to version 4.1.0 Message-ID: <20220113193713.A22AE8356E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23e4fbecb31678751812c54ce3006bab55bb3358 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update site in Config.in - Reorder select - python 2.7 support has been dropped since version 4.0.0 https://github.com/python-hyper/h2/blob/v4.1.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-h2/Config.in | 5 +++-- package/python-h2/python-h2.hash | 6 +++--- package/python-h2/python-h2.mk | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-h2/Config.in b/package/python-h2/Config.in index dccee9b909..d88ad36761 100644 --- a/package/python-h2/Config.in +++ b/package/python-h2/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_H2 bool "python-h2" - select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_HPACK # runtime + select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime help HTTP/2 State-Machine based protocol implementation. - http://hyper.rtfd.org + https://github.com/python-hyper/h2 diff --git a/package/python-h2/python-h2.hash b/package/python-h2/python-h2.hash index 4193567d37..2f9c8f647f 100644 --- a/package/python-h2/python-h2.hash +++ b/package/python-h2/python-h2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/h2/json -md5 197a99c09f344a0dd987fab9801dc8d0 h2-3.2.0.tar.gz -sha256 875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14 h2-3.2.0.tar.gz +md5 4274f9619c0a43bb4ae01b6b02bf0c99 h2-4.1.0.tar.gz +sha256 a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb h2-4.1.0.tar.gz # Locally computed sha256 checksums -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE +sha256 7a65a5af0cbabf1c16251c7c6b2b7cb46d16a7222e79975b9b61fcd66a2e3f28 LICENSE diff --git a/package/python-h2/python-h2.mk b/package/python-h2/python-h2.mk index 81397bbb10..699e8baece 100644 --- a/package/python-h2/python-h2.mk +++ b/package/python-h2/python-h2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H2_VERSION = 3.2.0 +PYTHON_H2_VERSION = 4.1.0 PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz -PYTHON_H2_SITE = https://files.pythonhosted.org/packages/08/0a/033df0fc05fe94f72517ccd393dd9ff99b1773fd198307638e6d3568a518 +PYTHON_H2_SITE = https://files.pythonhosted.org/packages/2a/32/fec683ddd10629ea4ea46d206752a95a2d8a48c22521edd70b142488efe1 PYTHON_H2_SETUP_TYPE = setuptools PYTHON_H2_LICENSE = MIT PYTHON_H2_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/omniorb: bump to version 4.3.0 In-Reply-To: <20220112210219.3160627-1-fontaine.fabrice@gmail.com> References: <20220112210219.3160627-1-fontaine.fabrice@gmail.com> Message-ID: <20220113204342.053a9e0c@windsurf> On Wed, 12 Jan 2022 22:02:19 +0100 Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0 > > Signed-off-by: Fabrice Fontaine > --- > package/omniorb/omniorb.hash | 12 ++++++------ > package/omniorb/omniorb.mk | 2 +- > 2 files changed, 7 insertions(+), 7 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:51 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-h2: bump to version 4.1.0 In-Reply-To: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> References: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> Message-ID: <20220113204351.2d39b41b@windsurf> On Wed, 12 Jan 2022 22:28:45 +0100 Fabrice Fontaine wrote: > - Update site in Config.in > - Reorder select > - python 2.7 support has been dropped since version 4.0.0 > > https://github.com/python-hyper/h2/blob/v4.1.0/CHANGELOG.rst > > Signed-off-by: Fabrice Fontaine > --- > package/python-h2/Config.in | 5 +++-- > package/python-h2/python-h2.hash | 6 +++--- > package/python-h2/python-h2.mk | 4 ++-- > 3 files changed, 8 insertions(+), 7 deletions(-) Series applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:44:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:44:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220112203939.606775-1-james.hilliard1@gmail.com> References: <20220112203939.606775-1-james.hilliard1@gmail.com> Message-ID: <20220113204451.23849f67@windsurf> Hello James, On Wed, 12 Jan 2022 13:39:39 -0700 James Hilliard wrote: > Currently the qmake gcc sysrootify path logic causes issues with > per-package directories, disable automatic gcc sysroot for qt5base > install and override all qt.conf paths manually to point to their > correct locations. > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > instead of the HOST_DIR for cross compilation to work. > > Signed-off-by: James Hilliard > --- > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > package/qt5/qt5base/qt5base.mk | 2 ++ > 2 files changed, 17 insertions(+), 3 deletions(-) Do you have a bit more details on what this changing, i.e how this is making things better? I have no doubt that it can make things better, but it would be useful in the commit log to have extra details on what specific details/aspects it is fixing/improving. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:51:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:51:29 +0100 Subject: [Buildroot] [PATCH] package/minijail: new package In-Reply-To: <20220113100506.89687-1-jose.pekkarinen@unikie.com> References: <20220113100506.89687-1-jose.pekkarinen@unikie.com> Message-ID: <20220113205129.585e3ce6@windsurf> Hello Jos?, Thanks for this new iteration! Comments below. On Thu, 13 Jan 2022 12:05:06 +0200 Jos? Pekkarinen wrote: > This patch adds package minijail > > Minijail depends in a toolchain different from > uclibc thanks to it's lack of support for prlimits. > > Signed-off-by: Jos? Pekkarinen > --- > [ v1 -> v2 ] > - Fixed hash file > - Fixed static assert patch > - Depend in toolchain distinct of uclibc > - Remove redundant host libpcap dependency > - Remove redundant parenthesis on MINIJAIL_BUILD_CMDS If this is v2, your patch should have been generated with "git format-patch -v2", so that its title is [PATCH v2] and not just [PATCH]. > diff --git a/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch > new file mode 100644 > index 0000000000..ff85995114 > --- /dev/null > +++ b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch > @@ -0,0 +1,35 @@ > +From 8a6d5a1c48b85fb49f0d68ec31ecc51fd22e7201 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > +Date: Wed, 12 Jan 2022 17:09:27 +0200 > +Subject: [PATCH] Substitute static_assert with _Static_assert > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Substitute static_assert with _Static_assert > + > +static_assert behaves differently for uclibc > +toolchains. Substituting it with the standard > +_Static_assert builds on all toolchains tested. So this is fixing a problem affecting uClibc toolchains, and below you exclude uClibc toolchains ? Does it make sense to have this patch ? > diff --git a/package/minijail/Config.in b/package/minijail/Config.in > new file mode 100644 > index 0000000000..24d307ed54 > --- /dev/null > +++ b/package/minijail/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_MINIJAIL > + bool "minijail" > + depends on !BR2_STATIC_LIBS # dlopen() > + depends on !BR2_TOOLCHAIN_USES_UCLIBC Please add a comment on top of this that explains why uClibc toolchains are excluded (prlimit not implemented). > + select BR2_PACKAGE_LIBCAP You need to replicate: depends on BR2_USE_MMU from the list of libcap dependencies. > + help > + Minijail is a sandboxing tool maintained by google. > + > + https://google.github.io/minijail/ > + > +comment "minijail needs a glibc or musl toolchain with dynamic library support" and also have it here. > + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC > diff --git a/package/minijail/minijail.hash b/package/minijail/minijail.hash > new file mode 100644 > index 0000000000..d9f497a86c > --- /dev/null > +++ b/package/minijail/minijail.hash > @@ -0,0 +1,5 @@ > +# Locally computed from https://github.com/google/minijail/releases/ > +sha256 1ee5a5916491a32c121c7422b4d8c16481c0396a3acab34bf1c44589dcf810ae linux-v17.tar.gz > + > +# Locally computed > +sha256 c6f439c5cf07263f71f01d29b79c79172ee529088e51ab434b22baad0988fe57 LICENSE > diff --git a/package/minijail/minijail.mk b/package/minijail/minijail.mk > new file mode 100644 > index 0000000000..78898865fb > --- /dev/null > +++ b/package/minijail/minijail.mk > @@ -0,0 +1,28 @@ > +################################################################################ > +# > +# minijail > +# > +################################################################################ > + > +MINIJAIL_VERSION = linux-v17 > +MINIJAIL_SOURCE = $(MINIJAIL_VERSION).tar.gz > +MINIJAIL_SITE = "https://github.com/google/minijail/archive/refs/tags" Please use the following lines instead: MINIJAIL_VERSION = 17 MINIJAIL_SITE = $(call github,google,minijail,linux-v$(MINIJAIL_VERSION)) You will have to adjust the .hash file accordingly. > +MINIJAIL_LICENSE = BSD-Style This is not a license. See https://spdx.org/licenses/ for the list of license identifiers that are valid. > +MINIJAIL_LICENSE_FILES = LICENSE > +MINIJAIL_DEPENDENCIES=libcap Spaces around "=". > +define MINIJAIL_BUILD_CMDS > + cd $(@D); \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) CC="$(TARGET_CC)" No need to cd into $(@D), since you run make with -C $(@D). Please drop the $(d) which is an empty variable. Also please use $(TARGET_CONFIGURE_OPTS). So something like this: $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) I'm pretty sure I already made this comment on a previous version, or perhaps on another package contributed by you. Could you take into account those comments and send a v3 ? It should be good to merge then. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:54:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:54:37 +0100 Subject: [Buildroot] [PATCH v3] package/opensc: new package In-Reply-To: <20220113114951.549960-1-jose.pekkarinen@unikie.com> References: <20220113114951.549960-1-jose.pekkarinen@unikie.com> Message-ID: <20220113205437.47e82728@windsurf> Hello Jos?, On Thu, 13 Jan 2022 13:49:51 +0200 Jos? Pekkarinen wrote: > diff --git a/package/opensc/Config.in b/package/opensc/Config.in > new file mode 100644 > index 0000000000..5ee52d1de6 > --- /dev/null > +++ b/package/opensc/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_OPENSC > + bool "opensc" > + depends on !BR2_STATIC_LIBS # dlopen() > + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM Unfortunately, this is not acceptable. If it breaks with this particular toolchain, it's also likely to break with other toolchains that share similar characteristics (gcc version, etc.). > + select BR2_PACKAGE_PCSC_LITE > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL Why do you force OpenSSL here? Is LibreSSL confirmed to not work with opensc? If so, please add a comment above this select that explains what explain is broken. If you select BR2_PACKAGE_PCSC_LITE, you also need to inherit its dependencies, i.e: depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:57:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:57:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/gensio: add avahi optional dependency In-Reply-To: References: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> Message-ID: <20220113205733.270b84f0@windsurf> On Mon, 10 Jan 2022 08:45:05 +0100 Fabrice Fontaine wrote: > > > +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) > > > > In the commit message you talk about avahi-client, but here it's avahi-daemon. > > That looks a bit weird... Can you explain? > avahi-client needs avahi-daemon and dbus but perhaps we should add a > BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT hidden option. I suppose you will rework this patch with the new avahi hidden option that you have added? I'll mark this particular patch as Changes Requested. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:22:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:22:22 +0100 Subject: [Buildroot] [PATCH v3] package/opensc: new package In-Reply-To: <20220113205437.47e82728@windsurf> References: <20220113114951.549960-1-jose.pekkarinen@unikie.com> <20220113205437.47e82728@windsurf> Message-ID: <20220113212222.282b9a9c@windsurf> Hello, On Thu, 13 Jan 2022 20:54:37 +0100 Thomas Petazzoni wrote: > > + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM > > Unfortunately, this is not acceptable. If it breaks with this > particular toolchain, it's also likely to break with other toolchains > that share similar characteristics (gcc version, etc.). Just pass --disable-strict in OPENSC_CONF_OPTS, and opensc will nicely build with the Sourcery toolchain. > > + select BR2_PACKAGE_PCSC_LITE > > + select BR2_PACKAGE_OPENSSL > > + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL > > Why do you force OpenSSL here? Is LibreSSL confirmed to not work with > opensc? If so, please add a comment above this select that explains > what explain is broken. I just tested the build with LibreSSL, and it works, so please drop this BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:27:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:27:34 +0100 Subject: [Buildroot] [git commit] package/gdb: remove python2 support Message-ID: <20220113202144.8EC4D82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a607efc6d3606e862babfbd17ca8e39398f7c2a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since at least gdb 7.8, python3 support has been available. As part of the progressive retiring of python2 support, it is time to drop its support in gdb by: - Removing BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host and removing the choice to leave just a BR2_PACKAGE_HOST_GDB_PYTHON3 option. - Adding BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy - Changing depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/gdb/Config.in | 2 +- package/gdb/Config.in.host | 20 +------------------- package/gdb/gdb.mk | 12 +----------- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6c6aca5ac9..dd64b7da1b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_HOST_GDB_PYTHON + bool "GDB Python2 support removed" + select BR2_LEGACY + help + Python2 is deprecated and no longer supported. + Please migrate to Python3. + config BR2_PACKAGE_GSTREAMER1_MM bool "gstreamer1-mm package removed" select BR2_LEGACY diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 6f1a883de7..daad6c910d 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI config BR2_PACKAGE_GDB_PYTHON bool "Python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help This option enables Python support in the target gdb. diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a6e1d7f53c..56999fa9e0 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -30,29 +30,11 @@ config BR2_PACKAGE_HOST_GDB_TUI help This option enables terminal user interface (TUI) for gdb -choice - prompt "Python support" - default BR2_PACKAGE_HOST_GDB_NOPYTHON - help - Select the version of Python you wish to use - -config BR2_PACKAGE_HOST_GDB_NOPYTHON - bool "None" - help - This option disables Python support in the cross gdb. - -config BR2_PACKAGE_HOST_GDB_PYTHON - bool "Python 2" - help - This option enables the Python 2 support in the cross gdb. - config BR2_PACKAGE_HOST_GDB_PYTHON3 - bool "Python 3" + bool "Python support" help This option enables the Python 3 support in the cross gdb. -endchoice - config BR2_PACKAGE_HOST_GDB_SIM bool "Simulator support" depends on !BR2_arc diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4ff498230a..05de3c14d1 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -201,17 +201,10 @@ GDB_CONF_OPTS += --disable-tui endif ifeq ($(BR2_PACKAGE_GDB_PYTHON),y) -ifeq ($(BR2_PACKAGE_PYTHON3),y) # CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_DEPENDENCIES += python3 -else -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_DEPENDENCIES += python -endif GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config else GDB_CONF_OPTS += --without-python @@ -287,10 +280,7 @@ else HOST_GDB_CONF_OPTS += --disable-tui endif -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 -HOST_GDB_DEPENDENCIES += host-python -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 HOST_GDB_DEPENDENCIES += host-python3 else From thomas.petazzoni at bootlin.com Thu Jan 13 20:38:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:38:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: remove python2 support In-Reply-To: <20220104200904.1422985-1-aduskett@gmail.com> References: <20220104200904.1422985-1-aduskett@gmail.com> Message-ID: <20220113213831.4b7c5a8a@windsurf> Hello, On Tue, 4 Jan 2022 12:09:04 -0800 Adam Duskett wrote: > According to the GDB 9.2 changelog, python3 has been supported since at least > 2019. > > - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host > > - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy > > - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to > depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in > > Signed-off-by: Adam Duskett I have applied your patch, after some changes. See below. > diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host > index a6e1d7f53c..2c6c78f20a 100644 > --- a/package/gdb/Config.in.host > +++ b/package/gdb/Config.in.host > @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON > help > This option disables Python support in the cross gdb. > > -config BR2_PACKAGE_HOST_GDB_PYTHON > - bool "Python 2" > - help > - This option enables the Python 2 support in the cross gdb. > - > config BR2_PACKAGE_HOST_GDB_PYTHON3 > bool "Python 3" > help The choice ... endchoice here was no longer needed, so I have only kept BR2_PACKAGE_HOST_GDB_PYTHON3 as an option. > diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk > index 4ff498230a..2929eaf058 100644 > --- a/package/gdb/gdb.mk > +++ b/package/gdb/gdb.mk > @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) This ifeq ($(BR2_PACKAGE_PYTHON3),y) was no longer needed: we know it's always going to be python3. Applied with those changes. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:38:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:38:39 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: use backported ICU patch from upstream Message-ID: <20220113203225.532D383582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e247f605e82fdfca6fbee6365baec982d1468071 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use backported upstream ICU fix instead of adapted downstream patch. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...yStation-ICU-68.1-no-longer-exposes-FALS.patch} | 35 +++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch similarity index 86% rename from package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch rename to package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch index 11d0b7b248..0c3e8b3586 100644 --- a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch +++ b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch @@ -1,18 +1,39 @@ -From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001 -From: Henri Roosen -Date: Thu, 18 Mar 2021 11:53:57 +0100 -Subject: [PATCH] Fix ICU related compile failures from capital bool defines +From 736e1d804d1efa2077c4f1fe0b9084927d82e249 Mon Sep 17 00:00:00 2001 +From: "stephan.szabo at sony.com" + +Date: Tue, 3 Nov 2020 20:06:15 +0000 +Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and + TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522 -See ICU-21267 +Reviewed by Don Olmstead. -Signed-off-by: Henri Roosen +Source/WebCore: + +* platform/text/TextCodecICU.cpp: Replace use of TRUE with true + +Source/WebKit: + +* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false + +Source/WTF: + +Replace uses of FALSE and TRUE with false and true. + +* wtf/text/icu/UTextProvider.h: +* wtf/text/icu/UTextProviderLatin1.cpp: +* wtf/text/icu/UTextProviderUTF16.cpp: + +Change-Id: I876cf2b10b8c858c3d265113c062d159749a2f3e +git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +736e1d804d1efa2077c4f1fe0b9084927d82e249] --- Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- Source/WebCore/platform/text/icu/UTextProvider.h | 8 ++++---- .../platform/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- .../platform/text/icu/UTextProviderUTF16.cpp | 4 ++-- - 4 files changed, 14 insertions(+), 14 deletions(-) + 7 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp index dd6ff0675bb1..e0f4bd718828 100644 From thomas.petazzoni at bootlin.com Thu Jan 13 20:38:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:38:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: use backported ICU patch from upstream In-Reply-To: <20220104205213.1367539-1-james.hilliard1@gmail.com> References: <20220104205213.1367539-1-james.hilliard1@gmail.com> Message-ID: <20220113213855.24e00974@windsurf> On Tue, 4 Jan 2022 13:52:13 -0700 James Hilliard wrote: > Use backported upstream ICU fix instead of adapted downstream patch. > > Signed-off-by: James Hilliard > --- > ...ion-ICU-68.1-no-longer-exposes-FALS.patch} | 35 +++++++++++++++---- > 1 file changed, 28 insertions(+), 7 deletions(-) > rename package/qt5/qt5webkit/{0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch => 0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch} (86%) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:40:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:40:24 +0100 Subject: [Buildroot] [git commit] package/systemd: add checklist of upgrade caveats Message-ID: <20220113203405.4AB5082DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0c778c18ce180c02b0210169d7f7df0f9b4499a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bumping the version of systemd is a little more complicated than the usual package, and it's easy to forget some of the things that need to be done - and this has happened several times in the past. Add a checklist of things to worry about when updating systemd. Note that there are many other complicated packages that also need a lot of attention when upgrading. However, systemd is a really critical package so it's more important that we get that one right than, say, valgrind. Cc: Norbert Lange Cc: J??r??my ROSEN Cc: Adam Duskett Cc: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 3811dbae42..2d3971f31d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,6 +4,21 @@ # ################################################################################ +# When updating systemd, take care of the following: +# - Check if the requirements have changed (see README), in particular +# arch and headers +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD +# - If the required kernel options have changed, update the Config.in +# help text and the list of KCONFIG_ENABLE_OPT. +# - Check if there are new meson_options. Make sure all options are set +# explicitly (usually to default value). +# - If there are new services: +# - create new options for them (if they really are optional); +# - create a new _USER if necessary; +# - create new directory (with _PERMISSIONS) if necessary. +# - Diff sysusers.d with the previous version +# - Diff factory/etc/nsswitch.conf with the previous version +# (details are often sprinkled around in README and manpages) SYSTEMD_VERSION = 250.1 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ From thomas.petazzoni at bootlin.com Thu Jan 13 20:40:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:40:48 +0100 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats In-Reply-To: <20220110131624.3639727-1-arnout@mind.be> References: <20220110131624.3639727-1-arnout@mind.be> Message-ID: <20220113214048.172176b9@windsurf> On Mon, 10 Jan 2022 14:16:24 +0100 "Arnout Vandecappelle (Essensium/Mind)" wrote: > Bumping the version of systemd is a little more complicated than the > usual package, and it's easy to forget some of the things that need to > be done - and this has happened several times in the past. > > Add a checklist of things to worry about when updating systemd. > > Note that there are many other complicated packages that also need a lot > of attention when upgrading. However, systemd is a really critical > package so it's more important that we get that one right than, say, > valgrind. > > Cc: Norbert Lange > Cc: J?r?my ROSEN > Cc: Adam Duskett > Cc: James Hilliard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/systemd/systemd.mk | 12 ++++++++++++ > 1 file changed, 12 insertions(+) Applied to master after taking into account the comments from Baruch and Norbert. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:41:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:41:48 +0100 Subject: [Buildroot] [git commit] package/python-gnupg: new package Message-ID: <20220113204212.89FD383582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b8abbe72c281bf646373b53abc2471631b8be71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A wrapper for the Gnu Privacy Guard (GPG or GnuPG). The gnupg module allows Python programs to make use of the functionality provided by the GNU Privacy Guard (abbreviated GPG or GnuPG). Using this module, Python programs can encrypt and decrypt data, digitally sign documents and verify digital signatures, manage (generate, list and delete) encryption keys, using Public Key Infrastructure (PKI) encryption technology based on OpenPGP. https://docs.red-dove.com/python-gnupg/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-gnupg/Config.in | 15 +++++++++++++++ package/python-gnupg/python-gnupg.hash | 5 +++++ package/python-gnupg/python-gnupg.mk | 13 +++++++++++++ 5 files changed, 35 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c15b117610..a17e828aa5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1605,6 +1605,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ F: package/python-distro/ +F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ diff --git a/package/Config.in b/package/Config.in index b76f50e565..4df1474b91 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1038,6 +1038,7 @@ menu "External python modules" source "package/python-futures/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" + source "package/python-gnupg/Config.in" source "package/python-gobject/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in new file mode 100644 index 0000000000..038a940778 --- /dev/null +++ b/package/python-gnupg/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_GNUPG + bool "python-gnupg" + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime + help + A wrapper for the Gnu Privacy Guard (GPG or GnuPG). + + The gnupg module allows Python programs to make use of the + functionality provided by the GNU Privacy Guard (abbreviated + GPG or GnuPG). Using this module, Python programs can + encrypt and decrypt data, digitally sign documents and + verify digital signatures, manage (generate, list and + delete) encryption keys, using Public Key Infrastructure + (PKI) encryption technology based on OpenPGP. + + https://docs.red-dove.com/python-gnupg/ diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash new file mode 100644 index 0000000000..fa0e8ae6e5 --- /dev/null +++ b/package/python-gnupg/python-gnupg.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-gnupg/json +md5 02c5d77b8db9dfba0741627560d89bd5 python-gnupg-0.4.8.tar.gz +sha256 b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7 python-gnupg-0.4.8.tar.gz +# Locally computed sha256 checksums +sha256 9620da3d3afdfca7dea53c4375c1507ab2d3a4af4e706827023acb49a9ec4a5e LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk new file mode 100644 index 0000000000..f16910e517 --- /dev/null +++ b/package/python-gnupg/python-gnupg.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-gnupg +# +################################################################################ + +PYTHON_GNUPG_VERSION = 0.4.8 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 +PYTHON_GNUPG_LICENSE = BSD-3-Clause +PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt +PYTHON_GNUPG_SETUP_TYPE = setuptools + +$(eval $(python-package)) From romain.naour at gmail.com Thu Jan 13 20:48:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 13 Jan 2022 21:48:50 +0100 Subject: [Buildroot] [PATCH 1/4] arch: move definition of KERNEL_ARCH to Config.in. files In-Reply-To: <20210518113652.29609-2-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-2-patrickdepinguin@gmail.com> Message-ID: <2fae6410-5fbf-776f-f3a7-586c09274738@gmail.com> Hi Thomas, Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > Similar to other arch-specific strings, the 'KERNEL_ARCH' variable can be > determined from Config.in. files. > > Besides aligning with similar strings, this also means simplification: the > big 'sed' covers several architectures not even supported by Buildroot. > Reviewed-by: Romain Naour Best regards, Romain > Signed-off-by: Thomas De Schampheleire > --- > Makefile | 17 +---------------- > arch/Config.in | 3 +++ > arch/Config.in.arc | 3 +++ > arch/Config.in.arm | 4 ++++ > arch/Config.in.csky | 3 +++ > arch/Config.in.m68k | 3 +++ > arch/Config.in.microblaze | 3 +++ > arch/Config.in.mips | 3 +++ > arch/Config.in.nds32 | 3 +++ > arch/Config.in.nios2 | 3 +++ > arch/Config.in.or1k | 3 +++ > arch/Config.in.powerpc | 3 +++ > arch/Config.in.riscv | 3 +++ > arch/Config.in.s390x | 3 +++ > arch/Config.in.sh | 3 +++ > arch/Config.in.sparc | 4 ++++ > arch/Config.in.x86 | 4 ++++ > arch/Config.in.xtensa | 3 +++ > 18 files changed, 55 insertions(+), 16 deletions(-) > > diff --git a/Makefile b/Makefile > index c3305f46e9..7b6998fde6 100644 > --- a/Makefile > +++ b/Makefile > @@ -433,22 +433,7 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > > # Strip off the annoying quoting > ARCH := $(call qstrip,$(BR2_ARCH)) > - > -KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ > - -e s/i.86/i386/ -e s/sun4u/sparc64/ \ > - -e s/arcle/arc/ \ > - -e s/arceb/arc/ \ > - -e s/arm.*/arm/ -e s/sa110/arm/ \ > - -e s/aarch64.*/arm64/ \ > - -e s/nds32.*/nds32/ \ > - -e s/or1k/openrisc/ \ > - -e s/parisc64/parisc/ \ > - -e s/powerpc64.*/powerpc/ \ > - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ > - -e s/riscv.*/riscv/ \ > - -e s/sh.*/sh/ \ > - -e s/s390x/s390/ \ > - -e s/microblazeel/microblaze/) > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > BZCAT := $(call qstrip,$(BR2_BZCAT)) > diff --git a/arch/Config.in b/arch/Config.in > index 155403c363..7575acf48c 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -326,6 +326,9 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_10 > config BR2_ARCH > string > > +config BR2_KERNEL_ARCH > + string > + > config BR2_ENDIAN > string > > diff --git a/arch/Config.in.arc b/arch/Config.in.arc > index f7a6d920b5..cc55c9e68f 100644 > --- a/arch/Config.in.arc > +++ b/arch/Config.in.arc > @@ -62,6 +62,9 @@ config BR2_ARCH > default "arc" if BR2_arcle > default "arceb" if BR2_arceb > > +config BR2_KERNEL_ARCH > + default "arc" > + > config BR2_arc > bool > default y if BR2_arcle || BR2_arceb > diff --git a/arch/Config.in.arm b/arch/Config.in.arm > index 4c0910e4f8..0f50512fad 100644 > --- a/arch/Config.in.arm > +++ b/arch/Config.in.arm > @@ -822,6 +822,10 @@ config BR2_ARCH > default "aarch64" if BR2_aarch64 > default "aarch64_be" if BR2_aarch64_be > > +config BR2_KERNEL_ARCH > + default "arm" if BR2_arm || BR2_armeb > + default "arm64" if BR2_aarch64 || BR2_aarch64_be > + > config BR2_ENDIAN > default "LITTLE" if (BR2_arm || BR2_aarch64) > default "BIG" if (BR2_armeb || BR2_aarch64_be) > diff --git a/arch/Config.in.csky b/arch/Config.in.csky > index 7e2029f759..df9e7ab75b 100644 > --- a/arch/Config.in.csky > +++ b/arch/Config.in.csky > @@ -39,6 +39,9 @@ config BR2_GCC_TARGET_FLOAT_ABI > config BR2_ARCH > default "csky" > > +config BR2_KERNEL_ARCH > + default "csky" > + > config BR2_ENDIAN > default "LITTLE" > > diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k > index 275f47f1d3..7f3aec7232 100644 > --- a/arch/Config.in.m68k > +++ b/arch/Config.in.m68k > @@ -1,6 +1,9 @@ > config BR2_ARCH > default "m68k" if BR2_m68k > > +config BR2_KERNEL_ARCH > + default "m68k" > + > config BR2_ENDIAN > default "BIG" > > diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze > index 5fe2906d40..52aa252a2c 100644 > --- a/arch/Config.in.microblaze > +++ b/arch/Config.in.microblaze > @@ -2,6 +2,9 @@ config BR2_ARCH > default "microblazeel" if BR2_microblazeel > default "microblaze" if BR2_microblazebe > > +config BR2_KERNEL_ARCH > + default "microblaze" > + > config BR2_ENDIAN > default "LITTLE" if BR2_microblazeel > default "BIG" if BR2_microblazebe > diff --git a/arch/Config.in.mips b/arch/Config.in.mips > index 619456c2d5..b4923f8484 100644 > --- a/arch/Config.in.mips > +++ b/arch/Config.in.mips > @@ -235,6 +235,9 @@ config BR2_ARCH > default "mips64" if BR2_mips64 > default "mips64el" if BR2_mips64el > > +config BR2_KERNEL_ARCH > + default "mips" > + > config BR2_ENDIAN > default "LITTLE" if BR2_mipsel || BR2_mips64el > default "BIG" if BR2_mips || BR2_mips64 > diff --git a/arch/Config.in.nds32 b/arch/Config.in.nds32 > index 322ff49f2e..61fc346260 100644 > --- a/arch/Config.in.nds32 > +++ b/arch/Config.in.nds32 > @@ -1,6 +1,9 @@ > config BR2_ARCH > default "nds32le" > > +config BR2_KERNEL_ARCH > + default "nds32" > + > config BR2_GCC_TARGET_ARCH > default "v3" > > diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2 > index aae435fa17..c77b1a1c59 100644 > --- a/arch/Config.in.nios2 > +++ b/arch/Config.in.nios2 > @@ -1,6 +1,9 @@ > config BR2_ARCH > default "nios2" > > +config BR2_KERNEL_ARCH > + default "nios2" > + > config BR2_ENDIAN > default "LITTLE" > > diff --git a/arch/Config.in.or1k b/arch/Config.in.or1k > index abdf498fb8..ef1bded453 100644 > --- a/arch/Config.in.or1k > +++ b/arch/Config.in.or1k > @@ -1,6 +1,9 @@ > config BR2_ARCH > default "or1k" > > +config BR2_KERNEL_ARCH > + default "openrisc" > + > config BR2_ENDIAN > default "BIG" > > diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc > index ba56c9c721..33b2471cf9 100644 > --- a/arch/Config.in.powerpc > +++ b/arch/Config.in.powerpc > @@ -157,6 +157,9 @@ config BR2_ARCH > default "powerpc64" if BR2_powerpc64 > default "powerpc64le" if BR2_powerpc64le > > +config BR2_KERNEL_ARCH > + default "powerpc" > + > config BR2_ENDIAN > default "BIG" if BR2_powerpc || BR2_powerpc64 > default "LITTLE" if BR2_powerpc64le > diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv > index 1fc20e5de7..e8b6ddc833 100644 > --- a/arch/Config.in.riscv > +++ b/arch/Config.in.riscv > @@ -116,6 +116,9 @@ config BR2_ARCH > default "riscv32" if !BR2_ARCH_IS_64 > default "riscv64" if BR2_ARCH_IS_64 > > +config BR2_KERNEL_ARCH > + default "riscv" > + > config BR2_ENDIAN > default "LITTLE" > > diff --git a/arch/Config.in.s390x b/arch/Config.in.s390x > index ad866b421e..bf4b70f957 100644 > --- a/arch/Config.in.s390x > +++ b/arch/Config.in.s390x > @@ -17,6 +17,9 @@ endchoice > config BR2_ARCH > default "s390x" if BR2_s390x > > +config BR2_KERNEL_ARCH > + default "s390" > + > config BR2_ENDIAN > default "BIG" > > diff --git a/arch/Config.in.sh b/arch/Config.in.sh > index b5cce18e22..fde42dfce2 100644 > --- a/arch/Config.in.sh > +++ b/arch/Config.in.sh > @@ -24,6 +24,9 @@ config BR2_ARCH > default "sh4a" if BR2_sh4a > default "sh4aeb" if BR2_sh4aeb > > +config BR2_KERNEL_ARCH > + default "sh" > + > config BR2_ENDIAN > default "LITTLE" if BR2_sh4 || BR2_sh4a > default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb > diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc > index 4c4dc61745..b91df6892b 100644 > --- a/arch/Config.in.sparc > +++ b/arch/Config.in.sparc > @@ -21,6 +21,10 @@ config BR2_ARCH > default "sparc" if BR2_sparc > default "sparc64" if BR2_sparc64 > > +config BR2_KERNEL_ARCH > + default "sparc" if BR2_sparc > + default "sparc64" if BR2_sparc64 > + > config BR2_ENDIAN > default "BIG" > > diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 > index 7aae3cafb7..88ac9cdc44 100644 > --- a/arch/Config.in.x86 > +++ b/arch/Config.in.x86 > @@ -266,6 +266,10 @@ config BR2_ARCH > default "i686" if BR2_x86_athlon_4 > default "x86_64" if BR2_x86_64 > > +config BR2_KERNEL_ARCH > + default "i386" if !BR2_x86_64 > + default "x86_64" if BR2_x86_64 > + > config BR2_ENDIAN > default "LITTLE" > > diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa > index a79d906985..acc340eca6 100644 > --- a/arch/Config.in.xtensa > +++ b/arch/Config.in.xtensa > @@ -48,6 +48,9 @@ config BR2_ENDIAN > config BR2_ARCH > default "xtensa" if BR2_xtensa > > +config BR2_KERNEL_ARCH > + default "xtensa" > + > config BR2_READELF_ARCH_NAME > default "Tensilica Xtensa Processor" > > From thomas.petazzoni at bootlin.com Thu Jan 13 20:51:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package In-Reply-To: <20220110200151.830192-1-ju.o@free.fr> References: <20220110200151.830192-1-ju.o@free.fr> Message-ID: <20220113215104.02a734a1@windsurf> Hello Julien, On Mon, 10 Jan 2022 21:01:51 +0100 Julien Olivain wrote: > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-gnupg/Config.in | 15 +++++++++++++++ > package/python-gnupg/python-gnupg.hash | 5 +++++ > package/python-gnupg/python-gnupg.mk | 13 +++++++++++++ > 5 files changed, 35 insertions(+) Thanks for the patch, which I have applied, with a change (see below). However, more importantly, could you write and contribute a test case for python-gnupg in our runtime test infrastructure ? See https://buildroot.org/downloads/manual/manual.html#_using_the_runtime_tests_framework for some amount of details. > +config BR2_PACKAGE_PYTHON_GNUPG > + bool "python-gnupg" > + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime This generates a circular dependency reported by kconfig, because another package does exactly the opposite. So I have inverted the logic here: select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:00:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:00:57 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220112184821.916646-1-heiko.thiery@gmail.com> References: <20220112184821.916646-1-heiko.thiery@gmail.com> Message-ID: <20220113220057.1db30808@windsurf> Hello, On Wed, 12 Jan 2022 19:48:22 +0100 Heiko Thiery wrote: > diff --git a/board/kontron/bl-imx8mm/boot.cmd b/board/kontron/bl-imx8mm/boot.cmd > new file mode 100644 > index 0000000000..7ce3198dbc > --- /dev/null > +++ b/board/kontron/bl-imx8mm/boot.cmd > @@ -0,0 +1,8 @@ > +echo "Root File Sytem on MMC${devnum}" > +setenv rootfs /dev/mmcblk${devnum}p1 > +setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} > + > +load ${devtype} ${devnum} ${kernel_addr_r} boot/Image > +load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mm-kontron-n801x-s.dtb > + > +booti ${kernel_addr_r} - ${fdt_addr_r} Have you considered using extlinux.conf ? This is generally much easier than a boot script, and removes the need to generate the boot script. > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..ed088dd0f8 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,28 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig I suppose the U-Boot patches are on their way upstream? > diff --git a/board/kontron/bl-imx8mm/post-image.sh b/board/kontron/bl-imx8mm/post-image.sh > new file mode 100755 > index 0000000000..564211c829 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/post-image.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg Could you call support/scripts/genimage.sh directly as the post-image script, using the BR2_ROOTFS_POST_SCRIPT_ARGS to pass the -c ... argument? We already do that in many defconfigs. > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y You need FIT support ? > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/bl-imx8mm/boot.cmd" These would no longer be needed if switching to extlinux.conf. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:04:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:04:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-rtsp-server: fix introspection In-Reply-To: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> References: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> Message-ID: <20220113220429.3ae14160@windsurf> Hello Fabrice, On Mon, 20 Dec 2021 10:33:11 +0100 Fabrice Fontaine wrote: > Fix the following build failure with introspection: > > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 > Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 > If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > Fixes: > - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 > > Signed-off-by: Fabrice Fontaine Thanks applied, but see below. > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] You've had some feedback about resubmitting to the monorepo (which I suppose is the new single repo that gstreamer developers are using now). If not already done, could you follow-up on this? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From paul at crapouillou.net Thu Jan 13 21:04:31 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Thu, 13 Jan 2022 21:04:31 +0000 Subject: [Buildroot] [PATCH 1/1] Config.in: add option to only use ccache for BR Message-ID: <20220113210431.1361727-1-paul@crapouillou.net> Add an option, disabled by default, to only use ccache for Buildroot packages. When enabled, ccache will be used when building Buildroot itself, but the toolchain exported as SDK will not make use of ccache to build external programs, unless the "BR_USE_CCACHE" environment variable is set. The motivation behind this change is to be able to speed up iterative building of a Buildroot based distribution, without forcing the users of the SDK to use ccache, which has the problem of clobbering the filesystem in a hidden directory if the cache directory is left as default, or trying to access a cache folder that existed on the machine that built the SDK but which may not exist on the machine on which it was later installed. Signed-off-by: Paul Cercueil --- Config.in | 9 +++++++++ linux/linux.mk | 4 ++++ package/Makefile.in | 4 ++++ toolchain/toolchain-wrapper.c | 5 +++++ toolchain/toolchain-wrapper.mk | 4 ++++ 5 files changed, 26 insertions(+) diff --git a/Config.in b/Config.in index f0cd6f48ed..fec2332077 100644 --- a/Config.in +++ b/Config.in @@ -374,6 +374,15 @@ config BR2_CCACHE_USE_BASEDIR the section "COMPILING IN DIFFERENT DIRECTORIES" in the ccache manual for more information. +config BR2_CCACHE_BR_ONLY + bool "Only use ccache for building Buildroot packages" + default n + help + When enabled, ccache will be used when building Buildroot + itself, but the toolchain exported as SDK will not make use of + ccache to build external programs, unless the "BR_USE_CCACHE" + environment variable is set. + endif config BR2_ENABLE_DEBUG diff --git a/linux/linux.mk b/linux/linux.mk index 61fdc0c76c..339848e29b 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -69,6 +69,10 @@ LINUX_MAKE_ENV = \ $(HOST_MAKE_ENV) \ BR_BINARIES_DIR=$(BINARIES_DIR) +ifeq ($(BR2_CCACHE_BR_ONLY),y) +LINUX_MAKE_ENV += BR_USE_CCACHE=1 +endif + LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod \ $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ diff --git a/package/Makefile.in b/package/Makefile.in index 508ea7c366..34556fa7b0 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -263,6 +263,10 @@ export PERL5LIB=$(HOST_DIR)/lib/perl TARGET_MAKE_ENV = PATH=$(BR_PATH) +ifeq ($(BR2_CCACHE_BR_ONLY),y) + TARGET_MAKE_ENV += BR_USE_CCACHE=1 +endif + TARGET_CONFIGURE_OPTS = \ $(TARGET_MAKE_ENV) \ AR="$(TARGET_AR)" \ diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 0fb6064b1c..bf0194c8fc 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -510,6 +510,11 @@ int main(int argc, char **argv) if (getenv("BR_NO_CCACHE")) /* Skip the ccache call */ exec_args++; +#ifdef BR_CCACHE_BR_ONLY + else if (!getenv("BR_USE_CCACHE")) + /* Skip the ccache call */ + exec_args++; +#endif #endif /* Debug the wrapper to see final arguments passed to the real compiler. */ diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index cbf46f15fa..cda9eaf342 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -73,6 +73,10 @@ ifeq ($(BR2_CCACHE_USE_BASEDIR),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"' endif +ifeq ($(BR2_CCACHE_BR_ONLY),y) +TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BR_ONLY +endif + ifeq ($(BR2_PIC_PIE),y) TOOLCHAIN_WRAPPER_ARGS += -DBR2_PIC_PIE endif -- 2.34.1 From thomas.petazzoni at bootlin.com Thu Jan 13 21:02:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:02:52 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gst1-rtsp-server: fix introspection Message-ID: <20220113210055.5938B83591@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa3e7a63b93620b8227d66c6a973cd6140432cf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with introspection: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-gst-rtsp-server-meson.build-add-gst_dep.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch new file mode 100644 index 0000000000..b63f634598 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch @@ -0,0 +1,41 @@ +From b6bc8fbb72d6d3914c616dc64d15b961493cb9c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Dec 2021 10:09:36 +0100 +Subject: [PATCH] gst/rtsp-server/meson.build: add gst_dep + +Add gst_dep to gst_rtsp_server_deps, in the context of buildroot, this +will avoid the following build failure, because the correct girdir +location will be retrieved from gstreamer-1.0.pc: + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 +Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + +Fixes: + - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] +--- + gst/rtsp-server/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/rtsp-server/meson.build b/gst/rtsp-server/meson.build +index 24d7c39..874da14 100644 +--- a/gst/rtsp-server/meson.build ++++ b/gst/rtsp-server/meson.build +@@ -55,7 +55,7 @@ rtsp_server_headers = [ + + install_headers(rtsp_server_headers, subdir : 'gstreamer-1.0/gst/rtsp-server') + +-gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep] ++gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep, gst_dep] + gst_rtsp_server = library('gstrtspserver- at 0@'.format(api_version), + rtsp_server_sources, + include_directories : rtspserver_incs, +-- +2.33.0 + From thomas.petazzoni at bootlin.com Thu Jan 13 21:09:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:09:54 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-zero: using PARTUUID to identify root filesystem Message-ID: <20220113210414.1B8FA83493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e68ec6de08f0ae9488a4df62ea15eb7e2bdf7b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The mmc block device number can vary, so passing a mmc block device to specify the location of the rootfs is not a reliable approach. Instead, use the root=PARTUUID= mechanism, where the uuid is found by U-Boot. Signed-off-by: Sergey Kuzminov Signed-off-by: Thomas Petazzoni --- board/orangepi/orangepi-zero/boot.cmd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd index 44f0885ff4..d094a64fe5 100644 --- a/board/orangepi/orangepi-zero/boot.cmd +++ b/board/orangepi/orangepi-zero/boot.cmd @@ -1,6 +1,7 @@ setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +part uuid mmc 0:2 uuid +setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb From thomas.petazzoni at bootlin.com Thu Jan 13 21:10:45 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:10:45 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:using UUID to root In-Reply-To: <20211217233227.16411-1-kuzminov.sergey81@gmail.com> References: <20211217233227.16411-1-kuzminov.sergey81@gmail.com> Message-ID: <20220113221045.0a09cfc1@windsurf> On Sat, 18 Dec 2021 02:32:27 +0300 Sergey Kuzminov wrote: > The mmc block device number can vary. Passing a mmc block device to specify the location of the rootfs is not a reliable approach. > > Signed-off-by: Sergey Kuzminov > --- > board/orangepi/orangepi-zero/boot.cmd | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From jlyda at carnegierobotics.com Thu Jan 13 21:11:08 2022 From: jlyda at carnegierobotics.com (Jeremy Lyda) Date: Thu, 13 Jan 2022 21:11:08 +0000 Subject: [Buildroot] [PATCH 1/1] package/lvm2: LC_ALL set to "C" locale before generating cmds In-Reply-To: <20220113203646.1b921877@windsurf> References: <03d134dec448470eb60d56a0c8a6ceb5@carnegierobotics.com>, <20220113203646.1b921877@windsurf> Message-ID: <397aae451e2840bdad25aecda53d1185@carnegierobotics.com> Hello Thomas, > Thanks a lot for your patch. Did you submit this patch to the upstream > lvm2 project? I have not yet gotten around to it, but I do intend on submitting it, yes. > Also, could you send the patch with "git send-email", so that it > appears inline, and not as an attached file? I am struggling to get `git send-email` to cooperate with our mail server, but I will attach an inline copy of the patch below: >From 8527acf5177dd17c0ffafcd1b331b25a51d7a705 Mon Sep 17 00:00:00 2001 From: Jeremy Lyda Date: Thu, 13 Jan 2022 12:14:01 -0500 Subject: [PATCH 1/1] package/lvm2: LC_ALL set to "C" locale before generating cmds Signed-off-by: Jeremy Lyda --- ...t-to-C-locale-before-generating-cmds.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/lvm2/0001-LC_ALL-set-to-C-locale-before-generating-cmds.patch diff --git a/package/lvm2/0001-LC_ALL-set-to-C-locale-before-generating-cmds.patch b/package/lvm2/0001-LC_ALL-set-to-C-locale-before-generating-cmds.patch new file mode 100644 index 0000000000..d9c31cc3f1 --- /dev/null +++ b/package/lvm2/0001-LC_ALL-set-to-C-locale-before-generating-cmds.patch @@ -0,0 +1,35 @@ +From 8742a873dc3a89095760152db62b827ddba8ca24 Mon Sep 17 00:00:00 2001 +From: Jeremy Lyda +Date: Thu, 13 Jan 2022 12:00:54 -0500 +Subject: [PATCH 1/1] LC_ALL set to "C" locale before generating cmds + +An assumption is made prior to generating the cmds.h header file that the +LC_COLLATE locale setting is set to "C" -- this is not always the case. If the +locale is set for example to "en_US.UTF8" then it will alter the way that +underscores compare to letters and numbers such that underscores will be sorted +after letters and numbers. LVM in our experience does not gracefully handle +this erroneous sorting and results in a segmentation fault at some point in +program execution. Setting LC_ALL to the "C" locale (specifically LC_COLLATE) +ensures a correct, consistent command environment across various systems. + +Signed-off-by: Jeremy Lyda +--- + tools/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile.in b/tools/Makefile.in +index ec546ca63..c8530915c 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -181,7 +181,7 @@ cmds.h: $(srcdir)/command-lines.in Makefile + ( cat $(srcdir)/license.inc && \ + echo "/* Do not edit. This file is generated by the Makefile. */" && \ + echo "cmd(CMD_NONE, none)" && \ +- $(GREP) '^ID:' $(srcdir)/command-lines.in | LANG=C $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \ ++ $(GREP) '^ID:' $(srcdir)/command-lines.in | LANG=C LC_ALL=C $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \ + echo "cmd(CMD_COUNT, count)" \ + ) > $@ + +-- +2.25.1 + -- 2.25.1 From ps.report at gmx.net Thu Jan 13 21:26:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 13 Jan 2022 22:26:05 +0100 Subject: [Buildroot] [PATCH v1] package/mesa3d: fix glvnd option handling Message-ID: <20220113212605.13343-1-ps.report@gmx.net> - enable glvnd option only in case OPENGL_GLX or OPENGL_EGL is enabled Fixes: - http://autobuild.buildroot.net/results/e97ad48f20a325f5757754a8be2bdb613c86e4ea .../build/mesa3d-21.3.3/meson.build:542:4: ERROR: Problem encountered: glvnd requires DRI based GLX and/or EGL Signed-off-by: Peter Seiderer --- package/mesa3d/mesa3d.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index aa365838ab..fb178c10b3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -271,10 +271,14 @@ MESA3D_CFLAGS += -mlong-jump-table-offsets endif ifeq ($(BR2_PACKAGE_LIBGLVND),y) +ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),) MESA3D_DEPENDENCIES += libglvnd MESA3D_CONF_OPTS += -Dglvnd=true else MESA3D_CONF_OPTS += -Dglvnd=false endif +else +MESA3D_CONF_OPTS += -Dglvnd=false +endif $(eval $(meson-package)) -- 2.34.1 From romain.naour at gmail.com Thu Jan 13 21:30:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 13 Jan 2022 22:30:50 +0100 Subject: [Buildroot] [PATCH 2/4] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH In-Reply-To: <20210518113652.29609-3-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-3-patrickdepinguin@gmail.com> Message-ID: Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > The variable 'KERNEL_ARCH' is actually a normalized version of > 'ARCH'/'BR2_ARCH'. For example, 'arcle' and 'arceb' both become 'arc', just > as all powerpc variants become 'powerpc'. > > It is presumably called 'KERNEL_ARCH' because the Linux kernel is typically > the first place where support for a new architecture is added, and thus is > the entity that defines the normalized name. > > However, the term 'KERNEL_ARCH' can also be interpreted as 'the architecture > used by the kernel', which need not be exactly the same as 'the normalized > name for a certain arch'. In particular, for cases where a 64-bit > architecture is running a 64-bit kernel but 32-bit userspace. Examples > include: > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > In such cases, the 'architecture used by the kernel' needs to refer to the > 64-bit name (aarch64, x86_64), whereas all userspace applications need to > refer the, potentially normalized, 32-bit name. > > This means that there need to be two different variables: > > KERNEL_ARCH: the architecture used by the kernel > NORMALIZED_ARCH: the normalized name for the current userspace architecture > > At this moment, both will actually have the same content. But a subsequent > patch will add basic support for situations described above, in which > KERNEL_ARCH may become overwritten to the 64-bit architecture, while > NORMALIZED_ARCH needs to remain the same (32-bit) case. > > This commit replaces use of KERNEL_ARCH where actually the userspace arch is > needed. Places that use KERNEL_ARCH in combination with building of kernel > modules are not touched. > There may be cases where a package builds both a kernel module as userspace, > in which case it may need to know about both KERNEL_ARCH and > NORMALIZED_ARCH, for the case where they differ. But this is to be fixed on > a per-need basis. While reviewing this patch, I noticed that LINUX_ARCH_PATH [1] is wrong for sparc64 LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) Indeed: $ make O=test/qemu_sparc64_sun4u_defconfig printvars VARS=LINUX_ARCH_PATH LINUX_ARCH_PATH=/home/kubu/buildroot/test/qemu_sparc64_sun4u_defconfig/build/linux-5.15/arch/sparc64 But since LINUX_ARCH_PATH is not used for this architecture, it was not noticed. [1] https://git.buildroot.net/buildroot/tree/linux/linux.mk?h=2021.11#n226 Remaining packages using KERNEL_ARCH actually build an out of tree kernel module: jailhouse, linux-fusion, openpowerlink. Reviewed-by: Romain Naour > > Signed-off-by: Thomas De Schampheleire > --- > Makefile | 1 + > boot/barebox/barebox.mk | 10 +++++----- > boot/uboot/uboot.mk | 6 +++--- > package/busybox/busybox.mk | 2 +- > package/environment-setup/environment-setup.mk | 2 +- > package/kvmtool/kvmtool.mk | 4 ++-- > package/libselinux/libselinux.mk | 2 +- > package/linux-tools/linux-tool-perf.mk.in | 4 ++-- > package/linux-tools/linux-tool-selftests.mk.in | 6 +++--- > package/olsr/olsr.mk | 4 ++-- > package/pciutils/pciutils.mk | 2 +- > package/uboot-tools/uboot-tools.mk | 10 +++++----- > 12 files changed, 27 insertions(+), 26 deletions(-) > > diff --git a/Makefile b/Makefile > index 7b6998fde6..c5399e9a35 100644 > --- a/Makefile > +++ b/Makefile > @@ -433,6 +433,7 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > > # Strip off the annoying quoting > ARCH := $(call qstrip,$(BR2_ARCH)) > +NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk > index 8f02f9f9e1..6506294d6d 100644 > --- a/boot/barebox/barebox.mk > +++ b/boot/barebox/barebox.mk > @@ -59,16 +59,16 @@ ifneq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) > $(1)_INSTALL_TARGET = NO > endif > > -ifeq ($$(KERNEL_ARCH),i386) > +ifeq ($$(NORMALIZED_ARCH),i386) > $(1)_ARCH = x86 > -else ifeq ($$(KERNEL_ARCH),x86_64) > +else ifeq ($$(NORMALIZED_ARCH),x86_64) > $(1)_ARCH = x86 > -else ifeq ($$(KERNEL_ARCH),powerpc) > +else ifeq ($$(NORMALIZED_ARCH),powerpc) > $(1)_ARCH = ppc > -else ifeq ($$(KERNEL_ARCH),arm64) > +else ifeq ($$(NORMALIZED_ARCH),arm64) > $(1)_ARCH = arm > else > -$(1)_ARCH = $$(KERNEL_ARCH) > +$(1)_ARCH = $$(NORMALIZED_ARCH) > endif > > $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dbe82e65b1..77df9c8bba 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -139,12 +139,12 @@ endif > > # The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm', so > # we have to special case it. Similar for i386/x86_64 -> x86 > -ifeq ($(KERNEL_ARCH),arm64) > +ifeq ($(NORMALIZED_ARCH),arm64) > UBOOT_ARCH = arm > -else ifneq ($(filter $(KERNEL_ARCH),i386 x86_64),) > +else ifneq ($(filter $(NORMALIZED_ARCH),i386 x86_64),) > UBOOT_ARCH = x86 > else > -UBOOT_ARCH = $(KERNEL_ARCH) > +UBOOT_ARCH = $(NORMALIZED_ARCH) > endif > > UBOOT_MAKE_OPTS += \ > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index e979ac4f4b..456ed04a73 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -99,7 +99,7 @@ endif > > BUSYBOX_MAKE_OPTS = \ > CC="$(TARGET_CC)" \ > - ARCH=$(KERNEL_ARCH) \ > + ARCH=$(NORMALIZED_ARCH) \ > PREFIX="$(TARGET_DIR)" \ > EXTRA_LDFLAGS="$(BUSYBOX_LDFLAGS)" \ > CROSS_COMPILE="$(TARGET_CROSS)" \ > diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk > index fcad013f0d..8e0fdff208 100644 > --- a/package/environment-setup/environment-setup.mk > +++ b/package/environment-setup/environment-setup.mk > @@ -11,7 +11,7 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS > for var in $(TARGET_CONFIGURE_OPTS); do \ > printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ > done > - printf "export \"ARCH=$(KERNEL_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) > + printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) > printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE) > printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \ > --host=$(GNU_TARGET_NAME) \ > diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk > index 2984817c7e..df6ae7e0f1 100644 > --- a/package/kvmtool/kvmtool.mk > +++ b/package/kvmtool/kvmtool.mk > @@ -25,11 +25,11 @@ KVMTOOL_MAKE_OPTS = \ > WERROR=0 > > define KVMTOOL_BUILD_CMDS > - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) > + $(TARGET_MAKE_ENV) ARCH=$(NORMALIZED_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) > endef > > define KVMTOOL_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) \ > + $(TARGET_MAKE_ENV) ARCH=$(NORMALIZED_ARCH) $(MAKE) -C $(@D) \ > $(KVMTOOL_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) prefix=/usr > endef > > diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk > index fdd13aa942..5a62b8d829 100644 > --- a/package/libselinux/libselinux.mk > +++ b/package/libselinux/libselinux.mk > @@ -18,7 +18,7 @@ LIBSELINUX_INSTALL_STAGING = YES > # we won't have to use a relative path in 0002-revert-ln-relative.patch > LIBSELINUX_MAKE_OPTS = \ > $(TARGET_CONFIGURE_OPTS) \ > - ARCH=$(KERNEL_ARCH) \ > + ARCH=$(NORMALIZED_ARCH) \ > SHLIBDIR=/usr/lib > > LIBSELINUX_MAKE_INSTALL_TARGETS = install > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > index efa747cf8d..4e28129f50 100644 > --- a/package/linux-tools/linux-tool-perf.mk.in > +++ b/package/linux-tools/linux-tool-perf.mk.in > @@ -8,10 +8,10 @@ LINUX_TOOLS += perf > > PERF_DEPENDENCIES = host-flex host-bison > > -ifeq ($(KERNEL_ARCH),x86_64) > +ifeq ($(NORMALIZED_ARCH),x86_64) > PERF_ARCH=x86 > else > -PERF_ARCH=$(KERNEL_ARCH) > +PERF_ARCH=$(NORMALIZED_ARCH) > endif > > PERF_MAKE_FLAGS = \ > diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in > index c4e5bf0fea..b824c11bd6 100644 > --- a/package/linux-tools/linux-tool-selftests.mk.in > +++ b/package/linux-tools/linux-tool-selftests.mk.in > @@ -6,13 +6,13 @@ > > LINUX_TOOLS += selftests > > -ifeq ($(KERNEL_ARCH),x86_64) > +ifeq ($(NORMALIZED_ARCH),x86_64) > SELFTESTS_ARCH=x86 > else > -ifeq ($(KERNEL_ARCH),i386) > +ifeq ($(NORMALIZED_ARCH),i386) > SELFTESTS_ARCH=x86 > else > -SELFTESTS_ARCH=$(KERNEL_ARCH) > +SELFTESTS_ARCH=$(NORMALIZED_ARCH) > endif > endif > > diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk > index b2c8e7e001..4ad88991f2 100644 > --- a/package/olsr/olsr.mk > +++ b/package/olsr/olsr.mk > @@ -27,10 +27,10 @@ OLSR_PLUGINS += pud > endif > > define OLSR_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ > + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(NORMALIZED_ARCH) \ > CFLAGS="$(OLSR_CFLAGS)" -C $(@D) olsrd > $(foreach p,$(OLSR_PLUGINS), \ > - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ > + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(NORMALIZED_ARCH) \ > CFLAGS="$(OLSR_CFLAGS)" -C $(@D)/lib/$(p) > ) > endef > diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk > index 9b83b62b55..67defcc743 100644 > --- a/package/pciutils/pciutils.mk > +++ b/package/pciutils/pciutils.mk > @@ -12,7 +12,7 @@ PCIUTILS_LICENSE = GPL-2.0+ > PCIUTILS_LICENSE_FILES = COPYING > PCIUTILS_MAKE_OPTS = \ > CROSS_COMPILE="$(TARGET_CROSS)" \ > - HOST="$(KERNEL_ARCH)-linux" \ > + HOST="$(NORMALIZED_ARCH)-linux" \ > OPT="$(TARGET_CFLAGS)" \ > LDFLAGS="$(TARGET_LDFLAGS)" \ > DNS=no \ > diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk > index 8963d6182e..d60aaa7668 100644 > --- a/package/uboot-tools/uboot-tools.mk > +++ b/package/uboot-tools/uboot-tools.mk > @@ -206,14 +206,14 @@ $(eval $(host-generic-package)) > MKIMAGE = $(HOST_DIR)/bin/mkimage > > # mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86 > -# KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa > -# For arm64, arc, xtensa we'll just keep KERNEL_ARCH > +# NORMALIZED_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa > +# For arm64, arc, xtensa we'll just keep NORMALIZED_ARCH > # For mips64, we'll just keep mips > # For i386 and x86_64, we need to convert This part needs to be fixed due to a recent change. Best regards, Romain > -ifeq ($(KERNEL_ARCH),x86_64) > +ifeq ($(NORMALIZED_ARCH),x86_64) > MKIMAGE_ARCH = x86 > -else ifeq ($(KERNEL_ARCH),i386) > +else ifeq ($(NORMALIZED_ARCH),i386) > MKIMAGE_ARCH = x86 > else > -MKIMAGE_ARCH = $(KERNEL_ARCH) > +MKIMAGE_ARCH = $(NORMALIZED_ARCH) > endif > From thomas.petazzoni at bootlin.com Thu Jan 13 21:12:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:12:03 +0100 Subject: [Buildroot] [git commit] package/pahole: new host package Message-ID: <20220113213356.3AB1B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddba0ef6b1e8e407c44bb1036a75aecaeb89da92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pahole is a tool used to show data structure embedded in debugging information formats like DWARF. It is notably needed by the Linux kernel to generate BPF Type Format (BTF) information used by Compile Once - Run Everywhere (CO-RE) BPF tools. To be built, pahole needs __LIB to be set to lib at stated in its README. Signed-off-by: Francis Laniel Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in.host | 1 + package/pahole/Config.in.host | 6 ++++++ package/pahole/pahole.hash | 3 +++ package/pahole/pahole.mk | 18 ++++++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a17e828aa5..a91e2dfcde 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -971,6 +971,9 @@ N: Floris Bos F: package/ipmitool/ F: package/odhcploc/ +N: Francis Laniel +F: package/pahole/ + N: Francisco Gonzalez F: package/ser2net/ diff --git a/package/Config.in.host b/package/Config.in.host index c390ae3e7d..20034f6ee0 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -61,6 +61,7 @@ menu "Host utilities" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host" source "package/opkg-utils/Config.in.host" + source "package/pahole/Config.in.host" source "package/parted/Config.in.host" source "package/patchelf/Config.in.host" source "package/pigz/Config.in.host" diff --git a/package/pahole/Config.in.host b/package/pahole/Config.in.host new file mode 100644 index 0000000000..e427629632 --- /dev/null +++ b/package/pahole/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_PAHOLE + bool "host pahole" + help + Pahole and other DWARF utils. + + https://git.kernel.org/pub/scm/devel/pahole/pahole.git diff --git a/package/pahole/pahole.hash b/package/pahole/pahole.hash new file mode 100644 index 0000000000..420db15e75 --- /dev/null +++ b/package/pahole/pahole.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cde85af68b368f50a913be387f94f6b43612a04af6c92387b4dcabb712a668fe pahole-v1.23-br1.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pahole/pahole.mk b/package/pahole/pahole.mk new file mode 100644 index 0000000000..1ad937062d --- /dev/null +++ b/package/pahole/pahole.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# pahole +# +################################################################################ + +PAHOLE_VERSION = v1.23 +PAHOLE_SITE = git://git.kernel.org/pub/scm/devel/pahole/pahole.git +PAHOLE_SITE_METHOD = git +# pahole contains git submodule and relies on them to be built. +PAHOLE_GIT_SUBMODULES = YES +HOST_PAHOLE_DEPENDENCIES = host-elfutils +# Defining __LIB is needed to build pahole. +HOST_PAHOLE_CONF_OPTS = -D__LIB=lib +PAHOLE_LICENSE = GPL-2.0 +PAHOLE_LICENSE_FILES = COPYING + +$(eval $(host-cmake-package)) From thomas.petazzoni at bootlin.com Thu Jan 13 21:23:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:23:27 +0100 Subject: [Buildroot] [git commit] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE Message-ID: <20220113213356.427FB82753@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2da2f359dba50aafef1202edda34374d99b77a14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CONFIG_DEBUG_BTF_INFO relies on pahole, so kernel DWARF are converted to BTF. If CONFIG_DEBUG_BTF_INFO is set and BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE not, an error message is shown and .config is not written. Signed-off-by: Francis Laniel Signed-off-by: Thomas Petazzoni --- linux/Config.in | 12 ++++++++++++ linux/linux.mk | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index 891e2cdcb6..582f37ba7c 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -470,6 +470,18 @@ config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". +config BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE + bool "Needs host pahole" + help + Some Linux kernel configuration options (such as + CONFIG_DEBUG_INFO_BTF) require building a host program + called pahole. Enabling this option will ensure host-pahole + gets built before the Linux kernel. + + Enable this option if you get a Linux kernel build failure + such as "BTF: .tmp_vmlinux.btf: pahole (pahole) is not + available". + # Linux extensions source "linux/Config.ext.in" diff --git a/linux/linux.mk b/linux/linux.mk index 61fdc0c76c..dd2eebd446 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -114,6 +114,17 @@ ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y) LINUX_DEPENDENCIES += host-elfutils host-pkgconf endif +ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE),y) +LINUX_DEPENDENCIES += host-pahole +else +define LINUX_FIXUP_CONFIG_PAHOLE_CHECK + if grep -q "^CONFIG_DEBUG_INFO_BTF=y" $(KCONFIG_DOT_CONFIG); then \ + echo "To use CONFIG_DEBUG_INFO_BTF, enable host-pahole (BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE)" 1>&2; \ + exit 1; \ + fi +endef +endif + # If host-uboot-tools is selected by the user, assume it is needed to # create a custom image ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y) @@ -324,6 +335,7 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_DISABLE_OPT,$(opt)) ) $(LINUX_FIXUP_CONFIG_ENDIANNESS) + $(LINUX_FIXUP_CONFIG_PAHOLE_CHECK) $(if $(BR2_arm)$(BR2_armeb), $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI)) $(if $(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le), From thomas.petazzoni at bootlin.com Thu Jan 13 21:40:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:40:35 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/pahole: new host package In-Reply-To: <20211222174905.71902-2-flaniel@linux.microsoft.com> References: <20211222174905.71902-1-flaniel@linux.microsoft.com> <20211222174905.71902-2-flaniel@linux.microsoft.com> Message-ID: <20220113224035.6423fb12@windsurf> On Wed, 22 Dec 2021 18:49:04 +0100 Francis Laniel wrote: > pahole is a tool used to show data structure embedded in debugging information > formats like DWARF. > It is notably needed by the Linux kernel to generate BPF Type Format (BTF) > information used by Compile Once - Run Everywhere (CO-RE) BPF tools. > > To be built, pahole needs __LIB to be set to lib at stated in its README. > > Signed-off-by: Francis Laniel > --- > DEVELOPERS | 3 +++ > package/Config.in.host | 1 + > package/pahole/Config.in.host | 6 ++++++ > package/pahole/pahole.hash | 3 +++ > package/pahole/pahole.mk | 18 ++++++++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/pahole/Config.in.host > create mode 100644 package/pahole/pahole.hash > create mode 100644 package/pahole/pahole.mk Applied to master with some minor formatting tweaks reported by "make check-package". Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:41:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:41:26 +0100 Subject: [Buildroot] [PATCH v2 2/2] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE In-Reply-To: <20211222174905.71902-3-flaniel@linux.microsoft.com> References: <20211222174905.71902-1-flaniel@linux.microsoft.com> <20211222174905.71902-3-flaniel@linux.microsoft.com> Message-ID: <20220113224126.6b0801dd@windsurf> Hello, On Wed, 22 Dec 2021 18:49:05 +0100 Francis Laniel wrote: > CONFIG_DEBUG_BTF_INFO relies on pahole, so kernel DWARF are converted to BTF. > If CONFIG_DEBUG_BTF_INFO is set and BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE not, > an error message is shown and .config is not written. > > Signed-off-by: Francis Laniel Thanks, applied, with one change. > diff --git a/package/pahole/Config.in.host b/package/pahole/Config.in.host > index e427629632..521874961b 100644 > --- a/package/pahole/Config.in.host > +++ b/package/pahole/Config.in.host > @@ -3,4 +3,6 @@ config BR2_PACKAGE_HOST_PAHOLE > help > Pahole and other DWARF utils. > > + Select this if you want to build a kernel with CONFIG_DEBUG_INFO_BTF set. > + I've dropped this, because it's not really this option that should be enabled if the kernel is configured with CONFIG_DEBUG_INFO_BTF, but the BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE option. Thanks for your contribution! Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:42:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:42:52 +0100 Subject: [Buildroot] [PATCH] board/broadcom: add support for bcm47xx platform devices In-Reply-To: <20211021085540.18764-1-zajec5@gmail.com> References: <20211021085540.18764-1-zajec5@gmail.com> Message-ID: <20220113224252.0a46e30b@windsurf> Hello Rafa?, On Thu, 21 Oct 2021 10:55:40 +0200 Rafa? Mi?ecki wrote: > From: Rafa? Mi?ecki > > Broadcom's bcm47xx is a family of MIPS SoCs going back to the 2002 and > including e.g. Linksys WRT54G with its BCM4702. It evolved through years > and its latest model BCM4706 is still in use nowadays. > > Pretty much all SoCs contain all following components: > 1. CPU > 2. PCIe controller(s) > 3. Ethernet interface(s) > 4. USB controllers > 5. Serial flash controller > 6. GPIO controller (for LEDs and buttons) > 7. Watchdog > > Upstream kernel includes a pretty much complete support for bcm47xx but > it isn't DTS based. Board detection is handled on runtime so there is > one kernel image to serve all. > > Bootloader used in those devices is CFE. It allows booting kernel over > tftp and flashing firmwares using TRX format. It isn't properly open > sourced (except some early versions) and in practice it's irreplaceable. > > This commit adds support for building a bootable kernel based on 5.4 > stable release: > Starting program at 0x80001000 > Linux version 5.4.155 (rmilecki at localhost.localdomain) (gcc version 10.3.0 (Buildroot 2021.08-930-gc0c925605d)) #5 Thu Oct 21 10:16:20 CEST 2021 > > Linux 5.10 doesn't start booting due to some regression that remains to > be debugged. Adding support for building full images (including rootfs) > is also planned for the future. > > Signed-off-by: Rafa? Mi?ecki > --- > board/broadcom/bcm47xx/linux.config | 28 ++++++++++++++++++++++++++++ > configs/broadcom_bcm47xx_defconfig | 8 ++++++++ > 2 files changed, 36 insertions(+) > create mode 100644 board/broadcom/bcm47xx/linux.config > create mode 100644 configs/broadcom_bcm47xx_defconfig Thanks for this contribution, but it doesn't seem to be really useful as it is: the root filesystem generated as a tarball is not even used, and there is no readme.txt. We prefer to have directly useful defconfig files. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:45:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:45:31 +0100 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20211024113931.88898-1-gilles.talis@gmail.com> References: <20211024113931.88898-1-gilles.talis@gmail.com> Message-ID: <20220113224531.6f9ac64a@windsurf> Hello Gilles, On Sun, 24 Oct 2021 13:39:31 +0200 Gilles Talis wrote: > The NanoPi R2S is a FriendlyElec mini-router based on: > > - Rockchip RK3328 SoC > - 1GB (or 2GB) DDR4 RAM > - Gigabit Ethernet (WAN) > - Gigabit Ethernet (USB3) (LAN) > - USB 2.0 Host Port > - MicroSD slot > - Reset button > - WAN - LAN - SYS LED > > https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 > > Signed-off-by: Gilles Talis This obviously looks very good, but there is one question: could you drop the VFAT partition, and have the kernel, DTB and extlinux.conf be directly in the ext4 partition, with U-Boot loading them from the ext4 partition directly? This would simplify things a bit. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:50:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:50:56 +0100 Subject: [Buildroot] [PATCH RFC] package/binutils: build deterministic archives by default In-Reply-To: <20210929220027.10505-1-romain.naour@gmail.com> References: <20210929220027.10505-1-romain.naour@gmail.com> Message-ID: <20220113225056.52fdda1d@windsurf> Hello Romain, On Thu, 30 Sep 2021 00:00:27 +0200 Romain Naour wrote: > The option --enable-deterministic-archives that build deterministic > archives is supported by binutils since binutils 2.23 [1][2]. > > See "Static libraries" chapter [3]. > https://reproducible-builds.org/docs/archives/ > > Enable this option for target and host variant. > > It was added to Yocto Morty (2.2) in 2016 [4]. > > [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2e30cb575a1d2b1eb8f776356ed59b0722a943d1 > [2] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=9cb80f72d8b8b2f59562692d9385cd5a533e9b3f > [3] https://reproducible-builds.org/docs/archives > [4] https://github.com/openembedded/openembedded-core/commit/df0d525c02780b5a0bd7a177a249c55f41797476 > > Signed-off-by: Romain Naour The drawback of this approach is that it doesn't address the problem for external toolchains, which have not necessarily been built with --enable-deterministic-archives. We could either pass -D in TARGET_AR (but of course that is subject to packages obeying to that), or we could extend the toolchain wrapper to also cover the ar tool ? For this to be worth the effort, it would be useful to get some actual case where this is causing a problem. Indeed, in Buildroot, we don't really care about the reproducibility of .a archives themselves. So unless their lack of reproducibility trickles down to the statically-linked executables that result from using those .a, I'm not sure this is really worth it. I'll mark the patch as Changes Requested, but feel free to disagree and put it back in the New state. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From zajec5 at gmail.com Thu Jan 13 21:56:45 2022 From: zajec5 at gmail.com (=?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?=) Date: Thu, 13 Jan 2022 22:56:45 +0100 Subject: [Buildroot] [PATCH] board/broadcom: add support for bcm47xx platform devices In-Reply-To: <20220113224252.0a46e30b@windsurf> References: <20211021085540.18764-1-zajec5@gmail.com> <20220113224252.0a46e30b@windsurf> Message-ID: On 13.01.2022 22:42, Thomas Petazzoni wrote: > Thanks for this contribution, but it doesn't seem to be really useful > as it is: the root filesystem generated as a tarball is not even used, > and there is no readme.txt. We prefer to have directly useful defconfig > files. Thank you for your feedback, I'm still "learning" buildroot. I aim to upstream 3 Broadcom platforms support and I already learnt about kernel + rootfs + readme.txt in another patch review. I didn't send V2 for bcm47xx yet, I plan to get back to working on it once I (hopefully) get: [PATCH V2] board/broadcom: add support for BCM4908 platform devices accepted (V2 or another one). I want to learn on 1 platform and then get other ones. So I'll work on bcm47xx V2 a bit later. From yann.morin.1998 at free.fr Thu Jan 13 21:58:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 22:58:05 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: References: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> Message-ID: <20220113215805.GM1477939@scaer> Arnout, All, On 2022-01-12 21:42 +0100, Arnout Vandecappelle spake thusly: > On 08/01/2022 18:35, Yann E. MORIN wrote: > >Some files contain hard-coded absolute paths that point to the host > >and/or staging directories. > > > >With per-package directories (aka. PPD), these paths point to the PPD > >of the package that created the files, when we want them to point to the > >PPD of the package that uses them. [--SNIP--] > >+define PPD_FIXUP_PATHS > >+ $(Q)grep -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ > This will trawl to large binary files and potentially take a long time... I too thought of that, and I even discussed it slightly with Peter K. here about what would be most efficient: grep-then-file, or file-then-grep? But if we add --binary-files=without-match to grep, then it will bail-out early on binary files, which would be more efficient. And then we still pass that through file to really get only text files. But a text-file with utf8 is really a binary file, so would grep ignore it? > >+ |while read -d '' f; do \ > >+ file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ > ... just to be ignored here. Again, not sure, because text/plain but utf8-encoded? > More importantly though: if a file is a symlink, it's going to be hit > twice. No, I don't think so: $ man grep [..] -r, --recursive Read all files under each directory, recursively, following symbolic links only if they are on the command line. [...] And that seems to be the case: $ echo Pouet >foo $ ln -s foo bar $ grep -r Pouet . foo:Pouet So, seems OK to me? > Worse, if it's a symlink to an absolute path (which most likely > points *outside* of STAGING_DIR), we may end up sed'ing something on the > host... > I notice now that the same (theoretical) issue exists in relocate-sdk.sh. > Obviously that script doesn't get thoroughly tested so it may very well be > the wrong thing to do... > > Do you remember perhaps why we don't simply do > > find $(HOST_DIR) -type f -print0 \ Maybe we should. But grep -r was an elegant way to combine the recursive feature of find, and limit to the matching files at the same time... I can try to time things to see what's the fastest / less-slow... But given that the symlinks are not an issue in practice, so we care? > ? I was going to say that we can skip the grep, but then we're back at the > large (text) file thing. > > >+ printf '%s\0' "$${f}"; \ > > Why not do the sed right here, like is done in relocate-sdk.sh? In fact, > I'd keep the code as close as possible to relocate-sdk.sh to make later > refactoring easier. Using xarg allows to spawn only a few sed. printf is a shell built-in so it's basically free. [--SNIP--] > > define FIXUP_PYTHON_SYSCONFIGDATA > Maybe rename to REMOVE_PYTHON_SYSCONFIGATA_PYC OK Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Thu Jan 13 22:05:01 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 13 Jan 2022 23:05:01 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <20210518113652.29609-4-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> Message-ID: <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> Hi Thomas, Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > There are cases where a 64-bit architecture is running a 64-bit kernel but > 32-bit userspace. Examples include: > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to > the 32-bit architecture, but the kernel needs to be built with the 64-bit > architecture. > > Make it possible to define the correct architecture to be used for the > kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is > expected to know the valid values. > > Signed-off-by: Thomas De Schampheleire > --- > Makefile | 4 ++++ > arch/Config.in | 15 +++++++++++++++ > 2 files changed, 19 insertions(+) > > diff --git a/Makefile b/Makefile > index c5399e9a35..d09cf7c958 100644 > --- a/Makefile > +++ b/Makefile > @@ -434,7 +434,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > # Strip off the annoying quoting > ARCH := $(call qstrip,$(BR2_ARCH)) > NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > +else > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) > +endif > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > BZCAT := $(call qstrip,$(BR2_BZCAT)) > diff --git a/arch/Config.in b/arch/Config.in > index 7575acf48c..c82100f541 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -329,6 +329,21 @@ config BR2_ARCH > config BR2_KERNEL_ARCH > string > > +config BR2_KERNEL_ARCH_OVERRIDE > + string "Kernel architecture override" Maybe it would be better to add architecture dependencies here (BR2_ARCH_IS_64) > + help > + Normally, the correct kernel architecture value is derived > + from the selected architecture, and you should keep this > + option empty. > + However, there are cases where you may want to enter a custom > + value, for example when using a 64-bit architecture but > + running userspace in 32-bit mode. > + As an example, in case of an x86_64 processor where you want > + 32-bit userspace, BR2_ARCH will be 'i386'/'i486'/'i686' and > + BR2_KERNEL_ARCH_OVERRIDE should be set to 'x86_64'. Note that > + in this example you will also need a multilib toolchain and > + pass '-m32' via BR2_TARGET_OPTIMIZATION. Adding -m32 will force the mulitilib toolchain to produce 32bits binary. But -m64 is also added to the toolchain wrapper for x86_64. Mixing -m64 and -m32 doesn't seems a good idea. Best regards, Romain > + > config BR2_ENDIAN > string > > From thomas.petazzoni at bootlin.com Thu Jan 13 22:10:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:10:56 +0100 Subject: [Buildroot] [git commit] board/raspberrypicm4io: enable RTC and USB overlays Message-ID: <20220113220600.6F5588348E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31ed653166a45eda2403e311a3996b5df59d6775 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The CM4 IO Board is equipped with an on-board RTC connected over I2C, and has USB 2.0 host ports. This commit loads the appropriate overlays to enable both. The USB 2.0 interface is by default disabled on CM4 to reduce the power consumption so it needs to be explicitly enabled on the CM4 IO Board to use the USB ports. Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- board/raspberrypi/config_cm4io.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/raspberrypi/config_cm4io.txt b/board/raspberrypi/config_cm4io.txt index 01f60395b3..cf7e6df1a1 100644 --- a/board/raspberrypi/config_cm4io.txt +++ b/board/raspberrypi/config_cm4io.txt @@ -24,3 +24,10 @@ gpu_mem_1024=100 # fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console dtoverlay=miniuart-bt + +# enable RTC +dtparam=i2c_vc=on +dtoverlay=i2c-rtc,pcf85063a,i2c_csi_dsi + +# enable dwc2 USB controller (USB 2.0) +dtoverlay=dwc2,dr_mode=host From thomas.petazzoni at bootlin.com Thu Jan 13 22:12:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:12:11 +0100 Subject: [Buildroot] [git commit] board/raspberrypicm4io-64: enable RTC and USB overlays Message-ID: <20220113220600.774B681392@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7cf67fc940264e2ad6e60eaa914a214df9b81d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The CM4 IO Board is equipped with an on-board RTC connected over I2C, and has USB 2.0 host ports. This commit loads the appropriate overlays to enable both. The USB 2.0 interface is by default disabled on CM4 to reduce the power consumption so it needs to be explicitly enabled on the CM4 IO Board to use the USB ports. Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- board/raspberrypi/config_cm4io_64bit.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/raspberrypi/config_cm4io_64bit.txt b/board/raspberrypi/config_cm4io_64bit.txt index 6cd8a729cd..813f6eba7b 100644 --- a/board/raspberrypi/config_cm4io_64bit.txt +++ b/board/raspberrypi/config_cm4io_64bit.txt @@ -25,6 +25,13 @@ gpu_mem_1024=100 # fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console dtoverlay=miniuart-bt +# enable RTC +dtparam=i2c_vc=on +dtoverlay=i2c-rtc,pcf85063a,i2c_csi_dsi + +# enable dwc2 USB controller (USB 2.0) +dtoverlay=dwc2,dr_mode=host + # enable 64bits support arm_64bit=1 From thomas.petazzoni at bootlin.com Thu Jan 13 22:13:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:13:22 +0100 Subject: [Buildroot] [PATCH v5 2/6] board/raspberrypicm4io: enable RTC and USB overlays In-Reply-To: <20210921202137.7092-2-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> <20210921202137.7092-2-ps.report@gmx.net> Message-ID: <20220113231322.7c8b978f@windsurf> On Tue, 21 Sep 2021 22:21:33 +0200 Peter Seiderer wrote: > - add RTC and USB dtoverlay entries to config_cm4io.txt > > Signed-off-by: Peter Seiderer > --- > Changes v4 -> v5: > - new patch > --- > board/raspberrypi/config_cm4io.txt | 7 +++++++ > 1 file changed, 7 insertions(+) I have applied to master, after extending the commit log with more details that explain the change. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 22:13:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:13:48 +0100 Subject: [Buildroot] [PATCH v5 3/6] board/raspberrypicm4io-64: enable RTC and USB overlays In-Reply-To: <20210921202137.7092-3-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> <20210921202137.7092-3-ps.report@gmx.net> Message-ID: <20220113231348.678e302f@windsurf> On Tue, 21 Sep 2021 22:21:34 +0200 Peter Seiderer wrote: > - add RTC and USB dtoverlay entries to config_cm4io_64bit.txt > > Signed-off-by: Peter Seiderer I have applied to master, after extending the commit log with more details that explain the change. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 22:14:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:14:38 +0100 Subject: [Buildroot] [PATCH v2, 1/2] Revert "package/log4cxx: select boost chrono and date-time with gcc < 7" In-Reply-To: <20211121145741.1fa4dffb@windsurf> References: <20211119175553.2413433-1-fontaine.fabrice@gmail.com> <20211121145741.1fa4dffb@windsurf> Message-ID: <20220113231438.5aa8742e@windsurf> Hello Fabrice, On Sun, 21 Nov 2021 14:57:41 +0100 Thomas Petazzoni wrote: > On Fri, 19 Nov 2021 18:55:52 +0100 > Fabrice Fontaine wrote: > > > This reverts commit 3c2245cb65741c965f4bb87d35ac3c64f250a1ae to move > > these selects on boost side as the build failure was raised with gcc >= > > 7 (making this commit a "no-op"). Indeed, the build failure is raised > > with cmake < 3.21.3, because cmake assumed that boost thread depends on > > date-time until > > https://github.com/Kitware/CMake/commit/1ad0c5ae53fc0c4f774166337f0e9c93c578cf9b. > > I don't understand why you say this commit is a no-op. It clearly > isn't. In gcc < 7.x configurations, this commit ensures that boost > chrono and boost date-time are selected. > > The fact that you realize later that the build failure occurred with > gcc >= 7.x, meaning this commit does not help fixing the issue does not > make this commit a no-op. Do you have some feedback/comment on the above questions? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at gmail.com Thu Jan 13 22:15:00 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 13 Jan 2022 23:15:00 +0100 Subject: [Buildroot] [PATCH 4/4] perf: fix compilation in case of i386 userspace with x86_64 kernel In-Reply-To: <20210518113652.29609-5-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-5-patrickdepinguin@gmail.com> Message-ID: <55296fff-7a19-3691-22e2-52095bc5cc47@gmail.com> Hello Thomas, Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > If a 64-bit kernel is combined with 32-bit userspace, and this is achieved > via a multilib toolchain that defaults to 64-bit with '-m32' in > BR2_TARGET_OPTIMIZATION, the '-ld' command will still default to > 64-bit output. > > In this case, packages that use 'ld' directly need to be instructed to use > the correct ABI via the '-m' parameter. 'perf' is one such package. > > Signed-off-by: Thomas De Schampheleire > --- > package/linux-tools/linux-tool-perf.mk.in | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > index 4e28129f50..b84b5fd415 100644 > --- a/package/linux-tools/linux-tool-perf.mk.in > +++ b/package/linux-tools/linux-tool-perf.mk.in > @@ -45,6 +45,9 @@ PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32ltsmipn32" > else > PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf64ltsmip" > endif > +# case for x86 toolchain that defaults to 64-bit output > +else ifeq ($(BR2_i386):$(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),y:x86_64) > +PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf_i386" Do you know why the ARM toolchain doesn't need a similar handling ? Best regards, Romain > endif > > # The call to backtrace() function fails for ARC, because for some > From yann.morin.1998 at free.fr Thu Jan 13 22:33:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 23:33:15 +0100 Subject: [Buildroot] [PATCH V2] board/broadcom: add support for BCM4908 platform devices In-Reply-To: <20211220045213.2210-1-zajec5@gmail.com> References: <20211220045213.2210-1-zajec5@gmail.com> Message-ID: <20220113223315.GN1477939@scaer> Rafa?, All, On 2021-12-20 05:52 +0100, Rafa? Mi?ecki spake thusly: > From: Rafa? Mi?ecki > > BCM4908 is Broadcom's 64-bit platform with Broadcom's own Brahma-B53 > CPU(s). It's mostly used for home routers. > > Kernel config is a minimal setup required to support on-SoC blocks like > NAND controller, Ethernet, switch, USB. > > To make kernels 5.12+ boot those boards require a hacky patch modifying > hyp-stub.S. That booting problem will hopefully get fixes on day in > upstream kernel code. > > There are many BCM4908 devices and all of them can be supported with the > same kernel & rootfs. For that reason this board compiles DTB files for > all 3 upstream supported devices. Compiling DTS files is cheap and it > saves duplicating the same board code for every supported board. > > BCM4908 devices use Broadcom's own CFE bootloader which isn't properly > opensourced. Available CFE sources are very old and cover only some > ancient MIPS devices. > > Signed-off-by: Rafa? Mi?ecki > --- [--SNIP--] > diff --git a/board/broadcom/bcm4908/linux.config b/board/broadcom/bcm4908/linux.config > new file mode 100644 > index 0000000000..446a0bdf83 > --- /dev/null > +++ b/board/broadcom/bcm4908/linux.config > @@ -0,0 +1,41 @@ > +CONFIG_BLK_DEV_INITRD=y > +CONFIG_ARCH_BCM4908=y The in-tree arm64 defconfig has support for CONFIG_ARCH_BCM4908, so can't we use that in-tree defconfig rather than carry a custom config file? If it's just because some drivers are missing, maybe provide them as a config fragment with just the symbols for those drivers. > diff --git a/board/broadcom/bcm4908/patches/linux/0001-arm64-don-t-issue-HVC-on-boot.patch b/board/broadcom/bcm4908/patches/linux/0001-arm64-don-t-issue-HVC-on-boot.patch > new file mode 100644 > index 0000000000..32e2b6330b > --- /dev/null > +++ b/board/broadcom/bcm4908/patches/linux/0001-arm64-don-t-issue-HVC-on-boot.patch > @@ -0,0 +1,32 @@ > +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= > +Date: Thu, 12 Aug 2021 11:52:42 +0200 > +Subject: [PATCH] arm64: don't issue HVC on boot > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit Please use a git-formated patch, which you get with: git format-patch --no-numbered [--SNIP--] > diff --git a/board/broadcom/bcm4908/readme.txt b/board/broadcom/bcm4908/readme.txt > new file mode 100644 > index 0000000000..b918ab8477 > --- /dev/null > +++ b/board/broadcom/bcm4908/readme.txt > @@ -0,0 +1,37 @@ > +BCM4908 > + > +Intro > +===== > + > +This readme covers BCM4908 family of Broadcom SoCs. It includes: > + - BCM4906 > + - BCM4908 > + - BCM49408 > + > +BCM4908 is commonly used in home routers by multiple vendors. > + > +Booting is handled using closed source CFE bootloader. There is no U-Boot (or > +any other) drop-in replacement. CFE supports booting over TFTP and from flash. Out of curiosity, and definitely not needed for that patch: is there no way to chain-boot? I.e. have CFE load a U-Boot, adn then that U-Boot load kernel and so on. > +How to build it > +=============== > + > + $ make broadcom_bcm4908_defconfig > + > + $ make > + > +How to boot using TFTP > +====================== > + > +When set into h (host) / c (tftp) mode CFE tries to boot image from a TFTP I am not sure I grasped what this "h (host) / c (tftp) mode" means. Can we expect users who have such a board to understand that? > +server. That allows booting buildroot built binaries. There are 3 files CFE > +looks for: kernel (Image), rootfs (cpio) and DTB. Exact filenames depend on CFE > +configuration. I would maybe add something like: Inspect the logs of your TFTP server to see what files are requested. Otherwise I think this readme is good. > +Booting from TFTP requires sharing 3 above files in TFTP server root dir. > + > +How to write to flash > +===================== > + > +Writing to flash requires using a custom BCM4908 firmware image format. It isn't > +supported yet. > diff --git a/configs/broadcom_bcm4908_defconfig b/configs/broadcom_bcm4908_defconfig > new file mode 100644 > index 0000000000..85307af053 > --- /dev/null > +++ b/configs/broadcom_bcm4908_defconfig > @@ -0,0 +1,9 @@ > +BR2_aarch64=y > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13.9" You will need to pin the linux-headers to that version too: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y However, why do you want to stick to 5.13.x? Can't we use a more recent version (5.15, or even the brand new 5.16)? Regards, Yann E. MORIN. > +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/broadcom/bcm4908/linux.config" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm4908/bcm4906-netgear-r8000p broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1 broadcom/bcm4908/bcm4908-asus-gt-ac5300" > +BR2_TARGET_ROOTFS_CPIO=y > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From festevam at gmail.com Thu Jan 13 23:14:46 2022 From: festevam at gmail.com (Fabio Estevam) Date: Thu, 13 Jan 2022 20:14:46 -0300 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220113220057.1db30808@windsurf> References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: Hi Heiko, On Thu, Jan 13, 2022 at 6:01 PM Thomas Petazzoni wrote: > Have you considered using extlinux.conf ? This is generally much easier > than a boot script, and removes the need to generate the boot script. I used your patch as a reference and modified it as per Thomas' suggestions to add Buildroot support for imx8mm-evk using only upstream components. Please find attached the patch. I haven't submitted it formally yet because the kernel does not always boot. Usually, it hangs at: mmc1 is current device Scanning mmc 1:1... Found /boot/extlinux/extlinux.conf Retrieving file: /boot/extlinux/extlinux.conf 1: imx8mm-evk-buildroot Retrieving file: /boot/Image append: root=/dev/mmcblk0p1 rootwait rw Retrieving file: /boot/imx8mm-evk.dtb Moving Image from 0x40480000 to 0x40600000, end=42770000 ## Flattened Device Tree blob at 43000000 Booting using the fdt blob at 0x43000000 Loading Device Tree to 000000004fff5000, end 000000004ffffd6b ... OK Starting kernel ... (hangs here) Looks like a U-Boot issue that I need to investigate. Thanks for your patch and hope this helps. -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-imx8mmevkmainline.patch Type: text/x-patch Size: 4730 bytes Desc: not available URL: From fontaine.fabrice at gmail.com Thu Jan 13 23:26:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 00:26:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-rtsp-server: fix introspection In-Reply-To: <20220113220429.3ae14160@windsurf> References: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> <20220113220429.3ae14160@windsurf> Message-ID: Le jeu. 13 janv. 2022 ? 22:04, Thomas Petazzoni a ?crit : > > Hello Fabrice, > > On Mon, 20 Dec 2021 10:33:11 +0100 > Fabrice Fontaine wrote: > > > Fix the following build failure with introspection: > > > > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 > > Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir > > error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 > > If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > > > Fixes: > > - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 > > > > Signed-off-by: Fabrice Fontaine > > Thanks applied, but see below. > > > +Signed-off-by: Fabrice Fontaine > > +[Upstream status: > > +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] > > You've had some feedback about resubmitting to the monorepo (which I > suppose is the new single repo that gstreamer developers are using > now). If not already done, could you follow-up on this? It is already merged: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822 > > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From fontaine.fabrice at gmail.com Thu Jan 13 23:29:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 00:29:03 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/gensio: add avahi optional dependency Message-ID: <20220113232903.318853-1-fontaine.fabrice@gmail.com> avahi-client is an optional dependency which is enabled by default since version 2.2.0 and https://github.com/cminyard/gensio/commit/5ab117c9743fd4719f610cf9f1ba45023cc25d7c Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Use BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT package/gensio/gensio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 389de1e263..266ac137a2 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING GENSIO_INSTALL_STAGING = YES +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),avahi) GENSIO_CONF_OPTS = \ --without-openipmi \ --without-swig \ -- 2.34.1 From aperez at igalia.com Thu Jan 13 23:37:58 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 14 Jan 2022 01:37:58 +0200 Subject: [Buildroot] [PATCH 1/1] package/kf5/kf5-extra-cmake-modules: do not build documentation Message-ID: <20220113233758.110264-1-aperez@igalia.com> Pass needed CMake options to disable generating documentations. The documentation is built using python-sphinx, which is not packaged in Buildroot. Prior to this change, if the build host would have a Python installation with the sphinx module installed the automatic detection tried to build documentation, which would fail in cases where the sphinxcontrib-qthelp package is missing from the host Python installation. The error message in this case was: Extension error: Could not import extension ecm (exception: cannot import name 'htmlescape' from 'sphinx.util.pycompat' (/usr/lib/python3.10/site-packages/sphinx/util/pycompat.py)) Signed-off-by: Adrian Perez de Castro --- .../kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk index 3c4281b960..ba2748456e 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk @@ -14,4 +14,9 @@ KF5_EXTRA_CMAKE_MODULES_DEPENDENCIES = host-pkgconf KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO +KF5_EXTRA_CMAKE_MODULES_CONF_OPTS += \ + -DBUILD_HTML_DOCS=OFF \ + -DBUILD_MAN_DOCS=OFF \ + -DBUILD_QTHELP_DOCS=OFF + $(eval $(cmake-package)) -- 2.34.1 From buildroot at busybox.net Thu Jan 13 23:42:27 2022 From: buildroot at busybox.net (buildroot at busybox.net) Date: 13 Jan 2022 15:42:27 -0800 Subject: [Buildroot] Waiting for the payment 13.1.2022 15:42:27 Message-ID: <20220113154227.F458BECF9A8A956A@busybox.net> An HTML attachment was scrubbed... URL: From buildroot at busybox.net Fri Jan 14 01:54:59 2022 From: buildroot at busybox.net (buildroot at busybox.net) Date: 13 Jan 2022 17:54:59 -0800 Subject: [Buildroot] Waiting for the payment 13.1.2022 17:54:59 Message-ID: <20220113175459.B99CEEE621D0B65E@busybox.net> An HTML attachment was scrubbed... URL: From festevam at gmail.com Fri Jan 14 02:45:55 2022 From: festevam at gmail.com (Fabio Estevam) Date: Thu, 13 Jan 2022 23:45:55 -0300 Subject: [Buildroot] [PATCH v2] configs/imx8mmevk: new defconfig Message-ID: <20220114024555.319448-1-festevam@gmail.com> Add support for imx8mmevk_defconfig that allows booting kernel, U-Boot and TFA from the upstream repositories. Signed-off-by: Fabio Estevam --- Changes since v1: - Also use TF-A and U-Boot upstream versions. DEVELOPERS | 1 + board/freescale/imx8mmevk/genimage.cfg | 16 ++++++++ board/freescale/imx8mmevk/readme.txt | 6 +++ .../boot/extlinux/extlinux.conf | 4 ++ configs/imx8mmevk_defconfig | 39 +++++++++++++++++++ 5 files changed, 66 insertions(+) create mode 100644 board/freescale/imx8mmevk/genimage.cfg create mode 100644 board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf create mode 100644 configs/imx8mmevk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..e19072a14e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -839,6 +839,7 @@ F: configs/imx6ullevk_defconfig F: configs/imx6ulpico_defconfig F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig +F: configs/imx8mmevk_defconfig F: configs/imx8mqevk_defconfig F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig diff --git a/board/freescale/imx8mmevk/genimage.cfg b/board/freescale/imx8mmevk/genimage.cfg new file mode 100644 index 0000000000..3a83aa1f03 --- /dev/null +++ b/board/freescale/imx8mmevk/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33k + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 8M + } +} diff --git a/board/freescale/imx8mmevk/readme.txt b/board/freescale/imx8mmevk/readme.txt index 7b69405d30..a8e80a48f9 100644 --- a/board/freescale/imx8mmevk/readme.txt +++ b/board/freescale/imx8mmevk/readme.txt @@ -10,8 +10,14 @@ Build First, configure Buildroot for the i.MX8MM EVK board: +If you want to use the NXP kernel: + make freescale_imx8mmevk_defconfig +Or if you want to use a mainline kernel: + + make imx8mmevk_defconfig + Build all components: make diff --git a/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..0ba2e4cbfc --- /dev/null +++ b/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +Label imx8mm-evk-buildroot + kernel /boot/Image + devicetree /boot/imx8mm-evk.dtb + append root=/dev/mmcblk1p1 rootwait rw diff --git a/configs/imx8mmevk_defconfig b/configs/imx8mmevk_defconfig new file mode 100644 index 0000000000..170b8d273b --- /dev/null +++ b/configs/imx8mmevk_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_OVERLAY="board/freescale/imx8mmevk/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/imx8mmevk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="240M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30890000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y -- 2.25.1 From festevam at gmail.com Fri Jan 14 02:47:27 2022 From: festevam at gmail.com (Fabio Estevam) Date: Thu, 13 Jan 2022 23:47:27 -0300 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: On Thu, Jan 13, 2022 at 8:14 PM Fabio Estevam wrote: > I haven't submitted it formally yet because the kernel does not always boot. > > Usually, it hangs at: > > mmc1 is current device > Scanning mmc 1:1... > Found /boot/extlinux/extlinux.conf > Retrieving file: /boot/extlinux/extlinux.conf > 1: imx8mm-evk-buildroot > Retrieving file: /boot/Image > append: root=/dev/mmcblk0p1 rootwait rw > Retrieving file: /boot/imx8mm-evk.dtb > Moving Image from 0x40480000 to 0x40600000, end=42770000 > ## Flattened Device Tree blob at 43000000 > Booting using the fdt blob at 0x43000000 > Loading Device Tree to 000000004fff5000, end 000000004ffffd6b ... OK > > Starting kernel ... > (hangs here) > > Looks like a U-Boot issue that I need to investigate. With kernel 5.15.14 it boots fine, so I submitted the patch with 5.15 instead of 5.16. I will investigate the 5.16 boot problem later. From james.hilliard1 at gmail.com Fri Jan 14 04:51:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 13 Jan 2022 21:51:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220113204451.23849f67@windsurf> References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220113204451.23849f67@windsurf> Message-ID: On Thu, Jan 13, 2022 at 12:44 PM Thomas Petazzoni wrote: > > Hello James, > > On Wed, 12 Jan 2022 13:39:39 -0700 > James Hilliard wrote: > > > Currently the qmake gcc sysrootify path logic causes issues with > > per-package directories, disable automatic gcc sysroot for qt5base > > install and override all qt.conf paths manually to point to their > > correct locations. > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > instead of the HOST_DIR for cross compilation to work. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > package/qt5/qt5base/qt5base.mk | 2 ++ > > 2 files changed, 17 insertions(+), 3 deletions(-) > > Do you have a bit more details on what this changing, i.e how this is > making things better? > > I have no doubt that it can make things better, but it would be useful > in the commit log to have extra details on what specific > details/aspects it is fixing/improving. Well it seems to prevent invalid paths causing these errors: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 > > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From doug at schmorgal.com Fri Jan 14 05:07:33 2022 From: doug at schmorgal.com (Doug Brown) Date: Thu, 13 Jan 2022 21:07:33 -0800 Subject: [Buildroot] [PATCH 1/2] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 Message-ID: <20220114050734.497034-1-doug@schmorgal.com> This version fixes a bug that prevents the user from switching from one access point to another. Signed-off-by: Doug Brown --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 04bc776a07..1dad7154b4 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz +sha256 1cd658742ce10b21c92877e09cecc98880680d5f150de3845553005abc542977 rtl8723bu-19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index c35fad5832..e490bddf09 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 +RTL8723BU_VERSION = 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) -- 2.25.1 From doug at schmorgal.com Fri Jan 14 05:07:34 2022 From: doug at schmorgal.com (Doug Brown) Date: Thu, 13 Jan 2022 21:07:34 -0800 Subject: [Buildroot] [PATCH 2/2] package/rtl8723bu: fix firmware install path In-Reply-To: <20220114050734.497034-1-doug@schmorgal.com> References: <20220114050734.497034-1-doug@schmorgal.com> Message-ID: <20220114050734.497034-2-doug@schmorgal.com> The rtl8723b_fw.bin file installed by this package is not actually used by this driver at all. It is used by the btrtl Bluetooth driver in the mainline kernel. The mainline btrtl driver looks for the file in /lib/firmware/rtl_bt rather than /lib/firmware/rtlwifi. This driver's Makefile has an install target that confirms the correct destination firmware directory. Signed-off-by: Doug Brown --- package/rtl8723bu/rtl8723bu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index e490bddf09..838bbedb74 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -13,7 +13,7 @@ RTL8723BU_MODULE_MAKE_OPTS = \ KSRC=$(LINUX_DIR) define RTL8723BU_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtlwifi/rtl8723b_fw.bin + $(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723b_fw.bin endef $(eval $(kernel-module)) -- 2.25.1 From jose.pekkarinen at unikie.com Fri Jan 14 05:50:29 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Fri, 14 Jan 2022 07:50:29 +0200 Subject: [Buildroot] [PATCH] package/minijail: new package In-Reply-To: <20220113205129.585e3ce6@windsurf> References: <20220113100506.89687-1-jose.pekkarinen@unikie.com> <20220113205129.585e3ce6@windsurf> Message-ID: On Thu, Jan 13, 2022 at 9:51 PM Thomas Petazzoni wrote: > > Hello Jos?, > > Thanks for this new iteration! Comments below. > > On Thu, 13 Jan 2022 12:05:06 +0200 > Jos? Pekkarinen wrote: > > > This patch adds package minijail > > > > Minijail depends in a toolchain different from > > uclibc thanks to it's lack of support for prlimits. > > > > Signed-off-by: Jos? Pekkarinen > > --- > > [ v1 -> v2 ] > > - Fixed hash file > > - Fixed static assert patch > > - Depend in toolchain distinct of uclibc > > - Remove redundant host libpcap dependency > > - Remove redundant parenthesis on MINIJAIL_BUILD_CMDS > > If this is v2, your patch should have been generated with "git > format-patch -v2", so that its title is [PATCH v2] and not just [PATCH]. Ack. > > diff --git a/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch > > new file mode 100644 > > index 0000000000..ff85995114 > > --- /dev/null > > +++ b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch > > @@ -0,0 +1,35 @@ > > +From 8a6d5a1c48b85fb49f0d68ec31ecc51fd22e7201 Mon Sep 17 00:00:00 2001 > > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > > +Date: Wed, 12 Jan 2022 17:09:27 +0200 > > +Subject: [PATCH] Substitute static_assert with _Static_assert > > +MIME-Version: 1.0 > > +Content-Type: text/plain; charset=UTF-8 > > +Content-Transfer-Encoding: 8bit > > + > > +Substitute static_assert with _Static_assert > > + > > +static_assert behaves differently for uclibc > > +toolchains. Substituting it with the standard > > +_Static_assert builds on all toolchains tested. > > So this is fixing a problem affecting uClibc toolchains, and below you > exclude uClibc toolchains ? Does it make sense to have this patch ? Ack. > > diff --git a/package/minijail/Config.in b/package/minijail/Config.in > > new file mode 100644 > > index 0000000000..24d307ed54 > > --- /dev/null > > +++ b/package/minijail/Config.in > > @@ -0,0 +1,12 @@ > > +config BR2_PACKAGE_MINIJAIL > > + bool "minijail" > > + depends on !BR2_STATIC_LIBS # dlopen() > > + depends on !BR2_TOOLCHAIN_USES_UCLIBC > > Please add a comment on top of this that explains why uClibc toolchains > are excluded (prlimit not implemented). Ack. > > + select BR2_PACKAGE_LIBCAP > > You need to replicate: > > depends on BR2_USE_MMU > > from the list of libcap dependencies. > > > + help > > + Minijail is a sandboxing tool maintained by google. > > + > > + https://google.github.io/minijail/ > > + > > +comment "minijail needs a glibc or musl toolchain with dynamic library support" > > and also have it here. Ack. > > + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC > > diff --git a/package/minijail/minijail.hash b/package/minijail/minijail.hash > > new file mode 100644 > > index 0000000000..d9f497a86c > > --- /dev/null > > +++ b/package/minijail/minijail.hash > > @@ -0,0 +1,5 @@ > > +# Locally computed from https://github.com/google/minijail/releases/ > > +sha256 1ee5a5916491a32c121c7422b4d8c16481c0396a3acab34bf1c44589dcf810ae linux-v17.tar.gz > > + > > +# Locally computed > > +sha256 c6f439c5cf07263f71f01d29b79c79172ee529088e51ab434b22baad0988fe57 LICENSE > > diff --git a/package/minijail/minijail.mk b/package/minijail/minijail.mk > > new file mode 100644 > > index 0000000000..78898865fb > > --- /dev/null > > +++ b/package/minijail/minijail.mk > > @@ -0,0 +1,28 @@ > > +################################################################################ > > +# > > +# minijail > > +# > > +################################################################################ > > + > > +MINIJAIL_VERSION = linux-v17 > > +MINIJAIL_SOURCE = $(MINIJAIL_VERSION).tar.gz > > +MINIJAIL_SITE = "https://github.com/google/minijail/archive/refs/tags" > > Please use the following lines instead: > > MINIJAIL_VERSION = 17 > MINIJAIL_SITE = $(call github,google,minijail,linux-v$(MINIJAIL_VERSION)) > > You will have to adjust the .hash file accordingly. > > > +MINIJAIL_LICENSE = BSD-Style > > This is not a license. See https://spdx.org/licenses/ for the list of > license identifiers that are valid. It's license doesn't reference any hint to the existing in spdx, identifying an equivalent is lawyers work. > > +MINIJAIL_LICENSE_FILES = LICENSE > > +MINIJAIL_DEPENDENCIES=libcap > > Spaces around "=". Ack. > > +define MINIJAIL_BUILD_CMDS > > + cd $(@D); \ > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) CC="$(TARGET_CC)" > > No need to cd into $(@D), since you run make with -C $(@D). Please drop > the $(d) which is an empty variable. Also please use > $(TARGET_CONFIGURE_OPTS). So something like this: > > $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) > > I'm pretty sure I already made this comment on a previous version, or > perhaps on another package contributed by you. Yes, sorry, I failed to find the email related. > Could you take into account those comments and send a v3 ? It should be > good to merge then. Thanks a lot! Happy to do so. Thanks! Jos?. From thomas.petazzoni at bootlin.com Fri Jan 14 07:03:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 14 Jan 2022 07:03:58 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-13 Message-ID: <20220114070403.55225415AD@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-13 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 64 | 7 | 0 | 71 | 2021.11.x | 24 | 10 | 0 | 34 | master | 100 | 64 | 0 | 164 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 10 bluez5_utils-5.63 | 7 unknown | 7 frr-8.1 | 5 guile-3.0.7 | 3 ksmbd-tools-3.4.3 | 3 btrfs-progs-5.15.1 | 2 host-riscv-isa-sim-1.1.0 | 2 libglvnd-1.3.2 | 2 libqb-2.0.3 | 2 mesa3d-21.3.3 | 2 wavemon-0.9.4 | 2 babeltrace2-2.0.4 | 1 dnsmasq-2.86 | 1 docker-proxy-55685ba49593e6... | 1 efl-1.26.0 | 1 gstd-0.13.0 | 1 gupnp-av-0.14.0 | 1 gvfs-1.48.1 | 1 host-btrfs-progs-5.15.1 | 1 libwpe-1.12.0 | 1 log4cxx-0.12.0 | 1 nodejs-14.18.2 | 1 piglit-2affee53f3ad7a96f5b3... | 1 poppler-21.12.0 | 1 pulseview-0.4.2 | 1 rtorrent-0.9.8 | 1 sg3_utils-1.47 | 1 vlc-3.0.16 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | babeltrace2-2.0.4 | NOK | http://autobuild.buildroot.net/results/f9ea3f142d7ccce481cfc6daa47ae641c3f11402 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/881d4d30080eeec4de252c0c06b7914ea5f7d6a8 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/eb5c4d9f8c0b915bc46f4ef8ad9e89a21b6aec24 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e2d5ec0be1e760bb361958c6ebf1e480b900c259 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e28801b8053e9d2a7a9609a6bbf415c17a206788 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d79f46c3c7be7e52fa4642446b15b27a8ebdd32a | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/23bddbd290d13196c6bd0d2514353d0eb2604a4e | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/542f372a0dd342a1b22371d21ce347c0ba88a8e3 | mips64el | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/e0526b8591a20c5db13814fb166d459b87bb1ea7 | ORPH powerpc64 | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/b630dbd078656a974c6ac9645b2e87279ef2adc0 | ORPH arm | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/ecf26d37f2aefa35e584a4f23f053119b4fb4704 | i686 | docker-proxy-55685ba49593e6... | NOK | http://autobuild.buildroot.net/results/36ebb9ace8b69120e696ccc1688c5d695125f462 | mipsel | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/03c24622c043c949ec7a743f9515f70ef9421594 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/c37813bda8f69c3b8eabd9a77f63998f0511d407 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/76372be625e03d09f3f54e613d1e2a77138cbee8 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5bc31d1e6aab27eb7f05e32f891cf40014f8cdbc | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/85ac84b34946609895e47d435aef61f410781dbd | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/bdbaa6155ff57ab01d2b4cb52de813a1ea528b02 | m68k | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/2f1214b2af494e51874e6cfd419cd4c6c5c0d3ac | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/696e89593e9fdaa97dd4fb192e77cf87169414d9 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/b0a6143f19145b00a1023271207676255427cbf0 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c7790a1799868bd03952a69d20b2c592fd546217 | ORPH s390x | gupnp-av-0.14.0 | NOK | http://autobuild.buildroot.net/results/64837bf9611377fe1935c6ff4e52715b58ed75ed | arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/9922ac2d5301db3a6e9a735078914f9f7861428c | ORPH i686 | host-btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/5cba551bde76ebe1749a278497a04a6d69e7b7c6 | ORPH powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/63c7c2466b8269a2708ba6a2ad7ee11b6f03e88c | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/d1ec407d3a9106be1271e4897d6f578d501439fe | arm | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/afd519cb2bd8e4505746f7f809cf309d0ca9901e | sh4 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/9794b9a72bcdc23a60f745dfb2b783d3421dd62d | riscv64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/638c303be9fa82ccb353be6cfe2a81c0d634a1e5 | sparc | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/a204953020a714057ec6690e63a3ad8ac621acd5 | ORPH arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/1dca9af43b534c537d8ab922d40ffc1635556333 | ORPH or1k | libqb-2.0.3 | NOK | http://autobuild.buildroot.net/results/6a8c4efd591929b9b22d793cc8f6249e6ae9045d | or1k | libqb-2.0.3 | NOK | http://autobuild.buildroot.net/results/e03782073fae2b1bde84393a73be5cbd59d67d9d | aarch64 | libwpe-1.12.0 | NOK | http://autobuild.buildroot.net/results/fdca71061eb938599e356fe6eed5f58a90d62259 | arc | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/6058173d7997a5632f80f33a1eba9dec47122095 | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/e4946b1c214fa30cfc63ba41755a7fb4c4661fc1 | mipsel | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/6433628db38e3828f2d37cf48ac7a19d0b6c441c | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/a510dfcc34fa12a8c0911525a1ecd6bef7402fc5 | mipsel | piglit-2affee53f3ad7a96f5b3... | NOK | http://autobuild.buildroot.net/results/ff6efa43102a56bb4b87401cd425a5241f0920cd | microblazeel | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/96e77ddba5042ba4dacb16b328fc298a4f00f49a | arm | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/9a7d48c3bb1cafe537d6e5a2be3da8a447a80b03 | arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/c8c8669281265d21fab8029b1f793fe93ef857b9 | ORPH aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c5094c1088f21eccc8ce463fbf86282a19bc2bac | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/aa20d0b3dd74957cfd72dc314b9a40e449eaa6cd | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/347f87cbc46f1207c9f075b580920b98338ea9a6 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6df8e78f518f912eb37266026de07856e9bb7b29 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d8a78ea616cdedd9cfd6c31da98ecf509acea40a | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/148c21e0207fef3afaaf0e10cfd5f3b50a7a4a09 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2972885ea76b1c9dc98b7d963b9b9ecb7721c082 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9a33fb68c758678843f439ee402ef8ff2a7d74ff | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/47f303c17b848d33afd9e41fe29816e18671d984 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b839f8b4dc06ebf42fa9a75e4887cb27ca20fdc4 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/c49300d12a209b18f41d389f092324592b881277 | arm | unknown | NOK | http://autobuild.buildroot.net/results/8bc3414169520fe6a06297cd819c16b5fa614c30 | arc | unknown | NOK | http://autobuild.buildroot.net/results/599263067fbb2c334289d4899c0e7a07cc46de80 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/ec70ce7988b9e78cdecd9cba1ae4ee6de948e48e | arm | unknown | NOK | http://autobuild.buildroot.net/results/7f7e97f14537db0b0fcbc48514c07876867a9cd3 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/95cd4e8faa4e1ca3c60df173232f39aa51cc4508 | arc | unknown | NOK | http://autobuild.buildroot.net/results/93cb507002b852523f29ba84bf42645d10f6642b | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/60db7598fc7b80f983b97b66c3a3ea24ff8756e6 | m68k | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/62a9d11157c283e4e1f26b6e0d097e40c9c5e29d | mips | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/3b4b22e0a5e5486b444cb0bb835c08f05255fa9b | m68k | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/d5f88660cbc0854b6690e004e3c409038224f971 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 1 libcoap-4.2.1 | 1 netdata-1.21.1 | 1 openal-1.20.1 | 1 rocksdb-6.13.3 | 1 suricata-6.0.4 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c415a502fc2672528a1a8ba1c62591e9d8ff1a17 | riscv32 | libcoap-4.2.1 | NOK | http://autobuild.buildroot.net/results/f775ea0d8062da0707cd64ba851a8cd2f87a5de8 | riscv32 | netdata-1.21.1 | NOK | http://autobuild.buildroot.net/results/845e6fd2797d85cafae5bdb2fe8074e3714d7d66 | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/13b16d0e88dbd87ec34e5413caa22c0cf320b0d9 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/790a270c6ccd2d4f5cf0dc329733e62124caddfc | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/0c02128071d73b026f8f23bd6f4837689946c1d3 | arm | unknown | NOK | http://autobuild.buildroot.net/results/8677a4bf0f00e7a87538fd0d2488fcf681d4c2f1 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 4 libnss-3.73 | 2 libqmi-1.30.2 | 1 ndisc6-1.0.5 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/0308d2757a677fff4a8880b239cd7f6183b87b1c | powerpc | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/d02000b72a5855239d7f2121158feb7c9b81edb4 | riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/a54f1533f81ef29e8eb65045eb6ac68d6ce92ea3 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/58f5c33e930a614dfc120e07f83cbc6af284de0e | or1k | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/2f8ad346f317dbf8f3370e3e9707be29fb26e872 | aarch64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/53189d7bef3601bc8a118697aad08135565d7174 | xtensa | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/78c6b80c06f17ffffefa50ab0615295468705512 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/4e5db1f5be1e0a1864f0246de502dff1d4b1f0bc | ORPH riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/4e40ba10f6039e674e2cfdfa5d9b1c112d12d749 | microblazeel | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/3a94ac6f9bc57cd71979021b423af71dc1f4a4c5 | -- http://autobuild.buildroot.net From jose.pekkarinen at unikie.com Fri Jan 14 07:08:52 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?q?Jos=C3=A9=20Pekkarinen?=) Date: Fri, 14 Jan 2022 09:08:52 +0200 Subject: [Buildroot] [PATCH v4] package/opensc: new package Message-ID: <20220114070852.481719-1-jose.pekkarinen@unikie.com> The patch will add package opensc. sourcery-arm toolchain triggers strict aliasing rules that upstream finds no easy way to fix. It is disabled for now until a proper solution is found upstream. Signed-off-by: Jos? Pekkarinen --- [ v1 -> v2 ] Fix hash file, and patches messages. [ v2 -> v3 ] - Remove strict aliasing patch - Add approved patch for maybe uninitialized errors - Disable sourcery-arm toolchain [ v3 -> v4 ] - Enable libressl - Added cascade dependencies - disabled strict building DEVELOPERS | 1 + package/Config.in | 1 + .../0001-Fix-maybe-uninitialized-errors.patch | 83 +++++++++++++++++++ package/opensc/Config.in | 17 ++++ package/opensc/opensc.hash | 5 ++ package/opensc/opensc.mk | 15 ++++ 6 files changed, 122 insertions(+) create mode 100644 package/opensc/0001-Fix-maybe-uninitialized-errors.patch create mode 100644 package/opensc/Config.in create mode 100644 package/opensc/opensc.hash create mode 100644 package/opensc/opensc.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55f37dfe62..45e7192e65 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1515,6 +1515,7 @@ F: support/testing/tests/package/test_zfs.py N: Jos? Pekkarinen F: package/alfred/ F: package/bmx7/ +F: package/opensc/ F: package/python-aexpect/ F: package/softhsm2/ F: support/testing/tests/package/sample_python_aexpect.py diff --git a/package/Config.in b/package/Config.in index a1924f96df..b40909ef89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1643,6 +1643,7 @@ menu "Hardware handling" source "package/mtdev/Config.in" source "package/ne10/Config.in" source "package/neardal/Config.in" + source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" source "package/rpi-rgb-led-matrix/Config.in" diff --git a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch new file mode 100644 index 0000000000..01b7a39818 --- /dev/null +++ b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch @@ -0,0 +1,83 @@ +From bcb39d6f4d2dee6beb035cb2f3618174ec1cb2b0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 13:54:26 +0200 +Subject: [PATCH] Fix maybe uninitialized errors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PR: https://github.com/OpenSC/OpenSC/pull/2466 + +Signed-off-by: Jos? Pekkarinen +--- + src/libopensc/pkcs15-coolkey.c | 12 ++++++------ + src/pkcs15init/pkcs15-asepcos.c | 2 +- + src/tools/opensc-explorer.c | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c +index 586475dd..15684cef 100644 +--- a/src/libopensc/pkcs15-coolkey.c ++++ b/src/libopensc/pkcs15-coolkey.c +@@ -147,9 +147,9 @@ coolkey_find_matching_cert(sc_card_t *card, sc_cardctl_coolkey_object_t *in_obj, + static int + coolkey_get_attribute_ulong(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, CK_ULONG *value) + { +- const u8 *val; +- size_t val_len; +- u8 data_type; ++ const u8 *val = NULL; ++ size_t val_len = 0; ++ u8 data_type = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, &data_type); +@@ -168,8 +168,8 @@ static int + coolkey_get_attribute_boolean(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE attr_type) + { + int r; +- const u8 *val; +- size_t val_len; ++ const u8 *val = NULL; ++ size_t val_len = 0; + + r = coolkey_get_attribute(card, obj, attr_type, &val, &val_len, NULL); + if (r < 0) { +@@ -186,7 +186,7 @@ static int + coolkey_get_attribute_bytes(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, u8 *data, size_t *data_len, size_t max_data_len) + { + const u8 *val; +- size_t val_len; ++ size_t val_len = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, NULL); +diff --git a/src/pkcs15init/pkcs15-asepcos.c b/src/pkcs15init/pkcs15-asepcos.c +index d7122012..bc0efb5c 100644 +--- a/src/pkcs15init/pkcs15-asepcos.c ++++ b/src/pkcs15init/pkcs15-asepcos.c +@@ -221,7 +221,7 @@ static int asepcos_do_store_pin(sc_profile_t *profile, sc_card_t *card, + { + sc_file_t *nfile = NULL; + u8 buf[64], sbuf[64], *p = buf, *q = sbuf; +- int r, akn; ++ int r, akn = 0; + + if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) + return SC_ERROR_OBJECT_NOT_VALID; +diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c +index 9ec4daa1..04efdf8f 100644 +--- a/src/tools/opensc-explorer.c ++++ b/src/tools/opensc-explorer.c +@@ -2472,7 +2472,7 @@ int main(int argc, char *argv[]) + char *line; + int cargc; + char *cargv[260]; +- int multiple; ++ int multiple = 0; + struct command *cmd; + char prompt[3*SC_MAX_PATH_STRING_SIZE]; + +-- +2.25.1 + diff --git a/package/opensc/Config.in b/package/opensc/Config.in new file mode 100644 index 0000000000..1b1ba0d38e --- /dev/null +++ b/package/opensc/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_OPENSC + bool "opensc" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_PCSC_LITE + select BR2_PACKAGE_OPENSSL + help + OpenSC provides a set of libraries and utilities to work + with smart cards. + + https://github.com/OpenSC/OpenSC/wiki + +comment "opensc needs a toolchain with dynamic library support distinct from sourcery-arm" + depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash new file mode 100644 index 0000000000..517cfe503a --- /dev/null +++ b/package/opensc/opensc.hash @@ -0,0 +1,5 @@ +# Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ +sha256 8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 opensc-0.22.0.tar.gz + +# Computed locally +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk new file mode 100644 index 0000000000..c948bc2c79 --- /dev/null +++ b/package/opensc/opensc.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# opensc +# +################################################################################ + +OPENSC_VERSION = 0.22.0 +OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) +OPENSC_LICENSE = LGPL-2.1+ +OPENSC_LICENSE_FILES = COPYING +OPENSC_DEPENDENCIES = openssl pcsc-lite +OPENSC_INSTALL_STAGING = YES +OPENSC_CONF_OPTS="--disable-strict" + +$(eval $(autotools-package)) -- 2.25.1 From fontaine.fabrice at gmail.com Fri Jan 14 07:43:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 08:43:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs threads Message-ID: <20220114074309.356873-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: In file included from ../src/util/glvnd_pthread.c:39: ../src/util/glvnd_pthread.h:33:10: fatal error: pthread.h: No such file or directory 33 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/63624bafc6f7a225d4db0667df977fd6141561aa Signed-off-by: Fabrice Fontaine --- package/libglvnd/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index cd19fde582..d020c21465 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS help The GL Vendor-Neutral Dispatch library @@ -45,6 +46,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES endif -comment "libglvnd needs a toolchain w/ dynamic library" +comment "libglvnd needs a toolchain w/ dynamic library, threads" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS -- 2.34.1 From giulio.benetti at benettiengineering.com Fri Jan 14 08:45:06 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 14 Jan 2022 09:45:06 +0100 Subject: [Buildroot] [PATCH] package/poppler: fix build failure due to gcc bug 68485 Message-ID: <20220114084506.776644-1-giulio.benetti@benettiengineering.com> The bullet package exhibits gcc bug 68485 when built for the Microblaze architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_68485=y like we already do for BR2_TOOLCHAIN_HAS_GCC_BUG_85180=y. Fixes: http://autobuild.buildroot.net/results/96e77ddba5042ba4dacb16b328fc298a4f00f49a/ Signed-off-by: Giulio Benetti --- package/poppler/poppler.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 9e9bfc9cba..18c044a9f6 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -131,4 +131,12 @@ else POPPLER_CONF_OPTS += -DUSE_FLOAT=ON endif +POPPLER_CXXFLAGS = $(TARGET_CXXCFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +POPPLER_CXXFLAGS += -O0 +endif + +POPPLER_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(POPPLER_CXXFLAGS)" + $(eval $(cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 14 09:15:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 14 Jan 2022 02:15:52 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix pkg-config prefix Message-ID: <20220114091552.3815459-1-james.hilliard1@gmail.com> By default qmake generates pkg-config files with QT_INSTALL_PREFIX as the prefix, this however contains a full sysroot path which breaks per-package directories, use the override QMAKE_PKGCONFIG_PREFIX to set the pkg-config prefix to /usr. Signed-off-by: James Hilliard --- package/qt5/qt5base/qmake.conf.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index 024c074928..03bd825c8a 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -8,6 +8,9 @@ include(../common/linux_device_pre.conf) +# fix pkg-config prefix +QMAKE_PKGCONFIG_PREFIX = /usr + # modifications to g++-unix.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ -- 2.25.1 From aperez at igalia.com Fri Jan 14 09:26:35 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 14 Jan 2022 11:26:35 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: add upstream patch to fix vapigen support In-Reply-To: <20220113174130.GI1477939@scaer> References: <20220113115704.2354150-1-aperez@igalia.com> <20220113174130.GI1477939@scaer> Message-ID: <20220114112635.GB546958@momiji> Hello Yann, On Thu, 13 Jan 2022 18:41:30 +0100 "Yann E. MORIN" wrote: > On 2022-01-13 13:57 +0200, Adrian Perez de Castro spake thusly: > > Import an upstream patch which fixes a typo in the Meson source code > > which caused a wrong command line option to be passed to the vapigen > > program. This fixes the build for all packages which use Meson and > > provide API bindings generated using said tool. > > > > Signed-off-by: Adrian Perez de Castro > > --- > > ...x-typo-in-vapigen-option-metadatadir.patch | 31 +++++++++++++++++++ > > 1 file changed, 31 insertions(+) > > create mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > > > > diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > > new file mode 100644 > > index 0000000000..f8cc30ec29 > > --- /dev/null > > +++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > > @@ -0,0 +1,31 @@ > > +From 5385e4c0a4dd4f9cf1e15c9c321b22d19cc0011a Mon Sep 17 00:00:00 2001 > > +From: Michal Vasilek > > +Date: Mon, 10 Jan 2022 21:27:30 +0100 > > +Subject: [PATCH] gnome: fix typo in vapigen option metadatadir > > + > > +This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and > > +can cause a build failure, because --metadatdir is not a valid vapigen > > +option. > > + > > +Signed-off-by: Adrian Perez de Castro > > +Upstream-Status: https://github.com/mesonbuild/meson/pull/9806 > > When an upstream PR/MR has been merged, we prefer that an actual > backport is made, so that the patch has the proper upstream hash, > which helps in the future ases if a version bump includes that > commit. > > So I've made that a proper backport: > > $ git format-patch -n1 --start-number=3 --no-numbered 9952446a2 Neat Git command, today I have learnt about a few things that format-patch can do! Thanks for merging both this and the gcr patch :) Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From patrickdepinguin at gmail.com Fri Jan 14 09:33:18 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Fri, 14 Jan 2022 10:33:18 +0100 Subject: [Buildroot] [PATCH 4/4] perf: fix compilation in case of i386 userspace with x86_64 kernel In-Reply-To: <55296fff-7a19-3691-22e2-52095bc5cc47@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-5-patrickdepinguin@gmail.com> <55296fff-7a19-3691-22e2-52095bc5cc47@gmail.com> Message-ID: Hi Romain, El jue, 13 ene 2022 a las 23:17, Romain Naour () escribi?: > > Hello Thomas, > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > If a 64-bit kernel is combined with 32-bit userspace, and this is achieved > > via a multilib toolchain that defaults to 64-bit with '-m32' in > > BR2_TARGET_OPTIMIZATION, the '-ld' command will still default to > > 64-bit output. > > > > In this case, packages that use 'ld' directly need to be instructed to use > > the correct ABI via the '-m' parameter. 'perf' is one such package. > > > > Signed-off-by: Thomas De Schampheleire > > --- > > package/linux-tools/linux-tool-perf.mk.in | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > > index 4e28129f50..b84b5fd415 100644 > > --- a/package/linux-tools/linux-tool-perf.mk.in > > +++ b/package/linux-tools/linux-tool-perf.mk.in > > @@ -45,6 +45,9 @@ PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32ltsmipn32" > > else > > PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf64ltsmip" > > endif > > +# case for x86 toolchain that defaults to 64-bit output > > +else ifeq ($(BR2_i386):$(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),y:x86_64) > > +PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf_i386" > > Do you know why the ARM toolchain doesn't need a similar handling ? If you are referring to the ARM toolchain that I am using, then yes. For Aarch64, it seems not possible to produce a multilib toolchain supporting ARM (32-bit) and Aarch64 (64-bit). I don't know the details about why. In order to support that case, we actually pack two separate toolchains into one 'toolchain' archive, and point Buildroot to the 32-bit one (the top-level directories bin/ lib/ etc. correspond to the 32-bit one). For Linux/u-boot we specifically point to the 64-bit toolchain. So since they are separate toolchains, there is no '-m32' anywhere: either toolchain has a fixed bitness. How we could handle this situation in Buildroot is to be discussed. These changes are not in this series. Best regards, Thomas From michael.opdenacker at bootlin.com Fri Jan 14 09:30:49 2022 From: michael.opdenacker at bootlin.com (Michael Opdenacker) Date: Fri, 14 Jan 2022 10:30:49 +0100 Subject: [Buildroot] [PATCH] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description Message-ID: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> This clarifies that custom DTSI files can be passed too, and that the files are compiled after being copied to the Linux kernel source tree. Signed-off-by: Michael Opdenacker --- linux/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 582f37ba7c..048a7fbfd0 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -411,9 +411,10 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH string "Out-of-tree Device Tree Source file paths" help - Path to the out-of-tree device tree source files. - You can provide a list of dts paths to copy and - build, separated by spaces. + 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 compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" -- 2.25.1 From heiko.thiery at gmail.com Fri Jan 14 09:39:26 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 14 Jan 2022 10:39:26 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: Hi Fabio, Am Fr., 14. Jan. 2022 um 00:14 Uhr schrieb Fabio Estevam : > > Hi Heiko, > > On Thu, Jan 13, 2022 at 6:01 PM Thomas Petazzoni > wrote: > > > Have you considered using extlinux.conf ? This is generally much easier > > than a boot script, and removes the need to generate the boot script. > > I used your patch as a reference and modified it as per Thomas' > suggestions to add Buildroot support for imx8mm-evk using only > upstream components. > > Please find attached the patch. > > I haven't submitted it formally yet because the kernel does not always boot. Can you tell me how often this happens? I updated my defconfig with the comments from Thomas. Now I bootet the board with that several times and can not see the behavior you describe. > > Usually, it hangs at: > > mmc1 is current device > Scanning mmc 1:1... > Found /boot/extlinux/extlinux.conf > Retrieving file: /boot/extlinux/extlinux.conf > 1: imx8mm-evk-buildroot > Retrieving file: /boot/Image > append: root=/dev/mmcblk0p1 rootwait rw > Retrieving file: /boot/imx8mm-evk.dtb > Moving Image from 0x40480000 to 0x40600000, end=42770000 > ## Flattened Device Tree blob at 43000000 > Booting using the fdt blob at 0x43000000 > Loading Device Tree to 000000004fff5000, end 000000004ffffd6b ... OK > > Starting kernel ... > (hangs here) > > Looks like a U-Boot issue that I need to investigate. > > Thanks for your patch and hope this helps. Your welcome, -- Heiko From heiko.thiery at gmail.com Fri Jan 14 09:42:34 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 14 Jan 2022 10:42:34 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220113220057.1db30808@windsurf> References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: Hi Thomas, Am Do., 13. Jan. 2022 um 22:00 Uhr schrieb Thomas Petazzoni : > > Hello, > > On Wed, 12 Jan 2022 19:48:22 +0100 > Heiko Thiery wrote: > > > diff --git a/board/kontron/bl-imx8mm/boot.cmd b/board/kontron/bl-imx8mm/boot.cmd > > new file mode 100644 > > index 0000000000..7ce3198dbc > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/boot.cmd > > @@ -0,0 +1,8 @@ > > +echo "Root File Sytem on MMC${devnum}" > > +setenv rootfs /dev/mmcblk${devnum}p1 > > +setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} > > + > > +load ${devtype} ${devnum} ${kernel_addr_r} boot/Image > > +load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mm-kontron-n801x-s.dtb > > + > > +booti ${kernel_addr_r} - ${fdt_addr_r} > > Have you considered using extlinux.conf ? This is generally much easier > than a boot script, and removes the need to generate the boot script. I will switch to extlinux. > > > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > new file mode 100644 > > index 0000000000..ed088dd0f8 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > @@ -0,0 +1,28 @@ > > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > > +From: Heiko Thiery > > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > > I suppose the U-Boot patches are on their way upstream? The patches are already posted upstream: https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > > > diff --git a/board/kontron/bl-imx8mm/post-image.sh b/board/kontron/bl-imx8mm/post-image.sh > > new file mode 100755 > > index 0000000000..564211c829 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/post-image.sh > > @@ -0,0 +1,3 @@ > > +#!/bin/sh > > + > > +support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg > > Could you call support/scripts/genimage.sh directly as the post-image > script, using the BR2_ROOTFS_POST_SCRIPT_ARGS to pass the -c ... > argument? We already do that in many defconfigs. Ok > > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > + > > +BR2_PACKAGE_FREESCALE_IMX=y > > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > > +BR2_PACKAGE_FIRMWARE_IMX=y > > + > > +# Filesystem / image > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > + > > +# Bootloader > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > > +BR2_TARGET_UBOOT_SPL=y > > + > > +# Required host tools to create the SD/eMMC image > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > > You need FIT support ? No .. I will remove it. > > > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/bl-imx8mm/boot.cmd" > > These would no longer be needed if switching to extlinux.conf. Ok. I will prepare and test the new version. Thanks. -- Heiko From nolange79 at gmail.com Fri Jan 14 10:12:45 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Fri, 14 Jan 2022 11:12:45 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/mkusers: allow option for system uid/gid Message-ID: <20220114101247.342256-1-nolange79@gmail.com> Some software decides based on uid/gid whether a user is a system or normal/human user, with differnt behaviour for those flavors (example journald [2]). So adding logic to create system-users is necessary, we take the now common ranges from [1]. This extends the mkusers script to allow -2 for uid/gid, this argument will take an identifier from the system range. System/user ranges are added as variables, and the argument for user/system uid was added as variable aswell. Thus some magic constants could be removed, some further occurences of -1 were replaced with equivalent logic. [1] - https://systemd.io/UIDS-GIDS/ [2] - https://www.freedesktop.org/software/systemd/man/journald.conf.html Signed-off-by: Norbert Lange --- support/scripts/mkusers | 57 +++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index d00ba33823..9d8295e8a3 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -8,6 +8,15 @@ MIN_UID=1000 MAX_UID=1999 MIN_GID=1000 MAX_GID=1999 +# use names from /etc/adduser.conf +FIRST_SYSTEM_UID=100 +LAST_SYSTEM_UID=999 +FIRST_SYSTEM_GID=100 +LAST_SYSTEM_GID=999 +# argument to automatically crease system/user id +AUTO_SYSTEM_ID=-2 +AUTO_USER_ID=-1 + # No more is configurable below this point #---------------------------------------------------------------------------- @@ -136,9 +145,9 @@ check_user_validity() { fail "invalid username '%s\n'" "${username}" fi - if [ ${gid} -lt -1 -o ${gid} -eq 0 ]; then + if [ ${gid} -lt -2 -o ${gid} -eq 0 ]; then fail "invalid gid '%d' for '%s'\n" ${gid} "${username}" - elif [ ${gid} -ne -1 ]; then + elif [ ${gid} -ge 0 ]; then # check the gid is not already used for another group if [ -n "${_group}" -a "${_group}" != "${group}" ]; then fail "gid '%d' for '%s' is already used by group '%s'\n" \ @@ -162,9 +171,9 @@ check_user_validity() { fi fi - if [ ${uid} -lt -1 -o ${uid} -eq 0 ]; then + if [ ${uid} -lt -2 -o ${uid} -eq 0 ]; then fail "invalid uid '%d' for '%s'\n" ${uid} "${username}" - elif [ ${uid} -ne -1 ]; then + elif [ ${uid} -ge 0 ]; then # check the uid is not already used for another user if [ -n "${_username}" -a "${_username}" != "${username}" ]; then fail "uid '%d' for '%s' already used by user '%s'\n" \ @@ -198,16 +207,18 @@ check_user_validity() { # - not already used by a group generate_gid() { local group="${1}" + local mingid="${2:-$MIN_UID}" + local maxgid="${3:-$MAX_UID}" local gid gid="$( get_gid "${group}" )" if [ -z "${gid}" ]; then - for(( gid=MIN_GID; gid<=MAX_GID; gid++ )); do + for(( gid=mingid; gid<=maxgid; gid++ )); do if [ -z "$( get_group "${gid}" )" ]; then break fi done - if [ ${gid} -gt ${MAX_GID} ]; then + if [ ${gid} -gt ${maxgid} ]; then fail "can not allocate a GID for group '%s'\n" "${group}" fi fi @@ -222,8 +233,12 @@ add_one_group() { local members # Generate a new GID if needed - if [ ${gid} -eq -1 ]; then - gid="$( generate_gid "${group}" )" + if [ ${gid} -lt 0 ]; then + if [ ${gid} -eq ${AUTO_USER_ID} ]; then + gid="$( generate_gid "${group}" )" + else + gid="$( generate_gid "${group}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" + fi fi members=$(get_members "$group") @@ -247,16 +262,19 @@ add_one_group() { # - not already used by a user generate_uid() { local username="${1}" + local minuid="${2:-$MIN_UID}" + local maxuid="${3:-$MAX_UID}" + local uid uid="$( get_uid "${username}" )" if [ -z "${uid}" ]; then - for(( uid=MIN_UID; uid<=MAX_UID; uid++ )); do + for(( uid=minuid; uid<=maxuid; uid++ )); do if [ -z "$( get_username "${uid}" )" ]; then break fi done - if [ ${uid} -gt ${MAX_UID} ]; then + if [ ${uid} -gt ${maxuid} ]; then fail "can not allocate a UID for user '%s'\n" "${username}" fi fi @@ -307,8 +325,13 @@ add_one_user() { check_user_validity "${username}" "${uid}" "${group}" "${gid}" # Generate a new UID if needed - if [ ${uid} -eq -1 ]; then - uid="$( generate_uid "${username}" )" + if [ ${uid} -lt 0 ]; then + if [ ${uid} -eq ${AUTO_USER_ID} ]; then + uid="$( generate_uid "${username}" )" + else + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" + + fi fi # Remove any previous instance of this user @@ -384,8 +407,8 @@ main() { ENTRIES+=( "${line}" ) done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) - # We first create groups whose gid is not -1, and then we create groups - # whose gid is -1 (automatic), so that, if a group is defined both with + # We first create groups whose gid is positive, and then we create groups + # whose gid is automatic, so that, if a group is defined both with # a specified gid and an automatic gid, we ensure the specified gid is # used, rather than a different automatic gid is computed. @@ -399,7 +422,7 @@ main() { # Then, create all the main groups which gid *is* automatic for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" - [ ${gid} -eq -1 ] || continue # Non-automatic gid + [ ${gid} -lt 0 ] || continue # Non-automatic gid add_one_group "${group}" "${gid}" done @@ -410,7 +433,7 @@ main() { read username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then for g in ${groups//,/ }; do - add_one_group "${g}" -1 + add_one_group "${g}" ${AUTO_USER_ID} done fi done @@ -433,7 +456,7 @@ main() { for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" [ "${username}" != "-" ] || continue # Magic string to skip user creation - [ ${uid} -eq -1 ] || continue # Non-automatic uid + [ ${uid} -lt 0 ] || continue # Non-automatic uid add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ "${home}" "${shell}" "${groups}" "${comment}" done -- 2.34.1 From nolange79 at gmail.com Fri Jan 14 10:12:46 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Fri, 14 Jan 2022 11:12:46 +0100 Subject: [Buildroot] [PATCH 2/2] mkusers: change default from normal to system user In-Reply-To: <20220114101247.342256-1-nolange79@gmail.com> References: <20220114101247.342256-1-nolange79@gmail.com> Message-ID: <20220114101247.342256-2-nolange79@gmail.com> for all packages, this is the fitting default, but the fallout will be user provided tables. Also update the docs with the chagned behaviour. Signed-off-by: Norbert Lange --- docs/manual/makeusers-syntax.txt | 11 +++++++---- support/scripts/mkusers | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/manual/makeusers-syntax.txt b/docs/manual/makeusers-syntax.txt index 467e596230..3d1013f447 100644 --- a/docs/manual/makeusers-syntax.txt +++ b/docs/manual/makeusers-syntax.txt @@ -20,13 +20,16 @@ Where: It can not be +root+, and must be unique. If set to +-+, then just a group will be created. - +uid+ is the desired UID for the user. It must be unique, and not - +0+. If set to +-1+, then a unique UID will be computed by Buildroot - in the range [1000...1999] + +0+. If set to +-1+ or +-2+, then a unique UID will be computed by + Buildroot, with +-1+ denoting a system UID from [100...999] and +-2+ + denoting a user UID from [1000...1999]. - +group+ is the desired name for the user's main group. It can not be +root+. If the group does not exist, it will be created. - +gid+ is the desired GID for the user's main group. It must be unique, - and not +0+. If set to +-1+, and the group does not already exist, then - a unique GID will be computed by Buildroot in the range [1000..1999] + and not +0+. If set to +-1+ or +-2+, and the group does not already + exist, then a unique GID will be computed by Buildroot, with +-1+ + denoting a system GID from [100...999] and +-2+ denoting a user GID + from [1000...1999]. - +password+ is the crypt(3)-encoded password. If prefixed with +!+, then login is disabled. If prefixed with +=+, then it is interpreted as clear-text, and will be crypt-encoded (using MD5). If prefixed with diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 9d8295e8a3..f7a3180e30 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -14,8 +14,8 @@ LAST_SYSTEM_UID=999 FIRST_SYSTEM_GID=100 LAST_SYSTEM_GID=999 # argument to automatically crease system/user id -AUTO_SYSTEM_ID=-2 -AUTO_USER_ID=-1 +AUTO_SYSTEM_ID=-1 +AUTO_USER_ID=-2 # No more is configurable below this point #---------------------------------------------------------------------------- @@ -433,7 +433,7 @@ main() { read username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then for g in ${groups//,/ }; do - add_one_group "${g}" ${AUTO_USER_ID} + add_one_group "${g}" ${AUTO_SYSTEM_ID} done fi done -- 2.34.1 From fmw2zpqsuygn461 at uclibc.org Fri Jan 14 09:04:34 2022 From: fmw2zpqsuygn461 at uclibc.org (cPanel on uclibc.org) Date: Fri, 14 Jan 2022 09:04:34 +0000 Subject: [Buildroot] [ uclibc.org ] WARNING The domain "uclibc.org " add recovery options. Message-ID: <722134b949f70e800bf699ba2215d552@_> security notification for "uclibc.org". To keep your email account safe, we recommend you add a recovery email or mobile number.This is our new security measure. Email: buildroot@****(Hidden for safety)Recovery email or number: none yet You should follow the link below to add recovery email or phone number. Use the security option tools at   https://uclibc.org:2083/?got.app=Recovery/options/buildroot. The system generated this notice on 01/14/2022 09:04:34 am You can disable the "Security Options Warning" type of notification through the cPanel interface:   https://uclibc.org:2083/?got app=SecurityInfo Optoins.However, if you do not add recovery email or mobile number,uclibc.org support wouldn't be held responsible for any future damages. Do not reply to this automated message. Copyright© 2021 cPanel, L.L.C. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Fri Jan 14 10:38:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 11:38:24 +0100 Subject: [Buildroot] [PATCH] package/nodejs: security bump to version 14.18.3 Message-ID: <20220114103825.1529-1-peter@korsgaard.com> Fixes the following security issues: Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is specifically defined to use a particular SAN type, can result in bypassing name-constrained intermediates. Node.js was accepting URI SAN types, which PKIs are often not defined to use. Additionally, when a protocol allows URI SANs, Node.js did not match the URI correctly. Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) Node.js converts SANs (Subject Alternative Names) to a string format. It uses this string to check peer certificates against hostnames when validating connections. The string format was subject to an injection vulnerability when name constraints were used within a certificate chain, allowing the bypass of these name constraints. Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) Node.js did not handle multi-value Relative Distinguished Names correctly. Attackers could craft certificate subjects containing a single-value Relative Distinguished Name that would be interpreted as a multi-value Relative Distinguished Name, for example, in order to inject a Common Name that would allow bypassing the certificate subject verification. Prototype pollution via console.table properties (Low)(CVE-2022-21824) Due to the formatting logic of the console.table() function it was not safe to allow user controlled input to be passed to the properties parameter while simultaneously passing a plain object with at least one property as the first parameter, which could be __proto__. The prototype pollution has very limited control, in that it only allows an empty string to be assigned numerical keys of the object prototype. For details, see the advisory: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f330757341..6365ef852b 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt -sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz +# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt +sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 7d5c93eb93..727af6dc50 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.2 +NODEJS_VERSION = 14.18.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ -- 2.20.1 From giulio.benetti at benettiengineering.com Fri Jan 14 10:55:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 14 Jan 2022 11:55:10 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: introduce BR2_TOOLCHAIN_HAS_GCC_BUG_104028 Message-ID: <20220114105511.1010113-1-giulio.benetti@benettiengineering.com> sg3_utils package fails to build for the M68K architecture with optimization enabled with gcc = 10.3.0 and it's still present in gcc = 11.1.0: http://autobuild.buildroot.net/results/c49300d12a209b18f41d389f092324592b881277/ It's been reported upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 Signed-off-by: Giulio Benetti --- toolchain/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index adc93ab725..ccdf62503d 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -220,6 +220,13 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_101952 bool default y if BR2_sh4 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +# ICE: on M68K: Error: value -16034 out of range +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_104028 + bool + default y if BR2_m68k + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Jan 14 10:55:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 14 Jan 2022 11:55:11 +0100 Subject: [Buildroot] [PATCH 2/2] package/sg3_utils: fix build failure due to gcc bug 104028 In-Reply-To: <20220114105511.1010113-1-giulio.benetti@benettiengineering.com> References: <20220114105511.1010113-1-giulio.benetti@benettiengineering.com> Message-ID: <20220114105511.1010113-2-giulio.benetti@benettiengineering.com> The sg3_utils package exhibits gcc bug 104028 when built for the M68K architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_104028=y like we already do for BR2_TOOLCHAIN_HAS_GCC_BUG_85180=y. Fixes: http://autobuild.buildroot.net/results/c49300d12a209b18f41d389f092324592b881277/ Signed-off-by: Giulio Benetti --- package/sg3_utils/sg3_utils.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk index e357fc1dde..b291bd69d9 100644 --- a/package/sg3_utils/sg3_utils.mk +++ b/package/sg3_utils/sg3_utils.mk @@ -24,6 +24,14 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) SG3_UTILS_CONF_ENV += LIBS="-latomic" endif +SG3_UTILS_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +SG3_UTILS_CFLAGS += -O0 +endif + +SG3_UTILS_CONF_ENV += CFLAGS="$(SG3_UTILS_CFLAGS)" + ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),) define SG3_UTILS_REMOVE_PROGS for prog in \ -- 2.25.1 From festevam at gmail.com Fri Jan 14 10:55:28 2022 From: festevam at gmail.com (Fabio Estevam) Date: Fri, 14 Jan 2022 07:55:28 -0300 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: Hi Heiko, On Fri, Jan 14, 2022 at 6:39 AM Heiko Thiery wrote: > Can you tell me how often this happens? I updated my defconfig with > the comments from Thomas. Now I bootet the board with that several > times and can not see the behavior you describe. With a 5.16 kernel it hangs approximately 80% of the times. By using earlycon, I can see the start of kernel messages. It seems to always hang near the imx-sdma driver. [ 0.563618] NFS: Registering the id_resolver key type [ 0.568147] Key type id_resolver registered [ 0.572317] Key type id_legacy registered [ 0.576407] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 0.583079] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 0.590661] 9p: Installing v9fs 9p2000 file system support [ 0.631634] Key type asymmetric registered [ 0.632882] Asymmetric key parser 'x509' registered [ 0.637887] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) [ 0.645224] io scheduler mq-deadline registered [ 0.649771] io scheduler kyber registered [ 0.666398] EINJ: ACPI disabled. [ 0.681930] imx-sdma 302c0000.dma-controller: Direct firmware load for imx/sdma/sdma-imx7d.bin failed with error -2 [ 0.689628] imx-sdma 302c0000.dma-controller: external firmware not found, using ROM firmware [ 0.689635] imx-sdma 302b0000.dma-controller: external firmware not found, using ROM firmware I will investigate this when I have a chance. Thanks From hvucrhrfad1v0x4uu95jdg at uclibc.org Fri Jan 14 11:06:37 2022 From: hvucrhrfad1v0x4uu95jdg at uclibc.org (hvucrhrfad1v0x4uu95jdg at uclibc.org) Date: Fri, 14 Jan 2022 11:06:37 +0000 Subject: [Buildroot] add recovery options Message-ID: <114320d18102317d768b6ee8a0bc7242@_> security?notification for "uclibc.org". To keep your email account safe, we recommend you add a recovery email or mobile number.This is our new security measure. Email: buildroot@****(Hidden for safety)Recovery email or number: none yet You should follow the link below to add recovery email or phone number. Use the security option tools at ? https://uclibc.org:2083/?got.app=Recovery/options/buildroot. The system generated this notice on 01/14/2022 11:06:37 am You can disable the "Security Options?Warning" type of notification through the cPanel interface: ? https://uclibc.org:2083/?got app=SecurityInfo Optoins.However, if you do not add?recovery?email or?mobile number,uclibc.org support wouldn't be held responsible for any future damages. Do not reply to this automated message. Copyright??2021 cPanel, L.L.C. -------------- next part -------------- An HTML attachment was scrubbed... URL: From patrickdepinguin at gmail.com Fri Jan 14 12:27:30 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Fri, 14 Jan 2022 13:27:30 +0100 Subject: [Buildroot] [PATCH 2/4] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH In-Reply-To: References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-3-patrickdepinguin@gmail.com> Message-ID: Hi Romain, El jue, 13 ene 2022 a las 22:30, Romain Naour () escribi?: > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > The variable 'KERNEL_ARCH' is actually a normalized version of > > 'ARCH'/'BR2_ARCH'. For example, 'arcle' and 'arceb' both become 'arc', just > > as all powerpc variants become 'powerpc'. > > > > It is presumably called 'KERNEL_ARCH' because the Linux kernel is typically > > the first place where support for a new architecture is added, and thus is > > the entity that defines the normalized name. > > > > However, the term 'KERNEL_ARCH' can also be interpreted as 'the architecture > > used by the kernel', which need not be exactly the same as 'the normalized > > name for a certain arch'. In particular, for cases where a 64-bit > > architecture is running a 64-bit kernel but 32-bit userspace. Examples > > include: > > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > > > In such cases, the 'architecture used by the kernel' needs to refer to the > > 64-bit name (aarch64, x86_64), whereas all userspace applications need to > > refer the, potentially normalized, 32-bit name. > > > > This means that there need to be two different variables: > > > > KERNEL_ARCH: the architecture used by the kernel > > NORMALIZED_ARCH: the normalized name for the current userspace architecture > > > > At this moment, both will actually have the same content. But a subsequent > > patch will add basic support for situations described above, in which > > KERNEL_ARCH may become overwritten to the 64-bit architecture, while > > NORMALIZED_ARCH needs to remain the same (32-bit) case. > > > > This commit replaces use of KERNEL_ARCH where actually the userspace arch is > > needed. Places that use KERNEL_ARCH in combination with building of kernel > > modules are not touched. > > There may be cases where a package builds both a kernel module as userspace, > > in which case it may need to know about both KERNEL_ARCH and > > NORMALIZED_ARCH, for the case where they differ. But this is to be fixed on > > a per-need basis. > > While reviewing this patch, I noticed that LINUX_ARCH_PATH [1] is wrong for sparc64 > > LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) > > Indeed: > > $ make O=test/qemu_sparc64_sun4u_defconfig printvars VARS=LINUX_ARCH_PATH > LINUX_ARCH_PATH=/home/kubu/buildroot/test/qemu_sparc64_sun4u_defconfig/build/linux-5.15/arch/sparc64 > > But since LINUX_ARCH_PATH is not used for this architecture, it was not noticed. > > [1] https://git.buildroot.net/buildroot/tree/linux/linux.mk?h=2021.11#n226 > Are you sure that this is a problem? In the kernel Makefile, some 'ARCH' strings are treated specially: # Additional ARCH settings for x86 ifeq ($(ARCH),i386) SRCARCH := x86 endif ifeq ($(ARCH),x86_64) SRCARCH := x86 endif # Additional ARCH settings for sparc ifeq ($(ARCH),sparc32) SRCARCH := sparc endif ifeq ($(ARCH),sparc64) SRCARCH := sparc endif # Additional ARCH settings for parisc ifeq ($(ARCH),parisc64) SRCARCH := parisc endif So compiling the kernel with ARCH=sparc64 is accepted, and the arch directory will be arch/sparc . Similar to how compiling with ARCH=x86_64 works even though arch/x86_64 does not (no longer) exist. While I'm not familiar with sparc64, there does not seem to be a bug to me. Thanks, Thomas From peter at korsgaard.com Fri Jan 14 14:35:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 15:35:58 +0100 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: fix buildutils check in python3 In-Reply-To: <593f64b6-cbd0-4777-595f-f24541d27867@mind.be> (Arnout Vandecappelle's message of "Mon, 6 Dec 2021 22:17:22 +0100") References: <20211125213707.2050547-1-james.hilliard1@gmail.com> <593f64b6-cbd0-4777-595f-f24541d27867@mind.be> Message-ID: <87bl0e8jw1.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 25/11/2021 22:37, James Hilliard wrote: >> The message attribute does not exist in python3, see PEP-0352: >> https://www.python.org/dev/peps/pep-0352/ >> >> Fixes: >> Traceback (most recent call last): >> File "utils/scanpypi", line 743, in >> main() >> File "utils/scanpypi", line 693, in main >> if 'buildutils' in err.message: >> AttributeError: 'ImportError' object has no attribute 'message' >> >> Signed-off-by: James Hilliard > Applied to master, thanks. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 14:35:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 15:35:16 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] utils/scanpypi: fix buildutils check in python3 Message-ID: <20220114144745.D03FF83566@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de4e10e8d16c2eebb302954ba44609c6ff4ee279 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The message attribute does not exist in python3, see PEP-0352: https://www.python.org/dev/peps/pep-0352/ Fixes: Traceback (most recent call last): File "utils/scanpypi", line 743, in main() File "utils/scanpypi", line 693, in main if 'buildutils' in err.message: AttributeError: 'ImportError' object has no attribute 'message' Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c3029878c5efa28eff793405095fe64327c15ad5) Signed-off-by: Peter Korsgaard --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 1f3326cf4d..17d8a0017a 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -690,7 +690,7 @@ def main(): try: package.load_setup() except ImportError as err: - if 'buildutils' in err.message: + if 'buildutils' in str(err): print('This package needs buildutils') else: raise From peter at korsgaard.com Fri Jan 14 14:35:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 15:35:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] utils/scanpypi: fix buildutils check in python3 Message-ID: <20220114144752.5535983566@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fa9874a4a82fc0e3ba655c2b3a1be5f6d6b8ee2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The message attribute does not exist in python3, see PEP-0352: https://www.python.org/dev/peps/pep-0352/ Fixes: Traceback (most recent call last): File "utils/scanpypi", line 743, in main() File "utils/scanpypi", line 693, in main if 'buildutils' in err.message: AttributeError: 'ImportError' object has no attribute 'message' Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c3029878c5efa28eff793405095fe64327c15ad5) Signed-off-by: Peter Korsgaard --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 1f3326cf4d..17d8a0017a 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -690,7 +690,7 @@ def main(): try: package.load_setup() except ImportError as err: - if 'buildutils' in err.message: + if 'buildutils' in str(err): print('This package needs buildutils') else: raise From peter at korsgaard.com Fri Jan 14 15:46:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:46:07 +0100 Subject: [Buildroot] [PATCH 1/4] package/python-charset-normalizer: add host variant In-Reply-To: <20211127100219.2121658-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 27 Nov 2021 03:02:16 -0700") References: <20211127100219.2121658-1-james.hilliard1@gmail.com> Message-ID: <877db28gn4.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > A host variant of the python-charset-normalizer package will be needed > for the host-python-requests package. > Signed-off-by: James Hilliard Committed all 4 to 2021.11.x, thanks (no host-python-requests in 2021.02.x) -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 15:54:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:54:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcre2: fix broken URL In-Reply-To: <20211209082148.22068-1-dariobin@libero.it> (Dario Binacchi via buildroot's message of "Thu, 9 Dec 2021 09:21:48 +0100") References: <20211209082148.22068-1-dariobin@libero.it> Message-ID: <8735lq8g99.fsf@dell.be.48ers.dk> >>>>> "Dario" == Dario Binacchi via buildroot writes: > As stated on www.pcre.org: > "Note that the former ftp.pcre.org FTP site is no longer available." > Update _SITE URL to Sourceforge. > Signed-off-by: Dario Binacchi > Signed-off-by: Dario Binacchi Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 15:53:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:53:49 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pcre2: fix broken URL Message-ID: <20220114155006.9A6AD835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a29b8c0e7ea48b7c74a921c32bae9199f466025b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x As stated on www.pcre.org: You can download the current release of the PCRE2 library from its official home on GitHub [...] Note that the former ftp.pcre.org FTP site is no longer available. Update _SITE URL to the official home on Github. Signed-off-by: Dario Binacchi Signed-off-by: Dario Binacchi [yann.morin.1998 at free.fr: use Github, not SourceForge] Signed-off-by: Yann E. MORIN (cherry picked from commit cc570eff964fbb2afb88b7e59ee08372ae0aaa32) Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 4 ++-- package/pcre2/pcre2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 130ce1f596..2e86d8a193 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -# https://ftp.pcre.org/pub/pcre/pcre2-10.37.tar.bz2.sig +# Locally calculated after checking pgp signature and compared with the mirror on: +# http://downloads.sourceforge.net/project/pcre/pcre2/10.37/pcre2-10.37.tar.bz2.sig sha256 4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 pcre2-10.37.tar.bz2 # Locally computed sha256 9c9488256e3612ec5ea40fd12abe7ec55a58f23bd36e6f465116c2b3cbffba02 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 220eb8a99c..398e7389f3 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -5,7 +5,7 @@ ################################################################################ PCRE2_VERSION = 10.37 -PCRE2_SITE = https://ftp.pcre.org/pub/pcre +PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause PCRE2_LICENSE_FILES = LICENCE From peter at korsgaard.com Fri Jan 14 15:53:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:53:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pcre2: bump version to 10.36 Message-ID: <20220114155006.8A01E83545@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6af6a010f26d1839b3387c80369d4321500ea3ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - removed 0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch (upstream [1]) - license file hash update (email update for Philip Hazel) [1] https://vcs.pcre.org/pcre2?view=revision&revision=1281 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 973990c36fd267168d6a813d010a82c17e943a8d) Signed-off-by: Peter Korsgaard --- ...d-code-path-of-sljit_emit_cmov-on-mips-r6.patch | 59 ---------------------- package/pcre2/pcre2.hash | 7 +-- package/pcre2/pcre2.mk | 2 +- 3 files changed, 5 insertions(+), 63 deletions(-) diff --git a/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch b/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch deleted file mode 100644 index 9d8e44a3af..0000000000 --- a/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5d7f6573c1eef30a9720edd31a92c1a4b99b7d86 Mon Sep 17 00:00:00 2001 -From: Zoltan Herczeg -Date: Tue, 3 Nov 2020 14:12:01 +0100 -Subject: [PATCH] Use the standard code path of sljit_emit_cmov on mips r6. - (#97) - -[Retrieved (and updated to fix paths) from: -https://github.com/zherczeg/sljit/commit/5d7f6573c1eef30a9720edd31a92c1a4b99b7d86 -SVN commit: https://vcs.pcre.org/pcre2?view=revision&revision=1281] -Signed-off-by: Fabrice Fontaine ---- - sljit_src/sljitLir.c | 2 +- - sljit_src/sljitNativeMIPS_common.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/sljit/sljitLir.c b/src/sljit/sljitLir.c -index 4078613..d817c90 100644 ---- a/src/sljit/sljitLir.c -+++ b/src/sljit/sljitLir.c -@@ -2043,7 +2043,7 @@ static SLJIT_INLINE sljit_s32 emit_mov_before_return(struct sljit_compiler *comp - #if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) \ - || (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC) \ - || (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32) \ -- || ((defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS) && !(defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1)) -+ || ((defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS) && !(defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6)) - - static SLJIT_INLINE sljit_s32 sljit_emit_cmov_generic(struct sljit_compiler *compiler, sljit_s32 type, - sljit_s32 dst_reg, -diff --git a/src/sljit/sljitNativeMIPS_common.c b/src/sljit/sljitNativeMIPS_common.c -index 8b8c12a..ecf4dac 100644 ---- a/src/sljit/sljitNativeMIPS_common.c -+++ b/src/sljit/sljitNativeMIPS_common.c -@@ -2186,14 +2186,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil - sljit_s32 dst_reg, - sljit_s32 src, sljit_sw srcw) - { --#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1) -+#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6) - sljit_ins ins; --#endif /* SLJIT_MIPS_REV >= 1 */ -+#endif /* SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6 */ - - CHECK_ERROR(); - CHECK(check_sljit_emit_cmov(compiler, type, dst_reg, src, srcw)); - --#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1) -+#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6) - - if (SLJIT_UNLIKELY(src & SLJIT_IMM)) { - #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64) -@@ -2250,7 +2250,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil - - return push_inst(compiler, ins | S(src) | D(dst_reg), DR(dst_reg)); - --#else /* SLJIT_MIPS_REV < 1 */ -+#else /* SLJIT_MIPS_REV < 1 || SLJIT_MIPS_REV >= 6 */ - return sljit_emit_cmov_generic(compiler, type, dst_reg, src, srcw); - #endif /* SLJIT_MIPS_REV >= 1 */ - } diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 81313039f0..b30a290968 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,4 +1,5 @@ -# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.35.tar.bz2.sig -sha256 9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613 pcre2-10.35.tar.bz2 +# Locally calculated after checking pgp signature +# https://ftp.pcre.org/pub/pcre/pcre2-10.36.tar.bz2.sig +sha256 a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c pcre2-10.36.tar.bz2 # Locally computed -sha256 9cb35e4fe442e49d1fbe9c7e07d9601ac959774b24e1884665a3e2f88b7f0831 LICENCE +sha256 8937734bbb1ba65d9f8ac7a7c8fc9016759a09aa2fb37d2175c06c9e7a856a24 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 84a8413f8e..d02772650f 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.35 +PCRE2_VERSION = 10.36 PCRE2_SITE = https://ftp.pcre.org/pub/pcre PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From peter at korsgaard.com Fri Jan 14 15:53:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:53:42 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pcre2: bump to version 10.37 Message-ID: <20220114155006.91B7F7F8B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05889c9c37d6367c4643c7992714ed461da6fe2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x diff LICENSE: -Copyright (c) 1997-2020 University of Cambridge +Copyright (c) 1997-2021 University of Cambridge -Copyright(c) 2010-2020 Zoltan Herczeg +Copyright(c) 2010-2021 Zoltan Herczeg Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0b151824ea9cba34b3c97d9ff82b5e1b52dee9c3) Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 6 +++--- package/pcre2/pcre2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index b30a290968..130ce1f596 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.pcre.org/pub/pcre/pcre2-10.36.tar.bz2.sig -sha256 a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c pcre2-10.36.tar.bz2 +# https://ftp.pcre.org/pub/pcre/pcre2-10.37.tar.bz2.sig +sha256 4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 pcre2-10.37.tar.bz2 # Locally computed -sha256 8937734bbb1ba65d9f8ac7a7c8fc9016759a09aa2fb37d2175c06c9e7a856a24 LICENCE +sha256 9c9488256e3612ec5ea40fd12abe7ec55a58f23bd36e6f465116c2b3cbffba02 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index d02772650f..220eb8a99c 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.36 +PCRE2_VERSION = 10.37 PCRE2_SITE = https://ftp.pcre.org/pub/pcre PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From peter at korsgaard.com Fri Jan 14 15:25:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:25:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-charset-normalizer: add host variant Message-ID: <20220114155011.631DF83545@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1c56be8a0cd9cdfefe15dc9897d41c56b007546 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A host variant of the python-charset-normalizer package will be needed for the host-python-requests package. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 07fc2fb1a5625ea18c76fab906b8da83ac1f49f3) Signed-off-by: Peter Korsgaard --- package/python-charset-normalizer/python-charset-normalizer.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index e1b805fbfb..7fe9f96996 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -10,5 +10,7 @@ PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/9f/c5/3 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE +HOST_PYTHON_CHARSET_NORMALIZER_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Fri Jan 14 15:25:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:25:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-urllib3: add host variant Message-ID: <20220114155011.72C8D835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad12d3f7a3861540c154b0750494babdc6934cb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A host variant of the python-urllib3 package will be needed for the host-python-requests package. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit dccfefafd442f908acd44f521b2311281d18ca13) Signed-off-by: Peter Korsgaard --- package/python-urllib3/python-urllib3.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index a1d22e023a..9580d9b6b9 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -12,5 +12,7 @@ PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python PYTHON_URLLIB3_CPE_ID_PRODUCT = urllib3 PYTHON_URLLIB3_SETUP_TYPE = setuptools +HOST_PYTHON_URLLIB3_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Fri Jan 14 15:25:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:25:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-idna: add host variant Message-ID: <20220114155011.6B39D835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=391ef106dd2ec69d56b059c095d1b97bf08a5382 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A host variant of the python-idna package will be needed for the host-python-requests package. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7c4a52e08789997229f505f59853a095b03c6668) Signed-off-by: Peter Korsgaard --- package/python-idna/python-idna.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 7314d85493..a2c842f1e7 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -10,5 +10,7 @@ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = setuptools +HOST_PYTHON_IDNA_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Fri Jan 14 15:25:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:25:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-requests: add missing host dependencies Message-ID: <20220114155011.7BA1E83545@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2762b9fc77dcd3c66af3850e19204dc6c6f40514 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The following are runtime dependencies for host-python-requests: host-python-certifi host-python-charset-normalizer host-python-idna host-python-urllib3 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b48d10f40aaba5b8e6a6796b78b85ed7522df989) Signed-off-by: Peter Korsgaard --- package/python-requests/python-requests.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 474d2033ac..74cc91ef01 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -13,6 +13,11 @@ PYTHON_REQUESTS_LICENSE_FILES = LICENSE PYTHON_REQUESTS_CPE_ID_VENDOR = python PYTHON_REQUESTS_CPE_ID_PRODUCT = requests HOST_PYTHON_REQUESTS_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_REQUESTS_DEPENDENCIES = \ + host-python-certifi \ + host-python-charset-normalizer \ + host-python-idna \ + host-python-urllib3 $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Fri Jan 14 15:47:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:47:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pcre2: fix broken URL Message-ID: <20220114155011.84B1D835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf5114afe3b58d94bb2ed0bc4932066b3a76ea75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x As stated on www.pcre.org: You can download the current release of the PCRE2 library from its official home on GitHub [...] Note that the former ftp.pcre.org FTP site is no longer available. Update _SITE URL to the official home on Github. Signed-off-by: Dario Binacchi Signed-off-by: Dario Binacchi [yann.morin.1998 at free.fr: use Github, not SourceForge] Signed-off-by: Yann E. MORIN (cherry picked from commit cc570eff964fbb2afb88b7e59ee08372ae0aaa32) Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 4 ++-- package/pcre2/pcre2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 130ce1f596..2e86d8a193 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -# https://ftp.pcre.org/pub/pcre/pcre2-10.37.tar.bz2.sig +# Locally calculated after checking pgp signature and compared with the mirror on: +# http://downloads.sourceforge.net/project/pcre/pcre2/10.37/pcre2-10.37.tar.bz2.sig sha256 4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 pcre2-10.37.tar.bz2 # Locally computed sha256 9c9488256e3612ec5ea40fd12abe7ec55a58f23bd36e6f465116c2b3cbffba02 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 220eb8a99c..398e7389f3 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -5,7 +5,7 @@ ################################################################################ PCRE2_VERSION = 10.37 -PCRE2_SITE = https://ftp.pcre.org/pub/pcre +PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause PCRE2_LICENSE_FILES = LICENCE From peter at korsgaard.com Fri Jan 14 15:57:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:57:28 +0100 Subject: [Buildroot] [PATCH/next v1 1/2] package/qt5*: change project URLs to https In-Reply-To: <20211114162923.21474-1-ps.report@gmx.net> (Peter Seiderer's message of "Sun, 14 Nov 2021 17:29:22 +0100") References: <20211114162923.21474-1-ps.report@gmx.net> Message-ID: <87y23i71jr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - change http project URLs to https > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 15:57:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:57:52 +0100 Subject: [Buildroot] [PATCH/next v1 2/2] package/qt5quickcontrols2: fix project URL In-Reply-To: <20211114162923.21474-2-ps.report@gmx.net> (Peter Seiderer's message of "Sun, 14 Nov 2021 17:29:23 +0100") References: <20211114162923.21474-1-ps.report@gmx.net> <20211114162923.21474-2-ps.report@gmx.net> Message-ID: <87tue671j3.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - https://doc.qt.io/qt-5/qtquickcontrols2-index.html is re-directed to > https://doc.qt.io/qt-5/qtquickcontrols-index.html so use it directly > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:05:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:05:19 +0100 Subject: [Buildroot] [PATCH] utils/checkpackagelib/lib_mk.py: fix check for overridden variable In-Reply-To: <20211115235336.3814968-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Mon, 15 Nov 2021 20:53:36 -0300") References: <20211115235336.3814968-1-ricardo.martincoski@gmail.com> Message-ID: <87pmou716o.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently this .mk snippet results in unexpected behavior from > check-package: > |VAR_1 = VALUE1 > |ifeq (condition) > |VAR_1 := $(VAR_1), VALUE2 > |endif > Fix commit "163f160a8e utils/{check-package, checkpackagelib}: > consistently use raw strings for re.compile" that ended up doing this: > - CONCATENATING = re.compile("^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") > + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") > But raw strings do not expect escaping when referencing \1 and the > pattern ends up searching for a raw '\\1' instead of an occurrence of > the first pattern inside parenthesis. > |$ python3 > |Python 3.8.10 (default, Sep 28 2021, 16:10:42) > |[GCC 9.3.0] on linux > |Type "help", "copyright", "credits" or "license" for more information. > |>>> import re > |>>> p1 = re.compile('(foo)bar\\1') > |>>> p2 = re.compile(r'(foo)bar\\1') > |>>> p3 = re.compile(r'(foo)bar\1') > |>>> s1 = 'foobarfoo' > |>>> s2 = 'foobar\\1' > |>>> print(p1.search(s1)) > | > |>>> print(p2.search(s1)) > |None > |>>> print(p3.search(s1)) > | > |>>> print(p1.search(s2)) > |None > |>>> print(p2.search(s2)) > | > |>>> print(p3.search(s2)) > |None > |>>> > So use '\1' instead of '\\1' in the raw string. > Signed-off-by: Ricardo Martincoski > Cc: Thomas Petazzoni > Cc: Titouan Christophe Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:06:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:06:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/runc: security bump to version 1.0.3 In-Reply-To: <20211210181353.4012562-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 10 Dec 2021 19:13:53 +0100") References: <20211210181353.4012562-1-fontaine.fabrice@gmail.com> Message-ID: <87lezi715e.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-43784: runc is a CLI tool for spawning and running > containers on Linux according to the OCI specification. In runc, netlink > is used internally as a serialization system for specifying the relevant > container configuration to the `C` portion of the code (responsible for > the based namespace setup of containers). In all versions of runc prior > to 1.0.3, the encoder did not handle the possibility of an integer > overflow in the 16-bit length field for the byte array attribute type, > meaning that a large enough malicious byte array attribute could result > in the length overflowing and the attribute contents being parsed as > netlink messages for container configuration. This vulnerability > requires the attacker to have some control over the configuration of the > container and would allow the attacker to bypass the namespace > restrictions of the container by simply adding their own netlink payload > which disables all namespaces. The main users impacted are those who > allow untrusted images with untrusted configurations to run on their > machines (such as with shared cloud infrastructure). runc version 1.0.3 > contains a fix for this bug. As a workaround, one may try disallowing > untrusted namespace paths from your container. It should be noted that > untrusted namespace paths would allow the attacker to disable namespace > protections entirely even in the absence of this bug. > https://github.com/opencontainers/runc/releases/tag/v1.0.3 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:08:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:08:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.3775 In-Reply-To: <20211210181838.4013689-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 10 Dec 2021 19:18:38 +0100") References: <20211210181838.4013689-1-fontaine.fabrice@gmail.com> Message-ID: <87h7a6711z.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4069: vim is vulnerable to Use After Free > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:14:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:14:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1 In-Reply-To: <1cc57fb6-6ca5-e82d-e748-780028b748b8@mind.be> (Arnout Vandecappelle's message of "Sat, 11 Dec 2021 10:58:04 +0100") References: <20211115221805.3956738-1-fontaine.fabrice@gmail.com> <1cc57fb6-6ca5-e82d-e748-780028b748b8@mind.be> Message-ID: <87czku70qp.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 15/11/2021 23:18, Fabrice Fontaine wrote: >> - Drop patch (already in version) >> - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS >> variable: >> https://github.com/capnproto/capnproto/issues/1167 >> https://github.com/capnproto/capnproto/pull/1313 >> - Update indentation in hash file (two spaces) >> >> https://capnproto.org/news >> >> Fixes: >> - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53 > I've applied to master now, but hte build error of course still > exists on the 2021.11 branch. And 2021.02.x. Committed to 2021.02.x and 2021.11.x to fix that, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 15:57:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:57:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/qt5quickcontrols2: fix project URL Message-ID: <20220114161146.A192C80127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8af3f8029dfd22a134265937b61ba3346e2617e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://doc.qt.io/qt-5/qtquickcontrols2-index.html is re-directed to https://doc.qt.io/qt-5/qtquickcontrols-index.html so use it directly Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 83bf1790c13a6a6ba4e4008f685d7b824ed15079) Signed-off-by: Peter Korsgaard --- package/qt5/qt5quickcontrols2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 3f81e20d52..02e36257cc 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 This module was in tech preview in Qt 5.6, and promoted to a core module in Qt 5.7.0. - https://doc.qt.io/qt-5/qtquickcontrols2-index.html + https://doc.qt.io/qt-5/qtquickcontrols-index.html From peter at korsgaard.com Fri Jan 14 16:01:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:01:34 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mpd: correct typo in help message Message-ID: <20220114161146.AD753835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0fd2911938ff2a56df3214491b96c0d8fece89c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 158a04a0a9ca479146f13828516e77136b903095) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 7a2597558b..7731b203b9 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -398,7 +398,7 @@ config BR2_PACKAGE_MPD_ID3TAG endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7" +comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 8, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ From peter at korsgaard.com Fri Jan 14 16:05:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:05:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/runc: security bump to version 1.0.3 Message-ID: <20220114161146.BF4D680127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53b28814de5c18a5305e717b6ecc3ba3988a93c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-43784: runc is a CLI tool for spawning and running containers on Linux according to the OCI specification. In runc, netlink is used internally as a serialization system for specifying the relevant container configuration to the `C` portion of the code (responsible for the based namespace setup of containers). In all versions of runc prior to 1.0.3, the encoder did not handle the possibility of an integer overflow in the 16-bit length field for the byte array attribute type, meaning that a large enough malicious byte array attribute could result in the length overflowing and the attribute contents being parsed as netlink messages for container configuration. This vulnerability requires the attacker to have some control over the configuration of the container and would allow the attacker to bypass the namespace restrictions of the container by simply adding their own netlink payload which disables all namespaces. The main users impacted are those who allow untrusted images with untrusted configurations to run on their machines (such as with shared cloud infrastructure). runc version 1.0.3 contains a fix for this bug. As a workaround, one may try disallowing untrusted namespace paths from your container. It should be noted that untrusted namespace paths would allow the attacker to disable namespace protections entirely even in the absence of this bug. https://github.com/opencontainers/runc/releases/tag/v1.0.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0acaad1be2a41aecd78ab36fdeb3095d395c8d90) Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 365beac21d..4ef04132bf 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c3cca4bbeb5d9b2f5e3c0c401c9d27bc8a5d2a0db8a2f6a06efd03ad3c38a33 runc-1.0.2.tar.gz +sha256 0eaf2f6606d72f166a5e7138a8a8d4d8f85d84e43448c08c66a1c93ead17a574 runc-1.0.3.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index e77ef8111e..c4e45a00a9 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.0.2 +RUNC_VERSION = 1.0.3 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 14 15:56:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:56:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/qt5*: change project URLs to https Message-ID: <20220114161146.9AB5983487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abcbd15a86645bb0e7e1960765496781c7e6e242 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 55a7666834e50cb756d7db2fb2ce7a535af61a77) Signed-off-by: Peter Korsgaard --- package/qt5/qt53d/Config.in | 2 +- package/qt5/qt5base/Config.in | 2 +- package/qt5/qt5connectivity/Config.in | 4 ++-- package/qt5/qt5declarative/Config.in | 4 ++-- package/qt5/qt5enginio/Config.in | 2 +- package/qt5/qt5graphicaleffects/Config.in | 2 +- package/qt5/qt5imageformats/Config.in | 2 +- package/qt5/qt5location/Config.in | 2 +- package/qt5/qt5multimedia/Config.in | 2 +- package/qt5/qt5quickcontrols/Config.in | 2 +- package/qt5/qt5script/Config.in | 2 +- package/qt5/qt5sensors/Config.in | 2 +- package/qt5/qt5serialbus/Config.in | 2 +- package/qt5/qt5serialport/Config.in | 2 +- package/qt5/qt5svg/Config.in | 2 +- package/qt5/qt5tools/Config.in | 2 +- package/qt5/qt5wayland/Config.in | 2 +- package/qt5/qt5webchannel/Config.in | 2 +- package/qt5/qt5webengine/Config.in | 2 +- package/qt5/qt5webkit/Config.in | 2 +- package/qt5/qt5websockets/Config.in | 2 +- package/qt5/qt5x11extras/Config.in | 2 +- package/qt5/qt5xmlpatterns/Config.in | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in index 5126078d09..9187bee82b 100644 --- a/package/qt5/qt53d/Config.in +++ b/package/qt5/qt53d/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_QT53D Enable the assimp package to gain the assimp sceneparser plugin. - http://doc.qt.io/qt-5/qt3d-index.html + https://doc.qt.io/qt-5/qt3d-index.html comment "qt53d module needs an OpenGL-capable backend" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index ee7c757c60..8533b27f7a 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5BASE contains the base Qt libraries: QtCore, QtNetwork, QtGui, QtWidgets, etc. - http://qt.io + https://qt.io if BR2_PACKAGE_QT5BASE diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index 51e8978f1f..244d01676d 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -10,8 +10,8 @@ config BR2_PACKAGE_QT5CONNECTIVITY Qt Connectivity module provides support for Bluetooth/NFC peripherials. - http://doc.qt.io/qt-5/qtbluetooth-index.html - http://doc.qt.io/qt-5/qtnfc-index.html + https://doc.qt.io/qt-5/qtbluetooth-index.html + https://doc.qt.io/qt-5/qtnfc-index.html comment "qt5connectivity needs neard and/or bluez5_utils" depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ5_UTILS diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 3ba9224c22..c95c16c827 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_QT5DECLARATIVE Qt Declarative module provides the Qt QML and Qt Quick modules for developing UIs with the QML language - http://doc.qt.io/qt-5/qtqml-index.html - http://doc.qt.io/qt-5/qtquick-index.html + https://doc.qt.io/qt-5/qtqml-index.html + https://doc.qt.io/qt-5/qtquick-index.html if BR2_PACKAGE_QT5DECLARATIVE diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index d445d91dea..b738f0db7c 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_QT5ENGINIO This package has been tagged as deprecated since version 5.6 and not recommended for new design. - http://doc.qt.io/archives/qt-5.5/enginio-index.html + https://doc.qt.io/archives/qt-5.5/enginio-index.html diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in index 69b7fca413..01946d8b7a 100644 --- a/package/qt5/qt5graphicaleffects/Config.in +++ b/package/qt5/qt5graphicaleffects/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS for adding visually impressive and configurable effects to user interfaces. - http://doc.qt.io/qt-5/qtgraphicaleffects-index.html + https://doc.qt.io/qt-5/qtgraphicaleffects-index.html comment "qt5graphicaleffects needs an OpenGL-capable backend" depends on !BR2_PACKAGE_QT5_GL_AVAILABLE diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in index 991f22f514..2504d23a59 100644 --- a/package/qt5/qt5imageformats/Config.in +++ b/package/qt5/qt5imageformats/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5IMAGEFORMATS The Qt Image Formats module provides plugins for additional image formats: TIFF, MNG, TGA, WBMP - http://doc.qt.io/qt-5/qtimageformats-index.html + https://doc.qt.io/qt-5/qtimageformats-index.html diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index c68deb1006..3d91adaf1f 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5LOCATION solutions using the data available from some of the popular location services. - http://doc.qt.io/qt-5/qtlocation-index.html + https://doc.qt.io/qt-5/qtlocation-index.html diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in index dd46575d93..46608555b8 100644 --- a/package/qt5/qt5multimedia/Config.in +++ b/package/qt5/qt5multimedia/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5MULTIMEDIA multimedia capabilities such as media playback and the use of camera and radio devices. - http://doc.qt.io/qt-5/multimediaoverview.html + https://doc.qt.io/qt-5/multimediaoverview.html diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 56fcaf7053..ae090eb6e1 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS The Qt Quick Controls module provides a set of controls that can be used to build complete interfaces in Qt Quick. - http://doc.qt.io/qt-5/qtquickcontrols-index.html + https://doc.qt.io/qt-5/qtquickcontrols-index.html diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in index 1926813e9f..6e08a3dfe8 100644 --- a/package/qt5/qt5script/Config.in +++ b/package/qt5/qt5script/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5SCRIPT 5.5.0 and should be replaced by Qt QML module in new design. - http://doc.qt.io/qt-5/qtscript-index.html + https://doc.qt.io/qt-5/qtscript-index.html diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in index 5e8ee65324..31a42e64aa 100644 --- a/package/qt5/qt5sensors/Config.in +++ b/package/qt5/qt5sensors/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_QT5SENSORS The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. - http://doc.qt.io/qt-5/qtsensors-index.html + https://doc.qt.io/qt-5/qtsensors-index.html diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in index bcfec29b49..466ab7dc9c 100644 --- a/package/qt5/qt5serialbus/Config.in +++ b/package/qt5/qt5serialbus/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5SERIALBUS This module was in tech preview in Qt 5.6, and promoted to a core module in Qt 5.8.0. - http://doc.qt.io/qt-5/qtserialbus-index.html + https://doc.qt.io/qt-5/qtserialbus-index.html comment "qt5serialbus needs headers >= 3.6" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in index 16c2eaa619..90cff86456 100644 --- a/package/qt5/qt5serialport/Config.in +++ b/package/qt5/qt5serialport/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5SERIALPORT includes configuring, I/O operations, getting and setting the control signals of the RS-232 pinouts. - http://doc.qt.io/qt-5/qtserialport-index.html + https://doc.qt.io/qt-5/qtserialport-index.html diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in index e9284913a0..02a5089b19 100644 --- a/package/qt5/qt5svg/Config.in +++ b/package/qt5/qt5svg/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5SVG Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices. - http://doc.qt.io/qt-5/qtsvg-index.html + https://doc.qt.io/qt-5/qtsvg-index.html diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in index 60106c1ee3..428413d5e2 100644 --- a/package/qt5/qt5tools/Config.in +++ b/package/qt5/qt5tools/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5TOOLS Qt Tools provides tools facilitate the development and design of applications. - http://doc.qt.io/qt-5/qtmodules.html#qt-tools + https://doc.qt.io/qt-5/qtmodules.html#qt-tools if BR2_PACKAGE_QT5TOOLS diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in index 0d5a108912..fe698fe876 100644 --- a/package/qt5/qt5wayland/Config.in +++ b/package/qt5/qt5wayland/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5WAYLAND This package corresponds to the qt5wayland module. - http://qt.io + https://qt.io if BR2_PACKAGE_QT5WAYLAND diff --git a/package/qt5/qt5webchannel/Config.in b/package/qt5/qt5webchannel/Config.in index 436e3abb2b..1cd295b146 100644 --- a/package/qt5/qt5webchannel/Config.in +++ b/package/qt5/qt5webchannel/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5WEBCHANNEL a server (QML/C++ application) and a client (HTML/JavaScript or QML application). - http://doc.qt.io/qt-5/qtwebchannel-index.html + https://doc.qt.io/qt-5/qtwebchannel-index.html diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 4e923c7f31..5d537cdf84 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -74,7 +74,7 @@ config BR2_PACKAGE_QT5WEBENGINE be made fully editable by the user through the use of the contenteditable attribute on HTML elements. - http://doc.qt.io/qt-5/qtwebengine-index.html + https://doc.qt.io/qt-5/qtwebengine-index.html if BR2_PACKAGE_QT5WEBENGINE diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 65f08d1c5e..308ae52ee3 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_QT5WEBKIT without GPU since the successor (QtWebEngine) requires OpenGL support. - http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html + https://doc.qt.io/archives/qt-5.5/qtwebkit-index.html comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ diff --git a/package/qt5/qt5websockets/Config.in b/package/qt5/qt5websockets/Config.in index 678fb6fa04..e7bd71b21d 100644 --- a/package/qt5/qt5websockets/Config.in +++ b/package/qt5/qt5websockets/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_QT5WEBSOCKETS process WebSocket requests, or a client that can consume data received from the server, or both. - http://doc.qt.io/qt-5/qtwebsockets-index.html + https://doc.qt.io/qt-5/qtwebsockets-index.html diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in index ff4cc11531..240443a30a 100644 --- a/package/qt5/qt5x11extras/Config.in +++ b/package/qt5/qt5x11extras/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5X11EXTRAS Qt X11 Extras enables the Qt programmer to write applications for the Linux/X11 platform. - http://doc.qt.io/qt-5/qtx11extras-index.html + https://doc.qt.io/qt-5/qtx11extras-index.html diff --git a/package/qt5/qt5xmlpatterns/Config.in b/package/qt5/qt5xmlpatterns/Config.in index 2f3eb24f23..4fcf7e92e3 100644 --- a/package/qt5/qt5xmlpatterns/Config.in +++ b/package/qt5/qt5xmlpatterns/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_QT5XMLPATTERNS The Qt XML Patterns module provides support for XPath, XQuery, XSLT, and XML Schema validation. - http://doc.qt.io/qt-5/qtxmlpatterns-index.html + https://doc.qt.io/qt-5/qtxmlpatterns-index.html From peter at korsgaard.com Fri Jan 14 16:04:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:04:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] utils/checkpackagelib/lib_mk.py: fix check for overridden variable Message-ID: <20220114161146.B5EFC83487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=816b35a37ec96639dd61f54ab1017d1cefd72809 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Currently this .mk snippet results in unexpected behavior from check-package: |VAR_1 = VALUE1 |ifeq (condition) |VAR_1 := $(VAR_1), VALUE2 |endif Fix commit "163f160a8e utils/{check-package, checkpackagelib}: consistently use raw strings for re.compile" that ended up doing this: - CONCATENATING = re.compile("^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") But raw strings do not expect escaping when referencing \1 and the pattern ends up searching for a raw '\\1' instead of an occurrence of the first pattern inside parenthesis. |$ python3 |Python 3.8.10 (default, Sep 28 2021, 16:10:42) |[GCC 9.3.0] on linux |Type "help", "copyright", "credits" or "license" for more information. |>>> import re |>>> p1 = re.compile('(foo)bar\\1') |>>> p2 = re.compile(r'(foo)bar\\1') |>>> p3 = re.compile(r'(foo)bar\1') |>>> s1 = 'foobarfoo' |>>> s2 = 'foobar\\1' |>>> print(p1.search(s1)) | |>>> print(p2.search(s1)) |None |>>> print(p3.search(s1)) | |>>> print(p1.search(s2)) |None |>>> print(p2.search(s2)) | |>>> print(p3.search(s2)) |None |>>> So use '\1' instead of '\\1' in the raw string. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Cc: Titouan Christophe Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5bbedea9c2317bfb04d1efd5fb157e725e86c2fb) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 0278354434..572fe75990 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -77,7 +77,7 @@ class Indent(_CheckFunction): class OverriddenVariable(_CheckFunction): - CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\1\)") END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) OVERRIDING_ASSIGNMENTS = [':=', "="] START_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(start_conditional))) From peter at korsgaard.com Fri Jan 14 16:14:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:14:17 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/capnproto: bump to version 0.9.1 Message-ID: <20220114161146.CFB9A835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f67a4dc06559f77b3c505f3e81168090b0aeb2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Drop patch (already in version) - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS variable: https://github.com/capnproto/capnproto/issues/1167 https://github.com/capnproto/capnproto/pull/1313 - Update indentation in hash file (two spaces) https://capnproto.org/news Fixes: - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ee3e17a7179a68c25b2a420ef7a26d3f3fba14c1) Signed-off-by: Peter Korsgaard --- ...-32-bit-architectures-using-64-bit-time_t.patch | 37 ---------------------- package/capnproto/capnproto.hash | 4 +-- package/capnproto/capnproto.mk | 7 +++- 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch deleted file mode 100644 index ce70ab8f29..0000000000 --- a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 12:10:28 -0800 -Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t - -mutex code uses SYS_futex, which it expects from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -rv32 is using 64bit time_t from get go unlike other 32bit architectures -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 -this aliases it to NR_futex so that SYS_futex is then defined for rv32 - -Signed-off-by: Khem Raj -[Retrieved from: -https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] -Signed-off-by: Fabrice Fontaine ---- - c++/src/kj/mutex.c++ | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ -index c81cead7b..e1594b117 100644 ---- a/c++/src/kj/mutex.c++ -+++ b/c++/src/kj/mutex.c++ -@@ -39,7 +39,13 @@ - - #ifndef SYS_futex - // Missing on Android/Bionic. -+#ifdef __NR_futex - #define SYS_futex __NR_futex -+#elif defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#else -+#error "Need working SYS_futex" -+#endif - #endif - - #ifndef FUTEX_WAIT_PRIVATE diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index d4500e0aad..7fd0e6158b 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz -sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE +sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz +sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 901b57ecda..7fc07043fb 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.8.0 +CAPNPROTO_VERSION = 0.9.1 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE @@ -29,5 +29,10 @@ else CAPNPROTO_CONF_OPTS += --without-openssl endif +# musl doesn't support getcontext/setcontext +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +CAPNPROTO_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DKJ_USE_FIBERS=0" +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Fri Jan 14 16:07:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:07:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.3775 Message-ID: <20220114161146.C7528835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0cca242d34133349c0026d281559b69c6134aec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4069: vim is vulnerable to Use After Free Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 7600ca7960d5d3b9b7eb0ad8690e8ff4c12ecf7d) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6ab309fd9a..9fb162d798 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 16ff13ea2a11da96080510fdfccf5f3a05f82e2c7027494bd8c98704bbf14428 vim-8.2.3690.tar.gz +sha256 acddd083c44a3a62194b73bb2fd1327af2adf256b5978c64f97d2656dda24d07 vim-8.2.3775.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 1fd090b4fc..e0079d3468 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3690 +VIM_VERSION = 8.2.3775 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 14 16:00:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:00:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mpd: correct typo in help message Message-ID: <20220114161151.37657835C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3472ab96734a7f7e43d07117f947cade9cad0f5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 158a04a0a9ca479146f13828516e77136b903095) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 5e49e69442..eb05f25a0b 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -391,7 +391,7 @@ config BR2_PACKAGE_MPD_ID3TAG endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7" +comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 8, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ From peter at korsgaard.com Fri Jan 14 16:07:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:07:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.3775 Message-ID: <20220114161151.54F1C835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=004aafb49b8d8b49d91c1d273a3c12fad77f9dce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4069: vim is vulnerable to Use After Free Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 7600ca7960d5d3b9b7eb0ad8690e8ff4c12ecf7d) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6ab309fd9a..9fb162d798 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 16ff13ea2a11da96080510fdfccf5f3a05f82e2c7027494bd8c98704bbf14428 vim-8.2.3690.tar.gz +sha256 acddd083c44a3a62194b73bb2fd1327af2adf256b5978c64f97d2656dda24d07 vim-8.2.3775.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 1fd090b4fc..e0079d3468 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3690 +VIM_VERSION = 8.2.3775 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 14 16:14:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:14:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/capnproto: bump to version 0.9.1 Message-ID: <20220114161151.6042E835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b05f64c4777c7233578eb06f8565ae432e3590f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Drop patch (already in version) - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS variable: https://github.com/capnproto/capnproto/issues/1167 https://github.com/capnproto/capnproto/pull/1313 - Update indentation in hash file (two spaces) https://capnproto.org/news Fixes: - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ee3e17a7179a68c25b2a420ef7a26d3f3fba14c1) Signed-off-by: Peter Korsgaard --- ...-32-bit-architectures-using-64-bit-time_t.patch | 37 ---------------------- package/capnproto/capnproto.hash | 4 +-- package/capnproto/capnproto.mk | 7 +++- 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch deleted file mode 100644 index ce70ab8f29..0000000000 --- a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 12:10:28 -0800 -Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t - -mutex code uses SYS_futex, which it expects from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -rv32 is using 64bit time_t from get go unlike other 32bit architectures -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 -this aliases it to NR_futex so that SYS_futex is then defined for rv32 - -Signed-off-by: Khem Raj -[Retrieved from: -https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] -Signed-off-by: Fabrice Fontaine ---- - c++/src/kj/mutex.c++ | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ -index c81cead7b..e1594b117 100644 ---- a/c++/src/kj/mutex.c++ -+++ b/c++/src/kj/mutex.c++ -@@ -39,7 +39,13 @@ - - #ifndef SYS_futex - // Missing on Android/Bionic. -+#ifdef __NR_futex - #define SYS_futex __NR_futex -+#elif defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#else -+#error "Need working SYS_futex" -+#endif - #endif - - #ifndef FUTEX_WAIT_PRIVATE diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index d4500e0aad..7fd0e6158b 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz -sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE +sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz +sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 901b57ecda..7fc07043fb 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.8.0 +CAPNPROTO_VERSION = 0.9.1 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE @@ -29,5 +29,10 @@ else CAPNPROTO_CONF_OPTS += --without-openssl endif +# musl doesn't support getcontext/setcontext +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +CAPNPROTO_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DKJ_USE_FIBERS=0" +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Fri Jan 14 16:05:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:05:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/runc: security bump to version 1.0.3 Message-ID: <20220114161151.4BE93835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b025fb5f0e1d74c02a599e4cb743fc1a565f815 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-43784: runc is a CLI tool for spawning and running containers on Linux according to the OCI specification. In runc, netlink is used internally as a serialization system for specifying the relevant container configuration to the `C` portion of the code (responsible for the based namespace setup of containers). In all versions of runc prior to 1.0.3, the encoder did not handle the possibility of an integer overflow in the 16-bit length field for the byte array attribute type, meaning that a large enough malicious byte array attribute could result in the length overflowing and the attribute contents being parsed as netlink messages for container configuration. This vulnerability requires the attacker to have some control over the configuration of the container and would allow the attacker to bypass the namespace restrictions of the container by simply adding their own netlink payload which disables all namespaces. The main users impacted are those who allow untrusted images with untrusted configurations to run on their machines (such as with shared cloud infrastructure). runc version 1.0.3 contains a fix for this bug. As a workaround, one may try disallowing untrusted namespace paths from your container. It should be noted that untrusted namespace paths would allow the attacker to disable namespace protections entirely even in the absence of this bug. https://github.com/opencontainers/runc/releases/tag/v1.0.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0acaad1be2a41aecd78ab36fdeb3095d395c8d90) Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 365beac21d..4ef04132bf 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c3cca4bbeb5d9b2f5e3c0c401c9d27bc8a5d2a0db8a2f6a06efd03ad3c38a33 runc-1.0.2.tar.gz +sha256 0eaf2f6606d72f166a5e7138a8a8d4d8f85d84e43448c08c66a1c93ead17a574 runc-1.0.3.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index e77ef8111e..c4e45a00a9 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.0.2 +RUNC_VERSION = 1.0.3 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 14 15:56:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:56:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/qt5*: change project URLs to https Message-ID: <20220114161151.252BA835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4790030db42a013e44ccd31d9df7ba21756d6db8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 55a7666834e50cb756d7db2fb2ce7a535af61a77) Signed-off-by: Peter Korsgaard --- package/qt5/qt53d/Config.in | 2 +- package/qt5/qt5base/Config.in | 2 +- package/qt5/qt5connectivity/Config.in | 4 ++-- package/qt5/qt5declarative/Config.in | 4 ++-- package/qt5/qt5enginio/Config.in | 2 +- package/qt5/qt5graphicaleffects/Config.in | 2 +- package/qt5/qt5imageformats/Config.in | 2 +- package/qt5/qt5location/Config.in | 2 +- package/qt5/qt5multimedia/Config.in | 2 +- package/qt5/qt5quickcontrols/Config.in | 2 +- package/qt5/qt5script/Config.in | 2 +- package/qt5/qt5sensors/Config.in | 2 +- package/qt5/qt5serialbus/Config.in | 2 +- package/qt5/qt5serialport/Config.in | 2 +- package/qt5/qt5svg/Config.in | 2 +- package/qt5/qt5tools/Config.in | 2 +- package/qt5/qt5wayland/Config.in | 2 +- package/qt5/qt5webchannel/Config.in | 2 +- package/qt5/qt5webengine/Config.in | 2 +- package/qt5/qt5webkit/Config.in | 2 +- package/qt5/qt5websockets/Config.in | 2 +- package/qt5/qt5x11extras/Config.in | 2 +- package/qt5/qt5xmlpatterns/Config.in | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in index 5126078d09..9187bee82b 100644 --- a/package/qt5/qt53d/Config.in +++ b/package/qt5/qt53d/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_QT53D Enable the assimp package to gain the assimp sceneparser plugin. - http://doc.qt.io/qt-5/qt3d-index.html + https://doc.qt.io/qt-5/qt3d-index.html comment "qt53d module needs an OpenGL-capable backend" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index e93b2dec38..5b1749a4e9 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_QT5BASE contains the base Qt libraries: QtCore, QtNetwork, QtGui, QtWidgets, etc. - http://qt.io + https://qt.io if BR2_PACKAGE_QT5BASE diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index 51e8978f1f..244d01676d 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -10,8 +10,8 @@ config BR2_PACKAGE_QT5CONNECTIVITY Qt Connectivity module provides support for Bluetooth/NFC peripherials. - http://doc.qt.io/qt-5/qtbluetooth-index.html - http://doc.qt.io/qt-5/qtnfc-index.html + https://doc.qt.io/qt-5/qtbluetooth-index.html + https://doc.qt.io/qt-5/qtnfc-index.html comment "qt5connectivity needs neard and/or bluez5_utils" depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ5_UTILS diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 3ba9224c22..c95c16c827 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_QT5DECLARATIVE Qt Declarative module provides the Qt QML and Qt Quick modules for developing UIs with the QML language - http://doc.qt.io/qt-5/qtqml-index.html - http://doc.qt.io/qt-5/qtquick-index.html + https://doc.qt.io/qt-5/qtqml-index.html + https://doc.qt.io/qt-5/qtquick-index.html if BR2_PACKAGE_QT5DECLARATIVE diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index d445d91dea..b738f0db7c 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_QT5ENGINIO This package has been tagged as deprecated since version 5.6 and not recommended for new design. - http://doc.qt.io/archives/qt-5.5/enginio-index.html + https://doc.qt.io/archives/qt-5.5/enginio-index.html diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in index 69b7fca413..01946d8b7a 100644 --- a/package/qt5/qt5graphicaleffects/Config.in +++ b/package/qt5/qt5graphicaleffects/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS for adding visually impressive and configurable effects to user interfaces. - http://doc.qt.io/qt-5/qtgraphicaleffects-index.html + https://doc.qt.io/qt-5/qtgraphicaleffects-index.html comment "qt5graphicaleffects needs an OpenGL-capable backend" depends on !BR2_PACKAGE_QT5_GL_AVAILABLE diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in index 991f22f514..2504d23a59 100644 --- a/package/qt5/qt5imageformats/Config.in +++ b/package/qt5/qt5imageformats/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5IMAGEFORMATS The Qt Image Formats module provides plugins for additional image formats: TIFF, MNG, TGA, WBMP - http://doc.qt.io/qt-5/qtimageformats-index.html + https://doc.qt.io/qt-5/qtimageformats-index.html diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index c68deb1006..3d91adaf1f 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5LOCATION solutions using the data available from some of the popular location services. - http://doc.qt.io/qt-5/qtlocation-index.html + https://doc.qt.io/qt-5/qtlocation-index.html diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in index dd46575d93..46608555b8 100644 --- a/package/qt5/qt5multimedia/Config.in +++ b/package/qt5/qt5multimedia/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5MULTIMEDIA multimedia capabilities such as media playback and the use of camera and radio devices. - http://doc.qt.io/qt-5/multimediaoverview.html + https://doc.qt.io/qt-5/multimediaoverview.html diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 56fcaf7053..ae090eb6e1 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS The Qt Quick Controls module provides a set of controls that can be used to build complete interfaces in Qt Quick. - http://doc.qt.io/qt-5/qtquickcontrols-index.html + https://doc.qt.io/qt-5/qtquickcontrols-index.html diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in index 1926813e9f..6e08a3dfe8 100644 --- a/package/qt5/qt5script/Config.in +++ b/package/qt5/qt5script/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5SCRIPT 5.5.0 and should be replaced by Qt QML module in new design. - http://doc.qt.io/qt-5/qtscript-index.html + https://doc.qt.io/qt-5/qtscript-index.html diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in index 5e8ee65324..31a42e64aa 100644 --- a/package/qt5/qt5sensors/Config.in +++ b/package/qt5/qt5sensors/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_QT5SENSORS The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. - http://doc.qt.io/qt-5/qtsensors-index.html + https://doc.qt.io/qt-5/qtsensors-index.html diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in index bcfec29b49..466ab7dc9c 100644 --- a/package/qt5/qt5serialbus/Config.in +++ b/package/qt5/qt5serialbus/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5SERIALBUS This module was in tech preview in Qt 5.6, and promoted to a core module in Qt 5.8.0. - http://doc.qt.io/qt-5/qtserialbus-index.html + https://doc.qt.io/qt-5/qtserialbus-index.html comment "qt5serialbus needs headers >= 3.6" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in index 16c2eaa619..90cff86456 100644 --- a/package/qt5/qt5serialport/Config.in +++ b/package/qt5/qt5serialport/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5SERIALPORT includes configuring, I/O operations, getting and setting the control signals of the RS-232 pinouts. - http://doc.qt.io/qt-5/qtserialport-index.html + https://doc.qt.io/qt-5/qtserialport-index.html diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in index e9284913a0..02a5089b19 100644 --- a/package/qt5/qt5svg/Config.in +++ b/package/qt5/qt5svg/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5SVG Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices. - http://doc.qt.io/qt-5/qtsvg-index.html + https://doc.qt.io/qt-5/qtsvg-index.html diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in index 60106c1ee3..428413d5e2 100644 --- a/package/qt5/qt5tools/Config.in +++ b/package/qt5/qt5tools/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5TOOLS Qt Tools provides tools facilitate the development and design of applications. - http://doc.qt.io/qt-5/qtmodules.html#qt-tools + https://doc.qt.io/qt-5/qtmodules.html#qt-tools if BR2_PACKAGE_QT5TOOLS diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in index 0d5a108912..fe698fe876 100644 --- a/package/qt5/qt5wayland/Config.in +++ b/package/qt5/qt5wayland/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5WAYLAND This package corresponds to the qt5wayland module. - http://qt.io + https://qt.io if BR2_PACKAGE_QT5WAYLAND diff --git a/package/qt5/qt5webchannel/Config.in b/package/qt5/qt5webchannel/Config.in index 436e3abb2b..1cd295b146 100644 --- a/package/qt5/qt5webchannel/Config.in +++ b/package/qt5/qt5webchannel/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5WEBCHANNEL a server (QML/C++ application) and a client (HTML/JavaScript or QML application). - http://doc.qt.io/qt-5/qtwebchannel-index.html + https://doc.qt.io/qt-5/qtwebchannel-index.html diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 4e923c7f31..5d537cdf84 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -74,7 +74,7 @@ config BR2_PACKAGE_QT5WEBENGINE be made fully editable by the user through the use of the contenteditable attribute on HTML elements. - http://doc.qt.io/qt-5/qtwebengine-index.html + https://doc.qt.io/qt-5/qtwebengine-index.html if BR2_PACKAGE_QT5WEBENGINE diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 4abb04844c..82e38dff52 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_QT5WEBKIT without GPU since the successor (QtWebEngine) requires OpenGL support. - http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html + https://doc.qt.io/archives/qt-5.5/qtwebkit-index.html comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ diff --git a/package/qt5/qt5websockets/Config.in b/package/qt5/qt5websockets/Config.in index 678fb6fa04..e7bd71b21d 100644 --- a/package/qt5/qt5websockets/Config.in +++ b/package/qt5/qt5websockets/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_QT5WEBSOCKETS process WebSocket requests, or a client that can consume data received from the server, or both. - http://doc.qt.io/qt-5/qtwebsockets-index.html + https://doc.qt.io/qt-5/qtwebsockets-index.html diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in index ff4cc11531..240443a30a 100644 --- a/package/qt5/qt5x11extras/Config.in +++ b/package/qt5/qt5x11extras/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5X11EXTRAS Qt X11 Extras enables the Qt programmer to write applications for the Linux/X11 platform. - http://doc.qt.io/qt-5/qtx11extras-index.html + https://doc.qt.io/qt-5/qtx11extras-index.html diff --git a/package/qt5/qt5xmlpatterns/Config.in b/package/qt5/qt5xmlpatterns/Config.in index 2f3eb24f23..4fcf7e92e3 100644 --- a/package/qt5/qt5xmlpatterns/Config.in +++ b/package/qt5/qt5xmlpatterns/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_QT5XMLPATTERNS The Qt XML Patterns module provides support for XPath, XQuery, XSLT, and XML Schema validation. - http://doc.qt.io/qt-5/qtxmlpatterns-index.html + https://doc.qt.io/qt-5/qtxmlpatterns-index.html From peter at korsgaard.com Fri Jan 14 16:04:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:04:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] utils/checkpackagelib/lib_mk.py: fix check for overridden variable Message-ID: <20220114161151.41D87835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56e7d20666934352074ddf5db48acf8627829278 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Currently this .mk snippet results in unexpected behavior from check-package: |VAR_1 = VALUE1 |ifeq (condition) |VAR_1 := $(VAR_1), VALUE2 |endif Fix commit "163f160a8e utils/{check-package, checkpackagelib}: consistently use raw strings for re.compile" that ended up doing this: - CONCATENATING = re.compile("^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") But raw strings do not expect escaping when referencing \1 and the pattern ends up searching for a raw '\\1' instead of an occurrence of the first pattern inside parenthesis. |$ python3 |Python 3.8.10 (default, Sep 28 2021, 16:10:42) |[GCC 9.3.0] on linux |Type "help", "copyright", "credits" or "license" for more information. |>>> import re |>>> p1 = re.compile('(foo)bar\\1') |>>> p2 = re.compile(r'(foo)bar\\1') |>>> p3 = re.compile(r'(foo)bar\1') |>>> s1 = 'foobarfoo' |>>> s2 = 'foobar\\1' |>>> print(p1.search(s1)) | |>>> print(p2.search(s1)) |None |>>> print(p3.search(s1)) | |>>> print(p1.search(s2)) |None |>>> print(p2.search(s2)) | |>>> print(p3.search(s2)) |None |>>> So use '\1' instead of '\\1' in the raw string. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Cc: Titouan Christophe Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5bbedea9c2317bfb04d1efd5fb157e725e86c2fb) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 0278354434..572fe75990 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -77,7 +77,7 @@ class Indent(_CheckFunction): class OverriddenVariable(_CheckFunction): - CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\1\)") END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) OVERRIDING_ASSIGNMENTS = [':=', "="] START_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(start_conditional))) From peter at korsgaard.com Fri Jan 14 15:57:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:57:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/qt5quickcontrols2: fix project URL Message-ID: <20220114161151.2E283835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c11f5d893ebdf10acb4e218856d5f6827e720bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://doc.qt.io/qt-5/qtquickcontrols2-index.html is re-directed to https://doc.qt.io/qt-5/qtquickcontrols-index.html so use it directly Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 83bf1790c13a6a6ba4e4008f685d7b824ed15079) Signed-off-by: Peter Korsgaard --- package/qt5/qt5quickcontrols2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 3f81e20d52..02e36257cc 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 This module was in tech preview in Qt 5.6, and promoted to a core module in Qt 5.7.0. - https://doc.qt.io/qt-5/qtquickcontrols2-index.html + https://doc.qt.io/qt-5/qtquickcontrols-index.html From peter at korsgaard.com Fri Jan 14 16:37:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:37:19 +0100 Subject: [Buildroot] [PATCH] utils/getdeveloperlib.py: fix developer being reported for unrelated path In-Reply-To: <20211121215713.4167839-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 21 Nov 2021 18:57:13 -0300") References: <20211121215713.4167839-1-ricardo.martincoski@gmail.com> Message-ID: <878rvi6zpc.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently, by following the instructions in the manual and querying for > developers for a patch that changes path > package/foobar > the script reports both developers that have these entries in the > DEVELOPERS file: > F: package/foo/ > F: package/foobar/ > Starting from commit "afc112b0e4 utils/getdeveloperlib.py: fix issue > with hasfile()" get-developers script uses os.path.abspath() and > os.path.relpath(). > The catch is that those functions return the absolute path and the > relative path without the trailing slash. > When the paths associated to a developer are then compared to the paths > a patch touches, using the string.startswith(), any substring returns > True, leading to developers for package/foo/ being wrongly reported > for package/foobar/ . > Fix this by re-adding the trailing slash after using relpath(). > Signed-off-by: Ricardo Martincoski > Cc: Heiko Thiery > Cc: James Knight > Cc: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:40:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:40:56 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: Don't print directory in 'make' call In-Reply-To: <20211211204815.0159982964@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 11 Dec 2021 21:35:19 +0100") References: <20211211204815.0159982964@busybox.osuosl.org> Message-ID: <874k666zjb.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=c988867fd2c72fe5abeb63c4abe92f10eea6499d > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > It is possible that some users of buildroot have put it in a repository > and call into it from another Makefile such as: > .DEFAULT: > $(MAKE) O=$(abspath $(O)) -C buildroot $(@) > This technique works well except that Make tells us that it changes into > the buildroot directory: > make[1]: Entering directory 'buildroot' > Because this line doesn't have an equals within it, python raises a > ValueError exception within pkg-stats. > This patch has python tell the invoked make not to print directories > Signed-off-by: Cyril Bur > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:36:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:36:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] utils/getdeveloperlib.py: fix developer being reported for unrelated path Message-ID: <20220114164237.5E57E82B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c062ff23f231c8d8e14b9168841e532768a382ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Currently, by following the instructions in the manual and querying for developers for a patch that changes path package/foobar the script reports both developers that have these entries in the DEVELOPERS file: F: package/foo/ F: package/foobar/ Starting from commit "afc112b0e4 utils/getdeveloperlib.py: fix issue with hasfile()" get-developers script uses os.path.abspath() and os.path.relpath(). The catch is that those functions return the absolute path and the relative path without the trailing slash. When the paths associated to a developer are then compared to the paths a patch touches, using the string.startswith(), any substring returns True, leading to developers for package/foo/ being wrongly reported for package/foobar/ . Fix this by re-adding the trailing slash after using relpath(). Signed-off-by: Ricardo Martincoski Cc: Heiko Thiery Cc: James Knight Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 29bb478a49712dfa8ec25262cac77b7c8ff1e51f) Signed-off-by: Peter Korsgaard --- utils/getdeveloperlib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index e686bc793f..2575c87a36 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -254,6 +254,8 @@ def parse_developers(): for f in dev_files: dev_file = os.path.relpath(f, brpath) dev_file = dev_file.replace(os.sep, '/') # force unix sep + if f[-1] == '/': # relpath removes the trailing / + dev_file = dev_file + '/' files.append(dev_file) elif line == "": if not name: From peter at korsgaard.com Fri Jan 14 16:40:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:40:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: Don't print directory in 'make' call Message-ID: <20220114164237.66C57835C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22c4abd1449880ef1557101308aec84321990371 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x It is possible that some users of buildroot have put it in a repository and call into it from another Makefile such as: .DEFAULT: $(MAKE) O=$(abspath $(O)) -C buildroot $(@) This technique works well except that Make tells us that it changes into the buildroot directory: make[1]: Entering directory 'buildroot' Because this line doesn't have an equals within it, python raises a ValueError exception within pkg-stats. This patch has python tell the invoked make not to print directories Signed-off-by: Cyril Bur Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c988867fd2c72fe5abeb63c4abe92f10eea6499d) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 4e7f27c3a3..6e656bfc29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -364,7 +364,8 @@ def get_config_packages(): def package_init_make_info(): # Fetch all variables at once - variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", + variables = subprocess.check_output(["make", "--no-print-directory", "-s", + "BR2_HAVE_DOT_CONFIG=y", "printvars", "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES %_CPE_ID"]) variable_list = variables.decode().splitlines() From peter at korsgaard.com Fri Jan 14 16:35:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:35:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] utils/getdeveloperlib.py: fix developer being reported for unrelated path Message-ID: <20220114164245.B917883487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a86d297ba09061051d54cf859b194054afd26ba8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Currently, by following the instructions in the manual and querying for developers for a patch that changes path package/foobar the script reports both developers that have these entries in the DEVELOPERS file: F: package/foo/ F: package/foobar/ Starting from commit "afc112b0e4 utils/getdeveloperlib.py: fix issue with hasfile()" get-developers script uses os.path.abspath() and os.path.relpath(). The catch is that those functions return the absolute path and the relative path without the trailing slash. When the paths associated to a developer are then compared to the paths a patch touches, using the string.startswith(), any substring returns True, leading to developers for package/foo/ being wrongly reported for package/foobar/ . Fix this by re-adding the trailing slash after using relpath(). Signed-off-by: Ricardo Martincoski Cc: Heiko Thiery Cc: James Knight Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 29bb478a49712dfa8ec25262cac77b7c8ff1e51f) Signed-off-by: Peter Korsgaard --- utils/getdeveloperlib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index f2b36862e3..c05e1f888b 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -253,6 +253,8 @@ def parse_developers(): for f in dev_files: dev_file = os.path.relpath(f, brpath) dev_file = dev_file.replace(os.sep, '/') # force unix sep + if f[-1] == '/': # relpath removes the trailing / + dev_file = dev_file + '/' files.append(dev_file) elif line == "": if not name: From peter at korsgaard.com Fri Jan 14 16:40:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:40:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: Don't print directory in 'make' call Message-ID: <20220114164245.C0A94835C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b950f813282b65de014ea3042c569500eee3687 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x It is possible that some users of buildroot have put it in a repository and call into it from another Makefile such as: .DEFAULT: $(MAKE) O=$(abspath $(O)) -C buildroot $(@) This technique works well except that Make tells us that it changes into the buildroot directory: make[1]: Entering directory 'buildroot' Because this line doesn't have an equals within it, python raises a ValueError exception within pkg-stats. This patch has python tell the invoked make not to print directories Signed-off-by: Cyril Bur Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c988867fd2c72fe5abeb63c4abe92f10eea6499d) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 3992c8312a..a435abff3d 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -375,7 +375,8 @@ def get_config_packages(): def package_init_make_info(): # Fetch all variables at once - variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", + variables = subprocess.check_output(["make", "--no-print-directory", "-s", + "BR2_HAVE_DOT_CONFIG=y", "printvars", "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES %_CPE_ID"]) variable_list = variables.decode().splitlines() From peter at korsgaard.com Fri Jan 14 16:56:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:56:07 +0100 Subject: [Buildroot] [git commit] package/grpc: add missing licenses In-Reply-To: <20211211204815.2C2E182964@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 11 Dec 2021 21:46:17 +0100") References: <20211211204815.2C2E182964@busybox.osuosl.org> Message-ID: <87zgny5k9k.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=50c4fd9363c1e7ee864e3892e7c066ce4b38fdd4 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Some of the third party code is BSD-licensed. In addition, the roots.pem > certificate store is MPL-licensed. > This was probably already the case in earlier versions as well, but it > was only noticed while updating to 1.42.0 because the LICENSE file was > adapted for it. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:51:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:51:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/grpc: add missing licenses Message-ID: <20220114165000.D74698356B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=352f8567909a7fde994b4eca4366a90be7ad7d71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Some of the third party code is BSD-licensed. In addition, the roots.pem certificate store is MPL-licensed. This was probably already the case in earlier versions as well, but it was only noticed while updating to 1.42.0 because the LICENSE file was adapted for it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 50c4fd9363c1e7ee864e3892e7c066ce4b38fdd4) Signed-off-by: Peter Korsgaard --- package/grpc/grpc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index f7a704dcd1..3094a77ade 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -6,7 +6,7 @@ GRPC_VERSION = 1.35.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) -GRPC_LICENSE = Apache-2.0 +GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE GRPC_CPE_ID_VENDOR = grpc From peter at korsgaard.com Fri Jan 14 16:51:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:51:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/grpc: add missing licenses Message-ID: <20220114165012.120818356B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fea34dddc967e7fc3377dee8f17bd32615a1523 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Some of the third party code is BSD-licensed. In addition, the roots.pem certificate store is MPL-licensed. This was probably already the case in earlier versions as well, but it was only noticed while updating to 1.42.0 because the LICENSE file was adapted for it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 50c4fd9363c1e7ee864e3892e7c066ce4b38fdd4) Signed-off-by: Peter Korsgaard --- package/grpc/grpc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 1bb4bd2b98..110e5e640a 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -6,7 +6,7 @@ GRPC_VERSION = 1.41.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) -GRPC_LICENSE = Apache-2.0 +GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE GRPC_CPE_ID_VENDOR = grpc From fontaine.fabrice at gmail.com Fri Jan 14 17:18:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 18:18:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable system on host Message-ID: <20220114171847.634174-1-fontaine.fabrice@gmail.com> boost system (which provides boost asio) is needed by host-riscv-isa-sim since its addition in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure: error: Could not find a version of the Boost::Asio library! Fixes: - http://autobuild.buildroot.org/results/6c33a66386ab2171454d8ea8c1bd17a5582e21dd Signed-off-by: Fabrice Fontaine --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6d1046e9a2..2d2a8fb311 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace system test thread timer \ + python random serialization stacktrace test thread timer \ type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) -- 2.34.1 From herve.codina at bootlin.com Fri Jan 14 17:44:33 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Fri, 14 Jan 2022 18:44:33 +0100 Subject: [Buildroot] [PATCH 3/3] package/gstreamer1/gst1-imx2: new package In-Reply-To: <20220112094250.27022-3-sebastien.szymanski@armadeus.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> <20220112094250.27022-3-sebastien.szymanski@armadeus.com> Message-ID: <20220114184433.687ebc15@bootlin.com> Hi S?bastien, all On Wed, 12 Jan 2022 10:42:50 +0100 S?bastien Szymanski wrote: > This is version 2 of gst1-imx. > > Signed-off-by: S?bastien Szymanski > --- > package/gstreamer1/Config.in | 1 + > package/gstreamer1/gst1-imx2/Config.in | 75 +++++++++++++++++++++ > package/gstreamer1/gst1-imx2/gst1-imx2.hash | 3 + > package/gstreamer1/gst1-imx2/gst1-imx2.mk | 75 +++++++++++++++++++++ > 4 files changed, 154 insertions(+) > create mode 100644 package/gstreamer1/gst1-imx2/Config.in > create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.hash > create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.mk > This package seems an update of the existing gst1-imx package. Why add a new package instead of bumping gst1-imx ? Best regards, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 14 17:56:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 18:56:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/hiawatha: fix build with gcc 4.8 Message-ID: <20220114175614.963475-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit 4e36e8f2081a66f477dd038793082045876d65ee: /tmp/instance-1/output-1/build/hiawatha-11.1/mbedtls/library/ecjpake.c: In function 'self_test_rng': /tmp/instance-1/output-1/build/hiawatha-11.1/mbedtls/library/ecjpake.c:973:5: error: 'for' loop initial declarations are only allowed in C99 mode for( size_t i = 0; i < len; i++ ) ^ Fixes: - http://autobuild.buildroot.org/results/1befc1552af91f34c600229138910c2078c2fdca Signed-off-by: Fabrice Fontaine --- package/hiawatha/hiawatha.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 14d3c9f1ee..25da98a43c 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -15,6 +15,7 @@ HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver HIAWATHA_CONF_OPTS = \ -DINSTALL_MBEDTLS_HEADERS=OFF \ -DUSE_SYSTEM_MBEDTLS=OFF \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ -DENABLE_TOOLKIT=OFF \ -DCONFIG_DIR=/etc/hiawatha \ -DLOG_DIR=/var/log \ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 18:02:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 19:02:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR Message-ID: <20220114180242.963756-1-fontaine.fabrice@gmail.com> cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb Signed-off-by: Fabrice Fontaine --- package/targetcli-fb/targetcli-fb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..7425423b8f 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 21:06:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 22:06:50 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-configshell-fb: bump to version 1.1.29 Message-ID: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/python-configshell-fb/python-configshell-fb.hash | 2 +- package/python-configshell-fb/python-configshell-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-configshell-fb/python-configshell-fb.hash b/package/python-configshell-fb/python-configshell-fb.hash index 0903e284aa..8fc38f61a6 100644 --- a/package/python-configshell-fb/python-configshell-fb.hash +++ b/package/python-configshell-fb/python-configshell-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 3685446d6ee02881930bb2fdc5fdd254938da66ce9843a5b3676c4246b058e4b python-configshell-fb-1.1.fb18.tar.gz +sha256 24b47284b463dcfb9ee0c1558827e13442127e62fa279b6e0253f136cf49058c python-configshell-fb-1.1.29.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index 94b6fed5ab..d0dd421e8d 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = 1.1.fb18 +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.29 PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 21:06:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 22:06:51 +0100 Subject: [Buildroot] [PATCH 2/3] package/python-rtslib-fb: bump to version 2.1.74 In-Reply-To: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> References: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> Message-ID: <20220114210652.1057109-2-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/python-rtslib-fb/python-rtslib-fb.hash | 2 +- package/python-rtslib-fb/python-rtslib-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index f67231d398..3c2e39fffd 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-2.1.fb57.tar.gz +sha256 9f581c4bcffebc60be236af8a6ebdeccdb66d0435eeb04ab1b743c170b95d046 python-rtslib-fb-2.1.74.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 421fbed0ae..09bde874f0 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = 2.1.fb57 +PYTHON_RTSLIB_FB_VERSION = 2.1.74 # Do not switch site to PyPI: it does not contain the latest version. PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 21:06:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 22:06:52 +0100 Subject: [Buildroot] [PATCH 3/3] package/targetcli-fb: security bump to version 2.1.54 In-Reply-To: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> References: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> Message-ID: <20220114210652.1057109-3-fontaine.fabrice@gmail.com> Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak permissions for /etc/target (and for the backup directory and backup files). Signed-off-by: Fabrice Fontaine --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 207c38e046..64f68a6675 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 7425423b8f..c6ca776b27 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING -- 2.34.1 From heiko.thiery at gmail.com Fri Jan 14 21:15:26 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 14 Jan 2022 22:15:26 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220114211525.2697606-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- v2: - switch to extlinux - directly call genimage.sh - remove post-image.sh - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 7 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 59 ++++ 8 files changed, 505 insertions(+) create mode 100644 board/kontron/bl-imx8mm/extlinux.conf create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..93c5760489 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1179,7 +1179,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf new file mode 100644 index 0000000000..d38f7f81b7 --- /dev/null +++ b/board/kontron/bl-imx8mm/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..6c0ef69591 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,18 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 16K + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33k + } + + partition rootfs { + image = "rootfs.ext4" + offset = 8M + partition-uuid = %PARTUUID% + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..ed088dd0f8 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,28 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..3bc71325c6 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,302 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..5b5648cc14 --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,59 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.30.2 From giulio.benetti at benettiengineering.com Fri Jan 14 21:37:16 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 14 Jan 2022 22:37:16 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220114211525.2697606-1-heiko.thiery@gmail.com> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> Message-ID: Hi Heiko, > Il giorno 14 gen 2022, alle ore 22:17, Heiko Thiery ha scritto: > > ?The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > Cc: Frieder Schrempf > Signed-off-by: Heiko Thiery > --- > v2: > - switch to extlinux > - directly call genimage.sh > - remove post-image.sh > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > > DEVELOPERS | 2 + > board/kontron/bl-imx8mm/extlinux.conf | 4 + > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ > ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ > board/kontron/bl-imx8mm/post-build.sh | 7 + > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > configs/kontron_bl_imx8mm_defconfig | 59 ++++ > 8 files changed, 505 insertions(+) > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > create mode 100644 board/kontron/bl-imx8mm/readme.txt > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index c0bfde69da..93c5760489 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1179,7 +1179,9 @@ F: package/python-sip/ > F: package/uhd/ > > N: Heiko Thiery > +F: board/kontron/bl-imx8mm/ > F: board/kontron/pitx-imx8m/ > +F: configs/kontron_bl_imx8mm_defconfig > F: configs/kontron_pitx_imx8m_defconfig > F: package/altera-stapl/ > F: package/ipmitool/ > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > new file mode 100644 > index 0000000000..d38f7f81b7 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > new file mode 100644 > index 0000000000..6c0ef69591 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/genimage.cfg > @@ -0,0 +1,18 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 16K > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33k I?ve missed V1 patch, here ^^^ please use capitol K letter. I still have to write the linter for genimage.cfg files :-/ > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + offset = 8M > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..ed088dd0f8 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,28 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > + > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > + > +Signed-off-by: Heiko Thiery > +--- > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > +index 35d12fca32..940bf07a92 100644 > +--- a/configs/kontron-sl-mx8mm_defconfig > ++++ b/configs/kontron-sl-mx8mm_defconfig > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > + CONFIG_SPL_TEXT_BASE=0x7E1000 > + CONFIG_TARGET_KONTRON_MX8MM=y > ++CONFIG_SPL_MMC=y > ++CONFIG_SPL_SERIAL=y > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > + CONFIG_SPL=y > + CONFIG_DISTRO_DEFAULTS=y > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > new file mode 100644 > index 0000000000..3bc71325c6 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > @@ -0,0 +1,302 @@ > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > + u-boot.dtsi > + > +When using a board variant that selects the lvds specific dtb the > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > +include this in the board base u-boot.dtsi and create an additional one > +for the lvds variant. > + > +Signed-off-by: Heiko Thiery > +--- > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > + 3 files changed, 135 insertions(+), 123 deletions(-) > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > + > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +new file mode 100644 > +index 0000000000..4bf75722bf > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +@@ -0,0 +1,6 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +index 22d18e6f1c..4bf75722bf 100644 > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +@@ -3,126 +3,4 @@ > + * Copyright (C) 2019 Kontron Electronics GmbH > + */ > + > +-#include "imx8mm-u-boot.dtsi" > +- > +-/ { > +- aliases { > +- usb0 = &usbotg1; > +- usb1 = &usbotg2; > +- }; > +- > +- wdt-reboot { > +- compatible = "wdt-reboot"; > +- wdt = <&wdog1>; > +- u-boot,dm-spl; > +- }; > +- > +- firmware { > +- optee { > +- compatible = "linaro,optee-tz"; > +- method = "smc"; > +- }; > +- }; > +-}; > +- > +-&fec1 { > +- phy-mode = "rgmii-rxid"; > +-}; > +- > +-&i2c1 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&i2c2 { > +- status = "okay"; > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_i2c1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_pmic { > +- u-boot,dm-spl; > +- fsl,pins = < > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > +- /* Disable Pullup for SD_VSEL */ > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > +- >; > +-}; > +- > +-&pinctrl_uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_100mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_200mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&pca9450 { > +- u-boot,dm-spl; > +-}; > +- > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > +- u-boot,dm-spl; > +-}; > +- > +-&ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio2 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio3 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio4 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio5 { > +- u-boot,dm-spl; > +-}; > +- > +-&uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&wdog1 { > +- u-boot,dm-spl; > +-}; > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +new file mode 100644 > +index 0000000000..22d18e6f1c > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +@@ -0,0 +1,128 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-u-boot.dtsi" > ++ > ++/ { > ++ aliases { > ++ usb0 = &usbotg1; > ++ usb1 = &usbotg2; > ++ }; > ++ > ++ wdt-reboot { > ++ compatible = "wdt-reboot"; > ++ wdt = <&wdog1>; > ++ u-boot,dm-spl; > ++ }; > ++ > ++ firmware { > ++ optee { > ++ compatible = "linaro,optee-tz"; > ++ method = "smc"; > ++ }; > ++ }; > ++}; > ++ > ++&fec1 { > ++ phy-mode = "rgmii-rxid"; > ++}; > ++ > ++&i2c1 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&i2c2 { > ++ status = "okay"; > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; I don?t know the hardware of the board and it?s a bit off-topic, but do you really need 2 i2c channels before relocating uboot? Best regards Giulio > ++ > ++&pinctrl_ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_i2c1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_pmic { > ++ u-boot,dm-spl; > ++ fsl,pins = < > ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > ++ /* Disable Pullup for SD_VSEL */ > ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > ++ >; > ++}; > ++ > ++&pinctrl_uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_100mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_200mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pca9450 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > ++ u-boot,dm-spl; > ++}; > ++ > ++&ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio3 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio4 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio5 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&wdog1 { > ++ u-boot,dm-spl; > ++}; > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > new file mode 100644 > index 0000000000..df47ba5174 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/readme.txt > @@ -0,0 +1,85 @@ > +Kontron BL i.MX8M Mini > +====================== > + > +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > + > + > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make kontron_bl_imx8mm_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and build the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? flash.bin > + ??? Image > + ??? imx8mm-kontron-n801x-s.dtb > + ??? lpddr4_pmu_train_1d_dmem_201904.bin > + ??? lpddr4_pmu_train_1d_dmem_202006.bin > + ??? lpddr4_pmu_train_1d_dmem.bin > + ??? lpddr4_pmu_train_1d_dmem_pad.bin > + ??? lpddr4_pmu_train_1d_fw.bin > + ??? lpddr4_pmu_train_1d_imem_201904.bin > + ??? lpddr4_pmu_train_1d_imem_202006.bin > + ??? lpddr4_pmu_train_1d_imem.bin > + ??? lpddr4_pmu_train_1d_imem_pad.bin > + ??? lpddr4_pmu_train_2d_dmem_201904.bin > + ??? lpddr4_pmu_train_2d_dmem_202006.bin > + ??? lpddr4_pmu_train_2d_dmem.bin > + ??? lpddr4_pmu_train_2d_dmem_pad.bin > + ??? lpddr4_pmu_train_2d_fw.bin > + ??? lpddr4_pmu_train_2d_imem_201904.bin > + ??? lpddr4_pmu_train_2d_imem_202006.bin > + ??? lpddr4_pmu_train_2d_imem.bin > + ??? lpddr4_pmu_train_2d_imem_pad.bin > + ??? lpddr4_pmu_train_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot-spl.bin > + > + > +Flashing the SD card image > +========================== > + > +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > + > + $ sudo dd if=output/images/sdcard.img of= > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Insert the SD card > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. To make sure the bootloader loads bootscript from > +the correct location (SD card) set the boot_targets environment variable: > + > + $ setenv boot_targets mmc1 > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > new file mode 100644 > index 0000000000..5b5648cc14 > --- /dev/null > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -0,0 +1,59 @@ > +# Architecture > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y > + > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Fri Jan 14 21:45:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 22:45:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/ipmitool: add freeipmi optional dependency Message-ID: <20220114214526.1153063-1-fontaine.fabrice@gmail.com> freeipmi is an optional dependency which is enabled by default Signed-off-by: Fabrice Fontaine --- package/ipmitool/ipmitool.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index facd97a0b8..801f1ea6b0 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -19,6 +19,13 @@ IPMITOOL_CPE_ID_VENDOR = ipmitool_project # 0013-fru-sdr-Fix-id_string-buffer-overflows.patch IPMITOOL_IGNORE_CVES += CVE-2020-5208 +ifeq ($(BR2_PACKAGE_FREEIPMI),y) +IPMITOOL_DEPENDENCIES += freeipmi +IPMITOOL_CONF_OPTS += --enable-intf-free +else +IPMITOOL_CONF_OPTS += --disable-intf-free +endif + ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) IPMITOOL_DEPENDENCIES += openssl IPMITOOL_CONF_OPTS += --enable-intf-lanplus -- 2.34.1 From heiko.thiery at gmail.com Fri Jan 14 21:54:32 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 14 Jan 2022 22:54:32 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220114211525.2697606-1-heiko.thiery@gmail.com> Message-ID: Hi Giulio, Am Fr., 14. Jan. 2022 um 22:37 Uhr schrieb Giulio Benetti : > > Hi Heiko, > > > Il giorno 14 gen 2022, alle ore 22:17, Heiko Thiery ha scritto: > > > > ?The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > > > Cc: Frieder Schrempf > > Signed-off-by: Heiko Thiery > > --- > > v2: > > - switch to extlinux > > - directly call genimage.sh > > - remove post-image.sh > > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > > > > > DEVELOPERS | 2 + > > board/kontron/bl-imx8mm/extlinux.conf | 4 + > > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > > ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ > > ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ > > board/kontron/bl-imx8mm/post-build.sh | 7 + > > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > > configs/kontron_bl_imx8mm_defconfig | 59 ++++ > > 8 files changed, 505 insertions(+) > > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > > create mode 100644 board/kontron/bl-imx8mm/readme.txt > > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index c0bfde69da..93c5760489 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1179,7 +1179,9 @@ F: package/python-sip/ > > F: package/uhd/ > > > > N: Heiko Thiery > > +F: board/kontron/bl-imx8mm/ > > F: board/kontron/pitx-imx8m/ > > +F: configs/kontron_bl_imx8mm_defconfig > > F: configs/kontron_pitx_imx8m_defconfig > > F: package/altera-stapl/ > > F: package/ipmitool/ > > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > > new file mode 100644 > > index 0000000000..d38f7f81b7 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/extlinux.conf > > @@ -0,0 +1,4 @@ > > +label buildroot > > + kernel /boot/Image > > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > > + append root=PARTUUID=%PARTUUID% rootwait rw > > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > > new file mode 100644 > > index 0000000000..6c0ef69591 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/genimage.cfg > > @@ -0,0 +1,18 @@ > > +image sdcard.img { > > + hdimage { > > + partition-table-type = "gpt" > > + gpt-location = 16K > > + } > > + > > + partition imx-boot { > > + in-partition-table = "no" > > + image = "flash.bin" > > + offset = 33k > > I?ve missed V1 patch, here ^^^ please use capitol K letter. > I still have to write the linter for genimage.cfg files :-/ Indeed .. missed that. I will wait for some more comments and do a v3 with that fixed later. [snip] > > ++&i2c1 { > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&i2c2 { > > ++ status = "okay"; > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > I don?t know the hardware of the board and it?s a bit off-topic, > but do you really need 2 i2c channels before relocating uboot? Good catch. @Frieder: can you say something to that? -- Heiko From fontaine.fabrice at gmail.com Fri Jan 14 22:09:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 23:09:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/open62541: add OPEN62541_CPE_ID_VENDOR Message-ID: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 Signed-off-by: Fabrice Fontaine --- package/open62541/open62541.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 66777ce501..fb28a614e2 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -11,6 +11,7 @@ OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 OPEN62541_LICENSE_FILES = LICENSE +OPEN62541_CPE_ID_VENDOR = open62541 # Force Release build to remove -Werror. # Don't use git describe to get the version number. -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 22:20:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 23:20:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4092 Message-ID: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> Fix CVE-2021-4192: vim is vulnerable to Use After Free Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read Signed-off-by: Fabrice Fontaine --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6fa5d1bef0..fff5072063 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 6643ef0841..408b33a409 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3930 +VIM_VERSION = 8.2.4092 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 22:40:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 23:40:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.11 Message-ID: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> Fix the following security issues: - https://www.wireshark.org/security/wnpa-sec-2021-16.html (CVE-2021-4186) - https://www.wireshark.org/security/wnpa-sec-2021-17.html (CVE-2021-4185) - https://www.wireshark.org/security/wnpa-sec-2021-18.html (CVE-2021-4184) - https://www.wireshark.org/security/wnpa-sec-2021-20.html (CVE-2021-4182) - https://www.wireshark.org/security/wnpa-sec-2021-21.html (CVE-2021-4181) https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html Signed-off-by: Fabrice Fontaine --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bc7c9f4d7e..7b67e316ed 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 2ba81d1f39..0361d0bb64 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.10 +WIRESHARK_VERSION = 3.4.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license -- 2.34.1 From tianyuanhao3 at 163.com Sat Jan 15 01:50:04 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Fri, 14 Jan 2022 17:50:04 -0800 Subject: [Buildroot] [PATCH 1/1] package/util-linux/util-linux-libs: add a missing patch Message-ID: <20220115015004.2531151-1-tianyuanhao3@163.com> The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for util-linux, but forgot to create a symlink to util-linux-libs. This results in inconsistent libblkid.so builds from util-linux and util-linux-libs. If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different libblkid.so is used in different $(BASE_DIR)/per-package/$(PKG)_NAME/target. Signed-off-by: TIAN Yuanhao --- ...ibblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch | 1 + 1 file changed, 1 insertion(+) create mode 120000 package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch new file mode 120000 index 0000000000..2f3c482144 --- /dev/null +++ b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch @@ -0,0 +1 @@ +../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch \ No newline at end of file -- 2.25.1 From heiko.thiery at gmail.com Sat Jan 15 06:56:45 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sat, 15 Jan 2022 07:56:45 +0100 Subject: [Buildroot] [PATCH v2] configs/imx8mmevk: new defconfig In-Reply-To: <20220114024555.319448-1-festevam@gmail.com> References: <20220114024555.319448-1-festevam@gmail.com> Message-ID: Hi Fabio, Am Fr., 14. Jan. 2022 um 03:46 Uhr schrieb Fabio Estevam : > > Add support for imx8mmevk_defconfig that allows booting kernel, U-Boot and > TFA from the upstream repositories. > > Signed-off-by: Fabio Estevam > --- > Changes since v1: > - Also use TF-A and U-Boot upstream versions. > > DEVELOPERS | 1 + > board/freescale/imx8mmevk/genimage.cfg | 16 ++++++++ > board/freescale/imx8mmevk/readme.txt | 6 +++ > .../boot/extlinux/extlinux.conf | 4 ++ > configs/imx8mmevk_defconfig | 39 +++++++++++++++++++ > 5 files changed, 66 insertions(+) > create mode 100644 board/freescale/imx8mmevk/genimage.cfg > create mode 100644 board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf > create mode 100644 configs/imx8mmevk_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index 12777e8d61..e19072a14e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -839,6 +839,7 @@ F: configs/imx6ullevk_defconfig > F: configs/imx6ulpico_defconfig > F: configs/imx7d-sdb_defconfig > F: configs/imx7dpico_defconfig > +F: configs/imx8mmevk_defconfig > F: configs/imx8mqevk_defconfig > F: configs/mx25pdk_defconfig > F: configs/mx51evk_defconfig > diff --git a/board/freescale/imx8mmevk/genimage.cfg b/board/freescale/imx8mmevk/genimage.cfg > new file mode 100644 > index 0000000000..3a83aa1f03 > --- /dev/null > +++ b/board/freescale/imx8mmevk/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33k Giulio pointed out to me that the units should be described with capital letters. > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 8M > + } > +} > diff --git a/board/freescale/imx8mmevk/readme.txt b/board/freescale/imx8mmevk/readme.txt > index 7b69405d30..a8e80a48f9 100644 > --- a/board/freescale/imx8mmevk/readme.txt > +++ b/board/freescale/imx8mmevk/readme.txt > @@ -10,8 +10,14 @@ Build > > First, configure Buildroot for the i.MX8MM EVK board: > > +If you want to use the NXP kernel: > + > make freescale_imx8mmevk_defconfig > > +Or if you want to use a mainline kernel: > + > + make imx8mmevk_defconfig > + > Build all components: > > make > diff --git a/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..0ba2e4cbfc > --- /dev/null > +++ b/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,4 @@ > +Label imx8mm-evk-buildroot > + kernel /boot/Image > + devicetree /boot/imx8mm-evk.dtb > + append root=/dev/mmcblk1p1 rootwait rw I my respin I used: append root=PARTUUID=%PARTUUID% rootwait rw The UUID is created in a post-build.sh script and set it in extlinux.conf and genimage.cfg With that the image would not limited to be located on the SD card. > diff --git a/configs/imx8mmevk_defconfig b/configs/imx8mmevk_defconfig > new file mode 100644 > index 0000000000..170b8d273b > --- /dev/null > +++ b/configs/imx8mmevk_defconfig > @@ -0,0 +1,39 @@ > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" > +BR2_ROOTFS_OVERLAY="board/freescale/imx8mmevk/rootfs_overlay" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/imx8mmevk/genimage.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="240M" Do you need 240MB here? > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30890000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > +BR2_PACKAGE_HOST_GENIMAGE=y > -- > 2.25.1 > -- Heiko From thomas.petazzoni at bootlin.com Sat Jan 15 06:57:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 15 Jan 2022 06:57:05 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-14 Message-ID: <20220115065710.5AEB240261@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-14 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 70 | 11 | 0 | 81 | 2021.11.x | 28 | 6 | 0 | 34 | master | 113 | 69 | 0 | 182 | Classification of failures by reason for master ----------------------------------------------- host-riscv-isa-sim-1.1.0 | 9 rygel-0.40.2 | 9 guile-3.0.7 | 5 cryptsetup-2.4.2 | 4 frr-8.1 | 4 unknown | 4 bluez5_utils-5.63 | 2 ksmbd-tools-3.4.3 | 2 pcsc-lite-1.9.5 | 2 pulseview-0.4.2 | 2 vlc-3.0.16 | 2 wavemon-0.9.4 | 2 bat-0.18.3 | 1 bird-2.0.8 | 1 dnsmasq-2.86 | 1 gensio-2.2.9 | 1 gocryptfs-2.2.0 | 1 google-breakpad-7515ab13768... | 1 hiawatha-11.1 | 1 host-nodejs-14.18.2 | 1 ipmitool-1.8.18 | 1 libglvnd-1.3.2 | 1 libwpe-1.12.0 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.3 | 1 oracle-mysql-5.1.73 | 1 qpid-proton-0.35.0 | 1 qt5webkit-5.212.0-alpha4 | 1 rtorrent-0.9.8 | 1 sslh-1.22c | 1 suricata-6.0.4 | 1 tesseract-ocr-5.0.1 | 1 ulog-0389d243352255f6182326... | 1 waylandpp-0.2.8 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/fbcf33d023f59d70e09c8d65a50936f147542d52 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/081983b1aea4e42c508b14cedbc2a702bb847421 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d33810e1461d5d713cc6cd51220bd1f1d22d12ea | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e47d4ecbff3c6c453818003ed1046ad0b03586bf | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/d430815c7d060b45526881fd150fbb319e60b778 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/e2d0e16f69dd55aaaf5e10c37954ef3b6b909b29 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/4dc344db9155c75c7eb98dadb54bcc375dd6c137 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/f72cc7729cd35a3fd57cb6284aac21ce5c6a3285 | mips64el | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/ebb45fb1d8865e8b6837f289b80fd44c9530531c | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4d7179f77197d52b70dc7f846f1e013389897514 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5c48881cc0baf2176442f774d14dfa18c1ab1770 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/27ca87d0ebf9cf2c98bb9dcc705a6c55c6a25643 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/411f08caf5e307a5b639289b9ea0648f9d66d2a4 | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/97a28636cc3c11d92a86cc1b0b306ced3f9e5f19 | arm | gocryptfs-2.2.0 | NOK | http://autobuild.buildroot.net/results/43783f7c8d741bc1e7c83d8b4e7b9b69033b57d2 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/14d430c5e798460ce0362b0a4d6bc1270b7798a2 | sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/99896bcdf6dc40add16bfaeb1903f3bc5c40a056 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a25f4b208fd16586e8406c1fe2bd2fa3cc543eb1 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/00e1fa3fc21c7f7fd0d70801acb3c814f3d0dff2 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/2d0fb68d8cf01f3d5d432aa278622649490a5cae | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a5deaba12abd888826468f2b30eb939db3dbac0e | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/1befc1552af91f34c600229138910c2078c2fdca | mipsel | host-nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/c1ff82b61963d5fbfa0fca2ac0b66c44b7178e2a | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6e55599e8cc33249b331d7ab35e18404a1a81a4e | mips64el | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/4968e4402baa07e385035c67b8af75386e1934f4 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/4018426cbe4bc25000cefc2d8a45f67b0b59b018 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/f783cdc212c8a608f0732869dc738004ff6a67be | nios2 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/485a6894508d218dc2a2c12a4332300d53b5bcf3 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6af52d47cfed2acfbde3a40c52f0b7af10996869 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/8306678f1f22e8a8c0f9ceceeb26594213233c28 | arc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6c33a66386ab2171454d8ea8c1bd17a5582e21dd | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/4eedc823552d29c0bae119412c003696b993ac8a | mips64el | ipmitool-1.8.18 | NOK | http://autobuild.buildroot.net/results/feb68f64d53648f7c95ae825b9c35d086a16154f | powerpc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/d010ac16563690dca83584b8fe5e029a4d3314bf | mipsel | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/b4c3dba395327ab6ae28337efb962c99b2d5b922 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/63624bafc6f7a225d4db0667df977fd6141561aa | ORPH x86_64 | libwpe-1.12.0 | NOK | http://autobuild.buildroot.net/results/a6d564c90a22b23982f7008af95118bb232f8f6c | mipsel | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/6c8a4189e611e7091e5d1707882ffaaaff78d94e | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/4e296b5d1254cdec29e3710f0ef217581bec4a37 | xtensa | oracle-mysql-5.1.73 | NOK | http://autobuild.buildroot.net/results/17a46735fb5c52930ca1f04e42a3d7f44f1d698b | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/bc987ca0a08466cb834d9979ec3ed91b549b87e5 | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/b90f0e3b854682fde31d6a927f05bb092604d254 | ORPH aarch64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/f2e15910cced16fbf5b58eeb9678d8eb1d746cc6 | mips64el | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/492d599183ab104577ca66b0a7e7d9268109deb7 | nds32le | qpid-proton-0.35.0 | NOK | http://autobuild.buildroot.net/results/260eeaccf6765cefc8240665bbe4acca99571a0e | i686 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/2fbd472f455e486780feb78389e76d66fb9bf238 | i586 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/812a3839d34cad1f1a5f644308e984650b08a3b1 | ORPH arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/be408f05124601417abe93842f56e46aefbb0e3e | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/847c729011fc8ae14e6fc3c301e0626a824cc58c | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/94c5d5ba952af1ce763055f0de448e9c4db93244 | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/0e06f07a09321e412a11db6fbfc3b6b7403e5d48 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ebe1037bbe77a0e584e3f7a00a18ede18bba2472 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/df0a213964ef602130fbb3801ad1e0dc41f17b5d | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d05561335a8fb8823cba1a371a340b242c1edc42 | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/105cfaf0f5e4c899eb0f579e7e8981926c39692d | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/289a519831a5085dcd97a8ffc0aa1f2440b2c90a | arm | sslh-1.22c | NOK | http://autobuild.buildroot.net/results/ebe07ee3c256ced96487bc58f661538d7e12adff | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/a2ee74f239b6739425c6fc48853cada4677aadcc | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/f35edee58ab5ab1e388169a7b29ace7d2e311c91 | aarch64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/119e7207db8114c735718c1402d8e01549ea8a5b | arm | unknown | NOK | http://autobuild.buildroot.net/results/34d92ba7008115eb9a6b4dc16d3d0cf488a4d1c1 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/a730286d9773341dd5fb4b70d1202de78abfd86c | i686 | unknown | NOK | http://autobuild.buildroot.net/results/a8223c4d4db98f8e7a89703608924ac90e45c453 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/473816192409d03e9a44c3d3f75cbfc24a1ecd1b | i686 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/43e6cb8bd5bc76a66e6757d70dd3d6df62741c0a | powerpc64le | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/e20e86852b27087983317d28db177282637ac09e | m68k | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/5b818bf9ca34b06cc612e9241c811c40151b729b | s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f2076f8bcb90580b2ce6f6492d1eb995aa452834 | arm | waylandpp-0.2.8 | NOK | http://autobuild.buildroot.net/results/37992f753ac7309659719224e6c4b91aab301d13 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 monkey-f54856ce250c4e257354... | 2 bluez5_utils-5.62 | 1 gensio-2.2.3 | 1 glib-networking-2.66.0 | 1 netdata-1.21.1 | 1 perl-5.32.1 | 1 suricata-6.0.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | bluez5_utils-5.62 | NOK | http://autobuild.buildroot.net/results/de42002621611351b0162fc726a8287cae48584b | riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/1ea400ee1ffae9c3be328fffd1e422a3590c2683 | riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/67d8c2ea0fc33026db1aeab8c35a261856708985 | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a383430008e0288282eb7bd4fe2159cb65b4419e | aarch64_be | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/173321861d5e3bd363c67b38890f202156fc5a21 | sparc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/879ca24f450ed2c759a3100f7002ad73fb0005ec | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/f22a072a9e5c716885b477d29d64d0c97b36c57b | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/325ce48012a302558ffb9469979d8e95fd600743 | riscv32 | netdata-1.21.1 | NOK | http://autobuild.buildroot.net/results/399a576ed856b384f5481434010287f1d9619c37 | arm | perl-5.32.1 | NOK | http://autobuild.buildroot.net/results/2c13aceda37567d1d184b13c564a9b63ef05f38b | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/f5f77319bb7049d4029dee8347f333dba722fcec | Classification of failures by reason for 2021.11.x -------------------------------------------------- icu-69-1 | 1 libmbim-1.26.0 | 1 libmodsecurity-3.0.6 | 1 libqmi-1.30.2 | 1 nodejs-14.18.1 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | icu-69-1 | NOK | http://autobuild.buildroot.net/results/e89df0bab81a6133a6a206d5d4a3be89e096aa3d | ORPH mipsel | libmbim-1.26.0 | NOK | http://autobuild.buildroot.net/results/2857641e07a7ae67c75b20954c4dd272c343e586 | arm | libmodsecurity-3.0.6 | NOK | http://autobuild.buildroot.net/results/1b17def94d719a01b5acc64a7ca218bf2235d608 | sparc | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/a231ebf0dcdc35e94fac885799099bbfbdd0da87 | mipsel | nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/2542a6399a10195d9790492459420c330075f640 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/828c6489d4114b8f80a3529db37a5bdb22600b83 | Gitlab CI results for 2022-01-14 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083640 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083642 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083643 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083644 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083647 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083648 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083655 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083656 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083657 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083660 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083662 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083664 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083667 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083669 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083671 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083672 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083675 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083679 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083680 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083683 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083685 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083687 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083689 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083691 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083692 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083693 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083696 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083699 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083700 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083703 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083707 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083709 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083711 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083713 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083715 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083716 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083718 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083721 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083722 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083723 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083724 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083725 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083727 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083728 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083758 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083760 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083761 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083763 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083764 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083765 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083769 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083771 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083776 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083772 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083774 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083777 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083779 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083781 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083794 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083828 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083833 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083852 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083854 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083859 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083862 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083864 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083868 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083871 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083874 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083877 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083882 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083893 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083949 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083973 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083986 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083991 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083992 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083999 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084001 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084006 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084007 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084011 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084018 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084024 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084028 | qemu_arm_vexpress_tz | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084122 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084135 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084136 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084144 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084147 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084152 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084154 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084158 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084162 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084166 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084170 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084174 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084179 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084185 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084186 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084214 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084219 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084225 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084235 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084237 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084239 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084243 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084248 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084251 | -- http://autobuild.buildroot.net From peter at korsgaard.com Sat Jan 15 08:43:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:43:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/keepalived: fix CVE-2021-44225 In-Reply-To: <20211207220407.3320031-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 7 Dec 2021 23:04:07 +0100") References: <20211207220407.3320031-1-fontaine.fabrice@gmail.com> Message-ID: <87sftp5qzm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > In Keepalived through 2.2.4, the D-Bus policy does not sufficiently > restrict the message destination, allowing any user to inspect and > manipulate any property. This leads to access-control bypass in some > situations in which an unrelated D-Bus system service has a settable > (writable) property > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 08:55:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:55:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/findutils: enable selinux support In-Reply-To: <20211209222104.222786-1-aduskett@gmail.com> (Adam Duskett's message of "Thu, 9 Dec 2021 14:21:04 -0800") References: <20211209222104.222786-1-aduskett@gmail.com> Message-ID: <87o84d5qeo.fsf@dell.be.48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Signed-off-by: Adam Duskett Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fperrad at gmail.com Sat Jan 15 09:13:54 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sat, 15 Jan 2022 10:13:54 +0100 Subject: [Buildroot] [PATCH] package/janet: bump to version 1.19.2 Message-ID: <20220115091354.60566-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/janet/janet.hash | 2 +- package/janet/janet.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/janet/janet.hash b/package/janet/janet.hash index 8e78d9a4d..50e6b1fef 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bfc29c11a070cc175666f74eb99ea992276d6e269701ba9558a72cef05ac80b4 janet-1.18.1.tar.gz +sha256 02ff892f4bfc060a8a37f4a5c3e659bf34ba5f1f1c5eb07d60dc2642c5cf0476 janet-1.19.2.tar.gz # Locally calculated sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index b00f82846..5b6a9a182 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANET_VERSION = 1.18.1 +JANET_VERSION = 1.19.2 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE -- 2.32.0 From fperrad at gmail.com Sat Jan 15 09:14:18 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sat, 15 Jan 2022 10:14:18 +0100 Subject: [Buildroot] [PATCH] package/luajit: bump to version a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 Message-ID: <20220115091418.60621-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/luajit/luajit.hash | 2 +- package/luajit/luajit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index 1497ee9df..d92eefb39 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b1b19f92451a661ba1167ee0b259299616cb3a1cdaf5ab05d7ccffaffeb4a0fb luajit-05f1984e1a862e4b3d3c3b370c773492e2edf84a.tar.gz +sha256 7ea92e2414b6405c7fb3974ab092707c400a5496e8d4936174b5bd3aa6e94477 luajit-a91d0d9d3bba1a936669cfac3244509a0f2ac0e3.tar.gz # Locally calculated sha256 43fc251179d900f9948e51dd3cc93733d1219f2db060faaa0c8100ad054f54d8 COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index d2af69d1e..7c1b556ff 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a +LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT -- 2.32.0 From yann.morin.1998 at free.fr Sat Jan 15 09:17:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:17:02 +0100 Subject: [Buildroot] [git commit] package/util-linux/util-linux-libs: add a missing patch Message-ID: <20220115091114.E9584825E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93d23ef91fcfd8bf7f5a3ffc23d82bad8e868b34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for util-linux, but forgot to create a symlink to util-linux-libs. This results in inconsistent libblkid.so builds from util-linux and util-linux-libs. If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different libblkid.so is used in different $(BASE_DIR)/per-package/$(PKG)_NAME/target. Signed-off-by: TIAN Yuanhao Signed-off-by: Yann E. MORIN --- .../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch new file mode 120000 index 0000000000..2f3c482144 --- /dev/null +++ b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch @@ -0,0 +1 @@ +../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch \ No newline at end of file From yann.morin.1998 at free.fr Sat Jan 15 09:18:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:18:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/util-linux/util-linux-libs: add a missing patch In-Reply-To: <20220115015004.2531151-1-tianyuanhao3@163.com> References: <20220115015004.2531151-1-tianyuanhao3@163.com> Message-ID: <20220115091803.GA1945846@scaer> Yuanhao, All, On 2022-01-14 17:50 -0800, TIAN Yuanhao spake thusly: > The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for > util-linux, but forgot to create a symlink to util-linux-libs. This > results in inconsistent libblkid.so builds from util-linux and > util-linux-libs. > > If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different > libblkid.so is used in different > $(BASE_DIR)/per-package/$(PKG)_NAME/target. > > Signed-off-by: TIAN Yuanhao Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ibblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch | 1 + > 1 file changed, 1 insertion(+) > create mode 120000 package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch > > diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch > new file mode 120000 > index 0000000000..2f3c482144 > --- /dev/null > +++ b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch > @@ -0,0 +1 @@ > +../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch > \ No newline at end of file > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 09:19:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:19:56 +0100 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4092 Message-ID: <20220115091423.AD3B9825DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33a3f1f30dedaf613dccac5b86ec909a1f404957 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-4192: vim is vulnerable to Use After Free Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6fa5d1bef0..fff5072063 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 6643ef0841..408b33a409 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3930 +VIM_VERSION = 8.2.4092 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From yann.morin.1998 at free.fr Sat Jan 15 09:19:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:19:58 +0100 Subject: [Buildroot] [git commit] package/wireshark: security bump to version 3.4.11 Message-ID: <20220115091423.B5245817B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d19436b88dcea890b6a73b242e2a2cbb66e17fcd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following security issues: - https://www.wireshark.org/security/wnpa-sec-2021-16.html (CVE-2021-4186) - https://www.wireshark.org/security/wnpa-sec-2021-17.html (CVE-2021-4185) - https://www.wireshark.org/security/wnpa-sec-2021-18.html (CVE-2021-4184) - https://www.wireshark.org/security/wnpa-sec-2021-20.html (CVE-2021-4182) - https://www.wireshark.org/security/wnpa-sec-2021-21.html (CVE-2021-4181) https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bc7c9f4d7e..7b67e316ed 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 2ba81d1f39..0361d0bb64 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.10 +WIRESHARK_VERSION = 3.4.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From yann.morin.1998 at free.fr Sat Jan 15 09:21:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:21:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.11 In-Reply-To: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> References: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> Message-ID: <20220115092103.GB1945846@scaer> Fabrice, All, On 2022-01-14 23:40 +0100, Fabrice Fontaine spake thusly: > Fix the following security issues: > - https://www.wireshark.org/security/wnpa-sec-2021-16.html > (CVE-2021-4186) > - https://www.wireshark.org/security/wnpa-sec-2021-17.html > (CVE-2021-4185) > - https://www.wireshark.org/security/wnpa-sec-2021-18.html > (CVE-2021-4184) > - https://www.wireshark.org/security/wnpa-sec-2021-20.html > (CVE-2021-4182) > - https://www.wireshark.org/security/wnpa-sec-2021-21.html > (CVE-2021-4181) > > https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/wireshark/wireshark.hash | 6 +++--- > package/wireshark/wireshark.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash > index bc7c9f4d7e..7b67e316ed 100644 > --- a/package/wireshark/wireshark.hash > +++ b/package/wireshark/wireshark.hash > @@ -1,6 +1,6 @@ > -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt > -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz > -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz > +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt > +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz > +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz > > # Locally calculated > sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING > diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk > index 2ba81d1f39..0361d0bb64 100644 > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WIRESHARK_VERSION = 3.4.10 > +WIRESHARK_VERSION = 3.4.11 > WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz > WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions > WIRESHARK_LICENSE = wireshark license > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 09:21:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:21:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4092 In-Reply-To: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> References: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> Message-ID: <20220115092116.GC1945846@scaer> Fabrice, All, On 2022-01-14 23:20 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2021-4192: vim is vulnerable to Use After Free > Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/vim/vim.hash | 2 +- > package/vim/vim.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/vim/vim.hash b/package/vim/vim.hash > index 6fa5d1bef0..fff5072063 100644 > --- a/package/vim/vim.hash > +++ b/package/vim/vim.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz > +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz > sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE > sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt > diff --git a/package/vim/vim.mk b/package/vim/vim.mk > index 6643ef0841..408b33a409 100644 > --- a/package/vim/vim.mk > +++ b/package/vim/vim.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -VIM_VERSION = 8.2.3930 > +VIM_VERSION = 8.2.4092 > VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) > VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) > VIM_SUBDIR = src > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 09:21:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:21:43 +0100 Subject: [Buildroot] [git commit] package/open62541: add OPEN62541_CPE_ID_VENDOR Message-ID: <20220115091525.A36FC813AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88606bd9eb4cc244388a3dec70a21d54ee3fe352 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/open62541/open62541.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 66777ce501..fb28a614e2 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -11,6 +11,7 @@ OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 OPEN62541_LICENSE_FILES = LICENSE +OPEN62541_CPE_ID_VENDOR = open62541 # Force Release build to remove -Werror. # Don't use git describe to get the version number. From yann.morin.1998 at free.fr Sat Jan 15 09:22:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:22:18 +0100 Subject: [Buildroot] [git commit] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR Message-ID: <20220115091609.2E3E3817E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67af1b5ba50f387f6fb6ec7cc67283e1c9813fc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/targetcli-fb/targetcli-fb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..7425423b8f 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six From yann.morin.1998 at free.fr Sat Jan 15 09:22:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:22:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/open62541: add OPEN62541_CPE_ID_VENDOR In-Reply-To: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> References: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> Message-ID: <20220115092257.GD1945846@scaer> Fabrice, All, On 2022-01-14 23:09 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/open62541/open62541.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk > index 66777ce501..fb28a614e2 100644 > --- a/package/open62541/open62541.mk > +++ b/package/open62541/open62541.mk > @@ -11,6 +11,7 @@ OPEN62541_GIT_SUBMODULES = YES > OPEN62541_INSTALL_STAGING = YES > OPEN62541_LICENSE = MPL-2.0 > OPEN62541_LICENSE_FILES = LICENSE > +OPEN62541_CPE_ID_VENDOR = open62541 > > # Force Release build to remove -Werror. > # Don't use git describe to get the version number. > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 09:23:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR In-Reply-To: <20220114180242.963756-1-fontaine.fabrice@gmail.com> References: <20220114180242.963756-1-fontaine.fabrice@gmail.com> Message-ID: <20220115092312.GE1945846@scaer> Fabrice, All, On 2022-01-14 19:02 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier > for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/targetcli-fb/targetcli-fb.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk > index 75643446d2..7425423b8f 100644 > --- a/package/targetcli-fb/targetcli-fb.mk > +++ b/package/targetcli-fb/targetcli-fb.mk > @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 > TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) > TARGETCLI_FB_LICENSE = Apache-2.0 > TARGETCLI_FB_LICENSE_FILES = COPYING > +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project > TARGETCLI_FB_SETUP_TYPE = setuptools > TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 08:52:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:52:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/findutils: enable selinux support Message-ID: <20220115092443.E9CE3825F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c25e90cb3b4b52968d8bcf0d2722329a073e3bcd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 544839b318d08b7c331cc91b5f66b776d5a87736) Signed-off-by: Peter Korsgaard --- package/findutils/findutils.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index a16f827166..725a7a0287 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -15,4 +15,11 @@ FINDUTILS_CONF_ENV = \ ac_cv_func_working_mktime=yes \ gl_cv_func_wcwidth_works=yes +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +FINDUTILS_DEPENDENCIES += libselinux +FINDUTILS_CONF_OPTS += --with-selinux +else +FINDUTILS_CONF_OPTS += --without-selinux +endif + $(eval $(autotools-package)) From peter at korsgaard.com Sat Jan 15 08:42:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:42:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/keepalived: fix CVE-2021-44225 Message-ID: <20220115092443.DB2F7825F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9088c5ce6f634996db48fa2367e1ca69f721c7bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x In Keepalived through 2.2.4, the D-Bus policy does not sufficiently restrict the message destination, allowing any user to inspect and manipulate any property. This leads to access-control bypass in some situations in which an unrelated D-Bus system service has a settable (writable) property Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e4464fabb6323dba4974096886166b9c4631fd38) Signed-off-by: Peter Korsgaard --- ...02-dbus-fix-policy-to-not-be-overly-broad.patch | 42 ++++++++++++++++++++++ package/keepalived/keepalived.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch new file mode 100644 index 0000000000..6287d6117d --- /dev/null +++ b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch @@ -0,0 +1,42 @@ +From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Tue, 23 Nov 2021 06:50:59 +0100 +Subject: [PATCH] dbus: fix policy to not be overly broad + +The DBus policy did not restrict the message destination, allowing any +user to inspect and manipulate any property. + +Signed-off-by: Vincent Bernat + +[Retrieved from: +https://github.com/acassen/keepalived/commit/7977fec0be89ae6fe87405b3f8da2f0b5e415e3d] +Signed-off-by: Fabrice Fontaine +--- + keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf +index 2b78a575c..b5ced6085 100644 +--- a/keepalived/dbus/org.keepalived.Vrrp1.conf ++++ b/keepalived/dbus/org.keepalived.Vrrp1.conf +@@ -3,12 +3,15 @@ + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + + +- +- ++ ++ + + +- +- +- ++ ++ ++ + + diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 5d42cab741..e31c02dec5 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -12,6 +12,9 @@ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# 0002-dbus-fix-policy-to-not-be-overly-broad.patch +KEEPALIVED_IGNORE_CVES += CVE-2021-44225 + ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c KEEPALIVED_CONF_OPTS += --enable-json From peter at korsgaard.com Sat Jan 15 08:51:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:51:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/findutils: enable selinux support Message-ID: <20220115092450.464F582627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2ea0138161625322a61217ba3f8ef0d09779c7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 544839b318d08b7c331cc91b5f66b776d5a87736) Signed-off-by: Peter Korsgaard --- package/findutils/findutils.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 918591c53f..3237e5502a 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -15,4 +15,11 @@ FINDUTILS_CONF_ENV = \ ac_cv_func_working_mktime=yes \ gl_cv_func_wcwidth_works=yes +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +FINDUTILS_DEPENDENCIES += libselinux +FINDUTILS_CONF_OPTS += --with-selinux +else +FINDUTILS_CONF_OPTS += --without-selinux +endif + $(eval $(autotools-package)) From peter at korsgaard.com Sat Jan 15 08:41:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:41:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/keepalived: fix CVE-2021-44225 Message-ID: <20220115092450.3E0BF825F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=257dda3c473fd6e818812183ba8ce66f8d718412 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x In Keepalived through 2.2.4, the D-Bus policy does not sufficiently restrict the message destination, allowing any user to inspect and manipulate any property. This leads to access-control bypass in some situations in which an unrelated D-Bus system service has a settable (writable) property Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e4464fabb6323dba4974096886166b9c4631fd38) Signed-off-by: Peter Korsgaard --- ...02-dbus-fix-policy-to-not-be-overly-broad.patch | 42 ++++++++++++++++++++++ package/keepalived/keepalived.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch new file mode 100644 index 0000000000..6287d6117d --- /dev/null +++ b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch @@ -0,0 +1,42 @@ +From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Tue, 23 Nov 2021 06:50:59 +0100 +Subject: [PATCH] dbus: fix policy to not be overly broad + +The DBus policy did not restrict the message destination, allowing any +user to inspect and manipulate any property. + +Signed-off-by: Vincent Bernat + +[Retrieved from: +https://github.com/acassen/keepalived/commit/7977fec0be89ae6fe87405b3f8da2f0b5e415e3d] +Signed-off-by: Fabrice Fontaine +--- + keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf +index 2b78a575c..b5ced6085 100644 +--- a/keepalived/dbus/org.keepalived.Vrrp1.conf ++++ b/keepalived/dbus/org.keepalived.Vrrp1.conf +@@ -3,12 +3,15 @@ + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + + +- +- ++ ++ + + +- +- +- ++ ++ ++ + + diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 5d42cab741..e31c02dec5 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -12,6 +12,9 @@ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# 0002-dbus-fix-policy-to-not-be-overly-broad.patch +KEEPALIVED_IGNORE_CVES += CVE-2021-44225 + ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c KEEPALIVED_CONF_OPTS += --enable-json From yann.morin.1998 at free.fr Sat Jan 15 09:39:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:39:11 +0100 Subject: [Buildroot] [git commit] package/boost: enable system on host Message-ID: <20220115093409.87FDF8258B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b32c37a260b0fec70fd9c16bca6632d8be19e7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master boost system (which provides boost asio) is needed by host-riscv-isa-sim since its addition in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure: error: Could not find a version of the Boost::Asio library! Fixes: - http://autobuild.buildroot.org/results/6c33a66386ab2171454d8ea8c1bd17a5582e21dd Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6d1046e9a2..2d2a8fb311 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace system test thread timer \ + python random serialization stacktrace test thread timer \ type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) From peter at korsgaard.com Sat Jan 15 09:32:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 10:32:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/containerd: security bump to version 1.5.8 Message-ID: <20220115093824.593DE82929@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7bfd519b796cb98c5d4eee2e2e251121689dd604 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The eighth patch release for containerd 1.5 contains a mitigation for CVE-2021-41190 as well as several fixes and updates. https://github.com/containerd/containerd/releases/tag/v1.5.8 Signed-off-by: Fabrice Fontaine Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit fc24c5c30a4c933e81e67d92559b271396186e02) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 594c56a819..f1a6709554 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 09be0cedea77568029aa0c7be9a323b89fa6886b402b5d223780a05b8c7cd45a containerd-1.5.7.tar.gz +sha256 a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790 containerd-1.5.8.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index fdbd2bf3e6..cd975db274 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.7 +CONTAINERD_VERSION = 1.5.8 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 15 09:49:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:49:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable system on host In-Reply-To: <20220114171847.634174-1-fontaine.fabrice@gmail.com> References: <20220114171847.634174-1-fontaine.fabrice@gmail.com> Message-ID: <20220115094925.GF1945846@scaer> Fabrice, All, On 2022-01-14 18:18 +0100, Fabrice Fontaine spake thusly: > boost system (which provides boost asio) is needed by host-riscv-isa-sim > since its addition in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: > > configure: error: Could not find a version of the Boost::Asio library! > > Fixes: > - http://autobuild.buildroot.org/results/6c33a66386ab2171454d8ea8c1bd17a5582e21dd > > Signed-off-by: Fabrice Fontaine > --- > package/boost/boost.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/boost/boost.mk b/package/boost/boost.mk > index 6d1046e9a2..2d2a8fb311 100644 > --- a/package/boost/boost.mk > +++ b/package/boost/boost.mk > @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ > --without-libraries=$(subst $(space),$(comma),atomic chrono context \ > contract container coroutine date_time exception fiber filesystem graph \ > graph_parallel iostreams json locale log math mpi nowide program_options \ > - python random serialization stacktrace system test thread timer \ > + python random serialization stacktrace test thread timer \ > type_erasure wave) I was wondering why we need to disable those, and the original commit log is not very explicit about why this is so (429ffbd2253 boost: add host variant), and the comment is not very helpful either... So I did a test: remove all those exclusion (just exclude python [0]), and build just host-boost (it has no dependency): master : 54s no-exclusion: 2min 38s So yes, this is a big increase. But considering that we have no way for host packages to express dependencies on Boost features, I wonder if we should not just build the whole stuff. For example, packages in a br2-external have no way to say so... Anyway, in the meantime: applied to master, thanks. [0] building the Boost python module would require the python development files be installed on the host, or that we depend on host-python{,3}, neither of which are acceptable Regards, Yann E. MORIN. > BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 09:44:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 10:44:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/containerd: security bump to version 1.5.8 In-Reply-To: <20211210211558.4015391-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 10 Dec 2021 22:15:58 +0100") References: <20211210211558.4015391-1-fontaine.fabrice@gmail.com> Message-ID: <87k0f15o54.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > The eighth patch release for containerd 1.5 contains a mitigation for > CVE-2021-41190 as well as several fixes and updates. > https://github.com/containerd/containerd/releases/tag/v1.5.8 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 1.4.12, which fixes the same issue. -- Bye, Peter Korsgaard From egorenar-dev at posteo.net Sat Jan 15 10:15:23 2022 From: egorenar-dev at posteo.net (Alexander Egorenkov) Date: Sat, 15 Jan 2022 10:15:23 +0000 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: bump to version 0.8.8 Message-ID: <20220115101523.2932-1-egorenar-dev@posteo.net> Signed-off-by: Alexander Egorenkov --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index ac41e4815b72..f063848681ea 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7c5962be6068c78d5256e8fc979cf327988f7560705bb9cc25b508c50ca997c0 multipath-tools-0.8.7.tar.gz +sha256 ff45ddb18a1effbfbe5712f513dd3b7146c68141091fc1c2489af8d6197026ef multipath-tools-0.8.8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 3d8095b0b093..eecfe3900233 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.8.7 +MULTIPATH_TOOLS_VERSION = 0.8.8 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ -- 2.34.1 From yann.morin.1998 at free.fr Sat Jan 15 10:16:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:16:52 +0100 Subject: [Buildroot] [git commit] package/luajit: bump to version a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 Message-ID: <20220115101119.09BC78292F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=589065acf96e89ad503e4943fd55517d769563c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/luajit/luajit.hash | 2 +- package/luajit/luajit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index 1497ee9df4..d92eefb39a 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b1b19f92451a661ba1167ee0b259299616cb3a1cdaf5ab05d7ccffaffeb4a0fb luajit-05f1984e1a862e4b3d3c3b370c773492e2edf84a.tar.gz +sha256 7ea92e2414b6405c7fb3974ab092707c400a5496e8d4936174b5bd3aa6e94477 luajit-a91d0d9d3bba1a936669cfac3244509a0f2ac0e3.tar.gz # Locally calculated sha256 43fc251179d900f9948e51dd3cc93733d1219f2db060faaa0c8100ad054f54d8 COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index d2af69d1e3..7c1b556ff7 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a +LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT From yann.morin.1998 at free.fr Sat Jan 15 10:13:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:13:19 +0100 Subject: [Buildroot] [git commit] package/janet: bump to version 1.19.2 Message-ID: <20220115101119.009DE826D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=012dcef7c23c0470acf6e3a3e841ccaab4f91584 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/janet/janet.hash | 2 +- package/janet/janet.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/janet/janet.hash b/package/janet/janet.hash index 8e78d9a4d1..50e6b1fef0 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bfc29c11a070cc175666f74eb99ea992276d6e269701ba9558a72cef05ac80b4 janet-1.18.1.tar.gz +sha256 02ff892f4bfc060a8a37f4a5c3e659bf34ba5f1f1c5eb07d60dc2642c5cf0476 janet-1.19.2.tar.gz # Locally calculated sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index b00f82846c..5b6a9a182d 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANET_VERSION = 1.18.1 +JANET_VERSION = 1.19.2 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE From fontaine.fabrice at gmail.com Sat Jan 15 10:15:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 11:15:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/ghostscript: fix CVE-2021-45944 Message-ID: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in sampled_data_sample (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine --- ...ack-limits-after-function-evaluation.patch | 52 +++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 ++ 2 files changed, 55 insertions(+) create mode 100644 package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch new file mode 100644 index 0000000000..352f1754f6 --- /dev/null +++ b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch @@ -0,0 +1,52 @@ +From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i References: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> Message-ID: <20220115101535.1699671-2-fontaine.fabrice@gmail.com> Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine --- ...-management-in-sampled_data_continue.patch | 68 +++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 + 2 files changed, 71 insertions(+) create mode 100644 package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch diff --git a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch new file mode 100644 index 0000000000..72e07df0ac --- /dev/null +++ b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i References: <20220115091418.60621-1-francois.perrad@gadz.org> Message-ID: <20220115101811.GG1945846@scaer> Fran?ois, All On 2022-01-15 10:14 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/luajit/luajit.hash | 2 +- > package/luajit/luajit.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash > index 1497ee9df..d92eefb39 100644 > --- a/package/luajit/luajit.hash > +++ b/package/luajit/luajit.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 b1b19f92451a661ba1167ee0b259299616cb3a1cdaf5ab05d7ccffaffeb4a0fb luajit-05f1984e1a862e4b3d3c3b370c773492e2edf84a.tar.gz > +sha256 7ea92e2414b6405c7fb3974ab092707c400a5496e8d4936174b5bd3aa6e94477 luajit-a91d0d9d3bba1a936669cfac3244509a0f2ac0e3.tar.gz > > # Locally calculated > sha256 43fc251179d900f9948e51dd3cc93733d1219f2db060faaa0c8100ad054f54d8 COPYRIGHT > diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk > index d2af69d1e..7c1b556ff 100644 > --- a/package/luajit/luajit.mk > +++ b/package/luajit/luajit.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a > +LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 > LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) > LUAJIT_LICENSE = MIT > LUAJIT_LICENSE_FILES = COPYRIGHT > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 10:18:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:18:27 +0100 Subject: [Buildroot] [PATCH] package/janet: bump to version 1.19.2 In-Reply-To: <20220115091354.60566-1-francois.perrad@gadz.org> References: <20220115091354.60566-1-francois.perrad@gadz.org> Message-ID: <20220115101827.GH1945846@scaer> Fran?ois, All, On 2022-01-15 10:13 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/janet/janet.hash | 2 +- > package/janet/janet.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/janet/janet.hash b/package/janet/janet.hash > index 8e78d9a4d..50e6b1fef 100644 > --- a/package/janet/janet.hash > +++ b/package/janet/janet.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 bfc29c11a070cc175666f74eb99ea992276d6e269701ba9558a72cef05ac80b4 janet-1.18.1.tar.gz > +sha256 02ff892f4bfc060a8a37f4a5c3e659bf34ba5f1f1c5eb07d60dc2642c5cf0476 janet-1.19.2.tar.gz > > # Locally calculated > sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE > diff --git a/package/janet/janet.mk b/package/janet/janet.mk > index b00f82846..5b6a9a182 100644 > --- a/package/janet/janet.mk > +++ b/package/janet/janet.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -JANET_VERSION = 1.18.1 > +JANET_VERSION = 1.19.2 > JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) > JANET_LICENSE = MIT > JANET_LICENSE_FILES = LICENSE > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 10:19:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:19:08 +0100 Subject: [Buildroot] [git commit] package/ipmitool: add freeipmi optional dependency Message-ID: <20220115101248.A11208294C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f6b346a34bdb344c4a001d8bd66f5e973013c17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master freeipmi is an optional dependency which is enabled by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ipmitool/ipmitool.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index facd97a0b8..801f1ea6b0 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -19,6 +19,13 @@ IPMITOOL_CPE_ID_VENDOR = ipmitool_project # 0013-fru-sdr-Fix-id_string-buffer-overflows.patch IPMITOOL_IGNORE_CVES += CVE-2020-5208 +ifeq ($(BR2_PACKAGE_FREEIPMI),y) +IPMITOOL_DEPENDENCIES += freeipmi +IPMITOOL_CONF_OPTS += --enable-intf-free +else +IPMITOOL_CONF_OPTS += --disable-intf-free +endif + ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) IPMITOOL_DEPENDENCIES += openssl IPMITOOL_CONF_OPTS += --enable-intf-lanplus From yann.morin.1998 at free.fr Sat Jan 15 10:19:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:19:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/ipmitool: add freeipmi optional dependency In-Reply-To: <20220114214526.1153063-1-fontaine.fabrice@gmail.com> References: <20220114214526.1153063-1-fontaine.fabrice@gmail.com> Message-ID: <20220115101929.GI1945846@scaer> Fabrice, All, On 2022-01-14 22:45 +0100, Fabrice Fontaine spake thusly: > freeipmi is an optional dependency which is enabled by default > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ipmitool/ipmitool.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk > index facd97a0b8..801f1ea6b0 100644 > --- a/package/ipmitool/ipmitool.mk > +++ b/package/ipmitool/ipmitool.mk > @@ -19,6 +19,13 @@ IPMITOOL_CPE_ID_VENDOR = ipmitool_project > # 0013-fru-sdr-Fix-id_string-buffer-overflows.patch > IPMITOOL_IGNORE_CVES += CVE-2020-5208 > > +ifeq ($(BR2_PACKAGE_FREEIPMI),y) > +IPMITOOL_DEPENDENCIES += freeipmi > +IPMITOOL_CONF_OPTS += --enable-intf-free > +else > +IPMITOOL_CONF_OPTS += --disable-intf-free > +endif > + > ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) > IPMITOOL_DEPENDENCIES += openssl > IPMITOOL_CONF_OPTS += --enable-intf-lanplus > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From rainbox2k12 at msgsafe.io Sat Jan 15 10:14:15 2022 From: rainbox2k12 at msgsafe.io (rainbox2k12) Date: Sat, 15 Jan 2022 10:14:15 +0000 (UTC) Subject: [Buildroot] package/vte: add libvte to buildroot toolchain Message-ID: <20220115101415.986123F41E@exit1-us.msgsafe.io> This patch is needed in order to use libvte in the buildroot toolchain. diff --git a/package/vte/vte.mk b/package/vte/vte.mk index 07e8136..ceb2f09 100644 \--- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -11,6 +11,7 @@ VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) VTE_LICENSE = LGPL-3.0+ VTE_LICENSE_FILES = COPYING.LGPL3 +VTE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_ICU),y) VTE_CONF_OPTS += -Dicu=true \-- Sent using MsgSafe.io's Free Plan Private, encrypted, online communication For everyone. https://www.msgsafe.io -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sat Jan 15 10:23:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:23:03 +0100 Subject: [Buildroot] [git commit] package/targetcli-fb: security bump to version 2.1.54 Message-ID: <20220115101718.49F728296C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=488f92a1c368c842f9f6c1bbae0384cfa803a684 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak permissions for /etc/target (and for the backup directory and backup files). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 207c38e046..64f68a6675 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 7425423b8f..c6ca776b27 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sat Jan 15 10:22:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:22:59 +0100 Subject: [Buildroot] [git commit] package/python-configshell-fb: bump to version 1.1.29 Message-ID: <20220115101718.3885682684@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e61c7eef35ba2c962cac23a2e59ec9920f301348 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-configshell-fb/python-configshell-fb.hash | 2 +- package/python-configshell-fb/python-configshell-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-configshell-fb/python-configshell-fb.hash b/package/python-configshell-fb/python-configshell-fb.hash index 0903e284aa..8fc38f61a6 100644 --- a/package/python-configshell-fb/python-configshell-fb.hash +++ b/package/python-configshell-fb/python-configshell-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 3685446d6ee02881930bb2fdc5fdd254938da66ce9843a5b3676c4246b058e4b python-configshell-fb-1.1.fb18.tar.gz +sha256 24b47284b463dcfb9ee0c1558827e13442127e62fa279b6e0253f136cf49058c python-configshell-fb-1.1.29.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index 94b6fed5ab..d0dd421e8d 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = 1.1.fb18 +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.29 PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sat Jan 15 10:23:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:23:01 +0100 Subject: [Buildroot] [git commit] package/python-rtslib-fb: bump to version 2.1.74 Message-ID: <20220115101718.4110182962@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcba4ae9444ec606bc7a48cbd04d9b55b87ba7fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-rtslib-fb/python-rtslib-fb.hash | 2 +- package/python-rtslib-fb/python-rtslib-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index f67231d398..3c2e39fffd 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-2.1.fb57.tar.gz +sha256 9f581c4bcffebc60be236af8a6ebdeccdb66d0435eeb04ab1b743c170b95d046 python-rtslib-fb-2.1.74.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 421fbed0ae..09bde874f0 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = 2.1.fb57 +PYTHON_RTSLIB_FB_VERSION = 2.1.74 # Do not switch site to PyPI: it does not contain the latest version. PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Sat Jan 15 10:24:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:24:15 +0100 Subject: [Buildroot] [PATCH 3/3] package/targetcli-fb: security bump to version 2.1.54 In-Reply-To: <20220114210652.1057109-3-fontaine.fabrice@gmail.com> References: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> <20220114210652.1057109-3-fontaine.fabrice@gmail.com> Message-ID: <20220115102415.GJ1945846@scaer> Fabrice, All, On 2022-01-14 22:06 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak > permissions for /etc/target (and for the backup directory and backup > files). > > Signed-off-by: Fabrice Fontaine Series of 3 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/targetcli-fb/targetcli-fb.hash | 2 +- > package/targetcli-fb/targetcli-fb.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash > index 207c38e046..64f68a6675 100644 > --- a/package/targetcli-fb/targetcli-fb.hash > +++ b/package/targetcli-fb/targetcli-fb.hash > @@ -1,3 +1,3 @@ > # locally computed > -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz > +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz > sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING > diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk > index 7425423b8f..c6ca776b27 100644 > --- a/package/targetcli-fb/targetcli-fb.mk > +++ b/package/targetcli-fb/targetcli-fb.mk > @@ -6,7 +6,7 @@ > > # When upgrading the version, be sure to also upgrade python-rtslib-fb > # and python-configshell-fb at the same time. > -TARGETCLI_FB_VERSION = 2.1.fb41 > +TARGETCLI_FB_VERSION = 2.1.54 > TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) > TARGETCLI_FB_LICENSE = Apache-2.0 > TARGETCLI_FB_LICENSE_FILES = COPYING > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 10:38:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:38:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-containerd: security bump to version 1.4.12 Message-ID: <20220115103230.73668826D6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71786cb620d61498676645fc9087e9518d8b85d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The twelfth patch release for containerd 1.4 contains a few minor bug fixes and an update to mitigate CVE-2021-41190. https://github.com/containerd/containerd/releases/tag/v1.4.12 Signed-off-by: Peter Korsgaard --- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index 82b9d00d8c..ffcbeee54b 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 d42bf6d4f303061166fa5ec2657726a443d978fe13cf08ed13532df5216a61b2 docker-containerd-1.4.11.tar.gz +sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c docker-containerd-1.4.12.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 80f621fe7c..08c189525c 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.4.11 +DOCKER_CONTAINERD_VERSION = 1.4.12 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE From fontaine.fabrice at gmail.com Sat Jan 15 10:37:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 11:37:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable all features except python on host Message-ID: <20220115103754.1759593-1-fontaine.fabrice@gmail.com> Enable all features except python on host variant as suggested by Yann E. Morin in https://patchwork.ozlabs.org/project/buildroot/patch/20220114171847.634174-1-fontaine.fabrice at gmail.com Indeed, host packages have no way to express their dependencies on host boost Signed-off-by: Fabrice Fontaine --- package/boost/boost.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 2d2a8fb311..ad071ed206 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -12,13 +12,7 @@ BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt BOOST_CPE_ID_VENDOR = boost -# keep host variant as minimal as possible -HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ - --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - contract container coroutine date_time exception fiber filesystem graph \ - graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace test thread timer \ - type_erasure wave) +HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc --without-libraries=python BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) -- 2.34.1 From peter at korsgaard.com Sat Jan 15 10:39:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:39:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-utils: fix install rule for alsactl In-Reply-To: <20211211025034.800367-1-admin@khoahoang.com> (Khoa Hoang's message of "Fri, 10 Dec 2021 18:50:34 -0800") References: <20211211025034.800367-1-admin@khoahoang.com> Message-ID: <87fspp5ll2.fsf@dell.be.48ers.dk> >>>>> "Khoa" == Khoa Hoang writes: > The copy command for /usr/share/alsa missing an asterisk cause it to copy to > /usr/share/alsa/alsa instead of /usr/share/alsa where it should be. > Signed-off-by: Khoa Hoang Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 15 10:47:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 11:47:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pysftp: fix dependencies Message-ID: <20220115104729.1760707-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of python-cryptography to version 36.0.1 in commit 01764876e3d4e7ab95c8365f1c83e6c12d49757c: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] Selected by [y]: - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] Selected by [y]: - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/python-pysftp/Config.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in index 5d5b731f33..c65369b667 100644 --- a/package/python-pysftp/Config.in +++ b/package/python-pysftp/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_PYTHON_PYSFTP bool "python-pysftp" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-paramiko -> python-cryptography depends on BR2_PACKAGE_PYTHON3 # python-paramiko -> python-bcrypt - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko select BR2_PACKAGE_PYTHON_PARAMIKO # runtime help A friendly face on SFTP. https://bitbucket.org/dundeemt/pysftp - -comment "python-pysftp needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP -- 2.34.1 From peter at korsgaard.com Sat Jan 15 10:51:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: bump to version 0.103.4 In-Reply-To: <20211211213632.537666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 11 Dec 2021 22:36:31 +0100") References: <20211211213632.537666-1-fontaine.fabrice@gmail.com> Message-ID: <87bl0d5l2f.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > ClamAV 0.103.4 is a critical patch release: > https://blog.clamav.net/2021/11/clamav-01034-and-01041-patch-releases.html > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:54:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:54:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/x11r7/xapp_xauth: bump version to 1.1.1 In-Reply-To: <20211212084857.127023-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 12 Dec 2021 09:48:56 +0100") References: <20211212084857.127023-1-bernd.kuhls@t-online.de> Message-ID: <877db15kx0.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Removed md5 and sha1 license hashes. > Release notes: > https://lists.x.org/archives/xorg-announce/2021-November/003118.html > Signed-off-by: Bernd Kuhls Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:56:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:56:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.5 In-Reply-To: (Christian Stewart via buildroot's message of "Thu, 6 Jan 2022 13:39:35 -0800") References: <20211212090107.2975294-1-christian@paral.in> Message-ID: <8735lp5ku3.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart via buildroot writes: > Hi maintainers, all, > Currently 2021.11.x branch is at version 1.17.3 which is vulnerable to: > - CVE-2021-44716 > - CVE-2021-44717 > Is it currently policy to backport security patches? > Similarly the 2021.02.x LTS branch is at 1.16.10, when the security > fixes landed in 1.16.12. > I've just submitted 1.17.6 to the list and will submit 1.16.12 for > 2021.02.x as well. Committed to 2021.11.x, thanks. Sorry for the delay. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:58:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:58:24 +0100 Subject: [Buildroot] [PATCH 2/2] package/x11r7/xlib_libX11: bump version to 1.7.3.1 In-Reply-To: <20211212084857.127023-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 12 Dec 2021 09:48:57 +0100") References: <20211212084857.127023-1-bernd.kuhls@t-online.de> <20211212084857.127023-2-bernd.kuhls@t-online.de> Message-ID: <87y23h465r.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Upstream switched from bz2 to xz tarball. > Release notes: > https://lists.x.org/archives/xorg-announce/2021-December/003120.html > https://lists.x.org/archives/xorg-announce/2021-December/003121.html > Signed-off-by: Bernd Kuhls Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:59:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:59:24 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Roman Gorbenkov, e-mail bouncing In-Reply-To: <20211213080333.791558380D@busybox.osuosl.org> (Thomas Petazzoni's message of "Mon, 13 Dec 2021 09:08:17 +0100") References: <20211213080333.791558380D@busybox.osuosl.org> Message-ID: <87tue54643.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=656f4a3718c5c643e419718ee693109093accbd9 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > : host mxd.relay.renater.fr[194.214.200.9] said: 550 > 5.5.0 Requested actions not taken as the mailbox is unavailable (in reply > to RCPT TO command) > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 15 11:00:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 12:00:11 +0100 Subject: [Buildroot] package/vte: add libvte to buildroot toolchain In-Reply-To: <20220115101415.986123F41E@exit1-us.msgsafe.io> References: <20220115101415.986123F41E@exit1-us.msgsafe.io> Message-ID: <20220115110011.GK1945846@scaer> rainbox2k12, All, On 2022-01-15 10:14 +0000, rainbox2k12 via buildroot spake thusly: > This patch is needed in order to use libvte in the buildroot toolchain. Thanks for your contribution; it definitely makes sense. To accept patches in Buildroot, we need them to be properly authored to a real name. Additionally, patches should have a sign-off that matches the author of the patch. Patches should also be properly formatted with a title and a description. In this case, a appropriate commit-log should probably look like: package/vte: install to staging vte also provides libvte, a library that can be linked to by other programs, so install it in staging. Signed-off-by: Your Real NAME See the manual for more details: https://buildroot.org/downloads/manual/manual.html#submitting-patches > diff --git a/package/vte/vte.mk b/package/vte/vte.mk > > index 07e8136..ceb2f09 100644 > > --- a/package/vte/vte.mk > > +++ b/package/vte/vte.mk > > @@ -11,6 +11,7 @@ VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) > > VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) > > VTE_LICENSE = LGPL-3.0+ > > VTE_LICENSE_FILES = COPYING.LGPL3 > > +VTE_INSTALL_STAGING = YES This patch is heavily mangled by your mailer. Please use 'git send-email' to send patches; this ensures that patches are properly formatted in a mail ready to be applied by maintainers. Regards, Yann E. MORIN. > ifeq ($(BR2_PACKAGE_ICU),y) > > VTE_CONF_OPTS += -Dicu=true > > -- > Sent using [1]MsgSafe.io's Free Plan > Private, encrypted, online communication > For everyone. [2]www.msgsafe.io > > Links: > 1. file:///tmp/mail-html2txt.2089315.NQ2C0Z/https:/www.msgsafe.io/?utm_source=msgsafe&utm_medium=email&utm_campaign=freemailsignature > 2. file:///tmp/mail-html2txt.2089315.NQ2C0Z/https:/www.msgsafe.io/?utm_source=msgsafe&utm_medium=email&utm_campaign=freemailsignature > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 11:01:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:01:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: bump to version 2.1.4 In-Reply-To: <20211212174922.668065-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 12 Dec 2021 18:49:22 +0100") References: <20211212174922.668065-1-fontaine.fabrice@gmail.com> Message-ID: <87pmot4612.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Mutt 2.1.4 was released on December 11, 2021. This is a bug-fix release, > fixing a performance issue when used with DavMail. > Mutt 2.1.3 was released on September 10, 2021. This is a bug-fix > release, fixing some of the fixes in the last release. IMAP and > QRESYNC users are advised to upgrade. > Mutt 2.1.2 was released on August 24, 2021. This is an important bug-fix > release, fixing a potential data-loss IMAP bug, a couple QRESYNC bugs, > and a few other issues. IMAP users are strongly advised to upgrade. > http://www.mutt.org > https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-4-rel/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:48:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:48:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/clamav: bump to version 0.103.4 Message-ID: <20220115105522.0F85F829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=daa07be55df578ba78994aba964e8f6f91ccae23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x ClamAV 0.103.4 is a critical patch release: https://blog.clamav.net/2021/11/clamav-01034-and-01041-patch-releases.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ac629ef040fc8b10521d2592c944e09fd70b7016) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index a2ed115d24..d68b04af76 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 clamav-0.103.3.tar.gz +sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 63af111da5..94b589b975 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.3 +CLAMAV_VERSION = 0.103.4 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Sat Jan 15 10:39:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:39:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/alsa-utils: fix install rule for alsactl Message-ID: <20220115105521.F327C82911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bdea4db4ba8df19b50e5ac72217336b1d4e2316 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The copy command for /usr/share/alsa missing an asterisk cause it to copy to /usr/share/alsa/alsa instead of /usr/share/alsa where it should be. Signed-off-by: Khoa Hoang Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6c71b52235d88cd8d38b4fd02c87f791aaa8eff3) Signed-off-by: Peter Korsgaard --- package/alsa-utils/alsa-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 427280c1e6..2603e52f18 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -77,7 +77,7 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS fi if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \ mkdir -p $(TARGET_DIR)/usr/share/; \ - cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \ + cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/; \ fi endef From peter at korsgaard.com Sat Jan 15 10:59:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:59:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: remove Roman Gorbenkov, e-mail bouncing Message-ID: <20220115105522.32F7F82911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1de8b3afe12c40fd127011b888f1c7f55b2227ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x : host mxd.relay.renater.fr[194.214.200.9] said: 550 5.5.0 Requested actions not taken as the mailbox is unavailable (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni (cherry picked from commit 656f4a3718c5c643e419718ee693109093accbd9) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c9848ac428..048d88ff55 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2402,9 +2402,6 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ -N: Roman Gorbenkov -F: package/davfs2/ - N: Ryan Barnett F: package/atftp/ F: package/c-periphery/ From peter at korsgaard.com Sat Jan 15 10:55:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:55:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/go: security bump to 1.17.5 Message-ID: <20220115105522.21838829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=823354d13d9112f83624de9a17c13f5c77f9e1a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x go1.17.4 (released 2021-12-02) includes fixes to the compiler, linker, runtime, and the go/types, net/http, and time packages. go1.17.5 (released 2021-12-09) includes security fixes to the syscall and net/http packages: - CVE-2021-44716 - CVE-2021-44717 https://go.dev/doc/devel/release#go1.17 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit eb92bb01b325521e5bd85349ad57281c1e481c33) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 9031c33d8a..39f8226aae 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0 go1.17.3.src.tar.gz +sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 59177e54db..0d9ceab2bb 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.3 +GO_VERSION = 1.17.5 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Sat Jan 15 10:57:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:57:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/x11r7/xlib_libX11: bump version to 1.7.3.1 Message-ID: <20220115105522.29AE8829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74d578c31c67afaf9fb7a92c07b34e24cc09d1c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Upstream switched from bz2 to xz tarball. Release notes: https://lists.x.org/archives/xorg-announce/2021-December/003120.html https://lists.x.org/archives/xorg-announce/2021-December/003121.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e39d5fb074807ee2e1725549d555153262626e41) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 7aeef33446..126be07f03 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-June/003092.html -sha256 1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c libX11-1.7.2.tar.bz2 -sha512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7 libX11-1.7.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-December/003121.html +sha256 2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989 libX11-1.7.3.1.tar.xz +sha512 a2620076db4bf35ab94706c8ab714e9c3fecbdd533cf99cdffeabaf49a1a1d30a233eb2dc76da51b01d50c43f11780aa3b2936668d982a33fa7d5008be44e25b libX11-1.7.3.1.tar.xz # Locally computed sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index aa3ebf1593..a8dc7f3668 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.7.2 -XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 +XLIB_LIBX11_VERSION = 1.7.3.1 +XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT XLIB_LIBX11_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Jan 15 10:47:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:47:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/clamav: drop first patch Message-ID: <20220115105522.0738A829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4eeeda794b345d3fde69770f215fe6897848a16d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x First patch is not needed since bump to version 0.99.1 in commit 2c8e5dd69f4f281b2b497ae7ec9ec95c47e7c80c and https://github.com/Cisco-Talos/clamav/commit/689005317680854627b79c76ffa6e42a8160b0e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3d565a831d7316ffbd182694b25674ab0101718b) Signed-off-by: Peter Korsgaard --- ...roto.c-fix-build-error-due-to-missing-soc.patch | 34 ---------------------- ...use-backtrace-if-using-uClibc-without-ba.patch} | 0 2 files changed, 34 deletions(-) diff --git a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch deleted file mode 100644 index daac677eaa..0000000000 --- a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 7 May 2018 23:14:46 +0200 -Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un - definition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -proto.c: In function ???dconnect???: -proto.c:86:67: error: invalid application of ???sizeof??? to incomplete type ???struct sockaddr_un??? - if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) - -Signed-off-by: Bernd Kuhls -Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html ---- - clamdscan/proto.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/clamdscan/proto.c b/clamdscan/proto.c -index 0205f6da0..d3396732f 100644 ---- a/clamdscan/proto.c -+++ b/clamdscan/proto.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_SYS_SELECT_H - #include - #endif --- -2.14.3 - diff --git a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch similarity index 100% rename from package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch rename to package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch From peter at korsgaard.com Sat Jan 15 11:00:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:00:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mutt: bump to version 2.1.4 Message-ID: <20220115105522.3C52082911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0743af30a8cc51cf669638e93df26fe9cf3768d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Mutt 2.1.4 was released on December 11, 2021. This is a bug-fix release, fixing a performance issue when used with DavMail. Mutt 2.1.3 was released on September 10, 2021. This is a bug-fix release, fixing some of the fixes in the last release. IMAP and QRESYNC users are advised to upgrade. Mutt 2.1.2 was released on August 24, 2021. This is an important bug-fix release, fixing a potential data-loss IMAP bug, a couple QRESYNC bugs, and a few other issues. IMAP users are strongly advised to upgrade. http://www.mutt.org https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-4-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7686a1382f97b8c2b2de00a8bc20e7208a2123b7) Signed-off-by: Peter Korsgaard --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index 1b58c50065..dceae57b65 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4ae6d60f7f19854c375cc1c27b5768b71e9f450c2adc10c22e45de8a27de524a mutt-2.1.1.tar.gz +sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 66616f032c..44d7864eb6 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.1 +MUTT_VERSION = 2.1.4 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From peter at korsgaard.com Sat Jan 15 10:54:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:54:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/x11r7/xapp_xauth: bump version to 1.1.1 Message-ID: <20220115105522.18F7882911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dccdddf13ac2106c65ebbfd6e211581e13578517 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Removed md5 and sha1 license hashes. Release notes: https://lists.x.org/archives/xorg-announce/2021-November/003118.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 01414cc093d9e791b15caff37dd426623068883c) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xauth/xapp_xauth.hash | 9 ++++----- package/x11r7/xapp_xauth/xapp_xauth.mk | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xauth/xapp_xauth.hash b/package/x11r7/xapp_xauth/xapp_xauth.hash index 0251c083a7..22ea4cadfd 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.hash +++ b/package/x11r7/xapp_xauth/xapp_xauth.hash @@ -1,7 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003005.html -md5 e50587c1bb832aafd1a19d91a0890a0b xauth-1.1.tar.bz2 -sha1 16180e36d75a23cb182cb91e78f24273f1a63967 xauth-1.1.tar.bz2 -sha256 6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c xauth-1.1.tar.bz2 -sha512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c xauth-1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-November/003118.html +sha256 164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92 xauth-1.1.1.tar.bz2 +sha512 998c3158378fff50d368959c29335173b8d98e02591cb3d7b2f9534b5a44b19deb4cb7da9bf291ca5a37f69f833d72839b2c6611723306d10c1b4968ae4d4120 xauth-1.1.1.tar.bz2 + # Locally computed sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk index cd900f0055..64b064d3bd 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.mk +++ b/package/x11r7/xapp_xauth/xapp_xauth.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XAUTH_VERSION = 1.1 +XAPP_XAUTH_VERSION = 1.1.1 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XAUTH_LICENSE = MIT From peter at korsgaard.com Sat Jan 15 10:48:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:48:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/clamav: bump version to 0.103.3 Message-ID: <20220115105526.61546829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6be56b0fd91c86b606bdbdcc52d9bddc1d47034b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://blog.clamav.net/2021/06/clamav-01033-patch-release.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 3950ab9bc7439ec6eb35dfdc5b36da038ae2ce50) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 679240985b..a2ed115d24 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d4b5d0ac666262e423a326fb54778caa7c69624d6c3f9542895feb8478271bd2 clamav-0.103.2.tar.gz +sha256 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 clamav-0.103.3.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index b3e1ca98ad..63af111da5 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.2 +CLAMAV_VERSION = 0.103.3 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Sat Jan 15 10:39:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:39:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/alsa-utils: fix install rule for alsactl Message-ID: <20220115105526.58CD3829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58b40c62f37f5841cbd1c9c6ff55512216101248 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The copy command for /usr/share/alsa missing an asterisk cause it to copy to /usr/share/alsa/alsa instead of /usr/share/alsa where it should be. Signed-off-by: Khoa Hoang Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6c71b52235d88cd8d38b4fd02c87f791aaa8eff3) Signed-off-by: Peter Korsgaard --- package/alsa-utils/alsa-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 427280c1e6..2603e52f18 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -77,7 +77,7 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS fi if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \ mkdir -p $(TARGET_DIR)/usr/share/; \ - cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \ + cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/; \ fi endef From peter at korsgaard.com Sat Jan 15 10:50:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:50:42 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/clamav: bump to version 0.103.4 Message-ID: <20220115105526.73357829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f445c949b0e5018a47107101fe8c5231b2fe3e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x ClamAV 0.103.4 is a critical patch release: https://blog.clamav.net/2021/11/clamav-01034-and-01041-patch-releases.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ac629ef040fc8b10521d2592c944e09fd70b7016) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index a2ed115d24..d68b04af76 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 clamav-0.103.3.tar.gz +sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 63af111da5..94b589b975 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.3 +CLAMAV_VERSION = 0.103.4 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Sat Jan 15 10:53:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:53:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/x11r7/xapp_xauth: bump version to 1.1.1 Message-ID: <20220115105526.7B71C829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a110aa56451bbe0b5713812b44b99e473b69afd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Removed md5 and sha1 license hashes. Release notes: https://lists.x.org/archives/xorg-announce/2021-November/003118.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 01414cc093d9e791b15caff37dd426623068883c) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xauth/xapp_xauth.hash | 9 ++++----- package/x11r7/xapp_xauth/xapp_xauth.mk | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xauth/xapp_xauth.hash b/package/x11r7/xapp_xauth/xapp_xauth.hash index 0251c083a7..22ea4cadfd 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.hash +++ b/package/x11r7/xapp_xauth/xapp_xauth.hash @@ -1,7 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003005.html -md5 e50587c1bb832aafd1a19d91a0890a0b xauth-1.1.tar.bz2 -sha1 16180e36d75a23cb182cb91e78f24273f1a63967 xauth-1.1.tar.bz2 -sha256 6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c xauth-1.1.tar.bz2 -sha512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c xauth-1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-November/003118.html +sha256 164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92 xauth-1.1.1.tar.bz2 +sha512 998c3158378fff50d368959c29335173b8d98e02591cb3d7b2f9534b5a44b19deb4cb7da9bf291ca5a37f69f833d72839b2c6611723306d10c1b4968ae4d4120 xauth-1.1.1.tar.bz2 + # Locally computed sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk index cd900f0055..64b064d3bd 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.mk +++ b/package/x11r7/xapp_xauth/xapp_xauth.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XAUTH_VERSION = 1.1 +XAPP_XAUTH_VERSION = 1.1.1 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XAUTH_LICENSE = MIT From peter at korsgaard.com Sat Jan 15 10:50:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:50:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/clamav: drop first patch Message-ID: <20220115105526.6A6DE829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d645ab244230c03908e7cb6c440ba143c9203cf5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x First patch is not needed since bump to version 0.99.1 in commit 2c8e5dd69f4f281b2b497ae7ec9ec95c47e7c80c and https://github.com/Cisco-Talos/clamav/commit/689005317680854627b79c76ffa6e42a8160b0e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3d565a831d7316ffbd182694b25674ab0101718b) Signed-off-by: Peter Korsgaard --- ...roto.c-fix-build-error-due-to-missing-soc.patch | 34 ---------------------- ...use-backtrace-if-using-uClibc-without-ba.patch} | 0 2 files changed, 34 deletions(-) diff --git a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch deleted file mode 100644 index daac677eaa..0000000000 --- a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 7 May 2018 23:14:46 +0200 -Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un - definition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -proto.c: In function ???dconnect???: -proto.c:86:67: error: invalid application of ???sizeof??? to incomplete type ???struct sockaddr_un??? - if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) - -Signed-off-by: Bernd Kuhls -Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html ---- - clamdscan/proto.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/clamdscan/proto.c b/clamdscan/proto.c -index 0205f6da0..d3396732f 100644 ---- a/clamdscan/proto.c -+++ b/clamdscan/proto.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_SYS_SELECT_H - #include - #endif --- -2.14.3 - diff --git a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch similarity index 100% rename from package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch rename to package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch From peter at korsgaard.com Sat Jan 15 10:59:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:59:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: remove Roman Gorbenkov, e-mail bouncing Message-ID: <20220115105526.8E0D3829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=654d798b829c4f677fa5eca99a4a0e569ec3fa1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x : host mxd.relay.renater.fr[194.214.200.9] said: 550 5.5.0 Requested actions not taken as the mailbox is unavailable (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni (cherry picked from commit 656f4a3718c5c643e419718ee693109093accbd9) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a2c4368dd0..2d7f971b25 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2284,9 +2284,6 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ -N: Roman Gorbenkov -F: package/davfs2/ - N: Ryan Barnett F: package/atftp/ F: package/c-periphery/ From peter at korsgaard.com Sat Jan 15 10:58:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:58:14 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/x11r7/xlib_libX11: bump version to 1.7.3.1 Message-ID: <20220115105526.83CD4829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0fe00a878c573663e2cb1cab3ecd8f68eecd340 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Upstream switched from bz2 to xz tarball. Release notes: https://lists.x.org/archives/xorg-announce/2021-December/003120.html https://lists.x.org/archives/xorg-announce/2021-December/003121.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e39d5fb074807ee2e1725549d555153262626e41) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 7aeef33446..126be07f03 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-June/003092.html -sha256 1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c libX11-1.7.2.tar.bz2 -sha512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7 libX11-1.7.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-December/003121.html +sha256 2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989 libX11-1.7.3.1.tar.xz +sha512 a2620076db4bf35ab94706c8ab714e9c3fecbdd533cf99cdffeabaf49a1a1d30a233eb2dc76da51b01d50c43f11780aa3b2936668d982a33fa7d5008be44e25b libX11-1.7.3.1.tar.xz # Locally computed sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index aa3ebf1593..a8dc7f3668 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.7.2 -XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 +XLIB_LIBX11_VERSION = 1.7.3.1 +XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT XLIB_LIBX11_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Jan 15 11:04:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:04:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.40 In-Reply-To: <20211212192544.838696-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 12 Dec 2021 20:25:44 +0100") References: <20211212192544.838696-1-fontaine.fabrice@gmail.com> Message-ID: <87lezh45vp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop patches (already in version) > - This bump will fix build failures on ARM > - This bump will fix build failures with old glibc thanks to > https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e1671236671afbf7719b3ef29039ec4ac5102347 > https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.40 > Fixes: > - http://autobuild.buildroot.org/results/faec4ea02f4a6ddf44d54d5784d9de866c2d8a1f > - http://autobuild.buildroot.org/results/31014558b6ad72e0f602095c423d48219dd6ebfa > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 11:06:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:06:14 +0100 Subject: [Buildroot] [PATCH 1/1] DEVELOPERS: add Andreas Ziegler to package/mpd In-Reply-To: <20211213063402.792467-1-br015@umbiko.net> (Andreas Ziegler's message of "Mon, 13 Dec 2021 07:34:02 +0100") References: <20211213063402.792467-1-br015@umbiko.net> Message-ID: <87h7a545sp.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > to monitor issues and changes. > Signed-off-by: Andreas Ziegler Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 15 11:05:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 12:05:33 +0100 Subject: [Buildroot] [git commit] package/ghostscript: fix CVE-2021-45949 Message-ID: <20220115110038.2ED6182A01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c817641331431aeb6db7b487173d63dbd9c73295 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...stack-management-in-sampled_data_continue.patch | 68 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 + 2 files changed, 71 insertions(+) diff --git a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch new file mode 100644 index 0000000000..72e07df0ac --- /dev/null +++ b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i commit: https://git.buildroot.net/buildroot/commit/?id=70910c4092d9c9f359c26436fbc3c75918a90129 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in sampled_data_sample (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ck-stack-limits-after-function-evaluation.patch | 52 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 ++ 2 files changed, 55 insertions(+) diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch new file mode 100644 index 0000000000..352f1754f6 --- /dev/null +++ b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch @@ -0,0 +1,52 @@ +From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i (Maxime Chevallier's message of "Mon, 13 Dec 2021 11:52:55 +0100") References: <20211213105255.650164-1-maxime.chevallier@bootlin.com> Message-ID: <87czkt45lc.fsf@dell.be.48ers.dk> >>>>> "Maxime" == Maxime Chevallier writes: > The Beaglebone Black Wireless needs a specific DT, which u-boot tries to > load based on the board name. Make sure we ship the DT so that we can > boot on that platform. > Signed-off-by: Maxime Chevallier Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 15 11:08:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 12:08:41 +0100 Subject: [Buildroot] [git commit] package/python-pysftp: fix dependencies Message-ID: <20220115110425.E5767825E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=959f3826e827544a15b7f8ef168b1146d5be81d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of python-cryptography to version 36.0.1 in commit 01764876e3d4e7ab95c8365f1c83e6c12d49757c: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] Selected by [y]: - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] Selected by [y]: - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pysftp/Config.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in index 5d5b731f33..c65369b667 100644 --- a/package/python-pysftp/Config.in +++ b/package/python-pysftp/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_PYTHON_PYSFTP bool "python-pysftp" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-paramiko -> python-cryptography depends on BR2_PACKAGE_PYTHON3 # python-paramiko -> python-bcrypt - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko select BR2_PACKAGE_PYTHON_PARAMIKO # runtime help A friendly face on SFTP. https://bitbucket.org/dundeemt/pysftp - -comment "python-pysftp needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP From yann.morin.1998 at free.fr Sat Jan 15 11:11:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 12:11:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pysftp: fix dependencies In-Reply-To: <20220115104729.1760707-1-fontaine.fabrice@gmail.com> References: <20220115104729.1760707-1-fontaine.fabrice@gmail.com> Message-ID: <20220115111153.GL1945846@scaer> Fabrice, All, On 2022-01-15 11:47 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump of python-cryptography > to version 36.0.1 in commit 01764876e3d4e7ab95c8365f1c83e6c12d49757c: > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO > Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] > Selected by [y]: > - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO > Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] > Selected by [y]: > - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-pysftp/Config.in | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in > index 5d5b731f33..c65369b667 100644 > --- a/package/python-pysftp/Config.in > +++ b/package/python-pysftp/Config.in > @@ -1,13 +1,9 @@ > config BR2_PACKAGE_PYTHON_PYSFTP > bool "python-pysftp" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-paramiko -> python-cryptography > depends on BR2_PACKAGE_PYTHON3 # python-paramiko -> python-bcrypt > - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko > select BR2_PACKAGE_PYTHON_PARAMIKO # runtime > help > A friendly face on SFTP. > > https://bitbucket.org/dundeemt/pysftp > - > -comment "python-pysftp needs a toolchain w/ C++" > - depends on BR2_PACKAGE_PYTHON3 > - depends on !BR2_INSTALL_LIBSTDCPP > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 11:17:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:17:03 +0100 Subject: [Buildroot] [PATCH 1/2] package/libvirt: fix libvirtd option In-Reply-To: <20211213221035.1779283-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Dec 2021 23:10:34 +0100") References: <20211213221035.1779283-1-fontaine.fabrice@gmail.com> Message-ID: <878rvh45ao.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Replace libvirtd by driver_libvirtd to avoid the following build failure > raised since the addition of the package in commit > ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: > ../output-1/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "libvirtd" > Fixes: > - http://autobuild.buildroot.org/results/3a20db6cb39c0d91213adbe82934274659df43e7 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 11:17:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:17:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/libvirt: fix dependencies in Config.in In-Reply-To: <20211213221035.1779283-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Dec 2021 23:10:35 +0100") References: <20211213221035.1779283-1-fontaine.fabrice@gmail.com> <20211213221035.1779283-2-fontaine.fabrice@gmail.com> Message-ID: <874k6545aj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop spurious "depends on WCHAR" added with commit > ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and adds missing wchar comment > While at it, drop BR2_USE_MMU from comment as it is already added by > BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS and fix indentation before > (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 15 11:16:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 12:16:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/php-apcu: fix build without __sync_*_4 intrinsics Message-ID: <20220115111622.1910388-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 8ddeeffa186d8bce875ac713c1e71483c618842a: configure: error: Compiler does not support atomics --enable-apcu-rwlocks can't be used until https://github.com/krakjoe/apcu/pull/430 is merged (and autoreconf does not work either) Fixes: - http://autobuild.buildroot.org/results/efa/efa3b4406f87a1e9521b66f392a6fa19ac01f0cd/build-end.log Signed-off-by: Fabrice Fontaine --- package/php-apcu/php-apcu.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/php-apcu/php-apcu.mk b/package/php-apcu/php-apcu.mk index ce59611d8f..3ac062e772 100644 --- a/package/php-apcu/php-apcu.mk +++ b/package/php-apcu/php-apcu.mk @@ -22,4 +22,8 @@ define PHP_APCU_PHPIZE endef PHP_APCU_PRE_CONFIGURE_HOOKS += PHP_APCU_PHPIZE +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),) +PHP_APCU_CONF_OPTS += --disable-apcu-rwlocks +endif + $(eval $(autotools-package)) -- 2.34.1 From peter at korsgaard.com Sat Jan 15 11:18:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:18:42 +0100 Subject: [Buildroot] [PATCH] package/json-for-modern-cpp: bump to version 3.10.4 In-Reply-To: <20211214121123.6867-1-buildroot@heine.tech> (Michael Nosthoff via buildroot's message of "Tue, 14 Dec 2021 13:11:21 +0100") References: <20211214121123.6867-1-buildroot@heine.tech> Message-ID: <87zgnx2qnh.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Nosthoff via buildroot writes: > This release fixes two bugs introduced in release 3.10.0 and fixes the > conversion of std::filesystem::path. All changes are backward-compatible. > https://github.com/nlohmann/json/releases/tag/v3.10.4 > Signed-off-by: Michael Nosthoff Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 11:20:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:20:00 +0100 Subject: [Buildroot] [PATCH] package/ruby: security update to 3.0.3 In-Reply-To: (Waldemar Brodkorb's message of "Tue, 14 Dec 2021 13:33:10 +0100") References: Message-ID: <87v8yl2qlb.fsf@dell.be.48ers.dk> >>>>> "Waldemar" == Waldemar Brodkorb writes: > Signed-off-by: Waldemar Brodkorb Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 2.7.5, which has the same fixes. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 11:07:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:07:42 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] configs/beaglebone: add DT for the Beaglebone Black Wireless Message-ID: <20220115111347.54A1582A42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=310d3d6bef9719ee7e147e59697143e0f1c0e023 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The Beaglebone Black Wireless needs a specific DT, which u-boot tries to load based on the board name. Make sure we ship the DT so that we can boot on that platform. Signed-off-by: Maxime Chevallier Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1984222c84f53f530dce230d14f30015d971ab3f) Signed-off-by: Peter Korsgaard --- board/beaglebone/genimage.cfg | 1 + configs/beaglebone_defconfig | 2 +- configs/beaglebone_qt5_defconfig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index cfc1039ec4..1c77c58f38 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -10,6 +10,7 @@ image boot.vfat { "am335x-bone.dtb", "am335x-boneblack.dtb", "am335x-bonegreen.dtb", + "am335x-boneblack-wireless.dtb", } } size = 16M diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 9a4be13ec5..5a37f42d3e 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -10,7 +10,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 5f084b77df..11a91677ce 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.7 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y From peter at korsgaard.com Sat Jan 15 11:05:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:05:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add Andreas Ziegler to package/mpd Message-ID: <20220115111347.4A9DB82A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b0360c73c6cca0b5b3dbe4d07e19f998cbfd169 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x to monitor issues and changes. Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f9ae2246045b141537af24769ed491ee3f281608) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2d7f971b25..f90224989f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -131,6 +131,9 @@ F: package/wine/ N: Andreas Klinger F: package/ply/ +N: Andreas Ziegler +F: package/mpd/ + N: Andrey Smirnov F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ From peter at korsgaard.com Sat Jan 15 11:05:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:05:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add Andreas Ziegler to package/mpd Message-ID: <20220115111353.8C60982A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d56287dfe4053c0a3e80f5236dd22be7f7bbe6ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x to monitor issues and changes. Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f9ae2246045b141537af24769ed491ee3f281608) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 048d88ff55..a4fdf3eddd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -133,6 +133,9 @@ F: package/wine/ N: Andreas Klinger F: package/ply/ +N: Andreas Ziegler +F: package/mpd/ + N: Andrey Smirnov F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ From peter at korsgaard.com Sat Jan 15 11:18:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:18:04 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/json-for-modern-cpp: bump to version 3.10.4 Message-ID: <20220115111353.AFBE882A42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed459845821f3fd49b6faf1c50ef723f07d225d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release fixes two bugs introduced in release 3.10.0 and fixes the conversion of std::filesystem::path. All changes are backward-compatible. https://github.com/nlohmann/json/releases/tag/v3.10.4 Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 87577a92aa4df511899d58ec9f7edb1e87c83a67) Signed-off-by: Peter Korsgaard --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index 1a98971dbc..eb14d2fd6d 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e0d7c1b120cac47fa7f14a41d10a5d390f67d423d8e97b9d6834887285d6873c json-3.10.3.tar.gz +sha256 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3 json-3.10.4.tar.gz sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 53cf17d2c6..428473db5a 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.10.3 +JSON_FOR_MODERN_CPP_VERSION = 3.10.4 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From peter at korsgaard.com Sat Jan 15 11:15:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:15:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: fix libvirtd option Message-ID: <20220115111353.9F1F88077E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b287106c74d969c0c185d7da389fe7065e5e167b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Replace libvirtd by driver_libvirtd to avoid the following build failure raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: ../output-1/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "libvirtd" Fixes: - http://autobuild.buildroot.org/results/3a20db6cb39c0d91213adbe82934274659df43e7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 86f91e14b5c158d4533909656c8174b6f28760af) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 3118de4d58..9a4788c905 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -194,7 +194,7 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Dlibvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -240,7 +240,7 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Dlibvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled endif From peter at korsgaard.com Sat Jan 15 11:04:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:04:19 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pipewire: bump to version 0.3.40 Message-ID: <20220115111353.83C028077E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c2e8a461771a3dd4e25614b70a88d1fa399a9c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Drop patches (already in version) - This bump will fix build failures on ARM - This bump will fix build failures with old glibc thanks to https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e1671236671afbf7719b3ef29039ec4ac5102347 https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.40 Fixes: - http://autobuild.buildroot.org/results/faec4ea02f4a6ddf44d54d5784d9de866c2d8a1f - http://autobuild.buildroot.org/results/31014558b6ad72e0f602095c423d48219dd6ebfa Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88281a5c4efbc637f0a6d1ac6e92f68ba2050c1a) Signed-off-by: Peter Korsgaard --- ...cpu-fix-compilation-on-some-architectures.patch | 28 -------------------- ...02-cpu-disable-VFP-asm-when-not-available.patch | 30 ---------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 2 +- 4 files changed, 2 insertions(+), 60 deletions(-) diff --git a/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch b/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch deleted file mode 100644 index 4465523610..0000000000 --- a/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 651f0decea5f83730c271e9bed03cdd0048fcd49 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 21 Oct 2021 11:09:48 +0200 -Subject: [PATCH] cpu: fix compilation on some architectures - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49] -Signed-off-by: Fabrice Fontaine ---- - spa/plugins/support/cpu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu.c b/spa/plugins/support/cpu.c -index ee1816512..01cff4854 100644 ---- a/spa/plugins/support/cpu.c -+++ b/spa/plugins/support/cpu.c -@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory, - if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL) - this->vm_type = atoi(str); - if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL) -- impl_cpu_zero_denormals(this, spa_atob(str)); -+ spa_cpu_zero_denormals(&this->cpu, spa_atob(str)); - } - - spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x", --- -GitLab - diff --git a/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch b/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch deleted file mode 100644 index 297016edc2..0000000000 --- a/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2cddd4a775c145570f4a8a30d28b57f551d43206 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Mon, 25 Oct 2021 16:32:16 +0200 -Subject: [PATCH] cpu: disable VFP asm when not available - -Fixes #1746 - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/2cddd4a775c145570f4a8a30d28b57f551d43206] -Signed-off-by: Fabrice Fontaine ---- - spa/plugins/support/cpu-arm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c -index c07711f70..fe6222f7c 100644 ---- a/spa/plugins/support/cpu-arm.c -+++ b/spa/plugins/support/cpu-arm.c -@@ -143,7 +143,7 @@ static int arm_zero_denormals(void *object, bool enable) - "msr fpcr, %0 \n" - "isb \n" - : "=r"(cw)::"memory"); --#else -+#elif (defined(__VFP_FP__) && !defined(__SOFTFP__)) - uint32_t cw; - if (enable) - __asm__ __volatile__( --- -GitLab - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 7894939b0d..c41c0a3686 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 fafcde675b264485883df1f3bf7e08f36fd1d661ecc092dcec6fd35a059c2aff pipewire-0.3.39.tar.bz2 +sha256 b6a2eab8bda2f3cb87c3a0a714839696831ad27b5786674c4bd6c3776b9ebc97 pipewire-0.3.40.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index cbf24dd0ec..efda3ad695 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.39 +PIPEWIRE_VERSION = 0.3.40 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) From peter at korsgaard.com Sat Jan 15 11:10:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:10:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/beaglebone: add DT for the Beaglebone Black Wireless Message-ID: <20220115111353.94E3F82A42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f610ca46e01053771bb5d1f63e1bdc356fde59a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The Beaglebone Black Wireless needs a specific DT, which u-boot tries to load based on the board name. Make sure we ship the DT so that we can boot on that platform. Signed-off-by: Maxime Chevallier Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1984222c84f53f530dce230d14f30015d971ab3f) Signed-off-by: Peter Korsgaard --- board/beaglebone/genimage.cfg | 1 + configs/beaglebone_defconfig | 2 +- configs/beaglebone_qt5_defconfig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 1fa6c5f381..42ca2cf107 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -10,6 +10,7 @@ image boot.vfat { "am335x-bone.dtb", "am335x-boneblack.dtb", "am335x-bonegreen.dtb", + "am335x-boneblack-wireless.dtb", } } diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 763696d1dd..06154d98b7 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 5f084b77df..11a91677ce 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.7 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y From peter at korsgaard.com Sat Jan 15 11:16:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:16:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: fix dependencies in Config.in Message-ID: <20220115111353.A769282A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d87b0813b2555dfc855daac54074f0638a2b22b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop spurious "depends on WCHAR" added with commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and adds missing wchar comment While at it, drop BR2_USE_MMU from comment as it is already added by BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS and fix indentation before (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 250e96580391e130951152ae1bf9abc485d637bb) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 5693ecb4cc..e75f1cf15f 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -5,12 +5,12 @@ config BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_USE_MMU # fork() -comment "libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12 (4.11 for AArch64)" +comment "libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, wchar, kernel headers >= 3.12 (4.11 for AArch64)" depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS - depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || !BR2_USE_MMU || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ !(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \ - (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) + (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) config BR2_PACKAGE_LIBVIRT bool "libvirt" @@ -19,7 +19,6 @@ config BR2_PACKAGE_LIBVIRT depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR select BR2_PACKAGE_GNUTLS From peter at korsgaard.com Sat Jan 15 11:19:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:19:01 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/ruby: security update to 3.0.3 Message-ID: <20220115111353.B88088077E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbf58002fe1497cb7aee8fd831c951626285fa16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5af47e96c42e677541a573e8896cb96ab2603733) Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index e3510cc97e..1208461cd0 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2021/07/07/ruby-3-0-2-released/ -sha512 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4 ruby-3.0.2.tar.xz +# https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/ +sha512 bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00 ruby-3.0.3.tar.xz # License files, Locally calculated sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index b02744f0e5..7966450fd1 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.0 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 RUBY_VERSION_EXT = 3.0.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From fontaine.fabrice at gmail.com Sat Jan 15 11:24:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 12:24:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/bento4: add BENTO4_CPE_ID_VENDOR Message-ID: <20220115112403.1910619-1-fontaine.fabrice@gmail.com> cpe:2.3:a:axiosys:bento4 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aaxiosys%3Abento4 Signed-off-by: Fabrice Fontaine --- package/bento4/bento4.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk index 6e17d1d53b..89ff2e4b85 100644 --- a/package/bento4/bento4.mk +++ b/package/bento4/bento4.mk @@ -9,6 +9,7 @@ BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION)) BENTO4_INSTALL_STAGING = YES BENTO4_LICENSE = GPL-2.0+ BENTO4_LICENSE_FILES = Documents/LICENSE.txt +BENTO4_CPE_ID_VENDOR = axiosys # Source/C++/Core/Ap4Config.h ifeq ($(BR2_ENDIAN),"BIG") -- 2.34.1 From peter at korsgaard.com Sat Jan 15 11:34:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:34:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/ruby: security bump to version 2.7.5 Message-ID: <20220115112945.71F0382A7D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9087da9922f10513c604d73f8d5d6d86cea91768 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2021-41817: Regular Expression Denial of Service Vulnerability of Date Parsing Methods https://www.ruby-lang.org/en/news/2021/11/15/date-parsing-method-regexp-dos-cve-2021-41817/ - CVE-2021-41816: Buffer Overrun in CGI.escape_html https://www.ruby-lang.org/en/news/2021/11/24/buffer-overrun-in-cgi-escape_html-cve-2021-41816/ - CVE-2021-41819: Cookie Prefix Spoofing in CGI::Cookie.parse https://www.ruby-lang.org/en/news/2021/11/24/cookie-prefix-spoofing-in-cgi-cookie-parse-cve-2021-41819/ Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index cba48418e7..408bd04e43 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2021/07/07/ruby-2-7-4-released/ -sha256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 ruby-2.7.4.tar.xz +# https://www.ruby-lang.org/en/news/2021/11/24/ruby-2-7-5-released/ +sha256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 ruby-2.7.5.tar.xz # License files, Locally calculated sha256 b09ca195d2de08f0aacfa8793d0af62d7681c304b3ef714b75813721823295a6 LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 24449eac71..d7648efdc6 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 2.7 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).4 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).5 RUBY_VERSION_EXT = 2.7.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From fontaine.fabrice at gmail.com Sat Jan 15 11:42:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 12:42:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: security bump to version 3.2.11 Message-ID: <20220115114244.1912724-1-fontaine.fabrice@gmail.com> Fixes: - CVE-2021-45115: Denial-of-service possibility in UserAttributeSimilarityValidator - CVE-2021-45116: Potential information disclosure in dictsort template filter - CVE-2021-45452: Potential directory-traversal via Storage.save() https://www.djangoproject.com/weblog/2022/jan/04/security-releases Signed-off-by: Fabrice Fontaine --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 3eea17e70f..89bc5ffb19 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 4f80208f0e..25a645823b 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.10 +PYTHON_DJANGO_VERSION = 3.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE -- 2.34.1 From festevam at gmail.com Sat Jan 15 12:10:00 2022 From: festevam at gmail.com (Fabio Estevam) Date: Sat, 15 Jan 2022 09:10:00 -0300 Subject: [Buildroot] [PATCH v2] configs/imx8mmevk: new defconfig In-Reply-To: References: <20220114024555.319448-1-festevam@gmail.com> Message-ID: Hi Heiko, On Sat, Jan 15, 2022 at 3:56 AM Heiko Thiery wrote: > > + partition imx-boot { > > + in-partition-table = "no" > > + image = "flash.bin" > > + offset = 33k > > Giulio pointed out to me that the units should be described with > capital letters. Thanks for pointing this out. I will change it. In the long term, we could probably use a common genimage.cfg too. > I my respin I used: > > append root=PARTUUID=%PARTUUID% rootwait rw > > The UUID is created in a post-build.sh script and set it in > extlinux.conf and genimage.cfg > > With that the image would not limited to be located on the SD card. Good idea. Will change it. > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" On my tests, I noticed that if I build U-Boot 2022.01 + TF-A mainline, then the kernel 5.16 does not boot. Using TF-A from the NXP BSP allows me to boot 5.16 without issues. I will try to investigate why this happens with imx8mm-evk, as your board does not show issues. Thanks From yann.morin.1998 at free.fr Sat Jan 15 13:08:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 14:08:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable all features except python on host In-Reply-To: <20220115103754.1759593-1-fontaine.fabrice@gmail.com> References: <20220115103754.1759593-1-fontaine.fabrice@gmail.com> Message-ID: <20220115130828.GM1945846@scaer> Fabrice, All, +Peter K., +Thomas P., +Arnout. On 2022-01-15 11:37 +0100, Fabrice Fontaine spake thusly: > Enable all features except python on host variant as suggested by > Yann E. Morin in > https://patchwork.ozlabs.org/project/buildroot/patch/20220114171847.634174-1-fontaine.fabrice at gmail.com > > Indeed, host packages have no way to express their dependencies on host > boost So, I was not expecting an actual patch so fast, and I was doing more testing here... So, with a recent-enough gcc (e.g. gcc-10 as is available in our Docker image used in our CI), the full Boost (save for python) is indeed built. So I gave it a shot on a much older system, like my autobuilder, that is still running gcc-4.8. And there, only the headers component is built; everything else is just skipped. This means that host packages that depend on specific features of host-boost will fail randomly depending on the host system, and there is no way to prevent that, except by adding appropriate Config.in.host options for host-boost. Note: in our case, host-riscv-isa-sim already depends on gcc >= 4.9, so it would not be selectable on my autobuilder. But still... So I wonder what we should do... Any idea? Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > package/boost/boost.mk | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/package/boost/boost.mk b/package/boost/boost.mk > index 2d2a8fb311..ad071ed206 100644 > --- a/package/boost/boost.mk > +++ b/package/boost/boost.mk > @@ -12,13 +12,7 @@ BOOST_LICENSE = BSL-1.0 > BOOST_LICENSE_FILES = LICENSE_1_0.txt > BOOST_CPE_ID_VENDOR = boost > > -# keep host variant as minimal as possible > -HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ > - --without-libraries=$(subst $(space),$(comma),atomic chrono context \ > - contract container coroutine date_time exception fiber filesystem graph \ > - graph_parallel iostreams json locale log math mpi nowide program_options \ > - python random serialization stacktrace test thread timer \ > - type_erasure wave) > +HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc --without-libraries=python > > BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) > BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 14:20:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 15:20:17 +0100 Subject: [Buildroot] [git commit] package/bento4: add BENTO4_CPE_ID_VENDOR Message-ID: <20220115141444.7807682AE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4830cf9e4ec8b6d0146d373ff2f4a8196c59c89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:axiosys:bento4 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aaxiosys%3Abento4 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/bento4/bento4.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk index 6e17d1d53b..89ff2e4b85 100644 --- a/package/bento4/bento4.mk +++ b/package/bento4/bento4.mk @@ -9,6 +9,7 @@ BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION)) BENTO4_INSTALL_STAGING = YES BENTO4_LICENSE = GPL-2.0+ BENTO4_LICENSE_FILES = Documents/LICENSE.txt +BENTO4_CPE_ID_VENDOR = axiosys # Source/C++/Core/Ap4Config.h ifeq ($(BR2_ENDIAN),"BIG") From yann.morin.1998 at free.fr Sat Jan 15 14:21:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 15:21:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/bento4: add BENTO4_CPE_ID_VENDOR In-Reply-To: <20220115112403.1910619-1-fontaine.fabrice@gmail.com> References: <20220115112403.1910619-1-fontaine.fabrice@gmail.com> Message-ID: <20220115142150.GN1945846@scaer> Fabrice, All, On 2022-01-15 12:24 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:axiosys:bento4 is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aaxiosys%3Abento4 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/bento4/bento4.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk > index 6e17d1d53b..89ff2e4b85 100644 > --- a/package/bento4/bento4.mk > +++ b/package/bento4/bento4.mk > @@ -9,6 +9,7 @@ BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION)) > BENTO4_INSTALL_STAGING = YES > BENTO4_LICENSE = GPL-2.0+ > BENTO4_LICENSE_FILES = Documents/LICENSE.txt > +BENTO4_CPE_ID_VENDOR = axiosys > > # Source/C++/Core/Ap4Config.h > ifeq ($(BR2_ENDIAN),"BIG") > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 14:22:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 15:22:02 +0100 Subject: [Buildroot] [git commit] package/python-django: security bump to version 3.2.11 Message-ID: <20220115141606.C2E3382AF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a17d4aba54e62359cba638809fde5752dd40cf59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - CVE-2021-45115: Denial-of-service possibility in UserAttributeSimilarityValidator - CVE-2021-45116: Potential information disclosure in dictsort template filter - CVE-2021-45452: Potential directory-traversal via Storage.save() https://www.djangoproject.com/weblog/2022/jan/04/security-releases Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 3eea17e70f..89bc5ffb19 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 4f80208f0e..25a645823b 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.10 +PYTHON_DJANGO_VERSION = 3.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 15 14:22:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 15:22:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: security bump to version 3.2.11 In-Reply-To: <20220115114244.1912724-1-fontaine.fabrice@gmail.com> References: <20220115114244.1912724-1-fontaine.fabrice@gmail.com> Message-ID: <20220115142230.GO1945846@scaer> Fabrice, All, On 2022-01-15 12:42 +0100, Fabrice Fontaine spake thusly: > Fixes: > - CVE-2021-45115: Denial-of-service possibility in > UserAttributeSimilarityValidator > - CVE-2021-45116: Potential information disclosure in dictsort template > filter > - CVE-2021-45452: Potential directory-traversal via Storage.save() > > https://www.djangoproject.com/weblog/2022/jan/04/security-releases > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-django/python-django.hash | 4 ++-- > package/python-django/python-django.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash > index 3eea17e70f..89bc5ffb19 100644 > --- a/package/python-django/python-django.hash > +++ b/package/python-django/python-django.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/django/json > -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz > -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz > +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz > +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz > # Locally computed sha256 checksums > sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE > diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk > index 4f80208f0e..25a645823b 100644 > --- a/package/python-django/python-django.mk > +++ b/package/python-django/python-django.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_DJANGO_VERSION = 3.2.10 > +PYTHON_DJANGO_VERSION = 3.2.11 > PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz > # The official Django site has an unpractical URL > -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 > +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b > > PYTHON_DJANGO_LICENSE = BSD-3-Clause > PYTHON_DJANGO_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Sat Jan 15 14:33:43 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 15 Jan 2022 15:33:43 +0100 Subject: [Buildroot] [PATCH 1/2] board/qemu/arm-vexpress-tz: use enable=on Message-ID: <20220115143344.12319-1-romain.naour@gmail.com> Since Qemu 6.0.0 [1], a warning appear in the log if a short-form boolean option is used. [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ccd3b3b8112b670fdccf8a392b8419b173ffccb4 Signed-off-by: Romain Naour Cc: Etienne Carriere Cc: Dick Olsson --- board/qemu/arm-vexpress-tz/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index 7e62e943a6..3036dd54ca 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -16,7 +16,7 @@ from the image directory: -smp 1 -s -m 1024 -d unimp \ -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ - -semihosting-config enable,target=native \ + -semihosting-config enable=on,target=native \ -bios flash.bin # qemu_arm_vexpress_tz_defconfig The boot stage traces (if any) followed by the login prompt will appear -- 2.31.1 From romain.naour at gmail.com Sat Jan 15 14:33:44 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 15 Jan 2022 15:33:44 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <20220115143344.12319-1-romain.naour@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> Message-ID: <20220115143344.12319-2-romain.naour@gmail.com> As for the Buildroot testsuite, multiply every emulator timeout by 10 to avoid sporadic failures in elastic runners. qemu_arm_vexpress_tz_defconfig tested locally with sucess. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 Signed-off-by: Romain Naour --- support/scripts/boot-qemu-image.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py index fba1533bb7..ba50ea69ee 100755 --- a/support/scripts/boot-qemu-image.py +++ b/support/scripts/boot-qemu-image.py @@ -25,7 +25,7 @@ def main(): qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') child = pexpect.spawn(qemu_start, ['serial-only'], - timeout=5, encoding='utf-8', + timeout=50, encoding='utf-8', env={"QEMU_AUDIO_DRV": "none"}) # We want only stdout into the log to avoid double echo @@ -36,7 +36,7 @@ def main(): time.sleep(1) try: - child.expect(["buildroot login:"], timeout=60) + child.expect(["buildroot login:"], timeout=600) except pexpect.EOF as e: # Some emulations require a fork of qemu-system, which may be # missing on the system, and is not provided by Buildroot. @@ -58,7 +58,7 @@ def main(): child.sendline("root\r") try: - child.expect(["# "], timeout=60) + child.expect(["# "], timeout=600) except pexpect.EOF: print("Cannot connect to shell") sys.exit(1) @@ -69,7 +69,7 @@ def main(): child.sendline("poweroff\r") try: - child.expect(["System halted"], timeout=60) + child.expect(["System halted"], timeout=600) child.expect(pexpect.EOF) except pexpect.EOF: pass -- 2.31.1 From fontaine.fabrice at gmail.com Sat Jan 15 14:39:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 15:39:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: bump to version 9.55.0 Message-ID: <20220115143900.2033727-1-fontaine.fabrice@gmail.com> - Drop patches (already in version) - Disable pdf which fails to build and was added by https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=316c3a08269212f1005709da64efcb383f8f5ce0 - Update hash of license file (references on ETS related patents removed with https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=431167121968b066d90b0506347b6eb779e08a3f) https://www.ghostscript.com/doc/9.54.0/News.htm https://www.ghostscript.com/doc/9.55.0/News.htm Signed-off-by: Fabrice Fontaine --- ...05-Fix-typo-in-non-forked-lcms2-code.patch | 28 +++ ...g-702985-drop-use-of-FT_CALLBACK_DEF.patch | 55 ---- ...de-device-specifier-strings-in-acces.patch | 234 ------------------ ...ack-limits-after-function-evaluation.patch | 52 ---- ...-management-in-sampled_data_continue.patch | 68 ----- package/ghostscript/ghostscript.hash | 6 +- package/ghostscript/ghostscript.mk | 12 +- 7 files changed, 33 insertions(+), 422 deletions(-) create mode 100644 package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch delete mode 100644 package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch delete mode 100644 package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch delete mode 100644 package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch delete mode 100644 package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch diff --git a/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch b/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch new file mode 100644 index 0000000000..bb1227f687 --- /dev/null +++ b/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch @@ -0,0 +1,28 @@ +From 830afae5454dea3bff903869d82022306890a96c Mon Sep 17 00:00:00 2001 +From: Robin Watts +Date: Fri, 1 Oct 2021 12:44:44 +0100 +Subject: [PATCH] Bug 704405: Fix typo in non-forked lcms2 code. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=830afae5454dea3bff903869d82022306890a96c] +Signed-off-by: Fabrice Fontaine +--- + base/gsicc_lcms2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/base/gsicc_lcms2.c b/base/gsicc_lcms2.c +index ccf1d7051..9badb6dee 100644 +--- a/base/gsicc_lcms2.c ++++ b/base/gsicc_lcms2.c +@@ -462,7 +462,7 @@ int + gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor, + void *outputcolor, int num_bytes) + { +- return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes); ++ return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes); + } + + int +-- +2.25.1 + diff --git a/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch b/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch deleted file mode 100644 index 044dcc72f1..0000000000 --- a/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Tue, 20 Oct 2020 09:49:45 +0100 -Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def - -From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what -we used when defining our callbacks from Freetype. - -No guidance forthcoming from the Freetype developer who made those changes, -so change to explicitly declaring the callbacks file static. - -Should fix the reported build failures. - -Downloaded from upstream commit: -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b - -Signed-off-by: Bernd Kuhls ---- - base/fapi_ft.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/base/fapi_ft.c b/base/fapi_ft.c -index 65fa6dcf4..21aef2f06 100644 ---- a/base/fapi_ft.c -+++ b/base/fapi_ft.c -@@ -125,7 +125,7 @@ static void - delete_inc_int_info(gs_fapi_server * a_server, - FT_IncrementalRec * a_inc_int_info); - --FT_CALLBACK_DEF(void *) -+static void * - FF_alloc(FT_Memory memory, long size) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; -@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) - return (gs_malloc(mem, size, 1, "FF_alloc")); - } - --FT_CALLBACK_DEF(void *) -+static void * - FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; -@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) - return (tmp); - } - --FT_CALLBACK_DEF(void) -+static void - FF_free(FT_Memory memory, void *block) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; --- -2.17.1 - diff --git a/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch b/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch deleted file mode 100644 index 81436d8228..0000000000 --- a/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch +++ /dev/null @@ -1,234 +0,0 @@ -From a9bd3dec9fde03327a4a2c69dad1036bf9632e20 Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Tue, 7 Sep 2021 20:36:12 +0100 -Subject: [PATCH] Bug 704342: Include device specifier strings in access - validation - -for the "%pipe%", %handle%" and %printer% io devices. - -We previously validated only the part after the "%pipe%" Postscript device -specifier, but this proved insufficient. - -This rebuilds the original file name string, and validates it complete. The -slight complication for "%pipe%" is it can be reached implicitly using -"|" so we have to check both prefixes. - -Addresses CVE-2021-3781 - -Signed-off-by: Peter Korsgaard ---- - base/gdevpipe.c | 22 +++++++++++++++- - base/gp_mshdl.c | 11 +++++++- - base/gp_msprn.c | 10 ++++++- - base/gp_os2pr.c | 13 +++++++++- - base/gslibctx.c | 69 ++++++++++--------------------------------------- - 5 files changed, 65 insertions(+), 60 deletions(-) - -diff --git a/base/gdevpipe.c b/base/gdevpipe.c -index 96d71f5d8..5bdc485be 100644 ---- a/base/gdevpipe.c -+++ b/base/gdevpipe.c -@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access, - #else - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ /* The pipe device can be reached in two ways, explicltly with %pipe% -+ or implicitly with "|", so we have to check for both -+ */ -+ char f[gp_file_name_sizeof]; -+ const char *pipestr = "|"; -+ const size_t pipestrlen = strlen(pipestr); -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); -+ int code1; -+ -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(f, iodev->dname, preflen); -+ memcpy(f + preflen, fname, nlen + 1); -+ -+ code1 = gp_validate_path(mem, f, access); -+ -+ memcpy(f, pipestr, pipestrlen); -+ memcpy(f + pipestrlen, fname, nlen + 1); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (code1 != 0 && gp_validate_path(mem, f, access) != 0 ) - return gs_error_invalidfileaccess; - - /* -diff --git a/base/gp_mshdl.c b/base/gp_mshdl.c -index 2b964ed74..8d87ceadc 100644 ---- a/base/gp_mshdl.c -+++ b/base/gp_mshdl.c -@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access, - long hfile; /* Correct for Win32, may be wrong for Win64 */ - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ char f[gp_file_name_sizeof]; -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(f, iodev->dname, preflen); -+ memcpy(f + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, f, access) != 0) - return gs_error_invalidfileaccess; - - /* First we try the open_handle method. */ -diff --git a/base/gp_msprn.c b/base/gp_msprn.c -index ed4827968..746a974f7 100644 ---- a/base/gp_msprn.c -+++ b/base/gp_msprn.c -@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access, - uintptr_t *ptid = &((tid_t *)(iodev->state))->tid; - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(pname, iodev->dname, preflen); -+ memcpy(pname + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, pname, access) != 0) - return gs_error_invalidfileaccess; - - /* First we try the open_printer method. */ -diff --git a/base/gp_os2pr.c b/base/gp_os2pr.c -index f852c71fc..ba54cde66 100644 ---- a/base/gp_os2pr.c -+++ b/base/gp_os2pr.c -@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access, - FILE ** pfile, char *rfname, uint rnamelen) - { - os2_printer_t *pr = (os2_printer_t *)iodev->state; -- char driver_name[256]; -+ char driver_name[gp_file_name_sizeof]; - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ const size_t preflen = strlen(iodev->dname); -+ const int size_t = strlen(fname); -+ -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(driver_name, iodev->dname, preflen); -+ memcpy(driver_name + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, driver_name, access) != 0) -+ return gs_error_invalidfileaccess; - - /* First we try the open_printer method. */ - /* Note that the loop condition here ensures we don't -diff --git a/base/gslibctx.c b/base/gslibctx.c -index 6dfed6cd5..318039fad 100644 ---- a/base/gslibctx.c -+++ b/base/gslibctx.c -@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s) - int - gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname) - { -- char *fp, f[gp_file_name_sizeof]; -- const int pipe = 124; /* ASCII code for '|' */ -- const int len = strlen(fname); -- int i, code; -+ char f[gp_file_name_sizeof]; -+ int code; - - /* Be sure the string copy will fit */ -- if (len >= gp_file_name_sizeof) -+ if (strlen(fname) >= gp_file_name_sizeof) - return gs_error_rangecheck; - strcpy(f, fname); -- fp = f; - /* Try to rewrite any %d (or similar) in the string */ - rewrite_percent_specifiers(f); -- for (i = 0; i < len; i++) { -- if (f[i] == pipe) { -- fp = &f[i + 1]; -- /* Because we potentially have to check file permissions at two levels -- for the output file (gx_device_open_output_file and the low level -- fopen API, if we're using a pipe, we have to add both the full string, -- (including the '|', and just the command to which we pipe - since at -- the pipe_fopen(), the leading '|' has been stripped. -- */ -- code = gs_add_control_path(mem, gs_permit_file_writing, f); -- if (code < 0) -- return code; -- code = gs_add_control_path(mem, gs_permit_file_control, f); -- if (code < 0) -- return code; -- break; -- } -- if (!IS_WHITESPACE(f[i])) -- break; -- } -- code = gs_add_control_path(mem, gs_permit_file_control, fp); -+ -+ code = gs_add_control_path(mem, gs_permit_file_control, f); - if (code < 0) - return code; -- return gs_add_control_path(mem, gs_permit_file_writing, fp); -+ return gs_add_control_path(mem, gs_permit_file_writing, f); - } - - int - gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname) - { -- char *fp, f[gp_file_name_sizeof]; -- const int pipe = 124; /* ASCII code for '|' */ -- const int len = strlen(fname); -- int i, code; -+ char f[gp_file_name_sizeof]; -+ int code; - - /* Be sure the string copy will fit */ -- if (len >= gp_file_name_sizeof) -+ if (strlen(fname) >= gp_file_name_sizeof) - return gs_error_rangecheck; - strcpy(f, fname); -- fp = f; - /* Try to rewrite any %d (or similar) in the string */ -- for (i = 0; i < len; i++) { -- if (f[i] == pipe) { -- fp = &f[i + 1]; -- /* Because we potentially have to check file permissions at two levels -- for the output file (gx_device_open_output_file and the low level -- fopen API, if we're using a pipe, we have to add both the full string, -- (including the '|', and just the command to which we pipe - since at -- the pipe_fopen(), the leading '|' has been stripped. -- */ -- code = gs_remove_control_path(mem, gs_permit_file_writing, f); -- if (code < 0) -- return code; -- code = gs_remove_control_path(mem, gs_permit_file_control, f); -- if (code < 0) -- return code; -- break; -- } -- if (!IS_WHITESPACE(f[i])) -- break; -- } -- code = gs_remove_control_path(mem, gs_permit_file_control, fp); -+ rewrite_percent_specifiers(f); -+ -+ code = gs_remove_control_path(mem, gs_permit_file_control, f); - if (code < 0) - return code; -- return gs_remove_control_path(mem, gs_permit_file_writing, fp); -+ return gs_remove_control_path(mem, gs_permit_file_writing, f); - } - - int --- -2.20.1 - diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch deleted file mode 100644 index 352f1754f6..0000000000 --- a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Fri, 12 Feb 2021 10:34:23 +0000 -Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. - -During function result sampling, after the callout to the Postscript -interpreter, make sure there is enough stack space available before pushing -or popping entries. - -In thise case, the Postscript procedure for the "function" is totally invalid -(as a function), and leaves the op stack in an unrecoverable state (as far as -function evaluation is concerned). We end up popping more entries off the -stack than are available. - -To cope, add in stack limit checking to throw an appropriate error when this -happens. - -[Retrieved from: -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] -Signed-off-by: Fabrice Fontaine ---- - psi/zfsample.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/psi/zfsample.c b/psi/zfsample.c -index 290809405..652ae02c6 100644 ---- a/psi/zfsample.c -+++ b/psi/zfsample.c -@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) - } else { - if (stack_depth_adjust) { - stack_depth_adjust -= num_out; -- push(O_STACK_PAD - stack_depth_adjust); -- for (i=0;i -Date: Tue, 1 Jun 2021 19:57:16 +0100 -Subject: [PATCH] Bug 703902: Fix op stack management in - sampled_data_continue() - -Replace pop() (which does no checking, and doesn't handle stack extension -blocks) with ref_stack_pop() which does do all that. - -We still use pop() in one case (it's faster), but we have to later use -ref_stack_pop() before calling sampled_data_sample() which also accesses the -op stack. - -Fixes: -https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 - -[Retrieved from: -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] -Signed-off-by: Fabrice Fontaine ---- - psi/zfsample.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/psi/zfsample.c b/psi/zfsample.c -index 0e8e4bc8d..00cd0cfdd 100644 ---- a/psi/zfsample.c -+++ b/psi/zfsample.c -@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) - for (j = 0; j < bps; j++) - data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ - } -- pop(num_out); /* Move op to base of result values */ - -- /* Check if we are done collecting data. */ -+ pop(num_out); /* Move op to base of result values */ - -+ /* From here on, we have to use ref_stack_pop() rather than pop() -+ so that it handles stack extension blocks properly, before calling -+ sampled_data_sample() which also uses the op stack. -+ */ -+ /* Check if we are done collecting data. */ - if (increment_cube_indexes(params, penum->indexes)) { - if (stack_depth_adjust == 0) -- pop(O_STACK_PAD); /* Remove spare stack space */ -+ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ - else -- pop(stack_depth_adjust - num_out); -+ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); - /* Execute the closing procedure, if given */ - code = 0; - if (esp_finish_proc != 0) -@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) - if ((O_STACK_PAD - stack_depth_adjust) < 0) { - stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); - check_op(stack_depth_adjust); -- pop(stack_depth_adjust); -+ ref_stack_pop(&o_stack, stack_depth_adjust); - } - else { - check_ostack(O_STACK_PAD - stack_depth_adjust); -- push(O_STACK_PAD - stack_depth_adjust); -+ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); - for (i=0;i References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-3-patrickdepinguin@gmail.com> Message-ID: <439edf17-a918-09da-bad6-3253ad6bb5a5@gmail.com> Hi Thomas, Le 14/01/2022 ? 13:27, Thomas De Schampheleire a ?crit?: > Hi Romain, > > El jue, 13 ene 2022 a las 22:30, Romain Naour > () escribi?: >> >> Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : >>> From: Thomas De Schampheleire >>> >>> The variable 'KERNEL_ARCH' is actually a normalized version of >>> 'ARCH'/'BR2_ARCH'. For example, 'arcle' and 'arceb' both become 'arc', just >>> as all powerpc variants become 'powerpc'. >>> >>> It is presumably called 'KERNEL_ARCH' because the Linux kernel is typically >>> the first place where support for a new architecture is added, and thus is >>> the entity that defines the normalized name. >>> >>> However, the term 'KERNEL_ARCH' can also be interpreted as 'the architecture >>> used by the kernel', which need not be exactly the same as 'the normalized >>> name for a certain arch'. In particular, for cases where a 64-bit >>> architecture is running a 64-bit kernel but 32-bit userspace. Examples >>> include: >>> * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace >>> * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace >>> >>> In such cases, the 'architecture used by the kernel' needs to refer to the >>> 64-bit name (aarch64, x86_64), whereas all userspace applications need to >>> refer the, potentially normalized, 32-bit name. >>> >>> This means that there need to be two different variables: >>> >>> KERNEL_ARCH: the architecture used by the kernel >>> NORMALIZED_ARCH: the normalized name for the current userspace architecture >>> >>> At this moment, both will actually have the same content. But a subsequent >>> patch will add basic support for situations described above, in which >>> KERNEL_ARCH may become overwritten to the 64-bit architecture, while >>> NORMALIZED_ARCH needs to remain the same (32-bit) case. >>> >>> This commit replaces use of KERNEL_ARCH where actually the userspace arch is >>> needed. Places that use KERNEL_ARCH in combination with building of kernel >>> modules are not touched. >>> There may be cases where a package builds both a kernel module as userspace, >>> in which case it may need to know about both KERNEL_ARCH and >>> NORMALIZED_ARCH, for the case where they differ. But this is to be fixed on >>> a per-need basis. >> >> While reviewing this patch, I noticed that LINUX_ARCH_PATH [1] is wrong for sparc64 >> >> LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) >> >> Indeed: >> >> $ make O=test/qemu_sparc64_sun4u_defconfig printvars VARS=LINUX_ARCH_PATH >> LINUX_ARCH_PATH=/home/kubu/buildroot/test/qemu_sparc64_sun4u_defconfig/build/linux-5.15/arch/sparc64 >> >> But since LINUX_ARCH_PATH is not used for this architecture, it was not noticed. >> >> [1] https://git.buildroot.net/buildroot/tree/linux/linux.mk?h=2021.11#n226 >> > > Are you sure that this is a problem? > In the kernel Makefile, some 'ARCH' strings are treated specially: > > # Additional ARCH settings for x86 > ifeq ($(ARCH),i386) > SRCARCH := x86 > endif > ifeq ($(ARCH),x86_64) > SRCARCH := x86 > endif > > # Additional ARCH settings for sparc > ifeq ($(ARCH),sparc32) > SRCARCH := sparc > endif > ifeq ($(ARCH),sparc64) > SRCARCH := sparc > endif > > # Additional ARCH settings for parisc > ifeq ($(ARCH),parisc64) > SRCARCH := parisc > endif > > > So compiling the kernel with ARCH=sparc64 is accepted, and the arch > directory will be arch/sparc . Similar to how compiling with > ARCH=x86_64 works even though arch/x86_64 does not (no longer) exist. > > While I'm not familiar with sparc64, there does not seem to be a bug to me. I mean LINUX_ARCH_PATH is a Buildroot variable from linux.mk used to copy some files from the kernel build directory. For now LINUX_ARCH_PATH is not used for sparc64 target but if it happens it will break. Best regards, Romain > > Thanks, > Thomas > From fontaine.fabrice at gmail.com Sat Jan 15 15:06:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 16:06:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/mtd: fix build with libexecinfo Message-ID: <20220115150610.2084070-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: tests/fs-tests/integrity/integck-integck.o: in function `check_failed.constprop.0': integck.c:(.text+0x96c): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/9409ebf6517db87672f3f4df5909a8ac4abfe8af Signed-off-by: Fabrice Fontaine --- package/mtd/mtd.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 9f4cc27ef1..45e7c0c61c 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -13,6 +13,15 @@ MTD_CPE_ID_VENDOR = mtd-utils_project MTD_CPE_ID_PRODUCT = mtd-utils MTD_INSTALL_STAGING = YES +MTD_LDFLAGS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +MTD_DEPENDENCIES += libexecinfo +MTD_LDFLAGS += -lexecinfo +endif + +MTD_CONF_ENV += LDFLAGS="$(MTD_LDFLAGS)" + ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) MTD_DEPENDENCIES += zlib lzo host-pkgconf MTD_CONF_OPTS += --with-jffs -- 2.34.1 From peter at korsgaard.com Sat Jan 15 15:17:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:17:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/dav1d: don't override TARGET_LDFLAGS In-Reply-To: <20211214212813.2251144-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 14 Dec 2021 22:28:12 +0100") References: <20211214212813.2251144-1-fontaine.fabrice@gmail.com> Message-ID: <87r1992fl8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > TARGET_LDFLAGS is overriden since the addition of the package in commit > 8d66bc940d6e4707f9773aeb052e94d45fa439ad > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:19:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:19:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/gupnp-tools: bump to version 0.10.2 In-Reply-To: <20211214221504.2937004-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 14 Dec 2021 23:15:04 +0100") References: <20211214221504.2937004-1-fontaine.fabrice@gmail.com> Message-ID: <87mtjx2fhl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (already in version) > https://gitlab.gnome.org/GNOME/gupnp-tools/-/blob/gupnp-tools-0.10.2/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:24:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:24:49 +0100 Subject: [Buildroot] [PATCH] connman: remove iptables as a fixed dependency In-Reply-To: ("Nuno =?utf-8?Q?Gon=C3=A7alves=22's?= message of "Wed, 15 Dec 2021 12:00:03 +0000") References: Message-ID: <87ilul2f9a.fsf@dell.be.48ers.dk> >>>>> "Nuno" == Nuno Gon?alves writes: > connman might depend on iptables or nftables, and those dependencies > are already selected later in this file as required. > Signed-off-by: Nuno Goncalves Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 15 15:33:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 16:33:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix static build with libgcrypt Message-ID: <20220115153319.2227752-1-fontaine.fabrice@gmail.com> Fix the following static build failure with libgcrypt raised since the addition of the package in commit 663f39c88c01593855c18355a4decdceeffd884b: configure:13665: /home/buildroot/autobuild/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lgcrypt >&5 /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libgcrypt.a(libgcrypt_la-visibility.o): in function `gcry_err_make_from_errno': visibility.c:(.text+0x29): undefined reference to `gpg_err_code_from_errno' Fixes: - http://autobuild.buildroot.org/results/5354f7231cf08bf762e7d86fca874ce63d9a116b Signed-off-by: Fabrice Fontaine --- ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch diff --git a/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch b/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch new file mode 100644 index 0000000000..6db6c2ae3b --- /dev/null +++ b/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch @@ -0,0 +1,50 @@ +From 727291789fa1930a3e5aa04a25e954cfa6e615d6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 15 Jan 2022 16:27:44 +0100 +Subject: [PATCH] configure.ac: use pkg-config to find gcrypt + +Use pkg-config to find gcrypt and avoid the following static build +failure: + +configure:13642: checking for gcry_md_open in -lgcrypt +configure:13665: /home/buildroot/autobuild/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lgcrypt >&5 +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libgcrypt.a(libgcrypt_la-visibility.o): in function `gcry_err_make_from_errno': +visibility.c:(.text+0x29): undefined reference to `gpg_err_code_from_errno' + +Fixes: + - http://autobuild.buildroot.org/results/5354f7231cf08bf762e7d86fca874ce63d9a116b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/52] +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bcc4156ff..531e10b8d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -405,7 +405,11 @@ fi + dnl Checks for libraries. + dnl don\'t include lib if LAN not desired + if test x"${ac_with_encryption}" = xyes; then +- AC_CHECK_LIB([gcrypt], [gcry_md_open], [have_gcrypt=yes], [have_gcrypt=no]) ++ PKG_CHECK_MODULES([GCRYPT], [libgcrypt], [have_gcrypt=yes], [ ++ AC_CHECK_LIB([gcrypt], [gcry_md_open], ++ [have_gcrypt=yes GCRYPT_LIBS=-lgcrypt], ++ [have_gcrypt=no]) ++ ]) + if test "x${have_gcrypt}" = "xno"; then + AC_MSG_ERROR([libgcrypt required to build libfreeipmi]) + AC_MSG_NOTICE([Note: libgpg-error required for libgcrypt]) +@@ -421,7 +425,6 @@ if test x"${ac_with_encryption}" = xyes; then + if test "x${have_gcrypt_threads}" = "xno"; then + AC_MSG_ERROR([libgcrypt with threads support required for libfreeipmi]) + fi +- GCRYPT_LIBS=-lgcrypt + fi + AC_SUBST(GCRYPT_LIBS) + +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Sat Jan 15 15:36:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:36:00 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.9.9 In-Reply-To: <20211216190423.2AEED821EB@busybox.osuosl.org> (Arnout Vandecappelle's message of "Thu, 16 Dec 2021 20:07:37 +0100") References: <20211216190423.2AEED821EB@busybox.osuosl.org> Message-ID: <87ee592eqn.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=ce81a6e6d2ee11b7cc23ad49252f5a696ab20299 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Drop 0030-Fix-cross-compiling-the-uuid-module.patch as the patched code has > been reworked upstream and python3 is built with --disable-uuid: > https://github.com/python/cpython/commit/91a51c5ffc3bd9da28a0000550530f6f2bcc25a2 > Rework 0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch as > the MULTIARCH code is now conditional on !darwin: > https://github.com/python/cpython/commit/9901d153c201d852d27dc9d3074e283c26468f6d > Refresh and renumber remaining patches. > Signed-off-by: Peter Korsgaard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:36:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:36:43 +0100 Subject: [Buildroot] [git commit] package/xen: add XSA-385, 386, 388, 389 security fixes In-Reply-To: <20211216190423.34EC88229F@busybox.osuosl.org> (Arnout Vandecappelle's message of "Thu, 16 Dec 2021 20:07:37 +0100") References: <20211216190423.34EC88229F@busybox.osuosl.org> Message-ID: <87a6fx2epg.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=c0932240fbd891528ae5d479f5df5229ed370416 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes the following security issues: > - XSA-385: guests may exceed their designated memory limit > https://xenbits.xenproject.org/xsa/advisory-385.html > - XSA-386: PCI devices with RMRRs not deassigned correctly > https://xenbits.xenproject.org/xsa/advisory-386.html > - XSA-388: PoD operations on misaligned GFNs > https://xenbits.xenproject.org/xsa/advisory-388.html > - XSA-389: issues with partially successful P2M updates on x86 > https://xenbits.xenproject.org/xsa/advisory-389.html > Signed-off-by: Peter Korsgaard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:16:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:16:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/dav1d: don't override TARGET_LDFLAGS Message-ID: <20220115153049.B0F7D8147C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d80c0e4488f45f14dc7a686a3d3251c93552c342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x TARGET_LDFLAGS is overriden since the addition of the package in commit 8d66bc940d6e4707f9773aeb052e94d45fa439ad Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6deb6bdc7cee0664a71f3363f4ee2d2e9d2f031b) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 7a798bbd4f..d7224625c8 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -25,7 +25,7 @@ endif # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -DAV1D_LDFLAGS += -latomic +DAV1D_LDFLAGS += $(TARGET_LDFLAGS) -latomic endif $(eval $(meson-package)) From peter at korsgaard.com Sat Jan 15 15:36:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:36:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xen: add XSA-385, 386, 388, 389 security fixes Message-ID: <20220115153049.DF30A82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=773d3bf98e7c0420ab45319355c460f62a72d8f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - XSA-385: guests may exceed their designated memory limit https://xenbits.xenproject.org/xsa/advisory-385.html - XSA-386: PCI devices with RMRRs not deassigned correctly https://xenbits.xenproject.org/xsa/advisory-386.html - XSA-388: PoD operations on misaligned GFNs https://xenbits.xenproject.org/xsa/advisory-388.html - XSA-389: issues with partially successful P2M updates on x86 https://xenbits.xenproject.org/xsa/advisory-389.html Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c0932240fbd891528ae5d479f5df5229ed370416) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 9 +++++++++ package/xen/xen.mk | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index e30db09516..10a778053a 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,12 @@ # Locally computed sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING +# https://xenbits.xenproject.org/xsa/advisory-385.html +sha256 831e86c3adfec532b1a48a0b967b7c58c37db3733aee8d78216eb9d535b34f12 xsa385-4.15.patch +# https://xenbits.xenproject.org/xsa/advisory-386.html +sha256 f2f83c825e249bba9454437b48bbd8307fe7a224f56484388a67af124dfd279b xsa386.patch +# https://xenbits.xenproject.org/xsa/advisory-388.html +sha256 6917267482101a3f8f1d13905e14994344a0af81370c7a2b92275fb176b321a0 xsa388-4.14-1.patch +sha256 d5886e046c69f34f98f7e1fc6ffcc36d92f8fc79242b9dc88412c39aa79b4ac3 xsa388-4.14-2.patch +# https://xenbits.xenproject.org/xsa/advisory-389.html +sha256 b243284679b32ab8c817a2e41562d8694d9781fa8096c268bb41b0cd91684baa xsa389-4.14.patch diff --git a/package/xen/xen.mk b/package/xen/xen.mk index b635996afb..cfc166dc4c 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -11,6 +11,23 @@ XEN_LICENSE_FILES = COPYING XEN_CPE_ID_VENDOR = xen XEN_CPE_ID_PREFIX = cpe:2.3:o XEN_DEPENDENCIES = host-acpica host-python3 +XEN_PATCH = \ + https://xenbits.xenproject.org/xsa/xsa385-4.15.patch \ + https://xenbits.xenproject.org/xsa/xsa386.patch \ + https://xenbits.xenproject.org/xsa/xsa388-4.14-1.patch \ + https://xenbits.xenproject.org/xsa/xsa388-4.14-2.patch \ + https://xenbits.xenproject.org/xsa/xsa389-4.14.patch + +# xsa385-4.15.patch +XEN_IGNORE_CVES += CVE-2021-28706 +# xsa386.patch +XEN_IGNORE_CVES += CVE-2021-28702 +# xsa388-4.14-1.patch +XEN_IGNORE_CVES += CVE-2021-28704 CVE-2021-28707 +# xsa388-4.14-2.patch +XEN_IGNORE_CVES += CVE-2021-28708 +# xsa389-4.14.patch +XEN_IGNORE_CVES += CVE-2021-28705 CVE-2021-28709 # Calculate XEN_ARCH ifeq ($(ARCH),aarch64) From peter at korsgaard.com Sat Jan 15 15:19:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:19:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gupnp-tools: bump to version 0.10.2 Message-ID: <20220115153049.BAD4B82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26b2c756e7eb8ac383d505497627e180007c8b1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop patch (already in version) https://gitlab.gnome.org/GNOME/gupnp-tools/-/blob/gupnp-tools-0.10.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b6e6c45327c6311117dc3316ad8413fc7540597a) Signed-off-by: Peter Korsgaard --- ...001-src-meson.build-upload-needs-gupnp-av.patch | 30 ---------------------- package/gupnp-tools/gupnp-tools.hash | 4 +-- package/gupnp-tools/gupnp-tools.mk | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch b/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch deleted file mode 100644 index f8eba76773..0000000000 --- a/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0831f77e990e363f78e3f6a5c461084988824f7b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 2 Jul 2019 23:48:12 +0200 -Subject: [PATCH] src/meson.build: upload needs gupnp-av - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/gupnp-tools/merge_requests/3] ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 84b2ca2..6601f45 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -2,9 +2,9 @@ subdir('common') - - if get_option('av-tools') and gupnp_av.found() - subdir('av-cp') -+ subdir('upload') - endif - - subdir('discover') - subdir('network-light') - subdir('universal-cp') --subdir('upload') --- -2.20.1 - diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index 30f1b8293d..28a1d26ede 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.0.sha256sum: -sha256 41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d gupnp-tools-0.10.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.2.sha256sum: +sha256 6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c gupnp-tools-0.10.2.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index 182b0145c8..7b34de52a0 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.10 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).0 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).2 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) From peter at korsgaard.com Sat Jan 15 15:23:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:23:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/connman: remove iptables as a mandatory dependency Message-ID: <20220115153049.C5F1D82B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7f987493c49d56474682ac45b16be1b55cf1c32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x connman might depend on iptables or nftables, and those dependencies are already selected later in this file as required. Config.in already only selects iptables if BR2_PACKAGE_CONNMAN_IPTABLES. Signed-off-by: Nuno Goncalves Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit edc46a56f6da78a3f001758d4571695d88f28ffb) Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 0355426e92..e5e596c973 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -7,7 +7,7 @@ CONNMAN_VERSION = 1.40 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman -CONNMAN_DEPENDENCIES = libglib2 dbus iptables +CONNMAN_DEPENDENCIES = libglib2 dbus CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Jan 15 15:37:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:37:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-django: security bump to version 3.2.10 Message-ID: <20220115153049.E72CE82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0896f414e6417b5491496d8793d407c6b19919ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - CVE-2021-44420: Potential bypass of an upstream access control based on URL paths HTTP requests for URLs with trailing newlines could bypass an upstream access control based on URL paths. This issue has low severity, according to the Django security policy. https://www.djangoproject.com/weblog/2021/dec/07/security-releases/ In addition, 3.2.8 / 3.2.9 fixes a number of bugs. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 086d357dfb177ef28d7831716707d2424a2ea4bd) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index ab89f0341c..3eea17e70f 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 2ade1eecca77640abbde6c4589da27dd Django-3.2.7.tar.gz -sha256 95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2 Django-3.2.7.tar.gz +md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz +sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 0850aa1358..4f80208f0e 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.7 +PYTHON_DJANGO_VERSION = 3.2.10 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/59/45/c6fbb3a206df0b7dc3e6e8fae738e042c63d4ddf828c6e1ba10d7417a1d9 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 + PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From peter at korsgaard.com Sat Jan 15 15:25:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:25:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python3: bump version to 3.9.9 Message-ID: <20220115153049.D6BA28147C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b47598e7566fcc97d9819ffd745b936249ee0ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop 0030-Fix-cross-compiling-the-uuid-module.patch as the patched code has been reworked upstream and python3 is built with --disable-uuid: https://github.com/python/cpython/commit/91a51c5ffc3bd9da28a0000550530f6f2bcc25a2 Rework 0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch as the MULTIARCH code is now conditional on !darwin: https://github.com/python/cpython/commit/9901d153c201d852d27dc9d3074e283c26468f6d Refresh and renumber remaining patches. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ce81a6e6d2ee11b7cc23ad49252f5a696ab20299) Signed-off-by: Peter Korsgaard --- ...1-Make-the-build-of-pyc-files-conditional.patch | 14 ++++---- ...gy_getaddrinfo-configure-test-when-cross-.patch | 8 ++--- ...ructure-to-disable-the-build-of-certain-e.patch | 18 +++++----- ...ibrary-header-paths-for-cross-compilation.patch | 4 +-- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 8 ++--- .../python3/0006-Don-t-add-multiarch-paths.patch | 8 ++--- .../0007-Abort-on-failed-module-build.patch | 6 ++-- package/python3/0008-Serial-ioctl-workaround.patch | 4 +-- ...st-the-shebang-of-Python-scripts-for-cros.patch | 4 +-- ...-config.sh.in-ensure-sed-invocations-only.patch | 4 +-- ...stem-locale-and-set-to-default-when-addin.patch | 8 ++--- ...0012-Add-importlib-fix-for-PEP-3147-issue.patch | 6 ++-- ...on-to-disable-installation-of-test-module.patch | 14 ++++---- .../0014-Add-an-option-to-disable-pydoc.patch | 22 ++++++------- .../0015-Add-an-option-to-disable-lib2to3.patch | 24 +++++++------- ...-Add-option-to-disable-the-sqlite3-module.patch | 16 ++++----- ...17-Add-an-option-to-disable-the-tk-module.patch | 16 ++++----- ...dd-an-option-to-disable-the-curses-module.patch | 14 ++++---- .../0019-Add-an-option-to-disable-expat.patch | 18 +++++----- .../0020-Add-an-option-to-disable-CJK-codecs.patch | 8 ++--- .../0021-Add-an-option-to-disable-NIS.patch | 8 ++--- ...0022-Add-an-option-to-disable-unicodedata.patch | 8 ++--- .../0023-Add-an-option-to-disable-IDLE.patch | 20 ++++++------ .../0024-Add-an-option-to-disable-decimal.patch | 12 +++---- ...-option-to-disable-the-ossaudiodev-module.patch | 8 ++--- ...-Add-an-option-to-disable-openssl-support.patch | 8 ++--- ...-an-option-to-disable-the-readline-module.patch | 8 ++--- ...ions-to-disable-zlib-bzip2-and-xz-modules.patch | 8 ++--- ...29-python-config.sh-don-t-reassign-prefix.patch | 4 +-- ...030-Add-an-option-to-disable-uuid-module.patch} | 8 ++--- .../0030-Fix-cross-compiling-the-uuid-module.patch | 38 ---------------------- ...0031-fix-building-on-older-distributions.patch} | 4 +-- ...-fixup-CC-print-multiarch-output-for-mus.patch} | 23 ++++++------- ...-option-to-disable-the-berkeleydb-module.patch} | 8 ++--- ...libc-ng-doesn-t-set-errno-when-encryptio.patch} | 4 +-- ...ry-iteration-error-in-_ExecutorManagerTh.patch} | 6 ++-- package/python3/python3.hash | 6 ++-- package/python3/python3.mk | 2 +- 38 files changed, 185 insertions(+), 222 deletions(-) diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 44902725d7..e40d8c8cd9 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 +From f63cc3031e775b556443c0f5b2725e530823dc49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77f91e72b1..0c809f3d8a 100644 +index 11230fa563..1ed9ad65d2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1550,6 +1550,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1549,6 +1549,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 77f91e72b1..0c809f3d8a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1577,6 +1578,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1576,6 +1577,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -35,10 +35,10 @@ index 77f91e72b1..0c809f3d8a 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index d60f05251a..1ee5a09588 100644 +index 823252be69..4e08118c46 100644 --- a/configure.ac +++ b/configure.ac -@@ -1121,6 +1121,12 @@ fi +@@ -1123,6 +1123,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index d60f05251a..1ee5a09588 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.25.1 +2.20.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 00177814cc..7ddbb8a28a 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 +From 7948fb08b18260811ce64806eec2bef465316b75 Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1ee5a09588..c2445edc88 100644 +index 4e08118c46..40b1f9bac1 100644 --- a/configure.ac +++ b/configure.ac -@@ -4210,7 +4210,7 @@ fi +@@ -4217,7 +4217,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) @@ -23,5 +23,5 @@ index 1ee5a09588..c2445edc88 100644 if test $ipv6 = yes then -- -2.25.1 +2.20.1 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 7cccc588e9..7f84f9a1e4 100644 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 +From 9da015fd909bd50a24479bba9a94cb3d1228043d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0c809f3d8a..7c3dde8dd4 100644 +index 1ed9ad65d2..6eacfd6961 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -216,6 +216,8 @@ FILEMODE= 644 +@@ -215,6 +215,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,7 +56,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -632,6 +634,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -631,6 +633,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -64,7 +64,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1696,7 +1699,8 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1695,7 +1698,8 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -75,10 +75,10 @@ index 0c809f3d8a..7c3dde8dd4 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index c2445edc88..73d66167de 100644 +index 40b1f9bac1..5b897d8e46 100644 --- a/configure.ac +++ b/configure.ac -@@ -3081,6 +3081,8 @@ LIBS="$withval $LIBS" +@@ -3088,6 +3088,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG @@ -88,7 +88,7 @@ index c2445edc88..73d66167de 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index 770866bca7..b6c829b3a5 100644 +index 9a5887b59f..b88d0bb007 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,10 @@ from distutils.spawn import find_executable @@ -104,5 +104,5 @@ index 770866bca7..b6c829b3a5 100644 def get_platform(): -- -2.25.1 +2.20.1 diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 24f369f87f..d64e881379 100644 --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 +From 8d2bc6a84a253c7ba2995a3e3be17ea113c228e2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -63,5 +63,5 @@ index 37feae5df7..e9c3a27856 100644 # Path to the base directory of the project. On Windows the binary may # live in project/PCbuild/win32 or project/PCbuild/amd64. -- -2.25.1 +2.20.1 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index c5abcfd786..2ea2d1d9d6 100644 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 +From 09c17b0194209cae8e057866670e4f4039a5be16 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index b6c829b3a5..ec3ba60607 100644 +index b88d0bb007..254c351519 100644 --- a/setup.py +++ b/setup.py -@@ -1041,12 +1041,9 @@ class PyBuildExt(build_ext): +@@ -1044,12 +1044,9 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) @@ -27,5 +27,5 @@ index b6c829b3a5..ec3ba60607 100644 libraries=readline_libs)) else: -- -2.25.1 +2.20.1 diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch index bb861612b1..23424d86d3 100644 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 +From e87dececb9bc2f4b1cba7f31d67ca2aaecbb52d8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index ec3ba60607..e27620035c 100644 +index 254c351519..5bf39f8a51 100644 --- a/setup.py +++ b/setup.py -@@ -734,10 +734,10 @@ class PyBuildExt(build_ext): +@@ -737,10 +737,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -33,5 +33,5 @@ index ec3ba60607..e27620035c 100644 def init_inc_lib_dirs(self): -- -2.25.1 +2.20.1 diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch index 856fcaac21..7e0dfad115 100644 --- a/package/python3/0007-Abort-on-failed-module-build.patch +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 +From cb4a3bc238ffbc8389c2820f24e72c2b36422b3f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,7 +14,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index e27620035c..d3f0e663f2 100644 +index 5bf39f8a51..36d94432da 100644 --- a/setup.py +++ b/setup.py @@ -524,6 +524,7 @@ class PyBuildExt(build_ext): @@ -26,5 +26,5 @@ index e27620035c..d3f0e663f2 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.25.1 +2.20.1 diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch index df31cd6220..568dcd9503 100644 --- a/package/python3/0008-Serial-ioctl-workaround.patch +++ b/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 +From 0b62a3634d343e4e3be6541d298d58eb81cf1458 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -29,5 +29,5 @@ index 75e5e52320..eefbddfe69 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.25.1 +2.20.1 diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index 8a77fe3708..2bb1d7e2ff 100644 --- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 +From 64bdc89106e6bd76e9b204d9cfef0adb7bfb0f4a Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.25.1 +2.20.1 diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index a1f9ab6cd9..cdacfd5b51 100644 --- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 +From e9f8466944c5000d9b43d25d38ef9eaa8cb0afae Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.25.1 +2.20.1 diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch index 8b0d4f4c4d..8c3ddd0042 100644 --- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch @@ -1,4 +1,4 @@ -From e4ae670e3489544a49dabd1618c32fe73504a7ba Mon Sep 17 00:00:00 2001 +From 6615a314ac7a2bc7efea945677934d6afd3b61d6 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 23 Dec 2015 11:45:48 +0100 Subject: [PATCH] Override system locale and set to default when adding gcc @@ -22,10 +22,10 @@ Signed-off-by: James Hilliard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index d3f0e663f2..926c16f58f 100644 +index 36d94432da..506f6107de 100644 --- a/setup.py +++ b/setup.py -@@ -680,7 +680,7 @@ class PyBuildExt(build_ext): +@@ -683,7 +683,7 @@ class PyBuildExt(build_ext): tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) @@ -35,5 +35,5 @@ index d3f0e663f2..926c16f58f 100644 is_clang = False in_incdirs = False -- -2.25.1 +2.20.1 diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch index 7a885303cb..5cb7c85246 100644 --- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch @@ -1,4 +1,4 @@ -From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 +From cda5c7447403440d679a3cd29d8dc38bb15eca33 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 22 Feb 2017 16:48:49 -0800 Subject: [PATCH] Add importlib fix for PEP 3147 issue @@ -25,7 +25,7 @@ Signed-off-by: Andrey Smirnov 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 25a3f8c0e0..2cb9a9aa52 100644 +index fe31f437da..71e64aef30 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -373,8 +373,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): @@ -101,5 +101,5 @@ index 25a3f8c0e0..2cb9a9aa52 100644 -- -2.25.1 +2.20.1 diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch index 8c1b989361..6cbffdf9e0 100644 --- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch @@ -1,4 +1,4 @@ -From 0337342d413d13f437fd089de91faee70a8bf3f9 Mon Sep 17 00:00:00 2001 +From 5c6722b6790ee6b8828a7f8a90b7fd173b77867f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:01:18 -0800 Subject: [PATCH] Add an option to disable installation of test modules @@ -18,10 +18,10 @@ Signed-off-by: James Hilliard 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7c3dde8dd4..204f293d53 100644 +index 6eacfd6961..bbc779ee6a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1406,8 +1406,29 @@ maninstall: altmaninstall +@@ -1405,8 +1405,29 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -53,7 +53,7 @@ index 7c3dde8dd4..204f293d53 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1468,28 +1489,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ +@@ -1467,28 +1488,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_importlib/zipdata02 \ test/test_zoneinfo test/test_zoneinfo/data \ test/ziptestdata \ @@ -97,10 +97,10 @@ index 7c3dde8dd4..204f293d53 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 73d66167de..92e28d02ee 100644 +index 5b897d8e46..bebad207f8 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,11 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,11 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -113,5 +113,5 @@ index 73d66167de..92e28d02ee 100644 # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -- -2.25.1 +2.20.1 diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch index 0c928a0bb2..66b05d5e52 100644 --- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From a65e5d3caf8e076d531191164c23c6240461f675 Mon Sep 17 00:00:00 2001 +From 57e14d395860a781d0b43b1ef3e2a4a8b04bbf80 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 204f293d53..63e3df0470 100644 +index bbc779ee6a..dd83413f17 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1374,7 +1374,9 @@ bininstall: altbininstall +@@ -1373,7 +1373,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -30,7 +30,7 @@ index 204f293d53..63e3df0470 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1424,7 +1426,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1423,7 +1425,7 @@ LIBSUBDIRS= tkinter site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -39,7 +39,7 @@ index 204f293d53..63e3df0470 100644 zoneinfo TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -@@ -1508,6 +1510,10 @@ ifeq (@TEST_MODULES@,yes) +@@ -1507,6 +1509,10 @@ ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -51,10 +51,10 @@ index 204f293d53..63e3df0470 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 92e28d02ee..174ed85a7c 100644 +index bebad207f8..b748ad7957 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,12 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -68,10 +68,10 @@ index 92e28d02ee..174ed85a7c 100644 AC_ARG_ENABLE(test-modules, diff --git a/setup.py b/setup.py -index 926c16f58f..1fc5fac90c 100644 +index 506f6107de..dcbc109c30 100644 --- a/setup.py +++ b/setup.py -@@ -2565,6 +2565,12 @@ def main(): +@@ -2572,6 +2572,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -84,7 +84,7 @@ index 926c16f58f..1fc5fac90c 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2589,8 +2595,7 @@ def main(): +@@ -2596,8 +2602,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in @@ -95,5 +95,5 @@ index 926c16f58f..1fc5fac90c 100644 # --install-platlib -- -2.25.1 +2.20.1 diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch index fe94cdfded..5e30e53788 100644 --- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 +From bc0681be87109e3e5c35e0bdd225143607350fb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 63e3df0470..8b7de12999 100644 +index dd83413f17..6324970733 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1378,7 +1378,9 @@ ifeq (@PYDOC@,yes) +@@ -1377,7 +1377,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -30,7 +30,7 @@ index 63e3df0470..8b7de12999 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1417,7 +1419,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1416,7 +1418,6 @@ LIBSUBDIRS= tkinter site-packages \ html json http dbm xmlrpc \ sqlite3 \ logging csv wsgiref urllib \ @@ -38,7 +38,7 @@ index 63e3df0470..8b7de12999 100644 ctypes ctypes/macholib \ idlelib idlelib/Icons \ distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1495,9 +1496,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1494,9 +1495,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_email test/test_email/data \ test/test_json \ sqlite3/test \ @@ -48,7 +48,7 @@ index 63e3df0470..8b7de12999 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1506,6 +1504,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1505,6 +1503,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -63,7 +63,7 @@ index 63e3df0470..8b7de12999 100644 ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif -@@ -1606,10 +1612,12 @@ ifeq (@PYC_BUILD@,yes) +@@ -1605,10 +1611,12 @@ ifeq (@PYC_BUILD@,yes) -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -77,10 +77,10 @@ index 63e3df0470..8b7de12999 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index 174ed85a7c..f1f5e9a7b0 100644 +index b748ad7957..58e9a8fe7a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3370,6 +3370,12 @@ AC_ARG_ENABLE(test-modules, +@@ -3377,6 +3377,12 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) @@ -94,10 +94,10 @@ index 174ed85a7c..f1f5e9a7b0 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 1fc5fac90c..4063d7ffa5 100644 +index dcbc109c30..8d6348f560 100644 --- a/setup.py +++ b/setup.py -@@ -2566,10 +2566,11 @@ def main(): +@@ -2573,10 +2573,11 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -112,5 +112,5 @@ index 1fc5fac90c..4063d7ffa5 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.25.1 +2.20.1 diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch index d6c9bccd45..0208bce231 100644 --- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 +From fdef81b6f4280eb26bc620ed8dd3c4dc2018dd29 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8b7de12999..d826d8ac4b 100644 +index 6324970733..f700b780fb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1417,7 +1417,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1416,7 +1416,6 @@ LIBSUBDIRS= tkinter site-packages \ email email/mime \ ensurepip ensurepip/_bundled \ html json http dbm xmlrpc \ @@ -24,7 +24,7 @@ index 8b7de12999..d826d8ac4b 100644 logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ -@@ -1495,7 +1494,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1494,7 +1493,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_asyncio \ test/test_email test/test_email/data \ test/test_json \ @@ -32,7 +32,7 @@ index 8b7de12999..d826d8ac4b 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1512,6 +1510,11 @@ TESTSUBDIRS += lib2to3/tests \ +@@ -1511,6 +1509,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif @@ -45,10 +45,10 @@ index 8b7de12999..d826d8ac4b 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index f1f5e9a7b0..8b5c65974c 100644 +index 58e9a8fe7a..644ed6d895 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,15 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -65,5 +65,5 @@ index f1f5e9a7b0..8b5c65974c 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index b798eb56a5..b3a4d202e8 100644 --- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 +From 8b77e7ce6723e11c1891befe7e6413d8328e8f67 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index d826d8ac4b..dc84384680 100644 +index f700b780fb..4fcf8b5a96 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1411,7 +1411,7 @@ maninstall: altmaninstall +@@ -1410,7 +1410,7 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -25,7 +25,7 @@ index d826d8ac4b..dc84384680 100644 asyncio \ collections concurrent concurrent/futures encodings \ email email/mime \ -@@ -1429,8 +1429,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1428,8 +1428,7 @@ LIBSUBDIRS= tkinter site-packages \ curses \ zoneinfo @@ -35,7 +35,7 @@ index d826d8ac4b..dc84384680 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1502,6 +1501,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1501,6 +1500,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -49,10 +49,10 @@ index d826d8ac4b..dc84384680 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 8b5c65974c..4c72dae960 100644 +index 644ed6d895..a4d06dcb50 100644 --- a/configure.ac +++ b/configure.ac -@@ -3367,6 +3367,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3374,6 +3374,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -69,5 +69,5 @@ index 8b5c65974c..4c72dae960 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch index 93dfac26ec..16d2c1d383 100644 --- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From 962deb43f5f340a8472d432ae8e6d61186f9040e Mon Sep 17 00:00:00 2001 +From 7dea1b79fbb905dd69862862f327cc0f25cd93c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dc84384680..2a82f3308f 100644 +index 4fcf8b5a96..2e45a41140 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1426,7 +1426,6 @@ LIBSUBDIRS= site-packages \ +@@ -1425,7 +1425,6 @@ LIBSUBDIRS= site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -24,7 +24,7 @@ index dc84384680..2a82f3308f 100644 zoneinfo TESTSUBDIRS= test \ -@@ -1507,6 +1506,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ +@@ -1506,6 +1505,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif @@ -36,10 +36,10 @@ index dc84384680..2a82f3308f 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 4c72dae960..acd98381a3 100644 +index a4d06dcb50..f034cd4bcb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3376,6 +3376,15 @@ if test "$TK" = "no"; then +@@ -3383,6 +3383,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -56,5 +56,5 @@ index 4c72dae960..acd98381a3 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch index e7349058c8..79e86bd85a 100644 --- a/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 +From e86dc4209f71d6dc4bfa74fcc2c963b678def39f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2a82f3308f..e678c8817e 100644 +index 2e45a41140..4981087723 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1420,7 +1420,7 @@ LIBSUBDIRS= site-packages \ +@@ -1419,7 +1419,7 @@ LIBSUBDIRS= site-packages \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -32,7 +32,7 @@ index 2a82f3308f..e678c8817e 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1510,6 +1510,10 @@ ifeq (@CURSES@,yes) +@@ -1509,6 +1509,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -44,10 +44,10 @@ index 2a82f3308f..e678c8817e 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index acd98381a3..9ef0ecd42f 100644 +index f034cd4bcb..c90c92c2de 100644 --- a/configure.ac +++ b/configure.ac -@@ -3084,13 +3084,21 @@ PKG_PROG_PKG_CONFIG +@@ -3091,13 +3091,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -75,10 +75,10 @@ index acd98381a3..9ef0ecd42f 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 4063d7ffa5..211a160f29 100644 +index 8d6348f560..0d6fe717da 100644 --- a/setup.py +++ b/setup.py -@@ -1666,7 +1666,7 @@ class PyBuildExt(build_ext): +@@ -1671,7 +1671,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +88,5 @@ index 4063d7ffa5..211a160f29 100644 define_macros = [] extra_compile_args = [] -- -2.25.1 +2.20.1 diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch index 4e22543096..aa1a1499be 100644 --- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch @@ -1,4 +1,4 @@ -From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 +From ede026befe4094635d268e293bfccb9118f19a1c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:49:55 +0100 Subject: [PATCH] Add an option to disable CJK codecs @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 9ef0ecd42f..18e6fd70a0 100644 +index c90c92c2de..d9029f5463 100644 --- a/configure.ac +++ b/configure.ac -@@ -3375,6 +3375,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3382,6 +3382,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -26,5 +26,5 @@ index 9ef0ecd42f..18e6fd70a0 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch index 9cd54df180..2a80e00099 100644 --- a/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch @@ -1,4 +1,4 @@ -From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 +From 1c1acbd3ca7f1184710326fab2d557fed4a216e3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:11 +0100 Subject: [PATCH] Add an option to disable NIS @@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 18e6fd70a0..46d2a8131e 100644 +index d9029f5463..82d9ec77fa 100644 --- a/configure.ac +++ b/configure.ac -@@ -3381,6 +3381,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3388,6 +3388,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) @@ -29,5 +29,5 @@ index 18e6fd70a0..46d2a8131e 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch index 2ddf606a70..c4bcbdf133 100644 --- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch @@ -1,4 +1,4 @@ -From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 +From 9fb4ebe3375ff3fc924d423b6b3400bf2cf82fb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:27 +0100 Subject: [PATCH] Add an option to disable unicodedata @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 46d2a8131e..5844e3b73f 100644 +index 82d9ec77fa..55d257515f 100644 --- a/configure.ac +++ b/configure.ac -@@ -3387,6 +3387,12 @@ AC_ARG_ENABLE(nis, +@@ -3394,6 +3394,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) @@ -26,5 +26,5 @@ index 46d2a8131e..5844e3b73f 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch index 0e35eea699..9235674a55 100644 --- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 +From e3b96113ae2b5a0c3f775d5a9550dbbcffb702dd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -16,10 +16,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e678c8817e..1148bd8708 100644 +index 4981087723..222c386f59 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1372,7 +1372,9 @@ bininstall: altbininstall +@@ -1371,7 +1371,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -29,7 +29,7 @@ index e678c8817e..1148bd8708 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1419,7 +1421,6 @@ LIBSUBDIRS= site-packages \ +@@ -1418,7 +1420,6 @@ LIBSUBDIRS= site-packages \ html json http dbm xmlrpc \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ @@ -37,7 +37,7 @@ index e678c8817e..1148bd8708 100644 distutils distutils/command \ importlib \ turtledemo \ -@@ -1514,6 +1515,10 @@ ifeq (@EXPAT@,yes) +@@ -1513,6 +1514,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -49,10 +49,10 @@ index e678c8817e..1148bd8708 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 5844e3b73f..7bd4623ccd 100644 +index 55d257515f..2efd7a6de0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3429,6 +3429,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -3436,6 +3436,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -66,10 +66,10 @@ index 5844e3b73f..7bd4623ccd 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 211a160f29..c4ee989ba3 100644 +index 0d6fe717da..4f8cfcd28d 100644 --- a/setup.py +++ b/setup.py -@@ -2566,11 +2566,13 @@ def main(): +@@ -2573,11 +2573,13 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -85,5 +85,5 @@ index 211a160f29..c4ee989ba3 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.25.1 +2.20.1 diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch index b5a12f7f38..963dcec70e 100644 --- a/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch @@ -1,4 +1,4 @@ -From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 +From 2eb05b69bb21df7884686ca2620612ac0f95b894 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:31 +0100 Subject: [PATCH] Add an option to disable decimal @@ -19,10 +19,10 @@ Signed-off-by: James Hilliard 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 7bd4623ccd..e513ef6a20 100644 +index 2efd7a6de0..86fd03cdbb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3135,13 +3135,20 @@ fi +@@ -3142,13 +3142,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library @@ -49,10 +49,10 @@ index 7bd4623ccd..e513ef6a20 100644 # Check whether _decimal should use a coroutine-local or thread-local context AC_MSG_CHECKING(for --with-decimal-contextvar) diff --git a/setup.py b/setup.py -index c4ee989ba3..3d0c74bb7f 100644 +index 4f8cfcd28d..b471234473 100644 --- a/setup.py +++ b/setup.py -@@ -2195,7 +2195,7 @@ class PyBuildExt(build_ext): +@@ -2202,7 +2202,7 @@ class PyBuildExt(build_ext): # Stefan Krah's _decimal module extra_compile_args = [] undef_macros = [] @@ -62,5 +62,5 @@ index c4ee989ba3..3d0c74bb7f 100644 libraries = [':libmpdec.so.2'] sources = ['_decimal/_decimal.c'] -- -2.25.1 +2.20.1 diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch index 0f68a08356..d7a9ab6481 100644 --- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -1,4 +1,4 @@ -From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 +From 1773ef327247ff2a6e7ce737637748b67c90419f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:58 +0100 Subject: [PATCH] Add an option to disable the ossaudiodev module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index e513ef6a20..c07505e89e 100644 +index 86fd03cdbb..7ba4ea8d5d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3165,6 +3165,12 @@ fi +@@ -3172,6 +3172,12 @@ fi AC_MSG_RESULT($with_decimal_contextvar) @@ -26,5 +26,5 @@ index e513ef6a20..c07505e89e 100644 AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) AC_ARG_ENABLE(loadable-sqlite-extensions, -- -2.25.1 +2.20.1 diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch index 44d1d3d6b3..33c6ad94b8 100644 --- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch @@ -1,4 +1,4 @@ -From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 +From 9fb639fba83cddfbda20819d58df77bdccf6ba1d Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Feb 2017 17:55:59 -0800 Subject: [PATCH] Add an option to disable openssl support. @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index c07505e89e..612e32faf5 100644 +index 7ba4ea8d5d..96e7e1feed 100644 --- a/configure.ac +++ b/configure.ac -@@ -3406,6 +3406,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3413,6 +3413,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index c07505e89e..612e32faf5 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch index 1597a2a560..f59af5e9a1 100644 --- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch @@ -1,4 +1,4 @@ -From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 +From c246223473b49a719b765520068aaf812f1fe6ca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:29:05 +0100 Subject: [PATCH] Add an option to disable the readline module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 612e32faf5..2a6aaeff60 100644 +index 96e7e1feed..d5732b2474 100644 --- a/configure.ac +++ b/configure.ac -@@ -3412,6 +3412,12 @@ AC_ARG_ENABLE(openssl, +@@ -3419,6 +3419,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index 612e32faf5..2a6aaeff60 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index a1d2ef3255..a2a30ab614 100644 --- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -1,4 +1,4 @@ -From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 +From 4d87cebaff75a19cd7ccf20f1c89abec5a5bce8d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:31:11 +0100 Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index 2a6aaeff60..21479bbd7d 100644 +index d5732b2474..3eadf17306 100644 --- a/configure.ac +++ b/configure.ac -@@ -3418,6 +3418,24 @@ AC_ARG_ENABLE(readline, +@@ -3425,6 +3425,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index 2a6aaeff60..21479bbd7d 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch index 4478b40162..870ec74d74 100644 --- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 +From 1ab6b1fb17c1988baca6b9c578f8de33c44c1a17 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.25.1 +2.20.1 diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch similarity index 81% rename from package/python3/0031-Add-an-option-to-disable-uuid-module.patch rename to package/python3/0030-Add-an-option-to-disable-uuid-module.patch index 92b24b211d..af56742d9e 100644 --- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch @@ -1,4 +1,4 @@ -From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 +From 20ff7301b496efe529e2b313cac4d7af626f5051 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 10:54:56 +0200 Subject: [PATCH] Add an option to disable uuid module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 21479bbd7d..615c16aced 100644 +index 3eadf17306..7812dc5102 100644 --- a/configure.ac +++ b/configure.ac -@@ -3454,6 +3454,15 @@ if test "$CURSES" = "no"; then +@@ -3461,6 +3461,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index 21479bbd7d..615c16aced 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch deleted file mode 100644 index 1bf5fc6db4..0000000000 --- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Fri, 20 Jul 2018 10:17:39 -0400 -Subject: [PATCH] Fix cross compiling the uuid module - -Python 3.7 has a new _uuid module, however, the include directory -search path for uuid.h is hardcoded to /usr/include/uuid, which should -not be used when cross-compiling. - -To fix this, use the same solution as the one used by the NIS -detection: append "uuid" to each of the include directories in -"inc_dirs", instead of hardcoding /usr/include/uuid. - -Signed-off-by: Adam Duskett -[Thomas: drop STAGING_DIR based solution, use a solution similar to -the one used for the NIS detection.] -Signed-off-by: Thomas Petazzoni ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3d0c74bb7f..c7be85f352 100644 ---- a/setup.py -+++ b/setup.py -@@ -1764,7 +1764,8 @@ class PyBuildExt(build_ext): - - def detect_uuid(self): - # Build the _uuid module if possible -- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"]) -+ uuid_incs = find_file("uuid.h", self.inc_dirs, -+ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) - if uuid_incs is not None: - if self.compiler.find_library_file(self.lib_dirs, 'uuid'): - uuid_libs = ['uuid'] --- -2.25.1 - diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0031-fix-building-on-older-distributions.patch similarity index 94% rename from package/python3/0032-fix-building-on-older-distributions.patch rename to package/python3/0031-fix-building-on-older-distributions.patch index fb59e593f4..a8b3465111 100644 --- a/package/python3/0032-fix-building-on-older-distributions.patch +++ b/package/python3/0031-fix-building-on-older-distributions.patch @@ -1,4 +1,4 @@ -From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 +From c9548b8e80eecdd6d0798817698c77649f005b42 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 16 Aug 2018 14:52:37 -0700 Subject: [PATCH] fix building on older distributions @@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 os.unlink(new_path) -- -2.25.1 +2.20.1 diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 71% rename from package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index f70990b254..ec7ecb6a35 100644 --- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From edc0757c56090364e0a95aabfa9f645a16a27569 Mon Sep 17 00:00:00 2001 +From ffe8fb3065973204fce95130c32578163755b71e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -23,26 +23,27 @@ non-multiarch toolchain on some architectures (E.G. PowerPC), but as a workaround, rewrite the --print-multiarch output to match older GCC versions to keep the configure script happy. +[Peter: update for 3.9.9, which made the MULTIARCH logic !darwin] Signed-off-by: Peter Korsgaard --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 615c16aced..241298e6cf 100644 +index 7812dc5102..0ce52b9a7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -727,7 +727,9 @@ then - fi - +@@ -883,7 +883,9 @@ fi + rm -f conftest.c conftest.out --MULTIARCH=$($CC --print-multiarch 2>/dev/null) -+# GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based -+# toolchains confusing python. Fix that up -+MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') + if test x$PLATFORM_TRIPLET != xdarwin; then +- MULTIARCH=$($CC --print-multiarch 2>/dev/null) ++ # GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based ++ # toolchains confusing python. Fix that up ++ MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') + fi AC_SUBST(MULTIARCH) - AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -- -2.25.1 +2.20.1 diff --git a/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch similarity index 80% rename from package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch rename to package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch index a4e8baf4dd..c253f09690 100644 --- a/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch +++ b/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch @@ -1,4 +1,4 @@ -From cf4d7fd9f7cb6c1ced32ee323b2b5755640051b7 Mon Sep 17 00:00:00 2001 +From 368a582879f3d757e3527071fd95a956bb272bd8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Apr 2020 22:01:40 +0200 Subject: [PATCH] Add an option to disable the berkeleydb module @@ -9,10 +9,10 @@ Signed-off-by: Bernd Kuhls 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 72c1d86e82..8c3912d237 100644 +index 0ce52b9a7d..30a4e5fb2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3465,6 +3465,12 @@ if test "$UUID" = "no"; then +@@ -3472,6 +3472,12 @@ if test "$UUID" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" fi @@ -26,5 +26,5 @@ index 72c1d86e82..8c3912d237 100644 AC_ARG_ENABLE(pydoc, -- -2.25.0 +2.20.1 diff --git a/package/python3/0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch similarity index 95% rename from package/python3/0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch rename to package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch index 880277eb1d..44eb450808 100644 --- a/package/python3/0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch +++ b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch @@ -1,4 +1,4 @@ -From 3c83eedcc2df3ecf6c4a17953ca24dff60c1378e Mon Sep 17 00:00:00 2001 +From 09ded6ff285e12221114b281d35fe8f9484a9ea5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 12 Nov 2020 00:16:18 +0100 Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method @@ -36,5 +36,5 @@ index 33dbc46bb3..4692a5270c 100644 raise if result and len(result) == method.total_size: -- -2.25.4 +2.20.1 diff --git a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch similarity index 90% rename from package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch rename to package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch index fbe44c7753..b524795d75 100644 --- a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch +++ b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch @@ -1,4 +1,4 @@ -From 331966be70c371b268a4fcce9e97280cd869f137 Mon Sep 17 00:00:00 2001 +From 234364f756e3083164ec9bfcd4867855048372b4 Mon Sep 17 00:00:00 2001 From: Jakub Kulik Date: Mon, 15 Mar 2021 08:49:28 +0100 Subject: [PATCH] Fix dictionary iteration error in _ExecutorManagerThread @@ -12,7 +12,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py -index 90bc98bf2ec..e3b36dff572 100644 +index 90bc98bf2e..e3b36dff57 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -373,7 +373,7 @@ class _ExecutorManagerThread(threading.Thread): @@ -25,5 +25,5 @@ index 90bc98bf2ec..e3b36dff572 100644 cause = None -- -2.31.1 +2.20.1 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 444dbd982a..15e68ca9f1 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-397/ -md5 fddb060b483bc01850a3f412eea1d954 Python-3.9.7.tar.xz +# From https://www.python.org/downloads/release/python-399/ +md5 11d12076311563252a995201248d17e5 Python-3.9.9.tar.xz # Locally computed -sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57 Python-3.9.7.tar.xz +sha256 06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27 Python-3.9.9.tar.xz sha256 599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70 LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 779f6dcb6c..6f063529b2 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.9 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 +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 peter at korsgaard.com Sat Jan 15 15:37:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:37:33 +0100 Subject: [Buildroot] [git commit] package/python-django: security bump to version 3.2.10 In-Reply-To: <20211216190423.3F963822A3@busybox.osuosl.org> (Arnout Vandecappelle's message of "Thu, 16 Dec 2021 20:07:37 +0100") References: <20211216190423.3F963822A3@busybox.osuosl.org> Message-ID: <875yql2eo2.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=086d357dfb177ef28d7831716707d2424a2ea4bd > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes the following security issues: > - CVE-2021-44420: Potential bypass of an upstream access control based on > URL paths > HTTP requests for URLs with trailing newlines could bypass an upstream > access control based on URL paths. > This issue has low severity, according to the Django security policy. > https://www.djangoproject.com/weblog/2021/dec/07/security-releases/ > In addition, 3.2.8 / 3.2.9 fixes a number of bugs. > Signed-off-by: Peter Korsgaard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:19:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:19:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gupnp-tools: bump to version 0.10.2 Message-ID: <20220115153110.526B4821C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8339a5b58390032521577ef6fa4be4653fb1dfc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop patch (already in version) https://gitlab.gnome.org/GNOME/gupnp-tools/-/blob/gupnp-tools-0.10.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b6e6c45327c6311117dc3316ad8413fc7540597a) Signed-off-by: Peter Korsgaard --- ...001-src-meson.build-upload-needs-gupnp-av.patch | 30 ---------------------- package/gupnp-tools/gupnp-tools.hash | 4 +-- package/gupnp-tools/gupnp-tools.mk | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch b/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch deleted file mode 100644 index f8eba76773..0000000000 --- a/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0831f77e990e363f78e3f6a5c461084988824f7b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 2 Jul 2019 23:48:12 +0200 -Subject: [PATCH] src/meson.build: upload needs gupnp-av - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/gupnp-tools/merge_requests/3] ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 84b2ca2..6601f45 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -2,9 +2,9 @@ subdir('common') - - if get_option('av-tools') and gupnp_av.found() - subdir('av-cp') -+ subdir('upload') - endif - - subdir('discover') - subdir('network-light') - subdir('universal-cp') --subdir('upload') --- -2.20.1 - diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index 30f1b8293d..28a1d26ede 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.0.sha256sum: -sha256 41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d gupnp-tools-0.10.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.2.sha256sum: +sha256 6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c gupnp-tools-0.10.2.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index 182b0145c8..7b34de52a0 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.10 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).0 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).2 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) From peter at korsgaard.com Sat Jan 15 15:36:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:36:31 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xen: add XSA-385, 386, 388, 389 security fixes Message-ID: <20220115153110.72E9482B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=381067112a29ae19a0fc50f94e117ff8195c42e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - XSA-385: guests may exceed their designated memory limit https://xenbits.xenproject.org/xsa/advisory-385.html - XSA-386: PCI devices with RMRRs not deassigned correctly https://xenbits.xenproject.org/xsa/advisory-386.html - XSA-388: PoD operations on misaligned GFNs https://xenbits.xenproject.org/xsa/advisory-388.html - XSA-389: issues with partially successful P2M updates on x86 https://xenbits.xenproject.org/xsa/advisory-389.html Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c0932240fbd891528ae5d479f5df5229ed370416) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 9 +++++++++ package/xen/xen.mk | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index e30db09516..10a778053a 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,12 @@ # Locally computed sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING +# https://xenbits.xenproject.org/xsa/advisory-385.html +sha256 831e86c3adfec532b1a48a0b967b7c58c37db3733aee8d78216eb9d535b34f12 xsa385-4.15.patch +# https://xenbits.xenproject.org/xsa/advisory-386.html +sha256 f2f83c825e249bba9454437b48bbd8307fe7a224f56484388a67af124dfd279b xsa386.patch +# https://xenbits.xenproject.org/xsa/advisory-388.html +sha256 6917267482101a3f8f1d13905e14994344a0af81370c7a2b92275fb176b321a0 xsa388-4.14-1.patch +sha256 d5886e046c69f34f98f7e1fc6ffcc36d92f8fc79242b9dc88412c39aa79b4ac3 xsa388-4.14-2.patch +# https://xenbits.xenproject.org/xsa/advisory-389.html +sha256 b243284679b32ab8c817a2e41562d8694d9781fa8096c268bb41b0cd91684baa xsa389-4.14.patch diff --git a/package/xen/xen.mk b/package/xen/xen.mk index b635996afb..cfc166dc4c 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -11,6 +11,23 @@ XEN_LICENSE_FILES = COPYING XEN_CPE_ID_VENDOR = xen XEN_CPE_ID_PREFIX = cpe:2.3:o XEN_DEPENDENCIES = host-acpica host-python3 +XEN_PATCH = \ + https://xenbits.xenproject.org/xsa/xsa385-4.15.patch \ + https://xenbits.xenproject.org/xsa/xsa386.patch \ + https://xenbits.xenproject.org/xsa/xsa388-4.14-1.patch \ + https://xenbits.xenproject.org/xsa/xsa388-4.14-2.patch \ + https://xenbits.xenproject.org/xsa/xsa389-4.14.patch + +# xsa385-4.15.patch +XEN_IGNORE_CVES += CVE-2021-28706 +# xsa386.patch +XEN_IGNORE_CVES += CVE-2021-28702 +# xsa388-4.14-1.patch +XEN_IGNORE_CVES += CVE-2021-28704 CVE-2021-28707 +# xsa388-4.14-2.patch +XEN_IGNORE_CVES += CVE-2021-28708 +# xsa389-4.14.patch +XEN_IGNORE_CVES += CVE-2021-28705 CVE-2021-28709 # Calculate XEN_ARCH ifeq ($(ARCH),aarch64) From peter at korsgaard.com Sat Jan 15 15:24:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:24:32 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/connman: remove iptables as a mandatory dependency Message-ID: <20220115153110.5B04882B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c9e151b19e2b4cb147e44bdeec44814a63a41ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x connman might depend on iptables or nftables, and those dependencies are already selected later in this file as required. Config.in already only selects iptables if BR2_PACKAGE_CONNMAN_IPTABLES. Signed-off-by: Nuno Goncalves Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit edc46a56f6da78a3f001758d4571695d88f28ffb) Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 0355426e92..e5e596c973 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -7,7 +7,7 @@ CONNMAN_VERSION = 1.40 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman -CONNMAN_DEPENDENCIES = libglib2 dbus iptables +CONNMAN_DEPENDENCIES = libglib2 dbus CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Jan 15 15:33:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:33:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python3: bump version to 3.9.9 Message-ID: <20220115153110.6A70D821C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=690b864f1598baf83e8a5d2251c59b3dafded38e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop 0030-Fix-cross-compiling-the-uuid-module.patch as the patched code has been reworked upstream and python3 is built with --disable-uuid: https://github.com/python/cpython/commit/91a51c5ffc3bd9da28a0000550530f6f2bcc25a2 Rework 0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch as the MULTIARCH code is now conditional on !darwin: https://github.com/python/cpython/commit/9901d153c201d852d27dc9d3074e283c26468f6d Refresh and renumber remaining patches. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ce81a6e6d2ee11b7cc23ad49252f5a696ab20299) Signed-off-by: Peter Korsgaard --- ...1-Make-the-build-of-pyc-files-conditional.patch | 14 ++++---- ...gy_getaddrinfo-configure-test-when-cross-.patch | 8 ++--- ...ructure-to-disable-the-build-of-certain-e.patch | 18 +++++----- ...ibrary-header-paths-for-cross-compilation.patch | 4 +-- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 8 ++--- .../python3/0006-Don-t-add-multiarch-paths.patch | 8 ++--- .../0007-Abort-on-failed-module-build.patch | 6 ++-- package/python3/0008-Serial-ioctl-workaround.patch | 4 +-- ...st-the-shebang-of-Python-scripts-for-cros.patch | 4 +-- ...-config.sh.in-ensure-sed-invocations-only.patch | 4 +-- ...stem-locale-and-set-to-default-when-addin.patch | 8 ++--- ...0012-Add-importlib-fix-for-PEP-3147-issue.patch | 6 ++-- ...on-to-disable-installation-of-test-module.patch | 14 ++++---- .../0014-Add-an-option-to-disable-pydoc.patch | 22 ++++++------- .../0015-Add-an-option-to-disable-lib2to3.patch | 24 +++++++------- ...-Add-option-to-disable-the-sqlite3-module.patch | 16 ++++----- ...17-Add-an-option-to-disable-the-tk-module.patch | 16 ++++----- ...dd-an-option-to-disable-the-curses-module.patch | 14 ++++---- .../0019-Add-an-option-to-disable-expat.patch | 18 +++++----- .../0020-Add-an-option-to-disable-CJK-codecs.patch | 8 ++--- .../0021-Add-an-option-to-disable-NIS.patch | 8 ++--- ...0022-Add-an-option-to-disable-unicodedata.patch | 8 ++--- .../0023-Add-an-option-to-disable-IDLE.patch | 20 ++++++------ .../0024-Add-an-option-to-disable-decimal.patch | 12 +++---- ...-option-to-disable-the-ossaudiodev-module.patch | 8 ++--- ...-Add-an-option-to-disable-openssl-support.patch | 8 ++--- ...-an-option-to-disable-the-readline-module.patch | 8 ++--- ...ions-to-disable-zlib-bzip2-and-xz-modules.patch | 8 ++--- ...29-python-config.sh-don-t-reassign-prefix.patch | 4 +-- ...030-Add-an-option-to-disable-uuid-module.patch} | 8 ++--- .../0030-Fix-cross-compiling-the-uuid-module.patch | 38 ---------------------- ...0031-fix-building-on-older-distributions.patch} | 4 +-- ...-fixup-CC-print-multiarch-output-for-mus.patch} | 23 ++++++------- ...Clibc-ng-doesn-t-set-errno-when-encryptio.patch | 4 +-- ...ry-iteration-error-in-_ExecutorManagerTh.patch} | 6 ++-- package/python3/python3.hash | 6 ++-- package/python3/python3.mk | 2 +- 37 files changed, 181 insertions(+), 218 deletions(-) diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 44902725d7..e40d8c8cd9 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 +From f63cc3031e775b556443c0f5b2725e530823dc49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77f91e72b1..0c809f3d8a 100644 +index 11230fa563..1ed9ad65d2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1550,6 +1550,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1549,6 +1549,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 77f91e72b1..0c809f3d8a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1577,6 +1578,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1576,6 +1577,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -35,10 +35,10 @@ index 77f91e72b1..0c809f3d8a 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index d60f05251a..1ee5a09588 100644 +index 823252be69..4e08118c46 100644 --- a/configure.ac +++ b/configure.ac -@@ -1121,6 +1121,12 @@ fi +@@ -1123,6 +1123,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index d60f05251a..1ee5a09588 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.25.1 +2.20.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 00177814cc..7ddbb8a28a 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 +From 7948fb08b18260811ce64806eec2bef465316b75 Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1ee5a09588..c2445edc88 100644 +index 4e08118c46..40b1f9bac1 100644 --- a/configure.ac +++ b/configure.ac -@@ -4210,7 +4210,7 @@ fi +@@ -4217,7 +4217,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) @@ -23,5 +23,5 @@ index 1ee5a09588..c2445edc88 100644 if test $ipv6 = yes then -- -2.25.1 +2.20.1 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 7cccc588e9..7f84f9a1e4 100644 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 +From 9da015fd909bd50a24479bba9a94cb3d1228043d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0c809f3d8a..7c3dde8dd4 100644 +index 1ed9ad65d2..6eacfd6961 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -216,6 +216,8 @@ FILEMODE= 644 +@@ -215,6 +215,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,7 +56,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -632,6 +634,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -631,6 +633,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -64,7 +64,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1696,7 +1699,8 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1695,7 +1698,8 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -75,10 +75,10 @@ index 0c809f3d8a..7c3dde8dd4 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index c2445edc88..73d66167de 100644 +index 40b1f9bac1..5b897d8e46 100644 --- a/configure.ac +++ b/configure.ac -@@ -3081,6 +3081,8 @@ LIBS="$withval $LIBS" +@@ -3088,6 +3088,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG @@ -88,7 +88,7 @@ index c2445edc88..73d66167de 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index 770866bca7..b6c829b3a5 100644 +index 9a5887b59f..b88d0bb007 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,10 @@ from distutils.spawn import find_executable @@ -104,5 +104,5 @@ index 770866bca7..b6c829b3a5 100644 def get_platform(): -- -2.25.1 +2.20.1 diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 24f369f87f..d64e881379 100644 --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 +From 8d2bc6a84a253c7ba2995a3e3be17ea113c228e2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -63,5 +63,5 @@ index 37feae5df7..e9c3a27856 100644 # Path to the base directory of the project. On Windows the binary may # live in project/PCbuild/win32 or project/PCbuild/amd64. -- -2.25.1 +2.20.1 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index c5abcfd786..2ea2d1d9d6 100644 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 +From 09c17b0194209cae8e057866670e4f4039a5be16 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index b6c829b3a5..ec3ba60607 100644 +index b88d0bb007..254c351519 100644 --- a/setup.py +++ b/setup.py -@@ -1041,12 +1041,9 @@ class PyBuildExt(build_ext): +@@ -1044,12 +1044,9 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) @@ -27,5 +27,5 @@ index b6c829b3a5..ec3ba60607 100644 libraries=readline_libs)) else: -- -2.25.1 +2.20.1 diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch index bb861612b1..23424d86d3 100644 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 +From e87dececb9bc2f4b1cba7f31d67ca2aaecbb52d8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index ec3ba60607..e27620035c 100644 +index 254c351519..5bf39f8a51 100644 --- a/setup.py +++ b/setup.py -@@ -734,10 +734,10 @@ class PyBuildExt(build_ext): +@@ -737,10 +737,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -33,5 +33,5 @@ index ec3ba60607..e27620035c 100644 def init_inc_lib_dirs(self): -- -2.25.1 +2.20.1 diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch index 856fcaac21..7e0dfad115 100644 --- a/package/python3/0007-Abort-on-failed-module-build.patch +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 +From cb4a3bc238ffbc8389c2820f24e72c2b36422b3f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,7 +14,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index e27620035c..d3f0e663f2 100644 +index 5bf39f8a51..36d94432da 100644 --- a/setup.py +++ b/setup.py @@ -524,6 +524,7 @@ class PyBuildExt(build_ext): @@ -26,5 +26,5 @@ index e27620035c..d3f0e663f2 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.25.1 +2.20.1 diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch index df31cd6220..568dcd9503 100644 --- a/package/python3/0008-Serial-ioctl-workaround.patch +++ b/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 +From 0b62a3634d343e4e3be6541d298d58eb81cf1458 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -29,5 +29,5 @@ index 75e5e52320..eefbddfe69 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.25.1 +2.20.1 diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index 8a77fe3708..2bb1d7e2ff 100644 --- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 +From 64bdc89106e6bd76e9b204d9cfef0adb7bfb0f4a Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.25.1 +2.20.1 diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index a1f9ab6cd9..cdacfd5b51 100644 --- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 +From e9f8466944c5000d9b43d25d38ef9eaa8cb0afae Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.25.1 +2.20.1 diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch index 8b0d4f4c4d..8c3ddd0042 100644 --- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch @@ -1,4 +1,4 @@ -From e4ae670e3489544a49dabd1618c32fe73504a7ba Mon Sep 17 00:00:00 2001 +From 6615a314ac7a2bc7efea945677934d6afd3b61d6 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 23 Dec 2015 11:45:48 +0100 Subject: [PATCH] Override system locale and set to default when adding gcc @@ -22,10 +22,10 @@ Signed-off-by: James Hilliard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index d3f0e663f2..926c16f58f 100644 +index 36d94432da..506f6107de 100644 --- a/setup.py +++ b/setup.py -@@ -680,7 +680,7 @@ class PyBuildExt(build_ext): +@@ -683,7 +683,7 @@ class PyBuildExt(build_ext): tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) @@ -35,5 +35,5 @@ index d3f0e663f2..926c16f58f 100644 is_clang = False in_incdirs = False -- -2.25.1 +2.20.1 diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch index 7a885303cb..5cb7c85246 100644 --- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch @@ -1,4 +1,4 @@ -From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 +From cda5c7447403440d679a3cd29d8dc38bb15eca33 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 22 Feb 2017 16:48:49 -0800 Subject: [PATCH] Add importlib fix for PEP 3147 issue @@ -25,7 +25,7 @@ Signed-off-by: Andrey Smirnov 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 25a3f8c0e0..2cb9a9aa52 100644 +index fe31f437da..71e64aef30 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -373,8 +373,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): @@ -101,5 +101,5 @@ index 25a3f8c0e0..2cb9a9aa52 100644 -- -2.25.1 +2.20.1 diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch index 8c1b989361..6cbffdf9e0 100644 --- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch @@ -1,4 +1,4 @@ -From 0337342d413d13f437fd089de91faee70a8bf3f9 Mon Sep 17 00:00:00 2001 +From 5c6722b6790ee6b8828a7f8a90b7fd173b77867f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:01:18 -0800 Subject: [PATCH] Add an option to disable installation of test modules @@ -18,10 +18,10 @@ Signed-off-by: James Hilliard 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7c3dde8dd4..204f293d53 100644 +index 6eacfd6961..bbc779ee6a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1406,8 +1406,29 @@ maninstall: altmaninstall +@@ -1405,8 +1405,29 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -53,7 +53,7 @@ index 7c3dde8dd4..204f293d53 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1468,28 +1489,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ +@@ -1467,28 +1488,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_importlib/zipdata02 \ test/test_zoneinfo test/test_zoneinfo/data \ test/ziptestdata \ @@ -97,10 +97,10 @@ index 7c3dde8dd4..204f293d53 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 73d66167de..92e28d02ee 100644 +index 5b897d8e46..bebad207f8 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,11 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,11 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -113,5 +113,5 @@ index 73d66167de..92e28d02ee 100644 # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -- -2.25.1 +2.20.1 diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch index 0c928a0bb2..66b05d5e52 100644 --- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From a65e5d3caf8e076d531191164c23c6240461f675 Mon Sep 17 00:00:00 2001 +From 57e14d395860a781d0b43b1ef3e2a4a8b04bbf80 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 204f293d53..63e3df0470 100644 +index bbc779ee6a..dd83413f17 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1374,7 +1374,9 @@ bininstall: altbininstall +@@ -1373,7 +1373,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -30,7 +30,7 @@ index 204f293d53..63e3df0470 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1424,7 +1426,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1423,7 +1425,7 @@ LIBSUBDIRS= tkinter site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -39,7 +39,7 @@ index 204f293d53..63e3df0470 100644 zoneinfo TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -@@ -1508,6 +1510,10 @@ ifeq (@TEST_MODULES@,yes) +@@ -1507,6 +1509,10 @@ ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -51,10 +51,10 @@ index 204f293d53..63e3df0470 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 92e28d02ee..174ed85a7c 100644 +index bebad207f8..b748ad7957 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,12 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -68,10 +68,10 @@ index 92e28d02ee..174ed85a7c 100644 AC_ARG_ENABLE(test-modules, diff --git a/setup.py b/setup.py -index 926c16f58f..1fc5fac90c 100644 +index 506f6107de..dcbc109c30 100644 --- a/setup.py +++ b/setup.py -@@ -2565,6 +2565,12 @@ def main(): +@@ -2572,6 +2572,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -84,7 +84,7 @@ index 926c16f58f..1fc5fac90c 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2589,8 +2595,7 @@ def main(): +@@ -2596,8 +2602,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in @@ -95,5 +95,5 @@ index 926c16f58f..1fc5fac90c 100644 # --install-platlib -- -2.25.1 +2.20.1 diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch index fe94cdfded..5e30e53788 100644 --- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 +From bc0681be87109e3e5c35e0bdd225143607350fb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 63e3df0470..8b7de12999 100644 +index dd83413f17..6324970733 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1378,7 +1378,9 @@ ifeq (@PYDOC@,yes) +@@ -1377,7 +1377,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -30,7 +30,7 @@ index 63e3df0470..8b7de12999 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1417,7 +1419,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1416,7 +1418,6 @@ LIBSUBDIRS= tkinter site-packages \ html json http dbm xmlrpc \ sqlite3 \ logging csv wsgiref urllib \ @@ -38,7 +38,7 @@ index 63e3df0470..8b7de12999 100644 ctypes ctypes/macholib \ idlelib idlelib/Icons \ distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1495,9 +1496,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1494,9 +1495,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_email test/test_email/data \ test/test_json \ sqlite3/test \ @@ -48,7 +48,7 @@ index 63e3df0470..8b7de12999 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1506,6 +1504,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1505,6 +1503,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -63,7 +63,7 @@ index 63e3df0470..8b7de12999 100644 ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif -@@ -1606,10 +1612,12 @@ ifeq (@PYC_BUILD@,yes) +@@ -1605,10 +1611,12 @@ ifeq (@PYC_BUILD@,yes) -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -77,10 +77,10 @@ index 63e3df0470..8b7de12999 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index 174ed85a7c..f1f5e9a7b0 100644 +index b748ad7957..58e9a8fe7a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3370,6 +3370,12 @@ AC_ARG_ENABLE(test-modules, +@@ -3377,6 +3377,12 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) @@ -94,10 +94,10 @@ index 174ed85a7c..f1f5e9a7b0 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 1fc5fac90c..4063d7ffa5 100644 +index dcbc109c30..8d6348f560 100644 --- a/setup.py +++ b/setup.py -@@ -2566,10 +2566,11 @@ def main(): +@@ -2573,10 +2573,11 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -112,5 +112,5 @@ index 1fc5fac90c..4063d7ffa5 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.25.1 +2.20.1 diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch index d6c9bccd45..0208bce231 100644 --- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 +From fdef81b6f4280eb26bc620ed8dd3c4dc2018dd29 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8b7de12999..d826d8ac4b 100644 +index 6324970733..f700b780fb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1417,7 +1417,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1416,7 +1416,6 @@ LIBSUBDIRS= tkinter site-packages \ email email/mime \ ensurepip ensurepip/_bundled \ html json http dbm xmlrpc \ @@ -24,7 +24,7 @@ index 8b7de12999..d826d8ac4b 100644 logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ -@@ -1495,7 +1494,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1494,7 +1493,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_asyncio \ test/test_email test/test_email/data \ test/test_json \ @@ -32,7 +32,7 @@ index 8b7de12999..d826d8ac4b 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1512,6 +1510,11 @@ TESTSUBDIRS += lib2to3/tests \ +@@ -1511,6 +1509,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif @@ -45,10 +45,10 @@ index 8b7de12999..d826d8ac4b 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index f1f5e9a7b0..8b5c65974c 100644 +index 58e9a8fe7a..644ed6d895 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,15 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -65,5 +65,5 @@ index f1f5e9a7b0..8b5c65974c 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index b798eb56a5..b3a4d202e8 100644 --- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 +From 8b77e7ce6723e11c1891befe7e6413d8328e8f67 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index d826d8ac4b..dc84384680 100644 +index f700b780fb..4fcf8b5a96 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1411,7 +1411,7 @@ maninstall: altmaninstall +@@ -1410,7 +1410,7 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -25,7 +25,7 @@ index d826d8ac4b..dc84384680 100644 asyncio \ collections concurrent concurrent/futures encodings \ email email/mime \ -@@ -1429,8 +1429,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1428,8 +1428,7 @@ LIBSUBDIRS= tkinter site-packages \ curses \ zoneinfo @@ -35,7 +35,7 @@ index d826d8ac4b..dc84384680 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1502,6 +1501,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1501,6 +1500,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -49,10 +49,10 @@ index d826d8ac4b..dc84384680 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 8b5c65974c..4c72dae960 100644 +index 644ed6d895..a4d06dcb50 100644 --- a/configure.ac +++ b/configure.ac -@@ -3367,6 +3367,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3374,6 +3374,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -69,5 +69,5 @@ index 8b5c65974c..4c72dae960 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch index 93dfac26ec..16d2c1d383 100644 --- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From 962deb43f5f340a8472d432ae8e6d61186f9040e Mon Sep 17 00:00:00 2001 +From 7dea1b79fbb905dd69862862f327cc0f25cd93c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dc84384680..2a82f3308f 100644 +index 4fcf8b5a96..2e45a41140 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1426,7 +1426,6 @@ LIBSUBDIRS= site-packages \ +@@ -1425,7 +1425,6 @@ LIBSUBDIRS= site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -24,7 +24,7 @@ index dc84384680..2a82f3308f 100644 zoneinfo TESTSUBDIRS= test \ -@@ -1507,6 +1506,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ +@@ -1506,6 +1505,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif @@ -36,10 +36,10 @@ index dc84384680..2a82f3308f 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 4c72dae960..acd98381a3 100644 +index a4d06dcb50..f034cd4bcb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3376,6 +3376,15 @@ if test "$TK" = "no"; then +@@ -3383,6 +3383,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -56,5 +56,5 @@ index 4c72dae960..acd98381a3 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch index e7349058c8..79e86bd85a 100644 --- a/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 +From e86dc4209f71d6dc4bfa74fcc2c963b678def39f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2a82f3308f..e678c8817e 100644 +index 2e45a41140..4981087723 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1420,7 +1420,7 @@ LIBSUBDIRS= site-packages \ +@@ -1419,7 +1419,7 @@ LIBSUBDIRS= site-packages \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -32,7 +32,7 @@ index 2a82f3308f..e678c8817e 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1510,6 +1510,10 @@ ifeq (@CURSES@,yes) +@@ -1509,6 +1509,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -44,10 +44,10 @@ index 2a82f3308f..e678c8817e 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index acd98381a3..9ef0ecd42f 100644 +index f034cd4bcb..c90c92c2de 100644 --- a/configure.ac +++ b/configure.ac -@@ -3084,13 +3084,21 @@ PKG_PROG_PKG_CONFIG +@@ -3091,13 +3091,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -75,10 +75,10 @@ index acd98381a3..9ef0ecd42f 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 4063d7ffa5..211a160f29 100644 +index 8d6348f560..0d6fe717da 100644 --- a/setup.py +++ b/setup.py -@@ -1666,7 +1666,7 @@ class PyBuildExt(build_ext): +@@ -1671,7 +1671,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +88,5 @@ index 4063d7ffa5..211a160f29 100644 define_macros = [] extra_compile_args = [] -- -2.25.1 +2.20.1 diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch index 4e22543096..aa1a1499be 100644 --- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch @@ -1,4 +1,4 @@ -From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 +From ede026befe4094635d268e293bfccb9118f19a1c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:49:55 +0100 Subject: [PATCH] Add an option to disable CJK codecs @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 9ef0ecd42f..18e6fd70a0 100644 +index c90c92c2de..d9029f5463 100644 --- a/configure.ac +++ b/configure.ac -@@ -3375,6 +3375,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3382,6 +3382,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -26,5 +26,5 @@ index 9ef0ecd42f..18e6fd70a0 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch index 9cd54df180..2a80e00099 100644 --- a/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch @@ -1,4 +1,4 @@ -From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 +From 1c1acbd3ca7f1184710326fab2d557fed4a216e3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:11 +0100 Subject: [PATCH] Add an option to disable NIS @@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 18e6fd70a0..46d2a8131e 100644 +index d9029f5463..82d9ec77fa 100644 --- a/configure.ac +++ b/configure.ac -@@ -3381,6 +3381,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3388,6 +3388,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) @@ -29,5 +29,5 @@ index 18e6fd70a0..46d2a8131e 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch index 2ddf606a70..c4bcbdf133 100644 --- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch @@ -1,4 +1,4 @@ -From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 +From 9fb4ebe3375ff3fc924d423b6b3400bf2cf82fb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:27 +0100 Subject: [PATCH] Add an option to disable unicodedata @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 46d2a8131e..5844e3b73f 100644 +index 82d9ec77fa..55d257515f 100644 --- a/configure.ac +++ b/configure.ac -@@ -3387,6 +3387,12 @@ AC_ARG_ENABLE(nis, +@@ -3394,6 +3394,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) @@ -26,5 +26,5 @@ index 46d2a8131e..5844e3b73f 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch index 0e35eea699..9235674a55 100644 --- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 +From e3b96113ae2b5a0c3f775d5a9550dbbcffb702dd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -16,10 +16,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e678c8817e..1148bd8708 100644 +index 4981087723..222c386f59 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1372,7 +1372,9 @@ bininstall: altbininstall +@@ -1371,7 +1371,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -29,7 +29,7 @@ index e678c8817e..1148bd8708 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1419,7 +1421,6 @@ LIBSUBDIRS= site-packages \ +@@ -1418,7 +1420,6 @@ LIBSUBDIRS= site-packages \ html json http dbm xmlrpc \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ @@ -37,7 +37,7 @@ index e678c8817e..1148bd8708 100644 distutils distutils/command \ importlib \ turtledemo \ -@@ -1514,6 +1515,10 @@ ifeq (@EXPAT@,yes) +@@ -1513,6 +1514,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -49,10 +49,10 @@ index e678c8817e..1148bd8708 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 5844e3b73f..7bd4623ccd 100644 +index 55d257515f..2efd7a6de0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3429,6 +3429,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -3436,6 +3436,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -66,10 +66,10 @@ index 5844e3b73f..7bd4623ccd 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 211a160f29..c4ee989ba3 100644 +index 0d6fe717da..4f8cfcd28d 100644 --- a/setup.py +++ b/setup.py -@@ -2566,11 +2566,13 @@ def main(): +@@ -2573,11 +2573,13 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -85,5 +85,5 @@ index 211a160f29..c4ee989ba3 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.25.1 +2.20.1 diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch index b5a12f7f38..963dcec70e 100644 --- a/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch @@ -1,4 +1,4 @@ -From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 +From 2eb05b69bb21df7884686ca2620612ac0f95b894 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:31 +0100 Subject: [PATCH] Add an option to disable decimal @@ -19,10 +19,10 @@ Signed-off-by: James Hilliard 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 7bd4623ccd..e513ef6a20 100644 +index 2efd7a6de0..86fd03cdbb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3135,13 +3135,20 @@ fi +@@ -3142,13 +3142,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library @@ -49,10 +49,10 @@ index 7bd4623ccd..e513ef6a20 100644 # Check whether _decimal should use a coroutine-local or thread-local context AC_MSG_CHECKING(for --with-decimal-contextvar) diff --git a/setup.py b/setup.py -index c4ee989ba3..3d0c74bb7f 100644 +index 4f8cfcd28d..b471234473 100644 --- a/setup.py +++ b/setup.py -@@ -2195,7 +2195,7 @@ class PyBuildExt(build_ext): +@@ -2202,7 +2202,7 @@ class PyBuildExt(build_ext): # Stefan Krah's _decimal module extra_compile_args = [] undef_macros = [] @@ -62,5 +62,5 @@ index c4ee989ba3..3d0c74bb7f 100644 libraries = [':libmpdec.so.2'] sources = ['_decimal/_decimal.c'] -- -2.25.1 +2.20.1 diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch index 0f68a08356..d7a9ab6481 100644 --- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -1,4 +1,4 @@ -From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 +From 1773ef327247ff2a6e7ce737637748b67c90419f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:58 +0100 Subject: [PATCH] Add an option to disable the ossaudiodev module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index e513ef6a20..c07505e89e 100644 +index 86fd03cdbb..7ba4ea8d5d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3165,6 +3165,12 @@ fi +@@ -3172,6 +3172,12 @@ fi AC_MSG_RESULT($with_decimal_contextvar) @@ -26,5 +26,5 @@ index e513ef6a20..c07505e89e 100644 AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) AC_ARG_ENABLE(loadable-sqlite-extensions, -- -2.25.1 +2.20.1 diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch index 44d1d3d6b3..33c6ad94b8 100644 --- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch @@ -1,4 +1,4 @@ -From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 +From 9fb639fba83cddfbda20819d58df77bdccf6ba1d Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Feb 2017 17:55:59 -0800 Subject: [PATCH] Add an option to disable openssl support. @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index c07505e89e..612e32faf5 100644 +index 7ba4ea8d5d..96e7e1feed 100644 --- a/configure.ac +++ b/configure.ac -@@ -3406,6 +3406,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3413,6 +3413,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index c07505e89e..612e32faf5 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch index 1597a2a560..f59af5e9a1 100644 --- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch @@ -1,4 +1,4 @@ -From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 +From c246223473b49a719b765520068aaf812f1fe6ca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:29:05 +0100 Subject: [PATCH] Add an option to disable the readline module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 612e32faf5..2a6aaeff60 100644 +index 96e7e1feed..d5732b2474 100644 --- a/configure.ac +++ b/configure.ac -@@ -3412,6 +3412,12 @@ AC_ARG_ENABLE(openssl, +@@ -3419,6 +3419,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index 612e32faf5..2a6aaeff60 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index a1d2ef3255..a2a30ab614 100644 --- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -1,4 +1,4 @@ -From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 +From 4d87cebaff75a19cd7ccf20f1c89abec5a5bce8d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:31:11 +0100 Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index 2a6aaeff60..21479bbd7d 100644 +index d5732b2474..3eadf17306 100644 --- a/configure.ac +++ b/configure.ac -@@ -3418,6 +3418,24 @@ AC_ARG_ENABLE(readline, +@@ -3425,6 +3425,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index 2a6aaeff60..21479bbd7d 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch index 4478b40162..870ec74d74 100644 --- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 +From 1ab6b1fb17c1988baca6b9c578f8de33c44c1a17 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.25.1 +2.20.1 diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch similarity index 81% rename from package/python3/0031-Add-an-option-to-disable-uuid-module.patch rename to package/python3/0030-Add-an-option-to-disable-uuid-module.patch index 92b24b211d..af56742d9e 100644 --- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch @@ -1,4 +1,4 @@ -From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 +From 20ff7301b496efe529e2b313cac4d7af626f5051 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 10:54:56 +0200 Subject: [PATCH] Add an option to disable uuid module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 21479bbd7d..615c16aced 100644 +index 3eadf17306..7812dc5102 100644 --- a/configure.ac +++ b/configure.ac -@@ -3454,6 +3454,15 @@ if test "$CURSES" = "no"; then +@@ -3461,6 +3461,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index 21479bbd7d..615c16aced 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch deleted file mode 100644 index 1bf5fc6db4..0000000000 --- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Fri, 20 Jul 2018 10:17:39 -0400 -Subject: [PATCH] Fix cross compiling the uuid module - -Python 3.7 has a new _uuid module, however, the include directory -search path for uuid.h is hardcoded to /usr/include/uuid, which should -not be used when cross-compiling. - -To fix this, use the same solution as the one used by the NIS -detection: append "uuid" to each of the include directories in -"inc_dirs", instead of hardcoding /usr/include/uuid. - -Signed-off-by: Adam Duskett -[Thomas: drop STAGING_DIR based solution, use a solution similar to -the one used for the NIS detection.] -Signed-off-by: Thomas Petazzoni ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3d0c74bb7f..c7be85f352 100644 ---- a/setup.py -+++ b/setup.py -@@ -1764,7 +1764,8 @@ class PyBuildExt(build_ext): - - def detect_uuid(self): - # Build the _uuid module if possible -- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"]) -+ uuid_incs = find_file("uuid.h", self.inc_dirs, -+ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) - if uuid_incs is not None: - if self.compiler.find_library_file(self.lib_dirs, 'uuid'): - uuid_libs = ['uuid'] --- -2.25.1 - diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0031-fix-building-on-older-distributions.patch similarity index 94% rename from package/python3/0032-fix-building-on-older-distributions.patch rename to package/python3/0031-fix-building-on-older-distributions.patch index fb59e593f4..a8b3465111 100644 --- a/package/python3/0032-fix-building-on-older-distributions.patch +++ b/package/python3/0031-fix-building-on-older-distributions.patch @@ -1,4 +1,4 @@ -From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 +From c9548b8e80eecdd6d0798817698c77649f005b42 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 16 Aug 2018 14:52:37 -0700 Subject: [PATCH] fix building on older distributions @@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 os.unlink(new_path) -- -2.25.1 +2.20.1 diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 71% rename from package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index f70990b254..ec7ecb6a35 100644 --- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From edc0757c56090364e0a95aabfa9f645a16a27569 Mon Sep 17 00:00:00 2001 +From ffe8fb3065973204fce95130c32578163755b71e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -23,26 +23,27 @@ non-multiarch toolchain on some architectures (E.G. PowerPC), but as a workaround, rewrite the --print-multiarch output to match older GCC versions to keep the configure script happy. +[Peter: update for 3.9.9, which made the MULTIARCH logic !darwin] Signed-off-by: Peter Korsgaard --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 615c16aced..241298e6cf 100644 +index 7812dc5102..0ce52b9a7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -727,7 +727,9 @@ then - fi - +@@ -883,7 +883,9 @@ fi + rm -f conftest.c conftest.out --MULTIARCH=$($CC --print-multiarch 2>/dev/null) -+# GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based -+# toolchains confusing python. Fix that up -+MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') + if test x$PLATFORM_TRIPLET != xdarwin; then +- MULTIARCH=$($CC --print-multiarch 2>/dev/null) ++ # GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based ++ # toolchains confusing python. Fix that up ++ MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') + fi AC_SUBST(MULTIARCH) - AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -- -2.25.1 +2.20.1 diff --git a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch index 880277eb1d..44eb450808 100644 --- a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch +++ b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch @@ -1,4 +1,4 @@ -From 3c83eedcc2df3ecf6c4a17953ca24dff60c1378e Mon Sep 17 00:00:00 2001 +From 09ded6ff285e12221114b281d35fe8f9484a9ea5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 12 Nov 2020 00:16:18 +0100 Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method @@ -36,5 +36,5 @@ index 33dbc46bb3..4692a5270c 100644 raise if result and len(result) == method.total_size: -- -2.25.4 +2.20.1 diff --git a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch similarity index 90% rename from package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch rename to package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch index fbe44c7753..b524795d75 100644 --- a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch +++ b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch @@ -1,4 +1,4 @@ -From 331966be70c371b268a4fcce9e97280cd869f137 Mon Sep 17 00:00:00 2001 +From 234364f756e3083164ec9bfcd4867855048372b4 Mon Sep 17 00:00:00 2001 From: Jakub Kulik Date: Mon, 15 Mar 2021 08:49:28 +0100 Subject: [PATCH] Fix dictionary iteration error in _ExecutorManagerThread @@ -12,7 +12,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py -index 90bc98bf2ec..e3b36dff572 100644 +index 90bc98bf2e..e3b36dff57 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -373,7 +373,7 @@ class _ExecutorManagerThread(threading.Thread): @@ -25,5 +25,5 @@ index 90bc98bf2ec..e3b36dff572 100644 cause = None -- -2.31.1 +2.20.1 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 444dbd982a..15e68ca9f1 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-397/ -md5 fddb060b483bc01850a3f412eea1d954 Python-3.9.7.tar.xz +# From https://www.python.org/downloads/release/python-399/ +md5 11d12076311563252a995201248d17e5 Python-3.9.9.tar.xz # Locally computed -sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57 Python-3.9.7.tar.xz +sha256 06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27 Python-3.9.9.tar.xz sha256 599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70 LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 0fab0dd9ba..c66a028bc7 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.9 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 +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 peter at korsgaard.com Sat Jan 15 15:16:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:16:11 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/dav1d: don't override TARGET_LDFLAGS Message-ID: <20220115153110.40FF982B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab4c0e6fc28aa5ea2f07c4699d1bff9c7edca78a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x TARGET_LDFLAGS is overriden since the addition of the package in commit 8d66bc940d6e4707f9773aeb052e94d45fa439ad Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6deb6bdc7cee0664a71f3363f4ee2d2e9d2f031b) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 68f6fc8805..235f070be5 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -25,7 +25,7 @@ endif # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -DAV1D_LDFLAGS += -latomic +DAV1D_LDFLAGS += $(TARGET_LDFLAGS) -latomic endif $(eval $(meson-package)) From peter at korsgaard.com Sat Jan 15 15:37:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:37:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-django: security bump to version 3.2.10 Message-ID: <20220115153110.7ABD082B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=025fa150745f7a6c26d3be656a55a8462b7f45ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2021-44420: Potential bypass of an upstream access control based on URL paths HTTP requests for URLs with trailing newlines could bypass an upstream access control based on URL paths. This issue has low severity, according to the Django security policy. https://www.djangoproject.com/weblog/2021/dec/07/security-releases/ In addition, 3.2.8 / 3.2.9 fixes a number of bugs. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 086d357dfb177ef28d7831716707d2424a2ea4bd) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index ab89f0341c..3eea17e70f 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 2ade1eecca77640abbde6c4589da27dd Django-3.2.7.tar.gz -sha256 95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2 Django-3.2.7.tar.gz +md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz +sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 0850aa1358..4f80208f0e 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.7 +PYTHON_DJANGO_VERSION = 3.2.10 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/59/45/c6fbb3a206df0b7dc3e6e8fae738e042c63d4ddf828c6e1ba10d7417a1d9 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 + PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From peter at korsgaard.com Sat Jan 15 15:38:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:38:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/privoxy: security bump to version 3.0.33 Message-ID: <20220115153156.D94AA82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=325b341440fa646818796a470eaf45241c7b1503 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - cgi_error_no_template(): Encode the template name to prevent XSS (cross-site scripting) when Privoxy is configured to servce the user-manual itself. Commit 0e668e9409c. OVE-20211102-0001. CVE-2021-44543. Reported by: Artem Ivanov - get_url_spec_param(): Free memory of compiled pattern spec before bailing. Reported by Joshua Rogers (Opera) who also provided the fix. Commit 652b4b7cb0. OVE-20211201-0003. CVE-2021-44540. - process_encrypted_request_headers(): Free header memory when failing to get the request destination. Reported by Joshua Rogers (Opera) who also provided the fix. Commit 0509c58045. OVE-20211201-0002. CVE-2021-44541. - send_http_request(): Prevent memory leaks when handling errors Reported by Joshua Rogers (Opera) who also provided the fix. Commit c48d1d6d08. OVE-20211201-0001. CVE-2021-44542. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 44a97dcb93ebe279f15ce625c23930c50beeb009) Signed-off-by: Peter Korsgaard --- package/privoxy/privoxy.hash | 8 ++++---- package/privoxy/privoxy.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index 92ecd1dd21..cf1056ecc4 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.32%20%28stable%29/ -md5 3a0a8ebdf80e0a29154683e74cbf510b privoxy-3.0.32-stable-src.tar.gz -sha1 3a298ab2599fc92555c86dc29a37742d7396a0d3 privoxy-3.0.32-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.33%20%28stable%29/ +md5 d6caf3eaad4812f0658b68d5b3ba3a06 privoxy-3.0.33-stable-src.tar.gz +sha1 688da305077d8ecbcf6423e02201f01f7a7098f4 privoxy-3.0.33-stable-src.tar.gz # Locally computed -sha256 c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7 privoxy-3.0.32-stable-src.tar.gz +sha256 04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae privoxy-3.0.33-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index adb5af28ac..5fe9d5cc3e 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.32 +PRIVOXY_VERSION = 3.0.33 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped From peter at korsgaard.com Sat Jan 15 15:38:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:38:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/privoxy: security bump to version 3.0.33 Message-ID: <20220115153201.5AFEB82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6aa6048432f9bf55527d79997f77b0f6feacae8c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - cgi_error_no_template(): Encode the template name to prevent XSS (cross-site scripting) when Privoxy is configured to servce the user-manual itself. Commit 0e668e9409c. OVE-20211102-0001. CVE-2021-44543. Reported by: Artem Ivanov - get_url_spec_param(): Free memory of compiled pattern spec before bailing. Reported by Joshua Rogers (Opera) who also provided the fix. Commit 652b4b7cb0. OVE-20211201-0003. CVE-2021-44540. - process_encrypted_request_headers(): Free header memory when failing to get the request destination. Reported by Joshua Rogers (Opera) who also provided the fix. Commit 0509c58045. OVE-20211201-0002. CVE-2021-44541. - send_http_request(): Prevent memory leaks when handling errors Reported by Joshua Rogers (Opera) who also provided the fix. Commit c48d1d6d08. OVE-20211201-0001. CVE-2021-44542. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 44a97dcb93ebe279f15ce625c23930c50beeb009) Signed-off-by: Peter Korsgaard --- package/privoxy/privoxy.hash | 8 ++++---- package/privoxy/privoxy.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index 92ecd1dd21..cf1056ecc4 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.32%20%28stable%29/ -md5 3a0a8ebdf80e0a29154683e74cbf510b privoxy-3.0.32-stable-src.tar.gz -sha1 3a298ab2599fc92555c86dc29a37742d7396a0d3 privoxy-3.0.32-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.33%20%28stable%29/ +md5 d6caf3eaad4812f0658b68d5b3ba3a06 privoxy-3.0.33-stable-src.tar.gz +sha1 688da305077d8ecbcf6423e02201f01f7a7098f4 privoxy-3.0.33-stable-src.tar.gz # Locally computed -sha256 c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7 privoxy-3.0.32-stable-src.tar.gz +sha256 04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae privoxy-3.0.33-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index c1859ed5f2..06642200df 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.32 +PRIVOXY_VERSION = 3.0.33 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped From peter at korsgaard.com Sat Jan 15 15:39:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:39:02 +0100 Subject: [Buildroot] [PATCH] package/privoxy: security bump to version 3.0.33 In-Reply-To: <20211215171540.4506-1-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 15 Dec 2021 18:15:39 +0100") References: <20211215171540.4506-1-peter@korsgaard.com> Message-ID: <871r192ell.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > - cgi_error_no_template(): Encode the template name to prevent > XSS (cross-site scripting) when Privoxy is configured to servce > the user-manual itself. > Commit 0e668e9409c. OVE-20211102-0001. CVE-2021-44543. > Reported by: Artem Ivanov > - get_url_spec_param(): Free memory of compiled pattern spec > before bailing. > Reported by Joshua Rogers (Opera) who also provided the fix. > Commit 652b4b7cb0. OVE-20211201-0003. CVE-2021-44540. > - process_encrypted_request_headers(): Free header memory when > failing to get the request destination. > Reported by Joshua Rogers (Opera) who also provided the fix. > Commit 0509c58045. OVE-20211201-0002. CVE-2021-44541. > - send_http_request(): Prevent memory leaks when handling errors > Reported by Joshua Rogers (Opera) who also provided the fix. > Commit c48d1d6d08. OVE-20211201-0001. CVE-2021-44542. > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 15 16:02:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:02:52 +0100 Subject: [Buildroot] [git commit] board/qemu/arm-vexpress-tz: use enable=on Message-ID: <20220115155637.CF74C82B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=04afe86cd7e85790360548647419a5a40efa6936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since Qemu 6.0.0 [1], a warning appear in the log if a short-form boolean option is used. [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ccd3b3b8112b670fdccf8a392b8419b173ffccb4 Signed-off-by: Romain Naour Cc: Etienne Carriere Cc: Dick Olsson Signed-off-by: Yann E. MORIN --- board/qemu/arm-vexpress-tz/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index 7e62e943a6..3036dd54ca 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -16,7 +16,7 @@ from the image directory: -smp 1 -s -m 1024 -d unimp \ -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ - -semihosting-config enable,target=native \ + -semihosting-config enable=on,target=native \ -bios flash.bin # qemu_arm_vexpress_tz_defconfig The boot stage traces (if any) followed by the login prompt will appear From yann.morin.1998 at free.fr Sat Jan 15 16:03:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:03:28 +0100 Subject: [Buildroot] [PATCH 1/2] board/qemu/arm-vexpress-tz: use enable=on In-Reply-To: <20220115143344.12319-1-romain.naour@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> Message-ID: <20220115160328.GP1945846@scaer> Romain, All, On 2022-01-15 15:33 +0100, Romain Naour spake thusly: > Since Qemu 6.0.0 [1], a warning appear in the log if a short-form > boolean option is used. > > [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ccd3b3b8112b670fdccf8a392b8419b173ffccb4 > > Signed-off-by: Romain Naour > Cc: Etienne Carriere > Cc: Dick Olsson Applied to master, thanks. Regards, Yann E. MORIN. > --- > board/qemu/arm-vexpress-tz/readme.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt > index 7e62e943a6..3036dd54ca 100644 > --- a/board/qemu/arm-vexpress-tz/readme.txt > +++ b/board/qemu/arm-vexpress-tz/readme.txt > @@ -16,7 +16,7 @@ from the image directory: > -smp 1 -s -m 1024 -d unimp \ > -serial stdio \ > -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ > - -semihosting-config enable,target=native \ > + -semihosting-config enable=on,target=native \ > -bios flash.bin # qemu_arm_vexpress_tz_defconfig > > The boot stage traces (if any) followed by the login prompt will appear > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 16:05:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:05:17 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <20220115143344.12319-2-romain.naour@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> <20220115143344.12319-2-romain.naour@gmail.com> Message-ID: <20220115160517.GQ1945846@scaer> Romain, All, On 2022-01-15 15:33 +0100, Romain Naour spake thusly: > As for the Buildroot testsuite, multiply every emulator timeout by 10 > to avoid sporadic failures in elastic runners. > > qemu_arm_vexpress_tz_defconfig tested locally with sucess. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 Are you sure increasing the timeout will fix this failure? The build-run.log contains another error: loaded file zImage from 40400000 to 408CAABF, 004CAAC0 bytes loaded file rootfs.cpio.uboot from 44000000 to 4438FA4E, 0038FA4F bytes Kernel image @ 0x40400000 [ 0x000000 - 0x4caac0 ] ## Loading init Ramdisk from Legacy Image at 44000000 ... Image Name: Created: 2022-01-13 16:06:53 UTC Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 3734031 Bytes = 3.6 MiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 40000000 Booting using the fdt blob at 0x40000000 ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) Using Device Tree in place at 40000000, end 400051f7 So, to me, this is not a timeout issue, but an actual boot issue. Regards, Yann E. MORIN. > Signed-off-by: Romain Naour > --- > support/scripts/boot-qemu-image.py | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py > index fba1533bb7..ba50ea69ee 100755 > --- a/support/scripts/boot-qemu-image.py > +++ b/support/scripts/boot-qemu-image.py > @@ -25,7 +25,7 @@ def main(): > qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') > > child = pexpect.spawn(qemu_start, ['serial-only'], > - timeout=5, encoding='utf-8', > + timeout=50, encoding='utf-8', > env={"QEMU_AUDIO_DRV": "none"}) > > # We want only stdout into the log to avoid double echo > @@ -36,7 +36,7 @@ def main(): > time.sleep(1) > > try: > - child.expect(["buildroot login:"], timeout=60) > + child.expect(["buildroot login:"], timeout=600) > except pexpect.EOF as e: > # Some emulations require a fork of qemu-system, which may be > # missing on the system, and is not provided by Buildroot. > @@ -58,7 +58,7 @@ def main(): > child.sendline("root\r") > > try: > - child.expect(["# "], timeout=60) > + child.expect(["# "], timeout=600) > except pexpect.EOF: > print("Cannot connect to shell") > sys.exit(1) > @@ -69,7 +69,7 @@ def main(): > child.sendline("poweroff\r") > > try: > - child.expect(["System halted"], timeout=60) > + child.expect(["System halted"], timeout=600) > child.expect(pexpect.EOF) > except pexpect.EOF: > pass > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 15 16:04:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 17:04:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost Message-ID: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> Set --with-boost to avoid the following build failure when a non working boost version is installed on host. This failure is raised since the addition of the package in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure:5559: error: Could not find a version of the Boost::Asio library! Fixes: - http://autobuild.buildroot.org/results/855b66b86d979cc922b947da932b0e2388481263 Signed-off-by: Fabrice Fontaine --- package/riscv-isa-sim/riscv-isa-sim.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index ee9067d304..90eed93c36 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -9,5 +9,6 @@ RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc +HOST_RISCV_ISA_SIM_CONF_OPTS = --with-boost=$(HOST_DIR) $(eval $(host-autotools-package)) -- 2.34.1 From yann.morin.1998 at free.fr Sat Jan 15 16:09:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:09:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: bump to version 0.8.8 In-Reply-To: <20220115101523.2932-1-egorenar-dev@posteo.net> References: <20220115101523.2932-1-egorenar-dev@posteo.net> Message-ID: <20220115160937.GR1945846@scaer> Alexander, All, On 2022-01-15 10:15 +0000, Alexander Egorenkov spake thusly: > Signed-off-by: Alexander Egorenkov Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/multipath-tools/multipath-tools.hash | 2 +- > package/multipath-tools/multipath-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash > index ac41e4815b72..f063848681ea 100644 > --- a/package/multipath-tools/multipath-tools.hash > +++ b/package/multipath-tools/multipath-tools.hash > @@ -1,5 +1,5 @@ > # Locally computed: > -sha256 7c5962be6068c78d5256e8fc979cf327988f7560705bb9cc25b508c50ca997c0 multipath-tools-0.8.7.tar.gz > +sha256 ff45ddb18a1effbfbe5712f513dd3b7146c68141091fc1c2489af8d6197026ef multipath-tools-0.8.8.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 > sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 > sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 > diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk > index 3d8095b0b093..eecfe3900233 100644 > --- a/package/multipath-tools/multipath-tools.mk > +++ b/package/multipath-tools/multipath-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MULTIPATH_TOOLS_VERSION = 0.8.7 > +MULTIPATH_TOOLS_VERSION = 0.8.8 > MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) > > MULTIPATH_TOOLS_LICENSE = \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 16:09:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:09:08 +0100 Subject: [Buildroot] [git commit] package/multipath-tools: bump to version 0.8.8 Message-ID: <20220115160318.CE55D82B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e4791b751c0f8e0ba218da2c22e71d3e1436b5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index ac41e4815b..f063848681 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7c5962be6068c78d5256e8fc979cf327988f7560705bb9cc25b508c50ca997c0 multipath-tools-0.8.7.tar.gz +sha256 ff45ddb18a1effbfbe5712f513dd3b7146c68141091fc1c2489af8d6197026ef multipath-tools-0.8.8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 3d8095b0b0..eecfe39002 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.8.7 +MULTIPATH_TOOLS_VERSION = 0.8.8 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From fontaine.fabrice at gmail.com Sat Jan 15 16:21:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 17:21:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpdecimal: bump to version 2.5.1 Message-ID: <20220115162142.2300207-1-fontaine.fabrice@gmail.com> Drop patch (already in version) and so autoreconf https://www.bytereef.org/mpdecimal/changelog.html Signed-off-by: Fabrice Fontaine --- ...ort-for-enable-disable-shared-static.patch | 147 ------------------ package/mpdecimal/mpdecimal.hash | 2 +- package/mpdecimal/mpdecimal.mk | 3 +- 3 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch diff --git a/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch b/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch deleted file mode 100644 index 60d6b4bb02..0000000000 --- a/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch +++ /dev/null @@ -1,147 +0,0 @@ -From c349964887901848fb4cd5db53a5bcb6dae27aaa Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 23 Nov 2014 10:16:33 +0100 -Subject: [PATCH] Add minimal support for --{enable,disable}-{shared,static} - -mpdecimal uses autoconf, but not automake or libtool, so this commit -adds some basic handling of --{enable,disable}-{shared,static}, so -that building the shared library can be disabled in pure static -library contexts. - -Signed-off-by: Thomas Petazzoni -[Fabrice: update for 2.5.0 (add libmpdec++)] -Signed-off-by: Fabrice Fontaine ---- - Makefile.in | 6 ++++++ - configure.ac | 13 +++++++++++++ - libmpdec/Makefile.in | 11 ++++++++++- - 3 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 2c91891..0c44f36 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -9,6 +9,8 @@ LIBSTATIC = @LIBSTATIC@ - LIBSONAME = @LIBSONAME@ - LIBSHARED = @LIBSHARED@ - INSTALL = @INSTALL@ -+BUILD_SHARED = @BUILD_SHARED@ -+BUILD_STATIC = @BUILD_STATIC@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -32,9 +34,13 @@ install: FORCE - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) - $(INSTALL) -m 644 libmpdec/mpdecimal.h $(DESTDIR)$(includedir) - $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) -+ifeq ($(BUILD_STATIC),yes) - $(INSTALL) -m 644 libmpdec/$(LIBSTATIC) $(DESTDIR)$(libdir) -+endif -+ifeq ($(BUILD_SHARED),yes) - $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) $(LIBNAME) -+endif - $(INSTALL) -d -m 755 $(DESTDIR)$(docdir) - cp -R doc/* $(DESTDIR)$(docdir) - -@@ -74,9 +80,13 @@ install_libcxx: install_lib - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) - $(INSTALL) -m 644 libmpdec++/decimal.hh $(DESTDIR)$(includedir) - $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) -+ifeq ($(BUILD_STATIC),yes) - $(INSTALL) -m 644 libmpdec++/$(LIBSTATIC_CXX) $(DESTDIR)$(libdir) -+endif -+ifeq ($(BUILD_SHARED),yes) - $(INSTALL) -m 755 libmpdec++/$(LIBSHARED_CXX) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX) && ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX) -+endif - cp -R doc/libmpdec++ $(DESTDIR)$(docdir) - - -diff --git a/configure.ac b/configure.ac -index 7ee8f86..2b3e505 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -88,6 +88,19 @@ CFLAGS="$saved_cflags" - AC_PROG_INSTALL - AC_SUBST(INSTALL) - -+AC_ARG_ENABLE([shared], -+ [AS_HELP_STRING([--enable-shared], [build shared library])], -+ [BUILD_SHARED=$enableval], -+ [BUILD_SHARED=yes]) -+ -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static], [build static library])], -+ [BUILD_STATIC=$enableval], -+ [BUILD_STATIC=yes]) -+ -+AC_SUBST(BUILD_SHARED) -+AC_SUBST(BUILD_STATIC) -+ - # _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect: - # http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html - AC_MSG_CHECKING(for glibc _FORTIFY_SOURCE/memmove bug) -diff --git a/libmpdec/Makefile.in b/libmpdec/Makefile.in -index d9619a3..985c73c 100644 ---- a/libmpdec/Makefile.in -+++ b/libmpdec/Makefile.in -@@ -7,6 +7,8 @@ - LIBSTATIC = @LIBSTATIC@ - LIBSONAME = @LIBSONAME@ - LIBSHARED = @LIBSHARED@ -+BUILD_SHARED = @BUILD_SHARED@ -+BUILD_STATIC = @BUILD_STATIC@ - - CC = @CC@ - LD = @LD@ -@@ -32,8 +34,15 @@ ifeq ($(MAKECMDGOALS), profile_use) - MPD_LDFLAGS += $(MPD_PUSE) - endif - -+ifeq ($(BUILD_SHARED),yes) -+TARGETS += $(LIBSHARED) -+endif -+ -+ifeq ($(BUILD_STATIC),yes) -+TARGETS += $(LIBSTATIC) -+endif - --default: $(LIBSTATIC) $(LIBSHARED) -+default: $(TARGETS) - - - OBJS := basearith.o context.o constants.o convolute.o crt.o mpdecimal.o \ -diff --git a/libmpdec/Makefile.in b/libmpdec/Makefile.in -index d9619a3..985c73c 100644 ---- a/libmpdec++/Makefile.in -+++ b/libmpdec++/Makefile.in -@@ -13,6 +13,8 @@ LIBSTATIC_CXX = @LIBSTATIC_CXX@ - LIBNAME_CXX = @LIBNAME_CXX@ - LIBSONAME_CXX = @LIBSONAME_CXX@ - LIBSHARED_CXX = @LIBSHARED_CXX@ -+BUILD_SHARED = @BUILD_SHARED@ -+BUILD_STATIC = @BUILD_STATIC@ - - CXX = @CXX@ - LDXX = @LDXX@ -@@ -39,8 +41,15 @@ ifeq ($(MAKECMDGOALS), profile_use) - MPD_LDXXFLAGS += $(MPD_PUSE) - endif - -+ifeq ($(BUILD_SHARED),yes) -+TARGETS += $(LIBSHARED_CXX) -+endif -+ -+ifeq ($(BUILD_STATIC),yes) -+TARGETS += $(LIBSTATIC_CXX) -+endif - --default: $(LIBSTATIC_CXX) $(LIBSHARED_CXX) -+default: $(TARGETS) - - - OBJS := decimal.o --- -2.1.0 - diff --git a/package/mpdecimal/mpdecimal.hash b/package/mpdecimal/mpdecimal.hash index c931ee4a6d..81150c7575 100644 --- a/package/mpdecimal/mpdecimal.hash +++ b/package/mpdecimal/mpdecimal.hash @@ -1,4 +1,4 @@ # From http://www.bytereef.org/mpdecimal/download.html -sha256 15417edc8e12a57d1d9d75fa7e3f22b158a3b98f44db9d694cfd2acde8dfa0ca mpdecimal-2.5.0.tar.gz +sha256 9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f mpdecimal-2.5.1.tar.gz # Locally computed sha256 b07528d8b1dbf1e2d2741052996f0876e23342ce2d30d0effa39c5457716c25a LICENSE.txt diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index fa310a2274..25c12c08b1 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -5,12 +5,11 @@ ################################################################################ MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases -MPDECIMAL_VERSION = 2.5.0 +MPDECIMAL_VERSION = 2.5.1 MPDECIMAL_INSTALL_STAGING = YES MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" -MPDECIMAL_AUTORECONF = YES # On i386, by default, mpdecimal tries to uses which is not # available in musl/uclibc. So in this case, we tell mpdecimal to use -- 2.34.1 From peter at korsgaard.com Sat Jan 15 17:31:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 18:31:24 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libopenssl: bump version to 1.1.1m Message-ID: <20220115172500.3973F8258B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c7473698ed47c0cc5d385f6a9cd742991bff383 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Minor bugfix release: Changes between 1.1.1l and 1.1.1m [14 Dec 2021] *) Avoid loading of a dynamic engine twice. [Bernd Edlinger] *) Fixed building on Debian with kfreebsd kernels [Mattias Ellert] *) Prioritise DANE TLSA issuer certs over peer certs [Viktor Dukhovni] *) Fixed random API for MacOS prior to 10.12 These MacOS versions don't support the CommonCrypto APIs [Lenny Primak] Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2b906b975a956bd2b6352b2eec6c3c697317bbbe) Signed-off-by: Peter Korsgaard --- 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 93c688d9dd..a055cbc270 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256 -sha256 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 +sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index b618e3e56b..e713afef7f 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1l +LIBOPENSSL_VERSION = 1.1.1m LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sat Jan 15 17:31:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 18:31:19 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libopenssl: bump version to 1.1.1m Message-ID: <20220115172504.EDA018258B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7642ecec5ea91fc1aabb72153d0dc497cc0471e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Minor bugfix release: Changes between 1.1.1l and 1.1.1m [14 Dec 2021] *) Avoid loading of a dynamic engine twice. [Bernd Edlinger] *) Fixed building on Debian with kfreebsd kernels [Mattias Ellert] *) Prioritise DANE TLSA issuer certs over peer certs [Viktor Dukhovni] *) Fixed random API for MacOS prior to 10.12 These MacOS versions don't support the CommonCrypto APIs [Lenny Primak] Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2b906b975a956bd2b6352b2eec6c3c697317bbbe) Signed-off-by: Peter Korsgaard --- 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 93c688d9dd..a055cbc270 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256 -sha256 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 +sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index f139213315..bd8ef6141a 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1l +LIBOPENSSL_VERSION = 1.1.1m LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sat Jan 15 17:31:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 18:31:41 +0100 Subject: [Buildroot] [git commit] package/libopenssl: bump version to 1.1.1m In-Reply-To: <20211216194555.323F481DED@busybox.osuosl.org> (Arnout Vandecappelle's message of "Thu, 16 Dec 2021 20:23:09 +0100") References: <20211216194555.323F481DED@busybox.osuosl.org> Message-ID: <87wnj029du.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=2b906b975a956bd2b6352b2eec6c3c697317bbbe > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Minor bugfix release: > Changes between 1.1.1l and 1.1.1m [14 Dec 2021] > *) Avoid loading of a dynamic engine twice. > [Bernd Edlinger] > *) Fixed building on Debian with kfreebsd kernels > [Mattias Ellert] > *) Prioritise DANE TLSA issuer certs over peer certs > [Viktor Dukhovni] > *) Fixed random API for MacOS prior to 10.12 > These MacOS versions don't support the CommonCrypto APIs > [Lenny Primak] > Signed-off-by: Peter Korsgaard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 19:16:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:16:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/civetweb: fix BR2_STATIC_SHARED_LIBS typo In-Reply-To: <20211215215007.3983784-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 15 Dec 2021 22:50:07 +0100") References: <20211215215007.3983784-1-fontaine.fabrice@gmail.com> Message-ID: <87sfto24jj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix typo BR2_STATIC_SHARED_LIBS -> BR2_SHARED_STATIC_LIBS added by > commit db47bc99976c2d4ffb509620a76cfdd369b30559 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From romain.naour at gmail.com Sat Jan 15 19:28:52 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 15 Jan 2022 20:28:52 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <20220115160517.GQ1945846@scaer> References: <20220115143344.12319-1-romain.naour@gmail.com> <20220115143344.12319-2-romain.naour@gmail.com> <20220115160517.GQ1945846@scaer> Message-ID: <737f135e-b936-a21c-8775-349d7db7fb88@gmail.com> Hello Yann, Le 15/01/2022 ? 17:05, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-15 15:33 +0100, Romain Naour spake thusly: >> As for the Buildroot testsuite, multiply every emulator timeout by 10 >> to avoid sporadic failures in elastic runners. >> >> qemu_arm_vexpress_tz_defconfig tested locally with sucess. >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 > > Are you sure increasing the timeout will fix this failure? The > build-run.log contains another error: > > loaded file zImage from 40400000 to 408CAABF, 004CAAC0 bytes > loaded file rootfs.cpio.uboot from 44000000 to 4438FA4E, 0038FA4F bytes > Kernel image @ 0x40400000 [ 0x000000 - 0x4caac0 ] > ## Loading init Ramdisk from Legacy Image at 44000000 ... > Image Name: > Created: 2022-01-13 16:06:53 UTC > Image Type: ARM Linux RAMDisk Image (uncompressed) > Data Size: 3734031 Bytes = 3.6 MiB > Load Address: 00000000 > Entry Point: 00000000 > Verifying Checksum ... OK > ## Flattened Device Tree blob at 40000000 > Booting using the fdt blob at 0x40000000 > ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) > Using Device Tree in place at 40000000, end 400051f7 > > So, to me, this is not a timeout issue, but an actual boot issue. The system stop in the middle of optee startup optee: dynamic shared memory is enabled Also, I got the same error message while testing locally. Best regards, Romain > > Regards, > Yann E. MORIN. > >> Signed-off-by: Romain Naour >> --- >> support/scripts/boot-qemu-image.py | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py >> index fba1533bb7..ba50ea69ee 100755 >> --- a/support/scripts/boot-qemu-image.py >> +++ b/support/scripts/boot-qemu-image.py >> @@ -25,7 +25,7 @@ def main(): >> qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') >> >> child = pexpect.spawn(qemu_start, ['serial-only'], >> - timeout=5, encoding='utf-8', >> + timeout=50, encoding='utf-8', >> env={"QEMU_AUDIO_DRV": "none"}) >> >> # We want only stdout into the log to avoid double echo >> @@ -36,7 +36,7 @@ def main(): >> time.sleep(1) >> >> try: >> - child.expect(["buildroot login:"], timeout=60) >> + child.expect(["buildroot login:"], timeout=600) >> except pexpect.EOF as e: >> # Some emulations require a fork of qemu-system, which may be >> # missing on the system, and is not provided by Buildroot. >> @@ -58,7 +58,7 @@ def main(): >> child.sendline("root\r") >> >> try: >> - child.expect(["# "], timeout=60) >> + child.expect(["# "], timeout=600) >> except pexpect.EOF: >> print("Cannot connect to shell") >> sys.exit(1) >> @@ -69,7 +69,7 @@ def main(): >> child.sendline("poweroff\r") >> >> try: >> - child.expect(["System halted"], timeout=60) >> + child.expect(["System halted"], timeout=600) >> child.expect(pexpect.EOF) >> except pexpect.EOF: >> pass >> -- >> 2.31.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Sat Jan 15 19:31:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:31:04 +0100 Subject: [Buildroot] [PATCH] configs/beaglebone_qt5_defconfig: bump to u-boot 2021.04 In-Reply-To: <20211215222507.762310-1-lothar.felten@gmail.com> (Lothar Felten's message of "Wed, 15 Dec 2021 23:25:07 +0100") References: <20211215222507.762310-1-lothar.felten@gmail.com> Message-ID: <87o84c23uv.fsf@dell.be.48ers.dk> >>>>> "Lothar" == Lothar Felten writes: > Fixes: > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition... > scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > Tested on beaglebone black and beaglebone white (A6) > Signed-off-by: Lothar Felten Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From patrickdepinguin at gmail.com Sat Jan 15 19:31:31 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 20:31:31 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> Message-ID: El jue, 13 ene 2022 a las 23:05, Romain Naour () escribi?: > > Hi Thomas, > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > There are cases where a 64-bit architecture is running a 64-bit kernel but > > 32-bit userspace. Examples include: > > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > > > In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to > > the 32-bit architecture, but the kernel needs to be built with the 64-bit > > architecture. > > > > Make it possible to define the correct architecture to be used for the > > kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is > > expected to know the valid values. > > > > Signed-off-by: Thomas De Schampheleire > > --- > > Makefile | 4 ++++ > > arch/Config.in | 15 +++++++++++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/Makefile b/Makefile > > index c5399e9a35..d09cf7c958 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -434,7 +434,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > > # Strip off the annoying quoting > > ARCH := $(call qstrip,$(BR2_ARCH)) > > NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) > > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > +else > > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) > > +endif > > > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > > BZCAT := $(call qstrip,$(BR2_BZCAT)) > > diff --git a/arch/Config.in b/arch/Config.in > > index 7575acf48c..c82100f541 100644 > > --- a/arch/Config.in > > +++ b/arch/Config.in > > @@ -329,6 +329,21 @@ config BR2_ARCH > > config BR2_KERNEL_ARCH > > string > > > > +config BR2_KERNEL_ARCH_OVERRIDE > > + string "Kernel architecture override" > > Maybe it would be better to add architecture dependencies here (BR2_ARCH_IS_64) > > > + help > > + Normally, the correct kernel architecture value is derived > > + from the selected architecture, and you should keep this > > + option empty. > > + However, there are cases where you may want to enter a custom > > + value, for example when using a 64-bit architecture but > > + running userspace in 32-bit mode. > > + As an example, in case of an x86_64 processor where you want > > + 32-bit userspace, BR2_ARCH will be 'i386'/'i486'/'i686' and > > + BR2_KERNEL_ARCH_OVERRIDE should be set to 'x86_64'. Note that > > + in this example you will also need a multilib toolchain and > > + pass '-m32' via BR2_TARGET_OPTIMIZATION. > > Adding -m32 will force the mulitilib toolchain to produce 32bits binary. > But -m64 is also added to the toolchain wrapper for x86_64. > Mixing -m64 and -m32 doesn't seems a good idea. Well, the last entry on the command-line counts, and since BR2_TARGET_OPTIMIZATION is passed _after_ -m64, the -m32 wins as expected. It would be possible to avoid passing the -m64 but then I think we'll have to make some assumptions about the value of KERNEL_ARCH_OVERRIDE or only cover specific cases. Best regards, Thomas From peter at korsgaard.com Sat Jan 15 19:32:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:32:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/lapack: security bump to version 3.10.0 In-Reply-To: <20211216070201.113909-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Dec 2021 08:02:01 +0100") References: <20211216070201.113909-1-fontaine.fabrice@gmail.com> Message-ID: <87k0f023rp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, > DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, > as also used in OpenBLAS before version 0.3.18. Specially crafted > inputs passed to these functions could cause an application using > lapack to crash or possibly disclose portions of its memory. > - Update license hash, year changed: > https://github.com/Reference-LAPACK/lapack/commit/f67034373ee2972b4ea5de5a3d635b30ad3026c2 > - Update indentation in hash file (two spaces) > http://netlib.org/lapack/lapack-3.10.0.html > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 18:12:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 19:12:04 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/civetweb: fix BR2_STATIC_SHARED_LIBS typo Message-ID: <20220115192726.7FB9482D97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b86bd9fee12fbaada52bc383d36626a6ec2fa07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix typo BR2_STATIC_SHARED_LIBS -> BR2_SHARED_STATIC_LIBS added by commit db47bc99976c2d4ffb509620a76cfdd369b30559 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0dbd03a0c93ae286d8b70b5455d699c58acf77e) Signed-off-by: Peter Korsgaard --- package/civetweb/civetweb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 33c3bfdf33..22618fb443 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -54,12 +54,12 @@ ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) CIVETWEB_INSTALL_STAGING = YES CIVETWEB_INSTALL_TARGETS += install-headers -ifeq ($(BR2_STATIC_LIBS)$(BR2_STATIC_SHARED_LIBS),y) +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) CIVETWEB_BUILD_TARGETS += lib CIVETWEB_INSTALL_TARGETS += install-lib endif -ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y) +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) CIVETWEB_BUILD_TARGETS += slib CIVETWEB_INSTALL_TARGETS += install-slib endif From peter at korsgaard.com Sat Jan 15 19:32:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:32:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lapack: security bump to version 3.10.0 Message-ID: <20220115192726.91AF582DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86a3f40405772faca6847553b3a541a501a73c88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. - Update license hash, year changed: https://github.com/Reference-LAPACK/lapack/commit/f67034373ee2972b4ea5de5a3d635b30ad3026c2 - Update indentation in hash file (two spaces) http://netlib.org/lapack/lapack-3.10.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 59a1fcc69620da8eab1c048977fa22d297b18284) Signed-off-by: Peter Korsgaard --- package/lapack/lapack.hash | 4 ++-- package/lapack/lapack.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lapack/lapack.hash b/package/lapack/lapack.hash index bac7210c29..6f6dbff1a6 100644 --- a/package/lapack/lapack.hash +++ b/package/lapack/lapack.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573 lapack-3.9.0.tar.gz -sha256 d56bd4441b999b80c88df04faf0d8b3d7d3b2bd781cf91242c4188e8a6d0f8be LICENSE +sha256 328c1bea493a32cac5257d84157dc686cc3ab0b004e2bea22044e0a59f6f8a19 lapack-3.10.0.tar.gz +sha256 66246b7d3e6736aea46e63fd5e087659474d07edfe2f9b051d085d9b42aaac61 LICENSE diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 41774f6167..f34f685ae2 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LAPACK_VERSION = 3.9.0 +LAPACK_VERSION = 3.10.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) From peter at korsgaard.com Sat Jan 15 19:24:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:24:42 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/beaglebone_qt5_defconfig: bump to u-boot 2021.04 Message-ID: <20220115192726.88AE982DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=839078c5da6c24727d6a065f5b3728bf8a216ded branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes: /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition... scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here Tested on beaglebone black and beaglebone white (A6) Signed-off-by: Lothar Felten Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b55cb018dbcc10d15b62e049d48b691fa8e4c9c) Signed-off-by: Peter Korsgaard --- configs/beaglebone_qt5_defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 11a91677ce..ff03a05a8e 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -32,13 +32,11 @@ 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="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y From peter at korsgaard.com Sat Jan 15 19:15:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:15:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/civetweb: fix BR2_STATIC_SHARED_LIBS typo Message-ID: <20220115192731.0D1CA82DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56228062ddd1a3c2a0d1a70a8d9d8b6641d46b5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix typo BR2_STATIC_SHARED_LIBS -> BR2_SHARED_STATIC_LIBS added by commit db47bc99976c2d4ffb509620a76cfdd369b30559 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0dbd03a0c93ae286d8b70b5455d699c58acf77e) Signed-off-by: Peter Korsgaard --- package/civetweb/civetweb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 94fbb4f9d8..b20d213a0d 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -54,12 +54,12 @@ ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) CIVETWEB_INSTALL_STAGING = YES CIVETWEB_INSTALL_TARGETS += install-headers -ifeq ($(BR2_STATIC_LIBS)$(BR2_STATIC_SHARED_LIBS),y) +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) CIVETWEB_BUILD_TARGETS += lib CIVETWEB_INSTALL_TARGETS += install-lib endif -ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y) +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) CIVETWEB_BUILD_TARGETS += slib CIVETWEB_INSTALL_TARGETS += install-slib endif From peter at korsgaard.com Sat Jan 15 19:32:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:32:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lapack: security bump to version 3.10.0 Message-ID: <20220115192731.14E2382DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4a84a9aa989efd98c160c89fa5edc92538a12d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. - Update license hash, year changed: https://github.com/Reference-LAPACK/lapack/commit/f67034373ee2972b4ea5de5a3d635b30ad3026c2 - Update indentation in hash file (two spaces) http://netlib.org/lapack/lapack-3.10.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 59a1fcc69620da8eab1c048977fa22d297b18284) Signed-off-by: Peter Korsgaard --- package/lapack/lapack.hash | 4 ++-- package/lapack/lapack.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lapack/lapack.hash b/package/lapack/lapack.hash index bac7210c29..6f6dbff1a6 100644 --- a/package/lapack/lapack.hash +++ b/package/lapack/lapack.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573 lapack-3.9.0.tar.gz -sha256 d56bd4441b999b80c88df04faf0d8b3d7d3b2bd781cf91242c4188e8a6d0f8be LICENSE +sha256 328c1bea493a32cac5257d84157dc686cc3ab0b004e2bea22044e0a59f6f8a19 lapack-3.10.0.tar.gz +sha256 66246b7d3e6736aea46e63fd5e087659474d07edfe2f9b051d085d9b42aaac61 LICENSE diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 41774f6167..f34f685ae2 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LAPACK_VERSION = 3.9.0 +LAPACK_VERSION = 3.10.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) From patrickdepinguin at gmail.com Sat Jan 15 19:45:22 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 20:45:22 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> Message-ID: El jue, 13 ene 2022 a las 23:05, Romain Naour () escribi?: > > Hi Thomas, > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > There are cases where a 64-bit architecture is running a 64-bit kernel but > > 32-bit userspace. Examples include: > > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > > > In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to > > the 32-bit architecture, but the kernel needs to be built with the 64-bit > > architecture. > > > > Make it possible to define the correct architecture to be used for the > > kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is > > expected to know the valid values. > > > > Signed-off-by: Thomas De Schampheleire > > --- > > Makefile | 4 ++++ > > arch/Config.in | 15 +++++++++++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/Makefile b/Makefile > > index c5399e9a35..d09cf7c958 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -434,7 +434,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > > # Strip off the annoying quoting > > ARCH := $(call qstrip,$(BR2_ARCH)) > > NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) > > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > +else > > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) > > +endif > > > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > > BZCAT := $(call qstrip,$(BR2_BZCAT)) > > diff --git a/arch/Config.in b/arch/Config.in > > index 7575acf48c..c82100f541 100644 > > --- a/arch/Config.in > > +++ b/arch/Config.in > > @@ -329,6 +329,21 @@ config BR2_ARCH > > config BR2_KERNEL_ARCH > > string > > > > +config BR2_KERNEL_ARCH_OVERRIDE > > + string "Kernel architecture override" > > Maybe it would be better to add architecture dependencies here (BR2_ARCH_IS_64) > Note that BR2_ARCH and BR2_ARCH_IS_64 refer to the architecture Buildroot really uses, which in these scenarios is the 32-bit architecture. So letting BR2_KERNEL_ARCH_OVERRIDE depend on BR2_ARCH_IS_64 is not possible. If we restrict the whole feature to specific cases (e.g. the two ones that I currently need) and extend on case-by-case basis, we could be more specific here. Best regards, Thomas From patrickdepinguin at gmail.com Sat Jan 15 20:02:58 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:02:58 +0100 Subject: [Buildroot] [PATCHv2 0/7] Basic support for 64-bit kernel and 32-bit userland Message-ID: <20220115200306.14037-1-patrickdepinguin@gmail.com> From: Thomas De Schampheleire Hello, Even though there are already cases where a 64-bit kernel is combined with 32-bit userland, like MIPS64n32, that Buildroot can support out-of-the-box, there are other combinations that don't currently work. At work, we have two such cases: - 64-bit x86_64 kernel with 32-bit i386 userspace - 64-bit aarch64 kernel with 32-bit arm userspace This series adds basic support for these cases, with the limitation that the user still needs to know what they are doing. Patch 1 is a general improvement and can land even if you don't agree with the rest. Patch 2 handles the realization that 'KERNEL_ARCH' can mean two different things, and that we need two separate variables. Patch 3 makes it possible for users to specify the kernel architecture that differs from the Buildroot notion of userspace architecture. Patch 4 fixes the build of perf in this mixed 64-bit-kernel+32-bit-userspace case. Patch 5 prepares host-qemu for the case of x86_64. I'm not very fond of the fact that this does not provide a generic solution. Patch 6 adds a new qemu defconfig for x86_64 kernel and x86 userspace, that employs the new logic. Finally patch 7 corrects LINUX_ARCH_PATH for sparc64, not directly related to this series but reported by Romain Naour during his review. As hinted above, users that would like to employ such scenarios still need to know what they are doing: - the correct value of BR2_KERNEL_ARCH_OVERRIDE is to be known by the user - the toolchain should be capable of generating both 64-bit (kernel) output as well as 32-bit userspace output. This is typically done with a multilib toolchain, where the default output is 64-bit so that the kernel build does not require additional changes, while passing the correct '-mXXX' flag as BR2_TARGET_OPTIMIZATION for the userspace compilations. - it is not possible to create one multilib toolchain that supports Aarch64 and (32-bit) ARM output. We have solved it by packaging two individual toolchains in one archive, with symlinks at top-level to the 32-bit toolchain, and some additional changes in Buildroot to make sure the 64-bit toolchain is used where needed (kernel, bootloader) - BR2_KERNEL_64_USERLAND_32 is not automatically passed. An alternative implementation would be to explicitly support certain combinations, but this is less flexible. Best regards, Thomas Thomas De Schampheleire (7): arch: move definition of KERNEL_ARCH to Config.in. files core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH core: introduce BR2_KERNEL_ARCH_OVERRIDE perf: fix compilation in case of i386 userspace with x86_64 kernel package/qemu: add support for overridden KERNEL_ARCH=x86_64 configs: add new qemu defconfig 'x86_multilib' linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 Makefile | 22 ++----- arch/Config.in | 18 ++++++ arch/Config.in.arc | 3 + arch/Config.in.arm | 4 ++ arch/Config.in.csky | 3 + arch/Config.in.m68k | 3 + arch/Config.in.microblaze | 3 + arch/Config.in.mips | 3 + arch/Config.in.nds32 | 3 + arch/Config.in.nios2 | 3 + arch/Config.in.or1k | 3 + arch/Config.in.powerpc | 3 + arch/Config.in.riscv | 3 + arch/Config.in.s390x | 3 + arch/Config.in.sh | 3 + arch/Config.in.sparc | 4 ++ arch/Config.in.x86 | 4 ++ arch/Config.in.xtensa | 3 + board/qemu/x86_multilib/linux.config | 57 +++++++++++++++++++ board/qemu/x86_multilib/post-build.sh | 11 ++++ board/qemu/x86_multilib/readme.txt | 7 +++ boot/barebox/barebox.mk | 10 ++-- boot/uboot/uboot.mk | 6 +- configs/qemu_x86_multilib_defconfig | 26 +++++++++ linux/linux.mk | 2 + package/busybox/busybox.mk | 2 +- .../environment-setup/environment-setup.mk | 2 +- package/kvmtool/kvmtool.mk | 4 +- package/libselinux/libselinux.mk | 2 +- package/linux-tools/linux-tool-perf.mk.in | 7 ++- .../linux-tools/linux-tool-selftests.mk.in | 6 +- package/olsr/olsr.mk | 4 +- package/pciutils/pciutils.mk | 2 +- package/qemu/qemu.mk | 3 + package/uboot-tools/uboot-tools.mk | 10 ++-- 35 files changed, 210 insertions(+), 42 deletions(-) create mode 100644 board/qemu/x86_multilib/linux.config create mode 100755 board/qemu/x86_multilib/post-build.sh create mode 100644 board/qemu/x86_multilib/readme.txt create mode 100644 configs/qemu_x86_multilib_defconfig -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:02:59 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:02:59 +0100 Subject: [Buildroot] [PATCHv2 1/7] arch: move definition of KERNEL_ARCH to Config.in. files In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-2-patrickdepinguin@gmail.com> From: Thomas De Schampheleire Similar to other arch-specific strings, the 'KERNEL_ARCH' variable can be determined from Config.in. files. Besides aligning with similar strings, this also means simplification: the big 'sed' covers several architectures not even supported by Buildroot. Signed-off-by: Thomas De Schampheleire Reviewed-by: Romain Naour --- Makefile | 17 +---------------- arch/Config.in | 3 +++ arch/Config.in.arc | 3 +++ arch/Config.in.arm | 4 ++++ arch/Config.in.csky | 3 +++ arch/Config.in.m68k | 3 +++ arch/Config.in.microblaze | 3 +++ arch/Config.in.mips | 3 +++ arch/Config.in.nds32 | 3 +++ arch/Config.in.nios2 | 3 +++ arch/Config.in.or1k | 3 +++ arch/Config.in.powerpc | 3 +++ arch/Config.in.riscv | 3 +++ arch/Config.in.s390x | 3 +++ arch/Config.in.sh | 3 +++ arch/Config.in.sparc | 4 ++++ arch/Config.in.x86 | 4 ++++ arch/Config.in.xtensa | 3 +++ 18 files changed, 55 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 5fc7137e5a..e012d121b9 100644 --- a/Makefile +++ b/Makefile @@ -437,22 +437,7 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) # Strip off the annoying quoting ARCH := $(call qstrip,$(BR2_ARCH)) - -KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ - -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/arcle/arc/ \ - -e s/arceb/arc/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/aarch64.*/arm64/ \ - -e s/nds32.*/nds32/ \ - -e s/or1k/openrisc/ \ - -e s/parisc64/parisc/ \ - -e s/powerpc64.*/powerpc/ \ - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/riscv.*/riscv/ \ - -e s/sh.*/sh/ \ - -e s/s390x/s390/ \ - -e s/microblazeel/microblaze/) +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) diff --git a/arch/Config.in b/arch/Config.in index c99af89efa..edf337f13e 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -328,6 +328,9 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_ARCH string +config BR2_KERNEL_ARCH + string + config BR2_ENDIAN string diff --git a/arch/Config.in.arc b/arch/Config.in.arc index f7a6d920b5..cc55c9e68f 100644 --- a/arch/Config.in.arc +++ b/arch/Config.in.arc @@ -62,6 +62,9 @@ config BR2_ARCH default "arc" if BR2_arcle default "arceb" if BR2_arceb +config BR2_KERNEL_ARCH + default "arc" + config BR2_arc bool default y if BR2_arcle || BR2_arceb diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 4c0910e4f8..0f50512fad 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -822,6 +822,10 @@ config BR2_ARCH default "aarch64" if BR2_aarch64 default "aarch64_be" if BR2_aarch64_be +config BR2_KERNEL_ARCH + default "arm" if BR2_arm || BR2_armeb + default "arm64" if BR2_aarch64 || BR2_aarch64_be + config BR2_ENDIAN default "LITTLE" if (BR2_arm || BR2_aarch64) default "BIG" if (BR2_armeb || BR2_aarch64_be) diff --git a/arch/Config.in.csky b/arch/Config.in.csky index 7e2029f759..df9e7ab75b 100644 --- a/arch/Config.in.csky +++ b/arch/Config.in.csky @@ -39,6 +39,9 @@ config BR2_GCC_TARGET_FLOAT_ABI config BR2_ARCH default "csky" +config BR2_KERNEL_ARCH + default "csky" + config BR2_ENDIAN default "LITTLE" diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k index 275f47f1d3..7f3aec7232 100644 --- a/arch/Config.in.m68k +++ b/arch/Config.in.m68k @@ -1,6 +1,9 @@ config BR2_ARCH default "m68k" if BR2_m68k +config BR2_KERNEL_ARCH + default "m68k" + config BR2_ENDIAN default "BIG" diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze index 5fe2906d40..52aa252a2c 100644 --- a/arch/Config.in.microblaze +++ b/arch/Config.in.microblaze @@ -2,6 +2,9 @@ config BR2_ARCH default "microblazeel" if BR2_microblazeel default "microblaze" if BR2_microblazebe +config BR2_KERNEL_ARCH + default "microblaze" + config BR2_ENDIAN default "LITTLE" if BR2_microblazeel default "BIG" if BR2_microblazebe diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 619456c2d5..b4923f8484 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -235,6 +235,9 @@ config BR2_ARCH default "mips64" if BR2_mips64 default "mips64el" if BR2_mips64el +config BR2_KERNEL_ARCH + default "mips" + config BR2_ENDIAN default "LITTLE" if BR2_mipsel || BR2_mips64el default "BIG" if BR2_mips || BR2_mips64 diff --git a/arch/Config.in.nds32 b/arch/Config.in.nds32 index 322ff49f2e..61fc346260 100644 --- a/arch/Config.in.nds32 +++ b/arch/Config.in.nds32 @@ -1,6 +1,9 @@ config BR2_ARCH default "nds32le" +config BR2_KERNEL_ARCH + default "nds32" + config BR2_GCC_TARGET_ARCH default "v3" diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2 index aae435fa17..c77b1a1c59 100644 --- a/arch/Config.in.nios2 +++ b/arch/Config.in.nios2 @@ -1,6 +1,9 @@ config BR2_ARCH default "nios2" +config BR2_KERNEL_ARCH + default "nios2" + config BR2_ENDIAN default "LITTLE" diff --git a/arch/Config.in.or1k b/arch/Config.in.or1k index abdf498fb8..ef1bded453 100644 --- a/arch/Config.in.or1k +++ b/arch/Config.in.or1k @@ -1,6 +1,9 @@ config BR2_ARCH default "or1k" +config BR2_KERNEL_ARCH + default "openrisc" + config BR2_ENDIAN default "BIG" diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index ba56c9c721..33b2471cf9 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -157,6 +157,9 @@ config BR2_ARCH default "powerpc64" if BR2_powerpc64 default "powerpc64le" if BR2_powerpc64le +config BR2_KERNEL_ARCH + default "powerpc" + config BR2_ENDIAN default "BIG" if BR2_powerpc || BR2_powerpc64 default "LITTLE" if BR2_powerpc64le diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv index e6436d7c39..1a008a935d 100644 --- a/arch/Config.in.riscv +++ b/arch/Config.in.riscv @@ -118,6 +118,9 @@ config BR2_ARCH default "riscv32" if !BR2_ARCH_IS_64 default "riscv64" if BR2_ARCH_IS_64 +config BR2_KERNEL_ARCH + default "riscv" + config BR2_ENDIAN default "LITTLE" diff --git a/arch/Config.in.s390x b/arch/Config.in.s390x index ad866b421e..bf4b70f957 100644 --- a/arch/Config.in.s390x +++ b/arch/Config.in.s390x @@ -17,6 +17,9 @@ endchoice config BR2_ARCH default "s390x" if BR2_s390x +config BR2_KERNEL_ARCH + default "s390" + config BR2_ENDIAN default "BIG" diff --git a/arch/Config.in.sh b/arch/Config.in.sh index b5cce18e22..fde42dfce2 100644 --- a/arch/Config.in.sh +++ b/arch/Config.in.sh @@ -24,6 +24,9 @@ config BR2_ARCH default "sh4a" if BR2_sh4a default "sh4aeb" if BR2_sh4aeb +config BR2_KERNEL_ARCH + default "sh" + config BR2_ENDIAN default "LITTLE" if BR2_sh4 || BR2_sh4a default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc index 4c4dc61745..b91df6892b 100644 --- a/arch/Config.in.sparc +++ b/arch/Config.in.sparc @@ -21,6 +21,10 @@ config BR2_ARCH default "sparc" if BR2_sparc default "sparc64" if BR2_sparc64 +config BR2_KERNEL_ARCH + default "sparc" if BR2_sparc + default "sparc64" if BR2_sparc64 + config BR2_ENDIAN default "BIG" diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0ba9ecbcea..b38d0f8106 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -337,6 +337,10 @@ config BR2_ARCH default "i686" if BR2_x86_athlon_4 default "x86_64" if BR2_x86_64 +config BR2_KERNEL_ARCH + default "i386" if !BR2_x86_64 + default "x86_64" if BR2_x86_64 + config BR2_ENDIAN default "LITTLE" diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index a79d906985..acc340eca6 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -48,6 +48,9 @@ config BR2_ENDIAN config BR2_ARCH default "xtensa" if BR2_xtensa +config BR2_KERNEL_ARCH + default "xtensa" + config BR2_READELF_ARCH_NAME default "Tensilica Xtensa Processor" -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:00 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:00 +0100 Subject: [Buildroot] [PATCHv2 2/7] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-3-patrickdepinguin@gmail.com> From: Thomas De Schampheleire The variable 'KERNEL_ARCH' is actually a normalized version of 'ARCH'/'BR2_ARCH'. For example, 'arcle' and 'arceb' both become 'arc', just as all powerpc variants become 'powerpc'. It is presumably called 'KERNEL_ARCH' because the Linux kernel is typically the first place where support for a new architecture is added, and thus is the entity that defines the normalized name. However, the term 'KERNEL_ARCH' can also be interpreted as 'the architecture used by the kernel', which need not be exactly the same as 'the normalized name for a certain arch'. In particular, for cases where a 64-bit architecture is running a 64-bit kernel but 32-bit userspace. Examples include: * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace In such cases, the 'architecture used by the kernel' needs to refer to the 64-bit name (aarch64, x86_64), whereas all userspace applications need to refer the, potentially normalized, 32-bit name. This means that there need to be two different variables: KERNEL_ARCH: the architecture used by the kernel NORMALIZED_ARCH: the normalized name for the current userspace architecture At this moment, both will actually have the same content. But a subsequent patch will add basic support for situations described above, in which KERNEL_ARCH may become overwritten to the 64-bit architecture, while NORMALIZED_ARCH needs to remain the same (32-bit) case. This commit replaces use of KERNEL_ARCH where actually the userspace arch is needed. Places that use KERNEL_ARCH in combination with building of kernel modules are not touched. There may be cases where a package builds both a kernel module as userspace, in which case it may need to know about both KERNEL_ARCH and NORMALIZED_ARCH, for the case where they differ. But this is to be fixed on a per-need basis. Signed-off-by: Thomas De Schampheleire Reviewed-by: Romain Naour --- Makefile | 1 + boot/barebox/barebox.mk | 10 +++++----- boot/uboot/uboot.mk | 6 +++--- package/busybox/busybox.mk | 2 +- package/environment-setup/environment-setup.mk | 2 +- package/kvmtool/kvmtool.mk | 4 ++-- package/libselinux/libselinux.mk | 2 +- package/linux-tools/linux-tool-perf.mk.in | 4 ++-- package/linux-tools/linux-tool-selftests.mk.in | 6 +++--- package/olsr/olsr.mk | 4 ++-- package/pciutils/pciutils.mk | 2 +- package/uboot-tools/uboot-tools.mk | 10 +++++----- 12 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index e012d121b9..c130eb61c6 100644 --- a/Makefile +++ b/Makefile @@ -437,6 +437,7 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) # Strip off the annoying quoting ARCH := $(call qstrip,$(BR2_ARCH)) +NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) ZCAT := $(call qstrip,$(BR2_ZCAT)) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 8f02f9f9e1..6506294d6d 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -59,16 +59,16 @@ ifneq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) $(1)_INSTALL_TARGET = NO endif -ifeq ($$(KERNEL_ARCH),i386) +ifeq ($$(NORMALIZED_ARCH),i386) $(1)_ARCH = x86 -else ifeq ($$(KERNEL_ARCH),x86_64) +else ifeq ($$(NORMALIZED_ARCH),x86_64) $(1)_ARCH = x86 -else ifeq ($$(KERNEL_ARCH),powerpc) +else ifeq ($$(NORMALIZED_ARCH),powerpc) $(1)_ARCH = ppc -else ifeq ($$(KERNEL_ARCH),arm64) +else ifeq ($$(NORMALIZED_ARCH),arm64) $(1)_ARCH = arm else -$(1)_ARCH = $$(KERNEL_ARCH) +$(1)_ARCH = $$(NORMALIZED_ARCH) endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 574fc7089a..49ebf42800 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -143,12 +143,12 @@ endif # The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm', so # we have to special case it. Similar for i386/x86_64 -> x86 -ifeq ($(KERNEL_ARCH),arm64) +ifeq ($(NORMALIZED_ARCH),arm64) UBOOT_ARCH = arm -else ifneq ($(filter $(KERNEL_ARCH),i386 x86_64),) +else ifneq ($(filter $(NORMALIZED_ARCH),i386 x86_64),) UBOOT_ARCH = x86 else -UBOOT_ARCH = $(KERNEL_ARCH) +UBOOT_ARCH = $(NORMALIZED_ARCH) endif UBOOT_MAKE_OPTS += \ diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60ebc4985f..75e57ba53f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -95,7 +95,7 @@ BUSYBOX_MAKE_OPTS = \ NM="$(TARGET_NM)" \ RANLIB="$(TARGET_RANLIB)" \ CC="$(TARGET_CC)" \ - ARCH=$(KERNEL_ARCH) \ + ARCH=$(NORMALIZED_ARCH) \ PREFIX="$(TARGET_DIR)" \ EXTRA_LDFLAGS="$(BUSYBOX_LDFLAGS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk index f4c52921f7..29ec5a9a95 100644 --- a/package/environment-setup/environment-setup.mk +++ b/package/environment-setup/environment-setup.mk @@ -11,7 +11,7 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS for var in $(TARGET_CONFIGURE_OPTS); do \ printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ done - printf "export \"ARCH=$(KERNEL_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) + printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE) printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index 2984817c7e..df6ae7e0f1 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -25,11 +25,11 @@ KVMTOOL_MAKE_OPTS = \ WERROR=0 define KVMTOOL_BUILD_CMDS - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) + $(TARGET_MAKE_ENV) ARCH=$(NORMALIZED_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) endef define KVMTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) ARCH=$(NORMALIZED_ARCH) $(MAKE) -C $(@D) \ $(KVMTOOL_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) prefix=/usr endef diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index c1e90130d2..5790e79040 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -18,7 +18,7 @@ LIBSELINUX_INSTALL_STAGING = YES # we won't have to use a relative path in 0002-revert-ln-relative.patch LIBSELINUX_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ - ARCH=$(KERNEL_ARCH) \ + ARCH=$(NORMALIZED_ARCH) \ SHLIBDIR=/usr/lib LIBSELINUX_MAKE_INSTALL_TARGETS = install diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index efa747cf8d..4e28129f50 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -8,10 +8,10 @@ LINUX_TOOLS += perf PERF_DEPENDENCIES = host-flex host-bison -ifeq ($(KERNEL_ARCH),x86_64) +ifeq ($(NORMALIZED_ARCH),x86_64) PERF_ARCH=x86 else -PERF_ARCH=$(KERNEL_ARCH) +PERF_ARCH=$(NORMALIZED_ARCH) endif PERF_MAKE_FLAGS = \ diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in index c4e5bf0fea..b824c11bd6 100644 --- a/package/linux-tools/linux-tool-selftests.mk.in +++ b/package/linux-tools/linux-tool-selftests.mk.in @@ -6,13 +6,13 @@ LINUX_TOOLS += selftests -ifeq ($(KERNEL_ARCH),x86_64) +ifeq ($(NORMALIZED_ARCH),x86_64) SELFTESTS_ARCH=x86 else -ifeq ($(KERNEL_ARCH),i386) +ifeq ($(NORMALIZED_ARCH),i386) SELFTESTS_ARCH=x86 else -SELFTESTS_ARCH=$(KERNEL_ARCH) +SELFTESTS_ARCH=$(NORMALIZED_ARCH) endif endif diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index b2c8e7e001..4ad88991f2 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -27,10 +27,10 @@ OLSR_PLUGINS += pud endif define OLSR_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(NORMALIZED_ARCH) \ CFLAGS="$(OLSR_CFLAGS)" -C $(@D) olsrd $(foreach p,$(OLSR_PLUGINS), \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(NORMALIZED_ARCH) \ CFLAGS="$(OLSR_CFLAGS)" -C $(@D)/lib/$(p) ) endef diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 9b83b62b55..67defcc743 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -12,7 +12,7 @@ PCIUTILS_LICENSE = GPL-2.0+ PCIUTILS_LICENSE_FILES = COPYING PCIUTILS_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ - HOST="$(KERNEL_ARCH)-linux" \ + HOST="$(NORMALIZED_ARCH)-linux" \ OPT="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ DNS=no \ diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 37e329a2af..26450b7adf 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -224,14 +224,14 @@ $(eval $(host-generic-package)) MKIMAGE = $(HOST_DIR)/bin/mkimage # mkimage supports alpha arc arm arm64 blackfin ia64 invalid m68k microblaze mips mips64 nds32 nios2 or1k powerpc riscv s390 sandbox sh sparc sparc64 x86 x86_64 xtensa -# KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa +# NORMALIZED_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa # For i386, we need to convert # For openrisc, we need to convert -# For others, we'll just keep KERNEL_ARCH -ifeq ($(KERNEL_ARCH),i386) +# For others, we'll just keep NORMALIZED_ARCH +ifeq ($(NORMALIZED_ARCH),i386) MKIMAGE_ARCH = x86 -else ifeq ($(KERNEL_ARCH),openrisc) +else ifeq ($(NORMALIZED_ARCH),openrisc) MKIMAGE_ARCH = or1k else -MKIMAGE_ARCH = $(KERNEL_ARCH) +MKIMAGE_ARCH = $(NORMALIZED_ARCH) endif -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:01 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:01 +0100 Subject: [Buildroot] [PATCHv2 3/7] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-4-patrickdepinguin@gmail.com> From: Thomas De Schampheleire There are cases where a 64-bit architecture is running a 64-bit kernel but 32-bit userspace. Examples include: * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to the 32-bit architecture, but the kernel needs to be built with the 64-bit architecture. Make it possible to define the correct architecture to be used for the kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is expected to know the valid values. Signed-off-by: Thomas De Schampheleire --- Makefile | 4 ++++ arch/Config.in | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Makefile b/Makefile index c130eb61c6..85b91338a5 100644 --- a/Makefile +++ b/Makefile @@ -438,7 +438,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) # Strip off the annoying quoting ARCH := $(call qstrip,$(BR2_ARCH)) NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) +else +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) +endif ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) diff --git a/arch/Config.in b/arch/Config.in index edf337f13e..6d8e2dfd7f 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -331,6 +331,21 @@ config BR2_ARCH config BR2_KERNEL_ARCH string +config BR2_KERNEL_ARCH_OVERRIDE + string "Kernel architecture override" + help + Normally, the correct kernel architecture value is derived + from the selected architecture, and you should keep this + option empty. + However, there are cases where you may want to enter a custom + value, for example when using a 64-bit architecture but + running userspace in 32-bit mode. + As an example, in case of an x86_64 processor where you want + 32-bit userspace, BR2_ARCH will be 'i386'/'i486'/'i686' and + BR2_KERNEL_ARCH_OVERRIDE should be set to 'x86_64'. Note that + in this example you will also need a multilib toolchain and + pass '-m32' via BR2_TARGET_OPTIMIZATION. + config BR2_ENDIAN string -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:02 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:02 +0100 Subject: [Buildroot] [PATCHv2 4/7] perf: fix compilation in case of i386 userspace with x86_64 kernel In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-5-patrickdepinguin@gmail.com> From: Thomas De Schampheleire If a 64-bit kernel is combined with 32-bit userspace, and this is achieved via a multilib toolchain that defaults to 64-bit with '-m32' in BR2_TARGET_OPTIMIZATION, the '-ld' command will still default to 64-bit output. In this case, packages that use 'ld' directly need to be instructed to use the correct ABI via the '-m' parameter. 'perf' is one such package. Signed-off-by: Thomas De Schampheleire --- package/linux-tools/linux-tool-perf.mk.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index 4e28129f50..b84b5fd415 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -45,6 +45,9 @@ PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32ltsmipn32" else PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf64ltsmip" endif +# case for x86 toolchain that defaults to 64-bit output +else ifeq ($(BR2_i386):$(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),y:x86_64) +PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf_i386" endif # The call to backtrace() function fails for ARC, because for some -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:03 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:03 +0100 Subject: [Buildroot] [PATCHv2 5/7] package/qemu: add support for overridden KERNEL_ARCH=x86_64 In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-6-patrickdepinguin@gmail.com> From: Thomas De Schampheleire When the kernel architecture is overridden via BR2_KERNEL_ARCH_OVERRIDE, this has an impact on the required architecture for qemu-system. The correct architecture for Qemu is currently determined based on ARCH, not KERNEL_ARCH. For example, while KERNEL_ARCH is 'powerpc' for all PowerPC variants, ARCH may be powerpc, powerpc64 or powerpc64le. And this translates to ppc, ppc64 and ppc64le for Qemu. This means that it is not generically possible to determine the Qemu architecture based on KERNEL_ARCH alone. For now, already handle the case of x86_64. Signed-off-by: Thomas De Schampheleire --- package/qemu/qemu.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index e69e813059..bcf684e615 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -302,6 +302,9 @@ endif ifeq ($(HOST_QEMU_ARCH),sh4aeb) HOST_QEMU_ARCH = sh4eb endif +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),x86_64) +HOST_QEMU_SYS_ARCH = x86_64 +endif HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) HOST_QEMU_CFLAGS = $(HOST_CFLAGS) -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:04 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:04 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-7-patrickdepinguin@gmail.com> From: Thomas De Schampheleire Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. Signed-off-by: Thomas De Schampheleire --- Note that the defconfig refers to a toolchain at autobuild.buildroot.org, but is not yet present at that location. I uploaded the toolchain temporarily to: http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz md5sum:b085c0d8f137c078f8f09d116d8364f8 sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 board/qemu/x86_multilib/linux.config | 57 +++++++++++++++++++++++++++ board/qemu/x86_multilib/post-build.sh | 11 ++++++ board/qemu/x86_multilib/readme.txt | 7 ++++ configs/qemu_x86_multilib_defconfig | 26 ++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 board/qemu/x86_multilib/linux.config create mode 100755 board/qemu/x86_multilib/post-build.sh create mode 100644 board/qemu/x86_multilib/readme.txt create mode 100644 configs/qemu_x86_multilib_defconfig diff --git a/board/qemu/x86_multilib/linux.config b/board/qemu/x86_multilib/linux.config new file mode 100644 index 0000000000..0ea9e53a06 --- /dev/null +++ b/board/qemu/x86_multilib/linux.config @@ -0,0 +1,57 @@ +CONFIG_SYSVIPC=y +# CONFIG_USELIB is not set +CONFIG_CGROUPS=y +CONFIG_SMP=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_IA32_EMULATION=y +# CONFIG_COMPAT_32BIT_TIME is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_WIRELESS is not set +CONFIG_PCI=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_NE2K_PCI=y +CONFIG_8139CP=y +# CONFIG_WLAN is not set +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_DRM=y +CONFIG_DRM_QXL=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_DRM_BOCHS=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_HDA_INTEL=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_EXT4_FS=y +CONFIG_AUTOFS4_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/board/qemu/x86_multilib/post-build.sh b/board/qemu/x86_multilib/post-build.sh new file mode 100755 index 0000000000..bf83a002c2 --- /dev/null +++ b/board/qemu/x86_multilib/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -u +set -e + +# Add a console on tty1 +if [ -e ${TARGET_DIR}/etc/inittab ]; then + grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ + sed -i '/GENERIC_SERIAL/a\ +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab +fi diff --git a/board/qemu/x86_multilib/readme.txt b/board/qemu/x86_multilib/readme.txt new file mode 100644 index 0000000000..fbc8ae9a6a --- /dev/null +++ b/board/qemu/x86_multilib/readme.txt @@ -0,0 +1,7 @@ +Run the emulation with: + + qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user # qemu_x86_multilib_defconfig + +Optionally add -smp N to emulate a SMP system with N CPUs. + +The login prompt will appear in the graphical window. diff --git a/configs/qemu_x86_multilib_defconfig b/configs/qemu_x86_multilib_defconfig new file mode 100644 index 0000000000..1c3a8179c1 --- /dev/null +++ b/configs/qemu_x86_multilib_defconfig @@ -0,0 +1,26 @@ +BR2_KERNEL_ARCH_OVERRIDE="x86_64" +BR2_x86_core2=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz" +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-multilib-linux-gnu" +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_15=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TARGET_OPTIMIZATION="-m32" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_multilib/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_multilib/linux.config" +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:05 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:05 +0100 Subject: [Buildroot] [PATCHv2 7/7] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-8-patrickdepinguin@gmail.com> From: Thomas De Schampheleire Buildroot uses variable LINUX_ARCH_PATH to refer to the arch-specific directory in the Linux tree, which may not necessarily be arch/$(KERNEL_ARCH). Buildroot already accounts for the case of KERNEL_ARCH=i386 and KERNEL_ARCH=x86_64, but does not for KERNEL_ARCH=sparc64, in which case the correct directory is arch/sparc. Reported-by: Romain Naour Signed-off-by: Thomas De Schampheleire --- linux/linux.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index dd2eebd446..35e2484588 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -242,6 +242,8 @@ ifeq ($(KERNEL_ARCH),i386) LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86 else ifeq ($(KERNEL_ARCH),x86_64) LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86 +else ifeq ($(KERNEL_ARCH),sparc64) +LINUX_ARCH_PATH = $(LINUX_DIR)/arch/sparc else LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) endif -- 2.32.0 From gilles.talis at gmail.com Sat Jan 15 20:19:19 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sat, 15 Jan 2022 21:19:19 +0100 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220113224531.6f9ac64a@windsurf> References: <20211024113931.88898-1-gilles.talis@gmail.com> <20220113224531.6f9ac64a@windsurf> Message-ID: Hello Thomas, Thanks for the review. Le jeu. 13 janv. 2022 ? 22:45, Thomas Petazzoni a ?crit : > > Hello Gilles, > > On Sun, 24 Oct 2021 13:39:31 +0200 > Gilles Talis wrote: > > > The NanoPi R2S is a FriendlyElec mini-router based on: > > > > - Rockchip RK3328 SoC > > - 1GB (or 2GB) DDR4 RAM > > - Gigabit Ethernet (WAN) > > - Gigabit Ethernet (USB3) (LAN) > > - USB 2.0 Host Port > > - MicroSD slot > > - Reset button > > - WAN - LAN - SYS LED > > > > https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 > > > > Signed-off-by: Gilles Talis > > This obviously looks very good, but there is one question: could you > drop the VFAT partition, and have the kernel, DTB and extlinux.conf be > directly in the ext4 partition, with U-Boot loading them from the ext4 > partition directly? > > This would simplify things a bit. Good suggestion. I will do that and send a v2 shortly. > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Thanks! Gilles From yann.morin.1998 at free.fr Sat Jan 15 20:23:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 21:23:03 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <737f135e-b936-a21c-8775-349d7db7fb88@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> <20220115143344.12319-2-romain.naour@gmail.com> <20220115160517.GQ1945846@scaer> <737f135e-b936-a21c-8775-349d7db7fb88@gmail.com> Message-ID: <20220115202303.GA2216429@scaer> Romain, All, On 2022-01-15 20:28 +0100, Romain Naour spake thusly: > Le 15/01/2022 ? 17:05, Yann E. MORIN a ?crit?: > > On 2022-01-15 15:33 +0100, Romain Naour spake thusly: > >> As for the Buildroot testsuite, multiply every emulator timeout by 10 > >> to avoid sporadic failures in elastic runners. > >> > >> qemu_arm_vexpress_tz_defconfig tested locally with sucess. > >> > >> Fixes: > >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 > > Are you sure increasing the timeout will fix this failure? The > > build-run.log contains another error: [--SNIP--] > > ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) > > Using Device Tree in place at 40000000, end 400051f7 > > So, to me, this is not a timeout issue, but an actual boot issue. > > The system stop in the middle of optee startup > optee: dynamic shared memory is enabled I was very confused by the above. Indeed, the log file I downladed earler really stopped at the error message I pasted. I am sure of that, as I still had it in my ~/tmp directory, so I could really double-check. But now I downloaded it again, and indeed, there are much more traces, up to that optee issue you point ed at. This is a really weird situation, that the download I had was only partial... > Also, I got the same error message while testing locally. But testing locally should not have the same impact on boot time, would it? The boot times out on the eleastic runners because they are too slow (and many congtainers contend for the CPU there). But locally, it is really surprising that you hit the exact same timeout issue, and the exact same point in the boot sequence... Anyway, can you resend your patch, as I marked it rejected in patchwork, please? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From gilles.talis at gmail.com Sat Jan 15 20:26:17 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sat, 15 Jan 2022 21:26:17 +0100 Subject: [Buildroot] [PATCH v2] configs/friendlyarm_nanopi_r2s: new defconfig Message-ID: <20220115202617.370414-1-gilles.talis@gmail.com> The NanoPi R2S is a FriendlyElec mini-router based on: - Rockchip RK3328 SoC - 1GB (or 2GB) DDR4 RAM - Gigabit Ethernet (WAN) - Gigabit Ethernet (USB3) (LAN) - USB 2.0 Host Port - MicroSD slot - Reset button - WAN - LAN - SYS LED https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 Signed-off-by: Gilles Talis --- DEVELOPERS | 2 + board/friendlyarm/nanopi-r2s/extlinux.conf | 4 ++ board/friendlyarm/nanopi-r2s/genimage.cfg | 22 +++++++++ board/friendlyarm/nanopi-r2s/post-build.sh | 5 ++ board/friendlyarm/nanopi-r2s/readme.txt | 57 ++++++++++++++++++++++ configs/friendlyarm_nanopi_r2s_defconfig | 34 +++++++++++++ 6 files changed, 124 insertions(+) create mode 100644 board/friendlyarm/nanopi-r2s/extlinux.conf create mode 100644 board/friendlyarm/nanopi-r2s/genimage.cfg create mode 100755 board/friendlyarm/nanopi-r2s/post-build.sh create mode 100644 board/friendlyarm/nanopi-r2s/readme.txt create mode 100644 configs/friendlyarm_nanopi_r2s_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..ca52c0cff2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1073,7 +1073,9 @@ F: configs/qemu_* N: Gilles Talis F: board/freescale/imx8mmevk/ +F: board/friendlyarm/nanopi-r2s/ F: configs/freescale_imx8mmevk_defconfig +F: configs/friendlyarm_nanopi_r2s_defconfig F: package/cctz/ F: package/faad2/ F: package/fdk-aac/ diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf new file mode 100644 index 0000000000..1ea0cdd8a5 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf @@ -0,0 +1,4 @@ +label NanoPi R2S linux + kernel /boot/Image + devicetree /boot/rk3328-nanopi-r2s.dtb + append root=/dev/mmcblk0p1 rw rootwait diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg new file mode 100644 index 0000000000..a686b4f14e --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "idbloader.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot.itb" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + offset = 16M + image = "rootfs.ext4" + } +} diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh new file mode 100755 index 0000000000..1f5ff6a611 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt new file mode 100644 index 0000000000..6d291cdd60 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/readme.txt @@ -0,0 +1,57 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Nanopi R2S. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Nanopi R2S link: +https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 + +This configuration uses ATF, U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_r2s_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +Files created in output directory +================================= + +output/images + +??? bl31.elf +??? boot.vfat +??? extlinux +??? idbloader.img +??? Image +??? rk3328-nanopi-r2s.dtb +??? rootfs.ext2 +??? rootfs.ext4 -> rootfs.ext2 +??? rootfs.tar +??? sdcard.img +??? u-boot.bin +??? u-boot.itb + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Nanopi R2S and power it up. The console +is on the serial line, 1500000 8N1. + +Notes +===== + +This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig new file mode 100644 index 0000000000..a167a39898 --- /dev/null +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -0,0 +1,34 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" +BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.32.0 From james.hilliard1 at gmail.com Sat Jan 15 21:11:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 15 Jan 2022 14:11:12 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220115211112.3224696-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. This fixes some build errors with per-package directories such as: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 Signed-off-by: James Hilliard --- Changes v1 -> v2: - add some missing overrides to qt.conf.in --- package/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 2 ++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..c92f52ced0 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,21 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Tests=@@STAGING_DIR@@/usr/lib/qt/tests +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +Documentation=@@STAGING_DIR@@/doc +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +Settings=@@STAGING_DIR@@/etc +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..6c05e710d8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ -- 2.25.1 From gilles.talis at gmail.com Sat Jan 15 21:14:49 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sat, 15 Jan 2022 22:14:49 +0100 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3_493 Message-ID: <20220115211449.393250-1-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/iozone/iozone.hash | 2 +- package/iozone/iozone.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 1255392e38..9ecf1d1af8 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 93c9142d61e6a71ea43b0a266bad7f49f07ce5f5d31b36f8edf4dd386795c483 iozone3_492.tgz +sha256 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 iozone3_493.tgz diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 2282a44eb8..2df4a2aa84 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,7 +4,7 @@ # ################################################################################ -IOZONE_VERSION = 3.492 +IOZONE_VERSION = 3.493 IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) -- 2.32.0 From ps.report at gmx.net Sat Jan 15 22:37:36 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 15 Jan 2022 23:37:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220112203939.606775-1-james.hilliard1@gmail.com> References: <20220112203939.606775-1-james.hilliard1@gmail.com> Message-ID: <20220115233736.634f0d0b@gmx.net> Hello James, *, On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > Currently the qmake gcc sysrootify path logic causes issues with > per-package directories, disable automatic gcc sysroot for qt5base > install and override all qt.conf paths manually to point to their > correct locations. > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > instead of the HOST_DIR for cross compilation to work. > > Signed-off-by: James Hilliard > --- > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > package/qt5/qt5base/qt5base.mk | 2 ++ > 2 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > index 2215cbd4e1..db9ab0c364 100644 > --- a/package/qt5/qt5base/qt.conf.in > +++ b/package/qt5/qt5base/qt.conf.in > @@ -2,6 +2,18 @@ > Prefix=/usr > HostPrefix=@@HOST_DIR@@ > Sysroot=@@STAGING_DIR@@ > -Headers=/usr/include/qt5 > -Plugins=/usr/lib/qt/plugins > -Examples=/usr/lib/qt/examples > +SysrootifyPrefix=false > +Binaries=@@STAGING_DIR@@/usr/bin > +Libraries=@@STAGING_DIR@@/usr/lib > +Headers=@@STAGING_DIR@@/usr/include/qt5 > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > +Data=@@STAGING_DIR@@ > +Translations=@@STAGING_DIR@@/translations > +ArchData=@@STAGING_DIR@@/usr > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > +Imports=@@STAGING_DIR@@/usr/imports > +Qml2Imports=@@STAGING_DIR@@/usr/qml > +HostBinaries=@@HOST_DIR@@/bin > +HostLibraries=@@HOST_DIR@@/lib > +HostData=@@STAGING_DIR@@ > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index bcdf036f00..6c05e710d8 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > -v \ > -prefix /usr \ > -hostprefix $(HOST_DIR) \ > + -hostdatadir $(STAGING_DIR) \ > -headerdir /usr/include/qt5 \ > -sysroot $(STAGING_DIR) \ > + -no-gcc-sysroot \ > -plugindir /usr/lib/qt/plugins \ > -examplesdir /usr/lib/qt/examples \ > -no-rpath \ This one leads to the following compile failure for qt5webengine-5.15.2: .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory collect2: error: ld returned 1 exit status But the file crti.o exists: $ find . -name crti.o ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o Did not (yet) test with your latest (v2) patch iteration... Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage (see secoidt.h/pk11pub.h No such file or directory failure reported by already by Thomas)... Regards, Peter From ps.report at gmx.net Sat Jan 15 22:53:51 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 15 Jan 2022 23:53:51 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/qt5webengine: fix compile flags for arm In-Reply-To: <20220109150304.45e12aea@windsurf> References: <20200306203410.25008-1-ps.report@gmx.net> <20220109150304.45e12aea@windsurf> Message-ID: <20220115235351.744cbf77@gmx.net> Hello Thomas, On Sun, 9 Jan 2022 15:03:04 +0100, Thomas Petazzoni wrote: > Hello Peter, > > On Fri, 6 Mar 2020 21:34:09 +0100 > Peter Seiderer wrote: > > > The qt5webengine configure simple takes QT_ARCH ('arm') to determine the > > chromium compiler flags and uses some hard coded ARMv7 default values > > for the compiler command line: '... -march=armv7-a -mfloat-abi=hard > > -mtune=generic-armv7-a -mfpu=vfpv3-d16 ...'. > > > > This results e.g. in an illegal instruction failure for rpi zero > > (reported on the mailing list, see [1]). > > > > Disable all arm custom cpu flags (march/mfloat-abi/mtune/mfpu/mthumb) as > > these are already set by the compiler wrapper (via a patch to the chromium > > GN build system BUILD.gn file). > > > > Despite the patch set all known values in the chromium GN build > > system config file chromium/build/config/arm.gni to not disturb > > the compile defines settings logic. > > It's been a very long time since this patch was posted. Does the > problem still occur? There is a patch series from James Hilliard > upgrading qt5webengine: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=279766 Problem still exits with qt5webengine-5.15.2 and qt5webengine-5.15.8... > > Some more questions below. > > > +diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > +index d223a4f6f..16dec5c6a 100644 > > +--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > ++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > +@@ -672,7 +672,8 @@ config("compiler") { > > + # TODO(pcc): The contents of .ARM.attributes should be based on the > > + # -march flag passed at compile time (see llvm.org/pr36291). > > + if (current_cpu == "arm") { > > +- ldflags += [ "-march=$arm_arch" ] > > ++ # disabled for the buildroot compile > > ++ # ldflags += [ "-march=$arm_arch" ] > > + } > > + } > > + > > +@@ -752,13 +753,15 @@ config("compiler_cpu_abi") { > > + ldflags += [ "--target=arm-linux-gnueabihf" ] > > + } > > + if (!is_nacl) { > > +- cflags += [ > > +- "-march=$arm_arch", > > +- "-mfloat-abi=$arm_float_abi", > > +- ] > > ++ # disabled for the buildroot compile > > ++ # cflags += [ > > ++ # "-march=$arm_arch", > > ++ # "-mfloat-abi=$arm_float_abi", > > ++ # ] > > + } > > + if (arm_tune != "") { > > +- cflags += [ "-mtune=$arm_tune" ] > > ++ # disabled for the buildroot compile > > ++ # cflags += [ "-mtune=$arm_tune" ] > > + } > > + } else if (current_cpu == "arm64") { > > + if (is_clang && !is_android && !is_nacl && !is_fuchsia) { > > +@@ -1130,7 +1133,9 @@ config("clang_revision") { > > + > > + config("compiler_arm_fpu") { > > + if (current_cpu == "arm" && !is_ios && !is_nacl) { > > +- cflags = [ "-mfpu=$arm_fpu" ] > > ++ # disabled for the buildroot compile > > ++ # cflags = [ "-mfpu=$arm_fpu" ] > > ++ cflags = [] > > + asmflags = cflags > > + } > > + } > > +@@ -1138,7 +1143,9 @@ config("compiler_arm_fpu") { > > + config("compiler_arm_thumb") { > > + if (current_cpu == "arm" && arm_use_thumb && is_posix && > > + !(is_mac || is_ios || is_nacl)) { > > +- cflags = [ "-mthumb" ] > > ++ # disabled for the buildroot compile > > ++ # cflags = [ "-mthumb" ] > > ++ cflags = [] > > + if (is_android && !is_clang) { > > + # Clang doesn't support this option. > > + cflags += [ "-mthumb-interwork" ] > > You're fixing the problem for ARM, but is there some similar mess for > other CPU architectures? > > > +# configure arm architecture paramter for chromium compile > > +ifeq ($(BR2_arm),y) > > +ifeq ($(BR2_ARM_CPU_ARMV4),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > > + $(SED) 's/^ arm_version = 7$$/ arm_version = 4/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +ifeq ($(BR2_ARM_CPU_ARMV5),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > > + $(SED) 's/^ arm_version = 7$$/ arm_version = 5/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +ifeq ($(BR2_ARM_CPU_ARMV6),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > > + $(SED) 's/^ arm_version = 7$$/ arm_version = 6/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +# no entriy for BR2_ARM_CPU_ARMV7A/BR2_ARM_CPU_ARMV7M, arm_vesion = 7 is already set by default > > + > > +ifeq ($(BR2_ARM_CPU_ARMV8A),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > > + $(SED) 's/^ arm_version = 7$$/ arm_version = 8/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +# not known by buildroot, set to some dummy to disable all default logic > > +define QT5WEBENGINE_CONFIGURE_ARM_ARCH > > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "arm-dummy-arch"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > + > > +define QT5WEBENGINE_CONFIGURE_ARM_FPU > > + $(SED) 's/^ arm_fpu = ""$$/ arm_fpu = $(BR2_GCC_TARGET_FPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > + > > +define QT5WEBENGINE_CONFIGURE_ARM_FLOAT_ABI > > + $(SED) 's/^ arm_float_abi = ""$$/ arm_float_abi = $(BR2_GCC_TARGET_FLOAT_ABI)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > + > > +define QT5WEBENGINE_CONFIGURE_ARM_TUNE > > + $(SED) 's/^ arm_tune = ""$$/ arm_tune = $(BR2_GCC_TARGET_CPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > + > > +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "true"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +else > > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "false"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +ifeq ($(BR2_ARM_CPU_HAS_THUMB),) > > +define QT5WEBENGINE_CONFIGURE_ARM_THUMB > > + $(SED) 's/^ arm_use_thumb = true$$/ arm_use_thumb = false/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > +endif > > What are all those variables doing in the GN Chromium stuff? Setting compiler flags e.g. arm_use_thumb --> -mthumb arm_use_neon --> -DUSE_NEON and influences arm_fpu setting (if not already set)... > > I'm kind of worried by two aspects: > > - This is all very ARM specific, but we have other CPU architectures > supported in Buildroot Yes there is a although some x86/x64 logic setting e.g. -m32/-m64 and -msse2/-mfpmath=sse/-mmmx and some mips/ppc/s390 and more..., but did only take a deeper look at the arm part as the reported failure was about rpi-zero... > > - We already pass the proper CFLAGS, so it's always annoying to > duplicate this logic into package-specific flags Yes... ;-) Regards, Peter > > Thomas From ps.report at gmx.net Sat Jan 15 22:57:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 15 Jan 2022 23:57:58 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/qt5webengine: use buildroot cflags/ldflags for arm In-Reply-To: <20220109150359.1c4a717b@windsurf> References: <20200306203410.25008-1-ps.report@gmx.net> <20200306203410.25008-2-ps.report@gmx.net> <20220109150359.1c4a717b@windsurf> Message-ID: <20220115235758.069ce087@gmx.net> Hello Thomas, On Sun, 9 Jan 2022 15:03:59 +0100, Thomas Petazzoni wrote: > On Fri, 6 Mar 2020 21:34:10 +0100 > Peter Seiderer wrote: > > > +define QT5WEBENGINE_CONFIGURE_COMPILER_FLAGS > > + $(SED) 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))%g' $(@D)/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > + $(SED) 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))%g' $(@D)/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > +endef > > This looks like a good thing. Could it replace the ARM-specific logic > you had in your PATCH 1/2 ? Not sure as there is more optional and/or compile defines logic depending on the various arm-options logic..., the save way seems to be the right setting of the various arm-options (but did not find a better way as to edit/sed the GN files... Regards, Peter > > Thomas From ps.report at gmx.net Sat Jan 15 23:03:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sun, 16 Jan 2022 00:03:04 +0100 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20220109142748.4f7c1a59@windsurf> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> <20220109142748.4f7c1a59@windsurf> Message-ID: <20220116000304.15e7dcf8@gmx.net> Hello Thomas, On Sun, 9 Jan 2022 14:27:48 +0100, Thomas Petazzoni wrote: > On Mon, 21 Dec 2020 21:39:51 +0100 > Peter Seiderer wrote: > > > - add optional host-freetype dependency > > > > Fixes: > > > > Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 > > Returned 1. > > stderr: > > > > Package freetype2 was not found in the pkg-config search path. > > Perhaps you should add the directory containing `freetype2.pc' > > to the PKG_CONFIG_PATH environment variable > > Package 'freetype2', required by 'virtual:world', not found > > Could not run pkg-config. > > > > See //build/linux/BUILD.gn:24:3: whence it was called. > > pkg_config("freetype_from_pkgconfig") { > > ^-------------------------------------- > > See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included. > > public_configs = [ "//build/linux:freetype_from_pkgconfig" ] > > ^-------------------------------------- > > Project ERROR: GN run error! > > make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 > > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 > > I am falling into this issue while building the following defconfig: > > BR2_arm=y > BR2_arm1176jzf_s=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_QT5WEBENGINE=y > BR2_PACKAGE_RPI_USERLAND=y > > Did you had the chance to investigate more deeply why having fontconfig > support in Qt leads qt5webengine wanting to find freetype2 on the host? The observation is that all (optional) qt target options are requested by qtwebengine for the host (and buildroot package fontconfig selects freetype)... Regards, Peter > > Thomas From ps.report at gmx.net Sat Jan 15 23:04:35 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sun, 16 Jan 2022 00:04:35 +0100 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20220109144430.1064ea1c@windsurf> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> <20220109142748.4f7c1a59@windsurf> <20220109144430.1064ea1c@windsurf> Message-ID: <20220116000435.03d5b920@gmx.net> Hello Thomas, On Sun, 9 Jan 2022 14:44:30 +0100, Thomas Petazzoni wrote: > On Sun, 9 Jan 2022 14:27:48 +0100 > Thomas Petazzoni wrote: > > > I am falling into this issue while building the following defconfig: > > > > BR2_arm=y > > BR2_arm1176jzf_s=y > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > > BR2_PACKAGE_QT5=y > > BR2_PACKAGE_QT5WEBENGINE=y > > BR2_PACKAGE_RPI_USERLAND=y > > > > Did you had the chance to investigate more deeply why having fontconfig > > support in Qt leads qt5webengine wanting to find freetype2 on the host? > > Interestingly, in commit > https://github.com/meta-qt5/meta-qt5/commit/280487f20bca829527a597d6263b0344a01917ac#diff-f0ffde666f6ff0282f8400203b3ba20968494d3c7245106eca761bd79baa1c78R26 > the meta-qt5 layer, when upgrading Qt to 5.15.2 added jpeg-native and > freetype-native as new unconditional dependencies. > > But there are no explanations. Is it really because the Chromium stuff > is building a host tool with freetype/jpeg, or is it just a workaround > for some incorrect behavior of the Chromium build process that needs > freetype/jpeg on the target, but checks for them on the host? Would say yes... Regards, Peter > > Thomas From james.hilliard1 at gmail.com Sun Jan 16 01:34:36 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 15 Jan 2022 18:34:36 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220115233736.634f0d0b@gmx.net> References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> Message-ID: On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > Hello James, *, > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > Currently the qmake gcc sysrootify path logic causes issues with > > per-package directories, disable automatic gcc sysroot for qt5base > > install and override all qt.conf paths manually to point to their > > correct locations. > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > instead of the HOST_DIR for cross compilation to work. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > package/qt5/qt5base/qt5base.mk | 2 ++ > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > index 2215cbd4e1..db9ab0c364 100644 > > --- a/package/qt5/qt5base/qt.conf.in > > +++ b/package/qt5/qt5base/qt.conf.in > > @@ -2,6 +2,18 @@ > > Prefix=/usr > > HostPrefix=@@HOST_DIR@@ > > Sysroot=@@STAGING_DIR@@ > > -Headers=/usr/include/qt5 > > -Plugins=/usr/lib/qt/plugins > > -Examples=/usr/lib/qt/examples > > +SysrootifyPrefix=false > > +Binaries=@@STAGING_DIR@@/usr/bin > > +Libraries=@@STAGING_DIR@@/usr/lib > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > +Data=@@STAGING_DIR@@ > > +Translations=@@STAGING_DIR@@/translations > > +ArchData=@@STAGING_DIR@@/usr > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > +Imports=@@STAGING_DIR@@/usr/imports > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > +HostBinaries=@@HOST_DIR@@/bin > > +HostLibraries=@@HOST_DIR@@/lib > > +HostData=@@STAGING_DIR@@ > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index bcdf036f00..6c05e710d8 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > -v \ > > -prefix /usr \ > > -hostprefix $(HOST_DIR) \ > > + -hostdatadir $(STAGING_DIR) \ > > -headerdir /usr/include/qt5 \ > > -sysroot $(STAGING_DIR) \ > > + -no-gcc-sysroot \ > > -plugindir /usr/lib/qt/plugins \ > > -examplesdir /usr/lib/qt/examples \ > > -no-rpath \ > > This one leads to the following compile failure for qt5webengine-5.15.2: > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > collect2: error: ld returned 1 exit status Hmm, I'll test that again. > > > But the file crti.o exists: > > $ find . -name crti.o > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > Did not (yet) test with your latest (v2) patch iteration... > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > Thomas)... Does qt5webengine build ok without per-package directories with just the KDE bump for all the other qt5 packages?: https://patchwork.ozlabs.org/project/buildroot/patch/20220113000935.2353800-1-james.hilliard1 at gmail.com/ I separated that out to make it easier to isolate the linker issues with the qt5webengine 5.15.8-lts build. > > Regards, > Peter From james.hilliard1 at gmail.com Sun Jan 16 04:05:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 15 Jan 2022 21:05:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webengine: fix build with glibc 2.34 Message-ID: <20220116040525.3007767-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 16 05:08:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 15 Jan 2022 22:08:57 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220115233736.634f0d0b@gmx.net> References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> Message-ID: On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > Hello James, *, > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > Currently the qmake gcc sysrootify path logic causes issues with > > per-package directories, disable automatic gcc sysroot for qt5base > > install and override all qt.conf paths manually to point to their > > correct locations. > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > instead of the HOST_DIR for cross compilation to work. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > package/qt5/qt5base/qt5base.mk | 2 ++ > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > index 2215cbd4e1..db9ab0c364 100644 > > --- a/package/qt5/qt5base/qt.conf.in > > +++ b/package/qt5/qt5base/qt.conf.in > > @@ -2,6 +2,18 @@ > > Prefix=/usr > > HostPrefix=@@HOST_DIR@@ > > Sysroot=@@STAGING_DIR@@ > > -Headers=/usr/include/qt5 > > -Plugins=/usr/lib/qt/plugins > > -Examples=/usr/lib/qt/examples > > +SysrootifyPrefix=false > > +Binaries=@@STAGING_DIR@@/usr/bin > > +Libraries=@@STAGING_DIR@@/usr/lib > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > +Data=@@STAGING_DIR@@ > > +Translations=@@STAGING_DIR@@/translations > > +ArchData=@@STAGING_DIR@@/usr > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > +Imports=@@STAGING_DIR@@/usr/imports > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > +HostBinaries=@@HOST_DIR@@/bin > > +HostLibraries=@@HOST_DIR@@/lib > > +HostData=@@STAGING_DIR@@ > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index bcdf036f00..6c05e710d8 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > -v \ > > -prefix /usr \ > > -hostprefix $(HOST_DIR) \ > > + -hostdatadir $(STAGING_DIR) \ > > -headerdir /usr/include/qt5 \ > > -sysroot $(STAGING_DIR) \ > > + -no-gcc-sysroot \ > > -plugindir /usr/lib/qt/plugins \ > > -examplesdir /usr/lib/qt/examples \ > > -no-rpath \ > > This one leads to the following compile failure for qt5webengine-5.15.2: > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > collect2: error: ld returned 1 exit status So I was able to reproduce this error, however best I can tell it's probably not a regression as the compilation still fails due to a different error without this patch: ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned non-zero exit code. pkgresult = exec_script(pkg_config_script, args, "value") ^---------- Current dir: /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/core/release/ Command: /home/buildroot/buildroot/output/host/bin/python2 /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config libjpeg Returned 1. stderr: Package libjpeg was not found in the pkg-config search path. Perhaps you should add the directory containing `libjpeg.pc' to the PKG_CONFIG_PATH environment variable Package 'libjpeg', required by 'virtual:world', not found Could not run pkg-config. See //third_party/BUILD.gn:17:3: whence it was called. pkg_config("system_libjpeg") { ^----------------------------- See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused the file to be included. "//third_party:jpeg", ^------------------- Project ERROR: GN run error! > > > But the file crti.o exists: > > $ find . -name crti.o > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > Did not (yet) test with your latest (v2) patch iteration... > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > Thomas)... > > Regards, > Peter From thomas.petazzoni at bootlin.com Sun Jan 16 07:08:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 16 Jan 2022 07:08:52 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-15 Message-ID: <20220116070900.72EF04035F@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-15 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 58 | 8 | 0 | 66 | 2021.11.x | 30 | 4 | 0 | 34 | master | 115 | 55 | 0 | 170 | Classification of failures by reason for master ----------------------------------------------- host-riscv-isa-sim-1.1.0 | 10 rygel-0.40.2 | 7 frr-8.1 | 5 gvfs-1.48.1 | 4 bluez5_utils-5.63 | 2 mtd-2.1.3 | 2 nodejs-14.18.2 | 2 pcsc-lite-1.9.5 | 2 qt5webkit-5.212.0-alpha4 | 2 rtorrent-0.9.8 | 2 wavemon-0.9.4 | 2 apcupsd-3.14.14 | 1 bat-0.18.3 | 1 freeipmi-1.6.8 | 1 google-breakpad-7515ab13768... | 1 ksmbd-tools-3.4.3 | 1 libglvnd-1.3.2 | 1 libupnp-1.14.12 | 1 libv4l-1.22.1 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.3 | 1 mongodb-4.2.11 | 1 opencv4-4.5.5 | 1 php-apcu-5.1.20 | 1 powertop-2.13 | 1 pulseview-0.4.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/3f04df1b394b4b4707775f6bca8a6dee1b92367c | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/3076accd1738f88bda4b4c1040f4a720e3e60a3a | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/3f09bceb4988b61d8d8db1c4a91828c66d0725bc | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6631348b0500e297832b30ce3dc47838945899c9 | x86_64 | freeipmi-1.6.8 | NOK | http://autobuild.buildroot.net/results/5354f7231cf08bf762e7d86fca874ce63d9a116b | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/10fbdb17e1b11c1cc4652a7f8860cd6a570560be | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/30f84f949367794bb8cabd4d7d6e6ad7a5287295 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/96c36ea64c1c8009d003c85a5fa35c62c8a4c015 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8a945fd8873256a0108c6bdeec2b08c09c4c8c6a | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/6515cc7cce49ac91372f41813ed68ce356003199 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/9d9608456e3016e6918b6a0e71846623309583b6 | aarch64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/d703792607bb52e81efaf5ba6a0bd53b438400c4 | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/126471bbd80b2b00a49635a73d69a554ae2c8b70 | ORPH i586 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/d81c60adf9cb56b242bb1e60552ff5019feffcf6 | ORPH mips64el | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/8e6fbf48c83d92861e650ce22a812001aee51ce2 | ORPH powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/632f14d4a9980d28d0b1eb1104e2fa8a60727958 | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/b2d69ee063782ac1a0bab1832f53e92e3fdd1b65 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/3e04528eeb05b3fb5f49645b837c5bebc3b13eb1 | sh4 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/5f5fd961c5902e6e63e97f06d917359aa4f4a703 | microblazeel | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/4837aba2025d540eb423af6b3a1e3092ae53c481 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/753450247f18e6ec6e532bbe286a435f2fb4a5e4 | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/35024daa51f80dfdbddbcb2ab607e8d656634cb0 | powerpc64le | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/5395fb39ba0a1127a64345631c85addfb84c936f | aarch64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/855b66b86d979cc922b947da932b0e2388481263 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6af0710e3b4fb72e9208eaba23a84378e4f4c9c2 | x86_64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/c3f0279eac744888412da9970431c45872c6d8f9 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/2ca1a96233c998807c5525a2b6ba77747e6c0760 | ORPH or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/d144c7b9359559df0f366be57d8336941c4e8134 | arm | libv4l-1.22.1 | NOK | http://autobuild.buildroot.net/results/6e71769ab6539e0ca5350be34fda940b4e67ee8c | mips64el | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/bf2036ebcffa0956b71aca6221e73426e56d4817 | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/eddbe414cfa07221c89d9bc0a23b3622cf0dc39d | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/f428ee92e28669721bf7960bb11483d90545bfec | mips64el | mtd-2.1.3 | NOK | http://autobuild.buildroot.net/results/2ae5017a4bfbfd892a070ac47a8ff3a5fa658f4d | arm | mtd-2.1.3 | NOK | http://autobuild.buildroot.net/results/9409ebf6517db87672f3f4df5909a8ac4abfe8af | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/d302653549e9365c2ad4292c1e24d7e73485af51 | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/a004d6139acebc3f8fa8957c437130584fc1bb8a | mips64el | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/8185c9a7d593f0dae78d69a7637895185cd4deb4 | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/bdada9a881996704626e542efa052ddcadbac3f0 | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/7fbf83eb66c841a484943109c1f6df7ab4d25bdb | ORPH sparc | php-apcu-5.1.20 | NOK | http://autobuild.buildroot.net/results/efa3b4406f87a1e9521b66f392a6fa19ac01f0cd | or1k | powertop-2.13 | NOK | http://autobuild.buildroot.net/results/e9ec8a86237f186254b9b4f4650d1e2a8fba984d | x86_64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/ec72723d63f514da5001f97e048db899f3844516 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/351529f7d928e28fa2db22c6297dc70d21db562b | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed | m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/204381f47359ebe0d43ada1ad2a3bbc78bc3f2e7 | ORPH arc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/63493e456f0e4f87cb8fb03f2d3498460b24a11c | ORPH riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ac1d02637f69b3858067d2f0cf68e3c3717d6bf4 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6fa76fd24e43d80095480b5c9157473dca5d890f | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/27d96a09309f3666149299cd3043d0cb4e29185e | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/572d980f9f60fed45e0f722429b65cb0934be415 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/edfc7e088274415311741318cbb7099af75e101d | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/768b98327b70ffcf9a6e6827033a133b74c57cbc | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/99bd2b4ba871502a6df5db2aabc8c87f9b7226c3 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1581ee81ab4194083b714cd1631247a655f216ba | s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/4ddb9143bf60921cbfbd3268d467a989a4f648bc | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 4 gobject-introspection-1.64.1 | 1 openvmtools-10.3.5-10430147 | 1 rauc-1.5.1 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/1cb28988579e8267fd5781b3f232a65531abe4dc | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/238862958dba1d6b7b576cbe0ebb0c9deb2845d8 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/16543b1f38b1c4a79e8d53f9043c5a3d6d249afa | microblazeel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4f319738882f053c46eff747d0edc4f035dfdb4a | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/804da91d362a7e9f47b1b57a5938c015583119dc | i586 | openvmtools-10.3.5-10430147 | NOK | http://autobuild.buildroot.net/results/24229bf032e11856a23f750c46796d8acd2aceeb | riscv32 | rauc-1.5.1 | NOK | http://autobuild.buildroot.net/results/15375cc1eb4f4a4351f9e15f163f3f59053a00d9 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/e0f352099102a21185b990d857bdd2419b7529cd | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 2 kismet-2021-08-R1 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/9019ca0e05554649775b78ea6189eb7500138620 | i586 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/a2d13f21109888f387021cfc3adbe6e92ccf33f8 | m68k | kismet-2021-08-R1 | NOK | http://autobuild.buildroot.net/results/54845d7ff2e6866fb54dad5b6b9f3d65afbd6530 | ORPH arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a27d6e7dce06085b6a411d3b47b360d7fbcabc9c | Gitlab CI results for 2022-01-15 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083640 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083642 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083643 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083644 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083647 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083648 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083655 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083656 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083657 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083660 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083662 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083664 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083667 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083669 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083671 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083672 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083675 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083679 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083680 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083683 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083685 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083687 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083689 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083691 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083692 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083693 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083696 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083699 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083700 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083703 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083707 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083709 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083711 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083713 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083715 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083716 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083718 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083721 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083722 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083723 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083724 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083725 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083727 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083728 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083758 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083760 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083761 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083763 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083764 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083765 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083769 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083771 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083776 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083772 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083774 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083777 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083779 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083781 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083794 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083828 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083833 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083852 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083854 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083859 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083862 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083864 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083868 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083871 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083874 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083877 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083882 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083893 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083949 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083973 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083986 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083991 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083992 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083999 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084001 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084006 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084007 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084011 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084018 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084024 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084028 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084122 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084135 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084136 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084144 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084147 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084152 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084154 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084158 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084162 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084166 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084170 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084174 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084179 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084185 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084186 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084214 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084219 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084225 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084235 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084237 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084239 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084243 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084248 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084251 | -- http://autobuild.buildroot.net From gilles.talis at gmail.com Sun Jan 16 08:50:41 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 16 Jan 2022 09:50:41 +0100 Subject: [Buildroot] [PATCH] package/clpeak: new package In-Reply-To: <20211230180010.04c873f9@windsurf> References: <20211024113654.88720-1-gilles.talis@gmail.com> <20211230180010.04c873f9@windsurf> Message-ID: Hi Thomas, thanks for the review. Somehow, I missed this email and just stumbled across it now. Le jeu. 30 d?c. 2021 ? 18:00, Thomas Petazzoni a ?crit : > > Hello Gilles, > > On Sun, 24 Oct 2021 13:36:54 +0200 > Gilles Talis wrote: > > > clpeak is a tool that profiles OpenCL devices to find > > their peak capacities > > > > Signed-off-by: Gilles Talis > > --- > > DEVELOPERS | 1 + > > package/Config.in | 1 + > > package/clpeak/Config.in | 14 ++++++++++++++ > > package/clpeak/clpeak.hash | 3 +++ > > package/clpeak/clpeak.mk | 13 +++++++++++++ > > 5 files changed, 32 insertions(+) > > create mode 100644 package/clpeak/Config.in > > create mode 100644 package/clpeak/clpeak.hash > > create mode 100644 package/clpeak/clpeak.mk > > Thanks for this package submission! Unfortunately, I'm afraid there is > an issue: it downloads stuff during the configure step. See below: Good catch! It seems like clpeak has a hidden dependency that I missed. Whilst I am here, one question: how do we deal with packages that have git submodules dependencies? Is it OK to let the download process download these dependencies? Even if the dependencies are available buildroot packages? > > >>> clpeak 0777205be1d5681d5a76d46ec94588544e8462a5 Configuring > ... > -- The C compiler identification is GNU 9.3.0 > -- The CXX compiler identification is GNU 9.3.0 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Looking for CL_VERSION_2_2 > -- Looking for CL_VERSION_2_2 - found > -- Found OpenCL: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so (found version "2.2") > CMake Warning (dev) in CMakeLists.txt: > No project() command is present. The top-level CMakeLists.txt file must > contain a literal, direct call to the project() command. Add a line of > code such as > > project(ProjectName) > > near the top of the file, but after cmake_minimum_required(). > > CMake is pretending there is a "project(Project)" command on the first > line. > This warning is for project developers. Use -Wno-dev to suppress it. > > -- The C compiler identification is GNU 9.3.0 > -- The CXX compiler identification is GNU 9.3.0 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Configuring done > -- Generating done > -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build > gmake[1]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[2]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > [ 12%] Creating directories for 'hpp_headers' > [ 25%] Performing download step (git clone) for 'hpp_headers' > Cloning into 'hpp_headers'... > remote: Enumerating objects: 558, done. > remote: Counting objects: 100% (558/558), done. > remote: Compressing objects: 100% (396/396), done. > remote: Total 558 (delta 324), reused 355 (delta 155), pack-reused 0 > Receiving objects: 100% (558/558), 762.72 KiB | 5.45 MiB/s, done. > Resolving deltas: 100% (324/324), done. > Already on 'master' > Your branch is up to date with 'origin/master'. > Submodule 'external/CMock' (https://github.com/ThrowTheSwitch/CMock) registered for path 'external/CMock' > Submodule 'external/Unity' (https://github.com/ThrowTheSwitch/Unity) registered for path 'external/Unity' > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock'... > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/Unity'... > Submodule path 'external/CMock': checked out '7cc41ddfdd07dc5eb8359d278f439f14031d64ad' > Submodule 'vendor/c_exception' (https://github.com/throwtheswitch/cexception.git) registered for path 'external/CMock/vendor/c_exception' > Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/unity' > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception'... > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/unity'... > Submodule path 'external/CMock/vendor/c_exception': checked out 'dce9e8b26f2179439002e02d691429e81a32b6c0' > Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/c_exception/vendor/unity' > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception/vendor/unity'... > Submodule path 'external/CMock/vendor/c_exception/vendor/unity': checked out '2c7629a0ae90ffe991b5fd08e4db8672f72ed64c' > Submodule path 'external/CMock/vendor/unity': checked out '031f3bbe45f8adf504ca3d13e6f093869920b091' > Submodule path 'external/Unity': checked out '7d2bf62b7e6afaf38153041a9d53c21aeeca9a25' > [ 37%] Performing update step for 'hpp_headers' > HEAD is now at 1df82b9 Add param traits for CL_DEVICE_SUPPORTED_REGISTER_ALLOCATIONS_ARM (#165) > [ 50%] No patch step for 'hpp_headers' > [ 62%] Performing configure step for 'hpp_headers' > -- The C compiler identification is GNU 9.3.0 > -- The CXX compiler identification is GNU 9.3.0 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Configuring done > -- Generating done > -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build > [ 75%] Performing build step for 'hpp_headers' > gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > [ 87%] Performing install step for 'hpp_headers' > gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > Install the project... > -- Install configuration: "Release" > -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL > -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/cl2.hpp > -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/opencl.hpp > gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > [100%] Completed 'hpp_headers' > gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > [100%] Built target hpp_headers > gmake[2]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > -- Selected OpenCL includes from /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/include;/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include > -- Selected OpenCL lib /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so > -- Configuring done > -- Generating done > CMake Warning: > Manually-specified variables were not used by the project: > > BUILD_DOC > BUILD_DOCS > BUILD_EXAMPLE > BUILD_EXAMPLES > BUILD_TEST > BUILD_TESTING > BUILD_TESTS > > > -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5 > > Also, while note related to clpeak, I did try to build this > configuration (which uses the NXP OpenCL provider): > > BR2_aarch64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_CLPEAK=y > BR2_PACKAGE_FREESCALE_IMX=y > BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y > BR2_PACKAGE_IMX_GPU_VIV=y > # BR2_TARGET_ROOTFS_TAR is not set > > and it fails with: > > /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/9.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib64/libGAL.so: undefined reference to `stat at GLIBC_2.33' > > And indeed the C library in this toolchain is glibc 2.31. So this means > that the libGAL library shipped by NXP in imx-gpu-viv will only work > with glibc >= 2.33. Good catch again. This is quite a bummer. I will look into that when time allows. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com thanks Gilles. From ps.report at gmx.net Sun Jan 16 09:19:01 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sun, 16 Jan 2022 10:19:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> Message-ID: <20220116101901.23db5faa@gmx.net> Hello James, On Sat, 15 Jan 2022 22:08:57 -0700, James Hilliard wrote: > On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > > > Hello James, *, > > > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > > > Currently the qmake gcc sysrootify path logic causes issues with > > > per-package directories, disable automatic gcc sysroot for qt5base > > > install and override all qt.conf paths manually to point to their > > > correct locations. > > > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > > instead of the HOST_DIR for cross compilation to work. > > > > > > Signed-off-by: James Hilliard > > > --- > > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > > package/qt5/qt5base/qt5base.mk | 2 ++ > > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > > index 2215cbd4e1..db9ab0c364 100644 > > > --- a/package/qt5/qt5base/qt.conf.in > > > +++ b/package/qt5/qt5base/qt.conf.in > > > @@ -2,6 +2,18 @@ > > > Prefix=/usr > > > HostPrefix=@@HOST_DIR@@ > > > Sysroot=@@STAGING_DIR@@ > > > -Headers=/usr/include/qt5 > > > -Plugins=/usr/lib/qt/plugins > > > -Examples=/usr/lib/qt/examples > > > +SysrootifyPrefix=false > > > +Binaries=@@STAGING_DIR@@/usr/bin > > > +Libraries=@@STAGING_DIR@@/usr/lib > > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > > +Data=@@STAGING_DIR@@ > > > +Translations=@@STAGING_DIR@@/translations > > > +ArchData=@@STAGING_DIR@@/usr > > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > > +Imports=@@STAGING_DIR@@/usr/imports > > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > > +HostBinaries=@@HOST_DIR@@/bin > > > +HostLibraries=@@HOST_DIR@@/lib > > > +HostData=@@STAGING_DIR@@ > > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > > index bcdf036f00..6c05e710d8 100644 > > > --- a/package/qt5/qt5base/qt5base.mk > > > +++ b/package/qt5/qt5base/qt5base.mk > > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > > -v \ > > > -prefix /usr \ > > > -hostprefix $(HOST_DIR) \ > > > + -hostdatadir $(STAGING_DIR) \ > > > -headerdir /usr/include/qt5 \ > > > -sysroot $(STAGING_DIR) \ > > > + -no-gcc-sysroot \ > > > -plugindir /usr/lib/qt/plugins \ > > > -examplesdir /usr/lib/qt/examples \ > > > -no-rpath \ > > > > This one leads to the following compile failure for qt5webengine-5.15.2: > > > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > > collect2: error: ld returned 1 exit status > > So I was able to reproduce this error, however best I can tell it's > probably not a regression This is a known failure, see the patches adding host-freetype/host-libjepeg/host-harfbuzz ([1]) or your own qt5webengine bump adding host-freetype dependency ([2])... Additional the SIGSTKSZ fix is needed... Regards, Peter [1] http://lists.busybox.net/pipermail/buildroot/2022-January/634005.html [2] http://lists.busybox.net/pipermail/buildroot/2022-January/633439.html > as the compilation still fails due to a different error without this patch: > > ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned > non-zero exit code. > pkgresult = exec_script(pkg_config_script, args, "value") > ^---------- > Current dir: /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/core/release/ > Command: /home/buildroot/buildroot/output/host/bin/python2 > /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py > -p /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config > libjpeg > Returned 1. > stderr: > > Package libjpeg was not found in the pkg-config search path. > Perhaps you should add the directory containing `libjpeg.pc' > to the PKG_CONFIG_PATH environment variable > Package 'libjpeg', required by 'virtual:world', not found > Could not run pkg-config. > > See //third_party/BUILD.gn:17:3: whence it was called. > pkg_config("system_libjpeg") { > ^----------------------------- > See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused > the file to be included. > "//third_party:jpeg", > ^------------------- > Project ERROR: GN run error! > > > > > > > But the file crti.o exists: > > > > $ find . -name crti.o > > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > > > > Did not (yet) test with your latest (v2) patch iteration... > > > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > > Thomas)... > > > > Regards, > > Peter > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sun Jan 16 09:43:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 10:43:45 +0100 Subject: [Buildroot] [PATCH v2, 1/2] Revert "package/log4cxx: select boost chrono and date-time with gcc < 7" In-Reply-To: <20220113231438.5aa8742e@windsurf> References: <20211119175553.2413433-1-fontaine.fabrice@gmail.com> <20211121145741.1fa4dffb@windsurf> <20220113231438.5aa8742e@windsurf> Message-ID: Hello Thomas, Le jeu. 13 janv. 2022 ? 23:14, Thomas Petazzoni a ?crit : > > Hello Fabrice, > > On Sun, 21 Nov 2021 14:57:41 +0100 > Thomas Petazzoni wrote: > > > On Fri, 19 Nov 2021 18:55:52 +0100 > > Fabrice Fontaine wrote: > > > > > This reverts commit 3c2245cb65741c965f4bb87d35ac3c64f250a1ae to move > > > these selects on boost side as the build failure was raised with gcc >= > > > 7 (making this commit a "no-op"). Indeed, the build failure is raised > > > with cmake < 3.21.3, because cmake assumed that boost thread depends on > > > date-time until > > > https://github.com/Kitware/CMake/commit/1ad0c5ae53fc0c4f774166337f0e9c93c578cf9b. > > > > I don't understand why you say this commit is a no-op. It clearly > > isn't. In gcc < 7.x configurations, this commit ensures that boost > > chrono and boost date-time are selected. > > > > The fact that you realize later that the build failure occurred with > > gcc >= 7.x, meaning this commit does not help fixing the issue does not > > make this commit a no-op. > > Do you have some feedback/comment on the above questions? Indeed, this is not a no-op so I suggest to only apply the second patch of the serie. > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From james.hilliard1 at gmail.com Sun Jan 16 10:17:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:17:39 -0700 Subject: [Buildroot] [PATCH v3 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220116101739.2623120-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. Also set qmake target pkg-config path for qt5webengine. This fixes some build errors with per-package directories such as: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 Signed-off-by: James Hilliard --- Changes v2 -> v3: - set target pkg-config path Changes v1 -> v2: - add some missing overrides to qt.conf.in --- package/qt5/qt5base/qmake.conf.in | 4 ++++ package/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 2 ++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index 024c074928..d12f884a55 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -8,6 +8,10 @@ include(../common/linux_device_pre.conf) +# set up pkg-config +QMAKE_PKG_CONFIG = $$[QT_HOST_PREFIX]/bin/pkg-config +QMAKE_PKGCONFIG_PREFIX = /usr + # modifications to g++-unix.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..c92f52ced0 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,21 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Tests=@@STAGING_DIR@@/usr/lib/qt/tests +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +Documentation=@@STAGING_DIR@@/doc +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +Settings=@@STAGING_DIR@@/etc +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..6c05e710d8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ -- 2.25.1 From voltagex at voltagex.org Sun Jan 16 10:28:41 2022 From: voltagex at voltagex.org (Adam Baxter) Date: Sun, 16 Jan 2022 21:28:41 +1100 Subject: [Buildroot] nvidia driver fails to build: compiler version check failed Message-ID: Hi all Using buildroot master 6e4791b751c0f8e0ba218da2c22e71d3e1436b5d Config is hopefully attached. Also, the below driver version was released by Nvidia on 2019.11.8 - perhaps it should be updated or removed? make[1]: Entering directory '/home/voltagex/src/buildroot/output/build/linux-5.15.13' Compiler version check failed: The major and minor number of the compiler used to compile the kernel: x86_64-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-1172-g6e4791b751) 11.2.0, GNU ld (GNU Binutils) 2.37 does not match the compiler used here: x86_64-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-1172-g6e4791b751) 11.2.0 Copyright (C) 2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. It is recommended to set the CC environment variable to the compiler that was used to compile the kernel. The compiler version check can be disabled by setting the IGNORE_CC_MISMATCH environment variable to "1". However, mixing compiler versions between the kernel and kernel modules can result in subtle bugs that are difficult to diagnose. *** Failed CC version check. Bailing out! *** make[2]: *** [/home/voltagex/src/buildroot/output/build/nvidia-driver-390.132/kernel/Kbuild:189: cc_version_check] Error 1 (after looking at this I realised I'd probably have more luck with nouveau, anyway) Thanks, Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: .config Type: application/xml Size: 117285 bytes Desc: not available URL: From james.hilliard1 at gmail.com Sun Jan 16 10:28:54 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:28:54 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220116101901.23db5faa@gmx.net> References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> <20220116101901.23db5faa@gmx.net> Message-ID: On Sun, Jan 16, 2022 at 2:19 AM Peter Seiderer wrote: > > Hello James, > > On Sat, 15 Jan 2022 22:08:57 -0700, James Hilliard wrote: > > > On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > > > > > Hello James, *, > > > > > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > > > > > Currently the qmake gcc sysrootify path logic causes issues with > > > > per-package directories, disable automatic gcc sysroot for qt5base > > > > install and override all qt.conf paths manually to point to their > > > > correct locations. > > > > > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > > > instead of the HOST_DIR for cross compilation to work. > > > > > > > > Signed-off-by: James Hilliard > > > > --- > > > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > > > package/qt5/qt5base/qt5base.mk | 2 ++ > > > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > > > index 2215cbd4e1..db9ab0c364 100644 > > > > --- a/package/qt5/qt5base/qt.conf.in > > > > +++ b/package/qt5/qt5base/qt.conf.in > > > > @@ -2,6 +2,18 @@ > > > > Prefix=/usr > > > > HostPrefix=@@HOST_DIR@@ > > > > Sysroot=@@STAGING_DIR@@ > > > > -Headers=/usr/include/qt5 > > > > -Plugins=/usr/lib/qt/plugins > > > > -Examples=/usr/lib/qt/examples > > > > +SysrootifyPrefix=false > > > > +Binaries=@@STAGING_DIR@@/usr/bin > > > > +Libraries=@@STAGING_DIR@@/usr/lib > > > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > > > +Data=@@STAGING_DIR@@ > > > > +Translations=@@STAGING_DIR@@/translations > > > > +ArchData=@@STAGING_DIR@@/usr > > > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > > > +Imports=@@STAGING_DIR@@/usr/imports > > > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > > > +HostBinaries=@@HOST_DIR@@/bin > > > > +HostLibraries=@@HOST_DIR@@/lib > > > > +HostData=@@STAGING_DIR@@ > > > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > > > index bcdf036f00..6c05e710d8 100644 > > > > --- a/package/qt5/qt5base/qt5base.mk > > > > +++ b/package/qt5/qt5base/qt5base.mk > > > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > > > -v \ > > > > -prefix /usr \ > > > > -hostprefix $(HOST_DIR) \ > > > > + -hostdatadir $(STAGING_DIR) \ > > > > -headerdir /usr/include/qt5 \ > > > > -sysroot $(STAGING_DIR) \ > > > > + -no-gcc-sysroot \ > > > > -plugindir /usr/lib/qt/plugins \ > > > > -examplesdir /usr/lib/qt/examples \ > > > > -no-rpath \ > > > > > > This one leads to the following compile failure for qt5webengine-5.15.2: > > > > > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > > > collect2: error: ld returned 1 exit status > > > > So I was able to reproduce this error, however best I can tell it's > > probably not a regression > > This is a known failure, see the patches adding host-freetype/host-libjepeg/host-harfbuzz ([1]) > or your own qt5webengine bump adding host-freetype dependency ([2])... So there's a major pkg-config bug here, I partially fixed it here but it seems gn is mangling some of the paths after getting them from pkg-config: https://patchwork.ozlabs.org/project/buildroot/patch/20220116101739.2623120-1-james.hilliard1 at gmail.com/ This gets the target pkg-config paths set up right at least output/build/qt5webengine-5.15.2/src/core/release/args.gn: pkg_config = "/home/buildroot/buildroot/output/host/bin/pkg-config" host_pkg_config = "/home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config" However gn I think is prepending the target_sysroot to the include paths or something: target_sysroot = "/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot" which causes this error: /home/buildroot/buildroot/output/host/bin/aarch64-linux-g++ -MMD -MF obj/crypto/crypto/nss_util.o.d -DCRYPTO_IMPLEMENTATION -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DCR_SYSROOT_HASH=2cade9ee1ca9186b28ac768c19e1ab7c45ee0600 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen -I../../3rdparty/chromium -I../../3rdparty/chromium/third_party/boringssl/src/include -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -I/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nss -I/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nspr -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti --sysroot=../../../../../host/aarch64-buildroot-linux-gnu/sysroot -fvisibility-inlines-hidden -c ../../3rdparty/chromium/crypto/nss_util.cc -o obj/crypto/crypto/nss_util.o ../../3rdparty/chromium/crypto/nss_util.cc:8:10: fatal error: pk11pub.h: No such file or directory 8 | #include | ^~~~~~~~~~~ The include path being set by gn doesn't exist, although it's at least trying to use the target variant now: /home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nss > > Additional the SIGSTKSZ fix is needed... Yeah, on newer glibc's it's needed. > > Regards, > Peter > > [1] http://lists.busybox.net/pipermail/buildroot/2022-January/634005.html > [2] http://lists.busybox.net/pipermail/buildroot/2022-January/633439.html > > > > as the compilation still fails due to a different error without this patch: > > > > ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned > > non-zero exit code. > > pkgresult = exec_script(pkg_config_script, args, "value") > > ^---------- > > Current dir: /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/core/release/ > > Command: /home/buildroot/buildroot/output/host/bin/python2 > > /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py > > -p /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config > > libjpeg > > Returned 1. > > stderr: > > > > Package libjpeg was not found in the pkg-config search path. > > Perhaps you should add the directory containing `libjpeg.pc' > > to the PKG_CONFIG_PATH environment variable > > Package 'libjpeg', required by 'virtual:world', not found > > Could not run pkg-config. > > > > See //third_party/BUILD.gn:17:3: whence it was called. > > pkg_config("system_libjpeg") { > > ^----------------------------- > > See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused > > the file to be included. > > "//third_party:jpeg", > > ^------------------- > > Project ERROR: GN run error! > > > > > > > > > > > But the file crti.o exists: > > > > > > $ find . -name crti.o > > > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > > > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > > > > > > > Did not (yet) test with your latest (v2) patch iteration... > > > > > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > > > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > > > Thomas)... > > > > > > Regards, > > > Peter > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From james.hilliard1 at gmail.com Sun Jan 16 10:38:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:38:17 -0700 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20201221203952.22168-3-ps.report@gmx.net> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> Message-ID: On Mon, Dec 21, 2020 at 1:40 PM Peter Seiderer wrote: > > - add optional host-freetype dependency > > Fixes: > > Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 > Returned 1. > stderr: > > Package freetype2 was not found in the pkg-config search path. > Perhaps you should add the directory containing `freetype2.pc' > to the PKG_CONFIG_PATH environment variable > Package 'freetype2', required by 'virtual:world', not found > Could not run pkg-config. > > See //build/linux/BUILD.gn:24:3: whence it was called. > pkg_config("freetype_from_pkgconfig") { > ^-------------------------------------- > See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included. > public_configs = [ "//build/linux:freetype_from_pkgconfig" ] > ^-------------------------------------- > Project ERROR: GN run error! > make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 > > - add optiobal hist-libjpeg dependency > > Fixes: > > https://gitlab.com/buildroot.org/buildroot/-/jobs/917539230 > > Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config libjpeg > Returned 1. > stderr: > Package libjpeg was not found in the pkg-config search path. > Perhaps you should add the directory containing `libjpeg.pc' > to the PKG_CONFIG_PATH environment variable > Package 'libjpeg', required by 'virtual:world', not found > Could not run pkg-config. > See //third_party/BUILD.gn:17:3: whence it was called. > pkg_config("system_libjpeg") { > ^----------------------------- > See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused the file to be included. > "//third_party:jpeg", > ^------------------- > Project ERROR: GN run error! > > Signed-off-by: Peter Seiderer Tested-by: James Hilliard > --- > package/qt5/qt5webengine/qt5webengine.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk > index 64c9c96cc2..8ab50a0fbf 100644 > --- a/package/qt5/qt5webengine/qt5webengine.mk > +++ b/package/qt5/qt5webengine/qt5webengine.mk > @@ -29,6 +29,14 @@ endif > > QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss > > +ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y) > +QT5WEBENGINE_DEPENDENCIES += host-freetype > +endif > + > +ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y) > +QT5WEBENGINE_DEPENDENCIES += host-libjpeg > +endif > + > QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg > > ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) > -- > 2.29.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From ju.o at free.fr Sun Jan 16 10:41:14 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 16 Jan 2022 11:41:14 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add test for python-gnupg Message-ID: <20220116104114.103601-1-ju.o@free.fr> This commit add a simple test doing symmetric encryption/decryption to check this python interface with the gpg binary is working fine. Signed-off-by: Julien Olivain --- DEVELOPERS | 2 ++ .../tests/package/sample_python_gnupg.py | 24 +++++++++++++++++++ .../tests/package/test_python_gnupg.py | 21 ++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 support/testing/tests/package/sample_python_gnupg.py create mode 100644 support/testing/tests/package/test_python_gnupg.py diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..e038941b3b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,8 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ +F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/test_python_gnupg.py N: Julien Viard de Galbert F: package/dieharder/ diff --git a/support/testing/tests/package/sample_python_gnupg.py b/support/testing/tests/package/sample_python_gnupg.py new file mode 100644 index 0000000000..b5b718a8cb --- /dev/null +++ b/support/testing/tests/package/sample_python_gnupg.py @@ -0,0 +1,24 @@ +import gnupg + +gpg = gnupg.GPG(verbose=True) + +plain_data = "Some plain text data" +good_passphrase = "Good Passphrase" + +# Test Encrypt +result = gpg.encrypt(plain_data, None, passphrase=good_passphrase, symmetric=True) +assert(result.returncode == 0) +enc_data = str(result) +assert(enc_data != plain_data) + +# Test Good Decrypt +result = gpg.decrypt(enc_data, passphrase=good_passphrase) +assert(result.returncode == 0) +dec_data = str(result) +assert(dec_data == plain_data) + +# Test Bad Decrypt +result = gpg.decrypt(enc_data, passphrase='A Wrong Passphrase') +assert(result.returncode != 0) +dec_data = str(result) +assert(dec_data != plain_data) diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py new file mode 100644 index 0000000000..0c71f6b6d0 --- /dev/null +++ b/support/testing/tests/package/test_python_gnupg.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2GnuPG(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_GNUPG=y + """ + sample_scripts = ["tests/package/sample_python_gnupg.py"] + + +class TestPythonPy3GnuPG(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_GNUPG=y + """ + sample_scripts = ["tests/package/sample_python_gnupg.py"] -- 2.34.1 From james.hilliard1 at gmail.com Sun Jan 16 10:43:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:43:21 -0700 Subject: [Buildroot] [PATCH v4 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220116104321.2696659-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. Also set qmake target pkg-config path for qt5webengine. Set PKG_CONFIG_SYSROOT_DIR="/" in qt5webengine to prevent target pkg-config path mangling. This fixes some build errors with per-package directories such as: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 Signed-off-by: James Hilliard --- Changes v3 -> v4: - fix target pkg-config path mangling Changes v2 -> v3: - set target pkg-config path Changes v1 -> v2: - add some missing overrides to qt.conf.in --- package/qt5/qt5base/qmake.conf.in | 4 ++++ package/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 2 ++ package/qt5/qt5webengine/qt5webengine.mk | 4 +++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index 024c074928..d12f884a55 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -8,6 +8,10 @@ include(../common/linux_device_pre.conf) +# set up pkg-config +QMAKE_PKG_CONFIG = $$[QT_HOST_PREFIX]/bin/pkg-config +QMAKE_PKGCONFIG_PREFIX = /usr + # modifications to g++-unix.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..c92f52ced0 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,21 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Tests=@@STAGING_DIR@@/usr/lib/qt/tests +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +Documentation=@@STAGING_DIR@@/doc +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +Settings=@@STAGING_DIR@@/etc +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..6c05e710d8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..06922e4eec 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -44,7 +44,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_SYSROOT_DIR="/" define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 16 10:45:45 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:45:45 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> <20220116101901.23db5faa@gmx.net> Message-ID: On Sun, Jan 16, 2022 at 3:28 AM James Hilliard wrote: > > On Sun, Jan 16, 2022 at 2:19 AM Peter Seiderer wrote: > > > > Hello James, > > > > On Sat, 15 Jan 2022 22:08:57 -0700, James Hilliard wrote: > > > > > On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > > > > > > > Hello James, *, > > > > > > > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > > > > > > > Currently the qmake gcc sysrootify path logic causes issues with > > > > > per-package directories, disable automatic gcc sysroot for qt5base > > > > > install and override all qt.conf paths manually to point to their > > > > > correct locations. > > > > > > > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > > > > instead of the HOST_DIR for cross compilation to work. > > > > > > > > > > Signed-off-by: James Hilliard > > > > > --- > > > > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > > > > package/qt5/qt5base/qt5base.mk | 2 ++ > > > > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > > > > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > > > > index 2215cbd4e1..db9ab0c364 100644 > > > > > --- a/package/qt5/qt5base/qt.conf.in > > > > > +++ b/package/qt5/qt5base/qt.conf.in > > > > > @@ -2,6 +2,18 @@ > > > > > Prefix=/usr > > > > > HostPrefix=@@HOST_DIR@@ > > > > > Sysroot=@@STAGING_DIR@@ > > > > > -Headers=/usr/include/qt5 > > > > > -Plugins=/usr/lib/qt/plugins > > > > > -Examples=/usr/lib/qt/examples > > > > > +SysrootifyPrefix=false > > > > > +Binaries=@@STAGING_DIR@@/usr/bin > > > > > +Libraries=@@STAGING_DIR@@/usr/lib > > > > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > > > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > > > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > > > > +Data=@@STAGING_DIR@@ > > > > > +Translations=@@STAGING_DIR@@/translations > > > > > +ArchData=@@STAGING_DIR@@/usr > > > > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > > > > +Imports=@@STAGING_DIR@@/usr/imports > > > > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > > > > +HostBinaries=@@HOST_DIR@@/bin > > > > > +HostLibraries=@@HOST_DIR@@/lib > > > > > +HostData=@@STAGING_DIR@@ > > > > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > > > > index bcdf036f00..6c05e710d8 100644 > > > > > --- a/package/qt5/qt5base/qt5base.mk > > > > > +++ b/package/qt5/qt5base/qt5base.mk > > > > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > > > > -v \ > > > > > -prefix /usr \ > > > > > -hostprefix $(HOST_DIR) \ > > > > > + -hostdatadir $(STAGING_DIR) \ > > > > > -headerdir /usr/include/qt5 \ > > > > > -sysroot $(STAGING_DIR) \ > > > > > + -no-gcc-sysroot \ > > > > > -plugindir /usr/lib/qt/plugins \ > > > > > -examplesdir /usr/lib/qt/examples \ > > > > > -no-rpath \ > > > > > > > > This one leads to the following compile failure for qt5webengine-5.15.2: > > > > > > > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > > > > collect2: error: ld returned 1 exit status > > > > > > So I was able to reproduce this error, however best I can tell it's > > > probably not a regression > > > > This is a known failure, see the patches adding host-freetype/host-libjepeg/host-harfbuzz ([1]) > > or your own qt5webengine bump adding host-freetype dependency ([2])... > > So there's a major pkg-config bug here, I partially fixed it here but > it seems gn > is mangling some of the paths after getting them from pkg-config: > https://patchwork.ozlabs.org/project/buildroot/patch/20220116101739.2623120-1-james.hilliard1 at gmail.com/ > > This gets the target pkg-config paths set up right at least > output/build/qt5webengine-5.15.2/src/core/release/args.gn: > pkg_config = "/home/buildroot/buildroot/output/host/bin/pkg-config" > host_pkg_config = > "/home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config" > > However gn I think is prepending the target_sysroot to the include > paths or something: > target_sysroot = > "/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot" > > which causes this error: > /home/buildroot/buildroot/output/host/bin/aarch64-linux-g++ -MMD -MF > obj/crypto/crypto/nss_util.o.d -DCRYPTO_IMPLEMENTATION -DUSE_UDEV > -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD > -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS > -D__STDC_FORMAT_MACROS > -DCR_SYSROOT_HASH=2cade9ee1ca9186b28ac768c19e1ab7c45ee0600 -DNDEBUG > -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen > -I../../3rdparty/chromium > -I../../3rdparty/chromium/third_party/boringssl/src/include > -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector > -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe > -pthread -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 > -Wno-unused-local-typedefs -Wno-maybe-uninitialized > -Wno-deprecated-declarations -fno-delete-null-pointer-checks > -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else > -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident > -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 > -fvisibility=hidden > -I/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nss > -I/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nspr > -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes > -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof > -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti > --sysroot=../../../../../host/aarch64-buildroot-linux-gnu/sysroot > -fvisibility-inlines-hidden -c > ../../3rdparty/chromium/crypto/nss_util.cc -o > obj/crypto/crypto/nss_util.o > ../../3rdparty/chromium/crypto/nss_util.cc:8:10: fatal error: > pk11pub.h: No such file or directory > 8 | #include > | ^~~~~~~~~~~ > > The include path being set by gn doesn't exist, although it's at least > trying to use the > target variant now: > /home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nss Hmm, so I think I found a way to get that to not happen by setting PKG_CONFIG_SYSROOT_DIR="/": https://patchwork.ozlabs.org/project/buildroot/patch/20220116104321.2696659-1-james.hilliard1 at gmail.com/ > > > > > Additional the SIGSTKSZ fix is needed... > > Yeah, on newer glibc's it's needed. > > > > > Regards, > > Peter > > > > [1] http://lists.busybox.net/pipermail/buildroot/2022-January/634005.html > > [2] http://lists.busybox.net/pipermail/buildroot/2022-January/633439.html > > > > > > > as the compilation still fails due to a different error without this patch: > > > > > > ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned > > > non-zero exit code. > > > pkgresult = exec_script(pkg_config_script, args, "value") > > > ^---------- > > > Current dir: /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/core/release/ > > > Command: /home/buildroot/buildroot/output/host/bin/python2 > > > /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py > > > -p /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config > > > libjpeg > > > Returned 1. > > > stderr: > > > > > > Package libjpeg was not found in the pkg-config search path. > > > Perhaps you should add the directory containing `libjpeg.pc' > > > to the PKG_CONFIG_PATH environment variable > > > Package 'libjpeg', required by 'virtual:world', not found > > > Could not run pkg-config. > > > > > > See //third_party/BUILD.gn:17:3: whence it was called. > > > pkg_config("system_libjpeg") { > > > ^----------------------------- > > > See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused > > > the file to be included. > > > "//third_party:jpeg", > > > ^------------------- > > > Project ERROR: GN run error! > > > > > > > > > > > > > > > But the file crti.o exists: > > > > > > > > $ find . -name crti.o > > > > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > > > > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > > > > > > > > > > Did not (yet) test with your latest (v2) patch iteration... > > > > > > > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > > > > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > > > > Thomas)... > > > > > > > > Regards, > > > > Peter > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From ju.o at free.fr Sun Jan 16 10:55:41 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 16 Jan 2022 11:55:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package In-Reply-To: <20220113215104.02a734a1@windsurf> References: <20220110200151.830192-1-ju.o@free.fr> <20220113215104.02a734a1@windsurf> Message-ID: <77b72a63fdde563f496649641a0efab1@free.fr> Hi Thomas, On 13/01/2022 21:51, Thomas Petazzoni wrote: > Hello Julien, > > On Mon, 10 Jan 2022 21:01:51 +0100 > Julien Olivain wrote: > >> [...] >> +config BR2_PACKAGE_PYTHON_GNUPG >> + bool "python-gnupg" >> + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime > > This generates a circular dependency reported by kconfig, because > another package does exactly the opposite. So I have inverted the logic > here: > > select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime What do you think about reversing the logic of all Buildroot packages selecting gnupg so they default to gnupg2? Quoting: https://gnupg.org/download/index.html """ GnuPG 1.4 is the old, single binary version which still support the unsafe PGP-2 keys. This branch has no dependencies on the above listed libraries or the Pinentry. However, it lacks many modern features and will receive only important updates. """ There is currently only two packages selecting gnupg: gpgme and python-gnupg Most Linux distributions are now shipping gnupg2 by default. gnupg v1 is now more for legacy/compatibility cases. If you agree, I can send a patch for this. Best regards, Julien. From kuzminov.sergey81 at gmail.com Sun Jan 16 11:26:00 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 16 Jan 2022 14:26:00 +0300 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring Message-ID: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> Changes: - common scenarios for multiple boards to create the SD image: board/orangepi/common; - extlinux.conf instead of boot.scr; - exclude FAT partition; - defconfig refactoring; - kernel: bump to version 5.12.19, if newer then BR2_PACKAGE_XR819_XRADIO will not compile; - u-boot: bump to version 2022.01 Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 5 ++ board/orangepi/common/genimage.cfg | 19 +++++++ board/orangepi/common/post-build.sh | 34 ++++++++++++ board/orangepi/common/uboot-extras.config | 3 + board/orangepi/orangepi-zero/boot.cmd | 9 --- board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ configs/orangepi_zero_defconfig | 67 ++++++++++++++--------- 7 files changed, 102 insertions(+), 71 deletions(-) create mode 100644 board/orangepi/common/extlinux.conf create mode 100644 board/orangepi/common/genimage.cfg create mode 100755 board/orangepi/common/post-build.sh create mode 100644 board/orangepi/common/uboot-extras.config delete mode 100644 board/orangepi/orangepi-zero/boot.cmd delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..015f29270e --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,5 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait console=${console} +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg new file mode 100644 index 0000000000..fd250ef05d --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,19 @@ +image sdcard.img { + hdimage { + partition-table-type = gpt + gpt-no-backup = true + gpt-location = 1008K # 1MB - 16KB + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB - 16KB + } + + partition rootfs { + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh new file mode 100755 index 0000000000..296f94b174 --- /dev/null +++ b/board/orangepi/common/post-build.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "uImage" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + echo "Image" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + echo "Image.gz" + else + echo "zImage" + fi +} + +generic_getty() +{ + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then + echo "" + else + echo "s/\s*console=\S*//" + fi +} + +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" + +sed -e "$(generic_getty)" \ + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ + -e "s/%PARTUUID%/$PARTUUID/g" \ + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" + +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config new file mode 100644 index 0000000000..5aa97523d9 --- /dev/null +++ b/board/orangepi/common/uboot-extras.config @@ -0,0 +1,3 @@ +CONFIG_BOOTDELAY=0 +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv preboot;" diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd deleted file mode 100644 index d094a64fe5..0000000000 --- a/board/orangepi/orangepi-zero/boot.cmd +++ /dev/null @@ -1,9 +0,0 @@ -setenv fdt_high ffffffff - -part uuid mmc 0:2 uuid -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg deleted file mode 100644 index 32f5454ae6..0000000000 --- a/board/orangepi/orangepi-zero/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Zero -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h2-plus-orangepi-zero.dtb", - "boot.scr" - } - } - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..908bcea893 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,49 +1,64 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set +BR2_GCC_ENABLE_LTO=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.19" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y +BR2_TARGET_ROOTFS_TAR=n + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_GENIMAGE=y -# wireless driver and firmware +# Wireless driver and firmware +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x BR2_PACKAGE_XR819_XRADIO=y BR2_PACKAGE_ARMBIAN_FIRMWARE=y BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -# wireless support +# Wireless support BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -# spi flash support +# Spi flash support BR2_PACKAGE_MTD=y -- 2.34.1 From arnout at mind.be Sun Jan 16 12:01:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:01:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package In-Reply-To: <77b72a63fdde563f496649641a0efab1@free.fr> References: <20220110200151.830192-1-ju.o@free.fr> <20220113215104.02a734a1@windsurf> <77b72a63fdde563f496649641a0efab1@free.fr> Message-ID: <6ece845a-20a1-4d79-c544-21e0f1f2fc6f@mind.be> On 16/01/2022 11:55, Julien Olivain wrote: > Hi Thomas, > > On 13/01/2022 21:51, Thomas Petazzoni wrote: >> Hello Julien, >> >> On Mon, 10 Jan 2022 21:01:51 +0100 >> Julien Olivain wrote: >> >>> ?[...] >>> +config BR2_PACKAGE_PYTHON_GNUPG >>> +??? bool "python-gnupg" >>> +??? select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime >> >> This generates a circular dependency reported by kconfig, because >> another package does exactly the opposite. So I have inverted the logic >> here: >> >> select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime > > What do you think about reversing the logic of all Buildroot packages > selecting gnupg so they default to gnupg2? > > Quoting: https://gnupg.org/download/index.html > """ > GnuPG 1.4 is the old, single binary version which still support the > unsafe PGP-2 keys. This branch has no dependencies on the above listed > libraries or the Pinentry. However, it lacks many modern features and > will receive only important updates. > """ > > There is currently only two packages selecting gnupg: > gpgme and python-gnupg > > Most Linux distributions are now shipping gnupg2 by default.? gnupg v1 > is now more for legacy/compatibility cases. Perhaps we should simply remove gnupg instead. We've had gnupg2 for 7.5 years now, that should be enough to migrate. Regards, Arnout > > If you agree, I can send a patch for this. > > Best regards, > > Julien. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Sun Jan 16 12:05:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:05:35 +0100 Subject: [Buildroot] nvidia driver fails to build: compiler version check failed In-Reply-To: References: Message-ID: <35bc0513-f94a-7dc1-e583-7c1a425d78ae@mind.be> On 16/01/2022 11:28, Adam Baxter wrote: > Hi all > > Using buildroot master 6e4791b751c0f8e0ba218da2c22e71d3e1436b5d > > Config is hopefully attached. > > Also, the below driver version was released by Nvidia on 2019.11.8 - perhaps it should be updated or removed? > > make[1]: Entering directory '/home/voltagex/src/buildroot/output/build/linux-5.15.13' > > Compiler version check failed: > > The major and minor number of the compiler used to > compile the kernel: > > x86_64-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-1172-g6e4791b751) 11.2.0, GNU ld (GNU Binutils) 2.37 > > does not match the compiler used here: > > x86_64-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-1172-g6e4791b751) 11.2.0 Clearly these two are the same, so that sounds like a bug in nvidia's compiler check. > Copyright (C) 2021 Free Software Foundation, Inc. > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > > > It is recommended to set the CC environment variable > to the compiler that was used to compile the kernel. > > The compiler version check can be disabled by setting > the IGNORE_CC_MISMATCH environment variable to "1". Sounds like the best option is to set this environment variable in nvidia-driver.mk then. We already make sure that the module is built with the same toolchain as the kernel. Regards, Arnout > However, mixing compiler versions between the kernel > and kernel modules can result in subtle bugs that are > difficult to diagnose. > > *** Failed CC version check. Bailing out! *** > > make[2]: *** [/home/voltagex/src/buildroot/output/build/nvidia-driver-390.132/kernel/Kbuild:189: cc_version_check] Error 1 > > > (after looking at this I realised I'd probably have more luck with nouveau, anyway) > > Thanks, > Adam > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sun Jan 16 12:10:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:10:17 +0100 Subject: [Buildroot] [PATCH] package/clpeak: new package In-Reply-To: References: <20211024113654.88720-1-gilles.talis@gmail.com> <20211230180010.04c873f9@windsurf> Message-ID: <53f0b52a-0bf2-fbd3-a79f-ef3d607bb95a@mind.be> On 16/01/2022 09:50, Gilles Talis wrote: > Hi Thomas, > > thanks for the review. Somehow, I missed this email and just stumbled > across it now. > > Le jeu. 30 d?c. 2021 ? 18:00, Thomas Petazzoni > a ?crit : >> >> Hello Gilles, >> >> On Sun, 24 Oct 2021 13:36:54 +0200 >> Gilles Talis wrote: >> >>> clpeak is a tool that profiles OpenCL devices to find >>> their peak capacities >>> >>> Signed-off-by: Gilles Talis >>> --- >>> DEVELOPERS | 1 + >>> package/Config.in | 1 + >>> package/clpeak/Config.in | 14 ++++++++++++++ >>> package/clpeak/clpeak.hash | 3 +++ >>> package/clpeak/clpeak.mk | 13 +++++++++++++ >>> 5 files changed, 32 insertions(+) >>> create mode 100644 package/clpeak/Config.in >>> create mode 100644 package/clpeak/clpeak.hash >>> create mode 100644 package/clpeak/clpeak.mk >> >> Thanks for this package submission! Unfortunately, I'm afraid there is >> an issue: it downloads stuff during the configure step. See below: > Good catch! It seems like clpeak has a hidden dependency that I missed. > Whilst I am here, one question: how do we deal with packages that have > git submodules dependencies? Is it OK to let the download process > download these dependencies? Even if the dependencies are available > buildroot packages? We prefer to unbundle dependencies (i.e., use the buildroot package rather than the submodule) if that is possible. However, some projects make that really hard (like chromium...) so it's not a strict requirement, more a best effort thing. Regards, Arnout > >> >>>>> clpeak 0777205be1d5681d5a76d46ec94588544e8462a5 Configuring >> ... >> -- The C compiler identification is GNU 9.3.0 >> -- The CXX compiler identification is GNU 9.3.0 >> -- Detecting C compiler ABI info >> -- Detecting C compiler ABI info - done >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped >> -- Detecting C compile features >> -- Detecting C compile features - done >> -- Detecting CXX compiler ABI info >> -- Detecting CXX compiler ABI info - done >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped >> -- Detecting CXX compile features >> -- Detecting CXX compile features - done >> -- Looking for CL_VERSION_2_2 >> -- Looking for CL_VERSION_2_2 - found >> -- Found OpenCL: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so (found version "2.2") >> CMake Warning (dev) in CMakeLists.txt: >> No project() command is present. The top-level CMakeLists.txt file must >> contain a literal, direct call to the project() command. Add a line of >> code such as >> >> project(ProjectName) >> >> near the top of the file, but after cmake_minimum_required(). >> >> CMake is pretending there is a "project(Project)" command on the first >> line. >> This warning is for project developers. Use -Wno-dev to suppress it. >> >> -- The C compiler identification is GNU 9.3.0 >> -- The CXX compiler identification is GNU 9.3.0 >> -- Detecting C compiler ABI info >> -- Detecting C compiler ABI info - done >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped >> -- Detecting C compile features >> -- Detecting C compile features - done >> -- Detecting CXX compiler ABI info >> -- Detecting CXX compiler ABI info - done >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped >> -- Detecting CXX compile features >> -- Detecting CXX compile features - done >> -- Configuring done >> -- Generating done >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build >> gmake[1]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[2]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> [ 12%] Creating directories for 'hpp_headers' >> [ 25%] Performing download step (git clone) for 'hpp_headers' >> Cloning into 'hpp_headers'... >> remote: Enumerating objects: 558, done. >> remote: Counting objects: 100% (558/558), done. >> remote: Compressing objects: 100% (396/396), done. >> remote: Total 558 (delta 324), reused 355 (delta 155), pack-reused 0 >> Receiving objects: 100% (558/558), 762.72 KiB | 5.45 MiB/s, done. >> Resolving deltas: 100% (324/324), done. >> Already on 'master' >> Your branch is up to date with 'origin/master'. >> Submodule 'external/CMock' (https://github.com/ThrowTheSwitch/CMock) registered for path 'external/CMock' >> Submodule 'external/Unity' (https://github.com/ThrowTheSwitch/Unity) registered for path 'external/Unity' >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock'... >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/Unity'... >> Submodule path 'external/CMock': checked out '7cc41ddfdd07dc5eb8359d278f439f14031d64ad' >> Submodule 'vendor/c_exception' (https://github.com/throwtheswitch/cexception.git) registered for path 'external/CMock/vendor/c_exception' >> Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/unity' >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception'... >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/unity'... >> Submodule path 'external/CMock/vendor/c_exception': checked out 'dce9e8b26f2179439002e02d691429e81a32b6c0' >> Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/c_exception/vendor/unity' >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception/vendor/unity'... >> Submodule path 'external/CMock/vendor/c_exception/vendor/unity': checked out '2c7629a0ae90ffe991b5fd08e4db8672f72ed64c' >> Submodule path 'external/CMock/vendor/unity': checked out '031f3bbe45f8adf504ca3d13e6f093869920b091' >> Submodule path 'external/Unity': checked out '7d2bf62b7e6afaf38153041a9d53c21aeeca9a25' >> [ 37%] Performing update step for 'hpp_headers' >> HEAD is now at 1df82b9 Add param traits for CL_DEVICE_SUPPORTED_REGISTER_ALLOCATIONS_ARM (#165) >> [ 50%] No patch step for 'hpp_headers' >> [ 62%] Performing configure step for 'hpp_headers' >> -- The C compiler identification is GNU 9.3.0 >> -- The CXX compiler identification is GNU 9.3.0 >> -- Detecting C compiler ABI info >> -- Detecting C compiler ABI info - done >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped >> -- Detecting C compile features >> -- Detecting C compile features - done >> -- Detecting CXX compiler ABI info >> -- Detecting CXX compiler ABI info - done >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped >> -- Detecting CXX compile features >> -- Detecting CXX compile features - done >> -- Configuring done >> -- Generating done >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build >> [ 75%] Performing build step for 'hpp_headers' >> gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' >> gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' >> [ 87%] Performing install step for 'hpp_headers' >> gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' >> Install the project... >> -- Install configuration: "Release" >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/cl2.hpp >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/opencl.hpp >> gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' >> [100%] Completed 'hpp_headers' >> gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> [100%] Built target hpp_headers >> gmake[2]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> -- Selected OpenCL includes from /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/include;/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include >> -- Selected OpenCL lib /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so >> -- Configuring done >> -- Generating done >> CMake Warning: >> Manually-specified variables were not used by the project: >> >> BUILD_DOC >> BUILD_DOCS >> BUILD_EXAMPLE >> BUILD_EXAMPLES >> BUILD_TEST >> BUILD_TESTING >> BUILD_TESTS >> >> >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5 >> >> Also, while note related to clpeak, I did try to build this >> configuration (which uses the NXP OpenCL provider): >> >> BR2_aarch64=y >> BR2_TOOLCHAIN_EXTERNAL=y >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y >> BR2_INIT_NONE=y >> BR2_SYSTEM_BIN_SH_NONE=y >> # BR2_PACKAGE_BUSYBOX is not set >> BR2_PACKAGE_CLPEAK=y >> BR2_PACKAGE_FREESCALE_IMX=y >> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y >> BR2_PACKAGE_IMX_GPU_VIV=y >> # BR2_TARGET_ROOTFS_TAR is not set >> >> and it fails with: >> >> /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/9.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib64/libGAL.so: undefined reference to `stat at GLIBC_2.33' >> >> And indeed the C library in this toolchain is glibc 2.31. So this means >> that the libGAL library shipped by NXP in imx-gpu-viv will only work >> with glibc >= 2.33. > Good catch again. This is quite a bummer. I will look into that when > time allows. > >> >> Best regards, >> >> Thomas >> -- >> Thomas Petazzoni, CTO, Bootlin >> Embedded Linux and Kernel engineering >> https://bootlin.com > thanks > Gilles. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sun Jan 16 12:25:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:25:19 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/mkusers: allow option for system uid/gid In-Reply-To: <20220114101247.342256-1-nolange79@gmail.com> References: <20220114101247.342256-1-nolange79@gmail.com> Message-ID: <5273d4d1-8254-e53d-0ce2-9c390fe315ad@mind.be> On 14/01/2022 11:12, Norbert Lange wrote: > Some software decides based on uid/gid whether a user is a > system or normal/human user, with differnt behaviour for those > flavors (example journald [2]). Thank you for the short yet sufficient summary! > > So adding logic to create system-users is necessary, we take > the now common ranges from [1]. > > This extends the mkusers script to allow -2 for uid/gid, > this argument will take an identifier from the system range. > > System/user ranges are added as variables, and the argument > for user/system uid was added as variable aswell. > Thus some magic constants could be removed, some further > occurences of -1 were replaced with equivalent logic. > > [1] - https://systemd.io/UIDS-GIDS/ > [2] - https://www.freedesktop.org/software/systemd/man/journald.conf.html > > Signed-off-by: Norbert Lange You forgot to mention that this is v2. v1 is here [1]. I think the only change is in the commit message. > --- > support/scripts/mkusers | 57 +++++++++++++++++++++++++++++------------ > 1 file changed, 40 insertions(+), 17 deletions(-) > > diff --git a/support/scripts/mkusers b/support/scripts/mkusers > index d00ba33823..9d8295e8a3 100755 > --- a/support/scripts/mkusers > +++ b/support/scripts/mkusers > @@ -8,6 +8,15 @@ MIN_UID=1000 > MAX_UID=1999 > MIN_GID=1000 > MAX_GID=1999 > +# use names from /etc/adduser.conf > +FIRST_SYSTEM_UID=100 > +LAST_SYSTEM_UID=999 > +FIRST_SYSTEM_GID=100 > +LAST_SYSTEM_GID=999 > +# argument to automatically crease system/user id > +AUTO_SYSTEM_ID=-2 Wouldn't it be better to use -1 for system users (= the usual case) and add -2 for normal users? System users are the usual, after all, and all current in-tree uses of -1 are definitely system users. I though that someone had already made this remark, but I can't find any trace of it. > +AUTO_USER_ID=-1 > + [snip] > @@ -222,8 +233,12 @@ add_one_group() { > local members > > # Generate a new GID if needed > - if [ ${gid} -eq -1 ]; then > - gid="$( generate_gid "${group}" )" > + if [ ${gid} -lt 0 ]; then > + if [ ${gid} -eq ${AUTO_USER_ID} ]; then > + gid="$( generate_gid "${group}" )" (nitpick) For symmetry, I'd always pass the first and last as argument here. > + else > + gid="$( generate_gid "${group}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" > + fi > fi (nitpick) I'd structure the entire block above as follows: if [ ${gid} -eq ${AUTO_USER_ID} ]; then elif [ ${gid} -eq ${AUTO_SYSTEM_ID} ]; then fi That's one level less deep, and more explicit about the system-id branch. Both remarks also apply to the uid case of course. > > members=$(get_members "$group") > @@ -247,16 +262,19 @@ add_one_group() { > # - not already used by a user > generate_uid() { > local username="${1}" > + local minuid="${2:-$MIN_UID}" > + local maxuid="${3:-$MAX_UID}" So here I'd remove the defaults and instead always pass the arguments. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/list/?series=152843&state=%2A&archive=both > + > local uid > > uid="$( get_uid "${username}" )" > if [ -z "${uid}" ]; then > - for(( uid=MIN_UID; uid<=MAX_UID; uid++ )); do > + for(( uid=minuid; uid<=maxuid; uid++ )); do > if [ -z "$( get_username "${uid}" )" ]; then > break > fi > done > - if [ ${uid} -gt ${MAX_UID} ]; then > + if [ ${uid} -gt ${maxuid} ]; then > fail "can not allocate a UID for user '%s'\n" "${username}" > fi > fi > @@ -307,8 +325,13 @@ add_one_user() { > check_user_validity "${username}" "${uid}" "${group}" "${gid}" > > # Generate a new UID if needed > - if [ ${uid} -eq -1 ]; then > - uid="$( generate_uid "${username}" )" > + if [ ${uid} -lt 0 ]; then > + if [ ${uid} -eq ${AUTO_USER_ID} ]; then > + uid="$( generate_uid "${username}" )" > + else > + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" > + > + fi > fi > > # Remove any previous instance of this user > @@ -384,8 +407,8 @@ main() { > ENTRIES+=( "${line}" ) > done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) > > - # We first create groups whose gid is not -1, and then we create groups > - # whose gid is -1 (automatic), so that, if a group is defined both with > + # We first create groups whose gid is positive, and then we create groups > + # whose gid is automatic, so that, if a group is defined both with > # a specified gid and an automatic gid, we ensure the specified gid is > # used, rather than a different automatic gid is computed. > > @@ -399,7 +422,7 @@ main() { > # Then, create all the main groups which gid *is* automatic > for line in "${ENTRIES[@]}"; do > read username uid group gid passwd home shell groups comment <<<"${line}" > - [ ${gid} -eq -1 ] || continue # Non-automatic gid > + [ ${gid} -lt 0 ] || continue # Non-automatic gid > add_one_group "${group}" "${gid}" > done > > @@ -410,7 +433,7 @@ main() { > read username uid group gid passwd home shell groups comment <<<"${line}" > if [ "${groups}" != "-" ]; then > for g in ${groups//,/ }; do > - add_one_group "${g}" -1 > + add_one_group "${g}" ${AUTO_USER_ID} > done > fi > done > @@ -433,7 +456,7 @@ main() { > for line in "${ENTRIES[@]}"; do > read username uid group gid passwd home shell groups comment <<<"${line}" > [ "${username}" != "-" ] || continue # Magic string to skip user creation > - [ ${uid} -eq -1 ] || continue # Non-automatic uid > + [ ${uid} -lt 0 ] || continue # Non-automatic uid > add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ > "${home}" "${shell}" "${groups}" "${comment}" > done > From arnout at mind.be Sun Jan 16 12:27:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:27:15 +0100 Subject: [Buildroot] [PATCH 2/2] mkusers: change default from normal to system user In-Reply-To: <20220114101247.342256-2-nolange79@gmail.com> References: <20220114101247.342256-1-nolange79@gmail.com> <20220114101247.342256-2-nolange79@gmail.com> Message-ID: <38a29a75-9f0a-a7b5-cdf3-16d54c00e2a0@mind.be> On 14/01/2022 11:12, Norbert Lange wrote: > for all packages, this is the fitting default, Ah, this is where I saw the remark! :-) I should have read the entire series before commenting. This patch should be squashed with the preceding one. Since my only remarks are nitpicks, I'm going to merge it as is (after squashing) - but later. So I'll already give it my Acked-by: Arnout Vandecappelle (Essensium/Mind) > but the fallout will be user provided tables. > > Also update the docs with the chagned behaviour. > > Signed-off-by: Norbert Lange > --- > docs/manual/makeusers-syntax.txt | 11 +++++++---- > support/scripts/mkusers | 6 +++--- > 2 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/docs/manual/makeusers-syntax.txt b/docs/manual/makeusers-syntax.txt > index 467e596230..3d1013f447 100644 > --- a/docs/manual/makeusers-syntax.txt > +++ b/docs/manual/makeusers-syntax.txt > @@ -20,13 +20,16 @@ Where: > It can not be +root+, and must be unique. If set to +-+, then just a > group will be created. > - +uid+ is the desired UID for the user. It must be unique, and not > - +0+. If set to +-1+, then a unique UID will be computed by Buildroot > - in the range [1000...1999] > + +0+. If set to +-1+ or +-2+, then a unique UID will be computed by > + Buildroot, with +-1+ denoting a system UID from [100...999] and +-2+ > + denoting a user UID from [1000...1999]. > - +group+ is the desired name for the user's main group. It can not > be +root+. If the group does not exist, it will be created. > - +gid+ is the desired GID for the user's main group. It must be unique, > - and not +0+. If set to +-1+, and the group does not already exist, then > - a unique GID will be computed by Buildroot in the range [1000..1999] > + and not +0+. If set to +-1+ or +-2+, and the group does not already > + exist, then a unique GID will be computed by Buildroot, with +-1+ > + denoting a system GID from [100...999] and +-2+ denoting a user GID > + from [1000...1999]. > - +password+ is the crypt(3)-encoded password. If prefixed with +!+, > then login is disabled. If prefixed with +=+, then it is interpreted > as clear-text, and will be crypt-encoded (using MD5). If prefixed with > diff --git a/support/scripts/mkusers b/support/scripts/mkusers > index 9d8295e8a3..f7a3180e30 100755 > --- a/support/scripts/mkusers > +++ b/support/scripts/mkusers > @@ -14,8 +14,8 @@ LAST_SYSTEM_UID=999 > FIRST_SYSTEM_GID=100 > LAST_SYSTEM_GID=999 > # argument to automatically crease system/user id > -AUTO_SYSTEM_ID=-2 > -AUTO_USER_ID=-1 > +AUTO_SYSTEM_ID=-1 > +AUTO_USER_ID=-2 > > # No more is configurable below this point > #---------------------------------------------------------------------------- > @@ -433,7 +433,7 @@ main() { > read username uid group gid passwd home shell groups comment <<<"${line}" > if [ "${groups}" != "-" ]; then > for g in ${groups//,/ }; do > - add_one_group "${g}" ${AUTO_USER_ID} > + add_one_group "${g}" ${AUTO_SYSTEM_ID} > done > fi > done > From romain.naour at gmail.com Sun Jan 16 12:37:47 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 16 Jan 2022 13:37:47 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <20220115202303.GA2216429@scaer> References: <20220115143344.12319-1-romain.naour@gmail.com> <20220115143344.12319-2-romain.naour@gmail.com> <20220115160517.GQ1945846@scaer> <737f135e-b936-a21c-8775-349d7db7fb88@gmail.com> <20220115202303.GA2216429@scaer> Message-ID: <6c222807-93f7-2186-8ca7-868b893abf55@gmail.com> Hello Yann, All, Le 15/01/2022 ? 21:23, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-15 20:28 +0100, Romain Naour spake thusly: >> Le 15/01/2022 ? 17:05, Yann E. MORIN a ?crit?: >>> On 2022-01-15 15:33 +0100, Romain Naour spake thusly: >>>> As for the Buildroot testsuite, multiply every emulator timeout by 10 >>>> to avoid sporadic failures in elastic runners. >>>> >>>> qemu_arm_vexpress_tz_defconfig tested locally with sucess. >>>> >>>> Fixes: >>>> https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 >>> Are you sure increasing the timeout will fix this failure? The >>> build-run.log contains another error: > [--SNIP--] >>> ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) >>> Using Device Tree in place at 40000000, end 400051f7 >>> So, to me, this is not a timeout issue, but an actual boot issue. >> >> The system stop in the middle of optee startup >> optee: dynamic shared memory is enabled > > I was very confused by the above. Indeed, the log file I downladed > earler really stopped at the error message I pasted. I am sure of that, > as I still had it in my ~/tmp directory, so I could really double-check. > > But now I downloaded it again, and indeed, there are much more traces, > up to that optee issue you point ed at. > > This is a really weird situation, that the download I had was only > partial... weird ineed. > >> Also, I got the same error message while testing locally. > > But testing locally should not have the same impact on boot time, would > it? The boot times out on the eleastic runners because they are too slow > (and many congtainers contend for the CPU there). But locally, it is > really surprising that you hit the exact same timeout issue, and the > exact same point in the boot sequence... I'm not able to reproduce the timeout locally but by looking at the timeout multiplier used for the Buildroot testsuite I would say that a sporadic failures. I restarted the job in gitlab and this time it succeeded: https://gitlab.com/buildroot.org/buildroot/-/jobs/1979108650 Best regards, Romain > > Anyway, can you resend your patch, as I marked it rejected in patchwork, > please? > > Regards, > Yann E. MORIN. > From gilles.talis at gmail.com Sun Jan 16 12:40:47 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 16 Jan 2022 13:40:47 +0100 Subject: [Buildroot] [PATCH] package/clpeak: new package In-Reply-To: <53f0b52a-0bf2-fbd3-a79f-ef3d607bb95a@mind.be> References: <20211024113654.88720-1-gilles.talis@gmail.com> <20211230180010.04c873f9@windsurf> <53f0b52a-0bf2-fbd3-a79f-ef3d607bb95a@mind.be> Message-ID: Le dim. 16 janv. 2022 ? 13:10, Arnout Vandecappelle a ?crit : > > > > On 16/01/2022 09:50, Gilles Talis wrote: > > Hi Thomas, > > > > thanks for the review. Somehow, I missed this email and just stumbled > > across it now. > > > > Le jeu. 30 d?c. 2021 ? 18:00, Thomas Petazzoni > > a ?crit : > >> > >> Hello Gilles, > >> > >> On Sun, 24 Oct 2021 13:36:54 +0200 > >> Gilles Talis wrote: > >> > >>> clpeak is a tool that profiles OpenCL devices to find > >>> their peak capacities > >>> > >>> Signed-off-by: Gilles Talis > >>> --- > >>> DEVELOPERS | 1 + > >>> package/Config.in | 1 + > >>> package/clpeak/Config.in | 14 ++++++++++++++ > >>> package/clpeak/clpeak.hash | 3 +++ > >>> package/clpeak/clpeak.mk | 13 +++++++++++++ > >>> 5 files changed, 32 insertions(+) > >>> create mode 100644 package/clpeak/Config.in > >>> create mode 100644 package/clpeak/clpeak.hash > >>> create mode 100644 package/clpeak/clpeak.mk > >> > >> Thanks for this package submission! Unfortunately, I'm afraid there is > >> an issue: it downloads stuff during the configure step. See below: > > Good catch! It seems like clpeak has a hidden dependency that I missed. > > Whilst I am here, one question: how do we deal with packages that have > > git submodules dependencies? Is it OK to let the download process > > download these dependencies? Even if the dependencies are available > > buildroot packages? > > We prefer to unbundle dependencies (i.e., use the buildroot package rather > than the submodule) if that is possible. However, some projects make that really > hard (like chromium...) so it's not a strict requirement, more a best effort thing. > > Regards, > Arnout thanks for the clarification Arnout! regards Gilles. > > > > >> > >>>>> clpeak 0777205be1d5681d5a76d46ec94588544e8462a5 Configuring > >> ... > >> -- The C compiler identification is GNU 9.3.0 > >> -- The CXX compiler identification is GNU 9.3.0 > >> -- Detecting C compiler ABI info > >> -- Detecting C compiler ABI info - done > >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > >> -- Detecting C compile features > >> -- Detecting C compile features - done > >> -- Detecting CXX compiler ABI info > >> -- Detecting CXX compiler ABI info - done > >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > >> -- Detecting CXX compile features > >> -- Detecting CXX compile features - done > >> -- Looking for CL_VERSION_2_2 > >> -- Looking for CL_VERSION_2_2 - found > >> -- Found OpenCL: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so (found version "2.2") > >> CMake Warning (dev) in CMakeLists.txt: > >> No project() command is present. The top-level CMakeLists.txt file must > >> contain a literal, direct call to the project() command. Add a line of > >> code such as > >> > >> project(ProjectName) > >> > >> near the top of the file, but after cmake_minimum_required(). > >> > >> CMake is pretending there is a "project(Project)" command on the first > >> line. > >> This warning is for project developers. Use -Wno-dev to suppress it. > >> > >> -- The C compiler identification is GNU 9.3.0 > >> -- The CXX compiler identification is GNU 9.3.0 > >> -- Detecting C compiler ABI info > >> -- Detecting C compiler ABI info - done > >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > >> -- Detecting C compile features > >> -- Detecting C compile features - done > >> -- Detecting CXX compiler ABI info > >> -- Detecting CXX compiler ABI info - done > >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > >> -- Detecting CXX compile features > >> -- Detecting CXX compile features - done > >> -- Configuring done > >> -- Generating done > >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build > >> gmake[1]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[2]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> [ 12%] Creating directories for 'hpp_headers' > >> [ 25%] Performing download step (git clone) for 'hpp_headers' > >> Cloning into 'hpp_headers'... > >> remote: Enumerating objects: 558, done. > >> remote: Counting objects: 100% (558/558), done. > >> remote: Compressing objects: 100% (396/396), done. > >> remote: Total 558 (delta 324), reused 355 (delta 155), pack-reused 0 > >> Receiving objects: 100% (558/558), 762.72 KiB | 5.45 MiB/s, done. > >> Resolving deltas: 100% (324/324), done. > >> Already on 'master' > >> Your branch is up to date with 'origin/master'. > >> Submodule 'external/CMock' (https://github.com/ThrowTheSwitch/CMock) registered for path 'external/CMock' > >> Submodule 'external/Unity' (https://github.com/ThrowTheSwitch/Unity) registered for path 'external/Unity' > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock'... > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/Unity'... > >> Submodule path 'external/CMock': checked out '7cc41ddfdd07dc5eb8359d278f439f14031d64ad' > >> Submodule 'vendor/c_exception' (https://github.com/throwtheswitch/cexception.git) registered for path 'external/CMock/vendor/c_exception' > >> Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/unity' > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception'... > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/unity'... > >> Submodule path 'external/CMock/vendor/c_exception': checked out 'dce9e8b26f2179439002e02d691429e81a32b6c0' > >> Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/c_exception/vendor/unity' > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception/vendor/unity'... > >> Submodule path 'external/CMock/vendor/c_exception/vendor/unity': checked out '2c7629a0ae90ffe991b5fd08e4db8672f72ed64c' > >> Submodule path 'external/CMock/vendor/unity': checked out '031f3bbe45f8adf504ca3d13e6f093869920b091' > >> Submodule path 'external/Unity': checked out '7d2bf62b7e6afaf38153041a9d53c21aeeca9a25' > >> [ 37%] Performing update step for 'hpp_headers' > >> HEAD is now at 1df82b9 Add param traits for CL_DEVICE_SUPPORTED_REGISTER_ALLOCATIONS_ARM (#165) > >> [ 50%] No patch step for 'hpp_headers' > >> [ 62%] Performing configure step for 'hpp_headers' > >> -- The C compiler identification is GNU 9.3.0 > >> -- The CXX compiler identification is GNU 9.3.0 > >> -- Detecting C compiler ABI info > >> -- Detecting C compiler ABI info - done > >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > >> -- Detecting C compile features > >> -- Detecting C compile features - done > >> -- Detecting CXX compiler ABI info > >> -- Detecting CXX compiler ABI info - done > >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > >> -- Detecting CXX compile features > >> -- Detecting CXX compile features - done > >> -- Configuring done > >> -- Generating done > >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build > >> [ 75%] Performing build step for 'hpp_headers' > >> gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > >> gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > >> [ 87%] Performing install step for 'hpp_headers' > >> gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > >> Install the project... > >> -- Install configuration: "Release" > >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL > >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/cl2.hpp > >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/opencl.hpp > >> gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > >> [100%] Completed 'hpp_headers' > >> gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> [100%] Built target hpp_headers > >> gmake[2]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> -- Selected OpenCL includes from /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/include;/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include > >> -- Selected OpenCL lib /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so > >> -- Configuring done > >> -- Generating done > >> CMake Warning: > >> Manually-specified variables were not used by the project: > >> > >> BUILD_DOC > >> BUILD_DOCS > >> BUILD_EXAMPLE > >> BUILD_EXAMPLES > >> BUILD_TEST > >> BUILD_TESTING > >> BUILD_TESTS > >> > >> > >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5 > >> > >> Also, while note related to clpeak, I did try to build this > >> configuration (which uses the NXP OpenCL provider): > >> > >> BR2_aarch64=y > >> BR2_TOOLCHAIN_EXTERNAL=y > >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > >> BR2_INIT_NONE=y > >> BR2_SYSTEM_BIN_SH_NONE=y > >> # BR2_PACKAGE_BUSYBOX is not set > >> BR2_PACKAGE_CLPEAK=y > >> BR2_PACKAGE_FREESCALE_IMX=y > >> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y > >> BR2_PACKAGE_IMX_GPU_VIV=y > >> # BR2_TARGET_ROOTFS_TAR is not set > >> > >> and it fails with: > >> > >> /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/9.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib64/libGAL.so: undefined reference to `stat at GLIBC_2.33' > >> > >> And indeed the C library in this toolchain is glibc 2.31. So this means > >> that the libGAL library shipped by NXP in imx-gpu-viv will only work > >> with glibc >= 2.33. > > Good catch again. This is quite a bummer. I will look into that when > > time allows. > > > >> > >> Best regards, > >> > >> Thomas > >> -- > >> Thomas Petazzoni, CTO, Bootlin > >> Embedded Linux and Kernel engineering > >> https://bootlin.com > > thanks > > Gilles. > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From paul at crapouillou.net Sun Jan 16 13:39:03 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Sun, 16 Jan 2022 13:39:03 +0000 Subject: [Buildroot] [PATCH 1/1] Config.in: add option to only use ccache for BR In-Reply-To: <20220113210431.1361727-1-paul@crapouillou.net> References: <20220113210431.1361727-1-paul@crapouillou.net> Message-ID: <3X1T5R.ND9E62SV5PXU3@crapouillou.net> Le jeu., janv. 13 2022 at 21:04:31 +0000, Paul Cercueil a ?crit : > Add an option, disabled by default, to only use ccache for Buildroot > packages. > > When enabled, ccache will be used when building Buildroot itself, but > the toolchain exported as SDK will not make use of ccache to build > external programs, unless the "BR_USE_CCACHE" environment variable is > set. > > The motivation behind this change is to be able to speed up iterative > building of a Buildroot based distribution, without forcing the users > of > the SDK to use ccache, which has the problem of clobbering the s/clobbering/cluttering/ -Paul > filesystem in a hidden directory if the cache directory is left as > default, or trying to access a cache folder that existed on the > machine > that built the SDK but which may not exist on the machine on which it > was later installed. > > Signed-off-by: Paul Cercueil > --- > Config.in | 9 +++++++++ > linux/linux.mk | 4 ++++ > package/Makefile.in | 4 ++++ > toolchain/toolchain-wrapper.c | 5 +++++ > toolchain/toolchain-wrapper.mk | 4 ++++ > 5 files changed, 26 insertions(+) > > diff --git a/Config.in b/Config.in > index f0cd6f48ed..fec2332077 100644 > --- a/Config.in > +++ b/Config.in > @@ -374,6 +374,15 @@ config BR2_CCACHE_USE_BASEDIR > the section "COMPILING IN DIFFERENT DIRECTORIES" in the ccache > manual for more information. > > +config BR2_CCACHE_BR_ONLY > + bool "Only use ccache for building Buildroot packages" > + default n > + help > + When enabled, ccache will be used when building Buildroot > + itself, but the toolchain exported as SDK will not make use of > + ccache to build external programs, unless the "BR_USE_CCACHE" > + environment variable is set. > + > endif > > config BR2_ENABLE_DEBUG > diff --git a/linux/linux.mk b/linux/linux.mk > index 61fdc0c76c..339848e29b 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -69,6 +69,10 @@ LINUX_MAKE_ENV = \ > $(HOST_MAKE_ENV) \ > BR_BINARIES_DIR=$(BINARIES_DIR) > > +ifeq ($(BR2_CCACHE_BR_ONLY),y) > +LINUX_MAKE_ENV += BR_USE_CCACHE=1 > +endif > + > LINUX_INSTALL_IMAGES = YES > LINUX_DEPENDENCIES = host-kmod \ > $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ > diff --git a/package/Makefile.in b/package/Makefile.in > index 508ea7c366..34556fa7b0 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -263,6 +263,10 @@ export PERL5LIB=$(HOST_DIR)/lib/perl > > TARGET_MAKE_ENV = PATH=$(BR_PATH) > > +ifeq ($(BR2_CCACHE_BR_ONLY),y) > + TARGET_MAKE_ENV += BR_USE_CCACHE=1 > +endif > + > TARGET_CONFIGURE_OPTS = \ > $(TARGET_MAKE_ENV) \ > AR="$(TARGET_AR)" \ > diff --git a/toolchain/toolchain-wrapper.c > b/toolchain/toolchain-wrapper.c > index 0fb6064b1c..bf0194c8fc 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -510,6 +510,11 @@ int main(int argc, char **argv) > if (getenv("BR_NO_CCACHE")) > /* Skip the ccache call */ > exec_args++; > +#ifdef BR_CCACHE_BR_ONLY > + else if (!getenv("BR_USE_CCACHE")) > + /* Skip the ccache call */ > + exec_args++; > +#endif > #endif > > /* Debug the wrapper to see final arguments passed to the real > compiler. */ > diff --git a/toolchain/toolchain-wrapper.mk > b/toolchain/toolchain-wrapper.mk > index cbf46f15fa..cda9eaf342 100644 > --- a/toolchain/toolchain-wrapper.mk > +++ b/toolchain/toolchain-wrapper.mk > @@ -73,6 +73,10 @@ ifeq ($(BR2_CCACHE_USE_BASEDIR),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"' > endif > > +ifeq ($(BR2_CCACHE_BR_ONLY),y) > +TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BR_ONLY > +endif > + > ifeq ($(BR2_PIC_PIE),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR2_PIC_PIE > endif > -- > 2.34.1 > From giulio.benetti at benettiengineering.com Sun Jan 16 15:29:42 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 16 Jan 2022 16:29:42 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> References: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> Message-ID: <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> Hi Sergey, Peter, All, > Il giorno 16 gen 2022, alle ore 12:26, Sergey Kuzminov ha scritto: > > ?Changes: > - common scenarios for multiple boards to create the SD image: board/orangepi/common; > - extlinux.conf instead of boot.scr; I?ve seen other boards switching to extlinux.conf instead of boot.scr, but extlinux.conf doesn?t have any checksum while boot.scr does as I remember. I?ve missed previous discussion about this. @Peter as I recall you?ve suggested this. Sorry but I don?t remember the reason and I would still keep boot.scr. I?d prefer the system not booting than a system booting with partial bootlegs honestly. What about that? And? > - exclude FAT partition; > - defconfig refactoring; > - kernel: bump to version 5.12.19, if newer then BR2_PACKAGE_XR819_XRADIO will not compile; > - u-boot: bump to version 2022.01 > > Signed-off-by: Sergey Kuzminov > --- > board/orangepi/common/extlinux.conf | 5 ++ > board/orangepi/common/genimage.cfg | 19 +++++++ > board/orangepi/common/post-build.sh | 34 ++++++++++++ > board/orangepi/common/uboot-extras.config | 3 + > board/orangepi/orangepi-zero/boot.cmd | 9 --- > board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ > configs/orangepi_zero_defconfig | 67 ++++++++++++++--------- > 7 files changed, 102 insertions(+), 71 deletions(-) > create mode 100644 board/orangepi/common/extlinux.conf > create mode 100644 board/orangepi/common/genimage.cfg > create mode 100755 board/orangepi/common/post-build.sh > create mode 100644 board/orangepi/common/uboot-extras.config > delete mode 100644 board/orangepi/orangepi-zero/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg > > diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf > new file mode 100644 > index 0000000000..015f29270e > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,5 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + append root=PARTUUID=%PARTUUID% rootwait console=${console} > +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..fd250ef05d > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,19 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = gpt > + gpt-no-backup = true > + gpt-location = 1008K # 1MB - 16KB > + } > + > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB - 16KB > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh > new file mode 100755 > index 0000000000..296f94b174 > --- /dev/null > +++ b/board/orangepi/common/post-build.sh > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +linux_image() > +{ > + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then > + echo "uImage" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then > + echo "Image" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then > + echo "Image.gz" > + else > + echo "zImage" > + fi > +} > + > +generic_getty() > +{ > + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then > + echo "" > + else > + echo "s/\s*console=\S*//" > + fi > +} > + > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > + > +sed -e "$(generic_getty)" \ > + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ > + -e "s/%PARTUUID%/$PARTUUID/g" \ > + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > + > +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config > new file mode 100644 > index 0000000000..5aa97523d9 > --- /dev/null > +++ b/board/orangepi/common/uboot-extras.config > @@ -0,0 +1,3 @@ > +CONFIG_BOOTDELAY=0 > +CONFIG_USE_PREBOOT=y > +CONFIG_PREBOOT="setenv preboot;" > diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd > deleted file mode 100644 > index d094a64fe5..0000000000 > --- a/board/orangepi/orangepi-zero/boot.cmd > +++ /dev/null > @@ -1,9 +0,0 @@ > -setenv fdt_high ffffffff > - > -part uuid mmc 0:2 uuid > -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg > deleted file mode 100644 > index 32f5454ae6..0000000000 > --- a/board/orangepi/orangepi-zero/genimage.cfg > +++ /dev/null > @@ -1,36 +0,0 @@ > -# Minimal SD card image for the OrangePi Zero > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h2-plus-orangepi-zero.dtb", > - "boot.scr" > - } > - } > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..908bcea893 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,49 +1,64 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_VFPV4=y ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards with sunxi A7 and can speed things up. > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" > -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -# BR2_TARGET_ROOTFS_TAR is not set > +BR2_GCC_ENABLE_LTO=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > -BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.19" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > +BR2_TARGET_ROOTFS_TAR=n > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_GENIMAGE=y > > -# wireless driver and firmware > +# Wireless driver and firmware > +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x > BR2_PACKAGE_XR819_XRADIO=y > BR2_PACKAGE_ARMBIAN_FIRMWARE=y > BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y Can you point a test case? This way I could try to fix building and you could test if it works. Thank you Best regards ?- Giulio Benetti Benetti Engineering sas > > -# wireless support > +# Wireless support > BR2_PACKAGE_IW=y > BR2_PACKAGE_WIRELESS_TOOLS=y > BR2_PACKAGE_WIRELESS_TOOLS_LIB=y > @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > > -# spi flash support > +# Spi flash support > BR2_PACKAGE_MTD=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From heiko.thiery at gmail.com Sun Jan 16 16:14:11 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sun, 16 Jan 2022 17:14:11 +0100 Subject: [Buildroot] [PATCH v3] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220116161410.2796330-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- v3: - change offset value to use capitol 'K' value (thanks Guilio) - add info to uboot patches about submitting to upstream v2: - switch to extlinux - directly call genimage.sh - remove post-image.sh - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 7 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 59 ++++ 8 files changed, 511 insertions(+) create mode 100644 board/kontron/bl-imx8mm/extlinux.conf create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..93c5760489 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1179,7 +1179,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf new file mode 100644 index 0000000000..d38f7f81b7 --- /dev/null +++ b/board/kontron/bl-imx8mm/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..c98bc4f150 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,18 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 16K + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + image = "rootfs.ext4" + offset = 8M + partition-uuid = %PARTUUID% + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..6d76282def --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,31 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..a88d7aba87 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,305 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..5b5648cc14 --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,59 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.30.2 From gilles.talis at gmail.com Sun Jan 16 17:53:20 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 16 Jan 2022 18:53:20 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/clpeak: new package In-Reply-To: <20220116175320.453041-1-gilles.talis@gmail.com> References: <20220116175320.453041-1-gilles.talis@gmail.com> Message-ID: <20220116175320.453041-2-gilles.talis@gmail.com> clpeak is a tool that profiles OpenCL devices to find their peak capacities Signed-off-by: Gilles Talis --- v2: - Added opencl-clhpp dependency DEVELOPERS | 1 + package/Config.in | 1 + package/clpeak/Config.in | 15 +++++++++++++++ package/clpeak/clpeak.hash | 3 +++ package/clpeak/clpeak.mk | 13 +++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/clpeak/Config.in create mode 100644 package/clpeak/clpeak.hash create mode 100644 package/clpeak/clpeak.mk diff --git a/DEVELOPERS b/DEVELOPERS index 483afa4932..04b3f8fba9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1075,6 +1075,7 @@ N: Gilles Talis F: board/freescale/imx8mmevk/ F: configs/freescale_imx8mmevk_defconfig F: package/cctz/ +F: package/clpeak/ F: package/faad2/ F: package/fdk-aac/ F: package/httping/ diff --git a/package/Config.in b/package/Config.in index 08eb3ad809..b38d05b3b3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -87,6 +87,7 @@ menu "Debugging, profiling and benchmark" source "package/bonnie/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" + source "package/clpeak/Config.in" source "package/coremark/Config.in" source "package/coremark-pro/Config.in" source "package/dacapo/Config.in" diff --git a/package/clpeak/Config.in b/package/clpeak/Config.in new file mode 100644 index 0000000000..c83297549c --- /dev/null +++ b/package/clpeak/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_CLPEAK + bool "clpeak" + depends on BR2_PACKAGE_HAS_LIBOPENCL + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_PACKAGE_OPENCL_CLHPP + help + clpeak is a tool that profiles OpenCL devices + to find their peak capacities + + https://github.com/krrishnarraj/clpeak + +comment "clpeak needs an OpenCL provider, a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_PACKAGE_HAS_LIBOPENCL \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/clpeak/clpeak.hash b/package/clpeak/clpeak.hash new file mode 100644 index 0000000000..e0d2c1e92b --- /dev/null +++ b/package/clpeak/clpeak.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 1e9c3f959498253d6bb956dc786de7b3e4019264216a1781c06ae49a1d6600e5 clpeak-0777205be1d5681d5a76d46ec94588544e8462a5.tar.gz +sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/clpeak/clpeak.mk b/package/clpeak/clpeak.mk new file mode 100644 index 0000000000..5fa990fb34 --- /dev/null +++ b/package/clpeak/clpeak.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# clpeak +# +################################################################################ + +CLPEAK_VERSION = 0777205be1d5681d5a76d46ec94588544e8462a5 +CLPEAK_SITE = $(call github,krrishnarraj,clpeak,$(CLPEAK_VERSION)) +CLPEAK_LICENSE = Unlicense +CLPEAK_LICENSE_FILES = LICENSE +CLPEAK_DEPENDENCIES = libopencl opencl-clhpp + +$(eval $(cmake-package)) -- 2.32.0 From gilles.talis at gmail.com Sun Jan 16 17:53:19 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 16 Jan 2022 18:53:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/opencl-clhpp: new package Message-ID: <20220116175320.453041-1-gilles.talis@gmail.com> opencl-clhpp are the OpenCL API C++ bindings Signed-off-by: Gilles Talis --- DEVELOPERS | 1 + package/Config.in | 1 + package/opencl-clhpp/Config.in | 10 ++++++++++ package/opencl-clhpp/opencl-clhpp.hash | 3 +++ package/opencl-clhpp/opencl-clhpp.mk | 16 ++++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/opencl-clhpp/Config.in create mode 100644 package/opencl-clhpp/opencl-clhpp.hash create mode 100644 package/opencl-clhpp/opencl-clhpp.mk diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..483afa4932 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1084,6 +1084,7 @@ F: package/libeXosip2/ F: package/libolm/ F: package/libosip2/ F: package/ocrad/ +F: package/opencl-clhpp/ F: package/opusfile/ F: package/restclient-cpp/ F: package/tesseract-ocr/ diff --git a/package/Config.in b/package/Config.in index 4df1474b91..08eb3ad809 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1564,6 +1564,7 @@ menu "Graphics" source "package/libvips/Config.in" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" + source "package/opencl-clhpp/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" source "package/opengl/Config.in" diff --git a/package/opencl-clhpp/Config.in b/package/opencl-clhpp/Config.in new file mode 100644 index 0000000000..12045be055 --- /dev/null +++ b/package/opencl-clhpp/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_OPENCL_CLHPP + bool "opencl-clhpp" + depends on BR2_INSTALL_LIBSTDCPP + help + opencl-clhpp are the OpenCL API C++ bindings + + http://github.khronos.org/OpenCL-CLHPP/ + +comment "opencl-clhpp needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash new file mode 100644 index 0000000000..27b27cd80c --- /dev/null +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -0,0 +1,3 @@ +# Locally Computed +sha256 869456032e60787eed9fceaeaf6c6cb4452bc0ff97e0f5a271510145a1c8f4d4 opencl-clhpp-2.0.16.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk new file mode 100644 index 0000000000..610cd45b62 --- /dev/null +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# opencl-clhpp +# +################################################################################ + +OPENCL_CLHPP_VERSION = 2.0.16 +OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) +OPENCL_CLHPP_LICENSE = Apache-2.0 +OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt +OPENCL_CLHPP_INSTALL_STAGING = YES + +# OpenCL_CLHPP is a header-only library +OPENCL_CLHPP_INSTALL_TARGET = NO + +$(eval $(cmake-package)) -- 2.32.0 From tambewilliam at gmail.com Sun Jan 16 19:23:20 2022 From: tambewilliam at gmail.com (William Tambe) Date: Sun, 16 Jan 2022 13:23:20 -0600 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory In-Reply-To: <420ac869-6aea-a492-7a74-3014b7bb4cf3@mind.be> References: <420ac869-6aea-a492-7a74-3014b7bb4cf3@mind.be> Message-ID: On Mon, Jan 10, 2022 at 1:33 AM Arnout Vandecappelle wrote: > > > > On 10/01/2022 00:46, William Tambe wrote: > > On Sun, Jan 9, 2022 at 2:08 PM Arnout Vandecappelle wrote: > >> > >> > >> > >> On 09/01/2022 19:18, William Tambe wrote: > >>> I am attempting to build: > >>> > >>> +BR2_PACKAGE_DHCP=y > >>> +BR2_PACKAGE_DHCP_CLIENT=y > >>> > >>> However it fails as follow complaining about not finding readline/history.h: > >>> > >>> making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate > >>> /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc > >> > >> pu32 doesn't exist in Buildroot, so this may very well be due to external changes. > > So, do you have external changes that may be the cause of this? IOW, can you > reproduce the problem on upstream Buildroot? > > >> > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 > >>> -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include > >>> -I../../lib/lwres/unix/include -I../../lib/lwres/include > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include > >>> -I../../lib/dns/include > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include > >>> -I../../lib/bind9/include > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include > >>> -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include > >>> -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include > >>> -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" > >>> -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > >>> -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall > >>> -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat > >>> -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks > >>> \ > >>> -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ > >>> -c ./nsupdate.c > >>> ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory > >>> 104 | #include > >>> | ^~~~~~~~~~~~~~~~~~~~ > >> > >> This sounds like you changed your configuration without doing 'make clean'. Is > >> that possible? > > > > I am building from clean or from scratch. > > > >> > >> Is BR2_PACKAGE_READLINE enabled in your configuration? Has it been built? > > > > Yes, BR2_PACKAGE_READLINE is enabled in my configuration. > > And does it get built? Does output/build/readline/.stamp_staging_installed exist? Yes it gets built and installed and .stamp_staging_installed exists. Below are related buildroot files listing: $ ls -ld buildroot-build/build/readline-8.1/.* drwxr-xr-x 6 tambewilliam tambewilliam 4096 Jan 16 12:58 buildroot-build/build/readline-8.1/. drwxr-xr-x 30 tambewilliam tambewilliam 4096 Jan 16 12:59 buildroot-build/build/readline-8.1/.. -rw-r--r-- 1 tambewilliam tambewilliam 84 Jan 16 12:58 buildroot-build/build/readline-8.1/.applied_patches_list -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.files-list-host.txt -rw-r--r-- 1 tambewilliam tambewilliam 799 Jan 16 12:58 buildroot-build/build/readline-8.1/.files-list-staging.txt -rw-r--r-- 1 tambewilliam tambewilliam 822 Jan 16 12:58 buildroot-build/build/readline-8.1/.files-list.txt -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_built -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_configured -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_downloaded -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_extracted -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_installed -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_patched -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_staging_installed -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_target_installed > > The bind.mk file has this: > ifeq ($(BR2_PACKAGE_READLINE),y) > BIND_DEPENDENCIES += readline > else > BIND_CONF_OPTS += --with-readline=no > endif > > which should make sure that readline is built and installed before bind. This in > turn should make sure that output/host/*/sysroot/usr/include/readline/history.h > exists. When I search for history.h I find it in following locations: $ find buildroot-build/ | fgrep history.h buildroot-build/target/usr/include/readline/history.h buildroot-build/host/pu32-buildroot-linux-gnu/sysroot/usr/include/readline/history.h buildroot-build/build/bash-5.1/lib/readline/history.h buildroot-build/build/readline-8.1/doc/history.html buildroot-build/build/readline-8.1/history.h How to make buildroot use include path host/pu32-buildroot-linux-gnu/sysroot/usr/include/readline/ such that it will find history.h ? > > Regards, > Arnout > > > > >> > >> Regards, > >> Arnout > >> > >>> compilation terminated. > >>> make[5]: *** [Makefile:473: nsupdate.o] Error 1 > >>> make[4]: *** [Makefile:79: subdirs] Error 1 > >>> make[3]: *** [Makefile:88: subdirs] Error 1 > >>> make[2]: *** [package/pkg-generic.mk:270: > >>> /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] > >>> Error 2 > >>> make[1]: *** [Makefile:23: _all] Error 2 > >>> make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' > >>> make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 > >>> _______________________________________________ > >>> buildroot mailing list > >>> buildroot at buildroot.org > >>> https://lists.buildroot.org/mailman/listinfo/buildroot > >>> From giulio.benetti at benettiengineering.com Sun Jan 16 19:33:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 16 Jan 2022 20:33:55 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> References: <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> Message-ID: <7398CECE-A994-4692-BCA7-FD6ACB33395F@benettiengineering.com> Hi Sergey, +Cc buildroot ML, > Il giorno 16 gen 2022, alle ore 19:19, Sergey Kuzminov ha scritto: > > ?16.01.2022 18:29, Giulio Benetti: >> Hi Sergey, Peter, All, >> >> +# Architecture >> BR2_arm=y >> BR2_cortex_a7=y >> BR2_ARM_FPU_VFPV4=y >> ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards with sunxi A7 and can speed things up. >> > Hi, Giulio. I will test, thanks. +1 > > >>> +# Wireless driver and firmware >>> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >>> BR2_PACKAGE_XR819_XRADIO=y >>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >> Can you point a test case? This way I could try to fix building and you could test if it works. >> >> Thank you >> Best regards >> ?- >> Giulio Benetti >> Benetti Engineering sas >> > To check, set the parameters in the current version of Buildroot > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.15" > in the configs/orangepi_zero_defconfig file Ok, thank you. Best regards Giulio > > make orangepi_zero_defconfig > make > > From giulio.benetti at benettiengineering.com Sun Jan 16 19:35:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 16 Jan 2022 20:35:13 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> References: <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> Message-ID: <03E379C4-315C-4148-94E7-8A6971376DFB@benettiengineering.com> Add Peter in Cc. Can you please check below about extlinux? Giulio > Il giorno 16 gen 2022, alle ore 16:30, Giulio Benetti ha scritto: > > ?Hi Sergey, Peter, All, > >> Il giorno 16 gen 2022, alle ore 12:26, Sergey Kuzminov ha scritto: >> >> ?Changes: >> - common scenarios for multiple boards to create the SD image: board/orangepi/common; >> - extlinux.conf instead of boot.scr; > > I?ve seen other boards switching to extlinux.conf instead of boot.scr, but extlinux.conf doesn?t have any checksum while boot.scr does as I remember. > I?ve missed previous discussion about this. > > @Peter as I recall you?ve suggested this. Sorry but I don?t remember the reason and I would still keep boot.scr. I?d prefer the system not booting than a system booting with partial bootlegs honestly. > > What about that? > > And? > >> - exclude FAT partition; >> - defconfig refactoring; >> - kernel: bump to version 5.12.19, if newer then BR2_PACKAGE_XR819_XRADIO will not compile; >> - u-boot: bump to version 2022.01 >> >> Signed-off-by: Sergey Kuzminov >> --- >> board/orangepi/common/extlinux.conf | 5 ++ >> board/orangepi/common/genimage.cfg | 19 +++++++ >> board/orangepi/common/post-build.sh | 34 ++++++++++++ >> board/orangepi/common/uboot-extras.config | 3 + >> board/orangepi/orangepi-zero/boot.cmd | 9 --- >> board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ >> configs/orangepi_zero_defconfig | 67 ++++++++++++++--------- >> 7 files changed, 102 insertions(+), 71 deletions(-) >> create mode 100644 board/orangepi/common/extlinux.conf >> create mode 100644 board/orangepi/common/genimage.cfg >> create mode 100755 board/orangepi/common/post-build.sh >> create mode 100644 board/orangepi/common/uboot-extras.config >> delete mode 100644 board/orangepi/orangepi-zero/boot.cmd >> delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg >> >> diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf >> new file mode 100644 >> index 0000000000..015f29270e >> --- /dev/null >> +++ b/board/orangepi/common/extlinux.conf >> @@ -0,0 +1,5 @@ >> +LABEL default >> + kernel /boot/%LINUXIMAGE% >> + devicetreedir /boot >> + append root=PARTUUID=%PARTUUID% rootwait console=${console} >> +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 >> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >> new file mode 100644 >> index 0000000000..fd250ef05d >> --- /dev/null >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,19 @@ >> +image sdcard.img { >> + hdimage { >> + partition-table-type = gpt >> + gpt-no-backup = true >> + gpt-location = 1008K # 1MB - 16KB >> + } >> + >> + partition u-boot { >> + in-partition-table = false >> + image = "u-boot-sunxi-with-spl.bin" >> + offset = 8K >> + size = 1000K # 1MB - 8KB - 16KB >> + } >> + >> + partition rootfs { >> + image = "rootfs.ext4" >> + partition-uuid = %PARTUUID% >> + } >> +} >> diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh >> new file mode 100755 >> index 0000000000..296f94b174 >> --- /dev/null >> +++ b/board/orangepi/common/post-build.sh >> @@ -0,0 +1,34 @@ >> +#!/bin/sh >> + >> +linux_image() >> +{ >> + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then >> + echo "uImage" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then >> + echo "Image" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then >> + echo "Image.gz" >> + else >> + echo "zImage" >> + fi >> +} >> + >> +generic_getty() >> +{ >> + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then >> + echo "" >> + else >> + echo "s/\s*console=\S*//" >> + fi >> +} >> + >> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >> + >> +install -d "$TARGET_DIR/boot/extlinux/" >> + >> +sed -e "$(generic_getty)" \ >> + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ >> + -e "s/%PARTUUID%/$PARTUUID/g" \ >> + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >> + >> +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >> diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config >> new file mode 100644 >> index 0000000000..5aa97523d9 >> --- /dev/null >> +++ b/board/orangepi/common/uboot-extras.config >> @@ -0,0 +1,3 @@ >> +CONFIG_BOOTDELAY=0 >> +CONFIG_USE_PREBOOT=y >> +CONFIG_PREBOOT="setenv preboot;" >> diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd >> deleted file mode 100644 >> index d094a64fe5..0000000000 >> --- a/board/orangepi/orangepi-zero/boot.cmd >> +++ /dev/null >> @@ -1,9 +0,0 @@ >> -setenv fdt_high ffffffff >> - >> -part uuid mmc 0:2 uuid >> -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait >> - >> -fatload mmc 0 $kernel_addr_r zImage >> -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb >> - >> -bootz $kernel_addr_r - $fdt_addr_r >> diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg >> deleted file mode 100644 >> index 32f5454ae6..0000000000 >> --- a/board/orangepi/orangepi-zero/genimage.cfg >> +++ /dev/null >> @@ -1,36 +0,0 @@ >> -# Minimal SD card image for the OrangePi Zero >> -# >> -image boot.vfat { >> - vfat { >> - files = { >> - "zImage", >> - "sun8i-h2-plus-orangepi-zero.dtb", >> - "boot.scr" >> - } >> - } >> - size = 10M >> -} >> - >> -image sdcard.img { >> - hdimage { >> - } >> - >> - partition u-boot { >> - in-partition-table = "no" >> - image = "u-boot-sunxi-with-spl.bin" >> - offset = 8K >> - size = 1016K # 1MB - 8KB >> - } >> - >> - partition boot { >> - partition-type = 0xC >> - bootable = "true" >> - image = "boot.vfat" >> - } >> - >> - partition rootfs { >> - partition-type = 0x83 >> - image = "rootfs.ext4" >> - size = 512M >> - } >> -} >> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >> index 1c107b10e6..908bcea893 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -1,49 +1,64 @@ >> +# Architecture >> BR2_arm=y >> BR2_cortex_a7=y >> BR2_ARM_FPU_VFPV4=y > > ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards with sunxi A7 and can speed things up. > >> + >> +# System >> +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >> -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> BR2_SYSTEM_DHCP="eth0" >> -BR2_LINUX_KERNEL=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" >> -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> -BR2_LINUX_KERNEL_DTS_SUPPORT=y >> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> -BR2_TARGET_ROOTFS_EXT2=y >> -BR2_TARGET_ROOTFS_EXT2_4=y >> -# BR2_TARGET_ROOTFS_TAR is not set >> +BR2_GCC_ENABLE_LTO=y >> + >> +# Bootloader >> BR2_TARGET_UBOOT=y >> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" >> -BR2_PACKAGE_HOST_DOSFSTOOLS=y >> -BR2_PACKAGE_HOST_GENIMAGE=y >> -BR2_PACKAGE_HOST_MTOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" >> + >> +# Kernel >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.19" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >> + >> +# Filesystem >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> +BR2_TARGET_ROOTFS_TAR=n >> + >> +# Image >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >> + >> +# Required tools to create the SD image >> +BR2_PACKAGE_HOST_GENIMAGE=y >> >> -# wireless driver and firmware >> +# Wireless driver and firmware >> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >> BR2_PACKAGE_XR819_XRADIO=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y > > Can you point a test case? This way I could try to fix building and you could test if it works. > > Thank you > Best regards > ?- > Giulio Benetti > Benetti Engineering sas > >> >> -# wireless support >> +# Wireless support >> BR2_PACKAGE_IW=y >> BR2_PACKAGE_WIRELESS_TOOLS=y >> BR2_PACKAGE_WIRELESS_TOOLS_LIB=y >> @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y >> BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y >> BR2_PACKAGE_WPA_SUPPLICANT_CLI=y >> >> -# spi flash support >> +# Spi flash support >> BR2_PACKAGE_MTD=y >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From mail at dbrgn.ch Sun Jan 16 20:15:57 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Sun, 16 Jan 2022 21:15:57 +0100 Subject: [Buildroot] [PATCH 1/1] configs/pcengines_apu2_defconfig: bump kernel to 5.16 Message-ID: <20220116211557.71866ff6@c3po> This fixes the compile errors that were present with the previous kernel version (4.19). Signed-off-by: Danilo Bargen --- configs/pcengines_apu2_defconfig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 68cebb8f6a..eb30f6aee7 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -1,16 +1,26 @@ +# Architecture BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_HOSTNAME="apu2" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_SYSTEM_DHCP="eth0" + +# Kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" + +# Default hostname and TTY +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Networking +BR2_SYSTEM_DHCP="eth0" + +# Rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" BR2_TARGET_ROOTFS_ISO9660_HYBRID=y -# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_SYSLINUX=y -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 21:08:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 22:08:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.4.3 Message-ID: <20220116210816.3210061-1-fontaine.fabrice@gmail.com> Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 https://blog.hartwork.org/posts/expat-2-4-3-released https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 8cf563d8f5..0853c3c76d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ -md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz -sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ +md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz +sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz # Locally calculated -sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb1cfd8c8a..a7ace66095 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.1 +EXPAT_VERSION = 2.4.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 21:49:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 22:49:53 +0100 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5webkit: widgets are mandatory Message-ID: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at /home/fabrice/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): Could not find a package configuration file provided by "Qt5Widgets" with any of the following names: Qt5WidgetsConfig.cmake qt5widgets-config.cmake Add the installation prefix of "Qt5Widgets" to CMAKE_PREFIX_PATH or set "Qt5Widgets_DIR" to a directory containing one of the above files. If "Qt5Widgets" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): Source/cmake/OptionsQt.cmake:646 (find_package) Source/cmake/WebKitCommon.cmake:51 (include) CMakeLists.txt:137 (include) Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index b7beb2b252..68b679dfcd 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5SENSORS select BR2_PACKAGE_QT5WEBCHANNEL -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 21:49:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 22:49:54 +0100 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5webkit: fix build without opengl In-Reply-To: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Message-ID: <20220116214955.3231899-2-fontaine.fabrice@gmail.com> Fix the following build failure without opengl raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at Source/cmake/OptionsQt.cmake:592 (message): Qt with OpenGL support is required for ENABLE_OPENGL WebKit2 unconditionally depends on TextureMapperGL.h and tools builds QtTestBrowser which unconditionally depends on QtOpenGL Fixes: - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 3af1918a46..de3c428fbe 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=ON \ + -DENABLE_WEBKIT2=ON +else +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=OFF \ + -DENABLE_WEBKIT2=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative endif QT5WEBKIT_CONF_OPTS += \ + -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DUSE_LIBHYPHEN=OFF -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 21:49:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 22:49:55 +0100 Subject: [Buildroot] [PATCH 3/3] package/qt5/qt5webkit: build shared core In-Reply-To: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Message-ID: <20220116214955.3231899-3-fontaine.fabrice@gmail.com> Build JavaScriptCore and WebCore as shared libraries to avoid a build failure Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/qt5webkit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index de3c428fbe..565c57e813 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -42,6 +42,7 @@ QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DSHARED_CORE=ON \ -DUSE_LIBHYPHEN=OFF $(eval $(cmake-package)) -- 2.34.1 From mail at dbrgn.ch Sun Jan 16 22:04:04 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Sun, 16 Jan 2022 23:04:04 +0100 Subject: [Buildroot] Hash verification from GitHub Message-ID: <20220116230404.71f68dbb@c3po> Hello folks I'm trying to create a new buildroot package (my first one). This is what the makefile (tealdeer.mk) looks like: TEALDEER_VERSION = 1.5.0 TEALDEER_SITE = $(call github,dbrgn,tealdeer,v$(TEALDEER_VERSION)) TEALDEER_LICENSE = Apache-2.0 or MIT TEALDEER_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT $(eval $(cargo-package)) The URL should expand to https://github.com/dbrgn/tealdeer/archive/v1.5.0/tealdeer-1.5.0.tar.gz. To generate the checksum, I ran: $ sha256sum tealdeer-1.5.0.tar.gz 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a tealdeer-1.5.0.tar.gz I also added a hash file (tealdeer.hash): # Locally generated sha256 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a tealdeer-1.5.0.tar.gz sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 a313b5e62b80a08f3aae0fa62ff3de8482ef55247299eb352ab44f87ef456b1b LICENSE-MIT When building this package, checksum verification fails every time. ERROR: tealdeer-1.5.0.tar.gz has wrong sha256 hash: ERROR: expected: 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a ERROR: got : 42febf9ee84721b9230077d62e2fc51201fd59624d3c776ccc1a634788768a60 ERROR: Incomplete download, or man-in-the-middle (MITM) attack No matter how I download the file (via wget, through the GitHub web UI, etc), it always results in the SHA256 checksum starting with 009..., but buildroot always thinks it should be 42f... I also tried changing the TEALDEER_SITE variable as follows: TEALDEER_SITE = https://github.com/dbrgn/tealdeer/archive/v$(TEALDEER_VERSION) ...to ensure that this URL is *really* being downloaded, but it fails every time. Full build log can be found here: https://gist.github.com/dbrgn/cc9e96051a079f5b63c531ca3c195954 Does someone have any pointers why the hash verification would fail in this case? It must be some obvious mistake I'm making, but I cannot figure out what it is. Best regards, Danilo Bargen From fontaine.fabrice at gmail.com Sun Jan 16 22:03:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 23:03:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: fix CVE-2022-22707 Message-ID: <20220116220302.3434242-1-fontaine.fabrice@gmail.com> In lighttpd 1.4.46 through 1.4.63, the mod_extforward_Forwarded function of the mod_extforward plugin has a stack-based buffer overflow (4 bytes representing -1), as demonstrated by remote denial of service (daemon crash) in a non-default configuration. The non-default configuration requires handling of the Forwarded header in a somewhat unusual manner. Also, a 32-bit system is much more likely to be affected than a 64-bit system. Signed-off-by: Fabrice Fontaine --- ...x-out-of-bounds-OOB-write-fixes-3134.patch | 94 +++++++++++++++++++ package/lighttpd/lighttpd.mk | 3 + 2 files changed, 97 insertions(+) create mode 100644 package/lighttpd/0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch diff --git a/package/lighttpd/0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch b/package/lighttpd/0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch new file mode 100644 index 0000000000..2cad8a6d18 --- /dev/null +++ b/package/lighttpd/0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch @@ -0,0 +1,94 @@ +From 8c62a890e23f5853b1a562b03fe3e1bccc6e7664 Mon Sep 17 00:00:00 2001 +From: povcfe +Date: Wed, 5 Jan 2022 11:11:09 +0000 +Subject: [PATCH] [mod_extforward] fix out-of-bounds (OOB) write (fixes #3134) + +(thx povcfe) + +(edited: gstrauss) + +There is a potential remote denial of service in lighttpd mod_extforward +under specific, non-default and uncommon 32-bit lighttpd mod_extforward +configurations. + +Under specific, non-default and uncommon lighttpd mod_extforward +configurations, a remote attacker can trigger a 4-byte out-of-bounds +write of value '-1' to the stack. This is not believed to be exploitable +in any way beyond triggering a crash of the lighttpd server on systems +where the lighttpd server has been built 32-bit and with compiler flags +which enable a stack canary -- gcc/clang -fstack-protector-strong or +-fstack-protector-all, but bug not visible with only -fstack-protector. + +With standard lighttpd builds using -O2 optimization on 64-bit x86_64, +this bug has not been observed to cause adverse behavior, even with +gcc/clang -fstack-protector-strong. + +For the bug to be reachable, the user must be using a non-default +lighttpd configuration which enables mod_extforward and configures +mod_extforward to accept and parse the "Forwarded" header from a trusted +proxy. At this time, support for RFC7239 Forwarded is not common in CDN +providers or popular web server reverse proxies. It bears repeating that +for the user to desire to configure lighttpd mod_extforward to accept +"Forwarded", the user must also be using a trusted proxy (in front of +lighttpd) which understands and actively modifies the "Forwarded" header +sent to lighttpd. + +lighttpd natively supports RFC7239 "Forwarded" +hiawatha natively supports RFC7239 "Forwarded" + +nginx can be manually configured to add a "Forwarded" header +https://www.nginx.com/resources/wiki/start/topics/examples/forwarded/ + +A 64-bit build of lighttpd on x86_64 (not known to be affected by bug) +in front of another 32-bit lighttpd will detect and reject a malicious +"Forwarded" request header, thereby thwarting an attempt to trigger +this bug in an upstream 32-bit lighttpd. + +The following servers currently do not natively support RFC7239 Forwarded: +nginx +apache2 +caddy +node.js +haproxy +squid +varnish-cache +litespeed + +Given the general dearth of support for RFC7239 Forwarded in popular +CDNs and web server reverse proxies, and given the prerequisites in +lighttpd mod_extforward needed to reach this bug, the number of lighttpd +servers vulnerable to this bug is estimated to be vanishingly small. +Large systems using reverse proxies are likely running 64-bit lighttpd, +which is not known to be adversely affected by this bug. + +In the future, it is desirable for more servers to implement RFC7239 +Forwarded. lighttpd developers would like to thank povcfe for reporting +this bug so that it can be fixed before more CDNs and web servers +implement RFC7239 Forwarded. + +x-ref: + "mod_extforward plugin has out-of-bounds (OOB) write of 4-byte -1" + https://redmine.lighttpd.net/issues/3134 + (not yet written or published) + CVE-2022-22707 + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/8c62a890e23f5853b1a562b03fe3e1bccc6e7664] +Signed-off-by: Fabrice Fontaine +--- + src/mod_extforward.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mod_extforward.c b/src/mod_extforward.c +index 733231fd2..1a04befa6 100644 +--- a/src/mod_extforward.c ++++ b/src/mod_extforward.c +@@ -715,7 +715,7 @@ static handler_t mod_extforward_Forwarded (request_st * const r, plugin_data * c + while (s[i] == ' ' || s[i] == '\t') ++i; + if (s[i] == ';') { ++i; continue; } + if (s[i] == ',') { +- if (j >= (int)(sizeof(offsets)/sizeof(int))) break; ++ if (j >= (int)(sizeof(offsets)/sizeof(int))-1) break; + offsets[++j] = -1; /*("offset" separating params from next proxy)*/ + ++i; + continue; diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 5d53767263..eb9556e619 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -39,6 +39,9 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +# 0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch +LIGHTTPD_IGNORE_CVES += CVE-2022-22707 + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 22:07:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 23:07:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: fix static build Message-ID: <20220116220724.3460985-1-fontaine.fabrice@gmail.com> Fix the following static build failure raised since the addition of the package in commit 03ca6f4e39874583060317e7e15e9e360220877e: >>> liburing 2.1 Installing to staging directory PATH="/home/buildroot/autobuild/instance-3/output-1/host/bin:/home/buildroot/autobuild/instance-3/output-1/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-3/output-1/build/liburing-2.1 DESTDIR=/home/buildroot/autobuild/instance-3/output-1/host/arc-buildroot-linux-uclibc/sysroot install make[1]: Entering directory '/home/buildroot/autobuild/instance-3/output-1/build/liburing-2.1' sed -e "s%@prefix@%/usr%g" \ -e "s%@libdir@%/usr/lib%g" \ -e "s%@includedir@%/usr/include%g" \ -e "s%@NAME@%liburing%g" \ -e "s%@VERSION@%2.0%g" \ liburing.pc.in >liburing.pc make[2]: Entering directory '/home/buildroot/autobuild/instance-3/output-1/build/liburing-2.1/src' CC setup.os CC queue.os CC syscall.os CC register.os CC liburing.so.2.1.0 /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(__uClibc_main.os): in function `__uClibc_fini': __uClibc_main.c:(.text+0xa2): undefined reference to `__fini_array_start' Fixes: - http://autobuild.buildroot.org/results/54c67e0f5bd2b5f520a250dc13b5846f94fc1790 Signed-off-by: Fabrice Fontaine --- package/liburing/liburing.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index 74ce4156f8..874e268d43 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -30,11 +30,13 @@ define LIBURING_BUILD_CMDS endef define LIBURING_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D) \ + DESTDIR=$(STAGING_DIR) install endef define LIBURING_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D) \ + DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) -- 2.34.1 From james.hilliard1 at gmail.com Sun Jan 16 22:14:58 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 15:14:58 -0700 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <20220116230404.71f68dbb@c3po> References: <20220116230404.71f68dbb@c3po> Message-ID: On Sun, Jan 16, 2022 at 3:04 PM Danilo Bargen wrote: > > Hello folks > > I'm trying to create a new buildroot package (my first one). This is > what the makefile (tealdeer.mk) looks like: > > TEALDEER_VERSION = 1.5.0 > TEALDEER_SITE = $(call github,dbrgn,tealdeer,v$(TEALDEER_VERSION)) > TEALDEER_LICENSE = Apache-2.0 or MIT > TEALDEER_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT > $(eval $(cargo-package)) > > The URL should expand to > https://github.com/dbrgn/tealdeer/archive/v1.5.0/tealdeer-1.5.0.tar.gz. > To generate the checksum, I ran: > > $ sha256sum tealdeer-1.5.0.tar.gz > 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a tealdeer-1.5.0.tar.gz Just use the hash buildroot generated for you, it should be correct. > > I also added a hash file (tealdeer.hash): > > # Locally generated > sha256 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a tealdeer-1.5.0.tar.gz > sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE > sha256 a313b5e62b80a08f3aae0fa62ff3de8482ef55247299eb352ab44f87ef456b1b LICENSE-MIT > > When building this package, checksum verification fails every time. > > ERROR: tealdeer-1.5.0.tar.gz has wrong sha256 hash: > ERROR: expected: 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a > ERROR: got : 42febf9ee84721b9230077d62e2fc51201fd59624d3c776ccc1a634788768a60 Use this hash. > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > > No matter how I download the file (via wget, through the GitHub web UI, > etc), it always results in the SHA256 checksum starting with 009..., > but buildroot always thinks it should be 42f... I also tried changing > the TEALDEER_SITE variable as follows: Yeah, it's not going to match since buildroot is doing stuff like vendoring the cargo deps before generating the tarball(to ensure that the package can be built from the tarball without having to download anything additional from cargo): https://github.com/buildroot/buildroot/blob/master/support/download/cargo-post-process > > TEALDEER_SITE = https://github.com/dbrgn/tealdeer/archive/v$(TEALDEER_VERSION) > > ...to ensure that this URL is *really* being downloaded, but it fails > every time. > > Full build log can be found here: > https://gist.github.com/dbrgn/cc9e96051a079f5b63c531ca3c195954 You can see it vendoring the deps in the log here: https://gist.github.com/dbrgn/cc9e96051a079f5b63c531ca3c195954#file-gistfile1-txt-L23-L200 > > Does someone have any pointers why the hash verification would fail in > this case? It must be some obvious mistake I'm making, but I cannot > figure out what it is. > > Best regards, > Danilo Bargen > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From mail at dbrgn.ch Sun Jan 16 22:37:58 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Sun, 16 Jan 2022 23:37:58 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: References: <20220116230404.71f68dbb@c3po> Message-ID: <20220116233758.59918490@c3po> Hello James > Just use the hash buildroot generated for you, it should be correct. > (...) > Yeah, it's not going to match since buildroot is doing stuff like > vendoring the cargo deps before generating the tarball Ahh, that explains it. Does this mean that for Cargo based packages, it will always be TOFU and checksums provided by the project / maintainer cannot be used (because they will mismatch)? Danilo From james.hilliard1 at gmail.com Sun Jan 16 22:51:16 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 15:51:16 -0700 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <20220116233758.59918490@c3po> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> Message-ID: On Sun, Jan 16, 2022 at 3:38 PM Danilo Bargen wrote: > > Hello James > > > Just use the hash buildroot generated for you, it should be correct. > > (...) > > Yeah, it's not going to match since buildroot is doing stuff like > > vendoring the cargo deps before generating the tarball > > Ahh, that explains it. Does this mean that for Cargo based packages, it > will always be TOFU and checksums provided by the project / maintainer > cannot be used (because they will mismatch)? A maintainer could sign the tarball generated by buildroot and upload it to github releases if they want. As you can see the script will bail out if the tarball already has vendored deps: https://github.com/buildroot/buildroot/blob/6e4791b751c0f8e0ba218da2c22e71d3e1436b5d/support/download/cargo-post-process#L16-L19 So as long as the upstream release tarball has vendored deps the hash should not change AFAIU. > > Danilo From mail at dbrgn.ch Sun Jan 16 23:18:14 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 00:18:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/tealdeer: new package Message-ID: <20220117001814.2645cd1b@c3po> Tealdeer is a fast and full-featured tldr client. tldr pages are simplified and community-driven man pages, see https://tldr.sh/ for more information. https://github.com/dbrgn/tealdeer/ Signed-off-by: Danilo Bargen --- DEVELOPERS | 1 + package/Config.in | 1 + package/tealdeer/Config.in | 10 ++++++++++ package/tealdeer/tealdeer.hash | 4 ++++ package/tealdeer/tealdeer.mk | 12 ++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/tealdeer/Config.in create mode 100644 package/tealdeer/tealdeer.hash create mode 100644 package/tealdeer/tealdeer.mk diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..d2f23968d0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -643,6 +643,7 @@ N: Daniel Sangue F: package/libftdi1/ N: Danilo Bargen +F: package/tealdeer/ F: board/pcengines/apu2/ F: configs/pcengines_apu2_defconfig diff --git a/package/Config.in b/package/Config.in index 4df1474b91..6e5e69a4f1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2604,6 +2604,7 @@ menu "System tools" source "package/systemd-bootchart/Config.in" source "package/sysvinit/Config.in" source "package/tar/Config.in" + source "package/tealdeer/Config.in" source "package/thermald/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" diff --git a/package/tealdeer/Config.in b/package/tealdeer/Config.in new file mode 100644 index 0000000000..96ed81614b --- /dev/null +++ b/package/tealdeer/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_TEALDEER + bool "tealdeer" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + A fast and full-featured tldr client. tldr pages are + simplified and community-driven man pages, see + https://tldr.sh/ for more information. + + https://github.com/dbrgn/tealdeer/ diff --git a/package/tealdeer/tealdeer.hash b/package/tealdeer/tealdeer.hash new file mode 100644 index 0000000000..0e53174841 --- /dev/null +++ b/package/tealdeer/tealdeer.hash @@ -0,0 +1,4 @@ +# Locally generated +sha256 42febf9ee84721b9230077d62e2fc51201fd59624d3c776ccc1a634788768a60 tealdeer-1.5.0.tar.gz +sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE +sha256 a313b5e62b80a08f3aae0fa62ff3de8482ef55247299eb352ab44f87ef456b1b LICENSE-MIT diff --git a/package/tealdeer/tealdeer.mk b/package/tealdeer/tealdeer.mk new file mode 100644 index 0000000000..c396225098 --- /dev/null +++ b/package/tealdeer/tealdeer.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# tealdeer +# +################################################################################ + +TEALDEER_VERSION = 1.5.0 +TEALDEER_SITE = $(call github,dbrgn,tealdeer,v$(TEALDEER_VERSION)) +TEALDEER_LICENSE = Apache-2.0 or MIT +TEALDEER_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) -- 2.34.1 From festevam at gmail.com Mon Jan 17 02:05:53 2022 From: festevam at gmail.com (Fabio Estevam) Date: Sun, 16 Jan 2022 23:05:53 -0300 Subject: [Buildroot] [PATCH] configs/mx6sx_udoo_neo: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220117020553.749592-1-festevam@gmail.com> Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 Signed-off-by: Fabio Estevam --- configs/mx6sx_udoo_neo_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 3e1dc33bd4ba..793d992ce7a1 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -13,6 +13,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -- 2.25.1 From david.oberhollenzer at sigma-star.at Mon Jan 17 06:11:12 2022 From: david.oberhollenzer at sigma-star.at (David Oberhollenzer) Date: Mon, 17 Jan 2022 06:11:12 +0000 Subject: [Buildroot] [ANNOUNCE] mtd-utils-2.1.4 is released In-Reply-To: <20220110121715.GA6032@falbala.internal.home.lespocky.de> References: <20220110121715.GA6032@falbala.internal.home.lespocky.de> Message-ID: <816f8625-a002-e3b5-8065-c61e4affa431@sigma-star.at> Hi Alex, On 1/10/22 13:17, Alexander Dahl wrote: > I tried to verify the gpg signature, but I could not find a public > key. At https://keys.openpgp.org/ you only get a not working key: > > gpg: key BCE5DC3C741A02D1: new key but contains no user ID - skipped > I originally uploaded the key to the MTD Key Server: https://pgp.mit.edu/pks/lookup?op=get&search=0xBCE5DC3C741A02D1 using the key from there I can verify the tarball on a clean Debian VM. If I managed to tickle the new Thunderbird GPG support the right way (and Protonmail doesn't mangle it somehow), this mail should also be signed. > I also searched at http://www.linux-mtd.infradead.org/index.html and > could not find a key, could you please point us to a recent version? > Yes, that sounds like a good idea. I will look into updating the website and adding the key. Greetings, David -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenPGP_0xBCE5DC3C741A02D1.asc Type: application/pgp-keys Size: 2487 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenPGP_signature Type: application/pgp-signature Size: 505 bytes Desc: not available URL: From thomas.petazzoni at bootlin.com Mon Jan 17 06:59:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 17 Jan 2022 06:59:53 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-16 Message-ID: <20220117070001.B4A38401A2@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-16 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 66 | 8 | 0 | 74 | 2021.11.x | 30 | 3 | 0 | 33 | master | 104 | 38 | 0 | 142 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 7 host-riscv-isa-sim-1.1.0 | 6 guile-3.0.7 | 3 mesa3d-21.3.3 | 3 frr-8.1 | 2 gensio-2.2.9 | 2 ksmbd-tools-3.4.3 | 2 perl-5.34.0 | 2 babeltrace2-2.0.4 | 1 bat-0.18.3 | 1 bluez5_utils-5.63 | 1 liburing-2.1 | 1 log4cxx-0.12.0 | 1 mongodb-4.2.11 | 1 nodejs-14.18.2 | 1 pcsc-lite-1.9.5 | 1 qt5base-5.15.2 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | babeltrace2-2.0.4 | NOK | http://autobuild.buildroot.net/results/9ce563325410cddd58313fbf04420591e6815684 | i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/1d68b65f578d75bd27652de26d9b93a4b9c3f661 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d06d69a95fa298d7517b55977fbb98451809db78 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b55ffe8056c1819f9e8a9c88a8b52b8fe8458cb8 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7ee89dc6fc97b1f3514d1f0d6ceaef83686a11bf | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/a90da9d54d7c561bc067821ab0559fe32eae88b3 | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/e6c40e34812c6ab2a8c0e0f8bada59b5ddbcf68a | sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/4cfb36b4f05dbfcfbf127f30c96db41f8692edf2 | ORPH riscv64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/5aadc06cf03fc06ae21383c20f817cce8cc1436f | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/e1aa5789619af7567015d67ef969b34d594a5c2d | ORPH x86_64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/a99e56968e7cdc7889ebf1a0f0b45e5816c096d6 | arc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/372a39360c185f20c709aad861202b6a3e2b6412 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/c1f5bdf9da6653ec1ef8a43137e682a385647ea3 | i586 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/9f6785fc25524636ba0d32e95424a681a052cb42 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/89f5d2420a4d52879e7ef9900eb395928a00475f | riscv32 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/2977a8c7f3fc7d9c34dd8b234cc74eca132a1045 | riscv32 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/3b1b2e59d67cd81614730ba5914f05e55a6c084d | powerpc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/61d0c019ebcd0970c0a61bd495b1794a923c9730 | arc | liburing-2.1 | NOK | http://autobuild.buildroot.net/results/54c67e0f5bd2b5f520a250dc13b5846f94fc1790 | mips64el | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/0ff9765a96aee7dc8b5d8e49b7f2dbd645108709 | riscv64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/6f4139caf4c3c7239f1549fd8a633f60bd436584 | xtensa | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/491ed94925c81b8ce8c6e16540b7e6460dfbec54 | arm | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/47411c1a65184a59133fa140dda1ae8452c73345 | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/b7bf4257e98727f95106299847afff31d8eba32c | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/022f35125bdc63f05d726391043a3f9f548c4df3 | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/60b909cdb7b8d3086711ca1d8e8a775fdb43fe64 | ORPH arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/941a5e4dee27d44b1f1d643944fc368190c48f5c | arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/27280c26829a725aa621962c83e634da0277cc28 | x86_64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/428efda63532e16897d51dc85f30da9ae3df9d61 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b2044d07d71f5e03a0eac1810b12b9500915a3f4 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5896a5dcc9480aa24375bdbe5a62efaaa252b988 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/8594285cd48b41d19471dc9af70268dfb682054a | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/93aa01ccbbdc58222f928ca8197a726d29efd00a | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c8ab63c451b60650e2f5ae4b9ed34b18c91c168a | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6480fa751d44ecc9c8700687490e37f66513d821 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9137546d039c6387a40b2028e84ca2650f89acf9 | arm | unknown | NOK | http://autobuild.buildroot.net/results/4c4e11bb5766d59d5369e47453ed5e6e303c9cf0 | sparc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/df245d7530e527c81db8ab843f20dda95653355d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 zeromq-4.3.4 | 2 gensio-2.2.3 | 1 gnuradio-3.8.1.0 | 1 mesa3d-20.3.5 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/67826e60c6b7c348baf815d2ad2237f0f367ec1a | sh4 | gnuradio-3.8.1.0 | NOK | http://autobuild.buildroot.net/results/283389f13740f6959173b1ee267c7867456ea268 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/67f177ed41acd7b6dd6a49c6df47b56b9a89aee4 | arc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e28ed95e37ec4c85a8a31617c24d58b998f5e24e | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/6d491bc6eeb1f4690b3c015b70dcfc7ba5c4d670 | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/0fcf92fdd1c4693bbe3eb505791c5bf2e4ab3783 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/be2f09eb2330b55c26bcee0e273e2d6b44124a15 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/46ef40ed721f5dc2a4f271b54c53255d361d25e1 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 1 libqmi-1.30.2 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/f85424157a5fdab398ba118c75d51474dced92bb | powerpc64le | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/d68c44928da5a1f7025fd005905ee8f5b0d3d287 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7c37b79f66d9b2daa284ee9cd5095d9fbcefc5d5 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- acpica | DISTRO | https://release-monitoring.org/project/00018 | 20200717 | 20211217 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 41.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.3.1 | 4.5.2 | alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.6 | 1.2.6.1 | alsa-plugins | DISTRO | https://release-monitoring.org/project/00041 | 1.2.5 | 1.2.6 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 12.0.0_r27 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.0 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.42.0 | avro-c | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.10 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 19.03.14 | 20.10.11 | ORPH bash | DISTRO | https://release-monitoring.org/project/00166 | 5.1 | 5.1.16 | ORPH bat | DISTRO | https://release-monitoring.org/project/241901 | 0.18.3 | 0.19.0 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2021.4 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.1 | 2021.4 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.5.0 | bcg729 | DISTRO | https://release-monitoring.org/project/14743 | 1.0.4 | 1.1.1 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.0.66 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.66 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.66 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.4 | ORPH bind | DISTRO | https://release-monitoring.org/project/14923 | 9.11.36 | 9.17.21 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.37 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 22.0 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.1.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.15.1 | 5.16 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.09 | 3.21 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.34.1 | 1.35.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.7 | 0.5.9 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.4 | 0.5.5 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.4 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.5.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.4.34 | 1.4.36 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.1 | 4.2 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.13 | 6.14 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.17.1 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.4 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.0 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.1 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.1 | 4.3.2 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.8 | 1.5.9 | cryptsetup | DISTRO | https://release-monitoring.org/project/13709 | 2.4.2 | 2.4.3 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.10 | 1.28.11 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.2.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.11.3 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.2.1 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.0.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.5 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.6.1 | 1.8.0 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20211214 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.11 | 20.10.12 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.11 | 20.10.12 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 37 | 38 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.0 | 1.26.1 | eigen | DISTRO | https://release-monitoring.org/project/00666 | 3.3.7 | 3.4.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 20.07 | 21.12 | elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.13.2 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.0 | 0.25.1 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.17 | 1.0.21 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-idna | DISTRO | https://release-monitoring.org/project/45374 | 6.0.0 | 6.1.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.9.0 | 1.11.2 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.6.10 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.9 | 1.0.16 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.25 | 1.0.29 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.10 | 1.0.14 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.7 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.6 | 1.0.8 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.38 | 1.0.45 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.23 | 1.0.27 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.39 | 1.2.0 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.9 | 1.1.13 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.20 | 1.0.24 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.44 | 1.1.48 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.4.10 | 1.5.6 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.28 | 1.0.32 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.8 | 1.0.12 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.9 | 1.0.10 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.3 | 1.4 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.8.0.1 | 2.8.2.0 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.8 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.24 | 6.4.26 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.1 | 5.0 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.29 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.16.1 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.2 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | fsl-sdk-v2.0 | 0.2.0 | fmt | DISTRO | https://release-monitoring.org/project/11526 | 8.0.1 | 8.1.1 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 5.15.4 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.94 | ORPH fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 21.12.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.10 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdk-pixbuf | DISTRO | https://release-monitoring.org/project/09533 | 2.42.4 | 2.42.6 | ORPH gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.2.9 | 2.3.5 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.53.3 | 9.55.0 | git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.34.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.66.0 | 2.70.1 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.70.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.10 | 3.0.14 | gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.2.32 | 2.3.4 | ORPH gnuplot | DISTRO | https://release-monitoring.org/project/01216 | 5.4.2 | 5.4.3 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.8.2.0 | 3.10.0.0 | gocryptfs | DISTRO | https://release-monitoring.org/project/21085 | 2.2.0 | 2.2.1 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.4 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grub2 | DISTRO | https://release-monitoring.org/project/01257 | 2.04 | 2.06 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 41.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gst-omx | DISTRO | https://release-monitoring.org/project/21845 | 1.18.5 | 1.19.3 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.5 | 1.19.3 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-libav | DISTRO | https://release-monitoring.org/project/21848 | 1.18.5 | 1.19.3 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.5 | 1.19.3 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.2 | ORPH gtkmm3 | DISTRO | https://release-monitoring.org/project/07963 | 3.22.0 | 4.4.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.2 | 1.4.3 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.49.1 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2018.01.1 | 2021.03.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.4.8 | 2.5.1 | haveged | DISTRO | https://release-monitoring.org/project/11695 | 1.9.15 | 1.9.17 | hdparm | DISTRO | https://release-monitoring.org/project/01304 | 9.62 | 9.63 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.11.2 | ORPH hostapd | DISTRO | https://release-monitoring.org/project/01325 | 2.9 | 2.10 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.21.12 | ORPH hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.354 | 0.355 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.4.1 | 2.7.0 | ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.36+nmu1 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.7.5 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.21.9.6 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 22.1.0 | 22.1.1 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.492 | 3.493 | ipmiutil | DISTRO | https://release-monitoring.org/project/01391 | 3.1.7 | 3.1.8 | iproute2 | DISTRO | https://release-monitoring.org/project/01392 | 5.15.0 | 5.16.0 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | isl | DISTRO | https://release-monitoring.org/project/13286 | 0.23 | 0.24 | ORPH jack1 | DISTRO | https://release-monitoring.org/project/59394 | 0.125.0 | 0.126.0 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.17 | 1.9.20 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.28 | 2.0.33 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.4 | 1.6 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.3 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.10.4 | 1.13.0 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.0 | json-glib | DISTRO | https://release-monitoring.org/project/13144 | 1.4.4 | 1.6.6 | ORPH jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.2.2 | 3.7.1 | keepalived | DISTRO | https://release-monitoring.org/project/01504 | 2.1.4 | 2.2.7 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.4.1-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.4-Ma... | 20.2.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.6-Ma... | 20.2.3-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.1.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.10-M... | 20.2.1-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.2.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.2-Ma... | 20.1.0-Nexus | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 1.2.0 | 2.1.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | lft | DISTRO | https://release-monitoring.org/project/21863 | 3.8 | 3.91 | ORPH libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.25 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.4.0 | 0.6.1 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 2.0 | libcodec2 | DISTRO | https://release-monitoring.org/project/14605 | 1.0.1 | 1.03 | libev | DISTRO | https://release-monitoring.org/project/01605 | 4.27 | 4.33 | ORPH libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgeos | DISTRO | https://release-monitoring.org/project/13493 | 3.10.1 | 3.10.2 | libgeotiff | DISTRO | https://release-monitoring.org/project/21361 | 1.6.0 | 1.7.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.2 | 3.3.6 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.68.4 | 2.70.2 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.3.2 | 1.4.0 | ORPH libgpg-error | DISTRO | https://release-monitoring.org/project/01628 | 1.42 | 1.43 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.28 | ORPH libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.6.0 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.37 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.12 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.16 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.0 | libjpeg | DISTRO | https://release-monitoring.org/project/21362 | 9d | 9e | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.1 | 0.11.3 | libmhash | DISTRO | https://release-monitoring.org/project/21488 | 0.9.9.9 | 1.4 | ORPH libminiupnpc | DISTRO | https://release-monitoring.org/project/01986 | 2.1.20201016 | 2.2.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.6 | 3.1.7 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.1.5 | 4.2.1 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.10 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 1.1.1m | 3.0.1 | libpagekite | DISTRO | https://release-monitoring.org/project/21366 | 0.91.190530 | 0.91.201110 | libpam-radius-auth | DISTRO | https://release-monitoring.org/project/57834 | 1.4.0 | 2.0.0 | ORPH libpjsip | DISTRO | https://release-monitoring.org/project/15701 | 2.10 | 2.11.1 | libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.0 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.5.0 | 1.6.0 | libqb | DISTRO | https://release-monitoring.org/project/09399 | 2.0.3 | 2.0.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.5 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigsegv | DISTRO | https://release-monitoring.org/project/01722 | 2.13 | 2.14 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.0 | 3.0.4 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.1 | 2.4.2 | libss7 | DISTRO | https://release-monitoring.org/project/21690 | 2.0.0 | 2.0.1 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.5 | libuhttpd | DISTRO | https://release-monitoring.org/project/89386 | 3.12.1 | 3.14.1 | libunistring | DISTRO | https://release-monitoring.org/project/01747 | 0.9.10 | 1.0 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.5.0 | 1.6.2 | ORPH libuv | DISTRO | https://release-monitoring.org/project/10784 | 1.42.0 | 1.43.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.1 | libvirt | DISTRO | https://release-monitoring.org/project/224041 | 7.10.0 | 8.0.0 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.0.21 | 4.3.0 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.26 | 4.4.27 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.66 | ORPH live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.01.11 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.9 | 1.0.13 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.12.0 | 0.12.1 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.18.0 | 3.19.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.3 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.8 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.3 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.12 | 2.03.14 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.3 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.30 | 10.7.1 | ORPH matchbox-keyboard | DISTRO | https://release-monitoring.org/project/230595 | 0.1 | 0.1.1 | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.0 | 3.1.0 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.4.0 | 0.1.5.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.0.66 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.12 | 1.6.13 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 5.31b | memtester | DISTRO | https://release-monitoring.org/project/01967 | 4.5.0 | 4.5.1 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 21.3.3 | 21.3.4 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 21.3.3 | 21.3.4 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.42.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2021.12 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20190618 | 20210805 | ORPH moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.8.1 | 0.9.3 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.16.10 | 1.18.4 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.11 | 5.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.5 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.30.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.165 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.0 | 2.5.1 | mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.29.3 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.34.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 4.0.3 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.14 | 1.8.19 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtd | DISTRO | https://release-monitoring.org/project/02026 | 2.1.3 | 2.1.4 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.36 | 4.0.37 | mtr | DISTRO | https://release-monitoring.org/project/02029 | 0.94 | 0.95 | ORPH mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.0.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220115 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.30.2 | 0.32.2 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | debian_1.... | 1.218 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.32.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.6.1 | 0.7.3 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9 | 5.9.1 | ORPH network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.32.12 | 1.34.0 | ORPH network-manager-openvpn | DISTRO | https://release-monitoring.org/project/69977 | 1.8.14 | 1.8.16 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.46.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.5 | nmon | DISTRO | https://release-monitoring.org/project/02097 | 16m | 16n | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.2 | 17.3.1 | nss-mdns | DISTRO | https://release-monitoring.org/project/05491 | 0.14.1 | 0.15.1 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.132 | 390.147 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 510.39.01 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 1.16 | ORPH ocf-linux | DISTRO | https://release-monitoring.org/project/21541 | 20120127 | 20171122 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.31 | 1.34 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.2.4 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.3 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.19 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.5.5 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.7.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.13+8 | 19+5 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.11.0 | 6.12.0 | openldap | DISTRO | https://release-monitoring.org/project/02551 | 2.4.59 | 2.6.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.2 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.44.10 | opentracing-cpp | DISTRO | https://release-monitoring.org/project/21553 | 1.5.1 | 1.6.0 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 10.3.5-10... | 11.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.5.0 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.27 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.0.66 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.5.1 | 1.5.2 | p11-kit | DISTRO | https://release-monitoring.org/project/02582 | 0.23.22 | 0.24.0 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.0 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH parted | DISTRO | https://release-monitoring.org/project/02596 | 3.3 | 3.4 | patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.9 | 0.14.3 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.3 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202112 | ORPH perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-guess | DISTRO | https://release-monitoring.org/project/17375 | 0.12 | 0.14 | perl-crypt-openssl-rsa | DISTRO | https://release-monitoring.org/project/02748 | 0.31 | 0.32 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.85 | 6.86 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-http-message | DISTRO | https://release-monitoring.org/project/02977 | 6.33 | 6.36 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.072 | 2.074 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.57 | 6.60 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20200907 | perl-net-dns | DISTRO | https://release-monitoring.org/project/03147 | 1.32 | 1.33 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.85 | 1.92 | perl-path-tiny | DISTRO | https://release-monitoring.org/project/11962 | 0.120 | 0.122 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-try-tiny | DISTRO | https://release-monitoring.org/project/11921 | 0.30 | 0.31 | perl-uri | DISTRO | https://release-monitoring.org/project/03485 | 5.09 | 5.10 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0207 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.0.14 | 8.1.1 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.21 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-imagick | DISTRO | https://release-monitoring.org/project/17401 | 3.5.0 | 3.7.0 | ORPH php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.1.2 | php-yaml | DISTRO | https://release-monitoring.org/project/12515 | 2.2.1 | 2.2.2 | ORPH pigpio | DISTRO | https://release-monitoring.org/project/21577 | 79 | 7301 | pigz | DISTRO | https://release-monitoring.org/project/03642 | 2.6 | 2.7 | pinentry | DISTRO | https://release-monitoring.org/project/03643 | 1.1.1 | 1.2.0 | ORPH pkcs11-helper | DISTRO | https://release-monitoring.org/project/91990 | 1.27 | 1.28 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.8.0 | ORPH poco | DISTRO | https://release-monitoring.org/project/05418 | 1.10.1 | 1.11.1 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.01.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.8 | 1.3.9 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.14 | proftpd | DISTRO | https://release-monitoring.org/project/07609 | 1.3.6e | 1.3.7c | proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 8.2.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.11 | 0.11.12 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.3 | protozero | DISTRO | https://release-monitoring.org/project/08002 | 1.7.0 | 1.7.1 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.15 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 14.2 | 15.0 | python-aenum | DISTRO | https://release-monitoring.org/project/34074 | 3.1.0 | 3.1.5 | python-aioblescan | DISTRO | https://release-monitoring.org/project/21242 | 0.2.8 | 0.2.12 | python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.1 | 0.4.3 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiojobs | DISTRO | https://release-monitoring.org/project/21252 | 0.3.0 | 1.0.0 | python-alsaaudio | DISTRO | https://release-monitoring.org/project/10072 | 0.8.4 | 0.9.0 | python-argon2-cffi | DISTRO | https://release-monitoring.org/project/33377 | 21.1.0 | 21.3.0 | python-arrow | DISTRO | https://release-monitoring.org/project/05314 | 1.2.0 | 1.2.1 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.4.1 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 21.2.0 | 21.4.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 21.3.1 | 21.11.1 | python-avro | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | python-bidict | DISTRO | https://release-monitoring.org/project/114352 | 0.21.3 | 0.21.4 | python-bleak | DISTRO | https://release-monitoring.org/project/26271 | 0.12.1 | 0.14.1 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.37 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.37 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2021.5.30 | 2021.10.8 | python-channels | DISTRO | https://release-monitoring.org/project/21937 | 2.3.1 | 3.0.4 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 2.4.1 | 3.3.1 | python-charset-normalizer | DISTRO | https://release-monitoring.org/project/55366 | 2.0.7 | 2.0.10 | python-cheroot | DISTRO | https://release-monitoring.org/project/20163 | 8.2.1 | 8.6.0 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 12.0.1 | 18.6.1 | python-click | DISTRO | https://release-monitoring.org/project/03802 | 7.1.2 | 8.0.3 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.4.1 | 6.6.0 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 1.0.2 | 2.3.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python-daemon | DISTRO | https://release-monitoring.org/project/03816 | 2.2.3 | 2.3.0 | python-daphne | DISTRO | https://release-monitoring.org/project/21939 | 2.4.1 | 3.0.2 | python-dataproperty | DISTRO | https://release-monitoring.org/project/21697 | 0.53.0 | 0.54.2 | python-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog | DISTRO | https://release-monitoring.org/project/03823 | 3.4.0 | 3.5.3 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 3.2.11 | 4.0.1 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 4.1.0 | 5.0.3 | python-docutils | DISTRO | https://release-monitoring.org/project/03849 | 0.15.2 | 0.18.1 | python-ecdsa | DISTRO | https://release-monitoring.org/project/08370 | 0.17.0 | 0.18.0b2 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.2.1 | 4.3.1 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.4.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.2 | python-flask-expects-json | DISTRO | https://release-monitoring.org/project/127659 | 1.5.0 | 1.7.0 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 0.3.1 | 2.1.0 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 2.4.1 | 2.5.1 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 0.15.1 | 1.0.0 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.28.2 | 4.28.5 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.26 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.9 | python-httplib2 | DISTRO | https://release-monitoring.org/project/03887 | 0.19.1 | 0.20.2 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.13.1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.2 | 3.3 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.28.0 | 8.0.0b1 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 1.1.0 | 2.0.1 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-janus | DISTRO | https://release-monitoring.org/project/56567 | 0.6.1 | 1.0.0 | python-jaraco-classes | DISTRO | https://release-monitoring.org/project/20150 | 2.0 | 3.2.1 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 2.0 | 3.5.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.0.2 | 3.0.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 2.5.1 | 4.4.0 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 19.2.0 | 23.5.0 | python-kiwisolver | DISTRO | https://release-monitoring.org/project/16910 | 1.1.0 | 1.3.2 | python-lmdb | DISTRO | https://release-monitoring.org/project/15512 | 1.2.1 | 1.3.0 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.6.5 | 4.7.1 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.1.5 | 1.1.6 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.3.4 | 3.3.6 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.1 | 2.4.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.5.1 | python-memory-profiler | DISTRO | https://release-monitoring.org/project/38508 | 0.58.0 | 0.60.0 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 0.8.4 | 2.0.2 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 8.10.0 | 8.12.0 | python-msgfy | DISTRO | https://release-monitoring.org/project/29716 | 0.1.0 | 0.2.0 | python-msgpack | DISTRO | https://release-monitoring.org/project/21831 | 1.0.2 | 1.0.3 | python-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-nfc | DISTRO | https://release-monitoring.org/project/21829 | 0.13.5 | 1.0.3 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.1 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 0.8.4 | 0.98.9 | python-paho-mqtt | DISTRO | https://release-monitoring.org/project/06084 | 1.4.0 | 1.6.1 | python-pam | DISTRO | https://release-monitoring.org/project/05725 | 0.5.0 | 1.8.4 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | python-pathlib2 | DISTRO | https://release-monitoring.org/project/12723 | 2.3.5 | 2.3.6 | python-pathpy | DISTRO | https://release-monitoring.org/project/21703 | 12.0.1 | 12.5.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.6.0 | 5.8.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 8.4.0 | 9.0.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 21.3.1 | python-portend | DISTRO | https://release-monitoring.org/project/20203 | 2.5 | 3.1.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.20 | 3.0.24 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.3 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python-psycopg2 | DISTRO | https://release-monitoring.org/project/03979 | 2.9.1 | 2.9.3 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2021.1 | 2022.1 | python-py | DISTRO | https://release-monitoring.org/project/03981 | 1.10.0 | 1.11.0 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0a2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.5 | 1.5.6 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.7.4 | 2.11.2 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.2 | 2.0.3 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 1.9.7 | 2.8 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.19.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 2.2.0 | 2.5.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.18.14 | 1.19.4 | python-pynacl | DISTRO | https://release-monitoring.org/project/12703 | 1.4.0 | 1.5.0 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 19.1.0 | 21.0.0 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.11.6 | 3.11.7 | python-pyphen | DISTRO | https://release-monitoring.org/project/19681 | 0.11.0 | 0.12.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.7 | 5.15.6 | python-pyro | DISTRO | https://release-monitoring.org/project/19993 | 3.16 | 4.82 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.5 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.1 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.17.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2019.3 | 2021.3 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | python-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 19.0.2 | 22.3.0 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 3.5.3 | 4.1.0 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.26.0 | 2.27.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.1 | python-rsa | DISTRO | https://release-monitoring.org/project/08808 | 4.7.2 | 4.8 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.2 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 18.1.0 | 21.1.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 44.0.0 | 60.5.0 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.17.5 | 3.17.6 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 0.45.2 | 1.3.0 | python-singledispatch | DISTRO | https://release-monitoring.org/project/12013 | 3.4.0.3 | 3.7.0 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.18 | 5.0.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 4.0.0 | 5.0.0 | python-snappy | DISTRO | https://release-monitoring.org/project/07203 | 0.5.4 | 0.6.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.1 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.2.1 | 2.3.1 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.3.10 | 1.4.29 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.2.0 | 1.2.1 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.3.0 | 0.4.2 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 1.14.1 | 5.0.0 | python-terminaltables | DISTRO | https://release-monitoring.org/project/15542 | 3.1.0 | 3.1.10 | python-thrift | DISTRO | https://release-monitoring.org/project/21614 | 0.13.0 | 0.15.0 | python-tinycss2 | DISTRO | https://release-monitoring.org/project/16655 | 1.1.0 | 1.1.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.1 | 1.1.3 | python-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.0 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.0.4 | 6.1 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.40.1 | 4.62.3 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.1.0 | 5.1.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 20.3.0 | 21.5.0 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 20.3.0 | 21.7.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.0.1 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 4.2.0 | 5.1.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.7 | 1.26.8 | python-validators | DISTRO | https://release-monitoring.org/project/19818 | 0.15.0 | 0.18.2 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.1.9 | 0.2.5 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 53.4 | 54.0b1 | python-webpy | DISTRO | https://release-monitoring.org/project/04090 | 0.40 | 0.62 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 0.58.0 | 1.2.3 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.2 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.12.1 | 1.13.3 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 2.3.3 | 3.0.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.27 | 0.31 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.1 | 3.0.2 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.1 | python3 | DISTRO | https://release-monitoring.org/project/13254 | 3.10.1 | 3.10.2 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python3-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 59.8.0 | 60.5.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt53d | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5base | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5charts | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5connectivity | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5declarative | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5graphicaleffects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5imageformats | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5location | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5lottie | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5multimedia | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols2 | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quicktimeline | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5remoteobjects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5script | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5scxml | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5sensors | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialbus | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialport | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5svg | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5tools | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5virtualkeyboard | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5wayland | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webchannel | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.212.0-a... | 6.2.2 | qt5websockets | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webview | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5x11extras | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5xmlpatterns | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.1 | 1.2 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-server | DISTRO | https://release-monitoring.org/project/05585 | 3.8.2 | 3.9.12 | ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | readline | DISTRO | https://release-monitoring.org/project/04173 | 8.1 | 8.1.2 | ORPH restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.4 | 1.10.5 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.27.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2112.0 | rtai | DISTRO | https://release-monitoring.org/project/21658 | 4.0.1 | 5.3 | ORPH rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.0.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.58.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.58.0 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.10.0.3 | 2.11.0.1 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.1 | 2.3.5.3 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.6.3 | 1.0.7.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.5.1.5 | 2.5.1.7 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.4.1.1 | 2.5.1.0 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.3.2 | 2.2.3.4 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.2.2 | 0.5.3.0 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.3.0 | sdbus-cpp | DISTRO | https://release-monitoring.org/project/70626 | 0.8.3 | 1.1.0 | sdl2 | DISTRO | https://release-monitoring.org/project/04779 | 2.0.18 | 2.0.20 | sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.0.15 | 2.0.18 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | sedutil | DISTRO | https://release-monitoring.org/project/15203 | 1.15.1 | 1.20.0 | sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 1.59.0 | 1.71.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.13 | sg3_utils | DISTRO | https://release-monitoring.org/project/04801 | 1.47 | 1.47r915 | shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.1 | ORPH skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.10.0.3 | 2.11.1.0 | sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.4.7 | 1.4.10 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.2 | 3.4.8 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.18.0 | 3.1.20.0 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | speexdsp | DISTRO | https://release-monitoring.org/project/08419 | SpeexDSP-... | 1.2.0 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.1 | 3.37.2 | sshfs | DISTRO | https://release-monitoring.org/project/11058 | 3.7.1 | 3.7.2 | ORPH start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.1 | ORPH startup-notification | DISTRO | https://release-monitoring.org/project/10089 | 0.9 | 0.12 | ORPH strace | DISTRO | https://release-monitoring.org/project/04897 | 5.15 | 5.16 | stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.4 | 1.0.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.61 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.4 | ORPH synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.23.1 | 0.28.0 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.34.1 | 3.35.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.42.1 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.4.2 | 12.5.5 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.01 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.4.6 | 2.4.8 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.15.0 | ORPH tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.2a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 2.4.0 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | trace-cmd... | 2.9.4 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.1 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2022.01 | udpcast | DISTRO | https://release-monitoring.org/project/10206 | 20200328 | 20211207 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.10 | 0.11 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 3.15.0.0 | 4.1.0.5 | umtprd | DISTRO | https://release-monitoring.org/project/46129 | 1.3.10 | 1.6.2 | unclutter-xfixes | DISTRO | https://release-monitoring.org/project/09206 | 1.5 | 1.6 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 2.2 | upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | uvw | DISTRO | https://release-monitoring.org/project/33083 | 2.10.0_li... | 2.11.0_li... | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.55.1 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4092 | 8.2.4115 | ORPH vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.22 | 3.2.27 | waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.6.1 | 1.7.0 | wayland | DISTRO | https://release-monitoring.org/project/10061 | 1.19.0 | 1.20.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.23 | 1.24 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.32.4 | 2.34.3 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.10 | 5.5.11 | wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 6.23 | wireguard-linux-compat | DISTRO | https://release-monitoring.org/project/62379 | 1.0.20210606 | 1.0.20211208 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.2 | 0.4.7 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.11 | 3.6.1 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.0 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.1.1 | wpa_supplicant | DISTRO | https://release-monitoring.org/project/05146 | 2.9 | 2.10 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.3 | 2.35.1 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20220111 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 21.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.3 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xml-security-c | DISTRO | https://release-monitoring.org/project/05197 | 2.0.2 | 2.0.4 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 5.45 | 6.02 | xserver_xorg-server | DISTRO | https://release-monitoring.org/project/05250 | 21.1.2 | 21.1.3 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.17 | 3.18 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.0 | 0.3.1 | yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | zynq-boot-bin | DISTRO | https://release-monitoring.org/project/21623 | 2015.1 | 2021.2 | ORPH Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 dnsmasq | CVE-2021-45951 | https://security-tracker.debian.org/tracker/CVE-2021-45951 dnsmasq | CVE-2021-45952 | https://security-tracker.debian.org/tracker/CVE-2021-45952 dnsmasq | CVE-2021-45953 | https://security-tracker.debian.org/tracker/CVE-2021-45953 dnsmasq | CVE-2021-45954 | https://security-tracker.debian.org/tracker/CVE-2021-45954 dnsmasq | CVE-2021-45955 | https://security-tracker.debian.org/tracker/CVE-2021-45955 dnsmasq | CVE-2021-45956 | https://security-tracker.debian.org/tracker/CVE-2021-45956 dnsmasq | CVE-2021-45957 | https://security-tracker.debian.org/tracker/CVE-2021-45957 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 bash | CVE-2019-18276 | https://security-tracker.debian.org/tracker/CVE-2019-18276 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-3487 | https://security-tracker.debian.org/tracker/CVE-2021-3487 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bird | CVE-2021-26928 | https://security-tracker.debian.org/tracker/CVE-2021-26928 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2021-42376 | https://security-tracker.debian.org/tracker/CVE-2021-42376 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 civetweb | CVE-2020-27304 | https://security-tracker.debian.org/tracker/CVE-2020-27304 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exim | CVE-2021-38371 | https://security-tracker.debian.org/tracker/CVE-2021-38371 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2020-35965 | https://security-tracker.debian.org/tracker/CVE-2020-35965 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 flatbuffers | CVE-2020-35864 | https://security-tracker.debian.org/tracker/CVE-2020-35864 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41157 | https://security-tracker.debian.org/tracker/CVE-2021-41157 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-27645 | https://security-tracker.debian.org/tracker/CVE-2021-27645 glibc | CVE-2021-33574 | https://security-tracker.debian.org/tracker/CVE-2021-33574 glibc | CVE-2021-38604 | https://security-tracker.debian.org/tracker/CVE-2021-38604 gnuchess | CVE-2021-30184 | https://security-tracker.debian.org/tracker/CVE-2021-30184 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 go | CVE-2021-29923 | https://security-tracker.debian.org/tracker/CVE-2021-29923 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2020-6624 | https://security-tracker.debian.org/tracker/CVE-2020-6624 jhead | CVE-2020-6625 | https://security-tracker.debian.org/tracker/CVE-2020-6625 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2021-42917 | https://security-tracker.debian.org/tracker/CVE-2021-42917 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libesmtp | CVE-2019-19977 | https://security-tracker.debian.org/tracker/CVE-2019-19977 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libnss | CVE-2021-43527 | https://security-tracker.debian.org/tracker/CVE-2021-43527 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libressl | CVE-2021-41581 | https://security-tracker.debian.org/tracker/CVE-2021-41581 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 liburiparser | CVE-2021-46141 | https://security-tracker.debian.org/tracker/CVE-2021-46141 liburiparser | CVE-2021-46142 | https://security-tracker.debian.org/tracker/CVE-2021-46142 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 monkey | CVE-2013-1771 | https://security-tracker.debian.org/tracker/CVE-2013-1771 monkey | CVE-2013-2183 | https://security-tracker.debian.org/tracker/CVE-2013-2183 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 mutt | CVE-2021-32055 | https://security-tracker.debian.org/tracker/CVE-2021-32055 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 network-manager | CVE-2021-20297 | https://security-tracker.debian.org/tracker/CVE-2021-20297 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvpn | CVE-2021-3606 | https://security-tracker.debian.org/tracker/CVE-2021-3606 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php-imagick | CVE-2019-11037 | https://security-tracker.debian.org/tracker/CVE-2019-11037 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-autobahn | CVE-2020-35678 | https://security-tracker.debian.org/tracker/CVE-2020-35678 python-cryptography | CVE-2020-36242 | https://security-tracker.debian.org/tracker/CVE-2020-36242 python-django | CVE-2021-45115 | https://security-tracker.debian.org/tracker/CVE-2021-45115 python-django | CVE-2021-45116 | https://security-tracker.debian.org/tracker/CVE-2021-45116 python-django | CVE-2021-45452 | https://security-tracker.debian.org/tracker/CVE-2021-45452 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2020-35503 | https://security-tracker.debian.org/tracker/CVE-2020-35503 qemu | CVE-2020-35504 | https://security-tracker.debian.org/tracker/CVE-2020-35504 qemu | CVE-2020-35505 | https://security-tracker.debian.org/tracker/CVE-2020-35505 qemu | CVE-2020-35506 | https://security-tracker.debian.org/tracker/CVE-2020-35506 qemu | CVE-2020-35517 | https://security-tracker.debian.org/tracker/CVE-2020-35517 qemu | CVE-2021-20181 | https://security-tracker.debian.org/tracker/CVE-2021-20181 qemu | CVE-2021-20196 | https://security-tracker.debian.org/tracker/CVE-2021-20196 qemu | CVE-2021-20203 | https://security-tracker.debian.org/tracker/CVE-2021-20203 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-20263 | https://security-tracker.debian.org/tracker/CVE-2021-20263 qemu | CVE-2021-3392 | https://security-tracker.debian.org/tracker/CVE-2021-3392 qemu | CVE-2021-3409 | https://security-tracker.debian.org/tracker/CVE-2021-3409 qemu | CVE-2021-3416 | https://security-tracker.debian.org/tracker/CVE-2021-3416 qemu | CVE-2021-3507 | https://security-tracker.debian.org/tracker/CVE-2021-3507 qemu | CVE-2021-3527 | https://security-tracker.debian.org/tracker/CVE-2021-3527 qemu | CVE-2021-3544 | https://security-tracker.debian.org/tracker/CVE-2021-3544 qemu | CVE-2021-3545 | https://security-tracker.debian.org/tracker/CVE-2021-3545 qemu | CVE-2021-3546 | https://security-tracker.debian.org/tracker/CVE-2021-3546 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 qpid-proton | CVE-2016-2166 | https://security-tracker.debian.org/tracker/CVE-2016-2166 qpid-proton | CVE-2016-4467 | https://security-tracker.debian.org/tracker/CVE-2016-4467 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2021-28966 | https://security-tracker.debian.org/tracker/CVE-2021-28966 rust | CVE-2021-29922 | https://security-tracker.debian.org/tracker/CVE-2021-29922 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2021-3156 | https://security-tracker.debian.org/tracker/CVE-2021-3156 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tools | CVE-2021-3565 | https://security-tracker.debian.org/tracker/CVE-2021-3565 uboot-tools | CVE-2021-27097 | https://security-tracker.debian.org/tracker/CVE-2021-27097 uboot-tools | CVE-2021-27138 | https://security-tracker.debian.org/tracker/CVE-2021-27138 util-linux | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 util-linux-libs | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4187 | https://security-tracker.debian.org/tracker/CVE-2021-4187 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 vim | CVE-2022-0128 | https://security-tracker.debian.org/tracker/CVE-2022-0128 vim | CVE-2022-0156 | https://security-tracker.debian.org/tracker/CVE-2022-0156 vim | CVE-2022-0158 | https://security-tracker.debian.org/tracker/CVE-2022-0158 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 webkitgtk | CVE-2021-45481 | https://security-tracker.debian.org/tracker/CVE-2021-45481 webkitgtk | CVE-2021-45482 | https://security-tracker.debian.org/tracker/CVE-2021-45482 webkitgtk | CVE-2021-45483 | https://security-tracker.debian.org/tracker/CVE-2021-45483 wget | CVE-2021-31879 | https://security-tracker.debian.org/tracker/CVE-2021-31879 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wireshark | CVE-2021-4185 | https://security-tracker.debian.org/tracker/CVE-2021-4185 wireshark | CVE-2021-4186 | https://security-tracker.debian.org/tracker/CVE-2021-4186 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 liburiparser | CVE-2021-46141 | https://security-tracker.debian.org/tracker/CVE-2021-46141 liburiparser | CVE-2021-46142 | https://security-tracker.debian.org/tracker/CVE-2021-46142 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-django | CVE-2021-45115 | https://security-tracker.debian.org/tracker/CVE-2021-45115 python-django | CVE-2021-45116 | https://security-tracker.debian.org/tracker/CVE-2021-45116 python-django | CVE-2021-45452 | https://security-tracker.debian.org/tracker/CVE-2021-45452 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2021-36690 | https://security-tracker.debian.org/tracker/CVE-2021-36690 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4187 | https://security-tracker.debian.org/tracker/CVE-2021-4187 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 vim | CVE-2022-0128 | https://security-tracker.debian.org/tracker/CVE-2022-0128 vim | CVE-2022-0156 | https://security-tracker.debian.org/tracker/CVE-2022-0156 vim | CVE-2022-0158 | https://security-tracker.debian.org/tracker/CVE-2022-0158 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wireshark | CVE-2021-4185 | https://security-tracker.debian.org/tracker/CVE-2021-4185 wireshark | CVE-2021-4186 | https://security-tracker.debian.org/tracker/CVE-2021-4186 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From heiko.thiery at gmail.com Mon Jan 17 08:06:16 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 17 Jan 2022 09:06:16 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script Message-ID: <20220117080616.10563-1-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- board/kontron/pitx-imx8m/boot.cmd | 8 -------- board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- board/kontron/pitx-imx8m/post-image.sh | 2 +- configs/kontron_pitx_imx8m_defconfig | 3 +-- 6 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 board/kontron/pitx-imx8m/boot.cmd create mode 100644 board/kontron/pitx-imx8m/extlinux.conf diff --git a/board/kontron/pitx-imx8m/boot.cmd b/board/kontron/pitx-imx8m/boot.cmd deleted file mode 100644 index 4d89235392..0000000000 --- a/board/kontron/pitx-imx8m/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -echo "Root File Sytem on MMC${devnum}" -setenv rootfs /dev/mmcblk${devnum}p1 -setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} - -load ${devtype} ${devnum} ${kernel_addr_r} boot/Image -load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mq-kontron-pitx-imx8m.dtb - -booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/kontron/pitx-imx8m/extlinux.conf b/board/kontron/pitx-imx8m/extlinux.conf new file mode 100644 index 0000000000..2911acec59 --- /dev/null +++ b/board/kontron/pitx-imx8m/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mq-kontron-pitx-imx8m.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg index c78ef0f910..4a0aa117fb 100644 --- a/board/kontron/pitx-imx8m/genimage.cfg +++ b/board/kontron/pitx-imx8m/genimage.cfg @@ -1,5 +1,6 @@ image sdcard.img { hdimage { + partition-table-type = "gpt" } partition imx-boot { @@ -9,8 +10,8 @@ image sdcard.img { } partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% } } diff --git a/board/kontron/pitx-imx8m/post-build.sh b/board/kontron/pitx-imx8m/post-build.sh index 4574221fe5..bf8861f6a9 100755 --- a/board/kontron/pitx-imx8m/post-build.sh +++ b/board/kontron/pitx-imx8m/post-build.sh @@ -1,4 +1,7 @@ #!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" -mkdir -p $TARGET_DIR/boot/ -cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/pitx-imx8m/post-image.sh b/board/kontron/pitx-imx8m/post-image.sh index 564211c829..3452fd4501 100755 --- a/board/kontron/pitx-imx8m/post-image.sh +++ b/board/kontron/pitx-imx8m/post-image.sh @@ -1,3 +1,3 @@ #!/bin/sh -support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 4053e1e398..458083160b 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -15,6 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -50,5 +51,3 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/pitx-imx8m/boot.cmd" -- 2.30.2 From heiko.thiery at gmail.com Mon Jan 17 08:06:17 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 17 Jan 2022 09:06:17 +0100 Subject: [Buildroot] [PATCH 2/2] configs/kontron_pitx_imx8m_defconfig: bump kernel to 5.16.1 In-Reply-To: <20220117080616.10563-1-heiko.thiery@gmail.com> References: <20220117080616.10563-1-heiko.thiery@gmail.com> Message-ID: <20220117080616.10563-2-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- configs/kontron_pitx_imx8m_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 458083160b..7f9c0eeae8 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pitx-imx8mq.dtb" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y -- 2.30.2 From romain.naour at smile.fr Mon Jan 17 09:04:32 2022 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 17 Jan 2022 10:04:32 +0100 Subject: [Buildroot] [PATCH 1/3] legacy: increase the duration during whih we keep legacy symbols In-Reply-To: References: Message-ID: Hello Yann, All, Le 28/03/2021 ? 22:30, Yann E. MORIN a ?crit?: > Our LTS is only one-year long (actually, more like 13 mopnths), which > is still seen as too short by some, who do not have the bandwidth, > willingness, and/or capability to update once a year. > > As such, the 2-year retention guarantee for the legacy symbols, is > often not enough, and people miss on them when eventually migrating. > > Furthermore, the cuystoms so far has been to drop the symbols only after > a 5-year period has elapsed: > f289b1b36f5c legacy: drop options removed more than 5 years ago now > a52e106bbd08 legacy: remove options made legacy 5 years ago > a7f49a9693d7 Config.in.legacy: drop 2013.02 entries > > So, make the customs the new rule: increase the retenetion period to 5 > years. I'm aware of some projects using an out of date Buildroot version from 2012 and 2016. But switching between Buildroot 2012 to Buildroot 2022 requires a complete rework, not just updating the Buildroot defconfig to remove legacy option. Is really a benefit to remove theses legacy config ? Best regards, Romain > > Reported-by: Thomas Petazzoni > Signed-off-by: Yann E. MORIN > --- > Config.in.legacy | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 8ebbc4c295..967b67e03e 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -6,7 +6,7 @@ > # This will make the transition for the user more convenient. > # > # When adding legacy symbols to this file, add them to the front. The oldest > -# symbols will be removed again after about two years. > +# symbols will be removed again after at least five years. > # > # The symbol should be copied as-is from the place where it was previously > # defined, but the help text should be removed or replaced with something that > From nolange79 at gmail.com Mon Jan 17 09:34:34 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Mon, 17 Jan 2022 10:34:34 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/mkusers: allow option for system uid/gid In-Reply-To: <5273d4d1-8254-e53d-0ce2-9c390fe315ad@mind.be> References: <20220114101247.342256-1-nolange79@gmail.com> <5273d4d1-8254-e53d-0ce2-9c390fe315ad@mind.be> Message-ID: Am So., 16. Jan. 2022 um 13:25 Uhr schrieb Arnout Vandecappelle : > > > > On 14/01/2022 11:12, Norbert Lange wrote: > > Some software decides based on uid/gid whether a user is a > > system or normal/human user, with differnt behaviour for those > > flavors (example journald [2]). > > Thank you for the short yet sufficient summary! > > > > > So adding logic to create system-users is necessary, we take > > the now common ranges from [1]. > > > > This extends the mkusers script to allow -2 for uid/gid, > > this argument will take an identifier from the system range. > > > > System/user ranges are added as variables, and the argument > > for user/system uid was added as variable aswell. > > Thus some magic constants could be removed, some further > > occurences of -1 were replaced with equivalent logic. > > > > [1] - https://systemd.io/UIDS-GIDS/ > > [2] - https://www.freedesktop.org/software/systemd/man/journald.conf.html > > > > Signed-off-by: Norbert Lange > > You forgot to mention that this is v2. v1 is here [1]. I did not forget it, just did not find references I pushed the patch before. > > I think the only change is in the commit message. Nah, its a bit more. > > > --- > > support/scripts/mkusers | 57 +++++++++++++++++++++++++++++------------ > > 1 file changed, 40 insertions(+), 17 deletions(-) > > > > diff --git a/support/scripts/mkusers b/support/scripts/mkusers > > index d00ba33823..9d8295e8a3 100755 > > --- a/support/scripts/mkusers > > +++ b/support/scripts/mkusers > > @@ -8,6 +8,15 @@ MIN_UID=1000 > > MAX_UID=1999 > > MIN_GID=1000 > > MAX_GID=1999 > > +# use names from /etc/adduser.conf > > +FIRST_SYSTEM_UID=100 > > +LAST_SYSTEM_UID=999 > > +FIRST_SYSTEM_GID=100 > > +LAST_SYSTEM_GID=999 > > +# argument to automatically crease system/user id > > +AUTO_SYSTEM_ID=-2 > > Wouldn't it be better to use -1 for system users (= the usual case) and add -2 > for normal users? System users are the usual, after all, and all current in-tree > uses of -1 are definitely system users. > > I though that someone had already made this remark, but I can't find any trace > of it. > > > +AUTO_USER_ID=-1 > > + > > [snip] > > @@ -222,8 +233,12 @@ add_one_group() { > > local members > > > > # Generate a new GID if needed > > - if [ ${gid} -eq -1 ]; then > > - gid="$( generate_gid "${group}" )" > > + if [ ${gid} -lt 0 ]; then > > + if [ ${gid} -eq ${AUTO_USER_ID} ]; then > > + gid="$( generate_gid "${group}" )" > > (nitpick) For symmetry, I'd always pass the first and last as argument here. > > > + else > > + gid="$( generate_gid "${group}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" > > + fi > > fi > > (nitpick) I'd structure the entire block above as follows: > > if [ ${gid} -eq ${AUTO_USER_ID} ]; then > elif [ ${gid} -eq ${AUTO_SYSTEM_ID} ]; then > fi > > That's one level less deep, and more explicit about the system-id branch. > > Both remarks also apply to the uid case of course. > > > > > members=$(get_members "$group") > > @@ -247,16 +262,19 @@ add_one_group() { > > # - not already used by a user > > generate_uid() { > > local username="${1}" > > + local minuid="${2:-$MIN_UID}" > > + local maxuid="${3:-$MAX_UID}" > > So here I'd remove the defaults and instead always pass the arguments. > > > > Regards, > Arnout > > [1] > https://patchwork.ozlabs.org/project/buildroot/list/?series=152843&state=%2A&archive=both > > > > + > > local uid > > > > uid="$( get_uid "${username}" )" > > if [ -z "${uid}" ]; then > > - for(( uid=MIN_UID; uid<=MAX_UID; uid++ )); do > > + for(( uid=minuid; uid<=maxuid; uid++ )); do > > if [ -z "$( get_username "${uid}" )" ]; then > > break > > fi > > done > > - if [ ${uid} -gt ${MAX_UID} ]; then > > + if [ ${uid} -gt ${maxuid} ]; then > > fail "can not allocate a UID for user '%s'\n" "${username}" > > fi > > fi > > @@ -307,8 +325,13 @@ add_one_user() { > > check_user_validity "${username}" "${uid}" "${group}" "${gid}" > > > > # Generate a new UID if needed > > - if [ ${uid} -eq -1 ]; then > > - uid="$( generate_uid "${username}" )" > > + if [ ${uid} -lt 0 ]; then > > + if [ ${uid} -eq ${AUTO_USER_ID} ]; then > > + uid="$( generate_uid "${username}" )" > > + else > > + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" > > + > > + fi > > fi > > > > # Remove any previous instance of this user > > @@ -384,8 +407,8 @@ main() { > > ENTRIES+=( "${line}" ) > > done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) > > > > - # We first create groups whose gid is not -1, and then we create groups > > - # whose gid is -1 (automatic), so that, if a group is defined both with > > + # We first create groups whose gid is positive, and then we create groups > > + # whose gid is automatic, so that, if a group is defined both with > > # a specified gid and an automatic gid, we ensure the specified gid is > > # used, rather than a different automatic gid is computed. > > > > @@ -399,7 +422,7 @@ main() { > > # Then, create all the main groups which gid *is* automatic > > for line in "${ENTRIES[@]}"; do > > read username uid group gid passwd home shell groups comment <<<"${line}" > > - [ ${gid} -eq -1 ] || continue # Non-automatic gid > > + [ ${gid} -lt 0 ] || continue # Non-automatic gid > > add_one_group "${group}" "${gid}" > > done > > > > @@ -410,7 +433,7 @@ main() { > > read username uid group gid passwd home shell groups comment <<<"${line}" > > if [ "${groups}" != "-" ]; then > > for g in ${groups//,/ }; do > > - add_one_group "${g}" -1 > > + add_one_group "${g}" ${AUTO_USER_ID} > > done > > fi > > done > > @@ -433,7 +456,7 @@ main() { > > for line in "${ENTRIES[@]}"; do > > read username uid group gid passwd home shell groups comment <<<"${line}" > > [ "${username}" != "-" ] || continue # Magic string to skip user creation > > - [ ${uid} -eq -1 ] || continue # Non-automatic uid > > + [ ${uid} -lt 0 ] || continue # Non-automatic uid > > add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ > > "${home}" "${shell}" "${groups}" "${comment}" > > done > > Norbert From mail at dbrgn.ch Mon Jan 17 09:50:17 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 10:50:17 +0100 Subject: [Buildroot] DMARC on this mailing list Message-ID: <20220117105017.28d6aacc@c3po> Hello folks I recently enabled report-only DMARC on my e-mail domain. After sending a few e-mails to this ML yesterday, this resulted in multiple DMARC would-be rejection e-mails. DMARC relies on SPF (correct sender IP) *or* DKIM (correct signature). A nice tool to visualize this is https://www.learndmarc.com/. If either SPF or DKIM passes, the e-mail should be accepted. In the case of mailing lists, the way I understand it, there are two options: - Rewrite the "From:" header so that the e-mail appears to be coming from the ML itself. Put the original sender e-mail in the "Reply-To" header instead. If this is not being done, the sender IP (the mailing list) does not match the sender e-mail domain and SPF fails. Note that this *might* impact the buildroot ML reputation for some big mailservers. - Expect that mail servers with DMARC enabled also have DKIM enabled, and ensure that the e-mail body is not modified (i.e. turn off the automatically inserted footer). Put mailing list unsubscribe links in the headers instead. This way, even though the sender IP does not match, the signature should still be intact. These approaches are described in the following blog post I found online: https://begriffs.com/posts/2018-09-18-dmarc-mailing-list.html I don't know if mailman allows turning off body modifications (i.e. RFC2369 and RFC2919), but it definitely allows "From"-munging: https://wiki.list.org/DEV/DMARC I'm still quite new to this mailing list and don't want to put out any demands, but I wanted to bring up this issue, since it will probably be more and more of an issue in the future (DMARC adoption is increasing). Cheers, Danilo From baruch at tkos.co.il Mon Jan 17 10:03:03 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 17 Jan 2022 12:03:03 +0200 Subject: [Buildroot] DMARC on this mailing list In-Reply-To: <20220117105017.28d6aacc@c3po> References: <20220117105017.28d6aacc@c3po> Message-ID: <87mtjufzh1.fsf@tarshish> Hi Danilo, On Mon, Jan 17 2022, Danilo Bargen wrote: > I recently enabled report-only DMARC on my e-mail domain. After sending > a few e-mails to this ML yesterday, this resulted in multiple DMARC > would-be rejection e-mails. > > DMARC relies on SPF (correct sender IP) *or* DKIM (correct signature). A > nice tool to visualize this is https://www.learndmarc.com/. If either > SPF or DKIM passes, the e-mail should be accepted. > > In the case of mailing lists, the way I understand it, there are two > options: > > - Rewrite the "From:" header so that the e-mail appears to be coming > from the ML itself. Put the original sender e-mail in the "Reply-To" > header instead. If this is not being done, the sender IP (the mailing > list) does not match the sender e-mail domain and SPF fails. Note > that this *might* impact the buildroot ML reputation for some big > mailservers. > - Expect that mail servers with DMARC enabled also have DKIM enabled, > and ensure that the e-mail body is not modified (i.e. turn off the > automatically inserted footer). Put mailing list unsubscribe links > in the headers instead. This way, even though the sender IP does not > match, the signature should still be intact. > > These approaches are described in the following blog post I found > online: https://begriffs.com/posts/2018-09-18-dmarc-mailing-list.html > > I don't know if mailman allows turning off body modifications (i.e. > RFC2369 and RFC2919), but it definitely allows "From"-munging: > https://wiki.list.org/DEV/DMARC > > I'm still quite new to this mailing list and don't want to put out any > demands, but I wanted to bring up this issue, since it will probably be > more and more of an issue in the future (DMARC adoption is increasing). I can't comment for the owners of the Buildroot list. But you might find this recent discussion from the linux-arm-kernel list interesting: https://lore.kernel.org/linux-arm-kernel/202110211313.B5C5C61 at keescook/ In this thread David Woodhouse describes the lists.infradead.org setup rationale. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From marcus.folkesson at gmail.com Mon Jan 17 10:07:50 2022 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 17 Jan 2022 11:07:50 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> Message-ID: Hello, On Wed, Jan 05, 2022 at 02:40:47PM +0100, Romain Naour wrote: > > > > I'll be happy to help in the review of such packages. > > Same here, I'll try to help. > Count me in as well. /Marcus -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From yann.morin.1998 at free.fr Mon Jan 17 10:17:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 11:17:05 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> Message-ID: <20220117101705.GB2313964@scaer> James, Danilo, All, On 2022-01-16 15:51 -0700, James Hilliard spake thusly: > On Sun, Jan 16, 2022 at 3:38 PM Danilo Bargen wrote: > > > Just use the hash buildroot generated for you, it should be correct. > > > (...) > > > Yeah, it's not going to match since buildroot is doing stuff like > > > vendoring the cargo deps before generating the tarball > > Ahh, that explains it. Does this mean that for Cargo based packages, it > > will always be TOFU and checksums provided by the project / maintainer > > cannot be used (because they will mismatch)? > A maintainer could sign the tarball generated by buildroot and upload it to > github releases if they want. To be exact: an upstream maintainer (i.e. not a Buildroot maintainer). > As you can see the script will bail out if the tarball already has > vendored deps: > https://github.com/buildroot/buildroot/blob/6e4791b751c0f8e0ba218da2c22e71d3e1436b5d/support/download/cargo-post-process#L16-L19 The script will not "bail out" on pre-vendored tarballs; it will just exit without touching the tarball at all. I.e. it means that we prefer using tarballs as-is from their upstreams, when they are vendored; we only vendor packages which upstreams have not. > So as long as the upstream release tarball has vendored deps the hash should > not change AFAIU. Yes, this is the goal. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From sebastien.szymanski at armadeus.com Mon Jan 17 09:37:39 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=c3=a9bastien_Szymanski?=) Date: Mon, 17 Jan 2022 10:37:39 +0100 Subject: [Buildroot] [PATCH 3/3] package/gstreamer1/gst1-imx2: new package In-Reply-To: <20220114184433.687ebc15@bootlin.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> <20220112094250.27022-3-sebastien.szymanski@armadeus.com> <20220114184433.687ebc15@bootlin.com> Message-ID: <63ff839c-c7e1-f228-8658-dde65a4d215a@armadeus.com> Hi Herv?, On 1/14/22 18:44, Herve Codina wrote: > Hi S?bastien, all > > On Wed, 12 Jan 2022 10:42:50 +0100 > S?bastien Szymanski wrote: > >> This is version 2 of gst1-imx. >> >> Signed-off-by: S?bastien Szymanski >> --- >> package/gstreamer1/Config.in | 1 + >> package/gstreamer1/gst1-imx2/Config.in | 75 +++++++++++++++++++++ >> package/gstreamer1/gst1-imx2/gst1-imx2.hash | 3 + >> package/gstreamer1/gst1-imx2/gst1-imx2.mk | 75 +++++++++++++++++++++ >> 4 files changed, 154 insertions(+) >> create mode 100644 package/gstreamer1/gst1-imx2/Config.in >> create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.hash >> create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.mk >> > > This package seems an update of the existing gst1-imx package. > > Why add a new package instead of bumping gst1-imx ? It's a rewrite, as the ChangLog says: * Complete rewrite based on GStreamer 1.14, libimxvpuapi 2.1.2, and the new libimxdmabuffer library. This new rewrite is referred to as "v2" (version 2), while the old code is referred to as "v1" (version 1). v1 is no longer being developed; work is focused on v2. I think we should keep gst1-imx v1 for compatibility. Best regards, > > Best regards, > Herv? > -- S?bastien Szymanski, Armadeus Systems Software engineer From yann.morin.1998 at free.fr Mon Jan 17 10:24:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 11:24:50 +0100 Subject: [Buildroot] DMARC on this mailing list In-Reply-To: <20220117105017.28d6aacc@c3po> References: <20220117105017.28d6aacc@c3po> Message-ID: <20220117102450.GC2313964@scaer> Danilo, All, On 2022-01-17 10:50 +0100, Danilo Bargen spake thusly: > I recently enabled report-only DMARC on my e-mail domain. After sending > a few e-mails to this ML yesterday, this resulted in multiple DMARC > would-be rejection e-mails. DMARC has bitten us in the recent past (1.5 year or so...) > DMARC relies on SPF (correct sender IP) *or* DKIM (correct signature). A > nice tool to visualize this is https://www.learndmarc.com/. If either > SPF or DKIM passes, the e-mail should be accepted. > > In the case of mailing lists, the way I understand it, there are two > options: > > - Rewrite the "From:" header so that the e-mail appears to be coming > from the ML itself. Put the original sender e-mail in the "Reply-To" > header instead. If this is not being done, the sender IP (the mailing > list) does not match the sender e-mail domain and SPF fails. Note > that this *might* impact the buildroot ML reputation for some big > mailservers. This is exactly what is going on. You can check for example on the archives: https://lore.kernel.org/buildroot/20220115101415.986123F41E at exit1-us.msgsafe.io/ > - Expect that mail servers with DMARC enabled also have DKIM enabled, > and ensure that the e-mail body is not modified (i.e. turn off the > automatically inserted footer). Put mailing list unsubscribe links > in the headers instead. This way, even though the sender IP does not > match, the signature should still be intact. > > These approaches are described in the following blog post I found > online: https://begriffs.com/posts/2018-09-18-dmarc-mailing-list.html > > I don't know if mailman allows turning off body modifications (i.e. > RFC2369 and RFC2919), but it definitely allows "From"-munging: > https://wiki.list.org/DEV/DMARC Yeah, this is what is being done on this list... Regards, Yann E. MORIN. > I'm still quite new to this mailing list and don't want to put out any > demands, but I wanted to bring up this issue, since it will probably be > more and more of an issue in the future (DMARC adoption is increasing). > > Cheers, > Danilo > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From mail at dbrgn.ch Mon Jan 17 10:24:53 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 11:24:53 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <20220117101705.GB2313964@scaer> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> <20220117101705.GB2313964@scaer> Message-ID: <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> Hello James, Yann On 1/17/22 11:17, Yann E. MORIN wrote: >> A maintainer could sign the tarball generated by buildroot and upload it to >> github releases if they want. > > To be exact: an upstream maintainer (i.e. not a Buildroot maintainer). > > (...) > > I.e. it means that we prefer using tarballs as-is from their upstreams, > when they are vendored; we only vendor packages which upstreams have > not. That makes sense! I am the maintainer of tealdeer, and I'll provide a vendored source tarball for the next release. (I've heard of "cargo vendor" before, but I haven't used it so far.) Maybe a corresponding paragraph could be added to the docs at https://nightly.buildroot.org/#_integration_of_cargo_based_packages ? Thanks for the helpful comments, Danilo From yann.morin.1998 at free.fr Mon Jan 17 10:32:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 11:32:18 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> <20220117101705.GB2313964@scaer> <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> Message-ID: <20220117103218.GD2313964@scaer> Danilo, All, On 2022-01-17 11:24 +0100, Danilo Bargen spake thusly: > On 1/17/22 11:17, Yann E. MORIN wrote: > >>A maintainer could sign the tarball generated by buildroot and upload it to > >>github releases if they want. > > > >To be exact: an upstream maintainer (i.e. not a Buildroot maintainer). > > > >(...) > > > >I.e. it means that we prefer using tarballs as-is from their upstreams, > >when they are vendored; we only vendor packages which upstreams have > >not. > That makes sense! I am the maintainer of tealdeer, and I'll provide a > vendored source tarball for the next release. (I've heard of "cargo vendor" > before, but I haven't used it so far.) > > Maybe a corresponding paragraph could be added to the docs at > https://nightly.buildroot.org/#_integration_of_cargo_based_packages ? Yeah, so I already noticed that the nightly manual is not up to date... It indeed points to the correct sha1 in master, but the Cargo part is not what it should be; it is still the older text from before we added the cargo infra. We're looking into the issue... You can hack on the manual too, it's in: docs/manual/ And you can generate the manual locally: make manual-html Patches welcome! ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fperrad at gmail.com Mon Jan 17 11:36:56 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 17 Jan 2022 12:36:56 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.12 Message-ID: <20220117113656.234077-1-francois.perrad@gadz.org> see https://blog.prosody.im/prosody-0.11.12-released/ Signed-off-by: Francois Perrad --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index ee459f85d..a925d0d00 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz -sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz -sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz -sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz +md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz +sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz +sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz +sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7acfa4708..d697c8556 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.11 +PROSODY_VERSION = 0.11.12 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING -- 2.32.0 From james.hilliard1 at gmail.com Mon Jan 17 11:43:58 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 17 Jan 2022 04:43:58 -0700 Subject: [Buildroot] [PATCH v5 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220117114358.3814200-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. Also set qmake target pkg-config path for qt5webengine. Set PKG_CONFIG_SYSROOT_DIR="/" in qt5webengine to prevent target pkg-config path mangling. This fixes some build errors with per-package directories such as: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 Also attempt to fix massive amounts of breakage due to use of unsupported config flags in qt5webengine as of 5.10.0: * WebEngine Features are now configured as Qt features and WEBENGINE_CONFIG has been removed. Move target dependencies to qt5base which fixes/works around more per-package issues. More fixes for pkg-config target/host separation. Signed-off-by: James Hilliard --- Changes v4 -> v5: - rework qt5webengine config to use feature flags - try to fix more random breakage Changes v3 -> v4: - fix target pkg-config path mangling Changes v2 -> v3: - set target pkg-config path Changes v1 -> v2: - add some missing overrides to qt.conf.in --- package/libxml2/libxml2.mk | 13 +- package/pkg-qmake.mk | 2 +- package/qt5/qt5base/qmake.conf.in | 4 + package/qt5/qt5base/qt.conf.in | 21 +- package/qt5/qt5base/qt5base.mk | 19 ++ ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 +++++ .../0003-Fix-build-with-system-ICU-68.patch | 291 ++++++++++++++++++ package/qt5/qt5webengine/Config.in | 6 + package/qt5/qt5webengine/qt5webengine.mk | 57 +++- package/webp/webp.mk | 5 + 10 files changed, 477 insertions(+), 17 deletions(-) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch create mode 100644 package/qt5/qt5webengine/0003-Fix-build-with-system-ICU-68.patch diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..ce396703db 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -12,11 +12,15 @@ LIBXML2_LICENSE_FILES = COPYING LIBXML2_CPE_ID_VENDOR = xmlsoft LIBXML2_CONFIG_SCRIPTS = xml2-config +LIBXML2_CFLAGS = $(TARGET_CFLAGS) + # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -LIBXML2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" +LIBXML2_CFLAGS += -mxgot endif +LIBXML2_CONF_ENV += CFLAGS="$(LIBXML2_CFLAGS)" + LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug HOST_LIBXML2_DEPENDENCIES = host-pkgconf @@ -24,6 +28,13 @@ LIBXML2_DEPENDENCIES = host-pkgconf HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python +ifeq ($(BR2_PACKAGE_ICU),y) +LIBXML2_DEPENDENCIES += icu +LIBXML2_CONF_OPTS += --with-icu +else +LIBXML2_CONF_OPTS += --without-icu +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBXML2_DEPENDENCIES += zlib LIBXML2_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..98664fe00b 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -61,7 +61,7 @@ $(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS cd $$($(2)_BUILDDIR) && \ - $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) + $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) -- $$($(2)_CONF_OPTS) endef endif diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index 024c074928..d12f884a55 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -8,6 +8,10 @@ include(../common/linux_device_pre.conf) +# set up pkg-config +QMAKE_PKG_CONFIG = $$[QT_HOST_PREFIX]/bin/pkg-config +QMAKE_PKGCONFIG_PREFIX = /usr + # modifications to g++-unix.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..c92f52ced0 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,21 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Tests=@@STAGING_DIR@@/usr/lib/qt/tests +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +Documentation=@@STAGING_DIR@@/doc +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +Settings=@@STAGING_DIR@@/etc +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..c781276135 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -230,6 +230,22 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples +# Used by qt5webengine +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_FFMPEG),ffmpeg) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBEVENT),libevent) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBNSS),libnss) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXML2),libxml2) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXSLT),libxslt) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_MINIZIP),minizip) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBVPX),libvpx) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBP),webp) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXCURSOR),xlib_libXcursor) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXI),xlib_libXi) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXRANDR),xlib_libXrandr) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),xlib_libXScrnSaver) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXTST),xlib_libXtst) + ifeq ($(BR2_PACKAGE_LIBINPUT),y) QT5BASE_CONFIGURE_OPTS += -libinput QT5BASE_DEPENDENCIES += libinput @@ -311,12 +327,15 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ -nomake tests \ + -pkg-config \ -device buildroot \ -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ -device-option BR_COMPILER_CFLAGS="$(QT5BASE_CFLAGS)" \ diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/package/qt5/qt5webengine/0003-Fix-build-with-system-ICU-68.patch b/package/qt5/qt5webengine/0003-Fix-build-with-system-ICU-68.patch new file mode 100644 index 0000000000..103175b97e --- /dev/null +++ b/package/qt5/qt5webengine/0003-Fix-build-with-system-ICU-68.patch @@ -0,0 +1,291 @@ +From 3fe2a7550a93a74d6d1c35a918229eb4c4dc5cb9 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Mon, 16 Nov 2020 13:16:13 +0100 +Subject: [PATCH] Fix build with system ICU 68 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: QTBUG-88116 +Change-Id: I935babf51c2670fad7cc7950a2fe07eb2829c4cb +Reviewed-by: J?ri Valdmann +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +2918e073086af29bd3e4176cd2403dffa789fdc0] +--- + chromium/base/i18n/string_compare.cc | 4 ++-- + chromium/base/i18n/time_formatting.cc | 2 +- + .../autofill/core/common/autofill_regexes.cc | 8 ++++---- + .../renderer/spellcheck_worditerator.cc | 2 +- + .../spoof_checks/idn_spoof_checker.cc | 4 ++-- + .../spoof_checks/skeleton_generator.cc | 2 +- + .../blink/renderer/platform/text/locale_icu.cc | 4 ++-- + .../platform/text/text_break_iterator_icu.cc | 16 ++++++++-------- + .../renderer/platform/text/unicode_utilities.cc | 2 +- + .../renderer/platform/wtf/text/text_codec_icu.cc | 2 +- + chromium/ui/base/l10n/formatter.cc | 6 +++--- + 11 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/src/3rdparty/chromium/base/i18n/string_compare.cc b/src/3rdparty/chromium/base/i18n/string_compare.cc +index 6cd59b98f49..a5fa502b53f 100644 +--- a/src/3rdparty/chromium/base/i18n/string_compare.cc ++++ b/src/3rdparty/chromium/base/i18n/string_compare.cc +@@ -18,8 +18,8 @@ UCollationResult CompareString16WithCollator(const icu::Collator& collator, + StringPiece16 rhs) { + UErrorCode error = U_ZERO_ERROR; + UCollationResult result = collator.compare( +- icu::UnicodeString(FALSE, lhs.data(), static_cast(lhs.length())), +- icu::UnicodeString(FALSE, rhs.data(), static_cast(rhs.length())), ++ icu::UnicodeString(false, lhs.data(), static_cast(lhs.length())), ++ icu::UnicodeString(false, rhs.data(), static_cast(rhs.length())), + error); + DCHECK(U_SUCCESS(error)); + return result; +diff --git a/src/3rdparty/chromium/base/i18n/time_formatting.cc b/src/3rdparty/chromium/base/i18n/time_formatting.cc +index 1a6c1389ba0..106dd0e5b47 100644 +--- a/src/3rdparty/chromium/base/i18n/time_formatting.cc ++++ b/src/3rdparty/chromium/base/i18n/time_formatting.cc +@@ -236,7 +236,7 @@ bool TimeDurationFormatWithSeconds(const TimeDelta time, + icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); + measure_format.formatMeasures(measures, 3, formatted, ignore, status); + *out = i18n::UnicodeStringToString16(formatted); +- return U_SUCCESS(status) == TRUE; ++ return U_SUCCESS(status) == true; + } + + string16 DateIntervalFormat(const Time& begin_time, +diff --git a/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc b/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc +index b141cb2d0f6..a8a688d50c7 100644 +--- a/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc ++++ b/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc +@@ -43,7 +43,7 @@ class AutofillRegexes { + icu::RegexMatcher* AutofillRegexes::GetMatcher(const base::string16& pattern) { + auto it = matchers_.find(pattern); + if (it == matchers_.end()) { +- const icu::UnicodeString icu_pattern(FALSE, pattern.data(), ++ const icu::UnicodeString icu_pattern(false, pattern.data(), + pattern.length()); + + UErrorCode status = U_ZERO_ERROR; +@@ -70,20 +70,20 @@ bool MatchesPattern(const base::string16& input, + base::AutoLock lock(*g_lock); + + icu::RegexMatcher* matcher = g_autofill_regexes->GetMatcher(pattern); +- icu::UnicodeString icu_input(FALSE, input.data(), input.length()); ++ icu::UnicodeString icu_input(false, input.data(), input.length()); + matcher->reset(icu_input); + + UErrorCode status = U_ZERO_ERROR; + UBool matched = matcher->find(0, status); + DCHECK(U_SUCCESS(status)); + +- if (matched == TRUE && match) { ++ if (matched == true && match) { + icu::UnicodeString match_unicode = matcher->group(0, status); + DCHECK(U_SUCCESS(status)); + *match = base::i18n::UnicodeStringToString16(match_unicode); + } + +- return matched == TRUE; ++ return matched == true; + } + + } // namespace autofill +diff --git a/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc b/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc +index 8fe8a6df381..e3a65580c08 100644 +--- a/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc ++++ b/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc +@@ -424,7 +424,7 @@ bool SpellcheckWordIterator::Normalize(size_t input_start, + // spellchecker and we need manual normalization as well. The normalized + // text does not have to be NUL-terminated since its characters are copied to + // string16, which adds a NUL character when we need. +- icu::UnicodeString input(FALSE, &text_[input_start], ++ icu::UnicodeString input(false, &text_[input_start], + base::checked_cast(input_length)); + UErrorCode status = U_ZERO_ERROR; + icu::UnicodeString output; +diff --git a/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc +index 1964793fd3e..c4e01026c38 100644 +--- a/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc ++++ b/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc +@@ -347,7 +347,7 @@ bool IDNSpoofChecker::SafeToDisplayAsUnicode( + if (U_FAILURE(status) || (result & USPOOF_ALL_CHECKS)) + return false; + +- icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(), ++ icu::UnicodeString label_string(false /* isTerminated */, label.data(), + base::checked_cast(label.size())); + + // A punycode label with 'xn--' prefix is not subject to the URL +@@ -677,7 +677,7 @@ bool IDNSpoofChecker::IsWholeScriptConfusableAllowedForTLD( + base::StringPiece tld, + base::StringPiece16 tld_unicode) { + icu::UnicodeString tld_string( +- FALSE /* isTerminated */, tld_unicode.data(), ++ false /* isTerminated */, tld_unicode.data(), + base::checked_cast(tld_unicode.size())); + // Allow if the TLD contains any letter from the script, in which case it's + // likely to be a TLD in that script. +diff --git a/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc b/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc +index 41485914007..b8c1c2f547a 100644 +--- a/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc ++++ b/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc +@@ -117,7 +117,7 @@ SkeletonGenerator::~SkeletonGenerator() = default; + Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 hostname) { + Skeletons skeletons; + size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0); +- icu::UnicodeString host(FALSE, hostname.data(), hostname_length); ++ icu::UnicodeString host(false, hostname.data(), hostname_length); + // If input has any characters outside Latin-Greek-Cyrillic and [0-9._-], + // there is no point in getting rid of diacritics because combining marks + // attached to non-LGC characters are already blocked. +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc +index abff1b1d809..57f1286d4e4 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc +@@ -169,12 +169,12 @@ static String GetDateFormatPattern(const UDateFormat* date_format) { + return g_empty_string; + + UErrorCode status = U_ZERO_ERROR; +- int32_t length = udat_toPattern(date_format, TRUE, nullptr, 0, &status); ++ int32_t length = udat_toPattern(date_format, true, nullptr, 0, &status); + if (status != U_BUFFER_OVERFLOW_ERROR || !length) + return g_empty_string; + StringBuffer buffer(length); + status = U_ZERO_ERROR; +- udat_toPattern(date_format, TRUE, buffer.Characters(), length, &status); ++ udat_toPattern(date_format, true, buffer.Characters(), length, &status); + if (U_FAILURE(status)) + return g_empty_string; + return String::Adopt(buffer); +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc +index a257cd75ccf..898d0c47bb1 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc +@@ -311,13 +311,13 @@ static inline bool TextInChunkOrOutOfRange(UText* text, + text->chunkOffset = offset <= std::numeric_limits::max() + ? static_cast(offset) + : 0; +- is_accessible = TRUE; ++ is_accessible = true; + return true; + } + if (native_index >= native_length && + text->chunkNativeLimit == native_length) { + text->chunkOffset = text->chunkLength; +- is_accessible = FALSE; ++ is_accessible = false; + return true; + } + } else { +@@ -330,12 +330,12 @@ static inline bool TextInChunkOrOutOfRange(UText* text, + text->chunkOffset = offset <= std::numeric_limits::max() + ? static_cast(offset) + : 0; +- is_accessible = TRUE; ++ is_accessible = true; + return true; + } + if (native_index <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- is_accessible = FALSE; ++ is_accessible = false; + return true; + } + } +@@ -346,7 +346,7 @@ static UBool TextLatin1Access(UText* text, + int64_t native_index, + UBool forward) { + if (!text->context) +- return FALSE; ++ return false; + int64_t native_length = TextNativeLength(text); + UBool is_accessible; + if (TextInChunkOrOutOfRange(text, native_index, native_length, forward, +@@ -370,7 +370,7 @@ static UBool TextLatin1Access(UText* text, + DCHECK_EQ(new_context, kPriorContext); + TextLatin1SwitchToPriorContext(text, native_index, native_length, forward); + } +- return TRUE; ++ return true; + } + + static const struct UTextFuncs kTextLatin1Funcs = { +@@ -510,7 +510,7 @@ static void TextUTF16SwitchToPriorContext(UText* text, + + static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) { + if (!text->context) +- return FALSE; ++ return false; + int64_t native_length = TextNativeLength(text); + UBool is_accessible; + if (TextInChunkOrOutOfRange(text, native_index, native_length, forward, +@@ -532,7 +532,7 @@ static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) { + DCHECK_EQ(new_context, kPriorContext); + TextUTF16SwitchToPriorContext(text, native_index, native_length, forward); + } +- return TRUE; ++ return true; + } + + static const struct UTextFuncs kTextUTF16Funcs = { +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc +index 2cefd5390b6..b8c4515dc13 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc +@@ -300,7 +300,7 @@ void NormalizeCharactersIntoNFCForm(const UChar* characters, + DCHECK(U_SUCCESS(status)); + int32_t input_length = static_cast(length); + // copy-on-write. +- icu::UnicodeString normalized(FALSE, characters, input_length); ++ icu::UnicodeString normalized(false, characters, input_length); + // In the vast majority of cases, input is already NFC. Run a quick check + // to avoid normalizing the entire input unnecessarily. + int32_t normalized_prefix_length = +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +index 810d1cd9181..9074b640fff 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +@@ -326,7 +326,7 @@ void TextCodecICU::CreateICUConverter() const { + DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING) + << "ICU ambiguous alias warning for encoding: " << encoding_.GetName(); + if (converter_icu_) +- ucnv_setFallback(converter_icu_, TRUE); ++ ucnv_setFallback(converter_icu_, true); + } + + int TextCodecICU::DecodeToBuffer(UChar* target, +diff --git a/src/3rdparty/chromium/ui/base/l10n/formatter.cc b/src/3rdparty/chromium/ui/base/l10n/formatter.cc +index 486a3a029cb..d7a41724628 100644 +--- a/src/3rdparty/chromium/ui/base/l10n/formatter.cc ++++ b/src/3rdparty/chromium/ui/base/l10n/formatter.cc +@@ -232,7 +232,7 @@ void Formatter::Format(Unit unit, + int value, + icu::UnicodeString* formatted_string) const { + DCHECK(simple_format_[unit]); +- DCHECK(formatted_string->isEmpty() == TRUE); ++ DCHECK(formatted_string->isEmpty() == true); + UErrorCode error = U_ZERO_ERROR; + FormatNumberInPlural(*simple_format_[unit], + value, formatted_string, &error); +@@ -248,7 +248,7 @@ void Formatter::Format(TwoUnits units, + << "Detailed() not implemented for your (format, length) combination!"; + DCHECK(detailed_format_[units][1]) + << "Detailed() not implemented for your (format, length) combination!"; +- DCHECK(formatted_string->isEmpty() == TRUE); ++ DCHECK(formatted_string->isEmpty() == true); + UErrorCode error = U_ZERO_ERROR; + FormatNumberInPlural(*detailed_format_[units][0], value_1, + formatted_string, &error); +@@ -281,7 +281,7 @@ std::unique_ptr Formatter::InitFormat( + base::string16 pattern = l10n_util::GetStringUTF16(pluralities.id); + UErrorCode error = U_ZERO_ERROR; + std::unique_ptr format(new icu::MessageFormat( +- icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error)); ++ icu::UnicodeString(false, pattern.data(), pattern.length()), error)); + DCHECK(U_SUCCESS(error)); + if (format.get()) + return format; +-- +2.25.1 + diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..f59d80a312 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -38,18 +38,24 @@ config BR2_PACKAGE_QT5WEBENGINE # https://github.com/v8/v8/blob/5.6.326.55/gypfiles/toolchain.gypi#L1036-L1037 select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNSS select BR2_PACKAGE_LIBVPX select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WEBP_MUX select BR2_PACKAGE_QT5BASE_DBUS select BR2_PACKAGE_QT5BASE_EGLFS select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_JPEG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_PNG select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..30dc397edd 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -7,9 +7,8 @@ QT5WEBENGINE_VERSION = $(QT5_VERSION) QT5WEBENGINE_SITE = $(QT5_SITE) QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz -QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel host-bison host-flex \ + host-gperf host-icu host-ninja host-pkgconf host-python host-webp host-zlib QT5WEBENGINE_INSTALL_STAGING = YES include package/qt5/qt5webengine/chromium-latest.inc @@ -22,29 +21,61 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg endif -ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst +QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss + +ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y) +QT5WEBENGINE_DEPENDENCIES += host-freetype +endif + +ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y) +QT5WEBENGINE_DEPENDENCIES += host-libjpeg endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-system-ffmpeg \ + -feature-webengine-system-glib \ + -feature-webengine-system-harfbuzz \ + -feature-webengine-system-libevent \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libwebp \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-opus \ + -feature-webengine-system-png \ + -feature-webengine-system-zlib -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-system-icu \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn \ + -no-feature-webengine-v8-snapshot-support ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -feature-webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-feature-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -feature-webengine-alsa +else +QT5WEBENGINE_CONF_OPTS += -no-feature-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -feature-webengine-pulseaudio else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-feature-webengine-pulseaudio endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_SYSROOT_DIR="/" define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python @@ -58,7 +89,9 @@ define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) diff --git a/package/webp/webp.mk b/package/webp/webp.mk index d1462426c6..7c2625df23 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -19,6 +19,10 @@ WEBP_CONF_OPTS += \ --with-tiffincludedir=$(STAGING_DIR)/usr/include \ --with-tifflibdir=$(STAGING_DIR)/usr/lib +HOST_WEBP_CONF_OPTS += \ + --enable-libwebpdemux \ + --enable-libwebpmux + ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) WEBP_CONF_OPTS += --enable-libwebpdemux else @@ -56,3 +60,4 @@ WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg) WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From rainbox2k12 at msgsafe.io Mon Jan 17 11:44:19 2022 From: rainbox2k12 at msgsafe.io (rainbox2k12) Date: Mon, 17 Jan 2022 11:44:19 +0000 (UTC) Subject: [Buildroot] package/vte: install to staging Message-ID: <20220117114419.B8EAB3F465@exit1-us.msgsafe.io> Yann, Can you accept my patch as an attached text document? Cheers, Rainer \-- Sent using MsgSafe.io's Free Plan Private, encrypted, online communication For everyone. https://www.msgsafe.io -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: vte-install-staging.patch Type: text/x-patch Size: 648 bytes Desc: not available URL: From guillaume.bressaix at gmail.com Mon Jan 17 12:46:05 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Mon, 17 Jan 2022 13:46:05 +0100 Subject: [Buildroot] [PATCH] package/libxcrypt: bump to version 4.4.27 Message-ID: <20220117124605.17592-1-guillaume.bressaix@gmail.com> Signed-off-by: Guillaume W. Bres --- package/libxcrypt/libxcrypt.hash | 2 +- package/libxcrypt/libxcrypt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index b47f470020..2b95a35229 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 libxcrypt-4.4.26.tar.gz +sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz sha256 cead8b3d94a143f64ccb571ada1cea47a70a0b847c8d95306e8d78ed68951f3d LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 3c98b30dd5..65efa2bab9 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.26 +LIBXCRYPT_VERSION = 4.4.27 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB -- 2.20.1 From mail at dbrgn.ch Mon Jan 17 12:57:07 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 13:57:07 +0100 Subject: [Buildroot] DMARC on this mailing list In-Reply-To: <20220117102450.GC2313964@scaer> References: <20220117105017.28d6aacc@c3po> <20220117102450.GC2313964@scaer> Message-ID: <03d2153b-9a56-98d7-75d4-d447b3a8e303@dbrgn.ch> Hello Yann >> - Rewrite the "From:" header so that the e-mail appears to be coming >> from the ML itself. Put the original sender e-mail in the "Reply-To" >> header instead. If this is not being done, the sender IP (the mailing >> list) does not match the sender e-mail domain and SPF fails. Note >> that this *might* impact the buildroot ML reputation for some big >> mailservers. > > This is exactly what is going on. You can check for example on the > archives: > https://lore.kernel.org/buildroot/20220115101415.986123F41E at exit1-us.msgsafe.io/ Strange, when I view your e-mail (coming from the ML, containing the "buildroot mailing list" footer) raw data, I still see your address in the "From"-Header, and not buildroot at buildroot.org: From: "Yann E. MORIN" The *sender* is set to Buildroot: Sender: "buildroot" ...but DMARC evaluates the From-Header and not the Sender-Header, as far as I know. Some mailservers that sent me DMARC failure reports after sending e-mails to the buildroot mailing list were: - silica.com - uni-bonn.de - yahoo.com - aol.com mail.ru With a reject policy, my e-mail would have been dropped by those servers. Danilo From mail at dbrgn.ch Mon Jan 17 13:03:54 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 14:03:54 +0100 Subject: [Buildroot] DMARC on this mailing list In-Reply-To: <03d2153b-9a56-98d7-75d4-d447b3a8e303@dbrgn.ch> References: <20220117105017.28d6aacc@c3po> <20220117102450.GC2313964@scaer> <03d2153b-9a56-98d7-75d4-d447b3a8e303@dbrgn.ch> Message-ID: <417e5e0b-0944-05ee-1d80-c5b57d64e6b2@dbrgn.ch> > Strange, when I view your e-mail (coming from the ML, containing the > "buildroot mailing list" footer) raw data, I still see your address in > the "From"-Header, and not buildroot at buildroot.org: > > ? From: "Yann E. MORIN" The lore.kernel.org archive seems to confirm this, "From"-header is not rewritten: https://lore.kernel.org/buildroot/20220117102450.GC2313964 at scaer/ However, for the archive entry you sent, it does look correct, with a rewritten "From"-header: https://lore.kernel.org/buildroot/20220115101415.986123F41E at exit1-us.msgsafe.io/ I'm not sure what the reason for the difference between these two e-mails is. Danilo From flaniel at linux.microsoft.com Mon Jan 17 13:51:28 2022 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Mon, 17 Jan 2022 14:51:28 +0100 Subject: [Buildroot] [PATCH v2 2/2] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE In-Reply-To: <20220113224126.6b0801dd@windsurf> References: <20211222174905.71902-1-flaniel@linux.microsoft.com> <20211222174905.71902-3-flaniel@linux.microsoft.com> <20220113224126.6b0801dd@windsurf> Message-ID: <16263830.Pqoitud5sI@machine> Hi. Le jeudi 13 janvier 2022, 22:41:26 CET Thomas Petazzoni a ?crit : > Hello, > > On Wed, 22 Dec 2021 18:49:05 +0100 > > Francis Laniel wrote: > > CONFIG_DEBUG_BTF_INFO relies on pahole, so kernel DWARF are converted to > > BTF. If CONFIG_DEBUG_BTF_INFO is set and > > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE not, an error message is shown and > > .config is not written. > > > > Signed-off-by: Francis Laniel > > Thanks, applied, with one change. > > > diff --git a/package/pahole/Config.in.host b/package/pahole/Config.in.host > > index e427629632..521874961b 100644 > > --- a/package/pahole/Config.in.host > > +++ b/package/pahole/Config.in.host > > @@ -3,4 +3,6 @@ config BR2_PACKAGE_HOST_PAHOLE > > > > help > > > > Pahole and other DWARF utils. > > > > + Select this if you want to build a kernel with CONFIG_DEBUG_INFO_BTF > > set. + > > I've dropped this, because it's not really this option that should be > enabled if the kernel is configured with CONFIG_DEBUG_INFO_BTF, but the > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE option. Your modification made the thing clearer, thank you for it! > Thanks for your contribution! You are welcome! I thank you for the merge! > Best regards, Best regards. > Thomas From yann.morin.1998 at free.fr Mon Jan 17 15:54:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 16:54:18 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <20220117103218.GD2313964@scaer> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> <20220117101705.GB2313964@scaer> <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> <20220117103218.GD2313964@scaer> Message-ID: <20220117155418.GE2313964@scaer> Danilo, All, On 2022-01-17 11:32 +0100, Yann E. MORIN spake thusly: > On 2022-01-17 11:24 +0100, Danilo Bargen spake thusly: [--SNIP--] > > Maybe a corresponding paragraph could be added to the docs at > > https://nightly.buildroot.org/#_integration_of_cargo_based_packages ? > Yeah, so I already noticed that the nightly manual is not up to date... It appears that the local tree that serves to generate the manual was somehow corrupted, and we were only ever building the same old manual over and over again... It has now presumably been resolved, and [0] now reads: A crate can depend on other libraries from crates.io or git repositories, listed in its Cargo.toml file. Buildroot automatically takes care of downloading such dependencies as part of the download step of packages that use the cargo-package infrastructure. Such dependencies are then kept together with the package source code in the tarball cached in Buildroot?s DL_DIR, and therefore the hash of the package?s tarball includes such dependencies. [0] https://nightly.buildroot.org/#_infrastructure_for_cargo_based_packages Maybe it is not so obvious and prominently advertised, indeed; patches to improve the situation are most welcome! :-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 17 16:06:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 17:06:02 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> <20220117101705.GB2313964@scaer> <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> Message-ID: <20220117160602.GF2313964@scaer> Danilo, All, On 2022-01-17 11:24 +0100, Danilo Bargen spake thusly: > On 1/17/22 11:17, Yann E. MORIN wrote: > >I.e. it means that we prefer using tarballs as-is from their upstreams, > >when they are vendored; we only vendor packages which upstreams have > >not. > That makes sense! I am the maintainer of tealdeer, and I'll provide a > vendored source tarball for the next release. (I've heard of "cargo vendor" > before, but I haven't used it so far.) Note that vendoring is definitely not a requirement we impose on upstreams. We do prefer when the vendoring has been done by upstream, because it means (at least we hope it does!) that upstream has validated the fully vendored package, and thus we have some confidence everything works as expected. It also avoids the case where an uppstreams for a dependency mucks around with their releases: we already noticed the case where an upstream for a dependency did a re-tag of their release, thus breaking the vendoring of the dependees because it would no longer match the expected hashes in the cargo.toml (or go.mod?). Also (but that's mostly for go, IIRC), we also already noticed that some of the points of distribution (goproxies?) are serving some incorrect archives, thus causing download issues... However, if an upstream decides to not vendor (for whatever reason), then this is perfectly fine for Buildroot; this is exactly why the cargo infra has been made to support doing the vendoring. All in all, it is better that upstream vendors their releases, because it avoids any of the pitfals I mention above. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From tomazsmodis73 at hotmail.com Mon Jan 17 18:29:49 2022 From: tomazsmodis73 at hotmail.com (=?UTF-8?B?VG9tYcW+IFNtb2RpxaE=?=) Date: Mon, 17 Jan 2022 19:29:49 +0100 Subject: [Buildroot] buildroot Qt Raspberry Pi3b+ Message-ID: HI I am trying to build Qt everywhere 5.12.5 against buildroot Raspberry Pi3b+ image/sysroot. I use linaro 7.5 compiler. I rsync the sd card rootfs into sysroot on my host computer. Then I run: ./configure -release -opengl es2 -device linux-rasp-pi-g++ -device-option CROSS_COMPILE=~/RaspberryPiEGLFS/toolsNEW/bin/arm-linux-gnueabihf- -sysroot ~/RaspberryPiEGLFS/sysroot -opensource -confirm-license -skip qtwayland -skip qtlocation -skip qtscript -make libs -prefix /usr/local/qt5pi -extprefix ~/RaspberryPiEGLFS/qt5pi -hostprefix ~/RaspberryPiEGLFS/qt5 -no-use-gold-linker -v -no-gbm It starts to configure but I got error: Running configuration tests... * /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -dumpmachine arm-linux-gnueabihf Checking for valid makespec... * cd /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/config.tests/verifyspec && /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/bin/qmake "CONFIG -= qt debug_and_release app_bundle lib_bundle" "CONFIG += shared warn_off console single_arch" "QMAKE_CFLAGS += --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" "QMAKE_CXXFLAGS += --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" "QMAKE_LFLAGS += --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" -early "CONFIG += cross_compile" /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec * cd /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/config.tests/verifyspec && MAKEFLAGS= /usr/bin/make clean && MAKEFLAGS= /usr/bin/make rm -f verifyspec.o rm -f *~ core *.core /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -c -pipe -marm -mfpu=vfp -mtune=arm1176jzf-s -march=armv6zk -mabi=aapcs-linux -mfloat-abi=hard --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot -O2 -std=gnu++11 -w -fPIC -I/home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec -I. -I/home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/mkspecs/devices/linux-rasp-pi-g++ -o verifyspec.o /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec/verifyspec.cpp /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -mfloat-abi=hard --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot -Wl,-O1 -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/opt/vc/lib -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/usr/lib/arm-linux-gnueabihf -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/lib/arm-linux-gnueabihf -o verifyspec verifyspec.o /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/../lib/gcc/arm-linux-gnueabihf/4.8.3/../../../../arm-linux-gnueabihf/bin/ld: cannot find -lm collect2: error: ld returned 1 exit status make: *** [Makefile:68: verifyspec] Error 1 Note: Also available for Linux: linux-clang linux-icc ERROR: Cannot compile a minimal program. The toolchain or QMakeSpec is broken. Minimal program? What am I missing? Thomas p.s. If I rsync full OS Buster image/rootfs into sysroot on my host it configures ok. I can make and make install the Qt binaries. I can compile Qt app against Buster/Raspbian sysroot. Then I run buildroot Raspberry Pi OS that I have build and wrtten on another sc card and it runs/loads ok. The I copy my Qt elf file to buildroots directory and I get ld.so/libc.so/interpreter problem! I understand this issue and I think if I could build Qt eveywhere against buildroots rootfs it would be ok!? -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Mon Jan 17 18:37:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:37:24 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <70C0CBB8-3896-423C-B7B7-135E02A6AF12@benettiengineering.com> References: <759da9ea-e1b8-353c-9745-1f9d91038f08@benettiengineering.com> <70C0CBB8-3896-423C-B7B7-135E02A6AF12@benettiengineering.com> Message-ID: <0a38b60e-a2b2-e4b4-5780-97680f2563c0@benettiengineering.com> Forgotten again to Cc ML. Sorry! -- Giulio Benetti Benetti Engineering sas On 17/01/22 15:16, Giulio Benetti wrote: > >> Il giorno 17 gen 2022, alle ore 12:38, Giulio Benetti ha scritto: >> >> ?Hi Sergey, >> >>> On 16/01/22 19:19, Sergey Kuzminov wrote: >>> 16.01.2022 18:29, Giulio Benetti: >>>> Hi Sergey, Peter, All, >>>> >>>> +# Architecture >>>> BR2_arm=y >>>> BR2_cortex_a7=y >>>> BR2_ARM_FPU_VFPV4=y >>>> ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards with sunxi A7 and can speed things up. >>>> >>> Hi, Giulio. I will test, thanks. >>>>> +# Wireless driver and firmware >>>>> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >>>>> BR2_PACKAGE_XR819_XRADIO=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >>>> Can you point a test case? This way I could try to fix building and you could test if it works. >>>> >>>> Thank you >>>> Best regards >>>> ?- >>>> Giulio Benetti >>>> Benetti Engineering sas >>>> >>> To check, set the parameters in the current version of Buildroot >>> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >>> BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.15" >>> in the configs/orangepi_zero_defconfig file >>> make orangepi_zero_defconfig >>> make >> >> I've fixed the building of this ^^^: >> https://github.com/giuliobenetti/buildroot/commit/5e8a422b231f395d6674a2310ef0ffbf64ab38dc >> >> Can you test if it works runtime? >> >> This way your actual patch can change using latest Linux(5.16.1). >> >> I've already opened a PR for that patch: >> https://github.com/fifteenhex/xradio/pull/15 > > I haven?t checked there was already a pending PR for this: > https://github.com/fifteenhex/xradio/pull/14 > > Anyway they do the same the thing with 2 different approaches. > > Best regards > Giulio Benetti > Benetti Engineering sas > >> >> Once my patch will be merged I will bump xradio version to latest in Buildroot. >> >> Thank you >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 17 18:45:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:45:59 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/octavo_osd32mp1_brk: new defconfig In-Reply-To: <20211130103919.19428-1-kory.maincent@bootlin.com> References: <20211130103919.19428-1-kory.maincent@bootlin.com> Message-ID: Hi Kory, On 30/11/21 11:39, Kory Maincent wrote: [SNIP] > diff --git a/configs/octavo_osd32mp1_brk_defconfig b/configs/octavo_osd32mp1_brk_defconfig > new file mode 100644 > index 0000000000..6b775282c0 > --- /dev/null > +++ b/configs/octavo_osd32mp1_brk_defconfig > @@ -0,0 +1,59 @@ > +# architecture > +BR2_arm=y > +BR2_cortex_a7=y Here I think you should add: BR2_ARM_FPU_NEON_VFPV4=y This way, while building, you will have FPU that can use both VFPV4 and NEON. This can speed some package up. Thank you Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 17 18:54:15 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:54:15 +0100 Subject: [Buildroot] [PATCH 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: <20211106181424.299041-2-peron.clem@gmail.com> References: <20211106181424.299041-1-peron.clem@gmail.com> <20211106181424.299041-2-peron.clem@gmail.com> Message-ID: Hi Cl?ment, On 06/11/21 19:14, Cl?ment P?ron wrote: > libfdt fails to compile with on CI. > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > > Bump U-boot and also Kernel and ATF. the commit log and subject doesn't explain that the version bumping(as I suspect) fix the uboot build failure(as I can interpret). Can you please improve commit log by specifying that while bumping(u-boot I think) that error is fixed? And please add: Fixes: the link of the CI failure. Thank you Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Cl?ment P?ron > --- > configs/beelink_gs1_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index 1872aabdf0..ca953df3ea 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" > > -# Kernel Linux headers same as kernel, a 5.5 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y > +# Kernel Linux headers same as kernel, 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" > @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" > > # Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > From giulio.benetti at benettiengineering.com Mon Jan 17 18:47:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:47:31 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/octavo_osd32mp1_red: new defconfig In-Reply-To: <20211130103919.19428-2-kory.maincent@bootlin.com> References: <20211130103919.19428-1-kory.maincent@bootlin.com> <20211130103919.19428-2-kory.maincent@bootlin.com> Message-ID: <1a9f0d17-f5a1-9617-1320-a9169b15307b@benettiengineering.com> Hi Kory, On 30/11/21 11:39, Kory Maincent wrote: [SNIP] > diff --git a/configs/octavo_osd32mp1_red_defconfig b/configs/octavo_osd32mp1_red_defconfig > new file mode 100644 > index 0000000000..1ff45429d2 > --- /dev/null > +++ b/configs/octavo_osd32mp1_red_defconfig > @@ -0,0 +1,59 @@ > +# architecture > +BR2_arm=y > +BR2_cortex_a7=y as for patch [1/2] Here I think you should add: BR2_ARM_FPU_NEON_VFPV4=y This way, while building, you will have FPU that can use both VFPV4 and NEON. This can speed some package up. Thank you Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 17 18:55:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:55:08 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <20211106181424.299041-1-peron.clem@gmail.com> References: <20211106181424.299041-1-peron.clem@gmail.com> Message-ID: Hi Cl?ment, On 06/11/21 19:14, Cl?ment P?ron wrote: > For the moment Beelink GS1 use a default rootfs size of 60M > which make sometimes the build failed due to missing space. > > Increase the rootfs size to 120M. > > Signed-off-by: Cl?ment P?ron Reviewed-by: Giulio Benetti -- Giulio Benetti Benetti Engineering sas > --- > configs/beelink_gs1_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index e88f3e3b69..1872aabdf0 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -24,6 +24,7 @@ BR2_PACKAGE_AUTOSSH=y > BR2_PACKAGE_DROPBEAR=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > From giulio.benetti at benettiengineering.com Mon Jan 17 19:14:05 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 20:14:05 +0100 Subject: [Buildroot] [PATCH 1/1] configs/toradex_colibri_imx6: initial commit In-Reply-To: <20210610105739.488491-1-dev@open-music-kontrollers.ch> References: <20210610105739.488491-1-dev@open-music-kontrollers.ch> Message-ID: <61e64587-f5f2-2a38-5b0a-4cbb9a708557@benettiengineering.com> Hi Hanspeter, On 10/06/21 12:57, Hanspeter Portner wrote: > Based on configs/toradex_apalis_imx6 with Toradex' mainline linux/uboot > branches. > > Tested on: > Module: 'Toradex Col IMX6DL 512MB V1.0A' > Evalboard: 'Toradex Col Evaluation V3.2A' Overall commit log is not that clear. This patch "adds initial support(is it complete?) for toradex_colibri_imx6". Can you please reword this commit log? And... > Signed-off-by: Hanspeter Portner > --- > board/toradex/colibri-imx6/genimage.cfg | 15 +++++++ > board/toradex/colibri-imx6/post-image.sh | 20 +++++++++ > board/toradex/colibri-imx6/readme.txt | 53 ++++++++++++++++++++++++ > board/toradex/colibri-imx6/uEnv.txt | 7 ++++ > configs/toradex_colibri_imx6_defconfig | 25 +++++++++++ > 5 files changed, 120 insertions(+) > create mode 100644 board/toradex/colibri-imx6/genimage.cfg > create mode 100755 board/toradex/colibri-imx6/post-image.sh > create mode 100644 board/toradex/colibri-imx6/readme.txt > create mode 100644 board/toradex/colibri-imx6/uEnv.txt > create mode 100644 configs/toradex_colibri_imx6_defconfig > > diff --git a/board/toradex/colibri-imx6/genimage.cfg b/board/toradex/colibri-imx6/genimage.cfg > new file mode 100644 > index 0000000000..91c927c723 > --- /dev/null > +++ b/board/toradex/colibri-imx6/genimage.cfg > @@ -0,0 +1,15 @@ > +# Minimal SD card image for the Toradex Colibri i.MX6 COM > +# > +# It does not need a boot section for a bootloader since it is booted > +# from its internal flash memory (eMMC). I'm not used to imx6 anymore for many years, so I don't remember how bootloader can automatically load u-boot and linux. Maybe here you didn't explain well what's going on and this should go for sure on commit log too. > + > +image sdcard.img { > + hdimage { > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext2" > + size = 512M > + } > +} > diff --git a/board/toradex/colibri-imx6/post-image.sh b/board/toradex/colibri-imx6/post-image.sh > new file mode 100755 > index 0000000000..b95e175a29 > --- /dev/null > +++ b/board/toradex/colibri-imx6/post-image.sh > @@ -0,0 +1,20 @@ > +#!/usr/bin/env bash > + > +GENIMAGE_CFG="$(dirname $0)/genimage.cfg" > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > +# copy the uEnv.txt to the output/images directory > +cp board/toradex/colibri-imx6/uEnv.txt $BINARIES_DIR/uEnv.txt > + > +rm -rf "${GENIMAGE_TMP}" > + > +# generate rootfs.img > +genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > +RET=${?} > +exit ${RET} > diff --git a/board/toradex/colibri-imx6/readme.txt b/board/toradex/colibri-imx6/readme.txt > new file mode 100644 > index 0000000000..50078db173 > --- /dev/null > +++ b/board/toradex/colibri-imx6/readme.txt > @@ -0,0 +1,53 @@ > +Toradex Colibri i.MX6 Computer on Module > + > +Intro > +===== > + > +The Colibri iMX6 is a SODIMM sized computer module based on NXP?/Freescale > +i.MX 6 SoC. The module targets a wide range of applications, including: > +Medical Devices, Navigation, Industrial Automation, HMIs, Avionics, > +Entertainment system, POS, Data Acquisition, Thin Clients, Robotics, Gaming > +and much more. It offers a wide range of interfaces from simple GPIOs, industry > +standard I2C, SPI, CAN, and UART buses through to high speed USB 2.0 interfaces > +and a 16/32bit external memory bus (parallel bus). The HDMI interface makes it > +very easy to connect large, full HD resolution displays > + > +https://www.toradex.com/computer-on-modules/colibri-arm-family/nxp-freescale-imx6 > + > +It supports one carrier boards: > + > +Colibri Evaluation Board > +https://www.toradex.com/products/carrier-board/colibri-evaluation-board > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make toradex_colibri_imx6_defconfig > + > +Compile everything and build the rootfs image: > + > + $ make > + So here basically you only build the rootfs. > +How to boot the image > +===================== > + > +The board only boots from its internal flash memory eMMC, so the > +bootloader image should be copied to it, following the procedures > +described in Toradex website. > + > +http://developer.toradex.com/knowledge-base/flashing-linux-on-imx6-modules > + > +Buildroot prepares a "sdcard.img" in output/images/ with the kernel > +image, device tree and a root filesystem, ready to be dumped on an SD > +card. > + > + $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M > + > +To boot from the SD card, you should change the U-Boot > +environment. Since U-Boot is running from internal eMMC, you will need > +to access its command line prompt and manually set the necessary > +variables to boot from the external SD card. For convenience, you can > +use uEnv.txt provided in output/images/ as a reference to create the > +necessary U-Boot variables to boot from the SD card. Ah here it's clarified. But this only creates a rootfs and need some external intervention. Couldn't you create support including u-boot in the genimage.cfg? Because what I expect from a defconfig that produces a sdcard.img is that I flash it and it simply works. Otherwise, please rename the defconfig by placing _rootfs_only suffix at the end. But I'd go for having a unique image with u-boot included. > diff --git a/board/toradex/colibri-imx6/uEnv.txt b/board/toradex/colibri-imx6/uEnv.txt > new file mode 100644 > index 0000000000..e8fec787aa > --- /dev/null > +++ b/board/toradex/colibri-imx6/uEnv.txt > @@ -0,0 +1,7 @@ > +setenv boot_file 'zImage' > +setenv fdt_file 'imx6dl-colibri-eval-v3.dtb' > +setenv sdargs 'ip=off root=/dev/mmcblk0p1 rw,noatime rootfstype=ext4 rootwait' > +setenv sddtbload 'ext2load mmc 1:1 ${fdt_addr_r} boot/${fdt_file}' > +setenv sdkernelload 'ext2load mmc 1:1 ${kernel_addr_r} boot/${boot_file}' > +setenv bootcmd 'run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} ${vidargs}; echo Booting from SD card...; run sddtbload; run sdkernelload; bootz ${kernel_addr_r} - ${fdt_addr_r}' > +run bootcmd > diff --git a/configs/toradex_colibri_imx6_defconfig b/configs/toradex_colibri_imx6_defconfig > new file mode 100644 > index 0000000000..0e50381579 > --- /dev/null > +++ b/configs/toradex_colibri_imx6_defconfig > @@ -0,0 +1,25 @@ > +BR2_arm=y > +BR2_cortex_a9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/toradex/colibri-imx6/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.toradex.com/linux-toradex.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="toradex_5.4.y" > +BR2_LINUX_KERNEL_DEFCONFIG="toradex-imx_v6_v7" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-colibri-eval-v3" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.toradex.com/u-boot-toradex.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="toradex_2020.07" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="colibri_imx6" > +BR2_TARGET_UBOOT_FORMAT_IMG=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="SPL" Where does u-boot binary goes into memory? Because as I can see, eMMC u-boot will be used instead of the sd-card one. So in case you only want to produce a rootfs with linux inside, I would also remove the uboot building here. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From Alexey.Brodkin at synopsys.com Mon Jan 17 19:20:17 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 17 Jan 2022 22:20:17 +0300 Subject: [Buildroot] [PATCH] configs/cubieboard2: U-Boot needs Python3 & OpenSSL Message-ID: <20220117192017.8841-1-abrodkin@synopsys.com> After update of the U-Boot [1] we were missing dependency on Python3, and so were seeing failures like in [2]: ------------------------->8-------------------- HOSTLD scripts/dtc/dtc scripts/dtc/pylibfdt/libfdt_wrap.c:154:11: fatal error: Python.h: No such file or directory 154 | # include | ^~~~~~~~~~ compilation terminated. error: command '/usr/bin/gcc' failed with exit code 1 ------------------------->8-------------------- So that get fixed with "BR2_TARGET_UBOOT_NEEDS_PYTHON3=y". And then once we use Python3, we also need OpenSSL, similarly to [3] and the likes. So do it with "BR2_TARGET_UBOOT_NEEDS_OPENSSL=y". Hopefully now all starts to build w/o any issues. And while at it let's add a bit more structure to the config! [1] https://git.buildroot.net/buildroot/commit/?id=06f10a88f30b73aaea5c0e0888d7ba9d9a6420f3 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650570 [3] https://git.buildroot.net/buildroot/commit/?id=cf2a7663ccc6089e98e0d6ec39fa8623749c0c24 Signed-off-by: Alexey Brodkin --- P.S. I didn't see that problem on the U-Boot bump, as I built all locally and quite obviously had Python3 and all the headers installed in the system. --- configs/cubieboard2_defconfig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index a9356295c1..18337fac72 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,32 +1,42 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y + # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 17 19:58:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 20:58:52 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220114211525.2697606-1-heiko.thiery@gmail.com> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> Message-ID: <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> Hi Heiko, I've missed one thing below, On 14/01/22 22:15, Heiko Thiery wrote: [SNIP] > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > new file mode 100644 > index 0000000000..5b5648cc14 > --- /dev/null > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -0,0 +1,59 @@ > +# Architecture > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: BR2_ARM_FPU_VFPV4D16 This is to achieve the maximum performance. Kind regards! -- Giulio Benetti Benetti Engineering sas > + > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > From giulio.benetti at benettiengineering.com Mon Jan 17 20:06:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 21:06:47 +0100 Subject: [Buildroot] [PATCH 1/1] configs/pcengines_apu2_defconfig: bump kernel to 5.16 In-Reply-To: <20220116211557.71866ff6@c3po> References: <20220116211557.71866ff6@c3po> Message-ID: <44c15385-c790-6867-fc1f-b24c922b7e40@benettiengineering.com> Hi Danilo, On 16/01/22 21:15, Danilo Bargen wrote: > This fixes the compile errors that were present with the previous kernel > version (4.19). Is there a build failure log url that you can point? I would also mention that you are refactoring defconfig file in commit log. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Danilo Bargen > --- > configs/pcengines_apu2_defconfig | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > -- > 2.34.1 > > diff --git a/configs/pcengines_apu2_defconfig > b/configs/pcengines_apu2_defconfig index 68cebb8f6a..eb30f6aee7 100644 > --- a/configs/pcengines_apu2_defconfig > +++ b/configs/pcengines_apu2_defconfig > @@ -1,16 +1,26 @@ > +# Architecture > BR2_x86_64=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y > -BR2_TARGET_GENERIC_HOSTNAME="apu2" > -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > -BR2_SYSTEM_DHCP="eth0" > + > +# Kernel > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" > + > +# Default hostname and TTY > +BR2_TARGET_GENERIC_HOSTNAME="apu2" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > + > +# Networking > +BR2_SYSTEM_DHCP="eth0" > + > +# Rootfs > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_ISO9660=y > BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" > BR2_TARGET_ROOTFS_ISO9660_HYBRID=y > -# BR2_TARGET_ROOTFS_TAR is not set > + > +# Bootloader > BR2_TARGET_SYSLINUX=y > From giulio.benetti at benettiengineering.com Mon Jan 17 21:06:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 22:06:36 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> References: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> <759da9ea-e1b8-353c-9745-1f9d91038f08@benettiengineering.com> <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> Message-ID: <3d6ebc46-f664-6125-b378-59c2d9535441@benettiengineering.com> Hi Sergey, please keep ML in Cc(reply to all), thank you I follow with another e-mail -- Giulio Benetti Benetti Engineering sas On 17/01/22 21:56, Sergey Kuzminov wrote: > Hi, Giulio. Wifi is working, thanks. > > # uname -a > Linux OrangePi_Zero 5.16.1 #1 SMP Mon Jan 17 21:46:45 MSK 2022 armv7l > GNU/Linux > # iwconfig > lo??????? no wireless extensions. > > eth0????? no wireless extensions. > > wlan0???? IEEE 802.11? ESSID:"AFD7DF" > ????????? Mode:Managed? Frequency:2.452 GHz? Access Point: > 2C:C8:1B:4C:E1:F3 > ????????? Bit Rate=26 Mb/s?? Tx-Power=20 dBm > ????????? Retry short limit:7?? RTS thr:off?? Fragment thr:off > ????????? Encryption key:off > ????????? Power Management:on > ????????? Link Quality=28/70? Signal level=-82 dBm > ????????? Rx invalid nwid:0? Rx invalid crypt:0? Rx invalid frag:0 > ????????? Tx excessive retries:4? Invalid misc:0?? Missed beacon:0 > > # ifconfig > eth0????? Link encap:Ethernet? HWaddr 02:42:FD:46:1D:D3 > ????????? UP BROADCAST MULTICAST? MTU:1500? Metric:1 > ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 > ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) > ????????? Interrupt:43 > > lo??????? Link encap:Local Loopback > ????????? inet addr:127.0.0.1? Mask:255.0.0.0 > ????????? UP LOOPBACK RUNNING? MTU:65536? Metric:1 > ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 > ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) > > wlan0???? Link encap:Ethernet? HWaddr 12:42:FD:46:1D:D3 > ????????? inet addr:192.168.10.240? Bcast:192.168.10.255 Mask:255.255.255.0 > ????????? UP BROADCAST RUNNING MULTICAST? MTU:1500? Metric:1 > ????????? RX packets:88 errors:0 dropped:34 overruns:0 frame:0 > ????????? TX packets:14 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:13516 (13.1 KiB)? TX bytes:1927 (1.8 KiB) > > # ping google.com > PING google.com (216.239.38.120): 56 data bytes > 64 bytes from 216.239.38.120: seq=0 ttl=102 time=54.890 ms > 64 bytes from 216.239.38.120: seq=1 ttl=102 time=54.102 ms > 64 bytes from 216.239.38.120: seq=2 ttl=102 time=51.583 ms > ^C > --- google.com ping statistics --- > 3 packets transmitted, 3 packets received, 0% packet loss > round-trip min/avg/max = 51.583/53.525/54.890 ms > > > > 17.01.2022 14:38, Giulio Benetti ?????: >> Hi Sergey, >> >> On 16/01/22 19:19, Sergey Kuzminov wrote: >>> 16.01.2022 18:29, Giulio Benetti: >>>> Hi Sergey, Peter, All, >>>> >>>> +# Architecture >>>> BR2_arm=y >>>> BR2_cortex_a7=y >>>> BR2_ARM_FPU_VFPV4=y >>>> ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards >>>> with sunxi A7 and can speed things up. >>>> >>> Hi, Giulio. I will test, thanks. >>> >>> >>>>> +# Wireless driver and firmware >>>>> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >>>>> BR2_PACKAGE_XR819_XRADIO=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >>>> Can you point a test case? This way I could try to fix building and >>>> you could test if it works. >>>> >>>> Thank you >>>> Best regards >>>> ?- >>>> Giulio Benetti >>>> Benetti Engineering sas >>>> >>> To check, set the parameters in the current version of Buildroot >>> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >>> BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.15" >>> in the configs/orangepi_zero_defconfig file >>> >>> make orangepi_zero_defconfig >>> make >> >> I've fixed the building of this ^^^: >> https://github.com/giuliobenetti/buildroot/commit/5e8a422b231f395d6674a2310ef0ffbf64ab38dc >> >> >> Can you test if it works runtime? >> >> This way your actual patch can change using latest Linux(5.16.1). >> >> I've already opened a PR for that patch: >> https://github.com/fifteenhex/xradio/pull/15 >> >> Once my patch will be merged I will bump xradio version to latest in >> Buildroot. >> >> Thank you >> Best regards > > -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 17 21:07:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 22:07:39 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: add patch to build with Linux > 5.12 Message-ID: <20220117210739.2022551-1-giulio.benetti@benettiengineering.com> As explained in the local patch itself of_get_mac_address() has changed, so we need to check against Linux version and use it slightly differently. Patch is pending upstream: https://github.com/fifteenhex/xradio/pull/15 I've realized only later there was already an opened PR for this, anyway IMHO I think my patch is written a little better, so please accept it. And most of all Sergey already tested it and it works: https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html Signed-off-by: Giulio Benetti --- ...fix-building-with-Linux-version-5.12.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch new file mode 100644 index 0000000000..a1d91e2ff7 --- /dev/null +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch @@ -0,0 +1,68 @@ +From 990b19664488a8a3bb8d019a3a6b242dd8ad4c29 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 17 Jan 2022 12:26:00 +0100 +Subject: [PATCH] main.c: fix building with Linux version > 5.12 + +of_get_mac_address() on Linux version > 5.12 requires mac pointer as second +argument and return an int. So let's deal with it by checking linux version +to make it compatible with both Linux version > 5.12 and not. + +Signed-off-by: Giulio Benetti +--- + main.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/main.c b/main.c +index b60e18d..d354521 100644 +--- a/main.c ++++ b/main.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "xradio.h" + #include "fwio.h" +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) + int if_id; + struct ieee80211_hw *dev; + struct xradio_common *hw_priv; ++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 12, 0) ++ unsigned char addr[ETH_ALEN]; ++#else + unsigned char randomaddr[ETH_ALEN]; + const unsigned char *addr = NULL; ++#endif + + //init xradio_common + dev = xradio_init_common(sizeof(struct xradio_common)); +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) + hw_priv->sdio_func = func; + sdio_set_drvdata(func, hw_priv); + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 12, 0) ++ // fill in mac addresses ++ if (hw_priv->pdev->of_node) { ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); ++ } ++ if (err < 0) { ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); ++ eth_random_addr(addr); ++ } ++#else + // fill in mac addresses + if (hw_priv->pdev->of_node) { + addr = of_get_mac_address(hw_priv->pdev->of_node); +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) + eth_random_addr(randomaddr); + addr = randomaddr; + } ++#endif ++ + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); + hw_priv->addresses[1].addr[5] += 0x01; +-- +2.25.1 + -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 17 21:08:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 22:08:20 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> References: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> <759da9ea-e1b8-353c-9745-1f9d91038f08@benettiengineering.com> <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> Message-ID: <4da691a9-cdba-1a3c-0aed-f2b8ac072e0d@benettiengineering.com> Hi Sergey, please keep ML in Cc, On 17/01/22 21:56, Sergey Kuzminov wrote: > Hi, Giulio. Wifi is working, thanks. > > # uname -a > Linux OrangePi_Zero 5.16.1 #1 SMP Mon Jan 17 21:46:45 MSK 2022 armv7l > GNU/Linux > # iwconfig > lo??????? no wireless extensions. > > eth0????? no wireless extensions. > > wlan0???? IEEE 802.11? ESSID:"AFD7DF" > ????????? Mode:Managed? Frequency:2.452 GHz? Access Point: > 2C:C8:1B:4C:E1:F3 > ????????? Bit Rate=26 Mb/s?? Tx-Power=20 dBm > ????????? Retry short limit:7?? RTS thr:off?? Fragment thr:off > ????????? Encryption key:off > ????????? Power Management:on > ????????? Link Quality=28/70? Signal level=-82 dBm > ????????? Rx invalid nwid:0? Rx invalid crypt:0? Rx invalid frag:0 > ????????? Tx excessive retries:4? Invalid misc:0?? Missed beacon:0 > > # ifconfig > eth0????? Link encap:Ethernet? HWaddr 02:42:FD:46:1D:D3 > ????????? UP BROADCAST MULTICAST? MTU:1500? Metric:1 > ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 > ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) > ????????? Interrupt:43 > > lo??????? Link encap:Local Loopback > ????????? inet addr:127.0.0.1? Mask:255.0.0.0 > ????????? UP LOOPBACK RUNNING? MTU:65536? Metric:1 > ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 > ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) > > wlan0???? Link encap:Ethernet? HWaddr 12:42:FD:46:1D:D3 > ????????? inet addr:192.168.10.240? Bcast:192.168.10.255 Mask:255.255.255.0 > ????????? UP BROADCAST RUNNING MULTICAST? MTU:1500? Metric:1 > ????????? RX packets:88 errors:0 dropped:34 overruns:0 frame:0 > ????????? TX packets:14 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:13516 (13.1 KiB)? TX bytes:1927 (1.8 KiB) > > # ping google.com > PING google.com (216.239.38.120): 56 data bytes > 64 bytes from 216.239.38.120: seq=0 ttl=102 time=54.890 ms > 64 bytes from 216.239.38.120: seq=1 ttl=102 time=54.102 ms > 64 bytes from 216.239.38.120: seq=2 ttl=102 time=51.583 ms > ^C > --- google.com ping statistics --- > 3 packets transmitted, 3 packets received, 0% packet loss > round-trip min/avg/max = 51.583/53.525/54.890 ms > Thanks a lot for trying. So please bump linux version to latest(5.16.1) and send V2 patch. In the meanwhile I've just sent a patch for rx819-radio: https://patchwork.ozlabs.org/project/buildroot/patch/20220117210739.2022551-1-giulio.benetti at benettiengineering.com/ So when you send V2, please create a cover-letter where you state my patch for rx819-radio is needed to work. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > > 17.01.2022 14:38, Giulio Benetti ?????: >> Hi Sergey, >> >> On 16/01/22 19:19, Sergey Kuzminov wrote: >>> 16.01.2022 18:29, Giulio Benetti: >>>> Hi Sergey, Peter, All, >>>> >>>> +# Architecture >>>> BR2_arm=y >>>> BR2_cortex_a7=y >>>> BR2_ARM_FPU_VFPV4=y >>>> ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards >>>> with sunxi A7 and can speed things up. >>>> >>> Hi, Giulio. I will test, thanks. >>> >>> >>>>> +# Wireless driver and firmware >>>>> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >>>>> BR2_PACKAGE_XR819_XRADIO=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >>>> Can you point a test case? This way I could try to fix building and >>>> you could test if it works. >>>> >>>> Thank you >>>> Best regards >>>> ?- >>>> Giulio Benetti >>>> Benetti Engineering sas >>>> >>> To check, set the parameters in the current version of Buildroot >>> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >>> BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.15" >>> in the configs/orangepi_zero_defconfig file >>> >>> make orangepi_zero_defconfig >>> make >> >> I've fixed the building of this ^^^: >> https://github.com/giuliobenetti/buildroot/commit/5e8a422b231f395d6674a2310ef0ffbf64ab38dc >> >> >> Can you test if it works runtime? >> >> This way your actual patch can change using latest Linux(5.16.1). >> >> I've already opened a PR for that patch: >> https://github.com/fifteenhex/xradio/pull/15 >> >> Once my patch will be merged I will bump xradio version to latest in >> Buildroot. >> >> Thank you >> Best regards > > From kuzminov.sergey81 at gmail.com Mon Jan 17 21:19:30 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Tue, 18 Jan 2022 00:19:30 +0300 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <4da691a9-cdba-1a3c-0aed-f2b8ac072e0d@benettiengineering.com> References: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> <759da9ea-e1b8-353c-9745-1f9d91038f08@benettiengineering.com> <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> <4da691a9-cdba-1a3c-0aed-f2b8ac072e0d@benettiengineering.com> Message-ID: <4f564638-77fa-be2c-6bed-2ea5937695d7@gmail.com> Ok. I'll make a v2 patch tomorrow, I want to check something else (BR2_ARM_EABIHF, BR2_ARM_FPU_NEON_VFPV4). 18.01.2022 00:08, Giulio Benetti ?????: > Hi Sergey, > > please keep ML in Cc, > > On 17/01/22 21:56, Sergey Kuzminov wrote: >> Hi, Giulio. Wifi is working, thanks. >> >> # uname -a >> Linux OrangePi_Zero 5.16.1 #1 SMP Mon Jan 17 21:46:45 MSK 2022 armv7l >> GNU/Linux >> # iwconfig >> lo??????? no wireless extensions. >> >> eth0????? no wireless extensions. >> >> wlan0???? IEEE 802.11? ESSID:"AFD7DF" >> ? ????????? Mode:Managed? Frequency:2.452 GHz? Access Point: >> 2C:C8:1B:4C:E1:F3 >> ? ????????? Bit Rate=26 Mb/s?? Tx-Power=20 dBm >> ? ????????? Retry short limit:7?? RTS thr:off?? Fragment thr:off >> ? ????????? Encryption key:off >> ? ????????? Power Management:on >> ? ????????? Link Quality=28/70? Signal level=-82 dBm >> ? ????????? Rx invalid nwid:0? Rx invalid crypt:0? Rx invalid frag:0 >> ? ????????? Tx excessive retries:4? Invalid misc:0?? Missed beacon:0 >> >> # ifconfig >> eth0????? Link encap:Ethernet? HWaddr 02:42:FD:46:1D:D3 >> ? ????????? UP BROADCAST MULTICAST? MTU:1500? Metric:1 >> ? ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 >> ? ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 >> ? ????????? collisions:0 txqueuelen:1000 >> ? ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) >> ? ????????? Interrupt:43 >> >> lo??????? Link encap:Local Loopback >> ? ????????? inet addr:127.0.0.1? Mask:255.0.0.0 >> ? ????????? UP LOOPBACK RUNNING? MTU:65536? Metric:1 >> ? ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 >> ? ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 >> ? ????????? collisions:0 txqueuelen:1000 >> ? ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) >> >> wlan0???? Link encap:Ethernet? HWaddr 12:42:FD:46:1D:D3 >> ? ????????? inet addr:192.168.10.240? Bcast:192.168.10.255 >> Mask:255.255.255.0 >> ? ????????? UP BROADCAST RUNNING MULTICAST? MTU:1500? Metric:1 >> ? ????????? RX packets:88 errors:0 dropped:34 overruns:0 frame:0 >> ? ????????? TX packets:14 errors:0 dropped:0 overruns:0 carrier:0 >> ? ????????? collisions:0 txqueuelen:1000 >> ? ????????? RX bytes:13516 (13.1 KiB)? TX bytes:1927 (1.8 KiB) >> >> # ping google.com >> PING google.com (216.239.38.120): 56 data bytes >> 64 bytes from 216.239.38.120: seq=0 ttl=102 time=54.890 ms >> 64 bytes from 216.239.38.120: seq=1 ttl=102 time=54.102 ms >> 64 bytes from 216.239.38.120: seq=2 ttl=102 time=51.583 ms >> ^C >> --- google.com ping statistics --- >> 3 packets transmitted, 3 packets received, 0% packet loss >> round-trip min/avg/max = 51.583/53.525/54.890 ms >> > > Thanks a lot for trying. So please bump linux version to > latest(5.16.1) and send V2 patch. In the meanwhile I've just sent a > patch for rx819-radio: > https://patchwork.ozlabs.org/project/buildroot/patch/20220117210739.2022551-1-giulio.benetti at benettiengineering.com/ > > > So when you send V2, please create a cover-letter where you state my > patch for rx819-radio is needed to work. > > Thank you! > Best regards From yann.morin.1998 at free.fr Mon Jan 17 21:34:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 22:34:41 +0100 Subject: [Buildroot] [git commit] package/nodejs: security bump to version 14.18.3 Message-ID: <20220117212825.850138349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9096036f00c5a0f37e3b3916417f0d0b166b73e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is specifically defined to use a particular SAN type, can result in bypassing name-constrained intermediates. Node.js was accepting URI SAN types, which PKIs are often not defined to use. Additionally, when a protocol allows URI SANs, Node.js did not match the URI correctly. Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) Node.js converts SANs (Subject Alternative Names) to a string format. It uses this string to check peer certificates against hostnames when validating connections. The string format was subject to an injection vulnerability when name constraints were used within a certificate chain, allowing the bypass of these name constraints. Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) Node.js did not handle multi-value Relative Distinguished Names correctly. Attackers could craft certificate subjects containing a single-value Relative Distinguished Name that would be interpreted as a multi-value Relative Distinguished Name, for example, in order to inject a Common Name that would allow bypassing the certificate subject verification. Prototype pollution via console.table properties (Low)(CVE-2022-21824) Due to the formatting logic of the console.table() function it was not safe to allow user controlled input to be passed to the properties parameter while simultaneously passing a plain object with at least one property as the first parameter, which could be __proto__. The prototype pollution has very limited control, in that it only allows an empty string to be assigned numerical keys of the object prototype. For details, see the advisory: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f330757341..6365ef852b 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt -sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz +# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt +sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 7d5c93eb93..727af6dc50 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.2 +NODEJS_VERSION = 14.18.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ From yann.morin.1998 at free.fr Mon Jan 17 21:37:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 22:37:21 +0100 Subject: [Buildroot] [PATCH] package/nodejs: security bump to version 14.18.3 In-Reply-To: <20220114103825.1529-1-peter@korsgaard.com> References: <20220114103825.1529-1-peter@korsgaard.com> Message-ID: <20220117213721.GG2313964@scaer> Peter, All, On 2022-01-14 11:38 +0100, Peter Korsgaard spake thusly: > Fixes the following security issues: [--SNIP--] > For details, see the advisory: > https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ It was also reported on IRC that this should also fix some build issue with python 3.10. > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nodejs/nodejs.hash | 4 ++-- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash > index f330757341..6365ef852b 100644 > --- a/package/nodejs/nodejs.hash > +++ b/package/nodejs/nodejs.hash > @@ -1,5 +1,5 @@ > -# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt > -sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz > +# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt > +sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz > > # Hash for license file > sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 7d5c93eb93..727af6dc50 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NODEJS_VERSION = 14.18.2 > +NODEJS_VERSION = 14.18.3 > NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz > NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) > NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Jan 17 21:50:50 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 22:50:50 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: add patch to build with Linux > 5.12 In-Reply-To: <20220117210739.2022551-1-giulio.benetti@benettiengineering.com> References: <20220117210739.2022551-1-giulio.benetti@benettiengineering.com> Message-ID: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> Hi All, > Il giorno 17 gen 2022, alle ore 22:07, Giulio Benetti ha scritto: > > ?As explained in the local patch itself of_get_mac_address() has changed, so > we need to check against Linux version and use it slightly differently. > > Patch is pending upstream: > https://github.com/fifteenhex/xradio/pull/15 > I've realized only later there was already an opened PR for this, anyway > IMHO I think my patch is written a little better, so please accept it. > And most of all Sergey already tested it and it works: > https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html > > Signed-off-by: Giulio Benetti > --- > ...fix-building-with-Linux-version-5.12.patch | 68 +++++++++++++++++++ > 1 file changed, 68 insertions(+) > create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch > > diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch > new file mode 100644 > index 0000000000..a1d91e2ff7 > --- /dev/null > +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch > @@ -0,0 +1,68 @@ > +From 990b19664488a8a3bb8d019a3a6b242dd8ad4c29 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti > +Date: Mon, 17 Jan 2022 12:26:00 +0100 > +Subject: [PATCH] main.c: fix building with Linux version > 5.12 > + > +of_get_mac_address() on Linux version > 5.12 requires mac pointer as second > +argument and return an int. So let's deal with it by checking linux version > +to make it compatible with both Linux version > 5.12 and not. > + > +Signed-off-by: Giulio Benetti > +--- > + main.c | 17 +++++++++++++++++ > + 1 file changed, 17 insertions(+) > + > +diff --git a/main.c b/main.c > +index b60e18d..d354521 100644 > +--- a/main.c > ++++ b/main.c > +@@ -13,6 +13,7 @@ > + #include > + #include > + #include > ++#include > + > + #include "xradio.h" > + #include "fwio.h" > +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) > + int if_id; > + struct ieee80211_hw *dev; > + struct xradio_common *hw_priv; > ++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 12, 0) > ++ unsigned char addr[ETH_ALEN]; > ++#else > + unsigned char randomaddr[ETH_ALEN]; > + const unsigned char *addr = NULL; > ++#endif > + > + //init xradio_common > + dev = xradio_init_common(sizeof(struct xradio_common)); > +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) > + hw_priv->sdio_func = func; > + sdio_set_drvdata(func, hw_priv); > + > ++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 12, 0) This ^^^ must be >= 5.13. Need to send a v2 and update my PR. Sorry for the noise Giulio > ++ // fill in mac addresses > ++ if (hw_priv->pdev->of_node) { > ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); > ++ } > ++ if (err < 0) { > ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); > ++ eth_random_addr(addr); > ++ } > ++#else > + // fill in mac addresses > + if (hw_priv->pdev->of_node) { > + addr = of_get_mac_address(hw_priv->pdev->of_node); > +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) > + eth_random_addr(randomaddr); > + addr = randomaddr; > + } > ++#endif > ++ > + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); > + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); > + hw_priv->addresses[1].addr[5] += 0x01; > +-- > +2.25.1 > + > -- > 2.25.1 > From fontaine.fabrice at gmail.com Mon Jan 17 22:30:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 17 Jan 2022 23:30:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjpeg: security bump to version 9e Message-ID: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> rdgif.c, cderror.h: add sanity check for GIF image dimensions. Thank to Casper Sun for cjpeg potential vulnerability report. - Update hash of README (changes not related to license) - Update indentation in hash file (two spaces) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 4f0a677d04..1a2e82caef 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz -sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README +sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 6b55aba7e5..caf7f05f44 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,12 +4,8 @@ # ################################################################################ -LIBJPEG_VERSION = 9d -# 9d was released 2020-01-12, but the tarball was replaced upstream circa -# 2021-03, causing hash mismatch. Until there is a new version released, -# use our cached copy from s.b.o. -#LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SITE = http://sources.buildroot.org/libjpeg +LIBJPEG_VERSION = 9e +LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 17 23:04:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 18 Jan 2022 00:04:48 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> Message-ID: <20220118000448.32ea764d@windsurf> On Mon, 17 Jan 2022 20:58:52 +0100 Giulio Benetti wrote: > > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > > new file mode 100644 > > index 0000000000..5b5648cc14 > > --- /dev/null > > +++ b/configs/kontron_bl_imx8mm_defconfig > > @@ -0,0 +1,59 @@ > > +# Architecture > > +BR2_aarch64=y > > +BR2_ARM_FPU_VFPV3=y > > i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: > BR2_ARM_FPU_VFPV4D16 > > This is to achieve the maximum performance. Nope, that's not really how it works. VFPv3 is better than VFPv3-D16. Indeed VFPv3 means that the the FPU has 32 double precision registers, while VFPv3-D16 means that it has "only" 16 double precision registers. So, if the i.MX8MM has only the VFPv3-D16, then indeed it should be chosen, because code compiled with VFPv3 may not work, as it might use too many double precision registers. On the other hand, if the i.MX8MM has the full VFPv3, then BR2_ARM_FPU_VFPV3=y should be used. That being said, the gcc man page only documents vfpv3, vfpv3-d16-fp16, vfpv3-fp16 as extension for armv7-a. Interesting, would need to look into this. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From richard at audacityteam.org Mon Jan 17 23:45:54 2022 From: richard at audacityteam.org (Richard Ash) Date: Mon, 17 Jan 2022 23:45:54 +0000 Subject: [Buildroot] buildroot Qt Raspberry Pi3b+ In-Reply-To: References: Message-ID: <20220117234554.39996df0@audacityteam.org> On Mon, 17 Jan 2022 19:29:49 +0100 Toma? Smodi? wrote: > HI > > I am trying to build Qt everywhere 5.12.5 against buildroot Raspberry > Pi3b+ image/sysroot. I use linaro 7.5 compiler. Did you configure and build buildroot using the linaro compiler? If not, then it's very unlikely to work. > I rsync the sd card rootfs into sysroot on my host computer. That's not the sysroot at all. The SD card contents only has the runtime libraries needed to run binaries. It does not have the headers and static libraries needed to compile software. They are found in the output/staging directory from buildroot (which you will notice is a lot bigger than the target directory! As a minimum, you need to be using the buildroot staging directory as your sysroot. But the bigger question is "why bother"? Buildroot has packages for qt5 so you can just get buildroot to compile whichever bits of QT you need as part of the system, without having to do it by hand. https://git.busybox.net/buildroot/tree/package/qt5 Richard Then I > run: > > ./configure -release -opengl es2 -device linux-rasp-pi-g++ > -device-option > CROSS_COMPILE=~/RaspberryPiEGLFS/toolsNEW/bin/arm-linux-gnueabihf- > -sysroot ~/RaspberryPiEGLFS/sysroot -opensource -confirm-license > -skip qtwayland -skip qtlocation -skip qtscript -make libs -prefix > /usr/local/qt5pi -extprefix ~/RaspberryPiEGLFS/qt5pi -hostprefix > ~/RaspberryPiEGLFS/qt5 -no-use-gold-linker -v -no-gbm > > It starts to configure but I got error: > > Running configuration tests... > > * > /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ > -dumpmachine > > arm-linux-gnueabihf > Checking for valid makespec... > > * cd > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/config.tests/verifyspec > && > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/bin/qmake > "CONFIG -= qt debug_and_release app_bundle lib_bundle" "CONFIG += > shared warn_off console single_arch" "QMAKE_CFLAGS += > --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" "QMAKE_CXXFLAGS += > --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" "QMAKE_LFLAGS += > --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" -early "CONFIG += > cross_compile" > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec > * cd > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/config.tests/verifyspec > && MAKEFLAGS= /usr/bin/make clean && MAKEFLAGS= /usr/bin/make > > rm -f verifyspec.o > rm -f *~ core *.core > /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ > -c -pipe -marm -mfpu=vfp -mtune=arm1176jzf-s -march=armv6zk > -mabi=aapcs-linux -mfloat-abi=hard > --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot -O2 -std=gnu++11 -w > -fPIC > -I/home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec > -I. > -I/home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/mkspecs/devices/linux-rasp-pi-g++ > -o verifyspec.o > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec/verifyspec.cpp > /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ > -mfloat-abi=hard --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot > -Wl,-O1 > -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/opt/vc/lib > -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/usr/lib/arm-linux-gnueabihf > -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/lib/arm-linux-gnueabihf > -o verifyspec verifyspec.o > /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/../lib/gcc/arm-linux-gnueabihf/4.8.3/../../../../arm-linux-gnueabihf/bin/ld: > cannot find -lm > collect2: error: ld returned 1 exit status > make: *** [Makefile:68: verifyspec] Error 1 > Note: Also available for Linux: linux-clang linux-icc > > ERROR: Cannot compile a minimal program. The toolchain or QMakeSpec > is broken. > > > Minimal program? What am I missing? > > Thomas > > p.s. If I rsync full OS Buster image/rootfs into sysroot on my host > it configures ok. I can make and make install the Qt binaries. I can > compile Qt app against Buster/Raspbian sysroot. Then I run buildroot > Raspberry Pi OS that I have build and wrtten on another sc card and > it runs/loads ok. The I copy my Qt elf file to buildroots directory > and I get ld.so/libc.so/interpreter problem! I understand this issue > and I think if I could build Qt eveywhere against buildroots rootfs > it would be ok!? > From buildroot at busybox.net Thu Jan 13 20:58:34 2022 From: buildroot at busybox.net (busybox.net) Date: 13 Jan 2022 21:58:34 +0100 Subject: [Buildroot] ACTION REQUIRED Message-ID: <20220113215834.8C7A445E7776F0D9@busybox.net> An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Tue Jan 18 06:35:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 07:35:31 +0100 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> Message-ID: <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> As explained in the local patch itself of_get_mac_address() has changed, so we need to check against Linux version and use it slightly differently. Patch is pending upstream: https://github.com/fifteenhex/xradio/pull/15 I've realized only later there was already an opened PR for this, anyway IMHO I think my patch is written a little better, so please accept it. And most of all Sergey already tested it and it works: https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html Signed-off-by: Giulio Benetti --- V1->V2: * update local patch to build correctly also with Linux >= 5.12.1 < 5.13.0 --- ...fix-building-with-Linux-version-5.13.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch new file mode 100644 index 0000000000..3b9742012e --- /dev/null +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch @@ -0,0 +1,68 @@ +From 4873746fa9d42a8edbc1e192899e00c29ed3d32a Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 17 Jan 2022 12:26:00 +0100 +Subject: [PATCH] main.c: fix building with Linux version >= 5.13 + +of_get_mac_address() on Linux version >= 5.13 requires mac pointer as +second argument and return an int. So let's deal with it by checking linux +version to make it compatible with both Linux version >= 5.13 and not. + +Signed-off-by: Giulio Benetti +--- + main.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/main.c b/main.c +index b60e18d..06cb1f6 100644 +--- a/main.c ++++ b/main.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "xradio.h" + #include "fwio.h" +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) + int if_id; + struct ieee80211_hw *dev; + struct xradio_common *hw_priv; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) ++ unsigned char addr[ETH_ALEN]; ++#else + unsigned char randomaddr[ETH_ALEN]; + const unsigned char *addr = NULL; ++#endif + + //init xradio_common + dev = xradio_init_common(sizeof(struct xradio_common)); +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) + hw_priv->sdio_func = func; + sdio_set_drvdata(func, hw_priv); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) ++ // fill in mac addresses ++ if (hw_priv->pdev->of_node) { ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); ++ } ++ if (err < 0) { ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); ++ eth_random_addr(addr); ++ } ++#else + // fill in mac addresses + if (hw_priv->pdev->of_node) { + addr = of_get_mac_address(hw_priv->pdev->of_node); +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) + eth_random_addr(randomaddr); + addr = randomaddr; + } ++#endif ++ + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); + hw_priv->addresses[1].addr[5] += 0x01; +-- +2.25.1 + -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 06:58:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 07:58:41 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220118000448.32ea764d@windsurf> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> <20220118000448.32ea764d@windsurf> Message-ID: Hi Thomas, On 18/01/22 00:04, Thomas Petazzoni wrote: > On Mon, 17 Jan 2022 20:58:52 +0100 > Giulio Benetti wrote: > >>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig >>> new file mode 100644 >>> index 0000000000..5b5648cc14 >>> --- /dev/null >>> +++ b/configs/kontron_bl_imx8mm_defconfig >>> @@ -0,0 +1,59 @@ >>> +# Architecture >>> +BR2_aarch64=y >>> +BR2_ARM_FPU_VFPV3=y >> >> i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: >> BR2_ARM_FPU_VFPV4D16 >> >> This is to achieve the maximum performance. > > Nope, that's not really how it works. VFPv3 is better than VFPv3-D16. > Indeed VFPv3 means that the the FPU has 32 double precision registers, > while VFPv3-D16 means that it has "only" 16 double precision registers. I'm a bit confused. The datasheet[1] states at 1.4.1: ``` ? Media Processing Engine (MPE) with NEON technology supporting the Advanced Single Instruction Multiple Data architecture ? Floating Point Unit (FPU) with support of the VFPv4-D16 architecture ``` [1]: https://www.nxp.com/docs/en/data-sheet/IMX8MMCEC.pdf So I expect it to only have VFPv4-D16. And also NEON, but we can't mix them up in Aarch64 as I know. > So, if the i.MX8MM has only the VFPv3-D16, then indeed it should be > chosen, because code compiled with VFPv3 may not work, as it might use > too many double precision registers. > > On the other hand, if the i.MX8MM has the full VFPv3, then > BR2_ARM_FPU_VFPV3=y should be used. It only has VFPv4-D16. I think I've explained myself bad. This is not to achieve maximum performance, simply datasheet states it only supports VFPv4-D16[1] and judging from this: https://developer.arm.com/documentation/dui0472/h/CJADDCIF#:~:text=VFPv3%20has%2032%20double%2Dprecision,VFPv3%20with%20half%2Dprecision%20extensions.&text=VFPv4%20has%2032%20double%2Dprecision,to%20the%20features%20of%20VFPv3. VFPv4 is retro-compatible with VFPv3, and I'd expect VFP4v4-D16 to be like that too. Is it possible that at the moment, by mistake, it worked without using more than 16 registers as VFPv3 that is retro-compatible with VFPv4-D16(maybe?). > That being said, the gcc man page only documents vfpv3, vfpv3-d16-fp16, > vfpv3-fp16 as extension for armv7-a. Interesting, would need to look > into this. Yes, but i.MX8MM is a cortex-A53, so armv8-a: https://developer.arm.com/ip-products/processors/cortex-a/cortex-a53 that then is retro-compatible to armv7-a if in Aarch32. But here we use it as BR2_aarch64, so armv8-a: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html and it lists: ``` -mfpu=name This specifies what floating-point hardware (or hardware emulation) is available on the target. Permissible names are: ?auto?, ?vfpv2?, ?vfpv3?, ?vfpv3-fp16?, ?vfpv3-d16?, ?vfpv3-d16-fp16?, ?vfpv3xd?, ?vfpv3xd-fp16?, ?neon-vfpv3?, ?neon-fp16?, ?vfpv4?, ?vfpv4-d16?, ?fpv4-sp-d16?, ?neon-vfpv4?, ?fpv5-d16?, ?fpv5-sp-d16?, ?fp-armv8?, ?neon-fp-armv8? and ?crypto-neon-fp-armv8?. Note that ?neon? is an alias for ?neon-vfpv3? and ?vfp? is an alias for ?vfpv2?. ``` So "vfpv4-d16" is possible. Here I think we need vfpv4-d16 and not vfpv3 because of both DS and RM of i.MX8MM. Does it sound good to you? Thank you Best regards -- Giulio Benetti Benetti Engineering sas From thomas.petazzoni at bootlin.com Tue Jan 18 07:06:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 18 Jan 2022 07:06:49 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-17 Message-ID: <20220118070654.17F4440105@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-17 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 63 | 9 | 0 | 72 | 2021.11.x | 23 | 3 | 0 | 26 | master | 84 | 52 | 0 | 136 | Classification of failures by reason for master ----------------------------------------------- host-riscv-isa-sim-1.1.0 | 12 rygel-0.40.2 | 7 frr-8.1 | 4 bluez5_utils-5.63 | 3 unknown | 3 bat-0.18.3 | 2 apcupsd-3.14.14 | 1 apparmor-3.0.3 | 1 cryptsetup-2.4.2 | 1 efl-1.26.0 | 1 gensio-2.2.9 | 1 google-breakpad-7515ab13768... | 1 gstd-0.13.0 | 1 hiawatha-11.1 | 1 ksmbd-tools-3.4.3 | 1 kvm-unit-tests-kvm-unit-tes... | 1 mesa3d-21.3.3 | 1 mongrel2-1.13.0 | 1 mp4v2-5.0.1 | 1 opencv4-4.5.5 | 1 pcsc-lite-1.9.5 | 1 powertop-2.13 | 1 qt5base-5.15.2 | 1 tesseract-ocr-5.0.1 | 1 ulog-0389d243352255f6182326... | 1 wavemon-0.9.4 | 1 xdriver_xf86-video-mach64-6... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/beb00fc8b71bcd2db87cbdc8e5029fe28c782abd | x86_64 | apparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/74763096f8eb9bf0bd4226dcd257fe6a0cdd5094 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/5641c78eb9df313c44f2b17de9dbbfece26b3c0c | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/715e5d0ac525406b698b015b5b306f3366a51c11 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/19c82963d6e3655f897bcae54e82fbf5887e46fe | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b91864dc5b4c33a1a29ee34036e6694ca81b9e13 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dea76eebc09e62989dc117767478d144c8789464 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/bd70dd1e5c6b045fc3a7da6b0cbf6de22d6dcbc6 | x86_64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/479aeee2ad138787119a16577233ff4d3ef0582d | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e6089331b8f3df3678aa5102df5e5bb3668c7637 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/bdac99f54d365f883e9a4272e3f03ebbcd8c4473 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e94fd48210d95ee216c45f68c714ba67515c6cc8 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/40ceb52442bd6589f740eee7521a8fb2fac13da4 | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/deccd3694d5250f51e7b75b93f151ada0dc59b8f | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/5d9cd3eda611b5fedcdd6f5d0c21596ff6de59b5 | mips64el | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/2f04f53df280a7d931615d8898687f5a5bd54803 | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/1ae8ff6834074e07904aa6a8d358804e7117439e | arc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/66e3127c8c7db3a0dc7b808ea06b4ae9cb3cd49e | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6d6587a3e81a282d226efbcf3579fc5ceda51db5 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/a0c12eef60097367366a81aca98fe82d871c67bc | xtensa | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/1e77b711034972fca198251db29df469cc199c25 | sparc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/ff2f711655d335609d325b09b38be1fda359db60 | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/b9315e68e616320c31b63594a62fa01b84506316 | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/ee5813ef9e0d467ab39962df2183dab70b6e9825 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/87979167940393416a78301c94f6cd7a8f719cab | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/8a79ffcee4ae595f95f34bbabbec32f25ccde387 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/ec1a394b4c9ba315b916ad84d2372ded55044a32 | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/7d69f16ae0f4bf9d87cf7acbb371c97242c70ec4 | riscv32 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/56e34478f3c5739c8967754d9fa2565310c88b0e | xtensa | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/f205f5edcc774623a60f4fb4e6f2c2854310ed71 | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/45b575f36753a0984da9bb106a7baa957ea554cb | mips64el | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/22487776f35e73bb6ae47b114caee6475d730028 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/de324b733e09057c87352220069fe65f6e535eb8 | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/86b477f1c1d38ff418f638ee0770dd827bcadbe7 | ORPH arm | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/3d77a828adc254b112ad2e5ce214d3e892b2229e | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/225151602eb240f20355982e596670919cf4cb33 | ORPH or1k | powertop-2.13 | NOK | http://autobuild.buildroot.net/results/e9f0deaeb09402a8bb601e616a615d1aa09bdaf6 | riscv64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/f026a0e6f14c9c948cb7771ed7020ef4aa24672e | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/47ddeb8cf5547091d059c348c7f754cf5a3650cb | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/384e4af1db8a962e148825e681c5ce27f7b477ab | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3646635c6a53da02c78be7fce7899b34fdc33b91 | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c4199a4788f6af996e8d31239f6ae9c64eb3b3a0 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ba1ef2ca6e581e5bb05b018dc9ac928c8beaee73 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/03be40d80dc7961abbdc6f3d323cafb0518bd36c | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/18413e663d9081386e26726ac3ca246074a70060 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/b3ee6065bbf1d67007c17f650898b5c6a7ed6f99 | mipsel | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/5bfc759b6a5cfcbb78d4a72c7b3318f491f4d5cf | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/21e773353abc8eee13c8e708bdc5032647692f86 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/8ea47650902b1004569e74fdb0b51b25a04f2e12 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/2a08d439d16128ad285d0bff5c6169bcedeb2ae3 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/59136d64244cb08f870781fa09013a56c3d93dfc | riscv64 | xdriver_xf86-video-mach64-6... | NOK | http://autobuild.buildroot.net/results/07a00bfb9c755a748232025f630d54424117169f | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 5 apcupsd-3.14.14 | 1 mesa3d-20.3.5 | 1 ndisc6-1.0.4 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/4b04a12ec6663a2aae0d6c293c8137d180947fc5 | mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/ce29083f8e24799424659fdc7ecc98473c074fca | riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/fa2b833b4c14ad580b5dcbcccca488d117424a6d | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/6f7b981e4d357c27ff57f079e038a0b2bcae5e59 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/63bd0633d30fbb5022f7ffa180d2f84c257d949a | powerpc64le | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/cdf7e22668b99a8f615b5fc82f1ba146bfe7d28b | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/668ce7624ababf1edd3da35bbe5b265cf7983a40 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/1c95d309e0455acbca15d366a44accba2804cc72 | ORPH mipsel | unknown | NOK | http://autobuild.buildroot.net/results/31b51516efb0fdaf8226f0ae0203e038cc7d329d | Classification of failures by reason for 2021.11.x -------------------------------------------------- acpid-2.0.33 | 1 libdbi-88b8477d57153b9f736d... | 1 libmbim-1.26.0 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.33 | NOK | http://autobuild.buildroot.net/results/509a5c704210e248e6df25657270067499c163f0 | ORPH riscv64 | libdbi-88b8477d57153b9f736d... | NOK | http://autobuild.buildroot.net/results/696b9e8e53b14fc148641226530f84c75ba37d00 | riscv32 | libmbim-1.26.0 | NOK | http://autobuild.buildroot.net/results/e3fc37860a19b6ee3afc97863243a5cb6fb69d42 | Gitlab CI results for 2022-01-17 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1981078627 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/1981078848 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/1981078849 | ORPH -- http://autobuild.buildroot.net From mf at go-sys.de Tue Jan 18 08:13:31 2022 From: mf at go-sys.de (Michael Fischer) Date: Tue, 18 Jan 2022 09:13:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuplot: bump version to 5.4.3 Message-ID: <20220118081331.30088-1-mf@go-sys.de> Signed-off-by: Michael Fischer --- package/gnuplot/gnuplot.hash | 6 +++--- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index fc166205d0..1cc14973d1 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/ -md5 2050ca477199a591543bc968aba7d899 gnuplot-5.4.2.tar.gz -sha1 2e076b29f38bfcb841cb5eb3377fd1a469ced1ac gnuplot-5.4.2.tar.gz +md5 9bb03cfa77e38924e08ffbb9eb59d8b1 gnuplot-5.4.3.tar.gz +sha1 c4b60fd7a700b22fa62b14829cbb0e17911627c9 gnuplot-5.4.3.tar.gz # Locally computed -sha256 e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba gnuplot-5.4.2.tar.gz +sha256 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 gnuplot-5.4.3.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 436d3e5f92..6cf36a0997 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.2 +GNUPLOT_VERSION = 5.4.3 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -- 2.20.1 From etienne.carriere at linaro.org Tue Jan 18 08:54:00 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Tue, 18 Jan 2022 09:54:00 +0100 Subject: [Buildroot] [PATCH 1/2] board/qemu/arm-vexpress-tz: use enable=on In-Reply-To: <20220115143344.12319-1-romain.naour@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> Message-ID: Hello Romain, On Sat, 15 Jan 2022 at 15:33, Romain Naour wrote: > > Since Qemu 6.0.0 [1], a warning appear in the log if a short-form > boolean option is used. > > [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ccd3b3b8112b670fdccf8a392b8419b173ffccb4 > > Signed-off-by: Romain Naour > Cc: Etienne Carriere > Cc: Dick Olsson > --- > board/qemu/arm-vexpress-tz/readme.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt > index 7e62e943a6..3036dd54ca 100644 > --- a/board/qemu/arm-vexpress-tz/readme.txt > +++ b/board/qemu/arm-vexpress-tz/readme.txt > @@ -16,7 +16,7 @@ from the image directory: > -smp 1 -s -m 1024 -d unimp \ > -serial stdio \ > -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ > - -semihosting-config enable,target=native \ > + -semihosting-config enable=on,target=native \ > -bios flash.bin # qemu_arm_vexpress_tz_defconfig > > The boot stage traces (if any) followed by the login prompt will appear > -- > 2.31.1 > Thanks for the fix. Br, Etienne From giulio.benetti at benettiengineering.com Tue Jan 18 10:42:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:42:56 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex Message-ID: <20220118104324.2081177-1-giulio.benetti@benettiengineering.com> Hi All, this patchset aims to enable the best FPU strategy for every board with 32-bits Arm Cortex actually present in Buildroot. I don't own these boards so I can't test these changes. What is about Allwinner doesn't worry me because I've tested a lot of cases with Olimex boards, but the other changes are still to be tested. So I ask to the board maintainers to test the patches that involve their boards if possible. Anyway I've checked well all the SoCs Datasheet and I think I've made it correctly, even if in some of them it's not specified if VFPv4 means -D32. I assume it like that because otherwise -D16 is usually specified. Best regards --- Giulio Benetti Benetti Engineering sas Giulio Benetti (28): configs/acmesystems_acqua_a5_256mb_defconfig: enable NEON/VFPV4 FPU strategy configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/beagleboardx15_defconfig: enable NEON/VFPV4 FPU strategy configs/beagleboneai_defconfig: enable NEON/VFPV4 FPU strategy configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_m1_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_m1_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/grinn_liteboard_defconfig: enable NEON/VFPV4 FPU strategy configs/licheepi_zero_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_lite_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_one_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_pc_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_pc_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157a_dk1_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157c_dk2_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157c_odyssey_defconfig: enable NEON/VFPV4 FPU strategy configs/acmesystems_acqua_a5_256mb_defconfig | 1 + configs/acmesystems_acqua_a5_512mb_defconfig | 1 + configs/bananapi_m2_plus_defconfig | 1 + configs/bananapi_m2_ultra_defconfig | 1 + configs/beagleboardx15_defconfig | 1 + configs/beagleboneai_defconfig | 1 + configs/chromebook_snow_defconfig | 1 + configs/freescale_imx7dsabresd_defconfig | 1 + configs/friendlyarm_nanopi_m1_defconfig | 2 +- configs/friendlyarm_nanopi_m1_plus_defconfig | 2 +- configs/friendlyarm_nanopi_neo_defconfig | 2 +- configs/friendlyarm_nanopi_r1_defconfig | 2 +- configs/grinn_liteboard_defconfig | 1 + configs/licheepi_zero_defconfig | 2 +- configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig | 1 + configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/orangepi_lite_defconfig | 2 +- configs/orangepi_one_defconfig | 2 +- configs/orangepi_pc_defconfig | 2 +- configs/orangepi_pc_plus_defconfig | 2 +- configs/orangepi_plus_defconfig | 2 +- configs/orangepi_r1_defconfig | 2 +- configs/orangepi_zero_defconfig | 2 +- configs/stm32mp157a_dk1_defconfig | 1 + configs/stm32mp157c_dk2_defconfig | 1 + configs/stm32mp157c_odyssey_defconfig | 1 + 28 files changed, 28 insertions(+), 12 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:10 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex Message-ID: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Hi All, this patchset aims to enable the best FPU strategy for every board with 32-bits Arm Cortex actually present in Buildroot. I don't own these boards so I can't test these changes. What is about Allwinner doesn't worry me because I've tested a lot of cases with Olimex boards, but the other changes are still to be tested. So I ask to the board maintainers to test the patches that involve their boards if possible. Anyway I've checked well all the SoCs Datasheet and I think I've made it correctly, even if in some of them it's not specified if VFPv4 means -D32. I assume it like that because otherwise -D16 is usually specified. Best regards --- Giulio Benetti Benetti Engineering sas Giulio Benetti (28): configs/acmesystems_acqua_a5_256mb_defconfig: enable NEON/VFPV4 FPU strategy configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/beagleboardx15_defconfig: enable NEON/VFPV4 FPU strategy configs/beagleboneai_defconfig: enable NEON/VFPV4 FPU strategy configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_m1_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_m1_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/grinn_liteboard_defconfig: enable NEON/VFPV4 FPU strategy configs/licheepi_zero_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_lite_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_one_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_pc_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_pc_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157a_dk1_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157c_dk2_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157c_odyssey_defconfig: enable NEON/VFPV4 FPU strategy configs/acmesystems_acqua_a5_256mb_defconfig | 1 + configs/acmesystems_acqua_a5_512mb_defconfig | 1 + configs/bananapi_m2_plus_defconfig | 1 + configs/bananapi_m2_ultra_defconfig | 1 + configs/beagleboardx15_defconfig | 1 + configs/beagleboneai_defconfig | 1 + configs/chromebook_snow_defconfig | 1 + configs/freescale_imx7dsabresd_defconfig | 1 + configs/friendlyarm_nanopi_m1_defconfig | 2 +- configs/friendlyarm_nanopi_m1_plus_defconfig | 2 +- configs/friendlyarm_nanopi_neo_defconfig | 2 +- configs/friendlyarm_nanopi_r1_defconfig | 2 +- configs/grinn_liteboard_defconfig | 1 + configs/licheepi_zero_defconfig | 2 +- configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig | 1 + configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/orangepi_lite_defconfig | 2 +- configs/orangepi_one_defconfig | 2 +- configs/orangepi_pc_defconfig | 2 +- configs/orangepi_pc_plus_defconfig | 2 +- configs/orangepi_plus_defconfig | 2 +- configs/orangepi_r1_defconfig | 2 +- configs/orangepi_zero_defconfig | 2 +- configs/stm32mp157a_dk1_defconfig | 1 + configs/stm32mp157c_dk2_defconfig | 1 + configs/stm32mp157c_odyssey_defconfig | 1 + 28 files changed, 28 insertions(+), 12 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:11 +0100 Subject: [Buildroot] [PATCH 01/28] configs/acmesystems_acqua_a5_256mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-2-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/acmesystems_acqua_a5_256mb_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index f8129f3780..991de4c1be 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a5=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:12 +0100 Subject: [Buildroot] [PATCH 02/28] configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/acmesystems_acqua_a5_512mb_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index e399d4a9ff..56885ea5a1 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_SYSTEM_DHCP="eth0" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:13 +0100 Subject: [Buildroot] [PATCH 03/28] configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-4-giulio.benetti@benettiengineering.com> This boards has Allwinner H3 that supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/bananapi_m2_plus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/bananapi_m2_plus_defconfig b/configs/bananapi_m2_plus_defconfig index 77a403ce81..9522c0c329 100644 --- a/configs/bananapi_m2_plus_defconfig +++ b/configs/bananapi_m2_plus_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:24 +0100 Subject: [Buildroot] [PATCH 14/28] configs/licheepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-15-giulio.benetti@benettiengineering.com> This board has Allwinner V3s that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/licheepi_zero_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/licheepi_zero_defconfig b/configs/licheepi_zero_defconfig index 2e1a413988..bdb937d2dd 100644 --- a/configs/licheepi_zero_defconfig +++ b/configs/licheepi_zero_defconfig @@ -1,7 +1,7 @@ # Target options BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:37 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:37 +0100 Subject: [Buildroot] [PATCH 27/28] configs/stm32mp157c_dk2_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-28-giulio.benetti@benettiengineering.com> This board has stm32mp157c that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of the default VFPV4-D16. Signed-off-by: Giulio Benetti --- configs/stm32mp157c_dk2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index f1f7baaa08..503ed91843 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -1,6 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.13 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:25 +0100 Subject: [Buildroot] [PATCH 15/28] configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-16-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig index 024e8a1465..c5b9e65a81 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:38 +0100 Subject: [Buildroot] [PATCH 28/28] configs/stm32mp157c_odyssey_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-29-giulio.benetti@benettiengineering.com> This board has stm32mp157c that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of the default VFPV4-D16. Signed-off-by: Giulio Benetti --- configs/stm32mp157c_odyssey_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32mp157c_odyssey_defconfig b/configs/stm32mp157c_odyssey_defconfig index 6b699830b1..6aa772b8c0 100644 --- a/configs/stm32mp157c_odyssey_defconfig +++ b/configs/stm32mp157c_odyssey_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/seeed/stm32mp157c-odyssey/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_OVERLAY="board/seeed/stm32mp157c-odyssey/overlay/" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:26 +0100 Subject: [Buildroot] [PATCH 16/28] configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-17-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig index 3bcd5f0200..35b8c905e5 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:27 +0100 Subject: [Buildroot] [PATCH 17/28] configs/microchip_sama5d2_icp_mmc_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-18-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/microchip_sama5d2_icp_mmc_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama5d2_icp_mmc_defconfig b/configs/microchip_sama5d2_icp_mmc_defconfig index 4bb3625f83..658d8c18b6 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:28 +0100 Subject: [Buildroot] [PATCH 18/28] configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-19-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/configs/microchip_sama5d2_icp_mmc_dev_defconfig index 052d9e032c..123bb3e69c 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:29 +0100 Subject: [Buildroot] [PATCH 19/28] configs/orangepi_lite_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-20-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_lite_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index e834816456..9805d953b9 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:30 +0100 Subject: [Buildroot] [PATCH 20/28] configs/orangepi_one_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-21-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_one_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307..c4e674a6b6 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:31 +0100 Subject: [Buildroot] [PATCH 21/28] configs/orangepi_pc_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-22-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_pc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c4..8d7d89599a 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:32 +0100 Subject: [Buildroot] [PATCH 22/28] configs/orangepi_pc_plus_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-23-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_pc_plus_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..cb108a8d31 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:33 +0100 Subject: [Buildroot] [PATCH 23/28] configs/orangepi_plus_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-24-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_plus_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig index 11d7486486..897246373b 100644 --- a/configs/orangepi_plus_defconfig +++ b/configs/orangepi_plus_defconfig @@ -1,7 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:34 +0100 Subject: [Buildroot] [PATCH 24/28] configs/orangepi_r1_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-25-giulio.benetti@benettiengineering.com> This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_r1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig index bad1f9400c..9fff1fa97a 100644 --- a/configs/orangepi_r1_defconfig +++ b/configs/orangepi_r1_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:35 +0100 Subject: [Buildroot] [PATCH 25/28] configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-26-giulio.benetti@benettiengineering.com> This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_zero_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..a0af809e92 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:36 +0100 Subject: [Buildroot] [PATCH 26/28] configs/stm32mp157a_dk1_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-27-giulio.benetti@benettiengineering.com> This board has stm32mp157a that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of the default VFPV4-D16. Signed-off-by: Giulio Benetti --- configs/stm32mp157a_dk1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index a487ce9891..1768500b74 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -1,6 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.13 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:14 +0100 Subject: [Buildroot] [PATCH 04/28] configs/bananapi_m2_ultra_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-5-giulio.benetti@benettiengineering.com> This boards has Allwinner A40i/R40/V40 that support NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/bananapi_m2_ultra_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 67ecec424c..b22e597945 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:15 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:15 +0100 Subject: [Buildroot] [PATCH 05/28] configs/beagleboardx15_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-6-giulio.benetti@benettiengineering.com> This board has TI AM5728 that is a cortex-A15 and supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/beagleboardx15_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beagleboardx15_defconfig b/configs/beagleboardx15_defconfig index 039a07b11e..2ee2777dad 100644 --- a/configs/beagleboardx15_defconfig +++ b/configs/beagleboardx15_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a15=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboardx15/genimage.cfg" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:16 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:16 +0100 Subject: [Buildroot] [PATCH 06/28] configs/beagleboneai_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-7-giulio.benetti@benettiengineering.com> This board has TI AM5729 that is a cortex-A15 and supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/beagleboneai_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig index 586a75317e..edc29e4e5e 100644 --- a/configs/beagleboneai_defconfig +++ b/configs/beagleboneai_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a15=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/beagleboneai/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_SYSTEM_DHCP="eth0" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:17 +0100 Subject: [Buildroot] [PATCH 07/28] configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-8-giulio.benetti@benettiengineering.com> This board has NVIDIA Tegra K1 that is a cortex-A15 and supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/chromebook_snow_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index bcb94b716b..bc188967b3 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a15=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:18 +0100 Subject: [Buildroot] [PATCH 08/28] configs/freescale_imx7dsabresd_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-9-giulio.benetti@benettiengineering.com> This board has i.M7D that supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/freescale_imx7dsabresd_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 5a9cff488d..dc9d8c0306 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -1,6 +1,7 @@ # architecture BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:19 +0100 Subject: [Buildroot] [PATCH 09/28] configs/friendlyarm_nanopi_m1_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-10-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/friendlyarm_nanopi_m1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/friendlyarm_nanopi_m1_defconfig b/configs/friendlyarm_nanopi_m1_defconfig index 18cfcb261e..6e78e662be 100644 --- a/configs/friendlyarm_nanopi_m1_defconfig +++ b/configs/friendlyarm_nanopi_m1_defconfig @@ -1,7 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:20 +0100 Subject: [Buildroot] [PATCH 10/28] configs/friendlyarm_nanopi_m1_plus_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-11-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/friendlyarm_nanopi_m1_plus_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/friendlyarm_nanopi_m1_plus_defconfig b/configs/friendlyarm_nanopi_m1_plus_defconfig index 06adc54b15..bd4d78cbf6 100644 --- a/configs/friendlyarm_nanopi_m1_plus_defconfig +++ b/configs/friendlyarm_nanopi_m1_plus_defconfig @@ -1,7 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:21 +0100 Subject: [Buildroot] [PATCH 11/28] configs/friendlyarm_nanopi_neo_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-12-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/friendlyarm_nanopi_neo_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/friendlyarm_nanopi_neo_defconfig b/configs/friendlyarm_nanopi_neo_defconfig index 1519d828d6..559a3a2415 100644 --- a/configs/friendlyarm_nanopi_neo_defconfig +++ b/configs/friendlyarm_nanopi_neo_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:22 +0100 Subject: [Buildroot] [PATCH 12/28] configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-13-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/friendlyarm_nanopi_r1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/friendlyarm_nanopi_r1_defconfig b/configs/friendlyarm_nanopi_r1_defconfig index 8b03f6dd00..8e382b5677 100644 --- a/configs/friendlyarm_nanopi_r1_defconfig +++ b/configs/friendlyarm_nanopi_r1_defconfig @@ -1,7 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:23 +0100 Subject: [Buildroot] [PATCH 13/28] configs/grinn_liteboard_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-14-giulio.benetti@benettiengineering.com> This board has i.MX6UL that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/grinn_liteboard_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 9cad66e15a..640e77c4d7 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From patrickdepinguin at gmail.com Tue Jan 18 11:19:46 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Tue, 18 Jan 2022 12:19:46 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: <20220115200306.14037-7-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-7-patrickdepinguin@gmail.com> Message-ID: Hi, El s?b, 15 ene 2022 a las 21:03, Thomas De Schampheleire () escribi?: > > From: Thomas De Schampheleire > > Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel > but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. > > Signed-off-by: Thomas De Schampheleire > --- > > Note that the defconfig refers to a toolchain at > autobuild.buildroot.org, but is not yet present at that location. > I uploaded the toolchain temporarily to: > http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz > md5sum:b085c0d8f137c078f8f09d116d8364f8 > sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 > > Romain Naour notified me that this toolchain does not run on the GCC Farm (Illegal instruction) so I made a new version, currently uploaded at: http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11-2.tar.xz md5sum: 3cee64f82675446ad255f6c165786eb5 sha256sum: 6715bfbc195588b6483d39e9ec6d70611cac3b99bf2dd34fedbed0d4e6c7edc1 Best regards, Thomas From adeep at lexina.in Tue Jan 18 11:14:58 2022 From: adeep at lexina.in (Vyacheslav Bocharov) Date: Tue, 18 Jan 2022 14:14:58 +0300 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package Message-ID: <20220118111457.2491318-1-adeep@lexina.in> Firmware Image Package (FIP) sources to sign Amlogic SoC u-boot binaries in LibreELEC, Armbian and meta-meson, buildroot. https://github.com/LibreELEC/amlogic-boot-fip Signed-off-by: Vyacheslav Bocharov --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/amlogic-boot-fip/Config.in | 17 +++++++++ .../amlogic-boot-fip/amlogic-boot-fip.hash | 2 + package/amlogic-boot-fip/amlogic-boot-fip.mk | 37 +++++++++++++++++++ 5 files changed, 60 insertions(+) create mode 100644 package/amlogic-boot-fip/Config.in create mode 100644 package/amlogic-boot-fip/amlogic-boot-fip.hash create mode 100644 package/amlogic-boot-fip/amlogic-boot-fip.mk diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..deda803018 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2894,6 +2894,9 @@ N: Volkov Viacheslav F: package/v4l2grab/ F: package/zbar/ +N: Vyacheslav Bocharov +F: package/amlogic-boot-fip/ + N: Wade Berrier F: package/ngrep/ diff --git a/package/Config.in b/package/Config.in index 4df1474b91..df38024af2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -418,6 +418,7 @@ endmenu menu "Hardware handling" menu "Firmware" source "package/am33x-cm3/Config.in" + source "package/amlogic-boot-fip/Config.in" source "package/armbian-firmware/Config.in" source "package/b43-firmware/Config.in" source "package/linux-firmware/Config.in" diff --git a/package/amlogic-boot-fip/Config.in b/package/amlogic-boot-fip/Config.in new file mode 100644 index 0000000000..ceb09f8247 --- /dev/null +++ b/package/amlogic-boot-fip/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_AMLOGIC_BOOT_FIP + bool "amlogic-boot-fip" + help + This package enables access to various u-boot + blobs from the LibreELEC amlogic-boot-fip repository. + + https://github.com/LibreELEC/amlogic-boot-fip + +if BR2_PACKAGE_AMLOGIC_BOOT_FIP + +config BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD + string "Board uboot firmware config" + depends on BR2_PACKAGE_AMLOGIC_BOOT_FIP + help + Name of the board for which U-Boot firmware should be built + from amlogic-boot-fip +endif diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.hash b/package/amlogic-boot-fip/amlogic-boot-fip.hash new file mode 100644 index 0000000000..5d6dd237e3 --- /dev/null +++ b/package/amlogic-boot-fip/amlogic-boot-fip.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdf9d3872457c33a2755cc504f6b0560a62a6ee04437ac28e66623a345ed4936 amlogic-boot-fip-7ff0004e0e4d261ba81334a2f46302bd06704aca-br1.tar.gz diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.mk b/package/amlogic-boot-fip/amlogic-boot-fip.mk new file mode 100644 index 0000000000..6f646ae871 --- /dev/null +++ b/package/amlogic-boot-fip/amlogic-boot-fip.mk @@ -0,0 +1,37 @@ + +################################################################################ +# +# amlogic-boot-fip +# +################################################################################ + +AMLOGIC_BOOT_FIP_VERSION = 7ff0004e0e4d261ba81334a2f46302bd06704aca +AMLOGIC_BOOT_FIP_SITE = https://github.com/LibreELEC/amlogic-boot-fip +AMLOGIC_BOOT_FIP_SITE_METHOD = git +AMLOGIC_BOOT_FIP_INSTALL_IMAGES = YES +AMLOGIC_BOOT_FIP_DEPENDENCIES = uboot + +AMLOGIC_BOOT_FIP_LICENSE = PROPRIETARY +AMLOGIC_BOOT_FIP_REDISTRIBUTE = NO + +AMLOGIC_BOOT_BINS += u-boot.bin.sd.bin + +define AMLOGIC_BOOT_FIP_BUILD_CMDS + mkdir -p $(@D)/fip + cp $(BINARIES_DIR)/u-boot.bin $(@D)/fip/bl33.bin + cd "$(@D)"; ./build-fip.sh $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) $(@D)/fip/bl33.bin $(@D)/fip +endef + +ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP),y) +ifeq ($(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)),) +$(error No board u-boot firmware config name specified, check your BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD setting) +endif # qstrip BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD +endif + +define AMLOGIC_BOOT_FIP_INSTALL_IMAGES_CMDS + $(foreach f,$(AMLOGIC_BOOT_BINS), \ + cp -dpf "$(@D)/fip/$(f)" "$(BINARIES_DIR)/" + ) +endef + +$(eval $(generic-package)) -- 2.30.2 From romain.naour at gmail.com Tue Jan 18 11:51:43 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 18 Jan 2022 12:51:43 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-7-patrickdepinguin@gmail.com> Message-ID: <13491b39-7995-1aa7-a2cb-5af43467bb95@gmail.com> Hello Thomas, Le 18/01/2022 ? 12:19, Thomas De Schampheleire a ?crit?: > Hi, > > El s?b, 15 ene 2022 a las 21:03, Thomas De Schampheleire > () escribi?: >> >> From: Thomas De Schampheleire >> >> Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel >> but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. >> >> Signed-off-by: Thomas De Schampheleire >> --- >> >> Note that the defconfig refers to a toolchain at >> autobuild.buildroot.org, but is not yet present at that location. >> I uploaded the toolchain temporarily to: >> http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz >> md5sum:b085c0d8f137c078f8f09d116d8364f8 >> sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 >> >> > > Romain Naour notified me that this toolchain does not run on the GCC > Farm (Illegal instruction) so I made a new version, currently uploaded > at: > http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11-2.tar.xz > md5sum: 3cee64f82675446ad255f6c165786eb5 > sha256sum: 6715bfbc195588b6483d39e9ec6d70611cac3b99bf2dd34fedbed0d4e6c7edc1 This toolchain doesn't work either. Did you tried with CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" ? With CT_EXTRA_CXXFLAGS_FOR_BUILD maybe or both. Also, building with a Debian jessie docker container would allow to run the toolchain with old Glibc. Best regards, Romain > > Best regards, > Thomas > From patrickdepinguin at gmail.com Tue Jan 18 12:02:49 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Tue, 18 Jan 2022 13:02:49 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: <13491b39-7995-1aa7-a2cb-5af43467bb95@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-7-patrickdepinguin@gmail.com> <13491b39-7995-1aa7-a2cb-5af43467bb95@gmail.com> Message-ID: Hi Romain, El mar, 18 ene 2022 a las 12:51, Romain Naour () escribi?: > > Hello Thomas, > > Le 18/01/2022 ? 12:19, Thomas De Schampheleire a ?crit : > > Hi, > > > > El s?b, 15 ene 2022 a las 21:03, Thomas De Schampheleire > > () escribi?: > >> > >> From: Thomas De Schampheleire > >> > >> Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel > >> but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. > >> > >> Signed-off-by: Thomas De Schampheleire > >> --- > >> > >> Note that the defconfig refers to a toolchain at > >> autobuild.buildroot.org, but is not yet present at that location. > >> I uploaded the toolchain temporarily to: > >> http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz > >> md5sum:b085c0d8f137c078f8f09d116d8364f8 > >> sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 > >> > >> > > > > Romain Naour notified me that this toolchain does not run on the GCC > > Farm (Illegal instruction) so I made a new version, currently uploaded > > at: > > http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11-2.tar.xz > > md5sum: 3cee64f82675446ad255f6c165786eb5 > > sha256sum: 6715bfbc195588b6483d39e9ec6d70611cac3b99bf2dd34fedbed0d4e6c7edc1 > > This toolchain doesn't work either. > > Did you tried with CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" ? > With CT_EXTRA_CXXFLAGS_FOR_BUILD maybe or both. So you get the same error of 'Illegal instruction' ? Following config was used (both the config as the build log are part of the archive): CT_CONFIG_VERSION="3" # CT_PREFIX_DIR_RO is not set CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" CT_EXTRA_CXXFLAGS_FOR_BUILD="-march=x86-64" CT_ARCH_X86=y CT_MULTILIB=y CT_ARCH_64=y CT_STATIC_TOOLCHAIN=y CT_TARGET_VENDOR="multilib" CT_KERNEL_LINUX=y CT_GLIBC_KERNEL_VERSION_NONE=y # CT_CREATE_LDSO_CONF is not set CT_CC_GCC_MULTILIB_LIST="m64,m32" CT_CC_GCC_LNK_HASH_STYLE_BOTH=y CT_CC_LANG_CXX=y CT_DEBUG_GDB=y CT_ZLIB_NEEDED=y > > Also, building with a Debian jessie docker container would allow to run the > toolchain with old Glibc. The toolchain is built statically, so the glibc version on the host does not matter. Perhaps I misunderstand the problem you are referring to? Thanks, Thomas From bonet at grenoble.cnrs.fr Tue Jan 18 12:58:47 2022 From: bonet at grenoble.cnrs.fr (Edgar Bonet) Date: Tue, 18 Jan 2022 13:58:47 +0100 Subject: [Buildroot] [PATCH 02/28] configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> Message-ID: Hi! [Replying to list only, hoping it is the right etiquette.] Giulio Benetti wrote: > --- a/configs/acmesystems_acqua_a5_512mb_defconfig > +++ b/configs/acmesystems_acqua_a5_512mb_defconfig > @@ -1,6 +1,7 @@ > BR2_arm=y > BR2_cortex_a5=y > BR2_ARM_ENABLE_VFP=y > +BR2_ARM_FPU_NEON_VFPV4=y > BR2_ARM_INSTRUCTIONS_THUMB2=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > BR2_SYSTEM_DHCP="eth0" I think this may be missing some dependencies, as this change does not survive `save defconfig'. I tried the following from a clean tree: git pull # from master git am ~/tmp/saved-patch.email # the patch above make acmesystems_acqua_a5_512mb_defconfig make nconfig # no changes to configuration Save Exit make savedefconfig git diff And git showed me that the patch had just been reverted on the worktree. According to arch/Config.in.arm, BR2_ARM_FPU_NEON_VFPV4 depends on BR2_ARM_CPU_HAS_NEON, which is not mentioned in my .config. It also appears that BR2_ARM_ENABLE_NEON selects BR2_ARM_CPU_HAS_NEON. Would BR2_ARM_ENABLE_NEON be the canonical way of making BR2_ARM_FPU_NEON_VFPV4 acceptable? I am a bit confused by the VFP selection logic in arch/Config.in.arm, so I am not sure that would be the right approach. As a follow up question, if this issue is fixed, what would be the simplest way of testing the floating point implementation on the board? I was thinking about adding gnuplot, which doesn't have any dependencies, and having it do some computations. I do not know, however, whether this would exercise the NEON SIMD extensions. Best regards, Edgar. From bonet at grenoble.cnrs.fr Tue Jan 18 13:28:35 2022 From: bonet at grenoble.cnrs.fr (Edgar Bonet) Date: Tue, 18 Jan 2022 14:28:35 +0100 Subject: [Buildroot] [PATCH 02/28] configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> Message-ID: Hi again! Giulio Benetti wrote: > As pointed by SAMA5D2 Datasheet [...] So let's enable VFPV4/NEON FPU > strategy instead of the default VFPV4-D16. BTW, the Acqua is a SAMA5D3[1] (SAMA5D31 or SAMA5D36, depending on the version), not a SAMA5D2. The datasheet[2] of the SAMA5D3 states: The Floating-Point Unit (FPU) supports the ARMv7 VFPv4-D16 architecture without Advanced SIMD extensions (NEON). So I guess the patch is not relevant to this board. [1] https://www.acmesystems.it/acqua [2] https://ww1.microchip.com/downloads/en/DeviceDoc/SAMA5D3-Series-Data-sheet-DS60001609b.pdf From giulio.benetti at benettiengineering.com Tue Jan 18 13:35:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 14:35:25 +0100 Subject: [Buildroot] [PATCH 02/28] configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> Message-ID: Hi Edgar, On 18/01/22 14:28, Edgar Bonet wrote: > Hi again! > > Giulio Benetti wrote: >> As pointed by SAMA5D2 Datasheet [...] So let's enable VFPV4/NEON FPU >> strategy instead of the default VFPV4-D16. > > BTW, the Acqua is a SAMA5D3[1] (SAMA5D31 or SAMA5D36, depending on the > version), not a SAMA5D2. The datasheet[2] of the SAMA5D3 states: > > The Floating-Point Unit (FPU) supports the ARMv7 VFPv4-D16 > architecture without Advanced SIMD extensions (NEON). Ah, thank you. I had the SAMA5D3 opened and I couldn't find anymore which board used it. I thought it was this one. Thanks for pointing. > So I guess the patch is not relevant to this board. Exactly. So please drop this patch and I've set it as rejected in Patchwork. I'll go in depth later with patch 01/28. Thank you for the answers! Best regards -- Giulio Benetti Benetti Engineering sas From ps.report at gmx.net Tue Jan 18 16:18:53 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 17:18:53 +0100 Subject: [Buildroot] [PATCH v1] package/strace: bump version to 5.16 Message-ID: <20220118161853.27777-1-ps.report@gmx.net> - update license file hash for COPYING (copyright year update) Changelog (from [1]): Noteworthy changes in strace 5.16 (2022-01-10) ============================================== * Improvements * Implemented --secontext=mismatch option to find mismatches in SELinux contexts. * Implemented decoding of futex_waitv syscall introduced in Linux 5.16. * Implemented decoding of BPF_LINK_GET_NEXT_ID and BPF_LINK_GET_FD_BY_ID bpf syscall commands. * Enhanced decoding of BPF_MAP_CREATE, BPF_PROG_TEST_RUN, and BPF_PROG_LOAD bpf syscall commands. * Enhanced decoding of BTRFS_IOC_FS_INFO ioctl command. * Updated lists of AUDIT_*, BPF_*, BTRFS_*, DEVCONF_*, FAN_*, ETH_P_*, IPV4_DEVCONF_*, KVM_*, NDA_*, SO_*, and V4L2_* constants. * Updated lists of ioctl commands from Linux 5.16. * Bug fixes * Fixed build for older Android. [1] https://strace.io/files/5.16/ Signed-off-by: Peter Seiderer --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index ff89447bfd..30c90e8e39 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.15/strace-5.15.tar.xz.asc -sha256 ebcac22f297335294dc654425cbc3ce013343bece6da2699e3aec86aee8d72dc strace-5.15.tar.xz -sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING +# https://strace.io/files/5.16/strace-5.16.tar.xz.asc +sha256 dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285 strace-5.16.tar.xz +sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 4b70531aa7..c8c3590f6e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.15 +STRACE_VERSION = 5.16 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Tue Jan 18 16:24:13 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 17:24:13 +0100 Subject: [Buildroot] [PATCH v1] package/rtl8812au-aircrack-ng: bump version to 3a6402e Message-ID: <20220118162413.24664-1-ps.report@gmx.net> Changelog: 47a38b7 Fix kernel 5.15 compilation 6fd304f fix libc6_2.34 dependency on build 307d694 Merge pull request #898 from CGarces/fix_5.15 191f5bc Remove REMAKE_INITRD bd8e44b Add back 8814au support 849206d Merge pull request #913 from iyanmv/iyanmv-remove-remake-initrd 7bb5114 Fix kernel v5.15+ compiler warnings 1b63ee6 Fixed compiler warning for unused function a72835d Fix (test) for IPX header on various distros 3a6402e Fix for kernel v3.20 Signed-off-by: Peter Seiderer --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index 5503b4f22e..ed1921d1c2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c5d8286a00273343fc10d0e16afc52e788ac73b7df57c8159e58a40707f61da rtl8812au-aircrack-ng-b8167e66b4ac046b3b76c2c40008d84528e91594.tar.gz +sha256 acae758c3834196c71f4ee58f53a3c1b29ffd984f63ff2f40f2b080c8785c49f rtl8812au-aircrack-ng-3a6402e9e79802891f1531b435be54f4d8b71f0b.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index d42d953496..2bbca88cfb 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = b8167e66b4ac046b3b76c2c40008d84528e91594 +RTL8812AU_AIRCRACK_NG_VERSION = 3a6402e9e79802891f1531b435be54f4d8b71f0b RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Jan 18 17:33:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 18:33:10 +0100 Subject: [Buildroot] [PATCH 01/28] configs/acmesystems_acqua_a5_256mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-2-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-2-giulio.benetti@benettiengineering.com> Message-ID: <4ac1fff6-a7ff-063e-82f7-7b1d198ef0a6@benettiengineering.com> Hi All, On 18/01/22 11:43, Giulio Benetti wrote: > As pointed by SAMA5D2 Datasheet[1]: As pointed by Edgar on Patch 02/28 Acqua A5 doesn't have a SAMA5D2 but a SAMA5D3 that doesn't have VFPV4+NEON, but a VFPv4-D16 and NEON, so this can't work. I've marked it as Rejected in Patchwork as patch 01/28 and please drop it. Thank you and sorry for the noise. Best regards -- Giulio Benetti Benetti Engineering sas > ``` > The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 > functionality to provide support for the ARM v7 Advanced SIMD v2 and > Vector Floating-Point v4 (VFPv4) instruction sets. > ``` > > So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. > > [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf > > Signed-off-by: Giulio Benetti > --- > configs/acmesystems_acqua_a5_256mb_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig > index f8129f3780..991de4c1be 100644 > --- a/configs/acmesystems_acqua_a5_256mb_defconfig > +++ b/configs/acmesystems_acqua_a5_256mb_defconfig > @@ -1,5 +1,6 @@ > BR2_arm=y > BR2_cortex_a5=y > +BR2_ARM_FPU_NEON_VFPV4=y > BR2_ARM_ENABLE_VFP=y > BR2_ARM_INSTRUCTIONS_THUMB2=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > From kuzminov.sergey81 at gmail.com Tue Jan 18 17:45:55 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Tue, 18 Jan 2022 20:45:55 +0300 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> Message-ID: <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> Hi All, Giulio. I checked the patch, everything works. 18.01.2022 09:35, Giulio Benetti ?????: > As explained in the local patch itself of_get_mac_address() has changed, so > we need to check against Linux version and use it slightly differently. > > Patch is pending upstream: > https://github.com/fifteenhex/xradio/pull/15 > I've realized only later there was already an opened PR for this, anyway > IMHO I think my patch is written a little better, so please accept it. > And most of all Sergey already tested it and it works: > https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * update local patch to build correctly also with Linux >= 5.12.1 < 5.13.0 > --- > ...fix-building-with-Linux-version-5.13.patch | 68 +++++++++++++++++++ > 1 file changed, 68 insertions(+) > create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch > > diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch > new file mode 100644 > index 0000000000..3b9742012e > --- /dev/null > +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch > @@ -0,0 +1,68 @@ > +From 4873746fa9d42a8edbc1e192899e00c29ed3d32a Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti > +Date: Mon, 17 Jan 2022 12:26:00 +0100 > +Subject: [PATCH] main.c: fix building with Linux version >= 5.13 > + > +of_get_mac_address() on Linux version >= 5.13 requires mac pointer as > +second argument and return an int. So let's deal with it by checking linux > +version to make it compatible with both Linux version >= 5.13 and not. > + > +Signed-off-by: Giulio Benetti > +--- > + main.c | 17 +++++++++++++++++ > + 1 file changed, 17 insertions(+) > + > +diff --git a/main.c b/main.c > +index b60e18d..06cb1f6 100644 > +--- a/main.c > ++++ b/main.c > +@@ -13,6 +13,7 @@ > + #include > + #include > + #include > ++#include > + > + #include "xradio.h" > + #include "fwio.h" > +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) > + int if_id; > + struct ieee80211_hw *dev; > + struct xradio_common *hw_priv; > ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) > ++ unsigned char addr[ETH_ALEN]; > ++#else > + unsigned char randomaddr[ETH_ALEN]; > + const unsigned char *addr = NULL; > ++#endif > + > + //init xradio_common > + dev = xradio_init_common(sizeof(struct xradio_common)); > +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) > + hw_priv->sdio_func = func; > + sdio_set_drvdata(func, hw_priv); > + > ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) > ++ // fill in mac addresses > ++ if (hw_priv->pdev->of_node) { > ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); > ++ } > ++ if (err < 0) { > ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); > ++ eth_random_addr(addr); > ++ } > ++#else > + // fill in mac addresses > + if (hw_priv->pdev->of_node) { > + addr = of_get_mac_address(hw_priv->pdev->of_node); > +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) > + eth_random_addr(randomaddr); > + addr = randomaddr; > + } > ++#endif > ++ > + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); > + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); > + hw_priv->addresses[1].addr[5] += 0x01; > +-- > +2.25.1 > + From giulio.benetti at benettiengineering.com Tue Jan 18 17:53:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 18:53:46 +0100 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> Message-ID: Hi Sergey, On 18/01/22 18:45, Sergey Kuzminov wrote: > Hi All, Giulio. > I checked the patch, everything works. Can you please place your: Tested-by: Name Surname ? -- Giulio Benetti Benetti Engineering sas > 18.01.2022 09:35, Giulio Benetti ?????: >> As explained in the local patch itself of_get_mac_address() has changed, so >> we need to check against Linux version and use it slightly differently. >> >> Patch is pending upstream: >> https://github.com/fifteenhex/xradio/pull/15 >> I've realized only later there was already an opened PR for this, anyway >> IMHO I think my patch is written a little better, so please accept it. >> And most of all Sergey already tested it and it works: >> https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html >> >> Signed-off-by: Giulio Benetti >> --- >> V1->V2: >> * update local patch to build correctly also with Linux >= 5.12.1 < 5.13.0 >> --- >> ...fix-building-with-Linux-version-5.13.patch | 68 +++++++++++++++++++ >> 1 file changed, 68 insertions(+) >> create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch >> >> diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch >> new file mode 100644 >> index 0000000000..3b9742012e >> --- /dev/null >> +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch >> @@ -0,0 +1,68 @@ >> +From 4873746fa9d42a8edbc1e192899e00c29ed3d32a Mon Sep 17 00:00:00 2001 >> +From: Giulio Benetti >> +Date: Mon, 17 Jan 2022 12:26:00 +0100 >> +Subject: [PATCH] main.c: fix building with Linux version >= 5.13 >> + >> +of_get_mac_address() on Linux version >= 5.13 requires mac pointer as >> +second argument and return an int. So let's deal with it by checking linux >> +version to make it compatible with both Linux version >= 5.13 and not. >> + >> +Signed-off-by: Giulio Benetti >> +--- >> + main.c | 17 +++++++++++++++++ >> + 1 file changed, 17 insertions(+) >> + >> +diff --git a/main.c b/main.c >> +index b60e18d..06cb1f6 100644 >> +--- a/main.c >> ++++ b/main.c >> +@@ -13,6 +13,7 @@ >> + #include >> + #include >> + #include >> ++#include >> + >> + #include "xradio.h" >> + #include "fwio.h" >> +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) >> + int if_id; >> + struct ieee80211_hw *dev; >> + struct xradio_common *hw_priv; >> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) >> ++ unsigned char addr[ETH_ALEN]; >> ++#else >> + unsigned char randomaddr[ETH_ALEN]; >> + const unsigned char *addr = NULL; >> ++#endif >> + >> + //init xradio_common >> + dev = xradio_init_common(sizeof(struct xradio_common)); >> +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) >> + hw_priv->sdio_func = func; >> + sdio_set_drvdata(func, hw_priv); >> + >> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) >> ++ // fill in mac addresses >> ++ if (hw_priv->pdev->of_node) { >> ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); >> ++ } >> ++ if (err < 0) { >> ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); >> ++ eth_random_addr(addr); >> ++ } >> ++#else >> + // fill in mac addresses >> + if (hw_priv->pdev->of_node) { >> + addr = of_get_mac_address(hw_priv->pdev->of_node); >> +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) >> + eth_random_addr(randomaddr); >> + addr = randomaddr; >> + } >> ++#endif >> ++ >> + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); >> + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); >> + hw_priv->addresses[1].addr[5] += 0x01; >> +-- >> +2.25.1 >> + > > From kuzminov.sergey81 at gmail.com Tue Jan 18 18:10:14 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Tue, 18 Jan 2022 21:10:14 +0300 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> Message-ID: <48d2b6c8-356d-419a-c284-e2184509d1c5@gmail.com> Tested-by: Sergey Kuzminov 18.01.2022 20:53, Giulio Benetti ?????: > Hi Sergey, > > On 18/01/22 18:45, Sergey Kuzminov wrote: >> Hi All, Giulio. >> I checked the patch, everything works. > > Can you please place your: > Tested-by: Name Surname > ? > From heiko.thiery at gmail.com Tue Jan 18 19:57:36 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 18 Jan 2022 20:57:36 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220114211525.2697606-1-heiko.thiery@gmail.com> <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> <20220118000448.32ea764d@windsurf> Message-ID: Hi Giulio, Hi Thomas, Am Di., 18. Jan. 2022 um 07:58 Uhr schrieb Giulio Benetti : > > Hi Thomas, > > On 18/01/22 00:04, Thomas Petazzoni wrote: > > On Mon, 17 Jan 2022 20:58:52 +0100 > > Giulio Benetti wrote: > > > >>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > >>> new file mode 100644 > >>> index 0000000000..5b5648cc14 > >>> --- /dev/null > >>> +++ b/configs/kontron_bl_imx8mm_defconfig > >>> @@ -0,0 +1,59 @@ > >>> +# Architecture > >>> +BR2_aarch64=y > >>> +BR2_ARM_FPU_VFPV3=y > >> > >> i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: > >> BR2_ARM_FPU_VFPV4D16 > >> > >> This is to achieve the maximum performance. > > > > Nope, that's not really how it works. VFPv3 is better than VFPv3-D16. > > Indeed VFPv3 means that the the FPU has 32 double precision registers, > > while VFPv3-D16 means that it has "only" 16 double precision registers. > > I'm a bit confused. The datasheet[1] states at 1.4.1: > ``` > ? Media Processing Engine (MPE) with NEON technology supporting the > Advanced Single Instruction Multiple Data architecture > ? Floating Point Unit (FPU) with support of the VFPv4-D16 architecture > ``` > [1]: https://www.nxp.com/docs/en/data-sheet/IMX8MMCEC.pdf > > So I expect it to only have VFPv4-D16. And also NEON, but we can't mix > them up in Aarch64 as I know. > > > So, if the i.MX8MM has only the VFPv3-D16, then indeed it should be > > chosen, because code compiled with VFPv3 may not work, as it might use > > too many double precision registers. > > > > On the other hand, if the i.MX8MM has the full VFPv3, then > > BR2_ARM_FPU_VFPV3=y should be used. > > It only has VFPv4-D16. I think I've explained myself bad. This is not to > achieve maximum performance, simply datasheet states it only supports > VFPv4-D16[1] and judging from this: > https://developer.arm.com/documentation/dui0472/h/CJADDCIF#:~:text=VFPv3%20has%2032%20double%2Dprecision,VFPv3%20with%20half%2Dprecision%20extensions.&text=VFPv4%20has%2032%20double%2Dprecision,to%20the%20features%20of%20VFPv3. > > VFPv4 is retro-compatible with VFPv3, and I'd expect VFP4v4-D16 to be > like that too. Is it possible that at the moment, by mistake, it worked > without using more than 16 registers as VFPv3 that is retro-compatible > with VFPv4-D16(maybe?). > > > That being said, the gcc man page only documents vfpv3, vfpv3-d16-fp16, > > vfpv3-fp16 as extension for armv7-a. Interesting, would need to look > > into this. > > Yes, but i.MX8MM is a cortex-A53, so armv8-a: > https://developer.arm.com/ip-products/processors/cortex-a/cortex-a53 > > that then is retro-compatible to armv7-a if in Aarch32. > But here we use it as BR2_aarch64, so armv8-a: > https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html > > and it lists: > ``` > -mfpu=name > This specifies what floating-point hardware (or hardware emulation) is > available on the target. Permissible names are: ?auto?, ?vfpv2?, > ?vfpv3?, ?vfpv3-fp16?, ?vfpv3-d16?, ?vfpv3-d16-fp16?, ?vfpv3xd?, > ?vfpv3xd-fp16?, ?neon-vfpv3?, ?neon-fp16?, ?vfpv4?, ?vfpv4-d16?, > ?fpv4-sp-d16?, ?neon-vfpv4?, ?fpv5-d16?, ?fpv5-sp-d16?, ?fp-armv8?, > ?neon-fp-armv8? and ?crypto-neon-fp-armv8?. Note that ?neon? is an alias > for ?neon-vfpv3? and ?vfp? is an alias for ?vfpv2?. > ``` > > So "vfpv4-d16" is possible. > > Here I think we need vfpv4-d16 and not vfpv3 because of both DS and RM > of i.MX8MM. > > Does it sound good to you? After following the discussion in IRC between Yann and Michael I am sure that this setting cannot be used for the aarch64/cortex-A53 CPU. The settings BR2_ARM_CPU_HAS_FPU, BR2_ARM_CPU_HAS_VFPV2, BR2_ARM_CPU_HAS_VFPV3, BR2_ARM_CPU_HAS_VFPV4 and BR2_ARM_CPU_HAS_FP_ARMV8 are set implicitly. I probably took the setting from the freescale_imx8mmevk_defconfig, which is then also not correct. I then looked further at the other aarch64 defconfigs and saw that there are more that set the FPU settings. # grep aarch64 -A50 configs/* | grep FPU | wc -l 28 I will remove this setting from the defconfig in this patch and also for the other kontron defconfig. -- Heiko From ps.report at gmx.net Tue Jan 18 20:17:09 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 21:17:09 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/enlightenment: change download URL to https In-Reply-To: <20220118201709.25366-1-ps.report@gmx.net> References: <20220118201709.25366-1-ps.report@gmx.net> Message-ID: <20220118201709.25366-2-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/enlightenment/enlightenment.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 640d5a62bb..24bbd96cd0 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -6,7 +6,7 @@ ENLIGHTENMENT_VERSION = 0.25.0 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt -- 2.34.1 From ps.report at gmx.net Tue Jan 18 20:17:08 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 21:17:08 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/efl: change download URL to https Message-ID: <20220118201709.25366-1-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/efl/efl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 46bce29305..ed0a8acc1d 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -6,7 +6,7 @@ EFL_VERSION = 1.26.0 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl +EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Jan 18 20:40:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 21:40:09 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: Message-ID: <966BF669-674E-4A71-82E3-FF7A2B520659@benettiengineering.com> Hi Heiko, Thomas, > Il giorno 18 gen 2022, alle ore 20:58, Heiko Thiery ha scritto: > > ?Hi Giulio, Hi Thomas, > > >> Am Di., 18. Jan. 2022 um 07:58 Uhr schrieb Giulio Benetti >> : >> >> Hi Thomas, >> >>> On 18/01/22 00:04, Thomas Petazzoni wrote: >>> On Mon, 17 Jan 2022 20:58:52 +0100 >>> Giulio Benetti wrote: >>> >>>>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig >>>>> new file mode 100644 >>>>> index 0000000000..5b5648cc14 >>>>> --- /dev/null >>>>> +++ b/configs/kontron_bl_imx8mm_defconfig >>>>> @@ -0,0 +1,59 @@ >>>>> +# Architecture >>>>> +BR2_aarch64=y >>>>> +BR2_ARM_FPU_VFPV3=y >>>> >>>> i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: >>>> BR2_ARM_FPU_VFPV4D16 >>>> >>>> This is to achieve the maximum performance. >>> >>> Nope, that's not really how it works. VFPv3 is better than VFPv3-D16. >>> Indeed VFPv3 means that the the FPU has 32 double precision registers, >>> while VFPv3-D16 means that it has "only" 16 double precision registers. >> >> I'm a bit confused. The datasheet[1] states at 1.4.1: >> ``` >> ? Media Processing Engine (MPE) with NEON technology supporting the >> Advanced Single Instruction Multiple Data architecture >> ? Floating Point Unit (FPU) with support of the VFPv4-D16 architecture >> ``` >> [1]: https://www.nxp.com/docs/en/data-sheet/IMX8MMCEC.pdf >> >> So I expect it to only have VFPv4-D16. And also NEON, but we can't mix >> them up in Aarch64 as I know. >> >>> So, if the i.MX8MM has only the VFPv3-D16, then indeed it should be >>> chosen, because code compiled with VFPv3 may not work, as it might use >>> too many double precision registers. >>> >>> On the other hand, if the i.MX8MM has the full VFPv3, then >>> BR2_ARM_FPU_VFPV3=y should be used. >> >> It only has VFPv4-D16. I think I've explained myself bad. This is not to >> achieve maximum performance, simply datasheet states it only supports >> VFPv4-D16[1] and judging from this: >> https://developer.arm.com/documentation/dui0472/h/CJADDCIF#:~:text=VFPv3%20has%2032%20double%2Dprecision,VFPv3%20with%20half%2Dprecision%20extensions.&text=VFPv4%20has%2032%20double%2Dprecision,to%20the%20features%20of%20VFPv3. >> >> VFPv4 is retro-compatible with VFPv3, and I'd expect VFP4v4-D16 to be >> like that too. Is it possible that at the moment, by mistake, it worked >> without using more than 16 registers as VFPv3 that is retro-compatible >> with VFPv4-D16(maybe?). >> >>> That being said, the gcc man page only documents vfpv3, vfpv3-d16-fp16, >>> vfpv3-fp16 as extension for armv7-a. Interesting, would need to look >>> into this. >> >> Yes, but i.MX8MM is a cortex-A53, so armv8-a: >> https://developer.arm.com/ip-products/processors/cortex-a/cortex-a53 >> >> that then is retro-compatible to armv7-a if in Aarch32. >> But here we use it as BR2_aarch64, so armv8-a: >> https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html >> >> and it lists: >> ``` >> -mfpu=name >> This specifies what floating-point hardware (or hardware emulation) is >> available on the target. Permissible names are: ?auto?, ?vfpv2?, >> ?vfpv3?, ?vfpv3-fp16?, ?vfpv3-d16?, ?vfpv3-d16-fp16?, ?vfpv3xd?, >> ?vfpv3xd-fp16?, ?neon-vfpv3?, ?neon-fp16?, ?vfpv4?, ?vfpv4-d16?, >> ?fpv4-sp-d16?, ?neon-vfpv4?, ?fpv5-d16?, ?fpv5-sp-d16?, ?fp-armv8?, >> ?neon-fp-armv8? and ?crypto-neon-fp-armv8?. Note that ?neon? is an alias >> for ?neon-vfpv3? and ?vfp? is an alias for ?vfpv2?. >> ``` >> >> So "vfpv4-d16" is possible. >> >> Here I think we need vfpv4-d16 and not vfpv3 because of both DS and RM >> of i.MX8MM. >> >> Does it sound good to you? > > After following the discussion in IRC between Yann and Michael I am > sure that this setting cannot be used for the aarch64/cortex-A53 CPU. > The settings BR2_ARM_CPU_HAS_FPU, BR2_ARM_CPU_HAS_VFPV2, > BR2_ARM_CPU_HAS_VFPV3, BR2_ARM_CPU_HAS_VFPV4 and > BR2_ARM_CPU_HAS_FP_ARMV8 are set implicitly. Yes, I was wrong and you point that fpu strategy falls back to BR2_ARM_FPU_FP_ARMV8 and it?s ok. But i.MX8MM supports NEON too, so I would go for setting BR2_ARM_FPU_NEON_FP_ARMV8, because as pointed here[1] the armv8 neon now supports IEEE 754 floating point standard. BUT I?ve found that gcc[2] points that: ??? If the selected floating-point hardware includes the NEON extension (e.g. -mfpu=neon), note that floating-point operations are not generated by GCC?s auto-vectorization pass unless -funsafe-math-optimizations is also specified. This is because NEON hardware does not fully implement the IEEE 754 standard for floating-point arithmetic (in particular denormal values are treated as zero), so the use of NEON instructions may lead to a loss of precision. ??? So I still can?t understand if it?s something core related or something gcc related. Does anyone have any more in-depth explanation? Anyway I agree with Heiko to remove the fpu strategy in this defconfig. Best regards ?- Giulio Benetti Benetti Engineering sas [1]: https://developer.arm.com/architectures/instruction-sets/floating-point [2]: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html > > I probably took the setting from the freescale_imx8mmevk_defconfig, > which is then also not correct. > > I then looked further at the other aarch64 defconfigs and saw that > there are more that set the FPU settings. > > # grep aarch64 -A50 configs/* | grep FPU | wc -l > 28 > > I will remove this setting from the defconfig in this patch and also > for the other kontron defconfig. > > -- > Heiko -------------- next part -------------- An HTML attachment was scrubbed... URL: From ps.report at gmx.net Tue Jan 18 21:14:29 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:29 +0100 Subject: [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Message-ID: <20220118211434.9854-1-ps.report@gmx.net> Now based on 5.10.92 (from 5.10.78). Signed-off-by: Peter Seiderer --- configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- configs/raspberrypicm4io_64_defconfig | 2 +- configs/raspberrypicm4io_defconfig | 2 +- configs/raspberrypizero2w_defconfig | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 64f7a93377..4506e94bce 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index f3e7c453ab..7a35794c2d 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 7befbf07e6..9b484c5588 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index ebb6e2252b..4d838ae0e8 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 6a9c4e0d02..0a59ab42a9 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 7d06b0bb5e..40d0c0f888 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 2b5446d8f1..5942f7c4e1 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index ac555ddd5e..4e5580c140 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 257e59536e..cca53f9b37 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 1ab379c557..29cb0472d7 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 9941754e25..017aecc0dd 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index ddd6b97b06..2ea503ca24 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:31 +0100 Subject: [Buildroot] [PATCH v1 3/6] package/rpi-userland: bump version to 14b90ff In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-3-ps.report@gmx.net> Changelog: f5404b2 raspicam: Check system is running legacy camera stack 14b90ff mmal: Hack to make mmal core register VideoCore components Signed-off-by: Peter Seiderer --- package/rpi-userland/rpi-userland.hash | 2 +- package/rpi-userland/rpi-userland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 8ea184a4f6..b837cfe709 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 16c01befff64ebc11a0554e487b00939ed7a716f68dc795db4880b35bb25fa41 rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz +sha256 bb682f3c20bc5c7877531d5666c8dcc674a2f347aa792cf979dc0b07b6261e77 rpi-userland-14b90ff9d9f031391a299e6e006965d02bfd1bb1.tar.gz sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 09a7f6af74..84050b6df3 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = bab9bf8790cd69660d443ce43b4e372999f3f7ac +RPI_USERLAND_VERSION = 14b90ff9d9f031391a299e6e006965d02bfd1bb1 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:32 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:32 +0100 Subject: [Buildroot] [PATCH v1 4/6] package/rpi-bt-firmware: bump version to ea9963f In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-4-ps.report@gmx.net> Chanelog (since 3888ba2): - Sync with RPi-Distro repo Switch to "bullseye" branch which moved several firmware files to the cypress dir. Add 43438 firmware 7.45.98.118 + external clm_blob Add 43455 firmware 7.45.241 and clm_blob - README.md: update link to RPi-distro repo wifi firmware files - Merge pull request #19 from HiassofT/2021-12 Signed-off-by: Peter Seiderer --- package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash index 7e60aa4632..a575a02e97 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-bt-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 8d658ce435..f2d54f33bf 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef +RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:33 +0100 Subject: [Buildroot] [PATCH v1 5/6] package/rpi-wifi-firmware bump version to ea9963f In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-5-ps.report@gmx.net> - add cypress files - update links Chanelog (since 3888ba2): - Sync with RPi-Distro repo Switch to "bullseye" branch which moved several firmware files to the cypress dir. Add 43438 firmware 7.45.98.118 + external clm_blob Add 43455 firmware 7.45.241 and clm_blob Signed-off-by: Peter Seiderer --- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index 09cd197dd8..7ff47b8cfe 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-wifi-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index a467f2c7b4..b54cd359a4 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef +RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx @@ -12,9 +12,17 @@ RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin + ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob + ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt + ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt + ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin + ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress endef $(eval $(generic-package)) -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:34 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:34 +0100 Subject: [Buildroot] [PATCH v1 6/6] package/brcmfmac_sdio-firmware-rpi: new package (former rpi-bt-firmware/rpi-wifi-firmware) In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-6-ps.report@gmx.net> Move rpi-bt-firmware and rpi-wifi-firmware packages to the new brcmfmac_sdio-firmware-rpi one (as they share the same donwload). Signed-off-by: Peter Seiderer --- Notes: - patch moved after the rpi-bt-firmware/rpi-wifi-firmware version bump as it saves some code/download duplication but the new package/name is harder to find/remember... --- Config.in.legacy | 18 ++++++++++++ DEVELOPERS | 3 +- package/Config.in | 3 +- package/brcmfmac_sdio-firmware-rpi/Config.in | 29 +++++++++++++++++++ .../brcmfmac_sdio-firmware-rpi.hash} | 2 +- .../brcmfmac_sdio-firmware-rpi.mk} | 27 +++++++++++++---- package/rpi-bt-firmware/Config.in | 9 ------ package/rpi-bt-firmware/rpi-bt-firmware.hash | 3 -- package/rpi-bt-firmware/rpi-bt-firmware.mk | 17 ----------- package/rpi-wifi-firmware/Config.in | 13 --------- 10 files changed, 71 insertions(+), 53 deletions(-) create mode 100644 package/brcmfmac_sdio-firmware-rpi/Config.in rename package/{rpi-wifi-firmware/rpi-wifi-firmware.hash => brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash} (68%) rename package/{rpi-wifi-firmware/rpi-wifi-firmware.mk => brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk} (61%) delete mode 100644 package/rpi-bt-firmware/Config.in delete mode 100644 package/rpi-bt-firmware/rpi-bt-firmware.hash delete mode 100644 package/rpi-bt-firmware/rpi-bt-firmware.mk delete mode 100644 package/rpi-wifi-firmware/Config.in diff --git a/Config.in.legacy b/Config.in.legacy index dd64b7da1b..465d7bef90 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,24 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_RPI_BT_FIRMWARE + bool "rpi-bt-firmware package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT + help + Package rpi-bt-firmware was moved as option to + package brcmfmac-sdio-firmware-rpi. + +config BR2_PACKAGE_RPI_WIFI_FIRMWARE + bool "rpi-wifi-firmware package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI + help + Package rpi-wifi-firmware was moved as option to + package brcmfmac-sdio-firmware-rpi. + config BR2_PACKAGE_HOST_GDB_PYTHON bool "GDB Python2 support removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..dc810b6fe1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1832,12 +1832,11 @@ F: configs/qemu_riscv64_virt_defconfig N: Martin Bark F: board/raspberrypi/ F: configs/raspberrypi3_defconfig +F: package/brcmfmac_sdio-firmware-rpi/ F: package/ca-certificates/ F: package/connman/ F: package/nodejs/ -F: package/rpi-bt-firmware/ F: package/rpi-firmware/ -F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ diff --git a/package/Config.in b/package/Config.in index 4df1474b91..3b38af7232 100644 --- a/package/Config.in +++ b/package/Config.in @@ -419,15 +419,14 @@ menu "Hardware handling" menu "Firmware" source "package/am33x-cm3/Config.in" source "package/armbian-firmware/Config.in" + source "package/brcmfmac_sdio-firmware-rpi/Config.in" source "package/b43-firmware/Config.in" source "package/linux-firmware/Config.in" source "package/murata-cyw-fw/Config.in" source "package/odroidc2-firmware/Config.in" source "package/qcom-db410c-firmware/Config.in" source "package/rcw-smarc-sal28/Config.in" - source "package/rpi-bt-firmware/Config.in" source "package/rpi-firmware/Config.in" - source "package/rpi-wifi-firmware/Config.in" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" diff --git a/package/brcmfmac_sdio-firmware-rpi/Config.in b/package/brcmfmac_sdio-firmware-rpi/Config.in new file mode 100644 index 0000000000..73f400a2b7 --- /dev/null +++ b/package/brcmfmac_sdio-firmware-rpi/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + bool "brcmfmac-sdio-firmware-rpi" + depends on BR2_arm || BR2_aarch64 + help + Raspberry Broadcom Bluetooth and Wifi firmware. + + https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi + +if BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT + bool "brcmfmac-sdio-firmware-rpi-bt" + help + Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module + firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 + Bluetooth module firmware. + +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI + bool "brcmfmac-sdio-firmware-rpi-wifi" + depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX + help + Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module + NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 + wifi module NVRAM data. + +comment "brcmfmac-sdio-firmware-rpi-wifi conflicts with linux-firmware Broadcom BRCM bcm43xx" + depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX + +endif diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash similarity index 68% rename from package/rpi-wifi-firmware/rpi-wifi-firmware.hash rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index 7ff47b8cfe..a12e92cbac 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk similarity index 61% rename from package/rpi-wifi-firmware/rpi-wifi-firmware.mk rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index b54cd359a4..4d1f285442 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -1,15 +1,24 @@ ################################################################################ # -# rpi-wifi-firmware +# brcmfmac_sdio-firmware-rpi # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) -RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY -RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx -define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS + +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm +endef +endif + +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin @@ -24,5 +33,11 @@ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress endef +endif + +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT) + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI) +endef $(eval $(generic-package)) diff --git a/package/rpi-bt-firmware/Config.in b/package/rpi-bt-firmware/Config.in deleted file mode 100644 index 45643d6a52..0000000000 --- a/package/rpi-bt-firmware/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_RPI_BT_FIRMWARE - bool "rpi-bt-firmware" - depends on BR2_arm || BR2_aarch64 - help - Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module - firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 - Bluetooth module firmware. - - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash deleted file mode 100644 index a575a02e97..0000000000 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk deleted file mode 100644 index f2d54f33bf..0000000000 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# rpi-bt-firmware -# -################################################################################ - -RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d -RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) -RPI_BT_FIRMWARE_LICENSE = PROPRIETARY -RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx - -define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm -endef - -$(eval $(generic-package)) diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in deleted file mode 100644 index 7e81b286c0..0000000000 --- a/package/rpi-wifi-firmware/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_RPI_WIFI_FIRMWARE - bool "rpi-wifi-firmware" - depends on BR2_arm || BR2_aarch64 - depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX - help - Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module - NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 - wifi module NVRAM data. - - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi - -comment "rpi-wifi-firmware conflicts with linux-firmware Broadcom BRCM bcm43xx" - depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:30 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:30 +0100 Subject: [Buildroot] [PATCH v1 2/6] package/rpi-firmware: bump version to 3f20b83 In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-2-ps.report@gmx.net> Changelog: 095deea759 kernel: overlays: vc4-kms-v3d: Change composite handling 2e9b609e53c kernel: Bump to 5.10.79 12bc6e36773 firmware: dtoverlay: Rebase aliases in overlays like labels 24d966d35bb kernel: Bump to 5.10.81 ca52e7c1303 kernel: edt-ft5x06 touchscreen fixes 1a0297bfbf7 kernel: Bump to 5.10.82 0a1a871d04c kernel: Fix for IN Token of USB Endpoint 1 stopping occasionally on Pi 4 303d0012cd7 kernel: Bump to 5.10.83 bd8b6d5dc8e kernel: Bump to 5.10.85 56f1b8bbc88 kernel: Bump to 5.10.87 536baf33ae9 kernel: Bump to 5.10.88 ce71e3e9b34 kernel: Bump to 5.10.89 19b570d0d6a firmware: arm-loader: Fix kernel8.img selection on 2837 with arm_64bit=1 fbbde90b709 kernel: drm/vc4: fix non-working audio on RPi3 and no video with DVI 165bd7bc562 firmware: improve firmware camera detection 318e3373496 kernel: Bump to 5.10.90 175984a6dc4 kernel: drm/vc4: Add alpha_blend_mode property to each plane 20c5829b0af kernel: Bump to 5.10.92 3f20b832b27 firmware: arm_loader: Only clip min/max to the same value for turbo clocks Signed-off-by: Peter Seiderer --- 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 7cbfd1b249..ec13115f3b 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a079a31fc80a23421589edcacef94faa713b12d3e77b92710ae2594c8d549477 rpi-firmware-fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25.tar.gz +sha256 33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index f773f83999..b46a7f5270 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25 +RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -- 2.34.1 From kuzminov.sergey81 at gmail.com Tue Jan 18 21:58:03 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Wed, 19 Jan 2022 00:58:03 +0300 Subject: [Buildroot] [PATCH v2] board/orangepi/orangepi-zero:extlinux, refactoring Message-ID: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> Changes: - common scenarios for multiple boards to create the SD image: board/orangepi/common; - extlinux.conf instead of boot.scr; - exclude FAT partition; - defconfig refactoring; - kernel: bump to version 5.16.1; - u-boot: bump to version 2022.01; - added BR2_ARM_FPU_NEON_VFPV4; - added fast_commit for ext4. Patch required to work: https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 5 ++ board/orangepi/common/genimage.cfg | 20 +++++++ board/orangepi/common/post-build.sh | 34 +++++++++++ board/orangepi/common/uboot-extras.config | 3 + board/orangepi/orangepi-zero/boot.cmd | 9 --- board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ configs/orangepi_zero_defconfig | 69 ++++++++++++++--------- 7 files changed, 104 insertions(+), 72 deletions(-) create mode 100644 board/orangepi/common/extlinux.conf create mode 100644 board/orangepi/common/genimage.cfg create mode 100755 board/orangepi/common/post-build.sh create mode 100644 board/orangepi/common/uboot-extras.config delete mode 100644 board/orangepi/orangepi-zero/boot.cmd delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..015f29270e --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,5 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait console=${console} +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg new file mode 100644 index 0000000000..8b80ffb138 --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + hdimage { + partition-table-type = gpt + gpt-no-backup = true + gpt-location = 1008K # 1MB - 16KB + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB - 16KB + } + + partition rootfs { + offset = 1M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh new file mode 100755 index 0000000000..296f94b174 --- /dev/null +++ b/board/orangepi/common/post-build.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "uImage" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + echo "Image" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + echo "Image.gz" + else + echo "zImage" + fi +} + +generic_getty() +{ + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then + echo "" + else + echo "s/\s*console=\S*//" + fi +} + +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" + +sed -e "$(generic_getty)" \ + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ + -e "s/%PARTUUID%/$PARTUUID/g" \ + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" + +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config new file mode 100644 index 0000000000..5aa97523d9 --- /dev/null +++ b/board/orangepi/common/uboot-extras.config @@ -0,0 +1,3 @@ +CONFIG_BOOTDELAY=0 +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv preboot;" diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd deleted file mode 100644 index d094a64fe5..0000000000 --- a/board/orangepi/orangepi-zero/boot.cmd +++ /dev/null @@ -1,9 +0,0 @@ -setenv fdt_high ffffffff - -part uuid mmc 0:2 uuid -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg deleted file mode 100644 index 32f5454ae6..0000000000 --- a/board/orangepi/orangepi-zero/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Zero -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h2-plus-orangepi-zero.dtb", - "boot.scr" - } - } - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..d1cae2b4f3 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,49 +1,64 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_NEON_VFPV4=y +#BR2_ARM_INSTRUCTIONS_THUMB2=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y +BR2_TARGET_ROOTFS_TAR=n + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_GENIMAGE=y -# wireless driver and firmware +# Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y BR2_PACKAGE_ARMBIAN_FIRMWARE=y BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -# wireless support +# Wireless support BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -# spi flash support +# Spi flash support BR2_PACKAGE_MTD=y -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 18 22:24:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 18 Jan 2022 23:24:24 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed Message-ID: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.): configure:13774: checking whether pthreads work with -pthread configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 conftest.c:27:26: error: #error "_REENTRANT must be defined" 27 | # error "_REENTRANT must be defined" | ^~~~~ It should be noted that external bootlins will have to be rebuilt. Fixes: - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 Signed-off-by: Fabrice Fontaine --- ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++ ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch create mode 100644 package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + diff --git a/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 18 22:24:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 18 Jan 2022 23:24:25 +0100 Subject: [Buildroot] [PATCH 2/2] Revert "package/libmicrohttpd: fix pthread detection" In-Reply-To: <20220118222425.164134-1-fontaine.fabrice@gmail.com> References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Message-ID: <20220118222425.164134-2-fontaine.fabrice@gmail.com> This reverts commit 834464792e691a243d456335083b2a8b3363e261, the build failure is not related to the bump to 0.9.75 but to or1k and gcc 10. Signed-off-by: Fabrice Fontaine --- package/libmicrohttpd/libmicrohttpd.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 344e1443fd..f75178bc0a 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -12,10 +12,6 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBMICROHTTPD_CFLAGS += -D_REENTRANT -endif - LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Jan 18 22:34:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 23:34:52 +0100 Subject: [Buildroot] [PATCH v2] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> References: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> Message-ID: <3F734133-43FB-4057-8A88-92210A9FDCB4@benettiengineering.com> Hi Sergey, patch subject doesn?t say what you?re doing. How about: orangepi/orangepi-zero: bump Linux and U-Boot versions And in commit log below try to keep it more consistent. Like every change form sounds the same: - create common scenario? - use extlinux.conf instead of boot.scr Etc. > Il giorno 18 gen 2022, alle ore 22:59, Sergey Kuzminov ha scritto: > > ?Changes: > - common scenario for multiple boards to create the SD image: board/orangepi/common; > - extlinux.conf instead of boot.scr; > - exclude FAT partition; > - defconfig refactoring; > - kernel: bump to version 5.16.1; > - u-boot: bump to version 2022.01; > - added BR2_ARM_FPU_NEON_VFPV4; > - added fast_commit for ext4. > > Patch required to work: > https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ > > Signed-off-by: Sergey Kuzminov ?- Here you need to add: V1->V2: * changed this * changed that So in V3 you also need to add: V2->V3: * changed those * etc. > --- > board/orangepi/common/extlinux.conf | 5 ++ > board/orangepi/common/genimage.cfg | 20 +++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++ > board/orangepi/common/uboot-extras.config | 3 + > board/orangepi/orangepi-zero/boot.cmd | 9 --- > board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ > configs/orangepi_zero_defconfig | 69 ++++++++++++++--------- > 7 files changed, 104 insertions(+), 72 deletions(-) > create mode 100644 board/orangepi/common/extlinux.conf > create mode 100644 board/orangepi/common/genimage.cfg > create mode 100755 board/orangepi/common/post-build.sh > create mode 100644 board/orangepi/common/uboot-extras.config > delete mode 100644 board/orangepi/orangepi-zero/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg > > diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf > new file mode 100644 > index 0000000000..015f29270e > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,5 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + append root=PARTUUID=%PARTUUID% rootwait console=${console} > +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..8b80ffb138 > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = gpt > + gpt-no-backup = true > + gpt-location = 1008K # 1MB - 16KB > + } > + > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB - 16KB > + } > + > + partition rootfs { > + offset = 1M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh > new file mode 100755 > index 0000000000..296f94b174 > --- /dev/null > +++ b/board/orangepi/common/post-build.sh > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +linux_image() > +{ > + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then > + echo "uImage" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then > + echo "Image" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then > + echo "Image.gz" > + else > + echo "zImage" > + fi > +} > + > +generic_getty() > +{ > + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then > + echo "" > + else > + echo "s/\s*console=\S*//" > + fi > +} > + > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > + > +sed -e "$(generic_getty)" \ > + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ > + -e "s/%PARTUUID%/$PARTUUID/g" \ > + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > + > +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config > new file mode 100644 > index 0000000000..5aa97523d9 > --- /dev/null > +++ b/board/orangepi/common/uboot-extras.config > @@ -0,0 +1,3 @@ > +CONFIG_BOOTDELAY=0 > +CONFIG_USE_PREBOOT=y > +CONFIG_PREBOOT="setenv preboot;" > diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd > deleted file mode 100644 > index d094a64fe5..0000000000 > --- a/board/orangepi/orangepi-zero/boot.cmd > +++ /dev/null > @@ -1,9 +0,0 @@ > -setenv fdt_high ffffffff > - > -part uuid mmc 0:2 uuid > -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg > deleted file mode 100644 > index 32f5454ae6..0000000000 > --- a/board/orangepi/orangepi-zero/genimage.cfg > +++ /dev/null > @@ -1,36 +0,0 @@ > -# Minimal SD card image for the OrangePi Zero > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h2-plus-orangepi-zero.dtb", > - "boot.scr" > - } > - } > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..d1cae2b4f3 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,49 +1,64 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > -BR2_ARM_FPU_VFPV4=y > +BR2_ARM_EABIHF=y > +BR2_ARM_FPU_NEON_VFPV4=y > +#BR2_ARM_INSTRUCTIONS_THUMB2=y Is there a specific reason for specifying here not thumb2? So ARM? > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" > -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -# BR2_TARGET_ROOTFS_TAR is not set > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > -BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" Here ^^^ I tend to use .fragment extension instead of .config > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" Ditto ^^^ > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > +BR2_TARGET_ROOTFS_TAR=n Here you should keep the form # BR2_TARGET_ROOTFS_TAR not set Instead of assigning =n Best regards ?- Giulio Benetti Benetti Engineering sas > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_GENIMAGE=y > > -# wireless driver and firmware > +# Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > BR2_PACKAGE_ARMBIAN_FIRMWARE=y > BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y > > -# wireless support > +# Wireless support > BR2_PACKAGE_IW=y > BR2_PACKAGE_WIRELESS_TOOLS=y > BR2_PACKAGE_WIRELESS_TOOLS_LIB=y > @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > > -# spi flash support > +# Spi flash support > BR2_PACKAGE_MTD=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Jan 19 07:06:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 19 Jan 2022 07:06:47 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-18 Message-ID: <20220119070657.545B340140@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-18 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 66 | 3 | 0 | 69 | 2021.11.x | 23 | 2 | 0 | 25 | master | 92 | 53 | 0 | 145 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 10 host-riscv-isa-sim-1.1.0 | 8 bluez5_utils-5.63 | 4 gvfs-1.48.1 | 4 log4cxx-0.12.0 | 3 unknown | 3 mesa3d-21.3.3 | 2 babeltrace2-2.0.4 | 1 bat-0.18.3 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 gstd-0.13.0 | 1 guile-3.0.7 | 1 ipmitool-1.8.18 | 1 ksmbd-tools-3.4.3 | 1 libglvnd-1.3.2 | 1 nodejs-14.18.3 | 1 pcsc-lite-1.9.5 | 1 pulseview-0.4.2 | 1 qt5base-5.15.2 | 1 qt5webkit-5.212.0-alpha4 | 1 sslh-1.22c | 1 tpm2-pkcs11-1.7.0 | 1 wavemon-0.9.4 | 1 xdriver_xf86-video-mach64-6... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | babeltrace2-2.0.4 | NOK | http://autobuild.buildroot.net/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/1bfca20d72a0bca2e3336b6edc3a4722d18a7816 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6571ba516c5fb13ab0ab5727671af36d8357ff70 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b912dd02ec87f6d3faacb163fcb676b0e6028ba0 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2a61a8d8739ec9773f946aec3c00b7ba54bb7a73 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/46f212005463424f93b9f86b0feba17335cf5db8 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/57d6a2a0785245df75fd6c1f38f59e352cce8ae1 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/74ff28b31a001e4451aafb4d69c0839e2b312853 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/daf464b68bb0bec85e0f96f2c6a4deb9cfd7488c | arm | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/9e0de3be130bb618514a32878e1fd3c2717ebce5 | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a927f5d8adbfdff2bb69fb1185aa98c718d5f73a | ORPH s390x | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/f2bc8f2163acda56dddde5bae8d4e0e852e8eeab | ORPH aarch64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/87194e411363b1e872edd0b789c7aa3236aecd6a | ORPH x86_64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/7c426984f57b5f044da597c6ddc602aeacb5e152 | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/aaafaf0fe330fa30fa3bc50eec985b8385733f40 | ORPH arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/53283b708980285341d23ef3e1ec18c1eb64ed89 | arc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/07662a376b7e77c3edca3725132615c2dcec4a0e | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6dd5b437ac5a1c995c79da9926e454c23eb82bab | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/1cc794a1b82832a3bd62bc9804097fadef8db3c5 | riscv32 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/40af7d5baa8360cae3298d11cdad0ed36655d425 | microblazeel | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/e5648e68ef17ca611728fbcadf2a80c7f3818521 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/95ddf7e566d38bcb7a61365ebed4a844f3b3bf79 | aarch64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/dee032c078aa3788fb146fc8ceb47bd6fbf5f062 | arc | ipmitool-1.8.18 | NOK | http://autobuild.buildroot.net/results/ef3c9c4507fefdfc34d881d3b2b6f84bf541688f | s390x | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/0693163f4903e8b814d6d8daa6e7e4d2f2341cc7 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/0b9193bba229573156aa92c962ac33584bf4a201 | ORPH x86_64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/a5d3e05f1b1618b603c44c84ad786e4b2f43e260 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/22cfce984a6b1959261ef20540fcb70d92be3129 | riscv64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/1f1412bb0e39e44813bacab73b984f63c20d2f09 | powerpc | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/e12e6c039bf2509370f1ad5f8aa6bcb744d3abff | riscv64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/58d5683a179efc2f79bba53d29ffb32b56c17a5d | x86_64 | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/a1f913e4a2da6fb59f67db6a9de81c41cd75e060 | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/6f926bec146752873f8032b593f0de1cb222ea46 | ORPH sparc64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/e9002c89321ae1438382dfff023fe1dba3aa096f | x86_64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/27b31481733f08f1cf8cfee34a251d3e69ab2621 | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/1edec9977ce0b2f7a5fa9757bfc5f22149b30a4f | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5ed1912a5c65dce379baeec8160ff6ee113867a6 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ef117ee0d40b36bd4c099b14aa4d2f59d2b2ef9b | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/41df114212d088c7ec2fff0770757092265934bc | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/43fa0d571924bd1ee96b0485cea5b62185a9800f | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/50fe491b3a6c4e6e1cefb36682a97612160112d5 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a5019decffeffdb5aed8bb93153364647b4d3935 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d7b6e3c014f418e3ba1a9b8b91d7d2877ea8fbe6 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f901a69ec0a3b311226fa282c4e4b4abeb845207 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5f4e7afff729d3f1ee145b5441d449f6f3ca351a | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/37bd366dfd1c57cbcd01b115c9074f49c4b1f9fd | arm | sslh-1.22c | NOK | http://autobuild.buildroot.net/results/59c95f4ffda404124409f4c4e9cc2dfe40ef7588 | or1k | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/fda2d1c28ffa7e73d38a52dcd4c7ae79aa0a44a5 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/05ccfe1c4a26585ce2f92f5685cf1b10ab7c8546 | arm | unknown | NOK | http://autobuild.buildroot.net/results/96d25f7893151a6a4f96117c1ce52d20a44fcfba | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7024cb5ef610451ee083c91fb312467709514e2c | xtensa | xdriver_xf86-video-mach64-6... | NOK | http://autobuild.buildroot.net/results/f0a0224a2b368c11236fcc7d14db5175c0a829d1 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c92a15f1e2ce25bfd4791318d85aa2ab385fb51b | xtensa | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/b94330935b48ba8124f42932f49a161cb348830e | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/b5a453a3196c3c8de1186984489356322e2c3ddb | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/9b1a2326b5a10cda27725a991d62091079a2ea75 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9507b99753ba8e72260dfe8b41d291248ecd2c5a | -- http://autobuild.buildroot.net From kuzminov.sergey81 at gmail.com Wed Jan 19 07:50:13 2022 From: kuzminov.sergey81 at gmail.com (Kuzminov Sergey) Date: Wed, 19 Jan 2022 10:50:13 +0300 Subject: [Buildroot] [PATCH v2] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <3F734133-43FB-4057-8A88-92210A9FDCB4@benettiengineering.com> References: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> <3F734133-43FB-4057-8A88-92210A9FDCB4@benettiengineering.com> Message-ID: <9d8e1077-030a-8520-d593-0d2a9c216127@gmail.com> Hi, Giulio. Thanks for the comments, I'll try to do everything right in the evening. I would like to consult about BR2_ARM_INSTRUCTIONS_THUMB2. I tested the build for Orange Zero (Allwinner H2+) using the built-in test in the 7-zip archiver and did not notice any performance differences between VFPV4, NEON_VFPV4, THUMB2. Most likely, another performance testing program is needed to unlock the potential of NEON. But I was more interested in BR2_ARM_INSTRUCTIONS_THUMB2. As it turned out, in my build, all executable files have decreased in size. For example busybox 566Kb (THUMB2) vs. 766Kb (VFPV4/NEON_VFPV4). But I do not know if there are any disadvantages of THUMB 2. Therefore, I added BR2_ARM_INSTRUCTIONS_THUMB 2 to the configuration, but commented so that people could see that this mode is possible for this processor and would make a choice whether to use it. Today I found a good article revealing the essence of what is happening: https://kmittal82.wordpress.com/2012/02/17/armthumbthumb-2/ What should I do? Leave as is, remove or enable BR2_ARM_INSTRUCTIONS_THUMB2. 19.01.2022 1:34, Giulio Benetti: > Hi Sergey, > > patch subject doesn?t say what you?re doing. > How about: > orangepi/orangepi-zero: bump Linux and U-Boot versions > > And in commit log below try to keep it more consistent. Like every change form sounds the same: > - create common scenario? > - use extlinux.conf instead of boot.scr > Etc. > >> Il giorno 18 gen 2022, alle ore 22:59, Sergey Kuzminov ha scritto: >> >> ?Changes: >> - common scenario for multiple boards to create the SD image: board/orangepi/common; >> - extlinux.conf instead of boot.scr; >> - exclude FAT partition; >> - defconfig refactoring; >> - kernel: bump to version 5.16.1; >> - u-boot: bump to version 2022.01; >> - added BR2_ARM_FPU_NEON_VFPV4; >> - added fast_commit for ext4. >> >> Patch required to work: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ >> >> Signed-off-by: Sergey Kuzminov > ?- > Here you need to add: > V1->V2: > * changed this > * changed that > So in V3 you also need to add: > V2->V3: > * changed those > * etc. >> --- >> board/orangepi/common/extlinux.conf | 5 ++ >> board/orangepi/common/genimage.cfg | 20 +++++++ >> board/orangepi/common/post-build.sh | 34 +++++++++++ >> board/orangepi/common/uboot-extras.config | 3 + >> board/orangepi/orangepi-zero/boot.cmd | 9 --- >> board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ >> configs/orangepi_zero_defconfig | 69 ++++++++++++++--------- >> 7 files changed, 104 insertions(+), 72 deletions(-) >> create mode 100644 board/orangepi/common/extlinux.conf >> create mode 100644 board/orangepi/common/genimage.cfg >> create mode 100755 board/orangepi/common/post-build.sh >> create mode 100644 board/orangepi/common/uboot-extras.config >> delete mode 100644 board/orangepi/orangepi-zero/boot.cmd >> delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg >> >> diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf >> new file mode 100644 >> index 0000000000..015f29270e >> --- /dev/null >> +++ b/board/orangepi/common/extlinux.conf >> @@ -0,0 +1,5 @@ >> +LABEL default >> + kernel /boot/%LINUXIMAGE% >> + devicetreedir /boot >> + append root=PARTUUID=%PARTUUID% rootwait console=${console} >> +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 >> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >> new file mode 100644 >> index 0000000000..8b80ffb138 >> --- /dev/null >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,20 @@ >> +image sdcard.img { >> + hdimage { >> + partition-table-type = gpt >> + gpt-no-backup = true >> + gpt-location = 1008K # 1MB - 16KB >> + } >> + >> + partition u-boot { >> + in-partition-table = false >> + image = "u-boot-sunxi-with-spl.bin" >> + offset = 8K >> + size = 1000K # 1MB - 8KB - 16KB >> + } >> + >> + partition rootfs { >> + offset = 1M >> + image = "rootfs.ext4" >> + partition-uuid = %PARTUUID% >> + } >> +} >> diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh >> new file mode 100755 >> index 0000000000..296f94b174 >> --- /dev/null >> +++ b/board/orangepi/common/post-build.sh >> @@ -0,0 +1,34 @@ >> +#!/bin/sh >> + >> +linux_image() >> +{ >> + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then >> + echo "uImage" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then >> + echo "Image" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then >> + echo "Image.gz" >> + else >> + echo "zImage" >> + fi >> +} >> + >> +generic_getty() >> +{ >> + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then >> + echo "" >> + else >> + echo "s/\s*console=\S*//" >> + fi >> +} >> + >> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >> + >> +install -d "$TARGET_DIR/boot/extlinux/" >> + >> +sed -e "$(generic_getty)" \ >> + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ >> + -e "s/%PARTUUID%/$PARTUUID/g" \ >> + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >> + >> +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >> diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config >> new file mode 100644 >> index 0000000000..5aa97523d9 >> --- /dev/null >> +++ b/board/orangepi/common/uboot-extras.config >> @@ -0,0 +1,3 @@ >> +CONFIG_BOOTDELAY=0 >> +CONFIG_USE_PREBOOT=y >> +CONFIG_PREBOOT="setenv preboot;" >> diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd >> deleted file mode 100644 >> index d094a64fe5..0000000000 >> --- a/board/orangepi/orangepi-zero/boot.cmd >> +++ /dev/null >> @@ -1,9 +0,0 @@ >> -setenv fdt_high ffffffff >> - >> -part uuid mmc 0:2 uuid >> -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait >> - >> -fatload mmc 0 $kernel_addr_r zImage >> -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb >> - >> -bootz $kernel_addr_r - $fdt_addr_r >> diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg >> deleted file mode 100644 >> index 32f5454ae6..0000000000 >> --- a/board/orangepi/orangepi-zero/genimage.cfg >> +++ /dev/null >> @@ -1,36 +0,0 @@ >> -# Minimal SD card image for the OrangePi Zero >> -# >> -image boot.vfat { >> - vfat { >> - files = { >> - "zImage", >> - "sun8i-h2-plus-orangepi-zero.dtb", >> - "boot.scr" >> - } >> - } >> - size = 10M >> -} >> - >> -image sdcard.img { >> - hdimage { >> - } >> - >> - partition u-boot { >> - in-partition-table = "no" >> - image = "u-boot-sunxi-with-spl.bin" >> - offset = 8K >> - size = 1016K # 1MB - 8KB >> - } >> - >> - partition boot { >> - partition-type = 0xC >> - bootable = "true" >> - image = "boot.vfat" >> - } >> - >> - partition rootfs { >> - partition-type = 0x83 >> - image = "rootfs.ext4" >> - size = 512M >> - } >> -} >> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >> index 1c107b10e6..d1cae2b4f3 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -1,49 +1,64 @@ >> +# Architecture >> BR2_arm=y >> BR2_cortex_a7=y >> -BR2_ARM_FPU_VFPV4=y >> +BR2_ARM_EABIHF=y >> +BR2_ARM_FPU_NEON_VFPV4=y >> +#BR2_ARM_INSTRUCTIONS_THUMB2=y > Is there a specific reason for specifying here not thumb2? So ARM? > >> + >> +# System >> +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >> -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> BR2_SYSTEM_DHCP="eth0" >> -BR2_LINUX_KERNEL=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" >> -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> -BR2_LINUX_KERNEL_DTS_SUPPORT=y >> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> -BR2_TARGET_ROOTFS_EXT2=y >> -BR2_TARGET_ROOTFS_EXT2_4=y >> -# BR2_TARGET_ROOTFS_TAR is not set >> + >> +# Bootloader >> BR2_TARGET_UBOOT=y >> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" >> -BR2_PACKAGE_HOST_DOSFSTOOLS=y >> -BR2_PACKAGE_HOST_GENIMAGE=y >> -BR2_PACKAGE_HOST_MTOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" > Here ^^^ I tend to use .fragment extension instead of .config > >> + >> +# Kernel >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > Ditto ^^^ > >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >> + >> +# Filesystem >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> +BR2_TARGET_ROOTFS_TAR=n > Here you should keep the form # BR2_TARGET_ROOTFS_TAR not set > Instead of assigning =n > > Best regards > ?- > Giulio Benetti > Benetti Engineering sas > >> + >> +# Image >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >> + >> +# Required tools to create the SD image >> +BR2_PACKAGE_HOST_GENIMAGE=y >> >> -# wireless driver and firmware >> +# Wireless driver and firmware >> BR2_PACKAGE_XR819_XRADIO=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >> >> -# wireless support >> +# Wireless support >> BR2_PACKAGE_IW=y >> BR2_PACKAGE_WIRELESS_TOOLS=y >> BR2_PACKAGE_WIRELESS_TOOLS_LIB=y >> @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y >> BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y >> BR2_PACKAGE_WPA_SUPPLICANT_CLI=y >> >> -# spi flash support >> +# Spi flash support >> BR2_PACKAGE_MTD=y >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Jan 19 07:54:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 19 Jan 2022 08:54:11 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220118222425.164134-1-fontaine.fabrice@gmail.com> References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Message-ID: <20220119085411.22ee6fb6@windsurf> Hello Fabrice, On Tue, 18 Jan 2022 23:24:24 +0100 Fabrice Fontaine wrote: > Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc > 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build > failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, > etc.): > > configure:13774: checking whether pthreads work with -pthread > configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 > conftest.c:27:26: error: #error "_REENTRANT must be defined" > 27 | # error "_REENTRANT must be defined" > | ^~~~~ > > It should be noted that external bootlins will have to be rebuilt. > > Fixes: > - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 > - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 > - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 > > Signed-off-by: Fabrice Fontaine Wow, this patch still hasn't been accepted in upstream gcc? It's been submitted a looong time ago I believe. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From shorne at gmail.com Wed Jan 19 08:13:54 2022 From: shorne at gmail.com (Stafford Horne) Date: Wed, 19 Jan 2022 17:13:54 +0900 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220119085411.22ee6fb6@windsurf> References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> <20220119085411.22ee6fb6@windsurf> Message-ID: On Wed, Jan 19, 2022 at 08:54:11AM +0100, Thomas Petazzoni wrote: > Hello Fabrice, > > On Tue, 18 Jan 2022 23:24:24 +0100 > Fabrice Fontaine wrote: > > > Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc > > 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build > > failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, > > etc.): > > > > configure:13774: checking whether pthreads work with -pthread > > configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 > > conftest.c:27:26: error: #error "_REENTRANT must be defined" > > 27 | # error "_REENTRANT must be defined" > > | ^~~~~ > > > > It should be noted that external bootlins will have to be rebuilt. > > > > Fixes: > > - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 > > - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 > > - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 > > > > Signed-off-by: Fabrice Fontaine > > Wow, this patch still hasn't been accepted in upstream gcc? It's been > submitted a looong time ago I believe. Hello, I must have missed this one. It looks good to me I will push it upstream. -Stafford From giulio.benetti at benettiengineering.com Wed Jan 19 08:14:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 09:14:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220119085411.22ee6fb6@windsurf> References: <20220119085411.22ee6fb6@windsurf> Message-ID: Hi Thomas, All, > Il giorno 19 gen 2022, alle ore 08:56, Thomas Petazzoni ha scritto: > > ?Hello Fabrice, > >> On Tue, 18 Jan 2022 23:24:24 +0100 >> Fabrice Fontaine wrote: >> >> Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc >> 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build >> failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, >> etc.): >> >> configure:13774: checking whether pthreads work with -pthread >> configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 >> conftest.c:27:26: error: #error "_REENTRANT must be defined" >> 27 | # error "_REENTRANT must be defined" >> | ^~~~~ >> >> It should be noted that external bootlins will have to be rebuilt. >> >> Fixes: >> - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 >> - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 >> - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 >> >> Signed-off-by: Fabrice Fontaine > > Wow, this patch still hasn't been accepted in upstream gcc? It's been > submitted a looong time ago I believe. That?s when the new maintainer took over the previous one. I ping him about this so he can commit it. YetAnotherOr1kBug :-) Best regards Giulio > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From giulio.benetti at benettiengineering.com Wed Jan 19 08:16:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 09:16:53 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: References: Message-ID: <1F1B4469-02B4-4D3D-A4DD-B2A76124B13C@benettiengineering.com> Hi Stafford, > Il giorno 19 gen 2022, alle ore 09:14, Stafford Horne ha scritto: > > ?On Wed, Jan 19, 2022 at 08:54:11AM +0100, Thomas Petazzoni wrote: >> Hello Fabrice, >> >>> On Tue, 18 Jan 2022 23:24:24 +0100 >>> Fabrice Fontaine wrote: >>> >>> Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc >>> 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build >>> failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, >>> etc.): >>> >>> configure:13774: checking whether pthreads work with -pthread >>> configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 >>> conftest.c:27:26: error: #error "_REENTRANT must be defined" >>> 27 | # error "_REENTRANT must be defined" >>> | ^~~~~ >>> >>> It should be noted that external bootlins will have to be rebuilt. >>> >>> Fixes: >>> - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 >>> - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 >>> - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 >>> >>> Signed-off-by: Fabrice Fontaine >> >> Wow, this patch still hasn't been accepted in upstream gcc? It's been >> submitted a looong time ago I believe. > > Hello, > > I must have missed this one. It looks good to me I will push it upstream. I?ve just written I would have pinged you soon and you?ve appeared:-) Better this way! Kind regards ?- Giulio Benetti Benetti Engineering sas > > -Stafford > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Wed Jan 19 08:45:45 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 19 Jan 2022 01:45:45 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build Message-ID: <20220119084545.3642950-1-james.hilliard1@gmail.com> The cmake build appears to be missing features such as pkg-config generation support, switch to the regular makefile based build which appears to work better. Signed-off-by: James Hilliard --- package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b562d5d7ef..144c82339f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON +define RE2_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) +endef -$(eval $(cmake-package)) -$(eval $(host-cmake-package)) +define RE2_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install +endef + +define RE2_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install +endef + +define HOST_RE2_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D) +endef + +define HOST_RE2_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) -- 2.25.1 From michael at walle.cc Wed Jan 19 09:01:25 2022 From: michael at walle.cc (Michael Walle) Date: Wed, 19 Jan 2022 10:01:25 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <966BF669-674E-4A71-82E3-FF7A2B520659@benettiengineering.com> References: <966BF669-674E-4A71-82E3-FF7A2B520659@benettiengineering.com> Message-ID: [please don't use html mails] Am 2022-01-18 21:40, schrieb Giulio Benetti: > After following the discussion in IRC between Yann and Michael I am > sure that this setting cannot be used for the aarch64/cortex-A53 CPU. > The settings BR2_ARM_CPU_HAS_FPU, BR2_ARM_CPU_HAS_VFPV2, > BR2_ARM_CPU_HAS_VFPV3, BR2_ARM_CPU_HAS_VFPV4 and > BR2_ARM_CPU_HAS_FP_ARMV8 are set implicitly. > > Yes, I was wrong and you point that fpu strategy falls back to > BR2_ARM_FPU_FP_ARMV8 and it?s ok. > But i.MX8MM supports NEON too, so I would go for setting > BR2_ARM_FPU_NEON_FP_ARMV8, > because as pointed here[1] the armv8 neon now supports IEEE 754 > floating point standard. > > BUT I?ve found that gcc[2] points that: > ??? > > If the selected floating-point hardware includes the NEON extension > (e.g. -mfpu=neon), note that floating-point operations are not > generated by GCC?s auto-vectorization pass unless > -funsafe-math-optimizations is also specified. This is because NEON > hardware does not fully implement the IEEE 754 standard for > floating-point arithmetic (in particular denormal values are treated > as zero), so the use of NEON instructions may lead to a loss of > precision. > ??? That is for aarch32 mode. aarch64 doesn't have the -mfpu switch. Instead the FPU support is either derived automatically or through modifiers of the -mcpu switch. -michael From james.hilliard1 at gmail.com Wed Jan 19 09:03:01 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 19 Jan 2022 02:03:01 -0700 Subject: [Buildroot] [PATCH 1/1] package/libxml2: add optional icu support Message-ID: <20220119090301.3649833-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/libxml2/libxml2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..023a461472 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -24,6 +24,13 @@ LIBXML2_DEPENDENCIES = host-pkgconf HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python +ifeq ($(BR2_PACKAGE_ICU),y) +LIBXML2_DEPENDENCIES += icu +LIBXML2_CONF_OPTS += --with-icu +else +LIBXML2_CONF_OPTS += --without-icu +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBXML2_DEPENDENCIES += zlib LIBXML2_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Jan 19 09:05:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 10:05:13 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <966BF669-674E-4A71-82E3-FF7A2B520659@benettiengineering.com> Message-ID: <98e95df3-0fc6-406a-bbb1-b47d99a75141@benettiengineering.com> Hi Michael, On 19/01/22 10:01, Michael Walle wrote: > [please don't use html mails] I know, sometimes I write from mobile and I can't use plain-text :-/ > Am 2022-01-18 21:40, schrieb Giulio Benetti: > >> After following the discussion in IRC between Yann and Michael I am >> sure that this setting cannot be used for the aarch64/cortex-A53 CPU. >> The settings BR2_ARM_CPU_HAS_FPU, BR2_ARM_CPU_HAS_VFPV2, >> BR2_ARM_CPU_HAS_VFPV3, BR2_ARM_CPU_HAS_VFPV4 and >> BR2_ARM_CPU_HAS_FP_ARMV8 are set implicitly. >> >> Yes, I was wrong and you point that fpu strategy falls back to >> BR2_ARM_FPU_FP_ARMV8 and it?s ok. >> But i.MX8MM supports NEON too, so I would go for setting >> BR2_ARM_FPU_NEON_FP_ARMV8, >> because as pointed here[1] the armv8 neon now supports IEEE 754 >> floating point standard. >> >> BUT I?ve found that gcc[2] points that: >> ??? >> >> If the selected floating-point hardware includes the NEON extension >> (e.g. -mfpu=neon), note that floating-point operations are not >> generated by GCC?s auto-vectorization pass unless >> -funsafe-math-optimizations is also specified. This is because NEON >> hardware does not fully implement the IEEE 754 standard for >> floating-point arithmetic (in particular denormal values are treated >> as zero), so the use of NEON instructions may lead to a loss of >> precision. >> ??? > > That is for aarch32 mode. aarch64 doesn't have the -mfpu switch. > Instead the FPU support is either derived automatically or > through modifiers of the -mcpu switch. Thank you for the explanation, indeed as talked in IRC I've found that under armv8-a there are only options for +simd or +crypto. This explains everything to me. Kind regards! -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Jan 19 09:44:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 10:44:55 +0100 Subject: [Buildroot] [PATCH v2] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <9d8e1077-030a-8520-d593-0d2a9c216127@gmail.com> References: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> <3F734133-43FB-4057-8A88-92210A9FDCB4@benettiengineering.com> <9d8e1077-030a-8520-d593-0d2a9c216127@gmail.com> Message-ID: Hi Sergey, adding Romain in Cc for Thumb2 On 19/01/22 08:50, Kuzminov Sergey wrote: > Hi, Giulio. > Thanks for the comments, I'll try to do everything right in the evening. > I would like to consult about BR2_ARM_INSTRUCTIONS_THUMB2. > > I tested the build for Orange Zero (Allwinner H2+) using the built-in > test in the 7-zip archiver and did not notice any performance > differences between VFPV4, NEON_VFPV4, THUMB2. Most likely, another > performance testing program is needed to unlock the potential of NEON. Yes, the mix of VFPV4 and NEON is rare, maybe you can appreciate it with libnss or other packages that use such optimization. Otherwise NEON doesn't get used. But anyway, if it's enabled, we have the chance for it to be used. It's there, so better use it :-) > But I was more interested in BR2_ARM_INSTRUCTIONS_THUMB2. As it turned > out, in my build, all executable files have decreased in size. For > example busybox 566Kb (THUMB2) vs. 766Kb (VFPV4/NEON_VFPV4). But I do > not know if there are any disadvantages of THUMB 2. THUMB2 yes, reduces size and it costs very few in term of performances(like 2% less), check here: https://pagefault.blog/2017/05/03/why-and-how-to-enable-arm-thumb-2-instruction-set-in-yocto/ They also state that every piece of the system should then be compiled with THUMB2, including Linux. About disadvantages, I only read sometimes that it can create some problem depending on toolchain. But here I leave the question to more experienced people than me. Maybe Romain can clarify this. > Therefore, I added > BR2_ARM_INSTRUCTIONS_THUMB 2 to the configuration, but commented so that > people could see that this mode is possible for this processor and would > make a choice whether to use it. Yes, but this is not how we want defconfigs. The option is available issuing: # make menuconfig so one can anyway enable it and give a try. So please remove that commented line. > Today I found a good article revealing the essence of what is happening: > https://kmittal82.wordpress.com/2012/02/17/armthumbthumb-2/ Yes, this article is good too. > What should I do? Leave as is, remove or enable BR2_ARM_INSTRUCTIONS_THUMB2. It can't stay there commented for sure, so if commented you need to remove it. Otherwise, like every Microchip cortex-A5 board does, you can enable it by default. But for consistency with all the other Allwinner SoCs maybe it's better to keep it disabled. Otherwise we should give a try to every Allwinner board(many) with THUMB2. It can be done, but I would think about it later. I mean, Allwinner with ARM instructions is well tested, so I would go for that. PS: please, next time answer in-line, don't top post :-) Thank you Best regards -- Giulio Benetti Benetti Engineering sas > 19.01.2022 1:34, Giulio Benetti: >> Hi Sergey, >> >> patch subject doesn?t say what you?re doing. >> How about: >> orangepi/orangepi-zero: bump Linux and U-Boot versions >> >> And in commit log below try to keep it more consistent. Like every change form sounds the same: >> - create common scenario? >> - use extlinux.conf instead of boot.scr >> Etc. >> >>> Il giorno 18 gen 2022, alle ore 22:59, Sergey Kuzminov ha scritto: >>> >>> ?Changes: >>> - common scenario for multiple boards to create the SD image: board/orangepi/common; >>> - extlinux.conf instead of boot.scr; >>> - exclude FAT partition; >>> - defconfig refactoring; >>> - kernel: bump to version 5.16.1; >>> - u-boot: bump to version 2022.01; >>> - added BR2_ARM_FPU_NEON_VFPV4; >>> - added fast_commit for ext4. >>> >>> Patch required to work: >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ >>> >>> Signed-off-by: Sergey Kuzminov >> ?- >> Here you need to add: >> V1->V2: >> * changed this >> * changed that >> So in V3 you also need to add: >> V2->V3: >> * changed those >> * etc. >>> --- >>> board/orangepi/common/extlinux.conf | 5 ++ >>> board/orangepi/common/genimage.cfg | 20 +++++++ >>> board/orangepi/common/post-build.sh | 34 +++++++++++ >>> board/orangepi/common/uboot-extras.config | 3 + >>> board/orangepi/orangepi-zero/boot.cmd | 9 --- >>> board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ >>> configs/orangepi_zero_defconfig | 69 ++++++++++++++--------- >>> 7 files changed, 104 insertions(+), 72 deletions(-) >>> create mode 100644 board/orangepi/common/extlinux.conf >>> create mode 100644 board/orangepi/common/genimage.cfg >>> create mode 100755 board/orangepi/common/post-build.sh >>> create mode 100644 board/orangepi/common/uboot-extras.config >>> delete mode 100644 board/orangepi/orangepi-zero/boot.cmd >>> delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg >>> >>> diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf >>> new file mode 100644 >>> index 0000000000..015f29270e >>> --- /dev/null >>> +++ b/board/orangepi/common/extlinux.conf >>> @@ -0,0 +1,5 @@ >>> +LABEL default >>> + kernel /boot/%LINUXIMAGE% >>> + devicetreedir /boot >>> + append root=PARTUUID=%PARTUUID% rootwait console=${console} >>> +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 >>> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >>> new file mode 100644 >>> index 0000000000..8b80ffb138 >>> --- /dev/null >>> +++ b/board/orangepi/common/genimage.cfg >>> @@ -0,0 +1,20 @@ >>> +image sdcard.img { >>> + hdimage { >>> + partition-table-type = gpt >>> + gpt-no-backup = true >>> + gpt-location = 1008K # 1MB - 16KB >>> + } >>> + >>> + partition u-boot { >>> + in-partition-table = false >>> + image = "u-boot-sunxi-with-spl.bin" >>> + offset = 8K >>> + size = 1000K # 1MB - 8KB - 16KB >>> + } >>> + >>> + partition rootfs { >>> + offset = 1M >>> + image = "rootfs.ext4" >>> + partition-uuid = %PARTUUID% >>> + } >>> +} >>> diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh >>> new file mode 100755 >>> index 0000000000..296f94b174 >>> --- /dev/null >>> +++ b/board/orangepi/common/post-build.sh >>> @@ -0,0 +1,34 @@ >>> +#!/bin/sh >>> + >>> +linux_image() >>> +{ >>> + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then >>> + echo "uImage" >>> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then >>> + echo "Image" >>> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then >>> + echo "Image.gz" >>> + else >>> + echo "zImage" >>> + fi >>> +} >>> + >>> +generic_getty() >>> +{ >>> + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then >>> + echo "" >>> + else >>> + echo "s/\s*console=\S*//" >>> + fi >>> +} >>> + >>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >>> + >>> +install -d "$TARGET_DIR/boot/extlinux/" >>> + >>> +sed -e "$(generic_getty)" \ >>> + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ >>> + -e "s/%PARTUUID%/$PARTUUID/g" \ >>> + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >>> + >>> +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >>> diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config >>> new file mode 100644 >>> index 0000000000..5aa97523d9 >>> --- /dev/null >>> +++ b/board/orangepi/common/uboot-extras.config >>> @@ -0,0 +1,3 @@ >>> +CONFIG_BOOTDELAY=0 >>> +CONFIG_USE_PREBOOT=y >>> +CONFIG_PREBOOT="setenv preboot;" >>> diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd >>> deleted file mode 100644 >>> index d094a64fe5..0000000000 >>> --- a/board/orangepi/orangepi-zero/boot.cmd >>> +++ /dev/null >>> @@ -1,9 +0,0 @@ >>> -setenv fdt_high ffffffff >>> - >>> -part uuid mmc 0:2 uuid >>> -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait >>> - >>> -fatload mmc 0 $kernel_addr_r zImage >>> -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb >>> - >>> -bootz $kernel_addr_r - $fdt_addr_r >>> diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg >>> deleted file mode 100644 >>> index 32f5454ae6..0000000000 >>> --- a/board/orangepi/orangepi-zero/genimage.cfg >>> +++ /dev/null >>> @@ -1,36 +0,0 @@ >>> -# Minimal SD card image for the OrangePi Zero >>> -# >>> -image boot.vfat { >>> - vfat { >>> - files = { >>> - "zImage", >>> - "sun8i-h2-plus-orangepi-zero.dtb", >>> - "boot.scr" >>> - } >>> - } >>> - size = 10M >>> -} >>> - >>> -image sdcard.img { >>> - hdimage { >>> - } >>> - >>> - partition u-boot { >>> - in-partition-table = "no" >>> - image = "u-boot-sunxi-with-spl.bin" >>> - offset = 8K >>> - size = 1016K # 1MB - 8KB >>> - } >>> - >>> - partition boot { >>> - partition-type = 0xC >>> - bootable = "true" >>> - image = "boot.vfat" >>> - } >>> - >>> - partition rootfs { >>> - partition-type = 0x83 >>> - image = "rootfs.ext4" >>> - size = 512M >>> - } >>> -} >>> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >>> index 1c107b10e6..d1cae2b4f3 100644 >>> --- a/configs/orangepi_zero_defconfig >>> +++ b/configs/orangepi_zero_defconfig >>> @@ -1,49 +1,64 @@ >>> +# Architecture >>> BR2_arm=y >>> BR2_cortex_a7=y >>> -BR2_ARM_FPU_VFPV4=y >>> +BR2_ARM_EABIHF=y >>> +BR2_ARM_FPU_NEON_VFPV4=y >>> +#BR2_ARM_INSTRUCTIONS_THUMB2=y >> Is there a specific reason for specifying here not thumb2? So ARM? >> >>> + >>> +# System >>> +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >>> +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >>> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >>> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >>> -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >>> -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >>> BR2_SYSTEM_DHCP="eth0" >>> -BR2_LINUX_KERNEL=y >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" >>> -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >>> -BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >>> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >>> -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>> -BR2_TARGET_ROOTFS_EXT2=y >>> -BR2_TARGET_ROOTFS_EXT2_4=y >>> -# BR2_TARGET_ROOTFS_TAR is not set >>> + >>> +# Bootloader >>> BR2_TARGET_UBOOT=y >>> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>> BR2_TARGET_UBOOT_CUSTOM_VERSION=y >>> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >>> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" >>> BR2_TARGET_UBOOT_NEEDS_DTC=y >>> BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>> BR2_TARGET_UBOOT_SPL=y >>> BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" >>> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >>> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y >>> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" >>> -BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> -BR2_PACKAGE_HOST_GENIMAGE=y >>> -BR2_PACKAGE_HOST_MTOOLS=y >>> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >>> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" >> Here ^^^ I tend to use .fragment extension instead of .config >> >>> + >>> +# Kernel >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >>> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> Ditto ^^^ >> >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >>> + >>> +# Filesystem >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >>> +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" >>> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >>> +BR2_TARGET_ROOTFS_TAR=n >> Here you should keep the form # BR2_TARGET_ROOTFS_TAR not set >> Instead of assigning =n >> >> Best regards >> ?- >> Giulio Benetti >> Benetti Engineering sas >> >>> + >>> +# Image >>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >>> -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" >>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >>> + >>> +# Required tools to create the SD image >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> >>> -# wireless driver and firmware >>> +# Wireless driver and firmware >>> BR2_PACKAGE_XR819_XRADIO=y >>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >>> >>> -# wireless support >>> +# Wireless support >>> BR2_PACKAGE_IW=y >>> BR2_PACKAGE_WIRELESS_TOOLS=y >>> BR2_PACKAGE_WIRELESS_TOOLS_LIB=y >>> @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y >>> BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y >>> BR2_PACKAGE_WPA_SUPPLICANT_CLI=y >>> >>> -# spi flash support >>> +# Spi flash support >>> BR2_PACKAGE_MTD=y >>> -- >>> 2.34.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From tom.marcuzzi at orolia.com Wed Jan 19 14:07:03 2022 From: tom.marcuzzi at orolia.com (Tom Marcuzzi) Date: Wed, 19 Jan 2022 15:07:03 +0100 Subject: [Buildroot] [PATCH 1/1] packages/nodejs: install npm packages on host Message-ID: <20220119140703.12978-1-tom.marcuzzi@orolia.com> Signed-off-by: Tom Marcuzzi --- package/nodejs/Config.in.host | 32 ++++++++++++++++++++++++++++++++ package/nodejs/nodejs.mk | 31 +++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 4ceaf0c73e..601eb6e052 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -16,3 +16,35 @@ config BR2_PACKAGE_HOST_NODEJS comment "host nodejs needs a host gcc >= 8" depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS depends on !BR2_HOST_GCC_AT_LEAST_8 + +if BR2_PACKAGE_HOST_NODEJS + + config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL + string "Additional modules" + help + List of space-separated nodejs modules to install via npm. + See https://npmjs.org/ to find modules and 'npm help install' + for available installation methods. For repeatable builds, + download and save tgz files or clone git repos for the + components you care about. + + Example: + serialport uglify-js at 1.3.4 /my/module/mymodule.tgz \ + git://github.com/someuser/somemodule.git#v1.2 + + This would install the serialport module (at the newest + version), the uglify-js module at 1.3.4, a module from a + filesystem path, and a module from a git repository. + + config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS + string "Additional module dependencies" + help + List of space-separated buildroot recipes which must be + built before your npms can be installed. For example, if in + 'Additional modules' you specified 'node-curl' (see: + https://github.com/jiangmiao/node-curl), you could then + specify 'libcurl' here, to ensure that buildroot builds the + libcurl package, and does so before building your node + modules. + +endif diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 727af6dc50..a342d1c90f 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -96,6 +96,35 @@ NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 +# +# Build the list of modules to install on host. +# +HOST_NODEJS_MODULES_LIST= $(call qstrip,\ + $(BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL)) + +# Define NPM for other packages to use +HOST_NPM = $(HOST_CONFIGURE_OPTS) \ + LDFLAGS="$(HOST_LDFLAGS)" \ + LD="$(HOST_CXX)" \ + npm_config_arch=$(NODEJS_CPU) \ + npm_config_target_arch=$(NODEJS_CPU) \ + npm_config_build_from_source=true \ + npm_config_nodedir=$(HOST_DIR)/nodejs-$(NODEJS_VERSION) \ + npm_config_prefix=$(HOST_DIR)/usr \ + npm_config_cache=$(HOST_DIR)/.npm-cache \ + $(HOST_DIR)/bin/npm +# +# We can only call NPM if there's something to install. +# +ifneq ($(HOST_NODEJS_MODULES_LIST),) +define HOST_NODEJS_INSTALL_MODULES + # If you're having trouble with module installation, adding -d to the + # npm install call below and setting npm_config_rollback=false can both + # help in diagnosing the problem. + $(HOST_NPM) install -g $(HOST_NODEJS_MODULES_LIST) +endef +endif + define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) \ @@ -110,6 +139,8 @@ define HOST_NODEJS_INSTALL_CMDS $(foreach f,$(NODEJS_HOST_TOOLS), \ $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f) ) + + $(HOST_NODEJS_INSTALL_MODULES) endef ifeq ($(BR2_i386),y) -- 2.25.1 From arved at arved.at Wed Jan 19 15:57:39 2022 From: arved at arved.at (Tilman =?utf-8?B?S2Vza2luw7Z6?=) Date: Wed, 19 Jan 2022 16:57:39 +0100 Subject: [Buildroot] [PATCH 1/1] Dependency on liburiparser was removed Message-ID: <20220119155739.c5kzupm5njobmkn6@arved.priv.at> From: Tilman Keskin?z Dependency was removed from Makefile in 593683b45f72169dd94ec14fa18720b3cec9dda4 Signed-off-by: Tilman Keskin?z --- package/tpm2-tss/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2fc56dbd76..857987ae36 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help -- 2.32.0 From giulio.benetti at benettiengineering.com Wed Jan 19 18:23:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 19:23:44 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <573cda00-7353-2bfd-dbb3-732cd23c5ae4@kontron.de> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> <573cda00-7353-2bfd-dbb3-732cd23c5ae4@kontron.de> Message-ID: Hi Frieder, Heiko, On 19/01/22 16:38, Frieder Schrempf wrote: > Am 14.01.22 um 22:54 schrieb Heiko Thiery: >> Hi Giulio, >> >> Am Fr., 14. Jan. 2022 um 22:37 Uhr schrieb Giulio Benetti >> : >>> >>> Hi Heiko, >>> >>>> Il giorno 14 gen 2022, alle ore 22:17, Heiko Thiery ha scritto: >>>> >>>> ?The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. >>>> >>>> https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.kontron.com%2Fprodukte%2Fbaseboard-bl-i.mx8m-mini%2Fp158549&data=04%7C01%7Cfrieder.schrempf%40kontron.de%7Cd7a266bb1dac478d7c4108d9d7a8795f%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637777940856116418%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=0wA9otr%2FwIIm37TL3VoW3lj8Ef%2Fcr2L5Dtyr0rqbK%2BI%3D&reserved=0 >>>> >>>> Cc: Frieder Schrempf >>>> Signed-off-by: Heiko Thiery >>>> --- >>>> v2: >>>> - switch to extlinux >>>> - directly call genimage.sh >>>> - remove post-image.sh >>>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT >>>> - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME >>>> >>>> >>>> DEVELOPERS | 2 + >>>> board/kontron/bl-imx8mm/extlinux.conf | 4 + >>>> board/kontron/bl-imx8mm/genimage.cfg | 18 ++ >>>> ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ >>>> ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ >>>> board/kontron/bl-imx8mm/post-build.sh | 7 + >>>> board/kontron/bl-imx8mm/readme.txt | 85 +++++ >>>> configs/kontron_bl_imx8mm_defconfig | 59 ++++ >>>> 8 files changed, 505 insertions(+) >>>> create mode 100644 board/kontron/bl-imx8mm/extlinux.conf >>>> create mode 100644 board/kontron/bl-imx8mm/genimage.cfg >>>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch >>>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch >>>> create mode 100755 board/kontron/bl-imx8mm/post-build.sh >>>> create mode 100644 board/kontron/bl-imx8mm/readme.txt >>>> create mode 100644 configs/kontron_bl_imx8mm_defconfig >>>> >>>> diff --git a/DEVELOPERS b/DEVELOPERS >>>> index c0bfde69da..93c5760489 100644 >>>> --- a/DEVELOPERS >>>> +++ b/DEVELOPERS >>>> @@ -1179,7 +1179,9 @@ F: package/python-sip/ >>>> F: package/uhd/ >>>> >>>> N: Heiko Thiery >>>> +F: board/kontron/bl-imx8mm/ >>>> F: board/kontron/pitx-imx8m/ >>>> +F: configs/kontron_bl_imx8mm_defconfig >>>> F: configs/kontron_pitx_imx8m_defconfig >>>> F: package/altera-stapl/ >>>> F: package/ipmitool/ >>>> diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf >>>> new file mode 100644 >>>> index 0000000000..d38f7f81b7 >>>> --- /dev/null >>>> +++ b/board/kontron/bl-imx8mm/extlinux.conf >>>> @@ -0,0 +1,4 @@ >>>> +label buildroot >>>> + kernel /boot/Image >>>> + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb >>>> + append root=PARTUUID=%PARTUUID% rootwait rw >>>> diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg >>>> new file mode 100644 >>>> index 0000000000..6c0ef69591 >>>> --- /dev/null >>>> +++ b/board/kontron/bl-imx8mm/genimage.cfg >>>> @@ -0,0 +1,18 @@ >>>> +image sdcard.img { >>>> + hdimage { >>>> + partition-table-type = "gpt" >>>> + gpt-location = 16K >>>> + } >>>> + >>>> + partition imx-boot { >>>> + in-partition-table = "no" >>>> + image = "flash.bin" >>>> + offset = 33k >>> >>> I?ve missed V1 patch, here ^^^ please use capitol K letter. >>> I still have to write the linter for genimage.cfg files :-/ >> >> Indeed .. missed that. I will wait for some more comments and do a v3 >> with that fixed later. >> >> [snip] >> >>>> ++&i2c1 { >>>> ++ u-boot,dm-spl; >>>> ++ u-boot,dm-pre-reloc; >>>> ++}; >>>> ++ >>>> ++&i2c2 { >>>> ++ status = "okay"; >>>> ++ u-boot,dm-spl; >>>> ++ u-boot,dm-pre-reloc; >>>> ++}; >>> >>> I don?t know the hardware of the board and it?s a bit off-topic, >>> but do you really need 2 i2c channels before relocating uboot? >> >> Good catch. >> >> @Frieder: can you say something to that? > > Hm, the I2C buses are used in SPL for configuring the PMIC and detecting > the display, so the "u-boot,dm-spl" is correct. I'm not really sure at > what time U-Boot proper probes the devices and if "u-boot,dm-pre-reloc" > is needed or not. > CONFIG_SPL_DM_PMIC_PCA9450 and CONFIG_DM_PMIC_PCA9450 are both enabled and you add uboot,dm-spl and uboot,dm-pre-reloc. What I expect is that PMIC is initialized in SPL and in u-boot pre-reloc. So I think that for i2c1 node uboot,dm-pre-reloc is useless but you need to keep uboot,dm-spl. Same goes for i2c2 if you use it with ush(uboot shell) since you have CONFIG_CMD_I2C enabled. Most of all, i2c2, if it's only used with CMD_I2C you can remove both uboot,dm-spl and uboot,dm-pre-reloc because the CMD_I2C will be available only after u-boot is relocated, for example when ush console is sent out. Of course this deserves a test. Do you have any kind of jtag-debugger to check this? Or can you enable uboot log debugging? That way you will be sure of what is going on. Anyway you could check if PMIC changed its default voltages to what you've programmed and you can also check if i2c2 is probed with i2c ush command. Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Tue Jan 18 17:27:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 18 Jan 2022 18:27:46 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: set --with-boost Message-ID: <20220119201624.83CAB8351F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ae840ba193a90f4cb950526646b831294477454 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set --with-boost to avoid the following build failure when a non working boost version is installed on host. This failure is raised since the addition of the package in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure:5559: error: Could not find a version of the Boost::Asio library! Fixes: - http://autobuild.buildroot.org/results/855b66b86d979cc922b947da932b0e2388481263 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/riscv-isa-sim/riscv-isa-sim.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index ee9067d304..90eed93c36 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -9,5 +9,6 @@ RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc +HOST_RISCV_ISA_SIM_CONF_OPTS = --with-boost=$(HOST_DIR) $(eval $(host-autotools-package)) From yann.morin.1998 at free.fr Wed Jan 19 20:23:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 21:23:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> Message-ID: <20220119202351.GA3095239@scaer> Fabrice, All, On 2022-01-15 17:04 +0100, Fabrice Fontaine spake thusly: > Set --with-boost to avoid the following build failure when a non working > boost version is installed on host. This failure is raised since the > addition of the package in commit > ea033cecf990ed3f86619647523a9ad2ccb09adb: > > configure:5559: error: Could not find a version of the Boost::Asio library! > > Fixes: > - http://autobuild.buildroot.org/results/855b66b86d979cc922b947da932b0e2388481263 > > Signed-off-by: Fabrice Fontaine > --- > package/riscv-isa-sim/riscv-isa-sim.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk > index ee9067d304..90eed93c36 100644 > --- a/package/riscv-isa-sim/riscv-isa-sim.mk > +++ b/package/riscv-isa-sim/riscv-isa-sim.mk > @@ -9,5 +9,6 @@ RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA > RISCV_ISA_SIM_LICENSE = BSD-3-Clause > RISCV_ISA_SIM_LICENSE_FILES = LICENSE > HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc > +HOST_RISCV_ISA_SIM_CONF_OPTS = --with-boost=$(HOST_DIR) To be noted: riscv-isa-sim could also be configured with --without-boost and the build succeeds. Anyway: applied to master, thanks. Julien, do you know what ill-effect building without Boost would have? Regards, Yann E. MORIN. > $(eval $(host-autotools-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 20:28:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 21:28:02 +0100 Subject: [Buildroot] [git commit] paclage/tpm2-tss: do not select liburiparser Message-ID: <20220119202333.5A504832B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbb70493af20445fbd24de4c5a15ba0de7f27c6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 593683b45f72 (package/tpm2-tss: remove unused dependency) removed the build-time dependency (in the .mk), but forgot to remove it from the Config.in. Signed-off-by: Tilman Keskin??z [yann.morin.1998 at free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- package/tpm2-tss/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2fc56dbd76..857987ae36 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help From yann.morin.1998 at free.fr Wed Jan 19 20:33:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 21:33:33 +0100 Subject: [Buildroot] [PATCH 1/1] Dependency on liburiparser was removed In-Reply-To: <20220119155739.c5kzupm5njobmkn6@arved.priv.at> References: <20220119155739.c5kzupm5njobmkn6@arved.priv.at> Message-ID: <20220119203333.GB3095239@scaer> Tilman, All, On 2022-01-19 16:57 +0100, Tilman Keskin?z spake thusly: > From: Tilman Keskin?z > > Dependency was removed from Makefile in > 593683b45f72169dd94ec14fa18720b3cec9dda4 The commit title should mention the impacted package, and mention an action in the infinitive tense, like so: package/tpm2-tss: do not select liburiparser The commit log was mostly OK, if a bit confusing, so I reworded it with: Commit 593683b45f72 (package/tpm2-tss: remove unused dependency) removed the build-time dependency (in the .mk), but forgot to remove it from the Config.in. Applied to master with those changes (and for good measure, a typo of mine that I noticed too late, sorry). Thanks! Regards, Yann E. MORIN. > Signed-off-by: Tilman Keskin?z > --- > package/tpm2-tss/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in > index 2fc56dbd76..857987ae36 100644 > --- a/package/tpm2-tss/Config.in > +++ b/package/tpm2-tss/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_TPM2_TSS > bool "tpm2-tss" > depends on !BR2_STATIC_LIBS # dlfcn.h > - select BR2_PACKAGE_LIBURIPARSER > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL > help > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 20:45:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 21:45:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220119084545.3642950-1-james.hilliard1@gmail.com> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> Message-ID: <20220119204518.GC3095239@scaer> James, All, On 2022-01-19 01:45 -0700, James Hilliard spake thusly: > The cmake build appears to be missing features such as pkg-config > generation support, switch to the regular makefile based build > which appears to work better. Can't we just fix the CMakeList.txt and submit a patch upstream, instead? Also, see below... > Signed-off-by: James Hilliard > --- > package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- > 1 file changed, 26 insertions(+), 4 deletions(-) > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > index b562d5d7ef..144c82339f 100644 > --- a/package/re2/re2.mk > +++ b/package/re2/re2.mk > @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause > RE2_LICENSE_FILES = LICENSE > RE2_INSTALL_STAGING = YES > > -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > +define RE2_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + -C $(@D) > +endef > > -$(eval $(cmake-package)) > -$(eval $(host-cmake-package)) > +define RE2_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install > +endef > + > +define RE2_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install The 'install' target will forcibly build and install static and shared libs: https://github.com/google/re2/blob/main/Makefile#L297 296: .PHONY: install 297: install: static-install shared-install So, this is probably going to not play nicely for builds where a shared build is not possible. AFAICS, the cmake-based buildsystem got that one correct, though, so it would be a bit of a shame to regress on that point... Regards, Yann E. MORIN. > +endef > + > +define HOST_RE2_BUILD_CMDS > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > + -C $(@D) > +endef > + > +define HOST_RE2_INSTALL_CMDS > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install > +endef > + > +$(eval $(generic-package)) > +$(eval $(host-generic-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Wed Jan 19 20:54:05 2022 From: romain.naour at gmail.com (Romain Naour) Date: Wed, 19 Jan 2022 21:54:05 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-7-patrickdepinguin@gmail.com> <13491b39-7995-1aa7-a2cb-5af43467bb95@gmail.com> Message-ID: <4b9211c6-6858-37a2-ec04-e677178780da@gmail.com> Hi Thomas, Le 18/01/2022 ? 13:02, Thomas De Schampheleire a ?crit?: > Hi Romain, > > El mar, 18 ene 2022 a las 12:51, Romain Naour > () escribi?: >> >> Hello Thomas, >> >> Le 18/01/2022 ? 12:19, Thomas De Schampheleire a ?crit : >>> Hi, >>> >>> El s?b, 15 ene 2022 a las 21:03, Thomas De Schampheleire >>> () escribi?: >>>> >>>> From: Thomas De Schampheleire >>>> >>>> Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel >>>> but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. >>>> >>>> Signed-off-by: Thomas De Schampheleire >>>> --- >>>> >>>> Note that the defconfig refers to a toolchain at >>>> autobuild.buildroot.org, but is not yet present at that location. >>>> I uploaded the toolchain temporarily to: >>>> http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz >>>> md5sum:b085c0d8f137c078f8f09d116d8364f8 >>>> sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 >>>> >>>> >>> >>> Romain Naour notified me that this toolchain does not run on the GCC >>> Farm (Illegal instruction) so I made a new version, currently uploaded >>> at: >>> http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11-2.tar.xz >>> md5sum: 3cee64f82675446ad255f6c165786eb5 >>> sha256sum: 6715bfbc195588b6483d39e9ec6d70611cac3b99bf2dd34fedbed0d4e6c7edc1 >> >> This toolchain doesn't work either. >> >> Did you tried with CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" ? >> With CT_EXTRA_CXXFLAGS_FOR_BUILD maybe or both. > > So you get the same error of 'Illegal instruction' ? > > Following config was used (both the config as the build log are part > of the archive): > > CT_CONFIG_VERSION="3" > # CT_PREFIX_DIR_RO is not set > CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" > CT_EXTRA_CXXFLAGS_FOR_BUILD="-march=x86-64" > CT_ARCH_X86=y > CT_MULTILIB=y > CT_ARCH_64=y > CT_STATIC_TOOLCHAIN=y I didn't enabled static toolchain option. Can you try without it. Notes: All Bootlin toolchain use glibc installed on the host, so we can't use really old systems. > CT_TARGET_VENDOR="multilib" > CT_KERNEL_LINUX=y > CT_GLIBC_KERNEL_VERSION_NONE=y > # CT_CREATE_LDSO_CONF is not set > CT_CC_GCC_MULTILIB_LIST="m64,m32" > CT_CC_GCC_LNK_HASH_STYLE_BOTH=y > CT_CC_LANG_CXX=y > CT_DEBUG_GDB=y > CT_ZLIB_NEEDED=y > > > >> >> Also, building with a Debian jessie docker container would allow to run the >> toolchain with old Glibc. > > The toolchain is built statically, so the glibc version on the host > does not matter. > Perhaps I misunderstand the problem you are referring to? I missed that your toolchain was build statically. Usually other prebuilt toolchain are not built statically. Best regards, Romain > > Thanks, > Thomas > From yann.morin.1998 at free.fr Wed Jan 19 21:25:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:25:35 +0100 Subject: [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220119212535.GD3095239@scaer> Peter, All, On 2022-01-18 22:14 +0100, Peter Seiderer spake thusly: > Now based on 5.10.92 (from 5.10.78). > > Signed-off-by: Peter Seiderer Series of 6 patches applied to master, thanks. I'll further reply to patch 6 with details specific to it... Regards, Yann E. MORIN. > --- > configs/raspberrypi0_defconfig | 2 +- > configs/raspberrypi0w_defconfig | 2 +- > configs/raspberrypi2_defconfig | 2 +- > configs/raspberrypi3_64_defconfig | 2 +- > configs/raspberrypi3_defconfig | 2 +- > configs/raspberrypi3_qt5we_defconfig | 2 +- > configs/raspberrypi4_64_defconfig | 2 +- > configs/raspberrypi4_defconfig | 2 +- > configs/raspberrypi_defconfig | 2 +- > configs/raspberrypicm4io_64_defconfig | 2 +- > configs/raspberrypicm4io_defconfig | 2 +- > configs/raspberrypizero2w_defconfig | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig > index 64f7a93377..4506e94bce 100644 > --- a/configs/raspberrypi0_defconfig > +++ b/configs/raspberrypi0_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > > # Build the DTBs for A/B from the kernel sources: the zero is the same > diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig > index f3e7c453ab..7a35794c2d 100644 > --- a/configs/raspberrypi0w_defconfig > +++ b/configs/raspberrypi0w_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" > diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig > index 7befbf07e6..9b484c5588 100644 > --- a/configs/raspberrypi2_defconfig > +++ b/configs/raspberrypi2_defconfig > @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig > index ebb6e2252b..4d838ae0e8 100644 > --- a/configs/raspberrypi3_64_defconfig > +++ b/configs/raspberrypi3_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig > index 6a9c4e0d02..0a59ab42a9 100644 > --- a/configs/raspberrypi3_defconfig > +++ b/configs/raspberrypi3_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig > index 7d06b0bb5e..40d0c0f888 100644 > --- a/configs/raspberrypi3_qt5we_defconfig > +++ b/configs/raspberrypi3_qt5we_defconfig > @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > index 2b5446d8f1..5942f7c4e1 100644 > --- a/configs/raspberrypi4_64_defconfig > +++ b/configs/raspberrypi4_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > index ac555ddd5e..4e5580c140 100644 > --- a/configs/raspberrypi4_defconfig > +++ b/configs/raspberrypi4_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig > index 257e59536e..cca53f9b37 100644 > --- a/configs/raspberrypi_defconfig > +++ b/configs/raspberrypi_defconfig > @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > > # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources > diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig > index 1ab379c557..29cb0472d7 100644 > --- a/configs/raspberrypicm4io_64_defconfig > +++ b/configs/raspberrypicm4io_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig > index 9941754e25..017aecc0dd 100644 > --- a/configs/raspberrypicm4io_defconfig > +++ b/configs/raspberrypicm4io_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig > index ddd6b97b06..2ea503ca24 100644 > --- a/configs/raspberrypizero2w_defconfig > +++ b/configs/raspberrypizero2w_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:28:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:28:19 +0100 Subject: [Buildroot] [PATCH v1 6/6] package/brcmfmac_sdio-firmware-rpi: new package (former rpi-bt-firmware/rpi-wifi-firmware) In-Reply-To: <20220118211434.9854-6-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> <20220118211434.9854-6-ps.report@gmx.net> Message-ID: <20220119212819.GE3095239@scaer> Peter, All, On 2022-01-18 22:14 +0100, Peter Seiderer spake thusly: > Move rpi-bt-firmware and rpi-wifi-firmware packages to the new > brcmfmac_sdio-firmware-rpi one (as they share the same donwload). $ make check-package Config.in.legacy:157: line contains trailing whitespace Config.in.legacy:166: line contains trailing whitespace package/Config.in:423: Packages in: menu "Firmware", are not alphabetically ordered; correct order: '-', '_', digits, capitals, lowercase; first incorrect package: b43-firmware package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:12: consecutive empty lines package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:15: expected indent with tabs package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:16: expected indent with tabs I've fixed that. > Signed-off-by: Peter Seiderer > --- > Notes: > - patch moved after the rpi-bt-firmware/rpi-wifi-firmware version bump > as it saves some code/download duplication but the new package/name > is harder to find/remember... Yet, the new package name is the upstream package name, which I believe is better to follow. [--SNIP--] > diff --git a/Config.in.legacy b/Config.in.legacy > index dd64b7da1b..465d7bef90 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,24 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_RPI_BT_FIRMWARE > + bool "rpi-bt-firmware package was renamed" The original symbols did depend on arm || aarch64, so I kept that dependency for both legacy symbols. Applied to master, thanks. Regards, Yann E. MORIN. > + select BR2_LEGACY > + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI > + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT > + help > + Package rpi-bt-firmware was moved as option to > + package brcmfmac-sdio-firmware-rpi. > + > +config BR2_PACKAGE_RPI_WIFI_FIRMWARE > + bool "rpi-wifi-firmware package was renamed" > + select BR2_LEGACY > + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI > + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI > + help > + Package rpi-wifi-firmware was moved as option to > + package brcmfmac-sdio-firmware-rpi. > + > config BR2_PACKAGE_HOST_GDB_PYTHON > bool "GDB Python2 support removed" > select BR2_LEGACY > diff --git a/DEVELOPERS b/DEVELOPERS > index a91e2dfcde..dc810b6fe1 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1832,12 +1832,11 @@ F: configs/qemu_riscv64_virt_defconfig > N: Martin Bark > F: board/raspberrypi/ > F: configs/raspberrypi3_defconfig > +F: package/brcmfmac_sdio-firmware-rpi/ > F: package/ca-certificates/ > F: package/connman/ > F: package/nodejs/ > -F: package/rpi-bt-firmware/ > F: package/rpi-firmware/ > -F: package/rpi-wifi-firmware/ > F: package/tzdata/ > F: package/zic/ > > diff --git a/package/Config.in b/package/Config.in > index 4df1474b91..3b38af7232 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -419,15 +419,14 @@ menu "Hardware handling" > menu "Firmware" > source "package/am33x-cm3/Config.in" > source "package/armbian-firmware/Config.in" > + source "package/brcmfmac_sdio-firmware-rpi/Config.in" > source "package/b43-firmware/Config.in" > source "package/linux-firmware/Config.in" > source "package/murata-cyw-fw/Config.in" > source "package/odroidc2-firmware/Config.in" > source "package/qcom-db410c-firmware/Config.in" > source "package/rcw-smarc-sal28/Config.in" > - source "package/rpi-bt-firmware/Config.in" > source "package/rpi-firmware/Config.in" > - source "package/rpi-wifi-firmware/Config.in" > source "package/sunxi-boards/Config.in" > source "package/ts4900-fpga/Config.in" > source "package/ux500-firmware/Config.in" > diff --git a/package/brcmfmac_sdio-firmware-rpi/Config.in b/package/brcmfmac_sdio-firmware-rpi/Config.in > new file mode 100644 > index 0000000000..73f400a2b7 > --- /dev/null > +++ b/package/brcmfmac_sdio-firmware-rpi/Config.in > @@ -0,0 +1,29 @@ > +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI > + bool "brcmfmac-sdio-firmware-rpi" > + depends on BR2_arm || BR2_aarch64 > + help > + Raspberry Broadcom Bluetooth and Wifi firmware. > + > + https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi > + > +if BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI > + > +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT > + bool "brcmfmac-sdio-firmware-rpi-bt" > + help > + Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module > + firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 > + Bluetooth module firmware. > + > +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI > + bool "brcmfmac-sdio-firmware-rpi-wifi" > + depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > + help > + Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module > + NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 > + wifi module NVRAM data. > + > +comment "brcmfmac-sdio-firmware-rpi-wifi conflicts with linux-firmware Broadcom BRCM bcm43xx" > + depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > + > +endif > diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash > similarity index 68% > rename from package/rpi-wifi-firmware/rpi-wifi-firmware.hash > rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash > index 7ff47b8cfe..a12e92cbac 100644 > --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash > +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz > +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz > sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx > diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk > similarity index 61% > rename from package/rpi-wifi-firmware/rpi-wifi-firmware.mk > rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk > index b54cd359a4..4d1f285442 100644 > --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk > +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk > @@ -1,15 +1,24 @@ > ################################################################################ > # > -# rpi-wifi-firmware > +# brcmfmac_sdio-firmware-rpi > # > ################################################################################ > > -RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d > -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) > -RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY > -RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx > +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d > +BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) > +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY > +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx > > -define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS > + > +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) > +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT > + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm > + $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm > +endef > +endif > + > +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) > +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI > $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm > $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm > ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin > @@ -24,5 +33,11 @@ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS > $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress > $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress > endef > +endif > + > +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS > + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT) > + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI) > +endef > > $(eval $(generic-package)) > diff --git a/package/rpi-bt-firmware/Config.in b/package/rpi-bt-firmware/Config.in > deleted file mode 100644 > index 45643d6a52..0000000000 > --- a/package/rpi-bt-firmware/Config.in > +++ /dev/null > @@ -1,9 +0,0 @@ > -config BR2_PACKAGE_RPI_BT_FIRMWARE > - bool "rpi-bt-firmware" > - depends on BR2_arm || BR2_aarch64 > - help > - Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module > - firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 > - Bluetooth module firmware. > - > - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi > diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash > deleted file mode 100644 > index a575a02e97..0000000000 > --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash > +++ /dev/null > @@ -1,3 +0,0 @@ > -# Locally computed > -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz > -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx > diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk > deleted file mode 100644 > index f2d54f33bf..0000000000 > --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk > +++ /dev/null > @@ -1,17 +0,0 @@ > -################################################################################ > -# > -# rpi-bt-firmware > -# > -################################################################################ > - > -RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d > -RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) > -RPI_BT_FIRMWARE_LICENSE = PROPRIETARY > -RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx > - > -define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS > - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm > - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm > -endef > - > -$(eval $(generic-package)) > diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in > deleted file mode 100644 > index 7e81b286c0..0000000000 > --- a/package/rpi-wifi-firmware/Config.in > +++ /dev/null > @@ -1,13 +0,0 @@ > -config BR2_PACKAGE_RPI_WIFI_FIRMWARE > - bool "rpi-wifi-firmware" > - depends on BR2_arm || BR2_aarch64 > - depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > - help > - Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module > - NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 > - wifi module NVRAM data. > - > - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi > - > -comment "rpi-wifi-firmware conflicts with linux-firmware Broadcom BRCM bcm43xx" > - depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:12:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:12:06 +0100 Subject: [Buildroot] [git commit] package/rpi-bt-firmware: bump version to ea9963f Message-ID: <20220119212206.04AB981763@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=520b760a5320b1995ffd70f607a18964b3c0c2b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Chanelog (since 3888ba2): - Sync with RPi-Distro repo Switch to "bullseye" branch which moved several firmware files to the cypress dir. Add 43438 firmware 7.45.98.118 + external clm_blob Add 43455 firmware 7.45.241 and clm_blob - README.md: update link to RPi-distro repo wifi firmware files - Merge pull request #19 from HiassofT/2021-12 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash index 7e60aa4632..a575a02e97 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-bt-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 8d658ce435..f2d54f33bf 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef +RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx From yann.morin.1998 at free.fr Wed Jan 19 21:12:04 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:12:04 +0100 Subject: [Buildroot] [git commit] package/rpi-userland: bump version to 14b90ff Message-ID: <20220119212205.EFB84835A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a71f9f8276d0d74a25760dfd7937dcb9cb212f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: f5404b2 raspicam: Check system is running legacy camera stack 14b90ff mmal: Hack to make mmal core register VideoCore components Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-userland/rpi-userland.hash | 2 +- package/rpi-userland/rpi-userland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 8ea184a4f6..b837cfe709 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 16c01befff64ebc11a0554e487b00939ed7a716f68dc795db4880b35bb25fa41 rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz +sha256 bb682f3c20bc5c7877531d5666c8dcc674a2f347aa792cf979dc0b07b6261e77 rpi-userland-14b90ff9d9f031391a299e6e006965d02bfd1bb1.tar.gz sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 09a7f6af74..84050b6df3 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = bab9bf8790cd69660d443ce43b4e372999f3f7ac +RPI_USERLAND_VERSION = 14b90ff9d9f031391a299e6e006965d02bfd1bb1 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE From yann.morin.1998 at free.fr Wed Jan 19 21:12:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:12:10 +0100 Subject: [Buildroot] [git commit] package/rpi-wifi-firmware bump version to ea9963f Message-ID: <20220119212206.0C7E78359D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ccb5f9dbe34cdbc54fdf658f5612fbce4bf0f94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add cypress files - update links Chanelog (since 3888ba2): - Sync with RPi-Distro repo Switch to "bullseye" branch which moved several firmware files to the cypress dir. Add 43438 firmware 7.45.98.118 + external clm_blob Add 43455 firmware 7.45.241 and clm_blob Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index 09cd197dd8..7ff47b8cfe 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-wifi-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index a467f2c7b4..b54cd359a4 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef +RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx @@ -12,9 +12,17 @@ RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin + ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob + ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt + ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt + ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin + ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress endef $(eval $(generic-package)) From yann.morin.1998 at free.fr Wed Jan 19 21:11:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:11:58 +0100 Subject: [Buildroot] [git commit] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Message-ID: <20220119212205.DC9FE81763@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a8a6dc41c0571c3cd466ade890b4ed1209ca0e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now based on 5.10.92 (from 5.10.78). Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- configs/raspberrypicm4io_64_defconfig | 2 +- configs/raspberrypicm4io_defconfig | 2 +- configs/raspberrypizero2w_defconfig | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 64f7a93377..4506e94bce 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index f3e7c453ab..7a35794c2d 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 7befbf07e6..9b484c5588 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index ebb6e2252b..4d838ae0e8 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 6a9c4e0d02..0a59ab42a9 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 7d06b0bb5e..40d0c0f888 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 2b5446d8f1..5942f7c4e1 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index ac555ddd5e..4e5580c140 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 257e59536e..cca53f9b37 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 1ab379c557..29cb0472d7 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 9941754e25..017aecc0dd 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index ddd6b97b06..2ea503ca24 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources From yann.morin.1998 at free.fr Wed Jan 19 21:12:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:12:00 +0100 Subject: [Buildroot] [git commit] package/rpi-firmware: bump version to 3f20b83 Message-ID: <20220119212205.E58CE8359D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9958744a0cddfd01e8359ab560e04e9a8cdd5578 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: 095deea759 kernel: overlays: vc4-kms-v3d: Change composite handling 2e9b609e53c kernel: Bump to 5.10.79 12bc6e36773 firmware: dtoverlay: Rebase aliases in overlays like labels 24d966d35bb kernel: Bump to 5.10.81 ca52e7c1303 kernel: edt-ft5x06 touchscreen fixes 1a0297bfbf7 kernel: Bump to 5.10.82 0a1a871d04c kernel: Fix for IN Token of USB Endpoint 1 stopping occasionally on Pi 4 303d0012cd7 kernel: Bump to 5.10.83 bd8b6d5dc8e kernel: Bump to 5.10.85 56f1b8bbc88 kernel: Bump to 5.10.87 536baf33ae9 kernel: Bump to 5.10.88 ce71e3e9b34 kernel: Bump to 5.10.89 19b570d0d6a firmware: arm-loader: Fix kernel8.img selection on 2837 with arm_64bit=1 fbbde90b709 kernel: drm/vc4: fix non-working audio on RPi3 and no video with DVI 165bd7bc562 firmware: improve firmware camera detection 318e3373496 kernel: Bump to 5.10.90 175984a6dc4 kernel: drm/vc4: Add alpha_blend_mode property to each plane 20c5829b0af kernel: Bump to 5.10.92 3f20b832b27 firmware: arm_loader: Only clip min/max to the same value for turbo clocks Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- 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 7cbfd1b249..ec13115f3b 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a079a31fc80a23421589edcacef94faa713b12d3e77b92710ae2594c8d549477 rpi-firmware-fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25.tar.gz +sha256 33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index f773f83999..b46a7f5270 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25 +RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From yann.morin.1998 at free.fr Wed Jan 19 21:24:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:24:11 +0100 Subject: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware Message-ID: <20220119212206.1ACA681763@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7527324132878f98999539bdd97bd3518747f585 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Move rpi-bt-firmware and rpi-wifi-firmware packages to the new brcmfmac_sdio-firmware-rpi one (as they are the same upstream package). Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: - fix check-package - legacy symbols still depend on arm || aarch64 ] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 20 +++++++++++++++ DEVELOPERS | 3 +-- package/Config.in | 3 +-- package/brcmfmac_sdio-firmware-rpi/Config.in | 29 ++++++++++++++++++++++ .../brcmfmac_sdio-firmware-rpi.hash} | 2 +- .../brcmfmac_sdio-firmware-rpi.mk} | 26 ++++++++++++++----- package/rpi-bt-firmware/Config.in | 9 ------- package/rpi-bt-firmware/rpi-bt-firmware.hash | 3 --- package/rpi-bt-firmware/rpi-bt-firmware.mk | 17 ------------- package/rpi-wifi-firmware/Config.in | 13 ---------- 10 files changed, 72 insertions(+), 53 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index dd64b7da1b..c11cb846fb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,26 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_RPI_BT_FIRMWARE + bool "rpi-bt-firmware package was renamed" + depends on BR2_arm || BR2_aarch64 + select BR2_LEGACY + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT + help + Package rpi-bt-firmware was moved as option to + package brcmfmac-sdio-firmware-rpi. + +config BR2_PACKAGE_RPI_WIFI_FIRMWARE + bool "rpi-wifi-firmware package was renamed" + depends on BR2_arm || BR2_aarch64 + select BR2_LEGACY + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI + help + Package rpi-wifi-firmware was moved as option to + package brcmfmac-sdio-firmware-rpi. + config BR2_PACKAGE_HOST_GDB_PYTHON bool "GDB Python2 support removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..dc810b6fe1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1832,12 +1832,11 @@ F: configs/qemu_riscv64_virt_defconfig N: Martin Bark F: board/raspberrypi/ F: configs/raspberrypi3_defconfig +F: package/brcmfmac_sdio-firmware-rpi/ F: package/ca-certificates/ F: package/connman/ F: package/nodejs/ -F: package/rpi-bt-firmware/ F: package/rpi-firmware/ -F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ diff --git a/package/Config.in b/package/Config.in index 4df1474b91..85188ff873 100644 --- a/package/Config.in +++ b/package/Config.in @@ -420,14 +420,13 @@ menu "Firmware" source "package/am33x-cm3/Config.in" source "package/armbian-firmware/Config.in" source "package/b43-firmware/Config.in" + source "package/brcmfmac_sdio-firmware-rpi/Config.in" source "package/linux-firmware/Config.in" source "package/murata-cyw-fw/Config.in" source "package/odroidc2-firmware/Config.in" source "package/qcom-db410c-firmware/Config.in" source "package/rcw-smarc-sal28/Config.in" - source "package/rpi-bt-firmware/Config.in" source "package/rpi-firmware/Config.in" - source "package/rpi-wifi-firmware/Config.in" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" diff --git a/package/brcmfmac_sdio-firmware-rpi/Config.in b/package/brcmfmac_sdio-firmware-rpi/Config.in new file mode 100644 index 0000000000..73f400a2b7 --- /dev/null +++ b/package/brcmfmac_sdio-firmware-rpi/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + bool "brcmfmac-sdio-firmware-rpi" + depends on BR2_arm || BR2_aarch64 + help + Raspberry Broadcom Bluetooth and Wifi firmware. + + https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi + +if BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT + bool "brcmfmac-sdio-firmware-rpi-bt" + help + Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module + firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 + Bluetooth module firmware. + +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI + bool "brcmfmac-sdio-firmware-rpi-wifi" + depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX + help + Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module + NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 + wifi module NVRAM data. + +comment "brcmfmac-sdio-firmware-rpi-wifi conflicts with linux-firmware Broadcom BRCM bcm43xx" + depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX + +endif diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash similarity index 68% rename from package/rpi-wifi-firmware/rpi-wifi-firmware.hash rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index 7ff47b8cfe..a12e92cbac 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk similarity index 62% rename from package/rpi-wifi-firmware/rpi-wifi-firmware.mk rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index b54cd359a4..5332bf53d7 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -1,15 +1,23 @@ ################################################################################ # -# rpi-wifi-firmware +# brcmfmac_sdio-firmware-rpi # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) -RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY -RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx -define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm +endef +endif + +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin @@ -24,5 +32,11 @@ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress endef +endif + +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT) + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI) +endef $(eval $(generic-package)) diff --git a/package/rpi-bt-firmware/Config.in b/package/rpi-bt-firmware/Config.in deleted file mode 100644 index 45643d6a52..0000000000 --- a/package/rpi-bt-firmware/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_RPI_BT_FIRMWARE - bool "rpi-bt-firmware" - depends on BR2_arm || BR2_aarch64 - help - Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module - firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 - Bluetooth module firmware. - - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash deleted file mode 100644 index a575a02e97..0000000000 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk deleted file mode 100644 index f2d54f33bf..0000000000 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# rpi-bt-firmware -# -################################################################################ - -RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d -RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) -RPI_BT_FIRMWARE_LICENSE = PROPRIETARY -RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx - -define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm -endef - -$(eval $(generic-package)) diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in deleted file mode 100644 index 7e81b286c0..0000000000 --- a/package/rpi-wifi-firmware/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_RPI_WIFI_FIRMWARE - bool "rpi-wifi-firmware" - depends on BR2_arm || BR2_aarch64 - depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX - help - Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module - NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 - wifi module NVRAM data. - - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi - -comment "rpi-wifi-firmware conflicts with linux-firmware Broadcom BRCM bcm43xx" - depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX From yann.morin.1998 at free.fr Wed Jan 19 21:34:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:34:35 +0100 Subject: [Buildroot] [git commit] package/efl: change download URL to https Message-ID: <20220119213205.91B398359C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3d5b27d5d24079d6c30c568c58e3a5e7c6e3fc7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: canonicalise homepage] Signed-off-by: Yann E. MORIN --- package/efl/Config.in | 2 +- package/efl/efl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 05ded72cf7..eb9c7aebd9 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_EFL help Enlightenment Foundation Libraries - https://enlightenment.org + https://www.enlightenment.org/ if BR2_PACKAGE_EFL diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 46bce29305..ed0a8acc1d 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -6,7 +6,7 @@ EFL_VERSION = 1.26.0 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl +EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ From yann.morin.1998 at free.fr Wed Jan 19 21:34:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:34:43 +0100 Subject: [Buildroot] [git commit] package/enlightenment: change download URL to https Message-ID: <20220119213205.9A7FF835AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6297befe176a2f33b8c598139f73d7e0b9f91c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: also change in Config.in] Signed-off-by: Yann E. MORIN --- package/enlightenment/Config.in | 2 +- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index cd2b8cfe54..cdf4d9211f 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_ENLIGHTENMENT KDE. Enlightenment can be used as a substitute for a full desktop environment. - http://www.enlightenment.org/ + https://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.9" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 640d5a62bb..24bbd96cd0 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -6,7 +6,7 @@ ENLIGHTENMENT_VERSION = 0.25.0 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt From yann.morin.1998 at free.fr Wed Jan 19 21:39:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:39:36 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/efl: change download URL to https In-Reply-To: <20220118201709.25366-1-ps.report@gmx.net> References: <20220118201709.25366-1-ps.report@gmx.net> Message-ID: <20220119213936.GF3095239@scaer> Peter, All, On 2022-01-18 21:17 +0100, Peter Seiderer spake thusly: > Signed-off-by: Peter Seiderer > --- > package/efl/efl.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/efl/efl.mk b/package/efl/efl.mk > index 46bce29305..ed0a8acc1d 100644 > --- a/package/efl/efl.mk > +++ b/package/efl/efl.mk > @@ -6,7 +6,7 @@ > > EFL_VERSION = 1.26.0 > EFL_SOURCE = efl-$(EFL_VERSION).tar.xz > -EFL_SITE = http://download.enlightenment.org/rel/libs/efl > +EFL_SITE = https://download.enlightenment.org/rel/libs/efl I also made the home page canonical in Config.in (see my reply to next patch to see hos I noticed). Applied to master, thanks. Regards, Yann E. MORIN. > EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT > EFL_LICENSE_FILES = \ > COMPLIANCE \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:40:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:40:27 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/enlightenment: change download URL to https In-Reply-To: <20220118201709.25366-2-ps.report@gmx.net> References: <20220118201709.25366-1-ps.report@gmx.net> <20220118201709.25366-2-ps.report@gmx.net> Message-ID: <20220119214027.GG3095239@scaer> Peter, All. On 2022-01-18 21:17 +0100, Peter Seiderer spake thusly: > Signed-off-by: Peter Seiderer > --- > package/enlightenment/enlightenment.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk > index 640d5a62bb..24bbd96cd0 100644 > --- a/package/enlightenment/enlightenment.mk > +++ b/package/enlightenment/enlightenment.mk > @@ -6,7 +6,7 @@ > > ENLIGHTENMENT_VERSION = 0.25.0 > ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz > -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment > +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment I also switched the homepage in Config.in to https, and that's how I noticed that the EFL homepage was not canonical. Applied to master, thanks. Regards, Yann E. MORIN. > ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) > ENLIGHTENMENT_LICENSE_FILES = COPYING \ > src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:45:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:45:22 +0100 Subject: [Buildroot] [git commit] package/strace: bump version to 5.16 Message-ID: <20220119213919.BF8788351F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6775e3e47689088589e0a2448b4033a1bd2853e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - update license file hash for COPYING (copyright year update) Changelog (from [1]): Noteworthy changes in strace 5.16 (2022-01-10) ============================================== * Improvements * Implemented --secontext=mismatch option to find mismatches in SELinux contexts. * Implemented decoding of futex_waitv syscall introduced in Linux 5.16. * Implemented decoding of BPF_LINK_GET_NEXT_ID and BPF_LINK_GET_FD_BY_ID bpf syscall commands. * Enhanced decoding of BPF_MAP_CREATE, BPF_PROG_TEST_RUN, and BPF_PROG_LOAD bpf syscall commands. * Enhanced decoding of BTRFS_IOC_FS_INFO ioctl command. * Updated lists of AUDIT_*, BPF_*, BTRFS_*, DEVCONF_*, FAN_*, ETH_P_*, IPV4_DEVCONF_*, KVM_*, NDA_*, SO_*, and V4L2_* constants. * Updated lists of ioctl commands from Linux 5.16. * Bug fixes * Fixed build for older Android. [1] https://strace.io/files/5.16/ Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index ff89447bfd..30c90e8e39 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.15/strace-5.15.tar.xz.asc -sha256 ebcac22f297335294dc654425cbc3ce013343bece6da2699e3aec86aee8d72dc strace-5.15.tar.xz -sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING +# https://strace.io/files/5.16/strace-5.16.tar.xz.asc +sha256 dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285 strace-5.16.tar.xz +sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 4b70531aa7..c8c3590f6e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.15 +STRACE_VERSION = 5.16 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Jan 19 21:46:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:46:21 +0100 Subject: [Buildroot] [PATCH v1] package/strace: bump version to 5.16 In-Reply-To: <20220118161853.27777-1-ps.report@gmx.net> References: <20220118161853.27777-1-ps.report@gmx.net> Message-ID: <20220119214621.GH3095239@scaer> Peter, All, On 2022-01-18 17:18 +0100, Peter Seiderer spake thusly: > - update license file hash for COPYING (copyright year update) > > Changelog (from [1]): > > Noteworthy changes in strace 5.16 (2022-01-10) > ============================================== > > * Improvements > * Implemented --secontext=mismatch option to find mismatches in SELinux > contexts. > * Implemented decoding of futex_waitv syscall introduced in Linux 5.16. > * Implemented decoding of BPF_LINK_GET_NEXT_ID and BPF_LINK_GET_FD_BY_ID bpf > syscall commands. > * Enhanced decoding of BPF_MAP_CREATE, BPF_PROG_TEST_RUN, and BPF_PROG_LOAD > bpf syscall commands. > * Enhanced decoding of BTRFS_IOC_FS_INFO ioctl command. > * Updated lists of AUDIT_*, BPF_*, BTRFS_*, DEVCONF_*, FAN_*, ETH_P_*, > IPV4_DEVCONF_*, KVM_*, NDA_*, SO_*, and V4L2_* constants. > * Updated lists of ioctl commands from Linux 5.16. > > * Bug fixes > * Fixed build for older Android. > > [1] https://strace.io/files/5.16/ > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/strace/strace.hash | 6 +++--- > package/strace/strace.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/strace/strace.hash b/package/strace/strace.hash > index ff89447bfd..30c90e8e39 100644 > --- a/package/strace/strace.hash > +++ b/package/strace/strace.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 > -# https://strace.io/files/5.15/strace-5.15.tar.xz.asc > -sha256 ebcac22f297335294dc654425cbc3ce013343bece6da2699e3aec86aee8d72dc strace-5.15.tar.xz > -sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING > +# https://strace.io/files/5.16/strace-5.16.tar.xz.asc > +sha256 dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285 strace-5.16.tar.xz > +sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING > sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later > diff --git a/package/strace/strace.mk b/package/strace/strace.mk > index 4b70531aa7..c8c3590f6e 100644 > --- a/package/strace/strace.mk > +++ b/package/strace/strace.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -STRACE_VERSION = 5.15 > +STRACE_VERSION = 5.16 > STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz > STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) > STRACE_LICENSE = LGPL-2.1+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:46:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:46:49 +0100 Subject: [Buildroot] [git commit] package/gnuplot: bump version to 5.4.3 Message-ID: <20220119214115.A86F48351F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a4300e8261f352f9e4af5e569fd55ad944843f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Fischer Signed-off-by: Yann E. MORIN --- package/gnuplot/gnuplot.hash | 6 +++--- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index fc166205d0..1cc14973d1 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/ -md5 2050ca477199a591543bc968aba7d899 gnuplot-5.4.2.tar.gz -sha1 2e076b29f38bfcb841cb5eb3377fd1a469ced1ac gnuplot-5.4.2.tar.gz +md5 9bb03cfa77e38924e08ffbb9eb59d8b1 gnuplot-5.4.3.tar.gz +sha1 c4b60fd7a700b22fa62b14829cbb0e17911627c9 gnuplot-5.4.3.tar.gz # Locally computed -sha256 e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba gnuplot-5.4.2.tar.gz +sha256 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 gnuplot-5.4.3.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 436d3e5f92..6cf36a0997 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.2 +GNUPLOT_VERSION = 5.4.3 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From yann.morin.1998 at free.fr Wed Jan 19 21:48:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:48:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuplot: bump version to 5.4.3 In-Reply-To: <20220118081331.30088-1-mf@go-sys.de> References: <20220118081331.30088-1-mf@go-sys.de> Message-ID: <20220119214814.GI3095239@scaer> Michael, All, On 2022-01-18 09:13 +0100, Michael Fischer spake thusly: > Signed-off-by: Michael Fischer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gnuplot/gnuplot.hash | 6 +++--- > package/gnuplot/gnuplot.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash > index fc166205d0..1cc14973d1 100644 > --- a/package/gnuplot/gnuplot.hash > +++ b/package/gnuplot/gnuplot.hash > @@ -1,6 +1,6 @@ > # From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/ > -md5 2050ca477199a591543bc968aba7d899 gnuplot-5.4.2.tar.gz > -sha1 2e076b29f38bfcb841cb5eb3377fd1a469ced1ac gnuplot-5.4.2.tar.gz > +md5 9bb03cfa77e38924e08ffbb9eb59d8b1 gnuplot-5.4.3.tar.gz > +sha1 c4b60fd7a700b22fa62b14829cbb0e17911627c9 gnuplot-5.4.3.tar.gz > # Locally computed > -sha256 e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba gnuplot-5.4.2.tar.gz > +sha256 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 gnuplot-5.4.3.tar.gz > sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright > diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk > index 436d3e5f92..6cf36a0997 100644 > --- a/package/gnuplot/gnuplot.mk > +++ b/package/gnuplot/gnuplot.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GNUPLOT_VERSION = 5.4.2 > +GNUPLOT_VERSION = 5.4.3 > GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) > GNUPLOT_LICENSE = gnuplot license (open source) > GNUPLOT_LICENSE_FILES = Copyright > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:53:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:53:51 +0100 Subject: [Buildroot] [PATCH] configs/cubieboard2: U-Boot needs Python3 & OpenSSL In-Reply-To: <20220117192017.8841-1-abrodkin@synopsys.com> References: <20220117192017.8841-1-abrodkin@synopsys.com> Message-ID: <20220119215351.GA3252931@scaer> Alexey, All, On 2022-01-17 22:20 +0300, Alexey Brodkin via buildroot spake thusly: > After update of the U-Boot [1] we were missing dependency on Python3, > and so were seeing failures like in [2]: > ------------------------->8-------------------- > HOSTLD scripts/dtc/dtc > scripts/dtc/pylibfdt/libfdt_wrap.c:154:11: fatal error: Python.h: No such file or directory > 154 | # include > | ^~~~~~~~~~ > compilation terminated. > error: command '/usr/bin/gcc' failed with exit code 1 > ------------------------->8-------------------- > > So that get fixed with "BR2_TARGET_UBOOT_NEEDS_PYTHON3=y". > And then once we use Python3, we also need OpenSSL, similarly to [3] > and the likes. So do it with "BR2_TARGET_UBOOT_NEEDS_OPENSSL=y". > > Hopefully now all starts to build w/o any issues. > > And while at it let's add a bit more structure to the config! > > [1] https://git.buildroot.net/buildroot/commit/?id=06f10a88f30b73aaea5c0e0888d7ba9d9a6420f3 > [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650570 > [3] https://git.buildroot.net/buildroot/commit/?id=cf2a7663ccc6089e98e0d6ec39fa8623749c0c24 > > Signed-off-by: Alexey Brodkin Applied to master, thanks. > --- > > P.S. I didn't see that problem on the U-Boot bump, as I built all > locally and quite obviously had Python3 and all the headers installed > in the system. Yeah, happens to each and all of us. ;-) Regards, Yann E. MORIN. > --- > configs/cubieboard2_defconfig | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig > index a9356295c1..18337fac72 100644 > --- a/configs/cubieboard2_defconfig > +++ b/configs/cubieboard2_defconfig > @@ -1,32 +1,42 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > + > # Linux headers same as kernel, a 5.15 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" > -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" > -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" > + > +# Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" > BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > BR2_PACKAGE_HOST_UBOOT_TOOLS=y > BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" > + > +# System > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:50:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:50:41 +0100 Subject: [Buildroot] [git commit] configs/cubieboard2: U-Boot needs Python3 & OpenSSL Message-ID: <20220119214719.4DE0582235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=507b1b9770142f9dba418653b1285a65252de705 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master After update of the U-Boot [1] we were missing dependency on Python3, and so were seeing failures like in [2]: ------------------------->8-------------------- HOSTLD scripts/dtc/dtc scripts/dtc/pylibfdt/libfdt_wrap.c:154:11: fatal error: Python.h: No such file or directory 154 | # include | ^~~~~~~~~~ compilation terminated. error: command '/usr/bin/gcc' failed with exit code 1 ------------------------->8-------------------- So that get fixed with "BR2_TARGET_UBOOT_NEEDS_PYTHON3=y". And then once we use Python3, we also need OpenSSL, similarly to [3] and the likes. So do it with "BR2_TARGET_UBOOT_NEEDS_OPENSSL=y". Hopefully now all starts to build w/o any issues. And while at it let's add a bit more structure to the config! [1] https://git.buildroot.net/buildroot/commit/?id=06f10a88f30b73aaea5c0e0888d7ba9d9a6420f3 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650570 [3] https://git.buildroot.net/buildroot/commit/?id=cf2a7663ccc6089e98e0d6ec39fa8623749c0c24 Signed-off-by: Alexey Brodkin Signed-off-by: Yann E. MORIN --- configs/cubieboard2_defconfig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index a9356295c1..18337fac72 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,32 +1,42 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y + # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From giulio.benetti at benettiengineering.com Wed Jan 19 22:23:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 23:23:32 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> Message-ID: <20220119222332.66485-1-giulio.benetti@benettiengineering.com> From: Maxime Chevallier Some rules in the refpolicy are declared with "dontaudit", effectively suppressing any AVC violation log, while still denying the actions. This is useful in some cases, where denied actions are to be expected but won't prevent the system from operating. However in some other cases, the suppressed logs are important to troubleshoot some issues. Disabling the "dontaudit" rules can be done either from the running system by rebuilding the policy with "semodules -DB", or when initialy building the policy by using the "enableaudit" make target. This commit allows building the refpolicy with the "enableaudit" target prior to installing it, thanks to a dedicated config option. Signed-off-by: Maxime Chevallier Signed-off-by: Giulio Benetti [Giulio: moved REFPOLICY_POST_BUILD_HOOKS inside ifeq/endef] --- Maxime: V1->V2: * Use POST_BUILD_HOOKS to summon make enableaudit, as per Antoine Tenart and Thomas petazzoni's reviews Giulio: V2->V3: * moved REFPOLICY_POST_BUILD_HOOKS into ifeq/endef as suggested by Antoine Tenart NOTE: this patch superseeds V2: https://patchwork.ozlabs.org/project/buildroot/patch/20210128125256.1419587-1-maxime.chevallier at bootlin.com/ --- package/refpolicy/Config.in | 14 ++++++++++++++ package/refpolicy/refpolicy.mk | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df..caba147feb 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -113,6 +113,20 @@ config BR2_REFPOLICY_EXTRA_MODULES endif +config BR2_REFPOLICY_DISABLE_DONTAUDIT + bool "Disable dontaudit" + help + Builds the refpolicy with the "dontaudit" rules disabled. + This will trigger unseen, and probably unharmful audit logs that are + explicitely silenced otherwise. This option can be helpful for + debugging purposes, should a silenced message cause a real issue + that would otherwise be hard to troubleshoot. + + This option should be used for debugging purposes only, due to + the amount of avc logs it generates. + + If unsure, select n. + endif comment "refpolicy needs a toolchain w/ threads, gcc >= 5, host gcc >= 5" diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 44c50af278..e113c3496e 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -118,6 +118,13 @@ define REFPOLICY_BUILD_CMDS $(REFPOLICY_MAKE) -C $(@D) policy endef +ifeq ($(BR2_REFPOLICY_DISABLE_DONTAUDIT),y) +define REFPOLICY_DISABLE_DONTAUDIT_CMDS + $(REFPOLICY_MAKE) -C $(@D) enableaudit +endef +REFPOLICY_POST_BUILD_HOOKS += REFPOLICY_DISABLE_DONTAUDIT_CMDS +endif + define REFPOLICY_INSTALL_STAGING_CMDS $(REFPOLICY_MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \ install-src install-headers -- 2.25.1 From paguilar at paguilar.org Wed Jan 19 22:32:08 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Wed, 19 Jan 2022 23:32:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/libunistring: bump version to 1.0 Message-ID: <20220119223208.1196891-1-paguilar@paguilar.org> - Update indentation in hash file (two spaces) Signed-off-by: Pedro Aguilar --- package/libunistring/libunistring.hash | 6 +++--- package/libunistring/libunistring.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index 2e4595b17d..145c8c3e54 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz.sig -sha256 eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7 libunistring-0.9.10.tar.xz +sha256 5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741 libunistring-1.0.tar.xz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 1ed7ecf906..a69eacd676 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNISTRING_VERSION = 0.9.10 +LIBUNISTRING_VERSION = 1.0 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Jan 19 22:39:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 19 Jan 2022 23:39:44 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20220119222332.66485-1-giulio.benetti@benettiengineering.com> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> Message-ID: <20220119233944.7ba2d09f@windsurf> On Wed, 19 Jan 2022 23:23:32 +0100 Giulio Benetti wrote: > +config BR2_REFPOLICY_DISABLE_DONTAUDIT > + bool "Disable dontaudit" I am still extremely confused by the name of option, with its double negative. When enabled, this option will disable something that doesn't audit. Meh. Is it possible to find a better name / description that doesn't make one's brain segfault when trying to understand what it does ? The make target that gets triggered is "enableaudit". Would it make sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? It would be nice to get the feedback from Antoine and/or Maxime on this. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From mail at dbrgn.ch Wed Jan 19 23:03:30 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Thu, 20 Jan 2022 00:03:30 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/pcengines_apu2_defconfig: bump kernel to 5.16 In-Reply-To: <44c15385-c790-6867-fc1f-b24c922b7e40@benettiengineering.com> References: <20220116211557.71866ff6@c3po> <44c15385-c790-6867-fc1f-b24c922b7e40@benettiengineering.com> Message-ID: <20220120000330.29552850@c3po> This fixes the compile errors that were present with the previous kernel version (4.19): https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 Additionally, the defconfig file was refactored: Configuration values are now grouped logically, thus increasing readability and maintainability. Signed-off-by: Danilo Bargen --- Changes v1 -> v2: - improved commit message Signed-off-by: Danilo Bargen --- configs/pcengines_apu2_defconfig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 68cebb8f6a..eb30f6aee7 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -1,16 +1,26 @@ +# Architecture BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_HOSTNAME="apu2" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_SYSTEM_DHCP="eth0" + +# Kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" + +# Default hostname and TTY +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Networking +BR2_SYSTEM_DHCP="eth0" + +# Rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" BR2_TARGET_ROOTFS_ISO9660_HYBRID=y -# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_SYSLINUX=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Jan 19 23:56:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 20 Jan 2022 00:56:44 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20220119233944.7ba2d09f@windsurf> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> Message-ID: <58f6a9d8-70e2-308e-d756-e1ec0b18d042@benettiengineering.com> On 19/01/22 23:39, Thomas Petazzoni wrote: > On Wed, 19 Jan 2022 23:23:32 +0100 > Giulio Benetti wrote: > >> +config BR2_REFPOLICY_DISABLE_DONTAUDIT >> + bool "Disable dontaudit" > > I am still extremely confused by the name of option, with its double > negative. > > When enabled, this option will disable something that doesn't audit. > Meh. > > Is it possible to find a better name / description that doesn't make > one's brain segfault when trying to understand what it does ? > > The make target that gets triggered is "enableaudit". Would it make > sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? I didn't check well the make argument..... Sorry. I agree with Thomas on changing the option variable to BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT and name to: "Enable audit" And I would change the help section from: ``` Builds the refpolicy with the "dontaudit" rules disabled. This will trigger unseen, and ... ``` to: ``` Remove all dontaudit rules from policy.conf. This will trigger unseen, and ... ``` as reported in refpolicy README: https://github.com/SELinuxProject/refpolicy/blob/master/README#L78 > It would be nice to get the feedback from Antoine and/or Maxime on this. Following this since I'm not used to this package. Best regards -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Thu Jan 20 00:38:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 19 Jan 2022 17:38:27 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/re2: switch to generic-package make build Message-ID: <20220120003827.395469-1-james.hilliard1@gmail.com> The cmake build appears to be missing features such as pkg-config generation support, switch to the regular makefile based build which appears to work better. Signed-off-by: James Hilliard --- Changes v1 -> v2: - don't built shared libraries if BR2_STATIC_LIBS is set --- package/re2/re2.mk | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b562d5d7ef..2863fcb662 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,8 +10,32 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON +define RE2_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) $(if $(BR2_STATIC_LIBS),static) +endef -$(eval $(cmake-package)) -$(eval $(host-cmake-package)) +define RE2_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ + $(if $(BR2_STATIC_LIBS),static-install,install) +endef + +define RE2_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \ + $(if $(BR2_STATIC_LIBS),static-install,install) +endef + +define HOST_RE2_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D) +endef + +define HOST_RE2_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 20 00:42:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 19 Jan 2022 17:42:46 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220119204518.GC3095239@scaer> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> Message-ID: On Wed, Jan 19, 2022 at 1:45 PM Yann E. MORIN wrote: > > James, All, > > On 2022-01-19 01:45 -0700, James Hilliard spake thusly: > > The cmake build appears to be missing features such as pkg-config > > generation support, switch to the regular makefile based build > > which appears to work better. > > Can't we just fix the CMakeList.txt and submit a patch upstream, > instead? It looked like this had been brought up before and there was some issue that was making this difficult to fix with cmake. See: https://github.com/google/re2/issues/349 > > Also, see below... > > > Signed-off-by: James Hilliard > > --- > > package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- > > 1 file changed, 26 insertions(+), 4 deletions(-) > > > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > > index b562d5d7ef..144c82339f 100644 > > --- a/package/re2/re2.mk > > +++ b/package/re2/re2.mk > > @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause > > RE2_LICENSE_FILES = LICENSE > > RE2_INSTALL_STAGING = YES > > > > -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > +define RE2_BUILD_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > + -C $(@D) > > +endef > > > > -$(eval $(cmake-package)) > > -$(eval $(host-cmake-package)) > > +define RE2_INSTALL_STAGING_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install > > +endef > > + > > +define RE2_INSTALL_TARGET_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install > > The 'install' target will forcibly build and install static and shared > libs: > > https://github.com/google/re2/blob/main/Makefile#L297 > > 296: .PHONY: install > 297: install: static-install shared-install > > So, this is probably going to not play nicely for builds where a shared > build is not possible. Sent a v2 which should fix this: https://patchwork.ozlabs.org/project/buildroot/patch/20220120003827.395469-1-james.hilliard1 at gmail.com/ > > AFAICS, the cmake-based buildsystem got that one correct, though, so it > would be a bit of a shame to regress on that point... > > Regards, > Yann E. MORIN. > > > +endef > > + > > +define HOST_RE2_BUILD_CMDS > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > + -C $(@D) > > +endef > > + > > +define HOST_RE2_INSTALL_CMDS > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install > > +endef > > + > > +$(eval $(generic-package)) > > +$(eval $(host-generic-package)) > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Thu Jan 20 07:06:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 20 Jan 2022 07:06:28 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-19 Message-ID: <20220120070633.38EB640385@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-19 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 65 | 6 | 0 | 71 | 2021.11.x | 18 | 1 | 0 | 19 | master | 91 | 50 | 0 | 141 | Classification of failures by reason for master ----------------------------------------------- host-riscv-isa-sim-1.1.0 | 10 frr-8.1 | 6 rygel-0.40.2 | 6 guile-3.0.7 | 3 unknown | 3 rtorrent-0.9.8 | 2 tesseract-ocr-5.0.1 | 2 bat-0.18.3 | 1 bluez5_utils-5.63 | 1 cryptsetup-2.4.2 | 1 gensio-2.2.9 | 1 google-breakpad-7515ab13768... | 1 gvfs-1.48.1 | 1 host-go-1.17.6 | 1 ksmbd-tools-3.4.3 | 1 libglvnd-1.3.2 | 1 libupnp-1.14.12 | 1 mesa3d-21.3.3 | 1 mongodb-4.2.11 | 1 mono-6.12.0.90 | 1 nodejs-14.18.3 | 1 resiprocate-1.12.0 | 1 ruby-3.1.0 | 1 tpm2-pkcs11-1.7.0 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/e87521dd795b72b78a704aa1172282a8e8744fc5 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/aa64d1b5f7db46dd4e59597aaec328ef239a01d2 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/06bf3ae6db48ddd7e8bea901b8c2a88d96ac5665 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f08c29637d88cc836472e1825b1fa4971d81e030 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/c35688288c6ab7404165a29db27e63b7448dac1f | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/44d74e375998c00e0ea70eb3699021599782d742 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/3ac5e7f085a5103095ccc3a90cd5d2caf672cdc5 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4ff2b8887247f87b3ab176ffa887c0d0387ae02d | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5c40f0a3268d5863f3000336a80eef1aa6f5f465 | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/18dc5dea6a714a9d9b7b62e824658936d51ad70b | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/1b98b2c0f5b0c6dad8eb57a67a3f7fee839545aa | x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/841a352d41727647babce23186b8abdd09fde1d7 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/adb63c3f4565e80d3d01526c40a163df8fb45705 | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/9b1a169aa5ea3529607ae4b40849e91b43568b13 | ORPH riscv64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/2601972c7add2871214a13f98139e8515bc55967 | ORPH mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/201d833e90dce59000458af5a2b1bfd1663af991 | nds32le | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/60ae48de0ee87e7c98ebfe5e4bb931ee16f2ba25 | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/e8a10eae22f1310f39bef0e328ea4970cf90a3e7 | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/1c89a6d170035cb9a990b1e81a074cd642a25eae | sparc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/60b89cdfae4feefd54eeb7bfcd7eddf2f7c76674 | mips64el | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/2e76a505246fcc1ad3ff598a7e57e850c9e26d5b | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/57d625e939cebcd3c1f80f18d71094d9d6d0f100 | powerpc64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/343504ec0f99dd16888727fa20811bd29cdeaffc | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/88c8f8f7c6c4930a59c496ac26bf3087c776c98e | x86_64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/f024ce003c121567c4ae53f2e047c606841305fa | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/76a37d6c207c2c13f1ffc07259f41a6ae4c740f1 | s390x | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/e10bf89c88f7ee784d3af1f0fae4c33343a75fef | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/0d9be02637772039247d0e823cae457c15405852 | ORPH or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/a121b42d3e768e2370ffca75e252eaf31128e2c1 | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/de325f313a118480972f0227ec2112a9672db5f9 | x86_64 | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/0b573c0987087f807460b42aef87caebb7bcbbe6 | arm | mono-6.12.0.90 | NOK | http://autobuild.buildroot.net/results/64c007ec4183ef1726ebab390dc0e8dd15050cb3 | x86_64 | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/68db60ef0a4909ef7b43365f9a1776166aa47804 | riscv64 | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/d76ac39be85ef58f5236f08436f442a4fda30357 | ORPH x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/4714d68a24160fb3a818f3470cc01a66329a1a3c | ORPH powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/89a069fd7b1ce6ebb9b890fd21facd14cf7f3c59 | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/5a38bbbe3680fa49b1ac658434fe682d1fdc83cf | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/20eff05871c3bd3703785537011c3553825d6a5b | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e5dc8dc1273a11f8f500e63c7aaf764a3e01a0f6 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/27f28e7d91715f5a8df4b569358af139c7ad548e | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/dc0c2063a92c6c98afa32765f5168f488c818371 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6c3bf3dee7a3d42e23e1195c9fe25bc8d2e7dfd3 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/edda4cf8232eafc64fd26d9fd89128012c217496 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/b71a4e13a038ec50a220e940b54db143faee6994 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/7b6051055dbe2bb093b2fa48814ccf27df0541b9 | or1k | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/e0a70c7ecae7b4bf71880842517f3aeaaf100ca0 | arm | unknown | NOK | http://autobuild.buildroot.net/results/a4f5fc22aa1774c3fd369666d538f8e0131f5466 | arc | unknown | NOK | http://autobuild.buildroot.net/results/50450e8aa9635b947dc80506c5df045a54127042 | arc | unknown | NOK | http://autobuild.buildroot.net/results/b7b5c97f21e76a8531b16a058f520db729ddf180 | arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1931a9e90fe31b7325555806f6965b16653a7a1d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 apitrace-9.0 | 1 qt5location-5.15.2 | 1 rocksdb-6.13.3 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-9.0 | NOK | http://autobuild.buildroot.net/results/6e87b86b6b01cdb91e8d09afe6e5220d29b445c2 | sparc64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5a162018da395ce19207a9994effa41db3f52da6 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c52f0996efbaeb6dd78a73138dcf4ec480c540c2 | mipsel | qt5location-5.15.2 | NOK | http://autobuild.buildroot.net/results/65fca52bba12bc7011693b063a8e72a539380808 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/ca61cec1922741a2447fed05c95e8b58e99d4af1 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/a27c46399adb20c6535ffbd23958996a43e97c7a | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/76bf9be59ca90afa957c55e8a17322bf10ed0c27 | -- http://autobuild.buildroot.net From maxime.chevallier at bootlin.com Thu Jan 20 07:48:04 2022 From: maxime.chevallier at bootlin.com (Maxime Chevallier) Date: Thu, 20 Jan 2022 08:48:04 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20220119233944.7ba2d09f@windsurf> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> Message-ID: <20220120084804.429f1d54@bootlin.com> Hello Thomas, On Wed, 19 Jan 2022 23:39:44 +0100 Thomas Petazzoni wrote: >On Wed, 19 Jan 2022 23:23:32 +0100 >Giulio Benetti wrote: > >> +config BR2_REFPOLICY_DISABLE_DONTAUDIT >> + bool "Disable dontaudit" > >I am still extremely confused by the name of option, with its double >negative. > >When enabled, this option will disable something that doesn't audit. >Meh. I agree about the confusing double-negative, but it follows the SELinux terminology from the rules syntax. My personal view is that the "make enableaudit" target is a bit confusing already :) >Is it possible to find a better name / description that doesn't make >one's brain segfault when trying to understand what it does ? Maybe we can think of an option name like "BR2_REFPOLICY_VERBOSE_DONTAUDIT", suggesting that we're not silencing these 'dontaudit' rules anymore ? The only actual effect is what gets printed in the AVC logs. >The make target that gets triggered is "enableaudit". Would it make >sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? The more I think about that, the more I think that using "enable/disable" here is misleading, the behaviour stays the same with regard to what gets denied/allow, only the logs are going to change. Thanks, Maxime >It would be nice to get the feedback from Antoine and/or Maxime on this. > >Thomas -- Maxime Chevallier, Bootlin Embedded Linux and kernel engineering https://bootlin.com From heiko.thiery at gmail.com Thu Jan 20 09:19:36 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Thu, 20 Jan 2022 10:19:36 +0100 Subject: [Buildroot] [PATCH v4] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220120091935.15035-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- v4: - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. The FPU options are set implicit. v3: - change offset value to use capitol 'K' value (thanks Guilio) - add info to uboot patches about submitting to upstream v2: - switch to extlinux - directly call genimage.sh - remove post-image.sh - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 7 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 58 ++++ 8 files changed, 510 insertions(+) create mode 100644 board/kontron/bl-imx8mm/extlinux.conf create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..93c5760489 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1179,7 +1179,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf new file mode 100644 index 0000000000..d38f7f81b7 --- /dev/null +++ b/board/kontron/bl-imx8mm/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..c98bc4f150 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,18 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 16K + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + image = "rootfs.ext4" + offset = 8M + partition-uuid = %PARTUUID% + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..6d76282def --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,31 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..a88d7aba87 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,305 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..9a9eabff61 --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_aarch64=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.30.2 From atenart at kernel.org Thu Jan 20 09:29:25 2022 From: atenart at kernel.org (Antoine Tenart) Date: Thu, 20 Jan 2022 10:29:25 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20220120084804.429f1d54@bootlin.com> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> <20220120084804.429f1d54@bootlin.com> Message-ID: <164267096542.4497.13116457792635384701@kwain> Quoting Maxime Chevallier (2022-01-20 08:48:04) > On Wed, 19 Jan 2022 23:39:44 +0100 > Thomas Petazzoni wrote: > >On Wed, 19 Jan 2022 23:23:32 +0100 > >Giulio Benetti wrote: > > > >> +config BR2_REFPOLICY_DISABLE_DONTAUDIT > >> + bool "Disable dontaudit" > > > >I am still extremely confused by the name of option, with its double > >negative. > > > >When enabled, this option will disable something that doesn't audit. > >Meh. > > I agree about the confusing double-negative, but it follows the SELinux > terminology from the rules syntax. My personal view is that the "make > enableaudit" target is a bit confusing already :) Agreed. > >Is it possible to find a better name / description that doesn't make > >one's brain segfault when trying to understand what it does ? > > Maybe we can think of an option name like > "BR2_REFPOLICY_VERBOSE_DONTAUDIT", suggesting that we're not silencing > these 'dontaudit' rules anymore ? The only actual effect is what gets > printed in the AVC logs. > > >The make target that gets triggered is "enableaudit". Would it make > >sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? > > The more I think about that, the more I think that using > "enable/disable" here is misleading, the behaviour stays the same with > regard to what gets denied/allow, only the logs are going to change. I would suggest using BR2_PACKAGE_REFPOLICY_WITH_DONTAUDIT, defaulting to y (using _WITHOUT_ would be less clear IMHO). And in Kconfig something along the lines: bool "Build with dontaudit rules" default y help The refpolicy comes with 'dontaudit' rules suppressing audit logs for known and expected violations of the policy. These rules are enabled by default. Building without the 'dontaudit' rules will lead in more denied actions being logged, which can be useful for debugging purposes. Note that running 'semodules -DB' from a running system will have the same effect. Say y if unsure. (Please check the semodules part, never tried it). WDYT? Antoine From giulio.benetti at benettiengineering.com Thu Jan 20 10:26:54 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 20 Jan 2022 11:26:54 +0100 Subject: [Buildroot] [PATCH v4] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220120091935.15035-1-heiko.thiery@gmail.com> References: <20220120091935.15035-1-heiko.thiery@gmail.com> Message-ID: Hi Heiko, Frieder, On 20/01/22 10:19, Heiko Thiery wrote: > The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > Cc: Frieder Schrempf > Signed-off-by: Heiko Thiery > --- > v4: > - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > The FPU options are set implicit. > > v3: > - change offset value to use capitol 'K' value (thanks Guilio) > - add info to uboot patches about submitting to upstream > > v2: > - switch to extlinux > - directly call genimage.sh > - remove post-image.sh > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > > DEVELOPERS | 2 + > board/kontron/bl-imx8mm/extlinux.conf | 4 + > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > board/kontron/bl-imx8mm/post-build.sh | 7 + > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > configs/kontron_bl_imx8mm_defconfig | 58 ++++ > 8 files changed, 510 insertions(+) > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > create mode 100644 board/kontron/bl-imx8mm/readme.txt > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index c0bfde69da..93c5760489 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1179,7 +1179,9 @@ F: package/python-sip/ > F: package/uhd/ > > N: Heiko Thiery > +F: board/kontron/bl-imx8mm/ > F: board/kontron/pitx-imx8m/ > +F: configs/kontron_bl_imx8mm_defconfig > F: configs/kontron_pitx_imx8m_defconfig > F: package/altera-stapl/ > F: package/ipmitool/ > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > new file mode 100644 > index 0000000000..d38f7f81b7 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > new file mode 100644 > index 0000000000..c98bc4f150 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/genimage.cfg > @@ -0,0 +1,18 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 16K > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33K > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + offset = 8M > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..6d76282def > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,31 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > + > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > +index 35d12fca32..940bf07a92 100644 > +--- a/configs/kontron-sl-mx8mm_defconfig > ++++ b/configs/kontron-sl-mx8mm_defconfig > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > + CONFIG_SPL_TEXT_BASE=0x7E1000 > + CONFIG_TARGET_KONTRON_MX8MM=y > ++CONFIG_SPL_MMC=y > ++CONFIG_SPL_SERIAL=y > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > + CONFIG_SPL=y > + CONFIG_DISTRO_DEFAULTS=y > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > new file mode 100644 > index 0000000000..a88d7aba87 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > @@ -0,0 +1,305 @@ > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > + u-boot.dtsi > + > +When using a board variant that selects the lvds specific dtb the > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > +include this in the board base u-boot.dtsi and create an additional one > +for the lvds variant. > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > + 3 files changed, 135 insertions(+), 123 deletions(-) > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > + > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +new file mode 100644 > +index 0000000000..4bf75722bf > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +@@ -0,0 +1,6 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +index 22d18e6f1c..4bf75722bf 100644 > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +@@ -3,126 +3,4 @@ > + * Copyright (C) 2019 Kontron Electronics GmbH > + */ > + > +-#include "imx8mm-u-boot.dtsi" > +- > +-/ { > +- aliases { > +- usb0 = &usbotg1; > +- usb1 = &usbotg2; > +- }; > +- > +- wdt-reboot { > +- compatible = "wdt-reboot"; > +- wdt = <&wdog1>; > +- u-boot,dm-spl; > +- }; > +- > +- firmware { > +- optee { > +- compatible = "linaro,optee-tz"; > +- method = "smc"; > +- }; > +- }; > +-}; > +- > +-&fec1 { > +- phy-mode = "rgmii-rxid"; > +-}; > +- > +-&i2c1 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&i2c2 { > +- status = "okay"; > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_i2c1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_pmic { > +- u-boot,dm-spl; > +- fsl,pins = < > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > +- /* Disable Pullup for SD_VSEL */ > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > +- >; > +-}; > +- > +-&pinctrl_uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_100mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_200mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&pca9450 { > +- u-boot,dm-spl; > +-}; > +- > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > +- u-boot,dm-spl; > +-}; > +- > +-&ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio2 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio3 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio4 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio5 { > +- u-boot,dm-spl; > +-}; > +- > +-&uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&wdog1 { > +- u-boot,dm-spl; > +-}; > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +new file mode 100644 > +index 0000000000..22d18e6f1c > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +@@ -0,0 +1,128 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-u-boot.dtsi" > ++ > ++/ { > ++ aliases { > ++ usb0 = &usbotg1; > ++ usb1 = &usbotg2; > ++ }; > ++ > ++ wdt-reboot { > ++ compatible = "wdt-reboot"; > ++ wdt = <&wdog1>; > ++ u-boot,dm-spl; > ++ }; > ++ > ++ firmware { > ++ optee { > ++ compatible = "linaro,optee-tz"; > ++ method = "smc"; > ++ }; > ++ }; > ++}; > ++ > ++&fec1 { > ++ phy-mode = "rgmii-rxid"; > ++}; > ++ > ++&i2c1 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&i2c2 { > ++ status = "okay"; > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; any findings for i2c1 and i2c2 nodes? This is not mandatory to be accepted anyway. I've successfully built it so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas From bugzilla at busybox.net Thu Jan 20 12:55:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 20 Jan 2022 12:55:10 +0000 Subject: [Buildroot] [Bug 14531] New: Package EFL - build error Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 Bug ID: 14531 Summary: Package EFL - build error Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: jhiljanen at europower-consulting.com CC: buildroot at uclibc.org Target Milestone: --- I get an error when building the EFL package: output/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze" -- You are receiving this mail because: You are on the CC list for the bug. From heiko.thiery at gmail.com Thu Jan 20 13:52:52 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Thu, 20 Jan 2022 14:52:52 +0100 Subject: [Buildroot] [PATCH] configs/kontron_pitx_imx8m_defconfig: remove BR2_ARM_FPU_VFPV3 Message-ID: <20220120135251.4225-1-heiko.thiery@gmail.com> The FP setting is not used for aarch64 in buildroot. The FPU options are set implicit. Signed-off-by: Heiko Thiery --- configs/kontron_pitx_imx8m_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 7f9c0eeae8..8f756f5246 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -1,6 +1,5 @@ # Architecture BR2_aarch64=y -BR2_ARM_FPU_VFPV3=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" -- 2.30.2 From bugzilla at busybox.net Thu Jan 20 13:54:37 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 20 Jan 2022 13:54:37 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #1 from Giulio Benetti --- Hi jhiljanen, I've tried with Buildroot master branch and I've found 2 missing dependencies: - libinput - libxkbcommon and this deserves a patch But once enabled them efl builds correctly. Which Buildroot version are you using? -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Thu Jan 20 14:09:40 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 20 Jan 2022 14:09:40 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #2 from jhiljanen at europower-consulting.com --- (In reply to Giulio Benetti from comment #1) I pulled the master from git. I don't have BR2_PACKAGE_EFL_EEZE enabled, because I'm using BusyBox init system. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Thu Jan 20 14:39:42 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 20 Jan 2022 14:39:42 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #3 from Giulio Benetti --- Ah ok, now I can reproduce with BR2_PACKAGE_EFL_EEZE not enabled. This must be fixed. Thanks for reporting. I'm going to fix it. Best regards -- You are receiving this mail because: You are on the CC list for the bug. From ps.report at gmx.net Thu Jan 20 17:21:39 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 18:21:39 +0100 Subject: [Buildroot] [PATCH v1] package/hwdata: bump version to 355 Message-ID: <20220120172139.25705-1-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- 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 43cca03b06..7861106859 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ed9a2c8b90371ccf4f0ff88972d87770c1c644e63ca44d2ac72c33200642cdde hwdata-0.354.tar.gz +sha256 0d3d21af57822f35141b524808fd9e4823dbb413df338606195010dc0aa1c935 hwdata-0.355.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 71b59b95ed..4dd9c9e28e 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.354 +HWDATA_VERSION = 0.355 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE -- 2.34.1 From ps.report at gmx.net Thu Jan 20 17:49:39 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 18:49:39 +0100 Subject: [Buildroot] [PATCH v1] package/hwloc: bump version to 2.7.0 Message-ID: <20220120174939.27055-1-ps.report@gmx.net> For details see [1]. [1] https://github.com/open-mpi/hwloc/blob/hwloc-2.7.0/NEWS Signed-off-by: Peter Seiderer --- package/hwloc/hwloc.hash | 4 ++-- package/hwloc/hwloc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index e207a6bb1a..ca77e3301c 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,4 +1,4 @@ -# From https://www.open-mpi.org/software/hwloc/v2.4/ -sha256 392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63 hwloc-2.4.1.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.7/ +sha256 028cee53ebcfe048283a2b3e87f2fa742c83645fc3ae329134bf5bb8b90384e0 hwloc-2.7.0.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 2a5a82cea4..04543a7e64 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,8 +4,8 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.4 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 +HWLOC_VERSION_MAJOR = 2.7 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause -- 2.34.1 From kuzminov.sergey81 at gmail.com Thu Jan 20 18:50:43 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Thu, 20 Jan 2022 21:50:43 +0300 Subject: [Buildroot] [PATCH v3] board/orangepi/orangepi-zero: bump Linux and U-Boot versions Message-ID: <20220120185043.7745-1-kuzminov.sergey81@gmail.com> v1: - Linux: bump to version 5.12.19 (from 5.12.2). - U-Boot: bump to version 2022.01 (from 2021.04). - Added fast_commit for ext4. When creating a file system with this option, writing speeds up twice in some cases: https://lwn.net/Articles/834483/ - Refactoring configs/orangepi_zero_defconfig. - Switched to extlinux. - Createed common scenarios for multiple boards to create an SD image: board/orangepi/common. v2: - Linux: bump to version 5.16.1 (from 5.12.19) thanks to a patch from Giulio for xr819-xradio (link below). - Added in genimage.cfg: partition rootfs {offset = 1M} to prevent possible alignment error. - Added BR2_ARM_EABIHF=y to make it visible in the config file, previously added implicitly. - Replaced BR2_ARM_FPU_VFPV4 with BR2_ARM_FPU_NEON_VFPV4 because processor supports it. - Deleted BR2_GCC_ENABLE_LTO=y, added by mistake. v3: - Changed the name of the patch (from board/orangepi/orangepi-zero:extlinux, refactoring). - Linux: bump to version 5.16.2 (from 5.16.1). - Returned (# BR2_TARGET_ROOTFS_TAR is not set) instead of (BR2_TARGET_ROOTFS_TAR=n), added in v1. - Renamed file uboot-extras.config -> uboot-extras.fragment. - Renamed file linux-extras.config -> linux-extras.fragment. - Deleted (#BR2_ARM_INSTRUCTIONS_THUMB2=y), added in v2. Patch required to work: https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 5 ++ board/orangepi/common/genimage.cfg | 20 ++++++ board/orangepi/common/post-build.sh | 34 ++++++++++ board/orangepi/common/uboot-extras.fragment | 3 + board/orangepi/orangepi-zero/boot.cmd | 9 --- board/orangepi/orangepi-zero/genimage.cfg | 36 ---------- ...ux-extras.config => linux-extras.fragment} | 0 configs/orangepi_zero_defconfig | 68 +++++++++++-------- 8 files changed, 103 insertions(+), 72 deletions(-) create mode 100644 board/orangepi/common/extlinux.conf create mode 100644 board/orangepi/common/genimage.cfg create mode 100755 board/orangepi/common/post-build.sh create mode 100644 board/orangepi/common/uboot-extras.fragment delete mode 100644 board/orangepi/orangepi-zero/boot.cmd delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..015f29270e --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,5 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait console=${console} +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg new file mode 100644 index 0000000000..8b80ffb138 --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + hdimage { + partition-table-type = gpt + gpt-no-backup = true + gpt-location = 1008K # 1MB - 16KB + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB - 16KB + } + + partition rootfs { + offset = 1M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh new file mode 100755 index 0000000000..296f94b174 --- /dev/null +++ b/board/orangepi/common/post-build.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "uImage" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + echo "Image" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + echo "Image.gz" + else + echo "zImage" + fi +} + +generic_getty() +{ + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then + echo "" + else + echo "s/\s*console=\S*//" + fi +} + +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" + +sed -e "$(generic_getty)" \ + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ + -e "s/%PARTUUID%/$PARTUUID/g" \ + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" + +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/orangepi/common/uboot-extras.fragment b/board/orangepi/common/uboot-extras.fragment new file mode 100644 index 0000000000..5aa97523d9 --- /dev/null +++ b/board/orangepi/common/uboot-extras.fragment @@ -0,0 +1,3 @@ +CONFIG_BOOTDELAY=0 +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv preboot;" diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd deleted file mode 100644 index d094a64fe5..0000000000 --- a/board/orangepi/orangepi-zero/boot.cmd +++ /dev/null @@ -1,9 +0,0 @@ -setenv fdt_high ffffffff - -part uuid mmc 0:2 uuid -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg deleted file mode 100644 index 32f5454ae6..0000000000 --- a/board/orangepi/orangepi-zero/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Zero -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h2-plus-orangepi-zero.dtb", - "boot.scr" - } - } - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment similarity index 100% rename from board/orangepi/orangepi-zero/linux-extras.config rename to board/orangepi/orangepi-zero/linux-extras.fragment diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..430d38af3e 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,49 +1,63 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.fragment" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.2" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_GENIMAGE=y -# wireless driver and firmware +# Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y BR2_PACKAGE_ARMBIAN_FIRMWARE=y BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -# wireless support +# Wireless support BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y @@ -51,5 +65,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -# spi flash support +# Spi flash support BR2_PACKAGE_MTD=y -- 2.34.1 From ps.report at gmx.net Thu Jan 20 19:26:26 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 20:26:26 +0100 Subject: [Buildroot] [PATCH v1] package/bash: bump version to 5.1.16 Message-ID: <20220120192626.11046-1-ps.report@gmx.net> - remove upstream patch level patches 0001-bash51-001.patch 0002-bash51-002.patch 0003-bash51-003.patch 0004-bash51-004.patch - renumber remaining patches For details see [1]. [1] http://git.savannah.gnu.org/cgit/bash.git/log Signed-off-by: Peter Seiderer --- package/bash/0001-bash51-001.patch | 83 ----------- ...ut.h-add-missing-include-on-stdio.h.patch} | 0 package/bash/0002-bash51-002.patch | 60 -------- ...ocal_shiftstates-vs.-locale_shiftst.patch} | 0 package/bash/0003-bash51-003.patch | 56 -------- ...uote_pathname-vs.-udequote_pathname.patch} | 0 package/bash/0004-bash51-004.patch | 129 ------------------ package/bash/bash.hash | 4 +- package/bash/bash.mk | 2 +- 9 files changed, 3 insertions(+), 331 deletions(-) delete mode 100644 package/bash/0001-bash51-001.patch rename package/bash/{0005-input.h-add-missing-include-on-stdio.h.patch => 0001-input.h-add-missing-include-on-stdio.h.patch} (100%) delete mode 100644 package/bash/0002-bash51-002.patch rename package/bash/{0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch => 0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch} (100%) delete mode 100644 package/bash/0003-bash51-003.patch rename package/bash/{0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch => 0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch} (100%) delete mode 100644 package/bash/0004-bash51-004.patch diff --git a/package/bash/0001-bash51-001.patch b/package/bash/0001-bash51-001.patch deleted file mode 100644 index 8f18cccc31..0000000000 --- a/package/bash/0001-bash51-001.patch +++ /dev/null @@ -1,83 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-001] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-001 - -Bug-Reported-by: Fazal Majid -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00000.html - -Bug-Description: - -There is a missing dependency on a constructed file, which can cause highly -parellel builds to fail. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/Makefile.in 2020-12-04 09:51:19.000000000 -0500 ---- b/Makefile.in 2020-12-16 11:28:36.000000000 -0500 -*************** -*** 1316,1319 **** ---- 1316,1320 ---- - bashline.o: pcomplete.h ${BASHINCDIR}/chartypes.h input.h - bashline.o: ${BASHINCDIR}/shmbutil.h ${BASHINCDIR}/shmbchar.h -+ bashline.o: ${DEFDIR}/builtext.h - bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h - bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h -*************** -*** 1436,1439 **** ---- 1437,1441 ---- - builtins/evalstring.o: jobs.h builtins.h flags.h input.h execute_cmd.h - builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h pathnames.h -+ builtins/evalstring.o: ${DEFDIR}/builtext.h - builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h - builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h xmalloc.h error.h - -*** ../bash-5.1-patched/builtins/Makefile.in 2019-07-25 08:03:45.000000000 -0400 ---- b/builtins/Makefile.in 2020-12-16 11:29:29.000000000 -0500 -*************** -*** 362,366 **** - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h - #evalstring.o: $(topdir)/y.tab.h - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h ---- 362,366 ---- - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h ./builtext.h - #evalstring.o: $(topdir)/y.tab.h - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 1,5 **** - /* patchlevel.h -- current bash patch level */ - -! /* Copyright (C) 2001-2016 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. ---- 1,5 ---- - /* patchlevel.h -- current bash patch level */ - -! /* Copyright (C) 2001-2020 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0005-input.h-add-missing-include-on-stdio.h.patch b/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch similarity index 100% rename from package/bash/0005-input.h-add-missing-include-on-stdio.h.patch rename to package/bash/0001-input.h-add-missing-include-on-stdio.h.patch diff --git a/package/bash/0002-bash51-002.patch b/package/bash/0002-bash51-002.patch deleted file mode 100644 index c9836082c1..0000000000 --- a/package/bash/0002-bash51-002.patch +++ /dev/null @@ -1,60 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-002] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-002 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00037.html - -Bug-Description: - -If there are no jobs, and the `-n' and `-p' options are both supplied to -`wait', bash can assign a value to the variable name specified with `-p' -instead of leaving it unset. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/builtins/wait.def 2020-04-09 15:13:57.000000000 -0400 ---- b/builtins/wait.def 2020-12-11 09:46:49.000000000 -0500 -*************** -*** 214,222 **** - - status = wait_for_any_job (wflags, &pstat); -- if (status < 0) -- status = 127; -- - if (vname && status >= 0) - bind_var_to_int (vname, pstat.pid); - if (list) - unset_waitlist (); ---- 214,222 ---- - - status = wait_for_any_job (wflags, &pstat); - if (vname && status >= 0) - bind_var_to_int (vname, pstat.pid); -+ -+ if (status < 0) -+ status = 127; - if (list) - unset_waitlist (); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch similarity index 100% rename from package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch rename to package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch diff --git a/package/bash/0003-bash51-003.patch b/package/bash/0003-bash51-003.patch deleted file mode 100644 index ff13fb0c9f..0000000000 --- a/package/bash/0003-bash51-003.patch +++ /dev/null @@ -1,56 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-003] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-003 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00050.html - -Bug-Description: - -Bash does not put a command substitution process that is started to perform an -expansion in a child process into the right process group where it can receive -keyboard-generated signals. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 ---- b/subst.c 2020-12-12 13:50:11.000000000 -0500 -*************** -*** 6357,6362 **** - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */ -! if ((subshell_environment & SUBSHELL_PIPE) == 0) - pipeline_pgrp = shell_pgrp; - cleanup_the_pipeline (); ---- 6357,6364 ---- - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or -! we've already forked to run a disk command (and are expanding redirections, -! for example). */ -! if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0) - pipeline_pgrp = shell_pgrp; - cleanup_the_pipeline (); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch similarity index 100% rename from package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch rename to package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch diff --git a/package/bash/0004-bash51-004.patch b/package/bash/0004-bash51-004.patch deleted file mode 100644 index 48a38645f7..0000000000 --- a/package/bash/0004-bash51-004.patch +++ /dev/null @@ -1,129 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-004] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-004 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00039.html - -Bug-Description: - -If a key-value compound array assignment to an associative array is supplied -as an assignment statement argument to the `declare' command that declares the -array, the assignment doesn't perform the correct word expansions. - -This patch makes key-value assignment and subscript assignment perform the -same expansions when they're supplied as an argument to `declare'. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/arrayfunc.c 2020-10-09 11:38:58.000000000 -0400 ---- b/arrayfunc.c 2020-12-11 15:12:22.000000000 -0500 -*************** -*** 598,601 **** ---- 598,622 ---- - } - } -+ -+ /* Return non-zero if L appears to be a key-value pair associative array -+ compound assignment. */ -+ int -+ kvpair_assignment_p (l) -+ WORD_LIST *l; -+ { -+ return (l && (l->word->flags & W_ASSIGNMENT) == 0 && l->word->word[0] != '['); /*]*/ -+ } -+ -+ char * -+ expand_and_quote_kvpair_word (w) -+ char *w; -+ { -+ char *t, *r; -+ -+ t = w ? expand_assignment_string_to_string (w, 0) : 0; -+ r = sh_single_quote (t ? t : ""); -+ free (t); -+ return r; -+ } - #endif - -*************** -*** 641,645 **** - - #if ASSOC_KVPAIR_ASSIGNMENT -! if (assoc_p (var) && nlist && (nlist->word->flags & W_ASSIGNMENT) == 0 && nlist->word->word[0] != '[') /*]*/ - { - iflags = flags & ~ASS_APPEND; ---- 662,666 ---- - - #if ASSOC_KVPAIR_ASSIGNMENT -! if (assoc_p (var) && kvpair_assignment_p (nlist)) - { - iflags = flags & ~ASS_APPEND; -*** ../bash-5.1-patched/arrayfunc.h 2020-04-29 17:24:15.000000000 -0400 ---- b/arrayfunc.h 2020-12-11 14:23:50.000000000 -0500 -*************** -*** 68,71 **** ---- 68,74 ---- - extern void quote_compound_array_list PARAMS((WORD_LIST *, int)); - -+ extern int kvpair_assignment_p PARAMS((WORD_LIST *)); -+ extern char *expand_and_quote_kvpair_word PARAMS((char *)); -+ - extern int unbind_array_element PARAMS((SHELL_VAR *, char *, int)); - extern int skipsubscript PARAMS((const char *, int, int)); -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 ---- b/subst.c 2020-12-11 15:11:10.000000000 -0500 -*************** -*** 11605,11608 **** ---- 11605,11609 ---- - WORD_LIST *l, *nl; - char *t; -+ int kvpair; - - if (flags == 0) -*************** -*** 11619,11622 **** ---- 11620,11627 ---- - /* Associative array */ - l = parse_string_to_word_list (value, 1, "array assign"); -+ #if ASSOC_KVPAIR_ASSIGNMENT -+ kvpair = kvpair_assignment_p (l); -+ #endif -+ - /* For associative arrays, with their arbitrary subscripts, we have to - expand and quote in one step so we don't have to search for the -*************** -*** 11624,11627 **** ---- 11629,11638 ---- - for (nl = l; nl; nl = nl->next) - { -+ #if ASSOC_KVPAIR_ASSIGNMENT -+ if (kvpair) -+ /* keys and values undergo the same set of expansions */ -+ t = expand_and_quote_kvpair_word (nl->word->word); -+ else -+ #endif - if ((nl->word->flags & W_ASSIGNMENT) == 0) - t = sh_single_quote (nl->word->word ? nl->word->word : ""); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 2e547c8c30..4660e9d38a 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://mirror.keystealth.org/gnu/bash/bash-5.1.tar.gz.sig -sha256 cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig +sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 7b853ece08..3aca22898e 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.1 +BASH_VERSION = 5.1.16 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ -- 2.34.1 From ps.report at gmx.net Thu Jan 20 19:27:38 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 20:27:38 +0100 Subject: [Buildroot] [PATCH v1] package/hdparm: bump version to 9.63 Message-ID: <20220120192738.11310-1-ps.report@gmx.net> For details see [1]. [1] https://sourceforge.net/p/hdparm/news/2022/01/hdparm-963-is-released- Signed-off-by: Peter Seiderer --- package/hdparm/hdparm.hash | 2 +- package/hdparm/hdparm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash index b37826caf2..c039481f77 100644 --- a/package/hdparm/hdparm.hash +++ b/package/hdparm/hdparm.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/hdparm/files/hdparm/ -sha1 100b9a5551b71d87b446b415d56c5d45ac41d131 hdparm-9.62.tar.gz +sha1 c8e24233b4d29506907ad2bf0725f793106c3a78 hdparm-9.63.tar.gz # Locally computed sha256 2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f hdparm-9.62.tar.gz sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 6a71c14fa7..2c3b372deb 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.62 +HDPARM_VERSION = 9.63 HDPARM_SITE = https://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT -- 2.34.1 From yann.morin.1998 at free.fr Thu Jan 20 20:35:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:35:31 +0100 Subject: [Buildroot] [git commit] package/hdparm: bump version to 9.63 Message-ID: <20220120203347.7378982DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b50ab233e6e1737cb3aa198fdebb5d9fb5cd89eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://sourceforge.net/p/hdparm/news/2022/01/hdparm-963-is-released- Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/hdparm/hdparm.hash | 2 +- package/hdparm/hdparm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash index b37826caf2..c039481f77 100644 --- a/package/hdparm/hdparm.hash +++ b/package/hdparm/hdparm.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/hdparm/files/hdparm/ -sha1 100b9a5551b71d87b446b415d56c5d45ac41d131 hdparm-9.62.tar.gz +sha1 c8e24233b4d29506907ad2bf0725f793106c3a78 hdparm-9.63.tar.gz # Locally computed sha256 2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f hdparm-9.62.tar.gz sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 6a71c14fa7..2c3b372deb 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.62 +HDPARM_VERSION = 9.63 HDPARM_SITE = https://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT From yann.morin.1998 at free.fr Thu Jan 20 20:35:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:35:28 +0100 Subject: [Buildroot] [git commit] package/bash: bump version to 5.1.16 Message-ID: <20220120203347.69FCE82BDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80b3c51c06bcb6872168f4f82147ec72938ab0e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - remove upstream patch level patches 0001-bash51-001.patch 0002-bash51-002.patch 0003-bash51-003.patch 0004-bash51-004.patch - renumber remaining patches For details see [1]. [1] http://git.savannah.gnu.org/cgit/bash.git/log Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/bash/0001-bash51-001.patch | 83 ------------- ...1-input.h-add-missing-include-on-stdio.h.patch} | 0 package/bash/0002-bash51-002.patch | 60 ---------- ...ypo-local_shiftstates-vs.-locale_shiftst.patch} | 0 package/bash/0003-bash51-003.patch | 56 --------- ...x-dequote_pathname-vs.-udequote_pathname.patch} | 0 package/bash/0004-bash51-004.patch | 129 --------------------- package/bash/bash.hash | 4 +- package/bash/bash.mk | 2 +- 9 files changed, 3 insertions(+), 331 deletions(-) diff --git a/package/bash/0001-bash51-001.patch b/package/bash/0001-bash51-001.patch deleted file mode 100644 index 8f18cccc31..0000000000 --- a/package/bash/0001-bash51-001.patch +++ /dev/null @@ -1,83 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-001] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-001 - -Bug-Reported-by: Fazal Majid -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00000.html - -Bug-Description: - -There is a missing dependency on a constructed file, which can cause highly -parellel builds to fail. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/Makefile.in 2020-12-04 09:51:19.000000000 -0500 ---- b/Makefile.in 2020-12-16 11:28:36.000000000 -0500 -*************** -*** 1316,1319 **** ---- 1316,1320 ---- - bashline.o: pcomplete.h ${BASHINCDIR}/chartypes.h input.h - bashline.o: ${BASHINCDIR}/shmbutil.h ${BASHINCDIR}/shmbchar.h -+ bashline.o: ${DEFDIR}/builtext.h - bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h - bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h -*************** -*** 1436,1439 **** ---- 1437,1441 ---- - builtins/evalstring.o: jobs.h builtins.h flags.h input.h execute_cmd.h - builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h pathnames.h -+ builtins/evalstring.o: ${DEFDIR}/builtext.h - builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h - builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h xmalloc.h error.h - -*** ../bash-5.1-patched/builtins/Makefile.in 2019-07-25 08:03:45.000000000 -0400 ---- b/builtins/Makefile.in 2020-12-16 11:29:29.000000000 -0500 -*************** -*** 362,366 **** - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h - #evalstring.o: $(topdir)/y.tab.h - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h ---- 362,366 ---- - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h ./builtext.h - #evalstring.o: $(topdir)/y.tab.h - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 1,5 **** - /* patchlevel.h -- current bash patch level */ - -! /* Copyright (C) 2001-2016 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. ---- 1,5 ---- - /* patchlevel.h -- current bash patch level */ - -! /* Copyright (C) 2001-2020 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0005-input.h-add-missing-include-on-stdio.h.patch b/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch similarity index 100% rename from package/bash/0005-input.h-add-missing-include-on-stdio.h.patch rename to package/bash/0001-input.h-add-missing-include-on-stdio.h.patch diff --git a/package/bash/0002-bash51-002.patch b/package/bash/0002-bash51-002.patch deleted file mode 100644 index c9836082c1..0000000000 --- a/package/bash/0002-bash51-002.patch +++ /dev/null @@ -1,60 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-002] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-002 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00037.html - -Bug-Description: - -If there are no jobs, and the `-n' and `-p' options are both supplied to -`wait', bash can assign a value to the variable name specified with `-p' -instead of leaving it unset. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/builtins/wait.def 2020-04-09 15:13:57.000000000 -0400 ---- b/builtins/wait.def 2020-12-11 09:46:49.000000000 -0500 -*************** -*** 214,222 **** - - status = wait_for_any_job (wflags, &pstat); -- if (status < 0) -- status = 127; -- - if (vname && status >= 0) - bind_var_to_int (vname, pstat.pid); - if (list) - unset_waitlist (); ---- 214,222 ---- - - status = wait_for_any_job (wflags, &pstat); - if (vname && status >= 0) - bind_var_to_int (vname, pstat.pid); -+ -+ if (status < 0) -+ status = 127; - if (list) - unset_waitlist (); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch similarity index 100% rename from package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch rename to package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch diff --git a/package/bash/0003-bash51-003.patch b/package/bash/0003-bash51-003.patch deleted file mode 100644 index ff13fb0c9f..0000000000 --- a/package/bash/0003-bash51-003.patch +++ /dev/null @@ -1,56 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-003] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-003 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00050.html - -Bug-Description: - -Bash does not put a command substitution process that is started to perform an -expansion in a child process into the right process group where it can receive -keyboard-generated signals. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 ---- b/subst.c 2020-12-12 13:50:11.000000000 -0500 -*************** -*** 6357,6362 **** - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */ -! if ((subshell_environment & SUBSHELL_PIPE) == 0) - pipeline_pgrp = shell_pgrp; - cleanup_the_pipeline (); ---- 6357,6364 ---- - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or -! we've already forked to run a disk command (and are expanding redirections, -! for example). */ -! if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0) - pipeline_pgrp = shell_pgrp; - cleanup_the_pipeline (); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch similarity index 100% rename from package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch rename to package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch diff --git a/package/bash/0004-bash51-004.patch b/package/bash/0004-bash51-004.patch deleted file mode 100644 index 48a38645f7..0000000000 --- a/package/bash/0004-bash51-004.patch +++ /dev/null @@ -1,129 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-004] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-004 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00039.html - -Bug-Description: - -If a key-value compound array assignment to an associative array is supplied -as an assignment statement argument to the `declare' command that declares the -array, the assignment doesn't perform the correct word expansions. - -This patch makes key-value assignment and subscript assignment perform the -same expansions when they're supplied as an argument to `declare'. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/arrayfunc.c 2020-10-09 11:38:58.000000000 -0400 ---- b/arrayfunc.c 2020-12-11 15:12:22.000000000 -0500 -*************** -*** 598,601 **** ---- 598,622 ---- - } - } -+ -+ /* Return non-zero if L appears to be a key-value pair associative array -+ compound assignment. */ -+ int -+ kvpair_assignment_p (l) -+ WORD_LIST *l; -+ { -+ return (l && (l->word->flags & W_ASSIGNMENT) == 0 && l->word->word[0] != '['); /*]*/ -+ } -+ -+ char * -+ expand_and_quote_kvpair_word (w) -+ char *w; -+ { -+ char *t, *r; -+ -+ t = w ? expand_assignment_string_to_string (w, 0) : 0; -+ r = sh_single_quote (t ? t : ""); -+ free (t); -+ return r; -+ } - #endif - -*************** -*** 641,645 **** - - #if ASSOC_KVPAIR_ASSIGNMENT -! if (assoc_p (var) && nlist && (nlist->word->flags & W_ASSIGNMENT) == 0 && nlist->word->word[0] != '[') /*]*/ - { - iflags = flags & ~ASS_APPEND; ---- 662,666 ---- - - #if ASSOC_KVPAIR_ASSIGNMENT -! if (assoc_p (var) && kvpair_assignment_p (nlist)) - { - iflags = flags & ~ASS_APPEND; -*** ../bash-5.1-patched/arrayfunc.h 2020-04-29 17:24:15.000000000 -0400 ---- b/arrayfunc.h 2020-12-11 14:23:50.000000000 -0500 -*************** -*** 68,71 **** ---- 68,74 ---- - extern void quote_compound_array_list PARAMS((WORD_LIST *, int)); - -+ extern int kvpair_assignment_p PARAMS((WORD_LIST *)); -+ extern char *expand_and_quote_kvpair_word PARAMS((char *)); -+ - extern int unbind_array_element PARAMS((SHELL_VAR *, char *, int)); - extern int skipsubscript PARAMS((const char *, int, int)); -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 ---- b/subst.c 2020-12-11 15:11:10.000000000 -0500 -*************** -*** 11605,11608 **** ---- 11605,11609 ---- - WORD_LIST *l, *nl; - char *t; -+ int kvpair; - - if (flags == 0) -*************** -*** 11619,11622 **** ---- 11620,11627 ---- - /* Associative array */ - l = parse_string_to_word_list (value, 1, "array assign"); -+ #if ASSOC_KVPAIR_ASSIGNMENT -+ kvpair = kvpair_assignment_p (l); -+ #endif -+ - /* For associative arrays, with their arbitrary subscripts, we have to - expand and quote in one step so we don't have to search for the -*************** -*** 11624,11627 **** ---- 11629,11638 ---- - for (nl = l; nl; nl = nl->next) - { -+ #if ASSOC_KVPAIR_ASSIGNMENT -+ if (kvpair) -+ /* keys and values undergo the same set of expansions */ -+ t = expand_and_quote_kvpair_word (nl->word->word); -+ else -+ #endif - if ((nl->word->flags & W_ASSIGNMENT) == 0) - t = sh_single_quote (nl->word->word ? nl->word->word : ""); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 2e547c8c30..4660e9d38a 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://mirror.keystealth.org/gnu/bash/bash-5.1.tar.gz.sig -sha256 cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig +sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 7b853ece08..3aca22898e 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.1 +BASH_VERSION = 5.1.16 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ From yann.morin.1998 at free.fr Thu Jan 20 20:44:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:44:02 +0100 Subject: [Buildroot] [PATCH v1] package/hdparm: bump version to 9.63 In-Reply-To: <20220120192738.11310-1-ps.report@gmx.net> References: <20220120192738.11310-1-ps.report@gmx.net> Message-ID: <20220120204402.GB3252931@scaer> Peter, All, On 2022-01-20 20:27 +0100, Peter Seiderer spake thusly: > For details see [1]. > > [1] https://sourceforge.net/p/hdparm/news/2022/01/hdparm-963-is-released- > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/hdparm/hdparm.hash | 2 +- > package/hdparm/hdparm.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash > index b37826caf2..c039481f77 100644 > --- a/package/hdparm/hdparm.hash > +++ b/package/hdparm/hdparm.hash > @@ -1,5 +1,5 @@ > # From https://sourceforge.net/projects/hdparm/files/hdparm/ > -sha1 100b9a5551b71d87b446b415d56c5d45ac41d131 hdparm-9.62.tar.gz > +sha1 c8e24233b4d29506907ad2bf0725f793106c3a78 hdparm-9.63.tar.gz > # Locally computed > sha256 2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f hdparm-9.62.tar.gz > sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT > diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk > index 6a71c14fa7..2c3b372deb 100644 > --- a/package/hdparm/hdparm.mk > +++ b/package/hdparm/hdparm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HDPARM_VERSION = 9.62 > +HDPARM_VERSION = 9.63 > HDPARM_SITE = https://downloads.sourceforge.net/project/hdparm/hdparm > HDPARM_LICENSE = BSD-Style > HDPARM_LICENSE_FILES = LICENSE.TXT > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 20 20:44:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:44:15 +0100 Subject: [Buildroot] [PATCH v1] package/bash: bump version to 5.1.16 In-Reply-To: <20220120192626.11046-1-ps.report@gmx.net> References: <20220120192626.11046-1-ps.report@gmx.net> Message-ID: <20220120204415.GC3252931@scaer> Peter, All, On 2022-01-20 20:26 +0100, Peter Seiderer spake thusly: > - remove upstream patch level patches > 0001-bash51-001.patch > 0002-bash51-002.patch > 0003-bash51-003.patch > 0004-bash51-004.patch > > - renumber remaining patches > > For details see [1]. > > [1] http://git.savannah.gnu.org/cgit/bash.git/log > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/bash/0001-bash51-001.patch | 83 ----------- > ...ut.h-add-missing-include-on-stdio.h.patch} | 0 > package/bash/0002-bash51-002.patch | 60 -------- > ...ocal_shiftstates-vs.-locale_shiftst.patch} | 0 > package/bash/0003-bash51-003.patch | 56 -------- > ...uote_pathname-vs.-udequote_pathname.patch} | 0 > package/bash/0004-bash51-004.patch | 129 ------------------ > package/bash/bash.hash | 4 +- > package/bash/bash.mk | 2 +- > 9 files changed, 3 insertions(+), 331 deletions(-) > delete mode 100644 package/bash/0001-bash51-001.patch > rename package/bash/{0005-input.h-add-missing-include-on-stdio.h.patch => 0001-input.h-add-missing-include-on-stdio.h.patch} (100%) > delete mode 100644 package/bash/0002-bash51-002.patch > rename package/bash/{0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch => 0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch} (100%) > delete mode 100644 package/bash/0003-bash51-003.patch > rename package/bash/{0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch => 0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch} (100%) > delete mode 100644 package/bash/0004-bash51-004.patch > > diff --git a/package/bash/0001-bash51-001.patch b/package/bash/0001-bash51-001.patch > deleted file mode 100644 > index 8f18cccc31..0000000000 > --- a/package/bash/0001-bash51-001.patch > +++ /dev/null > @@ -1,83 +0,0 @@ > -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-001] > -Signed-off-by: Peter Seiderer > - > - BASH PATCH REPORT > - ================= > - > -Bash-Release: 5.1 > -Patch-ID: bash51-001 > - > -Bug-Reported-by: Fazal Majid > -Bug-Reference-ID: > -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00000.html > - > -Bug-Description: > - > -There is a missing dependency on a constructed file, which can cause highly > -parellel builds to fail. > - > -Patch (apply with `patch -p0'): > - > -*** ../bash-5.1-patched/Makefile.in 2020-12-04 09:51:19.000000000 -0500 > ---- b/Makefile.in 2020-12-16 11:28:36.000000000 -0500 > -*************** > -*** 1316,1319 **** > ---- 1316,1320 ---- > - bashline.o: pcomplete.h ${BASHINCDIR}/chartypes.h input.h > - bashline.o: ${BASHINCDIR}/shmbutil.h ${BASHINCDIR}/shmbchar.h > -+ bashline.o: ${DEFDIR}/builtext.h > - bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h > - bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h > -*************** > -*** 1436,1439 **** > ---- 1437,1441 ---- > - builtins/evalstring.o: jobs.h builtins.h flags.h input.h execute_cmd.h > - builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h pathnames.h > -+ builtins/evalstring.o: ${DEFDIR}/builtext.h > - builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h > - builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h xmalloc.h error.h > - > -*** ../bash-5.1-patched/builtins/Makefile.in 2019-07-25 08:03:45.000000000 -0400 > ---- b/builtins/Makefile.in 2020-12-16 11:29:29.000000000 -0500 > -*************** > -*** 362,366 **** > - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h > - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h > -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h > - #evalstring.o: $(topdir)/y.tab.h > - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h > ---- 362,366 ---- > - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h > - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h > -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h ./builtext.h > - #evalstring.o: $(topdir)/y.tab.h > - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h > - > -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 > ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 > -*************** > -*** 1,5 **** > - /* patchlevel.h -- current bash patch level */ > - > -! /* Copyright (C) 2001-2016 Free Software Foundation, Inc. > - > - This file is part of GNU Bash, the Bourne Again SHell. > ---- 1,5 ---- > - /* patchlevel.h -- current bash patch level */ > - > -! /* Copyright (C) 2001-2020 Free Software Foundation, Inc. > - > - This file is part of GNU Bash, the Bourne Again SHell. > -*************** > -*** 26,30 **** > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 0 > - > - #endif /* _PATCHLEVEL_H_ */ > ---- 26,30 ---- > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 1 > - > - #endif /* _PATCHLEVEL_H_ */ > diff --git a/package/bash/0005-input.h-add-missing-include-on-stdio.h.patch b/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch > similarity index 100% > rename from package/bash/0005-input.h-add-missing-include-on-stdio.h.patch > rename to package/bash/0001-input.h-add-missing-include-on-stdio.h.patch > diff --git a/package/bash/0002-bash51-002.patch b/package/bash/0002-bash51-002.patch > deleted file mode 100644 > index c9836082c1..0000000000 > --- a/package/bash/0002-bash51-002.patch > +++ /dev/null > @@ -1,60 +0,0 @@ > -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-002] > -Signed-off-by: Peter Seiderer > - > - BASH PATCH REPORT > - ================= > - > -Bash-Release: 5.1 > -Patch-ID: bash51-002 > - > -Bug-Reported-by: oguzismailuysal at gmail.com > -Bug-Reference-ID: > -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00037.html > - > -Bug-Description: > - > -If there are no jobs, and the `-n' and `-p' options are both supplied to > -`wait', bash can assign a value to the variable name specified with `-p' > -instead of leaving it unset. > - > -Patch (apply with `patch -p0'): > - > -*** ../bash-5.1-patched/builtins/wait.def 2020-04-09 15:13:57.000000000 -0400 > ---- b/builtins/wait.def 2020-12-11 09:46:49.000000000 -0500 > -*************** > -*** 214,222 **** > - > - status = wait_for_any_job (wflags, &pstat); > -- if (status < 0) > -- status = 127; > -- > - if (vname && status >= 0) > - bind_var_to_int (vname, pstat.pid); > - if (list) > - unset_waitlist (); > ---- 214,222 ---- > - > - status = wait_for_any_job (wflags, &pstat); > - if (vname && status >= 0) > - bind_var_to_int (vname, pstat.pid); > -+ > -+ if (status < 0) > -+ status = 127; > - if (list) > - unset_waitlist (); > - > -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 > ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 > -*************** > -*** 26,30 **** > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 1 > - > - #endif /* _PATCHLEVEL_H_ */ > ---- 26,30 ---- > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 2 > - > - #endif /* _PATCHLEVEL_H_ */ > diff --git a/package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch > similarity index 100% > rename from package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch > rename to package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch > diff --git a/package/bash/0003-bash51-003.patch b/package/bash/0003-bash51-003.patch > deleted file mode 100644 > index ff13fb0c9f..0000000000 > --- a/package/bash/0003-bash51-003.patch > +++ /dev/null > @@ -1,56 +0,0 @@ > -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-003] > -Signed-off-by: Peter Seiderer > - > - BASH PATCH REPORT > - ================= > - > -Bash-Release: 5.1 > -Patch-ID: bash51-003 > - > -Bug-Reported-by: oguzismailuysal at gmail.com > -Bug-Reference-ID: > -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00050.html > - > -Bug-Description: > - > -Bash does not put a command substitution process that is started to perform an > -expansion in a child process into the right process group where it can receive > -keyboard-generated signals. > - > -Patch (apply with `patch -p0'): > - > -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 > ---- b/subst.c 2020-12-12 13:50:11.000000000 -0500 > -*************** > -*** 6357,6362 **** > - #if defined (JOB_CONTROL) > - old_pipeline_pgrp = pipeline_pgrp; > -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */ > -! if ((subshell_environment & SUBSHELL_PIPE) == 0) > - pipeline_pgrp = shell_pgrp; > - cleanup_the_pipeline (); > ---- 6357,6364 ---- > - #if defined (JOB_CONTROL) > - old_pipeline_pgrp = pipeline_pgrp; > -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or > -! we've already forked to run a disk command (and are expanding redirections, > -! for example). */ > -! if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0) > - pipeline_pgrp = shell_pgrp; > - cleanup_the_pipeline (); > - > -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 > ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 > -*************** > -*** 26,30 **** > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 2 > - > - #endif /* _PATCHLEVEL_H_ */ > ---- 26,30 ---- > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 3 > - > - #endif /* _PATCHLEVEL_H_ */ > diff --git a/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch > similarity index 100% > rename from package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch > rename to package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch > diff --git a/package/bash/0004-bash51-004.patch b/package/bash/0004-bash51-004.patch > deleted file mode 100644 > index 48a38645f7..0000000000 > --- a/package/bash/0004-bash51-004.patch > +++ /dev/null > @@ -1,129 +0,0 @@ > -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-004] > -Signed-off-by: Peter Seiderer > - > - BASH PATCH REPORT > - ================= > - > -Bash-Release: 5.1 > -Patch-ID: bash51-004 > - > -Bug-Reported-by: oguzismailuysal at gmail.com > -Bug-Reference-ID: > -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00039.html > - > -Bug-Description: > - > -If a key-value compound array assignment to an associative array is supplied > -as an assignment statement argument to the `declare' command that declares the > -array, the assignment doesn't perform the correct word expansions. > - > -This patch makes key-value assignment and subscript assignment perform the > -same expansions when they're supplied as an argument to `declare'. > - > -Patch (apply with `patch -p0'): > - > -*** ../bash-5.1-patched/arrayfunc.c 2020-10-09 11:38:58.000000000 -0400 > ---- b/arrayfunc.c 2020-12-11 15:12:22.000000000 -0500 > -*************** > -*** 598,601 **** > ---- 598,622 ---- > - } > - } > -+ > -+ /* Return non-zero if L appears to be a key-value pair associative array > -+ compound assignment. */ > -+ int > -+ kvpair_assignment_p (l) > -+ WORD_LIST *l; > -+ { > -+ return (l && (l->word->flags & W_ASSIGNMENT) == 0 && l->word->word[0] != '['); /*]*/ > -+ } > -+ > -+ char * > -+ expand_and_quote_kvpair_word (w) > -+ char *w; > -+ { > -+ char *t, *r; > -+ > -+ t = w ? expand_assignment_string_to_string (w, 0) : 0; > -+ r = sh_single_quote (t ? t : ""); > -+ free (t); > -+ return r; > -+ } > - #endif > - > -*************** > -*** 641,645 **** > - > - #if ASSOC_KVPAIR_ASSIGNMENT > -! if (assoc_p (var) && nlist && (nlist->word->flags & W_ASSIGNMENT) == 0 && nlist->word->word[0] != '[') /*]*/ > - { > - iflags = flags & ~ASS_APPEND; > ---- 662,666 ---- > - > - #if ASSOC_KVPAIR_ASSIGNMENT > -! if (assoc_p (var) && kvpair_assignment_p (nlist)) > - { > - iflags = flags & ~ASS_APPEND; > -*** ../bash-5.1-patched/arrayfunc.h 2020-04-29 17:24:15.000000000 -0400 > ---- b/arrayfunc.h 2020-12-11 14:23:50.000000000 -0500 > -*************** > -*** 68,71 **** > ---- 68,74 ---- > - extern void quote_compound_array_list PARAMS((WORD_LIST *, int)); > - > -+ extern int kvpair_assignment_p PARAMS((WORD_LIST *)); > -+ extern char *expand_and_quote_kvpair_word PARAMS((char *)); > -+ > - extern int unbind_array_element PARAMS((SHELL_VAR *, char *, int)); > - extern int skipsubscript PARAMS((const char *, int, int)); > -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 > ---- b/subst.c 2020-12-11 15:11:10.000000000 -0500 > -*************** > -*** 11605,11608 **** > ---- 11605,11609 ---- > - WORD_LIST *l, *nl; > - char *t; > -+ int kvpair; > - > - if (flags == 0) > -*************** > -*** 11619,11622 **** > ---- 11620,11627 ---- > - /* Associative array */ > - l = parse_string_to_word_list (value, 1, "array assign"); > -+ #if ASSOC_KVPAIR_ASSIGNMENT > -+ kvpair = kvpair_assignment_p (l); > -+ #endif > -+ > - /* For associative arrays, with their arbitrary subscripts, we have to > - expand and quote in one step so we don't have to search for the > -*************** > -*** 11624,11627 **** > ---- 11629,11638 ---- > - for (nl = l; nl; nl = nl->next) > - { > -+ #if ASSOC_KVPAIR_ASSIGNMENT > -+ if (kvpair) > -+ /* keys and values undergo the same set of expansions */ > -+ t = expand_and_quote_kvpair_word (nl->word->word); > -+ else > -+ #endif > - if ((nl->word->flags & W_ASSIGNMENT) == 0) > - t = sh_single_quote (nl->word->word ? nl->word->word : ""); > - > -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 > ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 > -*************** > -*** 26,30 **** > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 3 > - > - #endif /* _PATCHLEVEL_H_ */ > ---- 26,30 ---- > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 4 > - > - #endif /* _PATCHLEVEL_H_ */ > diff --git a/package/bash/bash.hash b/package/bash/bash.hash > index 2e547c8c30..4660e9d38a 100644 > --- a/package/bash/bash.hash > +++ b/package/bash/bash.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature from > -# http://mirror.keystealth.org/gnu/bash/bash-5.1.tar.gz.sig > -sha256 cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.gz > +# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig > +sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/bash/bash.mk b/package/bash/bash.mk > index 7b853ece08..3aca22898e 100644 > --- a/package/bash/bash.mk > +++ b/package/bash/bash.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BASH_VERSION = 5.1 > +BASH_VERSION = 5.1.16 > BASH_SITE = $(BR2_GNU_MIRROR)/bash > BASH_DEPENDENCIES = ncurses readline host-bison > BASH_LICENSE = GPL-3.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 20 20:54:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:54:25 +0100 Subject: [Buildroot] [git commit] package/hwdata: bump version to 355 Message-ID: <20220120205513.8B52F82DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b61f0d74c9b91f225e1ec15766c572fe4c9e0b24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- 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 43cca03b06..7861106859 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ed9a2c8b90371ccf4f0ff88972d87770c1c644e63ca44d2ac72c33200642cdde hwdata-0.354.tar.gz +sha256 0d3d21af57822f35141b524808fd9e4823dbb413df338606195010dc0aa1c935 hwdata-0.355.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 71b59b95ed..4dd9c9e28e 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.354 +HWDATA_VERSION = 0.355 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 yann.morin.1998 at free.fr Thu Jan 20 20:54:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:54:28 +0100 Subject: [Buildroot] [git commit] package/hwloc: bump version to 2.7.0 Message-ID: <20220120205513.9912F82A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9757e7d99ec02f2464bbd4120c2c260d8bfc7e22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/open-mpi/hwloc/blob/hwloc-2.7.0/NEWS Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/hwloc/hwloc.hash | 4 ++-- package/hwloc/hwloc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index e207a6bb1a..ca77e3301c 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,4 +1,4 @@ -# From https://www.open-mpi.org/software/hwloc/v2.4/ -sha256 392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63 hwloc-2.4.1.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.7/ +sha256 028cee53ebcfe048283a2b3e87f2fa742c83645fc3ae329134bf5bb8b90384e0 hwloc-2.7.0.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 2a5a82cea4..04543a7e64 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,8 +4,8 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.4 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 +HWLOC_VERSION_MAJOR = 2.7 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause From angelo at amarulasolutions.com Thu Jan 20 21:19:41 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Thu, 20 Jan 2022 22:19:41 +0100 Subject: [Buildroot] [PATCH] package/htpdate: bump to version 1.3.3 Message-ID: <20220120211941.1033249-1-angelo@amarulasolutions.com> Update project to its new location and move to use the package provided init scripts. Signed-off-by: Angelo Compagnucci --- package/htpdate/S43htpdate | 51 --------------------------------- package/htpdate/htpdate.hash | 2 +- package/htpdate/htpdate.mk | 6 ++-- package/htpdate/htpdate.service | 13 --------- 4 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 package/htpdate/S43htpdate delete mode 100644 package/htpdate/htpdate.service diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate deleted file mode 100644 index 75f9a995ff..0000000000 --- a/package/htpdate/S43htpdate +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -DAEMON="htpdate" -PIDFILE="/var/run/$DAEMON.pid" - -HTPDATE_ARGS="-a -s -t https://google.com" -test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" - -start() { - printf 'Starting %s: ' "$DAEMON" - # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ - -- -D -i "$PIDFILE" $HTPDATE_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - start -} - -case "$1" in - start|stop|restart) - "$1";; - reload) - # Restart, since there is no true "reload" feature. - restart;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index c38e8784e1..ef27f8f94c 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 f6fb63b18a0d836fda721ae5655ae0b87055db1b582e98c4700f64e1ba5e2d5a htpdate-1.3.1.tar.gz +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index e9323f9106..3c4412b283 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTPDATE_VERSION = 1.3.1 +HTPDATE_VERSION = 1.3.3 HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE @@ -23,12 +23,12 @@ define HTPDATE_INSTALL_TARGET_CMDS endef define HTPDATE_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/htpdate/S43htpdate \ + $(INSTALL) -D -m 0755 $(@D)/scripts/htpdate.init \ $(TARGET_DIR)/etc/init.d/S43htpdate endef define HTPDATE_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/htpdate/htpdate.service \ + $(INSTALL) -D -m 0644 $(@D)/scripts/htpdate.service \ $(TARGET_DIR)/usr/lib/systemd/system/htpdate.service endef diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service deleted file mode 100644 index b7f1371b08..0000000000 --- a/package/htpdate/htpdate.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=htpdate daemon -After=network.target - -[Service] -Type=forking -PIDFile=/run/htpdate.pid -Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" -EnvironmentFile=-/etc/default/htpdate -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS - -[Install] -WantedBy=multi-user.target -- 2.25.1 From yann.morin.1998 at free.fr Thu Jan 20 21:29:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 22:29:16 +0100 Subject: [Buildroot] [PATCH v1] package/hwdata: bump version to 355 In-Reply-To: <20220120172139.25705-1-ps.report@gmx.net> References: <20220120172139.25705-1-ps.report@gmx.net> Message-ID: <20220120212916.GD3252931@scaer> Peter, All, On 2022-01-20 18:21 +0100, Peter Seiderer spake thusly: > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 43cca03b06..7861106859 100644 > --- a/package/hwdata/hwdata.hash > +++ b/package/hwdata/hwdata.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 ed9a2c8b90371ccf4f0ff88972d87770c1c644e63ca44d2ac72c33200642cdde hwdata-0.354.tar.gz > +sha256 0d3d21af57822f35141b524808fd9e4823dbb413df338606195010dc0aa1c935 hwdata-0.355.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE > diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk > index 71b59b95ed..4dd9c9e28e 100644 > --- a/package/hwdata/hwdata.mk > +++ b/package/hwdata/hwdata.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HWDATA_VERSION = 0.354 > +HWDATA_VERSION = 0.355 > HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) > HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 > HWDATA_LICENSE_FILES = COPYING LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ps.report at gmx.net Thu Jan 20 21:29:36 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 22:29:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> Message-ID: <20220120222936.6e7b5aba@gmx.net> Hello James, Yann, On Wed, 19 Jan 2022 17:42:46 -0700, James Hilliard wrote: > On Wed, Jan 19, 2022 at 1:45 PM Yann E. MORIN wrote: > > > > James, All, > > > > On 2022-01-19 01:45 -0700, James Hilliard spake thusly: > > > The cmake build appears to be missing features such as pkg-config > > > generation support, switch to the regular makefile based build > > > which appears to work better. > > > > Can't we just fix the CMakeList.txt and submit a patch upstream, > > instead? > > It looked like this had been brought up before and there was some issue that was > making this difficult to fix with cmake. > See: > https://github.com/google/re2/issues/349 > > > > > Also, see below... > > > > > Signed-off-by: James Hilliard > > > --- > > > package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- > > > 1 file changed, 26 insertions(+), 4 deletions(-) > > > > > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > > > index b562d5d7ef..144c82339f 100644 > > > --- a/package/re2/re2.mk > > > +++ b/package/re2/re2.mk > > > @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause > > > RE2_LICENSE_FILES = LICENSE > > > RE2_INSTALL_STAGING = YES > > > > > > -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > > -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > > +define RE2_BUILD_CMDS > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > + -C $(@D) > > > +endef > > > > > > -$(eval $(cmake-package)) > > > -$(eval $(host-cmake-package)) > > > +define RE2_INSTALL_STAGING_CMDS > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install > > > +endef > > > + > > > +define RE2_INSTALL_TARGET_CMDS > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install > > > > The 'install' target will forcibly build and install static and shared > > libs: > > > > https://github.com/google/re2/blob/main/Makefile#L297 > > > > 296: .PHONY: install > > 297: install: static-install shared-install > > > > So, this is probably going to not play nicely for builds where a shared > > build is not possible. > > Sent a v2 which should fix this: > https://patchwork.ozlabs.org/project/buildroot/patch/20220120003827.395469-1-james.hilliard1 at gmail.com/ > > > > > AFAICS, the cmake-based buildsystem got that one correct, though, so it > > would be a bit of a shame to regress on that point... > > Or keep the cmake build and do the following to install re2.pc (taken from #349, [1]): --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -9,9 +9,20 @@ RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES +# keep original Makefile (for re2.pc install) +RE2_SUPPORTS_IN_SOURCE_BUILD = NO RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON +# install re2.pc +define RE2_INSTALL_PKG_CONFIG + $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) \ + libdir=/usr/lib includedir=/usr/include \ + common-install +endef + +RE2_POST_INSTALL_STAGING_HOOKS += RE2_INSTALL_PKG_CONFIG + $(eval $(cmake-package)) $(eval $(host-cmake-package)) Regards, Peter [1] https://github.com/macports/macports-ports/pull/9836#issuecomment-807868854 > > Regards, > > Yann E. MORIN. > > > > > +endef > > > + > > > +define HOST_RE2_BUILD_CMDS > > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > > + -C $(@D) > > > +endef > > > + > > > +define HOST_RE2_INSTALL_CMDS > > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > > + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install > > > +endef > > > + > > > +$(eval $(generic-package)) > > > +$(eval $(host-generic-package)) > > > -- > > > 2.25.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > -- > > .-----------------.--------------------.------------------.--------------------. > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From yann.morin.1998 at free.fr Thu Jan 20 21:29:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 22:29:48 +0100 Subject: [Buildroot] [PATCH v1] package/hwloc: bump version to 2.7.0 In-Reply-To: <20220120174939.27055-1-ps.report@gmx.net> References: <20220120174939.27055-1-ps.report@gmx.net> Message-ID: <20220120212948.GE3252931@scaer> Peter, All, On 2022-01-20 18:49 +0100, Peter Seiderer spake thusly: > For details see [1]. > > [1] https://github.com/open-mpi/hwloc/blob/hwloc-2.7.0/NEWS > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/hwloc/hwloc.hash | 4 ++-- > package/hwloc/hwloc.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash > index e207a6bb1a..ca77e3301c 100644 > --- a/package/hwloc/hwloc.hash > +++ b/package/hwloc/hwloc.hash > @@ -1,4 +1,4 @@ > -# From https://www.open-mpi.org/software/hwloc/v2.4/ > -sha256 392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63 hwloc-2.4.1.tar.bz2 > +# From https://www.open-mpi.org/software/hwloc/v2.7/ > +sha256 028cee53ebcfe048283a2b3e87f2fa742c83645fc3ae329134bf5bb8b90384e0 hwloc-2.7.0.tar.bz2 > # Locally computed > sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING > diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk > index 2a5a82cea4..04543a7e64 100644 > --- a/package/hwloc/hwloc.mk > +++ b/package/hwloc/hwloc.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -HWLOC_VERSION_MAJOR = 2.4 > -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 > +HWLOC_VERSION_MAJOR = 2.7 > +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 > HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 > HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) > HWLOC_LICENSE = BSD-3-Clause > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ps.report at gmx.net Thu Jan 20 21:43:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 22:43:00 +0100 Subject: [Buildroot] [PATCH v1] package/readline: bump version to 8.1.2 Message-ID: <20220120214300.8626-1-ps.report@gmx.net> For details see [1]. [1] http://git.savannah.gnu.org/cgit/readline.git/log Signed-off-by: Peter Seiderer --- package/readline/readline.hash | 5 +++-- package/readline/readline.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/readline/readline.hash b/package/readline/readline.hash index 63172f1121..b0530a2d72 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,5 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 readline-8.1.tar.gz +# Locally calculated after checking pgp signature from +# https://ftp.gnu.org/gnu/readline/readline-8.1.2.tar.gz.sig +sha256 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 readline-8.1.2.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 06a96b67a8..b1fd181b78 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.1 +READLINE_VERSION = 8.1.2 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Jan 20 22:13:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 20 Jan 2022 23:13:32 +0100 Subject: [Buildroot] [PATCH v3] board/orangepi/orangepi-zero: bump Linux and U-Boot versions In-Reply-To: <20220120185043.7745-1-kuzminov.sergey81@gmail.com> References: <20220120185043.7745-1-kuzminov.sergey81@gmail.com> Message-ID: Hi Sergey, On 20/01/22 19:50, Sergey Kuzminov wrote: > v1: > - Linux: bump to version 5.12.19 (from 5.12.2). > - U-Boot: bump to version 2022.01 (from 2021.04). > - Added fast_commit for ext4. When creating a file system with this option, writing speeds up twice in some cases: https://lwn.net/Articles/834483/ > - Refactoring configs/orangepi_zero_defconfig. > - Switched to extlinux. > - Createed common scenarios for multiple boards to create an SD image: board/orangepi/common. > > v2: > - Linux: bump to version 5.16.1 (from 5.12.19) thanks to a patch from Giulio for xr819-xradio (link below). On (link below) use [1] instead and then... > - Added in genimage.cfg: partition rootfs {offset = 1M} to prevent possible alignment error. > - Added BR2_ARM_EABIHF=y to make it visible in the config file, previously added implicitly. > - Replaced BR2_ARM_FPU_VFPV4 with BR2_ARM_FPU_NEON_VFPV4 because processor supports it. > - Deleted BR2_GCC_ENABLE_LTO=y, added by mistake. > > v3: > - Changed the name of the patch (from board/orangepi/orangepi-zero:extlinux, refactoring). > - Linux: bump to version 5.16.2 (from 5.16.1). > - Returned (# BR2_TARGET_ROOTFS_TAR is not set) instead of (BR2_TARGET_ROOTFS_TAR=n), added in v1. > - Renamed file uboot-extras.config -> uboot-extras.fragment. > - Renamed file linux-extras.config -> linux-extras.fragment. > - Deleted (#BR2_ARM_INSTRUCTIONS_THUMB2=y), added in v2. > > Patch required to work: > https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ ...put here: [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ > > Signed-off-by: Sergey Kuzminov --- all V1->V2, V2->V3 changes go here with the 3 dashes above And you need to keep V1 as commit log, not listing it here, so it has to summarize what this patch does. I'm wondering if maybe it makes sense to split it up to more than one patch. You're doing lot of stuff in this patch that can be bisectable even with different patches. So please try to move some changes into other patches and keep this one doing what the subject tells: bump Linux and U-Boot versions > --- > board/orangepi/common/extlinux.conf | 5 ++ > board/orangepi/common/genimage.cfg | 20 ++++++ > board/orangepi/common/post-build.sh | 34 ++++++++++ > board/orangepi/common/uboot-extras.fragment | 3 + > board/orangepi/orangepi-zero/boot.cmd | 9 --- > board/orangepi/orangepi-zero/genimage.cfg | 36 ---------- > ...ux-extras.config => linux-extras.fragment} | 0 > configs/orangepi_zero_defconfig | 68 +++++++++++-------- > 8 files changed, 103 insertions(+), 72 deletions(-) > create mode 100644 board/orangepi/common/extlinux.conf > create mode 100644 board/orangepi/common/genimage.cfg > create mode 100755 board/orangepi/common/post-build.sh > create mode 100644 board/orangepi/common/uboot-extras.fragment > delete mode 100644 board/orangepi/orangepi-zero/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg > rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) > > diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf > new file mode 100644 > index 0000000000..015f29270e > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,5 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + append root=PARTUUID=%PARTUUID% rootwait console=${console} > +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..8b80ffb138 > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = gpt > + gpt-no-backup = true > + gpt-location = 1008K # 1MB - 16KB > + } > + > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB - 16KB > + } > + > + partition rootfs { > + offset = 1M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} Here you add a common genimage.cfg, so another patch(including the removal of the one specific genimage.cfg below) > diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh > new file mode 100755 > index 0000000000..296f94b174 > --- /dev/null > +++ b/board/orangepi/common/post-build.sh > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +linux_image() > +{ > + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then > + echo "uImage" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then > + echo "Image" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then > + echo "Image.gz" > + else > + echo "zImage" > + fi > +} > + > +generic_getty() > +{ > + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then > + echo "" > + else > + echo "s/\s*console=\S*//" > + fi > +} > + > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > + > +sed -e "$(generic_getty)" \ > + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ > + -e "s/%PARTUUID%/$PARTUUID/g" \ > + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > + > +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" here ^^^ you add the post-build.sh and including its defconfig option should be another patch. And this should go with the adding of extlinux.conf above because it's related. > diff --git a/board/orangepi/common/uboot-extras.fragment b/board/orangepi/common/uboot-extras.fragment > new file mode 100644 > index 0000000000..5aa97523d9 > --- /dev/null > +++ b/board/orangepi/common/uboot-extras.fragment > @@ -0,0 +1,3 @@ > +CONFIG_BOOTDELAY=0 > +CONFIG_USE_PREBOOT=y > +CONFIG_PREBOOT="setenv preboot;" > diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd > deleted file mode 100644 > index d094a64fe5..0000000000 > --- a/board/orangepi/orangepi-zero/boot.cmd > +++ /dev/null > @@ -1,9 +0,0 @@ > -setenv fdt_high ffffffff > - > -part uuid mmc 0:2 uuid > -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r This ^^^ must be added to extlinux.conf replacing patch. > diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg > deleted file mode 100644 > index 32f5454ae6..0000000000 > --- a/board/orangepi/orangepi-zero/genimage.cfg > +++ /dev/null > @@ -1,36 +0,0 @@ > -# Minimal SD card image for the OrangePi Zero > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h2-plus-orangepi-zero.dtb", > - "boot.scr" > - } > - } > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment > similarity index 100% > rename from board/orangepi/orangepi-zero/linux-extras.config > rename to board/orangepi/orangepi-zero/linux-extras.fragment > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..430d38af3e 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,49 +1,63 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > -BR2_ARM_FPU_VFPV4=y > +BR2_ARM_EABIHF=y > +BR2_ARM_FPU_NEON_VFPV4=y This FPU stuff ^^^ is another patch > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" > -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -# BR2_TARGET_ROOTFS_TAR is not set > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > -BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y Here ^^^ you move lines down, and there can be a patch for only reordering stuff, 1 for uboot and 1 for linux. > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.fragment" This ^^^ goes with uboot-extras.fragment common patch > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.2" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y This ^^^ is ok, but you also moved the lines > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > +# BR2_TARGET_ROOTFS_TAR is not set This ^^^ ? If there is a reason is another patch, and ofc the removal of # not set goes together > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cf > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_GENIMAGE=y This ^^^ goes with common genimage.cfg patch > > -# wireless driver and firmware > +# Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > BR2_PACKAGE_ARMBIAN_FIRMWARE=y > BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y > > -# wireless support > +# Wireless support > BR2_PACKAGE_IW=y > BR2_PACKAGE_WIRELESS_TOOLS=y > BR2_PACKAGE_WIRELESS_TOOLS_LIB=y > @@ -51,5 +65,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > > -# spi flash support > +# Spi flash support > BR2_PACKAGE_MTD=y > Various comment capitalizing is another patch. So I would expect a patchset with like 6/7 patches. Otherwise you move a lot of stuff all in once. But keep in mind that it must be bisectable, so this defconfig has to produce something working after applying every single patch. Kind regards! -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Jan 20 22:14:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 20 Jan 2022 23:14:38 +0100 Subject: [Buildroot] [PATCH v3] board/orangepi/orangepi-zero: bump Linux and U-Boot versions In-Reply-To: References: <20220120185043.7745-1-kuzminov.sergey81@gmail.com> Message-ID: <4a5824ea-2704-d3bd-9b76-ac6f629be230@benettiengineering.com> Ah, sorry for top-posting. Please put me in Cc on next iteration. Thank you :-) -- Giulio Benetti Benetti Engineering sas On 20/01/22 23:13, Giulio Benetti wrote: > Hi Sergey, > > On 20/01/22 19:50, Sergey Kuzminov wrote: >> v1: >> - Linux: bump to version 5.12.19 (from 5.12.2). >> - U-Boot: bump to version 2022.01 (from 2021.04). >> - Added fast_commit for ext4. When creating a file system with this option, writing speeds up twice in some cases: https://lwn.net/Articles/834483/ >> - Refactoring configs/orangepi_zero_defconfig. >> - Switched to extlinux. >> - Createed common scenarios for multiple boards to create an SD image: board/orangepi/common. >> >> v2: >> - Linux: bump to version 5.16.1 (from 5.12.19) thanks to a patch from Giulio for xr819-xradio (link below). > > On (link below) use [1] instead and then... > >> - Added in genimage.cfg: partition rootfs {offset = 1M} to prevent possible alignment error. >> - Added BR2_ARM_EABIHF=y to make it visible in the config file, previously added implicitly. >> - Replaced BR2_ARM_FPU_VFPV4 with BR2_ARM_FPU_NEON_VFPV4 because processor supports it. >> - Deleted BR2_GCC_ENABLE_LTO=y, added by mistake. >> >> v3: >> - Changed the name of the patch (from board/orangepi/orangepi-zero:extlinux, refactoring). >> - Linux: bump to version 5.16.2 (from 5.16.1). >> - Returned (# BR2_TARGET_ROOTFS_TAR is not set) instead of (BR2_TARGET_ROOTFS_TAR=n), added in v1. >> - Renamed file uboot-extras.config -> uboot-extras.fragment. >> - Renamed file linux-extras.config -> linux-extras.fragment. >> - Deleted (#BR2_ARM_INSTRUCTIONS_THUMB2=y), added in v2. >> >> Patch required to work: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ > > ...put here: > [1]: > https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ > >> >> Signed-off-by: Sergey Kuzminov > > --- > all V1->V2, V2->V3 changes go here with the 3 dashes above > And you need to keep V1 as commit log, not listing it here, so it has to > summarize what this patch does. I'm wondering if maybe it makes sense to > split it up to more than one patch. You're doing lot of stuff in this > patch that can be bisectable even with different patches. So please try > to move some changes into other patches and keep this one doing what the > subject tells: > bump Linux and U-Boot versions > >> --- >> board/orangepi/common/extlinux.conf | 5 ++ >> board/orangepi/common/genimage.cfg | 20 ++++++ >> board/orangepi/common/post-build.sh | 34 ++++++++++ >> board/orangepi/common/uboot-extras.fragment | 3 + >> board/orangepi/orangepi-zero/boot.cmd | 9 --- >> board/orangepi/orangepi-zero/genimage.cfg | 36 ---------- >> ...ux-extras.config => linux-extras.fragment} | 0 >> configs/orangepi_zero_defconfig | 68 +++++++++++-------- >> 8 files changed, 103 insertions(+), 72 deletions(-) >> create mode 100644 board/orangepi/common/extlinux.conf >> create mode 100644 board/orangepi/common/genimage.cfg >> create mode 100755 board/orangepi/common/post-build.sh >> create mode 100644 board/orangepi/common/uboot-extras.fragment >> delete mode 100644 board/orangepi/orangepi-zero/boot.cmd >> delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg >> rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) >> >> diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf >> new file mode 100644 >> index 0000000000..015f29270e >> --- /dev/null >> +++ b/board/orangepi/common/extlinux.conf >> @@ -0,0 +1,5 @@ >> +LABEL default >> + kernel /boot/%LINUXIMAGE% >> + devicetreedir /boot >> + append root=PARTUUID=%PARTUUID% rootwait console=${console} >> +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 >> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >> new file mode 100644 >> index 0000000000..8b80ffb138 >> --- /dev/null >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,20 @@ >> +image sdcard.img { >> + hdimage { >> + partition-table-type = gpt >> + gpt-no-backup = true >> + gpt-location = 1008K # 1MB - 16KB >> + } >> + >> + partition u-boot { >> + in-partition-table = false >> + image = "u-boot-sunxi-with-spl.bin" >> + offset = 8K >> + size = 1000K # 1MB - 8KB - 16KB >> + } >> + >> + partition rootfs { >> + offset = 1M >> + image = "rootfs.ext4" >> + partition-uuid = %PARTUUID% >> + } >> +} > > Here you add a common genimage.cfg, so another patch(including the > removal of the one specific genimage.cfg below) > >> diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh >> new file mode 100755 >> index 0000000000..296f94b174 >> --- /dev/null >> +++ b/board/orangepi/common/post-build.sh >> @@ -0,0 +1,34 @@ >> +#!/bin/sh >> + >> +linux_image() >> +{ >> + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then >> + echo "uImage" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then >> + echo "Image" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then >> + echo "Image.gz" >> + else >> + echo "zImage" >> + fi >> +} >> + >> +generic_getty() >> +{ >> + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then >> + echo "" >> + else >> + echo "s/\s*console=\S*//" >> + fi >> +} >> + >> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >> + >> +install -d "$TARGET_DIR/boot/extlinux/" >> + >> +sed -e "$(generic_getty)" \ >> + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ >> + -e "s/%PARTUUID%/$PARTUUID/g" \ >> + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >> + >> +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > > here ^^^ you add the post-build.sh and including its defconfig option > should be another patch. And this should go with the adding of > extlinux.conf above because it's related. > >> diff --git a/board/orangepi/common/uboot-extras.fragment b/board/orangepi/common/uboot-extras.fragment >> new file mode 100644 >> index 0000000000..5aa97523d9 >> --- /dev/null >> +++ b/board/orangepi/common/uboot-extras.fragment >> @@ -0,0 +1,3 @@ >> +CONFIG_BOOTDELAY=0 >> +CONFIG_USE_PREBOOT=y >> +CONFIG_PREBOOT="setenv preboot;" >> diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd >> deleted file mode 100644 >> index d094a64fe5..0000000000 >> --- a/board/orangepi/orangepi-zero/boot.cmd >> +++ /dev/null >> @@ -1,9 +0,0 @@ >> -setenv fdt_high ffffffff >> - >> -part uuid mmc 0:2 uuid >> -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait >> - >> -fatload mmc 0 $kernel_addr_r zImage >> -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb >> - >> -bootz $kernel_addr_r - $fdt_addr_r > > This ^^^ must be added to extlinux.conf replacing patch. > >> diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg >> deleted file mode 100644 >> index 32f5454ae6..0000000000 >> --- a/board/orangepi/orangepi-zero/genimage.cfg >> +++ /dev/null >> @@ -1,36 +0,0 @@ >> -# Minimal SD card image for the OrangePi Zero >> -# >> -image boot.vfat { >> - vfat { >> - files = { >> - "zImage", >> - "sun8i-h2-plus-orangepi-zero.dtb", >> - "boot.scr" >> - } >> - } >> - size = 10M >> -} >> - >> -image sdcard.img { >> - hdimage { >> - } >> - >> - partition u-boot { >> - in-partition-table = "no" >> - image = "u-boot-sunxi-with-spl.bin" >> - offset = 8K >> - size = 1016K # 1MB - 8KB >> - } >> - >> - partition boot { >> - partition-type = 0xC >> - bootable = "true" >> - image = "boot.vfat" >> - } >> - >> - partition rootfs { >> - partition-type = 0x83 >> - image = "rootfs.ext4" >> - size = 512M >> - } >> -} >> diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment >> similarity index 100% >> rename from board/orangepi/orangepi-zero/linux-extras.config >> rename to board/orangepi/orangepi-zero/linux-extras.fragment >> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >> index 1c107b10e6..430d38af3e 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -1,49 +1,63 @@ >> +# Architecture >> BR2_arm=y >> BR2_cortex_a7=y >> -BR2_ARM_FPU_VFPV4=y >> +BR2_ARM_EABIHF=y >> +BR2_ARM_FPU_NEON_VFPV4=y > > This FPU stuff ^^^ is another patch > >> + >> +# System >> +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >> -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> BR2_SYSTEM_DHCP="eth0" >> -BR2_LINUX_KERNEL=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" >> -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> -BR2_LINUX_KERNEL_DTS_SUPPORT=y >> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> -BR2_TARGET_ROOTFS_EXT2=y >> -BR2_TARGET_ROOTFS_EXT2_4=y >> -# BR2_TARGET_ROOTFS_TAR is not set > > > >> + >> +# Bootloader >> BR2_TARGET_UBOOT=y >> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" >> -BR2_PACKAGE_HOST_DOSFSTOOLS=y >> -BR2_PACKAGE_HOST_GENIMAGE=y >> -BR2_PACKAGE_HOST_MTOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > Here ^^^ you move lines down, and there can be a patch for only > reordering stuff, 1 for uboot and 1 for linux. > >> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.fragment" > > This ^^^ goes with uboot-extras.fragment common patch > >> + >> +# Kernel >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.2" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > This ^^^ is ok, but you also moved the lines > >> + >> +# Filesystem >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> +# BR2_TARGET_ROOTFS_TAR is not set > > This ^^^ ? If there is a reason is another patch, and ofc the removal of > # not set goes together > >> + >> +# Image >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cf > + >> +# Required tools to create the SD image >> +BR2_PACKAGE_HOST_GENIMAGE=y > > This ^^^ goes with common genimage.cfg patch > >> >> -# wireless driver and firmware >> +# Wireless driver and firmware >> BR2_PACKAGE_XR819_XRADIO=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >> >> -# wireless support >> +# Wireless support >> BR2_PACKAGE_IW=y >> BR2_PACKAGE_WIRELESS_TOOLS=y >> BR2_PACKAGE_WIRELESS_TOOLS_LIB=y >> @@ -51,5 +65,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y >> BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y >> BR2_PACKAGE_WPA_SUPPLICANT_CLI=y >> >> -# spi flash support >> +# Spi flash support >> BR2_PACKAGE_MTD=y >> > > Various comment capitalizing is another patch. > > So I would expect a patchset with like 6/7 patches. > > Otherwise you move a lot of stuff all in once. > But keep in mind that it must be bisectable, so this defconfig has to > produce something working after applying every single patch. > > Kind regards! > From james.hilliard1 at gmail.com Thu Jan 20 23:57:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 20 Jan 2022 16:57:22 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220120222936.6e7b5aba@gmx.net> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> Message-ID: On Thu, Jan 20, 2022 at 2:29 PM Peter Seiderer wrote: > > Hello James, Yann, > > On Wed, 19 Jan 2022 17:42:46 -0700, James Hilliard wrote: > > > On Wed, Jan 19, 2022 at 1:45 PM Yann E. MORIN wrote: > > > > > > James, All, > > > > > > On 2022-01-19 01:45 -0700, James Hilliard spake thusly: > > > > The cmake build appears to be missing features such as pkg-config > > > > generation support, switch to the regular makefile based build > > > > which appears to work better. > > > > > > Can't we just fix the CMakeList.txt and submit a patch upstream, > > > instead? > > > > It looked like this had been brought up before and there was some issue that was > > making this difficult to fix with cmake. > > See: > > https://github.com/google/re2/issues/349 > > > > > > > > Also, see below... > > > > > > > Signed-off-by: James Hilliard > > > > --- > > > > package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- > > > > 1 file changed, 26 insertions(+), 4 deletions(-) > > > > > > > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > > > > index b562d5d7ef..144c82339f 100644 > > > > --- a/package/re2/re2.mk > > > > +++ b/package/re2/re2.mk > > > > @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause > > > > RE2_LICENSE_FILES = LICENSE > > > > RE2_INSTALL_STAGING = YES > > > > > > > > -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > > > -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > > > +define RE2_BUILD_CMDS > > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > > + -C $(@D) > > > > +endef > > > > > > > > -$(eval $(cmake-package)) > > > > -$(eval $(host-cmake-package)) > > > > +define RE2_INSTALL_STAGING_CMDS > > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > > + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install > > > > +endef > > > > + > > > > +define RE2_INSTALL_TARGET_CMDS > > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > > + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install > > > > > > The 'install' target will forcibly build and install static and shared > > > libs: > > > > > > https://github.com/google/re2/blob/main/Makefile#L297 > > > > > > 296: .PHONY: install > > > 297: install: static-install shared-install > > > > > > So, this is probably going to not play nicely for builds where a shared > > > build is not possible. > > > > Sent a v2 which should fix this: > > https://patchwork.ozlabs.org/project/buildroot/patch/20220120003827.395469-1-james.hilliard1 at gmail.com/ > > > > > > > > AFAICS, the cmake-based buildsystem got that one correct, though, so it > > > would be a bit of a shame to regress on that point... > > > > > Or keep the cmake build and do the following to install re2.pc (taken from #349, [1]): > > --- a/package/re2/re2.mk > +++ b/package/re2/re2.mk > @@ -9,9 +9,20 @@ RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) > RE2_LICENSE = BSD-3-Clause > RE2_LICENSE_FILES = LICENSE > RE2_INSTALL_STAGING = YES > +# keep original Makefile (for re2.pc install) > +RE2_SUPPORTS_IN_SOURCE_BUILD = NO > > RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > +# install re2.pc > +define RE2_INSTALL_PKG_CONFIG > + $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) \ > + libdir=/usr/lib includedir=/usr/include \ > + common-install > +endef > + > +RE2_POST_INSTALL_STAGING_HOOKS += RE2_INSTALL_PKG_CONFIG > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) > > Regards, > Peter > > [1] https://github.com/macports/macports-ports/pull/9836#issuecomment-807868854 There's a problem with this approach, the makefile with common-install gets overwritten by the one generated by cmake if cmake is used. > > > > > Regards, > > > Yann E. MORIN. > > > > > > > +endef > > > > + > > > > +define HOST_RE2_BUILD_CMDS > > > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > > > + -C $(@D) > > > > +endef > > > > + > > > > +define HOST_RE2_INSTALL_CMDS > > > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > > > + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install > > > > +endef > > > > + > > > > +$(eval $(generic-package)) > > > > +$(eval $(host-generic-package)) > > > > -- > > > > 2.25.1 > > > > > > > > _______________________________________________ > > > > buildroot mailing list > > > > buildroot at buildroot.org > > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > -- > > > .-----------------.--------------------.------------------.--------------------. > > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > > '------------------------------^-------^------------------^--------------------' > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From thomas.petazzoni at bootlin.com Fri Jan 21 06:58:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 06:58:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-20 Message-ID: <20220121065839.53738401ED@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-20 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 59 | 7 | 0 | 66 | 2021.11.x | 20 | 3 | 0 | 23 | master | 96 | 30 | 0 | 126 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 5 gvfs-1.48.1 | 3 frr-8.1 | 2 unknown | 2 wavemon-0.9.4 | 2 bat-0.18.3 | 1 belle-sip-4.4.8 | 1 bluez5_utils-5.63 | 1 boinc-7.18.1 | 1 cryptopp-8.6.0 | 1 guile-3.0.7 | 1 hiawatha-11.1 | 1 ksmbd-tools-3.4.3 | 1 libupnp-1.14.12 | 1 log4cxx-0.12.0 | 1 mpv-0.33.1 | 1 pulseview-0.4.2 | 1 qt5webkit-5.212.0-alpha4 | 1 ruby-3.1.0 | 1 vlc-3.0.16 | 1 vte-0.66.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/c47b98659910c7c689d1d961f7b728500d796984 | xtensa | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/ccf41f643b7a8049c9439f27e9d5907b58275efe | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4e2bb98d2d15438de8269c56272a59d8c5243adb | riscv64 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/c351826f86703570d0f428efce22074997f65b73 | nds32le | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/fa90b416a219a512a482e7dc63e2d72b184307c7 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7f17048efeea993cd7bc9d6eae93ee9547f12d5f | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/51e9218d25b8df1a1dda7b79808cb9e971ae4415 | riscv64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/3ae75d1820dff4e5c2c9b9055152d534c837002e | ORPH i586 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/8d2208e20f2bd9a7bcdc710af2b8694ad0e3626e | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/b2e95f9a8bee1f880a586dee2747815da2b85cb7 | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/4935f221124b905f678197d3f157fe9dee6ae5de | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/8fd8984bc1333c709e1c77e89e5f7db14bc1a52b | sparc64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/28376a96e86cbec4475c2e197f4f56b0cd4471cf | or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/6e3d9c5100bd14d5b2493129466e72c374c1bfd6 | xtensa | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/1c171e503c4e9562ef8670fad8d1b90d591a423c | powerpc64 | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/120d767732c04cf234b4f34503bbf16e57e08b96 | mipsel | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/5fd00cc3fe3ddf64d9114f21314c0039b74e3705 | i586 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/1bfc49cdd3a6279af93666ef9d905c3038c107a7 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/f55217299d5a42d828e7c95b642b49546cc03023 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ee1486b60197610f1a7af2efc86bea9abe4a416e | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d1b328da9dab68820adba22cd7e1b7b66abfd0d5 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d33fd6bcb9d0fe19493120d0cce6b1c10d9ad12e | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c3cdec79b7bd843d297ab4192fd2c3c66c7f13d3 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/0709a19115a6f3dbc6856f9ab609a2e717f12bfc | arm | unknown | NOK | http://autobuild.buildroot.net/results/0d9121e3bc38ddced115577dddf02f507aa92450 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/7eaaeb71ba24bd3320635073add057ca3fdbd9cd | x86_64 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/c4d17e415fd47c6490a94a812a9f51e968c7ca0b | mips64el | vte-0.66.2 | NOK | http://autobuild.buildroot.net/results/c0d1adeffbf97805a0f669d01929a56ccc66a835 | ORPH sh4 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/80d7e489219c49295bedb1307b33155eda76b80e | arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/de7e6e4b716dbc4396240b47eb2a777a8ade65f4 | Classification of failures by reason for 2021.02.x -------------------------------------------------- cutelyst-2.11.0 | 1 gobject-introspection-1.64.1 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 openvmtools-10.3.5-10430147 | 1 qt5location-5.15.2 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | cutelyst-2.11.0 | NOK | http://autobuild.buildroot.net/results/04b74af572ed66e8b7e1015605e90642810d6782 | x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/4797658d048163234d0fa69a1d87eb0083bf5444 | ORPH x86_64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/8aac0258be9ab18f26dc5ae072a25d8c6fb8075c | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/8780ca6ac97742e93b7c9ff0685ddd9acfb59650 | i586 | openvmtools-10.3.5-10430147 | NOK | http://autobuild.buildroot.net/results/d144cda2264f04d7074a3af1c5e15baa2e537a26 | arm | qt5location-5.15.2 | NOK | http://autobuild.buildroot.net/results/24bc8aedcc5c678429871933e40553c70dd84d5b | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/a58134722c19c9a4533b398a7c6c4e070cfffaed | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 libtheora-1.1.1 | 1 ndisc6-1.0.5 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/281532d1c0cabdd3b7c7109d96e307fafc551644 | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/a24f123d9a32aced63487234c9f72ecf0464a391 | ORPH arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/cb78d8ecb0ab38e1b866f855e7ab29da314e1324 | ORPH Gitlab CI results for 2022-01-20 ================================ -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Fri Jan 21 06:58:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 07:58:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> Message-ID: <20220121065850.GF3252931@scaer> James, All, On 2022-01-20 16:57 -0700, James Hilliard spake thusly: > On Thu, Jan 20, 2022 at 2:29 PM Peter Seiderer wrote: > > Or keep the cmake build and do the following to install re2.pc (taken from #349, [1]): > > > > --- a/package/re2/re2.mk > > +++ b/package/re2/re2.mk > > @@ -9,9 +9,20 @@ RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) > > RE2_LICENSE = BSD-3-Clause > > RE2_LICENSE_FILES = LICENSE > > RE2_INSTALL_STAGING = YES > > +# keep original Makefile (for re2.pc install) > > +RE2_SUPPORTS_IN_SOURCE_BUILD = NO > > > > RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > > > +# install re2.pc > > +define RE2_INSTALL_PKG_CONFIG > > + $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) \ > > + libdir=/usr/lib includedir=/usr/include \ > > + common-install > > +endef > > + > > +RE2_POST_INSTALL_STAGING_HOOKS += RE2_INSTALL_PKG_CONFIG > > + > > $(eval $(cmake-package)) > > $(eval $(host-cmake-package)) > > > > Regards, > > Peter > > > > [1] https://github.com/macports/macports-ports/pull/9836#issuecomment-807868854 > > There's a problem with this approach, the makefile with common-install > gets overwritten > by the one generated by cmake if cmake is used. It currently gets overwritten, because the build is done in-tree, but What Peter suggests is doing the build out-of-tree, with: RE2_SUPPORTS_IN_SOURCE_BUILD = NO However, I can't say that I am very fond of this option either. Misinx the two buildsystems looks icky... What bothers me a bit, is that common-install also installs the headers, not just the re2.pc, so this could, even if unlikely, conflict with what the cmake-side would do. But when looking at the various bugs about this issue: https://github.com/google/re2/issues/349 -> https://github.com/google/re2/issues/304#issuecomment-808219200 -> https://github.com/macports/macports-ports/pull/9836 re2: change to cmake build to support gprc, which currently needs a cmake version of re2 to build. Try to make it work like the previous autotools build worked. So, that last issue, against homebrew, is interesting: it seems that using the Makefile-based buildsystem is not enough, because it does not isntall the cmake equivalent of re2.pc, which breaks grpc. So, whether we keep the cmake build, or switch to the Makefile build, we would eventually still miss some pieces... Damn, back to square-one... So, I think that Peter's proposal is not so un-appealing, in then end. But then in such situation, I think it would be simpler for us to just apply something like: define RE2_INSTALL_PC $(INTALL) -d -m 0644 $(@D)/re2.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc $(SED) 's, at includedir@,/usr/include,; s, at libdir@,/usr/lib,' \ $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc endef RE2_POST_STAGING_INSTALL_HOOKS += RE2_INSTALL_PC And be done with it: minimal change to the re2 package, no dual-buildsystem situation and thus no install conflict on the headers, usual and simple post-install hook. Thoughts? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Fri Jan 21 07:41:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 08:41:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121065850.GF3252931@scaer> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> Message-ID: <20220121084141.6eac525e@windsurf> On Fri, 21 Jan 2022 07:58:50 +0100 "Yann E. MORIN" wrote: > So, I think that Peter's proposal is not so un-appealing, in then end. > But then in such situation, I think it would be simpler for us to just > apply something like: > > define RE2_INSTALL_PC > $(INTALL) -d -m 0644 $(@D)/re2.pc \ > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > $(SED) 's, at includedir@,/usr/include,; s, at libdir@,/usr/lib,' \ > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > endef > RE2_POST_STAGING_INSTALL_HOOKS += RE2_INSTALL_PC > > And be done with it: minimal change to the re2 package, no dual-buildsystem > situation and thus no install conflict on the headers, usual and simple > post-install hook. I might be missing something in the whole discussion, but why not patch the CMake build system so that it also installs this .pc file, and contribute this fix upstream ? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 21 07:50:45 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 08:50:45 +0100 Subject: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware In-Reply-To: <20220119212206.1ACA681763@busybox.osuosl.org> References: <20220119212206.1ACA681763@busybox.osuosl.org> Message-ID: <20220121085045.2e375b6c@windsurf> Hello, On Wed, 19 Jan 2022 22:24:11 +0100 Yann E. MORIN wrote: > ################################################################################ > # > -# rpi-wifi-firmware > +# brcmfmac_sdio-firmware-rpi A quick nitpicking comment: I tend to dislike _ in package names, and even more so when it's mixed with - in the package name. As it doesn't affect the Config.in option name, perhaps it's still time to adjust this to brcmfmac-sdio-firmware-rpi ? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Fri Jan 21 07:59:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 08:59:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121084141.6eac525e@windsurf> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> <20220121084141.6eac525e@windsurf> Message-ID: <20220121075924.GG3252931@scaer> Thomas, All, On 2022-01-21 08:41 +0100, Thomas Petazzoni spake thusly: > On Fri, 21 Jan 2022 07:58:50 +0100 > "Yann E. MORIN" wrote: > > > So, I think that Peter's proposal is not so un-appealing, in then end. > > But then in such situation, I think it would be simpler for us to just > > apply something like: > > > > define RE2_INSTALL_PC > > $(INTALL) -d -m 0644 $(@D)/re2.pc \ > > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > > $(SED) 's, at includedir@,/usr/include,; s, at libdir@,/usr/lib,' \ > > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > > endef > > RE2_POST_STAGING_INSTALL_HOOKS += RE2_INSTALL_PC > > > > And be done with it: minimal change to the re2 package, no dual-buildsystem > > situation and thus no install conflict on the headers, usual and simple > > post-install hook. > > I might be missing something in the whole discussion, but why not patch > the CMake build system so that it also installs this .pc file, and > contribute this fix upstream ? Because upstream have not been very enthusisatic about it, as James pointed out when I suggested the same. ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 21 08:04:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 09:04:56 +0100 Subject: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware In-Reply-To: <20220121085045.2e375b6c@windsurf> References: <20220119212206.1ACA681763@busybox.osuosl.org> <20220121085045.2e375b6c@windsurf> Message-ID: <20220121080456.GH3252931@scaer> Thomas, All, On 2022-01-21 08:50 +0100, Thomas Petazzoni spake thusly: > On Wed, 19 Jan 2022 22:24:11 +0100 > Yann E. MORIN wrote: > > > ################################################################################ > > # > > -# rpi-wifi-firmware > > +# brcmfmac_sdio-firmware-rpi > A quick nitpicking comment: I tend to dislike _ in package names, and > even more so when it's mixed with - in the package name. As it doesn't > affect the Config.in option name, perhaps it's still time to adjust > this to brcmfmac-sdio-firmware-rpi ? I don't like it much either. But the reason for the rename was to match the upstream name, which is exactly what we suggest in the manual, and that we argue for most of the time. And we also already had bluez5_utils-headers and xutil_util-macros, and 78 packages in package/x11r7/ Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Fri Jan 21 09:17:00 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 21 Jan 2022 02:17:00 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121065850.GF3252931@scaer> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> Message-ID: On Thu, Jan 20, 2022 at 11:58 PM Yann E. MORIN wrote: > > James, All, > > On 2022-01-20 16:57 -0700, James Hilliard spake thusly: > > On Thu, Jan 20, 2022 at 2:29 PM Peter Seiderer wrote: > > > Or keep the cmake build and do the following to install re2.pc (taken from #349, [1]): > > > > > > --- a/package/re2/re2.mk > > > +++ b/package/re2/re2.mk > > > @@ -9,9 +9,20 @@ RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) > > > RE2_LICENSE = BSD-3-Clause > > > RE2_LICENSE_FILES = LICENSE > > > RE2_INSTALL_STAGING = YES > > > +# keep original Makefile (for re2.pc install) > > > +RE2_SUPPORTS_IN_SOURCE_BUILD = NO > > > > > > RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > > HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > > > > > +# install re2.pc > > > +define RE2_INSTALL_PKG_CONFIG > > > + $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) \ > > > + libdir=/usr/lib includedir=/usr/include \ > > > + common-install > > > +endef > > > + > > > +RE2_POST_INSTALL_STAGING_HOOKS += RE2_INSTALL_PKG_CONFIG > > > + > > > $(eval $(cmake-package)) > > > $(eval $(host-cmake-package)) > > > > > > Regards, > > > Peter > > > > > > [1] https://github.com/macports/macports-ports/pull/9836#issuecomment-807868854 > > > > There's a problem with this approach, the makefile with common-install > > gets overwritten > > by the one generated by cmake if cmake is used. > > It currently gets overwritten, because the build is done in-tree, but > What Peter suggests is doing the build out-of-tree, with: > RE2_SUPPORTS_IN_SOURCE_BUILD = NO > > However, I can't say that I am very fond of this option either. Misinx > the two buildsystems looks icky... What bothers me a bit, is that > common-install also installs the headers, not just the re2.pc, so this > could, even if unlikely, conflict with what the cmake-side would do. > > But when looking at the various bugs about this issue: > > https://github.com/google/re2/issues/349 > -> https://github.com/google/re2/issues/304#issuecomment-808219200 > -> https://github.com/macports/macports-ports/pull/9836 > > re2: change to cmake build to support gprc, which currently needs a > cmake version of re2 to build. Try to make it work like the previous > autotools build worked. > > So, that last issue, against homebrew, is interesting: it seems that > using the Makefile-based buildsystem is not enough, because it does not > isntall the cmake equivalent of re2.pc, which breaks grpc. That appears to have been fixed: https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186 > > So, whether we keep the cmake build, or switch to the Makefile build, we > would eventually still miss some pieces... > > Damn, back to square-one... > > So, I think that Peter's proposal is not so un-appealing, in then end. > But then in such situation, I think it would be simpler for us to just > apply something like: > > define RE2_INSTALL_PC > $(INTALL) -d -m 0644 $(@D)/re2.pc \ > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > $(SED) 's, at includedir@,/usr/include,; s, at libdir@,/usr/lib,' \ > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > endef > RE2_POST_STAGING_INSTALL_HOOKS += RE2_INSTALL_PC > > And be done with it: minimal change to the re2 package, no dual-buildsystem > situation and thus no install conflict on the headers, usual and simple > post-install hook. > > Thoughts? > > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Fri Jan 21 10:14:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 21 Jan 2022 11:14:53 +0100 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: <48d2b6c8-356d-419a-c284-e2184509d1c5@gmail.com> References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> <48d2b6c8-356d-419a-c284-e2184509d1c5@gmail.com> Message-ID: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> Hi All, please drop this patch since the local patch has been upstreamed: https://github.com/fifteenhex/xradio/commit/4873746fa9d42a8edbc1e192899e00c29ed3d32a So I'm going to send a package bump soon that I ask Sergey to test. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas On 18/01/22 19:10, Sergey Kuzminov wrote: > Tested-by: Sergey Kuzminov > > 18.01.2022 20:53, Giulio Benetti ?????: >> Hi Sergey, >> >> On 18/01/22 18:45, Sergey Kuzminov wrote: >>> Hi All, Giulio. >>> I checked the patch, everything works. >> >> Can you please place your: >> Tested-by: Name Surname >> ? >> > From giulio.benetti at benettiengineering.com Fri Jan 21 10:33:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 21 Jan 2022 11:33:02 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building In-Reply-To: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> References: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> Message-ID: <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's bump xr819-xradio version. [1]: https://github.com/fifteenhex/xradio/pull/15 Signed-off-by: Giulio Benetti --- package/xr819-xradio/xr819-xradio.hash | 4 ++-- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index efff92ab7d..4a77db0d1a 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz +sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz # Locally computed -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index c1fe3295b6..5f60be887c 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 +XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Jan 21 13:24:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 14:24:51 +0100 Subject: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware In-Reply-To: <20220121080456.GH3252931@scaer> References: <20220119212206.1ACA681763@busybox.osuosl.org> <20220121085045.2e375b6c@windsurf> <20220121080456.GH3252931@scaer> Message-ID: <20220121142451.5dce5ff4@windsurf> On Fri, 21 Jan 2022 09:04:56 +0100 "Yann E. MORIN" wrote: > I don't like it much either. But the reason for the rename was to match > the upstream name, which is exactly what we suggest in the manual, and > that we argue for most of the time. Yeah, I usually make _ to - an exception to this. > And we also already had bluez5_utils-headers and xutil_util-macros, and > 78 packages in package/x11r7/ Which are all examples that I dislike a lot :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 21 13:26:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 14:26:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121075924.GG3252931@scaer> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> <20220121084141.6eac525e@windsurf> <20220121075924.GG3252931@scaer> Message-ID: <20220121142623.7d5d72bc@windsurf> On Fri, 21 Jan 2022 08:59:24 +0100 "Yann E. MORIN" wrote: > > I might be missing something in the whole discussion, but why not patch > > the CMake build system so that it also installs this .pc file, and > > contribute this fix upstream ? > > Because upstream have not been very enthusisatic about it, as James > pointed out when I suggested the same. ;-) Upstream is not enthusiastic about supporting pkg-config, about having their two possible build systems behave in the same way? What sort of odd upstream is that? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From aperez at igalia.com Fri Jan 21 15:42:28 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:28 +0200 Subject: [Buildroot] [PATCH RFC v2 0/7] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112132618.2634250-2-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> Message-ID: <20220121154235.798255-1-aperez@igalia.com> Hi all, Here's a new version of the patch set to use Ninja for all CMake packages. It is still incomplete (missing documentation, a couple of commits need better commit logs, etc.) so I will be still using the "RFC" tag =) This is what I wrote when I sent the initial version: > In order to avoid the circular dependency of host-ninja requiring itself, > ninja.mk gets changed to use host-generic-package with a build command > that plainly runs the compiler on the set of sources we know are needed > to build a minimal usable version of it under Unix-y systems. This is > basically the list of sources that CMake would have picked (as per the > CMakeLists.txt file) passed straight to $(HOSTCXX). > > The next change modifies pkg-cmake.mk to always pass -GNinja and removes > the $(_INSTALL[_STAGING,_TARGET]_OPTS) variables, because when using > Ninja the "install/fast" targets are not generated by CMake (those are > an internal detail of the Makefile generator, it seems). For consistency > with the Meson package infrastructure variables $(NINJA), $(_NINJA_ENV) > and $(NINJA_OPTS) are honored by the default set of build/install commands. While the main changes remain the same, this v2 includes a few fixes for packages which were needed to make them build using Ninja, and much more testing: out of the 306 packages which use CMake today, I have been able to successfully have 205 of them built. I will follow-up with another email commenting more on this, and with a defconfig attached. At this point I am confident that we can get all the packages built with CMake without loss of functionality. Only 5 packages out of 205 needing minor tweaks is a *very* good sign, IMO. Cheers, -Adrian Adrian Perez de Castro (7): package/ninja: do not require cmake package/pkg-cmake.mk: use ninja instead of make package/musepack: use MUSEPACK_NINJA_OPTS package/mariadb: use HOST_MARIADB_NINJA_OPTS package/kf5/kf5-extra-cmake-modules: do not build documentation package/libcorrect: avoid multiple rules for same target package/racehound: add patch to support building with ninja .../kf5-extra-cmake-modules.mk | 5 + package/libcorrect/libcorrect.mk | 2 + package/mariadb/mariadb.mk | 2 +- package/musepack/musepack.mk | 2 +- package/ninja/ninja.mk | 36 +++++- package/pkg-cmake.mk | 24 ++-- ...pport-non-Make-generators-e.g.-Ninja.patch | 112 ++++++++++++++++++ 7 files changed, 170 insertions(+), 13 deletions(-) create mode 100644 package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:31 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:31 +0200 Subject: [Buildroot] [PATCH RFC v2 3/7] package/musepack: use MUSEPACK_NINJA_OPTS In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-4-aperez@igalia.com> Replace the usage of MUSEPACK_MAKE with MUSEPACK_NINJA_OPTS to disable the parallel build. Unfortunately switching to Ninja for building CMake packages has not solved the parallel build issues. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Tweak muspack package to disallow parallel builds with Ninja. --- package/musepack/musepack.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a5..000db5fd76 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -9,8 +9,8 @@ MUSEPACK_SITE = http://files.musepack.net/source MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c +MUSEPACK_NINJA_OPTS = -j1 $(eval $(cmake-package)) -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:29 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:29 +0200 Subject: [Buildroot] [PATCH RFC v2 1/7] package/ninja: do not require cmake In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-2-aperez@igalia.com> Use host-generic-package to manually build ninja. This avoids the need for host-cmake in preparation for the CMake build system machinery being changed to use ninja instead of make. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - No changes. --- package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index ab1941023e..ae3be6a14f 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -9,8 +9,42 @@ NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING +# Ninja is used by CMake-based packages, avoid a circular dependency by +# by using host-generic-package instead and using a single command to +# compile the binary. This does in essence the same as the "bootstrap.py" +# included in the distribution avoiding the need for host-python. +define HOST_NINJA_BUILD_CMDS + cd $(@D) && $(HOSTCXX) $(HOST_CXXFLAGS) $(HOST_LDFLAGS) \ + src/build_log.cc \ + src/build.cc \ + src/clean.cc \ + src/clparser.cc \ + src/dyndep.cc \ + src/dyndep_parser.cc \ + src/debug_flags.cc \ + src/deps_log.cc \ + src/disk_interface.cc \ + src/edit_distance.cc \ + src/eval_env.cc \ + src/graph.cc \ + src/graphviz.cc \ + src/line_printer.cc \ + src/manifest_parser.cc \ + src/metrics.cc \ + src/parser.cc \ + src/state.cc \ + src/string_piece_util.cc \ + src/util.cc \ + src/version.cc \ + src/depfile_parser.cc \ + src/lexer.cc \ + src/subprocess-posix.cc \ + src/ninja.cc \ + -o ninja +endef + define HOST_NINJA_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja endef -$(eval $(host-cmake-package)) +$(eval $(host-generic-package)) -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:30 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:30 +0200 Subject: [Buildroot] [PATCH RFC v2 2/7] package/pkg-cmake.mk: use ninja instead of make In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-3-aperez@igalia.com> Switch to ninja as the build tool for the CMake package infrastructure. Note that the changes make packages which use [host-]cmake-package depend on host-ninja. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - No changes. --- package/pkg-cmake.mk | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..65f005a914 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -88,6 +83,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ @@ -117,6 +113,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -154,6 +151,8 @@ endif # primitives to find {C,LD}FLAGS, add it to the dependency list. $(2)_DEPENDENCIES += host-pkgconf +$(2)_DEPENDENCIES += host-ninja + $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # @@ -163,11 +162,13 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif endif @@ -178,7 +179,8 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -188,7 +190,8 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -198,7 +201,8 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:32 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:32 +0200 Subject: [Buildroot] [PATCH RFC v2 4/7] package/mariadb: use HOST_MARIADB_NINJA_OPTS In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-5-aperez@igalia.com> Replace usage of HOST_MARIADB_MAKE_OPTS with HOST_MARIADB_NINJA_OPTS. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Tweeak to use CMake+Ninja infra. --- package/mariadb/mariadb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index db967ca3ed..d24174dd74 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -101,7 +101,7 @@ HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system # -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake # must then be passed to cmake during target build. # see also https://mariadb.com/kb/en/mariadb/cross-compiling-mariadb/ -HOST_MARIADB_MAKE_OPTS = import_executables +HOST_MARIADB_NINJA_OPTS = import_executables MARIADB_CONF_OPTS += \ -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:33 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:33 +0200 Subject: [Buildroot] [PATCH RFC v2 5/7] package/kf5/kf5-extra-cmake-modules: do not build documentation In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-6-aperez@igalia.com> Pass needed CMake options to disable generating documentations. The documentation is built using python-sphinx, which is not packaged in Buildroot. Prior to this change, if the build host would have a Python installation with the sphinx module installed the automatic detection tried to build documentation, which would fail in cases where the sphinxcontrib-qthelp package is missing from the host Python installation. The error message in this case was: Extension error: Could not import extension ecm (exception: cannot import name 'htmlescape' from 'sphinx.util.pycompat' (/usr/lib/python3.10/site-packages/sphinx/util/pycompat.py)) Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Add CMake options to skip trying to build documentation. --- .../kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk index 3c4281b960..ba2748456e 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk @@ -14,4 +14,9 @@ KF5_EXTRA_CMAKE_MODULES_DEPENDENCIES = host-pkgconf KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO +KF5_EXTRA_CMAKE_MODULES_CONF_OPTS += \ + -DBUILD_HTML_DOCS=OFF \ + -DBUILD_MAN_DOCS=OFF \ + -DBUILD_QTHELP_DOCS=OFF + $(eval $(cmake-package)) -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:34 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:34 +0200 Subject: [Buildroot] [PATCH RFC v2 6/7] package/libcorrect: avoid multiple rules for same target In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-7-aperez@igalia.com> Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Avoid CMake generating two targets with the same name. Needs a better fix sent upstream to tweak CMakeLists.txt instead. --- package/libcorrect/libcorrect.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcorrect/libcorrect.mk b/package/libcorrect/libcorrect.mk index 0a84aa5c26..225111a64f 100644 --- a/package/libcorrect/libcorrect.mk +++ b/package/libcorrect/libcorrect.mk @@ -10,4 +10,6 @@ LIBCORRECT_LICENSE = BSD-3-Clause LIBCORRECT_LICENSE_FILES = LICENSE LIBCORRECT_INSTALL_STAGING = YES +LIBCORRECT_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF + $(eval $(cmake-package)) -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:35 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:35 +0200 Subject: [Buildroot] [PATCH RFC v2 7/7] package/racehound: add patch to support building with ninja In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-8-aperez@igalia.com> SSIA. Signed-off-by: Adrian Perez de Castro Upstream-Status: https://github.com/euspectre/racehound/pull/6 --- Changes v1 -> v2: - Patch added to call into Kbuild with plain make. --- ...pport-non-Make-generators-e.g.-Ninja.patch | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch diff --git a/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch b/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch new file mode 100644 index 0000000000..7f90fb8c69 --- /dev/null +++ b/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch @@ -0,0 +1,112 @@ +From f8d266b017fd76e2de9d20e0bb3951a5338075d1 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Fri, 14 Jan 2022 14:33:21 +0200 +Subject: [PATCH] CMake: Support non-Make generators, e.g. Ninja + +--- + cmake/modules/FindKbuild.cmake | 15 +++++++++++++-- + cmake/modules/kbuild_system.cmake | 4 ++-- + cmake/modules/kmodule_files/CMakeLists.txt | 11 +++++++++-- + core/tests/common_target/CMakeLists.txt | 2 +- + 4 files changed, 25 insertions(+), 7 deletions(-) + +diff --git a/cmake/modules/FindKbuild.cmake b/cmake/modules/FindKbuild.cmake +index b79d140..2ba0a78 100644 +--- a/cmake/modules/FindKbuild.cmake ++++ b/cmake/modules/FindKbuild.cmake +@@ -5,6 +5,7 @@ + # (often /lib/modules/${KBUILD_VERSION_STRING}/build) + # KBUILD_INCLUDE_DIR - not used + # KBUILD_FOUND - TRUE if everything is correct, FALSE otherwise ++# KBUILD_MAKE_COMMAND - Command to run for Make invocations. + + if (NOT KBUILD_VERSION_STRING) + set(KBUILD_VERSION_STRING ${CMAKE_SYSTEM_VERSION} CACHE STRING +@@ -18,8 +19,18 @@ endif (NOT KBUILD_BUILD_DIR) + + set(KBUILD_INCLUDE_DIRS "NOT USED") + +-# Note: only KBUILD_BUILD_DIR variable is really used in the project. +-# Other variables defined only for FindModule architecture of CMake. ++# Only makefiles have $(MAKE) defined, in other cases invoke make directly. ++if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") ++ set(KBUILD_MAKE_COMMAND $\(MAKE\)) ++else () ++ find_program(KBUILD_MAKE_COMMAND make REQUIRED) ++ set(KBUILD_MAKE_COMMAND ${KBUILD_MAKE_COMMAND} CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS}) ++endif () ++ ++ ++# Note: only KBUILD_BUILD_DIR and KBUILD_MAKE_COMMAND variables are really ++# used in the project. Other variables defined only for FindModule ++# architecture of CMake. + + # Handle the QUIETLY and REQUIRED arguments and set KBUILD_FOUND to TRUE if + # all listed variables are TRUE +diff --git a/cmake/modules/kbuild_system.cmake b/cmake/modules/kbuild_system.cmake +index e28ef33..e4e33df 100644 +--- a/cmake/modules/kbuild_system.cmake ++++ b/cmake/modules/kbuild_system.cmake +@@ -262,13 +262,13 @@ function(kbuild_add_module name) + > "${_dir}.${_name}.o.cmd") + endforeach(shipped_source_noext_abs ${shipped_source_noext_abs}) + endif(shipped_sources_noext_abs) +- ++ + # The rule to create module + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.ko ${symvers_file} + ${cmd_create_command} + ${symvers_command} +- COMMAND $(MAKE) -C ${KBUILD_BUILD_DIR} ++ COMMAND ${KBUILD_MAKE_COMMAND} -C ${KBUILD_BUILD_DIR} + M=${CMAKE_CURRENT_BINARY_DIR} modules + DEPENDS ${depend_files} + ) +diff --git a/cmake/modules/kmodule_files/CMakeLists.txt b/cmake/modules/kmodule_files/CMakeLists.txt +index 1147cc5..6115153 100644 +--- a/cmake/modules/kmodule_files/CMakeLists.txt ++++ b/cmake/modules/kmodule_files/CMakeLists.txt +@@ -5,7 +5,7 @@ if (NOT KERNELDIR) + set(KERNELDIR /lib/modules/${KBUILD_VERSION_STRING}/build) + endif (NOT KERNELDIR) + +-set(PWD $\(shell pwd\)) ++set(PWD $$\(pwd\)) + + project(kmodule_try_compile) + # Create rule for produce file from another file via copiing +@@ -27,9 +27,16 @@ if(COPY_FILE) + copy_file("${COPY_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/try_compile.ko") + endif(COPY_FILE) + ++# Only makefiles have $(MAKE) defined, in other cases invoke make directly. ++if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") ++ set(KBUILD_MAKE_COMMAND $\(MAKE\)) ++else () ++ find_program(KBUILD_MAKE_COMMAND make REQUIRED) ++endif () ++ + # Rule to produce try_compile.ko from try_compile.c + add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/try_compile.ko" +- COMMAND $(MAKE) -C ${KERNELDIR} M=${PWD} modules ++ COMMAND ${KBUILD_MAKE_COMMAND} -C ${KERNELDIR} M=${PWD} modules + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/try_compile.c") + + # Kbuild system cannot work with out-of-source build, +diff --git a/core/tests/common_target/CMakeLists.txt b/core/tests/common_target/CMakeLists.txt +index cf257ad..fe48e68 100644 +--- a/core/tests/common_target/CMakeLists.txt ++++ b/core/tests/common_target/CMakeLists.txt +@@ -17,7 +17,7 @@ add_custom_target("common_target_module" + + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${KMODULE_NAME}.ko" +- COMMAND $(MAKE) -f module.makefile ++ COMMAND ${KBUILD_MAKE_COMMAND} -f module.makefile + DEPENDS + "${CMAKE_CURRENT_BINARY_DIR}/cfake.c" + "${CMAKE_CURRENT_BINARY_DIR}/cfake.h" +-- +2.34.1 + -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:53:21 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:53:21 +0200 Subject: [Buildroot] [PATCH RFC v2 0/7] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121175321.GB3065576@momiji> Hello, On Fri, 21 Jan 2022 17:42:28 +0200 Adrian Perez de Castro wrote: > Here's a new version of the patch set to use Ninja for all CMake packages. > It is still incomplete (missing documentation, a couple of commits need > better commit logs, etc.) so I will be still using the "RFC" tag =) > > This is what I wrote when I sent the initial version: > > > In order to avoid the circular dependency of host-ninja requiring itself, > > ninja.mk gets changed to use host-generic-package with a build command > > that plainly runs the compiler on the set of sources we know are needed > > to build a minimal usable version of it under Unix-y systems. This is > > basically the list of sources that CMake would have picked (as per the > > CMakeLists.txt file) passed straight to $(HOSTCXX). > > > > The next change modifies pkg-cmake.mk to always pass -GNinja and removes > > the $(_INSTALL[_STAGING,_TARGET]_OPTS) variables, because when using > > Ninja the "install/fast" targets are not generated by CMake (those are > > an internal detail of the Makefile generator, it seems). For consistency > > with the Meson package infrastructure variables $(NINJA), $(_NINJA_ENV) > > and $(NINJA_OPTS) are honored by the default set of build/install commands. > > While the main changes remain the same, this v2 includes a few fixes for > packages which were needed to make them build using Ninja, and much more > testing: out of the 306 packages which use CMake today, I have been able to > successfully have 205 of them built. I will follow-up with another email > commenting more on this, and with a defconfig attached. > > At this point I am confident that we can get all the packages built with > CMake without loss of functionality. Only 5 packages out of 205 needing > minor tweaks is a *very* good sign, IMO. You can find two files attached to this mail: - v2-status.txt: lists all the CMake packages, marked with the following symbols: - [ ] - Package not yet tested. - [*] - Package tested, builds fine unchanged. - [=] - Package tested, builds with changes/patches applied. - [?] - Package tested, failed to build but the failure does not seem caused from switching from Make to Ninja. - qemu_x86_64_cmakeninja1_defconfig: a defconfig that can be used to build all the packages marked with [*] from the status list. I will need some other different defconfigs to test some of the packages, because they may be platform specific (like rpi-firmware) or need options enabled which conflict with other packages from the list. My plan is to continue in the next weeks and slowly get to the point where all the CMake packages can be built using Ninja, using the minimum amount of defconfigs possible. Cheers, -Adrian -------------- next part -------------- BR2_x86_64=y BR2_CCACHE=y BR2_OPTIMIZE_2=y BR2_SSP_ALL=y BR2_FORTIFY_SOURCE_2=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_FLUIDSYNTH=y BR2_PACKAGE_FLUIDSYNTH_SDL2=y BR2_PACKAGE_GSTREAMER1=y # BR2_PACKAGE_GSTREAMER1_GST_DEBUG is not set BR2_PACKAGE_GST1_PLUGINS_BASE=y BR2_PACKAGE_MUSEPACK=y BR2_PACKAGE_YMPD=y BR2_PACKAGE_UNZIP=y BR2_PACKAGE_SENTRY_NATIVE=y BR2_PACKAGE_TCF_AGENT=y BR2_PACKAGE_JQ=y BR2_PACKAGE_FIRMWARE_UTILS=y BR2_PACKAGE_UNIONFS=y BR2_PACKAGE_FLARE_ENGINE=y BR2_PACKAGE_FLARE_GAME=y BR2_PACKAGE_LUGARU=y BR2_PACKAGE_MINETEST=y BR2_PACKAGE_SOLARUS=y BR2_PACKAGE_SUPERTUX=y BR2_PACKAGE_SUPERTUXKART=y BR2_PACKAGE_MESA3D_DEMOS=y BR2_PACKAGE_MIDORI=y BR2_PACKAGE_CEGUI=y BR2_PACKAGE_FREERDP=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_SDL2_KMSDRM=y BR2_PACKAGE_SDL2_OPENGLES=y BR2_PACKAGE_VULKAN_HEADERS=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_OPENGL=y BR2_PACKAGE_QT5BASE_OPENGL_ES2=y BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5BASE_ICU=y BR2_PACKAGE_QT5LOCATION=y BR2_PACKAGE_QT5SENSORS=y BR2_PACKAGE_QT5TOOLS=y BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS=y BR2_PACKAGE_CUTELYST=y BR2_PACKAGE_GRANTLEE=y BR2_PACKAGE_KF5=y BR2_PACKAGE_KF5_MODEMMANAGER_QT=y BR2_PACKAGE_KF5_NETWORKMANAGER_QT=y BR2_PACKAGE_QJSON=y BR2_PACKAGE_SIMPLE_MAIL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y BR2_PACKAGE_APITRACE=y BR2_PACKAGE_BRICKD=y BR2_PACKAGE_CDRKIT=y BR2_PACKAGE_LIBIEC61850=y BR2_PACKAGE_LINUX_SERIAL_TEST=y BR2_PACKAGE_OPENFPGALOADER=y BR2_PACKAGE_OPENPOWERLINK=y BR2_PACKAGE_READ_EDID=y BR2_PACKAGE_UBUS=y BR2_PACKAGE_LUAJIT_COMPAT52=y BR2_PACKAGE_EASYDBUS=y BR2_PACKAGE_LUA_EV=y BR2_PACKAGE_LUA_SDL2=y BR2_PACKAGE_LUVI=y BR2_PACKAGE_PYTHON3_BZIP2=y BR2_PACKAGE_PYTHON3_PYEXPAT=y BR2_PACKAGE_PYTHON3_XZ=y BR2_PACKAGE_PYTHON3_ZLIB=y BR2_PACKAGE_PYTHON_FLATBUFFERS=y BR2_PACKAGE_PYTHON_MAKO=y BR2_PACKAGE_PYTHON_PAHO_MQTT=y BR2_PACKAGE_PYTHON_PYBIND=y BR2_PACKAGE_ALURE=y BR2_PACKAGE_BCG729=y BR2_PACKAGE_LIBASPLIB=y BR2_PACKAGE_LIBCODEC2=y BR2_PACKAGE_LIBCUE=y BR2_PACKAGE_LIBEBUR128=y BR2_PACKAGE_LIBSOXR=y BR2_PACKAGE_SPEEXDSP=y BR2_PACKAGE_TAGLIB=y BR2_PACKAGE_SNAPPY=y BR2_PACKAGE_ZLIB_NG=y BR2_PACKAGE_ZZIPLIB=y BR2_PACKAGE_LIBOLM=y BR2_PACKAGE_LIBSSH=y BR2_PACKAGE_LIBSSH_SERVER=y BR2_PACKAGE_LIBUECC=y BR2_PACKAGE_USTREAM_SSL=y BR2_PACKAGE_CPPDB=y BR2_PACKAGE_LEVELDB=y BR2_PACKAGE_LIBGIT2=y BR2_PACKAGE_LIBMDBX=y BR2_PACKAGE_LIBMDBX_CXX=y BR2_PACKAGE_MYSQL=y BR2_PACKAGE_MARIADB=y BR2_PACKAGE_EXIV2=y BR2_PACKAGE_GRAPHITE2=y BR2_PACKAGE_INTEL_MEDIASDK=y BR2_PACKAGE_JASPER=y BR2_PACKAGE_LENSFUN=y BR2_PACKAGE_LENSFUN_TOOLS=y BR2_PACKAGE_LIBGTA=y BR2_PACKAGE_LIBGTK3=y # BR2_PACKAGE_LIBGTK3_BROADWAY is not set BR2_PACKAGE_OPENCV4=y BR2_PACKAGE_OPENCV4_LIB_FLANN=y BR2_PACKAGE_OPENCV4_JPEG2000_WITH_OPENJPEG=y BR2_PACKAGE_POPPLER=y BR2_PACKAGE_POPPLER_QT5=y BR2_PACKAGE_WAFFLE=y BR2_PACKAGE_WAYLANDPP=y BR2_PACKAGE_ZXING_CPP=y BR2_PACKAGE_C_PERIPHERY=y BR2_PACKAGE_HACKRF=y BR2_PACKAGE_LET_ME_CREATE=y BR2_PACKAGE_LIBCEC=y BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1=y BR2_PACKAGE_LIBIIO=y BR2_PACKAGE_LIBIQRF=y BR2_PACKAGE_LIBSIGROK=y BR2_PACKAGE_LIBSIGROKCXX=y BR2_PACKAGE_MRAA=y BR2_PACKAGE_CJSON=y BR2_PACKAGE_JSON_FOR_MODERN_CPP=y BR2_PACKAGE_RAPIDJSON=y BR2_PACKAGE_TINYXML2=y BR2_PACKAGE_VALIJSON=y BR2_PACKAGE_XERCES=y BR2_PACKAGE_YAJL=y BR2_PACKAGE_YAML_CPP=y BR2_PACKAGE_GLOG=y BR2_PACKAGE_LOG4CXX=y BR2_PACKAGE_LOG4QT=y BR2_PACKAGE_BENTO4=y BR2_PACKAGE_LIBMATROSKA=y BR2_PACKAGE_LIBYUV=y BR2_PACKAGE_X265=y BR2_PACKAGE_X265_CLI=y BR2_PACKAGE_AZURE_IOT_SDK_C=y BR2_PACKAGE_CURLPP=y BR2_PACKAGE_GRPC=y BR2_PACKAGE_LIBCGI=y # BR2_PACKAGE_LIBCURL_EXTRA_PROTOCOLS_FEATURES is not set BR2_PACKAGE_LIBCURL_MBEDTLS=y BR2_PACKAGE_LIBMINIUPNPC=y BR2_PACKAGE_LIBNETCONF2=y BR2_PACKAGE_LIBRSYNC=y BR2_PACKAGE_LIBUHTTPD=y BR2_PACKAGE_LIBURIPARSER=y BR2_PACKAGE_LIBUWSC=y BR2_PACKAGE_LIBVNCSERVER=y BR2_PACKAGE_NANOMSG=y BR2_PACKAGE_PAHO_MQTT_CPP=y BR2_PACKAGE_PISTACHE=y BR2_PACKAGE_QPID_PROTON=y BR2_PACKAGE_RABBITMQ_C=y BR2_PACKAGE_SYSREPO=y BR2_PACKAGE_THRIFT=y BR2_PACKAGE_WAMPCC=y BR2_PACKAGE_WEBSOCKETPP=y BR2_PACKAGE_ARMADILLO=y BR2_PACKAGE_AVRO_C=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_CCTZ=y BR2_PACKAGE_CEREAL=y BR2_PACKAGE_CLANG=y BR2_PACKAGE_CMOCKA=y BR2_PACKAGE_EIGEN=y BR2_PACKAGE_ELFUTILS=y BR2_PACKAGE_FLANN=y BR2_PACKAGE_FLATCC=y BR2_PACKAGE_GFLAGS=y BR2_PACKAGE_GLI=y BR2_PACKAGE_GTEST=y BR2_PACKAGE_GTEST_GMOCK=y BR2_PACKAGE_LIBB64=y BR2_PACKAGE_LIBCORRECT=y BR2_PACKAGE_LIBEASTL=y BR2_PACKAGE_LIBGEOS=y BR2_PACKAGE_LIBICAL=y BR2_PACKAGE_LIBKS=y BR2_PACKAGE_LIBOSMIUM=y BR2_PACKAGE_LIBSPATIALINDEX=y BR2_PACKAGE_LIBUCI=y BR2_PACKAGE_MSGPACK=y BR2_PACKAGE_QHULL=y BR2_PACKAGE_UVW=y BR2_PACKAGE_UTF8PROC=y BR2_PACKAGE_COLLECTD=y BR2_PACKAGE_COLLECTD_REDIS=y BR2_PACKAGE_GNURADIO_CTRLPORT=y BR2_PACKAGE_GNURADIO_DTV=y BR2_PACKAGE_GNURADIO_PYTHON=y BR2_PACKAGE_GNURADIO_UTILS=y BR2_PACKAGE_GNURADIO_ZEROMQ=y BR2_PACKAGE_GNURADIO_CHANNELS=y BR2_PACKAGE_GNURADIO_QTGUI=y BR2_PACKAGE_GNURADIO_TRELLIS=y BR2_PACKAGE_GNURADIO_UHD=y BR2_PACKAGE_GQRX=y BR2_PACKAGE_GR_OSMOSDR_PYTHON=y BR2_PACKAGE_GR_OSMOSDR_IQFILE=y BR2_PACKAGE_GR_OSMOSDR_RTLSDR=y BR2_PACKAGE_GR_OSMOSDR_RTLSDR_TCP=y BR2_PACKAGE_GR_OSMOSDR_RFSPACE=y BR2_PACKAGE_RTL_433=y BR2_PACKAGE_TASKD=y BR2_PACKAGE_CANNELLONI=y BR2_PACKAGE_EASYFRAMES=y BR2_PACKAGE_GERBERA=y BR2_PACKAGE_HIAWATHA=y BR2_PACKAGE_I2PD=y BR2_PACKAGE_LINPHONE=y BR2_PACKAGE_MJPG_STREAMER=y BR2_PACKAGE_MRP=y BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_NETWORK_MANAGER_TUI=y BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENOBEX=y BR2_PACKAGE_SNORT3=y BR2_PACKAGE_SPICE_PROTOCOL=y BR2_PACKAGE_UHTTPD=y BR2_PACKAGE_UQMI=y BR2_PACKAGE_ZNC=y BR2_PACKAGE_RTTY=y BR2_PACKAGE_TTYD=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_FATCAT=y BR2_PACKAGE_HOST_LLD=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -------------- next part -------------- [*] package/alure/alure.mk [*] package/apitrace/apitrace.mk [*] package/armadillo/armadillo.mk [*] package/avro-c/avro-c.mk [*] package/azure-iot-sdk-c/azure-iot-sdk-c.mk [*] package/bcg729/bcg729.mk [*] package/bctoolbox/bctoolbox.mk [*] package/belle-sip/belle-sip.mk [*] package/belr/belr.mk [*] package/bento4/bento4.mk [*] package/brickd/brickd.mk [*] package/brotli/brotli.mk [*] package/c-periphery/c-periphery.mk [*] package/cannelloni/cannelloni.mk [*] package/cctz/cctz.mk [*] package/cdrkit/cdrkit.mk [*] package/cegui/cegui.mk [*] package/cereal/cereal.mk [*] package/cfm/cfm.mk [*] package/cjson/cjson.mk [*] package/clang/clang.mk [*] package/cmake/cmake.mk [*] package/cmocka/cmocka.mk [*] package/cog/cog.mk [*] package/cppdb/cppdb.mk [*] package/cppzmq/cppzmq.mk [*] package/curlpp/curlpp.mk [*] package/cutelyst/cutelyst.mk [*] package/doxygen/doxygen.mk [*] package/easydbus/easydbus.mk [*] package/easyframes/easyframes.mk [*] package/eigen/eigen.mk [*] package/exiv2/exiv2.mk [*] package/fatcat/fatcat.mk [*] package/firmware-utils/firmware-utils.mk [*] package/flann/flann.mk [*] package/flare-engine/flare-engine.mk [*] package/flare-game/flare-game.mk [*] package/flatbuffers/flatbuffers.mk [*] package/flatcc/flatcc.mk [*] package/fluidsynth/fluidsynth.mk [*] package/fmt/fmt.mk [*] package/freerdp/freerdp.mk [*] package/gerbera/gerbera.mk [*] package/gflags/gflags.mk [*] package/gli/gli.mk [*] package/glm/glm.mk [*] package/glog/glog.mk [*] package/gnuradio/gnuradio.mk [*] package/gqrx/gqrx.mk [*] package/gr-osmosdr/gr-osmosdr.mk [*] package/grantlee/grantlee.mk [*] package/graphite2/graphite2.mk [*] package/grpc/grpc.mk [*] package/gtest/gtest.mk [*] package/hackrf/hackrf.mk [*] package/hiawatha/hiawatha.mk [*] package/hiredis/hiredis.mk [*] package/i2pd/i2pd.mk [*] package/intel-gmmlib/intel-gmmlib.mk [*] package/intel-mediadriver/intel-mediadriver.mk [*] package/intel-mediasdk/intel-mediasdk.mk [*] package/jasper/jasper.mk [*] package/jpeg-turbo/jpeg-turbo.mk [*] package/json-c/json-c.mk [*] package/json-for-modern-cpp/json-for-modern-cpp.mk [*] package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk [*] package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk [*] package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk [*] package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk [*] package/lapack/lapack.mk [*] package/lensfun/lensfun.mk [*] package/let-me-create/let-me-create.mk [*] package/leveldb/leveldb.mk [*] package/libabseil-cpp/libabseil-cpp.mk [*] package/libasplib/libasplib.mk [*] package/libcec/libcec.mk [*] package/libcgi/libcgi.mk [*] package/libcodec2/libcodec2.mk [*] package/libcue/libcue.mk [*] package/libcuefile/libcuefile.mk [*] package/libeastl/libeastl.mk [*] package/libebml/libebml.mk [*] package/libebur128/libebur128.mk [*] package/libftdi1/libftdi1.mk [*] package/libgeos/libgeos.mk [*] package/libgit2/libgit2.mk [*] package/libgta/libgta.mk [*] package/libical/libical.mk [*] package/libiec61850/libiec61850.mk [*] package/libiio/libiio.mk [*] package/libiqrf/libiqrf.mk [*] package/libks/libks.mk [*] package/libmatroska/libmatroska.mk [*] package/libmdbx/libmdbx.mk [*] package/libminiupnpc/libminiupnpc.mk [*] package/libnetconf2/libnetconf2.mk [*] package/libolm/libolm.mk [*] package/libosmium/libosmium.mk [*] package/libplatform/libplatform.mk [*] package/librsync/librsync.mk [*] package/librtlsdr/librtlsdr.mk [*] package/libssh/libssh.mk [*] package/libubox/libubox.mk [*] package/libuci/libuci.mk [*] package/libuecc/libuecc.mk [*] package/libuhttpd/libuhttpd.mk [*] package/liburiparser/liburiparser.mk [*] package/libvncserver/libvncserver.mk [*] package/libwebsockets/libwebsockets.mk [*] package/libyuv/libyuv.mk [*] package/libzip/libzip.mk [*] package/linphone/linphone.mk [*] package/linux-serial-test/linux-serial-test.mk [*] package/lld/lld.mk [*] package/llvm/llvm.mk [*] package/log4cxx/log4cxx.mk [*] package/log4qt/log4qt.mk [*] package/lua-ev/lua-ev.mk [*] package/lua-sdl2/lua-sdl2.mk [*] package/luv/luv.mk [*] package/luvi/luvi.mk [*] package/lzlib/lzlib.mk [*] package/lzo/lzo.mk [*] package/mariadb/mariadb.mk [*] package/mbedtls/mbedtls.mk [*] package/mediastreamer/mediastreamer.mk [*] package/midori/midori.mk [*] package/mjpg-streamer/mjpg-streamer.mk [*] package/mraa/mraa.mk [*] package/mrp/mrp.mk [*] package/msgpack/msgpack.mk [*] package/musepack/musepack.mk [*] package/nanomsg/nanomsg.mk [*] package/odhcp6c/odhcp6c.mk [*] package/openal/openal.mk [*] package/opencv4/opencv4.mk [*] package/openjpeg/openjpeg.mk [*] package/openobex/openobex.mk [*] package/openpowerlink/openpowerlink.mk [*] package/ortp/ortp.mk [*] package/paho-mqtt-c/paho-mqtt-c.mk [*] package/paho-mqtt-cpp/paho-mqtt-cpp.mk [*] package/physfs/physfs.mk [*] package/pistache/pistache.mk [*] package/poppler/poppler.mk [*] package/protozero/protozero.mk [*] package/pugixml/pugixml.mk [*] package/python-pybind/python-pybind.mk [*] package/qhull/qhull.mk [*] package/qjson/qjson.mk [*] package/qpid-proton/qpid-proton.mk [*] package/rabbitmq-c/rabbitmq-c.mk [*] package/rapidjson/rapidjson.mk [*] package/re2/re2.mk [*] package/read-edid/read-edid.mk [*] package/rtl_433/rtl_433.mk [*] package/rtty/rtty.mk [*] package/sentry-native/sentry-native.mk [*] package/simple-mail/simple-mail.mk [*] package/snappy/snappy.mk [*] package/snort3/snort3.mk [*] package/solarus/solarus.mk [*] package/spdlog/spdlog.mk [*] package/sysrepo/sysrepo.mk [*] package/taglib/taglib.mk [*] package/taskd/taskd.mk [*] package/tcf-agent/tcf-agent.mk [*] package/thrift/thrift.mk [*] package/tinyxml2/tinyxml2.mk [*] package/ttyd/ttyd.mk [*] package/ubus/ubus.mk [*] package/uhd/uhd.mk [*] package/uhttpd/uhttpd.mk [*] package/unionfs/unionfs.mk [*] package/unzip/unzip.mk [*] package/uqmi/uqmi.mk [*] package/ustream-ssl/ustream-ssl.mk [*] package/utf8proc/utf8proc.mk [*] package/uvw/uvw.mk [*] package/valijson/valijson.mk [*] package/vulkan-headers/vulkan-headers.mk [*] package/waffle/waffle.mk [*] package/wampcc/wampcc.mk [*] package/waylandpp/waylandpp.mk [*] package/webkitgtk/webkitgtk.mk [*] package/websocketpp/websocketpp.mk [*] package/woff2/woff2.mk [*] package/wpewebkit/wpewebkit.mk [*] package/x265/x265.mk [*] package/xerces/xerces.mk [*] package/yajl/yajl.mk [*] package/yaml-cpp/yaml-cpp.mk [*] package/ympd/ympd.mk [*] package/zlib-ng/zlib-ng.mk [*] package/znc/znc.mk [*] package/zxing-cpp/zxing-cpp.mk [*] package/zziplib/zziplib.mk [*] package/libsoxr/libsoxr.mk [*] package/libspatialindex/libspatialindex.mk [*] package/lugaru/lugaru.mk [*] package/minetest/minetest.mk [*] package/openfpgaloader/openfpgaloader.mk [*] package/supertux/supertux.mk [*] package/supertuxkart/supertuxkart.mk [=] package/libcorrect/libcorrect.mk [=] package/ninja/ninja.mk [?] package/racehound/racehound.mk [?] package/azmq/azmq.mk [?] package/bullet/bullet.mk [?] package/cppcms/cppcms.mk [?] package/netopeer2/netopeer2.mk [?] package/piglit/piglit.mk [?] package/pulseview/pulseview.mk [?] package/qt5/qt5webkit/qt5webkit.mk [?] package/quazip/quazip.mk [?] package/sysdig/sysdig.mk [?] package/wireshark/wireshark.mk [ ] package/assimp/assimp.mk [ ] package/chipmunk/chipmunk.mk [ ] package/domoticz/domoticz.mk [ ] package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk [ ] package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk [ ] package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk [ ] package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk [ ] package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk [ ] package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk [ ] package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk [ ] package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk [ ] package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk [ ] package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk [ ] package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk [ ] package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk [ ] package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk [ ] package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk [ ] package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk [ ] package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk [ ] package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk [ ] package/kodi-pvr-argustv/kodi-pvr-argustv.mk [ ] package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk [ ] package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk [ ] package/kodi-pvr-filmon/kodi-pvr-filmon.mk [ ] package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk [ ] package/kodi-pvr-hts/kodi-pvr-hts.mk [ ] package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk [ ] package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk [ ] package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk [ ] package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk [ ] package/kodi-pvr-njoy/kodi-pvr-njoy.mk [ ] package/kodi-pvr-octonet/kodi-pvr-octonet.mk [ ] package/kodi-pvr-pctv/kodi-pvr-pctv.mk [ ] package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk [ ] package/kodi-pvr-stalker/kodi-pvr-stalker.mk [ ] package/kodi-pvr-vbox/kodi-pvr-vbox.mk [ ] package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk [ ] package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk [ ] package/kodi-pvr-waipu/kodi-pvr-waipu.mk [ ] package/kodi-pvr-wmc/kodi-pvr-wmc.mk [ ] package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk [ ] package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk [ ] package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk [ ] package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk [ ] package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk [ ] package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk [ ] package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk [ ] package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk [ ] package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk [ ] package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk [ ] package/kodi-screensaver-stars/kodi-screensaver-stars.mk [ ] package/kodi-texturepacker/kodi-texturepacker.mk [ ] package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk [ ] package/kodi-vfs-rar/kodi-vfs-rar.mk [ ] package/kodi-vfs-sftp/kodi-vfs-sftp.mk [ ] package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk [ ] package/kodi-visualisation-goom/kodi-visualisation-goom.mk [ ] package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk [ ] package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk [ ] package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk [ ] package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk [ ] package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk [ ] package/kodi/kodi.mk [ ] package/libcpprestsdk/libcpprestsdk.mk [ ] package/libfreeglut/libfreeglut.mk [ ] package/libglfw/libglfw.mk [ ] package/libressl/libressl.mk [ ] package/libubootenv/libubootenv.mk [ ] package/libuwsc/libuwsc.mk [ ] package/libyang/libyang.mk [ ] package/mfgtools/mfgtools.mk [ ] package/minizip/minizip.mk [ ] package/ne10/ne10.mk [ ] package/ogre/ogre.mk [ ] package/open62541/open62541.mk [ ] package/opencv3/opencv3.mk [ ] package/opentracing-cpp/opentracing-cpp.mk [ ] package/optee-benchmark/optee-benchmark.mk [ ] package/optee-client/optee-client.mk [ ] package/optee-examples/optee-examples.mk [ ] package/optee-test/optee-test.mk [ ] package/osm2pgsql/osm2pgsql.mk [ ] package/rpi-userland/rpi-userland.mk [ ] package/sdbus-cpp/sdbus-cpp.mk [ ] package/stellarium/stellarium.mk [ ] package/synergy/synergy.mk [ ] package/timescaledb/timescaledb.mk [ ] package/xmrig/xmrig.mk -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From quentin.schulz at theobroma-systems.com Fri Jan 21 16:14:58 2022 From: quentin.schulz at theobroma-systems.com (quentin.schulz at theobroma-systems.com) Date: Fri, 21 Jan 2022 17:14:58 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220121161458.220687-1-quentin.schulz@theobroma-systems.com> From: Quentin Schulz 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, 6.1+ and 5.12.12 all contain the necessary patches so let's port them to 5.15.2. As a note, those are also available on kde "fork" in their kde/5.15 branch: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- ...-intensive-painting-of-high-number-o.patch | 136 ++++++++++++++++++ ...-avoiding-huge-number-of-tiny-dashes.patch | 37 +++++ package/qt5/qt5base/qt5base.mk | 4 + 3 files changed, 177 insertions(+) create mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch create mode 100644 package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..fe3a16fd19 --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,136 @@ +From 7f345f2a1c8d9f60c60e8a9d8cc90729794bd2f1 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) +Reviewed-by: Eirik Aavitsland +[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=7f345f2a1c8d9f60c60e8a9d8cc90729794bd2f1] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++++++----- + tests/auto/other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index f4cbf15fc70..f04e3a498d8 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)) { ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + const QPainterPath::ElementType *types = path.elements(); + const qreal *points = path.points(); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 00000000000..d41ced7f5f9 +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.16.3 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..f3c525e584 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 9378ba2ae857df7e21a384e514650823db2355c3 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L??hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +Reviewed-by: Eirik Aavitsland +[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9378ba2ae857df7e21a384e514650823db2355c3 ] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index f04e3a498d8..bd6bdf7be12 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.16.3 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..4ef3759566 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. -- 2.34.1 From kuzminov.sergey81 at gmail.com Fri Jan 21 16:43:59 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Fri, 21 Jan 2022 19:43:59 +0300 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building In-Reply-To: <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> References: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> Message-ID: <1a005bda-86ec-be3d-72b8-153566669f14@gmail.com> 21.01.2022 13:33, Giulio Benetti ?????: > Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's > bump xr819-xradio version. > > [1]: https://github.com/fifteenhex/xradio/pull/15 > > Signed-off-by: Giulio Benetti > --- > package/xr819-xradio/xr819-xradio.hash | 4 ++-- > package/xr819-xradio/xr819-xradio.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash > index efff92ab7d..4a77db0d1a 100644 > --- a/package/xr819-xradio/xr819-xradio.hash > +++ b/package/xr819-xradio/xr819-xradio.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz > +sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz > # Locally computed > -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE > +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE > diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk > index c1fe3295b6..5f60be887c 100644 > --- a/package/xr819-xradio/xr819-xradio.mk > +++ b/package/xr819-xradio/xr819-xradio.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 > +XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 > XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) > XR819_XRADIO_LICENSE = GPL-2.0 > XR819_XRADIO_LICENSE_FILES = LICENSE Tested-by: Sergey Kuzminov From kuzminov.sergey81 at gmail.com Fri Jan 21 16:45:45 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Fri, 21 Jan 2022 19:45:45 +0300 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building In-Reply-To: <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> References: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> Message-ID: <8a692520-6994-d9c9-1fcf-0311a0120353@gmail.com> 21.01.2022 13:33, Giulio Benetti: > Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's > bump xr819-xradio version. > > [1]: https://github.com/fifteenhex/xradio/pull/15 > > Signed-off-by: Giulio Benetti > --- > package/xr819-xradio/xr819-xradio.hash | 4 ++-- > package/xr819-xradio/xr819-xradio.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash > index efff92ab7d..4a77db0d1a 100644 > --- a/package/xr819-xradio/xr819-xradio.hash > +++ b/package/xr819-xradio/xr819-xradio.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz > +sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz > # Locally computed > -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE > +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE > diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk > index c1fe3295b6..5f60be887c 100644 > --- a/package/xr819-xradio/xr819-xradio.mk > +++ b/package/xr819-xradio/xr819-xradio.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 > +XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 > XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) > XR819_XRADIO_LICENSE = GPL-2.0 > XR819_XRADIO_LICENSE_FILES = LICENSE Tested-by: Sergey Kuzminov From quentin.schulz at theobroma-systems.com Fri Jan 21 16:50:46 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Fri, 21 Jan 2022 17:50:46 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so let's port them to 5.15.2. Technically only the first two patches are required to patch the CVE. However, the second patch introduces a regression that is fixed in the third patch. The patches are taken from KDE kde/5.15 git branch. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- v2: - added third patch for fixing regression introduced by the second patch, - cherry-picked commits from kde git kde/5.15 branch instead of taking patches from 5.12.12 since they all applied nicely, ...-intensive-painting-of-high-number-o.patch | 163 ++++++++++++++++++ ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ++++ ...-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++ package/qt5/qt5base/qt5base.mk | 4 + 4 files changed, 304 insertions(+) create mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch create mode 100644 package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch create mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..03287d19ca --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,163 @@ +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Pick-to: 6.1 6.0 5.15 +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) + +* asturmlechner 2021-08-21: +Conflict from preceding 94dd2ceb in dev branch: + src/gui/painting/qpaintengineex.cpp + Resolved via: + + if (pen.style() > Qt::SolidLine) { + QRectF cpRect = path.controlPointRect(); + const QTransform &xf = state()->matrix; +- if (pen.isCosmetic()) { ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ + clipRect = d->exDeviceRect; + cpRect.translate(xf.dx(), xf.dy()); + } else { + +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: + Resolved via: + + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; +- const QList pattern = pen.dashPattern(); ++ const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); + +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 5d8f89eadd..55fdb0c2a0 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 0000000000..d41ced7f5f +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.34.1 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..16e0f20200 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Pick-to: 6.2 6.1 5.15 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L?hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 55fdb0c2a0..19e4b23423 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.34.1 + diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..ca3c2736ae --- /dev/null +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,100 @@ +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 30 Jul 2021 13:03:49 +0200 +Subject: [PATCH] Refix for avoiding huge number of tiny dashes + +Previous fix hit too widely so some valid horizontal and vertical +lines were affected; the root problem being that such lines have an +empty control point rect (width or height is 0). Fix by caculating in +the pen width. + +Pick-to: 6.2 6.1 5.15 +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 8 ++--- + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 19e4b23423..9fe510827a 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); + } + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway +- QRectF extentRect = cpRect & clipRect; ++ qreal pw = pen.widthF() ? pen.widthF() : 1; ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; + const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); +- if (pen.widthF()) +- patternLength *= pen.widthF(); ++ patternLength *= pw; + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { ++ } else if (extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 42e98ce363..d7c3f95f1d 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -308,6 +308,7 @@ private slots: + void fillPolygon(); + + void drawImageAtPointF(); ++ void scaledDashes(); + + private: + void fillData(); +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() + paint.end(); + } + ++void tst_QPainter::scaledDashes() ++{ ++ // Test that we do not hit the limit-huge-number-of-dashes path ++ QRgb fore = qRgb(0, 0, 0xff); ++ QRgb back = qRgb(0xff, 0xff, 0); ++ QImage image(5, 32, QImage::Format_RGB32); ++ image.fill(back); ++ QPainter p(&image); ++ QPen pen(QColor(fore), 3, Qt::DotLine); ++ p.setPen(pen); ++ p.scale(1, 2); ++ p.drawLine(2, 0, 2, 16); ++ p.end(); ++ ++ bool foreFound = false; ++ bool backFound = false; ++ int i = 0; ++ while (i < 32 && (!foreFound || !backFound)) { ++ QRgb pix = image.pixel(3, i); ++ if (pix == fore) ++ foreFound = true; ++ else if (pix == back) ++ backFound = true; ++ i++; ++ } ++ ++ QVERIFY(foreFound); ++ QVERIFY(backFound); ++} ++ + QTEST_MAIN(tst_QPainter) + + #include "tst_qpainter.moc" +-- +2.34.1 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..4ef3759566 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. -- 2.34.1 From fperrad at gmail.com Fri Jan 21 12:38:52 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:52 +0100 Subject: [Buildroot] [PATCH 1/8] package/perl-date-manip: bump to version 6.86 Message-ID: <20220121123859.754653-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-date-manip/perl-date-manip.hash | 4 ++-- package/perl-date-manip/perl-date-manip.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash index d40aa087b..dc267f525 100644 --- a/package/perl-date-manip/perl-date-manip.hash +++ b/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ce3447409d83d16e6dd7bea0a18f24b4 Date-Manip-6.85.tar.gz -sha256 1662393943b7c588478ea9d975200d825f500d26fe9996f2bf7f829cfaa5ccdc Date-Manip-6.85.tar.gz +md5 77123a4cc874f72d7188f859626bdd84 Date-Manip-6.86.tar.gz +sha256 b5203782d03c79aa5822cf33d1828aaa3b4db93a275d4a428c89f56f4713361f Date-Manip-6.86.tar.gz # computed by scancpan sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk index 4ee81d340..35bce456e 100644 --- a/package/perl-date-manip/perl-date-manip.mk +++ b/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.85 +PERL_DATE_MANIP_VERSION = 6.86 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:53 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:53 +0100 Subject: [Buildroot] [PATCH 2/8] package/perl-http-message: bump to version 6.36 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-http-message/perl-http-message.hash | 6 +++--- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 62cf0588a..1a5d9ad0d 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e291f19e9532ffb7d1c80eab786bf0f2 HTTP-Message-6.33.tar.gz -sha256 23b967f71b852cb209ec92a1af6bac89a141dff1650d69824d29a345c1eceef7 HTTP-Message-6.33.tar.gz +md5 e847fb3e297e740080ab6fd1ac127f7f HTTP-Message-6.36.tar.gz +sha256 576a53b486af87db56261a36099776370c06f0087d179fc8c7bb803b48cddd76 HTTP-Message-6.36.tar.gz # computed by scancpan -sha256 1379396dcd2291f17a741d2d6bf14d379f5f2ab91b3c7e7b92c5f82856e2d7ac LICENSE +sha256 f2f428b5f8a3bf4e6a71cd5ea92558a3d123d3d7c5075d34923e71e46dea94df LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 18e673ae1..3b5d6e7b5 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.33 +PERL_HTTP_MESSAGE_VERSION = 6.36 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:54 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:54 +0100 Subject: [Buildroot] [PATCH 3/8] package/perl-io-socket-ssl: bump to version 2.074 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-3-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-io-socket-ssl/perl-io-socket-ssl.hash | 4 ++-- package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index b5dc29973..4a1d71e34 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 4fb67fc8c4817dce8116f2eb7878fd9c IO-Socket-SSL-2.072.tar.gz -sha256 b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d IO-Socket-SSL-2.072.tar.gz +md5 53201b8e4dfaf25d4d661a54fdfda602 IO-Socket-SSL-2.074.tar.gz +sha256 36486b6be49da4d029819cf7069a7b41ed48af0c87e23be0f8e6aba23d08a832 IO-Socket-SSL-2.074.tar.gz # computed by scancpan sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index b32cce12c..1ab70509b 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.072 +PERL_IO_SOCKET_SSL_VERSION = 2.074 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:55 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:55 +0100 Subject: [Buildroot] [PATCH 4/8] package/perl-libwww-perl: bump to version 6.60 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-4-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-libwww-perl/perl-libwww-perl.hash | 6 +++--- package/perl-libwww-perl/perl-libwww-perl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index 2c9b19d6e..e32258050 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e0b7b07a01f19cc507d3a9b55951ce3a libwww-perl-6.57.tar.gz -sha256 30c242359cb808f3fe2b115fb90712410557f0786ad74844f9801fd719bc42f8 libwww-perl-6.57.tar.gz +md5 ce5180358d9279b2843a6518bf2de200 libwww-perl-6.60.tar.gz +sha256 cdd28b9237b9c6791725b9099695c7c3c720b33881606fd6cc7635a5495bb07c libwww-perl-6.60.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE +sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index 23e2aa3bb..aa15ebb59 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.57 +PERL_LIBWWW_PERL_VERSION = 6.60 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:56 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:56 +0100 Subject: [Buildroot] [PATCH 5/8] package/perl-net-dns: bump to version 1.33 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-5-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-net-dns/perl-net-dns.hash | 4 ++-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 916603e71..1af14e2a4 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e8ee02ec42dfeb10ae4a0d175d5fcafc Net-DNS-1.32.tar.gz -sha256 b890a7b44d573f27cc713caadf1e12eaaa4478a6504d1157194df614316b5b50 Net-DNS-1.32.tar.gz +md5 f3ba5295ee588d25dabc74a2ecda296a Net-DNS-1.33.tar.gz +sha256 5a40e7cf524e4bd2c33cf03b82b47d5308b712083aa5ee180b0b5af54c71fbd2 Net-DNS-1.33.tar.gz # computed by scancpan sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index afba3e216..fa7b50c02 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.32 +PERL_NET_DNS_VERSION = 1.33 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:57 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:57 +0100 Subject: [Buildroot] [PATCH 6/8] package/perl-path-tiny: bump to version 0.122 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-6-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-path-tiny/perl-path-tiny.hash | 4 ++-- package/perl-path-tiny/perl-path-tiny.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 6899d5c6b..16f1a9a22 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 046d14dde6e3568aee5085487dd4769e Path-Tiny-0.120.tar.gz -sha256 66a1164981d449da46cc88383fe37f9e352e87e9570bfb960e43fe8ff016ee1b Path-Tiny-0.120.tar.gz +md5 f746d8da5d049a5523b1880666bb0992 Path-Tiny-0.122.tar.gz +sha256 4bc6f76d0548ccd8b38cb66291a885bf0de453d0167562c7b82e8861afdcfb7c Path-Tiny-0.122.tar.gz # computed by scancpan sha256 c1a19c0d83f668a784640c0b41e024f37b182ad38011b170f9200123e57f6070 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index cd4c3bc49..310feed98 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.120 +PERL_PATH_TINY_VERSION = 0.122 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:58 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:58 +0100 Subject: [Buildroot] [PATCH 7/8] package/perl-try-tiny: bump to version 0.31 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-7-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-try-tiny/perl-try-tiny.hash | 6 +++--- package/perl-try-tiny/perl-try-tiny.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-try-tiny/perl-try-tiny.hash b/package/perl-try-tiny/perl-try-tiny.hash index ed4d8ac74..7aa88724f 100644 --- a/package/perl-try-tiny/perl-try-tiny.hash +++ b/package/perl-try-tiny/perl-try-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eb362c3cb32c42f9f28de9ddb7f2ead6 Try-Tiny-0.30.tar.gz -sha256 da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b Try-Tiny-0.30.tar.gz +md5 993a29ee8a03c9bd9c2f7c53d1082a03 Try-Tiny-0.31.tar.gz +sha256 3300d31d8a4075b26d8f46ce864a1d913e0e8467ceeba6655d5d2b2e206c11be Try-Tiny-0.31.tar.gz # computed by scancpan -sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE +sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE diff --git a/package/perl-try-tiny/perl-try-tiny.mk b/package/perl-try-tiny/perl-try-tiny.mk index f13e2ee59..cd2421a3c 100644 --- a/package/perl-try-tiny/perl-try-tiny.mk +++ b/package/perl-try-tiny/perl-try-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TRY_TINY_VERSION = 0.30 +PERL_TRY_TINY_VERSION = 0.31 PERL_TRY_TINY_SOURCE = Try-Tiny-$(PERL_TRY_TINY_VERSION).tar.gz PERL_TRY_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_TRY_TINY_LICENSE = MIT -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:59 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:59 +0100 Subject: [Buildroot] [PATCH 8/8] package/perl-uri: bump to version 5.10 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-8-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-uri/perl-uri.hash | 6 +++--- package/perl-uri/perl-uri.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index 578beed9b..e7e272c63 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bd66b0c620d076c4b0de9507b5f1fbdf URI-5.09.tar.gz -sha256 03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a URI-5.09.tar.gz +md5 2a00d3dbf891df4256d251382aefd9b9 URI-5.10.tar.gz +sha256 16325d5e308c7b7ab623d1bf944e1354c5f2245afcfadb8eed1e2cae9a0bd0b5 URI-5.10.tar.gz # computed by scancpan -sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE +sha256 d4f0b7a8771dcb1eee79a38c2e466eb997e23565a6687dd1900a2027eabe12a0 LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index d588e8205..d451bc5d6 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.09 +PERL_URI_VERSION = 5.10 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From yann.morin.1998 at free.fr Fri Jan 21 20:39:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 21:39:46 +0100 Subject: [Buildroot] [PATCH] package/htpdate: bump to version 1.3.3 In-Reply-To: <20220120211941.1033249-1-angelo@amarulasolutions.com> References: <20220120211941.1033249-1-angelo@amarulasolutions.com> Message-ID: <20220121203946.GI3252931@scaer> Angelo, All, On 2022-01-20 22:19 +0100, Angelo Compagnucci spake thusly: > Update project to its new location and move to use the package provided > init scripts. The service file we provide is functional (it uses Google's server) when the upstream service file is not (it uses a dymmy server), same goes for the init script: we are trying to provide works-out-of-the-box experience with sensible defaults. [0] However, the upstream files are very similar to ours, and I see you were the one to push them upstream. [0] And of course, I had to test: https://example.com/ does exist, and does return a date tag. Meh, scratch all the above... Still, I am not too fond of that, because then it means we are departing from our customs to provide our own scripts in all packages... Oh damn, I am not sure... But that is not the biggest issue, see below... > Signed-off-by: Angelo Compagnucci > --- [--SNIP--] > diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk > index e9323f9106..3c4412b283 100644 > --- a/package/htpdate/htpdate.mk > +++ b/package/htpdate/htpdate.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HTPDATE_VERSION = 1.3.1 > +HTPDATE_VERSION = 1.3.3 Er... We have 1.2.6 in the tree, and I could not find the 1.2.6 -> 1.3.1 bump in Patchwork... Are you sure you prepared your patch against master? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 21 20:44:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 21:44:46 +0100 Subject: [Buildroot] [PATCH] package/htpdate: bump to version 1.3.3 In-Reply-To: <20220121203946.GI3252931@scaer> References: <20220120211941.1033249-1-angelo@amarulasolutions.com> <20220121203946.GI3252931@scaer> Message-ID: <20220121204446.GJ3252931@scaer> Angelo, All, On 2022-01-21 21:39 +0100, Yann E. MORIN spake thusly: > On 2022-01-20 22:19 +0100, Angelo Compagnucci spake thusly: > > Update project to its new location and move to use the package provided > > init scripts. Oh, and this is just stating what the patch does, but is missing an explanations why this is a better idea than using our owns, the latter being the really interesting thing that we want to record in a commit log... ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 21 20:50:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 21:50:27 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220121204633.D7CC581DF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9151eab3c7e4548a052be69aecba1f2b1ee6396c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so let's port them to 5.15.2. Technically only the first two patches are required to patch the CVE. However, the second patch introduces a regression that is fixed in the third patch. The patches are taken from KDE kde/5.15 git branch. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN --- ...ssing-intensive-painting-of-high-number-o.patch | 163 +++++++++++++++++++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 +++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++++ package/qt5/qt5base/qt5base.mk | 4 + 4 files changed, 304 insertions(+) diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..03287d19ca --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,163 @@ +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Pick-to: 6.1 6.0 5.15 +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) + +* asturmlechner 2021-08-21: +Conflict from preceding 94dd2ceb in dev branch: + src/gui/painting/qpaintengineex.cpp + Resolved via: + + if (pen.style() > Qt::SolidLine) { + QRectF cpRect = path.controlPointRect(); + const QTransform &xf = state()->matrix; +- if (pen.isCosmetic()) { ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ + clipRect = d->exDeviceRect; + cpRect.translate(xf.dx(), xf.dy()); + } else { + +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: + Resolved via: + + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; +- const QList pattern = pen.dashPattern(); ++ const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); + +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 5d8f89eadd..55fdb0c2a0 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 0000000000..d41ced7f5f +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.34.1 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..16e0f20200 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Pick-to: 6.2 6.1 5.15 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L??hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 55fdb0c2a0..19e4b23423 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.34.1 + diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..ca3c2736ae --- /dev/null +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,100 @@ +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 30 Jul 2021 13:03:49 +0200 +Subject: [PATCH] Refix for avoiding huge number of tiny dashes + +Previous fix hit too widely so some valid horizontal and vertical +lines were affected; the root problem being that such lines have an +empty control point rect (width or height is 0). Fix by caculating in +the pen width. + +Pick-to: 6.2 6.1 5.15 +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 8 ++--- + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 19e4b23423..9fe510827a 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); + } + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway +- QRectF extentRect = cpRect & clipRect; ++ qreal pw = pen.widthF() ? pen.widthF() : 1; ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; + const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); +- if (pen.widthF()) +- patternLength *= pen.widthF(); ++ patternLength *= pw; + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { ++ } else if (extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 42e98ce363..d7c3f95f1d 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -308,6 +308,7 @@ private slots: + void fillPolygon(); + + void drawImageAtPointF(); ++ void scaledDashes(); + + private: + void fillData(); +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() + paint.end(); + } + ++void tst_QPainter::scaledDashes() ++{ ++ // Test that we do not hit the limit-huge-number-of-dashes path ++ QRgb fore = qRgb(0, 0, 0xff); ++ QRgb back = qRgb(0xff, 0xff, 0); ++ QImage image(5, 32, QImage::Format_RGB32); ++ image.fill(back); ++ QPainter p(&image); ++ QPen pen(QColor(fore), 3, Qt::DotLine); ++ p.setPen(pen); ++ p.scale(1, 2); ++ p.drawLine(2, 0, 2, 16); ++ p.end(); ++ ++ bool foreFound = false; ++ bool backFound = false; ++ int i = 0; ++ while (i < 32 && (!foreFound || !backFound)) { ++ QRgb pix = image.pixel(3, i); ++ if (pix == fore) ++ foreFound = true; ++ else if (pix == back) ++ backFound = true; ++ i++; ++ } ++ ++ QVERIFY(foreFound); ++ QVERIFY(backFound); ++} ++ + QTEST_MAIN(tst_QPainter) + + #include "tst_qpainter.moc" +-- +2.34.1 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..4ef3759566 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. From yann.morin.1998 at free.fr Fri Jan 21 20:53:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 21:53:27 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix CVE-2021-38593 In-Reply-To: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> References: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> Message-ID: <20220121205327.GK3252931@scaer> Quentin, All, On 2022-01-21 17:50 +0100, Quentin Schulz spake thusly: > 5.15.2 is the last public release of 5.15 and does not contain this CVE > fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so > let's port them to 5.15.2. > > Technically only the first two patches are required to patch the CVE. > However, the second patch introduces a regression that is fixed in the third > patch. > > The patches are taken from KDE kde/5.15 git branch. > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Applied to master, thanks. Regards, Yann E. MORIN. > --- > > v2: > - added third patch for fixing regression introduced by the second patch, > - cherry-picked commits from kde git kde/5.15 branch instead of taking > patches from 5.12.12 since they all applied nicely, > > ...-intensive-painting-of-high-number-o.patch | 163 ++++++++++++++++++ > ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ++++ > ...-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++ > package/qt5/qt5base/qt5base.mk | 4 + > 4 files changed, 304 insertions(+) > create mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch > create mode 100644 package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > create mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch > > diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch > new file mode 100644 > index 0000000000..03287d19ca > --- /dev/null > +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch > @@ -0,0 +1,163 @@ > +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 > +From: Eirik Aavitsland > +Date: Tue, 13 Apr 2021 14:23:45 +0200 > +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny > + dashes > + > +When stroking a dashed path, an unnecessary amount of processing would > +be spent if there is a huge number of dashes visible, e.g. because of > +scaling. Since the dashes are too small to be indivdually visible > +anyway, just replace with a semi-transparent solid line for such > +cases. > + > +Pick-to: 6.1 6.0 5.15 > +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 > +Reviewed-by: Allan Sandfeld Jensen > +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) > + > +* asturmlechner 2021-08-21: > +Conflict from preceding 94dd2ceb in dev branch: > + src/gui/painting/qpaintengineex.cpp > + Resolved via: > + > + if (pen.style() > Qt::SolidLine) { > + QRectF cpRect = path.controlPointRect(); > + const QTransform &xf = state()->matrix; > +- if (pen.isCosmetic()) { > ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ > + clipRect = d->exDeviceRect; > + cpRect.translate(xf.dx(), xf.dy()); > + } else { > + > +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: > + Resolved via: > + > + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; > + qreal extent = qMax(extentRect.width(), extentRect.height()); > + qreal patternLength = 0; > +- const QList pattern = pen.dashPattern(); > ++ const QVector pattern = pen.dashPattern(); > + const int patternSize = qMin(pattern.size(), 32); > + for (int i = 0; i < patternSize; i++) > + patternLength += qMax(pattern.at(i), qreal(0)); > + > +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] > +Signed-off-by: Quentin Schulz > +--- > + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- > + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ > + 2 files changed, 69 insertions(+), 9 deletions(-) > + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps > + > +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp > +index 5d8f89eadd..55fdb0c2a0 100644 > +--- a/src/gui/painting/qpaintengineex.cpp > ++++ b/src/gui/painting/qpaintengineex.cpp > +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const > + > + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp > + > +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) > ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) > + { > + #ifdef QT_DEBUG_DRAW > + qDebug() << "QPaintEngineEx::stroke()" << pen; > +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) > + d->stroker.setCubicToHook(qpaintengineex_cubicTo); > + } > + > ++ QRectF clipRect; > ++ QPen pen = inPen; > ++ if (pen.style() > Qt::SolidLine) { > ++ QRectF cpRect = path.controlPointRect(); > ++ const QTransform &xf = state()->matrix; > ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ > ++ clipRect = d->exDeviceRect; > ++ cpRect.translate(xf.dx(), xf.dy()); > ++ } else { > ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); > ++ } > ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway > ++ QRectF extentRect = cpRect & clipRect; > ++ qreal extent = qMax(extentRect.width(), extentRect.height()); > ++ qreal patternLength = 0; > ++ const QVector pattern = pen.dashPattern(); > ++ const int patternSize = qMin(pattern.size(), 32); > ++ for (int i = 0; i < patternSize; i++) > ++ patternLength += qMax(pattern.at(i), qreal(0)); > ++ if (pen.widthF()) > ++ patternLength *= pen.widthF(); > ++ if (qFuzzyIsNull(patternLength)) { > ++ pen.setStyle(Qt::NoPen); > ++ } else if (extent / patternLength > 10000) { > ++ // approximate stream of tiny dashes with semi-transparent solid line > ++ pen.setStyle(Qt::SolidLine); > ++ QColor color(pen.color()); > ++ color.setAlpha(color.alpha() / 2); > ++ pen.setColor(color); > ++ } > ++ } > ++ > + if (!qpen_fast_equals(pen, d->strokerPen)) { > + d->strokerPen = pen; > + d->stroker.setJoinStyle(pen.joinStyle()); > +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) > + return; > + } > + > +- if (pen.style() > Qt::SolidLine) { > +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ > +- d->activeStroker->setClipRect(d->exDeviceRect); > +- } else { > +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); > +- d->activeStroker->setClipRect(clipRect); > +- } > +- } > ++ if (!clipRect.isNull()) > ++ d->activeStroker->setClipRect(clipRect); > + > + if (d->activeStroker == &d->stroker) > + d->stroker.setForceOpen(path.hasExplicitOpen()); > +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps > +new file mode 100644 > +index 0000000000..d41ced7f5f > +--- /dev/null > ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps > +@@ -0,0 +1,34 @@ > ++# Version: 1 > ++# CheckVsReference: 5% > ++ > ++path_addEllipse mypath 20.0 20.0 200.0 200.0 > ++ > ++save > ++setPen blue 20 SolidLine FlatCap > ++pen_setCosmetic true > ++pen_setDashPattern [ 0.0004 0.0004 ] > ++setBrush yellow > ++ > ++drawPath mypath > ++translate 300 0 > ++setRenderHint Antialiasing true > ++drawPath mypath > ++restore > ++ > ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 > ++ > ++setPen blue 20 DotLine FlatCap > ++setBrush yellow > ++ > ++save > ++translate 0 300 > ++scale 0.0001 0.00011 > ++drawPath bigpath > ++restore > ++ > ++save > ++translate 300 300 > ++setRenderHint Antialiasing true > ++scale 0.0001 0.00011 > ++drawPath bigpath > ++restore > +-- > +2.34.1 > + > diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > new file mode 100644 > index 0000000000..16e0f20200 > --- /dev/null > +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > @@ -0,0 +1,37 @@ > +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 > +From: Eirik Aavitsland > +Date: Fri, 23 Jul 2021 15:53:56 +0200 > +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Some pathological cases were not caught by the previous fix. > + > +Fixes: QTBUG-95239 > +Pick-to: 6.2 6.1 5.15 > +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 > +Reviewed-by: Robert L?hning > +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) > +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] > +Signed-off-by: Quentin Schulz > +--- > + src/gui/painting/qpaintengineex.cpp | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp > +index 55fdb0c2a0..19e4b23423 100644 > +--- a/src/gui/painting/qpaintengineex.cpp > ++++ b/src/gui/painting/qpaintengineex.cpp > +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) > + patternLength *= pen.widthF(); > + if (qFuzzyIsNull(patternLength)) { > + pen.setStyle(Qt::NoPen); > +- } else if (extent / patternLength > 10000) { > ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { > + // approximate stream of tiny dashes with semi-transparent solid line > + pen.setStyle(Qt::SolidLine); > + QColor color(pen.color()); > +-- > +2.34.1 > + > diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch > new file mode 100644 > index 0000000000..ca3c2736ae > --- /dev/null > +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch > @@ -0,0 +1,100 @@ > +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 > +From: Eirik Aavitsland > +Date: Fri, 30 Jul 2021 13:03:49 +0200 > +Subject: [PATCH] Refix for avoiding huge number of tiny dashes > + > +Previous fix hit too widely so some valid horizontal and vertical > +lines were affected; the root problem being that such lines have an > +empty control point rect (width or height is 0). Fix by caculating in > +the pen width. > + > +Pick-to: 6.2 6.1 5.15 > +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc > +Reviewed-by: Allan Sandfeld Jensen > +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) > +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] > +Signed-off-by: Quentin Schulz > +--- > + src/gui/painting/qpaintengineex.cpp | 8 ++--- > + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ > + 2 files changed, 35 insertions(+), 4 deletions(-) > + > +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp > +index 19e4b23423..9fe510827a 100644 > +--- a/src/gui/painting/qpaintengineex.cpp > ++++ b/src/gui/painting/qpaintengineex.cpp > +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) > + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); > + } > + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway > +- QRectF extentRect = cpRect & clipRect; > ++ qreal pw = pen.widthF() ? pen.widthF() : 1; > ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; > + qreal extent = qMax(extentRect.width(), extentRect.height()); > + qreal patternLength = 0; > + const QVector pattern = pen.dashPattern(); > + const int patternSize = qMin(pattern.size(), 32); > + for (int i = 0; i < patternSize; i++) > + patternLength += qMax(pattern.at(i), qreal(0)); > +- if (pen.widthF()) > +- patternLength *= pen.widthF(); > ++ patternLength *= pw; > + if (qFuzzyIsNull(patternLength)) { > + pen.setStyle(Qt::NoPen); > +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { > ++ } else if (extent / patternLength > 10000) { > + // approximate stream of tiny dashes with semi-transparent solid line > + pen.setStyle(Qt::SolidLine); > + QColor color(pen.color()); > +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp > +index 42e98ce363..d7c3f95f1d 100644 > +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp > ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp > +@@ -308,6 +308,7 @@ private slots: > + void fillPolygon(); > + > + void drawImageAtPointF(); > ++ void scaledDashes(); > + > + private: > + void fillData(); > +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() > + paint.end(); > + } > + > ++void tst_QPainter::scaledDashes() > ++{ > ++ // Test that we do not hit the limit-huge-number-of-dashes path > ++ QRgb fore = qRgb(0, 0, 0xff); > ++ QRgb back = qRgb(0xff, 0xff, 0); > ++ QImage image(5, 32, QImage::Format_RGB32); > ++ image.fill(back); > ++ QPainter p(&image); > ++ QPen pen(QColor(fore), 3, Qt::DotLine); > ++ p.setPen(pen); > ++ p.scale(1, 2); > ++ p.drawLine(2, 0, 2, 16); > ++ p.end(); > ++ > ++ bool foreFound = false; > ++ bool backFound = false; > ++ int i = 0; > ++ while (i < 32 && (!foreFound || !backFound)) { > ++ QRgb pix = image.pixel(3, i); > ++ if (pix == fore) > ++ foreFound = true; > ++ else if (pix == back) > ++ backFound = true; > ++ i++; > ++ } > ++ > ++ QVERIFY(foreFound); > ++ QVERIFY(backFound); > ++} > ++ > + QTEST_MAIN(tst_QPainter) > + > + #include "tst_qpainter.moc" > +-- > +2.34.1 > + > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index bcdf036f00..4ef3759566 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz > QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib > QT5BASE_INSTALL_STAGING = YES > > +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > +QT5BASE_IGNORE_CVES += CVE-2021-38593 > + > # A few comments: > # * -no-pch to workaround the issue described at > # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Fri Jan 21 21:16:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 21 Jan 2022 14:16:29 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121142623.7d5d72bc@windsurf> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> <20220121084141.6eac525e@windsurf> <20220121075924.GG3252931@scaer> <20220121142623.7d5d72bc@windsurf> Message-ID: On Fri, Jan 21, 2022 at 6:26 AM Thomas Petazzoni wrote: > > On Fri, 21 Jan 2022 08:59:24 +0100 > "Yann E. MORIN" wrote: > > > > I might be missing something in the whole discussion, but why not patch > > > the CMake build system so that it also installs this .pc file, and > > > contribute this fix upstream ? > > > > Because upstream have not been very enthusisatic about it, as James > > pointed out when I suggested the same. ;-) > > Upstream is not enthusiastic about supporting pkg-config, about having > their two possible build systems behave in the same way? What sort of > odd upstream is that? Best I can tell the cmake build is mostly intended for non-system builds/installs or something weird like that. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From yann.morin.1998 at free.fr Fri Jan 21 21:23:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:42 +0100 Subject: [Buildroot] [git commit] package/perl-http-message: bump to version 6.36 Message-ID: <20220121211938.6C8D48353C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b1e9b844c04176555f179a061b9021f6ee1d304 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-http-message/perl-http-message.hash | 6 +++--- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 62cf0588ad..1a5d9ad0df 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e291f19e9532ffb7d1c80eab786bf0f2 HTTP-Message-6.33.tar.gz -sha256 23b967f71b852cb209ec92a1af6bac89a141dff1650d69824d29a345c1eceef7 HTTP-Message-6.33.tar.gz +md5 e847fb3e297e740080ab6fd1ac127f7f HTTP-Message-6.36.tar.gz +sha256 576a53b486af87db56261a36099776370c06f0087d179fc8c7bb803b48cddd76 HTTP-Message-6.36.tar.gz # computed by scancpan -sha256 1379396dcd2291f17a741d2d6bf14d379f5f2ab91b3c7e7b92c5f82856e2d7ac LICENSE +sha256 f2f428b5f8a3bf4e6a71cd5ea92558a3d123d3d7c5075d34923e71e46dea94df LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 18e673ae1c..3b5d6e7b5f 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.33 +PERL_HTTP_MESSAGE_VERSION = 6.36 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:23:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:44 +0100 Subject: [Buildroot] [git commit] package/perl-io-socket-ssl: bump to version 2.074 Message-ID: <20220121211938.752918353E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd75f2d403d6d7a63d151572b955c05ca25f942f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-io-socket-ssl/perl-io-socket-ssl.hash | 4 ++-- package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index b5dc299735..4a1d71e349 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 4fb67fc8c4817dce8116f2eb7878fd9c IO-Socket-SSL-2.072.tar.gz -sha256 b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d IO-Socket-SSL-2.072.tar.gz +md5 53201b8e4dfaf25d4d661a54fdfda602 IO-Socket-SSL-2.074.tar.gz +sha256 36486b6be49da4d029819cf7069a7b41ed48af0c87e23be0f8e6aba23d08a832 IO-Socket-SSL-2.074.tar.gz # computed by scancpan sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index b32cce12c6..1ab70509bd 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.072 +PERL_IO_SOCKET_SSL_VERSION = 2.074 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:23:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:40 +0100 Subject: [Buildroot] [git commit] package/perl-date-manip: bump to version 6.86 Message-ID: <20220121211938.6272B82B4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=068d86abf1d3024dbe3bcd657874d8216e8bb4f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-date-manip/perl-date-manip.hash | 4 ++-- package/perl-date-manip/perl-date-manip.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash index d40aa087b5..dc267f525e 100644 --- a/package/perl-date-manip/perl-date-manip.hash +++ b/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ce3447409d83d16e6dd7bea0a18f24b4 Date-Manip-6.85.tar.gz -sha256 1662393943b7c588478ea9d975200d825f500d26fe9996f2bf7f829cfaa5ccdc Date-Manip-6.85.tar.gz +md5 77123a4cc874f72d7188f859626bdd84 Date-Manip-6.86.tar.gz +sha256 b5203782d03c79aa5822cf33d1828aaa3b4db93a275d4a428c89f56f4713361f Date-Manip-6.86.tar.gz # computed by scancpan sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk index 4ee81d340f..35bce456e2 100644 --- a/package/perl-date-manip/perl-date-manip.mk +++ b/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.85 +PERL_DATE_MANIP_VERSION = 6.86 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:23:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:51 +0100 Subject: [Buildroot] [git commit] package/perl-path-tiny: bump to version 0.122 Message-ID: <20220121211938.914798353E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19f318a1e1126ddc002c3ad25edfe2197bdc3500 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-path-tiny/perl-path-tiny.hash | 4 ++-- package/perl-path-tiny/perl-path-tiny.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 6899d5c6b4..16f1a9a222 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 046d14dde6e3568aee5085487dd4769e Path-Tiny-0.120.tar.gz -sha256 66a1164981d449da46cc88383fe37f9e352e87e9570bfb960e43fe8ff016ee1b Path-Tiny-0.120.tar.gz +md5 f746d8da5d049a5523b1880666bb0992 Path-Tiny-0.122.tar.gz +sha256 4bc6f76d0548ccd8b38cb66291a885bf0de453d0167562c7b82e8861afdcfb7c Path-Tiny-0.122.tar.gz # computed by scancpan sha256 c1a19c0d83f668a784640c0b41e024f37b182ad38011b170f9200123e57f6070 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index cd4c3bc496..310feed98b 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.120 +PERL_PATH_TINY_VERSION = 0.122 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Fri Jan 21 21:23:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:47 +0100 Subject: [Buildroot] [git commit] package/perl-libwww-perl: bump to version 6.60 Message-ID: <20220121211938.7EECF82B4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1050a4c32f55e9e7e521f57490e6ca430119f42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-libwww-perl/perl-libwww-perl.hash | 6 +++--- package/perl-libwww-perl/perl-libwww-perl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index 2c9b19d6ef..e32258050c 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e0b7b07a01f19cc507d3a9b55951ce3a libwww-perl-6.57.tar.gz -sha256 30c242359cb808f3fe2b115fb90712410557f0786ad74844f9801fd719bc42f8 libwww-perl-6.57.tar.gz +md5 ce5180358d9279b2843a6518bf2de200 libwww-perl-6.60.tar.gz +sha256 cdd28b9237b9c6791725b9099695c7c3c720b33881606fd6cc7635a5495bb07c libwww-perl-6.60.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE +sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index 23e2aa3bb8..aa15ebb594 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.57 +PERL_LIBWWW_PERL_VERSION = 6.60 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:23:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:49 +0100 Subject: [Buildroot] [git commit] package/perl-net-dns: bump to version 1.33 Message-ID: <20220121211938.886078353C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b9961c6e15661f74140dd7656ca4485a059bb73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-net-dns/perl-net-dns.hash | 4 ++-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 916603e715..1af14e2a45 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e8ee02ec42dfeb10ae4a0d175d5fcafc Net-DNS-1.32.tar.gz -sha256 b890a7b44d573f27cc713caadf1e12eaaa4478a6504d1157194df614316b5b50 Net-DNS-1.32.tar.gz +md5 f3ba5295ee588d25dabc74a2ecda296a Net-DNS-1.33.tar.gz +sha256 5a40e7cf524e4bd2c33cf03b82b47d5308b712083aa5ee180b0b5af54c71fbd2 Net-DNS-1.33.tar.gz # computed by scancpan sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index afba3e216a..fa7b50c023 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.32 +PERL_NET_DNS_VERSION = 1.33 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT From yann.morin.1998 at free.fr Fri Jan 21 21:23:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:54 +0100 Subject: [Buildroot] [git commit] package/perl-try-tiny: bump to version 0.31 Message-ID: <20220121211938.99C1B82B4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d3a26867b4c28d66314416b4b515a9686f9c2d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-try-tiny/perl-try-tiny.hash | 6 +++--- package/perl-try-tiny/perl-try-tiny.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-try-tiny/perl-try-tiny.hash b/package/perl-try-tiny/perl-try-tiny.hash index ed4d8ac74f..7aa88724f0 100644 --- a/package/perl-try-tiny/perl-try-tiny.hash +++ b/package/perl-try-tiny/perl-try-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eb362c3cb32c42f9f28de9ddb7f2ead6 Try-Tiny-0.30.tar.gz -sha256 da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b Try-Tiny-0.30.tar.gz +md5 993a29ee8a03c9bd9c2f7c53d1082a03 Try-Tiny-0.31.tar.gz +sha256 3300d31d8a4075b26d8f46ce864a1d913e0e8467ceeba6655d5d2b2e206c11be Try-Tiny-0.31.tar.gz # computed by scancpan -sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE +sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE diff --git a/package/perl-try-tiny/perl-try-tiny.mk b/package/perl-try-tiny/perl-try-tiny.mk index f13e2ee59f..cd2421a3cb 100644 --- a/package/perl-try-tiny/perl-try-tiny.mk +++ b/package/perl-try-tiny/perl-try-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TRY_TINY_VERSION = 0.30 +PERL_TRY_TINY_VERSION = 0.31 PERL_TRY_TINY_SOURCE = Try-Tiny-$(PERL_TRY_TINY_VERSION).tar.gz PERL_TRY_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_TRY_TINY_LICENSE = MIT From yann.morin.1998 at free.fr Fri Jan 21 21:23:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:56 +0100 Subject: [Buildroot] [git commit] package/perl-uri: bump to version 5.10 Message-ID: <20220121211938.A1EC58359C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=970f1b0df0e47979f0c6284dd5c40ff1d477b506 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-uri/perl-uri.hash | 6 +++--- package/perl-uri/perl-uri.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index 578beed9bf..e7e272c63a 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bd66b0c620d076c4b0de9507b5f1fbdf URI-5.09.tar.gz -sha256 03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a URI-5.09.tar.gz +md5 2a00d3dbf891df4256d251382aefd9b9 URI-5.10.tar.gz +sha256 16325d5e308c7b7ab623d1bf944e1354c5f2245afcfadb8eed1e2cae9a0bd0b5 URI-5.10.tar.gz # computed by scancpan -sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE +sha256 d4f0b7a8771dcb1eee79a38c2e466eb997e23565a6687dd1900a2027eabe12a0 LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index d588e82056..d451bc5d6a 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.09 +PERL_URI_VERSION = 5.10 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:28:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:28:54 +0100 Subject: [Buildroot] [PATCH 1/8] package/perl-date-manip: bump to version 6.86 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121212854.GL3252931@scaer> Fran?ois, All, On 2022-01-21 13:38 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Series of 8 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/perl-date-manip/perl-date-manip.hash | 4 ++-- > package/perl-date-manip/perl-date-manip.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash > index d40aa087b..dc267f525 100644 > --- a/package/perl-date-manip/perl-date-manip.hash > +++ b/package/perl-date-manip/perl-date-manip.hash > @@ -1,6 +1,6 @@ > # retrieved by scancpan from http://cpan.metacpan.org/ > -md5 ce3447409d83d16e6dd7bea0a18f24b4 Date-Manip-6.85.tar.gz > -sha256 1662393943b7c588478ea9d975200d825f500d26fe9996f2bf7f829cfaa5ccdc Date-Manip-6.85.tar.gz > +md5 77123a4cc874f72d7188f859626bdd84 Date-Manip-6.86.tar.gz > +sha256 b5203782d03c79aa5822cf33d1828aaa3b4db93a275d4a428c89f56f4713361f Date-Manip-6.86.tar.gz > > # computed by scancpan > sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE > diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk > index 4ee81d340..35bce456e 100644 > --- a/package/perl-date-manip/perl-date-manip.mk > +++ b/package/perl-date-manip/perl-date-manip.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PERL_DATE_MANIP_VERSION = 6.85 > +PERL_DATE_MANIP_VERSION = 6.86 > PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz > PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK > PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sat Jan 22 07:06:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 07:06:51 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-21 Message-ID: <20220122070657.5191C607F2@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-01-21 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 70 | 5 | 0 | 75 | 2021.11.x | 17 | 6 | 0 | 23 | master | 94 | 29 | 0 | 123 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 7 frr-8.1 | 4 bluez5_utils-5.63 | 2 qt5webkit-5.212.0-alpha4 | 2 cryptopp-8.6.0 | 1 cryptsetup-2.4.2 | 1 guile-3.0.7 | 1 gvfs-1.48.1 | 1 hiawatha-11.1 | 1 ksmbd-tools-3.4.3 | 1 libglvnd-1.3.2 | 1 mongodb-4.2.11 | 1 nodejs-14.18.3 | 1 pulseview-0.4.2 | 1 rtorrent-0.9.8 | 1 tesseract-ocr-5.0.1 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6217231b30e9f62574a7408359bb8b18ef0a4228 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/cbca95b985a594e897c9dacbe12341d3a0a34f06 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/6b96ab6c391e304dc1f6c175e6ae4e68a8362d9b | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/4c5e5eaca926372cc71418583b56ea0d93d110cc | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/dbda895ef25cc48fee89ac49863480a6773778f9 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5e524ed0b4768304caad7fa29249cf64751ec6d6 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0f43deb205ad3da2b37694aa777f3cbf184436a4 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0e3fd4b6121097e7ea648d57f9f57596a395bec8 | aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/69ade733bd49d6cfafc0f162c352e2d624bfa9b2 | ORPH mipsel | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/e22684977c48652c170da28b3b3ce5808eb63b47 | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/12a20b3f9e4f9f343b7a23f3fed530407827615e | powerpc64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/05272cff4dee5b09d00b7f7f50c77bcd6f13f9fa | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/d27fcdd52ad149433e38539ef3bd00b501ae32c4 | ORPH arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/0e199ae9f1bc4d9d6a542afb4a01dce3f605cb5f | mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/f2ab8baa03dd2dad4b9fbe3ed175f006a745f3dd | riscv32 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/4158a3a5ec242eb1987352f75754d4fe63761a38 | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/53016bd78eedffb608efb8f4c069c217fb8859c2 | mipsel | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/0cda723b5fcf349270ad20875aec6d317d774f66 | sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/bd03b1790b50a5f3f8e7697c3ad9ba31dc16e5c3 | ORPH mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5796cfad0dff3218bac43f3bfb1488b1f953b39d | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/66c839da496742b9a34598cf6d0a2ec83779ba2f | i586 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9c4d38131a27255b7be320c3a6dc1009f0b54aa1 | microblazeel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/408f07a95f55bb8c15c4df092de61ecd1c99bda7 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/303e1b4a2d6e8f9a5abe382d862b601494ae7eb0 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/446b5f21c8906ac75ef9e65670e28ac583eccebb | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/86a60928dc063946886f403211348e65bf8099e2 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/0bac6491188b6681df2ca13eb230706e83cbb130 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/6c789e62dd2b24a4f265aaddc34f30f6283a961b | xtensa | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9e6966d48d75a987b69052d518dbcebb53e7ba6b | Classification of failures by reason for 2021.02.x -------------------------------------------------- gnuradio-3.8.1.0 | 1 gobject-introspection-1.64.1 | 1 gstreamer1-mm-1.10.0 | 1 qt5location-5.15.2 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | gnuradio-3.8.1.0 | NOK | http://autobuild.buildroot.net/results/08143fac4c9a19096d6375500505bf1984423598 | x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/2e14189d66bf643ecef5546fa9f84a62cb6083f4 | ORPH mips | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/2e2175d95d63f4a606da6d38028eb390a8eb9d92 | ORPH x86_64 | qt5location-5.15.2 | NOK | http://autobuild.buildroot.net/results/845168c5ee9c0e77a775f4e764c4205b368ca225 | arm | unknown | NOK | http://autobuild.buildroot.net/results/9162bc2b5fa9408edf2bec3d2a4db48cf3644abb | Classification of failures by reason for 2021.11.x -------------------------------------------------- gstd-0.13.0 | 1 host-erlang-22.2 | 1 libdbi-88b8477d57153b9f736d... | 1 libnss-3.73 | 1 libqmi-1.30.2 | 1 nodejs-14.18.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/da0348d455ac3660491bbec9ff9b8a15d6186b0d | ORPH x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/7f856109152d8c9ad224377317cd750b3870e584 | m68k | libdbi-88b8477d57153b9f736d... | NOK | http://autobuild.buildroot.net/results/adc3b7eb59b9a71ccb2ba79c724b693bbecbf5db | x86_64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/c368e02bedecb8ccb0b5db8c27f61912b43f09a3 | arm | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/dbce587915079f8014ea48524682fd567f33214d | arm | nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/c3715d2b8e3a938c6d5dd93d2497ea8adec0f70f | Gitlab CI results for 2022-01-21 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143358 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143361 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143362 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143363 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143366 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143368 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143373 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143375 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143377 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143379 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143381 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143383 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143384 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143386 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143388 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143390 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143391 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143395 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143396 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143397 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143398 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143399 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143401 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143402 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143404 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143405 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143407 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143409 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143410 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143411 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143415 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143416 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143417 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143420 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143427 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143428 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143431 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143433 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143435 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143436 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143437 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143439 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143440 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143460 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143462 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143463 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143464 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143465 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143467 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143469 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143470 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143474 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143472 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143473 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143476 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143477 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143478 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143487 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143500 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143501 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143506 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143507 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143510 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143511 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143512 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143513 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143515 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143517 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143518 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143519 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143522 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143527 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143546 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143556 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143562 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143566 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143567 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143572 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143574 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143577 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143578 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143580 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143584 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143590 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143591 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143592 | qemu_ppc_g3beige | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143631 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143660 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143668 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143669 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143671 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143672 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143674 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143675 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143677 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143679 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143680 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143682 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143685 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143687 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143689 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143706 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143707 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143709 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143714 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143715 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143716 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143717 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143718 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143719 | -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Sat Jan 22 10:50:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 11:50:17 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: <20220113215805.GM1477939@scaer> References: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> <20220113215805.GM1477939@scaer> Message-ID: <20220122105017.GM3252931@scaer> Arnout, All, On 2022-01-13 22:58 +0100, Yann E. MORIN spake thusly: > On 2022-01-12 21:42 +0100, Arnout Vandecappelle spake thusly: > > On 08/01/2022 18:35, Yann E. MORIN wrote: > > >Some files contain hard-coded absolute paths that point to the host > > >and/or staging directories. > > > > > >With per-package directories (aka. PPD), these paths point to the PPD > > >of the package that created the files, when we want them to point to the > > >PPD of the package that uses them. > [--SNIP--] > > >+define PPD_FIXUP_PATHS > > >+ $(Q)grep -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ > > This will trawl to large binary files and potentially take a long time... > > I too thought of that, and I even discussed it slightly with Peter K. > here about what would be most efficient: grep-then-file, or file-then-grep? > > But if we add --binary-files=without-match to grep, then it will > bail-out early on binary files, which would be more efficient. And then > we still pass that through file to really get only text files. > > But a text-file with utf8 is really a binary file, so would grep ignore > it? So I tried and created a simple file with arbitrary non-ASCII UTF-8 symbols (I just copy-pasted the chinese Wikipedia home page, arbitarily wrapped for "readability"): $ cat foo ????????????????????????????? ?????????????????????????????? ??????????????????????????2005?? ????????????????????????????? 2004-05?????24????????????????????? ?????????????????????????????? ?????????????????????????????? ?????????????????????????????2006 ?2008???????????????????2011-2013???? ????? $ file -b --mime-type foo text/plain $ grep --binary-files=without-match ??? foo 2004-05?????24????????????????????? So, a text file with utf-8 chars is still recognied as a text file, and grep will also not recognise it as a binary file. So we can tell grep to bail out early on binary files, to speed up the stuff. I'd still keep the 'file' test as a further safety net, though. So, grep does not follow symlinks, and we can can speed grep by instructing it to skip binary files. As such, I think all your issues have been addressed now. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sat Jan 22 12:15:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:15:00 +0100 Subject: [Buildroot] [PATCH] configs/kontron_pitx_imx8m_defconfig: remove BR2_ARM_FPU_VFPV3 In-Reply-To: <20220120135251.4225-1-heiko.thiery@gmail.com> References: <20220120135251.4225-1-heiko.thiery@gmail.com> Message-ID: <20220122131500.10cafe0a@windsurf> On Thu, 20 Jan 2022 14:52:52 +0100 Heiko Thiery wrote: > The FP setting is not used for aarch64 in buildroot. The FPU options are > set implicit. > > Signed-off-by: Heiko Thiery > --- > configs/kontron_pitx_imx8m_defconfig | 1 - > 1 file changed, 1 deletion(-) Applied to master, thanks. That being said the FPU handling on AArch64 is not very clear to me. I'm not sure we're handling it correctly in Buildroot today. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:15:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:15:09 +0100 Subject: [Buildroot] [git commit] configs/kontron_pitx_imx8m: remove BR2_ARM_FPU_VFPV3 Message-ID: <20220122120834.CD63C82598@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b399de3a1299636a734c96e6abef063d3dcfc0a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The FP setting is not used for aarch64 in buildroot. The FPU options are set implicit. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- configs/kontron_pitx_imx8m_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 4053e1e398..0e3868b583 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -1,6 +1,5 @@ # Architecture BR2_aarch64=y -BR2_ARM_FPU_VFPV3=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" From thomas.petazzoni at bootlin.com Sat Jan 22 12:15:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:15:21 +0100 Subject: [Buildroot] [git commit] package/readline: bump version to 8.1.2 Message-ID: <20220122120859.C931C825F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d958ae450d41ddf0d44ea5bd84209ba09face868 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] http://git.savannah.gnu.org/cgit/readline.git/log Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/readline/readline.hash | 5 +++-- package/readline/readline.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/readline/readline.hash b/package/readline/readline.hash index 63172f1121..b0530a2d72 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,5 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 readline-8.1.tar.gz +# Locally calculated after checking pgp signature from +# https://ftp.gnu.org/gnu/readline/readline-8.1.2.tar.gz.sig +sha256 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 readline-8.1.2.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 06a96b67a8..b1fd181b78 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.1 +READLINE_VERSION = 8.1.2 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf From thomas.petazzoni at bootlin.com Sat Jan 22 12:15:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:15:50 +0100 Subject: [Buildroot] [PATCH v1] package/readline: bump version to 8.1.2 In-Reply-To: <20220120214300.8626-1-ps.report@gmx.net> References: <20220120214300.8626-1-ps.report@gmx.net> Message-ID: <20220122131550.74a5eb54@windsurf> On Thu, 20 Jan 2022 22:43:00 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] http://git.savannah.gnu.org/cgit/readline.git/log > > Signed-off-by: Peter Seiderer > --- > package/readline/readline.hash | 5 +++-- > package/readline/readline.mk | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:16:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:16:14 +0100 Subject: [Buildroot] [git commit] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building Message-ID: <20220122120934.D8D4A81970@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aab9cb163ece16b5e10a3e3fb14ced6c11f98913 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's bump xr819-xradio version. [1]: https://github.com/fifteenhex/xradio/pull/15 Signed-off-by: Giulio Benetti Tested-by: Sergey Kuzminov Tested-by: Sergey Kuzminov Signed-off-by: Thomas Petazzoni --- package/xr819-xradio/xr819-xradio.hash | 4 ++-- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index efff92ab7d..4a77db0d1a 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz +sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz # Locally computed -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index c1fe3295b6..5f60be887c 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 +XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sat Jan 22 12:16:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:16:25 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building In-Reply-To: <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> References: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> Message-ID: <20220122131625.39303db2@windsurf> On Fri, 21 Jan 2022 11:33:02 +0100 Giulio Benetti wrote: > Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's > bump xr819-xradio version. > > [1]: https://github.com/fifteenhex/xradio/pull/15 > > Signed-off-by: Giulio Benetti > --- > package/xr819-xradio/xr819-xradio.hash | 4 ++-- > package/xr819-xradio/xr819-xradio.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:17:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:17:16 +0100 Subject: [Buildroot] [git commit] configs/pcengines_apu2_defconfig: bump kernel to 5.16 Message-ID: <20220122121045.BF43B81970@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=944eb00fd16b471432ee7cb4106ab9a82a2e57a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This fixes the compile errors that were present with the previous kernel version (4.19): https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 Additionally, the defconfig file was refactored: Configuration values are now grouped logically, thus increasing readability and maintainability. Signed-off-by: Danilo Bargen Signed-off-by: Thomas Petazzoni --- configs/pcengines_apu2_defconfig | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 68cebb8f6a..0792c93c19 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -1,16 +1,27 @@ +# Architecture BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_HOSTNAME="apu2" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_SYSTEM_DHCP="eth0" + +# Kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" + +# Default hostname and TTY +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Networking +BR2_SYSTEM_DHCP="eth0" + +# Rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" BR2_TARGET_ROOTFS_ISO9660_HYBRID=y # BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_SYSLINUX=y From thomas.petazzoni at bootlin.com Sat Jan 22 12:18:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:18:03 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/pcengines_apu2_defconfig: bump kernel to 5.16 In-Reply-To: <20220120000330.29552850@c3po> References: <20220116211557.71866ff6@c3po> <44c15385-c790-6867-fc1f-b24c922b7e40@benettiengineering.com> <20220120000330.29552850@c3po> Message-ID: <20220122131803.7de0d872@windsurf> On Thu, 20 Jan 2022 00:03:30 +0100 Danilo Bargen wrote: > This fixes the compile errors that were present with the previous > kernel version (4.19): > > https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 > > Additionally, the defconfig file was refactored: Configuration > values are now grouped logically, thus increasing readability and > maintainability. > > Signed-off-by: Danilo Bargen Applied to master, with one change. See below. > +# Rootfs > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_ISO9660=y > BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" > BR2_TARGET_ROOTFS_ISO9660_HYBRID=y > -# BR2_TARGET_ROOTFS_TAR is not set Not clear why you dropped this line. So I re-added it. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:18:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:18:50 +0100 Subject: [Buildroot] [git commit] package/libunistring: bump version to 1.0 Message-ID: <20220122121237.03AD5825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ad77c42db2a5359770f3623e12807d65bdec386 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update indentation in hash file (two spaces) Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- package/libunistring/libunistring.hash | 6 +++--- package/libunistring/libunistring.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index 2e4595b17d..81ffd4fb0c 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz.sig -sha256 eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7 libunistring-0.9.10.tar.xz +sha256 5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741 libunistring-1.0.tar.xz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 1ed7ecf906..a69eacd676 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNISTRING_VERSION = 0.9.10 +LIBUNISTRING_VERSION = 1.0 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sat Jan 22 12:19:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:19:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libunistring: bump version to 1.0 In-Reply-To: <20220119223208.1196891-1-paguilar@paguilar.org> References: <20220119223208.1196891-1-paguilar@paguilar.org> Message-ID: <20220122131951.2846f704@windsurf> On Wed, 19 Jan 2022 23:32:08 +0100 Pedro Aguilar wrote: > - Update indentation in hash file (two spaces) I'm not sure what went wrong, but between "sha256" and the hash, you had a tab and not two spaces, so "check-package" was complaining. I fixed that when applying to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:20:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:20:07 +0100 Subject: [Buildroot] [git commit] package/libxml2: add optional icu support Message-ID: <20220122121339.712E582627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49d7c85421e87d9d762be9352805cb47a2f0bbeb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libxml2/libxml2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..023a461472 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -24,6 +24,13 @@ LIBXML2_DEPENDENCIES = host-pkgconf HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python +ifeq ($(BR2_PACKAGE_ICU),y) +LIBXML2_DEPENDENCIES += icu +LIBXML2_CONF_OPTS += --with-icu +else +LIBXML2_CONF_OPTS += --without-icu +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBXML2_DEPENDENCIES += zlib LIBXML2_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr From thomas.petazzoni at bootlin.com Sat Jan 22 12:20:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:20:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxml2: add optional icu support In-Reply-To: <20220119090301.3649833-1-james.hilliard1@gmail.com> References: <20220119090301.3649833-1-james.hilliard1@gmail.com> Message-ID: <20220122132025.7fc0b510@windsurf> On Wed, 19 Jan 2022 02:03:01 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/libxml2/libxml2.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From bobrofon at gmail.com Sat Jan 22 12:41:11 2022 From: bobrofon at gmail.com (Sergey Bobrenok) Date: Sat, 22 Jan 2022 15:41:11 +0300 Subject: [Buildroot] [PATCH 1/1] package/sdbus-cpp: bump to version 1.1.0 Message-ID: <20220122124111.103131-1-bobrofon@gmail.com> Signed-off-by: Sergey Bobrenok --- package/sdbus-cpp/sdbus-cpp.hash | 3 ++- package/sdbus-cpp/sdbus-cpp.mk | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index 8b87653dfd..3a0e863a86 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 0fd575ae0f463773dd9141242d1133731e2b780fd6526650ce992ba711d88628 v0.8.3.tar.gz +sha256 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 v1.1.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING +sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 24904ee26f..e0fbc5c856 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,12 +4,12 @@ # ################################################################################ -SDBUS_CPP_VERSION = 0.8.3 +SDBUS_CPP_VERSION = 1.1.0 SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd -SDBUS_CPP_LICENSE = LGPL-2.1+ -SDBUS_CPP_LICENSE_FILES = COPYING +SDBUS_CPP_LICENSE = LGPL-2.1+ with exception (headers) +SDBUS_CPP_LICENSE_FILES = COPYING COPYING-LGPL-Exception $(eval $(cmake-package)) -- 2.31.1 From thomas.petazzoni at bootlin.com Sat Jan 22 13:20:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:20:46 +0100 Subject: [Buildroot] [PATCH 1/1] packages/nodejs: install npm packages on host In-Reply-To: <20220119140703.12978-1-tom.marcuzzi@orolia.com> References: <20220119140703.12978-1-tom.marcuzzi@orolia.com> Message-ID: <20220122142046.14e8ff50@windsurf> Hello Tom, On Wed, 19 Jan 2022 15:07:03 +0100 Tom Marcuzzi wrote: > Signed-off-by: Tom Marcuzzi > --- > package/nodejs/Config.in.host | 32 ++++++++++++++++++++++++++++++++ > package/nodejs/nodejs.mk | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 63 insertions(+) Thanks for your patch. Since the change is non-trivial, it would be good to have some details in the commit log about the motivations for the change. I suppose your build process at some point requires NodeJS on the host ? > diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host > index 4ceaf0c73e..601eb6e052 100644 > --- a/package/nodejs/Config.in.host > +++ b/package/nodejs/Config.in.host > @@ -16,3 +16,35 @@ config BR2_PACKAGE_HOST_NODEJS > comment "host nodejs needs a host gcc >= 8" > depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS > depends on !BR2_HOST_GCC_AT_LEAST_8 > + > +if BR2_PACKAGE_HOST_NODEJS > + > + config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL > + string "Additional modules" Please don't indent options, so remove the leading tab on all those lines. > + help > + List of space-separated nodejs modules to install via npm. Perhaps clarify that they will be installed for the host NodeJS. > + See https://npmjs.org/ to find modules and 'npm help install' > + for available installation methods. For repeatable builds, > + download and save tgz files or clone git repos for the > + components you care about. > + > + Example: > + serialport uglify-js at 1.3.4 /my/module/mymodule.tgz \ > + git://github.com/someuser/somemodule.git#v1.2 > + > + This would install the serialport module (at the newest > + version), the uglify-js module at 1.3.4, a module from a > + filesystem path, and a module from a git repository. > + > + config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS > + string "Additional module dependencies" > + help > + List of space-separated buildroot recipes which must be > + built before your npms can be installed. For example, if in > + 'Additional modules' you specified 'node-curl' (see: > + https://github.com/jiangmiao/node-curl), you could then > + specify 'libcurl' here, to ensure that buildroot builds the > + libcurl package, and does so before building your node > + modules. The libcurl example here is bad, because this BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS option should only contain host packages, and never target packages. So the example should mention host-libcurl and not libcurl. Also, this new option BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS is not used anywhere. You forgot to change: HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib to: HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib \ $(call qstrip,(BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS)) Could you have a look at the above questions, so that we can resolve the open points, and converge towards a solution that we can merge ? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:21:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:21:06 +0100 Subject: [Buildroot] [git commit] package/rtl8812au-aircrack-ng: bump version to 3a6402e Message-ID: <20220122131427.9C10182675@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2915d5a9f1f95c99f28a2276e18acdeeb0ab23d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: 47a38b7 Fix kernel 5.15 compilation 6fd304f fix libc6_2.34 dependency on build 307d694 Merge pull request #898 from CGarces/fix_5.15 191f5bc Remove REMAKE_INITRD bd8e44b Add back 8814au support 849206d Merge pull request #913 from iyanmv/iyanmv-remove-remake-initrd 7bb5114 Fix kernel v5.15+ compiler warnings 1b63ee6 Fixed compiler warning for unused function a72835d Fix (test) for IPX header on various distros 3a6402e Fix for kernel v3.20 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index 5503b4f22e..ed1921d1c2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c5d8286a00273343fc10d0e16afc52e788ac73b7df57c8159e58a40707f61da rtl8812au-aircrack-ng-b8167e66b4ac046b3b76c2c40008d84528e91594.tar.gz +sha256 acae758c3834196c71f4ee58f53a3c1b29ffd984f63ff2f40f2b080c8785c49f rtl8812au-aircrack-ng-3a6402e9e79802891f1531b435be54f4d8b71f0b.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index d42d953496..2bbca88cfb 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = b8167e66b4ac046b3b76c2c40008d84528e91594 +RTL8812AU_AIRCRACK_NG_VERSION = 3a6402e9e79802891f1531b435be54f4d8b71f0b RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sat Jan 22 13:21:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:21:14 +0100 Subject: [Buildroot] [PATCH v1] package/rtl8812au-aircrack-ng: bump version to 3a6402e In-Reply-To: <20220118162413.24664-1-ps.report@gmx.net> References: <20220118162413.24664-1-ps.report@gmx.net> Message-ID: <20220122142114.52195666@windsurf> On Tue, 18 Jan 2022 17:24:13 +0100 Peter Seiderer wrote: > Changelog: > > 47a38b7 Fix kernel 5.15 compilation > 6fd304f fix libc6_2.34 dependency on build > 307d694 Merge pull request #898 from CGarces/fix_5.15 > 191f5bc Remove REMAKE_INITRD > bd8e44b Add back 8814au support > 849206d Merge pull request #913 from iyanmv/iyanmv-remove-remake-initrd > 7bb5114 Fix kernel v5.15+ compiler warnings > 1b63ee6 Fixed compiler warning for unused function > a72835d Fix (test) for IPX header on various distros > 3a6402e Fix for kernel v3.20 > > Signed-off-by: Peter Seiderer > --- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:33:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:33:27 +0100 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <20220118111457.2491318-1-adeep@lexina.in> References: <20220118111457.2491318-1-adeep@lexina.in> Message-ID: <20220122143327.7d1a1cf7@windsurf> Hello Vyacheslav, [Arnout, Yann, Peter: question for you below.] On Tue, 18 Jan 2022 14:14:58 +0300 Vyacheslav Bocharov via buildroot wrote: > Firmware Image Package (FIP) sources to sign Amlogic SoC u-boot binaries > in LibreELEC, Armbian and meta-meson, buildroot. > > https://github.com/LibreELEC/amlogic-boot-fip > > Signed-off-by: Vyacheslav Bocharov Thanks for this contribution. I have a few small details below. But apart from the small details: there is one very significant issue. The LICENSE file says: // Redistribution and use in source and binary forms, with or without // modification is strictly prohibited without prior written permission // from Amlogic. So how can the contents of this repository be useful? OK, then can be used locally for your own experiments. But for building an actual device that you can ship/provide to others, using the contents of that repository, because Amlogic does not even allow you to distribute the contents of this repository. So I am wondering if it's really reasonable to package this in Buildroot. Arnout, Yann, Peter: what do you think about this? See the license file at https://github.com/LibreELEC/amlogic-boot-fip/blob/master/LICENSE for the full text. > diff --git a/package/amlogic-boot-fip/Config.in b/package/amlogic-boot-fip/Config.in > new file mode 100644 > index 0000000000..ceb09f8247 > --- /dev/null > +++ b/package/amlogic-boot-fip/Config.in > @@ -0,0 +1,17 @@ > +config BR2_PACKAGE_AMLOGIC_BOOT_FIP > + bool "amlogic-boot-fip" Indentation is wrong here: it should be just one tab, but you have one tab + one space. Make sure to run "make check-package" and fix the coding style issues. Also, you need: depends on BR2_TARGET_UBOOT because this package depends on U-Boot being enabled. > diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.hash b/package/amlogic-boot-fip/amlogic-boot-fip.hash > new file mode 100644 > index 0000000000..5d6dd237e3 > --- /dev/null > +++ b/package/amlogic-boot-fip/amlogic-boot-fip.hash > @@ -0,0 +1,2 @@ > +# Locally calculated > +sha256 cdf9d3872457c33a2755cc504f6b0560a62a6ee04437ac28e66623a345ed4936 amlogic-boot-fip-7ff0004e0e4d261ba81334a2f46302bd06704aca-br1.tar.gz Please add the hash of the license file. > diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.mk b/package/amlogic-boot-fip/amlogic-boot-fip.mk > new file mode 100644 > index 0000000000..6f646ae871 > --- /dev/null > +++ b/package/amlogic-boot-fip/amlogic-boot-fip.mk > @@ -0,0 +1,37 @@ > + > +################################################################################ > +# > +# amlogic-boot-fip > +# > +################################################################################ > + > +AMLOGIC_BOOT_FIP_VERSION = 7ff0004e0e4d261ba81334a2f46302bd06704aca > +AMLOGIC_BOOT_FIP_SITE = https://github.com/LibreELEC/amlogic-boot-fip > +AMLOGIC_BOOT_FIP_SITE_METHOD = git Please use the Github macro. Replace the _SITE variable by: AMLOGIC_BOOT_FIP_SITE = $(call github,LibreELEC,amlogic-boot-fip,$(AMLOGIC_BOOT_FIP_VERSION)) and drop the AMLOGIC_BOOT_FIP_SITE_METHOD variable. > +AMLOGIC_BOOT_FIP_INSTALL_IMAGES = YES > +AMLOGIC_BOOT_FIP_DEPENDENCIES = uboot > + > +AMLOGIC_BOOT_FIP_LICENSE = PROPRIETARY Please add AMLOGIC_BOOT_FIP_LICENSE_FILES as there is a license file in the repository (which contains the problematic clause) > +AMLOGIC_BOOT_FIP_REDISTRIBUTE = NO > + > +AMLOGIC_BOOT_BINS += u-boot.bin.sd.bin Just = instead of +=. But is this variable really needed? See below. > + > +define AMLOGIC_BOOT_FIP_BUILD_CMDS > + mkdir -p $(@D)/fip > + cp $(BINARIES_DIR)/u-boot.bin $(@D)/fip/bl33.bin > + cd "$(@D)"; ./build-fip.sh $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) $(@D)/fip/bl33.bin $(@D)/fip Please use tabs for indentation. Is copying $(BINARIES_DIR)/u-boot.bin to $(@D)/fip/bl33.bin if it gets passed as argument to build-fip.sh ? Would something like: cd $(@D) && \ ./build-fip.sh \ $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) \ $(BINARIES_DIR)/u-boot.bin \ $(@D)/fip work ? > +endef > + > +ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP),y) Use: ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP)$(BR_BUILDING),yy) so that this check is only done when building. > +ifeq ($(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)),) > +$(error No board u-boot firmware config name specified, check your BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD setting) > +endif # qstrip BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD > +endif > + > +define AMLOGIC_BOOT_FIP_INSTALL_IMAGES_CMDS > + $(foreach f,$(AMLOGIC_BOOT_BINS), \ > + cp -dpf "$(@D)/fip/$(f)" "$(BINARIES_DIR)/" > + ) Why have a loop with a $(AMLOGIC_BOOT_BINS) if there's only one file to copy? Just: $(INSTALL) -D -m 0644 $(@D)/fip/u-boot.bin.sd.bin $(BINARIES_DIR)/u-boot.bin.sd.bin I would have fixed myself all those small details, but the licensing/redistribution restriction seems to be a major issue to me. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:35:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:35:37 +0100 Subject: [Buildroot] [git commit] package/libjpeg: security bump to version 9e Message-ID: <20220122132930.8739B825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5e36f80a6629ef5701d4751d7fc6f7dd6a98476 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master rdgif.c, cderror.h: add sanity check for GIF image dimensions. Thank to Casper Sun for cjpeg potential vulnerability report. - Update hash of README (changes not related to license) - Update indentation in hash file (two spaces) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 4f0a677d04..1a2e82caef 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz -sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README +sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 6b55aba7e5..caf7f05f44 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,12 +4,8 @@ # ################################################################################ -LIBJPEG_VERSION = 9d -# 9d was released 2020-01-12, but the tarball was replaced upstream circa -# 2021-03, causing hash mismatch. Until there is a new version released, -# use our cached copy from s.b.o. -#LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SITE = http://sources.buildroot.org/libjpeg +LIBJPEG_VERSION = 9e +LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README From thomas.petazzoni at bootlin.com Sat Jan 22 13:36:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:36:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjpeg: security bump to version 9e In-Reply-To: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> References: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> Message-ID: <20220122143630.5ffd3018@windsurf> On Mon, 17 Jan 2022 23:30:26 +0100 Fabrice Fontaine wrote: > rdgif.c, cderror.h: add sanity check for GIF image dimensions. > Thank to Casper Sun for cjpeg potential vulnerability report. > > - Update hash of README (changes not related to license) > - Update indentation in hash file (two spaces) > > https://jpegclub.org/reference/reference-sources/ > > Signed-off-by: Fabrice Fontaine > --- > package/libjpeg/libjpeg.hash | 4 ++-- > package/libjpeg/libjpeg.mk | 8 ++------ > 2 files changed, 4 insertions(+), 8 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:38:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:38:51 +0100 Subject: [Buildroot] [git commit] package/libxcrypt: bump to version 4.4.27 Message-ID: <20220122133233.3BF6082914@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61ef0ff827754d07cd006f3107d4772ba1d2d1fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The hash of the LICENSING file is modified due to changes in file paths listed in that file. No impact on the licensing terms. Signed-off-by: Guillaume W. Bres Signed-off-by: Thomas Petazzoni --- package/libxcrypt/libxcrypt.hash | 4 ++-- package/libxcrypt/libxcrypt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index b47f470020..99ddf62be0 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 libxcrypt-4.4.26.tar.gz -sha256 cead8b3d94a143f64ccb571ada1cea47a70a0b847c8d95306e8d78ed68951f3d LICENSING +sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz +sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 3c98b30dd5..65efa2bab9 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.26 +LIBXCRYPT_VERSION = 4.4.27 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB From thomas.petazzoni at bootlin.com Sat Jan 22 13:43:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:43:15 +0100 Subject: [Buildroot] [PATCH] package/libxcrypt: bump to version 4.4.27 In-Reply-To: <20220117124605.17592-1-guillaume.bressaix@gmail.com> References: <20220117124605.17592-1-guillaume.bressaix@gmail.com> Message-ID: <20220122144315.030cc013@windsurf> Hello Guillaume, On Mon, 17 Jan 2022 13:46:05 +0100 "Guillaume W. Bres" wrote: > Signed-off-by: Guillaume W. Bres > --- > package/libxcrypt/libxcrypt.hash | 2 +- > package/libxcrypt/libxcrypt.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) I have applied to master, but you had forgotten to test "make legal-info" after this update, and the hash of the license files had changed. I fixed that up, and explained in the commit log why the hash changed. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:52:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:52:21 +0100 Subject: [Buildroot] [git commit] package/vte: install to staging Message-ID: <20220122134552.433EF8291D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2ecc4379d1b310184c721dd4c9be0a12269f6234 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master vte also provides libvte, a library that can be linked to by other programs, so install it in staging. Signed-off-by: Rainer Jonsson Signed-off-by: Thomas Petazzoni --- package/vte/vte.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/vte/vte.mk b/package/vte/vte.mk index 07e813685e..ceb2f09d67 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -11,6 +11,7 @@ VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) VTE_LICENSE = LGPL-3.0+ VTE_LICENSE_FILES = COPYING.LGPL3 +VTE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_ICU),y) VTE_CONF_OPTS += -Dicu=true From thomas.petazzoni at bootlin.com Sat Jan 22 13:53:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:53:23 +0100 Subject: [Buildroot] package/vte: install to staging In-Reply-To: <20220117114419.B8EAB3F465@exit1-us.msgsafe.io> References: <20220117114419.B8EAB3F465@exit1-us.msgsafe.io> Message-ID: <20220122145323.583b4b6c@windsurf> Hello, On Mon, 17 Jan 2022 11:44:19 +0000 (UTC) rainbox2k12 via buildroot wrote: > Can you accept my patch as an attached text document? I have applied your patch. I suppose this msgsafe.io service doesn't provide SMTP, so you can't use git send-email? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:54:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:54:13 +0100 Subject: [Buildroot] [git commit] package/prosody: security bump to 0.11.12 Message-ID: <20220122134746.DE22E8291D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d99bd8f7e0e3694828820a5ac1e0a09425d571d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://blog.prosody.im/prosody-0.11.12-released/ Signed-off-by: Francois Perrad [Thomas: update separator for license file hash.] Signed-off-by: Thomas Petazzoni --- package/prosody/prosody.hash | 10 +++++----- package/prosody/prosody.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index ee459f85d8..b6fa6532a5 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz -sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz -sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz -sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz +md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz +sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz +sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz +sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz # Hash for license file: -sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING +sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7acfa4708d..d697c85568 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.11 +PROSODY_VERSION = 0.11.12 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Sat Jan 22 13:54:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:54:36 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.12 In-Reply-To: <20220117113656.234077-1-francois.perrad@gadz.org> References: <20220117113656.234077-1-francois.perrad@gadz.org> Message-ID: <20220122145436.080cda5b@windsurf> On Mon, 17 Jan 2022 12:36:56 +0100 Francois Perrad wrote: > see https://blog.prosody.im/prosody-0.11.12-released/ > > Signed-off-by: Francois Perrad > --- > package/prosody/prosody.hash | 8 ++++---- > package/prosody/prosody.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:01:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:01:57 +0100 Subject: [Buildroot] [git commit] configs/mx6sx_udoo_neo: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220122135529.7231182745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8bf60c50c91e23db2944d32d9a2e9db921cfcc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/mx6sx_udoo_neo_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 3e1dc33bd4..793d992ce7 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -13,6 +13,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" From thomas.petazzoni at bootlin.com Sat Jan 22 14:02:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:02:19 +0100 Subject: [Buildroot] [PATCH] configs/mx6sx_udoo_neo: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20220117020553.749592-1-festevam@gmail.com> References: <20220117020553.749592-1-festevam@gmail.com> Message-ID: <20220122150219.49061424@windsurf> On Sun, 16 Jan 2022 23:05:53 -0300 Fabio Estevam wrote: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 > > Signed-off-by: Fabio Estevam > --- > configs/mx6sx_udoo_neo_defconfig | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:08:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:08:18 +0100 Subject: [Buildroot] [git commit] configs/kontron_pitx_imx8m: bump kernel to 5.16.1 Message-ID: <20220122140143.E319782929@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96a1344aaed5a36c25b507e5b21f247438a22c67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- configs/kontron_pitx_imx8m_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 2a4aa1a0ab..8f756f5246 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pitx-imx8mq.dtb" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" @@ -18,7 +18,7 @@ BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y From thomas.petazzoni at bootlin.com Sat Jan 22 14:07:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:07:23 +0100 Subject: [Buildroot] [git commit] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script Message-ID: <20220122140143.DAA0482926@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed380f62e0260cdf91e60bfb3706f17a96fddabf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- board/kontron/pitx-imx8m/boot.cmd | 8 -------- board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- board/kontron/pitx-imx8m/post-image.sh | 2 +- configs/kontron_pitx_imx8m_defconfig | 3 +-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/board/kontron/pitx-imx8m/boot.cmd b/board/kontron/pitx-imx8m/boot.cmd deleted file mode 100644 index 4d89235392..0000000000 --- a/board/kontron/pitx-imx8m/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -echo "Root File Sytem on MMC${devnum}" -setenv rootfs /dev/mmcblk${devnum}p1 -setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} - -load ${devtype} ${devnum} ${kernel_addr_r} boot/Image -load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mq-kontron-pitx-imx8m.dtb - -booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/kontron/pitx-imx8m/extlinux.conf b/board/kontron/pitx-imx8m/extlinux.conf new file mode 100644 index 0000000000..2911acec59 --- /dev/null +++ b/board/kontron/pitx-imx8m/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mq-kontron-pitx-imx8m.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg index c78ef0f910..4a0aa117fb 100644 --- a/board/kontron/pitx-imx8m/genimage.cfg +++ b/board/kontron/pitx-imx8m/genimage.cfg @@ -1,5 +1,6 @@ image sdcard.img { hdimage { + partition-table-type = "gpt" } partition imx-boot { @@ -9,8 +10,8 @@ image sdcard.img { } partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% } } diff --git a/board/kontron/pitx-imx8m/post-build.sh b/board/kontron/pitx-imx8m/post-build.sh index 4574221fe5..bf8861f6a9 100755 --- a/board/kontron/pitx-imx8m/post-build.sh +++ b/board/kontron/pitx-imx8m/post-build.sh @@ -1,4 +1,7 @@ #!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" -mkdir -p $TARGET_DIR/boot/ -cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/pitx-imx8m/post-image.sh b/board/kontron/pitx-imx8m/post-image.sh index 564211c829..3452fd4501 100755 --- a/board/kontron/pitx-imx8m/post-image.sh +++ b/board/kontron/pitx-imx8m/post-image.sh @@ -1,3 +1,3 @@ #!/bin/sh -support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 0e3868b583..2a4aa1a0ab 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -49,5 +50,3 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/pitx-imx8m/boot.cmd" From thomas.petazzoni at bootlin.com Sat Jan 22 14:11:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:11:30 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: <20220117080616.10563-1-heiko.thiery@gmail.com> References: <20220117080616.10563-1-heiko.thiery@gmail.com> Message-ID: <20220122151130.59ae7148@windsurf> On Mon, 17 Jan 2022 09:06:16 +0100 Heiko Thiery wrote: > Signed-off-by: Heiko Thiery > --- > board/kontron/pitx-imx8m/boot.cmd | 8 -------- > board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ > board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- > board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- > board/kontron/pitx-imx8m/post-image.sh | 2 +- > configs/kontron_pitx_imx8m_defconfig | 3 +-- > 6 files changed, 14 insertions(+), 15 deletions(-) > delete mode 100644 board/kontron/pitx-imx8m/boot.cmd > create mode 100644 board/kontron/pitx-imx8m/extlinux.conf I have applied, but I am a bit worried about things are going on with this switch to extlinux.conf. Indeed, we have: * Platforms where the UUID is hardcoded into genimage.cfg and extlinux.conf, such as board/beaglev/ * We have platforms where a "uuid" variable in filled in U-Boot before triggering the extlinux.conf logic, and therefore extlinux.conf uses root=PARTUUID=${uuid}. For example board/freescale/imx7dsdb/rootfs_overlay/boot/extlinux/extlinux.conf, board/orangepi/orangepi-zero/boot.cmd, board/solidrun/mx6cubox/rootfs_overlay/boot/extlinux/extlinux.conf, board/technexion/imx6ulpico/rootfs_overlay/boot/extlinux/extlinux.conf, and a few others. * We now have platforms (kontron/smarc-sal28 and kontron/pitx-imx8m) where a random UUID is generated in the post-build script, and used in genimage and extlinux.conf. I'm not sure where we want to go, and how much we want to enforce "best practices" that are common on all platforms, or just let each platform do its little business. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:11:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:11:33 +0100 Subject: [Buildroot] [PATCH 2/2] configs/kontron_pitx_imx8m_defconfig: bump kernel to 5.16.1 In-Reply-To: <20220117080616.10563-2-heiko.thiery@gmail.com> References: <20220117080616.10563-1-heiko.thiery@gmail.com> <20220117080616.10563-2-heiko.thiery@gmail.com> Message-ID: <20220122151133.1e3200cf@windsurf> On Mon, 17 Jan 2022 09:06:17 +0100 Heiko Thiery wrote: > Signed-off-by: Heiko Thiery > --- > configs/kontron_pitx_imx8m_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:32:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:32:43 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220122153243.009b24ba@windsurf> Hello, On Tue, 18 Jan 2022 11:43:10 +0100 Giulio Benetti wrote: > this patchset aims to enable the best FPU strategy for every board with > 32-bits Arm Cortex actually present in Buildroot. I don't own these boards > so I can't test these changes. What is about Allwinner doesn't worry me > because I've tested a lot of cases with Olimex boards, but the other > changes are still to be tested. > > So I ask to the board maintainers to test the patches that involve their > boards if possible. Anyway I've checked well all the SoCs Datasheet and I > think I've made it correctly, even if in some of them it's not specified > if VFPv4 means -D32. I assume it like that because otherwise -D16 is > usually specified. Do we have a good understand of what -mfpu=neon-vfpv4 does? Your patch series basically converts many defconfigs to use this -mfpu value, but it's not clear to me how it works. What does it mean to combine NEON and VFPv4 instructions? Regarding VFPv4 D16 vs. D32, https://developer.arm.com/documentation/den0018/a/Compiling-NEON-Instructions/GCC-command-line-options/Option-to-specify-the-FPU tells us: VFPv3 and VFPv4 implementations provide 32 double-precision registers. However, when NEON unit is not present, the top sixteen registers (D16-D31) become optional. This is shown by the -d16 in the option name, which means that the top sixteen D registers are not available. So, my understanding is that when NEON is available, the VFPv4 is guaranteed to have the 32 double-precision registers (D32). Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:33:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:33:13 +0100 Subject: [Buildroot] [git commit] Revert "package/libmicrohttpd: fix pthread detection" Message-ID: <20220122142637.E41FF81351@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=937a70001f4d8ebd39050af64deff759f8de4385 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 834464792e691a243d456335083b2a8b3363e261, the build failure is not related to the bump to 0.9.75 but to or1k and gcc 10. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmicrohttpd/libmicrohttpd.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 344e1443fd..f75178bc0a 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -12,10 +12,6 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBMICROHTTPD_CFLAGS += -D_REENTRANT -endif - LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) From thomas.petazzoni at bootlin.com Sat Jan 22 14:33:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:33:07 +0100 Subject: [Buildroot] [git commit] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed Message-ID: <20220122142637.DBF84818AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98e39dc80ee81a166df90b4ff3232038a63b759c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.): configure:13774: checking whether pthreads work with -pthread configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 conftest.c:27:26: error: #error "_REENTRANT must be defined" 27 | # error "_REENTRANT must be defined" | ^~~~~ It should be noted that external bootlins will have to be rebuilt. Fixes: - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + diff --git a/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + From thomas.petazzoni at bootlin.com Sat Jan 22 14:36:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:36:30 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220118222425.164134-1-fontaine.fabrice@gmail.com> References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Message-ID: <20220122153630.68f6ccc3@windsurf> Hello, On Tue, 18 Jan 2022 23:24:24 +0100 Fabrice Fontaine wrote: > Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc > 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build > failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, > etc.): > > configure:13774: checking whether pthreads work with -pthread > configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 > conftest.c:27:26: error: #error "_REENTRANT must be defined" > 27 | # error "_REENTRANT must be defined" > | ^~~~~ > > It should be noted that external bootlins will have to be rebuilt. > > Fixes: > - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 > - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 > - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 > > Signed-off-by: Fabrice Fontaine > --- > ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++ > ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++ > 2 files changed, 62 insertions(+) > create mode 100644 package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch > create mode 100644 package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Both patches applied. The Bootlin toolchains are being rebuilt. I'll send an update when the toolchains are ready. Best regards, Thomas Petazzoni -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:39:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:39:32 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to version 2.4.3 Message-ID: <20220122143253.0CF1C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=829bf508bba7df9aee3f86bcd70394ee487b19a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 https://blog.hartwork.org/posts/expat-2-4-3-released https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 8cf563d8f5..0853c3c76d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ -md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz -sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ +md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz +sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz # Locally calculated -sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb1cfd8c8a..a7ace66095 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.1 +EXPAT_VERSION = 2.4.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sat Jan 22 14:39:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:39:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.4.3 In-Reply-To: <20220116210816.3210061-1-fontaine.fabrice@gmail.com> References: <20220116210816.3210061-1-fontaine.fabrice@gmail.com> Message-ID: <20220122153951.48f3e00b@windsurf> On Sun, 16 Jan 2022 22:08:16 +0100 Fabrice Fontaine wrote: > Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 > > https://blog.hartwork.org/posts/expat-2-4-3-released > https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes > > Signed-off-by: Fabrice Fontaine > --- > package/expat/expat.hash | 8 ++++---- > package/expat/expat.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From adeep at lexina.in Sat Jan 22 15:05:06 2022 From: adeep at lexina.in (Vyacheslav) Date: Sat, 22 Jan 2022 18:05:06 +0300 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <20220122143327.7d1a1cf7@windsurf> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> Message-ID: <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> Hi. 22.01.2022 16:33, Thomas Petazzoni wrote: > Hello Vyacheslav, > > [Arnout, Yann, Peter: question for you below.] > > On Tue, 18 Jan 2022 14:14:58 +0300 > Vyacheslav Bocharov via buildroot wrote: > >> Firmware Image Package (FIP) sources to sign Amlogic SoC u-boot binaries >> in LibreELEC, Armbian and meta-meson, buildroot. >> >> https://github.com/LibreELEC/amlogic-boot-fip >> >> Signed-off-by: Vyacheslav Bocharov > > Thanks for this contribution. I have a few small details below. But > apart from the small details: there is one very significant issue. The > LICENSE file says: > > // Redistribution and use in source and binary forms, with or without > // modification is strictly prohibited without prior written permission > // from Amlogic. > > So how can the contents of this repository be useful? OK, then can be > used locally for your own experiments. But for building an actual > device that you can ship/provide to others, using the contents of that > repository, because Amlogic does not even allow you to distribute the > contents of this repository. > > So I am wondering if it's really reasonable to package this in > Buildroot. > You already have package/odroidc2-firmware with same license. amlogic-boot-fip just put all similar binaries together and Neil Armstrong made a build system for aml uboot binaries. > Arnout, Yann, Peter: what do you think about this? See the license file > at https://github.com/LibreELEC/amlogic-boot-fip/blob/master/LICENSE > for the full text. > > >> diff --git a/package/amlogic-boot-fip/Config.in b/package/amlogic-boot-fip/Config.in >> new file mode 100644 >> index 0000000000..ceb09f8247 >> --- /dev/null >> +++ b/package/amlogic-boot-fip/Config.in >> @@ -0,0 +1,17 @@ >> +config BR2_PACKAGE_AMLOGIC_BOOT_FIP >> + bool "amlogic-boot-fip" > > Indentation is wrong here: it should be just one tab, but you have one > tab + one space. Make sure to run "make check-package" and fix the > coding style issues. Thanks, i missed this. > > Also, you need: > > depends on BR2_TARGET_UBOOT > > because this package depends on U-Boot being enabled. > >> diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.hash b/package/amlogic-boot-fip/amlogic-boot-fip.hash >> new file mode 100644 >> index 0000000000..5d6dd237e3 >> --- /dev/null >> +++ b/package/amlogic-boot-fip/amlogic-boot-fip.hash >> @@ -0,0 +1,2 @@ >> +# Locally calculated >> +sha256 cdf9d3872457c33a2755cc504f6b0560a62a6ee04437ac28e66623a345ed4936 amlogic-boot-fip-7ff0004e0e4d261ba81334a2f46302bd06704aca-br1.tar.gz > > Please add the hash of the license file. > >> diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.mk b/package/amlogic-boot-fip/amlogic-boot-fip.mk >> new file mode 100644 >> index 0000000000..6f646ae871 >> --- /dev/null >> +++ b/package/amlogic-boot-fip/amlogic-boot-fip.mk >> @@ -0,0 +1,37 @@ >> + >> +################################################################################ >> +# >> +# amlogic-boot-fip >> +# >> +################################################################################ >> + >> +AMLOGIC_BOOT_FIP_VERSION = 7ff0004e0e4d261ba81334a2f46302bd06704aca >> +AMLOGIC_BOOT_FIP_SITE = https://github.com/LibreELEC/amlogic-boot-fip >> +AMLOGIC_BOOT_FIP_SITE_METHOD = git > > Please use the Github macro. Replace the _SITE variable by: > > AMLOGIC_BOOT_FIP_SITE = $(call github,LibreELEC,amlogic-boot-fip,$(AMLOGIC_BOOT_FIP_VERSION)) > > and drop the AMLOGIC_BOOT_FIP_SITE_METHOD variable. > >> +AMLOGIC_BOOT_FIP_INSTALL_IMAGES = YES >> +AMLOGIC_BOOT_FIP_DEPENDENCIES = uboot >> + >> +AMLOGIC_BOOT_FIP_LICENSE = PROPRIETARY > > Please add AMLOGIC_BOOT_FIP_LICENSE_FILES as there is a license file in > the repository (which contains the problematic clause) > >> +AMLOGIC_BOOT_FIP_REDISTRIBUTE = NO >> + >> +AMLOGIC_BOOT_BINS += u-boot.bin.sd.bin > > Just = instead of +=. But is this variable really needed? See below. > >> + >> +define AMLOGIC_BOOT_FIP_BUILD_CMDS >> + mkdir -p $(@D)/fip >> + cp $(BINARIES_DIR)/u-boot.bin $(@D)/fip/bl33.bin >> + cd "$(@D)"; ./build-fip.sh $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) $(@D)/fip/bl33.bin $(@D)/fip > > Please use tabs for indentation. Is copying $(BINARIES_DIR)/u-boot.bin > to $(@D)/fip/bl33.bin if it gets passed as argument to build-fip.sh ? > > Would something like: > > cd $(@D) && \ > ./build-fip.sh \ > $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) \ > $(BINARIES_DIR)/u-boot.bin \ > $(@D)/fip > > work ? Seems to yes. It really can be improved. Thanks. > >> +endef >> + >> +ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP),y) > > Use: > > ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP)$(BR_BUILDING),yy) > > so that this check is only done when building. > >> +ifeq ($(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)),) >> +$(error No board u-boot firmware config name specified, check your BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD setting) >> +endif # qstrip BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD >> +endif >> + >> +define AMLOGIC_BOOT_FIP_INSTALL_IMAGES_CMDS >> + $(foreach f,$(AMLOGIC_BOOT_BINS), \ >> + cp -dpf "$(@D)/fip/$(f)" "$(BINARIES_DIR)/" >> + ) > > Why have a loop with a $(AMLOGIC_BOOT_BINS) if there's only one file to > copy? In some cases you may need more than one file. But you're right it's better this way. > > Just: > > $(INSTALL) -D -m 0644 $(@D)/fip/u-boot.bin.sd.bin $(BINARIES_DIR)/u-boot.bin.sd.bin > > I would have fixed myself all those small details, but the > licensing/redistribution restriction seems to be a major issue to me. Thank you for sorting out the bugs. I'll fix them in the next version of the patch, if we come to a consensus on the possibility of using the license. > > Best regards, > > Thomas -- Vyacheslav Bocharov From thomas.petazzoni at bootlin.com Sat Jan 22 15:09:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 16:09:14 +0100 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> Message-ID: <20220122160914.7e4cc513@windsurf> Hello, On Sat, 22 Jan 2022 18:05:06 +0300 Vyacheslav wrote: > > So how can the contents of this repository be useful? OK, then can be > > used locally for your own experiments. But for building an actual > > device that you can ship/provide to others, using the contents of that > > repository, because Amlogic does not even allow you to distribute the > > contents of this repository. > > > > So I am wondering if it's really reasonable to package this in > > Buildroot. > > > You already have package/odroidc2-firmware with same license. > amlogic-boot-fip just put all similar binaries together and Neil > Armstrong made a build system for aml uboot binaries. Well, I wasn't aware package/odroidc2-firmware was under the same restrictive license. Are the license terms for package/odroidc2-firmware available somewhere? This package is downloaded from https://github.com/hardkernel/u-boot, but I don't see the license terms from Amlogic preventing redistribution. Of course, I understand that they simply may be missing (which would be really bad!). But how can anyone use those blobs? You can't redistribute them. According to their license, just putting them on Github is not even allowed. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From heiko.thiery at gmail.com Sat Jan 22 15:31:38 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sat, 22 Jan 2022 16:31:38 +0100 Subject: [Buildroot] [PATCH] configs/kontron_pitx_imx8m_defconfig: remove BR2_ARM_FPU_VFPV3 In-Reply-To: <20220122131500.10cafe0a@windsurf> References: <20220120135251.4225-1-heiko.thiery@gmail.com> <20220122131500.10cafe0a@windsurf> Message-ID: Hi Thomas, Am Sa., 22. Jan. 2022 um 13:15 Uhr schrieb Thomas Petazzoni : > > On Thu, 20 Jan 2022 14:52:52 +0100 > Heiko Thiery wrote: > > > The FP setting is not used for aarch64 in buildroot. The FPU options are > > set implicit. > > > > Signed-off-by: Heiko Thiery > > --- > > configs/kontron_pitx_imx8m_defconfig | 1 - > > 1 file changed, 1 deletion(-) > > Applied to master, thanks. That being said the FPU handling on AArch64 > is not very clear to me. I'm not sure we're handling it correctly in > Buildroot today. I must admit that I have not fully understood the topic FPU either. What I am sure of is that the kconfig selection of the "Floating point stategy" option for aarch64 has no effect, since this setting is made implicitly depending on the target architecture used. Therefore, a patch could look something like this to fix this: diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 4c0910e4f8..05acaa9157 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -618,6 +618,7 @@ endchoice choice prompt "Floating point strategy" + depends on BR2_arm || BR2_armeb default BR2_ARM_FPU_FP_ARMV8 if BR2_ARM_CPU_HAS_FP_ARMV8 default BR2_ARM_FPU_FPV5D16 if BR2_ARM_CPU_HAS_FPV5 default BR2_ARM_FPU_FPV4D16 if BR2_ARM_CPU_HAS_FPV4 -- Heiko From bernd.kuhls at t-online.de Sat Jan 22 15:32:07 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 22 Jan 2022 16:32:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-mediadriver: bump version to 22.1.1 Message-ID: <20220122153207.1376790-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 38121da036..ceafa20e80 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c1cd5c4c1b7bd1c7785ed4d553b76b17dd7e673619a39e0c3070246aa671024 intel-media-22.1.0.tar.gz +sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.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 99348537bf..d8820379e7 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 = 22.1.0 +INTEL_MEDIADRIVER_VERSION = 22.1.1 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 22 15:34:41 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 22 Jan 2022 16:34:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.4 Message-ID: <20220122153441.1377553-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1cdfff50c9..09640a903c 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.3 +MESA3D_HEADERS_VERSION = 21.3.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 235a1b55bb..0f373e29a6 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-December/000658.html -sha256 ad7f4613ea7c5d08d9fcb5025270199e6ceb9aa99fd72ee572b70342240a8121 mesa-21.3.3.tar.xz -sha512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673 mesa-21.3.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html +sha256 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d mesa-21.3.4.tar.xz +sha512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9 mesa-21.3.4.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index c4e213088e..0d80813d01 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.3 +MESA3D_VERSION = 21.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 22 15:36:29 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 22 Jan 2022 16:36:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-vdr-vnsi: bump version to 19.0.3-Matrix Message-ID: <20220122153629.1378404-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 4cd1f7ad6b..e3dc5585d2 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz +sha256 317442cdfd333f47dfe95d05057a682340dd5ba53efc8894e892ee565b8aaece kodi-pvr-vdr-vnsi-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 65e69d2b23..f0d61d9d2e 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.3-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md -- 2.30.2 From peter at korsgaard.com Sat Jan 22 15:37:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 16:37:13 +0100 Subject: [Buildroot] [PATCH 3/3] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 In-Reply-To: <20220122153714.26991-1-peter@korsgaard.com> References: <20220122153714.26991-1-peter@korsgaard.com> Message-ID: <20220122153714.26991-3-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- configs/qemu_aarch64_virt_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 0caf38112d..9fbf293311 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -- 2.20.1 From peter at korsgaard.com Sat Jan 22 15:37:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 16:37:12 +0100 Subject: [Buildroot] [PATCH 2/3] configs/qemu_aarch64_virt_defconfig: linux.config: enable fb/input support In-Reply-To: <20220122153714.26991-1-peter@korsgaard.com> References: <20220122153714.26991-1-peter@korsgaard.com> Message-ID: <20220122153714.26991-2-peter@korsgaard.com> The Linux config already enabled drm-virtio for graphics output, but not the corresponding virtio-input / evdev drivers for input or the compatibility fb option. Enable them so keyboard/mouse input works and /dev/fb0 is provided. Signed-off-by: Peter Korsgaard --- board/qemu/aarch64-virt/linux.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/qemu/aarch64-virt/linux.config b/board/qemu/aarch64-virt/linux.config index e3a4a92913..f9763b73b7 100644 --- a/board/qemu/aarch64-virt/linux.config +++ b/board/qemu/aarch64-virt/linux.config @@ -47,6 +47,7 @@ CONFIG_DUMMY=y CONFIG_MACVLAN=y CONFIG_VIRTIO_NET=y CONFIG_NLMON=y +CONFIG_INPUT_EVDEV=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y @@ -56,9 +57,11 @@ CONFIG_TCG_TPM=y CONFIG_TCG_TIS=y CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL031=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_MAILBOX=y -- 2.20.1 From peter at korsgaard.com Sat Jan 22 15:37:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 16:37:11 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu_aarch64_virt_defconfig: don't hard code getty port Message-ID: <20220122153714.26991-1-peter@korsgaard.com> The Linux defconfig both has VT and serial port support, so it makes more sense to run getty on /dev/console instead of hard coding the serial port. Signed-off-by: Peter Korsgaard --- configs/qemu_aarch64_virt_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index e6b72d8838..0caf38112d 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -4,7 +4,6 @@ BR2_cortex_a53=y # System BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -- 2.20.1 From heiko.thiery at gmail.com Sat Jan 22 15:59:52 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sat, 22 Jan 2022 16:59:52 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: <20220122151130.59ae7148@windsurf> References: <20220117080616.10563-1-heiko.thiery@gmail.com> <20220122151130.59ae7148@windsurf> Message-ID: Hi Thomas, Am Sa., 22. Jan. 2022 um 15:11 Uhr schrieb Thomas Petazzoni : > > On Mon, 17 Jan 2022 09:06:16 +0100 > Heiko Thiery wrote: > > > Signed-off-by: Heiko Thiery > > --- > > board/kontron/pitx-imx8m/boot.cmd | 8 -------- > > board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ > > board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- > > board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- > > board/kontron/pitx-imx8m/post-image.sh | 2 +- > > configs/kontron_pitx_imx8m_defconfig | 3 +-- > > 6 files changed, 14 insertions(+), 15 deletions(-) > > delete mode 100644 board/kontron/pitx-imx8m/boot.cmd > > create mode 100644 board/kontron/pitx-imx8m/extlinux.conf > > I have applied, but I am a bit worried about things are going on with > this switch to extlinux.conf. I was not aware of the different approaches. > Indeed, we have: > > * Platforms where the UUID is hardcoded into genimage.cfg and > extlinux.conf, such as board/beaglev/ > > * We have platforms where a "uuid" variable in filled in U-Boot before > triggering the extlinux.conf logic, and therefore extlinux.conf uses > root=PARTUUID=${uuid}. For example > board/freescale/imx7dsdb/rootfs_overlay/boot/extlinux/extlinux.conf, > board/orangepi/orangepi-zero/boot.cmd, > board/solidrun/mx6cubox/rootfs_overlay/boot/extlinux/extlinux.conf, > board/technexion/imx6ulpico/rootfs_overlay/boot/extlinux/extlinux.conf, > and a few others. For the technexion board there is some logic in u-boot to setp and discover the uuid of the root partition. https://source.denx.de/u-boot/u-boot/-/blob/master/include/configs/pico-imx6ul.h#L90 > * We now have platforms (kontron/smarc-sal28 and kontron/pitx-imx8m) > where a random UUID is generated in the post-build script, and used > in genimage and extlinux.conf. With this approach it is independent if the image is installed on the SD card or the eMMC or what else. But here one pitfall is when the image is installed on more devices. > I'm not sure where we want to go, and how much we want to enforce "best > practices" that are common on all platforms, or just let each platform > do its little business. From adeep at lexina.in Sat Jan 22 16:09:28 2022 From: adeep at lexina.in (Vyacheslav) Date: Sat, 22 Jan 2022 19:09:28 +0300 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <20220122160914.7e4cc513@windsurf> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> <20220122160914.7e4cc513@windsurf> Message-ID: <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> Hi, Neil! Can you help us with understanding license for Amlogic binaries in https://github.com/LibreELEC/amlogic-boot-fip? 22.01.2022 18:09, Thomas Petazzoni wrote: > Hello, > > On Sat, 22 Jan 2022 18:05:06 +0300 > Vyacheslav wrote: > >>> So how can the contents of this repository be useful? OK, then can be >>> used locally for your own experiments. But for building an actual >>> device that you can ship/provide to others, using the contents of that >>> repository, because Amlogic does not even allow you to distribute the >>> contents of this repository. >>> >>> So I am wondering if it's really reasonable to package this in >>> Buildroot. >>> >> You already have package/odroidc2-firmware with same license. >> amlogic-boot-fip just put all similar binaries together and Neil >> Armstrong made a build system for aml uboot binaries. > > Well, I wasn't aware package/odroidc2-firmware was under the same > restrictive license. Are the license terms for > package/odroidc2-firmware available somewhere? This package is > downloaded from https://github.com/hardkernel/u-boot, but I don't see > the license terms from Amlogic preventing redistribution. Of course, I > understand that they simply may be missing (which would be really bad!). > > But how can anyone use those blobs? You can't redistribute them. > According to their license, just putting them on Github is not even > allowed. > > Thomas From peter at korsgaard.com Sat Jan 22 16:54:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 17:54:47 +0100 Subject: [Buildroot] [PATCH] package/xserver_xorg-server: security bump to version 21.1.2 In-Reply-To: <20211216171656.27339-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 16 Dec 2021 18:16:55 +0100") References: <20211216171656.27339-1-peter@korsgaard.com> Message-ID: <87bl03zp60.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following vulnerabilities: > * CVE-2021-4008/ZDI-CAN-14192 SProcRenderCompositeGlyphs out-of-bounds > access > The handler for the CompositeGlyphs request of the Render extension does > not properly validate the request length leading to out of bounds memory > write. > * CVE-2021-4009/ZDI-CAN 14950 SProcXFixesCreatePointerBarrier out-of-bounds > access > The handler for the CreatePointerBarrier request of the XFixes extension > does not properly validate the request length leading to out of bounds > memory write. > * CVE-2021-4010/ZDI-CAN-14951 SProcScreenSaverSuspend out-of-bounds access > The handler for the Suspend request of the Screen Saver extension does not > properly validate the request length leading to out of bounds memory > write. > * CVE-2021-4011/ZDI-CAN-14952 SwapCreateRegister out-of-bounds access > The handlers for the RecordCreateContext and RecordRegisterClients > requests of the Record extension do not properly validate the request > length leading to out of bounds memory write. > For details, see the advisory: > https://lists.x.org/archives/xorg-announce/2021-December/003122.html > Builds without systemd unfortunately got broken. Add a patch fixing that > from an upstream merge request: > https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/827 > Signed-off-by: Peter Korsgaard In the mean time xserver 1.20.14 has been released with the same security fixes, so I've used that for 2021.02.x / 2021.11.x. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 16:50:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 17:50:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xserver_xorg-server: security bump to version 1.20.14 Message-ID: <20220122172216.C72CF829F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a29088b78d06e066ba3c743d85c09f25e1c5fd51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following vulnerabilities: * CVE-2021-4008/ZDI-CAN-14192 SProcRenderCompositeGlyphs out-of-bounds access The handler for the CompositeGlyphs request of the Render extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4009/ZDI-CAN 14950 SProcXFixesCreatePointerBarrier out-of-bounds access The handler for the CreatePointerBarrier request of the XFixes extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4010/ZDI-CAN-14951 SProcScreenSaverSuspend out-of-bounds access The handler for the Suspend request of the Screen Saver extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4011/ZDI-CAN-14952 SwapCreateRegister out-of-bounds access The handlers for the RecordCreateContext and RecordRegisterClients requests of the Record extension do not properly validate the request length leading to out of bounds memory write. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2021-December/003122.html Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 8eb56ba027..3d4796ef6b 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-July/003100.html -sha256 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 xorg-server-1.20.13.tar.xz -sha512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 xorg-server-1.20.13.tar.xz +# From https://lists.x.org/archives/xorg-announce/2021-December/003124.html +sha256 5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b xorg-server-1.20.14.tar.xz +sha512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 xorg-server-1.20.14.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index e649fbb7c6..077436dde4 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.20.13 +XSERVER_XORG_SERVER_VERSION = 1.20.14 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Sat Jan 22 16:53:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 17:53:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xserver_xorg-server: security bump to version 1.20.14 Message-ID: <20220122172227.4E44D829F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff1cd8a27540f677dcf6106f3958701922fdb40e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following vulnerabilities: * CVE-2021-4008/ZDI-CAN-14192 SProcRenderCompositeGlyphs out-of-bounds access The handler for the CompositeGlyphs request of the Render extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4009/ZDI-CAN 14950 SProcXFixesCreatePointerBarrier out-of-bounds access The handler for the CreatePointerBarrier request of the XFixes extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4010/ZDI-CAN-14951 SProcScreenSaverSuspend out-of-bounds access The handler for the Suspend request of the Screen Saver extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4011/ZDI-CAN-14952 SwapCreateRegister out-of-bounds access The handlers for the RecordCreateContext and RecordRegisterClients requests of the Record extension do not properly validate the request length leading to out of bounds memory write. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2021-December/003122.html Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 8eb56ba027..3d4796ef6b 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-July/003100.html -sha256 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 xorg-server-1.20.13.tar.xz -sha512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 xorg-server-1.20.13.tar.xz +# From https://lists.x.org/archives/xorg-announce/2021-December/003124.html +sha256 5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b xorg-server-1.20.14.tar.xz +sha512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 xorg-server-1.20.14.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index c326230be0..e891a0ee42 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.20.13 +XSERVER_XORG_SERVER_VERSION = 1.20.14 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Sat Jan 22 17:32:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:32:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqmi: fix build with help2man In-Reply-To: <20211216184943.580682-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Dec 2021 19:49:43 +0100") References: <20211216184943.580682-1-fontaine.fabrice@gmail.com> Message-ID: <877darzneq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised with help2man since bump to > version 1.30.0 in commit 50c5495f81d3418a0f63fc642dc6beb41cd316e0: > FAILED: docs/man/qmicli.1 > /usr/bin/help2man --output=docs/man/qmicli.1 '--name=Control QMI > devices' '--help-option="--help-all"' > /home/peko/autobuild/instance-1/output-1/build/libqmi-1.30.2/build/src/qmicli/qmicli > help2man: can't get `"--help-all"' info from > /home/peko/autobuild/instance-1/output-1/build/libqmi-1.30.2/build/src/qmicli/qmicli > Try `--no-discard-stderr' if option outputs to stderr > Fixes: > - http://autobuild.buildroot.org/results/15818b6de7378cd75c59b1d6dc732ed9a20c092a > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:39:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:39:37 +0100 Subject: [Buildroot] [PATCH] package/icu: fix build failure due to a library clash In-Reply-To: <20211216164522.3877446-1-anssi.hannula@bitwise.fi> (Anssi Hannula's message of "Thu, 16 Dec 2021 18:45:22 +0200") References: <20211216164522.3877446-1-anssi.hannula@bitwise.fi> Message-ID: <8735lfzn3a.fsf@dell.be.48ers.dk> >>>>> "Anssi" == Anssi Hannula writes: > ICU build scripting adds some host libraries to LD_LIBRARY_PATH by > using constructs of the following form: > LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" > If the original LD_LIBRARY_PATH is empty, this causes the last search > directory be an empty string, i.e. the working directory. > ICU build runs some basic host commands (e.g. "rm") in $(TARGET_DIR)/lib > under such an LD_LIBRARY_PATH, causing target libraries (e.g. libc) to > possibly get loaded instead of host system libraries if they are > compatible enough (e.g. arch matches). > Since the target libraries may not actually be ABI compatible with host > system binaries (e.g. target has an old libc), this can cause crashes > or other errors. > Observed errors include: > (1) rm: libc.so.6: version `GLIBC_2.33' not found (required by rm) > (2) sh: line 1: 1362670 Segmentation fault (core dumped) rm -f libicudata.so.65 > Workaround the issue by setting a dummy LD_LIBRARY_PATH when it would > otherwise be empty. > https://unicode-org.atlassian.net/browse/ICU-21417 > Signed-off-by: Anssi Hannula Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:39:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:39:17 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/icu: fix build failure due to a library clash Message-ID: <20220122173259.B6D7F82A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ca45102f557d277bee9ed856c51c08f02db1cb2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x ICU build scripting adds some host libraries to LD_LIBRARY_PATH by using constructs of the following form: LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" If the original LD_LIBRARY_PATH is empty, this causes the last search directory be an empty string, i.e. the working directory. ICU build runs some basic host commands (e.g. "rm") in $(TARGET_DIR)/lib under such an LD_LIBRARY_PATH, causing target libraries (e.g. libc) to possibly get loaded instead of host system libraries if they are compatible enough (e.g. arch matches). Since the target libraries may not actually be ABI compatible with host system binaries (e.g. target has an old libc), this can cause crashes or other errors. Observed errors include: (1) rm: libc.so.6: version `GLIBC_2.33' not found (required by rm) (2) sh: line 1: 1362670 Segmentation fault (core dumped) rm -f libicudata.so.65 Workaround the issue by setting a dummy LD_LIBRARY_PATH when it would otherwise be empty. https://unicode-org.atlassian.net/browse/ICU-21417 Signed-off-by: Anssi Hannula Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ac1c781149469d71c34cd37ed60a6e1525ca9689) Signed-off-by: Peter Korsgaard --- package/icu/icu.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 2c04c3c775..c5d0c3eefb 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -50,6 +50,17 @@ HOST_ICU_CONF_OPTS = \ ICU_SUBDIR = source HOST_ICU_SUBDIR = source +# ICU build scripting adds paths to LD_LIBRARY_PATH using +# LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" +# which, if LD_LIBRARY_PATH was empty, causes the last search directory +# to be the working directory, causing the build to try to load target +# libraries, possibly crashing the build due to ABI mismatches. +# Workaround by ensuring LD_LIBRARY_PATH is never empty. +# https://unicode-org.atlassian.net/browse/ICU-21417 +ifeq ($(LD_LIBRARY_PATH),) +ICU_MAKE_ENV += LD_LIBRARY_PATH=/dev/null +endif + ICU_CUSTOM_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH)) ifneq ($(ICU_CUSTOM_DATA_PATH),) From peter at korsgaard.com Sat Jan 22 17:39:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:39:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/icu: fix build failure due to a library clash Message-ID: <20220122173310.9CE3F82A14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8b4e8eedcf83d91487d1dad2fd274128a1ca48e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x ICU build scripting adds some host libraries to LD_LIBRARY_PATH by using constructs of the following form: LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" If the original LD_LIBRARY_PATH is empty, this causes the last search directory be an empty string, i.e. the working directory. ICU build runs some basic host commands (e.g. "rm") in $(TARGET_DIR)/lib under such an LD_LIBRARY_PATH, causing target libraries (e.g. libc) to possibly get loaded instead of host system libraries if they are compatible enough (e.g. arch matches). Since the target libraries may not actually be ABI compatible with host system binaries (e.g. target has an old libc), this can cause crashes or other errors. Observed errors include: (1) rm: libc.so.6: version `GLIBC_2.33' not found (required by rm) (2) sh: line 1: 1362670 Segmentation fault (core dumped) rm -f libicudata.so.65 Workaround the issue by setting a dummy LD_LIBRARY_PATH when it would otherwise be empty. https://unicode-org.atlassian.net/browse/ICU-21417 Signed-off-by: Anssi Hannula Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ac1c781149469d71c34cd37ed60a6e1525ca9689) Signed-off-by: Peter Korsgaard --- package/icu/icu.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 2c04c3c775..c5d0c3eefb 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -50,6 +50,17 @@ HOST_ICU_CONF_OPTS = \ ICU_SUBDIR = source HOST_ICU_SUBDIR = source +# ICU build scripting adds paths to LD_LIBRARY_PATH using +# LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" +# which, if LD_LIBRARY_PATH was empty, causes the last search directory +# to be the working directory, causing the build to try to load target +# libraries, possibly crashing the build due to ABI mismatches. +# Workaround by ensuring LD_LIBRARY_PATH is never empty. +# https://unicode-org.atlassian.net/browse/ICU-21417 +ifeq ($(LD_LIBRARY_PATH),) +ICU_MAKE_ENV += LD_LIBRARY_PATH=/dev/null +endif + ICU_CUSTOM_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH)) ifneq ($(ICU_CUSTOM_DATA_PATH),) From peter at korsgaard.com Sat Jan 22 17:31:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:31:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libqmi: fix build with help2man Message-ID: <20220122173310.9547982A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ec2241856579b7de135c699288a8d449fe551dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure raised with help2man since bump to version 1.30.0 in commit 50c5495f81d3418a0f63fc642dc6beb41cd316e0: FAILED: docs/man/qmicli.1 /usr/bin/help2man --output=docs/man/qmicli.1 '--name=Control QMI devices' '--help-option="--help-all"' /home/peko/autobuild/instance-1/output-1/build/libqmi-1.30.2/build/src/qmicli/qmicli help2man: can't get `"--help-all"' info from /home/peko/autobuild/instance-1/output-1/build/libqmi-1.30.2/build/src/qmicli/qmicli Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/15818b6de7378cd75c59b1d6dc732ed9a20c092a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7f38ce2103bbb01128dd00f102d0834d03343c2f) Signed-off-by: Peter Korsgaard --- ...uild-add-an-option-to-not-build-man-pages.patch | 65 ++++++++++++++++++++++ package/libqmi/libqmi.mk | 1 + 2 files changed, 66 insertions(+) diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch new file mode 100644 index 0000000000..d9053de537 --- /dev/null +++ b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch @@ -0,0 +1,65 @@ +From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado +Date: Wed, 3 Nov 2021 10:57:51 +0100 +Subject: [PATCH] build: add an option to not build man pages + +When cross-compiling, the compiled binaries cannot be run on the build +machine, unless one defines a helper (e.g. qemu) in the meson +configuration, which is most of the time undesirable. + +If help2man is installed on the build machine, then the build would fail +because of this, so add an option to disable generating the man pages. + +With later versions of meson, it will be possible to automatically +detect this condition. + +Based on the same fix done in libmbim by Nicolas Cavallari, see +https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40 + +Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75 + +[Retrieved (and backported) from: +https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 8 +++++++- + meson_options.txt | 1 + + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e88b43a1..c7312146 100644 +--- a/meson.build ++++ b/meson.build +@@ -223,8 +223,8 @@ if enable_gtk_doc + subdir('docs/reference/libqmi-glib') + endif + +-help2man = find_program('help2man', required: false) +-if help2man.found() ++enable_man = get_option('man') ++if enable_man + subdir('docs/man') + endif + +@@ -237,6 +242,7 @@ summary({ + output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' + output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' + output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' ++output += ' man pages: ' + enable_man.to_string() + '\n\n' + output += ' System paths\n' + output += ' prefix: ' + qmi_prefix + '\n' + output += ' udev base directory: ' + qmi_username + '\n\n' +diff --git a/meson_options.txt b/meson_options.txt +index 4d4f913d..bee5daac 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc + + option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support') + option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') ++option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') + + option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') +-- +GitLab + diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index cd2c2719f9..a4839f1efb 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -12,6 +12,7 @@ LIBQMI_CPE_ID_VENDOR = libqmi_project LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 +LIBQMI_CONF_OPTS = -Dman=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBQMI_DEPENDENCIES += gobject-introspection From peter at korsgaard.com Sat Jan 22 17:44:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:44:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmbim: fix build with help2man In-Reply-To: <20211216233423.1534607-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 17 Dec 2021 00:34:23 +0100") References: <20211216233423.1534607-1-fontaine.fabrice@gmail.com> Message-ID: <87y237y8az.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with help2man raised since bump to > version 1.26.0 in commit be76508af2b2253f95137a28198139732be2dcb3: > FAILED: docs/man/mbimcli.1 > /usr/bin/help2man --output=docs/man/mbimcli.1 '--name=Control MBIM > devices' '--help-option="--help-all"' > /home/peko/autobuild/instance-1/output-1/build/libmbim-1.26.0/build/src/mbimcli/mbimcli > help2man: can't get `"--help-all"' info from > /home/peko/autobuild/instance-1/output-1/build/libmbim-1.26.0/build/src/mbimcli/mbimcli > Try `--no-discard-stderr' if option outputs to stderr > Fixes: > - http://autobuild.buildroot.org/results/eaa2ba54b9c74f07292d3cad4fa96c80e6079702 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:44:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:44:04 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libmbim: fix build with help2man Message-ID: <20220122173757.EA49B82A14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8e11dcf546062a091ac1482b2f35ff4f52965cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure with help2man raised since bump to version 1.26.0 in commit be76508af2b2253f95137a28198139732be2dcb3: FAILED: docs/man/mbimcli.1 /usr/bin/help2man --output=docs/man/mbimcli.1 '--name=Control MBIM devices' '--help-option="--help-all"' /home/peko/autobuild/instance-1/output-1/build/libmbim-1.26.0/build/src/mbimcli/mbimcli help2man: can't get `"--help-all"' info from /home/peko/autobuild/instance-1/output-1/build/libmbim-1.26.0/build/src/mbimcli/mbimcli Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/eaa2ba54b9c74f07292d3cad4fa96c80e6079702 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a315d7c98bb0a853e9fe84639ea15595d9dd4b85) Signed-off-by: Peter Korsgaard --- ...uild-add-an-option-to-not-build-man-pages.patch | 60 ++++++++++++++++++++++ package/libmbim/libmbim.mk | 1 + 2 files changed, 61 insertions(+) diff --git a/package/libmbim/0002-meson-build-add-an-option-to-not-build-man-pages.patch b/package/libmbim/0002-meson-build-add-an-option-to-not-build-man-pages.patch new file mode 100644 index 0000000000..c91756e9a6 --- /dev/null +++ b/package/libmbim/0002-meson-build-add-an-option-to-not-build-man-pages.patch @@ -0,0 +1,60 @@ +From 792af73ea90e9689703ab526dd444fdb1c2f8e40 Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Thu, 14 Oct 2021 12:25:46 +0200 +Subject: [PATCH] meson.build: add an option to not build man pages. + +When cross-compiling, the compiled binaries cannot be run on the build +machine, unless one defines a helper (e.g. qemu) in the meson +configuration, which is most of the time undesirable. + +If help2man is installed on the build machine, then the build would fail +because of this, so add an option to disable generating the man pages. + +With later versions of meson, it will be possible to automatically +detect this condition. + +[Retrieved (and backported) from: +https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 8 +++++++- + meson_options.txt | 1 + + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1c5ee2d..59f1727 100644 +--- a/meson.build ++++ b/meson.build +@@ -184,8 +184,8 @@ if enable_gtk_doc + subdir('docs/reference/libmbim-glib') + endif + +-help2man = find_program('help2man', required: false) +-if help2man.found() ++enable_man = get_option('man') ++if enable_man + subdir('docs/man') + endif + +@@ -198,6 +203,7 @@ summary({ + output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' + output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' + output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' ++output += ' man pages: ' + enable_man.to_string() + '\n\n' + output += ' System paths\n' + output += ' prefix: ' + mbim_prefix + '\n' + output += ' udev base directory: ' + mbim_username + '\n\n' +diff --git a/meson_options.txt b/meson_options.txt +index 1305957..bfa33ab 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -7,5 +7,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc + + option('introspection', type: 'boolean', value: 'true', description: 'build introspection support') + option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') ++option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') + + option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') +-- +GitLab + diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index cdc3fabedb..6737afebe8 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -12,6 +12,7 @@ LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 +LIBMBIM_CONF_OPTS = -Dman=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBMBIM_DEPENDENCIES += gobject-introspection From peter at korsgaard.com Sat Jan 22 17:54:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:54:19 +0100 Subject: [Buildroot] [git commit] package/linux-pam: add missing BR2_USE_MMU dependency on comment In-Reply-To: <20211217214145.112BD802C5@busybox.osuosl.org> (Thomas Petazzoni's message of "Fri, 17 Dec 2021 22:46:55 +0100") References: <20211217214145.112BD802C5@busybox.osuosl.org> Message-ID: <87tudvy7uc.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=8f0df6609a0a1045c16a7d55711f21fc42af756b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > BR2_PACKAGE_LINUX_PAM depends on BR2_USE_MMU, but this dependency is > not taken into account in the Config.in comment, which this commit > fixes. > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:55:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:55:08 +0100 Subject: [Buildroot] [git commit] package/linux-pam: separate locale and wchar dependencies In-Reply-To: <20211217214145.1C5FF80288@busybox.osuosl.org> (Thomas Petazzoni's message of "Fri, 17 Dec 2021 22:46:55 +0100") References: <20211217214145.1C5FF80288@busybox.osuosl.org> Message-ID: <87pmojy7sz.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=ac9261edec111836952970e26cf373cc15b9e8ac > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > They are currently expressed as such: > depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) > which is not the common practice in Buildroot. We prefer to use: > depends on BR2_ENABLE_LOCALE > depends on BR2_USE_WCHAR > This commit ensures linux-pam is consistent with this best practice. > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:59:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:59:52 +0100 Subject: [Buildroot] [git commit] configs/stm32f469_xip_disco: fix kernel bootup In-Reply-To: <20211217215308.46712811FB@busybox.osuosl.org> (Arnout Vandecappelle's message of "Fri, 17 Dec 2021 22:58:11 +0100") References: <20211217215308.46712811FB@busybox.osuosl.org> Message-ID: <87lez7y7l3.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=82c1a437929acaeeb7f0cc198d5e5fa4b7862d5b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The current configuration fails to boot on the stm32f469-disco board. > Make it bootable again by reverting the DRAM patches. > Also change the kernel load address from 0x8010000 to 0x800C000 to > allocate more space to the kernel, since 32kB for the device tree is > enough. > Also clean up the rootfs a bit with the common stm32-post-build.sh > script. > Signed-off-by: Dario Binacchi > Acked-by: Christophe Priouzeau > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:45:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:45:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pugixml: switch _SITE to https Message-ID: <20220122175335.A1806829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a3c5b173ed08ded0fee9eb02c2846c090a7f5bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1b44913df9b09e4abff3f0419f2b8cd4234dfa1f) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index ddda5a3ccc..bc018180ef 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -5,7 +5,7 @@ ################################################################################ PUGIXML_VERSION = 1.11.4 -PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) +PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md PUGIXML_CPE_ID_VENDOR = pugixml_project From peter at korsgaard.com Sat Jan 22 17:46:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:46:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/x11r7/xapp_xinput-calibrator: switch _SITE to https Message-ID: <20220122175335.ABABA82A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27f4f1f03cf6cf11b711a9090429c8664377750a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 83b587a642075e605a4796a4ef924f90131bddae) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk index 974b83df2c..be86608b85 100644 --- a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk +++ b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk @@ -6,7 +6,7 @@ XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5 XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz -XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator +XAPP_XINPUT_CALIBRATOR_SITE = https://github.com/downloads/tias/xinput_calibrator XAPP_XINPUT_CALIBRATOR_LICENSE = MIT XAPP_XINPUT_CALIBRATOR_LICENSE_FILES = COPYING XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi From peter at korsgaard.com Sat Jan 22 17:54:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:54:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/linux-pam: separate locale and wchar dependencies Message-ID: <20220122175335.C0331829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d259c00fb6f44a7a8512275f6751de22a99ee39f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x They are currently expressed as such: depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) which is not the common practice in Buildroot. We prefer to use: depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR This commit ensures linux-pam is consistent with this best practice. Signed-off-by: Thomas Petazzoni (cherry picked from commit ac9261edec111836952970e26cf373cc15b9e8ac) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 931cfdeccf..27ba55bd61 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LINUX_PAM bool "linux-pam" - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) + depends on BR2_ENABLE_LOCALE + depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FLEX @@ -12,5 +13,5 @@ config BR2_PACKAGE_LINUX_PAM comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" depends on BR2_USE_MMU - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR \ || BR2_STATIC_LIBS From peter at korsgaard.com Sat Jan 22 17:59:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:59:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/stm32f469_xip_disco: fix kernel bootup Message-ID: <20220122175335.C93FD82A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0541a7c2103ba500d5a6ed4ddf08cd839290381f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The current configuration fails to boot on the stm32f469-disco board. Make it bootable again by reverting the DRAM patches. Also change the kernel load address from 0x8010000 to 0x800C000 to allocate more space to the kernel, since 32kB for the device tree is enough. Also clean up the rootfs a bit with the common stm32-post-build.sh script. Signed-off-by: Dario Binacchi Acked-by: Christophe Priouzeau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 82c1a437929acaeeb7f0cc198d5e5fa4b7862d5b) Signed-off-by: Peter Korsgaard --- .../stm32f469-disco/flash_xip.sh | 2 +- .../stm32f469-disco/linux-xip.config | 8 ++-- ...1-stm32f469-i-Update-kernel-start-address.patch | 56 ---------------------- ...m32f469i-disco-change-kernel-load-address.patch | 26 ++++++++++ ...se-default-dram-address-without-remapping.patch | 38 --------------- configs/stm32f469_disco_xip_defconfig | 1 + 6 files changed, 32 insertions(+), 99 deletions(-) diff --git a/board/stmicroelectronics/stm32f469-disco/flash_xip.sh b/board/stmicroelectronics/stm32f469-disco/flash_xip.sh old mode 100644 new mode 100755 index b5a067cee5..da27cd327c --- a/board/stmicroelectronics/stm32f469-disco/flash_xip.sh +++ b/board/stmicroelectronics/stm32f469-disco/flash_xip.sh @@ -15,6 +15,6 @@ ${OUTPUT_DIR}/host/bin/openocd -f board/stm32f469discovery.cfg \ -c "flash info 0" \ -c "flash write_image erase ${OUTPUT_DIR}/images/stm32f469i-disco.bin 0x08000000" \ -c "flash write_image erase ${OUTPUT_DIR}/images/stm32f469-disco.dtb 0x08004000" \ - -c "flash write_image erase ${OUTPUT_DIR}/images/xipImage 0x08010000" \ + -c "flash write_image erase ${OUTPUT_DIR}/images/xipImage 0x0800C000" \ -c "reset run" \ -c "shutdown" diff --git a/board/stmicroelectronics/stm32f469-disco/linux-xip.config b/board/stmicroelectronics/stm32f469-disco/linux-xip.config index 2d0ce59b31..01a94eb9d1 100644 --- a/board/stmicroelectronics/stm32f469-disco/linux-xip.config +++ b/board/stmicroelectronics/stm32f469-disco/linux-xip.config @@ -18,7 +18,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_MULTIUSER is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set -# CONFIG_POSIX_TIMERS is not set +CONFIG_POSIX_TIMERS=y # CONFIG_BUG is not set # CONFIG_BASE_FULL is not set # CONFIG_FUTEX is not set @@ -47,12 +47,12 @@ CONFIG_ARCH_STM32=y CONFIG_CPU_V7M_NUM_IRQ=240 # CONFIG_ARM_DMA_MEM_BUFFERABLE is not set CONFIG_SET_MEM_PARAM=y -CONFIG_DRAM_BASE=0xc0000000 -CONFIG_DRAM_SIZE=0x01000000 +CONFIG_DRAM_BASE=0x00000000 +CONFIG_DRAM_SIZE=0x00800000 CONFIG_HZ_1000=y # CONFIG_ATAGS is not set CONFIG_XIP_KERNEL=y -CONFIG_XIP_PHYS_ADDR=0x08010000 +CONFIG_XIP_PHYS_ADDR=0x0800C000 CONFIG_XIP_DEFLATED_DATA=y # CONFIG_SUSPEND is not set # CONFIG_STACKPROTECTOR is not set diff --git a/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch b/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch deleted file mode 100644 index d5d1e5a8ad..0000000000 --- a/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch +++ /dev/null @@ -1,56 +0,0 @@ -From fe5f3a86d07e378baeeddc1dfecd0686d83aa42f Mon Sep 17 00:00:00 2001 -From: Yauheni Saldatsenka -Date: Sat, 14 Aug 2021 18:54:51 +0300 -Subject: [PATCH] stm32f469-i: Update kernel start address - -As of GNU/Linux v5.12 kernel device tree binary grows above 0x08008000 -and overwrites kernel binary -Therefore this commit moves kernel to the next flash bank - -Signed-off-by: Yauheni Saldatsenka ---- - stm32f469i-disco.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/stm32f469i-disco.c b/stm32f469i-disco.c -index 2da1f4b..46fc06a 100644 ---- a/stm32f469i-disco.c -+++ b/stm32f469i-disco.c -@@ -6,6 +6,7 @@ - #include "gpio.h" - #include "mpu.h" - -+#define KERNEL_ADDR 0x08010000 - #define CONFIG_HSE_HZ 8000000 - #define CONFIG_PLL_M 8 - #define CONFIG_PLL_N 360 -@@ -85,7 +86,7 @@ static void fmc_wait_busy(void) - - void start_kernel(void) - { -- void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(0x08008000 | 1); -+ void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(KERNEL_ADDR | 1); - - kernel(0, ~0UL, 0x08004000); - } -@@ -102,7 +103,7 @@ int main(void) - volatile uint32_t *SYSCFG_MEMRMP = (void *)(SYSCFG_BASE + 0x00); - int i; - -- mpu_config(0x0); -+ mpu_config(0xc0000000); - - if (*FLASH_CR & FLASH_CR_LOCK) { - *FLASH_KEYR = 0x45670123; -@@ -195,8 +196,6 @@ int main(void) - usart_setup(usart_base, 45000000); - usart_putch(usart_base, '.'); - -- *SYSCFG_MEMRMP = 0x4; -- - start_kernel(); - - return 0; --- -2.32.0 - diff --git a/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469i-disco-change-kernel-load-address.patch b/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469i-disco-change-kernel-load-address.patch new file mode 100644 index 0000000000..1f8d929bfb --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469i-disco-change-kernel-load-address.patch @@ -0,0 +1,26 @@ +From d87969f72671cab5a88ba6e2418e43d0fa267d6f Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sat, 13 Nov 2021 15:46:32 +0100 +Subject: [PATCH] stm32f469i-disco: change kernel load address + +Signed-off-by: Dario Binacchi +--- + stm32f469i-disco.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stm32f469i-disco.c b/stm32f469i-disco.c +index 2da1f4b..3aacb12 100644 +--- a/stm32f469i-disco.c ++++ b/stm32f469i-disco.c +@@ -85,7 +85,7 @@ static void fmc_wait_busy(void) + + void start_kernel(void) + { +- void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(0x08008000 | 1); ++ void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(0x0800C000 | 1); + + kernel(0, ~0UL, 0x08004000); + } +-- +2.17.1 + diff --git a/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch b/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch deleted file mode 100644 index 68fe8380a2..0000000000 --- a/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8ccf9f625d00138d86fb7d70f3efd58a8fb4d7ff Mon Sep 17 00:00:00 2001 -From: Yauheni Saldatsenka -Date: Mon, 23 Aug 2021 02:54:22 +0300 -Subject: [PATCH] Use default dram address without remapping - -Signed-off-by: Yauheni Saldatsenka ---- - arch/arm/boot/dts/stm32f469-disco.dts | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts -index 2e1b3bbbe4b5..06845614a19a 100644 ---- a/arch/arm/boot/dts/stm32f469-disco.dts -+++ b/arch/arm/boot/dts/stm32f469-disco.dts -@@ -60,9 +60,9 @@ chosen { - stdout-path = "serial0:115200n8"; - }; - -- memory at 00000000 { -+ memory at c0000000 { - device_type = "memory"; -- reg = <0x00000000 0x1000000>; -+ reg = <0xc0000000 0x1000000>; - }; - - aliases { -@@ -84,7 +84,7 @@ vdd_dsi: vdd-dsi { - }; - - soc { -- dma-ranges = <0xc0000000 0x0 0x10000000>; -+ dma-ranges = <0xc0000000 0xc0000000 0x10000000>; - }; - - leds { --- -2.32.0 - diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 1ceffe4026..e8b2cf3d21 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -3,6 +3,7 @@ BR2_cortex_m4=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" # BR2_UCLIBC_INSTALL_UTILS is not set BR2_GCC_ENABLE_LTO=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" From peter at korsgaard.com Sat Jan 22 17:53:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:53:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/linux-pam: add missing BR2_USE_MMU dependency on comment Message-ID: <20220122175335.B6AA882A1F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=baed11290ece14044bd5486a17b6f595a1391513 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x BR2_PACKAGE_LINUX_PAM depends on BR2_USE_MMU, but this dependency is not taken into account in the Config.in comment, which this commit fixes. Signed-off-by: Thomas Petazzoni (cherry picked from commit 8f0df6609a0a1045c16a7d55711f21fc42af756b) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 84aee5cdd4..931cfdeccf 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -11,5 +11,6 @@ config BR2_PACKAGE_LINUX_PAM http://linux-pam.org comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" + depends on BR2_USE_MMU depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ || BR2_STATIC_LIBS From peter at korsgaard.com Sat Jan 22 17:45:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:45:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pugixml: switch _SITE to https Message-ID: <20220122175343.7DFDD829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4c8d4a1598054c6c7e6d8e2922476baa0d9ab2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1b44913df9b09e4abff3f0419f2b8cd4234dfa1f) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index ddda5a3ccc..bc018180ef 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -5,7 +5,7 @@ ################################################################################ PUGIXML_VERSION = 1.11.4 -PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) +PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md PUGIXML_CPE_ID_VENDOR = pugixml_project From peter at korsgaard.com Sat Jan 22 17:54:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:54:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/linux-pam: add missing BR2_USE_MMU dependency on comment Message-ID: <20220122175343.8FC2A82A1F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d8d5d4d4d4853e1e1bb37f481262d7fd6324f0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x BR2_PACKAGE_LINUX_PAM depends on BR2_USE_MMU, but this dependency is not taken into account in the Config.in comment, which this commit fixes. Signed-off-by: Thomas Petazzoni (cherry picked from commit 8f0df6609a0a1045c16a7d55711f21fc42af756b) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 84aee5cdd4..931cfdeccf 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -11,5 +11,6 @@ config BR2_PACKAGE_LINUX_PAM http://linux-pam.org comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" + depends on BR2_USE_MMU depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ || BR2_STATIC_LIBS From peter at korsgaard.com Sat Jan 22 17:54:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:54:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/linux-pam: separate locale and wchar dependencies Message-ID: <20220122175343.9959F829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=986fd8838f5c8348db889b9e6418ded3a2306243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x They are currently expressed as such: depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) which is not the common practice in Buildroot. We prefer to use: depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR This commit ensures linux-pam is consistent with this best practice. Signed-off-by: Thomas Petazzoni (cherry picked from commit ac9261edec111836952970e26cf373cc15b9e8ac) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 931cfdeccf..27ba55bd61 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LINUX_PAM bool "linux-pam" - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) + depends on BR2_ENABLE_LOCALE + depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FLEX @@ -12,5 +13,5 @@ config BR2_PACKAGE_LINUX_PAM comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" depends on BR2_USE_MMU - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR \ || BR2_STATIC_LIBS From peter at korsgaard.com Sat Jan 22 17:45:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:45:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/x11r7/xapp_xinput-calibrator: switch _SITE to https Message-ID: <20220122175343.86F4A82A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68d5ac331850439f2b17f586c12c156a47277138 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 83b587a642075e605a4796a4ef924f90131bddae) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk index 974b83df2c..be86608b85 100644 --- a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk +++ b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk @@ -6,7 +6,7 @@ XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5 XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz -XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator +XAPP_XINPUT_CALIBRATOR_SITE = https://github.com/downloads/tias/xinput_calibrator XAPP_XINPUT_CALIBRATOR_LICENSE = MIT XAPP_XINPUT_CALIBRATOR_LICENSE_FILES = COPYING XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi From petr.vorel at gmail.com Sat Jan 22 18:08:04 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 19:08:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: bump version to 2.6.1 Message-ID: <20220122180804.30250-1-petr.vorel@gmail.com> Drop patches backported from this release. Signed-off-by: Petr Vorel --- ...nfsdcltrack-sqlite-Fix-printf-format.patch | 52 --------------- ...rack-nfsdcltrack.c-Fix-printf-format.patch | 48 -------------- ...track-Use-uint64_t-instead-of-time_t.patch | 66 ------------------- package/nfs-utils/nfs-utils.hash | 4 +- package/nfs-utils/nfs-utils.mk | 2 +- 5 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch delete mode 100644 package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch delete mode 100644 package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch deleted file mode 100644 index 14894602c4..0000000000 --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:44 +0000 -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format - -sqlite.c: In function 'sqlite_remove_unreclaimed': -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", - | ~~^ - | | - | long int - | %lld - 548 | grace_start); - | ~~~~~~~~~~~ - | | - | time_t {aka long long int} - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/sqlite.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index f79aebb3..cea4a411 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) - int ret; - char *err = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, - grace_start); - if (ret < 0) { - return ret; --- -2.25.1 - diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch deleted file mode 100644 index 0893959460..0000000000 --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:45 +0000 -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format - -nfsdcltrack.c: In function 'cltrack_gracedone': -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); - | ~~^ ~~~~~~~~~ - | | | - | long int time_t {aka long long int} - | %lld - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index e926f1c0..0b37c094 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) - if (*tail) - return -EINVAL; - -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); - - ret = sqlite_remove_unreclaimed(gracetime); - --- -2.25.1 - diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch deleted file mode 100644 index 384f4fd806..0000000000 --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Tue, 27 Jul 2021 21:12:17 -0400 -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t - -With recent commits (4f2a5b64,5a53426c) that fixed -compile errors on x86_64 machines, caused similar -errors on i686 machines. - -The variable type that was being used was a time_t, -which changes size between architects, which -caused the compile error. - -Changing the variable to uint64_t fixed the issue. - -Signed-off-by: Steve Dickson -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 -Signed-off-by: Petr Vorel ---- - utils/nfsdcltrack/nfsdcltrack.c | 2 +- - utils/nfsdcltrack/sqlite.c | 2 +- - utils/nfsdcltrack/sqlite.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index 0b37c094..7c1c4bcc 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) - { - int ret; - char *tail; -- time_t gracetime; -+ uint64_t gracetime; - - - ret = sqlite_prepare_dbh(storagedir); -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index cea4a411..cf0c6a45 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -540,7 +540,7 @@ out_err: - * remove any client records that were not reclaimed since grace_start. - */ - int --sqlite_remove_unreclaimed(time_t grace_start) -+sqlite_remove_unreclaimed(uint64_t grace_start) - { - int ret; - char *err = NULL; -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h -index 06e7c044..ba8cdfa8 100644 ---- a/utils/nfsdcltrack/sqlite.h -+++ b/utils/nfsdcltrack/sqlite.h -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); - int sqlite_check_client(const unsigned char *clname, const size_t namelen, - const bool has_session); --int sqlite_remove_unreclaimed(const time_t grace_start); -+int sqlite_remove_unreclaimed(const uint64_t grace_start); - int sqlite_query_reclaiming(const time_t grace_start); - - #endif /* _SQLITE_H */ --- -2.32.0 - diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 2073bebd8a..a73bf80e70 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 07b44b5a93..6a3a801359 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.5.4 +NFS_UTILS_VERSION = 2.6.1 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ -- 2.34.1 From petr.vorel at gmail.com Sat Jan 22 18:10:58 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 19:10:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: bump version to 2.6.1 In-Reply-To: <20220122180804.30250-1-petr.vorel@gmail.com> References: <20220122180804.30250-1-petr.vorel@gmail.com> Message-ID: Hi all, note this version does not support NFSv2 any more. Does it need to be mentioned to the commit message? I didn't add it, because even NFSv3 is quite old (and I recommend to use NFSv4.2). Kind regards, Petr From yann.morin.1998 at free.fr Sat Jan 22 18:13:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 19:13:43 +0100 Subject: [Buildroot] [PATCH 0/2 v2] core: fixup PPD paths (branch yem/ppd-fixup-paths) Message-ID: Hello All! This series builds upon previous good work from Andreas [0], Louis-Paul [1], and Adam [2]. The first patch is the core of the change: rather than have multiple hooks that each cater for different types of files (.py, .pc, .pri, .cmake and so on), we jut do what we already do in relocate-sdk: we just look for all text files that have a PPD prefix in them, and replace tht with the current package's PPD. The second patch ensures that we can build reliable files lists, so that files we tweak in the infra are not believed to be installed/modified by the current package. [0] https://lore.kernel.org/buildroot/20200217212350.29750-21-anaumann at ultratronik.de/ [1] https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ [2] https://lore.kernel.org/buildroot/20220106171720.12857-1-aduskett at gmail.com/ Changes v1 -> v2: - use --binary-files=without-match, as this *considerably* speeds up the fixup (Arnout) - rename the python fixup (Arnout) Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (2): core/pkg-generic: fixup all PPD paths in a generic fashion core/pkg-generic: apply post-prepare hooks before monitoring directories package/pkg-generic.mk | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 18:13:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 19:13:44 +0100 Subject: [Buildroot] [PATCH 1/2 v2] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: References: Message-ID: Some files contain hard-coded absolute paths that point to the host and/or staging directories. With per-package directories (aka. PPD), these paths point to the PPD of the package that created the files, when we want them to point to the PPD of the package that uses them. Up until now, we had two hooks that attempted to fix those files: - a libtool-specific hook that searches for all .la files and seds them with the proper PPD, - a python-specific hook that tweaks just the sysconfigdata and removes the byte-compiled version of the sysconfigdata. But now, we also have a few other kinds of files for which we need to fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others as well. We solve this issue by just replacing any PPD in text files, with the current package's PPD. This is very similar to, and inspired from what is done when relocating the SDK. However, we can't use the existing relocate-sdk script, because that needs to know the original location, which we do not have when we aggregate the PPD (we could store it, but we can easily do without it). Furthermore, we use a construct that is way more efficient than relocate-sdk. First, we skip binary files with grep, which means we have way less files to check with 'file' [0]. Second, we use xargs to sed multiple files at once: printf is a shell built-in, so it's fast, and so we do not have to spawn a sed for each file to fixup. [0] We still keep using 'file' as a safety net, to avoid mangling a binary file that grep would have missed. Finally, the existing python-specific macro is simplified to just remove the pre-compiled sysconfigdata files. And we rename it accordingly. And as for some timings, to see the impact, with the defconfig below, and with the downloads already local, and with a PC mostly idle (mail and IRC activity only): Before Now Delta - without PPD : 7min 27s 7min 23s -0.9% - with PPD : 7min 51s 7min 59s +1.7% - with PPD -j8: 5min 51s 5min 56s +1.4% So we can see a slight increase in time, but it is mostly in the noise (some builds without this change did exceed some builds with this change, due to background noise). Also, depending on scheduling, there can be less parallelism; for example, python3 does not build in parallel, and with this special defconfig, python is on the critical path of a lot of packages that are python modules, which can negatively impact a parallel build too. A more realistic, bigger defconfig would probably be more parallel... YMMV... Delta without PPD is also due to background noise, as those hooks are not used when PPD is not enabled. Defconfig used: BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AIOBLESCAN=y BR2_PACKAGE_PYTHON_AIOCOAP=y BR2_PACKAGE_PYTHON_AIOFILES=y BR2_PACKAGE_PYTHON_AIOHTTP_CORS=y BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR=y BR2_PACKAGE_PYTHON_AIOHTTP_MAKO=y BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES=y BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY=y BR2_PACKAGE_PYTHON_AIOHTTP_SESSION=y BR2_PACKAGE_PYTHON_AIOHTTP_SSE=y BR2_PACKAGE_PYTHON_AIOJOBS=y BR2_PACKAGE_PYTHON_AIOLOGSTASH=y BR2_PACKAGE_PYTHON_AIOMONITOR=y BR2_PACKAGE_PYTHON_AIOPROCESSING=y BR2_PACKAGE_PYTHON_AIOREDIS=y BR2_PACKAGE_PYTHON_AIORWLOCK=y BR2_PACKAGE_PYTHON_AIOZIPKIN=y BR2_PACKAGE_LIGHTTPD=y BR2_PACKAGE_LIGHTTPD_OPENSSL=y BR2_PACKAGE_LIGHTTPD_ZLIB=y BR2_PACKAGE_LIGHTTPD_BZIP2=y BR2_PACKAGE_LIGHTTPD_PCRE=y BR2_PACKAGE_LIGHTTPD_WEBDAV=y # BR2_TARGET_ROOTFS_TAR is not set Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Adam Duskett Cc: Louis-Paul CORDIER Cc: Andreas Naumann --- Changes v1 -> v2: - use grep --binary-files=without-match as it *considerably* speeds up the fixup (Arnout) - rename the python hook (arnout) --- package/pkg-generic.mk | 45 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6a5fe5507b..78226ee266 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -90,21 +90,24 @@ endif ####################################### # Helper functions -# Make sure .la files only reference the current per-package -# directory. - -# $1: package name (lower case) -# $2: staging directory of the package ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define fixup-libtool-files - $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ - -name "*.la" -print0 | xargs -0 --no-run-if-empty \ - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" + +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the +# proper staging and host directories for the current package: find +# all text files that contain the PPD root, and replace it with the +# current package's PPD. +define PPD_FIXUP_PATHS + $(Q)grep --binary-files=without-match -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ + |while read -d '' f; do \ + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ + printf '%s\0' "$${f}"; \ + done \ + |xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef -endif -# Make sure python _sysconfigdata*.py files only reference the current -# per-package directory. +# Remove python's pre-compiled "sysconfigdata", as it may contain paths to +# the original staging or host dirs. # # Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) # because those directories may be created in the same recipe this macro will @@ -113,19 +116,15 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define FIXUP_PYTHON_SYSCONFIGDATA +define PPD_PYTHON_REMOVE_SYSCONFIGDATA_PYC $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ \) \ - \( \( -name "_sysconfigdata*.pyc" -delete \) \ - -o \( -name "_sysconfigdata*.py" -print0 \) \ - \) \ - | xargs -0 --no-run-if-empty \ - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + \( -name "_sysconfigdata*.pyc" -delete \) endef -endif + +endif # PPD # Functions to collect statistics about installed files @@ -278,8 +277,6 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) - $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) @@ -836,7 +833,9 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += \ + PPD_FIXUP_PATHS \ + PPD_PYTHON_REMOVE_SYSCONFIGDATA_PYC ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 22 18:13:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 19:13:45 +0100 Subject: [Buildroot] [PATCH 2/2 v2] core/pkg-generic: apply post-prepare hooks before monitoring directories In-Reply-To: References: Message-ID: <0883bf75cfefe1b97c562b8dae4b2349dd9ece4f.1642875217.git.yann.morin.1998@free.fr> Monitoring the target/ and host/ directories and so on, will serve to generate lists of files installed by the packages. Those lists are then used to generate graphs of the size those package take on the target for example. With PPD, we will also want to use those lists to only copy those files actually installed by each dependencies of a package, recursively. Currently, those lists are not entirely reliable, as the starting points are established before we apply PPD fixup hooks. As such, at the end of a package installation, fixed up files will be found to belong to the current package, while they were in fact provided by one of its dependency. While this does no big harm, if at all, for the size graphs, it will trigger overwrite detection when we eventually gather packages together to aggregate a PPD or te final host and target. So, we better have the lists of files be reliable. So, we only start monitoring the directories after we apply the PPD fixups (or seen the other way around for a smaller diff: we apply the PPD fixups before we start monitoring the directories). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Herve Codina --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 78226ee266..b3a7e1d60e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call MESSAGE,"Configuring") $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) @$(call pkg_size_before,$(TARGET_DIR)) @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) -- 2.25.1 From giulio.benetti at benettiengineering.com Sat Jan 22 18:21:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 22 Jan 2022 19:21:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: bump version to 2.6.1 In-Reply-To: References: Message-ID: <2DE5F820-FFD4-4E75-9566-25B881883586@benettiengineering.com> Hi Petr, > Il giorno 22 gen 2022, alle ore 19:11, Petr Vorel ha scritto: > > ?Hi all, > > note this version does not support NFSv2 any more. > Does it need to be mentioned to the commit message? Yes, it?s a very good idea. I would also add a note in Config.in help section listing the supported NFS versions available. Can you do that and send a v2 patch? Thank you! ?- Giulio Benetti Benetti Engineering sas > I didn't add it, because even NFSv3 is quite old (and I recommend to use > NFSv4.2). > > Kind regards, > Petr > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From petr.vorel at gmail.com Sat Jan 22 18:50:48 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 19:50:48 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1 Message-ID: <20220122185049.1194-1-petr.vorel@gmail.com> This version dropped support to NFSv2. Drop patches backported from this release. Signed-off-by: Petr Vorel --- Changes v1->v2: * note dropped NFSv2 support ...nfsdcltrack-sqlite-Fix-printf-format.patch | 52 --------------- ...rack-nfsdcltrack.c-Fix-printf-format.patch | 48 -------------- ...track-Use-uint64_t-instead-of-time_t.patch | 66 ------------------- package/nfs-utils/nfs-utils.hash | 4 +- package/nfs-utils/nfs-utils.mk | 2 +- 5 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch delete mode 100644 package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch delete mode 100644 package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch deleted file mode 100644 index 14894602c4..0000000000 --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:44 +0000 -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format - -sqlite.c: In function 'sqlite_remove_unreclaimed': -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", - | ~~^ - | | - | long int - | %lld - 548 | grace_start); - | ~~~~~~~~~~~ - | | - | time_t {aka long long int} - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/sqlite.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index f79aebb3..cea4a411 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) - int ret; - char *err = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, - grace_start); - if (ret < 0) { - return ret; --- -2.25.1 - diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch deleted file mode 100644 index 0893959460..0000000000 --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:45 +0000 -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format - -nfsdcltrack.c: In function 'cltrack_gracedone': -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); - | ~~^ ~~~~~~~~~ - | | | - | long int time_t {aka long long int} - | %lld - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index e926f1c0..0b37c094 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) - if (*tail) - return -EINVAL; - -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); - - ret = sqlite_remove_unreclaimed(gracetime); - --- -2.25.1 - diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch deleted file mode 100644 index 384f4fd806..0000000000 --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Tue, 27 Jul 2021 21:12:17 -0400 -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t - -With recent commits (4f2a5b64,5a53426c) that fixed -compile errors on x86_64 machines, caused similar -errors on i686 machines. - -The variable type that was being used was a time_t, -which changes size between architects, which -caused the compile error. - -Changing the variable to uint64_t fixed the issue. - -Signed-off-by: Steve Dickson -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 -Signed-off-by: Petr Vorel ---- - utils/nfsdcltrack/nfsdcltrack.c | 2 +- - utils/nfsdcltrack/sqlite.c | 2 +- - utils/nfsdcltrack/sqlite.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index 0b37c094..7c1c4bcc 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) - { - int ret; - char *tail; -- time_t gracetime; -+ uint64_t gracetime; - - - ret = sqlite_prepare_dbh(storagedir); -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index cea4a411..cf0c6a45 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -540,7 +540,7 @@ out_err: - * remove any client records that were not reclaimed since grace_start. - */ - int --sqlite_remove_unreclaimed(time_t grace_start) -+sqlite_remove_unreclaimed(uint64_t grace_start) - { - int ret; - char *err = NULL; -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h -index 06e7c044..ba8cdfa8 100644 ---- a/utils/nfsdcltrack/sqlite.h -+++ b/utils/nfsdcltrack/sqlite.h -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); - int sqlite_check_client(const unsigned char *clname, const size_t namelen, - const bool has_session); --int sqlite_remove_unreclaimed(const time_t grace_start); -+int sqlite_remove_unreclaimed(const uint64_t grace_start); - int sqlite_query_reclaiming(const time_t grace_start); - - #endif /* _SQLITE_H */ --- -2.32.0 - diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 2073bebd8a..a73bf80e70 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 07b44b5a93..6a3a801359 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.5.4 +NFS_UTILS_VERSION = 2.6.1 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ -- 2.34.1 From petr.vorel at gmail.com Sat Jan 22 18:50:49 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 19:50:49 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions In-Reply-To: <20220122185049.1194-1-petr.vorel@gmail.com> References: <20220122185049.1194-1-petr.vorel@gmail.com> Message-ID: <20220122185049.1194-2-petr.vorel@gmail.com> Suggested-by: Giulio Benetti Signed-off-by: Petr Vorel --- New in v2 package/nfs-utils/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index df9c12ca44..f00debc420 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -12,6 +12,8 @@ config BR2_PACKAGE_NFS_UTILS help The NFS Linux kernel server. + Supports NFSv3 and optionally NFSv4 (and later). + http://linux-nfs.org/ if BR2_PACKAGE_NFS_UTILS @@ -24,7 +26,7 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4 select BR2_PACKAGE_LVM2 select BR2_PACKAGE_SQLITE help - Enable NFSv4/NFSv4.1 support + Enable NFSv4/NFSv4.1/NFSv4.2 support comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -- 2.34.1 From giulio.benetti at benettiengineering.com Sat Jan 22 19:02:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 22 Jan 2022 20:02:19 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions In-Reply-To: <20220122185049.1194-2-petr.vorel@gmail.com> References: <20220122185049.1194-1-petr.vorel@gmail.com> <20220122185049.1194-2-petr.vorel@gmail.com> Message-ID: Hi Petr, On 22/01/22 19:50, Petr Vorel wrote: > Suggested-by: Giulio Benetti > Signed-off-by: Petr Vorel Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > New in v2 > > package/nfs-utils/Config.in | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in > index df9c12ca44..f00debc420 100644 > --- a/package/nfs-utils/Config.in > +++ b/package/nfs-utils/Config.in > @@ -12,6 +12,8 @@ config BR2_PACKAGE_NFS_UTILS > help > The NFS Linux kernel server. > > + Supports NFSv3 and optionally NFSv4 (and later). > + > http://linux-nfs.org/ > > if BR2_PACKAGE_NFS_UTILS > @@ -24,7 +26,7 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4 > select BR2_PACKAGE_LVM2 > select BR2_PACKAGE_SQLITE > help > - Enable NFSv4/NFSv4.1 support > + Enable NFSv4/NFSv4.1/NFSv4.2 support > > comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" > depends on BR2_STATIC_LIBS > From yann.morin.1998 at free.fr Sat Jan 22 19:08:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:08:41 +0100 Subject: [Buildroot] [git commit] configs/qemu_aarch64_virt_defconfig: linux.config: enable fb/input support Message-ID: <20220122190259.90DF182A2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5803bbd9002aab836cf0d86c5bf0674e3c1ca819 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Linux config already enabled drm-virtio for graphics output, but not the corresponding virtio-input / evdev drivers for input or the compatibility fb option. Enable them so keyboard/mouse input works and /dev/fb0 is provided. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- board/qemu/aarch64-virt/linux.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/qemu/aarch64-virt/linux.config b/board/qemu/aarch64-virt/linux.config index e3a4a92913..f9763b73b7 100644 --- a/board/qemu/aarch64-virt/linux.config +++ b/board/qemu/aarch64-virt/linux.config @@ -47,6 +47,7 @@ CONFIG_DUMMY=y CONFIG_MACVLAN=y CONFIG_VIRTIO_NET=y CONFIG_NLMON=y +CONFIG_INPUT_EVDEV=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y @@ -56,9 +57,11 @@ CONFIG_TCG_TPM=y CONFIG_TCG_TIS=y CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL031=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_MAILBOX=y From yann.morin.1998 at free.fr Sat Jan 22 19:08:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:08:43 +0100 Subject: [Buildroot] [git commit] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 Message-ID: <20220122190259.993E282A35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e410b4a32c88ab8f0799c276fb02bc2698c8782 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- configs/qemu_aarch64_virt_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 0caf38112d..9fbf293311 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From yann.morin.1998 at free.fr Sat Jan 22 19:08:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:08:38 +0100 Subject: [Buildroot] [git commit] configs/qemu_aarch64_virt_defconfig: don't hard code getty port Message-ID: <20220122190259.880C382972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24307955a2edf9e112ab815c139ceab83b3d4072 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Linux defconfig both has VT and serial port support, so it makes more sense to run getty on /dev/console instead of hard coding the serial port. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- configs/qemu_aarch64_virt_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index e6b72d8838..0caf38112d 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -4,7 +4,6 @@ BR2_cortex_a53=y # System BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y From yann.morin.1998 at free.fr Sat Jan 22 19:10:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:10:16 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu_aarch64_virt_defconfig: don't hard code getty port In-Reply-To: <20220122153714.26991-1-peter@korsgaard.com> References: <20220122153714.26991-1-peter@korsgaard.com> Message-ID: <20220122191016.GA3621364@scaer> Peter, All, On 2022-01-22 16:37 +0100, Peter Korsgaard spake thusly: > The Linux defconfig both has VT and serial port support, so it makes more > sense to run getty on /dev/console instead of hard coding the serial port. > > Signed-off-by: Peter Korsgaard Series of 3 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > configs/qemu_aarch64_virt_defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig > index e6b72d8838..0caf38112d 100644 > --- a/configs/qemu_aarch64_virt_defconfig > +++ b/configs/qemu_aarch64_virt_defconfig > @@ -4,7 +4,6 @@ BR2_cortex_a53=y > > # System > BR2_SYSTEM_DHCP="eth0" > -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 19:13:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:13:46 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1 In-Reply-To: <20220122185049.1194-1-petr.vorel@gmail.com> References: <20220122185049.1194-1-petr.vorel@gmail.com> Message-ID: <20220122191346.GB3621364@scaer> Petr, All, On 2022-01-22 19:50 +0100, Petr Vorel spake thusly: > This version dropped support to NFSv2. > > Drop patches backported from this release. > > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1->v2: > * note dropped NFSv2 support > > ...nfsdcltrack-sqlite-Fix-printf-format.patch | 52 --------------- > ...rack-nfsdcltrack.c-Fix-printf-format.patch | 48 -------------- > ...track-Use-uint64_t-instead-of-time_t.patch | 66 ------------------- > package/nfs-utils/nfs-utils.hash | 4 +- > package/nfs-utils/nfs-utils.mk | 2 +- > 5 files changed, 3 insertions(+), 169 deletions(-) > delete mode 100644 package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > delete mode 100644 package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > delete mode 100644 package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > > diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > deleted file mode 100644 > index 14894602c4..0000000000 > --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 > -From: Petr Vorel > -Date: Thu, 22 Jul 2021 16:15:44 +0000 > -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format > - > -sqlite.c: In function 'sqlite_remove_unreclaimed': > -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] > - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", > - | ~~^ > - | | > - | long int > - | %lld > - 548 | grace_start); > - | ~~~~~~~~~~~ > - | | > - | time_t {aka long long int} > - > -Found in Buildroot riscv32 build. > - > -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log > - > -Signed-off-by: Petr Vorel > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed > -Signed-off-by: Giulio Benetti > ---- > - utils/nfsdcltrack/sqlite.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c > -index f79aebb3..cea4a411 100644 > ---- a/utils/nfsdcltrack/sqlite.c > -+++ b/utils/nfsdcltrack/sqlite.c > -@@ -46,6 +46,7 @@ > - #include > - #include > - #include > -+#include > - #include > - #include > - #include > -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) > - int ret; > - char *err = NULL; > - > -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", > -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, > - grace_start); > - if (ret < 0) { > - return ret; > --- > -2.25.1 > - > diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > deleted file mode 100644 > index 0893959460..0000000000 > --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 > -From: Petr Vorel > -Date: Thu, 22 Jul 2021 16:15:45 +0000 > -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format > - > -nfsdcltrack.c: In function 'cltrack_gracedone': > -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] > - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); > - | ~~^ ~~~~~~~~~ > - | | | > - | long int time_t {aka long long int} > - | %lld > - > -Found in Buildroot riscv32 build. > - > -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log > - > -Signed-off-by: Petr Vorel > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c > -Signed-off-by: Giulio Benetti > ---- > - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c > -index e926f1c0..0b37c094 100644 > ---- a/utils/nfsdcltrack/nfsdcltrack.c > -+++ b/utils/nfsdcltrack/nfsdcltrack.c > -@@ -33,6 +33,7 @@ > - #include > - #include > - #include > -+#include > - #include > - #include > - #include > -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) > - if (*tail) > - return -EINVAL; > - > -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); > -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); > - > - ret = sqlite_remove_unreclaimed(gracetime); > - > --- > -2.25.1 > - > diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > deleted file mode 100644 > index 384f4fd806..0000000000 > --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > +++ /dev/null > @@ -1,66 +0,0 @@ > -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 > -From: Steve Dickson > -Date: Tue, 27 Jul 2021 21:12:17 -0400 > -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t > - > -With recent commits (4f2a5b64,5a53426c) that fixed > -compile errors on x86_64 machines, caused similar > -errors on i686 machines. > - > -The variable type that was being used was a time_t, > -which changes size between architects, which > -caused the compile error. > - > -Changing the variable to uint64_t fixed the issue. > - > -Signed-off-by: Steve Dickson > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 > -Signed-off-by: Petr Vorel > ---- > - utils/nfsdcltrack/nfsdcltrack.c | 2 +- > - utils/nfsdcltrack/sqlite.c | 2 +- > - utils/nfsdcltrack/sqlite.h | 2 +- > - 3 files changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c > -index 0b37c094..7c1c4bcc 100644 > ---- a/utils/nfsdcltrack/nfsdcltrack.c > -+++ b/utils/nfsdcltrack/nfsdcltrack.c > -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) > - { > - int ret; > - char *tail; > -- time_t gracetime; > -+ uint64_t gracetime; > - > - > - ret = sqlite_prepare_dbh(storagedir); > -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c > -index cea4a411..cf0c6a45 100644 > ---- a/utils/nfsdcltrack/sqlite.c > -+++ b/utils/nfsdcltrack/sqlite.c > -@@ -540,7 +540,7 @@ out_err: > - * remove any client records that were not reclaimed since grace_start. > - */ > - int > --sqlite_remove_unreclaimed(time_t grace_start) > -+sqlite_remove_unreclaimed(uint64_t grace_start) > - { > - int ret; > - char *err = NULL; > -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h > -index 06e7c044..ba8cdfa8 100644 > ---- a/utils/nfsdcltrack/sqlite.h > -+++ b/utils/nfsdcltrack/sqlite.h > -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, > - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); > - int sqlite_check_client(const unsigned char *clname, const size_t namelen, > - const bool has_session); > --int sqlite_remove_unreclaimed(const time_t grace_start); > -+int sqlite_remove_unreclaimed(const uint64_t grace_start); > - int sqlite_query_reclaiming(const time_t grace_start); > - > - #endif /* _SQLITE_H */ > --- > -2.32.0 > - > diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash > index 2073bebd8a..a73bf80e70 100644 > --- a/package/nfs-utils/nfs-utils.hash > +++ b/package/nfs-utils/nfs-utils.hash > @@ -1,4 +1,4 @@ > -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc > -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz > +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc > +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz > # Locally computed > sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index 07b44b5a93..6a3a801359 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NFS_UTILS_VERSION = 2.5.4 > +NFS_UTILS_VERSION = 2.6.1 > NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz > NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) > NFS_UTILS_LICENSE = GPL-2.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 19:14:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:14:34 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions In-Reply-To: <20220122185049.1194-2-petr.vorel@gmail.com> References: <20220122185049.1194-1-petr.vorel@gmail.com> <20220122185049.1194-2-petr.vorel@gmail.com> Message-ID: <20220122191434.GC3621364@scaer> Petr, All, On 2022-01-22 19:50 +0100, Petr Vorel spake thusly: > Suggested-by: Giulio Benetti > Signed-off-by: Petr Vorel The commit title was confusing, so I amended it a little, and applied to master, thanks. Regards, Yann E. MORIN. > --- > New in v2 > > package/nfs-utils/Config.in | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in > index df9c12ca44..f00debc420 100644 > --- a/package/nfs-utils/Config.in > +++ b/package/nfs-utils/Config.in > @@ -12,6 +12,8 @@ config BR2_PACKAGE_NFS_UTILS > help > The NFS Linux kernel server. > > + Supports NFSv3 and optionally NFSv4 (and later). > + > http://linux-nfs.org/ > > if BR2_PACKAGE_NFS_UTILS > @@ -24,7 +26,7 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4 > select BR2_PACKAGE_LVM2 > select BR2_PACKAGE_SQLITE > help > - Enable NFSv4/NFSv4.1 support > + Enable NFSv4/NFSv4.1/NFSv4.2 support > > comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" > depends on BR2_STATIC_LIBS > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From petr.vorel at gmail.com Sat Jan 22 19:35:14 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 20:35:14 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions In-Reply-To: <20220122191434.GC3621364@scaer> References: <20220122185049.1194-1-petr.vorel@gmail.com> <20220122185049.1194-2-petr.vorel@gmail.com> <20220122191434.GC3621364@scaer> Message-ID: > Petr, All, > On 2022-01-22 19:50 +0100, Petr Vorel spake thusly: > > Suggested-by: Giulio Benetti > > Signed-off-by: Petr Vorel > The commit title was confusing, so I amended it a little, and applied > to master, thanks. Yann, thanks a lot for fixing it! Kind regards, Petr > Regards, > Yann E. MORIN. From yann.morin.1998 at free.fr Sat Jan 22 19:11:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:11:56 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: update supported protocol versions in help texts Message-ID: <20220122193531.303D8813B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1945979c8e418063240bc3d3f9c512b878f9acf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Suggested-by: Giulio Benetti Signed-off-by: Petr Vorel Reviewed-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/nfs-utils/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index df9c12ca44..f00debc420 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -12,6 +12,8 @@ config BR2_PACKAGE_NFS_UTILS help The NFS Linux kernel server. + Supports NFSv3 and optionally NFSv4 (and later). + http://linux-nfs.org/ if BR2_PACKAGE_NFS_UTILS @@ -24,7 +26,7 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4 select BR2_PACKAGE_LVM2 select BR2_PACKAGE_SQLITE help - Enable NFSv4/NFSv4.1 support + Enable NFSv4/NFSv4.1/NFSv4.2 support comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS From yann.morin.1998 at free.fr Sat Jan 22 19:11:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:11:36 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: bump version to 2.6.1 Message-ID: <20220122193531.26CAD8294C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5039c49d580eaaea493c28c707314a233e40c9fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version dropped support to NFSv2. Drop patches backported from this release. Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- ...0001-nfsdcltrack-sqlite-Fix-printf-format.patch | 52 ----------------- ...sdcltrack-nfsdcltrack.c-Fix-printf-format.patch | 48 ---------------- ...fsdcltrack-Use-uint64_t-instead-of-time_t.patch | 66 ---------------------- package/nfs-utils/nfs-utils.hash | 4 +- package/nfs-utils/nfs-utils.mk | 2 +- 5 files changed, 3 insertions(+), 169 deletions(-) diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch deleted file mode 100644 index 14894602c4..0000000000 --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:44 +0000 -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format - -sqlite.c: In function 'sqlite_remove_unreclaimed': -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", - | ~~^ - | | - | long int - | %lld - 548 | grace_start); - | ~~~~~~~~~~~ - | | - | time_t {aka long long int} - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/sqlite.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index f79aebb3..cea4a411 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) - int ret; - char *err = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, - grace_start); - if (ret < 0) { - return ret; --- -2.25.1 - diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch deleted file mode 100644 index 0893959460..0000000000 --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:45 +0000 -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format - -nfsdcltrack.c: In function 'cltrack_gracedone': -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); - | ~~^ ~~~~~~~~~ - | | | - | long int time_t {aka long long int} - | %lld - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index e926f1c0..0b37c094 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) - if (*tail) - return -EINVAL; - -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); - - ret = sqlite_remove_unreclaimed(gracetime); - --- -2.25.1 - diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch deleted file mode 100644 index 384f4fd806..0000000000 --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Tue, 27 Jul 2021 21:12:17 -0400 -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t - -With recent commits (4f2a5b64,5a53426c) that fixed -compile errors on x86_64 machines, caused similar -errors on i686 machines. - -The variable type that was being used was a time_t, -which changes size between architects, which -caused the compile error. - -Changing the variable to uint64_t fixed the issue. - -Signed-off-by: Steve Dickson -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 -Signed-off-by: Petr Vorel ---- - utils/nfsdcltrack/nfsdcltrack.c | 2 +- - utils/nfsdcltrack/sqlite.c | 2 +- - utils/nfsdcltrack/sqlite.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index 0b37c094..7c1c4bcc 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) - { - int ret; - char *tail; -- time_t gracetime; -+ uint64_t gracetime; - - - ret = sqlite_prepare_dbh(storagedir); -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index cea4a411..cf0c6a45 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -540,7 +540,7 @@ out_err: - * remove any client records that were not reclaimed since grace_start. - */ - int --sqlite_remove_unreclaimed(time_t grace_start) -+sqlite_remove_unreclaimed(uint64_t grace_start) - { - int ret; - char *err = NULL; -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h -index 06e7c044..ba8cdfa8 100644 ---- a/utils/nfsdcltrack/sqlite.h -+++ b/utils/nfsdcltrack/sqlite.h -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); - int sqlite_check_client(const unsigned char *clname, const size_t namelen, - const bool has_session); --int sqlite_remove_unreclaimed(const time_t grace_start); -+int sqlite_remove_unreclaimed(const uint64_t grace_start); - int sqlite_query_reclaiming(const time_t grace_start); - - #endif /* _SQLITE_H */ --- -2.32.0 - diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 2073bebd8a..a73bf80e70 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 07b44b5a93..6a3a801359 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.5.4 +NFS_UTILS_VERSION = 2.6.1 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ From yann.morin.1998 at free.fr Sat Jan 22 19:53:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:53:12 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.4 Message-ID: <20220122194724.60AA78212B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e59579767cacc05c149cc7dbc089652ae5375b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: two spaces in hash file] Signed-off-by: Yann E. MORIN --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1cdfff50c9..09640a903c 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.3 +MESA3D_HEADERS_VERSION = 21.3.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 235a1b55bb..559f21e06a 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-December/000658.html -sha256 ad7f4613ea7c5d08d9fcb5025270199e6ceb9aa99fd72ee572b70342240a8121 mesa-21.3.3.tar.xz -sha512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673 mesa-21.3.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html +sha256 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d mesa-21.3.4.tar.xz +sha512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9 mesa-21.3.4.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index aa365838ab..f49d96025a 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.3 +MESA3D_VERSION = 21.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From yann.morin.1998 at free.fr Sat Jan 22 19:57:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:57:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.4 In-Reply-To: <20220122153441.1377553-1-bernd.kuhls@t-online.de> References: <20220122153441.1377553-1-bernd.kuhls@t-online.de> Message-ID: <20220122195729.GD3621364@scaer> Bernd, All, On 2022-01-22 16:34 +0100, Bernd Kuhls spake thusly: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html > > Signed-off-by: Bernd Kuhls > --- > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > package/mesa3d/mesa3d.hash | 6 +++--- > package/mesa3d/mesa3d.mk | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk > index 1cdfff50c9..09640a903c 100644 > --- a/package/mesa3d-headers/mesa3d-headers.mk > +++ b/package/mesa3d-headers/mesa3d-headers.mk > @@ -12,7 +12,7 @@ endif > > # Not possible to directly refer to mesa3d variables, because of > # first/second expansion trickery... > -MESA3D_HEADERS_VERSION = 21.3.3 > +MESA3D_HEADERS_VERSION = 21.3.4 Do you know why we have patches in mesa3d but not in mesa3d-headers? I would have expected that we would have the same set of patches for both... > MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz > MESA3D_HEADERS_SITE = https://archive.mesa3d.org > MESA3D_HEADERS_DL_SUBDIR = mesa3d > diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash > index 235a1b55bb..0f373e29a6 100644 > --- a/package/mesa3d/mesa3d.hash > +++ b/package/mesa3d/mesa3d.hash > @@ -1,6 +1,6 @@ > -# From https://lists.freedesktop.org/archives/mesa-announce/2021-December/000658.html > -sha256 ad7f4613ea7c5d08d9fcb5025270199e6ceb9aa99fd72ee572b70342240a8121 mesa-21.3.3.tar.xz > -sha512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673 mesa-21.3.3.tar.xz > +# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html > +sha256 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d mesa-21.3.4.tar.xz > +sha512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9 mesa-21.3.4.tar.xz There were two spaces between hash type and hash, but your update uses a single space, which triggers a check-package warning: $ ./utils/check-package -q package/mesa3d/mesa3d.hash package/mesa3d/mesa3d.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) package/mesa3d/mesa3d.hash:3: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > # License > sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index c4e213088e..0d80813d01 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > # When updating the version, please also update mesa3d-headers > -MESA3D_VERSION = 21.3.3 > +MESA3D_VERSION = 21.3.4 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 19:58:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:58:02 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-vdr-vnsi: bump version to 19.0.3-Matrix Message-ID: <20220122195142.242B48019E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca68aa7bc7c6a822676acb9ea1cb523341b3f51a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 4cd1f7ad6b..e3dc5585d2 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz +sha256 317442cdfd333f47dfe95d05057a682340dd5ba53efc8894e892ee565b8aaece kodi-pvr-vdr-vnsi-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 65e69d2b23..f0d61d9d2e 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.3-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Sat Jan 22 19:57:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:57:52 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 22.1.1 Message-ID: <20220122195142.1CC45818D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f78f9bff8e432312bbfa85a03e541aec3294aae0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 38121da036..ceafa20e80 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c1cd5c4c1b7bd1c7785ed4d553b76b17dd7e673619a39e0c3070246aa671024 intel-media-22.1.0.tar.gz +sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.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 fd3b22a851..9a2b4a8753 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 = 22.1.0 +INTEL_MEDIADRIVER_VERSION = 22.1.1 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From yann.morin.1998 at free.fr Sat Jan 22 19:58:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:58:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-mediadriver: bump version to 22.1.1 In-Reply-To: <20220122153207.1376790-1-bernd.kuhls@t-online.de> References: <20220122153207.1376790-1-bernd.kuhls@t-online.de> Message-ID: <20220122195840.GE3621364@scaer> Bernd, All, On 2022-01-22 16:32 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 38121da036..ceafa20e80 100644 > --- a/package/intel-mediadriver/intel-mediadriver.hash > +++ b/package/intel-mediadriver/intel-mediadriver.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 6c1cd5c4c1b7bd1c7785ed4d553b76b17dd7e673619a39e0c3070246aa671024 intel-media-22.1.0.tar.gz > +sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.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 99348537bf..d8820379e7 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 = 22.1.0 > +INTEL_MEDIADRIVER_VERSION = 22.1.1 > INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive > INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz > INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 19:59:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:59:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-vdr-vnsi: bump version to 19.0.3-Matrix In-Reply-To: <20220122153629.1378404-1-bernd.kuhls@t-online.de> References: <20220122153629.1378404-1-bernd.kuhls@t-online.de> Message-ID: <20220122195905.GF3621364@scaer> Bernd, All, On 2022-01-22 16:36 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- > package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > index 4cd1f7ad6b..e3dc5585d2 100644 > --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz > +sha256 317442cdfd333f47dfe95d05057a682340dd5ba53efc8894e892ee565b8aaece kodi-pvr-vdr-vnsi-19.0.3-Matrix.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > index 65e69d2b23..f0d61d9d2e 100644 > --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix > +KODI_PVR_VDR_VNSI_VERSION = 19.0.3-Matrix > KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) > KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ > KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 20:00:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 21:00:05 +0100 Subject: [Buildroot] [git commit] package/sdbus-cpp: bump to version 1.1.0 Message-ID: <20220122195614.61939819BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a394c17b79fbdd9d7f441e858e280c2cf225bfd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Sergey Bobrenok Signed-off-by: Yann E. MORIN --- package/sdbus-cpp/sdbus-cpp.hash | 3 ++- package/sdbus-cpp/sdbus-cpp.mk | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index 8b87653dfd..3a0e863a86 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 0fd575ae0f463773dd9141242d1133731e2b780fd6526650ce992ba711d88628 v0.8.3.tar.gz +sha256 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 v1.1.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING +sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 24904ee26f..e0fbc5c856 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,12 +4,12 @@ # ################################################################################ -SDBUS_CPP_VERSION = 0.8.3 +SDBUS_CPP_VERSION = 1.1.0 SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd -SDBUS_CPP_LICENSE = LGPL-2.1+ -SDBUS_CPP_LICENSE_FILES = COPYING +SDBUS_CPP_LICENSE = LGPL-2.1+ with exception (headers) +SDBUS_CPP_LICENSE_FILES = COPYING COPYING-LGPL-Exception $(eval $(cmake-package)) From yann.morin.1998 at free.fr Sat Jan 22 20:03:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 21:03:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdbus-cpp: bump to version 1.1.0 In-Reply-To: <20220122124111.103131-1-bobrofon@gmail.com> References: <20220122124111.103131-1-bobrofon@gmail.com> Message-ID: <20220122200341.GG3621364@scaer> Sergey, All, On 2022-01-22 15:41 +0300, Sergey Bobrenok spake thusly: > Signed-off-by: Sergey Bobrenok > --- > package/sdbus-cpp/sdbus-cpp.hash | 3 ++- > package/sdbus-cpp/sdbus-cpp.mk | 6 +++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash > index 8b87653dfd..3a0e863a86 100644 > --- a/package/sdbus-cpp/sdbus-cpp.hash > +++ b/package/sdbus-cpp/sdbus-cpp.hash > @@ -1,3 +1,4 @@ > # Locally computed: > -sha256 0fd575ae0f463773dd9141242d1133731e2b780fd6526650ce992ba711d88628 v0.8.3.tar.gz > +sha256 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 v1.1.0.tar.gz > sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING > +sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception > diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk > index 24904ee26f..e0fbc5c856 100644 > --- a/package/sdbus-cpp/sdbus-cpp.mk > +++ b/package/sdbus-cpp/sdbus-cpp.mk > @@ -4,12 +4,12 @@ > # > ################################################################################ > > -SDBUS_CPP_VERSION = 0.8.3 > +SDBUS_CPP_VERSION = 1.1.0 > SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz > SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) > SDBUS_CPP_INSTALL_STAGING = YES > SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd > -SDBUS_CPP_LICENSE = LGPL-2.1+ > -SDBUS_CPP_LICENSE_FILES = COPYING > +SDBUS_CPP_LICENSE = LGPL-2.1+ with exception (headers) > +SDBUS_CPP_LICENSE_FILES = COPYING COPYING-LGPL-Exception Thanks for noticing the update in the licensing terms. :-) Applied to master, thanks. Regards, Yann E. MORIN. > $(eval $(cmake-package)) > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 22 21:43:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 22:43:18 +0100 Subject: [Buildroot] [PATCH 1/1] Config.in.legacy: fix typo Message-ID: <20220122214318.136871-1-fontaine.fabrice@gmail.com> Fix typo added by commit 7527324132878f98999539bdd97bd3518747f585: brcmfmac-sdio-firmware-rpi by brcmfmac_sdio-firmware-rpi Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c11cb846fb..62717463df 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -154,7 +154,7 @@ config BR2_PACKAGE_RPI_BT_FIRMWARE select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT help Package rpi-bt-firmware was moved as option to - package brcmfmac-sdio-firmware-rpi. + package brcmfmac_sdio-firmware-rpi. config BR2_PACKAGE_RPI_WIFI_FIRMWARE bool "rpi-wifi-firmware package was renamed" @@ -164,7 +164,7 @@ config BR2_PACKAGE_RPI_WIFI_FIRMWARE select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI help Package rpi-wifi-firmware was moved as option to - package brcmfmac-sdio-firmware-rpi. + package brcmfmac_sdio-firmware-rpi. config BR2_PACKAGE_HOST_GDB_PYTHON bool "GDB Python2 support removed" -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:03:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:03:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/luajit: add LUAJIT_CPE_ID_VENDOR Message-ID: <20220122220334.266735-1-fontaine.fabrice@gmail.com> cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit Signed-off-by: Fabrice Fontaine --- package/luajit/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 7c1b556ff7..cca806309d 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -8,6 +8,7 @@ LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT +LUAJIT_CPE_ID_VENDOR = luajit LUAJIT_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:11:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:11:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: bump to version 3.4.4 Message-ID: <20220122221151.298957-1-fontaine.fabrice@gmail.com> This bump will fix build failure with libkrb5 raised since the addition of the package in commit 6be9913a7eeead7cdac804afc127791ba4b0e69e: management/spnego.c:25:10: fatal error: spnego_mech.h: No such file or directory 25 | #include "spnego_mech.h" | ^~~~~~~~~~~~~~~ https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.4.4 Fixes: - http://autobuild.buildroot.org/results/b4c3dba395327ab6ae28337efb962c99b2d5b922 Signed-off-by: Fabrice Fontaine --- package/ksmbd-tools/ksmbd-tools.hash | 2 +- package/ksmbd-tools/ksmbd-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index ad507bfdb2..d146f36a0e 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz +sha256 f42aec21515e34305bc07e1ce2c4926c87ea7bc8a675ca6d0a453f6b6be34e2b ksmbd-tools-3.4.4.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index b3ffc3e768..b08845b581 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.4.3 +KSMBD_TOOLS_VERSION = 3.4.4 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:23:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:23:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: security bump to version 1.4.64 Message-ID: <20220122222313.303416-1-fontaine.fabrice@gmail.com> Fix CVE-2022-22707: In lighttpd 1.4.46 through 1.4.63, the mod_extforward_Forwarded function of the mod_extforward plugin has a stack-based buffer overflow (4 bytes representing -1), as demonstrated by remote denial of service (daemon crash) in a non-default configuration. The non-default configuration requires handling of the Forwarded header in a somewhat unusual manner. Also, a 32-bit system is much more likely to be affected than a 64-bit system. gdbm, geoip and memcached options have been dropped with https://github.com/lighttpd/lighttpd1.4/commit/86c2d3093686c4f945086c90af9b8a7900925b6b https://www.lighttpd.net/2022/1/19/1.4.64/ Signed-off-by: Fabrice Fontaine --- package/lighttpd/lighttpd.hash | 4 ++-- package/lighttpd/lighttpd.mk | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 7601745fd7..ce026b9b4a 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.63.sha256sum -sha256 2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9 lighttpd-1.4.63.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.64.sha512sum +sha512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 lighttpd-1.4.64.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 5d53767263..f0974dd5b2 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).63 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).64 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -16,8 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ - -Dwith_gdbm=false \ - -Dwith_geoip=false \ -Dwith_gnutls=false \ -Dwith_krb5=false \ -Dwith_ldap=false \ @@ -25,7 +23,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_libunwind=false \ -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ - -Dwith_memcached=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ -- 2.34.1 From yann.morin.1998 at free.fr Sat Jan 22 22:26:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:26:16 +0100 Subject: [Buildroot] [git commit] package/lighttpd: security bump to version 1.4.64 Message-ID: <20220122222619.39A8C8296B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e043719c9747cf3a62780827deae5c08a5c7553f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-22707: In lighttpd 1.4.46 through 1.4.63, the mod_extforward_Forwarded function of the mod_extforward plugin has a stack-based buffer overflow (4 bytes representing -1), as demonstrated by remote denial of service (daemon crash) in a non-default configuration. The non-default configuration requires handling of the Forwarded header in a somewhat unusual manner. Also, a 32-bit system is much more likely to be affected than a 64-bit system. gdbm, geoip and memcached options have been dropped with https://github.com/lighttpd/lighttpd1.4/commit/86c2d3093686c4f945086c90af9b8a7900925b6b https://www.lighttpd.net/2022/1/19/1.4.64/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lighttpd/lighttpd.hash | 4 ++-- package/lighttpd/lighttpd.mk | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 7601745fd7..ce026b9b4a 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.63.sha256sum -sha256 2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9 lighttpd-1.4.63.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.64.sha512sum +sha512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 lighttpd-1.4.64.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 5d53767263..f0974dd5b2 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).63 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).64 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -16,8 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ - -Dwith_gdbm=false \ - -Dwith_geoip=false \ -Dwith_gnutls=false \ -Dwith_krb5=false \ -Dwith_ldap=false \ @@ -25,7 +23,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_libunwind=false \ -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ - -Dwith_memcached=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ From yann.morin.1998 at free.fr Sat Jan 22 22:33:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:33:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: security bump to version 1.4.64 In-Reply-To: <20220122222313.303416-1-fontaine.fabrice@gmail.com> References: <20220122222313.303416-1-fontaine.fabrice@gmail.com> Message-ID: <20220122223357.GI3621364@scaer> Fabrice, All, On 2022-01-22 23:23 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2022-22707: In lighttpd 1.4.46 through 1.4.63, the > mod_extforward_Forwarded function of the mod_extforward plugin has a > stack-based buffer overflow (4 bytes representing -1), as demonstrated > by remote denial of service (daemon crash) in a non-default > configuration. The non-default configuration requires handling of the > Forwarded header in a somewhat unusual manner. Also, a 32-bit system is > much more likely to be affected than a 64-bit system. > > gdbm, geoip and memcached options have been dropped with > https://github.com/lighttpd/lighttpd1.4/commit/86c2d3093686c4f945086c90af9b8a7900925b6b > > https://www.lighttpd.net/2022/1/19/1.4.64/ > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/lighttpd/lighttpd.hash | 4 ++-- > package/lighttpd/lighttpd.mk | 5 +---- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash > index 7601745fd7..ce026b9b4a 100644 > --- a/package/lighttpd/lighttpd.hash > +++ b/package/lighttpd/lighttpd.hash > @@ -1,4 +1,4 @@ > -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.63.sha256sum > -sha256 2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9 lighttpd-1.4.63.tar.xz > +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.64.sha512sum > +sha512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 lighttpd-1.4.64.tar.xz > # Locally calculated > sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING > diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk > index 5d53767263..f0974dd5b2 100644 > --- a/package/lighttpd/lighttpd.mk > +++ b/package/lighttpd/lighttpd.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIGHTTPD_VERSION_MAJOR = 1.4 > -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).63 > +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).64 > LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz > LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x > LIGHTTPD_LICENSE = BSD-3-Clause > @@ -16,8 +16,6 @@ LIGHTTPD_CONF_OPTS = \ > -Dwith_brotli=false \ > -Dwith_dbi=false \ > -Dwith_fam=false \ > - -Dwith_gdbm=false \ > - -Dwith_geoip=false \ > -Dwith_gnutls=false \ > -Dwith_krb5=false \ > -Dwith_ldap=false \ > @@ -25,7 +23,6 @@ LIGHTTPD_CONF_OPTS = \ > -Dwith_libunwind=false \ > -Dwith_maxminddb=false \ > -Dwith_mbedtls=false \ > - -Dwith_memcached=false \ > -Dwith_mysql=false \ > -Dwith_nettle=false \ > -Dwith_nss=false \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 22:35:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:35:13 +0100 Subject: [Buildroot] [git commit] package/ksmbd-tools: bump to version 3.4.4 Message-ID: <20220122222850.BA37182235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbb3e4615851cbd3c3c0ce4a72731347f006dc1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix build failure with libkrb5 raised since the addition of the package in commit 6be9913a7eeead7cdac804afc127791ba4b0e69e: management/spnego.c:25:10: fatal error: spnego_mech.h: No such file or directory 25 | #include "spnego_mech.h" | ^~~~~~~~~~~~~~~ https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.4.4 Fixes: - http://autobuild.buildroot.org/results/b4c3dba395327ab6ae28337efb962c99b2d5b922 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ksmbd-tools/ksmbd-tools.hash | 2 +- package/ksmbd-tools/ksmbd-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index ad507bfdb2..d146f36a0e 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz +sha256 f42aec21515e34305bc07e1ce2c4926c87ea7bc8a675ca6d0a453f6b6be34e2b ksmbd-tools-3.4.4.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index b3ffc3e768..b08845b581 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.4.3 +KSMBD_TOOLS_VERSION = 3.4.4 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sat Jan 22 22:34:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:34:45 +0100 Subject: [Buildroot] [git commit] package/luajit: add LUAJIT_CPE_ID_VENDOR Message-ID: <20220122222850.B09ED82A35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d91f454117fafad219948bf1ea86b0d6e2301f76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/luajit/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 7c1b556ff7..cca806309d 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -8,6 +8,7 @@ LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT +LUAJIT_CPE_ID_VENDOR = luajit LUAJIT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sat Jan 22 22:35:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:35:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/luajit: add LUAJIT_CPE_ID_VENDOR In-Reply-To: <20220122220334.266735-1-fontaine.fabrice@gmail.com> References: <20220122220334.266735-1-fontaine.fabrice@gmail.com> Message-ID: <20220122223547.GJ3621364@scaer> Fabrice, All, On 2022-01-22 23:03 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/luajit/luajit.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk > index 7c1b556ff7..cca806309d 100644 > --- a/package/luajit/luajit.mk > +++ b/package/luajit/luajit.mk > @@ -8,6 +8,7 @@ LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 > LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) > LUAJIT_LICENSE = MIT > LUAJIT_LICENSE_FILES = COPYRIGHT > +LUAJIT_CPE_ID_VENDOR = luajit > > LUAJIT_INSTALL_STAGING = YES > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 22:36:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:36:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: bump to version 3.4.4 In-Reply-To: <20220122221151.298957-1-fontaine.fabrice@gmail.com> References: <20220122221151.298957-1-fontaine.fabrice@gmail.com> Message-ID: <20220122223607.GK3621364@scaer> Fabrice, All, On 2022-01-22 23:11 +0100, Fabrice Fontaine spake thusly: > This bump will fix build failure with libkrb5 raised since the addition > of the package in commit 6be9913a7eeead7cdac804afc127791ba4b0e69e: > > management/spnego.c:25:10: fatal error: spnego_mech.h: No such file or directory > 25 | #include "spnego_mech.h" > | ^~~~~~~~~~~~~~~ > > https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.4.4 > > Fixes: > - http://autobuild.buildroot.org/results/b4c3dba395327ab6ae28337efb962c99b2d5b922 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ksmbd-tools/ksmbd-tools.hash | 2 +- > package/ksmbd-tools/ksmbd-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash > index ad507bfdb2..d146f36a0e 100644 > --- a/package/ksmbd-tools/ksmbd-tools.hash > +++ b/package/ksmbd-tools/ksmbd-tools.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz > +sha256 f42aec21515e34305bc07e1ce2c4926c87ea7bc8a675ca6d0a453f6b6be34e2b ksmbd-tools-3.4.4.tar.gz > sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING > diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk > index b3ffc3e768..b08845b581 100644 > --- a/package/ksmbd-tools/ksmbd-tools.mk > +++ b/package/ksmbd-tools/ksmbd-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KSMBD_TOOLS_VERSION = 3.4.3 > +KSMBD_TOOLS_VERSION = 3.4.4 > KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) > KSMBD_TOOLS_LICENSE = GPL-2.0+ > KSMBD_TOOLS_LICENSE_FILES = COPYING > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 22 22:35:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:35:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/cereal: bump to version 1.3.1 Message-ID: <20220122223516.306713-1-fontaine.fabrice@gmail.com> - Drop patch (already in version) - Update hash of LICENSE file (license updated to match BSD template: https://github.com/USCiLab/cereal/commit/8291f44e05d3e3ee3c4fc9e088231789b701e17e) - Update indentation in hash file (two spaces) https://github.com/USCiLab/cereal/releases/tag/v1.3.1 Signed-off-by: Fabrice Fontaine --- ...alized-shared_ptr-within-the-archive.patch | 67 ------------------- package/cereal/cereal.hash | 10 +-- package/cereal/cereal.mk | 5 +- 3 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch diff --git a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch b/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch deleted file mode 100644 index 3458ec1b59..0000000000 --- a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f27c12d491955c94583512603bf32c4568f20929 Mon Sep 17 00:00:00 2001 -From: Michael Walz -Date: Tue, 2 Feb 2021 00:50:29 +0100 -Subject: [PATCH] Store a copy of each serialized shared_ptr within the archive - to prevent the shared_ptr to be freed to early. (#667) - -The archives use the memory address pointed by the shared_ptr as a -unique id which must not be reused during lifetime of the archive. -Therefore, the archives stores a copy of it. -This problem was also reported as CVE-2020-11105. - -[Retrieved from: -https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929] -Signed-off-by: Fabrice Fontaine ---- - include/cereal/cereal.hpp | 13 +++++++++++-- - include/cereal/types/memory.hpp | 2 +- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/include/cereal/cereal.hpp b/include/cereal/cereal.hpp -index 99bed9d6..f0d15e8b 100644 ---- a/include/cereal/cereal.hpp -+++ b/include/cereal/cereal.hpp -@@ -369,12 +369,17 @@ namespace cereal - point to the same data. - - @internal -- @param addr The address (see shared_ptr get()) pointed to by the shared pointer -+ @param sharedPointer The shared pointer itself (the adress is taked via get()). -+ The archive takes a copy to prevent the memory location to be freed -+ as long as the address is used as id. This is needed to prevent CVE-2020-11105. - @return A key that uniquely identifies the pointer */ -- inline std::uint32_t registerSharedPointer( void const * addr ) -+ inline std::uint32_t registerSharedPointer(const std::shared_ptr& sharedPointer) - { -+ void const * addr = sharedPointer.get(); -+ - // Handle null pointers by just returning 0 - if(addr == 0) return 0; -+ itsSharedPointerStorage.push_back(sharedPointer); - - auto id = itsSharedPointerMap.find( addr ); - if( id == itsSharedPointerMap.end() ) -@@ -645,6 +650,10 @@ namespace cereal - //! Maps from addresses to pointer ids - std::unordered_map itsSharedPointerMap; - -+ //! Copy of shared pointers used in #itsSharedPointerMap to make sure they are kept alive -+ // during lifetime of itsSharedPointerMap to prevent CVE-2020-11105. -+ std::vector> itsSharedPointerStorage; -+ - //! The id to be given to the next pointer - std::uint32_t itsCurrentPointerId; - -diff --git a/include/cereal/types/memory.hpp b/include/cereal/types/memory.hpp -index 59e9da9b..cac1f334 100644 ---- a/include/cereal/types/memory.hpp -+++ b/include/cereal/types/memory.hpp -@@ -263,7 +263,7 @@ namespace cereal - { - auto & ptr = wrapper.ptr; - -- uint32_t id = ar.registerSharedPointer( ptr.get() ); -+ uint32_t id = ar.registerSharedPointer( ptr ); - ar( CEREAL_NVP_("id", id) ); - - if( id & detail::msb_32bit ) diff --git a/package/cereal/cereal.hash b/package/cereal/cereal.hash index ddaf54e7b4..18889b4d42 100644 --- a/package/cereal/cereal.hash +++ b/package/cereal/cereal.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5 cereal-1.3.0.tar.gz -sha256 18fd7618c44c9fe28b5f54cd19747df3c0472ed33e8507fea571e2acf6e72f34 LICENSE -sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp -sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h -sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt +sha256 65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976 cereal-1.3.1.tar.gz +sha256 58604a126af6a671ea390ee3d5b3e42228aa59b2858fb7af1d5b20b31739ccbb LICENSE +sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp +sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h +sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt diff --git a/package/cereal/cereal.mk b/package/cereal/cereal.mk index 19faa2ac4e..a44f09c743 100644 --- a/package/cereal/cereal.mk +++ b/package/cereal/cereal.mk @@ -4,7 +4,7 @@ # ################################################################################ -CEREAL_VERSION = 1.3.0 +CEREAL_VERSION = 1.3.1 CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) @@ -16,7 +16,4 @@ CEREAL_CONF_OPTS = \ -DTHREAD_SAFE=ON \ -DJUST_INSTALL_CEREAL=ON -# 0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch -CEREAL_IGNORE_CVES += CVE-2020-11105 - $(eval $(cmake-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:44:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:44:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: switch to pcre2 Message-ID: <20220122224410.309822-1-fontaine.fabrice@gmail.com> Switch to pcre2 which is supported since version 1.4.62 and https://github.com/lighttpd/lighttpd1.4/commit/7512d82ca49f1b579819c2974c61de4e3137c70b and enabled by default since version 1.4.64 and https://github.com/lighttpd/lighttpd1.4/commit/750414d3bb6f13c119220e56d0c8123e665dffc5 Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 2 +- package/lighttpd/lighttpd.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9f593a9228..ed674a9227 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -48,7 +48,7 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Enable PCRE support. Needed to support mod_rewrite diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index f0974dd5b2..2a05071209 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -26,6 +26,7 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ + -Dwith_pcre=false \ -Dwith_pgsql=false \ -Dwith_sasl=false \ -Dwith_wolfssl=false \ @@ -65,10 +66,10 @@ LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) -LIGHTTPD_DEPENDENCIES += pcre -LIGHTTPD_CONF_OPTS += -Dwith_pcre=true +LIGHTTPD_DEPENDENCIES += pcre2 +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true else -LIGHTTPD_CONF_OPTS += -Dwith_pcre=false +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:49:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:49:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: replace mod_compress by mod_deflate Message-ID: <20220122224935.310100-1-fontaine.fabrice@gmail.com> mod_compress has been subsumed by mod_deflate since version 1.4.56 and https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index ed674a9227..99a09e9766 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -38,13 +38,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB help - Enable zlib support for lighttpd mod_compress. + Enable zlib support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 help - Enable bzip2 support for lighttpd mod_compress. + Enable bzip2 support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Jan 23 07:07:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 23 Jan 2022 07:07:40 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-22 Message-ID: <20220123070745.8D0874040B@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-22 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 60 | 4 | 0 | 64 | 2021.11.x | 14 | 6 | 0 | 20 | master | 101 | 53 | 0 | 154 | Classification of failures by reason for master ----------------------------------------------- frr-8.1 | 7 rtorrent-0.9.8 | 4 rygel-0.40.2 | 4 bluez5_utils-5.63 | 3 qt5webkit-5.212.0-alpha4 | 3 apcupsd-3.14.14 | 2 cryptsetup-2.4.2 | 2 guile-3.0.7 | 2 log4cxx-0.12.0 | 2 mesa3d-21.3.3 | 2 unknown | 2 wavemon-0.9.4 | 2 android-tools-4.2.2+git2013... | 1 bat-0.18.3 | 1 bird-2.0.8 | 1 efl-1.26.0 | 1 file-5.41 | 1 gocryptfs-2.2.0 | 1 hiawatha-11.1 | 1 i2pd-2.40.0 | 1 ksmbd-tools-3.4.3 | 1 kvm-unit-tests-kvm-unit-tes... | 1 mongrel2-1.13.0 | 1 mpv-0.33.1 | 1 nodejs-14.18.3 | 1 powertop-2.13 | 1 qt5base-5.15.2 | 1 resiprocate-1.12.0 | 1 ripgrep-af6b6c543b224d348a8... | 1 vlc-3.0.16 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/0a6f8adfb3039c0c9fd99c61ae9335c86204e592 | sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/84e23aad4a3e13a4e3c8b07b7193d6535f59c1c5 | sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/8ba769e3f6be20b97df09f53b552dbf0d10f0090 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/faa0a158234bb964597e5d162b12afb9e7235049 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/fbcedf65e737df700dba9a2d82b55329d90010eb | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/88ee3923c06c9b54784fecac9c3faf54327bf858 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a640a352551806ff7207c17d8a0f9b0d0d7584c5 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a5e186b98e2a9d905f331381de92bbc4ea39c7c9 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/77cc2894c7d3548cb44d2336e093664eb7205cdd | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/aa465580924e321eb3c8c79d62d6de22c41e14ef | x86_64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/7e80d9bf86e33096111895f5ae195dee97112b8c | i586 | file-5.41 | NOK | http://autobuild.buildroot.net/results/0ef268f01541c3ef40d5570a443fec9dbd61c62f | ORPH mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f98ab172d0b62ac2fe9f990c3a22ed5513973887 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9431a7ec2667c6a50d6cfd2bd9e45e2eab3b2f29 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f968fbfb8c2956aff26f8c10bcf182a9e2ee110e | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4b83d98fa89269e04079af73a6c2bf7d5d3afe72 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1480f602385577c1c18b46c7ca8ad37f04c8c78e | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b59b5d8df58511dd297ebf8852a796e11e0ff765 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/646255d669197b0731189f5249d08b3d6f799038 | i686 | gocryptfs-2.2.0 | NOK | http://autobuild.buildroot.net/results/6c322f7b3236f615d0ca56244ca028c40bbcf2ca | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/4664aeac00cf7ea2bef754a06f1376fdb6683430 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/b8a07851379d892ab831dd28ceb0a279d5eaffd9 | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/3ef4ef1284d4bd1bfaf516f0879143082da303db | x86_64 | i2pd-2.40.0 | NOK | http://autobuild.buildroot.net/results/733c8f2e0ec561db66559ee461ba3c38df3b614d | arm | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/758390c38868d08facf7bda4b13150986fed59ba | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/cacf3dac9a94c04cdeb627388fda01a4f24e594f | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/41c84dffecb093cb6fc8ccaf79fbb08f499184c8 | powerpc | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/7b396421cd587b7c527e4cce895d094c18e96719 | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/9850737277f777d4aa5746164ac20710cf417ad0 | riscv32 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/df730ebb102a6da14e3b3c133e383e1f7db47aff | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/623b7c94b8f36cabe08fb7f152edeb8ac318eac4 | powerpc64le | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/51ba392394a98cbe90dfedb0b227ccf57c95d2be | mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/7645900c4a5a184d099063e64aff04fff20e5b49 | or1k | powertop-2.13 | NOK | http://autobuild.buildroot.net/results/35dbc51e5bd6ec25fec1d553e59925bda0340b1e | riscv64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/e7c685744b1f1bebb7fec9835bda534a72b7b7c2 | mipsel | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/7664afd0545f4f60a777269ecf0e5232dd126589 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/24e734291d594933bc89003863333c17c2684479 | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/1e86a2743d840ef2683d02f94c9af39472693332 | arm | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/e00f28b7c00e5fb71e9cef436c91ed6b2adea043 | ORPH arm | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/40430733edb30a5370bfea9c270c33672231df57 | arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/f54ba9169baae8740102b203d8091d0f465fb6e4 | ORPH sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/66a98d8fbc081f7013fb5839d525b4fd07ad0f07 | ORPH powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/1dd0e246b6ea7dc0e232bd98921740fe31f7bcdd | ORPH m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/a3d9078a0e139ef03a700ef4c8b0ca8bdeed516b | ORPH powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/99175e25fde107668c0e13fa34ac9c875b2477bb | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c9d53823e696be079d54f1ec736606bf336fdc58 | microblazeel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/481f477e81dc8c7d36ce810803d2ba1ccb0eca6a | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7ed9dd22399ed7c4cf03027343baf3ad52c3cb84 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/edaf3348d4cf28b7aa43084f92d51c1d381ec0c6 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/e32b11f232a58a977093a23da1f4a2ff072c29b7 | arc | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/843709019c8ed7d280de9818b38649f480f14984 | s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/50f90e8dd634bd295c51dcf11e85129f40339db2 | sparc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9e5c93f198ed84d4d4b08ff00c1cac2a79e10860 | Classification of failures by reason for 2021.02.x -------------------------------------------------- gensio-2.2.3 | 1 kismet-2020-12-R3 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/058ed8e9d50d1ce27b32a2b2148b22f0f6be4ecf | arm | kismet-2020-12-R3 | NOK | http://autobuild.buildroot.net/results/5d5cdeba409da4195953af8943524865030637d5 | ORPH or1k | unknown | NOK | http://autobuild.buildroot.net/results/2f53e3c29709406670df21c48347d20ac5ff99c9 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/f399b238ff5bcf0ee0bf4d1d89ecd15c60867ddf | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 3 log4cxx-0.12.0 | 1 rtorrent-0.9.8 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/3cfc0d6099af195822db9c75ba7396b87ca759ec | arm | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/2b1f0ae9f8d1b90f326f88b9ff1c9c88eaa0c5d0 | nios2 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/e48e05026a6f96ea34f4c0b1fd2b6ac9d1fca2b5 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/fef786fbc6f7235425faf6d84ebd546171f18f41 | riscv32 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/43fb1c983d29929f217fdd65458d3c06c65883be | ORPH or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/09550611052bbee402c81ee7ec9283753aa0f6ca | -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Sun Jan 23 08:32:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 09:32:17 +0100 Subject: [Buildroot] [git commit] package/lighttpd: switch to pcre2 Message-ID: <20220123083029.8E74E82946@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=694189ffa3cddd811620f77e19de9a73a24cd09e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to pcre2 which is supported since version 1.4.62 and https://github.com/lighttpd/lighttpd1.4/commit/7512d82ca49f1b579819c2974c61de4e3137c70b and enabled by default since version 1.4.64 and https://github.com/lighttpd/lighttpd1.4/commit/750414d3bb6f13c119220e56d0c8123e665dffc5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lighttpd/Config.in | 2 +- package/lighttpd/lighttpd.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9f593a9228..ed674a9227 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -48,7 +48,7 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Enable PCRE support. Needed to support mod_rewrite diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index f0974dd5b2..2a05071209 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -26,6 +26,7 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ + -Dwith_pcre=false \ -Dwith_pgsql=false \ -Dwith_sasl=false \ -Dwith_wolfssl=false \ @@ -65,10 +66,10 @@ LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) -LIGHTTPD_DEPENDENCIES += pcre -LIGHTTPD_CONF_OPTS += -Dwith_pcre=true +LIGHTTPD_DEPENDENCIES += pcre2 +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true else -LIGHTTPD_CONF_OPTS += -Dwith_pcre=false +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) From yann.morin.1998 at free.fr Sun Jan 23 08:32:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 09:32:19 +0100 Subject: [Buildroot] [git commit] package/lighttpd: replace mod_compress by mod_deflate Message-ID: <20220123083029.9725382A38@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=653dc2e710534494ea41c68c22a279cf8736b125 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master mod_compress has been subsumed by mod_deflate since version 1.4.56 and https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lighttpd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index ed674a9227..99a09e9766 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -38,13 +38,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB help - Enable zlib support for lighttpd mod_compress. + Enable zlib support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 help - Enable bzip2 support for lighttpd mod_compress. + Enable bzip2 support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" From yann.morin.1998 at free.fr Sun Jan 23 08:39:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 09:39:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: switch to pcre2 In-Reply-To: <20220122224410.309822-1-fontaine.fabrice@gmail.com> References: <20220122224410.309822-1-fontaine.fabrice@gmail.com> Message-ID: <20220123083935.GL3621364@scaer> Fabrice, All, On 2022-01-22 23:44 +0100, Fabrice Fontaine spake thusly: > Switch to pcre2 which is supported since version 1.4.62 and > https://github.com/lighttpd/lighttpd1.4/commit/7512d82ca49f1b579819c2974c61de4e3137c70b > and enabled by default since version 1.4.64 and > https://github.com/lighttpd/lighttpd1.4/commit/750414d3bb6f13c119220e56d0c8123e665dffc5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/lighttpd/Config.in | 2 +- > package/lighttpd/lighttpd.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in > index 9f593a9228..ed674a9227 100644 > --- a/package/lighttpd/Config.in > +++ b/package/lighttpd/Config.in > @@ -48,7 +48,7 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 > > config BR2_PACKAGE_LIGHTTPD_PCRE > bool "pcre support" > - select BR2_PACKAGE_PCRE > + select BR2_PACKAGE_PCRE2 > help > Enable PCRE support. Needed to support mod_rewrite > > diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk > index f0974dd5b2..2a05071209 100644 > --- a/package/lighttpd/lighttpd.mk > +++ b/package/lighttpd/lighttpd.mk > @@ -26,6 +26,7 @@ LIGHTTPD_CONF_OPTS = \ > -Dwith_mysql=false \ > -Dwith_nettle=false \ > -Dwith_nss=false \ > + -Dwith_pcre=false \ > -Dwith_pgsql=false \ > -Dwith_sasl=false \ > -Dwith_wolfssl=false \ > @@ -65,10 +66,10 @@ LIGHTTPD_CONF_OPTS += -Dwith_bzip=false > endif > > ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) > -LIGHTTPD_DEPENDENCIES += pcre > -LIGHTTPD_CONF_OPTS += -Dwith_pcre=true > +LIGHTTPD_DEPENDENCIES += pcre2 > +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true > else > -LIGHTTPD_CONF_OPTS += -Dwith_pcre=false > +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false > endif > > ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 08:39:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 09:39:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: replace mod_compress by mod_deflate In-Reply-To: <20220122224935.310100-1-fontaine.fabrice@gmail.com> References: <20220122224935.310100-1-fontaine.fabrice@gmail.com> Message-ID: <20220123083948.GM3621364@scaer> Fabrice, All, On 2022-01-22 23:49 +0100, Fabrice Fontaine spake thusly: > mod_compress has been subsumed by mod_deflate since version 1.4.56 and > https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/lighttpd/Config.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in > index ed674a9227..99a09e9766 100644 > --- a/package/lighttpd/Config.in > +++ b/package/lighttpd/Config.in > @@ -38,13 +38,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB > bool "zlib support" > select BR2_PACKAGE_ZLIB > help > - Enable zlib support for lighttpd mod_compress. > + Enable zlib support for lighttpd mod_deflate. > > config BR2_PACKAGE_LIGHTTPD_BZIP2 > bool "bzip2 support" > select BR2_PACKAGE_BZIP2 > help > - Enable bzip2 support for lighttpd mod_compress. > + Enable bzip2 support for lighttpd mod_deflate. > > config BR2_PACKAGE_LIGHTTPD_PCRE > bool "pcre support" > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 09:11:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 10:11:06 +0100 Subject: [Buildroot] [git commit] package/cereal: bump to version 1.3.1 Message-ID: <20220123090507.7B65B81393@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d824fc1145de69ef00415232668f6f1efe814668 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (already in version) - Update hash of LICENSE file (license updated to match BSD template: https://github.com/USCiLab/cereal/commit/8291f44e05d3e3ee3c4fc9e088231789b701e17e) - Update indentation in hash file (two spaces) https://github.com/USCiLab/cereal/releases/tag/v1.3.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-serialized-shared_ptr-within-the-archive.patch | 67 ---------------------- package/cereal/cereal.hash | 10 ++-- package/cereal/cereal.mk | 5 +- 3 files changed, 6 insertions(+), 76 deletions(-) diff --git a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch b/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch deleted file mode 100644 index 3458ec1b59..0000000000 --- a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f27c12d491955c94583512603bf32c4568f20929 Mon Sep 17 00:00:00 2001 -From: Michael Walz -Date: Tue, 2 Feb 2021 00:50:29 +0100 -Subject: [PATCH] Store a copy of each serialized shared_ptr within the archive - to prevent the shared_ptr to be freed to early. (#667) - -The archives use the memory address pointed by the shared_ptr as a -unique id which must not be reused during lifetime of the archive. -Therefore, the archives stores a copy of it. -This problem was also reported as CVE-2020-11105. - -[Retrieved from: -https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929] -Signed-off-by: Fabrice Fontaine ---- - include/cereal/cereal.hpp | 13 +++++++++++-- - include/cereal/types/memory.hpp | 2 +- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/include/cereal/cereal.hpp b/include/cereal/cereal.hpp -index 99bed9d6..f0d15e8b 100644 ---- a/include/cereal/cereal.hpp -+++ b/include/cereal/cereal.hpp -@@ -369,12 +369,17 @@ namespace cereal - point to the same data. - - @internal -- @param addr The address (see shared_ptr get()) pointed to by the shared pointer -+ @param sharedPointer The shared pointer itself (the adress is taked via get()). -+ The archive takes a copy to prevent the memory location to be freed -+ as long as the address is used as id. This is needed to prevent CVE-2020-11105. - @return A key that uniquely identifies the pointer */ -- inline std::uint32_t registerSharedPointer( void const * addr ) -+ inline std::uint32_t registerSharedPointer(const std::shared_ptr& sharedPointer) - { -+ void const * addr = sharedPointer.get(); -+ - // Handle null pointers by just returning 0 - if(addr == 0) return 0; -+ itsSharedPointerStorage.push_back(sharedPointer); - - auto id = itsSharedPointerMap.find( addr ); - if( id == itsSharedPointerMap.end() ) -@@ -645,6 +650,10 @@ namespace cereal - //! Maps from addresses to pointer ids - std::unordered_map itsSharedPointerMap; - -+ //! Copy of shared pointers used in #itsSharedPointerMap to make sure they are kept alive -+ // during lifetime of itsSharedPointerMap to prevent CVE-2020-11105. -+ std::vector> itsSharedPointerStorage; -+ - //! The id to be given to the next pointer - std::uint32_t itsCurrentPointerId; - -diff --git a/include/cereal/types/memory.hpp b/include/cereal/types/memory.hpp -index 59e9da9b..cac1f334 100644 ---- a/include/cereal/types/memory.hpp -+++ b/include/cereal/types/memory.hpp -@@ -263,7 +263,7 @@ namespace cereal - { - auto & ptr = wrapper.ptr; - -- uint32_t id = ar.registerSharedPointer( ptr.get() ); -+ uint32_t id = ar.registerSharedPointer( ptr ); - ar( CEREAL_NVP_("id", id) ); - - if( id & detail::msb_32bit ) diff --git a/package/cereal/cereal.hash b/package/cereal/cereal.hash index ddaf54e7b4..18889b4d42 100644 --- a/package/cereal/cereal.hash +++ b/package/cereal/cereal.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5 cereal-1.3.0.tar.gz -sha256 18fd7618c44c9fe28b5f54cd19747df3c0472ed33e8507fea571e2acf6e72f34 LICENSE -sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp -sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h -sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt +sha256 65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976 cereal-1.3.1.tar.gz +sha256 58604a126af6a671ea390ee3d5b3e42228aa59b2858fb7af1d5b20b31739ccbb LICENSE +sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp +sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h +sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt diff --git a/package/cereal/cereal.mk b/package/cereal/cereal.mk index 19faa2ac4e..a44f09c743 100644 --- a/package/cereal/cereal.mk +++ b/package/cereal/cereal.mk @@ -4,7 +4,7 @@ # ################################################################################ -CEREAL_VERSION = 1.3.0 +CEREAL_VERSION = 1.3.1 CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) @@ -16,7 +16,4 @@ CEREAL_CONF_OPTS = \ -DTHREAD_SAFE=ON \ -DJUST_INSTALL_CEREAL=ON -# 0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch -CEREAL_IGNORE_CVES += CVE-2020-11105 - $(eval $(cmake-package)) From yann.morin.1998 at free.fr Sun Jan 23 09:11:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 10:11:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/cereal: bump to version 1.3.1 In-Reply-To: <20220122223516.306713-1-fontaine.fabrice@gmail.com> References: <20220122223516.306713-1-fontaine.fabrice@gmail.com> Message-ID: <20220123091149.GA2502@scaer> Fabrice, All, On 2022-01-22 23:35 +0100, Fabrice Fontaine spake thusly: > - Drop patch (already in version) > - Update hash of LICENSE file (license updated to match BSD template: > https://github.com/USCiLab/cereal/commit/8291f44e05d3e3ee3c4fc9e088231789b701e17e) > - Update indentation in hash file (two spaces) > > https://github.com/USCiLab/cereal/releases/tag/v1.3.1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...alized-shared_ptr-within-the-archive.patch | 67 ------------------- > package/cereal/cereal.hash | 10 +-- > package/cereal/cereal.mk | 5 +- > 3 files changed, 6 insertions(+), 76 deletions(-) > delete mode 100644 package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch > > diff --git a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch b/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch > deleted file mode 100644 > index 3458ec1b59..0000000000 > --- a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch > +++ /dev/null > @@ -1,67 +0,0 @@ > -From f27c12d491955c94583512603bf32c4568f20929 Mon Sep 17 00:00:00 2001 > -From: Michael Walz > -Date: Tue, 2 Feb 2021 00:50:29 +0100 > -Subject: [PATCH] Store a copy of each serialized shared_ptr within the archive > - to prevent the shared_ptr to be freed to early. (#667) > - > -The archives use the memory address pointed by the shared_ptr as a > -unique id which must not be reused during lifetime of the archive. > -Therefore, the archives stores a copy of it. > -This problem was also reported as CVE-2020-11105. > - > -[Retrieved from: > -https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929] > -Signed-off-by: Fabrice Fontaine > ---- > - include/cereal/cereal.hpp | 13 +++++++++++-- > - include/cereal/types/memory.hpp | 2 +- > - 2 files changed, 12 insertions(+), 3 deletions(-) > - > -diff --git a/include/cereal/cereal.hpp b/include/cereal/cereal.hpp > -index 99bed9d6..f0d15e8b 100644 > ---- a/include/cereal/cereal.hpp > -+++ b/include/cereal/cereal.hpp > -@@ -369,12 +369,17 @@ namespace cereal > - point to the same data. > - > - @internal > -- @param addr The address (see shared_ptr get()) pointed to by the shared pointer > -+ @param sharedPointer The shared pointer itself (the adress is taked via get()). > -+ The archive takes a copy to prevent the memory location to be freed > -+ as long as the address is used as id. This is needed to prevent CVE-2020-11105. > - @return A key that uniquely identifies the pointer */ > -- inline std::uint32_t registerSharedPointer( void const * addr ) > -+ inline std::uint32_t registerSharedPointer(const std::shared_ptr& sharedPointer) > - { > -+ void const * addr = sharedPointer.get(); > -+ > - // Handle null pointers by just returning 0 > - if(addr == 0) return 0; > -+ itsSharedPointerStorage.push_back(sharedPointer); > - > - auto id = itsSharedPointerMap.find( addr ); > - if( id == itsSharedPointerMap.end() ) > -@@ -645,6 +650,10 @@ namespace cereal > - //! Maps from addresses to pointer ids > - std::unordered_map itsSharedPointerMap; > - > -+ //! Copy of shared pointers used in #itsSharedPointerMap to make sure they are kept alive > -+ // during lifetime of itsSharedPointerMap to prevent CVE-2020-11105. > -+ std::vector> itsSharedPointerStorage; > -+ > - //! The id to be given to the next pointer > - std::uint32_t itsCurrentPointerId; > - > -diff --git a/include/cereal/types/memory.hpp b/include/cereal/types/memory.hpp > -index 59e9da9b..cac1f334 100644 > ---- a/include/cereal/types/memory.hpp > -+++ b/include/cereal/types/memory.hpp > -@@ -263,7 +263,7 @@ namespace cereal > - { > - auto & ptr = wrapper.ptr; > - > -- uint32_t id = ar.registerSharedPointer( ptr.get() ); > -+ uint32_t id = ar.registerSharedPointer( ptr ); > - ar( CEREAL_NVP_("id", id) ); > - > - if( id & detail::msb_32bit ) > diff --git a/package/cereal/cereal.hash b/package/cereal/cereal.hash > index ddaf54e7b4..18889b4d42 100644 > --- a/package/cereal/cereal.hash > +++ b/package/cereal/cereal.hash > @@ -1,6 +1,6 @@ > # Locally computed > -sha256 329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5 cereal-1.3.0.tar.gz > -sha256 18fd7618c44c9fe28b5f54cd19747df3c0472ed33e8507fea571e2acf6e72f34 LICENSE > -sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp > -sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h > -sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt > +sha256 65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976 cereal-1.3.1.tar.gz > +sha256 58604a126af6a671ea390ee3d5b3e42228aa59b2858fb7af1d5b20b31739ccbb LICENSE > +sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp > +sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h > +sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt > diff --git a/package/cereal/cereal.mk b/package/cereal/cereal.mk > index 19faa2ac4e..a44f09c743 100644 > --- a/package/cereal/cereal.mk > +++ b/package/cereal/cereal.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CEREAL_VERSION = 1.3.0 > +CEREAL_VERSION = 1.3.1 > CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) > # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 > CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) > @@ -16,7 +16,4 @@ CEREAL_CONF_OPTS = \ > -DTHREAD_SAFE=ON \ > -DJUST_INSTALL_CEREAL=ON > > -# 0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch > -CEREAL_IGNORE_CVES += CVE-2020-11105 > - > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Jan 23 09:48:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:45 +0100 Subject: [Buildroot] [PATCH 1/6] package/lighttpd: reorder alphabetically options Message-ID: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 99a09e9766..59c1e0b2a6 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,18 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BZIP2 + bool "bzip2 support" + select BR2_PACKAGE_BZIP2 + help + Enable bzip2 support for lighttpd mod_deflate. + +config BR2_PACKAGE_LIGHTTPD_LUA + bool "lua support" + depends on BR2_PACKAGE_LUA + help + Enable Lua support. Needed to support mod_magnet + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL @@ -34,18 +46,6 @@ config BR2_PACKAGE_LIGHTTPD_PAM help Enable PAM authentication support for lighttpd. -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_deflate. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_deflate. - config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" select BR2_PACKAGE_PCRE2 @@ -59,10 +59,10 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA +config BR2_PACKAGE_LIGHTTPD_ZLIB + bool "zlib support" + select BR2_PACKAGE_ZLIB help - Enable Lua support. Needed to support mod_magnet + Enable zlib support for lighttpd mod_deflate. endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 2a05071209..bdbf75191c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -37,6 +37,20 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) +LIGHTTPD_DEPENDENCIES += bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +else +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) +LIGHTTPD_DEPENDENCIES += lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true +else +LIGHTTPD_CONF_OPTS += -Dwith_lua=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true @@ -51,20 +65,6 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true -else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false -endif - ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_DEPENDENCIES += pcre2 LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true @@ -85,11 +85,11 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += -Dwith_lua=true +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) +LIGHTTPD_DEPENDENCIES += zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += -Dwith_lua=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif define LIGHTTPD_INSTALL_CONFIG -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:46 +0100 Subject: [Buildroot] [PATCH 2/6] package/lighttpd: add zstd support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-2-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 59c1e0b2a6..05a7c84961 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -65,4 +65,10 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB help Enable zlib support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_ZSTD + bool "zstd support" + select BR2_PACKAGE_ZSTD + help + Enable zstd support for lighttpd mod_deflate. + endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index bdbf75191c..4f05db4e29 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -32,7 +32,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ -Dwith_xxhash=true \ - -Dwith_zstd=false \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd @@ -92,6 +91,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) +LIGHTTPD_DEPENDENCIES += zstd +LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +else +LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +endif + define LIGHTTPD_INSTALL_CONFIG $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:47 +0100 Subject: [Buildroot] [PATCH 3/6] package/lighttpd: add brotli support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-3-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- ...uild-meson-fix-typo-in-variable-name.patch | 25 +++++++++++++++++++ package/lighttpd/Config.in | 6 +++++ package/lighttpd/lighttpd.mk | 8 +++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch diff --git a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch new file mode 100644 index 0000000000..d338979d46 --- /dev/null +++ b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch @@ -0,0 +1,25 @@ +From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Thu, 20 Jan 2022 07:04:51 -0500 +Subject: [PATCH] [build] meson: fix typo in variable name + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] +Signed-off-by: Fabrice Fontaine +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 4ee163468..b35c1037f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -266,7 +266,7 @@ endif + libbrotli = [] + if get_option('with_brotli') + libbrotli = [ compiler.find_library('brotlienc') ] +- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include ') ++ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include ') + conf_data.set('HAVE_BROTLI_ENCODE_H', true) + conf_data.set('HAVE_BROTLI', true) + else diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 05a7c84961..f3e252d850 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,12 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BROTLI + bool "brotli support" + select BR2_PACKAGE_BROTLI + help + Enable brotli support for lighttpd mod_deflate. + config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 4f05db4e29..22db1a7348 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -13,7 +13,6 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ @@ -36,6 +35,13 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) +LIGHTTPD_DEPENDENCIES += brotli +LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +else +LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:48 +0100 Subject: [Buildroot] [PATCH 4/6] package/lighttpd: add maxminddb support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-4-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index f3e252d850..9a262dbe93 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,12 @@ config BR2_PACKAGE_LIGHTTPD_LUA help Enable Lua support. Needed to support mod_magnet +config BR2_PACKAGE_LIGHTTPD_MAXMINDDB + bool "maxminddb support" + select BR2_PACKAGE_LIBMAXMINDDB + help + Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 22db1a7348..b2e06c77a1 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -20,7 +20,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ - -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ @@ -56,6 +55,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_lua=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) +LIGHTTPD_DEPENDENCIES += libmaxminddb +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +else +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:49 +0100 Subject: [Buildroot] [PATCH 5/6] package/lighttpd: add krb5 support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-5-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9a262dbe93..595c50c978 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -33,6 +33,12 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 help Enable bzip2 support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_KRB5 + bool "krb5 support" + select BR2_PACKAGE_LIBKRB5 + help + Enable Kerberos5 support for lighttpd mod_auth. + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index b2e06c77a1..a25bb0bfcb 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_krb5=false \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ @@ -48,6 +47,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) +LIGHTTPD_DEPENDENCIES += libkrb5 +LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +else +LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:50 +0100 Subject: [Buildroot] [PATCH 6/6] package/lighttpd: add ldap support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-6-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 595c50c978..6425478a94 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,16 @@ config BR2_PACKAGE_LIGHTTPD_KRB5 help Enable Kerberos5 support for lighttpd mod_auth. +config BR2_PACKAGE_LIGHTTPD_LDAP + bool "ldap support" + depends on BR2_USE_MMU # openldap + select BR2_PACKAGE_OPENLDAP + help + Enable LDAP support for lighttpd mod_auth mod_vhostdb_ldap. + +comment "ldap support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index a25bb0bfcb..f8ed7c6f7c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ @@ -54,6 +53,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_krb5=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) +LIGHTTPD_DEPENDENCIES += openldap +LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +else +LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:52 +0100 Subject: [Buildroot] [PATCH v2, 1/6] package/lighttpd: reorder alphabetically options Message-ID: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 99a09e9766..59c1e0b2a6 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,18 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BZIP2 + bool "bzip2 support" + select BR2_PACKAGE_BZIP2 + help + Enable bzip2 support for lighttpd mod_deflate. + +config BR2_PACKAGE_LIGHTTPD_LUA + bool "lua support" + depends on BR2_PACKAGE_LUA + help + Enable Lua support. Needed to support mod_magnet + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL @@ -34,18 +46,6 @@ config BR2_PACKAGE_LIGHTTPD_PAM help Enable PAM authentication support for lighttpd. -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_deflate. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_deflate. - config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" select BR2_PACKAGE_PCRE2 @@ -59,10 +59,10 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA +config BR2_PACKAGE_LIGHTTPD_ZLIB + bool "zlib support" + select BR2_PACKAGE_ZLIB help - Enable Lua support. Needed to support mod_magnet + Enable zlib support for lighttpd mod_deflate. endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 2a05071209..bdbf75191c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -37,6 +37,20 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) +LIGHTTPD_DEPENDENCIES += bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +else +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) +LIGHTTPD_DEPENDENCIES += lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true +else +LIGHTTPD_CONF_OPTS += -Dwith_lua=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true @@ -51,20 +65,6 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true -else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false -endif - ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_DEPENDENCIES += pcre2 LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true @@ -85,11 +85,11 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += -Dwith_lua=true +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) +LIGHTTPD_DEPENDENCIES += zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += -Dwith_lua=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif define LIGHTTPD_INSTALL_CONFIG -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:53 +0100 Subject: [Buildroot] [PATCH v2,2/6] package/lighttpd: add zstd support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-2-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 59c1e0b2a6..05a7c84961 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -65,4 +65,10 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB help Enable zlib support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_ZSTD + bool "zstd support" + select BR2_PACKAGE_ZSTD + help + Enable zstd support for lighttpd mod_deflate. + endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index bdbf75191c..4f05db4e29 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -32,7 +32,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ -Dwith_xxhash=true \ - -Dwith_zstd=false \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd @@ -92,6 +91,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) +LIGHTTPD_DEPENDENCIES += zstd +LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +else +LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +endif + define LIGHTTPD_INSTALL_CONFIG $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:54 +0100 Subject: [Buildroot] [PATCH v2,3/6] package/lighttpd: add brotli support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-3-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- ...uild-meson-fix-typo-in-variable-name.patch | 25 +++++++++++++++++++ package/lighttpd/Config.in | 6 +++++ package/lighttpd/lighttpd.mk | 8 +++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch diff --git a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch new file mode 100644 index 0000000000..d338979d46 --- /dev/null +++ b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch @@ -0,0 +1,25 @@ +From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Thu, 20 Jan 2022 07:04:51 -0500 +Subject: [PATCH] [build] meson: fix typo in variable name + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] +Signed-off-by: Fabrice Fontaine +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 4ee163468..b35c1037f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -266,7 +266,7 @@ endif + libbrotli = [] + if get_option('with_brotli') + libbrotli = [ compiler.find_library('brotlienc') ] +- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include ') ++ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include ') + conf_data.set('HAVE_BROTLI_ENCODE_H', true) + conf_data.set('HAVE_BROTLI', true) + else diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 05a7c84961..f3e252d850 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,12 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BROTLI + bool "brotli support" + select BR2_PACKAGE_BROTLI + help + Enable brotli support for lighttpd mod_deflate. + config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 4f05db4e29..22db1a7348 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -13,7 +13,6 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ @@ -36,6 +35,13 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) +LIGHTTPD_DEPENDENCIES += brotli +LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +else +LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:55 +0100 Subject: [Buildroot] [PATCH v2, 4/6] package/lighttpd: add maxminddb support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-4-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index f3e252d850..9a262dbe93 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,12 @@ config BR2_PACKAGE_LIGHTTPD_LUA help Enable Lua support. Needed to support mod_magnet +config BR2_PACKAGE_LIGHTTPD_MAXMINDDB + bool "maxminddb support" + select BR2_PACKAGE_LIBMAXMINDDB + help + Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 22db1a7348..b2e06c77a1 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -20,7 +20,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ - -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ @@ -56,6 +55,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_lua=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) +LIGHTTPD_DEPENDENCIES += libmaxminddb +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +else +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:56 +0100 Subject: [Buildroot] [PATCH v2,5/6] package/lighttpd: add krb5 support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-5-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9a262dbe93..595c50c978 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -33,6 +33,12 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 help Enable bzip2 support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_KRB5 + bool "krb5 support" + select BR2_PACKAGE_LIBKRB5 + help + Enable Kerberos5 support for lighttpd mod_auth. + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index b2e06c77a1..a25bb0bfcb 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_krb5=false \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ @@ -48,6 +47,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) +LIGHTTPD_DEPENDENCIES += libkrb5 +LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +else +LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:57 +0100 Subject: [Buildroot] [PATCH v2,6/6] package/lighttpd: add ldap support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-6-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix openldap dependency package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 595c50c978..f46e1a9a66 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,16 @@ config BR2_PACKAGE_LIGHTTPD_KRB5 help Enable Kerberos5 support for lighttpd mod_auth. +config BR2_PACKAGE_LIGHTTPD_LDAP + bool "ldap support" + depends on BR2_USE_WCHAR # openldap + select BR2_PACKAGE_OPENLDAP + help + Enable LDAP support for lighttpd mod_auth mod_vhostdb_ldap. + +comment "ldap support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index a25bb0bfcb..f8ed7c6f7c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ @@ -54,6 +53,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_krb5=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) +LIGHTTPD_DEPENDENCIES += openldap +LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +else +LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Jan 23 10:39:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 23 Jan 2022 11:39:22 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name Message-ID: <20220123103922.1928118-1-giulio.benetti@benettiengineering.com> RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf index 5109625160..157c6a715e 100644 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ b/board/orangepi/orangepi-rk3399/extlinux.conf @@ -1,4 +1,4 @@ -label RK3399_ROCKPRO64 linux +label RK3399_ORANGEPI linux kernel /Image devicetree /rk3399-orangepi.dtb append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait -- 2.25.1 From fontaine.fabrice at gmail.com Sun Jan 23 10:40:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 11:40:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/xl2tp: bump to version 1.3.17 Message-ID: <20220123104057.556978-1-fontaine.fabrice@gmail.com> https://github.com/xelerance/xl2tpd/releases/tag/v1.3.17 Signed-off-by: Fabrice Fontaine --- package/xl2tp/xl2tp.hash | 2 +- package/xl2tp/xl2tp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash index 471657f0f2..eca918bc83 100644 --- a/package/xl2tp/xl2tp.hash +++ b/package/xl2tp/xl2tp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 c28608b315adb25c8bf9579c1d6ab52ab47c4c43b68a5ab63c5d039196fd180f xl2tp-1.3.16.tar.gz +sha256 898d9b6a374c78dea5f20d80fd50fac13428ad746fefb16ff5f6bec449affe67 xl2tp-1.3.17.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index 65a78504f3..4a2bd66308 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XL2TP_VERSION = 1.3.16 +XL2TP_VERSION = 1.3.17 XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap XL2TP_LICENSE = GPL-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 10:51:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 11:51:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon: bump to version 0.32.2 Message-ID: <20220123105146.568745-1-fontaine.fabrice@gmail.com> - Switch site to get latest version - README has been renamed to README.md - Update indentation in hash file (two spaces) https://github.com/notroj/neon/blob/0.32.2/NEWS Signed-off-by: Fabrice Fontaine --- package/neon/Config.in | 2 +- package/neon/neon.hash | 10 +++++----- package/neon/neon.mk | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/neon/Config.in b/package/neon/Config.in index 8dc78f0f0a..a3515f4052 100644 --- a/package/neon/Config.in +++ b/package/neon/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NEON help HTTP and WebDAV client library, with a C interface. - http://www.webdav.org/neon/ + https://notroj.github.io/neon/ if BR2_PACKAGE_NEON diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 2ebefbe520..5a5a77a58b 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,6 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca neon-0.30.2.tar.gz # Locally computed -sha256 95f77624e96f6728145826fc895142275451f43f41c073766db3dbbcc8b790b0 README -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING +sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz +# Hash for license files +sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING diff --git a/package/neon/neon.mk b/package/neon/neon.mk index da53735d0e..3bbd12561f 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,10 +4,10 @@ # ################################################################################ -NEON_VERSION = 0.30.2 -NEON_SITE = http://www.webdav.org/neon +NEON_VERSION = 0.32.2 +NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) -NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README +NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath -- 2.34.1 From romain.naour at gmail.com Sun Jan 23 10:56:39 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 23 Jan 2022 11:56:39 +0100 Subject: [Buildroot] [PATCH 3/3] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 In-Reply-To: <20220122153714.26991-3-peter@korsgaard.com> References: <20220122153714.26991-1-peter@korsgaard.com> <20220122153714.26991-3-peter@korsgaard.com> Message-ID: Hello Peter, All Le 22/01/2022 ? 16:37, Peter Korsgaard a ?crit?: > Signed-off-by: Peter Korsgaard > --- > configs/qemu_aarch64_virt_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig > index 0caf38112d..9fbf293311 100644 > --- a/configs/qemu_aarch64_virt_defconfig > +++ b/configs/qemu_aarch64_virt_defconfig > @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" Why just only taking care of this defconfig ? Most qemu defconfig are using the same kernel version (5.15). Usually we try to keep all of them in sync. Since Qemu defconfigs are runtime tested each week in GitLab-CI maybe we can safely switch to BR2_LINUX_KERNEL_LATEST_VERSION instead ? But we have to check qemu defconfigs using a local kernel patch, currently ppc-mpc8544ds and arm-versatile or keeping kernel custom version for them. Also BR2_LINUX_KERNEL_LATEST_VERSION refer to the latest stable kernel version, not the latest lts version. Thoughts? Best regards, Romain > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > From fontaine.fabrice at gmail.com Sun Jan 23 11:01:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 12:01:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectl: bump to version 4.3.2 Message-ID: <20220123110155.570748-1-fontaine.fabrice@gmail.com> 4.3.2 Oct 7, 2021 - very minor bug. the last command in perfquery is not in a loop and prevents the collectl daemon from starting via the service. Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/collectl/collectl.hash | 8 ++++---- package/collectl/collectl.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/collectl/collectl.hash b/package/collectl/collectl.hash index d866e0becc..1785d25d87 100644 --- a/package/collectl/collectl.hash +++ b/package/collectl/collectl.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2187264d974b36a653c8a4b028ac6eeab23e1885f8b2563a33f06358f39889f1 collectl-4.3.1.src.tar.gz -sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC -sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL +sha256 9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750 collectl-4.3.2.src.tar.gz +sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC +sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL diff --git a/package/collectl/collectl.mk b/package/collectl/collectl.mk index c9fb59293c..c6cb2e1494 100644 --- a/package/collectl/collectl.mk +++ b/package/collectl/collectl.mk @@ -4,7 +4,7 @@ # ################################################################################ -COLLECTL_VERSION = 4.3.1 +COLLECTL_VERSION = 4.3.2 COLLECTL_SOURCE = collectl-$(COLLECTL_VERSION).src.tar.gz COLLECTL_SITE = http://downloads.sourceforge.net/collectl/collectl COLLECTL_LICENSE = Artistic or GPL-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 11:11:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 12:11:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/nmon: bump to version 16n Message-ID: <20220123111126.573758-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/nmon/nmon.hash | 6 +++--- package/nmon/nmon.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nmon/nmon.hash b/package/nmon/nmon.hash index fd3f09c63a..1d7226a4fe 100644 --- a/package/nmon/nmon.hash +++ b/package/nmon/nmon.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/nmon/files/ -md5 df67f07ea4006c6204acff586beada81 lmon16m.c -sha1 68cd02be19036a287fe352823db93223e73a9411 lmon16m.c +md5 a8172601fdc05f3bc58455cbd3f4475e lmon16n.c +sha1 024a3b56179838f0e04bf1706cc9ba56595301a8 lmon16n.c # Locally computed -sha256 2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 lmon16m.c +sha256 c0012cc2d925dee940c37ceae297abac64ba5a5c30e575e7418b04028613f5f2 lmon16n.c diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk index 8b39748cce..01371a8c74 100644 --- a/package/nmon/nmon.mk +++ b/package/nmon/nmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMON_VERSION = 16m +NMON_VERSION = 16n NMON_SITE = https://sourceforge.net/projects/nmon/files NMON_SOURCE = lmon$(NMON_VERSION).c NMON_LICENSE = GPL-3.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 11:22:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 12:22:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/lft: bump to version 3.91 Message-ID: <20220123112220.578219-1-fontaine.fabrice@gmail.com> lft 3.91 / WhoB 3.91 ---------------------- - Fixed bugs.debian.org/cgi-bin/bugreport.cgi?bug=922430 - Updated date lft 3.9 / WhoB 3.9 ---------------------- - Fixed a bug that could indicate a target was closed when it was open - Improved support for DLT_NULL interfaces on BSD-like operating systems - Improved deprecated pcap device enumeration method - Improved GraphViz output format appearance Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/lft/lft.hash | 6 +++--- package/lft/lft.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lft/lft.hash b/package/lft/lft.hash index 91a1fb0659..9bcce843bc 100644 --- a/package/lft/lft.hash +++ b/package/lft/lft.hash @@ -1,5 +1,5 @@ # From http://pwhois.org/lft/ -md5 31b15aabc619707427a73657512560f8 lft-3.8.tar.gz +md5 73cb955546692cf0fb5d7931939c56de lft-3.91.tar.gz # Locally calculated -sha256 10f427e77b0f8207817329bd8ef0310078434612620073369264d15e6f97e990 lft-3.8.tar.gz -sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING +sha256 aad13e671adcfc471ab99417161964882d147893a54664f3f465ec5c8398e6af lft-3.91.tar.gz +sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING diff --git a/package/lft/lft.mk b/package/lft/lft.mk index 5154c83fef..37e6e77767 100644 --- a/package/lft/lft.mk +++ b/package/lft/lft.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFT_VERSION = 3.8 +LFT_VERSION = 3.91 LFT_SITE = http://pwhois.org/get LFT_DEPENDENCIES = libpcap LFT_LICENSE = VOSTROM Public License for Open Source -- 2.34.1 From ju.o at free.fr Sun Jan 23 13:48:03 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 23 Jan 2022 14:48:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynaddsubfx: new package Message-ID: <20220123134803.2269814-1-ju.o@free.fr> ZynAddSubFX is a fully featured open source software synthesizer capable of making a countless number of instruments, from some common heard from expensive hardware to interesting sounds that you'll boost to an amazing universe of sounds. https://zynaddsubfx.sourceforge.io/ Signed-off-by: Julien Olivain --- Checked with: make check-package [...] 0 warnings generated ./utils/test-pkg --all --package zynaddsubfx andes-nds32 [ 1/45]: SKIPPED arm-aarch64 [ 2/45]: OK bootlin-aarch64-glibc [ 3/45]: OK bootlin-arcle-hs38-uclibc [ 4/45]: OK bootlin-armv5-uclibc [ 5/45]: OK bootlin-armv7-glibc [ 6/45]: OK bootlin-armv7m-uclibc [ 7/45]: OK bootlin-armv7-musl [ 8/45]: OK bootlin-m68k-5208-uclibc [ 9/45]: OK bootlin-m68k-68040-uclibc [10/45]: OK bootlin-microblazeel-uclibc [11/45]: OK bootlin-mipsel32r6-glibc [12/45]: OK bootlin-mipsel-uclibc [13/45]: OK bootlin-nios2-glibc [14/45]: OK bootlin-openrisc-uclibc [15/45]: OK bootlin-powerpc64le-power8-glibc [16/45]: OK bootlin-powerpc-e500mc-uclibc [17/45]: OK bootlin-riscv32-glibc [18/45]: OK bootlin-riscv64-glibc [19/45]: OK bootlin-riscv64-musl [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: OK bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK bootlin-xtensa-uclibc [27/45]: OK br-arm-basic [28/45]: SKIPPED br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: SKIPPED sourcery-arm [41/45]: SKIPPED sourcery-arm-thumb2 [42/45]: SKIPPED sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 6 skipped, 0 build failed, 0 legal-info failed --- DEVELOPERS | 1 + package/Config.in | 1 + package/zynaddsubfx/Config.in | 31 ++++++++++++++++++++++++++++ package/zynaddsubfx/zynaddsubfx.hash | 3 +++ package/zynaddsubfx/zynaddsubfx.mk | 28 +++++++++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 package/zynaddsubfx/Config.in create mode 100644 package/zynaddsubfx/zynaddsubfx.hash create mode 100644 package/zynaddsubfx/zynaddsubfx.mk diff --git a/DEVELOPERS b/DEVELOPERS index dc810b6fe1..df9e6ec73b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ +F: package/zynaddsubfx/ N: Julien Viard de Galbert F: package/dieharder/ diff --git a/package/Config.in b/package/Config.in index 85188ff873..e4ca195beb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -62,6 +62,7 @@ menu "Audio and video applications" source "package/wavpack/Config.in" source "package/yavta/Config.in" source "package/ympd/Config.in" + source "package/zynaddsubfx/Config.in" endmenu menu "Compressors and decompressors" diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in new file mode 100644 index 0000000000..837a469e7c --- /dev/null +++ b/package/zynaddsubfx/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_ZYNADDSUBFX + bool "zynaddsubfx" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_SINGLE + select BR2_PACKAGE_LIBLO + select BR2_PACKAGE_MXML + select BR2_PACKAGE_ZLIB + help + ZynAddSubFX is a fully featured open source software + synthesizer capable of making a countless number of + instruments, from some common heard from expensive hardware + to interesting sounds that you'll boost to an amazing + universe of sounds. + + Note: this Buildroot package does not include the graphical + user interface. It is meant to be executed as a headless + daemon to be controlled with MIDI events or network OSC + (Open Sound Control) events. OSC events can be generated + from an external system with the ZynAddSubFX external GUI + program zynaddsubfx-ext-gui. + + https://zynaddsubfx.sourceforge.io/ + +comment "zynaddsubfx needs a toolchain w/ C++11 and threads" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/zynaddsubfx/zynaddsubfx.hash b/package/zynaddsubfx/zynaddsubfx.hash new file mode 100644 index 0000000000..2465d0b864 --- /dev/null +++ b/package/zynaddsubfx/zynaddsubfx.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cbd160778f6cf147f9b0487719edc5197a1404f46d7c7bfd89e153f0d8ce71ae zynaddsubfx-3.0.6.tar.bz2 +sha256 c9bf7643726da4f149e9669cf6f00257e4b3a173e4ab307461b8bd42717dd9a4 COPYING diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk new file mode 100644 index 0000000000..68aa5ce278 --- /dev/null +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# zynaddsubfx +# +################################################################################ + +ZYNADDSUBFX_VERSION = 3.0.6 +ZYNADDSUBFX_SOURCE = zynaddsubfx-$(ZYNADDSUBFX_VERSION).tar.bz2 +ZYNADDSUBFX_SITE = http://downloads.sourceforge.net/zynaddsubfx + +ZYNADDSUBFX_LICENSE = GPLv2+ +ZYNADDSUBFX_LICENSE_FILES = COPYING + +# There is no package in buildroot using LV2 plugins: disabling +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ZYNADDSUBFX_DEPENDENCIES = \ + alsa-lib \ + fftw-single \ + liblo \ + mxml \ + zlib + +$(eval $(cmake-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 13:47:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 14:47:50 +0100 Subject: [Buildroot] [PATCH 1/2] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR Message-ID: <20220123134751.703269-1-fontaine.fabrice@gmail.com> pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: Signed-off-by: Fabrice Fontaine --- package/libpjsip/libpjsip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8feec9bcb2..771db0ac72 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,7 +12,7 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_VENDOR = teluu LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 13:47:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 14:47:51 +0100 Subject: [Buildroot] [PATCH 2/2] package/libpjsip: security bump to version 2.11.1 In-Reply-To: <20220123134751.703269-1-fontaine.fabrice@gmail.com> References: <20220123134751.703269-1-fontaine.fabrice@gmail.com> Message-ID: <20220123134751.703269-2-fontaine.fabrice@gmail.com> Security update. This version is recommended for all users to improve the security of applications using PJSIP. Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 Update indentation in hash file (two spaces) https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr https://github.com/pjsip/pjproject/releases/tag/2.11 https://github.com/pjsip/pjproject/releases/tag/2.11.1 Signed-off-by: Fabrice Fontaine --- package/libpjsip/libpjsip.hash | 4 ++-- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 68c2208885..f39ebf4060 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 771db0ac72..b05cc31a83 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.10 +LIBPJSIP_VERSION = 2.11.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ -- 2.34.1 From peter at korsgaard.com Sun Jan 23 14:48:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 15:48:17 +0100 Subject: [Buildroot] [PATCH 3/3] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 In-Reply-To: References: <20220122153714.26991-1-peter@korsgaard.com> <20220122153714.26991-3-peter@korsgaard.com> Message-ID: On 23/01/2022 11.56, Romain Naour wrote: >> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" > > Why just only taking care of this defconfig ? Simply because I did some other changes to it (see the other patches in the series). > Most qemu defconfig are using the same kernel version (5.15). Usually we try to > keep all of them in sync. Ok. > Since Qemu defconfigs are runtime tested each week in GitLab-CI maybe we can > safely switch to BR2_LINUX_KERNEL_LATEST_VERSION instead ? > But we have to check qemu defconfigs using a local kernel patch, currently > ppc-mpc8544ds and arm-versatile or keeping kernel custom version for them. > > Also BR2_LINUX_KERNEL_LATEST_VERSION refer to the latest stable kernel version, > not the latest lts version. That would mean that they are not really reproducible, so I don't really like it. -- Bye, Peter Korsgaard From romain.naour at gmail.com Sun Jan 23 15:20:15 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 23 Jan 2022 16:20:15 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org In-Reply-To: <7c25f4d7-309c-6eb1-00de-552242a64a97@smile.fr> References: <20220109151414.1908259-1-romain.naour@smile.fr> <20220109200806.GD1477939@scaer> <7c25f4d7-309c-6eb1-00de-552242a64a97@smile.fr> Message-ID: Hello Yann, Le 09/01/2022 ? 22:42, Romain Naour a ?crit?: > Hello Yann, All, > > Le 09/01/2022 ? 21:08, Yann E. MORIN a ?crit?: >> Romain, All, >> >> On 2022-01-09 16:14 +0100, Romain Naour spake thusly: >>> While packaging telegraf [1] the download step failed due to a checksum >>> mismatch: >>> >>> go: downloading collectd.org v0.5.0 >>> get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 >>> verifying collectd.org at v0.5.0: checksum mismatch >>> downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= >>> go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= >>> >>> SECURITY ERROR >>> This download does NOT match an earlier download recorded in go.sum. >>> The bits may have been replaced on the origin server, or an attacker may >>> have intercepted the download attempt. >>> >>> For more information, see 'go help module-auth'. >>> >>> go-collectd was bumped in telegraf since several releases (since v1.19.0) without >>> any changes regarding the go-collectd hash. >>> >>> Some users reported an issue [3] when using "GOPROXY=direct" and used >>> "GOPROXY=proxy.golang.org" as a workaround. >> >> I'll put down what we discussed on IRC: >> >> Unfortunately, there are cases the other way around: using a proxy broke >> the vendoring, while a direct connection solved it. So we won't be able >> to satisfy both cases. > > Sure, at least I posted the workaround on the ml. > >> >> Furthermore, relying on a proxy having a cached archive risks breaking >> in the future anyway, as that archived may get eventually get evicted >> out of the cache of the proxy. Or the proxy may disapear in the future, >> or whatever. >> >> In any case, a bad hash is most probably due to one of the following >> issues: >> >> - upstream messed up when adding the dependency and incorrectly copied >> the hash (but that should not happen as adding a dependency is >> supposed to be done with go tools already), >> >> - the upstream of the dependency changed their release (i.e. they >> re-tagged a release) >> >> - the go proxy is caching an incorrect archive (e.g. a partial >> download, or an older archive, or is malicious, or whatever). >> >> In any case, we can't do anything about it, and the upstream of the >> project has to fix the mess. >> >> So, from my point of view, this is a NACK on this patch. > > I created an issue on Telegraf github: > https://github.com/influxdata/telegraf/issues/10408 The issue has been reported to go-collectd project but not reply so far [1] But using GOPROXY=direct is a problem itself since some git repositories are altered or disappear after a release. Building telegraf outside of Buildroot with GOPROXY=direct doesn't reach the collectd problem anymore since it fail earlier due to a missing dependency $ git clone https://github.com/influxdata/telegraf.git $ git checkout release-1.21 $ GOPROXY=direct go mod vendor -v -modcacherw go: github.com/harlow/kinesis-consumer at v0.3.6-0.20210911031324-5a873d6e9fec: invalid version: unknown revision 5a873d6e9fec https://github.com/harlow/kinesis-consumer/commit/5a873d6e9fec "This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository." Telegraf 1.21 build fine using GOPROXY=proxy.golang.org. The Buildroot build seems to mix a direct download and proxy download even if we use GOPROXY=direct: proxy download: go: downloading github.com/harlow/kinesis-consumer v0.3.6-0.20210911031324-5a873d6e9fec direct download: get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 go: downloading github.com/antchfx/jsonquery v1.1.4 verifying collectd.org at v0.5.0: checksum mismatch downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= SECURITY ERROR This download does NOT match an earlier download recorded in go.sum. The bits may have been replaced on the origin server, or an attacker may have intercepted the download attempt. See infos about GOPROXY [2]. Cloning all git repo is really slow and use a lot of disk space, 5Go for telegraf. We can use GOPROXY="proxy.golang.org,direct" to use direct download as a fallback [3]. But GOPROXY doesn't save all modules forever [4] "Why did a previously available module become unavailable in the mirror? proxy.golang.org does not save all modules forever. There are a number of reasons for this, but one reason is if proxy.golang.org is not able to detect a suitable license. In this case, only a temporarily cached copy of the module will be made available, and may become unavailable if it is removed from the original source and becomes outdated. The checksums will still remain in the checksum database regardless of whether or not they have become unavailable in the mirror." So we don't have any reliable way to retrieve all required sources to build go packages from sources. Telegraf fetch several hundred of git repository (sometime from personal repos)... [1] https://github.com/collectd/go-collectd/issues/94 [2] https://arslan.io/2019/08/02/why-you-should-use-a-go-module-proxy [3] https://github.com/renovatebot/renovate/issues/7233 [4] https://proxy.golang.org/ Best regards, Romain > > Best regards, > Romain > > >> >> Regards, >> Yann E. MORIN. >> >>> [1] https://github.com/influxdata/telegraf/ >>> [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e >>> [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 >>> >>> Signed-off-by: Romain Naour >>> Cc: Thomas Petazzoni >>> --- >>> package/pkg-golang.mk | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk >>> index 35bcb1673b..e23778d96a 100644 >>> --- a/package/pkg-golang.mk >>> +++ b/package/pkg-golang.mk >>> @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD >>> $(2)_DOWNLOAD_POST_PROCESS = go >>> $(2)_DL_ENV = \ >>> $(HOST_GO_COMMON_ENV) \ >>> - GOPROXY=direct \ >>> + GOPROXY=proxy.golang.org \ >>> BR_GOMOD=$$($(2)_GOMOD) >>> >>> # Due to vendoring, it is pretty likely that not all licenses are >>> -- >>> 2.31.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From ju.o at free.fr Sun Jan 23 15:34:18 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 23 Jan 2022 16:34:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package In-Reply-To: <6ece845a-20a1-4d79-c544-21e0f1f2fc6f@mind.be> References: <20220110200151.830192-1-ju.o@free.fr> <20220113215104.02a734a1@windsurf> <77b72a63fdde563f496649641a0efab1@free.fr> <6ece845a-20a1-4d79-c544-21e0f1f2fc6f@mind.be> Message-ID: <0b192b9e1ca3de226b780e0f9440f000@free.fr> Hi Arnout, On 16/01/2022 13:01, arnout at mind.be wrote: > On 16/01/2022 11:55, Julien Olivain wrote: >> Hi Thomas, >> >> On 13/01/2022 21:51, Thomas Petazzoni wrote: >>> Hello Julien, >>> >>> On Mon, 10 Jan 2022 21:01:51 +0100 >>> Julien Olivain wrote: >>> >>>> ?[...] >>>> +config BR2_PACKAGE_PYTHON_GNUPG >>>> +??? bool "python-gnupg" >>>> +??? select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime >>> >>> This generates a circular dependency reported by kconfig, because >>> another package does exactly the opposite. So I have inverted the >>> logic >>> here: >>> >>> select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime >> >> What do you think about reversing the logic of all Buildroot packages >> selecting gnupg so they default to gnupg2? >> >> Quoting: https://gnupg.org/download/index.html >> """ >> GnuPG 1.4 is the old, single binary version which still support the >> unsafe PGP-2 keys. This branch has no dependencies on the above listed >> libraries or the Pinentry. However, it lacks many modern features and >> will receive only important updates. >> """ >> >> There is currently only two packages selecting gnupg: >> gpgme and python-gnupg >> >> Most Linux distributions are now shipping gnupg2 by default.? gnupg v1 >> is now more for legacy/compatibility cases. > > Perhaps we should simply remove gnupg instead. We've had gnupg2 for > 7.5 years > now, that should be enough to migrate. I think gnupg (version 1) should be kept in Buildroot: - it's still maintained (only for important updates), - it has a smaller footprint (compared to v2), - it has less dependencies (only zlib), - it has less build dependencies (can build static, no need for MMU/threads, ...) gnupg1 might still be useful in some specific cases. This is why I was mentioning to switch the default version to v2, rather than removing v1. Best regards, Julien. > Regards, > Arnout > >> >> If you agree, I can send a patch for this. >> >> Best regards, >> >> Julien. >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From romain.naour at gmail.com Sun Jan 23 15:48:22 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 23 Jan 2022 16:48:22 +0100 Subject: [Buildroot] [PATCH 3/3] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 In-Reply-To: References: <20220122153714.26991-1-peter@korsgaard.com> <20220122153714.26991-3-peter@korsgaard.com> Message-ID: <9c63c5dc-a9dd-ff60-73e5-a2a7f09746f0@gmail.com> Hello Peter, Le 23/01/2022 ? 15:48, Peter Korsgaard a ?crit?: > On 23/01/2022 11.56, Romain Naour wrote: > >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" >> >> Why just only taking care of this defconfig ? > > Simply because I did some other changes to it (see the other patches in the > series). > >> Most qemu defconfig are using the same kernel version (5.15). Usually we try to >> keep all of them in sync. > > Ok. To test all qemu defconfig in gitlab you can push a branch named "kernel-5.15.16-defconfigs-qemu" Where: "kernel-5.15.16" is a prefix, "-defconfigs-" trigger a pipeline for testing Buildroot defconfis and "qemu" is a pattern to match all defconfig named qemu*. See: https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 The kernel 5.15 is not as old, do we want to follow closely the latest kernel version for Qemu defconfigs? But it's annoying to modify each time the kernel version in several place. > >> Since Qemu defconfigs are runtime tested each week in GitLab-CI maybe we can >> safely switch to BR2_LINUX_KERNEL_LATEST_VERSION instead ? >> But we have to check qemu defconfigs using a local kernel patch, currently >> ppc-mpc8544ds and arm-versatile or keeping kernel custom version for them. >> >> Also BR2_LINUX_KERNEL_LATEST_VERSION refer to the latest stable kernel version, >> not the latest lts version. > > That would mean that they are not really reproducible, so I don't really like it. For a given Buildroot version BR2_LINUX_KERNEL_LATEST_VERSION is set with a default kernel version. Actually defconfigs are already not reproducible since the internal toolchain components version use the default version. But indeed, the kernel version change faster than the toolchain. Best regards, Romain > > -- > Bye, Peter Korsgaard From ricardo.martincoski at gmail.com Sun Jan 23 16:08:44 2022 From: ricardo.martincoski at gmail.com (Ricardo Martincoski) Date: Sun, 23 Jan 2022 13:08:44 -0300 Subject: [Buildroot] [PATCH v2 2/4] support/docker: add python3-pytest In-Reply-To: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> Message-ID: <20220123160847.2653086-2-ricardo.martincoski@gmail.com> ... so the unit tests for check-package can run in the GitLab CI. Signed-off-by: Ricardo Martincoski Acked-by: Romain Naour --- Changes v1 -> v2: - none --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 5ca087546e..120e301b7c 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -41,6 +41,7 @@ RUN apt-get install -y --no-install-recommends \ python3-flake8 \ python3-nose2 \ python3-pexpect \ + python3-pytest \ qemu-system-arm \ qemu-system-x86 \ rsync \ -- 2.25.1 From ricardo.martincoski at gmail.com Sun Jan 23 16:08:45 2022 From: ricardo.martincoski at gmail.com (Ricardo Martincoski) Date: Sun, 23 Jan 2022 13:08:45 -0300 Subject: [Buildroot] [PATCH v2 3/4] utils/checkpackagelib: run unit tests on GitLab CI In-Reply-To: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> Message-ID: <20220123160847.2653086-3-ricardo.martincoski@gmail.com> ... so we can catch regressions on check-package. Signed-off-by: Ricardo Martincoski --- Changes v1 -> v2: - none DO NOT APPLY before applying the patch before, generating a new docker image, uploading it, and updating the image name in the .gitlab-ci.yml --- support/misc/gitlab-ci.yml.in | 4 ++++ support/scripts/generate-gitlab-ci-yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index be7951b3d2..47e72c3213 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,3 +1,7 @@ +.check-check-package_base: + script: + - python3 -m pytest -v utils/checkpackagelib/ + .check-DEVELOPERS_base: # get-developers should print just "No action specified"; if it prints # anything else, it's a parse error. diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index bd79807914..aa43aac019 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -26,7 +26,7 @@ gen_tests() { local do_basics do_defconfigs do_runtime do_testpkg local defconfigs_ext cfg tst - basics=( DEVELOPERS flake8 package ) + basics=( check-package DEVELOPERS flake8 package ) defconfigs=( $(cd configs; LC_ALL=C ls -1 *_defconfig) ) -- 2.25.1 From ricardo.martincoski at gmail.com Sun Jan 23 16:08:43 2022 From: ricardo.martincoski at gmail.com (Ricardo Martincoski) Date: Sun, 23 Jan 2022 13:08:43 -0300 Subject: [Buildroot] [PATCH v2 1/4] utils/checkpackagelib: add unit tests Message-ID: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> So anyone willing to contribute to check-package can run all tests in less than 1 second by using: $ python3 -m pytest -v utils/checkpackagelib/ Most test cases are in the form: @pytest.mark.parametrize('testname,filename,string,expected', function) - testname: a short description of the scenario tested, added in order to improve readability of the log when some tests fail - filename: the filename the check-package function being tested thinks it is testing - string: the content of the file being sent to the function under test - expected: all expected warnings that a given function from check-package should generate for a given file named filename and with string as its content. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Romain Naour --- Changes v1 -> v2: - fix small typo in the commit log expect -> expected - do not test 'none' type for hash (after "5da8218184 support/download: drop support for the 'none' hash"); - use the new spacing convention by default in this testsuite (suggested by Romain Naour) After seeing how the patch was applied at "f35a4b4ae2 utils/check-package: add a check for the new spacing convention", moving it to a new function, it seems more logical to me to keep the test for HashType as-is on v1, and create a new test for HashSpaces. If you or others disagree, I can rework, no problem. It could also be reworked when applying, since now the only change needed is to remove some test cases from the table. Sample run in the GitLab CI: https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/2004909364 Example of a failure, showing enough information to track down the test that fails (copied from v1, there is no such failure in the master branch): |testname = 'immediate assignment inside conditional and unconditional override outside' |filename = 'any.mk' |string = 'VAR_1 = VALUE1\nifeq (condition)\nVAR_1 := $(VAR_1), VALUE2\nendif\nVAR_1 := $(VAR_1), VALUE2\n' |expected = [['any.mk:3: immediate assignment to append to variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'], ['any.mk:5: unconditional override of variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n']] | | @pytest.mark.parametrize('testname,filename,string,expected', overridden_variable) | def test_overridden_variable(testname, filename, string, expected): | warnings = util.check_file(m.OverriddenVariable, filename, string) |> assert warnings == expected |E AssertionError: assert [['any.mk:3: ...), VALUE2\n']] == [['any.mk:3: i...), VALUE2\n']] |E At index 0 diff: ['any.mk:3: conditional override of variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'] != ['any.mk:3: immediate assignment to append to variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'] |E Full diff: |E - [['any.mk:3: conditional override of variable VAR_1', |E + [['any.mk:3: immediate assignment to append to variable VAR_1', |E 'VAR_1 := $(VAR_1), VALUE2\n'], |E ['any.mk:5: unconditional override of variable VAR_1', |E 'VAR_1 := $(VAR_1), VALUE2\n']] | |utils/checkpackagelib/test_lib_mk.py:168: AssertionError |===================== 2 failed, 180 passed in 0.79 seconds ===================== --- utils/checkpackagelib/test_lib.py | 212 ++++++++ utils/checkpackagelib/test_lib_config.py | 387 +++++++++++++++ utils/checkpackagelib/test_lib_hash.py | 183 +++++++ utils/checkpackagelib/test_lib_mk.py | 590 +++++++++++++++++++++++ utils/checkpackagelib/test_lib_patch.py | 96 ++++ utils/checkpackagelib/test_util.py | 8 + 6 files changed, 1476 insertions(+) create mode 100644 utils/checkpackagelib/test_lib.py create mode 100644 utils/checkpackagelib/test_lib_config.py create mode 100644 utils/checkpackagelib/test_lib_hash.py create mode 100644 utils/checkpackagelib/test_lib_mk.py create mode 100644 utils/checkpackagelib/test_lib_patch.py create mode 100644 utils/checkpackagelib/test_util.py diff --git a/utils/checkpackagelib/test_lib.py b/utils/checkpackagelib/test_lib.py new file mode 100644 index 0000000000..976a63d84d --- /dev/null +++ b/utils/checkpackagelib/test_lib.py @@ -0,0 +1,212 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib as m + + +ConsecutiveEmptyLines = [ + ('1 line (no newline)', + 'any', + '', + []), + ('1 line', + 'any', + '\n', + []), + ('2 lines', + 'any', + '\n' + '\n', + [['any:2: consecutive empty lines']]), + ('more than 2 consecutive', + 'any', + '\n' + '\n' + '\n', + [['any:2: consecutive empty lines'], + ['any:3: consecutive empty lines']]), + ('ignore whitespace 1', + 'any', + '\n' + ' ', + [['any:2: consecutive empty lines']]), + ('ignore whitespace 2', + 'any', + ' \n' + '\t\n', + [['any:2: consecutive empty lines']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', ConsecutiveEmptyLines) +def test_ConsecutiveEmptyLines(testname, filename, string, expected): + warnings = util.check_file(m.ConsecutiveEmptyLines, filename, string) + assert warnings == expected + + +EmptyLastLine = [ + ('ignore empty file', + 'any', + '', + []), + ('empty line (newline)', + 'any', + '\n', + [['any:1: empty line at end of file']]), + ('empty line (space, newline)', + 'any', + ' \n', + [['any:1: empty line at end of file']]), + ('empty line (space, no newline)', + 'any', + ' ', + [['any:1: empty line at end of file']]), + ('warn for the last of 2', + 'any', + '\n' + '\n', + [['any:2: empty line at end of file']]), + ('warn for the last of 3', + 'any', + '\n' + '\n' + '\n', + [['any:3: empty line at end of file']]), + ('ignore whitespace', + 'any', + ' \n' + '\t\n', + [['any:2: empty line at end of file']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', EmptyLastLine) +def test_EmptyLastLine(testname, filename, string, expected): + warnings = util.check_file(m.EmptyLastLine, filename, string) + assert warnings == expected + + +NewlineAtEof = [ + ('good', + 'any', + 'text\n', + []), + ('text (bad)', + 'any', + '\n' + 'text', + [['any:2: missing newline at end of file', + 'text']]), + ('space (bad)', + 'any', + '\n' + ' ', + [['any:2: missing newline at end of file', + ' ']]), + ('tab (bad)', + 'any', + '\n' + '\t', + [['any:2: missing newline at end of file', + '\t']]), + ('even for file with one line', + 'any', + ' ', + [['any:1: missing newline at end of file', + ' ']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', NewlineAtEof) +def test_NewlineAtEof(testname, filename, string, expected): + warnings = util.check_file(m.NewlineAtEof, filename, string) + assert warnings == expected + + +TrailingSpace = [ + ('good', + 'any', + 'text\n', + []), + ('ignore missing newline', + 'any', + '\n' + 'text', + []), + ('spaces', + 'any', + 'text \n', + [['any:1: line contains trailing whitespace', + 'text \n']]), + ('tabs after text', + 'any', + 'text\t\t\n', + [['any:1: line contains trailing whitespace', + 'text\t\t\n']]), + ('mix of tabs and spaces', + 'any', + ' \n' + ' ', + [['any:1: line contains trailing whitespace', + ' \n'], + ['any:2: line contains trailing whitespace', + ' ']]), + ('blank line with tabs', + 'any', + '\n' + '\t', + [['any:2: line contains trailing whitespace', + '\t']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', TrailingSpace) +def test_TrailingSpace(testname, filename, string, expected): + warnings = util.check_file(m.TrailingSpace, filename, string) + assert warnings == expected + + +Utf8Characters = [ + ('usual', + 'any', + 'text\n', + []), + ('acceptable character', + 'any', + '\x60', + []), + ('unacceptable character', + 'any', + '\x81', + [['any:1: line contains UTF-8 characters', + '\x81']]), + ('2 warnings', + 'any', + 'text\n' + 'text \xc8 text\n' + '\xc9\n', + [['any:2: line contains UTF-8 characters', + 'text \xc8 text\n'], + ['any:3: line contains UTF-8 characters', + '\xc9\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Utf8Characters) +def test_Utf8Characters(testname, filename, string, expected): + warnings = util.check_file(m.Utf8Characters, filename, string) + assert warnings == expected + + +def test_all_check_functions_are_used(): + import inspect + import checkpackagelib.lib_config as lib_config + import checkpackagelib.lib_hash as lib_hash + import checkpackagelib.lib_mk as lib_mk + import checkpackagelib.lib_patch as lib_patch + c_config = [c[0] for c in inspect.getmembers(lib_config, inspect.isclass)] + c_hash = [c[0] for c in inspect.getmembers(lib_hash, inspect.isclass)] + c_mk = [c[0] for c in inspect.getmembers(lib_mk, inspect.isclass)] + c_patch = [c[0] for c in inspect.getmembers(lib_patch, inspect.isclass)] + c_all = c_config + c_hash + c_mk + c_patch + c_common = [c[0] for c in inspect.getmembers(m, inspect.isclass)] + assert set(c_common) <= set(c_all) diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py new file mode 100644 index 0000000000..91a549adf2 --- /dev/null +++ b/utils/checkpackagelib/test_lib_config.py @@ -0,0 +1,387 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_config as m + + +AttributesOrder = [ + ('good example', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'default y\n' + 'depends on BR2_USE_BAR # runtime\n' + 'select BR2_PACKAGE_BAZ\n' + 'help\n' + '\t help text\n', + []), + ('depends before default', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'depends on BR2_USE_BAR\n' + 'default y\n', + [['any:4: attributes order: type, default, depends on, select, help (url#_config_files)', + 'default y\n']]), + ('select after help', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'help\n' + '\t help text\n' + 'select BR2_PACKAGE_BAZ\n', + [['any:5: attributes order: type, default, depends on, select, help (url#_config_files)', + 'select BR2_PACKAGE_BAZ\n']]), + ('string', + 'any', + 'config BR2_PACKAGE_FOO_PLUGINS\n' + 'string "foo plugins"\n' + 'default "all"\n', + []), + ('ignore tabs', + 'any', + 'config\tBR2_PACKAGE_FOO_PLUGINS\n' + 'default\t"all"\n' + 'string\t"foo plugins"\n', + [['any:3: attributes order: type, default, depends on, select, help (url#_config_files)', + 'string\t"foo plugins"\n']]), + ('choice', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_FOO\n' + '\n' + 'choice\n' + 'prompt "type of foo"\n' + 'default BR2_PACKAGE_FOO_STRING\n' + '\n' + 'config BR2_PACKAGE_FOO_NONE\n' + 'bool "none"\n' + '\n' + 'config BR2_PACKAGE_FOO_STRING\n' + 'bool "string"\n' + '\n' + 'endchoice\n' + '\n' + 'endif\n' + '\n', + []), + ('type after default', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_FOO\n' + '\n' + 'choice\n' + 'default BR2_PACKAGE_FOO_STRING\n' + 'prompt "type of foo"\n', + [['any:7: attributes order: type, default, depends on, select, help (url#_config_files)', + 'prompt "type of foo"\n']]), + ('menu', + 'any', + 'menuconfig BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'help\n' + '\t help text\n' + '\t help text\n' + '\n' + 'if BR2_PACKAGE_FOO\n' + '\n' + 'menu "foo plugins"\n' + 'config BR2_PACKAGE_FOO_COUNTER\n' + 'bool "counter"\n' + '\n' + 'endmenu\n' + '\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', AttributesOrder) +def test_AttributesOrder(testname, filename, string, expected): + warnings = util.check_file(m.AttributesOrder, filename, string) + assert warnings == expected + + +CommentsMenusPackagesOrder = [ + ('top menu (good)', + 'package/Config.in', + 'menu "Target packages"\n' + 'source "package/busybox/Config.in"\n' + 'source "package/skeleton/Config.in"\n', + []), + ('top menu (bad)', + 'package/Config.in', + 'source "package/skeleton/Config.in"\n' + 'source "package/busybox/Config.in"\n', + [['package/Config.in:2: Packages in: The top level menu,\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: busybox', + 'source "package/busybox/Config.in"\n']]), + ('menu (bad)', + 'package/Config.in', + 'menu "Target packages"\n' + 'source "package/skeleton/Config.in"\n' + 'source "package/busybox/Config.in"\n', + [['package/Config.in:3: Packages in: menu "Target packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: busybox', + 'source "package/busybox/Config.in"\n']]), + ('underscore (good)', + 'package/Config.in.host', + 'menu "Hardware handling"\n' + 'menu "Firmware"\n' + 'endmenu\n' + 'source "package/usb_modeswitch/Config.in"\n' + 'source "package/usbmount/Config.in"\n', + []), + ('underscore (bad)', + 'package/Config.in.host', + 'menu "Hardware handling"\n' + 'menu "Firmware"\n' + 'endmenu\n' + 'source "package/usbmount/Config.in"\n' + 'source "package/usb_modeswitch/Config.in"\n', + [['package/Config.in.host:5: Packages in: menu "Hardware handling",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: usb_modeswitch', + 'source "package/usb_modeswitch/Config.in"\n']]), + ('ignore other files', + 'any other file', + 'menu "Hardware handling"\n' + 'source "package/bbb/Config.in"\n' + 'source "package/aaa/Config.in"\n', + []), + ('dash (bad)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/aAa/Config.in"\n' + 'source "package/aaa/Config.in"\n', + [['package/Config.in:3: Packages in: menu "packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: a-a', + 'source "package/a-a/Config.in"\n']]), + ('underscore (bad)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/aAa/Config.in"\n' + 'source "package/aaa/Config.in"\n', + [['package/Config.in:4: Packages in: menu "packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: a_a', + 'source "package/a_a/Config.in"\n']]), + ('digit (bad)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/aAa/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/aaa/Config.in"\n', + [['package/Config.in:5: Packages in: menu "packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: a1a', + 'source "package/a1a/Config.in"\n']]), + ('capitals (bad)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/aaa/Config.in"\n' + 'source "package/aAa/Config.in"\n', + [['package/Config.in:6: Packages in: menu "packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: aAa', + 'source "package/aAa/Config.in"\n']]), + ('digits, capitals, underscore (good)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/aAa/Config.in"\n' + 'source "package/aaa/Config.in"\n', + []), + ('conditional menu (good)', + 'package/Config.in', + 'menu "Other"\n' + 'source "package/linux-pam/Config.in"\n' + 'if BR2_PACKAGE_LINUX_PAM\n' + 'comment "linux-pam plugins"\n' + 'source "package/libpam-radius-auth/Config.in"\n' + 'source "package/libpam-tacplus/Config.in"\n' + 'endif\n' + 'source "package/liquid-dsp/Config.in"\n', + []), + ('conditional menu (bad)', + 'package/Config.in', + 'menu "Other"\n' + 'source "package/linux-pam/Config.in"\n' + 'if BR2_PACKAGE_LINUX_PAM\n' + 'comment "linux-pam plugins"\n' + 'source "package/libpam-tacplus/Config.in"\n' + 'source "package/libpam-radius-auth/Config.in"\n' + 'endif\n' + 'source "package/liquid-dsp/Config.in"\n', + [['package/Config.in:6: Packages in: comment "linux-pam plugins",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: libpam-radius-auth', + 'source "package/libpam-radius-auth/Config.in"\n']]), + ('no conditional (bad)', + 'package/Config.in', + 'menu "Other"\n' + 'source "package/linux-pam/Config.in"\n' + 'source "package/libpam-radius-auth/Config.in"\n' + 'source "package/libpam-tacplus/Config.in"\n' + 'source "package/liquid-dsp/Config.in"\n', + [['package/Config.in:3: Packages in: menu "Other",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: libpam-radius-auth', + 'source "package/libpam-radius-auth/Config.in"\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', CommentsMenusPackagesOrder) +def test_CommentsMenusPackagesOrder(testname, filename, string, expected): + warnings = util.check_file(m.CommentsMenusPackagesOrder, filename, string) + assert warnings == expected + + +HelpText = [ + ('single line', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'default y\n' + 'depends on BR2_USE_BAR # runtime\n' + 'select BR2_PACKAGE_BAZ\n' + 'help\n' + '\t help text\n', + []), + ('larger than 72', + 'any', + 'help\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 123\n' + '\t help text\n', + [['any:3: help text: <2 spaces><62 chars> (url#writing-rules-config-in)', + '\t 123456789 123456789 123456789 123456789 123456789 123456789 123\n', + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12']]), + ('long url at beginning of line', + 'any', + 'help\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' + '\t http://url.that.is.longer.than.seventy.two.characthers/folder_name\n' + '\t https://url.that.is.longer.than.seventy.two.characthers/folder_name\n' + '\t git://url.that.is.longer.than.seventy.two.characthers/folder_name\n', + []), + ('long url not at beginning of line', + 'any', + 'help\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' + '\t refer to http://url.that.is.longer.than.seventy.two.characthers/folder_name\n' + '\n' + '\t http://url.that.is.longer.than.seventy.two.characthers/folder_name\n', + [['any:3: help text: <2 spaces><62 chars> (url#writing-rules-config-in)', + '\t refer to http://url.that.is.longer.than.seventy.two.characthers/folder_name\n', + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12']]), + ('allow beautified items', + 'any', + 'help\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' + '\t summary:\n' + '\t - enable that config\n' + '\t - built it\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', HelpText) +def test_HelpText(testname, filename, string, expected): + warnings = util.check_file(m.HelpText, filename, string) + assert warnings == expected + + +Indent = [ + ('good example', + 'any', + 'config BR2_PACKAGE_FOO\n' + '\tbool "foo"\n' + '\tdefault y\n' + '\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n' + '\tdepends on BR2_INSTALL_LIBSTDCPP\n' + '# very useful comment\n' + '\tselect BR2_PACKAGE_BAZ\n' + '\thelp\n' + '\t help text\n' + '\n' + 'comment "foo needs toolchain w/ C++, threads"\n' + '\tdepends on !BR2_INSTALL_LIBSTDCPP || \\\n' + '\t\t!BR2_TOOLCHAIN_HAS_THREADS\n' + '\n' + 'source "package/foo/bar/Config.in"\n', + []), + ('spaces', + 'any', + 'config BR2_PACKAGE_FOO\n' + ' bool "foo"\n', + [['any:2: should be indented with one tab (url#_config_files)', + ' bool "foo"\n']]), + ('without indent', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'default y\n', + [['any:2: should be indented with one tab (url#_config_files)', + 'default y\n']]), + ('too much tabs', + 'any', + 'config BR2_PACKAGE_FOO\n' + '\t\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n', + [['any:2: should be indented with one tab (url#_config_files)', + '\t\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n']]), + ('help', + 'any', + 'config BR2_PACKAGE_FOO\n' + ' help\n', + [['any:2: should be indented with one tab (url#_config_files)', + ' help\n']]), + ('continuation line', + 'any', + 'comment "foo needs toolchain w/ C++, threads"\n' + '\tdepends on !BR2_INSTALL_LIBSTDCPP || \\\n' + ' !BR2_TOOLCHAIN_HAS_THREADS\n', + [['any:3: continuation line should be indented using tabs', + ' !BR2_TOOLCHAIN_HAS_THREADS\n']]), + ('comment with tabs', + 'any', + '\tcomment "foo needs toolchain w/ C++, threads"\n', + [['any:1: should not be indented', + '\tcomment "foo needs toolchain w/ C++, threads"\n']]), + ('comment with spaces', + 'any', + ' comment "foo needs toolchain w/ C++, threads"\n', + [['any:1: should not be indented', + ' comment "foo needs toolchain w/ C++, threads"\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Indent) +def test_Indent(testname, filename, string, expected): + warnings = util.check_file(m.Indent, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_lib_hash.py b/utils/checkpackagelib/test_lib_hash.py new file mode 100644 index 0000000000..fdc6338189 --- /dev/null +++ b/utils/checkpackagelib/test_lib_hash.py @@ -0,0 +1,183 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_hash as m + + +HashNumberOfFields = [ + ('empty file', + 'any', + '', + []), + ('empty line', + 'any', + '\n', + []), + ('ignore whitespace', + 'any', + '\t\n', + []), + ('ignore comments', + 'any', + '# text\n', + []), + ('1 field', + 'any', + 'field1\n', + [['any:1: expected three fields (url#adding-packages-hash)', + 'field1\n']]), + ('2 fields', + 'any', + 'field1 field2\n', + [['any:1: expected three fields (url#adding-packages-hash)', + 'field1 field2\n']]), + ('4 fields', + 'any', + 'field1 field2 field3 field4\n', + [['any:1: expected three fields (url#adding-packages-hash)', + 'field1 field2 field3 field4\n']]), + ('with 1 space', + 'any', + 'field1 field2 field3\n', + []), + ('many spaces', + 'any', + ' field1 field2 field3\n', + []), + ('tabs', + 'any', + 'field1\tfield2\tfield3\n', + []), + ('mix of tabs and spaces', + 'any', + '\tfield1\t field2\t field3 \n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', HashNumberOfFields) +def test_HashNumberOfFields(testname, filename, string, expected): + warnings = util.check_file(m.HashNumberOfFields, filename, string) + assert warnings == expected + + +HashType = [ + ('ignore empty files', + 'any', + '', + []), + ('ignore 1 field', + 'any', + 'text\n', + []), + ('wrong type', + 'any', + 'text text\n', + [['any:1: unexpected type of hash (url#adding-packages-hash)', + 'text text\n']]), + ('md5 (good)', + 'any', + 'md5 12345678901234567890123456789012\n', + []), + ('md5 (short)', + 'any', + 'md5 123456\n', + [['any:1: hash size does not match type (url#adding-packages-hash)', + 'md5 123456\n', + 'expected 32 hex digits']]), + ('ignore space before', + 'any', + ' md5 12345678901234567890123456789012\n', + []), + ('2 spaces', + 'any', + 'md5 12345678901234567890123456789012\n', + []), + ('ignore tabs', + 'any', + 'md5\t12345678901234567890123456789012\n', + []), + ('common typo', + 'any', + 'md5sum 12345678901234567890123456789012\n', + [['any:1: unexpected type of hash (url#adding-packages-hash)', + 'md5sum 12345678901234567890123456789012\n']]), + ('md5 (too long)', + 'any', + 'md5 123456789012345678901234567890123\n', + [['any:1: hash size does not match type (url#adding-packages-hash)', + 'md5 123456789012345678901234567890123\n', + 'expected 32 hex digits']]), + ('sha1 (good)', + 'any', + 'sha1 1234567890123456789012345678901234567890\n', + []), + ('sha256', + 'any', + 'sha256 1234567890123456789012345678901234567890123456789012345678901234\n', + []), + ('sha384', + 'any', + 'sha384 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456\n', + []), + ('sha512', + 'any', + 'sha512 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678' + '9012345678\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', HashType) +def test_HashType(testname, filename, string, expected): + warnings = util.check_file(m.HashType, filename, string) + assert warnings == expected + + +HashSpaces = [ + ('ignore empty files', + 'any', + '', + []), + ('ignore 1 field', + 'any', + 'text\n', + []), + ('ignore comments', + 'any', + '# type 1234567890123456789012345678901234567890 file\n', + []), + ('ignore trailing space', + 'any', + 'type 1234567890123456789012345678901234567890 file\t \n', + []), + ('2 spaces', + 'any', + 'type 1234567890123456789012345678901234567890 file\n', + []), + ('1 space', + 'any', + 'type 1234567890123456789012345678901234567890 file\n', + [['any:1: separation does not match expectation (url#adding-packages-hash)', + 'type 1234567890123456789012345678901234567890 file\n']]), + ('3 spaces', + 'any', + 'type 1234567890123456789012345678901234567890 file\n', + [['any:1: separation does not match expectation (url#adding-packages-hash)', + 'type 1234567890123456789012345678901234567890 file\n']]), + ('tabs', + 'any', + 'type\t1234567890123456789012345678901234567890\tfile\n', + [['any:1: separation does not match expectation (url#adding-packages-hash)', + 'type\t1234567890123456789012345678901234567890\tfile\n']]), + ('mixed tabs and spaces', + 'any', + 'type\t 1234567890123456789012345678901234567890 \tfile\n', + [['any:1: separation does not match expectation (url#adding-packages-hash)', + 'type\t 1234567890123456789012345678901234567890 \tfile\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', HashSpaces) +def test_HashSpaces(testname, filename, string, expected): + warnings = util.check_file(m.HashSpaces, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py new file mode 100644 index 0000000000..49fa216fcd --- /dev/null +++ b/utils/checkpackagelib/test_lib_mk.py @@ -0,0 +1,590 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_mk as m + + +Indent = [ + ('ignore comment at beginning of line', + 'any', + '# very useful comment\n', + []), + ('ignore comment at end of line', + 'any', + ' # very useful comment\n', + []), + ('do not indent on conditional (good)', + 'any', + 'ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)\n' + 'FOO_CONF_OPTS += something\n' + 'endef\n', + []), + ('do not indent on conditional (bad)', + 'any', + 'ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)\n' + '\tFOO_CONF_OPTS += something\n' + 'endef\n', + [['any:2: unexpected indent with tabs', + '\tFOO_CONF_OPTS += something\n']]), + ('indent after line that ends in backslash (good)', + 'any', + 'FOO_CONF_OPTS += \\\n' + '\tsomething\n', + []), + ('indent after line that ends in backslash (bad)', + 'any', + 'FOO_CONF_OPTS += \\\n' + 'something\n', + [['any:2: expected indent with tabs', + 'something\n']]), + ('indent after 2 lines that ends in backslash (good)', + 'any', + 'FOO_CONF_OPTS += \\\n' + '\tsomething \\\n' + '\tsomething_else\n', + []), + ('indent after 2 lines that ends in backslash (bad)', + 'any', + 'FOO_CONF_OPTS += \\\n' + '\tsomething \\\n' + '\tsomething_else \\\n' + 'FOO_CONF_OPTS += another_thing\n', + [['any:4: expected indent with tabs', + 'FOO_CONF_OPTS += another_thing\n']]), + ('indent inside define (good)', + 'any', + 'define FOO_SOMETHING\n' + '\tcommand\n' + '\tcommand \\\n' + '\t\targuments\n' + 'endef\n' + 'FOO_POST_PATCH_HOOKS += FOO_SOMETHING\n', + []), + ('indent inside define (bad, no indent)', + 'any', + 'define FOO_SOMETHING\n' + 'command\n' + 'endef\n', + [['any:2: expected indent with tabs', + 'command\n']]), + ('indent inside define (bad, spaces)', + 'any', + 'define FOO_SOMETHING\n' + ' command\n' + 'endef\n', + [['any:2: expected indent with tabs', + ' command\n']]), + ('indent make target (good)', + 'any', + 'make_target:\n' + '\tcommand\n' + '\n', + []), + ('indent make target (bad)', + 'any', + 'make_target:\n' + ' command\n' + '\n', + [['any:2: expected indent with tabs', + ' command\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Indent) +def test_Indent(testname, filename, string, expected): + warnings = util.check_file(m.Indent, filename, string) + assert warnings == expected + + +OverriddenVariable = [ + ('simple assignment', + 'any.mk', + 'VAR_1 = VALUE1\n', + []), + ('unconditional override (variable without underscore)', + 'any.mk', + 'VAR1 = VALUE1\n' + 'VAR1 = VALUE1\n', + [['any.mk:2: unconditional override of variable VAR1', + 'VAR1 = VALUE1\n']]), + ('unconditional override (variable with underscore, same value)', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 = VALUE1\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 = VALUE1\n']]), + ('unconditional override (variable with underscore, different value)', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 = VALUE2\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 = VALUE2\n']]), + ('warn for unconditional override even with wrong number of spaces', + 'any.mk', + 'VAR_1= VALUE1\n' + 'VAR_1 =VALUE2\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 =VALUE2\n']]), + ('warn for := override', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 := VALUE2\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 := VALUE2\n']]), + ('append values outside conditional (good)', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 += VALUE2\n', + []), + ('append values outside conditional (bad)', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 := $(VAR_1), VALUE2\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 := $(VAR_1), VALUE2\n']]), + ('immediate assignment inside conditional', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'ifeq (condition)\n' + 'VAR_1 := $(VAR_1), VALUE2\n', + [['any.mk:3: immediate assignment to append to variable VAR_1', + 'VAR_1 := $(VAR_1), VALUE2\n']]), + ('immediate assignment inside conditional and unconditional override outside', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'ifeq (condition)\n' + 'VAR_1 := $(VAR_1), VALUE2\n' + 'endif\n' + 'VAR_1 := $(VAR_1), VALUE2\n', + [['any.mk:3: immediate assignment to append to variable VAR_1', + 'VAR_1 := $(VAR_1), VALUE2\n'], + ['any.mk:5: unconditional override of variable VAR_1', + 'VAR_1 := $(VAR_1), VALUE2\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', OverriddenVariable) +def test_OverriddenVariable(testname, filename, string, expected): + warnings = util.check_file(m.OverriddenVariable, filename, string) + assert warnings == expected + + +PackageHeader = [ + ('first line (good)', + 'any', + 80 * '#' + '\n', + []), + ('first line (bad)', + 'any', + '# very useful comment\n', + [['any:1: should be 80 hashes (url#writing-rules-mk)', + '# very useful comment\n', + 80 * '#']]), + ('second line (bad)', + 'any', + 80 * '#' + '\n' + '# package\n', + [['any:2: should be 1 hash (url#writing-rules-mk)', + '# package\n']]), + ('full header (good)', + 'any', + 80 * '#' + '\n' + '#\n' + '# package\n' + '#\n' + + 80 * '#' + '\n' + '\n', + []), + ('blank line after header (good)', + 'any', + 80 * '#' + '\n' + '#\n' + '# package\n' + '#\n' + + 80 * '#' + '\n' + '\n' + 'FOO_VERSION = 1\n', + []), + ('blank line after header (bad)', + 'any', + 80 * '#' + '\n' + '#\n' + '# package\n' + '#\n' + + 80 * '#' + '\n' + 'FOO_VERSION = 1\n', + [['any:6: should be a blank line (url#writing-rules-mk)', + 'FOO_VERSION = 1\n']]), + ('wrong number of hashes', + 'any', + 79 * '#' + '\n' + '#\n' + '# package\n' + '#\n' + + 81 * '#' + '\n' + '\n', + [['any:1: should be 80 hashes (url#writing-rules-mk)', + 79 * '#' + '\n', + 80 * '#'], + ['any:5: should be 80 hashes (url#writing-rules-mk)', + 81 * '#' + '\n', + 80 * '#']]), + ('allow include without header', + 'any', + 'include $(sort $(wildcard package/foo/*/*.mk))\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', PackageHeader) +def test_PackageHeader(testname, filename, string, expected): + warnings = util.check_file(m.PackageHeader, filename, string) + assert warnings == expected + + +RemoveDefaultPackageSourceVariable = [ + ('bad', + 'any.mk', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', + [['any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), + ('bad with path', + './any.mk', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', + [['./any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), + ('warn for correct line', + './any.mk', + '\n' + '\n' + '\n' + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', + [['./any.mk:4: remove default value of _SOURCE variable (url#generic-package-reference)', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), + ('warn ignoring missing spaces', + './any.mk', + 'ANY_SOURCE=any-$(ANY_VERSION).tar.gz\n', + [['./any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', + 'ANY_SOURCE=any-$(ANY_VERSION).tar.gz\n']]), + ('good', + './any.mk', + 'ANY_SOURCE = aNy-$(ANY_VERSION).tar.gz\n', + []), + ('gcc exception', + 'gcc.mk', + 'GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz\n', + []), + ('binutils exception', + './binutils.mk', + 'BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz\n', + []), + ('gdb exception', + 'gdb/gdb.mk', + 'GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz\n', + []), + ('package name with dash', + 'python-subprocess32.mk', + 'PYTHON_SUBPROCESS32_SOURCE = python-subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz\n', + [['python-subprocess32.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', + 'PYTHON_SUBPROCESS32_SOURCE = python-subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RemoveDefaultPackageSourceVariable) +def test_RemoveDefaultPackageSourceVariable(testname, filename, string, expected): + warnings = util.check_file(m.RemoveDefaultPackageSourceVariable, filename, string) + assert warnings == expected + + +SpaceBeforeBackslash = [ + ('no backslash', + 'any.mk', + '\n', + []), + ('ignore missing indent', + 'any.mk', + 'define ANY_SOME_FIXUP\n' + 'for i in $$(find $(STAGING_DIR)/usr/lib* -name "any*.la"); do \\\n', + []), + ('ignore missing space', + 'any.mk', + 'ANY_CONF_ENV= \\\n' + '\tap_cv_void_ptr_lt_long=no \\\n', + []), + ('variable', + 'any.mk', + '\n' + 'ANY = \\\n', + []), + ('2 spaces', + 'any.mk', + 'ANY = \\\n', + [['any.mk:1: use only one space before backslash', + 'ANY = \\\n']]), + ('warn about correct line', + 'any.mk', + '\n' + 'ANY = \\\n', + [['any.mk:2: use only one space before backslash', + 'ANY = \\\n']]), + ('tab', + 'any.mk', + 'ANY =\t\\\n', + [['any.mk:1: use only one space before backslash', + 'ANY =\t\\\n']]), + ('tabs', + 'any.mk', + 'ANY =\t\t\\\n', + [['any.mk:1: use only one space before backslash', + 'ANY =\t\t\\\n']]), + ('spaces and tabs', + 'any.mk', + 'ANY = \t\t\\\n', + [['any.mk:1: use only one space before backslash', + 'ANY = \t\t\\\n']]), + ('mixed spaces and tabs 1', + 'any.mk', + 'ANY = \t \t\\\n', + [['any.mk:1: use only one space before backslash', + 'ANY = \t \t\\\n']]), + ('mixed spaces and tabs 2', + 'any.mk', + 'ANY = \t \\\n', + [['any.mk:1: use only one space before backslash', + 'ANY = \t \\\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', SpaceBeforeBackslash) +def test_SpaceBeforeBackslash(testname, filename, string, expected): + warnings = util.check_file(m.SpaceBeforeBackslash, filename, string) + assert warnings == expected + + +TrailingBackslash = [ + ('no backslash', + 'any.mk', + 'ANY = \n', + []), + ('one line', + 'any.mk', + 'ANY = \\\n', + []), + ('2 lines', + 'any.mk', + 'ANY = \\\n' + '\\\n', + []), + ('empty line after', + 'any.mk', + 'ANY = \\\n' + '\n', + [['any.mk:1: remove trailing backslash', + 'ANY = \\\n']]), + ('line with spaces after', + 'any.mk', + 'ANY = \\\n' + ' \n', + [['any.mk:1: remove trailing backslash', + 'ANY = \\\n']]), + ('line with tabs after', + 'any.mk', + 'ANY = \\\n' + '\t\n', + [['any.mk:1: remove trailing backslash', + 'ANY = \\\n']]), + ('ignore if commented', + 'any.mk', + '# ANY = \\\n' + '\n', + []), + ('real example', + 'any.mk', + 'ANY_CONF_ENV= \t\\\n' + '\tap_cv_void_ptr_lt_long=no \\\n' + '\n', + [['any.mk:2: remove trailing backslash', + '\tap_cv_void_ptr_lt_long=no \\\n']]), + ('ignore whitespace 1', + 'any.mk', + 'ANY = \t\t\\\n', + []), + ('ignore whitespace 2', + 'any.mk', + 'ANY = \t \t\\\n', + []), + ('ignore whitespace 3', + 'any.mk', + 'ANY = \t \\\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', TrailingBackslash) +def test_TrailingBackslash(testname, filename, string, expected): + warnings = util.check_file(m.TrailingBackslash, filename, string) + assert warnings == expected + + +TypoInPackageVariable = [ + ('good', + 'any.mk', + 'ANY_VAR = \n', + []), + ('good with path 1', + './any.mk', + 'ANY_VAR += \n', + []), + ('good with path 2', + 'any/any.mk', + 'ANY_VAR = \n', + []), + ('bad =', + 'any.mk', + 'OTHER_VAR = \n', + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + 'OTHER_VAR = \n']]), + ('bad +=', + 'any.mk', + 'OTHER_VAR += \n', + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + 'OTHER_VAR += \n']]), + ('ignore missing space', + 'any.mk', + 'OTHER_VAR= \n', + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + 'OTHER_VAR= \n']]), + ('use path in the warning', + './any.mk', + 'OTHER_VAR = \n', + [['./any.mk:1: possible typo: OTHER_VAR -> *ANY*', + 'OTHER_VAR = \n']]), + ('another name', + 'other.mk', + 'ANY_VAR = \n', + [['other.mk:1: possible typo: ANY_VAR -> *OTHER*', + 'ANY_VAR = \n']]), + ('libc exception', + './any.mk', + 'BR_LIBC = \n', + []), + ('rootfs exception', + 'any.mk', + 'ROOTFS_ANY_VAR += \n', + []), + ('host (good)', + 'any.mk', + 'HOST_ANY_VAR += \n', + []), + ('host (bad)', + 'any.mk', + 'HOST_OTHER_VAR = \n', + [['any.mk:1: possible typo: HOST_OTHER_VAR -> *ANY*', + 'HOST_OTHER_VAR = \n']]), + ('provides', + 'any.mk', + 'ANY_PROVIDES = other thing\n' + 'OTHER_VAR = \n', + []), + ('ignore space', + 'any.mk', + 'ANY_PROVIDES = thing other \n' + 'OTHER_VAR = \n', + []), + ('wrong provides', + 'any.mk', + 'ANY_PROVIDES = other\n' + 'OTHERS_VAR = \n', + [['any.mk:2: possible typo: OTHERS_VAR -> *ANY*', + 'OTHERS_VAR = \n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', TypoInPackageVariable) +def test_TypoInPackageVariable(testname, filename, string, expected): + warnings = util.check_file(m.TypoInPackageVariable, filename, string) + assert warnings == expected + + +UselessFlag = [ + ('autoreconf no', + 'any.mk', + 'ANY_AUTORECONF=NO\n', + [['any.mk:1: useless default value (url#_infrastructure_for_autotools_based_packages)', + 'ANY_AUTORECONF=NO\n']]), + ('host autoreconf no', + 'any.mk', + 'HOST_ANY_AUTORECONF\n', + []), + ('autoreconf yes', + 'any.mk', + 'ANY_AUTORECONF=YES\n', + []), + ('libtool_patch yes', + 'any.mk', + 'ANY_LIBTOOL_PATCH\t= YES\n', + [['any.mk:1: useless default value (url#_infrastructure_for_autotools_based_packages)', + 'ANY_LIBTOOL_PATCH\t= YES\n']]), + ('libtool_patch no', + 'any.mk', + 'ANY_LIBTOOL_PATCH= \t NO\n', + []), + ('generic', + 'any.mk', + 'ANY_INSTALL_IMAGES = NO\n' + 'ANY_INSTALL_REDISTRIBUTE = YES\n' + 'ANY_INSTALL_STAGING = NO\n' + 'ANY_INSTALL_TARGET = YES\n', + [['any.mk:1: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_IMAGES = NO\n'], + ['any.mk:2: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_REDISTRIBUTE = YES\n'], + ['any.mk:3: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_STAGING = NO\n'], + ['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_TARGET = YES\n']]), + ('conditional', + 'any.mk', + 'ifneq (condition)\n' + 'ANY_INSTALL_IMAGES = NO\n' + 'endif\n' + 'ANY_INSTALL_REDISTRIBUTE = YES\n', + [['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_REDISTRIBUTE = YES\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', UselessFlag) +def test_UselessFlag(testname, filename, string, expected): + warnings = util.check_file(m.UselessFlag, filename, string) + assert warnings == expected + + +VariableWithBraces = [ + ('good', + 'xmlstarlet.mk', + 'XMLSTARLET_CONF_OPTS += \\\n' + '\t--with-libxml-prefix=$(STAGING_DIR)/usr \\\n', + []), + ('bad', + 'xmlstarlet.mk', + 'XMLSTARLET_CONF_OPTS += \\\n' + '\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n', + [['xmlstarlet.mk:2: use $() to delimit variables, not ${}', + '\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n']]), + ('expanded by the shell', + 'sg3_utils.mk', + '\tfor prog in xcopy zone; do \\\n' + '\t\t$(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \\\n' + '\tdone\n', + []), + ('comments', + 'any.mk', + '#\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', VariableWithBraces) +def test_VariableWithBraces(testname, filename, string, expected): + warnings = util.check_file(m.VariableWithBraces, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_lib_patch.py b/utils/checkpackagelib/test_lib_patch.py new file mode 100644 index 0000000000..3b6fadf38c --- /dev/null +++ b/utils/checkpackagelib/test_lib_patch.py @@ -0,0 +1,96 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_patch as m + + +ApplyOrder = [ + ('standard', # catches https://bugs.busybox.net/show_bug.cgi?id=11271 + '0001-description.patch', + '', + []), + ('standard with path', + 'path/0001-description.patch', + '', + []), + ('acceptable format', + '1-description.patch', + '', + []), + ('acceptable format with path', + 'path/1-description.patch', + '', + []), + ('old format', + 'package-0001-description.patch', + '', + [['package-0001-description.patch:0: use name -.patch (url#_providing_patches)']]), + ('old format with path', + 'path/package-0001-description.patch', + '', + [['path/package-0001-description.patch:0: use name -.patch (url#_providing_patches)']]), + ('missing number', + 'description.patch', + '', + [['description.patch:0: use name -.patch (url#_providing_patches)']]), + ('missing number with path', + 'path/description.patch', + '', + [['path/description.patch:0: use name -.patch (url#_providing_patches)']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', ApplyOrder) +def test_ApplyOrder(testname, filename, string, expected): + warnings = util.check_file(m.ApplyOrder, filename, string) + assert warnings == expected + + +NumberedSubject = [ + ('no subject', + 'patch', + '', + []), + ('acceptable because it is not a git patch', + 'patch', + 'Subject: [PATCH 24/105] text\n', + []), + ('good', + 'patch', + 'Subject: [PATCH] text\n' + 'diff --git a/configure.ac b/configure.ac\n', + []), + ('bad', + 'patch', + 'Subject: [PATCH 24/105] text\n' + 'diff --git a/configure.ac b/configure.ac\n', + [["patch:1: generate your patches with 'git format-patch -N'", + 'Subject: [PATCH 24/105] text\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', NumberedSubject) +def test_NumberedSubject(testname, filename, string, expected): + warnings = util.check_file(m.NumberedSubject, filename, string) + assert warnings == expected + + +Sob = [ + ('good', + 'patch', + 'Signed-off-by: John Doe \n', + []), + ('empty', + 'patch', + '', + [['patch:0: missing Signed-off-by in the header (url#_format_and_licensing_of_the_package_patches)']]), + ('bad', + 'patch', + 'Subject: [PATCH 24/105] text\n', + [['patch:0: missing Signed-off-by in the header (url#_format_and_licensing_of_the_package_patches)']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Sob) +def test_Sob(testname, filename, string, expected): + warnings = util.check_file(m.Sob, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_util.py b/utils/checkpackagelib/test_util.py new file mode 100644 index 0000000000..23f2995e27 --- /dev/null +++ b/utils/checkpackagelib/test_util.py @@ -0,0 +1,8 @@ +def check_file(check_function, filename, string): + obj = check_function(filename, 'url') + result = [] + result.append(obj.before()) + for i, line in enumerate(string.splitlines(True)): + result.append(obj.check_line(i + 1, line)) + result.append(obj.after()) + return [r for r in result if r is not None] -- 2.25.1 From ricardo.martincoski at gmail.com Sun Jan 23 16:08:46 2022 From: ricardo.martincoski at gmail.com (Ricardo Martincoski) Date: Sun, 23 Jan 2022 13:08:46 -0300 Subject: [Buildroot] [PATCH v2 4/4] utils/docker-run: new script In-Reply-To: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> Message-ID: <20220123160847.2653086-4-ricardo.martincoski@gmail.com> Add a small script to run commands in the same docker image used in the GitLab CI. For instance, one can run check-package unit tests without installing pytest directly in the host: $ ./utils/docker-run python3 -m pytest -v utils/checkpackagelib/ Signed-off-by: Ricardo Martincoski --- Changes v1 -> v2: - none NOTE: see also this other series for another use of this script: to call shellcheck from check-package with stable results, not depending on: - the developer having the tool shellcheck installed; - the version of the tool that is installed; http://patchwork.ozlabs.org/project/buildroot/patch/20211226184919.2753591-6-ricardo.martincoski at gmail.com/ --- utils/docker-run | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 utils/docker-run diff --git a/utils/docker-run b/utils/docker-run new file mode 100755 index 0000000000..499c194d13 --- /dev/null +++ b/utils/docker-run @@ -0,0 +1,7 @@ +#!/usr/bin/bash +set -o errexit -o pipefail +DIR=$(dirname "${0}") +MAIN_DIR=$(readlink -f "${DIR}/..") +IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') +set -x +docker run -v ${MAIN_DIR}:/home/br-user -t "${IMAGE}" $* -- 2.25.1 From kuzminov.sergey81 at gmail.com Sun Jan 23 18:07:33 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 23 Jan 2022 21:07:33 +0300 Subject: [Buildroot] [PATCH 25/28] configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-26-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-26-giulio.benetti@benettiengineering.com> Message-ID: <9c9b7005-6f85-f812-21b5-fa029136477b@gmail.com> 18.01.2022 13:43, Giulio Benetti: > This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and > supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. > > Signed-off-by: Giulio Benetti > --- > configs/orangepi_zero_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..a0af809e92 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,6 +1,6 @@ > BR2_arm=y > BR2_cortex_a7=y > -BR2_ARM_FPU_VFPV4=y > +BR2_ARM_FPU_NEON_VFPV4=y > BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y Tested-by: Sergey Kuzminov From kuzminov.sergey81 at gmail.com Sun Jan 23 18:39:13 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 23 Jan 2022 21:39:13 +0300 Subject: [Buildroot] [PATCH 21/28] configs/orangepi_pc_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-22-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-22-giulio.benetti@benettiengineering.com> Message-ID: <277af5a8-5490-9d79-c84f-bac556a0d6af@gmail.com> Tested-by: Sergey Kuzminov From peter at korsgaard.com Sun Jan 23 18:46:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:46:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-plugins-bad: fix typo In-Reply-To: <20211217201528.35309-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 17 Dec 2021 21:15:28 +0100") References: <20211217201528.35309-1-fontaine.fabrice@gmail.com> Message-ID: <87h79uxpcf.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix typo added by commit 4ae8ecea8fb042931cebf8f8d4cb4bc891073a77 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 19:10:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:10:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: security bump to version 2.16.12 In-Reply-To: <20211217191252.30122-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 17 Dec 2021 20:12:52 +0100") References: <20211217191252.30122-1-fontaine.fabrice@gmail.com> Message-ID: <87czkixo7i.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-12 > https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 18:45:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:45:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1/gst1-plugins-bad: fix typo Message-ID: <20220123190401.6BF6082B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a81b639a808ad7c2c0172a16e8741375150eedfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix typo added by commit 4ae8ecea8fb042931cebf8f8d4cb4bc891073a77 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1b53b6ec34cc37aa547eb4d07d6ef43afc04cdee) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 628a9df42c..7bbb1aa5dd 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -331,7 +331,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz select BR2_PACKAGE_LIBASS -comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8" +comment "assrender plugin needs a toolchain w/ C++, gcc >= 4.8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From peter at korsgaard.com Sun Jan 23 19:04:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:04:49 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: remove Evan Zelkowitz Message-ID: <20220123190401.7D7B28136B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7836d25c38fc0566dde7547bc1efd70b012413a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Evan has privately requested to no longer receive e-mails related to this Buildroot package. Signed-off-by: Thomas Petazzoni (cherry picked from commit acc0d51c53d5da45fc0da725513cd0ab8a2d4107) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index f90224989f..e1e526a666 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -761,9 +761,6 @@ F: package/optee-test/ N: Eugene Tarassov F: package/tcf-agent/ -N: Evan Zelkowitz -F: package/sdl_gfx/ - N: Ezequiel Garcia F: board/ci20/ F: configs/ci20_defconfig From peter at korsgaard.com Sun Jan 23 18:35:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:35:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lapack: fix CVE-2021-4048 Message-ID: <20220123190401.5AD81828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5ae65a5e13b121ec726997084e7d6842832d5aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. It should be noted that commit 59a1fcc69620da8eab1c048977fa22d297b18284 wrongly assumed that this CVE was fixed in version 3.10.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 83134027a02a6bea7320323562af9f75429c582f) Signed-off-by: Peter Korsgaard --- .../0001-Fix-out-of-bounds-read-in-slarrv.patch | 82 ++++++++++++++++++++++ package/lapack/lapack.mk | 3 + 2 files changed, 85 insertions(+) diff --git a/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch new file mode 100644 index 0000000000..43c6444b02 --- /dev/null +++ b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch @@ -0,0 +1,82 @@ +From 0631b6beaed60ba118b0b027c0f8d35397bf5df0 Mon Sep 17 00:00:00 2001 +From: Keno Fischer +Date: Thu, 30 Sep 2021 03:51:23 -0400 +Subject: [PATCH] Fix out of bounds read in slarrv + +This was originally reported as https://github.com/JuliaLang/julia/issues/42415. +I've tracked this down to an our of bounds read on the following line: + +https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L423 + +In the crashing example, `M` is `0`, causing `slarrv` to read uninitialized +memory from the work array. I believe the `0` for `M` is correct and indeed, +the documentation above supports that `M` may be zero: + +https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L113-L116 + +I believe it may be sufficient to early-out this function as suggested +in this PR. However, I have limited context for the full routine here, +so I would appreciate a sanity check. + +[Retrieved from: +https://github.com/Reference-LAPACK/lapack/commit/38f3eeee3108b18158409ca2a100e6fe03754781] +Signed-off-by: Fabrice Fontaine +--- + SRC/clarrv.f | 2 +- + SRC/dlarrv.f | 2 +- + SRC/slarrv.f | 2 +- + SRC/zlarrv.f | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SRC/clarrv.f b/SRC/clarrv.f +index 1f09e4da6..42f710757 100644 +--- a/SRC/clarrv.f ++++ b/SRC/clarrv.f +@@ -348,7 +348,7 @@ SUBROUTINE CLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/dlarrv.f b/SRC/dlarrv.f +index b036c1e66..299430361 100644 +--- a/SRC/dlarrv.f ++++ b/SRC/dlarrv.f +@@ -350,7 +350,7 @@ SUBROUTINE DLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/slarrv.f b/SRC/slarrv.f +index 9d72b339a..95f94fd1b 100644 +--- a/SRC/slarrv.f ++++ b/SRC/slarrv.f +@@ -350,7 +350,7 @@ SUBROUTINE SLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/zlarrv.f b/SRC/zlarrv.f +index 51ec558f5..e4be63e0d 100644 +--- a/SRC/zlarrv.f ++++ b/SRC/zlarrv.f +@@ -348,7 +348,7 @@ SUBROUTINE ZLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index f34f685ae2..a80131c9ad 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -12,6 +12,9 @@ LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON +# 0001-Fix-out-of-bounds-read-in-slarrv.patch +LAPACK_IGNORE_CVES += CVE-2021-4048 + ifeq ($(BR2_PACKAGE_LAPACK_COMPLEX),y) LAPACK_CONF_OPTS += -DBUILD_COMPLEX=ON -DBUILD_COMPLEX16=ON else From peter at korsgaard.com Sun Jan 23 19:08:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:08:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mbedtls: security bump to version 2.16.12 Message-ID: <20220123190401.866D982B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea7ed63f1d151c584888529bf9a3a2f5bacf929a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-12 https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da5c80f6750899578882688e68c128d8a21032c8) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index b93da164f9..8247748afd 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.11: -sha256 c18e7e9abf95e69e425260493720470021384a1728417042060a35d0b7b18b41 mbedtls-2.16.11.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12: +sha256 294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393 mbedtls-2.16.12.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 9207daf186..93ac1bb163 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.11 +MBEDTLS_VERSION = 2.16.12 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From peter at korsgaard.com Sun Jan 23 19:03:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:03:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/imagemagick: fix dependency Message-ID: <20220123190401.73D10828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=815d8f10bcb431151da10434bec034d62e9d287c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS dependency was wrongly added to BR2_PACKAGE_HOST_IMAGEMAGICK by commit df20e4546384d1c249a6a0541183590671e83d77, indeed host-librsvg is only needed by BR2_PACKAGE_HOST_IMAGEMAGICK_SVG Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 38f6b42d310e389245a6772ae20b8bce73e1c61c) Signed-off-by: Peter Korsgaard --- package/imagemagick/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/imagemagick/Config.in.host b/package/imagemagick/Config.in.host index e12d82939a..671b0995dc 100644 --- a/package/imagemagick/Config.in.host +++ b/package/imagemagick/Config.in.host @@ -1,6 +1,5 @@ config BR2_PACKAGE_HOST_IMAGEMAGICK bool "host imagemagick" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help ImageMagick(R) is a software suite to create, edit, and compose bitmap images. It can read, convert and write images @@ -17,6 +16,7 @@ if BR2_PACKAGE_HOST_IMAGEMAGICK config BR2_PACKAGE_HOST_IMAGEMAGICK_SVG bool "SVG support" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help Say 'y' here is you need ImageMagick tools (like convert) to support SVG. From peter at korsgaard.com Sun Jan 23 18:35:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:35:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lapack: add LAPACK_CPE_ID_VENDOR Message-ID: <20220123190401.632688136B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5356cb58be9b2146085aa7f89ff3e1bdcbffe7e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:lapack_project:lapack is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alapack_project%3Alapack Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 52570be4e9bedf4fb543429fcef23873f77a1193) Signed-off-by: Peter Korsgaard --- package/lapack/lapack.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index a80131c9ad..609075842d 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -8,6 +8,7 @@ LAPACK_VERSION = 3.10.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) +LAPACK_CPE_ID_VENDOR = lapack_project LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON From peter at korsgaard.com Sun Jan 23 18:35:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:35:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lapack: add LAPACK_CPE_ID_VENDOR Message-ID: <20220123190408.1689F82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74d23e17d53e704921bc3a699c52c389c07a09fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:lapack_project:lapack is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alapack_project%3Alapack Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 52570be4e9bedf4fb543429fcef23873f77a1193) Signed-off-by: Peter Korsgaard --- package/lapack/lapack.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index a80131c9ad..609075842d 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -8,6 +8,7 @@ LAPACK_VERSION = 3.10.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) +LAPACK_CPE_ID_VENDOR = lapack_project LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON From peter at korsgaard.com Sun Jan 23 19:04:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:04:57 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: remove Evan Zelkowitz Message-ID: <20220123190408.31FCF82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5737ed3478278b66125b8bcf403a3cffa6488a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Evan has privately requested to no longer receive e-mails related to this Buildroot package. Signed-off-by: Thomas Petazzoni (cherry picked from commit acc0d51c53d5da45fc0da725513cd0ab8a2d4107) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a4fdf3eddd..a9179fc154 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -787,9 +787,6 @@ F: package/optee-test/ N: Eugene Tarassov F: package/tcf-agent/ -N: Evan Zelkowitz -F: package/sdl_gfx/ - N: Ezequiel Garcia F: board/ci20/ F: configs/ci20_defconfig From peter at korsgaard.com Sun Jan 23 18:35:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:35:01 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lapack: fix CVE-2021-4048 Message-ID: <20220123190408.0D99682B29@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05b168b3a1d19c183c6085efab0196b6e7a514e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. It should be noted that commit 59a1fcc69620da8eab1c048977fa22d297b18284 wrongly assumed that this CVE was fixed in version 3.10.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 83134027a02a6bea7320323562af9f75429c582f) Signed-off-by: Peter Korsgaard --- .../0001-Fix-out-of-bounds-read-in-slarrv.patch | 82 ++++++++++++++++++++++ package/lapack/lapack.mk | 3 + 2 files changed, 85 insertions(+) diff --git a/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch new file mode 100644 index 0000000000..43c6444b02 --- /dev/null +++ b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch @@ -0,0 +1,82 @@ +From 0631b6beaed60ba118b0b027c0f8d35397bf5df0 Mon Sep 17 00:00:00 2001 +From: Keno Fischer +Date: Thu, 30 Sep 2021 03:51:23 -0400 +Subject: [PATCH] Fix out of bounds read in slarrv + +This was originally reported as https://github.com/JuliaLang/julia/issues/42415. +I've tracked this down to an our of bounds read on the following line: + +https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L423 + +In the crashing example, `M` is `0`, causing `slarrv` to read uninitialized +memory from the work array. I believe the `0` for `M` is correct and indeed, +the documentation above supports that `M` may be zero: + +https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L113-L116 + +I believe it may be sufficient to early-out this function as suggested +in this PR. However, I have limited context for the full routine here, +so I would appreciate a sanity check. + +[Retrieved from: +https://github.com/Reference-LAPACK/lapack/commit/38f3eeee3108b18158409ca2a100e6fe03754781] +Signed-off-by: Fabrice Fontaine +--- + SRC/clarrv.f | 2 +- + SRC/dlarrv.f | 2 +- + SRC/slarrv.f | 2 +- + SRC/zlarrv.f | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SRC/clarrv.f b/SRC/clarrv.f +index 1f09e4da6..42f710757 100644 +--- a/SRC/clarrv.f ++++ b/SRC/clarrv.f +@@ -348,7 +348,7 @@ SUBROUTINE CLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/dlarrv.f b/SRC/dlarrv.f +index b036c1e66..299430361 100644 +--- a/SRC/dlarrv.f ++++ b/SRC/dlarrv.f +@@ -350,7 +350,7 @@ SUBROUTINE DLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/slarrv.f b/SRC/slarrv.f +index 9d72b339a..95f94fd1b 100644 +--- a/SRC/slarrv.f ++++ b/SRC/slarrv.f +@@ -350,7 +350,7 @@ SUBROUTINE SLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/zlarrv.f b/SRC/zlarrv.f +index 51ec558f5..e4be63e0d 100644 +--- a/SRC/zlarrv.f ++++ b/SRC/zlarrv.f +@@ -348,7 +348,7 @@ SUBROUTINE ZLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index f34f685ae2..a80131c9ad 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -12,6 +12,9 @@ LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON +# 0001-Fix-out-of-bounds-read-in-slarrv.patch +LAPACK_IGNORE_CVES += CVE-2021-4048 + ifeq ($(BR2_PACKAGE_LAPACK_COMPLEX),y) LAPACK_CONF_OPTS += -DBUILD_COMPLEX=ON -DBUILD_COMPLEX16=ON else From peter at korsgaard.com Sun Jan 23 18:45:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:45:21 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1/gst1-plugins-bad: fix typo Message-ID: <20220123190408.1FCB082968@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bda3b9e6c9b6fb19cd25a7b9fe56d776927bf59f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix typo added by commit 4ae8ecea8fb042931cebf8f8d4cb4bc891073a77 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1b53b6ec34cc37aa547eb4d07d6ef43afc04cdee) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1204a65681..239a45bb63 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -331,7 +331,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz select BR2_PACKAGE_LIBASS -comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8" +comment "assrender plugin needs a toolchain w/ C++, gcc >= 4.8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From peter at korsgaard.com Sun Jan 23 19:03:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:03:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/imagemagick: fix dependency Message-ID: <20220123190408.287E582B29@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=535541bd4c674c717921be6bc9330134c504c1e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS dependency was wrongly added to BR2_PACKAGE_HOST_IMAGEMAGICK by commit df20e4546384d1c249a6a0541183590671e83d77, indeed host-librsvg is only needed by BR2_PACKAGE_HOST_IMAGEMAGICK_SVG Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 38f6b42d310e389245a6772ae20b8bce73e1c61c) Signed-off-by: Peter Korsgaard --- package/imagemagick/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/imagemagick/Config.in.host b/package/imagemagick/Config.in.host index e12d82939a..671b0995dc 100644 --- a/package/imagemagick/Config.in.host +++ b/package/imagemagick/Config.in.host @@ -1,6 +1,5 @@ config BR2_PACKAGE_HOST_IMAGEMAGICK bool "host imagemagick" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help ImageMagick(R) is a software suite to create, edit, and compose bitmap images. It can read, convert and write images @@ -17,6 +16,7 @@ if BR2_PACKAGE_HOST_IMAGEMAGICK config BR2_PACKAGE_HOST_IMAGEMAGICK_SVG bool "SVG support" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help Say 'y' here is you need ImageMagick tools (like convert) to support SVG. From peter at korsgaard.com Sun Jan 23 18:32:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:32:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xenomai: fix build with glibc >= 2.34 Message-ID: <20220123190408.0599582968@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee32b0446fd4b202a05e59073c62238dc2aabf6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure with glibc >= 2.34: In file included from timerobj.c:32: In function 'threadobj_set_current', inlined from 'server_prologue' at timerobj.c:94:2: ../../include/copperplate/threadobj.h:252:9: error: 'pthread_setspecific' expecting 1 byte in a region of size 0 [-Werror=stringop-overread] 252 | pthread_setspecific(threadobj_tskey, thobj); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ed93f916eda304b30f320816c85d1b0d4488c699 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1b3055cc8d25e496928643ef93f3a47910fa4974) Signed-off-by: Peter Korsgaard --- ...e-valid-addresses-for-pthread_setspecific.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch b/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch new file mode 100644 index 0000000000..0c39a4ecf7 --- /dev/null +++ b/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch @@ -0,0 +1,57 @@ +From 627d488db3aa71406e32d4d8934629e8b0f35905 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Sat, 16 Oct 2021 15:46:33 +0200 +Subject: [PATCH] lib/{cobalt,copperplate}: Use valid addresses for + pthread_setspecific + +glibx 2.34 and newer annotated pthread_setspecific in a way that gcc-11 +complains about non-NULL pointers that are outside of what is considered +valid. So use dummy addresses instead. namely the related pthread keys. +Those pointers will never be dereferenced in both use cases. + +See also https://sourceware.org/bugzilla/show_bug.cgi?id=28458. + +Reported-by: Vitaly Chikunov +Signed-off-by: Jan Kiszka + +[Retrieved from: +https://source.denx.de/Xenomai/xenomai/-/commit/627d488db3aa71406e32d4d8934629e8b0f35905] +Signed-off-by: Fabrice Fontaine +--- + include/copperplate/threadobj.h | 6 +++++- + lib/cobalt/printf.c | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h +index 7e6904f4c..c8363415b 100644 +--- a/include/copperplate/threadobj.h ++++ b/include/copperplate/threadobj.h +@@ -173,7 +173,11 @@ void threadobj_save_timeout(struct threadobj_corespec *corespec, + #define __THREAD_M_SPARE6 (1 << 22) + #define __THREAD_M_SPARE7 (1 << 23) + +-#define THREADOBJ_IRQCONTEXT ((struct threadobj *)-2UL) ++/* ++ * We need to use a valid address here. The object will never be dereferenced ++ * when it is identified as IRQ context, so the pthread key itself is fine. ++ */ ++#define THREADOBJ_IRQCONTEXT ((struct threadobj *)&threadobj_tskey) + + struct traceobj; + struct syncobj; +diff --git a/lib/cobalt/printf.c b/lib/cobalt/printf.c +index 8982ddc93..0aa5940c6 100644 +--- a/lib/cobalt/printf.c ++++ b/lib/cobalt/printf.c +@@ -729,7 +729,7 @@ done: + pthread_cond_init(&printer_wakeup, NULL); + spawn_printer_thread(); + /* We just need a non-zero TSD to trigger the dtor upon unwinding. */ +- pthread_setspecific(cleanup_key, (void *)1); ++ pthread_setspecific(cleanup_key, &cleanup_key); + + atexit(rt_print_flush_buffers); + } +-- +GitLab + From peter at korsgaard.com Sun Jan 23 19:08:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:08:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mbedtls: security bump to version 2.16.12 Message-ID: <20220123190408.3A71382968@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9319c37a6085ccc9daf389f40f6f0382f57c05f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-12 https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da5c80f6750899578882688e68c128d8a21032c8) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index b93da164f9..8247748afd 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.11: -sha256 c18e7e9abf95e69e425260493720470021384a1728417042060a35d0b7b18b41 mbedtls-2.16.11.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12: +sha256 294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393 mbedtls-2.16.12.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 9207daf186..93ac1bb163 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.11 +MBEDTLS_VERSION = 2.16.12 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From giulio.benetti at benettiengineering.com Sun Jan 23 19:12:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 23 Jan 2022 20:12:25 +0100 Subject: [Buildroot] [PATCH 25/28] configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <9c9b7005-6f85-f812-21b5-fa029136477b@gmail.com> References: <9c9b7005-6f85-f812-21b5-fa029136477b@gmail.com> Message-ID: <83218573-DFC3-4AA3-B21E-F5C32DBADC1B@benettiengineering.com> Hi Sergey, thank you for the Tested-by, but you should put it? > Il giorno 23 gen 2022, alle ore 19:08, Sergey Kuzminov ha scritto: > > ?18.01.2022 13:43, Giulio Benetti: >> This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and >> supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. >> Signed-off-by: Giulio Benetti ?here, after my SoB. And when answering to Mailing List(ML), always use ?Reply to All?. Honestly it?s since years I always use ?Reply to All? because it works both for multiple recipients and for single recipient too. This way I don?t forget to do it. Best regards! Giulio >> --- >> configs/orangepi_zero_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >> index 1c107b10e6..a0af809e92 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -1,6 +1,6 @@ >> BR2_arm=y >> BR2_cortex_a7=y >> -BR2_ARM_FPU_VFPV4=y >> +BR2_ARM_FPU_NEON_VFPV4=y >> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > > Tested-by: Sergey Kuzminov > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Sun Jan 23 19:35:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:35:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lxml: security bump to version 4.6.5 In-Reply-To: <20211219173830.1364434-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 19 Dec 2021 18:38:30 +0100") References: <20211219173830.1364434-1-fontaine.fabrice@gmail.com> Message-ID: <878rv6xn1y.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - A vulnerability (GHSL-2021-1038) in the HTML cleaner allowed sneaking > script content through SVG images (CVE-2021-43818). > - A vulnerability (GHSL-2021-1037) in the HTML cleaner allowed sneaking > script content through CSS imports and other crafted constructs > (CVE-2021-43818). > https://github.com/lxml/lxml/blob/lxml-4.6.5/CHANGES.txt > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 19:35:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:35:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-lxml: security bump to version 4.6.5 Message-ID: <20220123192944.D9B7C82973@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3377aa01883c8b88ff2c4918cd0dbc0e863e9bdb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - A vulnerability (GHSL-2021-1038) in the HTML cleaner allowed sneaking script content through SVG images (CVE-2021-43818). - A vulnerability (GHSL-2021-1037) in the HTML cleaner allowed sneaking script content through CSS imports and other crafted constructs (CVE-2021-43818). https://github.com/lxml/lxml/blob/lxml-4.6.5/CHANGES.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ad6321660c91c9440c17a770505bfc1742e57d33) Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index dd6446e6cc..e33a8f8109 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468 lxml-4.6.3.tar.gz +sha256 6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca lxml-4.6.5.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 0d3775a1bd..8c2e965af6 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.6.3 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e5/21/a2e4517e3d216f0051687eea3d3317557bde68736f038a3b105ac3809247 +PYTHON_LXML_VERSION = 4.6.5 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e6/e1/34b3ab08553fe9a30e15b2bb9d1803a49d7d907dd9f245638839190042f0 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From peter at korsgaard.com Sun Jan 23 19:34:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:34:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-lxml: security bump to version 4.6.5 Message-ID: <20220123192954.D46AD82973@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cca59981bb2ad73675555f35c4c3f6dcbe7a1fcc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - A vulnerability (GHSL-2021-1038) in the HTML cleaner allowed sneaking script content through SVG images (CVE-2021-43818). - A vulnerability (GHSL-2021-1037) in the HTML cleaner allowed sneaking script content through CSS imports and other crafted constructs (CVE-2021-43818). https://github.com/lxml/lxml/blob/lxml-4.6.5/CHANGES.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ad6321660c91c9440c17a770505bfc1742e57d33) Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index dd6446e6cc..e33a8f8109 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468 lxml-4.6.3.tar.gz +sha256 6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca lxml-4.6.5.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 0d3775a1bd..8c2e965af6 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.6.3 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e5/21/a2e4517e3d216f0051687eea3d3317557bde68736f038a3b105ac3809247 +PYTHON_LXML_VERSION = 4.6.5 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e6/e1/34b3ab08553fe9a30e15b2bb9d1803a49d7d907dd9f245638839190042f0 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From peter at korsgaard.com Sun Jan 23 19:41:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:41:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/janus-gateway: fix CVE-2021-4124 In-Reply-To: <20211222090951.505097-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 22 Dec 2021 10:09:51 +0100") References: <20211222090951.505097-1-fontaine.fabrice@gmail.com> Message-ID: <874k5uxms9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > janus-gateway is vulnerable to Improper Neutralization of Input During > Web Page Generation ('Cross-site Scripting') > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 19:39:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:39:30 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/janus-gateway: fix CVE-2021-4124 Message-ID: <20220123193446.CD97C82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4e00807d44b61a444410afa66650a0095532a8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x janus-gateway is vulnerable to Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting') Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2fd3c2cf43a189430cb53cb1434d37d7a3a78b47) Signed-off-by: Peter Korsgaard --- .../0004-Fixed-missing-XSS-mitigation.patch | 25 ++++++++++++++++++++++ package/janus-gateway/janus-gateway.mk | 3 +++ 2 files changed, 28 insertions(+) diff --git a/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch new file mode 100644 index 0000000000..e1e612133b --- /dev/null +++ b/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch @@ -0,0 +1,25 @@ +From f62bba6513ec840761f2434b93168106c7c65a3d Mon Sep 17 00:00:00 2001 +From: Lorenzo Miniero +Date: Wed, 15 Dec 2021 14:10:01 +0100 +Subject: [PATCH] Fixed missing XSS mitigation (see #2817) + +[Retrieved from: +https://github.com/meetecho/janus-gateway/commit/f62bba6513ec840761f2434b93168106c7c65a3d] +Signed-off-by: Fabrice Fontaine +--- + html/textroomtest.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/html/textroomtest.js b/html/textroomtest.js +index bf95a260a..7d5ae832c 100644 +--- a/html/textroomtest.js ++++ b/html/textroomtest.js +@@ -351,7 +351,7 @@ function sendPrivateMsg(username) { + text: JSON.stringify(message), + error: function(reason) { bootbox.alert(reason); }, + success: function() { +- $('#chatroom').append('

    [' + getDateString() + '] [whisper to ' + display + '] ' + result); ++ $('#chatroom').append('

    [' + getDateString() + '] [whisper to ' + display + '] ' + escapeXmlTags(result)); + $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; + } + }); diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 98e00aeeb8..83d28ff6c7 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -14,6 +14,9 @@ JANUS_GATEWAY_CPE_ID_PRODUCT = janus # 0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4020 +# 0004-Fixed-missing-XSS-mitigation.patch +JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 + # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ libsrtp host-gengetopt libglib2 openssl libconfig \ From peter at korsgaard.com Sun Jan 23 19:38:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:38:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/janus-gateway: fix CVE-2021-4124 Message-ID: <20220123193812.CF7F782B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c756e6ac7b14684712f85fcdc18598431f081a72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x janus-gateway is vulnerable to Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting') Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2fd3c2cf43a189430cb53cb1434d37d7a3a78b47) Signed-off-by: Peter Korsgaard --- .../0004-Fixed-missing-XSS-mitigation.patch | 25 ++++++++++++++++++++++ package/janus-gateway/janus-gateway.mk | 3 +++ 2 files changed, 28 insertions(+) diff --git a/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch new file mode 100644 index 0000000000..e1e612133b --- /dev/null +++ b/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch @@ -0,0 +1,25 @@ +From f62bba6513ec840761f2434b93168106c7c65a3d Mon Sep 17 00:00:00 2001 +From: Lorenzo Miniero +Date: Wed, 15 Dec 2021 14:10:01 +0100 +Subject: [PATCH] Fixed missing XSS mitigation (see #2817) + +[Retrieved from: +https://github.com/meetecho/janus-gateway/commit/f62bba6513ec840761f2434b93168106c7c65a3d] +Signed-off-by: Fabrice Fontaine +--- + html/textroomtest.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/html/textroomtest.js b/html/textroomtest.js +index bf95a260a..7d5ae832c 100644 +--- a/html/textroomtest.js ++++ b/html/textroomtest.js +@@ -351,7 +351,7 @@ function sendPrivateMsg(username) { + text: JSON.stringify(message), + error: function(reason) { bootbox.alert(reason); }, + success: function() { +- $('#chatroom').append('

    [' + getDateString() + '] [whisper to ' + display + '] ' + result); ++ $('#chatroom').append('

    [' + getDateString() + '] [whisper to ' + display + '] ' + escapeXmlTags(result)); + $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; + } + }); diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 98e00aeeb8..83d28ff6c7 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -14,6 +14,9 @@ JANUS_GATEWAY_CPE_ID_PRODUCT = janus # 0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4020 +# 0004-Fixed-missing-XSS-mitigation.patch +JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 + # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ libsrtp host-gengetopt libglib2 openssl libconfig \ From peter at korsgaard.com Sun Jan 23 19:49:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:49:43 +0100 Subject: [Buildroot] [PATCH] pakage/apache: security bump to version 2.4.52 In-Reply-To: <20211222174246.26822-1-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 22 Dec 2021 18:42:45 +0100") References: <20211222174246.26822-1-peter@korsgaard.com> Message-ID: <87zgnmw7u0.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > *) SECURITY: CVE-2021-44790: Possible buffer overflow when parsing > multipart content in mod_lua of Apache HTTP Server 2.4.51 and > earlier (cve.mitre.org) > A carefully crafted request body can cause a buffer overflow in > the mod_lua multipart parser (r:parsebody() called from Lua > scripts). > The Apache httpd team is not aware of an exploit for the > vulnerabilty though it might be possible to craft one. > This issue affects Apache HTTP Server 2.4.51 and earlier. > Credits: Chamal > *) SECURITY: CVE-2021-44224: Possible NULL dereference or SSRF in > forward proxy configurations in Apache HTTP Server 2.4.51 and > earlier (cve.mitre.org) > A crafted URI sent to httpd configured as a forward proxy > (ProxyRequests on) can cause a crash (NULL pointer dereference) > or, for configurations mixing forward and reverse proxy > declarations, can allow for requests to be directed to a > declared Unix Domain Socket endpoint (Server Side Request > Forgery). > This issue affects Apache HTTP Server 2.4.7 up to 2.4.51 > (included). > For more details, see the changes file: > https://downloads.apache.org/httpd/CHANGES_2.4.52 > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 19:48:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:48:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/apache: security bump to version 2.4.52 Message-ID: <20220123194303.6B4DD829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e29333183c94e8739ef6995e63a1cccb53219f52 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: *) SECURITY: CVE-2021-44790: Possible buffer overflow when parsing multipart content in mod_lua of Apache HTTP Server 2.4.51 and earlier (cve.mitre.org) A carefully crafted request body can cause a buffer overflow in the mod_lua multipart parser (r:parsebody() called from Lua scripts). The Apache httpd team is not aware of an exploit for the vulnerabilty though it might be possible to craft one. This issue affects Apache HTTP Server 2.4.51 and earlier. Credits: Chamal *) SECURITY: CVE-2021-44224: Possible NULL dereference or SSRF in forward proxy configurations in Apache HTTP Server 2.4.51 and earlier (cve.mitre.org) A crafted URI sent to httpd configured as a forward proxy (ProxyRequests on) can cause a crash (NULL pointer dereference) or, for configurations mixing forward and reverse proxy declarations, can allow for requests to be directed to a declared Unix Domain Socket endpoint (Server Side Request Forgery). This issue affects Apache HTTP Server 2.4.7 up to 2.4.51 (included). For more details, see the changes file: https://downloads.apache.org/httpd/CHANGES_2.4.52 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit bdc3f6888f669919bf8820be1eb75340b48ee7e1) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 138717c336..014d920772 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.51.tar.bz2.{sha256,sha512} -sha256 20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 httpd-2.4.51.tar.bz2 -sha512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} +sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 +sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index d55f43148e..3b518795be 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.51 +APACHE_VERSION = 2.4.52 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From peter at korsgaard.com Sun Jan 23 19:47:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:47:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/apache: security bump to version 2.4.52 Message-ID: <20220123194309.E0277829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1eb325609509caa6eced3220f88434add8e08125 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: *) SECURITY: CVE-2021-44790: Possible buffer overflow when parsing multipart content in mod_lua of Apache HTTP Server 2.4.51 and earlier (cve.mitre.org) A carefully crafted request body can cause a buffer overflow in the mod_lua multipart parser (r:parsebody() called from Lua scripts). The Apache httpd team is not aware of an exploit for the vulnerabilty though it might be possible to craft one. This issue affects Apache HTTP Server 2.4.51 and earlier. Credits: Chamal *) SECURITY: CVE-2021-44224: Possible NULL dereference or SSRF in forward proxy configurations in Apache HTTP Server 2.4.51 and earlier (cve.mitre.org) A crafted URI sent to httpd configured as a forward proxy (ProxyRequests on) can cause a crash (NULL pointer dereference) or, for configurations mixing forward and reverse proxy declarations, can allow for requests to be directed to a declared Unix Domain Socket endpoint (Server Side Request Forgery). This issue affects Apache HTTP Server 2.4.7 up to 2.4.51 (included). For more details, see the changes file: https://downloads.apache.org/httpd/CHANGES_2.4.52 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit bdc3f6888f669919bf8820be1eb75340b48ee7e1) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 138717c336..014d920772 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.51.tar.bz2.{sha256,sha512} -sha256 20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 httpd-2.4.51.tar.bz2 -sha512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} +sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 +sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index ff01b25106..5fcb887fbc 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.51 +APACHE_VERSION = 2.4.52 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Sun Jan 23 19:49:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:27 +0100 Subject: [Buildroot] [git commit] package/nmon: bump to version 16n Message-ID: <20220123194537.CC94782B4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a42e347222a2d04947d2e6985ea241ce593a0ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nmon/nmon.hash | 6 +++--- package/nmon/nmon.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nmon/nmon.hash b/package/nmon/nmon.hash index fd3f09c63a..1d7226a4fe 100644 --- a/package/nmon/nmon.hash +++ b/package/nmon/nmon.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/nmon/files/ -md5 df67f07ea4006c6204acff586beada81 lmon16m.c -sha1 68cd02be19036a287fe352823db93223e73a9411 lmon16m.c +md5 a8172601fdc05f3bc58455cbd3f4475e lmon16n.c +sha1 024a3b56179838f0e04bf1706cc9ba56595301a8 lmon16n.c # Locally computed -sha256 2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 lmon16m.c +sha256 c0012cc2d925dee940c37ceae297abac64ba5a5c30e575e7418b04028613f5f2 lmon16n.c diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk index 8b39748cce..01371a8c74 100644 --- a/package/nmon/nmon.mk +++ b/package/nmon/nmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMON_VERSION = 16m +NMON_VERSION = 16n NMON_SITE = https://sourceforge.net/projects/nmon/files NMON_SOURCE = lmon$(NMON_VERSION).c NMON_LICENSE = GPL-3.0+ From yann.morin.1998 at free.fr Sun Jan 23 19:49:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:21 +0100 Subject: [Buildroot] [git commit] package/xl2tp: bump to version 1.3.17 Message-ID: <20220123194537.B33D38296B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa1a33027fabe03f98b10edfa2a94555e9413415 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/xelerance/xl2tpd/releases/tag/v1.3.17 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xl2tp/xl2tp.hash | 2 +- package/xl2tp/xl2tp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash index 471657f0f2..eca918bc83 100644 --- a/package/xl2tp/xl2tp.hash +++ b/package/xl2tp/xl2tp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 c28608b315adb25c8bf9579c1d6ab52ab47c4c43b68a5ab63c5d039196fd180f xl2tp-1.3.16.tar.gz +sha256 898d9b6a374c78dea5f20d80fd50fac13428ad746fefb16ff5f6bec449affe67 xl2tp-1.3.17.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index ca404060a2..e42eeb1709 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XL2TP_VERSION = 1.3.16 +XL2TP_VERSION = 1.3.17 XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap XL2TP_LICENSE = GPL-2.0 From yann.morin.1998 at free.fr Sun Jan 23 19:49:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:34 +0100 Subject: [Buildroot] [git commit] package/libpjsip: security bump to version 2.11.1 Message-ID: <20220123194537.DE43C82B40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c7ad667ec4a25226848baba809e492ca0ff06da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security update. This version is recommended for all users to improve the security of applications using PJSIP. Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 Update indentation in hash file (two spaces) https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr https://github.com/pjsip/pjproject/releases/tag/2.11 https://github.com/pjsip/pjproject/releases/tag/2.11.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libpjsip/libpjsip.hash | 4 ++-- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 68c2208885..f39ebf4060 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8feec9bcb2..0a93780e93 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.10 +LIBPJSIP_VERSION = 2.11.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From yann.morin.1998 at free.fr Sun Jan 23 19:49:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:31 +0100 Subject: [Buildroot] [git commit] package/lft: bump to version 3.91 Message-ID: <20220123194537.D5D628296B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=038d7d685f811d48c2870df86c94c8641539f78b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master lft 3.91 / WhoB 3.91 ---------------------- - Fixed bugs.debian.org/cgi-bin/bugreport.cgi?bug=922430 - Updated date lft 3.9 / WhoB 3.9 ---------------------- - Fixed a bug that could indicate a target was closed when it was open - Improved support for DLT_NULL interfaces on BSD-like operating systems - Improved deprecated pcap device enumeration method - Improved GraphViz output format appearance Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lft/lft.hash | 6 +++--- package/lft/lft.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lft/lft.hash b/package/lft/lft.hash index 91a1fb0659..9bcce843bc 100644 --- a/package/lft/lft.hash +++ b/package/lft/lft.hash @@ -1,5 +1,5 @@ # From http://pwhois.org/lft/ -md5 31b15aabc619707427a73657512560f8 lft-3.8.tar.gz +md5 73cb955546692cf0fb5d7931939c56de lft-3.91.tar.gz # Locally calculated -sha256 10f427e77b0f8207817329bd8ef0310078434612620073369264d15e6f97e990 lft-3.8.tar.gz -sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING +sha256 aad13e671adcfc471ab99417161964882d147893a54664f3f465ec5c8398e6af lft-3.91.tar.gz +sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING diff --git a/package/lft/lft.mk b/package/lft/lft.mk index 5154c83fef..37e6e77767 100644 --- a/package/lft/lft.mk +++ b/package/lft/lft.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFT_VERSION = 3.8 +LFT_VERSION = 3.91 LFT_SITE = http://pwhois.org/get LFT_DEPENDENCIES = libpcap LFT_LICENSE = VOSTROM Public License for Open Source From yann.morin.1998 at free.fr Sun Jan 23 19:49:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:25 +0100 Subject: [Buildroot] [git commit] package/collectl: bump to version 4.3.2 Message-ID: <20220123194537.C3FD282B45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b44e7d988569778d952e9ad3e7e76cfe75bbe7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 4.3.2 Oct 7, 2021 - very minor bug. the last command in perfquery is not in a loop and prevents the collectl daemon from starting via the service. Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/collectl/collectl.hash | 8 ++++---- package/collectl/collectl.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/collectl/collectl.hash b/package/collectl/collectl.hash index d866e0becc..1785d25d87 100644 --- a/package/collectl/collectl.hash +++ b/package/collectl/collectl.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2187264d974b36a653c8a4b028ac6eeab23e1885f8b2563a33f06358f39889f1 collectl-4.3.1.src.tar.gz -sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC -sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL +sha256 9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750 collectl-4.3.2.src.tar.gz +sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC +sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL diff --git a/package/collectl/collectl.mk b/package/collectl/collectl.mk index c9fb59293c..c6cb2e1494 100644 --- a/package/collectl/collectl.mk +++ b/package/collectl/collectl.mk @@ -4,7 +4,7 @@ # ################################################################################ -COLLECTL_VERSION = 4.3.1 +COLLECTL_VERSION = 4.3.2 COLLECTL_SOURCE = collectl-$(COLLECTL_VERSION).src.tar.gz COLLECTL_SITE = http://downloads.sourceforge.net/collectl/collectl COLLECTL_LICENSE = Artistic or GPL-2.0 From yann.morin.1998 at free.fr Sun Jan 23 19:49:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:23 +0100 Subject: [Buildroot] [git commit] package/neon: bump to version 0.32.2 Message-ID: <20220123194537.BB3967F93B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=029a6dc3e3320984c6369747e0b79060f13b2afc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch site to get latest version - README has been renamed to README.md - Update indentation in hash file (two spaces) https://github.com/notroj/neon/blob/0.32.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/neon/Config.in | 2 +- package/neon/neon.hash | 10 +++++----- package/neon/neon.mk | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/neon/Config.in b/package/neon/Config.in index d055b37607..45348a7f4d 100644 --- a/package/neon/Config.in +++ b/package/neon/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NEON help HTTP and WebDAV client library, with a C interface. - http://www.webdav.org/neon/ + https://notroj.github.io/neon/ if BR2_PACKAGE_NEON diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 2ebefbe520..5a5a77a58b 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,6 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca neon-0.30.2.tar.gz # Locally computed -sha256 95f77624e96f6728145826fc895142275451f43f41c073766db3dbbcc8b790b0 README -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING +sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz +# Hash for license files +sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING diff --git a/package/neon/neon.mk b/package/neon/neon.mk index da53735d0e..3bbd12561f 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,10 +4,10 @@ # ################################################################################ -NEON_VERSION = 0.30.2 -NEON_SITE = http://www.webdav.org/neon +NEON_VERSION = 0.32.2 +NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) -NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README +NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath From yann.morin.1998 at free.fr Sun Jan 23 19:52:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:52:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/xl2tp: bump to version 1.3.17 In-Reply-To: <20220123104057.556978-1-fontaine.fabrice@gmail.com> References: <20220123104057.556978-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195240.GB2502@scaer> Fabrice, All, On 2022-01-23 11:40 +0100, Fabrice Fontaine spake thusly: > https://github.com/xelerance/xl2tpd/releases/tag/v1.3.17 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/xl2tp/xl2tp.hash | 2 +- > package/xl2tp/xl2tp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash > index 471657f0f2..eca918bc83 100644 > --- a/package/xl2tp/xl2tp.hash > +++ b/package/xl2tp/xl2tp.hash > @@ -1,3 +1,3 @@ > # locally computed > -sha256 c28608b315adb25c8bf9579c1d6ab52ab47c4c43b68a5ab63c5d039196fd180f xl2tp-1.3.16.tar.gz > +sha256 898d9b6a374c78dea5f20d80fd50fac13428ad746fefb16ff5f6bec449affe67 xl2tp-1.3.17.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE > diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk > index 65a78504f3..4a2bd66308 100644 > --- a/package/xl2tp/xl2tp.mk > +++ b/package/xl2tp/xl2tp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XL2TP_VERSION = 1.3.16 > +XL2TP_VERSION = 1.3.17 > XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) > XL2TP_DEPENDENCIES = libpcap > XL2TP_LICENSE = GPL-2.0 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:53:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:53:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon: bump to version 0.32.2 In-Reply-To: <20220123105146.568745-1-fontaine.fabrice@gmail.com> References: <20220123105146.568745-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195347.GC2502@scaer> Fabrice, All, On 2022-01-23 11:51 +0100, Fabrice Fontaine spake thusly: > - Switch site to get latest version > - README has been renamed to README.md > - Update indentation in hash file (two spaces) > > https://github.com/notroj/neon/blob/0.32.2/NEWS > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/neon/Config.in | 2 +- > package/neon/neon.hash | 10 +++++----- > package/neon/neon.mk | 6 +++--- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/package/neon/Config.in b/package/neon/Config.in > index 8dc78f0f0a..a3515f4052 100644 > --- a/package/neon/Config.in > +++ b/package/neon/Config.in > @@ -3,7 +3,7 @@ config BR2_PACKAGE_NEON > help > HTTP and WebDAV client library, with a C interface. > > - http://www.webdav.org/neon/ > + https://notroj.github.io/neon/ > > if BR2_PACKAGE_NEON > > diff --git a/package/neon/neon.hash b/package/neon/neon.hash > index 2ebefbe520..5a5a77a58b 100644 > --- a/package/neon/neon.hash > +++ b/package/neon/neon.hash > @@ -1,6 +1,6 @@ > -# Locally calculated after checking pgp signature > -sha256 db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca neon-0.30.2.tar.gz > # Locally computed > -sha256 95f77624e96f6728145826fc895142275451f43f41c073766db3dbbcc8b790b0 README > -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB > -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING > +sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz > +# Hash for license files > +sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md > +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB > +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING > diff --git a/package/neon/neon.mk b/package/neon/neon.mk > index da53735d0e..3bbd12561f 100644 > --- a/package/neon/neon.mk > +++ b/package/neon/neon.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -NEON_VERSION = 0.30.2 > -NEON_SITE = http://www.webdav.org/neon > +NEON_VERSION = 0.32.2 > +NEON_SITE = https://notroj.github.io/neon > NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) > -NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README > +NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md > NEON_CPE_ID_VENDOR = webdav > NEON_INSTALL_STAGING = YES > NEON_CONF_OPTS = --without-gssapi --disable-rpath > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:54:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:54:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectl: bump to version 4.3.2 In-Reply-To: <20220123110155.570748-1-fontaine.fabrice@gmail.com> References: <20220123110155.570748-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195400.GD2502@scaer> Fabrice, All, On 2022-01-23 12:01 +0100, Fabrice Fontaine spake thusly: > 4.3.2 Oct 7, 2021 > - very minor bug. the last command in perfquery is not in a loop and > prevents the collectl daemon from starting via the service. > > Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/collectl/collectl.hash | 8 ++++---- > package/collectl/collectl.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/collectl/collectl.hash b/package/collectl/collectl.hash > index d866e0becc..1785d25d87 100644 > --- a/package/collectl/collectl.hash > +++ b/package/collectl/collectl.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 2187264d974b36a653c8a4b028ac6eeab23e1885f8b2563a33f06358f39889f1 collectl-4.3.1.src.tar.gz > -sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC > -sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING > -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL > +sha256 9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750 collectl-4.3.2.src.tar.gz > +sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC > +sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING > +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL > diff --git a/package/collectl/collectl.mk b/package/collectl/collectl.mk > index c9fb59293c..c6cb2e1494 100644 > --- a/package/collectl/collectl.mk > +++ b/package/collectl/collectl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -COLLECTL_VERSION = 4.3.1 > +COLLECTL_VERSION = 4.3.2 > COLLECTL_SOURCE = collectl-$(COLLECTL_VERSION).src.tar.gz > COLLECTL_SITE = http://downloads.sourceforge.net/collectl/collectl > COLLECTL_LICENSE = Artistic or GPL-2.0 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:54:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:54:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/nmon: bump to version 16n In-Reply-To: <20220123111126.573758-1-fontaine.fabrice@gmail.com> References: <20220123111126.573758-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195425.GE2502@scaer> Fabrice, All, On 2022-01-23 12:11 +0100, Fabrice Fontaine spake thusly: > Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nmon/nmon.hash | 6 +++--- > package/nmon/nmon.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/nmon/nmon.hash b/package/nmon/nmon.hash > index fd3f09c63a..1d7226a4fe 100644 > --- a/package/nmon/nmon.hash > +++ b/package/nmon/nmon.hash > @@ -1,5 +1,5 @@ > # From https://sourceforge.net/projects/nmon/files/ > -md5 df67f07ea4006c6204acff586beada81 lmon16m.c > -sha1 68cd02be19036a287fe352823db93223e73a9411 lmon16m.c > +md5 a8172601fdc05f3bc58455cbd3f4475e lmon16n.c > +sha1 024a3b56179838f0e04bf1706cc9ba56595301a8 lmon16n.c > # Locally computed > -sha256 2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 lmon16m.c > +sha256 c0012cc2d925dee940c37ceae297abac64ba5a5c30e575e7418b04028613f5f2 lmon16n.c > diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk > index 8b39748cce..01371a8c74 100644 > --- a/package/nmon/nmon.mk > +++ b/package/nmon/nmon.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NMON_VERSION = 16m > +NMON_VERSION = 16n > NMON_SITE = https://sourceforge.net/projects/nmon/files > NMON_SOURCE = lmon$(NMON_VERSION).c > NMON_LICENSE = GPL-3.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:54:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:54:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/lft: bump to version 3.91 In-Reply-To: <20220123112220.578219-1-fontaine.fabrice@gmail.com> References: <20220123112220.578219-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195440.GF2502@scaer> Fab rice, All, On 2022-01-23 12:22 +0100, Fabrice Fontaine spake thusly: > lft 3.91 / WhoB 3.91 > ---------------------- > - Fixed bugs.debian.org/cgi-bin/bugreport.cgi?bug=922430 > - Updated date > > lft 3.9 / WhoB 3.9 > ---------------------- > - Fixed a bug that could indicate a target was closed when it was open > - Improved support for DLT_NULL interfaces on BSD-like operating systems > - Improved deprecated pcap device enumeration method > - Improved GraphViz output format appearance > > Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/lft/lft.hash | 6 +++--- > package/lft/lft.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/lft/lft.hash b/package/lft/lft.hash > index 91a1fb0659..9bcce843bc 100644 > --- a/package/lft/lft.hash > +++ b/package/lft/lft.hash > @@ -1,5 +1,5 @@ > # From http://pwhois.org/lft/ > -md5 31b15aabc619707427a73657512560f8 lft-3.8.tar.gz > +md5 73cb955546692cf0fb5d7931939c56de lft-3.91.tar.gz > # Locally calculated > -sha256 10f427e77b0f8207817329bd8ef0310078434612620073369264d15e6f97e990 lft-3.8.tar.gz > -sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING > +sha256 aad13e671adcfc471ab99417161964882d147893a54664f3f465ec5c8398e6af lft-3.91.tar.gz > +sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING > diff --git a/package/lft/lft.mk b/package/lft/lft.mk > index 5154c83fef..37e6e77767 100644 > --- a/package/lft/lft.mk > +++ b/package/lft/lft.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LFT_VERSION = 3.8 > +LFT_VERSION = 3.91 > LFT_SITE = http://pwhois.org/get > LFT_DEPENDENCIES = libpcap > LFT_LICENSE = VOSTROM Public License for Open Source > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:54:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:54:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/libpjsip: security bump to version 2.11.1 In-Reply-To: <20220123134751.703269-2-fontaine.fabrice@gmail.com> References: <20220123134751.703269-1-fontaine.fabrice@gmail.com> <20220123134751.703269-2-fontaine.fabrice@gmail.com> Message-ID: <20220123195455.GG2502@scaer> Fabrice, All On 2022-01-23 14:47 +0100, Fabrice Fontaine spake thusly: > Security update. This version is recommended for all users to improve > the security of applications using PJSIP. > > Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 > > Update indentation in hash file (two spaces) > > https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph > https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp > https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr > https://github.com/pjsip/pjproject/releases/tag/2.11 > https://github.com/pjsip/pjproject/releases/tag/2.11.1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libpjsip/libpjsip.hash | 4 ++-- > package/libpjsip/libpjsip.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash > index 68c2208885..f39ebf4060 100644 > --- a/package/libpjsip/libpjsip.hash > +++ b/package/libpjsip/libpjsip.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk > index 771db0ac72..b05cc31a83 100644 > --- a/package/libpjsip/libpjsip.mk > +++ b/package/libpjsip/libpjsip.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -LIBPJSIP_VERSION = 2.10 > +LIBPJSIP_VERSION = 2.11.1 > LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz > LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) > -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz > +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz > > LIBPJSIP_DEPENDENCIES = libsrtp > LIBPJSIP_LICENSE = GPL-2.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Sun Jan 23 20:03:21 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 23 Jan 2022 21:03:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: <20220119202351.GA3095239@scaer> References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> <20220119202351.GA3095239@scaer> Message-ID: Hi Yann, On 19/01/2022 21:23, Yann E. MORIN wrote: > Fabrice, All, > > On 2022-01-15 17:04 +0100, Fabrice Fontaine spake thusly: >> Set --with-boost to avoid the following build failure when a non >> working >> boost version is installed on host. This failure is raised since the >> addition of the package in commit >> ea033cecf990ed3f86619647523a9ad2ccb09adb: >> >> configure:5559: error: Could not find a version of the Boost::Asio >> library! >> >> Fixes: >> - >> http://autobuild.buildroot.org/results/855b66b86d979cc922b947da932b0e2388481263 >> >> Signed-off-by: Fabrice Fontaine >> --- >> package/riscv-isa-sim/riscv-isa-sim.mk | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk >> b/package/riscv-isa-sim/riscv-isa-sim.mk >> index ee9067d304..90eed93c36 100644 >> --- a/package/riscv-isa-sim/riscv-isa-sim.mk >> +++ b/package/riscv-isa-sim/riscv-isa-sim.mk >> @@ -9,5 +9,6 @@ RISCV_ISA_SIM_SITE = $(call >> github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA >> RISCV_ISA_SIM_LICENSE = BSD-3-Clause >> RISCV_ISA_SIM_LICENSE_FILES = LICENSE >> HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc >> +HOST_RISCV_ISA_SIM_CONF_OPTS = --with-boost=$(HOST_DIR) > > To be noted: riscv-isa-sim could also be configured with > --without-boost > and the build succeeds. > > Anyway: applied to master, thanks. > > Julien, do you know what ill-effect building without Boost would have? The absence of Boost is removing the "Command I/O via socket" feature of riscv-isa-sim (-s command line option). See: https://github.com/riscv-software-src/riscv-isa-sim/blob/v1.1.0/spike_main/spike.cc#L30 It's generally not needed in simple use-cases. My initial intent was to have host-riscv-isa-sim compiled without this Boost support. The upstream riscv-isa-sim detection of boost seems a bit peculiar and does not really honor --without-boost/--without-boost-regex/--without-boost-asio. Setting --without-boost alone on a system with boost will make the ./configure fail with: checking whether the Boost::ASIO library is available... yes configure: error: Could not find a version of the Boost::Asio library! Setting --without-boost --without-boost-regex --without-boost-asio will end up with a successful configuration/compilation, but with a binary linked with libboost_regex.so and libboost_system.so... I believe this part could be slightly improved before setting --without-boost in the BR recipe. I'll have a look into that. Best regards, Julien. > Regards, > Yann E. MORIN. > >> $(eval $(host-autotools-package)) >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ > | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There > is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v > conspiracy. | > '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Jan 23 20:43:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 21:43:03 +0100 Subject: [Buildroot] [PATCH 1/2] package/mpd-mpc: disable documentation In-Reply-To: <20211220125844.2187408-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Dec 2021 13:58:43 +0100") References: <20211220125844.2187408-1-fontaine.fabrice@gmail.com> Message-ID: <87tuduw5d4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable documentation which is available (and enabled by default) since > bump to version 0.31 in commit 0186da2923c07656005264dbb3001ca706a2ef10 > and > https://github.com/MusicPlayerDaemon/mpc/commit/60e173c0198743fd6af906682eadec1cc67a4975 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 20:42:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 21:42:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mpd-mpc: disable documentation Message-ID: <20220123203653.A6BAD8267E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d81064a03c1ade13ee52b4dcd7a33ede4bf23e9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Disable documentation which is available (and enabled by default) since bump to version 0.31 in commit 0186da2923c07656005264dbb3001ca706a2ef10 and https://github.com/MusicPlayerDaemon/mpc/commit/60e173c0198743fd6af906682eadec1cc67a4975 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8a78e215c3bc8bcfcfdd5ba8f8c82d977c91e91b) Signed-off-by: Peter Korsgaard --- package/mpd-mpc/mpd-mpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index 6eebc63cca..d5a981d70e 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -11,5 +11,6 @@ MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPL-2.0+ MPD_MPC_LICENSE_FILES = COPYING MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient +MPD_MPC_CONF_OPTS = -Ddocumentation=disabled $(eval $(meson-package)) From yann.morin.1998 at free.fr Sun Jan 23 20:51:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 21:51:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> <20220119202351.GA3095239@scaer> Message-ID: <20220123205148.GH2502@scaer> Julien, All, On 2022-01-23 21:03 +0100, Julien Olivain spake thusly: > On 19/01/2022 21:23, Yann E. MORIN wrote: [--SNIP--] > >To be noted: riscv-isa-sim could also be configured with --without-boost > >and the build succeeds. > >Julien, do you know what ill-effect building without Boost would have? > > The absence of Boost is removing the "Command I/O via socket" feature of > riscv-isa-sim (-s command line option). See: > https://github.com/riscv-software-src/riscv-isa-sim/blob/v1.1.0/spike_main/spike.cc#L30 > It's generally not needed in simple use-cases. Thanks for the feedback. :-) Indeed, if Boost is not a strict requirement, it would be nice to be able to build without it... > My initial intent was to have host-riscv-isa-sim compiled without this Boost > support. > > The upstream riscv-isa-sim detection of boost seems a bit peculiar and does > not > really honor --without-boost/--without-boost-regex/--without-boost-asio. > > Setting --without-boost alone on a system with boost will make the > ./configure > fail with: > > checking whether the Boost::ASIO library is available... yes > configure: error: Could not find a version of the Boost::Asio library! > > Setting --without-boost --without-boost-regex --without-boost-asio will end > up > with a successful configuration/compilation, but with a binary linked with > libboost_regex.so and libboost_system.so... > > I believe this part could be slightly improved before setting > --without-boost > in the BR recipe. I'll have a look into that. The problem, as you said, is that if Boost is available (either already isntalled on the build machine, or host-boost is puleld in by another package), configuring riscv-isa-sim with --without-boost still breaks with the message you pasted above. But we can't guarantee that Boost (system or host-boost) is not present. So, either we have a patch that fixes the Boost detection (and we push that patch upstream), or we can only depend on host-boost and keep the current status. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 20:57:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 21:57:09 +0100 Subject: [Buildroot] [PATCH 25/28] configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <83218573-DFC3-4AA3-B21E-F5C32DBADC1B@benettiengineering.com> References: <9c9b7005-6f85-f812-21b5-fa029136477b@gmail.com> <83218573-DFC3-4AA3-B21E-F5C32DBADC1B@benettiengineering.com> Message-ID: <20220123205709.GI2502@scaer> Giulio, All, On 2022-01-23 20:12 +0100, Giulio Benetti spake thusly: > Hi Sergey, > > thank you for the Tested-by, but you should put it? > > > Il giorno 23 gen 2022, alle ore 19:08, Sergey Kuzminov ha scritto: > > > > ?18.01.2022 13:43, Giulio Benetti: > >> This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and > >> supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. > >> Signed-off-by: Giulio Benetti > > ?here, after my SoB. No, not needed: Patchwork will correctly catch it wherever it is as long as the mail is a proper reply, which it is here, and you can check it on patchwork: the 'T' column is now set to '1' for this patch, and the tested-by tag is properly added to the mbox (which is what we maintainers use when applying patches): $ curl 'https://patchwork.ozlabs.org/project/buildroot/patch/20220118104338.2081259-26-giulio.benetti at benettiengineering.com/mbox/' [...] Signed-off-by: Giulio Benetti Tested-by: Sergey Kuzminov [...] Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Jan 23 21:23:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 22:23:28 +0100 Subject: [Buildroot] [PATCH] package/gcc: fix xtensa overlay for gcc ccache hash In-Reply-To: <20211224095257.2909635-1-yann.morin.1998@free.fr> References: <20211224095257.2909635-1-yann.morin.1998@free.fr> Message-ID: <0fa41a24-0015-eb7f-21bc-2ed851089b54@korsgaard.com> Hi, On 24/12/2021 10.52, Yann E. MORIN wrote: > Commit b3b60706221d (arch/xtensa: allow specifying path to tarball file) > m issed a place where the xtensa overlay was refrenced, thus breaking > the calculation for the ccache hash. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 21:20:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 22:20:37 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gcc: fix xtensa overlay for gcc ccache hash Message-ID: <20220123211649.37A1781456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2475ccb4ccc4619d83980ea5e3add7cb7c34c9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit b3b60706221d (arch/xtensa: allow specifying path to tarball file) missed a place where the xtensa overlay was referenced, thus breaking the calculation for the ccache hash. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Max Filippov Signed-off-by: Yann E. MORIN (cherry picked from commit b98ed34072f07f0c367b23d1e018f5b9487b3c34) Signed-off-by: Peter Korsgaard --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 5e419f7ede..28b6a0c95c 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -286,7 +286,7 @@ HOST_GCC_COMMON_CCACHE_HASH_FILES += \ $(addsuffix /gcc/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ $(addsuffix /gcc/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))))) ifeq ($(BR2_xtensa),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_TAR) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_FILE) endif # _CONF_OPTS contains some references to the absolute path of $(HOST_DIR) From peter at korsgaard.com Sun Jan 23 20:42:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 21:42:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mpd-mpc: disable documentation Message-ID: <20220123211656.7C7FD81456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ea385642d5b33dc347bad3f31d51f3e0f70ec2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Disable documentation which is available (and enabled by default) since bump to version 0.31 in commit 0186da2923c07656005264dbb3001ca706a2ef10 and https://github.com/MusicPlayerDaemon/mpc/commit/60e173c0198743fd6af906682eadec1cc67a4975 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8a78e215c3bc8bcfcfdd5ba8f8c82d977c91e91b) Signed-off-by: Peter Korsgaard --- package/mpd-mpc/mpd-mpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index 6eebc63cca..d5a981d70e 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -11,5 +11,6 @@ MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPL-2.0+ MPD_MPC_LICENSE_FILES = COPYING MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient +MPD_MPC_CONF_OPTS = -Ddocumentation=disabled $(eval $(meson-package)) From peter at korsgaard.com Sun Jan 23 21:20:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 22:20:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gcc: fix xtensa overlay for gcc ccache hash Message-ID: <20220123211656.881AA82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adf50a486a70065c18e1b925021343daabf6b4e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit b3b60706221d (arch/xtensa: allow specifying path to tarball file) missed a place where the xtensa overlay was referenced, thus breaking the calculation for the ccache hash. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Max Filippov Signed-off-by: Yann E. MORIN (cherry picked from commit b98ed34072f07f0c367b23d1e018f5b9487b3c34) Signed-off-by: Peter Korsgaard --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index fcc352aa25..3adc1d4e16 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -283,7 +283,7 @@ HOST_GCC_COMMON_CCACHE_HASH_FILES += \ $(addsuffix /gcc/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ $(addsuffix /gcc/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))))) ifeq ($(BR2_xtensa),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_TAR) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_FILE) endif # _CONF_OPTS contains some references to the absolute path of $(HOST_DIR) From fontaine.fabrice at gmail.com Sun Jan 23 21:26:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 22:26:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gvfs: fix build with meson >= 0.61 Message-ID: <20220123212607.781422-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of meson to version 0.61.0 in commit a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f: ../output-1/build/gvfs-1.48.1/daemon/meson.build:368:7: ERROR: Function does not take positional arguments. Fixes: - http://autobuild.buildroot.org/results/6231649fac82a70b215186c3396b879a28a96f60 Signed-off-by: Fabrice Fontaine --- ...e-incorrect-i18n.merge_file-argument.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch diff --git a/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch new file mode 100644 index 0000000000..a85a1a374e --- /dev/null +++ b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch @@ -0,0 +1,33 @@ +From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 + +[Retrieved (and backported) from: +https://gitlab.gnome.org/GNOME/gvfs/-/commit/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0] +Signed-off-by: Fabrice Fontaine +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index 5f9559aa..e20ada29 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -360,7 +360,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab + -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 21:27:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 22:27:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/xml-security-c: bump to version 2.0.4 Message-ID: <20220123212757.781999-1-fontaine.fabrice@gmail.com> Version 2.0.4 of the Apache XML Security for C++ has been released, correcting support for OpenSSL earlier than 1.1. Version 2.0.3 of the Apache XML Security for C++ has been released, adding support for OpenSSL 3.0.0. Drop patch (already in version) and so autoreconf https://santuario.apache.org/cindex.html Signed-off-by: Fabrice Fontaine --- ...ariable-cache-option-for-getcwd-test.patch | 50 ------------------- package/xml-security-c/xml-security-c.hash | 4 +- package/xml-security-c/xml-security-c.mk | 5 +- 3 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch diff --git a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch b/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch deleted file mode 100644 index 26b53ba719..0000000000 --- a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9d14fad412a497fe83cfc6ab594ddc612512f02a Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Thu, 4 Jun 2020 20:34:11 -0500 -Subject: [PATCH] autoconf variable cache option for getcwd test - -The cached variable allows cross compiled builds to successfully set the -desired default for this value without invoking a test. - -Fixes: -https://issues.apache.org/jira/browse/SANTUARIO-549 - -Signed-off-by: Matthew Weber ---- - configure.ac | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b43d7a5..c3d4489 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,14 +74,18 @@ AC_CHECK_FUNCS([strcasecmp]) - - # Check whether getcwd can dynamically allocate memory. - AC_MSG_CHECKING([whether getcwd(NULL, 0) works]) --AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -- #include ], --[char *cwd = getcwd(NULL, 0); --return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])], -- [AC_MSG_RESULT(yes) -- AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], -- [Define to 1 if getcwd(NULL, 0) works])], -- [AC_MSG_RESULT(no)]) -+AC_CACHE_VAL([xml_cv_func_getcwd_null], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include -+ #include -+ char *cwd = getcwd(NULL, 0); -+ return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;]])], -+ [xml_cv_func_getcwd_null=yes], -+ [xml_cv_func_getcwd_null=no])]) -+AC_MSG_RESULT([$xml_cv_func_getcwd_null]) -+if test $xml_cv_func_getcwd_null = yes; then -+AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], -+ [Define to 1 if getcwd(NULL, 0) works]) -+fi - - AC_LANG(C++) - --- -2.17.1 - diff --git a/package/xml-security-c/xml-security-c.hash b/package/xml-security-c/xml-security-c.hash index d91ed86e9c..f4b7041a63 100644 --- a/package/xml-security-c/xml-security-c.hash +++ b/package/xml-security-c/xml-security-c.hash @@ -1,3 +1,3 @@ -# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.2.tar.gz.sha256 -sha256 c303a2b08cb9ca0f5594adcbb83829b1e793175d7114a82f7d78def8bb2e30df xml-security-c-2.0.2.tar.gz +# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.4.tar.gz.sha256 +sha256 a78da6720f6c2ba14100d2426131e0d33eac5a2dba5cc11bdd04974b7eb89003 xml-security-c-2.0.4.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/xml-security-c/xml-security-c.mk b/package/xml-security-c/xml-security-c.mk index fe761819ee..fda9af4798 100644 --- a/package/xml-security-c/xml-security-c.mk +++ b/package/xml-security-c/xml-security-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -XML_SECURITY_C_VERSION = 2.0.2 +XML_SECURITY_C_VERSION = 2.0.4 XML_SECURITY_C_SITE = http://archive.apache.org/dist/santuario/c-library XML_SECURITY_C_LICENSE = Apache-2.0 XML_SECURITY_C_LICENSE_FILES = LICENSE.txt @@ -15,7 +15,4 @@ XML_SECURITY_C_CONF_ENV = \ xml_cv_func_getcwd_null=yes \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -# Patched configure.ac -XML_SECURITY_C_AUTORECONF = YES - $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 21:29:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 22:29:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/libev: bump to version 4.33 Message-ID: <20220123212916.782418-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/xorangekiller/libev-git/blob/rel-4_33/Changes Signed-off-by: Fabrice Fontaine --- package/libev/libev.hash | 4 ++-- package/libev/libev.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libev/libev.hash b/package/libev/libev.hash index 9ab341dedd..a849f3f39a 100644 --- a/package/libev/libev.hash +++ b/package/libev/libev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e libev-4.27.tar.gz -sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE +sha256 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea libev-4.33.tar.gz +sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 38b0530f62..9f3c19d46c 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEV_VERSION = 4.27 +LIBEV_VERSION = 4.33 LIBEV_SITE = http://dist.schmorp.de/libev/Attic LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 21:45:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 22:45:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/vte: needs gcc >= 10 Message-ID: <20220123214548.783629-1-fontaine.fabrice@gmail.com> vte needs C++20 since https://gitlab.gnome.org/GNOME/vte/-/commit/eec33cce0b9359fddda35703e22bffd1f8f28852 to avoid the following build failure raised since bump to version 0.66.2 in commit 53c0c7dd01228122c7ceb44d65f2800dbcf473f1: ../output-1/build/vte-0.66.2/meson.build:144:0: ERROR: Assert failed: option -std=gnu++20 not supported by gcc Fixes: - http://autobuild.buildroot.org/results/c0d1adeffbf97805a0f669d01929a56ccc66a835 Signed-off-by: Fabrice Fontaine --- package/vte/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vte/Config.in b/package/vte/Config.in index 2635a6007c..45d627885f 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_VTE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ @@ -22,13 +22,13 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte -comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 10" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ BR2_TOOLCHAIN_USES_MUSL comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Jan 23 22:01:15 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 23 Jan 2022 23:01:15 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: <20220122151130.59ae7148@windsurf> References: <20220117080616.10563-1-heiko.thiery@gmail.com> <20220122151130.59ae7148@windsurf> Message-ID: Hi Thomas, On 22/01/22 15:11, Thomas Petazzoni wrote: > On Mon, 17 Jan 2022 09:06:16 +0100 > Heiko Thiery wrote: > >> Signed-off-by: Heiko Thiery >> --- >> board/kontron/pitx-imx8m/boot.cmd | 8 -------- >> board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ >> board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- >> board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- >> board/kontron/pitx-imx8m/post-image.sh | 2 +- >> configs/kontron_pitx_imx8m_defconfig | 3 +-- >> 6 files changed, 14 insertions(+), 15 deletions(-) >> delete mode 100644 board/kontron/pitx-imx8m/boot.cmd >> create mode 100644 board/kontron/pitx-imx8m/extlinux.conf > > I have applied, but I am a bit worried about things are going on with > this switch to extlinux.conf. > > Indeed, we have: > > * Platforms where the UUID is hardcoded into genimage.cfg and > extlinux.conf, such as board/beaglev/ > > * We have platforms where a "uuid" variable in filled in U-Boot before > triggering the extlinux.conf logic, and therefore extlinux.conf uses > root=PARTUUID=${uuid}. For example > board/freescale/imx7dsdb/rootfs_overlay/boot/extlinux/extlinux.conf, > board/orangepi/orangepi-zero/boot.cmd, > board/solidrun/mx6cubox/rootfs_overlay/boot/extlinux/extlinux.conf, > board/technexion/imx6ulpico/rootfs_overlay/boot/extlinux/extlinux.conf, > and a few others. > > * We now have platforms (kontron/smarc-sal28 and kontron/pitx-imx8m) > where a random UUID is generated in the post-build script, and used > in genimage and extlinux.conf. > > I'm not sure where we want to go, and how much we want to enforce "best > practices" that are common on all platforms, or just let each platform > do its little business. IMHO the worst drawback I see while using extlinux.conf VS boot.scr is the missing checksum. Especially on embedded systems we deeply treat. Not having such checksum can make system booting without a parameter on linux command line for example, only because 1 ASCII has been corrupted. I prefer the system to not boot at all in general instead of having it "working" while hiding some potential problem. What do you and All think about this? Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sun Jan 23 22:07:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 23:07:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytz: bump to version 2021.3 Message-ID: <20220123220731.787537-1-fontaine.fabrice@gmail.com> - Update hash of LICENSE.txt (year updated) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/python-pytz/python-pytz.hash | 6 +++--- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index d1ce81e590..e0f253902c 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 c3d84a465fc56a4edd52cca8873ac0df pytz-2019.3.tar.gz -sha256 b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be pytz-2019.3.tar.gz +md5 d7b7060bbac4970afa2050c139c9fcb6 pytz-2021.3.tar.gz +sha256 acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 pytz-2021.3.tar.gz # Locally computed sha256 checksums -sha256 39f07c72a1bfda349cbd27bac9bcb1e6f8c5b4e5cc3fadf56900406e8cc0b792 LICENSE.txt +sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 888f3c4556..d606750699 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2019.3 +PYTHON_PYTZ_VERSION = 2021.3 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/82/c3/534ddba230bd4fbbd3b7a3d35f3341d014cca213f369a9940925e7e5f691 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 22:14:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 23:14:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyftpdlib: bump to version 1.5.6 Message-ID: <20220123221402.787958-1-fontaine.fabrice@gmail.com> - Update hash of LICENSE file (license updated to make it recognizable by github: https://github.com/giampaolo/pyftpdlib/commit/a3016e7d694c226cae6a2b7672c6c5196124cd7a) - Update indentation in hash file (two spaces) https://github.com/giampaolo/pyftpdlib/blob/release-1.5.6/HISTORY.rst Signed-off-by: Fabrice Fontaine --- package/python-pyftpdlib/python-pyftpdlib.hash | 6 +++--- package/python-pyftpdlib/python-pyftpdlib.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index 7f8da95550..abbb1261b2 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyftpdlib/json -md5 7f8089520d60171bee5dab2b721e8d00 pyftpdlib-1.5.5.tar.gz -sha256 1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752 pyftpdlib-1.5.5.tar.gz +md5 459dd3e685c4b7dfcf574ca05e5586eb pyftpdlib-1.5.6.tar.gz +sha256 fda655d81f29af52885ca2f8a2704134baed540f16d66a0b26e8fdfafd12db5e pyftpdlib-1.5.6.tar.gz # Locally computed sha256 checksums -sha256 18a4ff1ddf890838e36504b307581e3eb42c890a7272ce28b18b3ce1205b7ea8 LICENSE +sha256 67a832551570a5ac5f7901eaa5ece4b9491fda7f2d8c93957c3bbc68a5a76d88 LICENSE diff --git a/package/python-pyftpdlib/python-pyftpdlib.mk b/package/python-pyftpdlib/python-pyftpdlib.mk index dbbb9e2842..931e2dad06 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.5 +PYTHON_PYFTPDLIB_VERSION = 1.5.6 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/27/64/06a574350c79873e908fa9f48b617e7961de50fc468acc0a05d76771bce9 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/31/61/63ef60aca6de07eba1639d9d47f3f8e29462e8bb49d6a8dce9aeff240646 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Jan 23 22:21:50 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 23 Jan 2022 23:21:50 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <164267096542.4497.13116457792635384701@kwain> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> <20220120084804.429f1d54@bootlin.com> <164267096542.4497.13116457792635384701@kwain> Message-ID: <2d19c071-3859-25db-0966-2fd8ca3d845f@benettiengineering.com> Hi Antoine, Maxime, Thomas, All, On 20/01/22 10:29, Antoine Tenart wrote: > Quoting Maxime Chevallier (2022-01-20 08:48:04) >> On Wed, 19 Jan 2022 23:39:44 +0100 >> Thomas Petazzoni wrote: >>> On Wed, 19 Jan 2022 23:23:32 +0100 >>> Giulio Benetti wrote: >>> >>>> +config BR2_REFPOLICY_DISABLE_DONTAUDIT >>>> + bool "Disable dontaudit" >>> >>> I am still extremely confused by the name of option, with its double >>> negative. >>> >>> When enabled, this option will disable something that doesn't audit. >>> Meh. >> >> I agree about the confusing double-negative, but it follows the SELinux >> terminology from the rules syntax. My personal view is that the "make >> enableaudit" target is a bit confusing already :) > > Agreed. > >>> Is it possible to find a better name / description that doesn't make >>> one's brain segfault when trying to understand what it does ? >> >> Maybe we can think of an option name like >> "BR2_REFPOLICY_VERBOSE_DONTAUDIT", suggesting that we're not silencing >> these 'dontaudit' rules anymore ? The only actual effect is what gets >> printed in the AVC logs. >> >>> The make target that gets triggered is "enableaudit". Would it make >>> sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? >> >> The more I think about that, the more I think that using >> "enable/disable" here is misleading, the behaviour stays the same with >> regard to what gets denied/allow, only the logs are going to change. > > I would suggest using BR2_PACKAGE_REFPOLICY_WITH_DONTAUDIT, defaulting > to y (using _WITHOUT_ would be less clear IMHO). > > And in Kconfig something along the lines: > > bool "Build with dontaudit rules" > default y > help > The refpolicy comes with 'dontaudit' rules suppressing audit logs > for known and expected violations of the policy. These rules are > enabled by default. Building without the 'dontaudit' rules will lead > in more denied actions being logged, which can be useful for > debugging purposes. Note that running 'semodules -DB' from a running > system will have the same effect. > > Say y if unsure. > > (Please check the semodules part, never tried it). > > WDYT? Re-reading this after some day it looks to me like the simple BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all dontaudit rules from policy.conf", so it's true that it enables audit logs in the end. It's a very specific options and the one who will use it will know what he will enable and most of all we can specify in the help section that: "Removes all dontaudit rules from policy.conf" It changes the perspective we are looking at it, but in the end, it "Removes all dontaudit rules from policy.conf" and subsequentially this leads to show the audits logs. So it enables audits. Does it work for you? Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sun Jan 23 22:24:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 23:24:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pathlib2: bump to version 2.3.6 Message-ID: <20220123222405.789637-1-fontaine.fabrice@gmail.com> - Update hash of LICENSE.rst (LF replaced by CRLF) - Update indentation in hash file (two spaces) https://github.com/jazzband/pathlib2/blob/2.3.6/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- package/python-pathlib2/python-pathlib2.hash | 6 +++--- package/python-pathlib2/python-pathlib2.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash index 986049d9de..ebd197b62e 100644 --- a/package/python-pathlib2/python-pathlib2.hash +++ b/package/python-pathlib2/python-pathlib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 f2bd0a363eb0f8fa0556f35c1d9e66fb pathlib2-2.3.5.tar.gz -sha256 6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868 pathlib2-2.3.5.tar.gz +md5 e50a0cf94e406c5110b3aed535626e9e pathlib2-2.3.6.tar.gz +sha256 7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f pathlib2-2.3.6.tar.gz # Locally computed sha256 checksums -sha256 f8e02f1a07e4c6fc59a4bee831ddde26b97064105c423b9e24340f35aaa80262 LICENSE.rst +sha256 861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6 LICENSE.rst diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk index d813b77d7e..4bcfea78fb 100644 --- a/package/python-pathlib2/python-pathlib2.mk +++ b/package/python-pathlib2/python-pathlib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHLIB2_VERSION = 2.3.5 +PYTHON_PATHLIB2_VERSION = 2.3.6 PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/94/d8/65c86584e7e97ef824a1845c72bbe95d79f5b306364fa778a3c3e401b309 +PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/df/16/e9d6bcf1aed52a55bc1696324ab22586716053b3e97b85266e0f3ad36bae PYTHON_PATHLIB2_LICENSE = MIT PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst PYTHON_PATHLIB2_SETUP_TYPE = setuptools -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 22:37:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 23:37:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-itsdangerous: bump to version 2.0.1 Message-ID: <20220123223725.790209-1-fontaine.fabrice@gmail.com> - python 2 support has been dropped since version 2.0.0 and https://github.com/pallets/itsdangerous/commit/e085f3eedf94fe42391aaa9fc349927f8feaa367 - Update hash of license file (license standardized: https://github.com/pallets/itsdangerous/commit/c880f85ccdaee29adab8b47ad79eb7bdec507b57) - Update indentation in hash file (two spaces) https://itsdangerous.palletsprojects.com/en/2.0.x/changes/#version-2-0-1 Signed-off-by: Fabrice Fontaine --- package/python-itsdangerous/Config.in | 4 ++-- package/python-itsdangerous/python-itsdangerous.hash | 8 +++++--- package/python-itsdangerous/python-itsdangerous.mk | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in index 39ec0b7725..72aa9165f8 100644 --- a/package/python-itsdangerous/Config.in +++ b/package/python-itsdangerous/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_ITSDANGEROUS bool "python-itsdangerous" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Itsdangerous contains various helpers to pass data to untrusted environments and to get it back safe and sound. diff --git a/package/python-itsdangerous/python-itsdangerous.hash b/package/python-itsdangerous/python-itsdangerous.hash index 0904a91183..dad4ec0800 100644 --- a/package/python-itsdangerous/python-itsdangerous.hash +++ b/package/python-itsdangerous/python-itsdangerous.hash @@ -1,4 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/itsdangerous/json -md5 9b7f5afa7f1e3acfb7786eeca3d99307 itsdangerous-1.1.0.tar.gz -sha256 321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19 itsdangerous-1.1.0.tar.gz -sha256 feb28bfa348d816b0e7dbaeddf18499ee7e8007c67813db8d6ab37c65e046cd4 LICENSE.rst +md5 996b9763d1b4bd0edd6eb86f0a490629 itsdangerous-2.0.1.tar.gz +sha256 9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 itsdangerous-2.0.1.tar.gz +# Locally computed sha256 checksums +sha256 63af09891b6be8ad1a4252ed43af0f4efba7fc948e228367bed7f3c5ae0b09d7 LICENSE.rst +sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk index 9429233703..c53bc6b9ba 100644 --- a/package/python-itsdangerous/python-itsdangerous.mk +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_ITSDANGEROUS_VERSION = 1.1.0 +PYTHON_ITSDANGEROUS_VERSION = 2.0.1 PYTHON_ITSDANGEROUS_SOURCE = itsdangerous-$(PYTHON_ITSDANGEROUS_VERSION).tar.gz -PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/68/1a/f27de07a8a304ad5fa817bbe383d1238ac4396da447fa11ed937039fa04b +PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/58/66/d6c5859dcac92b442626427a8c7a42322068c5cd5d4a463ce78b93f730b7 PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause -PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst +PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst docs/license.rst $(eval $(python-package)) -- 2.34.1 From bugzilla at busybox.net Sun Jan 23 23:35:49 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 23 Jan 2022 23:35:49 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #4 from Giulio Benetti --- Hi jhiljanen, I've finally managed the problem. When you state: "I don't have BR2_PACKAGE_EFL_EEZE enabled, because I'm using BusyBox init system." means you're not enabling a dynamic /dev management for BusyBox. To do this you have to enable something that is not: BR2_ROOTFS_DEVICE_CREATION_STATIC so for example: BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV This way BR2_PACKAGE_EFL_EEZE will be selectable and efl will build successfully. Here the problem is that efl doesn't really support at the moment the capability to disable eeze, because lot of their modules that depend on eeze don't handle the case of #ifndef HAVE_EEZE/#endif. So the real bug is in efl itself. Here we have 2 ways to go: 1) make efl to depend on BR2_PACKAGE_HAS_UDEV 2) fix efl code and send patches upstream I'm still not sure what to do, I'm going to ask to their Mailing list if they will accept patches through Mailing List by sending with git send-mail(option 2), otherwise I will send a patch for option 1) to Buildroot. Hope this helps Best regards Giulio Benetti -- You are receiving this mail because: You are on the CC list for the bug. From kuzminov.sergey81 at gmail.com Mon Jan 24 05:42:31 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Mon, 24 Jan 2022 08:42:31 +0300 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: References: <20220117080616.10563-1-heiko.thiery@gmail.com> <20220122151130.59ae7148@windsurf> Message-ID: <1dea301e-8425-a1ca-fc69-db338825b19c@gmail.com> Hi All, 24.01.2022 01:01, Giulio Benetti: > IMHO the worst drawback I see while using extlinux.conf VS boot.scr is > the missing checksum. Especially on embedded systems we deeply treat. > Not having such checksum can make system booting without a parameter on > linux command line for example, only because 1 ASCII has been corrupted. > I prefer the system to not boot at all in general instead of having it > "working" while hiding some potential problem. > > What do you and All think about this? IMHO extlinux.conf is more debugging friendly. Boot.scr requires the following command: mkimage -C none -A arm -T script -d boot.cmd boot.scr The mkimage utility (BR2_PACKAGE_HOST_UBOOT_TOOLS) is not on the board, you need to transfer the converted file over the network. Or reconnect the microSD card. From thomas.petazzoni at bootlin.com Mon Jan 24 07:00:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 07:00:32 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-23 Message-ID: <20220124070039.EBC7B60AD6@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-01-23 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 60 | 7 | 0 | 67 | 2021.11.x | 23 | 6 | 0 | 29 | master | 101 | 31 | 0 | 132 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 10 gvfs-1.48.1 | 2 sg3_utils-1.47 | 2 unknown | 2 apcupsd-3.14.14 | 1 bat-0.18.3 | 1 efl-1.26.0 | 1 frr-8.1 | 1 guile-3.0.7 | 1 ksmbd-tools-3.4.3 | 1 kvm-unit-tests-kvm-unit-tes... | 1 pcsc-lite-1.9.5 | 1 poppler-21.12.0 | 1 pulseview-0.4.2 | 1 rtorrent-0.9.8 | 1 ruby-3.1.0 | 1 sslh-1.22c | 1 tinifier-3.4.0 | 1 woff2-1.0.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/63dd67261a134c3225534264292d2d1201f9db17 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/a6c0e895fd2df273785113a6c784c871b7d50d63 | x86_64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/d2daed9def1a1ca90f317a94df8d9e6c439c40f3 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2893c3bb3aeb004318276e8daf4bec4a5ff4ed76 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/ac1cdc7118a04367e1a22c3f3f4daf1ac4579193 | ORPH riscv64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/6231649fac82a70b215186c3396b879a28a96f60 | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/5490963b0ade0fc7c754533d97dd158e3cf7d1e7 | ORPH powerpc64le | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/7ca10984a48b5e1239e40cbca7e585a84f5c8522 | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/b03b46ea2cdd339d563c35c08f32ff10f2b6bf5e | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/d802ffc20232804aa360c117955e19614edf2f02 | ORPH riscv32 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/d2f50aa56410c2fff8a0538c57038104906e747e | xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/dff6f5ac8eb010695992561061ddcd9dab3090c8 | powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/63300c4f20bade0170d89e4ff75705925e1bf638 | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/91c24b5945b33076d70fad168a6cebf095c83d15 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/260bb0e389d4ae23e3141f59c8c2ff4c0b0b0472 | powerpc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d1784e0559d36e7b0ead5e88dfe930cc4aa25373 | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/69bcd929f8e2390b6d482c3cdbf0d3f4d66ce690 | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e28f6d16a1a9e6bd15f9fb921fe4f65ac88ed8dd | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c30a0cf45e61807ae7ebe87bbf9cb777846e4438 | powerpc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/475a7e812258392fb0b8ba055f468106fb1fa752 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/233b3df7dc6d2ea1205b226ece5475a68a9e0ea1 | sparc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ba2cf1a0c0fc533e3ef84a844a098468f4cb7c64 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/452a368197d82a2ad56607937c27b4e69c72be12 | powerpc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/892ad174187018d75acf759be6661a821ab01c28 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/bd371c3bc843056c89b31c2b5e6e95d8ac8677c1 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/019d93ea4f7defad672479adfb2e9f87305d3211 | arm | sslh-1.22c | NOK | http://autobuild.buildroot.net/results/aaaac2beb16730747b4265e81d09cb5e072c7267 | arm | tinifier-3.4.0 | NOK | http://autobuild.buildroot.net/results/a5d3e7b8a858558e03bec05d13706a12ad587690 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/3bcaf9d47c23c4f49a616c1d782e244593ee3194 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/9299286c8104e4b3c15c711fb6c2d096dcab621d | x86_64 | woff2-1.0.2 | NOK | http://autobuild.buildroot.net/results/8825caace7e41320de74005505ce5840b0745fef | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 apcupsd-3.14.14 | 1 gobject-introspection-1.64.1 | 1 openldap-2.4.59 | 1 qt5location-5.15.2 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/11157ce4b09f521cdafe3303095ed6a063cdfdf3 | x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/f45521f486ac8618098b411bf6816a16109e1f5f | ORPH sparc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/ee381989fdeb765dc5c6269f9d835f127e48772b | riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/11804a12660ed04ca7752e601332a62b065e817f | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/9421351bb7f7650c25eb4583d209a440e64d8615 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/63a2e0ec4aefca6cf26fea58b792db9e19634559 | aarch64 | qt5location-5.15.2 | NOK | http://autobuild.buildroot.net/results/1953e641afc11426bba59d6f0bb4574920206863 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 3 ndisc6-1.0.5 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/1bdfe51967bd77a853e1d08caace8cf037e40b23 | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/3233d790fbfbf4bc7b884368a5098746c87d26f1 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/f1b5210517e23dba5d40000438b5f29c5e43ffe5 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/9f84c9d4c35e954a7f88f760fffd988732f16ef9 | ORPH powerpc | unknown | NOK | http://autobuild.buildroot.net/results/cc9223bb6a519d21d0c83dc7b3568822ea06bcc1 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/d50b6604bb9b1e0fb839441a8e39e896099000b8 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- acpica | DISTRO | https://release-monitoring.org/project/00018 | 20200717 | 20211217 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 41.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.3.1 | 4.5.2 | alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.6 | 1.2.6.1 | alsa-plugins | DISTRO | https://release-monitoring.org/project/00041 | 1.2.5 | 1.2.6 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 12.0.0_r27 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.1 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.42.0 | avro-c | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.10 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 19.03.14 | 20.10.11 | ORPH bat | DISTRO | https://release-monitoring.org/project/241901 | 0.18.3 | 0.19.0 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2021.4 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.1 | 2021.4 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.5.0 | bcg729 | DISTRO | https://release-monitoring.org/project/14743 | 1.0.4 | 1.1.1 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.0.66 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.66 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.66 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH bind | DISTRO | https://release-monitoring.org/project/14923 | 9.11.36 | 9.17.22 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.37 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 22.0 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.1.3 | botan | DISTRO | https://release-monitoring.org/project/00214 | 2.18.2 | 2.19.1 | ORPH btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.15.1 | 5.16 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.09 | 3.21 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.34.1 | 1.35.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.7 | 0.5.9 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.4 | 0.5.5 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.4 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.5.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.4.34 | 1.4.36 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.1 | 4.2 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.13 | 6.14 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.17.1 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.4 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.0 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.1 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.8 | 1.5.9 | cryptsetup | DISTRO | https://release-monitoring.org/project/13709 | 2.4.2 | 2.4.3 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.10 | 1.28.11 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.2.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.11.4 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.2.2 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.0.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.25 | 1.26 | debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.6.1 | 1.8.0 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20220117 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.11 | 20.10.12 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.11 | 20.10.12 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 37 | 38 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.0 | 1.26.1 | eigen | DISTRO | https://release-monitoring.org/project/00666 | 3.3.7 | 3.4.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 20.07 | 21.12 | elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.13.2 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.0 | 0.25.1 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.17 | 1.0.21 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-idna | DISTRO | https://release-monitoring.org/project/45374 | 6.0.0 | 6.1.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.9.0 | 1.11.2 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.6.10 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.9 | 1.0.16 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.25 | 1.0.29 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.10 | 1.0.14 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.7 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.6 | 1.0.8 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.38 | 1.0.45 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.23 | 1.0.27 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.39 | 1.2.0 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.9 | 1.1.13 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.20 | 1.0.24 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.44 | 1.1.48 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.4.10 | 1.5.6 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.28 | 1.0.32 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.8 | 1.0.12 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.9 | 1.0.10 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.3 | 1.4 | ethtool | DISTRO | https://release-monitoring.org/project/00763 | 5.15 | 5.16 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.8.0.1 | 2.8.2.0 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.26 | 1.27 | ORPH fatcat | DISTRO | https://release-monitoring.org/project/21349 | 1.1.0 | 1.1.1 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.8 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.24 | 6.4.26 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.1 | 5.0 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.29 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.16.1 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.2 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fluidsynth | DISTRO | https://release-monitoring.org/project/10437 | 2.2.4 | 2.2.5 | fmc | GUESS | https://release-monitoring.org/project/145761 | fsl-sdk-v2.0 | 0.2.0 | fmt | DISTRO | https://release-monitoring.org/project/11526 | 8.0.1 | 8.1.1 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 5.15.4 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.94 | ORPH freeipmi | DISTRO | https://release-monitoring.org/project/00848 | 1.6.8 | 1.6.9 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8.1 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 21.12.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.10 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdk-pixbuf | DISTRO | https://release-monitoring.org/project/09533 | 2.42.4 | 2.42.6 | ORPH gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.2.9 | 2.3.5 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.53.3 | 9.55.0 | git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.34.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.66.0 | 2.70.1 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.70.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.10 | 3.0.14 | gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.2.32 | 2.3.4 | ORPH gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.8.2.0 | 3.10.0.0 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.2 | 3.7.3 | gocryptfs | DISTRO | https://release-monitoring.org/project/21085 | 2.2.0 | 2.2.1 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.7 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grub2 | DISTRO | https://release-monitoring.org/project/01257 | 2.04 | 2.06 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 41.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gst-omx | DISTRO | https://release-monitoring.org/project/21845 | 1.18.5 | 1.19.3 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.5 | 1.19.3 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-interpipe | DISTRO | https://release-monitoring.org/project/21847 | 1.1.7 | 1.1.8 | gst1-libav | DISTRO | https://release-monitoring.org/project/21848 | 1.18.5 | 1.19.3 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.5 | 1.19.3 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.2 | ORPH gtkmm3 | DISTRO | https://release-monitoring.org/project/07963 | 3.22.0 | 4.4.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.2 | 1.4.3 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.49.1 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2018.01.1 | 2021.03.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.4.8 | 2.5.1 | haveged | DISTRO | https://release-monitoring.org/project/11695 | 1.9.15 | 1.9.17 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.11.2 | ORPH hostapd | DISTRO | https://release-monitoring.org/project/01325 | 2.9 | 2.10 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.21.12 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.37 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-19 | 7.1.0-20 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.7.5 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.1.0 | ORPH iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.492 | 3.493 | ipmiutil | DISTRO | https://release-monitoring.org/project/01391 | 3.1.7 | 3.1.8 | iproute2 | DISTRO | https://release-monitoring.org/project/01392 | 5.15.0 | 5.16.0 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | isl | DISTRO | https://release-monitoring.org/project/13286 | 0.23 | 0.24 | ORPH jack1 | DISTRO | https://release-monitoring.org/project/59394 | 0.125.0 | 0.126.0 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.17 | 1.9.20 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.4 | 1.6 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.3 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.10.4 | 1.13.1 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.1 | json-glib | DISTRO | https://release-monitoring.org/project/13144 | 1.4.4 | 1.6.6 | ORPH jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.2.2 | 3.7.1 | keepalived | DISTRO | https://release-monitoring.org/project/01504 | 2.1.4 | 2.2.7 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kismet | DISTRO | https://release-monitoring.org/project/06966 | 2021-08-R1 | 2022-01-R2 | ORPH kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.4.1-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.4-Ma... | 20.2.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.6-Ma... | 20.2.3-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.1.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.3-Ma... | 20.2.2-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.10-M... | 20.2.1-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.2.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.2-Ma... | 20.1.0-Nexus | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 1.2.0 | 2.1.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.25 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.4.0 | 0.6.1 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.4 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 2.0 | libcodec2 | DISTRO | https://release-monitoring.org/project/14605 | 1.0.1 | 1.03 | libev | DISTRO | https://release-monitoring.org/project/01605 | 4.27 | 4.33 | ORPH libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgeos | DISTRO | https://release-monitoring.org/project/13493 | 3.10.1 | 3.10.2 | libgeotiff | DISTRO | https://release-monitoring.org/project/21361 | 1.6.0 | 1.7.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.2 | 3.3.6 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.68.4 | 2.70.2 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.3.2 | 1.4.0 | ORPH libgpg-error | DISTRO | https://release-monitoring.org/project/01628 | 1.42 | 1.43 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.28 | ORPH libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.6.0 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.37 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.13 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.16 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.1 | 0.11.3 | libmhash | DISTRO | https://release-monitoring.org/project/21488 | 0.9.9.9 | 1.4 | ORPH libminiupnpc | DISTRO | https://release-monitoring.org/project/01986 | 2.1.20201016 | 2.2.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.6 | 3.1.7 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.1.5 | 4.2.1 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.10 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 1.1.1m | 3.0.1 | libosmium | DISTRO | https://release-monitoring.org/project/07023 | 2.17.2 | 2.17.3 | libpagekite | DISTRO | https://release-monitoring.org/project/21366 | 0.91.190530 | 0.91.201110 | libpam-radius-auth | DISTRO | https://release-monitoring.org/project/57834 | 1.4.0 | 2.0.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.0 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.5.0 | 1.6.0 | libqb | DISTRO | https://release-monitoring.org/project/09399 | 2.0.3 | 2.0.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.5 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigsegv | DISTRO | https://release-monitoring.org/project/01722 | 2.13 | 2.14 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.0 | 3.0.4 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.1 | 2.4.2 | libss7 | DISTRO | https://release-monitoring.org/project/21690 | 2.0.0 | 2.0.1 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.5 | libuhttpd | DISTRO | https://release-monitoring.org/project/89386 | 3.12.1 | 3.14.1 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.5.0 | 1.6.2 | ORPH libuv | DISTRO | https://release-monitoring.org/project/10784 | 1.42.0 | 1.43.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.1 | libvirt | DISTRO | https://release-monitoring.org/project/224041 | 7.10.0 | 8.0.0 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.0.21 | 4.3.1 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.66 | ORPH live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.01.21 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.9 | 1.0.13 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.12.0 | 0.12.1 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.18.0 | 3.19.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20210927 | 20220121 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.3 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.8 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.3 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.12 | 2.03.14 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.3 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.30 | 10.7.1 | ORPH matchbox-keyboard | DISTRO | https://release-monitoring.org/project/230595 | 0.1 | 0.1.1 | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.0 | 3.1.0 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.4.0 | 0.1.5.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.0.66 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.12 | 1.6.13 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 5.31b | memtester | DISTRO | https://release-monitoring.org/project/01967 | 4.5.0 | 4.5.1 | meson | DISTRO | https://release-monitoring.org/project/06472 | 0.61.0 | 0.61.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.42.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | micropython | DISTRO | https://release-monitoring.org/project/10539 | 1.17 | 1.18 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2021.12 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20190618 | 20210805 | ORPH moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.8.1 | 0.9.3 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.16.10 | 1.18.4 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.11 | 5.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.6 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.30.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.165 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.0 | 2.5.1 | mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.29.3 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.34.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 4.0.3 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.14 | 1.8.19 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtd | DISTRO | https://release-monitoring.org/project/02026 | 2.1.3 | 2.1.4 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.36 | 4.0.37 | mtr | DISTRO | https://release-monitoring.org/project/02029 | 0.94 | 0.95 | ORPH mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.0.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220122 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | debian_1.... | 1.218 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.32.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.6.1 | 0.7.3 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9 | 5.9.1 | ORPH network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.32.12 | 1.34.0 | ORPH network-manager-openvpn | DISTRO | https://release-monitoring.org/project/69977 | 1.8.14 | 1.8.16 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.46.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.5 | nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.3 | 17.4.0 | nss-mdns | DISTRO | https://release-monitoring.org/project/05491 | 0.14.1 | 0.15.1 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.132 | 390.147 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 510.39.01 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 1.16 | ORPH ocf-linux | DISTRO | https://release-monitoring.org/project/21541 | 20120127 | 20171122 | ORPH ocrad | DISTRO | https://release-monitoring.org/project/02526 | 0.27 | 0.28 | ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.31 | 1.34 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.2.4 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.3 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.19 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.5.5 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.7.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.13+8 | 19+6 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.11.0 | 6.12.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.2 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.44.10 | opentracing-cpp | DISTRO | https://release-monitoring.org/project/21553 | 1.5.1 | 1.6.0 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 10.3.5-10... | 11.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.5.0 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.28 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.0.66 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.5.1 | 1.5.2 | p11-kit | DISTRO | https://release-monitoring.org/project/02582 | 0.23.22 | 0.24.1 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.0 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH parted | DISTRO | https://release-monitoring.org/project/02596 | 3.3 | 3.4 | patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.9 | 0.14.3 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.3 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202112 | ORPH perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-guess | DISTRO | https://release-monitoring.org/project/17375 | 0.12 | 0.14 | perl-crypt-openssl-rsa | DISTRO | https://release-monitoring.org/project/02748 | 0.31 | 0.32 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-gd | DISTRO | https://release-monitoring.org/project/12660 | 2.73 | 2.74 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.60 | 6.61 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20200907 | perl-net-http | DISTRO | https://release-monitoring.org/project/03152 | 6.21 | 6.22 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.85 | 1.92 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0207 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.0.14 | 8.1.2 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.21 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-imagick | DISTRO | https://release-monitoring.org/project/17401 | 3.5.0 | 3.7.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.1.2 | php-yaml | DISTRO | https://release-monitoring.org/project/12515 | 2.2.1 | 2.2.2 | ORPH pigpio | DISTRO | https://release-monitoring.org/project/21577 | 79 | 7301 | pigz | DISTRO | https://release-monitoring.org/project/03642 | 2.6 | 2.7 | pinentry | DISTRO | https://release-monitoring.org/project/03643 | 1.1.1 | 1.2.0 | ORPH pkcs11-helper | DISTRO | https://release-monitoring.org/project/91990 | 1.27 | 1.28 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.8.0 | ORPH poco | DISTRO | https://release-monitoring.org/project/05418 | 1.10.1 | 1.11.1 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.01.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.8 | 1.3.9 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.14 | proftpd | DISTRO | https://release-monitoring.org/project/07609 | 1.3.6e | 1.3.7c | proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 8.2.1 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.3 | protozero | DISTRO | https://release-monitoring.org/project/08002 | 1.7.0 | 1.7.1 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.15 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 14.2 | 15.0 | python-aenum | DISTRO | https://release-monitoring.org/project/34074 | 3.1.0 | 3.1.8 | python-aioblescan | DISTRO | https://release-monitoring.org/project/21242 | 0.2.8 | 0.2.12 | python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.1 | 0.4.3 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiojobs | DISTRO | https://release-monitoring.org/project/21252 | 0.3.0 | 1.0.0 | python-aiorwlock | DISTRO | https://release-monitoring.org/project/21254 | 1.2.0 | 1.3.0 | python-alsaaudio | DISTRO | https://release-monitoring.org/project/10072 | 0.8.4 | 0.9.0 | python-argon2-cffi | DISTRO | https://release-monitoring.org/project/33377 | 21.1.0 | 21.3.0 | python-arrow | DISTRO | https://release-monitoring.org/project/05314 | 1.2.0 | 1.2.1 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.5.0 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 21.2.0 | 21.4.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 21.3.1 | 21.11.1 | python-avro | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | python-bidict | DISTRO | https://release-monitoring.org/project/114352 | 0.21.3 | 0.21.4 | python-bleak | DISTRO | https://release-monitoring.org/project/26271 | 0.12.1 | 0.14.1 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.41 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.41 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2021.5.30 | 2021.10.8 | python-channels | DISTRO | https://release-monitoring.org/project/21937 | 2.3.1 | 3.0.4 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 2.4.1 | 3.3.1 | python-charset-normalizer | DISTRO | https://release-monitoring.org/project/55366 | 2.0.7 | 2.0.10 | python-cheroot | DISTRO | https://release-monitoring.org/project/20163 | 8.2.1 | 8.6.0 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 12.0.1 | 18.6.1 | python-click | DISTRO | https://release-monitoring.org/project/03802 | 7.1.2 | 8.0.3 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.4.1 | 6.6.0 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 1.0.2 | 2.3.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python-daemon | DISTRO | https://release-monitoring.org/project/03816 | 2.2.3 | 2.3.0 | python-daphne | DISTRO | https://release-monitoring.org/project/21939 | 2.4.1 | 3.0.2 | python-dataproperty | DISTRO | https://release-monitoring.org/project/21697 | 0.53.0 | 0.54.2 | python-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog | DISTRO | https://release-monitoring.org/project/03823 | 3.4.0 | 3.5.3 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 3.2.11 | 4.0.1 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.1.0 | 2.2.0 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 4.1.0 | 5.0.3 | python-docutils | DISTRO | https://release-monitoring.org/project/03849 | 0.15.2 | 0.18.1 | python-ecdsa | DISTRO | https://release-monitoring.org/project/08370 | 0.17.0 | 0.18.0b2 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.2.1 | 4.3.1 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.4.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.2 | python-flask-expects-json | DISTRO | https://release-monitoring.org/project/127659 | 1.5.0 | 1.7.0 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 0.3.1 | 2.1.0 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 2.4.1 | 2.5.1 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 0.15.1 | 1.0.0 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.28.2 | 4.28.5 | python-frozenlist | DISTRO | https://release-monitoring.org/project/41138 | 1.2.0 | 1.3.0 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.26 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.9 | python-greenlet | DISTRO | https://release-monitoring.org/project/06870 | 1.1.2 | 2.0.0a1 | python-httplib2 | DISTRO | https://release-monitoring.org/project/03887 | 0.19.1 | 0.20.2 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.13.1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.2 | 3.3 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.28.0 | 8.0.1 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 1.1.0 | 2.0.1 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-janus | DISTRO | https://release-monitoring.org/project/56567 | 0.6.1 | 1.0.0 | python-jaraco-classes | DISTRO | https://release-monitoring.org/project/20150 | 2.0 | 3.2.1 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 2.0 | 3.5.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.0.2 | 3.0.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 2.5.1 | 4.4.0 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 19.2.0 | 23.5.0 | python-kiwisolver | DISTRO | https://release-monitoring.org/project/16910 | 1.1.0 | 1.3.2 | python-lmdb | DISTRO | https://release-monitoring.org/project/15512 | 1.2.1 | 1.3.0 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.6.5 | 4.7.1 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.1.5 | 1.1.6 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.3.4 | 3.3.6 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.1 | 2.4.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.5.1 | python-memory-profiler | DISTRO | https://release-monitoring.org/project/38508 | 0.58.0 | 0.60.0 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 0.8.4 | 2.0.2 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 8.10.0 | 8.12.0 | python-mpd2 | DISTRO | https://release-monitoring.org/project/19721 | 3.0.4 | 3.0.5 | python-msgfy | DISTRO | https://release-monitoring.org/project/29716 | 0.1.0 | 0.2.0 | python-msgpack | DISTRO | https://release-monitoring.org/project/21831 | 1.0.2 | 1.0.3 | python-multidict | DISTRO | https://release-monitoring.org/project/11132 | 5.2.0 | 6.0.0 | python-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-nfc | DISTRO | https://release-monitoring.org/project/21829 | 0.13.5 | 1.0.3 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.1 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 0.8.4 | 0.98.9 | python-paho-mqtt | DISTRO | https://release-monitoring.org/project/06084 | 1.4.0 | 1.6.1 | python-pam | DISTRO | https://release-monitoring.org/project/05725 | 0.5.0 | 1.8.4 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | python-pathlib2 | DISTRO | https://release-monitoring.org/project/12723 | 2.3.5 | 2.3.6 | python-pathpy | DISTRO | https://release-monitoring.org/project/21703 | 12.0.1 | 12.5.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.6.0 | 5.8.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 8.4.0 | 9.0.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 21.3.1 | python-portend | DISTRO | https://release-monitoring.org/project/20203 | 2.5 | 3.1.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.20 | 3.0.24 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.3 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python-psycopg2 | DISTRO | https://release-monitoring.org/project/03979 | 2.9.1 | 2.9.3 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2021.1 | 2022.1 | python-py | DISTRO | https://release-monitoring.org/project/03981 | 1.10.0 | 1.11.0 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.13.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0a2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.5 | 1.5.6 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.7.4 | 2.11.2 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.2 | 2.0.3 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 1.9.7 | 2.8 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.19.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 2.2.0 | 2.5.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.18.14 | 1.19.4 | python-pynacl | DISTRO | https://release-monitoring.org/project/12703 | 1.4.0 | 1.5.0 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 19.1.0 | 21.0.0 | python-pyparsing | DISTRO | https://release-monitoring.org/project/03756 | 3.0.6 | 3.0.7 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.11.6 | 3.11.7 | python-pyphen | DISTRO | https://release-monitoring.org/project/19681 | 0.11.0 | 0.12.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.7 | 5.15.6 | python-pyro | DISTRO | https://release-monitoring.org/project/19993 | 3.16 | 4.82 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.5 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.1 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.17.2 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2019.3 | 2021.3 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | python-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 19.0.2 | 22.3.0 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 3.5.3 | 4.1.1 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.26.0 | 2.27.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.1 | python-rsa | DISTRO | https://release-monitoring.org/project/08808 | 4.7.2 | 4.8 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.3 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 18.1.0 | 21.1.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 44.0.0 | 60.5.0 | python-setuptools-scm | DISTRO | https://release-monitoring.org/project/07874 | 6.3.2 | 6.4.2 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.17.5 | 3.17.6 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 0.45.2 | 1.3.0 | python-singledispatch | DISTRO | https://release-monitoring.org/project/12013 | 3.4.0.3 | 3.7.0 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.18 | 5.0.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 4.0.0 | 5.0.0 | python-snappy | DISTRO | https://release-monitoring.org/project/07203 | 0.5.4 | 0.6.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.1 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.2.1 | 2.3.1 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.3.10 | 1.4.31 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.2.0 | 1.2.1 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.3.0 | 0.4.2 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 1.14.1 | 5.0.0 | python-terminaltables | DISTRO | https://release-monitoring.org/project/15542 | 3.1.0 | 3.1.10 | python-thrift | DISTRO | https://release-monitoring.org/project/21614 | 0.13.0 | 0.15.0 | python-tinycss2 | DISTRO | https://release-monitoring.org/project/16655 | 1.1.0 | 1.1.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.1 | 1.1.3 | python-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.0 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.0.4 | 6.1 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.40.1 | 4.62.3 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.1.0 | 5.1.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 20.3.0 | 21.5.0 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 20.3.0 | 21.7.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.0.1 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 4.2.0 | 5.1.0 | python-unittest-xml-reporting | DISTRO | https://release-monitoring.org/project/72281 | 3.0.4 | 3.2.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.7 | 1.26.8 | python-validators | DISTRO | https://release-monitoring.org/project/19818 | 0.15.0 | 0.18.2 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.1.9 | 0.2.5 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 53.4 | 54.0b1 | python-webpy | DISTRO | https://release-monitoring.org/project/04090 | 0.40 | 0.62 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 0.58.0 | 1.2.3 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.2 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.12.1 | 1.13.3 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 2.3.3 | 3.0.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.27 | 0.31 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.1 | 3.0.2 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.1 | python3 | DISTRO | https://release-monitoring.org/project/13254 | 3.10.1 | 3.10.2 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.13.0 | python3-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 59.8.0 | 60.5.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt53d | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5base | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5charts | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5connectivity | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5declarative | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5graphicaleffects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5imageformats | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5location | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5lottie | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5multimedia | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols2 | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quicktimeline | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5remoteobjects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5script | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5scxml | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5sensors | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialbus | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialport | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5svg | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5tools | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5virtualkeyboard | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5wayland | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webchannel | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.212.0-a... | 6.2.2 | qt5websockets | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webview | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5x11extras | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5xmlpatterns | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.1 | 1.2 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-server | DISTRO | https://release-monitoring.org/project/05585 | 3.8.2 | 3.9.13 | ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.4 | 1.10.5 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.27.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2112.0 | rtai | DISTRO | https://release-monitoring.org/project/21658 | 4.0.1 | 5.3 | ORPH rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.0.0 | runc | DISTRO | https://release-monitoring.org/project/07462 | 1.0.3 | 1.1.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.58.1 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.58.1 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.10.0.3 | 2.11.0.1 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.1 | 2.3.5.3 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.6.3 | 1.0.7.1 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.5.1.5 | 2.5.1.7 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.4.1.1 | 2.5.1.0 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.3.2 | 2.2.3.4 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.2.2 | 0.5.3.0 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.3 | 4.15.4 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.0.32 | 1.1.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.3.0 | sdl2 | DISTRO | https://release-monitoring.org/project/04779 | 2.0.18 | 2.0.20 | sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.0.15 | 2.0.18 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | sedutil | DISTRO | https://release-monitoring.org/project/15203 | 1.15.1 | 1.20.0 | sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 1.59.0 | 1.72.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.13 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.4 | 4.3.5 | sg3_utils | DISTRO | https://release-monitoring.org/project/04801 | 1.47 | 1.47r915 | shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.1 | ORPH skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.10.0.3 | 2.11.1.0 | sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.4.7 | 1.4.10 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.2 | 3.4.8 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.18.0 | 3.1.20.0 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | speexdsp | DISTRO | https://release-monitoring.org/project/08419 | SpeexDSP-... | 1.2.0 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.1 | 3.37.2 | sshfs | DISTRO | https://release-monitoring.org/project/11058 | 3.7.1 | 3.7.2 | ORPH start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.1 | ORPH startup-notification | DISTRO | https://release-monitoring.org/project/10089 | 0.9 | 0.12 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.4 | 1.0.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.62 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.4 | ORPH synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.23.1 | 0.28.0 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.34.1 | 3.35.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.42.1 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.4.2 | 12.5.5 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.01 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.4.6 | 2.4.8 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.15.0 | ORPH tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.2a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 2.4.0 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | trace-cmd... | 2.9.4 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.1 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2022.01 | udpcast | DISTRO | https://release-monitoring.org/project/10206 | 20200328 | 20211207 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.10 | 0.11 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 3.15.0.0 | 4.1.0.5 | umtprd | DISTRO | https://release-monitoring.org/project/46129 | 1.3.10 | 1.6.2 | unclutter-xfixes | DISTRO | https://release-monitoring.org/project/09206 | 1.5 | 1.6 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 2.2 | upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | uvw | DISTRO | https://release-monitoring.org/project/33083 | 2.10.0_li... | 2.11.0_li... | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.55.1 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4092 | 8.2.4186 | ORPH vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.22 | 3.2.29 | waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.6.1 | 1.7.0 | wayland | DISTRO | https://release-monitoring.org/project/10061 | 1.19.0 | 1.20.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.23 | 1.24 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.32.4 | 2.34.4 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.1 | 1.2.2 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.10 | 5.5.11 | wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 7.0 | wireguard-linux-compat | DISTRO | https://release-monitoring.org/project/62379 | 1.0.20210606 | 1.0.20211208 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.2 | 0.4.7 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.11 | 3.6.1 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.0 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.1.1 | wpa_supplicant | DISTRO | https://release-monitoring.org/project/05146 | 2.9 | 2.10 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.3 | 2.35.1 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20220111 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 21.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.3 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xml-security-c | DISTRO | https://release-monitoring.org/project/05197 | 2.0.2 | 2.0.4 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 5.45 | 6.02 | xserver_xorg-server | DISTRO | https://release-monitoring.org/project/05250 | 21.1.2 | 21.1.3 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.17 | 3.18 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.0 | 0.3.1 | yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | zstd | DISTRO | https://release-monitoring.org/project/12083 | 1.5.1 | 1.5.2 | zynq-boot-bin | DISTRO | https://release-monitoring.org/project/21623 | 2015.1 | 2021.2 | ORPH Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 clamav | CVE-2022-20698 | https://security-tracker.debian.org/tracker/CVE-2022-20698 containerd | CVE-2021-43816 | https://security-tracker.debian.org/tracker/CVE-2021-43816 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 dnsmasq | CVE-2021-45951 | https://security-tracker.debian.org/tracker/CVE-2021-45951 dnsmasq | CVE-2021-45952 | https://security-tracker.debian.org/tracker/CVE-2021-45952 dnsmasq | CVE-2021-45953 | https://security-tracker.debian.org/tracker/CVE-2021-45953 dnsmasq | CVE-2021-45954 | https://security-tracker.debian.org/tracker/CVE-2021-45954 dnsmasq | CVE-2021-45955 | https://security-tracker.debian.org/tracker/CVE-2021-45955 dnsmasq | CVE-2021-45956 | https://security-tracker.debian.org/tracker/CVE-2021-45956 dnsmasq | CVE-2021-45957 | https://security-tracker.debian.org/tracker/CVE-2021-45957 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libiec61850 | CVE-2021-45769 | https://security-tracker.debian.org/tracker/CVE-2021-45769 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-22815 | https://security-tracker.debian.org/tracker/CVE-2022-22815 python-pillow | CVE-2022-22816 | https://security-tracker.debian.org/tracker/CVE-2022-22816 python-pillow | CVE-2022-22817 | https://security-tracker.debian.org/tracker/CVE-2022-22817 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-22844 | https://security-tracker.debian.org/tracker/CVE-2022-22844 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 bash | CVE-2019-18276 | https://security-tracker.debian.org/tracker/CVE-2019-18276 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-3487 | https://security-tracker.debian.org/tracker/CVE-2021-3487 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bird | CVE-2021-26928 | https://security-tracker.debian.org/tracker/CVE-2021-26928 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2021-42376 | https://security-tracker.debian.org/tracker/CVE-2021-42376 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 civetweb | CVE-2020-27304 | https://security-tracker.debian.org/tracker/CVE-2020-27304 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 clamav | CVE-2022-20698 | https://security-tracker.debian.org/tracker/CVE-2022-20698 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exim | CVE-2021-38371 | https://security-tracker.debian.org/tracker/CVE-2021-38371 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2020-35965 | https://security-tracker.debian.org/tracker/CVE-2020-35965 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 flatbuffers | CVE-2020-35864 | https://security-tracker.debian.org/tracker/CVE-2020-35864 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41157 | https://security-tracker.debian.org/tracker/CVE-2021-41157 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-27645 | https://security-tracker.debian.org/tracker/CVE-2021-27645 glibc | CVE-2021-33574 | https://security-tracker.debian.org/tracker/CVE-2021-33574 glibc | CVE-2021-38604 | https://security-tracker.debian.org/tracker/CVE-2021-38604 glibc | CVE-2022-23218 | https://security-tracker.debian.org/tracker/CVE-2022-23218 glibc | CVE-2022-23219 | https://security-tracker.debian.org/tracker/CVE-2022-23219 gnuchess | CVE-2021-30184 | https://security-tracker.debian.org/tracker/CVE-2021-30184 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 go | CVE-2021-29923 | https://security-tracker.debian.org/tracker/CVE-2021-29923 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2020-6624 | https://security-tracker.debian.org/tracker/CVE-2020-6624 jhead | CVE-2020-6625 | https://security-tracker.debian.org/tracker/CVE-2020-6625 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2021-42917 | https://security-tracker.debian.org/tracker/CVE-2021-42917 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libesmtp | CVE-2019-19977 | https://security-tracker.debian.org/tracker/CVE-2019-19977 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libnss | CVE-2021-43527 | https://security-tracker.debian.org/tracker/CVE-2021-43527 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libressl | CVE-2021-41581 | https://security-tracker.debian.org/tracker/CVE-2021-41581 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 liburiparser | CVE-2021-46141 | https://security-tracker.debian.org/tracker/CVE-2021-46141 liburiparser | CVE-2021-46142 | https://security-tracker.debian.org/tracker/CVE-2021-46142 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 monkey | CVE-2013-1771 | https://security-tracker.debian.org/tracker/CVE-2013-1771 monkey | CVE-2013-2183 | https://security-tracker.debian.org/tracker/CVE-2013-2183 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 mutt | CVE-2021-32055 | https://security-tracker.debian.org/tracker/CVE-2021-32055 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 network-manager | CVE-2021-20297 | https://security-tracker.debian.org/tracker/CVE-2021-20297 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvpn | CVE-2021-3606 | https://security-tracker.debian.org/tracker/CVE-2021-3606 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php-imagick | CVE-2019-11037 | https://security-tracker.debian.org/tracker/CVE-2019-11037 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-autobahn | CVE-2020-35678 | https://security-tracker.debian.org/tracker/CVE-2020-35678 python-cryptography | CVE-2020-36242 | https://security-tracker.debian.org/tracker/CVE-2020-36242 python-django | CVE-2021-45115 | https://security-tracker.debian.org/tracker/CVE-2021-45115 python-django | CVE-2021-45116 | https://security-tracker.debian.org/tracker/CVE-2021-45116 python-django | CVE-2021-45452 | https://security-tracker.debian.org/tracker/CVE-2021-45452 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-22815 | https://security-tracker.debian.org/tracker/CVE-2022-22815 python-pillow | CVE-2022-22816 | https://security-tracker.debian.org/tracker/CVE-2022-22816 python-pillow | CVE-2022-22817 | https://security-tracker.debian.org/tracker/CVE-2022-22817 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2020-35503 | https://security-tracker.debian.org/tracker/CVE-2020-35503 qemu | CVE-2020-35504 | https://security-tracker.debian.org/tracker/CVE-2020-35504 qemu | CVE-2020-35505 | https://security-tracker.debian.org/tracker/CVE-2020-35505 qemu | CVE-2020-35506 | https://security-tracker.debian.org/tracker/CVE-2020-35506 qemu | CVE-2020-35517 | https://security-tracker.debian.org/tracker/CVE-2020-35517 qemu | CVE-2021-20181 | https://security-tracker.debian.org/tracker/CVE-2021-20181 qemu | CVE-2021-20196 | https://security-tracker.debian.org/tracker/CVE-2021-20196 qemu | CVE-2021-20203 | https://security-tracker.debian.org/tracker/CVE-2021-20203 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-20263 | https://security-tracker.debian.org/tracker/CVE-2021-20263 qemu | CVE-2021-3392 | https://security-tracker.debian.org/tracker/CVE-2021-3392 qemu | CVE-2021-3409 | https://security-tracker.debian.org/tracker/CVE-2021-3409 qemu | CVE-2021-3416 | https://security-tracker.debian.org/tracker/CVE-2021-3416 qemu | CVE-2021-3507 | https://security-tracker.debian.org/tracker/CVE-2021-3507 qemu | CVE-2021-3527 | https://security-tracker.debian.org/tracker/CVE-2021-3527 qemu | CVE-2021-3544 | https://security-tracker.debian.org/tracker/CVE-2021-3544 qemu | CVE-2021-3545 | https://security-tracker.debian.org/tracker/CVE-2021-3545 qemu | CVE-2021-3546 | https://security-tracker.debian.org/tracker/CVE-2021-3546 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 qpid-proton | CVE-2016-2166 | https://security-tracker.debian.org/tracker/CVE-2016-2166 qpid-proton | CVE-2016-4467 | https://security-tracker.debian.org/tracker/CVE-2016-4467 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2021-28966 | https://security-tracker.debian.org/tracker/CVE-2021-28966 rust | CVE-2021-29922 | https://security-tracker.debian.org/tracker/CVE-2021-29922 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2021-3156 | https://security-tracker.debian.org/tracker/CVE-2021-3156 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tools | CVE-2021-3565 | https://security-tracker.debian.org/tracker/CVE-2021-3565 uboot-tools | CVE-2021-27097 | https://security-tracker.debian.org/tracker/CVE-2021-27097 uboot-tools | CVE-2021-27138 | https://security-tracker.debian.org/tracker/CVE-2021-27138 util-linux | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 util-linux-libs | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4187 | https://security-tracker.debian.org/tracker/CVE-2021-4187 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 vim | CVE-2022-0128 | https://security-tracker.debian.org/tracker/CVE-2022-0128 vim | CVE-2022-0156 | https://security-tracker.debian.org/tracker/CVE-2022-0156 vim | CVE-2022-0158 | https://security-tracker.debian.org/tracker/CVE-2022-0158 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 webkitgtk | CVE-2021-45481 | https://security-tracker.debian.org/tracker/CVE-2021-45481 webkitgtk | CVE-2021-45482 | https://security-tracker.debian.org/tracker/CVE-2021-45482 webkitgtk | CVE-2021-45483 | https://security-tracker.debian.org/tracker/CVE-2021-45483 wget | CVE-2021-31879 | https://security-tracker.debian.org/tracker/CVE-2021-31879 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wireshark | CVE-2021-4185 | https://security-tracker.debian.org/tracker/CVE-2021-4185 wireshark | CVE-2021-4186 | https://security-tracker.debian.org/tracker/CVE-2021-4186 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 clamav | CVE-2022-20698 | https://security-tracker.debian.org/tracker/CVE-2022-20698 containerd | CVE-2021-43816 | https://security-tracker.debian.org/tracker/CVE-2021-43816 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libiec61850 | CVE-2021-45769 | https://security-tracker.debian.org/tracker/CVE-2021-45769 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 liburiparser | CVE-2021-46141 | https://security-tracker.debian.org/tracker/CVE-2021-46141 liburiparser | CVE-2021-46142 | https://security-tracker.debian.org/tracker/CVE-2021-46142 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-django | CVE-2021-45115 | https://security-tracker.debian.org/tracker/CVE-2021-45115 python-django | CVE-2021-45116 | https://security-tracker.debian.org/tracker/CVE-2021-45116 python-django | CVE-2021-45452 | https://security-tracker.debian.org/tracker/CVE-2021-45452 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-22815 | https://security-tracker.debian.org/tracker/CVE-2022-22815 python-pillow | CVE-2022-22816 | https://security-tracker.debian.org/tracker/CVE-2022-22816 python-pillow | CVE-2022-22817 | https://security-tracker.debian.org/tracker/CVE-2022-22817 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2021-36690 | https://security-tracker.debian.org/tracker/CVE-2021-36690 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-22844 | https://security-tracker.debian.org/tracker/CVE-2022-22844 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4187 | https://security-tracker.debian.org/tracker/CVE-2021-4187 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 vim | CVE-2022-0128 | https://security-tracker.debian.org/tracker/CVE-2022-0128 vim | CVE-2022-0156 | https://security-tracker.debian.org/tracker/CVE-2022-0156 vim | CVE-2022-0158 | https://security-tracker.debian.org/tracker/CVE-2022-0158 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wireshark | CVE-2021-4185 | https://security-tracker.debian.org/tracker/CVE-2021-4185 wireshark | CVE-2021-4186 | https://security-tracker.debian.org/tracker/CVE-2021-4186 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From christian at paral.in Mon Jan 24 07:11:43 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:11:43 -0800 Subject: [Buildroot] [PATCH 1/1] package/batman-adv: bump to version 2021.04 Message-ID: <20220124071143.15869-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/batman-adv/batman-adv.hash | 4 ++-- package/batman-adv/batman-adv.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index f81df11000..2060e3de2e 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -1,7 +1,7 @@ # From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.1/batman-adv-2021.1.tar.gz.sha1 -sha1 27a0dc7cb74b868bc0ab52794ecedd0448f0fb61 batman-adv-2021.1.tar.gz +sha1 80a3e4d763b6bf35db6e561ed9d6775dc874d7c6 batman-adv-2021.4.tar.gz # Hash for license files -sha256 5a989ba580897268373bd516b87b588061f344af773a0f6b038a3d8d2af028a1 batman-adv-2021.0.tar.gz +sha256 cff7a2f160045fd0dbf1f1cd7e35e93bf489e81cb8b9501b3756daa391f3eb1b batman-adv-2021.4.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index e58ac85bef..838f9b1851 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2021.1 +BATMAN_ADV_VERSION = 2021.4 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT -- 2.34.1 From christian at paral.in Mon Jan 24 07:14:53 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:14:53 -0800 Subject: [Buildroot] [PATCH 1/1] package/containerd: security bump to version 1.5.9 Message-ID: <20220124071453.16225-1-christian@paral.in> CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when it is SELinux" Containers launched through containerd?s CRI implementation on Linux systems which use the SELinux security module and containerd versions since v1.5.0 can cause arbitrary files and directories on the host to be relabeled to match the container process label through the use of specially-configured bind mounts in a hostPath volume. This relabeling elevates permissions for the container, granting full read/write access over the affected files and directories. Kubernetes and crictl can both be configured to use containerd?s CRI implementation. https://github.com/advisories/GHSA-mvff-h3cj-wj9c https://github.com/containerd/containerd/releases/tag/v1.5.9 Signed-off-by: Christian Stewart --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index f1a6709554..d5aafe2e70 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790 containerd-1.5.8.tar.gz +sha256 40c9767af3e87f2c36adf2f563f0a8374e80b30bd2b7aa80058c85912406cef4 containerd-1.5.9.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index cd975db274..8976e12f1a 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.8 +CONTAINERD_VERSION = 1.5.9 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE -- 2.34.1 From christian at paral.in Mon Jan 24 07:17:41 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:17:41 -0800 Subject: [Buildroot] [PATCH 1/1] package/delve: bump to version 1.8.0 Message-ID: <20220124071741.22618-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index 3d117813c6..04ea4954cc 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e73f7fc063632268d3bdf53486aeafd98cceb8f86f4af56903dedfebaefe690d delve-1.6.1.tar.gz +sha256 086106a4776fa155bf20c37d27b9caed55255be6359c7f0bda1893d3adbb614e delve-1.8.0.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 6c346552a4..984d90a03c 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.6.1 +DELVE_VERSION = 1.8.0 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE -- 2.34.1 From christian at paral.in Mon Jan 24 07:25:27 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:25:27 -0800 Subject: [Buildroot] [PATCH 1/1] package/delve: support building as host package Message-ID: <20220124072527.29954-1-christian@paral.in> Users may want to debug Go programs using dlv on the host machine. Adds package host-delve and BR2_PACKAGE_HOST_DELVE. Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/delve/Config.in.host | 7 +++++++ package/delve/delve.mk | 5 +++++ 3 files changed, 13 insertions(+) create mode 100644 package/delve/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 20034f6ee0..341e24926b 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/cramfs/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" + source "package/delve/Config.in.host" source "package/dfu-util/Config.in.host" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" diff --git a/package/delve/Config.in.host b/package/delve/Config.in.host new file mode 100644 index 0000000000..243b02f6a2 --- /dev/null +++ b/package/delve/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_DELVE + bool "delve" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + Delve is a debugger for the Go programming language. + + https://github.com/go-delve/delve diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 6c346552a4..9e00934375 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -14,4 +14,9 @@ DELVE_TAGS = cgo DELVE_BUILD_TARGETS = cmd/dlv DELVE_INSTALL_BINS = $(notdir $(DELVE_BUILD_TARGETS)) +HOST_DELVE_TAGS = cgo +HOST_DELVE_BUILD_TARGETS = cmd/dlv +HOST_DELVE_INSTALL_BINS = $(notdir $(HOST_DELVE_BUILD_TARGETS)) + $(eval $(golang-package)) +$(eval $(host-golang-package)) -- 2.34.1 From christian at paral.in Mon Jan 24 07:37:10 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:37:10 -0800 Subject: [Buildroot] [PATCH 1/2] package/docker-engine: bump to version 20.10.12 Message-ID: <20220124073711.44684-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d1323f507d..ec3a242629 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz +sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 45fa7fa53e..2a1239b676 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.11 +DOCKER_ENGINE_VERSION = 20.10.12 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 -- 2.34.1 From christian at paral.in Mon Jan 24 07:37:11 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:37:11 -0800 Subject: [Buildroot] [PATCH 2/2] package/docker-cli: bump to version 20.10.12 In-Reply-To: <20220124073711.44684-1-christian@paral.in> References: <20220124073711.44684-1-christian@paral.in> Message-ID: <20220124073711.44684-2-christian@paral.in> Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index fbcda5753e..f2fe316540 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz +sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 0e35a60d43..d5cca34efc 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.11 +DOCKER_CLI_VERSION = 20.10.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 -- 2.34.1 From christian at paral.in Mon Jan 24 07:40:36 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:40:36 -0800 Subject: [Buildroot] [PATCH 1/1] package/gocryptfs: bump to version 2.2.1 Message-ID: <20220124074036.53636-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index 94487815f5..ae161d1cd8 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 2a00e9a959..8f70dba7c3 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_VERSION = 2.2.1 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE -- 2.34.1 From christian at paral.in Mon Jan 24 07:41:51 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:41:51 -0800 Subject: [Buildroot] [PATCH 1/1] package/gocryptfs: bump to version 2.2.1 Message-ID: <20220124074151.58966-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index 94487815f5..ae161d1cd8 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 2a00e9a959..8f70dba7c3 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_VERSION = 2.2.1 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE -- 2.34.1 From buildroot at heine.tech Mon Jan 24 07:42:58 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 24 Jan 2022 08:42:58 +0100 Subject: [Buildroot] [PATCH] package/fmt: bump to version 8.1.1 Message-ID: <20220124074307.91368-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/fmt/fmt.hash | 2 +- package/fmt/fmt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index e735704023..79956c251b 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a627a56eab9554fc1e5dd9a623d0768583b3a383ff70a4312ba68f94c9d415bf fmt-8.0.1.zip +sha256 23778bad8edba12d76e4075da06db591f3b0e3c6c04928ced4a7282ca3400e5d fmt-8.1.1.zip sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 6ec86de7f3..be7ffb022b 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 8.0.1 +FMT_VERSION = 8.1.1 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception -- 2.25.1 From christian at paral.in Mon Jan 24 07:47:15 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:47:15 -0800 Subject: [Buildroot] [PATCH 1/1] package/delve: support building as host package In-Reply-To: <20220124072527.29954-1-christian@paral.in> References: <20220124072527.29954-1-christian@paral.in> Message-ID: Hi all, On Sun, Jan 23, 2022 at 11:25 PM Christian Stewart wrote: > +++ b/package/delve/Config.in.host > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_HOST_DELVE > + bool "delve" This should be "host delve" - just caught it. Thanks, Christian From christian at paral.in Mon Jan 24 07:48:53 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:48:53 -0800 Subject: [Buildroot] [PATCH 1/1] package/moby-buildkit: support building as host package Message-ID: <20220124074853.77797-1-christian@paral.in> Users may want to use buildkitd and buildkitctl to build images on the host. Adds package host-moby-buildkit and BR2_PACKAGE_HOST_MOBY_BUILDKIT. Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/moby-buildkit/Config.in.host | 8 ++++++++ package/moby-buildkit/moby-buildkit.mk | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 package/moby-buildkit/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 20034f6ee0..3bf6fab2db 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -53,6 +53,7 @@ menu "Host utilities" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" source "package/mkpasswd/Config.in.host" + source "package/moby-buildkit/Config.in.host" source "package/mtd/Config.in.host" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" diff --git a/package/moby-buildkit/Config.in.host b/package/moby-buildkit/Config.in.host new file mode 100644 index 0000000000..a3b18548f8 --- /dev/null +++ b/package/moby-buildkit/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_MOBY_BUILDKIT + bool "host moby-buildkit" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + BuildKit is a toolkit for converting source code to build + artifacts in an efficient expressive and repeatable manner. + + https://github.com/moby/buildkit diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 3f0df351ef..533ce6485a 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -19,4 +19,10 @@ MOBY_BUILDKIT_LDFLAGS = \ MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) +HOST_MOBY_BUILDKIT_TAGS = cgo +HOST_MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd + +HOST_MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(HOST_MOBY_BUILDKIT_BUILD_TARGETS)) + $(eval $(golang-package)) +$(eval $(host-golang-package)) -- 2.34.1 From christian at paral.in Mon Jan 24 08:00:13 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 24 Jan 2022 00:00:13 -0800 Subject: [Buildroot] [PATCH 1/1] package/runc: bump to version 1.1.0 Message-ID: <20220124080013.83231-1-christian@paral.in> Added LGPL-2.1 license specifier: libseccomp is statically-linked. https://github.com/opencontainers/runc/releases/tag/v1.1.0 Signed-off-by: Christian Stewart --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 4ef04132bf..38d9f52510 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0eaf2f6606d72f166a5e7138a8a8d4d8f85d84e43448c08c66a1c93ead17a574 runc-1.0.3.tar.gz +sha256 a8de57edbf0ff741ea798ccdd99ac0e1b79914f552871bd7cd92b0569f200964 runc-1.1.0.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index c4e45a00a9..a40075544e 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUNC_VERSION = 1.0.3 +RUNC_VERSION = 1.1.0 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) -RUNC_LICENSE = Apache-2.0 +RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE RUNC_CPE_ID_VENDOR = linuxfoundation -- 2.34.1 From mf at go-sys.de Mon Jan 24 08:01:07 2022 From: mf at go-sys.de (Michael Fischer) Date: Mon, 24 Jan 2022 09:01:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: bump version to 2.0.20 Message-ID: <20220124080107.4094-1-mf@go-sys.de> Signed-off-by: Michael Fischer --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 9fa95270c3..26b7ce4102 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.0.18.tar.gz.sig -sha256 94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c SDL2-2.0.18.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.20.tar.gz.sig +sha256 c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06 SDL2-2.0.20.tar.gz # Locally calculated -sha256 52d41d0c82507721ca1fd92c20dc2bf9ca531b3a288ef845a8275c550f118804 LICENSE.txt +sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 54eec85f5e..e0a817e249 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.18 +SDL2_VERSION = 2.0.20 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib -- 2.20.1 From wiselord1983 at gmail.com Mon Jan 24 08:03:52 2022 From: wiselord1983 at gmail.com (Uladzimir Bely) Date: Mon, 24 Jan 2022 11:03:52 +0300 Subject: [Buildroot] [PATCH] package/python-mpd2: bump to version 3.0.5 Message-ID: <20220124080352.2116-1-wiselord1983@gmail.com> Signed-off-by: Uladzimir Bely --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index 83487257ee..88dcb28377 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz -sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz +md5 594dff3e53c8eb6f583ba642bc2c1a27 python-mpd2-3.0.5.tar.gz +sha256 6f1bffd93b9a32fc018a9bbf3487505b52e0d757ec34066905c60a912d492384 python-mpd2-3.0.5.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index f357e302fd..bfe382b59e 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.0.4 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 +PYTHON_MPD2_VERSION = 3.0.5 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ed/c2/263621bdbbc37fa1a55fa1a7f66fd601bf08b3f87481e318a3509fb6c4bf PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt -- 2.34.1 From christian at paral.in Mon Jan 24 08:09:30 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 24 Jan 2022 00:09:30 -0800 Subject: [Buildroot] [PATCH 1/1] package/batman-adv: bump to version 2021.04 In-Reply-To: <20220124071143.15869-1-christian@paral.in> References: <20220124071143.15869-1-christian@paral.in> Message-ID: Hi all, On Sun, Jan 23, 2022 at 11:11 PM Christian Stewart wrote: > --- a/package/batman-adv/batman-adv.hash > +++ b/package/batman-adv/batman-adv.hash > @@ -1,7 +1,7 @@ > # From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.1/batman-adv-2021.1.tar.gz.sha1 > -sha1 27a0dc7cb74b868bc0ab52794ecedd0448f0fb61 batman-adv-2021.1.tar.gz > +sha1 80a3e4d763b6bf35db6e561ed9d6775dc874d7c6 batman-adv-2021.4.tar.gz ... comment should read: # From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.4/batman-adv-2021.4.tar.gz.sha1 Thanks, Christian From giulio.benetti at benettiengineering.com Mon Jan 24 08:12:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 09:12:47 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: <1dea301e-8425-a1ca-fc69-db338825b19c@gmail.com> References: <1dea301e-8425-a1ca-fc69-db338825b19c@gmail.com> Message-ID: <2BFF5C08-8E54-4689-894E-0A0BE3D6A71A@benettiengineering.com> > Il giorno 24 gen 2022, alle ore 06:43, Sergey Kuzminov ha scritto: > > ?Hi All, > > 24.01.2022 01:01, Giulio Benetti: >> IMHO the worst drawback I see while using extlinux.conf VS boot.scr is the missing checksum. Especially on embedded systems we deeply treat. >> Not having such checksum can make system booting without a parameter on linux command line for example, only because 1 ASCII has been corrupted. >> I prefer the system to not boot at all in general instead of having it "working" while hiding some potential problem. >> What do you and All think about this? > > IMHO extlinux.conf is more debugging friendly. > > Boot.scr requires the following command: > mkimage -C none -A arm -T script -d boot.cmd boot.scr > > The mkimage utility (BR2_PACKAGE_HOST_UBOOT_TOOLS) is not on the board, you need to transfer the converted file over the network. Or reconnect the microSD card. I agree with this too. I?ve found myself many times blaming because I couldn?t simply modify boot.scr on target and reboot. But I find it still dangerous. Another thing that I don?t find possible to do with extlinux.conf is using uboot scripting possibility that enables you to do lot or things, like fdt-overlay expand and apply, show a bmp instead of having a static splashscreen and so on. I don?t think this is achievable with extlinux.conf These are only my thoughts but I still don?t have a solution honestly. In particular to uniform boards. Best regards Giulio From atenart at kernel.org Mon Jan 24 08:44:02 2022 From: atenart at kernel.org (Antoine Tenart) Date: Mon, 24 Jan 2022 09:44:02 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <2d19c071-3859-25db-0966-2fd8ca3d845f@benettiengineering.com> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> <20220120084804.429f1d54@bootlin.com> <164267096542.4497.13116457792635384701@kwain> <2d19c071-3859-25db-0966-2fd8ca3d845f@benettiengineering.com> Message-ID: <164301384246.4708.15294151281235312059@kwain> Quoting Giulio Benetti (2022-01-23 23:21:50) > > Re-reading this after some day it looks to me like the simple > BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all > dontaudit rules from policy.conf", so it's true that it enables audit > logs in the end. It's a very specific options and the one who will use > it will know what he will enable and most of all we can specify in the > help section that: > "Removes all dontaudit rules from policy.conf" > Does it work for you? As long as the help text is clear enough for the user, either config option name should be acceptable. Using the above is good to have an 1:1 mapping with the target name, at the expense of having the help text not matching it and an unclear option name from the user perspective (it's a bit weird not to enable it, at first). For _WITH_DONTAUDIT_, the opposite is true. I'd say there is no perfect solution, we can either stay close to the refpolicy internals or have the Buildroot specifics more consistent; not sure which is better. Thanks, Antoine From peter at korsgaard.com Mon Jan 24 08:58:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 09:58:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <20211124205607.3021277-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Wed, 24 Nov 2021 22:56:07 +0200") References: <20211124205607.3021277-1-aperez@igalia.com> Message-ID: <87mtjlwlvo.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: Hi, > Update to the the next minor release, which fixes an scrolling issue and > incorporated a patch that can now be removed from Buildroot. Release > notes: > https://wpewebkit.org/release/wpewebkit-2.34.2.html > Signed-off-by: Adrian Perez de Castro What about webkitgtk? It would also be good to move that to the 2.34.x series before we release 2022.02. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Mon Jan 24 08:59:45 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 09:59:45 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <164301384246.4708.15294151281235312059@kwain> References: <164301384246.4708.15294151281235312059@kwain> Message-ID: <0FCF99B5-6DEF-4CEB-9686-033655A6802E@benettiengineering.com> > Il giorno 24 gen 2022, alle ore 09:45, Antoine Tenart ha scritto: > > ?Quoting Giulio Benetti (2022-01-23 23:21:50) >> >> Re-reading this after some day it looks to me like the simple >> BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all >> dontaudit rules from policy.conf", so it's true that it enables audit >> logs in the end. It's a very specific options and the one who will use >> it will know what he will enable and most of all we can specify in the >> help section that: >> "Removes all dontaudit rules from policy.conf" > >> Does it work for you? > > As long as the help text is clear enough for the user, either config > option name should be acceptable. Using the above is good to have an 1:1 > mapping with the target name, at the expense of having the help text not > matching it and an unclear option name from the user perspective (it's a > bit weird not to enable it, at first). For _WITH_DONTAUDIT_, the > opposite is true. I'd say there is no perfect solution, we can either > stay close to the refpolicy internals or have the Buildroot specifics > more consistent; not sure which is better. I?d go for Buildroot consistency since we?re in Buildroot. If someone enables refpolicy package and enables ?Enable audit?, I expect to see audit log. Right? This is me at least that I?ve never used refpolicy so I?m agnostic in the topic, so maybe a neutral ?use case? :-) Best regards Giulio > > Thanks, > Antoine > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From atenart at kernel.org Mon Jan 24 09:06:49 2022 From: atenart at kernel.org (Antoine Tenart) Date: Mon, 24 Jan 2022 10:06:49 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <0FCF99B5-6DEF-4CEB-9686-033655A6802E@benettiengineering.com> References: <164301384246.4708.15294151281235312059@kwain> <0FCF99B5-6DEF-4CEB-9686-033655A6802E@benettiengineering.com> Message-ID: <164301520937.4708.9842501306400984658@kwain> Quoting Giulio Benetti (2022-01-24 09:59:45) > > > Il giorno 24 gen 2022, alle ore 09:45, Antoine Tenart ha scritto: > > > > ?Quoting Giulio Benetti (2022-01-23 23:21:50) > >> > >> Re-reading this after some day it looks to me like the simple > >> BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all > >> dontaudit rules from policy.conf", so it's true that it enables audit > >> logs in the end. It's a very specific options and the one who will use > >> it will know what he will enable and most of all we can specify in the > >> help section that: > >> "Removes all dontaudit rules from policy.conf" > > > >> Does it work for you? > > > > As long as the help text is clear enough for the user, either config > > option name should be acceptable. Using the above is good to have an 1:1 > > mapping with the target name, at the expense of having the help text not > > matching it and an unclear option name from the user perspective (it's a > > bit weird not to enable it, at first). For _WITH_DONTAUDIT_, the > > opposite is true. I'd say there is no perfect solution, we can either > > stay close to the refpolicy internals or have the Buildroot specifics > > more consistent; not sure which is better. > > I?d go for Buildroot consistency since we?re in Buildroot. So _WITH_DONTAUDIT_? > If someone enables refpolicy package and enables ?Enable audit?, I > expect to see audit log. Right? Extra audit log* It's not about enabling audit logs, it's about having some known rules to not be silenced in the audit logs as they're known to be problematic. > This is me at least that I?ve never used refpolicy so I?m agnostic in > the topic, so maybe a neutral ?use case? :-) I don't really have a preference for either solution tbh. Antoine From giulio.benetti at benettiengineering.com Mon Jan 24 09:20:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 10:20:59 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <164301520937.4708.9842501306400984658@kwain> References: <164301520937.4708.9842501306400984658@kwain> Message-ID: > Il giorno 24 gen 2022, alle ore 10:07, Antoine Tenart ha scritto: > > ?Quoting Giulio Benetti (2022-01-24 09:59:45) >> >>>> Il giorno 24 gen 2022, alle ore 09:45, Antoine Tenart ha scritto: >>> >>> ?Quoting Giulio Benetti (2022-01-23 23:21:50) >>>> >>>> Re-reading this after some day it looks to me like the simple >>>> BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all >>>> dontaudit rules from policy.conf", so it's true that it enables audit >>>> logs in the end. It's a very specific options and the one who will use >>>> it will know what he will enable and most of all we can specify in the >>>> help section that: >>>> "Removes all dontaudit rules from policy.conf" >>> >>>> Does it work for you? >>> >>> As long as the help text is clear enough for the user, either config >>> option name should be acceptable. Using the above is good to have an 1:1 >>> mapping with the target name, at the expense of having the help text not >>> matching it and an unclear option name from the user perspective (it's a >>> bit weird not to enable it, at first). For _WITH_DONTAUDIT_, the >>> opposite is true. I'd say there is no perfect solution, we can either >>> stay close to the refpolicy internals or have the Buildroot specifics >>> more consistent; not sure which is better. >> >> I?d go for Buildroot consistency since we?re in Buildroot. > > So _WITH_DONTAUDIT_? > >> If someone enables refpolicy package and enables ?Enable audit?, I >> expect to see audit log. Right? > > Extra audit log* Aaah, here is the point ^^^. > > It's not about enabling audit logs, it's about having some known rules > to not be silenced in the audit logs as they're known to be problematic. Ok, Thanks for the explanation. > >> This is me at least that I?ve never used refpolicy so I?m agnostic in >> the topic, so maybe a neutral ?use case? :-) > > I don't really have a preference for either solution tbh. Then I?d go for: BR2_PACKAGE_REFPOLICY_ENABLE_EXTRA_AUDIT_LOG ?Enable extra audit log? And in the help section I specify all the warnings. Defaulted to n. This way it?s pretty clear to me that I approach the package for the first time. And most of all it?s what it does as you?ve explained me above. Well. I try to respin it this way. Will I receive a Reviewed-by: you then? :-) Best regards Giulio > > Antoine From james.hilliard1 at gmail.com Mon Jan 24 09:26:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 02:26:12 -0700 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.34.0 Message-ID: <20220124092612.4019025-1-james.hilliard1@gmail.com> CONTRIBUTING.md hash changed due to various style updates and additions. Signed-off-by: James Hilliard --- package/network-manager/network-manager.hash | 6 +++--- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index b007a6e88e..d25f0e8194 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.32/NetworkManager-1.32.12.sha256sum -sha256 a8ab36a0a502fe73cd8e3bacb6585f97fbb94ebef79e276cdbaf11c33ff8f54b NetworkManager-1.32.12.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum +sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 e70c2d84a038b972beff16d8662f35567709dff2d552220bd1af6014f6d2215d CONTRIBUTING.md +sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..a90228992c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.32 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 +NETWORK_MANAGER_VERSION_MAJOR = 1.34 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 09:29:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 02:29:49 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-multidict: bump to version 6.0.1 Message-ID: <20220124092949.137812-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 2d9943fc0d..789a6ec59f 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 e28b9592289597b232f09e5cc3857f32 multidict-5.2.0.tar.gz -sha256 0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce multidict-5.2.0.tar.gz +md5 c9a6ee3d39df11616cfe0c89abd5134b multidict-6.0.1.tar.gz +sha256 d40616f3f9326a18e1f2fa7c7e8e0e04a7e5228bfa2bd62c1e0d68fbc259b09b multidict-6.0.1.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 2619cad2ee..ff8fbcd053 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 5.2.0 +PYTHON_MULTIDICT_VERSION = 6.0.1 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/8e/7c/e12a69795b7b7d5071614af2c691c97fbf16a2a513c66ec52dd7d0a115bb +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/78/91/db40f5e6bd2b5d2f3fff0f5edee05035513c11fff09c565368f22129240a PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE -- 2.25.1 From atenart at kernel.org Mon Jan 24 09:29:59 2022 From: atenart at kernel.org (Antoine Tenart) Date: Mon, 24 Jan 2022 10:29:59 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: References: <164301520937.4708.9842501306400984658@kwain> Message-ID: <164301659905.4708.13356617813640521530@kwain> Quoting Giulio Benetti (2022-01-24 10:20:59) > > Then I?d go for: > BR2_PACKAGE_REFPOLICY_ENABLE_EXTRA_AUDIT_LOG > > ?Enable extra audit log? > > And in the help section I specify all the warnings. > Defaulted to n. > > This way it?s pretty clear to me that I approach the package for the > first time. And most of all it?s what it does as you?ve explained me > above. But then it's not close to the refpolicy implementation and I don't find it particularly clear either. Extra audit could be nice in many ways :) Let's wait a bit for other to have time to chime in, they might have an interesting take, or suggestions. Thanks, Antoine From quentin.schulz at theobroma-systems.com Mon Jan 24 09:31:06 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Mon, 24 Jan 2022 10:31:06 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix CVE-2021-38593 In-Reply-To: <20220121205327.GK3252931@scaer> References: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> <20220121205327.GK3252931@scaer> Message-ID: <3e21aca9-71ec-d648-c9e3-058a9f9960b2@theobroma-systems.com> Hi Yann, On 1/21/22 21:53, Yann E. MORIN wrote: > Quentin, All, > > On 2022-01-21 17:50 +0100, Quentin Schulz spake thusly: >> 5.15.2 is the last public release of 5.15 and does not contain this CVE >> fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so >> let's port them to 5.15.2. >> >> Technically only the first two patches are required to patch the CVE. >> However, the second patch introduces a regression that is fixed in the third >> patch. >> >> The patches are taken from KDE kde/5.15 git branch. >> >> Cc: Quentin Schulz >> Signed-off-by: Quentin Schulz > > Applied to master, thanks. > Thanks! I forgot to add that this patch can be applied to 2021.02.x and 2021.11.x branches too since qtbase hasn't changed since. Cc'ing Peter Korsgaard. Regards, Quentin > Regards, > Yann E. MORIN. > >> --- >> >> v2: >> - added third patch for fixing regression introduced by the second patch, >> - cherry-picked commits from kde git kde/5.15 branch instead of taking >> patches from 5.12.12 since they all applied nicely, >> >> ...-intensive-painting-of-high-number-o.patch | 163 ++++++++++++++++++ >> ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ++++ >> ...-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++ >> package/qt5/qt5base/qt5base.mk | 4 + >> 4 files changed, 304 insertions(+) >> create mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch >> create mode 100644 package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch >> create mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch >> >> diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch >> new file mode 100644 >> index 0000000000..03287d19ca >> --- /dev/null >> +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch >> @@ -0,0 +1,163 @@ >> +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 >> +From: Eirik Aavitsland >> +Date: Tue, 13 Apr 2021 14:23:45 +0200 >> +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny >> + dashes >> + >> +When stroking a dashed path, an unnecessary amount of processing would >> +be spent if there is a huge number of dashes visible, e.g. because of >> +scaling. Since the dashes are too small to be indivdually visible >> +anyway, just replace with a semi-transparent solid line for such >> +cases. >> + >> +Pick-to: 6.1 6.0 5.15 >> +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 >> +Reviewed-by: Allan Sandfeld Jensen >> +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) >> + >> +* asturmlechner 2021-08-21: >> +Conflict from preceding 94dd2ceb in dev branch: >> + src/gui/painting/qpaintengineex.cpp >> + Resolved via: >> + >> + if (pen.style() > Qt::SolidLine) { >> + QRectF cpRect = path.controlPointRect(); >> + const QTransform &xf = state()->matrix; >> +- if (pen.isCosmetic()) { >> ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ >> + clipRect = d->exDeviceRect; >> + cpRect.translate(xf.dx(), xf.dy()); >> + } else { >> + >> +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: >> + Resolved via: >> + >> + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; >> + qreal extent = qMax(extentRect.width(), extentRect.height()); >> + qreal patternLength = 0; >> +- const QList pattern = pen.dashPattern(); >> ++ const QVector pattern = pen.dashPattern(); >> + const int patternSize = qMin(pattern.size(), 32); >> + for (int i = 0; i < patternSize; i++) >> + patternLength += qMax(pattern.at(i), qreal(0)); >> + >> +[Retrieved from: https://urldefense.proofpoint.com/v2/url?u=https-3A__invent.kde.org_qt_qt_qtbase_-2D_commit_081d835c040a90f8ee76807354355062ac521dfb&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=LxReUcygQFa7q9x1Lv38CSIctBA3pevrTHehLs5s-Jo&e= ] >> +Signed-off-by: Quentin Schulz >> +--- >> + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- >> + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ >> + 2 files changed, 69 insertions(+), 9 deletions(-) >> + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps >> + >> +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp >> +index 5d8f89eadd..55fdb0c2a0 100644 >> +--- a/src/gui/painting/qpaintengineex.cpp >> ++++ b/src/gui/painting/qpaintengineex.cpp >> +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const >> + >> + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp >> + >> +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) >> ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) >> + { >> + #ifdef QT_DEBUG_DRAW >> + qDebug() << "QPaintEngineEx::stroke()" << pen; >> +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) >> + d->stroker.setCubicToHook(qpaintengineex_cubicTo); >> + } >> + >> ++ QRectF clipRect; >> ++ QPen pen = inPen; >> ++ if (pen.style() > Qt::SolidLine) { >> ++ QRectF cpRect = path.controlPointRect(); >> ++ const QTransform &xf = state()->matrix; >> ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ >> ++ clipRect = d->exDeviceRect; >> ++ cpRect.translate(xf.dx(), xf.dy()); >> ++ } else { >> ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); >> ++ } >> ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway >> ++ QRectF extentRect = cpRect & clipRect; >> ++ qreal extent = qMax(extentRect.width(), extentRect.height()); >> ++ qreal patternLength = 0; >> ++ const QVector pattern = pen.dashPattern(); >> ++ const int patternSize = qMin(pattern.size(), 32); >> ++ for (int i = 0; i < patternSize; i++) >> ++ patternLength += qMax(pattern.at(i), qreal(0)); >> ++ if (pen.widthF()) >> ++ patternLength *= pen.widthF(); >> ++ if (qFuzzyIsNull(patternLength)) { >> ++ pen.setStyle(Qt::NoPen); >> ++ } else if (extent / patternLength > 10000) { >> ++ // approximate stream of tiny dashes with semi-transparent solid line >> ++ pen.setStyle(Qt::SolidLine); >> ++ QColor color(pen.color()); >> ++ color.setAlpha(color.alpha() / 2); >> ++ pen.setColor(color); >> ++ } >> ++ } >> ++ >> + if (!qpen_fast_equals(pen, d->strokerPen)) { >> + d->strokerPen = pen; >> + d->stroker.setJoinStyle(pen.joinStyle()); >> +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) >> + return; >> + } >> + >> +- if (pen.style() > Qt::SolidLine) { >> +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ >> +- d->activeStroker->setClipRect(d->exDeviceRect); >> +- } else { >> +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); >> +- d->activeStroker->setClipRect(clipRect); >> +- } >> +- } >> ++ if (!clipRect.isNull()) >> ++ d->activeStroker->setClipRect(clipRect); >> + >> + if (d->activeStroker == &d->stroker) >> + d->stroker.setForceOpen(path.hasExplicitOpen()); >> +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps >> +new file mode 100644 >> +index 0000000000..d41ced7f5f >> +--- /dev/null >> ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps >> +@@ -0,0 +1,34 @@ >> ++# Version: 1 >> ++# CheckVsReference: 5% >> ++ >> ++path_addEllipse mypath 20.0 20.0 200.0 200.0 >> ++ >> ++save >> ++setPen blue 20 SolidLine FlatCap >> ++pen_setCosmetic true >> ++pen_setDashPattern [ 0.0004 0.0004 ] >> ++setBrush yellow >> ++ >> ++drawPath mypath >> ++translate 300 0 >> ++setRenderHint Antialiasing true >> ++drawPath mypath >> ++restore >> ++ >> ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 >> ++ >> ++setPen blue 20 DotLine FlatCap >> ++setBrush yellow >> ++ >> ++save >> ++translate 0 300 >> ++scale 0.0001 0.00011 >> ++drawPath bigpath >> ++restore >> ++ >> ++save >> ++translate 300 300 >> ++setRenderHint Antialiasing true >> ++scale 0.0001 0.00011 >> ++drawPath bigpath >> ++restore >> +-- >> +2.34.1 >> + >> diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch >> new file mode 100644 >> index 0000000000..16e0f20200 >> --- /dev/null >> +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch >> @@ -0,0 +1,37 @@ >> +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 >> +From: Eirik Aavitsland >> +Date: Fri, 23 Jul 2021 15:53:56 +0200 >> +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes >> +MIME-Version: 1.0 >> +Content-Type: text/plain; charset=UTF-8 >> +Content-Transfer-Encoding: 8bit >> + >> +Some pathological cases were not caught by the previous fix. >> + >> +Fixes: QTBUG-95239 >> +Pick-to: 6.2 6.1 5.15 >> +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 >> +Reviewed-by: Robert L?hning >> +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) >> +[Retrieved from: https://urldefense.proofpoint.com/v2/url?u=https-3A__invent.kde.org_qt_qt_qtbase_-2D_commit_fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=fz3SSDHyG958fkfUi81iVJmZwke0zFEFtSDHJGFm-Ng&e= ] >> +Signed-off-by: Quentin Schulz >> +--- >> + src/gui/painting/qpaintengineex.cpp | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp >> +index 55fdb0c2a0..19e4b23423 100644 >> +--- a/src/gui/painting/qpaintengineex.cpp >> ++++ b/src/gui/painting/qpaintengineex.cpp >> +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) >> + patternLength *= pen.widthF(); >> + if (qFuzzyIsNull(patternLength)) { >> + pen.setStyle(Qt::NoPen); >> +- } else if (extent / patternLength > 10000) { >> ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { >> + // approximate stream of tiny dashes with semi-transparent solid line >> + pen.setStyle(Qt::SolidLine); >> + QColor color(pen.color()); >> +-- >> +2.34.1 >> + >> diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch >> new file mode 100644 >> index 0000000000..ca3c2736ae >> --- /dev/null >> +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch >> @@ -0,0 +1,100 @@ >> +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 >> +From: Eirik Aavitsland >> +Date: Fri, 30 Jul 2021 13:03:49 +0200 >> +Subject: [PATCH] Refix for avoiding huge number of tiny dashes >> + >> +Previous fix hit too widely so some valid horizontal and vertical >> +lines were affected; the root problem being that such lines have an >> +empty control point rect (width or height is 0). Fix by caculating in >> +the pen width. >> + >> +Pick-to: 6.2 6.1 5.15 >> +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc >> +Reviewed-by: Allan Sandfeld Jensen >> +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) >> +[Retrieved from: https://urldefense.proofpoint.com/v2/url?u=https-3A__invent.kde.org_qt_qt_qtbase_-2D_commit_427df34efdcb56582a9ae9f7d2d1f39eeff70328&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=VxwG1OyHtsNChCKsSB0-O3lc8RzKa8eazWKhgLjrvJ0&e= ] >> +Signed-off-by: Quentin Schulz >> +--- >> + src/gui/painting/qpaintengineex.cpp | 8 ++--- >> + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ >> + 2 files changed, 35 insertions(+), 4 deletions(-) >> + >> +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp >> +index 19e4b23423..9fe510827a 100644 >> +--- a/src/gui/painting/qpaintengineex.cpp >> ++++ b/src/gui/painting/qpaintengineex.cpp >> +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) >> + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); >> + } >> + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway >> +- QRectF extentRect = cpRect & clipRect; >> ++ qreal pw = pen.widthF() ? pen.widthF() : 1; >> ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; >> + qreal extent = qMax(extentRect.width(), extentRect.height()); >> + qreal patternLength = 0; >> + const QVector pattern = pen.dashPattern(); >> + const int patternSize = qMin(pattern.size(), 32); >> + for (int i = 0; i < patternSize; i++) >> + patternLength += qMax(pattern.at(i), qreal(0)); >> +- if (pen.widthF()) >> +- patternLength *= pen.widthF(); >> ++ patternLength *= pw; >> + if (qFuzzyIsNull(patternLength)) { >> + pen.setStyle(Qt::NoPen); >> +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { >> ++ } else if (extent / patternLength > 10000) { >> + // approximate stream of tiny dashes with semi-transparent solid line >> + pen.setStyle(Qt::SolidLine); >> + QColor color(pen.color()); >> +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp >> +index 42e98ce363..d7c3f95f1d 100644 >> +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp >> ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp >> +@@ -308,6 +308,7 @@ private slots: >> + void fillPolygon(); >> + >> + void drawImageAtPointF(); >> ++ void scaledDashes(); >> + >> + private: >> + void fillData(); >> +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() >> + paint.end(); >> + } >> + >> ++void tst_QPainter::scaledDashes() >> ++{ >> ++ // Test that we do not hit the limit-huge-number-of-dashes path >> ++ QRgb fore = qRgb(0, 0, 0xff); >> ++ QRgb back = qRgb(0xff, 0xff, 0); >> ++ QImage image(5, 32, QImage::Format_RGB32); >> ++ image.fill(back); >> ++ QPainter p(&image); >> ++ QPen pen(QColor(fore), 3, Qt::DotLine); >> ++ p.setPen(pen); >> ++ p.scale(1, 2); >> ++ p.drawLine(2, 0, 2, 16); >> ++ p.end(); >> ++ >> ++ bool foreFound = false; >> ++ bool backFound = false; >> ++ int i = 0; >> ++ while (i < 32 && (!foreFound || !backFound)) { >> ++ QRgb pix = image.pixel(3, i); >> ++ if (pix == fore) >> ++ foreFound = true; >> ++ else if (pix == back) >> ++ backFound = true; >> ++ i++; >> ++ } >> ++ >> ++ QVERIFY(foreFound); >> ++ QVERIFY(backFound); >> ++} >> ++ >> + QTEST_MAIN(tst_QPainter) >> + >> + #include "tst_qpainter.moc" >> +-- >> +2.34.1 >> + >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index bcdf036f00..4ef3759566 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz >> QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib >> QT5BASE_INSTALL_STAGING = YES >> >> +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch >> +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch >> +QT5BASE_IGNORE_CVES += CVE-2021-38593 >> + >> # A few comments: >> # * -no-pch to workaround the issue described at >> # https://urldefense.proofpoint.com/v2/url?u=http-3A__comments.gmane.org_gmane.comp.lib.qt.devel_5933&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=aUZRl6hSJJWvvpz78VyHB93iMSfaDFegMAHksXfizi0&e= . >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.buildroot.org_mailman_listinfo_buildroot&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=xTyNnJzz7ej7-MydvaHKi1HryNTdQSeo8K8LiTL6N5k&e= > From giulio.benetti at benettiengineering.com Mon Jan 24 09:32:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 10:32:11 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <164301659905.4708.13356617813640521530@kwain> References: <164301520937.4708.9842501306400984658@kwain> <164301659905.4708.13356617813640521530@kwain> Message-ID: <4bcfec4b-c0eb-7c4e-0fc9-6782b2dbac0a@benettiengineering.com> On 24/01/22 10:29, Antoine Tenart wrote: > Quoting Giulio Benetti (2022-01-24 10:20:59) >> >> Then I?d go for: >> BR2_PACKAGE_REFPOLICY_ENABLE_EXTRA_AUDIT_LOG >> >> ?Enable extra audit log? >> >> And in the help section I specify all the warnings. >> Defaulted to n. >> >> This way it?s pretty clear to me that I approach the package for the >> first time. And most of all it?s what it does as you?ve explained me >> above. > > But then it's not close to the refpolicy implementation and I don't > find it particularly clear either. Extra audit could be nice in many > ways :) > > Let's wait a bit for other to have time to chime in, they might have an > interesting take, or suggestions. Ok, good idea Best regards! -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Mon Jan 24 09:36:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 02:36:10 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiorwlock: bump to version 1.3.0 Message-ID: <20220124093610.410365-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index fad7079789..15584a8a41 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz -sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz +md5 28e4812a1d1d67a2be4370209ece5528 aiorwlock-1.3.0.tar.gz +sha256 83f12d87df4b9728a0b8fda1756585ab0d652b107bab59c6084e1b1ad692ab45 aiorwlock-1.3.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index 4ba4965eb5..a5e7eeae83 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.2.0 +PYTHON_AIORWLOCK_VERSION = 1.3.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/fe/7027595f5e635ac1f597f7160a420e1f642a474576efb697001efea16bdc PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 09:44:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 02:44:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 21.11.1 Message-ID: <20220124094408.421939-1-james.hilliard1@gmail.com> Drop patches that are now upstream. Signed-off-by: James Hilliard --- ...r-packages-and-xbr-templates-package.patch | 54 ----------------- ...y-default-and-don-t-publish-universa.patch | 60 ------------------- package/python-autobahn/python-autobahn.hash | 4 +- package/python-autobahn/python-autobahn.mk | 5 +- 4 files changed, 5 insertions(+), 118 deletions(-) delete mode 100644 package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch delete mode 100644 package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch diff --git a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch b/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch deleted file mode 100644 index f239345dc7..0000000000 --- a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b13b7e38b38e2c79c0a13be32e05f0451483cd01 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sat, 12 Jun 2021 15:32:37 -0600 -Subject: [PATCH] Fix duplicate xbr packages and xbr templates package_data. - (#1492) - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -a370f9e7154e59b313cb675bfcaf8cad6011bd52] ---- - MANIFEST.in | 1 - - setup.py | 10 ++++++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/MANIFEST.in b/MANIFEST.in -index f4cb6da1..1dd32f0e 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -1,4 +1,3 @@ - include LICENSE - include autobahn/nvx/_utf8validator.c - recursive-include autobahn/wamp/gen/schema * --recursive-include autobahn/xbr/templates * -diff --git a/setup.py b/setup.py -index cf4e29ba..f27006da 100644 ---- a/setup.py -+++ b/setup.py -@@ -166,6 +166,12 @@ packages = [ - 'twisted.plugins', - ] - -+xbr_packages = [ -+ 'autobahn.xbr', -+ 'autobahn.asyncio.xbr', -+ 'autobahn.twisted.xbr', -+] -+ - package_data = {'autobahn.asyncio': ['./test/*']} - - entry_points = { -@@ -179,8 +185,8 @@ if 'AUTOBAHN_STRIP_XBR' in os.environ: - shutil.rmtree('autobahn.egg-info', ignore_errors=True) - else: - extras_require_all += extras_require_xbr -- packages += ['autobahn.xbr', 'autobahn.asyncio.xbr', 'autobahn.twisted.xbr'] -- package_data['xbr'] = ['./xbr/contracts/*.json'] -+ packages += xbr_packages -+ package_data['xbr'] = ['./xbr/templates/*.py.jinja2'] - entry_points['console_scripts'] += ["xbrnetwork = autobahn.xbr._cli:_main"] - - # development dependencies --- -2.25.1 - diff --git a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch b/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch deleted file mode 100644 index c2c2cf5777..0000000000 --- a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1e3162bab59cbc2f7cf8b9ef6cadf55ee273c1d8 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 22 Jul 2021 06:56:51 -0600 -Subject: [PATCH] Build with nvx by default and don't publish universal wheel. - (#1493) - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -a35f22eeaafca7568f1deb35c4a1b82ae78f77d4] ---- - Makefile | 8 ++++---- - autobahn/nvx/_utf8validator.py | 7 ++++++- - setup.py | 7 +------ - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/autobahn/nvx/_utf8validator.py b/autobahn/nvx/_utf8validator.py -index e72fc872..34393356 100644 ---- a/autobahn/nvx/_utf8validator.py -+++ b/autobahn/nvx/_utf8validator.py -@@ -44,13 +44,18 @@ ffi.cdef(""" - int nvx_utf8vld_get_impl(void* utf8vld); - """) - -+optional = True -+if 'AUTOBAHN_USE_NVX' in os.environ and os.environ['AUTOBAHN_USE_NVX'] in ['1', 'true']: -+ optional = False -+ - with open(os.path.join(os.path.dirname(__file__), '_utf8validator.c')) as fd: - c_source = fd.read() - ffi.set_source( - "_nvx_utf8validator", - c_source, - libraries=[], -- extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'] -+ extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'], -+ optional=optional - ) - - -diff --git a/setup.py b/setup.py -index f27006da..4889a39e 100644 ---- a/setup.py -+++ b/setup.py -@@ -110,12 +110,7 @@ extras_require_nvx = [ - - # cffi based extension modules to build, currently only NVX - cffi_modules = [] --if 'AUTOBAHN_USE_NVX' in os.environ: -- # FIXME: building this extension will make the wheel -- # produced no longer universal (as in "autobahn-18.4.1-py2.py3-none-any.whl"). -- # on the other hand, I don't know how to selectively include this -- # based on the install flavor the user has chosen (eg pip install autobahn[nvx] -- # should make the following be included) -+if 'AUTOBAHN_USE_NVX' not in os.environ or os.environ['AUTOBAHN_USE_NVX'] not in ['0', 'false']: - cffi_modules.append('autobahn/nvx/_utf8validator.py:ffi') - - extras_require_xbr = [ --- -2.25.1 - diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 7de1e7e673..0bbb9112d0 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 dcba839ee61be33d05042a09c008c6bc autobahn-21.3.1.tar.gz -sha256 e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03 autobahn-21.3.1.tar.gz +md5 1ccd46d938d8b9fed435e9781e54e887 autobahn-21.11.1.tar.gz +sha256 bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18 autobahn-21.11.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 4ec47f54ce..481d9373ad 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 21.3.1 +PYTHON_AUTOBAHN_VERSION = 21.11.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/4c/9e/f5bdfb55d1eab67c4b6d24d1397f95feec792071ff1b2f5a893d6d5247f3 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed +PYTHON_AUTOBAHN_SETUP_TYPE = setuptools PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 24 10:09:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 11:09:20 +0100 Subject: [Buildroot] [PATCH] package/efl: fix build failure with eeze disabled Message-ID: <20220124100920.3005564-1-giulio.benetti@benettiengineering.com> Elput depends on eeze, so if we disable eeze we also need to disable elput by setting the option "input" to false. Fixes: https://bugs.busybox.net/show_bug.cgi?id=14531 Signed-off-by: Giulio Benetti --- package/efl/efl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/efl/efl.mk b/package/efl/efl.mk index ed0a8acc1d..c93961475d 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -65,6 +65,8 @@ EFL_DEPENDENCIES += udev EFL_CONF_OPTS += -Deeze=true else EFL_CONF_OPTS += -Deeze=false +# input(elput) requires eeze, so disable it accordingly +EFL_CONF_OPTS += -Dinput=false endif ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) -- 2.25.1 From bugzilla at busybox.net Mon Jan 24 10:11:17 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 24 Jan 2022 10:11:17 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 Giulio Benetti changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #5 from Giulio Benetti --- Hi jhiljanen, I've found an easier fix with the help of Carsten Haitzler in Enlightment ML. Here is the pending patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220124100920.3005564-1-giulio.benetti at benettiengineering.com/ Best regards -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Mon Jan 24 10:23:41 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:23:41 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-msgpack: bump to version 1.0.3 Message-ID: <20220124102341.469972-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-msgpack/python-msgpack.hash | 4 ++-- package/python-msgpack/python-msgpack.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash index 8e192e3717..382bada4a7 100644 --- a/package/python-msgpack/python-msgpack.hash +++ b/package/python-msgpack/python-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgpack/json -md5 68d5804254642905ba87ede509e68970 msgpack-1.0.2.tar.gz -sha256 fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984 msgpack-1.0.2.tar.gz +md5 2dcb4fa618d7890e5a79de6fe44cbb59 msgpack-1.0.3.tar.gz +sha256 51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e msgpack-1.0.3.tar.gz # Locally computed sha256 checksums sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index dcb525ed1f..c50b7157a0 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 1.0.2 +PYTHON_MSGPACK_VERSION = 1.0.3 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/59/04/87fc6708659c2ed3b0b6d4954f270b6e931def707b227c4554f99bd5401e +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/61/3c/2206f39880d38ca7ad8ac1b28d2d5ca81632d163b2d68ef90e46409ca057 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:29:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:29:53 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: bump to verison 9.0.0 Message-ID: <20220124102953.524912-1-james.hilliard1@gmail.com> License hash change due to copyright year update: https://github.com/python-pillow/Pillow/commit/0bb3f87dcc72a1a80f50690abde5a3ac4576d3d6 Signed-off-by: James Hilliard --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index d14cb5cff6..f3ca8e6014 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 7a1eb5a250c7ccbd549a89e16404f09f Pillow-8.4.0.tar.gz -sha256 b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed Pillow-8.4.0.tar.gz +md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz +sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz # Locally computed sha256 checksums -sha256 5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4 LICENSE +sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 5ed57c55cb..2f2e817882 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 8.4.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/7d/2a/2fc11b54e2742db06297f7fa7f420a0e3069fdcf0e4b57dfec33f0b08622 +PYTHON_PILLOW_VERSION = 9.0.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:36:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:36:34 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-fonttools: bump to version 4.28.5 Message-ID: <20220124103634.527471-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-fonttools/python-fonttools.hash | 4 ++-- package/python-fonttools/python-fonttools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 2e79861e2c..1f9b546c23 100644 --- a/package/python-fonttools/python-fonttools.hash +++ b/package/python-fonttools/python-fonttools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fonttools/json -md5 fcf1425460855b5892c990027b5396c8 fonttools-4.28.2.zip -sha256 dca694331af74c8ad47acc5171e57f6b78fac5692bf050f2ab572964577ac0dd fonttools-4.28.2.zip +md5 4a894b3cd108432f7636849b4026b771 fonttools-4.28.5.zip +sha256 545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca fonttools-4.28.5.zip # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index 9ec369d550..c5c605161b 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.28.2 +PYTHON_FONTTOOLS_VERSION = 4.28.5 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/3c/d5/f722e0d1aed0d547383913c6bc3c4ff35772952057b8e2b8fe3be8df4216 +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/ce/1b/d4cd86f4e6cbd54a3c4f807015b116299bcd6d6587ea0645d88ba9d932bb PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:40:03 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:40:03 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-frozenlist: bump to version 1.3.0 Message-ID: <20220124104003.529661-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-frozenlist/python-frozenlist.hash | 4 ++-- package/python-frozenlist/python-frozenlist.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index fdbf694963..034150397b 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 8f1851ef871d95a15ebcf20255c12f6d frozenlist-1.2.0.tar.gz -sha256 68201be60ac56aff972dc18085800b6ee07973c49103a8aba669dee3d71079de frozenlist-1.2.0.tar.gz +md5 e65d870bd189ba3c21ab7eb10eab22b7 frozenlist-1.3.0.tar.gz +sha256 ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b frozenlist-1.3.0.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 4e26499808..ad618971f7 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.2.0 +PYTHON_FROZENLIST_VERSION = 1.3.0 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/5c/ee/7c6287928ba776567603248e160387cf4143641ecf734e393ad9b2c82475 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/f4/f7/8dfeb76d2a52bcea2b0718427af954ffec98be1d34cd8f282034b3e36829 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE -- 2.25.1 From evgeni at studio-punkt.com Mon Jan 24 10:41:15 2022 From: evgeni at studio-punkt.com (Evgeni Dobrev) Date: Mon, 24 Jan 2022 11:41:15 +0100 Subject: [Buildroot] [PATCH 0/1] fs: fix /tmp and /run clean-up in POSIX shells Message-ID: <20220124104116.12902-1-evgeni@studio-punkt.com> Hi, the fakeroot script uses [^c] to request the deletion of all hidden files within the tmp and run folders. This however does not work under dash (or other POSIX shells) without additional configuration. The proposed patch fixes the clean-up actions introduced with 5e78e7e97d772124f0d31653aca33731abe5b4db . Regards, Evgeni Dobrev (1): fs: fix /tmp and /run clean-up in POSIX shells fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.34.1 From evgeni at studio-punkt.com Mon Jan 24 10:41:16 2022 From: evgeni at studio-punkt.com (Evgeni Dobrev) Date: Mon, 24 Jan 2022 11:41:16 +0100 Subject: [Buildroot] [PATCH 1/1] fs: fix /tmp and /run clean-up in POSIX shells In-Reply-To: <20220124104116.12902-1-evgeni@studio-punkt.com> References: <20220124104116.12902-1-evgeni@studio-punkt.com> Message-ID: <20220124104116.12902-2-evgeni@studio-punkt.com> In POSIX sh, ^ in place of ! in glob bracket expressions is undefined. Signed-off-by: Evgeni Dobrev --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..64a94d9ad8 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) -- 2.34.1 From james.hilliard1 at gmail.com Mon Jan 24 10:42:40 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:42:40 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-jinja2: bump to version 3.0.3 Message-ID: <20220124104240.531060-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-jinja2/python-jinja2.hash | 4 ++-- package/python-jinja2/python-jinja2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash index afd07e89f1..ea7fe71a35 100644 --- a/package/python-jinja2/python-jinja2.hash +++ b/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 059f89375d7ea60eb7013f341f0b89e7 Jinja2-3.0.2.tar.gz -sha256 827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45 Jinja2-3.0.2.tar.gz +md5 b76ae2f0647abebc81e7c03f5fb7b00f Jinja2-3.0.3.tar.gz +sha256 611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 Jinja2-3.0.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index bb53f95699..752daf653c 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 3.0.2 +PYTHON_JINJA2_VERSION = 3.0.3 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/f8/86/7c0eb6e8b05385d1ce682abc0f994abd1668e148fb52603fa86e15d4c110 +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/91/a5/429efc6246119e1e3fbf562c00187d04e83e54619249eb732bb423efa6c6 PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:46:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:46:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-idna: bump to version 3.3 Message-ID: <20220124104639.532519-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-idna/python-idna.hash | 4 ++-- package/python-idna/python-idna.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 08a7be9d56..27c42c8b59 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 08ea8e2ce09e522424e872409c221138 idna-3.2.tar.gz -sha256 467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3 idna-3.2.tar.gz +md5 5856306eac5f25db8249e37a4c6ee3e7 idna-3.3.tar.gz +sha256 9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d idna-3.3.tar.gz # Locally computed sha256 checksums sha256 a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index a2c842f1e7..2a1ec8314b 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.2 +PYTHON_IDNA_VERSION = 3.3 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:49:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:49:14 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-attrs: bump to version 21.4.0 Message-ID: <20220124104914.533634-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-attrs/python-attrs.hash | 6 +++--- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index 5d4c46304e..823a9459bd 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 06af884070d9180694becdb106e5cd65 attrs-21.2.0.tar.gz -sha256 ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb attrs-21.2.0.tar.gz -# Locally computed sha256 +md5 5a9b5e9ceebc380a13fb93235b11bbda attrs-21.4.0.tar.gz +sha256 626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd attrs-21.4.0.tar.gz +# Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index b99a98501c..4877d62285 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 21.2.0 +PYTHON_ATTRS_VERSION = 21.4.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/ed/d6/3ebca4ca65157c12bd08a63e20ac0bdc21ac7f3694040711f9fd073c0ffb +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/d7/77/ebb15fc26d0f815839ecd897b919ed6d85c050feeb83e100e020df9153d2 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:52:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:52:51 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-certifi: bump to version 2021.10.8 Message-ID: <20220124105251.535089-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-certifi/python-certifi.hash | 4 ++-- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index ae122ffc23..0245496ebf 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 4b38238b7305fcb3ffbc4368be4e8845 certifi-2021.5.30.tar.gz -sha256 2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee certifi-2021.5.30.tar.gz +md5 880ed9e5d04aff8f46f5ff82a3a3e395 certifi-2021.10.8.tar.gz +sha256 78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 certifi-2021.10.8.tar.gz # Locally computed sha256 checksums sha256 be9d82f36112f87a7f1d74ecd4887e1467bbae8878a84004a00117b1e475a3e2 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 486548f8c2..17098e3fae 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2021.5.30 +PYTHON_CERTIFI_VERSION = 2021.10.8 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:55:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:55:27 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-charset-normalizer: bump to version 2.0.10 Message-ID: <20220124105527.536514-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- .../python-charset-normalizer/python-charset-normalizer.hash | 4 ++-- .../python-charset-normalizer/python-charset-normalizer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index f506fa85ed..eb3b67598b 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.hash +++ b/package/python-charset-normalizer/python-charset-normalizer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/charset-normalizer/json -md5 b28e4463613ff3911d5a2dc62b96233f charset-normalizer-2.0.7.tar.gz -sha256 e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0 charset-normalizer-2.0.7.tar.gz +md5 eaed8aaf95d7e3bc2daefcd8d0f03458 charset-normalizer-2.0.10.tar.gz +sha256 876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd charset-normalizer-2.0.10.tar.gz # Locally computed sha256 checksums sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index 7fe9f96996..33f2e132de 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.7 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.10 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/9f/c5/334c019f92c26e59637bb42bd14a190428874b2b2de75a355da394cf16c1 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:00:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:00:14 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-pycparser: bump to version 2.21 Message-ID: <20220124110014.537689-1-james.hilliard1@gmail.com> License hash changed due to year update: https://github.com/eliben/pycparser/commit/78beeb7d6f0a760f90a8592d9533042363a82810 Signed-off-by: James Hilliard --- package/python-pycparser/python-pycparser.hash | 6 +++--- package/python-pycparser/python-pycparser.mk | 4 ++-- package/python3-pycparser/python3-pycparser.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-pycparser/python-pycparser.hash b/package/python-pycparser/python-pycparser.hash index 0426444399..34401a319a 100644 --- a/package/python-pycparser/python-pycparser.hash +++ b/package/python-pycparser/python-pycparser.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycparser/json -md5 b8f88de737db8c346ee8d31c07c7a25a pycparser-2.20.tar.gz -sha256 2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 pycparser-2.20.tar.gz +md5 48f7d743bf018f7bb2ffc5fb976d1492 pycparser-2.21.tar.gz +sha256 e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 pycparser-2.21.tar.gz # Locally computed sha256 checksums -sha256 3c76629880aec2f8578ed914701a4ff9e5da8b60acb8b7ec675abf83c90c5168 LICENSE +sha256 3e7df25b8dfb658c9a91501930d4d943b05087a8347c7e2b4325616af535047b LICENSE diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 5f44a562af..20c3f641a9 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-pycparser/python3-pycparser.mk -PYTHON_PYCPARSER_VERSION = 2.20 +PYTHON_PYCPARSER_VERSION = 2.21 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd +PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3-Clause PYTHON_PYCPARSER_LICENSE_FILES = LICENSE diff --git a/package/python3-pycparser/python3-pycparser.mk b/package/python3-pycparser/python3-pycparser.mk index 68769ceb46..4075f4a38f 100644 --- a/package/python3-pycparser/python3-pycparser.mk +++ b/package/python3-pycparser/python3-pycparser.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-pycparser/python-pycparser.mk -PYTHON3_PYCPARSER_VERSION = 2.20 +PYTHON3_PYCPARSER_VERSION = 2.21 PYTHON3_PYCPARSER_SOURCE = pycparser-$(PYTHON3_PYCPARSER_VERSION).tar.gz -PYTHON3_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd +PYTHON3_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de PYTHON3_PYCPARSER_SETUP_TYPE = setuptools PYTHON3_PYCPARSER_LICENSE = BSD-3-Clause PYTHON3_PYCPARSER_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:17:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:17:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pyyaml: bump to version 6.0 Message-ID: <20220124111725.544497-1-james.hilliard1@gmail.com> Drop python2 support and propagate dependency changes. Ensure optimized cython build is enabled and add host cython dependency. Signed-off-by: James Hilliard --- package/libcamera/libcamera.mk | 2 +- package/mongodb/mongodb.mk | 2 +- package/python-pyyaml/Config.in | 1 + package/python-pyyaml/python-pyyaml.hash | 4 ++-- package/python-pyyaml/python-pyyaml.mk | 9 +++++---- package/python3-pyyaml/python3-pyyaml.hash | 1 - package/python3-pyyaml/python3-pyyaml.mk | 20 -------------------- 7 files changed, 10 insertions(+), 29 deletions(-) delete mode 120000 package/python3-pyyaml/python3-pyyaml.hash delete mode 100644 package/python3-pyyaml/python3-pyyaml.mk diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 0052ca558a..524cf07e03 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -12,7 +12,7 @@ LIBCAMERA_DEPENDENCIES = \ host-pkgconf \ host-python-jinja2 \ host-python3-ply \ - host-python3-pyyaml \ + host-python-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ -Dandroid=disabled \ diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index c33c3c2eb7..92656dd7a4 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -18,7 +18,7 @@ MONGODB_DEPENDENCIES = \ boost \ host-python3-cheetah \ host-python3-psutil \ - host-python3-pyyaml \ + host-python-pyyaml \ host-python3-regex \ host-python-requests \ host-scons \ diff --git a/package/python-pyyaml/Config.in b/package/python-pyyaml/Config.in index 45e818b7e7..eb073b9c03 100644 --- a/package/python-pyyaml/Config.in +++ b/package/python-pyyaml/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYYAML bool "python-pyyaml" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBYAML help The PyYAML package contains binding to the libyaml API. diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash index 82b2f4f880..f8b5332565 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json -md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz -sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz +md5 1d19c798f25e58e3e582f0f8c977dbb8 PyYAML-6.0.tar.gz +sha256 68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2 PyYAML-6.0.tar.gz # Locally computed sha256 checksums sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index c9013de8ec..8f5a2d269e 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -4,17 +4,18 @@ # ################################################################################ -# Please keep in sync package/python3-pyyaml/python3-pyyaml.mk -PYTHON_PYYAML_VERSION = 5.4.1 +PYTHON_PYYAML_VERSION = 6.0 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844 PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml -PYTHON_PYYAML_DEPENDENCIES = libyaml +PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml +PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-pyyaml/python3-pyyaml.hash b/package/python3-pyyaml/python3-pyyaml.hash deleted file mode 120000 index afa4932ecb..0000000000 --- a/package/python3-pyyaml/python3-pyyaml.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pyyaml/python-pyyaml.hash \ No newline at end of file diff --git a/package/python3-pyyaml/python3-pyyaml.mk b/package/python3-pyyaml/python3-pyyaml.mk deleted file mode 100644 index f758341502..0000000000 --- a/package/python3-pyyaml/python3-pyyaml.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-pyyaml -# -################################################################################ - -# Please keep in sync with package/python-pyyaml/python-pyyaml.mk -PYTHON3_PYYAML_VERSION = 5.4.1 -PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz -PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d -PYTHON3_PYYAML_SETUP_TYPE = setuptools -PYTHON3_PYYAML_LICENSE = MIT -PYTHON3_PYYAML_LICENSE_FILES = LICENSE -PYTHON3_PYYAML_CPE_ID_VENDOR = pyyaml -PYTHON3_PYYAML_CPE_ID_PRODUCT = pyyaml -HOST_PYTHON3_PYYAML_DL_SUBDIR = python-pyyaml -HOST_PYTHON3_PYYAML_NEEDS_HOST_PYTHON = python3 -HOST_PYTHON3_PYYAML_DEPENDENCIES = host-libyaml - -$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:19:58 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:19:58 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-requests: bump to version 2.27.1 Message-ID: <20220124111958.545565-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 53503a3668..1e4cbaff7b 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 8c745949ad3e9ae83d9927fed213db8a requests-2.26.0.tar.gz -sha256 b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7 requests-2.26.0.tar.gz +md5 bcc01b73974a305cc7c5b092e7d07004 requests-2.27.1.tar.gz +sha256 68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 requests-2.27.1.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 74cc91ef01..962646516e 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.26.0 +PYTHON_REQUESTS_VERSION = 2.27.1 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:24:03 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:24:03 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-terminaltables: bump to version 3.1.10 Message-ID: <20220124112403.546605-1-james.hilliard1@gmail.com> Update repository upstream url and add license hash. Signed-off-by: James Hilliard --- package/python-terminaltables/Config.in | 2 +- package/python-terminaltables/python-terminaltables.hash | 6 ++++-- package/python-terminaltables/python-terminaltables.mk | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/python-terminaltables/Config.in b/package/python-terminaltables/Config.in index 8f3c4296ed..8a387466ec 100644 --- a/package/python-terminaltables/Config.in +++ b/package/python-terminaltables/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_TERMINALTABLES Generate simple tables in terminals from a nested list of strings. - https://github.com/Robpol86/terminaltables + https://github.com/matthewdeanmartin/terminaltables diff --git a/package/python-terminaltables/python-terminaltables.hash b/package/python-terminaltables/python-terminaltables.hash index 3184f5f716..b6c95aa269 100644 --- a/package/python-terminaltables/python-terminaltables.hash +++ b/package/python-terminaltables/python-terminaltables.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/terminaltables/json -md5 863797674d8f75d22e16e6c1fdcbeb41 terminaltables-3.1.0.tar.gz -sha256 f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81 terminaltables-3.1.0.tar.gz +md5 5467e06a1a6e24dc44e6dd241706668e terminaltables-3.1.10.tar.gz +sha256 ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543 terminaltables-3.1.10.tar.gz +# Locally computed sha256 checksums +sha256 2e1320fd337db06a3136d0f4101bd62f13249c95c5b581304f35481e979d432a LICENSE diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index 763f82e9a2..b31ed332b6 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TERMINALTABLES_VERSION = 3.1.0 +PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz -PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/9b/c4/4a21174f32f8a7e1104798c445dacdc1d4df86f2f26722767034e4de4bff +PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools PYTHON_TERMINALTABLES_LICENSE = MIT +PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE $(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:29:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:29:12 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-urllib3: bump to version 1.26.8 Message-ID: <20220124112912.547889-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-urllib3/python-urllib3.hash | 4 ++-- package/python-urllib3/python-urllib3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 066bfb7288..2415f24199 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 e0051a87a956e618a6bb514a07fa7773 urllib3-1.26.7.tar.gz -sha256 4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece urllib3-1.26.7.tar.gz +md5 50831ca7b19bbe2781abb0a4c2d51760 urllib3-1.26.8.tar.gz +sha256 0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c urllib3-1.26.8.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 9580d9b6b9..c9c8a912d1 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.7 +PYTHON_URLLIB3_VERSION = 1.26.8 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/b0/b1/7bbf5181f8e3258efae31702f5eab87d8a74a72a0aa78bc8c08c1466e243 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:37:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:37:49 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pynacl: bump to version 1.5.0 Message-ID: <20220124113749.585264-1-james.hilliard1@gmail.com> Drop patch that is now upstream. Drop python2 support. Drop python-six dependency which is no longer needed. Signed-off-by: James Hilliard --- ...e-spurious-requirement-for-wheel-596.patch | 34 ------------------- package/python-pynacl/Config.in | 2 +- package/python-pynacl/python-pynacl.hash | 6 ++-- package/python-pynacl/python-pynacl.mk | 4 +-- 4 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch diff --git a/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch b/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch deleted file mode 100644 index 4f4a76ce29..0000000000 --- a/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 44fb453931c611d4822343debe902cca8e1c8afe Mon Sep 17 00:00:00 2001 -From: Scott Kitterman -Date: Tue, 26 May 2020 20:08:16 -0400 -Subject: [PATCH] Remove spurious requirement for wheel (#596) - -* Remove spurious requirement for wheel - -* Put wheel back in pyproject.toml - -Co-authored-by: Scott Kitterman -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -44fb453931c611d4822343debe902cca8e1c8afe] ---- - setup.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 9319c1c..d82a7fe 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,8 +35,7 @@ except ImportError: - - - requirements = ["six"] --setup_requirements = ["setuptools", -- "wheel"] -+setup_requirements = ["setuptools"] - test_requirements = ["pytest>=3.2.1,!=3.3.0", - "hypothesis>=3.27.0"] - docs_requirements = ["sphinx>=1.6.5", --- -2.25.1 - diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in index 256f9d5eb6..3bb4e29630 100644 --- a/package/python-pynacl/Config.in +++ b/package/python-pynacl/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PYNACL bool "python-pynacl" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBSODIUM - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime help Python binding to the Networking and Cryptography (NaCl) diff --git a/package/python-pynacl/python-pynacl.hash b/package/python-pynacl/python-pynacl.hash index b6ee2baf0e..85a7447b32 100644 --- a/package/python-pynacl/python-pynacl.hash +++ b/package/python-pynacl/python-pynacl.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/pynacl/json -md5 8c6c57893327a694c72510fb620e4744 PyNaCl-1.4.0.tar.gz -sha256 54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PyNaCl-1.4.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/PyNaCl/json +md5 93989045e25f1111452cfdf5e021814d PyNaCl-1.5.0.tar.gz +sha256 8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba PyNaCl-1.5.0.tar.gz # Locally computed sha256 checksums sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE diff --git a/package/python-pynacl/python-pynacl.mk b/package/python-pynacl/python-pynacl.mk index 1e4155992a..bd2571c3ad 100644 --- a/package/python-pynacl/python-pynacl.mk +++ b/package/python-pynacl/python-pynacl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYNACL_VERSION = 1.4.0 +PYTHON_PYNACL_VERSION = 1.5.0 PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/cf/5a/25aeb636baeceab15c8e57e66b8aa930c011ec1c035f284170cacb05025e +PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/a7/22/27582568be639dfe22ddb3902225f91f2f17ceff88ce80e4db396c8986da PYTHON_PYNACL_LICENSE = Apache-2.0 PYTHON_PYNACL_LICENSE_FILES = LICENSE PYTHON_PYNACL_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:52:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:52:10 -0700 Subject: [Buildroot] [PATCH 1/1] package/python3-pycryptodomex: bump to version 3.13.0 Message-ID: <20220124115210.591345-1-james.hilliard1@gmail.com> License hash changed due to OCB patents expiry: https://github.com/Legrandin/pycryptodome/commit/5d78d02220022592d79fd7789cc77af6d1859729 Signed-off-by: James Hilliard --- package/python-pycryptodomex/python-pycryptodomex.hash | 6 +++--- package/python-pycryptodomex/python-pycryptodomex.mk | 7 +++---- package/python3-pycryptodomex/python3-pycryptodomex.mk | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 544468b37e..9512f185a8 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 3d007103f68f7e902167719655d2b57a pycryptodomex-3.11.0.tar.gz -sha256 0398366656bb55ebdb1d1d493a7175fc48ade449283086db254ac44c7d318d6d pycryptodomex-3.11.0.tar.gz +md5 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz +sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz # Locally computed sha256 checksums -sha256 c273fb45d120362875aafdd6189f4d7c70f6c36d4cb7ce427e0dc704753639df LICENSE.rst +sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index f1fda7aea2..92780327a1 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -5,14 +5,13 @@ ################################################################################ # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk -PYTHON_PYCRYPTODOMEX_VERSION = 3.11.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/47/14/dd9ad29cd29ea4cc521286f2cb401ca7ac6fd5db0791c5e9bacaf2c9ac78 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ - Public Domain (pycrypto original code), \ - OCB patent license (OCB mode) + Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto $(eval $(python-package)) diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk index ee03a08ec6..06a46cdf63 100644 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ b/package/python3-pycryptodomex/python3-pycryptodomex.mk @@ -5,14 +5,13 @@ ################################################################################ # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.11.0 +PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/47/14/dd9ad29cd29ea4cc521286f2cb401ca7ac6fd5db0791c5e9bacaf2c9ac78 +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON3_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ - Public Domain (pycrypto original code), \ - OCB patent license (OCB mode) + Public Domain (pycrypto original code) PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 12:02:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 05:02:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cython: bump to version 0.29.26 Message-ID: <20220124120225.593014-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- package/python3-cython/python3-cython.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 70469c012b..b07f171c25 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 81aff945f5bfdfb86e7a5d24f5467668 Cython-0.29.24.tar.gz -sha256 cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443 Cython-0.29.24.tar.gz +md5 971c9708dd5269180868fc0af986084c Cython-0.29.26.tar.gz +sha256 af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 Cython-0.29.26.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index ffc8e719cd..cf41086dea 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-cython/python3-cython.mk -PYTHON_CYTHON_VERSION = 0.29.24 +PYTHON_CYTHON_VERSION = 0.29.26 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk index 2f15ad8c36..da159cedc8 100644 --- a/package/python3-cython/python3-cython.mk +++ b/package/python3-cython/python3-cython.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-cython/python-cython.mk -PYTHON3_CYTHON_VERSION = 0.29.24 +PYTHON3_CYTHON_VERSION = 0.29.26 PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b PYTHON3_CYTHON_SETUP_TYPE = setuptools PYTHON3_CYTHON_LICENSE = Apache-2.0 PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.25.1 From narmstrong at baylibre.com Mon Jan 24 13:41:49 2022 From: narmstrong at baylibre.com (Neil Armstrong) Date: Mon, 24 Jan 2022 14:41:49 +0100 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> <20220122160914.7e4cc513@windsurf> <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> Message-ID: <4a94b253-6fe7-5e79-b1e9-331b0a9051ca@baylibre.com> Hi Thomas, On 22/01/2022 17:09, Vyacheslav wrote: > Hi, Neil! > Can you help us with understanding license for Amlogic binaries in > https://github.com/LibreELEC/amlogic-boot-fip? > > > 22.01.2022 18:09, Thomas Petazzoni wrote: >> Hello, >> >> On Sat, 22 Jan 2022 18:05:06 +0300 >> Vyacheslav wrote: >> >>>> So how can the contents of this repository be useful? OK, then can be >>>> used locally for your own experiments. But for building an actual >>>> device that you can ship/provide to others, using the contents of that >>>> repository, because Amlogic does not even allow you to distribute the >>>> contents of this repository. >>>> >>>> So I am wondering if it's really reasonable to package this in >>>> Buildroot. >>>> ?? >>> You already have package/odroidc2-firmware with same license. >>> amlogic-boot-fip just put all similar binaries together and Neil >>> Armstrong made a build system for aml uboot binaries. >> >> Well, I wasn't aware package/odroidc2-firmware was under the same >> restrictive license. Are the license terms for >> package/odroidc2-firmware available somewhere? This package is >> downloaded from https://github.com/hardkernel/u-boot, but I don't see >> the license terms from Amlogic preventing redistribution. Of course, I >> understand that they simply may be missing (which would be really bad!). The binaries must be split into 2 categories: - Pre-built: bl2, bl31, bl21, bl32, fip_create, aml_encrypt_*, ddr*.fw, acs_tool.py - Built in the Vendor U-Boot source: acs.bin bl301.bin In 2019, Amlogic finally added a LICENSE for the pre-built binaries, before nobody knew what was the term of the distribution. commit 6abaf9a869a6584b3cfca8b96d0946ed49bc9b64 Author: Lawrence Mok Date: Mon May 6 12:34:56 2019 -0700 add LICENSE file and text referring to it [1/1] Change-Id: Id291f42bec3ddb0c2162e6540ce1f35d1cb1d079 The LICENSE can be found at [1] in Khadas github. Concerning the acs.bin & bl301.bin, they use the U-Boot build system and config header files and all these were also updated with the following SPDX: /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ commit 94de43d3d940cf75b4a9e4fd2a2715be8eff6138 Author: Jiucheng Xu Date: Wed Dec 16 10:11:00 2020 +0800 license: Fix the license of amlogic related codes [1/1] PD#SWPL-39001 Problem: A customer want to add amlogic driver in uboot to their private bootloader. Since the driver codes are licensed under GPL-2.0, and customer have to open their code, so we need fix the license issue. Solution: Fix the license of our related code in uboot by adding MIT license Verify: Franklin Change-Id: I2f3571e8720d1f4db069f882353d6ae050702cba Signed-off-by: Jiucheng Xu Note, none of the vendor who publicly published the Amlogic U-Boot source has this change, so we can consider acs.bin & bl301.bin generated from GPL-2.0 as the commit explains. >> >> But how can anyone use those blobs? You can't redistribute them. >> According to their license, just putting them on Github is not even >> allowed. The pre-built binaries stored on the LibreELEC repository only comes from public Vendor sources (Khadas, HardKernel, Libre Computer, FriendlyARM, Radxa) and checked against vendor repositories we have access to. We assume they got permission from Amlogic to publicly redistribute these binaries as we (BayLibre) were allowed to redistribute the VDEC firmware in [2] & [3]. Note the situation is still unclear, this is why I haven't continued my initial patchset for libretech-cc at [4] following your concerns over licensing. Neil >> >> Thomas [1] https://github.com/khadas/u-boot/blob/khadas-vims-pie/fip/LICENSE [2] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/LICENSE.amlogic_vdec [3] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/meson/vdec?id=e04cc56d0e6b6ff05924ff88fdba1a438ee7d3c8 [4] https://patchwork.ozlabs.org/project/buildroot/cover/1533545408-11248-1-git-send-email-narmstrong at baylibre.com/ From bugzilla at busybox.net Mon Jan 24 13:49:46 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 24 Jan 2022 13:49:46 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #6 from jhiljanen at europower-consulting.com --- (In reply to Giulio Benetti from comment #5) Thank you for your work! -- You are receiving this mail because: You are on the CC list for the bug. From aperez at igalia.com Mon Jan 24 14:02:30 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 24 Jan 2022 16:02:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.34.4 Message-ID: <20220124140230.1697395-1-aperez@igalia.com> This is a minor release which provides fixes for CVE-2021-30934, CVE-2021-30936, CVE-2021-30951, CVE-2021-30952, CVE-2021-30953, CVE-2021-30954, CVE-2021-30984, and the safarileaks.com vulnerability (which has not yet been assigned a CVE number). Release notes can be found at: https://wpewebkit.org/release/wpewebkit-2.34.4.html An accompanying security advisory has been published at: https://wpewebkit.org/security/WSA-2022-0001.html Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 52652b72ae..b863a0d705 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.34.3.tar.xz.sums -md5 f8eb92825bf6477fb04ca017926c2458 wpewebkit-2.34.3.tar.xz -sha1 a72f507dfd6d4d579b2e6c939d7c171c2cfb1d92 wpewebkit-2.34.3.tar.xz -sha256 c35de4bfce35c81cbd6c1da27879b4ea33e20bd51d750ce296a4d100d45f40fc wpewebkit-2.34.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.34.4.tar.xz.sums +md5 b0f7dcb18acfa94cfb42fea0fe10fb0d wpewebkit-2.34.4.tar.xz +sha1 de58481b43a6dba054097f619ee486f7889d7a56 wpewebkit-2.34.4.tar.xz +sha256 3653ba42dbe22a4e6751b3f7cab8d2ebb2db5b7654c5d135a2f9bedf94778cee wpewebkit-2.34.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 2cbed60cb3..25b71f0f50 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.3 +WPEWEBKIT_VERSION = 2.34.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.34.1 From aperez at igalia.com Mon Jan 24 14:16:11 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 24 Jan 2022 16:16:11 +0200 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <87mtjlwlvo.fsf@dell.be.48ers.dk> References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> Message-ID: <20220124161611.GB162969@momiji> Hello Peter, all, On Mon, 24 Jan 2022 09:58:35 +0100 Peter Korsgaard wrote: > >>>>> "Adrian" == Adrian Perez de Castro writes: > > > Update to the the next minor release, which fixes an scrolling issue and > > incorporated a patch that can now be removed from Buildroot. Release > > notes: > > > https://wpewebkit.org/release/wpewebkit-2.34.2.html > > > Signed-off-by: Adrian Perez de Castro > > What about webkitgtk? It would also be good to move that to the 2.34.x > series before we release 2022.02. I have all the intention to update WebKitGTK as soon as I have some spare cycles to figure out a build issue when X11 headers are not present (e.g. in Wayland-only configurations); currently I already have a WIP patch set here: https://git.sr.ht/~aperezdc/buildroot/log/wip/webkitgtk Also I just submitted some moments ago a small patch to update the WPE WebKit package to 2.34.4 as well. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From peter at korsgaard.com Mon Jan 24 14:44:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 15:44:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <20220124161611.GB162969@momiji> (Adrian Perez de Castro's message of "Mon, 24 Jan 2022 16:16:11 +0200") References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> <20220124161611.GB162969@momiji> Message-ID: <87ee4xw5vj.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: Hi, >> What about webkitgtk? It would also be good to move that to the 2.34.x >> series before we release 2022.02. > I have all the intention to update WebKitGTK as soon as I have some spare > cycles to figure out a build issue when X11 headers are not present (e.g. > in Wayland-only configurations); currently I already have a WIP patch set > here: > https://git.sr.ht/~aperezdc/buildroot/log/wip/webkitgtk Ahh, great! > Also I just submitted some moments ago a small patch to update the WPE WebKit > package to 2.34.4 as well. Thanks! -- Bye, Peter Korsgaard From tomazsmodis73 at hotmail.com Mon Jan 24 15:28:00 2022 From: tomazsmodis73 at hotmail.com (=?UTF-8?B?VG9tYcW+IFNtb2RpxaE=?=) Date: Mon, 24 Jan 2022 16:28:00 +0100 Subject: [Buildroot] buildroot EGLFS support Message-ID: Hi With help of Mr. Richard Ash I managed to build my buildroot Os. With the same compiler I buidl/compiled Qt libraries against buildroot sysroot. I was finally able to run some cpp code. I successfully ran Qt console application. However if I try to run Qt GUI Application I got errors. I enabled eglfs support in menuconfig: In target packages, graphic libraries and applications I enabled mesa3d option Gallium swrast driver and OpenGL EGL and OpenGL ES options. I ran make successfully, deployed to Raspberry Pi 3 b+ but after I run my app with: strace ./myapp -platform eglfs I got errror: write(2, "EGL library doesn't support Emul"..., 48EGL library doesn't support Emulator extensions Any advice? kind regards Thomas From fperrad at gmail.com Mon Jan 24 16:55:39 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 24 Jan 2022 17:55:39 +0100 Subject: [Buildroot] [PATCH] package/sqlite: bump to version 3.37.2 Message-ID: <20220124165539.778030-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 604275ebf..deb8d4c14 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz +sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 59b76ce16..b702139f6 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,10 +4,10 @@ # ################################################################################ -SQLITE_VERSION = 3.37.1 -SQLITE_TAR_VERSION = 3370100 +SQLITE_VERSION = 3.37.2 +SQLITE_TAR_VERSION = 3370200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2021 +SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite -- 2.32.0 From peter at korsgaard.com Mon Jan 24 17:16:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:16:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: add optional dependency to icu & libglib2 In-Reply-To: <20211225105738.4716-1-bernd.kuhls@t-online.de> References: <20211225105738.4716-1-bernd.kuhls@t-online.de> Message-ID: <16fb75fb-fb83-918a-3077-2d59001edb0c@korsgaard.com> On 25/12/2021 11.57, Bernd Kuhls wrote: > icu is used in lib/util/charset/ > https://git.samba.org/samba.git/?p=samba.git;a=blob;f=lib/util/charset/wscript_configure;hb=HEAD#l40 > > libglib2 is used in source3/ > https://git.samba.org/samba.git/?p=samba.git;a=blob;f=source3/wscript;hb=HEAD#l1778 > > Signed-off-by: Bernd Kuhls Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 24 17:23:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:23:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.14 In-Reply-To: <20211226162736.5528-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 26 Dec 2021 17:27:36 +0100") References: <20211226162736.5528-1-bernd.kuhls@t-online.de> Message-ID: <87fspdrqsv.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.14 > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 24 17:14:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:14:56 +0100 Subject: [Buildroot] [PATCH] package/cage: only enable XWayland if wlroots has X11 In-Reply-To: <20211225050854.1138268-1-t123yh.xyz@gmail.com> References: <20211225050854.1138268-1-t123yh.xyz@gmail.com> Message-ID: On 25/12/2021 06.08, Yunhao Tian wrote: > Cage requires wlroots to be built with X11 enabled > in order to enable XWayland, otherwise it will fail > with error: > > "ERROR: Problem encountered: Cannot build Cage with > XWayland support: wlroots has been built without it" > > Signed-off-by: Yunhao Tian Committed to 2021.02.x / 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Mon Jan 24 17:23:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 18:23:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml: add TINYXML_CPE_ID_VENDOR Message-ID: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml Signed-off-by: Fabrice Fontaine --- package/tinyxml/tinyxml.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 15280517ac..b8b8e43c05 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,5 +12,6 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README +TINYXML_CPE_ID_VENDOT = tinyxml_project $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 24 17:23:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 18:23:22 +0100 Subject: [Buildroot] [PATCH 2/2] package/tinyxml: fix CVE-2021-42260 In-Reply-To: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> References: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> Message-ID: <20220124172322.2302364-2-fontaine.fabrice@gmail.com> TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by a crafted XML message and leads to a denial of service. Signed-off-by: Fabrice Fontaine --- ...always-advance-the-pointer-if-p-0xef.patch | 37 +++++++++++++++++++ package/tinyxml/tinyxml.mk | 3 ++ 2 files changed, 40 insertions(+) create mode 100644 package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch diff --git a/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch new file mode 100644 index 0000000000..ea0f6476c8 --- /dev/null +++ b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch @@ -0,0 +1,37 @@ +From f7ca0035d17a663f55668e662b840afce7b86112 Mon Sep 17 00:00:00 2001 +From: Christian Voegl +Date: Wed, 27 Oct 2021 11:25:18 +0200 +Subject: [PATCH] In stamp always advance the pointer if *p= 0xef + +The current implementation only advanced if 0xef is followed +by two non-zero bytes. In case of malformed input (0xef should be +the start byte of a three byte character) this leads to an infinite +loop. (CVE-2021-42260) + +[Retrieved (and backported) from: +https://sourceforge.net/p/tinyxml/git/merge-requests/1] +Signed-off-by: Fabrice Fontaine +--- + tinyxmlparser.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 81b7eae..8aa0dfa 100755 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding ) + else + { p +=3; ++col; } // A normal character. + } ++ else ++ { ++ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so ++ // there is something wrong here. Just advance the pointer to evade infinite loops ++ ++p; ++ } + } + else + { +-- +2.34.1 + diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index b8b8e43c05..d173254e31 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -14,4 +14,7 @@ TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README TINYXML_CPE_ID_VENDOT = tinyxml_project +# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch +TINYXML_IGNORE_CVES += CVE-2021-42260 + $(eval $(autotools-package)) -- 2.34.1 From peter at korsgaard.com Mon Jan 24 17:25:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:25:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.9 In-Reply-To: <20211226165756.609096-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 26 Dec 2021 17:57:56 +0100") References: <20211226165756.609096-1-bernd.kuhls@t-online.de> Message-ID: <87bl01rqpd.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://forum.torproject.net/t/release-0-4-6-9-and-0-4-7-3-alpha/1265 > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Mon Jan 24 17:25:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 18:25:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/xvisor: bump to version 0.3.1 Message-ID: <20220124172520.2302603-1-fontaine.fabrice@gmail.com> - Drop first patch (already in version) - Send second patch upstream http://xhypervisor.org/index.php?page=news/20211220 Signed-off-by: Fabrice Fontaine --- .../xvisor/0001-fix-build-with-gcc-10.patch | 64 ------------------- ...smouse-back.c-fix-build-with-gcc-11.patch} | 1 + package/xvisor/xvisor.hash | 2 +- package/xvisor/xvisor.mk | 2 +- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 package/xvisor/0001-fix-build-with-gcc-10.patch rename package/xvisor/{0002-psmouse-back.c-fix-build-with-gcc-11.patch => 0001-psmouse-back.c-fix-build-with-gcc-11.patch} (98%) diff --git a/package/xvisor/0001-fix-build-with-gcc-10.patch b/package/xvisor/0001-fix-build-with-gcc-10.patch deleted file mode 100644 index a538558d86..0000000000 --- a/package/xvisor/0001-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 6 Oct 2020 21:52:20 +0200 -Subject: [PATCH] fix build with gcc 10 - -Define variables in header files as extern to avoid the following build failure -with gcc 10 (which defaults to -fno-common): - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld: -/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: -multiple definition of `sdio_func_type'; -/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: -first defined here - -Fixes: - - http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/xvisor/xvisor/pull/125] ---- - drivers/mmc/core/core.h | 2 +- - emulators/display/drawfn.h | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h -index d75d135a..e2ca3141 100644 ---- a/drivers/mmc/core/core.h -+++ b/drivers/mmc/core/core.h -@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host); - * Note: Must be called with host->lock held. - */ - extern struct vmm_bus sdio_bus_type; --struct vmm_device_type sdio_func_type; -+extern struct vmm_device_type sdio_func_type; - - int __sdio_attach(struct mmc_host *host); - -diff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h -index f9163cff..385deaf6 100644 ---- a/emulators/display/drawfn.h -+++ b/emulators/display/drawfn.h -@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *, - DRAWFN_ORDER_MAX * \ - DRAWFN_FORMAT_MAX) - --drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; - - #endif --- -2.28.0 - diff --git a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch similarity index 98% rename from package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch rename to package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch index 28010034d6..1c02f45c9d 100644 --- a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch +++ b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch @@ -17,6 +17,7 @@ Fixes: - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295 Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xvisor/xvisor/pull/139] --- drivers/input/mouse/alps.h | 4 ++-- drivers/input/mouse/lifebook.h | 6 +++--- diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash index 6938e20e7b..45b6fec49c 100644 --- a/package/xvisor/xvisor.hash +++ b/package/xvisor/xvisor.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 81660d26a0bc63979ba40872f10511df777185712eba2d0e19e816438388de05 xvisor-0.3.0.tar.xz +sha256 b1bb2ca09340e87a2f465c65196892cdd0f59b798794ae69e35d1f883cf9ba49 xvisor-0.3.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 394ff7c80b..dc49258400 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XVISOR_VERSION = 0.3.0 +XVISOR_VERSION = 0.3.1 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ -- 2.34.1 From peter at korsgaard.com Mon Jan 24 17:27:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:27:11 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Ryan Barnett In-Reply-To: <20211227084644.4C44B82975@busybox.osuosl.org> (Thomas Petazzoni's message of "Mon, 27 Dec 2021 09:51:39 +0100") References: <20211227084644.4C44B82975@busybox.osuosl.org> Message-ID: <877daprqmo.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=287601459e15c683feb9517092d8d50099b09915 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > His e-mail address is bouncing (and we have some private information > that explains why): > Ryan Barnett (ryan.barnett at collins.com) > The recipient won't be able to receive this message because it's too large. > The maximum message size that's allowed is 1 KB. This message is 7 KB. > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Mon Jan 24 17:26:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 18:26:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: bump to version 2.03.14 Message-ID: <20220124172623.2303019-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/lvmteam/lvm2/blob/v2_03_14/WHATS_NEW Signed-off-by: Fabrice Fontaine --- package/lvm2/lvm2.hash | 6 +++--- package/lvm2/lvm2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 1260669480..c52eaee1e1 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From http://sources.redhat.com/pub/lvm2/sha512.sum -sha512 e4d3bfb38b346251a2ea2cee7b79f2e12ed407652b659b35b65f58c8bb252943cee1c511713aeec8ff3400790e0e99ea6b83e8740050defe5cbb118f18bf7700 LVM2.2.03.12.tgz +sha512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d LVM2.2.03.14.tgz # Locally computed sha256 checksums -sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB +sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 70da10696c..f875b292f3 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.12 +LVM2_VERSION = 2.03.14 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = http://sources.redhat.com/pub/lvm2 LVM2_INSTALL_STAGING = YES -- 2.34.1 From peter at korsgaard.com Mon Jan 24 17:36:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:36:02 +0100 Subject: [Buildroot] [PATCH] package/coreutils: drop gl_cv_func_fstatat_zero_flag=no from config env In-Reply-To: <20211227072344.16697-1-jcmvbkbc@gmail.com> (Max Filippov's message of "Sun, 26 Dec 2021 23:23:44 -0800") References: <20211227072344.16697-1-jcmvbkbc@gmail.com> Message-ID: <87zgnlqbnh.fsf@dell.be.48ers.dk> >>>>> "Max" == Max Filippov writes: > Configuring coreutils with gl_cv_func_fstatat_zero_flag=no results in > non-functional lchmod library function which causes 'mkfifo -m' to > always complete with the message 'cannot set permissions of ...: Invalid > argument' and an error exit code. gl_cv_func_fstatat_zero_flag=no is not > needed when building coreutils-9.0 for linux and its setting should be > correctly determined by the configure script. > Drop gl_cv_func_fstatat_zero_flag=no from the coreutils configure > environment. > For more details see > https://lists.buildroot.org/pipermail/buildroot/2021-December/631388.html > Signed-off-by: Max Filippov Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 24 16:33:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 17:33:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/cage: only enable XWayland if wlroots has X11 Message-ID: <20220124172936.C6FA982B33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4294adf244cd5083ba957a106c4a13562692367d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Cage requires wlroots to be built with X11 enabled in order to enable XWayland, otherwise it will fail with error: "ERROR: Problem encountered: Cannot build Cage with XWayland support: wlroots has been built without it" Signed-off-by: Yunhao Tian [yann.morin.1998 at free.fr: - drop explicit _XORG7, as _WLROOTS_X11 depends on it ] Signed-off-by: Yann E. MORIN (cherry picked from commit 3e4c2d6213a09e9a0c598f800510acd6687ffcda) Signed-off-by: Peter Korsgaard --- package/cage/cage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cage/cage.mk b/package/cage/cage.mk index 9fc01d36c1..731702b4d3 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -10,7 +10,7 @@ CAGE_LICENSE = MIT CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) CAGE_CONF_OPTS = -Dxwayland=true else CAGE_CONF_OPTS = -Dxwayland=false From peter at korsgaard.com Mon Jan 24 16:28:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 17:28:33 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/samba4: add optional dependency to icu & libglib2 Message-ID: <20220124172936.BE29381DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2619c07f0a479cbdc3739b12d1e7a0cc4ffd562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x icu is used in lib/util/charset/ https://git.samba.org/samba.git/?p=samba.git;a=blob;f=lib/util/charset/wscript_configure;hb=HEAD#l40 libglib2 is used in source3/ https://git.samba.org/samba.git/?p=samba.git;a=blob;f=source3/wscript;hb=HEAD#l1778 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 1c4c68b8fbf471919fbbaf4e688a75c4de36a331) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index b2fb4882cb..5673521836 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -16,8 +16,10 @@ SAMBA4_DEPENDENCIES = \ host-e2fsprogs host-flex host-heimdal host-nfs-utils \ host-perl host-perl-parse-yapp host-python3 \ cmocka e2fsprogs gnutls popt zlib \ + $(if $(BR2_PACKAGE_ICU),icu) \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ + $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ $(if $(BR2_PACKAGE_READLINE),readline) \ $(TARGET_NLS_DEPENDENCIES) SAMBA4_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Mon Jan 24 17:30:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:30:54 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/coreutils: drop gl_cv_func_fstatat_zero_flag=no from config env Message-ID: <20220124172936.D81F8811E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20dffb403d72cc8639db8db5902231e02b9493fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Configuring coreutils with gl_cv_func_fstatat_zero_flag=no results in non-functional lchmod library function which causes 'mkfifo -m' to always complete with the message 'cannot set permissions of ...: Invalid argument' and an error exit code. gl_cv_func_fstatat_zero_flag=no is not needed when building coreutils-9.0 for linux and its setting should be correctly determined by the configure script. Drop gl_cv_func_fstatat_zero_flag=no from the coreutils configure environment. For more details see https://lists.buildroot.org/pipermail/buildroot/2021-December/631388.html Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni (cherry picked from commit fef5d9fbda813668885f2df00d887cb39b4fc505) Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 57b77b8c6a..cfd125e2d2 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -47,7 +47,6 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ gl_cv_func_getcwd_null=yes \ gl_cv_func_getcwd_path_max=yes \ gl_cv_func_gettimeofday_clobber=no \ - gl_cv_func_fstatat_zero_flag=no \ gl_cv_func_link_follows_symlink=no \ gl_cv_func_re_compile_pattern_working=yes \ gl_cv_func_svid_putenv=yes \ From peter at korsgaard.com Mon Jan 24 17:27:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:27:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: remove Ryan Barnett Message-ID: <20220124172936.CF5EC82BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb96c11e6f5eb3dc0384657fe2dacbcdf4d6e4d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x His e-mail address is bouncing (and we have some private information that explains why): Ryan Barnett (ryan.barnett at collins.com) The recipient won't be able to receive this message because it's too large. The maximum message size that's allowed is 1 KB. This message is 7 KB. Signed-off-by: Thomas Petazzoni (cherry picked from commit 287601459e15c683feb9517092d8d50099b09915) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index e1e526a666..9108d11f3c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2284,18 +2284,6 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ -N: Ryan Barnett -F: package/atftp/ -F: package/c-periphery/ -F: package/miraclecast/ -F: package/opkg/ -F: package/opkg-utils/ -F: package/python-pysnmp/ -F: package/python-pysnmp-mibs/ -F: package/python-tornado/ -F: package/resiprocate/ -F: package/websocketpp/ - N: Ryan Wilkins F: package/biosdevname/ From peter at korsgaard.com Mon Jan 24 17:22:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:22:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/php: bump version to 8.0.14 Message-ID: <20220124172947.AB89182BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b769aaa1fcb8e425b17879a229d633a7d5da1f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog: https://www.php.net/ChangeLog-8.php#8.0.14 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7a351e9fbe0b652a3b7472573916d791ba00fa1b) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 254484e72f..329410b54f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 cd976805ec2e9198417651027dfe16854ba2c2c388151ab9d4d268513d52ed52 php-8.0.13.tar.xz +sha256 fbde8247ac200e4de73449d9fefc8b495d323b5be9c10cdb645fb431c91156e3 php-8.0.14.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 8c45da77a2..ca59334104 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.13 +PHP_VERSION = 8.0.14 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Mon Jan 24 16:31:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 17:31:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/cage: only enable XWayland if wlroots has X11 Message-ID: <20220124172947.A0D2B82B33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0031fc0f1825de7207a7c0777a4402750b6d3583 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Cage requires wlroots to be built with X11 enabled in order to enable XWayland, otherwise it will fail with error: "ERROR: Problem encountered: Cannot build Cage with XWayland support: wlroots has been built without it" Signed-off-by: Yunhao Tian [yann.morin.1998 at free.fr: - drop explicit _XORG7, as _WLROOTS_X11 depends on it ] Signed-off-by: Yann E. MORIN (cherry picked from commit 3e4c2d6213a09e9a0c598f800510acd6687ffcda) Signed-off-by: Peter Korsgaard --- package/cage/cage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cage/cage.mk b/package/cage/cage.mk index a661857a95..c132f086f6 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -11,7 +11,7 @@ CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots CAGE_CONF_OPTS = -Dman-pages=disabled -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) CAGE_CONF_OPTS += -Dxwayland=true else CAGE_CONF_OPTS += -Dxwayland=false From peter at korsgaard.com Mon Jan 24 16:28:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 17:28:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/samba4: add optional dependency to icu & libglib2 Message-ID: <20220124172947.9828282972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8e5a9c8cdac32c85e42ed305482a7cf4296c52f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x icu is used in lib/util/charset/ https://git.samba.org/samba.git/?p=samba.git;a=blob;f=lib/util/charset/wscript_configure;hb=HEAD#l40 libglib2 is used in source3/ https://git.samba.org/samba.git/?p=samba.git;a=blob;f=source3/wscript;hb=HEAD#l1778 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 1c4c68b8fbf471919fbbaf4e688a75c4de36a331) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index eb1f3b830e..de019e7afc 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -17,8 +17,10 @@ SAMBA4_DEPENDENCIES = \ host-e2fsprogs host-flex host-heimdal host-nfs-utils \ host-perl host-perl-parse-yapp host-python3 \ cmocka e2fsprogs gnutls popt zlib \ + $(if $(BR2_PACKAGE_ICU),icu) \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ + $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ $(if $(BR2_PACKAGE_READLINE),readline) \ $(TARGET_NLS_DEPENDENCIES) SAMBA4_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Mon Jan 24 17:28:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:28:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/coreutils: drop gl_cv_func_fstatat_zero_flag=no from config env Message-ID: <20220124172947.C4F9781051@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8021a9feca97e14f5143fc339930298ebf12de4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Configuring coreutils with gl_cv_func_fstatat_zero_flag=no results in non-functional lchmod library function which causes 'mkfifo -m' to always complete with the message 'cannot set permissions of ...: Invalid argument' and an error exit code. gl_cv_func_fstatat_zero_flag=no is not needed when building coreutils-9.0 for linux and its setting should be correctly determined by the configure script. Drop gl_cv_func_fstatat_zero_flag=no from the coreutils configure environment. For more details see https://lists.buildroot.org/pipermail/buildroot/2021-December/631388.html Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni (cherry picked from commit fef5d9fbda813668885f2df00d887cb39b4fc505) Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 9c0f46cb29..a31354ac5a 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -45,7 +45,6 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ gl_cv_func_getcwd_null=yes \ gl_cv_func_getcwd_path_max=yes \ gl_cv_func_gettimeofday_clobber=no \ - gl_cv_func_fstatat_zero_flag=no \ gl_cv_func_link_follows_symlink=no \ gl_cv_func_re_compile_pattern_working=yes \ gl_cv_func_svid_putenv=yes \ From peter at korsgaard.com Mon Jan 24 17:24:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:24:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tor: bump version to 0.4.6.9 Message-ID: <20220124172947.B2BC381051@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17be0de47cbaad0e27e16a834f7d90705b0aa488 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://forum.torproject.net/t/release-0-4-6-9-and-0-4-7-3-alpha/1265 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3477d7b1428f460fdf6a75a43604a021a74cf6fc) Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 4dabf777cb..63d47d7fa6 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a tor-0.4.6.8.tar.gz +sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 31e6211693..fc1db6da6b 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.8 +TOR_VERSION = 0.4.6.9 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Jan 24 17:26:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:26:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: remove Ryan Barnett Message-ID: <20220124172947.BBBEE82DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a35749e6f93e7ff712dd3007efb2b7e8302468e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x His e-mail address is bouncing (and we have some private information that explains why): Ryan Barnett (ryan.barnett at collins.com) The recipient won't be able to receive this message because it's too large. The maximum message size that's allowed is 1 KB. This message is 7 KB. Signed-off-by: Thomas Petazzoni (cherry picked from commit 287601459e15c683feb9517092d8d50099b09915) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a9179fc154..de7d2c3fbf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2402,18 +2402,6 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ -N: Ryan Barnett -F: package/atftp/ -F: package/c-periphery/ -F: package/miraclecast/ -F: package/opkg/ -F: package/opkg-utils/ -F: package/python-pysnmp/ -F: package/python-pysnmp-mibs/ -F: package/python-tornado/ -F: package/resiprocate/ -F: package/websocketpp/ - N: Ryan Wilkins F: package/biosdevname/ From jborne at kalray.eu Mon Jan 24 17:35:21 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Mon, 24 Jan 2022 18:35:21 +0100 Subject: [Buildroot] [RFC PATCH 1/1] Fix binutils/libiberty target install directory. In-Reply-To: <20220124173521.2236-1-jborne@kalray.eu> References: <20220124173521.2236-1-jborne@kalray.eu> Message-ID: <20220124173521.2236-2-jborne@kalray.eu> Change libiberty target installation directory to $(TARGET_DIR). Signed-off-by: Jonathan Borne --- package/binutils/binutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 13f61be035..d2119e67cc 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -106,7 +106,7 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(TARGET_DIR) install endef endif -- 2.17.1 From jborne at kalray.eu Mon Jan 24 17:35:20 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Mon, 24 Jan 2022 18:35:20 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory Message-ID: <20220124173521.2236-1-jborne@kalray.eu> Hi, I stumbled upon a suspicious line in binutils.mk. In BINUTILS_INSTALL_TARGET_CMDS, libopcode and libbfd DESTDIR are both set to $(TARGET_DIR) and libiberty is the only one set to $(STAGING_DIR). Is there a reason behind this? Sorry if this is an obvious question, I am quite new to buildroot. I assume I am probably missing something. I though it was still better to ask... Thanks Best regards. Jonathan. Jonathan Borne(1): Fix binutils/libiberty target install directory. package/binutils/binutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 From baruch at tkos.co.il Mon Jan 24 17:44:29 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 24 Jan 2022 19:44:29 +0200 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <20220124173521.2236-1-jborne@kalray.eu> References: <20220124173521.2236-1-jborne@kalray.eu> Message-ID: <87k0ep9gbx.fsf@tarshish> Hi Jonathan, On Mon, Jan 24 2022, Jonathan Borne via buildroot wrote: > Hi, > I stumbled upon a suspicious line in binutils.mk. > > In BINUTILS_INSTALL_TARGET_CMDS, > libopcode and libbfd DESTDIR are both set to $(TARGET_DIR) > and libiberty is the only one set to $(STAGING_DIR). > > Is there a reason behind this? As I understand that's because libiberty is static only. Buildroot does not copy static libraries to $(TARGET_DIR) because they are only used at build time, but not at run-time. baruch > Sorry if this is an obvious question, I am quite new to buildroot. > I assume I am probably missing something. > I though it was still better to ask... > > Thanks > Best regards. > Jonathan. > > > Jonathan Borne(1): > Fix binutils/libiberty target install directory. > > package/binutils/binutils.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From romain.naour at smile.fr Mon Jan 24 18:12:10 2022 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 24 Jan 2022 19:12:10 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <87k0ep9gbx.fsf@tarshish> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> Message-ID: <10b5c0bb-03ca-605f-b1c7-2aac2a5aabff@smile.fr> Hello, Le 24/01/2022 ? 18:44, Baruch Siach via buildroot a ?crit?: > Hi Jonathan, > > On Mon, Jan 24 2022, Jonathan Borne via buildroot wrote: >> Hi, >> I stumbled upon a suspicious line in binutils.mk. >> >> In BINUTILS_INSTALL_TARGET_CMDS, >> libopcode and libbfd DESTDIR are both set to $(TARGET_DIR) >> and libiberty is the only one set to $(STAGING_DIR). >> >> Is there a reason behind this? > > As I understand that's because libiberty is static only. Buildroot does > not copy static libraries to $(TARGET_DIR) because they are only used at > build time, but not at run-time. Maybe we can just remove libiberty (static) from BINUTILS_INSTALL_TARGET_CMDS because it's already installed in staging by BINUTILS_INSTALL_STAGING_CMDS Best regards, Romain > > baruch > >> Sorry if this is an obvious question, I am quite new to buildroot. >> I assume I am probably missing something. >> I though it was still better to ask... >> >> Thanks >> Best regards. >> Jonathan. >> >> >> Jonathan Borne(1): >> Fix binutils/libiberty target install directory. >> >> package/binutils/binutils.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > From ju.o at free.fr Mon Jan 24 18:47:44 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 24 Jan 2022 19:47:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: <20220123205148.GH2502@scaer> References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> <20220119202351.GA3095239@scaer> <20220123205148.GH2502@scaer> Message-ID: <51028e4dcbbad93168992ae30a6f8330@free.fr> Hi Yann, All, On 23/01/2022 21:51, Yann E. MORIN wrote: > Julien, All, > > On 2022-01-23 21:03 +0100, Julien Olivain spake thusly: >> On 19/01/2022 21:23, Yann E. MORIN wrote: > [--SNIP--] >> >To be noted: riscv-isa-sim could also be configured with --without-boost >> >and the build succeeds. >> >Julien, do you know what ill-effect building without Boost would have? >> >> The absence of Boost is removing the "Command I/O via socket" feature >> of >> riscv-isa-sim (-s command line option). See: >> https://github.com/riscv-software-src/riscv-isa-sim/blob/v1.1.0/spike_main/spike.cc#L30 >> It's generally not needed in simple use-cases. > > Thanks for the feedback. :-) > > Indeed, if Boost is not a strict requirement, it would be nice to be > able to build without it... > >> My initial intent was to have host-riscv-isa-sim compiled without this >> Boost >> support. >> >> The upstream riscv-isa-sim detection of boost seems a bit peculiar and >> does >> not >> really honor >> --without-boost/--without-boost-regex/--without-boost-asio. >> >> Setting --without-boost alone on a system with boost will make the >> ./configure >> fail with: >> >> checking whether the Boost::ASIO library is available... yes >> configure: error: Could not find a version of the Boost::Asio >> library! >> >> Setting --without-boost --without-boost-regex --without-boost-asio >> will end >> up >> with a successful configuration/compilation, but with a binary linked >> with >> libboost_regex.so and libboost_system.so... >> >> I believe this part could be slightly improved before setting >> --without-boost >> in the BR recipe. I'll have a look into that. > > The problem, as you said, is that if Boost is available (either already > isntalled on the build machine, or host-boost is puleld in by another > package), configuring riscv-isa-sim with --without-boost still breaks > with the message you pasted above. > > But we can't guarantee that Boost (system or host-boost) is not > present. > > So, either we have a patch that fixes the Boost detection (and we push > that patch upstream), or we can only depend on host-boost and keep the > current status. I proposed a small upstream improvement of the boost detection here: https://github.com/riscv-software-src/riscv-isa-sim/pull/909 This should allow a clean host-riscv-isa-sim build in Buildroot using --without-boost is all situations (i.e. host has/hasn't boost, br host has/hasn't boost). Best regards, Julien. > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ > | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There > is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v > conspiracy. | > '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Mon Jan 24 19:56:34 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 24 Jan 2022 20:56:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluidsynth: bump to version 2.2.5 Message-ID: <20220124195634.522856-1-ju.o@free.fr> For change log since v2.2.4, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.5 Signed-off-by: Julien Olivain --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 4e544bc7f6..0d41c16d8d 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83cb1dba04c632ede74f0c0717018b062c0e00b639722203b23f77a961afd390 fluidsynth-2.2.4.tar.gz +sha256 9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8 fluidsynth-2.2.5.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 4ca8518ae0..b500944c16 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.2.4 +FLUIDSYNTH_VERSION = 2.2.5 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE -- 2.34.1 From ps.report at gmx.net Mon Jan 24 20:16:28 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 24 Jan 2022 21:16:28 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220124201628.11015-1-ps.report@gmx.net> For details see [1]. [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html Signed-off-by: Peter Seiderer --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index eafbe9254a..9c10a42dca 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz +sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf0fee409b..88d4984e2f 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 20:45:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 21:45:29 +0100 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <4a94b253-6fe7-5e79-b1e9-331b0a9051ca@baylibre.com> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> <20220122160914.7e4cc513@windsurf> <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> <4a94b253-6fe7-5e79-b1e9-331b0a9051ca@baylibre.com> Message-ID: <20220124214529.56b1bf5d@windsurf> Hello Neil, Thanks for the additional feedback. On Mon, 24 Jan 2022 14:41:49 +0100 Neil Armstrong wrote: > The binaries must be split into 2 categories: > - Pre-built: bl2, bl31, bl21, bl32, fip_create, aml_encrypt_*, ddr*.fw, acs_tool.py > - Built in the Vendor U-Boot source: acs.bin bl301.bin Right. > In 2019, Amlogic finally added a LICENSE for the pre-built binaries, before > nobody knew what was the term of the distribution. > > commit 6abaf9a869a6584b3cfca8b96d0946ed49bc9b64 > Author: Lawrence Mok > Date: Mon May 6 12:34:56 2019 -0700 > > add LICENSE file and text referring to it [1/1] > > Change-Id: Id291f42bec3ddb0c2162e6540ce1f35d1cb1d079 > > The LICENSE can be found at [1] in Khadas github. And this license is the one used at https://github.com/LibreELEC/amlogic-boot-fip which Vyacheslav wants to package in Buildroot, and this license is extremely restrictive. Basically, it says that excepts private use of the content of this repository, you can't do anything with it. > Concerning the acs.bin & bl301.bin, they use the U-Boot build system and > config header files and all these were also updated with the following SPDX: > /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ I don't really see what the license of the U-Boot build system and config headers has to do with the resulting license of the binaries. > commit 94de43d3d940cf75b4a9e4fd2a2715be8eff6138 > Author: Jiucheng Xu > Date: Wed Dec 16 10:11:00 2020 +0800 > > license: Fix the license of amlogic related codes [1/1] > > PD#SWPL-39001 > > Problem: > A customer want to add amlogic driver in uboot to > their private bootloader. Since the driver codes > are licensed under GPL-2.0, and customer have > to open their code, so we need fix the license > issue. > > Solution: > Fix the license of our related code in uboot by > adding MIT license > > Verify: > Franklin > > Change-Id: I2f3571e8720d1f4db069f882353d6ae050702cba > Signed-off-by: Jiucheng Xu > > Note, none of the vendor who publicly published the Amlogic U-Boot > source has this change, so we can consider acs.bin & bl301.bin > generated from GPL-2.0 as the commit explains. This is really a stretch. The question is which source files are compiled into acs.bin and bl301.bin ? If they use parts under the GPL-2.0, then indeed we can assume the whole is also under GPL-2.0, as it is the only license under which derivative works can be published. But the repository at https://github.com/LibreELEC/amlogic-boot-fip/ contains a lot more things than acs.bin and bl301.bin. > The pre-built binaries stored on the LibreELEC repository only comes from > public Vendor sources (Khadas, HardKernel, Libre Computer, FriendlyARM, Radxa) > and checked against vendor repositories we have access to. > > We assume they got permission from Amlogic to publicly redistribute these binaries > as we (BayLibre) were allowed to redistribute the VDEC firmware in [2] & [3]. If that's the case, then why does https://github.com/LibreELEC/amlogic-boot-fip has this LICENSE file with scary terms? I am really surprised by how unclear the licensing terms are for those blobs. This should scare pretty much any company from doing products based on Amlogic SoCs. Would it be possible to clarify this with Amlogic, and instead of their silly terms of "you can't do anything with it", have a license that at least allows distribution on Amlogic platforms? Again, thanks for your support on this! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ps.report at gmx.net Mon Jan 24 20:58:11 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 24 Jan 2022 21:58:11 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-interpipe: bump version to 1.1.8 Message-ID: <20220124205811.15913-1-ps.report@gmx.net> Changelog (since 1.1.7): 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element ddaa9b5 Add conditional build according to GST_VERSION_MINOR 730dea6 Bump project version 8718b12 Add initialization for the GstAppSinkCallbacks struct f015ff7 Remove redundant initialization of new_event callback 530da92 Update copyright year in README file e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct f0f3b8e Fix README copyright date to 2016-2022 814982e Merge branch 'hotfix/add-new-event-callback' Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 348abdb003..d9f09d2985 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 0fd29d3cba623163dd5852989d7ca21eee9033da9d14a467ccd5e527e3b4297b gst1-interpipe-1.1.7-br1.tar.gz +sha256 b97af0dfa108c5f736a961c388267c7a9c8f915e753985d7e85939091032deed gst1-interpipe-v1.1.8-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index fa4485e6f8..cec23e7fa7 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.7 +GST1_INTERPIPE_VERSION = v1.1.8 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 21:02:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:02:38 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <87k0ep9gbx.fsf@tarshish> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> Message-ID: <20220124220238.1fa0568b@windsurf> On Mon, 24 Jan 2022 19:44:29 +0200 Baruch Siach via buildroot wrote: > > Is there a reason behind this? > > As I understand that's because libiberty is static only. Buildroot does > not copy static libraries to $(TARGET_DIR) because they are only used at > build time, but not at run-time. True, but it doesn't make sense to do that in BINUTILS_INSTALL_TARGET_CMDS. It should go in BINUTILS_INSTALL_STAGING_CMDS, where it is already present, as Romain pointed out. So basically: $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install needs to be dropped from BINUTILS_INSTALL_TARGET_CMDS, if indeed libiberty is only installed as a static library. However, taking a step back: # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging define BINUTILS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef # If we don't want full binutils on target ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif This is *extremely* suspicious. Indeed, we get the libraries unconditionally installed in staging, so any other library or program that we build after binutils can potentially link against thosze libraries. But we only install them conditionally in $(TARGET_DIR) if BR2_PACKAGE_BINUTILS_TARGET=y. This seems very bad to me. Both target and staging installations should be done under the same condition. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:03:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:03:09 +0100 Subject: [Buildroot] [git commit] package/libev: bump to version 4.33 Message-ID: <20220124205624.B2A8D822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3edc9055c2098de37d4365a20fe278deaa0cebb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/xorangekiller/libev-git/blob/rel-4_33/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libev/libev.hash | 4 ++-- package/libev/libev.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libev/libev.hash b/package/libev/libev.hash index 9ab341dedd..a849f3f39a 100644 --- a/package/libev/libev.hash +++ b/package/libev/libev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e libev-4.27.tar.gz -sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE +sha256 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea libev-4.33.tar.gz +sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 38b0530f62..9f3c19d46c 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEV_VERSION = 4.27 +LIBEV_VERSION = 4.33 LIBEV_SITE = http://dist.schmorp.de/libev/Attic LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Jan 24 20:58:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 21:58:58 +0100 Subject: [Buildroot] [git commit] package/xml-security-c: bump to version 2.0.4 Message-ID: <20220124205624.AA7E1822E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27d08083ed4db5bd055219574cc602aaf8053a49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Version 2.0.4 of the Apache XML Security for C++ has been released, correcting support for OpenSSL earlier than 1.1. Version 2.0.3 of the Apache XML Security for C++ has been released, adding support for OpenSSL 3.0.0. Drop patch (already in version) and so autoreconf https://santuario.apache.org/cindex.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...onf-variable-cache-option-for-getcwd-test.patch | 50 ---------------------- package/xml-security-c/xml-security-c.hash | 4 +- package/xml-security-c/xml-security-c.mk | 5 +-- 3 files changed, 3 insertions(+), 56 deletions(-) diff --git a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch b/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch deleted file mode 100644 index 26b53ba719..0000000000 --- a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9d14fad412a497fe83cfc6ab594ddc612512f02a Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Thu, 4 Jun 2020 20:34:11 -0500 -Subject: [PATCH] autoconf variable cache option for getcwd test - -The cached variable allows cross compiled builds to successfully set the -desired default for this value without invoking a test. - -Fixes: -https://issues.apache.org/jira/browse/SANTUARIO-549 - -Signed-off-by: Matthew Weber ---- - configure.ac | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b43d7a5..c3d4489 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,14 +74,18 @@ AC_CHECK_FUNCS([strcasecmp]) - - # Check whether getcwd can dynamically allocate memory. - AC_MSG_CHECKING([whether getcwd(NULL, 0) works]) --AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -- #include ], --[char *cwd = getcwd(NULL, 0); --return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])], -- [AC_MSG_RESULT(yes) -- AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], -- [Define to 1 if getcwd(NULL, 0) works])], -- [AC_MSG_RESULT(no)]) -+AC_CACHE_VAL([xml_cv_func_getcwd_null], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include -+ #include -+ char *cwd = getcwd(NULL, 0); -+ return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;]])], -+ [xml_cv_func_getcwd_null=yes], -+ [xml_cv_func_getcwd_null=no])]) -+AC_MSG_RESULT([$xml_cv_func_getcwd_null]) -+if test $xml_cv_func_getcwd_null = yes; then -+AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], -+ [Define to 1 if getcwd(NULL, 0) works]) -+fi - - AC_LANG(C++) - --- -2.17.1 - diff --git a/package/xml-security-c/xml-security-c.hash b/package/xml-security-c/xml-security-c.hash index d91ed86e9c..f4b7041a63 100644 --- a/package/xml-security-c/xml-security-c.hash +++ b/package/xml-security-c/xml-security-c.hash @@ -1,3 +1,3 @@ -# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.2.tar.gz.sha256 -sha256 c303a2b08cb9ca0f5594adcbb83829b1e793175d7114a82f7d78def8bb2e30df xml-security-c-2.0.2.tar.gz +# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.4.tar.gz.sha256 +sha256 a78da6720f6c2ba14100d2426131e0d33eac5a2dba5cc11bdd04974b7eb89003 xml-security-c-2.0.4.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/xml-security-c/xml-security-c.mk b/package/xml-security-c/xml-security-c.mk index fe761819ee..fda9af4798 100644 --- a/package/xml-security-c/xml-security-c.mk +++ b/package/xml-security-c/xml-security-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -XML_SECURITY_C_VERSION = 2.0.2 +XML_SECURITY_C_VERSION = 2.0.4 XML_SECURITY_C_SITE = http://archive.apache.org/dist/santuario/c-library XML_SECURITY_C_LICENSE = Apache-2.0 XML_SECURITY_C_LICENSE_FILES = LICENSE.txt @@ -15,7 +15,4 @@ XML_SECURITY_C_CONF_ENV = \ xml_cv_func_getcwd_null=yes \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -# Patched configure.ac -XML_SECURITY_C_AUTORECONF = YES - $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Jan 24 21:03:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:03:33 +0100 Subject: [Buildroot] [git commit] package/vte: needs gcc >= 10 Message-ID: <20220124205648.A11B2822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63245fcf9bc801facd7b4775cc4ae9d31c3c8e24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master vte needs C++20 since https://gitlab.gnome.org/GNOME/vte/-/commit/eec33cce0b9359fddda35703e22bffd1f8f28852 to avoid the following build failure raised since bump to version 0.66.2 in commit 53c0c7dd01228122c7ceb44d65f2800dbcf473f1: ../output-1/build/vte-0.66.2/meson.build:144:0: ERROR: Assert failed: option -std=gnu++20 not supported by gcc Fixes: - http://autobuild.buildroot.org/results/c0d1adeffbf97805a0f669d01929a56ccc66a835 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/vte/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vte/Config.in b/package/vte/Config.in index 2635a6007c..45d627885f 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_VTE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ @@ -22,13 +22,13 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte -comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 10" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ BR2_TOOLCHAIN_USES_MUSL comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" From thomas.petazzoni at bootlin.com Mon Jan 24 21:03:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:03:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/libev: bump to version 4.33 In-Reply-To: <20220123212916.782418-1-fontaine.fabrice@gmail.com> References: <20220123212916.782418-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220347.60f82184@windsurf> On Sun, 23 Jan 2022 22:29:16 +0100 Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://github.com/xorangekiller/libev-git/blob/rel-4_33/Changes > > Signed-off-by: Fabrice Fontaine > --- > package/libev/libev.hash | 4 ++-- > package/libev/libev.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:03:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:03:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/vte: needs gcc >= 10 In-Reply-To: <20220123214548.783629-1-fontaine.fabrice@gmail.com> References: <20220123214548.783629-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220354.724aab7e@windsurf> On Sun, 23 Jan 2022 22:45:48 +0100 Fabrice Fontaine wrote: > vte needs C++20 since > https://gitlab.gnome.org/GNOME/vte/-/commit/eec33cce0b9359fddda35703e22bffd1f8f28852 > to avoid the following build failure raised since bump to version 0.66.2 > in commit 53c0c7dd01228122c7ceb44d65f2800dbcf473f1: > > ../output-1/build/vte-0.66.2/meson.build:144:0: ERROR: Assert failed: option -std=gnu++20 not supported by gcc > > Fixes: > - http://autobuild.buildroot.org/results/c0d1adeffbf97805a0f669d01929a56ccc66a835 > > Signed-off-by: Fabrice Fontaine > --- > package/vte/Config.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:05:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:05:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml: add TINYXML_CPE_ID_VENDOR In-Reply-To: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> References: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220521.14758457@windsurf> On Mon, 24 Jan 2022 18:23:21 +0100 Fabrice Fontaine wrote: > cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml > > Signed-off-by: Fabrice Fontaine > --- > package/tinyxml/tinyxml.mk | 1 + > 1 file changed, 1 insertion(+) Both applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:05:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:05:00 +0100 Subject: [Buildroot] [git commit] package/tinyxml: fix CVE-2021-42260 Message-ID: <20220124205911.49458822C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b23ef210299ca7f0eedf8fc898b0e5a0f3578293 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by a crafted XML message and leads to a denial of service. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...tamp-always-advance-the-pointer-if-p-0xef.patch | 37 ++++++++++++++++++++++ package/tinyxml/tinyxml.mk | 3 ++ 2 files changed, 40 insertions(+) diff --git a/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch new file mode 100644 index 0000000000..ea0f6476c8 --- /dev/null +++ b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch @@ -0,0 +1,37 @@ +From f7ca0035d17a663f55668e662b840afce7b86112 Mon Sep 17 00:00:00 2001 +From: Christian Voegl +Date: Wed, 27 Oct 2021 11:25:18 +0200 +Subject: [PATCH] In stamp always advance the pointer if *p= 0xef + +The current implementation only advanced if 0xef is followed +by two non-zero bytes. In case of malformed input (0xef should be +the start byte of a three byte character) this leads to an infinite +loop. (CVE-2021-42260) + +[Retrieved (and backported) from: +https://sourceforge.net/p/tinyxml/git/merge-requests/1] +Signed-off-by: Fabrice Fontaine +--- + tinyxmlparser.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 81b7eae..8aa0dfa 100755 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding ) + else + { p +=3; ++col; } // A normal character. + } ++ else ++ { ++ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so ++ // there is something wrong here. Just advance the pointer to evade infinite loops ++ ++p; ++ } + } + else + { +-- +2.34.1 + diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index b8b8e43c05..d173254e31 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -14,4 +14,7 @@ TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README TINYXML_CPE_ID_VENDOT = tinyxml_project +# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch +TINYXML_IGNORE_CVES += CVE-2021-42260 + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Jan 24 21:04:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:04:50 +0100 Subject: [Buildroot] [git commit] package/tinyxml: add TINYXML_CPE_ID_VENDOR Message-ID: <20220124205911.3E650812D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e46157821f0ad4107e8ddcf039661e9ac189609 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinyxml/tinyxml.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 15280517ac..b8b8e43c05 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,5 +12,6 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README +TINYXML_CPE_ID_VENDOT = tinyxml_project $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Jan 24 21:05:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:05:54 +0100 Subject: [Buildroot] [git commit] package/xvisor: bump to version 0.3.1 Message-ID: <20220124205911.53065822F6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4f8b8968770ecbf6444a5921c6472f126717626 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop first patch (already in version) - Send second patch upstream http://xhypervisor.org/index.php?page=news/20211220 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xvisor/0001-fix-build-with-gcc-10.patch | 64 ---------------------- ...001-psmouse-back.c-fix-build-with-gcc-11.patch} | 1 + package/xvisor/xvisor.hash | 2 +- package/xvisor/xvisor.mk | 2 +- 4 files changed, 3 insertions(+), 66 deletions(-) diff --git a/package/xvisor/0001-fix-build-with-gcc-10.patch b/package/xvisor/0001-fix-build-with-gcc-10.patch deleted file mode 100644 index a538558d86..0000000000 --- a/package/xvisor/0001-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 6 Oct 2020 21:52:20 +0200 -Subject: [PATCH] fix build with gcc 10 - -Define variables in header files as extern to avoid the following build failure -with gcc 10 (which defaults to -fno-common): - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld: -/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: -multiple definition of `sdio_func_type'; -/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: -first defined here - -Fixes: - - http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/xvisor/xvisor/pull/125] ---- - drivers/mmc/core/core.h | 2 +- - emulators/display/drawfn.h | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h -index d75d135a..e2ca3141 100644 ---- a/drivers/mmc/core/core.h -+++ b/drivers/mmc/core/core.h -@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host); - * Note: Must be called with host->lock held. - */ - extern struct vmm_bus sdio_bus_type; --struct vmm_device_type sdio_func_type; -+extern struct vmm_device_type sdio_func_type; - - int __sdio_attach(struct mmc_host *host); - -diff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h -index f9163cff..385deaf6 100644 ---- a/emulators/display/drawfn.h -+++ b/emulators/display/drawfn.h -@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *, - DRAWFN_ORDER_MAX * \ - DRAWFN_FORMAT_MAX) - --drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; - - #endif --- -2.28.0 - diff --git a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch similarity index 98% rename from package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch rename to package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch index 28010034d6..1c02f45c9d 100644 --- a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch +++ b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch @@ -17,6 +17,7 @@ Fixes: - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295 Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xvisor/xvisor/pull/139] --- drivers/input/mouse/alps.h | 4 ++-- drivers/input/mouse/lifebook.h | 6 +++--- diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash index 6938e20e7b..45b6fec49c 100644 --- a/package/xvisor/xvisor.hash +++ b/package/xvisor/xvisor.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 81660d26a0bc63979ba40872f10511df777185712eba2d0e19e816438388de05 xvisor-0.3.0.tar.xz +sha256 b1bb2ca09340e87a2f465c65196892cdd0f59b798794ae69e35d1f883cf9ba49 xvisor-0.3.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 394ff7c80b..dc49258400 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XVISOR_VERSION = 0.3.0 +XVISOR_VERSION = 0.3.1 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:08 +0100 Subject: [Buildroot] [git commit] package/lvm2: bump to version 2.03.14 Message-ID: <20220124205922.D6861822C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fb9b70238e8aec99e44f531b99a7e71f2822b94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/lvmteam/lvm2/blob/v2_03_14/WHATS_NEW Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lvm2/lvm2.hash | 6 +++--- package/lvm2/lvm2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 1260669480..c52eaee1e1 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From http://sources.redhat.com/pub/lvm2/sha512.sum -sha512 e4d3bfb38b346251a2ea2cee7b79f2e12ed407652b659b35b65f58c8bb252943cee1c511713aeec8ff3400790e0e99ea6b83e8740050defe5cbb118f18bf7700 LVM2.2.03.12.tgz +sha512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d LVM2.2.03.14.tgz # Locally computed sha256 checksums -sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB +sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index a5724328ff..89fdf2c1be 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.12 +LVM2_VERSION = 2.03.14 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = http://sources.redhat.com/pub/lvm2 LVM2_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/xvisor: bump to version 0.3.1 In-Reply-To: <20220124172520.2302603-1-fontaine.fabrice@gmail.com> References: <20220124172520.2302603-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220624.0fabcad6@windsurf> On Mon, 24 Jan 2022 18:25:20 +0100 Fabrice Fontaine wrote: > - Drop first patch (already in version) > - Send second patch upstream > > http://xhypervisor.org/index.php?page=news/20211220 > > Signed-off-by: Fabrice Fontaine > --- > .../xvisor/0001-fix-build-with-gcc-10.patch | 64 ------------------- > ...smouse-back.c-fix-build-with-gcc-11.patch} | 1 + > package/xvisor/xvisor.hash | 2 +- > package/xvisor/xvisor.mk | 2 +- > 4 files changed, 3 insertions(+), 66 deletions(-) > delete mode 100644 package/xvisor/0001-fix-build-with-gcc-10.patch > rename package/xvisor/{0002-psmouse-back.c-fix-build-with-gcc-11.patch => 0001-psmouse-back.c-fix-build-with-gcc-11.patch} (98%) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:36 +0100 Subject: [Buildroot] [git commit] package/fluidsynth: bump to version 2.2.5 Message-ID: <20220124205950.C2ED380FD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=506ad7f7e3b81f2ef509923f364fac9f4a922c1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log since v2.2.4, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.5 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 4e544bc7f6..0d41c16d8d 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83cb1dba04c632ede74f0c0717018b062c0e00b639722203b23f77a961afd390 fluidsynth-2.2.4.tar.gz +sha256 9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8 fluidsynth-2.2.5.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 4ca8518ae0..b500944c16 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.2.4 +FLUIDSYNTH_VERSION = 2.2.5 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluidsynth: bump to version 2.2.5 In-Reply-To: <20220124195634.522856-1-ju.o@free.fr> References: <20220124195634.522856-1-ju.o@free.fr> Message-ID: <20220124220647.0156c7cb@windsurf> On Mon, 24 Jan 2022 20:56:34 +0100 Julien Olivain wrote: > For change log since v2.2.4, see: > - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.5 > > Signed-off-by: Julien Olivain > --- > package/fluidsynth/fluidsynth.hash | 2 +- > package/fluidsynth/fluidsynth.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:54 +0100 Subject: [Buildroot] [git commit] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220124210009.20B1C822F6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12dcad48f6bce89adfc9462120b68fcc89b4c615 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index eafbe9254a..9c10a42dca 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz +sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf0fee409b..88d4984e2f 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From thomas.petazzoni at bootlin.com Mon Jan 24 21:07:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:07:07 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: <20220124201628.11015-1-ps.report@gmx.net> References: <20220124201628.11015-1-ps.report@gmx.net> Message-ID: <20220124220707.688fee47@windsurf> On Mon, 24 Jan 2022 21:16:28 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html > > Signed-off-by: Peter Seiderer > --- > package/util-linux/util-linux.hash | 2 +- > package/util-linux/util-linux.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:02:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:02:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/xml-security-c: bump to version 2.0.4 In-Reply-To: <20220123212757.781999-1-fontaine.fabrice@gmail.com> References: <20220123212757.781999-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220251.65336d07@windsurf> On Sun, 23 Jan 2022 22:27:57 +0100 Fabrice Fontaine wrote: > Version 2.0.4 of the Apache XML Security for C++ has been released, > correcting support for OpenSSL earlier than 1.1. > > Version 2.0.3 of the Apache XML Security for C++ has been released, > adding support for OpenSSL 3.0.0. > > Drop patch (already in version) and so autoreconf > > https://santuario.apache.org/cindex.html > > Signed-off-by: Fabrice Fontaine > --- > ...ariable-cache-option-for-getcwd-test.patch | 50 ------------------- > package/xml-security-c/xml-security-c.hash | 4 +- > package/xml-security-c/xml-security-c.mk | 5 +- > 3 files changed, 3 insertions(+), 56 deletions(-) > delete mode 100644 package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: bump to version 2.03.14 In-Reply-To: <20220124172623.2303019-1-fontaine.fabrice@gmail.com> References: <20220124172623.2303019-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220630.0f3cde77@windsurf> On Mon, 24 Jan 2022 18:26:23 +0100 Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://github.com/lvmteam/lvm2/blob/v2_03_14/WHATS_NEW > > Signed-off-by: Fabrice Fontaine > --- > package/lvm2/lvm2.hash | 6 +++--- > package/lvm2/lvm2.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:15:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:15:40 +0100 Subject: [Buildroot] [git commit] package/gst1-interpipe: bump version to 1.1.8 Message-ID: <20220124210854.D79E8818C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0872ac72b79439a0106768ae2b58e824e1f316da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog (since 1.1.7): 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element ddaa9b5 Add conditional build according to GST_VERSION_MINOR 730dea6 Bump project version 8718b12 Add initialization for the GstAppSinkCallbacks struct f015ff7 Remove redundant initialization of new_event callback 530da92 Update copyright year in README file e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct f0f3b8e Fix README copyright date to 2016-2022 814982e Merge branch 'hotfix/add-new-event-callback' Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 348abdb003..d9f09d2985 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 0fd29d3cba623163dd5852989d7ca21eee9033da9d14a467ccd5e527e3b4297b gst1-interpipe-1.1.7-br1.tar.gz +sha256 b97af0dfa108c5f736a961c388267c7a9c8f915e753985d7e85939091032deed gst1-interpipe-v1.1.8-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index fa4485e6f8..cec23e7fa7 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.7 +GST1_INTERPIPE_VERSION = v1.1.8 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module From thomas.petazzoni at bootlin.com Mon Jan 24 21:15:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:15:51 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-interpipe: bump version to 1.1.8 In-Reply-To: <20220124205811.15913-1-ps.report@gmx.net> References: <20220124205811.15913-1-ps.report@gmx.net> Message-ID: <20220124221551.692f4d3f@windsurf> On Mon, 24 Jan 2022 21:58:11 +0100 Peter Seiderer wrote: > Changelog (since 1.1.7): > > 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element > ddaa9b5 Add conditional build according to GST_VERSION_MINOR > 730dea6 Bump project version > 8718b12 Add initialization for the GstAppSinkCallbacks struct > f015ff7 Remove redundant initialization of new_event callback > 530da92 Update copyright year in README file > e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct > f0f3b8e Fix README copyright date to 2016-2022 > 814982e Merge branch 'hotfix/add-new-event-callback' > > Signed-off-by: Peter Seiderer > --- > package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- > package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:16:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:16:14 +0100 Subject: [Buildroot] [git commit] package/sqlite: bump to version 3.37.2 Message-ID: <20220124210929.9D252822DD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b9d6162a633daaf8a3f0e01ff67a81c3ef0e051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 604275ebfb..deb8d4c14c 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz +sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 59b76ce164..b702139f6c 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,10 +4,10 @@ # ################################################################################ -SQLITE_VERSION = 3.37.1 -SQLITE_TAR_VERSION = 3370100 +SQLITE_VERSION = 3.37.2 +SQLITE_TAR_VERSION = 3370200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2021 +SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite From thomas.petazzoni at bootlin.com Mon Jan 24 21:16:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:16:20 +0100 Subject: [Buildroot] [PATCH] package/sqlite: bump to version 3.37.2 In-Reply-To: <20220124165539.778030-1-francois.perrad@gadz.org> References: <20220124165539.778030-1-francois.perrad@gadz.org> Message-ID: <20220124221620.0f5f0cb0@windsurf> On Mon, 24 Jan 2022 17:55:39 +0100 Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > package/sqlite/sqlite.hash | 2 +- > package/sqlite/sqlite.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Jan 24 21:21:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 24 Jan 2022 22:21:49 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <20220124220238.1fa0568b@windsurf> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> Message-ID: <20220124212149.GJ2502@scaer> Thomas, All, On 2022-01-24 22:02 +0100, Thomas Petazzoni spake thusly: > On Mon, 24 Jan 2022 19:44:29 +0200 > Baruch Siach via buildroot wrote: > > > > Is there a reason behind this? > > > > As I understand that's because libiberty is static only. Buildroot does > > not copy static libraries to $(TARGET_DIR) because they are only used at > > build time, but not at run-time. > > True, but it doesn't make sense to do that in > BINUTILS_INSTALL_TARGET_CMDS. It should go in > BINUTILS_INSTALL_STAGING_CMDS, where it is already present, as Romain > pointed out. > > So basically: > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > needs to be dropped from BINUTILS_INSTALL_TARGET_CMDS, if indeed > libiberty is only installed as a static library. > > However, taking a step back: > > # We just want libbfd, libiberty and libopcodes, > # not the full-blown binutils in staging > define BINUTILS_INSTALL_STAGING_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > endef > > # If we don't want full binutils on target > ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > define BINUTILS_INSTALL_TARGET_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > endef > endif > > This is *extremely* suspicious. Indeed, we get the libraries > unconditionally installed in staging, so any other library or program > that we build after binutils can potentially link against thosze > libraries. > > But we only install them conditionally in $(TARGET_DIR) if > BR2_PACKAGE_BINUTILS_TARGET=y. > > This seems very bad to me. Both target and staging installations should > be done under the same condition. Not really. You missed the fact that binutils is an autotools package. As such, when BR2_PACKAGE_BINUTILS_TARGET=n, then the full binutils are instaleld in target, so the libs will be installed in target. So whatever gets in staging is present in target, but target can be a superset of what is in staging, so whatever links to a binutils lib from staging will find it in target. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 24 21:23:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 24 Jan 2022 22:23:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: <51028e4dcbbad93168992ae30a6f8330@free.fr> References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> <20220119202351.GA3095239@scaer> <20220123205148.GH2502@scaer> <51028e4dcbbad93168992ae30a6f8330@free.fr> Message-ID: <20220124212358.GK2502@scaer> Julien, All, On 2022-01-24 19:47 +0100, Julien Olivain spake thusly: > On 23/01/2022 21:51, Yann E. MORIN wrote: [--SNIP--] > >So, either we have a patch that fixes the Boost detection (and we push > >that patch upstream), or we can only depend on host-boost and keep the > >current status. > > I proposed a small upstream improvement of the boost detection here: > https://github.com/riscv-software-src/riscv-isa-sim/pull/909 > > This should allow a clean host-riscv-isa-sim build in Buildroot using > --without-boost is all situations (i.e. host has/hasn't boost, br host > has/hasn't boost). Thanks for the heads up. It looks like upstream has been positive about that patch of yours, great! :-) When they actually merge it, do not hesitate to send an update to buildroot to backport that patch. Thanks! Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From angelo at amarulasolutions.com Mon Jan 24 21:34:20 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 24 Jan 2022 22:34:20 +0100 Subject: [Buildroot] [PATCH v2] package/htpdate: bump to version 1.3.3 Message-ID: <20220124213420.1171861-1-angelo@amarulasolutions.com> Bump and update project to its new location. Signed-off-by: Angelo Compagnucci --- * Rebased on master * Keeping buildroot package init scripts package/htpdate/S43htpdate | 2 +- package/htpdate/htpdate.hash | 2 +- package/htpdate/htpdate.mk | 6 +++--- package/htpdate/htpdate.service | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate index 75f9a995ff..5971d70639 100644 --- a/package/htpdate/S43htpdate +++ b/package/htpdate/S43htpdate @@ -9,7 +9,7 @@ test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" \ -- -D -i "$PIDFILE" $HTPDATE_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index 824266c1bc..ef27f8f94c 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 52022346a9..200c3207a2 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,13 +4,13 @@ # ################################################################################ -HTPDATE_VERSION = 1.2.6 -HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) +HTPDATE_VERSION = 1.3.3 +HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 +HTPDATE_BUILD_OPTS = https HTPDATE_DEPENDENCIES += openssl host-pkgconf endif diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service index b7f1371b08..95220581d4 100644 --- a/package/htpdate/htpdate.service +++ b/package/htpdate/htpdate.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/run/htpdate.pid Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" EnvironmentFile=-/etc/default/htpdate -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS +ExecStart=/usr/sbin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS [Install] WantedBy=multi-user.target -- 2.25.1 From fontaine.fabrice at gmail.com Mon Jan 24 21:34:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 22:34:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/poppler: fix introspection build Message-ID: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit 9d1d4818c39d97ad7a1cdf6e075b9acae6dfff71: [ 98%] Generating Poppler-0.18.typelib Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e Signed-off-by: Fabrice Fontaine --- ...txt-allow-the-user-to-configure-INTR.patch | 43 +++++++++++++++++++ package/poppler/poppler.mk | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch diff --git a/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch new file mode 100644 index 0000000000..473966d7c9 --- /dev/null +++ b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch @@ -0,0 +1,43 @@ +From f9e5d423b0f765f2393a95c3299a2d827b9d3fb3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 24 Jan 2022 09:28:20 +0100 +Subject: [PATCH] glib/CMakeLists.txt: allow the user to configure + INTROSPECTION_COMPILER_ARGS + +Allow the user to add its own parameters such as +--includedir=$(STAGING_DIR)/usr/share/gir-1.0 to +INTROSPECTION_COMPILER_ARGS to avoid the following build failure when +cross-compiling with buildroot: + +[ 98%] Generating Poppler-0.18.typelib +Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + +Fixes: + - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1049] +--- + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 7510e69e..f5130e3c 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -119,7 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) + # General gir: Reset object-list for introspection & load tool args + set(INTROSPECTION_GIRS) + set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all") +- set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") ++ set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") + + # Poppler: Assign package to gir & export keys + set(Poppler_0_18_gir "poppler-glib") +-- +2.34.1 + diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 9e9bfc9cba..7062923c6c 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -44,7 +44,9 @@ endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) POPPLER_DEPENDENCIES += gobject-introspection -POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=ON +POPPLER_CONF_OPTS += \ + -DENABLE_GOBJECT_INTROSPECTION=ON \ + -DINTROSPECTION_COMPILER_ARGS="--includedir=$(STAGING_DIR)/usr/share/gir-1.0" else POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF endif -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 24 21:36:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 22:36:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/sslh: fix build with gcc 4.8 Message-ID: <20220124213631.2444354-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.22c in commit 5b9c58531e97b012a8a11c6ae5145b16dcfb8f74: sslh-select.c: In function 'udp_timeouts': sslh-select.c:480:5: error: 'for' loop initial declarations are only allowed in C99 mode for (int i = 0; i < fd_info->max_fd; i++) { ^ Fixes: - http://autobuild.buildroot.org/results/aaaac2beb16730747b4265e81d09cb5e072c7267 Signed-off-by: Fabrice Fontaine --- package/sslh/sslh.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 99fb6bf922..897b3b6505 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -11,7 +11,7 @@ SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING SSLH_DEPENDENCIES = pcre2 -SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) +SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" ifeq ($(BR2_PACKAGE_LIBBSD),y) SSLH_DEPENDENCIES += libbsd -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 21:53:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:53:56 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <20220124212149.GJ2502@scaer> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> <20220124212149.GJ2502@scaer> Message-ID: <20220124225356.03c1c658@windsurf> On Mon, 24 Jan 2022 22:21:49 +0100 "Yann E. MORIN" wrote: > > # We just want libbfd, libiberty and libopcodes, > > # not the full-blown binutils in staging > > define BINUTILS_INSTALL_STAGING_CMDS > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > endef > > > > # If we don't want full binutils on target > > ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > > define BINUTILS_INSTALL_TARGET_CMDS > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > endef > > endif > > > > This is *extremely* suspicious. Indeed, we get the libraries > > unconditionally installed in staging, so any other library or program > > that we build after binutils can potentially link against thosze > > libraries. > > > > But we only install them conditionally in $(TARGET_DIR) if > > BR2_PACKAGE_BINUTILS_TARGET=y. > > > > This seems very bad to me. Both target and staging installations should > > be done under the same condition. > > Not really. You missed the fact that binutils is an autotools package. > > As such, when BR2_PACKAGE_BINUTILS_TARGET=n, then the full binutils are > instaleld in target, so the libs will be installed in target. Aah, indeed, the condition is: ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > So whatever gets in staging is present in target, but target can be a > superset of what is in staging, so whatever links to a binutils lib from > staging will find it in target. Correct! Thanks for pointing me at my own mistake :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From angelo at amarulasolutions.com Mon Jan 24 21:59:04 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 24 Jan 2022 22:59:04 +0100 Subject: [Buildroot] [PATCH v3] package/htpdate: bump to version 1.3.3 Message-ID: <20220124215904.1200436-1-angelo@amarulasolutions.com> Bump and update project to its new location. Signed-off-by: Angelo Compagnucci --- v1->v2: * Rebased on master * Keeping buildroot package init scripts v2->v3: * Updating LICENSE hash package/htpdate/S43htpdate | 2 +- package/htpdate/htpdate.hash | 4 ++-- package/htpdate/htpdate.mk | 6 +++--- package/htpdate/htpdate.service | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate index 75f9a995ff..5971d70639 100644 --- a/package/htpdate/S43htpdate +++ b/package/htpdate/S43htpdate @@ -9,7 +9,7 @@ test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" \ -- -D -i "$PIDFILE" $HTPDATE_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index 824266c1bc..6876f2da51 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz -sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz +sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 52022346a9..200c3207a2 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,13 +4,13 @@ # ################################################################################ -HTPDATE_VERSION = 1.2.6 -HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) +HTPDATE_VERSION = 1.3.3 +HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 +HTPDATE_BUILD_OPTS = https HTPDATE_DEPENDENCIES += openssl host-pkgconf endif diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service index b7f1371b08..95220581d4 100644 --- a/package/htpdate/htpdate.service +++ b/package/htpdate/htpdate.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/run/htpdate.pid Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" EnvironmentFile=-/etc/default/htpdate -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS +ExecStart=/usr/sbin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS [Install] WantedBy=multi-user.target -- 2.25.1 From fontaine.fabrice at gmail.com Mon Jan 24 22:10:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 23:10:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump to version 0.103.5 Message-ID: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> ClamAV 0.103.5 is a critical patch release with the following fix: - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the clamscan --gen-json option) is enabled. https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md Signed-off-by: Fabrice Fontaine --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index d68b04af76..73f4ff88f1 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz +sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 94b589b975..cd2d06e6b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.4 +CLAMAV_VERSION = 0.103.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 24 22:16:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 23:16:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: bump to version 1.6.9 Message-ID: <20220124221657.2629467-1-fontaine.fabrice@gmail.com> Drop patches (already in version) and so autoreconf https://github.com/chu11/freeipmi-mirror/blob/freeipmi-1-6-9/NEWS Signed-off-by: Fabrice Fontaine --- package/freeipmi/0001-fix-build-on-musl.patch | 49 ------------------ .../0002-check-for-inb-and-outb.patch | 50 ------------------- ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 ------------------- package/freeipmi/freeipmi.hash | 2 +- package/freeipmi/freeipmi.mk | 4 +- 5 files changed, 2 insertions(+), 153 deletions(-) delete mode 100644 package/freeipmi/0001-fix-build-on-musl.patch delete mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch delete mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch diff --git a/package/freeipmi/0001-fix-build-on-musl.patch b/package/freeipmi/0001-fix-build-on-musl.patch deleted file mode 100644 index ff7425d221..0000000000 --- a/package/freeipmi/0001-fix-build-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 Oct 2021 00:26:40 +0200 -Subject: [PATCH] fix build on musl - -musl doesn't provide getmsg or putmsg even if stropts.h is available - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2] ---- - configure.ac | 1 + - libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 562dd624e..711b27674 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) - AC_CHECK_FUNCS([iopl]) - AC_CHECK_FUNCS([asprintf]) - AC_CHECK_FUNCS([cbrt]) -+AC_CHECK_FUNCS([getmsg putmsg]) - - dnl sighandler_t apparently not defined in Apple/OS X - AC_CHECK_TYPES([sighandler_t], [], [], [[#include ]]) -diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c -index 05caca8b6..4ae8c5719 100644 ---- a/libfreeipmi/driver/ipmi-sunbmc-driver.c -+++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c -@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx, - assert (ctx->io_init); - assert (ctx->putmsg_intf); - --#if defined(HAVE_SYS_STROPTS_H) -+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG) - memset (&sbuf, '\0', sizeof (struct strbuf)); - - /* Due to API differences, we need to extract the cmd out of the -@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx, - return (-1); - } - --#if defined(HAVE_SYS_STROPTS_H) -+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG) - if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0) - { - SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno); diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch deleted file mode 100644 index 3bc006acc7..0000000000 --- a/package/freeipmi/0002-check-for-inb-and-outb.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 2 Jan 2022 10:37:00 +0100 -Subject: [PATCH] check for inb and outb - -Check for inb and outb before using them to avoid the following build -failure on uclibc-ng: - -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': -/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' - -Fixes: - - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] ---- - configure.ac | 2 +- - libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 711b27674..bcc4156ff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) - AC_CHECK_FUNCS([getline getprogname]) - AC_CHECK_FUNCS([strerror strerror_r]) - AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) --AC_CHECK_FUNCS([iopl]) -+AC_CHECK_FUNCS([inb iopl outb]) - AC_CHECK_FUNCS([asprintf]) - AC_CHECK_FUNCS([cbrt]) - AC_CHECK_FUNCS([getmsg putmsg]) -diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c -index c212887c0..a9d4b2e96 100644 ---- a/libfreeipmi/driver/ipmi-kcs-driver.c -+++ b/libfreeipmi/driver/ipmi-kcs-driver.c -@@ -162,7 +162,7 @@ - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - # define _INB(port) inb (port) - # define _OUTB(data, port) outb (port, data) --#elif defined(HAVE_IOPL) -+#elif defined(HAVE_INB) && defined(HAVE_OUTB) - # define _INB(port) inb (port) - # define _OUTB(data, port) outb (data, port) - #else --- -2.33.0 - diff --git a/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch b/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch deleted file mode 100644 index 6db6c2ae3b..0000000000 --- a/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 727291789fa1930a3e5aa04a25e954cfa6e615d6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 15 Jan 2022 16:27:44 +0100 -Subject: [PATCH] configure.ac: use pkg-config to find gcrypt - -Use pkg-config to find gcrypt and avoid the following static build -failure: - -configure:13642: checking for gcry_md_open in -lgcrypt -configure:13665: /home/buildroot/autobuild/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lgcrypt >&5 -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libgcrypt.a(libgcrypt_la-visibility.o): in function `gcry_err_make_from_errno': -visibility.c:(.text+0x29): undefined reference to `gpg_err_code_from_errno' - -Fixes: - - http://autobuild.buildroot.org/results/5354f7231cf08bf762e7d86fca874ce63d9a116b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/52] ---- - configure.ac | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bcc4156ff..531e10b8d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -405,7 +405,11 @@ fi - dnl Checks for libraries. - dnl don\'t include lib if LAN not desired - if test x"${ac_with_encryption}" = xyes; then -- AC_CHECK_LIB([gcrypt], [gcry_md_open], [have_gcrypt=yes], [have_gcrypt=no]) -+ PKG_CHECK_MODULES([GCRYPT], [libgcrypt], [have_gcrypt=yes], [ -+ AC_CHECK_LIB([gcrypt], [gcry_md_open], -+ [have_gcrypt=yes GCRYPT_LIBS=-lgcrypt], -+ [have_gcrypt=no]) -+ ]) - if test "x${have_gcrypt}" = "xno"; then - AC_MSG_ERROR([libgcrypt required to build libfreeipmi]) - AC_MSG_NOTICE([Note: libgpg-error required for libgcrypt]) -@@ -421,7 +425,6 @@ if test x"${ac_with_encryption}" = xyes; then - if test "x${have_gcrypt_threads}" = "xno"; then - AC_MSG_ERROR([libgcrypt with threads support required for libfreeipmi]) - fi -- GCRYPT_LIBS=-lgcrypt - fi - AC_SUBST(GCRYPT_LIBS) - --- -2.34.1 - diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index f73b4a25fe..05fb50bd4c 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71 freeipmi-1.6.8.tar.gz +sha256 f25e1c35f3d0f1b5a99cc31ecc2353ca83ed46a15163842fba870127dc9c8206 freeipmi-1.6.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index b25ef0a4c6..9fb59245b9 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.8 +FREEIPMI_VERSION = 1.6.9 FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ @@ -14,8 +14,6 @@ FREEIPMI_LICENSE_FILES = \ COPYING.sunbmc COPYING.ZRESEARCH FREEIPMI_DEPENDENCIES = host-pkgconf FREEIPMI_INSTALL_STAGING = YES -# We're patching configure.ac -FREEIPMI_AUTORECONF = YES # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE FREEIPMI_CONF_OPTS = --without-random-device -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 24 22:18:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 23:18:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/whois: bump to version 5.5.11 Message-ID: <20220124221838.2630565-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 1478d60697..4bdfd74b20 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois/whois_5.5.10.dsc -sha256 2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd whois_5.5.10.tar.xz +# From http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois/whois_5.5.11.dsc +sha256 966281eb8301c14a1acc17e46c70061f73179d80e370aef43065c22f0947fb87 whois_5.5.11.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index c5d0a6f2ad..544cb9c2f7 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.10 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois +WHOIS_VERSION = 5.5.11 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ -- 2.34.1 From ps.report at gmx.net Mon Jan 24 22:34:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 24 Jan 2022 23:34:05 +0100 Subject: [Buildroot] buildroot EGLFS support In-Reply-To: References: Message-ID: <20220124233405.250ab307@gmx.net> Hello Toma?, On Mon, 24 Jan 2022 16:28:00 +0100, Toma? Smodi? wrote: > Hi > > With help of Mr. Richard Ash I managed to build my buildroot Os. > > With the same compiler I buidl/compiled Qt libraries against buildroot > sysroot. Why compile outside of buildroot? Qt is well integrated into buildroot (as Richard already pointed out [1])... > > I was finally able to run some cpp code. I successfully ran Qt console > application. > > However if I try to run Qt GUI Application I got errors. I enabled eglfs > support in menuconfig: > > In target packages, graphic libraries and applications I enabled mesa3d > option Gallium swrast driver and OpenGL EGL and OpenGL ES options. Why swrast and not 'Gallium vc4 driver'? > > I ran make successfully, deployed to Raspberry Pi 3 b+ but after I run > my app with: > > strace ./myapp -platform eglfs > > I got errror: > > write(2, "EGL library doesn't support Emul"..., 48EGL library doesn't > support Emulator extensions > > Any advice? My 'standard' RPi3 (64-bit) buildroot test configuration is like the following: BR2_aarch64=y BR2_ARM_FPU_VFPV4=y BR2_OPTIMIZE_3=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_GLIBC_UTILS=y BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" BR2_GENERATE_LOCALE="en_US" BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_STRACE=y BR2_PACKAGE_DEJAVU=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" BR2_PACKAGE_QT5BASE_FONTCONFIG=y BR2_PACKAGE_QT5BASE_HARFBUZZ=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5QUICKCONTROLS=y BR2_PACKAGE_QT5QUICKCONTROLS2=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="384M" # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y Needs only the added 'dtoverlay=vc4-kms-v3d' to the boot-partition config.txt file, most provided Qt gui examples run fine, e.g. /usr/lib/qt/examples/gui/analogclock/analogclock or /usr/lib/qt/examples/quickcontrols2/gallery/gallery etc. Regards, Peter [1] http://lists.busybox.net/pipermail/buildroot/2022-January/634093.html > > kind regards Thomas > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From quentin at barbe.me Mon Jan 24 22:35:55 2022 From: quentin at barbe.me (Quentin Barbe) Date: Mon, 24 Jan 2022 23:35:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/uboot-tools: add fw_printenv to host uboot tools Message-ID: <20220124223555.8595-1-quentin@barbe.me> This is useful to be able to customize the default env images in post build scripts. Signed-off-by: Quentin Barbe --- package/uboot-tools/uboot-tools.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 37e329a2af..961e123fc5 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -203,6 +203,7 @@ endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT define HOST_UBOOT_TOOLS_BUILD_CMDS $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only + $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) envtools no-dot-config-targets=envtools $(HOST_UBOOT_TOOLS_GENERATE_ENVIMAGE) $(HOST_UBOOT_TOOLS_GENERATE_BOOT_SCRIPT) endef @@ -212,6 +213,8 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(HOST_DIR)/bin/mkeficapsule $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(HOST_DIR)/bin/fw_printenv + ln -sf $(HOST_DIR)/bin/fw_printenv $(HOST_DIR)/bin/fw_setenv $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) $(HOST_UBOOT_TOOLS_INSTALL_BOOT_SCRIPT) endef -- 2.30.2 From fontaine.fabrice at gmail.com Mon Jan 24 22:38:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 23:38:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnpupnp: bump to version 4.2.1 Message-ID: <20220124223806.2720164-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/libnpupnp/libnpupnp.hash | 4 ++-- package/libnpupnp/libnpupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnpupnp/libnpupnp.hash b/package/libnpupnp/libnpupnp.hash index 9ebfd13379..276bf93c99 100644 --- a/package/libnpupnp/libnpupnp.hash +++ b/package/libnpupnp/libnpupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.1.5.tar.gz.sha256 -sha256 566f5895376a14aa87997de7ce3454595646613d1d0af34d05c31f6d9fe884a9 libnpupnp-4.1.5.tar.gz +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.2.1.tar.gz.sha256 +sha256 e0e59eb2d3d024e827050428e0e7eb228355912a38c85eb30bfeb2f0926eca4c libnpupnp-4.2.1.tar.gz # Hash for license file: sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libnpupnp/libnpupnp.mk b/package/libnpupnp/libnpupnp.mk index 03ac01c915..09bfa34b87 100644 --- a/package/libnpupnp/libnpupnp.mk +++ b/package/libnpupnp/libnpupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNPUPNP_VERSION = 4.1.5 +LIBNPUPNP_VERSION = 4.2.1 LIBNPUPNP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBNPUPNP_LICENSE = BSD-3-Clause LIBNPUPNP_LICENSE_FILES = COPYING -- 2.34.1 From quentin at barbe.me Mon Jan 24 22:09:54 2022 From: quentin at barbe.me (Quentin Barbe) Date: Mon, 24 Jan 2022 23:09:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/uboot-tools: add fw_printenv to host uboot tools Message-ID: <20220124220954.7602-1-quentin@barbe.me> This is useful to be able to customize the default env images in post build scripts. Signed-off-by: Quentin Barbe --- package/uboot-tools/uboot-tools.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 37e329a2af..961e123fc5 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -203,6 +203,7 @@ endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT define HOST_UBOOT_TOOLS_BUILD_CMDS $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only + $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) envtools no-dot-config-targets=envtools $(HOST_UBOOT_TOOLS_GENERATE_ENVIMAGE) $(HOST_UBOOT_TOOLS_GENERATE_BOOT_SCRIPT) endef @@ -212,6 +213,8 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(HOST_DIR)/bin/mkeficapsule $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(HOST_DIR)/bin/fw_printenv + ln -sf $(HOST_DIR)/bin/fw_printenv $(HOST_DIR)/bin/fw_setenv $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) $(HOST_UBOOT_TOOLS_INSTALL_BOOT_SCRIPT) endef -- 2.30.2 From thomas.petazzoni at bootlin.com Mon Jan 24 23:00:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:00:58 +0100 Subject: [Buildroot] [PATCH 00/16] Bootlin toolchain updates and x86 updates Message-ID: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Hello, This series: - Updates the OpenRISC Bootlin toolchains recently rebuilt with the _REENTRANT fix (PATCH 1) - Adds support for the new Bootlin toolchains targetting the x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 CPU variants (PATCH 2 and 3) - Simplifies the definition of BR2_ARCH in arch/Config.in.x86 in preparation for the addition of many Intel CPU variants (PATCH 4) - Syncs up the list of Intel CPU variants supported by gcc up to the point where AVX512 is introduced (PATCH 5, 6, 7, 8) - Uses the new BR2_X86_CPU_HAS_AVX512 in the definition of x86-64-v4, and also in the Bootlin toolchains script, and the files it generates (PATCH 9, 10, 11) - Adds all remaining Intel CPU variants supported by gcc up to gcc 11.x (PATCH 12, 13, 14, 15) - Documents how the arch/Config.in.x86 is ordered (PATCH 16) Note that I have left aside the "knl" and "knm" architectures as it seems they have been used much. But if for completeness reasons we want to add them, it can certainly be done. Thanks in advance for your review. Note that I mostly interested in the patches up to 11. The remaining patches are less relevant to me directly, so if you don't feel like we should add all those CPU variants, I'm fine if patches 12, 13, 14 and 15 are rejected. Best regards, Thomas Thomas Petazzoni (16): toolchain/toolchain-external/toolchain-external-bootlin: re-update OpenRISC toolchains support/scripts/gen-bootlin-toolchains: add support for new x86-64 toolchains toolchain/toolchain-external/toolchain-external-bootlin: update with new x86-64 toolchains arch/Config.in.x86: drastically simplify the BR2_ARCH definition arch/Config.in.x86: add "newer" names for several Intel x86 CPU variants arch/Config.in.x86: westmere and silvermont were added in gcc 4.9 arch/Config.in.x86: add broadwell Intel CPU variant arch/Config.in.x86: add skylake CPU variants arch/Config.in.x86: x86-64-v4 implies AVX512 support/scripts/gen-bootlin-toolchains: add missing BR2_X86_CPU_HAS_AVX512 condition for x86-64-v4 toolchain/toolchain-external/toolchain-external-bootlin: regenerate with AVX512 condition for x86-64-v4 toolchain arch/Config.in.x86: add cannonlake, icelake-client, icelake-server CPU variants arch/Config.in.x86: add goldmont, goldmont-plus, tremont, cascadelake, tigerlake CPU variants arch/Config.in.x86: add cooperlake CPU variant arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake arch/Config.in.x86: indicate how the CPU variants are ordered arch/Config.in.x86 | 294 ++++++++++- support/scripts/gen-bootlin-toolchains | 49 ++ .../tests/toolchain/test_external_bootlin.py | 225 +++++++++ .../Config.in.options | 457 +++++++++++++++++- .../toolchain-external-bootlin.hash | 46 +- .../toolchain-external-bootlin.mk | 98 +++- 6 files changed, 1129 insertions(+), 40 deletions(-) -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:00 +0100 Subject: [Buildroot] [PATCH 02/16] support/scripts/gen-bootlin-toolchains: add support for new x86-64 toolchains In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-3-thomas.petazzoni@bootlin.com> Following the merge of d6ce2a16814fd96a45888a774da6a4db74cd540a ("arch/Config.in.x86: add option for -march=x86-64") and eeace1cc13ce09a0c88ce177465b836d6eb58298 ("arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4"), bootlin.toolchains.com now provides toolchains targetting the x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 architecture variants. This commits modifies gen-bootlin-toolchains to support these toolchains. It should be noted that the description for the x86-64-v3 and x86-64-v4 toolchains are for now the same, as Buildroot doesn't yet have the options to describe the extra features that x86-64-v4 expects to find on the hardware platform. Signed-off-by: Thomas Petazzoni --- support/scripts/gen-bootlin-toolchains | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index f160a44152..a42ddb4097 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -178,6 +178,54 @@ arches = { 'conditions': ['BR2_sparc', 'BR2_sparc_v8'], 'prefix': 'sparc', }, + 'x86-64': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64'], + 'prefix': 'x86_64', + }, + 'x86-64-v2': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v2'], + 'prefix': 'x86_64', + }, + 'x86-64-v3': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42', + 'BR2_X86_CPU_HAS_AVX', + 'BR2_X86_CPU_HAS_AVX2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v3'], + 'prefix': 'x86_64', + }, + 'x86-64-v4': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42', + 'BR2_X86_CPU_HAS_AVX', + 'BR2_X86_CPU_HAS_AVX2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v4'], + 'prefix': 'x86_64', + }, 'x86-64-core-i7': { 'conditions': ['BR2_x86_64', 'BR2_X86_CPU_HAS_MMX', -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:00:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:00:59 +0100 Subject: [Buildroot] [PATCH 01/16] toolchain/toolchain-external/toolchain-external-bootlin: re-update OpenRISC toolchains In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-2-thomas.petazzoni@bootlin.com> The OpenRISC toolchains have been rebuilt once again, this time with the _REENTRANT fixed merged in commit 98e39dc80ee81a166df90b4ff3232038a63b759c ("package/gcc: define _REENTRANT for OpenRISC when -pthread is passed") Signed-off-by: Thomas Petazzoni --- .../toolchain-external-bootlin/Config.in.options | 8 ++++---- .../toolchain-external-bootlin.hash | 16 ++++++++-------- .../toolchain-external-bootlin.mk | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 94dea4a386..55b6d4c786 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -2400,7 +2400,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2021.11-4" + bool "openrisc musl bleeding-edge 2021.11-5" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -2423,7 +2423,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2021.11-4" + bool "openrisc musl stable 2021.11-5" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -2445,7 +2445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2021.11-4" + bool "openrisc uclibc bleeding-edge 2021.11-5" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -2468,7 +2468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2021.11-4" + bool "openrisc uclibc stable 2021.11-5" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 638130d8b8..8819782ac5 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -192,14 +192,14 @@ sha256 30d82c7ca41a0df9931a29a46ed881f21a889e9e59baf04e820c6679be87a7fb mips64 sha256 5c2dc11062f4817e81a328b12ab30be486b7e68c7c876eb45fffca72332a8804 nios2--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2021.11-1.sha256 sha256 f6f37f1e551edda0251ece8d906ed720bd8ec45da9d4b3e1d13721bdc9ef2882 nios2--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-4.sha256 -sha256 9100a143a2f96c46d4d593fb25f4cab4a2efc61371f12bd1a686fbd52ee64c63 openrisc--musl--bleeding-edge-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-4.sha256 -sha256 72fce2be59c18a5b3a02f51ebb83119a0f3d29ab7f2d5cd560038ff6f94f137a openrisc--musl--stable-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-4.sha256 -sha256 ffbdedf741bcfeadaf0c52ac09af83b24eedca2e9a5fc563127c5fdbd10c79a6 openrisc--uclibc--bleeding-edge-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-4.sha256 -sha256 082ec406a6a516d582a092e63f9078e200a1e32dc24d47928f90c09b1e61819b openrisc--uclibc--stable-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-5.sha256 +sha256 03f46c8fdded0002a2a04749bcf86136ec26a841654bf9fdc14575cc510739c6 openrisc--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-5.sha256 +sha256 409e4a7473125e7de7c8b0e6bc1cb971d53e63ac057e9a19102e4ce1467f442a openrisc--musl--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 9028d4e526f9e805b021791443805541a179eaf2e47a2af4dfbefb2021e44e9f openrisc--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-5.sha256 +sha256 f07d8e465f7e94e55330cfb55bbaf9fc27e4bb7b688271ead60a15aec3dbbf76 openrisc--uclibc--stable-2021.11-5.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2021.11-1.sha256 sha256 53afdbe1e48d0c60d560db8d17042a99288661fe10eebbfcfec4e56a6c2ca594 powerpc-440fp--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2021.11-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 f28592272c..64ae44f364 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -583,25 +583,25 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:02 +0100 Subject: [Buildroot] [PATCH 04/16] arch/Config.in.x86: drastically simplify the BR2_ARCH definition In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-5-thomas.petazzoni@bootlin.com> The BR2_ARCH definition is like this: * i486 for the i486 platform * i586 for a small number of platforms * i686 for all other x86 platforms when used in 32-bit, but we enumerate their entire list * x86_64 for all x86 64-bit platforms The list for i686 is long and needs to be extended everytime a new platform is added, with no added value. So this commit simplifies that by replacing this long list with just: default "i686" if BR2_i386 This works because Kconfig guarantees us that if an i386 platform matches an earlier case (i486 or one of the i586 platforms), the i486 and i586 earlier in the list will match. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0ba9ecbcea..a330d72f1d 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -311,30 +311,12 @@ config BR2_ARCH default "i686" if BR2_x86_c32 default "i586" if BR2_x86_winchip_c6 default "i586" if BR2_x86_winchip2 - default "i686" if BR2_x86_i686 - default "i686" if BR2_x86_pentium2 - default "i686" if BR2_x86_pentium3 - default "i686" if BR2_x86_pentium4 - default "i686" if BR2_x86_pentium_m - default "i686" if BR2_x86_pentiumpro - default "i686" if BR2_x86_prescott - default "i686" if BR2_x86_nocona && BR2_i386 - default "i686" if BR2_x86_core2 && BR2_i386 - default "i686" if BR2_x86_corei7 && BR2_i386 - default "i686" if BR2_x86_westmere && BR2_i386 - default "i686" if BR2_x86_corei7_avx && BR2_i386 - default "i686" if BR2_x86_core_avx2 && BR2_i386 - default "i686" if BR2_x86_atom && BR2_i386 - default "i686" if BR2_x86_silvermont && BR2_i386 - default "i686" if BR2_x86_opteron && BR2_i386 - default "i686" if BR2_x86_opteron_sse3 && BR2_i386 - default "i686" if BR2_x86_barcelona && BR2_i386 - default "i686" if BR2_x86_jaguar && BR2_i386 - default "i686" if BR2_x86_steamroller && BR2_i386 - default "i686" if BR2_x86_k6 - default "i686" if BR2_x86_k6_2 - default "i686" if BR2_x86_athlon - default "i686" if BR2_x86_athlon_4 + # We use the property of Kconfig that the first match of a + # list of default will be chosen. So the following entry will + # not match for all BR2_i386=y configurations, but only the + # ones that didn't match any of the previous cases (i486, + # i586). + default "i686" if BR2_i386 default "x86_64" if BR2_x86_64 config BR2_ENDIAN -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:03 +0100 Subject: [Buildroot] [PATCH 05/16] arch/Config.in.x86: add "newer" names for several Intel x86 CPU variants In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-6-thomas.petazzoni@bootlin.com> In gcc commit d3c11974032e21121a051d423a1d71097edf752f ("Use proper Intel processor names for -march=/-mtune="), which was merged in gcc 4.9, the following replacements were made: * corei7 -> nehalem * corei7-avx -> sandybridge * core-avx-i -> ivybridge * core-avx2 -> haswell * atom -> bonnel * slm -> silvermont So this commit marks the Buildroot options BR2_x86_corei7, BR2_x86_corei7_avx, BR2_x86_core_avx2 and BR2_x86_atom as deprecated, and adds the four corresponding options with the newer names. Note that the older options are still kept because the new option names are only supported starting gcc 4.9, and we theoretically still supports targets gcc as old as gcc 4.3. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index a330d72f1d..4beb11662d 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -174,6 +174,19 @@ config BR2_x86_corei7 select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + help + This option is deprecated. Since gcc 4.9, the gcc option + "nehalem" is preferred. Use BR2_x86_nehalem instead. +config BR2_x86_nehalem + bool "nehalem" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_westmere bool "westmere" select BR2_X86_CPU_HAS_MMX @@ -193,6 +206,20 @@ config BR2_x86_corei7_avx select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX + help + This option is deprecated. Since gcc 4.9, the gcc option + "sandybridge" is preferred. Use BR2_x86_sandybridge instead. +config BR2_x86_sandybridge + bool "sandybridge" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_core_avx2 bool "core-avx2" select BR2_X86_CPU_HAS_MMX @@ -204,6 +231,21 @@ config BR2_x86_core_avx2 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 + help + This option is deprecated. Since gcc 4.9, the gcc option + "haswell" is preferred. Use BR2_x86_haswell instead. +config BR2_x86_haswell + bool "haswell" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -211,6 +253,17 @@ config BR2_x86_atom select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 select BR2_X86_CPU_HAS_SSSE3 + help + This option is deprecated. Since gcc 4.9, the gcc option + "bonnel" is preferred. Use BR2_x86_bonnel instead. +config BR2_x86_bonnel + bool "bonnel" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_silvermont bool "silvermont" select BR2_X86_CPU_HAS_MMX @@ -341,9 +394,13 @@ config BR2_GCC_TARGET_ARCH default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 + default "nehalem" if BR2_x86_nehalem default "corei7-avx" if BR2_x86_corei7_avx + default "sandybridge" if BR2_x86_sandybridge default "core-avx2" if BR2_x86_core_avx2 + default "haswell" if BR2_x86_haswell default "atom" if BR2_x86_atom + default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "k8" if BR2_x86_opteron -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:04 +0100 Subject: [Buildroot] [PATCH 06/16] arch/Config.in.x86: westmere and silvermont were added in gcc 4.9 In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-7-thomas.petazzoni@bootlin.com> These were added in gcc commit d3c11974032e21121a051d423a1d71097edf752f ("Use proper Intel processor names for -march=/-mtune=") which was merged in gcc 4.9. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 4beb11662d..0aae26799c 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -196,6 +196,7 @@ config BR2_x86_westmere select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_corei7_avx bool "corei7-avx" select BR2_X86_CPU_HAS_MMX @@ -273,6 +274,7 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:01 +0100 Subject: [Buildroot] [PATCH 03/16] toolchain/toolchain-external/toolchain-external-bootlin: update with new x86-64 toolchains In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-4-thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni --- .../tests/toolchain/test_external_bootlin.py | 225 +++++++++ .../Config.in.options | 446 ++++++++++++++++++ .../toolchain-external-bootlin.hash | 30 ++ .../toolchain-external-bootlin.mk | 90 ++++ 4 files changed, 791 insertions(+) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index 5e908b957e..cf6174303e 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2362,6 +2362,231 @@ class TestExternalToolchainBootlinSparcv8UclibcStable(TestExternalToolchain): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664GlibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664MuslStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664UclibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664corei7GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 55b6d4c786..42cad21d71 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -37,6 +37,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 default y if BR2_sparc && BR2_sparc_v8 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 @@ -3791,6 +3795,448 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE + bool "x86-64 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 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_X86_64_GLIBC_STABLE + bool "x86-64 glibc stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE + bool "x86-64 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 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_X86_64_MUSL_STABLE + bool "x86-64 musl stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE + bool "x86-64 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64 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_X86_64_UCLIBC_STABLE + bool "x86-64 uclibc stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE + bool "x86-64-v2 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v2 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_X86_64_V2_MUSL_BLEEDING_EDGE + bool "x86-64-v2 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v2 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_X86_64_V2_UCLIBC_BLEEDING_EDGE + bool "x86-64-v2 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v2 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_X86_64_V3_GLIBC_BLEEDING_EDGE + bool "x86-64-v3 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v3 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_X86_64_V3_MUSL_BLEEDING_EDGE + bool "x86-64-v3 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v3 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_X86_64_V3_UCLIBC_BLEEDING_EDGE + bool "x86-64-v3 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v3 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_X86_64_V4_GLIBC_BLEEDING_EDGE + bool "x86-64-v4 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v4 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_X86_64_V4_MUSL_BLEEDING_EDGE + bool "x86-64-v4 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v4 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_X86_64_V4_UCLIBC_BLEEDING_EDGE + bool "x86-64-v4 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v4 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_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE bool "x86-64-core-i7 glibc bleeding-edge 2021.11-1" depends on BR2_x86_64 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 8819782ac5..6542694033 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -306,6 +306,36 @@ sha256 0ef307f6c91733ee82ce65801768013f7e6220b605f4e152158cb55b4f983582 sparc6 sha256 3c85420becb7caa84a9a229483f3f2d7158eb66817acdfa5d5700c3a05436cba sparcv8--uclibc--bleeding-edge-2021.11-3.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2021.11-1.sha256 sha256 f6d35e33338b26e71403b4c6d3944ab561f2a6e9b801ab33fbb401b4722044dd sparcv8--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2021.11-5.sha256 +sha256 024fd8edc91b9bfd643f8cf94e3f3ff2a6457aea654d10ef3516db8c3d94d5f5 x86-64--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2021.11-5.sha256 +sha256 6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0 x86-64--glibc--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2021.11-5.sha256 +sha256 468e6b73146595923fe87980a30adb54cd78f4c1e2f228e1a2c9bb705ea4243d x86-64--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2021.11-5.sha256 +sha256 2943617f6537ca195a66fb9db4a801a5dd1c108741c400d530d558d06908dd75 x86-64--musl--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 4aa8b8e2806d6fc87ba64ccec0a59b8a2fb5d157cda006d893e3f2264b7f0f10 x86-64--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2021.11-5.sha256 +sha256 e68fd1b23f4a5c5132f2122e4012c17eb24e5179b2ff45bb793a27ac30dd454f x86-64--uclibc--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2021.11-5.sha256 +sha256 af20cf98ce937f298e0958e16793bb4c7b08236bc69ab11574a4266cccc3823d x86-64-v2--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2021.11-5.sha256 +sha256 17add21a0337d2f7d0d79d1f21db88098c3474920d71f902be46e8995eb86d35 x86-64-v2--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 b3ef49012af9fc9c2c8a44b0a20722be69b518cec5db06e48480291fc28aefe0 x86-64-v2--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2021.11-5.sha256 +sha256 244d4afab02b9c54c76385657d26798515331d7d4fa90928315366f31b9cc39e x86-64-v3--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2021.11-5.sha256 +sha256 551cff1b6425e2a6ced7b7ad032fba49b43ed095faae38d1842260ac0b5d6dbf x86-64-v3--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 30188f50adef711b55ac1d5be7218e0d6ee4200ddb8660e4d4971a9cefe22f91 x86-64-v3--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2021.11-5.sha256 +sha256 0cd2de7c4103aa8cf47b72dc71146eb3bf7742a18d56c93128340ab3f4175804 x86-64-v4--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2021.11-5.sha256 +sha256 e159da16459e0f0d06a9a7467d5121202ab95e2fa6bf8abffdc0008c72fe9b07 x86-64-v4--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 984f011d170d3e46322ae4a110c86ebf995598d877f410201b3fb3d86e25dac2 x86-64-v4--uclibc--bleeding-edge-2021.11-5.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2021.11-1.sha256 sha256 a3dbfcd3347a72ca344ae77882f929615776ea9b1b058eeea0a0915e7db89b69 x86-64-core-i7--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2021.11-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 64ae44f364..fb19ef2909 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -924,6 +924,96 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:05 +0100 Subject: [Buildroot] [PATCH 07/16] arch/Config.in.x86: add broadwell Intel CPU variant In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-8-thomas.petazzoni@bootlin.com> It was added in gcc 4.9. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0aae26799c..d5d84715b8 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -247,6 +247,18 @@ config BR2_x86_haswell select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_broadwell + bool "broadwell" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -401,6 +413,7 @@ config BR2_GCC_TARGET_ARCH default "sandybridge" if BR2_x86_sandybridge default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell + default "broadwell" if BR2_x86_broadwell default "atom" if BR2_x86_atom default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:07 +0100 Subject: [Buildroot] [PATCH 09/16] arch/Config.in.x86: x86-64-v4 implies AVX512 In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-10-thomas.petazzoni@bootlin.com> Now that we have BR2_X86_CPU_HAS_AVX512, we can use it to fix the x86-64-v4 definition, which implies AVX512 support according to https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 6b18580ae4..2034fb3bb7 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -146,6 +146,7 @@ config BR2_x86_x86_64_v4 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 help This option corresponds to the x86-64-v4 micro-architecture -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:06 +0100 Subject: [Buildroot] [PATCH 08/16] arch/Config.in.x86: add skylake CPU variants In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-9-thomas.petazzoni@bootlin.com> Both skylake and skylake-avx512 were added in gcc 6.x. According to https://en.wikipedia.org/wiki/Skylake_(microarchitecture) the early Skylake processors indeed did not have AVX512 support, while the later ones did, hence the separate gcc options. Due to this being the first CPU we support with AVX512, this commit adds BR2_X86_CPU_HAS_AVX512. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index d5d84715b8..6b18580ae4 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -19,6 +19,8 @@ config BR2_X86_CPU_HAS_AVX bool config BR2_X86_CPU_HAS_AVX2 bool +config BR2_X86_CPU_HAS_AVX512 + bool choice prompt "Target Architecture Variant" @@ -259,6 +261,18 @@ config BR2_x86_broadwell select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_skylake + bool "skylake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -287,6 +301,19 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_skylake_avx512 + bool "skylake-avx512" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -414,10 +441,12 @@ config BR2_GCC_TARGET_ARCH default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell default "broadwell" if BR2_x86_broadwell + default "skylake" if BR2_x86_skylake default "atom" if BR2_x86_atom default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont + default "skylake-avx512" if BR2_x86_skylake_avx512 default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:08 +0100 Subject: [Buildroot] [PATCH 10/16] support/scripts/gen-bootlin-toolchains: add missing BR2_X86_CPU_HAS_AVX512 condition for x86-64-v4 In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-11-thomas.petazzoni@bootlin.com> The x86-64-v4 toolchain assumes availability of AVX512, as per the definition of the x86-64-v4 "standard". Signed-off-by: Thomas Petazzoni --- support/scripts/gen-bootlin-toolchains | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index a42ddb4097..dc173fa949 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -222,7 +222,8 @@ arches = { 'BR2_X86_CPU_HAS_SSE4', 'BR2_X86_CPU_HAS_SSE42', 'BR2_X86_CPU_HAS_AVX', - 'BR2_X86_CPU_HAS_AVX2'], + 'BR2_X86_CPU_HAS_AVX2', + 'BR2_X86_CPU_HAS_AVX512'], 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v4'], 'prefix': 'x86_64', }, -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:09 +0100 Subject: [Buildroot] [PATCH 11/16] toolchain/toolchain-external/toolchain-external-bootlin: regenerate with AVX512 condition for x86-64-v4 toolchain In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-12-thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni --- .../toolchain-external-bootlin/Config.in.options | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 42cad21d71..4b4404620c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -40,7 +40,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 - default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 && BR2_X86_CPU_HAS_AVX512 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 @@ -4152,6 +4152,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -4185,6 +4186,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -4217,6 +4219,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:11 +0100 Subject: [Buildroot] [PATCH 13/16] arch/Config.in.x86: add goldmont, goldmont-plus, tremont, cascadelake, tigerlake CPU variants In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-14-thomas.petazzoni@bootlin.com> These were added in gcc 9.x. The goldmont, goldmont-plus and tremont are for the low-power CPUs. While cascadelake and tigerlake are for the high-end ones. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index e9c55bb319..dffc9a74d3 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -302,6 +302,36 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_goldmont + bool "goldmont" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_goldmont_plus + bool "goldmont-plus" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_tremont + bool "tremont" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_x86_skylake_avx512 bool "skylake-avx512" select BR2_X86_CPU_HAS_MMX @@ -354,6 +384,32 @@ config BR2_x86_icelake_server select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_cascadelake + bool "cascadelake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_tigerlake + bool "tigerlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -486,10 +542,15 @@ config BR2_GCC_TARGET_ARCH default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont + default "goldmont" if BR2_x86_goldmont + default "goldmont-plus" if BR2_x86_goldmont_plus + default "tremont" if BR2_x86_tremont default "skylake-avx512" if BR2_x86_skylake_avx512 default "cannonlake" if BR2_x86_cannonlake default "icelake-client" if BR2_x86_icelake_client default "icelake-server" if BR2_x86_icelake_server + default "cascadelake" if BR2_x86_cascadelake + default "tigerlake" if BR2_x86_tigerlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:12 +0100 Subject: [Buildroot] [PATCH 14/16] arch/Config.in.x86: add cooperlake CPU variant In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-15-thomas.petazzoni@bootlin.com> It was added in gcc 10.x. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index dffc9a74d3..08837b7cea 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -397,6 +397,19 @@ config BR2_x86_cascadelake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_cooperlake + bool "cooperlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_10 config BR2_x86_tigerlake bool "tigerlake" select BR2_X86_CPU_HAS_MMX @@ -550,6 +563,7 @@ config BR2_GCC_TARGET_ARCH default "icelake-client" if BR2_x86_icelake_client default "icelake-server" if BR2_x86_icelake_server default "cascadelake" if BR2_x86_cascadelake + default "cooperlake" if BR2_x86_cooperlake default "tigerlake" if BR2_x86_tigerlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:14 +0100 Subject: [Buildroot] [PATCH 16/16] arch/Config.in.x86: indicate how the CPU variants are ordered In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-17-thomas.petazzoni@bootlin.com> They are loosely ordered according to the ordering of the gcc documentation. It is not entirely correct as the generic x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 are listed before i386 in the gcc documentation, but this nevertheless gives a good explanation for the overall ordering of the list. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index cae5502051..27f2bfcd4c 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -22,6 +22,9 @@ config BR2_X86_CPU_HAS_AVX2 config BR2_X86_CPU_HAS_AVX512 bool +# This list of CPU architecture variant is (loosely) ordered according +# to the gcc documentation at +# https://gcc.gnu.org/onlinedocs/gcc-11.2.0/gcc/x86-Options.html choice prompt "Target Architecture Variant" default BR2_x86_i586 if BR2_i386 -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:13 +0100 Subject: [Buildroot] [PATCH 15/16] arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-16-thomas.petazzoni@bootlin.com> These were added in gcc 11.x. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 08837b7cea..cae5502051 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -423,6 +423,45 @@ config BR2_x86_tigerlake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_sapphirerapids + bool "sapphirerapids" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_alderlake + bool "alderlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_rocketlake + bool "rocketlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -565,6 +604,9 @@ config BR2_GCC_TARGET_ARCH default "cascadelake" if BR2_x86_cascadelake default "cooperlake" if BR2_x86_cooperlake default "tigerlake" if BR2_x86_tigerlake + default "sapphirerapids" if BR2_x86_sapphirerapids + default "alderlake" if BR2_x86_alderlake + default "rocketlake" if BR2_x86_rocketlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:10 +0100 Subject: [Buildroot] [PATCH 12/16] arch/Config.in.x86: add cannonlake, icelake-client, icelake-server CPU variants In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-13-thomas.petazzoni@bootlin.com> These were added in gcc 8.x. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 2034fb3bb7..e9c55bb319 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -315,6 +315,45 @@ config BR2_x86_skylake_avx512 select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +config BR2_x86_cannonlake + bool "cannonlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_icelake_client + bool "icelake-client" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_icelake_server + bool "icelake-server" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -448,6 +487,9 @@ config BR2_GCC_TARGET_ARCH default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "skylake-avx512" if BR2_x86_skylake_avx512 + default "cannonlake" if BR2_x86_cannonlake + default "icelake-client" if BR2_x86_icelake_client + default "icelake-server" if BR2_x86_icelake_server default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:10:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:10:19 +0100 Subject: [Buildroot] [git commit] Revert "package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995)" Message-ID: <20220124230405.D208481D63@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9887615eda3076679fca2fe3a8335aa9cfc09f72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 12dcad48f6bce89adfc9462120b68fcc89b4c615, as it causes massive build breakage. Fixes: http://autobuild.buildroot.net/results/c2edca241e754566add0fd6b3f049c7945723cfc/ http://autobuild.buildroot.net/results/27d4aaef1fcffb51fa82b6ad6b0fe303a6d7be33/ --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 9c10a42dca..eafbe9254a 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz +sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 88d4984e2f..cf0fee409b 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From thomas.petazzoni at bootlin.com Mon Jan 24 23:12:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:12:22 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: <20220124220707.688fee47@windsurf> References: <20220124201628.11015-1-ps.report@gmx.net> <20220124220707.688fee47@windsurf> Message-ID: <20220125001222.582e094a@windsurf> On Mon, 24 Jan 2022 22:07:07 +0100 Thomas Petazzoni wrote: > Applied to master, thanks. And I reverted, because it breaks the build: http://autobuild.buildroot.net/?reason=%util-linux-2.37.3 (I didn't investigate, it's too late here.) Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From wbx at openadk.org Tue Jan 25 00:15:45 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Tue, 25 Jan 2022 01:15:45 +0100 Subject: [Buildroot] [PATCH] package/uclibc: update to 1.0.40 Message-ID: Signed-off-by: Waldemar Brodkorb --- package/uclibc/uclibc.hash | 4 ++-- package/uclibc/uclibc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 25bbabf2ea..989c9d887a 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.38/uClibc-ng-1.0.39.tar.xz.sha256 -sha256 cb089dfe14867a38f222d6428e85d0e1191dcbb66dd9b1a671484f6bc7c81920 uClibc-ng-1.0.39.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.40/uClibc-ng-1.0.40.tar.xz.sha256 +sha256 d863f01815a64174d5019c73475e8aff5b60848a13876e79daf5d3d83ce7f889 uClibc-ng-1.0.40.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 0feedb6cfa..d79eaa1d0d 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.39 +UCLIBC_VERSION = 1.0.40 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ -- 2.30.2 From james.hilliard1 at gmail.com Tue Jan 25 02:05:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 19:05:53 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-multidict: bump to version 6.0.2 Message-ID: <20220125020553.626832-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 2d9943fc0d..999c8867d0 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 e28b9592289597b232f09e5cc3857f32 multidict-5.2.0.tar.gz -sha256 0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce multidict-5.2.0.tar.gz +md5 f8230905ad1f50c87e8d9cc6b0bb7ca2 multidict-6.0.2.tar.gz +sha256 5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013 multidict-6.0.2.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 2619cad2ee..1a9aec7ba7 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 5.2.0 +PYTHON_MULTIDICT_VERSION = 6.0.2 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/8e/7c/e12a69795b7b7d5071614af2c691c97fbf16a2a513c66ec52dd7d0a115bb +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/fa/a7/71c253cdb8a1528802bac7503bf82fe674367e4055b09c28846fdfa4ab90 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE -- 2.25.1 From peterlin at andestech.com Tue Jan 25 05:49:54 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 25 Jan 2022 13:49:54 +0800 Subject: [Buildroot] [PATCH v2 1/3] board/andes: rearrange nds32 folder structure Message-ID: <20220125054956.27492-1-peterlin@andestech.com> Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 board/andes/{ => ae3xx}/readme.txt | 0 configs/andes_ae3xx_defconfig | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae3xx}/readme.txt (100%) diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae3xx/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch similarity index 100% rename from board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch rename to board/andes/ae3xx/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/readme.txt b/board/andes/ae3xx/readme.txt similarity index 100% rename from board/andes/readme.txt rename to board/andes/ae3xx/readme.txt diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae3xx_defconfig index 52634caa50..18051115c3 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae3xx_defconfig @@ -1,5 +1,5 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae3xx/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y -- 2.17.1 From peterlin at andestech.com Tue Jan 25 05:49:55 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 25 Jan 2022 13:49:55 +0800 Subject: [Buildroot] [PATCH v2 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220125054956.27492-1-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> Message-ID: <20220125054956.27492-2-peterlin@andestech.com> This patch provides defconfig and basic support for the Andes 45 series RISC-V architecture. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/boot.cmd | 3 + board/andes/ae350/genimage_sdcard.cfg | 29 ++ ...isable-PIC-explicitly-for-assembling.patch | 29 ++ ...2-Enable-cache-for-opensbi-jump-mode.patch | 25 ++ ...001-Fix-mmc-no-partition-table-error.patch | 27 ++ ...2-Prevent-fw_dynamic-from-relocation.patch | 27 ++ ...0003-Fix-u-boot-proper-booting-issue.patch | 26 ++ ...04-Enable-printing-OpenSBI-boot-logo.patch | 25 ++ board/andes/ae350/readme.txt | 63 ++++ board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 40 +++ 12 files changed, 573 insertions(+) create mode 100755 board/andes/ae350/ae350.dts create mode 100644 board/andes/ae350/boot.cmd create mode 100644 board/andes/ae350/genimage_sdcard.cfg create mode 100644 board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch create mode 100644 board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch create mode 100644 board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch create mode 100644 board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch create mode 100644 board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch create mode 100644 board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/uboot.config.fragment create mode 100644 configs/andes_ae350_45_defconfig diff --git a/board/andes/ae350/ae350.dts b/board/andes/ae350/ae350.dts new file mode 100755 index 0000000000..5e5d70ab25 --- /dev/null +++ b/board/andes/ae350/ae350.dts @@ -0,0 +1,274 @@ +/dts-v1/; + +/ { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,ae350"; + model = "andestech,ax45"; + aliases { + uart0 = &serial0; + spi0 = &spi; + }; + + chosen { + bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7"; + stdout-path = "uart0:38400n8"; + }; + cpus { + #address-cells = <1>; + #size-cells = <0>; + timebase-frequency = <60000000>; + CPU0: cpu at 0 { + device_type = "cpu"; + reg = <0>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU0_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU1: cpu at 1 { + device_type = "cpu"; + reg = <1>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU1_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU2: cpu at 2 { + device_type = "cpu"; + reg = <2>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU2_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU3: cpu at 3 { + device_type = "cpu"; + reg = <3>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU3_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + }; + L2: l2-cache at e0500000 { + compatible = "cache"; + cache-level = <2>; + cache-size = <0x80000>; + reg = <0x00000000 0xe0500000 0x00000000 0x00001000>; + andes,inst-prefetch = <3>; + andes,data-prefetch = <3>; + // The value format is + andes,tag-ram-ctl = <0 0>; + andes,data-ram-ctl = <0 0>; + }; + memory at 0 { + reg = <0x00000000 0x00000000 0x00000000 0x80000000>; + device_type = "memory"; + }; + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,riscv-ae350-soc", "simple-bus"; + ranges; + plic0: interrupt-controller at e4000000 { + compatible = "riscv,plic0"; + reg = <0x00000000 0xe4000000 0x00000000 0x02000000>; + interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <71>; + }; + plic1: interrupt-controller at e6400000 { + compatible = "riscv,plic1"; + reg = <0x00000000 0xe6400000 0x00000000 0x00400000>; + interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <4>; + }; + plmt0: plmt0 at e6000000 { + compatible = "riscv,plmt0"; + reg = <0x00000000 0xe6000000 0x00000000 0x00100000>; + interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>; + }; + spiclk: virt_100mhz { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; + timer0: timer at f0400000 { + compatible = "andestech,atcpit100"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + }; + pwm: pwm at f0400000 { + compatible = "andestech,atcpit100-pwm"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + pwm-cells = <2>; + }; + wdt: wdt at f0500000 { + compatible = "andestech,atcwdt200"; + reg = <0x00000000 0xf0500000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <15000000>; + }; + serial0: serial at f0300000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x00000000 0xf0300000 0x00000000 0x00001000>; + interrupts = <9 4>; + interrupt-parent = <&plic0>; + clock-frequency = <19660800>; + reg-shift = <2>; + reg-offset = <32>; + no-loopback-test = <1>; + }; + rtc0: rtc at f0600000 { + compatible = "andestech,atcrtc100"; + reg = <0x00000000 0xf0600000 0x00000000 0x00001000>; + interrupts = <1 4 2 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + gpio: gpio at f0700000 { + compatible = "andestech,atcgpio100"; + reg = <0x00000000 0xf0700000 0x00000000 0x00001000>; + interrupts = <7 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + mac0: mac at e0100000 { + compatible = "andestech,atmac100"; + reg = <0x00000000 0xe0100000 0x00000000 0x00001000>; + interrupts = <19 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + smu: smu at f0100000 { + compatible = "andestech,atcsmu"; + reg = <0x00000000 0xf0100000 0x00000000 0x00001000>; + }; + mmc0: mmc at f0e00000 { + compatible = "andestech,atfsdc010"; + reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>; + interrupts = <18 4>; + interrupt-parent = <&plic0>; + clock-freq-min-max = <400000 100000000>; + max-frequency = <100000000>; + fifo-depth = <16>; + cap-sd-highspeed; + dma-coherent; + }; + dma0: dma at f0c00000 { + compatible = "andestech,atcdmac300"; + reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>; + interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>; + interrupt-parent = <&plic0>; + dma-channels = <8>; + }; + lcd0: lcd at e0200000 { + compatible = "andestech,atflcdc100"; + reg = <0x00000000 0xe0200000 0x00000000 0x00001000>; + interrupts = <20 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + pmu: pmu { + compatible = "riscv,andes-pmu"; + device_type = "pmu"; + }; + spi: spi at f0b00000 { + compatible = "andestech,atcspi200"; + reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>; + interrupts = <4 4>; + interrupt-parent = <&plic0>; + #address-cells = <1>; + #size-cells = <0>; + num-cs = <1>; + clocks = <&spiclk>; + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0x00000000>; + spi-max-frequency = <50000000>; + spi-cpol; + spi-cpha; + }; + }; + }; +}; diff --git a/board/andes/ae350/boot.cmd b/board/andes/ae350/boot.cmd new file mode 100644 index 0000000000..2a046c6c7a --- /dev/null +++ b/board/andes/ae350/boot.cmd @@ -0,0 +1,3 @@ +setenv bootargs earlycon=sbi root=/dev/mmcblk0p2 rootwait +load mmc 0:1 0x600000 Image +booti 0x600000 - $fdtcontroladdr diff --git a/board/andes/ae350/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..e8bb3d4903 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,29 @@ +image boot.vfat { + vfat { + files = { + "Image", + "boot.scr", + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 128M +} + +image sdcard.img { + hdimage { + gpt = true + } + + partition u-boot { + partition-type-uuid = ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4 + image = "rootfs.ext4" + } +} diff --git a/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch new file mode 100644 index 0000000000..aeafed4c9f --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch @@ -0,0 +1,29 @@ +From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 29 Dec 2021 16:04:54 +0800 +Subject: [PATCH] Disable PIC explicitly for assembling + +This patch is necessary if the fw_dynamic load address +is not equal to link address. +However, they are equal currently, since we include an u-boot +patch for preventing fw_dynamic relocation. + +Signed-off-by: Yu Chien Peter Lin +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index d6f097d..441518d 100644 +--- a/Makefile ++++ b/Makefile +@@ -225,6 +225,7 @@ ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + ASFLAGS += $(GENFLAGS) + ASFLAGS += $(platform-asflags-y) + ASFLAGS += $(firmware-asflags-y) ++ASFLAGS += -fno-pic + + ARFLAGS = rcs + +-- +2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch new file mode 100644 index 0000000000..ae48a760c8 --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch @@ -0,0 +1,25 @@ +From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 30 Dec 2021 08:47:34 +0800 +Subject: [PATCH] Enable cache for opensbi jump mode + +Signed-off-by: Yu Chien Peter Lin +--- + firmware/fw_base.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/firmware/fw_base.S b/firmware/fw_base.S +index ab33e11..155d230 100644 +--- a/firmware/fw_base.S ++++ b/firmware/fw_base.S +@@ -46,6 +46,8 @@ + .globl _start + .globl _start_warm + _start: ++ li t0, 0x80003 ++ csrw 0x7ca, t0 + /* Find preferred boot HART id */ + MOV_3R s0, a0, s1, a1, s2, a2 + call fw_boot_hart +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch new file mode 100644 index 0000000000..7aff3cebf6 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch @@ -0,0 +1,27 @@ +From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:00:59 +0800 +Subject: [PATCH] Fix mmc no partition table error + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf..3b1e0aa0 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev) + return ret; + #endif + +- if (dev_read_bool(dev, "cap-mmc-highspeed") || \ +- dev_read_bool(dev, "cap-sd-highspeed")) +- chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz; +- + ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps, + priv->minmax[1] , priv->minmax[0]); + chip->mmc = &plat->mmc; +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch new file mode 100644 index 0000000000..c6e1896f1c --- /dev/null +++ b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch @@ -0,0 +1,27 @@ +From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:02:26 +0800 +Subject: [PATCH] Prevent fw_dynamic from relocation + +This patch prevents OpenSBI relocation, load fw_dynamic to link address + +Signed-off-by: Yu Chien Peter Lin +--- + board/AndesTech/ax25-ae350/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig +index e50f505a..385c4c11 100644 +--- a/board/AndesTech/ax25-ae350/Kconfig ++++ b/board/AndesTech/ax25-ae350/Kconfig +@@ -25,7 +25,7 @@ config SPL_TEXT_BASE + default 0x800000 + + config SPL_OPENSBI_LOAD_ADDR +- default 0x01000000 ++ default 0x0 + + config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch new file mode 100644 index 0000000000..20598fdba4 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch @@ -0,0 +1,26 @@ +From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 18:17:39 +0800 +Subject: [PATCH] Fix u-boot proper booting issue + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/cpu/start.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S +index 76850ec9..2ccda4f5 100644 +--- a/arch/riscv/cpu/start.S ++++ b/arch/riscv/cpu/start.S +@@ -139,7 +139,9 @@ call_harts_early_init: + * accesses gd). + */ + mv gp, s0 ++#if !CONFIG_IS_ENABLED(RISCV_SMODE) + bnez tp, secondary_hart_loop ++#endif + #endif + + jal board_init_f_init_reserve +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch new file mode 100644 index 0000000000..efd78ab26d --- /dev/null +++ b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch @@ -0,0 +1,25 @@ +From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 6 Jan 2022 13:50:07 +0800 +Subject: [PATCH] Enable printing OpenSBI boot logo + +Signed-off-by: Yu Chien Peter Lin +--- + include/opensbi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/opensbi.h b/include/opensbi.h +index d812cc8c..91fb8fd9 100644 +--- a/include/opensbi.h ++++ b/include/opensbi.h +@@ -20,7 +20,7 @@ + + enum sbi_scratch_options { + /** Disable prints during boot */ +- SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0), ++ SBI_SCRATCH_NO_BOOT_PRINTS = 0, + }; + + /** Representation dynamic info passed by previous booting stage */ +-- +2.25.1 diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..a104bb108e --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,63 @@ +Intro +===== + +Andestech AE350 Platform + +The AE350 prototype demonstrates the AE350 platform on the FPGA. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make andes_ae350_45_defconfig + +If you want to customize your configuration: + + $ make menuconfig + +Build everything +---------------- +Note: you will need to access to the network, since Buildroot will +download the packages' sources. + + $ make + +Result of the build +------------------- + +After building, you should obtain the following files: + + output/images/ + |-- Image + |-- ae350.dtb + |-- boot.scr + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- rootfs.ext2 + |-- rootfs.ext4 -> rootfs.ext2 + |-- sdcard.img + |-- u-boot-spl.bin + `-- u-boot.itb + +Copy the sdcard.img to a SD card with "dd": + + $ sudo dd if=sdcard.img of=/dev/sdX bs=4096 + +Your SD card partition should be: + + Disk /dev/mmcblk0: 31457280 sectors, 3072M + Logical sector size: 512 + Disk identifier (GUID): 546663ee-d2f1-427f-93a5-5c7b69dd801c + Partition table holds up to 128 entries + First usable sector is 34, last usable sector is 385062 + + Number Start (sector) End (sector) Size Name + 1 34 262177 128M u-boot + 2 262178 385057 60.0M rootfs + +Insert SD card and reset the board, should boot Linux from mmc. diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment new file mode 100644 index 0000000000..4992d712a5 --- /dev/null +++ b/board/andes/ae350/uboot.config.fragment @@ -0,0 +1,5 @@ +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_MMC=y +# CONFIG_SPL_RAM_SUPPORT is not set +# CONFIG_OF_BOARD is not set +CONFIG_OF_SEPARATE=y diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig new file mode 100644 index 0000000000..b8f91e50b3 --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,40 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,andestech,linux,591f3f73757ab80b46e7e1e10067ce3c82ff83a9)/linux-591f3f73757ab80b46e7e1e10067ce3c82ff83a9.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="andes/ae350" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/andes/ae350/boot.cmd" -- 2.17.1 From peterlin at andestech.com Tue Jan 25 05:49:56 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 25 Jan 2022 13:49:56 +0800 Subject: [Buildroot] [PATCH v2 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220125054956.27492-1-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> Message-ID: <20220125054956.27492-3-peterlin@andestech.com> Nylon is no longer at Andes. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- DEVELOPERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index dc810b6fe1..b191734d5a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2137,10 +2137,11 @@ N: Norbert Lange F: package/systemd/ F: package/tcf-agent/ -N: Nylon Chen +N: Yu Chien Peter Lin F: arch/Config.in.nds32 F: board/andes F: configs/andes_ae3xx_defconfig +F: configs/andes_ae350_45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel -- 2.17.1 From baruch at tkos.co.il Tue Jan 25 06:01:55 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Tue, 25 Jan 2022 08:01:55 +0200 Subject: [Buildroot] [PATCH v2] package/htpdate: bump to version 1.3.3 In-Reply-To: <20220124213420.1171861-1-angelo@amarulasolutions.com> References: <20220124213420.1171861-1-angelo@amarulasolutions.com> Message-ID: <877dao9ws8.fsf@tarshish> Hi Angelo, On Mon, Jan 24 2022, Angelo Compagnucci wrote: > Bump and update project to its new location. > > Signed-off-by: Angelo Compagnucci > --- > * Rebased on master > * Keeping buildroot package init scripts > > package/htpdate/S43htpdate | 2 +- > package/htpdate/htpdate.hash | 2 +- > package/htpdate/htpdate.mk | 6 +++--- > package/htpdate/htpdate.service | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate > index 75f9a995ff..5971d70639 100644 > --- a/package/htpdate/S43htpdate > +++ b/package/htpdate/S43htpdate > @@ -9,7 +9,7 @@ test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" > start() { > printf 'Starting %s: ' "$DAEMON" > # shellcheck disable=SC2086 # we need the word splitting > - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ > + start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" \ > -- -D -i "$PIDFILE" $HTPDATE_ARGS > status=$? > if [ "$status" -eq 0 ]; then > diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash > index 824266c1bc..ef27f8f94c 100644 > --- a/package/htpdate/htpdate.hash > +++ b/package/htpdate/htpdate.hash > @@ -1,3 +1,3 @@ > # Locally calculated: > -sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz > +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz > sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE > diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk > index 52022346a9..200c3207a2 100644 > --- a/package/htpdate/htpdate.mk > +++ b/package/htpdate/htpdate.mk > @@ -4,13 +4,13 @@ > # > ################################################################################ > > -HTPDATE_VERSION = 1.2.6 > -HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) > +HTPDATE_VERSION = 1.3.3 > +HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) You should update the Config.in link as well. baruch > HTPDATE_LICENSE = GPL-2.0+ > HTPDATE_LICENSE_FILES = LICENSE > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > -HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 > +HTPDATE_BUILD_OPTS = https > HTPDATE_DEPENDENCIES += openssl host-pkgconf > endif > > diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service > index b7f1371b08..95220581d4 100644 > --- a/package/htpdate/htpdate.service > +++ b/package/htpdate/htpdate.service > @@ -7,7 +7,7 @@ Type=forking > PIDFile=/run/htpdate.pid > Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" > EnvironmentFile=-/etc/default/htpdate > -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS > +ExecStart=/usr/sbin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS > > [Install] > WantedBy=multi-user.target -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From thomas.petazzoni at bootlin.com Tue Jan 25 07:05:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 07:05:39 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-24 Message-ID: <20220125070545.09FA6401E1@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-24 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 51 | 12 | 0 | 63 | 2021.11.x | 24 | 1 | 0 | 25 | master | 91 | 43 | 0 | 134 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 11 host-util-linux-2.37.3 | 6 bluez5_utils-5.63 | 5 guile-3.0.7 | 3 frr-8.1 | 2 log4cxx-0.12.0 | 2 util-linux-2.37.3 | 2 bat-0.18.3 | 1 cairo-1.16.0 | 1 gvfs-1.48.1 | 1 kf5-kcoreaddons-5.47.0 | 1 kvm-unit-tests-kvm-unit-tes... | 1 libplist-2.2.0 | 1 mp4v2-5.0.1 | 1 netopeer2-2.0.35 | 1 rtorrent-0.9.8 | 1 sg3_utils-1.47 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/56dc103362e7ba7917c97b8c172476db72cf3232 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/593b9029a08436b850ff6af87517ac195c4d5fa5 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/85593d26a76835d2ca4e6accb1d7b83ad1e9098e | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/be6fbe69a6efe464ff156835f8ee27f59a911c16 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f39dcea082bec2979cc56ab2547e51f33bc8e6fa | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d2b7910bbd1db5339dab4759ad1f2f2481778a83 | mips64el | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/66a50dc62e5818bfdcf0d0ecd4f599d0183d778d | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/610682d7e5c3fdcde06700828767fd67ec14be9f | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/af9e1c0d391f6e9998aacd5f00474e85c50247fd | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/25c3e9577a85ae30d76d3b5f6cb29805ec09a2b9 | ORPH sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c2d566c5d5decfc699315c6e9a57e9e0f3cd0e99 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/250814848233f66b7311d3a3eaa7f831e8c0c9b0 | ORPH aarch64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/ff4a829741676dbc501b70b3f6216fdc0182fcef | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/6e9bbd6ff1156fbfc79470a45672a0cd3da9a61a | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/43a1e376d2886b218b32a7d585132bac82181b31 | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/768cee9e747a008aaf42c434b0317f2ac0e3d180 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/e68e5c2600663668e62fbb85c859a97ed47843e8 | ORPH sh4 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/f18662c2064231bcf78d8438cce8bc0c9c261a52 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/27d4aaef1fcffb51fa82b6ad6b0fe303a6d7be33 | ORPH riscv32 | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/0267ff54ee82d853476ff7d6b14edb4aba308aa2 | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/d0daf3dbbafc6b86bf89a6fa26c14d3fe9c9dde1 | or1k | libplist-2.2.0 | NOK | http://autobuild.buildroot.net/results/529846d9f76d810998315fa45fbffa5107e20aab | ORPH i686 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/65cc4ffa5be35e74ea4e2616373cce49056b1072 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/e40cc85013721d5812229009490476627e83d0a3 | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/e5e6a7c2bd0cee79cb13135fe68cecc08ad96feb | ORPH riscv64 | netopeer2-2.0.35 | NOK | http://autobuild.buildroot.net/results/0660a4f767d5cdaf07b28a508101b87f0300850f | x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/846a91e5aeda960af08f3fccf58049c24da91a15 | ORPH powerpc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/12ebe83d6b2bc4f07b708f13489c9980e7eae705 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/42887b48e05f7fb23f80745852c3903efcea39e5 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/40b25b1c93ecaf30d91a6ad2fb434d6b494a965b | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/bc50609b429692c52e2983d44efae19cf61bcd31 | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f94780f625aa5e81d49cbbb894495d69d4d71d1b | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/bc8104f65deb54eeca8762ec99dce8c5e3a93fbc | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/4ae504a3ef8e8ff42d9eef6aee27e3a376583147 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/09e19e36823e78a75a1824040f6f52a67ac72756 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6eb39050d7ea2e8b0b1910f4cc2c35cf6e7dc5a4 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7eaec1554cd5017651b31ca2dc875f9c2617ecc8 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6db5ee4f3bb6cb19bf24056ae694be17b67f9f83 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/e84e1201748035a05e2d0c8f95069d7c64816c2a | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/5f75cc4a1f13ee5de46910841beb66fa188b312d | mipsel | util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/30285d1da000de87d8ffa514eef957b2e15037ce | ORPH arm | util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/c2edca241e754566add0fd6b3f049c7945723cfc | ORPH riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/2b564613e240e6105f64307cf2327d8403a8678c | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 gstreamer1-mm-1.10.0 | 1 haproxy-2.2.17 | 1 kismet-2020-12-R3 | 1 mesa3d-20.3.5 | 1 monkey-f54856ce250c4e257354... | 1 ndisc6-1.0.4 | 1 rocksdb-6.13.3 | 1 unknown | 1 xvisor-0.3.0 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/7b38a56dbc1705092efc8e1386e6f6119e8abd95 | ORPH sh4 | haproxy-2.2.17 | NOK | http://autobuild.buildroot.net/results/a8bd3b93c475e8b6213fc0c6276fc8b34fd6b567 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/0d9aa01ccf7dec1833c2c27d561ae527f4b0c31a | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/b3e810f0c7228b51e8a24b7ecccb867affaddb30 | m68k | kismet-2020-12-R3 | NOK | http://autobuild.buildroot.net/results/76a0dab1ac3d841c2d7fa5d31ec87b129b9b10c5 | ORPH arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/11a18e5ce6ea4870dc027f16e1ca4e083cdd1fe0 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/ef5af7fcb50bab30eebae6758109c34909765274 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/75c7c6dc8a587f076246c765c0a7c1e0d63efaf3 | ORPH m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/36d0072d9870cf18604e504a445e7aba521edc8c | arm | unknown | NOK | http://autobuild.buildroot.net/results/409c59df06e8ef7a7f8ed50a9132d4fe9a63b06d | x86_64 | xvisor-0.3.0 | NOK | http://autobuild.buildroot.net/results/6159ee6b20e4253db3bae72a3e4cd61071792fb0 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/af487bfa353492104c28a3d8686c6266843f81f5 | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/e02c7a0e22d8eee226e5c906537f7dfc559e067e | Gitlab CI results for 2022-01-24 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006799239 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006798984 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006798997 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006798998 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006799043 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006799132 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006799133 | ORPH -- http://autobuild.buildroot.net From giulio.benetti at benettiengineering.com Tue Jan 25 07:09:07 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 25 Jan 2022 08:09:07 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-24 In-Reply-To: <20220125070545.09FA6401E1@smtp2.osuosl.org> References: <20220125070545.09FA6401E1@smtp2.osuosl.org> Message-ID: <78204a26-75d9-ef6a-bf7f-dee8b47fa508@benettiengineering.com> Hi Peter, On 25/01/22 08:05, Thomas Petazzoni wrote: [SNIP] > Detail of failures for 2021.11.x > -------------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > microblazeel | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/e02c7a0e22d8eee226e5c906537f7dfc559e067e | This ^^^ is fixed by: https://git.buildroot.net/buildroot/commit/?id=540029eb4550760c2190a18ecbf0cb4391bb1dea Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Tue Jan 25 07:41:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:06 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: drastically simplify the BR2_ARCH definition Message-ID: <20220125074920.4C91E8233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73d135a695cf59eb8ab6aafb59bfd281a7400203 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The BR2_ARCH definition is like this: * i486 for the i486 platform * i586 for a small number of platforms * i686 for all other x86 platforms when used in 32-bit, but we enumerate their entire list * x86_64 for all x86 64-bit platforms The list for i686 is long and needs to be extended everytime a new platform is added, with no added value. So this commit simplifies that by replacing this long list with just: default "i686" if BR2_i386 This works because Kconfig guarantees us that if an i386 platform matches an earlier case (i486 or one of the i586 platforms), the i486 and i586 earlier in the list will match. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0ba9ecbcea..a330d72f1d 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -311,30 +311,12 @@ config BR2_ARCH default "i686" if BR2_x86_c32 default "i586" if BR2_x86_winchip_c6 default "i586" if BR2_x86_winchip2 - default "i686" if BR2_x86_i686 - default "i686" if BR2_x86_pentium2 - default "i686" if BR2_x86_pentium3 - default "i686" if BR2_x86_pentium4 - default "i686" if BR2_x86_pentium_m - default "i686" if BR2_x86_pentiumpro - default "i686" if BR2_x86_prescott - default "i686" if BR2_x86_nocona && BR2_i386 - default "i686" if BR2_x86_core2 && BR2_i386 - default "i686" if BR2_x86_corei7 && BR2_i386 - default "i686" if BR2_x86_westmere && BR2_i386 - default "i686" if BR2_x86_corei7_avx && BR2_i386 - default "i686" if BR2_x86_core_avx2 && BR2_i386 - default "i686" if BR2_x86_atom && BR2_i386 - default "i686" if BR2_x86_silvermont && BR2_i386 - default "i686" if BR2_x86_opteron && BR2_i386 - default "i686" if BR2_x86_opteron_sse3 && BR2_i386 - default "i686" if BR2_x86_barcelona && BR2_i386 - default "i686" if BR2_x86_jaguar && BR2_i386 - default "i686" if BR2_x86_steamroller && BR2_i386 - default "i686" if BR2_x86_k6 - default "i686" if BR2_x86_k6_2 - default "i686" if BR2_x86_athlon - default "i686" if BR2_x86_athlon_4 + # We use the property of Kconfig that the first match of a + # list of default will be chosen. So the following entry will + # not match for all BR2_i386=y configurations, but only the + # ones that didn't match any of the previous cases (i486, + # i586). + default "i686" if BR2_i386 default "x86_64" if BR2_x86_64 config BR2_ENDIAN From yann.morin.1998 at free.fr Tue Jan 25 07:41:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:24 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add cannonlake, icelake-client, icelake-server CPU variants Message-ID: <20220125074920.8D7868233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86a70de48e6608c222ec6f9b443420ab62406722 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These were added in gcc 8.x. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 2034fb3bb7..e9c55bb319 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -315,6 +315,45 @@ config BR2_x86_skylake_avx512 select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +config BR2_x86_cannonlake + bool "cannonlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_icelake_client + bool "icelake-client" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_icelake_server + bool "icelake-server" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -448,6 +487,9 @@ config BR2_GCC_TARGET_ARCH default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "skylake-avx512" if BR2_x86_skylake_avx512 + default "cannonlake" if BR2_x86_cannonlake + default "icelake-client" if BR2_x86_icelake_client + default "icelake-server" if BR2_x86_icelake_server default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona From yann.morin.1998 at free.fr Tue Jan 25 07:40:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:40:59 +0100 Subject: [Buildroot] [git commit] support/scripts/gen-bootlin-toolchains: add support for new x86-64 toolchains Message-ID: <20220125074920.378B082774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93cb79318147191bf3b9fc2b047c24095f3194bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Following the merge of d6ce2a16814fd96a45888a774da6a4db74cd540a ("arch/Config.in.x86: add option for -march=x86-64") and eeace1cc13ce09a0c88ce177465b836d6eb58298 ("arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4"), bootlin.toolchains.com now provides toolchains targetting the x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 architecture variants. This commits modifies gen-bootlin-toolchains to support these toolchains. It should be noted that the description for the x86-64-v3 and x86-64-v4 toolchains are for now the same, as Buildroot doesn't yet have the options to describe the extra features that x86-64-v4 expects to find on the hardware platform. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/scripts/gen-bootlin-toolchains | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index f160a44152..a42ddb4097 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -178,6 +178,54 @@ arches = { 'conditions': ['BR2_sparc', 'BR2_sparc_v8'], 'prefix': 'sparc', }, + 'x86-64': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64'], + 'prefix': 'x86_64', + }, + 'x86-64-v2': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v2'], + 'prefix': 'x86_64', + }, + 'x86-64-v3': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42', + 'BR2_X86_CPU_HAS_AVX', + 'BR2_X86_CPU_HAS_AVX2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v3'], + 'prefix': 'x86_64', + }, + 'x86-64-v4': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42', + 'BR2_X86_CPU_HAS_AVX', + 'BR2_X86_CPU_HAS_AVX2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v4'], + 'prefix': 'x86_64', + }, 'x86-64-core-i7': { 'conditions': ['BR2_x86_64', 'BR2_X86_CPU_HAS_MMX', From yann.morin.1998 at free.fr Tue Jan 25 07:41:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:28 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add cooperlake CPU variant Message-ID: <20220125074920.9C4338277A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b84dcf9686f7e97249676915b7c042f3624e453 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It was added in gcc 10.x. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index dffc9a74d3..08837b7cea 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -397,6 +397,19 @@ config BR2_x86_cascadelake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_cooperlake + bool "cooperlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_10 config BR2_x86_tigerlake bool "tigerlake" select BR2_X86_CPU_HAS_MMX @@ -550,6 +563,7 @@ config BR2_GCC_TARGET_ARCH default "icelake-client" if BR2_x86_icelake_client default "icelake-server" if BR2_x86_icelake_server default "cascadelake" if BR2_x86_cascadelake + default "cooperlake" if BR2_x86_cooperlake default "tigerlake" if BR2_x86_tigerlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 From yann.morin.1998 at free.fr Tue Jan 25 07:41:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:14 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add skylake CPU variants Message-ID: <20220125074920.6C1C082774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c0088718ebca4166f87606d5fd811a4190750e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Both skylake and skylake-avx512 were added in gcc 6.x. According to https://en.wikipedia.org/wiki/Skylake_(microarchitecture) the early Skylake processors indeed did not have AVX512 support, while the later ones did, hence the separate gcc options. Due to this being the first CPU we support with AVX512, this commit adds BR2_X86_CPU_HAS_AVX512. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index d5d84715b8..6b18580ae4 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -19,6 +19,8 @@ config BR2_X86_CPU_HAS_AVX bool config BR2_X86_CPU_HAS_AVX2 bool +config BR2_X86_CPU_HAS_AVX512 + bool choice prompt "Target Architecture Variant" @@ -259,6 +261,18 @@ config BR2_x86_broadwell select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_skylake + bool "skylake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -287,6 +301,19 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_skylake_avx512 + bool "skylake-avx512" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -414,10 +441,12 @@ config BR2_GCC_TARGET_ARCH default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell default "broadwell" if BR2_x86_broadwell + default "skylake" if BR2_x86_skylake default "atom" if BR2_x86_atom default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont + default "skylake-avx512" if BR2_x86_skylake_avx512 default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona From yann.morin.1998 at free.fr Tue Jan 25 07:41:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:10 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: westmere and silvermont were added in gcc 4.9 Message-ID: <20220125074920.5C7F88277A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a21705e7314c856dd8f75a66c99913376f3fd0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These were added in gcc commit d3c11974032e21121a051d423a1d71097edf752f ("Use proper Intel processor names for -march=/-mtune=") which was merged in gcc 4.9. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 4beb11662d..0aae26799c 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -196,6 +196,7 @@ config BR2_x86_westmere select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_corei7_avx bool "corei7-avx" select BR2_X86_CPU_HAS_MMX @@ -273,6 +274,7 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 From yann.morin.1998 at free.fr Tue Jan 25 07:41:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:26 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add goldmont, goldmont-plus, tremont, cascadelake, tigerlake CPU variants Message-ID: <20220125074920.947B582774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffcefb3a75d622fb283ec9a0e09b127de7c39110 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These were added in gcc 9.x. The goldmont, goldmont-plus and tremont are for the low-power CPUs. While cascadelake and tigerlake are for the high-end ones. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index e9c55bb319..dffc9a74d3 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -302,6 +302,36 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_goldmont + bool "goldmont" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_goldmont_plus + bool "goldmont-plus" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_tremont + bool "tremont" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_x86_skylake_avx512 bool "skylake-avx512" select BR2_X86_CPU_HAS_MMX @@ -354,6 +384,32 @@ config BR2_x86_icelake_server select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_cascadelake + bool "cascadelake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_tigerlake + bool "tigerlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -486,10 +542,15 @@ config BR2_GCC_TARGET_ARCH default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont + default "goldmont" if BR2_x86_goldmont + default "goldmont-plus" if BR2_x86_goldmont_plus + default "tremont" if BR2_x86_tremont default "skylake-avx512" if BR2_x86_skylake_avx512 default "cannonlake" if BR2_x86_cannonlake default "icelake-client" if BR2_x86_icelake_client default "icelake-server" if BR2_x86_icelake_server + default "cascadelake" if BR2_x86_cascadelake + default "tigerlake" if BR2_x86_tigerlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona From yann.morin.1998 at free.fr Tue Jan 25 07:41:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:08 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add "newer" names for several Intel x86 CPU variants Message-ID: <20220125074920.5432E82774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=653fa001f30414165cb54dde577688d78cca6b42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In gcc commit d3c11974032e21121a051d423a1d71097edf752f ("Use proper Intel processor names for -march=/-mtune="), which was merged in gcc 4.9, the following replacements were made: * corei7 -> nehalem * corei7-avx -> sandybridge * core-avx-i -> ivybridge * core-avx2 -> haswell * atom -> bonnel * slm -> silvermont So this commit marks the Buildroot options BR2_x86_corei7, BR2_x86_corei7_avx, BR2_x86_core_avx2 and BR2_x86_atom as deprecated, and adds the four corresponding options with the newer names. Note that the older options are still kept because the new option names are only supported starting gcc 4.9, and we theoretically still supports targets gcc as old as gcc 4.3. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index a330d72f1d..4beb11662d 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -174,6 +174,19 @@ config BR2_x86_corei7 select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + help + This option is deprecated. Since gcc 4.9, the gcc option + "nehalem" is preferred. Use BR2_x86_nehalem instead. +config BR2_x86_nehalem + bool "nehalem" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_westmere bool "westmere" select BR2_X86_CPU_HAS_MMX @@ -193,6 +206,20 @@ config BR2_x86_corei7_avx select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX + help + This option is deprecated. Since gcc 4.9, the gcc option + "sandybridge" is preferred. Use BR2_x86_sandybridge instead. +config BR2_x86_sandybridge + bool "sandybridge" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_core_avx2 bool "core-avx2" select BR2_X86_CPU_HAS_MMX @@ -204,6 +231,21 @@ config BR2_x86_core_avx2 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 + help + This option is deprecated. Since gcc 4.9, the gcc option + "haswell" is preferred. Use BR2_x86_haswell instead. +config BR2_x86_haswell + bool "haswell" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -211,6 +253,17 @@ config BR2_x86_atom select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 select BR2_X86_CPU_HAS_SSSE3 + help + This option is deprecated. Since gcc 4.9, the gcc option + "bonnel" is preferred. Use BR2_x86_bonnel instead. +config BR2_x86_bonnel + bool "bonnel" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_silvermont bool "silvermont" select BR2_X86_CPU_HAS_MMX @@ -341,9 +394,13 @@ config BR2_GCC_TARGET_ARCH default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 + default "nehalem" if BR2_x86_nehalem default "corei7-avx" if BR2_x86_corei7_avx + default "sandybridge" if BR2_x86_sandybridge default "core-avx2" if BR2_x86_core_avx2 + default "haswell" if BR2_x86_haswell default "atom" if BR2_x86_atom + default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "k8" if BR2_x86_opteron From yann.morin.1998 at free.fr Tue Jan 25 07:41:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:19 +0100 Subject: [Buildroot] [git commit] support/scripts/gen-bootlin-toolchains: add missing BR2_X86_CPU_HAS_AVX512 condition for x86-64-v4 Message-ID: <20220125074920.7D73D8233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ed58f94ee2944959a1c35850fb62241eefc99fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The x86-64-v4 toolchain assumes availability of AVX512, as per the definition of the x86-64-v4 "standard". Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/scripts/gen-bootlin-toolchains | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index a42ddb4097..dc173fa949 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -222,7 +222,8 @@ arches = { 'BR2_X86_CPU_HAS_SSE4', 'BR2_X86_CPU_HAS_SSE42', 'BR2_X86_CPU_HAS_AVX', - 'BR2_X86_CPU_HAS_AVX2'], + 'BR2_X86_CPU_HAS_AVX2', + 'BR2_X86_CPU_HAS_AVX512'], 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v4'], 'prefix': 'x86_64', }, From yann.morin.1998 at free.fr Tue Jan 25 07:41:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:12 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add broadwell Intel CPU variant Message-ID: <20220125074920.645B68233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3702977799b6a9a6f7e0f9bfaf83fccd95e9dc41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It was added in gcc 4.9. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0aae26799c..d5d84715b8 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -247,6 +247,18 @@ config BR2_x86_haswell select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_broadwell + bool "broadwell" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -401,6 +413,7 @@ config BR2_GCC_TARGET_ARCH default "sandybridge" if BR2_x86_sandybridge default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell + default "broadwell" if BR2_x86_broadwell default "atom" if BR2_x86_atom default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere From yann.morin.1998 at free.fr Tue Jan 25 07:40:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:40:57 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: re-update OpenRISC toolchains Message-ID: <20220125074920.2F2268233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7910b5e72df6e9b6c1dc6d3f041cf154668bd3b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The OpenRISC toolchains have been rebuilt once again, this time with the _REENTRANT fixed merged in commit 98e39dc80ee81a166df90b4ff3232038a63b759c ("package/gcc: define _REENTRANT for OpenRISC when -pthread is passed") Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../toolchain-external-bootlin/Config.in.options | 8 ++++---- .../toolchain-external-bootlin.hash | 16 ++++++++-------- .../toolchain-external-bootlin.mk | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 94dea4a386..55b6d4c786 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -2400,7 +2400,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2021.11-4" + bool "openrisc musl bleeding-edge 2021.11-5" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -2423,7 +2423,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2021.11-4" + bool "openrisc musl stable 2021.11-5" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -2445,7 +2445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2021.11-4" + bool "openrisc uclibc bleeding-edge 2021.11-5" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -2468,7 +2468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2021.11-4" + bool "openrisc uclibc stable 2021.11-5" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 638130d8b8..8819782ac5 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -192,14 +192,14 @@ sha256 30d82c7ca41a0df9931a29a46ed881f21a889e9e59baf04e820c6679be87a7fb mips64 sha256 5c2dc11062f4817e81a328b12ab30be486b7e68c7c876eb45fffca72332a8804 nios2--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2021.11-1.sha256 sha256 f6f37f1e551edda0251ece8d906ed720bd8ec45da9d4b3e1d13721bdc9ef2882 nios2--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-4.sha256 -sha256 9100a143a2f96c46d4d593fb25f4cab4a2efc61371f12bd1a686fbd52ee64c63 openrisc--musl--bleeding-edge-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-4.sha256 -sha256 72fce2be59c18a5b3a02f51ebb83119a0f3d29ab7f2d5cd560038ff6f94f137a openrisc--musl--stable-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-4.sha256 -sha256 ffbdedf741bcfeadaf0c52ac09af83b24eedca2e9a5fc563127c5fdbd10c79a6 openrisc--uclibc--bleeding-edge-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-4.sha256 -sha256 082ec406a6a516d582a092e63f9078e200a1e32dc24d47928f90c09b1e61819b openrisc--uclibc--stable-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-5.sha256 +sha256 03f46c8fdded0002a2a04749bcf86136ec26a841654bf9fdc14575cc510739c6 openrisc--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-5.sha256 +sha256 409e4a7473125e7de7c8b0e6bc1cb971d53e63ac057e9a19102e4ce1467f442a openrisc--musl--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 9028d4e526f9e805b021791443805541a179eaf2e47a2af4dfbefb2021e44e9f openrisc--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-5.sha256 +sha256 f07d8e465f7e94e55330cfb55bbaf9fc27e4bb7b688271ead60a15aec3dbbf76 openrisc--uclibc--stable-2021.11-5.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2021.11-1.sha256 sha256 53afdbe1e48d0c60d560db8d17042a99288661fe10eebbfcfec4e56a6c2ca594 powerpc-440fp--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2021.11-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 f28592272c..64ae44f364 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -583,25 +583,25 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif From yann.morin.1998 at free.fr Tue Jan 25 07:41:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:02 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: update with new x86-64 toolchains Message-ID: <20220125074920.437C48277A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7df632905fdd7d9334b71f08d8b324841912144f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../tests/toolchain/test_external_bootlin.py | 225 +++++++++++ .../toolchain-external-bootlin/Config.in.options | 446 +++++++++++++++++++++ .../toolchain-external-bootlin.hash | 30 ++ .../toolchain-external-bootlin.mk | 90 +++++ 4 files changed, 791 insertions(+) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index 5e908b957e..cf6174303e 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2362,6 +2362,231 @@ class TestExternalToolchainBootlinSparcv8UclibcStable(TestExternalToolchain): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664GlibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664MuslStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664UclibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664corei7GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 55b6d4c786..42cad21d71 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -37,6 +37,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 default y if BR2_sparc && BR2_sparc_v8 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 @@ -3791,6 +3795,448 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE + bool "x86-64 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 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_X86_64_GLIBC_STABLE + bool "x86-64 glibc stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE + bool "x86-64 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 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_X86_64_MUSL_STABLE + bool "x86-64 musl stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE + bool "x86-64 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64 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_X86_64_UCLIBC_STABLE + bool "x86-64 uclibc stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE + bool "x86-64-v2 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v2 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_X86_64_V2_MUSL_BLEEDING_EDGE + bool "x86-64-v2 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v2 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_X86_64_V2_UCLIBC_BLEEDING_EDGE + bool "x86-64-v2 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v2 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_X86_64_V3_GLIBC_BLEEDING_EDGE + bool "x86-64-v3 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v3 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_X86_64_V3_MUSL_BLEEDING_EDGE + bool "x86-64-v3 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v3 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_X86_64_V3_UCLIBC_BLEEDING_EDGE + bool "x86-64-v3 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v3 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_X86_64_V4_GLIBC_BLEEDING_EDGE + bool "x86-64-v4 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v4 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_X86_64_V4_MUSL_BLEEDING_EDGE + bool "x86-64-v4 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v4 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_X86_64_V4_UCLIBC_BLEEDING_EDGE + bool "x86-64-v4 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v4 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_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE bool "x86-64-core-i7 glibc bleeding-edge 2021.11-1" depends on BR2_x86_64 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 8819782ac5..6542694033 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -306,6 +306,36 @@ sha256 0ef307f6c91733ee82ce65801768013f7e6220b605f4e152158cb55b4f983582 sparc6 sha256 3c85420becb7caa84a9a229483f3f2d7158eb66817acdfa5d5700c3a05436cba sparcv8--uclibc--bleeding-edge-2021.11-3.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2021.11-1.sha256 sha256 f6d35e33338b26e71403b4c6d3944ab561f2a6e9b801ab33fbb401b4722044dd sparcv8--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2021.11-5.sha256 +sha256 024fd8edc91b9bfd643f8cf94e3f3ff2a6457aea654d10ef3516db8c3d94d5f5 x86-64--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2021.11-5.sha256 +sha256 6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0 x86-64--glibc--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2021.11-5.sha256 +sha256 468e6b73146595923fe87980a30adb54cd78f4c1e2f228e1a2c9bb705ea4243d x86-64--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2021.11-5.sha256 +sha256 2943617f6537ca195a66fb9db4a801a5dd1c108741c400d530d558d06908dd75 x86-64--musl--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 4aa8b8e2806d6fc87ba64ccec0a59b8a2fb5d157cda006d893e3f2264b7f0f10 x86-64--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2021.11-5.sha256 +sha256 e68fd1b23f4a5c5132f2122e4012c17eb24e5179b2ff45bb793a27ac30dd454f x86-64--uclibc--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2021.11-5.sha256 +sha256 af20cf98ce937f298e0958e16793bb4c7b08236bc69ab11574a4266cccc3823d x86-64-v2--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2021.11-5.sha256 +sha256 17add21a0337d2f7d0d79d1f21db88098c3474920d71f902be46e8995eb86d35 x86-64-v2--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 b3ef49012af9fc9c2c8a44b0a20722be69b518cec5db06e48480291fc28aefe0 x86-64-v2--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2021.11-5.sha256 +sha256 244d4afab02b9c54c76385657d26798515331d7d4fa90928315366f31b9cc39e x86-64-v3--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2021.11-5.sha256 +sha256 551cff1b6425e2a6ced7b7ad032fba49b43ed095faae38d1842260ac0b5d6dbf x86-64-v3--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 30188f50adef711b55ac1d5be7218e0d6ee4200ddb8660e4d4971a9cefe22f91 x86-64-v3--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2021.11-5.sha256 +sha256 0cd2de7c4103aa8cf47b72dc71146eb3bf7742a18d56c93128340ab3f4175804 x86-64-v4--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2021.11-5.sha256 +sha256 e159da16459e0f0d06a9a7467d5121202ab95e2fa6bf8abffdc0008c72fe9b07 x86-64-v4--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 984f011d170d3e46322ae4a110c86ebf995598d877f410201b3fb3d86e25dac2 x86-64-v4--uclibc--bleeding-edge-2021.11-5.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2021.11-1.sha256 sha256 a3dbfcd3347a72ca344ae77882f929615776ea9b1b058eeea0a0915e7db89b69 x86-64-core-i7--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2021.11-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 64ae44f364..fb19ef2909 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -924,6 +924,96 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 From yann.morin.1998 at free.fr Tue Jan 25 07:41:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:17 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: x86-64-v4 implies AVX512 Message-ID: <20220125074920.7630C82774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fa073c65fce21e5f8ad0baf74e431f4cb598458 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that we have BR2_X86_CPU_HAS_AVX512, we can use it to fix the x86-64-v4 definition, which implies AVX512 support according to https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 6b18580ae4..2034fb3bb7 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -146,6 +146,7 @@ config BR2_x86_x86_64_v4 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 help This option corresponds to the x86-64-v4 micro-architecture From yann.morin.1998 at free.fr Tue Jan 25 07:41:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:22 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: regenerate with AVX512 condition for x86-64-v4 toolchain Message-ID: <20220125074920.861618277A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82879ada2bb997dd3a6ff8541fe1a9169a832dba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../toolchain-external/toolchain-external-bootlin/Config.in.options | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 42cad21d71..4b4404620c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -40,7 +40,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 - default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 && BR2_X86_CPU_HAS_AVX512 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 @@ -4152,6 +4152,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -4185,6 +4186,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -4217,6 +4219,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR From yann.morin.1998 at free.fr Tue Jan 25 07:41:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:33 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: indicate how the CPU variants are ordered Message-ID: <20220125074920.AAC6082774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=206ce351619e401cc7d7e53f1baad7b20d3d2da5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master They are loosely ordered according to the ordering of the gcc documentation. It is not entirely correct as the generic x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 are listed before i386 in the gcc documentation, but this nevertheless gives a good explanation for the overall ordering of the list. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index cae5502051..27f2bfcd4c 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -22,6 +22,9 @@ config BR2_X86_CPU_HAS_AVX2 config BR2_X86_CPU_HAS_AVX512 bool +# This list of CPU architecture variant is (loosely) ordered according +# to the gcc documentation at +# https://gcc.gnu.org/onlinedocs/gcc-11.2.0/gcc/x86-Options.html choice prompt "Target Architecture Variant" default BR2_x86_i586 if BR2_i386 From yann.morin.1998 at free.fr Tue Jan 25 07:41:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:30 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake Message-ID: <20220125074920.A3BBC8233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7b9413056ccc1a359375c756c3f3c4e7e96e344 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These were added in gcc 11.x. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 08837b7cea..cae5502051 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -423,6 +423,45 @@ config BR2_x86_tigerlake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_sapphirerapids + bool "sapphirerapids" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_alderlake + bool "alderlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_rocketlake + bool "rocketlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -565,6 +604,9 @@ config BR2_GCC_TARGET_ARCH default "cascadelake" if BR2_x86_cascadelake default "cooperlake" if BR2_x86_cooperlake default "tigerlake" if BR2_x86_tigerlake + default "sapphirerapids" if BR2_x86_sapphirerapids + default "alderlake" if BR2_x86_alderlake + default "rocketlake" if BR2_x86_rocketlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona From yann.morin.1998 at free.fr Tue Jan 25 07:58:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:58:17 +0100 Subject: [Buildroot] [PATCH 00/16] Bootlin toolchain updates and x86 updates In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220125075817.GA457876@scaer> Thomas, All, On 2022-01-25 00:00 +0100, Thomas Petazzoni spake thusly: [--SNIP--] > Thomas Petazzoni (16): > toolchain/toolchain-external/toolchain-external-bootlin: re-update > OpenRISC toolchains > support/scripts/gen-bootlin-toolchains: add support for new x86-64 > toolchains > toolchain/toolchain-external/toolchain-external-bootlin: update with > new x86-64 toolchains > arch/Config.in.x86: drastically simplify the BR2_ARCH definition > arch/Config.in.x86: add "newer" names for several Intel x86 CPU > variants I was wondering if we should expand the prompt to include the fact that they are deprecated, or specific to gcc versions before 4.9... But whatever I tried was ugly or confusing, so I just left it as-is. Full series applied to master, thanks. Regards, Yann E. MORIN. > arch/Config.in.x86: westmere and silvermont were added in gcc 4.9 > arch/Config.in.x86: add broadwell Intel CPU variant > arch/Config.in.x86: add skylake CPU variants > arch/Config.in.x86: x86-64-v4 implies AVX512 > support/scripts/gen-bootlin-toolchains: add missing > BR2_X86_CPU_HAS_AVX512 condition for x86-64-v4 > toolchain/toolchain-external/toolchain-external-bootlin: regenerate > with AVX512 condition for x86-64-v4 toolchain > arch/Config.in.x86: add cannonlake, icelake-client, icelake-server CPU > variants > arch/Config.in.x86: add goldmont, goldmont-plus, tremont, cascadelake, > tigerlake CPU variants > arch/Config.in.x86: add cooperlake CPU variant > arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake > arch/Config.in.x86: indicate how the CPU variants are ordered > > arch/Config.in.x86 | 294 ++++++++++- > support/scripts/gen-bootlin-toolchains | 49 ++ > .../tests/toolchain/test_external_bootlin.py | 225 +++++++++ > .../Config.in.options | 457 +++++++++++++++++- > .../toolchain-external-bootlin.hash | 46 +- > .../toolchain-external-bootlin.mk | 98 +++- > 6 files changed, 1129 insertions(+), 40 deletions(-) > > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Tue Jan 25 09:11:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 10:11:25 +0100 Subject: [Buildroot] [PATCH 00/16] Bootlin toolchain updates and x86 updates In-Reply-To: <20220125075817.GA457876@scaer> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> <20220125075817.GA457876@scaer> Message-ID: <20220125101125.6974b8bf@windsurf> Hello, On Tue, 25 Jan 2022 08:58:17 +0100 "Yann E. MORIN" wrote: > > Thomas Petazzoni (16): > > toolchain/toolchain-external/toolchain-external-bootlin: re-update > > OpenRISC toolchains > > support/scripts/gen-bootlin-toolchains: add support for new x86-64 > > toolchains > > toolchain/toolchain-external/toolchain-external-bootlin: update with > > new x86-64 toolchains > > arch/Config.in.x86: drastically simplify the BR2_ARCH definition > > arch/Config.in.x86: add "newer" names for several Intel x86 CPU > > variants > > I was wondering if we should expand the prompt to include the fact that > they are deprecated, or specific to gcc versions before 4.9... But > whatever I tried was ugly or confusing, so I just left it as-is. Originally, I was hoping to simply remove them, and add Config.in.legacy entries for these options, selecting the new ones. But alas, before gcc 4.9, the "new" names didn't exist. > Full series applied to master, thanks. Wow, thanks \o/ Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From bugzilla at busybox.net Tue Jan 25 10:52:06 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 25 Jan 2022 10:52:06 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #7 from Fabrice Fontaine --- (In reply to Giulio Benetti from comment #5) Hi Giulio, I already sent a patch in December: https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ I didn't take time to take into account the remarks from Romain Naour however I think that this approach is better. Best Regards, Fabrice -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Tue Jan 25 12:27:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 25 Jan 2022 13:27:39 +0100 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: <2fe58d01-39a1-9c38-fa7d-1e6b7648ad2b@benettiengineering.com> Hi Fabrice, On 25/01/22 11:52, bugzilla at busybox.net wrote: > https://bugs.busybox.net/show_bug.cgi?id=14531 > > --- Comment #7 from Fabrice Fontaine --- > (In reply to Giulio Benetti from comment #5) > > Hi Giulio, > > I already sent a patch in December: > https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ Damn, I didn't notice it before :-/ > I didn't take time to take into account the remarks from Romain Naour however I > think that this approach is better. They are 2 different approaches. The problem is the efl dependency handling that is not consistent leading to pitfall. Honestly I'd expect that if eeze is disabled it automatically disable all libraries that depend on it, but it's not that way. Thank you for pointing :-) Best regards -- Giulio Benetti Benetti Engineering sas From tom.marcuzzi at orolia.com Tue Jan 25 13:05:05 2022 From: tom.marcuzzi at orolia.com (Tom Marcuzzi) Date: Tue, 25 Jan 2022 14:05:05 +0100 Subject: [Buildroot] [PATCH v2] packages/nodejs: install npm packages on host In-Reply-To: <20220119140703.12978-1-tom.marcuzzi@orolia.com> References: <20220119140703.12978-1-tom.marcuzzi@orolia.com> Message-ID: <20220125130506.668690-1-tom.marcuzzi@orolia.com> Installing npm packages on host allows to use JavaScript tools that runs on NodeJS (such as webpack) to build web applications. Signed-off-by: Tom Marcuzzi --- Changes v1 -> v2: - Fixed indentation and help in Config.in.host - Corrected use of BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS - Rename HOST_NPM to NPMHOST to prevent check-package warning package/nodejs/Config.in.host | 32 ++++++++++++++++++++++++++++++++ package/nodejs/nodejs.mk | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 4ceaf0c73e..0b67a59c55 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -16,3 +16,35 @@ config BR2_PACKAGE_HOST_NODEJS comment "host nodejs needs a host gcc >= 8" depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS depends on !BR2_HOST_GCC_AT_LEAST_8 + +if BR2_PACKAGE_HOST_NODEJS + +config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL + string "Additional modules" + help + List of space-separated nodejs modules to install via npm + on host. See https://npmjs.org/ to find modules and + 'npm help install' for available installation methods. + For repeatable builds, download and save tgz files or + clone git repos for the components you care about. + + Example: + serialport uglify-js at 1.3.4 /my/module/mymodule.tgz \ + git://github.com/someuser/somemodule.git#v1.2 + + This would install the serialport module (at the newest + version), the uglify-js module at 1.3.4, a module from a + filesystem path, and a module from a git repository. + +config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS + string "Additional module dependencies" + help + List of space-separated buildroot recipes which must be + built before your npms can be installed on host. For example, + if in 'Additional modules' you specified 'node-curl' (see: + https://github.com/jiangmiao/node-curl), you could then + specify 'host-libcurl' here, to ensure that buildroot builds + the host-libcurl package, and does so before building your node + modules. + +endif diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 727af6dc50..8a4a2ff0cf 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -10,7 +10,8 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib +HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib \ + $(call qstrip,$(BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS)) NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE @@ -96,6 +97,35 @@ NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 +# +# Build the list of modules to install on host. +# +HOST_NODEJS_MODULES_LIST= $(call qstrip,\ + $(BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL)) + +# Define NPMHOST for other packages to use +NPMHOST = $(HOST_CONFIGURE_OPTS) \ + LDFLAGS="$(HOST_LDFLAGS)" \ + LD="$(HOST_CXX)" \ + npm_config_arch=$(NODEJS_CPU) \ + npm_config_target_arch=$(NODEJS_CPU) \ + npm_config_build_from_source=true \ + npm_config_nodedir=$(HOST_DIR)/nodejs-$(NODEJS_VERSION) \ + npm_config_prefix=$(HOST_DIR)/usr \ + npm_config_cache=$(HOST_DIR)/.npm-cache \ + $(HOST_DIR)/bin/npm +# +# We can only call NPMHOST if there's something to install. +# +ifneq ($(HOST_NODEJS_MODULES_LIST),) +define HOST_NODEJS_INSTALL_MODULES + # If you're having trouble with module installation, adding -d to the + # npm install call below and setting npm_config_rollback=false can both + # help in diagnosing the problem. + $(NPMHOST) install -g $(HOST_NODEJS_MODULES_LIST) +endef +endif + define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) \ @@ -110,6 +140,8 @@ define HOST_NODEJS_INSTALL_CMDS $(foreach f,$(NODEJS_HOST_TOOLS), \ $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f) ) + + $(HOST_NODEJS_INSTALL_MODULES) endef ifeq ($(BR2_i386),y) -- 2.25.1 From aduskett at gmail.com Tue Jan 25 16:38:58 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 25 Jan 2022 08:38:58 -0800 Subject: [Buildroot] [PATCH 1/3] package/mender: bump to version 3.2.0 Message-ID: <20220125163900.269015-1-aduskett@gmail.com> Other changes: - Updated license hashes due to year changes, removals, and additions. Tested with: ./support/testing/run-tests tests.package.test_mender.TestMender Signed-off-by: Adam Duskett --- package/mender/mender.hash | 15 ++++++++------- package/mender/mender.mk | 7 ++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package/mender/mender.hash b/package/mender/mender.hash index 40d82f072f..af2780513d 100644 --- a/package/mender/mender.hash +++ b/package/mender/mender.hash @@ -1,12 +1,12 @@ # Locally computed: -sha256 716ba7110dd68cdafc5caa989706ff67bbac0617c284d666aa81605850be5763 3.1.0.tar.gz +sha256 b4f097b9dbf63d51ac837d6958ed0a2d9167a459ec502c15ef813d895d04f638 3.2.0.tar.gz # Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. -sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE -sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE +sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a vendor/github.com/mendersoftware/mender-artifact/LICENSE sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE @@ -14,26 +14,27 @@ sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor # BSD 2 Clause license. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE sha256 e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128 vendor/github.com/godbus/dbus/LICENSE +sha256 2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d vendor/github.com/gorilla/websocket/LICENSE # # BSD 3 Clause license. -sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE +sha256 0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf vendor/github.com/klauspost/compress/LICENSE sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/term/LICENSE # # ISC license. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE # # MIT license. sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE +sha256 5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212 vendor/github.com/klauspost/cpuid/v2/LICENSE sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/v2/LICENSE sha256 b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0 vendor/github.com/stretchr/objx/LICENSE -sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE # @@ -41,4 +42,4 @@ sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md # sha256 of all the vendor licenses combined -sha256 4f3541ea69b9b6e3959679576c146b42ba9a840a9dc4e593bff43e5e3a313d24 LIC_FILES_CHKSUM.sha256 +sha256 e6d8321e71be932e08b8923fe9e24e06a95c7e74a6b86e6f73696436ae0ea54f LIC_FILES_CHKSUM.sha256 diff --git a/package/mender/mender.mk b/package/mender/mender.mk index ddf3e43be2..61f872220c 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 3.1.0 +MENDER_VERSION = 3.2.0 MENDER_SITE = https://github.com/mendersoftware/mender/archive MENDER_SOURCE = $(MENDER_VERSION).tar.gz MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 @@ -20,20 +20,21 @@ MENDER_LICENSE_FILES = \ vendor/github.com/mendersoftware/progressbar/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/godbus/dbus/LICENSE \ + vendor/github.com/gorilla/websocket/LICENSE \ vendor/github.com/klauspost/compress/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ - vendor/golang.org/x/crypto/LICENSE \ vendor/golang.org/x/sys/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ + vendor/golang.org/x/term/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/klauspost/pgzip/LICENSE \ + vendor/github.com/klauspost/cpuid/v2/LICENSE \ vendor/github.com/sirupsen/logrus/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/ungerik/go-sysfs/LICENSE \ vendor/github.com/urfave/cli/v2/LICENSE \ vendor/github.com/stretchr/objx/LICENSE \ - vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \ vendor/gopkg.in/yaml.v3/LICENSE \ vendor/github.com/mattn/go-isatty/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md -- 2.34.1 From aduskett at gmail.com Tue Jan 25 16:38:59 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 25 Jan 2022 08:38:59 -0800 Subject: [Buildroot] [PATCH 2/3] package/mender/mender.mk: add bootloader-integration inventory script In-Reply-To: <20220125163900.269015-1-aduskett@gmail.com> References: <20220125163900.269015-1-aduskett@gmail.com> Message-ID: <20220125163900.269015-2-aduskett@gmail.com> This script is installed in the official meta-mender yocto recipe. Install it here as well. Signed-off-by: Adam Duskett --- package/mender/mender.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 61f872220c..2a601d2b1d 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -61,7 +61,7 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \ $(TARGET_DIR)/usr/share/mender/identity/mender-device-identity - $(foreach f,hostinfo network os rootfs-type, \ + $(foreach f,bootloader-integration hostinfo network os rootfs-type, \ $(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \ $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) -- 2.34.1 From aduskett at gmail.com Tue Jan 25 16:39:00 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 25 Jan 2022 08:39:00 -0800 Subject: [Buildroot] [PATCH 3/3] package/mender-artifact: bump to version 3.7.0 In-Reply-To: <20220125163900.269015-1-aduskett@gmail.com> References: <20220125163900.269015-1-aduskett@gmail.com> Message-ID: <20220125163900.269015-3-aduskett@gmail.com> Other changes: - Updated license hashes due to year changes, removals, and additions. Signed-off-by: Adam Duskett --- package/mender-artifact/mender-artifact.hash | 27 ++++++++++++++++---- package/mender-artifact/mender-artifact.mk | 22 +++++++++++++--- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/package/mender-artifact/mender-artifact.hash b/package/mender-artifact/mender-artifact.hash index 27f18862bc..3018a349b4 100644 --- a/package/mender-artifact/mender-artifact.hash +++ b/package/mender-artifact/mender-artifact.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 c46c305616cf53e65b786862addf04d97c388e451f11478886967b494c4ce5d9 mender-artifact-3.6.1.tar.gz -sha256 ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a LIC_FILES_CHKSUM.sha256 +sha256 42898957ae015ea36ecf068e293df12572c09c1d4f0a8a615c106ae9aed5695d mender-artifact-3.7.0.tar.gz +sha256 31e34a6aeee65e7d45e243e86ac16de5530679f76041df362a7e86c90a54ad90 LIC_FILES_CHKSUM.sha256 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the # following command: @@ -11,6 +11,14 @@ sha256 ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a LIC_FI sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/genproto/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/grpc/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/appengine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/kms/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd vendor/go.opencensus.io/LICENSE +sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/golang/groupcache/LICENSE + # # BSD 2 Clause licenses. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE @@ -18,10 +26,18 @@ sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor # BSD 3 Clause licenses. sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE -sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/remyoudompheng/go-liblzma/LICENSE -sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE +sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf vendor/github.com/klauspost/compress/LICENSE sha256 75e1ca97a84a9da6051dee0114333388216f2c4a5a028296b882ff3d57274735 vendor/github.com/russross/blackfriday/v2/LICENSE.txt +sha256 17b5d209ba8f9684257ecfcff87df6ceda6194143a8fbd074f29727cff6f0c40 vendor/github.com/google/go-cmp/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/oauth2/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/text/LICENSE +sha256 110244b02140866ee37d17fa7449436a377ec3b85a481fbb208f4c87964382de vendor/google.golang.org/api/LICENSE +sha256 fc0a2f71df4e8f047902da53d1f85301be43e0f360fc167057a2d04658ed2ba9 vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE +sha256 4835612df0098ca95f8e7d9e3bffcb02358d435dbb38057c844c99d7f725eb20 vendor/google.golang.org/protobuf/LICENSE +sha256 8778a9fc1eaffb03ab873caae251df2d224f6b5502be8777d3cd573a4dd43903 vendor/github.com/golang/protobuf/LICENSE +sha256 b95218cd9607855a6536384c0262922b30a0c2bf56e4ced790240f3a3bac4722 vendor/github.com/googleapis/gax-go/v2/LICENSE # # ISC licenses. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE @@ -35,3 +51,4 @@ sha256 a55959c4e3e8917bfa857359bb641115336276a6cc97408fd8197e079fb18470 vendor sha256 c8024e31c1de453fea90f22a221968835cc7af9d520274a2576c9ec9976055b0 vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE +sha256 5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212 vendor/github.com/klauspost/cpuid/v2/LICENSE diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index 34d0cd9469..68bbad9a4d 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOST_MENDER_ARTIFACT_VERSION = 3.6.1 +HOST_MENDER_ARTIFACT_VERSION = 3.7.0 HOST_MENDER_ARTIFACT_SITE = $(call github,mendersoftware,mender-artifact,$(HOST_MENDER_ARTIFACT_VERSION)) HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT HOST_MENDER_ARTIFACT_LICENSE_FILES = \ @@ -12,13 +12,28 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ LIC_FILES_CHKSUM.sha256 \ vendor/github.com/minio/sha256-simd/LICENSE \ vendor/github.com/mendersoftware/progressbar/LICENSE \ + vendor/google.golang.org/genproto/LICENSE \ + vendor/google.golang.org/grpc/LICENSE \ + vendor/google.golang.org/appengine/LICENSE \ + vendor/cloud.google.com/go/kms/LICENSE \ + vendor/cloud.google.com/go/LICENSE \ + vendor/go.opencensus.io/LICENSE \ + vendor/github.com/golang/groupcache/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ vendor/golang.org/x/sys/LICENSE \ - vendor/golang.org/x/crypto/LICENSE \ vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ vendor/github.com/klauspost/compress/LICENSE \ vendor/github.com/russross/blackfriday/v2/LICENSE.txt \ + vendor/github.com/google/go-cmp/LICENSE \ + vendor/golang.org/x/net/LICENSE \ + vendor/golang.org/x/oauth2/LICENSE \ + vendor/golang.org/x/text/LICENSE \ + vendor/google.golang.org/api/LICENSE \ + vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE \ + vendor/google.golang.org/protobuf/LICENSE \ + vendor/github.com/golang/protobuf/LICENSE \ + vendor/github.com/googleapis/gax-go/v2/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/urfave/cli/LICENSE \ @@ -27,7 +42,8 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md \ vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE \ vendor/gopkg.in/yaml.v3/LICENSE \ - vendor/github.com/mattn/go-isatty/LICENSE + vendor/github.com/mattn/go-isatty/LICENSE \ + vendor/github.com/klauspost/cpuid/v2/LICENSE HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz -- 2.34.1 From peter at korsgaard.com Tue Jan 25 16:43:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 17:43:43 +0100 Subject: [Buildroot] [PATCH] package/binutils: fix an OpenRISC binutils 2.37 patch In-Reply-To: <20211226103329.660967-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni's message of "Sun, 26 Dec 2021 11:33:29 +0100") References: <20211226103329.660967-1-thomas.petazzoni@bootlin.com> Message-ID: <87mtjjn4u8.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > When binutils 2.37 was introduced in commit > 62f0232980c8168631b29f27edf612af8109c691 ("package/binutils: add > version 2.37"), the patch > 0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch was > not properly updated. Indeed, between binutils 2.36 and 2.37, binutils > has switched to using the standard "bool" type, so instead of using > TRUE/FALSE, true/false must be used. > With this change, the binutils patch matches the one that was merged > upstream. > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Tue Jan 25 17:01:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 18:01:21 +0100 Subject: [Buildroot] [PATCH 00/16] Bootlin toolchain updates and x86 updates In-Reply-To: <20220125101125.6974b8bf@windsurf> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> <20220125075817.GA457876@scaer> <20220125101125.6974b8bf@windsurf> Message-ID: <20220125170121.GB457876@scaer> Thomas, All, On 2022-01-25 10:11 +0100, Thomas Petazzoni spake thusly: > On Tue, 25 Jan 2022 08:58:17 +0100 > "Yann E. MORIN" wrote: > > > Thomas Petazzoni (16): [--SNIP--] > > > arch/Config.in.x86: add "newer" names for several Intel x86 CPU > > > variants > > I was wondering if we should expand the prompt to include the fact that > > they are deprecated, or specific to gcc versions before 4.9... But > > whatever I tried was ugly or confusing, so I just left it as-is. > Originally, I was hoping to simply remove them, and add > Config.in.legacy entries for these options, selecting the new ones. But > alas, before gcc 4.9, the "new" names didn't exist. Yeah, I was wondering why we would not add them to legacy, then I read the commit log. ;-) But in the end, I believe legacy should be doable, albeit a bit ugly. In legacy (only two entries used as example): config BR2_x86_corei7 bool "corei7 has been renamed to nehalem" select BR2_LEGACY config BR2_x86_atom bool "atom has been renamed to bonnel" select BR2_LEGACY And then in the choice in arch/Config.in.x86: choice bool "Target Architecture Variant" default BR2_x86_nehalem if BR2_x86_corei7 # legacy default BR2_x86_bonnel if BR2_x86_atom # legacy default default BR2_x86_i586 if BR2_i386 depends on BR2_i386 || BR2_x86_64 # [0] [...] config BR2_x86_nehalem bool "nehalem (corei7 for gcc < 4.9)" config BR2_x86_bonnel bool "bonnel (previously: atom)" endchoice config BR2_GCC_TARGET_ARCH [...] default "nehalem" if BR2_x86_nehalem && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 default "corei7" if BR2_x86_nehalem # Legacy fallback default "bonnel" if BR2_x86_bonnel && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 default "atom" if BR2_x86_bonnel # Legacy fallback [...] This is a bit ugly, but a minor inconvenience. Note how I wrote two different prompts: it's just for illustration purposes, we'll need to settle on one or the other (or something else). [0] this dependency is superfluous, as the whole of arch/Config.in.x86 is already conditionally included with this same condition from arch/Config.in Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Tue Jan 25 17:03:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:03:32 +0100 Subject: [Buildroot] [PATCH 1/3] configs/warp7: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20211227175130.2986949-1-festevam@gmail.com> (Fabio Estevam's message of "Mon, 27 Dec 2021 14:51:28 -0300") References: <20211227175130.2986949-1-festevam@gmail.com> Message-ID: <87zgnjlpcr.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006500 > Signed-off-by: Fabio Estevam Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:03:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:03:38 +0100 Subject: [Buildroot] [PATCH 2/3] configs/mx6cubox: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20211227175130.2986949-2-festevam@gmail.com> (Fabio Estevam's message of "Mon, 27 Dec 2021 14:51:29 -0300") References: <20211227175130.2986949-1-festevam@gmail.com> <20211227175130.2986949-2-festevam@gmail.com> Message-ID: <87v8y7lpcl.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006257 > Signed-off-by: Fabio Estevam Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:04:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:04:24 +0100 Subject: [Buildroot] [PATCH 3/3] configs/imx6ullevk: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20211227175130.2986949-3-festevam@gmail.com> (Fabio Estevam's message of "Mon, 27 Dec 2021 14:51:30 -0300") References: <20211227175130.2986949-1-festevam@gmail.com> <20211227175130.2986949-3-festevam@gmail.com> Message-ID: <87r18vlpbb.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006189 > Signed-off-by: Fabio Estevam Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:01:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:01:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/warp7: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220125165919.56913827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e77dc1817a9f42e7ec9733b6c616ac534851101b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006500 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit f7071471ba64bc3e0036c1884dc3657568859113) Signed-off-by: Peter Korsgaard --- configs/warp7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 830d5187c8..5fca9f6cfc 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_BOARDNAME="warp7" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # wifi firmware for brcm43430 BR2_PACKAGE_LINUX_FIRMWARE=y From peter at korsgaard.com Tue Jan 25 16:33:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 17:33:39 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/binutils: fix an OpenRISC binutils 2.37 patch Message-ID: <20220125165919.4DA30827A0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a059006a1b8c2c8d4f1e04819031308a08e87898 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When binutils 2.37 was introduced in commit 62f0232980c8168631b29f27edf612af8109c691 ("package/binutils: add version 2.37"), the patch 0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch was not properly updated. Indeed, between binutils 2.36 and 2.37, binutils has switched to using the standard "bool" type, so instead of using TRUE/FALSE, true/false must be used. With this change, the binutils patch matches the one that was merged upstream. Signed-off-by: Thomas Petazzoni Reviewed-by: Giulio Benetti Signed-off-by: Yann E. MORIN (cherry picked from commit b032faa4019b60b34fd96df0a46ee7308e1fe074) Signed-off-by: Peter Korsgaard --- .../0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch index 779baeab63..0d18321ee1 100644 --- a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch @@ -46,7 +46,7 @@ index 32063ab0289..67252394173 100644 + _bfd_error_handler + (_("%pB: pc-relative relocation against dynamic symbol %s"), + input_bfd, name); -+ ret_val = FALSE; ++ ret_val = false; + bfd_set_error (bfd_error_bad_value); + } + break; From peter at korsgaard.com Tue Jan 25 17:04:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:04:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/imx6ullevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220125165919.6913C827A0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8a25482f3083f0d69ba3d48771477c61a24ab13 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006189 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit d9f72e37bdad345d80a5dd1c12ab7df2396b35b8) Signed-off-by: Peter Korsgaard --- configs/imx6ullevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index 06641f1458..c6e2981697 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From peter at korsgaard.com Tue Jan 25 17:02:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:02:33 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/mx6cubox: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220125165919.5EBEE827B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=850b8697a2f46c8d0f5c3ec816711bff74d8da25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006257 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 635f4b8b5a04d0802aa429fb92dbcd757feed66c) Signed-off-by: Peter Korsgaard --- configs/mx6cubox_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index d0ce2f9a6d..e80d995525 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -39,6 +39,7 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From peter at korsgaard.com Tue Jan 25 17:10:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: bump to version 20.10.11 In-Reply-To: <20211227003034.8877-1-christian@paral.in> (Christian Stewart's message of "Sun, 26 Dec 2021 16:30:34 -0800") References: <20211227003034.8877-1-christian@paral.in> Message-ID: <87mtjjlp1c.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Signed-off-by: Christian Stewart Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:10:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-cli: bump to version 20.10.11 In-Reply-To: <20211227003655.78166-1-christian@paral.in> (Christian Stewart's message of "Sun, 26 Dec 2021 16:36:55 -0800") References: <20211227003655.78166-1-christian@paral.in> Message-ID: <87ilu7lp18.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Signed-off-by: Christian Stewart Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:10:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-cli: bump to version 20.10.11 Message-ID: <20220125170404.6A285827BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d039cb94b2c2cf1286419e490a4f7f40c53cd7e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 60acafc80648bd87e86c574912ee71bd8bc64cbf) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 6eb9413a11..fbcda5753e 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d91010813824070dd2380013c8f343e61e6dda170f7853f024bda39b432b64ba docker-cli-20.10.9.tar.gz +sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 3a344bca36..0e35a60d43 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.9 +DOCKER_CLI_VERSION = 20.10.11 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Jan 25 17:10:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:48 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-engine: bump to version 20.10.11 Message-ID: <20220125170404.61D88827B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efbe462c8a2ddf514ca1e23ae347c8b79b863fd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 35cf2a00b2a97d32b80491043e802e8ed69bfbf9) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 5e15842859..d1323f507d 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 359e8854d0d51bc884d434f182f64ca62f25fbbe7b9c6a336eb09f212fe8cc9a docker-engine-20.10.9.tar.gz +sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 84366d9334..45fa7fa53e 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.9 +DOCKER_ENGINE_VERSION = 20.10.11 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Jan 25 17:10:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-engine: bump to version 20.10.11 Message-ID: <20220125170410.D5120827B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=114c95105f3543581497345159dde29d0567ce83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 35cf2a00b2a97d32b80491043e802e8ed69bfbf9) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 5e15842859..d1323f507d 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 359e8854d0d51bc884d434f182f64ca62f25fbbe7b9c6a336eb09f212fe8cc9a docker-engine-20.10.9.tar.gz +sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 84366d9334..45fa7fa53e 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.9 +DOCKER_ENGINE_VERSION = 20.10.11 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Jan 25 17:10:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:42 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-cli: bump to version 20.10.11 Message-ID: <20220125170410.DD88E827BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42850cce084406bc7ecbed1ff53c42eb40c83616 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 60acafc80648bd87e86c574912ee71bd8bc64cbf) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 6eb9413a11..fbcda5753e 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d91010813824070dd2380013c8f343e61e6dda170f7853f024bda39b432b64ba docker-cli-20.10.9.tar.gz +sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 3a344bca36..0e35a60d43 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.9 +DOCKER_CLI_VERSION = 20.10.11 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Jan 25 17:17:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:17:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/connman: add iwd support Message-ID: <20220125171229.04BFA82785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=528b64ab0e0fd20adf07ac284ed5d46de11d1859 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x IWD is a runtime dependency for the connman iwd plugin. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 9892fd8f06e51be6b838e99dce5075aceeda1142) Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index e5e596c973..8c66a69882 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -85,6 +85,12 @@ else CONNMAN_CONF_OPTS += --disable-wispr endif +ifeq ($(BR2_PACKAGE_IWD),y) +CONNMAN_CONF_OPTS += --enable-iwd +else +CONNMAN_CONF_OPTS += --disable-iwd +endif + define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef From peter at korsgaard.com Tue Jan 25 17:17:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:17:17 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/connman: add iwd support Message-ID: <20220125171239.EB97582785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=123e8b59879bda71e29c6e6485a75e9fc10bfdf6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x IWD is a runtime dependency for the connman iwd plugin. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 9892fd8f06e51be6b838e99dce5075aceeda1142) Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index e5e596c973..8c66a69882 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -85,6 +85,12 @@ else CONNMAN_CONF_OPTS += --disable-wispr endif +ifeq ($(BR2_PACKAGE_IWD),y) +CONNMAN_CONF_OPTS += --enable-iwd +else +CONNMAN_CONF_OPTS += --disable-iwd +endif + define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef From peter at korsgaard.com Tue Jan 25 17:17:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:17:26 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/connman: add iwd support In-Reply-To: <20211222000241.1894807-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 21 Dec 2021 17:02:41 -0700") References: <20211222000241.1894807-1-james.hilliard1@gmail.com> Message-ID: <87ee4vlopl.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > IWD is a runtime dependency for the connman iwd plugin. > Signed-off-by: James Hilliard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Tue Jan 25 17:33:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 18:33:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer/gst1-plugins-bad: fix build with neon Message-ID: <20220125173328.3475928-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of neon to version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc: ../output-1/build/gst1-plugins-bad-1.18.5/ext/neon/meson.build:1:0: ERROR: Invalid version of dependency, need 'neon' ['<= 0.31.99'] found '0.32.2'. Fixes: - http://autobuild.buildroot.org/results/eaf1890176431000ea8b371956f0d2d7e9907aea Signed-off-by: Fabrice Fontaine --- ...n-Allow-building-against-neon-0-32-x.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch diff --git a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch b/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch new file mode 100644 index 0000000000..e995a8cb91 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch @@ -0,0 +1,29 @@ +From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 26 Sep 2021 21:34:30 +0200 +Subject: [PATCH] neon: Allow building against neon 0.32.x + +No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3 + +Part-of: + +[Retrieved from: +https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0] +Signed-off-by: Fabrice Fontaine +--- + subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/neon/meson.build b/ext/neon/meson.build +index bf49be9111..abd9763649 100644 +--- a/ext/neon/meson.build ++++ b/ext/neon/meson.build +@@ -1,4 +1,4 @@ +-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'], ++neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'], + required : get_option('neon')) + + if neon_dep.found() +-- +GitLab + -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 17:34:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 18:34:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongodb: security bump to version 4.2.18 Message-ID: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> Fix CVE-2021-20330: An attacker with basic CRUD permissions on a replicated collection can run the applyOps command with specially malformed oplog entries, resulting in a potential denial of service on secondaries. This issue affects MongoDB Server v4.0 versions prior to 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server v4.4 versions prior to 4.4.6. Drop third patch (already in version) https://docs.mongodb.com/master/release-notes/4.2/ Signed-off-by: Fabrice Fontaine --- ...-MINSIGSTKSZ-is-no-longer-a-constant.patch | 49 ------------------- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch diff --git a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch b/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch deleted file mode 100644 index 02b35c6e4f..0000000000 --- a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ef08d0dbc99db8c4620512e92bfb3154282eb5d3 Mon Sep 17 00:00:00 2001 -From: Andrew Morrow -Date: Wed, 15 Sep 2021 15:23:42 -0400 -Subject: [PATCH] SERVER-59459 With glibc-2.34, MINSIGSTKSZ is no longer a - constant - -[Retrieved (and backported) from: -https://github.com/mongodb/mongo/commit/ef08d0dbc99db8c4620512e92bfb3154282eb5d3] -Signed-off-by: Fabrice Fontaine ---- - src/mongo/stdx/thread.h | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h -index 7b15bb561bd9..6f1e16cdeb36 100644 ---- a/src/mongo/stdx/thread.h -+++ b/src/mongo/stdx/thread.h -@@ -76,11 +76,19 @@ class SigAltStackController { - } - - private: -+ static size_t _getStackSize() { -+ // It would be nice for this to be a constexpr, but -+ // MINSIGSTKSZ became a macro that invoked `sysconf` in glibc -+ // 2.34. -+ static const std::size_t kMinSigStkSz = MINSIGSTKSZ; -+ return std::max(kMongoMinSignalStackSize, kMinSigStkSz); -+ } -+ - void _install() const { - stack_t ss; - ss.ss_sp = _stackStorage.get(); - ss.ss_flags = 0; -- ss.ss_size = kStackSize; -+ ss.ss_size = _getStackSize(); - if (sigaltstack(&ss, nullptr)) { - abort(); - } -@@ -107,9 +115,7 @@ class SigAltStackController { - // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) - static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; - -- static constexpr std::size_t kStackSize = -- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); -- std::unique_ptr _stackStorage = std::make_unique(kStackSize); -+ std::unique_ptr _stackStorage = std::make_unique(_getStackSize()); - - #else // !MONGO_HAS_SIGALTSTACK - auto makeInstallGuard() const { diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 3b2580cc43..02da8ad452 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index c33c3c2eb7..f666e83a03 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.11 +MONGODB_VERSION = 4.2.18 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz -- 2.34.1 From peter at korsgaard.com Tue Jan 25 17:35:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:35:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/glibc: add a patch to fix build issue in kernels >= 3.15 and < 5.1 on Microblaze Message-ID: <20220125172932.587F782302@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=941714483eed1cd0cf3524b30e5ff1fe96f348f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x As explained in the patch itself, there is a bug in the handling of __pselect32() in glibc for the Microblaze architecture. There a special Microblaze variant that was added to support kernels older than < 3.15, but it "hides" a generic implementation that is needed to support kernels newer than 3.15 but older than 5.1 (which is when the time64 support for 32-bit architectures was added, making __pselect32 no longer needed). This bug causes a glibc build failure for kernels >= 3.15 but < 5.1, on Microblaze. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 17ebb6ffaed73bd144639775a10a09e651f1c6e3) Signed-off-by: Peter Korsgaard --- ...x-sysv-linux-microblaze-pselect32.c-add-m.patch | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch b/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch new file mode 100644 index 0000000000..3597cd6a11 --- /dev/null +++ b/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch @@ -0,0 +1,85 @@ +From af06fe63f9babb6d0179ae5d7d9245daada6bf56 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 26 Dec 2021 10:30:01 +0100 +Subject: [PATCH] sysdeps/unix/sysv/linux/microblaze/pselect32.c: add missing + implementation when !__ASSUME_TIME64_SYSCALLS + +In commit a92f4e6299fe0e3cb6f77e79de00817aece501ce ("linux: Add time64 +pselect support"), a Microblaze specific implementation of +__pselect32() was added to cover the case of kernels < 3.15 which lack +the pselect6 system call. + +This new file sysdeps/unix/sysv/linux/microblaze/pselect32.c takes +precedence over the default implementation +sysdeps/unix/sysv/linux/pselect32.c. + +However sysdeps/unix/sysv/linux/pselect32.c provides an implementation +of __pselect32() which is needed when __ASSUME_TIME64_SYSCALLS is not +defined. On Microblaze, which is a 32-bit architecture, +__ASSUME_TIME64_SYSCALLS is only true for kernels >= 5.1. + +Due to sysdeps/unix/sysv/linux/microblaze/pselect32.c taking +precedence over sysdeps/unix/sysv/linux/pselect32.c, it means that +when we are with a kernel >= 3.15 but < 5.1, we need a __pselect32() +implementation, but sysdeps/unix/sysv/linux/microblaze/pselect32.c +doesn't provide it, and sysdeps/unix/sysv/linux/pselect32.c which +would provide it is not compiled in. + +This causes the following build failure on Microblaze with for example +Linux kernel headers 4.9: + +/home/thomas/buildroot/buildroot/output/host/lib/gcc/microblazeel-buildroot-linux-gnu/10.3.0/../../../../microblazeel-buildroot-linux-gnu/bin/ld: /home/thomas/buildroot/buildroot/output/build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/libc_pic.os: in function `__pselect64': +(.text+0x120b44): undefined reference to `__pselect32' +collect2: error: ld returned 1 exit status + +To fix this, we take a crude approach: replicate in +sysdeps/unix/sysv/linux/microblaze/pselect32.c the +!__ASSUME_TIME64_SYSCALLS implementation that is already in +sysdeps/unix/sysv/linux/pselect32.c. + +Upstream: https://sourceware.org/pipermail/libc-alpha/2021-December/134635.html +Signed-off-by: Thomas Petazzoni +--- + .../unix/sysv/linux/microblaze/pselect32.c | 22 +++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/sysdeps/unix/sysv/linux/microblaze/pselect32.c b/sysdeps/unix/sysv/linux/microblaze/pselect32.c +index 70b7b52a48..6b6b3e8a2e 100644 +--- a/sysdeps/unix/sysv/linux/microblaze/pselect32.c ++++ b/sysdeps/unix/sysv/linux/microblaze/pselect32.c +@@ -22,7 +22,25 @@ + #include + #include + +-#ifndef __ASSUME_PSELECT ++#if !defined(__ASSUME_TIME64_SYSCALLS) ++int ++__pselect32 (int nfds, fd_set *readfds, fd_set *writefds, ++ fd_set *exceptfds, const struct __timespec64 *timeout, ++ const sigset_t *sigmask) ++{ ++ struct timespec ts32, *pts32 = NULL; ++ if (timeout != NULL) ++ { ++ ts32 = valid_timespec64_to_timespec (*timeout); ++ pts32 = &ts32; ++ } ++ ++ return SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, ++ pts32, ++ ((__syscall_ulong_t[]){ (uintptr_t) sigmask, ++ __NSIG_BYTES })); ++} ++#elif !defined(__ASSUME_PSELECT) + int + __pselect32 (int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, const struct __timespec64 *timeout, +@@ -57,4 +75,4 @@ __pselect32 (int nfds, fd_set *readfds, fd_set *writefds, + + return ret; + } +-#endif /* __ASSUME_PSELECT */ ++#endif +-- +2.31.1 + From peter at korsgaard.com Tue Jan 25 17:39:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:39:15 +0100 Subject: [Buildroot] [PATCH] package/glibc: add a patch to fix build issue in kernels >= 3.15 and < 5.1 on Microblaze In-Reply-To: <20211226104520.663206-1-thomas.petazzoni@bootlin.com> References: <20211226104520.663206-1-thomas.petazzoni@bootlin.com> Message-ID: <2d5dcf47-01c7-8a69-5ac9-25440798bd19@korsgaard.com> On 26/12/2021 11.45, Thomas Petazzoni wrote: > As explained in the patch itself, there is a bug in the handling of > __pselect32() in glibc for the Microblaze architecture. There a > special Microblaze variant that was added to support kernels older > than < 3.15, but it "hides" a generic implementation that is needed to > support kernels newer than 3.15 but older than 5.1 (which is when the > time64 support for 32-bit architectures was added, making __pselect32 > no longer needed). > > This bug causes a glibc build failure for kernels >= 3.15 but < 5.1, > on Microblaze. > > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 18:06:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:06:47 +0100 Subject: [Buildroot] [PATCH] package/gcc/Config.in.host: fix BR2_GCC_VERSION_ARC select of BR2_TOOLCHAIN_GCC_AT_LEAST_xyz In-Reply-To: <20211228204448.GB3390456@scaer> (Yann E. MORIN's message of "Tue, 28 Dec 2021 21:44:48 +0100") References: <20211227215833.1136054-1-thomas.petazzoni@bootlin.com> <20211228204448.GB3390456@scaer> Message-ID: <87a6fjlmfc.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Thomas, All, > On 2021-12-27 22:58 +0100, Thomas Petazzoni spake thusly: >> When the gcc arc version was bumped to a version using gcc >> 10.x (arc-2020.09-release) in commit >> 0791abfba0227803b19895ea22326f4e17ac93dc, the select of >> BR2_GCC_VERSION_ARC on the appropriate BR2_TOOLCHAIN_GCC_AT_LEAST_xyz >> was not updated. This commit fixes this issue. > I've slightly rephrased the commit log to also add a reference to > 0b4c7ba01cfe (toolchain: update option descriptions for ARC tools > arc-2020.09-release) which also missed updating the select. > Nice catch, applied to master, thanks. Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 18:06:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:06:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gcc/Config.in.host: fix BR2_GCC_VERSION_ARC select of BR2_TOOLCHAIN_GCC_AT_LEAST_xyz Message-ID: <20220125180001.C1D22818F6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57941d2e66d5147dcc9241e248a240cb47d0212c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When the gcc arc version was bumped to a version using gcc 10.x (arc-2020.09-release) in commit 0791abfba022 (toolchain: update ARC tools to arc-2020.09-release), the select of BR2_GCC_VERSION_ARC on the appropriate BR2_TOOLCHAIN_GCC_AT_LEAST_xyz was not updated. Commit 0b4c7ba01cfe (toolchain: update option descriptions for ARC tools arc-2020.09-release) fixed the prompt, but still forgot to update the appropriate BR2_TOOLCHAIN_GCC_AT_LEAST_xyz. This commit eventually fixes this issue. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 81662cf228290f4abd72243730156baabb8b91c9) Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index aa2665cbee..a1fe192d3a 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -12,7 +12,7 @@ config BR2_GCC_VERSION_ARC bool "gcc arc (10.x)" # Only supported architecture depends on BR2_arc - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 config BR2_GCC_VERSION_POWERPC_SPE bool "gcc powerpc spe" From peter at korsgaard.com Tue Jan 25 18:08:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:08:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: fix musl build In-Reply-To: <20211228133959.3690191-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 28 Dec 2021 14:39:59 +0100") References: <20211228133959.3690191-1-fontaine.fabrice@gmail.com> Message-ID: <875yq7lmcz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following musl build failure raised since bump to version 6.14 > in commit 5292d1cf9ad0605cc264fedc75c1b9a169aa183b: > /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: > rngd-rngd_jitter.o: in function `rngd_notime_start': > rngd_jitter.c:(.text+0xdc2): undefined reference to `pthread_attr_setaffinity_np' > Fixes: > - http://autobuild.buildroot.org/results/3ec7df86856aa9bee2f18a8faa44fd58bc8a6657 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 18:07:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:07:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rng-tools: fix musl build Message-ID: <20220125180126.9FD73818AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b30309847e307dee233d7cd8c57586f1ff50cad5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following musl build failure raised since bump to version 6.14 in commit 5292d1cf9ad0605cc264fedc75c1b9a169aa183b: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: rngd-rngd_jitter.o: in function `rngd_notime_start': rngd_jitter.c:(.text+0xdc2): undefined reference to `pthread_attr_setaffinity_np' Fixes: - http://autobuild.buildroot.org/results/3ec7df86856aa9bee2f18a8faa44fd58bc8a6657 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d94e2b6dd4f291a77bbfd06eabb7ce85c9bb6aa9) Signed-off-by: Peter Korsgaard --- ...-detect-non-posix-extensions-for-pthreads.patch | 43 +++++++++++++++++++ ...se-of-either-pthread-affinity-set-methods.patch | 49 ++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch b/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch new file mode 100644 index 0000000000..ba6cf63d7c --- /dev/null +++ b/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch @@ -0,0 +1,43 @@ +From d1840e54a15fc454936cada10cce7fd91d06232b Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Thu, 15 Jul 2021 08:43:01 -0400 +Subject: [PATCH] Adding ability to detect non-posix extensions for pthreads + +Theres a desire to build rngd with musl, which doesn't have all the gnu +extensions (but it has some). So test for those. Note, this requires +the addition of the USE_EXTENSIONS macro to enable -d_GNU_SOURCE + +Signed-off-by: Neil Horman + +[Retrieved from: +https://github.com/nhorman/rng-tools/commit/d1840e54a15fc454936cada10cce7fd91d06232b] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 0fe06fc..de7dca3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,7 @@ AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD + AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_HEADERS([rng-tools-config.h]) + AC_CONFIG_MACRO_DIRS([m4]) ++AC_USE_SYSTEM_EXTENSIONS + + dnl Parse options + +@@ -100,6 +101,12 @@ AS_IF( + ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] + ) + ++AC_CHECK_DECL(pthread_attr_setaffinity_np, ++ [AC_DEFINE([HAVE_PTHREAD_ATTR_SETAFFINITY], 1,[Set ATTR_SETAFFINITY])], ++ [ AC_CHECK_DECL(pthread_setaffinity_np, ++ [AC_DEFINE([HAVE_PTHREAD_SETAFFINITY],1, [Set PTHREAD_SETAFFINITY])], [ AC_MSG_ERROR([Neither pthread_setaffinity_np nor pthread_attr_setaffinity_np found])],[[#include ]]) ++ ], [[#include ]]) ++ + AS_IF( + [ test "x$with_nistbeacon" != "xno"], + [ diff --git a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch b/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch new file mode 100644 index 0000000000..17285baa6a --- /dev/null +++ b/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch @@ -0,0 +1,49 @@ +From 5caa086dc14cecf68d1a5c31e87ba1efb2c00893 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Thu, 15 Jul 2021 08:48:10 -0400 +Subject: [PATCH] Allow for use of either pthread affinity set methods + +musl has support for pthread_setaffinity_np, but not +pthread_attr_setaffinity_np. so check for hte existence of either +function in configure, and use the appropriate one. + +Signed-off-by: Neil Horman + +[Retrieved from: +https://github.com/nhorman/rng-tools/commit/5caa086dc14cecf68d1a5c31e87ba1efb2c00893] +Signed-off-by: Fabrice Fontaine +--- + rngd_jitter.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/rngd_jitter.c b/rngd_jitter.c +index ea29436..5c7e09e 100644 +--- a/rngd_jitter.c ++++ b/rngd_jitter.c +@@ -67,12 +67,25 @@ static int rngd_notime_start(void *ctx, + for(i=i-1;i>=0;i--) { + CPU_SET(i,cpus); + } +- pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); + ++ /* ++ * Note that only one of: ++ * HAVE_PTHREAD_ATTR_SETAFFINITY ++ * and ++ * HAVE_PTHREAD_SETAFFINITY ++ * Will ever be set, as per the configure.ac logic ++ */ ++#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY ++ pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); ++#endif + ret = -pthread_create(&thread_ctx->notime_thread_id, + &thread_ctx->notime_pthread_attr, + start_routine, arg); + ++#ifdef HAVE_PTHREAD_SETAFFINITY ++ pthread_setaffinity_np(&thread_ctx->notime_thread_id, cpusize, cpus); ++#endif ++ + CPU_FREE(cpus); + return ret; + } From peter at korsgaard.com Tue Jan 25 18:09:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:09:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/collectd: add missing comment for mysql dependencies Message-ID: <20220125180302.79BDC825DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f54fa1d46972059790203547063b67f72be8fa7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f877c668114c3dab465127a307b3268f1f34db5b) Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 82c24fdbc3..d783317f8a 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -377,6 +377,10 @@ config BR2_PACKAGE_COLLECTD_MYSQL Connects to a MySQL database and issues a "show status" command. +comment "mysql needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_COLLECTD_NETLINK bool "netlink" select BR2_PACKAGE_LIBMNL From peter at korsgaard.com Tue Jan 25 18:09:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:09:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/collectd: add missing comment for mysql dependencies Message-ID: <20220125180307.372AA825DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f517fae03e547d6c9e6c4fe373b17b61469afa1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f877c668114c3dab465127a307b3268f1f34db5b) Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index d44d4e4913..9c38d87bcb 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -384,6 +384,10 @@ config BR2_PACKAGE_COLLECTD_MYSQL Connects to a MySQL database and issues a "show status" command. +comment "mysql needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_COLLECTD_NETLINK bool "netlink" select BR2_PACKAGE_LIBMNL From peter at korsgaard.com Tue Jan 25 18:10:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:10:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectd: add missing C++ comment for mysql In-Reply-To: <20211228220911.32556057@windsurf> (Thomas Petazzoni's message of "Tue, 28 Dec 2021 22:09:11 +0100") References: <20211030215307.2155221-1-fontaine.fabrice@gmail.com> <20211228220911.32556057@windsurf> Message-ID: <871r0vlm9v.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Sat, 30 Oct 2021 23:53:07 +0200 > Fabrice Fontaine wrote: >> Add missing C++ comment for mysql and while at it drops depends on >> MMU and threads which are always true >> >> Signed-off-by: Fabrice Fontaine >> --- >> package/collectd/Config.in | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) > I have applied the comment addition, but not the removal of > "duplicated" dependencies. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Tue Jan 25 18:17:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:17:28 +0100 Subject: [Buildroot] [git commit] package/python-mpd2: bump to version 3.0.5 Message-ID: <20220125181205.A0632822FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be89d78a0f0731b387a0a0bd00e8118c6728fa72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Uladzimir Bely Signed-off-by: Yann E. MORIN --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index 83487257ee..88dcb28377 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz -sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz +md5 594dff3e53c8eb6f583ba642bc2c1a27 python-mpd2-3.0.5.tar.gz +sha256 6f1bffd93b9a32fc018a9bbf3487505b52e0d757ec34066905c60a912d492384 python-mpd2-3.0.5.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index f357e302fd..bfe382b59e 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.0.4 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 +PYTHON_MPD2_VERSION = 3.0.5 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ed/c2/263621bdbbc37fa1a55fa1a7f66fd601bf08b3f87481e318a3509fb6c4bf PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Tue Jan 25 18:19:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:19:21 +0100 Subject: [Buildroot] [PATCH] package/python-mpd2: bump to version 3.0.5 In-Reply-To: <20220124080352.2116-1-wiselord1983@gmail.com> References: <20220124080352.2116-1-wiselord1983@gmail.com> Message-ID: <20220125181921.GC457876@scaer> Uladzimir, All, On 2022-01-24 11:03 +0300, Uladzimir Bely spake thusly: > Signed-off-by: Uladzimir Bely Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-mpd2/python-mpd2.hash | 4 ++-- > package/python-mpd2/python-mpd2.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash > index 83487257ee..88dcb28377 100644 > --- a/package/python-mpd2/python-mpd2.hash > +++ b/package/python-mpd2/python-mpd2.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/python-mpd2/json > -md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz > -sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz > +md5 594dff3e53c8eb6f583ba642bc2c1a27 python-mpd2-3.0.5.tar.gz > +sha256 6f1bffd93b9a32fc018a9bbf3487505b52e0d757ec34066905c60a912d492384 python-mpd2-3.0.5.tar.gz > # Locally computed sha256 checksums > sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt > diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk > index f357e302fd..bfe382b59e 100644 > --- a/package/python-mpd2/python-mpd2.mk > +++ b/package/python-mpd2/python-mpd2.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -PYTHON_MPD2_VERSION = 3.0.4 > -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 > +PYTHON_MPD2_VERSION = 3.0.5 > +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ed/c2/263621bdbbc37fa1a55fa1a7f66fd601bf08b3f87481e318a3509fb6c4bf > PYTHON_MPD2_SETUP_TYPE = setuptools > PYTHON_MPD2_LICENSE = LGPL-3.0+ > PYTHON_MPD2_LICENSE_FILES = LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 25 18:20:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:46 +0100 Subject: [Buildroot] [git commit] package/python-pyftpdlib: bump to version 1.5.6 Message-ID: <20220125182726.CDAB7827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4211a933a3f9762b2816c372f7aa2ca5e92db32d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update hash of LICENSE file (license updated to make it recognizable by github: https://github.com/giampaolo/pyftpdlib/commit/a3016e7d694c226cae6a2b7672c6c5196124cd7a) - Update indentation in hash file (two spaces) https://github.com/giampaolo/pyftpdlib/blob/release-1.5.6/HISTORY.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pyftpdlib/python-pyftpdlib.hash | 6 +++--- package/python-pyftpdlib/python-pyftpdlib.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index 7f8da95550..abbb1261b2 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyftpdlib/json -md5 7f8089520d60171bee5dab2b721e8d00 pyftpdlib-1.5.5.tar.gz -sha256 1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752 pyftpdlib-1.5.5.tar.gz +md5 459dd3e685c4b7dfcf574ca05e5586eb pyftpdlib-1.5.6.tar.gz +sha256 fda655d81f29af52885ca2f8a2704134baed540f16d66a0b26e8fdfafd12db5e pyftpdlib-1.5.6.tar.gz # Locally computed sha256 checksums -sha256 18a4ff1ddf890838e36504b307581e3eb42c890a7272ce28b18b3ce1205b7ea8 LICENSE +sha256 67a832551570a5ac5f7901eaa5ece4b9491fda7f2d8c93957c3bbc68a5a76d88 LICENSE diff --git a/package/python-pyftpdlib/python-pyftpdlib.mk b/package/python-pyftpdlib/python-pyftpdlib.mk index dbbb9e2842..931e2dad06 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.5 +PYTHON_PYFTPDLIB_VERSION = 1.5.6 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/27/64/06a574350c79873e908fa9f48b617e7961de50fc468acc0a05d76771bce9 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/31/61/63ef60aca6de07eba1639d9d47f3f8e29462e8bb49d6a8dce9aeff240646 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:20:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:43 +0100 Subject: [Buildroot] [git commit] package/python-pytz: bump to version 2021.3 Message-ID: <20220125182726.C2F79827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b603f2a1e8f2875e1f1c4cec385a73b3e88901b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update hash of LICENSE.txt (year updated) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pytz/python-pytz.hash | 6 +++--- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index d1ce81e590..e0f253902c 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 c3d84a465fc56a4edd52cca8873ac0df pytz-2019.3.tar.gz -sha256 b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be pytz-2019.3.tar.gz +md5 d7b7060bbac4970afa2050c139c9fcb6 pytz-2021.3.tar.gz +sha256 acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 pytz-2021.3.tar.gz # Locally computed sha256 checksums -sha256 39f07c72a1bfda349cbd27bac9bcb1e6f8c5b4e5cc3fadf56900406e8cc0b792 LICENSE.txt +sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 888f3c4556..d606750699 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2019.3 +PYTHON_PYTZ_VERSION = 2021.3 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/82/c3/534ddba230bd4fbbd3b7a3d35f3341d014cca213f369a9940925e7e5f691 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Tue Jan 25 18:20:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:53 +0100 Subject: [Buildroot] [git commit] package/python-aiorwlock: bump to version 1.3.0 Message-ID: <20220125182726.EFF3D827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea135ccb7a2e00e3e0572430a2ecf5cd6a879370 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index fad7079789..15584a8a41 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz -sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz +md5 28e4812a1d1d67a2be4370209ece5528 aiorwlock-1.3.0.tar.gz +sha256 83f12d87df4b9728a0b8fda1756585ab0d652b107bab59c6084e1b1ad692ab45 aiorwlock-1.3.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index 4ba4965eb5..a5e7eeae83 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.2.0 +PYTHON_AIORWLOCK_VERSION = 1.3.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/fe/7027595f5e635ac1f597f7160a420e1f642a474576efb697001efea16bdc PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:20:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:51 +0100 Subject: [Buildroot] [git commit] package/python-itsdangerous: bump to version 2.0.1 Message-ID: <20220125182726.E5780827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bd2ae3b4fc0fd16300861a55c04ad6d72389d49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - python 2 support has been dropped since version 2.0.0 and https://github.com/pallets/itsdangerous/commit/e085f3eedf94fe42391aaa9fc349927f8feaa367 - Update hash of license file (license standardized: https://github.com/pallets/itsdangerous/commit/c880f85ccdaee29adab8b47ad79eb7bdec507b57) - Update indentation in hash file (two spaces) https://itsdangerous.palletsprojects.com/en/2.0.x/changes/#version-2-0-1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-itsdangerous/Config.in | 4 ++-- package/python-itsdangerous/python-itsdangerous.hash | 8 +++++--- package/python-itsdangerous/python-itsdangerous.mk | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in index 39ec0b7725..72aa9165f8 100644 --- a/package/python-itsdangerous/Config.in +++ b/package/python-itsdangerous/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_ITSDANGEROUS bool "python-itsdangerous" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Itsdangerous contains various helpers to pass data to untrusted environments and to get it back safe and sound. diff --git a/package/python-itsdangerous/python-itsdangerous.hash b/package/python-itsdangerous/python-itsdangerous.hash index 0904a91183..dad4ec0800 100644 --- a/package/python-itsdangerous/python-itsdangerous.hash +++ b/package/python-itsdangerous/python-itsdangerous.hash @@ -1,4 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/itsdangerous/json -md5 9b7f5afa7f1e3acfb7786eeca3d99307 itsdangerous-1.1.0.tar.gz -sha256 321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19 itsdangerous-1.1.0.tar.gz -sha256 feb28bfa348d816b0e7dbaeddf18499ee7e8007c67813db8d6ab37c65e046cd4 LICENSE.rst +md5 996b9763d1b4bd0edd6eb86f0a490629 itsdangerous-2.0.1.tar.gz +sha256 9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 itsdangerous-2.0.1.tar.gz +# Locally computed sha256 checksums +sha256 63af09891b6be8ad1a4252ed43af0f4efba7fc948e228367bed7f3c5ae0b09d7 LICENSE.rst +sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk index 9429233703..c53bc6b9ba 100644 --- a/package/python-itsdangerous/python-itsdangerous.mk +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_ITSDANGEROUS_VERSION = 1.1.0 +PYTHON_ITSDANGEROUS_VERSION = 2.0.1 PYTHON_ITSDANGEROUS_SOURCE = itsdangerous-$(PYTHON_ITSDANGEROUS_VERSION).tar.gz -PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/68/1a/f27de07a8a304ad5fa817bbe383d1238ac4396da447fa11ed937039fa04b +PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/58/66/d6c5859dcac92b442626427a8c7a42322068c5cd5d4a463ce78b93f730b7 PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause -PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst +PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst docs/license.rst $(eval $(python-package)) From yann.morin.1998 at free.fr Tue Jan 25 18:23:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:29 +0100 Subject: [Buildroot] [git commit] package/python{, 3}-pycparser: bump to version 2.21 Message-ID: <20220125182727.70CDF827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c2a2aa1faeff4d3396b7ba402b54e1d874b679f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/eliben/pycparser/commit/78beeb7d6f0a760f90a8592d9533042363a82810 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycparser/python-pycparser.hash | 6 +++--- package/python-pycparser/python-pycparser.mk | 4 ++-- package/python3-pycparser/python3-pycparser.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-pycparser/python-pycparser.hash b/package/python-pycparser/python-pycparser.hash index 0426444399..34401a319a 100644 --- a/package/python-pycparser/python-pycparser.hash +++ b/package/python-pycparser/python-pycparser.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycparser/json -md5 b8f88de737db8c346ee8d31c07c7a25a pycparser-2.20.tar.gz -sha256 2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 pycparser-2.20.tar.gz +md5 48f7d743bf018f7bb2ffc5fb976d1492 pycparser-2.21.tar.gz +sha256 e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 pycparser-2.21.tar.gz # Locally computed sha256 checksums -sha256 3c76629880aec2f8578ed914701a4ff9e5da8b60acb8b7ec675abf83c90c5168 LICENSE +sha256 3e7df25b8dfb658c9a91501930d4d943b05087a8347c7e2b4325616af535047b LICENSE diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 5f44a562af..20c3f641a9 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-pycparser/python3-pycparser.mk -PYTHON_PYCPARSER_VERSION = 2.20 +PYTHON_PYCPARSER_VERSION = 2.21 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd +PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3-Clause PYTHON_PYCPARSER_LICENSE_FILES = LICENSE diff --git a/package/python3-pycparser/python3-pycparser.mk b/package/python3-pycparser/python3-pycparser.mk index 68769ceb46..4075f4a38f 100644 --- a/package/python3-pycparser/python3-pycparser.mk +++ b/package/python3-pycparser/python3-pycparser.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-pycparser/python-pycparser.mk -PYTHON3_PYCPARSER_VERSION = 2.20 +PYTHON3_PYCPARSER_VERSION = 2.21 PYTHON3_PYCPARSER_SOURCE = pycparser-$(PYTHON3_PYCPARSER_VERSION).tar.gz -PYTHON3_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd +PYTHON3_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de PYTHON3_PYCPARSER_SETUP_TYPE = setuptools PYTHON3_PYCPARSER_LICENSE = BSD-3-Clause PYTHON3_PYCPARSER_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:03 +0100 Subject: [Buildroot] [git commit] package/python-msgpack: bump to version 1.0.3 Message-ID: <20220125182727.0F35F827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81527c31652fc959661ac651d1f721f4ab5f6c4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-msgpack/python-msgpack.hash | 4 ++-- package/python-msgpack/python-msgpack.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash index 8e192e3717..382bada4a7 100644 --- a/package/python-msgpack/python-msgpack.hash +++ b/package/python-msgpack/python-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgpack/json -md5 68d5804254642905ba87ede509e68970 msgpack-1.0.2.tar.gz -sha256 fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984 msgpack-1.0.2.tar.gz +md5 2dcb4fa618d7890e5a79de6fe44cbb59 msgpack-1.0.3.tar.gz +sha256 51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e msgpack-1.0.3.tar.gz # Locally computed sha256 checksums sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index dcb525ed1f..c50b7157a0 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 1.0.2 +PYTHON_MSGPACK_VERSION = 1.0.3 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/59/04/87fc6708659c2ed3b0b6d4954f270b6e931def707b227c4554f99bd5401e +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/61/3c/2206f39880d38ca7ad8ac1b28d2d5ca81632d163b2d68ef90e46409ca057 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Tue Jan 25 18:20:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:48 +0100 Subject: [Buildroot] [git commit] package/python-pathlib2: bump to version 2.3.6 Message-ID: <20220125182726.D9966827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a5fd47c1eed1a350b7c24b16ba8c56fa5129846 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update hash of LICENSE.rst (LF replaced by CRLF) - Update indentation in hash file (two spaces) https://github.com/jazzband/pathlib2/blob/2.3.6/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pathlib2/python-pathlib2.hash | 6 +++--- package/python-pathlib2/python-pathlib2.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash index 986049d9de..ebd197b62e 100644 --- a/package/python-pathlib2/python-pathlib2.hash +++ b/package/python-pathlib2/python-pathlib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 f2bd0a363eb0f8fa0556f35c1d9e66fb pathlib2-2.3.5.tar.gz -sha256 6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868 pathlib2-2.3.5.tar.gz +md5 e50a0cf94e406c5110b3aed535626e9e pathlib2-2.3.6.tar.gz +sha256 7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f pathlib2-2.3.6.tar.gz # Locally computed sha256 checksums -sha256 f8e02f1a07e4c6fc59a4bee831ddde26b97064105c423b9e24340f35aaa80262 LICENSE.rst +sha256 861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6 LICENSE.rst diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk index d813b77d7e..4bcfea78fb 100644 --- a/package/python-pathlib2/python-pathlib2.mk +++ b/package/python-pathlib2/python-pathlib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHLIB2_VERSION = 2.3.5 +PYTHON_PATHLIB2_VERSION = 2.3.6 PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/94/d8/65c86584e7e97ef824a1845c72bbe95d79f5b306364fa778a3c3e401b309 +PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/df/16/e9d6bcf1aed52a55bc1696324ab22586716053b3e97b85266e0f3ad36bae PYTHON_PATHLIB2_LICENSE = MIT PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst PYTHON_PATHLIB2_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Tue Jan 25 18:26:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:26:36 +0100 Subject: [Buildroot] [git commit] package/python-requests: bump to version 2.27.1 Message-ID: <20220125182727.79E11827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4f9982a196dccc5f2e7cd340bfc1f54bbc411cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 53503a3668..1e4cbaff7b 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 8c745949ad3e9ae83d9927fed213db8a requests-2.26.0.tar.gz -sha256 b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7 requests-2.26.0.tar.gz +md5 bcc01b73974a305cc7c5b092e7d07004 requests-2.27.1.tar.gz +sha256 68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 requests-2.27.1.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 74cc91ef01..962646516e 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.26.0 +PYTHON_REQUESTS_VERSION = 2.27.1 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:21 +0100 Subject: [Buildroot] [git commit] package/python-certifi: bump to version 2021.10.8 Message-ID: <20220125182727.58E9A827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ac0bdf971a1898aafd0de1a6d462dbc7593fda2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-certifi/python-certifi.hash | 4 ++-- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index ae122ffc23..0245496ebf 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 4b38238b7305fcb3ffbc4368be4e8845 certifi-2021.5.30.tar.gz -sha256 2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee certifi-2021.5.30.tar.gz +md5 880ed9e5d04aff8f46f5ff82a3a3e395 certifi-2021.10.8.tar.gz +sha256 78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 certifi-2021.10.8.tar.gz # Locally computed sha256 checksums sha256 be9d82f36112f87a7f1d74ecd4887e1467bbae8878a84004a00117b1e475a3e2 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 486548f8c2..17098e3fae 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2021.5.30 +PYTHON_CERTIFI_VERSION = 2021.10.8 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:10 +0100 Subject: [Buildroot] [git commit] package/python-frozenlist: bump to version 1.3.0 Message-ID: <20220125182727.30C78827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b33cfb30feeb75090b3e308e6e012eb8b6eeae8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-frozenlist/python-frozenlist.hash | 4 ++-- package/python-frozenlist/python-frozenlist.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index fdbf694963..034150397b 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 8f1851ef871d95a15ebcf20255c12f6d frozenlist-1.2.0.tar.gz -sha256 68201be60ac56aff972dc18085800b6ee07973c49103a8aba669dee3d71079de frozenlist-1.2.0.tar.gz +md5 e65d870bd189ba3c21ab7eb10eab22b7 frozenlist-1.3.0.tar.gz +sha256 ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b frozenlist-1.3.0.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 4e26499808..ad618971f7 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.2.0 +PYTHON_FROZENLIST_VERSION = 1.3.0 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/5c/ee/7c6287928ba776567603248e160387cf4143641ecf734e393ad9b2c82475 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/f4/f7/8dfeb76d2a52bcea2b0718427af954ffec98be1d34cd8f282034b3e36829 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:13 +0100 Subject: [Buildroot] [git commit] package/python-jinja2: bump to version 3.0.3 Message-ID: <20220125182727.3B29E827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24ea41cfa2759eeac043690eb6b1b428249ef968 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-jinja2/python-jinja2.hash | 4 ++-- package/python-jinja2/python-jinja2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash index afd07e89f1..ea7fe71a35 100644 --- a/package/python-jinja2/python-jinja2.hash +++ b/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 059f89375d7ea60eb7013f341f0b89e7 Jinja2-3.0.2.tar.gz -sha256 827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45 Jinja2-3.0.2.tar.gz +md5 b76ae2f0647abebc81e7c03f5fb7b00f Jinja2-3.0.3.tar.gz +sha256 611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 Jinja2-3.0.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index bb53f95699..752daf653c 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 3.0.2 +PYTHON_JINJA2_VERSION = 3.0.3 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/f8/86/7c0eb6e8b05385d1ce682abc0f994abd1668e148fb52603fa86e15d4c110 +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/91/a5/429efc6246119e1e3fbf562c00187d04e83e54619249eb732bb423efa6c6 PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst From yann.morin.1998 at free.fr Tue Jan 25 18:23:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:23 +0100 Subject: [Buildroot] [git commit] package/python-charset-normalizer: bump to version 2.0.10 Message-ID: <20220125182727.6776E827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=051a6f8afbb0b4e5a56e011a12fa3427e89e4c10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-charset-normalizer/python-charset-normalizer.hash | 4 ++-- package/python-charset-normalizer/python-charset-normalizer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index f506fa85ed..eb3b67598b 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.hash +++ b/package/python-charset-normalizer/python-charset-normalizer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/charset-normalizer/json -md5 b28e4463613ff3911d5a2dc62b96233f charset-normalizer-2.0.7.tar.gz -sha256 e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0 charset-normalizer-2.0.7.tar.gz +md5 eaed8aaf95d7e3bc2daefcd8d0f03458 charset-normalizer-2.0.10.tar.gz +sha256 876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd charset-normalizer-2.0.10.tar.gz # Locally computed sha256 checksums sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index 7fe9f96996..33f2e132de 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.7 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.10 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/9f/c5/334c019f92c26e59637bb42bd14a190428874b2b2de75a355da394cf16c1 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:08 +0100 Subject: [Buildroot] [git commit] package/python-fonttools: bump to version 4.28.5 Message-ID: <20220125182727.2607A827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b844a3679a8c925f3d6603476814c57220e64bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-fonttools/python-fonttools.hash | 4 ++-- package/python-fonttools/python-fonttools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 2e79861e2c..1f9b546c23 100644 --- a/package/python-fonttools/python-fonttools.hash +++ b/package/python-fonttools/python-fonttools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fonttools/json -md5 fcf1425460855b5892c990027b5396c8 fonttools-4.28.2.zip -sha256 dca694331af74c8ad47acc5171e57f6b78fac5692bf050f2ab572964577ac0dd fonttools-4.28.2.zip +md5 4a894b3cd108432f7636849b4026b771 fonttools-4.28.5.zip +sha256 545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca fonttools-4.28.5.zip # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index 9ec369d550..c5c605161b 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.28.2 +PYTHON_FONTTOOLS_VERSION = 4.28.5 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/3c/d5/f722e0d1aed0d547383913c6bc3c4ff35772952057b8e2b8fe3be8df4216 +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/ce/1b/d4cd86f4e6cbd54a3c4f807015b116299bcd6d6587ea0645d88ba9d932bb PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:26:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:26:37 +0100 Subject: [Buildroot] [git commit] package/python-terminaltables: bump to version 3.1.10 Message-ID: <20220125182727.84621827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d190bc39220022b9dd2febf80a1bd970455d3a01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update repository upstream url and add license hash. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-terminaltables/Config.in | 2 +- package/python-terminaltables/python-terminaltables.hash | 6 ++++-- package/python-terminaltables/python-terminaltables.mk | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/python-terminaltables/Config.in b/package/python-terminaltables/Config.in index 8f3c4296ed..8a387466ec 100644 --- a/package/python-terminaltables/Config.in +++ b/package/python-terminaltables/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_TERMINALTABLES Generate simple tables in terminals from a nested list of strings. - https://github.com/Robpol86/terminaltables + https://github.com/matthewdeanmartin/terminaltables diff --git a/package/python-terminaltables/python-terminaltables.hash b/package/python-terminaltables/python-terminaltables.hash index 3184f5f716..b6c95aa269 100644 --- a/package/python-terminaltables/python-terminaltables.hash +++ b/package/python-terminaltables/python-terminaltables.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/terminaltables/json -md5 863797674d8f75d22e16e6c1fdcbeb41 terminaltables-3.1.0.tar.gz -sha256 f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81 terminaltables-3.1.0.tar.gz +md5 5467e06a1a6e24dc44e6dd241706668e terminaltables-3.1.10.tar.gz +sha256 ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543 terminaltables-3.1.10.tar.gz +# Locally computed sha256 checksums +sha256 2e1320fd337db06a3136d0f4101bd62f13249c95c5b581304f35481e979d432a LICENSE diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index 763f82e9a2..b31ed332b6 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TERMINALTABLES_VERSION = 3.1.0 +PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz -PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/9b/c4/4a21174f32f8a7e1104798c445dacdc1d4df86f2f26722767034e4de4bff +PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools PYTHON_TERMINALTABLES_LICENSE = MIT +PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE $(eval $(python-package)) From yann.morin.1998 at free.fr Tue Jan 25 18:23:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:19 +0100 Subject: [Buildroot] [git commit] package/python-attrs: bump to version 21.4.0 Message-ID: <20220125182727.4F2D7827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e58fb81634432a037afc180929744f86f843cc58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-attrs/python-attrs.hash | 6 +++--- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index 5d4c46304e..823a9459bd 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 06af884070d9180694becdb106e5cd65 attrs-21.2.0.tar.gz -sha256 ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb attrs-21.2.0.tar.gz -# Locally computed sha256 +md5 5a9b5e9ceebc380a13fb93235b11bbda attrs-21.4.0.tar.gz +sha256 626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd attrs-21.4.0.tar.gz +# Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index b99a98501c..4877d62285 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 21.2.0 +PYTHON_ATTRS_VERSION = 21.4.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/ed/d6/3ebca4ca65157c12bd08a63e20ac0bdc21ac7f3694040711f9fd073c0ffb +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/d7/77/ebb15fc26d0f815839ecd897b919ed6d85c050feeb83e100e020df9153d2 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:15 +0100 Subject: [Buildroot] [git commit] package/python-idna: bump to version 3.3 Message-ID: <20220125182727.458E4827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=952867c45247b43d51e80d2f294622ab3c108b60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-idna/python-idna.hash | 4 ++-- package/python-idna/python-idna.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 08a7be9d56..27c42c8b59 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 08ea8e2ce09e522424e872409c221138 idna-3.2.tar.gz -sha256 467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3 idna-3.2.tar.gz +md5 5856306eac5f25db8249e37a4c6ee3e7 idna-3.3.tar.gz +sha256 9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d idna-3.3.tar.gz # Locally computed sha256 checksums sha256 a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index a2c842f1e7..2a1ec8314b 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.2 +PYTHON_IDNA_VERSION = 3.3 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Tue Jan 25 18:26:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:26:37 +0100 Subject: [Buildroot] [git commit] package/python-urllib3: bump to version 1.26.8 Message-ID: <20220125182727.8D7C2827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ac3ae9446e7261445f6772ef4f76615cf16bf82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-urllib3/python-urllib3.hash | 4 ++-- package/python-urllib3/python-urllib3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 066bfb7288..2415f24199 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 e0051a87a956e618a6bb514a07fa7773 urllib3-1.26.7.tar.gz -sha256 4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece urllib3-1.26.7.tar.gz +md5 50831ca7b19bbe2781abb0a4c2d51760 urllib3-1.26.8.tar.gz +sha256 0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c urllib3-1.26.8.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 9580d9b6b9..c9c8a912d1 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.7 +PYTHON_URLLIB3_VERSION = 1.26.8 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/b0/b1/7bbf5181f8e3258efae31702f5eab87d8a74a72a0aa78bc8c08c1466e243 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python From yann.morin.1998 at free.fr Tue Jan 25 18:30:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:30:39 +0100 Subject: [Buildroot] [git commit] package/python{, 3}-cython: bump to version 0.29.26 Message-ID: <20220125182727.AE009827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=037df68cc8fcd2358d548775c641c75cc15c9f83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- package/python3-cython/python3-cython.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 70469c012b..b07f171c25 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 81aff945f5bfdfb86e7a5d24f5467668 Cython-0.29.24.tar.gz -sha256 cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443 Cython-0.29.24.tar.gz +md5 971c9708dd5269180868fc0af986084c Cython-0.29.26.tar.gz +sha256 af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 Cython-0.29.26.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index ffc8e719cd..cf41086dea 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-cython/python3-cython.mk -PYTHON_CYTHON_VERSION = 0.29.24 +PYTHON_CYTHON_VERSION = 0.29.26 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk index 2f15ad8c36..da159cedc8 100644 --- a/package/python3-cython/python3-cython.mk +++ b/package/python3-cython/python3-cython.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-cython/python-cython.mk -PYTHON3_CYTHON_VERSION = 0.29.24 +PYTHON3_CYTHON_VERSION = 0.29.26 PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b PYTHON3_CYTHON_SETUP_TYPE = setuptools PYTHON3_CYTHON_LICENSE = Apache-2.0 PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From yann.morin.1998 at free.fr Tue Jan 25 18:29:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:29:29 +0100 Subject: [Buildroot] [git commit] package/python-pynacl: bump to version 1.5.0 Message-ID: <20220125182727.9A487827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ad6b3974366844a54c7dadbcffbc62853504675 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch that is now upstream. Drop python2 support. Drop python-six dependency which is no longer needed. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: update paramiko python3 dependency comment] Signed-off-by: Yann E. MORIN --- package/python-paramiko/Config.in | 2 +- ...Remove-spurious-requirement-for-wheel-596.patch | 34 ---------------------- package/python-pynacl/Config.in | 2 +- package/python-pynacl/python-pynacl.hash | 6 ++-- package/python-pynacl/python-pynacl.mk | 4 +-- 5 files changed, 7 insertions(+), 41 deletions(-) diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index e44237b0c2..d48051bd22 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography - depends on BR2_PACKAGE_PYTHON3 # python-bcrypt, python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-bcrypt, python-cryptography, python-pynacl select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime diff --git a/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch b/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch deleted file mode 100644 index 4f4a76ce29..0000000000 --- a/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 44fb453931c611d4822343debe902cca8e1c8afe Mon Sep 17 00:00:00 2001 -From: Scott Kitterman -Date: Tue, 26 May 2020 20:08:16 -0400 -Subject: [PATCH] Remove spurious requirement for wheel (#596) - -* Remove spurious requirement for wheel - -* Put wheel back in pyproject.toml - -Co-authored-by: Scott Kitterman -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -44fb453931c611d4822343debe902cca8e1c8afe] ---- - setup.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 9319c1c..d82a7fe 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,8 +35,7 @@ except ImportError: - - - requirements = ["six"] --setup_requirements = ["setuptools", -- "wheel"] -+setup_requirements = ["setuptools"] - test_requirements = ["pytest>=3.2.1,!=3.3.0", - "hypothesis>=3.27.0"] - docs_requirements = ["sphinx>=1.6.5", --- -2.25.1 - diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in index 256f9d5eb6..3bb4e29630 100644 --- a/package/python-pynacl/Config.in +++ b/package/python-pynacl/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PYNACL bool "python-pynacl" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBSODIUM - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime help Python binding to the Networking and Cryptography (NaCl) diff --git a/package/python-pynacl/python-pynacl.hash b/package/python-pynacl/python-pynacl.hash index b6ee2baf0e..85a7447b32 100644 --- a/package/python-pynacl/python-pynacl.hash +++ b/package/python-pynacl/python-pynacl.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/pynacl/json -md5 8c6c57893327a694c72510fb620e4744 PyNaCl-1.4.0.tar.gz -sha256 54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PyNaCl-1.4.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/PyNaCl/json +md5 93989045e25f1111452cfdf5e021814d PyNaCl-1.5.0.tar.gz +sha256 8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba PyNaCl-1.5.0.tar.gz # Locally computed sha256 checksums sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE diff --git a/package/python-pynacl/python-pynacl.mk b/package/python-pynacl/python-pynacl.mk index 1e4155992a..bd2571c3ad 100644 --- a/package/python-pynacl/python-pynacl.mk +++ b/package/python-pynacl/python-pynacl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYNACL_VERSION = 1.4.0 +PYTHON_PYNACL_VERSION = 1.5.0 PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/cf/5a/25aeb636baeceab15c8e57e66b8aa930c011ec1c035f284170cacb05025e +PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/a7/22/27582568be639dfe22ddb3902225f91f2f17ceff88ce80e4db396c8986da PYTHON_PYNACL_LICENSE = Apache-2.0 PYTHON_PYNACL_LICENSE_FILES = LICENSE PYTHON_PYNACL_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Tue Jan 25 18:30:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:30:39 +0100 Subject: [Buildroot] [git commit] package/python-multidict: bump to version 6.0.2 Message-ID: <20220125182727.B801F827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba48bb937bf4499e2be122bf15d0d4a1f9714143 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 2d9943fc0d..999c8867d0 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 e28b9592289597b232f09e5cc3857f32 multidict-5.2.0.tar.gz -sha256 0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce multidict-5.2.0.tar.gz +md5 f8230905ad1f50c87e8d9cc6b0bb7ca2 multidict-6.0.2.tar.gz +sha256 5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013 multidict-6.0.2.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 2619cad2ee..1a9aec7ba7 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 5.2.0 +PYTHON_MULTIDICT_VERSION = 6.0.2 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/8e/7c/e12a69795b7b7d5071614af2c691c97fbf16a2a513c66ec52dd7d0a115bb +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/fa/a7/71c253cdb8a1528802bac7503bf82fe674367e4055b09c28846fdfa4ab90 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:30:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:30:39 +0100 Subject: [Buildroot] [git commit] package/python{, 3}-pycryptodomex: bump to version 3.13.0 Message-ID: <20220125182727.A36F1827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54f5fe5c6d2df4c133c805842e1df30410258010 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to OCB patents expiry: https://github.com/Legrandin/pycryptodome/commit/5d78d02220022592d79fd7789cc77af6d1859729 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycryptodomex/python-pycryptodomex.hash | 6 +++--- package/python-pycryptodomex/python-pycryptodomex.mk | 7 +++---- package/python3-pycryptodomex/python3-pycryptodomex.mk | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 544468b37e..9512f185a8 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 3d007103f68f7e902167719655d2b57a pycryptodomex-3.11.0.tar.gz -sha256 0398366656bb55ebdb1d1d493a7175fc48ade449283086db254ac44c7d318d6d pycryptodomex-3.11.0.tar.gz +md5 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz +sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz # Locally computed sha256 checksums -sha256 c273fb45d120362875aafdd6189f4d7c70f6c36d4cb7ce427e0dc704753639df LICENSE.rst +sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index f1fda7aea2..92780327a1 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -5,14 +5,13 @@ ################################################################################ # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk -PYTHON_PYCRYPTODOMEX_VERSION = 3.11.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/47/14/dd9ad29cd29ea4cc521286f2cb401ca7ac6fd5db0791c5e9bacaf2c9ac78 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ - Public Domain (pycrypto original code), \ - OCB patent license (OCB mode) + Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto $(eval $(python-package)) diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk index ee03a08ec6..06a46cdf63 100644 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ b/package/python3-pycryptodomex/python3-pycryptodomex.mk @@ -5,14 +5,13 @@ ################################################################################ # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.11.0 +PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/47/14/dd9ad29cd29ea4cc521286f2cb401ca7ac6fd5db0791c5e9bacaf2c9ac78 +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON3_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ - Public Domain (pycrypto original code), \ - OCB patent license (OCB mode) + Public Domain (pycrypto original code) PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 From yann.morin.1998 at free.fr Tue Jan 25 18:21:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:21:32 +0100 Subject: [Buildroot] [git commit] package/python-autobahn: bump to version 21.11.1 Message-ID: <20220125182727.06126827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67db399099a7c9832766680a3fdecb4050a3d6b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches that are now upstream. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: don't duplicate _SETUP_TYPE] Signed-off-by: Yann E. MORIN --- ...te-xbr-packages-and-xbr-templates-package.patch | 54 ------------------- ...nvx-by-default-and-don-t-publish-universa.patch | 60 ---------------------- package/python-autobahn/python-autobahn.hash | 4 +- package/python-autobahn/python-autobahn.mk | 4 +- 4 files changed, 4 insertions(+), 118 deletions(-) diff --git a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch b/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch deleted file mode 100644 index f239345dc7..0000000000 --- a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b13b7e38b38e2c79c0a13be32e05f0451483cd01 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sat, 12 Jun 2021 15:32:37 -0600 -Subject: [PATCH] Fix duplicate xbr packages and xbr templates package_data. - (#1492) - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -a370f9e7154e59b313cb675bfcaf8cad6011bd52] ---- - MANIFEST.in | 1 - - setup.py | 10 ++++++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/MANIFEST.in b/MANIFEST.in -index f4cb6da1..1dd32f0e 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -1,4 +1,3 @@ - include LICENSE - include autobahn/nvx/_utf8validator.c - recursive-include autobahn/wamp/gen/schema * --recursive-include autobahn/xbr/templates * -diff --git a/setup.py b/setup.py -index cf4e29ba..f27006da 100644 ---- a/setup.py -+++ b/setup.py -@@ -166,6 +166,12 @@ packages = [ - 'twisted.plugins', - ] - -+xbr_packages = [ -+ 'autobahn.xbr', -+ 'autobahn.asyncio.xbr', -+ 'autobahn.twisted.xbr', -+] -+ - package_data = {'autobahn.asyncio': ['./test/*']} - - entry_points = { -@@ -179,8 +185,8 @@ if 'AUTOBAHN_STRIP_XBR' in os.environ: - shutil.rmtree('autobahn.egg-info', ignore_errors=True) - else: - extras_require_all += extras_require_xbr -- packages += ['autobahn.xbr', 'autobahn.asyncio.xbr', 'autobahn.twisted.xbr'] -- package_data['xbr'] = ['./xbr/contracts/*.json'] -+ packages += xbr_packages -+ package_data['xbr'] = ['./xbr/templates/*.py.jinja2'] - entry_points['console_scripts'] += ["xbrnetwork = autobahn.xbr._cli:_main"] - - # development dependencies --- -2.25.1 - diff --git a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch b/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch deleted file mode 100644 index c2c2cf5777..0000000000 --- a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1e3162bab59cbc2f7cf8b9ef6cadf55ee273c1d8 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 22 Jul 2021 06:56:51 -0600 -Subject: [PATCH] Build with nvx by default and don't publish universal wheel. - (#1493) - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -a35f22eeaafca7568f1deb35c4a1b82ae78f77d4] ---- - Makefile | 8 ++++---- - autobahn/nvx/_utf8validator.py | 7 ++++++- - setup.py | 7 +------ - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/autobahn/nvx/_utf8validator.py b/autobahn/nvx/_utf8validator.py -index e72fc872..34393356 100644 ---- a/autobahn/nvx/_utf8validator.py -+++ b/autobahn/nvx/_utf8validator.py -@@ -44,13 +44,18 @@ ffi.cdef(""" - int nvx_utf8vld_get_impl(void* utf8vld); - """) - -+optional = True -+if 'AUTOBAHN_USE_NVX' in os.environ and os.environ['AUTOBAHN_USE_NVX'] in ['1', 'true']: -+ optional = False -+ - with open(os.path.join(os.path.dirname(__file__), '_utf8validator.c')) as fd: - c_source = fd.read() - ffi.set_source( - "_nvx_utf8validator", - c_source, - libraries=[], -- extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'] -+ extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'], -+ optional=optional - ) - - -diff --git a/setup.py b/setup.py -index f27006da..4889a39e 100644 ---- a/setup.py -+++ b/setup.py -@@ -110,12 +110,7 @@ extras_require_nvx = [ - - # cffi based extension modules to build, currently only NVX - cffi_modules = [] --if 'AUTOBAHN_USE_NVX' in os.environ: -- # FIXME: building this extension will make the wheel -- # produced no longer universal (as in "autobahn-18.4.1-py2.py3-none-any.whl"). -- # on the other hand, I don't know how to selectively include this -- # based on the install flavor the user has chosen (eg pip install autobahn[nvx] -- # should make the following be included) -+if 'AUTOBAHN_USE_NVX' not in os.environ or os.environ['AUTOBAHN_USE_NVX'] not in ['0', 'false']: - cffi_modules.append('autobahn/nvx/_utf8validator.py:ffi') - - extras_require_xbr = [ --- -2.25.1 - diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 7de1e7e673..0bbb9112d0 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 dcba839ee61be33d05042a09c008c6bc autobahn-21.3.1.tar.gz -sha256 e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03 autobahn-21.3.1.tar.gz +md5 1ccd46d938d8b9fed435e9781e54e887 autobahn-21.11.1.tar.gz +sha256 bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18 autobahn-21.11.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 4ec47f54ce..db9e5083d1 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 21.3.1 +PYTHON_AUTOBAHN_VERSION = 21.11.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/4c/9e/f5bdfb55d1eab67c4b6d24d1397f95feec792071ff1b2f5a893d6d5247f3 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar From yann.morin.1998 at free.fr Tue Jan 25 18:23:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:06 +0100 Subject: [Buildroot] [git commit] package/python-pillow: bump to verison 9.0.0 Message-ID: <20220125182727.1C8FB827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8b56565c2c134e2327554e47874139474588a33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash change due to copyright year update: https://github.com/python-pillow/Pillow/commit/0bb3f87dcc72a1a80f50690abde5a3ac4576d3d6 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index d14cb5cff6..f3ca8e6014 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 7a1eb5a250c7ccbd549a89e16404f09f Pillow-8.4.0.tar.gz -sha256 b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed Pillow-8.4.0.tar.gz +md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz +sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz # Locally computed sha256 checksums -sha256 5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4 LICENSE +sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 5ed57c55cb..2f2e817882 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 8.4.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/7d/2a/2fc11b54e2742db06297f7fa7f420a0e3069fdcf0e4b57dfec33f0b08622 +PYTHON_PILLOW_VERSION = 9.0.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:36:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:36:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 21.11.1 In-Reply-To: <20220124094408.421939-1-james.hilliard1@gmail.com> References: <20220124094408.421939-1-james.hilliard1@gmail.com> Message-ID: <20220125183640.GD457876@scaer> James, All, On 2022-01-24 02:44 -0700, James Hilliard spake thusly: > Drop patches that are now upstream. > > Signed-off-by: James Hilliard > --- [--SNIP--] > diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk > index 4ec47f54ce..481d9373ad 100644 > --- a/package/python-autobahn/python-autobahn.mk > +++ b/package/python-autobahn/python-autobahn.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -PYTHON_AUTOBAHN_VERSION = 21.3.1 > +PYTHON_AUTOBAHN_VERSION = 21.11.1 > PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz > -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/4c/9e/f5bdfb55d1eab67c4b6d24d1397f95feec792071ff1b2f5a893d6d5247f3 > +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed > +PYTHON_AUTOBAHN_SETUP_TYPE = setuptools $ make check-package package/python-autobahn/python-autobahn.mk:15: unconditional override of variable PYTHON_AUTOBAHN_SETUP_TYPE python-autobachn was already declared as a setuptools package; your change was superfluous. Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > PYTHON_AUTOBAHN_LICENSE = MIT > PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE > PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 25 18:38:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:38:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pynacl: bump to version 1.5.0 In-Reply-To: <20220124113749.585264-1-james.hilliard1@gmail.com> References: <20220124113749.585264-1-james.hilliard1@gmail.com> Message-ID: <20220125183816.GE457876@scaer> James, All, On 2022-01-24 04:37 -0700, James Hilliard spake thusly: > Drop patch that is now upstream. > > Drop python2 support. > > Drop python-six dependency which is no longer needed. > > Signed-off-by: James Hilliard > --- [--SNIP--] > diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in > index 256f9d5eb6..3bb4e29630 100644 > --- a/package/python-pynacl/Config.in > +++ b/package/python-pynacl/Config.in > @@ -1,7 +1,7 @@ > config BR2_PACKAGE_PYTHON_PYNACL > bool "python-pynacl" > + depends on BR2_PACKAGE_PYTHON3 You forgot to update the comment in paramiko. Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 25 18:42:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:42:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytz: bump to version 2021.3 In-Reply-To: <20220123220731.787537-1-fontaine.fabrice@gmail.com> References: <20220123220731.787537-1-fontaine.fabrice@gmail.com> Message-ID: <20220125184209.GF457876@scaer> Fabrice, All, On 2022-01-23 23:07 +0100, Fabrice Fontaine spake thusly: > - Update hash of LICENSE.txt (year updated) > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine This, and the three followimng python updates, applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-pytz/python-pytz.hash | 6 +++--- > package/python-pytz/python-pytz.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash > index d1ce81e590..e0f253902c 100644 > --- a/package/python-pytz/python-pytz.hash > +++ b/package/python-pytz/python-pytz.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pytz/json > -md5 c3d84a465fc56a4edd52cca8873ac0df pytz-2019.3.tar.gz > -sha256 b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be pytz-2019.3.tar.gz > +md5 d7b7060bbac4970afa2050c139c9fcb6 pytz-2021.3.tar.gz > +sha256 acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 pytz-2021.3.tar.gz > # Locally computed sha256 checksums > -sha256 39f07c72a1bfda349cbd27bac9bcb1e6f8c5b4e5cc3fadf56900406e8cc0b792 LICENSE.txt > +sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt > diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk > index 888f3c4556..d606750699 100644 > --- a/package/python-pytz/python-pytz.mk > +++ b/package/python-pytz/python-pytz.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYTZ_VERSION = 2019.3 > +PYTHON_PYTZ_VERSION = 2021.3 > PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz > -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/82/c3/534ddba230bd4fbbd3b7a3d35f3341d014cca213f369a9940925e7e5f691 > +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a > PYTHON_PYTZ_SETUP_TYPE = setuptools > PYTHON_PYTZ_LICENSE = MIT > PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 25 18:43:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:43:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiorwlock: bump to version 1.3.0 In-Reply-To: <20220124093610.410365-1-james.hilliard1@gmail.com> References: <20220124093610.410365-1-james.hilliard1@gmail.com> Message-ID: <20220125184330.GG457876@scaer> James, All, On 2022-01-24 02:36 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard Applied to master, along with a bunch of your other python package updates, thanks. Regards, Yann E. MORIN. > --- > package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- > package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash > index fad7079789..15584a8a41 100644 > --- a/package/python-aiorwlock/python-aiorwlock.hash > +++ b/package/python-aiorwlock/python-aiorwlock.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aiorwlock/json > -md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz > -sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz > +md5 28e4812a1d1d67a2be4370209ece5528 aiorwlock-1.3.0.tar.gz > +sha256 83f12d87df4b9728a0b8fda1756585ab0d652b107bab59c6084e1b1ad692ab45 aiorwlock-1.3.0.tar.gz > # Locally computed sha256 checksums > sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE > diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk > index 4ba4965eb5..a5e7eeae83 100644 > --- a/package/python-aiorwlock/python-aiorwlock.mk > +++ b/package/python-aiorwlock/python-aiorwlock.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIORWLOCK_VERSION = 1.2.0 > +PYTHON_AIORWLOCK_VERSION = 1.3.0 > PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz > -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d > +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/fe/7027595f5e635ac1f597f7160a420e1f642a474576efb697001efea16bdc > PYTHON_AIORWLOCK_SETUP_TYPE = setuptools > PYTHON_AIORWLOCK_LICENSE = Apache-2.0 > PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Tue Jan 25 18:51:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 19:51:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/gupnp: bump to version 1.4.3 Message-ID: <20220125185126.52194-1-fontaine.fabrice@gmail.com> https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.3/NEWS Signed-off-by: Fabrice Fontaine --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index cc78be7d5d..cc5e2b5775 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.2.sha256sum: -sha256 bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc gupnp-1.4.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: +sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index aebf9225a8..dca747f064 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ -- 2.34.1 From peter at korsgaard.com Tue Jan 25 18:59:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:59:30 +0100 Subject: [Buildroot] [git commit] package/erlang-rebar: fix linking failure on shared library In-Reply-To: <20211228214236.BD2C582B78@busybox.osuosl.org> (Yann E. MORIN's message of "Tue, 28 Dec 2021 22:47:41 +0100") References: <20211228214236.BD2C582B78@busybox.osuosl.org> Message-ID: <87wnink5f1.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b00c034fe58ad2ae87b2289e07912b6c10d19ee1 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Add patch to fix linking failure while creating shared library. As > explained in the patch itself, there is no specific variable for when we > link a shared library and rebar itself rely on the default LDFLAGS. Since > by default every CFLAGS is filled with -fPIC we need to make sure that > every LDFLAGS is the same, so not having any other *_LDFLAGS variable to > fille with -fPIC let's add it to the main LDFLAGS. > Fixes: > http://autobuild.buildroot.net/results/602/60296a48210e7ffc6bc9fa50ee586441a8957e85/ > Signed-off-by: Giulio Benetti > Signed-off-by: Yann E. MORIN Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From colin.foster at in-advantage.com Tue Jan 25 19:07:14 2022 From: colin.foster at in-advantage.com (Colin Foster) Date: Tue, 25 Jan 2022 11:07:14 -0800 Subject: [Buildroot] [PATCH] support/dependencies: add suggested regex to sanitize PATH variable Message-ID: <20220125190714.30785-1-colin.foster@in-advantage.com> WSL typically has /mnt/c/Program Files/... in the PATH variable. The suggested command will remove anything that has spaces in PATH, which should probably be good enough for most users who see this error. Signed-off-by: Colin Foster --- support/dependencies/dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index c604a9efcc..e49dfb84a5 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -41,7 +41,8 @@ case ":${PATH:-unset}:" in (*" "*|*"${TAB}"*|*"${NL}"*) printf "\n" printf "Your PATH contains spaces, TABs, and/or newline (\\\n) characters.\n" - printf "This doesn't work. Fix you PATH.\n" + printf "This doesn't work. Fix your PATH. You can try running:\n" + printf "export PATH=\$(echo \$PATH | grep -Po \"(?::|^)[^\ :]+(?=(?::|$))\" | tr -d '\\\n'; echo)\n" exit 1 ;; esac -- 2.25.1 From fontaine.fabrice at gmail.com Tue Jan 25 19:06:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 20:06:49 +0100 Subject: [Buildroot] [PATCH 1/2] package/xvisor: drop arm support Message-ID: <20220125190650.107677-1-fontaine.fabrice@gmail.com> Support for old 32-bit ARM boards (i.e. ARMv5, ARMv6, ARMv7a) without virtualization has been dropped since https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 resulting in the following build failure since bump to version 0.3.1 in commit c4f8b8968770ecbf6444a5921c6472f126717626: *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v6-defconfig"! *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-0/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v7-defconfig"! Fixes: - http://autobuild.buildroot.org/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b - http://autobuild.buildroot.org/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 Signed-off-by: Fabrice Fontaine --- package/xvisor/Config.in | 6 +----- package/xvisor/xvisor.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index eb7475b86d..55c43e6959 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool default y depends on BR2_USE_MMU - depends on BR2_arm || BR2_aarch64 || BR2_x86_64 - depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV7M + depends on BR2_aarch64 || BR2_x86_64 menuconfig BR2_PACKAGE_XVISOR bool "xvisor" @@ -32,9 +31,6 @@ endchoice config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" - default "generic-v5" if BR2_ARM_CPU_ARMV5 - default "generic-v6" if BR2_ARM_CPU_ARMV6 - default "generic-v7" if BR2_ARM_CPU_ARMV7A default "generic-v8" if BR2_aarch64 default "x86_64_generic" if BR2_x86_64 depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index dc49258400..4ceb5ed7cb 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -30,7 +30,7 @@ XVISOR_KCONFIG_EDITORS = menuconfig ifeq ($(BR2_x86_64),y) XVISOR_ARCH = x86 -else ifeq ($(BR2_arm)$(BR2_aarch64),y) +else ifeq ($(BR2_aarch64),y) XVISOR_ARCH = arm endif -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 19:06:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 20:06:50 +0100 Subject: [Buildroot] [PATCH 2/2] package/xvisor: add riscv support In-Reply-To: <20220125190650.107677-1-fontaine.fabrice@gmail.com> References: <20220125190650.107677-1-fontaine.fabrice@gmail.com> Message-ID: <20220125190650.107677-2-fontaine.fabrice@gmail.com> riscv is supported since version 0.3.0 and https://github.com/xvisor/xvisor/commit/d6feda4e80eefd372294b081111ce709d08ee4c0 Signed-off-by: Fabrice Fontaine --- package/xvisor/Config.in | 4 +++- package/xvisor/xvisor.mk | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index 55c43e6959..4e7a3e1b53 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool default y depends on BR2_USE_MMU - depends on BR2_aarch64 || BR2_x86_64 + depends on BR2_aarch64 || BR2_riscv || BR2_x86_64 menuconfig BR2_PACKAGE_XVISOR bool "xvisor" @@ -32,6 +32,8 @@ endchoice config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" default "generic-v8" if BR2_aarch64 + default "generic-32b" if BR2_RISCV_32 + default "generic-64b" if BR2_RISCV_64 default "x86_64_generic" if BR2_x86_64 depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG help diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 4ceb5ed7cb..1a7b49e689 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -32,6 +32,8 @@ ifeq ($(BR2_x86_64),y) XVISOR_ARCH = x86 else ifeq ($(BR2_aarch64),y) XVISOR_ARCH = arm +else ifeq ($(BR2_riscv),y) +XVISOR_ARCH = riscv endif ifeq ($(BR2_PACKAGE_XVISOR)$(BR_BUILDING),yy) -- 2.34.1 From peter at korsgaard.com Tue Jan 25 18:59:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:59:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/erlang-rebar: fix linking failure on shared library Message-ID: <20220125191346.D9FF4822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c630f207bf527977150ef59659b8d0b573f26c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add patch to fix linking failure while creating shared library. As explained in the patch itself, there is no specific variable for when we link a shared library and rebar itself rely on the default LDFLAGS. Since by default every CFLAGS is filled with -fPIC we need to make sure that every LDFLAGS is the same, so not having any other *_LDFLAGS variable to fille with -fPIC let's add it to the main LDFLAGS. Fixes: http://autobuild.buildroot.net/results/602/60296a48210e7ffc6bc9fa50ee586441a8957e85/ Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN (cherry picked from commit b00c034fe58ad2ae87b2289e07912b6c10d19ee1) Signed-off-by: Peter Korsgaard --- ...ort_compiler-add-fPIC-to-LDFLAGS-by-defau.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch b/package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch new file mode 100644 index 0000000000..a9c1670a1f --- /dev/null +++ b/package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch @@ -0,0 +1,35 @@ +From 7f54d48ee5db037778ead310e0b8278f3fe70b41 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sun, 19 Dec 2021 07:52:55 +0100 +Subject: [PATCH] src/rebar_port_compiler: add -fPIC to LDFLAGS by default + +Since both DRV_CFLAGS and EXE_CFLAGS list -fPIC we need also the LDFLAGS +to follow them. Unfortunately adding -fPIC only to DRV_LDFLAGS and +EXE_LDFLAGS is not sufficient, since when linking as a library(.so) it +doesn't take into account those variables. Since -fPIC is needed by default +by any kind of linking, let's add it to the general -fPIC. Rebar seems to +link libraries without taking into account any variable listed in: +src/rebar_port_compiler.erl +this after testing and tracing for every variable. + +Signed-off-by: Giulio Benetti +--- + src/rebar_port_compiler.erl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl +index 9679c80..bd08b21 100644 +--- a/src/rebar_port_compiler.erl ++++ b/src/rebar_port_compiler.erl +@@ -645,6 +645,8 @@ default_env() -> + {"OBJCOPY", get_tool(Arch, "objcopy", "objcopy")}, + {"OBJDUMP", get_tool(Arch, "objdump", "objdump")}, + ++ {"LDFLAGS", "-fPIC $LDFLAGS"}, ++ + {"DRV_CXX_TEMPLATE", + "$CXX -c $CXXFLAGS $DRV_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"}, + {"DRV_CC_TEMPLATE", +-- +2.25.1 + From peter at korsgaard.com Tue Jan 25 19:22:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 20:22:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libdbi: needs dynamic library Message-ID: <20220125191637.5FAF8822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d4a00623ebc44f197b08e039fe533bba82290b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x libdbi needs dynamic library to avoid the following build failure raised since the addition of the package in commit c6aac6ebdbbd3873110a9e19de1957e49cb9344e: dbi_main.c:84:2: error: #error no dynamic loading support 84 | #error no dynamic loading support | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/9cd56a625cbd52b0c070e2d462e02f5161d9631d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a24f0e8eeebbd6a77775a5eb5dbe830417fc9d22) Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 4 ++++ package/libdbi-drivers/Config.in | 4 ++++ package/libdbi/Config.in | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 9c38d87bcb..05fb577345 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -214,11 +214,15 @@ config BR2_PACKAGE_COLLECTD_CURL_XML config BR2_PACKAGE_COLLECTD_DBI bool "dbi" + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBDBI help Executes SQL statements on various databases and interprets the returned data. +comment "dbi support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_COLLECTD_DF bool "df" help diff --git a/package/libdbi-drivers/Config.in b/package/libdbi-drivers/Config.in index 087e6aaf0e..7c505340c1 100644 --- a/package/libdbi-drivers/Config.in +++ b/package/libdbi-drivers/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_LIBDBI_DRIVERS bool "libdbi-drivers" + depends on !BR2_STATIC_LIBS # libdbi select BR2_PACKAGE_LIBDBI help The libdbi-drivers project provides the database-specific drivers for the libdbi framework. http://libdbi-drivers.sourceforge.net + +comment "libdbi-drivers needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libdbi/Config.in b/package/libdbi/Config.in index ded2bc6e53..13ac344f82 100644 --- a/package/libdbi/Config.in +++ b/package/libdbi/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_LIBDBI bool "lidbi" + depends on !BR2_STATIC_LIBS help libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl. http://libdbi.sourceforge.net + +comment "libdbi needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS From peter at korsgaard.com Tue Jan 25 19:23:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 20:23:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdbi: needs dynamic library In-Reply-To: <20211228230513.5ebc14e9@windsurf> (Thomas Petazzoni's message of "Tue, 28 Dec 2021 23:05:13 +0100") References: <20211014160824.2154396-1-fontaine.fabrice@gmail.com> <20211228230513.5ebc14e9@windsurf> Message-ID: <87sftbk4ad.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Thu, 14 Oct 2021 18:08:24 +0200 > Fabrice Fontaine wrote: >> libdbi needs dynamic library to avoid the following build failure raised >> since the addition of the package in commit >> c6aac6ebdbbd3873110a9e19de1957e49cb9344e: >> >> dbi_main.c:84:2: error: #error no dynamic loading support >> 84 | #error no dynamic loading support >> | ^~~~~ >> >> Fixes: >> - http://autobuild.buildroot.org/results/9cd56a625cbd52b0c070e2d462e02f5161d9631d >> >> Signed-off-by: Fabrice Fontaine >> --- >> package/libdbi-drivers/Config.in | 4 ++++ >> package/libdbi/Config.in | 4 ++++ >> 2 files changed, 8 insertions(+) > Applied to master, but after adding the !BR2_STATIC_LIBS dependency to > collectd, as suggested by Herv?. Indeed, we prefer to duplicate those > dependencies, if they turn out to change at the top-level > BR2_PACKAGE_COLLECTD option. Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From ps.report at gmx.net Tue Jan 25 20:11:08 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 25 Jan 2022 21:11:08 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: <20220125001222.582e094a@windsurf> References: <20220124201628.11015-1-ps.report@gmx.net> <20220124220707.688fee47@windsurf> <20220125001222.582e094a@windsurf> Message-ID: <20220125211108.1143b77b@gmx.net> Hello Thomas, On Tue, 25 Jan 2022 00:12:22 +0100, Thomas Petazzoni wrote: > On Mon, 24 Jan 2022 22:07:07 +0100 > Thomas Petazzoni wrote: > > > Applied to master, thanks. > > And I reverted, because it breaks the build: > > http://autobuild.buildroot.net/?reason=%util-linux-2.37.3 > > (I didn't investigate, it's too late here.) The failure is make[3]: *** No rule to make target 'disk-utils/raw.8', needed by 'all-am'. Stop. upstream known [1] and [2] (and fixed in the next release), seems to be a packaging error and could be fixed/work-around (or hacked) by (will install an empty man page to staging/target): touch build/util-linux-2.37.3/disk-utils/raw.8 Can send an updated patch with this fix(?)... Regards, Peter [1] https://github.com/util-linux/util-linux/issues/1579 [2] https://github.com/util-linux/util-linux/issues/1577 > > Best regards, > > Thomas From arnout at mind.be Tue Jan 25 20:49:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 25 Jan 2022 21:49:17 +0100 Subject: [Buildroot] [PATCH 0/2 v2] core: fixup PPD paths (branch yem/ppd-fixup-paths) In-Reply-To: References: Message-ID: <27e2c9f6-8ed6-b23e-ba39-9f04e29f4590@mind.be> On 22/01/2022 19:13, Yann E. MORIN wrote: > Hello All! > > This series builds upon previous good work from Andreas [0], Louis-Paul > [1], and Adam [2]. > > The first patch is the core of the change: rather than have multiple > hooks that each cater for different types of files (.py, .pc, .pri, > .cmake and so on), we jut do what we already do in relocate-sdk: we just > look for all text files that have a PPD prefix in them, and replace tht > with the current package's PPD. > > The second patch ensures that we can build reliable files lists, so that > files we tweak in the infra are not believed to be installed/modified by > the current package. > > [0] https://lore.kernel.org/buildroot/20200217212350.29750-21-anaumann at ultratronik.de/ > [1] https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ > [2] https://lore.kernel.org/buildroot/20220106171720.12857-1-aduskett at gmail.com/ > > Changes v1 -> v2: > - use --binary-files=without-match, as this *considerably* speeds up > the fixup (Arnout) > - rename the python fixup (Arnout) Both applied to master, thanks. Regards, Arnout > > Regards, > Yann E. MORIN. > > > ---------------------------------------------------------------- > Yann E. MORIN (2): > core/pkg-generic: fixup all PPD paths in a generic fashion > core/pkg-generic: apply post-prepare hooks before monitoring directories > > package/pkg-generic.mk | 47 +++++++++++++++++++++++------------------------ > 1 file changed, 23 insertions(+), 24 deletions(-) > From arnout at mind.be Tue Jan 25 20:47:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 25 Jan 2022 21:47:17 +0100 Subject: [Buildroot] [git commit] core/pkg-generic: apply post-prepare hooks before monitoring directories Message-ID: <20220125204237.D5D9182810@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f9a1c621302c6cdf01dfff88f0343d7b03a6107 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Monitoring the target/ and host/ directories and so on, will serve to generate lists of files installed by the packages. Those lists are then used to generate graphs of the size those package take on the target for example. With PPD, we will also want to use those lists to only copy those files actually installed by each dependencies of a package, recursively. Currently, those lists are not entirely reliable, as the starting points are established before we apply PPD fixup hooks. As such, at the end of a package installation, fixed up files will be found to belong to the current package, while they were in fact provided by one of its dependency. While this does no big harm, if at all, for the size graphs, it will trigger overwrite detection when we eventually gather packages together to aggregate a PPD or te final host and target. So, we better have the lists of files be reliable. So, we only start monitoring the directories after we apply the PPD fixups (or seen the other way around for a smaller diff: we apply the PPD fixups before we start monitoring the directories). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Herve Codina Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 78226ee266..b3a7e1d60e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call MESSAGE,"Configuring") $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) @$(call pkg_size_before,$(TARGET_DIR)) @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) From arnout at mind.be Tue Jan 25 20:37:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 25 Jan 2022 21:37:48 +0100 Subject: [Buildroot] [git commit] core/pkg-generic: fixup all PPD paths in a generic fashion Message-ID: <20220125204237.CCA6182627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b06294e9897e90862656416e8b67fdace15488d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some files contain hard-coded absolute paths that point to the host and/or staging directories. With per-package directories (aka. PPD), these paths point to the PPD of the package that created the files, when we want them to point to the PPD of the package that uses them. Up until now, we had two hooks that attempted to fix those files: - a libtool-specific hook that searches for all .la files and seds them with the proper PPD, - a python-specific hook that tweaks just the sysconfigdata and removes the byte-compiled version of the sysconfigdata. But now, we also have a few other kinds of files for which we need to fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others as well. We solve this issue by just replacing any PPD in text files, with the current package's PPD. This is very similar to, and inspired from what is done when relocating the SDK. However, we can't use the existing relocate-sdk script, because that needs to know the original location, which we do not have when we aggregate the PPD (we could store it, but we can easily do without it). Furthermore, we use a construct that is way more efficient than relocate-sdk. First, we skip binary files with grep, which means we have way less files to check with 'file' [0]. Second, we use xargs to sed multiple files at once: printf is a shell built-in, so it's fast, and so we do not have to spawn a sed for each file to fixup. [0] We still keep using 'file' as a safety net, to avoid mangling a binary file that grep would have missed. Finally, the existing python-specific macro is simplified to just remove the pre-compiled sysconfigdata files. And we rename it accordingly. And as for some timings, to see the impact, with the defconfig below, and with the downloads already local, and with a PC mostly idle (mail and IRC activity only): Before Now Delta - without PPD : 7min 27s 7min 23s -0.9% - with PPD : 7min 51s 7min 59s +1.7% - with PPD -j8: 5min 51s 5min 56s +1.4% So we can see a slight increase in time, but it is mostly in the noise (some builds without this change did exceed some builds with this change, due to background noise). Also, depending on scheduling, there can be less parallelism; for example, python3 does not build in parallel, and with this special defconfig, python is on the critical path of a lot of packages that are python modules, which can negatively impact a parallel build too. A more realistic, bigger defconfig would probably be more parallel... YMMV... Delta without PPD is also due to background noise, as those hooks are not used when PPD is not enabled. Defconfig used: BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AIOBLESCAN=y BR2_PACKAGE_PYTHON_AIOCOAP=y BR2_PACKAGE_PYTHON_AIOFILES=y BR2_PACKAGE_PYTHON_AIOHTTP_CORS=y BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR=y BR2_PACKAGE_PYTHON_AIOHTTP_MAKO=y BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES=y BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY=y BR2_PACKAGE_PYTHON_AIOHTTP_SESSION=y BR2_PACKAGE_PYTHON_AIOHTTP_SSE=y BR2_PACKAGE_PYTHON_AIOJOBS=y BR2_PACKAGE_PYTHON_AIOLOGSTASH=y BR2_PACKAGE_PYTHON_AIOMONITOR=y BR2_PACKAGE_PYTHON_AIOPROCESSING=y BR2_PACKAGE_PYTHON_AIOREDIS=y BR2_PACKAGE_PYTHON_AIORWLOCK=y BR2_PACKAGE_PYTHON_AIOZIPKIN=y BR2_PACKAGE_LIGHTTPD=y BR2_PACKAGE_LIGHTTPD_OPENSSL=y BR2_PACKAGE_LIGHTTPD_ZLIB=y BR2_PACKAGE_LIGHTTPD_BZIP2=y BR2_PACKAGE_LIGHTTPD_PCRE=y BR2_PACKAGE_LIGHTTPD_WEBDAV=y # BR2_TARGET_ROOTFS_TAR is not set Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Adam Duskett Cc: Louis-Paul CORDIER Cc: Andreas Naumann Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-generic.mk | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6a5fe5507b..78226ee266 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -90,21 +90,24 @@ endif ####################################### # Helper functions -# Make sure .la files only reference the current per-package -# directory. - -# $1: package name (lower case) -# $2: staging directory of the package ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define fixup-libtool-files - $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ - -name "*.la" -print0 | xargs -0 --no-run-if-empty \ - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" + +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the +# proper staging and host directories for the current package: find +# all text files that contain the PPD root, and replace it with the +# current package's PPD. +define PPD_FIXUP_PATHS + $(Q)grep --binary-files=without-match -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ + |while read -d '' f; do \ + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ + printf '%s\0' "$${f}"; \ + done \ + |xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef -endif -# Make sure python _sysconfigdata*.py files only reference the current -# per-package directory. +# Remove python's pre-compiled "sysconfigdata", as it may contain paths to +# the original staging or host dirs. # # Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) # because those directories may be created in the same recipe this macro will @@ -113,19 +116,15 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define FIXUP_PYTHON_SYSCONFIGDATA +define PPD_PYTHON_REMOVE_SYSCONFIGDATA_PYC $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ \) \ - \( \( -name "_sysconfigdata*.pyc" -delete \) \ - -o \( -name "_sysconfigdata*.py" -print0 \) \ - \) \ - | xargs -0 --no-run-if-empty \ - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + \( -name "_sysconfigdata*.pyc" -delete \) endef -endif + +endif # PPD # Functions to collect statistics about installed files @@ -278,8 +277,6 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) - $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) @@ -836,7 +833,9 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += \ + PPD_FIXUP_PATHS \ + PPD_PYTHON_REMOVE_SYSCONFIGDATA_PYC ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) From yann.morin.1998 at free.fr Tue Jan 25 20:55:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 21:55:23 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex In-Reply-To: <20220122153243.009b24ba@windsurf> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220122153243.009b24ba@windsurf> Message-ID: <20220125205523.GH457876@scaer> Thomas, Giulio, All, On 2022-01-22 15:32 +0100, Thomas Petazzoni spake thusly: > On Tue, 18 Jan 2022 11:43:10 +0100 > Giulio Benetti wrote: > > > this patchset aims to enable the best FPU strategy for every board with > > 32-bits Arm Cortex actually present in Buildroot. I don't own these boards > > so I can't test these changes. What is about Allwinner doesn't worry me > > because I've tested a lot of cases with Olimex boards, but the other > > changes are still to be tested. > > > > So I ask to the board maintainers to test the patches that involve their > > boards if possible. Anyway I've checked well all the SoCs Datasheet and I > > think I've made it correctly, even if in some of them it's not specified > > if VFPv4 means -D32. I assume it like that because otherwise -D16 is > > usually specified. > > Do we have a good understand of what -mfpu=neon-vfpv4 does? Your patch > series basically converts many defconfigs to use this -mfpu value, but > it's not clear to me how it works. What does it mean to combine NEON > and VFPv4 instructions? The gcc man page states that specifying Neon as part of the fpu setting has no effect, unless the -funsafe-math-optimizations is also specified, because Neon is not compliant zith IEEE 754: If the selected floating-point hardware includes the NEON extension (e.g. -mfpu=neon), note that floating-point operations are not generated by GCC's auto-vectorization pass unless -funsafe-math-optimizations is also specified. This is because NEON hardware does not fully implement the IEEE 754 standard for floating-point arithmetic (in particular denormal values are treated as zero), so the use of NEON instructions may lead to a loss of precision. So it is my understanding that using Neon is not a good idea overall. It should only be requested on-demand by people who know what they are doing, and most probably, be setting appropriate CFLAGS on a per-package basis. Additionally, changing the default FPU setting on those defconfigs is not really interesting. Indeed, the base system that (most of) those defconfig build are probably not exercising the FPU setting much (the busybox login and shell are probably not using much FPU insns). So, for me, this series is a no-go, first because it has not been tsted on actual hardware, second because some of the changes introduce a dubious feature which is actually a no-op at best, or worse will generate incorrect code. Regards, Yann E. MORIN. > Regarding VFPv4 D16 vs. D32, > https://developer.arm.com/documentation/den0018/a/Compiling-NEON-Instructions/GCC-command-line-options/Option-to-specify-the-FPU > tells us: > > VFPv3 and VFPv4 implementations provide 32 double-precision > registers. However, when NEON unit is not present, the top sixteen > registers (D16-D31) become optional. This is shown by the -d16 in the > option name, which means that the top sixteen D registers are not > available. > > So, my understanding is that when NEON is available, the VFPv4 is > guaranteed to have the 32 double-precision registers (D32). > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Tue Jan 25 20:57:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 25 Jan 2022 21:57:37 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <20211106181424.299041-1-peron.clem@gmail.com> References: <20211106181424.299041-1-peron.clem@gmail.com> Message-ID: <73fe7aba-588b-133b-f0a6-960cbefb162f@mind.be> Hi Cle?ment, On 06/11/2021 19:14, Cl?ment P?ron wrote: > For the moment Beelink GS1 use a default rootfs size of 60M > which make sometimes the build failed due to missing space. That's surprising... The only thing in the rootfs is busybox, so the rootfs size should be way less than 1MB, let alone 60MB... Also, "sometimes" is suspicious. The rootfs should be almost binary identical between two builds (there are some dates and paths in there if you don't enable BR2_REPRODUCIBLE). Do you have a bit more detail/example of how it fails? Regards, Arnout > > Increase the rootfs size to 120M. > > Signed-off-by: Cl?ment P?ron > --- > configs/beelink_gs1_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index e88f3e3b69..1872aabdf0 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -24,6 +24,7 @@ BR2_PACKAGE_AUTOSSH=y > BR2_PACKAGE_DROPBEAR=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y From peter at korsgaard.com Tue Jan 25 21:07:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:07:52 +0100 Subject: [Buildroot] [git commit] Makefile: set HOST*_NOCCACHE variables only if unset In-Reply-To: <20211229090605.B5B8182A06@busybox.osuosl.org> (Thomas Petazzoni's message of "Wed, 29 Dec 2021 10:11:27 +0100") References: <20211229090605.B5B8182A06@busybox.osuosl.org> Message-ID: <87o83zjzh3.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=c5912e7db37cc0a04696cf081410ec007f8f0be9 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Set HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE only if they are not > set. This allows recursive calls to "make" to work as intended in the > presence of ccache. Such recursive calls to "make" can for example > happen if one calls "make legal-info" from within a post-build script, > to integrate some results of the legal-info output into the root > filesystem. > Without guarding these variables, a recursive invocation of make would > re-define > HOSTCC_NOCCACHE := $(HOSTCC) > and > HOSTCXX_NOCCACHE := $(HOSTCXX) > at a point in time when HOSTCC and HOSTCXX already point to ccache. > It used to work by "accident" until > ca6a2907c27c8171336643d1ab41bd5c34ee3794 ("make: support: use `command > -v' instead of `which'"), due to how "which" was behaving when invoked > with multiple arguments. After switching to "command -v", which > behaves different with multiple arguments, this HOSTCC_NOCCACHE > redefinition problem surfaced. Even though > ca6a2907c27c8171336643d1ab41bd5c34ee3794 has since then been reverted > for other reasons, it does make sense to guard the definition of > HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE to not rely on a side-effect of > using "which". > Signed-off-by: Markus Mayer > Reviewed-by: Petr Vorel > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Tue Jan 25 21:08:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 22:08:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: disable tests Message-ID: <20220125210800.299916-1-fontaine.fabrice@gmail.com> Disable tests which are enabled since bump to version 2.0.35 in commit 13d4856b916d797c3c771669edd3eb883336766f and https://github.com/CESNET/netopeer2/commit/466a0b3c268ee319b4f65980404715a2723b4c0a to avoid the following build failure if cmocka is built before netopeer2: In file included from /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/stdint.h:20, from /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/lib/gcc/riscv64-buildroot-linux-musl/10.3.0/include/stdint.h:9, from /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/libyang/libyang.h:18, from /home/buildroot/autobuild/instance-2/output-1/build/netopeer2-2.0.35/tests/test_sub_ntf.c:27: /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/bits/alltypes.h:53:24: error: conflicting types for 'uintptr_t' 53 | typedef unsigned _Addr uintptr_t; | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/0660a4f767d5cdaf07b28a508101b87f0300850f Signed-off-by: Fabrice Fontaine --- package/netopeer2/netopeer2.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index c8b6763313..43f22b7e4c 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -11,7 +11,9 @@ NETOPEER2_LICENSE = BSD-3-Clause NETOPEER2_LICENSE_FILES = LICENSE NETOPEER2_DEPENDENCIES = libnetconf2 libyang sysrepo host-sysrepo -NETOPEER2_CONF_OPTS = -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) +NETOPEER2_CONF_OPTS = \ + -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) \ + -DENABLE_TESTS=OFF # Set a build specific SYSREPO_SHM_PREFIX to ensure we can safely delete the # files. This also ensures that concurrent parallel builds will not be -- 2.34.1 From peter at korsgaard.com Tue Jan 25 21:11:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:11:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.3930 In-Reply-To: <20211229101950.534749-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 29 Dec 2021 11:19:50 +0100") References: <20211229101950.534749-1-fontaine.fabrice@gmail.com> Message-ID: <87k0enjzbp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4136: vim is vulnerable to Heap-based Buffer Overflow > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 21:10:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:10:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.3930 Message-ID: <20220125210530.4179D814BB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11f7c50bc2a0451bab846166cbc4ab680205e545 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4136: vim is vulnerable to Heap-based Buffer Overflow Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f5ec93be3c1d9deda2a7ad516c258128561f62e9) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 9fb162d798..6fa5d1bef0 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 acddd083c44a3a62194b73bb2fd1327af2adf256b5978c64f97d2656dda24d07 vim-8.2.3775.tar.gz +sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index e0079d3468..6643ef0841 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3775 +VIM_VERSION = 8.2.3930 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Tue Jan 25 21:07:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:07:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Makefile: set HOST*_NOCCACHE variables only if unset Message-ID: <20220125210534.E4F39814BB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a6bcea2b1da0c38344baa55feab9b6990f6c697 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Set HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE only if they are not set. This allows recursive calls to "make" to work as intended in the presence of ccache. Such recursive calls to "make" can for example happen if one calls "make legal-info" from within a post-build script, to integrate some results of the legal-info output into the root filesystem. Without guarding these variables, a recursive invocation of make would re-define HOSTCC_NOCCACHE := $(HOSTCC) and HOSTCXX_NOCCACHE := $(HOSTCXX) at a point in time when HOSTCC and HOSTCXX already point to ccache. It used to work by "accident" until ca6a2907c27c8171336643d1ab41bd5c34ee3794 ("make: support: use `command -v' instead of `which'"), due to how "which" was behaving when invoked with multiple arguments. After switching to "command -v", which behaves different with multiple arguments, this HOSTCC_NOCCACHE redefinition problem surfaced. Even though ca6a2907c27c8171336643d1ab41bd5c34ee3794 has since then been reverted for other reasons, it does make sense to guard the definition of HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE to not rely on a side-effect of using "which". Signed-off-by: Markus Mayer Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni (cherry picked from commit c5912e7db37cc0a04696cf081410ec007f8f0be9) Signed-off-by: Peter Korsgaard --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 74ef7dc598..386b4f4e44 100644 --- a/Makefile +++ b/Makefile @@ -286,12 +286,16 @@ ifndef HOSTCC HOSTCC := gcc HOSTCC := $(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc) endif +ifndef HOSTCC_NOCCACHE HOSTCC_NOCCACHE := $(HOSTCC) +endif ifndef HOSTCXX HOSTCXX := g++ HOSTCXX := $(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++) endif +ifndef HOSTCXX_NOCCACHE HOSTCXX_NOCCACHE := $(HOSTCXX) +endif ifndef HOSTCPP HOSTCPP := cpp endif From peter at korsgaard.com Tue Jan 25 21:10:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:10:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.3930 Message-ID: <20220125210534.ED396825E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=292f2d7ca073f0161c0c7f1bd23c1d920b273bc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4136: vim is vulnerable to Heap-based Buffer Overflow Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f5ec93be3c1d9deda2a7ad516c258128561f62e9) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 9fb162d798..6fa5d1bef0 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 acddd083c44a3a62194b73bb2fd1327af2adf256b5978c64f97d2656dda24d07 vim-8.2.3775.tar.gz +sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index e0079d3468..6643ef0841 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3775 +VIM_VERSION = 8.2.3930 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From arnout at mind.be Tue Jan 25 21:13:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 25 Jan 2022 22:13:01 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/gcc: use binutils wrappers for target libs In-Reply-To: References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-2-nolange79@gmail.com> <20220109151653.GC1477939@scaer> Message-ID: <0ff95c8d-0967-e5aa-bb9f-d0d6fe8c1b33@mind.be> On 10/01/2022 11:43, Arnout Vandecappelle wrote: > > > On 09/01/2022 22:08, Norbert Lange wrote: >> Am So., 9. Jan. 2022 um 16:16 Uhr schrieb Yann E. MORIN >> : >>> >>> Nrobert, All, >>> >>> On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: >>>> This will use gcc-ar, gcc-nm and gcc-ranlib instead of the >>>> normal binutils tools. The difference is that with the >>>> wrappers, gcc plugins will be automatically picked up, >>>> which might be necessary with some flags. >>>> >>>> Signed-off-by: Norbert Lange >>>> --- >>>> v1->v2: >>>> *?? Only set those wrappers if gc 4.7 or newer >>>> --- >>>> ? package/gcc/gcc.mk | 3 +++ >>>> ? 1 file changed, 3 insertions(+) >>>> >>>> diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk >>>> index 114c2887a0..a24ffe3ee2 100644 >>>> --- a/package/gcc/gcc.mk >>>> +++ b/package/gcc/gcc.mk >>>> @@ -99,6 +99,9 @@ GCC_COMMON_TARGET_CFLAGS += -Wno-error >>>> ? endif >>>> >>>> ? # Propagate options used for target software building to GCC target libs >>>> +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) ?This is actually not needed - the lowest GCC version we have for the internal toolchain is 8. >>>> +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm >>>> RANLIB_FOR_TARGET=gcc-ranlib >>> >>> So we were a bit skeptical about this one. >>> >>> First, we believe that only the final gcc should be using those. Indeed, >>> we do not need much of the initial gcc, except libgcc.a, which anyway >>> gets overwitten by the final gcc, so we do not care that the libgcc.a is >>> built with LTO (and thus the gcc wrappers). >> >>> Second, gcc initial is only used to build glibc, and as your patch 4 >>> states, glibc must not be built with LTO, we we also do not care that >>> the initial gcc uses its wrappers to build libgcc. > > ?Although I may have been the one to make this obvservation to begin with, I'm > starting to come back on that. Even though indeed it is probably not very > useful to apply the wrappers to gcc-initial, it doesn't hurt either. And by > putting it in _COMMON_CONF_ENV, we make sure that (almost) all of the options > are together in gcc.mk. Note that --enable-lto is also in COMMON_OPTS. > >>> >>> Third, shouldn't we be using the tupple-prefixed wrappers? Or does it >>> just happens that gcc will internally add its build directory to PATH so >>> that it can find the un-prefixed just-built ones? >>> >>> For that last point, I added gcc-ar, gcc-nm, and gcc-ranlib in my PATH, >>> that are just simple wrapper scripts that trace their being called, and >>> then call to the actual gcca-r et al.: >>> >>> ???? #!/bin/sh >>> ???? me="${0}" >>> ???? my_name="${0##*/}" >>> ???? found=false >>> ???? for i in $(which -a "${my_name}"); do >>> ???????? if [ "${i}" -ef "${me}" ]; then >>> ???????????? found=true >>> ???????? elif ${found}; then >>> ???????????? me="${i}" >>> ???????? fi >>> ???? done >>> ???? if ! ${found}; then >>> ???????? exit 42 >>> ???? fi >>> ???? printf "YEM: wrapped %s\n" "${me}" >>> ???? exec "${me}" "${@}" >>> >>> Turns out that the 'YEM: wrapped' string occurs nowhere in the build >>> directory (so it does not end up in config.log or whatever), and it >>> does not even appear on the stdout/stderr either. >>> >>> So I am wondering how we can exercise these... Any hint? >> >> Can't tell anymore, I went to crosstool-ng for the compiler some time ago, >> so unlike my other patches I dont use them anymore. > >> ?From my memory, it affected some of the additional libs gcc builds, >> libstdc++, some sanitizers maybe. >> there was not absolute paths or tuples as the various stages should >> use the wrappers from the previous ones. I believe the final compiler >> ignores PATH and uses the stage2-compiler with abs path to build the >> included target libraries. > > ?That it doesn't look in PATH indeed sounds feasible. > > ?However, what is very surprising is that GCC doesn't automatically use the > plugins when --enable-lto is passed. Before blindly adding some random > options, we want to really understand why it is needed, in case maybe things > are already broken in some other way, and to be able in the future to make > changes and understand if they're OK or not. > > ?That said, I have checked and indeed, without these options it seems to use > plain ar instead of gcc-ar. > > ?So I looked a bit deeper, and found this really old bug about enabling lto > for libgcc [1]. It refers to a bunch of other issues found while doing this. > > ?For me, however, the conclusion is that the patch should be applied, but with > better explanation. That way, you can set BR2_TARGET_OPTIMIZATION to -flto and > get an LTO'ed libgcc/libstdc++/etc. If LTO is not used, it doesn't harm to use > the wrapper. ?I summarized this discussion and applied to master, thanks. ?Regards, ?Arnout > > ?There's just one little concern though: I think the wrappers aren't even > generated unless LTO is enabled. But that point is moot - since GCC N (where N > > 4.9 and < 9), LTO is enabled by default, and we don't pass --disable-lto if > LTO is not enabled. In other words, nowadays the BR2_GCC_ENABLE_LTO symbol is > useless. > > > ?Regards, > ?Arnout > > > [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59893 > > > >> >> I am just sure it was very deliberately done *this* way. >> >> Norbert >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> From peter at korsgaard.com Tue Jan 25 21:15:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:15:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/vlc: needs host-gettext In-Reply-To: <20211228220302.2886460-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 28 Dec 2021 23:03:02 +0100") References: <20211228220302.2886460-1-bernd.kuhls@t-online.de> Message-ID: <87fspbjz55.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Build fails on systems without /usr/bin/msgfmt > Fixes: > http://autobuild.buildroot.net/results/3c9/3c9893dd92d784a0520a287c4d4a5e760393c95f/ > Signed-off-by: Bernd Kuhls Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Tue Jan 25 21:10:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 25 Jan 2022 22:10:26 +0100 Subject: [Buildroot] [git commit] package/gcc: use binutils wrappers for target libs Message-ID: <20220125210819.A504C825E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee228403e9741b6c799ce1ef34c15993086f266d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will use gcc-ar, gcc-nm and gcc-ranlib instead of the normal binutils tools. The difference is that with the wrappers, gcc plugins will be automatically picked up, which is necessary to build with LTO. With this enabled, it is possible to build everything (including libgcc and libstdc++) with LTO by setting BR2_TARGET_OPTIMIZATION="-flto". Note that you'd expect that the GCC build system would automatically do this when --enable-lto is set, but this is not the case. There are some open bugs [1][2] to allow building libgcc and libstdc++ with LTO support but it's apparently not done yet. Note that there are also reports of problems building libstdc++ with LTO [3], but it seems that's no longer a problem (and the bug didn't get updated). Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59893 [2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77278 [3] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60160 --- package/gcc/gcc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 3adc1d4e16..128cf8421d 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -104,6 +104,7 @@ endif # Propagate options used for target software building to GCC target libs HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib # libitm needs sparc V9+ ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) From peter at korsgaard.com Tue Jan 25 21:14:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:14:37 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vlc: needs host-gettext Message-ID: <20220125210906.C306D825E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=575a94b1acc2079f6f0ebb37f451f6bf044c99eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Build fails on systems without /usr/bin/msgfmt. This has been an issue that exists since at least vlc 3.0.7, with build failures that can be found as early as August 2019. Fixes: http://autobuild.buildroot.net/results/3c9893dd92d784a0520a287c4d4a5e760393c95f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 153d028303c88b25344f33ddee0094b2ac5e2f49) Signed-off-by: Peter Korsgaard --- package/vlc/vlc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 06fc650f6f..fe338fcbe8 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -11,7 +11,7 @@ VLC_LICENSE = GPL-2.0+, LGPL-2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_CPE_ID_VENDOR = videolan VLC_CPE_ID_PRODUCT = vlc_media_player -VLC_DEPENDENCIES = host-pkgconf +VLC_DEPENDENCIES = host-gettext host-pkgconf VLC_AUTORECONF = YES # Install vlc libraries in staging. From peter at korsgaard.com Tue Jan 25 21:14:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:14:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vlc: needs host-gettext Message-ID: <20220125210911.0AAB9825E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c4f7f1c2efc9ed079d8520d053b507b4cabfea3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Build fails on systems without /usr/bin/msgfmt. This has been an issue that exists since at least vlc 3.0.7, with build failures that can be found as early as August 2019. Fixes: http://autobuild.buildroot.net/results/3c9893dd92d784a0520a287c4d4a5e760393c95f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 153d028303c88b25344f33ddee0094b2ac5e2f49) Signed-off-by: Peter Korsgaard --- package/vlc/vlc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 06fc650f6f..fe338fcbe8 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -11,7 +11,7 @@ VLC_LICENSE = GPL-2.0+, LGPL-2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_CPE_ID_VENDOR = videolan VLC_CPE_ID_PRODUCT = vlc_media_player -VLC_DEPENDENCIES = host-pkgconf +VLC_DEPENDENCIES = host-gettext host-pkgconf VLC_AUTORECONF = YES # Install vlc libraries in staging. From fontaine.fabrice at gmail.com Tue Jan 25 21:20:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 22:20:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-dataproperty: bump to version 0.54.2 Message-ID: <20220125212039.300631-1-fontaine.fabrice@gmail.com> https://github.com/thombashi/DataProperty/releases/tag/v0.54.2 https://github.com/thombashi/DataProperty/releases/tag/v0.54.1 https://github.com/thombashi/DataProperty/releases/tag/v0.54.0 Signed-off-by: Fabrice Fontaine --- package/python-dataproperty/python-dataproperty.hash | 6 +++--- package/python-dataproperty/python-dataproperty.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-dataproperty/python-dataproperty.hash b/package/python-dataproperty/python-dataproperty.hash index 9a8c250125..380846e9f1 100644 --- a/package/python-dataproperty/python-dataproperty.hash +++ b/package/python-dataproperty/python-dataproperty.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/DataProperty/json -md5 6a6930ae266399df58707a13a5f0cfa6 DataProperty-0.53.0.tar.gz -sha256 9589b5c5b400a77e1aeb63d89d755043bbe00043219336963c93db5df49cbaf7 DataProperty-0.53.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/dataproperty/json +md5 ce5fd0d37b6d0ca57f144e22cd62bfec DataProperty-0.54.2.tar.gz +sha256 df2fcf00e7a57f0a6089f686f847527eb3c91ded5c419daef6d06ee4bb1187b4 DataProperty-0.54.2.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 5ceb7f72f5..1b07dc1bb7 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.53.0 +PYTHON_DATAPROPERTY_VERSION = 0.54.2 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/df/d0/36deb707996c5ef48ab353804291f44f59bd9d46875c384d163ad106df1a +PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/9a/03/44fb9094c4fb8032f254eaa37b3b07db82fa35779ceca097b3cde8464749 PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 21:32:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 22:32:41 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-sqliteschema: drop python-six dependency Message-ID: <20220125213242.301404-1-fontaine.fabrice@gmail.com> python-six is not a dependency since version 1.0.0 and https://github.com/thombashi/sqliteschema/commit/3aae6a0bb6d4b11ef2c83cb23a796a320ea422da which dropped python 2 support Signed-off-by: Fabrice Fontaine --- package/python-sqliteschema/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in index 8383647129..b8fed33c49 100644 --- a/package/python-sqliteschema/Config.in +++ b/package/python-sqliteschema/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_PYTHON_SQLITESCHEMA bool "python-sqliteschema" - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 21:32:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 22:32:42 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-sqliteschema: bump to version 1.2.1 In-Reply-To: <20220125213242.301404-1-fontaine.fabrice@gmail.com> References: <20220125213242.301404-1-fontaine.fabrice@gmail.com> Message-ID: <20220125213242.301404-2-fontaine.fabrice@gmail.com> https://github.com/thombashi/sqliteschema/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine --- package/python-sqliteschema/python-sqliteschema.hash | 4 ++-- package/python-sqliteschema/python-sqliteschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sqliteschema/python-sqliteschema.hash b/package/python-sqliteschema/python-sqliteschema.hash index 310e56ab32..e60bd64325 100644 --- a/package/python-sqliteschema/python-sqliteschema.hash +++ b/package/python-sqliteschema/python-sqliteschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqliteschema/json -md5 ca70006e289f1d506124de779ed73d64 sqliteschema-1.2.0.tar.gz -sha256 4c18f141239c58b6dbdc69130be41ed9740d8209a7ab6d529ba982a8b79c071a sqliteschema-1.2.0.tar.gz +md5 4fb0130e7cc60d92be468091fbfc3d51 sqliteschema-1.2.1.tar.gz +sha256 dde195bd7bc70d5841bc01dff20ec23bd43be87d760d2dfc7c7f2e5fd3808ef3 sqliteschema-1.2.1.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-sqliteschema/python-sqliteschema.mk b/package/python-sqliteschema/python-sqliteschema.mk index e4fd0de2fb..5c52e35111 100644 --- a/package/python-sqliteschema/python-sqliteschema.mk +++ b/package/python-sqliteschema/python-sqliteschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLITESCHEMA_VERSION = 1.2.0 +PYTHON_SQLITESCHEMA_VERSION = 1.2.1 PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/5c/d3/0c2e4c989a8d45f9443e431d7cbf89af4aba719fb0647b5f722716ef3990 +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/85/f8/be54d4bebf551cb533d1dea11c3bf165a1a408c2a1cceb1f9724aadd9967 PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools PYTHON_SQLITESCHEMA_LICENSE = MIT PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Jan 25 21:48:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 25 Jan 2022 22:48:22 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex In-Reply-To: <20220125205523.GH457876@scaer> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220122153243.009b24ba@windsurf> <20220125205523.GH457876@scaer> Message-ID: Hi Yann, Thomas, All, On 25/01/22 21:55, Yann E. MORIN wrote: > Thomas, Giulio, All, > > On 2022-01-22 15:32 +0100, Thomas Petazzoni spake thusly: >> On Tue, 18 Jan 2022 11:43:10 +0100 >> Giulio Benetti wrote: >> >>> this patchset aims to enable the best FPU strategy for every board with >>> 32-bits Arm Cortex actually present in Buildroot. I don't own these boards >>> so I can't test these changes. What is about Allwinner doesn't worry me >>> because I've tested a lot of cases with Olimex boards, but the other >>> changes are still to be tested. >>> >>> So I ask to the board maintainers to test the patches that involve their >>> boards if possible. Anyway I've checked well all the SoCs Datasheet and I >>> think I've made it correctly, even if in some of them it's not specified >>> if VFPv4 means -D32. I assume it like that because otherwise -D16 is >>> usually specified. >> >> Do we have a good understand of what -mfpu=neon-vfpv4 does? Your patch >> series basically converts many defconfigs to use this -mfpu value, but >> it's not clear to me how it works. What does it mean to combine NEON >> and VFPv4 instructions? > > The gcc man page states that specifying Neon as part of the fpu setting > has no effect, unless the -funsafe-math-optimizations is also specified, > because Neon is not compliant zith IEEE 754: > > If the selected floating-point hardware includes the NEON extension > (e.g. -mfpu=neon), note that floating-point operations are not > generated by GCC's auto-vectorization pass unless > -funsafe-math-optimizations is also specified. This is because NEON > hardware does not fully implement the IEEE 754 standard for > floating-point arithmetic (in particular denormal values are treated > as zero), so the use of NEON instructions may lead to a loss of > precision. > > So it is my understanding that using Neon is not a good idea overall. It > should only be requested on-demand by people who know what they are > doing, and most probably, be setting appropriate CFLAGS on a per-package > basis. > > Additionally, changing the default FPU setting on those defconfigs is > not really interesting. Indeed, the base system that (most of) those > defconfig build are probably not exercising the FPU setting much (the > busybox login and shell are probably not using much FPU insns). > > So, for me, this series is a no-go, first because it has not been tsted > on actual hardware, second because some of the changes introduce a > dubious feature which is actually a no-op at best, or worse will > generate incorrect code. I agree with you, it's too dangerous. I mean, I've tested on all Allwinner Axx series, but haven't check that in the end the assembly code corresponding. What I plan to do later, so now you can reject this patchset, is to use the smallest package that uses fpu instructions for sure, then enable for example: -mfpu=vfpv4 check AND -mfpu=neon-vfpv4 This way I will have my real answer before eventually re-submitting while explaining this in detail. Also, once I will have cleared this topic and it comes out that fpu is not use with neon-vfpv4, then I'll send patches to remove that fpu strategy on the boards I've set it to it. I thought it was easier, instead this is an insidious topic. So yes, let's drop this and thank you all for helping me to clarify. Kind regards! -- Giulio Benetti Benetti Engineering sas > Regards, > Yann E. MORIN. > >> Regarding VFPv4 D16 vs. D32, >> https://developer.arm.com/documentation/den0018/a/Compiling-NEON-Instructions/GCC-command-line-options/Option-to-specify-the-FPU >> tells us: >> >> VFPv3 and VFPv4 implementations provide 32 double-precision >> registers. However, when NEON unit is not present, the top sixteen >> registers (D16-D31) become optional. This is shown by the -d16 in the >> option name, which means that the top sixteen D registers are not >> available. >> >> So, my understanding is that when NEON is available, the VFPv4 is >> guaranteed to have the 32 double-precision registers (D32). >> >> Thomas >> -- >> Thomas Petazzoni, co-owner and CEO, Bootlin >> Embedded Linux and Kernel engineering and training >> https://bootlin.com > From ps.report at gmx.net Tue Jan 25 22:15:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 25 Jan 2022 23:15:33 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220125221533.17535-1-ps.report@gmx.net> - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.4 release download package For details see [1]. [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- Changes v1 -> v2: - add workaround for missing disk-utils/raw.8 file --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index eafbe9254a..9c10a42dca 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz +sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf0fee409b..baf9ed3406 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -267,6 +267,13 @@ else UTIL_LINUX_CONF_OPTS += --without-libmagic endif +# workaround missing disk-utils/raw.8 file in util-linux-2.37.4 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_PRE_BUILD_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + # Install PAM configuration files ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) define UTIL_LINUX_INSTALL_PAMFILES -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 22:34:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 23:34:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/tesseract-ocr: override neon check Message-ID: <20220125223454.444515-1-fontaine.fabrice@gmail.com> Override neon check to avoid the following build failure with uclibc-ng raised since bump to version 5.0.1 in commit df3f0c226fccd8d6143b09a1e05a0f5f23587136: src/arch/simddetect.cpp:61:14: fatal error: sys/auxv.h: No such file or directory 61 | # include | ^~~~~~~~~~~~ It should be noted that a patch to properly fix this build failure was rejected by upstream as "ARM support without NEON would result in a very slow Tesseract": https://github.com/tesseract-ocr/tesseract/pull/3717 So, a follow-up patch adding a dependency on !BR2_TOOLCHAIN_USES_UCLIBC for all CPU architectures or only for ARM without NEON could be approriate. Fixes: - http://autobuild.buildroot.org/results/0bac6491188b6681df2ca13eb230706e83cbb130 Signed-off-by: Fabrice Fontaine --- package/tesseract-ocr/tesseract-ocr.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index 7e23e64136..a7498931fb 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -24,6 +24,12 @@ TESSERACT_OCR_CONF_ENV = \ TESSERACT_OCR_CONF_OPTS = \ --disable-opencl +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +TESSERACT_OCR_CONF_ENV += ax_cv_check_cxxflags__mfpu_neon=yes +else +TESSERACT_OCR_CONF_ENV += ax_cv_check_cxxflags__mfpu_neon=no +endif + # Language data files download ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_ENG),y) TESSERACT_OCR_DATA_FILES += eng.traineddata -- 2.34.1 From lotorev at gmail.com Wed Jan 26 03:01:51 2022 From: lotorev at gmail.com (Vitaliy Lotorev) Date: Wed, 26 Jan 2022 06:01:51 +0300 Subject: [Buildroot] Buildroot check-package packaged as pre-commit.com hook Message-ID: Hi, To unify Buildroot linting experience on CI and in devs environment I developed a python wrapper package [1] that installs check-package Buildroot linter and dependencies. On the top of that there is a .pre-commit-hooks.yaml that allows to install and run check-package as pre-commit hook (https://pre-commit.com). Hope someone finds it useful :) [1] https://github.com/vlotorev/buildroot-utils -------------- next part -------------- An HTML attachment was scrubbed... URL: From kuzminov.sergey81 at gmail.com Wed Jan 26 05:18:08 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Wed, 26 Jan 2022 08:18:08 +0300 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: refactoring, bump Linux and U-Boot versions Message-ID: <20220126051808.26581-1-kuzminov.sergey81@gmail.com> Changelog: - Refactoring configs/orangepi_zero_defconfig. - Linux: bump to version 5.15.16 (from 5.12.2). - U-Boot: bump to version 2022.01 (from 2021.04). Signed-off-by: Sergey Kuzminov --- ...ux-extras.config => linux-extras.fragment} | 0 configs/orangepi_zero_defconfig | 32 +++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment similarity index 100% rename from board/orangepi/orangepi-zero/linux-extras.config rename to board/orangepi/orangepi-zero/linux-extras.fragment diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..5aaa1566c5 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,49 +1,61 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y + +# System BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" + +# Required tools to create the SD image BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" -# wireless driver and firmware +# Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y BR2_PACKAGE_ARMBIAN_FIRMWARE=y BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -# wireless support +# Wireless support BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y @@ -51,5 +63,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -# spi flash support +# Spi flash support BR2_PACKAGE_MTD=y -- 2.34.1 From adeep at lexina.in Wed Jan 26 05:41:26 2022 From: adeep at lexina.in (Vyacheslav) Date: Wed, 26 Jan 2022 08:41:26 +0300 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <20220124214529.56b1bf5d@windsurf> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> <20220122160914.7e4cc513@windsurf> <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> <4a94b253-6fe7-5e79-b1e9-331b0a9051ca@baylibre.com> <20220124214529.56b1bf5d@windsurf> Message-ID: Hi. Thanks all for replies. 24.01.2022 23:45, Thomas Petazzoni wrote: > Hello Neil, > > Thanks for the additional feedback. > > On Mon, 24 Jan 2022 14:41:49 +0100 > Neil Armstrong wrote: > >> The binaries must be split into 2 categories: >> - Pre-built: bl2, bl31, bl21, bl32, fip_create, aml_encrypt_*, ddr*.fw, acs_tool.py >> - Built in the Vendor U-Boot source: acs.bin bl301.bin > > Right. > >> In 2019, Amlogic finally added a LICENSE for the pre-built binaries, before >> nobody knew what was the term of the distribution. >> >> commit 6abaf9a869a6584b3cfca8b96d0946ed49bc9b64 >> Author: Lawrence Mok >> Date: Mon May 6 12:34:56 2019 -0700 >> >> add LICENSE file and text referring to it [1/1] >> >> Change-Id: Id291f42bec3ddb0c2162e6540ce1f35d1cb1d079 >> >> The LICENSE can be found at [1] in Khadas github. > > And this license is the one used at > https://github.com/LibreELEC/amlogic-boot-fip which Vyacheslav wants to > package in Buildroot, and this license is extremely restrictive. > Basically, it says that excepts private use of the content of this > repository, you can't do anything with it. > >> Concerning the acs.bin & bl301.bin, they use the U-Boot build system and >> config header files and all these were also updated with the following SPDX: >> /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > > I don't really see what the license of the U-Boot build system and > config headers has to do with the resulting license of the binaries. > >> commit 94de43d3d940cf75b4a9e4fd2a2715be8eff6138 >> Author: Jiucheng Xu >> Date: Wed Dec 16 10:11:00 2020 +0800 >> >> license: Fix the license of amlogic related codes [1/1] >> >> PD#SWPL-39001 >> >> Problem: >> A customer want to add amlogic driver in uboot to >> their private bootloader. Since the driver codes >> are licensed under GPL-2.0, and customer have >> to open their code, so we need fix the license >> issue. >> >> Solution: >> Fix the license of our related code in uboot by >> adding MIT license >> >> Verify: >> Franklin >> >> Change-Id: I2f3571e8720d1f4db069f882353d6ae050702cba >> Signed-off-by: Jiucheng Xu >> >> Note, none of the vendor who publicly published the Amlogic U-Boot >> source has this change, so we can consider acs.bin & bl301.bin >> generated from GPL-2.0 as the commit explains. > > This is really a stretch. The question is which source files are > compiled into acs.bin and bl301.bin ? If they use parts under the > GPL-2.0, then indeed we can assume the whole is also under GPL-2.0, as > it is the only license under which derivative works can be published. These sources usually published inside Amlogic U-Boot source > > But the repository at https://github.com/LibreELEC/amlogic-boot-fip/ > contains a lot more things than acs.bin and bl301.bin. > >> The pre-built binaries stored on the LibreELEC repository only comes from >> public Vendor sources (Khadas, HardKernel, Libre Computer, FriendlyARM, Radxa) >> and checked against vendor repositories we have access to. >> >> We assume they got permission from Amlogic to publicly redistribute these binaries >> as we (BayLibre) were allowed to redistribute the VDEC firmware in [2] & [3]. > > If that's the case, then why does > https://github.com/LibreELEC/amlogic-boot-fip has this LICENSE file > with scary terms? > > I am really surprised by how unclear the licensing terms are for those > blobs. This should scare pretty much any company from doing products > based on Amlogic SoCs. > > Would it be possible to clarify this with Amlogic, and instead of their > silly terms of "you can't do anything with it", have a license that at > least allows distribution on Amlogic platforms? I will try to contact Amlogic via JetHome, but most likely after the Chinese New Year. > > Again, thanks for your support on this! > > Thomas > From thomas.petazzoni at bootlin.com Wed Jan 26 07:06:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 07:06:27 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-25 Message-ID: <20220126070633.AB83F40629@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-25 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 62 | 7 | 0 | 69 | 2021.11.x | 23 | 6 | 0 | 29 | master | 98 | 40 | 0 | 138 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 7 host-util-linux-2.37.3 | 3 bluez5_utils-5.63 | 2 frr-8.1 | 2 rtorrent-0.9.8 | 2 wavemon-0.9.4 | 2 xvisor-0.3.1 | 2 cryptsetup-2.4.2 | 1 file-5.41 | 1 google-breakpad-7515ab13768... | 1 gst1-plugins-bad-1.18.5 | 1 gstd-0.13.0 | 1 guile-3.0.7 | 1 kvm-unit-tests-kvm-unit-tes... | 1 libiio-0.23 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.4 | 1 mongrel2-1.13.0 | 1 mtd-2.1.3 | 1 oracle-mysql-5.1.73 | 1 pcsc-lite-1.9.5 | 1 piglit-2affee53f3ad7a96f5b3... | 1 pipewire-0.3.43 | 1 qt5webkit-5.212.0-alpha4 | 1 ruby-3.1.0 | 1 tesseract-ocr-5.0.1 | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/54adb8da5e66e02f3943a681e21e8f26020723ea | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/76eae25f0c53205aad295cb79833aa59cb5aade9 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/c723c687d5c26206c98cfa84789e9fdbdbad31b4 | i586 | file-5.41 | NOK | http://autobuild.buildroot.net/results/31246e6d4dd51863c16e17cf5011092f3c4b7bb4 | ORPH nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2756ee8a00d78c2a04762972bcddf3c15564a0c0 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/ed31b5f6ef268009d5f8e76d0c1e18337a9e905a | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/97e3722e8ede7fa2aa0073dab4df654f3df186fb | i686 | gst1-plugins-bad-1.18.5 | NOK | http://autobuild.buildroot.net/results/eaf1890176431000ea8b371956f0d2d7e9907aea | ORPH arm | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/b9db1a63fa3740b7c6e089ddc2e1557ea0ca0f5e | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/d6ceddf52d22453fe21665b9b865f2c782382353 | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/562757475bbd1d3fdfe2ce3f5237d8d4cf1479ae | ORPH riscv64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/271d8a7d670b6a7314b8e2159829a222b54f41cc | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/11bc283f48b058738b89204517daac7d720abf03 | ORPH powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/917191d50af8f97b7bda82a669f3185660f64373 | arm | libiio-0.23 | NOK | http://autobuild.buildroot.net/results/e8847eabd5df1d9d31b88d69230145916020585c | x86_64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/f635b4c0032ce5cf8a56f526ba6092c0895e9b11 | x86_64 | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/55c3c66c6c909853d47a470e0bbbab7186c83793 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/3e931bb6833e58f6ddb56ebbc0c599d71c3a8625 | riscv64 | mtd-2.1.3 | NOK | http://autobuild.buildroot.net/results/f9bcc2f70eba388b28616bbff2d6e3b3e298837b | xtensa | oracle-mysql-5.1.73 | NOK | http://autobuild.buildroot.net/results/9a6e946cca1fe51ad157e6ca12ce5d7f41e8c8dc | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/1ec8035c8f01e5488b5ae4e079badfa0c543f958 | ORPH arc | piglit-2affee53f3ad7a96f5b3... | NOK | http://autobuild.buildroot.net/results/889a0aa9d8e78c066b03a491003fa8cd03597309 | sparc | pipewire-0.3.43 | NOK | http://autobuild.buildroot.net/results/192f40a5c6e05fc11507494e19db52a47082fc35 | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/f9aac4aa3cc590e77a510223624aebdc8547a8ed | or1k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/0aad6294d1f24a9e37e7fa56093aeabdac0f6298 | ORPH xtensa | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/fe114a9af0ac0afc77243fd27035477bfc315e8c | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/7fb735e45754f415a32b348be465849d5f0d999a | sparc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a566e2dcabb20625fa3471b610674ad46117acaf | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d088d25baed4e150850c7dc35e19e04821520c51 | powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/953702716339fa18a1f8ff6f9e7164938a3a32d6 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ef794d13e33665706c559230533f510f9b09f82e | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c076313116d1673de4ea83771c7ec2747ccfa99c | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2c4f10e59fa30b51571fdd49b3a4b073321ee876 | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9cc341458465e085fbcb7f11db3b4fb50dabf748 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/7d43c5b119bfdbef58ef0982d2f7a6260e2b7e0c | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/5bd88a00dfb20bfaec848b9364f62bbf4badef47 | i686 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7b8d62b1243136b236f5b44af024d41be5bbcec4 | powerpc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1b8021154751346fb5600b2b141980bdcd7e550d | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 apcupsd-3.14.14 | 1 gensio-2.2.3 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/95417fecaf5976aa788c4c6f5ec58f3d75619c73 | riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/f165cda8231d63d7b315532a805fca96829b6786 | mipsel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/981cd03f661e96e86e4dbbd7b2fcb66bf7adedb4 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/360860fa5a9764620e9c759bafe925537f5c36c9 | powerpc | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/6ef4b40c949458afafde99746ccdb1cae3427f31 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/52ce384941c2a7b72563d66fc3e5315d0d413729 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/cad0d08147f78d82228b2e54648a718fb292fb90 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 3 libdbi-88b8477d57153b9f736d... | 1 libnss-3.73 | 1 log4cxx-0.12.0 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/384a0f8a933ef3f3fd58234667e8aa1ab182ddf1 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/95c73e4235569012043c7c2909b8b65459502052 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/626168546a3ef19fce9fe59be5ef0531e752548b | m68k | libdbi-88b8477d57153b9f736d... | NOK | http://autobuild.buildroot.net/results/d8b2626828d09351bbd91a7931f5b94e2bf790b9 | mipsel | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/69dc2eb15f7d6c9727b48dfd888f5d611e0ce20d | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/6c917351920678771987a9f06c3bb8c0dd489b17 | -- http://autobuild.buildroot.net From pieter.degendt at gmail.com Wed Jan 26 08:25:05 2022 From: pieter.degendt at gmail.com (Pieter De Gendt) Date: Wed, 26 Jan 2022 09:25:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable context/coroutine for arm variants Message-ID: <20220126082505.10253-1-pieter.degendt@gmail.com> Add boost context support for aarch64/aarch64_be and select AAPCS as ABI for all arm variants. Signed-off-by: Pieter De Gendt --- package/boost/Config.in | 1 + package/boost/boost.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 1c405a36c3..cc11b8f53e 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -74,6 +74,7 @@ config BR2_PACKAGE_BOOST_CONTAINER config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS bool default y if ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) + default y if (BR2_aarch64 || BR2_aarch64_be) default y if BR2_i386 default y if BR2_mips default y if BR2_mipsel diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 2d2a8fb311..b6681b0ad3 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -85,7 +85,7 @@ HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ ifeq ($(BR2_MIPS_OABI32),y) BOOST_ABI = o32 -else ifeq ($(BR2_arm),y) +else ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be),y) BOOST_ABI = aapcs else BOOST_ABI = sysv -- 2.34.1 From mf at go-sys.de Wed Jan 26 09:04:57 2022 From: mf at go-sys.de (Michael Fischer) Date: Wed, 26 Jan 2022 10:04:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: add optional nmcli support Message-ID: <20220126090457.32015-1-mf@go-sys.de> When NetworkManager is built without the READLINE package the nmcli was not build. Signed-off-by: Michael Fischer --- package/network-manager/Config.in | 7 ++++++- package/network-manager/network-manager.mk | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..1a123a26e2 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -37,6 +37,12 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI help This option enables terminal based UI +config BR2_PACKAGE_NETWORK_MANAGER_CLI + bool "nmcli support" + select BR2_PACKAGE_READLINE + help + This option enables support for NetworkManager Command Line Interface + config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER @@ -54,7 +60,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS select BR2_PACKAGE_JANSSON help This option enables support for OpenVSwitch - endif comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..1eb9233b44 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -135,7 +135,7 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-polkit endif -ifeq ($(BR2_PACKAGE_READLINE),y) +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y) NETWORK_MANAGER_DEPENDENCIES += readline NETWORK_MANAGER_CONF_OPTS += --with-nmcli else -- 2.20.1 From mf at go-sys.de Wed Jan 26 09:28:10 2022 From: mf at go-sys.de (Michael Fischer) Date: Wed, 26 Jan 2022 10:28:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/busybox: bump version to 1.35.0 Message-ID: <20220126092810.6645-1-mf@go-sys.de> Signed-off-by: Michael Fischer --- package/busybox/busybox.hash | 4 ++-- package/busybox/busybox.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 1f34651d7b..2091cdaf65 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.34.1.tar.bz2.sha256 -sha256 415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549 busybox-1.34.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 +sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60ebc4985f..669366b903 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.34.1 +BUSYBOX_VERSION = 1.35.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 -- 2.20.1 From peter at korsgaard.com Wed Jan 26 12:22:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:22:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5location: Fix build failures without opengl In-Reply-To: <20211229234520.2957740-1-aduskett@gmail.com> (Adam Duskett's message of "Wed, 29 Dec 2021 15:45:20 -0800") References: <20211229234520.2957740-1-aduskett@gmail.com> Message-ID: <87pmoeit3y.fsf@dell.be.48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Backport a patch that fixes several "const marked override but does not > override" compilation errors when openGL is not enabled. > Patch fetched from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353 > Fixes: > http://autobuild.buildroot.net/results/6378e43d50dfad13a45522492f14c9df7acd64e4 > Signed-off-by: Adam Duskett Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 12:24:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:24:28 +0100 Subject: [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor In-Reply-To: <20211230135621.2255847-7-romain.naour@gmail.com> (Romain Naour's message of "Thu, 30 Dec 2021 14:56:21 +0100") References: <20211230135621.2255847-1-romain.naour@gmail.com> <20211230135621.2255847-7-romain.naour@gmail.com> Message-ID: <87lez2it1f.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Fixes: > radeon_present.c: In function ?radeon_present_check_flip?: > radeon_present.c:281:21: error: invalid use of undefined type ?struct radeon_pixmap? > 281 | if (priv && priv->fb_failed) > | ^~ > Signed-off-by: Romain Naour > Cc: Bernd Kuhls Is this only needed for xserver 21.x or does it also need to be backported to 2021.02.x / 2021.11.x? -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 12:26:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:26:08 +0100 Subject: [Buildroot] [PATCH/next v3, 1/1] package/font-awesome: make it compatible with fontconfig In-Reply-To: <20211230152059.465b21a8@windsurf> (Thomas Petazzoni's message of "Thu, 30 Dec 2021 15:20:59 +0100") References: <20200226090939.1810498-1-fontaine.fabrice@gmail.com> <20211230152059.465b21a8@windsurf> Message-ID: <87h79qisyn.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Wed, 26 Feb 2020 10:09:39 +0100 > Fabrice Fontaine wrote: >> This commit installs font-awesome in the standard fonts directory >> making it available systemwide. >> >> Thanks to baruch for his technical critique. >> Signed-off-by: Benjamin Calderon >> Signed-off-by: Fabrice Fontaine >> --- >> Changes v2 -> v3 (after review of Baruch Siach): >> - Create a symlink to avoid duplication > I have applied with a reworked commit log. That being said, I am not > sure it was really the "best" solution. It probably would be nicer to > install the fonts usable by fontconfig directly in /usr/share/fonts/, > keeping the rest in /usr/share/font-awesome/. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 12:36:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:36:34 +0100 Subject: [Buildroot] [PATCH] package/gstreamer1/gst1-plugins-bad: add missing Config.in comment on udev In-Reply-To: <20211229093317.1256594-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni's message of "Wed, 29 Dec 2021 10:33:16 +0100") References: <20211229093317.1256594-1-thomas.petazzoni@bootlin.com> Message-ID: <87czkeish9.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > The BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS option has a > dependency on BR2_PACKAGE_HAS_UDEV, but no Config.in comment was added > about this dependency. This commit addresses that. > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 12:26:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:26:01 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/font-awesome: make it visible by fontconfig Message-ID: <20220126124312.B73068257D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11fbee06c3bfa53f9194b7c115570ed3877e1565 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This commit creates a symlink that ensures fontconfig will find the fonts installed by the font-awesome package. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 0979a9e13c45afa20d60122747409cf82164147c) Signed-off-by: Peter Korsgaard --- package/font-awesome/font-awesome.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/font-awesome/font-awesome.mk b/package/font-awesome/font-awesome.mk index 666346be0e..5211ac22a5 100644 --- a/package/font-awesome/font-awesome.mk +++ b/package/font-awesome/font-awesome.mk @@ -13,6 +13,8 @@ define FONT_AWESOME_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/font-awesome/ $(foreach d,$(FONT_AWESOME_DIRECTORIES_LIST),\ cp -dpfr $(@D)/$(d) $(TARGET_DIR)/usr/share/font-awesome$(sep)) + mkdir -p $(TARGET_DIR)/usr/share/fonts/ + ln -sf ../font-awesome $(TARGET_DIR)/usr/share/fonts/font-awesome endef $(eval $(generic-package)) From peter at korsgaard.com Wed Jan 26 12:22:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:22:03 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/qt5/qt5location: fix build failures without opengl Message-ID: <20220126124312.ADD0F82241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c27663d70b19d07edbe3a64e406e0ca7c8a8a802 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Backport a patch that fixes several "const marked override but does not override" compilation errors when openGL is not enabled. Patch fetched from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353 Fixes: http://autobuild.buildroot.net/results/6378e43d50dfad13a45522492f14c9df7acd64e4 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit cea2b082eb35d9fd466833098463e2adcbb40022) Signed-off-by: Peter Korsgaard --- ...0002-fix-compilation-for-no-opengl-builds.patch | 528 +++++++++++++++++++++ 1 file changed, 528 insertions(+) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch new file mode 100644 index 0000000000..98e65df202 --- /dev/null +++ b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch @@ -0,0 +1,528 @@ +From 4bcacd0dc8f73de7b9e5e5f5fa2129fd88bdff3b Mon Sep 17 00:00:00 2001 +From: Michal Klocek +Date: Mon, 11 Jan 2021 16:02:14 +0100 +Subject: [PATCH] Fix compilation for no opengl builds + +Disables experimental labs qml plugin, which +since a4469cad40 depends heavily on opengl backend. + +Fix warnings with msvc when compiling without experimental +plugin. + +Task-number: QTBUG-91623 +Fixes: QTBUG-88017 +Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8 + +Signed-off-by: Michal Klocek +Signed-off-by: Alex Blasche + +[Retrieved from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353] +Signed-off-by: Adam Duskett +--- + src/location/configure.json | 1 + + .../qdeclarativecirclemapitem.cpp | 20 +++++++++++-- + .../qdeclarativecirclemapitem_p_p.h | 2 ++ + .../qdeclarativepolygonmapitem.cpp | 27 +++++++++++++---- + .../qdeclarativepolygonmapitem_p_p.h | 6 ++++ + .../qdeclarativepolylinemapitem.cpp | 30 +++++++++++++++---- + .../qdeclarativepolylinemapitem_p.h | 2 ++ + .../qdeclarativepolylinemapitem_p_p.h | 5 +++- + .../qdeclarativerectanglemapitem.cpp | 17 +++++++++-- + .../qdeclarativerectanglemapitem_p_p.h | 2 ++ + src/location/location.pro | 9 +++++- + .../itemsoverlay/qgeomapitemsoverlay.cpp | 9 +++++- + 12 files changed, 109 insertions(+), 21 deletions(-) + +diff --git a/src/location/configure.json b/src/location/configure.json +index 62ab029..6d01a9a 100644 +--- a/src/location/configure.json ++++ b/src/location/configure.json +@@ -9,6 +9,7 @@ + "label": "Qt.labs.location experimental QML plugin", + "purpose": "Provides experimental QtLocation QML types", + "section": "Location", ++ "condition": "config.opengl", + "output": [ "privateFeature" ] + }, + "geoservices_osm": { +diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +index 841c29a..955de2c 100644 +--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +@@ -446,6 +446,7 @@ void QDeclarativeCircleMapItem::updatePolish() + */ + void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldCenter, qreal oldRadius, const QGeoCoordinate &newCenter, qreal newRadius) + { ++#if QT_CONFIG(opengl) + if (m_backend != QDeclarativeCircleMapItem::OpenGL) + return; + +@@ -459,6 +460,9 @@ void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldC + QScopedPointer d(static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); + m_d.swap(d); + } ++#else ++ return; ++#endif + } + + /*! +@@ -534,9 +538,17 @@ void QDeclarativeCircleMapItem::setBackend(QDeclarativeCircleMapItem::Backend b) + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativeCircleMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativeCircleMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativeCircleMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -565,7 +577,9 @@ QDeclarativeCircleMapItemPrivate::~QDeclarativeCircleMapItemPrivate() {} + + QDeclarativeCircleMapItemPrivateCPU::~QDeclarativeCircleMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativeCircleMapItemPrivateOpenGL::~QDeclarativeCircleMapItemPrivateOpenGL() {} ++#endif + + bool QDeclarativeCircleMapItemPrivate::preserveCircleGeometry (QList &path, + const QGeoCoordinate ¢er, qreal distance, const QGeoProjectionWebMercator &p) +diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h +index 4cf4217..dbe6c8b 100644 +--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h +@@ -275,6 +275,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateOpenGL: public QDeclarativeCircleMapItemPrivate + { + public: +@@ -443,6 +444,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +index fa6ee17..af4f55e 100644 +--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +@@ -334,6 +334,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map, qreal stroke + this->translate(QPointF(strokeWidth, strokeWidth)); + } + ++#if QT_CONFIG(opengl) + QGeoMapPolygonGeometryOpenGL::QGeoMapPolygonGeometryOpenGL(){ + } + +@@ -344,6 +345,7 @@ void QGeoMapPolygonGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const + geopath.append(QWebMercator::mercatorToCoord(c)); + updateSourcePoints(map, geopath); + } ++#endif + + // wrapPath always preserves the geometry + // This one handles holes +@@ -452,6 +454,7 @@ static void cutPathEars(const QList &wrappedPath, + screenIndices << quint32(i); + } + ++#if QT_CONFIG(opengl) + /*! + \internal + */ +@@ -594,7 +597,7 @@ void QGeoMapPolygonGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebMe + sourceBounds_.setWidth(brect.width()); + sourceBounds_.setHeight(brect.height()); + } +- ++#endif // QT_CONFIG(opengl) + /* + * QDeclarativePolygonMapItem Private Implementations + */ +@@ -603,8 +606,9 @@ QDeclarativePolygonMapItemPrivate::~QDeclarativePolygonMapItemPrivate() {} + + QDeclarativePolygonMapItemPrivateCPU::~QDeclarativePolygonMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativePolygonMapItemPrivateOpenGL::~QDeclarativePolygonMapItemPrivateOpenGL() {} +- ++#endif + /* + * QDeclarativePolygonMapItem Implementation + */ +@@ -689,9 +693,17 @@ void QDeclarativePolygonMapItem::setBackend(QDeclarativePolygonMapItem::Backend + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativePolygonMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativePolygonMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativePolygonMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativePolygonMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -898,6 +910,7 @@ void QDeclarativePolygonMapItem::geometryChanged(const QRectF &newGeometry, cons + + ////////////////////////////////////////////////////////////////////// + ++#if QT_CONFIG(opengl) + QSGMaterialShader *MapPolygonMaterial::createShader() const + { + return new MapPolygonShader(); +@@ -916,6 +929,7 @@ QSGMaterialType *MapPolygonMaterial::type() const + static QSGMaterialType type; + return &type; + } ++#endif + + MapPolygonNode::MapPolygonNode() : + border_(new MapPolylineNode()), +@@ -967,6 +981,7 @@ void MapPolygonNode::update(const QColor &fillColor, const QColor &borderColor, + } + } + ++#if QT_CONFIG(opengl) + MapPolygonNodeGL::MapPolygonNodeGL() : + //fill_material_(this), + fill_material_(), +@@ -1052,5 +1067,5 @@ void MapPolygonShader::updateState(const QSGMaterialShader::RenderState &state, + program()->setUniformValue(m_center_lowpart_id, vecCenter_lowpart); + program()->setUniformValue(m_wrapOffset_id, float(newMaterial->wrapOffset())); + } +- ++#endif // QT_CONFIG(opengl) + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h +index 8d566e6..5e75deb 100644 +--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h +@@ -89,6 +89,7 @@ protected: + bool assumeSimple_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QGeoMapPolygonGeometryOpenGL : public QGeoMapItemGeometry + { + public: +@@ -197,6 +198,7 @@ private: + int m_color_id; + int m_wrapOffset_id; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT MapPolygonMaterial : public QSGFlatColorMaterial + { +@@ -269,6 +271,7 @@ private: + QSGGeometry geometry_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT MapPolygonNodeGL : public MapItemGeometryNode + { + +@@ -284,6 +287,7 @@ public: + MapPolygonMaterial fill_material_; + QSGGeometry geometry_; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivate + { +@@ -479,6 +483,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivateOpenGL: public QDeclarativePolygonMapItemPrivate + { + public: +@@ -662,6 +667,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +index d59704d..83d253f 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +@@ -769,6 +769,7 @@ bool QGeoMapPolylineGeometry::contains(const QPointF &point) const + return false; + } + ++#if QT_CONFIG(opengl) + void QGeoMapPolylineGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const QGeoPolygon &poly) + { + if (!sourceDirty_) +@@ -921,6 +922,7 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM + sourceBounds_.setWidth(brect.width() + strokeWidth); + sourceBounds_.setHeight(brect.height() + strokeWidth); + } ++#endif // QT_CONFIG(opengl) + + /* + * QDeclarativePolygonMapItem Private Implementations +@@ -928,12 +930,13 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM + + QDeclarativePolylineMapItemPrivate::~QDeclarativePolylineMapItemPrivate() {} + +- + QDeclarativePolylineMapItemPrivateCPU::~QDeclarativePolylineMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativePolylineMapItemPrivateOpenGLLineStrip::~QDeclarativePolylineMapItemPrivateOpenGLLineStrip() {} + + QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPrivateOpenGLExtruded() {} ++#endif + + /* + * QDeclarativePolygonMapItem Implementation +@@ -941,10 +944,12 @@ QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPr + + struct PolylineBackendSelector + { ++#if QT_CONFIG(opengl) + PolylineBackendSelector() + { + backend = (qgetenv("QTLOCATION_OPENGL_ITEMS").toInt()) ? QDeclarativePolylineMapItem::OpenGLExtruded : QDeclarativePolylineMapItem::Software; + } ++#endif + QDeclarativePolylineMapItem::Backend backend = QDeclarativePolylineMapItem::Software; + }; + +@@ -1236,11 +1241,22 @@ void QDeclarativePolylineMapItem::setBackend(QDeclarativePolylineMapItem::Backen + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativePolylineMapItemPrivateCPU(*this)) +- : ((m_backend == OpenGLExtruded) +- ? static_cast(new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) +- : static_cast(new QDeclarativePolylineMapItemPrivateOpenGLLineStrip(*this)))); ++ QScopedPointer d( ++ (m_backend == Software) ++ ? static_cast( ++ new QDeclarativePolylineMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : ((m_backend == OpenGLExtruded) ++ ? static_cast( ++ new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) ++ : static_cast( ++ new QDeclarativePolylineMapItemPrivateOpenGLLineStrip( ++ *this)))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -1477,6 +1493,7 @@ void MapPolylineNode::update(const QColor &fillColor, + } + } + ++#if QT_CONFIG(opengl) + MapPolylineNodeOpenGLLineStrip::MapPolylineNodeOpenGLLineStrip() + : geometry_(QSGGeometry::defaultAttributes_Point2D(), 0) + { +@@ -2080,5 +2097,6 @@ unsigned int QGeoMapItemLODGeometry::zoomForLOD(unsigned int zoom) + return res; + return res + 1; // give more resolution when closing in + } ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +index 9cd20ea..d3d0ebd 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +@@ -97,8 +97,10 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativ + public: + enum Backend { + Software = 0, ++#if QT_CONFIG(opengl) + OpenGLLineStrip = 1, + OpenGLExtruded = 2, ++#endif + }; + + explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0); +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +index 2a921e2..e184391 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +@@ -213,6 +213,7 @@ protected: + QSGGeometry geometry_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QGeoMapItemLODGeometry + { + public: +@@ -566,6 +567,7 @@ protected: + MapPolylineMaterialExtruded fill_material_; + QSGGeometry m_geometryTriangulating; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate + { +@@ -720,6 +722,7 @@ public: + MapPolylineNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLLineStrip: public QDeclarativePolylineMapItemPrivate + { + public: +@@ -884,7 +887,7 @@ public: + + MapPolylineNodeOpenGLExtruded *m_nodeTri = nullptr; + }; +- ++#endif // QT_CONFIG(opengl) + QT_END_NAMESPACE + + #endif // QDECLARATIVEPOLYLINEMAPITEM_P_P_H +diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +index 74d2cc1..6192be0 100644 +--- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +@@ -185,9 +185,18 @@ void QDeclarativeRectangleMapItem::setBackend(QDeclarativeRectangleMapItem::Back + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativeRectangleMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativeRectangleMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif ++ + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -397,6 +406,8 @@ QDeclarativeRectangleMapItemPrivate::~QDeclarativeRectangleMapItemPrivate() {} + + QDeclarativeRectangleMapItemPrivateCPU::~QDeclarativeRectangleMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativeRectangleMapItemPrivateOpenGL::~QDeclarativeRectangleMapItemPrivateOpenGL() {} ++#endif + + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h +index 65d2f61..f7ecd2a 100644 +--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h +@@ -244,6 +244,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateOpenGL: public QDeclarativeRectangleMapItemPrivate + { + public: +@@ -410,6 +411,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/location.pro b/src/location/location.pro +index b0e2c3f..ae20271 100644 +--- a/src/location/location.pro ++++ b/src/location/location.pro +@@ -39,7 +39,14 @@ include(maps/maps.pri) + include(places/places.pri) + include(declarativemaps/declarativemaps.pri) + include(declarativeplaces/declarativeplaces.pri) +-qtConfig(location-labs-plugin):include(labs/labs.pri) ++qtConfig(location-labs-plugin) { ++ include(labs/labs.pri) ++} else { ++ # FIXME: this should be moved out of plugin source code, geojson is referenced from other places ++ # within codebase,however compilation of location-labs-plugin is optional ++ PRIVATE_HEADERS += labs/qgeojson_p.h ++ SOURCES += labs/qgeojson.cpp ++} + + HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp +index 1ebad08..a764438 100644 +--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp ++++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp +@@ -103,6 +103,7 @@ QGeoMap::Capabilities QGeoMapItemsOverlay::capabilities() const + bool QGeoMapItemsOverlay::createMapObjectImplementation(QGeoMapObject *obj) + { + #ifndef LOCATIONLABS ++ Q_UNUSED(obj); + return false; + #else + Q_D(QGeoMapItemsOverlay); +@@ -132,7 +133,9 @@ QSGNode *QGeoMapItemsOverlay::updateSceneGraph(QSGNode *node, QQuickWindow *wind + + void QGeoMapItemsOverlay::removeMapObject(QGeoMapObject *obj) + { +-#ifdef LOCATIONLABS ++#ifndef LOCATIONLABS ++ Q_UNUSED(obj); ++#else + Q_D(QGeoMapItemsOverlay); + d->removeMapObject(obj); + #endif +@@ -169,7 +172,11 @@ QRectF QGeoMapItemsOverlayPrivate::visibleArea() const + QGeoMapItemsOverlayPrivate::QGeoMapItemsOverlayPrivate(QGeoMappingManagerEngineItemsOverlay *engine, QGeoMapItemsOverlay *map) + : QGeoMapPrivate(engine, new QGeoProjectionWebMercator) + { ++#ifndef LOCATIONLABS ++ Q_UNUSED(map); ++#else + m_qsgSupport.m_map = map; ++#endif + } + + QGeoMapItemsOverlayPrivate::~QGeoMapItemsOverlayPrivate() +-- +2.33.1 + From peter at korsgaard.com Wed Jan 26 12:34:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:34:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1/gst1-plugins-bad: add missing Config.in comment on udev Message-ID: <20220126124312.C0EF282829@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d9f754a5bf92d008469b0f281bfd9fe139ed218 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS option has a dependency on BR2_PACKAGE_HAS_UDEV, but no Config.in comment was added about this dependency. This commit addresses that. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 029a3c3ed7d84f26e7f2d5726aeb46af797fda5d) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 239a45bb63..f9f9aed486 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -665,6 +665,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS help Video4Linux Stateless CODECs support +comment "v4l2codecs need udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 bool "x265" depends on BR2_INSTALL_LIBSTDCPP From peter at korsgaard.com Wed Jan 26 12:25:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:25:37 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/font-awesome: make it visible by fontconfig Message-ID: <20220126124317.AD8B78257D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0990b46f521a778ea3064b0eef29adde6fe60d4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This commit creates a symlink that ensures fontconfig will find the fonts installed by the font-awesome package. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 0979a9e13c45afa20d60122747409cf82164147c) Signed-off-by: Peter Korsgaard --- package/font-awesome/font-awesome.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/font-awesome/font-awesome.mk b/package/font-awesome/font-awesome.mk index 666346be0e..5211ac22a5 100644 --- a/package/font-awesome/font-awesome.mk +++ b/package/font-awesome/font-awesome.mk @@ -13,6 +13,8 @@ define FONT_AWESOME_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/font-awesome/ $(foreach d,$(FONT_AWESOME_DIRECTORIES_LIST),\ cp -dpfr $(@D)/$(d) $(TARGET_DIR)/usr/share/font-awesome$(sep)) + mkdir -p $(TARGET_DIR)/usr/share/fonts/ + ln -sf ../font-awesome $(TARGET_DIR)/usr/share/fonts/font-awesome endef $(eval $(generic-package)) From peter at korsgaard.com Wed Jan 26 12:34:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:34:48 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1/gst1-plugins-bad: add missing Config.in comment on udev Message-ID: <20220126124317.B746982829@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20ba4f6d31a8406eb307a68d8654534c77d8061d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS option has a dependency on BR2_PACKAGE_HAS_UDEV, but no Config.in comment was added about this dependency. This commit addresses that. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 029a3c3ed7d84f26e7f2d5726aeb46af797fda5d) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 7bbb1aa5dd..a74008bf77 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -658,6 +658,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS help Video4Linux Stateless CODECs support +comment "v4l2codecs need udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 bool "x265" depends on BR2_INSTALL_LIBSTDCPP From peter at korsgaard.com Wed Jan 26 12:22:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:22:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/qt5/qt5location: fix build failures without opengl Message-ID: <20220126124317.A42C282241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6e486cf1e815c50d6cac136296e08bbd0816062 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Backport a patch that fixes several "const marked override but does not override" compilation errors when openGL is not enabled. Patch fetched from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353 Fixes: http://autobuild.buildroot.net/results/6378e43d50dfad13a45522492f14c9df7acd64e4 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit cea2b082eb35d9fd466833098463e2adcbb40022) Signed-off-by: Peter Korsgaard --- ...0002-fix-compilation-for-no-opengl-builds.patch | 528 +++++++++++++++++++++ 1 file changed, 528 insertions(+) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch new file mode 100644 index 0000000000..98e65df202 --- /dev/null +++ b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch @@ -0,0 +1,528 @@ +From 4bcacd0dc8f73de7b9e5e5f5fa2129fd88bdff3b Mon Sep 17 00:00:00 2001 +From: Michal Klocek +Date: Mon, 11 Jan 2021 16:02:14 +0100 +Subject: [PATCH] Fix compilation for no opengl builds + +Disables experimental labs qml plugin, which +since a4469cad40 depends heavily on opengl backend. + +Fix warnings with msvc when compiling without experimental +plugin. + +Task-number: QTBUG-91623 +Fixes: QTBUG-88017 +Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8 + +Signed-off-by: Michal Klocek +Signed-off-by: Alex Blasche + +[Retrieved from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353] +Signed-off-by: Adam Duskett +--- + src/location/configure.json | 1 + + .../qdeclarativecirclemapitem.cpp | 20 +++++++++++-- + .../qdeclarativecirclemapitem_p_p.h | 2 ++ + .../qdeclarativepolygonmapitem.cpp | 27 +++++++++++++---- + .../qdeclarativepolygonmapitem_p_p.h | 6 ++++ + .../qdeclarativepolylinemapitem.cpp | 30 +++++++++++++++---- + .../qdeclarativepolylinemapitem_p.h | 2 ++ + .../qdeclarativepolylinemapitem_p_p.h | 5 +++- + .../qdeclarativerectanglemapitem.cpp | 17 +++++++++-- + .../qdeclarativerectanglemapitem_p_p.h | 2 ++ + src/location/location.pro | 9 +++++- + .../itemsoverlay/qgeomapitemsoverlay.cpp | 9 +++++- + 12 files changed, 109 insertions(+), 21 deletions(-) + +diff --git a/src/location/configure.json b/src/location/configure.json +index 62ab029..6d01a9a 100644 +--- a/src/location/configure.json ++++ b/src/location/configure.json +@@ -9,6 +9,7 @@ + "label": "Qt.labs.location experimental QML plugin", + "purpose": "Provides experimental QtLocation QML types", + "section": "Location", ++ "condition": "config.opengl", + "output": [ "privateFeature" ] + }, + "geoservices_osm": { +diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +index 841c29a..955de2c 100644 +--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +@@ -446,6 +446,7 @@ void QDeclarativeCircleMapItem::updatePolish() + */ + void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldCenter, qreal oldRadius, const QGeoCoordinate &newCenter, qreal newRadius) + { ++#if QT_CONFIG(opengl) + if (m_backend != QDeclarativeCircleMapItem::OpenGL) + return; + +@@ -459,6 +460,9 @@ void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldC + QScopedPointer d(static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); + m_d.swap(d); + } ++#else ++ return; ++#endif + } + + /*! +@@ -534,9 +538,17 @@ void QDeclarativeCircleMapItem::setBackend(QDeclarativeCircleMapItem::Backend b) + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativeCircleMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativeCircleMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativeCircleMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -565,7 +577,9 @@ QDeclarativeCircleMapItemPrivate::~QDeclarativeCircleMapItemPrivate() {} + + QDeclarativeCircleMapItemPrivateCPU::~QDeclarativeCircleMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativeCircleMapItemPrivateOpenGL::~QDeclarativeCircleMapItemPrivateOpenGL() {} ++#endif + + bool QDeclarativeCircleMapItemPrivate::preserveCircleGeometry (QList &path, + const QGeoCoordinate ¢er, qreal distance, const QGeoProjectionWebMercator &p) +diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h +index 4cf4217..dbe6c8b 100644 +--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h +@@ -275,6 +275,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateOpenGL: public QDeclarativeCircleMapItemPrivate + { + public: +@@ -443,6 +444,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +index fa6ee17..af4f55e 100644 +--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +@@ -334,6 +334,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map, qreal stroke + this->translate(QPointF(strokeWidth, strokeWidth)); + } + ++#if QT_CONFIG(opengl) + QGeoMapPolygonGeometryOpenGL::QGeoMapPolygonGeometryOpenGL(){ + } + +@@ -344,6 +345,7 @@ void QGeoMapPolygonGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const + geopath.append(QWebMercator::mercatorToCoord(c)); + updateSourcePoints(map, geopath); + } ++#endif + + // wrapPath always preserves the geometry + // This one handles holes +@@ -452,6 +454,7 @@ static void cutPathEars(const QList &wrappedPath, + screenIndices << quint32(i); + } + ++#if QT_CONFIG(opengl) + /*! + \internal + */ +@@ -594,7 +597,7 @@ void QGeoMapPolygonGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebMe + sourceBounds_.setWidth(brect.width()); + sourceBounds_.setHeight(brect.height()); + } +- ++#endif // QT_CONFIG(opengl) + /* + * QDeclarativePolygonMapItem Private Implementations + */ +@@ -603,8 +606,9 @@ QDeclarativePolygonMapItemPrivate::~QDeclarativePolygonMapItemPrivate() {} + + QDeclarativePolygonMapItemPrivateCPU::~QDeclarativePolygonMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativePolygonMapItemPrivateOpenGL::~QDeclarativePolygonMapItemPrivateOpenGL() {} +- ++#endif + /* + * QDeclarativePolygonMapItem Implementation + */ +@@ -689,9 +693,17 @@ void QDeclarativePolygonMapItem::setBackend(QDeclarativePolygonMapItem::Backend + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativePolygonMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativePolygonMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativePolygonMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativePolygonMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -898,6 +910,7 @@ void QDeclarativePolygonMapItem::geometryChanged(const QRectF &newGeometry, cons + + ////////////////////////////////////////////////////////////////////// + ++#if QT_CONFIG(opengl) + QSGMaterialShader *MapPolygonMaterial::createShader() const + { + return new MapPolygonShader(); +@@ -916,6 +929,7 @@ QSGMaterialType *MapPolygonMaterial::type() const + static QSGMaterialType type; + return &type; + } ++#endif + + MapPolygonNode::MapPolygonNode() : + border_(new MapPolylineNode()), +@@ -967,6 +981,7 @@ void MapPolygonNode::update(const QColor &fillColor, const QColor &borderColor, + } + } + ++#if QT_CONFIG(opengl) + MapPolygonNodeGL::MapPolygonNodeGL() : + //fill_material_(this), + fill_material_(), +@@ -1052,5 +1067,5 @@ void MapPolygonShader::updateState(const QSGMaterialShader::RenderState &state, + program()->setUniformValue(m_center_lowpart_id, vecCenter_lowpart); + program()->setUniformValue(m_wrapOffset_id, float(newMaterial->wrapOffset())); + } +- ++#endif // QT_CONFIG(opengl) + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h +index 8d566e6..5e75deb 100644 +--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h +@@ -89,6 +89,7 @@ protected: + bool assumeSimple_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QGeoMapPolygonGeometryOpenGL : public QGeoMapItemGeometry + { + public: +@@ -197,6 +198,7 @@ private: + int m_color_id; + int m_wrapOffset_id; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT MapPolygonMaterial : public QSGFlatColorMaterial + { +@@ -269,6 +271,7 @@ private: + QSGGeometry geometry_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT MapPolygonNodeGL : public MapItemGeometryNode + { + +@@ -284,6 +287,7 @@ public: + MapPolygonMaterial fill_material_; + QSGGeometry geometry_; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivate + { +@@ -479,6 +483,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivateOpenGL: public QDeclarativePolygonMapItemPrivate + { + public: +@@ -662,6 +667,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +index d59704d..83d253f 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +@@ -769,6 +769,7 @@ bool QGeoMapPolylineGeometry::contains(const QPointF &point) const + return false; + } + ++#if QT_CONFIG(opengl) + void QGeoMapPolylineGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const QGeoPolygon &poly) + { + if (!sourceDirty_) +@@ -921,6 +922,7 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM + sourceBounds_.setWidth(brect.width() + strokeWidth); + sourceBounds_.setHeight(brect.height() + strokeWidth); + } ++#endif // QT_CONFIG(opengl) + + /* + * QDeclarativePolygonMapItem Private Implementations +@@ -928,12 +930,13 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM + + QDeclarativePolylineMapItemPrivate::~QDeclarativePolylineMapItemPrivate() {} + +- + QDeclarativePolylineMapItemPrivateCPU::~QDeclarativePolylineMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativePolylineMapItemPrivateOpenGLLineStrip::~QDeclarativePolylineMapItemPrivateOpenGLLineStrip() {} + + QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPrivateOpenGLExtruded() {} ++#endif + + /* + * QDeclarativePolygonMapItem Implementation +@@ -941,10 +944,12 @@ QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPr + + struct PolylineBackendSelector + { ++#if QT_CONFIG(opengl) + PolylineBackendSelector() + { + backend = (qgetenv("QTLOCATION_OPENGL_ITEMS").toInt()) ? QDeclarativePolylineMapItem::OpenGLExtruded : QDeclarativePolylineMapItem::Software; + } ++#endif + QDeclarativePolylineMapItem::Backend backend = QDeclarativePolylineMapItem::Software; + }; + +@@ -1236,11 +1241,22 @@ void QDeclarativePolylineMapItem::setBackend(QDeclarativePolylineMapItem::Backen + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativePolylineMapItemPrivateCPU(*this)) +- : ((m_backend == OpenGLExtruded) +- ? static_cast(new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) +- : static_cast(new QDeclarativePolylineMapItemPrivateOpenGLLineStrip(*this)))); ++ QScopedPointer d( ++ (m_backend == Software) ++ ? static_cast( ++ new QDeclarativePolylineMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : ((m_backend == OpenGLExtruded) ++ ? static_cast( ++ new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) ++ : static_cast( ++ new QDeclarativePolylineMapItemPrivateOpenGLLineStrip( ++ *this)))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -1477,6 +1493,7 @@ void MapPolylineNode::update(const QColor &fillColor, + } + } + ++#if QT_CONFIG(opengl) + MapPolylineNodeOpenGLLineStrip::MapPolylineNodeOpenGLLineStrip() + : geometry_(QSGGeometry::defaultAttributes_Point2D(), 0) + { +@@ -2080,5 +2097,6 @@ unsigned int QGeoMapItemLODGeometry::zoomForLOD(unsigned int zoom) + return res; + return res + 1; // give more resolution when closing in + } ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +index 9cd20ea..d3d0ebd 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +@@ -97,8 +97,10 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativ + public: + enum Backend { + Software = 0, ++#if QT_CONFIG(opengl) + OpenGLLineStrip = 1, + OpenGLExtruded = 2, ++#endif + }; + + explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0); +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +index 2a921e2..e184391 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +@@ -213,6 +213,7 @@ protected: + QSGGeometry geometry_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QGeoMapItemLODGeometry + { + public: +@@ -566,6 +567,7 @@ protected: + MapPolylineMaterialExtruded fill_material_; + QSGGeometry m_geometryTriangulating; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate + { +@@ -720,6 +722,7 @@ public: + MapPolylineNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLLineStrip: public QDeclarativePolylineMapItemPrivate + { + public: +@@ -884,7 +887,7 @@ public: + + MapPolylineNodeOpenGLExtruded *m_nodeTri = nullptr; + }; +- ++#endif // QT_CONFIG(opengl) + QT_END_NAMESPACE + + #endif // QDECLARATIVEPOLYLINEMAPITEM_P_P_H +diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +index 74d2cc1..6192be0 100644 +--- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +@@ -185,9 +185,18 @@ void QDeclarativeRectangleMapItem::setBackend(QDeclarativeRectangleMapItem::Back + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativeRectangleMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativeRectangleMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif ++ + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -397,6 +406,8 @@ QDeclarativeRectangleMapItemPrivate::~QDeclarativeRectangleMapItemPrivate() {} + + QDeclarativeRectangleMapItemPrivateCPU::~QDeclarativeRectangleMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativeRectangleMapItemPrivateOpenGL::~QDeclarativeRectangleMapItemPrivateOpenGL() {} ++#endif + + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h +index 65d2f61..f7ecd2a 100644 +--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h +@@ -244,6 +244,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateOpenGL: public QDeclarativeRectangleMapItemPrivate + { + public: +@@ -410,6 +411,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/location.pro b/src/location/location.pro +index b0e2c3f..ae20271 100644 +--- a/src/location/location.pro ++++ b/src/location/location.pro +@@ -39,7 +39,14 @@ include(maps/maps.pri) + include(places/places.pri) + include(declarativemaps/declarativemaps.pri) + include(declarativeplaces/declarativeplaces.pri) +-qtConfig(location-labs-plugin):include(labs/labs.pri) ++qtConfig(location-labs-plugin) { ++ include(labs/labs.pri) ++} else { ++ # FIXME: this should be moved out of plugin source code, geojson is referenced from other places ++ # within codebase,however compilation of location-labs-plugin is optional ++ PRIVATE_HEADERS += labs/qgeojson_p.h ++ SOURCES += labs/qgeojson.cpp ++} + + HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp +index 1ebad08..a764438 100644 +--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp ++++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp +@@ -103,6 +103,7 @@ QGeoMap::Capabilities QGeoMapItemsOverlay::capabilities() const + bool QGeoMapItemsOverlay::createMapObjectImplementation(QGeoMapObject *obj) + { + #ifndef LOCATIONLABS ++ Q_UNUSED(obj); + return false; + #else + Q_D(QGeoMapItemsOverlay); +@@ -132,7 +133,9 @@ QSGNode *QGeoMapItemsOverlay::updateSceneGraph(QSGNode *node, QQuickWindow *wind + + void QGeoMapItemsOverlay::removeMapObject(QGeoMapObject *obj) + { +-#ifdef LOCATIONLABS ++#ifndef LOCATIONLABS ++ Q_UNUSED(obj); ++#else + Q_D(QGeoMapItemsOverlay); + d->removeMapObject(obj); + #endif +@@ -169,7 +172,11 @@ QRectF QGeoMapItemsOverlayPrivate::visibleArea() const + QGeoMapItemsOverlayPrivate::QGeoMapItemsOverlayPrivate(QGeoMappingManagerEngineItemsOverlay *engine, QGeoMapItemsOverlay *map) + : QGeoMapPrivate(engine, new QGeoProjectionWebMercator) + { ++#ifndef LOCATIONLABS ++ Q_UNUSED(map); ++#else + m_qsgSupport.m_map = map; ++#endif + } + + QGeoMapItemsOverlayPrivate::~QGeoMapItemsOverlayPrivate() +-- +2.33.1 + From peter at korsgaard.com Wed Jan 26 13:01:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:01:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/tcpreplay: security bump to version 4.3.4 In-Reply-To: <20211230223606.3076350-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 30 Dec 2021 23:36:06 +0100") References: <20211230223606.3076350-1-fontaine.fabrice@gmail.com> Message-ID: <878rv2irb7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - heap buffer overflow in tcpreplay fast_edit_packet > - heap buffer overflow in tcpreplay get_next_packet > - CVE-2020-24266 heap buffer overflow in tcpprep get_l2len > - CVE-2020-24265 heap buffer overflow in tcpprep > - Drop patch (already in version) and so autoreconf > - Update hash of license file (http -> https with > https://github.com/appneta/tcpreplay/commit/ad8a18005347b3cef84a9b478d56de96d1ad254f) > https://github.com/appneta/tcpreplay/releases/tag/v4.3.4 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 13:01:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:01:34 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tcpreplay: security bump to version 4.3.4 Message-ID: <20220126125502.D2ADA81439@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06f7e1f240dcad847d28f56ec5180f0987f95ccc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - heap buffer overflow in tcpreplay fast_edit_packet - heap buffer overflow in tcpreplay get_next_packet - CVE-2020-24266 heap buffer overflow in tcpprep get_l2len - CVE-2020-24265 heap buffer overflow in tcpprep - Drop patch (already in version) and so autoreconf - Update hash of license file (http -> https with https://github.com/appneta/tcpreplay/commit/ad8a18005347b3cef84a9b478d56de96d1ad254f) https://github.com/appneta/tcpreplay/releases/tag/v4.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit cd5191efd97e814099d211288a9956e88677ff75) Signed-off-by: Peter Korsgaard --- .../0001-configure-ac-fix-without-libdnet.patch | 76 ---------------------- package/tcpreplay/tcpreplay.hash | 6 +- package/tcpreplay/tcpreplay.mk | 4 +- 3 files changed, 4 insertions(+), 82 deletions(-) diff --git a/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch b/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch deleted file mode 100644 index 75ed4f94de..0000000000 --- a/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch +++ /dev/null @@ -1,76 +0,0 @@ -From acee9c0c46f71f1f4c33c2dadf69d19e24b90f27 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 13 Aug 2019 20:19:23 +0200 -Subject: [PATCH] configure.ac: fix --without-libdnet - -Allow the user to disable libdnet check through --without-libdnet. -This option is useful to cross-compile tcpreplay to avoid build failures -if libdnet is installed on host but not on target, see -https://bugs.buildroot.org/show_bug.cgi?id=12096 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/appneta/tcpreplay/pull/567] ---- - configure.ac | 48 +++++++++++++++++++++++++----------------------- - 1 file changed, 25 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 39ba58b7..5de3dcb5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1464,30 +1464,32 @@ if test $have_cygwin = no ; then - AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]), - [trydnetdir=$withval]) - -- case "$build_os" in -- linux*) -- dnl # Debian/Ubuntu already have a package called libdnet -- dnl # so you the package you want to install libdumbnet-dev -- for testdir in $trydnetdir /usr/local /opt/local /usr ; do -- if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then -- LDNETINC="$($testdir/bin/dumbnet-config --cflags)" -- LDNETLIB="$($testdir/bin/dumbnet-config --libs)" -- libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)" -- founddnet=$testdir -- fi -- done -- ;; -- esac -+ if test $trydnetdir != no; then -+ case "$build_os" in -+ linux*) -+ dnl # Debian/Ubuntu already have a package called libdnet -+ dnl # so you the package you want to install libdumbnet-dev -+ for testdir in $trydnetdir /usr/local /opt/local /usr ; do -+ if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then -+ LDNETINC="$($testdir/bin/dumbnet-config --cflags)" -+ LDNETLIB="$($testdir/bin/dumbnet-config --libs)" -+ libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)" -+ founddnet=$testdir -+ fi -+ done -+ ;; -+ esac - -- if test $founddnet = no ; then -- for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do -- if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then -- LDNETINC="$($testdir/bin/dnet-config --cflags)" -- LDNETLIB="$($testdir/bin/dnet-config --libs)" -- libdnet_version="$($testdir/bin/dnet-config --version)" -- founddnet=$testdir -- fi -- done -+ if test $founddnet = no ; then -+ for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do -+ if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then -+ LDNETINC="$($testdir/bin/dnet-config --cflags)" -+ LDNETLIB="$($testdir/bin/dnet-config --libs)" -+ libdnet_version="$($testdir/bin/dnet-config --version)" -+ founddnet=$testdir -+ fi -+ done -+ fi - fi - - if test $founddnet = no ; then diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index e83efd78b1..8bcdae958c 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://github.com/appneta/tcpreplay/releases/download/v4.3.3/tcpreplay-4.3.3.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.3.4/tcpreplay-4.3.4.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 5e960e2a4432f583adbd11fa0855d17b73d9e0f2d6453b749f27aacaee53bab5 tcpreplay-4.3.3.tar.xz -sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE +sha256 42c055106e55852c29d94bb6e1b9e001a0723349f2985eb893a47d384c85002b tcpreplay-4.3.4.tar.xz +sha256 07cf5e92d475287a7d1663b33097f40cae5adf03ed8920fcd4374e3dfb48c8ad docs/LICENSE diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 9208cb8176..ef65403974 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.3.3 +TCPREPLAY_VERSION = 4.3.4 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 @@ -15,8 +15,6 @@ TCPREPLAY_CONF_ENV = \ TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \ --enable-pcapconfig TCPREPLAY_DEPENDENCIES = libpcap -# We're patching configure.ac -TCPREPLAY_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no From peter at korsgaard.com Wed Jan 26 13:01:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:01:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tcpreplay: security bump to version 4.3.4 Message-ID: <20220126125511.1E5A381439@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0171ea611a308cf227dd2f8f8f79bf1616f34ad7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - heap buffer overflow in tcpreplay fast_edit_packet - heap buffer overflow in tcpreplay get_next_packet - CVE-2020-24266 heap buffer overflow in tcpprep get_l2len - CVE-2020-24265 heap buffer overflow in tcpprep - Drop patch (already in version) and so autoreconf - Update hash of license file (http -> https with https://github.com/appneta/tcpreplay/commit/ad8a18005347b3cef84a9b478d56de96d1ad254f) https://github.com/appneta/tcpreplay/releases/tag/v4.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit cd5191efd97e814099d211288a9956e88677ff75) Signed-off-by: Peter Korsgaard --- .../0001-configure-ac-fix-without-libdnet.patch | 76 ---------------------- package/tcpreplay/tcpreplay.hash | 6 +- package/tcpreplay/tcpreplay.mk | 4 +- 3 files changed, 4 insertions(+), 82 deletions(-) diff --git a/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch b/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch deleted file mode 100644 index 75ed4f94de..0000000000 --- a/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch +++ /dev/null @@ -1,76 +0,0 @@ -From acee9c0c46f71f1f4c33c2dadf69d19e24b90f27 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 13 Aug 2019 20:19:23 +0200 -Subject: [PATCH] configure.ac: fix --without-libdnet - -Allow the user to disable libdnet check through --without-libdnet. -This option is useful to cross-compile tcpreplay to avoid build failures -if libdnet is installed on host but not on target, see -https://bugs.buildroot.org/show_bug.cgi?id=12096 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/appneta/tcpreplay/pull/567] ---- - configure.ac | 48 +++++++++++++++++++++++++----------------------- - 1 file changed, 25 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 39ba58b7..5de3dcb5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1464,30 +1464,32 @@ if test $have_cygwin = no ; then - AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]), - [trydnetdir=$withval]) - -- case "$build_os" in -- linux*) -- dnl # Debian/Ubuntu already have a package called libdnet -- dnl # so you the package you want to install libdumbnet-dev -- for testdir in $trydnetdir /usr/local /opt/local /usr ; do -- if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then -- LDNETINC="$($testdir/bin/dumbnet-config --cflags)" -- LDNETLIB="$($testdir/bin/dumbnet-config --libs)" -- libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)" -- founddnet=$testdir -- fi -- done -- ;; -- esac -+ if test $trydnetdir != no; then -+ case "$build_os" in -+ linux*) -+ dnl # Debian/Ubuntu already have a package called libdnet -+ dnl # so you the package you want to install libdumbnet-dev -+ for testdir in $trydnetdir /usr/local /opt/local /usr ; do -+ if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then -+ LDNETINC="$($testdir/bin/dumbnet-config --cflags)" -+ LDNETLIB="$($testdir/bin/dumbnet-config --libs)" -+ libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)" -+ founddnet=$testdir -+ fi -+ done -+ ;; -+ esac - -- if test $founddnet = no ; then -- for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do -- if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then -- LDNETINC="$($testdir/bin/dnet-config --cflags)" -- LDNETLIB="$($testdir/bin/dnet-config --libs)" -- libdnet_version="$($testdir/bin/dnet-config --version)" -- founddnet=$testdir -- fi -- done -+ if test $founddnet = no ; then -+ for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do -+ if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then -+ LDNETINC="$($testdir/bin/dnet-config --cflags)" -+ LDNETLIB="$($testdir/bin/dnet-config --libs)" -+ libdnet_version="$($testdir/bin/dnet-config --version)" -+ founddnet=$testdir -+ fi -+ done -+ fi - fi - - if test $founddnet = no ; then diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index e83efd78b1..8bcdae958c 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://github.com/appneta/tcpreplay/releases/download/v4.3.3/tcpreplay-4.3.3.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.3.4/tcpreplay-4.3.4.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 5e960e2a4432f583adbd11fa0855d17b73d9e0f2d6453b749f27aacaee53bab5 tcpreplay-4.3.3.tar.xz -sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE +sha256 42c055106e55852c29d94bb6e1b9e001a0723349f2985eb893a47d384c85002b tcpreplay-4.3.4.tar.xz +sha256 07cf5e92d475287a7d1663b33097f40cae5adf03ed8920fcd4374e3dfb48c8ad docs/LICENSE diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 9208cb8176..ef65403974 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.3.3 +TCPREPLAY_VERSION = 4.3.4 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 @@ -15,8 +15,6 @@ TCPREPLAY_CONF_ENV = \ TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \ --enable-pcapconfig TCPREPLAY_DEPENDENCIES = libpcap -# We're patching configure.ac -TCPREPLAY_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no From peter at korsgaard.com Wed Jan 26 13:07:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:07:03 +0100 Subject: [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor In-Reply-To: <20211231124728.1692301-1-romain.naour@gmail.com> (Romain Naour's message of "Fri, 31 Dec 2021 13:47:26 +0100") References: <20211231124728.1692301-1-romain.naour@gmail.com> Message-ID: <874k5qir2g.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Flare games use OGG audio file format througt SDL2-mixer. > Without OGG support, flare-engine trigger a lot of errors in its > log and fail to start the game. > ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format > Signed-off-by: Romain Naour Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 13:07:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:07:09 +0100 Subject: [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file In-Reply-To: <20211231124728.1692301-2-romain.naour@gmail.com> (Romain Naour's message of "Fri, 31 Dec 2021 13:47:27 +0100") References: <20211231124728.1692301-1-romain.naour@gmail.com> <20211231124728.1692301-2-romain.naour@gmail.com> Message-ID: <87zgnihchu.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > The previous version bump [1] added the hash of LICENSE.txt but > forgot to update FLARE_GAME_LICENSE_FILES. > [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c > Signed-off-by: Romain Naour Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 13:06:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:06:30 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Message-ID: <20220126130032.854DF82753@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27b6400b3fe591345080c06029c2af082d7246df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Flare games use OGG audio file format througt SDL2-mixer. Without OGG support, flare-engine trigger a lot of errors in its log and fail to start the game. ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 1f66c3557a391a00a7527e2b2e8fddd83f0ba0aa) Signed-off-by: Peter Korsgaard --- package/flare-engine/Config.in | 1 + package/flare-engine/flare-engine.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index d08b740af3..9c997c2b9a 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FLARE_ENGINE select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER select BR2_PACKAGE_SDL2_TTF + select BR2_PACKAGE_TREMOR # for SDL2_mixer ogg support help Flare (Free Libre Action Roleplaying Engine) is a simple game engine built to handle a very specific kind of game: diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index e2f3eefa28..6ff4ca36b4 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -9,7 +9,7 @@ FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSIO FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING -FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf +FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf tremor # Don't use /usr/games and /usr/share/games FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare From peter at korsgaard.com Wed Jan 26 13:06:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:06:53 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/flare-game: really use LICENSE.txt as license file Message-ID: <20220126130032.91A6182814@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f81703f466d4bc252932a4e1e8454482e70f88a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The previous version bump [1] added the hash of LICENSE.txt but forgot to update FLARE_GAME_LICENSE_FILES. [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 7684604188f829820f96ced628137ff880e302f6) Signed-off-by: Peter Korsgaard --- package/flare-game/flare-game.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index 4bebc79595..e015ef4687 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -8,7 +8,7 @@ FLARE_GAME_VERSION = 1.11 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) -FLARE_GAME_LICENSE_FILES = README +FLARE_GAME_LICENSE_FILES = LICENSE.txt FLARE_GAME_DEPENDENCIES = flare-engine From peter at korsgaard.com Wed Jan 26 13:05:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:05:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Message-ID: <20220126130036.82FCB82753@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a17bb098d474737f74ce23dbbdb78e28c5676719 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Flare games use OGG audio file format througt SDL2-mixer. Without OGG support, flare-engine trigger a lot of errors in its log and fail to start the game. ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 1f66c3557a391a00a7527e2b2e8fddd83f0ba0aa) Signed-off-by: Peter Korsgaard --- package/flare-engine/Config.in | 1 + package/flare-engine/flare-engine.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index d08b740af3..9c997c2b9a 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FLARE_ENGINE select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER select BR2_PACKAGE_SDL2_TTF + select BR2_PACKAGE_TREMOR # for SDL2_mixer ogg support help Flare (Free Libre Action Roleplaying Engine) is a simple game engine built to handle a very specific kind of game: diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index 14d2681fda..d722a42208 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -9,7 +9,7 @@ FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING -FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf +FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf tremor # Don't use /usr/games and /usr/share/games FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare From peter at korsgaard.com Wed Jan 26 13:05:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:05:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/flare-game: really use LICENSE.txt as license file Message-ID: <20220126130036.8E3E982814@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98524b449615350a860ccf0b63a106d7742477d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The previous version bump [1] added the hash of LICENSE.txt but forgot to update FLARE_GAME_LICENSE_FILES. [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 7684604188f829820f96ced628137ff880e302f6) Signed-off-by: Peter Korsgaard --- package/flare-game/flare-game.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index d65e3d6c38..2845dc9714 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -8,7 +8,7 @@ FLARE_GAME_VERSION = 1.11 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) -FLARE_GAME_LICENSE_FILES = README +FLARE_GAME_LICENSE_FILES = LICENSE.txt FLARE_GAME_DEPENDENCIES = flare-engine From heiko.thiery at gmail.com Wed Jan 26 13:17:30 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Wed, 26 Jan 2022 14:17:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: disable tests In-Reply-To: <20220125210800.299916-1-fontaine.fabrice@gmail.com> References: <20220125210800.299916-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, Am Di., 25. Jan. 2022 um 22:09 Uhr schrieb Fabrice Fontaine : > > Disable tests which are enabled since bump to version 2.0.35 in commit > 13d4856b916d797c3c771669edd3eb883336766f and > https://github.com/CESNET/netopeer2/commit/466a0b3c268ee319b4f65980404715a2723b4c0a > to avoid the following build failure if cmocka is built before > netopeer2: > > In file included from /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/stdint.h:20, > from /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/lib/gcc/riscv64-buildroot-linux-musl/10.3.0/include/stdint.h:9, > from /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/libyang/libyang.h:18, > from /home/buildroot/autobuild/instance-2/output-1/build/netopeer2-2.0.35/tests/test_sub_ntf.c:27: > /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/bits/alltypes.h:53:24: error: conflicting types for 'uintptr_t' > 53 | typedef unsigned _Addr uintptr_t; > | ^~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/0660a4f767d5cdaf07b28a508101b87f0300850f > > Signed-off-by: Fabrice Fontaine Reviewed-by: Heiko Thiery > --- > package/netopeer2/netopeer2.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk > index c8b6763313..43f22b7e4c 100644 > --- a/package/netopeer2/netopeer2.mk > +++ b/package/netopeer2/netopeer2.mk > @@ -11,7 +11,9 @@ NETOPEER2_LICENSE = BSD-3-Clause > NETOPEER2_LICENSE_FILES = LICENSE > NETOPEER2_DEPENDENCIES = libnetconf2 libyang sysrepo host-sysrepo > > -NETOPEER2_CONF_OPTS = -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) > +NETOPEER2_CONF_OPTS = \ > + -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) \ > + -DENABLE_TESTS=OFF > > # Set a build specific SYSREPO_SHM_PREFIX to ensure we can safely delete the > # files. This also ensures that concurrent parallel builds will not be > -- > 2.34.1 > From peter at korsgaard.com Wed Jan 26 14:36:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:36:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency In-Reply-To: <20220101000408.1538099-1-james.hilliard1@gmail.com> (James Hilliard's message of "Fri, 31 Dec 2021 17:04:08 -0700") References: <20220101000408.1538099-1-james.hilliard1@gmail.com> Message-ID: <87v8y6h8c7.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Fixes: > File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in > File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in > File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in > ModuleNotFoundError: No module named 'aiosignal' > Signed-off-by: James Hilliard When was this introduced? Do we need to backport this to 2021.02.x / 2021.11.x? -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 14:40:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:40:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: bump to version 14.18.2 In-Reply-To: <20211231100725.3662078-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 31 Dec 2021 11:07:25 +0100") References: <20211231100725.3662078-1-fontaine.fabrice@gmail.com> Message-ID: <87r18uh86i.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This bump will fix the following build failure raised since bump of > python3 to version 3.10.1 in commit > 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > Please use python3.9 or python3.8 or python3.7 or python3.6 or python3.5 or python2.7. > /usr/bin/python3.7 ./configure > /usr/bin/python3.5 ./configure > /home/peko/autobuild/instance-1/output-1/host/bin/python2.7 ./configure > Node.js configure: Found Python 3.10.1... > https://github.com/nodejs/node/releases/tag/v14.18.2 > Fixes: > - http://autobuild.buildroot.org/results/9e2ebb9c3681ec0485eaa042fa838c8ee62f649b > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 14:39:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:39:09 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/nodejs: bump to version 14.18.2 Message-ID: <20220126143337.50ED1825F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed95b7bbc2b110e19dd97b6a03613b9a51d37288 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This bump will fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: Please use python3.9 or python3.8 or python3.7 or python3.6 or python3.5 or python2.7. /usr/bin/python3.7 ./configure /usr/bin/python3.5 ./configure /home/peko/autobuild/instance-1/output-1/host/bin/python2.7 ./configure Node.js configure: Found Python 3.10.1... https://github.com/nodejs/node/releases/tag/v14.18.2 Fixes: - http://autobuild.buildroot.org/results/9e2ebb9c3681ec0485eaa042fa838c8ee62f649b Signed-off-by: Fabrice Fontaine Tested-by: James Hilliard Signed-off-by: Yann E. MORIN (cherry picked from commit 06735b085fd595ffc233e48cc5a57f4fa555b02c) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 3a4571e8e5..f330757341 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.17.6/SHASUMS256.txt -sha256 3fa1d71adddfab2f5e3e41874b4eddbdf92b65cade4a43922fb1e437afcf89ed node-v14.18.1.tar.xz +# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt +sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 42ef1baa64..44bf786dfd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.1 +NODEJS_VERSION = 14.18.2 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ From peter at korsgaard.com Wed Jan 26 14:46:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:46:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libnss: fix build failure with make version 4.3 Message-ID: <20220126144049.A33D4825F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5037ecffd5d42771ece111a220e011fec547764 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Make 4.3 is buggy and when parallel building host-libnss/libnss we end up with a failure thrown by make itself. So let's work-around this by don't parallel build the package if Make version is 4.3. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN (cherry picked from commit 540029eb4550760c2190a18ecbf0cb4391bb1dea) Signed-off-by: Peter Korsgaard --- package/libnss/libnss.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 2e26abdfc0..d885da0480 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING LIBNSS_CPE_ID_VENDOR = mozilla LIBNSS_CPE_ID_PRODUCT = nss +# Don't parallel build if make version = 4.3 +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) +LIBNSS_MAKE = $(MAKE1) +else +LIBNSS_MAKE = $(MAKE) +endif + LIBNSS_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) @@ -71,12 +78,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 endif define HOST_LIBNSS_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(HOST_LIBNSS_BUILD_VARS) - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ From peter at korsgaard.com Wed Jan 26 14:47:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:47:41 +0100 Subject: [Buildroot] [PATCH] package/libnss: fix build failure with make version 4.3 In-Reply-To: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sat, 1 Jan 2022 22:09:52 +0100") References: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> Message-ID: <87mtjih7ua.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Make 4.3 is buggy and when parallel building host-libnss/libnss we end up > with a failure thrown by make itself. So let's work-around this by don't > parallel build the package if Make version is 4.3. > Signed-off-by: Giulio Benetti Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 14:48:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:48:08 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-24 In-Reply-To: <78204a26-75d9-ef6a-bf7f-dee8b47fa508@benettiengineering.com> (Giulio Benetti's message of "Tue, 25 Jan 2022 08:09:07 +0100") References: <20220125070545.09FA6401E1@smtp2.osuosl.org> <78204a26-75d9-ef6a-bf7f-dee8b47fa508@benettiengineering.com> Message-ID: <87a6fih7tj.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Hi Peter, > On 25/01/22 08:05, Thomas Petazzoni wrote: > [SNIP] >> Detail of failures for 2021.11.x >> -------------------------------- >> >> arch | reason | OK? | url | orph? >> -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- >> microblazeel | libnss-3.73 | NOK | >> http://autobuild.buildroot.net/results/e02c7a0e22d8eee226e5c906537f7dfc559e067e >> | > This ^^^ is fixed by: > https://git.buildroot.net/buildroot/commit/?id=540029eb4550760c2190a18ecbf0cb4391bb1dea Thanks for the heads up, applied to 2021.11.x -- Bye, Peter Korsgaard From fperrad at gmail.com Wed Jan 26 14:55:02 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 26 Jan 2022 15:55:02 +0100 Subject: [Buildroot] [PATCH 1/2] package/lua: bump to version 5.4.4 Message-ID: <20220126145503.1032630-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/lua/5.4.3/lua.hash | 6 ------ package/lua/{5.4.3 => 5.4.4}/0001-root-path.patch | 0 package/lua/{5.4.3 => 5.4.4}/0002-shared-libs-for-lua.patch | 0 package/lua/{5.4.3 => 5.4.4}/0011-linenoise.patch | 2 +- package/lua/5.4.4/lua.hash | 6 ++++++ package/lua/lua.mk | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 package/lua/5.4.3/lua.hash rename package/lua/{5.4.3 => 5.4.4}/0001-root-path.patch (100%) rename package/lua/{5.4.3 => 5.4.4}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.4.3 => 5.4.4}/0011-linenoise.patch (97%) create mode 100644 package/lua/5.4.4/lua.hash diff --git a/package/lua/5.4.3/lua.hash b/package/lua/5.4.3/lua.hash deleted file mode 100644 index be3604837..000000000 --- a/package/lua/5.4.3/lua.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -md5 ef63ed2ecfb713646a7fcc583cf5f352 lua-5.4.3.tar.gz -sha1 1dda2ef23a9828492b4595c0197766de6e784bc7 lua-5.4.3.tar.gz - -# Locally computed -sha256 d205bfea131113bcdd64d4ebe4a50ce34063b42bad24b93e44b4b0d853ae4d49 doc/readme.html diff --git a/package/lua/5.4.3/0001-root-path.patch b/package/lua/5.4.4/0001-root-path.patch similarity index 100% rename from package/lua/5.4.3/0001-root-path.patch rename to package/lua/5.4.4/0001-root-path.patch diff --git a/package/lua/5.4.3/0002-shared-libs-for-lua.patch b/package/lua/5.4.4/0002-shared-libs-for-lua.patch similarity index 100% rename from package/lua/5.4.3/0002-shared-libs-for-lua.patch rename to package/lua/5.4.4/0002-shared-libs-for-lua.patch diff --git a/package/lua/5.4.3/0011-linenoise.patch b/package/lua/5.4.4/0011-linenoise.patch similarity index 97% rename from package/lua/5.4.3/0011-linenoise.patch rename to package/lua/5.4.4/0011-linenoise.patch index 7b9d6d76f..68316e108 100644 --- a/package/lua/5.4.3/0011-linenoise.patch +++ b/package/lua/5.4.4/0011-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -421,6 +421,14 @@ +@@ -428,6 +428,14 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) diff --git a/package/lua/5.4.4/lua.hash b/package/lua/5.4.4/lua.hash new file mode 100644 index 000000000..b55b17f25 --- /dev/null +++ b/package/lua/5.4.4/lua.hash @@ -0,0 +1,6 @@ +# Hashes from: https://www.lua.org/ftp/ +md5 bd8ce7069ff99a400efd14cf339a727b lua-5.4.4.tar.gz +sha1 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd lua-5.4.4.tar.gz + +# Locally computed +sha256 2556ac7198243f9f83130b9c81016e1904f7b30351481f1c28e02475dbd237fb doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 844e165df..09e7b34f7 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.3 +LUA_VERSION = 5.4.4 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else -- 2.32.0 From fperrad at gmail.com Wed Jan 26 14:55:03 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 26 Jan 2022 15:55:03 +0100 Subject: [Buildroot] [PATCH 2/2] package/lua: use Lua 5.4 as default In-Reply-To: <20220126145503.1032630-1-francois.perrad@gadz.org> References: <20220126145503.1032630-1-francois.perrad@gadz.org> Message-ID: <20220126145503.1032630-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/lua/Config.in | 2 +- support/testing/tests/package/test_lua.py | 4 ++-- support/testing/tests/package/test_lua_sdl2.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lua/Config.in b/package/lua/Config.in index 5d4cee5d5..309dd6eec 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" - default BR2_PACKAGE_LUA_5_3 + default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. diff --git a/support/testing/tests/package/test_lua.py b/support/testing/tests/package/test_lua.py index 573ae0100..9703dffbd 100644 --- a/support/testing/tests/package/test_lua.py +++ b/support/testing/tests/package/test_lua.py @@ -42,8 +42,8 @@ class TestLua(TestLuaBase): def test_run(self): self.login() - self.version_test('Lua 5.3') - self.g_version_test('Lua 5.3') + self.version_test('Lua 5.4') + self.g_version_test('Lua 5.4') class TestLuajit(TestLuaBase): diff --git a/support/testing/tests/package/test_lua_sdl2.py b/support/testing/tests/package/test_lua_sdl2.py index 22c4087f5..b9aad15f4 100644 --- a/support/testing/tests/package/test_lua_sdl2.py +++ b/support/testing/tests/package/test_lua_sdl2.py @@ -5,6 +5,7 @@ class TestLuaLuaSDL2(TestLuaBase): config = TestLuaBase.config + \ """ BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_5_3=y BR2_PACKAGE_LUA_SDL2=y BR2_PACKAGE_SDL2_IMAGE=y BR2_PACKAGE_SDL2_MIXER=y -- 2.32.0 From jborne at kalray.eu Wed Jan 26 15:30:44 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Wed, 26 Jan 2022 16:30:44 +0100 (CET) Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <20220124225356.03c1c658@windsurf> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> <20220124212149.GJ2502@scaer> <20220124225356.03c1c658@windsurf> Message-ID: <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> Hi again, thank you very much for your answers! ----- On Jan 24, 2022, at 10:53 PM, Thomas Petazzoni thomas.petazzoni at bootlin.com wrote: > On Mon, 24 Jan 2022 22:21:49 +0100 > "Yann E. MORIN" wrote: > >> > # We just want libbfd, libiberty and libopcodes, >> > # not the full-blown binutils in staging >> > define BINUTILS_INSTALL_STAGING_CMDS >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install >> > endef >> > >> > # If we don't want full binutils on target >> > ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) >> > define BINUTILS_INSTALL_TARGET_CMDS >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install >> > endef >> > endif >> > >> > This is *extremely* suspicious. Indeed, we get the libraries >> > unconditionally installed in staging, so any other library or program >> > that we build after binutils can potentially link against thosze >> > libraries. >> > >> > But we only install them conditionally in $(TARGET_DIR) if >> > BR2_PACKAGE_BINUTILS_TARGET=y. >> > >> > This seems very bad to me. Both target and staging installations should >> > be done under the same condition. >> >> Not really. You missed the fact that binutils is an autotools package. >> >> As such, when BR2_PACKAGE_BINUTILS_TARGET=n, then the full binutils are >> instaleld in target, so the libs will be installed in target. I think you made a typo here... The full binutils install to target is made when BR2_PACKAGE_BINUTILS_TARGET=y. > > Aah, indeed, the condition is: > > ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > Double negation is a bit confusing indeed, maybe the message could be changed to # If we don't want full binutils on target ifeq ($(BR2_PACKAGE_BINUTILS_TARGET),n) >> So whatever gets in staging is present in target, but target can be a >> superset of what is in staging, so whatever links to a binutils lib from >> staging will find it in target. Agreed! So if I understand correctly, as was suggested by Romain and Thomas, we could indeed get rid of $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install in BINUTILS_INSTALL_TARGET_CMDS. Thanks again Best Regards. Jonathan. From thomas.petazzoni at bootlin.com Wed Jan 26 15:52:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 16:52:49 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> <20220124212149.GJ2502@scaer> <20220124225356.03c1c658@windsurf> <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> Message-ID: <20220126165249.0445bdc9@windsurf> On Wed, 26 Jan 2022 16:30:44 +0100 (CET) Jonathan Borne wrote: > Double negation is a bit confusing indeed, > maybe the message could be changed to > > # If we don't want full binutils on target > ifeq ($(BR2_PACKAGE_BINUTILS_TARGET),n) This is never going to be true, as disabled options have an empty value. To work, it should be: ifeq ($(BR2_PACKAGE_BINUTILS_TARGET),) > Agreed! So if I understand correctly, as was suggested by Romain and Thomas, > we could indeed get rid of > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > in BINUTILS_INSTALL_TARGET_CMDS. Yes! Thanks, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From giulio.benetti at benettiengineering.com Wed Jan 26 16:55:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 26 Jan 2022 17:55:12 +0100 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: refactoring, bump Linux and U-Boot versions In-Reply-To: <20220126051808.26581-1-kuzminov.sergey81@gmail.com> References: <20220126051808.26581-1-kuzminov.sergey81@gmail.com> Message-ID: <392822cd-0b96-fa58-39bb-9834fb0f6be5@benettiengineering.com> Hi Sergey, All, On 26/01/22 06:18, Sergey Kuzminov wrote: > Changelog: > - Refactoring configs/orangepi_zero_defconfig. > - Linux: bump to version 5.15.16 (from 5.12.2). > - U-Boot: bump to version 2022.01 (from 2021.04). > > Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Only built successfully] Best regards -- Giulio Benetti Benetti Engineering sas > --- > ...ux-extras.config => linux-extras.fragment} | 0 > configs/orangepi_zero_defconfig | 32 +++++++++++++------ > 2 files changed, 22 insertions(+), 10 deletions(-) > rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) > > diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment > similarity index 100% > rename from board/orangepi/orangepi-zero/linux-extras.config > rename to board/orangepi/orangepi-zero/linux-extras.fragment > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..5aaa1566c5 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,49 +1,61 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_VFPV4=y > -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > + > +# System > BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_SYSTEM_DHCP="eth0" > + > +# Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" > BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > + > +# Required tools to create the SD image > BR2_PACKAGE_HOST_UBOOT_TOOLS=y > BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > + > +# Image > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > > -# wireless driver and firmware > +# Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > BR2_PACKAGE_ARMBIAN_FIRMWARE=y > BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y > > -# wireless support > +# Wireless support > BR2_PACKAGE_IW=y > BR2_PACKAGE_WIRELESS_TOOLS=y > BR2_PACKAGE_WIRELESS_TOOLS_LIB=y > @@ -51,5 +63,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > > -# spi flash support > +# Spi flash support > BR2_PACKAGE_MTD=y From yann.morin.1998 at free.fr Wed Jan 26 17:14:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 18:14:50 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> <20220124212149.GJ2502@scaer> <20220124225356.03c1c658@windsurf> <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> Message-ID: <20220126171450.GI457876@scaer> Jonathan, All, On 2022-01-26 16:30 +0100, Jonathan Borne via buildroot spake thusly: > ----- On Jan 24, 2022, at 10:53 PM, Thomas Petazzoni thomas.petazzoni at bootlin.com wrote: > > On Mon, 24 Jan 2022 22:21:49 +0100 > > "Yann E. MORIN" wrote: > >> As such, when BR2_PACKAGE_BINUTILS_TARGET=n, then the full binutils are > >> instaleld in target, so the libs will be installed in target. > I think you made a typo here... > The full binutils install to target is made when BR2_PACKAGE_BINUTILS_TARGET=y. Hehe... ;-) > >> So whatever gets in staging is present in target, but target can be a > >> superset of what is in staging, so whatever links to a binutils lib from > >> staging will find it in target. > > Agreed! So if I understand correctly, as was suggested by Romain and Thomas, > we could indeed get rid of > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > in BINUTILS_INSTALL_TARGET_CMDS. Yes, but to avoid any confusion, please also add a comment above the staging installation commands that states that libiberty is static only, as Baruch pointed out earlier. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 26 17:01:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 18:01:08 +0100 Subject: [Buildroot] [git commit] support/testing: add test for python-gnupg Message-ID: <20220126173505.B4714812BF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a79397fc5f6eb82805dbdff173d7f8cbfaea186 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit add a simple test doing symmetric encryption/decryption to check this python interface with the gpg binary is working fine. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ .../testing/tests/package/sample_python_gnupg.py | 24 ++++++++++++++++++++++ support/testing/tests/package/test_python_gnupg.py | 21 +++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dc810b6fe1..1d729e5ce4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,8 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ +F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/test_python_gnupg.py N: Julien Viard de Galbert F: package/dieharder/ diff --git a/support/testing/tests/package/sample_python_gnupg.py b/support/testing/tests/package/sample_python_gnupg.py new file mode 100644 index 0000000000..b5b718a8cb --- /dev/null +++ b/support/testing/tests/package/sample_python_gnupg.py @@ -0,0 +1,24 @@ +import gnupg + +gpg = gnupg.GPG(verbose=True) + +plain_data = "Some plain text data" +good_passphrase = "Good Passphrase" + +# Test Encrypt +result = gpg.encrypt(plain_data, None, passphrase=good_passphrase, symmetric=True) +assert(result.returncode == 0) +enc_data = str(result) +assert(enc_data != plain_data) + +# Test Good Decrypt +result = gpg.decrypt(enc_data, passphrase=good_passphrase) +assert(result.returncode == 0) +dec_data = str(result) +assert(dec_data == plain_data) + +# Test Bad Decrypt +result = gpg.decrypt(enc_data, passphrase='A Wrong Passphrase') +assert(result.returncode != 0) +dec_data = str(result) +assert(dec_data != plain_data) diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py new file mode 100644 index 0000000000..0c71f6b6d0 --- /dev/null +++ b/support/testing/tests/package/test_python_gnupg.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2GnuPG(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_GNUPG=y + """ + sample_scripts = ["tests/package/sample_python_gnupg.py"] + + +class TestPythonPy3GnuPG(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_GNUPG=y + """ + sample_scripts = ["tests/package/sample_python_gnupg.py"] From yann.morin.1998 at free.fr Wed Jan 26 17:42:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 18:42:18 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add test for python-gnupg In-Reply-To: <20220116104114.103601-1-ju.o@free.fr> References: <20220116104114.103601-1-ju.o@free.fr> Message-ID: <20220126174218.GJ457876@scaer> Julien, All, On 2022-01-16 11:41 +0100, Julien Olivain spake thusly: > This commit add a simple test doing symmetric encryption/decryption > to check this python interface with the gpg binary is working fine. > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 2 ++ > .../tests/package/sample_python_gnupg.py | 24 +++++++++++++++++++ > .../tests/package/test_python_gnupg.py | 21 ++++++++++++++++ > 3 files changed, 47 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_gnupg.py > create mode 100644 support/testing/tests/package/test_python_gnupg.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index a91e2dfcde..e038941b3b 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1611,6 +1611,8 @@ F: package/python-distro/ > F: package/python-gnupg/ > F: package/python-pyalsa/ > F: package/riscv-isa-sim/ > +F: support/testing/tests/package/sample_python_gnupg.py > +F: support/testing/tests/package/test_python_gnupg.py > > N: Julien Viard de Galbert > F: package/dieharder/ > diff --git a/support/testing/tests/package/sample_python_gnupg.py b/support/testing/tests/package/sample_python_gnupg.py > new file mode 100644 > index 0000000000..b5b718a8cb > --- /dev/null > +++ b/support/testing/tests/package/sample_python_gnupg.py > @@ -0,0 +1,24 @@ > +import gnupg > + > +gpg = gnupg.GPG(verbose=True) > + > +plain_data = "Some plain text data" > +good_passphrase = "Good Passphrase" > + > +# Test Encrypt > +result = gpg.encrypt(plain_data, None, passphrase=good_passphrase, symmetric=True) > +assert(result.returncode == 0) > +enc_data = str(result) > +assert(enc_data != plain_data) > + > +# Test Good Decrypt > +result = gpg.decrypt(enc_data, passphrase=good_passphrase) > +assert(result.returncode == 0) > +dec_data = str(result) > +assert(dec_data == plain_data) > + > +# Test Bad Decrypt > +result = gpg.decrypt(enc_data, passphrase='A Wrong Passphrase') > +assert(result.returncode != 0) > +dec_data = str(result) > +assert(dec_data != plain_data) > diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py > new file mode 100644 > index 0000000000..0c71f6b6d0 > --- /dev/null > +++ b/support/testing/tests/package/test_python_gnupg.py > @@ -0,0 +1,21 @@ > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy2GnuPG(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON=y > + BR2_PACKAGE_PYTHON_GNUPG=y > + """ > + sample_scripts = ["tests/package/sample_python_gnupg.py"] > + > + > +class TestPythonPy3GnuPG(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_GNUPG=y > + """ > + sample_scripts = ["tests/package/sample_python_gnupg.py"] > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Wed Jan 26 17:44:40 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 26 Jan 2022 10:44:40 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency In-Reply-To: <87v8y6h8c7.fsf@dell.be.48ers.dk> References: <20220101000408.1538099-1-james.hilliard1@gmail.com> <87v8y6h8c7.fsf@dell.be.48ers.dk> Message-ID: On Wed, Jan 26, 2022 at 7:36 AM Peter Korsgaard wrote: > > >>>>> "James" == James Hilliard writes: > > > Fixes: > > File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in > > File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in > > File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in > > ModuleNotFoundError: No module named 'aiosignal' > > > Signed-off-by: James Hilliard > > When was this introduced? Do we need to backport this to 2021.02.x / > 2021.11.x? Looks like it's required for aiohttp v3.8.0 and newer, so we shouldn't need to backport. > > -- > Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 18:36:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 19:36:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency In-Reply-To: (James Hilliard's message of "Wed, 26 Jan 2022 10:44:40 -0700") References: <20220101000408.1538099-1-james.hilliard1@gmail.com> <87v8y6h8c7.fsf@dell.be.48ers.dk> Message-ID: <87sftafiov.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > On Wed, Jan 26, 2022 at 7:36 AM Peter Korsgaard wrote: >> >> >>>>> "James" == James Hilliard writes: >> >> > Fixes: >> > File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in >> > File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in >> > File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in >> > ModuleNotFoundError: No module named 'aiosignal' >> >> > Signed-off-by: James Hilliard >> >> When was this introduced? Do we need to backport this to 2021.02.x / >> 2021.11.x? > Looks like it's required for aiohttp v3.8.0 and newer, so we shouldn't > need to backport. Ok, great. It is quite helpful to mention such things in the commit messages. -- Bye, Peter Korsgaard From ps.report at gmx.net Wed Jan 26 19:34:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 26 Jan 2022 20:34:31 +0100 Subject: [Buildroot] [PATCH v1] package/binutils: add upstream patch for v2.37 fixing linking of thin archives Message-ID: <20220126193431.17777-1-ps.report@gmx.net> Add upstream patch ([1]) for v2.37 fixing linkig of thin archives (see [2] for details). Fixes: .../host/bin/arm-buildroot-linux-gnueabihf-g++ [...] -o libQt5WebEngineCore.so.5.15.2 [...] .../arm-buildroot-linux-gnueabihf/bin/ld: .../build/qt5webengine-5.15.2/src/core/release/obj/third_party/boringssl/libboringssl.a: error adding symbols: malformed archive collect2: error: ld returned 1 exit status make[5]: *** [Makefile.core_module:90: ../../lib/libQt5WebEngineCore.so.5.15.2] Error 1 make[4]: *** [Makefile:124: sub-core_module-pro-make_first] Error 2 make[3]: *** [Makefile:79: sub-core-make_first] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: .../build/qt5webengine-5.15.2/.stamp_built] Error 2 make: *** [Makefile:23: _all] Error 2 [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0 [2] https://sourceware.org/bugzilla/show_bug.cgi?id=28138 Signed-off-by: Peter Seiderer --- Notes: - maybe the same failure as http://autobuild.buildroot.net/results/55c3c66c6c909853d47a470e0bbbab7186c83793 .../host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-gnu/11.2.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: src/intel/dev/libintel_dev.a: error adding symbols: malformed archive with BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y --- ...le-descriptor-if-there-is-no-archive.patch | 236 ++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch diff --git a/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch new file mode 100644 index 0000000000..46697cc5c8 --- /dev/null +++ b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch @@ -0,0 +1,236 @@ +From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 26 Jul 2021 05:59:55 -0700 +Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd + +Close the file descriptor if there is no archive plugin file descriptor +to avoid running out of file descriptors on thin archives with many +archive members. + +bfd/ + + PR ld/28138 + * plugin.c (bfd_plugin_close_file_descriptor): Close the file + descriptor there is no archive plugin file descriptor. + +ld/ + + PR ld/28138 + * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for + native build. + + PR ld/28138 + * testsuite/ld-plugin/lto.exp: Run ld/28138 tests. + * testsuite/ld-plugin/pr28138.c: New file. + * testsuite/ld-plugin/pr28138-1.c: Likewise. + * testsuite/ld-plugin/pr28138-2.c: Likewise. + * testsuite/ld-plugin/pr28138-3.c: Likewise. + * testsuite/ld-plugin/pr28138-4.c: Likewise. + * testsuite/ld-plugin/pr28138-5.c: Likewise. + * testsuite/ld-plugin/pr28138-6.c: Likewise. + * testsuite/ld-plugin/pr28138-7.c: Likewise. + +(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742) +(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2) + +[Upstream: + https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0] +Signed-off-by: Peter Seiderer +--- + bfd/plugin.c | 8 +++++++ + ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++ + ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++ + 10 files changed, 104 insertions(+) + create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c + create mode 100644 ld/testsuite/ld-plugin/pr28138.c + +diff --git a/bfd/plugin.c b/bfd/plugin.c +index 6cfa2b66470..3bab8febe88 100644 +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd) + && !bfd_is_thin_archive (abfd->my_archive)) + abfd = abfd->my_archive; + ++ /* Close the file descriptor if there is no archive plugin file ++ descriptor. */ ++ if (abfd->archive_plugin_fd == -1) ++ { ++ close (fd); ++ return; ++ } ++ + abfd->archive_plugin_fd_open_count--; + /* Dup the archive plugin file descriptor for later use, which + will be closed by _bfd_archive_close_and_cleanup. */ +diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp +index def69e43ab3..999d911ce6a 100644 +--- a/ld/testsuite/ld-plugin/lto.exp ++++ b/ld/testsuite/ld-plugin/lto.exp +@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } { + } + } + ++run_cc_link_tests [list \ ++ [list \ ++ "Build pr28138.a" \ ++ "-T" "" \ ++ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \ ++ pr28138-6.c pr28138-7.c} {} "pr28138.a" \ ++ ] \ ++ [list \ ++ "Build pr28138.o" \ ++ "" "" \ ++ {pr28138.c} {} \ ++ ] \ ++] ++ ++set exec_output [run_host_cmd "sh" \ ++ "-c \"ulimit -n 20; \ ++ $CC -Btmpdir/ld -o tmpdir/pr28138 \ ++ tmpdir/pr28138.o tmpdir/pr28138.a\""] ++set exec_output [prune_warnings $exec_output] ++if [string match "" $exec_output] then { ++ if { [isnative] } { ++ set exec_output [run_host_cmd "tmpdir/pr28138" ""] ++ if [string match "PASS" $exec_output] then { ++ pass "PR ld/28138" ++ } else { ++ fail "PR ld/28138" ++ } ++ } else { ++ pass "PR ld/28138" ++ } ++} else { ++ fail "PR ld/28138" ++} ++ + set testname "Build liblto-11.a" + remote_file host delete "tmpdir/liblto-11.a" + set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] +diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c +new file mode 100644 +index 00000000000..51d119e1642 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-1.c +@@ -0,0 +1,6 @@ ++extern int a0(void); ++int ++a1(void) ++{ ++ return 1 + a0(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c +new file mode 100644 +index 00000000000..1120cd797e9 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-2.c +@@ -0,0 +1,6 @@ ++extern int a1(void); ++int ++a2(void) ++{ ++ return 1 + a1(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c +new file mode 100644 +index 00000000000..ec464947ee6 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-3.c +@@ -0,0 +1,6 @@ ++extern int a2(void); ++int ++a3(void) ++{ ++ return 1 + a2(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c +new file mode 100644 +index 00000000000..475701b2c5c +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-4.c +@@ -0,0 +1,6 @@ ++extern int a3(void); ++int ++a4(void) ++{ ++ return 1 + a3(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c +new file mode 100644 +index 00000000000..e24f86c363e +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-5.c +@@ -0,0 +1,6 @@ ++extern int a4(void); ++int ++a5(void) ++{ ++ return 1 + a4(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c +new file mode 100644 +index 00000000000..b5b938bdb21 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-6.c +@@ -0,0 +1,6 @@ ++extern int a5(void); ++int ++a6(void) ++{ ++ return 1 + a5(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c +new file mode 100644 +index 00000000000..4ef75bf0f0c +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-7.c +@@ -0,0 +1,6 @@ ++extern int a6(void); ++int ++a7(void) ++{ ++ return 1 + a6(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c +new file mode 100644 +index 00000000000..68252c9f382 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138.c +@@ -0,0 +1,20 @@ ++#include ++ ++extern int a7(void); ++ ++int ++a0(void) ++{ ++ return 0; ++} ++ ++int ++main() ++{ ++ if (a7() == 7) ++ { ++ printf ("PASS\n"); ++ return 0; ++ } ++ return 1; ++} +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Wed Jan 26 20:00:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:00:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: fix avahi build In-Reply-To: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 1 Jan 2022 15:26:16 +0100") References: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> Message-ID: <87o83yfesx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since commit > 27908c6eab768d0b9fd3444a929b3f1b1510da71: > ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency > "avahi-client" not found, tried pkgconfig > Fixes: > - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:03:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:03:17 +0100 Subject: [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency In-Reply-To: <20220101223900.2970405-1-who+buildroot@cnackers.org> (Erik Larsson's message of "Sat, 1 Jan 2022 23:38:58 +0100") References: <20220101223900.2970405-1-who+buildroot@cnackers.org> Message-ID: <87k0emfenu.fsf@dell.be.48ers.dk> >>>>> "Erik" == Erik Larsson writes: > The last reference of uriparser was removed in: > https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e > Signed-off-by: Erik Larsson Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:03:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:03:45 +0100 Subject: [Buildroot] [git commit] paclage/tpm2-tss: do not select liburiparser In-Reply-To: <20220119202333.5A504832B5@busybox.osuosl.org> (Yann E. MORIN's message of "Wed, 19 Jan 2022 21:28:02 +0100") References: <20220119202333.5A504832B5@busybox.osuosl.org> Message-ID: <87fspafen2.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=cbb70493af20445fbd24de4c5a15ba0de7f27c6e > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Commit 593683b45f72 (package/tpm2-tss: remove unused dependency) > removed the build-time dependency (in the .mk), but forgot to > remove it from the Config.in. > Signed-off-by: Tilman Keskin?z > [yann.morin.1998 at free.fr: reword commit log] > Signed-off-by: Yann E. MORIN Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:02:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:02:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tpm2-tss: remove unused dependency Message-ID: <20220126195820.25E928140B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47b28bb6ad65ed97bcdf7c245b06931f51662f71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The last reference of uriparser was removed in: https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e Signed-off-by: Erik Larsson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 593683b45f72169dd94ec14fa18720b3cec9dda4) Signed-off-by: Peter Korsgaard --- package/tpm2-tss/tpm2-tss.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 71aa3feb96..060883c377 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES From peter at korsgaard.com Wed Jan 26 19:59:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 20:59:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pipewire: fix avahi build Message-ID: <20220126195820.191DD81503@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf791f4051576d7175dd63db5c14320ed5cbca4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure raised since commit 27908c6eab768d0b9fd3444a929b3f1b1510da71: ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency "avahi-client" not found, tried pkgconfig Fixes: - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f5131f6f28e384eb9dca1b11f571536e38d3ee9d) Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index efda3ad695..7043745cc1 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -82,7 +82,8 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# avahi support needs avahi-client, which needs avahi-daemon and dbus +ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else From peter at korsgaard.com Wed Jan 26 20:02:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:02:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] paclage/tpm2-tss: do not select liburiparser Message-ID: <20220126195820.2E7C782879@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1256840581a4a8256929b7a30f7ce8931a87693 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 593683b45f72 (package/tpm2-tss: remove unused dependency) removed the build-time dependency (in the .mk), but forgot to remove it from the Config.in. Signed-off-by: Tilman Keskin??z [yann.morin.1998 at free.fr: reword commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit cbb70493af20445fbd24de4c5a15ba0de7f27c6e) Signed-off-by: Peter Korsgaard --- package/tpm2-tss/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2fc56dbd76..857987ae36 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help From peter at korsgaard.com Wed Jan 26 20:07:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:07:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 1 Jan 2022 23:59:06 +0100") References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> Message-ID: <87bkzyfehm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > The LXC 4.0 branch is supported until June 2025. > Only bugfixes and securitiy issues get included into the stable bugfix > releases, so it's always safe and recommended to keep up and run the > latest bugfix release. > https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:06:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:06:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lxc: bump to version 4.0.11 Message-ID: <20220126200013.AD1CB8110A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3650dfb892fd85205dca7c563ab50b355d316d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The LXC 4.0 branch is supported until June 2025. Only bugfixes and securitiy issues get included into the stable bugfix releases, so it's always safe and recommended to keep up and run the latest bugfix release. https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 97a504ed30dbeaca4704cbac8699d98ce7f26102) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index efd7a8e42c..2b58df2f1d 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 93f6d2535f..4d63fc14cb 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.10 +LXC_VERSION = 4.0.11 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From peter at korsgaard.com Wed Jan 26 20:06:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:06:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lxc: bump to version 4.0.11 Message-ID: <20220126200102.1502782153@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23b5ad969c17c2cfe3b3eee5f184e38e351ee392 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The LXC 4.0 branch is supported until June 2025. Only bugfixes and securitiy issues get included into the stable bugfix releases, so it's always safe and recommended to keep up and run the latest bugfix release. https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 97a504ed30dbeaca4704cbac8699d98ce7f26102) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index efd7a8e42c..2b58df2f1d 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 93f6d2535f..4d63fc14cb 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.10 +LXC_VERSION = 4.0.11 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From james.hilliard1 at gmail.com Wed Jan 26 20:09:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 26 Jan 2022 13:09:24 -0700 Subject: [Buildroot] [PATCH v1] package/binutils: add upstream patch for v2.37 fixing linking of thin archives In-Reply-To: <20220126193431.17777-1-ps.report@gmx.net> References: <20220126193431.17777-1-ps.report@gmx.net> Message-ID: On Wed, Jan 26, 2022 at 12:34 PM Peter Seiderer wrote: > > Add upstream patch ([1]) for v2.37 fixing linkig of thin archives (see [2] for > details). > > Fixes: > > .../host/bin/arm-buildroot-linux-gnueabihf-g++ [...] -o libQt5WebEngineCore.so.5.15.2 [...] > .../arm-buildroot-linux-gnueabihf/bin/ld: .../build/qt5webengine-5.15.2/src/core/release/obj/third_party/boringssl/libboringssl.a: error adding symbols: malformed archive > collect2: error: ld returned 1 exit status > make[5]: *** [Makefile.core_module:90: ../../lib/libQt5WebEngineCore.so.5.15.2] Error 1 > make[4]: *** [Makefile:124: sub-core_module-pro-make_first] Error 2 > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 > make[1]: *** [package/pkg-generic.mk:295: .../build/qt5webengine-5.15.2/.stamp_built] Error 2 > make: *** [Makefile:23: _all] Error 2 > > [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0 > [2] https://sourceware.org/bugzilla/show_bug.cgi?id=28138 > > Signed-off-by: Peter Seiderer Reviewed-by: James Hilliard > --- > Notes: > - maybe the same failure as > > http://autobuild.buildroot.net/results/55c3c66c6c909853d47a470e0bbbab7186c83793 > > .../host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-gnu/11.2.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: src/intel/dev/libintel_dev.a: error adding symbols: malformed archive > > with BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y > --- > ...le-descriptor-if-there-is-no-archive.patch | 236 ++++++++++++++++++ > 1 file changed, 236 insertions(+) > create mode 100644 package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch > > diff --git a/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch > new file mode 100644 > index 0000000000..46697cc5c8 > --- /dev/null > +++ b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch > @@ -0,0 +1,236 @@ > +From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001 > +From: "H.J. Lu" > +Date: Mon, 26 Jul 2021 05:59:55 -0700 > +Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd > + > +Close the file descriptor if there is no archive plugin file descriptor > +to avoid running out of file descriptors on thin archives with many > +archive members. > + > +bfd/ > + > + PR ld/28138 > + * plugin.c (bfd_plugin_close_file_descriptor): Close the file > + descriptor there is no archive plugin file descriptor. > + > +ld/ > + > + PR ld/28138 > + * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for > + native build. > + > + PR ld/28138 > + * testsuite/ld-plugin/lto.exp: Run ld/28138 tests. > + * testsuite/ld-plugin/pr28138.c: New file. > + * testsuite/ld-plugin/pr28138-1.c: Likewise. > + * testsuite/ld-plugin/pr28138-2.c: Likewise. > + * testsuite/ld-plugin/pr28138-3.c: Likewise. > + * testsuite/ld-plugin/pr28138-4.c: Likewise. > + * testsuite/ld-plugin/pr28138-5.c: Likewise. > + * testsuite/ld-plugin/pr28138-6.c: Likewise. > + * testsuite/ld-plugin/pr28138-7.c: Likewise. > + > +(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742) > +(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2) > + > +[Upstream: > + https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0] > +Signed-off-by: Peter Seiderer > +--- > + bfd/plugin.c | 8 +++++++ > + ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++ > + ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++ > + 10 files changed, 104 insertions(+) > + create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138.c > + > +diff --git a/bfd/plugin.c b/bfd/plugin.c > +index 6cfa2b66470..3bab8febe88 100644 > +--- a/bfd/plugin.c > ++++ b/bfd/plugin.c > +@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd) > + && !bfd_is_thin_archive (abfd->my_archive)) > + abfd = abfd->my_archive; > + > ++ /* Close the file descriptor if there is no archive plugin file > ++ descriptor. */ > ++ if (abfd->archive_plugin_fd == -1) > ++ { > ++ close (fd); > ++ return; > ++ } > ++ > + abfd->archive_plugin_fd_open_count--; > + /* Dup the archive plugin file descriptor for later use, which > + will be closed by _bfd_archive_close_and_cleanup. */ > +diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp > +index def69e43ab3..999d911ce6a 100644 > +--- a/ld/testsuite/ld-plugin/lto.exp > ++++ b/ld/testsuite/ld-plugin/lto.exp > +@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } { > + } > + } > + > ++run_cc_link_tests [list \ > ++ [list \ > ++ "Build pr28138.a" \ > ++ "-T" "" \ > ++ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \ > ++ pr28138-6.c pr28138-7.c} {} "pr28138.a" \ > ++ ] \ > ++ [list \ > ++ "Build pr28138.o" \ > ++ "" "" \ > ++ {pr28138.c} {} \ > ++ ] \ > ++] > ++ > ++set exec_output [run_host_cmd "sh" \ > ++ "-c \"ulimit -n 20; \ > ++ $CC -Btmpdir/ld -o tmpdir/pr28138 \ > ++ tmpdir/pr28138.o tmpdir/pr28138.a\""] > ++set exec_output [prune_warnings $exec_output] > ++if [string match "" $exec_output] then { > ++ if { [isnative] } { > ++ set exec_output [run_host_cmd "tmpdir/pr28138" ""] > ++ if [string match "PASS" $exec_output] then { > ++ pass "PR ld/28138" > ++ } else { > ++ fail "PR ld/28138" > ++ } > ++ } else { > ++ pass "PR ld/28138" > ++ } > ++} else { > ++ fail "PR ld/28138" > ++} > ++ > + set testname "Build liblto-11.a" > + remote_file host delete "tmpdir/liblto-11.a" > + set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] > +diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c > +new file mode 100644 > +index 00000000000..51d119e1642 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-1.c > +@@ -0,0 +1,6 @@ > ++extern int a0(void); > ++int > ++a1(void) > ++{ > ++ return 1 + a0(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c > +new file mode 100644 > +index 00000000000..1120cd797e9 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-2.c > +@@ -0,0 +1,6 @@ > ++extern int a1(void); > ++int > ++a2(void) > ++{ > ++ return 1 + a1(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c > +new file mode 100644 > +index 00000000000..ec464947ee6 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-3.c > +@@ -0,0 +1,6 @@ > ++extern int a2(void); > ++int > ++a3(void) > ++{ > ++ return 1 + a2(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c > +new file mode 100644 > +index 00000000000..475701b2c5c > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-4.c > +@@ -0,0 +1,6 @@ > ++extern int a3(void); > ++int > ++a4(void) > ++{ > ++ return 1 + a3(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c > +new file mode 100644 > +index 00000000000..e24f86c363e > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-5.c > +@@ -0,0 +1,6 @@ > ++extern int a4(void); > ++int > ++a5(void) > ++{ > ++ return 1 + a4(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c > +new file mode 100644 > +index 00000000000..b5b938bdb21 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-6.c > +@@ -0,0 +1,6 @@ > ++extern int a5(void); > ++int > ++a6(void) > ++{ > ++ return 1 + a5(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c > +new file mode 100644 > +index 00000000000..4ef75bf0f0c > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-7.c > +@@ -0,0 +1,6 @@ > ++extern int a6(void); > ++int > ++a7(void) > ++{ > ++ return 1 + a6(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c > +new file mode 100644 > +index 00000000000..68252c9f382 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138.c > +@@ -0,0 +1,20 @@ > ++#include > ++ > ++extern int a7(void); > ++ > ++int > ++a0(void) > ++{ > ++ return 0; > ++} > ++ > ++int > ++main() > ++{ > ++ if (a7() == 7) > ++ { > ++ printf ("PASS\n"); > ++ return 0; > ++ } > ++ return 1; > ++} > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Wed Jan 26 20:09:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:09:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiio: set PYTHON_EXECUTABLE In-Reply-To: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 2 Jan 2022 18:43:29 +0100") References: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> Message-ID: <877damfed0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set PYTHON_EXECUTABLE to avoid the following build failure when > BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without > setuptools on host: > -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter > -- new > -- Python_EXECUTABLE /usr/bin/python3.5 > [...] > Traceback (most recent call last): > File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in > from setuptools import setup > ImportError: No module named 'setuptools' > Fixes: > - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:08:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:08:57 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libiio: set PYTHON_EXECUTABLE Message-ID: <20220126200310.3BD4781346@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2686b22bc5254163519974fc85f85f609ac0a363 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Set PYTHON_EXECUTABLE to avoid the following build failure when BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without setuptools on host: -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter -- new -- Python_EXECUTABLE /usr/bin/python3.5 [...] Traceback (most recent call last): File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in from setuptools import setup ImportError: No module named 'setuptools' Fixes: - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 Signed-off-by: Fabrice Fontaine Acked-by: Paul Cercueil Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f384de4f4ec646c28dab6c442dd6bb2f06628725) Signed-off-by: Peter Korsgaard --- package/libiio/libiio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index f706298c22..38b2f83e6e 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -76,8 +76,10 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) ifeq ($(BR2_PACKAGE_PYTHON),y) LIBIIO_DEPENDENCIES += host-python-setuptools python +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python else ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 endif LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON else From peter at korsgaard.com Wed Jan 26 20:13:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:13:36 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-pyqt5: Fix parallel build In-Reply-To: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> (Florent AUMAITRE's message of "Mon, 3 Jan 2022 17:54:51 +0100") References: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> Message-ID: <8735lafe6n.fsf@dell.be.48ers.dk> >>>>> "Florent" == Florent AUMAITRE writes: > This patch fix build of python-pyqt5 package when parallel build is used > Signed-off-by: Florent AUMAITRE > Changes v1 -> v2: > - Re-use the existing QT5_INSTALL_QT_CONF macro from package/qt5/qt5.mk (suggested by Thomas Petazzoni) > Signed-off-by: Florent AUMAITRE Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:12:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:12:34 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-pyqt5: Fix per-package build Message-ID: <20220126200652.083F58255D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eed125b1ca46965f43ffe699b3c307ab496c0835 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x pyqt5 uses qmake internally, but is python package rather than a qmake package. Therefore, we need to manually apply the same fixup as for qmake packages. Without this, top-level parallel build may fail because dependencies are looked for in the qt5 per-package staging directory instead of the python-pyqt5 one. Signed-off-by: Florent AUMAITRE Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 51c22b4ba905f8e0a0f75189715eab628cefab6c) Signed-off-by: Peter Korsgaard --- package/python-pyqt5/python-pyqt5.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 8f28c90d15..b05043563e 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL ) endef +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP + PYTHON_PYQT5_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ From peter at korsgaard.com Wed Jan 26 20:12:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:12:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-pyqt5: Fix per-package build Message-ID: <20220126200700.06ADD8255D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19fdc1367a16931e69fe9e3b07f37119eeae1589 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x pyqt5 uses qmake internally, but is python package rather than a qmake package. Therefore, we need to manually apply the same fixup as for qmake packages. Without this, top-level parallel build may fail because dependencies are looked for in the qt5 per-package staging directory instead of the python-pyqt5 one. Signed-off-by: Florent AUMAITRE Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 51c22b4ba905f8e0a0f75189715eab628cefab6c) Signed-off-by: Peter Korsgaard --- package/python-pyqt5/python-pyqt5.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 8f28c90d15..b05043563e 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL ) endef +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP + PYTHON_PYQT5_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ From peter at korsgaard.com Wed Jan 26 20:20:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:20:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mutt: bump to version 2.1.5 Message-ID: <20220126201335.91706817EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=896791904c14ada0b0960dc899f9491b6b045bc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, fixing two SMTP authentication issues, a crash bug on NetBSD, and a couple other issues. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit db156d693a54fadb43f6b487902ae6795477921f) Signed-off-by: Peter Korsgaard --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index dceae57b65..d439b23aa3 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz +sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 44d7864eb6..7e9046fe8a 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.4 +MUTT_VERSION = 2.1.5 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From peter at korsgaard.com Wed Jan 26 20:20:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:20:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: bump to version 2.1.5 In-Reply-To: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 19:25:08 +0100") References: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> Message-ID: <87y232dzaa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, > fixing two SMTP authentication issues, a crash bug on NetBSD, and a > couple other issues. > https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Wed Jan 26 20:22:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 21:22:36 +0100 Subject: [Buildroot] [PATCH] package/polkit: bump to fix CVE-2021-4034 Message-ID: <20220126202236.1399934-1-yann.morin.1998@free.fr> We are currently using the fork by Adam, with support for duktape as a JS engine. But upstream has finally merged that just a day ago. Woohoo! Between the fork we were using and upstream, there are very little changes, mostly centered around: - translations - buildsystem - duktape - CVE-2021-4034 So, we just switch to using the HEAD of the repo: it has not much more than the two important changes: duktape and the CVE fix. Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine --- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index f108ac19ec..1fedb5a707 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz +sha256 243fa69d1e480510c504723487716cda7d6fb588360c7c8f7ec6ba4a3f6ae60e polkit-a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index a7ab725c81..61666594a2 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,13 +4,16 @@ # ################################################################################ -POLKIT_VERSION = 0.120 -POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) +POLKIT_VERSION = a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_INSTALL_STAGING = YES +# Fix was comitted in a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) -- 2.25.1 From fontaine.fabrice at gmail.com Wed Jan 26 20:29:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 21:29:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: link examples with -latomic Message-ID: <20220126202942.1495636-1-fontaine.fabrice@gmail.com> Link examples with -latomic to avoid the following build failure raised since commit 3edc1cc44c7bd2deed31d28fa9534e67f32334e8: FAILED: spa/examples/adapter-control /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 Signed-off-by: Fabrice Fontaine --- ...eson.build-add-atomic_dep-dependency.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch diff --git a/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch b/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch new file mode 100644 index 0000000000..b91adbe7e4 --- /dev/null +++ b/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch @@ -0,0 +1,40 @@ +From 8d9dc023ac12cf305c28786891d5b15e13f29a3d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 25 Jan 2022 17:22:02 +0100 +Subject: [PATCH] spa/meson.build: add atomic_dep dependency + +Commit fa64d93e64592d5edd8767f722cf4ea093641052 moved the atomic_dep +from pipewire-jack to pipewire_dep however atomic_dep should also be +added to spa_dev to avoid the following build failure when building +examples (which don't depend on pipewire_dep): + +FAILED: spa/examples/adapter-control +/home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': +adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 + +[Retrieved from: +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8d9dc023ac12cf305c28786891d5b15e13f29a3d] +Signed-off-by: Fabrice Fontaine +--- + spa/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/spa/meson.build b/spa/meson.build +index 4ad37cdb4..2404748df 100644 +--- a/spa/meson.build ++++ b/spa/meson.build +@@ -9,6 +9,7 @@ spa_dep = declare_dependency( + include_directories : [ + include_directories('include'), + ], ++ dependencies : [atomic_dep], + version : spaversion, + variables : { + 'plugindir' : meson.current_build_dir() / 'plugins', +-- +GitLab + -- 2.34.1 From peter at korsgaard.com Wed Jan 26 20:32:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:32:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburiparser: security bump to version 0.9.6 In-Reply-To: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 6 Jan 2022 23:39:05 +0100") References: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> Message-ID: <87tudqdyqq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fixed: [CVE-2021-46141] > Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* > functions where the text range in .hostText would not be duped using > malloc but remain unchanged (and hence "not owned") for URIs with > an IPv4 or IPv6 address hostname; depending on how an application > uses uriparser, this could lead the application into a use-after-free > situation. > As the second half, fix uriFreeUriMembers* functions that would not > free .hostText memory for URIs with an IPv4 or IPv6 address host; > also, calling uriFreeUriMembers* multiple times on a URI of this > very nature would result in trying to free pointers to stack > (rather than heap) memory. > - Fixed: [CVE-2021-46142] > Fix functions uriNormalizeSyntax* for out-of-memory situations > (i.e. malloc returning NULL) for URIs containing empty segments > (any of user info, host text, query, or fragment) where previously > pointers to stack (rather than heap) memory were freed. > https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:32:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:32:10 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/liburiparser: security bump to version 0.9.6 Message-ID: <20220126202615.25CFF825DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b40f28f808123748c87da7af323c26aa5dd9eee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fixed: [CVE-2021-46141] Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* functions where the text range in .hostText would not be duped using malloc but remain unchanged (and hence "not owned") for URIs with an IPv4 or IPv6 address hostname; depending on how an application uses uriparser, this could lead the application into a use-after-free situation. As the second half, fix uriFreeUriMembers* functions that would not free .hostText memory for URIs with an IPv4 or IPv6 address host; also, calling uriFreeUriMembers* multiple times on a URI of this very nature would result in trying to free pointers to stack (rather than heap) memory. - Fixed: [CVE-2021-46142] Fix functions uriNormalizeSyntax* for out-of-memory situations (i.e. malloc returning NULL) for URIs containing empty segments (any of user info, host text, query, or fragment) where previously pointers to stack (rather than heap) memory were freed. https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e00379361e16f24a348c12bb26eab4dc0af94e84) Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 60acca2215..8b40807541 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c7bc604ece..c9903bd74f 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.5 -LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Jan 26 20:32:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:32:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/liburiparser: bump to version 0.9.5 Message-ID: <20220126202615.1D631822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=942ed061d76a192bcd403cb1782964a89d74ae45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://github.com/uriparser/uriparser/blob/uriparser-0.9.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index feb5945849..60acca2215 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b7cdabe5611408fc2c3a10f8beecb881a0c7e93ff669c578cd9e3e6d64b8f87b uriparser-0.9.4.tar.bz2 +sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index 4ba1e051e3..c7bc604ece 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.4 +LIBURIPARSER_VERSION = 0.9.5 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause From peter at korsgaard.com Wed Jan 26 20:31:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:31:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/liburiparser: security bump to version 0.9.6 Message-ID: <20220126202624.BA892822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6a838d6ac61e18c97445c75d3df0196ead4e73d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Fixed: [CVE-2021-46141] Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* functions where the text range in .hostText would not be duped using malloc but remain unchanged (and hence "not owned") for URIs with an IPv4 or IPv6 address hostname; depending on how an application uses uriparser, this could lead the application into a use-after-free situation. As the second half, fix uriFreeUriMembers* functions that would not free .hostText memory for URIs with an IPv4 or IPv6 address host; also, calling uriFreeUriMembers* multiple times on a URI of this very nature would result in trying to free pointers to stack (rather than heap) memory. - Fixed: [CVE-2021-46142] Fix functions uriNormalizeSyntax* for out-of-memory situations (i.e. malloc returning NULL) for URIs containing empty segments (any of user info, host text, query, or fragment) where previously pointers to stack (rather than heap) memory were freed. https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e00379361e16f24a348c12bb26eab4dc0af94e84) Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 60acca2215..8b40807541 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c7bc604ece..c9903bd74f 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.5 -LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Jan 26 20:32:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:32:11 +0100 Subject: [Buildroot] [git commit] package/iozone: bump to version 3_493 Message-ID: <20220126203111.1E4FE817D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9558f3d66561ef6cc24f79c1b60e2879ab144f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Gilles Talis Signed-off-by: Thomas Petazzoni --- package/iozone/iozone.hash | 2 +- package/iozone/iozone.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 1255392e38..9ecf1d1af8 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 93c9142d61e6a71ea43b0a266bad7f49f07ce5f5d31b36f8edf4dd386795c483 iozone3_492.tgz +sha256 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 iozone3_493.tgz diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 2282a44eb8..2df4a2aa84 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,7 +4,7 @@ # ################################################################################ -IOZONE_VERSION = 3.492 +IOZONE_VERSION = 3.493 IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) From thomas.petazzoni at bootlin.com Wed Jan 26 20:38:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:38:17 +0100 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3_493 In-Reply-To: <20220115211449.393250-1-gilles.talis@gmail.com> References: <20220115211449.393250-1-gilles.talis@gmail.com> Message-ID: <20220126213817.0da7b271@windsurf> On Sat, 15 Jan 2022 22:14:49 +0100 Gilles Talis wrote: > Signed-off-by: Gilles Talis > --- > package/iozone/iozone.hash | 2 +- > package/iozone/iozone.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Wed Jan 26 20:38:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:38:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: bump version to 1.17.6 In-Reply-To: <878rvrmo2g.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Fri, 07 Jan 2022 18:51:35 +0100") References: <20220106213014.433782-1-christian@paral.in> <878rvrmo2g.fsf@dell.be.48ers.dk> Message-ID: <87pmoedygx.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Christian" == Christian Stewart writes: >> View the release notes for more information: >> https://go.dev/doc/devel/release.html#go1.17.minor >> Signed-off-by: Christian Stewart > Committed, thanks. Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:37:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:37:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/go: bump version to 1.17.6 Message-ID: <20220126203138.CE79F82582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=288007dc4a3c95a705c811d6c6cbb64a623ae733 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x View the release notes for more information: https://go.dev/doc/devel/release.html#go1.17.minor Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 7af6659cb2cbd54b2ca6bad2d91291815e83fbc2) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 39f8226aae..9111c8c9aa 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz +sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 0d9ceab2bb..062bec378c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.5 +GO_VERSION = 1.17.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From fontaine.fabrice at gmail.com Wed Jan 26 20:37:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 21:37:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4224 Message-ID: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository vim/vim prior to 8.2.4120 Signed-off-by: Fabrice Fontaine --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fff5072063..49056b31cd 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 408b33a409..74ab1ec584 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4092 +VIM_VERSION = 8.2.4224 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src -- 2.34.1 From peter at korsgaard.com Wed Jan 26 20:42:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:42:34 +0100 Subject: [Buildroot] [PATCHv3 1/2] package/mender: remove single hyphen command In-Reply-To: <20220106153542.1668688-1-romain.naour@smile.fr> (Romain Naour's message of "Thu, 6 Jan 2022 16:35:41 +0100") References: <20220106153542.1668688-1-romain.naour@smile.fr> Message-ID: <87lez2dy9x.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Single hyphen commands has been removed since Mender 3.0.0 [1] > [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 > Signed-off-by: Romain Naour > Cc: Adam Duskett Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:47:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:47:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: fix comment In-Reply-To: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:53:14 +0100") References: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> Message-ID: <87h79qdy2b.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that > BR2_USE_WCHAR is due to flac dependency but flac is optional so remove > this comment and add boost instead > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:46:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:46:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mpd: fix comment Message-ID: <20220126204254.4ECE68282D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae3a6754176de54a4c068e8dcbf3b97d22e10c23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that BR2_USE_WCHAR is due to flac dependency but flac is optional so remove this comment and add boost instead Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 20584d1ef270d5c1851c1cd537833ec5882edcba) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index eb05f25a0b..0d58bd6756 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,7 +1,7 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac + depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC From peter at korsgaard.com Wed Jan 26 20:41:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:41:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mender: remove single hyphen command Message-ID: <20220126204254.462A281D78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7263cf4946682c4674dd63881fd166f81e3f0921 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Single hyphen commands has been removed since Mender 3.0.0 [1] [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 Signed-off-by: Romain Naour Cc: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 97daba5781bf58a6476c76a2910254bd9cbd329e) Signed-off-by: Peter Korsgaard --- package/mender/S42mender | 2 +- package/mender/mender-client.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mender/S42mender b/package/mender/S42mender index 108fecfea9..dc60f94f8b 100644 --- a/package/mender/S42mender +++ b/package/mender/S42mender @@ -25,7 +25,7 @@ start() { umask 077 start-stop-daemon -S -q -b -m -p /var/run/mender.pid \ - --exec /usr/bin/mender -- -daemon + --exec /usr/bin/mender -- daemon [ $? = 0 ] && echo "OK" || echo "FAIL" } stop() { diff --git a/package/mender/mender-client.service b/package/mender/mender-client.service index 2a5f476ee5..5539a56fd6 100644 --- a/package/mender/mender-client.service +++ b/package/mender/mender-client.service @@ -17,7 +17,7 @@ if [ -L /var/lib/mender \ mkdir -p "$(readlink /var/lib/mender)"; \ fi; \ fi' -ExecStart=/usr/bin/mender -daemon +ExecStart=/usr/bin/mender daemon Restart=on-abort [Install] From fontaine.fabrice at gmail.com Wed Jan 26 20:52:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 21:52:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyopenssl: bump to version 21.0.0 Message-ID: <20220126205225.1533816-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/pyca/pyopenssl/blob/21.0.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- package/python-pyopenssl/python-pyopenssl.hash | 8 ++++---- package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index b457aeacdd..5a3bc5dde9 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 d9804fedbd1eb0c7d9243397b1fbf972 pyOpenSSL-19.1.0.tar.gz -sha256 9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507 pyOpenSSL-19.1.0.tar.gz -# Locally computed sha256 -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +md5 2ec707d15b4e92f5ca5e46e5aab2f4ca pyOpenSSL-21.0.0.tar.gz +sha256 5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3 pyOpenSSL-21.0.0.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index a7ea7edfde..2ba8c2e73d 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 19.1.0 +PYTHON_PYOPENSSL_VERSION = 21.0.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/0d/1d/6cc4bd4e79f78be6640fab268555a11af48474fac9df187c3361a1d1d2f0 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/54/9a/2a43c5dbf4507f86f7c43cba4195d5e25a81c988fd7b0ea779dfc9c6973f PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 26 20:57:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:57:30 +0100 Subject: [Buildroot] [PATCH v2] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220115202617.370414-1-gilles.talis@gmail.com> References: <20220115202617.370414-1-gilles.talis@gmail.com> Message-ID: <20220126215730.30425623@windsurf> Hello Gilles, On Sat, 15 Jan 2022 21:26:17 +0100 Gilles Talis wrote: > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV4=y > +BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y Thanks for this v2. Unfortunately, there is one thing I did not notice when reviewing v1: you should use fixed versions of the Linux kernel, U-Boot and TF-A. Here your defconfig uses whatever is the latest, which is not the policy we have chosen for our defconfigs. Could you fix that up by using fixed versions? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 20:58:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:58:09 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: fix typo Message-ID: <20220126205120.6FCAF82386@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ed2b74717a4557c4ffd822326530b73b7506524 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix typo added by commit 7527324132878f98999539bdd97bd3518747f585: brcmfmac-sdio-firmware-rpi by brcmfmac_sdio-firmware-rpi Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c11cb846fb..62717463df 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -154,7 +154,7 @@ config BR2_PACKAGE_RPI_BT_FIRMWARE select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT help Package rpi-bt-firmware was moved as option to - package brcmfmac-sdio-firmware-rpi. + package brcmfmac_sdio-firmware-rpi. config BR2_PACKAGE_RPI_WIFI_FIRMWARE bool "rpi-wifi-firmware package was renamed" @@ -164,7 +164,7 @@ config BR2_PACKAGE_RPI_WIFI_FIRMWARE select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI help Package rpi-wifi-firmware was moved as option to - package brcmfmac-sdio-firmware-rpi. + package brcmfmac_sdio-firmware-rpi. config BR2_PACKAGE_HOST_GDB_PYTHON bool "GDB Python2 support removed" From thomas.petazzoni at bootlin.com Wed Jan 26 20:58:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:58:24 +0100 Subject: [Buildroot] [PATCH 1/1] Config.in.legacy: fix typo In-Reply-To: <20220122214318.136871-1-fontaine.fabrice@gmail.com> References: <20220122214318.136871-1-fontaine.fabrice@gmail.com> Message-ID: <20220126215824.38e88c72@windsurf> On Sat, 22 Jan 2022 22:43:18 +0100 Fabrice Fontaine wrote: > Fix typo added by commit 7527324132878f98999539bdd97bd3518747f585: > brcmfmac-sdio-firmware-rpi by brcmfmac_sdio-firmware-rpi > > Signed-off-by: Fabrice Fontaine > --- > Config.in.legacy | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 26 21:02:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 22:02:26 +0100 Subject: [Buildroot] [PATCH 2021.02.x] package/polkit: backport upstream patch to fix CVE-2021-4034 Message-ID: <20220126210226.1689899-1-yann.morin.1998@free.fr> Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine --- ...l-privilege-escalation-CVE-2021-4034.patch | 79 +++++++++++++++++++ package/polkit/polkit.mk | 3 + 2 files changed, 82 insertions(+) create mode 100644 package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch diff --git a/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch new file mode 100644 index 0000000000..8c01eed775 --- /dev/null +++ b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch @@ -0,0 +1,79 @@ +From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001 +From: Jan Rybar +Date: Tue, 25 Jan 2022 17:21:46 +0000 +Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034) + +--- + src/programs/pkcheck.c | 5 +++++ + src/programs/pkexec.c | 23 ++++++++++++++++++++--- + 2 files changed, 25 insertions(+), 3 deletions(-) + +diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c +index f1bb4e1..768525c 100644 +--- a/src/programs/pkcheck.c ++++ b/src/programs/pkcheck.c +@@ -363,6 +363,11 @@ main (int argc, char *argv[]) + local_agent_handle = NULL; + ret = 126; + ++ if (argc < 1) ++ { ++ exit(126); ++ } ++ + /* Disable remote file access from GIO. */ + setenv ("GIO_USE_VFS", "local", 1); + +diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c +index 7698c5c..84e5ef6 100644 +--- a/src/programs/pkexec.c ++++ b/src/programs/pkexec.c +@@ -488,6 +488,15 @@ main (int argc, char *argv[]) + pid_t pid_of_caller; + gpointer local_agent_handle; + ++ ++ /* ++ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out. ++ */ ++ if (argc<1) ++ { ++ exit(127); ++ } ++ + ret = 127; + authority = NULL; + subject = NULL; +@@ -614,10 +623,10 @@ main (int argc, char *argv[]) + + path = g_strdup (pwstruct.pw_shell); + if (!path) +- { ++ { + g_printerr ("No shell configured or error retrieving pw_shell\n"); + goto out; +- } ++ } + /* If you change this, be sure to change the if (!command_line) + case below too */ + command_line = g_strdup (path); +@@ -636,7 +645,15 @@ main (int argc, char *argv[]) + goto out; + } + g_free (path); +- argv[n] = path = s; ++ path = s; ++ ++ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated. ++ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination ++ */ ++ if (argv[n] != NULL) ++ { ++ argv[n] = path; ++ } + } + if (access (path, F_OK) != 0) + { +-- +2.25.1 + diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index e00b634b7f..3fd041a813 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -12,6 +12,9 @@ POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES +# 0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ libglib2 host-intltool expat spidermonkey $(TARGET_NLS_DEPENDENCIES) -- 2.25.1 From fontaine.fabrice at gmail.com Wed Jan 26 21:00:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 22:00:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/umtprd: bump to version 1.6.2 Message-ID: <20220126210039.1535791-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/viveris/uMTP-Responder/blob/umtprd-1.6.2/Release-notes.txt Signed-off-by: Fabrice Fontaine --- package/umtprd/umtprd.hash | 4 ++-- package/umtprd/umtprd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/umtprd/umtprd.hash b/package/umtprd/umtprd.hash index 170837d84b..7cd75619ab 100644 --- a/package/umtprd/umtprd.hash +++ b/package/umtprd/umtprd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cce45c7d3df0022fc013c79de21b1f11b1027d090aeb628669f08b0c20d2afdd umtprd-1.3.10.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE +sha256 1de40511c1dd4618719cff2058dfe68a595f1b9284c80afa89d6d1a1c80aec29 umtprd-1.6.2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk index f1a4e66cff..c5e0ee512e 100644 --- a/package/umtprd/umtprd.mk +++ b/package/umtprd/umtprd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UMTPRD_VERSION = 1.3.10 +UMTPRD_VERSION = 1.6.2 UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive UMTPRD_LICENSE = GPL-3.0+ UMTPRD_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 26 21:04:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:04:19 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add ldap support Message-ID: <20220126205732.9DB7E82883@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd35a0578eeadaedf9b634086c9c979193aaa21f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 595c50c978..f46e1a9a66 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,16 @@ config BR2_PACKAGE_LIGHTTPD_KRB5 help Enable Kerberos5 support for lighttpd mod_auth. +config BR2_PACKAGE_LIGHTTPD_LDAP + bool "ldap support" + depends on BR2_USE_WCHAR # openldap + select BR2_PACKAGE_OPENLDAP + help + Enable LDAP support for lighttpd mod_auth mod_vhostdb_ldap. + +comment "ldap support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index a25bb0bfcb..f8ed7c6f7c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ @@ -54,6 +53,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_krb5=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) +LIGHTTPD_DEPENDENCIES += openldap +LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +else +LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true From thomas.petazzoni at bootlin.com Wed Jan 26 20:58:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:58:48 +0100 Subject: [Buildroot] [git commit] package/lighttpd: reorder alphabetically options Message-ID: <20220126205732.7118C82386@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2b90b94894366fa81eac0767a0f4ad42289cd6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 99a09e9766..59c1e0b2a6 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,18 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BZIP2 + bool "bzip2 support" + select BR2_PACKAGE_BZIP2 + help + Enable bzip2 support for lighttpd mod_deflate. + +config BR2_PACKAGE_LIGHTTPD_LUA + bool "lua support" + depends on BR2_PACKAGE_LUA + help + Enable Lua support. Needed to support mod_magnet + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL @@ -34,18 +46,6 @@ config BR2_PACKAGE_LIGHTTPD_PAM help Enable PAM authentication support for lighttpd. -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_deflate. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_deflate. - config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" select BR2_PACKAGE_PCRE2 @@ -59,10 +59,10 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA +config BR2_PACKAGE_LIGHTTPD_ZLIB + bool "zlib support" + select BR2_PACKAGE_ZLIB help - Enable Lua support. Needed to support mod_magnet + Enable zlib support for lighttpd mod_deflate. endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 2a05071209..bdbf75191c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -37,6 +37,20 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) +LIGHTTPD_DEPENDENCIES += bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +else +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) +LIGHTTPD_DEPENDENCIES += lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true +else +LIGHTTPD_CONF_OPTS += -Dwith_lua=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true @@ -51,20 +65,6 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true -else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false -endif - ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_DEPENDENCIES += pcre2 LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true @@ -85,11 +85,11 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += -Dwith_lua=true +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) +LIGHTTPD_DEPENDENCIES += zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += -Dwith_lua=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif define LIGHTTPD_INSTALL_CONFIG From thomas.petazzoni at bootlin.com Wed Jan 26 20:58:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:58:56 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add zstd support Message-ID: <20220126205732.796177FB5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17ed9108a65ba78b108cb4d4b936cf0940948faf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 59c1e0b2a6..05a7c84961 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -65,4 +65,10 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB help Enable zlib support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_ZSTD + bool "zstd support" + select BR2_PACKAGE_ZSTD + help + Enable zstd support for lighttpd mod_deflate. + endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index bdbf75191c..4f05db4e29 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -32,7 +32,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ -Dwith_xxhash=true \ - -Dwith_zstd=false \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd @@ -92,6 +91,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) +LIGHTTPD_DEPENDENCIES += zstd +LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +else +LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +endif + define LIGHTTPD_INSTALL_CONFIG $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www From thomas.petazzoni at bootlin.com Wed Jan 26 21:04:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:04:07 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add krb5 support Message-ID: <20220126205732.954317FB5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef9a628c595695b875f7ca018e7e4a27564a1317 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9a262dbe93..595c50c978 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -33,6 +33,12 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 help Enable bzip2 support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_KRB5 + bool "krb5 support" + select BR2_PACKAGE_LIBKRB5 + help + Enable Kerberos5 support for lighttpd mod_auth. + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index b2e06c77a1..a25bb0bfcb 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_krb5=false \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ @@ -48,6 +47,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) +LIGHTTPD_DEPENDENCIES += libkrb5 +LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +else +LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true From thomas.petazzoni at bootlin.com Wed Jan 26 21:03:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:03:37 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add maxminddb support Message-ID: <20220126205732.8C0E282386@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c97efff6aa1acdf78acdc6d3783a37d7cdabc260 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index f3e252d850..9a262dbe93 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,12 @@ config BR2_PACKAGE_LIGHTTPD_LUA help Enable Lua support. Needed to support mod_magnet +config BR2_PACKAGE_LIGHTTPD_MAXMINDDB + bool "maxminddb support" + select BR2_PACKAGE_LIBMAXMINDDB + help + Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 22db1a7348..b2e06c77a1 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -20,7 +20,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ - -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ @@ -56,6 +55,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_lua=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) +LIGHTTPD_DEPENDENCIES += libmaxminddb +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +else +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true From thomas.petazzoni at bootlin.com Wed Jan 26 21:03:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:03:28 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add brotli support Message-ID: <20220126205732.827B182883@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e6ea33ded6354b6f6e6122b124707db89a2ef2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...002-build-meson-fix-typo-in-variable-name.patch | 25 ++++++++++++++++++++++ package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 ++++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch new file mode 100644 index 0000000000..d338979d46 --- /dev/null +++ b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch @@ -0,0 +1,25 @@ +From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Thu, 20 Jan 2022 07:04:51 -0500 +Subject: [PATCH] [build] meson: fix typo in variable name + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] +Signed-off-by: Fabrice Fontaine +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 4ee163468..b35c1037f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -266,7 +266,7 @@ endif + libbrotli = [] + if get_option('with_brotli') + libbrotli = [ compiler.find_library('brotlienc') ] +- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include ') ++ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include ') + conf_data.set('HAVE_BROTLI_ENCODE_H', true) + conf_data.set('HAVE_BROTLI', true) + else diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 05a7c84961..f3e252d850 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,12 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BROTLI + bool "brotli support" + select BR2_PACKAGE_BROTLI + help + Enable brotli support for lighttpd mod_deflate. + config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 4f05db4e29..22db1a7348 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -13,7 +13,6 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ @@ -36,6 +35,13 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) +LIGHTTPD_DEPENDENCIES += brotli +LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +else +LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 LIGHTTPD_CONF_OPTS += -Dwith_bzip=true From thomas.petazzoni at bootlin.com Wed Jan 26 21:04:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:04:57 +0100 Subject: [Buildroot] [PATCH v2, 1/6] package/lighttpd: reorder alphabetically options In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220126220457.2cd3d919@windsurf> On Sun, 23 Jan 2022 10:59:52 +0100 Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine > --- > package/lighttpd/Config.in | 32 ++++++++++++++++---------------- > package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ > 2 files changed, 34 insertions(+), 34 deletions(-) Series applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:05:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:05:18 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name Message-ID: <20220126205832.7AB4181906@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07a0d71657323d137bfb33e29311bff29ac58539 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf index 5109625160..157c6a715e 100644 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ b/board/orangepi/orangepi-rk3399/extlinux.conf @@ -1,4 +1,4 @@ -label RK3399_ROCKPRO64 linux +label RK3399_ORANGEPI linux kernel /Image devicetree /rk3399-orangepi.dtb append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait From thomas.petazzoni at bootlin.com Wed Jan 26 21:05:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:05:29 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name In-Reply-To: <20220123103922.1928118-1-giulio.benetti@benettiengineering.com> References: <20220123103922.1928118-1-giulio.benetti@benettiengineering.com> Message-ID: <20220126220529.246fa6d3@windsurf> On Sun, 23 Jan 2022 11:39:22 +0100 Giulio Benetti wrote: > RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal > with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. > > Signed-off-by: Giulio Benetti > --- > board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:06:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:06:04 +0100 Subject: [Buildroot] [git commit] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR Message-ID: <20220126205914.E00C581906@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c99d84fb9694000a91fa04abc820f3e63a14e7e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpjsip/libpjsip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 0a93780e93..b05cc31a83 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,7 +12,7 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_VENDOR = teluu LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) From thomas.petazzoni at bootlin.com Wed Jan 26 21:06:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:06:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR In-Reply-To: <20220123134751.703269-1-fontaine.fabrice@gmail.com> References: <20220123134751.703269-1-fontaine.fabrice@gmail.com> Message-ID: <20220126220610.7d44f5cc@windsurf> On Sun, 23 Jan 2022 14:47:50 +0100 Fabrice Fontaine wrote: > pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: > > > > > > Signed-off-by: Fabrice Fontaine > --- > package/libpjsip/libpjsip.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Wed Jan 26 21:12:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 22:12:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/bullet: bump to version 3.21 Message-ID: <20220126211220.1550407-1-fontaine.fabrice@gmail.com> - Drop patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...HACD-inc-vhacdMutex.h-fix-musl-build.patch | 42 ------------------- package/bullet/bullet.hash | 4 +- package/bullet/bullet.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch diff --git a/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch b/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch deleted file mode 100644 index d01bb97d99..0000000000 --- a/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dd37b97e79aea231ae026ac93c6ca4c7a2667582 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 7 Aug 2021 17:11:24 +0200 -Subject: [PATCH] Extras/VHACD/inc/vhacdMutex.h: fix musl build - -Fix the following build failure on musl (which does not provide -PTHREAD_MUTEX_RECURSIVE_NP): - -In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289, - from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19, - from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18, - from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28: -/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()': -/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h:97:54: error: 'PTHREAD_MUTEX_RECURSIVE_NP' was not declared in this scope; did you mean 'PTHREAD_MUTEX_RECURSIVE'? - 97 | VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/bulletphysics/bullet3/pull/3930] ---- - Extras/VHACD/inc/vhacdMutex.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Extras/VHACD/inc/vhacdMutex.h b/Extras/VHACD/inc/vhacdMutex.h -index 4d1ad2a7d..78c111383 100644 ---- a/Extras/VHACD/inc/vhacdMutex.h -+++ b/Extras/VHACD/inc/vhacdMutex.h -@@ -69,7 +69,7 @@ - #include - #endif - --#if defined(__APPLE__) -+#if defined(__APPLE__) || !defined(__GLIBC__) - #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE - #endif - --- -2.30.2 - diff --git a/package/bullet/bullet.hash b/package/bullet/bullet.hash index 813e8299e1..5c70c683b0 100644 --- a/package/bullet/bullet.hash +++ b/package/bullet/bullet.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f2feef9322329c0571d9066fede2db0ede92b19f7f7fdf54def3b4651f02af03 bullet-3.09.tar.gz -sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt +sha256 49d1ee47aa8cbb0bc6bb459f0a4cfb9579b40e28f5c7d9a36c313e3031fb3965 bullet-3.21.tar.gz +sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt diff --git a/package/bullet/bullet.mk b/package/bullet/bullet.mk index cc72be7c60..9afd922ec9 100644 --- a/package/bullet/bullet.mk +++ b/package/bullet/bullet.mk @@ -4,7 +4,7 @@ # ################################################################################ -BULLET_VERSION = 3.09 +BULLET_VERSION = 3.21 BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION)) BULLET_INSTALL_STAGING = YES BULLET_LICENSE = Zlib -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 26 21:17:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:17:17 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: new package Message-ID: <20220126211029.693108197C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=18a863063735e2c658fa6947a4e540e9dda6c431 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ZynAddSubFX is a fully featured open source software synthesizer capable of making a countless number of instruments, from some common heard from expensive hardware to interesting sounds that you'll boost to an amazing universe of sounds. https://zynaddsubfx.sourceforge.io/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/zynaddsubfx/Config.in | 31 +++++++++++++++++++++++++++++++ package/zynaddsubfx/zynaddsubfx.hash | 3 +++ package/zynaddsubfx/zynaddsubfx.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1d729e5ce4..fe8de1916e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ +F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/test_python_gnupg.py diff --git a/package/Config.in b/package/Config.in index 85188ff873..e4ca195beb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -62,6 +62,7 @@ menu "Audio and video applications" source "package/wavpack/Config.in" source "package/yavta/Config.in" source "package/ympd/Config.in" + source "package/zynaddsubfx/Config.in" endmenu menu "Compressors and decompressors" diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in new file mode 100644 index 0000000000..837a469e7c --- /dev/null +++ b/package/zynaddsubfx/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_ZYNADDSUBFX + bool "zynaddsubfx" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_SINGLE + select BR2_PACKAGE_LIBLO + select BR2_PACKAGE_MXML + select BR2_PACKAGE_ZLIB + help + ZynAddSubFX is a fully featured open source software + synthesizer capable of making a countless number of + instruments, from some common heard from expensive hardware + to interesting sounds that you'll boost to an amazing + universe of sounds. + + Note: this Buildroot package does not include the graphical + user interface. It is meant to be executed as a headless + daemon to be controlled with MIDI events or network OSC + (Open Sound Control) events. OSC events can be generated + from an external system with the ZynAddSubFX external GUI + program zynaddsubfx-ext-gui. + + https://zynaddsubfx.sourceforge.io/ + +comment "zynaddsubfx needs a toolchain w/ C++11 and threads" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/zynaddsubfx/zynaddsubfx.hash b/package/zynaddsubfx/zynaddsubfx.hash new file mode 100644 index 0000000000..2465d0b864 --- /dev/null +++ b/package/zynaddsubfx/zynaddsubfx.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cbd160778f6cf147f9b0487719edc5197a1404f46d7c7bfd89e153f0d8ce71ae zynaddsubfx-3.0.6.tar.bz2 +sha256 c9bf7643726da4f149e9669cf6f00257e4b3a173e4ab307461b8bd42717dd9a4 COPYING diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk new file mode 100644 index 0000000000..158b5b4ede --- /dev/null +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# zynaddsubfx +# +################################################################################ + +ZYNADDSUBFX_VERSION = 3.0.6 +ZYNADDSUBFX_SOURCE = zynaddsubfx-$(ZYNADDSUBFX_VERSION).tar.bz2 +ZYNADDSUBFX_SITE = http://downloads.sourceforge.net/zynaddsubfx +ZYNADDSUBFX_LICENSE = GPL-2.0+ +ZYNADDSUBFX_LICENSE_FILES = COPYING + +# There is no package in buildroot using LV2 plugins: disabling +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ZYNADDSUBFX_DEPENDENCIES = \ + alsa-lib \ + fftw-single \ + liblo \ + mxml \ + zlib + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Jan 26 21:18:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:18:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynaddsubfx: new package In-Reply-To: <20220123134803.2269814-1-ju.o@free.fr> References: <20220123134803.2269814-1-ju.o@free.fr> Message-ID: <20220126221824.2f484564@windsurf> On Sun, 23 Jan 2022 14:48:03 +0100 Julien Olivain wrote: > +ZYNADDSUBFX_LICENSE = GPLv2+ We use GPL-2.0+ and not GPLv2+. With this very minor nit, patch applied to master. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Jan 26 21:17:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 22:17:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: add pgsql support Message-ID: <20220126211749.1550932-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index eb8ab480a0..57bb756603 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -86,6 +86,16 @@ config BR2_PACKAGE_LIGHTTPD_PCRE help Enable PCRE support. Needed to support mod_rewrite +config BR2_PACKAGE_LIGHTTPD_PGSQL + bool "pgsql support" + depends on BR2_USE_MMU # postgresql + select BR2_PACKAGE_POSTGRESQL + help + Enable postgres support for lighttpd mod_vhostdb_pgsql. + +comment "pgsql support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_WEBDAV bool "webdav support" select BR2_PACKAGE_LIBXML2 diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 90b4ba0a72..595c59cb37 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -22,7 +22,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_nettle=false \ -Dwith_nss=false \ -Dwith_pcre=false \ - -Dwith_pgsql=false \ -Dwith_sasl=false \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ @@ -101,6 +100,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) +LIGHTTPD_DEPENDENCIES += postgresql +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +else +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 26 21:18:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:18:31 +0100 Subject: [Buildroot] [git commit] package/gvfs: fix build with meson >= 0.61 Message-ID: <20220126211403.49F3B82815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=334a69f12ebc8fd23818f33d4dfb17f8864d95e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of meson to version 0.61.0 in commit a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f: ../output-1/build/gvfs-1.48.1/daemon/meson.build:368:7: ERROR: Function does not take positional arguments. Fixes: - http://autobuild.buildroot.org/results/6231649fac82a70b215186c3396b879a28a96f60 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...Remove-incorrect-i18n.merge_file-argument.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch new file mode 100644 index 0000000000..a85a1a374e --- /dev/null +++ b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch @@ -0,0 +1,33 @@ +From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 + +[Retrieved (and backported) from: +https://gitlab.gnome.org/GNOME/gvfs/-/commit/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0] +Signed-off-by: Fabrice Fontaine +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index 5f9559aa..e20ada29 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -360,7 +360,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab + From thomas.petazzoni at bootlin.com Wed Jan 26 21:20:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:20:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gvfs: fix build with meson >= 0.61 In-Reply-To: <20220123212607.781422-1-fontaine.fabrice@gmail.com> References: <20220123212607.781422-1-fontaine.fabrice@gmail.com> Message-ID: <20220126222059.3d1e848a@windsurf> On Sun, 23 Jan 2022 22:26:07 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump of meson to version > 0.61.0 in commit a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f: > > ../output-1/build/gvfs-1.48.1/daemon/meson.build:368:7: ERROR: Function does not take positional arguments. > > Fixes: > - http://autobuild.buildroot.org/results/6231649fac82a70b215186c3396b879a28a96f60 > > Signed-off-by: Fabrice Fontaine > --- > ...e-incorrect-i18n.merge_file-argument.patch | 33 +++++++++++++++++++ > 1 file changed, 33 insertions(+) > create mode 100644 package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:21:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:21:34 +0100 Subject: [Buildroot] [git commit] package/batman-adv: bump to version 2021.04 Message-ID: <20220126211500.42E3382127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e15bd8e51ba1b72a59140c84e59971d71086431 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/batman-adv/batman-adv.hash | 6 +++--- package/batman-adv/batman-adv.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index f81df11000..c098663739 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -1,7 +1,7 @@ -# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.1/batman-adv-2021.1.tar.gz.sha1 -sha1 27a0dc7cb74b868bc0ab52794ecedd0448f0fb61 batman-adv-2021.1.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.4/batman-adv-2021.4.tar.gz.sha1 +sha1 80a3e4d763b6bf35db6e561ed9d6775dc874d7c6 batman-adv-2021.4.tar.gz # Hash for license files -sha256 5a989ba580897268373bd516b87b588061f344af773a0f6b038a3d8d2af028a1 batman-adv-2021.0.tar.gz +sha256 cff7a2f160045fd0dbf1f1cd7e35e93bf489e81cb8b9501b3756daa391f3eb1b batman-adv-2021.4.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index e58ac85bef..838f9b1851 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2021.1 +BATMAN_ADV_VERSION = 2021.4 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT From thomas.petazzoni at bootlin.com Wed Jan 26 21:21:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:21:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/batman-adv: bump to version 2021.04 In-Reply-To: <20220124071143.15869-1-christian@paral.in> References: <20220124071143.15869-1-christian@paral.in> Message-ID: <20220126222158.65f5e60a@windsurf> On Sun, 23 Jan 2022 23:11:43 -0800 Christian Stewart via buildroot wrote: > Signed-off-by: Christian Stewart > --- > package/batman-adv/batman-adv.hash | 4 ++-- > package/batman-adv/batman-adv.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:22:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:22:55 +0100 Subject: [Buildroot] [git commit] package/containerd: security bump to version 1.5.9 Message-ID: <20220126211606.BBFC582127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=935bd589a356f51e5c97d111877bd2052f0c9da5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when it is SELinux" Containers launched through containerd???s CRI implementation on Linux systems which use the SELinux security module and containerd versions since v1.5.0 can cause arbitrary files and directories on the host to be relabeled to match the container process label through the use of specially-configured bind mounts in a hostPath volume. This relabeling elevates permissions for the container, granting full read/write access over the affected files and directories. Kubernetes and crictl can both be configured to use containerd???s CRI implementation. https://github.com/advisories/GHSA-mvff-h3cj-wj9c https://github.com/containerd/containerd/releases/tag/v1.5.9 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index f1a6709554..d5aafe2e70 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790 containerd-1.5.8.tar.gz +sha256 40c9767af3e87f2c36adf2f563f0a8374e80b30bd2b7aa80058c85912406cef4 containerd-1.5.9.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index cd975db274..8976e12f1a 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.8 +CONTAINERD_VERSION = 1.5.9 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Jan 26 21:23:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:23:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/containerd: security bump to version 1.5.9 In-Reply-To: <20220124071453.16225-1-christian@paral.in> References: <20220124071453.16225-1-christian@paral.in> Message-ID: <20220126222309.44ad5b0f@windsurf> On Sun, 23 Jan 2022 23:14:53 -0800 Christian Stewart via buildroot wrote: > CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when > it is SELinux" > > Containers launched through containerd?s CRI implementation on Linux systems > which use the SELinux security module and containerd versions since v1.5.0 can > cause arbitrary files and directories on the host to be relabeled to match the > container process label through the use of specially-configured bind mounts in a > hostPath volume. This relabeling elevates permissions for the container, > granting full read/write access over the affected files and directories. > Kubernetes and crictl can both be configured to use containerd?s CRI > implementation. > > https://github.com/advisories/GHSA-mvff-h3cj-wj9c > https://github.com/containerd/containerd/releases/tag/v1.5.9 > > Signed-off-by: Christian Stewart > --- > package/containerd/containerd.hash | 2 +- > package/containerd/containerd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:24:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:24:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/delve: bump to version 1.8.0 In-Reply-To: <20220124071741.22618-1-christian@paral.in> References: <20220124071741.22618-1-christian@paral.in> Message-ID: <20220126222414.7b378d17@windsurf> On Sun, 23 Jan 2022 23:17:41 -0800 Christian Stewart via buildroot wrote: > Signed-off-by: Christian Stewart > --- > package/delve/delve.hash | 2 +- > package/delve/delve.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:23:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:23:59 +0100 Subject: [Buildroot] [git commit] package/delve: bump to version 1.8.0 Message-ID: <20220126212131.39E0682707@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37097d6d60d8edb08e226e64401fe055521de676 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index 3d117813c6..04ea4954cc 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e73f7fc063632268d3bdf53486aeafd98cceb8f86f4af56903dedfebaefe690d delve-1.6.1.tar.gz +sha256 086106a4776fa155bf20c37d27b9caed55255be6359c7f0bda1893d3adbb614e delve-1.8.0.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 6c346552a4..984d90a03c 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.6.1 +DELVE_VERSION = 1.8.0 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Jan 26 21:24:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:24:37 +0100 Subject: [Buildroot] [git commit] package/delve: support building as host package Message-ID: <20220126212131.456B781D55@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e7b8f9412ac12225e441acbd5228e97c2e38ca7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Users may want to debug Go programs using dlv on the host machine. Adds package host-delve and BR2_PACKAGE_HOST_DELVE. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/delve/Config.in.host | 7 +++++++ package/delve/delve.mk | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index 20034f6ee0..341e24926b 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/cramfs/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" + source "package/delve/Config.in.host" source "package/dfu-util/Config.in.host" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" diff --git a/package/delve/Config.in.host b/package/delve/Config.in.host new file mode 100644 index 0000000000..dab5ca8914 --- /dev/null +++ b/package/delve/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_DELVE + bool "host delve" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + Delve is a debugger for the Go programming language. + + https://github.com/go-delve/delve diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 984d90a03c..4ca1786ffc 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -14,4 +14,9 @@ DELVE_TAGS = cgo DELVE_BUILD_TARGETS = cmd/dlv DELVE_INSTALL_BINS = $(notdir $(DELVE_BUILD_TARGETS)) +HOST_DELVE_TAGS = cgo +HOST_DELVE_BUILD_TARGETS = cmd/dlv +HOST_DELVE_INSTALL_BINS = $(notdir $(HOST_DELVE_BUILD_TARGETS)) + $(eval $(golang-package)) +$(eval $(host-golang-package)) From thomas.petazzoni at bootlin.com Wed Jan 26 21:28:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:28:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/delve: support building as host package In-Reply-To: <20220124072527.29954-1-christian@paral.in> References: <20220124072527.29954-1-christian@paral.in> Message-ID: <20220126222826.09444e06@windsurf> On Sun, 23 Jan 2022 23:25:27 -0800 Christian Stewart via buildroot wrote: > Users may want to debug Go programs using dlv on the host machine. > > Adds package host-delve and BR2_PACKAGE_HOST_DELVE. > > Signed-off-by: Christian Stewart > --- > package/Config.in.host | 1 + > package/delve/Config.in.host | 7 +++++++ > package/delve/delve.mk | 5 +++++ > 3 files changed, 13 insertions(+) > create mode 100644 package/delve/Config.in.host Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:28:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:28:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/docker-engine: bump to version 20.10.12 In-Reply-To: <20220124073711.44684-1-christian@paral.in> References: <20220124073711.44684-1-christian@paral.in> Message-ID: <20220126222855.080cf833@windsurf> On Sun, 23 Jan 2022 23:37:10 -0800 Christian Stewart via buildroot wrote: > Signed-off-by: Christian Stewart > --- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:29:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:29:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/gocryptfs: bump to version 2.2.1 In-Reply-To: <20220124074151.58966-1-christian@paral.in> References: <20220124074151.58966-1-christian@paral.in> Message-ID: <20220126222957.61a2191d@windsurf> On Sun, 23 Jan 2022 23:41:51 -0800 Christian Stewart via buildroot wrote: > Signed-off-by: Christian Stewart > --- > package/gocryptfs/gocryptfs.hash | 2 +- > package/gocryptfs/gocryptfs.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:28:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:28:40 +0100 Subject: [Buildroot] [git commit] package/docker-engine: bump to version 20.10.12 Message-ID: <20220126213746.A58DE826DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64cf3dc6c46c7b04d5d0ca1c024b9cf3d0efeaf1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d1323f507d..ec3a242629 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz +sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 45fa7fa53e..2a1239b676 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.11 +DOCKER_ENGINE_VERSION = 20.10.12 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Wed Jan 26 21:29:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:29:49 +0100 Subject: [Buildroot] [git commit] package/gocryptfs: bump to version 2.2.1 Message-ID: <20220126213746.B8F728291D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=436983e0a3c075c2d8ea417c61e58b295323d15b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index 94487815f5..ae161d1cd8 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 2a00e9a959..8f70dba7c3 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_VERSION = 2.2.1 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Jan 26 21:28:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:28:43 +0100 Subject: [Buildroot] [git commit] package/docker-cli: bump to version 20.10.12 Message-ID: <20220126213746.AE2D07FB3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70d1858353029d4a45e5f0d4a705b07837736c21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index fbcda5753e..f2fe316540 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz +sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 0e35a60d43..d5cca34efc 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.11 +DOCKER_CLI_VERSION = 20.10.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Wed Jan 26 21:45:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:45:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.34.4 In-Reply-To: <20220124140230.1697395-1-aperez@igalia.com> References: <20220124140230.1697395-1-aperez@igalia.com> Message-ID: <20220126224515.125150ef@windsurf> On Mon, 24 Jan 2022 16:02:30 +0200 Adrian Perez de Castro wrote: > This is a minor release which provides fixes for CVE-2021-30934, > CVE-2021-30936, CVE-2021-30951, CVE-2021-30952, CVE-2021-30953, > CVE-2021-30954, CVE-2021-30984, and the safarileaks.com vulnerability > (which has not yet been assigned a CVE number). Release notes can be > found at: > > https://wpewebkit.org/release/wpewebkit-2.34.4.html > > An accompanying security advisory has been published at: > > https://wpewebkit.org/security/WSA-2022-0001.html > > Signed-off-by: Adrian Perez de Castro > --- > package/wpewebkit/wpewebkit.hash | 8 ++++---- > package/wpewebkit/wpewebkit.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:44:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:44:44 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.34.4 Message-ID: <20220126214843.EE9368276B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2c5bf66aceb795fbeb8e275f2df08788af1a864 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor release which provides fixes for CVE-2021-30934, CVE-2021-30936, CVE-2021-30951, CVE-2021-30952, CVE-2021-30953, CVE-2021-30954, CVE-2021-30984, and the safarileaks.com vulnerability (which has not yet been assigned a CVE number). Release notes can be found at: https://wpewebkit.org/release/wpewebkit-2.34.4.html An accompanying security advisory has been published at: https://wpewebkit.org/security/WSA-2022-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 52652b72ae..b863a0d705 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.34.3.tar.xz.sums -md5 f8eb92825bf6477fb04ca017926c2458 wpewebkit-2.34.3.tar.xz -sha1 a72f507dfd6d4d579b2e6c939d7c171c2cfb1d92 wpewebkit-2.34.3.tar.xz -sha256 c35de4bfce35c81cbd6c1da27879b4ea33e20bd51d750ce296a4d100d45f40fc wpewebkit-2.34.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.34.4.tar.xz.sums +md5 b0f7dcb18acfa94cfb42fea0fe10fb0d wpewebkit-2.34.4.tar.xz +sha1 de58481b43a6dba054097f619ee486f7889d7a56 wpewebkit-2.34.4.tar.xz +sha256 3653ba42dbe22a4e6751b3f7cab8d2ebb2db5b7654c5d135a2f9bedf94778cee wpewebkit-2.34.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 64c179534f..8d564d8223 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.3 +WPEWEBKIT_VERSION = 2.34.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Wed Jan 26 21:50:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:50:15 +0100 Subject: [Buildroot] [git commit] package/htpdate: bump to version 1.3.3 Message-ID: <20220126214844.0389580538@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=163509a8e0d558e6339c5489f072dfe805e0cc34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump and update project to its new location. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/htpdate/Config.in | 2 +- package/htpdate/S43htpdate | 2 +- package/htpdate/htpdate.hash | 4 ++-- package/htpdate/htpdate.mk | 6 +++--- package/htpdate/htpdate.service | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/htpdate/Config.in b/package/htpdate/Config.in index 42c10c308b..d2a71fb696 100644 --- a/package/htpdate/Config.in +++ b/package/htpdate/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_HTPDATE The HTTP Time Protocol (HTP) is used to synchronize a computer's time with web servers as reference time source. - https://github.com/angeloc/htpdate + https://github.com/twekkel/htpdate diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate index 75f9a995ff..5971d70639 100644 --- a/package/htpdate/S43htpdate +++ b/package/htpdate/S43htpdate @@ -9,7 +9,7 @@ test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" \ -- -D -i "$PIDFILE" $HTPDATE_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index 824266c1bc..b56522ea99 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz -sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz +sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 52022346a9..200c3207a2 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,13 +4,13 @@ # ################################################################################ -HTPDATE_VERSION = 1.2.6 -HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) +HTPDATE_VERSION = 1.3.3 +HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 +HTPDATE_BUILD_OPTS = https HTPDATE_DEPENDENCIES += openssl host-pkgconf endif diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service index b7f1371b08..95220581d4 100644 --- a/package/htpdate/htpdate.service +++ b/package/htpdate/htpdate.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/run/htpdate.pid Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" EnvironmentFile=-/etc/default/htpdate -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS +ExecStart=/usr/sbin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS [Install] WantedBy=multi-user.target From thomas.petazzoni at bootlin.com Wed Jan 26 21:56:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:56:16 +0100 Subject: [Buildroot] [PATCH v3] package/htpdate: bump to version 1.3.3 In-Reply-To: <20220124215904.1200436-1-angelo@amarulasolutions.com> References: <20220124215904.1200436-1-angelo@amarulasolutions.com> Message-ID: <20220126225616.2ba8e512@windsurf> On Mon, 24 Jan 2022 22:59:04 +0100 Angelo Compagnucci wrote: > Bump and update project to its new location. > > Signed-off-by: Angelo Compagnucci > --- > v1->v2: > * Rebased on master > * Keeping buildroot package init scripts Applied to master, thanks. You had forgotten to update the Config.in file with the new link to the upstream site (as suggested by Baruch on your v2) and the hash file had incorrect spacing causing "make check-package" warnings. I fixed both when applying. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:56:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:56:26 +0100 Subject: [Buildroot] [git commit] package/python-pyyaml: bump to version 6.0 Message-ID: <20220126214936.872A780FF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d893f870f7c0be22b340cd5fca5ae0661c20182 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop python2 support and propagate dependency changes. Ensure optimized cython build is enabled and add host cython dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libcamera/libcamera.mk | 2 +- package/mongodb/mongodb.mk | 2 +- package/python-pyyaml/Config.in | 1 + package/python-pyyaml/python-pyyaml.hash | 4 ++-- package/python-pyyaml/python-pyyaml.mk | 9 +++++---- package/python3-pyyaml/python3-pyyaml.hash | 1 - package/python3-pyyaml/python3-pyyaml.mk | 20 -------------------- 7 files changed, 10 insertions(+), 29 deletions(-) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 0052ca558a..524cf07e03 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -12,7 +12,7 @@ LIBCAMERA_DEPENDENCIES = \ host-pkgconf \ host-python-jinja2 \ host-python3-ply \ - host-python3-pyyaml \ + host-python-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ -Dandroid=disabled \ diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index c33c3c2eb7..92656dd7a4 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -18,7 +18,7 @@ MONGODB_DEPENDENCIES = \ boost \ host-python3-cheetah \ host-python3-psutil \ - host-python3-pyyaml \ + host-python-pyyaml \ host-python3-regex \ host-python-requests \ host-scons \ diff --git a/package/python-pyyaml/Config.in b/package/python-pyyaml/Config.in index 45e818b7e7..eb073b9c03 100644 --- a/package/python-pyyaml/Config.in +++ b/package/python-pyyaml/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYYAML bool "python-pyyaml" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBYAML help The PyYAML package contains binding to the libyaml API. diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash index 82b2f4f880..f8b5332565 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json -md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz -sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz +md5 1d19c798f25e58e3e582f0f8c977dbb8 PyYAML-6.0.tar.gz +sha256 68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2 PyYAML-6.0.tar.gz # Locally computed sha256 checksums sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index c9013de8ec..8f5a2d269e 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -4,17 +4,18 @@ # ################################################################################ -# Please keep in sync package/python3-pyyaml/python3-pyyaml.mk -PYTHON_PYYAML_VERSION = 5.4.1 +PYTHON_PYYAML_VERSION = 6.0 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844 PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml -PYTHON_PYYAML_DEPENDENCIES = libyaml +PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml +PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-pyyaml/python3-pyyaml.hash b/package/python3-pyyaml/python3-pyyaml.hash deleted file mode 120000 index afa4932ecb..0000000000 --- a/package/python3-pyyaml/python3-pyyaml.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pyyaml/python-pyyaml.hash \ No newline at end of file diff --git a/package/python3-pyyaml/python3-pyyaml.mk b/package/python3-pyyaml/python3-pyyaml.mk deleted file mode 100644 index f758341502..0000000000 --- a/package/python3-pyyaml/python3-pyyaml.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-pyyaml -# -################################################################################ - -# Please keep in sync with package/python-pyyaml/python-pyyaml.mk -PYTHON3_PYYAML_VERSION = 5.4.1 -PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz -PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d -PYTHON3_PYYAML_SETUP_TYPE = setuptools -PYTHON3_PYYAML_LICENSE = MIT -PYTHON3_PYYAML_LICENSE_FILES = LICENSE -PYTHON3_PYYAML_CPE_ID_VENDOR = pyyaml -PYTHON3_PYYAML_CPE_ID_PRODUCT = pyyaml -HOST_PYTHON3_PYYAML_DL_SUBDIR = python-pyyaml -HOST_PYTHON3_PYYAML_NEEDS_HOST_PYTHON = python3 -HOST_PYTHON3_PYYAML_DEPENDENCIES = host-libyaml - -$(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Wed Jan 26 22:00:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:00:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyyaml: bump to version 6.0 In-Reply-To: <20220124111725.544497-1-james.hilliard1@gmail.com> References: <20220124111725.544497-1-james.hilliard1@gmail.com> Message-ID: <20220126230025.67670779@windsurf> On Mon, 24 Jan 2022 04:17:25 -0700 James Hilliard wrote: > Drop python2 support and propagate dependency changes. > > Ensure optimized cython build is enabled and add host cython > dependency. > > Signed-off-by: James Hilliard > --- > package/libcamera/libcamera.mk | 2 +- > package/mongodb/mongodb.mk | 2 +- > package/python-pyyaml/Config.in | 1 + > package/python-pyyaml/python-pyyaml.hash | 4 ++-- > package/python-pyyaml/python-pyyaml.mk | 9 +++++---- > package/python3-pyyaml/python3-pyyaml.hash | 1 - > package/python3-pyyaml/python3-pyyaml.mk | 20 -------------------- > 7 files changed, 10 insertions(+), 29 deletions(-) > delete mode 120000 package/python3-pyyaml/python3-pyyaml.hash > delete mode 100644 package/python3-pyyaml/python3-pyyaml.mk Applied to master, thanks. I was surprised by the usage of host-python-pyyaml by host-sdbusplus. Indeed, host-sdbusplus depends on host-python3 and host-python-pyyaml, the latter being (before your patch) forcefully build for Python 2.x. So of the 3 Python modules that host-sdbusplus needs (inflection, mako, pyyaml), inflection and mako were installed for the host Python 3.x interpreter, and host-python-pyyaml for the host Python 2.x interpreter. And the host-sdbusplus build, even though it depended on host-python3, was in fact using host Python 2.x... which raises a question on the actual need of host-python-inflection and host-python-mako... as they are not actually needed during the build: the build succeeds when host-sdbusplus uses host Python 2.x, while mako and inflection are installed for host Python 3.x. It seems like they are only used at runtime ? But that also wouldn't work. Anyway, now with host-python-pyyaml being python3 only, this kind of solves the problem. But perhaps host-sdbusplus should be explicitly told to use $(HOST_DIR)/bin/python3, because if $(HOST_DIR)/bin/python2 is here, it will use it, and it won't have access to pyyaml. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:05:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:05:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/poppler: fix introspection build In-Reply-To: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> References: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230532.43ebcc51@windsurf> Hello Fabrice, +Adam for GOI expertise. On Mon, 24 Jan 2022 22:34:45 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since commit > 9d1d4818c39d97ad7a1cdf6e075b9acae6dfff71: > > [ 98%] Generating Poppler-0.18.typelib > Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 > If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > Fixes: > - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e > > Signed-off-by: Fabrice Fontaine > --- > ...txt-allow-the-user-to-configure-INTR.patch | 43 +++++++++++++++++++ > package/poppler/poppler.mk | 4 +- > 2 files changed, 46 insertions(+), 1 deletion(-) > create mode 100644 package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > > diff --git a/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > new file mode 100644 > index 0000000000..473966d7c9 > --- /dev/null > +++ b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > @@ -0,0 +1,43 @@ > +From f9e5d423b0f765f2393a95c3299a2d827b9d3fb3 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 24 Jan 2022 09:28:20 +0100 > +Subject: [PATCH] glib/CMakeLists.txt: allow the user to configure > + INTROSPECTION_COMPILER_ARGS > + > +Allow the user to add its own parameters such as > +--includedir=$(STAGING_DIR)/usr/share/gir-1.0 to > +INTROSPECTION_COMPILER_ARGS to avoid the following build failure when > +cross-compiling with buildroot: > + > +[ 98%] Generating Poppler-0.18.typelib > +Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > +error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 > +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > + > +Fixes: > + - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1049] > +--- > + glib/CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt > +index 7510e69e..f5130e3c 100644 > +--- a/glib/CMakeLists.txt > ++++ b/glib/CMakeLists.txt > +@@ -119,7 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) > + # General gir: Reset object-list for introspection & load tool args > + set(INTROSPECTION_GIRS) > + set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all") > +- set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") > ++ set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") Is this the right way of doing this? I see that glib-2.0.pc file has a "girdir" variable (which you have added in package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch to fix build issues in atk or libnice). So it seems like atk and libnice are automatically able to use these pkg-config files to find out this gir directory. Shouldn't poppler do the same ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:05:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:05:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/sslh: fix build with gcc 4.8 In-Reply-To: <20220124213631.2444354-1-fontaine.fabrice@gmail.com> References: <20220124213631.2444354-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230559.2957b075@windsurf> On Mon, 24 Jan 2022 22:36:31 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 1.22c in > commit 5b9c58531e97b012a8a11c6ae5145b16dcfb8f74: > > sslh-select.c: In function 'udp_timeouts': > sslh-select.c:480:5: error: 'for' loop initial declarations are only allowed in C99 mode > for (int i = 0; i < fd_info->max_fd; i++) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/aaaac2beb16730747b4265e81d09cb5e072c7267 > > Signed-off-by: Fabrice Fontaine > --- > package/sslh/sslh.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:06:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:06:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump to version 0.103.5 In-Reply-To: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> References: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230633.4a76c296@windsurf> On Mon, 24 Jan 2022 23:10:47 +0100 Fabrice Fontaine wrote: > ClamAV 0.103.5 is a critical patch release with the following fix: > > - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. > Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with > libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the > clamscan --gen-json option) is enabled. > > https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md > > Signed-off-by: Fabrice Fontaine > --- > package/clamav/clamav.hash | 2 +- > package/clamav/clamav.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:05:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:05:55 +0100 Subject: [Buildroot] [git commit] package/sslh: fix build with gcc 4.8 Message-ID: <20220126215945.9C042827A0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96c6ccb49808c312a7dfbd12edf08716de621405 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 1.22c in commit 5b9c58531e97b012a8a11c6ae5145b16dcfb8f74: sslh-select.c: In function 'udp_timeouts': sslh-select.c:480:5: error: 'for' loop initial declarations are only allowed in C99 mode for (int i = 0; i < fd_info->max_fd; i++) { ^ Fixes: - http://autobuild.buildroot.org/results/aaaac2beb16730747b4265e81d09cb5e072c7267 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/sslh/sslh.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 99fb6bf922..897b3b6505 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -11,7 +11,7 @@ SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING SSLH_DEPENDENCIES = pcre2 -SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) +SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" ifeq ($(BR2_PACKAGE_LIBBSD),y) SSLH_DEPENDENCIES += libbsd From thomas.petazzoni at bootlin.com Wed Jan 26 22:06:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:06:29 +0100 Subject: [Buildroot] [git commit] package/clamav: security bump to version 0.103.5 Message-ID: <20220126215945.A44FD7FA40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f92c093c7a39b8e0d6754c452268b0af20ef860b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ClamAV 0.103.5 is a critical patch release with the following fix: - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the clamscan --gen-json option) is enabled. https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index d68b04af76..73f4ff88f1 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz +sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 94b589b975..cd2d06e6b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.4 +CLAMAV_VERSION = 0.103.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From thomas.petazzoni at bootlin.com Wed Jan 26 22:08:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:08:26 +0100 Subject: [Buildroot] [git commit] package/freeipmi: bump to version 1.6.9 Message-ID: <20220126220146.3CBC58276A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f53928c2cb9bcc188a2586fc97535c2238ead50b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) and so autoreconf https://github.com/chu11/freeipmi-mirror/blob/freeipmi-1-6-9/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/freeipmi/0001-fix-build-on-musl.patch | 49 --------------------- package/freeipmi/0002-check-for-inb-and-outb.patch | 50 ---------------------- package/freeipmi/freeipmi.hash | 2 +- package/freeipmi/freeipmi.mk | 4 +- 4 files changed, 2 insertions(+), 103 deletions(-) diff --git a/package/freeipmi/0001-fix-build-on-musl.patch b/package/freeipmi/0001-fix-build-on-musl.patch deleted file mode 100644 index ff7425d221..0000000000 --- a/package/freeipmi/0001-fix-build-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 Oct 2021 00:26:40 +0200 -Subject: [PATCH] fix build on musl - -musl doesn't provide getmsg or putmsg even if stropts.h is available - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2] ---- - configure.ac | 1 + - libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 562dd624e..711b27674 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) - AC_CHECK_FUNCS([iopl]) - AC_CHECK_FUNCS([asprintf]) - AC_CHECK_FUNCS([cbrt]) -+AC_CHECK_FUNCS([getmsg putmsg]) - - dnl sighandler_t apparently not defined in Apple/OS X - AC_CHECK_TYPES([sighandler_t], [], [], [[#include ]]) -diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c -index 05caca8b6..4ae8c5719 100644 ---- a/libfreeipmi/driver/ipmi-sunbmc-driver.c -+++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c -@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx, - assert (ctx->io_init); - assert (ctx->putmsg_intf); - --#if defined(HAVE_SYS_STROPTS_H) -+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG) - memset (&sbuf, '\0', sizeof (struct strbuf)); - - /* Due to API differences, we need to extract the cmd out of the -@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx, - return (-1); - } - --#if defined(HAVE_SYS_STROPTS_H) -+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG) - if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0) - { - SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno); diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch deleted file mode 100644 index 3bc006acc7..0000000000 --- a/package/freeipmi/0002-check-for-inb-and-outb.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 2 Jan 2022 10:37:00 +0100 -Subject: [PATCH] check for inb and outb - -Check for inb and outb before using them to avoid the following build -failure on uclibc-ng: - -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': -/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' - -Fixes: - - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] ---- - configure.ac | 2 +- - libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 711b27674..bcc4156ff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) - AC_CHECK_FUNCS([getline getprogname]) - AC_CHECK_FUNCS([strerror strerror_r]) - AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) --AC_CHECK_FUNCS([iopl]) -+AC_CHECK_FUNCS([inb iopl outb]) - AC_CHECK_FUNCS([asprintf]) - AC_CHECK_FUNCS([cbrt]) - AC_CHECK_FUNCS([getmsg putmsg]) -diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c -index c212887c0..a9d4b2e96 100644 ---- a/libfreeipmi/driver/ipmi-kcs-driver.c -+++ b/libfreeipmi/driver/ipmi-kcs-driver.c -@@ -162,7 +162,7 @@ - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - # define _INB(port) inb (port) - # define _OUTB(data, port) outb (port, data) --#elif defined(HAVE_IOPL) -+#elif defined(HAVE_INB) && defined(HAVE_OUTB) - # define _INB(port) inb (port) - # define _OUTB(data, port) outb (data, port) - #else --- -2.33.0 - diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index f73b4a25fe..05fb50bd4c 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71 freeipmi-1.6.8.tar.gz +sha256 f25e1c35f3d0f1b5a99cc31ecc2353ca83ed46a15163842fba870127dc9c8206 freeipmi-1.6.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index b25ef0a4c6..9fb59245b9 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.8 +FREEIPMI_VERSION = 1.6.9 FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ @@ -14,8 +14,6 @@ FREEIPMI_LICENSE_FILES = \ COPYING.sunbmc COPYING.ZRESEARCH FREEIPMI_DEPENDENCIES = host-pkgconf FREEIPMI_INSTALL_STAGING = YES -# We're patching configure.ac -FREEIPMI_AUTORECONF = YES # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE FREEIPMI_CONF_OPTS = --without-random-device From thomas.petazzoni at bootlin.com Wed Jan 26 22:09:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:09:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: bump to version 1.6.9 In-Reply-To: <20220124221657.2629467-1-fontaine.fabrice@gmail.com> References: <20220124221657.2629467-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230926.7b02ffda@windsurf> On Mon, 24 Jan 2022 23:16:57 +0100 Fabrice Fontaine wrote: > Drop patches (already in version) and so autoreconf > > https://github.com/chu11/freeipmi-mirror/blob/freeipmi-1-6-9/NEWS > > Signed-off-by: Fabrice Fontaine > --- > package/freeipmi/0001-fix-build-on-musl.patch | 49 ------------------ > .../0002-check-for-inb-and-outb.patch | 50 ------------------- > ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 ------------------- > package/freeipmi/freeipmi.hash | 2 +- > package/freeipmi/freeipmi.mk | 4 +- > 5 files changed, 2 insertions(+), 153 deletions(-) > delete mode 100644 package/freeipmi/0001-fix-build-on-musl.patch > delete mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch > delete mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch This patch was not applying on master, because it was assuming that "package/freeipmi: fix static build with libgcrypt" was applied, which isn't in master. Since the patch added by "package/freeipmi: fix static build with libgcrypt" is not in upstream freeipmi, I applied the version bump, but without the removal of patch 0003. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:09:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:09:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix static build with libgcrypt In-Reply-To: <20220115153319.2227752-1-fontaine.fabrice@gmail.com> References: <20220115153319.2227752-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230936.32fe7c2e@windsurf> On Sat, 15 Jan 2022 16:33:19 +0100 Fabrice Fontaine wrote: > Fix the following static build failure with libgcrypt raised since the > addition of the package in commit > 663f39c88c01593855c18355a4decdceeffd884b: > > configure:13665: /home/buildroot/autobuild/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lgcrypt >&5 > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libgcrypt.a(libgcrypt_la-visibility.o): in function `gcry_err_make_from_errno': > visibility.c:(.text+0x29): undefined reference to `gpg_err_code_from_errno' > > Fixes: > - http://autobuild.buildroot.org/results/5354f7231cf08bf762e7d86fca874ce63d9a116b > > Signed-off-by: Fabrice Fontaine > --- > ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 +++++++++++++++++++ > 1 file changed, 50 insertions(+) > create mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch I've marked this one as Not Applicable. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:09:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:09:50 +0100 Subject: [Buildroot] [git commit] package/whois: bump to version 5.5.11 Message-ID: <20220126220305.B04DD8276A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7deb5618efefdef4d4a6eac2b4c4dc3c11d484c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 1478d60697..4bdfd74b20 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois/whois_5.5.10.dsc -sha256 2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd whois_5.5.10.tar.xz +# From http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois/whois_5.5.11.dsc +sha256 966281eb8301c14a1acc17e46c70061f73179d80e370aef43065c22f0947fb87 whois_5.5.11.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index c5d0a6f2ad..544cb9c2f7 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.10 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois +WHOIS_VERSION = 5.5.11 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ From thomas.petazzoni at bootlin.com Wed Jan 26 22:14:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:14:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: add optional nmcli support In-Reply-To: <20220126090457.32015-1-mf@go-sys.de> References: <20220126090457.32015-1-mf@go-sys.de> Message-ID: <20220126231432.37374caf@windsurf> Hello, +Yann on legacy handling (see below) On Wed, 26 Jan 2022 10:04:57 +0100 Michael Fischer wrote: > When NetworkManager is built without the READLINE package the nmcli was not build. Well, this was kind of expected, and isn't really a correct explanation for this change. A better explanation I believe is more something like this: """ The network-manager package builds the nmcli utility when the readline package is enabled. However, this is not necessarily obvious to the user. Therefore, this commit adds an explicit option to enable the nmcli tool, which automatically selects readline. """ > > Signed-off-by: Michael Fischer > +config BR2_PACKAGE_NETWORK_MANAGER_CLI > + bool "nmcli support" > + select BR2_PACKAGE_READLINE > + help > + This option enables support for NetworkManager Command Line Interface I think this line is too long, make sure to run "make check-package". But a bigger problem is the legacy handling. Indeed, before your patch, a configuration with BR2_PACKAGE_NETWORK_MANAGER=y and BR2_PACKAGE_READLINE=y gets nmcli. After your patch, such a configuration no longer has nmcli compiled, because BR2_PACKAGE_NETWORK_MANAGER_CLI is not enabled. Is this important to address, I don't know. Is it possible to address is by doing: config BR2_PACKAGE_NETWORK_MANAGER_CLI bool "nmcli support" default y if BR2_PACKAGE_READLINE select BR2_PACKAGE_READLINE I don't know if Kconfig is happy about such a construct. Yann? :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:15:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:15:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/busybox: bump version to 1.35.0 In-Reply-To: <20220126092810.6645-1-mf@go-sys.de> References: <20220126092810.6645-1-mf@go-sys.de> Message-ID: <20220126231554.0fcc106d@windsurf> Hello Michael, Thanks for your patch! On Wed, 26 Jan 2022 10:28:10 +0100 Michael Fischer wrote: > Signed-off-by: Michael Fischer > --- > package/busybox/busybox.hash | 4 ++-- > package/busybox/busybox.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Thanks, but don't we also need a refresh of package/busybox/busybox.config and package/busybox/busybox-minimal.config at the same time? I'm not even sure when was the last time they were refreshed. Maybe we need a first patch that refreshes them before the bump, and then the version bump itself with the refresh corresponding to the version bump ? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:16:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:16:29 +0100 Subject: [Buildroot] [git commit] package/pipewire: link examples with -latomic Message-ID: <20220126220941.081E68123F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dd830766e7b35f53eecbf2a85261b99564cde76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Link examples with -latomic to avoid the following build failure raised since commit 3edc1cc44c7bd2deed31d28fa9534e67f32334e8: FAILED: spa/examples/adapter-control /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...spa-meson.build-add-atomic_dep-dependency.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch b/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch new file mode 100644 index 0000000000..b91adbe7e4 --- /dev/null +++ b/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch @@ -0,0 +1,40 @@ +From 8d9dc023ac12cf305c28786891d5b15e13f29a3d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 25 Jan 2022 17:22:02 +0100 +Subject: [PATCH] spa/meson.build: add atomic_dep dependency + +Commit fa64d93e64592d5edd8767f722cf4ea093641052 moved the atomic_dep +from pipewire-jack to pipewire_dep however atomic_dep should also be +added to spa_dev to avoid the following build failure when building +examples (which don't depend on pipewire_dep): + +FAILED: spa/examples/adapter-control +/home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': +adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 + +[Retrieved from: +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8d9dc023ac12cf305c28786891d5b15e13f29a3d] +Signed-off-by: Fabrice Fontaine +--- + spa/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/spa/meson.build b/spa/meson.build +index 4ad37cdb4..2404748df 100644 +--- a/spa/meson.build ++++ b/spa/meson.build +@@ -9,6 +9,7 @@ spa_dep = declare_dependency( + include_directories : [ + include_directories('include'), + ], ++ dependencies : [atomic_dep], + version : spaversion, + variables : { + 'plugindir' : meson.current_build_dir() / 'plugins', +-- +GitLab + From thomas.petazzoni at bootlin.com Wed Jan 26 22:16:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:16:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: link examples with -latomic In-Reply-To: <20220126202942.1495636-1-fontaine.fabrice@gmail.com> References: <20220126202942.1495636-1-fontaine.fabrice@gmail.com> Message-ID: <20220126231638.5183ec78@windsurf> On Wed, 26 Jan 2022 21:29:42 +0100 Fabrice Fontaine wrote: > Link examples with -latomic to avoid the following build failure raised > since commit 3edc1cc44c7bd2deed31d28fa9534e67f32334e8: > > FAILED: spa/examples/adapter-control > /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group > /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': > adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' > > Fixes: > - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 > > Signed-off-by: Fabrice Fontaine > --- > ...eson.build-add-atomic_dep-dependency.patch | 40 +++++++++++++++++++ > 1 file changed, 40 insertions(+) > create mode 100644 package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:16:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:16:56 +0100 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4224 Message-ID: <20220126221006.E7C26817DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3da56369c75473ee3fac768b86382adcdec3f76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository vim/vim prior to 8.2.4120 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fff5072063..49056b31cd 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 408b33a409..74ab1ec584 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4092 +VIM_VERSION = 8.2.4224 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From thomas.petazzoni at bootlin.com Wed Jan 26 22:17:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:17:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4224 In-Reply-To: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> References: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> Message-ID: <20220126231702.7da0b712@windsurf> On Wed, 26 Jan 2022 21:37:33 +0100 Fabrice Fontaine wrote: > Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository > vim/vim prior to 8.2.4120 > > Signed-off-by: Fabrice Fontaine > --- > package/vim/vim.hash | 2 +- > package/vim/vim.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 26 22:17:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 23:17:08 +0100 Subject: [Buildroot] [PATCH 1/1] fs: fix /tmp and /run clean-up in POSIX shells In-Reply-To: <20220124104116.12902-2-evgeni@studio-punkt.com> References: <20220124104116.12902-1-evgeni@studio-punkt.com> <20220124104116.12902-2-evgeni@studio-punkt.com> Message-ID: <20220126221708.GK457876@scaer> Evgeni, All, On 2022-01-24 11:41 +0100, Evgeni Dobrev via buildroot spake thusly: > In POSIX sh, ^ in place of ! in glob bracket expressions > is undefined. > > Signed-off-by: Evgeni Dobrev > --- > fs/common.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..64a94d9ad8 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) TIL that bracket expressions are actually valid and specified by POSIX. But we do guarantee that we do have bash as a shell when running Buildroot, so I think it is fair to also run the fs script with bash: diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..f8a6da6bc4 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -172,7 +172,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(BASE_TARGET_DIR)/ \ $$(TARGET_DIR) - echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) + echo '#!$(SHELL)' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) However, $(SHELL) is not always correct, so we'd probably need: diff --git a/Makefile b/Makefile index 5fc7137e5a..bb9955f5b6 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ # we want bash as shell SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ - else echo sh; fi; fi) + else which sh; fi; fi) # Set O variable if not already done on the command line; # or avoid confusing packages that can use the O=

     syntax for out-of-tree But in the end this is quite more changes than what you propose. Can we also shorten the command? echo "rm -rf $$(TARGET_DIR)/{run,tmp}/* $$(TARGET_DIR)/{run,tmp}/.[!.]*" >> $$(FAKEROOT_SCRIPT) Regards, Yann E. MORIN. > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Wed Jan 26 22:22:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 23:22:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/poppler: fix introspection build In-Reply-To: <20220126230532.43ebcc51@windsurf> References: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> <20220126230532.43ebcc51@windsurf> Message-ID: Hello, Le mer. 26 janv. 2022 ? 23:05, Thomas Petazzoni a ?crit : > > Hello Fabrice, > > +Adam for GOI expertise. > > On Mon, 24 Jan 2022 22:34:45 +0100 > Fabrice Fontaine wrote: > > > Fix the following build failure raised since commit > > 9d1d4818c39d97ad7a1cdf6e075b9acae6dfff71: > > > > [ 98%] Generating Poppler-0.18.typelib > > Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > > error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 > > If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > > > Fixes: > > - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...txt-allow-the-user-to-configure-INTR.patch | 43 +++++++++++++++++++ > > package/poppler/poppler.mk | 4 +- > > 2 files changed, 46 insertions(+), 1 deletion(-) > > create mode 100644 package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > > > > diff --git a/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > > new file mode 100644 > > index 0000000000..473966d7c9 > > --- /dev/null > > +++ b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > > @@ -0,0 +1,43 @@ > > +From f9e5d423b0f765f2393a95c3299a2d827b9d3fb3 Mon Sep 17 00:00:00 2001 > > +From: Fabrice Fontaine > > +Date: Mon, 24 Jan 2022 09:28:20 +0100 > > +Subject: [PATCH] glib/CMakeLists.txt: allow the user to configure > > + INTROSPECTION_COMPILER_ARGS > > + > > +Allow the user to add its own parameters such as > > +--includedir=$(STAGING_DIR)/usr/share/gir-1.0 to > > +INTROSPECTION_COMPILER_ARGS to avoid the following build failure when > > +cross-compiling with buildroot: > > + > > +[ 98%] Generating Poppler-0.18.typelib > > +Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > > +error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 > > +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > > +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > + > > +Fixes: > > + - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e > > + > > +Signed-off-by: Fabrice Fontaine > > +[Upstream status: > > +https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1049] > > +--- > > + glib/CMakeLists.txt | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt > > +index 7510e69e..f5130e3c 100644 > > +--- a/glib/CMakeLists.txt > > ++++ b/glib/CMakeLists.txt > > +@@ -119,7 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) > > + # General gir: Reset object-list for introspection & load tool args > > + set(INTROSPECTION_GIRS) > > + set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all") > > +- set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") > > ++ set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") > > Is this the right way of doing this? I see that glib-2.0.pc file has a > "girdir" variable (which you have added in > package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch > to fix build issues in atk or libnice). So it seems like atk and > libnice are automatically able to use these pkg-config files to find > out this gir directory. Indeed, this is true but atk and libnice are meson packages. For autotools packages, commit 8dda79970661090f202e1f20e5982ba53fdaeb95 updated Makefile.introspection. > > Shouldn't poppler do the same ? poppler is a cmake-package and I thought that the suggested approach is the simplest, less invasive and quickest approach. Upstream is also ok for this patch. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From yann.morin.1998 at free.fr Wed Jan 26 22:28:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 23:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: add optional nmcli support In-Reply-To: <20220126231432.37374caf@windsurf> References: <20220126090457.32015-1-mf@go-sys.de> <20220126231432.37374caf@windsurf> Message-ID: <20220126222800.GL457876@scaer> Thomas, Michael, All, On 2022-01-26 23:14 +0100, Thomas Petazzoni spake thusly: > On Wed, 26 Jan 2022 10:04:57 +0100 > Michael Fischer wrote: [--SNIP--] > > +config BR2_PACKAGE_NETWORK_MANAGER_CLI > > + bool "nmcli support" > > + select BR2_PACKAGE_READLINE > > + help > > + This option enables support for NetworkManager Command Line Interface > > I think this line is too long, make sure to run "make check-package". > > But a bigger problem is the legacy handling. Indeed, before your patch, > a configuration with BR2_PACKAGE_NETWORK_MANAGER=y and > BR2_PACKAGE_READLINE=y gets nmcli. After your patch, such a > configuration no longer has nmcli compiled, because > BR2_PACKAGE_NETWORK_MANAGER_CLI is not enabled. I was also looking at that patch, and was wondering what we could do. I do not like efaulting symbols to 'y', even conditionally, and I would also expect people to regression-test their systems when they upgrade anyway. > Is this important to address, I don't know. > > Is it possible to address is by doing: > > config BR2_PACKAGE_NETWORK_MANAGER_CLI > bool "nmcli support" > default y if BR2_PACKAGE_READLINE > select BR2_PACKAGE_READLINE > > I don't know if Kconfig is happy about such a construct. Yann? :-) No it is not valid: you have both a backward and a forward dependency that drive the availability of the symbol: package/readline/Config.in:1:error: recursive dependency detected! package/readline/Config.in:1: symbol BR2_PACKAGE_READLINE is selected by BR2_PACKAGE_NETWORK_MANAGER_CLI package/network-manager/Config.in:36: symbol BR2_PACKAGE_NETWORK_MANAGER_CLI depends on BR2_PACKAGE_READLINE For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" TBH, I would just leave it like that... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Jan 26 22:32:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:32:04 +0100 Subject: [Buildroot] [PATCH 1/2] package/xvisor: drop arm support In-Reply-To: <20220125190650.107677-1-fontaine.fabrice@gmail.com> References: <20220125190650.107677-1-fontaine.fabrice@gmail.com> Message-ID: <20220126233204.36d9c37c@windsurf> On Tue, 25 Jan 2022 20:06:49 +0100 Fabrice Fontaine wrote: > Support for old 32-bit ARM boards (i.e. ARMv5, ARMv6, ARMv7a) without > virtualization has been dropped since > https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 > resulting in the following build failure since bump to version 0.3.1 in > commit c4f8b8968770ecbf6444a5921c6472f126717626: > > *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v6-defconfig"! > > *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-0/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v7-defconfig"! > > Fixes: > - http://autobuild.buildroot.org/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b > - http://autobuild.buildroot.org/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 > > Signed-off-by: Fabrice Fontaine > --- > package/xvisor/Config.in | 6 +----- > package/xvisor/xvisor.mk | 2 +- > 2 files changed, 2 insertions(+), 6 deletions(-) I think this is based on a misunderstanding of the https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 commit. This commit says that they remove support for "ARM32 without virtualization support", but there are ARM32 cores with virtualization support! As explained in the commit log, the ARM32 cores that support the ARMv7ve instruction set are still supported by Xvisor. This means that Cortex-A7, Cortex-A12, Cortex-A15 and Cortex-A17, which are all ARM32 cores, are still supported by Xvisor. So this patch entirely dropping ARM32 from Xvisor isn't entirely correct. So, the change should be more like this: config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool depends on BR2_USE_MMU default y if BR2_aarch64 default y if BR2_x86_64 default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17 config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" - default "generic-v5" if BR2_ARM_CPU_ARMV5 - default "generic-v6" if BR2_ARM_CPU_ARMV6 - default "generic-v7" if BR2_ARM_CPU_ARMV7A + default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A default "generic-v8" if BR2_aarch64 default "x86_64_generic" if BR2_x86_64 What do you think ? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:32:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:32:32 +0100 Subject: [Buildroot] [git commit] package/gupnp: bump to version 1.4.3 Message-ID: <20220126222545.070A782626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5312db2b1fbddaeb209ffaaefe611d32754a5382 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.3/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index cc78be7d5d..cc5e2b5775 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.2.sha256sum: -sha256 bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc gupnp-1.4.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: +sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index aebf9225a8..dca747f064 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Wed Jan 26 22:32:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:32:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/gupnp: bump to version 1.4.3 In-Reply-To: <20220125185126.52194-1-fontaine.fabrice@gmail.com> References: <20220125185126.52194-1-fontaine.fabrice@gmail.com> Message-ID: <20220126233240.1dbd1147@windsurf> On Tue, 25 Jan 2022 19:51:26 +0100 Fabrice Fontaine wrote: > https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.3/NEWS > > Signed-off-by: Fabrice Fontaine > --- > package/gupnp/gupnp.hash | 4 ++-- > package/gupnp/gupnp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:33:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:33:15 +0100 Subject: [Buildroot] [git commit] package/mongodb: security bump to version 4.2.18 Message-ID: <20220126222628.05A8E82626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49bbf644d4acd3dfe6f3fd0db39e6fed78abf58f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-20330: An attacker with basic CRUD permissions on a replicated collection can run the applyOps command with specially malformed oplog entries, resulting in a potential denial of service on secondaries. This issue affects MongoDB Server v4.0 versions prior to 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server v4.4 versions prior to 4.4.6. Drop third patch (already in version) https://docs.mongodb.com/master/release-notes/4.2/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch | 49 ---------------------- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch b/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch deleted file mode 100644 index 02b35c6e4f..0000000000 --- a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ef08d0dbc99db8c4620512e92bfb3154282eb5d3 Mon Sep 17 00:00:00 2001 -From: Andrew Morrow -Date: Wed, 15 Sep 2021 15:23:42 -0400 -Subject: [PATCH] SERVER-59459 With glibc-2.34, MINSIGSTKSZ is no longer a - constant - -[Retrieved (and backported) from: -https://github.com/mongodb/mongo/commit/ef08d0dbc99db8c4620512e92bfb3154282eb5d3] -Signed-off-by: Fabrice Fontaine ---- - src/mongo/stdx/thread.h | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h -index 7b15bb561bd9..6f1e16cdeb36 100644 ---- a/src/mongo/stdx/thread.h -+++ b/src/mongo/stdx/thread.h -@@ -76,11 +76,19 @@ class SigAltStackController { - } - - private: -+ static size_t _getStackSize() { -+ // It would be nice for this to be a constexpr, but -+ // MINSIGSTKSZ became a macro that invoked `sysconf` in glibc -+ // 2.34. -+ static const std::size_t kMinSigStkSz = MINSIGSTKSZ; -+ return std::max(kMongoMinSignalStackSize, kMinSigStkSz); -+ } -+ - void _install() const { - stack_t ss; - ss.ss_sp = _stackStorage.get(); - ss.ss_flags = 0; -- ss.ss_size = kStackSize; -+ ss.ss_size = _getStackSize(); - if (sigaltstack(&ss, nullptr)) { - abort(); - } -@@ -107,9 +115,7 @@ class SigAltStackController { - // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) - static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; - -- static constexpr std::size_t kStackSize = -- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); -- std::unique_ptr _stackStorage = std::make_unique(kStackSize); -+ std::unique_ptr _stackStorage = std::make_unique(_getStackSize()); - - #else // !MONGO_HAS_SIGALTSTACK - auto makeInstallGuard() const { diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 3b2580cc43..02da8ad452 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 92656dd7a4..311b9de14e 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.11 +MONGODB_VERSION = 4.2.18 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz From thomas.petazzoni at bootlin.com Wed Jan 26 22:33:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:33:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongodb: security bump to version 4.2.18 In-Reply-To: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> References: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> Message-ID: <20220126233324.523b01d9@windsurf> On Tue, 25 Jan 2022 18:34:22 +0100 Fabrice Fontaine wrote: > Fix CVE-2021-20330: An attacker with basic CRUD permissions on a > replicated collection can run the applyOps command with specially > malformed oplog entries, resulting in a potential denial of service on > secondaries. This issue affects MongoDB Server v4.0 versions prior to > 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server > v4.4 versions prior to 4.4.6. > > Drop third patch (already in version) > > https://docs.mongodb.com/master/release-notes/4.2/ > > Signed-off-by: Fabrice Fontaine > --- > ...-MINSIGSTKSZ-is-no-longer-a-constant.patch | 49 ------------------- > package/mongodb/mongodb.hash | 2 +- > package/mongodb/mongodb.mk | 2 +- > 3 files changed, 2 insertions(+), 51 deletions(-) > delete mode 100644 package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:33:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:33:58 +0100 Subject: [Buildroot] [git commit] package/gstreamer/gst1-plugins-bad: fix build with neon Message-ID: <20220126222709.D01E182626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90eca683f3272ec246098b5e6ef97b99f5844ea4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of neon to version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc: ../output-1/build/gst1-plugins-bad-1.18.5/ext/neon/meson.build:1:0: ERROR: Invalid version of dependency, need 'neon' ['<= 0.31.99'] found '0.32.2'. Fixes: - http://autobuild.buildroot.org/results/eaf1890176431000ea8b371956f0d2d7e9907aea Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-neon-Allow-building-against-neon-0-32-x.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch b/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch new file mode 100644 index 0000000000..e995a8cb91 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch @@ -0,0 +1,29 @@ +From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 26 Sep 2021 21:34:30 +0200 +Subject: [PATCH] neon: Allow building against neon 0.32.x + +No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3 + +Part-of: + +[Retrieved from: +https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0] +Signed-off-by: Fabrice Fontaine +--- + subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/neon/meson.build b/ext/neon/meson.build +index bf49be9111..abd9763649 100644 +--- a/ext/neon/meson.build ++++ b/ext/neon/meson.build +@@ -1,4 +1,4 @@ +-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'], ++neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'], + required : get_option('neon')) + + if neon_dep.found() +-- +GitLab + From thomas.petazzoni at bootlin.com Wed Jan 26 22:34:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:34:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer/gst1-plugins-bad: fix build with neon In-Reply-To: <20220125173328.3475928-1-fontaine.fabrice@gmail.com> References: <20220125173328.3475928-1-fontaine.fabrice@gmail.com> Message-ID: <20220126233407.6b987cea@windsurf> On Tue, 25 Jan 2022 18:33:28 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump of neon to version > 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc: > > ../output-1/build/gst1-plugins-bad-1.18.5/ext/neon/meson.build:1:0: ERROR: Invalid version of dependency, need 'neon' ['<= 0.31.99'] found '0.32.2'. > > Fixes: > - http://autobuild.buildroot.org/results/eaf1890176431000ea8b371956f0d2d7e9907aea > > Signed-off-by: Fabrice Fontaine > --- > ...n-Allow-building-against-neon-0-32-x.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From petr.vorel at gmail.com Wed Jan 26 22:35:20 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Wed, 26 Jan 2022 23:35:20 +0100 Subject: [Buildroot] [PATCH] package/uclibc: update to 1.0.40 In-Reply-To: References: Message-ID: Hi Waldemar, Reviewed-by: Petr Vorel Kind regards, Petr From thomas.petazzoni at bootlin.com Wed Jan 26 22:35:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:35:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/poppler: fix introspection build In-Reply-To: References: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> <20220126230532.43ebcc51@windsurf> Message-ID: <20220126233536.36053b53@windsurf> On Wed, 26 Jan 2022 23:22:24 +0100 Fabrice Fontaine wrote: > Indeed, this is true but atk and libnice are meson packages. > For autotools packages, commit > 8dda79970661090f202e1f20e5982ba53fdaeb95 updated > Makefile.introspection. Correct, I also looked into these :-) > poppler is a cmake-package and I thought that the suggested approach > is the simplest, less invasive and quickest approach. Upstream is also > ok for this patch. Yeah, maybe it's the most pragmatic solution. It just feels annoying that we have to teach "all" users of GOI where the GIR files are located. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Jan 26 22:38:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 23:38:23 +0100 Subject: [Buildroot] [PATCH 1/2] package/xvisor: drop arm support In-Reply-To: <20220126233204.36d9c37c@windsurf> References: <20220125190650.107677-1-fontaine.fabrice@gmail.com> <20220126233204.36d9c37c@windsurf> Message-ID: Le mer. 26 janv. 2022 ? 23:32, Thomas Petazzoni a ?crit : > > On Tue, 25 Jan 2022 20:06:49 +0100 > Fabrice Fontaine wrote: > > > Support for old 32-bit ARM boards (i.e. ARMv5, ARMv6, ARMv7a) without > > virtualization has been dropped since > > https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 > > resulting in the following build failure since bump to version 0.3.1 in > > commit c4f8b8968770ecbf6444a5921c6472f126717626: > > > > *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v6-defconfig"! > > > > *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-0/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v7-defconfig"! > > > > Fixes: > > - http://autobuild.buildroot.org/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b > > - http://autobuild.buildroot.org/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/xvisor/Config.in | 6 +----- > > package/xvisor/xvisor.mk | 2 +- > > 2 files changed, 2 insertions(+), 6 deletions(-) > > I think this is based on a misunderstanding of the > https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 > commit. This commit says that they remove support for "ARM32 without > virtualization support", but there are ARM32 cores with virtualization > support! As explained in the commit log, the ARM32 cores that support > the ARMv7ve instruction set are still supported by Xvisor. > > This means that Cortex-A7, Cortex-A12, Cortex-A15 and Cortex-A17, which > are all ARM32 cores, are still supported by Xvisor. So this patch > entirely dropping ARM32 from Xvisor isn't entirely correct. > > So, the change should be more like this: > > config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS > bool > depends on BR2_USE_MMU > default y if BR2_aarch64 > default y if BR2_x86_64 > default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17 > > config BR2_PACKAGE_XVISOR_DEFCONFIG > string "Defconfig name" > - default "generic-v5" if BR2_ARM_CPU_ARMV5 > - default "generic-v6" if BR2_ARM_CPU_ARMV6 > - default "generic-v7" if BR2_ARM_CPU_ARMV7A > + default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A > default "generic-v8" if BR2_aarch64 > default "x86_64_generic" if BR2_x86_64 > > What do you think ? You have more knowledge than me on ARM32. I'll send a v2 of the serie. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice From romain.naour at smile.fr Wed Jan 26 22:49:30 2022 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 26 Jan 2022 23:49:30 +0100 Subject: [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor In-Reply-To: <87lez2it1f.fsf@dell.be.48ers.dk> References: <20211230135621.2255847-1-romain.naour@gmail.com> <20211230135621.2255847-7-romain.naour@gmail.com> <87lez2it1f.fsf@dell.be.48ers.dk> Message-ID: Peter, Le 26/01/2022 ? 13:24, Peter Korsgaard a ?crit?: >>>>>> "Romain" == Romain Naour writes: > > > Fixes: > > radeon_present.c: In function ?radeon_present_check_flip?: > > radeon_present.c:281:21: error: invalid use of undefined type ?struct radeon_pixmap? > > 281 | if (priv && priv->fb_failed) > > | ^~ > > > Signed-off-by: Romain Naour > > Cc: Bernd Kuhls > > Is this only needed for xserver 21.x or does it also need to be > backported to 2021.02.x / 2021.11.x? > I haven't tried with previous xserver release but I don't think it's related to the xserver version. The issue has been introduced with xf86-video-ati-19.1.0 [1] which is available in Buildroot since 2019.11. [1] https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=33803c85f761d343aa7300311b8e9489b1a89495 Best regards, Romain From alistair23 at gmail.com Wed Jan 26 22:49:39 2022 From: alistair23 at gmail.com (Alistair Francis) Date: Thu, 27 Jan 2022 08:49:39 +1000 Subject: [Buildroot] [PATCH 2/2] package/xvisor: add riscv support In-Reply-To: <20220125190650.107677-2-fontaine.fabrice@gmail.com> References: <20220125190650.107677-1-fontaine.fabrice@gmail.com> <20220125190650.107677-2-fontaine.fabrice@gmail.com> Message-ID: On Wed, Jan 26, 2022 at 5:09 AM Fabrice Fontaine wrote: > > riscv is supported since version 0.3.0 and > https://github.com/xvisor/xvisor/commit/d6feda4e80eefd372294b081111ce709d08ee4c0 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Alistair Francis Alistair > --- > package/xvisor/Config.in | 4 +++- > package/xvisor/xvisor.mk | 2 ++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in > index 55c43e6959..4e7a3e1b53 100644 > --- a/package/xvisor/Config.in > +++ b/package/xvisor/Config.in > @@ -2,7 +2,7 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS > bool > default y > depends on BR2_USE_MMU > - depends on BR2_aarch64 || BR2_x86_64 > + depends on BR2_aarch64 || BR2_riscv || BR2_x86_64 > > menuconfig BR2_PACKAGE_XVISOR > bool "xvisor" > @@ -32,6 +32,8 @@ endchoice > config BR2_PACKAGE_XVISOR_DEFCONFIG > string "Defconfig name" > default "generic-v8" if BR2_aarch64 > + default "generic-32b" if BR2_RISCV_32 > + default "generic-64b" if BR2_RISCV_64 > default "x86_64_generic" if BR2_x86_64 > depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG > help > diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk > index 4ceb5ed7cb..1a7b49e689 100644 > --- a/package/xvisor/xvisor.mk > +++ b/package/xvisor/xvisor.mk > @@ -32,6 +32,8 @@ ifeq ($(BR2_x86_64),y) > XVISOR_ARCH = x86 > else ifeq ($(BR2_aarch64),y) > XVISOR_ARCH = arm > +else ifeq ($(BR2_riscv),y) > +XVISOR_ARCH = riscv > endif > > ifeq ($(BR2_PACKAGE_XVISOR)$(BR_BUILDING),yy) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Wed Jan 26 22:51:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 23:51:58 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/xvisor: drop ARM32 without virtualization support Message-ID: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> Support for old 32-bit ARM boards (i.e. ARMv5, ARMv6, ARMv7a) without virtualization has been dropped since https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 resulting in the following build failure since bump to version 0.3.1 in commit c4f8b8968770ecbf6444a5921c6472f126717626: *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v6-defconfig"! *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-0/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v7-defconfig"! As spotted by Thomas Petazzoni in https://patchwork.ozlabs.org/project/buildroot/patch/20220125190650.107677-1-fontaine.fabrice at gmail.com, "ARM32 cores that support the ARMv7ve instruction set are still supported by Xvisor. This means that Cortex-A7, Cortex-A12, Cortex-A15 and Cortex-A17, which are all ARM32 cores, are still supported" Fixes: - http://autobuild.buildroot.org/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b - http://autobuild.buildroot.org/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Keep ARM32 with virtualization package/xvisor/Config.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index eb7475b86d..71628e633e 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool - default y + default y if BR2_aarch64 + default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17 + default y if BR2_x86_64 depends on BR2_USE_MMU - depends on BR2_arm || BR2_aarch64 || BR2_x86_64 - depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV7M menuconfig BR2_PACKAGE_XVISOR bool "xvisor" @@ -32,9 +32,7 @@ endchoice config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" - default "generic-v5" if BR2_ARM_CPU_ARMV5 - default "generic-v6" if BR2_ARM_CPU_ARMV6 - default "generic-v7" if BR2_ARM_CPU_ARMV7A + default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A default "generic-v8" if BR2_aarch64 default "x86_64_generic" if BR2_x86_64 depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 26 22:51:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 23:51:59 +0100 Subject: [Buildroot] [PATCH v2,2/2] package/xvisor: add riscv support In-Reply-To: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> References: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> Message-ID: <20220126225159.1567622-2-fontaine.fabrice@gmail.com> riscv is supported since version 0.3.0 and https://github.com/xvisor/xvisor/commit/d6feda4e80eefd372294b081111ce709d08ee4c0 Signed-off-by: Fabrice Fontaine Reviewed-by: Alistair Francis --- package/xvisor/Config.in | 3 +++ package/xvisor/xvisor.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index 71628e633e..1eb50c8abe 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17 + default y if BR2_riscv default y if BR2_x86_64 depends on BR2_USE_MMU @@ -34,6 +35,8 @@ config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A default "generic-v8" if BR2_aarch64 + default "generic-32b" if BR2_RISCV_32 + default "generic-64b" if BR2_RISCV_64 default "x86_64_generic" if BR2_x86_64 depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG help diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index dc49258400..d7bb288ea8 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -32,6 +32,8 @@ ifeq ($(BR2_x86_64),y) XVISOR_ARCH = x86 else ifeq ($(BR2_arm)$(BR2_aarch64),y) XVISOR_ARCH = arm +else ifeq ($(BR2_riscv),y) +XVISOR_ARCH = riscv endif ifeq ($(BR2_PACKAGE_XVISOR)$(BR_BUILDING),yy) -- 2.34.1 From petr.vorel at gmail.com Wed Jan 26 23:00:14 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Jan 2022 00:00:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/ltp-testsuite: bump version to 20220121 Message-ID: <20220126230014.15420-1-petr.vorel@gmail.com> LTP now builds metadata directory as host target. It's mandatory, therefore adding HOST_CFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc). Drop patches from this release. Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it). Signed-off-by: Petr Vorel --- ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++-------- .../0002-lib-fix-MemAvailable-parsing.patch | 36 ----------- ...-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------ ...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ------------------ ...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 ------------------- package/ltp-testsuite/ltp-testsuite.hash | 6 +- package/ltp-testsuite/ltp-testsuite.mk | 4 +- 7 files changed, 23 insertions(+), 223 deletions(-) delete mode 100644 package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch delete mode 100644 package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch delete mode 100644 package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch delete mode 100644 package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch diff --git a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch index a167d938e1..2ceba64ed5 100644 --- a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +++ b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch @@ -1,4 +1,4 @@ -From bee452dfa2a34ba7df7db677e5673cbdcd23f61e Mon Sep 17 00:00:00 2001 +From f34c6ca3d543968e900d6327d8b5900db63f08ad Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Thu, 1 Oct 2020 23:28:39 +0200 Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc @@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h new file mode 100644 -index 000000000..d0e0e93d7 +index 0000000000..d0e0e93d7f --- /dev/null +++ b/include/lapi/sysinfo.h @@ -0,0 +1,22 @@ @@ -83,7 +83,7 @@ index 000000000..d0e0e93d7 + +#endif /* SYSINFO_H__ */ diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h -index d99441c86..0d26e9d45 100644 +index d99441c86f..0d26e9d455 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -12,7 +12,7 @@ @@ -96,44 +96,33 @@ index d99441c86..0d26e9d45 100644 #include #include diff --git a/lib/safe_macros.c b/lib/safe_macros.c -index a5b6bc504..20d01d304 100644 +index a5b6bc5047..87d922a928 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c -@@ -11,7 +11,6 @@ +@@ -11,7 +11,7 @@ #include #include #include -#include ++#include "lapi/sysinfo.h" #include #include #include -@@ -23,6 +22,7 @@ - #include - #include "test.h" - #include "safe_macros.h" -+#include "lapi/sysinfo.h" - - char *safe_basename(const char *file, const int lineno, - void (*cleanup_fn) (void), char *path) diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index 69077861f..ae1cad29b 100644 +index 4a49747613..000688f5a3 100644 --- a/lib/tst_memutils.c +++ b/lib/tst_memutils.c -@@ -5,11 +5,11 @@ - +@@ -6,7 +6,7 @@ + #include #include #include -#include ++#include "lapi/sysinfo.h" #include #define TST_NO_DEFAULT_MAIN - #include "tst_test.h" -+#include "lapi/sysinfo.h" - - #define BLOCKSIZE (16 * 1024 * 1024) - diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c -index 9676ea4b5..33b2ac822 100644 +index 20cb95191d..3462dc3f82 100644 --- a/testcases/kernel/mem/mtest01/mtest01.c +++ b/testcases/kernel/mem/mtest01/mtest01.c @@ -20,7 +20,6 @@ @@ -153,7 +142,7 @@ index 9676ea4b5..33b2ac822 100644 #define FIVE_HUNDRED_MB (500ULL*1024*1024) diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c -index 263b8e78b..4fa52e6ea 100644 +index 263b8e78bf..4fa52e6eae 100644 --- a/testcases/kernel/syscalls/madvise/madvise06.c +++ b/testcases/kernel/syscalls/madvise/madvise06.c @@ -46,7 +46,7 @@ @@ -166,7 +155,7 @@ index 263b8e78b..4fa52e6ea 100644 #include "tst_cgroup.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c -index 2ea44a2be..a237345ef 100644 +index 2ea44a2beb..a237345ef7 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c @@ -69,7 +69,7 @@ @@ -179,7 +168,7 @@ index 2ea44a2be..a237345ef 100644 #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c -index 7ad0e8bdc..61fa1ab75 100644 +index 7ad0e8bdcf..61fa1ab757 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c @@ -65,7 +65,7 @@ @@ -192,7 +181,7 @@ index 7ad0e8bdc..61fa1ab75 100644 #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c -index af7cb6421..dc5ae65e3 100644 +index af7cb6421e..dc5ae65e35 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c @@ -13,7 +13,7 @@ @@ -205,7 +194,7 @@ index af7cb6421..dc5ae65e3 100644 #include "lapi/posix_clocks.h" #include "tst_test.h" diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -index 22e7c3638..572701f9f 100644 +index 22e7c36386..572701f9fd 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c @@ -43,7 +43,7 @@ @@ -218,5 +207,5 @@ index 22e7c3638..572701f9f 100644 #include "../testfrmw/testfrmw.h" -- -2.33.0 +2.34.1 diff --git a/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch b/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch deleted file mode 100644 index 4a9a5b2363..0000000000 --- a/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001 -From: Ralph Siemsen -Date: Mon, 27 Sep 2021 22:18:50 -0400 -Subject: [PATCH] lib: fix MemAvailable parsing - -The amount of available memory was not being returned correctly, which -resulted in tests being executed when they should have been skipped. - -Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable") -Signed-off-by: Ralph Siemsen -Signed-off-by: Li Wang -Signed-off-by: Petr Vorel -[ upstream status: e42149e28 ("lib: fix MemAvailable parsing") ] ---- - lib/tst_memutils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index ae1cad29b..a46de78f5 100644 ---- a/lib/tst_memutils.c -+++ b/lib/tst_memutils.c -@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar) - - long long tst_available_mem(void) - { -- long long mem_available; -+ unsigned long long mem_available = 0; - -- if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld", -+ if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu", - &mem_available)) { - mem_available = SAFE_READ_MEMINFO("MemFree:") - + SAFE_READ_MEMINFO("Cached:"); --- -2.33.0 - diff --git a/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch b/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch deleted file mode 100644 index 056c769feb..0000000000 --- a/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:38:42 +0200 -Subject: [PATCH] lapi/rtnetlink.h: Fix include guards - -Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS") - -Signed-off-by: Petr Vorel -[ upstream status: a2a212cf8 ("lapi/rtnetlink.h: Fix include guards") ] ---- - include/lapi/rtnetlink.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h -index 8a1b5385b..04e9ad51a 100644 ---- a/include/lapi/rtnetlink.h -+++ b/include/lapi/rtnetlink.h -@@ -1,8 +1,8 @@ - // SPDX-License-Identifier: GPL-2.0-or-later - /* Copyright (c) 2021 Petr Vorel */ - --#ifndef LAPI_IF_ADDR_H__ --# define LAPI_IF_ADDR_H__ -+#ifndef LAPI_RTNETLINK_H__ -+# define LAPI_RTNETLINK_H__ - - #include - -@@ -10,4 +10,4 @@ - # define IFA_FLAGS 8 - #endif - --#endif /* LAPI_IF_ADDR_H__ */ -+#endif /* LAPI_RTNETLINK_H__ */ --- -2.33.0 - diff --git a/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch b/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch deleted file mode 100644 index 4044636e63..0000000000 --- a/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch +++ /dev/null @@ -1,58 +0,0 @@ -From b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:37:19 +0200 -Subject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h - -There will be fix in next commit for missing IFA_F_NOPREFIXROUTE which -requires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h, -as it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just -like includes . - -Signed-off-by: Petr Vorel -[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-3-petr.vorel at gmail.com/T/#u ] ---- - include/lapi/if_addr.h | 16 ++++++++++++++++ - include/lapi/rtnetlink.h | 5 +---- - 2 files changed, 17 insertions(+), 4 deletions(-) - create mode 100644 include/lapi/if_addr.h - -diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h -new file mode 100644 -index 000000000..4e50a0a4e ---- /dev/null -+++ b/include/lapi/if_addr.h -@@ -0,0 +1,16 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later -+/* -+ * Copyright (c) 2021 Petr Vorel -+ */ -+ -+#ifndef LAPI_IF_ADDR_H__ -+#define LAPI_IF_ADDR_H__ -+ -+#include -+ -+#ifndef IFA_FLAGS -+# define IFA_FLAGS 8 -+#endif -+ -+ -+#endif /* LAPI_IF_ADDR_H__ */ -diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h -index 04e9ad51a..089bf1a0d 100644 ---- a/include/lapi/rtnetlink.h -+++ b/include/lapi/rtnetlink.h -@@ -5,9 +5,6 @@ - # define LAPI_RTNETLINK_H__ - - #include -- --#ifndef IFA_FLAGS --# define IFA_FLAGS 8 --#endif -+#include "lapi/if_addr.h" - - #endif /* LAPI_RTNETLINK_H__ */ --- -2.33.0 - diff --git a/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch b/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch deleted file mode 100644 index b54e052992..0000000000 --- a/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 9e357fb4fc00ab9c303e314b85b9ae3836141f81 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:56:29 +0200 -Subject: [PATCH] lapi/if_addr.h: Define IFA_FLAGS - -and use it in icmp_rate_limit01.c. - -This fixes error on toolchains with very old kernel headers, e.g. -Buildroot sourcery-arm: - -icmp_rate_limit01.c:82:3: error: 'IFA_F_NOPREFIXROUTE' undeclared (first use in this function) - IFA_F_NOPREFIXROUTE); - -Fixed because IFA_F_NOPREFIXROUTE was added in 3.14 and the oldest -system we still support is Cent0S 7 with 3.10 kernel. - -NOTE: Cent0S 7 is obviously heavily patched thus it contains -IFA_F_NOPREFIXROUTE and therefore CI build didn't catch this error. - -Signed-off-by: Petr Vorel -[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-4-petr.vorel at gmail.com/T/#u ] ---- - include/lapi/if_addr.h | 3 +++ - testcases/cve/icmp_rate_limit01.c | 3 ++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h -index 4e50a0a4e..0f7e44784 100644 ---- a/include/lapi/if_addr.h -+++ b/include/lapi/if_addr.h -@@ -12,5 +12,8 @@ - # define IFA_FLAGS 8 - #endif - -+#ifndef IFA_F_NOPREFIXROUTE -+# define IFA_F_NOPREFIXROUTE 0x200 -+#endif - - #endif /* LAPI_IF_ADDR_H__ */ -diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c -index b3a237b30..3ada32675 100644 ---- a/testcases/cve/icmp_rate_limit01.c -+++ b/testcases/cve/icmp_rate_limit01.c -@@ -27,11 +27,12 @@ - #include - #include - #include --#include - #include - - #include - #include -+ -+#include "lapi/if_addr.h" - #include "tst_test.h" - #include "tst_netdevice.h" - --- -2.33.0 - diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index a9f3cfdfe1..bd648cbfdd 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,5 +1,5 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1 -sha1 dad7737f609e358c4060cb446b9cae5c026fc137 ltp-full-20210927.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1 +sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15 ltp-full-20210927.tar.xz +sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index cc6d3c63b6..bc1497e940 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20210927 +LTP_TESTSUITE_VERSION = 20220121 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) @@ -70,6 +70,8 @@ LTP_TESTSUITE_CONF_ENV += \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" +LTP_TESTSUITE_MAKE_ENV += HOST_CFLAGS="$(HOST_CFLAGS)" + # uclibc: bessel support normally not enabled LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ testcases/misc/math/float/bessel/ \ -- 2.34.1 From petr.vorel at gmail.com Wed Jan 26 23:56:52 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Jan 2022 00:56:52 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 Message-ID: <20220126235652.25712-1-petr.vorel@gmail.com> LTP now builds metadata directory as host target. It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc). Drop patches from this release. Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it). Signed-off-by: Petr Vorel --- Changes v1->v2: * Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc when compiling host target) Kind regards, Petr ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++-------- .../0002-lib-fix-MemAvailable-parsing.patch | 36 ----------- ...-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------ ...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ------------------ ...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 ------------------- package/ltp-testsuite/ltp-testsuite.hash | 6 +- package/ltp-testsuite/ltp-testsuite.mk | 6 +- 7 files changed, 25 insertions(+), 223 deletions(-) delete mode 100644 package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch delete mode 100644 package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch delete mode 100644 package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch delete mode 100644 package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch diff --git a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch index a167d938e1..2ceba64ed5 100644 --- a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +++ b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch @@ -1,4 +1,4 @@ -From bee452dfa2a34ba7df7db677e5673cbdcd23f61e Mon Sep 17 00:00:00 2001 +From f34c6ca3d543968e900d6327d8b5900db63f08ad Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Thu, 1 Oct 2020 23:28:39 +0200 Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc @@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h new file mode 100644 -index 000000000..d0e0e93d7 +index 0000000000..d0e0e93d7f --- /dev/null +++ b/include/lapi/sysinfo.h @@ -0,0 +1,22 @@ @@ -83,7 +83,7 @@ index 000000000..d0e0e93d7 + +#endif /* SYSINFO_H__ */ diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h -index d99441c86..0d26e9d45 100644 +index d99441c86f..0d26e9d455 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -12,7 +12,7 @@ @@ -96,44 +96,33 @@ index d99441c86..0d26e9d45 100644 #include #include diff --git a/lib/safe_macros.c b/lib/safe_macros.c -index a5b6bc504..20d01d304 100644 +index a5b6bc5047..87d922a928 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c -@@ -11,7 +11,6 @@ +@@ -11,7 +11,7 @@ #include #include #include -#include ++#include "lapi/sysinfo.h" #include #include #include -@@ -23,6 +22,7 @@ - #include - #include "test.h" - #include "safe_macros.h" -+#include "lapi/sysinfo.h" - - char *safe_basename(const char *file, const int lineno, - void (*cleanup_fn) (void), char *path) diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index 69077861f..ae1cad29b 100644 +index 4a49747613..000688f5a3 100644 --- a/lib/tst_memutils.c +++ b/lib/tst_memutils.c -@@ -5,11 +5,11 @@ - +@@ -6,7 +6,7 @@ + #include #include #include -#include ++#include "lapi/sysinfo.h" #include #define TST_NO_DEFAULT_MAIN - #include "tst_test.h" -+#include "lapi/sysinfo.h" - - #define BLOCKSIZE (16 * 1024 * 1024) - diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c -index 9676ea4b5..33b2ac822 100644 +index 20cb95191d..3462dc3f82 100644 --- a/testcases/kernel/mem/mtest01/mtest01.c +++ b/testcases/kernel/mem/mtest01/mtest01.c @@ -20,7 +20,6 @@ @@ -153,7 +142,7 @@ index 9676ea4b5..33b2ac822 100644 #define FIVE_HUNDRED_MB (500ULL*1024*1024) diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c -index 263b8e78b..4fa52e6ea 100644 +index 263b8e78bf..4fa52e6eae 100644 --- a/testcases/kernel/syscalls/madvise/madvise06.c +++ b/testcases/kernel/syscalls/madvise/madvise06.c @@ -46,7 +46,7 @@ @@ -166,7 +155,7 @@ index 263b8e78b..4fa52e6ea 100644 #include "tst_cgroup.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c -index 2ea44a2be..a237345ef 100644 +index 2ea44a2beb..a237345ef7 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c @@ -69,7 +69,7 @@ @@ -179,7 +168,7 @@ index 2ea44a2be..a237345ef 100644 #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c -index 7ad0e8bdc..61fa1ab75 100644 +index 7ad0e8bdcf..61fa1ab757 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c @@ -65,7 +65,7 @@ @@ -192,7 +181,7 @@ index 7ad0e8bdc..61fa1ab75 100644 #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c -index af7cb6421..dc5ae65e3 100644 +index af7cb6421e..dc5ae65e35 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c @@ -13,7 +13,7 @@ @@ -205,7 +194,7 @@ index af7cb6421..dc5ae65e3 100644 #include "lapi/posix_clocks.h" #include "tst_test.h" diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -index 22e7c3638..572701f9f 100644 +index 22e7c36386..572701f9fd 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c @@ -43,7 +43,7 @@ @@ -218,5 +207,5 @@ index 22e7c3638..572701f9f 100644 #include "../testfrmw/testfrmw.h" -- -2.33.0 +2.34.1 diff --git a/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch b/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch deleted file mode 100644 index 4a9a5b2363..0000000000 --- a/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001 -From: Ralph Siemsen -Date: Mon, 27 Sep 2021 22:18:50 -0400 -Subject: [PATCH] lib: fix MemAvailable parsing - -The amount of available memory was not being returned correctly, which -resulted in tests being executed when they should have been skipped. - -Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable") -Signed-off-by: Ralph Siemsen -Signed-off-by: Li Wang -Signed-off-by: Petr Vorel -[ upstream status: e42149e28 ("lib: fix MemAvailable parsing") ] ---- - lib/tst_memutils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index ae1cad29b..a46de78f5 100644 ---- a/lib/tst_memutils.c -+++ b/lib/tst_memutils.c -@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar) - - long long tst_available_mem(void) - { -- long long mem_available; -+ unsigned long long mem_available = 0; - -- if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld", -+ if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu", - &mem_available)) { - mem_available = SAFE_READ_MEMINFO("MemFree:") - + SAFE_READ_MEMINFO("Cached:"); --- -2.33.0 - diff --git a/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch b/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch deleted file mode 100644 index 056c769feb..0000000000 --- a/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:38:42 +0200 -Subject: [PATCH] lapi/rtnetlink.h: Fix include guards - -Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS") - -Signed-off-by: Petr Vorel -[ upstream status: a2a212cf8 ("lapi/rtnetlink.h: Fix include guards") ] ---- - include/lapi/rtnetlink.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h -index 8a1b5385b..04e9ad51a 100644 ---- a/include/lapi/rtnetlink.h -+++ b/include/lapi/rtnetlink.h -@@ -1,8 +1,8 @@ - // SPDX-License-Identifier: GPL-2.0-or-later - /* Copyright (c) 2021 Petr Vorel */ - --#ifndef LAPI_IF_ADDR_H__ --# define LAPI_IF_ADDR_H__ -+#ifndef LAPI_RTNETLINK_H__ -+# define LAPI_RTNETLINK_H__ - - #include - -@@ -10,4 +10,4 @@ - # define IFA_FLAGS 8 - #endif - --#endif /* LAPI_IF_ADDR_H__ */ -+#endif /* LAPI_RTNETLINK_H__ */ --- -2.33.0 - diff --git a/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch b/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch deleted file mode 100644 index 4044636e63..0000000000 --- a/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch +++ /dev/null @@ -1,58 +0,0 @@ -From b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:37:19 +0200 -Subject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h - -There will be fix in next commit for missing IFA_F_NOPREFIXROUTE which -requires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h, -as it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just -like includes . - -Signed-off-by: Petr Vorel -[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-3-petr.vorel at gmail.com/T/#u ] ---- - include/lapi/if_addr.h | 16 ++++++++++++++++ - include/lapi/rtnetlink.h | 5 +---- - 2 files changed, 17 insertions(+), 4 deletions(-) - create mode 100644 include/lapi/if_addr.h - -diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h -new file mode 100644 -index 000000000..4e50a0a4e ---- /dev/null -+++ b/include/lapi/if_addr.h -@@ -0,0 +1,16 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later -+/* -+ * Copyright (c) 2021 Petr Vorel -+ */ -+ -+#ifndef LAPI_IF_ADDR_H__ -+#define LAPI_IF_ADDR_H__ -+ -+#include -+ -+#ifndef IFA_FLAGS -+# define IFA_FLAGS 8 -+#endif -+ -+ -+#endif /* LAPI_IF_ADDR_H__ */ -diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h -index 04e9ad51a..089bf1a0d 100644 ---- a/include/lapi/rtnetlink.h -+++ b/include/lapi/rtnetlink.h -@@ -5,9 +5,6 @@ - # define LAPI_RTNETLINK_H__ - - #include -- --#ifndef IFA_FLAGS --# define IFA_FLAGS 8 --#endif -+#include "lapi/if_addr.h" - - #endif /* LAPI_RTNETLINK_H__ */ --- -2.33.0 - diff --git a/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch b/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch deleted file mode 100644 index b54e052992..0000000000 --- a/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 9e357fb4fc00ab9c303e314b85b9ae3836141f81 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:56:29 +0200 -Subject: [PATCH] lapi/if_addr.h: Define IFA_FLAGS - -and use it in icmp_rate_limit01.c. - -This fixes error on toolchains with very old kernel headers, e.g. -Buildroot sourcery-arm: - -icmp_rate_limit01.c:82:3: error: 'IFA_F_NOPREFIXROUTE' undeclared (first use in this function) - IFA_F_NOPREFIXROUTE); - -Fixed because IFA_F_NOPREFIXROUTE was added in 3.14 and the oldest -system we still support is Cent0S 7 with 3.10 kernel. - -NOTE: Cent0S 7 is obviously heavily patched thus it contains -IFA_F_NOPREFIXROUTE and therefore CI build didn't catch this error. - -Signed-off-by: Petr Vorel -[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-4-petr.vorel at gmail.com/T/#u ] ---- - include/lapi/if_addr.h | 3 +++ - testcases/cve/icmp_rate_limit01.c | 3 ++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h -index 4e50a0a4e..0f7e44784 100644 ---- a/include/lapi/if_addr.h -+++ b/include/lapi/if_addr.h -@@ -12,5 +12,8 @@ - # define IFA_FLAGS 8 - #endif - -+#ifndef IFA_F_NOPREFIXROUTE -+# define IFA_F_NOPREFIXROUTE 0x200 -+#endif - - #endif /* LAPI_IF_ADDR_H__ */ -diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c -index b3a237b30..3ada32675 100644 ---- a/testcases/cve/icmp_rate_limit01.c -+++ b/testcases/cve/icmp_rate_limit01.c -@@ -27,11 +27,12 @@ - #include - #include - #include --#include - #include - - #include - #include -+ -+#include "lapi/if_addr.h" - #include "tst_test.h" - #include "tst_netdevice.h" - --- -2.33.0 - diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index a9f3cfdfe1..bd648cbfdd 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,5 +1,5 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1 -sha1 dad7737f609e358c4060cb446b9cae5c026fc137 ltp-full-20210927.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1 +sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15 ltp-full-20210927.tar.xz +sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index cc6d3c63b6..d9b7133b07 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20210927 +LTP_TESTSUITE_VERSION = 20220121 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) @@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" +LTP_TESTSUITE_MAKE_ENV += \ + HOST_CFLAGS="$(HOST_CFLAGS)" \ + HOST_LDFLAGS="$(HOST_LDFLAGS)" + # uclibc: bessel support normally not enabled LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ testcases/misc/math/float/bessel/ \ -- 2.34.1 From christian at paral.in Thu Jan 27 03:40:17 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 19:40:17 -0800 Subject: [Buildroot] [PATCH 1/1] package/buildah: new package Message-ID: <20220127034017.91761-1-christian@paral.in> Adds both host and target packages for buildah. Buildah is a tool that facilitates building OCI images. https://github.com/containers/buildah Signed-off-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/Config.in.host | 1 + package/buildah/Config.in | 21 ++++++++++++++++++ package/buildah/Config.in.host | 7 ++++++ package/buildah/buildah.hash | 3 +++ package/buildah/buildah.mk | 39 ++++++++++++++++++++++++++++++++++ 7 files changed, 73 insertions(+) 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 fe8de1916e..80e7c5abee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -529,6 +529,7 @@ F: package/python-pylibftdi/ N: Christian Stewart F: package/batman-adv/ +F: package/buildah/ F: package/containerd/ F: package/delve/ F: package/docker-cli/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..91eb66a454 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2523,6 +2523,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/containerd/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..d2e59388ae 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -7,6 +7,7 @@ menu "Host utilities" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/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/Config.in b/package/buildah/Config.in new file mode 100644 index 0000000000..f4378be679 --- /dev/null +++ b/package/buildah/Config.in @@ -0,0 +1,21 @@ +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 + depends on BR2_USE_MMU # libgpgme -> libassuan + # gnupg is 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 + help + Buildah is a tool that facilitates building OCI images. + + https://github.com/containers/buildah + +comment "buildah needs a toolchain w/ threads" + 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 diff --git a/package/buildah/Config.in.host b/package/buildah/Config.in.host new file mode 100644 index 0000000000..ca294e6f92 --- /dev/null +++ b/package/buildah/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_BUILDAH + bool "buildah" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + 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..c7e00d02a7 --- /dev/null +++ b/package/buildah/buildah.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d99b5187a25bc9d7385408732a0e155df0458b4d2cea6e8d002f3fa2cbaac76f buildah-1.24.0.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk new file mode 100644 index 0000000000..87eed8b834 --- /dev/null +++ b/package/buildah/buildah.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# buildah +# +################################################################################ + +BUILDAH_VERSION = 1.24.0 +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)) + +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)) -- 2.35.0 From christian at paral.in Thu Jan 27 04:02:49 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 20:02:49 -0800 Subject: [Buildroot] [PATCH v2 1/2] package/runc: add host package Message-ID: <20220127040250.128604-1-christian@paral.in> Adds support for building runc as a host package. The bin name and gomod have to be specified as the pkg-golang infrastructure assumes the bin name will be "host-runc" on default. Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/runc/Config.in.host | 8 ++++++++ package/runc/runc.mk | 8 ++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/runc/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..2ce015eacf 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -81,6 +81,7 @@ menu "Host utilities" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" source "package/riscv-isa-sim/Config.in.host" + source "package/runc/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host new file mode 100644 index 0000000000..ce0dd518a6 --- /dev/null +++ b/package/runc/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_RUNC + bool "host runc" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + runC is a CLI tool for spawning and running containers + according to the OCP specification. + + https://github.com/opencontainers/runc diff --git a/package/runc/runc.mk b/package/runc/runc.mk index c4e45a00a9..932bf39eea 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -10,6 +10,8 @@ RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE RUNC_CPE_ID_VENDOR = linuxfoundation +RUNC_GOMOD = github.com/opencontainers/runc + RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build @@ -23,4 +25,10 @@ RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif +HOST_RUNC_BIN_NAME = runc +HOST_RUNC_LDFLAGS = $(RUNC_LDFLAGS) +HOST_RUNC_TAGS = $(RUNC_TAGS) +HOST_RUNC_INSTALL_BINS = $(HOST_RUNC_BIN_NAME) + $(eval $(golang-package)) +$(eval $(host-golang-package)) -- 2.35.0 From christian at paral.in Thu Jan 27 04:02:50 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 20:02:50 -0800 Subject: [Buildroot] [PATCH v2 2/2] package/buildah: new package In-Reply-To: <20220127040250.128604-1-christian@paral.in> References: <20220127040250.128604-1-christian@paral.in> Message-ID: <20220127040250.128604-2-christian@paral.in> Adds both host and target packages for buildah. Buildah is a tool that facilitates building OCI images. https://github.com/containers/buildah Signed-off-by: Christian Stewart --- v1 -> v2: - add package to developers - add host runc dependency for host package - add libgpgme runtime dependency Signed-off-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/Config.in.host | 1 + package/buildah/Config.in | 23 ++++++++++++++++++++ package/buildah/Config.in.host | 8 +++++++ package/buildah/buildah.hash | 3 +++ package/buildah/buildah.mk | 39 ++++++++++++++++++++++++++++++++++ 7 files changed, 76 insertions(+) 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 fe8de1916e..80e7c5abee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -529,6 +529,7 @@ F: package/python-pylibftdi/ N: Christian Stewart F: package/batman-adv/ +F: package/buildah/ F: package/containerd/ F: package/delve/ F: package/docker-cli/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..91eb66a454 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2523,6 +2523,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/containerd/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 2ce015eacf..6aadb1b640 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -7,6 +7,7 @@ menu "Host utilities" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/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/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..c7e00d02a7 --- /dev/null +++ b/package/buildah/buildah.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d99b5187a25bc9d7385408732a0e155df0458b4d2cea6e8d002f3fa2cbaac76f buildah-1.24.0.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk new file mode 100644 index 0000000000..87eed8b834 --- /dev/null +++ b/package/buildah/buildah.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# buildah +# +################################################################################ + +BUILDAH_VERSION = 1.24.0 +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)) + +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)) -- 2.35.0 From baruch at tkos.co.il Thu Jan 27 05:39:23 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Thu, 27 Jan 2022 07:39:23 +0200 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 In-Reply-To: <20220126235652.25712-1-petr.vorel@gmail.com> References: <20220126235652.25712-1-petr.vorel@gmail.com> Message-ID: <87lez191e6.fsf@tarshish> Hi Petr, On Thu, Jan 27 2022, Petr Vorel wrote: > LTP now builds metadata directory as host target. > It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make > (adding to configure does not work) to avoid adding -mlongcalls > -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc). > > Drop patches from this release. > > Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch > (still safe to carry it). > > Signed-off-by: Petr Vorel > --- > Changes v1->v2: > * Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc > when compiling host target) [...] > diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash > index a9f3cfdfe1..bd648cbfdd 100644 > --- a/package/ltp-testsuite/ltp-testsuite.hash > +++ b/package/ltp-testsuite/ltp-testsuite.hash > @@ -1,5 +1,5 @@ > -# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1 > -sha1 dad7737f609e358c4060cb446b9cae5c026fc137 ltp-full-20210927.tar.xz > +# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1 > +sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz > # Locally computed > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > -sha256 779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15 ltp-full-20210927.tar.xz > +sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz > diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk > index cc6d3c63b6..d9b7133b07 100644 > --- a/package/ltp-testsuite/ltp-testsuite.mk > +++ b/package/ltp-testsuite/ltp-testsuite.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LTP_TESTSUITE_VERSION = 20210927 > +LTP_TESTSUITE_VERSION = 20220121 > LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz > LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) > > @@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \ > LIBS="$(LTP_TESTSUITE_LIBS)" \ > SYSROOT="$(STAGING_DIR)" > > +LTP_TESTSUITE_MAKE_ENV += \ > + HOST_CFLAGS="$(HOST_CFLAGS)" \ > + HOST_LDFLAGS="$(HOST_LDFLAGS)" I think you should have TARGET_* on the right side of the assignment, since this is a target package. baruch > + > # uclibc: bessel support normally not enabled > LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ > testcases/misc/math/float/bessel/ \ -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From christian at paral.in Thu Jan 27 06:25:03 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 22:25:03 -0800 Subject: [Buildroot] [PATCH v3 1/2] package/runc: add host package Message-ID: <20220127062504.1835450-1-christian@paral.in> Adds support for building runc as a host package. The bin name and gomod have to be specified as the pkg-golang infrastructure assumes the bin name will be "host-runc" on default. Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/runc/Config.in.host | 8 ++++++++ package/runc/runc.mk | 8 ++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/runc/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..2ce015eacf 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -81,6 +81,7 @@ menu "Host utilities" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" source "package/riscv-isa-sim/Config.in.host" + source "package/runc/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host new file mode 100644 index 0000000000..ce0dd518a6 --- /dev/null +++ b/package/runc/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_RUNC + bool "host runc" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + runC is a CLI tool for spawning and running containers + according to the OCP specification. + + https://github.com/opencontainers/runc diff --git a/package/runc/runc.mk b/package/runc/runc.mk index c4e45a00a9..932bf39eea 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -10,6 +10,8 @@ RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE RUNC_CPE_ID_VENDOR = linuxfoundation +RUNC_GOMOD = github.com/opencontainers/runc + RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build @@ -23,4 +25,10 @@ RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif +HOST_RUNC_BIN_NAME = runc +HOST_RUNC_LDFLAGS = $(RUNC_LDFLAGS) +HOST_RUNC_TAGS = $(RUNC_TAGS) +HOST_RUNC_INSTALL_BINS = $(HOST_RUNC_BIN_NAME) + $(eval $(golang-package)) +$(eval $(host-golang-package)) -- 2.35.0 From christian at paral.in Thu Jan 27 06:25:04 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 22:25:04 -0800 Subject: [Buildroot] [PATCH v3 2/2] package/buildah: new package In-Reply-To: <20220127062504.1835450-1-christian@paral.in> References: <20220127062504.1835450-1-christian@paral.in> Message-ID: <20220127062504.1835450-2-christian@paral.in> 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 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 fe8de1916e..80e7c5abee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -529,6 +529,7 @@ F: package/python-pylibftdi/ N: Christian Stewart F: package/batman-adv/ +F: package/buildah/ F: package/containerd/ F: package/delve/ F: package/docker-cli/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..91eb66a454 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2523,6 +2523,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/containerd/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 2ce015eacf..6aadb1b640 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -7,6 +7,7 @@ menu "Host utilities" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/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..c7e00d02a7 --- /dev/null +++ b/package/buildah/buildah.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d99b5187a25bc9d7385408732a0e155df0458b4d2cea6e8d002f3fa2cbaac76f buildah-1.24.0.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk new file mode 100644 index 0000000000..658d7ef56f --- /dev/null +++ b/package/buildah/buildah.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# buildah +# +################################################################################ + +BUILDAH_VERSION = 1.24.0 +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)) -- 2.35.0 From thomas.petazzoni at bootlin.com Thu Jan 27 07:08:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 27 Jan 2022 07:08:44 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-26 Message-ID: <20220127070849.936CC83386@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-01-26 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 57 | 8 | 1 | 66 | 2021.11.x | 23 | 2 | 0 | 25 | master | 86 | 42 | 0 | 128 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 7 rtorrent-0.9.8 | 6 bluez5_utils-5.63 | 3 frr-8.1 | 3 mongodb-4.2.11 | 3 gvfs-1.48.1 | 2 log4cxx-0.12.0 | 2 unknown | 2 wavemon-0.9.4 | 2 xvisor-0.3.1 | 2 efl-1.26.0 | 1 guile-3.0.7 | 1 kf5-kcoreaddons-5.47.0 | 1 libglvnd-1.3.2 | 1 mesa3d-21.3.4 | 1 nodejs-14.18.3 | 1 php-apcu-5.1.20 | 1 ruby-3.1.0 | 1 sg3_utils-1.47 | 1 suricata-6.0.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/034d3d7519596e36df6cf0ebc3e87e6b192b81d0 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/78c0705dba994b2c164f3367f458c98dec49a2d1 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a434711259e269e1423523d0c5be6711385a2b85 | aarch64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/7e13979851926975b842f4c71379dbf81d012674 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/06c2ac8a1124011cf7d8e654bcb828af6db1f2ae | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f2d89a5e45fcecb0b7d014767dfd182cae1e9f10 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4fe535c71fb37015fc99f3151a52e9b7641220d7 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/3db47d5f101e62942c8dce777a3929cf8f22eb1b | ORPH riscv64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/127999dd2ba3b1c3d39eae36a99b5c4a63a50422 | ORPH aarch64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/87d35c2635b0a9ef63b77c357701865236764d09 | ORPH or1k | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/e6040c4d40cf234ee72e237fbd9c52682279d19c | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/9545f3127c862a7265c09153742dc5bff2272559 | ORPH riscv64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/8e2d33d8bc1739b29f8a230802d4591165a1a0fd | mips64el | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/7ee2a4bf27568acd91790f1283ccc066dcff46b8 | x86_64 | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/eba070b876c77c55f09c4d82f321e70c4cb7bdeb | x86_64 | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/88f6a03bce1b58af926d18011bf5449170eab2b3 | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/6ed9143a7012a574f067edd7c969f1c1d3d46d91 | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/766b3faa902ef200121841bd5675506a4992b213 | arm | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/2c812e012d2b8552924d646c682713d9120e8100 | arm | php-apcu-5.1.20 | NOK | http://autobuild.buildroot.net/results/9816237b8c3465e4bee21a0377da47ca62c890bc | m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/a0dc157a54f95afa0d5c452a0fee22a94f9069ad | ORPH powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/6be860d79ffebe7021c3c927c7495720ea0e060e | ORPH xtensa | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/03c95c866f0b8c50e494489130207c8e73c77616 | ORPH sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/142cdd994669313ff8ba4430512cecfa262a6750 | ORPH powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/269ede899ab28baf162cb153da91f567f050369e | ORPH x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/1325e438682e583614363e3e8c29aa89a1dddeb7 | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/faebaad581aa673088bf89d1a14b431f08b35765 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6c48ab0803ceb130d7d5ef979e3aeb84e6f12f30 | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a458af58ded8c4cb517e40ee61f2052379684a14 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/bb87ff12e37bba83dbf71614d36de3f9e64a2089 | powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/417ff7a87e2b3c61c7cca037ac57286e1a987d43 | i686 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/54cce5841655d2bc9ee34ce460efbf59c7786be3 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/0238056e8c4577d63d810fc1ed3d1783354855b7 | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f8b1b57b52b75a6431fc37030ec64fdc0fe4c042 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/1e73576d1c22c54f4ea61ec663ca80de2f6bd3be | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/3d44543167319e99b1848a622925ce47cd4a9af0 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/17d26f8c18066f8290ba249f3c591e0a0a6753b7 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/11ca4ece89703ce9c4f283bcc1b975f56626202b | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/77dd568e94f275af476a9324f5288afc6282c791 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1cac8cf2a5956c273a73905eb14c97cb2b75c2d4 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/cd245e455299b91e204f07196f3f3169e4179772 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/3ba3bbc6cb558df75f2d79b15614ab650d09e9b6 | Classification of failures by reason for 2021.02.x -------------------------------------------------- apcupsd-3.14.14 | 1 host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 openal-1.20.1 | 1 poppler | 1 qt5webkit-5.9.1 | 1 rocksdb-6.13.3 | 1 uboot-tools-2020.04 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/1a16d6ce541a37f43846f274e41765bb1f413601 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/120ff6ff5342805b1320f27fd14974a763a4a71e | sh4 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/d432f159c7ebe7299b806de29d829f8ddf90d00e | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/420448b66e8fe5f6d939d51db234d5b74d472da2 | nios2 | poppler | TIM | http://autobuild.buildroot.net/results/356fa066273a47c9a1344fa214e7e56b7d2a3187 | mipsel | qt5webkit-5.9.1 | NOK | http://autobuild.buildroot.net/results/1c232d49cddd291c442db823a2e4ed6df77f7a35 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/a9d88f994d38bfe6fd027a2c9a82ec31a1b0a8fb | arm | uboot-tools-2020.04 | NOK | http://autobuild.buildroot.net/results/1a665b8fcdf9b42e7abe82e9c1034fb21790066d | m68k | unknown | NOK | http://autobuild.buildroot.net/results/6e01511da93de5a182a2d0a8f503165c0005f922 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/6bc5fd15805eebe43def686d377a1409dd548567 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7d3ba65c101be258879678379480c97e6b213f4b | -- http://autobuild.buildroot.net From peter at korsgaard.com Thu Jan 27 07:12:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:12:18 +0100 Subject: [Buildroot] [git commit] package/sofia-sip: bump version to 1.13.6 In-Reply-To: <20220107232022.04480834E2@busybox.osuosl.org> (Peter Korsgaard's message of "Sat, 8 Jan 2022 00:26:21 +0100") References: <20220107232022.04480834E2@busybox.osuosl.org> Message-ID: <87czkdejot.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=30b2dbeae3930084634e126ead4e1e2930a58bad > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Needed to bump freeswitch to 1.10.7. > Signed-off-by: Bernd Kuhls > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:10:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:10:28 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/sofia-sip: don't set 'NDEBUG' explicitly Message-ID: <20220127070548.82A7C82862@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b326de0f793b6202a873aaf1fef5a3353f8d18d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. The sofia-sip package was setting '--enable-ndebug' conditionally based on BR2_ENABLE_DEBUG, and this would have to be updated to be based on BR2_ENABLE_RUNTIME_DEBUG. However, the sofia-sip option '--enable-ndebug' only sets the 'NDEBUG' preprocessor macro, and the core package infrastructure already sets this macro correctly based on BR2_ENABLE_RUNTIME_DEBUG. This means that the explicit '--enable-ndebug' flag can be removed. Suggested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN (cherry picked from commit 0993954814e8f54c7fea5dcb6dff1cc2c3d3e780) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 274c72fce8..fb565637eb 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -30,8 +30,4 @@ SOFIA_SIP_CONF_OPTS += \ --without-openssl endif -ifeq ($(BR2_ENABLE_DEBUG),) -SOFIA_SIP_CONF_OPTS += --enable-ndebug -endif - $(eval $(autotools-package)) From peter at korsgaard.com Thu Jan 27 07:11:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:11:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/freeswitch: security bump version to 1.10.7 Message-ID: <20220127070548.A4F6282862@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69a02feb789d5517e4b81eb02f9ea3eb775824b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2021-41105: FreeSWITCH susceptible to Denial of Service via invalid SRTP packets When handling SRTP calls, FreeSWITCH is susceptible to a DoS where calls can be terminated by remote attackers. This attack can be done continuously, thus denying encrypted calls during the attack. https://github.com/signalwire/freeswitch/security/advisories/GHSA-jh42-prph-gp36 - CVE-2021-41157: FreeSWITCH does not authenticate SIP SUBSCRIBE requests by default By default, SIP requests of the type SUBSCRIBE are not authenticated in the affected versions of FreeSWITCH. https://github.com/signalwire/freeswitch/security/advisories/GHSA-g7xg-7c54-rmpj - CVE-2021-37624: FreeSWITCH does not authenticate SIP MESSAGE requests, leading to spam and message spoofing By default, SIP requests of the type MESSAGE (RFC 3428) are not authenticated in the affected versions of FreeSWITCH. MESSAGE requests are relayed to SIP user agents registered with the FreeSWITCH server without requiring any authentication. Although this behaviour can be changed by setting the auth-messages parameter to true, it is not the default setting. https://github.com/signalwire/freeswitch/security/advisories/GHSA-mjcm-q9h8-9xv3 - CVE-2021-41145: FreeSWITCH susceptible to Denial of Service via SIP flooding When flooding FreeSWITCH with SIP messages, it was observed that after a number of seconds the process was killed by the operating system due to memory exhaustion https://github.com/signalwire/freeswitch/security/advisories/GHSA-jvpq-23v4-gp3m - CVE-2021-41158: FreeSWITCH vulnerable to SIP digest leak for configured gateways An attacker can perform a SIP digest leak attack against FreeSWITCH and receive the challenge response of a gateway configured on the FreeSWITCH server. This is done by challenging FreeSWITCH's SIP requests with the realm set to that of the gateway, thus forcing FreeSWITCH to respond with the challenge response which is based on the password of that targeted gateway. https://github.com/signalwire/freeswitch/security/advisories/GHSA-3v3f-99mv-qvj4 Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 Removed patch, upstream applied a different fix: https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b Added optional dependency to libks, needed due to upstream commit https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 Added upstream patches to fix build errors. Signed-off-by: Bernd Kuhls [Peter: mention security fixes] Signed-off-by: Peter Korsgaard (cherry picked from commit 829777c1c9a0d40c8c5753e6fe86acfc78edfc92) Signed-off-by: Peter Korsgaard --- ...-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch | 26 +++++ ...lications-mod_cv-mod_cv.cpp-fix-build-wit.patch | 44 ------- .../freeswitch/0002-core-fix--disable-libyuv.patch | 129 +++++++++++++++++++++ package/freeswitch/freeswitch.hash | 4 +- package/freeswitch/freeswitch.mk | 8 +- 5 files changed, 163 insertions(+), 48 deletions(-) diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch new file mode 100644 index 0000000000..57f6e660c1 --- /dev/null +++ b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch @@ -0,0 +1,26 @@ +From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 +From: Dragos Oancea +Date: Tue, 26 Oct 2021 08:42:58 +0000 +Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac + +Signed-off-by: Bernd Kuhls +--- + src/switch_rtp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/switch_rtp.c b/src/switch_rtp.c +index 1880bbb19c..843ee81381 100644 +--- a/src/switch_rtp.c ++++ b/src/switch_rtp.c +@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); + snprintf(header, sizeof(header), "Source-Lost"); + #if SWITCH_BYTE_ORDER == __BIG_ENDIAN +- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ ++ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ + #else + tmpLost = ntohl(rtcp_report_block->lost)>>8; + tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch b/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch deleted file mode 100644 index cd0a3ab4c2..0000000000 --- a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Oct 2020 23:06:36 +0200 -Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv - 3.4.9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use cvScalar instead of CV_RGB to avoid the following build failure with -opencv 3.4.9: - -mod_cv.cpp:693:24: error: conversion from ???cv::Scalar {aka cv::Scalar_}??? to non-scalar type ???CvScalar??? requested - CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); - ^ - -Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since -version 3.4.2 and -https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f - -It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/signalwire/freeswitch/pull/914] ---- - src/mod/applications/mod_cv/mod_cv.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp -index 582f925abf..bbec755e91 100644 ---- a/src/mod/applications/mod_cv/mod_cv.cpp -+++ b/src/mod/applications/mod_cv/mod_cv.cpp -@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context) - //printf("WTF %d\n", object_neighbors); - //cout << "Detected " << object_neighbors << " object neighbors" << endl; - const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors); -- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); -+ CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0); - rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1); - - parse_stats(&context->nestDetected, nestedObjects.size(), context->skip); --- -2.28.0 - diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch new file mode 100644 index 0000000000..137cb27cf8 --- /dev/null +++ b/package/freeswitch/0002-core-fix--disable-libyuv.patch @@ -0,0 +1,129 @@ +From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 +From: Sebastian Kemper +Date: Mon, 1 Nov 2021 09:59:09 +0100 +Subject: [PATCH] [core] fix "--disable-libyuv" + +Recent changes made it impossible to compile freeswitch without libyuv +support. + +src/switch_core_video.c: In function 'switch_img_read_from_file': +src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] +RAWToI420(data, width * 3, +^ +src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] +ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); +^ + +Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 + +Signed-off-by: Bernd Kuhls +Signed-off-by: Sebastian Kemper +--- + src/switch_core_video.c | 12 ++++++++++++ + tests/unit/switch_core_video.c | 4 ++++ + 2 files changed, 16 insertions(+) + +diff --git a/src/switch_core_video.c b/src/switch_core_video.c +index 7dbd685d6ee..0d377f9c3e4 100644 +--- a/src/switch_core_video.c ++++ b/src/switch_core_video.c +@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha + + SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) + { ++#ifdef SWITCH_HAVE_YUV + int width = 0, height = 0, channels = 0; + int comp = STBI_rgb; + unsigned char *data = NULL; +@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name + } else if (data) { + stbi_image_free(data); + } ++#endif + + return NULL; + } + + SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + const char *ext = strrchr(file_name, '.'); +@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co + free(data); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif + } + + typedef struct data_url_context_s { +@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { + char **urlP; + } data_url_context_t; + ++#ifdef SWITCH_HAVE_YUV + static void data_url_write_func(void *context, void *data, int size) + { + switch_buffer_t *buffer = (switch_buffer_t *)context; + switch_buffer_write(buffer, data, size); + } ++#endif + + SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + int stride_in_bytes = 0; +@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** + switch_buffer_destroy(&buffer); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif /* SWITCH_HAVE_YUV */ + } + + +diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c +index 27c96102929..e395db474d5 100644 +--- a/tests/unit/switch_core_video.c ++++ b/tests/unit/switch_core_video.c +@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEARDOWN_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(data_url_test) + { + char *data_url = NULL; +@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") + unlink(argb_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + + FST_TEST_BEGIN(img_patch) + { +@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEST_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(stb_data_url) + { + switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); +@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") + unlink(jpg_write_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + } + FST_SUITE_END() + } diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index dc5a67980f..8066c620c4 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 -sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 +sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 944867cc75..c576e5f267 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.6 +FREESWITCH_VERSION = 1.10.7 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -120,7 +120,6 @@ FREESWITCH_ENABLED_MODULES += \ endpoints/mod_rtc \ endpoints/mod_rtmp \ endpoints/mod_sofia \ - endpoints/mod_verto \ event_handlers/mod_cdr_csv \ event_handlers/mod_cdr_sqlite \ event_handlers/mod_event_socket \ @@ -209,6 +208,11 @@ FREESWITCH_DEPENDENCIES += libilbc FREESWITCH_ENABLED_MODULES += codecs/mod_ilbc endif +ifeq ($(BR2_PACKAGE_LIBKS),y) +FREESWITCH_DEPENDENCIES += libks +FREESWITCH_ENABLED_MODULES += endpoints/mod_verto +endif + ifeq ($(BR2_PACKAGE_LIBLDNS),y) FREESWITCH_DEPENDENCIES += libldns FREESWITCH_ENABLED_MODULES += applications/mod_enum From peter at korsgaard.com Thu Jan 27 07:09:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:09:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/sofia-sip: bump version to 1.13.3 Message-ID: <20220127070548.68431814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=652752cb4d9b2709519198761b36c24761a30be9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Removed patches which were applied upstream: https://github.com/freeswitch/sofia-sip/commit/f6f29b483e9c31ce8d3e87419ec3deea8679312d https://github.com/freeswitch/sofia-sip/commit/d568475eb7291bc72f585a116319b05d80b818e1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7210b40c93c8c2d3ac1f51e546544b8453974a9b) Signed-off-by: Peter Korsgaard --- ...ag.h-reintroduce-soatag_local_sdp_str_ref.patch | 30 ----------------- .../sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch | 38 ---------------------- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 2 +- 4 files changed, 2 insertions(+), 70 deletions(-) diff --git a/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch b/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch deleted file mode 100644 index 57c0bfe250..0000000000 --- a/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bcd0f17fd83f2dfe570a3ab17249a5c7290b27f2 Mon Sep 17 00:00:00 2001 -From: Pekka Pessi -Date: Thu, 24 Mar 2011 14:45:21 +0200 -Subject: [PATCH] soa_tag.h: reintroduce soatag_local_sdp_str_ref - -Thanks to Erik Habicht for spotting it - -Signed-off-by: Bernd Kuhls -[rebased for sofia-sip 1.13.1-d10a3d268c, patch sent upstream - https://github.com/freeswitch/sofia-sip/pull/23] ---- - libsofia-sip-ua/soa/sofia-sip/soa_tag.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h b/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -index 723ca02..d9448d6 100644 ---- a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -+++ b/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -@@ -130,7 +130,7 @@ SOFIAPUBVAR tag_typedef_t soatag_local_sdp_ref; - SOFIAPUBVAR tag_typedef_t soatag_local_sdp_str; - #define SOATAG_LOCAL_SDP_STR_REF(x) \ - soatag_local_sdp_str_ref, tag_str_vr(&(x)) --SOFIAPUBVAR tag_typedef_t soatag_session_sdp_str_ref; -+SOFIAPUBVAR tag_typedef_t soatag_local_sdp_str_ref; - - #define SOATAG_AF(x) soatag_af, tag_int_v((x)) - SOFIAPUBVAR tag_typedef_t soatag_af; --- -1.7.7 - diff --git a/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch b/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch deleted file mode 100644 index a2cc412843..0000000000 --- a/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d66a2e55daf223737c07c59b1be45a2d91212ef6 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 26 Jul 2020 13:47:16 +0200 -Subject: [PATCH] [sofia-sip] fix s2tcase.c - -Fixes build error with recent libcheck: -https://github.com/freeswitch/sofia-sip/issues/22 - -Signed-off-by: Bernd Kuhls ---- - s2check/s2tcase.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libs/sofia-sip/s2check/s2tcase.c b/libs/sofia-sip/s2check/s2tcase.c -index 382aaa3ad7..d67694c2ce 100644 ---- a/s2check/s2tcase.c -+++ b/s2check/s2tcase.c -@@ -57,7 +57,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, - if (strcmp(*patterns, "*")) { - printf("%s: selected\n", name); - } -- _tcase_add_test(tc, tf, name, signo, 0, start, end); -+ _tcase_add_test(tc, tf, name, signo, start, end); - return; - } - } -@@ -67,7 +67,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, - if (strcmp(*patterns, "*")) { - printf("%s: selected\n", name); - } -- _tcase_add_test(tc, tf, name, signo, 0, start, end); -+ _tcase_add_test(tc, tf, name, signo, start, end); - return; - } - } --- -2.27.0 - diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 99b315e276..0484cc1501 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 4cf0de1aaa1e1737db5a8fe4104021a8e60a148a4534f92b5affdd9782e404aa sofia-sip-1.13.1-d10a3d268c.tar.gz +sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index ef1b35fa2c..5c383400ff 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.1-d10a3d268c +SOFIA_SIP_VERSION = 1.13.3-8071e8accd SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Thu Jan 27 07:12:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:12:30 +0100 Subject: [Buildroot] [git commit] package/freeswitch: security bump version to 1.10.7 In-Reply-To: <20220107232022.0E707834E4@busybox.osuosl.org> (Peter Korsgaard's message of "Sat, 8 Jan 2022 00:26:21 +0100") References: <20220107232022.0E707834E4@busybox.osuosl.org> Message-ID: <878rv1ejoh.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=829777c1c9a0d40c8c5753e6fe86acfc78edfc92 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes the following security issues: > - CVE-2021-41105: FreeSWITCH susceptible to Denial of Service via invalid > SRTP packets > When handling SRTP calls, FreeSWITCH is susceptible to a DoS where calls > can be terminated by remote attackers. This attack can be done > continuously, thus denying encrypted calls during the attack. > https://github.com/signalwire/freeswitch/security/advisories/GHSA-jh42-prph-gp36 > - CVE-2021-41157: FreeSWITCH does not authenticate SIP SUBSCRIBE requests by default > By default, SIP requests of the type SUBSCRIBE are not authenticated in > the affected versions of FreeSWITCH. > https://github.com/signalwire/freeswitch/security/advisories/GHSA-g7xg-7c54-rmpj > - CVE-2021-37624: FreeSWITCH does not authenticate SIP MESSAGE requests, > leading to spam and message spoofing > By default, SIP requests of the type MESSAGE (RFC 3428) are not > authenticated in the affected versions of FreeSWITCH. MESSAGE requests > are relayed to SIP user agents registered with the FreeSWITCH server > without requiring any authentication. Although this behaviour can be > changed by setting the auth-messages parameter to true, it is not the > default setting. > https://github.com/signalwire/freeswitch/security/advisories/GHSA-mjcm-q9h8-9xv3 > - CVE-2021-41145: FreeSWITCH susceptible to Denial of Service via SIP flooding > When flooding FreeSWITCH with SIP messages, it was observed that after a > number of seconds the process was killed by the operating system due to > memory exhaustion > https://github.com/signalwire/freeswitch/security/advisories/GHSA-jvpq-23v4-gp3m > - CVE-2021-41158: FreeSWITCH vulnerable to SIP digest leak for configured gateways > An attacker can perform a SIP digest leak attack against FreeSWITCH and > receive the challenge response of a gateway configured on the FreeSWITCH > server. This is done by challenging FreeSWITCH's SIP requests with the > realm set to that of the gateway, thus forcing FreeSWITCH to respond with > the challenge response which is based on the password of that targeted > gateway. > https://github.com/signalwire/freeswitch/security/advisories/GHSA-3v3f-99mv-qvj4 > Release notes: > https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 > Removed patch, upstream applied a different fix: > https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b > Added optional dependency to libks, needed due to upstream commit > https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 > Added upstream patches to fix build errors. > Signed-off-by: Bernd Kuhls > [Peter: mention security fixes] > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:46:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:46:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mpd: fix comment Message-ID: <20220127070548.5AD2A8285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28d817c058aa7cbb24ccd3f67c17012fbd22f8ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that BR2_USE_WCHAR is due to flac dependency but flac is optional so remove this comment and add boost instead Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 20584d1ef270d5c1851c1cd537833ec5882edcba) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 7731b203b9..e1da654450 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,7 +1,7 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac + depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC From peter at korsgaard.com Thu Jan 27 07:10:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:10:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/sofia-sip: bump version to 1.13.6 Message-ID: <20220127070548.8D4488285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=778e32d6a817fc571009419a992a7bbcc5ea6ad1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Needed to bump freeswitch to 1.10.7. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 30b2dbeae3930084634e126ead4e1e2930a58bad) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 0484cc1501..6f6ff6d052 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.tar.gz +sha256 d39a3287038f1c9a747c1abc94a1379a726a9dfaf969285f955141883f7b810f sofia-sip-1.13.6-4152840260.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index fb565637eb..2bac480542 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.3-8071e8accd -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs +SOFIA_SIP_VERSION = 1.13.6-4152840260 +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Thu Jan 27 07:11:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:11:14 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/freeswitch: bump version to 1.10.6 Message-ID: <20220127070548.9942A8285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53a24740ecd4f544a237bcf7eab637cfdc501b57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b3f75b1b637f1c2d4ce79ecb840746b5365a080d) Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 4 ++-- package/freeswitch/freeswitch.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index d95e05c0b1..dc5a67980f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.5.-release.tar.xz.sha256 -sha256 3e26600767a82946eca94af2c8f14712783aa83db5fb1cc57585f544aecce327 freeswitch-1.10.5.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 +sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 7880151fa5..944867cc75 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.5 +FREESWITCH_VERSION = 1.10.6 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging From peter at korsgaard.com Thu Jan 27 07:10:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:10:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/sofia-sip: correct passing of '--enable-ndebug' Message-ID: <20220127070548.771C082872@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9651f61bbc2d92598f852eba8d00753fa7ed010 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The preprocessor option NDEBUG, triggered by the configure option '--enable-ndebug', should be read as 'no-debug'. When NDEBUG is set, asserts are _disabled_. The sofia-sip package had inverted logic, and set '--enable-ndebug' when BR2_ENABLE_DEBUG was enabled, while it should be the other way around. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN (cherry picked from commit fb12adbb7613a4c05643491453dbc09151b5bf48) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 5c383400ff..274c72fce8 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -30,7 +30,7 @@ SOFIA_SIP_CONF_OPTS += \ --without-openssl endif -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_DEBUG),) SOFIA_SIP_CONF_OPTS += --enable-ndebug endif From peter at korsgaard.com Wed Jan 26 20:52:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:52:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/sofia-sip: bump version to 1.13.6 Message-ID: <20220127070554.312008229B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16cbd66f0404f7984b78c118dc32196c974e65bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Needed to bump freeswitch to 1.10.7. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 30b2dbeae3930084634e126ead4e1e2930a58bad) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 0484cc1501..6f6ff6d052 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.tar.gz +sha256 d39a3287038f1c9a747c1abc94a1379a726a9dfaf969285f955141883f7b810f sofia-sip-1.13.6-4152840260.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index fb565637eb..2bac480542 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.3-8071e8accd -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs +SOFIA_SIP_VERSION = 1.13.6-4152840260 +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Jan 26 20:52:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:52:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/freeswitch: security bump version to 1.10.7 Message-ID: <20220127070554.398528285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecaafd1804496ac853a710075e43c7d39f2c0695 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - CVE-2021-41105: FreeSWITCH susceptible to Denial of Service via invalid SRTP packets When handling SRTP calls, FreeSWITCH is susceptible to a DoS where calls can be terminated by remote attackers. This attack can be done continuously, thus denying encrypted calls during the attack. https://github.com/signalwire/freeswitch/security/advisories/GHSA-jh42-prph-gp36 - CVE-2021-41157: FreeSWITCH does not authenticate SIP SUBSCRIBE requests by default By default, SIP requests of the type SUBSCRIBE are not authenticated in the affected versions of FreeSWITCH. https://github.com/signalwire/freeswitch/security/advisories/GHSA-g7xg-7c54-rmpj - CVE-2021-37624: FreeSWITCH does not authenticate SIP MESSAGE requests, leading to spam and message spoofing By default, SIP requests of the type MESSAGE (RFC 3428) are not authenticated in the affected versions of FreeSWITCH. MESSAGE requests are relayed to SIP user agents registered with the FreeSWITCH server without requiring any authentication. Although this behaviour can be changed by setting the auth-messages parameter to true, it is not the default setting. https://github.com/signalwire/freeswitch/security/advisories/GHSA-mjcm-q9h8-9xv3 - CVE-2021-41145: FreeSWITCH susceptible to Denial of Service via SIP flooding When flooding FreeSWITCH with SIP messages, it was observed that after a number of seconds the process was killed by the operating system due to memory exhaustion https://github.com/signalwire/freeswitch/security/advisories/GHSA-jvpq-23v4-gp3m - CVE-2021-41158: FreeSWITCH vulnerable to SIP digest leak for configured gateways An attacker can perform a SIP digest leak attack against FreeSWITCH and receive the challenge response of a gateway configured on the FreeSWITCH server. This is done by challenging FreeSWITCH's SIP requests with the realm set to that of the gateway, thus forcing FreeSWITCH to respond with the challenge response which is based on the password of that targeted gateway. https://github.com/signalwire/freeswitch/security/advisories/GHSA-3v3f-99mv-qvj4 Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 Removed patch, upstream applied a different fix: https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b Added optional dependency to libks, needed due to upstream commit https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 Added upstream patches to fix build errors. Signed-off-by: Bernd Kuhls [Peter: mention security fixes] Signed-off-by: Peter Korsgaard (cherry picked from commit 829777c1c9a0d40c8c5753e6fe86acfc78edfc92) Signed-off-by: Peter Korsgaard --- ...-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch | 26 +++++ ...lications-mod_cv-mod_cv.cpp-fix-build-wit.patch | 44 ------- .../freeswitch/0002-core-fix--disable-libyuv.patch | 129 +++++++++++++++++++++ package/freeswitch/freeswitch.hash | 4 +- package/freeswitch/freeswitch.mk | 8 +- 5 files changed, 163 insertions(+), 48 deletions(-) diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch new file mode 100644 index 0000000000..57f6e660c1 --- /dev/null +++ b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch @@ -0,0 +1,26 @@ +From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 +From: Dragos Oancea +Date: Tue, 26 Oct 2021 08:42:58 +0000 +Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac + +Signed-off-by: Bernd Kuhls +--- + src/switch_rtp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/switch_rtp.c b/src/switch_rtp.c +index 1880bbb19c..843ee81381 100644 +--- a/src/switch_rtp.c ++++ b/src/switch_rtp.c +@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); + snprintf(header, sizeof(header), "Source-Lost"); + #if SWITCH_BYTE_ORDER == __BIG_ENDIAN +- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ ++ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ + #else + tmpLost = ntohl(rtcp_report_block->lost)>>8; + tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch b/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch deleted file mode 100644 index cd0a3ab4c2..0000000000 --- a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Oct 2020 23:06:36 +0200 -Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv - 3.4.9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use cvScalar instead of CV_RGB to avoid the following build failure with -opencv 3.4.9: - -mod_cv.cpp:693:24: error: conversion from ???cv::Scalar {aka cv::Scalar_}??? to non-scalar type ???CvScalar??? requested - CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); - ^ - -Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since -version 3.4.2 and -https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f - -It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/signalwire/freeswitch/pull/914] ---- - src/mod/applications/mod_cv/mod_cv.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp -index 582f925abf..bbec755e91 100644 ---- a/src/mod/applications/mod_cv/mod_cv.cpp -+++ b/src/mod/applications/mod_cv/mod_cv.cpp -@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context) - //printf("WTF %d\n", object_neighbors); - //cout << "Detected " << object_neighbors << " object neighbors" << endl; - const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors); -- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); -+ CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0); - rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1); - - parse_stats(&context->nestDetected, nestedObjects.size(), context->skip); --- -2.28.0 - diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch new file mode 100644 index 0000000000..137cb27cf8 --- /dev/null +++ b/package/freeswitch/0002-core-fix--disable-libyuv.patch @@ -0,0 +1,129 @@ +From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 +From: Sebastian Kemper +Date: Mon, 1 Nov 2021 09:59:09 +0100 +Subject: [PATCH] [core] fix "--disable-libyuv" + +Recent changes made it impossible to compile freeswitch without libyuv +support. + +src/switch_core_video.c: In function 'switch_img_read_from_file': +src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] +RAWToI420(data, width * 3, +^ +src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] +ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); +^ + +Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 + +Signed-off-by: Bernd Kuhls +Signed-off-by: Sebastian Kemper +--- + src/switch_core_video.c | 12 ++++++++++++ + tests/unit/switch_core_video.c | 4 ++++ + 2 files changed, 16 insertions(+) + +diff --git a/src/switch_core_video.c b/src/switch_core_video.c +index 7dbd685d6ee..0d377f9c3e4 100644 +--- a/src/switch_core_video.c ++++ b/src/switch_core_video.c +@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha + + SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) + { ++#ifdef SWITCH_HAVE_YUV + int width = 0, height = 0, channels = 0; + int comp = STBI_rgb; + unsigned char *data = NULL; +@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name + } else if (data) { + stbi_image_free(data); + } ++#endif + + return NULL; + } + + SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + const char *ext = strrchr(file_name, '.'); +@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co + free(data); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif + } + + typedef struct data_url_context_s { +@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { + char **urlP; + } data_url_context_t; + ++#ifdef SWITCH_HAVE_YUV + static void data_url_write_func(void *context, void *data, int size) + { + switch_buffer_t *buffer = (switch_buffer_t *)context; + switch_buffer_write(buffer, data, size); + } ++#endif + + SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + int stride_in_bytes = 0; +@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** + switch_buffer_destroy(&buffer); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif /* SWITCH_HAVE_YUV */ + } + + +diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c +index 27c96102929..e395db474d5 100644 +--- a/tests/unit/switch_core_video.c ++++ b/tests/unit/switch_core_video.c +@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEARDOWN_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(data_url_test) + { + char *data_url = NULL; +@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") + unlink(argb_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + + FST_TEST_BEGIN(img_patch) + { +@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEST_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(stb_data_url) + { + switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); +@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") + unlink(jpg_write_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + } + FST_SUITE_END() + } diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index dc5a67980f..8066c620c4 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 -sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 +sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 944867cc75..c576e5f267 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.6 +FREESWITCH_VERSION = 1.10.7 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -120,7 +120,6 @@ FREESWITCH_ENABLED_MODULES += \ endpoints/mod_rtc \ endpoints/mod_rtmp \ endpoints/mod_sofia \ - endpoints/mod_verto \ event_handlers/mod_cdr_csv \ event_handlers/mod_cdr_sqlite \ event_handlers/mod_event_socket \ @@ -209,6 +208,11 @@ FREESWITCH_DEPENDENCIES += libilbc FREESWITCH_ENABLED_MODULES += codecs/mod_ilbc endif +ifeq ($(BR2_PACKAGE_LIBKS),y) +FREESWITCH_DEPENDENCIES += libks +FREESWITCH_ENABLED_MODULES += endpoints/mod_verto +endif + ifeq ($(BR2_PACKAGE_LIBLDNS),y) FREESWITCH_DEPENDENCIES += libldns FREESWITCH_ENABLED_MODULES += applications/mod_enum From peter at korsgaard.com Thu Jan 27 07:15:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:15:56 +0100 Subject: [Buildroot] [git commit] package/rhash: fix activation of gettext In-Reply-To: <20220108111557.3CBB282A91@busybox.osuosl.org> (Thomas Petazzoni's message of "Sat, 8 Jan 2022 12:21:59 +0100") References: <20220108111557.3CBB282A91@busybox.osuosl.org> Message-ID: <874k5pejir.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=5630e83c8452d3e9039feb15fd30ea005bfc6b55 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is > wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set > Signed-off-by: Fabrice Fontaine > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:15:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:15:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rhash: fix activation of gettext Message-ID: <20220127071035.BF7D18285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c17eeadab3aaa04ac0e97bf803b280220cd4f96c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5630e83c8452d3e9039feb15fd30ea005bfc6b55) Signed-off-by: Peter Korsgaard --- package/rhash/rhash.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 92abcd29b0..d15d6f5968 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -15,9 +15,9 @@ RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) -RHASH_CONF_OPTS += --disable-gettext -else RHASH_CONF_OPTS += --enable-gettext +else +RHASH_CONF_OPTS += --disable-gettext endif ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) From peter at korsgaard.com Thu Jan 27 07:15:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:15:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rhash: fix activation of gettext Message-ID: <20220127071040.87B9E8285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5e649a544da652a38683b2fd40c48cbec96fc59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5630e83c8452d3e9039feb15fd30ea005bfc6b55) Signed-off-by: Peter Korsgaard --- package/rhash/rhash.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index d19c355cbb..02af0aa57b 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -15,9 +15,9 @@ RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) -RHASH_CONF_OPTS += --disable-gettext -else RHASH_CONF_OPTS += --enable-gettext +else +RHASH_CONF_OPTS += --disable-gettext endif ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) From peter at korsgaard.com Thu Jan 27 07:19:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:19:31 +0100 Subject: [Buildroot] [git commit] package/opengl/libgbm: clarify option comments In-Reply-To: <20220108160854.2EB0F831C3@busybox.osuosl.org> (Thomas Petazzoni's message of "Sat, 8 Jan 2022 17:14:55 +0100") References: <20220108160854.2EB0F831C3@busybox.osuosl.org> Message-ID: <87zgnhd4sc.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=2b5f7ce29288e2ba393ca7cd4768a83cdb5dec48 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The comments were *after* the option they applied to, which was > confusing, so bring back the comments before the option they apply to. > In addition, instead of saying "this option", explicitly name the > option to clear any ambiguity. > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:19:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:19:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/opengl/libgbm: clarify option comments Message-ID: <20220127071246.CD09882212@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbbf702f00d7f92bf3a33ac880b1c8942998bbac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The comments were *after* the option they applied to, which was confusing, so bring back the comments before the option they apply to. In addition, instead of saying "this option", explicitly name the option to clear any ambiguity. Signed-off-by: Thomas Petazzoni (cherry picked from commit 2b5f7ce29288e2ba393ca7cd4768a83cdb5dec48) Signed-off-by: Peter Korsgaard --- package/opengl/libgbm/Config.in | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/package/opengl/libgbm/Config.in b/package/opengl/libgbm/Config.in index 7aa3efb97a..6eb39761c4 100644 --- a/package/opengl/libgbm/Config.in +++ b/package/opengl/libgbm/Config.in @@ -5,20 +5,21 @@ config BR2_PACKAGE_PROVIDES_LIBGBM string depends on BR2_PACKAGE_HAS_LIBGBM +# gbm implementations should select +# BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT if they +# provide the format modifier plane count feature. This API was +# initially introduced in mesa3d version 17. A gbm implementation +# provides this feature if it is implement function +# gbm_device_get_format_modifier_plane_count. config BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT bool depends on BR2_PACKAGE_HAS_LIBGBM -# gbm implementations should select this option if they provide the -# format modifier plane count feature. This API was initially introduced -# in mesa3d version 17. A gbm implementation provides this feature if it -# is implement function gbm_device_get_format_modifier_plane_count. - +# gbm implementations should select +# BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF if they provide the dma +# buffer feature. This API was initially introduced in mesa3d version +# 10. A gbm implementation provides this feature if it is implement +# function gbm_bo_get_fd. config BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF bool depends on BR2_PACKAGE_HAS_LIBGBM - -# gbm implementations should select this option if they provide the -# dma buffer feature. This API was initially introduced in mesa3d -# version 10. A gbm implementation provides this feature if it -# is implement function gbm_bo_get_fd. From peter at korsgaard.com Thu Jan 27 07:23:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:23:04 +0100 Subject: [Buildroot] [git commit] package/ca-certificates: remove dependency on host-python-cryptography In-Reply-To: <20220108164622.89A0281DFE@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 8 Jan 2022 17:51:24 +0100") References: <20220108164622.89A0281DFE@busybox.osuosl.org> Message-ID: <87v8y5d4mf.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: Hi, > commit: https://git.buildroot.net/buildroot/commit/?id=363dd649f31c7e7732f3cd509d43cebbb53e51ce > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The host-python-cryptography module is only used by ca-certificates > for a check of the expiration date of certificates, which is only a > warning not even causing the build to abort, i.e something that > Buildroot users are most likely never going to see. > Since the host-python-cryptography dependency would soon require a > dependency on rust, it's a lot simpler to just patch the > certdata2pem.py script to no longer require cryptography, but only > make use of it if available. > Signed-off-by: Thomas Petazzoni > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [snip] > +++ b/package/ca-certificates/ca-certificates.mk > @@ -7,7 +7,7 @@ > CA_CERTIFICATES_VERSION = 20211016 > CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz > CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates > -CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 host-python-cryptography > +CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 Can we then change to BR2_PYTHON3_HOST_DEPENDENCY instead of host-python3 now that no extra python modules are used? -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Thu Jan 27 07:39:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 27 Jan 2022 08:39:26 +0100 Subject: [Buildroot] [git commit] package/ca-certificates: remove dependency on host-python-cryptography In-Reply-To: <87v8y5d4mf.fsf@dell.be.48ers.dk> References: <20220108164622.89A0281DFE@busybox.osuosl.org> <87v8y5d4mf.fsf@dell.be.48ers.dk> Message-ID: <20220127083926.6b773ada@windsurf> On Thu, 27 Jan 2022 08:23:04 +0100 Peter Korsgaard wrote: > > +++ b/package/ca-certificates/ca-certificates.mk > > @@ -7,7 +7,7 @@ > > CA_CERTIFICATES_VERSION = 20211016 > > CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz > > CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates > > -CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 host-python-cryptography > > +CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 > > Can we then change to BR2_PYTHON3_HOST_DEPENDENCY instead of > host-python3 now that no extra python modules are used? Good point. I would say that yes, probably we could do that. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Jan 27 07:53:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:53:31 +0100 Subject: [Buildroot] [git commit] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 In-Reply-To: <20220108164622.9ABE7832B4@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 8 Jan 2022 17:51:24 +0100") References: <20220108164622.9ABE7832B4@busybox.osuosl.org> Message-ID: <87r18td37o.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=1ed4147e76fe56322c47468be8a222204c459adf > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for > BR2_ARM_CPU_ARMV7A, but it also needs a special value for > BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for > ARMv5TE is identified with the "armv5te" architecture name, see > https://doc.rust-lang.org/nightly/rustc/platform-support.html. > We noticed this because Rust binaries wouldn't work on an ARMv5 > platform (Illegal instruction). This was due to the usage of the > arm-unknown-linux-gnueabi variant of the Rust standard library, which > is for ARMv6. Thanks to this commit, we correctly use the > armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly > on ARMv5TE. > A better approach would be to do the conversion from architecture > options to Rust tuples in a single string symbol that also defines the > supported architectures, similar to how it's done in e.g. openblas. > However, that's a much bigger change. So for now, just do the easy thing > and fix this one issue. > Signed-off-by: Thomas Petazzoni > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:53:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:53:59 +0100 Subject: [Buildroot] [git commit] package/rustc: fix the riscv64gc architecture handling In-Reply-To: <20220108164622.A463581DFE@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 8 Jan 2022 17:51:24 +0100") References: <20220108164622.A463581DFE@busybox.osuosl.org> Message-ID: <87mtjhd36w.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=79c5639597e961a36ee10e55b0479e642013448f > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit > or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need > to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true > when BR2_riscv is true. > Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to > allow rust-bin to download its pre-compiled standard library > correctly. > Signed-off-by: Thomas Petazzoni > Reviewed-by: Alistair Francis > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:54:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:54:43 +0100 Subject: [Buildroot] [git commit] package/libeastl: drop duplicated sentence In-Reply-To: <20220108172225.2F0708324A@busybox.osuosl.org> (Peter Korsgaard's message of "Sat, 8 Jan 2022 18:28:20 +0100") References: <20220108172225.2F0708324A@busybox.osuosl.org> Message-ID: <87ilu5d35o.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=59bbe7cc7418d61a5d2963f1d30e558c3111a95e > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Drop duplicated sentence from Config.in > Signed-off-by: Fabrice Fontaine > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:54:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:54:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libeastl: drop duplicated sentence Message-ID: <20220127074754.ABDC28284B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acb675ec4c3c776713a9fb671aa0a1372b293174 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop duplicated sentence from Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 59bbe7cc7418d61a5d2963f1d30e558c3111a95e) Signed-off-by: Peter Korsgaard --- package/libeastl/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 7609434519..5abea8f810 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help EASTL stands for Electronic Arts Standard Template - Library. EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is an extensive From peter at korsgaard.com Thu Jan 27 07:53:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:53:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rustc: fix the riscv64gc architecture handling Message-ID: <20220127074809.E037B82872@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7ac9116604e874f30188a24b8cd045b5766a773 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true when BR2_riscv is true. Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to allow rust-bin to download its pre-compiled standard library correctly. Signed-off-by: Thomas Petazzoni Reviewed-by: Alistair Francis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 79c5639597e961a36ee10e55b0479e642013448f) Signed-off-by: Peter Korsgaard --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index fe7404b3bd..80d1d1a3d8 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -49,7 +49,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC # riscv64gc-unknown-linux-gnu # "g" stands for imafd, and we also need "c". - default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ + default y if BR2_RISCV_64 && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ BR2_TOOLCHAIN_USES_GLIBC @@ -104,6 +104,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH string default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A + default "riscv64gc" if BR2_RISCV_64 default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI From peter at korsgaard.com Thu Jan 27 07:23:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:23:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 Message-ID: <20220127074809.D80A0825CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a45747f72f8d5579eb29ee71ed82669df75c964 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for BR2_ARM_CPU_ARMV7A, but it also needs a special value for BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for ARMv5TE is identified with the "armv5te" architecture name, see https://doc.rust-lang.org/nightly/rustc/platform-support.html. We noticed this because Rust binaries wouldn't work on an ARMv5 platform (Illegal instruction). This was due to the usage of the arm-unknown-linux-gnueabi variant of the Rust standard library, which is for ARMv6. Thanks to this commit, we correctly use the armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly on ARMv5TE. A better approach would be to do the conversion from architecture options to Rust tuples in a single string symbol that also defines the supported architectures, similar to how it's done in e.g. openblas. However, that's a much bigger change. So for now, just do the easy thing and fix this one issue. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1ed4147e76fe56322c47468be8a222204c459adf) Signed-off-by: Peter Korsgaard --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 90ea56f626..fe7404b3bd 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -102,8 +102,9 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH string + default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A - default BR2_ARCH if !BR2_ARM_CPU_ARMV7A + default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI string From peter at korsgaard.com Thu Jan 27 07:54:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:54:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libeastl: drop duplicated sentence Message-ID: <20220127074809.EB6D1825CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=824bd21137998cd54d431acb8b6ee03c3fc65a31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop duplicated sentence from Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 59bbe7cc7418d61a5d2963f1d30e558c3111a95e) Signed-off-by: Peter Korsgaard --- package/libeastl/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 7609434519..5abea8f810 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help EASTL stands for Electronic Arts Standard Template - Library. EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is an extensive From thomas.petazzoni at bootlin.com Thu Jan 27 07:57:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 27 Jan 2022 08:57:04 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/runc: add host package In-Reply-To: <20220127062504.1835450-1-christian@paral.in> References: <20220127062504.1835450-1-christian@paral.in> Message-ID: <20220127085704.2192a320@windsurf> Hello, On Wed, 26 Jan 2022 22:25:03 -0800 Christian Stewart wrote: > diff --git a/package/runc/runc.mk b/package/runc/runc.mk > index c4e45a00a9..932bf39eea 100644 > --- a/package/runc/runc.mk > +++ b/package/runc/runc.mk > @@ -10,6 +10,8 @@ RUNC_LICENSE = Apache-2.0 > RUNC_LICENSE_FILES = LICENSE > RUNC_CPE_ID_VENDOR = linuxfoundation > > +RUNC_GOMOD = github.com/opencontainers/runc How is this related to the addition of the host package? This seems unrelated. Why is this needed now? > +HOST_RUNC_BIN_NAME = runc Why is this not needed for the target package ? > +HOST_RUNC_LDFLAGS = $(RUNC_LDFLAGS) > +HOST_RUNC_TAGS = $(RUNC_TAGS) > +HOST_RUNC_INSTALL_BINS = $(HOST_RUNC_BIN_NAME) This makes me think we should probably have some inheritance of those variables between the target variant and the host variant of the package. However, HOST_RUNC_TAGS = $(RUNC_TAGS) looks most likely wrong. Indeed: ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) RUNC_DEPENDENCIES += libapparmor RUNC_TAGS += apparmor endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif and you most likely don't want HOST_RUNC_TAGS to contain apparmor or seccomp, because we are not building libseccomp or libapparmor for the host. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Jan 27 07:57:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:57 +0100 Subject: [Buildroot] [git commit] package/libpri: add Linux in comment In-Reply-To: <20220108173322.F35FB83242@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 8 Jan 2022 18:39:25 +0100") References: <20220108173322.F35FB83242@busybox.osuosl.org> Message-ID: <87ee4td30a.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=0730b8b8228391ec36ace6e1d1d0831590b8d0cf > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Add "Linux" before kernel in comment to be consistent with other > packages and manual > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:58:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:58:03 +0100 Subject: [Buildroot] [git commit] package/libss7: add Linux in comment In-Reply-To: <20220108173323.0886D832C8@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 8 Jan 2022 18:39:25 +0100") References: <20220108173323.0886D832C8@busybox.osuosl.org> Message-ID: <87a6fhd304.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=e0de6291e3fe8d9f6c572a5206b8ead3719f6829 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Add "Linux" before kernel in comment to be consistent with other > packages and manual > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:58:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:58:29 +0100 Subject: [Buildroot] [git commit] package/nvidia-driver: add Linux in comment In-Reply-To: <20220108173323.11DED832CE@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 8 Jan 2022 18:39:25 +0100") References: <20220108173323.11DED832CE@busybox.osuosl.org> Message-ID: <875yq5d2ze.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=956cd5b9b7136344bc2641fbe3e1abfa2eff1bc8 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Add "Linux" before kernel in comment to be consistent with other > packages and manual > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 08:00:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 09:00:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/hackrf: add a comma between licenses In-Reply-To: <20220108173403.2819830-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 18:34:03 +0100") References: <20220108173403.2819830-1-fontaine.fabrice@gmail.com> Message-ID: <871r0td2wu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Thu Jan 27 08:01:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 27 Jan 2022 09:01:41 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/buildah: new package In-Reply-To: <20220127062504.1835450-2-christian@paral.in> References: <20220127062504.1835450-1-christian@paral.in> <20220127062504.1835450-2-christian@paral.in> Message-ID: <20220127090141.7d0645f2@windsurf> Hello, On Wed, 26 Jan 2022 22:25:04 -0800 Christian Stewart wrote: > v1 -> v2: > > - add package to developers > - add host runc dependency for host package > - add libgpgme runtime dependency Considering that there are runtime dependency concerns, it would be nice to have a simple test case in support/testing/. > diff --git a/package/buildah/buildah.hash b/package/buildah/buildah.hash > new file mode 100644 > index 0000000000..c7e00d02a7 > --- /dev/null > +++ b/package/buildah/buildah.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 d99b5187a25bc9d7385408732a0e155df0458b4d2cea6e8d002f3fa2cbaac76f buildah-1.24.0.tar.gz > +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk > new file mode 100644 > index 0000000000..658d7ef56f > --- /dev/null > +++ b/package/buildah/buildah.mk > @@ -0,0 +1,46 @@ > +################################################################################ > +# > +# buildah > +# > +################################################################################ > + > +BUILDAH_VERSION = 1.24.0 > +BUILDAH_SITE = $(call github,containers,buildah,v$(BUILDAH_VERSION)) > + > +BUILDAH_LICENSE = Apache-2.0 > +BUILDAH_LICENSE_FILES = LICENSE > + > +BUILDAH_DEPENDENCIES = libgpgme Is libgpgme really a runtime dependency, as noted in your changelog? If it is, then it's not needed in BUILDAH_DEPENDENCIES. However, it would be somewhat surprising for it to be only a runtime dependency. Could you confirm? Does it get dlopen()ed at runtime? Or it's not the library that is used at runtime, but some program that is installed by libgpgme? > +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) That "repetition" also makes me think we should have some level of inheritance between target and host variables in the golang-package infrastructure. For BUILD_TARGETS, TAGS and INSTALL_BINS, it sounds fine to do it. However, for LDFLAGS, it's a bit weird, as normally, LDFLAGS are different between host and target. However here, there are mostly used to pass these version-related -X options, that are in fact the same between host and target. Should we have a separate variable to pass those flags ? Not sure. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Jan 27 07:59:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:59:41 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/hackrf: add a comma between licenses Message-ID: <20220127075826.4BF86827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c88e47b3cbc0d17102f88c475e4fce5bce029427 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 4afa6fd8c1457dce95b830da3ad3b0d255ca1d09) Signed-off-by: Peter Korsgaard --- package/hackrf/hackrf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 391bddcdb0..d80f87e6b9 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -7,7 +7,7 @@ HACKRF_VERSION = 2018.01.1 HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz -HACKRF_LICENSE = GPL-2.0+ BSD-3-Clause +HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host From peter at korsgaard.com Thu Jan 27 07:57:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libpri: add Linux in comment Message-ID: <20220127075826.323B2827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b5d05b92c97053be8b45b2477e87f4c32791929 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0730b8b8228391ec36ace6e1d1d0831590b8d0cf) Signed-off-by: Peter Korsgaard --- package/libpri/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpri/Config.in b/package/libpri/Config.in index de2d96fcc4..0684d2ac83 100644 --- a/package/libpri/Config.in +++ b/package/libpri/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI http://www.asterisk.org/downloads/libpri -comment "libpri needs a kernel to be built" +comment "libpri needs a Linux kernel to be built" depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Thu Jan 27 07:58:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:58:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/nvidia-driver: add Linux in comment Message-ID: <20220127075826.435948287C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbec0270f3a5f7c0370cec64418da311f721dc89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 956cd5b9b7136344bc2641fbe3e1abfa2eff1bc8) Signed-off-by: Peter Korsgaard --- package/nvidia-driver/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 9631b3e70c..a8617a939b 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -75,7 +75,7 @@ config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA -comment "nvidia kernel module needs a kernel to be built" +comment "nvidia kernel module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_NVIDIA_DRIVER_MODULE From peter at korsgaard.com Thu Jan 27 07:57:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libss7: add Linux in comment Message-ID: <20220127075826.3AD3382872@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=579654f570d24778d5ec86dae652cc48803cb01d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e0de6291e3fe8d9f6c572a5206b8ead3719f6829) Signed-off-by: Peter Korsgaard --- package/libss7/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index bdf5fbe3a8..d8bcf11ce7 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBSS7 http://www.asterisk.org/downloads/libss7 -comment "libss7 needs a kernel to be built" +comment "libss7 needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL comment "libss7 needs a toolchain w/ threads" From peter at korsgaard.com Thu Jan 27 07:57:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libss7: add Linux in comment Message-ID: <20220127075831.3FF3F82872@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2628dcdd4750e7988c4491a17d5c480d4240b81f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e0de6291e3fe8d9f6c572a5206b8ead3719f6829) Signed-off-by: Peter Korsgaard --- package/libss7/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index bdf5fbe3a8..d8bcf11ce7 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBSS7 http://www.asterisk.org/downloads/libss7 -comment "libss7 needs a kernel to be built" +comment "libss7 needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL comment "libss7 needs a toolchain w/ threads" From peter at korsgaard.com Thu Jan 27 07:57:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libpri: add Linux in comment Message-ID: <20220127075831.387D6827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=957a7ff5b65f6d34fe3fcdbc5ccc85c2c6511143 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0730b8b8228391ec36ace6e1d1d0831590b8d0cf) Signed-off-by: Peter Korsgaard --- package/libpri/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpri/Config.in b/package/libpri/Config.in index de2d96fcc4..0684d2ac83 100644 --- a/package/libpri/Config.in +++ b/package/libpri/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI http://www.asterisk.org/downloads/libpri -comment "libpri needs a kernel to be built" +comment "libpri needs a Linux kernel to be built" depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Thu Jan 27 07:59:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:59:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/hackrf: add a comma between licenses Message-ID: <20220127075831.4F4EA827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b75389cb41d133d281a9c743ab5f20ebd58bd73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 4afa6fd8c1457dce95b830da3ad3b0d255ca1d09) Signed-off-by: Peter Korsgaard --- package/hackrf/hackrf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 391bddcdb0..d80f87e6b9 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -7,7 +7,7 @@ HACKRF_VERSION = 2018.01.1 HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz -HACKRF_LICENSE = GPL-2.0+ BSD-3-Clause +HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host From peter at korsgaard.com Thu Jan 27 07:58:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:58:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/nvidia-driver: add Linux in comment Message-ID: <20220127075831.47A058287C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58203964d7fb9c33228cabc3fee415f97c19e663 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 956cd5b9b7136344bc2641fbe3e1abfa2eff1bc8) Signed-off-by: Peter Korsgaard --- package/nvidia-driver/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 9631b3e70c..a8617a939b 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -75,7 +75,7 @@ config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA -comment "nvidia kernel module needs a kernel to be built" +comment "nvidia kernel module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_NVIDIA_DRIVER_MODULE From paul at crapouillou.net Thu Jan 27 09:50:12 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Thu, 27 Jan 2022 09:50:12 +0000 Subject: [Buildroot] [PATCH 1/1] package/umtprd: bump to version 1.6.2 In-Reply-To: <20220126210039.1535791-1-fontaine.fabrice@gmail.com> References: <20220126210039.1535791-1-fontaine.fabrice@gmail.com> Message-ID: Hi, Le mer., janv. 26 2022 at 22:00:39 +0100, Fabrice Fontaine a ?crit : > Update indentation in hash file (two spaces) > > https://github.com/viveris/uMTP-Responder/blob/umtprd-1.6.2/Release-notes.txt > > Signed-off-by: Fabrice Fontaine Thanks! It's been on my to-do list for too long. Acked-by: Paul Cercueil Cheers, -Paul > --- > package/umtprd/umtprd.hash | 4 ++-- > package/umtprd/umtprd.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/umtprd/umtprd.hash b/package/umtprd/umtprd.hash > index 170837d84b..7cd75619ab 100644 > --- a/package/umtprd/umtprd.hash > +++ b/package/umtprd/umtprd.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 cce45c7d3df0022fc013c79de21b1f11b1027d090aeb628669f08b0c20d2afdd umtprd-1.3.10.tar.gz > -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE > +sha256 > 1de40511c1dd4618719cff2058dfe68a595f1b9284c80afa89d6d1a1c80aec29 > umtprd-1.6.2.tar.gz > +sha256 > 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 > LICENSE > diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk > index f1a4e66cff..c5e0ee512e 100644 > --- a/package/umtprd/umtprd.mk > +++ b/package/umtprd/umtprd.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -UMTPRD_VERSION = 1.3.10 > +UMTPRD_VERSION = 1.6.2 > UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive > UMTPRD_LICENSE = GPL-3.0+ > UMTPRD_LICENSE_FILES = LICENSE > -- > 2.34.1 > From evgeni at studio-punkt.com Thu Jan 27 10:34:39 2022 From: evgeni at studio-punkt.com (Evgeni Dobrev) Date: Thu, 27 Jan 2022 11:34:39 +0100 Subject: [Buildroot] [PATCH 1/1] fs: fix /tmp and /run clean-up in POSIX shells In-Reply-To: <20220126221708.GK457876@scaer> References: <20220124104116.12902-1-evgeni@studio-punkt.com> <20220124104116.12902-2-evgeni@studio-punkt.com> <20220126221708.GK457876@scaer> Message-ID: Hi Yann, indeed the support for [^] vs [!] is more complicated than I thought initially ( see "Rationale" under https://github.com/koalaman/shellcheck/wiki/SC3026 ). Would the following be a bad idea: echo "find $$(TARGET_DIR)/run $$(TARGET_DIR)/tmp -mindepth 1 -delete" >> $$(FAKEROOT_SCRIPT) - it avoids the glob support complication - it is shorter Regards, Evgeni On Wed, Jan 26, 2022 at 11:17:08PM +0100, Yann E. MORIN wrote: > Evgeni, All, > > On 2022-01-24 11:41 +0100, Evgeni Dobrev via buildroot spake thusly: > > In POSIX sh, ^ in place of ! in glob bracket expressions > > is undefined. > > > > Signed-off-by: Evgeni Dobrev > > --- > > fs/common.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/fs/common.mk b/fs/common.mk > > index 45beb5ae7b..64a94d9ad8 100644 > > --- a/fs/common.mk > > +++ b/fs/common.mk > > @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) > > TIL that bracket expressions are actually valid and specified by POSIX. > > But we do guarantee that we do have bash as a shell when running > Buildroot, so I think it is fair to also run the fs script with bash: > > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..f8a6da6bc4 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -172,7 +172,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > $$(BASE_TARGET_DIR)/ \ > $$(TARGET_DIR) > > - echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) > + echo '#!$(SHELL)' > $$(FAKEROOT_SCRIPT) > echo "set -e" >> $$(FAKEROOT_SCRIPT) > > echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) > > However, $(SHELL) is not always correct, so we'd probably need: > > diff --git a/Makefile b/Makefile > index 5fc7137e5a..bb9955f5b6 100644 > --- a/Makefile > +++ b/Makefile > @@ -30,7 +30,7 @@ > # we want bash as shell > SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ > else if [ -x /bin/bash ]; then echo /bin/bash; \ > - else echo sh; fi; fi) > + else which sh; fi; fi) > > # Set O variable if not already done on the command line; > # or avoid confusing packages that can use the O= syntax for out-of-tree > > But in the end this is quite more changes than what you propose. > > Can we also shorten the command? > > echo "rm -rf $$(TARGET_DIR)/{run,tmp}/* $$(TARGET_DIR)/{run,tmp}/.[!.]*" >> $$(FAKEROOT_SCRIPT) > > Regards, > Yann E. MORIN. > > > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From mf at go-sys.de Thu Jan 27 10:46:58 2022 From: mf at go-sys.de (Michael Fischer) Date: Thu, 27 Jan 2022 11:46:58 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/network-manager: add optional nmcli support In-Reply-To: <20220126231432.37374caf@windsurf> References: <20220126231432.37374caf@windsurf> Message-ID: <20220127104658.9895-1-mf@go-sys.de> The network-manager package builds the nmcli utility when the readline package is enabled. However, this is not necessarily obvious to the user. Therefore, this commit adds an explicit option to enable the nmcli tool, which automatically selects readline. Signed-off-by: Michael Fischer --- package/network-manager/Config.in | 8 +++++++- package/network-manager/network-manager.mk | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..f61a046a95 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -37,6 +37,13 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI help This option enables terminal based UI +config BR2_PACKAGE_NETWORK_MANAGER_CLI + bool "nmcli support" + select BR2_PACKAGE_READLINE + help + This option enables support for the + NetworkManager Command Line Interface + config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER @@ -54,7 +61,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS select BR2_PACKAGE_JANSSON help This option enables support for OpenVSwitch - endif comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..1eb9233b44 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -135,7 +135,7 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-polkit endif -ifeq ($(BR2_PACKAGE_READLINE),y) +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y) NETWORK_MANAGER_DEPENDENCIES += readline NETWORK_MANAGER_CONF_OPTS += --with-nmcli else -- 2.20.1 From peter at korsgaard.com Thu Jan 27 10:52:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 11:52:52 +0100 Subject: [Buildroot] [PATCH] package/poppler: use HTTPS for upstream URL In-Reply-To: <20220109093735.4860-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 9 Jan 2022 10:37:33 +0100") References: <20220109093735.4860-1-peter@korsgaard.com> Message-ID: <87wnilbgcb.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ > The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget > versions (E.G. s.b.o): > wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz > DEBUG output created by Wget 1.14 on linux-gnu. > URI encoding = ?UTF-8? > Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) > Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) > --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz > Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 > Caching poppler.freedesktop.org => 147.75.198.156 > Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. > Created socket 3. > Releasing 0x0000000001ceda80 (new refcount 1). > ---request begin--- > GET /poppler-21.12.0.tar.xz HTTP/1.1 > User-Agent: Wget/1.14 (linux-gnu) > Accept: */* > Host: poppler.freedesktop.org > Connection: Keep-Alive > ---request end--- > HTTP request sent, awaiting response... > ---response begin--- > HTTP/1.1 308 Permanent Redirect > Date: Sun, 09 Jan 2022 09:28:02 GMT > Content-Type: text/html > Content-Length: 164 > Connection: keep-alive > Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz > ---response end--- > 308 Permanent Redirect > Registered socket 3 for persistent reuse. > Skipping 164 bytes of body: [ > 308 Permanent Redirect > >

    308 Permanent Redirect

    >
    nginx
    > > > ] done. > 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 10:52:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 11:52:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/poppler: use HTTPS for upstream URL Message-ID: <20220127104609.5AC3A8282A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c0c34c6346e54ea8089a163540a45c327859082 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes: http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget versions (E.G. s.b.o): wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz DEBUG output created by Wget 1.14 on linux-gnu. URI encoding = ???UTF-8??? Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 Caching poppler.freedesktop.org => 147.75.198.156 Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. Created socket 3. Releasing 0x0000000001ceda80 (new refcount 1). ---request begin--- GET /poppler-21.12.0.tar.xz HTTP/1.1 User-Agent: Wget/1.14 (linux-gnu) Accept: */* Host: poppler.freedesktop.org Connection: Keep-Alive ---request end--- HTTP request sent, awaiting response... ---response begin--- HTTP/1.1 308 Permanent Redirect Date: Sun, 09 Jan 2022 09:28:02 GMT Content-Type: text/html Content-Length: 164 Connection: keep-alive Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz ---response end--- 308 Permanent Redirect Registered socket 3 for persistent reuse. Skipping 164 bytes of body: [ 308 Permanent Redirect

    308 Permanent Redirect

    nginx
    ] done. 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. Signed-off-by: Peter Korsgaard (cherry picked from commit c39e0abba945dcc52e2e9e70b92fc94f1c351c0b) Signed-off-by: Peter Korsgaard --- package/poppler/Config.in | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 521e3e65a8..b2bc49fc75 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POPPLER Poppler is a PDF rendering library based on the xpdf-3.0 code base. - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ if BR2_PACKAGE_POPPLER diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index a5a97d974b..ae77cf2e5d 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -6,7 +6,7 @@ POPPLER_VERSION = 0.84.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org +POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Jan 27 10:52:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 11:52:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/poppler: use HTTPS for upstream URL Message-ID: <20220127104615.D60308282A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae2a31295c010e94483031eb1c0b8539698f5959 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes: http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget versions (E.G. s.b.o): wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz DEBUG output created by Wget 1.14 on linux-gnu. URI encoding = ???UTF-8??? Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 Caching poppler.freedesktop.org => 147.75.198.156 Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. Created socket 3. Releasing 0x0000000001ceda80 (new refcount 1). ---request begin--- GET /poppler-21.12.0.tar.xz HTTP/1.1 User-Agent: Wget/1.14 (linux-gnu) Accept: */* Host: poppler.freedesktop.org Connection: Keep-Alive ---request end--- HTTP request sent, awaiting response... ---response begin--- HTTP/1.1 308 Permanent Redirect Date: Sun, 09 Jan 2022 09:28:02 GMT Content-Type: text/html Content-Length: 164 Connection: keep-alive Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz ---response end--- 308 Permanent Redirect Registered socket 3 for persistent reuse. Skipping 164 bytes of body: [ 308 Permanent Redirect

    308 Permanent Redirect

    nginx
    ] done. 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. Signed-off-by: Peter Korsgaard (cherry picked from commit c39e0abba945dcc52e2e9e70b92fc94f1c351c0b) Signed-off-by: Peter Korsgaard --- package/poppler/Config.in | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 521e3e65a8..b2bc49fc75 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POPPLER Poppler is a PDF rendering library based on the xpdf-3.0 code base. - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ if BR2_PACKAGE_POPPLER diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index a5a97d974b..ae77cf2e5d 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -6,7 +6,7 @@ POPPLER_VERSION = 0.84.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org +POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING From mf at go-sys.de Thu Jan 27 12:18:24 2022 From: mf at go-sys.de (Michael Fischer) Date: Thu, 27 Jan 2022 13:18:24 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/busybox: bump version to 1.35.0 In-Reply-To: <20220126231554.0fcc106d@windsurf> References: <20220126231554.0fcc106d@windsurf> Message-ID: <20220127121824.32092-1-mf@go-sys.de> Updating the busybox configuration files by loading and saving it back. Signed-off-by: Michael Fischer --- package/busybox/busybox-minimal.config | 151 +++++++++++++++++------- package/busybox/busybox.config | 154 +++++++++++++++++-------- package/busybox/busybox.hash | 4 +- package/busybox/busybox.mk | 2 +- 4 files changed, 222 insertions(+), 89 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 65a347756d..9eae0f51f4 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.28.0 -# Wed Feb 7 09:47:09 2018 +# Busybox version: 1.35.0 +# Thu Jan 27 10:16:03 2022 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,6 +24,7 @@ CONFIG_FEATURE_WTMP=y # CONFIG_FEATURE_PIDFILE is not set CONFIG_PID_FILE_PATH="" CONFIG_BUSYBOX=y +CONFIG_FEATURE_SHOW_SCRIPT=y CONFIG_FEATURE_INSTALLER=y # CONFIG_INSTALL_NO_USR is not set CONFIG_FEATURE_SUID=y @@ -33,8 +34,8 @@ CONFIG_FEATURE_SUID=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y # # Build Options @@ -52,6 +53,8 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set +CONFIG_STACK_OPTIMIZATION_386=y +CONFIG_STATIC_LIBGCC=y # # Installation Options ("make install" behavior) @@ -73,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -81,15 +85,21 @@ CONFIG_NO_DEBUG_LIB=y # Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set +CONFIG_FLOAT_DURATION=y CONFIG_FEATURE_RTMINMAX=y +CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y @@ -100,6 +110,7 @@ CONFIG_FEATURE_REVERSE_SEARCH=y CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_WINCH=y # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set # CONFIG_LOCALE_SUPPORT is not set # CONFIG_UNICODE_SUPPORT is not set @@ -112,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y # # Applets @@ -149,10 +152,13 @@ CONFIG_LZCAT=y CONFIG_XZCAT=y # CONFIG_XZ is not set # CONFIG_BZIP2 is not set +CONFIG_BZIP2_SMALL=0 CONFIG_FEATURE_BZIP2_DECOMPRESS=y # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set +# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set +# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_GZIP is not set @@ -188,6 +194,22 @@ CONFIG_LZOPCAT=y # # Coreutils # +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for date and touch +# +# CONFIG_FEATURE_TIMEZONE is not set + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_FEATURE_CATN=y @@ -198,10 +220,13 @@ CONFIG_CHOWN=y # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y CONFIG_CKSUM=y +CONFIG_CRC32=y # CONFIG_COMM is not set CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set +# CONFIG_FEATURE_CP_REFLINK is not set CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set @@ -213,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y # CONFIG_FEATURE_DF_FANCY is not set +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -228,7 +254,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y CONFIG_FALSE=y CONFIG_FOLD=y -# CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y @@ -283,9 +308,9 @@ CONFIG_SHRED=y # CONFIG_SHUF is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set # CONFIG_STAT is not set @@ -295,6 +320,7 @@ CONFIG_STTY=y # CONFIG_SUM is not set CONFIG_SYNC=y # CONFIG_FEATURE_SYNC_FANCY is not set +# CONFIG_FSYNC is not set # CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -306,7 +332,6 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y # CONFIG_TIMEOUT is not set CONFIG_TOUCH=y -# CONFIG_FEATURE_TOUCH_NODEREF is not set CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -321,31 +346,17 @@ CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y CONFIG_UUDECODE=y +CONFIG_BASE32=y # CONFIG_BASE64 is not set CONFIG_UUENCODE=y CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHOAMI=y CONFIG_WHO=y CONFIG_W=y # CONFIG_USERS is not set +CONFIG_WHOAMI=y CONFIG_YES=y -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - # # Console Utilities # @@ -409,6 +420,7 @@ CONFIG_SED=y CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_8BIT is not set # CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_COLON_EXPAND is not set # CONFIG_FEATURE_VI_YANKMARK is not set # CONFIG_FEATURE_VI_SEARCH is not set # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -422,6 +434,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_UNDO is not set # CONFIG_FEATURE_VI_UNDO_QUEUE is not set CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 +# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -430,13 +443,19 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FIND is not set # CONFIG_FEATURE_FIND_PRINT0 is not set # CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_ATIME is not set +# CONFIG_FEATURE_FIND_CTIME is not set # CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_AMIN is not set +# CONFIG_FEATURE_FIND_CMIN is not set # CONFIG_FEATURE_FIND_PERM is not set # CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_EXECUTABLE is not set # CONFIG_FEATURE_FIND_XDEV is not set # CONFIG_FEATURE_FIND_MAXDEPTH is not set # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_SAMEFILE is not set # CONFIG_FEATURE_FIND_EXEC is not set # CONFIG_FEATURE_FIND_EXEC_PLUS is not set # CONFIG_FEATURE_FIND_USER is not set @@ -446,7 +465,9 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FEATURE_FIND_PAREN is not set # CONFIG_FEATURE_FIND_SIZE is not set # CONFIG_FEATURE_FIND_PRUNE is not set +# CONFIG_FEATURE_FIND_QUIT is not set # CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_EMPTY is not set # CONFIG_FEATURE_FIND_PATH is not set # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -473,6 +494,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y +CONFIG_FEATURE_WAIT_FOR_INIT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y @@ -495,10 +517,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set CONFIG_ADDUSER=y # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=60000 @@ -605,7 +627,6 @@ CONFIG_FSFREEZE=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y # CONFIG_HEXDUMP is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HD is not set CONFIG_XXD=y # CONFIG_HWCLOCK is not set @@ -624,6 +645,7 @@ CONFIG_XXD=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set CONFIG_MESG=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y CONFIG_MKE2FS=y @@ -647,6 +669,8 @@ CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y # CONFIG_MOUNTPOINT is not set +CONFIG_NOLOGIN=y +# CONFIG_NOLOGIN_DEPENDENCIES is not set # CONFIG_NSENTER is not set # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set @@ -673,6 +697,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set # CONFIG_UEVENT is not set CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -693,6 +718,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_BCACHE is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +CONFIG_FEATURE_VOLUMEID_EROFS=y # CONFIG_FEATURE_VOLUMEID_EXFAT is not set # CONFIG_FEATURE_VOLUMEID_EXT is not set # CONFIG_FEATURE_VOLUMEID_F2FS is not set @@ -700,6 +726,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_LFS is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set @@ -719,8 +746,15 @@ CONFIG_FEATURE_VOLUMEID_MINIX=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +CONFIG_BC=y +# CONFIG_DC is not set +CONFIG_FEATURE_DC_BIG=y +# CONFIG_FEATURE_DC_LIBM is not set +CONFIG_FEATURE_BC_INTERACTIVE=y +CONFIG_FEATURE_BC_LONG_OPTIONS=y # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -739,8 +773,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set CONFIG_FEATURE_CROND_DIR="" # CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set @@ -748,10 +780,10 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set # CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASHCP is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -764,6 +796,7 @@ CONFIG_HEXEDIT=y # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set +CONFIG_I2CTRANSFER=y # CONFIG_INOTIFYD is not set # CONFIG_LESS is not set CONFIG_FEATURE_LESS_MAXLINES=0 @@ -776,12 +809,15 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_FEATURE_LESS_RAW is not set +# CONFIG_FEATURE_LESS_ENV is not set CONFIG_LSSCSI=y # CONFIG_MAKEDEVS is not set # CONFIG_FEATURE_MAKEDEVS_LEAF is not set # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set +CONFIG_MIM=y # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -795,16 +831,18 @@ CONFIG_SETFATTR=y CONFIG_SETSERIAL=y # CONFIG_STRINGS is not set # CONFIG_TIME is not set +CONFIG_TS=y # CONFIG_TTYSIZE is not set -# CONFIG_UBIRENAME is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set +# CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -813,6 +851,10 @@ CONFIG_SETSERIAL=y # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_HWIB=y +# CONFIG_FEATURE_TLS_SHA1 is not set # CONFIG_ARP is not set # CONFIG_ARPING is not set # CONFIG_BRCTL is not set @@ -830,6 +872,7 @@ CONFIG_SETSERIAL=y CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -841,6 +884,10 @@ CONFIG_DNSDOMAINNAME=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_FEATURE_HTTPD_GZIP is not set +# CONFIG_FEATURE_HTTPD_ETAG is not set +# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set +# CONFIG_FEATURE_HTTPD_DATE is not set +# CONFIG_FEATURE_HTTPD_ACL_IP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -895,9 +942,12 @@ CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set CONFIG_FEATURE_NETSTAT_PRG=y # CONFIG_NSLOOKUP is not set +# CONFIG_FEATURE_NSLOOKUP_BIG is not set +# CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set # CONFIG_FEATURE_NTPD_CONF is not set +# CONFIG_FEATURE_NTP_AUTH is not set CONFIG_PING=y # CONFIG_PING6 is not set # CONFIG_FEATURE_FANCY_PING is not set @@ -905,6 +955,8 @@ CONFIG_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set +CONFIG_TC=y +CONFIG_FEATURE_TC_INGRESS=y # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y @@ -913,9 +965,11 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_FEATURE_TELNET_WIDTH=y # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -932,6 +986,7 @@ CONFIG_FEATURE_TELNET_WIDTH=y CONFIG_WGET=y # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_FEATURE_WGET_STATUSBAR is not set +CONFIG_FEATURE_WGET_FTP=y # CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_TIMEOUT is not set # CONFIG_FEATURE_WGET_HTTPS is not set @@ -952,10 +1007,12 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set +# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set # # Common options for DHCP applets # +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 @@ -973,17 +1030,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_IOSTAT is not set @@ -1022,7 +1081,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_WATCH is not set -# CONFIG_FEATURE_SHOW_THREADS is not set # # Runit Utilities @@ -1038,6 +1096,7 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" CONFIG_SVC=y +CONFIG_SVOK=y # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set # CONFIG_GETENFORCE is not set @@ -1062,10 +1121,13 @@ CONFIG_SH_IS_HUSH=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +# CONFIG_SHELL_ASH is not set # CONFIG_ASH is not set # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set # CONFIG_ASH_INTERNAL_GLOB is not set # CONFIG_ASH_BASH_COMPAT is not set +# CONFIG_ASH_BASH_SOURCE_CURDIR is not set +# CONFIG_ASH_BASH_NOT_FOUND_HOOK is not set # CONFIG_ASH_JOB_CONTROL is not set # CONFIG_ASH_ALIAS is not set # CONFIG_ASH_RANDOM_SUPPORT is not set @@ -1080,8 +1142,11 @@ CONFIG_BASH_IS_NONE=y # CONFIG_ASH_CMDCMD is not set # CONFIG_CTTYHACK is not set CONFIG_HUSH=y +CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +CONFIG_HUSH_LINENO_VAR=y CONFIG_HUSH_INTERACTIVE=y CONFIG_HUSH_SAVEHISTORY=y CONFIG_HUSH_JOB=y @@ -1102,6 +1167,7 @@ CONFIG_HUSH_EXPORT_N=y CONFIG_HUSH_READONLY=y CONFIG_HUSH_KILL=y CONFIG_HUSH_WAIT=y +CONFIG_HUSH_COMMAND=y CONFIG_HUSH_TRAP=y CONFIG_HUSH_TYPE=y CONFIG_HUSH_TIMES=y @@ -1118,11 +1184,13 @@ CONFIG_HUSH_GETOPTS=y # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set CONFIG_FEATURE_SH_READ_FRAC=y # CONFIG_FEATURE_SH_HISTFILESIZE is not set +CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y # # System Logging Utilities @@ -1137,6 +1205,7 @@ CONFIG_FEATURE_SH_READ_FRAC=y # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 3925521f28..52cb8ffcd8 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.28.0 -# Wed Feb 7 09:44:57 2018 +# Busybox version: 1.35.0 +# Thu Jan 27 10:16:54 2022 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,6 +24,7 @@ CONFIG_FEATURE_WTMP=y # CONFIG_FEATURE_PIDFILE is not set CONFIG_PID_FILE_PATH="" CONFIG_BUSYBOX=y +CONFIG_FEATURE_SHOW_SCRIPT=y CONFIG_FEATURE_INSTALLER=y # CONFIG_INSTALL_NO_USR is not set CONFIG_FEATURE_SUID=y @@ -33,8 +34,8 @@ CONFIG_FEATURE_SUID=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y # # Build Options @@ -52,6 +53,8 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set +CONFIG_STACK_OPTIMIZATION_386=y +CONFIG_STATIC_LIBGCC=y # # Installation Options ("make install" behavior) @@ -73,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -81,15 +85,21 @@ CONFIG_NO_DEBUG_LIB=y # Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set +CONFIG_FLOAT_DURATION=y CONFIG_FEATURE_RTMINMAX=y +CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y @@ -100,6 +110,7 @@ CONFIG_FEATURE_REVERSE_SEARCH=y CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_WINCH=y # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set # CONFIG_LOCALE_SUPPORT is not set # CONFIG_UNICODE_SUPPORT is not set @@ -112,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y # # Applets @@ -149,10 +152,13 @@ CONFIG_UNXZ=y CONFIG_XZCAT=y CONFIG_XZ=y # CONFIG_BZIP2 is not set +CONFIG_BZIP2_SMALL=0 CONFIG_FEATURE_BZIP2_DECOMPRESS=y CONFIG_CPIO=y # CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set +# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set +# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set CONFIG_GZIP=y @@ -188,6 +194,22 @@ CONFIG_FEATURE_UNZIP_XZ=y # # Coreutils # +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for date and touch +# +CONFIG_FEATURE_TIMEZONE=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_FEATURE_CATN=y @@ -198,10 +220,13 @@ CONFIG_CHOWN=y # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y CONFIG_CKSUM=y +CONFIG_CRC32=y # CONFIG_COMM is not set CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set +# CONFIG_FEATURE_CP_REFLINK is not set CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set @@ -213,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y # CONFIG_FEATURE_DF_FANCY is not set +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -228,7 +254,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y CONFIG_FALSE=y CONFIG_FOLD=y -# CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y @@ -283,9 +308,9 @@ CONFIG_SHRED=y # CONFIG_SHUF is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set # CONFIG_STAT is not set @@ -295,6 +320,7 @@ CONFIG_STTY=y # CONFIG_SUM is not set CONFIG_SYNC=y # CONFIG_FEATURE_SYNC_FANCY is not set +# CONFIG_FSYNC is not set # CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -306,7 +332,6 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y # CONFIG_TIMEOUT is not set CONFIG_TOUCH=y -# CONFIG_FEATURE_TOUCH_NODEREF is not set CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -321,31 +346,17 @@ CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y CONFIG_UUDECODE=y +CONFIG_BASE32=y CONFIG_BASE64=y CONFIG_UUENCODE=y CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHOAMI=y CONFIG_WHO=y CONFIG_W=y # CONFIG_USERS is not set +CONFIG_WHOAMI=y CONFIG_YES=y -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - # # Console Utilities # @@ -413,6 +424,7 @@ CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_COLON_EXPAND=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -426,6 +438,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_UNDO=y CONFIG_FEATURE_VI_UNDO_QUEUE=y CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_VI_VERBOSE_STATUS=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -434,13 +447,19 @@ CONFIG_FEATURE_ALLOW_EXEC=y CONFIG_FIND=y CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_ATIME=y +CONFIG_FEATURE_FIND_CTIME=y CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_AMIN=y +CONFIG_FEATURE_FIND_CMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_EXECUTABLE=y CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y # CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_SAMEFILE=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y @@ -450,7 +469,9 @@ CONFIG_FEATURE_FIND_DEPTH=y CONFIG_FEATURE_FIND_PAREN=y CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_QUIT=y # CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -477,6 +498,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y +CONFIG_FEATURE_WAIT_FOR_INIT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y @@ -499,10 +521,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set -CONFIG_ADDGROUP=y -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set +CONFIG_ADDGROUP=y +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set CONFIG_ADDUSER=y # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=60000 @@ -609,7 +631,6 @@ CONFIG_FSTRIM=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HD is not set CONFIG_XXD=y CONFIG_HWCLOCK=y @@ -652,6 +673,8 @@ CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y CONFIG_MOUNTPOINT=y +CONFIG_NOLOGIN=y +# CONFIG_NOLOGIN_DEPENDENCIES is not set # CONFIG_NSENTER is not set CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y @@ -678,6 +701,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_SWITCH_ROOT=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -698,6 +722,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_BCACHE is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +CONFIG_FEATURE_VOLUMEID_EROFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_F2FS=y @@ -705,6 +730,7 @@ CONFIG_FEATURE_VOLUMEID_FAT=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_LFS is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set @@ -724,8 +750,15 @@ CONFIG_FEATURE_VOLUMEID_UBIFS=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +CONFIG_BC=y +CONFIG_DC=y +CONFIG_FEATURE_DC_BIG=y +# CONFIG_FEATURE_DC_LIBM is not set +CONFIG_FEATURE_BC_INTERACTIVE=y +CONFIG_FEATURE_BC_LONG_OPTIONS=y # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -744,8 +777,6 @@ CONFIG_CROND=y CONFIG_FEATURE_CROND_SPECIAL_TIMES=y CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_FEATURE_DC_LIBM is not set # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set @@ -753,10 +784,10 @@ CONFIG_DC=y # CONFIG_FEATURE_DEVFS is not set CONFIG_DEVMEM=y # CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASHCP is not set CONFIG_HDPARM=y CONFIG_FEATURE_HDPARM_GET_IDENTITY=y # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -769,6 +800,7 @@ CONFIG_I2CGET=y CONFIG_I2CSET=y CONFIG_I2CDUMP=y CONFIG_I2CDETECT=y +CONFIG_I2CTRANSFER=y # CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -781,12 +813,15 @@ CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_FEATURE_LESS_RAW is not set +# CONFIG_FEATURE_LESS_ENV is not set CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set CONFIG_MICROCOM=y +CONFIG_MIM=y CONFIG_MT=y # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -800,16 +835,18 @@ CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TS=y # CONFIG_TTYSIZE is not set -CONFIG_UBIRENAME=y # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set +CONFIG_UBIRENAME=y # CONFIG_VOLNAME is not set CONFIG_WATCHDOG=y +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -818,6 +855,10 @@ CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_HWIB=y +# CONFIG_FEATURE_TLS_SHA1 is not set CONFIG_ARP=y CONFIG_ARPING=y # CONFIG_BRCTL is not set @@ -835,6 +876,7 @@ CONFIG_ETHER_WAKE=y CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -846,6 +888,10 @@ CONFIG_DNSDOMAINNAME=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_FEATURE_HTTPD_GZIP is not set +# CONFIG_FEATURE_HTTPD_ETAG is not set +# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set +# CONFIG_FEATURE_HTTPD_DATE is not set +# CONFIG_FEATURE_HTTPD_ACL_IP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -900,9 +946,12 @@ CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set CONFIG_NSLOOKUP=y +CONFIG_FEATURE_NSLOOKUP_BIG=y +CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set # CONFIG_FEATURE_NTPD_CONF is not set +# CONFIG_FEATURE_NTP_AUTH is not set CONFIG_PING=y # CONFIG_PING6 is not set CONFIG_FEATURE_FANCY_PING=y @@ -910,6 +959,8 @@ CONFIG_FEATURE_FANCY_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set +CONFIG_TC=y +CONFIG_FEATURE_TC_INGRESS=y # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y @@ -918,14 +969,12 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_FEATURE_TELNET_WIDTH=y # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set CONFIG_TFTP=y # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +CONFIG_FEATURE_TFTP_HPA_COMPAT=y # CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y @@ -941,6 +990,7 @@ CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_FTP=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_TIMEOUT=y # CONFIG_FEATURE_WGET_HTTPS is not set @@ -961,10 +1011,12 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set +# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set # # Common options for DHCP applets # +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 @@ -982,17 +1034,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R -O search" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_SHOW_THREADS is not set CONFIG_FREE=y CONFIG_FUSER=y # CONFIG_IOSTAT is not set @@ -1031,7 +1085,6 @@ CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_WATCH=y -# CONFIG_FEATURE_SHOW_THREADS is not set # # Runit Utilities @@ -1047,6 +1100,7 @@ CONFIG_WATCH=y # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" CONFIG_SVC=y +CONFIG_SVOK=y # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set # CONFIG_GETENFORCE is not set @@ -1071,10 +1125,13 @@ CONFIG_SH_IS_ASH=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_BASH_SOURCE_CURDIR is not set +CONFIG_ASH_BASH_NOT_FOUND_HOOK=y CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_RANDOM_SUPPORT=y @@ -1089,8 +1146,11 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set @@ -1111,6 +1171,7 @@ CONFIG_ASH_CMDCMD=y # CONFIG_HUSH_READONLY is not set # CONFIG_HUSH_KILL is not set # CONFIG_HUSH_WAIT is not set +# CONFIG_HUSH_COMMAND is not set # CONFIG_HUSH_TRAP is not set # CONFIG_HUSH_TYPE is not set # CONFIG_HUSH_TIMES is not set @@ -1127,11 +1188,13 @@ CONFIG_ASH_CMDCMD=y # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set CONFIG_FEATURE_SH_READ_FRAC=y # CONFIG_FEATURE_SH_HISTFILESIZE is not set +CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y # # System Logging Utilities @@ -1146,6 +1209,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 1f34651d7b..2091cdaf65 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.34.1.tar.bz2.sha256 -sha256 415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549 busybox-1.34.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 +sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60ebc4985f..669366b903 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.34.1 +BUSYBOX_VERSION = 1.35.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 -- 2.20.1 From jborne at kalray.eu Thu Jan 27 13:53:38 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Thu, 27 Jan 2022 14:53:38 +0100 Subject: [Buildroot] [PATCH 0/1] remove libiberty from target install Message-ID: <20220127135339.25430-1-jborne@kalray.eu> Hi, Following my earlier request for comment and your answers, I'm providing this patch... I hope this is Ok. This is pretty much my first patch submission... Thanks again for your nice answers. Best regards. Jonathan. Jonathan Borne (1): package/binutils: remove libiberty from target install package/binutils/binutils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.1 From jborne at kalray.eu Thu Jan 27 13:53:39 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Thu, 27 Jan 2022 14:53:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/binutils: remove libiberty from target install In-Reply-To: <20220127135339.25430-1-jborne@kalray.eu> References: <20220127135339.25430-1-jborne@kalray.eu> Message-ID: <20220127135339.25430-2-jborne@kalray.eu> In BINUTILS_INSTALL_TARGET_CMDS, libiberty is installed to STAGING_DIR This is not necessary since libiberty is already unconditionally installed to staging in BINUTILS_INSTALL_STAGING_CMDS. Furthermore the presence of STAGING_DIR path in TARGET_CMDS is confusing. Moreover libiberty is static only. Static libraries are only used at build time, not at run time so we do not want to install libiberty on target. This commit removes the unnecessary libiberty install in TARGET_CMDS and add a comment to clarify why we do not see libiberty installed on target. Signed-off-by: Jonathan Borne --- package/binutils/binutils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 13f61be035..32ca70d325 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -95,6 +95,8 @@ BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging +# Static-only libraries such as libiberty are used at buildtime in staging +# but are not installed to target. define BINUTILS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install @@ -106,7 +108,6 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif -- 2.17.1 From james.hilliard1 at gmail.com Thu Jan 27 16:21:00 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 09:21:00 -0700 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.1 Message-ID: <20220127162100.2629696-1-james.hilliard1@gmail.com> Drop patch that is now upstream. Signed-off-by: James Hilliard --- ...x-typo-in-vapigen-option-metadatadir.patch | 33 ------------------- package/meson/meson.hash | 4 +-- package/meson/meson.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch deleted file mode 100644 index 3788ee0f11..0000000000 --- a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9952446a2a28ea2b009f4b8b2a14ad50f0878bdd Mon Sep 17 00:00:00 2001 -From: Michal Vasilek -Date: Mon, 10 Jan 2022 21:27:30 +0100 -Subject: [PATCH] gnome: fix typo in vapigen option metadatadir - -This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and -can cause a build failure, because --metadatdir is not a valid vapigen -option. - -[aperez at igalia.com: backport from upstream] -Signed-off-by: Adrian Perez de Castro -[yann.morin.1998 at free.fr: make it an actual backport] -Signed-off-by: Yann E. MORIN ---- - mesonbuild/modules/gnome.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 1125e56e7..dfc66c2e3 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): - cmd: T.List[T.Union[str, 'ExternalProgram']] - cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] - cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) -- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) -+ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) - cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) - cmd += pkg_cmd - cmd += ['--metadatadir=' + source_dir] --- -2.25.1 - diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c9be54be05..c2d53519d4 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz.asc -sha256 ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c meson-0.61.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc +sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e63dc725bf..c40f9f220c 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.0 +MESON_VERSION = 0.61.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 16:29:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 09:29:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.3 Message-ID: <20220127162925.2639638-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index f89b2ce17d..81f51eac20 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 ccfdd97679972cd3d9fb15bc3c647a3ee3351a434e20e1e3eec2851caa1b4849 systemd-250.1.tar.gz +sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 2d3971f31d..5626b54e8e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.1 +SYSTEMD_VERSION = 250.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.25.1 From peter at korsgaard.com Thu Jan 27 16:39:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:39:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gnuchess: security bump to version 6.2.9 Message-ID: <20220127163217.594CE8197C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f40890a29f008589a7cfa8a27818432d2ddc8d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixed potential buffer overflow in pgnload and pgnreplay (CVE-2021-30184) https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85aab41ef9f818216635c9b0f64bf9c20c176135) Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index b68eb6e0ee..0248abcf71 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 29d3590849..630b3aefa7 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.8 +GNUCHESS_VERSION = 6.2.9 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Jan 27 16:39:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:39:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gnuchess: bump to version 6.2.8 Message-ID: <20220127163217.50FA382837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b58aa61fa14b31c7c5f03151469a0fb6bdffccc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://lists.gnu.org/archive/html/info-gnu-chess/2021-05/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4cb36ff7707d7b591b2896b089ce2f6c76a99275) Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index 1641a7d8f9..b68eb6e0ee 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 e536675a61abe82e61b919f6b786755441d9fcd4c21e1c82fb9e5340dd229846 gnuchess-6.2.7.tar.gz +sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 60327dfe06..29d3590849 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.7 +GNUCHESS_VERSION = 6.2.8 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Jan 27 16:38:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:38:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gnuchess: security bump to version 6.2.9 Message-ID: <20220127163222.B53E482837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52404bc144d9ced1b2194cff1d95ffdc2110f892 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixed potential buffer overflow in pgnload and pgnreplay (CVE-2021-30184) https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85aab41ef9f818216635c9b0f64bf9c20c176135) Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index b68eb6e0ee..0248abcf71 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 29d3590849..630b3aefa7 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.8 +GNUCHESS_VERSION = 6.2.9 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Jan 27 16:40:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:40:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuchess: security bump to version 6.2.9 In-Reply-To: <20220109125456.316484-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 13:54:56 +0100") References: <20220109125456.316484-1-fontaine.fabrice@gmail.com> Message-ID: <87sft9b08i.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fixed potential buffer overflow in pgnload and pgnreplay > (CVE-2021-30184) > https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html > https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:41:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:41:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pkg-python.mk: fix typos Message-ID: <20220127163448.7BBB182837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=947b6bc79924101f2a7956fd291be05d5f512d6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x s/interperter/interpreter/ and drop 'use use' / 'depend on use'. Signed-off-by: Peter Korsgaard (cherry picked from commit 65054d1a1964548a72c320b075cb20a122117952) Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 59a48e5a87..7cdd858628 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -170,8 +170,8 @@ endif # - for target packages, we always depend on the default python interpreter # (the one selected by the config); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we depend on use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) @@ -230,8 +230,8 @@ endif # SETUP_TYPE # - for target packages, we always use the default python interpreter (which # is the same version as the one built and installed on the target); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we use use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) From peter at korsgaard.com Thu Jan 27 16:41:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:41:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pkg-python.mk: fix typos Message-ID: <20220127163452.EF91282837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9279040543e9d2de39d8fdf222f80c82bb9c445e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x s/interperter/interpreter/ and drop 'use use' / 'depend on use'. Signed-off-by: Peter Korsgaard (cherry picked from commit 65054d1a1964548a72c320b075cb20a122117952) Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index e6b81bdfd3..bb1e6e5826 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -162,8 +162,8 @@ endif # - for target packages, we always depend on the default python interpreter # (the one selected by the config); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we depend on use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) @@ -222,8 +222,8 @@ endif # SETUP_TYPE # - for target packages, we always use the default python interpreter (which # is the same version as the one built and installed on the target); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we use use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) From peter at korsgaard.com Thu Jan 27 16:45:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:45:09 +0100 Subject: [Buildroot] [PATCH] package/mesa3d/mesa3d.mk: fix typo in comment Message-ID: <20220127164509.22867-1-peter@korsgaard.com> Commit 6a51177af14a2ddaa (package/mesa3d: always enable glx-direct if glx is enabled) introduced a typo in the comment, fix that. Signed-off-by: Peter Korsgaard --- package/mesa3d/mesa3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index f49d96025a..6907d8c94f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -73,7 +73,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. -# Always enable glx-direct; without it, amy GLX applications don't work. +# Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ -Dglx=dri \ -Dglx-direct=true -- 2.20.1 From peter at korsgaard.com Thu Jan 27 16:47:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:47:11 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: account for unsure CVEs In-Reply-To: <20220109162602.909E582A93@busybox.osuosl.org> (Thomas Petazzoni's message of "Sun, 9 Jan 2022 17:31:55 +0100") References: <20220109162602.909E582A93@busybox.osuosl.org> Message-ID: <87o83xazxs.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=a206bbc5fe3453f8763268261c4a7aa6ba2c275d > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The .affects() method of the CVE class in support/scripts/cve.py can > return 3 values: CVE_AFFECTS, CVE_DOESNT_AFFECT and CVE_UNKNOWN. > We of course properly account for CVEs where .affects() return > CVE_AFFECTS, but the ones for which CVE_UNKNOWN is returned are > currently ignored, and therefore treated as if they did not affect the > package. > However CVE_UNKNOWN in fact indicates that the v_start/v_end fields of > the CPE entry could not be parsed by > distutils.version.LooseVersion(). Instead of ignoring such cases, this > commit adds support for the concept of "unsure CVEs", which will be > listed next to CVEs known to affect the package, so that we are aware > of them and can investigate the version issue. > Signed-off-by: Gregory CLEMENT > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:48:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:48:32 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: add --disable option In-Reply-To: <20220109162602.991D282DEC@busybox.osuosl.org> (Thomas Petazzoni's message of "Sun, 9 Jan 2022 17:31:55 +0100") References: <20220109162602.991D282DEC@busybox.osuosl.org> Message-ID: <87k0elazvj.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b102352b62917b053cae1f5d0591fe6507d81522 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > When debugging pkg-stats, it's quite useful to be able to disable some > features that are quite long (checking upstream URL, checking latest > version, checking CVE). This commit adds a --disable option, which can > take a comma-separated list of features to disable, such as: > ./support/scripts/pkg-stats --disable url,upstream > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. Committed to 2021.11.x, thanks. > --- > support/scripts/pkg-stats | 23 ++++++++++++++++------- > 1 file changed, 16 insertions(+), 7 deletions(-) > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index 00ca5647ee..7e20ccc0da 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -1099,6 +1099,10 @@ def resolvepath(path): > return os.path.abspath(os.path.expanduser(path)) > +def list_str(values): > + return values.split(',') > + > + > def parse_args(): > parser = argparse.ArgumentParser() > output = parser.add_argument_group('output', 'Output file(s)') > @@ -1115,6 +1119,9 @@ def parse_args(): > help='List of packages (comma separated)') > parser.add_argument('--nvd-path', dest='nvd_path', > help='Path to the local NVD database', type=resolvepath) > + parser.add_argument('--disable', type=list_str, > + help='Features to disable, comma-separated (cve, upstream, url)', > + default=[]) > args = parser.parse_args() > if not args.html and not args.json: > parser.error('at least one of --html or --json (or both) is required') > @@ -1161,13 +1168,15 @@ def __main__(): > pkg.set_url() > pkg.set_ignored_cves() > pkg.set_developers(developers) > - print("Checking URL status") > - loop = asyncio.get_event_loop() > - loop.run_until_complete(check_package_urls(packages)) > - print("Getting latest versions ...") > - loop = asyncio.get_event_loop() > - loop.run_until_complete(check_package_latest_version(packages)) > - if args.nvd_path: > + if not "url" in args.disable: > + print("Checking URL status") > + loop = asyncio.get_event_loop() > + loop.run_until_complete(check_package_urls(packages)) > + if not "upstream" in args.disable: > + print("Getting latest versions ...") > + loop = asyncio.get_event_loop() > + loop.run_until_complete(check_package_latest_version(packages)) > + if not "cve" in args.disable and args.nvd_path: > print("Checking packages CVEs") > check_package_cves(args.nvd_path, packages) > check_package_cpes(args.nvd_path, packages) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:48:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:48:43 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: add --disable option In-Reply-To: <20220109162602.991D282DEC@busybox.osuosl.org> (Thomas Petazzoni's message of "Sun, 9 Jan 2022 17:31:55 +0100") References: <20220109162602.991D282DEC@busybox.osuosl.org> Message-ID: <87ilu5azv8.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b102352b62917b053cae1f5d0591fe6507d81522 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > When debugging pkg-stats, it's quite useful to be able to disable some > features that are quite long (checking upstream URL, checking latest > version, checking CVE). This commit adds a --disable option, which can > take a comma-separated list of features to disable, such as: > ./support/scripts/pkg-stats --disable url,upstream > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:46:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:46:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: account for unsure CVEs Message-ID: <20220127164713.5803E821F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1329957bdc123cef61aa1a68772188ac4f87a69 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The .affects() method of the CVE class in support/scripts/cve.py can return 3 values: CVE_AFFECTS, CVE_DOESNT_AFFECT and CVE_UNKNOWN. We of course properly account for CVEs where .affects() return CVE_AFFECTS, but the ones for which CVE_UNKNOWN is returned are currently ignored, and therefore treated as if they did not affect the package. However CVE_UNKNOWN in fact indicates that the v_start/v_end fields of the CPE entry could not be parsed by distutils.version.LooseVersion(). Instead of ignoring such cases, this commit adds support for the concept of "unsure CVEs", which will be listed next to CVEs known to affect the package, so that we are aware of them and can investigate the version issue. Signed-off-by: Gregory CLEMENT Signed-off-by: Thomas Petazzoni (cherry picked from commit a206bbc5fe3453f8763268261c4a7aa6ba2c275d) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index a435abff3d..00ca5647ee 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -101,6 +101,7 @@ class Package: self.cpeid = None self.cves = list() self.ignored_cves = list() + self.unsure_cves = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -580,8 +581,11 @@ def check_package_cve_affects(cve, cpe_product_pkgs): if product not in cpe_product_pkgs: continue for pkg in cpe_product_pkgs[product]: - if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS: + cve_status = cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) + if cve_status == cve.CVE_AFFECTS: pkg.cves.append(cve.identifier) + elif cve_status == cve.CVE_UNKNOWN: + pkg.unsure_cves.append(cve.identifier) def check_package_cves(nvd_path, packages): @@ -607,7 +611,7 @@ def check_package_cves(nvd_path, packages): for pkg in packages: if 'cve' not in pkg.status: - if pkg.cves: + if pkg.cves or pkg.unsure_cves: pkg.status['cve'] = ("error", "affected by CVEs") else: pkg.status['cve'] = ("ok", "not affected by CVEs") @@ -662,8 +666,11 @@ def calculate_stats(packages): stats["version-not-uptodate"] += 1 stats["patches"] += pkg.patch_count stats["total-cves"] += len(pkg.cves) + stats["total-unsure-cves"] += len(pkg.unsure_cves) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 + if len(pkg.unsure_cves) != 0: + stats["pkg-unsure-cves"] += 1 if pkg.cpeid: stats["cpe-id"] += 1 else: @@ -921,6 +928,8 @@ def dump_html_pkg(f, pkg): if pkg.is_status_error("cve"): for cve in pkg.cves: f.write("     %s
    \n" % (cve, cve)) + for cve in pkg.unsure_cves: + f.write("     %s (unsure)
    \n" % (cve, cve)) elif pkg.is_status_na("cve"): f.write(" %s" % pkg.status['cve'][1]) else: @@ -1024,6 +1033,10 @@ def dump_html_stats(f, stats): stats["pkg-cves"]) f.write("Total number of CVEs affecting all packages%s\n" % stats["total-cves"]) + f.write("Packages affected by unsure CVEs%s\n" % + stats["pkg-unsure-cves"]) + f.write("Total number of unsure CVEs affecting all packages%s\n" % + stats["total-unsure-cves"]) f.write("Packages with CPE ID%s\n" % stats["cpe-id"]) f.write("Packages without CPE ID%s\n" % From peter at korsgaard.com Thu Jan 27 16:54:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:54:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: fix ssh2 option Message-ID: <20220127164713.72E46821F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7e5a5a7918021697e9f309a14e4999e90059fb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c077b4a919d697c0b4f5c0c30d945418691e2e23) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 9a4788c905..291d892bae 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -219,10 +219,10 @@ LIBVIRT_CONF_OPTS += -Dsasl=disabled endif ifeq ($(BR2_PACKAGE_LIBSSH2),y) -LIBVIRT_CONF_OPTS += -Dssh2=enabled +LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 else -LIBVIRT_CONF_OPTS += -Dssh2=disabled +LIBVIRT_CONF_OPTS += -Dlibssh2=disabled endif ifeq ($(BR2_PACKAGE_LIBVIRT_LXC),y) From peter at korsgaard.com Thu Jan 27 16:48:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:48:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: add --disable option Message-ID: <20220127164713.60A24829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1261aa3c06a6392d674f4119b258aa722c47e59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When debugging pkg-stats, it's quite useful to be able to disable some features that are quite long (checking upstream URL, checking latest version, checking CVE). This commit adds a --disable option, which can take a comma-separated list of features to disable, such as: ./support/scripts/pkg-stats --disable url,upstream Signed-off-by: Thomas Petazzoni (cherry picked from commit b102352b62917b053cae1f5d0591fe6507d81522) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 00ca5647ee..7e20ccc0da 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1099,6 +1099,10 @@ def resolvepath(path): return os.path.abspath(os.path.expanduser(path)) +def list_str(values): + return values.split(',') + + def parse_args(): parser = argparse.ArgumentParser() output = parser.add_argument_group('output', 'Output file(s)') @@ -1115,6 +1119,9 @@ def parse_args(): help='List of packages (comma separated)') parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) + parser.add_argument('--disable', type=list_str, + help='Features to disable, comma-separated (cve, upstream, url)', + default=[]) args = parser.parse_args() if not args.html and not args.json: parser.error('at least one of --html or --json (or both) is required') @@ -1161,13 +1168,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - print("Checking URL status") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_urls(packages)) - print("Getting latest versions ...") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_latest_version(packages)) - if args.nvd_path: + if not "url" in args.disable: + print("Checking URL status") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_urls(packages)) + if not "upstream" in args.disable: + print("Getting latest versions ...") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_latest_version(packages)) + if not "cve" in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From peter at korsgaard.com Thu Jan 27 16:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:50:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: fix flake8 errors Message-ID: <20220127164713.69916829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29e4ff33c36ca865d9940edc16b1fd82a6006ebe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x support/scripts/pkg-stats:1171:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1175:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1179:8: E713 test for membership should be 'not in' 3 E713 test for membership should be 'not in' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1955772278 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 02e679d8bf8acae9e110820858d1f242ff971af8) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7e20ccc0da..abd36a3dd5 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1168,15 +1168,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - if not "url" in args.disable: + if "url" not in args.disable: print("Checking URL status") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_urls(packages)) - if not "upstream" in args.disable: + if "upstream" not in args.disable: print("Getting latest versions ...") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_latest_version(packages)) - if not "cve" in args.disable and args.nvd_path: + if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From peter at korsgaard.com Thu Jan 27 16:46:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:46:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: account for unsure CVEs Message-ID: <20220127164720.CEB34821F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67be1ff4f7c6db8091d1b09daa9e6765e6a6f329 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The .affects() method of the CVE class in support/scripts/cve.py can return 3 values: CVE_AFFECTS, CVE_DOESNT_AFFECT and CVE_UNKNOWN. We of course properly account for CVEs where .affects() return CVE_AFFECTS, but the ones for which CVE_UNKNOWN is returned are currently ignored, and therefore treated as if they did not affect the package. However CVE_UNKNOWN in fact indicates that the v_start/v_end fields of the CPE entry could not be parsed by distutils.version.LooseVersion(). Instead of ignoring such cases, this commit adds support for the concept of "unsure CVEs", which will be listed next to CVEs known to affect the package, so that we are aware of them and can investigate the version issue. Signed-off-by: Gregory CLEMENT Signed-off-by: Thomas Petazzoni (cherry picked from commit a206bbc5fe3453f8763268261c4a7aa6ba2c275d) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 6e656bfc29..0ac7466776 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -101,6 +101,7 @@ class Package: self.cpeid = None self.cves = list() self.ignored_cves = list() + self.unsure_cves = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -569,8 +570,11 @@ def check_package_cve_affects(cve, cpe_product_pkgs): if product not in cpe_product_pkgs: continue for pkg in cpe_product_pkgs[product]: - if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS: + cve_status = cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) + if cve_status == cve.CVE_AFFECTS: pkg.cves.append(cve.identifier) + elif cve_status == cve.CVE_UNKNOWN: + pkg.unsure_cves.append(cve.identifier) def check_package_cves(nvd_path, packages): @@ -596,7 +600,7 @@ def check_package_cves(nvd_path, packages): for pkg in packages: if 'cve' not in pkg.status: - if pkg.cves: + if pkg.cves or pkg.unsure_cves: pkg.status['cve'] = ("error", "affected by CVEs") else: pkg.status['cve'] = ("ok", "not affected by CVEs") @@ -651,8 +655,11 @@ def calculate_stats(packages): stats["version-not-uptodate"] += 1 stats["patches"] += pkg.patch_count stats["total-cves"] += len(pkg.cves) + stats["total-unsure-cves"] += len(pkg.unsure_cves) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 + if len(pkg.unsure_cves) != 0: + stats["pkg-unsure-cves"] += 1 if pkg.cpeid: stats["cpe-id"] += 1 else: @@ -904,6 +911,8 @@ def dump_html_pkg(f, pkg): if pkg.is_status_error("cve"): for cve in pkg.cves: f.write("     %s
    \n" % (cve, cve)) + for cve in pkg.unsure_cves: + f.write("     %s (unsure)
    \n" % (cve, cve)) elif pkg.is_status_na("cve"): f.write(" %s" % pkg.status['cve'][1]) else: @@ -986,6 +995,10 @@ def dump_html_stats(f, stats): stats["pkg-cves"]) f.write("Total number of CVEs affecting all packages%s\n" % stats["total-cves"]) + f.write("Packages affected by unsure CVEs%s\n" % + stats["pkg-unsure-cves"]) + f.write("Total number of unsure CVEs affecting all packages%s\n" % + stats["total-unsure-cves"]) f.write("Packages with CPE ID%s\n" % stats["cpe-id"]) f.write("Packages without CPE ID%s\n" % From peter at korsgaard.com Thu Jan 27 16:50:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:50:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: fix flake8 errors Message-ID: <20220127164720.E872C821F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8f4ca025d3040f474977b7597bc22e226dc7b7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x support/scripts/pkg-stats:1171:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1175:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1179:8: E713 test for membership should be 'not in' 3 E713 test for membership should be 'not in' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1955772278 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 02e679d8bf8acae9e110820858d1f242ff971af8) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 2ccb7a8362..f6da090d22 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1130,15 +1130,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - if not "url" in args.disable: + if "url" not in args.disable: print("Checking URL status") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_urls(packages)) - if not "upstream" in args.disable: + if "upstream" not in args.disable: print("Getting latest versions ...") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_latest_version(packages)) - if not "cve" in args.disable and args.nvd_path: + if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From peter at korsgaard.com Thu Jan 27 16:48:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:48:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: add --disable option Message-ID: <20220127164720.D69D3829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=679d40823bb3fc88e7358e88199b7a7d1e8c7bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x When debugging pkg-stats, it's quite useful to be able to disable some features that are quite long (checking upstream URL, checking latest version, checking CVE). This commit adds a --disable option, which can take a comma-separated list of features to disable, such as: ./support/scripts/pkg-stats --disable url,upstream Signed-off-by: Thomas Petazzoni (cherry picked from commit b102352b62917b053cae1f5d0591fe6507d81522) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 0ac7466776..2ccb7a8362 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1061,6 +1061,10 @@ def resolvepath(path): return os.path.abspath(os.path.expanduser(path)) +def list_str(values): + return values.split(',') + + def parse_args(): parser = argparse.ArgumentParser() output = parser.add_argument_group('output', 'Output file(s)') @@ -1077,6 +1081,9 @@ def parse_args(): help='List of packages (comma separated)') parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) + parser.add_argument('--disable', type=list_str, + help='Features to disable, comma-separated (cve, upstream, url)', + default=[]) args = parser.parse_args() if not args.html and not args.json: parser.error('at least one of --html or --json (or both) is required') @@ -1123,13 +1130,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - print("Checking URL status") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_urls(packages)) - print("Getting latest versions ...") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_latest_version(packages)) - if args.nvd_path: + if not "url" in args.disable: + print("Checking URL status") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_urls(packages)) + if not "upstream" in args.disable: + print("Getting latest versions ...") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_latest_version(packages)) + if not "cve" in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From peter at korsgaard.com Thu Jan 27 16:57:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:57:49 +0100 Subject: [Buildroot] [PATCH 1/3] package/libvirt: fix ssh2 option In-Reply-To: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 21:00:37 +0100") References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Message-ID: <87a6fhazg2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since commit > fbf25acfbfd5a73b3560918bea081768abbe5723: > output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" > Fixes: > - No autobuilder failures (yet) > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:58:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:58:21 +0100 Subject: [Buildroot] [PATCH 2/3] package/libvirt: disable sasl In-Reply-To: <20220109200039.3188788-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 21:00:38 +0100") References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> <20220109200039.3188788-2-fontaine.fabrice@gmail.com> Message-ID: <875yq5azf6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > sasl depends on libsasl2 (https://github.com/cyrusimap/cyrus-sasl) which > is not packaged yet in buildroot and will result in the following build > failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: > output/build/libvirt-7.7.0/meson.build:1212:2: ERROR: Dependency "libsasl2" not found, tried pkgconfig > Fixes: > - No autobuilder failures (yet) > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:58:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:58:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: disable sasl Message-ID: <20220127165358.E760A829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf0b5f24427dc01106d0c3c892763588dcb21b85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x sasl depends on libsasl2 (https://github.com/cyrusimap/cyrus-sasl) which is not packaged yet in buildroot and will result in the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1212:2: ERROR: Dependency "libsasl2" not found, tried pkgconfig Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ba2016dc04271844416088b766284f9a22a6b58d) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 291d892bae..e7bfe6964d 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -62,6 +62,7 @@ LIBVIRT_CONF_OPTS = \ -Dpciaccess=enabled \ -Dpm_utils=disabled \ -Dsanlock=disabled \ + -Dsasl=disabled \ -Dsecdriver_apparmor=disabled \ -Dstorage_iscsi=disabled \ -Dstorage_iscsi_direct=disabled \ @@ -211,13 +212,6 @@ else LIBVIRT_CONF_OPTS += -Dnss=disabled endif -ifeq ($(BR2_PACKAGE_LIBGSASL),y) -LIBVIRT_CONF_OPTS += -Dsasl=enabled -LIBVIRT_DEPENDENCIES += libgsasl -else -LIBVIRT_CONF_OPTS += -Dsasl=disabled -endif - ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 From petr.vorel at gmail.com Thu Jan 27 17:33:40 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Jan 2022 18:33:40 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 In-Reply-To: <87lez191e6.fsf@tarshish> References: <20220126235652.25712-1-petr.vorel@gmail.com> <87lez191e6.fsf@tarshish> Message-ID: Hi Baruch, > Hi Petr, > On Thu, Jan 27 2022, Petr Vorel wrote: > > LTP now builds metadata directory as host target. > > It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make > > (adding to configure does not work) to avoid adding -mlongcalls > > -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc). > > Drop patches from this release. > > Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch > > (still safe to carry it). > > Signed-off-by: Petr Vorel > > --- > > Changes v1->v2: > > * Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc > > when compiling host target) > [...] ... > > @@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \ > > LIBS="$(LTP_TESTSUITE_LIBS)" \ > > SYSROOT="$(STAGING_DIR)" > > +LTP_TESTSUITE_MAKE_ENV += \ > > + HOST_CFLAGS="$(HOST_CFLAGS)" \ > > + HOST_LDFLAGS="$(HOST_LDFLAGS)" > I think you should have TARGET_* on the right side of the assignment, > since this is a target package. No, it must be HOST_* because the whole exercise is needed to allow one bit of LTP code built for as host target. I tried to explain this in the commit message, but clearly I wasn't clear :). I've tested it on complete build that it's working like this. But using TARGET_* as you suggest HOST_CFLAGS would have the same options as CFLAGS, which I'm trying to avoid (that's the default if we don't set anything [1]). With TARGET_* (or nothing set at all) it fails at least on these 2 builds: br-arm-full-static [5/6]: FAILED bootlin-xtensa-uclibc [24/45]: FAILED * br-arm-full-static make -C "metadata" \ -f "br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata/Makefile" all make[1]: Entering directory 'br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata' /usr/bin/gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Os -g0 -static -Ibr-test-pkg/br-arm-full-static/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/tirpc -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -static metaparse.c -o metaparse /usr/lib64/gcc/x86_64-suse-linux/11/../../../../x86_64-suse-linux/bin/ld: cannot find -lc collect2: error: ld returned 1 exit status make[1]: *** [../include/mk/rules.mk:27: metaparse] Error 1 make[1]: Leaving directory 'br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata' make: *** [Makefile:106: metadata-all] Error 2 * bootlin-xtensa-uclibc make -C "metadata" \ -f "br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata/Makefile" all make[1]: Entering directory 'br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata' /usr/bin/gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -mlongcalls -mauto-litpools -Os -g0 -Ibr-test-pkg/bootlin-xtensa-uclibc/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/include/tirpc -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition metaparse.c -o metaparse gcc: error: unrecognized command-line option ?-mlongcalls? gcc: error: unrecognized command-line option ?-mauto-litpools? make[1]: *** [../include/mk/rules.mk:27: metaparse] Error 1 make[1]: Leaving directory 'br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata' Kind regards, Petr [1] https://lore.kernel.org/ltp/YfJ6fIbFvN7rD0SR at pevik/ > baruch From fontaine.fabrice at gmail.com Thu Jan 27 17:53:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 27 Jan 2022 18:53:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/htpdate: fix install Message-ID: <20220127175359.2330776-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: >>> htpdate 1.3.3 Installing to target PATH="/home/buildroot/autobuild/instance-0/output-1/host/bin:/home/buildroot/autobuild/instance-0/output-1/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3 DESTDIR=/home/buildroot/autobuild/instance-0/output-1/target install make[1]: Entering directory '/home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3' strip -s htpdate strip: Unable to recognise the format of the input file `htpdate' Fixes: - http://autobuild.buildroot.org/results/f1034de5ebc2fc2c49711820077d0b6e5e13aea5 Signed-off-by: Fabrice Fontaine --- package/htpdate/htpdate.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 200c3207a2..54b3ec2569 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -19,7 +19,8 @@ define HTPDATE_BUILD_CMDS endef define HTPDATE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR) install endef define HTPDATE_INSTALL_INIT_SYSV -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 27 18:04:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 27 Jan 2022 19:04:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/jasper: use JAS_ENABLE_DOC Message-ID: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> Replace CMAKE_DISABLE_FIND_PACKAGE_{DOXYGEN,LATEX} by JAS_ENABLE_DOC which is available (and working as expected) since version 2.0.20 and https://github.com/jasper-software/jasper/commit/cddb7b199a1c78f3ec0b2c6b8af705588437af4b Signed-off-by: Fabrice Fontaine --- package/jasper/jasper.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 6ef1afcac7..59c5b3d66a 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -11,9 +11,7 @@ JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = \ - -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ - -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE +JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 27 18:04:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 27 Jan 2022 19:04:56 +0100 Subject: [Buildroot] [PATCH 2/2] package/jasper: bump to version 2.0.33 In-Reply-To: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> References: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> Message-ID: <20220127180456.2338773-2-fontaine.fabrice@gmail.com> https://github.com/jasper-software/jasper/blob/version-2.0.33/NEWS Signed-off-by: Fabrice Fontaine --- package/jasper/jasper.hash | 2 +- package/jasper/jasper.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index 67653a8e88..410bcfc683 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b4e5f682be0ab1a5acb0eeb6bf41d6ce17a658bb8e2dbda95de40100939cc88 jasper-2.0.28.tar.gz +sha256 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a jasper-2.0.33.tar.gz sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 59c5b3d66a..05168db763 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,8 +4,8 @@ # ################################################################################ -JASPER_VERSION = 2.0.28 -JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) +JASPER_VERSION = 2.0.33 +JASPER_SITE = https://github.com/jasper-software/jasper/releases/download/version-$(JASPER_VERSION) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE -- 2.34.1 From peter at korsgaard.com Thu Jan 27 18:30:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:30:32 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: add entry for avrdude to Yegor Yefremov In-Reply-To: <20220110085850.11095-1-yegorslists@googlemail.com> (yegorslists's message of "Mon, 10 Jan 2022 09:58:49 +0100") References: <20220110085850.11095-1-yegorslists@googlemail.com> Message-ID: <871r0tav5j.fsf@dell.be.48ers.dk> >>>>> "yegorslists---" == yegorslists--- via buildroot writes: > From: Yegor Yefremov > Signed-off-by: Yegor Yefremov Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 18:30:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:30:51 +0100 Subject: [Buildroot] [git commit] Developpers: remove Santosh Multhalli for valjson In-Reply-To: <20220110140611.2CCBF83241@busybox.osuosl.org> (Yann E. MORIN's message of "Mon, 10 Jan 2022 15:11:53 +0100") References: <20220110140611.2CCBF83241@busybox.osuosl.org> Message-ID: <87wnil9gkk.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=31fd98c6ae7c39d779e7f9729e55ec65a7f847ff > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Signed-off-by: Santosh Multhalli > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 18:31:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:31:45 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: drop Henrique Camargo In-Reply-To: <20220111144110.01B1D82B52@busybox.osuosl.org> (Thomas Petazzoni's message of "Tue, 11 Jan 2022 15:46:59 +0100") References: <20220111144110.01B1D82B52@busybox.osuosl.org> Message-ID: <87sft99gj2.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=f51be73f25bdc9b370db42996475136098ebd251 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > He has privately requested to no longer be notified regarding this > package. > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 18:31:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:31:23 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: drop Henrique Camargo Message-ID: <20220127182510.84F3C82A00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3da77e6b2555a35ead4807e39c5520822f7142df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x He has privately requested to no longer be notified regarding this package. Signed-off-by: Thomas Petazzoni (cherry picked from commit f51be73f25bdc9b370db42996475136098ebd251) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 834419f9c5..e2c0f4d521 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1145,9 +1145,6 @@ F: package/linuxptp/ F: package/netopeer2/ F: package/sysrepo/ -N: Henrique Camargo -F: package/json-glib/ - N: Herv?? Codina F: package/dtbocfg/ F: package/libdbi/ From peter at korsgaard.com Thu Jan 27 18:20:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:20:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: libvirtd needs C++ for nmap-ncat Message-ID: <20220127182510.4A09D829FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53195812536db9890745f6ed69174888177bb812 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] Selected by [y]: - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: C++ only needed without NETCAT_OPENBSD] Signed-off-by: Yann E. MORIN (cherry picked from commit 4dff1be05e906f5c3cfd56ebc1458579635b4ca7) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index e75f1cf15f..103d1b9543 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,6 +44,7 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y + depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES @@ -57,6 +58,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. +comment "libvirtd needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD + # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON From peter at korsgaard.com Thu Jan 27 18:29:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:29:43 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add entry for avrdude to Yegor Yefremov Message-ID: <20220127182510.6F52E829FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a19f45e6428f538b2cce3b71ee2efde717cf4624 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN (cherry picked from commit 922fdcd47d092e9d2f7000afcb7997a2a2ed2111) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index de7d2c3fbf..1775b75791 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2883,6 +2883,7 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ +F: package/avrdude/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ From peter at korsgaard.com Thu Jan 27 18:29:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:29:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Developpers: remove Santosh Multhalli for valjson Message-ID: <20220127182510.79E2E829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11f988730e18fccbf3c865193ae8da929b900b40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Santosh Multhalli Signed-off-by: Yann E. MORIN (cherry picked from commit 31fd98c6ae7c39d779e7f9729e55ec65a7f847ff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1775b75791..834419f9c5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2425,9 +2425,6 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Santosh Multhalli -F: package/valijson/ - N: S??bastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ From peter at korsgaard.com Thu Jan 27 18:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:21:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirtd: fix recursive dependency in Kconfig Message-ID: <20220127182510.56B66829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcc1585d9ddb12ff849cf0e0940d90389e23123e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 4dff1be05e90 (package/libvirt: libvirtd needs C++ for nmap-ncat) introduce a recursive dependency (really: a circular dependency): package/busybox/Config.in:33:error: recursive dependency detected! package/busybox/Config.in:33: symbol BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is selected by BR2_PACKAGE_EBTABLES_UTILS_SAVE package/ebtables/Config.in:11: symbol BR2_PACKAGE_EBTABLES_UTILS_SAVE depends on BR2_PACKAGE_EBTABLES package/ebtables/Config.in:1: symbol BR2_PACKAGE_EBTABLES is selected by BR2_PACKAGE_LIBVIRT_DAEMON package/libvirt/Config.in:44: symbol BR2_PACKAGE_LIBVIRT_DAEMON depends on BR2_PACKAGE_NETCAT_OPENBSD package/netcat-openbsd/Config.in:1: symbol BR2_PACKAGE_NETCAT_OPENBSD depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS As usual with this kind of circular depednency, it is not trivial to see what the real cuplrit is, or where to cut the circle. A simple solution in this case is to drop the C++ dependency, and switch the netcat-openbsd and nmap-ncat dependencies conditions. Signed-off-by: Yann E. MORIN (cherry picked from commit f81242ae4fb64ab85af5d38e70246222276552ae) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 103d1b9543..b91b8e2c1c 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,15 +44,13 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y - depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES select BR2_PACKAGE_IPTABLES select BR2_PACKAGE_IPROUTE2 # These are required because there is no way to unequivocally select a modern netcat - select BR2_PACKAGE_NMAP if !BR2_PACKAGE_NETCAT_OPENBSD - select BR2_PACKAGE_NMAP_NCAT if !BR2_PACKAGE_NETCAT_OPENBSD + select BR2_PACKAGE_NETCAT_OPENBSD if !BR2_PACKAGE_NMAP_NCAT select BR2_PACKAGE_RADVD help Build the libvirt daemon (libvirtd) otherwise build only the From peter at korsgaard.com Thu Jan 27 18:21:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:21:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: drop C++ comment Message-ID: <20220127182510.6030082A00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=213d4e125ddb398cacbe4a0aec4f631f3ca1d55c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit f81242ae4fb64ab85af5d38e70246222276552ae forgot to drop C++ comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit fb9a65d98b128c1b06069013e0ab874779ef5228) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index b91b8e2c1c..af0fc36aea 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -56,9 +56,6 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. -comment "libvirtd needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD - # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON From peter at korsgaard.com Thu Jan 27 18:29:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:29:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add entry for avrdude to Yegor Yefremov Message-ID: <20220127182514.E376D829FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1cd0d2cf52511215df0586174a2609c374c0513 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN (cherry picked from commit 922fdcd47d092e9d2f7000afcb7997a2a2ed2111) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9108d11f3c..1e54d62466 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2737,6 +2737,7 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ +F: package/avrdude/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ From peter at korsgaard.com Thu Jan 27 18:29:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:29:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Developpers: remove Santosh Multhalli for valjson Message-ID: <20220127182514.EFA9F829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35baab9abf3ffa44d2318eb5d2063cfd5547b88d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Santosh Multhalli Signed-off-by: Yann E. MORIN (cherry picked from commit 31fd98c6ae7c39d779e7f9729e55ec65a7f847ff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1e54d62466..57e4592b4a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2309,9 +2309,6 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Santosh Multhalli -F: package/valijson/ - N: S??bastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ From james.hilliard1 at gmail.com Thu Jan 27 18:39:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 11:39:24 -0700 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson Message-ID: <20220127183924.1938903-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/network-manager/Config.in | 1 + package/network-manager/network-manager.mk | 100 ++++++++++----------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..da1a7d79b3 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help This option enables support for ModemManager diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..290333e16c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ libgcrypt wireless_tools util-linux host-intltool libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no - NETWORK_MANAGER_CONF_OPTS = \ - --disable-introspection \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --without-nm-cloud-setup + -Dintrospection=false \ + -Ddocs=false \ + -Dtests=no \ + -Dqt=false \ + -Dcrypto=gnutls \ + -Diptables=/usr/sbin/iptables \ + -Difupdown=false \ + -Dnm_cloud_setup=false \ + -Dsession_tracking_consolekit=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd -NETWORK_MANAGER_CONF_OPTS += --with-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=true else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=false endif ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl -NETWORK_MANAGER_CONF_OPTS += --enable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true else -NETWORK_MANAGER_CONF_OPTS += --disable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false endif ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl -NETWORK_MANAGER_CONF_OPTS += --with-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true else -NETWORK_MANAGER_CONF_OPTS += --without-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) NETWORK_MANAGER_DEPENDENCIES += libselinux -NETWORK_MANAGER_CONF_OPTS += --with-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true else -NETWORK_MANAGER_CONF_OPTS += --without-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=true NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=true else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=true else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_CONF_OPTS += \ - --with-systemd-journal \ - --with-config-logging-backend-default=journal \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd + -Dsystemd_journal=true \ + -Dconfig_logging_backend_default=journal \ + -Dsession_tracking=systemd \ + -Dsuspend_resume=systemd else NETWORK_MANAGER_CONF_OPTS += \ - --without-systemd-journal \ - --with-config-logging-backend-default=syslog \ - --without-session-tracking \ - --with-suspend-resume=upower + -Dsystemd_journal=false \ + -Dconfig_logging_backend_default=syslog \ + -Dsession_tracking=no \ + -Dsuspend_resume=upower \ + -Dsystemdsystemunitdir=no endif ifeq ($(BR2_PACKAGE_POLKIT),y) NETWORK_MANAGER_DEPENDENCIES += polkit -NETWORK_MANAGER_CONF_OPTS += --enable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true else -NETWORK_MANAGER_CONF_OPTS += --disable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false endif ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false endif define NETWORK_MANAGER_INSTALL_INIT_SYSV @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.25.1 From yann.morin.1998 at free.fr Thu Jan 27 18:46:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 19:46:29 +0100 Subject: [Buildroot] [git commit] package/mesa3d/mesa3d.mk: fix typo in comment Message-ID: <20220127183940.C03B58257C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9a7f54083e9b4c2461abcf06cfb0387a7ce51dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 6a51177af14a2ddaa (package/mesa3d: always enable glx-direct if glx is enabled) introduced a typo in the comment, fix that. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/mesa3d/mesa3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index f49d96025a..6907d8c94f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -73,7 +73,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. -# Always enable glx-direct; without it, amy GLX applications don't work. +# Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ -Dglx=dri \ -Dglx-direct=true From yann.morin.1998 at free.fr Thu Jan 27 18:47:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 19:47:02 +0100 Subject: [Buildroot] [PATCH] package/mesa3d/mesa3d.mk: fix typo in comment In-Reply-To: <20220127164509.22867-1-peter@korsgaard.com> References: <20220127164509.22867-1-peter@korsgaard.com> Message-ID: <20220127184702.GM457876@scaer> Peter, All, On 2022-01-27 17:45 +0100, Peter Korsgaard spake thusly: > Commit 6a51177af14a2ddaa (package/mesa3d: always enable glx-direct if glx is > enabled) introduced a typo in the comment, fix that. > > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/mesa3d/mesa3d.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index f49d96025a..6907d8c94f 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -73,7 +73,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) > # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi > # xlib : xlib conflicts with any dri driver > # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. > -# Always enable glx-direct; without it, amy GLX applications don't work. > +# Always enable glx-direct; without it, many GLX applications don't work. > MESA3D_CONF_OPTS += \ > -Dglx=dri \ > -Dglx-direct=true > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 27 18:49:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 19:49:45 +0100 Subject: [Buildroot] [git commit] package/htpdate: fix install Message-ID: <20220127184256.B4004829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e7e19a5b07e533716f3e1612c10a85fa2966d6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: >>> htpdate 1.3.3 Installing to target PATH="/home/buildroot/autobuild/instance-0/output-1/host/bin:/home/buildroot/autobuild/instance-0/output-1/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3 DESTDIR=/home/buildroot/autobuild/instance-0/output-1/target install make[1]: Entering directory '/home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3' strip -s htpdate strip: Unable to recognise the format of the input file `htpdate' Fixes: - http://autobuild.buildroot.org/results/f1034de5ebc2fc2c49711820077d0b6e5e13aea5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/htpdate/htpdate.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 200c3207a2..54b3ec2569 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -19,7 +19,8 @@ define HTPDATE_BUILD_CMDS endef define HTPDATE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR) install endef define HTPDATE_INSTALL_INIT_SYSV From yann.morin.1998 at free.fr Thu Jan 27 18:50:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 19:50:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/htpdate: fix install In-Reply-To: <20220127175359.2330776-1-fontaine.fabrice@gmail.com> References: <20220127175359.2330776-1-fontaine.fabrice@gmail.com> Message-ID: <20220127185005.GN457876@scaer> Fabrice, All, On 2022-01-27 18:53 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 1.3.3 in > commit 163509a8e0d558e6339c5489f072dfe805e0cc34: > > >>> htpdate 1.3.3 Installing to target > PATH="/home/buildroot/autobuild/instance-0/output-1/host/bin:/home/buildroot/autobuild/instance-0/output-1/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3 DESTDIR=/home/buildroot/autobuild/instance-0/output-1/target install > make[1]: Entering directory '/home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3' > strip -s htpdate > strip: Unable to recognise the format of the input file `htpdate' > > Fixes: > - http://autobuild.buildroot.org/results/f1034de5ebc2fc2c49711820077d0b6e5e13aea5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/htpdate/htpdate.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk > index 200c3207a2..54b3ec2569 100644 > --- a/package/htpdate/htpdate.mk > +++ b/package/htpdate/htpdate.mk > @@ -19,7 +19,8 @@ define HTPDATE_BUILD_CMDS > endef > > define HTPDATE_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install > + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ > + DESTDIR=$(TARGET_DIR) install > endef > > define HTPDATE_INSTALL_INIT_SYSV > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Thu Jan 27 19:23:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:07 -0700 Subject: [Buildroot] [PATCH v2 1/5] package/serd: new package Message-ID: <20220127192311.1954197-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/serd/Config.in | 8 ++++++++ package/serd/serd.hash | 4 ++++ package/serd/serd.mk | 20 ++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/serd/Config.in create mode 100644 package/serd/serd.hash create mode 100644 package/serd/serd.mk diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..6e40b0e9ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1335,6 +1335,7 @@ F: package/python-tomli/ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ +F: package/serd/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index e4ca195beb..decf523821 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1720,6 +1720,7 @@ menu "JSON/XML" source "package/rapidjson/Config.in" source "package/rapidxml/Config.in" source "package/raptor/Config.in" + source "package/serd/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" diff --git a/package/serd/Config.in b/package/serd/Config.in new file mode 100644 index 0000000000..7633a979e2 --- /dev/null +++ b/package/serd/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SERD + bool "serd" + help + Serd is a lightweight C library for RDF syntax which + supports reading and writing Turtle, TriG, NTriples, and + NQuads. + + https://drobilla.net/software/serd.html diff --git a/package/serd/serd.hash b/package/serd/serd.hash new file mode 100644 index 0000000000..d64a2aa271 --- /dev/null +++ b/package/serd/serd.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig +sha256 affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf serd-0.30.10.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/serd/serd.mk b/package/serd/serd.mk new file mode 100644 index 0000000000..85b16f6866 --- /dev/null +++ b/package/serd/serd.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# serd +# +################################################################################ + +SERD_VERSION = 0.30.10 +SERD_SITE = https://download.drobilla.net +SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2 +SERD_LICENSE = ISC +SERD_LICENSE_FILES = COPYING +SERD_INSTALL_STAGING = YES + +SERD_CONF_OPTS += --largefile --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SERD_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 19:23:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:08 -0700 Subject: [Buildroot] [PATCH v2 2/5] package/sord: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: <20220127192311.1954197-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sord/Config.in | 8 ++++++++ package/sord/sord.hash | 4 ++++ package/sord/sord.mk | 25 +++++++++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/sord/Config.in create mode 100644 package/sord/sord.hash create mode 100644 package/sord/sord.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6e40b0e9ae..0d70c676d5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1336,6 +1336,7 @@ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ F: package/serd/ +F: package/sord/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index decf523821..aa700bc8d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1721,6 +1721,7 @@ menu "JSON/XML" source "package/rapidxml/Config.in" source "package/raptor/Config.in" source "package/serd/Config.in" + source "package/sord/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" diff --git a/package/sord/Config.in b/package/sord/Config.in new file mode 100644 index 0000000000..91dfb41d0b --- /dev/null +++ b/package/sord/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SORD + bool "sord" + select BR2_PACKAGE_SERD + help + Sord is a lightweight C library for storing RDF data in + memory. + + https://drobilla.net/software/sord.html diff --git a/package/sord/sord.hash b/package/sord/sord.hash new file mode 100644 index 0000000000..af175f91f0 --- /dev/null +++ b/package/sord/sord.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc +sha256 7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14 sord-0.16.8.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/sord/sord.mk b/package/sord/sord.mk new file mode 100644 index 0000000000..f805805e9d --- /dev/null +++ b/package/sord/sord.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# sord +# +################################################################################ + +SORD_VERSION = 0.16.8 +SORD_SITE = https://download.drobilla.net +SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2 +SORD_LICENSE = ISC +SORD_LICENSE_FILES = COPYING +SORD_DEPENDENCIES = host-pkgconf serd +SORD_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_PCRE),y) +SORD_DEPENDENCIES += pcre +endif + +SORD_CONF_OPTS += --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SORD_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 19:23:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:09 -0700 Subject: [Buildroot] [PATCH v2 3/5] package/lv2: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: <20220127192311.1954197-3-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - disable plugins for static build --- DEVELOPERS | 1 + package/Config.in | 1 + package/lv2/Config.in | 8 ++++++++ package/lv2/lv2.hash | 4 ++++ package/lv2/lv2.mk | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 package/lv2/Config.in create mode 100644 package/lv2/lv2.hash create mode 100644 package/lv2/lv2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0d70c676d5..548570aa46 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1285,6 +1285,7 @@ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/lv2/ F: package/pipewire/ F: package/python-aioconsole/ F: package/python-aiodns/ diff --git a/package/Config.in b/package/Config.in index aa700bc8d7..80d3f9ff3c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1372,6 +1372,7 @@ menu "Audio/Sound" source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" + source "package/lv2/Config.in" source "package/mp4v2/Config.in" source "package/openal/Config.in" source "package/opencore-amr/Config.in" diff --git a/package/lv2/Config.in b/package/lv2/Config.in new file mode 100644 index 0000000000..aeeb6d0451 --- /dev/null +++ b/package/lv2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LV2 + bool "lv2" + help + LV2 is a plugin standard for audio systems. It defines + a minimal yet extensible C API for plugin code and a + format for plugin "bundles". + + https://lv2plug.in/ diff --git a/package/lv2/lv2.hash b/package/lv2/lv2.hash new file mode 100644 index 0000000000..ed21620bee --- /dev/null +++ b/package/lv2/lv2.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://lv2plug.in/spec/lv2-1.18.2.tar.bz2.asc +sha256 4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e lv2-1.18.2.tar.bz2 +sha256 0b0b07d852e3ce7fa04986e141f73001bd7f260683968f0a19e02dbcc4131aa6 COPYING diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk new file mode 100644 index 0000000000..13ffaa34b0 --- /dev/null +++ b/package/lv2/lv2.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# lv2 +# +################################################################################ + +LV2_VERSION = 1.18.2 +LV2_SITE = https://lv2plug.in/spec +LV2_SOURCE = lv2-$(LV2_VERSION).tar.bz2 +LV2_LICENSE = ISC +LV2_LICENSE_FILES = COPYING +LV2_DEPENDENCIES = host-pkgconf +LV2_INSTALL_STAGING = YES + +LV2_CONF_OPTS += \ + --no-coverage \ + --no-check-links \ + --copy-headers + +ifeq ($(BR2_PACKAGE_CAIRO),y) +LV2_DEPENDENCIES += cairo +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +LV2_DEPENDENCIES += libsndfile +endif + +ifeq ($(BR2_PACKAGE_LIBGTK2),y) +LV2_DEPENDENCIES += libgtk2 +endif + +ifeq ($(BR2_STATIC_LIBS),y) +LV2_CONF_OPTS += --no-plugins +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 19:23:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:10 -0700 Subject: [Buildroot] [PATCH v2 4/5] package/sratom: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: <20220127192311.1954197-4-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sratom/Config.in | 10 ++++++++++ package/sratom/sratom.hash | 4 ++++ package/sratom/sratom.mk | 21 +++++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/sratom/Config.in create mode 100644 package/sratom/sratom.hash create mode 100644 package/sratom/sratom.mk diff --git a/DEVELOPERS b/DEVELOPERS index 548570aa46..c4c46fc3bd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1338,6 +1338,7 @@ F: package/python-yarl/ F: package/python-zopfli/ F: package/serd/ F: package/sord/ +F: package/sratom/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index 80d3f9ff3c..547620a266 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1383,6 +1383,7 @@ menu "Audio/Sound" source "package/spandsp/Config.in" source "package/speex/Config.in" source "package/speexdsp/Config.in" + source "package/sratom/Config.in" source "package/taglib/Config.in" source "package/tinyalsa/Config.in" source "package/tremor/Config.in" diff --git a/package/sratom/Config.in b/package/sratom/Config.in new file mode 100644 index 0000000000..771e82073d --- /dev/null +++ b/package/sratom/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_SRATOM + bool "sratom" + select BR2_PACKAGE_LV2 + select BR2_PACKAGE_SERD + select BR2_PACKAGE_SORD + help + Sratom is a library for serialising LV2 atoms to and from + RDF, particularly the Turtle syntax. + + https://drobilla.net/software/sratom.html diff --git a/package/sratom/sratom.hash b/package/sratom/sratom.hash new file mode 100644 index 0000000000..64d460b2ea --- /dev/null +++ b/package/sratom/sratom.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/sratom-0.6.8.tar.bz2.asc +sha256 3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df sratom-0.6.8.tar.bz2 +sha256 3fc429d6b944fa20306357196a28bb4dd7c25e2d67edebec771f44de5bd7f9e8 COPYING diff --git a/package/sratom/sratom.mk b/package/sratom/sratom.mk new file mode 100644 index 0000000000..e1e0f4e033 --- /dev/null +++ b/package/sratom/sratom.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# sratom +# +################################################################################ + +SRATOM_VERSION = 0.6.8 +SRATOM_SITE = https://download.drobilla.net +SRATOM_SOURCE = sratom-$(SRATOM_VERSION).tar.bz2 +SRATOM_LICENSE = ISC +SRATOM_LICENSE_FILES = COPYING +SRATOM_DEPENDENCIES = host-pkgconf lv2 serd sord +SRATOM_INSTALL_STAGING = YES + +SRATOM_CONF_OPTS += --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SRATOM_CONF_OPTS += --static --no-shared +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 19:23:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:11 -0700 Subject: [Buildroot] [PATCH v2 5/5] package/lilv: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: <20220127192311.1954197-5-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - require dynamic library support --- DEVELOPERS | 1 + package/Config.in | 1 + package/lilv/Config.in | 15 +++++++++++++++ package/lilv/lilv.hash | 4 ++++ package/lilv/lilv.mk | 30 ++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 package/lilv/Config.in create mode 100644 package/lilv/lilv.hash create mode 100644 package/lilv/lilv.mk diff --git a/DEVELOPERS b/DEVELOPERS index c4c46fc3bd..5bde1695e7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1285,6 +1285,7 @@ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/lilv/ F: package/lv2/ F: package/pipewire/ F: package/python-aioconsole/ diff --git a/package/Config.in b/package/Config.in index 547620a266..84a53577e7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1372,6 +1372,7 @@ menu "Audio/Sound" source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" + source "package/lilv/Config.in" source "package/lv2/Config.in" source "package/mp4v2/Config.in" source "package/openal/Config.in" diff --git a/package/lilv/Config.in b/package/lilv/Config.in new file mode 100644 index 0000000000..08d54bcf8b --- /dev/null +++ b/package/lilv/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LILV + bool "lilv" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LV2 + select BR2_PACKAGE_SERD + select BR2_PACKAGE_SORD + select BR2_PACKAGE_SRATOM + help + Lilv is a C library to make the use of LV2 plugins as simple + as possible for applications. + + https://drobilla.net/software/lilv.html + +comment "lilv needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/lilv/lilv.hash b/package/lilv/lilv.hash new file mode 100644 index 0000000000..afa20fc083 --- /dev/null +++ b/package/lilv/lilv.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/lilv-0.24.12.tar.bz2.asc +sha256 26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061 lilv-0.24.12.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/lilv/lilv.mk b/package/lilv/lilv.mk new file mode 100644 index 0000000000..5f9186e66a --- /dev/null +++ b/package/lilv/lilv.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# lilv +# +################################################################################ + +LILV_VERSION = 0.24.12 +LILV_SITE = https://download.drobilla.net +LILV_SOURCE = lilv-$(LILV_VERSION).tar.bz2 +LILV_LICENSE = ISC +LILV_LICENSE_FILES = COPYING +LILV_DEPENDENCIES = host-pkgconf lv2 serd sord sratom +LILV_INSTALL_STAGING = YES + +LILV_CONF_OPTS += \ + --dyn-manifest \ + --no-bash-completion \ + --no-coverage + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LILV_DEPENDENCIES += python3 +else +LILV_CONF_OPTS += --no-bindings +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +LILV_DEPENDENCIES += libsndfile +endif + +$(eval $(waf-package)) -- 2.25.1 From yann.morin.1998 at free.fr Thu Jan 27 19:26:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 20:26:33 +0100 Subject: [Buildroot] [git commit] package/jasper: simplify disabling documentation Message-ID: <20220127192022.7E49582946@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b630df6fb24ec7f79564bea5fd6d0154268a6ed3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace CMAKE_DISABLE_FIND_PACKAGE_{DOXYGEN,LATEX} by JAS_ENABLE_DOC which is available (and working as expected) since version 2.0.20 and https://github.com/jasper-software/jasper/commit/cddb7b199a1c78f3ec0b2c6b8af705588437af4b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/jasper/jasper.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 6ef1afcac7..59c5b3d66a 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -11,9 +11,7 @@ JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = \ - -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ - -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE +JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF From yann.morin.1998 at free.fr Thu Jan 27 19:27:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 20:27:02 +0100 Subject: [Buildroot] [git commit] package/jasper: bump to version 2.0.33 Message-ID: <20220127192022.8695B82A00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f791221c8616bfa6d338ce6c287353395cc2c61a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/jasper-software/jasper/blob/version-2.0.33/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/jasper/jasper.hash | 2 +- package/jasper/jasper.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index 67653a8e88..410bcfc683 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b4e5f682be0ab1a5acb0eeb6bf41d6ce17a658bb8e2dbda95de40100939cc88 jasper-2.0.28.tar.gz +sha256 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a jasper-2.0.33.tar.gz sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 59c5b3d66a..05168db763 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,8 +4,8 @@ # ################################################################################ -JASPER_VERSION = 2.0.28 -JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) +JASPER_VERSION = 2.0.33 +JASPER_SITE = https://github.com/jasper-software/jasper/releases/download/version-$(JASPER_VERSION) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Thu Jan 27 19:28:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 20:28:22 +0100 Subject: [Buildroot] [PATCH 1/2] package/jasper: use JAS_ENABLE_DOC In-Reply-To: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> References: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> Message-ID: <20220127192822.GO457876@scaer> Fabrice, All, On 2022-01-27 19:04 +0100, Fabrice Fontaine spake thusly: > Replace CMAKE_DISABLE_FIND_PACKAGE_{DOXYGEN,LATEX} by JAS_ENABLE_DOC > which is available (and working as expected) since version 2.0.20 and > https://github.com/jasper-software/jasper/commit/cddb7b199a1c78f3ec0b2c6b8af705588437af4b > > Signed-off-by: Fabrice Fontaine I've slightly reworded the commit title, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/jasper/jasper.mk | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk > index 6ef1afcac7..59c5b3d66a 100644 > --- a/package/jasper/jasper.mk > +++ b/package/jasper/jasper.mk > @@ -11,9 +11,7 @@ JASPER_LICENSE = JasPer-2.0 > JASPER_LICENSE_FILES = LICENSE > JASPER_CPE_ID_VENDOR = jasper_project > JASPER_SUPPORTS_IN_SOURCE_BUILD = NO > -JASPER_CONF_OPTS = \ > - -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ > - -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE > +JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF > > ifeq ($(BR2_STATIC_LIBS),y) > JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 27 19:28:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 20:28:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/jasper: bump to version 2.0.33 In-Reply-To: <20220127180456.2338773-2-fontaine.fabrice@gmail.com> References: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> <20220127180456.2338773-2-fontaine.fabrice@gmail.com> Message-ID: <20220127192837.GP457876@scaer> Fabrice, All, On 2022-01-27 19:04 +0100, Fabrice Fontaine spake thusly: > https://github.com/jasper-software/jasper/blob/version-2.0.33/NEWS > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/jasper/jasper.hash | 2 +- > package/jasper/jasper.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash > index 67653a8e88..410bcfc683 100644 > --- a/package/jasper/jasper.hash > +++ b/package/jasper/jasper.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 6b4e5f682be0ab1a5acb0eeb6bf41d6ce17a658bb8e2dbda95de40100939cc88 jasper-2.0.28.tar.gz > +sha256 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a jasper-2.0.33.tar.gz > sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE > diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk > index 59c5b3d66a..05168db763 100644 > --- a/package/jasper/jasper.mk > +++ b/package/jasper/jasper.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -JASPER_VERSION = 2.0.28 > -JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) > +JASPER_VERSION = 2.0.33 > +JASPER_SITE = https://github.com/jasper-software/jasper/releases/download/version-$(JASPER_VERSION) > JASPER_INSTALL_STAGING = YES > JASPER_LICENSE = JasPer-2.0 > JASPER_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From christian at paral.in Thu Jan 27 20:31:09 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 27 Jan 2022 12:31:09 -0800 Subject: [Buildroot] [PATCH v3 2/2] package/buildah: new package In-Reply-To: <20220127090141.7d0645f2@windsurf> References: <20220127062504.1835450-1-christian@paral.in> <20220127062504.1835450-2-christian@paral.in> <20220127090141.7d0645f2@windsurf> Message-ID: Hi Thomas, On Thu, Jan 27, 2022 at 12:01 AM Thomas Petazzoni wrote: > Considering that there are runtime dependency concerns, it would be > nice to have a simple test case in support/testing/. OK, something like "buildah pull" or so? > > +BUILDAH_DEPENDENCIES = libgpgme > > Is libgpgme really a runtime dependency, as noted in your changelog? If Gpg is a runtime dependency, libgpgme is a build dependency. > > +HOST_BUILDAH_BUILD_TARGETS = $(BUILDAH_BUILD_TARGETS) > > +HOST_BUILDAH_TAGS = $(BUILDAH_TAGS) > > +HOST_BUILDAH_LDFLAGS = $(BUILDAH_LDFLAGS) > > +HOST_BUILDAH_INSTALL_BINS = $(BUILDAH_INSTALL_BINS) > > That "repetition" also makes me think we should have some level of > inheritance between target and host variables in the golang-package > infrastructure. For BUILD_TARGETS, TAGS and INSTALL_BINS, it sounds > fine to do it. Yes - unless the package overrides them - this should be fine. I was a bit surprised that it, on default, tries to build the binary named "host-runc" as well as a Go package named "host-runc". Of course, this is not the name of neither the binary nor the package. So the host-golang infra should remove the host- prefix for the default BUILD_TARGETS and INSTALL_BINS. This would also be fixed if those values were inherited from the target package. > However, for LDFLAGS, it's a bit weird, as normally, > LDFLAGS are different between host and target. However here, there are > mostly used to pass these version-related -X options, that are in fact > the same between host and target. Should we have a separate variable to > pass those flags ? Not sure. They are quite common for Go packages - could call them DEFINES or something similar. The syntax overrides the value of a global variable in a package. Best regards, Christian From yann.morin.1998 at free.fr Thu Jan 27 21:09:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 22:09:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson In-Reply-To: <20220127183924.1938903-1-james.hilliard1@gmail.com> References: <20220127183924.1938903-1-james.hilliard1@gmail.com> Message-ID: <20220127210924.GQ457876@scaer> James, All, On 2022-01-27 11:39 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard > --- > package/network-manager/Config.in | 1 + > package/network-manager/network-manager.mk | 100 ++++++++++----------- > 2 files changed, 48 insertions(+), 53 deletions(-) > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > index a48cb37b15..da1a7d79b3 100644 > --- a/package/network-manager/Config.in > +++ b/package/network-manager/Config.in > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI > config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER > bool "modem-manager support" > select BR2_PACKAGE_MODEM_MANAGER > + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO It looks like this is totally unrelated to the switch to meson, and should be applied in its own right, and then backported to the maintenance branches, no? If it is due to the switch to meson, then it should be explained in the commit log. Regards, Yann E. MORIN. > help > This option enables support for ModemManager > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > index 974320fce0..290333e16c 100644 > --- a/package/network-manager/network-manager.mk > +++ b/package/network-manager/network-manager.mk > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > NETWORK_MANAGER_INSTALL_STAGING = YES > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ > libgcrypt wireless_tools util-linux host-intltool libndp > NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) > NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome > NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager > NETWORK_MANAGER_SELINUX_MODULES = networkmanager > > -NETWORK_MANAGER_CONF_ENV = \ > - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ > - ac_cv_file__etc_fedora_release=no \ > - ac_cv_file__etc_mandriva_release=no \ > - ac_cv_file__etc_debian_version=no \ > - ac_cv_file__etc_redhat_release=no \ > - ac_cv_file__etc_SuSE_release=no > - > NETWORK_MANAGER_CONF_OPTS = \ > - --disable-introspection \ > - --disable-tests \ > - --disable-qt \ > - --disable-more-warnings \ > - --with-crypto=gnutls \ > - --with-iptables=/usr/sbin/iptables \ > - --disable-ifupdown \ > - --without-nm-cloud-setup > + -Dintrospection=false \ > + -Ddocs=false \ > + -Dtests=no \ > + -Dqt=false \ > + -Dcrypto=gnutls \ > + -Diptables=/usr/sbin/iptables \ > + -Difupdown=false \ > + -Dnm_cloud_setup=false \ > + -Dsession_tracking_consolekit=false > > ifeq ($(BR2_PACKAGE_AUDIT),y) > NETWORK_MANAGER_DEPENDENCIES += audit > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes > else > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no > endif > > ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient > endif > > ifeq ($(BR2_PACKAGE_DHCPCD),y) > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd > endif > > ifeq ($(BR2_PACKAGE_IWD),y) > NETWORK_MANAGER_DEPENDENCIES += iwd > -NETWORK_MANAGER_CONF_OPTS += --with-iwd > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false > endif > > ifeq ($(BR2_PACKAGE_LIBCURL),y) > NETWORK_MANAGER_DEPENDENCIES += libcurl > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true > else > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false > endif > > ifeq ($(BR2_PACKAGE_LIBPSL),y) > NETWORK_MANAGER_DEPENDENCIES += libpsl > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false > endif > > ifeq ($(BR2_PACKAGE_LIBSELINUX),y) > NETWORK_MANAGER_DEPENDENCIES += libselinux > -NETWORK_MANAGER_CONF_OPTS += --with-selinux > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-selinux > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false > endif > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) > -NETWORK_MANAGER_DEPENDENCIES += modem-manager > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false > endif > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true > NETWORK_MANAGER_DEPENDENCIES += jansson > else > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false > endif > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) > NETWORK_MANAGER_DEPENDENCIES += pppd > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true > else > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false > endif > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) > NETWORK_MANAGER_DEPENDENCIES += newt > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false > endif > > ifeq ($(BR2_PACKAGE_OFONO),y) > NETWORK_MANAGER_DEPENDENCIES += ofono > -NETWORK_MANAGER_CONF_OPTS += --with-ofono > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-ofono > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false > endif > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > NETWORK_MANAGER_DEPENDENCIES += systemd > NETWORK_MANAGER_CONF_OPTS += \ > - --with-systemd-journal \ > - --with-config-logging-backend-default=journal \ > - --with-session-tracking=systemd \ > - --with-suspend-resume=systemd > + -Dsystemd_journal=true \ > + -Dconfig_logging_backend_default=journal \ > + -Dsession_tracking=systemd \ > + -Dsuspend_resume=systemd > else > NETWORK_MANAGER_CONF_OPTS += \ > - --without-systemd-journal \ > - --with-config-logging-backend-default=syslog \ > - --without-session-tracking \ > - --with-suspend-resume=upower > + -Dsystemd_journal=false \ > + -Dconfig_logging_backend_default=syslog \ > + -Dsession_tracking=no \ > + -Dsuspend_resume=upower \ > + -Dsystemdsystemunitdir=no > endif > > ifeq ($(BR2_PACKAGE_POLKIT),y) > NETWORK_MANAGER_DEPENDENCIES += polkit > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true > else > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false > endif > > ifeq ($(BR2_PACKAGE_READLINE),y) > NETWORK_MANAGER_DEPENDENCIES += readline > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false > endif > > define NETWORK_MANAGER_INSTALL_INIT_SYSV > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD > > endef > > -$(eval $(autotools-package)) > +$(eval $(meson-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Thu Jan 27 21:15:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 14:15:07 -0700 Subject: [Buildroot] [PATCH v6 1/1] package/qt5: bump packages to latest kde submodule versions Message-ID: <20220127211507.2767083-1-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches which don't have proper version tags. Create a .git file so to trigger headers sync during configure. Hold back updating qt5webengine for now since the latest version requires significant changes to build, just tweak existing version to be compatible with latest kde versions for now. Signed-off-by: James Hilliard --- Changes v5 -> v6: - drop upstream patches - rebase on master Changes v4 -> v5: - leave qt5webengine on current version - add minimal tweaks to qt5webengine to build with updated kde deps Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 +- ...Fix-build-with-GCC-11-include-limits.patch | 53 ------ ...avoiding-huge-number-of-tiny-dashes.patch} | 0 .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------- .../0008-Add-missing-limits-include.patch | 32 ---- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 ----- ...-intensive-painting-of-high-number-o.patch | 163 ------------------ ...-avoiding-huge-number-of-tiny-dashes.patch | 100 ----------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 +- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 +- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 +- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 ----- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 +- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 +- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +- package/qt5/qt5location-mapboxgl/Config.in | 4 + .../qt5location-mapboxgl.hash | 16 ++ .../qt5location-mapboxgl.mk | 14 ++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 +- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 +- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 +- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 +- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 +- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 +- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 +- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 +- ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 ++++++++ package/qt5/qt5webengine/qt5webengine.mk | 9 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 +- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 +- 79 files changed, 306 insertions(+), 653 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch rename package/qt5/qt5base/{0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch => 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch} (100%) delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch delete mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..3e498f6a28 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..656e3067dc 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,9 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 +QT5_VERSION = $(QT5_VERSION_MAJOR).8 QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch similarity index 100% rename from package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch rename to package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch deleted file mode 100644 index 03287d19ca..0000000000 --- a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Tue, 13 Apr 2021 14:23:45 +0200 -Subject: [PATCH] Avoid processing-intensive painting of high number of tiny - dashes - -When stroking a dashed path, an unnecessary amount of processing would -be spent if there is a huge number of dashes visible, e.g. because of -scaling. Since the dashes are too small to be indivdually visible -anyway, just replace with a semi-transparent solid line for such -cases. - -Pick-to: 6.1 6.0 5.15 -Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) - -* asturmlechner 2021-08-21: -Conflict from preceding 94dd2ceb in dev branch: - src/gui/painting/qpaintengineex.cpp - Resolved via: - - if (pen.style() > Qt::SolidLine) { - QRectF cpRect = path.controlPointRect(); - const QTransform &xf = state()->matrix; -- if (pen.isCosmetic()) { -+ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ - clipRect = d->exDeviceRect; - cpRect.translate(xf.dx(), xf.dy()); - } else { - -FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: - Resolved via: - - QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; - qreal extent = qMax(extentRect.width(), extentRect.height()); - qreal patternLength = 0; -- const QList pattern = pen.dashPattern(); -+ const QVector pattern = pen.dashPattern(); - const int patternSize = qMin(pattern.size(), 32); - for (int i = 0; i < patternSize; i++) - patternLength += qMax(pattern.at(i), qreal(0)); - -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- - .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ - 2 files changed, 69 insertions(+), 9 deletions(-) - create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 5d8f89eadd..55fdb0c2a0 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const - - Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp - --void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) -+void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - { - #ifdef QT_DEBUG_DRAW - qDebug() << "QPaintEngineEx::stroke()" << pen; -@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) - d->stroker.setCubicToHook(qpaintengineex_cubicTo); - } - -+ QRectF clipRect; -+ QPen pen = inPen; -+ if (pen.style() > Qt::SolidLine) { -+ QRectF cpRect = path.controlPointRect(); -+ const QTransform &xf = state()->matrix; -+ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ -+ clipRect = d->exDeviceRect; -+ cpRect.translate(xf.dx(), xf.dy()); -+ } else { -+ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); -+ } -+ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway -+ QRectF extentRect = cpRect & clipRect; -+ qreal extent = qMax(extentRect.width(), extentRect.height()); -+ qreal patternLength = 0; -+ const QVector pattern = pen.dashPattern(); -+ const int patternSize = qMin(pattern.size(), 32); -+ for (int i = 0; i < patternSize; i++) -+ patternLength += qMax(pattern.at(i), qreal(0)); -+ if (pen.widthF()) -+ patternLength *= pen.widthF(); -+ if (qFuzzyIsNull(patternLength)) { -+ pen.setStyle(Qt::NoPen); -+ } else if (extent / patternLength > 10000) { -+ // approximate stream of tiny dashes with semi-transparent solid line -+ pen.setStyle(Qt::SolidLine); -+ QColor color(pen.color()); -+ color.setAlpha(color.alpha() / 2); -+ pen.setColor(color); -+ } -+ } -+ - if (!qpen_fast_equals(pen, d->strokerPen)) { - d->strokerPen = pen; - d->stroker.setJoinStyle(pen.joinStyle()); -@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) - return; - } - -- if (pen.style() > Qt::SolidLine) { -- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ -- d->activeStroker->setClipRect(d->exDeviceRect); -- } else { -- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); -- d->activeStroker->setClipRect(clipRect); -- } -- } -+ if (!clipRect.isNull()) -+ d->activeStroker->setClipRect(clipRect); - - if (d->activeStroker == &d->stroker) - d->stroker.setForceOpen(path.hasExplicitOpen()); -diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps -new file mode 100644 -index 0000000000..d41ced7f5f ---- /dev/null -+++ b/tests/auto/other/lancelot/scripts/tinydashes.qps -@@ -0,0 +1,34 @@ -+# Version: 1 -+# CheckVsReference: 5% -+ -+path_addEllipse mypath 20.0 20.0 200.0 200.0 -+ -+save -+setPen blue 20 SolidLine FlatCap -+pen_setCosmetic true -+pen_setDashPattern [ 0.0004 0.0004 ] -+setBrush yellow -+ -+drawPath mypath -+translate 300 0 -+setRenderHint Antialiasing true -+drawPath mypath -+restore -+ -+path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 -+ -+setPen blue 20 DotLine FlatCap -+setBrush yellow -+ -+save -+translate 0 300 -+scale 0.0001 0.00011 -+drawPath bigpath -+restore -+ -+save -+translate 300 300 -+setRenderHint Antialiasing true -+scale 0.0001 0.00011 -+drawPath bigpath -+restore --- -2.34.1 - diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index ca3c2736ae..0000000000 --- a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 30 Jul 2021 13:03:49 +0200 -Subject: [PATCH] Refix for avoiding huge number of tiny dashes - -Previous fix hit too widely so some valid horizontal and vertical -lines were affected; the root problem being that such lines have an -empty control point rect (width or height is 0). Fix by caculating in -the pen width. - -Pick-to: 6.2 6.1 5.15 -Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 8 ++--- - .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ - 2 files changed, 35 insertions(+), 4 deletions(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 19e4b23423..9fe510827a 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); - } - // Check to avoid generating unwieldy amount of dashes that will not be visible anyway -- QRectF extentRect = cpRect & clipRect; -+ qreal pw = pen.widthF() ? pen.widthF() : 1; -+ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; - qreal extent = qMax(extentRect.width(), extentRect.height()); - qreal patternLength = 0; - const QVector pattern = pen.dashPattern(); - const int patternSize = qMin(pattern.size(), 32); - for (int i = 0; i < patternSize; i++) - patternLength += qMax(pattern.at(i), qreal(0)); -- if (pen.widthF()) -- patternLength *= pen.widthF(); -+ patternLength *= pw; - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { -+ } else if (extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); -diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -index 42e98ce363..d7c3f95f1d 100644 ---- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -@@ -308,6 +308,7 @@ private slots: - void fillPolygon(); - - void drawImageAtPointF(); -+ void scaledDashes(); - - private: - void fillData(); -@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() - paint.end(); - } - -+void tst_QPainter::scaledDashes() -+{ -+ // Test that we do not hit the limit-huge-number-of-dashes path -+ QRgb fore = qRgb(0, 0, 0xff); -+ QRgb back = qRgb(0xff, 0xff, 0); -+ QImage image(5, 32, QImage::Format_RGB32); -+ image.fill(back); -+ QPainter p(&image); -+ QPen pen(QColor(fore), 3, Qt::DotLine); -+ p.setPen(pen); -+ p.scale(1, 2); -+ p.drawLine(2, 0, 2, 16); -+ p.end(); -+ -+ bool foreFound = false; -+ bool backFound = false; -+ int i = 0; -+ while (i < 32 && (!foreFound || !backFound)) { -+ QRgb pix = image.pixel(3, i); -+ if (pix == fore) -+ foreFound = true; -+ else if (pix == back) -+ backFound = true; -+ i++; -+ } -+ -+ QVERIFY(foreFound); -+ QVERIFY(backFound); -+} -+ - QTEST_MAIN(tst_QPainter) - - #include "tst_qpainter.moc" --- -2.34.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..a4ffd6b9a2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 13d3f871973033b24cd0b4a563812277153835897c61152aaebb6e468b3f8233 qtbase-7ec73b4e75eb4359f49e5dd2be291d459a685ace.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4ef3759566..b5501f8a9c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 7ec73b4e75eb4359f49e5dd2be291d459a685ace +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..fd616b74a6 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 9237818f2202d9473b035750b2aa598b9c31ea19abf8ae898957d33da03d0553 qtquickcontrols2-0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4be6cd9117 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = 0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..1e4dc54c67 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..849a2b7f1b 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 728012f7762ecd5762d493f8796907c6456f31e7 +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..cebd6d0fe2 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,8 +4,9 @@ # ################################################################################ -QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) +QT5WEBENGINE_VERSION_MAJOR = 5.15 +QT5WEBENGINE_VERSION = $(QT5WEBENGINE_VERSION_MAJOR).2 +QT5WEBENGINE_SITE = https://download.qt.io/archive/qt/$(QT5WEBENGINE_VERSION_MAJOR)/$(QT5WEBENGINE_VERSION)/submodules QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ @@ -44,7 +45,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From yann.morin.1998 at free.fr Thu Jan 27 21:15:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 22:15:08 +0100 Subject: [Buildroot] [git commit] package/binutils: remove libiberty from target install Message-ID: <20220127210927.1332682753@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4edfb8fef84d64a62d14d485e7cead3ab9e0b8b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In BINUTILS_INSTALL_TARGET_CMDS (target!), libiberty is installed to STAGING_DIR. This is not necessary since libiberty is already unconditionally installed to staging in BINUTILS_INSTALL_STAGING_CMDS. Furthermore the presence of STAGING_DIR path in TARGET_CMDS is confusing and incorrect. Moreover libiberty is static only. Static libraries are only used at build time, not at run time so we do not need to install libiberty in target. This commit removes the incorrect libiberty install in TARGET_CMDS and adds a comment to clarify why we do not see libiberty installed on target. Signed-off-by: Jonathan Borne [yann.morin.1998 at free.fr: - reword comment, move it toward the _INSTALL_TARGET_CMDS - rewrap and slightly reword commit log ] Signed-off-by: Yann E. MORIN --- package/binutils/binutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 13f61be035..8c4a1371ca 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -103,10 +103,10 @@ endef # If we don't want full binutils on target ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) +# libiberty is static-only, so it is only installed to staging, above. define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif From yann.morin.1998 at free.fr Thu Jan 27 21:18:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 22:18:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/binutils: remove libiberty from target install In-Reply-To: <20220127135339.25430-2-jborne@kalray.eu> References: <20220127135339.25430-1-jborne@kalray.eu> <20220127135339.25430-2-jborne@kalray.eu> Message-ID: <20220127211819.GR457876@scaer> Jonathan, All, Thanks for this new iteration. :-) On 2022-01-27 14:53 +0100, Jonathan Borne via buildroot spake thusly: > In BINUTILS_INSTALL_TARGET_CMDS, libiberty is installed > to STAGING_DIR > > This is not necessary since libiberty is already > unconditionally installed to staging in > BINUTILS_INSTALL_STAGING_CMDS. Furthermore the presence > of STAGING_DIR path in TARGET_CMDS is confusing. > > Moreover libiberty is static only. Static libraries > are only used at build time, not at run time so > we do not want to install libiberty on target. > > This commit removes the unnecessary libiberty > install in TARGET_CMDS and add a comment to clarify > why we do not see libiberty installed on target. I've slightly reworded the commit log, and rewrapped it closer to the usual 72-char width. > Signed-off-by: Jonathan Borne > --- > package/binutils/binutils.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk > index 13f61be035..32ca70d325 100644 > --- a/package/binutils/binutils.mk > +++ b/package/binutils/binutils.mk > @@ -95,6 +95,8 @@ BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) > > # We just want libbfd, libiberty and libopcodes, > # not the full-blown binutils in staging > +# Static-only libraries such as libiberty are used at buildtime in staging > +# but are not installed to target. I believe the comment in fact makes more sense closer to the _ISNTALL_TARGET_CMDS, so I moved it there, and reworded it appropriately. Applied to master, thanks. Regards, Yann E. MORIN. > define BINUTILS_INSTALL_STAGING_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install > @@ -106,7 +108,6 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > define BINUTILS_INSTALL_TARGET_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > endef > endif > > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Thu Jan 27 21:18:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 14:18:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson In-Reply-To: <20220127210924.GQ457876@scaer> References: <20220127183924.1938903-1-james.hilliard1@gmail.com> <20220127210924.GQ457876@scaer> Message-ID: On Thu, Jan 27, 2022 at 2:09 PM Yann E. MORIN wrote: > > James, All, > > On 2022-01-27 11:39 -0700, James Hilliard spake thusly: > > Signed-off-by: James Hilliard > > --- > > package/network-manager/Config.in | 1 + > > package/network-manager/network-manager.mk | 100 ++++++++++----------- > > 2 files changed, 48 insertions(+), 53 deletions(-) > > > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > > index a48cb37b15..da1a7d79b3 100644 > > --- a/package/network-manager/Config.in > > +++ b/package/network-manager/Config.in > > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI > > config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER > > bool "modem-manager support" > > select BR2_PACKAGE_MODEM_MANAGER > > + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO > > It looks like this is totally unrelated to the switch to meson, and > should be applied in its own right, and then backported to the > maintenance branches, no? > > If it is due to the switch to meson, then it should be explained in the > commit log. Well meson is enforcing that dependency is present while autotools was not. I'm not really sure if it's actually a hard requirement for the modem manager integration to work correctly. > > Regards, > Yann E. MORIN. > > > help > > This option enables support for ModemManager > > > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > index 974320fce0..290333e16c 100644 > > --- a/package/network-manager/network-manager.mk > > +++ b/package/network-manager/network-manager.mk > > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 > > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > > NETWORK_MANAGER_INSTALL_STAGING = YES > > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ > > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ > > libgcrypt wireless_tools util-linux host-intltool libndp > > NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) > > NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md > > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome > > NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager > > NETWORK_MANAGER_SELINUX_MODULES = networkmanager > > > > -NETWORK_MANAGER_CONF_ENV = \ > > - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ > > - ac_cv_file__etc_fedora_release=no \ > > - ac_cv_file__etc_mandriva_release=no \ > > - ac_cv_file__etc_debian_version=no \ > > - ac_cv_file__etc_redhat_release=no \ > > - ac_cv_file__etc_SuSE_release=no > > - > > NETWORK_MANAGER_CONF_OPTS = \ > > - --disable-introspection \ > > - --disable-tests \ > > - --disable-qt \ > > - --disable-more-warnings \ > > - --with-crypto=gnutls \ > > - --with-iptables=/usr/sbin/iptables \ > > - --disable-ifupdown \ > > - --without-nm-cloud-setup > > + -Dintrospection=false \ > > + -Ddocs=false \ > > + -Dtests=no \ > > + -Dqt=false \ > > + -Dcrypto=gnutls \ > > + -Diptables=/usr/sbin/iptables \ > > + -Difupdown=false \ > > + -Dnm_cloud_setup=false \ > > + -Dsession_tracking_consolekit=false > > > > ifeq ($(BR2_PACKAGE_AUDIT),y) > > NETWORK_MANAGER_DEPENDENCIES += audit > > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no > > endif > > > > ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) > > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient > > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient > > endif > > > > ifeq ($(BR2_PACKAGE_DHCPCD),y) > > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd > > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd > > endif > > > > ifeq ($(BR2_PACKAGE_IWD),y) > > NETWORK_MANAGER_DEPENDENCIES += iwd > > -NETWORK_MANAGER_CONF_OPTS += --with-iwd > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBCURL),y) > > NETWORK_MANAGER_DEPENDENCIES += libcurl > > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBPSL),y) > > NETWORK_MANAGER_DEPENDENCIES += libpsl > > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBSELINUX),y) > > NETWORK_MANAGER_DEPENDENCIES += libselinux > > -NETWORK_MANAGER_CONF_OPTS += --with-selinux > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-selinux > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) > > -NETWORK_MANAGER_DEPENDENCIES += modem-manager > > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 > > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) > > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true > > NETWORK_MANAGER_DEPENDENCIES += jansson > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) > > NETWORK_MANAGER_DEPENDENCIES += pppd > > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) > > NETWORK_MANAGER_DEPENDENCIES += newt > > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false > > endif > > > > ifeq ($(BR2_PACKAGE_OFONO),y) > > NETWORK_MANAGER_DEPENDENCIES += ofono > > -NETWORK_MANAGER_CONF_OPTS += --with-ofono > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-ofono > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false > > endif > > > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > > NETWORK_MANAGER_DEPENDENCIES += systemd > > NETWORK_MANAGER_CONF_OPTS += \ > > - --with-systemd-journal \ > > - --with-config-logging-backend-default=journal \ > > - --with-session-tracking=systemd \ > > - --with-suspend-resume=systemd > > + -Dsystemd_journal=true \ > > + -Dconfig_logging_backend_default=journal \ > > + -Dsession_tracking=systemd \ > > + -Dsuspend_resume=systemd > > else > > NETWORK_MANAGER_CONF_OPTS += \ > > - --without-systemd-journal \ > > - --with-config-logging-backend-default=syslog \ > > - --without-session-tracking \ > > - --with-suspend-resume=upower > > + -Dsystemd_journal=false \ > > + -Dconfig_logging_backend_default=syslog \ > > + -Dsession_tracking=no \ > > + -Dsuspend_resume=upower \ > > + -Dsystemdsystemunitdir=no > > endif > > > > ifeq ($(BR2_PACKAGE_POLKIT),y) > > NETWORK_MANAGER_DEPENDENCIES += polkit > > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false > > endif > > > > ifeq ($(BR2_PACKAGE_READLINE),y) > > NETWORK_MANAGER_DEPENDENCIES += readline > > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false > > endif > > > > define NETWORK_MANAGER_INSTALL_INIT_SYSV > > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD > > > > endef > > > > -$(eval $(autotools-package)) > > +$(eval $(meson-package)) > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Thu Jan 27 23:22:09 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 27 Jan 2022 23:22:09 +0000 Subject: [Buildroot] [Bug 14556] New: python-crossbar fails to build Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14556 Bug ID: 14556 Summary: python-crossbar fails to build Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: emile.cormier.jr at gmail.com CC: buildroot at uclibc.org Target Milestone: --- The buildroot crossbar package does not work in the latest release/head of buildroot. After two days of playing dependency whac-a-mole, I've been able to make it work again with the following steps: 1. Remove the package-crossbar/0002-Remove-idna-requirement.patch and replace it with another patch which does the following: - Change the idna requirement to >=2.5,<4 to match that of the Requests v2.27.1 package included with the latest buildroot. The idna v3.3 package is the one currently bundled with buildroot. - Change the urllib3 requirement to >=1.21.1,<1.27 to match that of the Requests v2.27.1 package included with the latest buildroot. The urllib3 v1.26.8 package is the one currently bundled with buildroot. - Remove the importlib-resources>=4.1.1 requirement. The importlib-resources 5.0 features have been merged into the CPython 3.10 included with the latest buildroot. 2. Generate a new python-zlmdb package via utility/scanpypi. scanpypi fails before terminating, but it generates a viable python-zlmdb package nonetheless. 3. Add a patch for the new python-zlmdb package which removes pytest-runner from the setup-requirements in setup.py. 4. Bump buildroot's python-pyopenssl version to 21.0.0. 5. Bump buildroot's python-snappy version to 0.6.0. 6. Bump buildroot's python-trek version to 21.5.0. 7. Add these missing dependencies in python-crossbar/Config.in: bcrypt, cffi, colorama, wsaccel, zlmdb, argon_cffi, cbor2, flatbuffers, msgpack, snappy, ujson I will submit a patch with the above changes, but I first need some time to familiarize myself with your submission conventions. (Cross-posted to https://github.com/crossbario/crossbar/issues/1936) -- You are receiving this mail because: You are on the CC list for the bug. From petr.vorel at gmail.com Fri Jan 28 01:46:02 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Fri, 28 Jan 2022 02:46:02 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 In-Reply-To: <87lez191e6.fsf@tarshish> References: <20220126235652.25712-1-petr.vorel@gmail.com> <87lez191e6.fsf@tarshish> Message-ID: Hi, FYI tested: bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed andes-nds32 [ 1/45]: OK arm-aarch64 [ 2/45]: OK bootlin-aarch64-glibc [ 3/45]: OK bootlin-arcle-hs38-uclibc [ 4/45]: OK bootlin-armv5-uclibc [ 5/45]: OK bootlin-armv7-glibc [ 6/45]: OK bootlin-armv7m-uclibc [ 7/45]: SKIPPED bootlin-armv7-musl [ 8/45]: OK bootlin-microblazeel-uclibc [ 9/45]: OK bootlin-mipsel-uclibc [10/45]: OK bootlin-mipsel32r6-glibc [11/45]: OK bootlin-m68k-5208-uclibc [12/45]: SKIPPED bootlin-m68k-68040-uclibc [13/45]: OK bootlin-nios2-glibc [14/45]: SKIPPED bootlin-openrisc-uclibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: OK bootlin-powerpc64le-power8-glibc [17/45]: OK bootlin-riscv32-glibc [18/45]: OK bootlin-riscv64-glibc [19/45]: OK bootlin-riscv64-musl [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc-uclibc [22/45]: SKIPPED bootlin-sparc64-glibc [23/45]: OK bootlin-xtensa-uclibc [24/45]: OK bootlin-x86-64-glibc [25/45]: OK bootlin-x86-64-musl [26/45]: OK bootlin-x86-64-uclibc [27/45]: OK br-arm-basic [28/45]: OK br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: OK br-i386-pentium-mmx-musl [31/45]: OK br-i386-pentium4-full [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips [43/45]: OK sourcery-mips64 [44/45]: OK sourcery-nios2 [45/45]: SKIPPED 45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Kind regards, Petr From cheart0 at gmail.com Fri Jan 28 03:59:23 2022 From: cheart0 at gmail.com (Chris) Date: Fri, 28 Jan 2022 12:59:23 +0900 Subject: [Buildroot] swupdate suricatta build error Message-ID: Hi, there Did anybody ever see the same issue? When build 2021.11 for raspberry pi, we added swupdate package and enabled suricatta mode by "make swupdate-menuconfig", then we got error as below, suricatta/common.c:79:26: error: storage size of ?json_res? isn?t known 79 | enum json_tokener_error json_res; | ^~~~~~~~ suricatta/common.c:82:15: warning: implicit declaration of function ?json_tokener_parse_ex? [-Wimplicit-function-declaration] 82 | json_root = json_tokener_parse_ex( | ^~~~~~~~~~~~~~~~~~~~~ suricatta/common.c:82:13: warning: assignment to ?struct json_object *? from ?int? makes pointer from integer without a cast [-Wint-conversion] 82 | json_root = json_tokener_parse_ex( | ^ suricatta/common.c:84:23: warning: implicit declaration of function ?json_tokener_get_error? [-Wimplicit-function-declaration] 84 | } while ((json_res = json_tokener_get_error(json_tokenizer)) == | ^~~~~~~~~~~~~~~~~~~~~~ suricatta/common.c:85:4: error: ?json_tokener_continue? undeclared (first use in this function) 85 | json_tokener_continue); | ^~~~~~~~~~~~~~~~~~~~~ suricatta/common.c:85:4: note: each undeclared identifier is reported only once for each function it appears in suricatta/common.c:86:18: error: ?json_tokener_success? undeclared (first use in this function); did you mean ?json_tokener_error?? 86 | if (json_res != json_tokener_success) { | ^~~~~~~~~~~~~~~~~~~~ | json_tokener_error suricatta/suricatta.c:17:10: fatal error: json-c/json.h: No such file or directory 17 | #include - host machine (OS/release) --Linux MINT20 - version of Buildroot--2021.11 - target for which the build fails--raspberry pi b - package(s) for which the build fails--swupdate - the command that fails and its output--as posted above - any information you think that may be relevant Thanks Chris -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Fri Jan 28 04:51:40 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 07:51:40 +0300 Subject: [Buildroot] [PATCH 1/1] package/protozero: bump version to 1.7.1 Message-ID: <20220128045140.272465-1-fido_max@inbox.ru> Drop upstream patch. Release-notes: https://github.com/mapbox/protozero/releases/tag/v1.7.1 Signed-off-by: Maxim Kochetkov --- ...CMakeLists.txt-respect-BUILD_TESTING.patch | 47 ------------------- package/protozero/protozero.hash | 2 +- package/protozero/protozero.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch diff --git a/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch b/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch deleted file mode 100644 index d0267e3283..0000000000 --- a/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 03daae49c8fa94513b508bd12f1597e8e5e086f2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 17 Apr 2021 13:06:44 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_TESTING - -Don't build tests if the standard cmake BUILD_TESTING variable is set to -OFF. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mapbox/protozero/pull/105] ---- - CMakeLists.txt | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9702d6..7a40212 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,6 +23,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - - #----------------------------------------------------------------------------- - -+option(BUILD_TESTING "Build tests" ON) - option(WERROR "Add -Werror flag to build (turns warnings into errors)" ON) - - if(MSVC) -@@ -134,13 +135,13 @@ install(DIRECTORY include/protozero DESTINATION include) - - #----------------------------------------------------------------------------- - --enable_testing() -- - add_subdirectory(doc) - - add_subdirectory(tools) - --add_subdirectory(test) -- -+if(BUILD_TESTING) -+ enable_testing() -+ add_subdirectory(test) -+endif() - - #----------------------------------------------------------------------------- --- -2.30.2 - diff --git a/package/protozero/protozero.hash b/package/protozero/protozero.hash index 5453e01ecf..f0b8e39009 100644 --- a/package/protozero/protozero.hash +++ b/package/protozero/protozero.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 beffbdfab060854fd770178a8db9c028b5b6ee4a059a2fed82c46390a85f3f31 protozero-1.7.0.tar.gz +sha256 27e0017d5b3ba06d646a3ec6391d5ccc8500db821be480aefd2e4ddc3de5ff99 protozero-1.7.1.tar.gz sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE.md sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.from_folly diff --git a/package/protozero/protozero.mk b/package/protozero/protozero.mk index 80d16192e3..a46e37d69b 100644 --- a/package/protozero/protozero.mk +++ b/package/protozero/protozero.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOZERO_VERSION = 1.7.0 +PROTOZERO_VERSION = 1.7.1 PROTOZERO_SITE = $(call github,mapbox,protozero,v$(PROTOZERO_VERSION)) PROTOZERO_LICENSE = BSD-2-Clause, Apache-2.0 PROTOZERO_LICENSE_FILES = LICENSE.md LICENSE.from_folly -- 2.33.1 From fido_max at inbox.ru Fri Jan 28 05:00:13 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 08:00:13 +0300 Subject: [Buildroot] [PATCH 1/1] package/libgeos: bump version to 3.10.2 Message-ID: <20220128050013.277864-1-fido_max@inbox.ru> Changelog: https://github.com/libgeos/geos/blob/3.10.2/NEWS Signed-off-by: Maxim Kochetkov --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index d2c27955ac..f93badbaa3 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a8148eec9636814c8ab0f8f5266ce6f9b914ed65b0d083fc43bb0bbb01f83648 geos-3.10.1.tar.bz2 +sha256 50bbc599ac386b4c2b3962dcc411f0040a61f204aaef4eba7225ecdd0cf45715 geos-3.10.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 745eb32256..197def1212 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.10.1 +LIBGEOS_VERSION = 3.10.2 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 -- 2.33.1 From fido_max at inbox.ru Fri Jan 28 05:13:32 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 08:13:32 +0300 Subject: [Buildroot] [PATCH 1/1] package/libosmium: bump version to 2.17.3 Message-ID: <20220128051332.459202-1-fido_max@inbox.ru> Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.17.3 Signed-off-by: Maxim Kochetkov --- package/libosmium/libosmium.hash | 2 +- package/libosmium/libosmium.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libosmium/libosmium.hash b/package/libosmium/libosmium.hash index 564b7c07d7..ccfd3b09b0 100644 --- a/package/libosmium/libosmium.hash +++ b/package/libosmium/libosmium.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f30e37c28f37ca3857b8107a12e6d138a0719831eca52a836692909801c8b0bd libosmium-2.17.2.tar.gz +sha256 ff85d55ca83d77fc41f6b7ae77f3d8d4337d299cbb4cc60c00e1f9d90d94e71b libosmium-2.17.3.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk index 82dd274bba..6510af4e77 100644 --- a/package/libosmium/libosmium.mk +++ b/package/libosmium/libosmium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSMIUM_VERSION = 2.17.2 +LIBOSMIUM_VERSION = 2.17.3 LIBOSMIUM_SITE = $(call github,osmcode,libosmium,v$(LIBOSMIUM_VERSION)) LIBOSMIUM_LICENSE = BSL-1.0 LIBOSMIUM_LICENSE_FILES = LICENSE -- 2.33.1 From fido_max at inbox.ru Fri Jan 28 05:59:10 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 08:59:10 +0300 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: bump version 1.5.2 Message-ID: <20220128055910.798614-1-fido_max@inbox.ru> Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.5.2 Signed-off-by: Maxim Kochetkov --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index c488949b62..88299745fb 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e osm2pgsql-1.5.1.tar.gz +sha256 4af0b925180ead2710eb68af28f70c91a81fb21dde5f80659d78e9fd14cf52cc osm2pgsql-1.5.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 74193c62cf..43440e0db8 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.5.1 +OSM2PGSQL_VERSION = 1.5.2 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING -- 2.33.1 From fido_max at inbox.ru Fri Jan 28 06:07:28 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 09:07:28 +0300 Subject: [Buildroot] [PATCH 1/1 next] package/osm2pgsql: bump version 1.6.0 Message-ID: <20220128060728.800722-1-fido_max@inbox.ru> Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.6.0 Signed-off-by: Maxim Kochetkov --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 88299745fb..898fcd5500 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4af0b925180ead2710eb68af28f70c91a81fb21dde5f80659d78e9fd14cf52cc osm2pgsql-1.5.2.tar.gz +sha256 0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5 osm2pgsql-1.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 43440e0db8..b00976d28b 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.5.2 +OSM2PGSQL_VERSION = 1.6.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 28 07:08:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 28 Jan 2022 07:08:20 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-27 Message-ID: <20220128070824.9FB3F410CB@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-27 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 51 | 14 | 0 | 65 | 2021.11.x | 21 | 7 | 0 | 28 | master | 85 | 44 | 0 | 129 | Classification of failures by reason for master ----------------------------------------------- htpdate-1.3.3 | 5 rygel-0.40.2 | 5 unknown | 5 frr-8.1 | 4 guile-3.0.7 | 2 host-delve-1.8.0 | 2 log4cxx-0.12.0 | 2 rtorrent-0.9.8 | 2 bird-2.0.8 | 1 bluez5_utils-5.63 | 1 cryptsetup-2.4.2 | 1 dnsmasq-2.86 | 1 glslsandbox-player-2021.08.24 | 1 hiawatha-11.1 | 1 jasper-2.0.28 | 1 mongodb-4.2.18 | 1 mongrel2-1.13.0 | 1 mp4v2-5.0.1 | 1 nodejs-14.18.3 | 1 pistache-f2f5a50fbfb5b8ef6c... | 1 pulseview-0.4.2 | 1 vdr-2.6.0 | 1 vlc-3.0.16 | 1 wavemon-0.9.4 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/5a1a94efe3eab09050ab56caec88b411cae451ed | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1e52863f27ef19b2555d5bf360812e1cb4a48725 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/dc74e318564f642bd8fddcca2721a650f21af3c5 | arm | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/9c09a31cef5abfeaf774c025df678a33c18aad5e | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/6fc95af66fd39481fac5c0e06a46f7a56c931d64 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/bf6d2615526a84e91110bce13f57779478a285e9 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8b700fe2442a56fd47c8a01a8ba1a2dd57f65a8f | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/bc109f875ced91c99aeecf7a102f1453b99d1270 | arc | glslsandbox-player-2021.08.24 | NOK | http://autobuild.buildroot.net/results/8c153d9082b0193ca4db6f2a7f879e49f27dff2f | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/6ff930a94023e3b4b787c99d10ea3bb4b606b4b7 | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/2dfbb7f8de52247fbce64037deaabec5f06c75a4 | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/ec6ca34a8b00204ee5f14cda17a3f38a95e509a1 | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/ba9d5d02f0394abcd1c346d716812bf5f86da452 | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/4fecb2e4d8de4669f52ceaa25771468de2f2b9d8 | arc | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/2084229fd67cc7d340c3e64ab2836825e629f817 | riscv64 | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/f1034de5ebc2fc2c49711820077d0b6e5e13aea5 | nios2 | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/e800b73900ae957436f7b93db00706e7f157b188 | powerpc | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/28cc14f488c92ff982271a03795b44d9a241e6fb | riscv64 | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/f0b64c97e7333ba9ce2276d76ae139d44ab8b0f5 | x86_64 | jasper-2.0.28 | NOK | http://autobuild.buildroot.net/results/4e965c07f607bc75e980e613267cedc1c4febd91 | x86_64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/8d49ab7cd9952f6a13bdd330e875012d0601f1d2 | s390x | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/ea0cd0ef5a6c625072504e6c631af77808628578 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/cfedb7f6432dd1ed1f4d4000541b5c76de65f5d4 | mips | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/fb95b2472a6e7c60115048fbf1c6e1d19d09fa3c | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/b2d4e16a7984528b8179abe4774aced433a7572c | ORPH mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/b2e204a84747949d7b0c1422f2c2310fc03fbdd4 | nios2 | pistache-f2f5a50fbfb5b8ef6c... | NOK | http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031 | ORPH sh4 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/f5f51d043d088256ed455c205d8355ddcc1f6f8f | m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/8dfad4391d8c89cf2448cf32bb6635d2a870d5f1 | ORPH x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/c8e77d3a44bdf4b241ead03f773b9695718d5570 | ORPH aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a5aa04382491043ddc6c79126668041a5b39b855 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d58f5f005db0a82c430deecdc6a38da84e2f25c3 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/deeda871e1b6ed50cf0b2ccc354fe6ae27886cc4 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a4576f1a9cb5a2485c8e58fc0f638315c6f6317c | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ef595d1ec24bcd565da3f80ca2781a0e830cc9ab | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/97b6dff3278abe3909cf92c9e31604bf3eb6e955 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/bb64b1ec66cc5eed4e33d84e3bed6dfdf8c4a22a | arm | unknown | NOK | http://autobuild.buildroot.net/results/e308a4103ccc05cfe1d7ddda2162163930c55056 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/34d04685f7438baa019ed49f5ec7e90c82a4022c | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/339c5e66414d83025051e6389f25f432b6d73fe6 | m68k | vdr-2.6.0 | NOK | http://autobuild.buildroot.net/results/427830ab64583961552038dc98cec5a4da35b83e | arm | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/fbfa6428d05c9c26cdded044cb560583f8aad1a9 | powerpc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/93963b2602145bafac21349a46e274638f87b36a | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/c63e8279de9f033aacb94f4bac1cbceb33d2d949 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 monkey-f54856ce250c4e257354... | 2 asterisk-16.21.1 | 1 libostree-2020.8 | 1 libtheora-1.1.1 | 1 mesa3d-20.3.5 | 1 ndisc6-1.0.4 | 1 openal-1.20.1 | 1 openldap-2.4.59 | 1 openvmtools-10.3.5-10430147 | 1 uboot-tools-2020.04 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | asterisk-16.21.1 | NOK | http://autobuild.buildroot.net/results/51014e9a47cad500dc075f98cfeba4802f8c8cf4 | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/bdaab2422c3e9187b18a1ed791d7f91c45e51ca1 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/36fe55fa88d2dd2472d1761a76fd40f228faeb73 | mips | libostree-2020.8 | NOK | http://autobuild.buildroot.net/results/14f1cff870f5322350810d8a2729fd2a47a2e7b3 | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/7ac2c2c43c51f597caafe8350aa3239da2a9166d | ORPH arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/4e882b11ee3debaa9b74ea15acf85bc9f161419a | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/e4bb49b02ecb5482155f2026b527ef68981172fe | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/803b992736c3b75985a679bd586f1054f57cd39c | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/19244f86c21a334cf395b6c2f72daac61782f342 | ORPH or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/a0a98d274ca48139d2b044ce09f02ef99bc2be7b | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/e3f8ecbdd3d5755f1daf840f26869fb3f24951ca | x86_64 | openvmtools-10.3.5-10430147 | NOK | http://autobuild.buildroot.net/results/026acc7d45f1836f0bde034d0edb51f38d4ed873 | arm | uboot-tools-2020.04 | NOK | http://autobuild.buildroot.net/results/9e7938479794fba5eaf22b42b69f57112b68a16d | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/8af4e0d735069ccceac76fdc1b02d1c378cbab10 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 5 log4cxx-0.12.0 | 1 unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/0b5ce47d0d1e94016065913b11c2720d50969f47 | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/10a8920847fc2df0f82bb89d62d81ca24de8328c | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/d22b59163b0666ab33012acbeb2fd6fa7fa30127 | mipsel | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/1bee2e1ad6bee97f0c4cf572fb320cc6a005e9cd | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/564eabd8125899113e960fdcdd19157bad20ea67 | xtensa | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/9d38cc6d8af874d61390b2daa5eb53f7e1d4e225 | arm | unknown | NOK | http://autobuild.buildroot.net/results/d39a15f1a2cf4d0e730ddc6e992037468e94a677 | Gitlab CI results for 2022-01-27 ================================ -- http://autobuild.buildroot.net From ps.report at gmx.net Fri Jan 28 07:50:17 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 08:50:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson In-Reply-To: <20220127210924.GQ457876@scaer> References: <20220127183924.1938903-1-james.hilliard1@gmail.com> <20220127210924.GQ457876@scaer> Message-ID: <20220128085017.786b1c13@gmx.net> Hello James, Yann, On Thu, 27 Jan 2022 22:09:24 +0100, "Yann E. MORIN" wrote: > James, All, > > On 2022-01-27 11:39 -0700, James Hilliard spake thusly: > > Signed-off-by: James Hilliard > > --- > > package/network-manager/Config.in | 1 + > > package/network-manager/network-manager.mk | 100 ++++++++++----------- > > 2 files changed, 48 insertions(+), 53 deletions(-) > > > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > > index a48cb37b15..da1a7d79b3 100644 > > --- a/package/network-manager/Config.in > > +++ b/package/network-manager/Config.in > > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI > > config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER > > bool "modem-manager support" > > select BR2_PACKAGE_MODEM_MANAGER > > + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO > > It looks like this is totally unrelated to the switch to meson, and > should be applied in its own right, and then backported to the > maintenance branches, no? > > If it is due to the switch to meson, then it should be explained in the > commit log. > > Regards, > Yann E. MORIN. > > > help > > This option enables support for ModemManager > > > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > index 974320fce0..290333e16c 100644 > > --- a/package/network-manager/network-manager.mk > > +++ b/package/network-manager/network-manager.mk > > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 > > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > > NETWORK_MANAGER_INSTALL_STAGING = YES > > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ > > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ Same comment as Yann beofore, here for added dbus dependency... Regards, Peter > > libgcrypt wireless_tools util-linux host-intltool libndp > > NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) > > NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md > > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome > > NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager > > NETWORK_MANAGER_SELINUX_MODULES = networkmanager > > > > -NETWORK_MANAGER_CONF_ENV = \ > > - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ > > - ac_cv_file__etc_fedora_release=no \ > > - ac_cv_file__etc_mandriva_release=no \ > > - ac_cv_file__etc_debian_version=no \ > > - ac_cv_file__etc_redhat_release=no \ > > - ac_cv_file__etc_SuSE_release=no > > - > > NETWORK_MANAGER_CONF_OPTS = \ > > - --disable-introspection \ > > - --disable-tests \ > > - --disable-qt \ > > - --disable-more-warnings \ > > - --with-crypto=gnutls \ > > - --with-iptables=/usr/sbin/iptables \ > > - --disable-ifupdown \ > > - --without-nm-cloud-setup > > + -Dintrospection=false \ > > + -Ddocs=false \ > > + -Dtests=no \ > > + -Dqt=false \ > > + -Dcrypto=gnutls \ > > + -Diptables=/usr/sbin/iptables \ > > + -Difupdown=false \ > > + -Dnm_cloud_setup=false \ > > + -Dsession_tracking_consolekit=false > > > > ifeq ($(BR2_PACKAGE_AUDIT),y) > > NETWORK_MANAGER_DEPENDENCIES += audit > > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no > > endif > > > > ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) > > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient > > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient > > endif > > > > ifeq ($(BR2_PACKAGE_DHCPCD),y) > > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd > > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd > > endif > > > > ifeq ($(BR2_PACKAGE_IWD),y) > > NETWORK_MANAGER_DEPENDENCIES += iwd > > -NETWORK_MANAGER_CONF_OPTS += --with-iwd > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBCURL),y) > > NETWORK_MANAGER_DEPENDENCIES += libcurl > > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBPSL),y) > > NETWORK_MANAGER_DEPENDENCIES += libpsl > > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBSELINUX),y) > > NETWORK_MANAGER_DEPENDENCIES += libselinux > > -NETWORK_MANAGER_CONF_OPTS += --with-selinux > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-selinux > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) > > -NETWORK_MANAGER_DEPENDENCIES += modem-manager > > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 > > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) > > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true > > NETWORK_MANAGER_DEPENDENCIES += jansson > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) > > NETWORK_MANAGER_DEPENDENCIES += pppd > > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) > > NETWORK_MANAGER_DEPENDENCIES += newt > > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false > > endif > > > > ifeq ($(BR2_PACKAGE_OFONO),y) > > NETWORK_MANAGER_DEPENDENCIES += ofono > > -NETWORK_MANAGER_CONF_OPTS += --with-ofono > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-ofono > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false > > endif > > > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > > NETWORK_MANAGER_DEPENDENCIES += systemd > > NETWORK_MANAGER_CONF_OPTS += \ > > - --with-systemd-journal \ > > - --with-config-logging-backend-default=journal \ > > - --with-session-tracking=systemd \ > > - --with-suspend-resume=systemd > > + -Dsystemd_journal=true \ > > + -Dconfig_logging_backend_default=journal \ > > + -Dsession_tracking=systemd \ > > + -Dsuspend_resume=systemd > > else > > NETWORK_MANAGER_CONF_OPTS += \ > > - --without-systemd-journal \ > > - --with-config-logging-backend-default=syslog \ > > - --without-session-tracking \ > > - --with-suspend-resume=upower > > + -Dsystemd_journal=false \ > > + -Dconfig_logging_backend_default=syslog \ > > + -Dsession_tracking=no \ > > + -Dsuspend_resume=upower \ > > + -Dsystemdsystemunitdir=no > > endif > > > > ifeq ($(BR2_PACKAGE_POLKIT),y) > > NETWORK_MANAGER_DEPENDENCIES += polkit > > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false > > endif > > > > ifeq ($(BR2_PACKAGE_READLINE),y) > > NETWORK_MANAGER_DEPENDENCIES += readline > > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false > > endif > > > > define NETWORK_MANAGER_INSTALL_INIT_SYSV > > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD > > > > endef > > > > -$(eval $(autotools-package)) > > +$(eval $(meson-package)) > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Fri Jan 28 08:10:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 09:10:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/erlang: bump to version 22.3.4.22 Message-ID: <20220128080408.D3C6A829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08b34bc3920106a78c6b0cdfb17ceb5b86621aec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Drop third patch (already in version) - Fix build failure with autoconf >= 2.70 raised since commit ecd54b65c1f998a7ccd91f7c523e4ff38c4781da Fixes: - http://autobuild.buildroot.org/results/4f52b2f194dcfd619fefb192d1c0fd070d5bd408 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 2ad6a3a428831b343823ee3bd95d8d5813a0697c) Signed-off-by: Peter Korsgaard --- ...-avoid-ODR-violation-of-ei_default_socket.patch | 54 ---------------------- package/erlang/erlang.hash | 9 ++-- package/erlang/erlang.mk | 7 +-- 3 files changed, 9 insertions(+), 61 deletions(-) diff --git a/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch b/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch deleted file mode 100644 index 69b6fae81f..0000000000 --- a/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch +++ /dev/null @@ -1,54 +0,0 @@ -From de870d7f9f36b3e68f280057851a4585a67ab219 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 14 Jan 2020 23:15:01 +0000 -Subject: [PATCH] ei_portio.h: avoid ODR violation of - 'ei_default_socket_callbacks' - -Noticed as a build failure against fresh gcc-master: - -``` -LD otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(eirecv.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send_reg.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(epmd_port.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_portio.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -collect2: error: ld returned 1 exit status -make[3]: *** [x86_64-unknown-linux-gnu/Makefile:669: otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call] Error 1 -``` - -The failure looks legitimate: `ei_default_socket_callbacks` is a -struct defined in 'ei_portio.h' and in 'ei_portio.c'. - -The change flips 'ei_portio.h' definition to declaration. - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Signed-off-by: Sergei Trofimovich - -Patch taken from upstream: https://github.com/erlang/otp/commit/de870d7f9f36b3e68f280057851a4585a67ab219 -Signed-off-by: Heiko Thiery ---- - lib/erl_interface/src/misc/ei_portio.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/erl_interface/src/misc/ei_portio.h b/lib/erl_interface/src/misc/ei_portio.h -index 84ebc5039a..5172d085b4 100644 - ---- a/lib/erl_interface/src/misc/ei_portio.h -+++ b/lib/erl_interface/src/misc/ei_portio.h -@@ -47,7 +47,7 @@ int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iov - int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs); - #endif - --ei_socket_callbacks ei_default_socket_callbacks; -+extern ei_socket_callbacks ei_default_socket_callbacks; - - #define EI_FD_AS_CTX__(FD) \ - ((void *) (long) (FD)) --- -2.20.1 - diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash index 3c2f039496..338545a0ba 100644 --- a/package/erlang/erlang.hash +++ b/package/erlang/erlang.hash @@ -1,4 +1,5 @@ -# md5 from http://www.erlang.org/download/MD5, sha256 locally computed -md5 b2b48dad6e69c1e882843edbf2abcfd3 otp_src_22.2.tar.gz -sha256 89c2480cdac566065577c82704a48e10f89cf2e6ca5ab99e1cf80027784c678f otp_src_22.2.tar.gz -sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt +# From https://github.com/erlang/otp/releases/download/OTP-22.3.4.22/SHA256.txt +sha256 e7f0793e62f8da4f7551dc9c1c0de76c40f19773ba516121fc56315c840f60cc otp_src_22.3.4.22.tar.gz + +# Hash for license file +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 527eb15a00..ac2c204a49 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -5,8 +5,9 @@ ################################################################################ # See note below when updating Erlang -ERLANG_VERSION = 22.2 -ERLANG_SITE = http://www.erlang.org/download +ERLANG_VERSION = 22.3.4.22 +ERLANG_SITE = \ + https://github.com/erlang/otp/releases/download/OTP-$(ERLANG_VERSION) ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz ERLANG_DEPENDENCIES = host-erlang @@ -37,7 +38,7 @@ HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF # Whenever updating Erlang, this value should be updated as well, to the # value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.13.1 +ERLANG_EI_VSN = 3.13.2.2 # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes From troglobit at gmail.com Fri Jan 28 08:42:44 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Fri, 28 Jan 2022 09:42:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: backport fix for gdbserver 11.1 on aarch64 Message-ID: <20220128084244.2258811-1-troglobit@gmail.com> Backported from upstream GDB geb79b23, with ChangeLogs stripped so the patch applies properly on Buildroot. https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=eb79b23 Fixes the following issue: # gdbserver /dev/hvc1 inadyn -n -l debug Process inadyn created; pid = 675 Remote debugging using /dev/hvc1 ../../gdbserver/regcache.cc:257: A problem internal to GDBserver has been detected. Unknown register tag_ctl requested Signed-off-by: Joachim Wiberg --- .../11.1/0010-gdbserver-aarch64-support.patch | 317 ++++++++++++++++++ 1 file changed, 317 insertions(+) create mode 100644 package/gdb/11.1/0010-gdbserver-aarch64-support.patch diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch new file mode 100644 index 0000000000..c915b8fe6f --- /dev/null +++ b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch @@ -0,0 +1,317 @@ +From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001 +From: Luis Machado +Date: Fri, 29 Oct 2021 14:54:36 -0300 +Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic + +The current register set selection mechanism for AArch64 is static, based +on a pre-populated array of register sets. + +This means that we might potentially probe register sets that are not +available. This is OK if the kernel errors out during ptrace, but probing the +tag_ctl register, for example, does not result in a ptrace error if the kernel +supports the tagged address ABI but not MTE (PR 28355). + +Making the register set selection dynamic, based on feature checks, solves +this and simplifies the code a bit. It allows us to list all of the register +sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties. + +gdb/ChangeLog: + +2021-11-03 Luis Machado + + PR gdb/28355 + + * arch/aarch64.h (struct aarch64_features): New struct. + +gdbserver/ChangeLog: + +2021-11-03 Luis Machado + + PR gdb/28355 + + * linux-aarch64-low.cc (is_sve_tdesc): Remove. + (aarch64_target::low_arch_setup): Rework to adjust the register sets. + (aarch64_regsets): Update to list all register sets. + (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr. + (aarch64_sve_regsets, aarch64_sve_regsets_info) + (regs_info_aarch64_sve): Remove. + (aarch64_adjust_register_sets): New. + (aarch64_target::get_regs_info): Remove references to removed structs. + (initialize_low_arch): Likewise. +--- + gdb/arch/aarch64.h | 9 ++ + gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++--------------- + 4 files changed, 130 insertions(+), 85 deletions(-) + +diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h +index 0eb702c5b5e..95edb664b55 100644 +--- a/gdb/arch/aarch64.h ++++ b/gdb/arch/aarch64.h +@@ -22,6 +22,15 @@ + + #include "gdbsupport/tdesc.h" + ++/* Holds information on what architectural features are available. This is ++ used to select register sets. */ ++struct aarch64_features ++{ ++ bool sve = false; ++ bool pauth = false; ++ bool mte = false; ++}; ++ + /* Create the aarch64 target description. A non zero VQ value indicates both + the presence of SVE and the Vector Quotient - the number of 128bit chunks in + an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH +diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc +index daccfef746e..9a8cb4169a7 100644 +--- a/gdbserver/linux-aarch64-low.cc ++++ b/gdbserver/linux-aarch64-low.cc +@@ -196,16 +196,6 @@ is_64bit_tdesc (void) + return register_size (regcache->tdesc, 0) == 8; + } + +-/* Return true if the regcache contains the number of SVE registers. */ +- +-static bool +-is_sve_tdesc (void) +-{ +- struct regcache *regcache = get_thread_regcache (current_thread, 0); +- +- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve"); +-} +- + static void + aarch64_fill_gregset (struct regcache *regcache, void *buf) + { +@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent, + *child->priv->arch_private = *parent->priv->arch_private; + } + +-/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ +-#define AARCH64_HWCAP_PACA (1 << 30) +- +-/* Implementation of linux target ops method "low_arch_setup". */ +- +-void +-aarch64_target::low_arch_setup () +-{ +- unsigned int machine; +- int is_elf64; +- int tid; +- +- tid = lwpid_of (current_thread); +- +- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); +- +- if (is_elf64) +- { +- uint64_t vq = aarch64_sve_get_vq (tid); +- unsigned long hwcap = linux_get_hwcap (8); +- unsigned long hwcap2 = linux_get_hwcap2 (8); +- bool pauth_p = hwcap & AARCH64_HWCAP_PACA; +- /* MTE is AArch64-only. */ +- bool mte_p = hwcap2 & HWCAP2_MTE; +- +- current_process ()->tdesc +- = aarch64_linux_read_description (vq, pauth_p, mte_p); +- } +- else +- current_process ()->tdesc = aarch32_linux_read_description (); +- +- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); +-} +- + /* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */ + + static void +@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf) + return aarch64_sve_regs_copy_from_reg_buf (regcache, buf); + } + ++/* Array containing all the possible register sets for AArch64/Linux. During ++ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for ++ validity and enabled/disabled accordingly. ++ ++ Their sizes are set to 0 here, but they will be adjusted later depending ++ on whether each register set is available or not. */ + static struct regset_info aarch64_regsets[] = + { ++ /* GPR registers. */ + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, +- sizeof (struct user_pt_regs), GENERAL_REGS, ++ 0, GENERAL_REGS, + aarch64_fill_gregset, aarch64_store_gregset }, ++ /* Floating Point (FPU) registers. */ + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET, +- sizeof (struct user_fpsimd_state), FP_REGS, ++ 0, FP_REGS, + aarch64_fill_fpregset, aarch64_store_fpregset + }, ++ /* Scalable Vector Extension (SVE) registers. */ ++ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, ++ 0, EXTENDED_REGS, ++ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache ++ }, ++ /* PAC registers. */ + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, +- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, +- NULL, aarch64_store_pauthregset }, ++ 0, OPTIONAL_REGS, ++ nullptr, aarch64_store_pauthregset }, ++ /* Tagged address control / MTE registers. */ + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, +- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, +- aarch64_store_mteregset }, ++ 0, OPTIONAL_REGS, ++ aarch64_fill_mteregset, aarch64_store_mteregset }, + NULL_REGSET + }; + +@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info = + { + aarch64_regsets, /* regsets */ + 0, /* num_regsets */ +- NULL, /* disabled_regsets */ ++ nullptr, /* disabled_regsets */ + }; + + static struct regs_info regs_info_aarch64 = + { +- NULL, /* regset_bitmap */ +- NULL, /* usrregs */ ++ nullptr, /* regset_bitmap */ ++ nullptr, /* usrregs */ + &aarch64_regsets_info, + }; + +-static struct regset_info aarch64_sve_regsets[] = ++/* Given FEATURES, adjust the available register sets by setting their ++ sizes. A size of 0 means the register set is disabled and won't be ++ used. */ ++ ++static void ++aarch64_adjust_register_sets (const struct aarch64_features &features) + { +- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, +- sizeof (struct user_pt_regs), GENERAL_REGS, +- aarch64_fill_gregset, aarch64_store_gregset }, +- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, +- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS, +- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache +- }, +- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, +- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, +- NULL, aarch64_store_pauthregset }, +- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, +- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, +- aarch64_store_mteregset }, +- NULL_REGSET +-}; ++ struct regset_info *regset; + +-static struct regsets_info aarch64_sve_regsets_info = +- { +- aarch64_sve_regsets, /* regsets. */ +- 0, /* num_regsets. */ +- NULL, /* disabled_regsets. */ +- }; ++ for (regset = aarch64_regsets; regset->size >= 0; regset++) ++ { ++ switch (regset->nt_type) ++ { ++ case NT_PRSTATUS: ++ /* General purpose registers are always present. */ ++ regset->size = sizeof (struct user_pt_regs); ++ break; ++ case NT_FPREGSET: ++ /* This is unavailable when SVE is present. */ ++ if (!features.sve) ++ regset->size = sizeof (struct user_fpsimd_state); ++ break; ++ case NT_ARM_SVE: ++ if (features.sve) ++ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE); ++ break; ++ case NT_ARM_PAC_MASK: ++ if (features.pauth) ++ regset->size = AARCH64_PAUTH_REGS_SIZE; ++ break; ++ case NT_ARM_TAGGED_ADDR_CTRL: ++ if (features.mte) ++ regset->size = AARCH64_LINUX_SIZEOF_MTE; ++ break; ++ default: ++ gdb_assert_not_reached ("Unknown register set found."); ++ } ++ } ++} + +-static struct regs_info regs_info_aarch64_sve = +- { +- NULL, /* regset_bitmap. */ +- NULL, /* usrregs. */ +- &aarch64_sve_regsets_info, +- }; ++/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ ++#define AARCH64_HWCAP_PACA (1 << 30) ++ ++/* Implementation of linux target ops method "low_arch_setup". */ ++ ++void ++aarch64_target::low_arch_setup () ++{ ++ unsigned int machine; ++ int is_elf64; ++ int tid; ++ ++ tid = lwpid_of (current_thread); ++ ++ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); ++ ++ if (is_elf64) ++ { ++ struct aarch64_features features; ++ ++ uint64_t vq = aarch64_sve_get_vq (tid); ++ features.sve = (vq > 0); ++ /* A-profile PAC is 64-bit only. */ ++ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; ++ /* A-profile MTE is 64-bit only. */ ++ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; ++ ++ current_process ()->tdesc ++ = aarch64_linux_read_description (vq, features.pauth, features.mte); ++ ++ /* Adjust the register sets we should use for this particular set of ++ features. */ ++ aarch64_adjust_register_sets (features); ++ } ++ else ++ current_process ()->tdesc = aarch32_linux_read_description (); ++ ++ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); ++} + + /* Implementation of linux target ops method "get_regs_info". */ + +@@ -802,9 +821,7 @@ aarch64_target::get_regs_info () + if (!is_64bit_tdesc ()) + return ®s_info_aarch32; + +- if (is_sve_tdesc ()) +- return ®s_info_aarch64_sve; +- ++ /* AArch64 64-bit registers. */ + return ®s_info_aarch64; + } + +@@ -3294,5 +3311,4 @@ initialize_low_arch (void) + initialize_low_arch_aarch32 (); + + initialize_regsets_info (&aarch64_regsets_info); +- initialize_regsets_info (&aarch64_sve_regsets_info); + } +-- +2.27.0 + From jborne at kalray.eu Fri Jan 28 09:15:02 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Fri, 28 Jan 2022 10:15:02 +0100 (CET) Subject: [Buildroot] [PATCH 1/1] package/binutils: remove libiberty from target install In-Reply-To: <20220127211819.GR457876@scaer> References: <20220127135339.25430-1-jborne@kalray.eu> <20220127135339.25430-2-jborne@kalray.eu> <20220127211819.GR457876@scaer> Message-ID: <519255027.1854303.1643361302026.JavaMail.zimbra@kalray.eu> ----- On Jan 27, 2022, at 10:18 PM, Yann E. MORIN yann.morin.1998 at free.fr wrote: > Jonathan, All, > > Thanks for this new iteration. :-) > > On 2022-01-27 14:53 +0100, Jonathan Borne via buildroot spake thusly: >> In BINUTILS_INSTALL_TARGET_CMDS, libiberty is installed >> to STAGING_DIR >> >> This is not necessary since libiberty is already >> unconditionally installed to staging in >> BINUTILS_INSTALL_STAGING_CMDS. Furthermore the presence >> of STAGING_DIR path in TARGET_CMDS is confusing. >> >> Moreover libiberty is static only. Static libraries >> are only used at build time, not at run time so >> we do not want to install libiberty on target. >> >> This commit removes the unnecessary libiberty >> install in TARGET_CMDS and add a comment to clarify >> why we do not see libiberty installed on target. > > I've slightly reworded the commit log, and rewrapped it closer to the > usual 72-char width. > That's perfect. I will think about the wrapping next time. >> Signed-off-by: Jonathan Borne >> --- >> package/binutils/binutils.mk | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk >> index 13f61be035..32ca70d325 100644 >> --- a/package/binutils/binutils.mk >> +++ b/package/binutils/binutils.mk >> @@ -95,6 +95,8 @@ BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) >> >> # We just want libbfd, libiberty and libopcodes, >> # not the full-blown binutils in staging >> +# Static-only libraries such as libiberty are used at buildtime in staging >> +# but are not installed to target. > > I believe the comment in fact makes more sense closer to the > _ISNTALL_TARGET_CMDS, so I moved it there, and reworded it > appropriately. > I hesitated a bit about the right place to put this comment but that's definitively cleaner this way. > Applied to master, thanks. > > Regards, > Yann E. MORIN. > Nice! Thank you very much! Best regards, Jonathan >> define BINUTILS_INSTALL_STAGING_CMDS >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install >> @@ -106,7 +108,6 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) >> define BINUTILS_INSTALL_TARGET_CMDS >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install >> - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install >> endef >> endif >> >> -- >> 2.17.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. >| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | >| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | >| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | >| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > > > To declare a filtering error, please use the following link : > https://www.security-mail.net/reporter.php?mid=16157.61f30c1f.e3bf2.0&r=jborne%40kalray.eu&s=yann.morin.1998%40free.fr&o=Re%3A+%5BBuildroot%5D+%5BPATCH+1%2F1%5D+package%2Fbinutils%3A+remove+libiberty+from+target+install&verdict=C&c=175bda5746a47a6dc86efbf686983009e1fe0acd From bernd.kuhls at t-online.de Fri Jan 28 09:48:27 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 28 Jan 2022 10:48:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.15 Message-ID: <20220128094827.2705597-1-bernd.kuhls@t-online.de> Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 Signed-off-by: Bernd Kuhls --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 329410b54f..e78385cbe7 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 fbde8247ac200e4de73449d9fefc8b495d323b5be9c10cdb645fb431c91156e3 php-8.0.14.tar.xz +sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index ca59334104..c9de8c2c76 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.14 +PHP_VERSION = 8.0.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Fri Jan 28 09:50:40 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 28 Jan 2022 10:50:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.4 Message-ID: <20220128095040.2706666-1-bernd.kuhls@t-online.de> Release notes: https://www.samba.org/samba/history/samba-4.15.4.html Signed-off-by: Bernd Kuhls --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 4749f6f597..130b628e32 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.3.tar.asc -sha256 519399404391550345846768ea4dd0fe7fcb04e20c2b891b5eeb02e5554137db samba-4.15.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.4.tar.asc +sha256 499065a589b7b9ffb8e3eb6efa8575985919a2999972afc469520a47322aec11 samba-4.15.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 14f9302e21..1d4b985437 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.3 +SAMBA4_VERSION = 4.15.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Fri Jan 28 09:52:49 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 28 Jan 2022 10:52:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.5 Message-ID: <20220128095249.2707373-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 09640a903c..871cf2f495 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.4 +MESA3D_HEADERS_VERSION = 21.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 559f21e06a..e36d798e21 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html -sha256 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d mesa-21.3.4.tar.xz -sha512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9 mesa-21.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html +sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz +sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 888ef58ad3..b1d0858ce3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.4 +MESA3D_VERSION = 21.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.30.2 From peter at korsgaard.com Fri Jan 28 10:25:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 11:25:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series Message-ID: <20220128101908.8A98B82858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa7f960200be32f6443f4684e721dd1142375345 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db14f7d71505aad2ae1e4aefc5c0ece97f5eacec) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index db0c58129f..264cbde98e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" 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 9062b72a0e..116d4af1d6 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz +sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9bc3c873c5..89307fdb99 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -374,14 +374,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 default "5.14.21" if BR2_KERNEL_HEADERS_5_14 - default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "5.15.13" if BR2_KERNEL_HEADERS_5_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Fri Jan 28 10:27:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 11:27:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series Message-ID: <20220128102110.EE47582858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf066e053c6f0e84294dae7f5cf908064f6e7623 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db14f7d71505aad2ae1e4aefc5c0ece97f5eacec) [Peter: drop 5.15.x bump] 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 a60ff7d1fa..e7addf1810 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.83" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.90" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" 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 8246c7dc09..e22ac924bc 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 740ed6c09d..fb9867525c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -346,12 +346,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From thomas.devoogdt at gmail.com Fri Jan 28 10:59:16 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Fri, 28 Jan 2022 11:59:16 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.69.1 Message-ID: <20220128105917.30421-1-thomas.devoogdt@barco.com> The internal_pcre option was dropped in: https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c Signed-off-by: Thomas Devoogdt --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index c402cbafa5..ce73d54f16 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.68.4', + version : '2.69.1', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index d421e025ff..0363b6e081 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum -sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz +# https://download.gnome.org/sources/glib/2.69/glib-2.69.1.sha256sum +sha256 f92f34057a091fc8638d91f10cece842cb8618e9a1090b0ddb19cc15a21bf39c glib-2.69.1.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index af73aeb3bf..46bbba18ad 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.69 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -30,7 +30,6 @@ HOST_LIBGLIB2_CONF_OPTS = \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ - -Dinternal_pcre=false \ -Dtests=false \ -Doss_fuzz=disabled @@ -52,7 +51,6 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ -Dglib_debug=disabled \ - -Dinternal_pcre=false \ -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ -Dtests=false \ -- 2.17.1 From thomas.devoogdt at gmail.com Fri Jan 28 10:59:17 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Fri, 28 Jan 2022 11:59:17 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsoup: bump to version 3.0.4 In-Reply-To: <20220128105917.30421-1-thomas.devoogdt@barco.com> References: <20220128105917.30421-1-thomas.devoogdt@barco.com> Message-ID: <20220128105917.30421-2-thomas.devoogdt@barco.com> Drop upstreamed patch: https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c The gnome option was dropped in: https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 backend): https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 Signed-off-by: Thomas Devoogdt --- Config.in.legacy | 6 +++ .../0001-meson.build-set-c_std-to-gnu99.patch | 40 ------------------- package/libsoup/Config.in | 6 +-- package/libsoup/libsoup.hash | 4 +- package/libsoup/libsoup.mk | 11 ++--- package/midori/Config.in | 1 - 6 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..d1fa68f894 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LIBSOUP_GNOME + bool "libsoup-gnome support was removed" + select BR2_LEGACY + help + Build libsoup-gnome library. + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 diff --git a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch b/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch deleted file mode 100644 index f2e8f7701d..0000000000 --- a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5c3d431bdb094c59997f2a23e31e83f815ab667c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 1 Jul 2021 22:09:23 +0200 -Subject: [PATCH] meson.build: set c_std to gnu99 - -Set c_std to gnu99 to avoid the following build failure with gcc 4.8: - -In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/resolv.h:65:0, - from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/gio/gnetworking.h:40, - from ../libsoup/soup-address.c:14: -/tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/arpa/nameser.h:115:2: error: unknown type name 'u_char' - const u_char *_msg, *_eom; - ^ - -Fixes: - - http://autobuild.buildroot.org/results/56b9cb987e25b99d6fed16c537552f47c3376f21 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/241] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 4dfd8c15..a5ebc63a 100644 ---- a/meson.build -+++ b/meson.build -@@ -2,6 +2,6 @@ project('libsoup', 'c', - version: '2.74.0', - meson_version : '>= 0.50', - license : 'LGPL2', -- default_options : 'c_std=c99') -+ default_options : 'c_std=gnu99') - - gnome = import('gnome') - --- -2.30.2 - diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 02e8e8b578..c98c61a31e 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSOUP depends on BR2_USE_WCHAR # glib2, gnutls and libpsl depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 + select BR2_PACKAGE_NGHTTP2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBPSL @@ -16,11 +17,6 @@ config BR2_PACKAGE_LIBSOUP if BR2_PACKAGE_LIBSOUP -config BR2_PACKAGE_LIBSOUP_GNOME - bool "libsoup-gnome" - help - Build libsoup-gnome library. - config BR2_PACKAGE_LIBSOUP_SSL bool "https support" depends on !BR2_STATIC_LIBS # glib-networking, gnutls diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 95c1c26eb4..00591fc0ad 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.0.sha256sum -sha256 33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e libsoup-2.74.0.tar.xz +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/3.0/libsoup-3.0.4.sha256sum +sha256 5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b libsoup-3.0.4.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 1a26714992..ce40a7dabf 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.74 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +LIBSOUP_VERSION_MAJOR = 3.0 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).4 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ @@ -16,6 +16,7 @@ LIBSOUP_DEPENDENCIES = \ host-intltool \ host-libglib2 \ host-pkgconf \ + nghttp2 \ libglib2 \ libpsl \ libxml2 \ @@ -55,10 +56,4 @@ else LIBSOUP_CONF_OPTS += -Dgssapi=disabled endif -ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) -LIBSOUP_CONF_OPTS += -Dgnome=true -else -LIBSOUP_CONF_OPTS += -Dgnome=false -endif - $(eval $(meson-package)) diff --git a/package/midori/Config.in b/package/midori/Config.in index d98d7cb161..715295e5a6 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -41,7 +41,6 @@ config BR2_PACKAGE_MIDORI select BR2_PACKAGE_LIBPEAS select BR2_PACKAGE_LIBPEAS_WIDGETS select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBSOUP_GNOME select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_SQLITE -- 2.17.1 From giulio.benetti at benettiengineering.com Fri Jan 28 11:05:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 28 Jan 2022 12:05:41 +0100 Subject: [Buildroot] [PATCH] package/libcamera: fix missing comment for binutils-bug-27597 In-Reply-To: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> References: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> Message-ID: <20220128110542.1101197-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libcamera/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 23a0040abf..88db054975 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -92,7 +92,7 @@ comment "lc-compliance test application needs a toolchain w/ C++, wchar, threads endif # BR2_PACKAGE_LIBCAMERA -comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" +comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7, not binutils bug 27597" depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Jan 28 11:05:40 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 28 Jan 2022 12:05:40 +0100 Subject: [Buildroot] [PATCH] package/kf5/kf5-kcoreaddons: add missing comment dependency for binutils-bug-27597 Message-ID: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/kf5/kf5-kcoreaddons/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/kf5/kf5-kcoreaddons/Config.in b/package/kf5/kf5-kcoreaddons/Config.in index 02bd38e395..eef43101a2 100644 --- a/package/kf5/kf5-kcoreaddons/Config.in +++ b/package/kf5/kf5-kcoreaddons/Config.in @@ -13,3 +13,6 @@ config BR2_PACKAGE_KF5_KCOREADDONS on top of QtCore to perform various tasks. https://api.kde.org/frameworks/kcoreaddons/html/index.html + +comment "kf5-kcoreaddons needs a toolchain w/o bug 27597" + depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Jan 28 11:05:42 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 28 Jan 2022 12:05:42 +0100 Subject: [Buildroot] [PATCH] package/pistache: disable package if affected by BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 In-Reply-To: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> References: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> Message-ID: <20220128110542.1101197-3-giulio.benetti@benettiengineering.com> Package pistache is affected by binutils bug 27597(Nios II), so let's disable it when BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y. Let'a also indent the comment dependencies. Fixes: http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031/ Signed-off-by: Giulio Benetti --- package/pistache/Config.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 64d6340827..96aed5210a 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_PISTACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure C++14 and provides @@ -12,9 +13,10 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar" +comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ - BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR + BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || \ + BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 -- 2.25.1 From d.lang at abatec.at Fri Jan 28 11:12:58 2022 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 28 Jan 2022 11:12:58 +0000 Subject: [Buildroot] [PATCH] package/dbus-cxx: new package Message-ID: DBus-cxx provides an object-oriented interface to DBus Signed-off-by: Lang Daniel --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-gcc11-include-typeinfo.patch | 29 ++++++ .../0002-cmake-improve-include-paths.patch | 91 +++++++++++++++++++ package/dbus-cxx/0003-sasl-use-uid_t.patch | 41 +++++++++ package/dbus-cxx/Config.in | 40 ++++++++ package/dbus-cxx/dbus-cxx.hash | 5 + package/dbus-cxx/dbus-cxx.mk | 28 ++++++ 8 files changed, 236 insertions(+) create mode 100644 package/dbus-cxx/0001-gcc11-include-typeinfo.patch create mode 100644 package/dbus-cxx/0002-cmake-improve-include-paths.patch create mode 100644 package/dbus-cxx/0003-sasl-use-uid_t.patch create mode 100644 package/dbus-cxx/Config.in create mode 100644 package/dbus-cxx/dbus-cxx.hash create mode 100644 package/dbus-cxx/dbus-cxx.mk diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..c319c53e00 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -626,6 +626,7 @@ N: Daniel J. Leach F: package/dacapo/ N: Daniel Lang +F: package/dbus-cxx/ F: package/paho-mqtt-cpp/ N: Damien Lanson diff --git a/package/Config.in b/package/Config.in index e4ca195beb..4e3d261cc1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -460,6 +460,7 @@ endmenu source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" source "package/dbus-cpp/Config.in" + source "package/dbus-cxx/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in" source "package/dbus-triggerd/Config.in" diff --git a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch new file mode 100644 index 0000000000..b4b7d83de2 --- /dev/null +++ b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch @@ -0,0 +1,29 @@ +From 0a4c5db225d8d213916655593471e303ba71e0ea Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk +Date: Mon, 13 Dec 2021 03:42:44 +0100 +Subject: [PATCH] Include typeinfo for typeid() (#83) + +Otherwise fails with: + error: must '#include ' before using 'typeid' + +Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/83 +Upstream-Status: Accepted +Signed-off-by: Daniel Lang + +--- + dbus-cxx/demangle.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h +index b71bcb9..9a4e99b 100644 +--- a/dbus-cxx/demangle.h ++++ b/dbus-cxx/demangle.h +@@ -21,6 +21,7 @@ + #define DBUSCXX_DEMANGLE_H + + #include ++#include + #include + + #if DBUS_CXX_HAS_CXXABI_H + diff --git a/package/dbus-cxx/0002-cmake-improve-include-paths.patch b/package/dbus-cxx/0002-cmake-improve-include-paths.patch new file mode 100644 index 0000000000..1f6a36a2c0 --- /dev/null +++ b/package/dbus-cxx/0002-cmake-improve-include-paths.patch @@ -0,0 +1,91 @@ +From 5a0ebbf55515a928acf9926d3fcd789115e347d3 Mon Sep 17 00:00:00 2001 +From: Lang Daniel +Date: Mon, 17 Jan 2022 13:57:55 +0100 +Subject: [PATCH] cmake: improve include paths + +Adding the dbus-cxx subfolders as an include path might override system +headers (signal.h for gcc 10). +By removing the subfolders, includes can happen via #include "..." or +via #include . + +Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/86 +Upstream-Status: Accepted +Signed-off-by: Daniel Lang + +--- + CMakeLists.txt | 4 +--- + dbus-cxx/matchrule.h | 2 +- + dbus-cxx/sasl.h | 2 +- + dbus-cxx/sendmsgtransport.cpp | 2 +- + dbus-cxx/simpletransport.cpp | 2 +- + 5 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b6d28c..e76cd61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -207,9 +207,7 @@ set( DBUS_CXX_HEADERS + + set( DBUS_CXX_INCLUDE_DIRECTORIES + ${PROJECT_SOURCE_DIR} +- ${PROJECT_SOURCE_DIR}/dbus-cxx +- ${PROJECT_BINARY_DIR} +- ${PROJECT_BINARY_DIR}/dbus-cxx ) ++ ${PROJECT_BINARY_DIR} ) + include_directories( ${DBUS_CXX_INCLUDE_DIRECTORIES} + ${dbus_INCLUDE_DIRS} + ${sigc_INCLUDE_DIRS} ) +diff --git a/dbus-cxx/matchrule.h b/dbus-cxx/matchrule.h +index 69fdab7..18c9e81 100644 +--- a/dbus-cxx/matchrule.h ++++ b/dbus-cxx/matchrule.h +@@ -20,7 +20,7 @@ + #define DBUSCXX_MATCH_RULE_H + + #include +-#include "dbus-cxx-config.h" ++#include + + namespace DBus { + +diff --git a/dbus-cxx/sasl.h b/dbus-cxx/sasl.h +index d7429a3..44edd6e 100644 +--- a/dbus-cxx/sasl.h ++++ b/dbus-cxx/sasl.h +@@ -19,7 +19,7 @@ + #ifndef DBUSCXX_SASL_H + #define DBUSCXX_SASL_H + +-#include ++#include + + #include + #include +diff --git a/dbus-cxx/sendmsgtransport.cpp b/dbus-cxx/sendmsgtransport.cpp +index ae053ff..a10ae66 100644 +--- a/dbus-cxx/sendmsgtransport.cpp ++++ b/dbus-cxx/sendmsgtransport.cpp +@@ -21,8 +21,8 @@ + #include "dbus-cxx-private.h" + #include "utility.h" + #include "validator.h" ++#include "message.h" + +-#include + #include + #include + #include +diff --git a/dbus-cxx/simpletransport.cpp b/dbus-cxx/simpletransport.cpp +index f291d9f..fed4364 100644 +--- a/dbus-cxx/simpletransport.cpp ++++ b/dbus-cxx/simpletransport.cpp +@@ -18,7 +18,7 @@ + ***************************************************************************/ + #include "simpletransport.h" + +-#include ++#include "dbus-cxx-private.h" + #include "demarshaling.h" + #include "message.h" + #include "utility.h" + diff --git a/package/dbus-cxx/0003-sasl-use-uid_t.patch b/package/dbus-cxx/0003-sasl-use-uid_t.patch new file mode 100644 index 0000000000..e517068891 --- /dev/null +++ b/package/dbus-cxx/0003-sasl-use-uid_t.patch @@ -0,0 +1,41 @@ +From 9db9673c0c2407e18e215844adadbd4a397e6f78 Mon Sep 17 00:00:00 2001 +From: Lang Daniel +Date: Fri, 28 Jan 2022 07:53:13 +0100 +Subject: [PATCH] use uid_t instead of __uid_t + +uclibc and glibc define getuid() as +extern __uid_t getuid (void) __THROW; +https://elixir.bootlin.com/glibc/glibc-2.34/source/posix/unistd.h#L698 +which is a typedef for unsigned int. + +musl uses uid_t as return type +uid_t getuid(void); +https://elixir.bootlin.com/musl/v1.2.2/source/include/unistd.h#L108 +which is a typedef to unsigned. + +glibc and uclibc include typedefs from __uid_t to uid_t, +which means one should be able to use uid_t as a replacement +for __uid_t and make compiling with all three c standard libraries +possible. + +Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/87 +Signed-off-by: Daniel Lang + +--- + dbus-cxx/sasl.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp +index e8a6060..7a76af6 100644 +--- a/dbus-cxx/sasl.cpp ++++ b/dbus-cxx/sasl.cpp +@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { + bool success = false; + bool negotiatedFD = false; + std::vector serverGUID; +- __uid_t uid = getuid(); ++ uid_t uid = getuid(); + std::string line; + std::smatch regex_match; + + diff --git a/package/dbus-cxx/Config.in b/package/dbus-cxx/Config.in new file mode 100644 index 0000000000..49f0f2237e --- /dev/null +++ b/package/dbus-cxx/Config.in @@ -0,0 +1,40 @@ +config BR2_PACKAGE_DBUS_CXX + bool "dbus-cxx" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_DBUS # runtime dependency + select BR2_PACKAGE_LIBSIGC + help + DBus-cxx is a C++ implementation for DBus. DBus is a + Linux-specific RPC (remote procedure call) and + IPC (inter-process communications) mechanism. + DBus-cxx provides an object-oriented view of all programs + on the DBus, and allows an object-oriented way of + exporting methods onto the DBus. + + https://dbus-cxx.github.io/ + +if BR2_PACKAGE_DBUS_CXX + +config BR2_PACKAGE_DBUS_CXX_QT + bool "Qt support" + depends on BR2_PACKAGE_QT5 + +comment "Qt support needs Qt5" + depends on !BR2_PACKAGE_QT5 + +config BR2_PACKAGE_DBUS_CXX_GLIB + bool "Glib support" + depends on BR2_PACKAGE_LIBGLIB2 + +comment "Glib support needs libglib2" + depends on !BR2_PACKAGE_LIBGLIB2 + +endif + +comment "dbus-cxx needs a toolchain w/ C++, threads, gcc >= 7 and dynamic library support" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash new file mode 100644 index 0000000000..907de1866f --- /dev/null +++ b/package/dbus-cxx/dbus-cxx.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 05c4f4750261f09819564bb8ee93b5d7f56fd05bbcd755858860fa6697d09c2a dbus-cxx-2.1.0.tar.gz +sha256 e85e018c8ee7d4f439b097289bf4371f6fcfec24e89f3e77c422944501bc383d COPYING +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 cmake-modules/LICENSE_1_0.txt +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 tools/libcppgenerate/LICENSE diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk new file mode 100644 index 0000000000..e184ef48ef --- /dev/null +++ b/package/dbus-cxx/dbus-cxx.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# dbus-cxx +# +################################################################################ + +DBUS_CXX_VERSION = 2.1.0 +DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) +DBUS_CXX_LICENSE = Boost license (cmake-modules), Apache 2.0 (libcppgenerate), GPL-3.0 +DBUS_CXX_LICENSE_FILES = cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE COPYING +DBUS_CXX_INSTALL_STAGING = YES +DBUS_CXX_DEPENDENCIES = libsigc + +ifeq ($(BR2_PACKAGE_DBUS_CXX_QT),y) +DBUS_CXX_CONF_OPTS += -DENABLE_QT_SUPPORT=ON +DBUS_CXX_DEPENDENCIES += qt5base +else +DBUS_CXX_CONF_OPTS += -DENABLE_QT_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_DBUS_CXX_GLIB),y) +DBUS_CXX_CONF_OPTS += -DENABLE_GLIB_SUPPORT=ON +DBUS_CXX_DEPENDENCIES += libglib2 +else +DBUS_CXX_CONF_OPTS += -DENABLE_GLIB_SUPPORT=OFF +endif + +$(eval $(cmake-package)) -- 2.25.1 From peter at korsgaard.com Fri Jan 28 11:33:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 12:33:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-rtsp-server: fix introspection In-Reply-To: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Dec 2021 10:33:11 +0100") References: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> Message-ID: <87czkc9jss.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with introspection: > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler > gst/rtsp-server/GstRtspServer-1.0.gir --output > gst/rtsp-server/GstRtspServer-1.0.typelib > --includedir=/usr/share/gir-1.0 > Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 > If the above error message is about missing .so libraries, then > setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > Fixes: > - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From aperez at igalia.com Fri Jan 28 11:42:23 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 28 Jan 2022 13:42:23 +0200 Subject: [Buildroot] [PATCH 2/2] package/libsoup: bump to version 3.0.4 In-Reply-To: <20220128105917.30421-2-thomas.devoogdt@barco.com> References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> Message-ID: <20220128134223.GB765275@momiji> Hello Thomas, all, On Fri, 28 Jan 2022 11:59:17 +0100 Thomas Devoogdt wrote: > Drop upstreamed patch: > https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c > > The gnome option was dropped in: > https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a > > A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 backend): > https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 > > Signed-off-by: Thomas Devoogdt > --- > Config.in.legacy | 6 +++ > .../0001-meson.build-set-c_std-to-gnu99.patch | 40 ------------------- > package/libsoup/Config.in | 6 +-- > package/libsoup/libsoup.hash | 4 +- > package/libsoup/libsoup.mk | 11 ++--- > package/midori/Config.in | 1 - > 6 files changed, 12 insertions(+), 56 deletions(-) > delete mode 100644 package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch Note that libsoup3 has a new API [1] (and ABI, therefore). Packages using libsoup2 may not even compile with libsoup3, or may crash at runtime in unexpected ways. You will need followup patches to modify packages that depend on libsoup to make them use libsoup2. For example in package/wpewebkit.mk we are currently passing -DUSE_SOUP2=ON to CMake, which needs to be changed to OFF. Some packages may not even support yet building with libsoup3. Therefore we may need to keep the libsoup2 package. This is possible, as both versions are parallel-installable. But then there is one more issue: one cannot use both libraries in the same process. Which means, for example, if wpewebkit gets changed to use libsoup3, then GStreamer *also* needs to be changed because both are used inside WebKit. These are all reasons why I have not yet sent patches to do the switch. Probably we want to discuss how to go ahead with the libsoup3 migration in Buildroot. Cheers, ?Adri?n --- [1] https://libsoup.org/libsoup-3.0/ch02.html -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From thomas.devoogdt at gmail.com Fri Jan 28 12:33:32 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Fri, 28 Jan 2022 13:33:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsoup: bump to version 3.0.4 In-Reply-To: <20220128134223.GB765275@momiji> References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> <20220128134223.GB765275@momiji> Message-ID: Hello Adri?n, all, I tested indeed libsoup3 against webkitgtk 2.34.4 [1]. By dropping -DUSE_SOUP2=ON from your commit, I was able to build webkitgtk 2.34.4. You are right, other packages will have to migrate as well, e.g. a GStreamer bump to 1.19.3 is needed [2]. A quick search learns me that BR2_PACKAGE_LIBSOUP is/can be selected in/for: - BR2_PACKAGE_GMPC (no explicit support mentioned yet) - BR2_PACKAGE_GSSDP (support on master branch [3]) - BR2_PACKAGE_GUPNP_TOOLS (no explicit support mentioned yet) - BR2_PACKAGE_GVFS (no explicit support mentioned yet) - BR2_PACKAGE_LIBOSTREE (no explicit support mentioned yet) - BR2_PACKAGE_MIDORI (no explicit support mentioned yet) - BR2_PACKAGE_WPEWEBKIT (no explicit support mentioned yet) - BR2_PACKAGE_GST1_PLUGINS_GOOD (starting from 1.19.3) - BR2_PACKAGE_GSTD (starting from 1.19.3) - BR2_PACKAGE_WEBKITGTK (starting from 2.34.4) Kr, Thomas Devoogdt --- [1] https://git.sr.ht/~aperezdc/buildroot/commit/5dc402d58659a35a30afd1de1a8fb8075034f3fc [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1044 [3] https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/7 Op vr 28 jan. 2022 om 12:42 schreef Adrian Perez de Castro < aperez at igalia.com>: > Hello Thomas, all, > > On Fri, 28 Jan 2022 11:59:17 +0100 Thomas Devoogdt < > thomas.devoogdt at gmail.com> wrote: > > Drop upstreamed patch: > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c > > > > The gnome option was dropped in: > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a > > > > A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 > backend): > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 > > > > Signed-off-by: Thomas Devoogdt > > --- > > Config.in.legacy | 6 +++ > > .../0001-meson.build-set-c_std-to-gnu99.patch | 40 ------------------- > > package/libsoup/Config.in | 6 +-- > > package/libsoup/libsoup.hash | 4 +- > > package/libsoup/libsoup.mk | 11 ++--- > > package/midori/Config.in | 1 - > > 6 files changed, 12 insertions(+), 56 deletions(-) > > delete mode 100644 > package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch > > Note that libsoup3 has a new API [1] (and ABI, therefore). Packages using > libsoup2 may not even compile with libsoup3, or may crash at runtime in > unexpected ways. > > You will need followup patches to modify packages that depend on libsoup > to make them use libsoup2. For example in package/wpewebkit.mk we are > currently passing -DUSE_SOUP2=ON to CMake, which needs to be changed to > OFF. > > Some packages may not even support yet building with libsoup3. Therefore > we may need to keep the libsoup2 package. This is possible, as both > versions > are parallel-installable. But then there is one more issue: one cannot use > both libraries in the same process. Which means, for example, if wpewebkit > gets changed to use libsoup3, then GStreamer *also* needs to be changed > because both are used inside WebKit. > > These are all reasons why I have not yet sent patches to do the switch. > Probably we want to discuss how to go ahead with the libsoup3 migration in > Buildroot. > > Cheers, > ?Adri?n > > --- > [1] https://libsoup.org/libsoup-3.0/ch02.html > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Fri Jan 28 12:44:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:44:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/util-linux/util-linux-libs: add a missing patch In-Reply-To: <20220115015004.2531151-1-tianyuanhao3@163.com> (TIAN Yuanhao's message of "Fri, 14 Jan 2022 17:50:04 -0800") References: <20220115015004.2531151-1-tianyuanhao3@163.com> Message-ID: <874k5o9gig.fsf@dell.be.48ers.dk> >>>>> "TIAN" == TIAN Yuanhao writes: > The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for > util-linux, but forgot to create a symlink to util-linux-libs. This > results in inconsistent libblkid.so builds from util-linux and > util-linux-libs. > If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different > libblkid.so is used in different > $(BASE_DIR)/per-package/$(PKG)_NAME/target. > Signed-off-by: TIAN Yuanhao Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From ps.report at gmx.net Fri Jan 28 12:45:36 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 13:45:36 +0100 Subject: [Buildroot] [PATCH v1 1/3] package/log4cxx: change download URL to https Message-ID: <20220128124538.31789-1-ps.report@gmx.net> - change download URL to https Signed-off-by: Peter Seiderer --- package/log4cxx/log4cxx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index e799b0fb16..7612774583 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -5,7 +5,7 @@ ################################################################################ LOG4CXX_VERSION = 0.12.0 -LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) +LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 -- 2.34.1 From ps.report at gmx.net Fri Jan 28 12:45:38 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 13:45:38 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/log4cxx: bump version to 0.12.1 In-Reply-To: <20220128124538.31789-1-ps.report@gmx.net> References: <20220128124538.31789-1-ps.report@gmx.net> Message-ID: <20220128124538.31789-3-ps.report@gmx.net> - drop 0001-LOGCXX-528.patch (from upstream [1]) - renumber remainnig patch Changelog (for deteils see [2]): - This is a minor bugfix release to fix issues found with 0.12.0. Notably, this version fixes a bug where a multithreaded application would crash when using a rolling file. [LOGCXX-534] - Crashed in log->forcedLog function when running with multi-thread [LOGCXX-528] - log4cxx fails to build on Centos 7.6 / g++ 4.8.5 / Boost 1.53 [1] https://github.com/apache/logging-log4cxx/commit/249dd85494a430d95fd69d89f42b02fd950cda51 [2] https://logging.apache.org/log4cxx/latest_stable/changelog.html#0.12.1 Signed-off-by: Peter Seiderer --- package/log4cxx/0001-LOGCXX-528.patch | 189 ------------------ ...ly-check-for-boost-if-really-needed.patch} | 0 package/log4cxx/log4cxx.hash | 4 +- package/log4cxx/log4cxx.mk | 2 +- 4 files changed, 3 insertions(+), 192 deletions(-) delete mode 100644 package/log4cxx/0001-LOGCXX-528.patch rename package/log4cxx/{0002-boost-fallback-only-check-for-boost-if-really-needed.patch => 0001-boost-fallback-only-check-for-boost-if-really-needed.patch} (100%) diff --git a/package/log4cxx/0001-LOGCXX-528.patch b/package/log4cxx/0001-LOGCXX-528.patch deleted file mode 100644 index d1d3189024..0000000000 --- a/package/log4cxx/0001-LOGCXX-528.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 249dd85494a430d95fd69d89f42b02fd950cda51 Mon Sep 17 00:00:00 2001 -From: Robert Middleton -Date: Thu, 22 Jul 2021 15:27:50 -0700 -Subject: [PATCH] LOGCXX-528 (#66) - -Fixes for checking that C++11 is available. Fix for older compilers. - -[Retrieved from: -https://github.com/apache/logging-log4cxx/commit/249dd85494a430d95fd69d89f42b02fd950cda51] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 10 +++++++++ - src/cmake/boost-fallback/boost-fallback.cmake | 21 ++++++++++--------- - src/main/cpp/hierarchy.cpp | 4 ++-- - src/main/include/CMakeLists.txt | 2 +- - .../log4cxx/helpers/appenderattachableimpl.h | 1 + - .../include/log4cxx/helpers/aprinitializer.h | 1 + - src/main/include/log4cxx/helpers/loglog.h | 1 + - .../include/log4cxx/helpers/serversocket.h | 1 + - src/main/include/log4cxx/level.h | 1 + - src/main/include/log4cxx/rolling/action.h | 1 + - 10 files changed, 30 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5b44ef1a..9c6e63902 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,6 +41,9 @@ if( NOT "${CMAKE_CXX_STANDARD}") - set(CMAKE_CXX_STANDARD 17) - endif() - -+# Don't allow for compiler-specific extensions -+set(CMAKE_CXX_EXTENSIONS OFF) -+ - # Building - add_subdirectory(src) - -@@ -185,6 +188,13 @@ if(APACHE_MAINTAINER) - ) - endif() - -+# -+# Check for any fatal configuration errors -+# -+if( "${SHARED_MUTEX_IMPL}" STREQUAL "NONE" ) -+ message( FATAL_ERROR "No shared_mutex implementation found. Requires Boost or C++17" ) -+endif() -+ - # - # Output configuration information - # Similar to APR CMake configuration -diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake -index a8d7d441b..8285b0b99 100644 ---- a/src/cmake/boost-fallback/boost-fallback.cmake -+++ b/src/cmake/boost-fallback/boost-fallback.cmake -@@ -56,16 +56,17 @@ try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" - "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp") - - find_package(Boost COMPONENTS thread) --try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -- "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedptr.cpp") --try_compile(Boost_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -- "${CMAKE_CURRENT_LIST_DIR}/test-boostmutex.cpp") --try_compile(Boost_SHARED_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -- "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedmutex.cpp" -- LINK_LIBRARIES Threads::Threads --) --try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -- "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") -+if( ${Boost_FOUND} ) -+ try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -+ "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedptr.cpp") -+ try_compile(Boost_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -+ "${CMAKE_CURRENT_LIST_DIR}/test-boostmutex.cpp") -+ try_compile(Boost_SHARED_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -+ "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedmutex.cpp" -+ LINK_LIBRARIES Threads::Threads Boost::thread) -+ try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -+ "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") -+endif( ${Boost_FOUND} ) - - # Link the target with the appropriate boost libraries(if required) - function(boostfallback_link target) -diff --git a/src/main/cpp/hierarchy.cpp b/src/main/cpp/hierarchy.cpp -index 4f5174448..c70d39dbb 100644 ---- a/src/main/cpp/hierarchy.cpp -+++ b/src/main/cpp/hierarchy.cpp -@@ -223,7 +223,7 @@ LoggerPtr Hierarchy::getLogger(const LogString& name, - else - { - LoggerPtr logger(factory->makeNewLoggerInstance(pool, name)); -- logger->setHierarchy(weak_from_this()); -+ logger->setHierarchy(shared_from_this()); - loggers->insert(LoggerMap::value_type(name, logger)); - - ProvisionNodeMap::iterator it2 = provisionNodes->find(name); -@@ -423,6 +423,6 @@ void Hierarchy::configureRoot(){ - // LOGCXX-322 we need to turn the repositroy into a weak_ptr, and we - // can't use weak_from_this() in the constructor. - if( !root->getLoggerRepository().lock() ){ -- root->setHierarchy(weak_from_this()); -+ root->setHierarchy(shared_from_this()); - } - } -diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt -index 8183660a5..584941c97 100644 ---- a/src/main/include/CMakeLists.txt -+++ b/src/main/include/CMakeLists.txt -@@ -133,7 +133,7 @@ if( ${STD_SHARED_MUTEX_FOUND} ) - elseif( ${Boost_SHARED_MUTEX_FOUND} ) - set( SHARED_MUTEX_IMPL "boost::shared_mutex" ) - else() -- set( SMART_PTR_IMPL "NONE" ) -+ set( SHARED_MUTEX_IMPL "NONE" ) - endif() - - if( ${STD_ATOMIC_FOUND} ) -diff --git a/src/main/include/log4cxx/helpers/appenderattachableimpl.h b/src/main/include/log4cxx/helpers/appenderattachableimpl.h -index 40e77d93c..b80b5aade 100644 ---- a/src/main/include/log4cxx/helpers/appenderattachableimpl.h -+++ b/src/main/include/log4cxx/helpers/appenderattachableimpl.h -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/helpers/aprinitializer.h b/src/main/include/log4cxx/helpers/aprinitializer.h -index 6f3f55070..fccd18e0f 100644 ---- a/src/main/include/log4cxx/helpers/aprinitializer.h -+++ b/src/main/include/log4cxx/helpers/aprinitializer.h -@@ -30,6 +30,7 @@ extern "C" { - } - - #include -+#include - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/helpers/loglog.h b/src/main/include/log4cxx/helpers/loglog.h -index d54785ddc..a4c92416a 100644 ---- a/src/main/include/log4cxx/helpers/loglog.h -+++ b/src/main/include/log4cxx/helpers/loglog.h -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/helpers/serversocket.h b/src/main/include/log4cxx/helpers/serversocket.h -index e6e6d475e..7da75b969 100644 ---- a/src/main/include/log4cxx/helpers/serversocket.h -+++ b/src/main/include/log4cxx/helpers/serversocket.h -@@ -19,6 +19,7 @@ - #define _LOG4CXX_HELPERS_SERVER_SOCKET_H - - #include -+#include - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/level.h b/src/main/include/log4cxx/level.h -index 4ca4bf28c..7848c902a 100644 ---- a/src/main/include/log4cxx/level.h -+++ b/src/main/include/log4cxx/level.h -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #if defined(_MSC_VER) - #pragma warning ( push ) -diff --git a/src/main/include/log4cxx/rolling/action.h b/src/main/include/log4cxx/rolling/action.h -index 0e8d55f36..fc4497813 100644 ---- a/src/main/include/log4cxx/rolling/action.h -+++ b/src/main/include/log4cxx/rolling/action.h -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - namespace log4cxx - { diff --git a/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch b/package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch similarity index 100% rename from package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch rename to package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 6fc0d8836e..12633c8e57 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/logging/log4cxx/0.12.0/apache-log4cxx-0.12.0.tar.gz.sha512 -sha512 00fe571f9c511bf93b17cac8269ce00f7e817e8d723acf62bddff1bbe0e7facd0ab2fd75c01a93870f7e5c66718b2b73fc22c5f193bfd204e34d052b1123e60d apache-log4cxx-0.12.0.tar.gz +# From https://www.apache.org/dist/logging/log4cxx/0.12.1/apache-log4cxx-0.12.1.tar.gz.sha512 +sha512 807058734cebf7c92e99484313becbc6be63e48bd930889c733318bb78dfec498b66aaa12255ed30879abb005b32e2b965f9dd87ec50d0421ca067f3f66280d9 apache-log4cxx-0.12.1.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index 7612774583..d20cc792a6 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CXX_VERSION = 0.12.0 +LOG4CXX_VERSION = 0.12.1 LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES -- 2.34.1 From peter at korsgaard.com Fri Jan 28 12:45:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:45:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4092 In-Reply-To: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 14 Jan 2022 23:20:55 +0100") References: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> Message-ID: <87zgng81vv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4192: vim is vulnerable to Use After Free > Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From ps.report at gmx.net Fri Jan 28 12:45:37 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 13:45:37 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/log4cxx: fix boost-fallback (only check for boost if really needed) In-Reply-To: <20220128124538.31789-1-ps.report@gmx.net> References: <20220128124538.31789-1-ps.report@gmx.net> Message-ID: <20220128124538.31789-2-ps.report@gmx.net> - add patch 0002-boost-fallback-only-check-for-boost-if-really-needed.patch to check for boost if really needed (in case of legacy c++ standard < c++17) Fixes: - http://autobuild.buildroot.net/results/8d49ab7cd9952f6a13bdd330e875012d0601f1d2 -- Found Boost: .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include (found version "1.78.0") found components: thread chrono missing components: date_time atomic CMake Error at .../build/log4cxx-0.12.0/boost-fallback-compile-tests/CMakeFiles/CMakeTmp/CMakeLists.txt:19 (add_executable): Target "cmTC_aac37" links to target "Boost::date_time" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? CMake Error at .../build/log4cxx-0.12.0/boost-fallback-compile-tests/CMakeFiles/CMakeTmp/CMakeLists.txt:19 (add_executable): Target "cmTC_aac37" links to target "Boost::atomic" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Signed-off-by: Peter Seiderer --- ...nly-check-for-boost-if-really-needed.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch diff --git a/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch b/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch new file mode 100644 index 0000000000..7df29ea120 --- /dev/null +++ b/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch @@ -0,0 +1,36 @@ +From 24e7adc8d67b3c8f7d275b4f9a7e70a61b73fcd4 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 28 Jan 2022 13:11:01 +0100 +Subject: [PATCH] boost-fallback: only check for boost if really needed + +- only check for boost if really needed (in case of legacy c++ standard < c++17) + +Signed-off-by: Peter Seiderer +--- + src/cmake/boost-fallback/boost-fallback.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake +index 8285b0b9..0ecf8c6c 100644 +--- a/src/cmake/boost-fallback/boost-fallback.cmake ++++ b/src/cmake/boost-fallback/boost-fallback.cmake +@@ -55,6 +55,8 @@ try_compile(STD_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tes + try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" + "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp") + ++# search for boost only in case needed for legacy c++ standard < c++17 ++if(NOT ${STD_THREAD_FOUND} OR NOT ${STD_MUTEX_FOUND} OR NOT ${STD_SHARED_MUTEX_FOUND} OR NOT ${STD_SHARED_PTR_FOUND} OR NOT ${STD_ATOMIC_FOUND}) + find_package(Boost COMPONENTS thread) + if( ${Boost_FOUND} ) + try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" +@@ -67,6 +69,7 @@ if( ${Boost_FOUND} ) + try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" + "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") + endif( ${Boost_FOUND} ) ++endif() + + # Link the target with the appropriate boost libraries(if required) + function(boostfallback_link target) +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Fri Jan 28 12:46:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:46:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireshark: security bump to version 3.4.11 Message-ID: <20220128123916.4E02B82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75d2730ac1e75603509b72d711d1003799b6cdd1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following security issues: - https://www.wireshark.org/security/wnpa-sec-2021-16.html (CVE-2021-4186) - https://www.wireshark.org/security/wnpa-sec-2021-17.html (CVE-2021-4185) - https://www.wireshark.org/security/wnpa-sec-2021-18.html (CVE-2021-4184) - https://www.wireshark.org/security/wnpa-sec-2021-20.html (CVE-2021-4182) - https://www.wireshark.org/security/wnpa-sec-2021-21.html (CVE-2021-4181) https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d19436b88dcea890b6a73b242e2a2cbb66e17fcd) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bc7c9f4d7e..7b67e316ed 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 91d215f183..7715680767 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.10 +WIRESHARK_VERSION = 3.4.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From peter at korsgaard.com Fri Jan 28 11:32:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 12:32:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1/gst1-rtsp-server: fix introspection Message-ID: <20220128123916.3D32F818E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d77ea65bb7e23083b0af6ea0625bb7e7a973491 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following build failure with introspection: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit fa3e7a63b93620b8227d66c6a973cd6140432cf3) Signed-off-by: Peter Korsgaard --- ...1-gst-rtsp-server-meson.build-add-gst_dep.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch new file mode 100644 index 0000000000..b63f634598 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch @@ -0,0 +1,41 @@ +From b6bc8fbb72d6d3914c616dc64d15b961493cb9c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Dec 2021 10:09:36 +0100 +Subject: [PATCH] gst/rtsp-server/meson.build: add gst_dep + +Add gst_dep to gst_rtsp_server_deps, in the context of buildroot, this +will avoid the following build failure, because the correct girdir +location will be retrieved from gstreamer-1.0.pc: + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 +Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + +Fixes: + - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] +--- + gst/rtsp-server/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/rtsp-server/meson.build b/gst/rtsp-server/meson.build +index 24d7c39..874da14 100644 +--- a/gst/rtsp-server/meson.build ++++ b/gst/rtsp-server/meson.build +@@ -55,7 +55,7 @@ rtsp_server_headers = [ + + install_headers(rtsp_server_headers, subdir : 'gstreamer-1.0/gst/rtsp-server') + +-gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep] ++gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep, gst_dep] + gst_rtsp_server = library('gstrtspserver- at 0@'.format(api_version), + rtsp_server_sources, + include_directories : rtspserver_incs, +-- +2.33.0 + From peter at korsgaard.com Fri Jan 28 12:44:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:44:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4092 Message-ID: <20220128123916.4589F82A99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17e4a53cc991150886f2f8fa901f6d630871aef2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4192: vim is vulnerable to Use After Free Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 33a3f1f30dedaf613dccac5b86ec909a1f404957) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6fa5d1bef0..fff5072063 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 6643ef0841..408b33a409 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3930 +VIM_VERSION = 8.2.4092 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 28 12:46:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:46:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.11 In-Reply-To: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 14 Jan 2022 23:40:35 +0100") References: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> Message-ID: <87v8y481uq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues: > - https://www.wireshark.org/security/wnpa-sec-2021-16.html > (CVE-2021-4186) > - https://www.wireshark.org/security/wnpa-sec-2021-17.html > (CVE-2021-4185) > - https://www.wireshark.org/security/wnpa-sec-2021-18.html > (CVE-2021-4184) > - https://www.wireshark.org/security/wnpa-sec-2021-20.html > (CVE-2021-4182) > - https://www.wireshark.org/security/wnpa-sec-2021-21.html > (CVE-2021-4181) > https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 11:30:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 12:30:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1/gst1-rtsp-server: fix introspection Message-ID: <20220128123934.8CEB8829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=598b97465ae61a8f07adfcc81cbd503646175081 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure with introspection: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit fa3e7a63b93620b8227d66c6a973cd6140432cf3) Signed-off-by: Peter Korsgaard --- ...1-gst-rtsp-server-meson.build-add-gst_dep.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch new file mode 100644 index 0000000000..b63f634598 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch @@ -0,0 +1,41 @@ +From b6bc8fbb72d6d3914c616dc64d15b961493cb9c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Dec 2021 10:09:36 +0100 +Subject: [PATCH] gst/rtsp-server/meson.build: add gst_dep + +Add gst_dep to gst_rtsp_server_deps, in the context of buildroot, this +will avoid the following build failure, because the correct girdir +location will be retrieved from gstreamer-1.0.pc: + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 +Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + +Fixes: + - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] +--- + gst/rtsp-server/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/rtsp-server/meson.build b/gst/rtsp-server/meson.build +index 24d7c39..874da14 100644 +--- a/gst/rtsp-server/meson.build ++++ b/gst/rtsp-server/meson.build +@@ -55,7 +55,7 @@ rtsp_server_headers = [ + + install_headers(rtsp_server_headers, subdir : 'gstreamer-1.0/gst/rtsp-server') + +-gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep] ++gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep, gst_dep] + gst_rtsp_server = library('gstrtspserver- at 0@'.format(api_version), + rtsp_server_sources, + include_directories : rtspserver_incs, +-- +2.33.0 + From peter at korsgaard.com Fri Jan 28 11:37:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 12:37:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux/util-linux-libs: add a missing patch Message-ID: <20220128123934.9559A82A99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7261f8e7a05729cb689be2539965833824d2db25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for util-linux, but forgot to create a symlink to util-linux-libs. This results in inconsistent libblkid.so builds from util-linux and util-linux-libs. If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different libblkid.so is used in different $(BASE_DIR)/per-package/$(PKG)_NAME/target. Signed-off-by: TIAN Yuanhao Signed-off-by: Yann E. MORIN (cherry picked from commit 93d23ef91fcfd8bf7f5a3ffc23d82bad8e868b34) Signed-off-by: Peter Korsgaard --- .../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch new file mode 120000 index 0000000000..2f3c482144 --- /dev/null +++ b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch @@ -0,0 +1 @@ +../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch \ No newline at end of file From peter at korsgaard.com Fri Jan 28 12:45:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:45:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.4092 Message-ID: <20220128123934.9D32282AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd8f975dc0c526ec8761fc89f222e95c29b009c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4192: vim is vulnerable to Use After Free Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 33a3f1f30dedaf613dccac5b86ec909a1f404957) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6fa5d1bef0..fff5072063 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 6643ef0841..408b33a409 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3930 +VIM_VERSION = 8.2.4092 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 28 12:45:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:45:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wireshark: security bump to version 3.4.11 Message-ID: <20220128123934.A5BA6829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dd97c860cfa2109b58b5f2aa5e9d68495f79652 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following security issues: - https://www.wireshark.org/security/wnpa-sec-2021-16.html (CVE-2021-4186) - https://www.wireshark.org/security/wnpa-sec-2021-17.html (CVE-2021-4185) - https://www.wireshark.org/security/wnpa-sec-2021-18.html (CVE-2021-4184) - https://www.wireshark.org/security/wnpa-sec-2021-20.html (CVE-2021-4182) - https://www.wireshark.org/security/wnpa-sec-2021-21.html (CVE-2021-4181) https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d19436b88dcea890b6a73b242e2a2cbb66e17fcd) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bc7c9f4d7e..7b67e316ed 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 2ba81d1f39..0361d0bb64 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.10 +WIRESHARK_VERSION = 3.4.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From ps.report at gmx.net Fri Jan 28 13:40:21 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 14:40:21 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/log4cxx: fix boost-fallback (only check for boost if really needed) In-Reply-To: <20220128124538.31789-2-ps.report@gmx.net> References: <20220128124538.31789-1-ps.report@gmx.net> <20220128124538.31789-2-ps.report@gmx.net> Message-ID: <20220128144021.543b2a0b@gmx.net> On Fri, 28 Jan 2022 13:45:37 +0100, Peter Seiderer wrote: > - add patch 0002-boost-fallback-only-check-for-boost-if-really-needed.patch > to check for boost if really needed (in case of legacy c++ standard < c++17) > > Fixes: > > - http://autobuild.buildroot.net/results/8d49ab7cd9952f6a13bdd330e875012d0601f1d2 > > -- Found Boost: .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include (found version "1.78.0") found components: thread chrono missing components: date_time atomic > CMake Error at .../build/log4cxx-0.12.0/boost-fallback-compile-tests/CMakeFiles/CMakeTmp/CMakeLists.txt:19 (add_executable): > Target "cmTC_aac37" links to target "Boost::date_time" but the target was > not found. Perhaps a find_package() call is missing for an IMPORTED > target, or an ALIAS target is missing? > > CMake Error at .../build/log4cxx-0.12.0/boost-fallback-compile-tests/CMakeFiles/CMakeTmp/CMakeLists.txt:19 (add_executable): > Target "cmTC_aac37" links to target "Boost::atomic" but the target was not > found. Perhaps a find_package() call is missing for an IMPORTED target, or > an ALIAS target is missing? > > Signed-off-by: Peter Seiderer > --- > ...nly-check-for-boost-if-really-needed.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch > > diff --git a/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch b/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch > new file mode 100644 > index 0000000000..7df29ea120 > --- /dev/null > +++ b/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch > @@ -0,0 +1,36 @@ > +From 24e7adc8d67b3c8f7d275b4f9a7e70a61b73fcd4 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Fri, 28 Jan 2022 13:11:01 +0100 > +Subject: [PATCH] boost-fallback: only check for boost if really needed > + > +- only check for boost if really needed (in case of legacy c++ standard < c++17) > + > +Signed-off-by: Peter Seiderer Upstream: https://github.com/apache/logging-log4cxx/pull/107 And https://patchwork.ozlabs.org/project/buildroot/patch/20211119175553.2413433-2-fontaine.fabrice at gmail.com/ for previous attempt to fix a similar/same failure... Regards, Peter > +--- > + src/cmake/boost-fallback/boost-fallback.cmake | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake > +index 8285b0b9..0ecf8c6c 100644 > +--- a/src/cmake/boost-fallback/boost-fallback.cmake > ++++ b/src/cmake/boost-fallback/boost-fallback.cmake > +@@ -55,6 +55,8 @@ try_compile(STD_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tes > + try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" > + "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp") > + > ++# search for boost only in case needed for legacy c++ standard < c++17 > ++if(NOT ${STD_THREAD_FOUND} OR NOT ${STD_MUTEX_FOUND} OR NOT ${STD_SHARED_MUTEX_FOUND} OR NOT ${STD_SHARED_PTR_FOUND} OR NOT ${STD_ATOMIC_FOUND}) > + find_package(Boost COMPONENTS thread) > + if( ${Boost_FOUND} ) > + try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" > +@@ -67,6 +69,7 @@ if( ${Boost_FOUND} ) > + try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" > + "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") > + endif( ${Boost_FOUND} ) > ++endif() > + > + # Link the target with the appropriate boost libraries(if required) > + function(boostfallback_link target) > +-- > +2.34.1 > + From aperez at igalia.com Fri Jan 28 14:13:14 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 28 Jan 2022 16:13:14 +0200 Subject: [Buildroot] libsoup3 migration (was: Re: [PATCH 2/2] package/libsoup: bump to version 3.0.4) In-Reply-To: References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> <20220128134223.GB765275@momiji> Message-ID: <20220128161314.GB770598@momiji> Hello Thomas, all, On Fri, 28 Jan 2022 13:33:32 +0100 Thomas Devoogdt wrote: > Hello Adri?n, all, > > I tested indeed libsoup3 against webkitgtk 2.34.4 [1]. By dropping > -DUSE_SOUP2=ON > from your commit, I was able to build webkitgtk 2.34.4. > > You are right, other packages will have to migrate as well, > e.g. a GStreamer bump to 1.19.3 is needed [2]. > > A quick search learns me that BR2_PACKAGE_LIBSOUP is/can be selected in/for: > - BR2_PACKAGE_GMPC (no explicit support mentioned yet) > - BR2_PACKAGE_GSSDP (support on master branch [3]) > - BR2_PACKAGE_GUPNP_TOOLS (no explicit support mentioned yet) > - BR2_PACKAGE_GVFS (no explicit support mentioned yet) > - BR2_PACKAGE_LIBOSTREE (no explicit support mentioned yet) > - BR2_PACKAGE_MIDORI (no explicit support mentioned yet) > - BR2_PACKAGE_WPEWEBKIT (no explicit support mentioned yet) > > - BR2_PACKAGE_GST1_PLUGINS_GOOD (starting from 1.19.3) > - BR2_PACKAGE_GSTD (starting from 1.19.3) > - BR2_PACKAGE_WEBKITGTK (starting from 2.34.4) There is a tracking table for the libsoup3 migration that one of my work mates has been maintaining up to date; you can find it here: https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 For most of the packages from Buildroot that you listed there are patches filed to their corresponding upstreams. The way I see it, there are three possible ways for a migration: - Keep both libsoup2 and libsoup3 in the tree, migrate packages to libsoup3 where possible and where we do not see conflicts (like loading both versions in the same process) likely to happen. - Replace libsoup2 with libsoup3 *now*, import patches into the Buildroot tree for the packages which do not yet have releases compatible with libsoup3. - Replace libsoup2 with libsoup3 *later*, once all upstreams of packages present in Buildroot put out releases that work with libsoup3. Personally I tend to think the last option is likely to be the best, to avoid confusions and the possibility that people who use Buildroot as basis for their work get into nasty situations due to both libsoup2 and libsoup3 being available. Opinions? > --- > [1] > https://git.sr.ht/~aperezdc/buildroot/commit/5dc402d58659a35a30afd1de1a8fb8075034f3fc > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1044 > [3] https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/7 > > > Op vr 28 jan. 2022 om 12:42 schreef Adrian Perez de Castro < > aperez at igalia.com>: > > > Hello Thomas, all, > > > > On Fri, 28 Jan 2022 11:59:17 +0100 Thomas Devoogdt < > > thomas.devoogdt at gmail.com> wrote: > > > Drop upstreamed patch: > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c > > > > > > The gnome option was dropped in: > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a > > > > > > A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 > > backend): > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 > > > > > > Signed-off-by: Thomas Devoogdt > > > --- > > > Config.in.legacy | 6 +++ > > > .../0001-meson.build-set-c_std-to-gnu99.patch | 40 ------------------- > > > package/libsoup/Config.in | 6 +-- > > > package/libsoup/libsoup.hash | 4 +- > > > package/libsoup/libsoup.mk | 11 ++--- > > > package/midori/Config.in | 1 - > > > 6 files changed, 12 insertions(+), 56 deletions(-) > > > delete mode 100644 > > package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch > > > > Note that libsoup3 has a new API [1] (and ABI, therefore). Packages using > > libsoup2 may not even compile with libsoup3, or may crash at runtime in > > unexpected ways. > > > > You will need followup patches to modify packages that depend on libsoup > > to make them use libsoup2. For example in package/wpewebkit.mk we are > > currently passing -DUSE_SOUP2=ON to CMake, which needs to be changed to > > OFF. > > > > Some packages may not even support yet building with libsoup3. Therefore > > we may need to keep the libsoup2 package. This is possible, as both > > versions > > are parallel-installable. But then there is one more issue: one cannot use > > both libraries in the same process. Which means, for example, if wpewebkit > > gets changed to use libsoup3, then GStreamer *also* needs to be changed > > because both are used inside WebKit. > > > > These are all reasons why I have not yet sent patches to do the switch. > > Probably we want to discuss how to go ahead with the libsoup3 migration in > > Buildroot. > > > > Cheers, > > ?Adri?n > > > > --- > > [1] https://libsoup.org/libsoup-3.0/ch02.html > > Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From universeiii at gmx.de Fri Jan 28 14:51:03 2022 From: universeiii at gmx.de (Andreas Ehmanns) Date: Fri, 28 Jan 2022 15:51:03 +0100 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: add config option for custom patches Message-ID: <20220128145103.3422-1-universeiii@gmx.de> Many embedded board manufacturer provide their BSP as patches to linux kernel and u-boot. They can simply be applied by setting the corresponding buildroot config (custom patches). Nowadays patches for the arm trusted firmware (ATF) are also part of BSP deliveries but there is no config option in buildroot for ATF to apply custom patches. This patch adds (similar to linux kernel and u-boot) an option to apply custom patches to ATF. Signed-off-by: Andreas Ehmanns --- boot/arm-trusted-firmware/Config.in | 8 +++++++ .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index b1fc03e10b..786a3083a2 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -63,6 +63,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION endif +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH + string "Custom ATF patches" + help + A space-separated list of patches to apply to ATF. + Each patch can be described as an URL, a local file path, + or a directory. In the case of a directory, all files + matching *.patch in the directory will be applied. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM string "ATF platform" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 03fa83b7b5..d329bdbfc3 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -29,6 +29,27 @@ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) endif +# Analogous code exists in linux/linux.mk. Basically, the generic +# package infrastructure handles downloading and applying remote +# patches. Local patches are handled depending on whether they are +# directories or files. +ARM_TRUSTED_FIRMWARE_PATCHES = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH)) +ARM_TRUSTED_FIRMWARE_PATCH = $(filter ftp://% http://% https://%,$(ARM_TRUSTED_FIRMWARE_PATCHES)) + +define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES + for p in $(filter-out ftp://% http://% https://%,$(ARM_TRUSTED_FIRMWARE_PATCHES)) ; do \ + if test -d $$p ; then \ + $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \ + else \ + $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \ + fi \ + done +endef +ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES + +# We have no way to know the hashes for user-supplied patches. +BR_NO_CHECK_HASH_FOR += $(notdir $(ARM_TRUSTED_FIRMWARE_PATCHES)) + ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) -- 2.26.2 From robert.hancock at calian.com Fri Jan 28 16:25:12 2022 From: robert.hancock at calian.com (Robert Hancock) Date: Fri, 28 Jan 2022 16:25:12 +0000 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: add config option for custom patches In-Reply-To: <20220128145103.3422-1-universeiii@gmx.de> References: <20220128145103.3422-1-universeiii@gmx.de> Message-ID: <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> On Fri, 2022-01-28 at 15:51 +0100, Andreas Ehmanns wrote: > Many embedded board manufacturer provide their BSP as patches to > linux kernel and u-boot. They can simply be applied by setting the > corresponding buildroot config (custom patches). > Nowadays patches for the arm trusted firmware (ATF) are also part of > BSP deliveries but there is no config option in buildroot for ATF > to apply custom patches. > This patch adds (similar to linux kernel and u-boot) an option to > apply custom patches to ATF. Hi Andreas, You shouldn't need a custom option to add patches for each package. If you add patches to $(BR2_EXTERNAL)/patches/arm-trusted-firmware then they will get applied automatically, we are using this mechanism already. I think the specific patch options for the kernel and U-Boot may predate that mechanism but don't need to be used anymore either. > > Signed-off-by: Andreas Ehmanns > --- > boot/arm-trusted-firmware/Config.in | 8 +++++++ > .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ > 2 files changed, 29 insertions(+) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- > firmware/Config.in > index b1fc03e10b..786a3083a2 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -63,6 +63,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION > > endif > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH > + string "Custom ATF patches" > + help > + A space-separated list of patches to apply to ATF. > + Each patch can be described as an URL, a local file path, > + or a directory. In the case of a directory, all files > + matching *.patch in the directory will be applied. > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM > string "ATF platform" > help > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm- > trusted-firmware/arm-trusted-firmware.mk > index 03fa83b7b5..d329bdbfc3 100644 > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > @@ -29,6 +29,27 @@ ifeq > ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST > BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) > endif > > +# Analogous code exists in linux/linux.mk. Basically, the generic > +# package infrastructure handles downloading and applying remote > +# patches. Local patches are handled depending on whether they are > +# directories or files. > +ARM_TRUSTED_FIRMWARE_PATCHES = $(call > qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH)) > +ARM_TRUSTED_FIRMWARE_PATCH = $(filter > https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ > https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 > fh66I9s3_Ij- > rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM > _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- > rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) > + > +define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES > + for p in $(filter-out > https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ > https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 > fh66I9s3_Ij- > rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM > _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- > rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) ; do \ > + if test -d $$p ; then \ > + $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \ > + else \ > + $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || > exit 1; \ > + fi \ > + done > +endef > +ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += > ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES > + > +# We have no way to know the hashes for user-supplied patches. > +BR_NO_CHECK_HASH_FOR += $(notdir $(ARM_TRUSTED_FIRMWARE_PATCHES)) > + > ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES > > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) > -- > 2.26.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://urldefense.com/v3/__https://lists.buildroot.org/mailman/listinfo/buildroot__;!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78CXtWZJI$ From peter at korsgaard.com Fri Jan 28 16:53:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:53:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR Message-ID: <20220128164633.E1B5A807B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb15463735f23b16601ef3f8b9f744f7cd421e5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 67af1b5ba50f387f6fb6ec7cc67283e1c9813fc0) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..7425423b8f 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six From peter at korsgaard.com Fri Jan 28 16:53:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:53:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/open62541: add OPEN62541_CPE_ID_VENDOR Message-ID: <20220128164633.D9A2C82707@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8af955d48aaaaa5caca577d804e0780ad40ed5ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 88606bd9eb4cc244388a3dec70a21d54ee3fe352) Signed-off-by: Peter Korsgaard --- package/open62541/open62541.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 102e09a429..8adf09a79d 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -12,6 +12,7 @@ OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 OPEN62541_LICENSE_FILES = LICENSE +OPEN62541_CPE_ID_VENDOR = open62541 # Force Release build to remove -Werror. # Don't use git describe to get the version number. From peter at korsgaard.com Fri Jan 28 16:53:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:53:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR Message-ID: <20220128164712.0329C82AFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cdc0f655e9fad98d7c0239b9d8b6161b4c8f40d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 67af1b5ba50f387f6fb6ec7cc67283e1c9813fc0) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..7425423b8f 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six From peter at korsgaard.com Fri Jan 28 16:53:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:53:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/open62541: add OPEN62541_CPE_ID_VENDOR Message-ID: <20220128164711.EE77B82825@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2c278e83fd7774b5fcd52c1e82a4546639da03e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 88606bd9eb4cc244388a3dec70a21d54ee3fe352) Signed-off-by: Peter Korsgaard --- package/open62541/open62541.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 66777ce501..fb28a614e2 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -11,6 +11,7 @@ OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 OPEN62541_LICENSE_FILES = LICENSE +OPEN62541_CPE_ID_VENDOR = open62541 # Force Release build to remove -Werror. # Don't use git describe to get the version number. From peter at korsgaard.com Fri Jan 28 16:55:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:55:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/open62541: add OPEN62541_CPE_ID_VENDOR In-Reply-To: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 14 Jan 2022 23:09:54 +0100") References: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> Message-ID: <87mtjf94vz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:55:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:55:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR In-Reply-To: <20220114180242.963756-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 14 Jan 2022 19:02:42 +0100") References: <20220114180242.963756-1-fontaine.fabrice@gmail.com> Message-ID: <87ilu394vc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:57:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:57:15 +0100 Subject: [Buildroot] [git commit] package/targetcli-fb: security bump to version 2.1.54 In-Reply-To: <20220115101718.49F728296C@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 15 Jan 2022 11:23:03 +0100") References: <20220115101718.49F728296C@busybox.osuosl.org> Message-ID: <87ee4r94t0.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=488f92a1c368c842f9f6c1bbae0384cfa803a684 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak > permissions for /etc/target (and for the backup directory and backup > files). > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:56:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:56:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/targetcli-fb: security bump to version 2.1.54 Message-ID: <20220128165024.C155882A43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8280160e7d157ea7fde79b56582cff28eda0f71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak permissions for /etc/target (and for the backup directory and backup files). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 488f92a1c368c842f9f6c1bbae0384cfa803a684) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 207c38e046..64f68a6675 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 7425423b8f..c6ca776b27 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 16:56:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:56:23 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/targetcli-fb: security bump to version 2.1.54 Message-ID: <20220128165028.D836682A43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f9b37303b63feb13514cee47e0ae3e66ce7c945 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak permissions for /etc/target (and for the backup directory and backup files). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 488f92a1c368c842f9f6c1bbae0384cfa803a684) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 207c38e046..64f68a6675 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 7425423b8f..c6ca776b27 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 16:59:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:59:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/ghostscript: fix CVE-2021-45944 In-Reply-To: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 15 Jan 2022 11:15:34 +0100") References: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> Message-ID: <87a6ff94ov.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in > sampled_data_sample (called from sampled_data_continue and interp). > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:59:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:59:49 +0100 Subject: [Buildroot] [PATCH 2/2] package/ghostscript: fix CVE-2021-45949 In-Reply-To: <20220115101535.1699671-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 15 Jan 2022 11:15:35 +0100") References: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> <20220115101535.1699671-2-fontaine.fabrice@gmail.com> Message-ID: <875yq394oq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer > overflow in sampled_data_finish (called from sampled_data_continue and > interp). > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:59:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:59:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/ghostscript: fix CVE-2021-45944 Message-ID: <20220128165257.E411D82AFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a11767de07d2d4fbb15e08002a0041b5c70e85b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in sampled_data_sample (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 70910c4092d9c9f359c26436fbc3c75918a90129) Signed-off-by: Peter Korsgaard --- ...ck-stack-limits-after-function-evaluation.patch | 52 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 ++ 2 files changed, 55 insertions(+) diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch new file mode 100644 index 0000000000..352f1754f6 --- /dev/null +++ b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch @@ -0,0 +1,52 @@ +From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i commit: https://git.buildroot.net/buildroot/commit/?id=813833e121abc3653e696284f3acc6c68d2a891e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop spurious space added by commit f9e359d7653f4af32a491e2baf4b6e524554174b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7e47d01c995b6a8329a4dafd4d5b2645b73cc9f2) Signed-off-by: Peter Korsgaard --- package/ghostscript/ghostscript.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index ca24c61678..d502d19206 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -71,7 +71,7 @@ endif ifeq ($(BR2_PACKAGE_CUPS),y) GHOSTSCRIPT_DEPENDENCIES += cups -GHOSTSCRIPT_CONF_OPTS += \ +GHOSTSCRIPT_CONF_OPTS += \ CUPSCONFIG=$(STAGING_DIR)/usr/bin/cups-config \ --enable-cups else From peter at korsgaard.com Fri Jan 28 16:59:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:59:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/ghostscript: fix CVE-2021-45949 Message-ID: <20220128165257.F08AF82AFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d908fb496b7bef62e7ccab27f68170685770a59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c817641331431aeb6db7b487173d63dbd9c73295) Signed-off-by: Peter Korsgaard --- ...stack-management-in-sampled_data_continue.patch | 68 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 + 2 files changed, 71 insertions(+) diff --git a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch new file mode 100644 index 0000000000..72e07df0ac --- /dev/null +++ b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i commit: https://git.buildroot.net/buildroot/commit/?id=226a8ae7f20cea17472c0232a022d7d526e660a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c817641331431aeb6db7b487173d63dbd9c73295) Signed-off-by: Peter Korsgaard --- ...stack-management-in-sampled_data_continue.patch | 68 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 + 2 files changed, 71 insertions(+) diff --git a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch new file mode 100644 index 0000000000..72e07df0ac --- /dev/null +++ b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i commit: https://git.buildroot.net/buildroot/commit/?id=cfdca3ebf81bee54b3fc5e3a378c5e3131dfe2e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in sampled_data_sample (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 70910c4092d9c9f359c26436fbc3c75918a90129) Signed-off-by: Peter Korsgaard --- ...ck-stack-limits-after-function-evaluation.patch | 52 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 ++ 2 files changed, 55 insertions(+) diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch new file mode 100644 index 0000000000..352f1754f6 --- /dev/null +++ b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch @@ -0,0 +1,52 @@ +From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i (Fabrice Fontaine's message of "Sat, 15 Jan 2022 12:42:44 +0100") References: <20220115114244.1912724-1-fontaine.fabrice@gmail.com> Message-ID: <871r0r94my.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fixes: > - CVE-2021-45115: Denial-of-service possibility in > UserAttributeSimilarityValidator > - CVE-2021-45116: Potential information disclosure in dictsort template > filter > - CVE-2021-45452: Potential directory-traversal via Storage.save() > https://www.djangoproject.com/weblog/2022/jan/04/security-releases > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 17:00:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 18:00:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-django: security bump to version 3.2.11 Message-ID: <20220128165406.8DD7F8140B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f541ba0cfffd5653adf1b3c36cbd046e7542f6e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes: - CVE-2021-45115: Denial-of-service possibility in UserAttributeSimilarityValidator - CVE-2021-45116: Potential information disclosure in dictsort template filter - CVE-2021-45452: Potential directory-traversal via Storage.save() https://www.djangoproject.com/weblog/2022/jan/04/security-releases Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a17d4aba54e62359cba638809fde5752dd40cf59) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 3eea17e70f..89bc5ffb19 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 4f80208f0e..25a645823b 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.10 +PYTHON_DJANGO_VERSION = 3.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 28 17:00:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 18:00:21 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-django: security bump to version 3.2.11 Message-ID: <20220128165411.0FEA182A2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a07dc684c304eade263e83f863abee3ed587a986 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes: - CVE-2021-45115: Denial-of-service possibility in UserAttributeSimilarityValidator - CVE-2021-45116: Potential information disclosure in dictsort template filter - CVE-2021-45452: Potential directory-traversal via Storage.save() https://www.djangoproject.com/weblog/2022/jan/04/security-releases Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a17d4aba54e62359cba638809fde5752dd40cf59) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 3eea17e70f..89bc5ffb19 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 4f80208f0e..25a645823b 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.10 +PYTHON_DJANGO_VERSION = 3.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 28 17:03:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 18:03:26 +0100 Subject: [Buildroot] [PATCH] package/nodejs: security bump to version 14.18.3 In-Reply-To: <20220114103825.1529-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 14 Jan 2022 11:38:24 +0100") References: <20220114103825.1529-1-peter@korsgaard.com> Message-ID: <87wnij7py9.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) > Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is > specifically defined to use a particular SAN type, can result in bypassing > name-constrained intermediates. Node.js was accepting URI SAN types, which > PKIs are often not defined to use. Additionally, when a protocol allows URI > SANs, Node.js did not match the URI correctly. > Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) > Node.js converts SANs (Subject Alternative Names) to a string format. It > uses this string to check peer certificates against hostnames when > validating connections. The string format was subject to an injection > vulnerability when name constraints were used within a certificate chain, > allowing the bypass of these name constraints. > Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) > Node.js did not handle multi-value Relative Distinguished Names correctly. > Attackers could craft certificate subjects containing a single-value > Relative Distinguished Name that would be interpreted as a multi-value > Relative Distinguished Name, for example, in order to inject a Common Name > that would allow bypassing the certificate subject verification. > Prototype pollution via console.table properties (Low)(CVE-2022-21824) > Due to the formatting logic of the console.table() function it was not safe > to allow user controlled input to be passed to the properties parameter > while simultaneously passing a plain object with at least one property as > the first parameter, which could be __proto__. The prototype pollution has > very limited control, in that it only allows an empty string to be assigned > numerical keys of the object prototype. > For details, see the advisory: > https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ > Signed-off-by: Peter Korsgaard Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 12.22.9 which contains the same fixes. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Fri Jan 28 17:16:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 28 Jan 2022 18:16:55 +0100 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: add config option for custom patches In-Reply-To: <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> References: <20220128145103.3422-1-universeiii@gmx.de> <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> Message-ID: <20220128171655.GS457876@scaer> Robert, Andreas, All, On 2022-01-28 16:25 +0000, Robert Hancock via buildroot spake thusly: > On Fri, 2022-01-28 at 15:51 +0100, Andreas Ehmanns wrote: > > Many embedded board manufacturer provide their BSP as patches to > > linux kernel and u-boot. They can simply be applied by setting the > > corresponding buildroot config (custom patches). > > Nowadays patches for the arm trusted firmware (ATF) are also part of > > BSP deliveries but there is no config option in buildroot for ATF > > to apply custom patches. > > This patch adds (similar to linux kernel and u-boot) an option to > > apply custom patches to ATF. > You shouldn't need a custom option to add patches for each package. If you add > patches to $(BR2_EXTERNAL)/patches/arm-trusted-firmware then they will get > applied automatically, we are using this mechanism already. I think you forgot a part to this: ... as long as you set BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/patches" in your Buildroot configuration. BR2_GLOBAL_PATCH_DIR is the generic solution to apply custom patches to any package in Buildroot. BR2_GLOBAL_PATCH_DIR can even be a space-separated list of directories. And it can also use a 'series' file rather than just globing *.patch. > I think the specific patch options for the kernel and U-Boot may predate that > mechanism but don't need to be used anymore either. Indeed. We're keeping them just because of inertia... Regards, Yann E. MORIN. > > Signed-off-by: Andreas Ehmanns > > --- > > boot/arm-trusted-firmware/Config.in | 8 +++++++ > > .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ > > 2 files changed, 29 insertions(+) > > > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- > > firmware/Config.in > > index b1fc03e10b..786a3083a2 100644 > > --- a/boot/arm-trusted-firmware/Config.in > > +++ b/boot/arm-trusted-firmware/Config.in > > @@ -63,6 +63,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION > > > > endif > > > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH > > + string "Custom ATF patches" > > + help > > + A space-separated list of patches to apply to ATF. > > + Each patch can be described as an URL, a local file path, > > + or a directory. In the case of a directory, all files > > + matching *.patch in the directory will be applied. > > + > > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM > > string "ATF platform" > > help > > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm- > > trusted-firmware/arm-trusted-firmware.mk > > index 03fa83b7b5..d329bdbfc3 100644 > > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > > @@ -29,6 +29,27 @@ ifeq > > ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST > > BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) > > endif > > > > +# Analogous code exists in linux/linux.mk. Basically, the generic > > +# package infrastructure handles downloading and applying remote > > +# patches. Local patches are handled depending on whether they are > > +# directories or files. > > +ARM_TRUSTED_FIRMWARE_PATCHES = $(call > > qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH)) > > +ARM_TRUSTED_FIRMWARE_PATCH = $(filter > > https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ > > https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 > > fh66I9s3_Ij- > > rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM > > _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- > > rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) > > + > > +define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES > > + for p in $(filter-out > > https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ > > https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 > > fh66I9s3_Ij- > > rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM > > _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- > > rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) ; do \ > > + if test -d $$p ; then \ > > + $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \ > > + else \ > > + $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || > > exit 1; \ > > + fi \ > > + done > > +endef > > +ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += > > ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES > > + > > +# We have no way to know the hashes for user-supplied patches. > > +BR_NO_CHECK_HASH_FOR += $(notdir $(ARM_TRUSTED_FIRMWARE_PATCHES)) > > + > > ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES > > > > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) > > -- > > 2.26.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://urldefense.com/v3/__https://lists.buildroot.org/mailman/listinfo/buildroot__;!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78CXtWZJI$ > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.devoogdt at gmail.com Fri Jan 28 17:23:25 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Fri, 28 Jan 2022 18:23:25 +0100 Subject: [Buildroot] libsoup3 migration (was: Re: [PATCH 2/2] package/libsoup: bump to version 3.0.4) In-Reply-To: <20220128161314.GB770598@momiji> References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> <20220128134223.GB765275@momiji> <20220128161314.GB770598@momiji> Message-ID: Hello Adri?n, all, Over time, we might have to support both versions anyway, since not all packages will migrate that quickly. If we go for option 1, then we can do it as follows: Introducing a flag called BR2_PACKAGE_LIBSOUP_3. The flag should have a life-cycle of 3 stages: 1. The newly introduced flag should default to 'false'. All packages which don't support libsoup3 support can add a 'depend on !BR2_PACKAGE_LIBSOUP_3' mark. 2. Over time, we can set the default to 'true', but keep the possibility to use libsoup2 for packages that still lack libsoup3 support. 3. Mark the BR2_PACKAGE_LIBSOUP_3 as legacy. The main advantage of this strategy is that people can start using libsoup3. The Disadvantage is that the new flag has to be maintained for a while. Kr, Thomas Op vr 28 jan. 2022 om 15:13 schreef Adrian Perez de Castro < aperez at igalia.com>: > Hello Thomas, all, > > On Fri, 28 Jan 2022 13:33:32 +0100 Thomas Devoogdt < > thomas.devoogdt at gmail.com> wrote: > > Hello Adri?n, all, > > > > I tested indeed libsoup3 against webkitgtk 2.34.4 [1]. By dropping > > -DUSE_SOUP2=ON > > from your commit, I was able to build webkitgtk 2.34.4. > > > > You are right, other packages will have to migrate as well, > > e.g. a GStreamer bump to 1.19.3 is needed [2]. > > > > A quick search learns me that BR2_PACKAGE_LIBSOUP is/can be selected > in/for: > > - BR2_PACKAGE_GMPC (no explicit support mentioned yet) > > - BR2_PACKAGE_GSSDP (support on master branch [3]) > > - BR2_PACKAGE_GUPNP_TOOLS (no explicit support mentioned yet) > > - BR2_PACKAGE_GVFS (no explicit support mentioned yet) > > - BR2_PACKAGE_LIBOSTREE (no explicit support mentioned yet) > > - BR2_PACKAGE_MIDORI (no explicit support mentioned yet) > > - BR2_PACKAGE_WPEWEBKIT (no explicit support mentioned yet) > > > > - BR2_PACKAGE_GST1_PLUGINS_GOOD (starting from 1.19.3) > > - BR2_PACKAGE_GSTD (starting from 1.19.3) > > - BR2_PACKAGE_WEBKITGTK (starting from 2.34.4) > > There is a tracking table for the libsoup3 migration that one of my work > mates > has been maintaining up to date; you can find it here: > > https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 > > For most of the packages from Buildroot that you listed there are patches > filed to their corresponding upstreams. > > The way I see it, there are three possible ways for a migration: > > - Keep both libsoup2 and libsoup3 in the tree, migrate packages to libsoup3 > where possible and where we do not see conflicts (like loading both > versions > in the same process) likely to happen. > > - Replace libsoup2 with libsoup3 *now*, import patches into the Buildroot > tree > for the packages which do not yet have releases compatible with libsoup3. > > - Replace libsoup2 with libsoup3 *later*, once all upstreams of packages > present in Buildroot put out releases that work with libsoup3. > > Personally I tend to think the last option is likely to be the best, to > avoid > confusions and the possibility that people who use Buildroot as basis for > their work get into nasty situations due to both libsoup2 and libsoup3 > being > available. > > Opinions? > > > --- > > [1] > > > https://git.sr.ht/~aperezdc/buildroot/commit/5dc402d58659a35a30afd1de1a8fb8075034f3fc > > [2] > https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1044 > > [3] https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/7 > > > > > > Op vr 28 jan. 2022 om 12:42 schreef Adrian Perez de Castro < > > aperez at igalia.com>: > > > > > Hello Thomas, all, > > > > > > On Fri, 28 Jan 2022 11:59:17 +0100 Thomas Devoogdt < > > > thomas.devoogdt at gmail.com> wrote: > > > > Drop upstreamed patch: > > > > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c > > > > > > > > The gnome option was dropped in: > > > > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a > > > > > > > > A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 > > > backend): > > > > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 > > > > > > > > Signed-off-by: Thomas Devoogdt > > > > --- > > > > Config.in.legacy | 6 +++ > > > > .../0001-meson.build-set-c_std-to-gnu99.patch | 40 > ------------------- > > > > package/libsoup/Config.in | 6 +-- > > > > package/libsoup/libsoup.hash | 4 +- > > > > package/libsoup/libsoup.mk | 11 ++--- > > > > package/midori/Config.in | 1 - > > > > 6 files changed, 12 insertions(+), 56 deletions(-) > > > > delete mode 100644 > > > package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch > > > > > > Note that libsoup3 has a new API [1] (and ABI, therefore). Packages > using > > > libsoup2 may not even compile with libsoup3, or may crash at runtime in > > > unexpected ways. > > > > > > You will need followup patches to modify packages that depend on > libsoup > > > to make them use libsoup2. For example in package/wpewebkit.mk we are > > > currently passing -DUSE_SOUP2=ON to CMake, which needs to be changed to > > > OFF. > > > > > > Some packages may not even support yet building with libsoup3. > Therefore > > > we may need to keep the libsoup2 package. This is possible, as both > > > versions > > > are parallel-installable. But then there is one more issue: one cannot > use > > > both libraries in the same process. Which means, for example, if > wpewebkit > > > gets changed to use libsoup3, then GStreamer *also* needs to be changed > > > because both are used inside WebKit. > > > > > > These are all reasons why I have not yet sent patches to do the switch. > > > Probably we want to discuss how to go ahead with the libsoup3 > migration in > > > Buildroot. > > > > > > Cheers, > > > ?Adri?n > > > > > > --- > > > [1] https://libsoup.org/libsoup-3.0/ch02.html > > > > > Cheers, > ?Adri?n > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Fri Jan 28 17:30:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 18:30:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/xml-security-c: needs threads Message-ID: <20220128173002.2483220-1-fontaine.fabrice@gmail.com> Add threads dependency to avoid the following build failure raised since bump to version 2.0.4 in commit 27d08083ed4db5bd055219574cc602aaf8053a49: configure: error: unable to find pthreads, currently this is required Fixes: - http://autobuild.buildroot.org/results/b6065efaa722f2da911c7cf150d446da621e8c71 Signed-off-by: Fabrice Fontaine --- package/xml-security-c/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/xml-security-c/Config.in b/package/xml-security-c/Config.in index 02544d5a01..c7963be69a 100644 --- a/package/xml-security-c/Config.in +++ b/package/xml-security-c/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_XML_SECURITY_C depends on !BR2_STATIC_LIBS # xerces depends on BR2_USE_WCHAR # xerces depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_XERCES @@ -13,6 +14,7 @@ config BR2_PACKAGE_XML_SECURITY_C https://santuario.apache.org/cindex.html -comment "xml-security-c needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7" +comment "xml-security-c needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 17:32:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 18:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/midori: drop select of libsoup-gnome Message-ID: <20220128173204.2483569-1-fontaine.fabrice@gmail.com> libsoup-gnome is not used by midori since bump to version 9.0 in commit 42f19d49fb2da891be9266a2f843292d24847f18 and https://github.com/midori-browser/core/commit/0c2d8f0ea61f20476542e861bc1772a878a54d32 Signed-off-by: Fabrice Fontaine --- package/midori/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/midori/Config.in b/package/midori/Config.in index d98d7cb161..715295e5a6 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -41,7 +41,6 @@ config BR2_PACKAGE_MIDORI select BR2_PACKAGE_LIBPEAS select BR2_PACKAGE_LIBPEAS_WIDGETS select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBSOUP_GNOME select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_SQLITE -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 17:45:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 18:45:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/htpdate: fix static openssl build Message-ID: <20220128174540.2502417-1-fontaine.fabrice@gmail.com> Fix the following static build failure with openssl raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(rec_layer_d1.o): in function `DTLS_RECORD_LAYER_new': rec_layer_d1.c:(.text+0x124): undefined reference to `CRYPTO_malloc' Fixes: - http://autobuild.buildroot.org/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 Signed-off-by: Fabrice Fontaine --- ...-config-to-determine-openssl-LDFLAGS.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch diff --git a/package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch b/package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch new file mode 100644 index 0000000000..c229ca6d89 --- /dev/null +++ b/package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch @@ -0,0 +1,43 @@ +From 81fd178abed833defce18562e8122d5c85822ccb Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Fri, 28 Jan 2022 18:37:24 +0100 +Subject: [PATCH] Use pkg-config to determine openssl LDFLAGS + +Depending on its build configuration, openssl might not be compiled with +dynamic zlib support, and programs that link against openssl need to link +against zlib as well, as illustrated in this build failure: +http://autobuild.buildroot.net/results/ae9/ae946ca72238840b3eaa5fe823e8d620618f7462/ + +Signed-off-by: Titouan Christophe +[Retrieved (and slightly updated) from: +https://github.com/angeloc/htpdate/commit/72fcf9f82770e927e058a2eaa327d0eecb1e3c8d] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/twekkel/htpdate/pull/17] +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4796efa..46c8681 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,6 +4,7 @@ mandir = ${prefix}/share/man + + CC ?= gcc + CFLAGS += -Wall -std=c11 -pedantic -O2 ++PKG_CONFIG ?= pkg-config + + INSTALL ?= install -c + STRIP ?= strip -s +@@ -14,7 +15,7 @@ htpdate: htpdate.c + $(CC) $(CFLAGS) -o htpdate htpdate.c + + https: htpdate.c +- $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c -lssl ++ $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c $(shell $(PKG_CONFIG) --libs libssl) + + install: all + $(STRIP) htpdate +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Fri Jan 28 18:11:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:11:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.69.1 In-Reply-To: <20220128105917.30421-1-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Fri, 28 Jan 2022 11:59:16 +0100") References: <20220128105917.30421-1-thomas.devoogdt@barco.com> Message-ID: <87sft77mtd.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > The internal_pcre option was dropped in: > https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c > Signed-off-by: Thomas Devoogdt > --- > package/libglib2/0002-remove-cpp-requirement.patch | 2 +- > package/libglib2/libglib2.hash | 4 ++-- > package/libglib2/libglib2.mk | 6 ++---- > 3 files changed, 5 insertions(+), 7 deletions(-) > +++ b/package/libglib2/libglib2.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > -LIBGLIB2_VERSION_MAJOR = 2.68 > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > +LIBGLIB2_VERSION_MAJOR = 2.69 > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 The "odd" libglib versions numbers are afaik development versions. We normally only use stable versions in Buildroot. Do you have any idea when 2.70 is planned? -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:25:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:25:35 +0100 Subject: [Buildroot] libsoup3 migration In-Reply-To: <20220128161314.GB770598@momiji> (Adrian Perez de Castro's message of "Fri, 28 Jan 2022 16:13:14 +0200") References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> <20220128134223.GB765275@momiji> <20220128161314.GB770598@momiji> Message-ID: <87o83v7m5c.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: Hi, > There is a tracking table for the libsoup3 migration that one of my work mates > has been maintaining up to date; you can find it here: > https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 > For most of the packages from Buildroot that you listed there are patches > filed to their corresponding upstreams. Thanks, that is helpful! > The way I see it, there are three possible ways for a migration: > - Keep both libsoup2 and libsoup3 in the tree, migrate packages to libsoup3 > where possible and where we do not see conflicts (like loading both versions > in the same process) likely to happen. > - Replace libsoup2 with libsoup3 *now*, import patches into the Buildroot tree > for the packages which do not yet have releases compatible with libsoup3. > - Replace libsoup2 with libsoup3 *later*, once all upstreams of packages > present in Buildroot put out releases that work with libsoup3. > Personally I tend to think the last option is likely to be the best, to avoid > confusions and the possibility that people who use Buildroot as basis for > their work get into nasty situations due to both libsoup2 and libsoup3 being > available. We don't want to maintain any more patches than needed, so option 2 isn't very nice. The question about having both v2 and v3 in the tree at the same time probably depends on how long v2 will be supported upstream, how fast applications will be migrate to v3 and how fast they will drop their v2 support - E.G. we still want to be able to pull in security fixes to any packages using libsoup during the 2022.02.x support period. We typically don't go as far as detecting any possible runtime issues from package combinations in Kconfig, and it looks like libsoup v2 recently gained some support for detecting an already loaded v3, so perhaps that is good enough? https://www.mail-archive.com/ftp-release-list at gnome.org/msg32190.html -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:26:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:26:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.69.1 In-Reply-To: <87sft77mtd.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Fri, 28 Jan 2022 19:11:10 +0100") References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <87sft77mtd.fsf@dell.be.48ers.dk> Message-ID: <87k0ej7m3d.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: Hi, >> -LIBGLIB2_VERSION_MAJOR = 2.68 >> -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 >> +LIBGLIB2_VERSION_MAJOR = 2.69 >> +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 > The "odd" libglib versions numbers are afaik development versions. We > normally only use stable versions in Buildroot. Do you have any idea > when 2.70 is planned? Ahh, it is already out: https://download.gnome.org/sources/glib/2.70/ -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:27:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:27:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/nodejs: security bump to version 12.22.9 Message-ID: <20220128182120.5C3CB822AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cee7b40cab2fd5cf4c9dbe34b41d71fa75677eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is specifically defined to use a particular SAN type, can result in bypassing name-constrained intermediates. Node.js was accepting URI SAN types, which PKIs are often not defined to use. Additionally, when a protocol allows URI SANs, Node.js did not match the URI correctly. Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) Node.js converts SANs (Subject Alternative Names) to a string format. It uses this string to check peer certificates against hostnames when validating connections. The string format was subject to an injection vulnerability when name constraints were used within a certificate chain, allowing the bypass of these name constraints. Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) Node.js did not handle multi-value Relative Distinguished Names correctly. Attackers could craft certificate subjects containing a single-value Relative Distinguished Name that would be interpreted as a multi-value Relative Distinguished Name, for example, in order to inject a Common Name that would allow bypassing the certificate subject verification. Prototype pollution via console.table properties (Low)(CVE-2022-21824) Due to the formatting logic of the console.table() function it was not safe to allow user controlled input to be passed to the properties parameter while simultaneously passing a plain object with at least one property as the first parameter, which could be __proto__. The prototype pollution has very limited control, in that it only allows an empty string to be assigned numerical keys of the object prototype. For details, see the advisory: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f31c7d5d69..11d5ec0672 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.22.7/SHASUMS256.txt -sha256 cc6a23b44870679a94bd8f3c8d4e1f4b77bb2712a36888ab87463459e6785f6b node-v12.22.7.tar.xz +# From https://nodejs.org/dist/v12.22.9/SHASUMS256.txt +sha256 da982c03e584c2b6e50f432cc5e46605d4e3d8451125be25a645fe716873e24a node-v12.22.9.tar.xz # Hash for license file sha256 221417a7ca275112a5ac54639b36ee3c5184e74631ea1e1b01b701293b655190 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index c8c5223a0b..c6649ce993 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 12.22.7 +NODEJS_VERSION = 12.22.9 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From peter at korsgaard.com Fri Jan 28 18:36:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:36:23 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix CVE-2021-38593 In-Reply-To: <3e21aca9-71ec-d648-c9e3-058a9f9960b2@theobroma-systems.com> (Quentin Schulz's message of "Mon, 24 Jan 2022 10:31:06 +0100") References: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> <20220121205327.GK3252931@scaer> <3e21aca9-71ec-d648-c9e3-058a9f9960b2@theobroma-systems.com> Message-ID: <87fsp77lnc.fsf@dell.be.48ers.dk> >>>>> "Quentin" == Quentin Schulz writes: > Hi Yann, > On 1/21/22 21:53, Yann E. MORIN wrote: >> Quentin, All, >> >> On 2022-01-21 17:50 +0100, Quentin Schulz spake thusly: >>> 5.15.2 is the last public release of 5.15 and does not contain this CVE >>> fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so >>> let's port them to 5.15.2. >>> >>> Technically only the first two patches are required to patch the CVE. >>> However, the second patch introduces a regression that is fixed in the third >>> patch. >>> >>> The patches are taken from KDE kde/5.15 git branch. >>> >>> Cc: Quentin Schulz >>> Signed-off-by: Quentin Schulz >> >> Applied to master, thanks. >> > Thanks! > I forgot to add that this patch can be applied to 2021.02.x and > 2021.11.x branches too since qtbase hasn't changed since. Thanks for the heads up. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:37:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:37:05 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/efl: change download URL to https In-Reply-To: <20220118201709.25366-1-ps.report@gmx.net> (Peter Seiderer's message of "Tue, 18 Jan 2022 21:17:08 +0100") References: <20220118201709.25366-1-ps.report@gmx.net> Message-ID: <87bkzv7lm6.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:37:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:37:09 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/enlightenment: change download URL to https In-Reply-To: <20220118201709.25366-2-ps.report@gmx.net> (Peter Seiderer's message of "Tue, 18 Jan 2022 21:17:09 +0100") References: <20220118201709.25366-1-ps.report@gmx.net> <20220118201709.25366-2-ps.report@gmx.net> Message-ID: <877daj7lm2.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:34:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:34:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/efl: change download URL to https Message-ID: <20220128183019.448D482B2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=345edd4b4732cdd5d48b04fdce0a4b140ff6f058 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: canonicalise homepage] Signed-off-by: Yann E. MORIN (cherry picked from commit c3d5b27d5d24079d6c30c568c58e3a5e7c6e3fc7) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 2 +- package/efl/efl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 05ded72cf7..eb9c7aebd9 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_EFL help Enlightenment Foundation Libraries - https://enlightenment.org + https://www.enlightenment.org/ if BR2_PACKAGE_EFL diff --git a/package/efl/efl.mk b/package/efl/efl.mk index cdb05aa551..1d7057c50b 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -6,7 +6,7 @@ EFL_VERSION = 1.25.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl +EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ From peter at korsgaard.com Fri Jan 28 18:36:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:36:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220128183019.55DD282B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0cbf7935acc8b18ee047381ec657db418e22147 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so let's port them to 5.15.2. Technically only the first two patches are required to patch the CVE. However, the second patch introduces a regression that is fixed in the third patch. The patches are taken from KDE kde/5.15 git branch. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN (cherry picked from commit 9151eab3c7e4548a052be69aecba1f2b1ee6396c) Signed-off-by: Peter Korsgaard --- ...ssing-intensive-painting-of-high-number-o.patch | 163 +++++++++++++++++++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 +++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++++ package/qt5/qt5base/qt5base.mk | 4 + 4 files changed, 304 insertions(+) diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..03287d19ca --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,163 @@ +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Pick-to: 6.1 6.0 5.15 +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) + +* asturmlechner 2021-08-21: +Conflict from preceding 94dd2ceb in dev branch: + src/gui/painting/qpaintengineex.cpp + Resolved via: + + if (pen.style() > Qt::SolidLine) { + QRectF cpRect = path.controlPointRect(); + const QTransform &xf = state()->matrix; +- if (pen.isCosmetic()) { ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ + clipRect = d->exDeviceRect; + cpRect.translate(xf.dx(), xf.dy()); + } else { + +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: + Resolved via: + + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; +- const QList pattern = pen.dashPattern(); ++ const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); + +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 5d8f89eadd..55fdb0c2a0 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 0000000000..d41ced7f5f +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.34.1 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..16e0f20200 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Pick-to: 6.2 6.1 5.15 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L??hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 55fdb0c2a0..19e4b23423 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.34.1 + diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..ca3c2736ae --- /dev/null +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,100 @@ +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 30 Jul 2021 13:03:49 +0200 +Subject: [PATCH] Refix for avoiding huge number of tiny dashes + +Previous fix hit too widely so some valid horizontal and vertical +lines were affected; the root problem being that such lines have an +empty control point rect (width or height is 0). Fix by caculating in +the pen width. + +Pick-to: 6.2 6.1 5.15 +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 8 ++--- + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 19e4b23423..9fe510827a 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); + } + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway +- QRectF extentRect = cpRect & clipRect; ++ qreal pw = pen.widthF() ? pen.widthF() : 1; ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; + const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); +- if (pen.widthF()) +- patternLength *= pen.widthF(); ++ patternLength *= pw; + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { ++ } else if (extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 42e98ce363..d7c3f95f1d 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -308,6 +308,7 @@ private slots: + void fillPolygon(); + + void drawImageAtPointF(); ++ void scaledDashes(); + + private: + void fillData(); +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() + paint.end(); + } + ++void tst_QPainter::scaledDashes() ++{ ++ // Test that we do not hit the limit-huge-number-of-dashes path ++ QRgb fore = qRgb(0, 0, 0xff); ++ QRgb back = qRgb(0xff, 0xff, 0); ++ QImage image(5, 32, QImage::Format_RGB32); ++ image.fill(back); ++ QPainter p(&image); ++ QPen pen(QColor(fore), 3, Qt::DotLine); ++ p.setPen(pen); ++ p.scale(1, 2); ++ p.drawLine(2, 0, 2, 16); ++ p.end(); ++ ++ bool foreFound = false; ++ bool backFound = false; ++ int i = 0; ++ while (i < 32 && (!foreFound || !backFound)) { ++ QRgb pix = image.pixel(3, i); ++ if (pix == fore) ++ foreFound = true; ++ else if (pix == back) ++ backFound = true; ++ i++; ++ } ++ ++ QVERIFY(foreFound); ++ QVERIFY(backFound); ++} ++ + QTEST_MAIN(tst_QPainter) + + #include "tst_qpainter.moc" +-- +2.34.1 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 7897e4294a..62dc16b647 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. From peter at korsgaard.com Fri Jan 28 18:35:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:35:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/enlightenment: change download URL to https Message-ID: <20220128183019.4C6E97FF88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=072c2aec0b2b34f1c1589d7e121ffcf56a747922 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: also change in Config.in] Signed-off-by: Yann E. MORIN (cherry picked from commit f6297befe176a2f33b8c598139f73d7e0b9f91c9) Signed-off-by: Peter Korsgaard --- package/enlightenment/Config.in | 2 +- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 91cdd896f6..e4affc1eec 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_ENLIGHTENMENT KDE. Enlightenment can be used as a substitute for a full desktop environment. - http://www.enlightenment.org/ + https://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.8" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 969b391cdc..7684009996 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -6,7 +6,7 @@ ENLIGHTENMENT_VERSION = 0.24.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt From peter at korsgaard.com Fri Jan 28 17:01:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 18:01:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/nodejs: security bump to version 14.18.3 Message-ID: <20220128183025.4EB0F82B2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8d740b04a58ffd8d8347d9ce2e33f6298e1bea2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is specifically defined to use a particular SAN type, can result in bypassing name-constrained intermediates. Node.js was accepting URI SAN types, which PKIs are often not defined to use. Additionally, when a protocol allows URI SANs, Node.js did not match the URI correctly. Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) Node.js converts SANs (Subject Alternative Names) to a string format. It uses this string to check peer certificates against hostnames when validating connections. The string format was subject to an injection vulnerability when name constraints were used within a certificate chain, allowing the bypass of these name constraints. Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) Node.js did not handle multi-value Relative Distinguished Names correctly. Attackers could craft certificate subjects containing a single-value Relative Distinguished Name that would be interpreted as a multi-value Relative Distinguished Name, for example, in order to inject a Common Name that would allow bypassing the certificate subject verification. Prototype pollution via console.table properties (Low)(CVE-2022-21824) Due to the formatting logic of the console.table() function it was not safe to allow user controlled input to be passed to the properties parameter while simultaneously passing a plain object with at least one property as the first parameter, which could be __proto__. The prototype pollution has very limited control, in that it only allows an empty string to be assigned numerical keys of the object prototype. For details, see the advisory: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9096036f00c5a0f37e3b3916417f0d0b166b73e8) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f330757341..6365ef852b 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt -sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz +# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt +sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 44bf786dfd..bd34860ef7 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.2 +NODEJS_VERSION = 14.18.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ From peter at korsgaard.com Fri Jan 28 18:35:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:35:09 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/efl: change download URL to https Message-ID: <20220128183025.569D782B2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=681fc3e74c2cdacad5f02682bf4314dad7112472 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: canonicalise homepage] Signed-off-by: Yann E. MORIN (cherry picked from commit c3d5b27d5d24079d6c30c568c58e3a5e7c6e3fc7) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 2 +- package/efl/efl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 05ded72cf7..eb9c7aebd9 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_EFL help Enlightenment Foundation Libraries - https://enlightenment.org + https://www.enlightenment.org/ if BR2_PACKAGE_EFL diff --git a/package/efl/efl.mk b/package/efl/efl.mk index cdb05aa551..1d7057c50b 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -6,7 +6,7 @@ EFL_VERSION = 1.25.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl +EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ From peter at korsgaard.com Fri Jan 28 18:35:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:35:11 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/enlightenment: change download URL to https Message-ID: <20220128183025.5F1D482B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4390ab28726ee48226a48ed112100239427ae2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: also change in Config.in] Signed-off-by: Yann E. MORIN (cherry picked from commit f6297befe176a2f33b8c598139f73d7e0b9f91c9) Signed-off-by: Peter Korsgaard --- package/enlightenment/Config.in | 2 +- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 91cdd896f6..e4affc1eec 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_ENLIGHTENMENT KDE. Enlightenment can be used as a substitute for a full desktop environment. - http://www.enlightenment.org/ + https://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.8" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 969b391cdc..7684009996 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -6,7 +6,7 @@ ENLIGHTENMENT_VERSION = 0.24.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt From peter at korsgaard.com Fri Jan 28 18:35:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:35:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220128183025.6848782B2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c5064a8b489070a46e7075be4db17f17b1e1fcf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so let's port them to 5.15.2. Technically only the first two patches are required to patch the CVE. However, the second patch introduces a regression that is fixed in the third patch. The patches are taken from KDE kde/5.15 git branch. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN (cherry picked from commit 9151eab3c7e4548a052be69aecba1f2b1ee6396c) Signed-off-by: Peter Korsgaard --- ...ssing-intensive-painting-of-high-number-o.patch | 163 +++++++++++++++++++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 +++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++++ package/qt5/qt5base/qt5base.mk | 4 + 4 files changed, 304 insertions(+) diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..03287d19ca --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,163 @@ +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Pick-to: 6.1 6.0 5.15 +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) + +* asturmlechner 2021-08-21: +Conflict from preceding 94dd2ceb in dev branch: + src/gui/painting/qpaintengineex.cpp + Resolved via: + + if (pen.style() > Qt::SolidLine) { + QRectF cpRect = path.controlPointRect(); + const QTransform &xf = state()->matrix; +- if (pen.isCosmetic()) { ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ + clipRect = d->exDeviceRect; + cpRect.translate(xf.dx(), xf.dy()); + } else { + +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: + Resolved via: + + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; +- const QList pattern = pen.dashPattern(); ++ const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); + +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 5d8f89eadd..55fdb0c2a0 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 0000000000..d41ced7f5f +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.34.1 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..16e0f20200 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Pick-to: 6.2 6.1 5.15 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L??hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 55fdb0c2a0..19e4b23423 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.34.1 + diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..ca3c2736ae --- /dev/null +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,100 @@ +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 30 Jul 2021 13:03:49 +0200 +Subject: [PATCH] Refix for avoiding huge number of tiny dashes + +Previous fix hit too widely so some valid horizontal and vertical +lines were affected; the root problem being that such lines have an +empty control point rect (width or height is 0). Fix by caculating in +the pen width. + +Pick-to: 6.2 6.1 5.15 +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 8 ++--- + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 19e4b23423..9fe510827a 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); + } + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway +- QRectF extentRect = cpRect & clipRect; ++ qreal pw = pen.widthF() ? pen.widthF() : 1; ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; + const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); +- if (pen.widthF()) +- patternLength *= pen.widthF(); ++ patternLength *= pw; + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { ++ } else if (extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 42e98ce363..d7c3f95f1d 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -308,6 +308,7 @@ private slots: + void fillPolygon(); + + void drawImageAtPointF(); ++ void scaledDashes(); + + private: + void fillData(); +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() + paint.end(); + } + ++void tst_QPainter::scaledDashes() ++{ ++ // Test that we do not hit the limit-huge-number-of-dashes path ++ QRgb fore = qRgb(0, 0, 0xff); ++ QRgb back = qRgb(0xff, 0xff, 0); ++ QImage image(5, 32, QImage::Format_RGB32); ++ image.fill(back); ++ QPainter p(&image); ++ QPen pen(QColor(fore), 3, Qt::DotLine); ++ p.setPen(pen); ++ p.scale(1, 2); ++ p.drawLine(2, 0, 2, 16); ++ p.end(); ++ ++ bool foreFound = false; ++ bool backFound = false; ++ int i = 0; ++ while (i < 32 && (!foreFound || !backFound)) { ++ QRgb pix = image.pixel(3, i); ++ if (pix == fore) ++ foreFound = true; ++ else if (pix == back) ++ backFound = true; ++ i++; ++ } ++ ++ QVERIFY(foreFound); ++ QVERIFY(backFound); ++} ++ + QTEST_MAIN(tst_QPainter) + + #include "tst_qpainter.moc" +-- +2.34.1 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9da3de468a..ddeab204f7 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. From james.hilliard1 at gmail.com Fri Jan 28 19:19:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 28 Jan 2022 12:19:52 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/network-manager: migrate autotools build system to meson Message-ID: <20220128191952.2776015-1-james.hilliard1@gmail.com> We need to add dbus as a build dependency since the meson build system uses dbus pkg-config to determine install locations. The meson build also requires mobile-broadband-info in order to get the database pkg-config variable. Signed-off-by: James Hilliard --- Changes v1 -> v2: - add comments on new dependencies --- package/network-manager/Config.in | 1 + package/network-manager/network-manager.mk | 100 ++++++++++----------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..da1a7d79b3 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help This option enables support for ModemManager diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..290333e16c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ libgcrypt wireless_tools util-linux host-intltool libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no - NETWORK_MANAGER_CONF_OPTS = \ - --disable-introspection \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --without-nm-cloud-setup + -Dintrospection=false \ + -Ddocs=false \ + -Dtests=no \ + -Dqt=false \ + -Dcrypto=gnutls \ + -Diptables=/usr/sbin/iptables \ + -Difupdown=false \ + -Dnm_cloud_setup=false \ + -Dsession_tracking_consolekit=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd -NETWORK_MANAGER_CONF_OPTS += --with-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=true else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=false endif ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl -NETWORK_MANAGER_CONF_OPTS += --enable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true else -NETWORK_MANAGER_CONF_OPTS += --disable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false endif ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl -NETWORK_MANAGER_CONF_OPTS += --with-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true else -NETWORK_MANAGER_CONF_OPTS += --without-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) NETWORK_MANAGER_DEPENDENCIES += libselinux -NETWORK_MANAGER_CONF_OPTS += --with-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true else -NETWORK_MANAGER_CONF_OPTS += --without-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=true NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=true else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=true else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_CONF_OPTS += \ - --with-systemd-journal \ - --with-config-logging-backend-default=journal \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd + -Dsystemd_journal=true \ + -Dconfig_logging_backend_default=journal \ + -Dsession_tracking=systemd \ + -Dsuspend_resume=systemd else NETWORK_MANAGER_CONF_OPTS += \ - --without-systemd-journal \ - --with-config-logging-backend-default=syslog \ - --without-session-tracking \ - --with-suspend-resume=upower + -Dsystemd_journal=false \ + -Dconfig_logging_backend_default=syslog \ + -Dsession_tracking=no \ + -Dsuspend_resume=upower \ + -Dsystemdsystemunitdir=no endif ifeq ($(BR2_PACKAGE_POLKIT),y) NETWORK_MANAGER_DEPENDENCIES += polkit -NETWORK_MANAGER_CONF_OPTS += --enable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true else -NETWORK_MANAGER_CONF_OPTS += --disable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false endif ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false endif define NETWORK_MANAGER_INSTALL_INIT_SYSV @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 28 19:23:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 28 Jan 2022 12:23:21 -0700 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson In-Reply-To: <20220128085017.786b1c13@gmx.net> References: <20220127183924.1938903-1-james.hilliard1@gmail.com> <20220127210924.GQ457876@scaer> <20220128085017.786b1c13@gmx.net> Message-ID: On Fri, Jan 28, 2022 at 12:50 AM Peter Seiderer wrote: > > Hello James, Yann, > > On Thu, 27 Jan 2022 22:09:24 +0100, "Yann E. MORIN" wrote: > > > James, All, > > > > On 2022-01-27 11:39 -0700, James Hilliard spake thusly: > > > Signed-off-by: James Hilliard > > > --- > > > package/network-manager/Config.in | 1 + > > > package/network-manager/network-manager.mk | 100 ++++++++++----------- > > > 2 files changed, 48 insertions(+), 53 deletions(-) > > > > > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > > > index a48cb37b15..da1a7d79b3 100644 > > > --- a/package/network-manager/Config.in > > > +++ b/package/network-manager/Config.in > > > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI > > > config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER > > > bool "modem-manager support" > > > select BR2_PACKAGE_MODEM_MANAGER > > > + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO > > > > It looks like this is totally unrelated to the switch to meson, and > > should be applied in its own right, and then backported to the > > maintenance branches, no? > > > > If it is due to the switch to meson, then it should be explained in the > > commit log. > > > > Regards, > > Yann E. MORIN. > > > > > help > > > This option enables support for ModemManager > > > > > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > > index 974320fce0..290333e16c 100644 > > > --- a/package/network-manager/network-manager.mk > > > +++ b/package/network-manager/network-manager.mk > > > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 > > > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > > > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > > > NETWORK_MANAGER_INSTALL_STAGING = YES > > > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ > > > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ > > Same comment as Yann beofore, here for added dbus dependency... Yeah, seems both are just needed due to the pkg-config variables being needed: https://patchwork.ozlabs.org/project/buildroot/patch/20220128191952.2776015-1-james.hilliard1 at gmail.com/ > > Regards, > Peter > > > > libgcrypt wireless_tools util-linux host-intltool libndp > > > NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) > > > NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md > > > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome > > > NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager > > > NETWORK_MANAGER_SELINUX_MODULES = networkmanager > > > > > > -NETWORK_MANAGER_CONF_ENV = \ > > > - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ > > > - ac_cv_file__etc_fedora_release=no \ > > > - ac_cv_file__etc_mandriva_release=no \ > > > - ac_cv_file__etc_debian_version=no \ > > > - ac_cv_file__etc_redhat_release=no \ > > > - ac_cv_file__etc_SuSE_release=no > > > - > > > NETWORK_MANAGER_CONF_OPTS = \ > > > - --disable-introspection \ > > > - --disable-tests \ > > > - --disable-qt \ > > > - --disable-more-warnings \ > > > - --with-crypto=gnutls \ > > > - --with-iptables=/usr/sbin/iptables \ > > > - --disable-ifupdown \ > > > - --without-nm-cloud-setup > > > + -Dintrospection=false \ > > > + -Ddocs=false \ > > > + -Dtests=no \ > > > + -Dqt=false \ > > > + -Dcrypto=gnutls \ > > > + -Diptables=/usr/sbin/iptables \ > > > + -Difupdown=false \ > > > + -Dnm_cloud_setup=false \ > > > + -Dsession_tracking_consolekit=false > > > > > > ifeq ($(BR2_PACKAGE_AUDIT),y) > > > NETWORK_MANAGER_DEPENDENCIES += audit > > > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit > > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit > > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no > > > endif > > > > > > ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) > > > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient > > > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient > > > endif > > > > > > ifeq ($(BR2_PACKAGE_DHCPCD),y) > > > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd > > > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd > > > endif > > > > > > ifeq ($(BR2_PACKAGE_IWD),y) > > > NETWORK_MANAGER_DEPENDENCIES += iwd > > > -NETWORK_MANAGER_CONF_OPTS += --with-iwd > > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_LIBCURL),y) > > > NETWORK_MANAGER_DEPENDENCIES += libcurl > > > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck > > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck > > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_LIBPSL),y) > > > NETWORK_MANAGER_DEPENDENCIES += libpsl > > > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl > > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl > > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_LIBSELINUX),y) > > > NETWORK_MANAGER_DEPENDENCIES += libselinux > > > -NETWORK_MANAGER_CONF_OPTS += --with-selinux > > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-selinux > > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) > > > -NETWORK_MANAGER_DEPENDENCIES += modem-manager > > > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 > > > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info > > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 > > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) > > > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs > > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true > > > NETWORK_MANAGER_DEPENDENCIES += jansson > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs > > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) > > > NETWORK_MANAGER_DEPENDENCIES += pppd > > > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp > > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp > > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) > > > NETWORK_MANAGER_DEPENDENCIES += newt > > > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui > > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui > > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_OFONO),y) > > > NETWORK_MANAGER_DEPENDENCIES += ofono > > > -NETWORK_MANAGER_CONF_OPTS += --with-ofono > > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-ofono > > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > > > NETWORK_MANAGER_DEPENDENCIES += systemd > > > NETWORK_MANAGER_CONF_OPTS += \ > > > - --with-systemd-journal \ > > > - --with-config-logging-backend-default=journal \ > > > - --with-session-tracking=systemd \ > > > - --with-suspend-resume=systemd > > > + -Dsystemd_journal=true \ > > > + -Dconfig_logging_backend_default=journal \ > > > + -Dsession_tracking=systemd \ > > > + -Dsuspend_resume=systemd > > > else > > > NETWORK_MANAGER_CONF_OPTS += \ > > > - --without-systemd-journal \ > > > - --with-config-logging-backend-default=syslog \ > > > - --without-session-tracking \ > > > - --with-suspend-resume=upower > > > + -Dsystemd_journal=false \ > > > + -Dconfig_logging_backend_default=syslog \ > > > + -Dsession_tracking=no \ > > > + -Dsuspend_resume=upower \ > > > + -Dsystemdsystemunitdir=no > > > endif > > > > > > ifeq ($(BR2_PACKAGE_POLKIT),y) > > > NETWORK_MANAGER_DEPENDENCIES += polkit > > > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit > > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit > > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_READLINE),y) > > > NETWORK_MANAGER_DEPENDENCIES += readline > > > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli > > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli > > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false > > > endif > > > > > > define NETWORK_MANAGER_INSTALL_INIT_SYSV > > > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD > > > > > > endef > > > > > > -$(eval $(autotools-package)) > > > +$(eval $(meson-package)) > > > -- > > > 2.25.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > From peter at korsgaard.com Fri Jan 28 19:28:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:28:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjpeg: security bump to version 9e In-Reply-To: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 17 Jan 2022 23:30:26 +0100") References: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> Message-ID: <8735l77j94.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > rdgif.c, cderror.h: add sanity check for GIF image dimensions. > Thank to Casper Sun for cjpeg potential vulnerability report. > - Update hash of README (changes not related to license) > - Update indentation in hash file (two spaces) > https://jpegclub.org/reference/reference-sources/ > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 19:33:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:33:13 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.12 In-Reply-To: <20220117113656.234077-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 17 Jan 2022 12:36:56 +0100") References: <20220117113656.234077-1-francois.perrad@gadz.org> Message-ID: <87y22z64g6.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://blog.prosody.im/prosody-0.11.12-released/ > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 19:27:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:27:21 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libjpeg: security bump to version 9e Message-ID: <20220128192734.A3FBC829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0eb0c1bba0876cfa19e83a0d7284aa7431157f05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x rdgif.c, cderror.h: add sanity check for GIF image dimensions. Thank to Casper Sun for cjpeg potential vulnerability report. - Update hash of README (changes not related to license) - Update indentation in hash file (two spaces) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b5e36f80a6629ef5701d4751d7fc6f7dd6a98476) Signed-off-by: Peter Korsgaard --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 4f0a677d04..1a2e82caef 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz -sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README +sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 6b55aba7e5..caf7f05f44 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,12 +4,8 @@ # ################################################################################ -LIBJPEG_VERSION = 9d -# 9d was released 2020-01-12, but the tarball was replaced upstream circa -# 2021-03, causing hash mismatch. Until there is a new version released, -# use our cached copy from s.b.o. -#LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SITE = http://sources.buildroot.org/libjpeg +LIBJPEG_VERSION = 9e +LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README From peter at korsgaard.com Fri Jan 28 19:30:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:30:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/prosody: security bump to 0.11.12 Message-ID: <20220128192734.B416F82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15e3def173ba2013e50ab731560df57d48564e83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x see https://blog.prosody.im/prosody-0.11.12-released/ Signed-off-by: Francois Perrad [Thomas: update separator for license file hash.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 2d99bd8f7e0e3694828820a5ac1e0a09425d571d) Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 10 +++++----- package/prosody/prosody.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index ee459f85d8..b6fa6532a5 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz -sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz -sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz -sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz +md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz +sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz +sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz +sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz # Hash for license file: -sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING +sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7acfa4708d..d697c85568 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.11 +PROSODY_VERSION = 0.11.12 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 19:30:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:30:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/prosody: bump to version 0.11.11 Message-ID: <20220128192734.AC4C982B2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f4a347754ed4f6f1730a38390448ec5f7fe2bfe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit ab9d3bb9900be3106928734274ce67e0a5cbf7b9) Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 4579545e39..ee459f85d8 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 6130b79fb64141909330caf83a79a131 prosody-0.11.10.tar.gz -sha1 4dc8b2f783b43e7a5e781b1fc8aee48b0e106def prosody-0.11.10.tar.gz -sha256 c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1 prosody-0.11.10.tar.gz -sha512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb prosody-0.11.10.tar.gz +md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz +sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz +sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz +sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 0eeb32cd3f..7acfa4708d 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.10 +PROSODY_VERSION = 0.11.11 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 19:27:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:27:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libjpeg: security bump to version 9e Message-ID: <20220128192741.C9618829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2aa5e89e153045e0a54c43b0fa4dc3dbc8ab510a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x rdgif.c, cderror.h: add sanity check for GIF image dimensions. Thank to Casper Sun for cjpeg potential vulnerability report. - Update hash of README (changes not related to license) - Update indentation in hash file (two spaces) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b5e36f80a6629ef5701d4751d7fc6f7dd6a98476) Signed-off-by: Peter Korsgaard --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 4f0a677d04..1a2e82caef 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz -sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README +sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 6b55aba7e5..caf7f05f44 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,12 +4,8 @@ # ################################################################################ -LIBJPEG_VERSION = 9d -# 9d was released 2020-01-12, but the tarball was replaced upstream circa -# 2021-03, causing hash mismatch. Until there is a new version released, -# use our cached copy from s.b.o. -#LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SITE = http://sources.buildroot.org/libjpeg +LIBJPEG_VERSION = 9e +LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README From peter at korsgaard.com Fri Jan 28 19:29:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:29:53 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/prosody: bump to version 0.11.11 Message-ID: <20220128192741.D278582B2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb388212b5f337bff798e4d0af89322658dc9c18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit ab9d3bb9900be3106928734274ce67e0a5cbf7b9) Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 4579545e39..ee459f85d8 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 6130b79fb64141909330caf83a79a131 prosody-0.11.10.tar.gz -sha1 4dc8b2f783b43e7a5e781b1fc8aee48b0e106def prosody-0.11.10.tar.gz -sha256 c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1 prosody-0.11.10.tar.gz -sha512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb prosody-0.11.10.tar.gz +md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz +sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz +sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz +sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 0eeb32cd3f..7acfa4708d 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.10 +PROSODY_VERSION = 0.11.11 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 19:29:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:29:59 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/prosody: security bump to 0.11.12 Message-ID: <20220128192741.DA2EE82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35bd926e18efeffb2351a70333083a84caa47627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x see https://blog.prosody.im/prosody-0.11.12-released/ Signed-off-by: Francois Perrad [Thomas: update separator for license file hash.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 2d99bd8f7e0e3694828820a5ac1e0a09425d571d) Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 10 +++++----- package/prosody/prosody.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index ee459f85d8..b6fa6532a5 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz -sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz -sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz -sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz +md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz +sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz +sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz +sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz # Hash for license file: -sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING +sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7acfa4708d..d697c85568 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.11 +PROSODY_VERSION = 0.11.12 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 20:05:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:05:29 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220118222425.164134-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 18 Jan 2022 23:24:24 +0100") References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Message-ID: <87tudn62ye.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc > 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build > failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, > etc.): > configure:13774: checking whether pthreads work with -pthread > configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 > conftest.c:27:26: error: #error "_REENTRANT must be defined" > 27 | # error "_REENTRANT must be defined" > | ^~~~~ > It should be noted that external bootlins will have to be rebuilt. > Fixes: > - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 > - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 > - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:06:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:06:20 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to version 2.4.3 In-Reply-To: <20220122143253.0CF1C828C8@busybox.osuosl.org> (Thomas Petazzoni's message of "Sat, 22 Jan 2022 15:39:32 +0100") References: <20220122143253.0CF1C828C8@busybox.osuosl.org> Message-ID: <87pmob62wz.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=829bf508bba7df9aee3f86bcd70394ee487b19a6 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 > https://blog.hartwork.org/posts/expat-2-4-3-released > https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes > Signed-off-by: Fabrice Fontaine > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:04:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:04:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed Message-ID: <20220128200131.3158282B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b212e4c605569c484fa7489a3b349143864e4334 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.): configure:13774: checking whether pthreads work with -pthread configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 conftest.c:27:26: error: #error "_REENTRANT must be defined" 27 | # error "_REENTRANT must be defined" | ^~~~~ It should be noted that external bootlins will have to be rebuilt. Fixes: - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 98e39dc80ee81a166df90b4ff3232038a63b759c) [Peter: drop 11.2.0 patch] Signed-off-by: Peter Korsgaard --- ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + From peter at korsgaard.com Fri Jan 28 20:06:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:06:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: security bump to version 2.4.3 Message-ID: <20220128200131.3A70182B40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e16885b3811a827a37a017c493fdb5d9889bdbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 https://blog.hartwork.org/posts/expat-2-4-3-released https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 829bf508bba7df9aee3f86bcd70394ee487b19a6) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 8cf563d8f5..0853c3c76d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ -md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz -sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ +md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz +sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz # Locally calculated -sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb1cfd8c8a..a7ace66095 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.1 +EXPAT_VERSION = 2.4.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Fri Jan 28 20:05:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:05:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: security bump to version 2.4.3 Message-ID: <20220128200136.3E5DC82B40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a800c82206b287e147de5560d146a32f743dd1aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 https://blog.hartwork.org/posts/expat-2-4-3-released https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 829bf508bba7df9aee3f86bcd70394ee487b19a6) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 8cf563d8f5..0853c3c76d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ -md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz -sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ +md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz +sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz # Locally calculated -sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb1cfd8c8a..a7ace66095 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.1 +EXPAT_VERSION = 2.4.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Fri Jan 28 20:05:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:05:18 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed Message-ID: <20220128200136.3524682B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62cdd112374c7a7bf5c83e5872811e5e3d53722c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.): configure:13774: checking whether pthreads work with -pthread configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 conftest.c:27:26: error: #error "_REENTRANT must be defined" 27 | # error "_REENTRANT must be defined" | ^~~~~ It should be noted that external bootlins will have to be rebuilt. Fixes: - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 98e39dc80ee81a166df90b4ff3232038a63b759c) Signed-off-by: Peter Korsgaard --- ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + diff --git a/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + From universeiii at gmx.de Fri Jan 28 20:27:43 2022 From: universeiii at gmx.de (Andreas Ehmanns) Date: Fri, 28 Jan 2022 21:27:43 +0100 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: add config option for custom patches In-Reply-To: <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> References: <20220128145103.3422-1-universeiii@gmx.de> <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> Message-ID: <2d6ae233-5b36-8fd9-3bdf-3c4c01eafc22@gmx.de> On 1/28/22 17:25, Robert Hancock via buildroot wrote: > On Fri, 2022-01-28 at 15:51 +0100, Andreas Ehmanns wrote: >> Many embedded board manufacturer provide their BSP as patches to >> linux kernel and u-boot. They can simply be applied by setting the >> corresponding buildroot config (custom patches). >> Nowadays patches for the arm trusted firmware (ATF) are also part of >> BSP deliveries but there is no config option in buildroot for ATF >> to apply custom patches. >> This patch adds (similar to linux kernel and u-boot) an option to >> apply custom patches to ATF. > Hi Andreas, > > You shouldn't need a custom option to add patches for each package. If you add > patches to $(BR2_EXTERNAL)/patches/arm-trusted-firmware then they will get > applied automatically, we are using this mechanism already. > > I think the specific patch options for the kernel and U-Boot may predate that > mechanism but don't need to be used anymore either. Hi Robert, Hi Yann, I typically store BSP Patches under board///patches// ... This is necessary for me since I have to manage a lot of different embedded boards with buildroot. Every manufacturer has its own patches, often different patches for different boards and also for different releases. A global patch directory does not help because I have to configure in each defconfig which patches from which manufacturer/board/version combination should be applied. For that I use the custom patch option of linux and uboot since a lot of years and it works perfectly for me. So I transferred this mechanism to ATF too. This patch helps me managing all the different combination of BSP versions, therefore I thought it may be helpful for others too. Regards, Andreas >> Signed-off-by: Andreas Ehmanns >> --- >> boot/arm-trusted-firmware/Config.in | 8 +++++++ >> .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ >> 2 files changed, 29 insertions(+) >> >> diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- >> firmware/Config.in >> index b1fc03e10b..786a3083a2 100644 >> --- a/boot/arm-trusted-firmware/Config.in >> +++ b/boot/arm-trusted-firmware/Config.in >> @@ -63,6 +63,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION >> >> endif >> >> +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH >> + string "Custom ATF patches" >> + help >> + A space-separated list of patches to apply to ATF. >> + Each patch can be described as an URL, a local file path, >> + or a directory. In the case of a directory, all files >> + matching *.patch in the directory will be applied. >> + >> config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM >> string "ATF platform" >> help >> diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm- >> trusted-firmware/arm-trusted-firmware.mk >> index 03fa83b7b5..d329bdbfc3 100644 >> --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk >> +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk >> @@ -29,6 +29,27 @@ ifeq >> ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST >> BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) >> endif >> >> +# Analogous code exists in linux/linux.mk. Basically, the generic >> +# package infrastructure handles downloading and applying remote >> +# patches. Local patches are handled depending on whether they are >> +# directories or files. >> +ARM_TRUSTED_FIRMWARE_PATCHES = $(call >> qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH)) >> +ARM_TRUSTED_FIRMWARE_PATCH = $(filter >> https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ >> https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 >> fh66I9s3_Ij- >> rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM >> _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- >> rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) >> + >> +define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES >> + for p in $(filter-out >> https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ >> https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 >> fh66I9s3_Ij- >> rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM >> _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- >> rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) ; do \ >> + if test -d $$p ; then \ >> + $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \ >> + else \ >> + $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || >> exit 1; \ >> + fi \ >> + done >> +endef >> +ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += >> ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES >> + >> +# We have no way to know the hashes for user-supplied patches. >> +BR_NO_CHECK_HASH_FOR += $(notdir $(ARM_TRUSTED_FIRMWARE_PATCHES)) >> + >> ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES >> >> ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) >> -- >> 2.26.2 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://urldefense.com/v3/__https://lists.buildroot.org/mailman/listinfo/buildroot__;!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78CXtWZJI$ From peter at korsgaard.com Fri Jan 28 20:36:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:36:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/luajit: add LUAJIT_CPE_ID_VENDOR In-Reply-To: <20220122220334.266735-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 22 Jan 2022 23:03:34 +0100") References: <20220122220334.266735-1-fontaine.fabrice@gmail.com> Message-ID: <87leyz61hw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:38:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:38:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: replace mod_compress by mod_deflate In-Reply-To: <20220122224935.310100-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 22 Jan 2022 23:49:35 +0100") References: <20220122224935.310100-1-fontaine.fabrice@gmail.com> Message-ID: <87h79n61fb.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > mod_compress has been subsumed by mod_deflate since version 1.4.56 and > https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:41:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:41:30 +0100 Subject: [Buildroot] [git commit] package/libpjsip: security bump to version 2.11.1 In-Reply-To: <20220123194537.DE43C82B40@busybox.osuosl.org> (Yann E. MORIN's message of "Sun, 23 Jan 2022 20:49:34 +0100") References: <20220123194537.DE43C82B40@busybox.osuosl.org> Message-ID: <87czkb61ad.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=2c7ad667ec4a25226848baba809e492ca0ff06da > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Security update. This version is recommended for all users to improve > the security of applications using PJSIP. > Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 > Update indentation in hash file (two spaces) > https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph > https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp > https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr > https://github.com/pjsip/pjproject/releases/tag/2.11 > https://github.com/pjsip/pjproject/releases/tag/2.11.1 > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:44:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:44:23 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml: add TINYXML_CPE_ID_VENDOR In-Reply-To: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 24 Jan 2022 18:23:21 +0100") References: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> Message-ID: <878ruz615k.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:44:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:44:28 +0100 Subject: [Buildroot] [PATCH 2/2] package/tinyxml: fix CVE-2021-42260 In-Reply-To: <20220124172322.2302364-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 24 Jan 2022 18:23:22 +0100") References: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> <20220124172322.2302364-2-fontaine.fabrice@gmail.com> Message-ID: <874k5n615f.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in > tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by > a crafted XML message and leads to a denial of service. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:36:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:36:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/luajit: add LUAJIT_CPE_ID_VENDOR Message-ID: <20220128203942.BD2C0821A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e75d81356be71c79cbe59bd7b9a267ef7f06fb51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d91f454117fafad219948bf1ea86b0d6e2301f76) Signed-off-by: Peter Korsgaard --- package/luajit/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index defa21dd3f..12042cd04b 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -8,6 +8,7 @@ LUAJIT_VERSION = 2.1.2 LUAJIT_SITE = $(call github,moonjit,moonjit,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT +LUAJIT_CPE_ID_VENDOR = luajit LUAJIT_INSTALL_STAGING = YES From peter at korsgaard.com Fri Jan 28 20:37:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:37:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lighttpd: replace mod_compress by mod_deflate Message-ID: <20220128203942.C582882B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb8b3112878c1d57e642ba69c196184eb2000f73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x mod_compress has been subsumed by mod_deflate since version 1.4.56 and https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 653dc2e710534494ea41c68c22a279cf8736b125) Signed-off-by: Peter Korsgaard --- package/lighttpd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index e9a5aa34f0..3e468ce9c8 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -37,13 +37,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB help - Enable zlib support for lighttpd mod_compress. + Enable zlib support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 help - Enable bzip2 support for lighttpd mod_compress. + Enable bzip2 support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" From peter at korsgaard.com Fri Jan 28 20:43:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:43:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tinyxml: add TINYXML_CPE_ID_VENDOR Message-ID: <20220128203942.D7A33821A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1eb773baf6c6c06190a487b590424ffd1d9cded3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 6e46157821f0ad4107e8ddcf039661e9ac189609) Signed-off-by: Peter Korsgaard --- package/tinyxml/tinyxml.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 15280517ac..b8b8e43c05 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,5 +12,6 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README +TINYXML_CPE_ID_VENDOT = tinyxml_project $(eval $(autotools-package)) From peter at korsgaard.com Fri Jan 28 20:41:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:41:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libpjsip: security bump to version 2.11.1 Message-ID: <20220128203942.CE84282B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f448847223b00567c048e152ed37e375eae7ad8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Security update. This version is recommended for all users to improve the security of applications using PJSIP. Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 Update indentation in hash file (two spaces) https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr https://github.com/pjsip/pjproject/releases/tag/2.11 https://github.com/pjsip/pjproject/releases/tag/2.11.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2c7ad667ec4a25226848baba809e492ca0ff06da) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 4 ++-- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 68c2208885..f39ebf4060 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8feec9bcb2..0a93780e93 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.10 +LIBPJSIP_VERSION = 2.11.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Fri Jan 28 20:44:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:44:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tinyxml: fix CVE-2021-42260 Message-ID: <20220128203942.E18B582B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43df60902ce19c3d8f71857be757a8997b9d53ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by a crafted XML message and leads to a denial of service. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b23ef210299ca7f0eedf8fc898b0e5a0f3578293) Signed-off-by: Peter Korsgaard --- ...tamp-always-advance-the-pointer-if-p-0xef.patch | 37 ++++++++++++++++++++++ package/tinyxml/tinyxml.mk | 3 ++ 2 files changed, 40 insertions(+) diff --git a/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch new file mode 100644 index 0000000000..ea0f6476c8 --- /dev/null +++ b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch @@ -0,0 +1,37 @@ +From f7ca0035d17a663f55668e662b840afce7b86112 Mon Sep 17 00:00:00 2001 +From: Christian Voegl +Date: Wed, 27 Oct 2021 11:25:18 +0200 +Subject: [PATCH] In stamp always advance the pointer if *p= 0xef + +The current implementation only advanced if 0xef is followed +by two non-zero bytes. In case of malformed input (0xef should be +the start byte of a three byte character) this leads to an infinite +loop. (CVE-2021-42260) + +[Retrieved (and backported) from: +https://sourceforge.net/p/tinyxml/git/merge-requests/1] +Signed-off-by: Fabrice Fontaine +--- + tinyxmlparser.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 81b7eae..8aa0dfa 100755 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding ) + else + { p +=3; ++col; } // A normal character. + } ++ else ++ { ++ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so ++ // there is something wrong here. Just advance the pointer to evade infinite loops ++ ++p; ++ } + } + else + { +-- +2.34.1 + diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index b8b8e43c05..d173254e31 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -14,4 +14,7 @@ TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README TINYXML_CPE_ID_VENDOT = tinyxml_project +# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch +TINYXML_IGNORE_CVES += CVE-2021-42260 + $(eval $(autotools-package)) From peter at korsgaard.com Fri Jan 28 20:39:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:39:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lighttpd: replace mod_compress by mod_deflate Message-ID: <20220128203949.A137C82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0dab0bd0be3018facc25bcc9227926af59fd0c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x mod_compress has been subsumed by mod_deflate since version 1.4.56 and https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 653dc2e710534494ea41c68c22a279cf8736b125) Signed-off-by: Peter Korsgaard --- package/lighttpd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index e9a5aa34f0..3e468ce9c8 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -37,13 +37,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB help - Enable zlib support for lighttpd mod_compress. + Enable zlib support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 help - Enable bzip2 support for lighttpd mod_compress. + Enable bzip2 support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" From peter at korsgaard.com Fri Jan 28 20:43:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:43:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tinyxml: fix CVE-2021-42260 Message-ID: <20220128203949.BABE182B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55ef8028572f4fc9e9212f8bbe2d5bf7a8f9b71a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by a crafted XML message and leads to a denial of service. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b23ef210299ca7f0eedf8fc898b0e5a0f3578293) Signed-off-by: Peter Korsgaard --- ...tamp-always-advance-the-pointer-if-p-0xef.patch | 37 ++++++++++++++++++++++ package/tinyxml/tinyxml.mk | 3 ++ 2 files changed, 40 insertions(+) diff --git a/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch new file mode 100644 index 0000000000..ea0f6476c8 --- /dev/null +++ b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch @@ -0,0 +1,37 @@ +From f7ca0035d17a663f55668e662b840afce7b86112 Mon Sep 17 00:00:00 2001 +From: Christian Voegl +Date: Wed, 27 Oct 2021 11:25:18 +0200 +Subject: [PATCH] In stamp always advance the pointer if *p= 0xef + +The current implementation only advanced if 0xef is followed +by two non-zero bytes. In case of malformed input (0xef should be +the start byte of a three byte character) this leads to an infinite +loop. (CVE-2021-42260) + +[Retrieved (and backported) from: +https://sourceforge.net/p/tinyxml/git/merge-requests/1] +Signed-off-by: Fabrice Fontaine +--- + tinyxmlparser.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 81b7eae..8aa0dfa 100755 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding ) + else + { p +=3; ++col; } // A normal character. + } ++ else ++ { ++ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so ++ // there is something wrong here. Just advance the pointer to evade infinite loops ++ ++p; ++ } + } + else + { +-- +2.34.1 + diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index b8b8e43c05..d173254e31 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -14,4 +14,7 @@ TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README TINYXML_CPE_ID_VENDOT = tinyxml_project +# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch +TINYXML_IGNORE_CVES += CVE-2021-42260 + $(eval $(autotools-package)) From peter at korsgaard.com Fri Jan 28 20:43:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:43:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tinyxml: add TINYXML_CPE_ID_VENDOR Message-ID: <20220128203949.B17828230F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b22fb63c7f66df5337392f1889764a3885133b6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 6e46157821f0ad4107e8ddcf039661e9ac189609) Signed-off-by: Peter Korsgaard --- package/tinyxml/tinyxml.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 15280517ac..b8b8e43c05 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,5 +12,6 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README +TINYXML_CPE_ID_VENDOT = tinyxml_project $(eval $(autotools-package)) From peter at korsgaard.com Fri Jan 28 20:36:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:36:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/luajit: add LUAJIT_CPE_ID_VENDOR Message-ID: <20220128203949.98D2F8230F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e2ae214fdde95daf104ab8a72df25127a3f98c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d91f454117fafad219948bf1ea86b0d6e2301f76) Signed-off-by: Peter Korsgaard --- package/luajit/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index d2af69d1e3..1f45fb8af0 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -8,6 +8,7 @@ LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT +LUAJIT_CPE_ID_VENDOR = luajit LUAJIT_INSTALL_STAGING = YES From peter at korsgaard.com Fri Jan 28 20:41:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:41:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libpjsip: security bump to version 2.11.1 Message-ID: <20220128203949.A95DA82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9c73096689ea5a5b3bf2b5e020d9e1e77189056 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Security update. This version is recommended for all users to improve the security of applications using PJSIP. Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 Update indentation in hash file (two spaces) https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr https://github.com/pjsip/pjproject/releases/tag/2.11 https://github.com/pjsip/pjproject/releases/tag/2.11.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2c7ad667ec4a25226848baba809e492ca0ff06da) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 4 ++-- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 68c2208885..f39ebf4060 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8feec9bcb2..0a93780e93 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.10 +LIBPJSIP_VERSION = 2.11.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Fri Jan 28 20:50:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:50:20 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-interpipe: bump version to 1.1.8 In-Reply-To: <20220124205811.15913-1-ps.report@gmx.net> (Peter Seiderer's message of "Mon, 24 Jan 2022 21:58:11 +0100") References: <20220124205811.15913-1-ps.report@gmx.net> Message-ID: <87zgnf4mb7.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Changelog (since 1.1.7): > 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element > ddaa9b5 Add conditional build according to GST_VERSION_MINOR > 730dea6 Bump project version > 8718b12 Add initialization for the GstAppSinkCallbacks struct > f015ff7 Remove redundant initialization of new_event callback > 530da92 Update copyright year in README file > e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct > f0f3b8e Fix README copyright date to 2016-2022 > 814982e Merge branch 'hotfix/add-new-event-callback' > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Fri Jan 28 20:52:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 21:52:00 +0100 Subject: [Buildroot] [PATCH 1/2] package/glslsandbox: kms needs gbm Message-ID: <20220128205201.2798205-1-fontaine.fabrice@gmail.com> Obviously, KMS/DRM/GBM needs gbm so add a dependency on libgbm which was added by commit 4a541ee93242e67f7fab625607f5501c6925d451: checking for gbm... no configure: error: Package requirements (gbm) were not met: Package 'gbm', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/31b3fff9748300e293b4efb5615176ccce48dd15 Signed-off-by: Fabrice Fontaine --- package/glslsandbox-player/Config.in | 1 + package/glslsandbox-player/glslsandbox-player.mk | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 3aa6049dfb..e36e8d74c8 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -70,6 +70,7 @@ choice config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS bool "KMS/DRM/GBM" depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index c5fbf062b7..8886788587 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -37,9 +37,7 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-install-scripts endif ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) -# gbm dependency is not needed, as it is normally packaged with -# libegl/libgles drivers. -GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm +GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm libgbm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 20:52:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 21:52:01 +0100 Subject: [Buildroot] [PATCH 2/2] package/libglvnd: bump to version 1.4.0 In-Reply-To: <20220128205201.2798205-1-fontaine.fabrice@gmail.com> References: <20220128205201.2798205-1-fontaine.fabrice@gmail.com> Message-ID: <20220128205201.2798205-2-fontaine.fabrice@gmail.com> - Update hash of README.md (extra paragraph removed with https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/a7bb6f4d19d1258d83c8800af885936a243e07bb) - Update hash of uthash license (year updated with https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/b3a958feb03694e2f0df71482875684e45353964) https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v1.4.0 Signed-off-by: Fabrice Fontaine --- package/libglvnd/libglvnd.hash | 6 +++--- package/libglvnd/libglvnd.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libglvnd/libglvnd.hash b/package/libglvnd/libglvnd.hash index 15e76ea9e8..e463a8def5 100644 --- a/package/libglvnd/libglvnd.hash +++ b/package/libglvnd/libglvnd.hash @@ -1,7 +1,7 @@ # Locally computed -sha256 6332c27f4c792b09a3eb1d7ae18c2d6ff6a0acaf3a746489caf859e659fca2f7 libglvnd-v1.3.2.tar.gz +sha256 c4a884503d2412dc1fa209613aa8a77193aeb7065b823fe1775dc8b6f3e45211 libglvnd-1.4.0.tar.gz # Locally computed hashes for license files -sha256 224534547628a9e5e889d8808385bd38839e6bdb77d89c90ac04dad6891a4f5f README.md -sha256 bebdc0fd27cd37af8406e47af23c113866b7856c3f7349ffcbc672029ec8acf7 src/util/uthash/LICENSE +sha256 f84a3eca98cc5bdf5318741124c38c5e877f856df8c7e229ee5065e5c61038c2 README.md +sha256 e9b9aac8421b6d29176c6f23f6f7a907194245e35ef99ace10839734961cfaa2 src/util/uthash/LICENSE sha256 f6f207863675ca5a5128fd120b9aef4f4bbab73ffa57e5f771ccffc8e3cc56b7 src/util/cJSON/LICENSE diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 3df609f6eb..4149e8b1e6 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBGLVND_VERSION = 1.3.2 -LIBGLVND_SOURCE = libglvnd-v$(LIBGLVND_VERSION).tar.gz -LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$(LIBGLVND_VERSION) +LIBGLVND_VERSION = 1.4.0 +LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/uploads/ca5bf4295beb39bb324f692c481ac8a1 LIBGLVND_LICENSE = \ libglvnd license, \ -- 2.34.1 From peter at korsgaard.com Fri Jan 28 21:03:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:03:53 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name In-Reply-To: <20220126205832.7AB4181906@busybox.osuosl.org> (Thomas Petazzoni's message of "Wed, 26 Jan 2022 22:05:18 +0100") References: <20220126205832.7AB4181906@busybox.osuosl.org> Message-ID: <87v8y34lom.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=07a0d71657323d137bfb33e29311bff29ac58539 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal > with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. > Signed-off-by: Giulio Benetti > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:05:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:05:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR In-Reply-To: <20220123134751.703269-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 23 Jan 2022 14:47:50 +0100") References: <20220123134751.703269-1-fontaine.fabrice@gmail.com> Message-ID: <87r18r4llu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: > > > > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:07:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:07:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/containerd: security bump to version 1.5.9 In-Reply-To: <20220126222309.44ad5b0f@windsurf> (Thomas Petazzoni's message of "Wed, 26 Jan 2022 22:23:09 +0100") References: <20220124071453.16225-1-christian@paral.in> <20220126222309.44ad5b0f@windsurf> Message-ID: <87mtjf4li3.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Sun, 23 Jan 2022 23:14:53 -0800 > Christian Stewart via buildroot wrote: >> CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when >> it is SELinux" >> >> Containers launched through containerd?s CRI implementation on Linux systems >> which use the SELinux security module and containerd versions since v1.5.0 can >> cause arbitrary files and directories on the host to be relabeled to match the >> container process label through the use of specially-configured bind mounts in a >> hostPath volume. This relabeling elevates permissions for the container, >> granting full read/write access over the affected files and directories. >> Kubernetes and crictl can both be configured to use containerd?s CRI >> implementation. >> >> https://github.com/advisories/GHSA-mvff-h3cj-wj9c >> https://github.com/containerd/containerd/releases/tag/v1.5.9 >> >> Signed-off-by: Christian Stewart >> --- >> package/containerd/containerd.hash | 2 +- >> package/containerd/containerd.mk | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) Committed to 2021.11.x, thanks (2021.02.x not affected). -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:04:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:04:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR Message-ID: <20220128210100.525B582B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2784581a7d62a36da07b6460b7ae6f42aa1efd11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c99d84fb9694000a91fa04abc820f3e63a14e7e9) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 0a93780e93..b05cc31a83 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,7 +12,7 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_VENDOR = teluu LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) From peter at korsgaard.com Fri Jan 28 21:03:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:03:18 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name Message-ID: <20220128210100.4742282B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=050acd180c5a256e2f8632a308ccb1ba687cda45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 07a0d71657323d137bfb33e29311bff29ac58539) Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf index 5109625160..157c6a715e 100644 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ b/board/orangepi/orangepi-rk3399/extlinux.conf @@ -1,4 +1,4 @@ -label RK3399_ROCKPRO64 linux +label RK3399_ORANGEPI linux kernel /Image devicetree /rk3399-orangepi.dtb append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait From peter at korsgaard.com Fri Jan 28 20:50:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:50:04 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-interpipe: bump version to 1.1.8 Message-ID: <20220128210100.3DB4482964@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19bfe48a265e8dea3a2f18b24a70435470c48d08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changelog (since 1.1.7): 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element ddaa9b5 Add conditional build according to GST_VERSION_MINOR 730dea6 Bump project version 8718b12 Add initialization for the GstAppSinkCallbacks struct f015ff7 Remove redundant initialization of new_event callback 530da92 Update copyright year in README file e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct f0f3b8e Fix README copyright date to 2016-2022 814982e Merge branch 'hotfix/add-new-event-callback' Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0872ac72b79439a0106768ae2b58e824e1f316da) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 348abdb003..d9f09d2985 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 0fd29d3cba623163dd5852989d7ca21eee9033da9d14a467ccd5e527e3b4297b gst1-interpipe-1.1.7-br1.tar.gz +sha256 b97af0dfa108c5f736a961c388267c7a9c8f915e753985d7e85939091032deed gst1-interpipe-v1.1.8-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index fa4485e6f8..cec23e7fa7 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.7 +GST1_INTERPIPE_VERSION = v1.1.8 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module From peter at korsgaard.com Fri Jan 28 20:49:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:49:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-interpipe: bump version to 1.1.8 Message-ID: <20220128210105.46B5A82964@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9c5056288c8d1214f421b2d1ce181211218a711 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog (since 1.1.7): 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element ddaa9b5 Add conditional build according to GST_VERSION_MINOR 730dea6 Bump project version 8718b12 Add initialization for the GstAppSinkCallbacks struct f015ff7 Remove redundant initialization of new_event callback 530da92 Update copyright year in README file e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct f0f3b8e Fix README copyright date to 2016-2022 814982e Merge branch 'hotfix/add-new-event-callback' Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0872ac72b79439a0106768ae2b58e824e1f316da) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 348abdb003..d9f09d2985 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 0fd29d3cba623163dd5852989d7ca21eee9033da9d14a467ccd5e527e3b4297b gst1-interpipe-1.1.7-br1.tar.gz +sha256 b97af0dfa108c5f736a961c388267c7a9c8f915e753985d7e85939091032deed gst1-interpipe-v1.1.8-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index fa4485e6f8..cec23e7fa7 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.7 +GST1_INTERPIPE_VERSION = v1.1.8 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module From peter at korsgaard.com Fri Jan 28 21:03:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:03:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name Message-ID: <20220128210105.50E0F82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eebadec5d158bb53614c170486c53850cf6e4bad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 07a0d71657323d137bfb33e29311bff29ac58539) Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf index 5109625160..157c6a715e 100644 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ b/board/orangepi/orangepi-rk3399/extlinux.conf @@ -1,4 +1,4 @@ -label RK3399_ROCKPRO64 linux +label RK3399_ORANGEPI linux kernel /Image devicetree /rk3399-orangepi.dtb append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait From peter at korsgaard.com Fri Jan 28 21:06:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:06:46 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/containerd: security bump to version 1.5.9 Message-ID: <20220128210105.6148182B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd140f26cc5a80b24cb60b6a19d8ed0921a7d06e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when it is SELinux" Containers launched through containerd???s CRI implementation on Linux systems which use the SELinux security module and containerd versions since v1.5.0 can cause arbitrary files and directories on the host to be relabeled to match the container process label through the use of specially-configured bind mounts in a hostPath volume. This relabeling elevates permissions for the container, granting full read/write access over the affected files and directories. Kubernetes and crictl can both be configured to use containerd???s CRI implementation. https://github.com/advisories/GHSA-mvff-h3cj-wj9c https://github.com/containerd/containerd/releases/tag/v1.5.9 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 935bd589a356f51e5c97d111877bd2052f0c9da5) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index f1a6709554..d5aafe2e70 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790 containerd-1.5.8.tar.gz +sha256 40c9767af3e87f2c36adf2f563f0a8374e80b30bd2b7aa80058c85912406cef4 containerd-1.5.9.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index cd975db274..8976e12f1a 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.8 +CONTAINERD_VERSION = 1.5.9 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 28 21:04:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:04:03 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR Message-ID: <20220128210105.58CAB82964@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fe6230ee2c92c0322f2a26e61a00b0b9a2f33be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c99d84fb9694000a91fa04abc820f3e63a14e7e9) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 0a93780e93..b05cc31a83 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,7 +12,7 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_VENDOR = teluu LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) From peter at korsgaard.com Fri Jan 28 21:09:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:09:03 +0100 Subject: [Buildroot] [PATCH 1/2] package/docker-engine: bump to version 20.10.12 In-Reply-To: <20220124073711.44684-1-christian@paral.in> (Christian Stewart's message of "Sun, 23 Jan 2022 23:37:10 -0800") References: <20220124073711.44684-1-christian@paral.in> Message-ID: <87ilu34lg0.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Signed-off-by: Christian Stewart Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:09:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/docker-cli: bump to version 20.10.12 In-Reply-To: <20220124073711.44684-2-christian@paral.in> (Christian Stewart's message of "Sun, 23 Jan 2022 23:37:11 -0800") References: <20220124073711.44684-1-christian@paral.in> <20220124073711.44684-2-christian@paral.in> Message-ID: <87ee4r4lfv.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Signed-off-by: Christian Stewart Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:08:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:08:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-cli: bump to version 20.10.12 Message-ID: <20220128210309.4A03B82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42d642acc16c69783a40d1d00d5e5419ae850232 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 70d1858353029d4a45e5f0d4a705b07837736c21) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index fbcda5753e..f2fe316540 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz +sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 0e35a60d43..d5cca34efc 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.11 +DOCKER_CLI_VERSION = 20.10.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Jan 28 21:08:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:08:54 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-engine: bump to version 20.10.12 Message-ID: <20220128210309.3F0B682964@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=177b477df76429571ba3d0957991b5147546476a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 64cf3dc6c46c7b04d5d0ca1c024b9cf3d0efeaf1) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d1323f507d..ec3a242629 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz +sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 45fa7fa53e..2a1239b676 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.11 +DOCKER_ENGINE_VERSION = 20.10.12 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Jan 28 21:08:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:08:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-engine: bump to version 20.10.12 Message-ID: <20220128210314.6E78782B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6f7d795751a16a86026e31432dd48a11c7a3894 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 64cf3dc6c46c7b04d5d0ca1c024b9cf3d0efeaf1) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d1323f507d..ec3a242629 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz +sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 45fa7fa53e..2a1239b676 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.11 +DOCKER_ENGINE_VERSION = 20.10.12 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Jan 28 21:08:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:08:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-cli: bump to version 20.10.12 Message-ID: <20220128210314.7845182B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=deacc25cd63e24614b9d27dae47762b45c205c6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 70d1858353029d4a45e5f0d4a705b07837736c21) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index fbcda5753e..f2fe316540 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz +sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 0e35a60d43..d5cca34efc 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.11 +DOCKER_CLI_VERSION = 20.10.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Jan 28 21:12:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:12:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump to version 0.103.5 In-Reply-To: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 24 Jan 2022 23:10:47 +0100") References: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> Message-ID: <87a6ff4l9o.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > ClamAV 0.103.5 is a critical patch release with the following fix: > - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. > Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with > libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the > clamscan --gen-json option) is enabled. > https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:15:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:15:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4224 In-Reply-To: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 26 Jan 2022 21:37:33 +0100") References: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> Message-ID: <875yq34l4r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository > vim/vim prior to 8.2.4120 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:17:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:17:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongodb: security bump to version 4.2.18 In-Reply-To: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 25 Jan 2022 18:34:22 +0100") References: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> Message-ID: <871r0r4l23.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-20330: An attacker with basic CRUD permissions on a > replicated collection can run the applyOps command with specially > malformed oplog entries, resulting in a potential denial of service on > secondaries. This issue affects MongoDB Server v4.0 versions prior to > 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server > v4.4 versions prior to 4.4.6. > Drop third patch (already in version) > https://docs.mongodb.com/master/release-notes/4.2/ > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:14:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:14:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4224 Message-ID: <20220128211207.AD7BC82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b26a86ffa2e7dd1a2896e0717b890fb8f309046f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository vim/vim prior to 8.2.4120 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d3da56369c75473ee3fac768b86382adcdec3f76) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fff5072063..49056b31cd 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 408b33a409..74ab1ec584 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4092 +VIM_VERSION = 8.2.4224 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 28 21:12:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:12:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/clamav: security bump to version 0.103.5 Message-ID: <20220128211207.A581582A96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e81847715fb0e43cd79ef170d22e94938e16c9ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x ClamAV 0.103.5 is a critical patch release with the following fix: - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the clamscan --gen-json option) is enabled. https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f92c093c7a39b8e0d6754c452268b0af20ef860b) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index d68b04af76..73f4ff88f1 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz +sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 94b589b975..cd2d06e6b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.4 +CLAMAV_VERSION = 0.103.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Fri Jan 28 21:17:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:17:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mongodb: security bump to version 4.2.18 Message-ID: <20220128211207.B619382B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d146485de18f807015a17926918c7c4a02de48a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-20330: An attacker with basic CRUD permissions on a replicated collection can run the applyOps command with specially malformed oplog entries, resulting in a potential denial of service on secondaries. This issue affects MongoDB Server v4.0 versions prior to 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server v4.4 versions prior to 4.4.6. Drop third patch (already in version) https://docs.mongodb.com/master/release-notes/4.2/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 49bbf644d4acd3dfe6f3fd0db39e6fed78abf58f) Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 3b2580cc43..02da8ad452 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 377484a00b..8220999df7 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.11 +MONGODB_VERSION = 4.2.18 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz From peter at korsgaard.com Fri Jan 28 21:12:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:12:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/clamav: security bump to version 0.103.5 Message-ID: <20220128211214.50C2182A96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ece7b2f709aab572304174413c0e495bb016cdcf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x ClamAV 0.103.5 is a critical patch release with the following fix: - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the clamscan --gen-json option) is enabled. https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f92c093c7a39b8e0d6754c452268b0af20ef860b) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index d68b04af76..73f4ff88f1 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz +sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 94b589b975..cd2d06e6b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.4 +CLAMAV_VERSION = 0.103.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Fri Jan 28 21:15:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:15:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.4224 Message-ID: <20220128211214.5872B82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a76cdac04445e8d2003f45522827c7cd959c7a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository vim/vim prior to 8.2.4120 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d3da56369c75473ee3fac768b86382adcdec3f76) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fff5072063..49056b31cd 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 408b33a409..74ab1ec584 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4092 +VIM_VERSION = 8.2.4224 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 28 21:16:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:16:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mongodb: security bump to version 4.2.18 Message-ID: <20220128211214.6063182B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ed039eafbc418b271d24eb16dba5b924d02c914 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-20330: An attacker with basic CRUD permissions on a replicated collection can run the applyOps command with specially malformed oplog entries, resulting in a potential denial of service on secondaries. This issue affects MongoDB Server v4.0 versions prior to 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server v4.4 versions prior to 4.4.6. Drop third patch (already in version) https://docs.mongodb.com/master/release-notes/4.2/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 49bbf644d4acd3dfe6f3fd0db39e6fed78abf58f) Signed-off-by: Peter Korsgaard --- ...-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch | 49 ---------------------- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch b/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch deleted file mode 100644 index 02b35c6e4f..0000000000 --- a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ef08d0dbc99db8c4620512e92bfb3154282eb5d3 Mon Sep 17 00:00:00 2001 -From: Andrew Morrow -Date: Wed, 15 Sep 2021 15:23:42 -0400 -Subject: [PATCH] SERVER-59459 With glibc-2.34, MINSIGSTKSZ is no longer a - constant - -[Retrieved (and backported) from: -https://github.com/mongodb/mongo/commit/ef08d0dbc99db8c4620512e92bfb3154282eb5d3] -Signed-off-by: Fabrice Fontaine ---- - src/mongo/stdx/thread.h | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h -index 7b15bb561bd9..6f1e16cdeb36 100644 ---- a/src/mongo/stdx/thread.h -+++ b/src/mongo/stdx/thread.h -@@ -76,11 +76,19 @@ class SigAltStackController { - } - - private: -+ static size_t _getStackSize() { -+ // It would be nice for this to be a constexpr, but -+ // MINSIGSTKSZ became a macro that invoked `sysconf` in glibc -+ // 2.34. -+ static const std::size_t kMinSigStkSz = MINSIGSTKSZ; -+ return std::max(kMongoMinSignalStackSize, kMinSigStkSz); -+ } -+ - void _install() const { - stack_t ss; - ss.ss_sp = _stackStorage.get(); - ss.ss_flags = 0; -- ss.ss_size = kStackSize; -+ ss.ss_size = _getStackSize(); - if (sigaltstack(&ss, nullptr)) { - abort(); - } -@@ -107,9 +115,7 @@ class SigAltStackController { - // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) - static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; - -- static constexpr std::size_t kStackSize = -- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); -- std::unique_ptr _stackStorage = std::make_unique(kStackSize); -+ std::unique_ptr _stackStorage = std::make_unique(_getStackSize()); - - #else // !MONGO_HAS_SIGALTSTACK - auto makeInstallGuard() const { diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 3b2580cc43..02da8ad452 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index ede03e44d6..8c2e0db2bb 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.11 +MONGODB_VERSION = 4.2.18 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz From peter at korsgaard.com Fri Jan 28 21:21:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:21:14 +0100 Subject: [Buildroot] [PATCH] package/polkit: bump to fix CVE-2021-4034 In-Reply-To: <20220126202236.1399934-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 26 Jan 2022 21:22:36 +0100") References: <20220126202236.1399934-1-yann.morin.1998@free.fr> Message-ID: <87wnij36b9.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > We are currently using the fork by Adam, with support for duktape as a > JS engine. But upstream has finally merged that just a day ago. Woohoo! > Between the fork we were using and upstream, there are very little > changes, mostly centered around: > - translations > - buildsystem > - duktape > - CVE-2021-4034 > So, we just switch to using the HEAD of the repo: it has not much more > than the two important changes: duktape and the CVE fix. > Signed-off-by: Yann E. MORIN > Cc: Marek Belisko > Cc: Adam Duskett > Cc: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Fri Jan 28 21:20:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 22:20:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/keepalived: bump to version 2.2.7 Message-ID: <20220128212005.2899314-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://www.keepalived.org/release-notes/Release-2.2.7.html https://www.keepalived.org/release-notes/Release-2.2.4.html https://www.keepalived.org/release-notes/Release-2.2.3.html https://www.keepalived.org/release-notes/Release-2.2.2.html https://www.keepalived.org/release-notes/Release-2.2.0.html https://www.keepalived.org/release-notes/Release-2.1.5.html Signed-off-by: Fabrice Fontaine --- .../0001-core-Fix-compiling-on-RHEL-9.patch | 34 --------------- ...us-fix-policy-to-not-be-overly-broad.patch | 42 ------------------- package/keepalived/keepalived.hash | 2 +- package/keepalived/keepalived.mk | 5 +-- 4 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch delete mode 100644 package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch diff --git a/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch b/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch deleted file mode 100644 index 39134fcc35..0000000000 --- a/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Tue, 8 Jun 2021 08:57:45 +0100 -Subject: [PATCH] core: Fix compiling on RHEL 9 - -Signed-off-by: Quentin Armitage - -[Retrieved from: -https://github.com/acassen/keepalived/commit/3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d] -Signed-off-by: Fabrice Fontaine ---- - keepalived/core/layer4.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c -index d2cc971a3..fdca04913 100644 ---- a/keepalived/core/layer4.c -+++ b/keepalived/core/layer4.c -@@ -27,13 +27,14 @@ - #include - #include - #include -+#include -+#include - #include - #include - #ifdef ERRQUEUE_NEEDS_SYS_TIME - #include - #endif - #include --#include - - #include "layer4.h" - #include "logger.h" diff --git a/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch deleted file mode 100644 index 6287d6117d..0000000000 --- a/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 -From: Vincent Bernat -Date: Tue, 23 Nov 2021 06:50:59 +0100 -Subject: [PATCH] dbus: fix policy to not be overly broad - -The DBus policy did not restrict the message destination, allowing any -user to inspect and manipulate any property. - -Signed-off-by: Vincent Bernat - -[Retrieved from: -https://github.com/acassen/keepalived/commit/7977fec0be89ae6fe87405b3f8da2f0b5e415e3d] -Signed-off-by: Fabrice Fontaine ---- - keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf -index 2b78a575c..b5ced6085 100644 ---- a/keepalived/dbus/org.keepalived.Vrrp1.conf -+++ b/keepalived/dbus/org.keepalived.Vrrp1.conf -@@ -3,12 +3,15 @@ - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - - -- -- -+ -+ - - -- -- -- -+ -+ -+ - - diff --git a/package/keepalived/keepalived.hash b/package/keepalived/keepalived.hash index 94af43c3e6..9d8ab949b7 100644 --- a/package/keepalived/keepalived.hash +++ b/package/keepalived/keepalived.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 245bf399e4320064996ac5507236a8896f545d005f6c4c3b91701bcbc5728c60 keepalived-2.1.4.tar.gz +sha256 c61940d874154a560a54627ecf7ef47adebdf832164368d10bf242a4d9b7d49d keepalived-2.2.7.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index e31c02dec5..7a1123b4dd 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEEPALIVED_VERSION = 2.1.4 +KEEPALIVED_VERSION = 2.2.7 KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl KEEPALIVED_LICENSE = GPL-2.0+ @@ -12,9 +12,6 @@ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening -# 0002-dbus-fix-policy-to-not-be-overly-broad.patch -KEEPALIVED_IGNORE_CVES += CVE-2021-44225 - ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c KEEPALIVED_CONF_OPTS += --enable-json -- 2.34.1 From peter at korsgaard.com Fri Jan 28 21:19:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:19:59 +0100 Subject: [Buildroot] [git commit] package/polkit: bump to fix CVE-2021-4034 Message-ID: <20220128211521.13EC182B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4aecb964aff92e5cc956b2d3b700ac7841041463 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We are currently using the fork by Adam, with support for duktape as a JS engine. But upstream has finally merged that just a day ago. Woohoo! Between the fork we were using and upstream, there are very little changes, mostly centered around: - translations - buildsystem - duktape - CVE-2021-4034 So, we just switch to using the HEAD of the repo: it has not much more than the two important changes: duktape and the CVE fix. Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index f108ac19ec..1fedb5a707 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz +sha256 243fa69d1e480510c504723487716cda7d6fb588360c7c8f7ec6ba4a3f6ae60e polkit-a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index a7ab725c81..61666594a2 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,13 +4,16 @@ # ################################################################################ -POLKIT_VERSION = 0.120 -POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) +POLKIT_VERSION = a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_INSTALL_STAGING = YES +# Fix was comitted in a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) From peter at korsgaard.com Fri Jan 28 21:22:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:22:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.3 In-Reply-To: <20220127162925.2639638-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 27 Jan 2022 09:29:25 -0700") References: <20220127162925.2639638-1-james.hilliard1@gmail.com> Message-ID: <87sft7368j.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:22:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:22:40 +0100 Subject: [Buildroot] [git commit] package/systemd: bump to version 250.3 Message-ID: <20220128211603.B56408251A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5777d6e725fb4ecc25e16f15ac764de03939202f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index f89b2ce17d..81f51eac20 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 ccfdd97679972cd3d9fb15bc3c647a3ee3351a434e20e1e3eec2851caa1b4849 systemd-250.1.tar.gz +sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 2d3971f31d..5626b54e8e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.1 +SYSTEMD_VERSION = 250.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From fontaine.fabrice at gmail.com Fri Jan 28 21:50:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 22:50:12 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkcs11-helper: drop autoreconf Message-ID: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> autoreconf is not needed since commit dbf8047f64f081ffbc97b67dd891690632377692 as the official tarball already ships a configure file Signed-off-by: Fabrice Fontaine --- package/pkcs11-helper/pkcs11-helper.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 805e000759..90929404be 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -10,7 +10,6 @@ PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/p PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL PKCS11_HELPER_DEPENDENCIES = host-pkgconf -PKCS11_HELPER_AUTORECONF = YES PKCS11_HELPER_INSTALL_STAGING = YES PKCS11_HELPER_CONF_OPTS = \ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 21:50:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 22:50:13 +0100 Subject: [Buildroot] [PATCH 2/2] package/pkcs11-helper: bump to version 1.28 In-Reply-To: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> References: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> Message-ID: <20220128215013.2997212-2-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/OpenSC/pkcs11-helper/releases/tag/pkcs11-helper-1.28 Signed-off-by: Fabrice Fontaine --- .../0001-nss-use-nss-pkcs11-h.patch | 62 ------------------- package/pkcs11-helper/pkcs11-helper.hash | 2 +- package/pkcs11-helper/pkcs11-helper.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch diff --git a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch b/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch deleted file mode 100644 index d0b573446f..0000000000 --- a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d159a5c59c80552c3e8ea75d9bcf29b3a8e8289d Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 30 Jul 2021 20:06:36 +0300 -Subject: [PATCH] nss: use nss pkcs11.h - -make nss happy with its own extensions and non-standard behavior. -[Retrieved (and updated to remove ChangeLog update) from: -https://github.com/OpenSC/pkcs11-helper/pull/39] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 1 + - lib/_pkcs11h-crypto-nss.c | 14 ++++++++++---- - lib/common.h | 7 +++++++ - 3 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/lib/_pkcs11h-crypto-nss.c b/lib/_pkcs11h-crypto-nss.c -index 4b70e826..f57f9e6b 100644 ---- a/lib/_pkcs11h-crypto-nss.c -+++ b/lib/_pkcs11h-crypto-nss.c -@@ -48,15 +48,21 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include "common.h" -- --#include "_pkcs11h-crypto.h" -+#ifdef HAVE_CONFIG_H -+#include -+#endif - - #if defined(ENABLE_PKCS11H_ENGINE_NSS) --#define _PKCS11T_H_ /* required so no conflict with ours */ - #include - #include - -+/* Use PKCS#11 of nss to avoid conflicts and make nss happy with its own extensions */ -+#define PKCS11_H 1 -+ -+#include "common.h" -+ -+#include "_pkcs11h-crypto.h" -+ - static - int - __pkcs11h_crypto_nss_initialize ( -diff --git a/lib/common.h b/lib/common.h -index 61a958af..2499e9c5 100644 ---- a/lib/common.h -+++ b/lib/common.h -@@ -72,5 +72,12 @@ - - #define _PKCS11H_ASSERT assert - -+#ifndef FALSE -+#define FALSE 0 -+#endif -+#ifndef TRUE -+#define TRUE 1 -+#endif -+ - #endif - diff --git a/package/pkcs11-helper/pkcs11-helper.hash b/package/pkcs11-helper/pkcs11-helper.hash index d707bcf914..4114378ab8 100644 --- a/package/pkcs11-helper/pkcs11-helper.hash +++ b/package/pkcs11-helper/pkcs11-helper.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 653730f0c561bbf5941754c0783976113589b2dc64a0661c908dc878bfa4e58b pkcs11-helper-1.27.0.tar.bz2 +sha256 5bd55adafdbb708e096070dd0a910f23e1d5fd6291922398c1a15f00fff2b5ec pkcs11-helper-1.28.0.tar.bz2 sha256 808705ac1daafe07a76431929575c5712a8693977a39ec9102aed25f030754d9 COPYING sha256 865496cf23a6c792739ff2f9ea11e95ac99db89cfe3780a295b4e1495a9c19fe COPYING.BSD sha256 cd2e7d63a11058f19c58b06fb8c759140ce70788369dce6e6e9db40d3475021e COPYING.GPL diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 90929404be..4fc3e21e5a 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -4,7 +4,7 @@ # ################################################################################ -PKCS11_HELPER_VERSION = 1.27 +PKCS11_HELPER_VERSION = 1.28 PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).0.tar.bz2 PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-$(PKCS11_HELPER_VERSION) PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause -- 2.34.1 From peter at korsgaard.com Fri Jan 28 21:58:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:58:04 +0100 Subject: [Buildroot] [PATCH 2021.02.x] package/polkit: backport upstream patch to fix CVE-2021-4034 In-Reply-To: <20220126210226.1689899-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 26 Jan 2022 22:02:26 +0100") References: <20220126210226.1689899-1-yann.morin.1998@free.fr> Message-ID: <87o83v34lv.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Signed-off-by: Yann E. MORIN > Cc: Marek Belisko > Cc: Adam Duskett > Cc: Fabrice Fontaine > --- > ...l-privilege-escalation-CVE-2021-4034.patch | 79 +++++++++++++++++++ > package/polkit/polkit.mk | 3 + > 2 files changed, 82 insertions(+) > create mode 100644 package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch > diff --git a/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch > new file mode 100644 > index 0000000000..8c01eed775 > --- /dev/null > +++ b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch > @@ -0,0 +1,79 @@ > +From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001 > +From: Jan Rybar > +Date: Tue, 25 Jan 2022 17:21:46 +0000 > +Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034) > + Added your s-o-b to make check-package happy and applied to 2021.02.x, thanks! -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:55:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:55:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/polkit: backport upstream patch to fix CVE-2021-4034 Message-ID: <20220128215117.14EC182B53@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90cf9188c96f391ac56788100af326df923b4c37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-local-privilege-escalation-CVE-2021-4034.patch | 80 ++++++++++++++++++++++ package/polkit/polkit.mk | 3 + 2 files changed, 83 insertions(+) diff --git a/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch new file mode 100644 index 0000000000..515fdb81c1 --- /dev/null +++ b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch @@ -0,0 +1,80 @@ +From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001 +From: Jan Rybar +Date: Tue, 25 Jan 2022 17:21:46 +0000 +Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034) + +Signed-off-by: "Yann E. MORIN" +--- + src/programs/pkcheck.c | 5 +++++ + src/programs/pkexec.c | 23 ++++++++++++++++++++--- + 2 files changed, 25 insertions(+), 3 deletions(-) + +diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c +index f1bb4e1..768525c 100644 +--- a/src/programs/pkcheck.c ++++ b/src/programs/pkcheck.c +@@ -363,6 +363,11 @@ main (int argc, char *argv[]) + local_agent_handle = NULL; + ret = 126; + ++ if (argc < 1) ++ { ++ exit(126); ++ } ++ + /* Disable remote file access from GIO. */ + setenv ("GIO_USE_VFS", "local", 1); + +diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c +index 7698c5c..84e5ef6 100644 +--- a/src/programs/pkexec.c ++++ b/src/programs/pkexec.c +@@ -488,6 +488,15 @@ main (int argc, char *argv[]) + pid_t pid_of_caller; + gpointer local_agent_handle; + ++ ++ /* ++ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out. ++ */ ++ if (argc<1) ++ { ++ exit(127); ++ } ++ + ret = 127; + authority = NULL; + subject = NULL; +@@ -614,10 +623,10 @@ main (int argc, char *argv[]) + + path = g_strdup (pwstruct.pw_shell); + if (!path) +- { ++ { + g_printerr ("No shell configured or error retrieving pw_shell\n"); + goto out; +- } ++ } + /* If you change this, be sure to change the if (!command_line) + case below too */ + command_line = g_strdup (path); +@@ -636,7 +645,15 @@ main (int argc, char *argv[]) + goto out; + } + g_free (path); +- argv[n] = path = s; ++ path = s; ++ ++ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated. ++ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination ++ */ ++ if (argv[n] != NULL) ++ { ++ argv[n] = path; ++ } + } + if (access (path, F_OK) != 0) + { +-- +2.25.1 + diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index e00b634b7f..3fd041a813 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -12,6 +12,9 @@ POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES +# 0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ libglib2 host-intltool expat spidermonkey $(TARGET_NLS_DEPENDENCIES) From fontaine.fabrice at gmail.com Fri Jan 28 21:56:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 22:56:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/p11-kit: bump to version 0.24.1 Message-ID: <20220128215657.3023442-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/p11-glue/p11-kit/releases/tag/0.24.1 https://github.com/p11-glue/p11-kit/releases/tag/0.24.0 Signed-off-by: Fabrice Fontaine --- ...ts-c-Add-stdint-h-to-fix-compilation.patch | 28 ------------------- package/p11-kit/p11-kit.hash | 2 +- package/p11-kit/p11-kit.mk | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch diff --git a/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch b/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch deleted file mode 100644 index d4828666d3..0000000000 --- a/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 507c394cfcf4edffc5e4450c5d737e545c26b857 Mon Sep 17 00:00:00 2001 -From: Daniel Engberg -Date: Sat, 12 Dec 2020 18:56:38 +0100 -Subject: [PATCH] p11-kit/lists.c: Add stdint.h to fix compilation - -Add stdint.h otherwise compilation fails on FreeBSD 13-CURRENT with "use of undeclared identifier 'SIZE_MAX'" - -Signed-off-by: Daniel Engberg - -[Retrieved from: -https://github.com/p11-glue/p11-kit/commit/507c394cfcf4edffc5e4450c5d737e545c26b857] -Signed-off-by: Fabrice Fontaine ---- - p11-kit/lists.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/p11-kit/lists.c b/p11-kit/lists.c -index 365a6d89..1d9062be 100644 ---- a/p11-kit/lists.c -+++ b/p11-kit/lists.c -@@ -39,6 +39,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/package/p11-kit/p11-kit.hash b/package/p11-kit/p11-kit.hash index 3481a40b00..e950060c91 100644 --- a/package/p11-kit/p11-kit.hash +++ b/package/p11-kit/p11-kit.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6 p11-kit-0.23.22.tar.xz +sha256 d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8 p11-kit-0.24.1.tar.xz # Locally computed sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 284eb0fa35..868e3a7c9b 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -4,7 +4,7 @@ # ################################################################################ -P11_KIT_VERSION = 0.23.22 +P11_KIT_VERSION = 0.24.1 P11_KIT_SOURCE = p11-kit-$(P11_KIT_VERSION).tar.xz P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION) P11_KIT_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 22:07:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 23:07:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: bump to version 3.14.1 Message-ID: <20220128220738.3028614-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.1 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.0 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.13.0 Signed-off-by: Fabrice Fontaine --- ...001-openssl.c-fix-build-with-wolfssl.patch | 47 ------------------- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch diff --git a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch deleted file mode 100644 index deb1a0f93b..0000000000 --- a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e5c5ed1c64cfc715729c9bfbfdcc4be225f344ff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:32:39 +0200 -Subject: [PATCH] openssl.c: fix build with wolfssl - -Fix the following build failure with wolfssl: - -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new': -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function) - 174 | SSL_CTX_set_ciphersuites(c, tls13_ciphersuites); - | ^~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/d0fb629b40b05ad828775894fabed878692bb222 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/ssl/pull/1] ---- - openssl.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/openssl.c b/openssl.c -index 8f3d8b7..c42638c 100644 ---- a/src/ssl/openssl.c -+++ b/src/ssl/openssl.c -@@ -71,14 +71,14 @@ - "TLS13-AES256-GCM-SHA384:" \ - ecdhe_aead_ciphers - #else --# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -- "TLS_AES_128_GCM_SHA256:" \ -- "TLS_AES_256_GCM_SHA384" -- - # define top_ciphers \ - ecdhe_aead_ciphers - #endif - -+# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -+ "TLS_AES_128_GCM_SHA256:" \ -+ "TLS_AES_256_GCM_SHA384" -+ - #define ecdhe_aead_ciphers \ - "ECDHE-ECDSA-CHACHA20-POLY1305:" \ - "ECDHE-ECDSA-AES128-GCM-SHA256:" \ --- -2.30.2 - diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 98bd6e513b..e4fde4eb64 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz +sha256 512d4abfced0ec916d985d3d1eac7528e6676eecae6aca27fdaf313374e29f16 libuhttpd-3.14.1.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 3a99fe0613..b8cf935d01 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.12.1 +LIBUHTTPD_VERSION = 3.14.1 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Sat Jan 29 00:38:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 28 Jan 2022 17:38:57 -0700 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5webkit: fix build without opengl In-Reply-To: <20220116214955.3231899-2-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> <20220116214955.3231899-2-fontaine.fabrice@gmail.com> Message-ID: On Sun, Jan 16, 2022 at 2:51 PM Fabrice Fontaine wrote: > > Fix the following build failure without opengl raised since bump to > version 5.212.0-alpha4 in commit > df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > CMake Error at Source/cmake/OptionsQt.cmake:592 (message): > Qt with OpenGL support is required for ENABLE_OPENGL > > WebKit2 unconditionally depends on TextureMapperGL.h and tools builds > QtTestBrowser which unconditionally depends on QtOpenGL > > Fixes: > - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed > > Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard > --- > package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 3af1918a46..de3c428fbe 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > # in the archive. > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > > +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) > +QT5WEBKIT_CONF_OPTS += \ > + -DENABLE_OPENGL=ON \ > + -DENABLE_WEBKIT2=ON > +else > +QT5WEBKIT_CONF_OPTS += \ > + -DENABLE_OPENGL=OFF \ > + -DENABLE_WEBKIT2=OFF > +endif > + > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender > endif > @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative > endif > > QT5WEBKIT_CONF_OPTS += \ > + -DENABLE_TOOLS=OFF \ > -DPORT=Qt \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > -DUSE_LIBHYPHEN=OFF > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Sat Jan 29 07:08:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 29 Jan 2022 07:08:15 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-28 Message-ID: <20220129070821.7886340217@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-28 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 56 | 3 | 0 | 59 | 2021.11.x | 24 | 3 | 0 | 27 | master | 95 | 43 | 0 | 138 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 8 efl-1.26.0 | 3 guile-3.0.7 | 3 pulseview-0.4.2 | 3 wavemon-0.9.4 | 3 xvisor-0.3.1 | 3 bluez5_utils-5.63 | 2 cryptsetup-2.4.2 | 2 frr-8.1 | 2 unknown | 2 apitrace-10.0 | 1 google-breakpad-7515ab13768... | 1 htpdate-1.3.3 | 1 libglvnd-1.3.2 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.4 | 1 mongrel2-1.13.0 | 1 qt5base-5.15.2 | 1 rabbitmq-server-3.8.2 | 1 sg3_utils-1.47 | 1 ulog-0389d243352255f6182326... | 1 xml-security-c-2.0.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-10.0 | NOK | http://autobuild.buildroot.net/results/7306bf05962fec30fbe98b1eb8ee09b3162b8080 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/483e199d98055bfaed4bb39d86be43d2399d7e44 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2be71a93e34ed4187d803878140da8ad408ee69b | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/6b634d116e474d250f6eead8c1851a4761753368 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/fba5a691df78bb168984b5cf59587ce8f3270b92 | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/d1b07a9da2572313b1cc5324460b3aea83802b25 | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/aca7ccd8ac96bade59a205c8a1a062cabdad531f | mipsel | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/4cbfb7180715f540b7e6486ab00ba00535726345 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a66804073ad558869148ecbbeca23128658c336c | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b7de1d85ee966b5c3a8a038163b215a856cba6c0 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/3d0087f9d3be37963d471bcafbc1761464a7729a | riscv64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a9beb47a528310541fc65e49d61123d16c450f6f | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c9634ecbe3462430a2a32d08dacf11d63813819c | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/03352427b91e7955351f0887c36077d2ce55effc | ORPH sh4 | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/673dd087f7b8b60668cd7f2d67bf758f2de8c3bf | ORPH sh4 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/41e47f76d7a86b25c9aff1d08beaeb39cb6c9e94 | arm | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/3b2e30d147dbdb4d9e74bd534cad8bb7a28ca1c8 | mips64el | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/80e167f6596aee56f1008f6bb286e3b326ceba89 | mips64el | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/83843238e18b44b1c0c1dedd9b8204e80d8ec8c2 | mips64el | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/7b2b2a07991d955581d8ec035b1d3d08dfc4c5e9 | powerpc | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/9004c1019011286aabda757c6a14ec725c398f4f | arm | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/c762350e8deb6499d3b636e8b9410dc315f188ca | riscv64 | rabbitmq-server-3.8.2 | NOK | http://autobuild.buildroot.net/results/cb5abfef8bb9516860c65bbdc1780f6c67561e87 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d4e193480d9a1c009cd889ccd4610e8601ff1a37 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6601cb785519a9073bdd547f6a3b2d2a3f09aefe | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/eade1c03916e6d644ebc7b8a995a45af99d173f3 | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/784016ef58af2861a7085f2e53965f68823d50b1 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/17a24db93f74a31a455ebe3cc2d6aa0caa08d0a3 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2c9dd75b0da9a288ed33bc0c3d16021825649ad0 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e3dd03bc02aeb8e1b0d9de6ffa153cdb36331114 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1ecbdcb953d96afe9d7efee78bfe395892435a57 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/3517c60fcedd6b060a45255af79486a73cd2666f | powerpc64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/f5cbcd3f762d18e8321a0ba7cb34f21bc4ebfda2 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/01313be3272fe7f40db0395bd446366feaa01718 | arm | unknown | NOK | http://autobuild.buildroot.net/results/e1a586c437bf1ce8e32ca08e922fb87b4cfc1a69 | aarch64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/fee2aaa2f21cfa17ccf37852821d010015ad132b | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/694a892b51530776f810a7b0afc51f4186164d2a | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/03bfb07db28214ad0edcbef140826a1c27d740f4 | arm | xml-security-c-2.0.4 | NOK | http://autobuild.buildroot.net/results/b6065efaa722f2da911c7cf150d446da621e8c71 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/c50b17a15dbaf05e18e3125ddd215296c79434ab | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/e6e2eb7fc6f378d49d61d3609b0a8c07d5ab5d50 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/42dfe2e445b020b6de8e8edcebe4358afcc3fb80 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 1 python-pybind-2.6.1 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/99fe839ac197ec7628c43b9d431595974de61d31 | aarch64 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/9bec461a1c7e35495a191bf28ca203625d67cebf | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/c71492a8e99131863482085166ecea749162d6d4 | Classification of failures by reason for 2021.11.x -------------------------------------------------- nodejs-14.18.2 | 1 openal-1.21.1 | 1 weston-9.0.0 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/1a828fcf92dd6dd3cfba396269825a258a24c3d0 | or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/c3cea7e7267d81c31c8a190137c3264f17872e33 | arm | weston-9.0.0 | NOK | http://autobuild.buildroot.net/results/f00b6197ba93e4581663be73ffb8903f62d81476 | Gitlab CI results for 2022-01-28 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478161 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478164 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478165 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478166 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478168 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478170 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478175 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478176 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478177 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478178 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478179 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478180 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478181 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478182 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478183 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478184 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478185 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478186 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478187 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478188 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478189 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478190 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478191 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478192 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478193 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478194 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478196 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478197 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478198 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478199 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478201 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478202 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478203 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478205 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478207 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478210 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478213 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478216 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478217 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478219 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478220 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478222 | freescale_imx6qsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478236 | freescale_imx6sxsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478238 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478246 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478248 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478255 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478256 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478258 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478260 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478262 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478264 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478266 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478268 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478274 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478270 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478273 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478276 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478278 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478280 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478287 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478298 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478299 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478304 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478305 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478307 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478309 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478310 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478311 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478312 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478314 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478315 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478316 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478319 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478335 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478343 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478353 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478358 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478359 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478362 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478363 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478366 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478368 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478374 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478376 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478377 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478378 | qemu_ppc64_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478400 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478427 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478438 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478440 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478443 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478444 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478445 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478446 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478448 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478450 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478451 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478452 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478457 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478460 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478461 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478478 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478480 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478482 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478491 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478492 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478493 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478494 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478495 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478496 | -- http://autobuild.buildroot.net From peter at korsgaard.com Sat Jan 29 08:30:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 09:30:18 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/polkit: enable selinux policykit module for refpolicy Message-ID: <20220129082339.87A88826DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9a07a5887b422c9459bb6e80770c8a5d6c8514c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This is needed for polkit to work with SELinux. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b89163a067f6fd7d555e102ccbbe389a6dddc52d) Signed-off-by: Peter Korsgaard --- package/polkit/polkit.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index a8b91d21bc..a7ab725c81 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -14,6 +14,8 @@ POLKIT_INSTALL_STAGING = YES POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) +POLKIT_SELINUX_MODULES = policykit + POLKIT_LDFLAGS = $(TARGET_NLS_LIBS) POLKIT_CONF_OPTS = \ From peter at korsgaard.com Sat Jan 29 08:30:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 09:30:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/polkit: bump to version 0.120 Message-ID: <20220129082339.7CED1818AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b6623e47899e788b7e72dda64d3c4ff479fcfe7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Drop upstreamed patches - change the location of polkit.its and polkit.loc to match their new locations. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 079528bb9c887b393ade82032761d0bef867313b) Signed-off-by: Peter Korsgaard --- .../0002-Improve-meson_post_install-script.patch | 124 --------------------- ...undant-computation-of-dbus-data-directory.patch | 35 ------ ...uild-Don-t-require-dbus-development-files.patch | 42 ------- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 6 +- 5 files changed, 4 insertions(+), 205 deletions(-) diff --git a/package/polkit/0002-Improve-meson_post_install-script.patch b/package/polkit/0002-Improve-meson_post_install-script.patch deleted file mode 100644 index 932bf88f59..0000000000 --- a/package/polkit/0002-Improve-meson_post_install-script.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 6c8022392713955c5ae0061e22b50a16a1c2252a Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 15 Jul 2021 12:36:05 +0000 -Subject: [PATCH] Improve meson_post_install script - -[Retrieved from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/6c8022392713955c5ae0061e22b50a16a1c2252a] -Signed-off-by: Fabrice Fontaine ---- - .gitlab-ci.yml | 3 +-- - meson_post_install.py | 58 +++++++++++++++++++++++++++++++++++-------- - 2 files changed, 49 insertions(+), 12 deletions(-) - -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index 8ac3e9f..6d0abb4 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -26,8 +26,6 @@ build_stable: - before_script: - - dnf upgrade -y --nogpgcheck fedora-release fedora-repos* - - dnf update -y && dnf install -y $DEPENDENCIES -- - getent group polkitd >/dev/null || groupadd -r polkitd -- - getent passwd polkitd >/dev/null || useradd -r -g polkitd -d / -s /sbin/nologin -c "User for polkitd" polkitd - - script: - - meson setup -@@ -43,6 +41,7 @@ build_stable: - - meson compile -C builddir - - meson test -C builddir - - meson install -C builddir -+ - DESTDIR=$(pwd)/DESTDIR meson install -C builddir - artifacts: - name: 'test logs' - when: 'always' -diff --git a/meson_post_install.py b/meson_post_install.py -index 0a0fccf..0ab7469 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -1,20 +1,44 @@ - #!/usr/bin/env python3 - --import getpass - import os - import pwd - import sys - -+destdir = os.environ.get('DESTDIR') - prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX'] - --bindir = os.path.join(prefix, sys.argv[1]) --pkgdatadir = os.path.join(prefix, sys.argv[2]) --pkglibdir = os.path.join(prefix, sys.argv[3]) --pkgsysconfdir = os.path.join(prefix, sys.argv[4]) -+def destdir_path(p): -+ if os.path.isabs(p): -+ if destdir is None: -+ return p -+ else: -+ return os.path.join(destdir, os.path.relpath(p, '/')) -+ else: -+ return os.path.join(prefix, p) - --polkitd_uid = pwd.getpwnam(sys.argv[5]).pw_uid -+bindir = destdir_path(sys.argv[1]) -+pkgdatadir = destdir_path(sys.argv[2]) -+pkglibdir = destdir_path(sys.argv[3]) -+pkgsysconfdir = destdir_path(sys.argv[4]) -+polkitd_user = sys.argv[5] - --os.chmod(os.path.join(bindir, 'pkexec'), 0o4775) -+try: -+ polkitd_uid = pwd.getpwnam(polkitd_user).pw_uid -+except KeyError: -+ polkitd_uid = None -+ -+dst = os.path.join(bindir, 'pkexec') -+ -+if os.geteuid() == 0: -+ os.chmod(dst, 0o4755) -+ os.chown(dst, 0, -1) -+else: -+ print( -+ 'Owner and mode of {} need to be setuid root (04755) after ' -+ 'installation'.format( -+ dst, -+ ) -+ ) - - dst_dirs = [ - os.path.join(pkgsysconfdir, 'rules.d'), -@@ -24,13 +48,27 @@ dst_dirs = [ - for dst in dst_dirs: - if not os.path.exists(dst): - os.makedirs(dst, mode=0o700) -- if getpass.getuser() == "root": -+ if os.geteuid() == 0 and polkitd_uid is not None: - os.chown(dst, polkitd_uid, -1) -+ else: -+ print( -+ 'Owner of {} needs to be set to {} after installation'.format( -+ dst, polkitd_user, -+ ) -+ ) - - # polkit-agent-helper-1 need to be setuid root because it's used to - # authenticate not only the invoking user, but possibly also root - # and/or other users. - dst = os.path.join(pkglibdir, 'polkit-agent-helper-1') --os.chmod(dst, 0o4755) --if getpass.getuser() == "root": -+ -+if os.geteuid() == 0: -+ os.chmod(dst, 0o4755) - os.chown(dst, 0, -1) -+else: -+ print( -+ 'Owner and mode of {} need to be setuid root (04755) after ' -+ 'installation'.format( -+ dst, -+ ) -+ ) --- -GitLab - diff --git a/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch b/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch deleted file mode 100644 index 7fce2e10a5..0000000000 --- a/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9fa097f4dde92a0c1675400228b4cb965ed3e123 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 3 Jun 2021 18:55:29 +0100 -Subject: [PATCH] build: Remove redundant computation of dbus data directory - -We were asking pkg-config "if I define ${datadir} to pk_prefix/pk_datadir, -what would ${datadir} be?" but the answer is obviously always going to be -pk_prefix/pk_datadir. - -Signed-off-by: Simon McVittie - -[Retrieved (and slightly updated for duktape fork) from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/9fa097f4dde92a0c1675400228b4cb965ed3e123] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 6a6799e..03a7683 100644 ---- a/meson.build -+++ b/meson.build -@@ -136,8 +136,7 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin - endif - - dbus_dep = dependency('dbus-1') --dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838 --dbus_policydir = dbus_confdir / 'dbus-1/system.d' -+dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' - dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) - - # check OS --- -GitLab - diff --git a/package/polkit/0004-build-Don-t-require-dbus-development-files.patch b/package/polkit/0004-build-Don-t-require-dbus-development-files.patch deleted file mode 100644 index 1b7adbf67f..0000000000 --- a/package/polkit/0004-build-Don-t-require-dbus-development-files.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4bb2157adae620c8b07caf5a24b177d1f90f2fbb Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 3 Jun 2021 18:57:00 +0100 -Subject: [PATCH] build: Don't require dbus development files - -We don't actually need libdbus, only the dbus-daemon's installation -directory for system services, which in practice is always going to be -/usr/share/dbus-1/system-services. - -Signed-off-by: Simon McVittie - -[Retrieved (and slightly updated for duktape fork) from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/4bb2157adae620c8b07caf5a24b177d1f90f2fbb] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 03a7683..539ec7a 100644 ---- a/meson.build -+++ b/meson.build -@@ -135,9 +135,14 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin - js_dep = dependency('mozjs-78') - endif - --dbus_dep = dependency('dbus-1') -+dbus_dep = dependency('dbus-1', required: false) - dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' --dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) -+if dbus_dep.found() -+ dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) -+else -+ # libdbus development files not installed, assume a standard layout -+ dbus_system_bus_services_dir = pk_prefix / pk_datadir / 'dbus-1' / 'system-services' -+endif - - # check OS - host_system = host_machine.system() --- -GitLab - diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index 9677e19bb0..f108ac19ec 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 88d078f1d1f653fd31fe42e46cc3d9b7dd468e70684075e32fe1766dc7ece517 polkit-0.119.tar.gz +sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index ed6f1a5a8f..a8b91d21bc 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -POLKIT_VERSION = 0.119 +POLKIT_VERSION = 0.120 POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING @@ -39,9 +39,9 @@ endif # polkit.{its,loc} are needed for gvfs and must be installed in $(HOST_DIR) # and not $(STAGING_DIR) define POLKIT_INSTALL_ITS - $(INSTALL) -D -m 644 $(@D)/data/polkit.its \ + $(INSTALL) -D -m 644 $(@D)/gettext/its/polkit.its \ $(HOST_DIR)/share/gettext/its/polkit.its - $(INSTALL) -D -m 644 $(@D)/data/polkit.loc \ + $(INSTALL) -D -m 644 $(@D)/gettext/its/polkit.loc \ $(HOST_DIR)/share/gettext/its/polkit.loc endef POLKIT_POST_INSTALL_TARGET_HOOKS += POLKIT_INSTALL_ITS From peter at korsgaard.com Sat Jan 29 08:30:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 09:30:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/polkit: bump to fix CVE-2021-4034 Message-ID: <20220129082339.917AD82707@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1e6c004d0707a3c024356cad0bfc820da9a5ebf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x We are currently using the fork by Adam, with support for duktape as a JS engine. But upstream has finally merged that just a day ago. Woohoo! Between the fork we were using and upstream, there are very little changes, mostly centered around: - translations - buildsystem - duktape - CVE-2021-4034 So, we just switch to using the HEAD of the repo: it has not much more than the two important changes: duktape and the CVE fix. Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4aecb964aff92e5cc956b2d3b700ac7841041463) Signed-off-by: Peter Korsgaard --- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index f108ac19ec..1fedb5a707 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz +sha256 243fa69d1e480510c504723487716cda7d6fb588360c7c8f7ec6ba4a3f6ae60e polkit-a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index a7ab725c81..61666594a2 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,13 +4,16 @@ # ################################################################################ -POLKIT_VERSION = 0.120 -POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) +POLKIT_VERSION = a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_INSTALL_STAGING = YES +# Fix was comitted in a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) From peter at korsgaard.com Sat Jan 29 08:31:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 09:31:24 +0100 Subject: [Buildroot] [PATCH] package/polkit: bump to fix CVE-2021-4034 In-Reply-To: <20220126202236.1399934-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 26 Jan 2022 21:22:36 +0100") References: <20220126202236.1399934-1-yann.morin.1998@free.fr> Message-ID: <87k0ej2bab.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > We are currently using the fork by Adam, with support for duktape as a > JS engine. But upstream has finally merged that just a day ago. Woohoo! > Between the fork we were using and upstream, there are very little > changes, mostly centered around: > - translations > - buildsystem > - duktape > - CVE-2021-4034 > So, we just switch to using the HEAD of the repo: it has not much more > than the two important changes: duktape and the CVE fix. > Signed-off-by: Yann E. MORIN > Cc: Marek Belisko > Cc: Adam Duskett > Cc: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 29 09:42:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 10:42:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo: fix debug build Message-ID: <20220129094222.3583303-1-fontaine.fabrice@gmail.com> There is no --debug mode for cargo resulting in the following build failure in ripgrep since its conversion to cargo infrastructure in commit 342fd3e7350479dc368541ac77a5130ebb53194c: error: Found argument '--debug' which wasn't expected, or isn't valid in this context Fixes: - http://autobuild.buildroot.org/results/772ebdd6a39950457a59419bdc1376cb0e0a3611 Signed-off-by: Fabrice Fontaine --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 614d46ad64..e74a8358bc 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -104,7 +104,7 @@ define $(2)_BUILD_CMDS $$($(2)_CARGO_ENV) \ cargo build \ --offline \ - $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ + $$(if $$(BR2_ENABLE_DEBUG),,--release) \ --manifest-path Cargo.toml \ --locked \ $$($(2)_CARGO_BUILD_OPTS) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 29 10:44:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 11:44:25 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/htpdate: fix static openssl build Message-ID: <20220129104425.3724653-1-fontaine.fabrice@gmail.com> Fix the following static build failure with openssl raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(rec_layer_d1.o): in function `DTLS_RECORD_LAYER_new': rec_layer_d1.c:(.text+0x124): undefined reference to `CRYPTO_malloc' Fixes: - http://autobuild.buildroot.org/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Move pkg-config call in htpdate.mk following upstream feedback: https://github.com/twekkel/htpdate/pull/17 ...BS-to-be-configured-from-environment.patch | 37 +++++++++++++++++++ package/htpdate/htpdate.mk | 4 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch diff --git a/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch new file mode 100644 index 0000000000..6dca2babab --- /dev/null +++ b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch @@ -0,0 +1,37 @@ +From 4ba90fedd553c3b06c925fb6ff5245a5dcabace9 Mon Sep 17 00:00:00 2001 +From: Eddy Vervest +Date: Sat, 29 Jan 2022 10:58:13 +0100 +Subject: [PATCH] Allow SSL_LIBS to be configured from environment + +[Retrieved from: +https://github.com/twekkel/htpdate/commit/4ba90fedd553c3b06c925fb6ff5245a5dcabace9] +Signed-off-by: Fabrice Fontaine +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 4796efa..cf077e6 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,8 +2,9 @@ prefix = $(DESTDIR)/usr + bindir = ${prefix}/sbin + mandir = ${prefix}/share/man + +-CC ?= gcc +-CFLAGS += -Wall -std=c11 -pedantic -O2 ++CC ?= gcc ++CFLAGS += -Wall -std=c11 -pedantic -O2 ++SSL_LIBS ?= -lssl + + INSTALL ?= install -c + STRIP ?= strip -s +@@ -14,7 +15,7 @@ htpdate: htpdate.c + $(CC) $(CFLAGS) -o htpdate htpdate.c + + https: htpdate.c +- $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c -lssl ++ $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c $(SSL_LIBS) + + install: all + $(STRIP) htpdate diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 54b3ec2569..e32480fc85 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -10,7 +10,9 @@ HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = https +HTPDATE_BUILD_OPTS = \ + https \ + SSL_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" HTPDATE_DEPENDENCIES += openssl host-pkgconf endif -- 2.34.1 From peron.clem at gmail.com Sat Jan 29 11:03:49 2022 From: peron.clem at gmail.com (=?UTF-8?B?Q2zDqW1lbnQgUMOpcm9u?=) Date: Sat, 29 Jan 2022 12:03:49 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Your daily results for 2022-01-28 In-Reply-To: <61f4e7d9.1c69fb81.722e5.a0feSMTPIN_ADDED_MISSING@mx.google.com> References: <61f4e7d9.1c69fb81.722e5.a0feSMTPIN_ADDED_MISSING@mx.google.com> Message-ID: Hello Thomas, On Sat, 29 Jan 2022 at 08:08, Thomas Petazzoni wrote: > > Hello, > > Gitlab CI failures > ================== > > Below is a list of Gitlab CI job failures in relation to defconfigs or > runtime tests you are in charge of. Please help us improving the quality > of Buildroot by investigating those build failures and sending patches > to fix them. > > Results for 'master' > -------------------- > > Build failures related to your defconfigs: > > defconfig | link to the job > ----------------------------------+-------------------------------------------------------------- > beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 > > > > Thanks for your contribution to Buildroot! Not related to the content of the email but it seems that since June 2020 the mail format has changed. Before I received email with the To recipient defined like this: To: "Cl?ment P?ron" Now it has been changed to: To: "Cl?ment P?ron " I use GMail as a mail client and the To is no longer properly parsed. See attached original mail and picture attached (If attachment are allowed) Thanks, Clement > > > -- > http://autobuild.buildroot.net -------------- next part -------------- An embedded message was scrubbed... From: Thomas Petazzoni Subject: [autobuild.buildroot.net] Your daily results for 2022-01-28 Date: Sat, 29 Jan 2022 07:08:09 -0000 Size: 4673 URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: mail_parsed_issue.png Type: image/png Size: 16156 bytes Desc: not available URL: From fontaine.fabrice at gmail.com Sat Jan 29 11:07:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 12:07:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix static build with openipmi Message-ID: <20220129110734.3737599-1-fontaine.fabrice@gmail.com> Fix the following static build failure with openipmi raised since commit 8f6b346a34bdb344c4a001d8bd66f5e973013c17: /home/peko/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/libfreeipmi.a(libfreeipmi_la-ipmi-md5.o): in function `md5_init': ipmi-md5.c:(.text+0xa7c): multiple definition of `md5_init'; ../lib/.libs/libipmitool.a(md5.o):md5.c:(.text+0xab0): first defined here Fixes: - http://autobuild.buildroot.org/results/01b22faf08a798ecc5d5465e1c0c13fa024f1096 Signed-off-by: Fabrice Fontaine --- ...-rename-md2-and-md5-functions-macros.patch | 695 ++++++++++++++++++ 1 file changed, 695 insertions(+) create mode 100644 package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch diff --git a/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch new file mode 100644 index 0000000000..0de5b29c9c --- /dev/null +++ b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch @@ -0,0 +1,695 @@ +From 50eeda7f14c4eaa56aa86ba570a47557456544f2 Mon Sep 17 00:00:00 2001 +From: Albert Chu +Date: Wed, 19 Jan 2022 11:55:55 -0800 +Subject: [PATCH] libfreeipmi: rename md2 and md5 functions / macros + +Static compilation with libfreeipmi can lead to problems if +other software has similarly named md2/md5 functions +(such as md5_init()). Prefix all macros and functions with +'ipmi_' as needed. Update all callers accordingly. + +[Retrieved from: +https://github.com/chu11/freeipmi-mirror/commit/50eeda7f14c4eaa56aa86ba570a47557456544f2] +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 11 ++ + libfreeipmi/interface/ipmi-lan-interface.c | 48 +++---- + .../interface/ipmi-rmcpplus-interface.c | 2 +- + libfreeipmi/libcommon/ipmi-md2.c | 72 +++++------ + libfreeipmi/libcommon/ipmi-md2.h | 30 ++--- + libfreeipmi/libcommon/ipmi-md5.c | 64 +++++----- + libfreeipmi/libcommon/ipmi-md5.h | 18 +-- + libfreeipmi/util/ipmi-lan-util.c | 120 +++++++++--------- + 8 files changed, 188 insertions(+), 177 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 883a195cf..60bf8c323 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,14 @@ ++2021-01-19 Albert Chu ++ ++ * libfreeipmi/libcommon/ipmi-md2.h, ++ libfreeipmi/libcommon/ipmi-md2.c, ++ libfreeipmi/libcommon/ipmi-md5.h, ++ libfreeipmi/libcommon/ipmi-md5.c: Static compilation with ++ libfreeipmi can lead to problems if other software has similarly ++ named md2/md5 functions (such as md5_init()). Prefix all macros ++ and functions with 'ipmi_' as needed. Update all callers ++ accordingly. ++ + 2022-01-18 Fabrice Fontaine + + * configure.ac: use pkg-config to find gcrypt +diff --git a/libfreeipmi/interface/ipmi-lan-interface.c b/libfreeipmi/interface/ipmi-lan-interface.c +index 20099d770..658be53e1 100644 +--- a/libfreeipmi/interface/ipmi-lan-interface.c ++++ b/libfreeipmi/interface/ipmi-lan-interface.c +@@ -533,37 +533,37 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_rmcp_hdr, + + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- uint8_t digest[MD2_DIGEST_LENGTH]; ++ ipmi_md2_t ctx; ++ uint8_t digest[IPMI_MD2_DIGEST_LENGTH]; + +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); + +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, session_id_buf, session_id_len); +- md2_update_data (&ctx, msg_data_ptr, msg_data_count); +- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, digest, MD2_DIGEST_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md2_update_data (&ctx, msg_data_ptr, msg_data_count); ++ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, digest, IPMI_MD2_DIGEST_LENGTH); ++ ipmi_md2_init (&ctx); + + memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- uint8_t digest[MD5_DIGEST_LENGTH]; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, session_id_buf, session_id_len); +- md5_update_data (&ctx, msg_data_ptr, msg_data_count); +- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, digest, MD5_DIGEST_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ uint8_t digest[IPMI_MD5_DIGEST_LENGTH]; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md5_update_data (&ctx, msg_data_ptr, msg_data_count); ++ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, digest, IPMI_MD5_DIGEST_LENGTH); ++ ipmi_md5_init (&ctx); + + memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); + } +diff --git a/libfreeipmi/interface/ipmi-rmcpplus-interface.c b/libfreeipmi/interface/ipmi-rmcpplus-interface.c +index 1f462da7e..d1fd0753a 100644 +--- a/libfreeipmi/interface/ipmi-rmcpplus-interface.c ++++ b/libfreeipmi/interface/ipmi-rmcpplus-interface.c +@@ -1134,7 +1134,7 @@ _construct_session_trlr_authentication_code (uint8_t integrity_algorithm, + { + hash_algorithm = IPMI_CRYPT_HASH_MD5; + hash_flags = 0; +- expected_digest_len = MD5_DIGEST_LENGTH; ++ expected_digest_len = IPMI_MD5_DIGEST_LENGTH; + copy_digest_len = IPMI_MD5_128_AUTHENTICATION_CODE_LENGTH; + } + else /* IPMI_INTEGRITY_ALGORITHM_HMAC_SHA256_128 */ +diff --git a/libfreeipmi/libcommon/ipmi-md2.c b/libfreeipmi/libcommon/ipmi-md2.c +index 6e9386be7..076b555bd 100644 +--- a/libfreeipmi/libcommon/ipmi-md2.c ++++ b/libfreeipmi/libcommon/ipmi-md2.c +@@ -101,15 +101,15 @@ static unsigned char S[256] = + 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14 + }; + +-#define L ctx->l +-#define X ctx->x +-#define C ctx->c +-#define M ctx->m +-#define Mlen ctx->mlen +-#define MD2_MAGIC 0xf00fd00d ++#define L ctx->l ++#define X ctx->x ++#define C ctx->c ++#define M ctx->m ++#define Mlen ctx->mlen ++#define IPMI_MD2_MAGIC 0xf00fd00d + + int +-md2_init (md2_t *ctx) ++ipmi_md2_init (ipmi_md2_t *ctx) + { + + if (ctx == NULL) +@@ -118,26 +118,26 @@ md2_init (md2_t *ctx) + return (-1); + } + +- ctx->magic = MD2_MAGIC; ++ ctx->magic = IPMI_MD2_MAGIC; + + L = 0; + Mlen = 0; +- memset (X, '\0', MD2_BUFFER_LENGTH); +- memset (C, '\0', MD2_CHKSUM_LENGTH); +- memset (M, '\0', MD2_BLOCK_LENGTH); ++ memset (X, '\0', IPMI_MD2_BUFFER_LENGTH); ++ memset (C, '\0', IPMI_MD2_CHKSUM_LENGTH); ++ memset (M, '\0', IPMI_MD2_BLOCK_LENGTH); + + return (0); + } + + static void +-_md2_update_digest_and_checksum (md2_t *ctx) ++_ipmi_md2_update_digest_and_checksum (ipmi_md2_t *ctx) + { + unsigned int j, k; + uint8_t c, t; + + /* Update X */ + +- for (j = 0; j < MD2_BLOCK_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) + { + X[16+j] = M[j]; + X[32+j] = (X[16+j] ^ X[j]); +@@ -145,9 +145,9 @@ _md2_update_digest_and_checksum (md2_t *ctx) + + t = 0; + +- for (j = 0; j < MD2_ROUNDS_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_ROUNDS_LENGTH; j++) + { +- for (k = 0; k < MD2_BUFFER_LENGTH; k++) ++ for (k = 0; k < IPMI_MD2_BUFFER_LENGTH; k++) + { + t = X[k] = (X[k] ^ S[t]); + } +@@ -166,7 +166,7 @@ _md2_update_digest_and_checksum (md2_t *ctx) + * Set C[j] to C[j] xor S[c xor L]. + */ + +- for (j = 0; j < MD2_BLOCK_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) + { + c = M[j]; + C[j] = C[j] ^ S[c ^ L]; +@@ -175,10 +175,10 @@ _md2_update_digest_and_checksum (md2_t *ctx) + } + + int +-md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) ++ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen) + { + +- if (ctx == NULL || ctx->magic != MD2_MAGIC || buf == NULL) ++ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC || buf == NULL) + { + errno = EINVAL; + return (-1); +@@ -187,19 +187,19 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) + if (buflen == 0) + return (0); + +- if ((Mlen + buflen) >= MD2_BLOCK_LENGTH) ++ if ((Mlen + buflen) >= IPMI_MD2_BLOCK_LENGTH) + { + unsigned int bufcount; + +- bufcount = (MD2_BLOCK_LENGTH - Mlen); ++ bufcount = (IPMI_MD2_BLOCK_LENGTH - Mlen); + memcpy (M + Mlen, buf, bufcount); +- _md2_update_digest_and_checksum (ctx); ++ _ipmi_md2_update_digest_and_checksum (ctx); + +- while ((buflen - bufcount) >= MD2_BLOCK_LENGTH) ++ while ((buflen - bufcount) >= IPMI_MD2_BLOCK_LENGTH) + { +- memcpy (M, buf + bufcount, MD2_BLOCK_LENGTH); +- bufcount += MD2_BLOCK_LENGTH; +- _md2_update_digest_and_checksum (ctx); ++ memcpy (M, buf + bufcount, IPMI_MD2_BLOCK_LENGTH); ++ bufcount += IPMI_MD2_BLOCK_LENGTH; ++ _ipmi_md2_update_digest_and_checksum (ctx); + } + + Mlen = buflen - bufcount; +@@ -217,33 +217,33 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) + } + + static void +-_md2_append_padding_and_checksum (md2_t *ctx) ++_ipmi_md2_append_padding_and_checksum (ipmi_md2_t *ctx) + { + unsigned int padlen; + int padindex; + +- padlen = MD2_PADDING_LENGTH - Mlen; ++ padlen = IPMI_MD2_PADDING_LENGTH - Mlen; + padindex = padlen - 1; + +- md2_update_data (ctx, padding[padindex], padlen); ++ ipmi_md2_update_data (ctx, padding[padindex], padlen); + +- md2_update_data (ctx, C, MD2_CHKSUM_LENGTH); ++ ipmi_md2_update_data (ctx, C, IPMI_MD2_CHKSUM_LENGTH); + } + + int +-md2_finish (md2_t *ctx, void *digest, unsigned int digestlen) ++ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen) + { +- if (ctx == NULL || ctx->magic != MD2_MAGIC +- || digest == NULL || digestlen < MD2_DIGEST_LENGTH) ++ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC ++ || digest == NULL || digestlen < IPMI_MD2_DIGEST_LENGTH) + { + errno = EINVAL; + return (-1); + } + +- _md2_append_padding_and_checksum (ctx); +- memcpy (digest, X, MD2_DIGEST_LENGTH); ++ _ipmi_md2_append_padding_and_checksum (ctx); ++ memcpy (digest, X, IPMI_MD2_DIGEST_LENGTH); + +- ctx->magic = ~MD2_MAGIC; +- return (MD2_DIGEST_LENGTH); ++ ctx->magic = ~IPMI_MD2_MAGIC; ++ return (IPMI_MD2_DIGEST_LENGTH); + } + +diff --git a/libfreeipmi/libcommon/ipmi-md2.h b/libfreeipmi/libcommon/ipmi-md2.h +index c102fce2c..05328e85e 100644 +--- a/libfreeipmi/libcommon/ipmi-md2.h ++++ b/libfreeipmi/libcommon/ipmi-md2.h +@@ -34,26 +34,26 @@ + + #include + +-#define MD2_BLOCK_LENGTH 16 +-#define MD2_BUFFER_LENGTH 48 +-#define MD2_CHKSUM_LENGTH 16 +-#define MD2_DIGEST_LENGTH 16 +-#define MD2_PADDING_LENGTH 16 +-#define MD2_ROUNDS_LENGTH 18 +- +-typedef struct __md2 { ++#define IPMI_MD2_BLOCK_LENGTH 16 ++#define IPMI_MD2_BUFFER_LENGTH 48 ++#define IPMI_MD2_CHKSUM_LENGTH 16 ++#define IPMI_MD2_DIGEST_LENGTH 16 ++#define IPMI_MD2_PADDING_LENGTH 16 ++#define IPMI_MD2_ROUNDS_LENGTH 18 ++ ++typedef struct __ipmi_md2 { + uint32_t magic; + uint8_t l; + unsigned int mlen; +- uint8_t x[MD2_BUFFER_LENGTH]; +- uint8_t c[MD2_CHKSUM_LENGTH]; +- uint8_t m[MD2_BLOCK_LENGTH]; +-} md2_t; ++ uint8_t x[IPMI_MD2_BUFFER_LENGTH]; ++ uint8_t c[IPMI_MD2_CHKSUM_LENGTH]; ++ uint8_t m[IPMI_MD2_BLOCK_LENGTH]; ++} ipmi_md2_t; + +-int md2_init (md2_t *ctx); ++int ipmi_md2_init (ipmi_md2_t *ctx); + +-int md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen); ++int ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen); + +-int md2_finish (md2_t *ctx, void *digest, unsigned int digestlen); ++int ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen); + + #endif /* IPMI_MD2_H */ +diff --git a/libfreeipmi/libcommon/ipmi-md5.c b/libfreeipmi/libcommon/ipmi-md5.c +index 17073b85f..c84e350a6 100644 +--- a/libfreeipmi/libcommon/ipmi-md5.c ++++ b/libfreeipmi/libcommon/ipmi-md5.c +@@ -92,7 +92,7 @@ static uint32_t T[64] = + #define D ctx->d + #define M ctx->m + #define Mlen ctx->mlen +-#define MD5_MAGIC 0xfb0fdb0d ++#define IPMI_MD5_MAGIC 0xfb0fdb0d + + #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) + #define G(x,y,z) (((x) & (z)) | ((y) & (~(z)))) +@@ -126,7 +126,7 @@ static uint32_t T[64] = + } while (0) + + int +-md5_init (md5_t *ctx) ++ipmi_md5_init (ipmi_md5_t *ctx) + { + if (ctx == NULL) + { +@@ -134,13 +134,13 @@ md5_init (md5_t *ctx) + return (-1); + } + +- ctx->magic = MD5_MAGIC; ++ ctx->magic = IPMI_MD5_MAGIC; + + Mlen = 0; + ctx->bytes_mod_64 = 0; + ctx->bit_count[0] = 0; + ctx->bit_count[1] = 0; +- memset (M, '\0', MD5_BLOCK_LENGTH); ++ memset (M, '\0', IPMI_MD5_BLOCK_LENGTH); + + /* initial values are listed low-order byte first */ + A = 0x67452301; +@@ -152,16 +152,16 @@ md5_init (md5_t *ctx) + } + + static void +-_md5_update_digest (md5_t *ctx) ++_ipmi_md5_update_digest (ipmi_md5_t *ctx) + { + uint32_t AA, BB, CC, DD; +- uint32_t X[MD5_BLOCK_WORDS_LENGTH]; ++ uint32_t X[IPMI_MD5_BLOCK_WORDS_LENGTH]; + unsigned int j; + + /* Note there are no endian issues here, compiler is required to + * handle shifts correctly + */ +- for (j = 0; j < MD5_BLOCK_WORDS_LENGTH; j++) ++ for (j = 0; j < IPMI_MD5_BLOCK_WORDS_LENGTH; j++) + X[j] = ((uint32_t)M[j*4] + | ((uint32_t)M[j*4+1] << 8) + | ((uint32_t)M[j*4+2] << 16) +@@ -251,7 +251,7 @@ _md5_update_digest (md5_t *ctx) + } + + static void +-_md5_update_count (md5_t *ctx, unsigned int buflen) ++_ipmi_md5_update_count (ipmi_md5_t *ctx, unsigned int buflen) + { + + /* Use two uint32_t integers to hold our 64 bit count. +@@ -272,10 +272,10 @@ _md5_update_count (md5_t *ctx, unsigned int buflen) + } + + int +-md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) ++ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen) + { + +- if (ctx == NULL || ctx->magic != MD5_MAGIC || buf == NULL) ++ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC || buf == NULL) + { + errno = EINVAL; + return (-1); +@@ -284,28 +284,28 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) + if (buflen == 0) + return (0); + +- if ((Mlen + buflen) >= MD5_BLOCK_LENGTH) ++ if ((Mlen + buflen) >= IPMI_MD5_BLOCK_LENGTH) + { + unsigned int bufcount; + +- bufcount = (MD5_BLOCK_LENGTH - Mlen); ++ bufcount = (IPMI_MD5_BLOCK_LENGTH - Mlen); + memcpy (M + Mlen, buf, bufcount); +- _md5_update_digest (ctx); +- _md5_update_count (ctx, bufcount); ++ _ipmi_md5_update_digest (ctx); ++ _ipmi_md5_update_count (ctx, bufcount); + +- while ((buflen - bufcount) >= MD5_BLOCK_LENGTH) ++ while ((buflen - bufcount) >= IPMI_MD5_BLOCK_LENGTH) + { +- memcpy (M, buf + bufcount, MD5_BLOCK_LENGTH); +- bufcount += MD5_BLOCK_LENGTH; +- _md5_update_digest (ctx); +- _md5_update_count (ctx, MD5_BLOCK_LENGTH); ++ memcpy (M, buf + bufcount, IPMI_MD5_BLOCK_LENGTH); ++ bufcount += IPMI_MD5_BLOCK_LENGTH; ++ _ipmi_md5_update_digest (ctx); ++ _ipmi_md5_update_count (ctx, IPMI_MD5_BLOCK_LENGTH); + } + + Mlen = buflen - bufcount; + if (Mlen > 0) + { + memcpy (M, buf + bufcount, Mlen); +- _md5_update_count (ctx, Mlen); ++ _ipmi_md5_update_count (ctx, Mlen); + } + } + else +@@ -313,14 +313,14 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) + /* Not enough data to update digest, just copy in data */ + memcpy (M + Mlen, buf, buflen); + Mlen += buflen; +- _md5_update_count (ctx, buflen); ++ _ipmi_md5_update_count (ctx, buflen); + } + + return (buflen); + } + + static void +-_md5_append_padding_and_length (md5_t *ctx) ++_ipmi_md5_append_padding_and_length (ipmi_md5_t *ctx) + { + unsigned int padlen; + char length[8]; +@@ -348,23 +348,23 @@ _md5_append_padding_and_length (md5_t *ctx) + length[6] = (ctx->bit_count[0] & 0x00ff0000) >> 16; + length[7] = (ctx->bit_count[0] & 0xff000000) >> 24; + +- md5_update_data (ctx, padding, padlen); +- md5_update_data (ctx, length, 8); ++ ipmi_md5_update_data (ctx, padding, padlen); ++ ipmi_md5_update_data (ctx, length, 8); + } + + int +-md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) ++ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen) + { +- uint8_t buf[MD5_DIGEST_LENGTH]; ++ uint8_t buf[IPMI_MD5_DIGEST_LENGTH]; + +- if (ctx == NULL || ctx->magic != MD5_MAGIC +- || digest == NULL || digestlen < MD5_DIGEST_LENGTH) ++ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC ++ || digest == NULL || digestlen < IPMI_MD5_DIGEST_LENGTH) + { + errno = EINVAL; + return (-1); + } + +- _md5_append_padding_and_length (ctx); ++ _ipmi_md5_append_padding_and_length (ctx); + + /* Note there are no endian issues here, compiler is required to + * handle bitmasks and shifts correctly +@@ -387,7 +387,7 @@ md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) + buf[14] = (D & 0x00ff0000) >> 16; + buf[15] = (D & 0xff000000) >> 24; + +- memcpy (digest, buf, MD5_DIGEST_LENGTH); +- ctx->magic = ~MD5_MAGIC; +- return (MD5_DIGEST_LENGTH); ++ memcpy (digest, buf, IPMI_MD5_DIGEST_LENGTH); ++ ctx->magic = ~IPMI_MD5_MAGIC; ++ return (IPMI_MD5_DIGEST_LENGTH); + } +diff --git a/libfreeipmi/libcommon/ipmi-md5.h b/libfreeipmi/libcommon/ipmi-md5.h +index 0f86f1754..6b863ef36 100644 +--- a/libfreeipmi/libcommon/ipmi-md5.h ++++ b/libfreeipmi/libcommon/ipmi-md5.h +@@ -34,11 +34,11 @@ + + #include + +-#define MD5_BLOCK_LENGTH 64 +-#define MD5_BLOCK_WORDS_LENGTH (MD5_BLOCK_LENGTH/4) +-#define MD5_DIGEST_LENGTH 16 ++#define IPMI_MD5_BLOCK_LENGTH 64 ++#define IPMI_MD5_BLOCK_WORDS_LENGTH (IPMI_MD5_BLOCK_LENGTH/4) ++#define IPMI_MD5_DIGEST_LENGTH 16 + +-typedef struct __md5 { ++typedef struct __ipmi_md5 { + uint32_t magic; + unsigned int mlen; + unsigned int bytes_mod_64; +@@ -47,13 +47,13 @@ typedef struct __md5 { + uint32_t b; + uint32_t c; + uint32_t d; +- uint8_t m[MD5_BLOCK_LENGTH]; +-} md5_t; ++ uint8_t m[IPMI_MD5_BLOCK_LENGTH]; ++} ipmi_md5_t; + +-int md5_init (md5_t *ctx); ++int ipmi_md5_init (ipmi_md5_t *ctx); + +-int md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen); ++int ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen); + +-int md5_finish (md5_t *ctx, void *digest, unsigned int digestlen); ++int ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen); + + #endif /* IPMI_MD5_H */ +diff --git a/libfreeipmi/util/ipmi-lan-util.c b/libfreeipmi/util/ipmi-lan-util.c +index cd269fcb9..a374acc8d 100644 +--- a/libfreeipmi/util/ipmi-lan-util.c ++++ b/libfreeipmi/util/ipmi-lan-util.c +@@ -281,33 +281,33 @@ ipmi_lan_check_session_authentication_code (fiid_obj_t obj_lan_session_hdr_rs, + + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); +- +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, session_id_buf, session_id_len); +- md2_update_data (&ctx, buf, len); +- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); ++ ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md2_update_data (&ctx, buf, len); ++ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_init (&ctx); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, session_id_buf, session_id_len); +- md5_update_data (&ctx, buf, len); +- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md5_update_data (&ctx, buf, len); ++ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_init (&ctx); + } + } + +@@ -451,45 +451,45 @@ ipmi_lan_check_packet_session_authentication_code (const void *pkt, + memcpy (pwbuf, authentication_code_data, authentication_code_data_len); + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); +- +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, +- pkt + session_id_offset, +- session_id_len); +- md2_update_data (&ctx, +- pkt + data_offset, +- pkt_len - data_offset); +- md2_update_data (&ctx, +- pkt + session_sequence_number_offset, +- session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); ++ ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, ++ pkt + session_id_offset, ++ session_id_len); ++ ipmi_md2_update_data (&ctx, ++ pkt + data_offset, ++ pkt_len - data_offset); ++ ipmi_md2_update_data (&ctx, ++ pkt + session_sequence_number_offset, ++ session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_init (&ctx); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, +- pkt + session_id_offset, +- session_id_len); +- md5_update_data (&ctx, +- pkt + data_offset, +- pkt_len - data_offset); +- md5_update_data (&ctx, +- pkt + session_sequence_number_offset, +- session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, ++ pkt + session_id_offset, ++ session_id_len); ++ ipmi_md5_update_data (&ctx, ++ pkt + data_offset, ++ pkt_len - data_offset); ++ ipmi_md5_update_data (&ctx, ++ pkt + session_sequence_number_offset, ++ session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_init (&ctx); + } + } + else /* authentication_type == IPMI_AUTHENTICATION_TYPE_STRAIGHT_PASSWORD_KEY -- 2.34.1 From peron.clem at gmail.com Sat Jan 29 11:11:23 2022 From: peron.clem at gmail.com (=?UTF-8?B?Q2zDqW1lbnQgUMOpcm9u?=) Date: Sat, 29 Jan 2022 12:11:23 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <73fe7aba-588b-133b-f0a6-960cbefb162f@mind.be> References: <20211106181424.299041-1-peron.clem@gmail.com> <73fe7aba-588b-133b-f0a6-960cbefb162f@mind.be> Message-ID: Hi Arnout, On Tue, 25 Jan 2022 at 21:57, Arnout Vandecappelle wrote: > > Hi Cle?ment, > > On 06/11/2021 19:14, Cl?ment P?ron wrote: > > For the moment Beelink GS1 use a default rootfs size of 60M > > which make sometimes the build failed due to missing space. > > That's surprising... The only thing in the rootfs is busybox, so the rootfs > size should be way less than 1MB, let alone 60MB... > > Also, "sometimes" is suspicious. The rootfs should be almost binary identical > between two builds (there are some dates and paths in there if you don't enable > BR2_REPRODUCIBLE). > > Do you have a bit more detail/example of how it fails? Agree, "Sometimes" is not the proper word, I received two times a mail saying missing space in the target, maybe it was due to a package that was wrongly added by default with some dependencies? (Can't find them again). Anyway 60MiB is really low and I need to change it every time I want to add a graphic stack. I will edit the commit log and send a V2. Regards, Clement > > Regards, > Arnout > > > > > Increase the rootfs size to 120M. > > > > Signed-off-by: Cl?ment P?ron > > --- > > configs/beelink_gs1_defconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > > index e88f3e3b69..1872aabdf0 100644 > > --- a/configs/beelink_gs1_defconfig > > +++ b/configs/beelink_gs1_defconfig > > @@ -24,6 +24,7 @@ BR2_PACKAGE_AUTOSSH=y > > BR2_PACKAGE_DROPBEAR=y > > BR2_TARGET_ROOTFS_EXT2=y > > BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > > > # Firmware > > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y From peron.clem at gmail.com Sat Jan 29 11:12:53 2022 From: peron.clem at gmail.com (=?UTF-8?B?Q2zDqW1lbnQgUMOpcm9u?=) Date: Sat, 29 Jan 2022 12:12:53 +0100 Subject: [Buildroot] [PATCH 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: References: <20211106181424.299041-1-peron.clem@gmail.com> <20211106181424.299041-2-peron.clem@gmail.com> Message-ID: Hi Giulio, On Mon, 17 Jan 2022 at 19:54, Giulio Benetti wrote: > > Hi Cl?ment, > > On 06/11/21 19:14, Cl?ment P?ron wrote: > > libfdt fails to compile with on CI. > > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > > collect2: error: ld returned 1 exit status > > > > Bump U-boot and also Kernel and ATF. > > the commit log and subject doesn't explain that the version bumping(as I > suspect) fix the uboot build failure(as I can interpret). Can you please > improve commit log by specifying that while bumping(u-boot I think) that > error is fixed? Thanks for the review, I will send a V2 Regards, Clement > > And please add: > > Fixes: > the link of the CI failure. > > Thank you > Best regards > -- > Giulio Benetti > Benetti Engineering sas > > > Signed-off-by: Cl?ment P?ron > > --- > > configs/beelink_gs1_defconfig | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > > index 1872aabdf0..ca953df3ea 100644 > > --- a/configs/beelink_gs1_defconfig > > +++ b/configs/beelink_gs1_defconfig > > @@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" > > > > -# Kernel Linux headers same as kernel, a 5.5 series > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y > > +# Kernel Linux headers same as kernel, 5.15 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" > > @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > # Firmware > > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" > > > > # Bootloader > > BR2_TARGET_UBOOT=y > > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" > > BR2_TARGET_UBOOT_NEEDS_DTC=y > > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > > From peron.clem at gmail.com Sat Jan 29 11:17:30 2022 From: peron.clem at gmail.com (=?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?=) Date: Sat, 29 Jan 2022 12:17:30 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beelink_gs1: increase rootfs size to 120M Message-ID: <20220129111731.736265-1-peron.clem@gmail.com> For the moment Beelink GS1 use a default rootfs size of 60M, which is a bit low if you want to add some packages like a graphic stack. Increase the rootfs size to 120M. Reviewed-by: Giulio Benetti Signed-off-by: Cl?ment P?ron --- configs/beelink_gs1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index e88f3e3b69..1872aabdf0 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -24,6 +24,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_DROPBEAR=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -- 2.32.0 From peron.clem at gmail.com Sat Jan 29 11:17:31 2022 From: peron.clem at gmail.com (=?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?=) Date: Sat, 29 Jan 2022 12:17:31 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: <20220129111731.736265-1-peron.clem@gmail.com> References: <20220129111731.736265-1-peron.clem@gmail.com> Message-ID: <20220129111731.736265-2-peron.clem@gmail.com> U-boot libfdt fails to compile on CI. /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 As this fix has been already upstreamed just bump U-boot package. Let's also bump Kernel and ATF as the board is properly supported upstream. Signed-off-by: Cl?ment P?ron --- configs/beelink_gs1_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index 1872aabdf0..ca953df3ea 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -# Kernel Linux headers same as kernel, a 5.5 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y +# Kernel Linux headers same as kernel, 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.32.0 From giulio.benetti at benettiengineering.com Sat Jan 29 11:22:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 12:22:17 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: <20220129111731.736265-2-peron.clem@gmail.com> References: <20220129111731.736265-2-peron.clem@gmail.com> Message-ID: <6757E6B9-1D89-4E85-8C96-87CA1F111835@benettiengineering.com> Hi Cl?ment, > Il giorno 29 gen 2022, alle ore 12:18, Cl?ment P?ron ha scritto: > > ?U-boot libfdt fails to compile on CI. > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 > > As this fix has been already upstreamed just bump U-boot package. > > Let's also bump Kernel and ATF as the board is properly supported upstream. > > Signed-off-by: Cl?ment P?ron Reviewed-by: Giulio Benetti Best regards Giulio > --- > configs/beelink_gs1_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index 1872aabdf0..ca953df3ea 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" > > -# Kernel Linux headers same as kernel, a 5.5 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y > +# Kernel Linux headers same as kernel, 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" > @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" > > # Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From michael at amarulasolutions.com Sat Jan 29 13:03:54 2022 From: michael at amarulasolutions.com (Michael Trimarchi) Date: Sat, 29 Jan 2022 14:03:54 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO Message-ID: <20220129130354.1094543-1-michael@amarulasolutions.com> Add initial support for iMX8MN BSH SMM S2 PRO board: - Linux: v5.17-rc1 - Uboot 2022-01-rc1 (reference tree) - Default packages from buildroot Cc: Ariel D'Alessandro Cc: Jagan Teki Signed-off-by: Michael Trimarchi --- DEVELOPERS | 2 + board/bsh/bsh-imx8mn/extlinux.conf | 4 ++ board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ board/bsh/bsh-imx8mn/post-image.sh | 3 ++ board/bsh/bsh-imx8mn/readme.txt | 60 ++++++++++++++++++++++++++++++ configs/bsh_smms2pro_defconfig | 42 +++++++++++++++++++++ 7 files changed, 135 insertions(+) create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg create mode 100755 board/bsh/bsh-imx8mn/post-build.sh create mode 100755 board/bsh/bsh-imx8mn/post-image.sh create mode 100644 board/bsh/bsh-imx8mn/readme.txt create mode 100644 configs/bsh_smms2pro_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..fc66fb6b83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig F: configs/snps_archs38_vdk_defconfig N: Ariel D'Alessandro +F: board/bsh/ F: package/axfsutils/ F: package/mali-t76x/ @@ -2018,6 +2019,7 @@ F: package/python-crc16/ F: package/python-pyzmq/ N: Michael Trimarchi +F: board/bsh/ F: package/python-spidev/ N: Michael Vetter diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf new file mode 100644 index 0000000000..9111354742 --- /dev/null +++ b/board/bsh/bsh-imx8mn/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg new file mode 100644 index 0000000000..4a0aa117fb --- /dev/null +++ b/board/bsh/bsh-imx8mn/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "imx8-boot-sd.bin" + offset = 33K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/bsh/bsh-imx8mn/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh new file mode 100755 index 0000000000..3452fd4501 --- /dev/null +++ b/board/bsh/bsh-imx8mn/post-image.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt new file mode 100644 index 0000000000..b84f2ff4be --- /dev/null +++ b/board/bsh/bsh-imx8mn/readme.txt @@ -0,0 +1,60 @@ +How to build it +=============== + +Configure buildroot: + + $ make bsh_smms2pro_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and buildr the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? Image + ??? imx8-boot-sd.bin + ??? imx8mn-bsh-smm-s2pro.dtb + ??? ddr_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot.itb + ??? u-boot-nodtb.bin + ??? u-boot-spl.bin + ??? u-boot-spl-ddr.bin + + +Flashing the emmc card image +========================== + +To install the image on on eMMC + + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img + + +Preparing the board +=================== + + * Connect a serial line to the board + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig new file mode 100644 index 0000000000..5f58d184b2 --- /dev/null +++ b/configs/bsh_smms2pro_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/bsh/bsh-imx8mn/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -- 2.25.1 From giulio.benetti at benettiengineering.com Sat Jan 29 13:32:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 14:32:21 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <20220129130354.1094543-1-michael@amarulasolutions.com> References: <20220129130354.1094543-1-michael@amarulasolutions.com> Message-ID: <00DCA0AA-C62D-4A45-8DDF-7E275F75047C@benettiengineering.com> Hi Michael, Ariel, happy to meet you here :-), > Il giorno 29 gen 2022, alle ore 14:04, Michael Trimarchi ha scritto: > > ?Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 > - Uboot 2022-01-rc1 (reference tree) I?m not very sure it?s a good idea using an -rc1 version. I see 3 chances: 1) backport to previous versions(it would be a mess) 2) wait until v5.17 is released in 7 weeks :-/ 3) keep as is while someone else gives his Tested-by: For example Ariel, that will also be one of the two maintainers of this board as I read below. And later bump uboot and Linux versions as soon as they are released. > - Default packages from buildroot Here please specify a https URL for the board like this: https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > > Cc: Ariel D'Alessandro > Cc: Jagan Teki > Signed-off-by: Michael Trimarchi > --- > DEVELOPERS | 2 + > board/bsh/bsh-imx8mn/extlinux.conf | 4 ++ > board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > board/bsh/bsh-imx8mn/readme.txt | 60 ++++++++++++++++++++++++++++++ > configs/bsh_smms2pro_defconfig | 42 +++++++++++++++++++++ > 7 files changed, 135 insertions(+) > create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > create mode 100644 board/bsh/bsh-imx8mn/readme.txt > create mode 100644 configs/bsh_smms2pro_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index fe8de1916e..fc66fb6b83 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > F: configs/snps_archs38_vdk_defconfig > > N: Ariel D'Alessandro > +F: board/bsh/ > F: package/axfsutils/ > F: package/mali-t76x/ > > @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > F: package/python-pyzmq/ > > N: Michael Trimarchi > +F: board/bsh/ > F: package/python-spidev/ > > N: Michael Vetter > diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > new file mode 100644 > index 0000000000..9111354742 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > new file mode 100644 > index 0000000000..4a0aa117fb > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/genimage.cfg > @@ -0,0 +1,17 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "imx8-boot-sd.bin" > + offset = 33K > + } > + > + partition rootfs { > + offset = 8M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > new file mode 100755 > index 0000000000..3452fd4501 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-image.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > new file mode 100644 > index 0000000000..b84f2ff4be > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/readme.txt > @@ -0,0 +1,60 @@ > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make bsh_smms2pro_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and buildr the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? Image > + ??? imx8-boot-sd.bin > + ??? imx8mn-bsh-smm-s2pro.dtb > + ??? ddr_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot.itb > + ??? u-boot-nodtb.bin > + ??? u-boot-spl.bin > + ??? u-boot-spl-ddr.bin > + > + > +Flashing the emmc card image > +========================== > + > +To install the image on on eMMC > + > + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > new file mode 100644 > index 0000000000..5f58d184b2 > --- /dev/null > +++ b/configs/bsh_smms2pro_defconfig > @@ -0,0 +1,42 @@ > +BR2_aarch64=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/bsh/bsh-imx8mn/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" This ^^^ wip name doesn?t sound that good to me. Ariel, is it possible to give a tag with a version like v0.1? So something shorter and more clear. > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" > +BR2_TARGET_UBOOT_SPL=y Have you given a go with latest Buildroot docker to check if uboot needs libfdtpy, python3 etc.? It?s highly probable it needs them. Kind regards ?- Giulio Benetti Benetti Engineering sas > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From michael at amarulasolutions.com Sat Jan 29 13:38:29 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sat, 29 Jan 2022 14:38:29 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <00DCA0AA-C62D-4A45-8DDF-7E275F75047C@benettiengineering.com> References: <20220129130354.1094543-1-michael@amarulasolutions.com> <00DCA0AA-C62D-4A45-8DDF-7E275F75047C@benettiengineering.com> Message-ID: Hi Giulio On Sat, Jan 29, 2022 at 2:32 PM Giulio Benetti wrote: > > Hi Michael, Ariel, > > happy to meet you here :-), > > Il giorno 29 gen 2022, alle ore 14:04, Michael Trimarchi ha scritto: > > ?Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 > - Uboot 2022-01-rc1 (reference tree) > > > I?m not very sure it?s a good idea using an -rc1 version. I see 3 chances: > 1) backport to previous versions(it would be a mess) > 2) wait until v5.17 is released in 7 weeks :-/ > 3) keep as is while someone else gives his Tested-by: Well, only a few people can test it. I will wait Ariel > For example Ariel, that will also be one of the two maintainers of this board as I read below. > And later bump uboot and Linux versions as soon as they are released. > uboot is there for a while. I have other board that get their uboot source from gitlab or other download point. I think that we need to ensure a valid commit point. I should maybe force uboot to a specific one > - Default packages from buildroot > > > Here please specify a https URL for the board like this: > https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > Ok > > Cc: Ariel D'Alessandro > Cc: Jagan Teki > Signed-off-by: Michael Trimarchi > --- > DEVELOPERS | 2 + > board/bsh/bsh-imx8mn/extlinux.conf | 4 ++ > board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > board/bsh/bsh-imx8mn/readme.txt | 60 ++++++++++++++++++++++++++++++ > configs/bsh_smms2pro_defconfig | 42 +++++++++++++++++++++ > 7 files changed, 135 insertions(+) > create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > create mode 100644 board/bsh/bsh-imx8mn/readme.txt > create mode 100644 configs/bsh_smms2pro_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index fe8de1916e..fc66fb6b83 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > F: configs/snps_archs38_vdk_defconfig > > N: Ariel D'Alessandro > +F: board/bsh/ > F: package/axfsutils/ > F: package/mali-t76x/ > > @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > F: package/python-pyzmq/ > > N: Michael Trimarchi > +F: board/bsh/ > F: package/python-spidev/ > > N: Michael Vetter > diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > new file mode 100644 > index 0000000000..9111354742 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > new file mode 100644 > index 0000000000..4a0aa117fb > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/genimage.cfg > @@ -0,0 +1,17 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "imx8-boot-sd.bin" > + offset = 33K > + } > + > + partition rootfs { > + offset = 8M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > new file mode 100755 > index 0000000000..3452fd4501 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-image.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > new file mode 100644 > index 0000000000..b84f2ff4be > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/readme.txt > @@ -0,0 +1,60 @@ > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make bsh_smms2pro_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and buildr the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? Image > + ??? imx8-boot-sd.bin > + ??? imx8mn-bsh-smm-s2pro.dtb > + ??? ddr_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot.itb > + ??? u-boot-nodtb.bin > + ??? u-boot-spl.bin > + ??? u-boot-spl-ddr.bin > + > + > +Flashing the emmc card image > +========================== > + > +To install the image on on eMMC > + > + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > new file mode 100644 > index 0000000000..5f58d184b2 > --- /dev/null > +++ b/configs/bsh_smms2pro_defconfig > @@ -0,0 +1,42 @@ > +BR2_aarch64=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/bsh/bsh-imx8mn/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" > > > This ^^^ wip name doesn?t sound that good to me. Ariel, is it possible to give a tag with a version like v0.1? So something shorter and more clear. > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" > +BR2_TARGET_UBOOT_SPL=y > > > Have you given a go with latest Buildroot docker to check if uboot needs libfdtpy, python3 etc.? > It?s highly probable it needs them. Suggestion, should be given to the other newest board that was added. I think that you are talking about host-tools here. Please point me to this buildroot docker Michael > > Kind regards > ?- > Giulio Benetti > Benetti Engineering sas > > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From giulio.benetti at benettiengineering.com Sat Jan 29 13:54:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 14:54:26 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: Message-ID: <6D05417C-EE4C-4145-BDB2-5CD9AC5A39A5@benettiengineering.com> Hi Michael, > Il giorno 29 gen 2022, alle ore 14:38, Michael Nazzareno Trimarchi ha scritto: > > ?Hi Giulio > >> On Sat, Jan 29, 2022 at 2:32 PM Giulio Benetti >> wrote: >> >> Hi Michael, Ariel, >> >> happy to meet you here :-), >> >> Il giorno 29 gen 2022, alle ore 14:04, Michael Trimarchi ha scritto: >> >> ?Add initial support for iMX8MN BSH SMM S2 PRO board: >> >> - Linux: v5.17-rc1 >> - Uboot 2022-01-rc1 (reference tree) >> >> >> I?m not very sure it?s a good idea using an -rc1 version. I see 3 chances: >> 1) backport to previous versions(it would be a mess) >> 2) wait until v5.17 is released in 7 weeks :-/ >> 3) keep as is while someone else gives his Tested-by: > > Well, only a few people can test it. I will wait Ariel Ok > >> For example Ariel, that will also be one of the two maintainers of this board as I read below. >> And later bump uboot and Linux versions as soon as they are released. >> > > uboot is there for a while. I have other board that get their uboot > source from gitlab or other download point. > I think that we need to ensure a valid commit point. I should maybe > force uboot to a specific one +1 > >> - Default packages from buildroot >> >> >> Here please specify a https URL for the board like this: >> https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ >> > > Ok > >> >> Cc: Ariel D'Alessandro >> Cc: Jagan Teki >> Signed-off-by: Michael Trimarchi >> --- >> DEVELOPERS | 2 + >> board/bsh/bsh-imx8mn/extlinux.conf | 4 ++ >> board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ >> board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ >> board/bsh/bsh-imx8mn/post-image.sh | 3 ++ >> board/bsh/bsh-imx8mn/readme.txt | 60 ++++++++++++++++++++++++++++++ >> configs/bsh_smms2pro_defconfig | 42 +++++++++++++++++++++ >> 7 files changed, 135 insertions(+) >> create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf >> create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg >> create mode 100755 board/bsh/bsh-imx8mn/post-build.sh >> create mode 100755 board/bsh/bsh-imx8mn/post-image.sh >> create mode 100644 board/bsh/bsh-imx8mn/readme.txt >> create mode 100644 configs/bsh_smms2pro_defconfig >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index fe8de1916e..fc66fb6b83 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig >> F: configs/snps_archs38_vdk_defconfig >> >> N: Ariel D'Alessandro >> +F: board/bsh/ >> F: package/axfsutils/ >> F: package/mali-t76x/ >> >> @@ -2018,6 +2019,7 @@ F: package/python-crc16/ >> F: package/python-pyzmq/ >> >> N: Michael Trimarchi >> +F: board/bsh/ >> F: package/python-spidev/ >> >> N: Michael Vetter >> diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf >> new file mode 100644 >> index 0000000000..9111354742 >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/extlinux.conf >> @@ -0,0 +1,4 @@ >> +label buildroot >> + kernel /boot/Image >> + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb >> + append root=PARTUUID=%PARTUUID% rootwait rw >> diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg >> new file mode 100644 >> index 0000000000..4a0aa117fb >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/genimage.cfg >> @@ -0,0 +1,17 @@ >> +image sdcard.img { >> + hdimage { >> + partition-table-type = "gpt" >> + } >> + >> + partition imx-boot { >> + in-partition-table = "no" >> + image = "imx8-boot-sd.bin" >> + offset = 33K >> + } >> + >> + partition rootfs { >> + offset = 8M >> + image = "rootfs.ext4" >> + partition-uuid = %PARTUUID% >> + } >> +} >> diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh >> new file mode 100755 >> index 0000000000..bf8861f6a9 >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/post-build.sh >> @@ -0,0 +1,7 @@ >> +#!/bin/sh >> +BOARD_DIR="$(dirname $0)" >> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >> + >> +install -d "$TARGET_DIR/boot/extlinux/" >> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >> diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh >> new file mode 100755 >> index 0000000000..3452fd4501 >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/post-image.sh >> @@ -0,0 +1,3 @@ >> +#!/bin/sh >> + >> +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg >> diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt >> new file mode 100644 >> index 0000000000..b84f2ff4be >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/readme.txt >> @@ -0,0 +1,60 @@ >> +How to build it >> +=============== >> + >> +Configure buildroot: >> + >> + $ make bsh_smms2pro_defconfig >> + >> +Change settings to fit your needs (optional): >> + >> + $ make menuconfig >> + >> +Compile everything and buildr the rootfs image: >> + >> + $ make >> + >> + >> +Result of the build >> +=================== >> + >> +After building, the output/images directory contains: >> + >> + output/images/ >> + ??? bl31.bin >> + ??? boot.scr >> + ??? ddr_fw.bin >> + ??? Image >> + ??? imx8-boot-sd.bin >> + ??? imx8mn-bsh-smm-s2pro.dtb >> + ??? ddr_fw.bin >> + ??? rootfs.ext2 >> + ??? rootfs.ext4 -> rootfs.ext2 >> + ??? rootfs.tar >> + ??? sdcard.img >> + ??? u-boot.bin >> + ??? u-boot.itb >> + ??? u-boot-nodtb.bin >> + ??? u-boot-spl.bin >> + ??? u-boot-spl-ddr.bin >> + >> + >> +Flashing the emmc card image >> +========================== >> + >> +To install the image on on eMMC >> + >> + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img >> + >> + >> +Preparing the board >> +=================== >> + >> + * Connect a serial line to the board >> + * Power-up the board >> + >> + >> +Booting the board >> +================= >> + >> +By default the bootloader will search for the first valid image, starting >> +with the internal eMMC. >> diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig >> new file mode 100644 >> index 0000000000..5f58d184b2 >> --- /dev/null >> +++ b/configs/bsh_smms2pro_defconfig >> @@ -0,0 +1,42 @@ >> +BR2_aarch64=y >> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/bsh/bsh-imx8mn/post-build.sh" >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" >> >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" >> >> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" >> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_PACKAGE_FREESCALE_IMX=y >> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y >> +BR2_PACKAGE_FIRMWARE_IMX=y >> +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" >> +BR2_TARGET_UBOOT=y >> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> +BR2_TARGET_UBOOT_CUSTOM_GIT=y >> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" >> >> >> This ^^^ wip name doesn?t sound that good to me. Ariel, is it possible to give a tag with a version like v0.1? So something shorter and more clear. >> >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" >> +BR2_TARGET_UBOOT_SPL=y >> >> >> Have you given a go with latest Buildroot docker to check if uboot needs libfdtpy, python3 etc.? >> It?s highly probable it needs them. > > Suggestion, should be given to the other newest board that was added. Correct, I?m going to check my latest board reviews about this > I think that you are talking about > host-tools here. Yes > Please point me to this buildroot docker https://hub.docker.com/r/buildroot/base/tags # docker pull buildroot/base:20211120.1925 Best regards ?- Giulio Benetti Benetti Engineering sas > > Michael > >> >> Kind regards >> ?- >> Giulio Benetti >> Benetti Engineering sas >> >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_IMX_MKIMAGE=y >> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > > > -- > Michael Nazzareno Trimarchi > Co-Founder & Chief Executive Officer > M. +39 347 913 2170 > michael at amarulasolutions.com > __________________________________ > > Amarula Solutions BV > Joop Geesinkweg 125, 1114 AB, Amsterdam, NL > T. +31 (0)85 111 9172 > info at amarulasolutions.com > www.amarulasolutions.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From michael at amarulasolutions.com Sat Jan 29 14:08:31 2022 From: michael at amarulasolutions.com (Michael Trimarchi) Date: Sat, 29 Jan 2022 15:08:31 +0100 Subject: [Buildroot] [PATCH] package/freescale-imx: Add installation of easrc-imx8mn.bin firmware Message-ID: <20220129140831.1284832-1-michael@amarulasolutions.com> The easrc firmware is used for audio resampling. The firmware for now exists only for imx8mn device Signed-off-by: Michael Trimarchi --- package/freescale-imx/firmware-imx/Config.in | 4 ++++ package/freescale-imx/firmware-imx/firmware-imx.mk | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index df266fb28e..06c4d8036c 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -39,6 +39,10 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW bool default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EASRC_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EPDC_FW bool default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 3acd053d0f..211a43c4ca 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -113,6 +113,17 @@ define FIRMWARE_IMX_INSTALL_IMAGE_HDMI_FW endef endif +# +# EASRC firmware +# + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EASRC_FW),y) +define FIRMWARE_IMX_INSTALL_TARGET_EASRC_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx + cp -r $(@D)/firmware/easrc $(TARGET_DIR)/lib/firmware/imx +endef +endif + # # EPDC firmware # @@ -160,6 +171,7 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS endef define FIRMWARE_IMX_INSTALL_TARGET_CMDS + $(FIRMWARE_IMX_INSTALL_TARGET_EASRC_FW) $(FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW) $(FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW) $(FIRMWARE_IMX_INSTALL_TARGET_VPU_FW) -- 2.25.1 From romain.naour at gmail.com Sat Jan 29 14:23:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 15:23:50 +0100 Subject: [Buildroot] [PATCH 1/3] package/poke: install libpoke.so to staging Message-ID: <20220129142352.1197168-1-romain.naour@gmail.com> Poke generate a library libpoke.so, so install it to staging. Signed-off-by: Romain Naour --- package/poke/poke.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/poke/poke.mk b/package/poke/poke.mk index fed023e954..ddd03ae3b0 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -13,6 +13,7 @@ POKE_LICENSE_FILES = COPYING jitter/COPYING # 0001-configure.ac-HELP2MAN-replace-by-false-when-cross-co.patch POKE_AUTORECONF = YES +POKE_INSTALL_STAGING = YES POKE_DEPENDENCIES = host-flex host-bison host-pkgconf bdwgc readline # poke bundle gnulib that doesn't support the case where -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 14:23:51 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 15:23:51 +0100 Subject: [Buildroot] [PATCH 2/3] package/poke: disable minimal-threading with thumb or thumb2 In-Reply-To: <20220129142352.1197168-1-romain.naour@gmail.com> References: <20220129142352.1197168-1-romain.naour@gmail.com> Message-ID: <20220129142352.1197168-2-romain.naour@gmail.com> Disable minimal-threading when thumb or thumb2 is enabled due to build and runtime issues. After fixing the build issue "Error: invalid swi expression" with upstream, poke fail to run with the following error: # poke ERROR: specialized instruction beghl/retR (opcode 25) is defective but has no replacement [...] Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/2030046871 Reported upstream [1]. [1] https://lists.gnu.org/archive/html/poke-devel/2022-01/msg00162.html Signed-off-by: Romain Naour --- package/poke/poke.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..91518f5854 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -46,6 +46,15 @@ POKE_CONF_OPTS = \ --disable-libnbd \ --with-libreadline-prefix=$(STAGING_DIR) +# Disable minimal-threading when thumb or thumb2 is enabled +# due to runtime issue. +# https://lists.gnu.org/archive/html/poke-devel/2022-01/msg00162.html +ifeq ($(BR2_ARM_CPU_HAS_THUMB)$(BR2_ARM_CPU_HAS_THUMB2),y) +POKE_CONF_OPTS += --disable-dispatch-minimal-threading +else +POKE_CONF_OPTS += --enable-dispatch-minimal-threading +endif + ifeq ($(BR2_PACKAGE_JSON_C),y) POKE_DEPENDENCIES += json-c POKE_CONF_OPTS += --enable-mi -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 14:23:52 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 15:23:52 +0100 Subject: [Buildroot] [PATCH 3/3] package/poke: bump to version 2.0 In-Reply-To: <20220129142352.1197168-1-romain.naour@gmail.com> References: <20220129142352.1197168-1-romain.naour@gmail.com> Message-ID: <20220129142352.1197168-3-romain.naour@gmail.com> Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6270 # of unsupported tests 7 See: http://www.jemarch.net/poke-2.0-relnotes.html Tested: https://gitlab.com/kubu93/buildroot/-/pipelines/458943718 Signed-off-by: Romain Naour --- test-pkg config: BR2_PACKAGE_POKE=y BR2_PACKAGE_JSON_C=y --- ...P2MAN-replace-by-true-when-cross-com.patch | 6 ++-- ...andom.c-fix-build-with-uclibc-1.0.35.patch | 28 +++++++++---------- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index c169516153..85a76e068e 100644 --- a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -1,4 +1,4 @@ -From b35dadae6371c3727cac46ae5bd348b66aa411fc Mon Sep 17 00:00:00 2001 +From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 30 Apr 2021 15:43:59 +0200 Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when @@ -17,10 +17,10 @@ Signed-off-by: Romain Naour 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2c6f1aef..9c4c9be2 100644 +index a1943b57..c633f719 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) +@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) else diff --git a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch index 757dc3f760..bd20b5d2c6 100644 --- a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch +++ b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -1,4 +1,4 @@ -From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 +From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 1 Apr 2021 07:49:46 +0200 Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 @@ -15,7 +15,7 @@ In file included from ./sys/random.h:40, /tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? 7 | #include +++ |+#include - 8 | + 8 | This patch is not upstreamable as it is only a workaround for uclibc < 1.0.35, upstream uclibc has been patched with @@ -26,15 +26,15 @@ Fixes: Signed-off-by: Fabrice Fontaine --- - jitter/gnulib-local/getrandom.c | 1 + - gl/getrandom.c | 1 + gl-libpoke/getrandom.c | 1 + + gl/getrandom.c | 1 + + jitter/gnulib-local/getrandom.c | 1 + 3 files changed, 3 insertions(+) -diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/jitter/gnulib-local/getrandom.c -+++ b/jitter/gnulib-local/getrandom.c +diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c +index e146873..3948d8d 100644 +--- a/gl-libpoke/getrandom.c ++++ b/gl-libpoke/getrandom.c @@ -19,6 +19,7 @@ #include @@ -44,7 +44,7 @@ index 41212fb32..0ad3f9648 100644 #include diff --git a/gl/getrandom.c b/gl/getrandom.c -index 41212fb32..0ad3f9648 100644 +index e146873..3948d8d 100644 --- a/gl/getrandom.c +++ b/gl/getrandom.c @@ -19,6 +19,7 @@ @@ -55,10 +55,10 @@ index 41212fb32..0ad3f9648 100644 #include #include -diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/gl-libpoke/getrandom.c -+++ b/gl-libpoke/getrandom.c +diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c +index e146873..3948d8d 100644 +--- a/jitter/gnulib-local/getrandom.c ++++ b/jitter/gnulib-local/getrandom.c @@ -19,6 +19,7 @@ #include @@ -68,5 +68,5 @@ index 41212fb32..0ad3f9648 100644 #include -- -2.30.2 +2.31.1 diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 1367262f54..7bf2204c55 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce054df29560c921230132703ee449fe130b6e25ab03aa6cc796bb401506aa24 poke-1.4.tar.gz +sha256 5b822bf3e112c9fb5c0c9ab22a30a45a5d5e4d16e3f7436052bb720aa26b9a58 poke-2.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index 91518f5854..e92d9506ce 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.0 POKE_SITE = $(BR2_GNU_MIRROR)/poke # gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) -- 2.31.1 From fontaine.fabrice at gmail.com Sat Jan 29 15:48:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 16:48:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/android-tools: fastboot needs gcc >= 5 Message-ID: <20220129154800.3819350-1-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 dependency to fastboot: Makefile:591: *** libsepol is in the dependency chain of libselinux that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/2430ba4afb40569ed54506201494baeebf6c5d42 Signed-off-by: Fabrice Fontaine --- package/android-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/android-tools/Config.in b/package/android-tools/Config.in index a36c4db189..22d17f5fae 100644 --- a/package/android-tools/Config.in +++ b/package/android-tools/Config.in @@ -38,6 +38,7 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT bool "fastboot" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_ZLIB @@ -46,8 +47,9 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT the target, which can be used to reflash other target devices implementing the fastboot protocol. -comment "fastboot needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "fastboot needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || _ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "fastboot needs headers >= 3.10 (PowerPC64), headers >= 3.16 (MIPS64)" depends on !BR2_arc -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 29 15:50:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 16:50:19 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/android-tools: fastboot needs gcc >= 5 Message-ID: <20220129155019.3819750-1-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 dependency to fastboot: Makefile:591: *** libsepol is in the dependency chain of libselinux that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/2430ba4afb40569ed54506201494baeebf6c5d42 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo package/android-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/android-tools/Config.in b/package/android-tools/Config.in index a36c4db189..bc76d545c1 100644 --- a/package/android-tools/Config.in +++ b/package/android-tools/Config.in @@ -38,6 +38,7 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT bool "fastboot" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_ZLIB @@ -46,8 +47,9 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT the target, which can be used to reflash other target devices implementing the fastboot protocol. -comment "fastboot needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "fastboot needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "fastboot needs headers >= 3.10 (PowerPC64), headers >= 3.16 (MIPS64)" depends on !BR2_arc -- 2.34.1 From peter at korsgaard.com Sat Jan 29 18:14:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 19:14:59 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Update for 2021.02.9 Message-ID: <20220129180819.2AD0582761@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af67915161af4243cfdbd81408cd6ba64a8438eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard --- CHANGES | 29 +++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e967c265cd..f7d14f636d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,32 @@ +2021.02.9, released January 29th, 2022 + + Important / security related fixes. + + check-package: Improve variable override check + + pkg-stats: List CVEs where the version info cannot be parsed + as unsure rather than completely ignoring them. + + Defconfigs: Beaglebone: Support BeagleBone black wireless + + Updated/fixed packages: alsa-utils, apache, cage, capnproto, + civetweb, clamav, collectd, connman, coreutils, dav1d, + docker-cli, docker-containerd, docker-engine, expat, + findutils, flare-engine, flare-game, font-awesome, freeswitch, + gcc, ghostscript, gnuchess, go, grpc, gst1-interpipe, + gst1-plugins-bad, gst-rtsp-sever, gupnp-tools, hackrf, icu, + imagemagick, janus-gateway, keepalived, lapack, libjpeg, + libopenssl, libpjsip, liburiparser, linux-pam, lxc, mbedtls, + mongodb, mpd-mpc, nodejs, openblas, pcre2, polkit, poppler, + privoxy, prosody, python-django, python-lxml, python-pyqt5, + python3, qt5base, qt5location, rhash, ruby, runc, samba4, + sofia-sip, targetcli-fb, tcpreplay, tinyxml, vim, vlc, + wireshark, xapp_xauth, xen, xlib_libX11, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #14471: alsa_utils wrong deployment + 2021.02.8, released December 14th, 2021 Important / security related fixes. diff --git a/Makefile b/Makefile index 926695afd3..d1a5d4d71e 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.8 +export BR2_VERSION := 2021.02.9 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1639501000 +BR2_VERSION_EPOCH = 1643480000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ae1dd51650..ff793ccba8 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.8' +RELEASE='2021.02.9' ### Change here for more memory/cores ### VM_MEMORY=2048 From giulio.benetti at benettiengineering.com Sat Jan 29 18:34:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 19:34:26 +0100 Subject: [Buildroot] [PATCH] package/apitrace: fix build failure on m68k architecture Message-ID: <20220129183426.152177-1-giulio.benetti@benettiengineering.com> apitrace uses very big switch statements, which causes the build to fail on m68k, because the offsets there are only 16-bit. We fix that by using -mlong-jump-table-offsets on m68k, to use 32-bit offsets for switch statements. That flag is available on gcc version >= 7 but apitrace package already depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7, so we can use it with no problem. Fixes: http://autobuild.buildroot.net/results/7306bf05962fec30fbe98b1eb8ee09b3162b8080/ Signed-off-by: Giulio Benetti --- package/apitrace/apitrace.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/apitrace/apitrace.mk b/package/apitrace/apitrace.mk index 3656a5722b..c47562233b 100644 --- a/package/apitrace/apitrace.mk +++ b/package/apitrace/apitrace.mk @@ -38,6 +38,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) APITRACE_CXXFLAGS += -O0 endif +# m68k needs 32-bit offsets in switch tables to build +ifeq ($(BR2_m68k),y) +APITRACE_CXXFLAGS += -mlong-jump-table-offsets +endif + APITRACE_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(APITRACE_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(APITRACE_CXXFLAGS)" -- 2.25.1 From ps.report at gmx.net Sat Jan 29 19:07:55 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 29 Jan 2022 20:07:55 +0100 Subject: [Buildroot] swupdate suricatta build error In-Reply-To: References: Message-ID: <20220129200755.17188a26@gmx.net> Hello Chris, On Fri, 28 Jan 2022 12:59:23 +0900, Chris wrote: > Hi, there > Did anybody ever see the same issue? When build 2021.11 for raspberry pi, > we added swupdate package and enabled suricatta mode by "make > swupdate-menuconfig", then we got error as below, > > suricatta/common.c:79:26: error: storage size of ?json_res? isn?t known > 79 | enum json_tokener_error json_res; > | ^~~~~~~~ > suricatta/common.c:82:15: warning: implicit declaration of function > ?json_tokener_parse_ex? [-Wimplicit-function-declaration] > 82 | json_root = json_tokener_parse_ex( > | ^~~~~~~~~~~~~~~~~~~~~ > suricatta/common.c:82:13: warning: assignment to ?struct json_object *? > from ?int? makes pointer from integer without a cast [-Wint-conversion] > 82 | json_root = json_tokener_parse_ex( > | ^ > suricatta/common.c:84:23: warning: implicit declaration of function > ?json_tokener_get_error? [-Wimplicit-function-declaration] > 84 | } while ((json_res = json_tokener_get_error(json_tokenizer)) == > | ^~~~~~~~~~~~~~~~~~~~~~ > suricatta/common.c:85:4: error: ?json_tokener_continue? undeclared (first > use in this function) > 85 | json_tokener_continue); > | ^~~~~~~~~~~~~~~~~~~~~ > suricatta/common.c:85:4: note: each undeclared identifier is reported only > once for each function it appears in > suricatta/common.c:86:18: error: ?json_tokener_success? undeclared (first > use in this function); did you mean ?json_tokener_error?? > 86 | if (json_res != json_tokener_success) { > | ^~~~~~~~~~~~~~~~~~~~ > | json_tokener_error > suricatta/suricatta.c:17:10: fatal error: json-c/json.h: No such file or > directory > 17 | #include > > > - host machine (OS/release) --Linux MINT20 > - version of Buildroot--2021.11 > - target for which the build fails--raspberry pi b > - package(s) for which the build fails--swupdate > - the command that fails and its output--as posted above > - any information you think that may be relevant > > > Thanks > Chris Seems suricatta depens on json-c, simple enable additional BR2_PACKAGE_JSON_C=y in your .config file (or json-c via 'make menuconfig')... Note: swupdate has already an optional dependency on json-c (see [1]) but an hard dependency for an changed swupdate config (via 'make swupdate-menuconfig' is hard to express in buildroot)... Regards, Peter [1] https://git.buildroot.net/buildroot/tree/package/swupdate/swupdate.mk#n42 From peter at korsgaard.com Sat Jan 29 19:14:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 20:14:37 +0100 Subject: [Buildroot] Buildroot 2021.02.9 released Message-ID: <87ee4q2w2q.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.02.9 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.02.9.tar.gz or http://buildroot.org/downloads/buildroot-2021.02.9.tar.bz2 Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.02.9 is a bugfix release on the current long term release, fixing a number of important / security related issues discovered since the 2021.02.8 release. - Defconfigs: Beaglebone: Support BeagleBone black wireless - Security fixes for apache, clamav, docker-containerd, expat, freeswitch, ghostscript, gnuchess, go, janus-gateway, keepalived, lapack, libjpeg, libpjsip, liburiparser, mbedtls, mongodb, nodejs, openblas, polkit, privoxy, prosody, python-django, python-lxml, qt5base, ruby, runc, targetcli-fb, tcpreplay, tinyxml, vim, wireshark, xen, xserver_xorg-server - Fixes for download/compilation/runtime/license issues in alsa-utils, cage, capnproto, civetweb, connman, coreutils, dav1d, docker-cli, docker-engine, flare-engine, flare-game, font-awesome, gcc, grpc, gst1-interpipe, gst1-rtsp-server, gupnp-tools, hackrf, icu, imagemagick, libopenssl, linux-pam, lxc, mpd-mpc, pcre2, python-pyqt5, python3, qt5location, rhash, samba4, vlc, xapp_xauth, xlib_libX11 For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.02.9 Users of the affected packages are strongly encouraged to upgrade. Many thanks to all the people contributing to this release: git shortlog -sn 2021.02.8.. 57 Fabrice Fontaine 14 Peter Korsgaard 11 Bernd Kuhls 7 Thomas Petazzoni 6 Peter Seiderer 5 Christian Stewart 3 Francois Perrad 2 Adam Duskett 2 Andreas Ziegler 2 Arnout Vandecappelle (Essensium/Mind) 2 James Hilliard 2 Ricardo Martincoski 2 Romain Naour 2 Thomas De Schampheleire 2 Yann E. MORIN 1 Anssi Hannula 1 Cyril Bur 1 Dario Binacchi 1 Florent AUMAITRE 1 Giulio Benetti 1 Gregory CLEMENT 1 Khoa Hoang 1 Max Filippov 1 Maxime Chevallier 1 Nuno Gon?alves 1 Quentin Schulz 1 Santosh Multhalli 1 Yegor Yefremov 1 Yunhao Tian -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Sat Jan 29 19:46:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 20:46:33 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <6D05417C-EE4C-4145-BDB2-5CD9AC5A39A5@benettiengineering.com> References: <6D05417C-EE4C-4145-BDB2-5CD9AC5A39A5@benettiengineering.com> Message-ID: Hi Michael, On 29/01/22 14:54, Giulio Benetti wrote: [SNIP] >>> Have you given a go with latest Buildroot docker to check if uboot >>> needs libfdtpy, python3 etc.? >>> It?s highly probable it needs them. >> >> Suggestion, should be given to the other newest board that was added. > > Correct, I?m going to check my latest board reviews about this I've pointed them tbh >> I think that you are talking about >> host-tools here. > > Yes > >> Please point me to this buildroot docker > > https://hub.docker.com/r/buildroot/base/tags > > # docker pull buildroot/base:20211120.1925 This is not correct, sorry, I've just given a try and it builds correctly even if it fails with gitlab CI. You have to use this docker: docker pull buildroot/base:20210922.2200 Best regards! -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Sat Jan 29 20:27:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 29 Jan 2022 13:27:51 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: add missing openssl build dependency Message-ID: <20220129202751.3851776-1-james.hilliard1@gmail.com> Fixes: build/temp.linux-x86_64-3.10/_openssl.c:575:10: fatal error: openssl/opensslv.h: No such file or directory 575 | #include | ^~~~~~~~~~~~~~~~~~~~ Signed-off-by: James Hilliard --- package/python-cryptography/python-cryptography.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index fc1686af9a..e642691bc5 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -12,7 +12,11 @@ PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-setuptools-rust host-python-cffi host-rustc +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 29 20:34:38 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 29 Jan 2022 13:34:38 -0700 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.58.1 Message-ID: <20220129203438.3855797-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/rust-bin/rust-bin.hash | 198 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index bdb1f07fcc..9f8788a295 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,102 +1,102 @@ -# From https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 9c3baf8ec849978b0206262fc402ac9d24fdb2a8ae7b5d785b09022dbdbc20e8 rust-1.54.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9fb4a22b74120b81a4d896326b02d121d5f996b3288580c346ea55a52d8946a9 rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a1a77737d218087eb7d3613adcde2c9e383d758cdf128646a0ee63396145270b rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 9a7ff8e4cd160f6a58c3b5c7e679b7acdc427c2440ecc70a31a5dc71bbecd0c8 rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c87dc1681756c9c275eba690c6a05bcdd2ac3bd04a70ae039869dc85fff18b69 rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 74c9f120ad8a443798ebec74302b5166a0880b13b1d8c43dde0c8ba70d9e4b2d rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 2a19d96cf9e863448b21ff989550da54080312ce99272128cc0eb3b1fe5c73cc rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 481192a6906c44501f910a35fc49ed9b1b271925c4569a52f45d9efbc2058ae2 rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 2716f587d0da1dd26fc64251303f5705230f5b86e47e9af35e11622d01ceb963 rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 b1f25af230f3b6fd930452024bd0cc9f4599bfb15f09f802cdb756effa516bbf rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 86549aca1b65188cedf3f1c8fce5af3d7f817450418367049d4bbe8c69ba1da0 rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 7823b95fc3fcd7cc47ba767e2e917c9efbafed2d5ad0b74e7c087600bd72e54f rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 f9a650a3970dbc321e8979dd87ed02fd8f9d03901c3fb1a87724f3c214eb6e57 rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 19a80cfaf18c15eaa1c112312c0cb0ccfd14179407118b35735cdcfc1cc4c60f rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 7c747dea305f5d4b1c6a23d064fbb41e24bb56f2917867020bb57cb064878dc4 rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.asc -sha256 b52dd3d4ae465037ed2987e23457d30e1a75fd16c2c421613ec52c250947a5f8 rust-std-1.54.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e88269a37ebfbff52fcd07746c53fc0bfa2570531f10f226800d5783ce735e3f rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.asc -sha256 947054afa4d6e37c64e484c704b5f09043783b83aafbf7a00e6959442b1fc14f rust-std-1.54.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 59c0bd07976f9e18e05e328e2f0acd9e99b736ea0330a03b313842e5c5816e13 rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.asc -sha256 02611ec7a6d510572803b4bd9948f0790e9f0ae8e3047ff7fa465300346e3b74 rust-std-1.54.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 dba582de46b7f97ba85b2d75662482df67214e71e0b9cea3c9c153c9d371a00f rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2e94aedf59369d81524dfe8027e6e4fb0fe338d2ee7869bd96e5cef24974cf0e rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 d1d32bc202b026470ec2c37826fef92bd91f46b08ed1e2620a50eadba03d7095 rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 25d0c06fb445e16d7aac3b5370b43e72600a2aee41fa06605f64a3b8a8ed0e4b rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 626b4255d31c35fa77669471c15ec63b0e88726115538e598a6ef6e814d83bae rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 0f4aaec3ef60ad3c017a39925a1627cc79cd5be00cc8ea7759a470c24b0b66e7 rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 116b2cd682cc5902f91a1ffbe2eb649262d871cd3c47e539afeb723513ae15eb rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 f0329a9d6c96eeb1db5cb7969dbadbab58768b8bff48a1ffc89103031945126e rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 c08b7df82a30acacb3afcdad34b3384e77a9f35ce6bef10d43f29f129fab35e1 rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 8b9ac3e1947036d6f2a3939edd279631fc1b0a260507343a8b3e9ecd448fe738 rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 6ce101e3c5b1bae6006c61a18dcb5685fe0ff57ea8c00a36e6bf95f748abe5f6 rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a22e19859b3c5032daac1633637546a986c51bdfa3ad0db6e394e6cc461f466b rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 c2de24eb3e524c0fdd1e8116f578c103035da1ece1e4c06efab67999180eefe8 rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 110ca4967351d8535f3d39e24f40e2941c20346c5765d3530270e134ae50568e rust-1.58.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f71b077caf0becbd0af9fd22bc1fa31c4fdf7a21fe046da8a15a7bde1286da25 rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 c7a016ac63aeb5481d661ee3e680b57d35d5ccb902c605c32937a047a02cff49 rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 4c8d9774fb1f6cfa616f2c43395f438e887a38f0cd901a3886056cc1c1b84c30 rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 eb58c2b72e9bbe50c80e9f2981e14d737198f7e17a4cad524d00baefdfa3bc1d rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 58e3f4905c3e7028811971219a3222640f947062fb93dbe51c1674551e9b06a6 rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 b354f0ad28d8cc7d5996d46c3a310c80aa6486ac7b89abcd1eeef7f13435e0ff rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 705fba2a50835354112ab86d1ee8889c39f3c7265d7ca26f1dffebaa463600a6 rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 0505759fa8b26c902a701f266db4bfbfe496de71c5c6548a55c562fe9d386485 rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 9ca8adb43b4e75556a99b6c7a9bc1d9aab894bbe109736c34582169ec81aee14 rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 9f38bc3220d659ff482db9a0ace9dcb7051991d471149fad7bbb62fce8314e04 rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 1511c675d17033737ab2bd1e87b525aaf59e0455f5a717ab0a91fd849949164f rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 2cf8a8cc2441a1bb4b45b690c87fff4df975fac077240706c08594e26f901bdc rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 db86e823484f210884d7d815ffcd7dae355bba86e18151b0838ec06544bb8126 rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 02bce02f929114cc60126410fceeab6c0bcc8b96c394de9516d8f449880cb585 rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.asc +sha256 e80d5769f042a00388546dbd26cb40c045d5dddc84e5da3f98d174027ed9eaaa rust-std-1.58.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 d7f2bc431db551ea9019a6d50d4e3f11e14fabbea3abec1478ac72a281309152 rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.asc +sha256 c70fbb13aedfb88cfec8098355a155a4edce3d52f9b099bc033b7c7ac45aab00 rust-std-1.58.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 b678ac0282cbb1965f9a7485a1f56b01d0229f91ddff5a18a9628f86970f5902 rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.asc +sha256 2f571f4c9b4e86e278539e811f495fb84f44898d4333b983a3d95ef5d2c0fdd8 rust-std-1.58.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 7f2f613606f039eec83239753a83c227b1d3c39b6474647234e7788a1541e850 rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 7283539843df5c8abd06b0ce3830efeab0d673447b45d3b6636d2eb296d28681 rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 3d2935e0979a7150cc271481f5f06569005ee27f0a7ef7ed1a5393c3e34b1974 rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 33078d23ea70ca405b5938e5a2a74fbf4ec7dc41b729e4991e3e01d4c8370028 rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 fdade0d00dac3524348041ec915a5a96208c9c1929ce746ab6352d0d2897a3a7 rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 c747a00ac9a6ee70793002e6db2fbce3b2cd60eda277729468d18369736c6c8e rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 7813f825e5d10aac0ded4b3f785970c69c25464b4edcf9c2b83eff0e55ee95f3 rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 c68d93de3a46ec709788fee2c38a298a261d4254d299299195ab3474b316a59b rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 a85f5f42918e8b140d7093ba49fc46a21625863538c95d2db03f831cc445f025 rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 2d7276fe261478c377913177dcec3e0aeed84f2c567db0ae8e415efee7bb9ce0 rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 7a7cd002c63179f3f47d64b1140c180986322a7cc0d31de61d7c4728cedacba0 rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 e72367c15906f021f46801652181c917cd3328be022b93bb30506724f7b56256 rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 b0d3e03c9b1eff6e241383913b02653ba80776626ca7c4a93f36c2ad829ba989 rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index bc8a485ac5..d4cb8f50ea 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.54.0 +RUST_BIN_VERSION = 1.58.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 30a348e982..7eb8f59603 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.asc -sha256 a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4 rustc-1.54.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.asc +sha256 2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469 rustc-1.58.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 26ee2a9362..5fad7d404c 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.54.0 +RUST_VERSION = 1.58.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT -- 2.25.1 From thomas.devoogdt at gmail.com Sat Jan 29 21:42:34 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Sat, 29 Jan 2022 22:42:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.70.0 Message-ID: <20220129214235.5133-1-thomas.devoogdt@gmail.com> The internal_pcre option was dropped in: https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c Signed-off-by: Thomas Devoogdt --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index c402cbafa5..2f95228932 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.68.4', + version : '2.70.0', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index d421e025ff..580be3e08e 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum -sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum +sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index af73aeb3bf..d3cba1a8bb 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.70 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -30,7 +30,6 @@ HOST_LIBGLIB2_CONF_OPTS = \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ - -Dinternal_pcre=false \ -Dtests=false \ -Doss_fuzz=disabled @@ -52,7 +51,6 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ -Dglib_debug=disabled \ - -Dinternal_pcre=false \ -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ -Dtests=false \ -- 2.17.1 From thomas.devoogdt at gmail.com Sat Jan 29 21:42:35 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Sat, 29 Jan 2022 22:42:35 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsoup: add choice between libsoup2 and libsoup3 In-Reply-To: <20220129214235.5133-1-thomas.devoogdt@gmail.com> References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> Message-ID: <20220129214235.5133-2-thomas.devoogdt@gmail.com> Libsoup3 has a new API [1], packages using libsoup2 may not compile with libsoup3 or may crash at runtime in unexpected ways. So the default will (for now) stay on libsoup2. A tracking table for the migration can be found here [2]. Changes for libsoup3: - "0001-meson.build-set-c_std-to-gnu99.patch" is upstream now [3]. - The "gnome" option was dropped in [4]. - A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 backend) [5]. [1] https://libsoup.org/libsoup-3.0/ch02.html [2] https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 [3] https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c [4] https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a [5] https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 Signed-off-by: Thomas Devoogdt --- .../0001-meson.build-set-c_std-to-gnu99.patch | 0 package/libsoup/Config.in | 16 ++++++++++++++++ package/libsoup/libsoup.hash | 2 ++ package/libsoup/libsoup.mk | 11 +++++++++++ 4 files changed, 29 insertions(+) rename package/libsoup/{ => 2.74.0}/0001-meson.build-set-c_std-to-gnu99.patch (100%) diff --git a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch b/package/libsoup/2.74.0/0001-meson.build-set-c_std-to-gnu99.patch similarity index 100% rename from package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch rename to package/libsoup/2.74.0/0001-meson.build-set-c_std-to-gnu99.patch diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 02e8e8b578..959ddedef5 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -16,8 +16,24 @@ config BR2_PACKAGE_LIBSOUP if BR2_PACKAGE_LIBSOUP +choice + prompt "libsoup version" + default BR2_PACKAGE_LIBSOUP_VERSION_2 + help + Select the version of libsoup you wish to use. + +config BR2_PACKAGE_LIBSOUP_VERSION_3 + select BR2_PACKAGE_NGHTTP2 + bool "libsoup3" + +config BR2_PACKAGE_LIBSOUP_VERSION_2 + bool "libsoup2" + +endchoice + config BR2_PACKAGE_LIBSOUP_GNOME bool "libsoup-gnome" + depends on BR2_PACKAGE_LIBSOUP_VERSION_2 help Build libsoup-gnome library. diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 95c1c26eb4..6d87cc67e8 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,3 +1,5 @@ +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/3.0/libsoup-3.0.0.sha256sum +sha256 cde05f3e20114ce985cbd03d575ff74e5e41e70a218e5eb3068c4bf4710dbf2b libsoup-3.0.0.tar.xz # From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.0.sha256sum sha256 33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e libsoup-2.74.0.tar.xz # Locally calculated diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 1a26714992..bd8ce40643 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,13 @@ # ################################################################################ +ifeq ($(BR2_PACKAGE_LIBSOUP_VERSION_3),y) +LIBSOUP_VERSION_MAJOR = 3.0 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +else LIBSOUP_VERSION_MAJOR = 2.74 LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +endif LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ @@ -55,10 +60,16 @@ else LIBSOUP_CONF_OPTS += -Dgssapi=disabled endif +ifeq ($(BR2_PACKAGE_LIBSOUP_VERSION_2),y) ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) LIBSOUP_CONF_OPTS += -Dgnome=true else LIBSOUP_CONF_OPTS += -Dgnome=false endif +endif + +ifeq ($(BR2_PACKAGE_LIBSOUP_VERSION_3),y) +LIBSOUP_DEPENDENCIES += nghttp2 +endif $(eval $(meson-package)) -- 2.17.1 From romain.naour at gmail.com Sat Jan 29 22:46:47 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:47 +0100 Subject: [Buildroot] [PATCH 1/5] package/efl: bump to version 1.26.1 Message-ID: <20220129224651.1282263-1-romain.naour@gmail.com> This is a bug-fix release. See: https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 Signed-off-by: Romain Naour --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 6364d276c0..8d50400eb7 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://www.enlightenment.org/news/2021-12-26-efl-1.26.0 -sha256 a4a9bce45fd27f8541874e44a130f64550bee1f2f72feaa6c8a758d92eaf204c efl-1.26.0.tar.xz +# From https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 +sha256 86a9677e3d48dd0c13a399ebb417bd417bd8d150d6b06cc491bc92275c88a642 efl-1.26.1.tar.xz sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING diff --git a/package/efl/efl.mk b/package/efl/efl.mk index ed0a8acc1d..43a2dc4fcb 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.26.0 +EFL_VERSION = 1.26.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 22:46:48 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:48 +0100 Subject: [Buildroot] [PATCH 2/5] package/enlightenment: bump to version 0.25.1 In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220129224651.1282263-2-romain.naour@gmail.com> This is the a bugfix release. See: https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 Signed-off-by: Romain Naour --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index dd4c4d78c0..2d977b86f7 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,4 +1,4 @@ -# From https://www.enlightenment.org/news/2021-12-26-enlightenment-0.25.0 -sha256 7d6e72ceed5aca135b7a49c2a1c1eb9d8fde1318613517401d0418e0e5f6df06 enlightenment-0.25.0.tar.xz +# From https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 +sha256 2cf05fe3d96ef35e823619dbc0ac513ecabcae2186800ecd804924a637112444 enlightenment-0.25.1.tar.xz sha256 8d2fbc393e967cd6f5b8559d1744881a6a1ceb3ec6e1c2368c3916809ffccb8d COPYING sha256 cdc77ee1732455b203610f923fe4196046b3f7509038c48dc0b0c7e3492c23f3 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 24bbd96cd0..95670e800d 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.25.0 +ENLIGHTENMENT_VERSION = 0.25.1 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 22:46:49 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:49 +0100 Subject: [Buildroot] [PATCH 3/5] package/efl: rework eeze handling in Kconfig In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220129224651.1282263-3-romain.naour@gmail.com> Commit [1] added eeze dependency using "depends on" to several efl options (drm, libmount) instead of selecting eeze and propagate the udev reverse dependency. The dependency between eeze, libinput, efl drm requires to add a new libinput option. Rework eeze handling to use select BR2_PACKAGE_EFL_EEZE since the user is already aware of the udev dependency (BR2_PACKAGE_HAS_UDEV). [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 Signed-off-by: Romain Naour --- package/efl/Config.in | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd9..21845ba306 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -115,7 +115,8 @@ config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT bool "Enable libmount support (recommended)" default y - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # eeze + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # libblkid is part of required tools, see EFL's README. @@ -126,7 +127,7 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT Enlightenment and its filemanager. comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,7 +174,7 @@ config BR2_PACKAGE_EFL_WAYLAND depends on BR2_PACKAGE_WAYLAND depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine - depends on BR2_PACKAGE_EFL_EEZE # efl drm + depends on BR2_PACKAGE_HAS_UDEV # efl drm (eeze) depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput select BR2_PACKAGE_EFL_DRM @@ -182,7 +183,7 @@ config BR2_PACKAGE_EFL_WAYLAND comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" depends on BR2_PACKAGE_WAYLAND depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ || !BR2_ENABLE_LOCALE choice @@ -215,9 +216,10 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV (eeze) depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON @@ -232,7 +234,7 @@ config BR2_PACKAGE_EFL_DRM comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_HAS_UDEV comment "libevas loaders" -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 22:46:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:50 +0100 Subject: [Buildroot] [PATCH 4/5] package/efl: handle input option In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220129224651.1282263-4-romain.naour@gmail.com> From: Fabrice Fontaine Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input option on target which was added (and enabled by default) by https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be resulting in the following build failure when eeze is disabled: ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". Fixes: - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e Signed-off-by: Fabrice Fontaine [Romain: use BR2_PACKAGE_EFL_LIBINPUT for BR2_PACKAGE_EFL_DRM] Signed-off-by: Romain Naour --- v2: rework BR2_PACKAGE_EFL_DRM --- package/efl/Config.in | 19 +++++++++++++++---- package/efl/efl.mk | 7 +++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 21845ba306..bc89f2609b 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI so you may also trigger code paths with bugs that are never normally used. +config BR2_PACKAGE_EFL_LIBINPUT + bool "Enable libinput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Libinput is used to support gesture recognition. + +comment "libinput needs udev /dev management (eeze)" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_EFL_LIBSNDFILE bool "Enable libsndfile support (recommended)" default y @@ -216,13 +229,11 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_HAS_UDEV (eeze) + depends on BR2_PACKAGE_HAS_UDEV # elput, eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_EFL_LIBINPUT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBINPUT # For elput - select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 43a2dc4fcb..021afa8204 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -67,6 +67,13 @@ else EFL_CONF_OPTS += -Deeze=false endif +ifeq ($(BR2_PACKAGE_EFL_LIBINPUT),y) +EFL_DEPENDENCIES += libinput libxkbcommon +EFL_CONF_OPTS += -Dinput=true +else +EFL_CONF_OPTS += -Dinput=false +endif + ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux EFL_CONF_OPTS += -Dlibmount=true -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 22:46:51 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:51 +0100 Subject: [Buildroot] [PATCH 5/5] docs/manual/adding-packages-directory.txt: reorder select/depends In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220129224651.1282263-5-romain.naour@gmail.com> >From [1]: "Even though the ordering has absolutely no consequences in Kconfig, it is not logical (when reading). It is more logical and far easier to understand when depends come first, followed by the selects." Also, the Config.in example in the manual suggests to use this coding style [2]." Use the correct coding style in the chapter "Choosing depends on or select" in the manual. [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html [2] https://nightly.buildroot.org/manual.html#_coding_style Signed-off-by: Romain Naour --- docs/manual/adding-packages-directory.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 6c68d7aa67..e5c7462a6c 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -196,13 +196,13 @@ config BR2_PACKAGE_E -------------------------- config BR2_PACKAGE_D bool "Package D" - select BR2_PACKAGE_B depends on BR2_PACKAGE_A + select BR2_PACKAGE_B config BR2_PACKAGE_E bool "Package E" - select BR2_PACKAGE_D depends on BR2_PACKAGE_A + select BR2_PACKAGE_D -------------------------- Overall, for package library dependencies, +select+ should be -- 2.31.1 From peter at korsgaard.com Sat Jan 29 23:09:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 30 Jan 2022 00:09:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Update for 2021.11.1 Message-ID: <20220129230245.DE9B6822BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=323ae1e681c24babfb375cb46bc81df551a3e0b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard --- CHANGES | 36 ++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 698d5d72a6..1e1c060107 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,39 @@ +2021.11.1, released January 29th, 2022 + + Important / security related fixes. + + check-package: Improve variable override check + + pkg-stats: List CVEs where the version info cannot be parsed + as unsure rather than completely ignoring them. + + Defconfigs: Beaglebone: Support BeagleBone black wireless, + stm32f469_xip_disco: Fix kernel boot + + Updated/fixed packages: alsa-utils, apache, binutils, cage, + capnproto, civetweb, clamav, collectd, connman, containerd, + coreutils, dav1d, docker-cli, docker-engine, erlang, + erlang-rebar, expat, findutils, flare-engine, flare-game, + font-awesome, freeswitch, gcc, ghostscript, glibc, gnuchess, + go, grpc, gst1-interpipe, gst1-rtsp-server, gupnp-tools, + hackrf, icu, imagemagick, janus-gateway, json-for-modern-cpp, + keepalived, lapack, libdbi, libiio, libjpeg, libmbim, libnss, + libopenssl, libpjsip, libqmi, liburiparser, libvirt, + linux-pam, lxc, mbedtls, mender, mongodb, mpd-mpc, mutt, + nodejs, openblas, pcre2, php, pipewire, polkit, privoxy, + prosody, python-charset-normalizer, python-django, + python-idna, python-lxml, python-pyqt5, python-requests, + python-urllib3, python3, qt5base, qt5location, rhash, + rng-tools, ruby, runc, rustc, samba4, sofia-sip, targetcli-fb, + tcpreplay, tinyxml, tor, tpm2-tss, util-linux-libs, vim, vlc, + wireshark, xapp_xauth, xapp_xinput-calibrator, xen, xenomai, + xlib_libX11, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #14451: nodejs won't build on Fedora 35 + #14471: alsa_utils wrong deployment + 2021.11, released December 5th, 2021 Various fixes. diff --git a/Makefile b/Makefile index 386b4f4e44..45fd44dd62 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.11 +export BR2_VERSION := 2021.11.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1638734000 +BR2_VERSION_EPOCH = 1643497000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 2bcb59c08b..eb312081fe 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11' +RELEASE='2021.11.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From giulio.benetti at benettiengineering.com Sat Jan 29 23:14:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 30 Jan 2022 00:14:20 +0100 Subject: [Buildroot] [PATCH] board/andes: fix build failure with host gcc >= 10 Message-ID: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> Add patch to fix linux bug: ``` HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ``` Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478164 Signed-off-by: Giulio Benetti --- ...ve-redundant-YYLOC-global-declaratio.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch new file mode 100644 index 0000000000..71ae991816 --- /dev/null +++ b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch @@ -0,0 +1,52 @@ +From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Tue, 14 Jan 2020 18:53:41 +0100 +Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration + +gcc 10 will default to -fno-common, which causes this error at link +time: + + (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here + +This is because both dtc-lexer as well as dtc-parser define the same +global symbol yyloc. Before with -fcommon those were merged into one +defintion. The proper solution would be to to mark this as "extern", +however that leads to: + + dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] + 26 | extern YYLTYPE yylloc; + | ^~~~~~ +In file included from dtc-lexer.l:24: +dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here + 127 | extern YYLTYPE yylloc; + | ^~~~~~ +cc1: all warnings being treated as errors + +which means the declaration is completely redundant and can just be +dropped. + +Signed-off-by: Dirk Mueller +Signed-off-by: David Gibson +[robh: cherry-pick from upstream] +Cc: stable at vger.kernel.org +Signed-off-by: Rob Herring +Signed-off-by: Giulio Benetti +--- + scripts/dtc/dtc-lexer.l | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l +index 06c040902444..d1b3810156c7 100644 +--- a/scripts/dtc/dtc-lexer.l ++++ b/scripts/dtc/dtc-lexer.l +@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +-- +2.25.1 + -- 2.25.1 From thomas.petazzoni at bootlin.com Sun Jan 30 07:06:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 07:06:29 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-29 Message-ID: <20220130070634.7A31082BD6@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-01-29 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 50 | 9 | 0 | 59 | 2021.11.x | 24 | 1 | 0 | 25 | master | 88 | 41 | 1 | 130 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 11 guile-3.0.7 | 3 unknown | 3 cryptsetup-2.4.2 | 2 log4cxx-0.12.0 | 2 apcupsd-3.14.14 | 1 apitrace-10.0 | 1 bluez5_utils-5.63 | 1 dnsmasq-2.86 | 1 efl-1.26.0 | 1 file-5.41 | 1 frr | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 host-delve-1.8.0 | 1 htpdate-1.3.3 | 1 ipmitool-1.8.18 | 1 libcamera-40f5fddca7f774944... | 1 libtheora-1.1.1 | 1 mongodb-4.2.18 | 1 mono-6.12.0.90 | 1 nodejs-14.18.3 | 1 qt5webkit-5.212.0-alpha4 | 1 ripgrep-af6b6c543b224d348a8... | 1 ruby-3.1.0 | 1 ulog-0389d243352255f6182326... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/74a6b83aea8a7b3c35fdfe7509730b72932aaa83 | m68k | apitrace-10.0 | NOK | http://autobuild.buildroot.net/results/88ebcb486ca3fbeec2239537eea9879d89e9467e | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/24b7f114cdcac8daab1b46f05a5e38096cfca05e | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/86b6b13e6be8375875caebcd91de91fef83f72e8 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/e5bcb5b7cdeb569dde447bd22fcb263a2b5a1a3a | xtensa | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/3aaa5e1523049df18692b90d61cdff182e1cd1dd | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/a6809c2d80b325e72bc6e771fe4aed53fe20042f | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/e32ac63caedc4399614a30582f29f8b65aac2c71 | ORPH arc | frr | TIM | http://autobuild.buildroot.net/results/118b4ed145a46772899e472b8fc34eeabe7f5532 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1f625c2122765609e8da43511b9b6a62b7cbcc4a | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/f861b3152e343b5b6092f8be2723636a708157b3 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/f20ab6a7c560d929cbc7649b811884c78fa2e4d2 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/7da11b2dcbc1cc8134754cca9cca926d5a8f83c0 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/44ce26c5cf46b4ae1ecadd2bf8902a5fab278233 | ORPH arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/0de2c31d9cf279cbc569b054e55b260ba8c94527 | arm | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/f53ee40222c42c421836a6cbd9f199c6c70df6d9 | arm | ipmitool-1.8.18 | NOK | http://autobuild.buildroot.net/results/01b22faf08a798ecc5d5465e1c0c13fa024f1096 | powerpc | libcamera-40f5fddca7f774944... | NOK | http://autobuild.buildroot.net/results/a1077815895ab847c5ca82ec17c7d13fe97cff53 | xtensa | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/1912bd1213a23c1bb0995a3d322a5c1e0d605270 | ORPH x86_64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/d0f99ad2c38432854689b7d3383ba3ae64adf8d7 | riscv32 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/8308ec2a83868c2446670a47998dee679c48367a | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/536839681cec37d7adaf8fc7cc287be3336ccb29 | arm | mono-6.12.0.90 | NOK | http://autobuild.buildroot.net/results/0f9ae32c07f2fc5c7ac2099c3a0d0d5238bc8e53 | mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/f0b34c628f1ce2b98428cc7996377802a088ca2f | x86_64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/194a9b21cb67a2fa296a1faed3df51dc2ccc518a | aarch64 | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/a03b756e52bc79fc3c27a36f60aebed113405cf2 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/8bf6573281b02d4ce24a27b67b2ba2424cc38b27 | sparc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/14d85969132c17ae6fef524aad67a3e69e616181 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9b86de606fbeccc414c89f2b6c7c2a71513fb4dc | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9ca75a49dc94801de96367b7224a355b358052fc | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c1b3727dd5ce70fe2eef298f5cdfec999ad65500 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/866275dad076a5b129fc004f9df3af3823f9a5d6 | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f4f43b67534d9f4d4265c0df1f30d2b9608ca045 | i686 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/50febe44f0e9985736a03a7e8ae605e4f87fbce0 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b47f32a5e5b8373bd53ae4e4a41a280dcc2e7952 | i586 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c279988e715139cbee9f83c9d1a21491bd140df6 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3f0af43bea780ee1196189b36dc40031ba7d512c | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/bcf1613fffe9723a3aa1ce157fe0b187026bc74b | arm | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/9fd5fedb0e7b1f781875a0327b3d558aa208c3dc | arm | unknown | NOK | http://autobuild.buildroot.net/results/2430ba4afb40569ed54506201494baeebf6c5d42 | arc | unknown | NOK | http://autobuild.buildroot.net/results/0f0f683d3c48dfcdcaf619ab924ee5c54e7d9a9f | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/64f163f3c55e9a0ba45db23375384988dc9f2f6d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 mesa3d-20.3.5 | 2 host-go-1.16.13 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 rauc-1.5.1 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | host-go-1.16.13 | NOK | http://autobuild.buildroot.net/results/8c47d27a1fa8c9dd2beed685938071e2c50bfdb6 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a7fa76bf73b46fac10a690f8cb03c41a02679a51 | nios2 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/7ec8d67a7aba7aa9484f31c2a6943c7d3e92f7da | nios2 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/75afadb7c62ba1a0bad6b3000d01b085f5553d21 | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/d8106a7135645b5ccff7f8273df9a7316a19f6eb | mips64el | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/1e8ed45385721d824f77dc8d0ffb7cc712871706 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/914ff822a8bd92e57a163f448915355dd8663343 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/838f6d1a4f26b2fbd2eae1086119a285be66a5ed | riscv32 | rauc-1.5.1 | NOK | http://autobuild.buildroot.net/results/a5a8732047d90df6020d2513e3183bea73ee6afe | Classification of failures by reason for 2021.11.x -------------------------------------------------- wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a09911c39e38ae0575aca836e76ae982f688f45f | -- http://autobuild.buildroot.net From james.hilliard1 at gmail.com Sun Jan 30 09:05:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 30 Jan 2022 02:05:35 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: fix get_platform for target builds Message-ID: <20220130090535.404853-1-james.hilliard1@gmail.com> Replicate the logic used to set _PYTHON_HOST_PLATFORM in configure.ac: https://github.com/python/cpython/blob/v3.10.2/configure.ac#L441-L446 This should correctly set the sysconfig platform for cross builds: https://github.com/python/cpython/blob/v3.10.2/Lib/sysconfig.py#L704-L706 Not setting this appears to cause distutils/setuptools to use the wrong build directory names for c extensions, however this doesn't seem to cause build or runtime errors as the installation paths still appear to be correct for staging/target installs. Signed-off-by: James Hilliard --- package/pkg-python.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 22ea77352c..d751311791 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -20,6 +20,13 @@ # ################################################################################ +ifeq ($(BR2_arm)$(BR2_armeb),y) +PKG_PYTHON_ARCH = arm +else +PKG_PYTHON_ARCH = $(ARCH) +endif +PKG_PYTHON_HOST_PLATFORM = linux-$(PKG_PYTHON_ARCH) + # basename does not evaluate if a file exists, so we must check to ensure # the _sysconfigdata__linux_*.py file exists. The "|| true" is added to return # an empty string if the file does not exist. @@ -33,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ PYTHONNOUSERSITE=1 \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -60,6 +68,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ -- 2.25.1 From peter at korsgaard.com Sun Jan 30 09:45:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 30 Jan 2022 10:45:49 +0100 Subject: [Buildroot] Buildroot 2021.11.1 released Message-ID: <87a6fd36b6.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.08.1 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.11.1.tar.gz or http://buildroot.org/downloads/buildroot-2021.11.1.tar.xz Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.11.1 is a bugfix release, fixing a number of important / security related issues discovered since the 2021.11 release. - Defconfigs: Beaglebone: Support BeagleBone black wireless, stm32f469_xip_disco: Fix kernel boot - Security fixes for apache, clamav, containerd, expat, freeswitch, ghostscript, gnuchess, go, janus-gateway, keepalived, lapack, libjpeg, libpjsip, liburiparser, mbedtls, mongodb, nodejs, openblas, polkit, privoxy, prosody, python-django, python-lxml, qt5base, ruby, runc, targetcli-fb, tcpreplay, tinyxml, vim, wireshark, xen, xserver_xorg-server - Fixes for download/compilation/runtime/license issues in alsa-utils, binutils, cage, capnproto, civetweb, connman, coreutils, dav1d, docker-cli, docker-engine, erlang, erlang-rebar, findutils, flare-engine, flare-game, font-awesome, gcc, glibc, grpc, gst1-rtsp-server, gst1-interpipe, gupnp-tools, hackrf, icu, imagemagick, json-for-modern-cpp, libdbi, libiio, libmbim, libnss, libopenssl, libqmi, libvirt, linux-pam, lxc, mender, mpd-mpc, mutt, pcre2, php, pipewire, python-pyqt5, python-requests, python3, qt5location, rhash, rng-tools, rustc, samba4, tor, tpm2-tss, util-linux-libs, vlc, xapp_xauth, xenomai, xlib_libX11 For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.11.1 Users of the affected packages are strongly encouraged to upgrade. Many thanks to all the people contributing to this release: git shortlog -sn 2021.11.. 73 Fabrice Fontaine 14 Thomas Petazzoni 12 Peter Korsgaard 10 Bernd Kuhls 7 Christian Stewart 6 James Hilliard 5 Peter Seiderer 4 Adam Duskett 3 Fabio Estevam 3 Giulio Benetti 3 Romain Naour 3 Yann E. MORIN 2 Andreas Ziegler 2 Arnout Vandecappelle (Essensium/Mind) 2 Dario Binacchi 2 Francois Perrad 2 Ricardo Martincoski 1 Anssi Hannula 1 Cyril Bur 1 Erik Larsson 1 Florent AUMAITRE 1 Gregory CLEMENT 1 Khoa Hoang 1 Lothar Felten 1 Markus Mayer 1 Max Filippov 1 Maxime Chevallier 1 Michael Nosthoff 1 Nuno Gon?alves 1 Quentin Schulz 1 Santosh Multhalli 1 TIAN Yuanhao 1 Tilman Keskin?z 1 Waldemar Brodkorb 1 Yegor Yefremov 1 Yunhao Tian -- Bye, Peter Korsgaard From gilles.talis at gmail.com Sun Jan 30 09:58:20 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 30 Jan 2022 10:58:20 +0100 Subject: [Buildroot] [PATCH v2] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220126215730.30425623@windsurf> References: <20220115202617.370414-1-gilles.talis@gmail.com> <20220126215730.30425623@windsurf> Message-ID: Hi Thomas, thanks for the review. Le mer. 26 janv. 2022 ? 21:57, Thomas Petazzoni a ?crit : > > Hello Gilles, > > On Sat, 15 Jan 2022 21:26:17 +0100 > Gilles Talis wrote: > > > +BR2_aarch64=y > > +BR2_ARM_FPU_VFPV4=y > > +BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" > > +BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > Thanks for this v2. Unfortunately, there is one thing I did not notice > when reviewing v1: you should use fixed versions of the Linux kernel, > U-Boot and TF-A. Here your defconfig uses whatever is the latest, which > is not the policy we have chosen for our defconfigs. > > Could you fix that up by using fixed versions? Yes. Will send a v3 shortly. > > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Thanks! Gilles. From gilles.talis at gmail.com Sun Jan 30 10:11:50 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 30 Jan 2022 11:11:50 +0100 Subject: [Buildroot] [PATCH v3] configs/friendlyarm_nanopi_r2s: new defconfig Message-ID: <20220130101150.20605-1-gilles.talis@gmail.com> The NanoPi R2S is a FriendlyElec mini-router based on: - Rockchip RK3328 SoC - 1GB (or 2GB) DDR4 RAM - Gigabit Ethernet (WAN) - Gigabit Ethernet (USB3) (LAN) - USB 2.0 Host Port - MicroSD slot - Reset button - WAN - LAN - SYS LED https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 Signed-off-by: Gilles Talis --- Changes v1 -> v2: - Drop VFAT partition (kernel, DTB and ext4linux.conf in ext4 partition) Changes v2 -> v3: - Use fixed versions of u-boot, kernel and TF-A --- DEVELOPERS | 2 + board/friendlyarm/nanopi-r2s/extlinux.conf | 4 ++ board/friendlyarm/nanopi-r2s/genimage.cfg | 22 +++++++++ board/friendlyarm/nanopi-r2s/post-build.sh | 5 ++ board/friendlyarm/nanopi-r2s/readme.txt | 57 ++++++++++++++++++++++ configs/friendlyarm_nanopi_r2s_defconfig | 41 ++++++++++++++++ 6 files changed, 131 insertions(+) create mode 100644 board/friendlyarm/nanopi-r2s/extlinux.conf create mode 100644 board/friendlyarm/nanopi-r2s/genimage.cfg create mode 100755 board/friendlyarm/nanopi-r2s/post-build.sh create mode 100644 board/friendlyarm/nanopi-r2s/readme.txt create mode 100644 configs/friendlyarm_nanopi_r2s_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..f8a062558c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1073,7 +1073,9 @@ F: configs/qemu_* N: Gilles Talis F: board/freescale/imx8mmevk/ +F: board/friendlyarm/nanopi-r2s/ F: configs/freescale_imx8mmevk_defconfig +F: configs/friendlyarm_nanopi_r2s_defconfig F: package/cctz/ F: package/faad2/ F: package/fdk-aac/ diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf new file mode 100644 index 0000000000..1ea0cdd8a5 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf @@ -0,0 +1,4 @@ +label NanoPi R2S linux + kernel /boot/Image + devicetree /boot/rk3328-nanopi-r2s.dtb + append root=/dev/mmcblk0p1 rw rootwait diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg new file mode 100644 index 0000000000..a686b4f14e --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "idbloader.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot.itb" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + offset = 16M + image = "rootfs.ext4" + } +} diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh new file mode 100755 index 0000000000..1f5ff6a611 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt new file mode 100644 index 0000000000..6d291cdd60 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/readme.txt @@ -0,0 +1,57 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Nanopi R2S. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Nanopi R2S link: +https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 + +This configuration uses ATF, U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_r2s_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +Files created in output directory +================================= + +output/images + +??? bl31.elf +??? boot.vfat +??? extlinux +??? idbloader.img +??? Image +??? rk3328-nanopi-r2s.dtb +??? rootfs.ext2 +??? rootfs.ext4 -> rootfs.ext2 +??? rootfs.tar +??? sdcard.img +??? u-boot.bin +??? u-boot.itb + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Nanopi R2S and power it up. The console +is on the serial line, 1500000 8N1. + +Notes +===== + +This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig new file mode 100644 index 0000000000..6fcfcd7159 --- /dev/null +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" +BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.32.0 From yegorslists at googlemail.com Sun Jan 30 10:51:16 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Sun, 30 Jan 2022 11:51:16 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov Message-ID: <20220130105116.18458-1-yegorslists@googlemail.com> From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..a4b4fa2f70 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2992,6 +2992,7 @@ F: package/circus/ F: package/dhcpcd/ F: package/feh/ F: package/giblib/ +F: package/hostapd/ F: package/imlib2/ F: package/jquery-datetimepicker/ F: package/jquery-sidebar/ @@ -3020,6 +3021,7 @@ F: package/swig/ F: package/qt5/qt5serialbus/ F: package/sdparm/ F: package/ti-utils/ +F: package/wpa_supplicant/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ -- 2.17.0 From yegorslists at googlemail.com Sun Jan 30 10:54:59 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Sun, 30 Jan 2022 11:54:59 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov Message-ID: <20220130105459.19339-1-yegorslists@googlemail.com> From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a4b4fa2f70..e17803f38a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3002,6 +3002,8 @@ F: package/libical/ F: package/libmbim/ F: package/libndp/ F: package/libnftnl/ +F: package/libqmi/ +F: package/libqrtr-glib/ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ -- 2.17.0 From bernd.kuhls at t-online.de Sun Jan 30 12:34:35 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 30 Jan 2022 13:34:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.16.3 Message-ID: <20220130123435.13149-1-bernd.kuhls@t-online.de> Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 7960522f35..36b0c8c8a1 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee07a66a2cd8332695fb377b685ccf90e56fcff1717316211dee22bde7357d1f xmrig-6.16.2.tar.gz +sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ff2e8d6c1f..7fa638a54c 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.2 +XMRIG_VERSION = 6.16.3 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE -- 2.30.2 From thomas.petazzoni at bootlin.com Sun Jan 30 13:43:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:43:33 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov Message-ID: <20220130134605.E006B82870@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4bdbc7c505157d0039d1010e67f653b0f89b945 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..a4b4fa2f70 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2992,6 +2992,7 @@ F: package/circus/ F: package/dhcpcd/ F: package/feh/ F: package/giblib/ +F: package/hostapd/ F: package/imlib2/ F: package/jquery-datetimepicker/ F: package/jquery-sidebar/ @@ -3020,6 +3021,7 @@ F: package/swig/ F: package/qt5/qt5serialbus/ F: package/sdparm/ F: package/ti-utils/ +F: package/wpa_supplicant/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ From thomas.petazzoni at bootlin.com Sun Jan 30 13:43:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:43:35 +0100 Subject: [Buildroot] [git commit] package/xmrig: bump version to 6.16.3 Message-ID: <20220130134605.F1C6C82A75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0623d12244ae40a25603958ff6f4ee9d2db31698 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 7960522f35..36b0c8c8a1 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee07a66a2cd8332695fb377b685ccf90e56fcff1717316211dee22bde7357d1f xmrig-6.16.2.tar.gz +sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ff2e8d6c1f..7fa638a54c 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.2 +XMRIG_VERSION = 6.16.3 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sun Jan 30 13:43:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:43:34 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov Message-ID: <20220130134605.E8B2E82A6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73ce754531b5e45bd42b56c58718fbacc754406f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a4b4fa2f70..e17803f38a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3002,6 +3002,8 @@ F: package/libical/ F: package/libmbim/ F: package/libndp/ F: package/libnftnl/ +F: package/libqmi/ +F: package/libqrtr-glib/ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:25 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov In-Reply-To: <20220130105116.18458-1-yegorslists@googlemail.com> References: <20220130105116.18458-1-yegorslists@googlemail.com> Message-ID: <20220130145325.733f8d3d@windsurf> On Sun, 30 Jan 2022 11:51:16 +0100 yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > Signed-off-by: Yegor Yefremov > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:28 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov In-Reply-To: <20220130105459.19339-1-yegorslists@googlemail.com> References: <20220130105459.19339-1-yegorslists@googlemail.com> Message-ID: <20220130145328.4192c53e@windsurf> On Sun, 30 Jan 2022 11:54:59 +0100 yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > Signed-off-by: Yegor Yefremov > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.16.3 In-Reply-To: <20220130123435.13149-1-bernd.kuhls@t-online.de> References: <20220130123435.13149-1-bernd.kuhls@t-online.de> Message-ID: <20220130145331.5474ffa9@windsurf> On Sun, 30 Jan 2022 13:34:35 +0100 Bernd Kuhls wrote: > Changelog: > https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md > > Signed-off-by: Bernd Kuhls > --- > package/xmrig/xmrig.hash | 2 +- > package/xmrig/xmrig.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:00:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:00:17 +0100 Subject: [Buildroot] [PATCH 1/5] package/efl: bump to version 1.26.1 In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220130150017.5914a95a@windsurf> On Sat, 29 Jan 2022 23:46:47 +0100 Romain Naour wrote: > This is a bug-fix release. > > See: https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 > > Signed-off-by: Romain Naour > --- > package/efl/efl.hash | 4 ++-- > package/efl/efl.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:00:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:00:20 +0100 Subject: [Buildroot] [PATCH 2/5] package/enlightenment: bump to version 0.25.1 In-Reply-To: <20220129224651.1282263-2-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-2-romain.naour@gmail.com> Message-ID: <20220130150020.2a13b8e5@windsurf> On Sat, 29 Jan 2022 23:46:48 +0100 Romain Naour wrote: > This is the a bugfix release. > > See: > https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 > > Signed-off-by: Romain Naour > --- > package/enlightenment/enlightenment.hash | 4 ++-- > package/enlightenment/enlightenment.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:02:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:02:43 +0100 Subject: [Buildroot] [PATCH 3/5] package/efl: rework eeze handling in Kconfig In-Reply-To: <20220129224651.1282263-3-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-3-romain.naour@gmail.com> Message-ID: <20220130150243.5795f1fa@windsurf> On Sat, 29 Jan 2022 23:46:49 +0100 Romain Naour wrote: > Commit [1] added eeze dependency using "depends on" to several efl > options (drm, libmount) instead of selecting eeze and propagate the > udev reverse dependency. I do agree with changing from a "depends on BR2_PACKAGE_EFL_EEZE" to a "depends BR2_PACKAGE_HAS_UDEV" + "select BR2_PACKAGE_EFL_EEZE". However... > The dependency between eeze, libinput, efl drm requires to add a new > libinput option. ... I don't understand this justification. Could you clarify. Even after reading PATCH 4/5, I don't get the relationship. PATCH 4/5 could have been done (I guess using the same principle of "depends on BR2_PACKAGE_EFL_EEZE". > Rework eeze handling to use select BR2_PACKAGE_EFL_EEZE since the > user is already aware of the udev dependency (BR2_PACKAGE_HAS_UDEV). I don't understand why you say the user is already aware of the udev dependency? Thanks to the comments? > comment "efl's libmount support needs udev /dev management (eeze)" Remove the "eeze" between parenthesis here I believe. > - depends on !BR2_PACKAGE_EFL_EEZE > + depends on !BR2_PACKAGE_HAS_UDEV > > config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG > bool > @@ -173,7 +174,7 @@ config BR2_PACKAGE_EFL_WAYLAND > depends on BR2_PACKAGE_WAYLAND > depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine > - depends on BR2_PACKAGE_EFL_EEZE # efl drm > + depends on BR2_PACKAGE_HAS_UDEV # efl drm (eeze) > depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only > depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput > select BR2_PACKAGE_EFL_DRM > @@ -182,7 +183,7 @@ config BR2_PACKAGE_EFL_WAYLAND > comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" Ditto. > depends on BR2_PACKAGE_WAYLAND > depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ > - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ > + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ > || !BR2_ENABLE_LOCALE > > choice > @@ -215,9 +216,10 @@ endchoice # OpenGL support > > config BR2_PACKAGE_EFL_DRM > bool "Evas DRM Engine" > - depends on BR2_PACKAGE_EFL_EEZE > + depends on BR2_PACKAGE_HAS_UDEV (eeze) Does this line really parses correctly? > depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d > + select BR2_PACKAGE_EFL_EEZE > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_LIBINPUT # For elput > select BR2_PACKAGE_LIBXKBCOMMON > @@ -232,7 +234,7 @@ config BR2_PACKAGE_EFL_DRM > > comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" Remove the "eeze" between parenthesis. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:05:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:05:27 +0100 Subject: [Buildroot] [PATCH 4/5] package/efl: handle input option In-Reply-To: <20220129224651.1282263-4-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-4-romain.naour@gmail.com> Message-ID: <20220130150527.12c67565@windsurf> Hello, On Sat, 29 Jan 2022 23:46:50 +0100 Romain Naour wrote: > +config BR2_PACKAGE_EFL_LIBINPUT > + bool "Enable libinput support (recommended)" > + default y > + depends on BR2_PACKAGE_HAS_UDEV # libinput Should be: depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze > +comment "libinput needs udev /dev management (eeze)" Drop "eeze" between parenthesis. > + depends on !BR2_PACKAGE_HAS_UDEV > + > config BR2_PACKAGE_EFL_LIBSNDFILE > bool "Enable libsndfile support (recommended)" > default y > @@ -216,13 +229,11 @@ endchoice # OpenGL support > > config BR2_PACKAGE_EFL_DRM > bool "Evas DRM Engine" > - depends on BR2_PACKAGE_HAS_UDEV (eeze) > + depends on BR2_PACKAGE_HAS_UDEV # elput, eeze You fixed a bug from the previous commit here. What is "elput" ? > depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d > - select BR2_PACKAGE_EFL_EEZE > + select BR2_PACKAGE_EFL_LIBINPUT Is that the explanation for PATCH 3/5 ? But even that doesn't seem to justify PATCH 3/5: you could have done the same with a "depends on BR2_PACKAGE_EFL_EEZE". Again: I agree with PATCH 3/5, and I think it's the right patch. I just don't understand the justification it has in its commit log. > select BR2_PACKAGE_LIBDRM > - select BR2_PACKAGE_LIBINPUT # For elput What is "elput" ? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:51 +0100 Subject: [Buildroot] [git commit] package/enlightenment: bump to version 0.25.1 Message-ID: <20220130140530.CDF857FEA9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e889bc8db5ac67031abec8a55ba12abb3c443555 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is the a bugfix release. See: https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index dd4c4d78c0..2d977b86f7 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,4 +1,4 @@ -# From https://www.enlightenment.org/news/2021-12-26-enlightenment-0.25.0 -sha256 7d6e72ceed5aca135b7a49c2a1c1eb9d8fde1318613517401d0418e0e5f6df06 enlightenment-0.25.0.tar.xz +# From https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 +sha256 2cf05fe3d96ef35e823619dbc0ac513ecabcae2186800ecd804924a637112444 enlightenment-0.25.1.tar.xz sha256 8d2fbc393e967cd6f5b8559d1744881a6a1ceb3ec6e1c2368c3916809ffccb8d COPYING sha256 cdc77ee1732455b203610f923fe4196046b3f7509038c48dc0b0c7e3492c23f3 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 24bbd96cd0..95670e800d 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.25.0 +ENLIGHTENMENT_VERSION = 0.25.1 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:46 +0100 Subject: [Buildroot] [git commit] package/efl: bump to version 1.26.1 Message-ID: <20220130140530.C5D9F82A52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8aa81ad9f129f8aa3ccd5bdb1207c0ecc3de147a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a bug-fix release. See: https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 6364d276c0..8d50400eb7 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://www.enlightenment.org/news/2021-12-26-efl-1.26.0 -sha256 a4a9bce45fd27f8541874e44a130f64550bee1f2f72feaa6c8a758d92eaf204c efl-1.26.0.tar.xz +# From https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 +sha256 86a9677e3d48dd0c13a399ebb417bd417bd8d150d6b06cc491bc92275c88a642 efl-1.26.1.tar.xz sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING diff --git a/package/efl/efl.mk b/package/efl/efl.mk index ed0a8acc1d..43a2dc4fcb 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.26.0 +EFL_VERSION = 1.26.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT From thomas.petazzoni at bootlin.com Sun Jan 30 14:12:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:12:28 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-directory.txt: reorder select/depends Message-ID: <20220130140530.D72C082A75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39458e33c1e0c4704fd1dbcd64b87cb7016c6deb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master >From [1]: "Even though the ordering has absolutely no consequences in Kconfig, it is not logical (when reading). It is more logical and far easier to understand when depends come first, followed by the selects." Also, the Config.in example in the manual suggests to use this coding style [2]." Use the correct coding style in the chapter "Choosing depends on or select" in the manual. [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html [2] https://nightly.buildroot.org/manual.html#_coding_style Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 6c68d7aa67..e5c7462a6c 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -196,13 +196,13 @@ config BR2_PACKAGE_E -------------------------- config BR2_PACKAGE_D bool "Package D" - select BR2_PACKAGE_B depends on BR2_PACKAGE_A + select BR2_PACKAGE_B config BR2_PACKAGE_E bool "Package E" - select BR2_PACKAGE_D depends on BR2_PACKAGE_A + select BR2_PACKAGE_D -------------------------- Overall, for package library dependencies, +select+ should be From thomas.petazzoni at bootlin.com Sun Jan 30 14:12:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:12:34 +0100 Subject: [Buildroot] [PATCH 5/5] docs/manual/adding-packages-directory.txt: reorder select/depends In-Reply-To: <20220129224651.1282263-5-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-5-romain.naour@gmail.com> Message-ID: <20220130151234.6ab8458c@windsurf> On Sat, 29 Jan 2022 23:46:51 +0100 Romain Naour wrote: > From [1]: > "Even though the ordering has absolutely no consequences in Kconfig, it > is not logical (when reading). It is more logical and far easier to > understand when depends come first, followed by the selects." > > Also, the Config.in example in the manual suggests to use this coding > style [2]." > > Use the correct coding style in the chapter "Choosing depends on or select" > in the manual. > > [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html > [2] https://nightly.buildroot.org/manual.html#_coding_style > > Signed-off-by: Romain Naour > --- > docs/manual/adding-packages-directory.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:17:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:17:25 +0100 Subject: [Buildroot] [git commit] package/{rust, rust-bin}: bump to version 1.58.1 Message-ID: <20220130141029.4FC9782A52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a865fc386d9e7b7e23e5bca051f38ab45920829f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 198 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index bdb1f07fcc..9f8788a295 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,102 +1,102 @@ -# From https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 9c3baf8ec849978b0206262fc402ac9d24fdb2a8ae7b5d785b09022dbdbc20e8 rust-1.54.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9fb4a22b74120b81a4d896326b02d121d5f996b3288580c346ea55a52d8946a9 rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a1a77737d218087eb7d3613adcde2c9e383d758cdf128646a0ee63396145270b rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 9a7ff8e4cd160f6a58c3b5c7e679b7acdc427c2440ecc70a31a5dc71bbecd0c8 rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c87dc1681756c9c275eba690c6a05bcdd2ac3bd04a70ae039869dc85fff18b69 rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 74c9f120ad8a443798ebec74302b5166a0880b13b1d8c43dde0c8ba70d9e4b2d rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 2a19d96cf9e863448b21ff989550da54080312ce99272128cc0eb3b1fe5c73cc rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 481192a6906c44501f910a35fc49ed9b1b271925c4569a52f45d9efbc2058ae2 rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 2716f587d0da1dd26fc64251303f5705230f5b86e47e9af35e11622d01ceb963 rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 b1f25af230f3b6fd930452024bd0cc9f4599bfb15f09f802cdb756effa516bbf rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 86549aca1b65188cedf3f1c8fce5af3d7f817450418367049d4bbe8c69ba1da0 rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 7823b95fc3fcd7cc47ba767e2e917c9efbafed2d5ad0b74e7c087600bd72e54f rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 f9a650a3970dbc321e8979dd87ed02fd8f9d03901c3fb1a87724f3c214eb6e57 rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 19a80cfaf18c15eaa1c112312c0cb0ccfd14179407118b35735cdcfc1cc4c60f rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 7c747dea305f5d4b1c6a23d064fbb41e24bb56f2917867020bb57cb064878dc4 rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.asc -sha256 b52dd3d4ae465037ed2987e23457d30e1a75fd16c2c421613ec52c250947a5f8 rust-std-1.54.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e88269a37ebfbff52fcd07746c53fc0bfa2570531f10f226800d5783ce735e3f rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.asc -sha256 947054afa4d6e37c64e484c704b5f09043783b83aafbf7a00e6959442b1fc14f rust-std-1.54.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 59c0bd07976f9e18e05e328e2f0acd9e99b736ea0330a03b313842e5c5816e13 rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.asc -sha256 02611ec7a6d510572803b4bd9948f0790e9f0ae8e3047ff7fa465300346e3b74 rust-std-1.54.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 dba582de46b7f97ba85b2d75662482df67214e71e0b9cea3c9c153c9d371a00f rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2e94aedf59369d81524dfe8027e6e4fb0fe338d2ee7869bd96e5cef24974cf0e rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 d1d32bc202b026470ec2c37826fef92bd91f46b08ed1e2620a50eadba03d7095 rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 25d0c06fb445e16d7aac3b5370b43e72600a2aee41fa06605f64a3b8a8ed0e4b rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 626b4255d31c35fa77669471c15ec63b0e88726115538e598a6ef6e814d83bae rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 0f4aaec3ef60ad3c017a39925a1627cc79cd5be00cc8ea7759a470c24b0b66e7 rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 116b2cd682cc5902f91a1ffbe2eb649262d871cd3c47e539afeb723513ae15eb rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 f0329a9d6c96eeb1db5cb7969dbadbab58768b8bff48a1ffc89103031945126e rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 c08b7df82a30acacb3afcdad34b3384e77a9f35ce6bef10d43f29f129fab35e1 rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 8b9ac3e1947036d6f2a3939edd279631fc1b0a260507343a8b3e9ecd448fe738 rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 6ce101e3c5b1bae6006c61a18dcb5685fe0ff57ea8c00a36e6bf95f748abe5f6 rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a22e19859b3c5032daac1633637546a986c51bdfa3ad0db6e394e6cc461f466b rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 c2de24eb3e524c0fdd1e8116f578c103035da1ece1e4c06efab67999180eefe8 rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 110ca4967351d8535f3d39e24f40e2941c20346c5765d3530270e134ae50568e rust-1.58.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f71b077caf0becbd0af9fd22bc1fa31c4fdf7a21fe046da8a15a7bde1286da25 rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 c7a016ac63aeb5481d661ee3e680b57d35d5ccb902c605c32937a047a02cff49 rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 4c8d9774fb1f6cfa616f2c43395f438e887a38f0cd901a3886056cc1c1b84c30 rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 eb58c2b72e9bbe50c80e9f2981e14d737198f7e17a4cad524d00baefdfa3bc1d rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 58e3f4905c3e7028811971219a3222640f947062fb93dbe51c1674551e9b06a6 rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 b354f0ad28d8cc7d5996d46c3a310c80aa6486ac7b89abcd1eeef7f13435e0ff rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 705fba2a50835354112ab86d1ee8889c39f3c7265d7ca26f1dffebaa463600a6 rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 0505759fa8b26c902a701f266db4bfbfe496de71c5c6548a55c562fe9d386485 rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 9ca8adb43b4e75556a99b6c7a9bc1d9aab894bbe109736c34582169ec81aee14 rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 9f38bc3220d659ff482db9a0ace9dcb7051991d471149fad7bbb62fce8314e04 rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 1511c675d17033737ab2bd1e87b525aaf59e0455f5a717ab0a91fd849949164f rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 2cf8a8cc2441a1bb4b45b690c87fff4df975fac077240706c08594e26f901bdc rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 db86e823484f210884d7d815ffcd7dae355bba86e18151b0838ec06544bb8126 rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 02bce02f929114cc60126410fceeab6c0bcc8b96c394de9516d8f449880cb585 rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.asc +sha256 e80d5769f042a00388546dbd26cb40c045d5dddc84e5da3f98d174027ed9eaaa rust-std-1.58.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 d7f2bc431db551ea9019a6d50d4e3f11e14fabbea3abec1478ac72a281309152 rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.asc +sha256 c70fbb13aedfb88cfec8098355a155a4edce3d52f9b099bc033b7c7ac45aab00 rust-std-1.58.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 b678ac0282cbb1965f9a7485a1f56b01d0229f91ddff5a18a9628f86970f5902 rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.asc +sha256 2f571f4c9b4e86e278539e811f495fb84f44898d4333b983a3d95ef5d2c0fdd8 rust-std-1.58.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 7f2f613606f039eec83239753a83c227b1d3c39b6474647234e7788a1541e850 rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 7283539843df5c8abd06b0ce3830efeab0d673447b45d3b6636d2eb296d28681 rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 3d2935e0979a7150cc271481f5f06569005ee27f0a7ef7ed1a5393c3e34b1974 rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 33078d23ea70ca405b5938e5a2a74fbf4ec7dc41b729e4991e3e01d4c8370028 rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 fdade0d00dac3524348041ec915a5a96208c9c1929ce746ab6352d0d2897a3a7 rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 c747a00ac9a6ee70793002e6db2fbce3b2cd60eda277729468d18369736c6c8e rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 7813f825e5d10aac0ded4b3f785970c69c25464b4edcf9c2b83eff0e55ee95f3 rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 c68d93de3a46ec709788fee2c38a298a261d4254d299299195ab3474b316a59b rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 a85f5f42918e8b140d7093ba49fc46a21625863538c95d2db03f831cc445f025 rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 2d7276fe261478c377913177dcec3e0aeed84f2c567db0ae8e415efee7bb9ce0 rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 7a7cd002c63179f3f47d64b1140c180986322a7cc0d31de61d7c4728cedacba0 rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 e72367c15906f021f46801652181c917cd3328be022b93bb30506724f7b56256 rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 b0d3e03c9b1eff6e241383913b02653ba80776626ca7c4a93f36c2ad829ba989 rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index bc8a485ac5..d4cb8f50ea 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.54.0 +RUST_BIN_VERSION = 1.58.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 30a348e982..7eb8f59603 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.asc -sha256 a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4 rustc-1.54.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.asc +sha256 2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469 rustc-1.58.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 26ee2a9362..5fad7d404c 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.54.0 +RUST_VERSION = 1.58.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From thomas.petazzoni at bootlin.com Sun Jan 30 14:17:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:17:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.58.1 In-Reply-To: <20220129203438.3855797-1-james.hilliard1@gmail.com> References: <20220129203438.3855797-1-james.hilliard1@gmail.com> Message-ID: <20220130151743.1dc28539@windsurf> On Sat, 29 Jan 2022 13:34:38 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/rust-bin/rust-bin.hash | 198 ++++++++++++++++----------------- > package/rust-bin/rust-bin.mk | 2 +- > package/rust/rust.hash | 6 +- > package/rust/rust.mk | 2 +- > 4 files changed, 104 insertions(+), 104 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:18:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:18:12 +0100 Subject: [Buildroot] [git commit] package/poke: install libpoke.so to staging Message-ID: <20220130142119.A0CB982A52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3af06834c80a5efe5696dac0aab81cb233cec334 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Poke generate a library libpoke.so, so install it to staging. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/poke/poke.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/poke/poke.mk b/package/poke/poke.mk index fed023e954..ddd03ae3b0 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -13,6 +13,7 @@ POKE_LICENSE_FILES = COPYING jitter/COPYING # 0001-configure.ac-HELP2MAN-replace-by-false-when-cross-co.patch POKE_AUTORECONF = YES +POKE_INSTALL_STAGING = YES POKE_DEPENDENCIES = host-flex host-bison host-pkgconf bdwgc readline # poke bundle gnulib that doesn't support the case where From thomas.petazzoni at bootlin.com Sun Jan 30 14:28:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:28:26 +0100 Subject: [Buildroot] [PATCH 1/3] package/poke: install libpoke.so to staging In-Reply-To: <20220129142352.1197168-1-romain.naour@gmail.com> References: <20220129142352.1197168-1-romain.naour@gmail.com> Message-ID: <20220130152826.27bed0e4@windsurf> On Sat, 29 Jan 2022 15:23:50 +0100 Romain Naour wrote: > Poke generate a library libpoke.so, so install it to staging. > > Signed-off-by: Romain Naour > --- > package/poke/poke.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:28:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:28:38 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: add missing openssl build dependency Message-ID: <20220130142326.9897D8282A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e2976aee57cb4f8f75899c4ad5a5ea4ff8f5ad4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 01764876e3d4e7ab95c8365f1c83e6c12d49757c ("package/python-cryptography: bump version to 36.0.1") incorrectly removed the build dependency on openssl. This causes the following build failure: build/temp.linux-x86_64-3.10/_openssl.c:575:10: fatal error: openssl/opensslv.h: No such file or directory 575 | #include | ^~~~~~~~~~~~~~~~~~~~ as OpenSSL is no longer guaranteed to be built before python-cryptography (the Config.in file still had a "select BR2_PACKAGE_OPENSSL" guaranteeing that OpenSSL would be built, but not necessarily before). Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-cryptography/python-cryptography.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index fc1686af9a..e642691bc5 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -12,7 +12,11 @@ PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-setuptools-rust host-python-cffi host-rustc +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" From thomas.petazzoni at bootlin.com Sun Jan 30 14:30:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:30:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: add missing openssl build dependency In-Reply-To: <20220129202751.3851776-1-james.hilliard1@gmail.com> References: <20220129202751.3851776-1-james.hilliard1@gmail.com> Message-ID: <20220130153056.312fb1b2@windsurf> On Sat, 29 Jan 2022 13:27:51 -0700 James Hilliard wrote: > Fixes: > build/temp.linux-x86_64-3.10/_openssl.c:575:10: fatal error: openssl/opensslv.h: No such file or directory > 575 | #include > | ^~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: James Hilliard > --- > package/python-cryptography/python-cryptography.mk | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Applied to master with an extended commit log, especially pointing at when the regression/issue was introduced. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:46:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:46:05 +0100 Subject: [Buildroot] [PATCH 2/3] package/poke: disable minimal-threading with thumb or thumb2 In-Reply-To: <20220129142352.1197168-2-romain.naour@gmail.com> References: <20220129142352.1197168-1-romain.naour@gmail.com> <20220129142352.1197168-2-romain.naour@gmail.com> Message-ID: <20220130154605.5fad582e@windsurf> Hello, On Sat, 29 Jan 2022 15:23:51 +0100 Romain Naour wrote: > +# Disable minimal-threading when thumb or thumb2 is enabled > +# due to runtime issue. > +# https://lists.gnu.org/archive/html/poke-devel/2022-01/msg00162.html > +ifeq ($(BR2_ARM_CPU_HAS_THUMB)$(BR2_ARM_CPU_HAS_THUMB2),y) > +POKE_CONF_OPTS += --disable-dispatch-minimal-threading > +else > +POKE_CONF_OPTS += --enable-dispatch-minimal-threading > +endif I don't understand this patch, because minimal-threading is already disabled by default (at least in poke 1.4, I haven't checked in poke 2.0). jitter/configure.ac contains: # Is the minimal-threading dispatch enabled? Check the default and the # configure command-line option. AC_MSG_CHECKING([if minimal-threading dispatch is enabled]) # FIXME: reenable this when I make defect handling reliable. #default=$(test "x$JITTER_HAVE_ACTUAL_GCC" = "xyes" && echo yes || echo no) default=no AC_ARG_ENABLE([dispatch-minimal-threading], AS_HELP_STRING([--enable-dispatch-minimal-threading], [enable minimal threading dispatch: default yes if and only if GCC (not an imitation) is used]), jitter_enable_dispatch_minimal_threading="$enableval", jitter_enable_dispatch_minimal_threading="$default") if test "x$jitter_enable_dispatch_minimal_threading" = "xyes"; then jitter_best_dispatch_model="minimal-threading" jitter_enabled_dispatch_models="$jitter_enabled_dispatch_models minimal-threading" fi AC_MSG_RESULT([$jitter_enable_dispatch_minimal_threading$jitter_subpackage_disclaimer]) # FIXME: remove this warning message when I make defect handling reliable. if test "x$jitter_enable_dispatch_minimal_threading" = "xyes"; then AC_MSG_WARN([minimal-threading dispatch is currently unreliable, and should not be used in production until defective instruction replacement is fully implemented]) fi See the "default=no" ? Also, when building with the following defconfig: BR2_arm=y BR2_cortex_a8=y BR2_ARM_EABI=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_POKE=y # BR2_TARGET_ROOTFS_TAR is not set The minimal threading is already disabled: checking if switch dispatching is enabled... yes, provisionally (sub-package mode) checking if direct-threading dispatch is enabled... yes, provisionally (sub-package mode) checking if minimal-threading dispatch is enabled... no, provisionally (sub-package mode) checking if no-threading dispatch is enabled... no, provisionally (sub-package mode) configure: sub-package mode: disabling every dispatch except direct-threading configure: (the following dispatches could have been enabled: switch direct-threading) configure: enabled dispatching models are: direct-threading configure: the best enabled dispatching model is: direct-threading So what this patch is doing is in fact slightly the opposite of what he says: instead of disabling minimal threading for thumb or thumb2, it enables it for any other platform. Are you sure this patch was needed for poke 1.4, and not for poke 2.0 ? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:49:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:49:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsoup: add choice between libsoup2 and libsoup3 In-Reply-To: <20220129214235.5133-2-thomas.devoogdt@gmail.com> References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> <20220129214235.5133-2-thomas.devoogdt@gmail.com> Message-ID: <20220130154908.0ff0f0b6@windsurf> Hello Thomas, Thanks for your patch. On Sat, 29 Jan 2022 22:42:35 +0100 Thomas Devoogdt wrote: > Libsoup3 has a new API [1], packages using libsoup2 may not > compile with libsoup3 or may crash at runtime in unexpected > ways. So the default will (for now) stay on libsoup2. > A tracking table for the migration can be found here [2]. A "choice" is not going to work well, as it means that in a given configuration we will only be able to install either packages that need libsoup2 *or* packages that libsoup3, bit not a mix of both. Is it possible to install both libsoup2 and libsoup3 side-by-side in the same system? This requires them having a different library name and a different location for header files. If that's the case, we will definitely want to have a separate libsoup3 package, so that we can install libsoup and libsoup3 side by side in the same system. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:50:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:50:42 +0100 Subject: [Buildroot] [git commit] package/libglib2: bump version to 2.70.0 Message-ID: <20220130144346.7617282AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=079923d5fabf4f887bb140808cb16067ca08b19b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The internal_pcre option was dropped in: https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index c402cbafa5..2f95228932 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.68.4', + version : '2.70.0', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index d421e025ff..580be3e08e 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum -sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum +sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index af73aeb3bf..d3cba1a8bb 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.70 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -30,7 +30,6 @@ HOST_LIBGLIB2_CONF_OPTS = \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ - -Dinternal_pcre=false \ -Dtests=false \ -Doss_fuzz=disabled @@ -52,7 +51,6 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ -Dglib_debug=disabled \ - -Dinternal_pcre=false \ -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ -Dtests=false \ From thomas.petazzoni at bootlin.com Sun Jan 30 14:51:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:51:35 +0100 Subject: [Buildroot] [git commit] board/andes: fix build failure with host gcc >= 10 Message-ID: <20220130144438.AE24282A52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3529e8c21c939d73cc0090cb41c17b02db5b1013 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add patch to fix linux bug: ``` HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ``` Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478164 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...-Remove-redundant-YYLOC-global-declaratio.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch new file mode 100644 index 0000000000..71ae991816 --- /dev/null +++ b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch @@ -0,0 +1,52 @@ +From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Tue, 14 Jan 2020 18:53:41 +0100 +Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration + +gcc 10 will default to -fno-common, which causes this error at link +time: + + (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here + +This is because both dtc-lexer as well as dtc-parser define the same +global symbol yyloc. Before with -fcommon those were merged into one +defintion. The proper solution would be to to mark this as "extern", +however that leads to: + + dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] + 26 | extern YYLTYPE yylloc; + | ^~~~~~ +In file included from dtc-lexer.l:24: +dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here + 127 | extern YYLTYPE yylloc; + | ^~~~~~ +cc1: all warnings being treated as errors + +which means the declaration is completely redundant and can just be +dropped. + +Signed-off-by: Dirk Mueller +Signed-off-by: David Gibson +[robh: cherry-pick from upstream] +Cc: stable at vger.kernel.org +Signed-off-by: Rob Herring +Signed-off-by: Giulio Benetti +--- + scripts/dtc/dtc-lexer.l | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l +index 06c040902444..d1b3810156c7 100644 +--- a/scripts/dtc/dtc-lexer.l ++++ b/scripts/dtc/dtc-lexer.l +@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +-- +2.25.1 + From thomas.petazzoni at bootlin.com Sun Jan 30 14:52:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:52:35 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.70.0 In-Reply-To: <20220129214235.5133-1-thomas.devoogdt@gmail.com> References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> Message-ID: <20220130155235.2f51e08a@windsurf> On Sat, 29 Jan 2022 22:42:34 +0100 Thomas Devoogdt wrote: > The internal_pcre option was dropped in: > https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c > > Signed-off-by: Thomas Devoogdt > --- > package/libglib2/0002-remove-cpp-requirement.patch | 2 +- > package/libglib2/libglib2.hash | 4 ++-- > package/libglib2/libglib2.mk | 6 ++---- > 3 files changed, 5 insertions(+), 7 deletions(-) I've applied, thanks! It would be nice if you could watch http://autobuild.buildroot.net/ in the next few days and see if there are any failures related to libglib2 (note: failures can happen in other packages that libglib2), as major updates of libglib2 have several times caused breakage. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:53:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:53:25 +0100 Subject: [Buildroot] [PATCH] board/andes: fix build failure with host gcc >= 10 In-Reply-To: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> References: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> Message-ID: <20220130155325.635964dc@windsurf> Hello Giulio, On Sun, 30 Jan 2022 00:14:20 +0100 Giulio Benetti wrote: > Add patch to fix linux bug: > ``` > HOSTLD scripts/dtc/dtc > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > ``` > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478164 > > Signed-off-by: Giulio Benetti > --- > ...ve-redundant-YYLOC-global-declaratio.patch | 52 +++++++++++++++++++ > 1 file changed, 52 insertions(+) > create mode 100644 board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch I've applied to master. However, I would have very much preferred a kernel version bump, tested by Nylon Chen. Nylon: could you send a patch to update this defconfig to a newer kernel version? Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:55:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:55:13 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: fix debug build Message-ID: <20220130144826.BA4A482747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32a0230d7028d9cbe90e25bcbf5d814dbe1b9967 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There is no --debug mode for cargo resulting in the following build failure in ripgrep since its conversion to cargo infrastructure in commit 342fd3e7350479dc368541ac77a5130ebb53194c: error: Found argument '--debug' which wasn't expected, or isn't valid in this context Fixes: - http://autobuild.buildroot.org/results/772ebdd6a39950457a59419bdc1376cb0e0a3611 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 614d46ad64..e74a8358bc 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -104,7 +104,7 @@ define $(2)_BUILD_CMDS $$($(2)_CARGO_ENV) \ cargo build \ --offline \ - $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ + $$(if $$(BR2_ENABLE_DEBUG),,--release) \ --manifest-path Cargo.toml \ --locked \ $$($(2)_CARGO_BUILD_OPTS) From thomas.petazzoni at bootlin.com Sun Jan 30 14:55:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:55:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo: fix debug build In-Reply-To: <20220129094222.3583303-1-fontaine.fabrice@gmail.com> References: <20220129094222.3583303-1-fontaine.fabrice@gmail.com> Message-ID: <20220130155559.11d4fea3@windsurf> On Sat, 29 Jan 2022 10:42:22 +0100 Fabrice Fontaine wrote: > There is no --debug mode for cargo resulting in the following build > failure in ripgrep since its conversion to cargo infrastructure in > commit 342fd3e7350479dc368541ac77a5130ebb53194c: > > error: Found argument '--debug' which wasn't expected, or isn't valid in this context > > Fixes: > - http://autobuild.buildroot.org/results/772ebdd6a39950457a59419bdc1376cb0e0a3611 > > Signed-off-by: Fabrice Fontaine > --- > package/pkg-cargo.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. However, I'm wondering if we shouldn't instead use: --profile=release and --profile=dev See https://doc.rust-lang.org/cargo/reference/profiles.html Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:56:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:56:17 +0100 Subject: [Buildroot] [git commit] package/pkcs11-helper: drop autoreconf Message-ID: <20220130144927.3969F82747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59f8a971ae6c8f88bf99dede56946e701a2c1b40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master autoreconf is not needed since commit dbf8047f64f081ffbc97b67dd891690632377692 as the official tarball already ships a configure file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pkcs11-helper/pkcs11-helper.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 805e000759..90929404be 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -10,7 +10,6 @@ PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/p PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL PKCS11_HELPER_DEPENDENCIES = host-pkgconf -PKCS11_HELPER_AUTORECONF = YES PKCS11_HELPER_INSTALL_STAGING = YES PKCS11_HELPER_CONF_OPTS = \ From thomas.petazzoni at bootlin.com Sun Jan 30 14:56:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:56:25 +0100 Subject: [Buildroot] [git commit] package/pkcs11-helper: bump to version 1.28 Message-ID: <20220130144927.42E1482AEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a2e33c5149c902e8532be7db6b97a6ef4fb9e62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/OpenSC/pkcs11-helper/releases/tag/pkcs11-helper-1.28 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch | 62 ---------------------- package/pkcs11-helper/pkcs11-helper.hash | 2 +- package/pkcs11-helper/pkcs11-helper.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) diff --git a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch b/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch deleted file mode 100644 index d0b573446f..0000000000 --- a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d159a5c59c80552c3e8ea75d9bcf29b3a8e8289d Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 30 Jul 2021 20:06:36 +0300 -Subject: [PATCH] nss: use nss pkcs11.h - -make nss happy with its own extensions and non-standard behavior. -[Retrieved (and updated to remove ChangeLog update) from: -https://github.com/OpenSC/pkcs11-helper/pull/39] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 1 + - lib/_pkcs11h-crypto-nss.c | 14 ++++++++++---- - lib/common.h | 7 +++++++ - 3 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/lib/_pkcs11h-crypto-nss.c b/lib/_pkcs11h-crypto-nss.c -index 4b70e826..f57f9e6b 100644 ---- a/lib/_pkcs11h-crypto-nss.c -+++ b/lib/_pkcs11h-crypto-nss.c -@@ -48,15 +48,21 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include "common.h" -- --#include "_pkcs11h-crypto.h" -+#ifdef HAVE_CONFIG_H -+#include -+#endif - - #if defined(ENABLE_PKCS11H_ENGINE_NSS) --#define _PKCS11T_H_ /* required so no conflict with ours */ - #include - #include - -+/* Use PKCS#11 of nss to avoid conflicts and make nss happy with its own extensions */ -+#define PKCS11_H 1 -+ -+#include "common.h" -+ -+#include "_pkcs11h-crypto.h" -+ - static - int - __pkcs11h_crypto_nss_initialize ( -diff --git a/lib/common.h b/lib/common.h -index 61a958af..2499e9c5 100644 ---- a/lib/common.h -+++ b/lib/common.h -@@ -72,5 +72,12 @@ - - #define _PKCS11H_ASSERT assert - -+#ifndef FALSE -+#define FALSE 0 -+#endif -+#ifndef TRUE -+#define TRUE 1 -+#endif -+ - #endif - diff --git a/package/pkcs11-helper/pkcs11-helper.hash b/package/pkcs11-helper/pkcs11-helper.hash index d707bcf914..4114378ab8 100644 --- a/package/pkcs11-helper/pkcs11-helper.hash +++ b/package/pkcs11-helper/pkcs11-helper.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 653730f0c561bbf5941754c0783976113589b2dc64a0661c908dc878bfa4e58b pkcs11-helper-1.27.0.tar.bz2 +sha256 5bd55adafdbb708e096070dd0a910f23e1d5fd6291922398c1a15f00fff2b5ec pkcs11-helper-1.28.0.tar.bz2 sha256 808705ac1daafe07a76431929575c5712a8693977a39ec9102aed25f030754d9 COPYING sha256 865496cf23a6c792739ff2f9ea11e95ac99db89cfe3780a295b4e1495a9c19fe COPYING.BSD sha256 cd2e7d63a11058f19c58b06fb8c759140ce70788369dce6e6e9db40d3475021e COPYING.GPL diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 90929404be..4fc3e21e5a 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -4,7 +4,7 @@ # ################################################################################ -PKCS11_HELPER_VERSION = 1.27 +PKCS11_HELPER_VERSION = 1.28 PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).0.tar.bz2 PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-$(PKCS11_HELPER_VERSION) PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause From thomas.petazzoni at bootlin.com Sun Jan 30 14:56:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:56:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkcs11-helper: drop autoreconf In-Reply-To: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> References: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> Message-ID: <20220130155646.24ea8390@windsurf> On Fri, 28 Jan 2022 22:50:12 +0100 Fabrice Fontaine wrote: > autoreconf is not needed since commit > dbf8047f64f081ffbc97b67dd891690632377692 as the official tarball already > ships a configure file > > Signed-off-by: Fabrice Fontaine > --- > package/pkcs11-helper/pkcs11-helper.mk | 1 - > 1 file changed, 1 deletion(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:56:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:56:57 +0100 Subject: [Buildroot] [git commit] package/p11-kit: bump to version 0.24.1 Message-ID: <20220130144959.2516982747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4fabac3f7fd55570e1ccddc023a64bef712d2fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/p11-glue/p11-kit/releases/tag/0.24.1 https://github.com/p11-glue/p11-kit/releases/tag/0.24.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...t-lists-c-Add-stdint-h-to-fix-compilation.patch | 28 ---------------------- package/p11-kit/p11-kit.hash | 2 +- package/p11-kit/p11-kit.mk | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch b/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch deleted file mode 100644 index d4828666d3..0000000000 --- a/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 507c394cfcf4edffc5e4450c5d737e545c26b857 Mon Sep 17 00:00:00 2001 -From: Daniel Engberg -Date: Sat, 12 Dec 2020 18:56:38 +0100 -Subject: [PATCH] p11-kit/lists.c: Add stdint.h to fix compilation - -Add stdint.h otherwise compilation fails on FreeBSD 13-CURRENT with "use of undeclared identifier 'SIZE_MAX'" - -Signed-off-by: Daniel Engberg - -[Retrieved from: -https://github.com/p11-glue/p11-kit/commit/507c394cfcf4edffc5e4450c5d737e545c26b857] -Signed-off-by: Fabrice Fontaine ---- - p11-kit/lists.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/p11-kit/lists.c b/p11-kit/lists.c -index 365a6d89..1d9062be 100644 ---- a/p11-kit/lists.c -+++ b/p11-kit/lists.c -@@ -39,6 +39,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/package/p11-kit/p11-kit.hash b/package/p11-kit/p11-kit.hash index 3481a40b00..e950060c91 100644 --- a/package/p11-kit/p11-kit.hash +++ b/package/p11-kit/p11-kit.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6 p11-kit-0.23.22.tar.xz +sha256 d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8 p11-kit-0.24.1.tar.xz # Locally computed sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 284eb0fa35..868e3a7c9b 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -4,7 +4,7 @@ # ################################################################################ -P11_KIT_VERSION = 0.23.22 +P11_KIT_VERSION = 0.24.1 P11_KIT_SOURCE = p11-kit-$(P11_KIT_VERSION).tar.xz P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION) P11_KIT_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Jan 30 14:57:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:57:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/p11-kit: bump to version 0.24.1 In-Reply-To: <20220128215657.3023442-1-fontaine.fabrice@gmail.com> References: <20220128215657.3023442-1-fontaine.fabrice@gmail.com> Message-ID: <20220130155704.67ce3036@windsurf> On Fri, 28 Jan 2022 22:56:57 +0100 Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/p11-glue/p11-kit/releases/tag/0.24.1 > https://github.com/p11-glue/p11-kit/releases/tag/0.24.0 > > Signed-off-by: Fabrice Fontaine > --- > ...ts-c-Add-stdint-h-to-fix-compilation.patch | 28 ------------------- > package/p11-kit/p11-kit.hash | 2 +- > package/p11-kit/p11-kit.mk | 2 +- > 3 files changed, 2 insertions(+), 30 deletions(-) > delete mode 100644 package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:57:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:57:19 +0100 Subject: [Buildroot] [git commit] package/libuhttpd: bump to version 3.14.1 Message-ID: <20220130145021.16A6682747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61797c52f5deef2cb67e60cf075ca243078c8855 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.1 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.0 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.13.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-openssl.c-fix-build-with-wolfssl.patch | 47 ---------------------- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch deleted file mode 100644 index deb1a0f93b..0000000000 --- a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e5c5ed1c64cfc715729c9bfbfdcc4be225f344ff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:32:39 +0200 -Subject: [PATCH] openssl.c: fix build with wolfssl - -Fix the following build failure with wolfssl: - -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new': -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function) - 174 | SSL_CTX_set_ciphersuites(c, tls13_ciphersuites); - | ^~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/d0fb629b40b05ad828775894fabed878692bb222 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/ssl/pull/1] ---- - openssl.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/openssl.c b/openssl.c -index 8f3d8b7..c42638c 100644 ---- a/src/ssl/openssl.c -+++ b/src/ssl/openssl.c -@@ -71,14 +71,14 @@ - "TLS13-AES256-GCM-SHA384:" \ - ecdhe_aead_ciphers - #else --# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -- "TLS_AES_128_GCM_SHA256:" \ -- "TLS_AES_256_GCM_SHA384" -- - # define top_ciphers \ - ecdhe_aead_ciphers - #endif - -+# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -+ "TLS_AES_128_GCM_SHA256:" \ -+ "TLS_AES_256_GCM_SHA384" -+ - #define ecdhe_aead_ciphers \ - "ECDHE-ECDSA-CHACHA20-POLY1305:" \ - "ECDHE-ECDSA-AES128-GCM-SHA256:" \ --- -2.30.2 - diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 98bd6e513b..e4fde4eb64 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz +sha256 512d4abfced0ec916d985d3d1eac7528e6676eecae6aca27fdaf313374e29f16 libuhttpd-3.14.1.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 3a99fe0613..b8cf935d01 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.12.1 +LIBUHTTPD_VERSION = 3.14.1 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sun Jan 30 14:57:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:57:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: bump to version 3.14.1 In-Reply-To: <20220128220738.3028614-1-fontaine.fabrice@gmail.com> References: <20220128220738.3028614-1-fontaine.fabrice@gmail.com> Message-ID: <20220130155728.7f171314@windsurf> On Fri, 28 Jan 2022 23:07:38 +0100 Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.1 > https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.0 > https://github.com/zhaojh329/libuhttpd/releases/tag/v3.13.0 > > Signed-off-by: Fabrice Fontaine > --- > ...001-openssl.c-fix-build-with-wolfssl.patch | 47 ------------------- > package/libuhttpd/libuhttpd.hash | 2 +- > package/libuhttpd/libuhttpd.mk | 2 +- > 3 files changed, 2 insertions(+), 49 deletions(-) > delete mode 100644 package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 15:00:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 16:00:27 +0100 Subject: [Buildroot] [git commit] package/htpdate: fix static openssl build Message-ID: <20220130145353.DEC2882AEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ad05acb1e8c83da6c31b88ea2d543f4fe210004 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure with openssl raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(rec_layer_d1.o): in function `DTLS_RECORD_LAYER_new': rec_layer_d1.c:(.text+0x124): undefined reference to `CRYPTO_malloc' Fixes: - http://autobuild.buildroot.org/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...SL_LIBS-to-be-configured-from-environment.patch | 37 ++++++++++++++++++++++ package/htpdate/htpdate.mk | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch new file mode 100644 index 0000000000..6dca2babab --- /dev/null +++ b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch @@ -0,0 +1,37 @@ +From 4ba90fedd553c3b06c925fb6ff5245a5dcabace9 Mon Sep 17 00:00:00 2001 +From: Eddy Vervest +Date: Sat, 29 Jan 2022 10:58:13 +0100 +Subject: [PATCH] Allow SSL_LIBS to be configured from environment + +[Retrieved from: +https://github.com/twekkel/htpdate/commit/4ba90fedd553c3b06c925fb6ff5245a5dcabace9] +Signed-off-by: Fabrice Fontaine +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 4796efa..cf077e6 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,8 +2,9 @@ prefix = $(DESTDIR)/usr + bindir = ${prefix}/sbin + mandir = ${prefix}/share/man + +-CC ?= gcc +-CFLAGS += -Wall -std=c11 -pedantic -O2 ++CC ?= gcc ++CFLAGS += -Wall -std=c11 -pedantic -O2 ++SSL_LIBS ?= -lssl + + INSTALL ?= install -c + STRIP ?= strip -s +@@ -14,7 +15,7 @@ htpdate: htpdate.c + $(CC) $(CFLAGS) -o htpdate htpdate.c + + https: htpdate.c +- $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c -lssl ++ $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c $(SSL_LIBS) + + install: all + $(STRIP) htpdate diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 54b3ec2569..e32480fc85 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -10,7 +10,9 @@ HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = https +HTPDATE_BUILD_OPTS = \ + https \ + SSL_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" HTPDATE_DEPENDENCIES += openssl host-pkgconf endif From thomas.petazzoni at bootlin.com Sun Jan 30 15:02:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 16:02:58 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/htpdate: fix static openssl build In-Reply-To: <20220129104425.3724653-1-fontaine.fabrice@gmail.com> References: <20220129104425.3724653-1-fontaine.fabrice@gmail.com> Message-ID: <20220130160258.20d80a8d@windsurf> On Sat, 29 Jan 2022 11:44:25 +0100 Fabrice Fontaine wrote: > Fix the following static build failure with openssl raised since bump to > version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: > > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(rec_layer_d1.o): in function `DTLS_RECORD_LAYER_new': > rec_layer_d1.c:(.text+0x124): undefined reference to `CRYPTO_malloc' > > Fixes: > - http://autobuild.buildroot.org/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Move pkg-config call in htpdate.mk following upstream feedback: > https://github.com/twekkel/htpdate/pull/17 I'm a bit surprised by your feedback to upstream's reaction. Indeed, it would have been possible in the Makefile to make use of pkg-config if it's available, and if not fallback to just using -lssl. Preserve the existing behavior, doesn't make pkg-config mandatory, but allows people like use to make use of pkg-config. Anyway, I've applied your patch as-is. And it made me wonder why host-pkgconf was already part of the package dependencies? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at gmail.com Sun Jan 30 16:36:39 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 30 Jan 2022 17:36:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <87bl0t1a9o.fsf@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> Message-ID: <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> Hello Fabrice, Joachim, All, Le 03/01/2022 ? 09:41, Joachim Wiberg a ?crit?: > On Sat, Jan 01, 2022 at 23:59, Fabrice Fontaine wrote: >> The LXC 4.0 branch is supported until June 2025. >> Only bugfixes and securitiy issues get included into the stable bugfix >> releases, so it's always safe and recommended to keep up and run the >> latest bugfix release. Well it also includes new features since this version bump break lxc with all kernel < 5.6 due to the broken fall back when the new mount API is not supported. We have a test for lxc using a kernel 4.19 that trigger this issue [1]. See lxc.log: (kernel 5.5) DEBUG conf - conf.c:lxc_setup_devpts_child:1682 - No new devpts instance will be mounted since no pts devices are required lxc-start lxc_iperf3 DEBUG conf - conf.c:lxc_setup_dev_console:1966 - Cleared all (0) mounts from "/dev/console" lxc-start lxc_iperf3 ERROR mount_utils - mount_utils.c:mount_at:661 - No such file or directory - Failed to mount "/proc/self/fd/44" to "/proc/self/fd/43" lxc-start lxc_iperf3 ERROR conf - conf.c:lxc_setup_dev_console:1988 - No such file or directory - Failed to mount "10(/dev/pts/0)" on "43" lxc-start lxc_iperf3 ERROR conf - conf.c:lxc_setup_console:2143 - No such file or directory - Failed to setup console (kernel 5.6) lxc-start lxc_iperf3 TRACE mount_utils - mount_utils.c:can_use_mount_api:582 - Kernel supports mount api lxc-start lxc_iperf3 TRACE mount_utils - mount_utils.c:move_detached_mount:328 - Attach detached mount 45 to filesystem at 43 lxc-start lxc_iperf3 TRACE conf - conf.c:lxc_setup_dev_console:1990 - Setup console "/dev/pts/0" [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/2006798998 This issue is not yet fixed in lxc stable-4.0 branch. Can you have a look? Best regards, Romain >> >> https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 >> >> Signed-off-by: Fabrice Fontaine > > Reviewed-by: Joachim Wiberg > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From thomas.petazzoni at bootlin.com Sun Jan 30 17:06:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:06:54 +0100 Subject: [Buildroot] [git commit] package/freeipmi: fix static build with openipmi Message-ID: <20220130165957.AF23582862@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7bc68d9b10aba88f74095aff85dfd8a730d05348 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure with openipmi raised since commit 8f6b346a34bdb344c4a001d8bd66f5e973013c17: /home/peko/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/libfreeipmi.a(libfreeipmi_la-ipmi-md5.o): in function `md5_init': ipmi-md5.c:(.text+0xa7c): multiple definition of `md5_init'; ../lib/.libs/libipmitool.a(md5.o):md5.c:(.text+0xab0): first defined here Fixes: - http://autobuild.buildroot.org/results/01b22faf08a798ecc5d5465e1c0c13fa024f1096 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...eipmi-rename-md2-and-md5-functions-macros.patch | 695 +++++++++++++++++++++ 1 file changed, 695 insertions(+) diff --git a/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch new file mode 100644 index 0000000000..0de5b29c9c --- /dev/null +++ b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch @@ -0,0 +1,695 @@ +From 50eeda7f14c4eaa56aa86ba570a47557456544f2 Mon Sep 17 00:00:00 2001 +From: Albert Chu +Date: Wed, 19 Jan 2022 11:55:55 -0800 +Subject: [PATCH] libfreeipmi: rename md2 and md5 functions / macros + +Static compilation with libfreeipmi can lead to problems if +other software has similarly named md2/md5 functions +(such as md5_init()). Prefix all macros and functions with +'ipmi_' as needed. Update all callers accordingly. + +[Retrieved from: +https://github.com/chu11/freeipmi-mirror/commit/50eeda7f14c4eaa56aa86ba570a47557456544f2] +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 11 ++ + libfreeipmi/interface/ipmi-lan-interface.c | 48 +++---- + .../interface/ipmi-rmcpplus-interface.c | 2 +- + libfreeipmi/libcommon/ipmi-md2.c | 72 +++++------ + libfreeipmi/libcommon/ipmi-md2.h | 30 ++--- + libfreeipmi/libcommon/ipmi-md5.c | 64 +++++----- + libfreeipmi/libcommon/ipmi-md5.h | 18 +-- + libfreeipmi/util/ipmi-lan-util.c | 120 +++++++++--------- + 8 files changed, 188 insertions(+), 177 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 883a195cf..60bf8c323 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,14 @@ ++2021-01-19 Albert Chu ++ ++ * libfreeipmi/libcommon/ipmi-md2.h, ++ libfreeipmi/libcommon/ipmi-md2.c, ++ libfreeipmi/libcommon/ipmi-md5.h, ++ libfreeipmi/libcommon/ipmi-md5.c: Static compilation with ++ libfreeipmi can lead to problems if other software has similarly ++ named md2/md5 functions (such as md5_init()). Prefix all macros ++ and functions with 'ipmi_' as needed. Update all callers ++ accordingly. ++ + 2022-01-18 Fabrice Fontaine + + * configure.ac: use pkg-config to find gcrypt +diff --git a/libfreeipmi/interface/ipmi-lan-interface.c b/libfreeipmi/interface/ipmi-lan-interface.c +index 20099d770..658be53e1 100644 +--- a/libfreeipmi/interface/ipmi-lan-interface.c ++++ b/libfreeipmi/interface/ipmi-lan-interface.c +@@ -533,37 +533,37 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_rmcp_hdr, + + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- uint8_t digest[MD2_DIGEST_LENGTH]; ++ ipmi_md2_t ctx; ++ uint8_t digest[IPMI_MD2_DIGEST_LENGTH]; + +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); + +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, session_id_buf, session_id_len); +- md2_update_data (&ctx, msg_data_ptr, msg_data_count); +- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, digest, MD2_DIGEST_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md2_update_data (&ctx, msg_data_ptr, msg_data_count); ++ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, digest, IPMI_MD2_DIGEST_LENGTH); ++ ipmi_md2_init (&ctx); + + memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- uint8_t digest[MD5_DIGEST_LENGTH]; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, session_id_buf, session_id_len); +- md5_update_data (&ctx, msg_data_ptr, msg_data_count); +- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, digest, MD5_DIGEST_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ uint8_t digest[IPMI_MD5_DIGEST_LENGTH]; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md5_update_data (&ctx, msg_data_ptr, msg_data_count); ++ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, digest, IPMI_MD5_DIGEST_LENGTH); ++ ipmi_md5_init (&ctx); + + memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); + } +diff --git a/libfreeipmi/interface/ipmi-rmcpplus-interface.c b/libfreeipmi/interface/ipmi-rmcpplus-interface.c +index 1f462da7e..d1fd0753a 100644 +--- a/libfreeipmi/interface/ipmi-rmcpplus-interface.c ++++ b/libfreeipmi/interface/ipmi-rmcpplus-interface.c +@@ -1134,7 +1134,7 @@ _construct_session_trlr_authentication_code (uint8_t integrity_algorithm, + { + hash_algorithm = IPMI_CRYPT_HASH_MD5; + hash_flags = 0; +- expected_digest_len = MD5_DIGEST_LENGTH; ++ expected_digest_len = IPMI_MD5_DIGEST_LENGTH; + copy_digest_len = IPMI_MD5_128_AUTHENTICATION_CODE_LENGTH; + } + else /* IPMI_INTEGRITY_ALGORITHM_HMAC_SHA256_128 */ +diff --git a/libfreeipmi/libcommon/ipmi-md2.c b/libfreeipmi/libcommon/ipmi-md2.c +index 6e9386be7..076b555bd 100644 +--- a/libfreeipmi/libcommon/ipmi-md2.c ++++ b/libfreeipmi/libcommon/ipmi-md2.c +@@ -101,15 +101,15 @@ static unsigned char S[256] = + 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14 + }; + +-#define L ctx->l +-#define X ctx->x +-#define C ctx->c +-#define M ctx->m +-#define Mlen ctx->mlen +-#define MD2_MAGIC 0xf00fd00d ++#define L ctx->l ++#define X ctx->x ++#define C ctx->c ++#define M ctx->m ++#define Mlen ctx->mlen ++#define IPMI_MD2_MAGIC 0xf00fd00d + + int +-md2_init (md2_t *ctx) ++ipmi_md2_init (ipmi_md2_t *ctx) + { + + if (ctx == NULL) +@@ -118,26 +118,26 @@ md2_init (md2_t *ctx) + return (-1); + } + +- ctx->magic = MD2_MAGIC; ++ ctx->magic = IPMI_MD2_MAGIC; + + L = 0; + Mlen = 0; +- memset (X, '\0', MD2_BUFFER_LENGTH); +- memset (C, '\0', MD2_CHKSUM_LENGTH); +- memset (M, '\0', MD2_BLOCK_LENGTH); ++ memset (X, '\0', IPMI_MD2_BUFFER_LENGTH); ++ memset (C, '\0', IPMI_MD2_CHKSUM_LENGTH); ++ memset (M, '\0', IPMI_MD2_BLOCK_LENGTH); + + return (0); + } + + static void +-_md2_update_digest_and_checksum (md2_t *ctx) ++_ipmi_md2_update_digest_and_checksum (ipmi_md2_t *ctx) + { + unsigned int j, k; + uint8_t c, t; + + /* Update X */ + +- for (j = 0; j < MD2_BLOCK_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) + { + X[16+j] = M[j]; + X[32+j] = (X[16+j] ^ X[j]); +@@ -145,9 +145,9 @@ _md2_update_digest_and_checksum (md2_t *ctx) + + t = 0; + +- for (j = 0; j < MD2_ROUNDS_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_ROUNDS_LENGTH; j++) + { +- for (k = 0; k < MD2_BUFFER_LENGTH; k++) ++ for (k = 0; k < IPMI_MD2_BUFFER_LENGTH; k++) + { + t = X[k] = (X[k] ^ S[t]); + } +@@ -166,7 +166,7 @@ _md2_update_digest_and_checksum (md2_t *ctx) + * Set C[j] to C[j] xor S[c xor L]. + */ + +- for (j = 0; j < MD2_BLOCK_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) + { + c = M[j]; + C[j] = C[j] ^ S[c ^ L]; +@@ -175,10 +175,10 @@ _md2_update_digest_and_checksum (md2_t *ctx) + } + + int +-md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) ++ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen) + { + +- if (ctx == NULL || ctx->magic != MD2_MAGIC || buf == NULL) ++ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC || buf == NULL) + { + errno = EINVAL; + return (-1); +@@ -187,19 +187,19 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) + if (buflen == 0) + return (0); + +- if ((Mlen + buflen) >= MD2_BLOCK_LENGTH) ++ if ((Mlen + buflen) >= IPMI_MD2_BLOCK_LENGTH) + { + unsigned int bufcount; + +- bufcount = (MD2_BLOCK_LENGTH - Mlen); ++ bufcount = (IPMI_MD2_BLOCK_LENGTH - Mlen); + memcpy (M + Mlen, buf, bufcount); +- _md2_update_digest_and_checksum (ctx); ++ _ipmi_md2_update_digest_and_checksum (ctx); + +- while ((buflen - bufcount) >= MD2_BLOCK_LENGTH) ++ while ((buflen - bufcount) >= IPMI_MD2_BLOCK_LENGTH) + { +- memcpy (M, buf + bufcount, MD2_BLOCK_LENGTH); +- bufcount += MD2_BLOCK_LENGTH; +- _md2_update_digest_and_checksum (ctx); ++ memcpy (M, buf + bufcount, IPMI_MD2_BLOCK_LENGTH); ++ bufcount += IPMI_MD2_BLOCK_LENGTH; ++ _ipmi_md2_update_digest_and_checksum (ctx); + } + + Mlen = buflen - bufcount; +@@ -217,33 +217,33 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) + } + + static void +-_md2_append_padding_and_checksum (md2_t *ctx) ++_ipmi_md2_append_padding_and_checksum (ipmi_md2_t *ctx) + { + unsigned int padlen; + int padindex; + +- padlen = MD2_PADDING_LENGTH - Mlen; ++ padlen = IPMI_MD2_PADDING_LENGTH - Mlen; + padindex = padlen - 1; + +- md2_update_data (ctx, padding[padindex], padlen); ++ ipmi_md2_update_data (ctx, padding[padindex], padlen); + +- md2_update_data (ctx, C, MD2_CHKSUM_LENGTH); ++ ipmi_md2_update_data (ctx, C, IPMI_MD2_CHKSUM_LENGTH); + } + + int +-md2_finish (md2_t *ctx, void *digest, unsigned int digestlen) ++ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen) + { +- if (ctx == NULL || ctx->magic != MD2_MAGIC +- || digest == NULL || digestlen < MD2_DIGEST_LENGTH) ++ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC ++ || digest == NULL || digestlen < IPMI_MD2_DIGEST_LENGTH) + { + errno = EINVAL; + return (-1); + } + +- _md2_append_padding_and_checksum (ctx); +- memcpy (digest, X, MD2_DIGEST_LENGTH); ++ _ipmi_md2_append_padding_and_checksum (ctx); ++ memcpy (digest, X, IPMI_MD2_DIGEST_LENGTH); + +- ctx->magic = ~MD2_MAGIC; +- return (MD2_DIGEST_LENGTH); ++ ctx->magic = ~IPMI_MD2_MAGIC; ++ return (IPMI_MD2_DIGEST_LENGTH); + } + +diff --git a/libfreeipmi/libcommon/ipmi-md2.h b/libfreeipmi/libcommon/ipmi-md2.h +index c102fce2c..05328e85e 100644 +--- a/libfreeipmi/libcommon/ipmi-md2.h ++++ b/libfreeipmi/libcommon/ipmi-md2.h +@@ -34,26 +34,26 @@ + + #include + +-#define MD2_BLOCK_LENGTH 16 +-#define MD2_BUFFER_LENGTH 48 +-#define MD2_CHKSUM_LENGTH 16 +-#define MD2_DIGEST_LENGTH 16 +-#define MD2_PADDING_LENGTH 16 +-#define MD2_ROUNDS_LENGTH 18 +- +-typedef struct __md2 { ++#define IPMI_MD2_BLOCK_LENGTH 16 ++#define IPMI_MD2_BUFFER_LENGTH 48 ++#define IPMI_MD2_CHKSUM_LENGTH 16 ++#define IPMI_MD2_DIGEST_LENGTH 16 ++#define IPMI_MD2_PADDING_LENGTH 16 ++#define IPMI_MD2_ROUNDS_LENGTH 18 ++ ++typedef struct __ipmi_md2 { + uint32_t magic; + uint8_t l; + unsigned int mlen; +- uint8_t x[MD2_BUFFER_LENGTH]; +- uint8_t c[MD2_CHKSUM_LENGTH]; +- uint8_t m[MD2_BLOCK_LENGTH]; +-} md2_t; ++ uint8_t x[IPMI_MD2_BUFFER_LENGTH]; ++ uint8_t c[IPMI_MD2_CHKSUM_LENGTH]; ++ uint8_t m[IPMI_MD2_BLOCK_LENGTH]; ++} ipmi_md2_t; + +-int md2_init (md2_t *ctx); ++int ipmi_md2_init (ipmi_md2_t *ctx); + +-int md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen); ++int ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen); + +-int md2_finish (md2_t *ctx, void *digest, unsigned int digestlen); ++int ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen); + + #endif /* IPMI_MD2_H */ +diff --git a/libfreeipmi/libcommon/ipmi-md5.c b/libfreeipmi/libcommon/ipmi-md5.c +index 17073b85f..c84e350a6 100644 +--- a/libfreeipmi/libcommon/ipmi-md5.c ++++ b/libfreeipmi/libcommon/ipmi-md5.c +@@ -92,7 +92,7 @@ static uint32_t T[64] = + #define D ctx->d + #define M ctx->m + #define Mlen ctx->mlen +-#define MD5_MAGIC 0xfb0fdb0d ++#define IPMI_MD5_MAGIC 0xfb0fdb0d + + #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) + #define G(x,y,z) (((x) & (z)) | ((y) & (~(z)))) +@@ -126,7 +126,7 @@ static uint32_t T[64] = + } while (0) + + int +-md5_init (md5_t *ctx) ++ipmi_md5_init (ipmi_md5_t *ctx) + { + if (ctx == NULL) + { +@@ -134,13 +134,13 @@ md5_init (md5_t *ctx) + return (-1); + } + +- ctx->magic = MD5_MAGIC; ++ ctx->magic = IPMI_MD5_MAGIC; + + Mlen = 0; + ctx->bytes_mod_64 = 0; + ctx->bit_count[0] = 0; + ctx->bit_count[1] = 0; +- memset (M, '\0', MD5_BLOCK_LENGTH); ++ memset (M, '\0', IPMI_MD5_BLOCK_LENGTH); + + /* initial values are listed low-order byte first */ + A = 0x67452301; +@@ -152,16 +152,16 @@ md5_init (md5_t *ctx) + } + + static void +-_md5_update_digest (md5_t *ctx) ++_ipmi_md5_update_digest (ipmi_md5_t *ctx) + { + uint32_t AA, BB, CC, DD; +- uint32_t X[MD5_BLOCK_WORDS_LENGTH]; ++ uint32_t X[IPMI_MD5_BLOCK_WORDS_LENGTH]; + unsigned int j; + + /* Note there are no endian issues here, compiler is required to + * handle shifts correctly + */ +- for (j = 0; j < MD5_BLOCK_WORDS_LENGTH; j++) ++ for (j = 0; j < IPMI_MD5_BLOCK_WORDS_LENGTH; j++) + X[j] = ((uint32_t)M[j*4] + | ((uint32_t)M[j*4+1] << 8) + | ((uint32_t)M[j*4+2] << 16) +@@ -251,7 +251,7 @@ _md5_update_digest (md5_t *ctx) + } + + static void +-_md5_update_count (md5_t *ctx, unsigned int buflen) ++_ipmi_md5_update_count (ipmi_md5_t *ctx, unsigned int buflen) + { + + /* Use two uint32_t integers to hold our 64 bit count. +@@ -272,10 +272,10 @@ _md5_update_count (md5_t *ctx, unsigned int buflen) + } + + int +-md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) ++ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen) + { + +- if (ctx == NULL || ctx->magic != MD5_MAGIC || buf == NULL) ++ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC || buf == NULL) + { + errno = EINVAL; + return (-1); +@@ -284,28 +284,28 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) + if (buflen == 0) + return (0); + +- if ((Mlen + buflen) >= MD5_BLOCK_LENGTH) ++ if ((Mlen + buflen) >= IPMI_MD5_BLOCK_LENGTH) + { + unsigned int bufcount; + +- bufcount = (MD5_BLOCK_LENGTH - Mlen); ++ bufcount = (IPMI_MD5_BLOCK_LENGTH - Mlen); + memcpy (M + Mlen, buf, bufcount); +- _md5_update_digest (ctx); +- _md5_update_count (ctx, bufcount); ++ _ipmi_md5_update_digest (ctx); ++ _ipmi_md5_update_count (ctx, bufcount); + +- while ((buflen - bufcount) >= MD5_BLOCK_LENGTH) ++ while ((buflen - bufcount) >= IPMI_MD5_BLOCK_LENGTH) + { +- memcpy (M, buf + bufcount, MD5_BLOCK_LENGTH); +- bufcount += MD5_BLOCK_LENGTH; +- _md5_update_digest (ctx); +- _md5_update_count (ctx, MD5_BLOCK_LENGTH); ++ memcpy (M, buf + bufcount, IPMI_MD5_BLOCK_LENGTH); ++ bufcount += IPMI_MD5_BLOCK_LENGTH; ++ _ipmi_md5_update_digest (ctx); ++ _ipmi_md5_update_count (ctx, IPMI_MD5_BLOCK_LENGTH); + } + + Mlen = buflen - bufcount; + if (Mlen > 0) + { + memcpy (M, buf + bufcount, Mlen); +- _md5_update_count (ctx, Mlen); ++ _ipmi_md5_update_count (ctx, Mlen); + } + } + else +@@ -313,14 +313,14 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) + /* Not enough data to update digest, just copy in data */ + memcpy (M + Mlen, buf, buflen); + Mlen += buflen; +- _md5_update_count (ctx, buflen); ++ _ipmi_md5_update_count (ctx, buflen); + } + + return (buflen); + } + + static void +-_md5_append_padding_and_length (md5_t *ctx) ++_ipmi_md5_append_padding_and_length (ipmi_md5_t *ctx) + { + unsigned int padlen; + char length[8]; +@@ -348,23 +348,23 @@ _md5_append_padding_and_length (md5_t *ctx) + length[6] = (ctx->bit_count[0] & 0x00ff0000) >> 16; + length[7] = (ctx->bit_count[0] & 0xff000000) >> 24; + +- md5_update_data (ctx, padding, padlen); +- md5_update_data (ctx, length, 8); ++ ipmi_md5_update_data (ctx, padding, padlen); ++ ipmi_md5_update_data (ctx, length, 8); + } + + int +-md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) ++ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen) + { +- uint8_t buf[MD5_DIGEST_LENGTH]; ++ uint8_t buf[IPMI_MD5_DIGEST_LENGTH]; + +- if (ctx == NULL || ctx->magic != MD5_MAGIC +- || digest == NULL || digestlen < MD5_DIGEST_LENGTH) ++ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC ++ || digest == NULL || digestlen < IPMI_MD5_DIGEST_LENGTH) + { + errno = EINVAL; + return (-1); + } + +- _md5_append_padding_and_length (ctx); ++ _ipmi_md5_append_padding_and_length (ctx); + + /* Note there are no endian issues here, compiler is required to + * handle bitmasks and shifts correctly +@@ -387,7 +387,7 @@ md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) + buf[14] = (D & 0x00ff0000) >> 16; + buf[15] = (D & 0xff000000) >> 24; + +- memcpy (digest, buf, MD5_DIGEST_LENGTH); +- ctx->magic = ~MD5_MAGIC; +- return (MD5_DIGEST_LENGTH); ++ memcpy (digest, buf, IPMI_MD5_DIGEST_LENGTH); ++ ctx->magic = ~IPMI_MD5_MAGIC; ++ return (IPMI_MD5_DIGEST_LENGTH); + } +diff --git a/libfreeipmi/libcommon/ipmi-md5.h b/libfreeipmi/libcommon/ipmi-md5.h +index 0f86f1754..6b863ef36 100644 +--- a/libfreeipmi/libcommon/ipmi-md5.h ++++ b/libfreeipmi/libcommon/ipmi-md5.h +@@ -34,11 +34,11 @@ + + #include + +-#define MD5_BLOCK_LENGTH 64 +-#define MD5_BLOCK_WORDS_LENGTH (MD5_BLOCK_LENGTH/4) +-#define MD5_DIGEST_LENGTH 16 ++#define IPMI_MD5_BLOCK_LENGTH 64 ++#define IPMI_MD5_BLOCK_WORDS_LENGTH (IPMI_MD5_BLOCK_LENGTH/4) ++#define IPMI_MD5_DIGEST_LENGTH 16 + +-typedef struct __md5 { ++typedef struct __ipmi_md5 { + uint32_t magic; + unsigned int mlen; + unsigned int bytes_mod_64; +@@ -47,13 +47,13 @@ typedef struct __md5 { + uint32_t b; + uint32_t c; + uint32_t d; +- uint8_t m[MD5_BLOCK_LENGTH]; +-} md5_t; ++ uint8_t m[IPMI_MD5_BLOCK_LENGTH]; ++} ipmi_md5_t; + +-int md5_init (md5_t *ctx); ++int ipmi_md5_init (ipmi_md5_t *ctx); + +-int md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen); ++int ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen); + +-int md5_finish (md5_t *ctx, void *digest, unsigned int digestlen); ++int ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen); + + #endif /* IPMI_MD5_H */ +diff --git a/libfreeipmi/util/ipmi-lan-util.c b/libfreeipmi/util/ipmi-lan-util.c +index cd269fcb9..a374acc8d 100644 +--- a/libfreeipmi/util/ipmi-lan-util.c ++++ b/libfreeipmi/util/ipmi-lan-util.c +@@ -281,33 +281,33 @@ ipmi_lan_check_session_authentication_code (fiid_obj_t obj_lan_session_hdr_rs, + + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); +- +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, session_id_buf, session_id_len); +- md2_update_data (&ctx, buf, len); +- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); ++ ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md2_update_data (&ctx, buf, len); ++ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_init (&ctx); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, session_id_buf, session_id_len); +- md5_update_data (&ctx, buf, len); +- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md5_update_data (&ctx, buf, len); ++ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_init (&ctx); + } + } + +@@ -451,45 +451,45 @@ ipmi_lan_check_packet_session_authentication_code (const void *pkt, + memcpy (pwbuf, authentication_code_data, authentication_code_data_len); + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); +- +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, +- pkt + session_id_offset, +- session_id_len); +- md2_update_data (&ctx, +- pkt + data_offset, +- pkt_len - data_offset); +- md2_update_data (&ctx, +- pkt + session_sequence_number_offset, +- session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); ++ ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, ++ pkt + session_id_offset, ++ session_id_len); ++ ipmi_md2_update_data (&ctx, ++ pkt + data_offset, ++ pkt_len - data_offset); ++ ipmi_md2_update_data (&ctx, ++ pkt + session_sequence_number_offset, ++ session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_init (&ctx); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, +- pkt + session_id_offset, +- session_id_len); +- md5_update_data (&ctx, +- pkt + data_offset, +- pkt_len - data_offset); +- md5_update_data (&ctx, +- pkt + session_sequence_number_offset, +- session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, ++ pkt + session_id_offset, ++ session_id_len); ++ ipmi_md5_update_data (&ctx, ++ pkt + data_offset, ++ pkt_len - data_offset); ++ ipmi_md5_update_data (&ctx, ++ pkt + session_sequence_number_offset, ++ session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_init (&ctx); + } + } + else /* authentication_type == IPMI_AUTHENTICATION_TYPE_STRAIGHT_PASSWORD_KEY From thomas.petazzoni at bootlin.com Sun Jan 30 17:07:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:07:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix static build with openipmi In-Reply-To: <20220129110734.3737599-1-fontaine.fabrice@gmail.com> References: <20220129110734.3737599-1-fontaine.fabrice@gmail.com> Message-ID: <20220130180710.0634772d@windsurf> On Sat, 29 Jan 2022 12:07:34 +0100 Fabrice Fontaine wrote: > Fix the following static build failure with openipmi raised since commit > 8f6b346a34bdb344c4a001d8bd66f5e973013c17: > > /home/peko/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/libfreeipmi.a(libfreeipmi_la-ipmi-md5.o): in function `md5_init': > ipmi-md5.c:(.text+0xa7c): multiple definition of `md5_init'; ../lib/.libs/libipmitool.a(md5.o):md5.c:(.text+0xab0): first defined here > > Fixes: > - http://autobuild.buildroot.org/results/01b22faf08a798ecc5d5465e1c0c13fa024f1096 > > Signed-off-by: Fabrice Fontaine > --- > ...-rename-md2-and-md5-functions-macros.patch | 695 ++++++++++++++++++ > 1 file changed, 695 insertions(+) > create mode 100644 package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 17:16:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:16:32 +0100 Subject: [Buildroot] [git commit] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 Message-ID: <20220130170940.6693882626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87ee52a205ec0a250cd448ab6c12f40a7c85a272 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master U-boot libfdt fails to compile on CI. /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 As this fix has been already upstreamed just bump U-boot package. Let's also bump Kernel and ATF as the board is properly supported upstream. Signed-off-by: Cl??ment P??ron Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/beelink_gs1_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index b461574a98..aa8a2cfb6b 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -9,11 +9,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -# Kernel Linux headers same as kernel, a 5.5 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y +# Kernel Linux headers same as kernel, 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" @@ -24,14 +24,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Sun Jan 30 17:16:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:16:59 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: <20220129111731.736265-2-peron.clem@gmail.com> References: <20220129111731.736265-1-peron.clem@gmail.com> <20220129111731.736265-2-peron.clem@gmail.com> Message-ID: <20220130181659.1e3aae5a@windsurf> On Sat, 29 Jan 2022 12:17:31 +0100 Cl?ment P?ron wrote: > U-boot libfdt fails to compile on CI. > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 > > As this fix has been already upstreamed just bump U-boot package. > > Let's also bump Kernel and ATF as the board is properly supported upstream. > > Signed-off-by: Cl?ment P?ron > --- > configs/beelink_gs1_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 17:18:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:18:30 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <20220129111731.736265-1-peron.clem@gmail.com> References: <20220129111731.736265-1-peron.clem@gmail.com> Message-ID: <20220130181830.3170d14f@windsurf> On Sat, 29 Jan 2022 12:17:30 +0100 Cl?ment P?ron wrote: > For the moment Beelink GS1 use a default rootfs size of 60M, > which is a bit low if you want to add some packages like a > graphic stack. > > Increase the rootfs size to 120M. > > Reviewed-by: Giulio Benetti > Signed-off-by: Cl?ment P?ron > --- > configs/beelink_gs1_defconfig | 1 + > 1 file changed, 1 insertion(+) I have not applied this one. Indeed, any defconfig that uses the default rootfs size of 60M would have the problem of "if I add more packages, it doesn't fit in the image". The defconfigs are meant to be minimal, so it doesn't make sense to increase the size to 120M to accommodate some possible package additions. Maybe even 120M is not going to be enough depending on how many packages you add (and how large they are). So I've marked this patch as Rejected. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 17:19:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:19:10 +0100 Subject: [Buildroot] [git commit] package/midori: drop select of libsoup-gnome Message-ID: <20220130171212.94A0B81933@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75bea7b215675da9e097f9105d9b97aa4fc4f5b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libsoup-gnome is not used by midori since bump to version 9.0 in commit 42f19d49fb2da891be9266a2f843292d24847f18 and https://github.com/midori-browser/core/commit/0c2d8f0ea61f20476542e861bc1772a878a54d32 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/midori/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/midori/Config.in b/package/midori/Config.in index d98d7cb161..715295e5a6 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -41,7 +41,6 @@ config BR2_PACKAGE_MIDORI select BR2_PACKAGE_LIBPEAS select BR2_PACKAGE_LIBPEAS_WIDGETS select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBSOUP_GNOME select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_SQLITE From thomas.petazzoni at bootlin.com Sun Jan 30 17:19:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:19:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/midori: drop select of libsoup-gnome In-Reply-To: <20220128173204.2483569-1-fontaine.fabrice@gmail.com> References: <20220128173204.2483569-1-fontaine.fabrice@gmail.com> Message-ID: <20220130181917.3232550a@windsurf> On Fri, 28 Jan 2022 18:32:04 +0100 Fabrice Fontaine wrote: > libsoup-gnome is not used by midori since bump to version 9.0 in commit > 42f19d49fb2da891be9266a2f843292d24847f18 and > https://github.com/midori-browser/core/commit/0c2d8f0ea61f20476542e861bc1772a878a54d32 > > Signed-off-by: Fabrice Fontaine > --- > package/midori/Config.in | 1 - > 1 file changed, 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From ju.o at free.fr Sun Jan 30 17:21:45 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 30 Jan 2022 18:21:45 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add test for python-distro Message-ID: <20220130172145.888946-1-ju.o@free.fr> This commit add a simple test checking the reported distro name and id are Buildroot (as reported by /etc/os-release). Signed-off-by: Julien Olivain --- DEVELOPERS | 2 ++ .../tests/package/sample_python_distro.py | 4 ++++ .../tests/package/test_python_distro.py | 21 +++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 support/testing/tests/package/sample_python_distro.py create mode 100644 support/testing/tests/package/test_python_distro.py diff --git a/DEVELOPERS b/DEVELOPERS index e17803f38a..368f95796b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1612,7 +1612,9 @@ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ F: package/zynaddsubfx/ +F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py N: Julien Viard de Galbert diff --git a/support/testing/tests/package/sample_python_distro.py b/support/testing/tests/package/sample_python_distro.py new file mode 100644 index 0000000000..b31f129718 --- /dev/null +++ b/support/testing/tests/package/sample_python_distro.py @@ -0,0 +1,4 @@ +import distro + +assert(distro.name() == 'Buildroot') +assert(distro.id() == 'buildroot') diff --git a/support/testing/tests/package/test_python_distro.py b/support/testing/tests/package/test_python_distro.py new file mode 100644 index 0000000000..943b29e47e --- /dev/null +++ b/support/testing/tests/package/test_python_distro.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Distro(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_DISTRO=y + """ + sample_scripts = ["tests/package/sample_python_distro.py"] + + +class TestPythonPy3Distro(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DISTRO=y + """ + sample_scripts = ["tests/package/sample_python_distro.py"] -- 2.34.1 From romain.naour at gmail.com Sun Jan 30 17:32:43 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 30 Jan 2022 18:32:43 +0100 Subject: [Buildroot] [PATCH 2/3] package/poke: disable minimal-threading with thumb or thumb2 In-Reply-To: <20220130154605.5fad582e@windsurf> References: <20220129142352.1197168-1-romain.naour@gmail.com> <20220129142352.1197168-2-romain.naour@gmail.com> <20220130154605.5fad582e@windsurf> Message-ID: Hello Thomas, Le 30/01/2022 ? 15:46, Thomas Petazzoni a ?crit?: > Hello, > > On Sat, 29 Jan 2022 15:23:51 +0100 > Romain Naour wrote: > >> +# Disable minimal-threading when thumb or thumb2 is enabled >> +# due to runtime issue. >> +# https://lists.gnu.org/archive/html/poke-devel/2022-01/msg00162.html >> +ifeq ($(BR2_ARM_CPU_HAS_THUMB)$(BR2_ARM_CPU_HAS_THUMB2),y) >> +POKE_CONF_OPTS += --disable-dispatch-minimal-threading >> +else >> +POKE_CONF_OPTS += --enable-dispatch-minimal-threading >> +endif > > I don't understand this patch, because minimal-threading is already > disabled by default (at least in poke 1.4, I haven't checked in poke > 2.0). jitter/configure.ac contains: > > # Is the minimal-threading dispatch enabled? Check the default and the > # configure command-line option. > AC_MSG_CHECKING([if minimal-threading dispatch is enabled]) > # FIXME: reenable this when I make defect handling reliable. > #default=$(test "x$JITTER_HAVE_ACTUAL_GCC" = "xyes" && echo yes || echo no) > default=no > AC_ARG_ENABLE([dispatch-minimal-threading], > AS_HELP_STRING([--enable-dispatch-minimal-threading], > [enable minimal threading dispatch: default yes if and > only if GCC (not an imitation) is used]), > jitter_enable_dispatch_minimal_threading="$enableval", > jitter_enable_dispatch_minimal_threading="$default") > if test "x$jitter_enable_dispatch_minimal_threading" = "xyes"; then > jitter_best_dispatch_model="minimal-threading" > jitter_enabled_dispatch_models="$jitter_enabled_dispatch_models minimal-threading" > fi > AC_MSG_RESULT([$jitter_enable_dispatch_minimal_threading$jitter_subpackage_disclaimer]) > # FIXME: remove this warning message when I make defect handling reliable. > if test "x$jitter_enable_dispatch_minimal_threading" = "xyes"; then > AC_MSG_WARN([minimal-threading dispatch is currently unreliable, and should > not be used in production until defective instruction replacement is fully > implemented]) > fi > > See the "default=no" ? > > Also, when building with the following defconfig: > > BR2_arm=y > BR2_cortex_a8=y > BR2_ARM_EABI=y > BR2_ARM_INSTRUCTIONS_THUMB2=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_POKE=y > # BR2_TARGET_ROOTFS_TAR is not set > > The minimal threading is already disabled: > > checking if switch dispatching is enabled... yes, provisionally (sub-package mode) > checking if direct-threading dispatch is enabled... yes, provisionally (sub-package mode) > checking if minimal-threading dispatch is enabled... no, provisionally (sub-package mode) > checking if no-threading dispatch is enabled... no, provisionally (sub-package mode) > configure: sub-package mode: disabling every dispatch except > direct-threading > configure: (the following dispatches could have been enabled: > switch direct-threading) > configure: enabled dispatching models are: > direct-threading > configure: the best enabled dispatching model is: > direct-threading > > So what this patch is doing is in fact slightly the opposite of what he > says: instead of disabling minimal threading for thumb or thumb2, it > enables it for any other platform. > > Are you sure this patch was needed for poke 1.4, and not for poke 2.0 ? I overlooked that was disabled by default in poke 1.4. I only checked if this option was present in poke 1.4. So this patch must be merged in the poke version bump. Best regards, Romain > > Best regards, > > Thomas > From romain.naour at gmail.com Sun Jan 30 17:40:39 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 30 Jan 2022 18:40:39 +0100 Subject: [Buildroot] [PATCH 3/5] package/efl: rework eeze handling in Kconfig In-Reply-To: <20220130150243.5795f1fa@windsurf> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-3-romain.naour@gmail.com> <20220130150243.5795f1fa@windsurf> Message-ID: <400c4077-1e25-a5fd-592e-cbf149d7a626@gmail.com> Hello Thomas, Le 30/01/2022 ? 15:02, Thomas Petazzoni a ?crit?: > On Sat, 29 Jan 2022 23:46:49 +0100 > Romain Naour wrote: > >> Commit [1] added eeze dependency using "depends on" to several efl >> options (drm, libmount) instead of selecting eeze and propagate the >> udev reverse dependency. > > I do agree with changing from a "depends on BR2_PACKAGE_EFL_EEZE" to a > "depends BR2_PACKAGE_HAS_UDEV" + "select BR2_PACKAGE_EFL_EEZE". > However... > >> The dependency between eeze, libinput, efl drm requires to add a new >> libinput option. > > ... I don't understand this justification. Could you clarify. Even > after reading PATCH 4/5, I don't get the relationship. PATCH 4/5 could > have been done (I guess using the same principle of "depends on > BR2_PACKAGE_EFL_EEZE". AFAIK, efl drm needs libinput (elput) that requires udev (eeze). Until now we don't have a libinput option to disable it when eeze is also disabled. > >> Rework eeze handling to use select BR2_PACKAGE_EFL_EEZE since the >> user is already aware of the udev dependency (BR2_PACKAGE_HAS_UDEV). > > I don't understand why you say the user is already aware of the udev > dependency? Thanks to the comments? I mean if eeze can be selected, it means that the used either selected systemd or eudev. > >> comment "efl's libmount support needs udev /dev management (eeze)" > > Remove the "eeze" between parenthesis here I believe. > >> - depends on !BR2_PACKAGE_EFL_EEZE >> + depends on !BR2_PACKAGE_HAS_UDEV >> >> config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG >> bool >> @@ -173,7 +174,7 @@ config BR2_PACKAGE_EFL_WAYLAND >> depends on BR2_PACKAGE_WAYLAND >> depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm >> depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine >> - depends on BR2_PACKAGE_EFL_EEZE # efl drm >> + depends on BR2_PACKAGE_HAS_UDEV # efl drm (eeze) >> depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only >> depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput >> select BR2_PACKAGE_EFL_DRM >> @@ -182,7 +183,7 @@ config BR2_PACKAGE_EFL_WAYLAND >> comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" > > Ditto. > >> depends on BR2_PACKAGE_WAYLAND >> depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ >> - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ >> + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ >> || !BR2_ENABLE_LOCALE >> >> choice >> @@ -215,9 +216,10 @@ endchoice # OpenGL support >> >> config BR2_PACKAGE_EFL_DRM >> bool "Evas DRM Engine" >> - depends on BR2_PACKAGE_EFL_EEZE >> + depends on BR2_PACKAGE_HAS_UDEV (eeze) > > Does this line really parses correctly? > >> depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm >> depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d >> + select BR2_PACKAGE_EFL_EEZE >> select BR2_PACKAGE_LIBDRM >> select BR2_PACKAGE_LIBINPUT # For elput >> select BR2_PACKAGE_LIBXKBCOMMON >> @@ -232,7 +234,7 @@ config BR2_PACKAGE_EFL_DRM >> >> comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" > > Remove the "eeze" between parenthesis. Best regards, Romain > > Thanks! > > Thomas > From giulio.benetti at benettiengineering.com Sun Jan 30 19:49:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 30 Jan 2022 20:49:08 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Giulio Benetti to sunxi-tools package Message-ID: <20220130194908.1658031-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0c11a25359..38724726d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1110,6 +1110,7 @@ F: package/python-uvloop/ F: package/rockchip-mali/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ +F: package/sunxi-tools/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ -- 2.25.1 From peter at korsgaard.com Sun Jan 30 20:13:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 30 Jan 2022 21:13:32 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.02.9 Message-ID: <20220130200732.DC334814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14233f3f0fdf133f30510a9e8c35faff4f22eb8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 961ca0ef87..2d082062a2 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
    Download
    -

    Latest long term support release: 2021.02.8

    +

    Latest long term support release: 2021.02.9

    - +
    - +
    -

    buildroot-2021.02.8.tar.gz

    -

    PGP signature

    +

    buildroot-2021.02.9.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2021.02.8.tar.bz2

    -

    PGP signature

    +

    buildroot-2021.02.9.tar.bz2

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index 85426677bf..d1dbc582a6 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

    News

      +
    • +
      +
      +
      +

      2021.02.9 released

      +

      29 January 2022

      +
      +
      +

      The 2021.02.9 bugfix release is out, fixing a number of important / + security related issues discovered since the 2021.02.8 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2021.02.9 release.

      +
      +
      +
      • +
    • From peter at korsgaard.com Sun Jan 30 20:02:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 30 Jan 2022 21:02:40 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.11.1 Message-ID: <20220130200732.C1C8F814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce361c33615437c17f55c1765a20766b0fa2602f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 89c70997ce..961ca0ef87 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
    -

    Latest stable release: 2021.11

    +

    Latest stable release: 2021.11.1

    - +
    - +
    -

    buildroot-2021.11.tar.gz

    -

    PGP signature

    +

    buildroot-2021.11.1.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2021.11.tar.xz

    -

    PGP signature

    +

    buildroot-2021.11.1.tar.xz

    +

    PGP signature

    For me, libsoup3 support is important for the additional APIs that webkitgtk 2.34.4 is providing. kr, Thomas Op zo 30 jan. 2022 om 23:17 schreef Thomas Petazzoni < thomas.petazzoni at bootlin.com>: > On Mon, 31 Jan 2022 00:02:21 +0200 > Adrian Perez de Castro wrote: > > > > Is it possible to install both libsoup2 and libsoup3 side-by-side in > > > the same system? This requires them having a different library name and > > > a different location for header files. > > > > Yes, libsoup2 and libsoup3 are parallel-installable, both can coexist in > > the same system. The only caveat is, as I mentioned in a previous email, > > that having both versions loaded in the same process will result in odd > > crashes and assorted failures due to symbols clashing. > > If both libsoup2 and libsoup3 are enabled in the same build, it's going > to be difficult to guarantee that one application doesn't end up > loading both, by the usage of separate shared libraries that > independently use a different version of libsoup. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From heiko.thiery at gmail.com Mon Jan 31 11:42:05 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 31 Jan 2022 12:42:05 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <20220131085216.1256242-1-michael@amarulasolutions.com> References: <20220131085216.1256242-1-michael@amarulasolutions.com> Message-ID: Hi Michael, Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi : > > Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 > - Uboot 2022-01-rc1 (reference tree) > - Default packages from buildroot > > https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > > Add Ariel D'Alessandro as co-maintainer, we work together on > platform mainline > > Build and tested using: > docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > Cc: Ariel D'Alessandro > Cc: Jagan Teki > Signed-off-by: Michael Trimarchi > --- > Changes V1->V2: > - add the board reference page > - test with docker > - adjust the buildroot config in order to use buildman > --- > DEVELOPERS | 2 ++ > board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ > board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ > configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ > 7 files changed, 134 insertions(+) > create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > create mode 100644 board/bsh/bsh-imx8mn/readme.txt > create mode 100644 configs/bsh_smms2pro_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index fe8de1916e..fc66fb6b83 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > F: configs/snps_archs38_vdk_defconfig > > N: Ariel D'Alessandro > +F: board/bsh/ > F: package/axfsutils/ > F: package/mali-t76x/ > > @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > F: package/python-pyzmq/ > > N: Michael Trimarchi > +F: board/bsh/ > F: package/python-spidev/ > > N: Michael Vetter > diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > new file mode 100644 > index 0000000000..9111354742 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > new file mode 100644 > index 0000000000..bc100b171d > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/genimage.cfg > @@ -0,0 +1,17 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33K > + } > + > + partition rootfs { > + offset = 8M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > new file mode 100755 > index 0000000000..3452fd4501 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-image.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > new file mode 100644 > index 0000000000..ae30666cd0 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/readme.txt > @@ -0,0 +1,55 @@ > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make bsh_smms2pro_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and buildr the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? Image > + ??? flash.bin > + ??? ddr3* > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot-nodtb.bin > + ??? u-boot-spl.bin > + > + > +Flashing the emmc card image > +========================== > + > +To install the image on on eMMC > + > + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > new file mode 100644 > index 0000000000..8472c6db2b > --- /dev/null > +++ b/configs/bsh_smms2pro_defconfig > @@ -0,0 +1,46 @@ > +BR2_aarch64=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y When building the final imx flash.bin image with binman this host tool is no longer required. > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Same here. -- Heiko From michael at amarulasolutions.com Mon Jan 31 11:48:01 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 31 Jan 2022 12:48:01 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131085216.1256242-1-michael@amarulasolutions.com> Message-ID: Hi Heiko On Mon, Jan 31, 2022 at 12:42 PM Heiko Thiery wrote: > > Hi Michael, > > Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi > : > > > > Add initial support for iMX8MN BSH SMM S2 PRO board: > > > > - Linux: v5.17-rc1 > > - Uboot 2022-01-rc1 (reference tree) > > - Default packages from buildroot > > > > https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > > > > Add Ariel D'Alessandro as co-maintainer, we work together on > > platform mainline > > > > Build and tested using: > > docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > > > Cc: Ariel D'Alessandro > > Cc: Jagan Teki > > Signed-off-by: Michael Trimarchi > > --- > > Changes V1->V2: > > - add the board reference page > > - test with docker > > - adjust the buildroot config in order to use buildman > > --- > > DEVELOPERS | 2 ++ > > board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ > > board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > > board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > > board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > > board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ > > configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ > > 7 files changed, 134 insertions(+) > > create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > > create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > > create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > > create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > > create mode 100644 board/bsh/bsh-imx8mn/readme.txt > > create mode 100644 configs/bsh_smms2pro_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index fe8de1916e..fc66fb6b83 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > > F: configs/snps_archs38_vdk_defconfig > > > > N: Ariel D'Alessandro > > +F: board/bsh/ > > F: package/axfsutils/ > > F: package/mali-t76x/ > > > > @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > > F: package/python-pyzmq/ > > > > N: Michael Trimarchi > > +F: board/bsh/ > > F: package/python-spidev/ > > > > N: Michael Vetter > > diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > > new file mode 100644 > > index 0000000000..9111354742 > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/extlinux.conf > > @@ -0,0 +1,4 @@ > > +label buildroot > > + kernel /boot/Image > > + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > > + append root=PARTUUID=%PARTUUID% rootwait rw > > diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > > new file mode 100644 > > index 0000000000..bc100b171d > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/genimage.cfg > > @@ -0,0 +1,17 @@ > > +image sdcard.img { > > + hdimage { > > + partition-table-type = "gpt" > > + } > > + > > + partition imx-boot { > > + in-partition-table = "no" > > + image = "flash.bin" > > + offset = 33K > > + } > > + > > + partition rootfs { > > + offset = 8M > > + image = "rootfs.ext4" > > + partition-uuid = %PARTUUID% > > + } > > +} > > diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > > new file mode 100755 > > index 0000000000..bf8861f6a9 > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/post-build.sh > > @@ -0,0 +1,7 @@ > > +#!/bin/sh > > +BOARD_DIR="$(dirname $0)" > > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > > + > > +install -d "$TARGET_DIR/boot/extlinux/" > > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > > diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > > new file mode 100755 > > index 0000000000..3452fd4501 > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/post-image.sh > > @@ -0,0 +1,3 @@ > > +#!/bin/sh > > + > > +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > > diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > > new file mode 100644 > > index 0000000000..ae30666cd0 > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/readme.txt > > @@ -0,0 +1,55 @@ > > +How to build it > > +=============== > > + > > +Configure buildroot: > > + > > + $ make bsh_smms2pro_defconfig > > + > > +Change settings to fit your needs (optional): > > + > > + $ make menuconfig > > + > > +Compile everything and buildr the rootfs image: > > + > > + $ make > > + > > + > > +Result of the build > > +=================== > > + > > +After building, the output/images directory contains: > > + > > + output/images/ > > + ??? bl31.bin > > + ??? Image > > + ??? flash.bin > > + ??? ddr3* > > + ??? rootfs.ext2 > > + ??? rootfs.ext4 -> rootfs.ext2 > > + ??? rootfs.tar > > + ??? sdcard.img > > + ??? u-boot.bin > > + ??? u-boot-nodtb.bin > > + ??? u-boot-spl.bin > > + > > + > > +Flashing the emmc card image > > +========================== > > + > > +To install the image on on eMMC > > + > > + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > > + > > + > > +Preparing the board > > +=================== > > + > > + * Connect a serial line to the board > > + * Power-up the board > > + > > + > > +Booting the board > > +================= > > + > > +By default the bootloader will search for the first valid image, starting > > +with the internal eMMC. > > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > > new file mode 100644 > > index 0000000000..8472c6db2b > > --- /dev/null > > +++ b/configs/bsh_smms2pro_defconfig > > @@ -0,0 +1,46 @@ > > +BR2_aarch64=y > > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > > +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > +BR2_PACKAGE_FREESCALE_IMX=y > > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > > +BR2_PACKAGE_FIRMWARE_IMX=y > > +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > > When building the final imx flash.bin image with binman this host tool > is no longer required. > > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > > Same here. You mean the UBOOT_TOOLS* package. I will drop as soon as I have a uboot downloading point in apertis (better the this one) Michael > > -- > Heiko -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From giulio.benetti at benettiengineering.com Mon Jan 31 12:05:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 13:05:48 +0100 Subject: [Buildroot] [PATCH 0/5] synopsys: boards maintenance In-Reply-To: <20220131081214.12773-1-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> Message-ID: <48cd0534-15fc-3dda-4a39-64487b112229@benettiengineering.com> Hi Sergey, On 31/01/22 09:12, Sergey Matyukevich wrote: > Hi all, > > This is a maintenance patch series for Synopsys boards. Outdated > and unused VDK configurations are removed. All the other boards > receive Linux kernel and U-Boot updates. Have you tested on the real boards or only check if they built successfully? Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Sergey > > > Sergey Matyukevich (5): > configs/snps_arc700_axs101: bump kernel and u-boot versions > configs/snps_archs32_axs103: bump kernel and u-boot versions > configs/snps_archs38_hsdk: bump kernel and u-boot versions > configs/snps_archs38_haps: bump kernel and u-boot versions > board/synopsys: remove outdated vdk boards > > board/synopsys/axs10x/uboot-fragment.config | 1 + > .../synopsys/vdk/linux-vdk-aarch64-defconfig | 143 ------------------ > board/synopsys/vdk/readme.txt | 65 -------- > configs/snps_aarch64_vdk_defconfig | 12 -- > configs/snps_arc700_axs101_defconfig | 10 +- > configs/snps_archs38_axs103_defconfig | 10 +- > configs/snps_archs38_haps_defconfig | 6 +- > configs/snps_archs38_hsdk_defconfig | 7 +- > configs/snps_archs38_vdk_defconfig | 20 --- > 9 files changed, 20 insertions(+), 254 deletions(-) > create mode 100644 board/synopsys/axs10x/uboot-fragment.config > delete mode 100644 board/synopsys/vdk/linux-vdk-aarch64-defconfig > delete mode 100644 board/synopsys/vdk/readme.txt > delete mode 100644 configs/snps_aarch64_vdk_defconfig > delete mode 100644 configs/snps_archs38_vdk_defconfig > From giulio.benetti at benettiengineering.com Mon Jan 31 12:34:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 13:34:41 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.4 Message-ID: <20220131123441.3645526-1-giulio.benetti@benettiengineering.com> All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one. Signed-off-by: Giulio Benetti --- ...ake-install-for-non-root-don-t-stri.patch} | 24 +++- ...Makefile.in-replace-IROOT-by-DESTDIR.patch | 113 ------------------ ...etloadavg.c-compilation-revert-to-3..patch | 39 ------ ...-Makefile-fix-parallel-build-failure.patch | 41 ------- package/at/at.hash | 2 +- package/at/at.mk | 2 +- 6 files changed, 20 insertions(+), 201 deletions(-) rename package/at/{0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch => 0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch} (89%) delete mode 100644 package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch delete mode 100644 package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch delete mode 100644 package/at/0004-Makefile-fix-parallel-build-failure.patch diff --git a/package/at/0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch b/package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch similarity index 89% rename from package/at/0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch rename to package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch index f6c07e9fe2..74972d5dd3 100644 --- a/package/at/0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch +++ b/package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch @@ -1,4 +1,4 @@ -From 71d9a23ab6a73ec1287acc683716481090095de0 Mon Sep 17 00:00:00 2001 +From d3ebf63f0e1274eb7835983cb7d79216aa0a0137 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Jul 2021 16:47:56 +0200 Subject: [PATCH] Makefile.in: fix make install for non-root, don't strip @@ -10,16 +10,28 @@ Signed-off-by: Peter Korsgaard Signed-off-by: Vicente Olivert Riera [Vincent: tweak the patch for the new version] Signed-off-by: Giulio Benetti -[Giulio: convert patch to git format and rebase to version 3.2.2] +[Giulio: convert patch to git format and rebase to version 3.2.2 and +3.2.4] --- - Makefile.in | 47 +++++++++++++++++++++++------------------------ - 1 file changed, 23 insertions(+), 24 deletions(-) + Makefile.in | 51 +++++++++++++++++++++++++++------------------------ + 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in -index a7197f2..0b35a67 100644 +index 4ae194f..e6892d9 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -99,43 +99,42 @@ atrun: atrun.in +@@ -25,6 +25,10 @@ DESTDIR = $(IROOT) + $(warning IROOT is deprecated, you should use DESTDIR instead) + endif + ++ifdef IROOT ++DESTDIR = $(DESTDIR) ++endif ++ + DAEMON_USERNAME = @DAEMON_USERNAME@ + DAEMON_GROUPNAME= @DAEMON_GROUPNAME@ + LOADAVG_MX = @LOADAVG_MX@ +@@ -102,43 +106,42 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all diff --git a/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch deleted file mode 100644 index a9538589c1..0000000000 --- a/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch +++ /dev/null @@ -1,113 +0,0 @@ -From cbfd3296d7d0742d9e35b01ec9e433afe2c36c63 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Tue, 1 Dec 2009 20:57:45 +0100 -Subject: [PATCH] Makefile.in: replace IROOT by DESTDIR - -This patch replaces IROOT by DESTDIR, which is the autotools standard -variable. For backwards compatibilty IROOT overwrites the DESTDIR. - -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Vicente Olivert Riera -[Vincent: tweak the patch for the new version] -Signed-off-by: Giulio Benetti -[Giulio: convert patch to git format and rebase to version 3.2.2] ---- - Makefile.in | 72 ++++++++++++++++++++++++++++------------------------- - 1 file changed, 38 insertions(+), 34 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 3e8303c..a7197f2 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -20,6 +20,10 @@ etcdir = @ETCDIR@ - atjobdir = @ATJBD@ - systemdsystemunitdir = @systemdsystemunitdir@ - -+ifdef IROOT -+DESTDIR = $(DESTDIR) -+endif -+ - DAEMON_USERNAME = @DAEMON_USERNAME@ - DAEMON_GROUPNAME= @DAEMON_GROUPNAME@ - LOADAVG_MX = @LOADAVG_MX@ -@@ -95,43 +99,43 @@ atrun: atrun.in - $(CC) -c $(CFLAGS) $(DEFS) $*.c - - install: all -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdatadir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) -- chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) -- touch $(IROOT)$(LFILE) -- chmod 600 $(IROOT)$(LFILE) -- chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) -- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir) -- $(LN_S) -f at $(IROOT)$(bindir)/atq -- $(LN_S) -f at $(IROOT)$(bindir)/atrm -- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) -- $(INSTALL) -g root -o root -m 755 batch-job $(IROOT)$(atdatadir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) -- $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ -- cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 -- $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/ -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdatadir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir) -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) -+ chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) -+ touch $(DESTDIR)$(LFILE) -+ chmod 600 $(DESTDIR)$(LFILE) -+ chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE) -+ test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/ -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir) -+ $(LN_S) -f at $(DESTDIR)$(bindir)/atq -+ $(LN_S) -f at $(DESTDIR)$(bindir)/atrm -+ $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir) -+ $(INSTALL) -g root -o root -m 755 batch-job $(DESTDIR)$(atdatadir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) -+ $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/ -+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 -+ $(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/ - sed "s,\$${exec_prefix},$(exec_prefix),g" tmpman -- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 -+ $(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8 - rm -f tmpman -- $(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/ -- cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 -- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) -- rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ -- $(IROOT)$(mandir)/cat1/atq.1* -- rm -f $(IROOT)$(mandir)/cat1/atd.8* -+ $(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/ -+ cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 -+ $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir) -+ rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \ -+ $(DESTDIR)$(mandir)/cat1/atq.1* -+ rm -f $(DESTDIR)$(mandir)/cat1/atd.8* - if test x"$(systemdsystemunitdir)" != xno; then \ -- $(INSTALL) -o root -g root -m 755 -d $(IROOT)$(systemdsystemunitdir); \ -- $(INSTALL) -o root -g root -m 644 atd.service $(IROOT)$(systemdsystemunitdir); \ -+ $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ -+ $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ - fi - - dist: checkin $(DIST) $(LIST) Filelist.asc --- -2.25.1 - diff --git a/package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch b/package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch deleted file mode 100644 index fb515af8d9..0000000000 --- a/package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4eda31cea9fb3c77fe2748a65960f24ffb42f9ff Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Fri, 23 Jul 2021 16:51:17 +0200 -Subject: [PATCH] getloadavg: fix getloadavg.c compilation, revert to 3.1.10 - version - -getloadavg.c shipped with 3.1.13 doesn't compile because it references -headers not shipped. Fix it by simply reverting to the 3.1.10 version. - -Signed-off-by: Peter Korsgaard -Signed-off-by: Giulio Benetti -[Giulio: convert patch to git format] ---- - getloadavg.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/getloadavg.c b/getloadavg.c -index cf5869f..23d18eb 100644 ---- a/getloadavg.c -+++ b/getloadavg.c -@@ -66,11 +66,12 @@ Boston, MA 02110-1301 USA */ - - /* This should always be first. */ - #ifdef HAVE_CONFIG_H --#include -+#include "config.h" - #endif - --#include "lisp.h" --#include "sysfile.h" /* for encapsulated open, close, read, write */ -+#include -+#include -+#include - - #ifndef HAVE_GETLOADAVG - --- -2.25.1 - diff --git a/package/at/0004-Makefile-fix-parallel-build-failure.patch b/package/at/0004-Makefile-fix-parallel-build-failure.patch deleted file mode 100644 index 6e3dc24ca4..0000000000 --- a/package/at/0004-Makefile-fix-parallel-build-failure.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3ace0b57e2aacb784c01a3c7694c6c92461937ff Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Thu, 20 Feb 2020 22:00:11 +0100 -Subject: [PATCH] Makefile: fix parallel build failure - -At the moment parallel build fails due to 2 causes: -1) parsetime.l tries to include incomplete y.tab.h, since y.tab.h is the -result of yacc -d parsetime.y -2) when compiling y.tab.c, y.tab.c itself is not complete, since it is -the result of yacc -d parsetime.y - -So fix it by: -1) making parsetime.l to wait for y.tab.h to be created by yacc -2) waiting for y.tab.c and y.tab.h to be created before compile them - -Signed-off-by: Giulio Benetti ---- - Makefile.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index 4c11913..57c3a0c 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y - lex.yy.c: parsetime.l - $(LEX) -i parsetime.l - -+parsetime.l: y.tab.h -+ - atd.service: atd.service.in - cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ - -@@ -173,3 +175,4 @@ perm.o: perm.c config.h privs.h at.h - posixtm.o: posixtm.c posixtm.h - daemon.o: daemon.c config.h daemon.h privs.h - getloadavg.o: getloadavg.c config.h getloadavg.h -+y.tab.o: y.tab.c y.tab.h --- -2.20.1 - diff --git a/package/at/at.hash b/package/at/at.hash index 88a9e8a91d..d4ad9aa436 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088 at_3.2.2.orig.tar.gz +sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index bbeed2a0e8..6637f0df64 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.2 +AT_VERSION = 3.2.4 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_AUTORECONF = YES -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 31 12:39:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 13:39:08 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131085216.1256242-1-michael@amarulasolutions.com> Message-ID: Hi Michael, Heiko, All, On 31/01/22 12:48, Michael Nazzareno Trimarchi wrote: > Hi Heiko > > On Mon, Jan 31, 2022 at 12:42 PM Heiko Thiery wrote: >> >> Hi Michael, >> >> Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi >> : >>> >>> Add initial support for iMX8MN BSH SMM S2 PRO board: >>> >>> - Linux: v5.17-rc1 >>> - Uboot 2022-01-rc1 (reference tree) >>> - Default packages from buildroot >>> >>> https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ >>> >>> Add Ariel D'Alessandro as co-maintainer, we work together on >>> platform mainline >>> >>> Build and tested using: >>> docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>> >>> Cc: Ariel D'Alessandro >>> Cc: Jagan Teki >>> Signed-off-by: Michael Trimarchi >>> --- >>> Changes V1->V2: >>> - add the board reference page >>> - test with docker >>> - adjust the buildroot config in order to use buildman >>> --- >>> DEVELOPERS | 2 ++ >>> board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ >>> board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ >>> board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ >>> board/bsh/bsh-imx8mn/post-image.sh | 3 ++ >>> board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ >>> configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ >>> 7 files changed, 134 insertions(+) >>> create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf >>> create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg >>> create mode 100755 board/bsh/bsh-imx8mn/post-build.sh >>> create mode 100755 board/bsh/bsh-imx8mn/post-image.sh >>> create mode 100644 board/bsh/bsh-imx8mn/readme.txt >>> create mode 100644 configs/bsh_smms2pro_defconfig >>> >>> diff --git a/DEVELOPERS b/DEVELOPERS >>> index fe8de1916e..fc66fb6b83 100644 >>> --- a/DEVELOPERS >>> +++ b/DEVELOPERS >>> @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig >>> F: configs/snps_archs38_vdk_defconfig >>> >>> N: Ariel D'Alessandro >>> +F: board/bsh/ >>> F: package/axfsutils/ >>> F: package/mali-t76x/ >>> >>> @@ -2018,6 +2019,7 @@ F: package/python-crc16/ >>> F: package/python-pyzmq/ >>> >>> N: Michael Trimarchi >>> +F: board/bsh/ >>> F: package/python-spidev/ >>> >>> N: Michael Vetter >>> diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf >>> new file mode 100644 >>> index 0000000000..9111354742 >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/extlinux.conf >>> @@ -0,0 +1,4 @@ >>> +label buildroot >>> + kernel /boot/Image >>> + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb >>> + append root=PARTUUID=%PARTUUID% rootwait rw >>> diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg >>> new file mode 100644 >>> index 0000000000..bc100b171d >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/genimage.cfg >>> @@ -0,0 +1,17 @@ >>> +image sdcard.img { >>> + hdimage { >>> + partition-table-type = "gpt" >>> + } >>> + >>> + partition imx-boot { >>> + in-partition-table = "no" >>> + image = "flash.bin" >>> + offset = 33K >>> + } >>> + >>> + partition rootfs { >>> + offset = 8M >>> + image = "rootfs.ext4" >>> + partition-uuid = %PARTUUID% >>> + } >>> +} >>> diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh >>> new file mode 100755 >>> index 0000000000..bf8861f6a9 >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/post-build.sh >>> @@ -0,0 +1,7 @@ >>> +#!/bin/sh >>> +BOARD_DIR="$(dirname $0)" >>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >>> + >>> +install -d "$TARGET_DIR/boot/extlinux/" >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >>> diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh >>> new file mode 100755 >>> index 0000000000..3452fd4501 >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/post-image.sh >>> @@ -0,0 +1,3 @@ >>> +#!/bin/sh >>> + >>> +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg >>> diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt >>> new file mode 100644 >>> index 0000000000..ae30666cd0 >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/readme.txt >>> @@ -0,0 +1,55 @@ >>> +How to build it >>> +=============== >>> + >>> +Configure buildroot: >>> + >>> + $ make bsh_smms2pro_defconfig >>> + >>> +Change settings to fit your needs (optional): >>> + >>> + $ make menuconfig >>> + >>> +Compile everything and buildr the rootfs image: >>> + >>> + $ make >>> + >>> + >>> +Result of the build >>> +=================== >>> + >>> +After building, the output/images directory contains: >>> + >>> + output/images/ >>> + ??? bl31.bin >>> + ??? Image >>> + ??? flash.bin >>> + ??? ddr3* >>> + ??? rootfs.ext2 >>> + ??? rootfs.ext4 -> rootfs.ext2 >>> + ??? rootfs.tar >>> + ??? sdcard.img >>> + ??? u-boot.bin >>> + ??? u-boot-nodtb.bin >>> + ??? u-boot-spl.bin >>> + >>> + >>> +Flashing the emmc card image >>> +========================== >>> + >>> +To install the image on on eMMC >>> + >>> + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img >>> + >>> + >>> +Preparing the board >>> +=================== >>> + >>> + * Connect a serial line to the board >>> + * Power-up the board >>> + >>> + >>> +Booting the board >>> +================= >>> + >>> +By default the bootloader will search for the first valid image, starting >>> +with the internal eMMC. >>> diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig >>> new file mode 100644 >>> index 0000000000..8472c6db2b >>> --- /dev/null >>> +++ b/configs/bsh_smms2pro_defconfig >>> @@ -0,0 +1,46 @@ >>> +BR2_aarch64=y >>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" >>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" >>> +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" >>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" >>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>> +BR2_PACKAGE_FREESCALE_IMX=y >>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y >>> +BR2_PACKAGE_FIRMWARE_IMX=y >>> +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" >>> +BR2_TARGET_UBOOT=y >>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>> +BR2_TARGET_UBOOT_SPL=y >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> +BR2_PACKAGE_HOST_IMX_MKIMAGE=y >> >> When building the final imx flash.bin image with binman this host tool >> is no longer required. >> >>> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y >>> +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y >> >> Same here. > > You mean the UBOOT_TOOLS* package. I will drop as soon as I have a > uboot downloading point in apertis (better the this one) I think Heiko means BR2_PACKAGE_HOST_IMX_MKIMAGE=y, indeed I've just built successfully the defconfig. So I give you a: Reviewed-by: Giulio Benetti removing BR2_PACKAGE_HOST_IMX_MKIMAGE=y and with the promise to bump Linux and U-Boot versions as soon as new versions are released with the goal of removing the -rc1 versions. Kind regards to everybody! -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 31 12:41:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 13:41:38 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131085216.1256242-1-michael@amarulasolutions.com> Message-ID: <32d9ead7-e961-0b9d-10a3-c1ea8337b957@benettiengineering.com> On 31/01/22 13:39, Giulio Benetti wrote: > Hi Michael, Heiko, All, > > On 31/01/22 12:48, Michael Nazzareno Trimarchi wrote: >> Hi Heiko >> >> On Mon, Jan 31, 2022 at 12:42 PM Heiko Thiery wrote: >>> >>> Hi Michael, >>> >>> Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi >>> : >>>> >>>> Add initial support for iMX8MN BSH SMM S2 PRO board: >>>> >>>> - Linux: v5.17-rc1 >>>> - Uboot 2022-01-rc1 (reference tree) >>>> - Default packages from buildroot >>>> >>>> https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ >>>> >>>> Add Ariel D'Alessandro as co-maintainer, we work together on >>>> platform mainline >>>> >>>> Build and tested using: >>>> docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>>> >>>> Cc: Ariel D'Alessandro >>>> Cc: Jagan Teki >>>> Signed-off-by: Michael Trimarchi >>>> --- >>>> Changes V1->V2: >>>> - add the board reference page >>>> - test with docker >>>> - adjust the buildroot config in order to use buildman >>>> --- >>>> DEVELOPERS | 2 ++ >>>> board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ >>>> board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ >>>> board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ >>>> board/bsh/bsh-imx8mn/post-image.sh | 3 ++ >>>> board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ >>>> configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ >>>> 7 files changed, 134 insertions(+) >>>> create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf >>>> create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg >>>> create mode 100755 board/bsh/bsh-imx8mn/post-build.sh >>>> create mode 100755 board/bsh/bsh-imx8mn/post-image.sh >>>> create mode 100644 board/bsh/bsh-imx8mn/readme.txt >>>> create mode 100644 configs/bsh_smms2pro_defconfig >>>> >>>> diff --git a/DEVELOPERS b/DEVELOPERS >>>> index fe8de1916e..fc66fb6b83 100644 >>>> --- a/DEVELOPERS >>>> +++ b/DEVELOPERS >>>> @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig >>>> F: configs/snps_archs38_vdk_defconfig >>>> >>>> N: Ariel D'Alessandro >>>> +F: board/bsh/ >>>> F: package/axfsutils/ >>>> F: package/mali-t76x/ >>>> >>>> @@ -2018,6 +2019,7 @@ F: package/python-crc16/ >>>> F: package/python-pyzmq/ >>>> >>>> N: Michael Trimarchi >>>> +F: board/bsh/ >>>> F: package/python-spidev/ >>>> >>>> N: Michael Vetter >>>> diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf >>>> new file mode 100644 >>>> index 0000000000..9111354742 >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/extlinux.conf >>>> @@ -0,0 +1,4 @@ >>>> +label buildroot >>>> + kernel /boot/Image >>>> + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb >>>> + append root=PARTUUID=%PARTUUID% rootwait rw >>>> diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg >>>> new file mode 100644 >>>> index 0000000000..bc100b171d >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/genimage.cfg >>>> @@ -0,0 +1,17 @@ >>>> +image sdcard.img { >>>> + hdimage { >>>> + partition-table-type = "gpt" >>>> + } >>>> + >>>> + partition imx-boot { >>>> + in-partition-table = "no" >>>> + image = "flash.bin" >>>> + offset = 33K >>>> + } >>>> + >>>> + partition rootfs { >>>> + offset = 8M >>>> + image = "rootfs.ext4" >>>> + partition-uuid = %PARTUUID% >>>> + } >>>> +} >>>> diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh >>>> new file mode 100755 >>>> index 0000000000..bf8861f6a9 >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/post-build.sh >>>> @@ -0,0 +1,7 @@ >>>> +#!/bin/sh >>>> +BOARD_DIR="$(dirname $0)" >>>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >>>> + >>>> +install -d "$TARGET_DIR/boot/extlinux/" >>>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >>>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >>>> diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh >>>> new file mode 100755 >>>> index 0000000000..3452fd4501 >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/post-image.sh >>>> @@ -0,0 +1,3 @@ >>>> +#!/bin/sh >>>> + >>>> +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg >>>> diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt >>>> new file mode 100644 >>>> index 0000000000..ae30666cd0 >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/readme.txt >>>> @@ -0,0 +1,55 @@ >>>> +How to build it >>>> +=============== >>>> + >>>> +Configure buildroot: >>>> + >>>> + $ make bsh_smms2pro_defconfig >>>> + >>>> +Change settings to fit your needs (optional): >>>> + >>>> + $ make menuconfig >>>> + >>>> +Compile everything and buildr the rootfs image: >>>> + >>>> + $ make >>>> + >>>> + >>>> +Result of the build >>>> +=================== >>>> + >>>> +After building, the output/images directory contains: >>>> + >>>> + output/images/ >>>> + ??? bl31.bin >>>> + ??? Image >>>> + ??? flash.bin >>>> + ??? ddr3* >>>> + ??? rootfs.ext2 >>>> + ??? rootfs.ext4 -> rootfs.ext2 >>>> + ??? rootfs.tar >>>> + ??? sdcard.img >>>> + ??? u-boot.bin >>>> + ??? u-boot-nodtb.bin >>>> + ??? u-boot-spl.bin >>>> + >>>> + >>>> +Flashing the emmc card image >>>> +========================== >>>> + >>>> +To install the image on on eMMC >>>> + >>>> + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img >>>> + >>>> + >>>> +Preparing the board >>>> +=================== >>>> + >>>> + * Connect a serial line to the board >>>> + * Power-up the board >>>> + >>>> + >>>> +Booting the board >>>> +================= >>>> + >>>> +By default the bootloader will search for the first valid image, starting >>>> +with the internal eMMC. >>>> diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig >>>> new file mode 100644 >>>> index 0000000000..8472c6db2b >>>> --- /dev/null >>>> +++ b/configs/bsh_smms2pro_defconfig >>>> @@ -0,0 +1,46 @@ >>>> +BR2_aarch64=y >>>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" >>>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" >>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" >>>> +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" >>>> +BR2_LINUX_KERNEL=y >>>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" >>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" >>>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" >>>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>>> +BR2_PACKAGE_FREESCALE_IMX=y >>>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y >>>> +BR2_PACKAGE_FIRMWARE_IMX=y >>>> +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y >>>> +BR2_TARGET_ROOTFS_EXT2=y >>>> +BR2_TARGET_ROOTFS_EXT2_4=y >>>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" >>>> +BR2_TARGET_UBOOT=y >>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y >>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" >>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" >>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" >>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>>> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>>> +BR2_TARGET_UBOOT_SPL=y >>>> +BR2_PACKAGE_HOST_GENIMAGE=y >>>> +BR2_PACKAGE_HOST_IMX_MKIMAGE=y >>> >>> When building the final imx flash.bin image with binman this host tool >>> is no longer required. >>> >>>> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y >>>> +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y >>> >>> Same here. >> >> You mean the UBOOT_TOOLS* package. I will drop as soon as I have a >> uboot downloading point in apertis (better the this one) > > I think Heiko means BR2_PACKAGE_HOST_IMX_MKIMAGE=y, indeed I've just > built successfully the defconfig. > > So I give you a: > Reviewed-by: Giulio Benetti > > removing BR2_PACKAGE_HOST_IMX_MKIMAGE=y > > and with the promise to bump Linux and U-Boot versions as soon as new > versions are released with the goal of removing the -rc1 versions. Forgotten to mention again, we need Ariel "Tested-by:" before applying. Regards -- Giulio Benetti Benetti Engineering sas From peron.clem at gmail.com Mon Jan 31 12:43:14 2022 From: peron.clem at gmail.com (=?UTF-8?B?Q2zDqW1lbnQgUMOpcm9u?=) Date: Mon, 31 Jan 2022 13:43:14 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <20220130181830.3170d14f@windsurf> References: <20220129111731.736265-1-peron.clem@gmail.com> <20220130181830.3170d14f@windsurf> Message-ID: Hi Thomas, On Sun, 30 Jan 2022 at 18:18, Thomas Petazzoni wrote: > > On Sat, 29 Jan 2022 12:17:30 +0100 > Cl?ment P?ron wrote: > > > For the moment Beelink GS1 use a default rootfs size of 60M, > > which is a bit low if you want to add some packages like a > > graphic stack. > > > > Increase the rootfs size to 120M. > > > > Reviewed-by: Giulio Benetti > > Signed-off-by: Cl?ment P?ron > > --- > > configs/beelink_gs1_defconfig | 1 + > > 1 file changed, 1 insertion(+) > > I have not applied this one. Indeed, any defconfig that uses the > default rootfs size of 60M would have the problem of "if I add more > packages, it doesn't fit in the image". The defconfigs are meant to be > minimal, so it doesn't make sense to increase the size to 120M to > accommodate some possible package additions. Maybe even 120M is not > going to be enough depending on how many packages you add (and how > large they are). Ok, Thanks for the explanation > > So I've marked this patch as Rejected. > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From michael at amarulasolutions.com Mon Jan 31 12:43:35 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 31 Jan 2022 13:43:35 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <32d9ead7-e961-0b9d-10a3-c1ea8337b957@benettiengineering.com> References: <20220131085216.1256242-1-michael@amarulasolutions.com> <32d9ead7-e961-0b9d-10a3-c1ea8337b957@benettiengineering.com> Message-ID: Hi git diff diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig index 8472c6db2b..34d92fa4cc 100644 --- a/configs/bsh_smms2pro_defconfig +++ b/configs/bsh_smms2pro_defconfig @@ -41,6 +41,3 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Those are not needed. Anyway I need to change uboot download point and waiting from Ariel Michael On Mon, Jan 31, 2022 at 1:41 PM Giulio Benetti wrote: > > On 31/01/22 13:39, Giulio Benetti wrote: > > Hi Michael, Heiko, All, > > > > On 31/01/22 12:48, Michael Nazzareno Trimarchi wrote: > >> Hi Heiko > >> > >> On Mon, Jan 31, 2022 at 12:42 PM Heiko Thiery wrote: > >>> > >>> Hi Michael, > >>> > >>> Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi > >>> : > >>>> > >>>> Add initial support for iMX8MN BSH SMM S2 PRO board: > >>>> > >>>> - Linux: v5.17-rc1 > >>>> - Uboot 2022-01-rc1 (reference tree) > >>>> - Default packages from buildroot > >>>> > >>>> https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > >>>> > >>>> Add Ariel D'Alessandro as co-maintainer, we work together on > >>>> platform mainline > >>>> > >>>> Build and tested using: > >>>> docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > >>>> > >>>> Cc: Ariel D'Alessandro > >>>> Cc: Jagan Teki > >>>> Signed-off-by: Michael Trimarchi > >>>> --- > >>>> Changes V1->V2: > >>>> - add the board reference page > >>>> - test with docker > >>>> - adjust the buildroot config in order to use buildman > >>>> --- > >>>> DEVELOPERS | 2 ++ > >>>> board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ > >>>> board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > >>>> board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > >>>> board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > >>>> board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ > >>>> configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ > >>>> 7 files changed, 134 insertions(+) > >>>> create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > >>>> create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > >>>> create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > >>>> create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > >>>> create mode 100644 board/bsh/bsh-imx8mn/readme.txt > >>>> create mode 100644 configs/bsh_smms2pro_defconfig > >>>> > >>>> diff --git a/DEVELOPERS b/DEVELOPERS > >>>> index fe8de1916e..fc66fb6b83 100644 > >>>> --- a/DEVELOPERS > >>>> +++ b/DEVELOPERS > >>>> @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > >>>> F: configs/snps_archs38_vdk_defconfig > >>>> > >>>> N: Ariel D'Alessandro > >>>> +F: board/bsh/ > >>>> F: package/axfsutils/ > >>>> F: package/mali-t76x/ > >>>> > >>>> @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > >>>> F: package/python-pyzmq/ > >>>> > >>>> N: Michael Trimarchi > >>>> +F: board/bsh/ > >>>> F: package/python-spidev/ > >>>> > >>>> N: Michael Vetter > >>>> diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > >>>> new file mode 100644 > >>>> index 0000000000..9111354742 > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/extlinux.conf > >>>> @@ -0,0 +1,4 @@ > >>>> +label buildroot > >>>> + kernel /boot/Image > >>>> + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > >>>> + append root=PARTUUID=%PARTUUID% rootwait rw > >>>> diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > >>>> new file mode 100644 > >>>> index 0000000000..bc100b171d > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/genimage.cfg > >>>> @@ -0,0 +1,17 @@ > >>>> +image sdcard.img { > >>>> + hdimage { > >>>> + partition-table-type = "gpt" > >>>> + } > >>>> + > >>>> + partition imx-boot { > >>>> + in-partition-table = "no" > >>>> + image = "flash.bin" > >>>> + offset = 33K > >>>> + } > >>>> + > >>>> + partition rootfs { > >>>> + offset = 8M > >>>> + image = "rootfs.ext4" > >>>> + partition-uuid = %PARTUUID% > >>>> + } > >>>> +} > >>>> diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > >>>> new file mode 100755 > >>>> index 0000000000..bf8861f6a9 > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/post-build.sh > >>>> @@ -0,0 +1,7 @@ > >>>> +#!/bin/sh > >>>> +BOARD_DIR="$(dirname $0)" > >>>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" > >>>> + > >>>> +install -d "$TARGET_DIR/boot/extlinux/" > >>>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > >>>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > >>>> diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > >>>> new file mode 100755 > >>>> index 0000000000..3452fd4501 > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/post-image.sh > >>>> @@ -0,0 +1,3 @@ > >>>> +#!/bin/sh > >>>> + > >>>> +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > >>>> diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > >>>> new file mode 100644 > >>>> index 0000000000..ae30666cd0 > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/readme.txt > >>>> @@ -0,0 +1,55 @@ > >>>> +How to build it > >>>> +=============== > >>>> + > >>>> +Configure buildroot: > >>>> + > >>>> + $ make bsh_smms2pro_defconfig > >>>> + > >>>> +Change settings to fit your needs (optional): > >>>> + > >>>> + $ make menuconfig > >>>> + > >>>> +Compile everything and buildr the rootfs image: > >>>> + > >>>> + $ make > >>>> + > >>>> + > >>>> +Result of the build > >>>> +=================== > >>>> + > >>>> +After building, the output/images directory contains: > >>>> + > >>>> + output/images/ > >>>> + ??? bl31.bin > >>>> + ??? Image > >>>> + ??? flash.bin > >>>> + ??? ddr3* > >>>> + ??? rootfs.ext2 > >>>> + ??? rootfs.ext4 -> rootfs.ext2 > >>>> + ??? rootfs.tar > >>>> + ??? sdcard.img > >>>> + ??? u-boot.bin > >>>> + ??? u-boot-nodtb.bin > >>>> + ??? u-boot-spl.bin > >>>> + > >>>> + > >>>> +Flashing the emmc card image > >>>> +========================== > >>>> + > >>>> +To install the image on on eMMC > >>>> + > >>>> + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > >>>> + > >>>> + > >>>> +Preparing the board > >>>> +=================== > >>>> + > >>>> + * Connect a serial line to the board > >>>> + * Power-up the board > >>>> + > >>>> + > >>>> +Booting the board > >>>> +================= > >>>> + > >>>> +By default the bootloader will search for the first valid image, starting > >>>> +with the internal eMMC. > >>>> diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > >>>> new file mode 100644 > >>>> index 0000000000..8472c6db2b > >>>> --- /dev/null > >>>> +++ b/configs/bsh_smms2pro_defconfig > >>>> @@ -0,0 +1,46 @@ > >>>> +BR2_aarch64=y > >>>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > >>>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" > >>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > >>>> +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > >>>> +BR2_LINUX_KERNEL=y > >>>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y > >>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > >>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > >>>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > >>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y > >>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > >>>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > >>>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y > >>>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > >>>> +BR2_PACKAGE_FREESCALE_IMX=y > >>>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > >>>> +BR2_PACKAGE_FIRMWARE_IMX=y > >>>> +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > >>>> +BR2_TARGET_ROOTFS_EXT2=y > >>>> +BR2_TARGET_ROOTFS_EXT2_4=y > >>>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > >>>> +BR2_TARGET_UBOOT=y > >>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > >>>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y > >>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > >>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" > >>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > >>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y > >>>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > >>>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > >>>> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > >>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > >>>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > >>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > >>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > >>>> +BR2_TARGET_UBOOT_SPL=y > >>>> +BR2_PACKAGE_HOST_GENIMAGE=y > >>>> +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > >>> > >>> When building the final imx flash.bin image with binman this host tool > >>> is no longer required. > >>> > >>>> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > >>>> +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > >>> > >>> Same here. > >> > >> You mean the UBOOT_TOOLS* package. I will drop as soon as I have a > >> uboot downloading point in apertis (better the this one) > > > > I think Heiko means BR2_PACKAGE_HOST_IMX_MKIMAGE=y, indeed I've just > > built successfully the defconfig. > > > > So I give you a: > > Reviewed-by: Giulio Benetti > > > > removing BR2_PACKAGE_HOST_IMX_MKIMAGE=y > > > > and with the promise to bump Linux and U-Boot versions as soon as new > > versions are released with the goal of removing the -rc1 versions. > > Forgotten to mention again, we need Ariel "Tested-by:" before applying. > > Regards > -- > Giulio Benetti > Benetti Engineering sas -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From heiko.thiery at gmail.com Mon Jan 31 12:45:58 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 31 Jan 2022 13:45:58 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131085216.1256242-1-michael@amarulasolutions.com> <32d9ead7-e961-0b9d-10a3-c1ea8337b957@benettiengineering.com> Message-ID: Hi, Am Mo., 31. Jan. 2022 um 13:43 Uhr schrieb Michael Nazzareno Trimarchi : > > Hi > > git diff > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > index 8472c6db2b..34d92fa4cc 100644 > --- a/configs/bsh_smms2pro_defconfig > +++ b/configs/bsh_smms2pro_defconfig > @@ -41,6 +41,3 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > BR2_TARGET_UBOOT_SPL=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_IMX_MKIMAGE=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > > Those are not needed. Anyway I need to change uboot download point and > waiting from Ariel Yes .. this is what I meant. -- Heiko From geomatsi at gmail.com Mon Jan 31 13:09:03 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 31 Jan 2022 16:09:03 +0300 Subject: [Buildroot] [PATCH 0/5] synopsys: boards maintenance In-Reply-To: <48cd0534-15fc-3dda-4a39-64487b112229@benettiengineering.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <48cd0534-15fc-3dda-4a39-64487b112229@benettiengineering.com> Message-ID: Hi Giulio, > Hi Sergey, > > On 31/01/22 09:12, Sergey Matyukevich wrote: > > Hi all, > > > > This is a maintenance patch series for Synopsys boards. Outdated > > and unused VDK configurations are removed. All the other boards > > receive Linux kernel and U-Boot updates. > > Have you tested on the real boards or only check if they built successfully? I have tested all the images on hardware. Regards, Sergey From giulio.benetti at benettiengineering.com Mon Jan 31 13:10:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 14:10:46 +0100 Subject: [Buildroot] [PATCH 0/5] synopsys: boards maintenance In-Reply-To: References: Message-ID: > Il giorno 31 gen 2022, alle ore 14:09, Sergey Matyukevich ha scritto: > > ?Hi Giulio, > >> Hi Sergey, >> >>> On 31/01/22 09:12, Sergey Matyukevich wrote: >>> Hi all, >>> >>> This is a maintenance patch series for Synopsys boards. Outdated >>> and unused VDK configurations are removed. All the other boards >>> receive Linux kernel and U-Boot updates. >> >> Have you tested on the real boards or only check if they built successfully? > > I have tested all the images on hardware. Perfect :-) Best regards Giulio Benetti > > Regards, > Sergey From michael at amarulasolutions.com Mon Jan 31 14:55:55 2022 From: michael at amarulasolutions.com (Michael Trimarchi) Date: Mon, 31 Jan 2022 15:55:55 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO Message-ID: <20220131145555.2819020-1-michael@amarulasolutions.com> Add initial support for iMX8MN BSH SMM S2 PRO board: - Linux: v5.17-rc1 - Uboot 2022-01-rc1 (reference tree) - Default packages from buildroot https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ Add Ariel D'Alessandro as co-maintainer, we work together on platform mainline Build and tested using: docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 Cc: Ariel D'Alessandro Cc: Jagan Teki Cc: Heiko Thiery Cc: Giulio Benetti Reviewed-by: Giulio Benetti Signed-off-by: Michael Trimarchi --- Changes V2->V3: - Update the uboot download point - Add feedback from Heiko Thiery - Add feddback from Giulio Benetti Changes V1->V2: - add the board reference page - test with docker - adjust the buildroot config in order to use buildman --- DEVELOPERS | 2 ++ board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ board/bsh/bsh-imx8mn/post-image.sh | 3 ++ board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ configs/bsh_smms2pro_defconfig | 43 +++++++++++++++++++++++ 7 files changed, 131 insertions(+) create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg create mode 100755 board/bsh/bsh-imx8mn/post-build.sh create mode 100755 board/bsh/bsh-imx8mn/post-image.sh create mode 100644 board/bsh/bsh-imx8mn/readme.txt create mode 100644 configs/bsh_smms2pro_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..fc66fb6b83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig F: configs/snps_archs38_vdk_defconfig N: Ariel D'Alessandro +F: board/bsh/ F: package/axfsutils/ F: package/mali-t76x/ @@ -2018,6 +2019,7 @@ F: package/python-crc16/ F: package/python-pyzmq/ N: Michael Trimarchi +F: board/bsh/ F: package/python-spidev/ N: Michael Vetter diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf new file mode 100644 index 0000000000..9111354742 --- /dev/null +++ b/board/bsh/bsh-imx8mn/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg new file mode 100644 index 0000000000..bc100b171d --- /dev/null +++ b/board/bsh/bsh-imx8mn/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/bsh/bsh-imx8mn/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh new file mode 100755 index 0000000000..3452fd4501 --- /dev/null +++ b/board/bsh/bsh-imx8mn/post-image.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt new file mode 100644 index 0000000000..ae30666cd0 --- /dev/null +++ b/board/bsh/bsh-imx8mn/readme.txt @@ -0,0 +1,55 @@ +How to build it +=============== + +Configure buildroot: + + $ make bsh_smms2pro_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and buildr the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? Image + ??? flash.bin + ??? ddr3* + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-nodtb.bin + ??? u-boot-spl.bin + + +Flashing the emmc card image +========================== + +To install the image on on eMMC + + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img + + +Preparing the board +=================== + + * Connect a serial line to the board + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig new file mode 100644 index 0000000000..9fd7fb8e7c --- /dev/null +++ b/configs/bsh_smms2pro_defconfig @@ -0,0 +1,43 @@ +BR2_aarch64=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-bsh-smm2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y -- 2.25.1 From heiko.thiery at gmail.com Mon Jan 31 15:30:23 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 31 Jan 2022 16:30:23 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220131153022.351662-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- v5: - remove BR2_PACKAGE_HOST_UBOOT_TOOLS v4: - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. The FPU options are set implicit. v3: - change offset value to use capitol 'K' value (thanks Guilio) - add info to uboot patches about submitting to upstream v2: - switch to extlinux - directly call genimage.sh - remove post-image.sh - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 7 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 58 ++++ 8 files changed, 510 insertions(+) create mode 100644 board/kontron/bl-imx8mm/extlinux.conf create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..38724726d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1183,7 +1183,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf new file mode 100644 index 0000000000..d38f7f81b7 --- /dev/null +++ b/board/kontron/bl-imx8mm/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..c98bc4f150 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,18 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 16K + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + image = "rootfs.ext4" + offset = 8M + partition-uuid = %PARTUUID% + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..6d76282def --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,31 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..a88d7aba87 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,305 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..0cf0115bfa --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_PACKAGE_HOST_GENIMAGE=y -- 2.30.2 From michael at amarulasolutions.com Mon Jan 31 15:36:04 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 31 Jan 2022 16:36:04 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220131153022.351662-1-heiko.thiery@gmail.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> Message-ID: Hi Heiko On Mon, Jan 31, 2022 at 4:30 PM Heiko Thiery wrote: > > The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > Cc: Frieder Schrempf > Signed-off-by: Heiko Thiery > --- > v5: > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS > > v4: > - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > The FPU options are set implicit. > > v3: > - change offset value to use capitol 'K' value (thanks Guilio) > - add info to uboot patches about submitting to upstream > > v2: > - switch to extlinux > - directly call genimage.sh > - remove post-image.sh > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > DEVELOPERS | 2 + > board/kontron/bl-imx8mm/extlinux.conf | 4 + > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > board/kontron/bl-imx8mm/post-build.sh | 7 + > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > configs/kontron_bl_imx8mm_defconfig | 58 ++++ > 8 files changed, 510 insertions(+) > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > create mode 100644 board/kontron/bl-imx8mm/readme.txt > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index a1ec9a091e..38724726d4 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1183,7 +1183,9 @@ F: package/python-sip/ > F: package/uhd/ > > N: Heiko Thiery > +F: board/kontron/bl-imx8mm/ > F: board/kontron/pitx-imx8m/ > +F: configs/kontron_bl_imx8mm_defconfig > F: configs/kontron_pitx_imx8m_defconfig > F: package/altera-stapl/ > F: package/ipmitool/ > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > new file mode 100644 > index 0000000000..d38f7f81b7 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > new file mode 100644 > index 0000000000..c98bc4f150 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/genimage.cfg > @@ -0,0 +1,18 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 16K > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33K > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + offset = 8M > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..6d76282def > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,31 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > + > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > +index 35d12fca32..940bf07a92 100644 > +--- a/configs/kontron-sl-mx8mm_defconfig > ++++ b/configs/kontron-sl-mx8mm_defconfig > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > + CONFIG_SPL_TEXT_BASE=0x7E1000 > + CONFIG_TARGET_KONTRON_MX8MM=y > ++CONFIG_SPL_MMC=y > ++CONFIG_SPL_SERIAL=y > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > + CONFIG_SPL=y > + CONFIG_DISTRO_DEFAULTS=y > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > new file mode 100644 > index 0000000000..a88d7aba87 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > @@ -0,0 +1,305 @@ > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > + u-boot.dtsi > + > +When using a board variant that selects the lvds specific dtb the > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > +include this in the board base u-boot.dtsi and create an additional one > +for the lvds variant. > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > + 3 files changed, 135 insertions(+), 123 deletions(-) > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > + > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +new file mode 100644 > +index 0000000000..4bf75722bf > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +@@ -0,0 +1,6 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +index 22d18e6f1c..4bf75722bf 100644 > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +@@ -3,126 +3,4 @@ > + * Copyright (C) 2019 Kontron Electronics GmbH > + */ > + > +-#include "imx8mm-u-boot.dtsi" > +- > +-/ { > +- aliases { > +- usb0 = &usbotg1; > +- usb1 = &usbotg2; > +- }; > +- > +- wdt-reboot { > +- compatible = "wdt-reboot"; > +- wdt = <&wdog1>; > +- u-boot,dm-spl; > +- }; > +- > +- firmware { > +- optee { > +- compatible = "linaro,optee-tz"; > +- method = "smc"; > +- }; > +- }; > +-}; > +- > +-&fec1 { > +- phy-mode = "rgmii-rxid"; > +-}; > +- > +-&i2c1 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&i2c2 { > +- status = "okay"; > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_i2c1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_pmic { > +- u-boot,dm-spl; > +- fsl,pins = < > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > +- /* Disable Pullup for SD_VSEL */ > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > +- >; > +-}; > +- > +-&pinctrl_uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_100mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_200mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&pca9450 { > +- u-boot,dm-spl; > +-}; > +- > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > +- u-boot,dm-spl; > +-}; > +- > +-&ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio2 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio3 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio4 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio5 { > +- u-boot,dm-spl; > +-}; > +- > +-&uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&wdog1 { > +- u-boot,dm-spl; > +-}; > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +new file mode 100644 > +index 0000000000..22d18e6f1c > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +@@ -0,0 +1,128 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-u-boot.dtsi" > ++ > ++/ { > ++ aliases { > ++ usb0 = &usbotg1; > ++ usb1 = &usbotg2; > ++ }; > ++ > ++ wdt-reboot { > ++ compatible = "wdt-reboot"; > ++ wdt = <&wdog1>; > ++ u-boot,dm-spl; > ++ }; > ++ > ++ firmware { > ++ optee { > ++ compatible = "linaro,optee-tz"; > ++ method = "smc"; > ++ }; > ++ }; > ++}; > ++ > ++&fec1 { > ++ phy-mode = "rgmii-rxid"; > ++}; > ++ > ++&i2c1 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&i2c2 { > ++ status = "okay"; > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_i2c1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_pmic { > ++ u-boot,dm-spl; > ++ fsl,pins = < > ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > ++ /* Disable Pullup for SD_VSEL */ > ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > ++ >; > ++}; > ++ > ++&pinctrl_uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_100mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_200mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pca9450 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > ++ u-boot,dm-spl; > ++}; > ++ > ++&ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio3 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio4 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio5 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&wdog1 { > ++ u-boot,dm-spl; > ++}; > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > new file mode 100644 > index 0000000000..df47ba5174 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/readme.txt > @@ -0,0 +1,85 @@ > +Kontron BL i.MX8M Mini > +====================== > + > +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > + > + > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make kontron_bl_imx8mm_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and build the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? flash.bin > + ??? Image > + ??? imx8mm-kontron-n801x-s.dtb > + ??? lpddr4_pmu_train_1d_dmem_201904.bin > + ??? lpddr4_pmu_train_1d_dmem_202006.bin > + ??? lpddr4_pmu_train_1d_dmem.bin > + ??? lpddr4_pmu_train_1d_dmem_pad.bin > + ??? lpddr4_pmu_train_1d_fw.bin > + ??? lpddr4_pmu_train_1d_imem_201904.bin > + ??? lpddr4_pmu_train_1d_imem_202006.bin > + ??? lpddr4_pmu_train_1d_imem.bin > + ??? lpddr4_pmu_train_1d_imem_pad.bin > + ??? lpddr4_pmu_train_2d_dmem_201904.bin > + ??? lpddr4_pmu_train_2d_dmem_202006.bin > + ??? lpddr4_pmu_train_2d_dmem.bin > + ??? lpddr4_pmu_train_2d_dmem_pad.bin > + ??? lpddr4_pmu_train_2d_fw.bin > + ??? lpddr4_pmu_train_2d_imem_201904.bin > + ??? lpddr4_pmu_train_2d_imem_202006.bin > + ??? lpddr4_pmu_train_2d_imem.bin > + ??? lpddr4_pmu_train_2d_imem_pad.bin > + ??? lpddr4_pmu_train_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot-spl.bin > + > + > +Flashing the SD card image > +========================== > + > +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > + > + $ sudo dd if=output/images/sdcard.img of= > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Insert the SD card > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. To make sure the bootloader loads bootscript from > +the correct location (SD card) set the boot_targets environment variable: > + > + $ setenv boot_targets mmc1 > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > new file mode 100644 > index 0000000000..0cf0115bfa > --- /dev/null > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -0,0 +1,58 @@ > +# Architecture > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y > + > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > +BR2_PACKAGE_HOST_GENIMAGE=y I have seen that some people like to have this organization but it's not really nice to maintain. I would like to savedefconfig and use that one instead of having nice commented part. Is this mandatory? Michael > -- > 2.30.2 > -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From giulio.benetti at benettiengineering.com Mon Jan 31 15:37:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 16:37:33 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220131153022.351662-1-heiko.thiery@gmail.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> Message-ID: Hi Heiko, > Il giorno 31 gen 2022, alle ore 16:31, Heiko Thiery ha scritto: > > ?The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > Cc: Frieder Schrempf > Signed-off-by: Heiko Thiery Reviewed-by: Giulio Benetti Best regards Giulio > --- > v5: > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS > > v4: > - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > The FPU options are set implicit. > > v3: > - change offset value to use capitol 'K' value (thanks Guilio) > - add info to uboot patches about submitting to upstream > > v2: > - switch to extlinux > - directly call genimage.sh > - remove post-image.sh > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > DEVELOPERS | 2 + > board/kontron/bl-imx8mm/extlinux.conf | 4 + > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > board/kontron/bl-imx8mm/post-build.sh | 7 + > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > configs/kontron_bl_imx8mm_defconfig | 58 ++++ > 8 files changed, 510 insertions(+) > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > create mode 100644 board/kontron/bl-imx8mm/readme.txt > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index a1ec9a091e..38724726d4 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1183,7 +1183,9 @@ F: package/python-sip/ > F: package/uhd/ > > N: Heiko Thiery > +F: board/kontron/bl-imx8mm/ > F: board/kontron/pitx-imx8m/ > +F: configs/kontron_bl_imx8mm_defconfig > F: configs/kontron_pitx_imx8m_defconfig > F: package/altera-stapl/ > F: package/ipmitool/ > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > new file mode 100644 > index 0000000000..d38f7f81b7 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > new file mode 100644 > index 0000000000..c98bc4f150 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/genimage.cfg > @@ -0,0 +1,18 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 16K > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33K > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + offset = 8M > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..6d76282def > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,31 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > + > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > +index 35d12fca32..940bf07a92 100644 > +--- a/configs/kontron-sl-mx8mm_defconfig > ++++ b/configs/kontron-sl-mx8mm_defconfig > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > + CONFIG_SPL_TEXT_BASE=0x7E1000 > + CONFIG_TARGET_KONTRON_MX8MM=y > ++CONFIG_SPL_MMC=y > ++CONFIG_SPL_SERIAL=y > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > + CONFIG_SPL=y > + CONFIG_DISTRO_DEFAULTS=y > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > new file mode 100644 > index 0000000000..a88d7aba87 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > @@ -0,0 +1,305 @@ > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > + u-boot.dtsi > + > +When using a board variant that selects the lvds specific dtb the > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > +include this in the board base u-boot.dtsi and create an additional one > +for the lvds variant. > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > + 3 files changed, 135 insertions(+), 123 deletions(-) > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > + > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +new file mode 100644 > +index 0000000000..4bf75722bf > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +@@ -0,0 +1,6 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +index 22d18e6f1c..4bf75722bf 100644 > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +@@ -3,126 +3,4 @@ > + * Copyright (C) 2019 Kontron Electronics GmbH > + */ > + > +-#include "imx8mm-u-boot.dtsi" > +- > +-/ { > +- aliases { > +- usb0 = &usbotg1; > +- usb1 = &usbotg2; > +- }; > +- > +- wdt-reboot { > +- compatible = "wdt-reboot"; > +- wdt = <&wdog1>; > +- u-boot,dm-spl; > +- }; > +- > +- firmware { > +- optee { > +- compatible = "linaro,optee-tz"; > +- method = "smc"; > +- }; > +- }; > +-}; > +- > +-&fec1 { > +- phy-mode = "rgmii-rxid"; > +-}; > +- > +-&i2c1 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&i2c2 { > +- status = "okay"; > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_i2c1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_pmic { > +- u-boot,dm-spl; > +- fsl,pins = < > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > +- /* Disable Pullup for SD_VSEL */ > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > +- >; > +-}; > +- > +-&pinctrl_uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_100mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_200mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&pca9450 { > +- u-boot,dm-spl; > +-}; > +- > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > +- u-boot,dm-spl; > +-}; > +- > +-&ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio2 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio3 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio4 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio5 { > +- u-boot,dm-spl; > +-}; > +- > +-&uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&wdog1 { > +- u-boot,dm-spl; > +-}; > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +new file mode 100644 > +index 0000000000..22d18e6f1c > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +@@ -0,0 +1,128 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-u-boot.dtsi" > ++ > ++/ { > ++ aliases { > ++ usb0 = &usbotg1; > ++ usb1 = &usbotg2; > ++ }; > ++ > ++ wdt-reboot { > ++ compatible = "wdt-reboot"; > ++ wdt = <&wdog1>; > ++ u-boot,dm-spl; > ++ }; > ++ > ++ firmware { > ++ optee { > ++ compatible = "linaro,optee-tz"; > ++ method = "smc"; > ++ }; > ++ }; > ++}; > ++ > ++&fec1 { > ++ phy-mode = "rgmii-rxid"; > ++}; > ++ > ++&i2c1 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&i2c2 { > ++ status = "okay"; > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_i2c1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_pmic { > ++ u-boot,dm-spl; > ++ fsl,pins = < > ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > ++ /* Disable Pullup for SD_VSEL */ > ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > ++ >; > ++}; > ++ > ++&pinctrl_uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_100mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_200mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pca9450 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > ++ u-boot,dm-spl; > ++}; > ++ > ++&ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio3 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio4 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio5 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&wdog1 { > ++ u-boot,dm-spl; > ++}; > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > new file mode 100644 > index 0000000000..df47ba5174 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/readme.txt > @@ -0,0 +1,85 @@ > +Kontron BL i.MX8M Mini > +====================== > + > +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > + > + > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make kontron_bl_imx8mm_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and build the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? flash.bin > + ??? Image > + ??? imx8mm-kontron-n801x-s.dtb > + ??? lpddr4_pmu_train_1d_dmem_201904.bin > + ??? lpddr4_pmu_train_1d_dmem_202006.bin > + ??? lpddr4_pmu_train_1d_dmem.bin > + ??? lpddr4_pmu_train_1d_dmem_pad.bin > + ??? lpddr4_pmu_train_1d_fw.bin > + ??? lpddr4_pmu_train_1d_imem_201904.bin > + ??? lpddr4_pmu_train_1d_imem_202006.bin > + ??? lpddr4_pmu_train_1d_imem.bin > + ??? lpddr4_pmu_train_1d_imem_pad.bin > + ??? lpddr4_pmu_train_2d_dmem_201904.bin > + ??? lpddr4_pmu_train_2d_dmem_202006.bin > + ??? lpddr4_pmu_train_2d_dmem.bin > + ??? lpddr4_pmu_train_2d_dmem_pad.bin > + ??? lpddr4_pmu_train_2d_fw.bin > + ??? lpddr4_pmu_train_2d_imem_201904.bin > + ??? lpddr4_pmu_train_2d_imem_202006.bin > + ??? lpddr4_pmu_train_2d_imem.bin > + ??? lpddr4_pmu_train_2d_imem_pad.bin > + ??? lpddr4_pmu_train_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot-spl.bin > + > + > +Flashing the SD card image > +========================== > + > +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > + > + $ sudo dd if=output/images/sdcard.img of= > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Insert the SD card > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. To make sure the bootloader loads bootscript from > +the correct location (SD card) set the boot_targets environment variable: > + > + $ setenv boot_targets mmc1 > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > new file mode 100644 > index 0000000000..0cf0115bfa > --- /dev/null > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -0,0 +1,58 @@ > +# Architecture > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y > + > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > +BR2_PACKAGE_HOST_GENIMAGE=y > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From heiko.thiery at gmail.com Mon Jan 31 15:42:39 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 31 Jan 2022 16:42:39 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220131153022.351662-1-heiko.thiery@gmail.com> Message-ID: Hi Michael, Am Mo., 31. Jan. 2022 um 16:36 Uhr schrieb Michael Nazzareno Trimarchi : > > Hi Heiko > > On Mon, Jan 31, 2022 at 4:30 PM Heiko Thiery wrote: > > > > The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > > > Cc: Frieder Schrempf > > Signed-off-by: Heiko Thiery > > --- > > v5: > > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS > > > > v4: > > - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > > The FPU options are set implicit. > > > > v3: > > - change offset value to use capitol 'K' value (thanks Guilio) > > - add info to uboot patches about submitting to upstream > > > > v2: > > - switch to extlinux > > - directly call genimage.sh > > - remove post-image.sh > > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > > > DEVELOPERS | 2 + > > board/kontron/bl-imx8mm/extlinux.conf | 4 + > > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > > ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > > ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > > board/kontron/bl-imx8mm/post-build.sh | 7 + > > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > > configs/kontron_bl_imx8mm_defconfig | 58 ++++ > > 8 files changed, 510 insertions(+) > > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > > create mode 100644 board/kontron/bl-imx8mm/readme.txt > > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index a1ec9a091e..38724726d4 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1183,7 +1183,9 @@ F: package/python-sip/ > > F: package/uhd/ > > > > N: Heiko Thiery > > +F: board/kontron/bl-imx8mm/ > > F: board/kontron/pitx-imx8m/ > > +F: configs/kontron_bl_imx8mm_defconfig > > F: configs/kontron_pitx_imx8m_defconfig > > F: package/altera-stapl/ > > F: package/ipmitool/ > > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > > new file mode 100644 > > index 0000000000..d38f7f81b7 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/extlinux.conf > > @@ -0,0 +1,4 @@ > > +label buildroot > > + kernel /boot/Image > > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > > + append root=PARTUUID=%PARTUUID% rootwait rw > > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > > new file mode 100644 > > index 0000000000..c98bc4f150 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/genimage.cfg > > @@ -0,0 +1,18 @@ > > +image sdcard.img { > > + hdimage { > > + partition-table-type = "gpt" > > + gpt-location = 16K > > + } > > + > > + partition imx-boot { > > + in-partition-table = "no" > > + image = "flash.bin" > > + offset = 33K > > + } > > + > > + partition rootfs { > > + image = "rootfs.ext4" > > + offset = 8M > > + partition-uuid = %PARTUUID% > > + } > > +} > > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > new file mode 100644 > > index 0000000000..6d76282def > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > @@ -0,0 +1,31 @@ > > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > > +From: Heiko Thiery > > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > > + > > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > > + > > +Patch submitted upstream: > > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > > + > > +Signed-off-by: Heiko Thiery > > +--- > > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > > + 1 file changed, 2 insertions(+) > > + > > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > > +index 35d12fca32..940bf07a92 100644 > > +--- a/configs/kontron-sl-mx8mm_defconfig > > ++++ b/configs/kontron-sl-mx8mm_defconfig > > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > > + CONFIG_SPL_TEXT_BASE=0x7E1000 > > + CONFIG_TARGET_KONTRON_MX8MM=y > > ++CONFIG_SPL_MMC=y > > ++CONFIG_SPL_SERIAL=y > > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > > + CONFIG_SPL=y > > + CONFIG_DISTRO_DEFAULTS=y > > +-- > > +2.30.2 > > + > > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > > new file mode 100644 > > index 0000000000..a88d7aba87 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > > @@ -0,0 +1,305 @@ > > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > > +From: Heiko Thiery > > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > > + u-boot.dtsi > > + > > +When using a board variant that selects the lvds specific dtb the > > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > > +include this in the board base u-boot.dtsi and create an additional one > > +for the lvds variant. > > + > > +Patch submitted upstream: > > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > > + > > +Signed-off-by: Heiko Thiery > > +--- > > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > > + 3 files changed, 135 insertions(+), 123 deletions(-) > > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > > + > > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > > +new file mode 100644 > > +index 0000000000..4bf75722bf > > +--- /dev/null > > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > > +@@ -0,0 +1,6 @@ > > ++// SPDX-License-Identifier: GPL-2.0+ > > ++/* > > ++ * Copyright (C) 2019 Kontron Electronics GmbH > > ++ */ > > ++ > > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > > +index 22d18e6f1c..4bf75722bf 100644 > > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > > +@@ -3,126 +3,4 @@ > > + * Copyright (C) 2019 Kontron Electronics GmbH > > + */ > > + > > +-#include "imx8mm-u-boot.dtsi" > > +- > > +-/ { > > +- aliases { > > +- usb0 = &usbotg1; > > +- usb1 = &usbotg2; > > +- }; > > +- > > +- wdt-reboot { > > +- compatible = "wdt-reboot"; > > +- wdt = <&wdog1>; > > +- u-boot,dm-spl; > > +- }; > > +- > > +- firmware { > > +- optee { > > +- compatible = "linaro,optee-tz"; > > +- method = "smc"; > > +- }; > > +- }; > > +-}; > > +- > > +-&fec1 { > > +- phy-mode = "rgmii-rxid"; > > +-}; > > +- > > +-&i2c1 { > > +- u-boot,dm-spl; > > +- u-boot,dm-pre-reloc; > > +-}; > > +- > > +-&i2c2 { > > +- status = "okay"; > > +- u-boot,dm-spl; > > +- u-boot,dm-pre-reloc; > > +-}; > > +- > > +-&pinctrl_ecspi1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_i2c1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_pmic { > > +- u-boot,dm-spl; > > +- fsl,pins = < > > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > > +- /* Disable Pullup for SD_VSEL */ > > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > > +- >; > > +-}; > > +- > > +-&pinctrl_uart3 { > > +- u-boot,dm-spl; > > +- u-boot,dm-pre-reloc; > > +-}; > > +- > > +-&pinctrl_usdhc1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_usdhc1_100mhz { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_usdhc1_200mhz { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_usdhc2 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pca9450 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&ecspi1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio2 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio3 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio4 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio5 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&uart3 { > > +- u-boot,dm-spl; > > +- u-boot,dm-pre-reloc; > > +-}; > > +- > > +-&usdhc1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&usdhc2 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&wdog1 { > > +- u-boot,dm-spl; > > +-}; > > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > > +new file mode 100644 > > +index 0000000000..22d18e6f1c > > +--- /dev/null > > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > > +@@ -0,0 +1,128 @@ > > ++// SPDX-License-Identifier: GPL-2.0+ > > ++/* > > ++ * Copyright (C) 2019 Kontron Electronics GmbH > > ++ */ > > ++ > > ++#include "imx8mm-u-boot.dtsi" > > ++ > > ++/ { > > ++ aliases { > > ++ usb0 = &usbotg1; > > ++ usb1 = &usbotg2; > > ++ }; > > ++ > > ++ wdt-reboot { > > ++ compatible = "wdt-reboot"; > > ++ wdt = <&wdog1>; > > ++ u-boot,dm-spl; > > ++ }; > > ++ > > ++ firmware { > > ++ optee { > > ++ compatible = "linaro,optee-tz"; > > ++ method = "smc"; > > ++ }; > > ++ }; > > ++}; > > ++ > > ++&fec1 { > > ++ phy-mode = "rgmii-rxid"; > > ++}; > > ++ > > ++&i2c1 { > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&i2c2 { > > ++ status = "okay"; > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&pinctrl_ecspi1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_i2c1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_pmic { > > ++ u-boot,dm-spl; > > ++ fsl,pins = < > > ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > > ++ /* Disable Pullup for SD_VSEL */ > > ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > > ++ >; > > ++}; > > ++ > > ++&pinctrl_uart3 { > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&pinctrl_usdhc1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_usdhc1_100mhz { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_usdhc1_200mhz { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_usdhc2 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pca9450 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&ecspi1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio2 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio3 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio4 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio5 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&uart3 { > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&usdhc1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&usdhc2 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&wdog1 { > > ++ u-boot,dm-spl; > > ++}; > > +-- > > +2.30.2 > > + > > diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > > new file mode 100755 > > index 0000000000..bf8861f6a9 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/post-build.sh > > @@ -0,0 +1,7 @@ > > +#!/bin/sh > > +BOARD_DIR="$(dirname $0)" > > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > > + > > +install -d "$TARGET_DIR/boot/extlinux/" > > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > > diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > > new file mode 100644 > > index 0000000000..df47ba5174 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/readme.txt > > @@ -0,0 +1,85 @@ > > +Kontron BL i.MX8M Mini > > +====================== > > + > > +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > + > > + > > +How to build it > > +=============== > > + > > +Configure buildroot: > > + > > + $ make kontron_bl_imx8mm_defconfig > > + > > +Change settings to fit your needs (optional): > > + > > + $ make menuconfig > > + > > +Compile everything and build the rootfs image: > > + > > + $ make > > + > > + > > +Result of the build > > +=================== > > + > > +After building, the output/images directory contains: > > + > > + output/images/ > > + ??? bl31.bin > > + ??? boot.scr > > + ??? ddr_fw.bin > > + ??? flash.bin > > + ??? Image > > + ??? imx8mm-kontron-n801x-s.dtb > > + ??? lpddr4_pmu_train_1d_dmem_201904.bin > > + ??? lpddr4_pmu_train_1d_dmem_202006.bin > > + ??? lpddr4_pmu_train_1d_dmem.bin > > + ??? lpddr4_pmu_train_1d_dmem_pad.bin > > + ??? lpddr4_pmu_train_1d_fw.bin > > + ??? lpddr4_pmu_train_1d_imem_201904.bin > > + ??? lpddr4_pmu_train_1d_imem_202006.bin > > + ??? lpddr4_pmu_train_1d_imem.bin > > + ??? lpddr4_pmu_train_1d_imem_pad.bin > > + ??? lpddr4_pmu_train_2d_dmem_201904.bin > > + ??? lpddr4_pmu_train_2d_dmem_202006.bin > > + ??? lpddr4_pmu_train_2d_dmem.bin > > + ??? lpddr4_pmu_train_2d_dmem_pad.bin > > + ??? lpddr4_pmu_train_2d_fw.bin > > + ??? lpddr4_pmu_train_2d_imem_201904.bin > > + ??? lpddr4_pmu_train_2d_imem_202006.bin > > + ??? lpddr4_pmu_train_2d_imem.bin > > + ??? lpddr4_pmu_train_2d_imem_pad.bin > > + ??? lpddr4_pmu_train_fw.bin > > + ??? rootfs.ext2 > > + ??? rootfs.ext4 -> rootfs.ext2 > > + ??? rootfs.tar > > + ??? sdcard.img > > + ??? u-boot.bin > > + ??? u-boot-spl.bin > > + > > + > > +Flashing the SD card image > > +========================== > > + > > +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > > + > > + $ sudo dd if=output/images/sdcard.img of= > > + > > + > > +Preparing the board > > +=================== > > + > > + * Connect a serial line to the board > > + * Insert the SD card > > + * Power-up the board > > + > > + > > +Booting the board > > +================= > > + > > +By default the bootloader will search for the first valid image, starting > > +with the internal eMMC. To make sure the bootloader loads bootscript from > > +the correct location (SD card) set the boot_targets environment variable: > > + > > + $ setenv boot_targets mmc1 > > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > > new file mode 100644 > > index 0000000000..0cf0115bfa > > --- /dev/null > > +++ b/configs/kontron_bl_imx8mm_defconfig > > @@ -0,0 +1,58 @@ > > +# Architecture > > +BR2_aarch64=y > > +BR2_ARM_FPU_VFPV3=y > > + > > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > > + > > +# System > > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > > + > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > + > > +BR2_PACKAGE_FREESCALE_IMX=y > > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > > +BR2_PACKAGE_FIRMWARE_IMX=y > > + > > +# Filesystem / image > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > + > > +# Bootloader > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > > +BR2_TARGET_UBOOT_SPL=y > > + > > +# Required host tools to create the SD/eMMC image > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > > +BR2_PACKAGE_HOST_GENIMAGE=y > > I have seen that some people like to have this organization but it's > not really nice to maintain. I would like > to savedefconfig and use that one instead of having nice commented > part. Is this mandatory? As far as I know there is no rule how to do that. For me it seems to be more readable and clean. But this is only my opinion. -- Heiko From bugzilla at busybox.net Mon Jan 31 15:52:48 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 31 Jan 2022 15:52:48 +0000 Subject: [Buildroot] [Bug 14366] 2021.11-rc2: Build of nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 --- Comment #2 from Jens Maus --- I can confirm that this issue still exists in 2021.11.1. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Jan 31 15:56:44 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 31 Jan 2022 15:56:44 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 Jens Maus changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|2021.11-rc2: Build of |Nodejs fails with "version |nodejs fails with "version |`GLIBC_2.34' not found" on |`GLIBC_2.34' not found" on |Ubuntu 20.04 |Ubuntu 20.04 | -- You are receiving this mail because: You are on the CC list for the bug. From thomas.devoogdt at gmail.com Mon Jan 31 16:16:10 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Mon, 31 Jan 2022 17:16:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.70.0 In-Reply-To: <20220130155235.2f51e08a@windsurf> References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> <20220130155235.2f51e08a@windsurf> Message-ID: Hi Thomas, All, > It's a bit difficult to follow http://autobuild.buildroot.net/, but I saw one thing when doing a quick scan: bluez5_utils: http://autobuild.buildroot.net/results/5c7/5c75ad724df3ff726559acee0da31f777ef6bc68/build-end.log --> g_memdup, deprecated since 2.68: https://docs.gtk.org/glib/func.memdup.html Kr, Thomas -------------- next part -------------- An HTML attachment was scrubbed... URL: From ariel.dalessandro at collabora.com Mon Jan 31 16:19:58 2022 From: ariel.dalessandro at collabora.com (Ariel D'Alessandro) Date: Mon, 31 Jan 2022 13:19:58 -0300 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <20220131145555.2819020-1-michael@amarulasolutions.com> References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: Hi Michael, all, On 1/31/22 11:55, Michael Trimarchi wrote: > Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 > - Uboot 2022-01-rc1 (reference tree) > - Default packages from buildroot > > https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > > Add Ariel D'Alessandro as co-maintainer, we work together on > platform mainline > > Build and tested using: > docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > Cc: Ariel D'Alessandro > Cc: Jagan Teki > Cc: Heiko Thiery > Cc: Giulio Benetti > Reviewed-by: Giulio Benetti > Signed-off-by: Michael Trimarchi Tested-by: Ariel D'Alessandro From giulio.benetti at benettiengineering.com Mon Jan 31 16:38:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 17:38:49 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220131153022.351662-1-heiko.thiery@gmail.com> Message-ID: <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> Hi Michael, On 31/01/22 16:42, Heiko Thiery wrote: > Hi Michael, > > > Am Mo., 31. Jan. 2022 um 16:36 Uhr schrieb Michael Nazzareno Trimarchi > : >> >> Hi Heiko >> >> On Mon, Jan 31, 2022 at 4:30 PM Heiko Thiery wrote: >>> >>> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. >>> >>> https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 >>> >>> Cc: Frieder Schrempf >>> Signed-off-by: Heiko Thiery >>> --- >>> v5: >>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS >>> >>> v4: >>> - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. >>> The FPU options are set implicit. >>> >>> v3: >>> - change offset value to use capitol 'K' value (thanks Guilio) >>> - add info to uboot patches about submitting to upstream >>> >>> v2: >>> - switch to extlinux >>> - directly call genimage.sh >>> - remove post-image.sh >>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT >>> - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME >>> >>> DEVELOPERS | 2 + >>> board/kontron/bl-imx8mm/extlinux.conf | 4 + >>> board/kontron/bl-imx8mm/genimage.cfg | 18 ++ >>> ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ >>> ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ >>> board/kontron/bl-imx8mm/post-build.sh | 7 + >>> board/kontron/bl-imx8mm/readme.txt | 85 +++++ >>> configs/kontron_bl_imx8mm_defconfig | 58 ++++ >>> 8 files changed, 510 insertions(+) >>> create mode 100644 board/kontron/bl-imx8mm/extlinux.conf >>> create mode 100644 board/kontron/bl-imx8mm/genimage.cfg >>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch >>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch >>> create mode 100755 board/kontron/bl-imx8mm/post-build.sh >>> create mode 100644 board/kontron/bl-imx8mm/readme.txt >>> create mode 100644 configs/kontron_bl_imx8mm_defconfig >>> >>> diff --git a/DEVELOPERS b/DEVELOPERS >>> index a1ec9a091e..38724726d4 100644 >>> --- a/DEVELOPERS >>> +++ b/DEVELOPERS >>> @@ -1183,7 +1183,9 @@ F: package/python-sip/ >>> F: package/uhd/ >>> >>> N: Heiko Thiery >>> +F: board/kontron/bl-imx8mm/ >>> F: board/kontron/pitx-imx8m/ >>> +F: configs/kontron_bl_imx8mm_defconfig >>> F: configs/kontron_pitx_imx8m_defconfig >>> F: package/altera-stapl/ >>> F: package/ipmitool/ >>> diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf >>> new file mode 100644 >>> index 0000000000..d38f7f81b7 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/extlinux.conf >>> @@ -0,0 +1,4 @@ >>> +label buildroot >>> + kernel /boot/Image >>> + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb >>> + append root=PARTUUID=%PARTUUID% rootwait rw >>> diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg >>> new file mode 100644 >>> index 0000000000..c98bc4f150 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/genimage.cfg >>> @@ -0,0 +1,18 @@ >>> +image sdcard.img { >>> + hdimage { >>> + partition-table-type = "gpt" >>> + gpt-location = 16K >>> + } >>> + >>> + partition imx-boot { >>> + in-partition-table = "no" >>> + image = "flash.bin" >>> + offset = 33K >>> + } >>> + >>> + partition rootfs { >>> + image = "rootfs.ext4" >>> + offset = 8M >>> + partition-uuid = %PARTUUID% >>> + } >>> +} >>> diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch >>> new file mode 100644 >>> index 0000000000..6d76282def >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch >>> @@ -0,0 +1,31 @@ >>> +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 >>> +From: Heiko Thiery >>> +Date: Mon, 10 Jan 2022 14:13:02 +0100 >>> +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig >>> + >>> +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL >>> + >>> +Patch submitted upstream: >>> +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ >>> + >>> +Signed-off-by: Heiko Thiery >>> +--- >>> + configs/kontron-sl-mx8mm_defconfig | 2 ++ >>> + 1 file changed, 2 insertions(+) >>> + >>> +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig >>> +index 35d12fca32..940bf07a92 100644 >>> +--- a/configs/kontron-sl-mx8mm_defconfig >>> ++++ b/configs/kontron-sl-mx8mm_defconfig >>> +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y >>> + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" >>> + CONFIG_SPL_TEXT_BASE=0x7E1000 >>> + CONFIG_TARGET_KONTRON_MX8MM=y >>> ++CONFIG_SPL_MMC=y >>> ++CONFIG_SPL_SERIAL=y >>> + CONFIG_BOOTCOUNT_BOOTLIMIT=3 >>> + CONFIG_SPL=y >>> + CONFIG_DISTRO_DEFAULTS=y >>> +-- >>> +2.30.2 >>> + >>> diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch >>> new file mode 100644 >>> index 0000000000..a88d7aba87 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch >>> @@ -0,0 +1,305 @@ >>> +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 >>> +From: Heiko Thiery >>> +Date: Wed, 12 Jan 2022 08:44:36 +0100 >>> +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board >>> + u-boot.dtsi >>> + >>> +When using a board variant that selects the lvds specific dtb the >>> +*.u-boot.dtsi file will not be included. To have a lvds dtb specific >>> +u-boot.dtsi file move this part to a common board u-boot.dtsi file and >>> +include this in the board base u-boot.dtsi and create an additional one >>> +for the lvds variant. >>> + >>> +Patch submitted upstream: >>> +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ >>> + >>> +Signed-off-by: Heiko Thiery >>> +--- >>> + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + >>> + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- >>> + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ >>> + 3 files changed, 135 insertions(+), 123 deletions(-) >>> + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi >>> + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi >>> + >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi >>> +new file mode 100644 >>> +index 0000000000..4bf75722bf >>> +--- /dev/null >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi >>> +@@ -0,0 +1,6 @@ >>> ++// SPDX-License-Identifier: GPL-2.0+ >>> ++/* >>> ++ * Copyright (C) 2019 Kontron Electronics GmbH >>> ++ */ >>> ++ >>> ++#include "imx8mm-kontron-n801x-u-boot.dtsi" >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi >>> +index 22d18e6f1c..4bf75722bf 100644 >>> +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi >>> +@@ -3,126 +3,4 @@ >>> + * Copyright (C) 2019 Kontron Electronics GmbH >>> + */ >>> + >>> +-#include "imx8mm-u-boot.dtsi" >>> +- >>> +-/ { >>> +- aliases { >>> +- usb0 = &usbotg1; >>> +- usb1 = &usbotg2; >>> +- }; >>> +- >>> +- wdt-reboot { >>> +- compatible = "wdt-reboot"; >>> +- wdt = <&wdog1>; >>> +- u-boot,dm-spl; >>> +- }; >>> +- >>> +- firmware { >>> +- optee { >>> +- compatible = "linaro,optee-tz"; >>> +- method = "smc"; >>> +- }; >>> +- }; >>> +-}; >>> +- >>> +-&fec1 { >>> +- phy-mode = "rgmii-rxid"; >>> +-}; >>> +- >>> +-&i2c1 { >>> +- u-boot,dm-spl; >>> +- u-boot,dm-pre-reloc; >>> +-}; >>> +- >>> +-&i2c2 { >>> +- status = "okay"; >>> +- u-boot,dm-spl; >>> +- u-boot,dm-pre-reloc; >>> +-}; >>> +- >>> +-&pinctrl_ecspi1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_i2c1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_pmic { >>> +- u-boot,dm-spl; >>> +- fsl,pins = < >>> +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 >>> +- /* Disable Pullup for SD_VSEL */ >>> +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 >>> +- >; >>> +-}; >>> +- >>> +-&pinctrl_uart3 { >>> +- u-boot,dm-spl; >>> +- u-boot,dm-pre-reloc; >>> +-}; >>> +- >>> +-&pinctrl_usdhc1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_usdhc1_100mhz { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_usdhc1_200mhz { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_usdhc2 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pca9450 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&ecspi1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio2 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio3 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio4 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio5 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&uart3 { >>> +- u-boot,dm-spl; >>> +- u-boot,dm-pre-reloc; >>> +-}; >>> +- >>> +-&usdhc1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&usdhc2 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&wdog1 { >>> +- u-boot,dm-spl; >>> +-}; >>> ++#include "imx8mm-kontron-n801x-u-boot.dtsi" >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi >>> +new file mode 100644 >>> +index 0000000000..22d18e6f1c >>> +--- /dev/null >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi >>> +@@ -0,0 +1,128 @@ >>> ++// SPDX-License-Identifier: GPL-2.0+ >>> ++/* >>> ++ * Copyright (C) 2019 Kontron Electronics GmbH >>> ++ */ >>> ++ >>> ++#include "imx8mm-u-boot.dtsi" >>> ++ >>> ++/ { >>> ++ aliases { >>> ++ usb0 = &usbotg1; >>> ++ usb1 = &usbotg2; >>> ++ }; >>> ++ >>> ++ wdt-reboot { >>> ++ compatible = "wdt-reboot"; >>> ++ wdt = <&wdog1>; >>> ++ u-boot,dm-spl; >>> ++ }; >>> ++ >>> ++ firmware { >>> ++ optee { >>> ++ compatible = "linaro,optee-tz"; >>> ++ method = "smc"; >>> ++ }; >>> ++ }; >>> ++}; >>> ++ >>> ++&fec1 { >>> ++ phy-mode = "rgmii-rxid"; >>> ++}; >>> ++ >>> ++&i2c1 { >>> ++ u-boot,dm-spl; >>> ++ u-boot,dm-pre-reloc; >>> ++}; >>> ++ >>> ++&i2c2 { >>> ++ status = "okay"; >>> ++ u-boot,dm-spl; >>> ++ u-boot,dm-pre-reloc; >>> ++}; >>> ++ >>> ++&pinctrl_ecspi1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_i2c1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_pmic { >>> ++ u-boot,dm-spl; >>> ++ fsl,pins = < >>> ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 >>> ++ /* Disable Pullup for SD_VSEL */ >>> ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 >>> ++ >; >>> ++}; >>> ++ >>> ++&pinctrl_uart3 { >>> ++ u-boot,dm-spl; >>> ++ u-boot,dm-pre-reloc; >>> ++}; >>> ++ >>> ++&pinctrl_usdhc1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_usdhc1_100mhz { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_usdhc1_200mhz { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_usdhc2 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pca9450 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&ecspi1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio2 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio3 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio4 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio5 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&uart3 { >>> ++ u-boot,dm-spl; >>> ++ u-boot,dm-pre-reloc; >>> ++}; >>> ++ >>> ++&usdhc1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&usdhc2 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&wdog1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> +-- >>> +2.30.2 >>> + >>> diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh >>> new file mode 100755 >>> index 0000000000..bf8861f6a9 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/post-build.sh >>> @@ -0,0 +1,7 @@ >>> +#!/bin/sh >>> +BOARD_DIR="$(dirname $0)" >>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >>> + >>> +install -d "$TARGET_DIR/boot/extlinux/" >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >>> diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt >>> new file mode 100644 >>> index 0000000000..df47ba5174 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/readme.txt >>> @@ -0,0 +1,85 @@ >>> +Kontron BL i.MX8M Mini >>> +====================== >>> + >>> +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 >>> + >>> + >>> +How to build it >>> +=============== >>> + >>> +Configure buildroot: >>> + >>> + $ make kontron_bl_imx8mm_defconfig >>> + >>> +Change settings to fit your needs (optional): >>> + >>> + $ make menuconfig >>> + >>> +Compile everything and build the rootfs image: >>> + >>> + $ make >>> + >>> + >>> +Result of the build >>> +=================== >>> + >>> +After building, the output/images directory contains: >>> + >>> + output/images/ >>> + ??? bl31.bin >>> + ??? boot.scr >>> + ??? ddr_fw.bin >>> + ??? flash.bin >>> + ??? Image >>> + ??? imx8mm-kontron-n801x-s.dtb >>> + ??? lpddr4_pmu_train_1d_dmem_201904.bin >>> + ??? lpddr4_pmu_train_1d_dmem_202006.bin >>> + ??? lpddr4_pmu_train_1d_dmem.bin >>> + ??? lpddr4_pmu_train_1d_dmem_pad.bin >>> + ??? lpddr4_pmu_train_1d_fw.bin >>> + ??? lpddr4_pmu_train_1d_imem_201904.bin >>> + ??? lpddr4_pmu_train_1d_imem_202006.bin >>> + ??? lpddr4_pmu_train_1d_imem.bin >>> + ??? lpddr4_pmu_train_1d_imem_pad.bin >>> + ??? lpddr4_pmu_train_2d_dmem_201904.bin >>> + ??? lpddr4_pmu_train_2d_dmem_202006.bin >>> + ??? lpddr4_pmu_train_2d_dmem.bin >>> + ??? lpddr4_pmu_train_2d_dmem_pad.bin >>> + ??? lpddr4_pmu_train_2d_fw.bin >>> + ??? lpddr4_pmu_train_2d_imem_201904.bin >>> + ??? lpddr4_pmu_train_2d_imem_202006.bin >>> + ??? lpddr4_pmu_train_2d_imem.bin >>> + ??? lpddr4_pmu_train_2d_imem_pad.bin >>> + ??? lpddr4_pmu_train_fw.bin >>> + ??? rootfs.ext2 >>> + ??? rootfs.ext4 -> rootfs.ext2 >>> + ??? rootfs.tar >>> + ??? sdcard.img >>> + ??? u-boot.bin >>> + ??? u-boot-spl.bin >>> + >>> + >>> +Flashing the SD card image >>> +========================== >>> + >>> +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) >>> + >>> + $ sudo dd if=output/images/sdcard.img of= >>> + >>> + >>> +Preparing the board >>> +=================== >>> + >>> + * Connect a serial line to the board >>> + * Insert the SD card >>> + * Power-up the board >>> + >>> + >>> +Booting the board >>> +================= >>> + >>> +By default the bootloader will search for the first valid image, starting >>> +with the internal eMMC. To make sure the bootloader loads bootscript from >>> +the correct location (SD card) set the boot_targets environment variable: >>> + >>> + $ setenv boot_targets mmc1 >>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig >>> new file mode 100644 >>> index 0000000000..0cf0115bfa >>> --- /dev/null >>> +++ b/configs/kontron_bl_imx8mm_defconfig >>> @@ -0,0 +1,58 @@ >>> +# Architecture >>> +BR2_aarch64=y >>> +BR2_ARM_FPU_VFPV3=y >>> + >>> +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" >>> + >>> +# System >>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" >>> + >>> +# Kernel >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" >>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" >>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>> + >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >>> + >>> +BR2_PACKAGE_FREESCALE_IMX=y >>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y >>> +BR2_PACKAGE_FIRMWARE_IMX=y >>> + >>> +# Filesystem / image >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>> + >>> +# Bootloader >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" >>> +BR2_TARGET_UBOOT=y >>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y >>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>> +BR2_TARGET_UBOOT_SPL=y >>> + >>> +# Required host tools to create the SD/eMMC image >>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >>> +BR2_PACKAGE_HOST_GENIMAGE=y >> >> I have seen that some people like to have this organization but it's >> not really nice to maintain. I would like >> to savedefconfig and use that one instead of having nice commented >> part. Is this mandatory? > > As far as I know there is no rule how to do that. For me it seems to > be more readable and clean. But this is only my opinion. As Heiko pointed it's a very good habit. One thing that must be taken into account while doing it, is to keep the various BR2_* configs ordered as they are ordere inside the various Config.in Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Mon Jan 31 16:40:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 31 Jan 2022 17:40:58 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.70.0 In-Reply-To: References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> <20220130155235.2f51e08a@windsurf> Message-ID: Hi, Le lun. 31 janv. 2022 ? 17:16, Thomas Devoogdt a ?crit : > > Hi Thomas, All, > > > It's a bit difficult to follow http://autobuild.buildroot.net/, but > I saw one thing when doing a quick scan: > > bluez5_utils: http://autobuild.buildroot.net/results/5c7/5c75ad724df3ff726559acee0da31f777ef6bc68/build-end.log > --> g_memdup, deprecated since 2.68: https://docs.gtk.org/glib/func.memdup.html You can also add this one: - libblockdev: http://autobuild.buildroot.net/results/2fd/2fd1b4001b64004be49dd91329945ab108e1a90c/build-end.log exec.c: In function 'bd_utils_exec_and_report_status_error': exec.c:239:5: error: 'g_spawn_check_exit_status' is deprecated: Use 'g_spawn_check_wait_status' instead [-Werror=deprecated-declarations] 239 | if (!g_spawn_check_exit_status (exit_status, error)) { | ^~ > > Kr, > Thomas > Best Regards, Fabrice From michael at amarulasolutions.com Mon Jan 31 16:42:23 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 31 Jan 2022 17:42:23 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> Message-ID: Hi On Mon, Jan 31, 2022 at 5:38 PM Giulio Benetti wrote: > > Hi Michael, > > On 31/01/22 16:42, Heiko Thiery wrote: > > Hi Michael, > > > > > > Am Mo., 31. Jan. 2022 um 16:36 Uhr schrieb Michael Nazzareno Trimarchi > > : > >> > >> Hi Heiko > >> > >> On Mon, Jan 31, 2022 at 4:30 PM Heiko Thiery wrote: > >>> > >>> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > >>> > >>> https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > >>> > >>> Cc: Frieder Schrempf > >>> Signed-off-by: Heiko Thiery > >>> --- > >>> v5: > >>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS > >>> > >>> v4: > >>> - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > >>> The FPU options are set implicit. > >>> > >>> v3: > >>> - change offset value to use capitol 'K' value (thanks Guilio) > >>> - add info to uboot patches about submitting to upstream > >>> > >>> v2: > >>> - switch to extlinux > >>> - directly call genimage.sh > >>> - remove post-image.sh > >>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > >>> - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > >>> > >>> DEVELOPERS | 2 + > >>> board/kontron/bl-imx8mm/extlinux.conf | 4 + > >>> board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > >>> ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > >>> ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > >>> board/kontron/bl-imx8mm/post-build.sh | 7 + > >>> board/kontron/bl-imx8mm/readme.txt | 85 +++++ > >>> configs/kontron_bl_imx8mm_defconfig | 58 ++++ > >>> 8 files changed, 510 insertions(+) > >>> create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > >>> create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > >>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > >>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > >>> create mode 100755 board/kontron/bl-imx8mm/post-build.sh > >>> create mode 100644 board/kontron/bl-imx8mm/readme.txt > >>> create mode 100644 configs/kontron_bl_imx8mm_defconfig > >>> > >>> diff --git a/DEVELOPERS b/DEVELOPERS > >>> index a1ec9a091e..38724726d4 100644 > >>> --- a/DEVELOPERS > >>> +++ b/DEVELOPERS > >>> @@ -1183,7 +1183,9 @@ F: package/python-sip/ > >>> F: package/uhd/ > >>> > >>> N: Heiko Thiery > >>> +F: board/kontron/bl-imx8mm/ > >>> F: board/kontron/pitx-imx8m/ > >>> +F: configs/kontron_bl_imx8mm_defconfig > >>> F: configs/kontron_pitx_imx8m_defconfig > >>> F: package/altera-stapl/ > >>> F: package/ipmitool/ > >>> diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > >>> new file mode 100644 > >>> index 0000000000..d38f7f81b7 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/extlinux.conf > >>> @@ -0,0 +1,4 @@ > >>> +label buildroot > >>> + kernel /boot/Image > >>> + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > >>> + append root=PARTUUID=%PARTUUID% rootwait rw > >>> diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > >>> new file mode 100644 > >>> index 0000000000..c98bc4f150 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/genimage.cfg > >>> @@ -0,0 +1,18 @@ > >>> +image sdcard.img { > >>> + hdimage { > >>> + partition-table-type = "gpt" > >>> + gpt-location = 16K > >>> + } > >>> + > >>> + partition imx-boot { > >>> + in-partition-table = "no" > >>> + image = "flash.bin" > >>> + offset = 33K > >>> + } > >>> + > >>> + partition rootfs { > >>> + image = "rootfs.ext4" > >>> + offset = 8M > >>> + partition-uuid = %PARTUUID% > >>> + } > >>> +} > >>> diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > >>> new file mode 100644 > >>> index 0000000000..6d76282def > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > >>> @@ -0,0 +1,31 @@ > >>> +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > >>> +From: Heiko Thiery > >>> +Date: Mon, 10 Jan 2022 14:13:02 +0100 > >>> +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > >>> + > >>> +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > >>> + > >>> +Patch submitted upstream: > >>> +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > >>> + > >>> +Signed-off-by: Heiko Thiery > >>> +--- > >>> + configs/kontron-sl-mx8mm_defconfig | 2 ++ > >>> + 1 file changed, 2 insertions(+) > >>> + > >>> +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > >>> +index 35d12fca32..940bf07a92 100644 > >>> +--- a/configs/kontron-sl-mx8mm_defconfig > >>> ++++ b/configs/kontron-sl-mx8mm_defconfig > >>> +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > >>> + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > >>> + CONFIG_SPL_TEXT_BASE=0x7E1000 > >>> + CONFIG_TARGET_KONTRON_MX8MM=y > >>> ++CONFIG_SPL_MMC=y > >>> ++CONFIG_SPL_SERIAL=y > >>> + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > >>> + CONFIG_SPL=y > >>> + CONFIG_DISTRO_DEFAULTS=y > >>> +-- > >>> +2.30.2 > >>> + > >>> diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > >>> new file mode 100644 > >>> index 0000000000..a88d7aba87 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > >>> @@ -0,0 +1,305 @@ > >>> +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > >>> +From: Heiko Thiery > >>> +Date: Wed, 12 Jan 2022 08:44:36 +0100 > >>> +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > >>> + u-boot.dtsi > >>> + > >>> +When using a board variant that selects the lvds specific dtb the > >>> +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > >>> +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > >>> +include this in the board base u-boot.dtsi and create an additional one > >>> +for the lvds variant. > >>> + > >>> +Patch submitted upstream: > >>> +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > >>> + > >>> +Signed-off-by: Heiko Thiery > >>> +--- > >>> + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > >>> + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > >>> + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > >>> + 3 files changed, 135 insertions(+), 123 deletions(-) > >>> + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > >>> + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > >>> + > >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > >>> +new file mode 100644 > >>> +index 0000000000..4bf75722bf > >>> +--- /dev/null > >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > >>> +@@ -0,0 +1,6 @@ > >>> ++// SPDX-License-Identifier: GPL-2.0+ > >>> ++/* > >>> ++ * Copyright (C) 2019 Kontron Electronics GmbH > >>> ++ */ > >>> ++ > >>> ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > >>> +index 22d18e6f1c..4bf75722bf 100644 > >>> +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > >>> +@@ -3,126 +3,4 @@ > >>> + * Copyright (C) 2019 Kontron Electronics GmbH > >>> + */ > >>> + > >>> +-#include "imx8mm-u-boot.dtsi" > >>> +- > >>> +-/ { > >>> +- aliases { > >>> +- usb0 = &usbotg1; > >>> +- usb1 = &usbotg2; > >>> +- }; > >>> +- > >>> +- wdt-reboot { > >>> +- compatible = "wdt-reboot"; > >>> +- wdt = <&wdog1>; > >>> +- u-boot,dm-spl; > >>> +- }; > >>> +- > >>> +- firmware { > >>> +- optee { > >>> +- compatible = "linaro,optee-tz"; > >>> +- method = "smc"; > >>> +- }; > >>> +- }; > >>> +-}; > >>> +- > >>> +-&fec1 { > >>> +- phy-mode = "rgmii-rxid"; > >>> +-}; > >>> +- > >>> +-&i2c1 { > >>> +- u-boot,dm-spl; > >>> +- u-boot,dm-pre-reloc; > >>> +-}; > >>> +- > >>> +-&i2c2 { > >>> +- status = "okay"; > >>> +- u-boot,dm-spl; > >>> +- u-boot,dm-pre-reloc; > >>> +-}; > >>> +- > >>> +-&pinctrl_ecspi1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_i2c1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_pmic { > >>> +- u-boot,dm-spl; > >>> +- fsl,pins = < > >>> +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > >>> +- /* Disable Pullup for SD_VSEL */ > >>> +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > >>> +- >; > >>> +-}; > >>> +- > >>> +-&pinctrl_uart3 { > >>> +- u-boot,dm-spl; > >>> +- u-boot,dm-pre-reloc; > >>> +-}; > >>> +- > >>> +-&pinctrl_usdhc1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_usdhc1_100mhz { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_usdhc1_200mhz { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_usdhc2 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pca9450 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&ecspi1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio2 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio3 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio4 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio5 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&uart3 { > >>> +- u-boot,dm-spl; > >>> +- u-boot,dm-pre-reloc; > >>> +-}; > >>> +- > >>> +-&usdhc1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&usdhc2 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&wdog1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > >>> +new file mode 100644 > >>> +index 0000000000..22d18e6f1c > >>> +--- /dev/null > >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > >>> +@@ -0,0 +1,128 @@ > >>> ++// SPDX-License-Identifier: GPL-2.0+ > >>> ++/* > >>> ++ * Copyright (C) 2019 Kontron Electronics GmbH > >>> ++ */ > >>> ++ > >>> ++#include "imx8mm-u-boot.dtsi" > >>> ++ > >>> ++/ { > >>> ++ aliases { > >>> ++ usb0 = &usbotg1; > >>> ++ usb1 = &usbotg2; > >>> ++ }; > >>> ++ > >>> ++ wdt-reboot { > >>> ++ compatible = "wdt-reboot"; > >>> ++ wdt = <&wdog1>; > >>> ++ u-boot,dm-spl; > >>> ++ }; > >>> ++ > >>> ++ firmware { > >>> ++ optee { > >>> ++ compatible = "linaro,optee-tz"; > >>> ++ method = "smc"; > >>> ++ }; > >>> ++ }; > >>> ++}; > >>> ++ > >>> ++&fec1 { > >>> ++ phy-mode = "rgmii-rxid"; > >>> ++}; > >>> ++ > >>> ++&i2c1 { > >>> ++ u-boot,dm-spl; > >>> ++ u-boot,dm-pre-reloc; > >>> ++}; > >>> ++ > >>> ++&i2c2 { > >>> ++ status = "okay"; > >>> ++ u-boot,dm-spl; > >>> ++ u-boot,dm-pre-reloc; > >>> ++}; > >>> ++ > >>> ++&pinctrl_ecspi1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_i2c1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_pmic { > >>> ++ u-boot,dm-spl; > >>> ++ fsl,pins = < > >>> ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > >>> ++ /* Disable Pullup for SD_VSEL */ > >>> ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > >>> ++ >; > >>> ++}; > >>> ++ > >>> ++&pinctrl_uart3 { > >>> ++ u-boot,dm-spl; > >>> ++ u-boot,dm-pre-reloc; > >>> ++}; > >>> ++ > >>> ++&pinctrl_usdhc1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_usdhc1_100mhz { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_usdhc1_200mhz { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_usdhc2 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pca9450 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&ecspi1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio2 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio3 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio4 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio5 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&uart3 { > >>> ++ u-boot,dm-spl; > >>> ++ u-boot,dm-pre-reloc; > >>> ++}; > >>> ++ > >>> ++&usdhc1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&usdhc2 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&wdog1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> +-- > >>> +2.30.2 > >>> + > >>> diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > >>> new file mode 100755 > >>> index 0000000000..bf8861f6a9 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/post-build.sh > >>> @@ -0,0 +1,7 @@ > >>> +#!/bin/sh > >>> +BOARD_DIR="$(dirname $0)" > >>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" > >>> + > >>> +install -d "$TARGET_DIR/boot/extlinux/" > >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > >>> diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > >>> new file mode 100644 > >>> index 0000000000..df47ba5174 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/readme.txt > >>> @@ -0,0 +1,85 @@ > >>> +Kontron BL i.MX8M Mini > >>> +====================== > >>> + > >>> +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > >>> + > >>> + > >>> +How to build it > >>> +=============== > >>> + > >>> +Configure buildroot: > >>> + > >>> + $ make kontron_bl_imx8mm_defconfig > >>> + > >>> +Change settings to fit your needs (optional): > >>> + > >>> + $ make menuconfig > >>> + > >>> +Compile everything and build the rootfs image: > >>> + > >>> + $ make > >>> + > >>> + > >>> +Result of the build > >>> +=================== > >>> + > >>> +After building, the output/images directory contains: > >>> + > >>> + output/images/ > >>> + ??? bl31.bin > >>> + ??? boot.scr > >>> + ??? ddr_fw.bin > >>> + ??? flash.bin > >>> + ??? Image > >>> + ??? imx8mm-kontron-n801x-s.dtb > >>> + ??? lpddr4_pmu_train_1d_dmem_201904.bin > >>> + ??? lpddr4_pmu_train_1d_dmem_202006.bin > >>> + ??? lpddr4_pmu_train_1d_dmem.bin > >>> + ??? lpddr4_pmu_train_1d_dmem_pad.bin > >>> + ??? lpddr4_pmu_train_1d_fw.bin > >>> + ??? lpddr4_pmu_train_1d_imem_201904.bin > >>> + ??? lpddr4_pmu_train_1d_imem_202006.bin > >>> + ??? lpddr4_pmu_train_1d_imem.bin > >>> + ??? lpddr4_pmu_train_1d_imem_pad.bin > >>> + ??? lpddr4_pmu_train_2d_dmem_201904.bin > >>> + ??? lpddr4_pmu_train_2d_dmem_202006.bin > >>> + ??? lpddr4_pmu_train_2d_dmem.bin > >>> + ??? lpddr4_pmu_train_2d_dmem_pad.bin > >>> + ??? lpddr4_pmu_train_2d_fw.bin > >>> + ??? lpddr4_pmu_train_2d_imem_201904.bin > >>> + ??? lpddr4_pmu_train_2d_imem_202006.bin > >>> + ??? lpddr4_pmu_train_2d_imem.bin > >>> + ??? lpddr4_pmu_train_2d_imem_pad.bin > >>> + ??? lpddr4_pmu_train_fw.bin > >>> + ??? rootfs.ext2 > >>> + ??? rootfs.ext4 -> rootfs.ext2 > >>> + ??? rootfs.tar > >>> + ??? sdcard.img > >>> + ??? u-boot.bin > >>> + ??? u-boot-spl.bin > >>> + > >>> + > >>> +Flashing the SD card image > >>> +========================== > >>> + > >>> +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > >>> + > >>> + $ sudo dd if=output/images/sdcard.img of= > >>> + > >>> + > >>> +Preparing the board > >>> +=================== > >>> + > >>> + * Connect a serial line to the board > >>> + * Insert the SD card > >>> + * Power-up the board > >>> + > >>> + > >>> +Booting the board > >>> +================= > >>> + > >>> +By default the bootloader will search for the first valid image, starting > >>> +with the internal eMMC. To make sure the bootloader loads bootscript from > >>> +the correct location (SD card) set the boot_targets environment variable: > >>> + > >>> + $ setenv boot_targets mmc1 > >>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > >>> new file mode 100644 > >>> index 0000000000..0cf0115bfa > >>> --- /dev/null > >>> +++ b/configs/kontron_bl_imx8mm_defconfig > >>> @@ -0,0 +1,58 @@ > >>> +# Architecture > >>> +BR2_aarch64=y > >>> +BR2_ARM_FPU_VFPV3=y > >>> + > >>> +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > >>> + > >>> +# System > >>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > >>> + > >>> +# Kernel > >>> +BR2_LINUX_KERNEL=y > >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > >>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y > >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > >>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y > >>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > >>> + > >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > >>> + > >>> +BR2_PACKAGE_FREESCALE_IMX=y > >>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > >>> +BR2_PACKAGE_FIRMWARE_IMX=y > >>> + > >>> +# Filesystem / image > >>> +BR2_TARGET_ROOTFS_EXT2=y > >>> +BR2_TARGET_ROOTFS_EXT2_4=y > >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > >>> + > >>> +# Bootloader > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > >>> +BR2_TARGET_UBOOT=y > >>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y > >>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > >>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > >>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > >>> +BR2_TARGET_UBOOT_SPL=y > >>> + > >>> +# Required host tools to create the SD/eMMC image > >>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > >>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > >>> +BR2_PACKAGE_HOST_GENIMAGE=y > >> > >> I have seen that some people like to have this organization but it's > >> not really nice to maintain. I would like > >> to savedefconfig and use that one instead of having nice commented > >> part. Is this mandatory? > > > > As far as I know there is no rule how to do that. For me it seems to > > be more readable and clean. But this is only my opinion. > > As Heiko pointed it's a very good habit. > > One thing that must be taken into account while doing it, is to keep the > various BR2_* configs ordered as they are ordere inside the various > Config.in There are good information indeed but even those information must be keep updated. Daily work show me that work on savedefconfig make things nicely. Some of your option can be at some point autoselect by another one and so on. Michael > > Best regards > -- > Giulio Benetti > Benetti Engineering sas -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From giulio.benetti at benettiengineering.com Mon Jan 31 17:11:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 18:11:44 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> Message-ID: <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> On 31/01/22 17:42, Michael Nazzareno Trimarchi wrote: [SNIP] >>>>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig >>>>> new file mode 100644 >>>>> index 0000000000..0cf0115bfa >>>>> --- /dev/null >>>>> +++ b/configs/kontron_bl_imx8mm_defconfig >>>>> @@ -0,0 +1,58 @@ >>>>> +# Architecture >>>>> +BR2_aarch64=y >>>>> +BR2_ARM_FPU_VFPV3=y >>>>> + >>>>> +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" >>>>> + >>>>> +# System >>>>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" >>>>> + >>>>> +# Kernel >>>>> +BR2_LINUX_KERNEL=y >>>>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>>>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" >>>>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" >>>>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>>>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>>>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>>>> + >>>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >>>>> + >>>>> +BR2_PACKAGE_FREESCALE_IMX=y >>>>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y >>>>> +BR2_PACKAGE_FIRMWARE_IMX=y >>>>> + >>>>> +# Filesystem / image >>>>> +BR2_TARGET_ROOTFS_EXT2=y >>>>> +BR2_TARGET_ROOTFS_EXT2_4=y >>>>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>>>> + >>>>> +# Bootloader >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" >>>>> +BR2_TARGET_UBOOT=y >>>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>>>> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y >>>>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >>>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" >>>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>>>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>>>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y >>>>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>>>> +BR2_TARGET_UBOOT_SPL=y >>>>> + >>>>> +# Required host tools to create the SD/eMMC image >>>>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" >>>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >>>>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >>>>> +BR2_PACKAGE_HOST_GENIMAGE=y >>>> >>>> I have seen that some people like to have this organization but it's >>>> not really nice to maintain. I would like >>>> to savedefconfig and use that one instead of having nice commented >>>> part. Is this mandatory? >>> >>> As far as I know there is no rule how to do that. For me it seems to >>> be more readable and clean. But this is only my opinion. >> >> As Heiko pointed it's a very good habit. >> >> One thing that must be taken into account while doing it, is to keep the >> various BR2_* configs ordered as they are ordere inside the various >> Config.in > > There are good information indeed but even those information must be > keep updated. Daily work show me that work on > savedefconfig make things nicely. Some of your option can be at some > point autoselect by another one and so on. Yes, you're right, I've noticed that too. It's "not that automatic", but if you check the first 25 defconfigs you can see that more or less the 70% use the "descriptive" way. So basically one should savedefconfig to another file and compare to the configs/*_defconfig and eventually modify. Anyway there is still not a standard decided. So maintainers will accept both ways. Cheers -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Mon Jan 31 17:13:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 31 Jan 2022 18:13:55 +0100 Subject: [Buildroot] [PATCH 1/2] boot/uboot: fix build with host-gcc 10+ In-Reply-To: <45a93a2b-2172-2cd2-8ccb-77f251e55dbc@mind.be> References: <45a93a2b-2172-2cd2-8ccb-77f251e55dbc@mind.be> Message-ID: <20220131171355.GU457876@scaer> Arnout, All, On 2022-01-31 08:42 +0100, Arnout Vandecappelle spake thusly: > On 30/01/2022 22:10, Yann E. MORIN wrote: [--SNIP--] > >Upstream just dropped that line altogether: > > https://source.denx.de/u-boot/u-boot/-/commit/018921ee79d3f30893614b3b2b63b588d8544f73 > >So, we use a little sed-grep combo to do the exact same change. [--SNIP--] > >+# Older versions break on gcc 10+ because of redefined symbols > >+define UBOOT_DROP_YYLLOC > >+ $(SED) '/^YYLTYPE yylloc;$$/d' `grep -l -r -E '^YYLTYPE yylloc;$$' $(@D)` > > Why not use > grep ... | xargs --no-run-if-empty $(SED) ... > > which also avoids the "no input files" problem. Yes, this is the obviously correct solution; I just did not have time to handle it this morning... ;-) > Also: > - Isn't it enough to search in $(@D)/scripts? I was also a bit conflicted on that one. It should even be enough to look up scripts/dtc/ (kconfig was never impacted). > - I guess we should use -Z to make is 0-separated. I'm not a 100% sure, but > I vaguely remember encountering a U-Boot or Linux vendor fork which had file > names with spaces in them. Whether that exists or not, I am now trying to always use -Z et al. when dealing with lists of files in shell. Thanks for the input; v2 incoming shortly... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From nealf at xilinx.com Mon Jan 31 17:30:37 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 31 Jan 2022 17:30:37 +0000 Subject: [Buildroot] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Message-ID: Changes included with this patch: 1. Removing ATF and U-Boot patches which are no longer necessary since they are in mainline. 2. Using Xilinx github for ATF, U-Boot and Linux as there are updates which may not yet be in mainline. 3. Adding a zynqmp_zcu102_defconfig. Signed-off-by: Neal Frager This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-configs-zynqmp_zcu10x-Bump-ATF-U-Boot-Linux-to-Xilin.patch Type: application/octet-stream Size: 26963 bytes Desc: 0001-configs-zynqmp_zcu10x-Bump-ATF-U-Boot-Linux-to-Xilin.patch URL: From fperrad at gmail.com Mon Jan 31 14:47:34 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 31 Jan 2022 15:47:34 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.13 Message-ID: <20220131144734.1199549-1-francois.perrad@gadz.org> see https://prosody.im/doc/release/0.11.13 Signed-off-by: Francois Perrad --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index b6fa6532a..3a3a363a4 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz -sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz -sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz -sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz +md5 7214ee57d4702585bd0d3428e69790b4 prosody-0.11.13.tar.gz +sha1 1cc5a72d98738872d0c1a4c34b1fcb8878348c7d prosody-0.11.13.tar.gz +sha256 39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432 prosody-0.11.13.tar.gz +sha512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 prosody-0.11.13.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index d697c8556..62ba073b9 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.12 +PROSODY_VERSION = 0.11.13 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING -- 2.32.0 From b.bilas at grinn-global.com Mon Jan 31 17:45:29 2022 From: b.bilas at grinn-global.com (Bartosz Bilas) Date: Mon, 31 Jan 2022 18:45:29 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> Message-ID: <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> Hello, On 31.01.2022 18:11, Giulio Benetti wrote: > On 31/01/22 17:42, Michael Nazzareno Trimarchi wrote: > > [SNIP] > >>>>>> diff --git a/configs/kontron_bl_imx8mm_defconfig >>>>>> b/configs/kontron_bl_imx8mm_defconfig >>>>>> new file mode 100644 >>>>>> index 0000000000..0cf0115bfa >>>>>> --- /dev/null >>>>>> +++ b/configs/kontron_bl_imx8mm_defconfig >>>>>> @@ -0,0 +1,58 @@ >>>>>> +# Architecture >>>>>> +BR2_aarch64=y >>>>>> +BR2_ARM_FPU_VFPV3=y >>>>>> + >>>>>> +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" >>>>>> + >>>>>> +# System >>>>>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" >>>>>> + >>>>>> +# Kernel >>>>>> +BR2_LINUX_KERNEL=y >>>>>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>>>>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" >>>>>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>>>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>>>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" >>>>>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>>>>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>>>>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>>>>> + >>>>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >>>>>> + >>>>>> +BR2_PACKAGE_FREESCALE_IMX=y >>>>>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y >>>>>> +BR2_PACKAGE_FIRMWARE_IMX=y >>>>>> + >>>>>> +# Filesystem / image >>>>>> +BR2_TARGET_ROOTFS_EXT2=y >>>>>> +BR2_TARGET_ROOTFS_EXT2_4=y >>>>>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>>>>> + >>>>>> +# Bootloader >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" >>>>>> >>>>>> +BR2_TARGET_UBOOT=y >>>>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>>>>> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y >>>>>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >>>>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" >>>>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>>>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>>>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>>>>> +BR2_TARGET_UBOOT_SPL=y >>>>>> + >>>>>> +# Required host tools to create the SD/eMMC image >>>>>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" >>>>>> >>>>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >>>>>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >>>>>> +BR2_PACKAGE_HOST_GENIMAGE=y >>>>> >>>>> I have seen that some people like to have this organization but it's >>>>> not really nice to maintain. I would like >>>>> to savedefconfig and use that one instead of having nice commented >>>>> part. Is this mandatory? >>>> >>>> As far as I know there is no rule how to do that. For me it seems to >>>> be more readable and clean. But this is only my opinion. >>> >>> As Heiko pointed it's a very good habit. >>> >>> One thing that must be taken into account while doing it, is to keep >>> the >>> various BR2_* configs ordered as they are ordere inside the various >>> Config.in >> >> There are good information indeed but even those information must be >> keep updated. Daily work show me that work on >> savedefconfig make things nicely. Some of your option can be at some >> point autoselect by another one and so on. > > Yes, you're right, I've noticed that too. It's "not that automatic", > but if you check the first 25 defconfigs you can see that more or less > the 70% use the "descriptive" way. So basically one should > savedefconfig to another file and compare to the configs/*_defconfig > and eventually modify. > > Anyway there is still not a standard decided. So maintainers will > accept both ways. The global sync via `savedefconfig` for all existing configs should solve everything. Besides, it should be impossible to edit those files manually. Best Bartek From giulio.benetti at benettiengineering.com Mon Jan 31 17:53:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 18:53:41 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.3.0 Message-ID: <20220131175341.4091688-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 1615933a6e..20ef6c5f51 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd harfbuzz-3.2.0.tar.xz +sha256 f6fb9f28d3df7c027f38b283ec28944fb9900ab2898b149c75c91c34c9c186e6 harfbuzz-3.3.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 67eab359c6..5f4625f96f 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.2.0 +HARFBUZZ_VERSION = 3.3.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 31 18:07:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 19:07:39 +0100 Subject: [Buildroot] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: <8f3868bc-5fe0-d016-a203-9b7ad5773136@benettiengineering.com> Hi Neal, can you please re-send using: # git send-mail --to ... otherwise it's impossible to review your patch. Thank you Best regards! -- Giulio Benetti Benetti Engineering sas On 31/01/22 18:30, Neal Frager wrote: > Changes included with this patch: > 1. Removing ATF and U-Boot patches which are no longer necessary since they are in mainline. > 2. Using Xilinx github for ATF, U-Boot and Linux as there are updates which may not yet be in mainline. > 3. Adding a zynqmp_zcu102_defconfig. > > Signed-off-by: Neal Frager > This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Mon Jan 31 18:10:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 31 Jan 2022 18:10:58 +0000 Subject: [Buildroot] [Bug 14561] New: OpenJDK does not compile when building in WSL Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14561 Bug ID: 14561 Summary: OpenJDK does not compile when building in WSL Product: buildroot Version: 2021.11 Hardware: All OS: Windows Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: colin.foster at in-advantage.com CC: buildroot at uclibc.org Target Milestone: --- Tested in 2021.11. As the summary suggests, when building in WSLv2, OpenJDK fails. If I were to wager a guess, OpenJDK is trying to be too smart about the fact that it is building on a Windows OS. Jumping to a Linux machine and compiling with the same config works as expected. checking for egrep... /usr/bin/grep -E checking for fgrep... /usr/bin/grep -F checking for a sed that does not truncate output... /usr/bin/sed checking for df... /usr/bin/df checking for nice... /usr/bin/nice checking for greadlink... [not found] checking for readlink... /usr/bin/readlink checking for cygpath... [not found] checking for wslpath... /usr/bin/wslpath checking for lsb_release... /usr/bin/lsb_release checking for cmd.exe... /mnt/c/Windows/system32/cmd.exe checking for cmp... /usr/bin/cmp checking for uniq... /usr/bin/uniq checking build system type... x86_64-pc-wsl checking host system type... arm-buildroot-linux-gnueabihf checking target system type... arm-buildroot-linux-gnueabihf checking openjdk-build os-cpu... windows-x86_64 checking openjdk-target os-cpu... linux-arm checking openjdk-target C library... default checking compilation type... cross /home/colin/src/buildroot/output/build/openjdk-17.0.1+12/build/.configure-support/generated-configure.sh: line 34833: import: command not found /home/colin/src/buildroot/output/build/openjdk-17.0.1+12/build/.configure-support/generated-configure.sh: line 34834: verify: command not found configure: error: The path of TOPDIR, which resolves as "/home/colin/src/buildroot/output/build/openjdk-17.0.1+12", could not be imported. configure exiting with result code 1 make: *** [package/pkg-generic.mk:285: /home/colin/src/buildroot/output/build/openjdk-17.0.1+12/.stamp_configured] Error 1 -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Mon Jan 31 18:16:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 11:16:35 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/bpftool: new package Message-ID: <20220131181635.4165602-1-james.hilliard1@gmail.com> Move the target bpftool build out of linux-tools so that it is up to date. This also fixes build issues due to differences between kernel versions. The latest version should be fully backwards compatible. The host bpftool is needed for enabling features such as the systemd bpf-framework(to be added in a future patch). Signed-off-by: James Hilliard --- Changes v1 -> v2: - move target bpftool out of linux-tools into stand-alone build --- Config.in.legacy | 8 ++++ DEVELOPERS | 1 + package/Config.in | 1 + package/bpftool/Config.in | 18 ++++++++ package/bpftool/bpftool.hash | 5 +++ package/bpftool/bpftool.mk | 45 ++++++++++++++++++++ package/linux-tools/linux-tool-bpftool.mk.in | 37 ---------------- 7 files changed, 78 insertions(+), 37 deletions(-) create mode 100644 package/bpftool/Config.in create mode 100644 package/bpftool/bpftool.hash create mode 100644 package/bpftool/bpftool.mk delete mode 100644 package/linux-tools/linux-tool-bpftool.mk.in diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..dce236b3b4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL + bool "bpftool was moved" + select BR2_LEGACY + select BR2_PACKAGE_BPFTOOL + help + The linux-tools bpftool build has been moved out + of the linux-tools package. + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..51b52871ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1282,6 +1282,7 @@ F: configs/pine64_sopine_defconfig N: James Hilliard F: package/apcupsd/ +F: package/bpftool/ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..dbdcc3919b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -86,6 +86,7 @@ menu "Debugging, profiling and benchmark" source "package/babeltrace2/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" + source "package/bpftool/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" source "package/coremark/Config.in" diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in new file mode 100644 index 0000000000..39475aa962 --- /dev/null +++ b/package/bpftool/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_BPFTOOL + bool "bpftool" + depends on !BR2_nios2 # binutils + depends on BR2_USE_WCHAR # binutils, elfutils + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_ELFUTILS + help + bpftool is a tool for for inspection and simple manipulation + of eBPF programs and maps. + +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on !BR2_nios2 + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash new file mode 100644 index 0000000000..c7d4ae250e --- /dev/null +++ b/package/bpftool/bpftool.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk new file mode 100644 index 0000000000..a642759a96 --- /dev/null +++ b/package/bpftool/bpftool.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# bpftool +# +################################################################################ + +BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_SITE = https://github.com/libbpf/bpftool +BPFTOOL_SITE_METHOD = git +BPFTOOL_GIT_SUBMODULES = YES +BPFTOOL_LICENSE = GPL-2.0, BSD-2-Clause +BPFTOOL_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0 +BPFTOOL_DEPENDENCIES = binutils elfutils +HOST_BPFTOOL_DEPENDENCIES = host-elfutils host-pkgconf host-zlib + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +BPFTOOL_DEPENDENCIES += libcap +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +BPFTOOL_DEPENDENCIES += zlib +endif + +define BPFTOOL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define HOST_BPFTOOL_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define BPFTOOL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src DESTDIR="$(TARGET_DIR)" prefix=/usr +endef + +define HOST_BPFTOOL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/linux-tools/linux-tool-bpftool.mk.in b/package/linux-tools/linux-tool-bpftool.mk.in deleted file mode 100644 index 0c4d3693a3..0000000000 --- a/package/linux-tools/linux-tool-bpftool.mk.in +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# bpftool -# -################################################################################ - -LINUX_TOOLS += bpftool - -BPFTOOL_DEPENDENCIES = binutils elfutils - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -BPFTOOL_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BPFTOOL_DEPENDENCIES += zlib -endif - -BPFTOOL_MAKE_OPTS = $(LINUX_MAKE_FLAGS) - -define BPFTOOL_BUILD_CMDS - $(Q)if ! grep install $(LINUX_DIR)/tools/bpf/bpftool/Makefile >/dev/null 2>&1 ; then \ - echo "Your kernel version is too old and does not have install section in the bpf tools." ; \ - echo "At least kernel 4.15 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) -endef - -define BPFTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - install -endef -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 31 18:22:56 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 11:22:56 -0700 Subject: [Buildroot] [PATCH v3 1/1] package/bpftool: new package Message-ID: <20220131182256.4187299-1-james.hilliard1@gmail.com> Move the target bpftool build out of linux-tools so that it is up to date. This also fixes build issues due to differences between kernel versions. The latest version should be fully backwards compatible. The host bpftool is needed for enabling features such as the systemd bpf-framework(to be added in a future patch). Signed-off-by: James Hilliard --- Changes v2 -> v3: - fix target install Changes v1 -> v2: - move target bpftool out of linux-tools into stand-alone build --- Config.in.legacy | 8 ++++ DEVELOPERS | 1 + package/Config.in | 1 + package/bpftool/Config.in | 18 ++++++++ package/bpftool/bpftool.hash | 5 +++ package/bpftool/bpftool.mk | 45 ++++++++++++++++++++ package/linux-tools/linux-tool-bpftool.mk.in | 37 ---------------- 7 files changed, 78 insertions(+), 37 deletions(-) create mode 100644 package/bpftool/Config.in create mode 100644 package/bpftool/bpftool.hash create mode 100644 package/bpftool/bpftool.mk delete mode 100644 package/linux-tools/linux-tool-bpftool.mk.in diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..dce236b3b4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL + bool "bpftool was moved" + select BR2_LEGACY + select BR2_PACKAGE_BPFTOOL + help + The linux-tools bpftool build has been moved out + of the linux-tools package. + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..51b52871ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1282,6 +1282,7 @@ F: configs/pine64_sopine_defconfig N: James Hilliard F: package/apcupsd/ +F: package/bpftool/ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..dbdcc3919b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -86,6 +86,7 @@ menu "Debugging, profiling and benchmark" source "package/babeltrace2/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" + source "package/bpftool/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" source "package/coremark/Config.in" diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in new file mode 100644 index 0000000000..39475aa962 --- /dev/null +++ b/package/bpftool/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_BPFTOOL + bool "bpftool" + depends on !BR2_nios2 # binutils + depends on BR2_USE_WCHAR # binutils, elfutils + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_ELFUTILS + help + bpftool is a tool for for inspection and simple manipulation + of eBPF programs and maps. + +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on !BR2_nios2 + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash new file mode 100644 index 0000000000..c7d4ae250e --- /dev/null +++ b/package/bpftool/bpftool.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk new file mode 100644 index 0000000000..4276f91958 --- /dev/null +++ b/package/bpftool/bpftool.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# bpftool +# +################################################################################ + +BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_SITE = https://github.com/libbpf/bpftool +BPFTOOL_SITE_METHOD = git +BPFTOOL_GIT_SUBMODULES = YES +BPFTOOL_LICENSE = GPL-2.0, BSD-2-Clause +BPFTOOL_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0 +BPFTOOL_DEPENDENCIES = binutils elfutils +HOST_BPFTOOL_DEPENDENCIES = host-elfutils host-pkgconf host-zlib + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +BPFTOOL_DEPENDENCIES += libcap +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +BPFTOOL_DEPENDENCIES += zlib +endif + +define BPFTOOL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define HOST_BPFTOOL_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define BPFTOOL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(TARGET_DIR)" prefix=/usr +endef + +define HOST_BPFTOOL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/linux-tools/linux-tool-bpftool.mk.in b/package/linux-tools/linux-tool-bpftool.mk.in deleted file mode 100644 index 0c4d3693a3..0000000000 --- a/package/linux-tools/linux-tool-bpftool.mk.in +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# bpftool -# -################################################################################ - -LINUX_TOOLS += bpftool - -BPFTOOL_DEPENDENCIES = binutils elfutils - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -BPFTOOL_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BPFTOOL_DEPENDENCIES += zlib -endif - -BPFTOOL_MAKE_OPTS = $(LINUX_MAKE_FLAGS) - -define BPFTOOL_BUILD_CMDS - $(Q)if ! grep install $(LINUX_DIR)/tools/bpf/bpftool/Makefile >/dev/null 2>&1 ; then \ - echo "Your kernel version is too old and does not have install section in the bpf tools." ; \ - echo "At least kernel 4.15 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) -endef - -define BPFTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - install -endef -- 2.25.1 From fperrad at gmail.com Mon Jan 31 14:58:25 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 31 Jan 2022 15:58:25 +0100 Subject: [Buildroot] [PATCH] package/expat: security bump to 2.4.4 Message-ID: <20220131145825.1206899-1-francois.perrad@gadz.org> fix CVE-2022-23852, CVE-2022-23990 Signed-off-by: Francois Perrad --- package/expat/expat.hash | 6 +++--- package/expat/expat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0853c3c76..312980166 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ -md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz -sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.4/ +md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz +sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz # Locally calculated sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz diff --git a/package/expat/expat.mk b/package/expat/expat.mk index a7ace6609..250600c25 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.3 +EXPAT_VERSION = 2.4.4 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.32.0 From james.hilliard1 at gmail.com Mon Jan 31 18:51:54 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 11:51:54 -0700 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: new package Message-ID: <20220131185154.26343-1-james.hilliard1@gmail.com> Move the target bpftool build out of linux-tools so that it is up to date. This also fixes build issues due to differences between kernel versions. The latest version should be fully backwards compatible. The host bpftool is needed for enabling features such as the systemd bpf-framework(to be added in a future patch). Signed-off-by: James Hilliard --- Changes v3 -> v4: - remove linux-tools bpftool kconfig entry Changes v2 -> v3: - fix target install Changes v1 -> v2: - move target bpftool out of linux-tools into stand-alone build --- Config.in.legacy | 8 ++++ DEVELOPERS | 1 + package/Config.in | 1 + package/bpftool/Config.in | 18 ++++++++ package/bpftool/bpftool.hash | 5 +++ package/bpftool/bpftool.mk | 45 ++++++++++++++++++++ package/linux-tools/Config.in | 22 ---------- package/linux-tools/linux-tool-bpftool.mk.in | 37 ---------------- 8 files changed, 78 insertions(+), 59 deletions(-) create mode 100644 package/bpftool/Config.in create mode 100644 package/bpftool/bpftool.hash create mode 100644 package/bpftool/bpftool.mk delete mode 100644 package/linux-tools/linux-tool-bpftool.mk.in diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..dce236b3b4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL + bool "bpftool was moved" + select BR2_LEGACY + select BR2_PACKAGE_BPFTOOL + help + The linux-tools bpftool build has been moved out + of the linux-tools package. + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..51b52871ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1282,6 +1282,7 @@ F: configs/pine64_sopine_defconfig N: James Hilliard F: package/apcupsd/ +F: package/bpftool/ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..dbdcc3919b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -86,6 +86,7 @@ menu "Debugging, profiling and benchmark" source "package/babeltrace2/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" + source "package/bpftool/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" source "package/coremark/Config.in" diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in new file mode 100644 index 0000000000..39475aa962 --- /dev/null +++ b/package/bpftool/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_BPFTOOL + bool "bpftool" + depends on !BR2_nios2 # binutils + depends on BR2_USE_WCHAR # binutils, elfutils + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_ELFUTILS + help + bpftool is a tool for for inspection and simple manipulation + of eBPF programs and maps. + +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on !BR2_nios2 + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash new file mode 100644 index 0000000000..c7d4ae250e --- /dev/null +++ b/package/bpftool/bpftool.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk new file mode 100644 index 0000000000..4276f91958 --- /dev/null +++ b/package/bpftool/bpftool.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# bpftool +# +################################################################################ + +BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_SITE = https://github.com/libbpf/bpftool +BPFTOOL_SITE_METHOD = git +BPFTOOL_GIT_SUBMODULES = YES +BPFTOOL_LICENSE = GPL-2.0, BSD-2-Clause +BPFTOOL_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0 +BPFTOOL_DEPENDENCIES = binutils elfutils +HOST_BPFTOOL_DEPENDENCIES = host-elfutils host-pkgconf host-zlib + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +BPFTOOL_DEPENDENCIES += libcap +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +BPFTOOL_DEPENDENCIES += zlib +endif + +define BPFTOOL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define HOST_BPFTOOL_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define BPFTOOL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(TARGET_DIR)" prefix=/usr +endef + +define HOST_BPFTOOL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 28641dccdd..f459b41762 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -5,28 +5,6 @@ menu "Linux Kernel Tools" config BR2_PACKAGE_LINUX_TOOLS bool -config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL - bool "bpftool" - depends on !BR2_nios2 # binutils - depends on BR2_USE_WCHAR # binutils, elfutils - depends on !BR2_STATIC_LIBS # elfutils - depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - select BR2_PACKAGE_LINUX_TOOLS - select BR2_PACKAGE_BINUTILS - select BR2_PACKAGE_ELFUTILS - help - bpftool is a tool for for inspection and simple manipulation - of eBPF programs and maps. - - These tools are available only from kernel version 4.15. - -comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" - depends on !BR2_nios2 - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) - config BR2_PACKAGE_LINUX_TOOLS_CPUPOWER bool "cpupower" select BR2_PACKAGE_LINUX_TOOLS diff --git a/package/linux-tools/linux-tool-bpftool.mk.in b/package/linux-tools/linux-tool-bpftool.mk.in deleted file mode 100644 index 0c4d3693a3..0000000000 --- a/package/linux-tools/linux-tool-bpftool.mk.in +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# bpftool -# -################################################################################ - -LINUX_TOOLS += bpftool - -BPFTOOL_DEPENDENCIES = binutils elfutils - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -BPFTOOL_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BPFTOOL_DEPENDENCIES += zlib -endif - -BPFTOOL_MAKE_OPTS = $(LINUX_MAKE_FLAGS) - -define BPFTOOL_BUILD_CMDS - $(Q)if ! grep install $(LINUX_DIR)/tools/bpf/bpftool/Makefile >/dev/null 2>&1 ; then \ - echo "Your kernel version is too old and does not have install section in the bpf tools." ; \ - echo "At least kernel 4.15 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) -endef - -define BPFTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - install -endef -- 2.25.1 From aduskett at gmail.com Mon Jan 31 19:31:16 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 31 Jan 2022 11:31:16 -0800 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5webkit: fix build without opengl In-Reply-To: References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> <20220116214955.3231899-2-fontaine.fabrice@gmail.com> Message-ID: Reviewed-by: Adam Duskett Tested-by: Adam Duskett On Fri, Jan 28, 2022 at 4:39 PM James Hilliard wrote: > > On Sun, Jan 16, 2022 at 2:51 PM Fabrice Fontaine > wrote: > > > > Fix the following build failure without opengl raised since bump to > > version 5.212.0-alpha4 in commit > > df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > > > CMake Error at Source/cmake/OptionsQt.cmake:592 (message): > > Qt with OpenGL support is required for ENABLE_OPENGL > > > > WebKit2 unconditionally depends on TextureMapperGL.h and tools builds > > QtTestBrowser which unconditionally depends on QtOpenGL > > > > Fixes: > > - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed > > > > Signed-off-by: Fabrice Fontaine > Reviewed-by: James Hilliard > > --- > > package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > > index 3af1918a46..de3c428fbe 100644 > > --- a/package/qt5/qt5webkit/qt5webkit.mk > > +++ b/package/qt5/qt5webkit/qt5webkit.mk > > @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > > # in the archive. > > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > > > > +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) > > +QT5WEBKIT_CONF_OPTS += \ > > + -DENABLE_OPENGL=ON \ > > + -DENABLE_WEBKIT2=ON > > +else > > +QT5WEBKIT_CONF_OPTS += \ > > + -DENABLE_OPENGL=OFF \ > > + -DENABLE_WEBKIT2=OFF > > +endif > > + > > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > > QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender > > endif > > @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative > > endif > > > > QT5WEBKIT_CONF_OPTS += \ > > + -DENABLE_TOOLS=OFF \ > > -DPORT=Qt \ > > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > > -DUSE_LIBHYPHEN=OFF > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From aduskett at gmail.com Mon Jan 31 19:31:33 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 31 Jan 2022 11:31:33 -0800 Subject: [Buildroot] [PATCH 3/3] package/qt5/qt5webkit: build shared core In-Reply-To: <20220116214955.3231899-3-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> <20220116214955.3231899-3-fontaine.fabrice@gmail.com> Message-ID: Reviewed-by: Adam Duskett Tested-by: Adam Duskett On Sun, Jan 16, 2022 at 1:52 PM Fabrice Fontaine wrote: > > Build JavaScriptCore and WebCore as shared libraries to avoid a build > failure > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webkit/qt5webkit.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index de3c428fbe..565c57e813 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -42,6 +42,7 @@ QT5WEBKIT_CONF_OPTS += \ > -DENABLE_TOOLS=OFF \ > -DPORT=Qt \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > + -DSHARED_CORE=ON \ > -DUSE_LIBHYPHEN=OFF > > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From aduskett at gmail.com Mon Jan 31 19:32:36 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 31 Jan 2022 11:32:36 -0800 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5webkit: widgets are mandatory In-Reply-To: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Message-ID: Reviewed-by: Adam Duskett Tested-by: Adam Duskett On Sun, Jan 16, 2022 at 1:51 PM Fabrice Fontaine wrote: > > Fix the following build failure raised since bump to version > 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > CMake Error at /home/fabrice/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): > Could not find a package configuration file provided by "Qt5Widgets" with > any of the following names: > > Qt5WidgetsConfig.cmake > qt5widgets-config.cmake > > Add the installation prefix of "Qt5Widgets" to CMAKE_PREFIX_PATH or set > "Qt5Widgets_DIR" to a directory containing one of the above files. If > "Qt5Widgets" provides a separate development package or SDK, be sure it has > been installed. > Call Stack (most recent call first): > Source/cmake/OptionsQt.cmake:646 (find_package) > Source/cmake/WebKitCommon.cmake:51 (include) > CMakeLists.txt:137 (include) > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webkit/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in > index b7beb2b252..68b679dfcd 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -17,6 +17,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_LIBPNG > select BR2_PACKAGE_QT5BASE_ICU > select BR2_PACKAGE_QT5BASE_GUI > + select BR2_PACKAGE_QT5BASE_WIDGETS > select BR2_PACKAGE_QT5LOCATION > select BR2_PACKAGE_QT5SENSORS > select BR2_PACKAGE_QT5WEBCHANNEL > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From geomatsi at gmail.com Mon Jan 31 19:48:17 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 31 Jan 2022 22:48:17 +0300 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump version to 2.10 Message-ID: <20220131194818.2084092-1-geomatsi@gmail.com> Update wpa_supplicant to the latest release v2.10. Drop all the patches as they have already been upstreamed. Remove from .mk file all the WPA_SUPPLICANT_IGNORE_CVES records since those CVEs will not be reported against the new version. Signed-off-by: Sergey Matyukevich --- ...re-management-frame-from-unexpected-.patch | 77 ------------ ...DigestAlgorithmIdentifier-parameters.patch | 116 ------------------ ...dbool.h-to-allow-C99-bool-to-be-used.patch | 32 ----- ...-functions-for-recognizing-tag-value.patch | 37 ------ package/wpa_supplicant/wpa_supplicant.hash | 4 +- package/wpa_supplicant/wpa_supplicant.mk | 14 +-- 6 files changed, 2 insertions(+), 278 deletions(-) delete mode 100644 package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch delete mode 100644 package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch delete mode 100644 package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch delete mode 100644 package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch diff --git a/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch deleted file mode 100644 index 959788c2e9..0000000000 --- a/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: [PATCH] AP: Silently ignore management frame from unexpected source - address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Signed-off-by: Jouni Malinen - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch] ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 31587685fe3b..34ca379edc3d 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28db44b7..e7065372e158 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.20.1 - diff --git a/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch b/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch deleted file mode 100644 index 5dcfed9406..0000000000 --- a/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch +++ /dev/null @@ -1,116 +0,0 @@ -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 18:19:31 +0200 -Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters - -The supported hash algorithms do not use AlgorithmIdentifier parameters. -However, there are implementations that include NULL parameters in -addition to ones that omit the parameters. Previous implementation did -not check the parameters value at all which supported both these cases, -but did not reject any other unexpected information. - -Use strict validation of digest algorithm parameters and reject any -unexpected value when validating a signature. This is needed to prevent -potential forging attacks. - -Signed-off-by: Jouni Malinen -Signed-off-by: Peter Korsgaard ---- - src/tls/pkcs1.c | 21 +++++++++++++++++++++ - src/tls/x509v3.c | 20 ++++++++++++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c -index bbdb0d72d..5761dfed0 100644 ---- a/src/tls/pkcs1.c -+++ b/src/tls/pkcs1.c -@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", -+ hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "PKCS #1: Unexpected digest algorithm parameters"); -+ os_free(decrypted); -+ return -1; -+ } - - if (!asn1_oid_equal(&oid, hash_alg)) { - char txt[100], txt2[100]; -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c -index a8944dd2f..df337ec4d 100644 ---- a/src/tls/x509v3.c -+++ b/src/tls/x509v3.c -@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "X509: Unexpected digest algorithm parameters"); -+ os_free(data); -+ return -1; -+ } - - if (x509_sha1_oid(&oid)) { - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { --- -2.20.1 - diff --git a/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch b/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch deleted file mode 100644 index e52dbdb694..0000000000 --- a/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 99cf89555313056d3a8fa54b21d02dc880b363e1 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 20 Apr 2020 20:29:31 +0300 -Subject: [PATCH] Include stdbool.h to allow C99 bool to be used - -We have practically started requiring some C99 features, so might as -well finally go ahead and bring in the C99 bool as well. - -Signed-off-by: Jouni Malinen -[geomatsi at gmail.com: backport from upstream] -Signed-off-by: Sergey Matyukevich -[yann.morin.1998 at free.fr: keep upstream sha1 in header, drop numbering] -Signed-off-by: Yann E. MORIN ---- - src/utils/includes.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/utils/includes.h b/src/utils/includes.h -index 75513fc8c..741fc9c14 100644 ---- a/src/utils/includes.h -+++ b/src/utils/includes.h -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.25.1 - diff --git a/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch b/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch deleted file mode 100644 index a5415e7daf..0000000000 --- a/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9a990e8c4eb92dd64e0ec483599820e45c35ac23 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 23:14:23 +0200 -Subject: [PATCH] ASN.1: Add helper functions for recognizing tag values - -Signed-off-by: Jouni Malinen -[geomatsi at gmail.com: backport asn1_is_null() from upstream 9a990e8c4eb9] -Signed-off-by: Sergey Matyukevich -[yann.morin.1998 at free.fr: - - reformat, keep the upstream sha1 and title, - - drop numbering -] -Signed-off-by: Yann E. MORIN ---- - src/tls/asn1.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 102 insertions(+) - -diff --git a/src/tls/asn1.h b/src/tls/asn1.h -index de3430adb..a4d1be473 100644 ---- a/src/tls/asn1.h -+++ b/src/tls/asn1.h -@@ -66,6 +66,12 @@ struct wpabuf * asn1_build_alg_id(const struct asn1_oid *oid, - unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); - int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); - -+static inline bool asn1_is_null(const struct asn1_hdr *hdr) -+{ -+ return hdr->class == ASN1_CLASS_UNIVERSAL && -+ hdr->tag == ASN1_TAG_NULL; -+} -+ - extern struct asn1_oid asn1_sha1_oid; - extern struct asn1_oid asn1_sha256_oid; - --- -2.25.1 - diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index 2387391a3c..b442be6ed5 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -1,5 +1,3 @@ # Locally calculated -sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz +sha256 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f wpa_supplicant-2.10.tar.gz sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README -sha256 c4d65cc13863e0237d0644198558e2c47b4ed91e2b2be4516ff590724187c4a5 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch -sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 3c0b0c1dfc..b414144774 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,11 +4,8 @@ # ################################################################################ -WPA_SUPPLICANT_VERSION = 2.9 +WPA_SUPPLICANT_VERSION = 2.10 WPA_SUPPLICANT_SITE = http://w1.fi/releases -WPA_SUPPLICANT_PATCH = \ - https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch \ - https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi @@ -19,15 +16,6 @@ WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) WPA_SUPPLICANT_SELINUX_MODULES = networkmanager -# 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch -WPA_SUPPLICANT_IGNORE_CVES += CVE-2019-16275 - -# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch -WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-27803 - -# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch -WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-30004 - # install the wpa_client library WPA_SUPPLICANT_INSTALL_STAGING = YES -- 2.35.0 From geomatsi at gmail.com Mon Jan 31 19:48:18 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 31 Jan 2022 22:48:18 +0300 Subject: [Buildroot] [PATCH 2/2] package/hostapd: bump version to 2.10 In-Reply-To: <20220131194818.2084092-1-geomatsi@gmail.com> References: <20220131194818.2084092-1-geomatsi@gmail.com> Message-ID: <20220131194818.2084092-2-geomatsi@gmail.com> Update hostapd to the latest release v2.10. Drop all the patches as they have already been upstreamed. Remove from .mk file all the HOSTAPD_IGNORE_CVES records since those CVEs will not be reported against the new version. Signed-off-by: Sergey Matyukevich --- ...re-management-frame-from-unexpected-.patch | 77 ------------ ...DigestAlgorithmIdentifier-parameters.patch | 116 ------------------ ...dbool.h-to-allow-C99-bool-to-be-used.patch | 32 ----- ...-functions-for-recognizing-tag-value.patch | 37 ------ package/hostapd/hostapd.hash | 6 +- package/hostapd/hostapd.mk | 19 +-- 6 files changed, 2 insertions(+), 285 deletions(-) delete mode 100644 package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch delete mode 100644 package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch delete mode 100644 package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch delete mode 100644 package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch diff --git a/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch deleted file mode 100644 index 959788c2e9..0000000000 --- a/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: [PATCH] AP: Silently ignore management frame from unexpected source - address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Signed-off-by: Jouni Malinen - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch] ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 31587685fe3b..34ca379edc3d 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28db44b7..e7065372e158 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.20.1 - diff --git a/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch b/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch deleted file mode 100644 index 5dcfed9406..0000000000 --- a/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch +++ /dev/null @@ -1,116 +0,0 @@ -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 18:19:31 +0200 -Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters - -The supported hash algorithms do not use AlgorithmIdentifier parameters. -However, there are implementations that include NULL parameters in -addition to ones that omit the parameters. Previous implementation did -not check the parameters value at all which supported both these cases, -but did not reject any other unexpected information. - -Use strict validation of digest algorithm parameters and reject any -unexpected value when validating a signature. This is needed to prevent -potential forging attacks. - -Signed-off-by: Jouni Malinen -Signed-off-by: Peter Korsgaard ---- - src/tls/pkcs1.c | 21 +++++++++++++++++++++ - src/tls/x509v3.c | 20 ++++++++++++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c -index bbdb0d72d..5761dfed0 100644 ---- a/src/tls/pkcs1.c -+++ b/src/tls/pkcs1.c -@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", -+ hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "PKCS #1: Unexpected digest algorithm parameters"); -+ os_free(decrypted); -+ return -1; -+ } - - if (!asn1_oid_equal(&oid, hash_alg)) { - char txt[100], txt2[100]; -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c -index a8944dd2f..df337ec4d 100644 ---- a/src/tls/x509v3.c -+++ b/src/tls/x509v3.c -@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "X509: Unexpected digest algorithm parameters"); -+ os_free(data); -+ return -1; -+ } - - if (x509_sha1_oid(&oid)) { - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { --- -2.20.1 - diff --git a/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch b/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch deleted file mode 100644 index e52dbdb694..0000000000 --- a/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 99cf89555313056d3a8fa54b21d02dc880b363e1 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 20 Apr 2020 20:29:31 +0300 -Subject: [PATCH] Include stdbool.h to allow C99 bool to be used - -We have practically started requiring some C99 features, so might as -well finally go ahead and bring in the C99 bool as well. - -Signed-off-by: Jouni Malinen -[geomatsi at gmail.com: backport from upstream] -Signed-off-by: Sergey Matyukevich -[yann.morin.1998 at free.fr: keep upstream sha1 in header, drop numbering] -Signed-off-by: Yann E. MORIN ---- - src/utils/includes.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/utils/includes.h b/src/utils/includes.h -index 75513fc8c..741fc9c14 100644 ---- a/src/utils/includes.h -+++ b/src/utils/includes.h -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.25.1 - diff --git a/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch b/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch deleted file mode 100644 index a5415e7daf..0000000000 --- a/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9a990e8c4eb92dd64e0ec483599820e45c35ac23 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 23:14:23 +0200 -Subject: [PATCH] ASN.1: Add helper functions for recognizing tag values - -Signed-off-by: Jouni Malinen -[geomatsi at gmail.com: backport asn1_is_null() from upstream 9a990e8c4eb9] -Signed-off-by: Sergey Matyukevich -[yann.morin.1998 at free.fr: - - reformat, keep the upstream sha1 and title, - - drop numbering -] -Signed-off-by: Yann E. MORIN ---- - src/tls/asn1.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 102 insertions(+) - -diff --git a/src/tls/asn1.h b/src/tls/asn1.h -index de3430adb..a4d1be473 100644 ---- a/src/tls/asn1.h -+++ b/src/tls/asn1.h -@@ -66,6 +66,12 @@ struct wpabuf * asn1_build_alg_id(const struct asn1_oid *oid, - unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); - int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); - -+static inline bool asn1_is_null(const struct asn1_hdr *hdr) -+{ -+ return hdr->class == ASN1_CLASS_UNIVERSAL && -+ hdr->tag == ASN1_TAG_NULL; -+} -+ - extern struct asn1_oid asn1_sha1_oid; - extern struct asn1_oid asn1_sha256_oid; - --- -2.25.1 - diff --git a/package/hostapd/hostapd.hash b/package/hostapd/hostapd.hash index 9ac5f4b392..f8183d1620 100644 --- a/package/hostapd/hostapd.hash +++ b/package/hostapd/hostapd.hash @@ -1,7 +1,3 @@ # Locally calculated -sha256 881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7 hostapd-2.9.tar.gz -sha256 2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch -sha256 49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch -sha256 a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch -sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch +sha256 206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d hostapd-2.10.tar.gz sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index e988999d3e..075cb2a8d0 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -4,32 +4,15 @@ # ################################################################################ -HOSTAPD_VERSION = 2.9 +HOSTAPD_VERSION = 2.10 HOSTAPD_SITE = http://w1.fi/releases HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config -HOSTAPD_PATCH = \ - https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \ - https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \ - https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \ - https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch HOSTAPD_DEPENDENCIES = host-pkgconf HOSTAPD_CFLAGS = $(TARGET_CFLAGS) HOSTAPD_LICENSE = BSD-3-Clause HOSTAPD_LICENSE_FILES = README -# 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch -HOSTAPD_IGNORE_CVES += CVE-2019-16275 - -# 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch -HOSTAPD_IGNORE_CVES += CVE-2020-12695 - -# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch -HOSTAPD_IGNORE_CVES += CVE-2021-30004 - -# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch -HOSTAPD_IGNORE_CVES += CVE-2021-27803 - HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_SELINUX_MODULES = hostapd HOSTAPD_CONFIG_SET = -- 2.35.0 From arnout at mind.be Mon Jan 31 19:57:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 31 Jan 2022 20:57:16 +0100 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5webkit: widgets are mandatory In-Reply-To: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Message-ID: On 16/01/2022 22:49, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version > 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > CMake Error at /home/fabrice/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): > Could not find a package configuration file provided by "Qt5Widgets" with > any of the following names: > > Qt5WidgetsConfig.cmake > qt5widgets-config.cmake > > Add the installation prefix of "Qt5Widgets" to CMAKE_PREFIX_PATH or set > "Qt5Widgets_DIR" to a directory containing one of the above files. If > "Qt5Widgets" provides a separate development package or SDK, be sure it has > been installed. > Call Stack (most recent call first): > Source/cmake/OptionsQt.cmake:646 (find_package) > Source/cmake/WebKitCommon.cmake:51 (include) > CMakeLists.txt:137 (include) > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Series applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5webkit/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in > index b7beb2b252..68b679dfcd 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -17,6 +17,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_LIBPNG > select BR2_PACKAGE_QT5BASE_ICU > select BR2_PACKAGE_QT5BASE_GUI > + select BR2_PACKAGE_QT5BASE_WIDGETS > select BR2_PACKAGE_QT5LOCATION > select BR2_PACKAGE_QT5SENSORS > select BR2_PACKAGE_QT5WEBCHANNEL From arnout at mind.be Mon Jan 31 19:54:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 20:54:41 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: fix build without opengl Message-ID: <20220131195022.9665982821@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea8579141c1af9e3afc08e1d398e5187a67f38cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without opengl raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at Source/cmake/OptionsQt.cmake:592 (message): Qt with OpenGL support is required for ENABLE_OPENGL WebKit2 unconditionally depends on TextureMapperGL.h and tools builds QtTestBrowser which unconditionally depends on QtOpenGL Fixes: - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 3af1918a46..de3c428fbe 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=ON \ + -DENABLE_WEBKIT2=ON +else +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=OFF \ + -DENABLE_WEBKIT2=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative endif QT5WEBKIT_CONF_OPTS += \ + -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DUSE_LIBHYPHEN=OFF From arnout at mind.be Mon Jan 31 19:55:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 20:55:50 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: build shared core Message-ID: <20220131195022.A035982825@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bebeb772eb0b28ab1488ce91bc59a06a573ee6e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Build JavaScriptCore and WebCore as shared libraries to avoid a build failure Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/qt5webkit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index de3c428fbe..565c57e813 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -42,6 +42,7 @@ QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DSHARED_CORE=ON \ -DUSE_LIBHYPHEN=OFF $(eval $(cmake-package)) From arnout at mind.be Mon Jan 31 19:54:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 20:54:10 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: widgets are mandatory Message-ID: <20220131195022.8D3E281376@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2dd01a63004994393ca42c90f99aeaf767a61e9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at /home/fabrice/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): Could not find a package configuration file provided by "Qt5Widgets" with any of the following names: Qt5WidgetsConfig.cmake qt5widgets-config.cmake Add the installation prefix of "Qt5Widgets" to CMAKE_PREFIX_PATH or set "Qt5Widgets_DIR" to a directory containing one of the above files. If "Qt5Widgets" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): Source/cmake/OptionsQt.cmake:646 (find_package) Source/cmake/WebKitCommon.cmake:51 (include) CMakeLists.txt:137 (include) Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index b7beb2b252..68b679dfcd 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5SENSORS select BR2_PACKAGE_QT5WEBCHANNEL From yegorslists at googlemail.com Mon Jan 31 20:14:42 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 31 Jan 2022 21:14:42 +0100 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump version to 2.10 In-Reply-To: <20220131194818.2084092-1-geomatsi@gmail.com> References: <20220131194818.2084092-1-geomatsi@gmail.com> Message-ID: Hi Sergey, On Mon, Jan 31, 2022 at 8:48 PM Sergey Matyukevich wrote: > > Update wpa_supplicant to the latest release v2.10. Drop all the patches > as they have already been upstreamed. Remove from .mk file all the > WPA_SUPPLICANT_IGNORE_CVES records since those CVEs will not be > reported against the new version. > > Signed-off-by: Sergey Matyukevich > --- > ...re-management-frame-from-unexpected-.patch | 77 ------------ > ...DigestAlgorithmIdentifier-parameters.patch | 116 ------------------ > ...dbool.h-to-allow-C99-bool-to-be-used.patch | 32 ----- > ...-functions-for-recognizing-tag-value.patch | 37 ------ > package/wpa_supplicant/wpa_supplicant.hash | 4 +- > package/wpa_supplicant/wpa_supplicant.mk | 14 +-- > 6 files changed, 2 insertions(+), 278 deletions(-) > delete mode 100644 package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch > delete mode 100644 package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch > delete mode 100644 package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch > delete mode 100644 package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch > > diff --git a/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch > deleted file mode 100644 > index 959788c2e9..0000000000 > --- a/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch > +++ /dev/null > @@ -1,77 +0,0 @@ > -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 > -From: Jouni Malinen > -Date: Thu, 29 Aug 2019 11:52:04 +0300 > -Subject: [PATCH] AP: Silently ignore management frame from unexpected source > - address > - > -Do not process any received Management frames with unexpected/invalid SA > -so that we do not add any state for unexpected STA addresses or end up > -sending out frames to unexpected destination. This prevents unexpected > -sequences where an unprotected frame might end up causing the AP to send > -out a response to another device and that other device processing the > -unexpected response. > - > -In particular, this prevents some potential denial of service cases > -where the unexpected response frame from the AP might result in a > -connected station dropping its association. > - > -Signed-off-by: Jouni Malinen > - > -Signed-off-by: Fabrice Fontaine > -[Retrieved from: > -https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch] > ---- > - src/ap/drv_callbacks.c | 13 +++++++++++++ > - src/ap/ieee802_11.c | 12 ++++++++++++ > - 2 files changed, 25 insertions(+) > - > -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c > -index 31587685fe3b..34ca379edc3d 100644 > ---- a/src/ap/drv_callbacks.c > -+++ b/src/ap/drv_callbacks.c > -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, > - "hostapd_notif_assoc: Skip event with no address"); > - return -1; > - } > -+ > -+ if (is_multicast_ether_addr(addr) || > -+ is_zero_ether_addr(addr) || > -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { > -+ /* Do not process any frames with unexpected/invalid SA so that > -+ * we do not add any state for unexpected STA addresses or end > -+ * up sending out frames to unexpected destination. */ > -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR > -+ " in received indication - ignore this indication silently", > -+ __func__, MAC2STR(addr)); > -+ return 0; > -+ } > -+ > - random_add_randomness(addr, ETH_ALEN); > - > - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, > -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c > -index c85a28db44b7..e7065372e158 100644 > ---- a/src/ap/ieee802_11.c > -+++ b/src/ap/ieee802_11.c > -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, > - fc = le_to_host16(mgmt->frame_control); > - stype = WLAN_FC_GET_STYPE(fc); > - > -+ if (is_multicast_ether_addr(mgmt->sa) || > -+ is_zero_ether_addr(mgmt->sa) || > -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { > -+ /* Do not process any frames with unexpected/invalid SA so that > -+ * we do not add any state for unexpected STA addresses or end > -+ * up sending out frames to unexpected destination. */ > -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR > -+ " in received frame - ignore this frame silently", > -+ MAC2STR(mgmt->sa)); > -+ return 0; > -+ } > -+ > - if (stype == WLAN_FC_STYPE_BEACON) { > - handle_beacon(hapd, mgmt, len, fi); > - return 1; > --- > -2.20.1 > - > diff --git a/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch b/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch > deleted file mode 100644 > index 5dcfed9406..0000000000 > --- a/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch > +++ /dev/null > @@ -1,116 +0,0 @@ > -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 > -From: Jouni Malinen > -Date: Sat, 13 Mar 2021 18:19:31 +0200 > -Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters > - > -The supported hash algorithms do not use AlgorithmIdentifier parameters. > -However, there are implementations that include NULL parameters in > -addition to ones that omit the parameters. Previous implementation did > -not check the parameters value at all which supported both these cases, > -but did not reject any other unexpected information. > - > -Use strict validation of digest algorithm parameters and reject any > -unexpected value when validating a signature. This is needed to prevent > -potential forging attacks. > - > -Signed-off-by: Jouni Malinen > -Signed-off-by: Peter Korsgaard > ---- > - src/tls/pkcs1.c | 21 +++++++++++++++++++++ > - src/tls/x509v3.c | 20 ++++++++++++++++++++ > - 2 files changed, 41 insertions(+) > - > -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c > -index bbdb0d72d..5761dfed0 100644 > ---- a/src/tls/pkcs1.c > -+++ b/src/tls/pkcs1.c > -@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, > - os_free(decrypted); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", > -+ hdr.payload, hdr.length); > - > - pos = hdr.payload; > - end = pos + hdr.length; > -@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, > - os_free(decrypted); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", > -+ hdr.payload, hdr.length); > - da_end = hdr.payload + hdr.length; > - > - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { > -@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, > - os_free(decrypted); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", > -+ next, da_end - next); > -+ > -+ /* > -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to > -+ * omit the parameters, but there are implementation that encode these > -+ * as a NULL element. Allow these two cases and reject anything else. > -+ */ > -+ if (da_end > next && > -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || > -+ !asn1_is_null(&hdr) || > -+ hdr.payload + hdr.length != da_end)) { > -+ wpa_printf(MSG_DEBUG, > -+ "PKCS #1: Unexpected digest algorithm parameters"); > -+ os_free(decrypted); > -+ return -1; > -+ } > - > - if (!asn1_oid_equal(&oid, hash_alg)) { > - char txt[100], txt2[100]; > -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c > -index a8944dd2f..df337ec4d 100644 > ---- a/src/tls/x509v3.c > -+++ b/src/tls/x509v3.c > -@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, > - os_free(data); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); > - > - pos = hdr.payload; > - end = pos + hdr.length; > -@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, > - os_free(data); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", > -+ hdr.payload, hdr.length); > - da_end = hdr.payload + hdr.length; > - > - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { > -@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, > - os_free(data); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", > -+ next, da_end - next); > -+ > -+ /* > -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to > -+ * omit the parameters, but there are implementation that encode these > -+ * as a NULL element. Allow these two cases and reject anything else. > -+ */ > -+ if (da_end > next && > -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || > -+ !asn1_is_null(&hdr) || > -+ hdr.payload + hdr.length != da_end)) { > -+ wpa_printf(MSG_DEBUG, > -+ "X509: Unexpected digest algorithm parameters"); > -+ os_free(data); > -+ return -1; > -+ } > - > - if (x509_sha1_oid(&oid)) { > - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { > --- > -2.20.1 > - > diff --git a/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch b/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch > deleted file mode 100644 > index e52dbdb694..0000000000 > --- a/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 99cf89555313056d3a8fa54b21d02dc880b363e1 Mon Sep 17 00:00:00 2001 > -From: Jouni Malinen > -Date: Mon, 20 Apr 2020 20:29:31 +0300 > -Subject: [PATCH] Include stdbool.h to allow C99 bool to be used > - > -We have practically started requiring some C99 features, so might as > -well finally go ahead and bring in the C99 bool as well. > - > -Signed-off-by: Jouni Malinen > -[geomatsi at gmail.com: backport from upstream] > -Signed-off-by: Sergey Matyukevich > -[yann.morin.1998 at free.fr: keep upstream sha1 in header, drop numbering] > -Signed-off-by: Yann E. MORIN > ---- > - src/utils/includes.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/utils/includes.h b/src/utils/includes.h > -index 75513fc8c..741fc9c14 100644 > ---- a/src/utils/includes.h > -+++ b/src/utils/includes.h > -@@ -18,6 +18,7 @@ > - > - #include > - #include > -+#include > - #include > - #include > - #include > --- > -2.25.1 > - > diff --git a/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch b/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch > deleted file mode 100644 > index a5415e7daf..0000000000 > --- a/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From 9a990e8c4eb92dd64e0ec483599820e45c35ac23 Mon Sep 17 00:00:00 2001 > -From: Jouni Malinen > -Date: Sat, 13 Mar 2021 23:14:23 +0200 > -Subject: [PATCH] ASN.1: Add helper functions for recognizing tag values > - > -Signed-off-by: Jouni Malinen > -[geomatsi at gmail.com: backport asn1_is_null() from upstream 9a990e8c4eb9] > -Signed-off-by: Sergey Matyukevich > -[yann.morin.1998 at free.fr: > - - reformat, keep the upstream sha1 and title, > - - drop numbering > -] > -Signed-off-by: Yann E. MORIN > ---- > - src/tls/asn1.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ > - 1 file changed, 102 insertions(+) > - > -diff --git a/src/tls/asn1.h b/src/tls/asn1.h > -index de3430adb..a4d1be473 100644 > ---- a/src/tls/asn1.h > -+++ b/src/tls/asn1.h > -@@ -66,6 +66,12 @@ struct wpabuf * asn1_build_alg_id(const struct asn1_oid *oid, > - unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); > - int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); > - > -+static inline bool asn1_is_null(const struct asn1_hdr *hdr) > -+{ > -+ return hdr->class == ASN1_CLASS_UNIVERSAL && > -+ hdr->tag == ASN1_TAG_NULL; > -+} > -+ > - extern struct asn1_oid asn1_sha1_oid; > - extern struct asn1_oid asn1_sha256_oid; > - > --- > -2.25.1 > - > diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash > index 2387391a3c..b442be6ed5 100644 > --- a/package/wpa_supplicant/wpa_supplicant.hash > +++ b/package/wpa_supplicant/wpa_supplicant.hash > @@ -1,5 +1,3 @@ > # Locally calculated > -sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz > +sha256 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f wpa_supplicant-2.10.tar.gz > sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README > -sha256 c4d65cc13863e0237d0644198558e2c47b4ed91e2b2be4516ff590724187c4a5 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch > -sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch > diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk > index 3c0b0c1dfc..b414144774 100644 > --- a/package/wpa_supplicant/wpa_supplicant.mk > +++ b/package/wpa_supplicant/wpa_supplicant.mk > @@ -4,11 +4,8 @@ > # > ################################################################################ > > -WPA_SUPPLICANT_VERSION = 2.9 > +WPA_SUPPLICANT_VERSION = 2.10 > WPA_SUPPLICANT_SITE = http://w1.fi/releases > -WPA_SUPPLICANT_PATCH = \ > - https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch \ > - https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch > WPA_SUPPLICANT_LICENSE = BSD-3-Clause > WPA_SUPPLICANT_LICENSE_FILES = README > WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi > @@ -19,15 +16,6 @@ WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ > WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) > WPA_SUPPLICANT_SELINUX_MODULES = networkmanager > > -# 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch > -WPA_SUPPLICANT_IGNORE_CVES += CVE-2019-16275 > - > -# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch > -WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-27803 > - > -# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch > -WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-30004 > - > # install the wpa_client library > WPA_SUPPLICANT_INSTALL_STAGING = YES Have you tried to build wpa_supplicant without BR2_PACKAGE_WPA_SUPPLICANT_WPA3 and enabled BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING? I've got a linking error. I have also sent a quick and dirty patch to the hostap mailing list [1] but still got no answer. [1] http://lists.infradead.org/pipermail/hostap/2022-January/040181.html Regards, Yegor From ju.o at free.fr Mon Jan 31 20:16:34 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 31 Jan 2022 21:16:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/glslsandbox: kms needs gbm In-Reply-To: <20220130225207.04efc439@windsurf> References: <20220128205201.2798205-1-fontaine.fabrice@gmail.com> <20220130225207.04efc439@windsurf> Message-ID: Hi Thomas, Fabrice, Yann, On 30/01/2022 22:52, Thomas Petazzoni wrote: > Hello Fabrice, > > On Fri, 28 Jan 2022 21:52:00 +0100 > Fabrice Fontaine wrote: > >> diff --git a/package/glslsandbox-player/Config.in >> b/package/glslsandbox-player/Config.in >> index 3aa6049dfb..e36e8d74c8 100644 >> --- a/package/glslsandbox-player/Config.in >> +++ b/package/glslsandbox-player/Config.in >> @@ -70,6 +70,7 @@ choice >> config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS >> bool "KMS/DRM/GBM" >> depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm >> + depends on BR2_PACKAGE_HAS_LIBGBM >> select BR2_PACKAGE_LIBDRM > > So, yes, this is needed, but isn't sufficient. Indeed, now you can > potentially enable glslsandbox-player even if you don't meet the > dependency for at least one of the "Native windowing system" (see the > choice...endchoice in the package Config.in). > > The top-level BR2_PACKAGE_GLSLSANDBOX_PLAYER option is even carrying a > "bogus" depends on BR2_TOOLCHAIN_HAS_THREADS to make sure that at least > the BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS option is available. > > But with your change, this is no longer true, and adding depends on > BR2_PACKAGE_HAS_LIBGBM to the package top-level option doesn't make > sense. > > So I've tried to make sure that glslsandbox-player is only available > when one of the windowing systems dependencies is met, by doing this: > > diff --git a/package/glslsandbox-player/Config.in > b/package/glslsandbox-player/Config.in > index 2d15a7e270..35fe7b3c6a 100644 > --- a/package/glslsandbox-player/Config.in > +++ b/package/glslsandbox-player/Config.in > @@ -1,10 +1,20 @@ > +config BR2_PACKAGE_GLSLSANDBOX_SUPPORTS_WINDOWING_SYSTEM > + bool > + default y if BR2_PACKAGE_SUNXI_MALI_UTGARD > + default y if BR2_PACKAGE_MALI_T76X > + default y if BR2_PACKAGE_RPI_USERLAND > + default y if BR2_PACKAGE_SDL2_OPENGLES > + default y if BR2_PACKAGE_TI_SGX_UM > + default y if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB > + default y if BR2_PACKAGE_WAYLAND > + default y if BR2_PACKAGE_XORG7 > + default y if BR2_TOOLCHAIN_HAS_THREADS > + > config BR2_PACKAGE_GLSLSANDBOX_PLAYER > bool "glslsandbox-player" > depends on BR2_PACKAGE_HAS_LIBEGL > depends on BR2_PACKAGE_HAS_LIBGLES > - # Doesn't really depend on threads, but this makes sure we have > at least > - # one native windowing system available, and is good enough in > practice. > - depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_PACKAGE_GLSLSANDBOX_SUPPORTS_WINDOWING_SYSTEM > help > GLSL Sandbox standalone player allow one to run and render > (most of) nice shaders available online on the > > (this would have been the change *before* your patch). But > unfortunately, this causes Kconfig to goes nuts with a silly recursive > dependency: > > package/python3/Config.in:5:error: recursive dependency detected! > package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by > BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS > package/glslsandbox-player/Config.in:44: symbol > BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS depends on > BR2_PACKAGE_GLSLSANDBOX_PLAYER > package/glslsandbox-player/Config.in:13: symbol > BR2_PACKAGE_GLSLSANDBOX_PLAYER depends on > BR2_PACKAGE_GLSLSANDBOX_SUPPORTS_WINDOWING_SYSTEM > package/glslsandbox-player/Config.in:6: symbol > BR2_PACKAGE_GLSLSANDBOX_SUPPORTS_WINDOWING_SYSTEM depends on > BR2_PACKAGE_SDL2_OPENGLES > package/sdl2/Config.in:54: symbol BR2_PACKAGE_SDL2_OPENGLES depends on > BR2_PACKAGE_SDL2 > package/sdl2/Config.in:1: symbol BR2_PACKAGE_SDL2 is selected by > BR2_PACKAGE_FFMPEG_FFPLAY > package/ffmpeg/Config.in:51: symbol BR2_PACKAGE_FFMPEG_FFPLAY depends > on BR2_PACKAGE_FFMPEG > package/ffmpeg/Config.in:18: symbol BR2_PACKAGE_FFMPEG is selected by > BR2_PACKAGE_KODI > package/kodi/Config.in:51: symbol BR2_PACKAGE_KODI depends on > BR2_PACKAGE_PYTHON3 > > which I have no idea how to resolve :-/ I would like to suggest the following: glslsandbox-player introduced last year a "Null Windowing System", which does not require anything. See: https://github.com/jolivain/glslsandbox-player/blob/v2021.08.24/src/native_gfx_nullws.c Some ancient EGL implementations worked that way (TI SGX, i.MX5 AMD GPU, ...). Basically, this windowing system is always expected to compile. But it will not always work at runtime. (For an "always working" minimal configuration, for testing for example, I would recommend a Mesa3D/GBM/KMS swrast/llvmpipe relying on Kernel DRM VKMS). This NullWS could be the fallback needed which is needed here. The "bogus" BR2_TOOLCHAIN_HAS_THREADS dependency could also be removed. What do you think about that approach? If you agree, I can send a patch for adding this NullWS. After that, I think this patch proposed by Fabrice can be applied as is. Best regards, Julien. > Thomas From joerg.krause at embedded.rocks Mon Jan 31 20:21:51 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Mon, 31 Jan 2022 20:21:51 +0000 Subject: [Buildroot] [PATCH 1/1] linux: build after wireless-regdb if enabled for early loading support Message-ID: <20220131202151.937124-1-joerg.krause@embedded.rocks> To support building in the wireless regulatory database files (regulatory.db*) into the kernel using the CONFIG_EXTRA_FIRMWARE option, we need to ensure that the database files are installed before the Linux kernel is built. Signed-off-by: J?rg Krause --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index dd2eebd446..ffe0606930 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -72,7 +72,8 @@ LINUX_MAKE_ENV = \ LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod \ $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ - $(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware) + $(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware) \ + $(if $(BR2_PACKAGE_WIRELESS_REGDB),wireless-regdb) # Starting with 4.16, the generated kconfig paser code is no longer # shipped with the kernel sources, so we need flex and bison, but -- 2.35.1 From arnout at mind.be Mon Jan 31 20:38:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 31 Jan 2022 21:38:08 +0100 Subject: [Buildroot] [PATCHv2 1/2] utils/size-stats-compare: clarify meaning of variables in print_result In-Reply-To: <20210303150451.7963-1-patrickdepinguin@gmail.com> References: <20210303150451.7963-1-patrickdepinguin@gmail.com> Message-ID: <527fd8d5-6c7e-aa10-06ba-e634ba3c600d@mind.be> On 03/03/2021 16:04, Thomas De Schampheleire wrote: > From: Thomas De Schampheleire > > print_result is juggling with entry[x][y] which is not very readable. > While a better solution would be to use a class and reference named > attributes, that would require some bigger changes in the script. > > Instead, make a minimal improvement by assigning the entry[x][y] values to > intermediate variables. Store them in a dict for easy usage from a format > string. > > Signed-off-by: Thomas De Schampheleire Series applied to master, thanks. It's a bit silly that this has to take a year, but it is what it is... Regards, Arnout > --- > v2: new patch > > utils/size-stats-compare | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/utils/size-stats-compare b/utils/size-stats-compare > index a3d7f250c6..de67b72587 100755 > --- a/utils/size-stats-compare > +++ b/utils/size-stats-compare > @@ -77,9 +77,16 @@ def print_results(result, threshold): > # list_result is a list of tuples: (name, (flag, size difference)) > > for entry in sorted(list_result, key=lambda entry: entry[1][1]): > - if threshold is not None and abs(entry[1][1]) <= threshold: > + > + data = dict( > + name=entry[0], > + action=entry[1][0], > + size=entry[1][1], > + ) > + > + if threshold is not None and abs(data['size']) <= threshold: > continue > - print('%12s %7s %s' % (entry[1][1], entry[1][0], entry[0])) > + print('{size:12d} {action:7s} {name}'.format(**data)) > > > # main ######################################################################### From arnout at mind.be Mon Jan 31 20:24:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 21:24:40 +0100 Subject: [Buildroot] [git commit] utils/size-stats-compare: clarify meaning of variables in print_result Message-ID: <20220131203116.0291E825D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9b1dffa5d17c7af5d6171de88348431a6260308 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master print_result is juggling with entry[x][y] which is not very readable. While a better solution would be to use a class and reference named attributes, that would require some bigger changes in the script. Instead, make a minimal improvement by assigning the entry[x][y] values to intermediate variables. Store them in a dict for easy usage from a format string. Signed-off-by: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/size-stats-compare | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/size-stats-compare b/utils/size-stats-compare index 422972e488..c679150654 100755 --- a/utils/size-stats-compare +++ b/utils/size-stats-compare @@ -77,9 +77,15 @@ def print_results(result, threshold): # list_result is a list of tuples: (name, (flag, size difference)) for entry in sorted(list_result, key=lambda entry: entry[1][1]): - if threshold is not None and abs(entry[1][1]) <= threshold: + data = dict( + name=entry[0], + action=entry[1][0], + size=entry[1][1], + ) + + if threshold is not None and abs(data['size']) <= threshold: continue - print('%12s %7s %s' % (entry[1][1], entry[1][0], entry[0])) + print('{size:12d} {action:7s} {name}'.format(**data)) # main ######################################################################### From arnout at mind.be Mon Jan 31 20:32:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 21:32:22 +0100 Subject: [Buildroot] [git commit] utils/size-stats-compare: add package name in detail output Message-ID: <20220131203116.0BEB382826@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=391f70b6893e0b502b69f40c69df412f24519060 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master size-stats-compare gives an overview of the size increase/decrease between two cases, based on packages-file-list.txt. The 'detail' mode gives info per file, otherwise per package. But sometimes, you want the detailed per-file info, but only for a specific package. Since the detailed output no longer lists the package name, you cannot simply grep for it. A workaround was to filter the input packages-file-list.txt's first, and then pass these filtered versions to size-stats-compare. Make this easier by adding the package name next to the filename in detailed output. This allows grep'ing normally. For example: $ utils/size-stats-compare orig new -t 100 -d | grep ebtables -67712 removed ebtables lib/ebtables/libebtc.so -66764 removed ebtables lib/ebtables/libebt_nat.so -66752 removed ebtables sbin/ebtables -66704 removed ebtables lib/ebtables/libebt_arp.so -66700 removed ebtables lib/ebtables/libebt_stp.so -66700 removed ebtables lib/ebtables/libebt_among.so -66684 removed ebtables lib/ebtables/libebt_ip.so -66676 removed ebtables lib/ebtables/libebt_limit.so -66656 removed ebtables lib/ebtables/libebt_log.so -66648 removed ebtables lib/ebtables/libebt_mark.so -66636 removed ebtables lib/ebtables/libebt_pkttype.so -66604 removed ebtables lib/ebtables/libebt_vlan.so -66588 removed ebtables lib/ebtables/libebt_ulog.so -66588 removed ebtables lib/ebtables/libebt_nflog.so -66584 removed ebtables lib/ebtables/libebt_arpreply.so -66544 removed ebtables lib/ebtables/libebt_ip6.so -66540 removed ebtables lib/ebtables/libebt_802_3.so -66536 removed ebtables lib/ebtables/libebt_standard.so -66524 removed ebtables lib/ebtables/libebt_mark_m.so -66524 removed ebtables lib/ebtables/libebt_redirect.so -66452 removed ebtables lib/ebtables/libebtable_filter.so -66452 removed ebtables lib/ebtables/libebtable_broute.so -66452 removed ebtables lib/ebtables/libebtable_nat.so 45 ebtables etc/ethertypes 66752 added ebtables usr/sbin/ebtablesd 66752 added ebtables usr/sbin/ebtables-legacy 66752 added ebtables usr/sbin/ebtablesu 200840 added ebtables usr/lib/libebtc.so.0.0.0 Signed-off-by: Thomas De Schampheleire --- utils/size-stats-compare | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/utils/size-stats-compare b/utils/size-stats-compare index c679150654..2ccbe7d191 100755 --- a/utils/size-stats-compare +++ b/utils/size-stats-compare @@ -40,9 +40,9 @@ def read_file_size_csv(inputf, detail=None): for row in reader: if detail: - sizes[row[0]] = int(row[2]) + sizes[(row[0], row[1])] = int(row[2]) else: - sizes[row[1]] = int(row[3]) + sizes[(None, row[1])] = int(row[3]) return sizes @@ -73,19 +73,27 @@ def print_results(result, threshold): from six import iteritems list_result = list(iteritems(result)) - # result is a dictionary: name -> (flag, size difference) - # list_result is a list of tuples: (name, (flag, size difference)) + # result is a dictionary: (filename, pkgname) -> (flag, size difference) + # list_result is a list of tuples: ((filename, pkgname), (flag, size difference)) + # filename may be None if no detail is requested. + + maxpkgname=max(len(pkgname) for filename, pkgname in result) for entry in sorted(list_result, key=lambda entry: entry[1][1]): data = dict( - name=entry[0], + filename=entry[0][0], + pkgname=entry[0][1], action=entry[1][0], size=entry[1][1], + maxpkgname=maxpkgname, ) if threshold is not None and abs(data['size']) <= threshold: continue - print('{size:12d} {action:7s} {name}'.format(**data)) + if data['filename']: + print('{size:12d} {action:7s} {pkgname:{maxpkgname}s} {filename}'.format(**data)) + else: + print('{size:12d} {action:7s} {pkgname}'.format(**data)) # main ######################################################################### @@ -132,5 +140,5 @@ print('Size difference per %s (bytes), threshold = %s' % (keyword, args.threshol print(80*'-') print_results(delta, args.threshold) print(80*'-') -print_results({'TOTAL': ('', sum(new_sizes.values()) - sum(old_sizes.values()))}, +print_results({(None, 'TOTAL'): ('', sum(new_sizes.values()) - sum(old_sizes.values()))}, threshold=None) From geomatsi at gmail.com Mon Jan 31 20:38:36 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 31 Jan 2022 23:38:36 +0300 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump version to 2.10 In-Reply-To: References: <20220131194818.2084092-1-geomatsi@gmail.com> Message-ID: Hello Yegor, > Hi Sergey, > > On Mon, Jan 31, 2022 at 8:48 PM Sergey Matyukevich wrote: > > > > Update wpa_supplicant to the latest release v2.10. Drop all the patches > > as they have already been upstreamed. Remove from .mk file all the > > WPA_SUPPLICANT_IGNORE_CVES records since those CVEs will not be > > reported against the new version. > > > > Signed-off-by: Sergey Matyukevich ... > Have you tried to build wpa_supplicant without > BR2_PACKAGE_WPA_SUPPLICANT_WPA3 and enabled > BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING? I've got a linking error. > I have also sent a quick and dirty patch to the hostap mailing list > [1] but still got no answer. > > [1] http://lists.infradead.org/pipermail/hostap/2022-January/040181.html So far I have not observed that problem. I think we can handle it independently from the revision update, adding fixup patches if needed. I tried to reproduce it using the following wpa_supplicant configuration: BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y However build succeeded. Could you please post your wpa_supplicant configuration snippet ? Probably the root cause is in openssl and some of its features need to be enabled in package/wpa_supplicant/Config.in. Regards, Sergey From arnout at mind.be Mon Jan 31 20:54:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 31 Jan 2022 21:54:08 +0100 Subject: [Buildroot] [PATCH 2/3] utils/test-pkg: add ability to fail when skipped In-Reply-To: <20220101210857.GA69135@scaer> References: <20211201230827.35080-1-matthew.weber@collins.com> <20211201230827.35080-2-matthew.weber@collins.com> <20220101210857.GA69135@scaer> Message-ID: On 01/01/2022 22:08, Yann E. MORIN wrote: > Matthew, All, > > On 2021-12-01 17:08 -0600, Matthew Weber via buildroot spake thusly: >> Add flag to allow the return value to be incremented when a skip >> happens, treating the overall run as a failure. >> >> This flag could be used when using test-pkg for local validation of >> downstream packages, for example in a user's br2-external. An example of >> this could be a user choosing to use test-pkg as part of a CI >> infrastructure where the fragment and toolchains are tightly controlled >> to test a package against multiple toolchains easily. >> >> In this case, the user would want to lower the rate of false-positives >> of that fragment/toolchain configuration if a build is instead skipped >> (which may happen in the case of buildroot version bumps where >> dependencies could change). > > I am a bit skeptical about this use-case. > > As I understand it, wht is most interesting in a CI setup for internal > development, is that *all* internal packages do build togetrher and form > a working sysem *as a whole*. > > As such, a CI setup would build the defconfig file(s) for a project (and > run the integration test-suite), rather than build each package > individually I don't think the intention is necessarily to build each package individually. Although it actually does make a whole lot of sense to do that, because it helps to check if the dependencies are set correctly. So, the obvious way to take the approach that Yann proposes is to have a list of defconfigs that enable all the packages in the external with the various toolchains. However, that still doesn't solve the issue that Matt faces, because any package can silently disappear from the config if its dependencies are no longer met. But indeed, it would make a *whole* lot of sense to add a check to %_defconfig that everything in the defconfig still appears in the generated .config file. If it doesn't, there is something really wrong... So yeah, I tend to agree that this is not the approach we should have upstream. Note that in CI it's very easy to check the output of test-pkg and search for SKIPPED lines. So it's not that this feature is really *needed* to land upstream. Therefore, I've marked the series as Rejected. As always, you're welcome to argue why we should include it after all. Regards, Arnout > > Building each package individually with test-pkg would have the > disadvantage that it takes more time overall, as all the common deps are > build as many times as there are packages to test, and package are also > dependencies one of the others, so most packages would be built more > than once as well... > > So, I am really not convinced... > > Regards, > Yann E. MORIN. > >> Signed-off-by: Matthew Weber >> --- >> utils/test-pkg | 18 +++++++++++++++--- >> 1 file changed, 15 insertions(+), 3 deletions(-) >> >> diff --git a/utils/test-pkg b/utils/test-pkg >> index d0472f176b..97957008fa 100755 >> --- a/utils/test-pkg >> +++ b/utils/test-pkg >> @@ -18,8 +18,8 @@ main() { >> local -a toolchains >> local pkg_br_name >> >> - o='hakc:d:n:p:r:t:e:' >> - O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,' >> + o='hakc:d:n:p:r:t:e:f' >> + O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,fail-on-skip' >> opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" >> eval set -- "${opts}" >> >> @@ -29,6 +29,7 @@ main() { >> number=0 >> mode=0 >> prepare_only=0 >> + fail_on_skip=0 >> toolchains_csv="${TOOLCHAINS_CSV}" >> while [ ${#} -gt 0 ]; do >> case "${1}" in >> @@ -65,6 +66,9 @@ main() { >> (-e|--externals) >> BR2_EXTERNALS="${2}"; shift 2 >> ;; >> + (-f|--fail-on-skip) >> + fail_on_skip=1; shift 1 >> + ;; >> (--) >> shift; break >> ;; >> @@ -147,7 +151,12 @@ main() { >> printf "%d builds, %d skipped, %d build failed, %d legal-info failed\n" \ >> ${nb} ${nb_skip} ${nb_fail} ${nb_legal} >> >> - return $((nb_fail + nb_legal)) >> + nb_result=$((nb_fail + nb_legal)) >> + if [ ${fail_on_skip} ]; then >> + nb_result=$((nb_result + nb_skip)) >> + fi >> + >> + return $nb_result >> } >> >> build_one() { >> @@ -279,6 +288,9 @@ Options: >> Externals to be used as part of the build process. Packages from >> within these externals may be tested. >> >> + -f, --fail-on-skip >> + If any builds are skipped, return a negative exit value. >> + >> Example: >> >> Testing libcec would require a config snippet that contains: >> -- >> 2.17.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From geomatsi at gmail.com Mon Jan 31 21:24:55 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 00:24:55 +0300 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update Message-ID: <20220131212456.3176156-1-geomatsi@gmail.com> ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type To fix the first genimage error report, change 'partition-type' entries to the appropriate 'partition-type-uuid'. Then genimage starts to complain about overlaps: ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000) ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. To fix the second genimage error report, update the size of bootloader file. Do not reserve additional space for GPT partition table since new genimage is able to keep track of it. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-zero-plus2/genimage.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index aee9719ae4..5a7ee7707a 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -22,11 +22,11 @@ image sdcard.img { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8K - size = 1032K # 1MB - 8KB + 16KB(GPT) + size = 1016K # 1MB - 8KB } partition boot { - partition-type = 0xC + partition-type-uuid = "F" bootable = "true" image = "boot.vfat" } @@ -34,7 +34,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type = 0x83 + partition-type-uuid = "L" image = "rootfs.ext4" size = 256M } -- 2.35.0 From geomatsi at gmail.com Mon Jan 31 21:24:56 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 00:24:56 +0300 Subject: [Buildroot] [PATCH 2/2] configs/orangepi_zero_plus2: BSP update In-Reply-To: <20220131212456.3176156-1-geomatsi@gmail.com> References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: <20220131212456.3176156-2-geomatsi@gmail.com> Bump Linux kernel to 5.16.1 and U-Boot to 2022.01. Select option BR2_TARGET_UBOOT_NEEDS_OPENSSL since U-Boot requires openssl. Root filesystem does not fit into default 60M anymore, so increase its size. Signed-off-by: Sergey Matyukevich --- configs/orangepi_zero_plus2_defconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index da2d3b4178..9d88b37ac9 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y @@ -33,7 +34,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" @@ -56,6 +57,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.35.0 From luca at lucaceresoli.net Mon Jan 31 21:31:42 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 31 Jan 2022 22:31:42 +0100 Subject: [Buildroot] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: Hi Neal, On 31/01/22 18:30, Neal Frager wrote: > Changes included with this patch: > 1. Removing ATF and U-Boot patches which are no longer necessary since they are in mainline. > 2. Using Xilinx github for ATF, U-Boot and Linux as there are updates which may not yet be in mainline. > 3. Adding a zynqmp_zcu102_defconfig. > > Signed-off-by: Neal Frager Thank you for your contribution. I appreciate it very much! Please don't point to my luca/next branch for the pmufw download URL, but use the tag I pushed to master a few hours ago. This is the URL: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin More comments will be made easier after you send the patch inline as Giulio already asked. > This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. This sort of message is generally considered incompatible with submission to open source projects, and in some mailing lists is causes messages to be deleted and ignored. Maybe the Buildroot community is not so picky, but it would be nice if you could remove it. -- Luca From yegorslists at googlemail.com Mon Jan 31 21:32:45 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 31 Jan 2022 22:32:45 +0100 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump version to 2.10 In-Reply-To: References: <20220131194818.2084092-1-geomatsi@gmail.com> Message-ID: On Mon, Jan 31, 2022 at 9:38 PM Sergey Matyukevich wrote: > > Hello Yegor, > > > Hi Sergey, > > > > On Mon, Jan 31, 2022 at 8:48 PM Sergey Matyukevich wrote: > > > > > > Update wpa_supplicant to the latest release v2.10. Drop all the patches > > > as they have already been upstreamed. Remove from .mk file all the > > > WPA_SUPPLICANT_IGNORE_CVES records since those CVEs will not be > > > reported against the new version. > > > > > > Signed-off-by: Sergey Matyukevich > > ... > > > Have you tried to build wpa_supplicant without > > BR2_PACKAGE_WPA_SUPPLICANT_WPA3 and enabled > > BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING? I've got a linking error. > > I have also sent a quick and dirty patch to the hostap mailing list > > [1] but still got no answer. > > > > [1] http://lists.infradead.org/pipermail/hostap/2022-January/040181.html > > So far I have not observed that problem. I think we can handle it > independently from the revision update, adding fixup patches if needed. > > I tried to reproduce it using the following wpa_supplicant configuration: > > BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y > BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y > > However build succeeded. Could you please post your wpa_supplicant > configuration snippet ? Probably the root cause is in openssl and some > of its features need to be enabled in package/wpa_supplicant/Config.in. I have pinned it down: BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y BR2_PACKAGE_WPA_SUPPLICANT_EAP=y It is BR2_PACKAGE_WPA_SUPPLICANT_EAP option the selects NEED_SHA384. Regards, Yegor From yann.morin.1998 at free.fr Mon Jan 31 21:38:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 31 Jan 2022 22:38:06 +0100 Subject: [Buildroot] [PATCH 0/2 v2] linux|uboot: fix build with host-gcc 10+ for older versions (branch yem/yylloc) Message-ID: Hello All! This two-patch series aims at side-stepping the multiple symbol declaration in older Linux and U-Boot, where the infamous yylloc is defined more than once. Like we have a fix for the perl timeconst issue in linux, do s similar tweak for yylloc in the two packages known to be affected, Linux and U-Boot. Here is a pipeline with all the defconfig builds: https://gitlab.com/ymorin/buildroot/-/pipelines/460207930 There are still some failures, but none relate to the yylloc issue: - too long build time or not space left on device (I am only using elastic runners) - defconfig not up-to-date (e.g. using kernel headers version since removed) - missing host dependencies for kernel (openssl, libelf) or uboot (python) - another host-gcc 10+ symbol redefinition issue (galileo [0]) - make 4.3 issues. For example: amarula_a64_relic_defconfig https://gitlab.com/ymorin/buildroot/-/jobs/2035820886 DTC arch/arm/dts/sun50i-a64-amarula-relic.dtb Error: arch/arm/dts/.sun50i-a64-amarula-relic.dtb.pre.tmp:66.1-10 syntax error FATAL ERROR: Unable to parse input tree This is caused by make 4.3 that no longer treats '#' as special in macros, and shall no longer be escaped: https://lwn.net/Articles/810071/ This causes '\#include "something"' to be injected as-is at the end of the temporary DTS, and of course, dtc does not cope nicely with that... [1] Unfortuantely, I don't think we can do a generic fixup for that one... - some other issues (e.g. deprecated 'partition-type' for geniamge..) [0] this was fixed in 2014 in the kernel: - eeeda4cd06e828b331b15741a204ff9f5874d28d [1] this was fixed in 2018 in uboot: - e5e701c2b8470de044c5c71d2a54ecfc72680d59 - 0c544115379ed77c1843a194e26960e5b8f3d369 Changes v1 -> v2: - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout) - extend cover-ltter with a pipeline reference and analysese of remaining build failures Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (2): boot/uboot: fix build with host-gcc 10+ linux: fix build with host-gcc 10+ boot/uboot/uboot.mk | 7 +++++++ linux/linux.mk | 7 +++++++ 2 files changed, 14 insertions(+) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 31 21:38:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 31 Jan 2022 22:38:08 +0100 Subject: [Buildroot] [PATCH 1/2 v2] boot/uboot: fix build with host-gcc 10+ In-Reply-To: References: Message-ID: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> Some older versions of U-Boot, or custom versions (like forks for some boards), fail to build with host-gcc 10+, because of redefined symbols: HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status make[4]: *** [scripts/Makefile.host:106: scripts/dtc/dtc] E Since this has been fixed in recent-ish versions, we can't use an unconditionaly patch, so we must have a conditional patch. However, a patch may not always apply to arbitrary U-Boot versions or forks. Upstream just dropped that line altogether: https://source.denx.de/u-boot/u-boot/-/commit/018921ee79d3f30893614b3b2b63b588d8544f73 So, we use a little sed-grep combo to do the exact same change. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v2: - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout) --- boot/uboot/uboot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 574fc7089a..21db1d9d60 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -244,6 +244,13 @@ endef UBOOT_POST_EXTRACT_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE UBOOT_POST_RSYNC_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE +# Older versions break on gcc 10+ because of redefined symbols +define UBOOT_DROP_YYLLOC + $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ + |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' +endef +UBOOT_POST_PATCH_HOOKS += UBOOT_DROP_YYLLOC + ifneq ($(ARCH_XTENSA_OVERLAY_FILE),) define UBOOT_XTENSA_OVERLAY_EXTRACT $(call arch-xtensa-overlay-extract,$(@D),u-boot) -- 2.25.1 From yann.morin.1998 at free.fr Mon Jan 31 21:38:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 31 Jan 2022 22:38:09 +0100 Subject: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+ In-Reply-To: References: Message-ID: Some older versions of linux, or custom versions (like forks for some boards), fail to build with host-gcc 10+, because of redefined symbols: HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status Since this has been fixed in recent-ish versions, we can't use an unconditionaly patch, so we must have a conditional patch. However, a patch may not always apply to arbitrary U-Boot versions or forks. Upstream just dropped that line altogether: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e33a814e772cdc36436c8c188d8c42d019fda639 So, we use a little sed-grep combo to do the exact same change. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v2: - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout) --- linux/linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index dd2eebd446..410b714360 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -268,6 +268,13 @@ endef LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES +# Older versions break on gcc 10+ because of redefined symbols +define LINUX_DROP_YYLLOC + $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ + |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' +endef +LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC + # Older linux kernels use deprecated perl constructs in timeconst.pl # that were removed for perl 5.22+ so it breaks on newer distributions # Try a dry-run patch to see if this applies, if it does go ahead -- 2.25.1 From fontaine.fabrice at gmail.com Mon Jan 31 22:02:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 31 Jan 2022 23:02:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/cgilua: add CGILUA_CPE_ID_VENDOR Message-ID: <20220131220240.127249-1-fontaine.fabrice@gmail.com> cpe:2.3:a:keplerproject:cgilua is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Akeplerproject%3Acgilua Signed-off-by: Fabrice Fontaine --- package/cgilua/cgilua.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk index 7471be3da0..8061eaf3a6 100644 --- a/package/cgilua/cgilua.mk +++ b/package/cgilua/cgilua.mk @@ -8,5 +8,6 @@ CGILUA_VERSION = 6.0.2-0 CGILUA_SUBDIR = cgilua CGILUA_LICENSE = MIT CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html +CGILUA_CPE_ID_VENDOR = keplerproject $(eval $(luarocks-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 31 22:08:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 31 Jan 2022 23:08:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: needs MMU Message-ID: <20220131220841.127708-1-fontaine.fabrice@gmail.com> libuhttpd needs MMU since version 3.13.0 and https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840 to avoid the following build failure raised since commit 61797c52f5deef2cb67e60cf075ca243078c8855: /home/buildroot/autobuild/instance-0/output-1/build/libuhttpd-3.14.1/src/cgi.c: In function 'create_cgi': /home/buildroot/autobuild/instance-0/output-1/build/libuhttpd-3.14.1/src/cgi.c:321:11: error: implicit declaration of function 'fork' [-Werror=implicit-function-declaration] 321 | pid = fork(); | ^~~~ Fixes: - http://autobuild.buildroot.org/results/8d2a79dacf9ac423f7ece51b8c23f3683238312b Signed-off-by: Fabrice Fontaine --- package/libuhttpd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index 9159341d89..52bbd313bc 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBEV select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL help -- 2.34.1 From ps.report at gmx.net Mon Jan 31 22:10:43 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 31 Jan 2022 23:10:43 +0100 Subject: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+ In-Reply-To: References: Message-ID: <20220131231043.615b992b@gmx.net> Hello Yann, one nitpick... On Mon, 31 Jan 2022 22:38:09 +0100, "Yann E. MORIN" wrote: > Some older versions of linux, or custom versions (like forks for some > boards), fail to build with host-gcc 10+, because of redefined symbols: > > HOSTLD scripts/dtc/dtc > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition > of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > > Since this has been fixed in recent-ish versions, we can't use an > unconditionaly patch, so we must have a conditional patch. However, a > patch may not always apply to arbitrary U-Boot versions or forks. s/U-Boot/Linux kernel/ Regards, Peter > > Upstream just dropped that line altogether: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e33a814e772cdc36436c8c188d8c42d019fda639 > > So, we use a little sed-grep combo to do the exact same change. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle (Essensium/Mind) > > --- > Changes v1 -> v2: > - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout) > --- > linux/linux.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/linux/linux.mk b/linux/linux.mk > index dd2eebd446..410b714360 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -268,6 +268,13 @@ endef > > LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES > > +# Older versions break on gcc 10+ because of redefined symbols > +define LINUX_DROP_YYLLOC > + $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ > + |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' > +endef > +LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC > + > # Older linux kernels use deprecated perl constructs in timeconst.pl > # that were removed for perl 5.22+ so it breaks on newer distributions > # Try a dry-run patch to see if this applies, if it does go ahead From ps.report at gmx.net Mon Jan 31 22:30:24 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 31 Jan 2022 23:30:24 +0100 Subject: [Buildroot] [PATCH v1] package/qt5base: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220131223024.22386-1-ps.report@gmx.net> - depend and link against libexecinfo if enabled to fix linking failure in case execinfo.h is detected for qlogging: qt5base-5.15.2/src/corelib/global/qlogging.cpp:110 - __has_include() - libexecinfo already depends on !BR2_TOOLCHAIN_USES_GLIBC - rename plain QT5BASE_CONFIGURE_ARCH_CONFIG to QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC Fixes: - http://autobuild.buildroot.net/results/e7c685744b1f1bebb7fec9835bda534a72b7b7c2 .../riscv64-buildroot-linux-musl/bin/ld: .../build/qt5base-5.15.2/src/corelib/global/qlogging.cpp:1398: undefined reference to `backtrace_symbols' Signed-off-by: Peter Seiderer --- package/qt5/qt5base/qt5base.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4ef3759566..59c423c49c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -234,6 +234,14 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples +# see qt5base-5.15.2/src/corelib/global/qlogging.cpp:110 - __has_include() +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +QT5BASE_DEPENDENCIES += libexecinfo +define QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO + printf '!host_build { \n LIBS += -lexecinfo\n }' >$(QT5BASE_ARCH_CONFIG_FILE) +endef +endif + ifeq ($(BR2_PACKAGE_LIBINPUT),y) QT5BASE_CONFIGURE_OPTS += -libinput QT5BASE_DEPENDENCIES += libinput @@ -282,7 +290,7 @@ endif QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) # Qt 5.8 needs atomics, which on various architectures are in -latomic -define QT5BASE_CONFIGURE_ARCH_CONFIG +define QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC printf '!host_build { \n LIBS += -latomic\n }' >$(QT5BASE_ARCH_CONFIG_FILE) endef endif @@ -305,7 +313,8 @@ define QT5BASE_CONFIGURE_CMDS $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h $(QT5BASE_CONFIGURE_CONFIG_FILE) touch $(QT5BASE_ARCH_CONFIG_FILE) - $(QT5BASE_CONFIGURE_ARCH_CONFIG) + $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC) + $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO) $(QT5BASE_CONFIGURE_HOSTCC) (cd $(@D); \ $(TARGET_MAKE_ENV) \ -- 2.34.1 From arnout at mind.be Mon Jan 31 22:43:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 31 Jan 2022 23:43:46 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/pkg-meson: separate infrastructure logic from package In-Reply-To: <20211203215438.213437-1-nolange79@gmail.com> References: <20211203215438.213437-1-nolange79@gmail.com> Message-ID: <077c8dc8-eb09-1672-615f-d86e15abf87e@mind.be> On 03/12/2021 22:54, Norbert Lange wrote: > Move all logic related to handling meson packages to the > package/pkg-meson file. This now mirrors the other build > systems and keeps the package itself clean. > > Correctly prefix variables with PKG_MESON_ > > Signed-off-by: Norbert Lange > --- > v2->v3: > - rebase, split up the moving > > v1->v2: > - squash 2 commits, really hard to separate as moving and renaming > variables from 2 to one location affects alot code. > - use TOOLCHAIN_POST_INSTALL_STAGING_HOOKS again. > - consistently use double quotes for sed patterns > > Signed-off-by: Norbert Lange > --- > package/meson/meson.mk | 38 -------------------------------------- > package/pkg-meson.mk | 40 +++++++++++++++++++++++++++++++++++++++- > 2 files changed, 39 insertions(+), 39 deletions(-) > > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index a8c846126a..5553c15d91 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -13,44 +13,6 @@ MESON_SETUP_TYPE = setuptools > HOST_MESON_DEPENDENCIES = host-ninja > HOST_MESON_NEEDS_HOST_PYTHON = python3 > > -HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) > -HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) > - > -# https://mesonbuild.com/Reference-tables.html#cpu-families > -ifeq ($(BR2_arcle)$(BR2_arceb),y) > -HOST_MESON_TARGET_CPU_FAMILY = arc > -else ifeq ($(BR2_arm)$(BR2_armeb),y) > -HOST_MESON_TARGET_CPU_FAMILY = arm > -else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) > -HOST_MESON_TARGET_CPU_FAMILY = aarch64 > -else ifeq ($(BR2_i386),y) > -HOST_MESON_TARGET_CPU_FAMILY = x86 > -else ifeq ($(BR2_m68k),y) > -HOST_MESON_TARGET_CPU_FAMILY = m68k > -else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) > -HOST_MESON_TARGET_CPU_FAMILY = microblaze > -else ifeq ($(BR2_mips)$(BR2_mipsel),y) > -HOST_MESON_TARGET_CPU_FAMILY = mips > -else ifeq ($(BR2_mips64)$(BR2_mips64el),y) > -HOST_MESON_TARGET_CPU_FAMILY = mips64 > -else ifeq ($(BR2_powerpc),y) > -HOST_MESON_TARGET_CPU_FAMILY = ppc > -else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > -HOST_MESON_TARGET_CPU_FAMILY = ppc64 > -else ifeq ($(BR2_riscv),y) > -HOST_MESON_TARGET_CPU_FAMILY = riscv64 > -else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) > -HOST_MESON_TARGET_CPU_FAMILY = sh4 > -else ifeq ($(BR2_sparc),y) > -HOST_MESON_TARGET_CPU_FAMILY = sparc > -else ifeq ($(BR2_sparc64),y) > -HOST_MESON_TARGET_CPU_FAMILY = sparc64 > -else ifeq ($(BR2_x86_64),y) > -HOST_MESON_TARGET_CPU_FAMILY = x86_64 > -else > -HOST_MESON_TARGET_CPU_FAMILY = $(ARCH) > -endif > - > # Avoid interpreter shebang longer than 128 chars > define HOST_MESON_SET_INTERPRETER > $(SED) '1s:.*:#!/usr/bin/env python3:' $(HOST_DIR)/bin/meson > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 16a90d157b..4914486665 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -185,9 +185,47 @@ meson-package = $(call inner-meson-package,$(pkgname),$(call UPPERCASE,$(pkgname > host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) > > ################################################################################ > -# Generation of the Meson cross-compilation.conf file > +# Generation of the Meson compile flags and cross-compilation file > ################################################################################ > > +# https://mesonbuild.com/Reference-tables.html#cpu-families > +ifeq ($(BR2_arcle)$(BR2_arceb),y) > +PKG_MESON_TARGET_CPU_FAMILY = arc > +else ifeq ($(BR2_arm)$(BR2_armeb),y) > +PKG_MESON_TARGET_CPU_FAMILY = arm > +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) > +PKG_MESON_TARGET_CPU_FAMILY = aarch64 > +else ifeq ($(BR2_i386),y) > +PKG_MESON_TARGET_CPU_FAMILY = x86 > +else ifeq ($(BR2_m68k),y) > +PKG_MESON_TARGET_CPU_FAMILY = m68k > +else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) > +PKG_MESON_TARGET_CPU_FAMILY = microblaze > +else ifeq ($(BR2_mips)$(BR2_mipsel),y) > +PKG_MESON_TARGET_CPU_FAMILY = mips > +else ifeq ($(BR2_mips64)$(BR2_mips64el),y) > +PKG_MESON_TARGET_CPU_FAMILY = mips64 > +else ifeq ($(BR2_powerpc),y) > +PKG_MESON_TARGET_CPU_FAMILY = ppc > +else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > +PKG_MESON_TARGET_CPU_FAMILY = ppc64 > +else ifeq ($(BR2_riscv),y) > +PKG_MESON_TARGET_CPU_FAMILY = riscv64 > +else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) > +PKG_MESON_TARGET_CPU_FAMILY = sh4 > +else ifeq ($(BR2_sparc),y) > +PKG_MESON_TARGET_CPU_FAMILY = sparc > +else ifeq ($(BR2_sparc64),y) > +PKG_MESON_TARGET_CPU_FAMILY = sparc64 > +else ifeq ($(BR2_x86_64),y) > +PKG_MESON_TARGET_CPU_FAMILY = x86_64 > +else > +PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) > +endif > + > +HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) > +HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) I moved all this to the beginning of the file, since it's (indirectly) used within inner-meson-package. Applied to master with that changed, thanks. Regards, Arnout > + > # Generate a Meson cross-compilation.conf suitable for use with the > # SDK; also install the file as a template for users to add their > # own flags if they need to. From fontaine.fabrice at gmail.com Mon Jan 31 22:52:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 31 Jan 2022 23:52:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.4.4 Message-ID: <20220131225230.178602-1-fontaine.fabrice@gmail.com> Expat 2.4.4 has been released yesterday. Besides a memory leak bugfix to xmlwf and fixes to the build system, this release is about security fixes. There are 2 CVEs involved, both related to fixed-size integer math (integer overflow) near memory allocation, not unlike what we had with 2.4.3 before. Impact is denial of service, or more. Fix CVE-2022-23852 and CVE-2022-23990 https://blog.hartwork.org/posts/expat-2-4-4-released/ https://github.com/libexpat/libexpat/blob/R_2_4_4/expat/Changes Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0853c3c76d..10e13206d0 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ -md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz -sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.4/ +md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz +sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz # Locally calculated -sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz +sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index a7ace66095..250600c25e 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.3 +EXPAT_VERSION = 2.4.4 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.34.1 From james.hilliard1 at gmail.com Mon Jan 31 22:56:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 15:56:22 -0700 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions Message-ID: <20220131225622.90226-1-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches which don't have proper version tags. Create a .git file so to trigger headers sync during configure. Hold back updating qt5webengine for now since the latest version requires significant changes to build, just tweak existing version to be compatible with latest kde versions for now. Signed-off-by: James Hilliard --- Changes v6 -> v7: - update kde versions(fixes qt5webkit build) Changes v5 -> v6: - drop upstream patches - rebase on master Changes v4 -> v5: - leave qt5webengine on current version - add minimal tweaks to qt5webengine to build with updated kde deps Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 +- ...Fix-build-with-GCC-11-include-limits.patch | 53 ------ ...avoiding-huge-number-of-tiny-dashes.patch} | 0 .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------- .../0008-Add-missing-limits-include.patch | 32 ---- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 ----- ...-intensive-painting-of-high-number-o.patch | 163 ------------------ ...-avoiding-huge-number-of-tiny-dashes.patch | 100 ----------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 +- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 +- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 +- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 ----- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 +- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 +- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +- package/qt5/qt5location-mapboxgl/Config.in | 4 + .../qt5location-mapboxgl.hash | 16 ++ .../qt5location-mapboxgl.mk | 14 ++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 +- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 +- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 +- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 +- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 +- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 +- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 +- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 +- ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 ++++++++ package/qt5/qt5webengine/qt5webengine.mk | 9 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 +- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 +- 79 files changed, 306 insertions(+), 653 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch rename package/qt5/qt5base/{0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch => 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch} (100%) delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch delete mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..3e498f6a28 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..656e3067dc 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,9 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 +QT5_VERSION = $(QT5_VERSION_MAJOR).8 QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch similarity index 100% rename from package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch rename to package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch deleted file mode 100644 index 03287d19ca..0000000000 --- a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Tue, 13 Apr 2021 14:23:45 +0200 -Subject: [PATCH] Avoid processing-intensive painting of high number of tiny - dashes - -When stroking a dashed path, an unnecessary amount of processing would -be spent if there is a huge number of dashes visible, e.g. because of -scaling. Since the dashes are too small to be indivdually visible -anyway, just replace with a semi-transparent solid line for such -cases. - -Pick-to: 6.1 6.0 5.15 -Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) - -* asturmlechner 2021-08-21: -Conflict from preceding 94dd2ceb in dev branch: - src/gui/painting/qpaintengineex.cpp - Resolved via: - - if (pen.style() > Qt::SolidLine) { - QRectF cpRect = path.controlPointRect(); - const QTransform &xf = state()->matrix; -- if (pen.isCosmetic()) { -+ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ - clipRect = d->exDeviceRect; - cpRect.translate(xf.dx(), xf.dy()); - } else { - -FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: - Resolved via: - - QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; - qreal extent = qMax(extentRect.width(), extentRect.height()); - qreal patternLength = 0; -- const QList pattern = pen.dashPattern(); -+ const QVector pattern = pen.dashPattern(); - const int patternSize = qMin(pattern.size(), 32); - for (int i = 0; i < patternSize; i++) - patternLength += qMax(pattern.at(i), qreal(0)); - -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- - .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ - 2 files changed, 69 insertions(+), 9 deletions(-) - create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 5d8f89eadd..55fdb0c2a0 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const - - Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp - --void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) -+void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - { - #ifdef QT_DEBUG_DRAW - qDebug() << "QPaintEngineEx::stroke()" << pen; -@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) - d->stroker.setCubicToHook(qpaintengineex_cubicTo); - } - -+ QRectF clipRect; -+ QPen pen = inPen; -+ if (pen.style() > Qt::SolidLine) { -+ QRectF cpRect = path.controlPointRect(); -+ const QTransform &xf = state()->matrix; -+ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ -+ clipRect = d->exDeviceRect; -+ cpRect.translate(xf.dx(), xf.dy()); -+ } else { -+ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); -+ } -+ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway -+ QRectF extentRect = cpRect & clipRect; -+ qreal extent = qMax(extentRect.width(), extentRect.height()); -+ qreal patternLength = 0; -+ const QVector pattern = pen.dashPattern(); -+ const int patternSize = qMin(pattern.size(), 32); -+ for (int i = 0; i < patternSize; i++) -+ patternLength += qMax(pattern.at(i), qreal(0)); -+ if (pen.widthF()) -+ patternLength *= pen.widthF(); -+ if (qFuzzyIsNull(patternLength)) { -+ pen.setStyle(Qt::NoPen); -+ } else if (extent / patternLength > 10000) { -+ // approximate stream of tiny dashes with semi-transparent solid line -+ pen.setStyle(Qt::SolidLine); -+ QColor color(pen.color()); -+ color.setAlpha(color.alpha() / 2); -+ pen.setColor(color); -+ } -+ } -+ - if (!qpen_fast_equals(pen, d->strokerPen)) { - d->strokerPen = pen; - d->stroker.setJoinStyle(pen.joinStyle()); -@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) - return; - } - -- if (pen.style() > Qt::SolidLine) { -- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ -- d->activeStroker->setClipRect(d->exDeviceRect); -- } else { -- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); -- d->activeStroker->setClipRect(clipRect); -- } -- } -+ if (!clipRect.isNull()) -+ d->activeStroker->setClipRect(clipRect); - - if (d->activeStroker == &d->stroker) - d->stroker.setForceOpen(path.hasExplicitOpen()); -diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps -new file mode 100644 -index 0000000000..d41ced7f5f ---- /dev/null -+++ b/tests/auto/other/lancelot/scripts/tinydashes.qps -@@ -0,0 +1,34 @@ -+# Version: 1 -+# CheckVsReference: 5% -+ -+path_addEllipse mypath 20.0 20.0 200.0 200.0 -+ -+save -+setPen blue 20 SolidLine FlatCap -+pen_setCosmetic true -+pen_setDashPattern [ 0.0004 0.0004 ] -+setBrush yellow -+ -+drawPath mypath -+translate 300 0 -+setRenderHint Antialiasing true -+drawPath mypath -+restore -+ -+path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 -+ -+setPen blue 20 DotLine FlatCap -+setBrush yellow -+ -+save -+translate 0 300 -+scale 0.0001 0.00011 -+drawPath bigpath -+restore -+ -+save -+translate 300 300 -+setRenderHint Antialiasing true -+scale 0.0001 0.00011 -+drawPath bigpath -+restore --- -2.34.1 - diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index ca3c2736ae..0000000000 --- a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 30 Jul 2021 13:03:49 +0200 -Subject: [PATCH] Refix for avoiding huge number of tiny dashes - -Previous fix hit too widely so some valid horizontal and vertical -lines were affected; the root problem being that such lines have an -empty control point rect (width or height is 0). Fix by caculating in -the pen width. - -Pick-to: 6.2 6.1 5.15 -Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 8 ++--- - .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ - 2 files changed, 35 insertions(+), 4 deletions(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 19e4b23423..9fe510827a 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); - } - // Check to avoid generating unwieldy amount of dashes that will not be visible anyway -- QRectF extentRect = cpRect & clipRect; -+ qreal pw = pen.widthF() ? pen.widthF() : 1; -+ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; - qreal extent = qMax(extentRect.width(), extentRect.height()); - qreal patternLength = 0; - const QVector pattern = pen.dashPattern(); - const int patternSize = qMin(pattern.size(), 32); - for (int i = 0; i < patternSize; i++) - patternLength += qMax(pattern.at(i), qreal(0)); -- if (pen.widthF()) -- patternLength *= pen.widthF(); -+ patternLength *= pw; - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { -+ } else if (extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); -diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -index 42e98ce363..d7c3f95f1d 100644 ---- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -@@ -308,6 +308,7 @@ private slots: - void fillPolygon(); - - void drawImageAtPointF(); -+ void scaledDashes(); - - private: - void fillData(); -@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() - paint.end(); - } - -+void tst_QPainter::scaledDashes() -+{ -+ // Test that we do not hit the limit-huge-number-of-dashes path -+ QRgb fore = qRgb(0, 0, 0xff); -+ QRgb back = qRgb(0xff, 0xff, 0); -+ QImage image(5, 32, QImage::Format_RGB32); -+ image.fill(back); -+ QPainter p(&image); -+ QPen pen(QColor(fore), 3, Qt::DotLine); -+ p.setPen(pen); -+ p.scale(1, 2); -+ p.drawLine(2, 0, 2, 16); -+ p.end(); -+ -+ bool foreFound = false; -+ bool backFound = false; -+ int i = 0; -+ while (i < 32 && (!foreFound || !backFound)) { -+ QRgb pix = image.pixel(3, i); -+ if (pix == fore) -+ foreFound = true; -+ else if (pix == back) -+ backFound = true; -+ i++; -+ } -+ -+ QVERIFY(foreFound); -+ QVERIFY(backFound); -+} -+ - QTEST_MAIN(tst_QPainter) - - #include "tst_qpainter.moc" --- -2.34.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..396f5044ff 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4ef3759566..d8a0bf1d16 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..adda7e03ba 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..e63a78021a 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..766fd69077 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f0315b0f0301fdb16d6ee78c57e3cd600121884c1356ca1160ace96a57ac17bc qtquickcontrols2-d8d6b14b9907adbc6ce307d52be34aaa761a58fa.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..ff1a49a9ce 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = d8d6b14b9907adbc6ce307d52be34aaa761a58fa +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..1e4dc54c67 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..849a2b7f1b 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 728012f7762ecd5762d493f8796907c6456f31e7 +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..432e3099c3 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 a91024f241df0d24ee398c262b61d126d451c70f05ef109901cfb483d1201538 qtvirtualkeyboard-98d1fd864cbb6c7c012c4139118808af110fb8f0.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..8e997a2426 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 98d1fd864cbb6c7c012c4139118808af110fb8f0 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..1a7400de67 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..bcc4915022 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..cebd6d0fe2 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,8 +4,9 @@ # ################################################################################ -QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) +QT5WEBENGINE_VERSION_MAJOR = 5.15 +QT5WEBENGINE_VERSION = $(QT5WEBENGINE_VERSION_MAJOR).2 +QT5WEBENGINE_SITE = https://download.qt.io/archive/qt/$(QT5WEBENGINE_VERSION_MAJOR)/$(QT5WEBENGINE_VERSION)/submodules QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ @@ -44,7 +45,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From arnout at mind.be Mon Jan 31 23:00:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 00:00:58 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/pkg-meson: improve generation of cross-compilation file In-Reply-To: <20211203215438.213437-2-nolange79@gmail.com> References: <20211203215438.213437-1-nolange79@gmail.com> <20211203215438.213437-2-nolange79@gmail.com> Message-ID: <44572e0d-1989-106f-65fa-4b784427e15b@mind.be> On 03/12/2021 22:54, Norbert Lange wrote: > Removed a few variables, as they were only used to communicate > between the meson package and pkg-meson.mk and are not needed > anymore. > > Moved cross-compilation.conf.in out of meson package. > > Creating the cross-compilation.conf files for packages is now > using the original template. > To avoid duplicate code, the common sed pattern is stored in > a make variable. > > Use explicit Buildroot variables for compiler tools, > and some fixes. (TARGET_LDFLAGS and TARGET_CXXFLAGS > were mixed up with PKG_TARGET_CFLAGS) > > Signed-off-by: Norbert Lange Applied to master, but see below. > --- > v2->v3: > - rebase > > v1->v2: > - squash 2 commits, really hard to separate as moving and renaming > variables from 2 to one location affects alot code. > - use TOOLCHAIN_POST_INSTALL_STAGING_HOOKS again. > - consistently use double quotes for sed patterns > > Signed-off-by: Norbert Lange > --- > package/pkg-meson.mk | 58 +++++++++---------- > .../misc}/cross-compilation.conf.in | 10 ++-- > 2 files changed, 33 insertions(+), 35 deletions(-) > rename {package/meson => support/misc}/cross-compilation.conf.in (84%) > > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 4914486665..77dc2b46b0 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -67,19 +67,9 @@ $(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS) > define $(2)_CONFIGURE_CMDS > rm -rf $$($$(PKG)_SRCDIR)/build > mkdir -p $$($$(PKG)_SRCDIR)/build > - sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%g' \ > - -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ > - -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ > - -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ > - -e "s%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g" \ > - -e "s%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g" \ > - -e "s%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g" \ > - -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ > - -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ > - -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ > - -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ > + sed -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ > -e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \ > - package/meson/cross-compilation.conf.in \ > + $$(call PKG_MESON_CROSSCONFIG_SED,$(2)_CFLAGS,$(2)_CXXFLAGS,$(2)_LDFLAGS) \ > > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf > PATH=$$(BR_PATH) \ > CC_FOR_BUILD="$$(HOSTCC)" \ > @@ -223,31 +213,39 @@ else > PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) > endif > > -HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) > -HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) > +# Generates sed patterns for patching the cross-compilation.conf template, > +# since Flags might contain commas the arguments are passed indirectly by > +# variable name (stripped to deal with whitespaces). > +# Arguments are variable containing cflags, cxxflags, ldflags. > +define PKG_MESON_CROSSCONFIG_SED > + -e "s%@TARGET_CC@%$(TARGET_CC)%g" \ > + -e "s%@TARGET_CXX@%$(TARGET_CXX)%g" \ > + -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ > + -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ > + -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ > + -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ > + -e "s%@TARGET_ENDIAN@%$(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN)))%g" \ > + -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ > + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ > + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ > + -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ > + -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ > + -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ > + $(TOPDIR)/support/misc/cross-compilation.conf.in > +endef > > # Generate a Meson cross-compilation.conf suitable for use with the > # SDK; also install the file as a template for users to add their > # own flags if they need to. > define PKG_MESON_INSTALL_CROSS_CONF > mkdir -p $(HOST_DIR)/etc/meson > - sed -e 's%@TARGET_CROSS@%$(TARGET_CROSS)%g' \ > - -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ > - -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ > - -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ > - -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ > - -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g" \ > - -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g" \ > - -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ > - -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ > - -e 's%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g' \ > - $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > + sed -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ > + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_LDFLAGS@%g" \ > + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CXXFLAGS@%g" \ > + $(call PKG_MESON_CROSSCONFIG_SED) \ This could have been $(call PKG_MESON_CROSSCONFIG_SED,$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@,$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CXXFLAGS@,$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_LDFLAGS@) which is of course completely unreadable. While looking at this, however, I noticed that there's something wrong with the cross-compilation.conf.in we generate. It contains this: c_args = ['-D_LARGEFILE_SOURCE', ..., '-D_FORTIFY_SOURCE=1'@PKG_TARGET_CFLAGS@] c_link_args = [@PKG_TARGET_CFLAGS@] which means that @PKG_TARGET_CFLAGS@ can't be replaced with anything sane: in c_args, it must start with a comma, but in c_link_args it must not start with comma. But this was already wrong before this patch. In fact, this was already a problem since the very time that Peter introduced PKG_TARGET_CFLAGS. I'm not sure what to do about it. > > $(HOST_DIR)/etc/meson/cross-compilation.conf.in > - sed -e 's%@PKG_TARGET_CFLAGS@%%g' \ > - -e 's%@PKG_TARGET_LDFLAGS@%%g' \ > - -e 's%@PKG_TARGET_CXXFLAGS@%%g' \ > - $(HOST_DIR)/etc/meson/cross-compilation.conf.in \ > + sed $(call PKG_MESON_CROSSCONFIG_SED,TARGET_CFLAGS,TARGET_CXXFLAGS,TARGET_LDFLAGS) \ > > $(HOST_DIR)/etc/meson/cross-compilation.conf > endef > > -TOOLCHAIN_TARGET_FINALIZE_HOOKS += PKG_MESON_INSTALL_CROSS_CONF > +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += PKG_MESON_INSTALL_CROSS_CONF This change (do it in post-install-staging instead of target-finalize) is not explained in the commit message, and it reverts an earlier change [1]. So I reverted that part. Regards, Arnout [1] https://lore.kernel.org/buildroot/20191204150225.33749-1-thomas.petazzoni at bootlin.com/ > diff --git a/package/meson/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > similarity index 84% > rename from package/meson/cross-compilation.conf.in > rename to support/misc/cross-compilation.conf.in > index 7a7ece97ae..18cf258a8e 100644 > --- a/package/meson/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -4,11 +4,11 @@ > # - Buildroot's 'target' is Meson's 'host' > > [binaries] > -c = '@TARGET_CROSS at gcc' > -cpp = '@TARGET_CROSS at g++' > -ar = '@TARGET_CROSS at ar' > -strip = '@TARGET_CROSS at strip' > -pkgconfig = '@HOST_DIR@/bin/pkgconf' > +c = '@TARGET_CC@' > +cpp = '@TARGET_CXX@' > +ar = '@TARGET_AR@' > +strip = '@TARGET_STRIP@' > +pkgconfig = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > From arnout at mind.be Mon Jan 31 21:21:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 22:21:05 +0100 Subject: [Buildroot] [git commit] package/pkg-meson: separate infrastructure logic from package Message-ID: <20220131225416.D227C82803@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56e31ff9dbbff8774c29875cf4316e403cb89691 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Move all logic related to handling meson packages to the package/pkg-meson file. This now mirrors the other build systems and keeps the package itself clean. Correctly prefix variables with PKG_MESON_ Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.mk | 38 -------------------------------------- package/pkg-meson.mk | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e63dc725bf..6c0d1ab08e 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -13,44 +13,6 @@ MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja HOST_MESON_NEEDS_HOST_PYTHON = python3 -HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) -HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) - -# https://mesonbuild.com/Reference-tables.html#cpu-families -ifeq ($(BR2_arcle)$(BR2_arceb),y) -HOST_MESON_TARGET_CPU_FAMILY = arc -else ifeq ($(BR2_arm)$(BR2_armeb),y) -HOST_MESON_TARGET_CPU_FAMILY = arm -else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) -HOST_MESON_TARGET_CPU_FAMILY = aarch64 -else ifeq ($(BR2_i386),y) -HOST_MESON_TARGET_CPU_FAMILY = x86 -else ifeq ($(BR2_m68k),y) -HOST_MESON_TARGET_CPU_FAMILY = m68k -else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) -HOST_MESON_TARGET_CPU_FAMILY = microblaze -else ifeq ($(BR2_mips)$(BR2_mipsel),y) -HOST_MESON_TARGET_CPU_FAMILY = mips -else ifeq ($(BR2_mips64)$(BR2_mips64el),y) -HOST_MESON_TARGET_CPU_FAMILY = mips64 -else ifeq ($(BR2_powerpc),y) -HOST_MESON_TARGET_CPU_FAMILY = ppc -else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) -HOST_MESON_TARGET_CPU_FAMILY = ppc64 -else ifeq ($(BR2_riscv),y) -HOST_MESON_TARGET_CPU_FAMILY = riscv64 -else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) -HOST_MESON_TARGET_CPU_FAMILY = sh4 -else ifeq ($(BR2_sparc),y) -HOST_MESON_TARGET_CPU_FAMILY = sparc -else ifeq ($(BR2_sparc64),y) -HOST_MESON_TARGET_CPU_FAMILY = sparc64 -else ifeq ($(BR2_x86_64),y) -HOST_MESON_TARGET_CPU_FAMILY = x86_64 -else -HOST_MESON_TARGET_CPU_FAMILY = $(ARCH) -endif - # Avoid interpreter shebang longer than 128 chars define HOST_MESON_SET_INTERPRETER $(SED) '1s:.*:#!/usr/bin/env python3:' $(HOST_DIR)/bin/meson diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index ec535174b6..91f0f3244b 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -29,6 +29,44 @@ MESON = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/meson NINJA = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/ninja NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) +# https://mesonbuild.com/Reference-tables.html#cpu-families +ifeq ($(BR2_arcle)$(BR2_arceb),y) +PKG_MESON_TARGET_CPU_FAMILY = arc +else ifeq ($(BR2_arm)$(BR2_armeb),y) +PKG_MESON_TARGET_CPU_FAMILY = arm +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) +PKG_MESON_TARGET_CPU_FAMILY = aarch64 +else ifeq ($(BR2_i386),y) +PKG_MESON_TARGET_CPU_FAMILY = x86 +else ifeq ($(BR2_m68k),y) +PKG_MESON_TARGET_CPU_FAMILY = m68k +else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) +PKG_MESON_TARGET_CPU_FAMILY = microblaze +else ifeq ($(BR2_mips)$(BR2_mipsel),y) +PKG_MESON_TARGET_CPU_FAMILY = mips +else ifeq ($(BR2_mips64)$(BR2_mips64el),y) +PKG_MESON_TARGET_CPU_FAMILY = mips64 +else ifeq ($(BR2_powerpc),y) +PKG_MESON_TARGET_CPU_FAMILY = ppc +else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) +PKG_MESON_TARGET_CPU_FAMILY = ppc64 +else ifeq ($(BR2_riscv),y) +PKG_MESON_TARGET_CPU_FAMILY = riscv64 +else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) +PKG_MESON_TARGET_CPU_FAMILY = sh4 +else ifeq ($(BR2_sparc),y) +PKG_MESON_TARGET_CPU_FAMILY = sparc +else ifeq ($(BR2_sparc64),y) +PKG_MESON_TARGET_CPU_FAMILY = sparc64 +else ifeq ($(BR2_x86_64),y) +PKG_MESON_TARGET_CPU_FAMILY = x86_64 +else +PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) +endif + +HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) +HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) + ################################################################################ # inner-meson-package -- defines how the configuration, compilation and # installation of a Meson package should be done, implements a few hooks to @@ -181,7 +219,7 @@ meson-package = $(call inner-meson-package,$(pkgname),$(call UPPERCASE,$(pkgname host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) ################################################################################ -# Generation of the Meson cross-compilation.conf file +# Generation of the Meson compile flags and cross-compilation file ################################################################################ # Generate a Meson cross-compilation.conf suitable for use with the From arnout at mind.be Mon Jan 31 22:36:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 23:36:11 +0100 Subject: [Buildroot] [git commit] package/pkg-meson: improve generation of cross-compilation file Message-ID: <20220131225416.DEC9B80F72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=675f02fd3f0b11b24eab62b781038e492c40bf90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed a few variables, as they were only used to communicate between the meson package and pkg-meson.mk and are not needed anymore. Moved cross-compilation.conf.in out of meson package. Creating the cross-compilation.conf files for packages is now using the original template. To avoid duplicate code, the common sed pattern is stored in a make variable. Use explicit Buildroot variables for compiler tools, and some fixes. (TARGET_LDFLAGS and TARGET_CXXFLAGS were mixed up with PKG_TARGET_CFLAGS) Signed-off-by: Norbert Lange [Arnout: keep PKG_MESON_INSTALL_CROSS_CONF in TOOLCHAIN_TARGET_FINALIZE_HOOKS] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-meson.mk | 56 +++++++++++----------- .../misc}/cross-compilation.conf.in | 10 ++-- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 91f0f3244b..85de98e03a 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -64,8 +64,26 @@ else PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) endif -HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) -HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) +# Generates sed patterns for patching the cross-compilation.conf template, +# since Flags might contain commas the arguments are passed indirectly by +# variable name (stripped to deal with whitespaces). +# Arguments are variable containing cflags, cxxflags, ldflags. +define PKG_MESON_CROSSCONFIG_SED + -e "s%@TARGET_CC@%$(TARGET_CC)%g" \ + -e "s%@TARGET_CXX@%$(TARGET_CXX)%g" \ + -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ + -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ + -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ + -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ + -e "s%@TARGET_ENDIAN@%$(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN)))%g" \ + -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ + -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ + -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ + $(TOPDIR)/support/misc/cross-compilation.conf.in +endef ################################################################################ # inner-meson-package -- defines how the configuration, compilation and @@ -101,19 +119,9 @@ $(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS) define $(2)_CONFIGURE_CMDS rm -rf $$($$(PKG)_SRCDIR)/build mkdir -p $$($$(PKG)_SRCDIR)/build - sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%g' \ - -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ - -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ - -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e "s%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g" \ - -e "s%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g" \ - -e "s%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g" \ - -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ - -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ - -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ - -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ + sed -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ -e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \ - package/meson/cross-compilation.conf.in \ + $$(call PKG_MESON_CROSSCONFIG_SED,$(2)_CFLAGS,$(2)_CXXFLAGS,$(2)_LDFLAGS) \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf PATH=$$(BR_PATH) \ CC_FOR_BUILD="$$(HOSTCC)" \ @@ -227,22 +235,12 @@ host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE # own flags if they need to. define PKG_MESON_INSTALL_CROSS_CONF mkdir -p $(HOST_DIR)/etc/meson - sed -e 's%@TARGET_CROSS@%$(TARGET_CROSS)%g' \ - -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ - -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ - -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ - -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g" \ - -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g" \ - -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ - -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ - -e 's%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g' \ - $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ + sed -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_LDFLAGS@%g" \ + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CXXFLAGS@%g" \ + $(call PKG_MESON_CROSSCONFIG_SED) \ > $(HOST_DIR)/etc/meson/cross-compilation.conf.in - sed -e 's%@PKG_TARGET_CFLAGS@%%g' \ - -e 's%@PKG_TARGET_LDFLAGS@%%g' \ - -e 's%@PKG_TARGET_CXXFLAGS@%%g' \ - $(HOST_DIR)/etc/meson/cross-compilation.conf.in \ + sed $(call PKG_MESON_CROSSCONFIG_SED,TARGET_CFLAGS,TARGET_CXXFLAGS,TARGET_LDFLAGS) \ > $(HOST_DIR)/etc/meson/cross-compilation.conf endef diff --git a/package/meson/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in similarity index 84% rename from package/meson/cross-compilation.conf.in rename to support/misc/cross-compilation.conf.in index 7a7ece97ae..18cf258a8e 100644 --- a/package/meson/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -4,11 +4,11 @@ # - Buildroot's 'target' is Meson's 'host' [binaries] -c = '@TARGET_CROSS at gcc' -cpp = '@TARGET_CROSS at g++' -ar = '@TARGET_CROSS at ar' -strip = '@TARGET_CROSS at strip' -pkgconfig = '@HOST_DIR@/bin/pkgconf' +c = '@TARGET_CC@' +cpp = '@TARGET_CXX@' +ar = '@TARGET_AR@' +strip = '@TARGET_STRIP@' +pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' From fontaine.fabrice at gmail.com Mon Jan 31 23:00:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 00:00:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/iproute2: fix musl build Message-ID: <20220131230015.181368-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since bump to version 5.16.0 in commit 8f54d6d7859c0eabf303a44b26e6fafb1cb50143: ax25_ntop.c:5:10: fatal error: netax25/ax25.h: No such file or directory 5 | #include | ^~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/455840288bbe13ed585b0e2dc7b20a294dd1eee1 Signed-off-by: Fabrice Fontaine --- ...0001-lib-fix-ax25-h-include-for-musl.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch diff --git a/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch b/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch new file mode 100644 index 0000000000..1f8860c5d8 --- /dev/null +++ b/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch @@ -0,0 +1,37 @@ +From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 13 Jan 2022 08:14:13 +0000 +Subject: [PATCH] lib: fix ax25.h include for musl + +ax25.h isn't guaranteed to be avilable in netax25/*; +it's dependent on our choice of libc (it's not available +on musl at least) [0]. + +Let's use the version from linux-headers. + +[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers +Bug: https://bugs.gentoo.org/831102 + +Signed-off-by: Sam James +Signed-off-by: Stephen Hemminger + +[Retrieved from: +https://github.com/shemminger/iproute2/commit/8bced38a941a181f1468fa39541e872e51b6022f] +Signed-off-by: Fabrice Fontaine +--- + lib/ax25_ntop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c +index cfd0e04b0..3a72a43e9 100644 +--- a/lib/ax25_ntop.c ++++ b/lib/ax25_ntop.c +@@ -2,7 +2,7 @@ + + #include + #include +-#include ++#include + + #include "utils.h" + -- 2.34.1 From petr.vorel at gmail.com Mon Jan 31 23:05:19 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Tue, 1 Feb 2022 00:05:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/iproute2: fix musl build In-Reply-To: <20220131230015.181368-1-fontaine.fabrice@gmail.com> References: <20220131230015.181368-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, good catch! Reviewed-by: Petr Vorel ... > diff --git a/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch b/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch ... > +[Retrieved from: > +https://github.com/shemminger/iproute2/commit/8bced38a941a181f1468fa39541e872e51b6022f] I'd use URL from primary git: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8bced38a941a181f1468fa39541e872e51b6022f Kind regards, Petr From ps.report at gmx.net Mon Jan 31 23:07:30 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 1 Feb 2022 00:07:30 +0100 Subject: [Buildroot] [PATCH v1] package/libcamera: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220131230730.22235-1-ps.report@gmx.net> - depend and link against libexecinfo if enabled to fix linking failure in case execinfo.h is detected, see libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8/meson.build: 32 if cc.has_header_symbol('execinfo.h', 'backtrace') 33 config_h.set('HAVE_BACKTRACE', 1) 34 endif - libexecinfo already depends on !BR2_TOOLCHAIN_USES_GLIBC Fixes: - http://autobuild.buildroot.net/results/a1077815895ab847c5ca82ec17c7d13fe97cff53 .../powerpc-buildroot-linux-uclibc/bin/ld: src/libcamera/base/libcamera-base.so.p/log.cpp.o: in function `libcamera::Logger::backtrace()': log.cpp:(.text+0x34b0): undefined reference to `backtrace' .../powerpc-buildroot-linux-uclibc/bin/ld: log.cpp:(.text+0x34c0): undefined reference to `backtrace_symbols' Signed-off-by: Peter Seiderer --- package/libcamera/libcamera.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 524cf07e03..9be45d248a 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -99,4 +99,9 @@ else LIBCAMERA_CONF_OPTS += -Dtracing=disabled endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LIBCAMERA_DEPENDENCIES += libexecinfo +LIBCAMERA_LDFLAGS += -lexecinfo +endif + $(eval $(meson-package)) -- 2.34.1 From james.hilliard1 at gmail.com Sat Jan 1 00:04:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 17:04:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency Message-ID: <20220101000408.1538099-1-james.hilliard1@gmail.com> Fixes: File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in ModuleNotFoundError: No module named 'aiosignal' Signed-off-by: James Hilliard --- package/python-aiohttp/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 9ffea088e4..85a6862141 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_AIOHTTP bool "python-aiohttp" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIODNS # runtime + select BR2_PACKAGE_PYTHON_AIOSIGNAL # runtime select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 00:31:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 17:31:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-sse: bump to version 2.1.0 Message-ID: <20220101003125.1957739-1-james.hilliard1@gmail.com> License hash change due to full text removal: https://github.com/aio-libs/aiohttp-sse/commit/307fd35a84a66b7fb5adfd70cd5b7d709fa8508c Fixes(python 3.10 compatibility): File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 107, in wait File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 144, in _ping TypeError: sleep() got an unexpected keyword argument 'loop' Signed-off-by: James Hilliard --- package/python-aiohttp-sse/python-aiohttp-sse.hash | 6 +++--- package/python-aiohttp-sse/python-aiohttp-sse.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.hash b/package/python-aiohttp-sse/python-aiohttp-sse.hash index 2f21da462e..224601450c 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.hash +++ b/package/python-aiohttp-sse/python-aiohttp-sse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-sse/json -md5 d2f394fb75f591045b2c94fc17c8533d aiohttp-sse-2.0.0.tar.gz -sha256 547e1eaa129749f090d02b31956215edbcde74ce99721f5f0ac902a9ccb1202e aiohttp-sse-2.0.0.tar.gz +md5 822cd0c30325e8a711101c1a1ede4058 aiohttp-sse-2.1.0.tar.gz +sha256 dfe8f7271ab4470891fa1bfa1913d6889b3d19015dd3d3a4cab949e66971bbca aiohttp-sse-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE +sha256 5585eb91ec607b4fdbe97d44a61146a9cc27bb703336628bc3c6a1eaffe60307 LICENSE diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.mk b/package/python-aiohttp-sse/python-aiohttp-sse.mk index 7a7a0d0a70..2aef1579f5 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.mk +++ b/package/python-aiohttp-sse/python-aiohttp-sse.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SSE_VERSION = 2.0.0 +PYTHON_AIOHTTP_SSE_VERSION = 2.1.0 PYTHON_AIOHTTP_SSE_SOURCE = aiohttp-sse-$(PYTHON_AIOHTTP_SSE_VERSION).tar.gz -PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2b/50/e127729f7df53c32c96b5c71932a7262cad40c83f1e19c218b068c816d51 +PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2f/3f/cc4f5a3fe6cb50ad5b9d26bb7738c5da1f61645b517d4230df2fc32d89f0 PYTHON_AIOHTTP_SSE_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SSE_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SSE_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 00:40:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 17:40:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: bump to version 3.8.1 Message-ID: <20220101004032.1986569-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiohttp/python-aiohttp.hash | 4 ++-- package/python-aiohttp/python-aiohttp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index 90dbd75994..b2b0f8c937 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 4743950052dbaf5ce5c3622754ebceae aiohttp-3.8.0.tar.gz -sha256 d3b19d8d183bcfd68b25beebab8dc3308282fe2ca3d6ea3cb4cd101b3c279f8d aiohttp-3.8.0.tar.gz +md5 faf7726dc65a940272874c0f441e8ec6 aiohttp-3.8.1.tar.gz +sha256 fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578 aiohttp-3.8.1.tar.gz # Locally computed sha256 checksums sha256 383c70c090b60ae81e035fe4fafed689b45c4421cd3bc355f1bd41ac208ccf3f LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 03501a7527..5a2d306438 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.8.0 +PYTHON_AIOHTTP_VERSION = 3.8.1 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/48/1a/ba9542a545aed4b0b6ef128561f68dd3c2812ff5abfa9ed5b96547a728ea +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/5a/86/5f63de7a202550269a617a5d57859a2961f3396ecd1739a70b92224766bc PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 04:49:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 21:49:13 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-remotes: bump to version 1.1.0 Message-ID: <20220101044913.1990522-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiohttp-remotes/python-aiohttp-remotes.hash | 4 ++-- package/python-aiohttp-remotes/python-aiohttp-remotes.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index a9a6cad2df..595340d5d8 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 e90fad4b7aa088207f831698fddd9eea aiohttp_remotes-1.0.0.tar.gz -sha256 caec1681de70bac82daa676078d9b125758fb3952fdaa893a6b42bdd995562ef aiohttp_remotes-1.0.0.tar.gz +md5 da13880f25ec3b9cf98c7baff92835a2 aiohttp_remotes-1.1.0.tar.gz +sha256 e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174 aiohttp_remotes-1.1.0.tar.gz # Locally computed sha256 checksums sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index f04cecd89d..e2bc3e1c18 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.0.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.1.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/40/b6/1178bd1e26e88f9f29b7d1bbfae7b38d39ec9cf787d4685f83ade2e7aa7f +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/e3/fc/5523010172e2d8685a8934fbb49d564118c9ebc1e4233a62b77310f979db PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 05:01:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 22:01:52 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiosignal: bump to version 1.2.0 Message-ID: <20220101050152.1991600-1-james.hilliard1@gmail.com> License file renamed in: https://github.com/aio-libs/aiosignal/commit/98b25a33d08821a2948d334b223e2874979f5bd4 Signed-off-by: James Hilliard --- package/python-aiosignal/python-aiosignal.hash | 6 +++--- package/python-aiosignal/python-aiosignal.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-aiosignal/python-aiosignal.hash b/package/python-aiosignal/python-aiosignal.hash index 3fdd459502..f2a09749b8 100644 --- a/package/python-aiosignal/python-aiosignal.hash +++ b/package/python-aiosignal/python-aiosignal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosignal/json -md5 f3edf1b700b4fee6ea6ed375c3f6555c aiosignal-1.1.2.tar.gz -sha256 15605698a0401075a03d36cea979e3c0e6cf8467a9e3b9047040514dd9e6f43b aiosignal-1.1.2.tar.gz +md5 011700c3acc576a3a38deade6a4860cb aiosignal-1.2.0.tar.gz +sha256 78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2 aiosignal-1.2.0.tar.gz # Locally computed sha256 checksums -sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt +sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-aiosignal/python-aiosignal.mk b/package/python-aiosignal/python-aiosignal.mk index ea11d97060..e0436e973e 100644 --- a/package/python-aiosignal/python-aiosignal.mk +++ b/package/python-aiosignal/python-aiosignal.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_AIOSIGNAL_VERSION = 1.1.2 +PYTHON_AIOSIGNAL_VERSION = 1.2.0 PYTHON_AIOSIGNAL_SOURCE = aiosignal-$(PYTHON_AIOSIGNAL_VERSION).tar.gz -PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/ac/f7/c3df3b7eac6ea96175e0817b272b43b398d5ba589be09a50d1b758d5b852 +PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/27/6b/a89fbcfae70cf53f066ec22591938296889d3cc58fec1e1c393b10e8d71d PYTHON_AIOSIGNAL_SETUP_TYPE = setuptools PYTHON_AIOSIGNAL_LICENSE = Apache-2.0 -PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE.txt +PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE $(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 05:16:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 22:16:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-async-timeout: bump to version 4.0.2 Message-ID: <20220101051608.1993550-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-async-timeout/python-async-timeout.hash | 4 ++-- package/python-async-timeout/python-async-timeout.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-async-timeout/python-async-timeout.hash b/package/python-async-timeout/python-async-timeout.hash index 1a64c3a77d..0ecf1ef5ae 100644 --- a/package/python-async-timeout/python-async-timeout.hash +++ b/package/python-async-timeout/python-async-timeout.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/async-timeout/json -md5 2871f3853060ac7e76e6278b85dfb3c9 async-timeout-4.0.0.tar.gz -sha256 7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382 async-timeout-4.0.0.tar.gz +md5 10571272b2e0fab839ec23f8293bf482 async-timeout-4.0.2.tar.gz +sha256 2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15 async-timeout-4.0.2.tar.gz # Locally computed sha256 checksums sha256 e18d7bb8f513e2c46bb585c94b585bd30720dd3ccb21ddb0786f72d16658f92c LICENSE diff --git a/package/python-async-timeout/python-async-timeout.mk b/package/python-async-timeout/python-async-timeout.mk index 1d2c716fa9..b3c5f79e45 100644 --- a/package/python-async-timeout/python-async-timeout.mk +++ b/package/python-async-timeout/python-async-timeout.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.0 +PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.2 PYTHON_ASYNC_TIMEOUT_SOURCE = async-timeout-$(PYTHON_ASYNC_TIMEOUT_VERSION).tar.gz -PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/28/0c/1cd218ea84964f0740a3ab6152dfa99661174abdd8e4053e06c0285ac42a +PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/54/6e/9678f7b2993537452710ffb1750c62d2c26df438aa621ad5fa9d1507a43a PYTHON_ASYNC_TIMEOUT_LICENSE = Apache-2.0 PYTHON_ASYNC_TIMEOUT_LICENSE_FILES = LICENSE PYTHON_ASYNC_TIMEOUT_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 05:20:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 22:20:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiorwlock: bump to version 1.2.0 Message-ID: <20220101052032.1994475-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index bddc846a5b..fad7079789 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 066260ea2c6798f6e18258d4430031bb aiorwlock-1.1.0.tar.gz -sha256 2aaf1d1cc995abfd5b2f07ca0e9b5c23bd369517c75495a347eb5896bc307f29 aiorwlock-1.1.0.tar.gz +md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz +sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index acc6f90158..4ba4965eb5 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.1.0 +PYTHON_AIORWLOCK_VERSION = 1.2.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/ca/e5/3221d49edb432024f6b1b7e9e36cad6363601973375667477f2130d5da7d +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 05:32:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 31 Dec 2021 22:32:21 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-session: bump to version 2.10.0 Message-ID: <20220101053221.1995791-1-james.hilliard1@gmail.com> License hash changed due to full text removal: https://github.com/aio-libs/aiohttp-session/commit/6a1c7f0efe006425b5387b089f4d39bc48765ed7 Signed-off-by: James Hilliard --- package/python-aiohttp-session/python-aiohttp-session.hash | 6 +++--- package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index f10827b616..3842f0c7af 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.hash +++ b/package/python-aiohttp-session/python-aiohttp-session.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-session/json -md5 993ec277ece4765472d0edc0f6c0bba3 aiohttp-session-2.9.0.tar.gz -sha256 959413468b84e30e7ca09719617cfb0000066a2e0f6c20062d043433e82aeb74 aiohttp-session-2.9.0.tar.gz +md5 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz +sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz # Locally computed sha256 checksums -sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE +sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index fa724fdb86..a28b1ae143 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/package/python-aiohttp-session/python-aiohttp-session.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SESSION_VERSION = 2.9.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.10.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/f8/fe/53dfd35f5c7fcc7f2d0866cb29e722303e3fae7f749c1f3d4d11d361dc38 +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 08:06:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 01:06:20 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.3.3 Message-ID: <20220101080620.1997183-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 45139a6606..26a3778756 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 b8cbcb6e00d8e535256526dfe4f27db3 aioconsole-0.3.2.tar.gz -sha256 9355b36d41d5fbdd3dbb01510deb2b985b508b2ebcd5b8bd85af61a707e2f6c8 aioconsole-0.3.2.tar.gz +md5 f8b67330e631cfc45a9b2560a6e0fa98 aioconsole-0.3.3.tar.gz +sha256 47df42d9f8cc3995bbe032dd5f01d32cc5b06639e9078bb9b4e3c55b237f5e32 aioconsole-0.3.3.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 75ea3c2a2a..f06d91a550 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.2 +PYTHON_AIOCONSOLE_VERSION = 0.3.3 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/7a/b2/747ab3cb965596cd84c5159941613d901d8771acad3c51c4f5da362aa9f0 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/dd/f6/bbc451ba96c1e1da6aa253f254b181ceb03272b475b27b481b57865d7d7f PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 08:09:43 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 01:09:43 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiofiles: bump to version 0.8.0 Message-ID: <20220101080943.1998115-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiofiles/python-aiofiles.hash | 4 ++-- package/python-aiofiles/python-aiofiles.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiofiles/python-aiofiles.hash b/package/python-aiofiles/python-aiofiles.hash index a5c140606b..268136a406 100644 --- a/package/python-aiofiles/python-aiofiles.hash +++ b/package/python-aiofiles/python-aiofiles.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiofiles/json -md5 a2dd24e2ca8d7b7e7dbacd6381da748a aiofiles-0.7.0.tar.gz -sha256 a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4 aiofiles-0.7.0.tar.gz +md5 697deeb4fdcb620c45f114f173ed7c0d aiofiles-0.8.0.tar.gz +sha256 8334f23235248a3b2e83b2c3a78a22674f39969b96397126cc93664d9a901e59 aiofiles-0.8.0.tar.gz # Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index e43cf9a484..996e5eb6c0 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOFILES_VERSION = 0.7.0 +PYTHON_AIOFILES_VERSION = 0.8.0 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz -PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/06/f0/af90f3fb4066b0707b6a5af3ffd5fd9b3809bbb52f0153a3c7550e594de3 +PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/10/ca/c416cfacf6a47e1400dad56eab85aa86c92c6fbe58447d12035e434f0d5c PYTHON_AIOFILES_SETUP_TYPE = setuptools PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 1 08:35:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:35:49 +0100 Subject: [Buildroot] [git commit] package/flare-game: really use LICENSE.txt as license file Message-ID: <20220101083153.3282D8120D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7684604188f829820f96ced628137ff880e302f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The previous version bump [1] added the hash of LICENSE.txt but forgot to update FLARE_GAME_LICENSE_FILES. [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/flare-game/flare-game.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index d65e3d6c38..2845dc9714 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -8,7 +8,7 @@ FLARE_GAME_VERSION = 1.11 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) -FLARE_GAME_LICENSE_FILES = README +FLARE_GAME_LICENSE_FILES = LICENSE.txt FLARE_GAME_DEPENDENCIES = flare-engine From yann.morin.1998 at free.fr Sat Jan 1 08:35:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:35:47 +0100 Subject: [Buildroot] [git commit] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Message-ID: <20220101083153.2550282DA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f66c3557a391a00a7527e2b2e8fddd83f0ba0aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Flare games use OGG audio file format througt SDL2-mixer. Without OGG support, flare-engine trigger a lot of errors in its log and fail to start the game. ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/flare-engine/Config.in | 1 + package/flare-engine/flare-engine.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index d08b740af3..9c997c2b9a 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FLARE_ENGINE select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER select BR2_PACKAGE_SDL2_TTF + select BR2_PACKAGE_TREMOR # for SDL2_mixer ogg support help Flare (Free Libre Action Roleplaying Engine) is a simple game engine built to handle a very specific kind of game: diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index 14d2681fda..d722a42208 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -9,7 +9,7 @@ FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING -FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf +FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf tremor # Don't use /usr/games and /usr/share/games FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare From yann.morin.1998 at free.fr Sat Jan 1 08:40:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:40:00 +0100 Subject: [Buildroot] [git commit] flare-{engine, game}: bump to version 1.12 Message-ID: <20220101083540.E3C8D81E43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc0edf6e698ba9ed2686f0b3652b6739979964cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See: https://flarerpg.org/2021/08/02/flare-1-12/ Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/flare-engine/flare-engine.hash | 2 +- package/flare-engine/flare-engine.mk | 2 +- package/flare-game/flare-game.hash | 2 +- package/flare-game/flare-game.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash index 0e37a71922..7f6169381c 100644 --- a/package/flare-engine/flare-engine.hash +++ b/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d flare-engine-1.11.tar.gz +sha256 287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e flare-engine-1.12.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index d722a42208..cbb7add4bb 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_ENGINE_VERSION = 1.11 +FLARE_ENGINE_VERSION = 1.12 FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash index 983c23200f..3d6d678c94 100644 --- a/package/flare-game/flare-game.hash +++ b/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c13231c7dd021252487f6cf117f7f2bb24bbda40af0a2b2902d72b5e2d4c242a flare-game-1.11.tar.gz +sha256 19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160 flare-game-1.12.tar.gz sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index 2845dc9714..41f02bec93 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_GAME_VERSION = 1.11 +FLARE_GAME_VERSION = 1.12 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) From yann.morin.1998 at free.fr Sat Jan 1 08:42:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:42:11 +0100 Subject: [Buildroot] [PATCH 3/3] flare-{engine, game}: bump to version 1.12 In-Reply-To: <20211231124728.1692301-3-romain.naour@gmail.com> References: <20211231124728.1692301-1-romain.naour@gmail.com> <20211231124728.1692301-3-romain.naour@gmail.com> Message-ID: <20220101084211.GP3390456@scaer> Romain, All, On 2021-12-31 13:47 +0100, Romain Naour spake thusly: > See: > https://flarerpg.org/2021/08/02/flare-1-12/ > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/flare-engine/flare-engine.hash | 2 +- > package/flare-engine/flare-engine.mk | 2 +- > package/flare-game/flare-game.hash | 2 +- > package/flare-game/flare-game.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash > index 0e37a71922..7f6169381c 100644 > --- a/package/flare-engine/flare-engine.hash > +++ b/package/flare-engine/flare-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d flare-engine-1.11.tar.gz > +sha256 287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e flare-engine-1.12.tar.gz > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk > index d722a42208..cbb7add4bb 100644 > --- a/package/flare-engine/flare-engine.mk > +++ b/package/flare-engine/flare-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FLARE_ENGINE_VERSION = 1.11 > +FLARE_ENGINE_VERSION = 1.12 > FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) > FLARE_ENGINE_LICENSE = GPL-3.0+ > FLARE_ENGINE_LICENSE_FILES = COPYING > diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash > index 983c23200f..3d6d678c94 100644 > --- a/package/flare-game/flare-game.hash > +++ b/package/flare-game/flare-game.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 c13231c7dd021252487f6cf117f7f2bb24bbda40af0a2b2902d72b5e2d4c242a flare-game-1.11.tar.gz > +sha256 19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160 flare-game-1.12.tar.gz > sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt > diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk > index 2845dc9714..41f02bec93 100644 > --- a/package/flare-game/flare-game.mk > +++ b/package/flare-game/flare-game.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FLARE_GAME_VERSION = 1.11 > +FLARE_GAME_VERSION = 1.12 > FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) > FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ > OFL-1.1 (Liberation Sans) > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 08:50:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:50:47 +0100 Subject: [Buildroot] [git commit] package/ruby: update to 3.1.0 Message-ID: <20220101084614.C44B282289@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4efd17526a5554b5191e3e5ef69d33aa210c5ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All patches are upstream. Tested with qemu-system-arm/qemu-system-sparc. LEGAL license hash changed: - drop aclocal.m4, no longer provided - add MIT-covered works Signed-off-by: Waldemar Brodkorb [yann.morin.1998 at free.fr: update license hash] Signed-off-by: Yann E. MORIN --- .../0001-fix-default-coroutine-selection.patch | 21 ---------------- package/ruby/0002-Needs-AC_PROG_CC.patch | 28 ---------------------- package/ruby/ruby.hash | 6 ++--- package/ruby/ruby.mk | 21 +++++++++------- 4 files changed, 16 insertions(+), 60 deletions(-) diff --git a/package/ruby/0001-fix-default-coroutine-selection.patch b/package/ruby/0001-fix-default-coroutine-selection.patch deleted file mode 100644 index ea84aa9bc6..0000000000 --- a/package/ruby/0001-fix-default-coroutine-selection.patch +++ /dev/null @@ -1,21 +0,0 @@ -fixed default coroutine selection for musl/uclibc - -https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac ---- ruby-3.0.0.orig/configure.ac 2020-12-25 04:33:01.000000000 +0100 -+++ ruby-3.0.0/configure.ac 2021-02-22 13:00:53.990314464 +0100 -@@ -2441,7 +2441,10 @@ - rb_cv_coroutine=copy - ], - [ -- rb_cv_coroutine=ucontext -+ AC_CHECK_FUNCS([getcontext swapcontext makecontext], -+ [rb_cv_coroutine=ucontext], -+ [rb_cv_coroutine=copy; break] -+ ) - ] - ) - AC_MSG_RESULT(${rb_cv_coroutine}) diff --git a/package/ruby/0002-Needs-AC_PROG_CC.patch b/package/ruby/0002-Needs-AC_PROG_CC.patch deleted file mode 100644 index 647358be70..0000000000 --- a/package/ruby/0002-Needs-AC_PROG_CC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Thu, 30 Sep 2021 18:24:37 +0900 -Subject: [PATCH] Needs `AC_PROG_CC` - -Although `AC_PROG_CC_C99` has been obsolete, `AC_PROG_CC` is not -and the latter is necessary not to make C++ compiler mandatory. - -[Retrieved from: -https://github.com/ruby/ruby/commit/912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b24a8f59b0d2..c7059ee1ecf4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -218,7 +218,7 @@ rb_test_CXXFLAGS=${CXXFLAGS+yes} - # BSD's ports and MacPorts prefix GNU binutils with 'g' - - dnl Seems necessarily in order to add -std=gnu99 option for gcc 4.9. --m4_version_prereq([2.70], [], [AC_PROG_CC_C99]) -+m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_C99]) - - AC_PROG_CXX - AC_PROG_CPP diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 1208461cd0..90e7627a97 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,6 +1,6 @@ -# https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/ -sha512 bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00 ruby-3.0.3.tar.xz +# https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/ +sha512 a2bb6b5e62d5fa06dd9c30cf84ddcb2c27cb87fbaaffd2309a44391a6b110e1dde6b7b0d8c659b56387ee3c9b4264003f3532d5a374123a7c187ebba9293f320 ruby-3.1.0.tar.xz # License files, Locally calculated -sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL +sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING sha256 36a9a6e7347214bbba599a412617204e65bff065dcbe5c46f5cb454c80de9eb0 BSDL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 7966450fd1..4f3b94f83b 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,11 +4,21 @@ # ################################################################################ -RUBY_VERSION_MAJOR = 3.0 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 -RUBY_VERSION_EXT = 3.0.0 +RUBY_VERSION_MAJOR = 3.1 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 +RUBY_VERSION_EXT = 3.1.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz + +RUBY_LICENSE = \ + Ruby or BSD-2-Clause, \ + BSD-3-Clause, \ + MIT, \ + others +RUBY_LICENSE_FILES = LEGAL COPYING BSDL + +RUBY_CPE_ID_VENDOR = ruby-lang + RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -17,11 +27,6 @@ HOST_RUBY_CONF_OPTS = \ --disable-install-doc \ --with-out-ext=curses,readline \ --without-gmp -RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others -RUBY_LICENSE_FILES = LEGAL COPYING BSDL -RUBY_CPE_ID_VENDOR = ruby-lang -# 0001-fix-default-coroutine-selection.patch -RUBY_AUTORECONF = YES ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) RUBY_CONF_ENV += LIBS=-latomic From yann.morin.1998 at free.fr Sat Jan 1 08:57:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 09:57:52 +0100 Subject: [Buildroot] [PATCH] package/ruby: update to 3.1.0 In-Reply-To: References: Message-ID: <20220101085751.GQ3390456@scaer> Waldemar, All, On 2021-12-31 16:12 +0100, Waldemar Brodkorb spake thusly: > All patches are upstream. Tested with qemu-system-arm/qemu-system-sparc. > > Signed-off-by: Waldemar Brodkorb $ make host-ruby-legal-info >>> host-ruby 3.1.0 Collecting legal info ERROR: LEGAL has wrong sha256 hash: ERROR: expected: 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e ERROR: got : 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc ERROR: Incomplete download, or man-in-the-middle (MITM) attack That's because new files have been added, MIT-covered, and another has been removed. So I've fixed the hash, added the MIT to the list of licenses, and pushed to master (with a bit of shuffling the variables around). I've also noted that there is the GPL license text in the 'GPL' file at the root of the package, ad idneed, there are a few files that do refer to the GPL. Could you please have a look and send an update, please? Regards, Yann E. MORIN. > --- > ...0001-fix-default-coroutine-selection.patch | 21 -------------- > package/ruby/0002-Needs-AC_PROG_CC.patch | 28 ------------------- > package/ruby/ruby.hash | 4 +-- > package/ruby/ruby.mk | 8 ++---- > 4 files changed, 5 insertions(+), 56 deletions(-) > delete mode 100644 package/ruby/0001-fix-default-coroutine-selection.patch > delete mode 100644 package/ruby/0002-Needs-AC_PROG_CC.patch > > diff --git a/package/ruby/0001-fix-default-coroutine-selection.patch b/package/ruby/0001-fix-default-coroutine-selection.patch > deleted file mode 100644 > index ea84aa9bc6..0000000000 > --- a/package/ruby/0001-fix-default-coroutine-selection.patch > +++ /dev/null > @@ -1,21 +0,0 @@ > -fixed default coroutine selection for musl/uclibc > - > -https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3 > - > -Signed-off-by: Waldemar Brodkorb > - > -diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac > ---- ruby-3.0.0.orig/configure.ac 2020-12-25 04:33:01.000000000 +0100 > -+++ ruby-3.0.0/configure.ac 2021-02-22 13:00:53.990314464 +0100 > -@@ -2441,7 +2441,10 @@ > - rb_cv_coroutine=copy > - ], > - [ > -- rb_cv_coroutine=ucontext > -+ AC_CHECK_FUNCS([getcontext swapcontext makecontext], > -+ [rb_cv_coroutine=ucontext], > -+ [rb_cv_coroutine=copy; break] > -+ ) > - ] > - ) > - AC_MSG_RESULT(${rb_cv_coroutine}) > diff --git a/package/ruby/0002-Needs-AC_PROG_CC.patch b/package/ruby/0002-Needs-AC_PROG_CC.patch > deleted file mode 100644 > index 647358be70..0000000000 > --- a/package/ruby/0002-Needs-AC_PROG_CC.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -From 912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6 Mon Sep 17 00:00:00 2001 > -From: Nobuyoshi Nakada > -Date: Thu, 30 Sep 2021 18:24:37 +0900 > -Subject: [PATCH] Needs `AC_PROG_CC` > - > -Although `AC_PROG_CC_C99` has been obsolete, `AC_PROG_CC` is not > -and the latter is necessary not to make C++ compiler mandatory. > - > -[Retrieved from: > -https://github.com/ruby/ruby/commit/912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index b24a8f59b0d2..c7059ee1ecf4 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -218,7 +218,7 @@ rb_test_CXXFLAGS=${CXXFLAGS+yes} > - # BSD's ports and MacPorts prefix GNU binutils with 'g' > - > - dnl Seems necessarily in order to add -std=gnu99 option for gcc 4.9. > --m4_version_prereq([2.70], [], [AC_PROG_CC_C99]) > -+m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_C99]) > - > - AC_PROG_CXX > - AC_PROG_CPP > diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash > index 1208461cd0..93708a4d7d 100644 > --- a/package/ruby/ruby.hash > +++ b/package/ruby/ruby.hash > @@ -1,5 +1,5 @@ > -# https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/ > -sha512 bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00 ruby-3.0.3.tar.xz > +# https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/ > +sha512 a2bb6b5e62d5fa06dd9c30cf84ddcb2c27cb87fbaaffd2309a44391a6b110e1dde6b7b0d8c659b56387ee3c9b4264003f3532d5a374123a7c187ebba9293f320 ruby-3.1.0.tar.xz > # License files, Locally calculated > sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL > sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING > diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk > index 7966450fd1..0bb4391e33 100644 > --- a/package/ruby/ruby.mk > +++ b/package/ruby/ruby.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -RUBY_VERSION_MAJOR = 3.0 > -RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 > -RUBY_VERSION_EXT = 3.0.0 > +RUBY_VERSION_MAJOR = 3.1 > +RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 > +RUBY_VERSION_EXT = 3.1.0 > RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) > RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz > RUBY_DEPENDENCIES = host-pkgconf host-ruby > @@ -20,8 +20,6 @@ HOST_RUBY_CONF_OPTS = \ > RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others > RUBY_LICENSE_FILES = LEGAL COPYING BSDL > RUBY_CPE_ID_VENDOR = ruby-lang > -# 0001-fix-default-coroutine-selection.patch > -RUBY_AUTORECONF = YES > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > RUBY_CONF_ENV += LIBS=-latomic > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 09:46:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:46:24 +0100 Subject: [Buildroot] [git commit] package/libdnet: bump to version 1.14, drop python2 support. Message-ID: <20220101094111.4A87E811FA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee21467863d30e20df80fcc1384ac9e573ec8f43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Change the url to the github ofalk repository (SF's repo is MIA; now everyone and their distros switched over to the Github-hosted fork). Depend on python3 and host-python3-cython for python bindings. Remove upstream patches; rework python-makefile.patch to adhere to git formatting and refresh for 1.14. Update License hash due to year changes. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: rework commit log, explain switch to Github] Signed-off-by: Yann E. MORIN --- package/libdnet/0001-python-gcc.patch | 20 -------------------- package/libdnet/0001-python-makefile.patch | 27 +++++++++++++++++++++++++++ package/libdnet/0002-python-makefile.patch | 16 ---------------- package/libdnet/Config.in | 6 +++--- package/libdnet/libdnet.hash | 4 ++-- package/libdnet/libdnet.mk | 12 ++++++------ 6 files changed, 38 insertions(+), 47 deletions(-) diff --git a/package/libdnet/0001-python-gcc.patch b/package/libdnet/0001-python-gcc.patch deleted file mode 100644 index ea732e4358..0000000000 --- a/package/libdnet/0001-python-gcc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/python/dnet.c 2006-01-19 18:08:23.000000000 +1100 -+++ b/python/dnet.c 2008-09-03 16:30:47.000000000 +1000 -@@ -2726,7 +2726,7 @@ - PyObject *__pyx_3 = 0; - unsigned short __pyx_4; - Py_INCREF(__pyx_v_self); -- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); - - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */ - __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max); -@@ -2738,7 +2739,7 @@ - Py_DECREF(__pyx_2); __pyx_2 = 0; - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} - Py_DECREF(((PyObject *)__pyx_v_next)); -- ((PyObject *)__pyx_v_next) = __pyx_3; -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)__pyx_3; - __pyx_3 = 0; - - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */ diff --git a/package/libdnet/0001-python-makefile.patch b/package/libdnet/0001-python-makefile.patch new file mode 100644 index 0000000000..eae22b2f14 --- /dev/null +++ b/package/libdnet/0001-python-makefile.patch @@ -0,0 +1,27 @@ +From 298cd8eaa21a21eee85f9551a26ad294347b1d5a Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Thu, 30 Dec 2021 11:14:15 -0800 +Subject: [PATCH] python makefile + +Signed-off-by: Peter Korsgaard +[adam: refresh for 1.14; make it git-formatted] +Signed-off-by: Adam Duskett +--- + python/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/python/Makefile.am b/python/Makefile.am +index 1a74ef2..59fe0f3 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -11,6 +11,7 @@ $(srcdir)/dnet.c: $(srcdir)/dnet.pyx + pyrexc $(srcdir)/dnet.pyx + + python-build: $(srcdir)/dnet.c ++ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) + $(PYTHON) setup.py build + touch python-build + +-- +2.33.1 + diff --git a/package/libdnet/0002-python-makefile.patch b/package/libdnet/0002-python-makefile.patch deleted file mode 100644 index fb41e43e35..0000000000 --- a/package/libdnet/0002-python-makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - python/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -Index: libdnet-1.11/python/Makefile.am -=================================================================== ---- libdnet-1.11.orig/python/Makefile.am -+++ libdnet-1.11/python/Makefile.am -@@ -11,6 +11,7 @@ - pyrexc $(srcdir)/dnet.pyx - - python-build: $(srcdir)/dnet.c -+ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) - $(PYTHON) setup.py build - touch python-build - diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in index e7ba3a21af..f853e4e12d 100644 --- a/package/libdnet/Config.in +++ b/package/libdnet/Config.in @@ -10,11 +10,11 @@ if BR2_PACKAGE_LIBDNET config BR2_PACKAGE_LIBDNET_PYTHON bool "libdnet python module" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON3 help dnet module for python -comment "dnet module for python requires python package" - depends on !BR2_PACKAGE_PYTHON +comment "dnet module for python requires python3 package" + depends on !BR2_PACKAGE_PYTHON3 endif diff --git a/package/libdnet/libdnet.hash b/package/libdnet/libdnet.hash index d2e820270f..d322a1cc29 100644 --- a/package/libdnet/libdnet.hash +++ b/package/libdnet/libdnet.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53 libdnet-1.11.tar.gz -sha256 1e94df12cb3701fa64e07eeb60284bb16a3544815d5a39860dacff7b86610584 LICENSE +sha256 592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe libdnet-1.14.tar.gz +sha256 6b46ec86e290066c47b6607d322135b3c473566e7225ac23d35a7c0588a82da6 LICENSE diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index 3d3fcbe605..e9a57d6ed2 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBDNET_VERSION = 1.11 -LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION) +LIBDNET_VERSION = 1.14 +LIBDNET_SITE = $(call github,ofalk,libdnet,libdnet-$(LIBDNET_VERSION)) LIBDNET_LICENSE = BSD-3-Clause LIBDNET_LICENSE_FILES = LICENSE LIBDNET_INSTALL_STAGING = YES @@ -15,10 +15,10 @@ LIBDNET_CONF_OPTS = \ --with-check=no LIBDNET_CONFIG_SCRIPTS = dnet-config -ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),) -LIBDNET_DEPENDENCIES += python -LIBDNET_CONF_OPTS += --with-python -LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib +ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) +LIBDNET_DEPENDENCIES += host-python3-cython python3 +LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin +LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endif From yann.morin.1998 at free.fr Sat Jan 1 09:49:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:49:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency In-Reply-To: <20220101000408.1538099-1-james.hilliard1@gmail.com> References: <20220101000408.1538099-1-james.hilliard1@gmail.com> Message-ID: <20220101094952.GR3390456@scaer> James, All, On 2021-12-31 17:04 -0700, James Hilliard spake thusly: > Fixes: > File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in > File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in > File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in > ModuleNotFoundError: No module named 'aiosignal' What about a small runtime test to ensure we no longer miss any such dependency in the future? ;-) > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-aiohttp/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in > index 9ffea088e4..85a6862141 100644 > --- a/package/python-aiohttp/Config.in > +++ b/package/python-aiohttp/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_AIOHTTP > bool "python-aiohttp" > depends on BR2_PACKAGE_PYTHON3 > select BR2_PACKAGE_PYTHON_AIODNS # runtime > + select BR2_PACKAGE_PYTHON_AIOSIGNAL # runtime > select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 09:49:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:49:57 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp: add aiosignal runtime dependency Message-ID: <20220101094828.25061813B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=393614da509c0ce5984b75b943bb7284454fb96c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in ModuleNotFoundError: No module named 'aiosignal' Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 9ffea088e4..85a6862141 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_AIOHTTP bool "python-aiohttp" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIODNS # runtime + select BR2_PACKAGE_PYTHON_AIOSIGNAL # runtime select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime From yann.morin.1998 at free.fr Sat Jan 1 09:50:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:29 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-sse: bump to version 2.1.0 Message-ID: <20220101094828.2E2FD813B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc5b783b191adb1bc6a0714a06b247d2433535fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash change due to full text removal: https://github.com/aio-libs/aiohttp-sse/commit/307fd35a84a66b7fb5adfd70cd5b7d709fa8508c Fixes(python 3.10 compatibility): File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 107, in wait File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 144, in _ping TypeError: sleep() got an unexpected keyword argument 'loop' Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp-sse/python-aiohttp-sse.hash | 6 +++--- package/python-aiohttp-sse/python-aiohttp-sse.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.hash b/package/python-aiohttp-sse/python-aiohttp-sse.hash index 2f21da462e..224601450c 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.hash +++ b/package/python-aiohttp-sse/python-aiohttp-sse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-sse/json -md5 d2f394fb75f591045b2c94fc17c8533d aiohttp-sse-2.0.0.tar.gz -sha256 547e1eaa129749f090d02b31956215edbcde74ce99721f5f0ac902a9ccb1202e aiohttp-sse-2.0.0.tar.gz +md5 822cd0c30325e8a711101c1a1ede4058 aiohttp-sse-2.1.0.tar.gz +sha256 dfe8f7271ab4470891fa1bfa1913d6889b3d19015dd3d3a4cab949e66971bbca aiohttp-sse-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE +sha256 5585eb91ec607b4fdbe97d44a61146a9cc27bb703336628bc3c6a1eaffe60307 LICENSE diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.mk b/package/python-aiohttp-sse/python-aiohttp-sse.mk index 7a7a0d0a70..2aef1579f5 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.mk +++ b/package/python-aiohttp-sse/python-aiohttp-sse.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SSE_VERSION = 2.0.0 +PYTHON_AIOHTTP_SSE_VERSION = 2.1.0 PYTHON_AIOHTTP_SSE_SOURCE = aiohttp-sse-$(PYTHON_AIOHTTP_SSE_VERSION).tar.gz -PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2b/50/e127729f7df53c32c96b5c71932a7262cad40c83f1e19c218b068c816d51 +PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2f/3f/cc4f5a3fe6cb50ad5b9d26bb7738c5da1f61645b517d4230df2fc32d89f0 PYTHON_AIOHTTP_SSE_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SSE_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SSE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:31 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp: bump to version 3.8.1 Message-ID: <20220101094828.6D032813B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6d2ad9b359c8fe786efb0f6d224fc203d46b94b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp/python-aiohttp.hash | 4 ++-- package/python-aiohttp/python-aiohttp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index 90dbd75994..b2b0f8c937 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 4743950052dbaf5ce5c3622754ebceae aiohttp-3.8.0.tar.gz -sha256 d3b19d8d183bcfd68b25beebab8dc3308282fe2ca3d6ea3cb4cd101b3c279f8d aiohttp-3.8.0.tar.gz +md5 faf7726dc65a940272874c0f441e8ec6 aiohttp-3.8.1.tar.gz +sha256 fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578 aiohttp-3.8.1.tar.gz # Locally computed sha256 checksums sha256 383c70c090b60ae81e035fe4fafed689b45c4421cd3bc355f1bd41ac208ccf3f LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 03501a7527..5a2d306438 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.8.0 +PYTHON_AIOHTTP_VERSION = 3.8.1 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/48/1a/ba9542a545aed4b0b6ef128561f68dd3c2812ff5abfa9ed5b96547a728ea +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/5a/86/5f63de7a202550269a617a5d57859a2961f3396ecd1739a70b92224766bc PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Sat Jan 1 09:50:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:40 +0100 Subject: [Buildroot] [git commit] package/python-aiorwlock: bump to version 1.2.0 Message-ID: <20220101094828.90F01813B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f72c1355f09b67fe353a728eb9eef7baeb8837bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index bddc846a5b..fad7079789 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 066260ea2c6798f6e18258d4430031bb aiorwlock-1.1.0.tar.gz -sha256 2aaf1d1cc995abfd5b2f07ca0e9b5c23bd369517c75495a347eb5896bc307f29 aiorwlock-1.1.0.tar.gz +md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz +sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index acc6f90158..4ba4965eb5 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.1.0 +PYTHON_AIORWLOCK_VERSION = 1.2.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/ca/e5/3221d49edb432024f6b1b7e9e36cad6363601973375667477f2130d5da7d +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:38 +0100 Subject: [Buildroot] [git commit] package/python-async-timeout: bump to version 4.0.2 Message-ID: <20220101094828.87DAD813B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a27ad5ca247835de0fc10a1583b6c2bb1a6648e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-async-timeout/python-async-timeout.hash | 4 ++-- package/python-async-timeout/python-async-timeout.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-async-timeout/python-async-timeout.hash b/package/python-async-timeout/python-async-timeout.hash index 1a64c3a77d..0ecf1ef5ae 100644 --- a/package/python-async-timeout/python-async-timeout.hash +++ b/package/python-async-timeout/python-async-timeout.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/async-timeout/json -md5 2871f3853060ac7e76e6278b85dfb3c9 async-timeout-4.0.0.tar.gz -sha256 7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382 async-timeout-4.0.0.tar.gz +md5 10571272b2e0fab839ec23f8293bf482 async-timeout-4.0.2.tar.gz +sha256 2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15 async-timeout-4.0.2.tar.gz # Locally computed sha256 checksums sha256 e18d7bb8f513e2c46bb585c94b585bd30720dd3ccb21ddb0786f72d16658f92c LICENSE diff --git a/package/python-async-timeout/python-async-timeout.mk b/package/python-async-timeout/python-async-timeout.mk index 1d2c716fa9..b3c5f79e45 100644 --- a/package/python-async-timeout/python-async-timeout.mk +++ b/package/python-async-timeout/python-async-timeout.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.0 +PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.2 PYTHON_ASYNC_TIMEOUT_SOURCE = async-timeout-$(PYTHON_ASYNC_TIMEOUT_VERSION).tar.gz -PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/28/0c/1cd218ea84964f0740a3ab6152dfa99661174abdd8e4053e06c0285ac42a +PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/54/6e/9678f7b2993537452710ffb1750c62d2c26df438aa621ad5fa9d1507a43a PYTHON_ASYNC_TIMEOUT_LICENSE = Apache-2.0 PYTHON_ASYNC_TIMEOUT_LICENSE_FILES = LICENSE PYTHON_ASYNC_TIMEOUT_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Sat Jan 1 09:50:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:35 +0100 Subject: [Buildroot] [git commit] package/python-aiosignal: bump to version 1.2.0 Message-ID: <20220101094828.7EA24813D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd3550f17948240f3fb80be93511304e73ec0f33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License file renamed in: https://github.com/aio-libs/aiosignal/commit/98b25a33d08821a2948d334b223e2874979f5bd4 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiosignal/python-aiosignal.hash | 6 +++--- package/python-aiosignal/python-aiosignal.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-aiosignal/python-aiosignal.hash b/package/python-aiosignal/python-aiosignal.hash index 3fdd459502..f2a09749b8 100644 --- a/package/python-aiosignal/python-aiosignal.hash +++ b/package/python-aiosignal/python-aiosignal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosignal/json -md5 f3edf1b700b4fee6ea6ed375c3f6555c aiosignal-1.1.2.tar.gz -sha256 15605698a0401075a03d36cea979e3c0e6cf8467a9e3b9047040514dd9e6f43b aiosignal-1.1.2.tar.gz +md5 011700c3acc576a3a38deade6a4860cb aiosignal-1.2.0.tar.gz +sha256 78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2 aiosignal-1.2.0.tar.gz # Locally computed sha256 checksums -sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt +sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-aiosignal/python-aiosignal.mk b/package/python-aiosignal/python-aiosignal.mk index ea11d97060..e0436e973e 100644 --- a/package/python-aiosignal/python-aiosignal.mk +++ b/package/python-aiosignal/python-aiosignal.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_AIOSIGNAL_VERSION = 1.1.2 +PYTHON_AIOSIGNAL_VERSION = 1.2.0 PYTHON_AIOSIGNAL_SOURCE = aiosignal-$(PYTHON_AIOSIGNAL_VERSION).tar.gz -PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/ac/f7/c3df3b7eac6ea96175e0817b272b43b398d5ba589be09a50d1b758d5b852 +PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/27/6b/a89fbcfae70cf53f066ec22591938296889d3cc58fec1e1c393b10e8d71d PYTHON_AIOSIGNAL_SETUP_TYPE = setuptools PYTHON_AIOSIGNAL_LICENSE = Apache-2.0 -PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE.txt +PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE $(eval $(python-package)) From yann.morin.1998 at free.fr Sat Jan 1 09:50:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:33 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-remotes: bump to version 1.1.0 Message-ID: <20220101094828.7564D813B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfb1265750e8e3ecef4aff2e3aa0762b8e9ae2b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp-remotes/python-aiohttp-remotes.hash | 4 ++-- package/python-aiohttp-remotes/python-aiohttp-remotes.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index a9a6cad2df..595340d5d8 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 e90fad4b7aa088207f831698fddd9eea aiohttp_remotes-1.0.0.tar.gz -sha256 caec1681de70bac82daa676078d9b125758fb3952fdaa893a6b42bdd995562ef aiohttp_remotes-1.0.0.tar.gz +md5 da13880f25ec3b9cf98c7baff92835a2 aiohttp_remotes-1.1.0.tar.gz +sha256 e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174 aiohttp_remotes-1.1.0.tar.gz # Locally computed sha256 checksums sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index f04cecd89d..e2bc3e1c18 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.0.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.1.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/40/b6/1178bd1e26e88f9f29b7d1bbfae7b38d39ec9cf787d4685f83ade2e7aa7f +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/e3/fc/5523010172e2d8685a8934fbb49d564118c9ebc1e4233a62b77310f979db PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:42 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-session: bump to version 2.10.0 Message-ID: <20220101094828.9D257813B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9dbed1ca6aaaecf9de63f9f6b20ccaf41897d7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to full text removal: https://github.com/aio-libs/aiohttp-session/commit/6a1c7f0efe006425b5387b089f4d39bc48765ed7 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiohttp-session/python-aiohttp-session.hash | 6 +++--- package/python-aiohttp-session/python-aiohttp-session.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index f10827b616..3842f0c7af 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.hash +++ b/package/python-aiohttp-session/python-aiohttp-session.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-session/json -md5 993ec277ece4765472d0edc0f6c0bba3 aiohttp-session-2.9.0.tar.gz -sha256 959413468b84e30e7ca09719617cfb0000066a2e0f6c20062d043433e82aeb74 aiohttp-session-2.9.0.tar.gz +md5 d57d463a9db13b681f7924b38aa77f64 aiohttp-session-2.10.0.tar.gz +sha256 2af19af9f435937baacbb6420f887b21e5021bb34be146c2702c58e6ebf6b76b aiohttp-session-2.10.0.tar.gz # Locally computed sha256 checksums -sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE +sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index fa724fdb86..a28b1ae143 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/package/python-aiohttp-session/python-aiohttp-session.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SESSION_VERSION = 2.9.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.10.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/f8/fe/53dfd35f5c7fcc7f2d0866cb29e722303e3fae7f749c1f3d4d11d361dc38 +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/d6/3f/ab6288e8bbf4a9ae63ea0d3d5711bccc3a6dad1cb85a420c14fdeabc209e PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:45 +0100 Subject: [Buildroot] [git commit] package/python-aioconsole: bump to version 0.3.3 Message-ID: <20220101094828.A5335813B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d25064b907d2239aab7de4fe08991335f1e0955c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 45139a6606..26a3778756 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 b8cbcb6e00d8e535256526dfe4f27db3 aioconsole-0.3.2.tar.gz -sha256 9355b36d41d5fbdd3dbb01510deb2b985b508b2ebcd5b8bd85af61a707e2f6c8 aioconsole-0.3.2.tar.gz +md5 f8b67330e631cfc45a9b2560a6e0fa98 aioconsole-0.3.3.tar.gz +sha256 47df42d9f8cc3995bbe032dd5f01d32cc5b06639e9078bb9b4e3c55b237f5e32 aioconsole-0.3.3.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 75ea3c2a2a..f06d91a550 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.2 +PYTHON_AIOCONSOLE_VERSION = 0.3.3 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/7a/b2/747ab3cb965596cd84c5159941613d901d8771acad3c51c4f5da362aa9f0 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/dd/f6/bbc451ba96c1e1da6aa253f254b181ceb03272b475b27b481b57865d7d7f PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:50:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:50:47 +0100 Subject: [Buildroot] [git commit] package/python-aiofiles: bump to version 0.8.0 Message-ID: <20220101094828.AD96D813D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d943a4ede09210a407846c59c41373263b2e5a1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiofiles/python-aiofiles.hash | 4 ++-- package/python-aiofiles/python-aiofiles.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiofiles/python-aiofiles.hash b/package/python-aiofiles/python-aiofiles.hash index a5c140606b..268136a406 100644 --- a/package/python-aiofiles/python-aiofiles.hash +++ b/package/python-aiofiles/python-aiofiles.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiofiles/json -md5 a2dd24e2ca8d7b7e7dbacd6381da748a aiofiles-0.7.0.tar.gz -sha256 a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4 aiofiles-0.7.0.tar.gz +md5 697deeb4fdcb620c45f114f173ed7c0d aiofiles-0.8.0.tar.gz +sha256 8334f23235248a3b2e83b2c3a78a22674f39969b96397126cc93664d9a901e59 aiofiles-0.8.0.tar.gz # Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index e43cf9a484..996e5eb6c0 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOFILES_VERSION = 0.7.0 +PYTHON_AIOFILES_VERSION = 0.8.0 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz -PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/06/f0/af90f3fb4066b0707b6a5af3ffd5fd9b3809bbb52f0153a3c7550e594de3 +PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/10/ca/c416cfacf6a47e1400dad56eab85aa86c92c6fbe58447d12035e434f0d5c PYTHON_AIOFILES_SETUP_TYPE = setuptools PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 1 09:55:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 10:55:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-sse: bump to version 2.1.0 In-Reply-To: <20220101003125.1957739-1-james.hilliard1@gmail.com> References: <20220101003125.1957739-1-james.hilliard1@gmail.com> Message-ID: <20220101095508.GS3390456@scaer> James, All, On 2021-12-31 17:31 -0700, James Hilliard spake thusly: > License hash change due to full text removal: > https://github.com/aio-libs/aiohttp-sse/commit/307fd35a84a66b7fb5adfd70cd5b7d709fa8508c > > Fixes(python 3.10 compatibility): > File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 107, in wait > File "/usr/lib/python3.10/site-packages/aiohttp_sse/__init__.py", line 144, in _ping > TypeError: sleep() got an unexpected keyword argument 'loop' > > Signed-off-by: James Hilliard This, and your 8 following python-related patches, applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-aiohttp-sse/python-aiohttp-sse.hash | 6 +++--- > package/python-aiohttp-sse/python-aiohttp-sse.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.hash b/package/python-aiohttp-sse/python-aiohttp-sse.hash > index 2f21da462e..224601450c 100644 > --- a/package/python-aiohttp-sse/python-aiohttp-sse.hash > +++ b/package/python-aiohttp-sse/python-aiohttp-sse.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aiohttp-sse/json > -md5 d2f394fb75f591045b2c94fc17c8533d aiohttp-sse-2.0.0.tar.gz > -sha256 547e1eaa129749f090d02b31956215edbcde74ce99721f5f0ac902a9ccb1202e aiohttp-sse-2.0.0.tar.gz > +md5 822cd0c30325e8a711101c1a1ede4058 aiohttp-sse-2.1.0.tar.gz > +sha256 dfe8f7271ab4470891fa1bfa1913d6889b3d19015dd3d3a4cab949e66971bbca aiohttp-sse-2.1.0.tar.gz > # Locally computed sha256 checksums > -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE > +sha256 5585eb91ec607b4fdbe97d44a61146a9cc27bb703336628bc3c6a1eaffe60307 LICENSE > diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.mk b/package/python-aiohttp-sse/python-aiohttp-sse.mk > index 7a7a0d0a70..2aef1579f5 100644 > --- a/package/python-aiohttp-sse/python-aiohttp-sse.mk > +++ b/package/python-aiohttp-sse/python-aiohttp-sse.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOHTTP_SSE_VERSION = 2.0.0 > +PYTHON_AIOHTTP_SSE_VERSION = 2.1.0 > PYTHON_AIOHTTP_SSE_SOURCE = aiohttp-sse-$(PYTHON_AIOHTTP_SSE_VERSION).tar.gz > -PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2b/50/e127729f7df53c32c96b5c71932a7262cad40c83f1e19c218b068c816d51 > +PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2f/3f/cc4f5a3fe6cb50ad5b9d26bb7738c5da1f61645b517d4230df2fc32d89f0 > PYTHON_AIOHTTP_SSE_SETUP_TYPE = setuptools > PYTHON_AIOHTTP_SSE_LICENSE = Apache-2.0 > PYTHON_AIOHTTP_SSE_LICENSE_FILES = LICENSE > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:02:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:02:54 +0100 Subject: [Buildroot] [git commit] package/libimxvpuapi: switch to using host-python3 Message-ID: <20220101095723.D18D0817B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57edd417c58e58dc10e60d84b6b1920e72560262 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package builds just fine with python3. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/libimxvpuapi/libimxvpuapi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk index a2a3b21105..d8f214b9e0 100644 --- a/package/libimxvpuapi/libimxvpuapi.mk +++ b/package/libimxvpuapi/libimxvpuapi.mk @@ -8,7 +8,7 @@ LIBIMXVPUAPI_VERSION = 0.10.3 LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION)) LIBIMXVPUAPI_LICENSE = LGPL-2.1+ LIBIMXVPUAPI_LICENSE_FILES = LICENSE -LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu +LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python3 imx-vpu LIBIMXVPUAPI_INSTALL_STAGING = YES LIBIMXVPUAPI_NEEDS_EXTERNAL_WAF = YES From yann.morin.1998 at free.fr Sat Jan 1 10:03:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:03:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libimxvpuapi: depend on host-python3 In-Reply-To: <20211231230422.955804-1-aduskett@gmail.com> References: <20211231230422.955804-1-aduskett@gmail.com> Message-ID: <20220101100352.GT3390456@scaer> Adam, All, On 2021-12-31 15:04 -0800, Adam Duskett spake thusly: > This package builds just fine with python3. > > Signed-off-by: Adam Duskett I've rephrased the title, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libimxvpuapi/libimxvpuapi.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk > index a2a3b21105..d8f214b9e0 100644 > --- a/package/libimxvpuapi/libimxvpuapi.mk > +++ b/package/libimxvpuapi/libimxvpuapi.mk > @@ -8,7 +8,7 @@ LIBIMXVPUAPI_VERSION = 0.10.3 > LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION)) > LIBIMXVPUAPI_LICENSE = LGPL-2.1+ > LIBIMXVPUAPI_LICENSE_FILES = LICENSE > -LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu > +LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python3 imx-vpu > LIBIMXVPUAPI_INSTALL_STAGING = YES > LIBIMXVPUAPI_NEEDS_EXTERNAL_WAF = YES > > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:05:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:05:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdnet: bump to version 1.14, drop python2 support. In-Reply-To: <20211231211055.3996590-1-aduskett@gmail.com> References: <20211231211055.3996590-1-aduskett@gmail.com> Message-ID: <20220101100502.GU3390456@scaer> Adam, All, On 2021-12-31 13:10 -0800, Adam Duskett spake thusly: > - Change the url to the github ofalk repository. > - Remove upstream patches > - Rework python-makefile.patch to adhere to git formatting and refresh for 1.14 > - Update License hash due to year changes > - Depend on python3 and host-python3-cython for python bindings > > Signed-off-by: Adam Duskett I've added an explanation why we switch to the ofalk repo, took that opportunity to rephrase the commit log, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libdnet/0001-python-gcc.patch | 20 ---------------- > package/libdnet/0001-python-makefile.patch | 27 ++++++++++++++++++++++ > package/libdnet/0002-python-makefile.patch | 16 ------------- > package/libdnet/Config.in | 6 ++--- > package/libdnet/libdnet.hash | 4 ++-- > package/libdnet/libdnet.mk | 12 +++++----- > 6 files changed, 38 insertions(+), 47 deletions(-) > delete mode 100644 package/libdnet/0001-python-gcc.patch > create mode 100644 package/libdnet/0001-python-makefile.patch > delete mode 100644 package/libdnet/0002-python-makefile.patch > > diff --git a/package/libdnet/0001-python-gcc.patch b/package/libdnet/0001-python-gcc.patch > deleted file mode 100644 > index ea732e4358..0000000000 > --- a/package/libdnet/0001-python-gcc.patch > +++ /dev/null > @@ -1,20 +0,0 @@ > ---- a/python/dnet.c 2006-01-19 18:08:23.000000000 +1100 > -+++ b/python/dnet.c 2008-09-03 16:30:47.000000000 +1000 > -@@ -2726,7 +2726,7 @@ > - PyObject *__pyx_3 = 0; > - unsigned short __pyx_4; > - Py_INCREF(__pyx_v_self); > -- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); > -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); > - > - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */ > - __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max); > -@@ -2738,7 +2739,7 @@ > - Py_DECREF(__pyx_2); __pyx_2 = 0; > - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} > - Py_DECREF(((PyObject *)__pyx_v_next)); > -- ((PyObject *)__pyx_v_next) = __pyx_3; > -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)__pyx_3; > - __pyx_3 = 0; > - > - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */ > diff --git a/package/libdnet/0001-python-makefile.patch b/package/libdnet/0001-python-makefile.patch > new file mode 100644 > index 0000000000..5f641302be > --- /dev/null > +++ b/package/libdnet/0001-python-makefile.patch > @@ -0,0 +1,27 @@ > +From 298cd8eaa21a21eee85f9551a26ad294347b1d5a Mon Sep 17 00:00:00 2001 > +From: Peter Korsgaard > +Date: Thu, 30 Dec 2021 11:14:15 -0800 > +Subject: [PATCH] python makefile > + > +Signed-off-by: Peter Korsgaard > +Signed-off-by: Adam Duskett > +Refresh for 1.14 > +--- > + python/Makefile.am | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/python/Makefile.am b/python/Makefile.am > +index 1a74ef2..59fe0f3 100644 > +--- a/python/Makefile.am > ++++ b/python/Makefile.am > +@@ -11,6 +11,7 @@ $(srcdir)/dnet.c: $(srcdir)/dnet.pyx > + pyrexc $(srcdir)/dnet.pyx > + > + python-build: $(srcdir)/dnet.c > ++ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) > + $(PYTHON) setup.py build > + touch python-build > + > +-- > +2.33.1 > + > diff --git a/package/libdnet/0002-python-makefile.patch b/package/libdnet/0002-python-makefile.patch > deleted file mode 100644 > index fb41e43e35..0000000000 > --- a/package/libdnet/0002-python-makefile.patch > +++ /dev/null > @@ -1,16 +0,0 @@ > ---- > - python/Makefile.am | 1 + > - 1 file changed, 1 insertion(+) > - > -Index: libdnet-1.11/python/Makefile.am > -=================================================================== > ---- libdnet-1.11.orig/python/Makefile.am > -+++ libdnet-1.11/python/Makefile.am > -@@ -11,6 +11,7 @@ > - pyrexc $(srcdir)/dnet.pyx > - > - python-build: $(srcdir)/dnet.c > -+ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) > - $(PYTHON) setup.py build > - touch python-build > - > diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in > index e7ba3a21af..f853e4e12d 100644 > --- a/package/libdnet/Config.in > +++ b/package/libdnet/Config.in > @@ -10,11 +10,11 @@ if BR2_PACKAGE_LIBDNET > > config BR2_PACKAGE_LIBDNET_PYTHON > bool "libdnet python module" > - depends on BR2_PACKAGE_PYTHON > + depends on BR2_PACKAGE_PYTHON3 > help > dnet module for python > > -comment "dnet module for python requires python package" > - depends on !BR2_PACKAGE_PYTHON > +comment "dnet module for python requires python3 package" > + depends on !BR2_PACKAGE_PYTHON3 > > endif > diff --git a/package/libdnet/libdnet.hash b/package/libdnet/libdnet.hash > index d2e820270f..d322a1cc29 100644 > --- a/package/libdnet/libdnet.hash > +++ b/package/libdnet/libdnet.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53 libdnet-1.11.tar.gz > -sha256 1e94df12cb3701fa64e07eeb60284bb16a3544815d5a39860dacff7b86610584 LICENSE > +sha256 592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe libdnet-1.14.tar.gz > +sha256 6b46ec86e290066c47b6607d322135b3c473566e7225ac23d35a7c0588a82da6 LICENSE > diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk > index 3d3fcbe605..e9a57d6ed2 100644 > --- a/package/libdnet/libdnet.mk > +++ b/package/libdnet/libdnet.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBDNET_VERSION = 1.11 > -LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION) > +LIBDNET_VERSION = 1.14 > +LIBDNET_SITE = $(call github,ofalk,libdnet,libdnet-$(LIBDNET_VERSION)) > LIBDNET_LICENSE = BSD-3-Clause > LIBDNET_LICENSE_FILES = LICENSE > LIBDNET_INSTALL_STAGING = YES > @@ -15,10 +15,10 @@ LIBDNET_CONF_OPTS = \ > --with-check=no > LIBDNET_CONFIG_SCRIPTS = dnet-config > > -ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),) > -LIBDNET_DEPENDENCIES += python > -LIBDNET_CONF_OPTS += --with-python > -LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib > +ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) > +LIBDNET_DEPENDENCIES += host-python3-cython python3 > +LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin > +LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) > LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec > LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install > endif > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:06:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:06:56 +0100 Subject: [Buildroot] [git commit] package/python3: requires blake2 support in openssl Message-ID: <20220101100109.4995E817EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae54331db305f30c6c958ca64d9e6c63b7ae9e50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: /home/buildroot/autobuild/instance-3/output-1/build/python3-3.10.1/Modules/_hashopenssl.c:244:22: error: implicit declaration of function 'EVP_blake2s256'; did you mean 'LN_blake2s256'? [-Werror=implicit-function-declaration] 244 | digest = EVP_blake2s256(); | ^~~~~~~~~~~~~~ | LN_blake2s256 Fixes: - http://autobuild.buildroot.org/results/9112571b75aebb0ba5032ef1b16226d9848f5184 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python3/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/Config.in b/package/python3/Config.in index efc4dbb3d4..7714518edc 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -90,6 +90,7 @@ config BR2_PACKAGE_PYTHON3_READLINE config BR2_PACKAGE_PYTHON3_SSL bool "ssl" select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 if BR2_PACKAGE_LIBOPENSSL help _ssl module for Python3 (required for https in urllib etc). From yann.morin.1998 at free.fr Sat Jan 1 10:07:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:07:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python3: requires blake2 support in openssl In-Reply-To: <20211231092425.3550185-1-fontaine.fabrice@gmail.com> References: <20211231092425.3550185-1-fontaine.fabrice@gmail.com> Message-ID: <20220101100723.GV3390456@scaer> Fabrice, All, On 2021-12-31 10:24 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 3.10.1 in > commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > /home/buildroot/autobuild/instance-3/output-1/build/python3-3.10.1/Modules/_hashopenssl.c:244:22: error: implicit declaration of function 'EVP_blake2s256'; did you mean 'LN_blake2s256'? [-Werror=implicit-function-declaration] > 244 | digest = EVP_blake2s256(); > | ^~~~~~~~~~~~~~ > | LN_blake2s256 > > Fixes: > - http://autobuild.buildroot.org/results/9112571b75aebb0ba5032ef1b16226d9848f5184 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python3/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python3/Config.in b/package/python3/Config.in > index efc4dbb3d4..7714518edc 100644 > --- a/package/python3/Config.in > +++ b/package/python3/Config.in > @@ -90,6 +90,7 @@ config BR2_PACKAGE_PYTHON3_READLINE > config BR2_PACKAGE_PYTHON3_SSL > bool "ssl" > select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 if BR2_PACKAGE_LIBOPENSSL > help > _ssl module for Python3 (required for https in urllib etc). > > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:07:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:07:52 +0100 Subject: [Buildroot] [git commit] package/ogre: disable csharp Message-ID: <20220101100218.B232F817FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d18582d94152f541beab4478deded4053c554bc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable csharp to avoid the following build failure with python since bump to version 1.12.12 in commit 4e814227caa0a5d190e36cd5174239fe5c627279 and https://github.com/OGRECave/ogre/commit/3fd839c76a153e614c9e3131ff9959234099e749: /bin/sh: 1: mcs: not found Fixes: - http://autobuild.buildroot.org/results/5f384dbed8e5241f91072bfffa54ba6b9c509751 Signed-off-by: Fabrice Fontaine Acked-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/ogre/ogre.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk index 72c96cb33a..72fd616c0c 100644 --- a/package/ogre/ogre.mk +++ b/package/ogre/ogre.mk @@ -33,6 +33,7 @@ OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU # Disable java and nvidia cg support. # Disable imgui overlay to avoid extra download from CMake. OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ + -DOGRE_BUILD_COMPONENT_CSHARP=OFF \ -DOGRE_BUILD_COMPONENT_JAVA=OFF \ -DOGRE_BUILD_PLUGIN_CG=OFF \ -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=OFF \ From yann.morin.1998 at free.fr Sat Jan 1 10:08:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:08:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/ogre: disable csharp In-Reply-To: <20211231090030.3437133-1-fontaine.fabrice@gmail.com> References: <20211231090030.3437133-1-fontaine.fabrice@gmail.com> Message-ID: <20220101100830.GW3390456@scaer> Fabrice, All, On 2021-12-31 10:00 +0100, Fabrice Fontaine spake thusly: > Disable csharp to avoid the following build failure with python since > bump to version 1.12.12 in commit > 4e814227caa0a5d190e36cd5174239fe5c627279 and > https://github.com/OGRECave/ogre/commit/3fd839c76a153e614c9e3131ff9959234099e749: > > /bin/sh: 1: mcs: not found > > Fixes: > - http://autobuild.buildroot.org/results/5f384dbed8e5241f91072bfffa54ba6b9c509751 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ogre/ogre.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk > index 72c96cb33a..72fd616c0c 100644 > --- a/package/ogre/ogre.mk > +++ b/package/ogre/ogre.mk > @@ -33,6 +33,7 @@ OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU > # Disable java and nvidia cg support. > # Disable imgui overlay to avoid extra download from CMake. > OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ > + -DOGRE_BUILD_COMPONENT_CSHARP=OFF \ > -DOGRE_BUILD_COMPONENT_JAVA=OFF \ > -DOGRE_BUILD_PLUGIN_CG=OFF \ > -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=OFF \ > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:09:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:09:18 +0100 Subject: [Buildroot] [git commit] package/libzip: bump to version 1.8.0 Message-ID: <20220101100650.3DC6B81851@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6990000654e564a357c446ee2bf5afb04ae046a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patches (already in version) - Add zstd optional dependency https://libzip.org/news/release-1.8.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Add-FindGnuTLS-cmake-from-3-17-3.patch | 103 --------------------- .../libzip/0002-Include-limits.h-for-INT_MAX.patch | 27 ------ package/libzip/libzip.hash | 2 +- package/libzip/libzip.mk | 9 +- 4 files changed, 9 insertions(+), 132 deletions(-) diff --git a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch b/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch deleted file mode 100644 index 30bc201048..0000000000 --- a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 73f6f8ebff678a0847e6b197b574082cc285b528 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Sat, 25 Jul 2020 12:03:29 +0200 -Subject: [PATCH] Add FindGnuTLS.cmake from 3.17.3. - -Addresses #199 - -[Retrieved from: -https://github.com/nih-at/libzip/commit/73f6f8ebff678a0847e6b197b574082cc285b528] -Signed-off-by: Fabrice Fontaine ---- - cmake-compat/FindGnuTLS.cmake | 82 +++++++++++++++++++++++++++++++++++ - 1 file changed, 82 insertions(+) - create mode 100644 cmake-compat/FindGnuTLS.cmake - -diff --git a/cmake-compat/FindGnuTLS.cmake b/cmake-compat/FindGnuTLS.cmake -new file mode 100644 -index 00000000..819f0001 ---- /dev/null -+++ b/cmake-compat/FindGnuTLS.cmake -@@ -0,0 +1,82 @@ -+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -+# file Copyright.txt or https://cmake.org/licensing for details. -+ -+#[=======================================================================[.rst: -+FindGnuTLS -+---------- -+ -+Find the GNU Transport Layer Security library (gnutls) -+ -+IMPORTED Targets -+^^^^^^^^^^^^^^^^ -+ -+This module defines :prop_tgt:`IMPORTED` target ``GnuTLS::GnuTLS``, if -+gnutls has been found. -+ -+Result Variables -+^^^^^^^^^^^^^^^^ -+ -+``GNUTLS_FOUND`` -+ System has gnutls -+``GNUTLS_INCLUDE_DIR`` -+ The gnutls include directory -+``GNUTLS_LIBRARIES`` -+ The libraries needed to use gnutls -+``GNUTLS_DEFINITIONS`` -+ Compiler switches required for using gnutls -+``GNUTLS_VERSION`` -+ version of gnutls. -+#]=======================================================================] -+ -+# Note that this doesn't try to find the gnutls-extra package. -+ -+ -+if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARY) -+ # in cache already -+ set(gnutls_FIND_QUIETLY TRUE) -+endif () -+ -+if (NOT WIN32) -+ # try using pkg-config to get the directories and then use these values -+ # in the find_path() and find_library() calls -+ # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful -+ find_package(PkgConfig QUIET) -+ PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls) -+ set(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) -+ set(GNUTLS_VERSION ${PC_GNUTLS_VERSION}) -+ # keep for backward compatibility -+ set(GNUTLS_VERSION_STRING ${PC_GNUTLS_VERSION}) -+endif () -+ -+find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h -+ HINTS -+ ${PC_GNUTLS_INCLUDEDIR} -+ ${PC_GNUTLS_INCLUDE_DIRS} -+ ) -+ -+find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls -+ HINTS -+ ${PC_GNUTLS_LIBDIR} -+ ${PC_GNUTLS_LIBRARY_DIRS} -+ ) -+ -+mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) -+ -+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS -+ REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR -+ VERSION_VAR GNUTLS_VERSION_STRING) -+ -+if(GNUTLS_FOUND) -+ set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) -+ set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) -+ -+ if(NOT TARGET GnuTLS::GnuTLS) -+ add_library(GnuTLS::GnuTLS UNKNOWN IMPORTED) -+ set_target_properties(GnuTLS::GnuTLS PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}" -+ INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}" -+ IMPORTED_LINK_INTERFACE_LANGUAGES "C" -+ IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") -+ endif() -+endif() diff --git a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch deleted file mode 100644 index c488f05289..0000000000 --- a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=98rjan=20Malde?= -Date: Wed, 15 Jul 2020 12:16:16 +0200 -Subject: [PATCH] Include limits.h for INT_MAX - -[Retrieved from: -https://github.com/nih-at/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] -Signed-off-by: Paul Cercueil ---- - lib/zip_crypto_openssl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c -index 1cb00479..60f92758 100644 ---- a/lib/zip_crypto_openssl.c -+++ b/lib/zip_crypto_openssl.c -@@ -38,6 +38,7 @@ - #include "zip_crypto.h" - - #include -+#include - - #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) - #define USE_OPENSSL_1_0_API --- -2.28.0 - diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash index a298b9aba9..5afdfd7cb8 100644 --- a/package/libzip/libzip.hash +++ b/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 libzip-1.7.3.tar.xz +sha256 f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e libzip-1.8.0.tar.xz sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 4a028f970a..6bc5c5c193 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZIP_VERSION = 1.7.3 +LIBZIP_VERSION = 1.8.0 LIBZIP_SITE = https://libzip.org/download LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause @@ -54,5 +54,12 @@ else LIBZIP_CONF_OPTS += -DENABLE_LZMA=OFF endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +LIBZIP_DEPENDENCIES += zstd +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=ON +else +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Sat Jan 1 10:09:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:09:10 +0100 Subject: [Buildroot] [git commit] package/gawk: bump to version 5.1.1 Message-ID: <20220101100650.214C881851@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9865dc01ddab8d8048acb09787f4e1342cd4377f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.savannah.gnu.org/cgit/gawk.git/tree/NEWS?h=gawk-5.1.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gawk/gawk.hash | 4 ++-- package/gawk/gawk.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index 91e506607e..894c939c5b 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.1.1.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd gawk-5.1.0.tar.xz +sha256 d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2 gawk-5.1.1.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index ae2bbe5422..b55c74d00a 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.1.0 +GAWK_VERSION = 5.1.1 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk From yann.morin.1998 at free.fr Sat Jan 1 10:09:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:09:12 +0100 Subject: [Buildroot] [git commit] package/shairport-sync: bump to version 3.3.9 Message-ID: <20220101100650.2ABCF818B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a252a2852df8d42c1fd4b10afc2d0fa385e51186 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop second patch (already in version) https://github.com/mikebrady/shairport-sync/releases/tag/3.3.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...nfigure.ac-fix-build-with-automake-1.16.5.patch | 48 ---------------------- package/shairport-sync/shairport-sync.hash | 2 +- package/shairport-sync/shairport-sync.mk | 2 +- 3 files changed, 2 insertions(+), 50 deletions(-) diff --git a/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch b/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch deleted file mode 100644 index 2ee8f59fee..0000000000 --- a/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ad22edb303a470b6f9eda9fd9d3f588bb2eff8cb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 15 Oct 2021 08:02:23 +0200 -Subject: [PATCH] configure.ac: fix build with automake 1.16.5 - -Fix the following build failure with convolution raised since automake -1.16.5 and -https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624: - -configure.ac:305: error: AM_INIT_AUTOMAKE expanded multiple times -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... -configure.ac:6: the top level -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... -configure.ac:305: the top level - -Fixes: - - http://autobuild.buildroot.org/results/464148bdccb705d8992dc860262bfdeb01b7e2a1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1314] ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f77087c5..aa533a2d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ - - AC_PREREQ([2.50]) - AC_INIT([shairport-sync], [3.3.8], [4265913+mikebrady at users.noreply.github.com]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([subdir-objects]) - AC_CONFIG_SRCDIR([shairport.c]) - AC_CONFIG_HEADERS([config.h]) - AC_PROG_RANLIB -@@ -302,7 +302,6 @@ AM_CONDITIONAL([USE_PA], [test "x$with_pa" = "xyes"]) - # Look for Convolution flag - AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP convolution support])]) - if test "x$with_convolution" = "xyes" ; then -- AM_INIT_AUTOMAKE([subdir-objects]) - AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.]) - AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!)) - fi --- -2.33.0 - diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index ebc81dedc1..331866a379 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca shairport-sync-3.3.8.tar.gz +sha256 17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795 shairport-sync-3.3.9.tar.gz sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index ba8b44a621..cf49f2b2ed 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.3.8 +SHAIRPORT_SYNC_VERSION = 3.3.9 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause From yann.morin.1998 at free.fr Sat Jan 1 10:09:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:09:15 +0100 Subject: [Buildroot] [git commit] package/file: bump to version 5.41 Message-ID: <20220101100650.33CA48190F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d38b72bcd75392a88b5100839ac410859d0a6a79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (already in version) and so autoreconf - Update hash of vasprintf.c (changes not related to license: https://github.com/file/file/commit/80816651588efb79a5d054e13703bf2a3378d024 https://github.com/file/file/commit/43f7989076aa3731f3558c6954780bc7b2734b64) https://github.com/file/file/blob/FILE5_41/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/file/0001-Add-libmagic.pc.patch | 76 --------------------------------- package/file/file.hash | 10 ++--- package/file/file.mk | 4 +- 3 files changed, 6 insertions(+), 84 deletions(-) diff --git a/package/file/0001-Add-libmagic.pc.patch b/package/file/0001-Add-libmagic.pc.patch deleted file mode 100644 index b26d16224d..0000000000 --- a/package/file/0001-Add-libmagic.pc.patch +++ /dev/null @@ -1,76 +0,0 @@ -From d079cac1110cc2761417f0dcb0a142b217eb1eda Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 31 Jan 2020 20:26:29 +0100 -Subject: [PATCH] Add libmagic.pc - -libmagic can optionally depends on xz (for lzma) or bzip2 since version -5.38 and -https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7 -so add libmagic.pc so package (such as gerbera) that links with libmagic -will be able to use pkg-config to retrieve those static dependencies -For example, this will avoid the following build failure: - -[100%] Linking CXX executable gerbera -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf': -compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' - -Fixes: - - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugs.astron.com/view.php?id=136] ---- - Makefile.am | 5 +++++ - configure.ac | 2 +- - libmagic.pc.in | 10 ++++++++++ - 3 files changed, 16 insertions(+), 1 deletion(-) - create mode 100644 libmagic.pc.in - -diff --git a/Makefile.am b/Makefile.am -index 8bd927d9..2ab67ed7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,3 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = MAINT - - SUBDIRS = src magic tests doc python -+ -+# This variable must have 'exec' in its name, in order to be installed -+# by 'install-exec' target (instead of default 'install-data') -+pkgconfigexecdir = $(libdir)/pkgconfig -+pkgconfigexec_DATA = libmagic.pc -diff --git a/configure.ac b/configure.ac -index ac37fccd..b2e2e5b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -217,5 +217,5 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t - AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support]) - fi - --AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile]) -+AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc]) - AC_OUTPUT -diff --git a/libmagic.pc.in b/libmagic.pc.in -new file mode 100644 -index 00000000..3ad1290b ---- /dev/null -+++ b/libmagic.pc.in -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libmagic -+Description: Magic number recognition library -+Version: @VERSION@ -+Libs: -L${libdir} -lmagic -+Libs.private: @LIBS@ --- -2.24.1 - diff --git a/package/file/file.hash b/package/file/file.hash index 96efaf8483..33875776eb 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,7 +1,7 @@ # Locally calculated after verifying signature -# ftp://ftp.astron.com/pub/file/file-5.38.tar.gz.asc +# ftp://ftp.astron.com/pub/file/file-5.41.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A -sha256 593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34 file-5.38.tar.gz -sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING -sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h -sha256 58b5932aca6c10f2194290a3b26088ec9ba07ef6b52cc9bb2dd638cc634db6f1 src/vasprintf.c +sha256 13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f file-5.41.tar.gz +sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING +sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h +sha256 c4fa92d6504b88484a12140fe3e24b9b29b0112717f94b1ff4205d54828b1c70 src/vasprintf.c diff --git a/package/file/file.mk b/package/file/file.mk index c41a8eb3a4..12647af8bb 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.38 +FILE_VERSION = 5.41 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file HOST_FILE_DEPENDENCIES = host-zlib @@ -13,8 +13,6 @@ FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c FILE_CPE_ID_VENDOR = file_project -# We're patching configure.ac -FILE_AUTORECONF = YES HOST_FILE_CONF_OPTS = --disable-libseccomp ifeq ($(BR2_PACKAGE_BZIP2),y) From yann.morin.1998 at free.fr Sat Jan 1 10:12:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:12:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/gawk: bump to version 5.1.1 In-Reply-To: <20211230225958.3089672-1-fontaine.fabrice@gmail.com> References: <20211230225958.3089672-1-fontaine.fabrice@gmail.com> Message-ID: <20220101101258.GX3390456@scaer> Fabrice, All, On 2021-12-30 23:59 +0100, Fabrice Fontaine spake thusly: > https://git.savannah.gnu.org/cgit/gawk.git/tree/NEWS?h=gawk-5.1.1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gawk/gawk.hash | 4 ++-- > package/gawk/gawk.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash > index 91e506607e..894c939c5b 100644 > --- a/package/gawk/gawk.hash > +++ b/package/gawk/gawk.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz.sig > +# https://ftp.gnu.org/gnu/gawk/gawk-5.1.1.tar.xz.sig > # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 > -sha256 cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd gawk-5.1.0.tar.xz > +sha256 d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2 gawk-5.1.1.tar.xz > # Locally calculated > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk > index ae2bbe5422..b55c74d00a 100644 > --- a/package/gawk/gawk.mk > +++ b/package/gawk/gawk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GAWK_VERSION = 5.1.0 > +GAWK_VERSION = 5.1.1 > GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz > GAWK_SITE = $(BR2_GNU_MIRROR)/gawk > GAWK_DEPENDENCIES = host-gawk > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:13:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:13:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/shairport-sync: bump to version 3.3.9 In-Reply-To: <20211230230701.3177447-1-fontaine.fabrice@gmail.com> References: <20211230230701.3177447-1-fontaine.fabrice@gmail.com> Message-ID: <20220101101318.GY3390456@scaer> Fabrice, All, On 2021-12-31 00:07 +0100, Fabrice Fontaine spake thusly: > Drop second patch (already in version) > > https://github.com/mikebrady/shairport-sync/releases/tag/3.3.9 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...re.ac-fix-build-with-automake-1.16.5.patch | 48 ------------------- > package/shairport-sync/shairport-sync.hash | 2 +- > package/shairport-sync/shairport-sync.mk | 2 +- > 3 files changed, 2 insertions(+), 50 deletions(-) > delete mode 100644 package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch > > diff --git a/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch b/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch > deleted file mode 100644 > index 2ee8f59fee..0000000000 > --- a/package/shairport-sync/0002-configure.ac-fix-build-with-automake-1.16.5.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From ad22edb303a470b6f9eda9fd9d3f588bb2eff8cb Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 15 Oct 2021 08:02:23 +0200 > -Subject: [PATCH] configure.ac: fix build with automake 1.16.5 > - > -Fix the following build failure with convolution raised since automake > -1.16.5 and > -https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624: > - > -configure.ac:305: error: AM_INIT_AUTOMAKE expanded multiple times > -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... > -configure.ac:6: the top level > -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... > -configure.ac:305: the top level > - > -Fixes: > - - http://autobuild.buildroot.org/results/464148bdccb705d8992dc860262bfdeb01b7e2a1 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1314] > ---- > - configure.ac | 3 +-- > - 1 file changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/configure.ac b/configure.ac > -index f77087c5..aa533a2d 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -3,7 +3,7 @@ > - > - AC_PREREQ([2.50]) > - AC_INIT([shairport-sync], [3.3.8], [4265913+mikebrady at users.noreply.github.com]) > --AM_INIT_AUTOMAKE > -+AM_INIT_AUTOMAKE([subdir-objects]) > - AC_CONFIG_SRCDIR([shairport.c]) > - AC_CONFIG_HEADERS([config.h]) > - AC_PROG_RANLIB > -@@ -302,7 +302,6 @@ AM_CONDITIONAL([USE_PA], [test "x$with_pa" = "xyes"]) > - # Look for Convolution flag > - AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP convolution support])]) > - if test "x$with_convolution" = "xyes" ; then > -- AM_INIT_AUTOMAKE([subdir-objects]) > - AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.]) > - AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!)) > - fi > --- > -2.33.0 > - > diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash > index ebc81dedc1..331866a379 100644 > --- a/package/shairport-sync/shairport-sync.hash > +++ b/package/shairport-sync/shairport-sync.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca shairport-sync-3.3.8.tar.gz > +sha256 17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795 shairport-sync-3.3.9.tar.gz > sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES > diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk > index ba8b44a621..cf49f2b2ed 100644 > --- a/package/shairport-sync/shairport-sync.mk > +++ b/package/shairport-sync/shairport-sync.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SHAIRPORT_SYNC_VERSION = 3.3.8 > +SHAIRPORT_SYNC_VERSION = 3.3.9 > SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) > > SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:13:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:13:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/file: bump to version 5.41 In-Reply-To: <20211230231836.3197707-1-fontaine.fabrice@gmail.com> References: <20211230231836.3197707-1-fontaine.fabrice@gmail.com> Message-ID: <20220101101331.GZ3390456@scaer> Fabrice, All, On 2021-12-31 00:18 +0100, Fabrice Fontaine spake thusly: > - Drop patch (already in version) and so autoreconf > - Update hash of vasprintf.c (changes not related to license: > https://github.com/file/file/commit/80816651588efb79a5d054e13703bf2a3378d024 > https://github.com/file/file/commit/43f7989076aa3731f3558c6954780bc7b2734b64) > > https://github.com/file/file/blob/FILE5_41/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/file/0001-Add-libmagic.pc.patch | 76 ------------------------- > package/file/file.hash | 10 ++-- > package/file/file.mk | 4 +- > 3 files changed, 6 insertions(+), 84 deletions(-) > delete mode 100644 package/file/0001-Add-libmagic.pc.patch > > diff --git a/package/file/0001-Add-libmagic.pc.patch b/package/file/0001-Add-libmagic.pc.patch > deleted file mode 100644 > index b26d16224d..0000000000 > --- a/package/file/0001-Add-libmagic.pc.patch > +++ /dev/null > @@ -1,76 +0,0 @@ > -From d079cac1110cc2761417f0dcb0a142b217eb1eda Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 31 Jan 2020 20:26:29 +0100 > -Subject: [PATCH] Add libmagic.pc > - > -libmagic can optionally depends on xz (for lzma) or bzip2 since version > -5.38 and > -https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7 > -so add libmagic.pc so package (such as gerbera) that links with libmagic > -will be able to use pkg-config to retrieve those static dependencies > -For example, this will avoid the following build failure: > - > -[100%] Linking CXX executable gerbera > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf': > -compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' > -/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' > - > -Fixes: > - - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://bugs.astron.com/view.php?id=136] > ---- > - Makefile.am | 5 +++++ > - configure.ac | 2 +- > - libmagic.pc.in | 10 ++++++++++ > - 3 files changed, 16 insertions(+), 1 deletion(-) > - create mode 100644 libmagic.pc.in > - > -diff --git a/Makefile.am b/Makefile.am > -index 8bd927d9..2ab67ed7 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -3,3 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 > - EXTRA_DIST = MAINT > - > - SUBDIRS = src magic tests doc python > -+ > -+# This variable must have 'exec' in its name, in order to be installed > -+# by 'install-exec' target (instead of default 'install-data') > -+pkgconfigexecdir = $(libdir)/pkgconfig > -+pkgconfigexec_DATA = libmagic.pc > -diff --git a/configure.ac b/configure.ac > -index ac37fccd..b2e2e5b8 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -217,5 +217,5 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t > - AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support]) > - fi > - > --AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile]) > -+AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc]) > - AC_OUTPUT > -diff --git a/libmagic.pc.in b/libmagic.pc.in > -new file mode 100644 > -index 00000000..3ad1290b > ---- /dev/null > -+++ b/libmagic.pc.in > -@@ -0,0 +1,10 @@ > -+prefix=@prefix@ > -+exec_prefix=@exec_prefix@ > -+libdir=@libdir@ > -+includedir=@includedir@ > -+ > -+Name: libmagic > -+Description: Magic number recognition library > -+Version: @VERSION@ > -+Libs: -L${libdir} -lmagic > -+Libs.private: @LIBS@ > --- > -2.24.1 > - > diff --git a/package/file/file.hash b/package/file/file.hash > index 96efaf8483..33875776eb 100644 > --- a/package/file/file.hash > +++ b/package/file/file.hash > @@ -1,7 +1,7 @@ > # Locally calculated after verifying signature > -# ftp://ftp.astron.com/pub/file/file-5.38.tar.gz.asc > +# ftp://ftp.astron.com/pub/file/file-5.41.tar.gz.asc > # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A > -sha256 593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34 file-5.38.tar.gz > -sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING > -sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h > -sha256 58b5932aca6c10f2194290a3b26088ec9ba07ef6b52cc9bb2dd638cc634db6f1 src/vasprintf.c > +sha256 13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f file-5.41.tar.gz > +sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING > +sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h > +sha256 c4fa92d6504b88484a12140fe3e24b9b29b0112717f94b1ff4205d54828b1c70 src/vasprintf.c > diff --git a/package/file/file.mk b/package/file/file.mk > index c41a8eb3a4..12647af8bb 100644 > --- a/package/file/file.mk > +++ b/package/file/file.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FILE_VERSION = 5.38 > +FILE_VERSION = 5.41 > FILE_SITE = ftp://ftp.astron.com/pub/file > FILE_DEPENDENCIES = host-file > HOST_FILE_DEPENDENCIES = host-zlib > @@ -13,8 +13,6 @@ FILE_INSTALL_STAGING = YES > FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) > FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c > FILE_CPE_ID_VENDOR = file_project > -# We're patching configure.ac > -FILE_AUTORECONF = YES > HOST_FILE_CONF_OPTS = --disable-libseccomp > > ifeq ($(BR2_PACKAGE_BZIP2),y) > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:13:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:13:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libzip: bump to version 1.8.0 In-Reply-To: <20211230233920.3207191-1-fontaine.fabrice@gmail.com> References: <20211230233920.3207191-1-fontaine.fabrice@gmail.com> Message-ID: <20220101101344.GA3390456@scaer> Fabrice, All, On 2021-12-31 00:39 +0100, Fabrice Fontaine spake thusly: > - Drop patches (already in version) > - Add zstd optional dependency > > https://libzip.org/news/release-1.8.0.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...001-Add-FindGnuTLS-cmake-from-3-17-3.patch | 103 ------------------ > .../0002-Include-limits.h-for-INT_MAX.patch | 27 ----- > package/libzip/libzip.hash | 2 +- > package/libzip/libzip.mk | 9 +- > 4 files changed, 9 insertions(+), 132 deletions(-) > delete mode 100644 package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > delete mode 100644 package/libzip/0002-Include-limits.h-for-INT_MAX.patch > > diff --git a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch b/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > deleted file mode 100644 > index 30bc201048..0000000000 > --- a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch > +++ /dev/null > @@ -1,103 +0,0 @@ > -From 73f6f8ebff678a0847e6b197b574082cc285b528 Mon Sep 17 00:00:00 2001 > -From: Thomas Klausner > -Date: Sat, 25 Jul 2020 12:03:29 +0200 > -Subject: [PATCH] Add FindGnuTLS.cmake from 3.17.3. > - > -Addresses #199 > - > -[Retrieved from: > -https://github.com/nih-at/libzip/commit/73f6f8ebff678a0847e6b197b574082cc285b528] > -Signed-off-by: Fabrice Fontaine > ---- > - cmake-compat/FindGnuTLS.cmake | 82 +++++++++++++++++++++++++++++++++++ > - 1 file changed, 82 insertions(+) > - create mode 100644 cmake-compat/FindGnuTLS.cmake > - > -diff --git a/cmake-compat/FindGnuTLS.cmake b/cmake-compat/FindGnuTLS.cmake > -new file mode 100644 > -index 00000000..819f0001 > ---- /dev/null > -+++ b/cmake-compat/FindGnuTLS.cmake > -@@ -0,0 +1,82 @@ > -+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying > -+# file Copyright.txt or https://cmake.org/licensing for details. > -+ > -+#[=======================================================================[.rst: > -+FindGnuTLS > -+---------- > -+ > -+Find the GNU Transport Layer Security library (gnutls) > -+ > -+IMPORTED Targets > -+^^^^^^^^^^^^^^^^ > -+ > -+This module defines :prop_tgt:`IMPORTED` target ``GnuTLS::GnuTLS``, if > -+gnutls has been found. > -+ > -+Result Variables > -+^^^^^^^^^^^^^^^^ > -+ > -+``GNUTLS_FOUND`` > -+ System has gnutls > -+``GNUTLS_INCLUDE_DIR`` > -+ The gnutls include directory > -+``GNUTLS_LIBRARIES`` > -+ The libraries needed to use gnutls > -+``GNUTLS_DEFINITIONS`` > -+ Compiler switches required for using gnutls > -+``GNUTLS_VERSION`` > -+ version of gnutls. > -+#]=======================================================================] > -+ > -+# Note that this doesn't try to find the gnutls-extra package. > -+ > -+ > -+if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARY) > -+ # in cache already > -+ set(gnutls_FIND_QUIETLY TRUE) > -+endif () > -+ > -+if (NOT WIN32) > -+ # try using pkg-config to get the directories and then use these values > -+ # in the find_path() and find_library() calls > -+ # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful > -+ find_package(PkgConfig QUIET) > -+ PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls) > -+ set(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) > -+ set(GNUTLS_VERSION ${PC_GNUTLS_VERSION}) > -+ # keep for backward compatibility > -+ set(GNUTLS_VERSION_STRING ${PC_GNUTLS_VERSION}) > -+endif () > -+ > -+find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h > -+ HINTS > -+ ${PC_GNUTLS_INCLUDEDIR} > -+ ${PC_GNUTLS_INCLUDE_DIRS} > -+ ) > -+ > -+find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls > -+ HINTS > -+ ${PC_GNUTLS_LIBDIR} > -+ ${PC_GNUTLS_LIBRARY_DIRS} > -+ ) > -+ > -+mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) > -+ > -+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) > -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS > -+ REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR > -+ VERSION_VAR GNUTLS_VERSION_STRING) > -+ > -+if(GNUTLS_FOUND) > -+ set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) > -+ set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) > -+ > -+ if(NOT TARGET GnuTLS::GnuTLS) > -+ add_library(GnuTLS::GnuTLS UNKNOWN IMPORTED) > -+ set_target_properties(GnuTLS::GnuTLS PROPERTIES > -+ INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}" > -+ INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}" > -+ IMPORTED_LINK_INTERFACE_LANGUAGES "C" > -+ IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") > -+ endif() > -+endif() > diff --git a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch > deleted file mode 100644 > index c488f05289..0000000000 > --- a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch > +++ /dev/null > @@ -1,27 +0,0 @@ > -From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?=C3=98rjan=20Malde?= > -Date: Wed, 15 Jul 2020 12:16:16 +0200 > -Subject: [PATCH] Include limits.h for INT_MAX > - > -[Retrieved from: > -https://github.com/nih-at/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] > -Signed-off-by: Paul Cercueil > ---- > - lib/zip_crypto_openssl.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c > -index 1cb00479..60f92758 100644 > ---- a/lib/zip_crypto_openssl.c > -+++ b/lib/zip_crypto_openssl.c > -@@ -38,6 +38,7 @@ > - #include "zip_crypto.h" > - > - #include > -+#include > - > - #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) > - #define USE_OPENSSL_1_0_API > --- > -2.28.0 > - > diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash > index a298b9aba9..5afdfd7cb8 100644 > --- a/package/libzip/libzip.hash > +++ b/package/libzip/libzip.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 libzip-1.7.3.tar.xz > +sha256 f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e libzip-1.8.0.tar.xz > sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE > diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk > index 4a028f970a..6bc5c5c193 100644 > --- a/package/libzip/libzip.mk > +++ b/package/libzip/libzip.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBZIP_VERSION = 1.7.3 > +LIBZIP_VERSION = 1.8.0 > LIBZIP_SITE = https://libzip.org/download > LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz > LIBZIP_LICENSE = BSD-3-Clause > @@ -54,5 +54,12 @@ else > LIBZIP_CONF_OPTS += -DENABLE_LZMA=OFF > endif > > +ifeq ($(BR2_PACKAGE_ZSTD),y) > +LIBZIP_DEPENDENCIES += zstd > +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=ON > +else > +LIBZIP_CONF_OPTS += -DENABLE_ZSTD=OFF > +endif > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:17:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:17:52 +0100 Subject: [Buildroot] [git commit] package/openjdk: Make sure for ARC only Zero is selectable Message-ID: <20220101101449.662E981A0E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef7ace1017f13ca9266bb689c18bc008cca92ed2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit a5d2c379ebf5 (package/openjdk: add ARC HS3x/4x support via "Zero Assembly Project") forgot to limit the scope of the ARC support. As of now for ARC we only have fully-interpreted mode AKA "Project Zero" and so all the JIT'ed modes must be explicitly disabled for ARC. Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/openjdk/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index b6eb2d7818..8b7fd4653e 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -126,19 +126,19 @@ config BR2_PACKAGE_OPENJDK_FULL_JDK choice prompt "openjdk variant" - default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc + default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !(BR2_powerpc || BR2_arc) default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_arc config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT bool "client" - depends on !BR2_powerpc + depends on !(BR2_powerpc || BR2_arc) help Quick loading, but slower run-time performance. config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER bool "server" - depends on !BR2_powerpc + depends on !(BR2_powerpc || BR2_arc) help Slower loading, but faster run-time performance. From yann.morin.1998 at free.fr Sat Jan 1 10:22:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:22:06 +0100 Subject: [Buildroot] [PATCH] package/openjdk: Make sure for ARC only Zero is selectable In-Reply-To: <20211230225719.31728-1-abrodkin@synopsys.com> References: <20211230225719.31728-1-abrodkin@synopsys.com> Message-ID: <20220101102206.GB3390456@scaer> Alexey, All, On 2021-12-31 01:57 +0300, Alexey Brodkin via buildroot spake thusly: > As of now for ARC we only have fully-interpreted mode AKA > "Project Zero" and so all the JIT'ed modes must be explicitly > disabled for ARC. Doing it now as it was not done in the initial > submission > > Signed-off-by: Alexey Brodkin > Cc: Thomas Petazzoni I've slightly reworded the commit log to adde the actual reference to the initial commit, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/openjdk/Config.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in > index b6eb2d7818..8b7fd4653e 100644 > --- a/package/openjdk/Config.in > +++ b/package/openjdk/Config.in > @@ -126,19 +126,19 @@ config BR2_PACKAGE_OPENJDK_FULL_JDK > > choice > prompt "openjdk variant" > - default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc > + default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !(BR2_powerpc || BR2_arc) > default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc > default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_arc > > config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT > bool "client" > - depends on !BR2_powerpc > + depends on !(BR2_powerpc || BR2_arc) > help > Quick loading, but slower run-time performance. > > config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER > bool "server" > - depends on !BR2_powerpc > + depends on !(BR2_powerpc || BR2_arc) > help > Slower loading, but faster run-time performance. > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:26:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:26:16 +0100 Subject: [Buildroot] [git commit] package/libexecinfo: needs dynamic library Message-ID: <20220101102026.B6B9D8190F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c87659ec8030de5155667664de1bf67ab18a7613 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit eea8ba446c10701a273432552108d80fb2224ef4: execinfo.c:32:10: fatal error: dlfcn.h: No such file or directory 32 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ea33c8c6aa5091983837609eec5d129902183ef1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libexecinfo/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libexecinfo/Config.in b/package/libexecinfo/Config.in index 473a4f7181..e90dfc4e87 100644 --- a/package/libexecinfo/Config.in +++ b/package/libexecinfo/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_LIBEXECINFO bool "libexecinfo" + depends on !BR2_STATIC_LIBS # dlfcn.h depends on !BR2_TOOLCHAIN_USES_GLIBC help Library for inspecting program's backtrace https://github.com/mikroskeem/libexecinfo + +comment "libexecinfo needs a musl or uclibc toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS From yann.morin.1998 at free.fr Sat Jan 1 10:26:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:26:49 +0100 Subject: [Buildroot] [git commit] package/nodejs: bump to version 14.18.2 Message-ID: <20220101102139.B5F5F81D8B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06735b085fd595ffc233e48cc5a57f4fa555b02c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: Please use python3.9 or python3.8 or python3.7 or python3.6 or python3.5 or python2.7. /usr/bin/python3.7 ./configure /usr/bin/python3.5 ./configure /home/peko/autobuild/instance-1/output-1/host/bin/python2.7 ./configure Node.js configure: Found Python 3.10.1... https://github.com/nodejs/node/releases/tag/v14.18.2 Fixes: - http://autobuild.buildroot.org/results/9e2ebb9c3681ec0485eaa042fa838c8ee62f649b Signed-off-by: Fabrice Fontaine Tested-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 3a4571e8e5..f330757341 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.17.6/SHASUMS256.txt -sha256 3fa1d71adddfab2f5e3e41874b4eddbdf92b65cade4a43922fb1e437afcf89ed node-v14.18.1.tar.xz +# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt +sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 42ef1baa64..44bf786dfd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.1 +NODEJS_VERSION = 14.18.2 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ From yann.morin.1998 at free.fr Sat Jan 1 10:28:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:28:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: bump to version 14.18.2 In-Reply-To: <20211231100725.3662078-1-fontaine.fabrice@gmail.com> References: <20211231100725.3662078-1-fontaine.fabrice@gmail.com> Message-ID: <20220101102813.GC3390456@scaer> On 2021-12-31 11:07 +0100, Fabrice Fontaine spake thusly: Fabrice, All, > This bump will fix the following build failure raised since bump of > python3 to version 3.10.1 in commit > 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > Please use python3.9 or python3.8 or python3.7 or python3.6 or python3.5 or python2.7. > /usr/bin/python3.7 ./configure > /usr/bin/python3.5 ./configure > /home/peko/autobuild/instance-1/output-1/host/bin/python2.7 ./configure > Node.js configure: Found Python 3.10.1... > > https://github.com/nodejs/node/releases/tag/v14.18.2 > > Fixes: > - http://autobuild.buildroot.org/results/9e2ebb9c3681ec0485eaa042fa838c8ee62f649b > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nodejs/nodejs.hash | 4 ++-- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash > index 3a4571e8e5..f330757341 100644 > --- a/package/nodejs/nodejs.hash > +++ b/package/nodejs/nodejs.hash > @@ -1,5 +1,5 @@ > -# From https://nodejs.org/dist/v14.17.6/SHASUMS256.txt > -sha256 3fa1d71adddfab2f5e3e41874b4eddbdf92b65cade4a43922fb1e437afcf89ed node-v14.18.1.tar.xz > +# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt > +sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz > > # Hash for license file > sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 322eed6d19..7d5c93eb93 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NODEJS_VERSION = 14.18.1 > +NODEJS_VERSION = 14.18.2 > NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz > NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) > NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 10:39:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:39:55 +0100 Subject: [Buildroot] [git commit] package/assimp: fix namespace related compile failure Message-ID: <20220101103427.6806381D8B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6dfb23a407f5c8c5cf6678554f39a8bd32a26d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - http://autobuild.buildroot.net/results/0861c66ec02a55e984577094e28b65c78b95a330 .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] const FileDatabase &db) const { ^ In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] void Convert(T &dest, const FileDatabase &db) const; ^ .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] const FileDatabase &db) const { ^ In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] void Convert(T &dest, const FileDatabase &db) const; ^ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: update upstream status] Signed-off-by: Yann E. MORIN --- ...e-use-explicit-namespace-instead-of-using.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch new file mode 100644 index 0000000000..c83e9c50a4 --- /dev/null +++ b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch @@ -0,0 +1,57 @@ +From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 30 Dec 2021 18:01:54 +0100 +Subject: [PATCH] BlenderScene: use explicit namespace instead of using + namespace + +Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): + + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] + const FileDatabase &db) const { + ^ + In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, + from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] + void Convert(T &dest, const FileDatabase &db) const; + ^ + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] + const FileDatabase &db) const { + ^ + In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, + from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] + void Convert(T &dest, const FileDatabase &db) const; + ^ + +[backport from upstream commit a099fe7cd331] +Signed-off-by: Peter Seiderer +--- + code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp +index c93d913fc..9ad086fe6 100644 +--- a/code/AssetLib/Blender/BlenderScene.cpp ++++ b/code/AssetLib/Blender/BlenderScene.cpp +@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "BlenderDNA.h" + #include "BlenderSceneGen.h" + +-using namespace Assimp; +-using namespace Assimp::Blender; ++namespace Assimp { ++namespace Blender { + + //-------------------------------------------------------------------------------- + template <> +@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { + converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); + } + ++} // namespace Blender ++} //namespace Assimp ++ + #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER +-- +2.34.1 + From yann.morin.1998 at free.fr Sat Jan 1 10:43:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 11:43:11 +0100 Subject: [Buildroot] [RFC v1] package/assimp: fix namespace related compile failure In-Reply-To: <20211230172507.30212-1-ps.report@gmx.net> References: <20211230172507.30212-1-ps.report@gmx.net> Message-ID: <20220101104311.GD3390456@scaer> Peter, All, On 2021-12-30 18:25 +0100, Peter Seiderer spake thusly: > Fixes: > > - http://autobuild.buildroot.net/results/0861c66ec02a55e984577094e28b65c78b95a330 > > .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > const FileDatabase &db) const { > ^ > In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > void Convert(T &dest, const FileDatabase &db) const; > ^ > .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > const FileDatabase &db) const { > ^ > In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > void Convert(T &dest, const FileDatabase &db) const; > ^ > > Signed-off-by: Peter Seiderer > --- > Note: > - patch fixes the compile failure but did not find the root cause > and/or a good explanation why the template spezialisation failes > for Structure::Convert and > Structure::Convert (but not the other ones) and > why it is fixed by the patch... Since this is now an upstream commit, I've applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-explicit-namespace-instead-of-using.patch | 56 +++++++++++++++++++ > 1 file changed, 56 insertions(+) > create mode 100644 package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > > diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > new file mode 100644 > index 0000000000..b498c3be3f > --- /dev/null > +++ b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > @@ -0,0 +1,56 @@ > +From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Thu, 30 Dec 2021 18:01:54 +0100 > +Subject: [PATCH] BlenderScene: use explicit namespace instead of using > + namespace > + > +Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): > + > + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > + const FileDatabase &db) const { > + ^ > + In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > + from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > + void Convert(T &dest, const FileDatabase &db) const; > + ^ > + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > + const FileDatabase &db) const { > + ^ > + In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > + from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > + .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > + void Convert(T &dest, const FileDatabase &db) const; > + ^ > + > +Signed-off-by: Peter Seiderer > +--- > + code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- > + 1 file changed, 5 insertions(+), 2 deletions(-) > + > +diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp > +index c93d913fc..9ad086fe6 100644 > +--- a/code/AssetLib/Blender/BlenderScene.cpp > ++++ b/code/AssetLib/Blender/BlenderScene.cpp > +@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + #include "BlenderDNA.h" > + #include "BlenderSceneGen.h" > + > +-using namespace Assimp; > +-using namespace Assimp::Blender; > ++namespace Assimp { > ++namespace Blender { > + > + //-------------------------------------------------------------------------------- > + template <> > +@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { > + converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); > + } > + > ++} // namespace Blender > ++} //namespace Assimp > ++ > + #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sat Jan 1 10:50:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 1 Jan 2022 11:50:58 +0100 Subject: [Buildroot] [buildroot-test] scripts/autobuild-run: extend timeout from 120 to 180 minutes In-Reply-To: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> References: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> Message-ID: <20220101115058.0515c8d9@windsurf> Hello Giulio, On Fri, 1 Oct 2021 01:14:24 +0200 Giulio Benetti wrote: > During the last months some package started to timeout, but this is not due > to toolchain infinite loop. I think it's due to the increase of the source > code files' length and to complexity of toolchains or even slow compiling > time. For example python-uvloop and python-lxml only take long time to > build with -Os optimization and this makes it seem a TIMEOUT but it's not. > So let's extend timeout setting from 120 to 180 minutes to avoid false > TIMEOUTs. > > Signed-off-by: Giulio Benetti Do you have a specific example where you have seen a failure? Please note that this HUNG_BUILD_TIMEOUT value is the per-step timeout: it verifies that one step of one particular package doesn't take more than 120 minutes. Unless you have a specific example where you have seen this timeout causing false positives, I'm not really keen on applying such a patch as it would cause situations where the build is really stuck to be stuck for 3 hours instead of 2. Did you identify that the python-uvloop and python-lxml packages really took more than 2 hours to build? I did see at http://autobuild.buildroot.net/?status=TIMEOUT those timeouts dating back from ~November. Did you reproduce the issue, and verified that the build indeed completes at some point? In general, if a simple package such as python-uvloop or python-lxml takes more than 2 hours to build, it means that the compiler (or linker) has gone crazy in an infinite loop, and the build will in fact never finish. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 1 11:00:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 12:00:31 +0100 Subject: [Buildroot] [git commit] package/freeipmi: new package Message-ID: <20220101105445.6819782628@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=663f39c88c01593855c18355a4decdceeffd884b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master FreeIPMI provides in-band and out-of-band IPMI software based on the IPMI v1.5/2.0 specification. The IPMI specification defines a set of interfaces for platform management and is implemented by a number vendors for system management. The features of IPMI that most users will be interested in are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL). https://www.gnu.org/software/freeipmi/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/freeipmi/0001-fix-build-on-musl.patch | 49 +++++++++++++++++++++++++++ package/freeipmi/Config.in | 20 +++++++++++ package/freeipmi/freeipmi.hash | 15 ++++++++ package/freeipmi/freeipmi.mk | 35 +++++++++++++++++++ 6 files changed, 121 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 78e41b7d7c..21e4f2a84c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -858,6 +858,7 @@ F: package/daq3/ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ +F: package/freeipmi/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index ce12e5f3c5..d3d0717535 100644 --- a/package/Config.in +++ b/package/Config.in @@ -478,6 +478,7 @@ endmenu source "package/fconfig/Config.in" source "package/flashrom/Config.in" source "package/fmtools/Config.in" + source "package/freeipmi/Config.in" source "package/freescale-imx/Config.in" source "package/fxload/Config.in" source "package/gcnano-binaries/Config.in" diff --git a/package/freeipmi/0001-fix-build-on-musl.patch b/package/freeipmi/0001-fix-build-on-musl.patch new file mode 100644 index 0000000000..ff7425d221 --- /dev/null +++ b/package/freeipmi/0001-fix-build-on-musl.patch @@ -0,0 +1,49 @@ +From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 30 Oct 2021 00:26:40 +0200 +Subject: [PATCH] fix build on musl + +musl doesn't provide getmsg or putmsg even if stropts.h is available + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2] +--- + configure.ac | 1 + + libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 562dd624e..711b27674 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) + AC_CHECK_FUNCS([iopl]) + AC_CHECK_FUNCS([asprintf]) + AC_CHECK_FUNCS([cbrt]) ++AC_CHECK_FUNCS([getmsg putmsg]) + + dnl sighandler_t apparently not defined in Apple/OS X + AC_CHECK_TYPES([sighandler_t], [], [], [[#include ]]) +diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c +index 05caca8b6..4ae8c5719 100644 +--- a/libfreeipmi/driver/ipmi-sunbmc-driver.c ++++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c +@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx, + assert (ctx->io_init); + assert (ctx->putmsg_intf); + +-#if defined(HAVE_SYS_STROPTS_H) ++#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG) + memset (&sbuf, '\0', sizeof (struct strbuf)); + + /* Due to API differences, we need to extract the cmd out of the +@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx, + return (-1); + } + +-#if defined(HAVE_SYS_STROPTS_H) ++#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG) + if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0) + { + SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno); diff --git a/package/freeipmi/Config.in b/package/freeipmi/Config.in new file mode 100644 index 0000000000..8ef2e137fa --- /dev/null +++ b/package/freeipmi/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_FREEIPMI + bool "freeipmi" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + help + FreeIPMI provides in-band and out-of-band IPMI software based + on the IPMI v1.5/2.0 specification. + + The IPMI specification defines a set of interfaces for + platform management and is implemented by a number vendors + for system management. The features of IPMI that most users + will be interested in are sensor monitoring, system event + monitoring, power control, and serial-over-LAN (SOL). + + https://www.gnu.org/software/freeipmi/ + +comment "freeipmi needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash new file mode 100644 index 0000000000..f73b4a25fe --- /dev/null +++ b/package/freeipmi/freeipmi.hash @@ -0,0 +1,15 @@ +# Locally computed: +sha256 4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71 freeipmi-1.6.8.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmi-dcmi +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmidetect +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmi-fru +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmimonitoring +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiping +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmipower +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiseld +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.pstdout +sha256 48f44386b3f359e70d7e4a5d7f1d529d8591a7c64c47df3f4abdf2ad45a6d537 COPYING.sunbmc +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ZRESEARCH diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk new file mode 100644 index 0000000000..b25ef0a4c6 --- /dev/null +++ b/package/freeipmi/freeipmi.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# freeipmi +# +################################################################################ + +FREEIPMI_VERSION = 1.6.8 +FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi +FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) +FREEIPMI_LICENSE_FILES = \ + COPYING COPYING.bmc-watchdog COPYING.ipmiconsole COPYING.ipmi-dcmi \ + COPYING.ipmidetect COPYING.ipmi-fru COPYING.ipmimonitoring \ + COPYING.ipmiping COPYING.ipmipower COPYING.ipmiseld COPYING.pstdout \ + COPYING.sunbmc COPYING.ZRESEARCH +FREEIPMI_DEPENDENCIES = host-pkgconf +FREEIPMI_INSTALL_STAGING = YES +# We're patching configure.ac +FREEIPMI_AUTORECONF = YES +# Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE +FREEIPMI_CONF_OPTS = --without-random-device + +# Work around for uClibc or musl toolchains which lack argp_*() +# functions. +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) +FREEIPMI_DEPENDENCIES += argp-standalone +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +FREEIPMI_CONF_OPTS += --with-encryption +FREEIPMI_DEPENDENCIES += libgcrypt +else +FREEIPMI_CONF_OPTS += --without-encryption +endif + +$(eval $(autotools-package)) From yann.morin.1998 at free.fr Sat Jan 1 11:01:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 12:01:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: new package In-Reply-To: <20211227124417.1509743-1-fontaine.fabrice@gmail.com> References: <20211227124417.1509743-1-fontaine.fabrice@gmail.com> Message-ID: <20220101110127.GE3390456@scaer> Fabrice, All, On 2021-12-27 13:44 +0100, Fabrice Fontaine spake thusly: > FreeIPMI provides in-band and out-of-band IPMI software based on the > IPMI v1.5/2.0 specification. > > The IPMI specification defines a set of interfaces for platform > management and is implemented by a number vendors for system management. > The features of IPMI that most users will be interested in are sensor > monitoring, system event monitoring, power control, and serial-over-LAN > (SOL). > > https://www.gnu.org/software/freeipmi/ > > Signed-off-by: Fabrice Fontaine [--SNIP--] > diff --git a/package/freeipmi/0001-fix-build-on-musl.patch b/package/freeipmi/0001-fix-build-on-musl.patch > new file mode 100644 > index 0000000000..0a570b8841 > --- /dev/null > +++ b/package/freeipmi/0001-fix-build-on-musl.patch > @@ -0,0 +1,49 @@ > +From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 30 Oct 2021 00:26:40 +0200 > +Subject: [PATCH] fix build on musl > + > +musl doesn't provide getmsg or putmsg even if stropts.h is available > + > +Signed-off-by: Fabrice Fontaine > +[Retrieved from: > +https://github.com/chu11/freeipmi-mirror/commit/6295c96ae54cb16efe41e53f526a4dc19cd719f2] I've changed that to point to the official git repository: https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2 Applied to master, thanks. Regards, Yann E. MORIN. > +--- > + configure.ac | 1 + > + libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++-- > + 2 files changed, 3 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 562dd624e..711b27674 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) > + AC_CHECK_FUNCS([iopl]) > + AC_CHECK_FUNCS([asprintf]) > + AC_CHECK_FUNCS([cbrt]) > ++AC_CHECK_FUNCS([getmsg putmsg]) > + > + dnl sighandler_t apparently not defined in Apple/OS X > + AC_CHECK_TYPES([sighandler_t], [], [], [[#include ]]) > +diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c > +index 05caca8b6..4ae8c5719 100644 > +--- a/libfreeipmi/driver/ipmi-sunbmc-driver.c > ++++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c > +@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx, > + assert (ctx->io_init); > + assert (ctx->putmsg_intf); > + > +-#if defined(HAVE_SYS_STROPTS_H) > ++#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG) > + memset (&sbuf, '\0', sizeof (struct strbuf)); > + > + /* Due to API differences, we need to extract the cmd out of the > +@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx, > + return (-1); > + } > + > +-#if defined(HAVE_SYS_STROPTS_H) > ++#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG) > + if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0) > + { > + SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno); > diff --git a/package/freeipmi/Config.in b/package/freeipmi/Config.in > new file mode 100644 > index 0000000000..8ef2e137fa > --- /dev/null > +++ b/package/freeipmi/Config.in > @@ -0,0 +1,20 @@ > +config BR2_PACKAGE_FREEIPMI > + bool "freeipmi" > + depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_HAS_THREADS > + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL > + help > + FreeIPMI provides in-band and out-of-band IPMI software based > + on the IPMI v1.5/2.0 specification. > + > + The IPMI specification defines a set of interfaces for > + platform management and is implemented by a number vendors > + for system management. The features of IPMI that most users > + will be interested in are sensor monitoring, system event > + monitoring, power control, and serial-over-LAN (SOL). > + > + https://www.gnu.org/software/freeipmi/ > + > +comment "freeipmi needs a toolchain w/ threads" > + depends on BR2_USE_MMU > + depends on !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash > new file mode 100644 > index 0000000000..f73b4a25fe > --- /dev/null > +++ b/package/freeipmi/freeipmi.hash > @@ -0,0 +1,15 @@ > +# Locally computed: > +sha256 4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71 freeipmi-1.6.8.tar.gz > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmi-dcmi > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmidetect > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmi-fru > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmimonitoring > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiping > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmipower > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiseld > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.pstdout > +sha256 48f44386b3f359e70d7e4a5d7f1d529d8591a7c64c47df3f4abdf2ad45a6d537 COPYING.sunbmc > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ZRESEARCH > diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk > new file mode 100644 > index 0000000000..b25ef0a4c6 > --- /dev/null > +++ b/package/freeipmi/freeipmi.mk > @@ -0,0 +1,35 @@ > +################################################################################ > +# > +# freeipmi > +# > +################################################################################ > + > +FREEIPMI_VERSION = 1.6.8 > +FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi > +FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) > +FREEIPMI_LICENSE_FILES = \ > + COPYING COPYING.bmc-watchdog COPYING.ipmiconsole COPYING.ipmi-dcmi \ > + COPYING.ipmidetect COPYING.ipmi-fru COPYING.ipmimonitoring \ > + COPYING.ipmiping COPYING.ipmipower COPYING.ipmiseld COPYING.pstdout \ > + COPYING.sunbmc COPYING.ZRESEARCH > +FREEIPMI_DEPENDENCIES = host-pkgconf > +FREEIPMI_INSTALL_STAGING = YES > +# We're patching configure.ac > +FREEIPMI_AUTORECONF = YES > +# Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE > +FREEIPMI_CONF_OPTS = --without-random-device > + > +# Work around for uClibc or musl toolchains which lack argp_*() > +# functions. > +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) > +FREEIPMI_DEPENDENCIES += argp-standalone > +endif > + > +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > +FREEIPMI_CONF_OPTS += --with-encryption > +FREEIPMI_DEPENDENCIES += libgcrypt > +else > +FREEIPMI_CONF_OPTS += --without-encryption > +endif > + > +$(eval $(autotools-package)) > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 11:02:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 12:02:54 +0100 Subject: [Buildroot] [git commit] package/sslh: bump to version 1.22c Message-ID: <20220101105810.36D7682258@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b9c58531e97b012a8a11c6ae5145b16dcfb8f74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - pcre2 is mandatory since version 1.22b and https://github.com/yrutschle/sslh/commit/37d275670345bc177d4081d7d348c0943f743132 - Drop patch (not needed anymore) https://github.com/yrutschle/sslh/blob/v1.22c/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...001-Makefile-fix-static-linking-with-pcre.patch | 41 ---------------------- package/sslh/Config.in | 1 + package/sslh/sslh.hash | 2 +- package/sslh/sslh.mk | 10 ++---- 4 files changed, 4 insertions(+), 50 deletions(-) diff --git a/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch b/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch deleted file mode 100644 index 5fc3296da5..0000000000 --- a/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0d9e004d324cc030c173de04c40db51a0f22bb5c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 07:58:05 +0200 -Subject: [PATCH] Makefile: fix static linking with pcre - -Static build with pcre is broken since version 1.19b and -https://github.com/yrutschle/sslh/commit/cb90cc97ae64a445242e517847c6e44b7003eda4 -because -lpcre has been replaced by -lpcreposix which will result in -the following static build failure: - -/srv/storage/autobuild/run/instance-1/output-1/host/bin/mipsel-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -o echosrv echosrv.o probe.o common.o tls.o -lpcreposix -lconfig -lcap -/srv/storage/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/8.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-1/output-1/host/mipsel-buildroot-linux-uclibc/sysroot/usr/lib/libpcreposix.a(libpcreposix_la-pcreposix.o): in function `regfree': -pcreposix.c:(.text+0x120): undefined reference to `pcre_free' - -So append -lpcre after -lpcreposix - -Fixes: - - http://autobuild.buildroot.org/results/a601824fc0c205a6a940e0f9f079ce2c39840605 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/yrutschle/sslh/pull/280] ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 986cf1c..ecadc22 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,7 +43,7 @@ endif - - ifneq ($(strip $(USELIBPCRE)),) - CPPFLAGS+=-DLIBPCRE -- LIBS:=$(LIBS) -lpcreposix -+ LIBS:=$(LIBS) -lpcreposix -lpcre - endif - - ifneq ($(strip $(USELIBCONFIG)),) --- -2.28.0 - diff --git a/package/sslh/Config.in b/package/sslh/Config.in index f6b46f3218..a1d5211851 100644 --- a/package/sslh/Config.in +++ b/package/sslh/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_SSLH bool "sslh" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBCONFIG if BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_PCRE2 help Applicative protocol multiplexer diff --git a/package/sslh/sslh.hash b/package/sslh/sslh.hash index 00e5c12d77..ae678563da 100644 --- a/package/sslh/sslh.hash +++ b/package/sslh/sslh.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 sslh-v1.21c.tar.gz +sha256 8e3742d14edf4119350cfdc7bb96b89134d9218eb6d2a6e1f70891ca18a649b1 sslh-v1.22c.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 4bde143cd8..99fb6bf922 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -4,11 +4,12 @@ # ################################################################################ -SSLH_VERSION = 1.21c +SSLH_VERSION = 1.22c SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz SSLH_SITE = http://www.rutschle.net/tech/sslh SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING +SSLH_DEPENDENCIES = pcre2 SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) @@ -33,13 +34,6 @@ else SSLH_MAKE_OPTS += USELIBCONFIG= endif -ifeq ($(BR2_PACKAGE_PCRE),y) -SSLH_DEPENDENCIES += pcre -SSLH_MAKE_OPTS += USELIBPCRE=1 -else -SSLH_MAKE_OPTS += USELIBPCRE= -endif - ifeq ($(BR2_PACKAGE_SYSTEMD),y) SSLH_DEPENDENCIES += systemd SSLH_MAKE_OPTS += USESYSTEMD=1 From yann.morin.1998 at free.fr Sat Jan 1 11:05:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 12:05:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/sslh: bump to version 1.22c In-Reply-To: <20211230225204.3080462-1-fontaine.fabrice@gmail.com> References: <20211230225204.3080462-1-fontaine.fabrice@gmail.com> Message-ID: <20220101110512.GF3390456@scaer> Fabrice, All, On 2021-12-30 23:52 +0100, Fabrice Fontaine spake thusly: > - pcre2 is mandatory since version 1.22b and > https://github.com/yrutschle/sslh/commit/37d275670345bc177d4081d7d348c0943f743132 > - Drop patch (not needed anymore) > > https://github.com/yrutschle/sslh/blob/v1.22c/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...akefile-fix-static-linking-with-pcre.patch | 41 ------------------- > package/sslh/Config.in | 1 + > package/sslh/sslh.hash | 2 +- > package/sslh/sslh.mk | 10 +---- > 4 files changed, 4 insertions(+), 50 deletions(-) > delete mode 100644 package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch > > diff --git a/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch b/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch > deleted file mode 100644 > index 5fc3296da5..0000000000 > --- a/package/sslh/0001-Makefile-fix-static-linking-with-pcre.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -From 0d9e004d324cc030c173de04c40db51a0f22bb5c Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Thu, 15 Oct 2020 07:58:05 +0200 > -Subject: [PATCH] Makefile: fix static linking with pcre > - > -Static build with pcre is broken since version 1.19b and > -https://github.com/yrutschle/sslh/commit/cb90cc97ae64a445242e517847c6e44b7003eda4 > -because -lpcre has been replaced by -lpcreposix which will result in > -the following static build failure: > - > -/srv/storage/autobuild/run/instance-1/output-1/host/bin/mipsel-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -o echosrv echosrv.o probe.o common.o tls.o -lpcreposix -lconfig -lcap > -/srv/storage/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/8.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-1/output-1/host/mipsel-buildroot-linux-uclibc/sysroot/usr/lib/libpcreposix.a(libpcreposix_la-pcreposix.o): in function `regfree': > -pcreposix.c:(.text+0x120): undefined reference to `pcre_free' > - > -So append -lpcre after -lpcreposix > - > -Fixes: > - - http://autobuild.buildroot.org/results/a601824fc0c205a6a940e0f9f079ce2c39840605 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/yrutschle/sslh/pull/280] > ---- > - Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index 986cf1c..ecadc22 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -43,7 +43,7 @@ endif > - > - ifneq ($(strip $(USELIBPCRE)),) > - CPPFLAGS+=-DLIBPCRE > -- LIBS:=$(LIBS) -lpcreposix > -+ LIBS:=$(LIBS) -lpcreposix -lpcre > - endif > - > - ifneq ($(strip $(USELIBCONFIG)),) > --- > -2.28.0 > - > diff --git a/package/sslh/Config.in b/package/sslh/Config.in > index f6b46f3218..a1d5211851 100644 > --- a/package/sslh/Config.in > +++ b/package/sslh/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_SSLH > bool "sslh" > depends on BR2_USE_MMU # fork() > select BR2_PACKAGE_LIBCONFIG if BR2_PACKAGE_SYSTEMD > + select BR2_PACKAGE_PCRE2 > help > Applicative protocol multiplexer > > diff --git a/package/sslh/sslh.hash b/package/sslh/sslh.hash > index 00e5c12d77..ae678563da 100644 > --- a/package/sslh/sslh.hash > +++ b/package/sslh/sslh.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 sslh-v1.21c.tar.gz > +sha256 8e3742d14edf4119350cfdc7bb96b89134d9218eb6d2a6e1f70891ca18a649b1 sslh-v1.22c.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk > index 4bde143cd8..99fb6bf922 100644 > --- a/package/sslh/sslh.mk > +++ b/package/sslh/sslh.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -SSLH_VERSION = 1.21c > +SSLH_VERSION = 1.22c > SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz > SSLH_SITE = http://www.rutschle.net/tech/sslh > SSLH_LICENSE = GPL-2.0+ > SSLH_LICENSE_FILES = COPYING > +SSLH_DEPENDENCIES = pcre2 > > SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) > > @@ -33,13 +34,6 @@ else > SSLH_MAKE_OPTS += USELIBCONFIG= > endif > > -ifeq ($(BR2_PACKAGE_PCRE),y) > -SSLH_DEPENDENCIES += pcre > -SSLH_MAKE_OPTS += USELIBPCRE=1 > -else > -SSLH_MAKE_OPTS += USELIBPCRE= > -endif > - > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > SSLH_DEPENDENCIES += systemd > SSLH_MAKE_OPTS += USESYSTEMD=1 > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd.kuhls at t-online.de Sat Jan 1 12:09:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 1 Jan 2022 13:09:20 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/vdr: enable musl/uclibc build Message-ID: <20220101120920.2809336-1-bernd.kuhls@t-online.de> Re-add patch 0001 to fix uClibc build, this patch was removed 2019: https://git.buildroot.net/buildroot/commit/?id=573d15b0790cfd2838cf0544ded79b415e20f5a7 Add two more patches from Alpine Linux to fix musl build. Add optional dependency to libexecinfo to provide execinfo.h. Depend on BR2_SYSTEM_ENABLE_NLS to have gettext being added as dependency to provide _nl_msg_cat_cntr() needed by i18n.c. Signed-off-by: Bernd Kuhls --- v3: rework nls/gettext dependencies (Thomas) v2: no changes package/vdr/0001-getloadavg.patch | 55 +++++++ package/vdr/0002-musl-compat.patch | 140 ++++++++++++++++++ package/vdr/0003-include-missing-limits.patch | 30 ++++ package/vdr/Config.in | 8 +- package/vdr/vdr.mk | 5 + 5 files changed, 234 insertions(+), 4 deletions(-) create mode 100644 package/vdr/0001-getloadavg.patch create mode 100644 package/vdr/0002-musl-compat.patch create mode 100644 package/vdr/0003-include-missing-limits.patch diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch new file mode 100644 index 0000000000..9e6316e284 --- /dev/null +++ b/package/vdr/0001-getloadavg.patch @@ -0,0 +1,55 @@ +Fix compilation with uClibc + +Ported from +https://github.com/stschake/buildroot-grasshopper/blob/master/package/torsmo/torsmo-0.18-uclibc-getloadavg.patch + +Signed-off-by: Bernd Kuhls + +diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +--- vdr-2.3.1.org/skinlcars.c 2015-09-01 12:07:07.000000000 +0200 ++++ vdr-2.3.1/skinlcars.c 2016-07-31 21:00:11.000000000 +0200 +@@ -1100,6 +1100,44 @@ + } + } + ++/* uclibc and dietlibc do not have this junk -ReneR */ ++#if defined (__UCLIBC__) || defined (__dietlibc__) ++static int getloadavg (double loadavg[], int nelem) ++{ ++ int fd; ++ ++ fd = open ("/proc/loadavg", O_RDONLY); ++ if (fd < 0) ++ return -1; ++ else ++ { ++ char buf[65], *p; ++ ssize_t nread; ++ int i; ++ ++ nread = read (fd, buf, sizeof buf - 1); ++ close (fd); ++ if (nread <= 0) ++ return -1; ++ buf[nread - 1] = '\0'; ++ ++ if (nelem > 3) ++ nelem = 3; ++ p = buf; ++ for (i = 0; i < nelem; ++i) ++ { ++ char *endp; ++ loadavg[i] = strtod (p, &endp); ++ if (endp == p) ++ return -1; ++ p = endp; ++ } ++ ++ return i; ++ } ++} ++#endif ++ + void cSkinLCARSDisplayMenu::DrawLoad(void) + { + if (yb04) { diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-musl-compat.patch new file mode 100644 index 0000000000..b6f8f414a9 --- /dev/null +++ b/package/vdr/0002-musl-compat.patch @@ -0,0 +1,140 @@ +Fix musl build + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch + +Signed-off-by: Bernd Kuhls + +diff --git a/i18n.h b/i18n.h +index f8ad9de..b002bbf 100644 +--- a/i18n.h ++++ b/i18n.h +@@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); + ///< have an actual locale installed. The rest are just dummy entries + ///< to allow having three letter language codes for other languages + ///< that have no actual locale on this system. +-const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1); ++const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute__((__format_arg__ (1))); + ///< Translates the given string (with optional Plugin context) into + ///< the current language. If no translation is available, the original + ///< string will be returned. +diff --git a/osd.c b/osd.c +index 524700a..ef975f5 100644 +--- a/osd.c ++++ b/osd.c +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include "device.h" + #include "tools.h" + +diff --git a/thread.c b/thread.c +index 47eb977..58dba43 100644 +--- a/thread.c ++++ b/thread.c +@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) + writeLockThreadId = 0; + pthread_rwlockattr_t attr; + pthread_rwlockattr_init(&attr); ++#if defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP); ++#endif + pthread_rwlock_init(&rwlock, &attr); + } + +@@ -205,7 +207,7 @@ cMutex::cMutex(void) + locked = 0; + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); + pthread_mutex_init(&mutex, &attr); + } + +diff --git a/tools.c b/tools.c +index 754673d..fef9d2d 100644 +--- a/tools.c ++++ b/tools.c +@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) + { + if (!FileName) + return NULL; +- char *TargetName = canonicalize_file_name(FileName); ++ char *TargetName = realpath(FileName, NULL); + if (!TargetName) { + if (errno == ENOENT) // file doesn't exist + TargetName = strdup(FileName); +@@ -1528,7 +1528,7 @@ + struct dirent *cReadDir::Next(void) + { + if (directory) { +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + while (readdir_r(directory, &u.d, &result) == 0 && result) { + #else + while ((result = readdir(directory)) != NULL) { +diff --git a/tools.h b/tools.h +index 73cca5a..03f5fd1 100644 +--- a/tools.h ++++ b/tools.h +@@ -28,6 +28,16 @@ + #include + #include "thread.h" + ++#ifndef ACCESSPERMS ++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++#ifndef ALLPERMS ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ ++#endif ++#ifndef DEFFILEMODE ++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ ++#endif ++ + typedef unsigned char uchar; + + extern int SysLogLevel; +@@ -400,7 +410,7 @@ + private: + DIR *directory; + struct dirent *result; +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + union { // according to "The GNU C Library Reference Manual" + struct dirent d; + char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; +@@ -738,7 +748,7 @@ public: + data[i] = T(0); + size = 0; + } +- void Sort(__compar_fn_t Compare) ++ void Sort(int (*Compare)(const void *, const void *)) + { + qsort(data, size, sizeof(T), Compare); + } +diff --git a/vdr.c b/vdr.c +index 8a49471..c2a82aa 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) + } + } + else if (Terminal) { ++#ifdef __GLIBC__ + // Claim new controlling terminal + stdin = freopen(Terminal, "r", stdin); + stdout = freopen(Terminal, "w", stdout); + stderr = freopen(Terminal, "w", stderr); + HasStdin = true; + tcgetattr(STDIN_FILENO, &savedTm); ++#else ++ // stdin, stdout, stderr are declared FILE const* by musl C library ++ fprintf(stderr, "Option '-t' is only supported if VDR has been built against glibc.\n"); ++ return 2; ++#endif + } + + isyslog("VDR version %s started", VDRVERSION); diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch new file mode 100644 index 0000000000..c2efe291e6 --- /dev/null +++ b/package/vdr/0003-include-missing-limits.patch @@ -0,0 +1,30 @@ +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Signed-off-by: Bernd Kuhls +---- + +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + diff --git a/package/vdr/Config.in b/package/vdr/Config.in index df602f26d6..1f9187ce6c 100644 --- a/package/vdr/Config.in +++ b/package/vdr/Config.in @@ -2,25 +2,25 @@ config BR2_PACKAGE_VDR bool "vdr" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_SYSTEM_ENABLE_NLS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBCAP - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC help This project describes how to build your own digital satellite receiver and Video Disk Recorder. http://www.tvdr.de -comment "vdr needs a glibc toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9" +comment "vdr needs a toolchain w/ C++, dynamic library, NLS, NPTL, wchar, headers >= 3.9" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_USE_WCHAR || \ + !BR2_SYSTEM_ENABLE_NLS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 51affe5a7b..bb7b1e22c0 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -26,6 +26,11 @@ VDR_MAKE_FLAGS = \ VIDEODIR=/var/lib/vdr VDR_LDFLAGS = $(TARGET_NLS_LIBS) +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +VDR_DEPENDENCIES += libexecinfo +VDR_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) VDR_DEPENDENCIES += libfribidi VDR_MAKE_FLAGS += BIDI=1 -- 2.30.2 From troglobit at gmail.com Sat Jan 1 12:19:54 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Sat, 01 Jan 2022 13:19:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/dhcpcd: add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP In-Reply-To: <20210305111048.1902558-1-fontaine.fabrice@gmail.com> References: <20210305111048.1902558-1-fontaine.fabrice@gmail.com> Message-ID: <87mtkf1wd1.fsf@gmail.com> On Fri, Mar 05, 2021 at 12:10, Fabrice Fontaine wrote: > Add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP following Arnout feedback: > https://patchwork.ozlabs.org/project/buildroot/patch/20210303091904.467706-1-fontaine.fabrice at gmail.com > > Signed-off-by: Fabrice Fontaine Looks good to me, much cleaner than what we have now. Reviewed-by: Joachim Wiberg From troglobit at gmail.com Sat Jan 1 12:28:15 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Sat, 01 Jan 2022 13:28:15 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled In-Reply-To: <20210321135842.1165539-1-fontaine.fabrice@gmail.com> References: <20210321135842.1165539-1-fontaine.fabrice@gmail.com> Message-ID: <87k0fj1vz4.fsf@gmail.com> On Sun, Mar 21, 2021 at 14:58, Fabrice Fontaine wrote: > Following the bump to 8.1910.0, items requiring libcurl were > disabled by default. This patch selectively enables options > which depend on libcurl when that package is enabled in the > build. > > Signed-off-by: Matthew Weber > [Fabrice: Disable mmkubernetes which also depends on lognorm and while > at it also disable mmnormalize which is available since version 6.1.2 > (from 2010) and > https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf] > Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg From yann.morin.1998 at free.fr Sat Jan 1 13:02:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:02:41 +0100 Subject: [Buildroot] [git commit] package/dhcpcd: add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP Message-ID: <20220101125821.B0DFC82901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20dd9453f32c9898ae4a0dc482bbb0a21853090c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP following Arnout feedback: https://patchwork.ozlabs.org/project/buildroot/patch/20210303091904.467706-1-fontaine.fabrice at gmail.com Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/dhcpcd/Config.in | 19 +++++++++++++++++++ package/dhcpcd/dhcpcd.mk | 22 ++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in index ece08d2c96..3ebacb3ba2 100644 --- a/package/dhcpcd/Config.in +++ b/package/dhcpcd/Config.in @@ -8,3 +8,22 @@ config BR2_PACKAGE_DHCPCD An RFC2131 compliant DHCP client http://roy.marples.name/projects/dhcpcd/ + +if BR2_PACKAGE_DHCPCD + +config BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP + bool + default y + depends on BR2_USE_MMU + # Audit headers were only added in recent kernels for some arches + depends on !(BR2_arceb || BR2_arcle) || \ + BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + depends on !(BR2_microblazeel || BR2_microblazebe) || \ + BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + depends on !BR2_nds32 || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + depends on !BR2_nios2 || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + depends on !BR2_or1k || BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + depends on !BR2_sh || BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + depends on !BR2_xtensa || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + +endif diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index ebe6941646..922d289b26 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -17,23 +17,9 @@ DHCPCD_CONFIG_OPTS = \ --os=linux \ --privsepuser=dhcpcd -# AUDIT_ARCH_{OPENRISC,SH,SHEL,SH64,SHEL64} are only available with kernel >= 3.7 -ifeq ($(BR2_or1k)$(BR2_sh):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7),y:) -DHCPCD_CONFIG_OPTS += --disable-privsep -endif - -# AUDIT_ARCH_MICROBLAZE is only available with kernel >= 3.18 -ifeq ($(BR2_microblazeel)$(BR2_microblazebe):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18),y:) -DHCPCD_CONFIG_OPTS += --disable-privsep -endif - -# AUDIT_ARCH_XTENSA is only available with kernel >= 5.0 -ifeq ($(BR2_xtensa):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y:) -DHCPCD_CONFIG_OPTS += --disable-privsep -endif - -# AUDIT_ARCH_{ARCOMPACT,ARCV2,NDS32,NIOS2} are only available with kernel >= 5.2 -ifeq ($(BR2_arceb)$(BR2_arcle)$(BR2_nds32)$(BR2_nios2):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2),y:) +ifeq ($(BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP),y) +DHCPCD_CONFIG_OPTS += --enable-privsep +else DHCPCD_CONFIG_OPTS += --disable-privsep endif @@ -49,7 +35,7 @@ DHCPCD_CONFIG_OPTS += --enable-static endif ifeq ($(BR2_USE_MMU),) -DHCPCD_CONFIG_OPTS += --disable-fork --disable-privsep +DHCPCD_CONFIG_OPTS += --disable-fork endif define DHCPCD_CONFIGURE_CMDS From yann.morin.1998 at free.fr Sat Jan 1 13:04:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:04:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/dhcpcd: add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP In-Reply-To: <87mtkf1wd1.fsf@gmail.com> References: <20210305111048.1902558-1-fontaine.fabrice@gmail.com> <87mtkf1wd1.fsf@gmail.com> Message-ID: <20220101130407.GG3390456@scaer> Fabrice, All, On 2022-01-01 13:19 +0100, Joachim Wiberg spake thusly: > On Fri, Mar 05, 2021 at 12:10, Fabrice Fontaine wrote: > > Add BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP following Arnout feedback: > > https://patchwork.ozlabs.org/project/buildroot/patch/20210303091904.467706-1-fontaine.fabrice at gmail.com > > > > Signed-off-by: Fabrice Fontaine > > Looks good to me, much cleaner than what we have now. > > Reviewed-by: Joachim Wiberg Applied to master, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 13:06:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:06:14 +0100 Subject: [Buildroot] [git commit] package/rsyslog: enable options when libcurl is enabled Message-ID: <20220101130033.D31538261A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e644e5df39c4d63ce7ae28ce2d02bfbf2a230cff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Following the bump to 8.1910.0, items requiring libcurl were disabled by default. This patch selectively enables options which depend on libcurl when that package is enabled in the build. Signed-off-by: Matthew Weber [Fabrice: Disable mmkubernetes which also depends on lognorm and while at it also disable mmnormalize which is available since version 6.1.2 (from 2010) and https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf] Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/rsyslog/rsyslog.mk | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 6cf53ccb82..afd1a5557e 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -28,14 +28,29 @@ endif RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) -# Disable items requiring libcurl -RSYSLOG_CONF_OPTS += --disable-elasticsearch \ +# Disable items requiring lognorm +RSYSLOG_CONF_OPTS += \ + --disable-mmkubernetes \ + --disable-mmnormalize + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +RSYSLOG_DEPENDENCIES += libcurl +RSYSLOG_CONF_OPTS += \ + --enable-clickhouse \ + --enable-elasticsearch \ + --enable-fmhttp \ + --enable-imdocker \ + --enable-omhttp \ + --enable-omhttpfs +else +RSYSLOG_CONF_OPTS += \ --disable-clickhouse \ - --disable-omhttp \ + --disable-elasticsearch \ --disable-fmhttp \ --disable-imdocker \ - --disable-omhttpfs \ - --disable-mmkubernetes + --disable-omhttp \ + --disable-omhttpfs +endif ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) RSYSLOG_DEPENDENCIES += civetweb From yann.morin.1998 at free.fr Sat Jan 1 13:08:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:08:09 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled In-Reply-To: <87k0fj1vz4.fsf@gmail.com> References: <20210321135842.1165539-1-fontaine.fabrice@gmail.com> <87k0fj1vz4.fsf@gmail.com> Message-ID: <20220101130809.GH3390456@scaer> Fabrice, All, On 2022-01-01 13:28 +0100, Joachim Wiberg spake thusly: > On Sun, Mar 21, 2021 at 14:58, Fabrice Fontaine wrote: > > Following the bump to 8.1910.0, items requiring libcurl were > > disabled by default. This patch selectively enables options > > which depend on libcurl when that package is enabled in the > > build. > > > > Signed-off-by: Matthew Weber > > [Fabrice: Disable mmkubernetes which also depends on lognorm and while > > at it also disable mmnormalize which is available since version 6.1.2 > > (from 2010) and > > https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf] > > Signed-off-by: Fabrice Fontaine > > Reviewed-by: Joachim Wiberg Applied to master, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 13:27:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:27:17 +0100 Subject: [Buildroot] [git commit] package/makedevs: allow recursive on directory with dangling symlinks Message-ID: <20220101132341.5942981DD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e745c0b92db3db7008d066813e2529d2032986c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When using BR2_ROOTFS_DEVICE_TABLE to change ownership of /etc, like so: /etc r -1 root wheel - - - - - makedevs fails due to trying to chown() a dangling symlink: makedevs: chown failed for /src/myLinux/output/build/buildroot-fs/ext2/target/etc/mtab: No such file or directory makedevs: line 25: recursive failed for /src/myLinux/output/build/buildroot-fs/ext2/target/etc: No such file or directory make[2]: *** [fs/ext2/ext2.mk:63: /src/myLinux/output/images/rootfs.ext2] Error 1 make[1]: *** [Makefile:84: _all] Error 2 make[1]: Leaving directory '/src/myLinux/buildroot' This patch changes chown() to lchown() in two cases in makedevs.c when the argument can be a symlink, dangling or not. In case the recursive operation includes a chmod() as well, explicitly exclude symlinks that are dangling, because chmod() always operates on the link target. Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/makedevs/makedevs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index c57b964f5c..2796cd5e78 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -440,11 +440,13 @@ void bb_show_usage(void) int bb_recursive(const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf){ - if (chown(fpath, recursive_uid, recursive_gid) == -1) { + if (lchown(fpath, recursive_uid, recursive_gid) == -1) { bb_perror_msg("chown failed for %s", fpath); return -1; } - if (recursive_mode != -1) { + + /* chmod() is optional, also skip if dangling symlink */ + if (recursive_mode != -1 && tflag == FTW_SL && access(fpath, F_OK)) { if (chmod(fpath, recursive_mode) < 0) { bb_perror_msg("chmod failed for %s", fpath); return -1; @@ -628,7 +630,7 @@ int main(int argc, char **argv) if (mknod(full_name_inc, mode, rdev) < 0) { bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc); ret = EXIT_FAILURE; - } else if (chown(full_name_inc, uid, gid) < 0) { + } else if (lchown(full_name_inc, uid, gid) < 0) { bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc); ret = EXIT_FAILURE; } else if (chmod(full_name_inc, mode) < 0) { From yann.morin.1998 at free.fr Sat Jan 1 13:32:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:32:18 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/makedevs: allow recursive on directory with dangling symlinks In-Reply-To: <20211223090800.1716321-2-troglobit@gmail.com> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-2-troglobit@gmail.com> Message-ID: <20220101133218.GI3390456@scaer> Joachim, All, On 2021-12-23 10:07 +0100, Joachim Wiberg spake thusly: > When using BR2_ROOTFS_DEVICE_TABLE to change ownership of /etc, like so: > > /etc r -1 root wheel - - - - - > > makdevs fails due to it trying to chown() a dangling symlink: *makedevs *its (really "its", and really not "it's") Applied to master, thanks. Regards, Yann E. MORIN. > makedevs: chown failed for /src/myLinux/output/build/buildroot-fs/ext2/target/etc/mtab: No such file or directory > makedevs: line 25: recursive failed for /src/myLinux/output/build/buildroot-fs/ext2/target/etc: No such file or directory > make[2]: *** [fs/ext2/ext2.mk:63: /src/myLinux/output/images/rootfs.ext2] Error 1 > make[1]: *** [Makefile:84: _all] Error 2 > make[1]: Leaving directory '/src/myLinux/buildroot' > > This patch changes chown() to lchown() in two cases in makedevs.c when > the argument can be a symlink, dangling or not. > > In case the recursive operation includes a chmod() as well, explicitly > exclude symlinks that are dangling, because chmod() always operates on > the link target. > > Signed-off-by: Joachim Wiberg > --- > package/makedevs/makedevs.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c > index c57b964f5c..2796cd5e78 100644 > --- a/package/makedevs/makedevs.c > +++ b/package/makedevs/makedevs.c > @@ -440,11 +440,13 @@ void bb_show_usage(void) > int bb_recursive(const char *fpath, const struct stat *sb, > int tflag, struct FTW *ftwbuf){ > > - if (chown(fpath, recursive_uid, recursive_gid) == -1) { > + if (lchown(fpath, recursive_uid, recursive_gid) == -1) { > bb_perror_msg("chown failed for %s", fpath); > return -1; > } > - if (recursive_mode != -1) { > + > + /* chmod() is optional, also skip if dangling symlink */ > + if (recursive_mode != -1 && tflag == FTW_SL && access(fpath, F_OK)) { > if (chmod(fpath, recursive_mode) < 0) { > bb_perror_msg("chmod failed for %s", fpath); > return -1; > @@ -628,7 +630,7 @@ int main(int argc, char **argv) > if (mknod(full_name_inc, mode, rdev) < 0) { > bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc); > ret = EXIT_FAILURE; > - } else if (chown(full_name_inc, uid, gid) < 0) { > + } else if (lchown(full_name_inc, uid, gid) < 0) { > bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc); > ret = EXIT_FAILURE; > } else if (chmod(full_name_inc, mode) < 0) { > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 13:58:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 14:58:30 +0100 Subject: [Buildroot] [PATCH v3 2/3] .clang-format: initial import from Linux 5.15.6 In-Reply-To: <20211223090800.1716321-3-troglobit@gmail.com> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-3-troglobit@gmail.com> Message-ID: <20220101135830.GA2777@scaer> Joachim, All, On 2021-12-23 10:07 +0100, Joachim Wiberg spake thusly: > Intended as an aid when working with in-tree C files, like makdevs.c > > Notice max number of columns is set to 80, despite the LKML discussion > to not enforce this limit in checkpatch.pl, see [1] for details, hence > use with care and perhaps try to avoid unnecessary line breaks. In Buldroot, we have already settled down for 132 columns: # grep max .flake8 max-line-length=132 so I would say that we would want to use 132 for C-style code too. Applied to master with the above change, thanks. Regards, Yann E. MORIN. > [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bdc48fa11e46f867ea4d75fa59ee87a7f48be144 > > Signed-off-by: Joachim Wiberg > --- > .clang-format | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 566 insertions(+) > create mode 100644 .clang-format > > diff --git a/.clang-format b/.clang-format > new file mode 100644 > index 0000000000..91b92e97e5 > --- /dev/null > +++ b/.clang-format > @@ -0,0 +1,566 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# clang-format configuration file. Intended for clang-format >= 4. > +# > +# For more information, see: > +# > +# Documentation/process/clang-format.rst > +# https://clang.llvm.org/docs/ClangFormat.html > +# https://clang.llvm.org/docs/ClangFormatStyleOptions.html > +# > + > +# Buildroot: imported unmodified from Linux 5.15.6 -- please note, > +# this is not enforced at the moment. Intended as an aid > +# when working with in-tree C files, like makedevs.c > +# > +--- > +AccessModifierOffset: -4 > +AlignAfterOpenBracket: Align > +AlignConsecutiveAssignments: false > +AlignConsecutiveDeclarations: false > +#AlignEscapedNewlines: Left # Unknown to clang-format-4.0 > +AlignOperands: true > +AlignTrailingComments: false > +AllowAllParametersOfDeclarationOnNextLine: false > +AllowShortBlocksOnASingleLine: false > +AllowShortCaseLabelsOnASingleLine: false > +AllowShortFunctionsOnASingleLine: None > +AllowShortIfStatementsOnASingleLine: false > +AllowShortLoopsOnASingleLine: false > +AlwaysBreakAfterDefinitionReturnType: None > +AlwaysBreakAfterReturnType: None > +AlwaysBreakBeforeMultilineStrings: false > +AlwaysBreakTemplateDeclarations: false > +BinPackArguments: true > +BinPackParameters: true > +BraceWrapping: > + AfterClass: false > + AfterControlStatement: false > + AfterEnum: false > + AfterFunction: true > + AfterNamespace: true > + AfterObjCDeclaration: false > + AfterStruct: false > + AfterUnion: false > + #AfterExternBlock: false # Unknown to clang-format-5.0 > + BeforeCatch: false > + BeforeElse: false > + IndentBraces: false > + #SplitEmptyFunction: true # Unknown to clang-format-4.0 > + #SplitEmptyRecord: true # Unknown to clang-format-4.0 > + #SplitEmptyNamespace: true # Unknown to clang-format-4.0 > +BreakBeforeBinaryOperators: None > +BreakBeforeBraces: Custom > +#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0 > +BreakBeforeTernaryOperators: false > +BreakConstructorInitializersBeforeComma: false > +#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0 > +BreakAfterJavaFieldAnnotations: false > +BreakStringLiterals: false > +ColumnLimit: 80 > +CommentPragmas: '^ IWYU pragma:' > +#CompactNamespaces: false # Unknown to clang-format-4.0 > +ConstructorInitializerAllOnOneLineOrOnePerLine: false > +ConstructorInitializerIndentWidth: 8 > +ContinuationIndentWidth: 8 > +Cpp11BracedListStyle: false > +DerivePointerAlignment: false > +DisableFormat: false > +ExperimentalAutoDetectBinPacking: false > +#FixNamespaceComments: false # Unknown to clang-format-4.0 > + > +# Taken from: > +# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \ > +# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \ > +# | sort | uniq > +ForEachMacros: > + - 'apei_estatus_for_each_section' > + - 'ata_for_each_dev' > + - 'ata_for_each_link' > + - '__ata_qc_for_each' > + - 'ata_qc_for_each' > + - 'ata_qc_for_each_raw' > + - 'ata_qc_for_each_with_internal' > + - 'ax25_for_each' > + - 'ax25_uid_for_each' > + - '__bio_for_each_bvec' > + - 'bio_for_each_bvec' > + - 'bio_for_each_bvec_all' > + - 'bio_for_each_integrity_vec' > + - '__bio_for_each_segment' > + - 'bio_for_each_segment' > + - 'bio_for_each_segment_all' > + - 'bio_list_for_each' > + - 'bip_for_each_vec' > + - 'bitmap_for_each_clear_region' > + - 'bitmap_for_each_set_region' > + - 'blkg_for_each_descendant_post' > + - 'blkg_for_each_descendant_pre' > + - 'blk_queue_for_each_rl' > + - 'bond_for_each_slave' > + - 'bond_for_each_slave_rcu' > + - 'bpf_for_each_spilled_reg' > + - 'btree_for_each_safe128' > + - 'btree_for_each_safe32' > + - 'btree_for_each_safe64' > + - 'btree_for_each_safel' > + - 'card_for_each_dev' > + - 'cgroup_taskset_for_each' > + - 'cgroup_taskset_for_each_leader' > + - 'cpufreq_for_each_entry' > + - 'cpufreq_for_each_entry_idx' > + - 'cpufreq_for_each_valid_entry' > + - 'cpufreq_for_each_valid_entry_idx' > + - 'css_for_each_child' > + - 'css_for_each_descendant_post' > + - 'css_for_each_descendant_pre' > + - 'device_for_each_child_node' > + - 'displayid_iter_for_each' > + - 'dma_fence_chain_for_each' > + - 'do_for_each_ftrace_op' > + - 'drm_atomic_crtc_for_each_plane' > + - 'drm_atomic_crtc_state_for_each_plane' > + - 'drm_atomic_crtc_state_for_each_plane_state' > + - 'drm_atomic_for_each_plane_damage' > + - 'drm_client_for_each_connector_iter' > + - 'drm_client_for_each_modeset' > + - 'drm_connector_for_each_possible_encoder' > + - 'drm_for_each_bridge_in_chain' > + - 'drm_for_each_connector_iter' > + - 'drm_for_each_crtc' > + - 'drm_for_each_crtc_reverse' > + - 'drm_for_each_encoder' > + - 'drm_for_each_encoder_mask' > + - 'drm_for_each_fb' > + - 'drm_for_each_legacy_plane' > + - 'drm_for_each_plane' > + - 'drm_for_each_plane_mask' > + - 'drm_for_each_privobj' > + - 'drm_mm_for_each_hole' > + - 'drm_mm_for_each_node' > + - 'drm_mm_for_each_node_in_range' > + - 'drm_mm_for_each_node_safe' > + - 'flow_action_for_each' > + - 'for_each_acpi_dev_match' > + - 'for_each_active_dev_scope' > + - 'for_each_active_drhd_unit' > + - 'for_each_active_iommu' > + - 'for_each_aggr_pgid' > + - 'for_each_available_child_of_node' > + - 'for_each_bio' > + - 'for_each_board_func_rsrc' > + - 'for_each_bvec' > + - 'for_each_card_auxs' > + - 'for_each_card_auxs_safe' > + - 'for_each_card_components' > + - 'for_each_card_dapms' > + - 'for_each_card_pre_auxs' > + - 'for_each_card_prelinks' > + - 'for_each_card_rtds' > + - 'for_each_card_rtds_safe' > + - 'for_each_card_widgets' > + - 'for_each_card_widgets_safe' > + - 'for_each_cgroup_storage_type' > + - 'for_each_child_of_node' > + - 'for_each_clear_bit' > + - 'for_each_clear_bit_from' > + - 'for_each_cmsghdr' > + - 'for_each_compatible_node' > + - 'for_each_component_dais' > + - 'for_each_component_dais_safe' > + - 'for_each_comp_order' > + - 'for_each_console' > + - 'for_each_cpu' > + - 'for_each_cpu_and' > + - 'for_each_cpu_not' > + - 'for_each_cpu_wrap' > + - 'for_each_dapm_widgets' > + - 'for_each_dev_addr' > + - 'for_each_dev_scope' > + - 'for_each_dma_cap_mask' > + - 'for_each_dpcm_be' > + - 'for_each_dpcm_be_rollback' > + - 'for_each_dpcm_be_safe' > + - 'for_each_dpcm_fe' > + - 'for_each_drhd_unit' > + - 'for_each_dss_dev' > + - 'for_each_dtpm_table' > + - 'for_each_efi_memory_desc' > + - 'for_each_efi_memory_desc_in_map' > + - 'for_each_element' > + - 'for_each_element_extid' > + - 'for_each_element_id' > + - 'for_each_endpoint_of_node' > + - 'for_each_evictable_lru' > + - 'for_each_fib6_node_rt_rcu' > + - 'for_each_fib6_walker_rt' > + - 'for_each_free_mem_pfn_range_in_zone' > + - 'for_each_free_mem_pfn_range_in_zone_from' > + - 'for_each_free_mem_range' > + - 'for_each_free_mem_range_reverse' > + - 'for_each_func_rsrc' > + - 'for_each_hstate' > + - 'for_each_if' > + - 'for_each_iommu' > + - 'for_each_ip_tunnel_rcu' > + - 'for_each_irq_nr' > + - 'for_each_link_codecs' > + - 'for_each_link_cpus' > + - 'for_each_link_platforms' > + - 'for_each_lru' > + - 'for_each_matching_node' > + - 'for_each_matching_node_and_match' > + - 'for_each_member' > + - 'for_each_memcg_cache_index' > + - 'for_each_mem_pfn_range' > + - '__for_each_mem_range' > + - 'for_each_mem_range' > + - '__for_each_mem_range_rev' > + - 'for_each_mem_range_rev' > + - 'for_each_mem_region' > + - 'for_each_migratetype_order' > + - 'for_each_msi_entry' > + - 'for_each_msi_entry_safe' > + - 'for_each_msi_vector' > + - 'for_each_net' > + - 'for_each_net_continue_reverse' > + - 'for_each_netdev' > + - 'for_each_netdev_continue' > + - 'for_each_netdev_continue_rcu' > + - 'for_each_netdev_continue_reverse' > + - 'for_each_netdev_feature' > + - 'for_each_netdev_in_bond_rcu' > + - 'for_each_netdev_rcu' > + - 'for_each_netdev_reverse' > + - 'for_each_netdev_safe' > + - 'for_each_net_rcu' > + - 'for_each_new_connector_in_state' > + - 'for_each_new_crtc_in_state' > + - 'for_each_new_mst_mgr_in_state' > + - 'for_each_new_plane_in_state' > + - 'for_each_new_private_obj_in_state' > + - 'for_each_node' > + - 'for_each_node_by_name' > + - 'for_each_node_by_type' > + - 'for_each_node_mask' > + - 'for_each_node_state' > + - 'for_each_node_with_cpus' > + - 'for_each_node_with_property' > + - 'for_each_nonreserved_multicast_dest_pgid' > + - 'for_each_of_allnodes' > + - 'for_each_of_allnodes_from' > + - 'for_each_of_cpu_node' > + - 'for_each_of_pci_range' > + - 'for_each_old_connector_in_state' > + - 'for_each_old_crtc_in_state' > + - 'for_each_old_mst_mgr_in_state' > + - 'for_each_oldnew_connector_in_state' > + - 'for_each_oldnew_crtc_in_state' > + - 'for_each_oldnew_mst_mgr_in_state' > + - 'for_each_oldnew_plane_in_state' > + - 'for_each_oldnew_plane_in_state_reverse' > + - 'for_each_oldnew_private_obj_in_state' > + - 'for_each_old_plane_in_state' > + - 'for_each_old_private_obj_in_state' > + - 'for_each_online_cpu' > + - 'for_each_online_node' > + - 'for_each_online_pgdat' > + - 'for_each_pci_bridge' > + - 'for_each_pci_dev' > + - 'for_each_pci_msi_entry' > + - 'for_each_pcm_streams' > + - 'for_each_physmem_range' > + - 'for_each_populated_zone' > + - 'for_each_possible_cpu' > + - 'for_each_present_cpu' > + - 'for_each_prime_number' > + - 'for_each_prime_number_from' > + - 'for_each_process' > + - 'for_each_process_thread' > + - 'for_each_prop_codec_conf' > + - 'for_each_prop_dai_codec' > + - 'for_each_prop_dai_cpu' > + - 'for_each_prop_dlc_codecs' > + - 'for_each_prop_dlc_cpus' > + - 'for_each_prop_dlc_platforms' > + - 'for_each_property_of_node' > + - 'for_each_registered_fb' > + - 'for_each_requested_gpio' > + - 'for_each_requested_gpio_in_range' > + - 'for_each_reserved_mem_range' > + - 'for_each_reserved_mem_region' > + - 'for_each_rtd_codec_dais' > + - 'for_each_rtd_components' > + - 'for_each_rtd_cpu_dais' > + - 'for_each_rtd_dais' > + - 'for_each_set_bit' > + - 'for_each_set_bit_from' > + - 'for_each_set_clump8' > + - 'for_each_sg' > + - 'for_each_sg_dma_page' > + - 'for_each_sg_page' > + - 'for_each_sgtable_dma_page' > + - 'for_each_sgtable_dma_sg' > + - 'for_each_sgtable_page' > + - 'for_each_sgtable_sg' > + - 'for_each_sibling_event' > + - 'for_each_subelement' > + - 'for_each_subelement_extid' > + - 'for_each_subelement_id' > + - '__for_each_thread' > + - 'for_each_thread' > + - 'for_each_unicast_dest_pgid' > + - 'for_each_vsi' > + - 'for_each_wakeup_source' > + - 'for_each_zone' > + - 'for_each_zone_zonelist' > + - 'for_each_zone_zonelist_nodemask' > + - 'fwnode_for_each_available_child_node' > + - 'fwnode_for_each_child_node' > + - 'fwnode_graph_for_each_endpoint' > + - 'gadget_for_each_ep' > + - 'genradix_for_each' > + - 'genradix_for_each_from' > + - 'hash_for_each' > + - 'hash_for_each_possible' > + - 'hash_for_each_possible_rcu' > + - 'hash_for_each_possible_rcu_notrace' > + - 'hash_for_each_possible_safe' > + - 'hash_for_each_rcu' > + - 'hash_for_each_safe' > + - 'hctx_for_each_ctx' > + - 'hlist_bl_for_each_entry' > + - 'hlist_bl_for_each_entry_rcu' > + - 'hlist_bl_for_each_entry_safe' > + - 'hlist_for_each' > + - 'hlist_for_each_entry' > + - 'hlist_for_each_entry_continue' > + - 'hlist_for_each_entry_continue_rcu' > + - 'hlist_for_each_entry_continue_rcu_bh' > + - 'hlist_for_each_entry_from' > + - 'hlist_for_each_entry_from_rcu' > + - 'hlist_for_each_entry_rcu' > + - 'hlist_for_each_entry_rcu_bh' > + - 'hlist_for_each_entry_rcu_notrace' > + - 'hlist_for_each_entry_safe' > + - 'hlist_for_each_entry_srcu' > + - '__hlist_for_each_rcu' > + - 'hlist_for_each_safe' > + - 'hlist_nulls_for_each_entry' > + - 'hlist_nulls_for_each_entry_from' > + - 'hlist_nulls_for_each_entry_rcu' > + - 'hlist_nulls_for_each_entry_safe' > + - 'i3c_bus_for_each_i2cdev' > + - 'i3c_bus_for_each_i3cdev' > + - 'ide_host_for_each_port' > + - 'ide_port_for_each_dev' > + - 'ide_port_for_each_present_dev' > + - 'idr_for_each_entry' > + - 'idr_for_each_entry_continue' > + - 'idr_for_each_entry_continue_ul' > + - 'idr_for_each_entry_ul' > + - 'in_dev_for_each_ifa_rcu' > + - 'in_dev_for_each_ifa_rtnl' > + - 'inet_bind_bucket_for_each' > + - 'inet_lhash2_for_each_icsk_rcu' > + - 'key_for_each' > + - 'key_for_each_safe' > + - 'klp_for_each_func' > + - 'klp_for_each_func_safe' > + - 'klp_for_each_func_static' > + - 'klp_for_each_object' > + - 'klp_for_each_object_safe' > + - 'klp_for_each_object_static' > + - 'kunit_suite_for_each_test_case' > + - 'kvm_for_each_memslot' > + - 'kvm_for_each_vcpu' > + - 'list_for_each' > + - 'list_for_each_codec' > + - 'list_for_each_codec_safe' > + - 'list_for_each_continue' > + - 'list_for_each_entry' > + - 'list_for_each_entry_continue' > + - 'list_for_each_entry_continue_rcu' > + - 'list_for_each_entry_continue_reverse' > + - 'list_for_each_entry_from' > + - 'list_for_each_entry_from_rcu' > + - 'list_for_each_entry_from_reverse' > + - 'list_for_each_entry_lockless' > + - 'list_for_each_entry_rcu' > + - 'list_for_each_entry_reverse' > + - 'list_for_each_entry_safe' > + - 'list_for_each_entry_safe_continue' > + - 'list_for_each_entry_safe_from' > + - 'list_for_each_entry_safe_reverse' > + - 'list_for_each_entry_srcu' > + - 'list_for_each_prev' > + - 'list_for_each_prev_safe' > + - 'list_for_each_safe' > + - 'llist_for_each' > + - 'llist_for_each_entry' > + - 'llist_for_each_entry_safe' > + - 'llist_for_each_safe' > + - 'mci_for_each_dimm' > + - 'media_device_for_each_entity' > + - 'media_device_for_each_intf' > + - 'media_device_for_each_link' > + - 'media_device_for_each_pad' > + - 'nanddev_io_for_each_page' > + - 'netdev_for_each_lower_dev' > + - 'netdev_for_each_lower_private' > + - 'netdev_for_each_lower_private_rcu' > + - 'netdev_for_each_mc_addr' > + - 'netdev_for_each_uc_addr' > + - 'netdev_for_each_upper_dev_rcu' > + - 'netdev_hw_addr_list_for_each' > + - 'nft_rule_for_each_expr' > + - 'nla_for_each_attr' > + - 'nla_for_each_nested' > + - 'nlmsg_for_each_attr' > + - 'nlmsg_for_each_msg' > + - 'nr_neigh_for_each' > + - 'nr_neigh_for_each_safe' > + - 'nr_node_for_each' > + - 'nr_node_for_each_safe' > + - 'of_for_each_phandle' > + - 'of_property_for_each_string' > + - 'of_property_for_each_u32' > + - 'pci_bus_for_each_resource' > + - 'pcl_for_each_chunk' > + - 'pcl_for_each_segment' > + - 'pcm_for_each_format' > + - 'ping_portaddr_for_each_entry' > + - 'plist_for_each' > + - 'plist_for_each_continue' > + - 'plist_for_each_entry' > + - 'plist_for_each_entry_continue' > + - 'plist_for_each_entry_safe' > + - 'plist_for_each_safe' > + - 'pnp_for_each_card' > + - 'pnp_for_each_dev' > + - 'protocol_for_each_card' > + - 'protocol_for_each_dev' > + - 'queue_for_each_hw_ctx' > + - 'radix_tree_for_each_slot' > + - 'radix_tree_for_each_tagged' > + - 'rb_for_each' > + - 'rbtree_postorder_for_each_entry_safe' > + - 'rdma_for_each_block' > + - 'rdma_for_each_port' > + - 'rdma_umem_for_each_dma_block' > + - 'resource_list_for_each_entry' > + - 'resource_list_for_each_entry_safe' > + - 'rhl_for_each_entry_rcu' > + - 'rhl_for_each_rcu' > + - 'rht_for_each' > + - 'rht_for_each_entry' > + - 'rht_for_each_entry_from' > + - 'rht_for_each_entry_rcu' > + - 'rht_for_each_entry_rcu_from' > + - 'rht_for_each_entry_safe' > + - 'rht_for_each_from' > + - 'rht_for_each_rcu' > + - 'rht_for_each_rcu_from' > + - '__rq_for_each_bio' > + - 'rq_for_each_bvec' > + - 'rq_for_each_segment' > + - 'scsi_for_each_prot_sg' > + - 'scsi_for_each_sg' > + - 'sctp_for_each_hentry' > + - 'sctp_skb_for_each' > + - 'shdma_for_each_chan' > + - '__shost_for_each_device' > + - 'shost_for_each_device' > + - 'sk_for_each' > + - 'sk_for_each_bound' > + - 'sk_for_each_entry_offset_rcu' > + - 'sk_for_each_from' > + - 'sk_for_each_rcu' > + - 'sk_for_each_safe' > + - 'sk_nulls_for_each' > + - 'sk_nulls_for_each_from' > + - 'sk_nulls_for_each_rcu' > + - 'snd_array_for_each' > + - 'snd_pcm_group_for_each_entry' > + - 'snd_soc_dapm_widget_for_each_path' > + - 'snd_soc_dapm_widget_for_each_path_safe' > + - 'snd_soc_dapm_widget_for_each_sink_path' > + - 'snd_soc_dapm_widget_for_each_source_path' > + - 'tb_property_for_each' > + - 'tcf_exts_for_each_action' > + - 'udp_portaddr_for_each_entry' > + - 'udp_portaddr_for_each_entry_rcu' > + - 'usb_hub_for_each_child' > + - 'v4l2_device_for_each_subdev' > + - 'v4l2_m2m_for_each_dst_buf' > + - 'v4l2_m2m_for_each_dst_buf_safe' > + - 'v4l2_m2m_for_each_src_buf' > + - 'v4l2_m2m_for_each_src_buf_safe' > + - 'virtio_device_for_each_vq' > + - 'while_for_each_ftrace_op' > + - 'xa_for_each' > + - 'xa_for_each_marked' > + - 'xa_for_each_range' > + - 'xa_for_each_start' > + - 'xas_for_each' > + - 'xas_for_each_conflict' > + - 'xas_for_each_marked' > + - 'xbc_array_for_each_value' > + - 'xbc_for_each_key_value' > + - 'xbc_node_for_each_array_value' > + - 'xbc_node_for_each_child' > + - 'xbc_node_for_each_key_value' > + - 'zorro_for_each_dev' > + > +#IncludeBlocks: Preserve # Unknown to clang-format-5.0 > +IncludeCategories: > + - Regex: '.*' > + Priority: 1 > +IncludeIsMainRegex: '(Test)?$' > +IndentCaseLabels: false > +#IndentPPDirectives: None # Unknown to clang-format-5.0 > +IndentWidth: 8 > +IndentWrappedFunctionNames: false > +JavaScriptQuotes: Leave > +JavaScriptWrapImports: true > +KeepEmptyLinesAtTheStartOfBlocks: false > +MacroBlockBegin: '' > +MacroBlockEnd: '' > +MaxEmptyLinesToKeep: 1 > +NamespaceIndentation: None > +#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0 > +ObjCBlockIndentWidth: 8 > +ObjCSpaceAfterProperty: true > +ObjCSpaceBeforeProtocolList: true > + > +# Taken from git's rules > +#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0 > +PenaltyBreakBeforeFirstCallParameter: 30 > +PenaltyBreakComment: 10 > +PenaltyBreakFirstLessLess: 0 > +PenaltyBreakString: 10 > +PenaltyExcessCharacter: 100 > +PenaltyReturnTypeOnItsOwnLine: 60 > + > +PointerAlignment: Right > +ReflowComments: false > +SortIncludes: false > +#SortUsingDeclarations: false # Unknown to clang-format-4.0 > +SpaceAfterCStyleCast: false > +SpaceAfterTemplateKeyword: true > +SpaceBeforeAssignmentOperators: true > +#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0 > +#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0 > +SpaceBeforeParens: ControlStatements > +#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0 > +SpaceInEmptyParentheses: false > +SpacesBeforeTrailingComments: 1 > +SpacesInAngles: false > +SpacesInContainerLiterals: false > +SpacesInCStyleCastParentheses: false > +SpacesInParentheses: false > +SpacesInSquareBrackets: false > +Standard: Cpp03 > +TabWidth: 8 > +UseTab: Always > +... > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 13:57:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 14:57:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: new package Message-ID: <20220101135737.956301-1-fontaine.fabrice@gmail.com> ksmbd kernel server userspace utilities. https://github.com/cifsd-team/ksmbd-tools Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/ksmbd-tools/Config.in | 15 +++++++++++++++ package/ksmbd-tools/ksmbd-tools.hash | 3 +++ package/ksmbd-tools/ksmbd-tools.mk | 20 ++++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/ksmbd-tools/Config.in create mode 100644 package/ksmbd-tools/ksmbd-tools.hash create mode 100644 package/ksmbd-tools/ksmbd-tools.mk diff --git a/DEVELOPERS b/DEVELOPERS index 98ff2372cc..cf0e6fe0fc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -870,6 +870,7 @@ F: package/hiredis/ F: package/i2pd/ F: package/igd2-for-linux/ F: package/json-c/ +F: package/ksmbd-tools/ F: package/lcms2/ F: package/lftp/ F: package/libcap-ng/ diff --git a/package/Config.in b/package/Config.in index 4185675e4c..1e25ccd964 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2235,6 +2235,7 @@ endif source "package/keepalived/Config.in" source "package/kismet/Config.in" source "package/knock/Config.in" + source "package/ksmbd-tools/Config.in" source "package/leafnode2/Config.in" source "package/lft/Config.in" source "package/lftp/Config.in" diff --git a/package/ksmbd-tools/Config.in b/package/ksmbd-tools/Config.in new file mode 100644 index 0000000000..ce1850e016 --- /dev/null +++ b/package/ksmbd-tools/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_KSMBD_TOOLS + bool "ksmbd-tools" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libnl + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBNL + help + ksmbd kernel server userspace utilities. + + https://github.com/cifsd-team/ksmbd-tools + +comment "ksmbd-tools needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash new file mode 100644 index 0000000000..ad507bfdb2 --- /dev/null +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk new file mode 100644 index 0000000000..b3ffc3e768 --- /dev/null +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# ksmbd-tools +# +################################################################################ + +KSMBD_TOOLS_VERSION = 3.4.3 +KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) +KSMBD_TOOLS_LICENSE = GPL-2.0+ +KSMBD_TOOLS_LICENSE_FILES = COPYING +KSMBD_TOOLS_DEPENDENCIES = host-pkgconf libglib2 libnl + +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +KSMBD_TOOLS_CONF_OPTS += --enable-krb5 +KSMBD_TOOLS_DEPENDENCIES += libkrb5 +else +KSMBD_TOOLS_CONF_OPTS += --disable-krb5 +endif + +$(eval $(autotools-package)) -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 14:01:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 15:01:13 +0100 Subject: [Buildroot] [git commit] .clang-format: initial import from Linux 5.15.6 Message-ID: <20220101135527.56A88829F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8fddaf36edc449c1239b75468cfe75be4cd5132f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Intended as an aid when working with in-tree C files, like makdevs.c. Unlike for the kernel, which still has an 80-char limit line (but they decided not to enforce it [0]), we set the limit to 132-char for us, like we do for the python code (see ./.flake8). [0] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bdc48fa11e46f867ea4d75fa59ee87a7f48be144 Signed-off-by: Joachim Wiberg [yann.morin.1998 at free.fr: use and explain the 132-char limit) Signed-off-by: Yann E. MORIN --- .clang-format | 567 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 567 insertions(+) diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000000..1758a23f32 --- /dev/null +++ b/.clang-format @@ -0,0 +1,567 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# clang-format configuration file. Intended for clang-format >= 4. +# +# For more information, see: +# +# Documentation/process/clang-format.rst +# https://clang.llvm.org/docs/ClangFormat.html +# https://clang.llvm.org/docs/ClangFormatStyleOptions.html +# + +# Buildroot: imported from Linux 5.15.6, with minimal modifications. +# Please note, this is not enforced at the moment. Intended +# as an aid when working with in-tree C files, like +# makedevs.c +# +--- +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +#AlignEscapedNewlines: Left # Unknown to clang-format-4.0 +AlignOperands: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + #AfterExternBlock: false # Unknown to clang-format-5.0 + BeforeCatch: false + BeforeElse: false + IndentBraces: false + #SplitEmptyFunction: true # Unknown to clang-format-4.0 + #SplitEmptyRecord: true # Unknown to clang-format-4.0 + #SplitEmptyNamespace: true # Unknown to clang-format-4.0 +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Custom +#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0 +BreakBeforeTernaryOperators: false +BreakConstructorInitializersBeforeComma: false +#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0 +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: false +ColumnLimit: 132 # Specially for Buildroot +CommentPragmas: '^ IWYU pragma:' +#CompactNamespaces: false # Unknown to clang-format-4.0 +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 8 +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +#FixNamespaceComments: false # Unknown to clang-format-4.0 + +# Taken from: +# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \ +# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \ +# | sort | uniq +ForEachMacros: + - 'apei_estatus_for_each_section' + - 'ata_for_each_dev' + - 'ata_for_each_link' + - '__ata_qc_for_each' + - 'ata_qc_for_each' + - 'ata_qc_for_each_raw' + - 'ata_qc_for_each_with_internal' + - 'ax25_for_each' + - 'ax25_uid_for_each' + - '__bio_for_each_bvec' + - 'bio_for_each_bvec' + - 'bio_for_each_bvec_all' + - 'bio_for_each_integrity_vec' + - '__bio_for_each_segment' + - 'bio_for_each_segment' + - 'bio_for_each_segment_all' + - 'bio_list_for_each' + - 'bip_for_each_vec' + - 'bitmap_for_each_clear_region' + - 'bitmap_for_each_set_region' + - 'blkg_for_each_descendant_post' + - 'blkg_for_each_descendant_pre' + - 'blk_queue_for_each_rl' + - 'bond_for_each_slave' + - 'bond_for_each_slave_rcu' + - 'bpf_for_each_spilled_reg' + - 'btree_for_each_safe128' + - 'btree_for_each_safe32' + - 'btree_for_each_safe64' + - 'btree_for_each_safel' + - 'card_for_each_dev' + - 'cgroup_taskset_for_each' + - 'cgroup_taskset_for_each_leader' + - 'cpufreq_for_each_entry' + - 'cpufreq_for_each_entry_idx' + - 'cpufreq_for_each_valid_entry' + - 'cpufreq_for_each_valid_entry_idx' + - 'css_for_each_child' + - 'css_for_each_descendant_post' + - 'css_for_each_descendant_pre' + - 'device_for_each_child_node' + - 'displayid_iter_for_each' + - 'dma_fence_chain_for_each' + - 'do_for_each_ftrace_op' + - 'drm_atomic_crtc_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane_state' + - 'drm_atomic_for_each_plane_damage' + - 'drm_client_for_each_connector_iter' + - 'drm_client_for_each_modeset' + - 'drm_connector_for_each_possible_encoder' + - 'drm_for_each_bridge_in_chain' + - 'drm_for_each_connector_iter' + - 'drm_for_each_crtc' + - 'drm_for_each_crtc_reverse' + - 'drm_for_each_encoder' + - 'drm_for_each_encoder_mask' + - 'drm_for_each_fb' + - 'drm_for_each_legacy_plane' + - 'drm_for_each_plane' + - 'drm_for_each_plane_mask' + - 'drm_for_each_privobj' + - 'drm_mm_for_each_hole' + - 'drm_mm_for_each_node' + - 'drm_mm_for_each_node_in_range' + - 'drm_mm_for_each_node_safe' + - 'flow_action_for_each' + - 'for_each_acpi_dev_match' + - 'for_each_active_dev_scope' + - 'for_each_active_drhd_unit' + - 'for_each_active_iommu' + - 'for_each_aggr_pgid' + - 'for_each_available_child_of_node' + - 'for_each_bio' + - 'for_each_board_func_rsrc' + - 'for_each_bvec' + - 'for_each_card_auxs' + - 'for_each_card_auxs_safe' + - 'for_each_card_components' + - 'for_each_card_dapms' + - 'for_each_card_pre_auxs' + - 'for_each_card_prelinks' + - 'for_each_card_rtds' + - 'for_each_card_rtds_safe' + - 'for_each_card_widgets' + - 'for_each_card_widgets_safe' + - 'for_each_cgroup_storage_type' + - 'for_each_child_of_node' + - 'for_each_clear_bit' + - 'for_each_clear_bit_from' + - 'for_each_cmsghdr' + - 'for_each_compatible_node' + - 'for_each_component_dais' + - 'for_each_component_dais_safe' + - 'for_each_comp_order' + - 'for_each_console' + - 'for_each_cpu' + - 'for_each_cpu_and' + - 'for_each_cpu_not' + - 'for_each_cpu_wrap' + - 'for_each_dapm_widgets' + - 'for_each_dev_addr' + - 'for_each_dev_scope' + - 'for_each_dma_cap_mask' + - 'for_each_dpcm_be' + - 'for_each_dpcm_be_rollback' + - 'for_each_dpcm_be_safe' + - 'for_each_dpcm_fe' + - 'for_each_drhd_unit' + - 'for_each_dss_dev' + - 'for_each_dtpm_table' + - 'for_each_efi_memory_desc' + - 'for_each_efi_memory_desc_in_map' + - 'for_each_element' + - 'for_each_element_extid' + - 'for_each_element_id' + - 'for_each_endpoint_of_node' + - 'for_each_evictable_lru' + - 'for_each_fib6_node_rt_rcu' + - 'for_each_fib6_walker_rt' + - 'for_each_free_mem_pfn_range_in_zone' + - 'for_each_free_mem_pfn_range_in_zone_from' + - 'for_each_free_mem_range' + - 'for_each_free_mem_range_reverse' + - 'for_each_func_rsrc' + - 'for_each_hstate' + - 'for_each_if' + - 'for_each_iommu' + - 'for_each_ip_tunnel_rcu' + - 'for_each_irq_nr' + - 'for_each_link_codecs' + - 'for_each_link_cpus' + - 'for_each_link_platforms' + - 'for_each_lru' + - 'for_each_matching_node' + - 'for_each_matching_node_and_match' + - 'for_each_member' + - 'for_each_memcg_cache_index' + - 'for_each_mem_pfn_range' + - '__for_each_mem_range' + - 'for_each_mem_range' + - '__for_each_mem_range_rev' + - 'for_each_mem_range_rev' + - 'for_each_mem_region' + - 'for_each_migratetype_order' + - 'for_each_msi_entry' + - 'for_each_msi_entry_safe' + - 'for_each_msi_vector' + - 'for_each_net' + - 'for_each_net_continue_reverse' + - 'for_each_netdev' + - 'for_each_netdev_continue' + - 'for_each_netdev_continue_rcu' + - 'for_each_netdev_continue_reverse' + - 'for_each_netdev_feature' + - 'for_each_netdev_in_bond_rcu' + - 'for_each_netdev_rcu' + - 'for_each_netdev_reverse' + - 'for_each_netdev_safe' + - 'for_each_net_rcu' + - 'for_each_new_connector_in_state' + - 'for_each_new_crtc_in_state' + - 'for_each_new_mst_mgr_in_state' + - 'for_each_new_plane_in_state' + - 'for_each_new_private_obj_in_state' + - 'for_each_node' + - 'for_each_node_by_name' + - 'for_each_node_by_type' + - 'for_each_node_mask' + - 'for_each_node_state' + - 'for_each_node_with_cpus' + - 'for_each_node_with_property' + - 'for_each_nonreserved_multicast_dest_pgid' + - 'for_each_of_allnodes' + - 'for_each_of_allnodes_from' + - 'for_each_of_cpu_node' + - 'for_each_of_pci_range' + - 'for_each_old_connector_in_state' + - 'for_each_old_crtc_in_state' + - 'for_each_old_mst_mgr_in_state' + - 'for_each_oldnew_connector_in_state' + - 'for_each_oldnew_crtc_in_state' + - 'for_each_oldnew_mst_mgr_in_state' + - 'for_each_oldnew_plane_in_state' + - 'for_each_oldnew_plane_in_state_reverse' + - 'for_each_oldnew_private_obj_in_state' + - 'for_each_old_plane_in_state' + - 'for_each_old_private_obj_in_state' + - 'for_each_online_cpu' + - 'for_each_online_node' + - 'for_each_online_pgdat' + - 'for_each_pci_bridge' + - 'for_each_pci_dev' + - 'for_each_pci_msi_entry' + - 'for_each_pcm_streams' + - 'for_each_physmem_range' + - 'for_each_populated_zone' + - 'for_each_possible_cpu' + - 'for_each_present_cpu' + - 'for_each_prime_number' + - 'for_each_prime_number_from' + - 'for_each_process' + - 'for_each_process_thread' + - 'for_each_prop_codec_conf' + - 'for_each_prop_dai_codec' + - 'for_each_prop_dai_cpu' + - 'for_each_prop_dlc_codecs' + - 'for_each_prop_dlc_cpus' + - 'for_each_prop_dlc_platforms' + - 'for_each_property_of_node' + - 'for_each_registered_fb' + - 'for_each_requested_gpio' + - 'for_each_requested_gpio_in_range' + - 'for_each_reserved_mem_range' + - 'for_each_reserved_mem_region' + - 'for_each_rtd_codec_dais' + - 'for_each_rtd_components' + - 'for_each_rtd_cpu_dais' + - 'for_each_rtd_dais' + - 'for_each_set_bit' + - 'for_each_set_bit_from' + - 'for_each_set_clump8' + - 'for_each_sg' + - 'for_each_sg_dma_page' + - 'for_each_sg_page' + - 'for_each_sgtable_dma_page' + - 'for_each_sgtable_dma_sg' + - 'for_each_sgtable_page' + - 'for_each_sgtable_sg' + - 'for_each_sibling_event' + - 'for_each_subelement' + - 'for_each_subelement_extid' + - 'for_each_subelement_id' + - '__for_each_thread' + - 'for_each_thread' + - 'for_each_unicast_dest_pgid' + - 'for_each_vsi' + - 'for_each_wakeup_source' + - 'for_each_zone' + - 'for_each_zone_zonelist' + - 'for_each_zone_zonelist_nodemask' + - 'fwnode_for_each_available_child_node' + - 'fwnode_for_each_child_node' + - 'fwnode_graph_for_each_endpoint' + - 'gadget_for_each_ep' + - 'genradix_for_each' + - 'genradix_for_each_from' + - 'hash_for_each' + - 'hash_for_each_possible' + - 'hash_for_each_possible_rcu' + - 'hash_for_each_possible_rcu_notrace' + - 'hash_for_each_possible_safe' + - 'hash_for_each_rcu' + - 'hash_for_each_safe' + - 'hctx_for_each_ctx' + - 'hlist_bl_for_each_entry' + - 'hlist_bl_for_each_entry_rcu' + - 'hlist_bl_for_each_entry_safe' + - 'hlist_for_each' + - 'hlist_for_each_entry' + - 'hlist_for_each_entry_continue' + - 'hlist_for_each_entry_continue_rcu' + - 'hlist_for_each_entry_continue_rcu_bh' + - 'hlist_for_each_entry_from' + - 'hlist_for_each_entry_from_rcu' + - 'hlist_for_each_entry_rcu' + - 'hlist_for_each_entry_rcu_bh' + - 'hlist_for_each_entry_rcu_notrace' + - 'hlist_for_each_entry_safe' + - 'hlist_for_each_entry_srcu' + - '__hlist_for_each_rcu' + - 'hlist_for_each_safe' + - 'hlist_nulls_for_each_entry' + - 'hlist_nulls_for_each_entry_from' + - 'hlist_nulls_for_each_entry_rcu' + - 'hlist_nulls_for_each_entry_safe' + - 'i3c_bus_for_each_i2cdev' + - 'i3c_bus_for_each_i3cdev' + - 'ide_host_for_each_port' + - 'ide_port_for_each_dev' + - 'ide_port_for_each_present_dev' + - 'idr_for_each_entry' + - 'idr_for_each_entry_continue' + - 'idr_for_each_entry_continue_ul' + - 'idr_for_each_entry_ul' + - 'in_dev_for_each_ifa_rcu' + - 'in_dev_for_each_ifa_rtnl' + - 'inet_bind_bucket_for_each' + - 'inet_lhash2_for_each_icsk_rcu' + - 'key_for_each' + - 'key_for_each_safe' + - 'klp_for_each_func' + - 'klp_for_each_func_safe' + - 'klp_for_each_func_static' + - 'klp_for_each_object' + - 'klp_for_each_object_safe' + - 'klp_for_each_object_static' + - 'kunit_suite_for_each_test_case' + - 'kvm_for_each_memslot' + - 'kvm_for_each_vcpu' + - 'list_for_each' + - 'list_for_each_codec' + - 'list_for_each_codec_safe' + - 'list_for_each_continue' + - 'list_for_each_entry' + - 'list_for_each_entry_continue' + - 'list_for_each_entry_continue_rcu' + - 'list_for_each_entry_continue_reverse' + - 'list_for_each_entry_from' + - 'list_for_each_entry_from_rcu' + - 'list_for_each_entry_from_reverse' + - 'list_for_each_entry_lockless' + - 'list_for_each_entry_rcu' + - 'list_for_each_entry_reverse' + - 'list_for_each_entry_safe' + - 'list_for_each_entry_safe_continue' + - 'list_for_each_entry_safe_from' + - 'list_for_each_entry_safe_reverse' + - 'list_for_each_entry_srcu' + - 'list_for_each_prev' + - 'list_for_each_prev_safe' + - 'list_for_each_safe' + - 'llist_for_each' + - 'llist_for_each_entry' + - 'llist_for_each_entry_safe' + - 'llist_for_each_safe' + - 'mci_for_each_dimm' + - 'media_device_for_each_entity' + - 'media_device_for_each_intf' + - 'media_device_for_each_link' + - 'media_device_for_each_pad' + - 'nanddev_io_for_each_page' + - 'netdev_for_each_lower_dev' + - 'netdev_for_each_lower_private' + - 'netdev_for_each_lower_private_rcu' + - 'netdev_for_each_mc_addr' + - 'netdev_for_each_uc_addr' + - 'netdev_for_each_upper_dev_rcu' + - 'netdev_hw_addr_list_for_each' + - 'nft_rule_for_each_expr' + - 'nla_for_each_attr' + - 'nla_for_each_nested' + - 'nlmsg_for_each_attr' + - 'nlmsg_for_each_msg' + - 'nr_neigh_for_each' + - 'nr_neigh_for_each_safe' + - 'nr_node_for_each' + - 'nr_node_for_each_safe' + - 'of_for_each_phandle' + - 'of_property_for_each_string' + - 'of_property_for_each_u32' + - 'pci_bus_for_each_resource' + - 'pcl_for_each_chunk' + - 'pcl_for_each_segment' + - 'pcm_for_each_format' + - 'ping_portaddr_for_each_entry' + - 'plist_for_each' + - 'plist_for_each_continue' + - 'plist_for_each_entry' + - 'plist_for_each_entry_continue' + - 'plist_for_each_entry_safe' + - 'plist_for_each_safe' + - 'pnp_for_each_card' + - 'pnp_for_each_dev' + - 'protocol_for_each_card' + - 'protocol_for_each_dev' + - 'queue_for_each_hw_ctx' + - 'radix_tree_for_each_slot' + - 'radix_tree_for_each_tagged' + - 'rb_for_each' + - 'rbtree_postorder_for_each_entry_safe' + - 'rdma_for_each_block' + - 'rdma_for_each_port' + - 'rdma_umem_for_each_dma_block' + - 'resource_list_for_each_entry' + - 'resource_list_for_each_entry_safe' + - 'rhl_for_each_entry_rcu' + - 'rhl_for_each_rcu' + - 'rht_for_each' + - 'rht_for_each_entry' + - 'rht_for_each_entry_from' + - 'rht_for_each_entry_rcu' + - 'rht_for_each_entry_rcu_from' + - 'rht_for_each_entry_safe' + - 'rht_for_each_from' + - 'rht_for_each_rcu' + - 'rht_for_each_rcu_from' + - '__rq_for_each_bio' + - 'rq_for_each_bvec' + - 'rq_for_each_segment' + - 'scsi_for_each_prot_sg' + - 'scsi_for_each_sg' + - 'sctp_for_each_hentry' + - 'sctp_skb_for_each' + - 'shdma_for_each_chan' + - '__shost_for_each_device' + - 'shost_for_each_device' + - 'sk_for_each' + - 'sk_for_each_bound' + - 'sk_for_each_entry_offset_rcu' + - 'sk_for_each_from' + - 'sk_for_each_rcu' + - 'sk_for_each_safe' + - 'sk_nulls_for_each' + - 'sk_nulls_for_each_from' + - 'sk_nulls_for_each_rcu' + - 'snd_array_for_each' + - 'snd_pcm_group_for_each_entry' + - 'snd_soc_dapm_widget_for_each_path' + - 'snd_soc_dapm_widget_for_each_path_safe' + - 'snd_soc_dapm_widget_for_each_sink_path' + - 'snd_soc_dapm_widget_for_each_source_path' + - 'tb_property_for_each' + - 'tcf_exts_for_each_action' + - 'udp_portaddr_for_each_entry' + - 'udp_portaddr_for_each_entry_rcu' + - 'usb_hub_for_each_child' + - 'v4l2_device_for_each_subdev' + - 'v4l2_m2m_for_each_dst_buf' + - 'v4l2_m2m_for_each_dst_buf_safe' + - 'v4l2_m2m_for_each_src_buf' + - 'v4l2_m2m_for_each_src_buf_safe' + - 'virtio_device_for_each_vq' + - 'while_for_each_ftrace_op' + - 'xa_for_each' + - 'xa_for_each_marked' + - 'xa_for_each_range' + - 'xa_for_each_start' + - 'xas_for_each' + - 'xas_for_each_conflict' + - 'xas_for_each_marked' + - 'xbc_array_for_each_value' + - 'xbc_for_each_key_value' + - 'xbc_node_for_each_array_value' + - 'xbc_node_for_each_child' + - 'xbc_node_for_each_key_value' + - 'zorro_for_each_dev' + +#IncludeBlocks: Preserve # Unknown to clang-format-5.0 +IncludeCategories: + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: false +#IndentPPDirectives: None # Unknown to clang-format-5.0 +IndentWidth: 8 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0 +ObjCBlockIndentWidth: 8 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true + +# Taken from git's rules +#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0 +PenaltyBreakBeforeFirstCallParameter: 30 +PenaltyBreakComment: 10 +PenaltyBreakFirstLessLess: 0 +PenaltyBreakString: 10 +PenaltyExcessCharacter: 100 +PenaltyReturnTypeOnItsOwnLine: 60 + +PointerAlignment: Right +ReflowComments: false +SortIncludes: false +#SortUsingDeclarations: false # Unknown to clang-format-4.0 +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0 +#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0 +SpaceBeforeParens: ControlStatements +#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0 +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp03 +TabWidth: 8 +UseTab: Always +... From troglobit at gmail.com Sat Jan 1 14:01:23 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Sat, 01 Jan 2022 15:01:23 +0100 Subject: [Buildroot] [[Next]RFC] sdk-docker: new make target using Dockcross In-Reply-To: <20210215053258.3323654-1-matt@thewebers.ws> References: <20210215053258.3323654-1-matt@thewebers.ws> Message-ID: <87ee5r1rnw.fsf@gmail.com> Hi, sorry for the late review: On Sun, Feb 14, 2021 at 23:32, Matt Weber wrote: > This patch adds a new make target for building a Docker with > an SDK installed. This patch has not been broken up and is for > RFC only to get feedback on the technical approach. > > - `make sdk-docker` first sets up the dockcross package and > the environment-setup script to stage the environment. > > - The dockcross package in Buildroot includes a folder with > a custom Dockerfile and pre-exec setup scripts which are > copied into the dockcross build folder at configure time. > This Dockerfile uses the Buildroot base and sets up other > tools to allow a project to completely execute a build flow > with make / cmake / meson / scons. > > - Within the Dockcross package, the entrypoint and sudo > scripting are reused but a new standard image/custom image > is not defined. Instead this patchset duplicates the > docker build step in the Buildroot top-level Makefile. > The entrypoint / sudo scripting were reused because it > handles seamless mapping of the calling user into the > container for the build and back with all the files uid/gid > intacted. > > - One of the best advantages of this environment is the > fact it resets on each new lauch and is clean for a new > build. I.e. just the PWD which is mapped as /work inside > is maintained after the container tears down. > > - I'm unsure if it makes sense to use dockcross or just pull > over the concepts they use into Buildroot directly.... > I think I found a good balance considering each Buildroot > defconfig build is unique so it doesn't seem like there is > a chance to upstream a Buildroot configuration to dockcross. > > - TODO: Add a manual section that includes usage notes > > - How to test > make qemu_aarch64_virt_defconfig > make sdk-docker > # Usage from https://github.com/dockcross/dockcross > # Setup container launch script > docker run --rm dockcross/buildroot-sdk-aarch64-buildroot-linux-gnu > ./dockcross > # This dockcross script maps the pwd into the container as /work > # as well as the current users $HOME as $HOME inside. > # Executing the script to dump the env, should list all the > # environment-setup exported values for use > ./dockcross bash -c 'export' > # Check that the cross toolchain executes > ./dockcross bash -c '$CC -version' > > Signed-off-by: Matt Weber This looks *really* interesting! At $DAYJOB we currently have locally maintained docker containers to get reproducible build environments on developer laptops. Having it integrated in Buildroot would be great! I've tested your patch using latest Buildroot and qemu_x86_64_defconfig but it failed with the following, which turned out to be a too old buildroot/base. When I bumped to 20211120.1925 it worked fine. Turns out GitHub dropped insecure cryptos last summer and the old Debian base had a bit too old curl: Downloading https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 ######################################################################## 100.0% curl: (35) Unknown SSL protocol error in connection to objects.githubusercontent.com:443 The command '/bin/sh -c set -x && /buildscripts/install-gosu-binary.sh && /buildscripts/install-gosu-binary-wrapper.sh && rm -rf /buildscripts' returned a non-zero code: 35 make[1]: *** [Makefile:629: sdk-docker] Error 35 Only two things that stick out to me are: 1. might need to have some small check in the top Makefile to verify that 'docker' is available on the host system -- maybe obvious to experienced users, but it would help reduce the support burden for the mailing list, I think 2. the dockcross project apparently doesn't do releases, or even tags, so it might be a bit of a hassle to track changes and do updates? Maybe we could reach out to them and ask for tags, at least Can't give better technical feedback than that, maybe Mr Petazzoni can chime in here wrt the actual integration. Reviewed-by: Joachim Wiberg From fontaine.fabrice at gmail.com Sat Jan 1 14:03:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 15:03:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectd: add ipmi support Message-ID: <20220101140324.1001998-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/collectd/Config.in | 11 +++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 05fb577345..5e5dff6fe1 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -312,6 +312,17 @@ config BR2_PACKAGE_COLLECTD_IPC IPC counters: semaphores used, number of allocated segments in shared memory and more. +config BR2_PACKAGE_COLLECTD_IPMI + bool "ipmi" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_OPENIPMI + help + Read hardware sensors from servers using the Intelligent + Platform Management Interface (IPMI). + +comment "ipmi needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + config BR2_PACKAGE_COLLECTD_IPTABLES bool "iptables" select BR2_PACKAGE_IPTABLES diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index d01058471d..9d6f630fe3 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -18,7 +18,7 @@ COLLECTD_SELINUX_MODULES = apache collectd # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dpdkstat email \ - gmond hddtemp intel_rdt ipmi java lpar \ + gmond hddtemp intel_rdt java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ @@ -88,6 +88,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ + $(if $(BR2_PACKAGE_COLLECTD_IPMI),--enable-ipmi,--disable-ipmi) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ $(if $(BR2_PACKAGE_COLLECTD_IPVS),--enable-ipvs,--disable-ipvs) \ $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ @@ -174,6 +175,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ + $(if $(BR2_PACKAGE_COLLECTD_IPMI),openipmi) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 14:13:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 15:13:15 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/makedevs: coding style and whitespace cleanup In-Reply-To: <20211223090800.1716321-4-troglobit@gmail.com> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-4-troglobit@gmail.com> Message-ID: <20220101141315.GB2777@scaer> Joachim, All, On 2021-12-23 10:08 +0100, Joachim Wiberg spake thusly: > This program is cobbled up with parts from all over the place, mostly > BusyBox, so the style has not been kept consistent. This patch is a > modest attempt to clean it up a bit. Some changes, e.g., comments are > for consistency with the rest of the program. > > - The (new) top level .clang-format file has been used as an aid > - Overly long lines have been kept to keep the diff small and any > discussions on max line length in the project to a minimum > - Comment indentation has been kept, again to keep the diff small While I appreciate the rasoning, I think that, if we have a code style and a linter/reformatter, then we should just mechanically apply it and not manually apply parts of the rules. Otherwise, it does not help the maintenance/review anymore than the current state. So, I would be of the opinion that we should just blindly apply clang-format and be done with that. However, I'm also afraid that there might be different reformatting rules based on the clang-format version... Maybe the version we use should be documented somewhere? Regards, Yann E. MORIN. > Signed-off-by: Joachim Wiberg > --- > package/makedevs/makedevs.c | 111 +++++++++++++++++++----------------- > 1 file changed, 60 insertions(+), 51 deletions(-) > > diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c > index 2796cd5e78..ec7db8f3e8 100644 > --- a/package/makedevs/makedevs.c > +++ b/package/makedevs/makedevs.c > @@ -44,7 +44,7 @@ uid_t recursive_uid; > gid_t recursive_gid; > unsigned int recursive_mode; > #define PASSWD_PATH "etc/passwd" /* MUST be relative */ > -#define GROUP_PATH "etc/group" /* MUST be relative */ > +#define GROUP_PATH "etc/group" /* MUST be relative */ > > void bb_verror_msg(const char *s, va_list p) > { > @@ -76,10 +76,12 @@ void bb_error_msg_and_die(const char *s, ...) > > void bb_vperror_msg(const char *s, va_list p) > { > - int err=errno; > - if(s == 0) s = ""; > + int err = errno; > + if (s == 0) > + s = ""; > bb_verror_msg(s, p); > - if (*s) s = ": "; > + if (*s) > + s = ": "; > fprintf(stderr, "%s%s\n", s, strerror(err)); > } > > @@ -129,8 +131,8 @@ int bb_make_directory (char *path, long mode, int flags) > if (mode == -1) { > umask(mask); > mode = (S_IXUSR | S_IXGRP | S_IXOTH | > - S_IWUSR | S_IWGRP | S_IWOTH | > - S_IRUSR | S_IRGRP | S_IROTH) & ~mask; > + S_IWUSR | S_IWGRP | S_IWOTH | > + S_IRUSR | S_IRGRP | S_IROTH) & ~mask; > } else { > umask(mask & ~0300); > } > @@ -154,18 +156,22 @@ int bb_make_directory (char *path, long mode, int flags) > } > > if (mkdir(path, 0777) < 0) { > - /* If we failed for any other reason than the directory > - * already exists, output a diagnostic and return -1.*/ > - if ((errno != EEXIST && errno != EISDIR) > - || !(flags & FILEUTILS_RECUR) > - || (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) { > + /* > + * If we failed for any other reason than the directory > + * already exists, output a diagnostic and return -1. > + */ > + if ((errno != EEXIST && errno != EISDIR) || > + !(flags & FILEUTILS_RECUR) || > + (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) { > fail_msg = "create"; > umask(mask); > break; > } > - /* Since the directory exists, don't attempt to change > + /* > + * Since the directory exists, don't attempt to change > * permissions if it was the full target. Note that > - * this is not an error conditon. */ > + * this is not an error conditon. > + */ > if (!c) { > umask(mask); > return 0; > @@ -173,11 +179,13 @@ int bb_make_directory (char *path, long mode, int flags) > } > > if (!c) { > - /* Done. If necessary, updated perms on the newly > + /* > + * Done. If necessary, updated perms on the newly > * created directory. Failure to update here _is_ > - * an error.*/ > + * an error. > + */ > umask(mask); > - if ((mode != -1) && (chmod(path, mode) < 0)){ > + if ((mode != -1) && (chmod(path, mode) < 0)) { > fail_msg = "set permissions of"; > break; > } > @@ -189,25 +197,29 @@ int bb_make_directory (char *path, long mode, int flags) > > } while (1); > > - bb_perror_msg ("Cannot %s directory `%s'", fail_msg, path); > + bb_perror_msg("Cannot %s directory `%s'", fail_msg, path); > return -1; > } > > -const char * const bb_msg_memory_exhausted = "memory exhausted"; > +const char *const bb_msg_memory_exhausted = "memory exhausted"; > > void *xmalloc(size_t size) > { > void *ptr = malloc(size); > + > if (ptr == NULL && size != 0) > bb_error_msg_and_die(bb_msg_memory_exhausted); > + > return ptr; > } > > void *xcalloc(size_t nmemb, size_t size) > { > void *ptr = calloc(nmemb, size); > + > if (ptr == NULL && nmemb != 0 && size != 0) > bb_error_msg_and_die(bb_msg_memory_exhausted); > + > return ptr; > } > > @@ -216,6 +228,7 @@ void *xrealloc(void *ptr, size_t size) > ptr = realloc(ptr, size); > if (ptr == NULL && size != 0) > bb_error_msg_and_die(bb_msg_memory_exhausted); > + > return ptr; > } > > @@ -234,8 +247,9 @@ char *private_get_line_from_file(FILE *file, int c) > linebuf = xrealloc(linebuf, linebufsz += GROWBY); > } > linebuf[idx++] = (char)ch; > - if (!ch) return linebuf; > - if (c<2 && ch == '\n') { > + if (!ch) > + return linebuf; > + if (c < 2 && ch == '\n') { > if (c) { > --idx; > } > @@ -263,7 +277,7 @@ long my_getpwnam(const char *name) > FILE *stream; > > stream = bb_xfopen(PASSWD_PATH, "r"); > - while(1) { > + while (1) { > errno = 0; > myuser = fgetpwent(stream); > if (myuser == NULL) > @@ -284,7 +298,7 @@ long my_getgrnam(const char *name) > FILE *stream; > > stream = bb_xfopen(GROUP_PATH, "r"); > - while(1) { > + while (1) { > errno = 0; > mygroup = fgetgrent(stream); > if (mygroup == NULL) > @@ -312,12 +326,12 @@ unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *)) > return r; > } > > -char * last_char_is(const char *s, int c) > +char *last_char_is(const char *s, int c) > { > char *sret = (char *)s; > if (sret) { > sret = strrchr(sret, c); > - if(sret != NULL && *(sret+1) != 0) > + if (sret != NULL && *(sret + 1) != 0) > sret = NULL; > } > return sret; > @@ -347,7 +361,7 @@ char *concat_path_file(const char *path, const char *filename) > lc = last_char_is(path, '/'); > while (*filename == '/') > filename++; > - bb_xasprintf(&outbuf, "%s%s%s", path, (lc==NULL ? "/" : ""), filename); > + bb_xasprintf(&outbuf, "%s%s%s", path, (lc == NULL ? "/" : ""), filename); > > return outbuf; > } > @@ -437,9 +451,8 @@ void bb_show_usage(void) > exit(1); > } > > -int bb_recursive(const char *fpath, const struct stat *sb, > - int tflag, struct FTW *ftwbuf){ > - > +int bb_recursive(const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf) > +{ > if (lchown(fpath, recursive_uid, recursive_gid) == -1) { > bb_perror_msg("chown failed for %s", fpath); > return -1; > @@ -469,16 +482,16 @@ int main(int argc, char **argv) > bb_applet_name = basename(argv[0]); > > while ((opt = getopt(argc, argv, "d:")) != -1) { > - switch(opt) { > - case 'd': > - table = bb_xfopen((line=optarg), "r"); > - break; > - default: > - bb_show_usage(); > + switch (opt) { > + case 'd': > + table = bb_xfopen((line = optarg), "r"); > + break; > + default: > + bb_show_usage(); > } > } > > - if (optind >= argc || (rootdir=argv[optind])==NULL) { > + if (optind >= argc || (rootdir = argv[optind]) == NULL) { > bb_error_msg_and_die("root directory not speficied"); > } > > @@ -527,12 +540,11 @@ int main(int argc, char **argv) > continue; > } > > - if ((2 > sscanf(line, "%4095s %c %o %40s %40s %u %u %u %u %u", name, > - &type, &mode, user, group, &major, > - &minor, &start, &increment, &count)) || > - ((major | minor | start | count | increment) > 0xfffff)) > - { > - if (*line=='\0' || *line=='#' || isspace(*line)) > + if ((2 > sscanf(line, "%4095s %c %o %40s %40s %u %u %u %u %u", > + name, &type, &mode, user, group, &major, &minor, > + &start, &increment, &count)) || > + ((major | minor | start | count | increment) > 0xfffff)) { > + if (*line == '\0' || *line == '#' || isspace(*line)) > continue; > bb_error_msg("line %d invalid: '%s'\n", linenum, line); > ret = EXIT_FAILURE; > @@ -567,7 +579,7 @@ int main(int argc, char **argv) > ret = EXIT_FAILURE; > goto loop; > } > - if ((mode != -1) && (chmod(full_name, mode) < 0)){ > + if ((mode != -1) && (chmod(full_name, mode) < 0)) { > bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); > ret = EXIT_FAILURE; > goto loop; > @@ -587,7 +599,7 @@ int main(int argc, char **argv) > ret = EXIT_FAILURE; > goto loop; > } > - if ((mode != -1) && (chmod(full_name, mode) < 0)){ > + if ((mode != -1) && (chmod(full_name, mode) < 0)) { > bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); > ret = EXIT_FAILURE; > goto loop; > @@ -601,19 +613,16 @@ int main(int argc, char **argv) > ret = EXIT_FAILURE; > goto loop; > } > - } else > - { > + } else { > dev_t rdev; > unsigned i; > char *full_name_inc; > > if (type == 'p') { > mode |= S_IFIFO; > - } > - else if (type == 'c') { > + } else if (type == 'c') { > mode |= S_IFCHR; > - } > - else if (type == 'b') { > + } else if (type == 'b') { > mode |= S_IFBLK; > } else { > bb_error_msg("line %d: Unsupported file type %c", linenum, type); > @@ -621,7 +630,7 @@ int main(int argc, char **argv) > goto loop; > } > > - full_name_inc = xmalloc(strlen(full_name) + sizeof(int)*3 + 2); > + full_name_inc = xmalloc(strlen(full_name) + sizeof(int) * 3 + 2); > if (count) > count--; > for (i = start; i <= start + count; i++) { > @@ -640,7 +649,7 @@ int main(int argc, char **argv) > } > free(full_name_inc); > } > -loop: > + loop: > free(line); > } > fclose(table); > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From troglobit at gmail.com Sat Jan 1 14:26:58 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Sat, 1 Jan 2022 15:26:58 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/makedevs: coding style and whitespace cleanup In-Reply-To: <20220101141315.GB2777@scaer> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-4-troglobit@gmail.com> <20220101141315.GB2777@scaer> Message-ID: <07d1d003-f2fd-a682-d496-d733c2e974ce@gmail.com> On 1/1/22 3:13 PM, Yann E. MORIN wrote: > Joachim, All, > On 2021-12-23 10:08 +0100, Joachim Wiberg spake thusly: >> This program is cobbled up with parts from all over the place, mostly >> BusyBox, so the style has not been kept consistent. This patch is a >> modest attempt to clean it up a bit. Some changes, e.g., comments are >> for consistency with the rest of the program. >> >> - The (new) top level .clang-format file has been used as an aid >> - Overly long lines have been kept to keep the diff small and any >> discussions on max line length in the project to a minimum >> - Comment indentation has been kept, again to keep the diff small > While I appreciate the rasoning, I think that, if we have a code style > and a linter/reformatter, then we should just mechanically apply it and > not manually apply parts of the rules. > Otherwise, it does not help the maintenance/review anymore than the > current state. > So, I would be of the opinion that we should just blindly apply > clang-format and be done with that. Agreed. > However, I'm also afraid that there might be different reformatting > rules based on the clang-format version... Maybe the version we use > should be documented somewhere? Possibly, but in that case this would be a problem also in other projects, e.g. the kernel. I'd lean more towards syncing with kernel .clang-format if that should turn out to be a regular problem. Best regards /Joachim From fontaine.fabrice at gmail.com Sat Jan 1 14:26:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 15:26:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: fix avahi build Message-ID: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit 27908c6eab768d0b9fd3444a929b3f1b1510da71: ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency "avahi-client" not found, tried pkgconfig Fixes: - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 Signed-off-by: Fabrice Fontaine --- package/pipewire/pipewire.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index efda3ad695..7043745cc1 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -82,7 +82,8 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# avahi support needs avahi-client, which needs avahi-daemon and dbus +ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 14:38:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 15:38:20 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/makedevs: coding style and whitespace cleanup In-Reply-To: <07d1d003-f2fd-a682-d496-d733c2e974ce@gmail.com> References: <20211223090800.1716321-1-troglobit@gmail.com> <20211223090800.1716321-4-troglobit@gmail.com> <20220101141315.GB2777@scaer> <07d1d003-f2fd-a682-d496-d733c2e974ce@gmail.com> Message-ID: <20220101143820.GC2777@scaer> Joachim, All, On 2022-01-01 15:26 +0100, Joachim Wiberg spake thusly: > On 1/1/22 3:13 PM, Yann E. MORIN wrote: > > However, I'm also afraid that there might be different reformatting > > rules based on the clang-format version... Maybe the version we use > > should be documented somewhere? > Possibly, but in that case this would be a problem also in other > projects, e.g. the kernel. I'd lean more towards syncing with kernel > .clang-format if that should turn out to be a regular problem. Agreed. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 14:48:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 15:48:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libapparmor: fix build with python 3.10 Message-ID: <20220101144840.1387059-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: configure: error: cannot import Python module "distutils". Please check your Python installation. The error was: :1: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives Fixes: - http://autobuild.buildroot.org/results//f3e400cbb5b00fbd7f0cb421c993e46b64ec5ac5 Signed-off-by: Fabrice Fontaine --- ...deprecated-distutils-with-setuptools.patch | 244 ++++++++++++++++++ package/libapparmor/libapparmor.mk | 2 +- 2 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch new file mode 100644 index 0000000000..5aed31d0b5 --- /dev/null +++ b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch @@ -0,0 +1,244 @@ +From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 +From: Georgia Garcia +Date: Wed, 10 Nov 2021 19:50:35 +0000 +Subject: [PATCH] replace deprecated distutils with setuptools + +Adds python3 setuptools as a build dependency for libapparmor + +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 +Signed-off-by: Georgia Garcia +Acked-by: Christian Boltz + +[Retrieved (and updated to remove changes on .gitlab-ci.yml and +README.md) from: +https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 3 ++ + .gitlab-ci.yml | 2 +- + libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- + libraries/libapparmor/swig/python/Makefile.am | 2 +- + libraries/libapparmor/swig/python/setup.py.in | 2 +- + .../libapparmor/swig/python/test/Makefile.am | 2 +- + profiles/Makefile | 2 +- + utils/Makefile | 1 + + utils/python-tools-setup.py | 6 ++-- + utils/test/Makefile | 2 +- + utils/test/README.md | 2 +- + 11 files changed, 32 insertions(+), 28 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 78a06fdf9..4782a351a 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c + libraries/libapparmor/swig/perl/libapparmor_wrap.o + libraries/libapparmor/swig/perl/pm_to_blib + libraries/libapparmor/swig/python/LibAppArmor.py ++libraries/libapparmor/swig/python/LibAppArmor.egg-info/ + libraries/libapparmor/swig/python/build/ + libraries/libapparmor/swig/python/libapparmor_wrap.c + libraries/libapparmor/swig/python/Makefile +@@ -204,6 +205,8 @@ utils/*.tmp + utils/po/*.mo + utils/apparmor/*.pyc + utils/apparmor/rule/*.pyc ++utils/apparmor.egg-info/ ++utils/build/ + utils/htmlcov/ + utils/test/common_test.pyc + utils/test/.coverage +diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 +index 1da29d873..f21f70ce7 100644 +--- a/libraries/libapparmor/m4/ac_python_devel.m4 ++++ b/libraries/libapparmor/m4/ac_python_devel.m4 +@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. + fi + + # +- # Check if you have distutils, else fail ++ # Check if you have setuptools, else fail + # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ AC_MSG_CHECKING([for the setuptools Python package]) ++ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` ++ if test -z "$ac_setuptools_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ AC_MSG_ERROR([cannot import Python module "setuptools". + Please check your Python installation. The error was: +-$ac_distutils_result]) ++$ac_setuptools_result]) + PYTHON_VERSION="" + fi + +@@ -88,8 +88,8 @@ $ac_distutils_result]) + PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` + fi + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` ++ python_path=`$PYTHON -c "import sys; import sysconfig;\ ++sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` + if test -n "${python_path}"; then + python_path="-I$python_path" + fi +@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` + if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) +- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` ++ py_version=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` + if test "$py_version" == "[None]"; then + if test -n "$PYTHON_VERSION"; then + py_version=$PYTHON_VERSION +@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` + fi + fi + +- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ ++ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ + "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` + fi + AC_MSG_RESULT([$PYTHON_LDFLAGS]) +@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO + # + AC_MSG_CHECKING([for Python site-packages path]) + if test -z "$PYTHON_SITE_PKG"; then +- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` ++ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` + fi + AC_MSG_RESULT([$PYTHON_SITE_PKG]) + AC_SUBST([PYTHON_SITE_PKG]) +@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` + PYTHON_EXTRA_LIBS='' + fi + if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) +@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( + PYTHON_EXTRA_LDFLAGS='' + fi + if test -z "$PYTHON_EXTRA_LDFLAGS"; then +- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) +diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am +index 04edff003..bf05fe0fc 100644 +--- a/libraries/libapparmor/swig/python/Makefile.am ++++ b/libraries/libapparmor/swig/python/Makefile.am +@@ -21,7 +21,7 @@ install-exec-local: + + clean-local: + if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi +- rm -rf build ++ rm -rf build LibAppArmor.egg-info + if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi + + endif +diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in +index 32abd46b2..b23e40746 100644 +--- a/libraries/libapparmor/swig/python/setup.py.in ++++ b/libraries/libapparmor/swig/python/setup.py.in +@@ -1,4 +1,4 @@ +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import string + + setup(name = 'LibAppArmor', +diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am +index 7287819c9..9dccfdef6 100644 +--- a/libraries/libapparmor/swig/python/test/Makefile.am ++++ b/libraries/libapparmor/swig/python/test/Makefile.am +@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status + CLEANFILES = test_python.py + + # bah, how brittle is this? +-PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' ++PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' + + TESTS = test_python.py + TESTS_ENVIRONMENT = \ +diff --git a/profiles/Makefile b/profiles/Makefile +index c471e58e8..0b7f2655d 100644 +--- a/profiles/Makefile ++++ b/profiles/Makefile +@@ -41,7 +41,7 @@ ifdef USE_SYSTEM + LOGPROF?=aa-logprof + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) +diff --git a/utils/Makefile b/utils/Makefile +index 1f08f259a..91a15107b 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -72,6 +72,7 @@ clean: pod_clean + rm -rf staging/ build/ + rm -f apparmor/*.pyc apparmor/rule/*.pyc + rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ ++ rm -rf apparmor.egg-info/ + + # ${CAPABILITIES} is defined in common/Make.rules + .PHONY: check_severity_db +diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py +index 30ce0cb05..2cbde8fc1 100644 +--- a/utils/python-tools-setup.py ++++ b/utils/python-tools-setup.py +@@ -20,14 +20,14 @@ + # Note: --version=... must be the last argument to this script + # + +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import os + import shutil + import sys + + class Install(_install, object): +- '''Override distutils to install the files where we want them.''' ++ '''Override setuptools to install the files where we want them.''' + def run(self): + # Now byte-compile everything + super(Install, self).run() +diff --git a/utils/test/Makefile b/utils/test/Makefile +index 90354aa50..9126bdd71 100644 +--- a/utils/test/Makefile ++++ b/utils/test/Makefile +@@ -32,7 +32,7 @@ ifdef USE_SYSTEM + PARSER= + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) +-- +GitLab + diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 0d5822a56d..b21a841f3f 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -28,7 +28,7 @@ LIBAPPARMOR_CONF_OPTS = \ --disable-man-pages ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIBAPPARMOR_DEPENDENCIES += host-python3 host-swig python3 +LIBAPPARMOR_DEPENDENCIES += host-python3 host-python3-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 14:56:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 15:56:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/fail2ban: fix build with python 3.10 Message-ID: <20220101145632.1393642-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: error in fail2ban setup command: use_2to3 is invalid. Fixes: - http://autobuild.buildroot.org/results/6a5e91f9912f869b2b07b10b576457b432066393 Signed-off-by: Fabrice Fontaine --- ...with-error-in-fail2ban-setup-command.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch diff --git a/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch new file mode 100644 index 0000000000..8cb097dc38 --- /dev/null +++ b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch @@ -0,0 +1,67 @@ +From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001 +From: sebres +Date: Sun, 19 Sep 2021 18:49:18 +0200 +Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup + command: use_2to3 is invalid (setuptools 58+) + +[Retrieved from: +https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497] +Signed-off-by: Fabrice Fontaine +--- + setup.py | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/setup.py b/setup.py +index f4c2550f6..98413273c 100755 +--- a/setup.py ++++ b/setup.py +@@ -48,7 +48,7 @@ + from glob import glob + + from fail2ban.setup import updatePyExec +- ++from fail2ban.version import version + + source_dir = os.path.realpath(os.path.dirname( + # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): +@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): + # Wrapper to specify fail2ban own options: + class install_command_f2b(install): + user_options = install.user_options + [ +- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), + ('without-tests', None, 'without tests files installation'), + ] + def initialize_options(self): +- self.disable_2to3 = None + self.without_tests = not with_tests + install.initialize_options(self) + def finalize_options(self): +- global _2to3 +- ## in the test cases 2to3 should be already done (fail2ban-2to3): +- if self.disable_2to3: +- _2to3 = False +- if _2to3: +- cmdclass = self.distribution.cmdclass +- cmdclass['build_py'] = build_py_2to3 +- cmdclass['build_scripts'] = build_scripts_2to3 + if self.without_tests: + self.distribution.scripts.remove('bin/fail2ban-testcases') + +@@ -178,7 +168,6 @@ def run(self): + if setuptools: + setup_extra = { + 'test_suite': "fail2ban.tests.utils.gatherTests", +- 'use_2to3': True, + } + else: + setup_extra = {} +@@ -202,9 +191,6 @@ def run(self): + ('/usr/share/doc/fail2ban', doc_files) + ) + +-# Get version number, avoiding importing fail2ban. +-# This is due to tests not functioning for python3 as 2to3 takes place later +-exec(open(join("fail2ban", "version.py")).read()) + + setup( + name = "fail2ban", -- 2.33.0 From giulio.benetti at benettiengineering.com Sat Jan 1 15:10:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 1 Jan 2022 16:10:09 +0100 Subject: [Buildroot] [buildroot-test] scripts/autobuild-run: extend timeout from 120 to 180 minutes In-Reply-To: <20220101115058.0515c8d9@windsurf> References: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> <20220101115058.0515c8d9@windsurf> Message-ID: <9c4d8993-46b2-8f1a-6aa3-bdd9957b783c@benettiengineering.com> Hi Thomas, On 01/01/22 11:50, Thomas Petazzoni wrote: > Hello Giulio, > > On Fri, 1 Oct 2021 01:14:24 +0200 > Giulio Benetti wrote: > >> During the last months some package started to timeout, but this is not due >> to toolchain infinite loop. I think it's due to the increase of the source >> code files' length and to complexity of toolchains or even slow compiling >> time. For example python-uvloop and python-lxml only take long time to >> build with -Os optimization and this makes it seem a TIMEOUT but it's not. >> So let's extend timeout setting from 120 to 180 minutes to avoid false >> TIMEOUTs. >> >> Signed-off-by: Giulio Benetti > > Do you have a specific example where you have seen a failure? Not anymore, it's been only in September. 2 days ago I was right thinking about dropping this patch when checking patchwork. > Please > note that this HUNG_BUILD_TIMEOUT value is the per-step timeout: it > verifies that one step of one particular package doesn't take more than > 120 minutes. Ah, I thought the entire build, but that makes no sense since some build can take way more than 2 hours. > Unless you have a specific example where you have seen this timeout > causing false positives, I'm not really keen on applying such a patch > as it would cause situations where the build is really stuck to be > stuck for 3 hours instead of 2. Yes, I see you've already marked it as rejected. > Did you identify that the python-uvloop and python-lxml packages really > took more than 2 hours to build? I did see at > http://autobuild.buildroot.net/?status=TIMEOUT those timeouts dating > back from ~November. Did you reproduce the issue, and verified that the > build indeed completes at some point? In general, if a simple package > such as python-uvloop or python-lxml takes more than 2 hours to build, > it means that the compiler (or linker) has gone crazy in an infinite > loop, and the build will in fact never finish. It was only my suspicious as specified in commit log. I couldn't reproduce it and I thought it was due to the autobuilder's host. And yes, now that I know it's a per-step timeout it doesn't make sense at all for such little packages. Thank you Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sat Jan 1 15:12:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 16:12:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtorrent-rasterbar: fix build with gcc 9 Message-ID: <20220101151218.1620080-1-fontaine.fabrice@gmail.com> Drop -std=c++11 to avoid the following build failure with gcc 9 raised since bump to version 1.2.15 in commit 2cecfe94f889165f3a5169598ed7e0388941a6cd and https://github.com/arvidn/libtorrent/commit/b7e02cc700d884f87a18a3bc59f95a66a5cb0209: configure: error: *** A compiler with support for C++14 language features is required. Fixes: - http://autobuild.buildroot.org/results/905a51bee38e85a48aa170c15494f2798aa6afea Signed-off-by: Fabrice Fontaine --- package/libtorrent-rasterbar/libtorrent-rasterbar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 914e0cbca3..cde010a4f7 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -16,7 +16,7 @@ LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES LIBTORRENT_RASTERBAR_CONF_OPTS = \ --with-boost-libdir=$(STAGING_DIR)/usr/lib \ --disable-invariant-checks -LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 +LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) # Internal error, aborting at dwarf2cfi.c:2802 in connect_traces # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 15:50:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 16:50:22 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/alchemy: new host package In-Reply-To: <20211112131258.2671293-2-herve.codina@bootlin.com> References: <20211112131258.2671293-1-herve.codina@bootlin.com> <20211112131258.2671293-2-herve.codina@bootlin.com> Message-ID: <20220101155022.GD2777@scaer> Herv?, All, On 2021-11-12 14:12 +0100, Herve Codina spake thusly: > Alchemy is a build system developed by Parrot. > > It is a new build system based on the one used in Android. > A central makefile instance scans a workspace to find user > makefiles, includes them and register modules to be built. > > https://github.com/Parrot-Developers/alchemy > > Signed-off-by: Herve Codina I was about to push this, with a few changes, but I have some questions about the packages, so here's the patch of the changes I did: [yann.morin.1998 at free.fr: - use ALCHEMY_HOME everywhere rather than repeating the location in the install macro - don't remove install dir before installing - use a template for atom.mk, not in-line in alchemy.mk ] diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk index 63d5a941c5..f802c62425 100644 --- a/package/alchemy/alchemy.mk +++ b/package/alchemy/alchemy.mk @@ -10,19 +10,19 @@ ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) ALCHEMY_LICENSE_FILES = COPYING README HOST_ALCHEMY_DEPENDENCIES = host-python3 +ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk define HOST_ALCHEMY_INSTALL_CMDS - rm -rf $(HOST_DIR)/opt/alchemy - mkdir -p $(HOST_DIR)/opt/alchemy - cp -rf $(@D)/* $(HOST_DIR)/opt/alchemy/ + mkdir -p $(ALCHEMY_HOME) + cp -rf $(@D)/* $(ALCHEMY_HOME) + cp $(ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOM E)/atom.mk.in endef $(eval $(host-generic-package)) # Variables used by other packages -ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake # TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture. @@ -59,14 +59,11 @@ endif # $2: Alchemy module name # $3: Alchemy module file name define ALCHEMY_INSTALL_LIB_SDK_FILE - mkdir -p $(ALCHEMY_SDK_BASEDIR)/$(strip $(1)) - ( \ - echo 'LOCAL_PATH := $$(call my-dir)'; \ - echo 'include $$(CLEAR_VARS)'; \ - echo 'LOCAL_MODULE := $(strip $(2))'; \ - echo 'LOCAL_SDK := $(STAGING_DIR)'; \ - echo 'LOCAL_DESTDIR := usr/lib'; \ - echo 'LOCAL_MODULE_FILENAME := $(strip $(3))'; \ - echo 'include $$(BUILD_LIBRARY)'; \ - ) > $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk + $(INSTALL) -m 0644 -D \ + $(ALCHEMY_HOME)/atom.mk.in \ + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk + $(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \ + -e 's#@MODULE@#$(strip $(2))#' \ + -e 's#@MODULE_FILENAME@#$(strip $(3))#' \ + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk endef diff --git a/package/alchemy/atom.mk.in b/package/alchemy/atom.mk.in new file mode 100644 index 0000000000..30eb6d5e23 --- /dev/null +++ b/package/alchemy/atom.mk.in @@ -0,0 +1,7 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE := @MODULE@ +LOCAL_SDK := @STAGING_DIR@ +LOCAL_DESTDIR := usr/lib +LOCAL_MODULE_FILENAME := @MODULE_FILENAME@ +include $(BUILD_LIBRARY) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 15:59:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 16:59:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/tvheadend: disable execinfo Message-ID: <20220101155950.1784485-1-fontaine.fabrice@gmail.com> Disable execinfo to avoid the following build failure if libexecinfo is built before tvheadend since the addition of the package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/build.linux/src/tvhlog.o: in function `tvhlog_backtrace_printf': /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/src/tvhlog.c:522: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/ee9ad2c999b622097fe0f1522e7e32184722e548 Signed-off-by: Fabrice Fontaine --- .../0002-configure-add-execinfo-option.patch | 55 +++++++++++++++++++ package/tvheadend/tvheadend.mk | 1 + 2 files changed, 56 insertions(+) create mode 100644 package/tvheadend/0002-configure-add-execinfo-option.patch diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch new file mode 100644 index 0000000000..c55d127d58 --- /dev/null +++ b/package/tvheadend/0002-configure-add-execinfo-option.patch @@ -0,0 +1,55 @@ +From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 16:53:29 +0100 +Subject: [PATCH] configure: add execinfo option + +Add execinfo option to allow the user to disable the feature even if +execinfo.h is found on the system + +Signed-off-by: Fabrice Fontaine +[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] +--- + configure | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 4dad024c4..c087502bf 100755 +--- a/configure ++++ b/configure +@@ -75,6 +75,7 @@ OPTIONS=( + "ddci:yes" + "cclang_threadsan:no" + "gperftools:no" ++ "execinfo:auto" + ) + + # +@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then + # If we don't have libunwind then fallback to execinfo. + if ! enabled libunwind + then +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + + else +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + check_cc_option mmx + check_cc_option sse2 +-- +2.33.0 + diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 4e84e496bf..58ebdcb054 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -161,6 +161,7 @@ define TVHEADEND_CONFIGURE_CMDS --enable-dvbscan \ --enable-bundle \ --enable-pngquant \ + --disable-execinfo \ --disable-ffmpeg_static \ --disable-hdhomerun_static \ $(TVHEADEND_CONF_OPTS) \ -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 16:05:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 17:05:33 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/ulog: new package In-Reply-To: <20211112131258.2671293-3-herve.codina@bootlin.com> References: <20211112131258.2671293-1-herve.codina@bootlin.com> <20211112131258.2671293-3-herve.codina@bootlin.com> Message-ID: <20220101160533.GE2777@scaer> Herv?, All, On 2021-11-12 14:12 +0100, Herve Codina spake thusly: > The ulog library is a minimalistic logging library derived from > Android logger. > > https://github.com/Parrot-Developers/ulog > > Signed-off-by: Herve Codina [--SNIP--] > diff --git a/package/ulog/ulog.mk b/package/ulog/ulog.mk > new file mode 100644 > index 0000000000..fab16e80d8 > --- /dev/null > +++ b/package/ulog/ulog.mk > @@ -0,0 +1,44 @@ > +################################################################################ > +# > +# ulog > +# > +################################################################################ > + > +ULOG_VERSION = 0389d243352255f6182326dccdae3d56dadc078f > +ULOG_SITE = $(call github,Parrot-Developers,ulog,$(ULOG_VERSION)) > +ULOG_LICENSE = Apache-2.0 > +ULOG_LICENSE_FILES = COPYING > +ULOG_DEPENDENCIES = host-alchemy > +ULOG_INSTALL_STAGING = YES > + > +define ULOG_BUILD_CMDS > + $(ALCHEMY_TARGET_ENV) \ > + $(ALCHEMY_MAKE) libulog > +endef > + > +define ULOG_INSTALL_STATIC_LIBS > + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.a $(1)/usr/lib/ > +endef So, it looks like you are always going to install the static library, but the package does not have: depends on !BR2_STATIC_LIBS > + > +define ULOG_INSTALL_HEADERS > + cp -Raf $(@D)/libulog/include/* $(1)/usr/include/ > +endef > + > +ifeq ($(BR2_STATIC_LIBS),) > +define ULOG_INSTALL_SHARED_LIBS > + $(INSTALL) -m 755 $(@D)/alchemy-out/staging/usr/lib/libulog.so* $(1)/usr/lib/ Although it is very improbable that the destination directory does not already exist, that is still a possibility, especially in target/. And for consistency with all the other packages, you must create the destination directory first before you start copying multiple files in there. Also for consistency, use either 'cp' or '$(INSTALL)', not both , in the same .mk (you used 'cp' for headers, and '$(INSTALL)' for libs, although I don't see a reason not to use them consistently). Oh, and shared libraries do not need to be +x, so -m 644 is enough. > +endef > +endif > + > +define ULOG_INSTALL_TARGET_CMDS > + $(call ULOG_INSTALL_SHARED_LIBS, $(TARGET_DIR)) > +endef > + > +define ULOG_INSTALL_STAGING_CMDS > + $(call ULOG_INSTALL_STATIC_LIBS, $(STAGING_DIR)) > + $(call ULOG_INSTALL_SHARED_LIBS, $(STAGING_DIR)) > + $(call ULOG_INSTALL_HEADERS, $(STAGING_DIR)) > + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, ulog, libulog, libulog.so) So, what happens with BR2_STATIC_LIBS=y? The .so would not exist in that case, would it? But then, this is what would be registered in the atom.mk... And with BR2_STATIC_LIBS not set, then the .a should not be built (or at least not installed!), yet the installation of the static lib is unconditional (and see the first comment too). It is difficult to understand if all of the static-shared combinations are supported, so could you please check/clarify this? If the three combinations are indeed supported, then both the shared and the staic install macros should be conditional. Otherwise, proper guards should be added in the Config.in. Those comments apply to all the pakcages in this series. Regards, Yann E. MORIN. > +endef > + > +$(eval $(generic-package)) > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 17:09:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 18:09:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.23 Message-ID: <20220101170938.1866790-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://www.spinics.net/lists/kexec/msg27693.html Signed-off-by: Fabrice Fontaine --- ...move-duplicate-definition-of-ramdisk.patch | 32 ------------------- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch diff --git a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch b/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch deleted file mode 100644 index 173323bff8..0000000000 --- a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001 -From: Petr Tesarik -Date: Mon, 26 Apr 2021 15:29:51 +0200 -Subject: kexec-tools: Remove duplicate definition of ramdisk - -The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This -other definition is not needed and breaks build with -fno-common. - -Signed-off-by: Petr Tesarik -Signed-off-by: Simon Horman -[Retrieved from: -https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c] -Signed-off-by: Fabrice Fontaine ---- - kexec/arch/ppc/kexec-elf-ppc.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c -index ad43ad1..4a4886e 100644 ---- a/kexec/arch/ppc/kexec-elf-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-ppc.c -@@ -33,7 +33,6 @@ - static const int probe_debug = 0; - - unsigned char reuse_initrd; --const char *ramdisk; - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, - char *); - --- -cgit 1.2.3-1.el7 - diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 1cf860d85e..05eb9e3d02 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 kexec-tools-2.0.22.tar.xz +sha256 aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b kexec-tools-2.0.23.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 81d35815d8..b3b4e56546 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.22 +KEXEC_VERSION = 2.0.23 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 -- 2.33.0 From richard at audacityteam.org Sat Jan 1 17:37:05 2022 From: richard at audacityteam.org (Richard Ash) Date: Sat, 1 Jan 2022 17:37:05 +0000 Subject: [Buildroot] Patching a BR package makefile In-Reply-To: References: Message-ID: <20220101173705.142a0496@audacityteam.org> On Wed, 29 Dec 2021 14:57:54 +0200 Jacques Samoun wrote: > I had to modify a OPENSSH_CONF_OPTS of the openssh.mk package > makefile to solve a known interoperability issue (openssh vs > libopenssl). Now the fix is verified, i would like to create a patch > to be applied to this openssh.mk . > > However, while I already did a couple of patches to other packages, > they were always so far applied to the course code of the packages. In > this specific case, I do not know how to make this on the > buildroot/package/.mk file. > > Is there a preferred way to do so ? As far as I know, there isn't a way to do this within buildroot, because the buildroot tree is (has to be) immutable by the time buildroot runs. Put another way you can't patch what effectively becomes one vast Makefile from within that Makefile without badly upsetting make! The only options I have found are: 1. Write a wrapper script to unpack the buildroot tarball and apply your patches (note you may have problems if your patches change over time). 2. Have your own fork of buildroot git, and then your own branch from the relevant release tag with your changes on top. This means you can rebase your changes with git's help when you want to move to a newer buildroot. Convenient if the rest of your build is in git and you can use a git submodule to fetch your forked git automatically. 3. Don't try to modify the buildroot package, create your own custom-ssh package (copy of buildroot plus your patch) and maintain it in a buildroot external (see the manual). Could be a pain to keep up to date in the longer term. I'm not in any way a buildroot maintainer however! All of these are good reasons to get patches upstreamed (if possible) into buildroot! Richard From james.hilliard1 at gmail.com Sat Jan 1 18:00:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 11:00:04 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cffi: bump to version 1.15.0 Message-ID: <20220101180004.2499189-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-cffi/python-cffi.hash | 4 ++-- package/python-cffi/python-cffi.mk | 4 ++-- package/python3-cffi/python3-cffi.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash index 8ab672a56f..41565f9a62 100644 --- a/package/python-cffi/python-cffi.hash +++ b/package/python-cffi/python-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cffi/json -md5 5c118a18ea897df164dbff67a32876fc cffi-1.14.6.tar.gz -sha256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd cffi-1.14.6.tar.gz +md5 f3a3f26cd3335fc597479c9475da0a0b cffi-1.15.0.tar.gz +sha256 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 cffi-1.15.0.tar.gz # Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index 2504cf18f4..b14dce8225 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-cffi/python3-cffi.mk -PYTHON_CFFI_VERSION = 1.14.6 +PYTHON_CFFI_VERSION = 1.15.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk index 52ea3b3fbf..2770eda93e 100644 --- a/package/python3-cffi/python3-cffi.mk +++ b/package/python3-cffi/python3-cffi.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-cffi/python-cffi.mk -PYTHON3_CFFI_VERSION = 1.14.6 +PYTHON3_CFFI_VERSION = 1.15.0 PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz -PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 +PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a PYTHON3_CFFI_SETUP_TYPE = setuptools PYTHON3_CFFI_LICENSE = MIT PYTHON3_CFFI_LICENSE_FILES = LICENSE -- 2.25.1 From fontaine.fabrice at gmail.com Sat Jan 1 18:25:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 19:25:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/mdadm: bump to version 4.2 Message-ID: <20220101182557.1915942-1-fontaine.fabrice@gmail.com> - Drop first patch and use install-bin target added by https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=b4a5ad4958cb3ad87c3c5fa993e7572c38596d09 - Drop second patch (already in version) - Handle libudev optional dependency through CXFLAGS instead of overriding CFLAGS as wanted by upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=af3396dadfcd3b13480d021b8d3645c6d2420f79 - Update indentation in hash file (two spaces) https://www.spinics.net/lists/raid/msg69218.html Signed-off-by: Fabrice Fontaine --- ...-install-targets-for-mdadm-and-mdmon.patch | 32 ----------------- ...-include-sysmacros.h-unconditionally.patch | 35 ------------------- package/mdadm/mdadm.hash | 4 +-- package/mdadm/mdadm.mk | 21 +++++++---- 4 files changed, 17 insertions(+), 75 deletions(-) delete mode 100644 package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch delete mode 100644 package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch diff --git a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch b/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch deleted file mode 100644 index 15df7557e7..0000000000 --- a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Wed, 6 Mar 2013 16:03:14 +0100 -Subject: [PATCH] Add install targets for mdadm and mdmon - - -Signed-off-by: Christophe Vu-Brugier ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 315455b..27d8eeb 100644 ---- a/Makefile -+++ b/Makefile -@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h - sha1.o : sha1.c sha1.h md5.h - $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c - --install : mdadm mdmon install-man install-udev -+install : install-mdadm install-mdmon install-man install-udev -+ -+install-mdadm : - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm -+ -+install-mdmon : - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon - - install-static : mdadm.static install-man --- -1.7.10.4 - diff --git a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch b/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch deleted file mode 100644 index c8944c8475..0000000000 --- a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 6 Aug 2019 16:01:15 +0300 -Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally - -musl libc now also requires sys/sysmacros.h for the major/minor macros. -All supported libc implementations carry sys/sysmacros.h, including -diet-libc, klibc, and uclibc-ng. - -Cc: Hauke Mehrtens -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=linux-raid&m=156509677018508 - - mdadm.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/mdadm.h b/mdadm.h -index c36d7fdb10f6..d61a9ca82dc1 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - #include - #include - #include --#ifdef __GLIBC__ - /* Newer glibc requires sys/sysmacros.h directly for makedev() */ - #include --#endif - #ifdef __dietlibc__ - #include - /* dietlibc has deprecated random and srandom!! */ --- -2.20.1 - diff --git a/package/mdadm/mdadm.hash b/package/mdadm/mdadm.hash index b15cb4e031..b9631a2aaa 100644 --- a/package/mdadm/mdadm.hash +++ b/package/mdadm/mdadm.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a mdadm-4.1.tar.xz +sha256 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d mdadm-4.2.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 171782712f..6ee0bb60c9 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -4,14 +4,19 @@ # ################################################################################ -MDADM_VERSION = 4.1 +MDADM_VERSION = 4.2 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING -MDADM_BUILD_OPTS = $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" \ +MDADM_CXFLAGS = $(TARGET_CFLAGS) + +MDADM_BUILD_OPTS = \ + CC=$(TARGET_CC) \ + COROSYNC=-DNO_COROSYNC \ + DLM=-DNO_DLM \ + CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 @@ -19,14 +24,18 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) MDADM_BUILD_OPTS += USE_PTHREADS= endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +MDADM_DEPENDENCIES += udev +else +MDADM_CXFLAGS += -DNO_LIBUDEV +endif + define MDADM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(MDADM_BUILD_OPTS) mdadm mdmon endef define MDADM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) \ - install-mdadm install-mdmon + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin endef $(eval $(generic-package)) -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 18:36:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 19:36:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-lib: fix static build Message-ID: <20220101183612.1965455-1-fontaine.fabrice@gmail.com> Fix the following static build failure with alsa-utils raised since bump to version 1.2.6 in commit 4d4a588a504a6446dd0a29a353d94c6e86cfd879: checking for snd_tplg_new in -latopology... no configure: error: No linkable libatopology was found. Fixes: - http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 Signed-off-by: Fabrice Fontaine --- ...ser.c-drop-duplicate-safe_strtol_bas.patch | 51 +++++++++++ ...-safe_strto-functions-from-libasound.patch | 88 +++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch create mode 100644 package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch diff --git a/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch new file mode 100644 index 0000000000..a3741c42c0 --- /dev/null +++ b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch @@ -0,0 +1,51 @@ +From 47252054b4a2d5c8382cb1342f5d4eb89dabf95f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 17:20:47 +0100 +Subject: [PATCH] src/topology/parser.c: drop duplicate safe_strtol_base + +The safe_strtol_base() function is defined twice since + f547b2e3 ("conf: introduce safe_strtol_base()") and + 5fab157a ("topology: do not call strtol directly") +resulting in the following build failure when alsa-utils is built +statically because safe_strtol_base is defined twice. + +Fixes: http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 +Fixes: https://github.com/alsa-project/alsa-lib/pull/207 +Signed-off-by: Fabrice Fontaine +Signed-off-by: Jaroslav Kysela +[Retrieved from: +https://github.com/alsa-project/alsa-lib/commit/47252054b4a2d5c8382cb1342f5d4eb89dabf95f] +--- + src/topology/parser.c | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/src/topology/parser.c b/src/topology/parser.c +index 01c95afa..e70173f6 100644 +--- a/src/topology/parser.c ++++ b/src/topology/parser.c +@@ -21,25 +21,6 @@ + #include "list.h" + #include "tplg_local.h" + +-/* +- * Safe strtol call +- */ +-int safe_strtol_base(const char *str, long *val, int base) +-{ +- char *end; +- long v; +- if (!*str) +- return -EINVAL; +- errno = 0; +- v = strtol(str, &end, base); +- if (errno) +- return -errno; +- if (*end) +- return -EINVAL; +- *val = v; +- return 0; +-} +- + /* + * Get integer value + */ diff --git a/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch new file mode 100644 index 0000000000..3dfcb78b5c --- /dev/null +++ b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch @@ -0,0 +1,88 @@ +From c687c482107f746332dd18f7407f6c6efbffccb2 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sat, 1 Jan 2022 19:18:25 +0100 +Subject: [PATCH] conf: fix the export of safe_strto* functions from libasound + +Only one library should define the safe_strto function. Export it +correctly and add _snd_ prefix to avoid possible clashes with the other +application code. + +Fixes: 47252054 ("src/topology/parser.c: drop duplicate safe_strtol_base") +Fixes: https://github.com/alsa-project/alsa-lib/pull/208 +Signed-off-by: Jaroslav Kysela + +[Retrieved from: +https://github.com/alsa-project/alsa-lib/commit/c687c482107f746332dd18f7407f6c6efbffccb2] +Signed-off-by: Fabrice Fontaine +--- + include/local.h | 8 ++++++-- + src/Versions.in | 6 ++++++ + src/conf.c | 6 +++--- + 3 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/include/local.h b/include/local.h +index ebc9350c..f64fe9d8 100644 +--- a/include/local.h ++++ b/include/local.h +@@ -232,10 +232,14 @@ size_t page_align(size_t size); + size_t page_size(void); + size_t page_ptr(size_t object_offset, size_t object_size, size_t *offset, size_t *mmap_offset); + +-int safe_strtoll_base(const char *str, long long *val, int base); ++#define safe_strtoll_base _snd_safe_strtoll_base ++int _snd_safe_strtoll_base(const char *str, long long *val, int base); + static inline int safe_strtoll(const char *str, long long *val) { return safe_strtoll_base(str, val, 0); } +-int safe_strtol_base(const char *str, long *val, int base); ++#define safe_strtol_base _snd_safe_strtol_base ++int _snd_safe_strtol_base(const char *str, long *val, int base); + static inline int safe_strtol(const char *str, long *val) { return safe_strtol_base(str, val, 0); } ++#define safe_strtod _snd_safe_strtod ++int _snd_safe_strtod(const char *str, double *val); + + int snd_send_fd(int sock, void *data, size_t len, int fd); + int snd_receive_fd(int sock, void *data, size_t len, int *fd); +diff --git a/src/Versions.in b/src/Versions.in +index 5daccbd4..85031b38 100644 +--- a/src/Versions.in ++++ b/src/Versions.in +@@ -134,3 +134,9 @@ ALSA_1.1.6 { + + @SYMBOL_PREFIX at snd_dlopen; + } ALSA_0.9.7; ++ ++ALSA_1.2.6 { ++ global: ++ ++ @SYMBOL_PREFIX at _snd_safe_strto*; ++} ALSA_1.1.6; +diff --git a/src/conf.c b/src/conf.c +index d3597cbc..098ebd63 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -663,7 +663,7 @@ static int input_stdio_open(snd_input_t **inputp, const char *file, + return err; + } + +-int safe_strtoll_base(const char *str, long long *val, int base) ++int _snd_safe_strtoll_base(const char *str, long long *val, int base) + { + char *end; + long v; +@@ -679,7 +679,7 @@ int safe_strtoll_base(const char *str, long long *val, int base) + return 0; + } + +-int safe_strtol_base(const char *str, long *val, int base) ++int _snd_safe_strtol_base(const char *str, long *val, int base) + { + char *end; + long v; +@@ -695,7 +695,7 @@ int safe_strtol_base(const char *str, long *val, int base) + return 0; + } + +-static int safe_strtod(const char *str, double *val) ++int _snd_safe_strtod(const char *str, double *val) + { + char *end; + double v; -- 2.33.0 From james.hilliard1 at gmail.com Sat Jan 1 19:30:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:14 -0700 Subject: [Buildroot] [PATCH 1/5] package/python-tomli: new package Message-ID: <20220101193018.404937-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-tomli/Config.in | 7 +++++++ package/python-tomli/python-tomli.hash | 5 +++++ package/python-tomli/python-tomli.mk | 16 ++++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/python-tomli/Config.in create mode 100644 package/python-tomli/python-tomli.hash create mode 100644 package/python-tomli/python-tomli.mk diff --git a/DEVELOPERS b/DEVELOPERS index 21e4f2a84c..e14842575a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1292,6 +1292,7 @@ F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ +F: package/python-tomli/ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ diff --git a/package/Config.in b/package/Config.in index d3d0717535..a34323175d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1254,6 +1254,7 @@ menu "External python modules" source "package/python-tinyrpc/Config.in" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" + source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in new file mode 100644 index 0000000000..e1cecaaa36 --- /dev/null +++ b/package/python-tomli/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TOMLI + bool "python-tomli" + depends on BR2_PACKAGE_PYTHON3 + help + A lil' TOML parser. + + https://github.com/hukkin/tomli diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash new file mode 100644 index 0000000000..1a274c8a40 --- /dev/null +++ b/package/python-tomli/python-tomli.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tomli/json +md5 2ecbc7a23b8c8dc2fe96f588f88463d9 tomli-1.2.0.tar.gz +sha256 d60e681734099207a6add7a10326bc2ddd1fdc36c1b0f547d00ef73ac63739c2 tomli-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk new file mode 100644 index 0000000000..4e6b023ef7 --- /dev/null +++ b/package/python-tomli/python-tomli.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-tomli +# +################################################################################ + +PYTHON_TOMLI_VERSION = 1.2.0 +PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa +PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_LICENSE = MIT +PYTHON_TOMLI_LICENSE_FILES = LICENSE +HOST_PYTHON_TOMLI_NEEDS_HOST_PYTHON = python3 + +$(eval $(python-package)) +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:30:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:15 -0700 Subject: [Buildroot] [PATCH 2/5] package/python-pyparsing: enable host build In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220101193018.404937-2-james.hilliard1@gmail.com> This will be required by host-python-packaging. Signed-off-by: James Hilliard --- package/python-pyparsing/python-pyparsing.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 0dacf2371d..5741458d65 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -10,5 +10,7 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools +HOST_PYTHON_PYPARSING_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:30:16 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:16 -0700 Subject: [Buildroot] [PATCH 3/5] package/python-packaging: enable host build In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220101193018.404937-3-james.hilliard1@gmail.com> This is required by python-setuptools-scm. Signed-off-by: James Hilliard --- package/python-packaging/python-packaging.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 6b54d2416d..e2fb9b120b 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -10,5 +10,8 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3a PYTHON_PACKAGING_SETUP_TYPE = setuptools PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD +HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:30:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:17 -0700 Subject: [Buildroot] [PATCH 4/5] package/python-setuptools-scm: bump to version 6.3.2 In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220101193018.404937-4-james.hilliard1@gmail.com> Add new host-python-packaging and host-python-tomli dependencies. Signed-off-by: James Hilliard --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 79999fca0d..22b9afd2c2 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 c11bf23d80224691a46ee5deb84c42db setuptools_scm-5.0.1.tar.gz -sha256 c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a setuptools_scm-5.0.1.tar.gz +md5 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz +sha256 a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 setuptools_scm-6.3.2.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index caca6d4314..f7f4e3ef27 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 5.0.1 +PYTHON_SETUPTOOLS_SCM_VERSION = 6.3.2 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/af/df/f8aa8a78d4d29e0cffa4512e9bc223ed02f24893fe1837c6cee2749ebd67 +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4b/0d/ecb9595fae02467edba5023eb8a23c688d2b438a6a8d1a9e2b8649faf23d PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools +HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli $(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:30:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:30:18 -0700 Subject: [Buildroot] [PATCH 5/5] package/python-argon2-cffi-bindings: new package In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220101193018.404937-5-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-argon2-cffi-bindings/Config.in | 11 ++++++++ .../python-argon2-cffi-bindings.hash | 5 ++++ .../python-argon2-cffi-bindings.mk | 25 +++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/python-argon2-cffi-bindings/Config.in create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk diff --git a/DEVELOPERS b/DEVELOPERS index e14842575a..1f9516da87 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1270,6 +1270,7 @@ F: package/python-aiorwlock/ F: package/python-aiosignal/ F: package/python-aiozipkin/ F: package/python-argon2-cffi/ +F: package/python-argon2-cffi-bindings/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-bidict/ diff --git a/package/Config.in b/package/Config.in index a34323175d..f5c4c23e27 100644 --- a/package/Config.in +++ b/package/Config.in @@ -917,6 +917,7 @@ menu "External python modules" source "package/python-ansicolors/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" + source "package/python-argon2-cffi-bindings/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in new file mode 100644 index 0000000000..3d409759e0 --- /dev/null +++ b/package/python-argon2-cffi-bindings/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS + bool "python-argon2-cffi-bindings" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU # libargon2 + depends on !BR2_STATIC_LIBS # libargon2 + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_LIBARGON2 + help + Low-level CFFI bindings for Argon2. + + https://github.com/hynek/argon2-cffi-bindings diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash new file mode 100644 index 0000000000..e088d3dad1 --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/argon2-cffi-bindings/json +md5 f1591e1af7dea9ef3e5b982e2c196c1d argon2-cffi-bindings-21.2.0.tar.gz +sha256 bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 argon2-cffi-bindings-21.2.0.tar.gz +# Locally computed sha256 checksums +sha256 9c158d4f433627f48ac24b6b4d37970afe4172514673c5318014d7cca157c6df LICENSE diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk new file mode 100644 index 0000000000..f0d71e803a --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# python-argon2-cffi-bindings +# +################################################################################ + +PYTHON_ARGON2_CFFI_BINDINGS_VERSION = 21.2.0 +PYTHON_ARGON2_CFFI_BINDINGS_SOURCE = argon2-cffi-bindings-$(PYTHON_ARGON2_CFFI_BINDINGS_VERSION).tar.gz +PYTHON_ARGON2_CFFI_BINDINGS_SITE = https://files.pythonhosted.org/packages/b9/e9/184b8ccce6683b0aa2fbb7ba5683ea4b9c5763f1356347f1312c32e3c66e +PYTHON_ARGON2_CFFI_BINDINGS_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE = MIT +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE_FILES = LICENSE +PYTHON_ARGON2_CFFI_BINDINGS_DEPENDENCIES = \ + host-python-cffi \ + host-python-setuptools-scm \ + libargon2 +PYTHON_ARGON2_CFFI_BINDINGS_ENV = ARGON2_CFFI_USE_SYSTEM=1 + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=1 +else +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=0 +endif + +$(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 19:59:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 12:59:10 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aioredis: bump to version 2.0.1 Message-ID: <20220101195910.406035-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aioredis/python-aioredis.hash | 4 ++-- package/python-aioredis/python-aioredis.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioredis/python-aioredis.hash b/package/python-aioredis/python-aioredis.hash index ca3f64d1e5..29e6361014 100644 --- a/package/python-aioredis/python-aioredis.hash +++ b/package/python-aioredis/python-aioredis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioredis/json -md5 343a451df2381b9ea368e12b9075caa5 aioredis-2.0.0.tar.gz -sha256 3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db aioredis-2.0.0.tar.gz +md5 8f3547af83ef4b863b18c19f23166a9d aioredis-2.0.1.tar.gz +sha256 eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e aioredis-2.0.1.tar.gz # Locally computed sha256 checksums sha256 183b21f240e41af611c951d01d4f36793d470a82d5fd79efc21f25ae4cf68543 LICENSE diff --git a/package/python-aioredis/python-aioredis.mk b/package/python-aioredis/python-aioredis.mk index 21a8a349c5..798dbd0c3c 100644 --- a/package/python-aioredis/python-aioredis.mk +++ b/package/python-aioredis/python-aioredis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOREDIS_VERSION = 2.0.0 +PYTHON_AIOREDIS_VERSION = 2.0.1 PYTHON_AIOREDIS_SOURCE = aioredis-$(PYTHON_AIOREDIS_VERSION).tar.gz -PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/92/60/a3cb5fadc254cc6e709ba14a02531870b02386b8c7bb147bf80a2be93f76 +PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/2e/cf/9eb144a0b05809ffc5d29045c4b51039000ea275bc1268d0351c9e7dfc06 PYTHON_AIOREDIS_SETUP_TYPE = setuptools PYTHON_AIOREDIS_LICENSE = MIT PYTHON_AIOREDIS_LICENSE_FILES = LICENSE -- 2.25.1 From thomas.petazzoni at bootlin.com Sat Jan 1 20:09:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 1 Jan 2022 21:09:57 +0100 Subject: [Buildroot] [buildroot-test] scripts/autobuild-run: extend timeout from 120 to 180 minutes In-Reply-To: <9c4d8993-46b2-8f1a-6aa3-bdd9957b783c@benettiengineering.com> References: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> <20220101115058.0515c8d9@windsurf> <9c4d8993-46b2-8f1a-6aa3-bdd9957b783c@benettiengineering.com> Message-ID: <20220101210957.0fde77e5@windsurf> Hello, On Sat, 1 Jan 2022 16:10:09 +0100 Giulio Benetti wrote: > > Please > > note that this HUNG_BUILD_TIMEOUT value is the per-step timeout: it > > verifies that one step of one particular package doesn't take more than > > 120 minutes. > > Ah, I thought the entire build, but that makes no sense since some build > can take way more than 2 hours. There used to be a global timeout for the build, but we had false positives when really large configurations were built. Due to this, commit 86892c63f754b4f6c9a4a517fde30160127b3506 change to a more fine grained timeout: we monitor the file build-time.log (which gets appended everytime the step of a package starts or ends), and we time out after HUNG_BUILD_TIMEOUT minutes if that file hasn't changed; > > Did you identify that the python-uvloop and python-lxml packages really > > took more than 2 hours to build? I did see at > > http://autobuild.buildroot.net/?status=TIMEOUT those timeouts dating > > back from ~November. Did you reproduce the issue, and verified that the > > build indeed completes at some point? In general, if a simple package > > such as python-uvloop or python-lxml takes more than 2 hours to build, > > it means that the compiler (or linker) has gone crazy in an infinite > > loop, and the build will in fact never finish. > > It was only my suspicious as specified in commit log. I couldn't > reproduce it and I thought it was due to the autobuilder's host. > > And yes, now that I know it's a per-step timeout it doesn't make sense > at all for such little packages. Yes, for such small packages, it clearly hints at a compiler/linker bug that stays stuck in an infinite loop. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From giulio.benetti at benettiengineering.com Sat Jan 1 20:43:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 1 Jan 2022 21:43:30 +0100 Subject: [Buildroot] [buildroot-test] scripts/autobuild-run: extend timeout from 120 to 180 minutes In-Reply-To: <20220101210957.0fde77e5@windsurf> References: <20210930231424.249681-1-giulio.benetti@benettiengineering.com> <20220101115058.0515c8d9@windsurf> <9c4d8993-46b2-8f1a-6aa3-bdd9957b783c@benettiengineering.com> <20220101210957.0fde77e5@windsurf> Message-ID: <56356313-5055-5bb4-e69d-c5ed8d16c274@benettiengineering.com> On 01/01/22 21:09, Thomas Petazzoni wrote: > Hello, > > On Sat, 1 Jan 2022 16:10:09 +0100 > Giulio Benetti wrote: > >>> Please >>> note that this HUNG_BUILD_TIMEOUT value is the per-step timeout: it >>> verifies that one step of one particular package doesn't take more than >>> 120 minutes. >> >> Ah, I thought the entire build, but that makes no sense since some build >> can take way more than 2 hours. > > There used to be a global timeout for the build, but we had false > positives when really large configurations were built. Due to this, > commit 86892c63f754b4f6c9a4a517fde30160127b3506 change to a more fine > grained timeout: we monitor the file build-time.log (which gets > appended everytime the step of a package starts or ends), and we time > out after HUNG_BUILD_TIMEOUT minutes if that file hasn't changed; Thank you for the explanation >>> Did you identify that the python-uvloop and python-lxml packages really >>> took more than 2 hours to build? I did see at >>> http://autobuild.buildroot.net/?status=TIMEOUT those timeouts dating >>> back from ~November. Did you reproduce the issue, and verified that the >>> build indeed completes at some point? In general, if a simple package >>> such as python-uvloop or python-lxml takes more than 2 hours to build, >>> it means that the compiler (or linker) has gone crazy in an infinite >>> loop, and the build will in fact never finish. >> >> It was only my suspicious as specified in commit log. I couldn't >> reproduce it and I thought it was due to the autobuilder's host. >> >> And yes, now that I know it's a per-step timeout it doesn't make sense >> at all for such little packages. > > Yes, for such small packages, it clearly hints at a compiler/linker bug > that stays stuck in an infinite loop. Yes, that was the reason I was looking for in the beginning :-) Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Sat Jan 1 21:08:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:08:57 +0100 Subject: [Buildroot] [PATCH 2/3] utils/test-pkg: add ability to fail when skipped In-Reply-To: <20211201230827.35080-2-matthew.weber@collins.com> References: <20211201230827.35080-1-matthew.weber@collins.com> <20211201230827.35080-2-matthew.weber@collins.com> Message-ID: <20220101210857.GA69135@scaer> Matthew, All, On 2021-12-01 17:08 -0600, Matthew Weber via buildroot spake thusly: > Add flag to allow the return value to be incremented when a skip > happens, treating the overall run as a failure. > > This flag could be used when using test-pkg for local validation of > downstream packages, for example in a user's br2-external. An example of > this could be a user choosing to use test-pkg as part of a CI > infrastructure where the fragment and toolchains are tightly controlled > to test a package against multiple toolchains easily. > > In this case, the user would want to lower the rate of false-positives > of that fragment/toolchain configuration if a build is instead skipped > (which may happen in the case of buildroot version bumps where > dependencies could change). I am a bit skeptical about this use-case. As I understand it, wht is most interesting in a CI setup for internal development, is that *all* internal packages do build togetrher and form a working sysem *as a whole*. As such, a CI setup would build the defconfig file(s) for a project (and run the integration test-suite), rather than build each package individually Building each package individually with test-pkg would have the disadvantage that it takes more time overall, as all the common deps are build as many times as there are packages to test, and package are also dependencies one of the others, so most packages would be built more than once as well... So, I am really not convinced... Regards, Yann E. MORIN. > Signed-off-by: Matthew Weber > --- > utils/test-pkg | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index d0472f176b..97957008fa 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -18,8 +18,8 @@ main() { > local -a toolchains > local pkg_br_name > > - o='hakc:d:n:p:r:t:e:' > - O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,' > + o='hakc:d:n:p:r:t:e:f' > + O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,fail-on-skip' > opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" > eval set -- "${opts}" > > @@ -29,6 +29,7 @@ main() { > number=0 > mode=0 > prepare_only=0 > + fail_on_skip=0 > toolchains_csv="${TOOLCHAINS_CSV}" > while [ ${#} -gt 0 ]; do > case "${1}" in > @@ -65,6 +66,9 @@ main() { > (-e|--externals) > BR2_EXTERNALS="${2}"; shift 2 > ;; > + (-f|--fail-on-skip) > + fail_on_skip=1; shift 1 > + ;; > (--) > shift; break > ;; > @@ -147,7 +151,12 @@ main() { > printf "%d builds, %d skipped, %d build failed, %d legal-info failed\n" \ > ${nb} ${nb_skip} ${nb_fail} ${nb_legal} > > - return $((nb_fail + nb_legal)) > + nb_result=$((nb_fail + nb_legal)) > + if [ ${fail_on_skip} ]; then > + nb_result=$((nb_result + nb_skip)) > + fi > + > + return $nb_result > } > > build_one() { > @@ -279,6 +288,9 @@ Options: > Externals to be used as part of the build process. Packages from > within these externals may be tested. > > + -f, --fail-on-skip > + If any builds are skipped, return a negative exit value. > + > Example: > > Testing libcec would require a config snippet that contains: > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sat Jan 1 21:09:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 1 Jan 2022 22:09:52 +0100 Subject: [Buildroot] [PATCH] package/libnss: fix build failure with make version 4.3 Message-ID: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> Make 4.3 is buggy and when parallel building host-libnss/libnss we end up with a failure thrown by make itself. So let's work-around this by don't parallel build the package if Make version is 4.3. Signed-off-by: Giulio Benetti --- package/libnss/libnss.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e2f7521b47..b6279fa921 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING LIBNSS_CPE_ID_VENDOR = mozilla LIBNSS_CPE_ID_PRODUCT = nss +# Don't parallel build if make version = 4.3 +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) +LIBNSS_MAKE = $(MAKE1) +else +LIBNSS_MAKE = $(MAKE) +endif + LIBNSS_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) @@ -71,12 +78,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 endif define HOST_LIBNSS_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(HOST_LIBNSS_BUILD_VARS) - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 1 21:33:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 1 Jan 2022 14:33:46 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cbor2: bump to version 5.4.2 Message-ID: <20220101213346.408623-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-cbor2/python-cbor2.hash | 4 ++-- package/python-cbor2/python-cbor2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index 879463c2ce..9910e632a2 100644 --- a/package/python-cbor2/python-cbor2.hash +++ b/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 87b3ad8a9dd8875fa46c6ec06e3fb0ba cbor2-5.4.1.tar.gz -sha256 a8bf432f6cb595f50aeb8fed2a4aa3b3f7caa7f135fb57e4378eaa39242feac9 cbor2-5.4.1.tar.gz +md5 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz +sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz # Locally computed sha256 checksums sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index af42d0344a..4cc09a219f 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.1 +PYTHON_CBOR2_VERSION = 5.4.2 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/9e/25/9dd432c051010faea6a702cb85d0b53dc9d5414513866b6a73b3ac954092 +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 1 21:33:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:33:20 +0100 Subject: [Buildroot] [git commit] package/libnss: fix build failure with make version 4.3 Message-ID: <20220101212839.D87DF82963@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=540029eb4550760c2190a18ecbf0cb4391bb1dea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make 4.3 is buggy and when parallel building host-libnss/libnss we end up with a failure thrown by make itself. So let's work-around this by don't parallel build the package if Make version is 4.3. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/libnss/libnss.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e2f7521b47..b6279fa921 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING LIBNSS_CPE_ID_VENDOR = mozilla LIBNSS_CPE_ID_PRODUCT = nss +# Don't parallel build if make version = 4.3 +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) +LIBNSS_MAKE = $(MAKE1) +else +LIBNSS_MAKE = $(MAKE) +endif + LIBNSS_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) @@ -71,12 +78,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 endif define HOST_LIBNSS_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(HOST_LIBNSS_BUILD_VARS) - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ From yann.morin.1998 at free.fr Sat Jan 1 21:34:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:34:59 +0100 Subject: [Buildroot] [PATCH] package/libnss: fix build failure with make version 4.3 In-Reply-To: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> References: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> Message-ID: <20220101213459.GB69135@scaer> Giulio, All, On 2022-01-01 22:09 +0100, Giulio Benetti spake thusly: > Make 4.3 is buggy and when parallel building host-libnss/libnss we end up > with a failure thrown by make itself. So let's work-around this by don't > parallel build the package if Make version is 4.3. > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libnss/libnss.mk | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk > index e2f7521b47..b6279fa921 100644 > --- a/package/libnss/libnss.mk > +++ b/package/libnss/libnss.mk > @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING > LIBNSS_CPE_ID_VENDOR = mozilla > LIBNSS_CPE_ID_PRODUCT = nss > > +# Don't parallel build if make version = 4.3 > +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) > +LIBNSS_MAKE = $(MAKE1) > +else > +LIBNSS_MAKE = $(MAKE) > +endif > + > LIBNSS_CFLAGS = $(TARGET_CFLAGS) > > ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) > @@ -71,12 +78,12 @@ endif > endif > > define LIBNSS_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ > + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > $(LIBNSS_BUILD_VARS) > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ > + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 > endif > > define HOST_LIBNSS_BUILD_CMDS > - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ > + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > $(HOST_LIBNSS_BUILD_VARS) > - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ > + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 1 21:37:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:37:47 +0100 Subject: [Buildroot] [git commit] package/alsa-lib: fix static build Message-ID: <20220101213259.2F50F82A1F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0629443499230b1dd4ab77c3e469d778ad1b2a66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure with alsa-utils raised since bump to version 1.2.6 in commit 4d4a588a504a6446dd0a29a353d94c6e86cfd879: checking for snd_tplg_new in -latopology... no configure: error: No linkable libatopology was found. Fixes: - http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...y-parser.c-drop-duplicate-safe_strtol_bas.patch | 51 +++++++++++++ ...rt-of-safe_strto-functions-from-libasound.patch | 88 ++++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch new file mode 100644 index 0000000000..a3741c42c0 --- /dev/null +++ b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch @@ -0,0 +1,51 @@ +From 47252054b4a2d5c8382cb1342f5d4eb89dabf95f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 17:20:47 +0100 +Subject: [PATCH] src/topology/parser.c: drop duplicate safe_strtol_base + +The safe_strtol_base() function is defined twice since + f547b2e3 ("conf: introduce safe_strtol_base()") and + 5fab157a ("topology: do not call strtol directly") +resulting in the following build failure when alsa-utils is built +statically because safe_strtol_base is defined twice. + +Fixes: http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 +Fixes: https://github.com/alsa-project/alsa-lib/pull/207 +Signed-off-by: Fabrice Fontaine +Signed-off-by: Jaroslav Kysela +[Retrieved from: +https://github.com/alsa-project/alsa-lib/commit/47252054b4a2d5c8382cb1342f5d4eb89dabf95f] +--- + src/topology/parser.c | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/src/topology/parser.c b/src/topology/parser.c +index 01c95afa..e70173f6 100644 +--- a/src/topology/parser.c ++++ b/src/topology/parser.c +@@ -21,25 +21,6 @@ + #include "list.h" + #include "tplg_local.h" + +-/* +- * Safe strtol call +- */ +-int safe_strtol_base(const char *str, long *val, int base) +-{ +- char *end; +- long v; +- if (!*str) +- return -EINVAL; +- errno = 0; +- v = strtol(str, &end, base); +- if (errno) +- return -errno; +- if (*end) +- return -EINVAL; +- *val = v; +- return 0; +-} +- + /* + * Get integer value + */ diff --git a/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch new file mode 100644 index 0000000000..3dfcb78b5c --- /dev/null +++ b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch @@ -0,0 +1,88 @@ +From c687c482107f746332dd18f7407f6c6efbffccb2 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sat, 1 Jan 2022 19:18:25 +0100 +Subject: [PATCH] conf: fix the export of safe_strto* functions from libasound + +Only one library should define the safe_strto function. Export it +correctly and add _snd_ prefix to avoid possible clashes with the other +application code. + +Fixes: 47252054 ("src/topology/parser.c: drop duplicate safe_strtol_base") +Fixes: https://github.com/alsa-project/alsa-lib/pull/208 +Signed-off-by: Jaroslav Kysela + +[Retrieved from: +https://github.com/alsa-project/alsa-lib/commit/c687c482107f746332dd18f7407f6c6efbffccb2] +Signed-off-by: Fabrice Fontaine +--- + include/local.h | 8 ++++++-- + src/Versions.in | 6 ++++++ + src/conf.c | 6 +++--- + 3 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/include/local.h b/include/local.h +index ebc9350c..f64fe9d8 100644 +--- a/include/local.h ++++ b/include/local.h +@@ -232,10 +232,14 @@ size_t page_align(size_t size); + size_t page_size(void); + size_t page_ptr(size_t object_offset, size_t object_size, size_t *offset, size_t *mmap_offset); + +-int safe_strtoll_base(const char *str, long long *val, int base); ++#define safe_strtoll_base _snd_safe_strtoll_base ++int _snd_safe_strtoll_base(const char *str, long long *val, int base); + static inline int safe_strtoll(const char *str, long long *val) { return safe_strtoll_base(str, val, 0); } +-int safe_strtol_base(const char *str, long *val, int base); ++#define safe_strtol_base _snd_safe_strtol_base ++int _snd_safe_strtol_base(const char *str, long *val, int base); + static inline int safe_strtol(const char *str, long *val) { return safe_strtol_base(str, val, 0); } ++#define safe_strtod _snd_safe_strtod ++int _snd_safe_strtod(const char *str, double *val); + + int snd_send_fd(int sock, void *data, size_t len, int fd); + int snd_receive_fd(int sock, void *data, size_t len, int *fd); +diff --git a/src/Versions.in b/src/Versions.in +index 5daccbd4..85031b38 100644 +--- a/src/Versions.in ++++ b/src/Versions.in +@@ -134,3 +134,9 @@ ALSA_1.1.6 { + + @SYMBOL_PREFIX at snd_dlopen; + } ALSA_0.9.7; ++ ++ALSA_1.2.6 { ++ global: ++ ++ @SYMBOL_PREFIX at _snd_safe_strto*; ++} ALSA_1.1.6; +diff --git a/src/conf.c b/src/conf.c +index d3597cbc..098ebd63 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -663,7 +663,7 @@ static int input_stdio_open(snd_input_t **inputp, const char *file, + return err; + } + +-int safe_strtoll_base(const char *str, long long *val, int base) ++int _snd_safe_strtoll_base(const char *str, long long *val, int base) + { + char *end; + long v; +@@ -679,7 +679,7 @@ int safe_strtoll_base(const char *str, long long *val, int base) + return 0; + } + +-int safe_strtol_base(const char *str, long *val, int base) ++int _snd_safe_strtol_base(const char *str, long *val, int base) + { + char *end; + long v; +@@ -695,7 +695,7 @@ int safe_strtol_base(const char *str, long *val, int base) + return 0; + } + +-static int safe_strtod(const char *str, double *val) ++int _snd_safe_strtod(const char *str, double *val) + { + char *end; + double v; From yann.morin.1998 at free.fr Sat Jan 1 21:39:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:39:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-lib: fix static build In-Reply-To: <20220101183612.1965455-1-fontaine.fabrice@gmail.com> References: <20220101183612.1965455-1-fontaine.fabrice@gmail.com> Message-ID: <20220101213922.GC69135@scaer> Fabrice, All, On 2022-01-01 19:36 +0100, Fabrice Fontaine spake thusly: > Fix the following static build failure with alsa-utils raised since bump > to version 1.2.6 in commit 4d4a588a504a6446dd0a29a353d94c6e86cfd879: > > checking for snd_tplg_new in -latopology... no > configure: error: No linkable libatopology was found. > > Fixes: > - http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ser.c-drop-duplicate-safe_strtol_bas.patch | 51 +++++++++++ > ...-safe_strto-functions-from-libasound.patch | 88 +++++++++++++++++++ > 2 files changed, 139 insertions(+) > create mode 100644 package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch > create mode 100644 package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch > > diff --git a/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch > new file mode 100644 > index 0000000000..a3741c42c0 > --- /dev/null > +++ b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch > @@ -0,0 +1,51 @@ > +From 47252054b4a2d5c8382cb1342f5d4eb89dabf95f Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 1 Jan 2022 17:20:47 +0100 > +Subject: [PATCH] src/topology/parser.c: drop duplicate safe_strtol_base > + > +The safe_strtol_base() function is defined twice since > + f547b2e3 ("conf: introduce safe_strtol_base()") and > + 5fab157a ("topology: do not call strtol directly") > +resulting in the following build failure when alsa-utils is built > +statically because safe_strtol_base is defined twice. > + > +Fixes: http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 > +Fixes: https://github.com/alsa-project/alsa-lib/pull/207 > +Signed-off-by: Fabrice Fontaine > +Signed-off-by: Jaroslav Kysela > +[Retrieved from: > +https://github.com/alsa-project/alsa-lib/commit/47252054b4a2d5c8382cb1342f5d4eb89dabf95f] > +--- > + src/topology/parser.c | 19 ------------------- > + 1 file changed, 19 deletions(-) > + > +diff --git a/src/topology/parser.c b/src/topology/parser.c > +index 01c95afa..e70173f6 100644 > +--- a/src/topology/parser.c > ++++ b/src/topology/parser.c > +@@ -21,25 +21,6 @@ > + #include "list.h" > + #include "tplg_local.h" > + > +-/* > +- * Safe strtol call > +- */ > +-int safe_strtol_base(const char *str, long *val, int base) > +-{ > +- char *end; > +- long v; > +- if (!*str) > +- return -EINVAL; > +- errno = 0; > +- v = strtol(str, &end, base); > +- if (errno) > +- return -errno; > +- if (*end) > +- return -EINVAL; > +- *val = v; > +- return 0; > +-} > +- > + /* > + * Get integer value > + */ > diff --git a/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch > new file mode 100644 > index 0000000000..3dfcb78b5c > --- /dev/null > +++ b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch > @@ -0,0 +1,88 @@ > +From c687c482107f746332dd18f7407f6c6efbffccb2 Mon Sep 17 00:00:00 2001 > +From: Jaroslav Kysela > +Date: Sat, 1 Jan 2022 19:18:25 +0100 > +Subject: [PATCH] conf: fix the export of safe_strto* functions from libasound > + > +Only one library should define the safe_strto function. Export it > +correctly and add _snd_ prefix to avoid possible clashes with the other > +application code. > + > +Fixes: 47252054 ("src/topology/parser.c: drop duplicate safe_strtol_base") > +Fixes: https://github.com/alsa-project/alsa-lib/pull/208 > +Signed-off-by: Jaroslav Kysela > + > +[Retrieved from: > +https://github.com/alsa-project/alsa-lib/commit/c687c482107f746332dd18f7407f6c6efbffccb2] > +Signed-off-by: Fabrice Fontaine > +--- > + include/local.h | 8 ++++++-- > + src/Versions.in | 6 ++++++ > + src/conf.c | 6 +++--- > + 3 files changed, 15 insertions(+), 5 deletions(-) > + > +diff --git a/include/local.h b/include/local.h > +index ebc9350c..f64fe9d8 100644 > +--- a/include/local.h > ++++ b/include/local.h > +@@ -232,10 +232,14 @@ size_t page_align(size_t size); > + size_t page_size(void); > + size_t page_ptr(size_t object_offset, size_t object_size, size_t *offset, size_t *mmap_offset); > + > +-int safe_strtoll_base(const char *str, long long *val, int base); > ++#define safe_strtoll_base _snd_safe_strtoll_base > ++int _snd_safe_strtoll_base(const char *str, long long *val, int base); > + static inline int safe_strtoll(const char *str, long long *val) { return safe_strtoll_base(str, val, 0); } > +-int safe_strtol_base(const char *str, long *val, int base); > ++#define safe_strtol_base _snd_safe_strtol_base > ++int _snd_safe_strtol_base(const char *str, long *val, int base); > + static inline int safe_strtol(const char *str, long *val) { return safe_strtol_base(str, val, 0); } > ++#define safe_strtod _snd_safe_strtod > ++int _snd_safe_strtod(const char *str, double *val); > + > + int snd_send_fd(int sock, void *data, size_t len, int fd); > + int snd_receive_fd(int sock, void *data, size_t len, int *fd); > +diff --git a/src/Versions.in b/src/Versions.in > +index 5daccbd4..85031b38 100644 > +--- a/src/Versions.in > ++++ b/src/Versions.in > +@@ -134,3 +134,9 @@ ALSA_1.1.6 { > + > + @SYMBOL_PREFIX at snd_dlopen; > + } ALSA_0.9.7; > ++ > ++ALSA_1.2.6 { > ++ global: > ++ > ++ @SYMBOL_PREFIX at _snd_safe_strto*; > ++} ALSA_1.1.6; > +diff --git a/src/conf.c b/src/conf.c > +index d3597cbc..098ebd63 100644 > +--- a/src/conf.c > ++++ b/src/conf.c > +@@ -663,7 +663,7 @@ static int input_stdio_open(snd_input_t **inputp, const char *file, > + return err; > + } > + > +-int safe_strtoll_base(const char *str, long long *val, int base) > ++int _snd_safe_strtoll_base(const char *str, long long *val, int base) > + { > + char *end; > + long v; > +@@ -679,7 +679,7 @@ int safe_strtoll_base(const char *str, long long *val, int base) > + return 0; > + } > + > +-int safe_strtol_base(const char *str, long *val, int base) > ++int _snd_safe_strtol_base(const char *str, long *val, int base) > + { > + char *end; > + long v; > +@@ -695,7 +695,7 @@ int safe_strtol_base(const char *str, long *val, int base) > + return 0; > + } > + > +-static int safe_strtod(const char *str, double *val) > ++int _snd_safe_strtod(const char *str, double *val) > + { > + char *end; > + double v; > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sat Jan 1 21:40:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 1 Jan 2022 22:40:34 +0100 Subject: [Buildroot] [PATCH] Makefile: disable 'printvars' and 'show-vars' recipes for Make 4.3 Message-ID: <20220101214034.2152144-1-giulio.benetti@benettiengineering.com> Make 4.3 is buggy and leads to a "Segmentation fault (core dumped)" when calling 'make printvars' or 'make show-vars', so let's refuse to execute those recipes if Make 4.3 by adding 'check-make-version' recipe as depedendency of 'printvars' and 'show-vars' as suggested by Yann E. Morin. Signed-off-by: Giulio Benetti --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0b8c7b2867..ac98b84425 100644 --- a/Makefile +++ b/Makefile @@ -1058,13 +1058,20 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif +.PHONY: check-make-version +check-make-version: +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) + @echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes" + @exit 1 +endif + # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are # displayed. # show-vars does the same, but as a JSON dictionnary. .PHONY: printvars -printvars: +printvars: check-make-version @: $(foreach V, \ $(sort $(filter $(VARS),$(.VARIABLES))), \ @@ -1077,7 +1084,7 @@ printvars: .PHONY: show-vars show-vars: VARS?=% -show-vars: +show-vars: check-make-version @: $(info $(call clean-json, { \ $(foreach V, \ -- 2.25.1 From ju.o at free.fr Sat Jan 1 21:39:48 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 1 Jan 2022 22:39:48 +0100 Subject: [Buildroot] [PATCH 1/1] support/config-fragments/autobuild: fix riscv64 toolchain configs Message-ID: <20220101213948.265173-1-ju.o@free.fr> commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 toolchains by RISC-V LP64D. The config symbols BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. Those changes were not reflected in the autobuild toolchain configs in support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config When testing a package with the command: ./utils/test-pkg --all --package somepackage bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build logfile contains: [...] Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y Actual value: Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set This commit update the autobuild config fragments for RISC-V 64bit toolchains so they can be used by test-pkg. Signed-off-by: Julien Olivain --- .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config index f6c6fcaa36..433a6e89f7 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config index 2b6a6e56da..fee1f29f4a 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config @@ -1,4 +1,4 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y -- 2.33.1 From fontaine.fabrice at gmail.com Sat Jan 1 21:40:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 22:40:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/jose: bump to version 11 Message-ID: <20220101214034.2000480-1-fontaine.fabrice@gmail.com> - Switch to meson-package (and so drop second patch) - Update indentation in hash file (two spaces) https://github.com/latchset/jose/releases/tag/v11 Signed-off-by: Fabrice Fontaine --- ...nfigure-fix-build-with-old-compilers.patch | 165 ------------------ package/jose/jose.hash | 4 +- package/jose/jose.mk | 8 +- 3 files changed, 5 insertions(+), 172 deletions(-) delete mode 100644 package/jose/0002-configure-fix-build-with-old-compilers.patch diff --git a/package/jose/0002-configure-fix-build-with-old-compilers.patch b/package/jose/0002-configure-fix-build-with-old-compilers.patch deleted file mode 100644 index 0484f38f0d..0000000000 --- a/package/jose/0002-configure-fix-build-with-old-compilers.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 98e9faa4d39cd5b6aaab882877e19ae394ba3810 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Nov 2017 23:10:38 +0100 -Subject: [PATCH] configure: fix build with old compilers - -Old gcc versions (gcc 4.7) do not support all warnings flags currently -hard-coded by configure.ac. In order to fix this, we import the -AX_CHECK_COMPILE_FLAG() macro from the autoconf-archive, and use it in -the configure.ac to only use warning flags when the compiler supports -them. - -Submitted-upstream: https://github.com/latchset/jose/pull/51 -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 46 +++++++++++++++------------- - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 105 insertions(+), 22 deletions(-) - create mode 100644 m4/ax_check_compile_flag.m4 - -diff --git a/configure.ac b/configure.ac -index cf8c9a6..6fe4ded 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,6 @@ - AC_PREREQ(2.62) - AC_INIT(jose, 10) -+AC_CONFIG_MACRO_DIRS([m4]) - AC_CANONICAL_SYSTEM - AC_PROG_CC_C99 - -@@ -18,27 +19,30 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.0.2]) - AC_OPENMP - AC_SUBST([OPENMP_CFLAGS]) - --JOSE_CFLAGS="\ ---Wall \ ---Wextra \ ---Werror \ ---Wstrict-aliasing \ ---Wchar-subscripts \ ---Wformat-security \ ---Wmissing-declarations \ ---Wmissing-prototypes \ ---Wnested-externs \ ---Wpointer-arith \ ---Wshadow \ ---Wsign-compare \ ---Wstrict-prototypes \ ---Wtype-limits \ ---Wunused-function \ ---Wno-missing-field-initializers \ ---Wno-unused-command-line-argument \ ---Wno-unused-parameter \ ---Wno-unknown-pragmas \ --" -+for flag in \ -+ -Wall \ -+ -Wextra \ -+ -Werror \ -+ -Wstrict-aliasing \ -+ -Wchar-subscripts \ -+ -Wformat-security \ -+ -Wmissing-declarations \ -+ -Wmissing-prototypes \ -+ -Wnested-externs \ -+ -Wpointer-arith \ -+ -Wshadow \ -+ -Wsign-compare \ -+ -Wstrict-prototypes \ -+ -Wtype-limits \ -+ -Wunused-function \ -+ -Wno-missing-field-initializers \ -+ -Wno-unused-command-line-argument \ -+ -Wno-unused-parameter \ -+ -Wno-unknown-pragmas ; do -+ AX_CHECK_COMPILE_FLAG([${flag}], -+ [JOSE_CFLAGS="${JOSE_CFLAGS} ${flag}"]) -+done -+ - AC_SUBST([JOSE_CFLAGS]) - - AC_MSG_CHECKING([for linker script support]) -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..dcabb92 ---- /dev/null -+++ b/m4/ax_check_compile_flag.m4 -@@ -0,0 +1,74 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the current language's compiler -+# or gives an error. (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the current language's default -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -+# force the compiler to issue an error when a bad flag is given. -+# -+# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim -+# Copyright (c) 2011 Maarten Bosmans -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 5 -+ -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], -+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" -+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -+AS_VAR_IF(CACHEVAR,yes, -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_COMPILE_FLAGS --- -2.13.6 - diff --git a/package/jose/jose.hash b/package/jose/jose.hash index 376bc0b585..128d26d163 100644 --- a/package/jose/jose.hash +++ b/package/jose/jose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72 jose-10.tar.bz2 -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING +sha256 e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 jose-11.tar.xz +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING diff --git a/package/jose/jose.mk b/package/jose/jose.mk index 2758d408da..8a60e20cc6 100644 --- a/package/jose/jose.mk +++ b/package/jose/jose.mk @@ -4,14 +4,12 @@ # ################################################################################ -JOSE_VERSION = 10 -JOSE_SOURCE = jose-$(JOSE_VERSION).tar.bz2 +JOSE_VERSION = 11 +JOSE_SOURCE = jose-$(JOSE_VERSION).tar.xz JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) JOSE_LICENSE = Apache-2.0 JOSE_LICENSE_FILES = COPYING -# 0002-configure-fix-build-with-old-compilers.patch -JOSE_AUTORECONF = YES JOSE_INSTALL_STAGING = YES JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.33.0 From yann.morin.1998 at free.fr Sat Jan 1 21:55:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 1 Jan 2022 22:55:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/libopenaptx: use official tarball In-Reply-To: <20211218232238.667138-1-fontaine.fabrice@gmail.com> References: <20211218232238.667138-1-fontaine.fabrice@gmail.com> Message-ID: <20220101215555.GD69135@scaer> Fabrice, All, On 2021-12-19 00:22 +0100, Fabrice Fontaine spake thusly: > Use official tarball and while at it use 2 spaces and reorder files in > libopenaptx.hash As explained in my review,i and despite my previous suggestion for this change, this would clash with the archive that is now on s.b.o, or with those people already have localy. So, I've marked this as rejected. Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > package/libopenaptx/libopenaptx.hash | 4 ++-- > package/libopenaptx/libopenaptx.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libopenaptx/libopenaptx.hash b/package/libopenaptx/libopenaptx.hash > index 76b4e66c9b..acaec5d642 100644 > --- a/package/libopenaptx/libopenaptx.hash > +++ b/package/libopenaptx/libopenaptx.hash > @@ -1,3 +1,3 @@ > # Locally calculated: > -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > -sha256 a19b3b642def6f86441b73dd4efda6e6f13d49e7e2d6e5e91cc7eb464ebb505a libopenaptx-0.2.1.tar.gz > +sha256 f13eac1ebfe31a563943cd47819eece1109960e10a1e85c111975bcfd37d5361 libopenaptx-0.2.1.tar.gz > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/libopenaptx/libopenaptx.mk b/package/libopenaptx/libopenaptx.mk > index c2f5fa2390..12c33f6225 100644 > --- a/package/libopenaptx/libopenaptx.mk > +++ b/package/libopenaptx/libopenaptx.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBOPENAPTX_VERSION = 0.2.1 > -LIBOPENAPTX_SITE = $(call github,pali,libopenaptx,$(LIBOPENAPTX_VERSION)) > +LIBOPENAPTX_SITE = https://github.com/pali/libopenaptx/releases/download/$(LIBOPENAPTX_VERSION) > LIBOPENAPTX_LICENSE = GPL-3.0+ > LIBOPENAPTX_LICENSE_FILES = COPYING > LIBOPENAPTX_INSTALL_STAGING = YES > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 1 21:56:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 22:56:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/mraa: bump to version 2.2.0 Message-ID: <20220101215622.2013558-1-fontaine.fabrice@gmail.com> - Refresh upstream status of first patch - Drop second patch (already in version) https://github.com/eclipse/mraa/blob/v2.2.0/docs/changelog.md Signed-off-by: Fabrice Fontaine --- ...de-Declare-gVERSION-global-as-extern.patch | 7 +- ...2-CMakeLists.txt-add-BUILDCPP-option.patch | 193 ------------------ package/mraa/mraa.hash | 2 +- package/mraa/mraa.mk | 2 +- 4 files changed, 6 insertions(+), 198 deletions(-) delete mode 100644 package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch diff --git a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch index b3a1f5a03a..110c020a62 100644 --- a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch +++ b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch @@ -1,13 +1,14 @@ -From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 +From aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 13 Apr 2020 20:12:11 +0200 Subject: [PATCH] include: Declare gVERSION global as 'extern'. Fixes build with '-fno-common'. +Signed-off-by: Thomas Ingleby [Retrieved from: -https://github.com/eclipse/mraa/pull/1012/commits/dbb5961f106ec42cd70689d933674c9c37aedfe1] -Signed-off-by: Fabrice Fontaine +https://github.com/eclipse/mraa/commit/aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031] +Signed-off-by: Fabrice Fontaine --- include/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch b/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch deleted file mode 100644 index fbadfe79ef..0000000000 --- a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch +++ /dev/null @@ -1,193 +0,0 @@ -From cb88e4dd1fbbb9d24e625dba2768b88ed99da309 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Jun 2020 22:51:37 +0200 -Subject: [PATCH] CMakeLists.txt: add BUILDCPP option - -C++ is a mandatory dependency since version 1.4.0 and -https://github.com/eclipse/mraa/commit/122cab1f1e53b7c9c7cd82905b962071f9bad9dc - -As a result, build on embedded toolchains that do not support C++ fails -on: - -CMake Error at CMakeLists.txt:2 (project): - The CMAKE_CXX_COMPILER: - - /home/naourr/work/instance-1/output-1/per-package/mraa/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - -Fixes: - - http://autobuild.buildroot.org/results/31086422e03611c16ab59c4418e3669b580bc0c0 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/eclipse/mraa/commit/cb88e4dd1fbbb9d24e625dba2768b88ed99da309] ---- - CMakeLists.txt | 69 +++++++++++++++++++---------------- - src/java/CMakeLists.txt | 4 +- - src/javascript/CMakeLists.txt | 34 +++++++++-------- - 3 files changed, 59 insertions(+), 48 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 250d9106e..90c0dc920 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required (VERSION 2.8.11) --project (mraa C CXX) -+project (mraa C) - - FIND_PACKAGE (Threads REQUIRED) - -@@ -11,6 +11,8 @@ else () - set (CMAKE_C_STANDARD 99) - endif () - -+option (BUILDCPP "Enable C++ (needed by FTDI4222 and tests)" ON) -+ - ############################################################################### - # Detect supported warning flags - # Modified from work By Dan Liew (fpbench - MIT) -@@ -33,15 +35,18 @@ set (MRAA_C_WARNING_FLAGS - -Werror=missing-parameter-type - ) - --# Warning flags for the C++ compiler only --set (MRAA_CXX_WARNING_FLAGS -- -Wnon-virtual-dtor -- -Woverloaded-virtual -- -Wreorder --) -- - include (CheckCCompilerFlag) --include (CheckCXXCompilerFlag) -+if (BUILDCPP) -+ # Warning flags for the C++ compiler only -+ set (MRAA_CXX_WARNING_FLAGS -+ -Wnon-virtual-dtor -+ -Woverloaded-virtual -+ -Wreorder -+ ) -+ -+ enable_language (CXX) -+ include (CheckCXXCompilerFlag) -+endif () - function (MRAA_SANITIZE_FLAG_NAME OUTPUT_VAR FLAG) - string (REPLACE "-" "_" SANITIZED_FLAG_NAME "${FLAG}") - string (REPLACE "/" "_" SANITIZED_FLAG_NAME "${SANITIZED_FLAG_NAME}") -@@ -62,28 +67,30 @@ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_C_WARNING_FLAGS}) - endif () - endforeach () - --# Globally set C++ compiler warning flags that are supported and emit --# a warning about unsupported flags --foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) -- MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") -- CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) -- if (HAS_CXX_${SANITIZED_FLAG_NAME}) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") -- else () -- message (WARNING "C++ compiler does not support flag \"${flag}\"") -- endif () --endforeach () -- --# This function adds the c++11 flag to a c++ target (if supported) --function(use_cxx_11 targetname) -- include(CheckCXXCompilerFlag) -- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -- if (COMPILER_SUPPORTS_CXX11) -- set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") -- else() -- message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") -- endif() --endfunction() -+if (BUILDCPP) -+ # Globally set C++ compiler warning flags that are supported and emit -+ # a warning about unsupported flags -+ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) -+ MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") -+ CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) -+ if (HAS_CXX_${SANITIZED_FLAG_NAME}) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") -+ else () -+ message (WARNING "C++ compiler does not support flag \"${flag}\"") -+ endif () -+ endforeach () -+ -+ # This function adds the c++11 flag to a c++ target (if supported) -+ function(use_cxx_11 targetname) -+ include(CheckCXXCompilerFlag) -+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -+ if (COMPILER_SUPPORTS_CXX11) -+ set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") -+ else() -+ message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") -+ endif() -+ endfunction() -+endif() - - # Set CMAKE_INSTALL_LIBDIR if not defined - include(GNUInstallDirs) -diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt -index 231c755fa..cfa72a0df 100644 ---- a/src/java/CMakeLists.txt -+++ b/src/java/CMakeLists.txt -@@ -16,7 +16,9 @@ include_directories ( - set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src") - set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") -+if (BUILDCPP) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") -+endif() - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") - - if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) -diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt -index 25fd36275..99a96b49d 100644 ---- a/src/javascript/CMakeLists.txt -+++ b/src/javascript/CMakeLists.txt -@@ -36,25 +36,27 @@ set_target_properties (mraajs PROPERTIES - ) - - message (STATUS "INFO - swig Version ${SWIG_VERSION}") --message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") -+if (BUILDCPP) -+ message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") - --if (${V8_VERSION_MAJOR} GREATER 3) -- message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") -- # Node 0.12.x V8 engine major version is '3'. -- # Node 2.1.0 V8 engine major version is '4'. -- set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) -- set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) -- if (CMAKE_VERSION VERSION_LESS "3.1") -- message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") -- if (CMAKE_COMPILER_IS_GNUCXX) -- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -- message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") -+ if (${V8_VERSION_MAJOR} GREATER 3) -+ message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") -+ # Node 0.12.x V8 engine major version is '3'. -+ # Node 2.1.0 V8 engine major version is '4'. -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) -+ if (CMAKE_VERSION VERSION_LESS "3.1") -+ message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") -+ if (CMAKE_COMPILER_IS_GNUCXX) -+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -+ message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") -+ endif () -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") -+ else () -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") - endif () -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") -- else () -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") - endif () -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") - endif () - endif () - diff --git a/package/mraa/mraa.hash b/package/mraa/mraa.hash index f29a5ce838..321b6409ed 100644 --- a/package/mraa/mraa.hash +++ b/package/mraa/mraa.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345 mraa-2.1.0.tar.gz +sha256 076669bee8423ffef3065735b293a329020be86630fea457174dbfcc67a0554a mraa-2.2.0.tar.gz sha256 fac52622ed3badd86b34857b21777ab90296d6ccbc2ac0fd457c09fdeefa9ef1 COPYING diff --git a/package/mraa/mraa.mk b/package/mraa/mraa.mk index 910339b386..47178a423b 100644 --- a/package/mraa/mraa.mk +++ b/package/mraa/mraa.mk @@ -4,7 +4,7 @@ # ################################################################################ -MRAA_VERSION = 2.1.0 +MRAA_VERSION = 2.2.0 MRAA_SITE = $(call github,eclipse,mraa,v$(MRAA_VERSION)) MRAA_LICENSE = MIT MRAA_LICENSE_FILES = COPYING -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 22:05:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 23:05:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbredir: bump to version 0.12.0 Message-ID: <20220101220532.2057125-1-fontaine.fabrice@gmail.com> Drop all patches (already in version) https://gitlab.freedesktop.org/spice/usbredir/-/blob/usbredir-0.12.0/ChangeLog.md Signed-off-by: Fabrice Fontaine --- .../0001-meson-add-tests-option.patch | 46 -------------- ...002-meson-add-stack_protector-option.patch | 60 ------------------- .../0003-meson.build-make-C-optional.patch | 39 ------------ package/usbredir/usbredir.hash | 4 +- package/usbredir/usbredir.mk | 2 +- 5 files changed, 3 insertions(+), 148 deletions(-) delete mode 100644 package/usbredir/0001-meson-add-tests-option.patch delete mode 100644 package/usbredir/0002-meson-add-stack_protector-option.patch delete mode 100644 package/usbredir/0003-meson.build-make-C-optional.patch diff --git a/package/usbredir/0001-meson-add-tests-option.patch b/package/usbredir/0001-meson-add-tests-option.patch deleted file mode 100644 index b2df1587b1..0000000000 --- a/package/usbredir/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8490a7ac101d4ee0a78c44b252d3b7a6c2508c74 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 21 Aug 2021 11:55:48 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to disable them - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/spice/usbredir/-/commit/8490a7ac101d4ee0a78c44b252d3b7a6c2508c74] ---- - meson.build | 4 +++- - meson_options.txt | 5 +++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6e773a7..a6d21b8 100644 ---- a/meson.build -+++ b/meson.build -@@ -106,7 +106,9 @@ if host_machine.system() != 'windows' - subdir('fuzzing') - endif - endif --subdir('tests') -+if get_option('tests').enabled() -+ subdir('tests') -+endif - subdir('data') - - summary(summary_info, bool_yn: true) -diff --git a/meson_options.txt b/meson_options.txt -index b35732b..63e8c85 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -21,3 +21,8 @@ option('tools', - type : 'feature', - value : 'enabled', - description : 'Build usbredir\'s tools such as usbredirect') -+ -+option('tests', -+ type : 'feature', -+ value : 'enabled', -+ description : 'Build usbredir\'s tests such as filter') --- -GitLab - diff --git a/package/usbredir/0002-meson-add-stack_protector-option.patch b/package/usbredir/0002-meson-add-stack_protector-option.patch deleted file mode 100644 index 613e2714e3..0000000000 --- a/package/usbredir/0002-meson-add-stack_protector-option.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 54cf1897ef3aa4d0a35b5f4eb1f5c6928b033af5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 24 Sep 2021 17:24:43 +0200 -Subject: [PATCH] meson: add stack_protector option - -Add stack_protector option to allow the user to disable it as some -embedded toolchains don't support it which will result in the following -build failure: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: usbredirparser/libusbredirparser.so.1.1.0.p/usbredirparser.c.o: in function `va_log': -usbredirparser.c:(.text+0x1c4): undefined reference to `__stack_chk_guard' - -Fixes: - - http://autobuild.buildroot.org/results/40de5443e98157ad50c6841ea70a835cd5ad4fe9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/53] ---- - meson.build | 6 +++++- - meson_options.txt | 5 +++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index a6d21b8..4350f53 100644 ---- a/meson.build -+++ b/meson.build -@@ -17,8 +17,12 @@ cc_flags = [ - if host_machine.system() != 'windows' - cc_flags += [ - '-Wp,-D_FORTIFY_SOURCE=2', -- '-fstack-protector', - ] -+ if get_option('stack_protector').enabled() -+ cc_flags += [ -+ '-fstack-protector', -+ ] -+ endif - endif - - # Check if we are building from .git -diff --git a/meson_options.txt b/meson_options.txt -index 63e8c85..34dd392 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,6 +17,11 @@ option('fuzzing-install-dir', - type : 'string', - description : 'Installation directory for fuzzing binaries') - -+option('stack_protector', -+ type : 'feature', -+ value : 'enabled', -+ description : 'Build usbredir\'s with stack-protector') -+ - option('tools', - type : 'feature', - value : 'enabled', --- -2.33.0 - diff --git a/package/usbredir/0003-meson.build-make-C-optional.patch b/package/usbredir/0003-meson.build-make-C-optional.patch deleted file mode 100644 index fe1ed3f698..0000000000 --- a/package/usbredir/0003-meson.build-make-C-optional.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 55fc307d23d657b52433d1c8508467d0589754d5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 16 Oct 2021 15:45:57 +0200 -Subject: [PATCH] meson.build: make C++ optional - -Remove cpp from meson project statement to make C++ optional and avoid -the following build failure when the toolchain does not provide a C++ -compiler: - -../output-1/build/usbredir-0.11.0/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++']] -The following exception(s) were encountered: -Running "/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++ --version" gave "[Errno 2] No such file or directory: '/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++'" - -Indeed C++ is only required for fuzzing which is already handled by -meson through add_languages('cpp', required: true) - -Fixes: - - http://autobuild.buildroot.org/results/eca1d8a2b73a769354ab1d24c7996be30f152138 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/55] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 49dbce4..ca19f22 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('usbredir', 'c', 'cpp', -+project('usbredir', 'c', - version: '0.11.0', - license: 'LGPLv2.1+', - meson_version : '>= 0.53', --- -2.33.0 - diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash index e11d4aa720..f738c36690 100644 --- a/package/usbredir/usbredir.hash +++ b/package/usbredir/usbredir.hash @@ -1,5 +1,5 @@ -# https://spice-space.org/download/usbredir/usbredir-0.11.0.tar.xz.sha256sum -sha256 72dd5f3aa90dfbc0510b5149bb5b1654c8f21fdc405dfce7b5dc163dcff19cba usbredir-0.11.0.tar.xz +# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum +sha256 fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d usbredir-0.12.0.tar.xz # Hash for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index 0a8dbf012d..6792a3e758 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBREDIR_VERSION = 0.11.0 +USBREDIR_VERSION = 0.12.0 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz USBREDIR_SITE = http://spice-space.org/download/usbredir USBREDIR_LICENSE = LGPL-2.1+ (libraries) -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 22:14:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 23:14:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: bump to version 0.8.1 Message-ID: <20220101221425.2059395-1-fontaine.fabrice@gmail.com> - Drop first patch (already in version) - Refresh upstream status of latest patch - Update hash of LICENSE and add cli/COPYING: https://github.com/Cyan4973/xxHash/commit/85e1ea2ab0d90463b804f4a65b0f67d99718c6f8 https://github.com/Cyan4973/xxHash/releases/tag/v0.8.1 Signed-off-by: Fabrice Fontaine --- ...h => 0001-fix-man-page-installation.patch} | 0 .../0001-fixed-man-page-installation.patch | 31 ------------------- ...efile-add-dedicated-install-targets.patch} | 8 ++--- package/xxhash/xxhash.hash | 5 +-- package/xxhash/xxhash.mk | 4 +-- 5 files changed, 8 insertions(+), 40 deletions(-) rename package/xxhash/{0002-fix-man-page-installation.patch => 0001-fix-man-page-installation.patch} (100%) delete mode 100644 package/xxhash/0001-fixed-man-page-installation.patch rename package/xxhash/{0003-Makefile-add-dedicated-install-targets.patch => 0002-Makefile-add-dedicated-install-targets.patch} (94%) diff --git a/package/xxhash/0002-fix-man-page-installation.patch b/package/xxhash/0001-fix-man-page-installation.patch similarity index 100% rename from package/xxhash/0002-fix-man-page-installation.patch rename to package/xxhash/0001-fix-man-page-installation.patch diff --git a/package/xxhash/0001-fixed-man-page-installation.patch b/package/xxhash/0001-fixed-man-page-installation.patch deleted file mode 100644 index a9f68db4b4..0000000000 --- a/package/xxhash/0001-fixed-man-page-installation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Fri, 6 Aug 2021 15:29:32 -0700 -Subject: [PATCH] fixed man page installation - -[Retrieved from: -https://github.com/Cyan4973/xxHash/commit/e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index b8552a9f..556a32a0 100644 ---- a/Makefile -+++ b/Makefile -@@ -498,10 +498,10 @@ endif - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum - @echo Installing man pages -- $(Q)$(INSTALL_DATA) xxhsum.1 $(DESTDIR)$(MANDIR)/xxhsum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 -+ $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 - @echo xxhash installation completed - - .PHONY: uninstall diff --git a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch similarity index 94% rename from package/xxhash/0003-Makefile-add-dedicated-install-targets.patch rename to package/xxhash/0002-Makefile-add-dedicated-install-targets.patch index 0607c8ee82..17d34a0823 100644 --- a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch +++ b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch @@ -10,13 +10,14 @@ This is especially useful on embedded systems where dynamic library is not always supported by toolchains Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/Cyan4973/xxHash/pull/665] +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/db9c199e99f7b4d419647b1ef49c547fc2547516] --- Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index 8d4fcd2..5fe7297 100644 +index 8d4fcd21..5fe72972 100644 --- a/Makefile +++ b/Makefile @@ -505,11 +505,14 @@ libxxhash.pc: libxxhash.pc.in @@ -68,6 +69,3 @@ index 8d4fcd2..5fe7297 100644 @echo xxhash installation completed .PHONY: uninstall --- -2.33.0 - diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash index feb5000808..2c99236a45 100644 --- a/package/xxhash/xxhash.hash +++ b/package/xxhash/xxhash.hash @@ -1,3 +1,4 @@ # locally computed -sha256 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f xxhash-0.8.0.tar.gz -sha256 9da63520e9293d82c4b1613be5c84058cadb82b02f5972179bad13731d589910 LICENSE +sha256 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c xxhash-0.8.1.tar.gz +sha256 553d0035773ddd1590045f8fdc3a4c6ead31e36336721aeca8421e88ed1c9f80 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 3e7f3244b3..a8f8d1d179 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -4,10 +4,10 @@ # ################################################################################ -XXHASH_VERSION = 0.8.0 +XXHASH_VERSION = 0.8.1 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) -XXHASH_LICENSE_FILES = LICENSE +XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES XXHASH_TARGETS = xxhsum -- 2.33.0 From fontaine.fabrice at gmail.com Sat Jan 1 22:35:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 23:35:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: bump to version 2.0.0 Message-ID: <20220101223529.2111756-1-fontaine.fabrice@gmail.com> - Switch to meson-package to drop first patch and disable examples and utils - Drop second patch (already in version) - Update hash of NOTICE (empty new lines added with https://github.com/tinyalsa/tinyalsa/commit/902b8c8f9fa5a2e1937007d7d5ee90f01790808b) https://github.com/tinyalsa/tinyalsa/releases/tag/v2.0.0 Signed-off-by: Fabrice Fontaine --- .../tinyalsa/0001-disable-doxygen-usage.patch | 35 ------------------ .../0002-interval.h-add-missing-header.patch | 36 ------------------- package/tinyalsa/tinyalsa.hash | 4 +-- package/tinyalsa/tinyalsa.mk | 27 +++----------- 4 files changed, 6 insertions(+), 96 deletions(-) delete mode 100644 package/tinyalsa/0001-disable-doxygen-usage.patch delete mode 100644 package/tinyalsa/0002-interval.h-add-missing-header.patch diff --git a/package/tinyalsa/0001-disable-doxygen-usage.patch b/package/tinyalsa/0001-disable-doxygen-usage.patch deleted file mode 100644 index ed939fb9bf..0000000000 --- a/package/tinyalsa/0001-disable-doxygen-usage.patch +++ /dev/null @@ -1,35 +0,0 @@ -Disable doxygen usage - -In order to avoid a dependency on doxygen on the build machine, this -patch adjusts the main Makefile to not build and install the -documentation. - -[Vincent: tweak patch for 1.1.1 version] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Makefile b/Makefile ---- a/Makefile 2017-05-24 05:23:57.000000000 +0100 -+++ b/Makefile 2017-05-25 10:35:20.781747053 +0100 -@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man - all: - $(MAKE) -C src - $(MAKE) -C utils -- $(MAKE) -C doxygen - $(MAKE) -C examples - - .PHONY: clean - clean: - $(MAKE) -C src clean - $(MAKE) -C utils clean -- $(MAKE) -C doxygen clean - $(MAKE) -C examples clean - - .PHONY: install -@@ -30,5 +28,4 @@ install: - install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/ - $(MAKE) -C src install - $(MAKE) -C utils install -- $(MAKE) -C doxygen install - diff --git a/package/tinyalsa/0002-interval.h-add-missing-header.patch b/package/tinyalsa/0002-interval.h-add-missing-header.patch deleted file mode 100644 index c043145b55..0000000000 --- a/package/tinyalsa/0002-interval.h-add-missing-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 2 Jun 2017 12:19:03 +0300 -Subject: [PATCH] interval.h: add missing header - -The ssize_t type requires the unistd.h header. This fixes build with musl -libc: - -In file included from ../include/tinyalsa/limits.h:32:0, - from limits.c:1: -../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t' - ssize_t max; - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98 - - include/tinyalsa/interval.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h -index 3f6f3dce5d90..068571df5a63 100644 ---- a/include/tinyalsa/interval.h -+++ b/include/tinyalsa/interval.h -@@ -30,6 +30,7 @@ - #define TINYALSA_INTERVAL_H - - #include -+#include - - /** A closed range signed interval. */ - --- -2.11.0 - diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash index d078bab597..f7673b1769 100644 --- a/package/tinyalsa/tinyalsa.hash +++ b/package/tinyalsa/tinyalsa.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz -sha256 ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d NOTICE +sha256 573ae0b2d3480851c1d2a12503ead2beea27f92d44ed47b74b553ba947994ef1 tinyalsa-2.0.0.tar.gz +sha256 ea22a4711f5250f88a4d7011fbc65367d1b02ac954dcc49f5b6d7c135e6537c4 NOTICE diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index bd9d9a00d0..b5c39e35d6 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -4,30 +4,11 @@ # ################################################################################ -TINYALSA_VERSION = 1.1.1 -TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) +TINYALSA_VERSION = 2.0.0 +TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled -define TINYALSA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) -endef - -define TINYALSA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(STAGING_DIR)" install -endef - -define TINYALSA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) -- 2.33.0 From who+buildroot at cnackers.org Sat Jan 1 22:38:58 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Sat, 1 Jan 2022 23:38:58 +0100 Subject: [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency Message-ID: <20220101223900.2970405-1-who+buildroot@cnackers.org> The last reference of uriparser was removed in: https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e Signed-off-by: Erik Larsson --- package/tpm2-tss/tpm2-tss.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 71aa3feb96..060883c377 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES -- 2.34.1 From who+buildroot at cnackers.org Sat Jan 1 22:39:00 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Sat, 1 Jan 2022 23:39:00 +0100 Subject: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools In-Reply-To: <20220101223900.2970405-1-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> Message-ID: <20220101223900.2970405-3-who+buildroot@cnackers.org> Signed-off-by: Erik Larsson --- package/tpm2-tools/Config.in | 11 +++++++++++ package/tpm2-tools/tpm2-tools.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 1a6698570a..cb3eb2b0a5 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS https://github.com/tpm2-software/tpm2-tools +if BR2_PACKAGE_TPM2_TOOLS + +config BR2_PACKAGE_TPM2_TOOLS_FAPI + bool "tpm2-tools fapi support" + select BR2_PACKAGE_TPM2_TSS_FAPI + help + This option enables Feature API (FAPI) support in tpm2-tools. + The FAPI tools are prefixed with tss2_. + +endif + comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index df5fbbfff4..6894be195f 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening # do not build man pages TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) +TPM2_TOOLS_CONF_OPTS += --enable-fapi +else +TPM2_TOOLS_CONF_OPTS += --disable-fapi +endif + $(eval $(autotools-package)) -- 2.34.1 From who+buildroot at cnackers.org Sat Jan 1 22:38:59 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Sat, 1 Jan 2022 23:38:59 +0100 Subject: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 In-Reply-To: <20220101223900.2970405-1-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> Message-ID: <20220101223900.2970405-2-who+buildroot@cnackers.org> Depedency on libuuid was removed in: https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 Signed-off-by: Erik Larsson --- .../0001-configure-make-build-gnu99.patch | 30 ------------------- package/tpm2-tools/Config.in | 2 -- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 4 +-- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch deleted file mode 100644 index 37ca6c5873..0000000000 --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 -From: William Roberts -Date: Mon, 8 Feb 2021 11:57:28 -0600 -Subject: [PATCH] configure: make build gnu99 - -Signed-off-by: William Roberts - -[Retrieved from: -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c -and updated to set gnu99 instead of c99 as done by -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dc15b5595..25039a0d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ - # -D_GNU_SOURCE is required for execvpe() in options.c - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) - -+# Enable gnu99 mode, since we use some of these features. -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) -+ - # Best attempt compiler options that are on newer versions of GCC that - # we can't widely enforce without killing other peoples builds. - # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 3be947648f..1a6698570a 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index bfb7e9b220..f50a896363 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 41f5bcf201..df5fbbfff4 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,13 +4,13 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.3.2 +TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # We're patching configure.ac TPM2_TOOLS_AUTORECONF = YES -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 1 22:59:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 1 Jan 2022 23:59:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 Message-ID: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> The LXC 4.0 branch is supported until June 2025. Only bugfixes and securitiy issues get included into the stable bugfix releases, so it's always safe and recommended to keep up and run the latest bugfix release. https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 Signed-off-by: Fabrice Fontaine --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index efd7a8e42c..2b58df2f1d 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 93f6d2535f..4d63fc14cb 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.10 +LXC_VERSION = 4.0.11 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 -- 2.33.0 From charles at steinkuehler.net Sat Jan 1 23:46:53 2022 From: charles at steinkuehler.net (Charles Steinkuehler) Date: Sat, 1 Jan 2022 17:46:53 -0600 Subject: [Buildroot] Buildroot + RAUC Message-ID: Buildroot has included RAUC for some time, but I was unable to find any working examples suitable for experimenting or as a foundation for a production system. I have attempted to fill this void and have crafted a BR2_EXTERNAL project that layers a basic RAUC setup on top of Buildroot targeting the Raspberry Pi cm4io. As I am new to both Buildroot and RAUC, I would appreciate any reviews or critiques of how I have managed the customization required for Buildroot, U-Boot, RAUC, Linux, and the device tree. The project files and instructions are on github: https://github.com/cdsteinkuehler/br2rauc All comments welcome, especially the "no you fool, don't do it *THAT* way!" variety. :) -- Charles Steinkuehler charles at steinkuehler.net From baruch at tkos.co.il Sun Jan 2 04:04:26 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 02 Jan 2022 06:04:26 +0200 Subject: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 In-Reply-To: <20220101223900.2970405-2-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> <20220101223900.2970405-2-who+buildroot@cnackers.org> Message-ID: <871r1qkcis.fsf@tarshish> Hi Erik, On Sat, Jan 01 2022, Erik Larsson wrote: > Depedency on libuuid was removed in: > https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd > > Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 > > Signed-off-by: Erik Larsson > --- > .../0001-configure-make-build-gnu99.patch | 30 ------------------- > package/tpm2-tools/Config.in | 2 -- > package/tpm2-tools/tpm2-tools.hash | 2 +- > package/tpm2-tools/tpm2-tools.mk | 4 +-- > 4 files changed, 3 insertions(+), 35 deletions(-) > delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch > > diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch > deleted file mode 100644 > index 37ca6c5873..0000000000 > --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 > -From: William Roberts > -Date: Mon, 8 Feb 2021 11:57:28 -0600 > -Subject: [PATCH] configure: make build gnu99 > - > -Signed-off-by: William Roberts > - > -[Retrieved from: > -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c > -and updated to set gnu99 instead of c99 as done by > -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index dc15b5595..25039a0d9 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ > - # -D_GNU_SOURCE is required for execvpe() in options.c > - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) > - > -+# Enable gnu99 mode, since we use some of these features. > -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) > -+ > - # Best attempt compiler options that are on newer versions of GCC that > - # we can't widely enforce without killing other peoples builds. > - # Works with gcc only. Needs to be disabled on BSD and clang > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 3be947648f..1a6698570a 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_TPM2_TSS > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBUUID > help > TPM (Trusted Platform Module) 2.0 CLI tools based on system > API of TPM2-TSS. These tools can be used to manage keys, > diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash > index bfb7e9b220..f50a896363 100644 > --- a/package/tpm2-tools/tpm2-tools.hash > +++ b/package/tpm2-tools/tpm2-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz > +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz > sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index 41f5bcf201..df5fbbfff4 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -4,13 +4,13 @@ > # > ################################################################################ > > -TPM2_TOOLS_VERSION = 4.3.2 > +TPM2_TOOLS_VERSION = 5.2 > TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_LICENSE = BSD-3-Clause > TPM2_TOOLS_LICENSE_FILES = doc/LICENSE > TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project > TPM2_TOOLS_SELINUX_MODULES = tpm2 > -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux > +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf > # We're patching configure.ac > TPM2_TOOLS_AUTORECONF = YES You can also remove this AUTORECONF since you remove the configure.ac patch. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From jacques.samoun33 at gmail.com Sun Jan 2 06:38:57 2022 From: jacques.samoun33 at gmail.com (Jacques Samoun) Date: Sun, 2 Jan 2022 08:38:57 +0200 Subject: [Buildroot] Patching a BR package makefile In-Reply-To: <20220101173705.142a0496@audacityteam.org> References: <20220101173705.142a0496@audacityteam.org> Message-ID: Hi Richard, thanks for that. I think option 3 is the way to go, at least till this openssh/openssl issue has been fixed, which should happen (there is an PR at openssh already). Thanks, Jacques On Sat, Jan 1, 2022 at 7:37 PM Richard Ash wrote: > On Wed, 29 Dec 2021 14:57:54 +0200 > Jacques Samoun wrote: > > > I had to modify a OPENSSH_CONF_OPTS of the openssh.mk package > > makefile to solve a known interoperability issue (openssh vs > > libopenssl). Now the fix is verified, i would like to create a patch > > to be applied to this openssh.mk . > > > > However, while I already did a couple of patches to other packages, > > they were always so far applied to the course code of the packages. In > > this specific case, I do not know how to make this on the > > buildroot/package/.mk file. > > > > Is there a preferred way to do so ? > > As far as I know, there isn't a way to do this within buildroot, > because the buildroot tree is (has to be) immutable by the time > buildroot runs. Put another way you can't patch what effectively > becomes one vast Makefile from within that Makefile without badly > upsetting make! > > The only options I have found are: > 1. Write a wrapper script to unpack the buildroot tarball and apply > your patches (note you may have problems if your patches change over > time). > 2. Have your own fork of buildroot git, and then your own branch from > the relevant release tag with your changes on top. This means you can > rebase your changes with git's help when you want to move to a newer > buildroot. Convenient if the rest of your build is in git and you can > use a git submodule to fetch your forked git automatically. > 3. Don't try to modify the buildroot package, create your own > custom-ssh package (copy of buildroot plus your patch) and maintain it > in a buildroot external (see the manual). Could be a pain to keep up to > date in the longer term. > > I'm not in any way a buildroot maintainer however! > > All of these are good reasons to get patches upstreamed (if possible) > into buildroot! > > Richard > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sun Jan 2 06:56:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 02 Jan 2022 06:56:16 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-01 Message-ID: <20220102065622.9D5A04028A@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-01 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 71 | 9 | 0 | 80 | 2021.11.x | 30 | 2 | 0 | 32 | master | 95 | 64 | 0 | 159 | Classification of failures by reason for master ----------------------------------------------- python3-3.10.1 | 25 host-nodejs-14.18.1 | 5 libapparmor-3.0.3 | 4 wavemon-0.9.4 | 4 rygel-0.40.2 | 3 babeltrace2-2.0.3 | 2 fail2ban-0.11.2 | 2 hiawatha-11.1 | 2 poppler-21.12.0 | 2 alsa-utils-1.2.4 | 1 assimp-5.1.4 | 1 belle-sip-4.4.8 | 1 boinc-7.18.1 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 gstreamer1-mm-1.10.0 | 1 guile-3.0.7 | 1 libexecinfo-1.1-3 | 1 log4cxx-0.12.0 | 1 pipewire-0.3.40 | 1 pulseview-0.4.2 | 1 qt5webkit-5.9.1 | 1 suricata-6.0.4 | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | alsa-utils-1.2.4 | NOK | http://autobuild.buildroot.net/results/08d028004090b2a8292f03910cb9bf80a73ac804 | mips | assimp-5.1.4 | NOK | http://autobuild.buildroot.net/results/e6edcf4acde4b053fa6190a45f6d1e00c86bdb27 | or1k | babeltrace2-2.0.3 | NOK | http://autobuild.buildroot.net/results/c383730b84342532f047a9ea73de19df9d734dbe | or1k | babeltrace2-2.0.3 | NOK | http://autobuild.buildroot.net/results/bd00ac7f40fe1925800f549029e41d04acc37462 | nios2 | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/945afeae741757641a0463b40598ba95f68d7d24 | arm | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/c234ba45416ea309ead0a02de7598aa15331617d | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/661b658a8c109893f68bf8fd93f67b3bf0ebd608 | arm | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/dbba8135047632311bbcfe3dc1407c2e7a9b4087 | sparc64 | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/6a5e91f9912f869b2b07b10b576457b432066393 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/33e8b8c9be1a84a22cdb7fbbc5696de965af4373 | mipsel | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/6b7d2ad6b5f3b8d4b882664eaf51d87b55de3009 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/dc6b337006529b0723d9a18813befc34a1e0f11f | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/b63f85b8849d91f648433f824d2284489c9c15d9 | arc | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/9f2481ae19461a760d39afa4f99060ed652aa18c | arm | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/b2379660b5e30c54005d18edeb5e330937841fe7 | arm | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/a3eadd01dac90d57c26d07d3b276cd813c701168 | xtensa | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/c1b8b2ca194e34994cd77aa460410b39f97042d3 | arm | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/d0dec14fff18b483c8947ceefbc5e59ed842104e | xtensa | host-nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/36262ace4639008d9261cab09fbe6cc2bd6e09fe | arc | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/f3e400cbb5b00fbd7f0cb421c993e46b64ec5ac5 | powerpc64le | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/cd757c6b7b1edd938abb13f5d5ad1f60d98b6944 | arc | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/fc30266947a5aecc1e302d88006ffbbab1e9528a | mips64el | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/d26c42f8cc67ea36df43e59bb6f7b3839c57c4e1 | m68k | libexecinfo-1.1-3 | NOK | http://autobuild.buildroot.net/results/a5bbdc349d2c1ecf07e9e1980ebe2c8881637bde | ORPH riscv32 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/ef4b7d12a1b2b19c64db08170bfb7bc9192ddc2c | or1k | pipewire-0.3.40 | NOK | http://autobuild.buildroot.net/results/d1707ad82159aafbddb69c503109bf2e830f0f29 | i586 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/716fdb10500d59b949e32246538808b2a15cd333 | arm | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/cca6f072af6c0758e7b75b18753cd53f7bf70f3c | powerpc64le | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/531c17f6b6410739bb3b0c8212af91c1f6e1149b | riscv64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/8299b1458369720bb6ea773d35fc46c6f18c4f44 | arc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/0df7fd2160f707b8eda50c366d64d17784c32d89 | x86_64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/fbeee34ffad87a0300c856a134d2bfebaf3bd59b | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/18d0ee27688896ffc1b79fbb8aa9b1a8502b81ce | powerpc64le | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/846adda3a7157dc65c95c7b565bc4db9ec1ac2c2 | powerpc64le | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/efa154c01a0165a6ab35db951129a71c1bd3e475 | arc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/19d1ce37556a290c8cdad0e138ff4a02edbaa04b | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/bed22c4e40d4ecdb34a370f3b56a21835f4c0d26 | mipsel | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/7b67f73a2cf1aead7fc5f582684388675348eea2 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/1bf4d7d64e0580a324e0e6164a62a6a6997d6640 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/d2a3960f1f06e97a151a1459f384f5c3e3b8650b | powerpc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/c60a9531689b5b8c955775f558ef071aebaeeedd | mipsel | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/08aace35c21ff0206628015c2f94a4b38eff58fa | i686 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/0361de31c3fc3c4fd6a5078d5ac0211f511d5996 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/ba6fbbd2ae9572795e8d40d4d58fcb5c94fe5d7c | sparc64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/b96dae6b6a30f5a80de14586371cfaa4a8b88168 | riscv64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/9302952721d9c4ec8a858cf4a2e5e81d83b4fb75 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/2d487a558b414c72e627b3fb876afcd6572cf02d | riscv64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/b9727dc7bea5d4d7d38296fe6eeeac8186562a37 | arc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/e9df7a5dbcc6168876cf7e5fe5ff4338bde3b955 | arm | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/ba5c022c5f69d78aae8cc8ef6cb79a188dfb5575 | sparc64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/635f56c2df68b4f9de4d777f2422b0415f66ba92 | powerpc | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/b6ec492972635599b0fb1d87feb1e25a906e83fe | nios2 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/6966ad896c33c9e10a2b70df76144999d92f6355 | x86_64 | python3-3.10.1 | NOK | http://autobuild.buildroot.net/results/8ee7b605be1013ac3f1f227b816aa38060ab26a5 | mipsel | qt5webkit-5.9.1 | NOK | http://autobuild.buildroot.net/results/5c41f09be7d12e455d7a142ea2c0302307d970c5 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/49b83df3604caf1e2fb30641d4a5a3ce9e2ba4be | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3b41bc7edce11190fe360c74040a19f7fe8309d6 | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c8db67ec4334f94b0d10fb1b1d543b5d2e803839 | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/425ef4f74765c3cd227eab40f0ec8698a2f4e6be | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/37ef1654c5419714425f6afff829a9848715e8ea | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9a7545cede50dd12a9c47e67677ea37b15be49f0 | powerpc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/994bb96cde3c743aaa4dbec058c9019ae613f301 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/970b9c0fe4969c20d8d78962bf5f018182679e80 | riscv32 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f77732d083d4c332afc601703a914faa83e4f756 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 monkey-f54856ce250c4e257354... | 2 glib-networking-2.66.0 | 1 gobject-introspection-1.64.1 | 1 xvisor-0.3.0 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/30ecfd7c9adb3cb236c60bf449ddd04dc78ed483 | ORPH x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/fa9d8e8785ba74292df7fbb528e1e9a6ed788013 | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/2c1e274963484b56556888acc008286375a16e8b | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5dafb691e11f9f172ab9adbb5e100a2674ad7d0a | mips | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c0546b3ec690852d2bda4f17a0d89651b6e5ab0e | xtensa | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/47643be58fae84410eb32ab4042516224d47717f | riscv64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/d142552c3ee9854e613a45c191cbcae084b7dbe7 | x86_64 | xvisor-0.3.0 | NOK | http://autobuild.buildroot.net/results/6045d74e7fc6d9190e29cb9157ad32929c28efbd | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/211e93a4d648c99c46d3b8e43f7ae2f48e11f3b8 | Classification of failures by reason for 2021.11.x -------------------------------------------------- openal-1.21.1 | 1 python-pybind-2.6.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/d278eb4bd6c922a54325188dab7e9c2c8f4ea3cd | riscv64 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/308a4e0ac1482323ee29b30c705c0874c5f429c9 | -- http://autobuild.buildroot.net From Alexey.Brodkin at synopsys.com Sun Jan 2 08:06:35 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Sun, 2 Jan 2022 11:06:35 +0300 Subject: [Buildroot] [PATCH] configs/cubieboard2: bump U-Boot and kernel Message-ID: <20220102080635.9405-1-abrodkin@synopsys.com> Bump U-Boot to version 2021.10 and kernel to 5.15.11 Among other things fixes U-Boot build failure, see https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006081: ---------------------->8------------------- HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ---------------------->8------------------- Signed-off-by: Alexey Brodkin --- configs/cubieboard2_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 8924c88c54..a9356295c1 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" BR2_TARGET_ROOTFS_EXT2=y @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -- 2.25.1 From fperrad at gmail.com Sun Jan 2 10:43:18 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 2 Jan 2022 11:43:18 +0100 Subject: [Buildroot] [PATCH] package/perl: bump to version 5.34.0 Message-ID: <20220102104318.2631-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl/perl.hash | 12 ++++++------ package/perl/perl.mk | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 42b7cc66c..b0f60ef6f 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,10 +1,10 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz.{md5,sha1,sha256}.txt -md5 7f104064b906ad8c7329ca5e409a32d7 perl-5.32.1.tar.xz -sha1 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e perl-5.32.1.tar.xz -sha256 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt +md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz +sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz +sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.hash -sha256 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25 perl-cross-1.3.5.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash +sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic diff --git a/package/perl/perl.mk b/package/perl/perl.mk index f661fef01..d7f9c58dd 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 32 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION_MAJOR = 34 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 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.3.5 +PERL_CROSS_VERSION = 1.3.6 # 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 -- 2.32.0 From romain.naour at gmail.com Sun Jan 2 16:54:31 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 2 Jan 2022 17:54:31 +0100 Subject: [Buildroot] [PATCH] board/qemu/aarch64-sbsa: use partition-type-uuid for genimage-15 Message-ID: <20220102165431.3551867-1-romain.naour@gmail.com> Genimage 15 restricted the partition-type option to mbr and hybrid partition-table-type and now prints a warning when it is used [1]: ERROR: hdimage(disk.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type [1] https://github.com/pengutronix/genimage/commit/1d72d8091f83790a0a35a1ea7dc25d46adba8876 Sync the genimage.cfg with the one used for aarch64_efi_defconfig Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717179 https://gitlab.com/buildroot.org/buildroot/-/jobs/1921792262 Signed-off-by: Romain Naour Cc: Dick Olsson Cc: Pierre-Jean Texier --- board/qemu/aarch64-sbsa/genimage.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index 121ae9f37b..bdf8a89d75 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -18,12 +18,14 @@ image disk.img { } partition boot { - partition-type = 0xEF image = "efi-part.vfat" + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32K + bootable = true } partition root { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } -- 2.31.1 From dariobin at libero.it Sun Jan 2 16:58:49 2022 From: dariobin at libero.it (Dario Binacchi) Date: Sun, 2 Jan 2022 17:58:49 +0100 Subject: [Buildroot] [PATCH 2/2] configs/stm32f469_disco_xip: explicitly set the kernel version In-Reply-To: <20220102165849.1653228-1-dariobin@libero.it> References: <20220102165849.1653228-1-dariobin@libero.it> Message-ID: <20220102165849.1653228-2-dariobin@libero.it> The version of the kernel and its headers must be explicitly set because if you keep the default setting, the kernel is continuously updated in buildroot with the risk that its image + dtb grow so much that it again exceeds the 2 MByte of the flash module. Signed-off-by: Dario Binacchi --- configs/stm32f469_disco_xip_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 6c4f227f582d..d95b7759f31a 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -1,9 +1,12 @@ BR2_arm=y BR2_cortex_m4=y +BR2_KERNEL_HEADERS_5_15=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_GCC_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.32.0 From dariobin at libero.it Sun Jan 2 16:58:48 2022 From: dariobin at libero.it (Dario Binacchi) Date: Sun, 2 Jan 2022 17:58:48 +0100 Subject: [Buildroot] [PATCH 1/2] configs/stm32f469_disco_xip: remove BR2_LINUX_KERNEL_XZ Message-ID: <20220102165849.1653228-1-dariobin@libero.it> This is a XIP kernel, so it shouldn't be compressed. Signed-off-by: Dario Binacchi --- configs/stm32f469_disco_xip_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index f3d333278a53..6c4f227f582d 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -7,7 +7,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_XZ=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -- 2.32.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:42:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:42:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/zchunk: needs MMU Message-ID: <20220102174226.2823845-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit c618da772df32679fdd338b99f44133655c9113f: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: src/zck_gen_zdict.p/zck_gen_zdict.c.o: in function `main': zck_gen_zdict.c:(.text.startup+0x254): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/582b994372435b8c35a56345c15bd0ffc722af79 Signed-off-by: Fabrice Fontaine --- package/zchunk/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zchunk/Config.in b/package/zchunk/Config.in index 2c8db434ce..2d2a78a210 100644 --- a/package/zchunk/Config.in +++ b/package/zchunk/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ZCHUNK bool "zchunk" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_LIBCURL help -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:43:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:43:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiio: set PYTHON_EXECUTABLE Message-ID: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> Set PYTHON_EXECUTABLE to avoid the following build failure when BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without setuptools on host: -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter -- new -- Python_EXECUTABLE /usr/bin/python3.5 [...] Traceback (most recent call last): File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in from setuptools import setup ImportError: No module named 'setuptools' Fixes: - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 Signed-off-by: Fabrice Fontaine --- package/libiio/libiio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index f706298c22..38b2f83e6e 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -76,8 +76,10 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) ifeq ($(BR2_PACKAGE_PYTHON),y) LIBIIO_DEPENDENCIES += host-python-setuptools python +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python else ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 endif LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON else -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:45:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:45:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with gcc 4.8 Message-ID: <20220102174556.2824179-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: option.c: In function 'one_opt': option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode for (char *p = arg; *p; p++) { ^ option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { ^ Fixes: - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 Signed-off-by: Fabrice Fontaine --- ...-src-option.c-fix-build-with-gcc-4.8.patch | 52 +++++++++++++++++++ ...9080ff8743133fbd52427b4b2213171-typo.patch | 36 +++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch create mode 100644 package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..50ecf2f18a --- /dev/null +++ b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,52 @@ +From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 31 Dec 2021 17:29:44 +0100 +Subject: [PATCH] src/option.c: fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8 raised since version 2.86: + +option.c: In function 'one_opt': +option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode + for (char *p = arg; *p; p++) { + ^ +option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code +option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode + for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 + +Signed-off-by: Fabrice Fontaine +[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] +--- + src/option.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index ff54def..c57f6d8 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + arg += 9; + if (strlen(arg) != 16) + ret_err(gen_err); +- for (char *p = arg; *p; p++) { ++ char *p; ++ for (*p = arg; *p; p++) { + if (!isxdigit((int)*p)) + ret_err(gen_err); + } +@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + + u8 *u = daemon->umbrella_device; + char word[3]; +- for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { ++ u8 i; ++ for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { + memcpy(word, &(arg[0]), 2); + *u++ = strtoul(word, NULL, 16); + } +-- +2.33.0 + diff --git a/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch new file mode 100644 index 0000000000..8cdf5b3f1b --- /dev/null +++ b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch @@ -0,0 +1,36 @@ +From 2748fb81e23b71e2c44956e99321816aca91905d Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Sat, 1 Jan 2022 23:03:26 +0000 +Subject: [PATCH] Fix 46312909d9080ff8743133fbd52427b4b2213171 typo. + +[Upstream commit 2748fb81e23b71e2c44956e99321816aca91905d] +Signed-off-by: Fabrice Fontaine +--- + src/option.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index c57f6d8..6f56ce8 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -357,7 +357,7 @@ static const struct myoption opts[] = + { "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID }, + { "dynamic-host", 1, 0, LOPT_DYNHOST }, + { "log-debug", 0, 0, LOPT_LOG_DEBUG }, +- { "umbrella", 2, 0, LOPT_UMBRELLA }, ++ { "umbrella", 2, 0, LOPT_UMBRELLA }, + { "quiet-tftp", 0, 0, LOPT_QUIET_TFTP }, + { NULL, 0, 0, 0 } + }; +@@ -2526,7 +2526,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + if (strlen(arg) != 16) + ret_err(gen_err); + char *p; +- for (*p = arg; *p; p++) { ++ for (p = arg; *p; p++) { + if (!isxdigit((int)*p)) + ret_err(gen_err); + } +-- +2.33.0 + -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:45:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:45:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix uclibc-ng build Message-ID: <20220102174501.2824124-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 663f39c88c01593855c18355a4decdceeffd884b: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': /home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' Fixes: - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d Signed-off-by: Fabrice Fontaine --- .../0002-check-for-inb-and-outb.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch new file mode 100644 index 0000000000..3bc006acc7 --- /dev/null +++ b/package/freeipmi/0002-check-for-inb-and-outb.patch @@ -0,0 +1,50 @@ +From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 10:37:00 +0100 +Subject: [PATCH] check for inb and outb + +Check for inb and outb before using them to avoid the following build +failure on uclibc-ng: + +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': +/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' + +Fixes: + - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] +--- + configure.ac | 2 +- + libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 711b27674..bcc4156ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) + AC_CHECK_FUNCS([getline getprogname]) + AC_CHECK_FUNCS([strerror strerror_r]) + AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) +-AC_CHECK_FUNCS([iopl]) ++AC_CHECK_FUNCS([inb iopl outb]) + AC_CHECK_FUNCS([asprintf]) + AC_CHECK_FUNCS([cbrt]) + AC_CHECK_FUNCS([getmsg putmsg]) +diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c +index c212887c0..a9d4b2e96 100644 +--- a/libfreeipmi/driver/ipmi-kcs-driver.c ++++ b/libfreeipmi/driver/ipmi-kcs-driver.c +@@ -162,7 +162,7 @@ + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + # define _INB(port) inb (port) + # define _OUTB(data, port) outb (port, data) +-#elif defined(HAVE_IOPL) ++#elif defined(HAVE_INB) && defined(HAVE_OUTB) + # define _INB(port) inb (port) + # define _OUTB(data, port) outb (data, port) + #else +-- +2.33.0 + -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 17:46:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 18:46:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-utils: bump to version 1.2.6 Message-ID: <20220102174659.2824253-1-fontaine.fabrice@gmail.com> https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.6 https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5.1 https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5 Signed-off-by: Fabrice Fontaine --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index dda009c1af..c2d3ee9bb5 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2 +sha256 6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d alsa-utils-1.2.6.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 2603e52f18..c1478bf847 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.4 +ALSA_UTILS_VERSION = 1.2.6 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 -- 2.33.0 From amrtmoh2006 at gmail.com Sun Jan 2 18:15:24 2022 From: amrtmoh2006 at gmail.com (azxxza22) Date: Sun, 2 Jan 2022 20:15:24 +0200 Subject: [Buildroot] [PATCH 1/2] nodogsplash package added Message-ID: <20220102181525.9494-1-amrtmoh2006@gmail.com> Signed-off-by: azxxza22 --- package/Config.in | 1 + package/nodogsplash/Config.in | 9 ++++++++ package/nodogsplash/nodogsplash.mk | 37 ++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 package/nodogsplash/Config.in create mode 100644 package/nodogsplash/nodogsplash.mk diff --git a/package/Config.in b/package/Config.in index 2eda8f6ad7..152a2e9e60 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2270,6 +2270,7 @@ endif source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" + source "package/nodogsplash/Config.in" if BR2_PACKAGE_NGINX menu "External nginx modules" source "package/nginx-dav-ext/Config.in" diff --git a/package/nodogsplash/Config.in b/package/nodogsplash/Config.in new file mode 100644 index 0000000000..7a68bcccb0 --- /dev/null +++ b/package/nodogsplash/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_NODOGSPLASH + bool "nodogsplash" + depends on BR2_PACKAGE_LIBMICROHTTPD + help + Nodogsplash is a Captive Portal that offers + a simple way to provide restricted access to the Internet by + showing a splash page to the user before Internet access is granted + + https://github.com/nodogsplash/nodogsplash/ diff --git a/package/nodogsplash/nodogsplash.mk b/package/nodogsplash/nodogsplash.mk new file mode 100644 index 0000000000..3075b7e9f1 --- /dev/null +++ b/package/nodogsplash/nodogsplash.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# nodogsplash +# +################################################################################ +NODOGSPLASH_VERSION = v4.5.1 +NODOGSPLASH_SITE = git://github.com/nodogsplash/nodogsplash.git +NODOGSPLASH_SITE_METHOD = git +NODOGSPLASH_LICENSE = GPL-2.0 +NODOGSPLASH_LICENSE_FILES = COPYING +NODOGSPLASH_DEPENDENCIES = libmicrohttpd +NODOGSPLASH_INSTALL_STAGING = YES + +define NODOGSPLASH_BUILD_CMDS + $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) +endef + +define NODOGSPLASH_INSTALL_EXTRA_FILES + mkdir -p $(TARGET_DIR)/usr/bin + mkdir -p $(TARGET_DIR)/etc/nodogsplash/htdocs/images + cp $(@D)/resources/nodogsplash.conf $(TARGET_DIR)/etc/nodogsplash/ + cp $(@D)/resources/splash.html $(TARGET_DIR)/etc/nodogsplash/htdocs/ + cp $(@D)/resources/splash.css $(TARGET_DIR)/etc/nodogsplash/htdocs/ + cp $(@D)/resources/status.html $(TARGET_DIR)/etc/nodogsplash/htdocs/ + cp $(@D)/resources/splash.jpg $(TARGET_DIR)/etc/nodogsplash/htdocs/images/ +endef + +NODOGSPLASH_POST_INSTALL_TARGET_HOOKS += NODOGSPLASH_INSTALL_EXTRA_FILES + +define NODOGSPLASH_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/nodogsplash $(TARGET_DIR)/usr/bin + $(INSTALL) -D -m 0755 $(@D)/ndsctl $(TARGET_DIR)/usr/bin + +endef + +$(eval $(generic-package)) + -- 2.17.1 From amrtmoh2006 at gmail.com Sun Jan 2 18:15:25 2022 From: amrtmoh2006 at gmail.com (azxxza22) Date: Sun, 2 Jan 2022 20:15:25 +0200 Subject: [Buildroot] [PATCH 2/2] hash file added In-Reply-To: <20220102181525.9494-1-amrtmoh2006@gmail.com> References: <20220102181525.9494-1-amrtmoh2006@gmail.com> Message-ID: <20220102181525.9494-2-amrtmoh2006@gmail.com> Signed-off-by: azxxza22 --- package/nodogsplash/nodogsplash.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/nodogsplash/nodogsplash.hash diff --git a/package/nodogsplash/nodogsplash.hash b/package/nodogsplash/nodogsplash.hash new file mode 100644 index 0000000000..da059a854d --- /dev/null +++ b/package/nodogsplash/nodogsplash.hash @@ -0,0 +1,2 @@ +md5 edafdd4ef89218261f29a9074891cf7a nodogsplash-v4.5.1-br1.tar.gz +md5 cbbd794e2a0a289b9dfcc9f513d1996e COPYING -- 2.17.1 From bernd.kuhls at t-online.de Sun Jan 2 19:10:18 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:18 +0100 Subject: [Buildroot] [PATCH 12/19] package/kodi-pvr-stalker: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-12-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 66d587b19d..90e74d451a 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6161f0593feb67865e78f9aecc8c59019933ddda273e495ffadb0bdb42dde2a3 kodi-pvr-stalker-19.0.0-Matrix.tar.gz +sha256 84a92c298ddda8d72072aafe2a62c5c6b48b60b3b85408ce7ca4f96e42965541 kodi-pvr-stalker-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index d0ffebb063..a0d5f4356d 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 19.0.0-Matrix +KODI_PVR_STALKER_VERSION = 19.0.1-Matrix KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:07 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:07 +0100 Subject: [Buildroot] [PATCH 01/19] package/kodi-audiodecoder-modplug: bump version to 19.0.2-Matrix Message-ID: <20220102191025.259154-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index 7bab017241..e2bfe09928 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c422cacf456ab9eda5e2836d2789c3756bfbae03265a01647dd8f935261d9ec kodi-audiodecoder-modplug-19.0.1-Matrix.tar.gz +sha256 6e1b1910e799ea8c5ab11428084feb8f6a0a9b1b0d4b5760033545fe765a59e9 kodi-audiodecoder-modplug-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index 9b2cf98dbc..f5736e7db7 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:15 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:15 +0100 Subject: [Buildroot] [PATCH 09/19] package/kodi-pvr-nextpvr: bump version to 19.0.3-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-9-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- 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 2a0c235af1..df13732957 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 c240c16a878f3b024c40728efe5b4f1ae19b74c4cb69875d5f9e415882838ee3 kodi-pvr-nextpvr-19.0.2-Matrix.tar.gz +sha256 f9a03f7e61ae69096b149184a1ababa2d98cf2486688022e7b63823047c04496 kodi-pvr-nextpvr-19.0.3-Matrix.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 a453c4e62f..c245a7e0bc 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 = 19.0.2-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.3-Matrix 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 -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:23 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:23 +0100 Subject: [Buildroot] [PATCH 17/19] package/kodi-visualisation-matrix: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-17-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-visualisation-matrix/kodi-visualisation-matrix.hash | 2 +- package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash index 602dc3f2f0..9a5652a2d9 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e2cf98fa3cb9451dca595b2fad211ae34b5c449be07073c91aa73f182b208182 kodi-visualisation-matrix-19.0.0-Matrix.tar.gz +sha256 aba081aca30b6ff2b349f90ecc3ad9519fa7b8b88d61e08aeba2b66fad2a17a2 kodi-visualisation-matrix-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk index 080823e124..f8959facbd 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_MATRIX_VERSION = 19.0.0-Matrix +KODI_VISUALISATION_MATRIX_VERSION = 19.0.1-Matrix KODI_VISUALISATION_MATRIX_SITE = $(call github,xbmc,visualization.matrix,$(KODI_VISUALISATION_MATRIX_VERSION)) KODI_VISUALISATION_MATRIX_LICENSE = GPL-2.0+ KODI_VISUALISATION_MATRIX_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:20 +0100 Subject: [Buildroot] [PATCH 14/19] package/kodi-pvr-wmc: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-14-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index bfd95b37f7..4a04c07ac8 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f8e05a70948f31289a5c1a19114e904e088189ad12bf478dc4ab8e3b7dca211e kodi-pvr-wmc-19.0.1-Matrix.tar.gz +sha256 d5addd39f64f97beb6e14090561583de47f0acdc70bedb39b3037613430cc71a kodi-pvr-wmc-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 2eaaaaa77a..3bf21b3440 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 19.0.1-Matrix +KODI_PVR_WMC_VERSION = 19.0.2-Matrix KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:10 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:10 +0100 Subject: [Buildroot] [PATCH 04/19] package/kodi-audioencoder-lame: bump version to 19.1.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-4-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index f39b1f7a82..a9cb12af6a 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb75e1cb069e977887003d3f11cc73a1ecf885c7fb9c03950cd5c918dc64820a kodi-audioencoder-lame-19.1.1-Matrix.tar.gz +sha256 774e75b051b1872620a706aa5e6c8741708364ac8d9d849286c4a265dd1a22f7 kodi-audioencoder-lame-19.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index 9048d4d730..fbc7489782 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 19.1.1-Matrix +KODI_AUDIOENCODER_LAME_VERSION = 19.1.2-Matrix KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:25 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:25 +0100 Subject: [Buildroot] [PATCH 19/19] package/kodi-vfs-sftp: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-19-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 217b2b5ee3..1f3cc4978f 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 06015d9c645642f92ed2b28d6c6e3c1c9b149e7fb1e212b66a02510d438b4947 kodi-vfs-sftp-19.0.0-Matrix.tar.gz +sha256 671bc7bd45d8d744f7e8a60bde9d1f9a0c821d7dd79b9e33d29b2bb2b5d231a1 kodi-vfs-sftp-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index ea6cef069c..6415fcb1de 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 19.0.0-Matrix +KODI_VFS_SFTP_VERSION = 19.0.1-Matrix KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:22 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:22 +0100 Subject: [Buildroot] [PATCH 16/19] package/kodi-visualisation-fishbmc: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-16-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash | 2 +- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index c595b0ba1b..449b2a4817 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8cb7793f29b3c3d097a5348831347af8fbed1e4ef44d37d9faeff83ff22a830 kodi-visualisation-fishbmc-19.0.0-Matrix.tar.gz +sha256 3023e6cf739985c31ff9a6cd2a217909563b9817de5c1047aab8d9928a00cfd9 kodi-visualisation-fishbmc-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index 8e0fcabff9..060e1d9b69 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 19.0.0-Matrix +KODI_VISUALISATION_FISHBMC_VERSION = 19.0.1-Matrix KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ KODI_VISUALISATION_FISHBMC_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:12 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:12 +0100 Subject: [Buildroot] [PATCH 06/19] package/kodi-peripheral-joystick: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-6-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 8cc09e9774..c43d5d8628 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85452cab5aa6e6dd426ca5df76c0832e1c9fa2d464973a16ad5e8c52d4533cc9 kodi-peripheral-joystick-19.0.0-Matrix.tar.gz +sha256 65efcfb8b0ed6595082d8d7298ec25b5c31d0189bb8e09ae1bc10989b9655204 kodi-peripheral-joystick-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index b753e689e8..b823550751 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.0-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.1-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:09 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:09 +0100 Subject: [Buildroot] [PATCH 03/19] package/kodi-audiodecoder-snesapu: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-3-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash | 2 +- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index c8bf76ada7..1a0227f415 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f7a346b751900f4b66e8a3e7d3c3579b0b10a112e6ed6901553c4c9fc72bbb3b kodi-audiodecoder-snesapu-19.0.1-Matrix.tar.gz +sha256 b7180132472b27e71bf9f30675c0af58330f3ad07d7065492d28f3e97117c341 kodi-audiodecoder-snesapu-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index 5397e765f7..ff988dffce 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:08 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:08 +0100 Subject: [Buildroot] [PATCH 02/19] package/kodi-audiodecoder-nosefart: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash | 2 +- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 56a73306bd..9d1c9a2a76 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5ed3013f42860afec661e72bdcb4ebb10e98705d3a7c9826dfe29d2c394709d kodi-audiodecoder-nosefart-19.0.1-Matrix.tar.gz +sha256 631b2abded62a34bf66a6769f7b1597a418057f64d79e54322f57090e53e63e7 kodi-audiodecoder-nosefart-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index 4e12c965d5..fbf327032b 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:19 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:19 +0100 Subject: [Buildroot] [PATCH 13/19] package/kodi-pvr-vdr-vnsi: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-13-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 6759dfc5f5..c6223fc8e4 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab7ba632438d12001cb1e10c2ccb75816be9a9181ec2fdb739bd8eb2f173cf7f kodi-pvr-vdr-vnsi-19.0.0-Matrix.tar.gz +sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 51a22d6cb5..b281f00f19 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.0-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:17 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:17 +0100 Subject: [Buildroot] [PATCH 11/19] package/kodi-pvr-pctv: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-11-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 8946250980..04919af7d2 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 004d9f8801e9c5d2d76c0c84d0844c4560ede7e2ed02c4c43286991a54d720c9 kodi-pvr-pctv-19.0.0-Matrix.tar.gz +sha256 cd267a5b9e98b3b1b1c00feac16e2a07962641cbe53ff4c05ccb72acd925e3f8 kodi-pvr-pctv-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 61557eb301..6f8dca4b23 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 19.0.0-Matrix +KODI_PVR_PCTV_VERSION = 19.0.1-Matrix KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:16 +0100 Subject: [Buildroot] [PATCH 10/19] package/kodi-pvr-njoy: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-10-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index a5305526b1..ec78e7c84a 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 55644b3e7b09f0ae14ccbe55b569b5add782b72fb973e1545414f17c2613a4a8 kodi-pvr-njoy-19.0.0-Matrix.tar.gz +sha256 e5a6d31d1a74d8c053919f1c3c73eb9ada1e799d99f61dca171c3d8f0afa0a03 kodi-pvr-njoy-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index f6cee1bbb0..4808974c31 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 19.0.0-Matrix +KODI_PVR_NJOY_VERSION = 19.0.1-Matrix KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ KODI_PVR_NJOY_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:24 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:24 +0100 Subject: [Buildroot] [PATCH 18/19] package/kodi-visualisation-shadertoy: bump version to 19.1.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-18-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-visualisation-shadertoy.hash | 2 +- .../kodi-visualisation-shadertoy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index a27334d2cc..d3f489e4f9 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c556003a46ebf11595fb04343bf21a135365342f09e2280da2e7fd5e802944e7 kodi-visualisation-shadertoy-19.1.1-Matrix.tar.gz +sha256 49ffaf8ee1a95193d7ac4a6280ae7db8d59ca44c9e5554c0b8cd85a768d1d002 kodi-visualisation-shadertoy-19.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index e15264bb44..5c644bb3ee 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.1-Matrix +KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.2-Matrix KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:11 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:11 +0100 Subject: [Buildroot] [PATCH 05/19] package/kodi-inputstream-ffmpegdirect: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-5-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-inputstream-ffmpegdirect.hash | 2 +- .../kodi-inputstream-ffmpegdirect.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash index 90122f7bbf..97385a5167 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 47b920094d1ffaa8a6204ffb223cff94078a764c035a97384ae969e87a3f5e6e kodi-inputstream-ffmpegdirect-19.0.0-Matrix.tar.gz +sha256 b676f5264df50f3cf990b270bbeb4a18bb082e99ff189d7b9a25fd67313a0382 kodi-inputstream-ffmpegdirect-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk index 65cf63f6c8..bad6c6ac97 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.0-Matrix +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.1-Matrix KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION)) KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:14 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:14 +0100 Subject: [Buildroot] [PATCH 08/19] package/kodi-pvr-mediaportal-tvserver: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-8-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-pvr-mediaportal-tvserver.hash | 2 +- .../kodi-pvr-mediaportal-tvserver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 72c28d4aef..9f4bd97366 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e7947b0428fc394220138bedf1b56fce0ed7f5218d2f3e773d5fec62edbdc95e kodi-pvr-mediaportal-tvserver-19.0.1-Matrix.tar.gz +sha256 3e0ba7a111ee0f93b64d0a0cb640569b13e429b1c47c88ac737389083054d732 kodi-pvr-mediaportal-tvserver-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 9ddfae91e6..1db0dca618 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.1-Matrix +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.2-Matrix KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:13 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:13 +0100 Subject: [Buildroot] [PATCH 07/19] package/kodi-pvr-argustv: bump version to 19.1.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-7-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index d7bb94ec68..47ecd18975 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 66722c72c0bcd2b80ef2092a6bfc650ea2742f4a72521820ac716856bf69712b kodi-pvr-argustv-19.0.1-Matrix.tar.gz +sha256 31f0ac72c8549339c18c828e51ce2531c24686c6ce6c734db0f2b0ce67ff41a3 kodi-pvr-argustv-19.1.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index cbb7b9dc9b..793f7f1adc 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.0.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.1.1-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Jan 2 19:10:21 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 2 Jan 2022 20:10:21 +0100 Subject: [Buildroot] [PATCH 15/19] package/kodi-vfs-libarchive: bump version to 19.0.1-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220102191025.259154-15-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash | 2 +- package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index feda0ee6b2..f3a2c8fcef 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 941dd675e84c2a6e964622fcc36664f011304d2b2e207196aad298167c713715 kodi-vfs-libarchive-19.0.0-Matrix.tar.gz +sha256 1360154d86bc73fc6f01f546d7b09a92968653cf05b037b0cd80a825d95a9187 kodi-vfs-libarchive-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index 91191ab636..eac02d7442 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = 19.0.0-Matrix +KODI_VFS_LIBARCHIVE_VERSION = 19.0.1-Matrix KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md -- 2.30.2 From fontaine.fabrice at gmail.com Sun Jan 2 19:10:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 20:10:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrokdecode: fix build with python 3.10 Message-ID: <20220102191027.3219775-1-fontaine.fabrice@gmail.com> Fix the following build failure with sigrok-cli raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-none-linux-gnu/10.3.1/../../../../aarch64-none-linux-gnu/bin/ld: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/e2f33366803b18aff29086007610fa0a264f90d6 Signed-off-by: Fabrice Fontaine --- ...02-configure-Add-python-3-10-support.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch diff --git a/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch new file mode 100644 index 0000000000..e3148dcde8 --- /dev/null +++ b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch @@ -0,0 +1,28 @@ +From c4c10b89396fe21a622b8c38dd5815a496b007bf Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Mon, 20 Dec 2021 19:36:39 +0100 +Subject: [PATCH] configure: Add python 3.10 support + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=c4c10b89396fe21a622b8c38dd5815a496b007bf] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2917cb3..b8841f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.24.0.rc2 + -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 20:03:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 21:03:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/file: fix build with gcc 4.8 Message-ID: <20220102200337.3271548-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 5.41 in commit d38b72bcd75392a88b5100839ac410859d0a6a79: readelf.c: In function 'do_auxv_note': readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode for (size_t off = 0; off + elsize <= descsz; off += elsize) { ^ Fixes: - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc Signed-off-by: Fabrice Fontaine --- .../file/0001-fix-build-with-gcc-4.8.patch | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 package/file/0001-fix-build-with-gcc-4.8.patch diff --git a/package/file/0001-fix-build-with-gcc-4.8.patch b/package/file/0001-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..2494c6a7c0 --- /dev/null +++ b/package/file/0001-fix-build-with-gcc-4.8.patch @@ -0,0 +1,97 @@ +From e36455301a3757618381cb83bf17115dd386131e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 20:41:31 +0100 +Subject: [PATCH] fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8 + +readelf.c: In function 'do_auxv_note': +readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode + for (size_t off = 0; off + elsize <= descsz; off += elsize) { + ^ + +funcs.c:93:2: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *p = fmt; *p; p++) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugs.astron.com/view.php?id=307] +--- + src/der.c | 6 ++++-- + src/funcs.c | 3 ++- + src/readelf.c | 4 ++-- + 3 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/src/der.c b/src/der.c +index 4bee9f16..23b9a574 100644 +--- a/src/der.c ++++ b/src/der.c +@@ -235,6 +235,7 @@ der_tag(char *buf, size_t len, uint32_t tag) + static int + der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) + { ++ uint32_t i; + const uint8_t *d = CAST(const uint8_t *, q); + switch (tag) { + case DER_TAG_PRINTABLE_STRING: +@@ -251,7 +252,7 @@ der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) + break; + } + +- for (uint32_t i = 0; i < len; i++) { ++ for (i = 0; i < len; i++) { + uint32_t z = i << 1; + if (z < blen - 2) + snprintf(buf + z, blen - z, "%.2x", d[i]); +@@ -283,7 +284,8 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes) + offs += ms->offset + m->offset; + DPRINTF(("cont_level = %d\n", m->cont_level)); + #ifdef DEBUG_DER +- for (size_t i = 0; i < m->cont_level; i++) ++ size_t i; ++ for (i = 0; i < m->cont_level; i++) + printf("cont_level[%" SIZE_T_FORMAT "u] = %u\n", i, + ms->c.li[i].off); + #endif +diff --git a/src/funcs.c b/src/funcs.c +index d968873d..08b565fb 100644 +--- a/src/funcs.c ++++ b/src/funcs.c +@@ -90,7 +90,8 @@ file_checkfield(char *msg, size_t mlen, const char *what, const char **pp) + protected int + file_checkfmt(char *msg, size_t mlen, const char *fmt) + { +- for (const char *p = fmt; *p; p++) { ++ const char *p; ++ for (p = fmt; *p; p++) { + if (*p != '%') + continue; + if (*++p == '%') +diff --git a/src/readelf.c b/src/readelf.c +index 01c60fe9..46421a2e 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -1015,7 +1015,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, + size_t elsize = xauxv_sizeof; + const char *tag; + int is_string; +- size_t nval; ++ size_t nval, off; + + if ((*flags & (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) != + (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) +@@ -1043,7 +1043,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, + *flags |= FLAGS_DID_AUXV; + + nval = 0; +- for (size_t off = 0; off + elsize <= descsz; off += elsize) { ++ for (off = 0; off + elsize <= descsz; off += elsize) { + memcpy(xauxv_addr, &nbuf[doff + off], xauxv_sizeof); + /* Limit processing to 50 vector entries to prevent DoS */ + if (nval++ >= 50) { +-- +2.33.0 + -- 2.33.0 From fontaine.fabrice at gmail.com Sun Jan 2 20:36:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 2 Jan 2022 21:36:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> Message-ID: Hi, Le ven. 31 d?c. 2021 ? 09:26, Joachim Wiberg a ?crit : > > Hi everyone! > > On 12/28/21 6:14 PM, Thomas Petazzoni wrote: > > On Tue, 28 Dec 2021 18:07:03 +0100 Fabrice Fontaine wrote: > >>> An important (and unfortunate point) is that apparently mbedtls3 cannot > >>> be installed side-by-side with mbedtls. At least that's what your > >>> "depends on !BR2_PACKAGE_MBEDTLS" seems to hint. > >> Indeed, both versions install their headers in include/mbedtls. > >>> This is a major annoyance, and I'm not sure how Linux distributions > >>> will handle this migration if they cannot have mbedtls 2.x and mbedtls > >>> 3.x installed side by side. > >> 3.0 was released in July. > >> To my knowledge, hiawatha is one of the first package that uses this > >> new API and buildroot will probably be one of the first build system > >> that will provide mbedts3. > >> IMHO, being unable to install both versions side by side is pretty > >> common: we had the same issue with libupnp 1.6.x and libupnp 1.8.x. > >> Concerning libupnp, we even had to revert the possibility to install > >> both versions side by side because it was a "burden to programs > >> linking against libupnp": > >> https://github.com/pupnp/pupnp/commit/07f504c61bd9e4d93eb3d373ffc8527cafe0b9af > > I'm not sure to follow you here. The fact that it's pretty common > > doesn't make it a good solution. It makes the transition period > > absolutely awful. > > With the currently proposed approach, someone who today has a working > > configuration that has hiawatha and belle-sip can conveniently build > > both in the same image. With your patch applied, this is no longer > > possible, due to hiawatha now using mbedtls3, which cannot be installed > > side-by-side with mbedtls. > > This doesn't seem very acceptable for us, and probably is even less > > acceptable for major Linux distributions. > > I looked into this, ever so briefly, and without checking with any of > the packages that select BR2_PACKAGE_MBEDTLS. > > However, seeing as it is only Hiawatha that requires a version >= 3.0, > for a transition period, we could change it to -DUSE_SYSTEM_MBEDTLS=OFF > and let Hiawatha use its bundled mbedtls instead. Indeed, this is also an alternative, even if I think that adding mbedtls3 would be a great addition. For example, libcurl supports mbedts 3.0 since its version 7.79 and https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. Otherwise, as requested by Thomas, I sent an email to mbedtls mailing list: https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ Here is an extract of their answer: "you need to install the header files and the libraries under different paths. At most one can be in the default include and lib directories. Since each program can only use one version, you need to pick the desired -I/-L paths at compile/link times." So basically, we can't really install them side by side in the context of buildroot except if you want to patch every single mbedtls package with custom CFLAGS and LDFLAGS ... If one of you wants to debate with them, feel free to do it. > > > Best regards > /Joachim Best Regards, Fabrice From giulio.benetti at benettiengineering.com Sun Jan 2 21:04:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 2 Jan 2022 22:04:08 +0100 Subject: [Buildroot] [PATCH 2/2] toolchain: remove binutils bug 21464 In-Reply-To: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> References: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> Message-ID: <20220102210408.221439-2-giulio.benetti@benettiengineering.com> Binutils bug 21464 is not present anymore in Buildroot so let's remove it and its depends on in libgeos and postgis packages. Signed-off-by: Giulio Benetti --- package/libgeos/Config.in | 4 +--- package/postgis/Config.in | 4 +--- toolchain/Config.in | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 5e861ab010..8411627d43 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 21464, 27597" +comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/postgis/Config.in b/package/postgis/Config.in index f4d913ece7..405c5c723a 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 # libgeos depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ @@ -19,8 +18,7 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 21464, 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/toolchain/Config.in b/toolchain/Config.in index 140d07ca38..fd005f4740 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=21464 -# Affect toolchains built with binutils 2.31.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 - bool - default y if BR2_or1k - # https://sourceware.org/bugzilla/show_bug.cgi?id=27597 # Affect toolchains built with binutils 2.36.1, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Jan 2 21:04:07 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 2 Jan 2022 22:04:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: add patches to fix binutils bug 28735(or1k) Message-ID: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> After fixing binutils bug 21464, bug 28735 showed up. It got fixed very soon after my request: https://sourceware.org/pipermail/binutils/2022-January/119078.html So let's add patch and backported patches to all binutils versions to make Buildroot free from bug 28735. Unfortunately Bootlin toolchains have just been rebuilt and will fail for this bug. This happened because libgeos has been bumped few time ago and was masked by bug 21464 dependency that prevented to build. Signed-off-by: Giulio Benetti --- ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ 4 files changed, 300 insertions(+) create mode 100644 package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch create mode 100644 package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch create mode 100644 package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch create mode 100644 package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch diff --git a/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..7e92e2bfd8 --- /dev/null +++ b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 51def3dc6a168d03d28e0d4e2935d9ddb2929192 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index cfa292f0032..ecb70753b6a 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1477,12 +1494,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..e96d49122a --- /dev/null +++ b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From fbab8933bca6b7dba2aa19190a71f799a370c3d4 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 2ff998066a8..3df31172fcb 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1508,12 +1525,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..c4fedb719a --- /dev/null +++ b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 190091f9c1ec4cb80f8106e45ab4125eefa4114b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 431a8ee479f..ea26cdf1033 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 362a20108782b87cd780a989c0dbd014fc2def8b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..7fd88d72442 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + false), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ false, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ false, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ false); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = true; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + -- 2.25.1 From who+buildroot at cnackers.org Sun Jan 2 21:25:59 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Sun, 2 Jan 2022 22:25:59 +0100 Subject: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 In-Reply-To: <20220101223900.2970405-2-who+buildroot@cnackers.org> References: <20220101223900.2970405-2-who+buildroot@cnackers.org> Message-ID: <20220102212559.43475-1-who+buildroot@cnackers.org> Depedency on libuuid was removed in: https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 Signed-off-by: Erik Larsson --- .../0001-configure-make-build-gnu99.patch | 30 ------------------- package/tpm2-tools/Config.in | 2 -- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 6 ++-- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch deleted file mode 100644 index 37ca6c5873..0000000000 --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 -From: William Roberts -Date: Mon, 8 Feb 2021 11:57:28 -0600 -Subject: [PATCH] configure: make build gnu99 - -Signed-off-by: William Roberts - -[Retrieved from: -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c -and updated to set gnu99 instead of c99 as done by -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dc15b5595..25039a0d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ - # -D_GNU_SOURCE is required for execvpe() in options.c - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) - -+# Enable gnu99 mode, since we use some of these features. -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) -+ - # Best attempt compiler options that are on newer versions of GCC that - # we can't widely enforce without killing other peoples builds. - # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 3be947648f..1a6698570a 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index bfb7e9b220..f50a896363 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 41f5bcf201..8675344805 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,15 +4,13 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.3.2 +TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux -# We're patching configure.ac -TPM2_TOOLS_AUTORECONF = YES +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options -- 2.34.1 From m.niestroj at grinn-global.com Sun Jan 2 21:56:11 2022 From: m.niestroj at grinn-global.com (Marcin =?utf-8?Q?Niestr=C3=B3j?=) Date: Sun, 02 Jan 2022 22:56:11 +0100 Subject: [Buildroot] [PATCH 2/5] package/python-pyparsing: enable host build In-Reply-To: <20220101193018.404937-2-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-2-james.hilliard1@gmail.com> Message-ID: <87ee5phjzu.fsf@grinn-global.com> James Hilliard writes: > This will be required by host-python-packaging. > > Signed-off-by: James Hilliard > --- > package/python-pyparsing/python-pyparsing.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk > index 0dacf2371d..5741458d65 100644 > --- a/package/python-pyparsing/python-pyparsing.mk > +++ b/package/python-pyparsing/python-pyparsing.mk > @@ -10,5 +10,7 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9 > PYTHON_PYPARSING_LICENSE = MIT > PYTHON_PYPARSING_LICENSE_FILES = LICENSE > PYTHON_PYPARSING_SETUP_TYPE = setuptools > +HOST_PYTHON_PYPARSING_NEEDS_HOST_PYTHON = python3 > > $(eval $(python-package)) > +$(eval $(host-python-package)) Reviewed-by: Marcin Niestroj -- Marcin Niestr?j From m.niestroj at grinn-global.com Sun Jan 2 22:05:17 2022 From: m.niestroj at grinn-global.com (Marcin =?utf-8?Q?Niestr=C3=B3j?=) Date: Sun, 02 Jan 2022 23:05:17 +0100 Subject: [Buildroot] [PATCH 3/5] package/python-packaging: enable host build In-Reply-To: <20220101193018.404937-3-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-3-james.hilliard1@gmail.com> Message-ID: <87a6gdhjyi.fsf@grinn-global.com> James Hilliard writes: > This is required by python-setuptools-scm. > > Signed-off-by: James Hilliard > --- > package/python-packaging/python-packaging.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk > index 6b54d2416d..e2fb9b120b 100644 > --- a/package/python-packaging/python-packaging.mk > +++ b/package/python-packaging/python-packaging.mk > @@ -10,5 +10,8 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3a > PYTHON_PACKAGING_SETUP_TYPE = setuptools > PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause > PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD > +HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3 > +HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing > > $(eval $(python-package)) > +$(eval $(host-python-package)) Reviewed-by: Marcin Niestroj -- Marcin Niestr?j From fido_max at inbox.ru Mon Jan 3 04:33:25 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 3 Jan 2022 07:33:25 +0300 Subject: [Buildroot] [PATCH 2/2] toolchain: remove binutils bug 21464 In-Reply-To: <20220102210408.221439-2-giulio.benetti@benettiengineering.com> References: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> <20220102210408.221439-2-giulio.benetti@benettiengineering.com> Message-ID: On 03.01.2022 00:04, Giulio Benetti wrote: > Binutils bug 21464 is not present anymore in Buildroot so let's remove it > and its depends on in libgeos and postgis packages. > > Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov > --- > package/libgeos/Config.in | 4 +--- > package/postgis/Config.in | 4 +--- > toolchain/Config.in | 6 ------ > 3 files changed, 2 insertions(+), 12 deletions(-) From thomas.petazzoni at bootlin.com Mon Jan 3 06:56:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 03 Jan 2022 06:56:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-02 Message-ID: <20220103065642.8762960AF7@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-01-02 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 74 | 7 | 0 | 81 | 2021.11.x | 26 | 3 | 0 | 29 | master | 113 | 61 | 0 | 174 | Classification of failures by reason for master ----------------------------------------------- libapparmor-3.0.3 | 13 fail2ban-0.11.2 | 5 rygel-0.40.2 | 5 frr-8.1 | 4 google-breakpad-7515ab13768... | 3 guile-3.0.7 | 3 poppler-21.12.0 | 3 freeipmi-1.6.8 | 2 gstreamer1-mm-1.10.0 | 2 hiawatha-11.1 | 2 unknown | 2 wavemon-0.9.4 | 2 4th-3.62.5 | 1 delve-1.6.1 | 1 dnsmasq-2.86 | 1 efl-1.26.0 | 1 host-file-5.41 | 1 kismet-2021-08-R1 | 1 libiio-0.23 | 1 log4cxx-0.12.0 | 1 pcsc-lite-1.9.5 | 1 resiprocate-1.12.0 | 1 sg3_utils-1.47 | 1 sigrok-cli-0.7.2 | 1 tinycbor-0.6.0 | 1 tvheadend-b8710206eb073c72b... | 1 zchunk-1.1.16 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | 4th-3.62.5 | NOK | http://autobuild.buildroot.net/results/d7cbc4560455f09af137f329ee283803da6d9a18 | x86_64 | delve-1.6.1 | NOK | http://autobuild.buildroot.net/results/4999c1dcaf8d9ce58fa054f65bc0564379b601d9 | arc | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/51242d4f532373544e3c7ea45036b8d41390b29b | x86_64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/055c634f528d490155633f540b7702e9b209671b | arm | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/ec209d2a25ae42169bd64f9b7c841bb904d1a367 | i586 | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/969a6c8fef6931ed983eddbbed4c41458337353d | riscv64 | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/53c2cb461746ce7cfdd260bb74cb0a9e19f83fcb | arm | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/dae1b8aed29d7ee79b3ba645460846c45ad64ae8 | arm | fail2ban-0.11.2 | NOK | http://autobuild.buildroot.net/results/ec32b353414072086c327636b1d8be7b4a99e88d | powerpc | freeipmi-1.6.8 | NOK | http://autobuild.buildroot.net/results/27187cf998c688ef12d637c47ebe16745623f9f2 | powerpc | freeipmi-1.6.8 | NOK | http://autobuild.buildroot.net/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d | nds32le | frr-8.1 | NOK | http://autobuild.buildroot.net/results/36e790ee5dd1fb9e668f85bebf43dc3612945bf6 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e981c6ba8a7cd3ed028e6f98c8b889e80a025834 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/487c56ffe6f88f9fee7f407e67beb7dec9f52267 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a1b8375f5d18e81aff578db624182878f57abe62 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/8b424fe5d7b6853319f3d87017c8b26ca2e5dfe5 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/50833673eb73134dfd2a99affbdf1f68a2e23f73 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/ae331418736d44a740126b6d0fb9e734d802f97d | mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/6ea1a3d89faea9b60eecacb66c22ddfd60f2b25d | ORPH mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/b82363db6ccb609a2905eb011e8364fd844ac93a | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a76debb958938f520fe340841baff446132197b0 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/9b163d3132018ce6032af33be9b51f2f1f0a9f1f | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/df99a01ffd9e8bf8a741755283dac9b79470f3e6 | ORPH mips64el | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/166d121ee85ad01edc49097a91fa9747df7210aa | arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/71c23dde4ddb8cdd7c9cda4218d55230aa822b9d | nios2 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc | ORPH m68k | kismet-2021-08-R1 | NOK | http://autobuild.buildroot.net/results/0108fecea42d2a1ddcf1e66e05f2bfcc1217d3b0 | ORPH arm | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/95dd18f38e41af9a2ab2864b9a79b3fdef168995 | aarch64 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/51f6e8656ae768e449225ec873a6b2b59875ecc6 | xtensa | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/939347a17a5d57920008648abb52cf9ee737fcdb | mips64el | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/353c4bd5377cf0d39b71b6436b326806a460100c | i686 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/fc4b0216c92374afd7a4c0d7e1551268b07693cc | x86_64 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/606844a4b65af028fdf08986a17c8ec478d9e168 | arc | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/d15509c627f814a36b78f0bfab81dfacf8908158 | aarch64 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/aa3af8eac008a1f6559e9fce1ce874a2ae8dd5fa | mips64el | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/da40fa0fa7659da8e66f8884fa3b8b7e45fab7c0 | x86_64 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/0bdcc7e2d0e3a9b9229d5704208ced0dc88a88d7 | mipsel | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/01c46c1916b1a2f7e06d4c4bf9e28b1a41cdfeee | i686 | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/e347b70fe903fa366e70d3816ec97d88b6888118 | s390x | libapparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/fad379bef963bfc86ac5ad3c8567dfbcb17c6f4c | microblazeel | libiio-0.23 | NOK | http://autobuild.buildroot.net/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 | powerpc64le | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/aef34c14fc8ec8dfa7492de2b994c770a2747217 | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/66c8b7973f2e787195a8565633cd7cab53581134 | ORPH arc | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/e9e3e4635e3e1e27e5e619001b71a328ad3b65d6 | arc | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/6ff25c3f7aae9afd4c971fe9fda8d665a8fea3f6 | xtensa | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/044a7111c65606cb063821f9cb6007af9f5d6ec8 | x86_64 | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/f26bbb8346d5ec68712e7eea9c7b61db8b36e268 | ORPH or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/20c7fabb447cce1e814cfdd05c5cf2bc80733e63 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/fec081130f87333a22cc25ec91f20c309aa0097b | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3dc2cd178e402651be1cf8e4b3e329cc5f83bdcd | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f228ecf5897db62191ae99387a241bc35f41d7ec | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1d8e73c11f4a164e319a1c01e9df556518104269 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/50abba4d95cd34cae0b1a167f13efdd9af1c8c7b | aarch64 | sigrok-cli-0.7.2 | NOK | http://autobuild.buildroot.net/results/e2f33366803b18aff29086007610fa0a264f90d6 | arm | tinycbor-0.6.0 | NOK | http://autobuild.buildroot.net/results/36f17ce944994c01b57fc419e1af3d7d7def93ca | powerpc | tvheadend-b8710206eb073c72b... | NOK | http://autobuild.buildroot.net/results/01c578dcc56b45e5c620f5b43ff4a3348660b4e3 | arm | unknown | NOK | http://autobuild.buildroot.net/results/ddda25a9fe7d98a740633a8fa0c551f6d940bb44 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/b2a1a4f569ccf7fa43c77921ac6401f0b19e8824 | mipsel | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/af33495f64ebe4be0f85c55a8ebe587e4a40b601 | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/dcaca10b00ba7dc2a6baa9828f30bf59bc613693 | arm | zchunk-1.1.16 | NOK | http://autobuild.buildroot.net/results/582b994372435b8c35a56345c15bd0ffc722af79 | Classification of failures by reason for 2021.02.x -------------------------------------------------- zeromq-4.3.4 | 2 apitrace-9.0 | 1 host-sentry-cli-1.57.0 | 1 openal-1.20.1 | 1 rocksdb-6.13.3 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-9.0 | NOK | http://autobuild.buildroot.net/results/ef77899a8882725ba56d051dc2c7c529a4513c89 | mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/62593a101fbde2c494fc1bce0675b10fa03e1e76 | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/bd93a666749d850ed7cc680f6dd04ea7ad4081ad | arm | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/8a17c033f9fb9db3edb0786f56a0c26ecf0952e0 | powerpc64 | unknown | NOK | http://autobuild.buildroot.net/results/cd72d15758cf3f8169ed0a8645776b14b9875ec4 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/797799ed46d621435e9dc15ba79647f9d0c28c55 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/7ab63dd8ed5bc32e137a8a1f2ee88815ccdeefd1 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 1 libmbim-1.26.0 | 1 pipewire-0.3.39 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/5946985a0e850ddd54d70510122e327b29662631 | powerpc64 | libmbim-1.26.0 | NOK | http://autobuild.buildroot.net/results/36ee4839f9d80a07d66f739447db3b53150af6cb | arm | pipewire-0.3.39 | NOK | http://autobuild.buildroot.net/results/0b5510c6af93a3cf3de28b19729a8edec0a62412 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- acpica | DISTRO | https://release-monitoring.org/project/00018 | 20200717 | 20211217 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 41.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.3.1 | 4.5.2 | alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.6 | 1.2.6.1 | alsa-plugins | DISTRO | https://release-monitoring.org/project/00041 | 1.2.5 | 1.2.6 | alsa-utils | DISTRO | https://release-monitoring.org/project/00037 | 1.2.4 | 1.2.6 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 12.0.0_r21 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.0 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.4 | 5.1.5 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.42.0 | avrdude | DISTRO | https://release-monitoring.org/project/10751 | r1450 | 6.4 | avro-c | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.10 | ORPH babeltrace2 | DISTRO | https://release-monitoring.org/project/07137 | 2.0.3 | 2.0.4 | balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 19.03.14 | 20.10.11 | ORPH bash | DISTRO | https://release-monitoring.org/project/00166 | 5.1 | 5.1.8 | ORPH batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2021.4 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.1 | 2021.4 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.5.0 | bcg729 | DISTRO | https://release-monitoring.org/project/14743 | 1.0.4 | 1.1.1 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.0.61 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.61 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.61 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.4 | ORPH bind | DISTRO | https://release-monitoring.org/project/14923 | 9.11.36 | 9.17.21 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.37 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 22.0 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.1.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.11 | 5.15.1 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.09 | 3.21 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.34.1 | 1.35.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.7 | 0.5.9 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.4 | 0.5.5 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.4 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.5.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.4.34 | 1.4.36 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.2 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.1 | 4.2 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.13 | 6.14 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.17.1 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.4 | 0.104.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.0 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.1 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.2 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.2.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.11.3 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.1.1 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.0.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.5 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.6.1 | 1.8.0 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20211214 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.11 | 20.10.12 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.2 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.11 | 20.10.12 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.19.1 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH e2fsprogs | DISTRO | https://release-monitoring.org/project/00646 | 1.46.4 | 1.46.5 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.0 | 1.26.1 | eigen | DISTRO | https://release-monitoring.org/project/00666 | 3.3.7 | 3.4.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 20.07 | 21.12 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.184 | 0.186 | ORPH elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.13.1 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.0 | 0.25.1 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.17 | 1.0.21 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-idna | DISTRO | https://release-monitoring.org/project/45374 | 6.0.0 | 6.1.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.9.0 | 1.11.2 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.6.10 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.9 | 1.0.16 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.25 | 1.0.29 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.10 | 1.0.14 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.7 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.6 | 1.0.8 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.38 | 1.0.45 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.23 | 1.0.27 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.39 | 1.1.0 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.9 | 1.1.13 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.20 | 1.0.24 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.44 | 1.1.48 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.4.10 | 1.5.6 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.28 | 1.0.32 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.8 | 1.0.12 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.9 | 1.0.10 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.3 | 1.4 | ethtool | DISTRO | https://release-monitoring.org/project/00763 | 5.12 | 5.15 | eudev | DISTRO | https://release-monitoring.org/project/13466 | 3.2.10 | 3.2.11 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.8.0.1 | 2.8.2.0 | exfatprogs | DISTRO | https://release-monitoring.org/project/94441 | 1.1.0 | 1.1.3 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.7.2 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.24 | 6.4.26 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.29 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.16.0 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.2 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | fsl-sdk-v2.0 | 0.2.0 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 5.15.4 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.94 | ORPH freeswitch | DISTRO | https://release-monitoring.org/project/21436 | 1.10.6 | 1.10.7 | freetype | DISTRO | https://release-monitoring.org/project/00854 | 2.10.4 | 2.11.1 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 21.12.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.10 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdk-pixbuf | DISTRO | https://release-monitoring.org/project/09533 | 2.42.4 | 2.42.6 | ORPH gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.2.9 | 2.3.5 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.53.3 | 9.55.0 | git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.34.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.66.0 | 2.70.1 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.70.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.10 | 3.0.14 | gnuchess | DISTRO | https://release-monitoring.org/project/01206 | 6.2.8 | 6.2.9 | ORPH gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.2.32 | 2.3.4 | ORPH gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.8.2.0 | 3.9.4.0 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.68.0 | 1.70.0 | ORPH gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.1 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grub2 | DISTRO | https://release-monitoring.org/project/01257 | 2.04 | 2.06 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 41.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gst-omx | DISTRO | https://release-monitoring.org/project/21845 | 1.18.5 | 1.19.3 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.5 | 1.19.3 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-libav | DISTRO | https://release-monitoring.org/project/21848 | 1.18.5 | 1.19.3 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.5 | 1.19.3 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.1 | ORPH gtkmm3 | DISTRO | https://release-monitoring.org/project/07963 | 3.22.0 | 4.4.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.0 | gupnp-av | DISTRO | https://release-monitoring.org/project/01282 | 0.13.0 | 0.14.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.44.1 | 1.48.1 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2018.01.1 | 2021.03.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.4.8 | 2.5.0 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.21.12 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.4.1 | 2.7.0 | icu | DISTRO | https://release-monitoring.org/project/16134 | 69-1 | 70.1 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.36+nmu1 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.0.11-13 | 7.1.0-19 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.7.5 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.21.9.6 | ORPH ipmiutil | DISTRO | https://release-monitoring.org/project/01391 | 3.1.7 | 3.1.8 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | isl | DISTRO | https://release-monitoring.org/project/13286 | 0.23 | 0.24 | ORPH jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.17 | 1.9.19 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.18.1 | 1.19.2 | janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 0.10.10 | 0.11.6 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.28 | 2.0.33 | jimtcl | DISTRO | https://release-monitoring.org/project/01459 | 0.80 | 0.81 | jose | DISTRO | https://release-monitoring.org/project/11761 | 10 | 11 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.3 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.10.4 | 1.13.0 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.0 | json-glib | DISTRO | https://release-monitoring.org/project/13144 | 1.4.4 | 1.6.6 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.2.2 | 3.7.1 | keepalived | DISTRO | https://release-monitoring.org/project/01504 | 2.1.4 | 2.2.4 | kexec | DISTRO | https://release-monitoring.org/project/12689 | 2.0.22 | 2.0.23 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.89.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.89.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.89.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.89.0 | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.0.1-Ma... | 20.3.0-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.4-Ma... | 20.2.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.0.3-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.10-M... | 20.2.0-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.1-Ma... | 20.2.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.2-Ma... | 20.1.0-Nexus | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 1.2.0 | 2.1.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | lft | DISTRO | https://release-monitoring.org/project/21863 | 3.8 | 3.91 | ORPH libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.25 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.4.0 | 0.6.1 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.10.0 | 0.11.3 | libbytesize | DISTRO | https://release-monitoring.org/project/07869 | 2.5 | 2.6 | ORPH libcap | DISTRO | https://release-monitoring.org/project/01569 | 2.52 | 2.62 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 2.0 | libcodec2 | DISTRO | https://release-monitoring.org/project/14605 | 1.0.1 | 1.03 | libeXosip2 | DISTRO | https://release-monitoring.org/project/21475 | 5.2.1 | 5.3.0 | libedit | DISTRO | https://release-monitoring.org/project/01599 | 20191231-3.1 | 20210910-3.1 | libev | DISTRO | https://release-monitoring.org/project/01605 | 4.27 | 4.33 | ORPH libfribidi | DISTRO | https://release-monitoring.org/project/00857 | 1.0.10 | 1.0.11 | libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgeotiff | DISTRO | https://release-monitoring.org/project/21361 | 1.6.0 | 1.7.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.2 | 3.3.6 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.68.4 | 2.70.2 | libgpg-error | DISTRO | https://release-monitoring.org/project/01628 | 1.42 | 1.43 | ORPH libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.6.0 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.37 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.12 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.16 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libldns | DISTRO | https://release-monitoring.org/project/14817 | 1.7.1 | 1.8.1 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.1 | 0.11.3 | libmhash | DISTRO | https://release-monitoring.org/project/21488 | 0.9.9.9 | 1.4 | ORPH libminiupnpc | DISTRO | https://release-monitoring.org/project/01986 | 2.1.20201016 | 2.2.3 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnftnl | DISTRO | https://release-monitoring.org/project/01681 | 1.2.0 | 1.2.1 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.6 | 3.2.8 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 1.1.1m | 3.0.1 | libosip2 | DISTRO | https://release-monitoring.org/project/15135 | 5.2.1 | 5.3.0 | libpagekite | DISTRO | https://release-monitoring.org/project/21366 | 0.91.190530 | 0.91.201110 | libpam-radius-auth | DISTRO | https://release-monitoring.org/project/57834 | 1.4.0 | 2.0.0 | ORPH libpjsip | DISTRO | https://release-monitoring.org/project/15701 | 2.10 | 2.11.1 | libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.6.0 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.5.0 | 1.6.0 | libqb | DISTRO | https://release-monitoring.org/project/09399 | 2.0.3 | 2.0.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.5 | libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.2 | 3.3 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.2 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.2 | 20200710 | libsoundtouch | DISTRO | https://release-monitoring.org/project/115722 | 2.2 | 2.3.1 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.0 | 3.0.3 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.1 | 2.4.2 | libss7 | DISTRO | https://release-monitoring.org/project/21690 | 2.0.0 | 2.0.1 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.5 | libuhttpd | DISTRO | https://release-monitoring.org/project/89386 | 3.12.1 | 3.14.1 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.5.0 | 4.0.10 | ORPH libvdpau | DISTRO | https://release-monitoring.org/project/01755 | 1.3 | 1.4 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.1 | libvirt | DISTRO | https://release-monitoring.org/project/224041 | 7.7.0 | 7.10.0 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.0.21 | 4.3.0 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.26 | 4.4.27 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.61 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20210919 | 20211216 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2021.12.18 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.9 | 1.0.13 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.12.0 | 0.12.1 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.18.0 | 3.18.1 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.3 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.8 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.11.0 | 2.13.0 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.3 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.12 | 2.03.14 | ORPH lxc | DISTRO | https://release-monitoring.org/project/01860 | 4.0.10 | 4.0.11 | lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.3 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.30 | 10.7.1 | ORPH matchbox-fakekey | DISTRO | https://release-monitoring.org/project/229563 | 0.1 | 0.3 | matchbox-keyboard | DISTRO | https://release-monitoring.org/project/230595 | 0.1 | 0.1.1 | matchbox-lib | DISTRO | https://release-monitoring.org/project/21187 | 1.9 | 1.12 | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.16.12 | 3.1.0 | mbuffer | DISTRO | https://release-monitoring.org/project/15518 | 20210328 | 20211018 | mdadm | DISTRO | https://release-monitoring.org/project/01958 | 4.1 | 4.2 | ORPH mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.4.0 | 0.1.5.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.0.61 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 5.31b | memtester | DISTRO | https://release-monitoring.org/project/01967 | 4.5.0 | 4.5.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.42.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2021.12 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20190618 | 20210805 | ORPH modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.16.10 | 1.18.4 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.11 | 5.1.1 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.5 | mongrel2 | DISTRO | https://release-monitoring.org/project/16904 | 1.12.2 | 1.13.0 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.29.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.163 | mp4v2 | DISTRO | https://release-monitoring.org/project/98413 | 4.1.3 | 5.0.1 | ORPH mpd | DISTRO | https://release-monitoring.org/project/14864 | 0.23.3 | 0.23.5 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.0 | 2.5.1 | mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.29.3 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.34.0 | mraa | DISTRO | https://release-monitoring.org/project/21528 | 2.1.0 | 2.2.0 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 4.0.3 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.14 | 1.8.19 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.0.9 | 0.05 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.26 | 4.0.36 | multipath-tools | DISTRO | https://release-monitoring.org/project/00424 | 0.8.7 | 0.8.8 | mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | mutt | DISTRO | https://release-monitoring.org/project/02035 | 2.1.4 | 2.1.5 | nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.0.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220101 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.30.2 | 0.32.1 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | debian_1.... | 1.218 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.32.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.6.1 | 0.7.3 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9 | 5.9.1 | ORPH network-manager-openvpn | DISTRO | https://release-monitoring.org/project/69977 | 1.8.14 | 1.8.16 | nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.0 | 1.0.1 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.46.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.5 | nmon | DISTRO | https://release-monitoring.org/project/02097 | 16m | 16n | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.2 | 17.3.0 | nss-mdns | DISTRO | https://release-monitoring.org/project/05491 | 0.14.1 | 0.15.1 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.132 | 390.147 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 495.46 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 1.16 | ORPH ocf-linux | DISTRO | https://release-monitoring.org/project/21541 | 20120127 | 20171122 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.31 | 1.33 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.2.4 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.3 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.19 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.5.5 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.7.0 | openipmi | DISTRO | https://release-monitoring.org/project/02549 | 2.0.28 | 2.0.32 | ORPH openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.13+8 | 19+3 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.9.0 | 6.10.0 | openldap | DISTRO | https://release-monitoring.org/project/02551 | 2.4.59 | 2.6.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.2 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.44.10 | opentracing-cpp | DISTRO | https://release-monitoring.org/project/21553 | 1.5.1 | 1.6.0 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 10.3.5-10... | 11.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.5.0 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.27 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.0.61 | ORPH p11-kit | DISTRO | https://release-monitoring.org/project/02582 | 0.23.22 | 0.24.0 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.0 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH parted | DISTRO | https://release-monitoring.org/project/02596 | 3.3 | 3.4 | patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.9 | 0.14.3 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.3 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202112 | ORPH perl | DISTRO | https://release-monitoring.org/project/13599 | 5.32.1 | 5.34.0 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-guess | DISTRO | https://release-monitoring.org/project/17375 | 0.12 | 0.14 | perl-crypt-openssl-rsa | DISTRO | https://release-monitoring.org/project/02748 | 0.31 | 0.32 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.85 | 6.86 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-http-message | DISTRO | https://release-monitoring.org/project/02977 | 6.33 | 6.35 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.072 | 2.073 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.57 | 6.60 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20200907 | perl-net-dns | DISTRO | https://release-monitoring.org/project/03147 | 1.32 | 1.33 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.85 | 1.90 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-try-tiny | DISTRO | https://release-monitoring.org/project/11921 | 0.30 | 0.31 | perl-uri | DISTRO | https://release-monitoring.org/project/03485 | 5.09 | 5.10 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0207 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.0.14 | 8.1.1 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.21 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-imagick | DISTRO | https://release-monitoring.org/project/17401 | 3.5.0 | 3.6.0 | ORPH php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.1.2 | php-yaml | DISTRO | https://release-monitoring.org/project/12515 | 2.2.1 | 2.2.2 | ORPH pigpio | DISTRO | https://release-monitoring.org/project/21577 | 79 | 7301 | pinentry | DISTRO | https://release-monitoring.org/project/03643 | 1.1.1 | 1.2.0 | ORPH pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.40 | 0.3.42 | pkcs11-helper | DISTRO | https://release-monitoring.org/project/91990 | 1.27 | 1.28 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.8.0 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.16.0 | 2.17.0 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.10.1 | 1.11.1 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.8 | 1.3.9 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.14 | proftpd | DISTRO | https://release-monitoring.org/project/07609 | 1.3.6e | 1.3.7c | proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 8.2.1 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.15 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 14.2 | 15.0 | python-aenum | DISTRO | https://release-monitoring.org/project/34074 | 3.1.0 | 3.1.5 | python-aioblescan | DISTRO | https://release-monitoring.org/project/21242 | 0.2.8 | 0.2.10 | python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.1 | 0.4.3 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiojobs | DISTRO | https://release-monitoring.org/project/21252 | 0.3.0 | 1.0.0 | python-aioredis | DISTRO | https://release-monitoring.org/project/21938 | 2.0.0 | 2.0.1 | python-alsaaudio | DISTRO | https://release-monitoring.org/project/10072 | 0.8.4 | 0.9.0 | python-argon2-cffi | DISTRO | https://release-monitoring.org/project/33377 | 21.1.0 | 21.3.0 | python-arrow | DISTRO | https://release-monitoring.org/project/05314 | 1.2.0 | 1.2.1 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.4.1 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 21.2.0 | 21.4.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 21.3.1 | 21.11.1 | python-avro | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | python-backports-functools-... | DISTRO | https://release-monitoring.org/project/28328 | 1.5 | 1.6.4 | python-bidict | DISTRO | https://release-monitoring.org/project/114352 | 0.21.3 | 0.21.4 | python-bleak | DISTRO | https://release-monitoring.org/project/26271 | 0.12.1 | 0.13.0 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.26 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.26 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 1.2.1 | python-cbor2 | DISTRO | https://release-monitoring.org/project/64102 | 5.4.1 | 5.4.2 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2021.5.30 | 2021.10.8 | python-cffi | DISTRO | https://release-monitoring.org/project/05536 | 1.14.6 | 1.15.0 | python-channels | DISTRO | https://release-monitoring.org/project/21937 | 2.3.1 | 3.0.4 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 2.4.1 | 3.3.1 | python-charset-normalizer | DISTRO | https://release-monitoring.org/project/55366 | 2.0.7 | 2.0.9 | python-cheroot | DISTRO | https://release-monitoring.org/project/20163 | 8.2.1 | 8.5.2 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 12.0.1 | 18.6.1 | python-click | DISTRO | https://release-monitoring.org/project/03802 | 7.1.2 | 8.0.3 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.4.1 | 6.6.0 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.fb18 | 1.5 | python-cryptography | DISTRO | https://release-monitoring.org/project/05532 | 3.3.2 | 36.0.1 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 1.0.2 | 2.3.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a9 | python-daemon | DISTRO | https://release-monitoring.org/project/03816 | 2.2.3 | 2.3.0 | python-daphne | DISTRO | https://release-monitoring.org/project/21939 | 2.4.1 | 3.0.2 | python-dataproperty | DISTRO | https://release-monitoring.org/project/21697 | 0.53.0 | 0.54.2 | python-dialog | DISTRO | https://release-monitoring.org/project/03823 | 3.4.0 | 3.5.3 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 3.2.10 | 4.0b1 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 4.1.0 | 5.0.3 | python-docutils | DISTRO | https://release-monitoring.org/project/03849 | 0.15.2 | 0.18.1 | python-ecdsa | DISTRO | https://release-monitoring.org/project/08370 | 0.17.0 | 0.18.0b1 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.2.1 | 4.3.0 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.4.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.2 | python-flask-expects-json | DISTRO | https://release-monitoring.org/project/127659 | 1.5.0 | 1.7.0 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 0.3.1 | 2.1.0 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 2.4.1 | 2.5.1 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 0.15.1 | 1.0.0 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.28.2 | 4.28.5 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.9 | python-h2 | DISTRO | https://release-monitoring.org/project/19033 | 3.2.0 | 4.1.0 | python-hpack | DISTRO | https://release-monitoring.org/project/19034 | 3.0.0 | 4.0.0 | python-httplib2 | DISTRO | https://release-monitoring.org/project/03887 | 0.19.1 | 0.20.2 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.13.1 | python-hyperframe | DISTRO | https://release-monitoring.org/project/19035 | 5.2.0 | 6.0.1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.2 | 3.3 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.28.0 | 8.0.0b1 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 1.1.0 | 2.0.1 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-janus | DISTRO | https://release-monitoring.org/project/56567 | 0.6.1 | 1.0.0 | python-jaraco-classes | DISTRO | https://release-monitoring.org/project/20150 | 2.0 | 3.2.1 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 2.0 | 3.5.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.0.2 | 3.0.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 2.5.1 | 4.3.3 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 19.2.0 | 23.5.0 | python-kiwisolver | DISTRO | https://release-monitoring.org/project/16910 | 1.1.0 | 1.3.2 | python-lmdb | DISTRO | https://release-monitoring.org/project/15512 | 1.2.1 | 1.3.0 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.6.5 | 4.7.1 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.1.5 | 1.1.6 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.3.4 | 3.3.6 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.1 | 2.4.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.5.1 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 0.8.4 | 2.0.1 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 8.10.0 | 8.12.0 | python-msgfy | DISTRO | https://release-monitoring.org/project/29716 | 0.1.0 | 0.2.0 | python-msgpack | DISTRO | https://release-monitoring.org/project/21831 | 1.0.2 | 1.0.3 | python-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-nfc | DISTRO | https://release-monitoring.org/project/21829 | 0.13.5 | 1.0.3 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.0 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 0.8.4 | 0.98.9 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 21.0 | 21.3 | python-paho-mqtt | DISTRO | https://release-monitoring.org/project/06084 | 1.4.0 | 1.6.1 | python-pam | DISTRO | https://release-monitoring.org/project/05725 | 0.5.0 | 1.8.4 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.1 | python-pathlib2 | DISTRO | https://release-monitoring.org/project/12723 | 2.3.5 | 2.3.6 | python-pathpy | DISTRO | https://release-monitoring.org/project/21703 | 12.0.1 | 12.5.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.6.0 | 5.8.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 8.4.0 | 9.0.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 21.3.1 | python-portend | DISTRO | https://release-monitoring.org/project/20203 | 2.5 | 3.1.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.20 | 3.0.24 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python-psycopg2 | DISTRO | https://release-monitoring.org/project/03979 | 2.9.1 | 2.9.3 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2021.1 | 2021.2.2 | python-py | DISTRO | https://release-monitoring.org/project/03981 | 1.10.0 | 1.11.0 | python-pybind | DISTRO | https://release-monitoring.org/project/13384 | 2.6.1 | 2.9.0 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0a2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.5 | 1.5.6 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.7.4 | 2.11.1 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.2 | 2.0.3 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 1.9.7 | 2.8 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.19.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 2.2.0 | 2.5.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.18.14 | 1.19.4 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 19.1.0 | 21.0.0 | python-pyparsing | DISTRO | https://release-monitoring.org/project/03756 | 2.4.7 | 3.0.6 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.11.6 | 3.11.7 | python-pyphen | DISTRO | https://release-monitoring.org/project/19681 | 0.11.0 | 0.12.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.7 | 5.15.6 | python-pyro | DISTRO | https://release-monitoring.org/project/19993 | 3.16 | 4.82 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.5 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.1 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.16.0 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2019.3 | 2021.3 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | python-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 19.0.2 | 22.3.0 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 3.5.3 | 4.1.0 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.1 | python-rsa | DISTRO | https://release-monitoring.org/project/08808 | 4.7.2 | 4.8 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.fb57 | 2.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.1 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 18.1.0 | 21.1.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 44.0.0 | 60.2.0 | python-setuptools-rust | DISTRO | https://release-monitoring.org/project/122284 | 0.12.1 | 1.1.2 | python-setuptools-scm | DISTRO | https://release-monitoring.org/project/07874 | 5.0.1 | 6.3.2 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.17.5 | 3.17.6 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 0.45.2 | 1.3.0 | python-singledispatch | DISTRO | https://release-monitoring.org/project/12013 | 3.4.0.3 | 3.7.0 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.18 | 5.0.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 4.0.0 | 5.0.0 | python-snappy | DISTRO | https://release-monitoring.org/project/07203 | 0.5.4 | 0.6.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.0 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.2.1 | 2.3.1 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.3.10 | 1.4.29 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.2.0 | 1.2.1 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.3.0 | 0.4.2 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 1.14.1 | 4.1.2 | python-terminaltables | DISTRO | https://release-monitoring.org/project/15542 | 3.1.0 | 3.1.10 | python-thrift | DISTRO | https://release-monitoring.org/project/21614 | 0.13.0 | 0.15.0 | python-tinycss2 | DISTRO | https://release-monitoring.org/project/16655 | 1.1.0 | 1.1.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.1 | 1.1.3 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.0.4 | 6.1 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.40.1 | 4.62.3 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.1.0 | 5.1.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 20.3.0 | 21.5.0 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 20.3.0 | 21.7.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.0.1 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 4.2.0 | 5.1.0 | python-validators | DISTRO | https://release-monitoring.org/project/19818 | 0.15.0 | 0.18.2 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.1.9 | 0.2.5 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 53.4 | 54.0b1 | python-webpy | DISTRO | https://release-monitoring.org/project/04090 | 0.40 | 0.62 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 0.58.0 | 1.2.3 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.2 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.12.1 | 1.13.3 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 2.3.3 | 3.0.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.27 | 0.31 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.1 | 3.0.2 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.1 | python3-cffi | DISTRO | https://release-monitoring.org/project/05536 | 1.14.6 | 1.15.0 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a9 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python3-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 59.8.0 | 60.2.0 | qemu | DISTRO | https://release-monitoring.org/project/13607 | 6.1.0 | 6.2.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt53d | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5base | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5charts | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5connectivity | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5declarative | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5graphicaleffects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5imageformats | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5location | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5lottie | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5multimedia | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols2 | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quicktimeline | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5remoteobjects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5script | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5scxml | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5sensors | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialbus | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialport | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5svg | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5tools | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5virtualkeyboard | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5wayland | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webchannel | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.9.1 | 6.2.2 | qt5webkit-examples | DISTRO | https://release-monitoring.org/project/07927 | 5.9.1 | 6.2.2 | qt5websockets | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webview | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5x11extras | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5xmlpatterns | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.1 | 1.2 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-server | DISTRO | https://release-monitoring.org/project/05585 | 3.8.2 | 3.9.11 | ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.2 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.4 | 1.10.5 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.27.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2112.0 | rtai | DISTRO | https://release-monitoring.org/project/21658 | 4.0.1 | 5.3 | ORPH rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.0.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.57.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.57.0 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.10.0.3 | 2.11.0.1 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.1 | 2.3.5.3 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.6.3 | 1.0.7.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.5.1.5 | 2.5.1.7 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.4.1.1 | 2.5.1.0 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.3.2 | 2.2.3.4 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.2.2 | 0.5.3.0 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.3.0 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | sedutil | DISTRO | https://release-monitoring.org/project/15203 | 1.15.1 | 1.20.0 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.2 | 3.3 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.2 | 3.3 | ORPH sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.13 | sg3_utils | DISTRO | https://release-monitoring.org/project/04801 | 1.47 | 1.47r915 | shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.1 | ORPH skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.10.0.3 | 2.11.1.0 | snappy | DISTRO | https://release-monitoring.org/project/04844 | 1.1.8 | 1.1.9 | sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.4.7 | 1.4.10 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.2 | 3.4.8 | snort | DISTRO | https://release-monitoring.org/project/212335 | 2.9.18.1 | 2.9.19 | sofia-sip | DISTRO | https://release-monitoring.org/project/10509 | 1.13.3-80... | 1.13.6 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | speexdsp | DISTRO | https://release-monitoring.org/project/08419 | SpeexDSP-... | 1.2.0 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spi-tools | DISTRO | https://release-monitoring.org/project/20628 | 1.0.0 | 1.0.1 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.0 | 3.37.1 | squid | DISTRO | https://release-monitoring.org/project/04880 | 4.17 | 5.2 | ORPH sshfs | DISTRO | https://release-monitoring.org/project/11058 | 3.7.1 | 3.7.2 | ORPH start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.1 | ORPH startup-notification | DISTRO | https://release-monitoring.org/project/10089 | 0.9 | 0.12 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.4 | 1.0.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.61 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.4 | ORPH synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.23.1 | 0.28.0 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.34.1 | 3.35.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.42.1 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.4.2 | 12.5.5 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.01 | ORPH targetcli-fb | DISTRO | https://release-monitoring.org/project/09174 | 2.1.fb41 | 2.1.54 | tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.9.0 | 1.12.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 4.1.1 | 5.0.0 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.15.0 | ORPH tinyalsa | DISTRO | https://release-monitoring.org/project/21382 | 1.1.1 | 2.0.0 | ORPH tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.2a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 2.4.0 | ORPH tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 4.3.2 | 5.2 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | trace-cmd... | 2.9.4 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.0 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2021.10 | udpcast | DISTRO | https://release-monitoring.org/project/10206 | 20200328 | 20211207 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.10 | 0.11 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 3.15.0.0 | 4.1.0.5 | umtprd | DISTRO | https://release-monitoring.org/project/46129 | 1.3.10 | 1.6.2 | unclutter-xfixes | DISTRO | https://release-monitoring.org/project/09206 | 1.5 | 1.6 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 2.2 | unrar | DISTRO | https://release-monitoring.org/project/13306 | 5.9.4 | 6.1.3 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | usbredir | DISTRO | https://release-monitoring.org/project/16012 | 0.11.0 | 0.12.0 | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.54.5 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.3930 | 8.2.3978 | ORPH vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.48.3 | 0.66.2 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.22 | 3.2.26 | waf | DISTRO | https://release-monitoring.org/project/05116 | 2.0.22 | 2.0.23 | waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.6.1 | 1.7.0 | wayland | DISTRO | https://release-monitoring.org/project/10061 | 1.19.0 | 1.20.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.23 | 1.24 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.32.4 | 2.34.3 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 6.23 | wireguard-linux-compat | DISTRO | https://release-monitoring.org/project/62379 | 1.0.20210606 | 1.0.20211208 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.2 | 0.4.5 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.10 | 3.6.1 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.0 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.1.0 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.3 | 2.35.1 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.18 | 1.4.19 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20210218 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 21.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.3 | 4.16.0 | xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 5.10.0 | 5.14.2 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xml-security-c | DISTRO | https://release-monitoring.org/project/05197 | 2.0.2 | 2.0.4 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 5.45 | 6.02 | xserver_xorg-server | DISTRO | https://release-monitoring.org/project/05250 | 21.1.2 | 21.1.3 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.17 | 3.18 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.0 | 0.3.1 | xxhash | DISTRO | https://release-monitoring.org/project/17583 | 0.8.0 | 0.8.1 | ORPH yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2020f | 2021e | zlib-ng | DISTRO | https://release-monitoring.org/project/115592 | 1.9.9-b1 | 2.0.6 | ORPH zynq-boot-bin | DISTRO | https://release-monitoring.org/project/21623 | 2015.1 | 2021.2 | ORPH Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 bash | CVE-2019-18276 | https://security-tracker.debian.org/tracker/CVE-2019-18276 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-3487 | https://security-tracker.debian.org/tracker/CVE-2021-3487 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bird | CVE-2021-26928 | https://security-tracker.debian.org/tracker/CVE-2021-26928 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2021-42376 | https://security-tracker.debian.org/tracker/CVE-2021-42376 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 civetweb | CVE-2020-27304 | https://security-tracker.debian.org/tracker/CVE-2020-27304 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exim | CVE-2021-38371 | https://security-tracker.debian.org/tracker/CVE-2021-38371 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2020-35965 | https://security-tracker.debian.org/tracker/CVE-2020-35965 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 flatbuffers | CVE-2020-35864 | https://security-tracker.debian.org/tracker/CVE-2020-35864 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41157 | https://security-tracker.debian.org/tracker/CVE-2021-41157 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-27645 | https://security-tracker.debian.org/tracker/CVE-2021-27645 glibc | CVE-2021-33574 | https://security-tracker.debian.org/tracker/CVE-2021-33574 glibc | CVE-2021-38604 | https://security-tracker.debian.org/tracker/CVE-2021-38604 gnuchess | CVE-2021-30184 | https://security-tracker.debian.org/tracker/CVE-2021-30184 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 go | CVE-2021-29923 | https://security-tracker.debian.org/tracker/CVE-2021-29923 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2020-6624 | https://security-tracker.debian.org/tracker/CVE-2020-6624 jhead | CVE-2020-6625 | https://security-tracker.debian.org/tracker/CVE-2020-6625 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 keepalived | CVE-2021-44225 | https://security-tracker.debian.org/tracker/CVE-2021-44225 kodi | CVE-2021-42917 | https://security-tracker.debian.org/tracker/CVE-2021-42917 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libesmtp | CVE-2019-19977 | https://security-tracker.debian.org/tracker/CVE-2019-19977 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libnss | CVE-2021-43527 | https://security-tracker.debian.org/tracker/CVE-2021-43527 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libressl | CVE-2021-41581 | https://security-tracker.debian.org/tracker/CVE-2021-41581 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 monkey | CVE-2013-1771 | https://security-tracker.debian.org/tracker/CVE-2013-1771 monkey | CVE-2013-2183 | https://security-tracker.debian.org/tracker/CVE-2013-2183 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 mutt | CVE-2021-32055 | https://security-tracker.debian.org/tracker/CVE-2021-32055 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 network-manager | CVE-2021-20297 | https://security-tracker.debian.org/tracker/CVE-2021-20297 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 openblas | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvpn | CVE-2021-3606 | https://security-tracker.debian.org/tracker/CVE-2021-3606 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php-imagick | CVE-2019-11037 | https://security-tracker.debian.org/tracker/CVE-2019-11037 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 privoxy | CVE-2021-44542 | https://security-tracker.debian.org/tracker/CVE-2021-44542 privoxy | CVE-2021-44543 | https://security-tracker.debian.org/tracker/CVE-2021-44543 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-autobahn | CVE-2020-35678 | https://security-tracker.debian.org/tracker/CVE-2020-35678 python-cryptography | CVE-2020-36242 | https://security-tracker.debian.org/tracker/CVE-2020-36242 python-django | CVE-2021-44420 | https://security-tracker.debian.org/tracker/CVE-2021-44420 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2020-35503 | https://security-tracker.debian.org/tracker/CVE-2020-35503 qemu | CVE-2020-35504 | https://security-tracker.debian.org/tracker/CVE-2020-35504 qemu | CVE-2020-35505 | https://security-tracker.debian.org/tracker/CVE-2020-35505 qemu | CVE-2020-35506 | https://security-tracker.debian.org/tracker/CVE-2020-35506 qemu | CVE-2020-35517 | https://security-tracker.debian.org/tracker/CVE-2020-35517 qemu | CVE-2021-20181 | https://security-tracker.debian.org/tracker/CVE-2021-20181 qemu | CVE-2021-20196 | https://security-tracker.debian.org/tracker/CVE-2021-20196 qemu | CVE-2021-20203 | https://security-tracker.debian.org/tracker/CVE-2021-20203 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-20263 | https://security-tracker.debian.org/tracker/CVE-2021-20263 qemu | CVE-2021-3392 | https://security-tracker.debian.org/tracker/CVE-2021-3392 qemu | CVE-2021-3409 | https://security-tracker.debian.org/tracker/CVE-2021-3409 qemu | CVE-2021-3416 | https://security-tracker.debian.org/tracker/CVE-2021-3416 qemu | CVE-2021-3507 | https://security-tracker.debian.org/tracker/CVE-2021-3507 qemu | CVE-2021-3527 | https://security-tracker.debian.org/tracker/CVE-2021-3527 qemu | CVE-2021-3544 | https://security-tracker.debian.org/tracker/CVE-2021-3544 qemu | CVE-2021-3545 | https://security-tracker.debian.org/tracker/CVE-2021-3545 qemu | CVE-2021-3546 | https://security-tracker.debian.org/tracker/CVE-2021-3546 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 qpid-proton | CVE-2016-2166 | https://security-tracker.debian.org/tracker/CVE-2016-2166 qpid-proton | CVE-2016-4467 | https://security-tracker.debian.org/tracker/CVE-2016-4467 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2021-28966 | https://security-tracker.debian.org/tracker/CVE-2021-28966 runc | CVE-2021-43784 | https://security-tracker.debian.org/tracker/CVE-2021-43784 rust | CVE-2021-29922 | https://security-tracker.debian.org/tracker/CVE-2021-29922 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2021-3156 | https://security-tracker.debian.org/tracker/CVE-2021-3156 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tools | CVE-2021-3565 | https://security-tracker.debian.org/tracker/CVE-2021-3565 uboot-tools | CVE-2021-27097 | https://security-tracker.debian.org/tracker/CVE-2021-27097 uboot-tools | CVE-2021-27138 | https://security-tracker.debian.org/tracker/CVE-2021-27138 util-linux | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 util-linux-libs | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 vim | CVE-2021-4069 | https://security-tracker.debian.org/tracker/CVE-2021-4069 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wget | CVE-2021-31879 | https://security-tracker.debian.org/tracker/CVE-2021-31879 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28705 | https://security-tracker.debian.org/tracker/CVE-2021-28705 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28709 | https://security-tracker.debian.org/tracker/CVE-2021-28709 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 keepalived | CVE-2021-44225 | https://security-tracker.debian.org/tracker/CVE-2021-44225 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 openblas | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 privoxy | CVE-2021-44542 | https://security-tracker.debian.org/tracker/CVE-2021-44542 privoxy | CVE-2021-44543 | https://security-tracker.debian.org/tracker/CVE-2021-44543 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-django | CVE-2021-44420 | https://security-tracker.debian.org/tracker/CVE-2021-44420 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 runc | CVE-2021-43784 | https://security-tracker.debian.org/tracker/CVE-2021-43784 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2021-36690 | https://security-tracker.debian.org/tracker/CVE-2021-36690 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4069 | https://security-tracker.debian.org/tracker/CVE-2021-4069 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28705 | https://security-tracker.debian.org/tracker/CVE-2021-28705 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28709 | https://security-tracker.debian.org/tracker/CVE-2021-28709 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From tomi.valkeinen at ideasonboard.com Mon Jan 3 08:24:07 2022 From: tomi.valkeinen at ideasonboard.com (Tomi Valkeinen) Date: Mon, 3 Jan 2022 10:24:07 +0200 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: <20211206215730.GE2603@scaer> References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> Message-ID: Hi, On 06/12/2021 23:57, Yann E. MORIN wrote: > So I think we really, really need a package (like scipy) that actually > makes use of pybind, so we can see how it works, and to fix it... Jfyi, there are two relatively simple packages in buildroot that can use pybind: kmsxx and rwmem. Both use meson for building. I can test the next version of this series with those packages. Tomi From troglobit at gmail.com Mon Jan 3 08:41:39 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Mon, 03 Jan 2022 09:41:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> Message-ID: <87bl0t1a9o.fsf@gmail.com> On Sat, Jan 01, 2022 at 23:59, Fabrice Fontaine wrote: > The LXC 4.0 branch is supported until June 2025. > Only bugfixes and securitiy issues get included into the stable bugfix > releases, so it's always safe and recommended to keep up and run the > latest bugfix release. > > https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg From troglobit at gmail.com Mon Jan 3 08:42:10 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Mon, 03 Jan 2022 09:42:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: new package In-Reply-To: <20220101135737.956301-1-fontaine.fabrice@gmail.com> References: <20220101135737.956301-1-fontaine.fabrice@gmail.com> Message-ID: <878rvx1a8t.fsf@gmail.com> On Sat, Jan 01, 2022 at 14:57, Fabrice Fontaine wrote: > ksmbd kernel server userspace utilities. > > https://github.com/cifsd-team/ksmbd-tools > > Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg From yann.morin.1998 at free.fr Mon Jan 3 09:04:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:14 +0100 Subject: [Buildroot] [git commit] package/kodi-peripheral-joystick: bump version to 19.0.1-Matrix Message-ID: <20220103090129.396C982BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ac5273f8571f53966ca1beb382f573712d8a2e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 8cc09e9774..c43d5d8628 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85452cab5aa6e6dd426ca5df76c0832e1c9fa2d464973a16ad5e8c52d4533cc9 kodi-peripheral-joystick-19.0.0-Matrix.tar.gz +sha256 65efcfb8b0ed6595082d8d7298ec25b5c31d0189bb8e09ae1bc10989b9655204 kodi-peripheral-joystick-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index b753e689e8..b823550751 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.0-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.1-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:02 +0100 Subject: [Buildroot] [git commit] package/kodi-audiodecoder-modplug: bump version to 19.0.2-Matrix Message-ID: <20220103090129.0876082BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=deec3a88876cdb1454cb550ea57d4b3692d54cea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index 7bab017241..e2bfe09928 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c422cacf456ab9eda5e2836d2789c3756bfbae03265a01647dd8f935261d9ec kodi-audiodecoder-modplug-19.0.1-Matrix.tar.gz +sha256 6e1b1910e799ea8c5ab11428084feb8f6a0a9b1b0d4b5760033545fe765a59e9 kodi-audiodecoder-modplug-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index 9b2cf98dbc..f5736e7db7 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:05 +0100 Subject: [Buildroot] [git commit] package/kodi-audiodecoder-nosefart: bump version to 19.0.2-Matrix Message-ID: <20220103090129.10B9C82D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2973455e7043e134029385c815c3e8a5975c46af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash | 2 +- package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 56a73306bd..9d1c9a2a76 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5ed3013f42860afec661e72bdcb4ebb10e98705d3a7c9826dfe29d2c394709d kodi-audiodecoder-nosefart-19.0.1-Matrix.tar.gz +sha256 631b2abded62a34bf66a6769f7b1597a418057f64d79e54322f57090e53e63e7 kodi-audiodecoder-nosefart-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index 4e12c965d5..fbf327032b 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:29 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-stalker: bump version to 19.0.1-Matrix Message-ID: <20220103090129.714F382D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=040560c3d765f8e1b44f796f480ec8aadb646a25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 2 +- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 66d587b19d..90e74d451a 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6161f0593feb67865e78f9aecc8c59019933ddda273e495ffadb0bdb42dde2a3 kodi-pvr-stalker-19.0.0-Matrix.tar.gz +sha256 84a92c298ddda8d72072aafe2a62c5c6b48b60b3b85408ce7ca4f96e42965541 kodi-pvr-stalker-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index d0ffebb063..a0d5f4356d 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 19.0.0-Matrix +KODI_PVR_STALKER_VERSION = 19.0.1-Matrix KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:10 +0100 Subject: [Buildroot] [git commit] package/kodi-audioencoder-lame: bump version to 19.1.2-Matrix Message-ID: <20220103090129.2170882BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fb70b49b615ace33730f0b0fee0cc02e06624d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index f39b1f7a82..a9cb12af6a 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb75e1cb069e977887003d3f11cc73a1ecf885c7fb9c03950cd5c918dc64820a kodi-audioencoder-lame-19.1.1-Matrix.tar.gz +sha256 774e75b051b1872620a706aa5e6c8741708364ac8d9d849286c4a265dd1a22f7 kodi-audioencoder-lame-19.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index 9048d4d730..fbc7489782 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 19.1.1-Matrix +KODI_AUDIOENCODER_LAME_VERSION = 19.1.2-Matrix KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:45 +0100 Subject: [Buildroot] [git commit] package/kodi-vfs-sftp: bump version to 19.0.1-Matrix Message-ID: <20220103090129.BB84882D9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76c1664ddd62711183b4698c74749d62462c809a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 217b2b5ee3..1f3cc4978f 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 06015d9c645642f92ed2b28d6c6e3c1c9b149e7fb1e212b66a02510d438b4947 kodi-vfs-sftp-19.0.0-Matrix.tar.gz +sha256 671bc7bd45d8d744f7e8a60bde9d1f9a0c821d7dd79b9e33d29b2bb2b5d231a1 kodi-vfs-sftp-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index ea6cef069c..6415fcb1de 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 19.0.0-Matrix +KODI_VFS_SFTP_VERSION = 19.0.1-Matrix KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:36 +0100 Subject: [Buildroot] [git commit] package/kodi-vfs-libarchive: bump version to 19.0.1-Matrix Message-ID: <20220103090129.9062182D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=947f30ef43b1828ce5d5f3713ac3da1f7ed4fac1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash | 2 +- package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index feda0ee6b2..f3a2c8fcef 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 941dd675e84c2a6e964622fcc36664f011304d2b2e207196aad298167c713715 kodi-vfs-libarchive-19.0.0-Matrix.tar.gz +sha256 1360154d86bc73fc6f01f546d7b09a92968653cf05b037b0cd80a825d95a9187 kodi-vfs-libarchive-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index 91191ab636..eac02d7442 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = 19.0.0-Matrix +KODI_VFS_LIBARCHIVE_VERSION = 19.0.1-Matrix KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:12 +0100 Subject: [Buildroot] [git commit] package/kodi-inputstream-ffmpegdirect: bump version to 19.0.1-Matrix Message-ID: <20220103090129.30BC182D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0921cf401c16c64202db24484a585ba5c652a04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash | 2 +- package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash index 90122f7bbf..97385a5167 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 47b920094d1ffaa8a6204ffb223cff94078a764c035a97384ae969e87a3f5e6e kodi-inputstream-ffmpegdirect-19.0.0-Matrix.tar.gz +sha256 b676f5264df50f3cf990b270bbeb4a18bb082e99ff189d7b9a25fd67313a0382 kodi-inputstream-ffmpegdirect-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk index 65cf63f6c8..bad6c6ac97 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.0-Matrix +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.1-Matrix KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION)) KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:07 +0100 Subject: [Buildroot] [git commit] package/kodi-audiodecoder-snesapu: bump version to 19.0.2-Matrix Message-ID: <20220103090129.191BC82D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51dc39eed390e2b0f86f6e5d5d8c083067c17c51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash | 2 +- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index c8bf76ada7..1a0227f415 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f7a346b751900f4b66e8a3e7d3c3579b0b10a112e6ed6901553c4c9fc72bbb3b kodi-audiodecoder-snesapu-19.0.1-Matrix.tar.gz +sha256 b7180132472b27e71bf9f30675c0af58330f3ad07d7065492d28f3e97117c341 kodi-audiodecoder-snesapu-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index 5397e765f7..ff988dffce 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.1-Matrix +KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.2-Matrix KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:33 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-wmc: bump version to 19.0.2-Matrix Message-ID: <20220103090129.8726782D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99b223aecf0b967a88a8df4ee178a9527ea17de9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index bfd95b37f7..4a04c07ac8 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f8e05a70948f31289a5c1a19114e904e088189ad12bf478dc4ab8e3b7dca211e kodi-pvr-wmc-19.0.1-Matrix.tar.gz +sha256 d5addd39f64f97beb6e14090561583de47f0acdc70bedb39b3037613430cc71a kodi-pvr-wmc-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 2eaaaaa77a..3bf21b3440 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 19.0.1-Matrix +KODI_PVR_WMC_VERSION = 19.0.2-Matrix KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:43 +0100 Subject: [Buildroot] [git commit] package/kodi-visualisation-shadertoy: bump version to 19.1.2-Matrix Message-ID: <20220103090129.B304D82D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa9b29fdf51b9d992343f3736709fce98d247f60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash | 2 +- package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index a27334d2cc..d3f489e4f9 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c556003a46ebf11595fb04343bf21a135365342f09e2280da2e7fd5e802944e7 kodi-visualisation-shadertoy-19.1.1-Matrix.tar.gz +sha256 49ffaf8ee1a95193d7ac4a6280ae7db8d59ca44c9e5554c0b8cd85a768d1d002 kodi-visualisation-shadertoy-19.1.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index e15264bb44..5c644bb3ee 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.1-Matrix +KODI_VISUALISATION_SHADERTOY_VERSION = 19.1.2-Matrix KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:19 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-mediaportal-tvserver: bump version to 19.0.2-Matrix Message-ID: <20220103090129.492A382D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c25809c665ee6aca8923f0721ffd4e5a6fd55273 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- .../kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash | 2 +- package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 72c28d4aef..9f4bd97366 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e7947b0428fc394220138bedf1b56fce0ed7f5218d2f3e773d5fec62edbdc95e kodi-pvr-mediaportal-tvserver-19.0.1-Matrix.tar.gz +sha256 3e0ba7a111ee0f93b64d0a0cb640569b13e429b1c47c88ac737389083054d732 kodi-pvr-mediaportal-tvserver-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 9ddfae91e6..1db0dca618 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.1-Matrix +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 19.0.2-Matrix KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:17 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-argustv: bump version to 19.1.1-Matrix Message-ID: <20220103090129.4172382BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=596744fe95468da1f869f9d4d0aa49f5d98d1815 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index d7bb94ec68..47ecd18975 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 66722c72c0bcd2b80ef2092a6bfc650ea2742f4a72521820ac716856bf69712b kodi-pvr-argustv-19.0.1-Matrix.tar.gz +sha256 31f0ac72c8549339c18c828e51ce2531c24686c6ce6c734db0f2b0ce67ff41a3 kodi-pvr-argustv-19.1.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index cbb7b9dc9b..793f7f1adc 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.0.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.1.1-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:40 +0100 Subject: [Buildroot] [git commit] package/kodi-visualisation-matrix: bump version to 19.0.1-Matrix Message-ID: <20220103090129.A9CF382D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f77e4b34cd19bc50c79c01bf5321c53fe0c4a83c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash | 2 +- package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash index 602dc3f2f0..9a5652a2d9 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e2cf98fa3cb9451dca595b2fad211ae34b5c449be07073c91aa73f182b208182 kodi-visualisation-matrix-19.0.0-Matrix.tar.gz +sha256 aba081aca30b6ff2b349f90ecc3ad9519fa7b8b88d61e08aeba2b66fad2a17a2 kodi-visualisation-matrix-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk index 080823e124..f8959facbd 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_MATRIX_VERSION = 19.0.0-Matrix +KODI_VISUALISATION_MATRIX_VERSION = 19.0.1-Matrix KODI_VISUALISATION_MATRIX_SITE = $(call github,xbmc,visualization.matrix,$(KODI_VISUALISATION_MATRIX_VERSION)) KODI_VISUALISATION_MATRIX_LICENSE = GPL-2.0+ KODI_VISUALISATION_MATRIX_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:21 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-nextpvr: bump version to 19.0.3-Matrix Message-ID: <20220103090129.50CCC82D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1053d9d91bf702cdad38a141c3e6391002a6e996 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 2a0c235af1..df13732957 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 c240c16a878f3b024c40728efe5b4f1ae19b74c4cb69875d5f9e415882838ee3 kodi-pvr-nextpvr-19.0.2-Matrix.tar.gz +sha256 f9a03f7e61ae69096b149184a1ababa2d98cf2486688022e7b63823047c04496 kodi-pvr-nextpvr-19.0.3-Matrix.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 a453c4e62f..c245a7e0bc 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 = 19.0.2-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.3-Matrix 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 yann.morin.1998 at free.fr Mon Jan 3 09:04:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:24 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-njoy: bump version to 19.0.1-Matrix Message-ID: <20220103090129.5A8BD82D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bc526ea99fc8a485e7d0b22a502ab9312121ef1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index a5305526b1..ec78e7c84a 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 55644b3e7b09f0ae14ccbe55b569b5add782b72fb973e1545414f17c2613a4a8 kodi-pvr-njoy-19.0.0-Matrix.tar.gz +sha256 e5a6d31d1a74d8c053919f1c3c73eb9ada1e799d99f61dca171c3d8f0afa0a03 kodi-pvr-njoy-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index f6cee1bbb0..4808974c31 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 19.0.0-Matrix +KODI_PVR_NJOY_VERSION = 19.0.1-Matrix KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ KODI_PVR_NJOY_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:26 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-pctv: bump version to 19.0.1-Matrix Message-ID: <20220103090129.674A882D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24d3ed0e9fb91063edc12a96e617795fdaad9ab7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 8946250980..04919af7d2 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 004d9f8801e9c5d2d76c0c84d0844c4560ede7e2ed02c4c43286991a54d720c9 kodi-pvr-pctv-19.0.0-Matrix.tar.gz +sha256 cd267a5b9e98b3b1b1c00feac16e2a07962641cbe53ff4c05ccb72acd925e3f8 kodi-pvr-pctv-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 61557eb301..6f8dca4b23 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 19.0.0-Matrix +KODI_PVR_PCTV_VERSION = 19.0.1-Matrix KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:31 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-vdr-vnsi: bump version to 19.0.1-Matrix Message-ID: <20220103090129.7AB2E82D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c1cede383f616fa1472c261f271323e8cc610f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 6759dfc5f5..c6223fc8e4 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab7ba632438d12001cb1e10c2ccb75816be9a9181ec2fdb739bd8eb2f173cf7f kodi-pvr-vdr-vnsi-19.0.0-Matrix.tar.gz +sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 51a22d6cb5..b281f00f19 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.0-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:04:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:04:38 +0100 Subject: [Buildroot] [git commit] package/kodi-visualisation-fishbmc: bump version to 19.0.1-Matrix Message-ID: <20220103090129.9AC8382D86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4698bada4e613ea144275800a7bdfd3dc01334f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash | 2 +- package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index c595b0ba1b..449b2a4817 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8cb7793f29b3c3d097a5348831347af8fbed1e4ef44d37d9faeff83ff22a830 kodi-visualisation-fishbmc-19.0.0-Matrix.tar.gz +sha256 3023e6cf739985c31ff9a6cd2a217909563b9817de5c1047aab8d9928a00cfd9 kodi-visualisation-fishbmc-19.0.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index 8e0fcabff9..060e1d9b69 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 19.0.0-Matrix +KODI_VISUALISATION_FISHBMC_VERSION = 19.0.1-Matrix KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ KODI_VISUALISATION_FISHBMC_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Mon Jan 3 09:07:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:07:32 +0100 Subject: [Buildroot] [PATCH 01/19] package/kodi-audiodecoder-modplug: bump version to 19.0.2-Matrix In-Reply-To: <20220102191025.259154-1-bernd.kuhls@t-online.de> References: <20220102191025.259154-1-bernd.kuhls@t-online.de> Message-ID: <20220103090732.GE69135@scaer> Bernd, All, On 2022-01-02 20:10 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls Whole series of 19 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- > package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash > index 7bab017241..e2bfe09928 100644 > --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash > +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4c422cacf456ab9eda5e2836d2789c3756bfbae03265a01647dd8f935261d9ec kodi-audiodecoder-modplug-19.0.1-Matrix.tar.gz > +sha256 6e1b1910e799ea8c5ab11428084feb8f6a0a9b1b0d4b5760033545fe765a59e9 kodi-audiodecoder-modplug-19.0.2-Matrix.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk > index 9b2cf98dbc..f5736e7db7 100644 > --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk > +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.1-Matrix > +KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.2-Matrix > KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) > KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ > KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 09:16:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:16:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220102200337.3271548-1-fontaine.fabrice@gmail.com> References: <20220102200337.3271548-1-fontaine.fabrice@gmail.com> Message-ID: <20220103091657.GF69135@scaer> Fabrice, All, On 2022-01-02 21:03 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 5.41 in > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > readelf.c: In function 'do_auxv_note': > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc The error above explicitly states that C99 should be used to build those files. C99 is supposedly complete in gcc 4.8, but was not the default, hence the error. And it seems that using C99 is what we attempted in da400ee5e1e (file: bump to version 5.26), which added the following line: FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' So, why are those files not built with C99? Ha, because this is the host variant... We should also use -std=gnu99 for the host variant. Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > .../file/0001-fix-build-with-gcc-4.8.patch | 97 +++++++++++++++++++ > 1 file changed, 97 insertions(+) > create mode 100644 package/file/0001-fix-build-with-gcc-4.8.patch > > diff --git a/package/file/0001-fix-build-with-gcc-4.8.patch b/package/file/0001-fix-build-with-gcc-4.8.patch > new file mode 100644 > index 0000000000..2494c6a7c0 > --- /dev/null > +++ b/package/file/0001-fix-build-with-gcc-4.8.patch > @@ -0,0 +1,97 @@ > +From e36455301a3757618381cb83bf17115dd386131e Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 2 Jan 2022 20:41:31 +0100 > +Subject: [PATCH] fix build with gcc 4.8 > + > +Fix the following build failure with gcc 4.8 > + > +readelf.c: In function 'do_auxv_note': > +readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > + for (size_t off = 0; off + elsize <= descsz; off += elsize) { > + ^ > + > +funcs.c:93:2: error: 'for' loop initial declarations are only allowed in C99 mode > + for (const char *p = fmt; *p; p++) { > + ^ > + > +Fixes: > + - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://bugs.astron.com/view.php?id=307] > +--- > + src/der.c | 6 ++++-- > + src/funcs.c | 3 ++- > + src/readelf.c | 4 ++-- > + 3 files changed, 8 insertions(+), 5 deletions(-) > + > +diff --git a/src/der.c b/src/der.c > +index 4bee9f16..23b9a574 100644 > +--- a/src/der.c > ++++ b/src/der.c > +@@ -235,6 +235,7 @@ der_tag(char *buf, size_t len, uint32_t tag) > + static int > + der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) > + { > ++ uint32_t i; > + const uint8_t *d = CAST(const uint8_t *, q); > + switch (tag) { > + case DER_TAG_PRINTABLE_STRING: > +@@ -251,7 +252,7 @@ der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) > + break; > + } > + > +- for (uint32_t i = 0; i < len; i++) { > ++ for (i = 0; i < len; i++) { > + uint32_t z = i << 1; > + if (z < blen - 2) > + snprintf(buf + z, blen - z, "%.2x", d[i]); > +@@ -283,7 +284,8 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes) > + offs += ms->offset + m->offset; > + DPRINTF(("cont_level = %d\n", m->cont_level)); > + #ifdef DEBUG_DER > +- for (size_t i = 0; i < m->cont_level; i++) > ++ size_t i; > ++ for (i = 0; i < m->cont_level; i++) > + printf("cont_level[%" SIZE_T_FORMAT "u] = %u\n", i, > + ms->c.li[i].off); > + #endif > +diff --git a/src/funcs.c b/src/funcs.c > +index d968873d..08b565fb 100644 > +--- a/src/funcs.c > ++++ b/src/funcs.c > +@@ -90,7 +90,8 @@ file_checkfield(char *msg, size_t mlen, const char *what, const char **pp) > + protected int > + file_checkfmt(char *msg, size_t mlen, const char *fmt) > + { > +- for (const char *p = fmt; *p; p++) { > ++ const char *p; > ++ for (p = fmt; *p; p++) { > + if (*p != '%') > + continue; > + if (*++p == '%') > +diff --git a/src/readelf.c b/src/readelf.c > +index 01c60fe9..46421a2e 100644 > +--- a/src/readelf.c > ++++ b/src/readelf.c > +@@ -1015,7 +1015,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, > + size_t elsize = xauxv_sizeof; > + const char *tag; > + int is_string; > +- size_t nval; > ++ size_t nval, off; > + > + if ((*flags & (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) != > + (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) > +@@ -1043,7 +1043,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, > + *flags |= FLAGS_DID_AUXV; > + > + nval = 0; > +- for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ++ for (off = 0; off + elsize <= descsz; off += elsize) { > + memcpy(xauxv_addr, &nbuf[doff + off], xauxv_sizeof); > + /* Limit processing to 50 vector entries to prevent DoS */ > + if (nval++ >= 50) { > +-- > +2.33.0 > + > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 09:20:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:20:06 +0100 Subject: [Buildroot] [git commit] package/libsigrokdecode: fix build with python 3.10 Message-ID: <20220103091418.2CAFC82AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=779501290f7205de2dcb7a7eadff9e456b0e2d3e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with sigrok-cli raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-none-linux-gnu/10.3.1/../../../../aarch64-none-linux-gnu/bin/ld: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/e2f33366803b18aff29086007610fa0a264f90d6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0002-configure-Add-python-3-10-support.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch new file mode 100644 index 0000000000..53acb65944 --- /dev/null +++ b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch @@ -0,0 +1,28 @@ +From c4c10b89396fe21a622b8c38dd5815a496b007bf Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Mon, 20 Dec 2021 19:36:39 +0100 +Subject: [PATCH] configure: Add python 3.10 support + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff;h=c4c10b89396fe21a622b8c38dd5815a496b007bf +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2917cb3..b8841f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.24.0.rc2 + From yann.morin.1998 at free.fr Mon Jan 3 09:21:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 10:21:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrokdecode: fix build with python 3.10 In-Reply-To: <20220102191027.3219775-1-fontaine.fabrice@gmail.com> References: <20220102191027.3219775-1-fontaine.fabrice@gmail.com> Message-ID: <20220103092108.GG69135@scaer> Fabrice, All, On 2022-01-02 20:10 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure with sigrok-cli raised since bump of > python3 to version 3.10.1 in commit > 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-none-linux-gnu/10.3.1/../../../../aarch64-none-linux-gnu/bin/ld: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' > > Fixes: > - http://autobuild.buildroot.org/results/e2f33366803b18aff29086007610fa0a264f90d6 > > Signed-off-by: Fabrice Fontaine > --- > ...02-configure-Add-python-3-10-support.patch | 28 +++++++++++++++++++ > 1 file changed, 28 insertions(+) > create mode 100644 package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch > > diff --git a/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch > new file mode 100644 > index 0000000000..e3148dcde8 > --- /dev/null > +++ b/package/libsigrokdecode/0002-configure-Add-python-3-10-support.patch > @@ -0,0 +1,28 @@ > +From c4c10b89396fe21a622b8c38dd5815a496b007bf Mon Sep 17 00:00:00 2001 > +From: Soeren Apel > +Date: Mon, 20 Dec 2021 19:36:39 +0100 > +Subject: [PATCH] configure: Add python 3.10 support > + > +[Retrieved from: > +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=c4c10b89396fe21a622b8c38dd5815a496b007bf] I've changed that to point to the commit-diff (not just the commit log), and applied to master, thanks. Regards, Yann E. MORIN. > +Signed-off-by: Fabrice Fontaine > +--- > + configure.ac | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index 2917cb3..b8841f8 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) > + # first, since usually only that variant will add "-lpython3.8". > + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build > + SR_PKG_CHECK([python3], [SRD_PKGLIBS], > +- [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) > ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) > + AS_IF([test "x$sr_have_python3" = xno], > + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) > + > +-- > +2.24.0.rc2 > + > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fperrad at gmail.com Mon Jan 3 10:43:43 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 3 Jan 2022 11:43:43 +0100 Subject: [Buildroot] [PATCH] package/ethtool: bump to version 5.15 Message-ID: <20220103104343.15975-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 536579670..59c657e86 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 ethtool-5.12.tar.xz +sha256 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d ethtool-5.15.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index f3e950f21..c4bb9bdd9 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.12 +ETHTOOL_VERSION = 5.15 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 -- 2.32.0 From fperrad at gmail.com Mon Jan 3 10:43:55 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 3 Jan 2022 11:43:55 +0100 Subject: [Buildroot] [PATCH] package/spi-tools: bump to version 1.0.1 Message-ID: <20220103104355.16030-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/spi-tools/spi-tools.hash | 2 +- package/spi-tools/spi-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash index a1ef4c2b9..1595cd3d2 100644 --- a/package/spi-tools/spi-tools.hash +++ b/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 5eb24670461dcf2c58471114dc69b5204dab1c0cc5053878f6de79503bd8cc9f spi-tools-1.0.0.tar.gz +sha256 81bb9f7218123f86c3644d92ad2c427343758df2143ee5da38e6f743f18714fd spi-tools-1.0.1.tar.gz sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk index 26d0dcf54..d623babf4 100644 --- a/package/spi-tools/spi-tools.mk +++ b/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 1.0.0 +SPI_TOOLS_VERSION = 1.0.1 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES -- 2.32.0 From fperrad at gmail.com Mon Jan 3 10:44:07 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 3 Jan 2022 11:44:07 +0100 Subject: [Buildroot] [PATCH] package/sqlite: bump to version 3.37.1 Message-ID: <20220103104407.16085-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- 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 94f0127d1..604275ebf 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7 sqlite-autoconf-3370000.tar.gz +sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index be060c311..59b76ce16 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.0 -SQLITE_TAR_VERSION = 3370000 +SQLITE_VERSION = 3.37.1 +SQLITE_TAR_VERSION = 3370100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2021 SQLITE_LICENSE = Public domain -- 2.32.0 From paul at crapouillou.net Mon Jan 3 10:52:53 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Mon, 03 Jan 2022 10:52:53 +0000 Subject: [Buildroot] [PATCH 1/1] package/libiio: set PYTHON_EXECUTABLE In-Reply-To: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> References: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> Message-ID: <5KR45R.7T4EYI3OTWEG1@crapouillou.net> Hi Fabrice, Le dim., janv. 2 2022 at 18:43:29 +0100, Fabrice Fontaine a ?crit : > Set PYTHON_EXECUTABLE to avoid the following build failure when > BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without > setuptools on host: > > -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found > components: Interpreter > -- new > -- Python_EXECUTABLE /usr/bin/python3.5 > > [...] > > Traceback (most recent call last): > File > "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", > line 15, in > from setuptools import setup > ImportError: No module named 'setuptools' > > Fixes: > - > http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 > > Signed-off-by: Fabrice Fontaine Acked-by: Paul Cercueil Cheers, -Paul > --- > package/libiio/libiio.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk > index f706298c22..38b2f83e6e 100644 > --- a/package/libiio/libiio.mk > +++ b/package/libiio/libiio.mk > @@ -76,8 +76,10 @@ endif > ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) > ifeq ($(BR2_PACKAGE_PYTHON),y) > LIBIIO_DEPENDENCIES += host-python-setuptools python > +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python > else ifeq ($(BR2_PACKAGE_PYTHON3),y) > LIBIIO_DEPENDENCIES += host-python3-setuptools python3 > +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 > endif > LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON > else > -- > 2.33.0 > From andreynech at gmail.com Mon Jan 3 11:29:11 2022 From: andreynech at gmail.com (Andrey Nechypurenko) Date: Mon, 3 Jan 2022 12:29:11 +0100 Subject: [Buildroot] [PATCH 1/1] support/scripts/: remove -E flag from patch call In-Reply-To: <20211230214722.GJ3390456@scaer> References: <20211214125510.13654-1-andreynech@gmail.com> <20211230214722.GJ3390456@scaer> Message-ID: Hi Yann, >> -E flag instructs patch to remove empty files. However, in some cases >> empty files are essential. If they are missing, build could be broken >> or other bad things can happen. > > Do you have an example of a publicly accessible package that has this > issue? No I have not. In my case this is not a mainlined driver for the touch controller provided by the display manufacturer. > So we have an antagonist situation: some patches will want to rem ove > files, and some patches will want to not remove files. We can't satisfy > both, obviously. > > So, unfortunately, it is not possible to apply your patch. I understand your concern. So it sounds like a need for configurability here. > Unless someone comes up with a better idea... Not sure if it is a good idea, but maybe the problem could be solved using series files? Currently, there is already -p1 parameter which could be specified in the series files. Brief look at the relevant part of the apply-patches.sh reveals that it is ignored :-) but it could be changed. After that, the script can walk through patch directories where patches with +++ /dev/null are found, generate or update series files to use the -E flag together with -p1. This solution would not break existing packages and provide flexibility for the new packages where developers can decide whether to add -E (or maybe some other flags) to patch invocation using series files. What do you think about it? Best regards, Andrey. From thomas.petazzoni at bootlin.com Mon Jan 3 15:23:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 3 Jan 2022 16:23:41 +0100 Subject: [Buildroot] [RFC v1] package/assimp: fix namespace related compile failure In-Reply-To: <20211231091800.629b2ad3@gmx.net> References: <20211230172507.30212-1-ps.report@gmx.net> <20211230211120.031434c7@windsurf> <20211231091800.629b2ad3@gmx.net> Message-ID: <20220103162341.2c6f2a55@windsurf> Hello Peter, On Fri, 31 Dec 2021 09:18:00 +0100 Peter Seiderer wrote: > Same failure today (see [1]) with: > > $ ./host/bin/mips-linux-gnu-g++ --version > mips-linux-gnu-g++ (Sourcery CodeBench Lite 2016.05-8) 5.3.0 > > And merge request accepted upstream, see [2]... Thanks for the ping on this. In the mean time, Yann merged the patch, so we're good! Thanks a lot, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 3 15:25:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 3 Jan 2022 16:25:20 +0100 Subject: [Buildroot] [PATCH v5 05/10] board: Add Sipeed MAIX-bit support In-Reply-To: References: <20211026071728.954356-1-damien.lemoal@wdc.com> <20211026071728.954356-6-damien.lemoal@wdc.com> <20211230212742.030be8c5@windsurf> Message-ID: <20220103162520.07b40bf0@windsurf> Hello Damien, On Fri, 31 Dec 2021 00:39:14 +0000 Damien Le Moal wrote: > My apologies about the delay. I have been swamped with the kernel and other > projects. I kept at this a little though, mainly trying to address the elf2flt > issue which seems to generate unworkable binaries for Peter, while it is always > working for me... Really no clue what is going on so I am a little stuck with > that. I will work on updates addressing all of Peter's comments and see how > that work. No worries about the delay. I took advantage of the Christmas/New Year quiet period to help catch up with our patch backlog, and stumbled across your patch series, which is why I asked. I also saw the on-going discussion with Peter who had issues with non-working binaries produced by elf2flt. > > - The readme.txt file for each defconfig should be added in the patch > > adding the defconfig > > Hmm... It is the same procedure for all boards, only the defconfig name > differs. Hence I added this README file last with all board defconfigs > mentioned. I can add the README file with the first board and update it with > each patch adding a board ? Yes, that would work: add the README file with the first board, and update it progressively for each board. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From florent.aumaitre at medianesysteme.com Mon Jan 3 16:36:53 2022 From: florent.aumaitre at medianesysteme.com (Florent AUMAITRE) Date: Mon, 3 Jan 2022 16:36:53 +0000 Subject: [Buildroot] [PATCH 1/1] package/qt5: fix parallel build qmake package (qt5) doesn't build when using parallel build. In-Reply-To: <20211226235013.22faad2e@windsurf> References: <20211214075133.4482-1-florent.aumaitre@medianesysteme.com> <20211215232839.22ae07a9@gmx.net> <20211226235013.22faad2e@windsurf> Message-ID: Hello Thomas, > -----Message d'origine----- > De?: Thomas Petazzoni > Envoy??: dimanche 26 d?cembre 2021 23:50 > ??: Florent AUMAITRE > Cc?: Peter Seiderer ; Julien Corjon > ; Naumann Andreas > ; buildroot at buildroot.org > Objet?: Re: [Buildroot] [PATCH 1/1] package/qt5: fix parallel build qmake > package (qt5) doesn't build when using parallel build. > > Hello Florent, > > On Thu, 16 Dec 2021 09:25:19 +0000 > Florent AUMAITRE wrote: > > > > Which failure? Does it happen with per-package enabled or without > > > (would like to avoid the forced MAKE1 for all qt packages install) > > > too? In case it happens with per-package disabled it should go to an extra > patch... > > > > I observe a race condition with some install target > > 2021-11-04T12:43:36 Makefile:886: recipe for target > > 'install_do_install_qmltypes' failed > > 2021-11-04T12:43:36 Makefile:400: recipe for target > > 'sub-wavefrontmesh-install_subtargets' failed > > 2021-11-04T12:43:36 make[4]: *** > > [sub-wavefrontmesh-install_subtargets] Error 2 > > 2021-11-04T12:43:36 make[4]: *** Waiting for unfinished jobs... > > > > Qt5declarative generated makefile (qt5declarative- > 5.15.2/src/imports/wavefrontmesh/Makefile) install twice > /usr/qml/Qt/labs/wavefrontmesh/plugins.qmltypes in target install_qmlfiles > and install_do_install_qmltypes. > > Could you specify whether this happens with > BR2_PER_PACKAGE_DIRECTORIES enabled or disabled? Also, do you have an > example Buildroot configuration that exhibits this problem? This appended with BR2_PER_PACKAGE_DIRECTORIES enabled. This problem is random so I didn't have a configuration that exhibits the problem all times. For info we build on a machine with 36 cores (Intel(R) Core(TM) i9-10980XE CPU @ 3.00GHz). I think http://autobuild.buildroot.net/results/d0c/d0c43084edd4de1221d93dfdfa15dfdeae16ceeb/build-end.log is the same problem. > > According to http://autobuild.buildroot.net/?reason=qt5declarative% > there are only 3 "recent" failures of qt5declarative-5.15.2 and they are not > what you're pointing. > We unfortunately can't "blindly" apply a workaround for a problem that isn't > "visible". > > However, your commit seems to mix up the $(MAKE) -> $(MAKE1) change > with those PKG_QMAKE_FIXUP_ABSOLUTE_PATH and > QT5BASE_CMAKECONFIG_FIXUP macros which are not explained in the > commit log. Could you give more details? Some part of the patch is for issue with linker like in http://autobuild.buildroot.net/results/8eb/8ebf6f8024ba32883e5c34c1c1c69de77246a7c3/build-end.log Sysroot path : --sysroot=/tmp/instance-0/output-1/per-package/qt5declarative/host/arm-buildroot-linux-gnueabihf/sysroot And Library search path : -L/tmp/instance-0/output-1/per-package/qt5base/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib Are not with the same prefix path so linker didn't find system library. So I add PKG_QMAKE_FIXUP_ABSOLUTE_PATH and QT5BASE_CMAKECONFIG_FIXUP to fix this. > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel > engineering and training https://bootlin.com Best Regards Florent From florent.aumaitre at medianesysteme.com Mon Jan 3 16:54:51 2022 From: florent.aumaitre at medianesysteme.com (Florent AUMAITRE) Date: Mon, 3 Jan 2022 17:54:51 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-pyqt5: Fix parallel build Message-ID: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> This patch fix build of python-pyqt5 package when parallel build is used Signed-off-by: Florent AUMAITRE Changes v1 -> v2: - Re-use the existing QT5_INSTALL_QT_CONF macro from package/qt5/qt5.mk (suggested by Thomas Petazzoni) Signed-off-by: Florent AUMAITRE --- package/python-pyqt5/python-pyqt5.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 8f28c90d15..b05043563e 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL ) endef +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP + PYTHON_PYQT5_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ -- 2.17.1 From arnout at mind.be Mon Jan 3 17:11:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 3 Jan 2022 18:11:49 +0100 Subject: [Buildroot] [PATCH 1/1] support/scripts/: remove -E flag from patch call In-Reply-To: <20211230214722.GJ3390456@scaer> References: <20211214125510.13654-1-andreynech@gmail.com> <20211230214722.GJ3390456@scaer> Message-ID: <63439c64-530d-4d2f-67e5-91a854501a5c@mind.be> On 30/12/2021 22:47, Yann E. MORIN wrote: > Andrey, All, > > On 2021-12-14 13:55 +0100, Andrey Nechypurenko spake thusly: >> -E flag instructs patch to remove empty files. However, in some cases >> empty files are essential. If they are missing, build could be broken >> or other bad things can happen. > > Do you have an example of a publicly accessible package that has this > issue? > >> Signed-off-by: Andrey Nechypurenko > > I was going to apply this, but then I was wondering; what about patches > that actually *want* to remove files? > > It turns out that we do have a few patches that remove files: > > $ git grep -E '\+\+\+ /dev/null' > board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch:+++ /dev/null > board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch:+++ /dev/null > board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch:+++ /dev/null > boot/grub2/0033-verifiers-Move-verifiers-API-to-kernel-image.patch:+++ /dev/null > boot/grub2/0034-efi-Move-the-shim_lock-verifier-to-the-GRUB-core.patch:+++ /dev/null > boot/lpc32xxcdl/0002-delete_redundant_files.patch:+++ /dev/null2012-01-01 16:39:47.918907000 +0100 > boot/lpc32xxcdl/0002-delete_redundant_files.patch:+++ /dev/null2012-01-01 16:39:47.918907000 +0100 > package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch:+++ /dev/null > package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch:+++ /dev/null > package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch:+++ /dev/null > package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch:+++ /dev/null Have you actually tested this? With modern patch, the /dev/null indicates exactly what we want: that the file must be removed. So even without -E, the file gets removed. What -E does is remove a file in the following case: --- a/foo +++ a/foo @@ -1,1 +0,0 @@ - foo git grep -B1 '+0,0 @@' only yields /dev/null cases, so I think it's OK. So I think the only real concern is: will a patch version that supports renames always behave like this? I *think* the answer is yes, but it's hard to be sure of course. Regards, Arnout > package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch:+++ /dev/null > package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch:+++ /dev/null > package/gcc/9.4.0/0003-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch:+++ /dev/null > package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch:+++ /dev/null > package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch:+++ /dev/null > package/screen/0005-rename-sched_h.patch:+++ /dev/null > > While a few of them could be rewriten so that the are actual renames > (now that we require a patch version that supports renames), some really > do want to remove files; that's notably the case with the uboot patch > for the roseapplepi board, or the babeltrace2 patch, as well as the gcc > patches... > > Furthermore, some users may have alaready relied on this behaviour, that > empty files get removed, for their packages in theor br2-external > trees... > > So we have an antagonist situation: some patches will want to rem ove > files, and some patches will want to not remove files. We can't satisfy > both, obviously. > > So, unfortunately, it is not possible to apply your patch. > > If your package really requires that the files be present and empty, you > should then use a post-patch hook to touch those files. > > Unless someone comes up with a better idea... > > Regards, > Yann E. MORIN. > >> --- >> support/scripts/apply-patches.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh >> index e5a2fdd09e..6da83f6826 100755 >> --- a/support/scripts/apply-patches.sh >> +++ b/support/scripts/apply-patches.sh >> @@ -114,7 +114,7 @@ function apply_patch { >> exit 1 >> fi >> echo "${path}/${patch}" >> ${builddir}/.applied_patches_list >> - ${uncomp} "${path}/$patch" | patch -g0 -p1 -E --no-backup-if-mismatch -d "${builddir}" -t -N $silent >> + ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent >> if [ $? != 0 ] ; then >> echo "Patch failed! Please fix ${patch}!" >> exit 1 >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From clg at kaod.org Mon Jan 3 16:58:05 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 3 Jan 2022 17:58:05 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 Message-ID: <20220103165805.3697636-1-clg@kaod.org> Remove uclibc workaround which was deprecated by upstream : commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") Remove upstream patches : commit 304332039014 ("block/export/fuse.c: fix musl build") commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") Signed-off-by: C?dric Le Goater --- ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 5 files changed, 2 insertions(+), 130 deletions(-) delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch deleted file mode 100644 index 6db4e8bc923e..000000000000 --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 5 May 2017 09:07:15 +0200 -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc - -user-exec.c has some conditional code to decide how to use the -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path -gets used, which doesn't apply to uClibc. - -Fix this by excluding __UCLIBC__, which ensures we fall back to the -general case of using uc_mcontext.arm_pc, which works fine with -uClibc. - -Signed-off-by: Thomas Petazzoni ---- - accel/tcg/user-exec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c -index 4ebe25461a..0496674fbd 100644 ---- a/accel/tcg/user-exec.c -+++ b/accel/tcg/user-exec.c -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, - - #if defined(__NetBSD__) - pc = uc->uc_mcontext.__gregs[_REG_R15]; --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) - pc = uc->uc_mcontext.gregs[R15]; - #else - pc = uc->uc_mcontext.arm_pc; --- -2.25.3 - diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch deleted file mode 100644 index 50762055bf18..000000000000 --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 23:40:01 +0200 -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl - -Include linux/fs.h to avoid the following build failure on uclibc or -musl raised since version 6.0.0: - -../block/export/fuse.c: In function 'fuse_lseek': -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ - | SEEK_SET - -Fixes: - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] ---- - block/export/fuse.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index fc7b07d2b5..2e3bf8270b 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,9 @@ - #include - #include - -+#ifdef __linux__ -+#include -+#endif - - /* Prevent overly long bounce buffer allocations */ - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) --- -2.32.0 - diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch deleted file mode 100644 index 4856821843fc..000000000000 --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 11:52:09 +0200 -Subject: [PATCH] block/export/fuse.c: fix musl build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb -and avoid the following build failure on musl: - -../block/export/fuse.c: In function 'fuse_fallocate': -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b - -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") -Signed-off-by: Fabrice Fontaine -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> -Reviewed-by: Philippe Mathieu-Daud? -Signed-off-by: Kevin Wolf -[Retrieved from: -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] ---- - block/export/fuse.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index 2e3bf8270b..823c126d23 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,10 @@ - #include - #include - -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) -+#include -+#endif -+ - #ifdef __linux__ - #include - #endif --- -GitLab - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 0613fce49367..9411832384ba 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 919aef6599f1..97f9f885a18a 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 6.1.0 +QEMU_VERSION = 6.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c -- 2.31.1 From yann.morin.1998 at free.fr Mon Jan 3 19:49:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 20:49:52 +0100 Subject: [Buildroot] [git commit] package/qemu: bump to version 6.2.0 Message-ID: <20220103200326.8277D82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85c7bd0602715dc6a148cc79db8910dca27c4e76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove uclibc workaround which was deprecated by upstream : commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") Remove upstream patches : commit 304332039014 ("block/export/fuse.c: fix musl build") commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") Signed-off-by: C??dric Le Goater Signed-off-by: Yann E. MORIN --- ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 35 ---------------- ...t-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ------------------- .../0004-block-export-fuse.c-fix-musl-build.patch | 49 ---------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 5 files changed, 2 insertions(+), 130 deletions(-) diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch deleted file mode 100644 index 6db4e8bc92..0000000000 --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 5 May 2017 09:07:15 +0200 -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc - -user-exec.c has some conditional code to decide how to use the -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path -gets used, which doesn't apply to uClibc. - -Fix this by excluding __UCLIBC__, which ensures we fall back to the -general case of using uc_mcontext.arm_pc, which works fine with -uClibc. - -Signed-off-by: Thomas Petazzoni ---- - accel/tcg/user-exec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c -index 4ebe25461a..0496674fbd 100644 ---- a/accel/tcg/user-exec.c -+++ b/accel/tcg/user-exec.c -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, - - #if defined(__NetBSD__) - pc = uc->uc_mcontext.__gregs[_REG_R15]; --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) - pc = uc->uc_mcontext.gregs[R15]; - #else - pc = uc->uc_mcontext.arm_pc; --- -2.25.3 - diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch deleted file mode 100644 index 50762055bf..0000000000 --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 23:40:01 +0200 -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl - -Include linux/fs.h to avoid the following build failure on uclibc or -musl raised since version 6.0.0: - -../block/export/fuse.c: In function 'fuse_lseek': -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ - | SEEK_SET - -Fixes: - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] ---- - block/export/fuse.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index fc7b07d2b5..2e3bf8270b 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,9 @@ - #include - #include - -+#ifdef __linux__ -+#include -+#endif - - /* Prevent overly long bounce buffer allocations */ - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) --- -2.32.0 - diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch deleted file mode 100644 index 4856821843..0000000000 --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 11:52:09 +0200 -Subject: [PATCH] block/export/fuse.c: fix musl build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb -and avoid the following build failure on musl: - -../block/export/fuse.c: In function 'fuse_fallocate': -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b - -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") -Signed-off-by: Fabrice Fontaine -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> -Reviewed-by: Philippe Mathieu-Daud?? -Signed-off-by: Kevin Wolf -[Retrieved from: -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] ---- - block/export/fuse.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index 2e3bf8270b..823c126d23 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,10 @@ - #include - #include - -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) -+#include -+#endif -+ - #ifdef __linux__ - #include - #endif --- -GitLab - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 0613fce493..9411832384 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 919aef6599..97f9f885a1 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 6.1.0 +QEMU_VERSION = 6.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c From yann.morin.1998 at free.fr Mon Jan 3 20:10:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:10:19 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <20220103165805.3697636-1-clg@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> Message-ID: <20220103201019.GH69135@scaer> C?dric, All, On 2022-01-03 17:58 +0100, C?dric Le Goater spake thusly: > Remove uclibc workaround which was deprecated by upstream : > commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") > > Remove upstream patches : > commit 304332039014 ("block/export/fuse.c: fix musl build") > commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") > > Signed-off-by: C?dric Le Goater Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- > ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- > ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- > package/qemu/qemu.hash | 2 +- > package/qemu/qemu.mk | 2 +- > 5 files changed, 2 insertions(+), 130 deletions(-) > delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > > diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > deleted file mode 100644 > index 6db4e8bc923e..000000000000 > --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Fri, 5 May 2017 09:07:15 +0200 > -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc > - > -user-exec.c has some conditional code to decide how to use the > -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but > -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path > -gets used, which doesn't apply to uClibc. > - > -Fix this by excluding __UCLIBC__, which ensures we fall back to the > -general case of using uc_mcontext.arm_pc, which works fine with > -uClibc. > - > -Signed-off-by: Thomas Petazzoni > ---- > - accel/tcg/user-exec.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c > -index 4ebe25461a..0496674fbd 100644 > ---- a/accel/tcg/user-exec.c > -+++ b/accel/tcg/user-exec.c > -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, > - > - #if defined(__NetBSD__) > - pc = uc->uc_mcontext.__gregs[_REG_R15]; > --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > - pc = uc->uc_mcontext.gregs[R15]; > - #else > - pc = uc->uc_mcontext.arm_pc; > --- > -2.25.3 > - > diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > deleted file mode 100644 > index 50762055bf18..000000000000 > --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 27 Aug 2021 23:40:01 +0200 > -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl > - > -Include linux/fs.h to avoid the following build failure on uclibc or > -musl raised since version 6.0.0: > - > -../block/export/fuse.c: In function 'fuse_lseek': > -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in > -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > - | SEEK_SET > - > -Fixes: > - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] > ---- > - block/export/fuse.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index fc7b07d2b5..2e3bf8270b 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,9 @@ > - #include > - #include > - > -+#ifdef __linux__ > -+#include > -+#endif > - > - /* Prevent overly long bounce buffer allocations */ > - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) > --- > -2.32.0 > - > diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > deleted file mode 100644 > index 4856821843fc..000000000000 > --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 22 Oct 2021 11:52:09 +0200 > -Subject: [PATCH] block/export/fuse.c: fix musl build > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix > -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb > -and avoid the following build failure on musl: > - > -../block/export/fuse.c: In function 'fuse_fallocate': > -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) > - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { > - | ^~~~~~~~~~~~~~~~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b > - > -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") > -Signed-off-by: Fabrice Fontaine > -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> > -Reviewed-by: Philippe Mathieu-Daud? > -Signed-off-by: Kevin Wolf > -[Retrieved from: > -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] > ---- > - block/export/fuse.c | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index 2e3bf8270b..823c126d23 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,10 @@ > - #include > - #include > - > -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) > -+#include > -+#endif > -+ > - #ifdef __linux__ > - #include > - #endif > --- > -GitLab > - > diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash > index 0613fce49367..9411832384ba 100644 > --- a/package/qemu/qemu.hash > +++ b/package/qemu/qemu.hash > @@ -1,4 +1,4 @@ > # Locally computed, tarball verified with GPG signature > -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz > +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz > sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 919aef6599f1..97f9f885a18a 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QEMU_VERSION = 6.1.0 > +QEMU_VERSION = 6.2.0 > QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz > QEMU_SITE = http://download.qemu.org > QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 20:14:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:14:32 +0100 Subject: [Buildroot] [git commit] support/scripts/: remove -E flag from patch call Message-ID: <20220103201049.30C9F82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1368ce2331cc0303ea59b35093875989d0d2bf8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master -E flag instructs patch to remove empty files. However, in some cases empty files are essential. If they are missing, build could be broken or other bad things can happen. Note that empty files are still removed when their headers are properly formattedo: timestamp set to 1970-01-01T00:00:00Z, destination set to /dev/null. Signed-off-by: Andrey Nechypurenko Signed-off-by: Yann E. MORIN --- support/scripts/apply-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index e5a2fdd09e..6da83f6826 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -114,7 +114,7 @@ function apply_patch { exit 1 fi echo "${path}/${patch}" >> ${builddir}/.applied_patches_list - ${uncomp} "${path}/$patch" | patch -g0 -p1 -E --no-backup-if-mismatch -d "${builddir}" -t -N $silent + ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1 From yann.morin.1998 at free.fr Mon Jan 3 20:18:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:18:22 +0100 Subject: [Buildroot] [PATCH 1/1] support/scripts/: remove -E flag from patch call In-Reply-To: <63439c64-530d-4d2f-67e5-91a854501a5c@mind.be> References: <20211214125510.13654-1-andreynech@gmail.com> <20211230214722.GJ3390456@scaer> <63439c64-530d-4d2f-67e5-91a854501a5c@mind.be> Message-ID: <20220103201822.GI69135@scaer> Arnout, All, On 2022-01-03 18:11 +0100, Arnout Vandecappelle spake thusly: > On 30/12/2021 22:47, Yann E. MORIN wrote: > >On 2021-12-14 13:55 +0100, Andrey Nechypurenko spake thusly: > >>-E flag instructs patch to remove empty files. However, in some cases > >>empty files are essential. If they are missing, build could be broken > >>or other bad things can happen. [--SNIP--] > >I was going to apply this, but then I was wondering; what about patches > >that actually *want* to remove files? > >It turns out that we do have a few patches that remove files: > Have you actually tested this? With modern patch, the /dev/null indicates > exactly what we want: that the file must be removed. So even without -E, the > file gets removed. > > What -E does is remove a file in the following case: > > --- a/foo > +++ a/foo > @@ -1,1 +0,0 @@ > - foo Ah, yeah, I was a bit unsure... Now I tried, adn indeed it behaves as expected. > git grep -B1 '+0,0 @@' only yields /dev/null cases, so I think it's OK. > So I think the only real concern is: will a patch version that supports > renames always behave like this? I *think* the answer is yes, but it's hard > to be sure of course. OK, I'm sold on the idea, and I believe this is sane enough. Applied to master, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Mon Jan 3 20:19:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 21:19:50 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <20220103165805.3697636-1-clg@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> Message-ID: <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> Hi C?dric, All, Le 03/01/2022 ? 17:58, C?dric Le Goater a ?crit?: > Remove uclibc workaround which was deprecated by upstream : > commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") > > Remove upstream patches : > commit 304332039014 ("block/export/fuse.c: fix musl build") > commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") > > Signed-off-by: C?dric Le Goater I did a similar commit to test all qemu defconfig in gitlab-ci: https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 No problem detected so far, I was investigating why the s390x defconfig failed for me... It would be great if you can do a runtime test in gitlab and add the link in the commit log. > --- > ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- > ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- > ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- > package/qemu/qemu.hash | 2 +- > package/qemu/qemu.mk | 2 +- > 5 files changed, 2 insertions(+), 130 deletions(-) > delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > > diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > deleted file mode 100644 > index 6db4e8bc923e..000000000000 > --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Fri, 5 May 2017 09:07:15 +0200 > -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc > - > -user-exec.c has some conditional code to decide how to use the > -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but > -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path > -gets used, which doesn't apply to uClibc. > - > -Fix this by excluding __UCLIBC__, which ensures we fall back to the > -general case of using uc_mcontext.arm_pc, which works fine with > -uClibc. > - > -Signed-off-by: Thomas Petazzoni > ---- > - accel/tcg/user-exec.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c > -index 4ebe25461a..0496674fbd 100644 > ---- a/accel/tcg/user-exec.c > -+++ b/accel/tcg/user-exec.c > -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, > - > - #if defined(__NetBSD__) > - pc = uc->uc_mcontext.__gregs[_REG_R15]; > --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > - pc = uc->uc_mcontext.gregs[R15]; > - #else > - pc = uc->uc_mcontext.arm_pc; > --- > -2.25.3 > - > diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > deleted file mode 100644 > index 50762055bf18..000000000000 > --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 27 Aug 2021 23:40:01 +0200 > -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl > - > -Include linux/fs.h to avoid the following build failure on uclibc or > -musl raised since version 6.0.0: > - > -../block/export/fuse.c: In function 'fuse_lseek': > -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in > -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > - | SEEK_SET > - > -Fixes: > - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] > ---- > - block/export/fuse.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index fc7b07d2b5..2e3bf8270b 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,9 @@ > - #include > - #include > - > -+#ifdef __linux__ > -+#include > -+#endif > - > - /* Prevent overly long bounce buffer allocations */ > - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) > --- > -2.32.0 > - > diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > deleted file mode 100644 > index 4856821843fc..000000000000 > --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 22 Oct 2021 11:52:09 +0200 > -Subject: [PATCH] block/export/fuse.c: fix musl build > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix > -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb > -and avoid the following build failure on musl: > - > -../block/export/fuse.c: In function 'fuse_fallocate': > -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) > - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { > - | ^~~~~~~~~~~~~~~~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b > - > -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") > -Signed-off-by: Fabrice Fontaine > -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> > -Reviewed-by: Philippe Mathieu-Daud? > -Signed-off-by: Kevin Wolf > -[Retrieved from: > -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] > ---- > - block/export/fuse.c | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index 2e3bf8270b..823c126d23 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,10 @@ > - #include > - #include > - > -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) > -+#include > -+#endif > -+ > - #ifdef __linux__ > - #include > - #endif > --- > -GitLab > - > diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash > index 0613fce49367..9411832384ba 100644 > --- a/package/qemu/qemu.hash > +++ b/package/qemu/qemu.hash > @@ -1,4 +1,4 @@ > # Locally computed, tarball verified with GPG signature > -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz > +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz > sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 919aef6599f1..97f9f885a18a 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QEMU_VERSION = 6.1.0 > +QEMU_VERSION = 6.2.0 > QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz > QEMU_SITE = http://download.qemu.org > QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c > Please check qemu configure options while doing a version bump, there are a lot of new option added: https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e Best regards, Romain From yann.morin.1998 at free.fr Mon Jan 3 20:41:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:41:50 +0100 Subject: [Buildroot] [git commit] board/qemu/aarch64-sbsa: use partition-type-uuid for genimage-15 Message-ID: <20220103203632.64AE982A54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16d490d1117e1e7496fb6287a8b6d5c04b1712b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Genimage 15 restricted the partition-type option to mbr and hybrid partition-table-type and now prints a warning when it is used [1]: ERROR: hdimage(disk.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type [1] https://github.com/pengutronix/genimage/commit/1d72d8091f83790a0a35a1ea7dc25d46adba8876 Sync the genimage.cfg with the one used for aarch64_efi_defconfig Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717179 https://gitlab.com/buildroot.org/buildroot/-/jobs/1921792262 FTR, the magic UUID are from: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Signed-off-by: Romain Naour Cc: Dick Olsson Cc: Pierre-Jean Texier [yann.morin.1998 at free.fr: add Wikipedia link] Signed-off-by: Yann E. MORIN --- board/qemu/aarch64-sbsa/genimage.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index 121ae9f37b..bdf8a89d75 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -18,12 +18,14 @@ image disk.img { } partition boot { - partition-type = 0xEF image = "efi-part.vfat" + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32K + bootable = true } partition root { - partition-type = 0x83 + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae image = "rootfs.ext2" } } From yann.morin.1998 at free.fr Mon Jan 3 20:43:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:43:44 +0100 Subject: [Buildroot] [PATCH] board/qemu/aarch64-sbsa: use partition-type-uuid for genimage-15 In-Reply-To: <20220102165431.3551867-1-romain.naour@gmail.com> References: <20220102165431.3551867-1-romain.naour@gmail.com> Message-ID: <20220103204344.GJ69135@scaer> Romain, All, On 2022-01-02 17:54 +0100, Romain Naour spake thusly: > Genimage 15 restricted the partition-type option to mbr and hybrid > partition-table-type and now prints a warning when it is used [1]: > > ERROR: hdimage(disk.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type > > [1] https://github.com/pengutronix/genimage/commit/1d72d8091f83790a0a35a1ea7dc25d46adba8876 > > Sync the genimage.cfg with the one used for aarch64_efi_defconfig > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717179 > https://gitlab.com/buildroot.org/buildroot/-/jobs/1921792262 I've added a link to the Wikipedia page that lists the UUIDs: https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs > Signed-off-by: Romain Naour > Cc: Dick Olsson > Cc: Pierre-Jean Texier Applied to master, thanks. Regards, Yann E. MORIN. > --- > board/qemu/aarch64-sbsa/genimage.cfg | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg > index 121ae9f37b..bdf8a89d75 100644 > --- a/board/qemu/aarch64-sbsa/genimage.cfg > +++ b/board/qemu/aarch64-sbsa/genimage.cfg > @@ -18,12 +18,14 @@ image disk.img { > } > > partition boot { > - partition-type = 0xEF > image = "efi-part.vfat" > + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b > + offset = 32K > + bootable = true > } > > partition root { > - partition-type = 0x83 > + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae > image = "rootfs.ext2" > } > } > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Mon Jan 3 20:45:15 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 21:45:15 +0100 Subject: [Buildroot] [PATCH] board/qemu/aarch64-sbsa: use partition-type-uuid for genimage-15 In-Reply-To: <20220103204344.GJ69135@scaer> References: <20220102165431.3551867-1-romain.naour@gmail.com> <20220103204344.GJ69135@scaer> Message-ID: <85e542af-edfa-629f-3b6e-1afa7eb55c31@gmail.com> Hello Yann, Le 03/01/2022 ? 21:43, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-02 17:54 +0100, Romain Naour spake thusly: >> Genimage 15 restricted the partition-type option to mbr and hybrid >> partition-table-type and now prints a warning when it is used [1]: >> >> ERROR: hdimage(disk.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type >> >> [1] https://github.com/pengutronix/genimage/commit/1d72d8091f83790a0a35a1ea7dc25d46adba8876 >> >> Sync the genimage.cfg with the one used for aarch64_efi_defconfig >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1929717179 >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1921792262 > > I've added a link to the Wikipedia page that lists the UUIDs: > https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs Thanks, useful link! Best regards, Romain > >> Signed-off-by: Romain Naour >> Cc: Dick Olsson >> Cc: Pierre-Jean Texier > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > >> --- >> board/qemu/aarch64-sbsa/genimage.cfg | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg >> index 121ae9f37b..bdf8a89d75 100644 >> --- a/board/qemu/aarch64-sbsa/genimage.cfg >> +++ b/board/qemu/aarch64-sbsa/genimage.cfg >> @@ -18,12 +18,14 @@ image disk.img { >> } >> >> partition boot { >> - partition-type = 0xEF >> image = "efi-part.vfat" >> + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b >> + offset = 32K >> + bootable = true >> } >> >> partition root { >> - partition-type = 0x83 >> + partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae >> image = "rootfs.ext2" >> } >> } >> -- >> 2.31.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Mon Jan 3 20:44:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:44:27 +0100 Subject: [Buildroot] [git commit] package/ethtool: bump to version 5.15 Message-ID: <20220103203945.4F2E682BC4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e732d651758e4e974590b067b2992f4645fd301 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 536579670f..59c657e868 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 ethtool-5.12.tar.xz +sha256 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d ethtool-5.15.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index f3e950f212..c4bb9bdd90 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.12 +ETHTOOL_VERSION = 5.15 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From yann.morin.1998 at free.fr Mon Jan 3 20:44:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:44:29 +0100 Subject: [Buildroot] [git commit] package/spi-tools: bump to version 1.0.1 Message-ID: <20220103203945.585E881934@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=867b708ebdcf68f81bd07f91901d3ca12e94c9e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/spi-tools/spi-tools.hash | 2 +- package/spi-tools/spi-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash index a1ef4c2b9b..1595cd3d2c 100644 --- a/package/spi-tools/spi-tools.hash +++ b/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 5eb24670461dcf2c58471114dc69b5204dab1c0cc5053878f6de79503bd8cc9f spi-tools-1.0.0.tar.gz +sha256 81bb9f7218123f86c3644d92ad2c427343758df2143ee5da38e6f743f18714fd spi-tools-1.0.1.tar.gz sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk index 26d0dcf546..d623babf48 100644 --- a/package/spi-tools/spi-tools.mk +++ b/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 1.0.0 +SPI_TOOLS_VERSION = 1.0.1 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES From yann.morin.1998 at free.fr Mon Jan 3 20:44:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:44:32 +0100 Subject: [Buildroot] [git commit] package/sqlite: bump to version 3.37.1 Message-ID: <20220103203945.61DBF82DF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c37cf14c4cd8b4a9ede2ab4aaa39f01b2a1a2bff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- 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 94f0127d19..604275ebfb 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7 sqlite-autoconf-3370000.tar.gz +sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index be060c3117..59b76ce164 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.0 -SQLITE_TAR_VERSION = 3370000 +SQLITE_VERSION = 3.37.1 +SQLITE_TAR_VERSION = 3370100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2021 SQLITE_LICENSE = Public domain From yann.morin.1998 at free.fr Mon Jan 3 20:46:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:46:21 +0100 Subject: [Buildroot] [PATCH] package/ethtool: bump to version 5.15 In-Reply-To: <20220103104343.15975-1-francois.perrad@gadz.org> References: <20220103104343.15975-1-francois.perrad@gadz.org> Message-ID: <20220103204621.GK69135@scaer> Fran?ois, All, On 2022-01-03 11:43 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ethtool/ethtool.hash | 2 +- > package/ethtool/ethtool.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash > index 536579670..59c657e86 100644 > --- a/package/ethtool/ethtool.hash > +++ b/package/ethtool/ethtool.hash > @@ -1,5 +1,5 @@ > # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc > -sha256 f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 ethtool-5.12.tar.xz > +sha256 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d ethtool-5.15.tar.xz > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE > diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk > index f3e950f21..c4bb9bdd9 100644 > --- a/package/ethtool/ethtool.mk > +++ b/package/ethtool/ethtool.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ETHTOOL_VERSION = 5.12 > +ETHTOOL_VERSION = 5.15 > ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz > ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool > ETHTOOL_LICENSE = GPL-2.0 > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 20:46:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:46:35 +0100 Subject: [Buildroot] [PATCH] package/spi-tools: bump to version 1.0.1 In-Reply-To: <20220103104355.16030-1-francois.perrad@gadz.org> References: <20220103104355.16030-1-francois.perrad@gadz.org> Message-ID: <20220103204635.GL69135@scaer> Fran?ois, All, On 2022-01-03 11:43 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/spi-tools/spi-tools.hash | 2 +- > package/spi-tools/spi-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash > index a1ef4c2b9..1595cd3d2 100644 > --- a/package/spi-tools/spi-tools.hash > +++ b/package/spi-tools/spi-tools.hash > @@ -1,3 +1,3 @@ > # locally computed hash > -sha256 5eb24670461dcf2c58471114dc69b5204dab1c0cc5053878f6de79503bd8cc9f spi-tools-1.0.0.tar.gz > +sha256 81bb9f7218123f86c3644d92ad2c427343758df2143ee5da38e6f743f18714fd spi-tools-1.0.1.tar.gz > sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE > diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk > index 26d0dcf54..d623babf4 100644 > --- a/package/spi-tools/spi-tools.mk > +++ b/package/spi-tools/spi-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SPI_TOOLS_VERSION = 1.0.0 > +SPI_TOOLS_VERSION = 1.0.1 > SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) > # autoreconf must be run as specified in package documentation > SPI_TOOLS_AUTORECONF = YES > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 20:46:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:46:52 +0100 Subject: [Buildroot] [PATCH] package/sqlite: bump to version 3.37.1 In-Reply-To: <20220103104407.16085-1-francois.perrad@gadz.org> References: <20220103104407.16085-1-francois.perrad@gadz.org> Message-ID: <20220103204652.GM69135@scaer> Fran?ois, All, On 2022-01-03 11:44 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 94f0127d1..604275ebf 100644 > --- a/package/sqlite/sqlite.hash > +++ b/package/sqlite/sqlite.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7 sqlite-autoconf-3370000.tar.gz > +sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz > sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms > diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk > index be060c311..59b76ce16 100644 > --- a/package/sqlite/sqlite.mk > +++ b/package/sqlite/sqlite.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -SQLITE_VERSION = 3.37.0 > -SQLITE_TAR_VERSION = 3370000 > +SQLITE_VERSION = 3.37.1 > +SQLITE_TAR_VERSION = 3370100 > SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz > SQLITE_SITE = https://www.sqlite.org/2021 > SQLITE_LICENSE = Public domain > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 3 20:59:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 21:59:31 +0100 Subject: [Buildroot] [PATCH 1/3] utils/test-pkg: add support for externals In-Reply-To: <20211201230827.35080-1-matthew.weber@collins.com> References: <20211201230827.35080-1-matthew.weber@collins.com> Message-ID: <20220103205931.GN69135@scaer> Matthew, All, On 2021-12-01 17:08 -0600, Matthew Weber via buildroot spake thusly: > Add support to test-pkg to allow the usage br2-externals, so that > it may be leveraged for packages outside of upstream buildroot as well. Why is it even needed? Just pass BR2_EXTERNAL in the environment: BR2_EXTERNAL=/path/to/foo:/path/to/bar ./utils/test-pkg Maybe we should change the manual to state that BR2_EXTERNAL can be set in the environment as well, and the help for ./utils/test-pkg could also mention that. Oh, and by the way: we should not have added the -e option to support/kconfig/merge_config.sh either, because even in that case, BR2_EXTERNAL in the environment works as well. Regards, Yann E. MORIN. > Signed-off-by: Matthew Weber > --- > utils/test-pkg | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index 526b95b1fb..d0472f176b 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -3,6 +3,7 @@ set -e > > TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' > TEMP_CONF="" > +BR2_EXTERNALS="" > > do_clean() { > if [ ! -z "${TEMP_CONF}" ]; then > @@ -17,8 +18,8 @@ main() { > local -a toolchains > local pkg_br_name > > - o='hakc:d:n:p:r:t:' > - O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:' > + o='hakc:d:n:p:r:t:e:' > + O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,' > opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" > eval set -- "${opts}" > > @@ -61,6 +62,9 @@ main() { > (-t|--toolchains-csv) > toolchains_csv="${2}"; shift 2 > ;; > + (-e|--externals) > + BR2_EXTERNALS="${2}"; shift 2 > + ;; > (--) > shift; break > ;; > @@ -155,7 +159,7 @@ build_one() { > > mkdir -p "${dir}" > > - CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ > + CONFIG_= support/kconfig/merge_config.sh -e "${BR2_EXTERNALS}" -O "${dir}" \ > "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ > >> "${dir}/logfile" 2>&1 > # We want all the options from the snippet to be present as-is (set > @@ -181,7 +185,7 @@ build_one() { > fi > > if [ -n "${pkg}" ]; then > - if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then > + if ! make BR2_EXTERNAL="${BR2_EXTERNALS}" O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then > return 2 > fi > fi > @@ -193,14 +197,14 @@ build_one() { > > # legal-info done systematically, because some packages have different > # sources depending on the configuration (e.g. lua-5.2 vs. lua-5.3) > - if ! make O="${dir}" legal-info >> "${dir}/logfile" 2>&1; then > + if ! make BR2_EXTERNAL="${BR2_EXTERNALS}" O="${dir}" legal-info >> "${dir}/logfile" 2>&1; then > return 3 > fi > > # If we get here, the build was successful. Clean up the build/host > # directories to save disk space, unless 'keep' was set. > if [ ${keep} -ne 1 ]; then > - make O="${dir}" clean >> "${dir}/logfile" 2>&1 > + make BR2_EXTERNAL="${BR2_EXTERNALS}" O="${dir}" clean >> "${dir}/logfile" 2>&1 > fi > } > > @@ -271,6 +275,10 @@ Options: > Only prepare the .config files, but do not build them. Output the > list of build directories to stdout, and the status on stderr. > > + -e, --externals > + Externals to be used as part of the build process. Packages from > + within these externals may be tested. > + > Example: > > Testing libcec would require a config snippet that contains: > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Mon Jan 3 21:00:46 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:00:46 +0100 Subject: [Buildroot] [PATCH 1/3] package/qemu: reorder enable/disable options alphabetically Message-ID: <20220103210048.7879-1-romain.naour@gmail.com> Signed-off-by: Romain Naour --- package/qemu/qemu.mk | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 97f9f885a1..43450a6649 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -187,39 +187,39 @@ define QEMU_CONFIGURE_CMDS --audio-drv-list= \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ - --enable-kvm \ - --enable-attr \ - --enable-vhost-net \ --disable-bpf \ + --disable-brlapi \ --disable-bsd-user \ + --disable-cap-ng \ + --disable-capstone \ --disable-containers \ - --disable-xen \ - --disable-virtfs \ - --disable-brlapi \ - --disable-curses \ --disable-curl \ - --disable-vde \ - --disable-linux-aio \ - --disable-linux-io-uring \ - --disable-cap-ng \ + --disable-curses \ --disable-docs \ - --disable-rbd \ - --disable-libiscsi \ - --disable-strip \ - --disable-sparse \ - --disable-mpath \ - --disable-sanitizers \ --disable-hvf \ - --disable-whpx \ + --disable-libiscsi \ + --disable-libxml2 \ + --disable-linux-aio \ + --disable-linux-io-uring \ --disable-malloc-trim \ --disable-membarrier \ - --disable-vhost-crypto \ - --disable-libxml2 \ - --disable-capstone \ - --with-git-submodules=ignore \ + --disable-mpath \ --disable-opengl \ + --disable-rbd \ + --disable-sanitizers \ + --disable-sparse \ + --disable-strip \ + --disable-vde \ + --disable-vhost-crypto \ --disable-vhost-user-blk-server \ + --disable-virtfs \ --disable-virtiofsd \ + --disable-whpx \ + --disable-xen \ + --enable-attr \ + --enable-kvm \ + --enable-vhost-net \ + --with-git-submodules=ignore \ $(QEMU_OPTS) endef -- 2.31.1 From romain.naour at gmail.com Mon Jan 3 21:00:47 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:00:47 +0100 Subject: [Buildroot] [PATCH 2/3] package/qemu: Disable new configure options added by Qemu 2.6.0 In-Reply-To: <20220103210048.7879-1-romain.naour@gmail.com> References: <20220103210048.7879-1-romain.naour@gmail.com> Message-ID: <20220103210048.7879-2-romain.naour@gmail.com> Disable new configure options added by this release to avoid adding new dependencies or features. Signed-off-by: Romain Naour --- package/qemu/qemu.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 43450a6649..e69e813059 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -187,16 +187,20 @@ define QEMU_CONFIGURE_CMDS --audio-drv-list= \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ + --disable-alsa \ --disable-bpf \ --disable-brlapi \ --disable-bsd-user \ --disable-cap-ng \ --disable-capstone \ --disable-containers \ + --disable-coreaudio \ --disable-curl \ --disable-curses \ --disable-docs \ + --disable-dsound \ --disable-hvf \ + --disable-jack \ --disable-libiscsi \ --disable-libxml2 \ --disable-linux-aio \ @@ -204,9 +208,13 @@ define QEMU_CONFIGURE_CMDS --disable-malloc-trim \ --disable-membarrier \ --disable-mpath \ + --disable-netmap \ --disable-opengl \ + --disable-oss \ + --disable-pa \ --disable-rbd \ --disable-sanitizers \ + --disable-selinux \ --disable-sparse \ --disable-strip \ --disable-vde \ @@ -355,14 +363,24 @@ define HOST_QEMU_CONFIGURE_CMDS --extra-ldflags="$(HOST_LDFLAGS)" \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ + --disable-alsa \ --disable-bpf \ --disable-bzip2 \ --disable-containers \ + --disable-coreaudio \ --disable-curl \ --disable-docs \ + --disable-dsound \ + --disable-jack \ --disable-libssh \ + --disable-linux-aio \ --disable-linux-io-uring \ + --disable-netmap \ + --disable-oss \ + --disable-pa \ --disable-sdl \ + --disable-selinux \ + --disable-vde \ --disable-vhost-user-blk-server \ --disable-virtiofsd \ --disable-vnc-jpeg \ -- 2.31.1 From romain.naour at gmail.com Mon Jan 3 21:00:48 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:00:48 +0100 Subject: [Buildroot] [PATCH 3/3] package/qemu: reorder patches In-Reply-To: <20220103210048.7879-1-romain.naour@gmail.com> References: <20220103210048.7879-1-romain.naour@gmail.com> Message-ID: <20220103210048.7879-3-romain.naour@gmail.com> The commit [1] removed patch 0001. [1] 85c7bd0602715dc6a148cc79db8910dca27c4e76 Signed-off-by: Romain Naour --- ...atch => 0001-tests-fp-disable-fp-bench-build-by-default.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/qemu/{0002-tests-fp-disable-fp-bench-build-by-default.patch => 0001-tests-fp-disable-fp-bench-build-by-default.patch} (100%) diff --git a/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch similarity index 100% rename from package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch rename to package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch -- 2.31.1 From romain.naour at gmail.com Mon Jan 3 21:07:13 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:07:13 +0100 Subject: [Buildroot] [PATCH] package/terminology: bump to version 1.12.0 Message-ID: <20220103210713.8642-1-romain.naour@gmail.com> Requires efl 1.26.0 [1] [1] https://git.enlightenment.org/apps/terminology.git/commit/?id=3e95d2ad9f59e01d498e90dcb4413dc886d49852 See: https://www.enlightenment.org/news/2022-01-02-terminology-1.12.0 Signed-off-by: Romain Naour --- package/terminology/terminology.hash | 4 ++-- package/terminology/terminology.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index be1d6f4269..7e9658482a 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz.sha256sum -sha256 3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c terminology-1.9.0.tar.xz +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum +sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index 29b59fb39e..787c9ad137 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.9.0 +TERMINOLOGY_VERSION = 1.12.0 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause -- 2.31.1 From ps.report at gmx.net Mon Jan 3 21:08:16 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 3 Jan 2022 22:08:16 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.1.5 Message-ID: <20220103210816.26410-1-ps.report@gmx.net> - remove 0002-BlenderScene-use-explicit-namespace-instead-of-using.patch (upstream applied [1]). For details see [2]. [1] https://github.com/assimp/assimp/commit/a099fe7cd331a839137115db5df1733c4c1c8070 [2] https://github.com/assimp/assimp/releases/tag/v5.1.5 Signed-off-by: Peter Seiderer --- ...-explicit-namespace-instead-of-using.patch | 57 ------------------- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch deleted file mode 100644 index c83e9c50a4..0000000000 --- a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 30 Dec 2021 18:01:54 +0100 -Subject: [PATCH] BlenderScene: use explicit namespace instead of using - namespace - -Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): - - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - -[backport from upstream commit a099fe7cd331] -Signed-off-by: Peter Seiderer ---- - code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp -index c93d913fc..9ad086fe6 100644 ---- a/code/AssetLib/Blender/BlenderScene.cpp -+++ b/code/AssetLib/Blender/BlenderScene.cpp -@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "BlenderDNA.h" - #include "BlenderSceneGen.h" - --using namespace Assimp; --using namespace Assimp::Blender; -+namespace Assimp { -+namespace Blender { - - //-------------------------------------------------------------------------------- - template <> -@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { - converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); - } - -+} // namespace Blender -+} //namespace Assimp -+ - #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER --- -2.34.1 - diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 89b8d168c2..8f6d613bb4 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6 assimp-5.1.4.tar.gz +sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index ead5d73bca..b5f84ef56f 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.4 +ASSIMP_VERSION = 5.1.5 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE -- 2.34.1 From romain.naour at gmail.com Mon Jan 3 21:20:45 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:20:45 +0100 Subject: [Buildroot] [PATCH 2/2 v4] package/mesa3d: make it aware of libglvnd and support it when present In-Reply-To: <20200727173524.GG19818@scaer> References: <20200727173844.2ac2945f@windsurf.home> <20200727173524.GG19818@scaer> Message-ID: <85de806e-39a4-ce1b-fd07-2916443dfbbf@gmail.com> Hello Yann, Thomas, Le 27/07/2020 ? 19:35, Yann E. MORIN a ?crit?: > Thomas, All, > > On 2020-07-27 17:38 +0200, Thomas Petazzoni spake thusly: >> On Mon, 27 Jul 2020 10:47:02 +0200 >> "Yann E. MORIN" wrote: >>> From: Jakub Skrzypnik >>> >>> When libglvnd is enabled, mesa3d must be told so, so as it installs its >>> libraries with the vendor suffix (e.g. libEGL_mesa.so instead of >>> libEGL.so). >>> >>> Additionally, the provider (in Buildroot parlance) is libglvnd, not mesa3d. > [--SNIP--] >>> config BR2_PACKAGE_MESA3D_OPENGL_GLX >>> bool "OpenGL GLX" >>> depends on BR2_PACKAGE_XORG7 >>> - select BR2_PACKAGE_HAS_LIBGL >>> + select BR2_PACKAGE_HAS_LIBGL if !BR2_PACKAGE_LIBGLVND >>> + select BR2_PACKAGE_LIBGLVND_DISPATCH_GL if BR2_PACKAGE_LIBGLVND >> >> I don't immediately see a good solution for this, but I find that >> solution to be quite annoying :-/ > > At first, I though so too, and I also looked for a better approach, > but... > >> Indeed, I understand that once libglvnd is enabled, the GL-provider is >> libglvnd, which in the background is using mesa3d. The dance to handle >> libglvnd in mesa3d is already not nice, and we would have to have the >> same dance in other GL providers that support libglvnd. > > Well, it is not _so_ bad. We could maybe make it a bit simpler, with: > > config BR2_PACKAGE_MESA3D_OPENGL_GLX > bool "OpenGL GLX" > select BR2_PACKAGE_HAS_LIBGL > > We still need to declare emsa3d as providing libgl depending on whether > libglvnd is enabled, but we can make it a bit more "compact": > > if !BR2_PACKAGE_LIBGLVND > > config BR2_PACKAGE_PROVIDES_LIBGL > default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX > > [EGL and GLES too here] > > endif > > And in mesa3d.mk too: > > ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) > MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgl) > [...] > endif > > But now, in libglvnd, we don't need any extra symbol, we can just re-use > BR2_PACKAGE_PROVIDES_LIBGL et al.: > > config BR2_PACKAGE_LIBGLVND > bool "libglvnd" > select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_PROVIDES_LIBGL > select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_PROVIDES_LIBGL > select BR2_PACKAGE_XLIB_XORGPROTO if BR2_PACKAGE_PROVIDES_LIBGL > select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_PROVIDES_LIBGL > > if BR2_PACKAGE_LIBGLVND > > config BR2_PACKAGE_PROVIDES_LIBGL > default "libglvnd" if BR2_PACKAGE_HAS_LIBGL > > endif > > and in libglvnd.mk: > > ifeq ($(BR2_PACKAGE_PROVIDES_LIBGL),y) > LIBGLVND_DEPENDENCIES += xlib_libXext xorgproto > LIBGLVND_CONF_OPTS += -Dglx=enabled > LIBGLVND_PROVIDES += libgl > else > LIBGLVND_CONF_OPTS += -Dglx=disabled > endif > >> OK, here is some vague idea for a possible solution: >> - We introduce an intermediate "layer" between libgl and GL providers. > [--SNIP--] >> I *think* this would perhaps avoid that complexity in mesa3d... >> obviously for additional complexity in terms of how the virtual >> packages in GL world all work together. > > You are reinventing libglvnd in between libglvnd and actual providers, no? > > Also, remember that individual GL providers will still have to function > as providers without libglvnd, which is not required. > > But I would like we progress on the topic, and when we have a second > candidate for libglvnd use, we can revisit the topic and see if we can > over-engineer the thing. > > Usually, we wait for three or four cases before trying to solve the > problem in a generic fashion, and so I'd like to do here as well. > Because so far, only two providers are known to work with libglvnd: > mewsa3d and nvidia. ATI might be a third one, but I have no clue about > it. And in the SoC land, there is not much that is libglvnd compatible > so far, if at all. > > So, in the short-to-medium term, we'd at best have three providers. Is > that enough to delve into a generic infra so far? Not sure... I had an issue with a package (ogre) that now use OPENGL_glx_LIBRARY to find the "GLVND 'GLX' library" https://github.com/OGRECave/ogre/commit/aa9ffa7a51e52cb714f1bf5a3a00b9ef9f5a7dc2 https://cmake.org/cmake/help/latest/module/FindOpenGL.html I guess libglvnd will be required at some point. Best regards, Romain > > Regards, > Yann E. MORIN. > From romain.naour at gmail.com Mon Jan 3 21:25:57 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:25:57 +0100 Subject: [Buildroot] [PATCH 2/2 v4] package/mesa3d: make it aware of libglvnd and support it when present In-Reply-To: <85de806e-39a4-ce1b-fd07-2916443dfbbf@gmail.com> References: <20200727173844.2ac2945f@windsurf.home> <20200727173524.GG19818@scaer> <85de806e-39a4-ce1b-fd07-2916443dfbbf@gmail.com> Message-ID: <2679464d-5793-f8dc-4b57-14646bfdba6e@gmail.com> Le 03/01/2022 ? 22:20, Romain Naour a ?crit?: > Hello Yann, Thomas, > > Le 27/07/2020 ? 19:35, Yann E. MORIN a ?crit?: >> Thomas, All, >> >> On 2020-07-27 17:38 +0200, Thomas Petazzoni spake thusly: >>> On Mon, 27 Jul 2020 10:47:02 +0200 >>> "Yann E. MORIN" wrote: >>>> From: Jakub Skrzypnik >>>> >>>> When libglvnd is enabled, mesa3d must be told so, so as it installs its >>>> libraries with the vendor suffix (e.g. libEGL_mesa.so instead of >>>> libEGL.so). >>>> >>>> Additionally, the provider (in Buildroot parlance) is libglvnd, not mesa3d. >> [--SNIP--] >>>> config BR2_PACKAGE_MESA3D_OPENGL_GLX >>>> bool "OpenGL GLX" >>>> depends on BR2_PACKAGE_XORG7 >>>> - select BR2_PACKAGE_HAS_LIBGL >>>> + select BR2_PACKAGE_HAS_LIBGL if !BR2_PACKAGE_LIBGLVND >>>> + select BR2_PACKAGE_LIBGLVND_DISPATCH_GL if BR2_PACKAGE_LIBGLVND >>> >>> I don't immediately see a good solution for this, but I find that >>> solution to be quite annoying :-/ >> >> At first, I though so too, and I also looked for a better approach, >> but... >> >>> Indeed, I understand that once libglvnd is enabled, the GL-provider is >>> libglvnd, which in the background is using mesa3d. The dance to handle >>> libglvnd in mesa3d is already not nice, and we would have to have the >>> same dance in other GL providers that support libglvnd. >> >> Well, it is not _so_ bad. We could maybe make it a bit simpler, with: >> >> config BR2_PACKAGE_MESA3D_OPENGL_GLX >> bool "OpenGL GLX" >> select BR2_PACKAGE_HAS_LIBGL >> >> We still need to declare emsa3d as providing libgl depending on whether >> libglvnd is enabled, but we can make it a bit more "compact": >> >> if !BR2_PACKAGE_LIBGLVND >> >> config BR2_PACKAGE_PROVIDES_LIBGL >> default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX >> >> [EGL and GLES too here] >> >> endif >> >> And in mesa3d.mk too: >> >> ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) >> MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgl) >> [...] >> endif >> >> But now, in libglvnd, we don't need any extra symbol, we can just re-use >> BR2_PACKAGE_PROVIDES_LIBGL et al.: >> >> config BR2_PACKAGE_LIBGLVND >> bool "libglvnd" >> select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_PROVIDES_LIBGL >> select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_PROVIDES_LIBGL >> select BR2_PACKAGE_XLIB_XORGPROTO if BR2_PACKAGE_PROVIDES_LIBGL >> select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_PROVIDES_LIBGL >> >> if BR2_PACKAGE_LIBGLVND >> >> config BR2_PACKAGE_PROVIDES_LIBGL >> default "libglvnd" if BR2_PACKAGE_HAS_LIBGL >> >> endif >> >> and in libglvnd.mk: >> >> ifeq ($(BR2_PACKAGE_PROVIDES_LIBGL),y) >> LIBGLVND_DEPENDENCIES += xlib_libXext xorgproto >> LIBGLVND_CONF_OPTS += -Dglx=enabled >> LIBGLVND_PROVIDES += libgl >> else >> LIBGLVND_CONF_OPTS += -Dglx=disabled >> endif >> >>> OK, here is some vague idea for a possible solution: >>> - We introduce an intermediate "layer" between libgl and GL providers. >> [--SNIP--] >>> I *think* this would perhaps avoid that complexity in mesa3d... >>> obviously for additional complexity in terms of how the virtual >>> packages in GL world all work together. >> >> You are reinventing libglvnd in between libglvnd and actual providers, no? >> >> Also, remember that individual GL providers will still have to function >> as providers without libglvnd, which is not required. >> >> But I would like we progress on the topic, and when we have a second >> candidate for libglvnd use, we can revisit the topic and see if we can >> over-engineer the thing. >> >> Usually, we wait for three or four cases before trying to solve the >> problem in a generic fashion, and so I'd like to do here as well. >> Because so far, only two providers are known to work with libglvnd: >> mewsa3d and nvidia. ATI might be a third one, but I have no clue about >> it. And in the SoC land, there is not much that is libglvnd compatible >> so far, if at all. >> >> So, in the short-to-medium term, we'd at best have three providers. Is >> that enough to delve into a generic infra so far? Not sure... > > I had an issue with a package (ogre) that now use OPENGL_glx_LIBRARY to find the > "GLVND 'GLX' library" > > https://github.com/OGRECave/ogre/commit/aa9ffa7a51e52cb714f1bf5a3a00b9ef9f5a7dc2 > https://cmake.org/cmake/help/latest/module/FindOpenGL.html > > I guess libglvnd will be required at some point. Actually I did a test using this series as is. Tested-by: Romain Naour Best regards, Romain > > Best regards, > Romain > > >> >> Regards, >> Yann E. MORIN. >> > From romain.naour at gmail.com Mon Jan 3 21:39:40 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 22:39:40 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> Message-ID: Hello, Le 03/01/2022 ? 22:26, C?dric Le Goater a ?crit?: > On 1/3/22 21:19, Romain Naour wrote: >> Hi C?dric, All, >> >> Le 03/01/2022 ? 17:58, C?dric Le Goater a ?crit?: >>> Remove uclibc workaround which was deprecated by upstream : >>> ?? commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") >>> >>> Remove upstream patches : >>> ?? commit 304332039014 ("block/export/fuse.c: fix musl build") >>> ?? commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") >>> >>> Signed-off-by: C?dric Le Goater >> >> I did a similar commit to test all qemu defconfig in gitlab-ci: >> >> https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 >> >> No problem detected so far, I was investigating why the s390x defconfig failed >> for me... >> >> It would be great if you can do a runtime test in gitlab and add the link in the >> commit log. > > I did a few runs with test branches but I didn't find a way to run only > the qemu board boot tests. How did you do that ? Ok, I'll try to find some time to document how to use gitlab for qemu testing (see also recent changes in gitlab-ci) Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. Create a test branch named: qemu-6.2.0-defconfigs-qemu Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing Buildroot defconfis and "qemu" is a pattern. See: https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 "pushing a branch called "-defconfigs-" which will test all defconfigs whose name start with the pattern." > > ? >>> --- >>> ? ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- >>> ? ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- >>> ? ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- >>> ? package/qemu/qemu.hash??????????????????????? |? 2 +- >>> ? package/qemu/qemu.mk????????????????????????? |? 2 +- >>> ? 5 files changed, 2 insertions(+), 130 deletions(-) >>> ? delete mode 100644 >>> package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> ? delete mode 100644 >>> package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> ? delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> >>> diff --git >>> a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> >>> deleted file mode 100644 >>> index 6db4e8bc923e..000000000000 >>> --- >>> a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> +++ /dev/null >>> @@ -1,35 +0,0 @@ >>> -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 >>> -From: Thomas Petazzoni >>> -Date: Fri, 5 May 2017 09:07:15 +0200 >>> -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc >>> - >>> -user-exec.c has some conditional code to decide how to use the >>> -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but >>> -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path >>> -gets used, which doesn't apply to uClibc. >>> - >>> -Fix this by excluding __UCLIBC__, which ensures we fall back to the >>> -general case of using uc_mcontext.arm_pc, which works fine with >>> -uClibc. >>> - >>> -Signed-off-by: Thomas Petazzoni >>> ---- >>> - accel/tcg/user-exec.c | 2 +- >>> - 1 file changed, 1 insertion(+), 1 deletion(-) >>> - >>> -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c >>> -index 4ebe25461a..0496674fbd 100644 >>> ---- a/accel/tcg/user-exec.c >>> -+++ b/accel/tcg/user-exec.c >>> -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, >>> - >>> - #if defined(__NetBSD__) >>> -???? pc = uc->uc_mcontext.__gregs[_REG_R15]; >>> --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && >>> __GLIBC_MINOR__ <= 3)) >>> -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || >>> (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >>> -???? pc = uc->uc_mcontext.gregs[R15]; >>> - #else >>> -???? pc = uc->uc_mcontext.arm_pc; >>> --- >>> -2.25.3 >>> - >>> diff --git >>> a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> >>> deleted file mode 100644 >>> index 50762055bf18..000000000000 >>> --- >>> a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> +++ /dev/null >>> @@ -1,44 +0,0 @@ >>> -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 >>> -From: Fabrice Fontaine >>> -Date: Fri, 27 Aug 2021 23:40:01 +0200 >>> -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl >>> - >>> -Include linux/fs.h to avoid the following build failure on uclibc or >>> -musl raised since version 6.0.0: >>> - >>> -../block/export/fuse.c: In function 'fuse_lseek': >>> -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in >>> this function) >>> -? 641 |???? if (whence != SEEK_HOLE && whence != SEEK_DATA) { >>> -????? |?????????????????? ^~~~~~~~~ >>> -../block/export/fuse.c:641:19: note: each undeclared identifier is reported >>> only once for each function it appears in >>> -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in >>> this function); did you mean 'SEEK_SET'? >>> -? 641 |???? if (whence != SEEK_HOLE && whence != SEEK_DATA) { >>> -????? |????????????????????????????????????????? ^~~~~~~~~ >>> -????? |????????????????????????????????????????? SEEK_SET >>> - >>> -Fixes: >>> - - >>> http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 >>> - >>> -Signed-off-by: Fabrice Fontaine >>> -[Upstream status: >>> https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] >>> >>> ---- >>> - block/export/fuse.c | 3 +++ >>> - 1 file changed, 3 insertions(+) >>> - >>> -diff --git a/block/export/fuse.c b/block/export/fuse.c >>> -index fc7b07d2b5..2e3bf8270b 100644 >>> ---- a/block/export/fuse.c >>> -+++ b/block/export/fuse.c >>> -@@ -31,6 +31,9 @@ >>> - #include >>> - #include >>> - >>> -+#ifdef __linux__ >>> -+#include >>> -+#endif >>> - >>> - /* Prevent overly long bounce buffer allocations */ >>> - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) >>> --- >>> -2.32.0 >>> - >>> diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> deleted file mode 100644 >>> index 4856821843fc..000000000000 >>> --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> +++ /dev/null >>> @@ -1,49 +0,0 @@ >>> -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 >>> -From: Fabrice Fontaine >>> -Date: Fri, 22 Oct 2021 11:52:09 +0200 >>> -Subject: [PATCH] block/export/fuse.c: fix musl build >>> -MIME-Version: 1.0 >>> -Content-Type: text/plain; charset=UTF-8 >>> -Content-Transfer-Encoding: 8bit >>> - >>> -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix >>> -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb >>> >>> -and avoid the following build failure on musl: >>> - >>> -../block/export/fuse.c: In function 'fuse_fallocate': >>> -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared >>> (first use in this function) >>> -? 643 |???? else if (mode & FALLOC_FL_ZERO_RANGE) { >>> -????? |???????????????????? ^~~~~~~~~~~~~~~~~~~~ >>> - >>> -Fixes: >>> - - >>> http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b >>> - >>> -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") >>> -Signed-off-by: Fabrice Fontaine >>> -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> >>> -Reviewed-by: Philippe Mathieu-Daud? >>> -Signed-off-by: Kevin Wolf >>> -[Retrieved from: >>> -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] >>> >>> ---- >>> - block/export/fuse.c | 4 ++++ >>> - 1 file changed, 4 insertions(+) >>> - >>> -diff --git a/block/export/fuse.c b/block/export/fuse.c >>> -index 2e3bf8270b..823c126d23 100644 >>> ---- a/block/export/fuse.c >>> -+++ b/block/export/fuse.c >>> -@@ -31,6 +31,10 @@ >>> - #include >>> - #include >>> - >>> -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) >>> -+#include >>> -+#endif >>> -+ >>> - #ifdef __linux__ >>> - #include >>> - #endif >>> --- >>> -GitLab >>> - >>> diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash >>> index 0613fce49367..9411832384ba 100644 >>> --- a/package/qemu/qemu.hash >>> +++ b/package/qemu/qemu.hash >>> @@ -1,4 +1,4 @@ >>> ? # Locally computed, tarball verified with GPG signature >>> -sha256? eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96? >>> qemu-6.1.0.tar.xz >>> +sha256? 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45? >>> qemu-6.2.0.tar.xz >>> ? sha256? 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100? >>> COPYING >>> ? sha256? dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551? >>> COPYING.LIB >>> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk >>> index 919aef6599f1..97f9f885a18a 100644 >>> --- a/package/qemu/qemu.mk >>> +++ b/package/qemu/qemu.mk >>> @@ -4,7 +4,7 @@ >>> ? # >>> ? >>> ################################################################################ >>> ? -QEMU_VERSION = 6.1.0 >>> +QEMU_VERSION = 6.2.0 >>> ? QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz >>> ? QEMU_SITE = http://download.qemu.org >>> ? QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, >>> Others/BSD-1c >>> >> >> Please check qemu configure options while doing a version bump, there are a lot >> of new option added: > > yes. QEMU is very much alive. > >> https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e >> > > I suppose you disable options to reduce compile time ? I'm more concerned about qemu dependencies. host-qemu must avoid linking with libraries installed on the host (unpredictable build and runtime result). Best regards, Romain > > Thanks, > > C. From ps.report at gmx.net Mon Jan 3 21:56:19 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 3 Jan 2022 22:56:19 +0100 Subject: [Buildroot] [PATCH v1] package/pkg-waf.mk: enable verbose compile Message-ID: <20220103215619.4580-1-ps.report@gmx.net> Honour the buildroot verbose flag ('V=1') for the waf compile step by adding '-v' to the build command. Signed-off-by: Peter Seiderer --- package/pkg-waf.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index a593476a69..0239862ac6 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -20,6 +20,8 @@ # ################################################################################ +WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) + ################################################################################ # inner-waf-package -- defines how the configuration, compilation and # installation of a waf package should be done, implements a few hooks @@ -74,7 +76,7 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ + build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef endif -- 2.34.1 From yann.morin.1998 at free.fr Mon Jan 3 21:19:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 22:19:58 +0100 Subject: [Buildroot] [git commit] package/qemu: renumber remaining patch Message-ID: <20220103215701.85C9B82DEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5c58aff5d4ff44b6b923c4a91e9beb27ee536fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The commit [1] removed patch 0001. [1] 85c7bd0602715dc6a148cc79db8910dca27c4e76 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...efault.patch => 0001-tests-fp-disable-fp-bench-build-by-default.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch similarity index 100% rename from package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch rename to package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch From yann.morin.1998 at free.fr Mon Jan 3 21:25:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 22:25:02 +0100 Subject: [Buildroot] [git commit] package/qemu: Disable new configure options added by Qemu 2.6.0 Message-ID: <20220103215701.9967782DF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78a989b1f15311d7e9e01717111c3dc306a0dbaa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable new configure options added by this release to avoid adding new dependencies or features. Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 43450a6649..e69e813059 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -187,16 +187,20 @@ define QEMU_CONFIGURE_CMDS --audio-drv-list= \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ + --disable-alsa \ --disable-bpf \ --disable-brlapi \ --disable-bsd-user \ --disable-cap-ng \ --disable-capstone \ --disable-containers \ + --disable-coreaudio \ --disable-curl \ --disable-curses \ --disable-docs \ + --disable-dsound \ --disable-hvf \ + --disable-jack \ --disable-libiscsi \ --disable-libxml2 \ --disable-linux-aio \ @@ -204,9 +208,13 @@ define QEMU_CONFIGURE_CMDS --disable-malloc-trim \ --disable-membarrier \ --disable-mpath \ + --disable-netmap \ --disable-opengl \ + --disable-oss \ + --disable-pa \ --disable-rbd \ --disable-sanitizers \ + --disable-selinux \ --disable-sparse \ --disable-strip \ --disable-vde \ @@ -355,14 +363,24 @@ define HOST_QEMU_CONFIGURE_CMDS --extra-ldflags="$(HOST_LDFLAGS)" \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ + --disable-alsa \ --disable-bpf \ --disable-bzip2 \ --disable-containers \ + --disable-coreaudio \ --disable-curl \ --disable-docs \ + --disable-dsound \ + --disable-jack \ --disable-libssh \ + --disable-linux-aio \ --disable-linux-io-uring \ + --disable-netmap \ + --disable-oss \ + --disable-pa \ --disable-sdl \ + --disable-selinux \ + --disable-vde \ --disable-vhost-user-blk-server \ --disable-virtiofsd \ --disable-vnc-jpeg \ From yann.morin.1998 at free.fr Mon Jan 3 21:22:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 3 Jan 2022 22:22:18 +0100 Subject: [Buildroot] [git commit] package/qemu: reorder enable/disable options alphabetically Message-ID: <20220103215701.8FCC682DF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c115a09c894404d6417997dd722e3029fa71317 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 97f9f885a1..43450a6649 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -187,39 +187,39 @@ define QEMU_CONFIGURE_CMDS --audio-drv-list= \ --meson=$(HOST_DIR)/bin/meson \ --ninja=$(HOST_DIR)/bin/ninja \ - --enable-kvm \ - --enable-attr \ - --enable-vhost-net \ --disable-bpf \ + --disable-brlapi \ --disable-bsd-user \ + --disable-cap-ng \ + --disable-capstone \ --disable-containers \ - --disable-xen \ - --disable-virtfs \ - --disable-brlapi \ - --disable-curses \ --disable-curl \ - --disable-vde \ - --disable-linux-aio \ - --disable-linux-io-uring \ - --disable-cap-ng \ + --disable-curses \ --disable-docs \ - --disable-rbd \ - --disable-libiscsi \ - --disable-strip \ - --disable-sparse \ - --disable-mpath \ - --disable-sanitizers \ --disable-hvf \ - --disable-whpx \ + --disable-libiscsi \ + --disable-libxml2 \ + --disable-linux-aio \ + --disable-linux-io-uring \ --disable-malloc-trim \ --disable-membarrier \ - --disable-vhost-crypto \ - --disable-libxml2 \ - --disable-capstone \ - --with-git-submodules=ignore \ + --disable-mpath \ --disable-opengl \ + --disable-rbd \ + --disable-sanitizers \ + --disable-sparse \ + --disable-strip \ + --disable-vde \ + --disable-vhost-crypto \ --disable-vhost-user-blk-server \ + --disable-virtfs \ --disable-virtiofsd \ + --disable-whpx \ + --disable-xen \ + --enable-attr \ + --enable-kvm \ + --enable-vhost-net \ + --with-git-submodules=ignore \ $(QEMU_OPTS) endef From fontaine.fabrice at gmail.com Mon Jan 3 22:07:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 3 Jan 2022 23:07:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-rgb-led-matrix: fix musl build Message-ID: <20220103220724.559180-1-fontaine.fabrice@gmail.com> Fix the following build failure on musl raised since the addition of the package in commit e821078031e14df69e5142f23e9cb7b5a1ea0e77: text-scroller.cc: In function 'int main(int, char**)': text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? 220 | uint frame_counter = 0; | ^~~~ | rint Fixes: - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 Signed-off-by: Fabrice Fontaine --- ...-utils-text-scroller.cc-replace-uint.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch diff --git a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch new file mode 100644 index 0000000000..627415bac8 --- /dev/null +++ b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch @@ -0,0 +1,50 @@ +From a56338db0f003d5236f2ce98c73a591d64a70852 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Jan 2022 22:57:11 +0100 +Subject: [PATCH] utils/text-scroller.cc: replace uint (#1383) + +Replace uint by uint64_t to avoid the following build failure on musl: + +text-scroller.cc: In function 'int main(int, char**)': +text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? + 220 | uint frame_counter = 0; + | ^~~~ + | rint + +Fixes: + - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/hzeller/rpi-rgb-led-matrix/commit/a56338db0f003d5236f2ce98c73a591d64a70852] +--- + utils/text-scroller.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/utils/text-scroller.cc b/utils/text-scroller.cc +index a64ba0c89..28d4f7182 100644 +--- a/utils/text-scroller.cc ++++ b/utils/text-scroller.cc +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -217,12 +218,12 @@ int main(int argc, char *argv[]) { + + struct timespec next_frame = {0, 0}; + +- uint frame_counter = 0; ++ uint64_t frame_counter = 0; + while (!interrupt_received && loops != 0) { + ++frame_counter; + offscreen_canvas->Fill(bg_color.r, bg_color.g, bg_color.b); + const bool draw_on_frame = (blink_on <= 0) +- || (frame_counter % (blink_on + blink_off) < (uint)blink_on); ++ || (frame_counter % (blink_on + blink_off) < (uint64_t)blink_on); + + if (draw_on_frame) { + if (outline_font) { -- 2.34.1 From clg at kaod.org Mon Jan 3 22:20:49 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Mon, 3 Jan 2022 23:20:49 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> Message-ID: <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> Hello, > Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. > > Create a test branch named: qemu-6.2.0-defconfigs-qemu > > Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing > Buildroot defconfis and "qemu" is a pattern. > > See: > https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 > > "pushing a branch called "-defconfigs-" which will test all > defconfigs whose name start with the pattern." That looks simple enough. Something is going wrong though : https://gitlab.com/legoater/buildroot/-/jobs/1937752353 Am I missing something ? Thanks, C. From clg at kaod.org Mon Jan 3 21:26:20 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Mon, 3 Jan 2022 22:26:20 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> Message-ID: <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> On 1/3/22 21:19, Romain Naour wrote: > Hi C?dric, All, > > Le 03/01/2022 ? 17:58, C?dric Le Goater a ?crit?: >> Remove uclibc workaround which was deprecated by upstream : >> commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") >> >> Remove upstream patches : >> commit 304332039014 ("block/export/fuse.c: fix musl build") >> commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") >> >> Signed-off-by: C?dric Le Goater > > I did a similar commit to test all qemu defconfig in gitlab-ci: > > https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 > > No problem detected so far, I was investigating why the s390x defconfig failed > for me... > > It would be great if you can do a runtime test in gitlab and add the link in the > commit log. I did a few runs with test branches but I didn't find a way to run only the qemu board boot tests. How did you do that ? >> --- >> ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- >> ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- >> ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- >> package/qemu/qemu.hash | 2 +- >> package/qemu/qemu.mk | 2 +- >> 5 files changed, 2 insertions(+), 130 deletions(-) >> delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> >> diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> deleted file mode 100644 >> index 6db4e8bc923e..000000000000 >> --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> +++ /dev/null >> @@ -1,35 +0,0 @@ >> -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 >> -From: Thomas Petazzoni >> -Date: Fri, 5 May 2017 09:07:15 +0200 >> -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc >> - >> -user-exec.c has some conditional code to decide how to use the >> -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but >> -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path >> -gets used, which doesn't apply to uClibc. >> - >> -Fix this by excluding __UCLIBC__, which ensures we fall back to the >> -general case of using uc_mcontext.arm_pc, which works fine with >> -uClibc. >> - >> -Signed-off-by: Thomas Petazzoni >> ---- >> - accel/tcg/user-exec.c | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c >> -index 4ebe25461a..0496674fbd 100644 >> ---- a/accel/tcg/user-exec.c >> -+++ b/accel/tcg/user-exec.c >> -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, >> - >> - #if defined(__NetBSD__) >> - pc = uc->uc_mcontext.__gregs[_REG_R15]; >> --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >> -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >> - pc = uc->uc_mcontext.gregs[R15]; >> - #else >> - pc = uc->uc_mcontext.arm_pc; >> --- >> -2.25.3 >> - >> diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> deleted file mode 100644 >> index 50762055bf18..000000000000 >> --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> +++ /dev/null >> @@ -1,44 +0,0 @@ >> -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Fri, 27 Aug 2021 23:40:01 +0200 >> -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl >> - >> -Include linux/fs.h to avoid the following build failure on uclibc or >> -musl raised since version 6.0.0: >> - >> -../block/export/fuse.c: In function 'fuse_lseek': >> -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) >> - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { >> - | ^~~~~~~~~ >> -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in >> -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? >> - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { >> - | ^~~~~~~~~ >> - | SEEK_SET >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 >> - >> -Signed-off-by: Fabrice Fontaine >> -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice at gmail.com/] >> ---- >> - block/export/fuse.c | 3 +++ >> - 1 file changed, 3 insertions(+) >> - >> -diff --git a/block/export/fuse.c b/block/export/fuse.c >> -index fc7b07d2b5..2e3bf8270b 100644 >> ---- a/block/export/fuse.c >> -+++ b/block/export/fuse.c >> -@@ -31,6 +31,9 @@ >> - #include >> - #include >> - >> -+#ifdef __linux__ >> -+#include >> -+#endif >> - >> - /* Prevent overly long bounce buffer allocations */ >> - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) >> --- >> -2.32.0 >> - >> diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> deleted file mode 100644 >> index 4856821843fc..000000000000 >> --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> +++ /dev/null >> @@ -1,49 +0,0 @@ >> -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Fri, 22 Oct 2021 11:52:09 +0200 >> -Subject: [PATCH] block/export/fuse.c: fix musl build >> -MIME-Version: 1.0 >> -Content-Type: text/plain; charset=UTF-8 >> -Content-Transfer-Encoding: 8bit >> - >> -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix >> -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb >> -and avoid the following build failure on musl: >> - >> -../block/export/fuse.c: In function 'fuse_fallocate': >> -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) >> - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { >> - | ^~~~~~~~~~~~~~~~~~~~ >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b >> - >> -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") >> -Signed-off-by: Fabrice Fontaine >> -Message-Id: <20211022095209.1319671-1-fontaine.fabrice at gmail.com> >> -Reviewed-by: Philippe Mathieu-Daud? >> -Signed-off-by: Kevin Wolf >> -[Retrieved from: >> -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] >> ---- >> - block/export/fuse.c | 4 ++++ >> - 1 file changed, 4 insertions(+) >> - >> -diff --git a/block/export/fuse.c b/block/export/fuse.c >> -index 2e3bf8270b..823c126d23 100644 >> ---- a/block/export/fuse.c >> -+++ b/block/export/fuse.c >> -@@ -31,6 +31,10 @@ >> - #include >> - #include >> - >> -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) >> -+#include >> -+#endif >> -+ >> - #ifdef __linux__ >> - #include >> - #endif >> --- >> -GitLab >> - >> diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash >> index 0613fce49367..9411832384ba 100644 >> --- a/package/qemu/qemu.hash >> +++ b/package/qemu/qemu.hash >> @@ -1,4 +1,4 @@ >> # Locally computed, tarball verified with GPG signature >> -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz >> +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz >> sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING >> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB >> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk >> index 919aef6599f1..97f9f885a18a 100644 >> --- a/package/qemu/qemu.mk >> +++ b/package/qemu/qemu.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -QEMU_VERSION = 6.1.0 >> +QEMU_VERSION = 6.2.0 >> QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz >> QEMU_SITE = http://download.qemu.org >> QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c >> > > Please check qemu configure options while doing a version bump, there are a lot > of new option added: yes. QEMU is very much alive. > https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e I suppose you disable options to reduce compile time ? Thanks, C. From romain.naour at gmail.com Mon Jan 3 22:43:11 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 23:43:11 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> Message-ID: <1b60df77-a795-f328-6651-4e3b5c4b0757@gmail.com> Le 03/01/2022 ? 23:20, C?dric Le Goater a ?crit?: > Hello, >> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >> >> Create a test branch named: qemu-6.2.0-defconfigs-qemu >> >> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >> Buildroot defconfis and "qemu" is a pattern. >> >> See: >> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >> >> >> "pushing a branch called "-defconfigs-" which will test all >> defconfigs whose name start with the pattern." > > That looks simple enough. Something is going wrong though : > > ? https://gitlab.com/legoater/buildroot/-/jobs/1937752353 > > Am I missing something ? humm, maybe there is weakness in the script when foo is "qemu-6.2.0" ^ Try again with something else like qemu_6.2.0-defconfigs-qemu Best regards, Romain > > Thanks, > > C. From romain.naour at gmail.com Mon Jan 3 22:50:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 23:50:41 +0100 Subject: [Buildroot] [PATCH] package/zfs: fix python3 version check Message-ID: <20220103225041.13925-1-romain.naour@gmail.com> Backport a patch to fix the python 3 version check that broke the build since the python 3.10 version bump. Add host-python-packaging dependency since the backport add "from packaging import version" while checking the python version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1935414730 https://gitlab.com/buildroot.org/buildroot/-/jobs/1935415049 Signed-off-by: Romain Naour --- ...law-in-the-Python-3-version-checking.patch | 106 ++++++++++++++++++ package/zfs/zfs.mk | 5 +- 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch new file mode 100644 index 0000000000..70978f9f4d --- /dev/null +++ b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch @@ -0,0 +1,106 @@ +From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain at users.noreply.github.com> +Date: Tue, 8 Jun 2021 20:20:16 -0400 +Subject: [PATCH] Correct a flaw in the Python 3 version checking + +It turns out the ax_python_devel.m4 version check assumes that +("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 +is 10 or above and X is not. (Also presumably X+1=100 and ...) + +So let's remake the check to behave consistently, using the +"packaging" or (if absent) the "distlib" modules. + +(Also, update the Github workflows to use the new packages.) + +Reviewed-by: Brian Behlendorf +Reviewed-by: John Kennedy +Signed-off-by: Rich Ercolani +Closes: #12073 +(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) +[Romain: drop rpm spec and github workflows changes] +Signed-off-by: Romain Naour +--- + config/always-pyzfs.m4 | 15 +++++++++++++++ + config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ + 2 files changed, 42 insertions(+), 6 deletions(-) + +diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 +index 76e07b593..fa39fd885 100644 +--- a/config/always-pyzfs.m4 ++++ b/config/always-pyzfs.m4 +@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ + ]) + AC_SUBST(DEFINE_PYZFS) + ++ dnl # ++ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs ++ dnl # ++ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ ++ ZFS_AC_PYTHON_MODULE([packaging], [], [ ++ ZFS_AC_PYTHON_MODULE([distlib], [], [ ++ AS_IF([test "x$enable_pyzfs" = xyes], [ ++ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") ++ ], [test "x$enable_pyzfs" != xno], [ ++ enable_pyzfs=no ++ ]) ++ ]) ++ ]) ++ ]) ++ + dnl # + dnl # Require python-devel libraries + dnl # +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index c51b45b7d..cdfbbf81f 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split ()[[0]]; \ +- print (ver >= '2.1.0')"` ++ ac_supports_python_ver=`cat<= '3.11.0' ++ ac_supports_python_ver=`cat< Signed-off-by: Romain Naour --- package/python-packaging/python-packaging.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 6b54d2416d..1fd6f26d64 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -12,3 +12,4 @@ PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.31.1 From romain.naour at gmail.com Mon Jan 3 22:54:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 3 Jan 2022 23:54:50 +0100 Subject: [Buildroot] [PATCH 2/2] package/zfs: fix python3 version check In-Reply-To: <20220103225450.14459-1-romain.naour@gmail.com> References: <20220103225450.14459-1-romain.naour@gmail.com> Message-ID: <20220103225450.14459-2-romain.naour@gmail.com> Backport a patch to fix the python 3 version check that broke the build since the python 3.10 version bump. Add host-python-packaging dependency since the backport add "from packaging import version" while checking the python version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1935414730 https://gitlab.com/buildroot.org/buildroot/-/jobs/1935415049 Signed-off-by: Romain Naour --- ...law-in-the-Python-3-version-checking.patch | 106 ++++++++++++++++++ package/zfs/zfs.mk | 5 +- 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch new file mode 100644 index 0000000000..70978f9f4d --- /dev/null +++ b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch @@ -0,0 +1,106 @@ +From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain at users.noreply.github.com> +Date: Tue, 8 Jun 2021 20:20:16 -0400 +Subject: [PATCH] Correct a flaw in the Python 3 version checking + +It turns out the ax_python_devel.m4 version check assumes that +("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 +is 10 or above and X is not. (Also presumably X+1=100 and ...) + +So let's remake the check to behave consistently, using the +"packaging" or (if absent) the "distlib" modules. + +(Also, update the Github workflows to use the new packages.) + +Reviewed-by: Brian Behlendorf +Reviewed-by: John Kennedy +Signed-off-by: Rich Ercolani +Closes: #12073 +(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) +[Romain: drop rpm spec and github workflows changes] +Signed-off-by: Romain Naour +--- + config/always-pyzfs.m4 | 15 +++++++++++++++ + config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ + 2 files changed, 42 insertions(+), 6 deletions(-) + +diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 +index 76e07b593..fa39fd885 100644 +--- a/config/always-pyzfs.m4 ++++ b/config/always-pyzfs.m4 +@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ + ]) + AC_SUBST(DEFINE_PYZFS) + ++ dnl # ++ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs ++ dnl # ++ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ ++ ZFS_AC_PYTHON_MODULE([packaging], [], [ ++ ZFS_AC_PYTHON_MODULE([distlib], [], [ ++ AS_IF([test "x$enable_pyzfs" = xyes], [ ++ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") ++ ], [test "x$enable_pyzfs" != xno], [ ++ enable_pyzfs=no ++ ]) ++ ]) ++ ]) ++ ]) ++ + dnl # + dnl # Require python-devel libraries + dnl # +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index c51b45b7d..cdfbbf81f 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split ()[[0]]; \ +- print (ver >= '2.1.0')"` ++ ac_supports_python_ver=`cat<= '3.11.0' ++ ac_supports_python_ver=`cat< These patches fix per-package builds with non-qt5base qt5 packages. Based off of Louis-Paul's earlier work[1] and And Yann Morin's feedback to a different patch set[2], the simple fix is to add a few pre-configure hook methods to pkg-generic.mk, pkg-cmake.mk, and pkg-qmake.mk which search for .pc, .cmake, and .pri files for the $(STAGING_DIR)/ prefix and removes them. Feedback is welcome! Adam 1) https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ 2) https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Adam Duskett (3): package/pkg-generic.mk: fix absolute paths in .pc files for per-package builds Some packages (notably qmake packages) generate .pc files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in the .pc file point outside the per-package sysroot. package/pkg-cmake.mk: fix absolute paths in .cmake files for per-package builds package/pkg-qmake.mk: fix absolute paths in .pri files for per-package builds package/pkg-cmake.mk | 11 +++++++++++ package/pkg-generic.mk | 11 +++++++++++ package/pkg-qmake.mk | 11 +++++++++++ 3 files changed, 33 insertions(+) -- 2.33.1 From aduskett at gmail.com Mon Jan 3 23:02:48 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 3 Jan 2022 15:02:48 -0800 Subject: [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: fix absolute paths in .cmake files for per-package builds In-Reply-To: <20220103230249.310062-1-aduskett@gmail.com> References: <20220103230249.310062-1-aduskett@gmail.com> Message-ID: <20220103230249.310062-3-aduskett@gmail.com> Some packages (notably qmake packages) generate .cmake files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in the .cmake files point outside the per-package sysroot. Add the new pre-configure-hook "FIXUP_CMAKECONFIG_ABSOLUTE_PATHS" in package/pkg-cmake.mk which searches for all .cmake files in a per-package staging directory and removes the $(STAGING_DIR)/ prefix from in them. This simple fix allows non-qt5base qt5 packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- package/pkg-cmake.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..47234fbdd9 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -65,6 +65,17 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +# Some packages may generate cmake files with absolute paths. Remove the +# absolute paths from the generated cmake files to keep per-package isolation +# with the build sysroot. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_CMAKECONFIG_ABSOLUTE_PATHS + $(Q)find $(STAGING_DIR)/ -name "*.cmake" | xargs --no-run-if-empty \ + $(SED) "s:$(STAGING_DIR)::g" +endef +$(2)_PRE_CONFIGURE_HOOKS += FIXUP_CMAKECONFIG_ABSOLUTE_PATHS +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target -- 2.33.1 From aduskett at gmail.com Mon Jan 3 23:02:47 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 3 Jan 2022 15:02:47 -0800 Subject: [Buildroot] [PATCH 1/3] package/pkg-generic.mk: fix absolute paths in .pc files for per-package builds In-Reply-To: <20220103230249.310062-1-aduskett@gmail.com> References: <20220103230249.310062-1-aduskett@gmail.com> Message-ID: <20220103230249.310062-2-aduskett@gmail.com> Some packages (notably qmake packages) generate .pc files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in the .pc file point outside the per-package sysroot. Add the new pre-configure-hook "FIXUP_PC_FILES_ABSOLUTE_PATHS" in package/pkg-generic.mk which searches for all .pc files in a per-package staging directory and removes the $(STAGING_DIR)/ prefix in them. This simple fix allows non-qt5base qt5 packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- package/pkg-generic.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5626af1d87..94104cbfa9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -103,6 +103,17 @@ define fixup-libtool-files endef endif +# When per-package is enabled, packages may generate .pc files with absolute +# paths for the prefix field. Remove the absolute paths from the generated .pc +# files to keep per-package isolation with the build sysroot. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_PC_FILES_ABSOLUTE_PATHS + $(Q)find $(STAGING_DIR)/ -name "*.pc" | xargs --no-run-if-empty \ + $(SED) "s:$(STAGING_DIR)::g" +endef +$(2)_PRE_CONFIGURE_HOOKS += FIXUP_PC_ABSOLUTE_PATHS +endif + # Make sure python _sysconfigdata*.py files only reference the current # per-package directory. # -- 2.33.1 From aduskett at gmail.com Mon Jan 3 23:02:49 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 3 Jan 2022 15:02:49 -0800 Subject: [Buildroot] [PATCH 3/3] package/pkg-qmake.mk: fix absolute paths in .pri files for per-package builds In-Reply-To: <20220103230249.310062-1-aduskett@gmail.com> References: <20220103230249.310062-1-aduskett@gmail.com> Message-ID: <20220103230249.310062-4-aduskett@gmail.com> Qmake generates .pri files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in the .pri files point outside the per-package sysroot. Add the new pre-configure-hook "FIXUP_PRI_FILES_ABSOLUTE_PATHS" in package/pkg-qmake.mk which searches for all .pri files in a per-package staging directory and removes the $(STAGING_DIR)/ prefix in them. This simple fix allows non-qt5base qt5 packages that use .pri files to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- package/pkg-qmake.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..b847ab0ef8 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -27,6 +27,17 @@ define QT_HEADERS_SYNC_HOOK $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) endef +# When per-package is enabled, qmake packages may generate .pri files with +# absolute paths Remove the absolute paths from the generated .pri files to +# keep per-package isolation with the build sysroot. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_PRI_FILES_ABSOLUTE_PATHS + $(Q)find $(HOST_DIR)/ -name "*.pri" | xargs --no-run-if-empty \ + $(SED) "s:$(STAGING_DIR):\$$\$$\[QT_SYSROOT\]:g" +endef +$(2)_PRE_CONFIGURE_HOOKS += FIXUP_PC_ABSOLUTE_PATHS +endif + ################################################################################ # inner-qmake-package -- defines how the configuration, compilation and # installation of a qmake package should be done, implements a few hooks -- 2.33.1 From james.hilliard1 at gmail.com Tue Jan 4 07:48:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 4 Jan 2022 00:48:21 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: bump to version 5.212.0-alpha4 Message-ID: <20220104074821.1330228-1-james.hilliard1@gmail.com> Switch to latest release in new active upstream: https://github.com/qtwebkit/qtwebkit Migrate python2 build to python3. Drop patches that are upstream/no longer needed. Adapt/add patches to fix build issues. Rework build system to use cmake instead of qmake(which does not currently support cross compilation). Signed-off-by: James Hilliard --- ...compile-failures-from-capital-bool-d.patch | 147 ++++++++++++++++++ ...0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 36 ----- ...acktrace-API-for-non-glibc-libraries.patch | 44 ------ ...with-Python-3.9-avoid-passing-encodi.patch | 33 ++++ ...-Detect-32-bits-armv8-a-architecture.patch | 48 ------ ...e-the-header-directly-to-fix-build-.patch} | 22 +-- ...04-Fix-installation-of-class-headers.patch | 49 ------ ..._object-declarations-to-fix-build-wi.patch | 31 ++++ ...005-Fix-ICU-related-compile-failures.patch | 67 -------- ...-legacy-reference-to-qtConfig-mircli.patch | 34 ---- ...te-the-header-directly-to-fix-build-.patch | 31 ---- ...compile-failures-from-capital-bool-d.patch | 99 ------------ package/qt5/qt5webkit/Config.in | 14 ++ package/qt5/qt5webkit/qt5webkit.hash | 4 +- package/qt5/qt5webkit/qt5webkit.mk | 37 ++--- 15 files changed, 250 insertions(+), 446 deletions(-) create mode 100644 package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch delete mode 100644 package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch delete mode 100644 package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch create mode 100644 package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch delete mode 100644 package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch rename package/qt5/qt5webkit/{0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch => 0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch} (60%) delete mode 100644 package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch create mode 100644 package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch delete mode 100644 package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch delete mode 100644 package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch delete mode 100644 package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch delete mode 100644 package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch new file mode 100644 index 0000000000..11d0b7b248 --- /dev/null +++ b/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch @@ -0,0 +1,147 @@ +From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001 +From: Henri Roosen +Date: Thu, 18 Mar 2021 11:53:57 +0100 +Subject: [PATCH] Fix ICU related compile failures from capital bool defines + +See ICU-21267 + +Signed-off-by: Henri Roosen +Signed-off-by: James Hilliard +--- + Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- + Source/WebCore/platform/text/icu/UTextProvider.h | 8 ++++---- + .../platform/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- + .../platform/text/icu/UTextProviderUTF16.cpp | 4 ++-- + 4 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp +index dd6ff0675bb1..e0f4bd718828 100644 +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h +index c254fc4c7ce2..6d1e1cbc5eb2 100644 +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +index cd6852c71e55..6a864b1c1567 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +index 7aaac48c8151..9ae0d367f1f6 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch deleted file mode 100644 index 669c7e6aa2..0000000000 --- a/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner -Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) - -Building qtwebkit causes a QA issue such that QtWebPluginProcess and -QtWebProcess contain bad RPATHs which point into the build location. This fix -adds a patch to not include the rpath.prf which causes this problem. - -Signed-off-by: Trevor Woerner -Signed-off-by: Martin Jansa - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0001-qtwebkit-fix-QA-issue-bad-RPATH.patch - -Signed-off-by: Gary Bisson ---- - Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index fd66af6..ef754c3 100644 ---- a/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -61,7 +61,6 @@ linux-*g++* { - } - } - --contains(TEMPLATE, app): CONFIG += rpath - - CONFIG(debug, debug|release)|force_debug_info { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. --- -2.7.0 - diff --git a/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted file mode 100644 index a2597a54bb..0000000000 --- a/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries - -It was excluding musl with current checks, so lets make it such that it -considers only glibc when using backtrace API - -Signed-off-by: Khem Raj - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0003-Exclude-backtrace-API-for-non-glibc-libraries.patch - -Signed-off-by: Gary Bisson ---- - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 1b2091f..ba03a28 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -61,7 +61,7 @@ - #include - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include - #include -@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined --- -2.7.0 - diff --git a/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch b/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch new file mode 100644 index 0000000000..d167a44bf3 --- /dev/null +++ b/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch @@ -0,0 +1,33 @@ +From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Wed, 3 Jun 2020 15:01:42 +0300 +Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to + json.load() + +In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument +is not supported. + +Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +78360c01c796b6260bf828bc9c8a0ef73c5132fd] +--- + Source/JavaScriptCore/generate-bytecode-files | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files +index c5dab429c7b0..af3431275ecf 100644 +--- a/Source/JavaScriptCore/generate-bytecode-files ++++ b/Source/JavaScriptCore/generate-bytecode-files +@@ -163,7 +163,7 @@ if __name__ == "__main__": + initBytecodesFile = openOrExit(initASMFileName, "w") + + try: +- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") ++ bytecodeSections = json.load(bytecodeFile) + except: + print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) + +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch deleted file mode 100644 index 9c2205dd94..0000000000 --- a/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 15 Aug 2017 18:28:49 -0400 -Subject: [PATCH] Detect 32-bits armv8-a architecture -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Adds WTF platform support for the 32-bits armv8-a architectures. - -Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) -and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). - -This commit catches this new architecture (armv8a) within a #ifdef/#endif -inside the if statement dedicated for 32-bits ARM detection. - -Fixes: - - In file included from ./config.h:30:0, - from ... - ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" - # error "Not supported ARM architecture" - ^~~~~ - -Upstream-Status: Backport [with adaptations] -Signed-off-by: Ga?l PORTAY ---- - Source/WTF/wtf/Platform.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 562840cf7..9cf656845 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -243,6 +243,10 @@ - || defined(__ARM_ARCH_7S__) - #define WTF_ARM_ARCH_VERSION 7 - -+#elif defined(__ARM_ARCH_8__) \ -+ || defined(__ARM_ARCH_8A__) -+#define WTF_ARM_ARCH_VERSION 8 -+ - /* MSVC sets _M_ARM */ - #elif defined(_M_ARM) - #define WTF_ARM_ARCH_VERSION _M_ARM --- -2.16.1 - diff --git a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch similarity index 60% rename from package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch rename to package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch index 7bb81b1259..1591b8a82c 100644 --- a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch +++ b/package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch @@ -1,4 +1,4 @@ -From 894a5448ee8ce0f134845c877b4c0a2a660e4ab3 Mon Sep 17 00:00:00 2001 +From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Tue, 4 Aug 2020 21:04:06 +0300 Subject: [PATCH] Let Bison generate the header directly, to fix build with @@ -9,24 +9,25 @@ by default, instead of duplicating it. So we should not delete it. Remove the code to add #ifdef guards to the header, since Bison adds them itself since version 2.6.3. - -[Original patch taken from -https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch?id=69e618c88a9134f754264efc11aa0b1fdc028b88 -ported to qtwebkit-opensource-src-5.9.1] -Signed-off-by: Peter Seiderer +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +d92b11fea65364fefa700249bd3340e0cd4c5b31] --- Source/WebCore/css/makegrammar.pl | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 4e0452ed..9ef32963 100644 +index 5d63b08102eb..9435701c7061 100644 --- a/Source/WebCore/css/makegrammar.pl +++ b/Source/WebCore/css/makegrammar.pl -@@ -73,23 +73,4 @@ if ($suffix eq ".y.in") { +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { } my $fileBase = File::Spec->join($outputDir, $filename); --system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; - -open HEADER, ">$fileBase.h" or die; -print HEADER << "EOF"; @@ -46,7 +47,6 @@ index 4e0452ed..9ef32963 100644 -unlink("$fileBase.cpp.h"); -unlink("$fileBase.hpp"); - -+system("$bison --defines=$fileBase.h -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); -- -2.28.0 +2.25.1 diff --git a/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch b/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch deleted file mode 100644 index 92aab57111..0000000000 --- a/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7d763d441fd4fa78553a818ee75ac477eb6dbcbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= -Date: Sun, 2 Feb 2020 10:48:50 +0100 -Subject: [PATCH] Fix installation of class headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since Qt 5.11 (see commit [1]), the key word HEADER_CLASSES has been -removed. It has been replaced by a new variable GENERATED_HEADER_FILES. - -The class headers were not generated, this commit moves them directly to -HEADER_FILES. - -[1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 - -Signed-off-by: Ga?l PORTAY -[Converted to git formated patch] -Signed-off-by: Peter Seiderer ---- - include/QtWebKit/headers.pri | 3 +-- - include/QtWebKitWidgets/headers.pri | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/include/QtWebKit/headers.pri b/include/QtWebKit/headers.pri -index 6775f3a6..3a5c14cd 100644 ---- a/include/QtWebKit/headers.pri -+++ b/include/QtWebKit/headers.pri -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit --SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion -+SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = -diff --git a/include/QtWebKitWidgets/headers.pri b/include/QtWebKitWidgets/headers.pri -index 9d386e29..2b8b095c 100644 ---- a/include/QtWebKitWidgets/headers.pri -+++ b/include/QtWebKitWidgets/headers.pri -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets --SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion -+SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch new file mode 100644 index 0000000000..48605e4fe4 --- /dev/null +++ b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch @@ -0,0 +1,31 @@ +From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 7 Apr 2021 13:38:09 +0200 +Subject: [PATCH] Remove invalid g_object declarations to fix build with glib + >= 2.68 + +g_object_ref_sink is defined as a macro meanwhile and so the build fails. +Just remove the declarations, glib.h is included anyway. +Signed-off-by: James Hilliard +[Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058] +--- + Source/WTF/wtf/glib/GRefPtr.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h +index 06133d82cb35..d9a1d2f145f5 100644 +--- a/Source/WTF/wtf/glib/GRefPtr.h ++++ b/Source/WTF/wtf/glib/GRefPtr.h +@@ -29,9 +29,6 @@ + #include + #include + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt }; +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch b/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch deleted file mode 100644 index 1a99eb7f84..0000000000 --- a/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 2 Feb 2020 10:51:00 +0100 -Subject: [PATCH] Fix ICU related compile failures. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The ICU macro U16_NEXT() needs a trailing semicolon. - -Fixes: - - platform/graphics/SegmentedFontData.cpp:65:9: error: expected ?;? before ?if? - dom/Document.cpp:3850:5: error: expected ?;? before ?if? - dom/Document.cpp:3855:9: error: expected ?;? before ?if? - dom/Document.cpp:3918:9: error: expected ?;? before ?if? - -Signed-off-by: Peter Seiderer ---- - Source/WebCore/dom/Document.cpp | 6 +++--- - Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index af63b141..26f7312b 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S - const UChar* s = qualifiedName.characters(); - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(s, i, length, c) -+ U16_NEXT(s, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; -diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp -index efb20a8c..99b3e86c 100644 ---- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp -+++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp -@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length) - { - UChar32 c; - for (int i = 0; i < length; ) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!containsCharacter(c)) - return false; - } --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch b/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch deleted file mode 100644 index d9b94697da..0000000000 --- a/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c408484e3a442ecf99d3cc61402f20c45c894b7c Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 3 Feb 2020 21:19:57 +0100 -Subject: [PATCH] configure: remove legacy reference to qtConfig(mirclient) - -The optio mirclient is removed since Qt-5.14.x (see [1]) -Fixes: - - Project ERROR: Could not find feature mirclient. - -[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405 - -Signed-off-by: Peter Seiderer ---- - Tools/qmake/mkspecs/features/configure.prf | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf -index 23d99040..783f6752 100644 ---- a/Tools/qmake/mkspecs/features/configure.prf -+++ b/Tools/qmake/mkspecs/features/configure.prf -@@ -130,9 +130,6 @@ defineTest(finalizeConfigure) { - addReasonForSkippingBuild("Build not supported on Android.") - } - QT_FOR_CONFIG += gui-private -- production_build:qtConfig(mirclient) { -- addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") -- } - !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) { - addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") - } --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch deleted file mode 100644 index 9deb2d8c63..0000000000 --- a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8959e226fac7f73b9a40e202610bd5e12334561b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 15 Sep 2020 19:11:18 +0200 -Subject: [PATCH] let bison generate the header directly, to fix build with - bison 3.7 - -Do the same as the patch taken from [1] for the bison call in -Source/WebCore/DerivedSources.pri to fix file generation -for bison 3.7. - -Signed-off-by: Peter Seiderer ---- - Source/WebCore/DerivedSources.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri -index 57a6b0f7..e9f52614 100644 ---- a/Source/WebCore/DerivedSources.pri -+++ b/Source/WebCore/DerivedSources.pri -@@ -987,7 +987,7 @@ GENERATORS += pluginsresources - # GENERATOR 11: XPATH grammar - xpathbison.output = ${QMAKE_FILE_BASE}.cpp - xpathbison.input = XPATHBISON --xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h -+xpathbison.commands = bison --defines=${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.h -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.cpp - xpathbison.depends = ${QMAKE_FILE_NAME} - GENERATORS += xpathbison - --- -2.28.0 - diff --git a/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch deleted file mode 100644 index 7d941a5683..0000000000 --- a/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 37ee268d9d07a8dad02c1d8db3bf96e0b30df10b Mon Sep 17 00:00:00 2001 -From: Henri Roosen -Date: Thu, 18 Mar 2021 11:53:57 +0100 -Subject: [PATCH] Fix ICU related compile failures from capital bool defines - -See ICU-21267 - -Signed-off-by: Henri Roosen ---- - .../platform/text/TextBreakIteratorICU.cpp | 16 ++++++++-------- - Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -index b4046ac9..832890a2 100644 ---- a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -+++ b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -@@ -214,12 +214,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < numeric_limits::max()); - text->chunkOffset = offset < numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -228,12 +228,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < numeric_limits::max()); - text->chunkOffset = offset < numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } -@@ -243,7 +243,7 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = textNativeLength(text); - UBool isAccessible; - if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -263,7 +263,7 @@ static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward) - ASSERT(newContext == PriorContext); - textLatin1SwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static const struct UTextFuncs textLatin1Funcs = { -@@ -364,7 +364,7 @@ static void textUTF16SwitchToPriorContext(UText* text, int64_t nativeIndex, int6 - static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = textNativeLength(text); - UBool isAccessible; - if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -384,7 +384,7 @@ static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward) - ASSERT(newContext == PriorContext); - textUTF16SwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static const struct UTextFuncs textUTF16Funcs = { -diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp -index 86d4ea17..da152edd 100644 ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -269,7 +269,7 @@ void TextCodecICU::createICUConverter() const - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) --- -2.20.1 - diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 82e38dff52..b7beb2b252 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -9,10 +9,24 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_BINFMT_FLAT # icu # assumes a FPU is available on MIPS depends on !BR2_MIPS_SOFT_FLOAT + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_ICU + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION + select BR2_PACKAGE_QT5SENSORS + select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB help diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 312d58272a..d7c8bd6c8a 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,5 +1,5 @@ -# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz +# Locally calculated +sha256 9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6 qtwebkit-5.212.0-alpha4.tar.xz # Hashes for license files: sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index dd99661be0..3af1918a46 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBKIT_VERSION = 5.9.1 -QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_VERSION = 5.212.0-alpha4 +QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION) +QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ - host-bison host-flex host-gperf host-python host-ruby \ - leveldb sqlite + host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ + gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ + qt5sensors qt5webchannel sqlite webp woff2 QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 @@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender +QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_DEPENDENCIES += qt5declarative endif -# QtWebkit's build system uses python, but only supports python2. We work -# around this by forcing python2 early in the PATH, via a python->python2 -# symlink. -QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -define QT5WEBKIT_PYTHON2_SYMLINK - mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python -endef -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK +QT5WEBKIT_CONF_OPTS += \ + -DPORT=Qt \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DUSE_LIBHYPHEN=OFF -QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb - -define QT5WEBKIT_INSTALL_TARGET_EXTRAS - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ -endef - -QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS - -$(eval $(qmake-package)) +$(eval $(cmake-package)) -- 2.25.1 From yann.morin.1998 at free.fr Tue Jan 4 08:27:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 09:27:36 +0100 Subject: [Buildroot] [git commit] package/pkg-waf.mk: enable verbose compile Message-ID: <20220104082233.C52DA82A54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0db062f4b6a7e249602e540204e7e428fc5ff2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Honour the buildroot verbose flag ('V=1') for the waf compile step by adding '-v' to the build command. Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index a593476a69..d546b4a817 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -20,6 +20,8 @@ # ################################################################################ +WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) + ################################################################################ # inner-waf-package -- defines how the configuration, compilation and # installation of a waf package should be done, implements a few hooks @@ -74,7 +76,7 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ + build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef endif From yann.morin.1998 at free.fr Tue Jan 4 08:29:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 09:29:41 +0100 Subject: [Buildroot] [PATCH v1] package/pkg-waf.mk: enable verbose compile In-Reply-To: <20220103215619.4580-1-ps.report@gmx.net> References: <20220103215619.4580-1-ps.report@gmx.net> Message-ID: <20220104082941.GQ69135@scaer> Peter, All, On 2022-01-03 22:56 +0100, Peter Seiderer spake thusly: > Honour the buildroot verbose flag ('V=1') for the waf compile step by > adding '-v' to the build command. > > Signed-off-by: Peter Seiderer > --- > package/pkg-waf.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk > index a593476a69..0239862ac6 100644 > --- a/package/pkg-waf.mk > +++ b/package/pkg-waf.mk > @@ -20,6 +20,8 @@ > # > ################################################################################ > > +WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) s/\t=/ =/ Applied to master, thanks. Regards, Yann E. MORIN. > ################################################################################ > # inner-waf-package -- defines how the configuration, compilation and > # installation of a waf package should be done, implements a few hooks > @@ -74,7 +76,7 @@ ifndef $(2)_BUILD_CMDS > define $(2)_BUILD_CMDS > cd $$($$(PKG)_SRCDIR) && \ > $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ > - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ > + build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \ > $$($(2)_WAF_OPTS) > endef > endif > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 4 08:30:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 09:30:11 +0100 Subject: [Buildroot] [PATCH 1/3] package/qemu: reorder enable/disable options alphabetically In-Reply-To: <20220103210048.7879-1-romain.naour@gmail.com> References: <20220103210048.7879-1-romain.naour@gmail.com> Message-ID: <20220104083011.GR69135@scaer> Romain, All, On 2022-01-03 22:00 +0100, Romain Naour spake thusly: > Signed-off-by: Romain Naour Series of three patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/qemu/qemu.mk | 44 ++++++++++++++++++++++---------------------- > 1 file changed, 22 insertions(+), 22 deletions(-) > > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 97f9f885a1..43450a6649 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -187,39 +187,39 @@ define QEMU_CONFIGURE_CMDS > --audio-drv-list= \ > --meson=$(HOST_DIR)/bin/meson \ > --ninja=$(HOST_DIR)/bin/ninja \ > - --enable-kvm \ > - --enable-attr \ > - --enable-vhost-net \ > --disable-bpf \ > + --disable-brlapi \ > --disable-bsd-user \ > + --disable-cap-ng \ > + --disable-capstone \ > --disable-containers \ > - --disable-xen \ > - --disable-virtfs \ > - --disable-brlapi \ > - --disable-curses \ > --disable-curl \ > - --disable-vde \ > - --disable-linux-aio \ > - --disable-linux-io-uring \ > - --disable-cap-ng \ > + --disable-curses \ > --disable-docs \ > - --disable-rbd \ > - --disable-libiscsi \ > - --disable-strip \ > - --disable-sparse \ > - --disable-mpath \ > - --disable-sanitizers \ > --disable-hvf \ > - --disable-whpx \ > + --disable-libiscsi \ > + --disable-libxml2 \ > + --disable-linux-aio \ > + --disable-linux-io-uring \ > --disable-malloc-trim \ > --disable-membarrier \ > - --disable-vhost-crypto \ > - --disable-libxml2 \ > - --disable-capstone \ > - --with-git-submodules=ignore \ > + --disable-mpath \ > --disable-opengl \ > + --disable-rbd \ > + --disable-sanitizers \ > + --disable-sparse \ > + --disable-strip \ > + --disable-vde \ > + --disable-vhost-crypto \ > --disable-vhost-user-blk-server \ > + --disable-virtfs \ > --disable-virtiofsd \ > + --disable-whpx \ > + --disable-xen \ > + --enable-attr \ > + --enable-kvm \ > + --enable-vhost-net \ > + --with-git-submodules=ignore \ > $(QEMU_OPTS) > endef > > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From clg at kaod.org Tue Jan 4 09:05:09 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Tue, 4 Jan 2022 10:05:09 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <1b60df77-a795-f328-6651-4e3b5c4b0757@gmail.com> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> <1b60df77-a795-f328-6651-4e3b5c4b0757@gmail.com> Message-ID: <20b2bd43-9fe6-f174-e437-7595ea5864d8@kaod.org> Hello, On 1/3/22 23:43, Romain Naour wrote: > Le 03/01/2022 ? 23:20, C?dric Le Goater a ?crit?: >> Hello, >>> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >>> >>> Create a test branch named: qemu-6.2.0-defconfigs-qemu >>> >>> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >>> Buildroot defconfis and "qemu" is a pattern. >>> >>> See: >>> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >>> >>> >>> "pushing a branch called "-defconfigs-" which will test all >>> defconfigs whose name start with the pattern." >> >> That looks simple enough. Something is going wrong though : >> >> ? https://gitlab.com/legoater/buildroot/-/jobs/1937752353 >> >> Am I missing something ? > > humm, maybe there is weakness in the script when foo is "qemu-6.2.0" > ^ > Try again with something else like qemu_6.2.0-defconfigs-qemu Yes. That was it. Thanks, C. From guillaume.bressaix at gmail.com Tue Jan 4 12:38:59 2022 From: guillaume.bressaix at gmail.com (guillaume.bressaix at gmail.com) Date: Tue, 4 Jan 2022 13:38:59 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/python-pybind: fix upgrade to 2.6.1 In-Reply-To: References: Message-ID: <20220104123901.23929-1-guillaume.bressaix@gmail.com> From: "Guillaume W. Bres" Fixes http://autobuild.buildroot.net/results/b89f1de64b308dffa73675f1f31ccb0b7be5a10d http://autobuild.buildroot.net/results/d0287b7f64f206b0f074908c5780a3632e0cb799 http://autobuild.buildroot.net/results/27efb545a5a719a5581c8f746d3a3555ff4216ce http://autobuild.buildroot.net/results/d2f0a0ad8f6c7178517df109e7d885dac9134c3a http://autobuild.buildroot.net/results/b57e9a3279260dae4a590f9421238fcabb2f7cab http://autobuild.buildroot.net/results/515e6f2fc6b5780260d98d6bb52b541ce4bf1afe http://autobuild.buildroot.net/results/d89c4ecc81222d4f80c951da2232d2e393fa1c69 Signed-off-by: Guillaume W. Bres --- setup.py now calls 'cmake', as is, internally, with DESTDIR=$(@D) to provide some setup.py build requirements. The autobuild failures were actually of different kinds: (1) 'cmake' too old causes an early crash as it is unable to parse their CMakeList.txt (host machine dependent) (2) $(@D)/pybind missing because cmake call was faulty (happened all the time) The provided patch allows us to fully control the hidden cmake context: * which 'cmake' is actually called is important, as most of the time we end up using /usr/bin/cmake. By adding BR2_CMAKE_DEPENDENCY we make sure (1) never happens and (2) is always solved with a complete cmake context control. We could convert python-pybind to a cmake package but it involves so much patching and tweaking (mostly for the python install), that it is now clear that keeping the package as is, is the best option. I also fixed the previous package declaration / handling: * this is a header only lib, so installing to target does not make sense, and installing to staging is mandatory * most of the time, this package will be used at compile time, on host, so having the host-package option is mandatory. This package is then used to customize the host/usr/python capacity, with C++ macro bindings. This patch serie provides an example of use, that does exactly that, and works for both python2 and python3 (refer to following patch) --- ...-py-improve-cmake-context-definition.patch | 48 +++++++++++++++++++ package/python-pybind/python-pybind.mk | 47 ++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 package/python-pybind/0001-setup-py-improve-cmake-context-definition.patch diff --git a/package/python-pybind/0001-setup-py-improve-cmake-context-definition.patch b/package/python-pybind/0001-setup-py-improve-cmake-context-definition.patch new file mode 100644 index 0000000000..0952d44464 --- /dev/null +++ b/package/python-pybind/0001-setup-py-improve-cmake-context-definition.patch @@ -0,0 +1,48 @@ +From aeee170bc90d89973268f286c8bfa12afd8f330c Mon Sep 17 00:00:00 2001 +From: "Guillaume W. Bres" +Date: Thu, 9 Dec 2021 20:30:08 +0100 +Subject: [PATCH] setup.py: improve cmake context definition + +Use two env. variables to define which cmake +is internally called and pass a toolchain file +for complex cross-compilation contexts. + +Signed-off-by: Guillaume W. Bres +--- + setup.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3a03279..2dff721 100644 +--- a/setup.py ++++ b/setup.py +@@ -23,6 +23,8 @@ VERSION_REGEX = re.compile( + # files, and the sys.prefix files (CMake and headers). + + global_sdist = os.environ.get("PYBIND11_GLOBAL_SDIST", False) ++global_cmake = os.environ.get("PYBIND11_CMAKE", "unknown") ++global_cmake_toolchain_file = os.environ.get("PYBIND11_CMAKE_TOOLCHAIN_FILE", "unknown") + + setup_py = "tools/setup_global.py.in" if global_sdist else "tools/setup_main.py.in" + extra_cmd = 'cmdclass["sdist"] = SDist\n' +@@ -101,14 +103,15 @@ def remove_output(*sources): + with remove_output("pybind11/include", "pybind11/share"): + # Generate the files if they are not present. + with TemporaryDirectory() as tmpdir: +- cmd = ["cmake", "-S", ".", "-B", tmpdir] + [ ++ cmd = [global_cmake, "-S", ".", "-B", tmpdir] + [ + "-DCMAKE_INSTALL_PREFIX=pybind11", ++ "-DCMAKE_TOOLCHAIN_FILE={:s}".format(global_cmake_toolchain_file), + "-DBUILD_TESTING=OFF", + "-DPYBIND11_NOPYTHON=ON", + ] + cmake_opts = dict(cwd=DIR, stdout=sys.stdout, stderr=sys.stderr) + subprocess.check_call(cmd, **cmake_opts) +- subprocess.check_call(["cmake", "--install", tmpdir], **cmake_opts) ++ subprocess.check_call([global_cmake, "--install", tmpdir], **cmake_opts) + + txt = get_and_replace(setup_py, version=version, extra_cmd=extra_cmd) + code = compile(txt, setup_py, "exec") +-- +1.8.3.1 + diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index a6a1bdb976..442ed3328f 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -10,4 +10,51 @@ PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE PYTHON_PYBIND_SETUP_TYPE = setuptools +# Only installs header files +PYTHON_PYBIND_INSTALL_TARGET = NO +PYTHON_PYBIND_INSTALL_STAGING = YES + +# their cmakelist.txt file needs a recent cmake +PYTHON_PYBIND_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) +HOST_PYTHON_PYBIND_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) + +# every single setup.py interaction calls 'cmake' (as is) intrinsicly. +# we deliver a patch to customize setup.py to define the cmake context +# using the following variables +PYTHON_PYBIND_MAKE_ENV = $(MAKE_ENV) +PYTHON_PYBIND_SETUPTOOLS_ENV = $(PKG_PYTHON_SETUPTOOLS_ENV) +PYTHON_PYBIND_SETUPTOOLS_ENV += PYBIND11_CMAKE=$(BR2_CMAKE) +PYTHON_PYBIND_SETUPTOOLS_ENV += PYBIND11_CMAKE_TOOLCHAIN_FILE=$(HOST_DIR)/share/buildroot/toolchainfile.cmake + +HOST_PYTHON_PYBIND_MAKE_ENV = $(MAKE_ENV) +HOST_PYTHON_PYBIND_SETUPTOOLS_ENV = $(PKG_PYTHON_SETUPTOOLS_ENV) +HOST_PYTHON_PYBIND_SETUPTOOLS_ENV += PYBIND11_CMAKE=$(BR2_CMAKE) +HOST_PYTHON_PYBIND_SETUPTOOLS_ENV += PYBIND11_CMAKE_TOOLCHAIN_FILE=$(HOST_DIR)/share/buildroot/toolchainfile.cmake + +define PYTHON_PYBIND_BUILD_CMDS + cd $(@D); \ + $(PYTHON_PYBIND_SETUPTOOLS_ENV) $(HOST_DIR)/usr/bin/python setup.py build +endef + +define HOST_PYTHON_PYBIND_BUILD_CMDS + cd $(@D); \ + $(PYTHON_PYBIND_SETUPTOOLS_ENV) $(HOST_DIR)/usr/bin/python setup.py build +endef + +# define installation destinations properly +define PYTHON_PYBIND_INSTALL_STAGING_CMDS + cd $(@D); \ + $(PYTHON_PYBIND_SETUPTOOLS_ENV) \ + PREFIX=$(STAGING_DIR)/usr \ + $(HOST_DIR)/bin/python setup.py install +endef + +define HOST_PYTHON_PYBIND_INSTALL_CMDS + cd $(@D); \ + $(PYTHON_PYBIND_SETUPTOOLS_ENV) \ + PREFIX=$(HOST_DIR)/usr \ + $(HOST_DIR)/bin/python setup.py install +endef + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.30.2 From guillaume.bressaix at gmail.com Tue Jan 4 12:39:00 2022 From: guillaume.bressaix at gmail.com (guillaume.bressaix at gmail.com) Date: Tue, 4 Jan 2022 13:39:00 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/python-pybind: bump to version 2.8.1 In-Reply-To: <20220104123901.23929-1-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> Message-ID: <20220104123901.23929-2-guillaume.bressaix@gmail.com> From: "Guillaume W. Bres" Signed-off-by: Guillaume W. Bres --- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index a68ac846e2..e1d86a4494 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a python-pybind-2.6.1.tar.gz +sha256 f1bcc07caa568eb312411dde5308b1e250bd0e1bc020fae855bf9f43209940cc python-pybind-2.8.1.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index 442ed3328f..cf6a642922 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.6.1 +PYTHON_PYBIND_VERSION = 2.8.1 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE -- 2.30.2 From guillaume.bressaix at gmail.com Tue Jan 4 12:39:01 2022 From: guillaume.bressaix at gmail.com (guillaume.bressaix at gmail.com) Date: Tue, 4 Jan 2022 13:39:01 +0100 Subject: [Buildroot] [PATCH v2 3/3] support/testing: add test for python-pybind In-Reply-To: <20220104123901.23929-1-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> Message-ID: <20220104123901.23929-3-guillaume.bressaix@gmail.com> From: "Guillaume W. Bres" python-pybind is a header only library, most of the time used as a host-package, to customize the host/usr/python interpreter capacity (at build time) with C++ based features. Signed-off-by: Guillaume W. Bres --- This test case enhances the /host/usr/python interpreter with a C++ macro. The test delivers a C++ macro contained in its br-external/example.cpp. We compile it against the host context. We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively contained in the host-python system path (import is easy). The macro is an integer adder, written in C++ that we can now call in host-python. The test infrastructure should actually be declared "host-generic-package" instead of "generic-package", to be consistent with Buildroot infrastructure. But I am not able to get this to actually do anything, if I declare this package as a host-generic and "Config.in.host" instead of "Config.in". To me, this is not too important * TestPythonPybind allows testing for both Py2 and Py3 like it is done in many other packages * TestPythonPybind does not inherit from TestPythonPackageBase as usually done (1) because I need the br2-external feature to ship the example.cpp containing the custom macro (2) because TestPythonPackageBase always involves the emulator, which we do not want in our context * Although TestPythonPybind does have a TestPythonBase.config base at the same time, as it is most convenient to have a valid python context * TestPythonPybind uses subprocess, as similarly done in 'core' on 'infra' test cases, because we do not involve the emulator * TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3 * TestPythonPybind tests a custom module attribute, written in C++, used in Python 2/3 --- DEVELOPERS | 3 ++ .../br2-external/python-pybind/Config.in | 1 + .../br2-external/python-pybind/external.desc | 1 + .../br2-external/python-pybind/external.mk | 1 + .../package/python-pybind-example/Config.in | 5 ++ .../package/python-pybind-example/example.cpp | 16 +++++++ .../python-pybind-example.mk | 47 ++++++++++++++++++ .../tests/package/sample_python_pybind.py | 4 ++ .../tests/package/test_python_pybind.py | 48 +++++++++++++++++++ 9 files changed, 126 insertions(+) create mode 100644 support/testing/tests/package/br2-external/python-pybind/Config.in create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.desc create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.mk create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk create mode 100644 support/testing/tests/package/sample_python_pybind.py create mode 100644 support/testing/tests/package/test_python_pybind.py diff --git a/DEVELOPERS b/DEVELOPERS index 21e4f2a84c..130ac3db73 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1120,6 +1120,9 @@ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ F: package/reaver/ +F: support/testing/tests/package/br2-external/python-pybind +F: support/testing/tests/package/sample_python_pybind.py +F: support/testing/tests/package/test_python_pybind.py N: Guo Ren F: arch/Config.in.csky diff --git a/support/testing/tests/package/br2-external/python-pybind/Config.in b/support/testing/tests/package/br2-external/python-pybind/Config.in new file mode 100644 index 0000000000..70c77157b3 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in" diff --git a/support/testing/tests/package/br2-external/python-pybind/external.desc b/support/testing/tests/package/br2-external/python-pybind/external.desc new file mode 100644 index 0000000000..eef5e0f5a0 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/external.desc @@ -0,0 +1 @@ +name: PYTHON_PYBIND diff --git a/support/testing/tests/package/br2-external/python-pybind/external.mk b/support/testing/tests/package/br2-external/python-pybind/external.mk new file mode 100644 index 0000000000..3501f3135e --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in new file mode 100644 index 0000000000..773d021a53 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE + bool "python-pybind-example" + depends on BR2_PACKAGE_PYTHON_PYBIND + help + This test creates a cpp macro later used on target in python diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp new file mode 100644 index 0000000000..f2eea8e48d --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp @@ -0,0 +1,16 @@ +#include +namespace py = pybind11; + +int add (int i, int j) { + return i + j; +} + +PYBIND11_MODULE (example, m) { + // optional module description + m.doc() = "pybind11 example plugin"; + // test a module method + m.def("add", &add, "example::add adds two integer numbers"); + // test a module attribute + py::object hello = py::cast("Hello World"); + m.attr("says") = hello; +} diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk new file mode 100644 index 0000000000..85dd09d93f --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# python-pybind-example +# +################################################################################ + +# this builds a C++ macro "add(a,b)" +# that we expose to host-python with a custom install +# and that the python test script will later use +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind + +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS) +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR) +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3 +else +PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR) +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2 +endif + +# retrieve pybind11 include paths +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \ + $(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes) + +# .so to be installed must have exact suffix +# otherwise import() in python will not work +HOST_LIB_BINARY_SUFFIX = \ + $(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix) + +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS + $(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D) + cd $(@D); \ + $(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \ + example.cpp -o example$(HOST_LIB_BINARY_SUFFIX) +endef + +# installs into host/python sys.path +# so the new macro is naturally known +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \ + $(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX) +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py new file mode 100644 index 0000000000..605c0bab15 --- /dev/null +++ b/support/testing/tests/package/sample_python_pybind.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import example +print(example.add(1, 2)) +print(example.says) diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py new file mode 100644 index 0000000000..7a68d6512a --- /dev/null +++ b/support/testing/tests/package/test_python_pybind.py @@ -0,0 +1,48 @@ +import os +import infra +import subprocess +from tests.package.test_python import TestPythonPackageBase + +class TestPythonPybind (infra.basetest.BRTest): + config = TestPythonPackageBase.config # python minimal requirements + sample_script = "tests/package/sample_python_pybind.py" + # ship examples macro & installs it to host + br2_external = [infra.filepath("tests/package/br2-external/python-pybind")] + +class TestPythonPy2Pybind (TestPythonPybind): + __test__ = True + config = TestPythonPybind.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_PYBIND=y + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y + """ + + def test_run(self): + host_interpreter = os.path.join(self.builddir,"host","usr","bin","python") + # test new c++->py macro exposed to host interpreter + cmd = [host_interpreter, infra.filepath(self.sample_script)] + output = subprocess.check_output(cmd) + result = int(output.splitlines()[0]) + attribute = output.splitlines()[1].decode("utf-8") + self.assertEqual(result,3) # 2+1 using '+' macro from cpp + self.assertEqual(attribute,"Hello World") # macro special attribute + +class TestPythonPy3Pybind (TestPythonPybind): + __test__ = True + config = TestPythonPybind.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYBIND=y + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y + """ + + def test_run(self): + host_interpreter = os.path.join(self.builddir,"host","usr","bin","python") + # test new c++->py macro exposed to host interpreter + cmd = [host_interpreter, infra.filepath(self.sample_script)] + output = subprocess.check_output(cmd) + result = int(output.splitlines()[0]) + attribute = output.splitlines()[1].decode("utf-8") + self.assertEqual(result,3) # 2+1 using '+' macro from cpp + self.assertEqual(attribute,"Hello World") # macro special attribute -- 2.30.2 From buildroot at heine.tech Tue Jan 4 13:34:03 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Tue, 4 Jan 2022 14:34:03 +0100 Subject: [Buildroot] [PATCH] package/json-for-modern-cpp: bump version to 3.10.5 Message-ID: <20220104133416.5185-1-buildroot@heine.tech> * Update License hash due to updated year Fixes: - Make sure C++17 filesystem conversions are only used if the compiler supports it. Signed-off-by: Michael Nosthoff --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 4 ++-- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index eb14d2fd6d..a193fa6d49 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3 json-3.10.4.tar.gz -sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT +sha256 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz +sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 428473db5a..fd13ce1fd1 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.10.4 +JSON_FOR_MODERN_CPP_VERSION = 3.10.5 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT -- 2.25.1 From arnout at mind.be Tue Jan 4 16:44:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:44:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: new package In-Reply-To: <20220101135737.956301-1-fontaine.fabrice@gmail.com> References: <20220101135737.956301-1-fontaine.fabrice@gmail.com> Message-ID: <0949e63d-a8b0-d70c-af17-06cecbbe87f1@mind.be> On 01/01/2022 14:57, Fabrice Fontaine wrote: > ksmbd kernel server userspace utilities. > > https://github.com/cifsd-team/ksmbd-tools > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/ksmbd-tools/Config.in | 15 +++++++++++++++ > package/ksmbd-tools/ksmbd-tools.hash | 3 +++ > package/ksmbd-tools/ksmbd-tools.mk | 20 ++++++++++++++++++++ > 5 files changed, 40 insertions(+) > create mode 100644 package/ksmbd-tools/Config.in > create mode 100644 package/ksmbd-tools/ksmbd-tools.hash > create mode 100644 package/ksmbd-tools/ksmbd-tools.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 98ff2372cc..cf0e6fe0fc 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -870,6 +870,7 @@ F: package/hiredis/ > F: package/i2pd/ > F: package/igd2-for-linux/ > F: package/json-c/ > +F: package/ksmbd-tools/ > F: package/lcms2/ > F: package/lftp/ > F: package/libcap-ng/ > diff --git a/package/Config.in b/package/Config.in > index 4185675e4c..1e25ccd964 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2235,6 +2235,7 @@ endif > source "package/keepalived/Config.in" > source "package/kismet/Config.in" > source "package/knock/Config.in" > + source "package/ksmbd-tools/Config.in" > source "package/leafnode2/Config.in" > source "package/lft/Config.in" > source "package/lftp/Config.in" > diff --git a/package/ksmbd-tools/Config.in b/package/ksmbd-tools/Config.in > new file mode 100644 > index 0000000000..ce1850e016 > --- /dev/null > +++ b/package/ksmbd-tools/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_KSMBD_TOOLS > + bool "ksmbd-tools" > + depends on BR2_USE_MMU # fork() > + depends on BR2_USE_WCHAR # libglib2 > + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libnl > + select BR2_PACKAGE_LIBGLIB2 > + select BR2_PACKAGE_LIBNL > + help > + ksmbd kernel server userspace utilities. > + > + https://github.com/cifsd-team/ksmbd-tools > + > +comment "ksmbd-tools needs a toolchain w/ wchar, threads" > + depends on BR2_USE_MMU > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash > new file mode 100644 > index 0000000000..ad507bfdb2 > --- /dev/null > +++ b/package/ksmbd-tools/ksmbd-tools.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz > +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING > diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk > new file mode 100644 > index 0000000000..b3ffc3e768 > --- /dev/null > +++ b/package/ksmbd-tools/ksmbd-tools.mk > @@ -0,0 +1,20 @@ > +################################################################################ > +# > +# ksmbd-tools > +# > +################################################################################ > + > +KSMBD_TOOLS_VERSION = 3.4.3 > +KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) > +KSMBD_TOOLS_LICENSE = GPL-2.0+ > +KSMBD_TOOLS_LICENSE_FILES = COPYING > +KSMBD_TOOLS_DEPENDENCIES = host-pkgconf libglib2 libnl > + > +ifeq ($(BR2_PACKAGE_LIBKRB5),y) > +KSMBD_TOOLS_CONF_OPTS += --enable-krb5 > +KSMBD_TOOLS_DEPENDENCIES += libkrb5 > +else > +KSMBD_TOOLS_CONF_OPTS += --disable-krb5 > +endif > + > +$(eval $(autotools-package)) > From arnout at mind.be Tue Jan 4 16:44:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:44:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectd: add ipmi support In-Reply-To: <20220101140324.1001998-1-fontaine.fabrice@gmail.com> References: <20220101140324.1001998-1-fontaine.fabrice@gmail.com> Message-ID: On 01/01/2022 15:03, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/collectd/Config.in | 11 +++++++++++ > package/collectd/collectd.mk | 4 +++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/package/collectd/Config.in b/package/collectd/Config.in > index 05fb577345..5e5dff6fe1 100644 > --- a/package/collectd/Config.in > +++ b/package/collectd/Config.in > @@ -312,6 +312,17 @@ config BR2_PACKAGE_COLLECTD_IPC > IPC counters: semaphores used, number of allocated segments > in shared memory and more. > > +config BR2_PACKAGE_COLLECTD_IPMI > + bool "ipmi" > + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > + select BR2_PACKAGE_OPENIPMI > + help > + Read hardware sensors from servers using the Intelligent > + Platform Management Interface (IPMI). > + > +comment "ipmi needs a toolchain w/ NPTL" > + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL > + > config BR2_PACKAGE_COLLECTD_IPTABLES > bool "iptables" > select BR2_PACKAGE_IPTABLES > diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk > index d01058471d..9d6f630fe3 100644 > --- a/package/collectd/collectd.mk > +++ b/package/collectd/collectd.mk > @@ -18,7 +18,7 @@ COLLECTD_SELINUX_MODULES = apache collectd > # These require unmet dependencies, are fringe, pointless or deprecated > COLLECTD_PLUGINS_DISABLE = \ > apple_sensors aquaero ascent barometer dpdkstat email \ > - gmond hddtemp intel_rdt ipmi java lpar \ > + gmond hddtemp intel_rdt java lpar \ > madwifi mbmon mic multimeter netapp notify_desktop numa \ > oracle perl pf pinba powerdns python routeros \ > rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ > @@ -88,6 +88,7 @@ COLLECTD_CONF_OPTS += \ > $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ > $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ > $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ > + $(if $(BR2_PACKAGE_COLLECTD_IPMI),--enable-ipmi,--disable-ipmi) \ > $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ > $(if $(BR2_PACKAGE_COLLECTD_IPVS),--enable-ipvs,--disable-ipvs) \ > $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ > @@ -174,6 +175,7 @@ COLLECTD_DEPENDENCIES = \ > $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \ > $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ > $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ > + $(if $(BR2_PACKAGE_COLLECTD_IPMI),openipmi) \ > $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ > $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ > $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ > From arnout at mind.be Tue Jan 4 16:45:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:45:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: fix avahi build In-Reply-To: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> References: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> Message-ID: <29663017-0e83-de96-8fd6-ac2752b503fc@mind.be> On 01/01/2022 15:26, Fabrice Fontaine wrote: > Fix the following build failure raised since commit > 27908c6eab768d0b9fd3444a929b3f1b1510da71: > > ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency "avahi-client" not found, tried pkgconfig > > Fixes: > - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 > > Signed-off-by: Fabrice Fontaine > --- > package/pipewire/pipewire.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk > index efda3ad695..7043745cc1 100644 > --- a/package/pipewire/pipewire.mk > +++ b/package/pipewire/pipewire.mk > @@ -82,7 +82,8 @@ else > PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled > endif > > -ifeq ($(BR2_PACKAGE_AVAHI),y) > +# avahi support needs avahi-client, which needs avahi-daemon and dbus > +ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) BR2_PACKAGE_AVAHI is redundant with BR2_PACKAGE_AVAHI_DAEMON, but I kept it anyway since it's IMHO a little clearer that way. Applied to master, thanks. Regards, Arnout > PIPEWIRE_CONF_OPTS += -Davahi=enabled > PIPEWIRE_DEPENDENCIES += avahi > else > From arnout at mind.be Tue Jan 4 16:46:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:46:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/libapparmor: fix build with python 3.10 In-Reply-To: <20220101144840.1387059-1-fontaine.fabrice@gmail.com> References: <20220101144840.1387059-1-fontaine.fabrice@gmail.com> Message-ID: On 01/01/2022 15:48, Fabrice Fontaine wrote: > Fix the following build failure raised since bump of python3 to version > 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > configure: error: cannot import Python module "distutils". > Please check your Python installation. The error was: > :1: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives > > Fixes: > - http://autobuild.buildroot.org/results//f3e400cbb5b00fbd7f0cb421c993e46b64ec5ac5 > > Signed-off-by: Fabrice Fontaine > --- > ...deprecated-distutils-with-setuptools.patch | 244 ++++++++++++++++++ > package/libapparmor/libapparmor.mk | 2 +- > 2 files changed, 245 insertions(+), 1 deletion(-) > create mode 100644 package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > > diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > new file mode 100644 > index 0000000000..5aed31d0b5 > --- /dev/null > +++ b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > @@ -0,0 +1,244 @@ > +From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 > +From: Georgia Garcia > +Date: Wed, 10 Nov 2021 19:50:35 +0000 > +Subject: [PATCH] replace deprecated distutils with setuptools > + > +Adds python3 setuptools as a build dependency for libapparmor > + > +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 > +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 > +Signed-off-by: Georgia Garcia > +Acked-by: Christian Boltz > + > +[Retrieved (and updated to remove changes on .gitlab-ci.yml and > +README.md) from: > +https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] > +Signed-off-by: Fabrice Fontaine > +--- > + .gitignore | 3 ++ > + .gitlab-ci.yml | 2 +- > + libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- Sounds like this requires AUTORECONF = YES ... which was already set because it wasn't removed when the version was bumped and the patches removed. So I updated the comment and the commit message, and applied to master, thanks. Regards, Arnout [snip] From arnout at mind.be Tue Jan 4 16:17:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:17:30 +0100 Subject: [Buildroot] [git commit] package/collectd: add ipmi support Message-ID: <20220104164044.8E57B82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53ba8d3c0e1f7d4023ff37f6aea838043466c59e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/collectd/Config.in | 11 +++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 05fb577345..5e5dff6fe1 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -312,6 +312,17 @@ config BR2_PACKAGE_COLLECTD_IPC IPC counters: semaphores used, number of allocated segments in shared memory and more. +config BR2_PACKAGE_COLLECTD_IPMI + bool "ipmi" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_OPENIPMI + help + Read hardware sensors from servers using the Intelligent + Platform Management Interface (IPMI). + +comment "ipmi needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + config BR2_PACKAGE_COLLECTD_IPTABLES bool "iptables" select BR2_PACKAGE_IPTABLES diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index d01058471d..9d6f630fe3 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -18,7 +18,7 @@ COLLECTD_SELINUX_MODULES = apache collectd # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dpdkstat email \ - gmond hddtemp intel_rdt ipmi java lpar \ + gmond hddtemp intel_rdt java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ @@ -88,6 +88,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ + $(if $(BR2_PACKAGE_COLLECTD_IPMI),--enable-ipmi,--disable-ipmi) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ $(if $(BR2_PACKAGE_COLLECTD_IPVS),--enable-ipvs,--disable-ipvs) \ $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ @@ -174,6 +175,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),jansson) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ + $(if $(BR2_PACKAGE_COLLECTD_IPMI),openipmi) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ From arnout at mind.be Tue Jan 4 16:17:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:17:33 +0100 Subject: [Buildroot] [git commit] package/pipewire: fix avahi build Message-ID: <20220104164044.97B2582E21@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5131f6f28e384eb9dca1b11f571536e38d3ee9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit 27908c6eab768d0b9fd3444a929b3f1b1510da71: ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency "avahi-client" not found, tried pkgconfig Fixes: - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pipewire/pipewire.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index efda3ad695..7043745cc1 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -82,7 +82,8 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# avahi support needs avahi-client, which needs avahi-daemon and dbus +ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else From arnout at mind.be Tue Jan 4 16:17:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:17:27 +0100 Subject: [Buildroot] [git commit] package/ksmbd-tools: new package Message-ID: <20220104164044.8561782BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6be9913a7eeead7cdac804afc127791ba4b0e69e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ksmbd kernel server userspace utilities. https://github.com/cifsd-team/ksmbd-tools Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ksmbd-tools/Config.in | 15 +++++++++++++++ package/ksmbd-tools/ksmbd-tools.hash | 3 +++ package/ksmbd-tools/ksmbd-tools.mk | 20 ++++++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 21e4f2a84c..37c792816a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -870,6 +870,7 @@ F: package/hiredis/ F: package/i2pd/ F: package/igd2-for-linux/ F: package/json-c/ +F: package/ksmbd-tools/ F: package/lcms2/ F: package/lftp/ F: package/libcap-ng/ diff --git a/package/Config.in b/package/Config.in index d3d0717535..7148639735 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2231,6 +2231,7 @@ endif source "package/keepalived/Config.in" source "package/kismet/Config.in" source "package/knock/Config.in" + source "package/ksmbd-tools/Config.in" source "package/leafnode2/Config.in" source "package/lft/Config.in" source "package/lftp/Config.in" diff --git a/package/ksmbd-tools/Config.in b/package/ksmbd-tools/Config.in new file mode 100644 index 0000000000..ce1850e016 --- /dev/null +++ b/package/ksmbd-tools/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_KSMBD_TOOLS + bool "ksmbd-tools" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libnl + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBNL + help + ksmbd kernel server userspace utilities. + + https://github.com/cifsd-team/ksmbd-tools + +comment "ksmbd-tools needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash new file mode 100644 index 0000000000..ad507bfdb2 --- /dev/null +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk new file mode 100644 index 0000000000..b3ffc3e768 --- /dev/null +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# ksmbd-tools +# +################################################################################ + +KSMBD_TOOLS_VERSION = 3.4.3 +KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) +KSMBD_TOOLS_LICENSE = GPL-2.0+ +KSMBD_TOOLS_LICENSE_FILES = COPYING +KSMBD_TOOLS_DEPENDENCIES = host-pkgconf libglib2 libnl + +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +KSMBD_TOOLS_CONF_OPTS += --enable-krb5 +KSMBD_TOOLS_DEPENDENCIES += libkrb5 +else +KSMBD_TOOLS_CONF_OPTS += --disable-krb5 +endif + +$(eval $(autotools-package)) From arnout at mind.be Tue Jan 4 16:41:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:41:24 +0100 Subject: [Buildroot] [git commit] package/libapparmor: fix build with python 3.10 Message-ID: <20220104164044.A29D682BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40a09b263486b95f000547860da451b32ad19174 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: configure: error: cannot import Python module "distutils". Please check your Python installation. The error was: :1: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives Fixes: - http://autobuild.buildroot.org/results//f3e400cbb5b00fbd7f0cb421c993e46b64ec5ac5 _AUTORECONF was already set to YES even though it was no longer needed since the patches were removed with the bump to 3.0.1 in 2cacda2591. So just update the comment. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...lace-deprecated-distutils-with-setuptools.patch | 244 +++++++++++++++++++++ package/libapparmor/libapparmor.mk | 4 +- 2 files changed, 246 insertions(+), 2 deletions(-) diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch new file mode 100644 index 0000000000..5aed31d0b5 --- /dev/null +++ b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch @@ -0,0 +1,244 @@ +From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 +From: Georgia Garcia +Date: Wed, 10 Nov 2021 19:50:35 +0000 +Subject: [PATCH] replace deprecated distutils with setuptools + +Adds python3 setuptools as a build dependency for libapparmor + +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 +Signed-off-by: Georgia Garcia +Acked-by: Christian Boltz + +[Retrieved (and updated to remove changes on .gitlab-ci.yml and +README.md) from: +https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 3 ++ + .gitlab-ci.yml | 2 +- + libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- + libraries/libapparmor/swig/python/Makefile.am | 2 +- + libraries/libapparmor/swig/python/setup.py.in | 2 +- + .../libapparmor/swig/python/test/Makefile.am | 2 +- + profiles/Makefile | 2 +- + utils/Makefile | 1 + + utils/python-tools-setup.py | 6 ++-- + utils/test/Makefile | 2 +- + utils/test/README.md | 2 +- + 11 files changed, 32 insertions(+), 28 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 78a06fdf9..4782a351a 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c + libraries/libapparmor/swig/perl/libapparmor_wrap.o + libraries/libapparmor/swig/perl/pm_to_blib + libraries/libapparmor/swig/python/LibAppArmor.py ++libraries/libapparmor/swig/python/LibAppArmor.egg-info/ + libraries/libapparmor/swig/python/build/ + libraries/libapparmor/swig/python/libapparmor_wrap.c + libraries/libapparmor/swig/python/Makefile +@@ -204,6 +205,8 @@ utils/*.tmp + utils/po/*.mo + utils/apparmor/*.pyc + utils/apparmor/rule/*.pyc ++utils/apparmor.egg-info/ ++utils/build/ + utils/htmlcov/ + utils/test/common_test.pyc + utils/test/.coverage +diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 +index 1da29d873..f21f70ce7 100644 +--- a/libraries/libapparmor/m4/ac_python_devel.m4 ++++ b/libraries/libapparmor/m4/ac_python_devel.m4 +@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. + fi + + # +- # Check if you have distutils, else fail ++ # Check if you have setuptools, else fail + # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ AC_MSG_CHECKING([for the setuptools Python package]) ++ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` ++ if test -z "$ac_setuptools_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ AC_MSG_ERROR([cannot import Python module "setuptools". + Please check your Python installation. The error was: +-$ac_distutils_result]) ++$ac_setuptools_result]) + PYTHON_VERSION="" + fi + +@@ -88,8 +88,8 @@ $ac_distutils_result]) + PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` + fi + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` ++ python_path=`$PYTHON -c "import sys; import sysconfig;\ ++sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` + if test -n "${python_path}"; then + python_path="-I$python_path" + fi +@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` + if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) +- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` ++ py_version=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` + if test "$py_version" == "[None]"; then + if test -n "$PYTHON_VERSION"; then + py_version=$PYTHON_VERSION +@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` + fi + fi + +- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ ++ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ + "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` + fi + AC_MSG_RESULT([$PYTHON_LDFLAGS]) +@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO + # + AC_MSG_CHECKING([for Python site-packages path]) + if test -z "$PYTHON_SITE_PKG"; then +- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` ++ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` + fi + AC_MSG_RESULT([$PYTHON_SITE_PKG]) + AC_SUBST([PYTHON_SITE_PKG]) +@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` + PYTHON_EXTRA_LIBS='' + fi + if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) +@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( + PYTHON_EXTRA_LDFLAGS='' + fi + if test -z "$PYTHON_EXTRA_LDFLAGS"; then +- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) +diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am +index 04edff003..bf05fe0fc 100644 +--- a/libraries/libapparmor/swig/python/Makefile.am ++++ b/libraries/libapparmor/swig/python/Makefile.am +@@ -21,7 +21,7 @@ install-exec-local: + + clean-local: + if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi +- rm -rf build ++ rm -rf build LibAppArmor.egg-info + if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi + + endif +diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in +index 32abd46b2..b23e40746 100644 +--- a/libraries/libapparmor/swig/python/setup.py.in ++++ b/libraries/libapparmor/swig/python/setup.py.in +@@ -1,4 +1,4 @@ +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import string + + setup(name = 'LibAppArmor', +diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am +index 7287819c9..9dccfdef6 100644 +--- a/libraries/libapparmor/swig/python/test/Makefile.am ++++ b/libraries/libapparmor/swig/python/test/Makefile.am +@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status + CLEANFILES = test_python.py + + # bah, how brittle is this? +-PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' ++PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' + + TESTS = test_python.py + TESTS_ENVIRONMENT = \ +diff --git a/profiles/Makefile b/profiles/Makefile +index c471e58e8..0b7f2655d 100644 +--- a/profiles/Makefile ++++ b/profiles/Makefile +@@ -41,7 +41,7 @@ ifdef USE_SYSTEM + LOGPROF?=aa-logprof + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) +diff --git a/utils/Makefile b/utils/Makefile +index 1f08f259a..91a15107b 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -72,6 +72,7 @@ clean: pod_clean + rm -rf staging/ build/ + rm -f apparmor/*.pyc apparmor/rule/*.pyc + rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ ++ rm -rf apparmor.egg-info/ + + # ${CAPABILITIES} is defined in common/Make.rules + .PHONY: check_severity_db +diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py +index 30ce0cb05..2cbde8fc1 100644 +--- a/utils/python-tools-setup.py ++++ b/utils/python-tools-setup.py +@@ -20,14 +20,14 @@ + # Note: --version=... must be the last argument to this script + # + +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import os + import shutil + import sys + + class Install(_install, object): +- '''Override distutils to install the files where we want them.''' ++ '''Override setuptools to install the files where we want them.''' + def run(self): + # Now byte-compile everything + super(Install, self).run() +diff --git a/utils/test/Makefile b/utils/test/Makefile +index 90354aa50..9126bdd71 100644 +--- a/utils/test/Makefile ++++ b/utils/test/Makefile +@@ -32,7 +32,7 @@ ifdef USE_SYSTEM + PARSER= + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) +-- +GitLab + diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 0d5822a56d..f3d744e3e7 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -16,7 +16,7 @@ LIBAPPARMOR_DEPENDENCIES = host-bison host-flex host-pkgconf LIBAPPARMOR_SUBDIR = libraries/libapparmor LIBAPPARMOR_INSTALL_STAGING = YES -# Patches 0001 and 0002 touch Makefile.am and an m4 file +# Patch 0001 touches Makefile.am and m4 files LIBAPPARMOR_AUTORECONF = YES # Most AppArmor tools will want to link to the static lib. @@ -28,7 +28,7 @@ LIBAPPARMOR_CONF_OPTS = \ --disable-man-pages ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIBAPPARMOR_DEPENDENCIES += host-python3 host-swig python3 +LIBAPPARMOR_DEPENDENCIES += host-python3 host-python3-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ From arnout at mind.be Tue Jan 4 16:51:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:51:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/fail2ban: fix build with python 3.10 In-Reply-To: <20220101145632.1393642-1-fontaine.fabrice@gmail.com> References: <20220101145632.1393642-1-fontaine.fabrice@gmail.com> Message-ID: <9b639725-a9f6-6887-f43d-2dd080586df0@mind.be> On 01/01/2022 15:56, Fabrice Fontaine wrote: > Fix the following build failure raised since bump of python3 to version > 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > error in fail2ban setup command: use_2to3 is invalid. > > Fixes: > - http://autobuild.buildroot.org/results/6a5e91f9912f869b2b07b10b576457b432066393 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...with-error-in-fail2ban-setup-command.patch | 67 +++++++++++++++++++ > 1 file changed, 67 insertions(+) > create mode 100644 package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch > > diff --git a/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch > new file mode 100644 > index 0000000000..8cb097dc38 > --- /dev/null > +++ b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch > @@ -0,0 +1,67 @@ > +From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001 > +From: sebres > +Date: Sun, 19 Sep 2021 18:49:18 +0200 > +Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup > + command: use_2to3 is invalid (setuptools 58+) > + > +[Retrieved from: > +https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497] > +Signed-off-by: Fabrice Fontaine > +--- > + setup.py | 16 +--------------- > + 1 file changed, 1 insertion(+), 15 deletions(-) > + > +diff --git a/setup.py b/setup.py > +index f4c2550f6..98413273c 100755 > +--- a/setup.py > ++++ b/setup.py > +@@ -48,7 +48,7 @@ > + from glob import glob > + > + from fail2ban.setup import updatePyExec > +- > ++from fail2ban.version import version > + > + source_dir = os.path.realpath(os.path.dirname( > + # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): > +@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): > + # Wrapper to specify fail2ban own options: > + class install_command_f2b(install): > + user_options = install.user_options + [ > +- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), > + ('without-tests', None, 'without tests files installation'), > + ] > + def initialize_options(self): > +- self.disable_2to3 = None > + self.without_tests = not with_tests > + install.initialize_options(self) > + def finalize_options(self): > +- global _2to3 > +- ## in the test cases 2to3 should be already done (fail2ban-2to3): > +- if self.disable_2to3: > +- _2to3 = False > +- if _2to3: > +- cmdclass = self.distribution.cmdclass > +- cmdclass['build_py'] = build_py_2to3 > +- cmdclass['build_scripts'] = build_scripts_2to3 > + if self.without_tests: > + self.distribution.scripts.remove('bin/fail2ban-testcases') > + > +@@ -178,7 +168,6 @@ def run(self): > + if setuptools: > + setup_extra = { > + 'test_suite': "fail2ban.tests.utils.gatherTests", > +- 'use_2to3': True, > + } > + else: > + setup_extra = {} > +@@ -202,9 +191,6 @@ def run(self): > + ('/usr/share/doc/fail2ban', doc_files) > + ) > + > +-# Get version number, avoiding importing fail2ban. > +-# This is due to tests not functioning for python3 as 2to3 takes place later > +-exec(open(join("fail2ban", "version.py")).read()) > + > + setup( > + name = "fail2ban", > From arnout at mind.be Tue Jan 4 16:43:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:43:10 +0100 Subject: [Buildroot] [git commit] package/fail2ban: fix build with python 3.10 Message-ID: <20220104164505.E897B82AB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee16da9654f83682accea5873732303f355e0c0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: error in fail2ban setup command: use_2to3 is invalid. Fixes: - http://autobuild.buildroot.org/results/6a5e91f9912f869b2b07b10b576457b432066393 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ails-with-error-in-fail2ban-setup-command.patch | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch new file mode 100644 index 0000000000..8cb097dc38 --- /dev/null +++ b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch @@ -0,0 +1,67 @@ +From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001 +From: sebres +Date: Sun, 19 Sep 2021 18:49:18 +0200 +Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup + command: use_2to3 is invalid (setuptools 58+) + +[Retrieved from: +https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497] +Signed-off-by: Fabrice Fontaine +--- + setup.py | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/setup.py b/setup.py +index f4c2550f6..98413273c 100755 +--- a/setup.py ++++ b/setup.py +@@ -48,7 +48,7 @@ + from glob import glob + + from fail2ban.setup import updatePyExec +- ++from fail2ban.version import version + + source_dir = os.path.realpath(os.path.dirname( + # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): +@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): + # Wrapper to specify fail2ban own options: + class install_command_f2b(install): + user_options = install.user_options + [ +- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), + ('without-tests', None, 'without tests files installation'), + ] + def initialize_options(self): +- self.disable_2to3 = None + self.without_tests = not with_tests + install.initialize_options(self) + def finalize_options(self): +- global _2to3 +- ## in the test cases 2to3 should be already done (fail2ban-2to3): +- if self.disable_2to3: +- _2to3 = False +- if _2to3: +- cmdclass = self.distribution.cmdclass +- cmdclass['build_py'] = build_py_2to3 +- cmdclass['build_scripts'] = build_scripts_2to3 + if self.without_tests: + self.distribution.scripts.remove('bin/fail2ban-testcases') + +@@ -178,7 +168,6 @@ def run(self): + if setuptools: + setup_extra = { + 'test_suite': "fail2ban.tests.utils.gatherTests", +- 'use_2to3': True, + } + else: + setup_extra = {} +@@ -202,9 +191,6 @@ def run(self): + ('/usr/share/doc/fail2ban', doc_files) + ) + +-# Get version number, avoiding importing fail2ban. +-# This is due to tests not functioning for python3 as 2to3 takes place later +-exec(open(join("fail2ban", "version.py")).read()) + + setup( + name = "fail2ban", From arnout at mind.be Tue Jan 4 16:52:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 17:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtorrent-rasterbar: fix build with gcc 9 In-Reply-To: <20220101151218.1620080-1-fontaine.fabrice@gmail.com> References: <20220101151218.1620080-1-fontaine.fabrice@gmail.com> Message-ID: <9b3f060d-9671-e475-40f7-dbf46e5d480c@mind.be> On 01/01/2022 16:12, Fabrice Fontaine wrote: > Drop -std=c++11 to avoid the following build failure with gcc 9 raised > since bump to version 1.2.15 in commit > 2cecfe94f889165f3a5169598ed7e0388941a6cd and > https://github.com/arvidn/libtorrent/commit/b7e02cc700d884f87a18a3bc59f95a66a5cb0209: > > configure: error: *** A compiler with support for C++14 language features is required. > > Fixes: > - http://autobuild.buildroot.org/results/905a51bee38e85a48aa170c15494f2798aa6afea > > Signed-off-by: Fabrice Fontaine > --- > package/libtorrent-rasterbar/libtorrent-rasterbar.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk > index 914e0cbca3..cde010a4f7 100644 > --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk > +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk > @@ -16,7 +16,7 @@ LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES > LIBTORRENT_RASTERBAR_CONF_OPTS = \ > --with-boost-libdir=$(STAGING_DIR)/usr/lib \ > --disable-invariant-checks > -LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 If this was needed before, it sounds like we might now need -std=c++14 (for GCC versions that default to an earlier standard, i.e. anything below 6 I think). Have you tested with GCC 4.9? Regards, Arnout > +LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) > > # Internal error, aborting at dwarf2cfi.c:2802 in connect_traces > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 > From arnout at mind.be Tue Jan 4 17:11:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:11:28 +0100 Subject: [Buildroot] [PATCH] Config.in.legacy: fix removed bootlin riscv64 toolchains Message-ID: <20220104171128.956397-1-arnout@mind.be> commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 bootlin toolchains by RISC-V LP64D. However, Config.in.legacy was added for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE, which never existed (the stable version was only added after the switch to LP64D). Conversely, BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE, which was removed, was not mentioned in Config.in.legacy. Correct the symbol name and its comment in Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5994d94487..e5349e58ac 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,8 +153,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE The RISC-V 64-bit LP64 Bootlin toolchains have been removed, in favor of RISC-V 64-bit LP64D toolchains. -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE - bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE + bool "Bootlin riscv64 musl bleeding-edge toolchain removed" select BR2_LEGACY help The RISC-V 64-bit LP64 Bootlin toolchains have been removed, -- 2.31.1 From arnout at mind.be Tue Jan 4 17:13:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:13:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/tvheadend: disable execinfo In-Reply-To: <20220101155950.1784485-1-fontaine.fabrice@gmail.com> References: <20220101155950.1784485-1-fontaine.fabrice@gmail.com> Message-ID: On 01/01/2022 16:59, Fabrice Fontaine wrote: > Disable execinfo to avoid the following build failure if libexecinfo is > built before tvheadend since the addition of the package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/build.linux/src/tvhlog.o: in function `tvhlog_backtrace_printf': > /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/src/tvhlog.c:522: undefined reference to `backtrace' I was thinking, why not simply link with libexecinfo when needed? But since the patch was anyway accepted upstream and I don't care about execinfo in tvheadend: Applied to master, thanks. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/ee9ad2c999b622097fe0f1522e7e32184722e548 > > Signed-off-by: Fabrice Fontaine > --- > .../0002-configure-add-execinfo-option.patch | 55 +++++++++++++++++++ > package/tvheadend/tvheadend.mk | 1 + > 2 files changed, 56 insertions(+) > create mode 100644 package/tvheadend/0002-configure-add-execinfo-option.patch > > diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch > new file mode 100644 > index 0000000000..c55d127d58 > --- /dev/null > +++ b/package/tvheadend/0002-configure-add-execinfo-option.patch > @@ -0,0 +1,55 @@ > +From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 1 Jan 2022 16:53:29 +0100 > +Subject: [PATCH] configure: add execinfo option > + > +Add execinfo option to allow the user to disable the feature even if > +execinfo.h is found on the system > + > +Signed-off-by: Fabrice Fontaine > +[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] > +--- > + configure | 17 +++++++++++++++-- > + 1 file changed, 15 insertions(+), 2 deletions(-) > + > +diff --git a/configure b/configure > +index 4dad024c4..c087502bf 100755 > +--- a/configure > ++++ b/configure > +@@ -75,6 +75,7 @@ OPTIONS=( > + "ddci:yes" > + "cclang_threadsan:no" > + "gperftools:no" > ++ "execinfo:auto" > + ) > + > + # > +@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then > + # If we don't have libunwind then fallback to execinfo. > + if ! enabled libunwind > + then > +- check_cc_header execinfo > ++ if enabled_or_auto execinfo; then > ++ if check_cc_header execinfo; then > ++ enable execinfo > ++ else > ++ die "execinfo.h not found (use --disable-execinfo)" > ++ fi > ++ fi > + fi > + > + else > +- check_cc_header execinfo > ++ if enabled_or_auto execinfo; then > ++ if check_cc_header execinfo; then > ++ enable execinfo > ++ else > ++ die "execinfo.h not found (use --disable-execinfo)" > ++ fi > ++ fi > + fi > + check_cc_option mmx > + check_cc_option sse2 > +-- > +2.33.0 > + > diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk > index 4e84e496bf..58ebdcb054 100644 > --- a/package/tvheadend/tvheadend.mk > +++ b/package/tvheadend/tvheadend.mk > @@ -161,6 +161,7 @@ define TVHEADEND_CONFIGURE_CMDS > --enable-dvbscan \ > --enable-bundle \ > --enable-pngquant \ > + --disable-execinfo \ > --disable-ffmpeg_static \ > --disable-hdhomerun_static \ > $(TVHEADEND_CONF_OPTS) \ > From arnout at mind.be Tue Jan 4 17:13:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:13:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.23 In-Reply-To: <20220101170938.1866790-1-fontaine.fabrice@gmail.com> References: <20220101170938.1866790-1-fontaine.fabrice@gmail.com> Message-ID: <4cf4ec18-f0eb-e14b-927a-1512157c795b@mind.be> On 01/01/2022 18:09, Fabrice Fontaine wrote: > Drop patch (already in version) > > https://www.spinics.net/lists/kexec/msg27693.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...move-duplicate-definition-of-ramdisk.patch | 32 ------------------- > package/kexec/kexec.hash | 2 +- > package/kexec/kexec.mk | 2 +- > 3 files changed, 2 insertions(+), 34 deletions(-) > delete mode 100644 package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch > > diff --git a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch b/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch > deleted file mode 100644 > index 173323bff8..0000000000 > --- a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001 > -From: Petr Tesarik > -Date: Mon, 26 Apr 2021 15:29:51 +0200 > -Subject: kexec-tools: Remove duplicate definition of ramdisk > - > -The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This > -other definition is not needed and breaks build with -fno-common. > - > -Signed-off-by: Petr Tesarik > -Signed-off-by: Simon Horman > -[Retrieved from: > -https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c] > -Signed-off-by: Fabrice Fontaine > ---- > - kexec/arch/ppc/kexec-elf-ppc.c | 1 - > - 1 file changed, 1 deletion(-) > - > -diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c > -index ad43ad1..4a4886e 100644 > ---- a/kexec/arch/ppc/kexec-elf-ppc.c > -+++ b/kexec/arch/ppc/kexec-elf-ppc.c > -@@ -33,7 +33,6 @@ > - static const int probe_debug = 0; > - > - unsigned char reuse_initrd; > --const char *ramdisk; > - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, > - char *); > - > --- > -cgit 1.2.3-1.el7 > - > diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash > index 1cf860d85e..05eb9e3d02 100644 > --- a/package/kexec/kexec.hash > +++ b/package/kexec/kexec.hash > @@ -1,4 +1,4 @@ > # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc > -sha256 96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 kexec-tools-2.0.22.tar.xz > +sha256 aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b kexec-tools-2.0.23.tar.xz > # locally calculated > sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING > diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk > index 81d35815d8..b3b4e56546 100644 > --- a/package/kexec/kexec.mk > +++ b/package/kexec/kexec.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KEXEC_VERSION = 2.0.22 > +KEXEC_VERSION = 2.0.23 > KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz > KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec > KEXEC_LICENSE = GPL-2.0 > From arnout at mind.be Tue Jan 4 17:13:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:13:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cffi: bump to version 1.15.0 In-Reply-To: <20220101180004.2499189-1-james.hilliard1@gmail.com> References: <20220101180004.2499189-1-james.hilliard1@gmail.com> Message-ID: On 01/01/2022 19:00, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-cffi/python-cffi.hash | 4 ++-- > package/python-cffi/python-cffi.mk | 4 ++-- > package/python3-cffi/python3-cffi.mk | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash > index 8ab672a56f..41565f9a62 100644 > --- a/package/python-cffi/python-cffi.hash > +++ b/package/python-cffi/python-cffi.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/cffi/json > -md5 5c118a18ea897df164dbff67a32876fc cffi-1.14.6.tar.gz > -sha256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd cffi-1.14.6.tar.gz > +md5 f3a3f26cd3335fc597479c9475da0a0b cffi-1.15.0.tar.gz > +sha256 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 cffi-1.15.0.tar.gz > # Locally computed sha256 checksums > sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE > diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk > index 2504cf18f4..b14dce8225 100644 > --- a/package/python-cffi/python-cffi.mk > +++ b/package/python-cffi/python-cffi.mk > @@ -5,9 +5,9 @@ > ################################################################################ > > # Please keep in sync with package/python3-cffi/python3-cffi.mk > -PYTHON_CFFI_VERSION = 1.14.6 > +PYTHON_CFFI_VERSION = 1.15.0 > PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz > -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 > +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a > PYTHON_CFFI_SETUP_TYPE = setuptools > PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi > PYTHON_CFFI_LICENSE = MIT > diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk > index 52ea3b3fbf..2770eda93e 100644 > --- a/package/python3-cffi/python3-cffi.mk > +++ b/package/python3-cffi/python3-cffi.mk > @@ -5,9 +5,9 @@ > ################################################################################ > > # Please keep in sync with package/python-cffi/python-cffi.mk > -PYTHON3_CFFI_VERSION = 1.14.6 > +PYTHON3_CFFI_VERSION = 1.15.0 > PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz > -PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 > +PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a > PYTHON3_CFFI_SETUP_TYPE = setuptools > PYTHON3_CFFI_LICENSE = MIT > PYTHON3_CFFI_LICENSE_FILES = LICENSE > From arnout at mind.be Tue Jan 4 17:13:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:13:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/mdadm: bump to version 4.2 In-Reply-To: <20220101182557.1915942-1-fontaine.fabrice@gmail.com> References: <20220101182557.1915942-1-fontaine.fabrice@gmail.com> Message-ID: <4fd6af9a-376a-4682-05b8-042c3ba41ad5@mind.be> On 01/01/2022 19:25, Fabrice Fontaine wrote: > - Drop first patch and use install-bin target added by > https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=b4a5ad4958cb3ad87c3c5fa993e7572c38596d09 > - Drop second patch (already in version) > - Handle libudev optional dependency through CXFLAGS instead of > overriding CFLAGS as wanted by upstream: > https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=af3396dadfcd3b13480d021b8d3645c6d2420f79 > - Update indentation in hash file (two spaces) > > https://www.spinics.net/lists/raid/msg69218.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-install-targets-for-mdadm-and-mdmon.patch | 32 ----------------- > ...-include-sysmacros.h-unconditionally.patch | 35 ------------------- > package/mdadm/mdadm.hash | 4 +-- > package/mdadm/mdadm.mk | 21 +++++++---- > 4 files changed, 17 insertions(+), 75 deletions(-) > delete mode 100644 package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch > delete mode 100644 package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch > > diff --git a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch b/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch > deleted file mode 100644 > index 15df7557e7..0000000000 > --- a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001 > -From: Christophe Vu-Brugier > -Date: Wed, 6 Mar 2013 16:03:14 +0100 > -Subject: [PATCH] Add install targets for mdadm and mdmon > - > - > -Signed-off-by: Christophe Vu-Brugier > ---- > - Makefile | 6 +++++- > - 1 file changed, 5 insertions(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index 315455b..27d8eeb 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h > - sha1.o : sha1.c sha1.h md5.h > - $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c > - > --install : mdadm mdmon install-man install-udev > -+install : install-mdadm install-mdmon install-man install-udev > -+ > -+install-mdadm : > - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm > -+ > -+install-mdmon : > - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon > - > - install-static : mdadm.static install-man > --- > -1.7.10.4 > - > diff --git a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch b/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch > deleted file mode 100644 > index c8944c8475..0000000000 > --- a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001 > -From: Baruch Siach > -Date: Tue, 6 Aug 2019 16:01:15 +0300 > -Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally > - > -musl libc now also requires sys/sysmacros.h for the major/minor macros. > -All supported libc implementations carry sys/sysmacros.h, including > -diet-libc, klibc, and uclibc-ng. > - > -Cc: Hauke Mehrtens > -Signed-off-by: Baruch Siach > ---- > -Upstream status: https://marc.info/?l=linux-raid&m=156509677018508 > - > - mdadm.h | 2 -- > - 1 file changed, 2 deletions(-) > - > -diff --git a/mdadm.h b/mdadm.h > -index c36d7fdb10f6..d61a9ca82dc1 100644 > ---- a/mdadm.h > -+++ b/mdadm.h > -@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); > - #include > - #include > - #include > --#ifdef __GLIBC__ > - /* Newer glibc requires sys/sysmacros.h directly for makedev() */ > - #include > --#endif > - #ifdef __dietlibc__ > - #include > - /* dietlibc has deprecated random and srandom!! */ > --- > -2.20.1 > - > diff --git a/package/mdadm/mdadm.hash b/package/mdadm/mdadm.hash > index b15cb4e031..b9631a2aaa 100644 > --- a/package/mdadm/mdadm.hash > +++ b/package/mdadm/mdadm.hash > @@ -1,4 +1,4 @@ > # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc > -sha256 ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a mdadm-4.1.tar.xz > +sha256 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d mdadm-4.2.tar.xz > # Locally calculated > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk > index 171782712f..6ee0bb60c9 100644 > --- a/package/mdadm/mdadm.mk > +++ b/package/mdadm/mdadm.mk > @@ -4,14 +4,19 @@ > # > ################################################################################ > > -MDADM_VERSION = 4.1 > +MDADM_VERSION = 4.2 > MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz > MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm > MDADM_LICENSE = GPL-2.0+ > MDADM_LICENSE_FILES = COPYING > > -MDADM_BUILD_OPTS = $(TARGET_CONFIGURE_OPTS) \ > - CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" \ > +MDADM_CXFLAGS = $(TARGET_CFLAGS) > + > +MDADM_BUILD_OPTS = \ > + CC=$(TARGET_CC) \ > + COROSYNC=-DNO_COROSYNC \ > + DLM=-DNO_DLM \ > + CXFLAGS="$(MDADM_CXFLAGS)" \ > CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ > CHECK_RUN_DIR=0 > > @@ -19,14 +24,18 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > MDADM_BUILD_OPTS += USE_PTHREADS= > endif > > +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > +MDADM_DEPENDENCIES += udev > +else > +MDADM_CXFLAGS += -DNO_LIBUDEV > +endif > + > define MDADM_BUILD_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(MDADM_BUILD_OPTS) mdadm mdmon > endef > > define MDADM_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ > - DESTDIR=$(TARGET_DIR) \ > - install-mdadm install-mdmon > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin > endef > > $(eval $(generic-package)) > From arnout at mind.be Tue Jan 4 17:14:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:14:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aioredis: bump to version 2.0.1 In-Reply-To: <20220101195910.406035-1-james.hilliard1@gmail.com> References: <20220101195910.406035-1-james.hilliard1@gmail.com> Message-ID: On 01/01/2022 20:59, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aioredis/python-aioredis.hash | 4 ++-- > package/python-aioredis/python-aioredis.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aioredis/python-aioredis.hash b/package/python-aioredis/python-aioredis.hash > index ca3f64d1e5..29e6361014 100644 > --- a/package/python-aioredis/python-aioredis.hash > +++ b/package/python-aioredis/python-aioredis.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aioredis/json > -md5 343a451df2381b9ea368e12b9075caa5 aioredis-2.0.0.tar.gz > -sha256 3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db aioredis-2.0.0.tar.gz > +md5 8f3547af83ef4b863b18c19f23166a9d aioredis-2.0.1.tar.gz > +sha256 eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e aioredis-2.0.1.tar.gz > # Locally computed sha256 checksums > sha256 183b21f240e41af611c951d01d4f36793d470a82d5fd79efc21f25ae4cf68543 LICENSE > diff --git a/package/python-aioredis/python-aioredis.mk b/package/python-aioredis/python-aioredis.mk > index 21a8a349c5..798dbd0c3c 100644 > --- a/package/python-aioredis/python-aioredis.mk > +++ b/package/python-aioredis/python-aioredis.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOREDIS_VERSION = 2.0.0 > +PYTHON_AIOREDIS_VERSION = 2.0.1 > PYTHON_AIOREDIS_SOURCE = aioredis-$(PYTHON_AIOREDIS_VERSION).tar.gz > -PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/92/60/a3cb5fadc254cc6e709ba14a02531870b02386b8c7bb147bf80a2be93f76 > +PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/2e/cf/9eb144a0b05809ffc5d29045c4b51039000ea275bc1268d0351c9e7dfc06 > PYTHON_AIOREDIS_SETUP_TYPE = setuptools > PYTHON_AIOREDIS_LICENSE = MIT > PYTHON_AIOREDIS_LICENSE_FILES = LICENSE > From arnout at mind.be Tue Jan 4 17:14:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:14:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cbor2: bump to version 5.4.2 In-Reply-To: <20220101213346.408623-1-james.hilliard1@gmail.com> References: <20220101213346.408623-1-james.hilliard1@gmail.com> Message-ID: <37a88641-b1b7-fc77-8f97-83492e9875e3@mind.be> On 01/01/2022 22:33, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-cbor2/python-cbor2.hash | 4 ++-- > package/python-cbor2/python-cbor2.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash > index 879463c2ce..9910e632a2 100644 > --- a/package/python-cbor2/python-cbor2.hash > +++ b/package/python-cbor2/python-cbor2.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/cbor2/json > -md5 87b3ad8a9dd8875fa46c6ec06e3fb0ba cbor2-5.4.1.tar.gz > -sha256 a8bf432f6cb595f50aeb8fed2a4aa3b3f7caa7f135fb57e4378eaa39242feac9 cbor2-5.4.1.tar.gz > +md5 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz > +sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz > # Locally computed sha256 checksums > sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt > diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk > index af42d0344a..4cc09a219f 100644 > --- a/package/python-cbor2/python-cbor2.mk > +++ b/package/python-cbor2/python-cbor2.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_CBOR2_VERSION = 5.4.1 > +PYTHON_CBOR2_VERSION = 5.4.2 > PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz > -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/9e/25/9dd432c051010faea6a702cb85d0b53dc9d5414513866b6a73b3ac954092 > +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa > PYTHON_CBOR2_SETUP_TYPE = setuptools > PYTHON_CBOR2_LICENSE = MIT > PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt > From arnout at mind.be Tue Jan 4 17:15:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:15:36 +0100 Subject: [Buildroot] [PATCH] Makefile: disable 'printvars' and 'show-vars' recipes for Make 4.3 In-Reply-To: <20220101214034.2152144-1-giulio.benetti@benettiengineering.com> References: <20220101214034.2152144-1-giulio.benetti@benettiengineering.com> Message-ID: On 01/01/2022 22:40, Giulio Benetti wrote: > Make 4.3 is buggy and leads to a "Segmentation fault (core dumped)" when > calling 'make printvars' or 'make show-vars', so let's refuse to execute > those recipes if Make 4.3 by adding 'check-make-version' recipe as > depedendency of 'printvars' and 'show-vars' as suggested by Yann E. Morin. > > Signed-off-by: Giulio Benetti Yeah, this has been bothering me for ages... I hope this gets fixed soon. Applied to master, thanks. Regards, Arnout > --- > Makefile | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 0b8c7b2867..ac98b84425 100644 > --- a/Makefile > +++ b/Makefile > @@ -1058,13 +1058,20 @@ ifeq ($(NEED_WRAPPER),y) > $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) > endif > > +.PHONY: check-make-version > +check-make-version: > +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) > + @echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes" > + @exit 1 > +endif > + > # printvars prints all the variables currently defined in our > # Makefiles. Alternatively, if a non-empty VARS variable is passed, > # only the variables matching the make pattern passed in VARS are > # displayed. > # show-vars does the same, but as a JSON dictionnary. > .PHONY: printvars > -printvars: > +printvars: check-make-version > @: > $(foreach V, \ > $(sort $(filter $(VARS),$(.VARIABLES))), \ > @@ -1077,7 +1084,7 @@ printvars: > > .PHONY: show-vars > show-vars: VARS?=% > -show-vars: > +show-vars: check-make-version > @: > $(info $(call clean-json, { \ > $(foreach V, \ > From arnout at mind.be Tue Jan 4 17:16:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:16:49 +0100 Subject: [Buildroot] [PATCH 1/1] support/config-fragments/autobuild: fix riscv64 toolchain configs In-Reply-To: <20220101213948.265173-1-ju.o@free.fr> References: <20220101213948.265173-1-ju.o@free.fr> Message-ID: On 01/01/2022 22:39, Julien Olivain wrote: > commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 > toolchains by RISC-V LP64D. The config symbols > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. > Those changes were not reflected in the autobuild toolchain configs in > support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config > > When testing a package with the command: > > ./utils/test-pkg --all --package somepackage > > bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build > logfile contains: > > [...] > Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config > Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > Actual value: > > Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config > Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y > Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set > > This commit update the autobuild config fragments for RISC-V 64bit > toolchains so they can be used by test-pkg. > > Signed-off-by: Julien Olivain Applied to master, thanks. While reviewing this, I noticed that BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, so I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc Thomas on that, so Thomas consider yourself CCed now :-) Regards, Arnout > --- > .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- > .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > index f6c6fcaa36..433a6e89f7 100644 > --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > @@ -1,5 +1,5 @@ > BR2_riscv=y > -BR2_RISCV_ABI_LP64=y > +BR2_RISCV_ABI_LP64D=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y > +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y > diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config > index 2b6a6e56da..fee1f29f4a 100644 > --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config > +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config > @@ -1,4 +1,4 @@ > BR2_riscv=y > -BR2_RISCV_ABI_LP64=y > +BR2_RISCV_ABI_LP64D=y > BR2_TOOLCHAIN_EXTERNAL=y > -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y > +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y > From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/python-aioredis: bump to version 2.0.1 Message-ID: <20220104171106.2C81A82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ebbfa0c5765c9c51acc21bf1995a01c9063e4c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-aioredis/python-aioredis.hash | 4 ++-- package/python-aioredis/python-aioredis.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioredis/python-aioredis.hash b/package/python-aioredis/python-aioredis.hash index ca3f64d1e5..29e6361014 100644 --- a/package/python-aioredis/python-aioredis.hash +++ b/package/python-aioredis/python-aioredis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioredis/json -md5 343a451df2381b9ea368e12b9075caa5 aioredis-2.0.0.tar.gz -sha256 3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db aioredis-2.0.0.tar.gz +md5 8f3547af83ef4b863b18c19f23166a9d aioredis-2.0.1.tar.gz +sha256 eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e aioredis-2.0.1.tar.gz # Locally computed sha256 checksums sha256 183b21f240e41af611c951d01d4f36793d470a82d5fd79efc21f25ae4cf68543 LICENSE diff --git a/package/python-aioredis/python-aioredis.mk b/package/python-aioredis/python-aioredis.mk index 21a8a349c5..798dbd0c3c 100644 --- a/package/python-aioredis/python-aioredis.mk +++ b/package/python-aioredis/python-aioredis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOREDIS_VERSION = 2.0.0 +PYTHON_AIOREDIS_VERSION = 2.0.1 PYTHON_AIOREDIS_SOURCE = aioredis-$(PYTHON_AIOREDIS_VERSION).tar.gz -PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/92/60/a3cb5fadc254cc6e709ba14a02531870b02386b8c7bb147bf80a2be93f76 +PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/2e/cf/9eb144a0b05809ffc5d29045c4b51039000ea275bc1268d0351c9e7dfc06 PYTHON_AIOREDIS_SETUP_TYPE = setuptools PYTHON_AIOREDIS_LICENSE = MIT PYTHON_AIOREDIS_LICENSE_FILES = LICENSE From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/kexec: bump to version 2.0.23 Message-ID: <20220104171106.0DD4C82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c1c0de0bdb6b2ff618cbebf9e5b8070bf561562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://www.spinics.net/lists/kexec/msg27693.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ls-Remove-duplicate-definition-of-ramdisk.patch | 32 ---------------------- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch b/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch deleted file mode 100644 index 173323bff8..0000000000 --- a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001 -From: Petr Tesarik -Date: Mon, 26 Apr 2021 15:29:51 +0200 -Subject: kexec-tools: Remove duplicate definition of ramdisk - -The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This -other definition is not needed and breaks build with -fno-common. - -Signed-off-by: Petr Tesarik -Signed-off-by: Simon Horman -[Retrieved from: -https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c] -Signed-off-by: Fabrice Fontaine ---- - kexec/arch/ppc/kexec-elf-ppc.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c -index ad43ad1..4a4886e 100644 ---- a/kexec/arch/ppc/kexec-elf-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-ppc.c -@@ -33,7 +33,6 @@ - static const int probe_debug = 0; - - unsigned char reuse_initrd; --const char *ramdisk; - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, - char *); - --- -cgit 1.2.3-1.el7 - diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 1cf860d85e..05eb9e3d02 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 kexec-tools-2.0.22.tar.xz +sha256 aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b kexec-tools-2.0.23.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 81d35815d8..b3b4e56546 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.22 +KEXEC_VERSION = 2.0.23 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/tvheadend: disable execinfo Message-ID: <20220104171106.03EBB82DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee6477095a61a46ad66209f4fd14eaca12b51576 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable execinfo to avoid the following build failure if libexecinfo is built before tvheadend since the addition of the package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/build.linux/src/tvhlog.o: in function `tvhlog_backtrace_printf': /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/src/tvhlog.c:522: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/ee9ad2c999b622097fe0f1522e7e32184722e548 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-configure-add-execinfo-option.patch | 55 ++++++++++++++++++++++ package/tvheadend/tvheadend.mk | 1 + 2 files changed, 56 insertions(+) diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch new file mode 100644 index 0000000000..c55d127d58 --- /dev/null +++ b/package/tvheadend/0002-configure-add-execinfo-option.patch @@ -0,0 +1,55 @@ +From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 16:53:29 +0100 +Subject: [PATCH] configure: add execinfo option + +Add execinfo option to allow the user to disable the feature even if +execinfo.h is found on the system + +Signed-off-by: Fabrice Fontaine +[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] +--- + configure | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 4dad024c4..c087502bf 100755 +--- a/configure ++++ b/configure +@@ -75,6 +75,7 @@ OPTIONS=( + "ddci:yes" + "cclang_threadsan:no" + "gperftools:no" ++ "execinfo:auto" + ) + + # +@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then + # If we don't have libunwind then fallback to execinfo. + if ! enabled libunwind + then +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + + else +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + check_cc_option mmx + check_cc_option sse2 +-- +2.33.0 + diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 4e84e496bf..58ebdcb054 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -161,6 +161,7 @@ define TVHEADEND_CONFIGURE_CMDS --enable-dvbscan \ --enable-bundle \ --enable-pngquant \ + --disable-execinfo \ --disable-ffmpeg_static \ --disable-hdhomerun_static \ $(TVHEADEND_CONF_OPTS) \ From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/python{3}-cffi: bump to version 1.15.0 Message-ID: <20220104171106.179A082E21@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1c37ece2842225b1794c80347d52a3c1df3ec08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-cffi/python-cffi.hash | 4 ++-- package/python-cffi/python-cffi.mk | 4 ++-- package/python3-cffi/python3-cffi.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash index 8ab672a56f..41565f9a62 100644 --- a/package/python-cffi/python-cffi.hash +++ b/package/python-cffi/python-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cffi/json -md5 5c118a18ea897df164dbff67a32876fc cffi-1.14.6.tar.gz -sha256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd cffi-1.14.6.tar.gz +md5 f3a3f26cd3335fc597479c9475da0a0b cffi-1.15.0.tar.gz +sha256 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 cffi-1.15.0.tar.gz # Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index 2504cf18f4..b14dce8225 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-cffi/python3-cffi.mk -PYTHON_CFFI_VERSION = 1.14.6 +PYTHON_CFFI_VERSION = 1.15.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk index 52ea3b3fbf..2770eda93e 100644 --- a/package/python3-cffi/python3-cffi.mk +++ b/package/python3-cffi/python3-cffi.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-cffi/python-cffi.mk -PYTHON3_CFFI_VERSION = 1.14.6 +PYTHON3_CFFI_VERSION = 1.15.0 PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz -PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 +PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a PYTHON3_CFFI_SETUP_TYPE = setuptools PYTHON3_CFFI_LICENSE = MIT PYTHON3_CFFI_LICENSE_FILES = LICENSE From arnout at mind.be Tue Jan 4 17:08:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:08:57 +0100 Subject: [Buildroot] [git commit] support/config-fragments/autobuild: fix bootlin-riscv64 configs Message-ID: <20220104171106.45E9382E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c92ef3dd8f6b83c33d8e4fad2e2ac2d2a2d6a39 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 bootlin toolchains by RISC-V LP64D. The config symbols BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. Those changes were not reflected in the autobuild toolchain configs in support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config When testing a package with the command: ./utils/test-pkg --all --package somepackage bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build logfile contains: [...] Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y Actual value: Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set This commit update the autobuild config fragments for RISC-V 64bit toolchains so they can be used by test-pkg. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- support/config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config index f6c6fcaa36..433a6e89f7 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config index 2b6a6e56da..fee1f29f4a 100644 --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config @@ -1,4 +1,4 @@ BR2_riscv=y -BR2_RISCV_ABI_LP64=y +BR2_RISCV_ABI_LP64D=y BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y From arnout at mind.be Tue Jan 4 16:53:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:53:00 +0100 Subject: [Buildroot] [git commit] Makefile: disable 'printvars' and 'show-vars' recipes for Make 4.3 Message-ID: <20220104171106.3DDBA82DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25cec5ea733251eb27745adb489f268e7e4d5a76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Make 4.3 is buggy and leads to a "Segmentation fault (core dumped)" when calling 'make printvars' or 'make show-vars', so let's refuse to execute those recipes if Make 4.3 by adding 'check-make-version' recipe as depedendency of 'printvars' and 'show-vars' as suggested by Yann E. Morin. Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0b8c7b2867..ac98b84425 100644 --- a/Makefile +++ b/Makefile @@ -1058,13 +1058,20 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif +.PHONY: check-make-version +check-make-version: +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) + @echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes" + @exit 1 +endif + # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are # displayed. # show-vars does the same, but as a JSON dictionnary. .PHONY: printvars -printvars: +printvars: check-make-version @: $(foreach V, \ $(sort $(filter $(VARS),$(.VARIABLES))), \ @@ -1077,7 +1084,7 @@ printvars: .PHONY: show-vars show-vars: VARS?=% -show-vars: +show-vars: check-make-version @: $(info $(call clean-json, { \ $(foreach V, \ From arnout at mind.be Tue Jan 4 16:53:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:53:00 +0100 Subject: [Buildroot] [git commit] package/python-cbor2: bump to version 5.4.2 Message-ID: <20220104171106.34E9282E21@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63b1ebe94d96951c56bab97eba56b6298cf015ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-cbor2/python-cbor2.hash | 4 ++-- package/python-cbor2/python-cbor2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index 879463c2ce..9910e632a2 100644 --- a/package/python-cbor2/python-cbor2.hash +++ b/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 87b3ad8a9dd8875fa46c6ec06e3fb0ba cbor2-5.4.1.tar.gz -sha256 a8bf432f6cb595f50aeb8fed2a4aa3b3f7caa7f135fb57e4378eaa39242feac9 cbor2-5.4.1.tar.gz +md5 b3a6085ee1a9e11ddec305f7a7bc5956 cbor2-5.4.2.tar.gz +sha256 e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8 cbor2-5.4.2.tar.gz # Locally computed sha256 checksums sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index af42d0344a..4cc09a219f 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.1 +PYTHON_CBOR2_VERSION = 5.4.2 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/9e/25/9dd432c051010faea6a702cb85d0b53dc9d5414513866b6a73b3ac954092 +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d4/ca/b96be94f694155ce58823c38cf8fd1aa620bdc91e2c801713cdb4167b6aa PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt From arnout at mind.be Tue Jan 4 16:52:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 17:52:59 +0100 Subject: [Buildroot] [git commit] package/mdadm: bump to version 4.2 Message-ID: <20220104171106.2271582DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b03fc7974536378ba102418451ba7e9801bc6251 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop first patch and use install-bin target added by https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=b4a5ad4958cb3ad87c3c5fa993e7572c38596d09 - Drop second patch (already in version) - Handle libudev optional dependency through CXFLAGS instead of overriding CFLAGS as wanted by upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=af3396dadfcd3b13480d021b8d3645c6d2420f79 - Update indentation in hash file (two spaces) https://www.spinics.net/lists/raid/msg69218.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...1-add-install-targets-for-mdadm-and-mdmon.patch | 32 -------------------- ...adm.h-include-sysmacros.h-unconditionally.patch | 35 ---------------------- package/mdadm/mdadm.hash | 4 +-- package/mdadm/mdadm.mk | 21 +++++++++---- 4 files changed, 17 insertions(+), 75 deletions(-) diff --git a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch b/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch deleted file mode 100644 index 15df7557e7..0000000000 --- a/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Wed, 6 Mar 2013 16:03:14 +0100 -Subject: [PATCH] Add install targets for mdadm and mdmon - - -Signed-off-by: Christophe Vu-Brugier ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 315455b..27d8eeb 100644 ---- a/Makefile -+++ b/Makefile -@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h - sha1.o : sha1.c sha1.h md5.h - $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c - --install : mdadm mdmon install-man install-udev -+install : install-mdadm install-mdmon install-man install-udev -+ -+install-mdadm : - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm -+ -+install-mdmon : - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon - - install-static : mdadm.static install-man --- -1.7.10.4 - diff --git a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch b/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch deleted file mode 100644 index c8944c8475..0000000000 --- a/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 6 Aug 2019 16:01:15 +0300 -Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally - -musl libc now also requires sys/sysmacros.h for the major/minor macros. -All supported libc implementations carry sys/sysmacros.h, including -diet-libc, klibc, and uclibc-ng. - -Cc: Hauke Mehrtens -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=linux-raid&m=156509677018508 - - mdadm.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/mdadm.h b/mdadm.h -index c36d7fdb10f6..d61a9ca82dc1 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - #include - #include - #include --#ifdef __GLIBC__ - /* Newer glibc requires sys/sysmacros.h directly for makedev() */ - #include --#endif - #ifdef __dietlibc__ - #include - /* dietlibc has deprecated random and srandom!! */ --- -2.20.1 - diff --git a/package/mdadm/mdadm.hash b/package/mdadm/mdadm.hash index b15cb4e031..b9631a2aaa 100644 --- a/package/mdadm/mdadm.hash +++ b/package/mdadm/mdadm.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a mdadm-4.1.tar.xz +sha256 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d mdadm-4.2.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 171782712f..6ee0bb60c9 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -4,14 +4,19 @@ # ################################################################################ -MDADM_VERSION = 4.1 +MDADM_VERSION = 4.2 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING -MDADM_BUILD_OPTS = $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" \ +MDADM_CXFLAGS = $(TARGET_CFLAGS) + +MDADM_BUILD_OPTS = \ + CC=$(TARGET_CC) \ + COROSYNC=-DNO_COROSYNC \ + DLM=-DNO_DLM \ + CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 @@ -19,14 +24,18 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) MDADM_BUILD_OPTS += USE_PTHREADS= endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +MDADM_DEPENDENCIES += udev +else +MDADM_CXFLAGS += -DNO_LIBUDEV +endif + define MDADM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(MDADM_BUILD_OPTS) mdadm mdmon endef define MDADM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) \ - install-mdadm install-mdmon + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin endef $(eval $(generic-package)) From arnout at mind.be Tue Jan 4 17:32:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:32:08 +0100 Subject: [Buildroot] [PATCH 1/1] support/config-fragments/autobuild: fix riscv64 toolchain configs In-Reply-To: References: <20220101213948.265173-1-ju.o@free.fr> Message-ID: <067a8d97-e71c-4036-a1b2-4fcb7d062947@mind.be> On 04/01/2022 18:16, Arnout Vandecappelle wrote: > > > On 01/01/2022 22:39, Julien Olivain wrote: >> commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 >> toolchains by RISC-V LP64D. The config symbols >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. >> Those changes were not reflected in the autobuild toolchain configs in >> support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config >> >> When testing a package with the command: >> >> ???? ./utils/test-pkg --all --package somepackage >> >> bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build >> logfile contains: >> >> ???? [...] >> ???? Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config >> ???? Requested value:? BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y >> ???? Actual value: >> >> ???? Value requested for >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config >> ???? Requested value: >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y >> ???? Actual value:???? # >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set >> >> This commit update the autobuild config fragments for RISC-V 64bit >> toolchains so they can be used by test-pkg. >> >> Signed-off-by: Julien Olivain > > ?Applied to master, thanks. > > ?While reviewing this, I noticed that > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, so > I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc Thomas > on that, so Thomas consider yourself CCed now :-) > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220104171128.956397-1-arnout at mind.be/ ?Regards, ?Arnout > ?Regards, > ?Arnout > > >> --- >> ? .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- >> ? .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- >> ? 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config >> b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config >> index f6c6fcaa36..433a6e89f7 100644 >> --- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config >> +++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config >> @@ -1,5 +1,5 @@ >> ? BR2_riscv=y >> -BR2_RISCV_ABI_LP64=y >> +BR2_RISCV_ABI_LP64D=y >> ? BR2_TOOLCHAIN_EXTERNAL=y >> ? BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y >> -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y >> +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y >> diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config >> b/support/config-fragments/autobuild/bootlin-riscv64-musl.config >> index 2b6a6e56da..fee1f29f4a 100644 >> --- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config >> +++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config >> @@ -1,4 +1,4 @@ >> ? BR2_riscv=y >> -BR2_RISCV_ABI_LP64=y >> +BR2_RISCV_ABI_LP64D=y >> ? BR2_TOOLCHAIN_EXTERNAL=y >> -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y >> +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y >> From aduskett at gmail.com Tue Jan 4 17:48:57 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 4 Jan 2022 09:48:57 -0800 Subject: [Buildroot] [PATCH v2 0/1] Fix per-package builds with qt5 submodule packages Message-ID: <20220104174858.2665848-1-aduskett@gmail.com> Based off of Louis-Paul's earlier work[1] and And Yann Morin's feedback to a different patch set[2], this simple fix adds a new pre-configure hook method to pkg-generic.mk which searches for .pc,.cmake, and .pri files for any line that has a PER_PACKAGE_DIR path and replaces it with the appropriate PER_PACKAGE_DIR path for the package being compiled. $(HOST_DIR) is used instead of $(STAGING_DIR) as that covers both host and staging directories in one step. IE: If building qt5svg: buildroot/output/per-package/qt5base -> buildroot/output/per-package/qt5svg Feedback is welcome! Adam 1) https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ 2) https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Adam Duskett (1): package/pkg-generic.mk: fix absolute paths in per-package config files package/pkg-generic.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- changes v1 -> v2 - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host directories in a single step. 2.33.1 From aduskett at gmail.com Tue Jan 4 17:48:58 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 4 Jan 2022 09:48:58 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-generic.mk: fix absolute paths in per-package config files In-Reply-To: <20220104174858.2665848-1-aduskett@gmail.com> References: <20220104174858.2665848-1-aduskett@gmail.com> Message-ID: <20220104174858.2665848-2-aduskett@gmail.com> Some packages (notably qmake packages) generate .cmake, .pc, and .pri files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in those files point outside the per-package sysroot for packages that have rsynced those same files. Add the new pre-configure hook "FIXUP_CONFIG_FILES_ABSOLUTE_PATHS" in package/pkg-generic.mk which searches for .cmake, .pc, and .pri files in a given per-package host and staging directory and replaces the old $(PER_PACKAGE_DIR) directory with the correct directory for the given package. This simple fix allows qt5 submodule packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- changes v1 -> v2 - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host directories in a single step. package/pkg-generic.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5626af1d87..5a2b4ccaf8 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -103,6 +103,21 @@ define fixup-libtool-files endef endif +# When per-package is enabled, packages may generate files with absolute paths +# that point to the given sysroot. However, after the rsync step for another +# package that uses those files, per-package isolation is broken because the +# hard-coded paths point to directories outside the per-package sysroot. +# As a pre-configure step, sed all .cmake, .pc, and .pri files in a given +# package sysroot containing the word "per-package" and replace the line with +# the appropriate per-package directory. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_CONFIG_FILES_ABSOLUTE_PATHS + $(Q)find $(HOST_DIR)/ -name "*.pc" -o -name "*.cmake" -o -name "*.pri" \ + | xargs --no-run-if-empty \ + $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(NAME)/:g" +endef +endif + # Make sure python _sysconfigdata*.py files only reference the current # per-package directory. # @@ -837,6 +852,7 @@ $(2)_EXTRACT_CMDS ?= \ # pre/post-steps hooks $(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_PRE_CONFIGURE_HOOKS += FIXUP_CONFIG_FILES_ABSOLUTE_PATHS ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.33.1 From arnout at mind.be Tue Jan 4 17:49:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:49:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/jose: bump to version 11 In-Reply-To: <20220101214034.2000480-1-fontaine.fabrice@gmail.com> References: <20220101214034.2000480-1-fontaine.fabrice@gmail.com> Message-ID: <153def22-4f44-e274-107f-010e68cb1407@mind.be> On 01/01/2022 22:40, Fabrice Fontaine wrote: > - Switch to meson-package (and so drop second patch) > - Update indentation in hash file (two spaces) > > https://github.com/latchset/jose/releases/tag/v11 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...nfigure-fix-build-with-old-compilers.patch | 165 ------------------ > package/jose/jose.hash | 4 +- > package/jose/jose.mk | 8 +- > 3 files changed, 5 insertions(+), 172 deletions(-) > delete mode 100644 package/jose/0002-configure-fix-build-with-old-compilers.patch > > diff --git a/package/jose/0002-configure-fix-build-with-old-compilers.patch b/package/jose/0002-configure-fix-build-with-old-compilers.patch > deleted file mode 100644 > index 0484f38f0d..0000000000 > --- a/package/jose/0002-configure-fix-build-with-old-compilers.patch > +++ /dev/null > @@ -1,165 +0,0 @@ > -From 98e9faa4d39cd5b6aaab882877e19ae394ba3810 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Mon, 20 Nov 2017 23:10:38 +0100 > -Subject: [PATCH] configure: fix build with old compilers > - > -Old gcc versions (gcc 4.7) do not support all warnings flags currently > -hard-coded by configure.ac. In order to fix this, we import the > -AX_CHECK_COMPILE_FLAG() macro from the autoconf-archive, and use it in > -the configure.ac to only use warning flags when the compiler supports > -them. > - > -Submitted-upstream: https://github.com/latchset/jose/pull/51 > -Signed-off-by: Thomas Petazzoni > ---- > - configure.ac | 46 +++++++++++++++------------- > - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ > - 3 files changed, 105 insertions(+), 22 deletions(-) > - create mode 100644 m4/ax_check_compile_flag.m4 > - > -diff --git a/configure.ac b/configure.ac > -index cf8c9a6..6fe4ded 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -1,5 +1,6 @@ > - AC_PREREQ(2.62) > - AC_INIT(jose, 10) > -+AC_CONFIG_MACRO_DIRS([m4]) > - AC_CANONICAL_SYSTEM > - AC_PROG_CC_C99 > - > -@@ -18,27 +19,30 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.0.2]) > - AC_OPENMP > - AC_SUBST([OPENMP_CFLAGS]) > - > --JOSE_CFLAGS="\ > ---Wall \ > ---Wextra \ > ---Werror \ > ---Wstrict-aliasing \ > ---Wchar-subscripts \ > ---Wformat-security \ > ---Wmissing-declarations \ > ---Wmissing-prototypes \ > ---Wnested-externs \ > ---Wpointer-arith \ > ---Wshadow \ > ---Wsign-compare \ > ---Wstrict-prototypes \ > ---Wtype-limits \ > ---Wunused-function \ > ---Wno-missing-field-initializers \ > ---Wno-unused-command-line-argument \ > ---Wno-unused-parameter \ > ---Wno-unknown-pragmas \ > --" > -+for flag in \ > -+ -Wall \ > -+ -Wextra \ > -+ -Werror \ > -+ -Wstrict-aliasing \ > -+ -Wchar-subscripts \ > -+ -Wformat-security \ > -+ -Wmissing-declarations \ > -+ -Wmissing-prototypes \ > -+ -Wnested-externs \ > -+ -Wpointer-arith \ > -+ -Wshadow \ > -+ -Wsign-compare \ > -+ -Wstrict-prototypes \ > -+ -Wtype-limits \ > -+ -Wunused-function \ > -+ -Wno-missing-field-initializers \ > -+ -Wno-unused-command-line-argument \ > -+ -Wno-unused-parameter \ > -+ -Wno-unknown-pragmas ; do > -+ AX_CHECK_COMPILE_FLAG([${flag}], > -+ [JOSE_CFLAGS="${JOSE_CFLAGS} ${flag}"]) > -+done > -+ > - AC_SUBST([JOSE_CFLAGS]) > - > - AC_MSG_CHECKING([for linker script support]) > -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 > -new file mode 100644 > -index 0000000..dcabb92 > ---- /dev/null > -+++ b/m4/ax_check_compile_flag.m4 > -@@ -0,0 +1,74 @@ > -+# =========================================================================== > -+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html > -+# =========================================================================== > -+# > -+# SYNOPSIS > -+# > -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) > -+# > -+# DESCRIPTION > -+# > -+# Check whether the given FLAG works with the current language's compiler > -+# or gives an error. (Warnings, however, are ignored) > -+# > -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on > -+# success/failure. > -+# > -+# If EXTRA-FLAGS is defined, it is added to the current language's default > -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with > -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to > -+# force the compiler to issue an error when a bad flag is given. > -+# > -+# INPUT gives an alternative input source to AC_COMPILE_IFELSE. > -+# > -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this > -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. > -+# > -+# LICENSE > -+# > -+# Copyright (c) 2008 Guido U. Draheim > -+# Copyright (c) 2011 Maarten Bosmans > -+# > -+# This program is free software: you can redistribute it and/or modify it > -+# under the terms of the GNU General Public License as published by the > -+# Free Software Foundation, either version 3 of the License, or (at your > -+# option) any later version. > -+# > -+# This program is distributed in the hope that it will be useful, but > -+# WITHOUT ANY WARRANTY; without even the implied warranty of > -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General > -+# Public License for more details. > -+# > -+# You should have received a copy of the GNU General Public License along > -+# with this program. If not, see . > -+# > -+# As a special exception, the respective Autoconf Macro's copyright owner > -+# gives unlimited permission to copy, distribute and modify the configure > -+# scripts that are the output of Autoconf when processing the Macro. You > -+# need not follow the terms of the GNU General Public License when using > -+# or distributing such scripts, even though portions of the text of the > -+# Macro appear in them. The GNU General Public License (GPL) does govern > -+# all other use of the material that constitutes the Autoconf Macro. > -+# > -+# This special exception to the GPL applies to versions of the Autoconf > -+# Macro released by the Autoconf Archive. When you make and distribute a > -+# modified version of the Autoconf Macro, you may extend this special > -+# exception to the GPL to apply to your modified version as well. > -+ > -+#serial 5 > -+ > -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], > -+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF > -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl > -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ > -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS > -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" > -+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], > -+ [AS_VAR_SET(CACHEVAR,[yes])], > -+ [AS_VAR_SET(CACHEVAR,[no])]) > -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) > -+AS_VAR_IF(CACHEVAR,yes, > -+ [m4_default([$2], :)], > -+ [m4_default([$3], :)]) > -+AS_VAR_POPDEF([CACHEVAR])dnl > -+])dnl AX_CHECK_COMPILE_FLAGS > --- > -2.13.6 > - > diff --git a/package/jose/jose.hash b/package/jose/jose.hash > index 376bc0b585..128d26d163 100644 > --- a/package/jose/jose.hash > +++ b/package/jose/jose.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72 jose-10.tar.bz2 > -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING > +sha256 e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 jose-11.tar.xz > +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING > diff --git a/package/jose/jose.mk b/package/jose/jose.mk > index 2758d408da..8a60e20cc6 100644 > --- a/package/jose/jose.mk > +++ b/package/jose/jose.mk > @@ -4,14 +4,12 @@ > # > ################################################################################ > > -JOSE_VERSION = 10 > -JOSE_SOURCE = jose-$(JOSE_VERSION).tar.bz2 > +JOSE_VERSION = 11 > +JOSE_SOURCE = jose-$(JOSE_VERSION).tar.xz > JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) > JOSE_LICENSE = Apache-2.0 > JOSE_LICENSE_FILES = COPYING > -# 0002-configure-fix-build-with-old-compilers.patch > -JOSE_AUTORECONF = YES > JOSE_INSTALL_STAGING = YES > JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl > > -$(eval $(autotools-package)) > +$(eval $(meson-package)) > From arnout at mind.be Tue Jan 4 17:49:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:49:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/mraa: bump to version 2.2.0 In-Reply-To: <20220101215622.2013558-1-fontaine.fabrice@gmail.com> References: <20220101215622.2013558-1-fontaine.fabrice@gmail.com> Message-ID: On 01/01/2022 22:56, Fabrice Fontaine wrote: > - Refresh upstream status of first patch > - Drop second patch (already in version) > > https://github.com/eclipse/mraa/blob/v2.2.0/docs/changelog.md > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...de-Declare-gVERSION-global-as-extern.patch | 7 +- > ...2-CMakeLists.txt-add-BUILDCPP-option.patch | 193 ------------------ > package/mraa/mraa.hash | 2 +- > package/mraa/mraa.mk | 2 +- > 4 files changed, 6 insertions(+), 198 deletions(-) > delete mode 100644 package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch > > diff --git a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch > index b3a1f5a03a..110c020a62 100644 > --- a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch > +++ b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch > @@ -1,13 +1,14 @@ > -From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 > +From aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= > Date: Mon, 13 Apr 2020 20:12:11 +0200 > Subject: [PATCH] include: Declare gVERSION global as 'extern'. > > Fixes build with '-fno-common'. > > +Signed-off-by: Thomas Ingleby > [Retrieved from: > -https://github.com/eclipse/mraa/pull/1012/commits/dbb5961f106ec42cd70689d933674c9c37aedfe1] > -Signed-off-by: Fabrice Fontaine > +https://github.com/eclipse/mraa/commit/aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031] > +Signed-off-by: Fabrice Fontaine > --- > include/version.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch b/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch > deleted file mode 100644 > index fbadfe79ef..0000000000 > --- a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch > +++ /dev/null > @@ -1,193 +0,0 @@ > -From cb88e4dd1fbbb9d24e625dba2768b88ed99da309 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 13 Jun 2020 22:51:37 +0200 > -Subject: [PATCH] CMakeLists.txt: add BUILDCPP option > - > -C++ is a mandatory dependency since version 1.4.0 and > -https://github.com/eclipse/mraa/commit/122cab1f1e53b7c9c7cd82905b962071f9bad9dc > - > -As a result, build on embedded toolchains that do not support C++ fails > -on: > - > -CMake Error at CMakeLists.txt:2 (project): > - The CMAKE_CXX_COMPILER: > - > - /home/naourr/work/instance-1/output-1/per-package/mraa/host/bin/arm-linux-g++ > - > - is not a full path to an existing compiler tool. > - > -Fixes: > - - http://autobuild.buildroot.org/results/31086422e03611c16ab59c4418e3669b580bc0c0 > - > -Signed-off-by: Fabrice Fontaine > -[Retrieved from: > -https://github.com/eclipse/mraa/commit/cb88e4dd1fbbb9d24e625dba2768b88ed99da309] > ---- > - CMakeLists.txt | 69 +++++++++++++++++++---------------- > - src/java/CMakeLists.txt | 4 +- > - src/javascript/CMakeLists.txt | 34 +++++++++-------- > - 3 files changed, 59 insertions(+), 48 deletions(-) > - > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index 250d9106e..90c0dc920 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -1,5 +1,5 @@ > - cmake_minimum_required (VERSION 2.8.11) > --project (mraa C CXX) > -+project (mraa C) > - > - FIND_PACKAGE (Threads REQUIRED) > - > -@@ -11,6 +11,8 @@ else () > - set (CMAKE_C_STANDARD 99) > - endif () > - > -+option (BUILDCPP "Enable C++ (needed by FTDI4222 and tests)" ON) > -+ > - ############################################################################### > - # Detect supported warning flags > - # Modified from work By Dan Liew (fpbench - MIT) > -@@ -33,15 +35,18 @@ set (MRAA_C_WARNING_FLAGS > - -Werror=missing-parameter-type > - ) > - > --# Warning flags for the C++ compiler only > --set (MRAA_CXX_WARNING_FLAGS > -- -Wnon-virtual-dtor > -- -Woverloaded-virtual > -- -Wreorder > --) > -- > - include (CheckCCompilerFlag) > --include (CheckCXXCompilerFlag) > -+if (BUILDCPP) > -+ # Warning flags for the C++ compiler only > -+ set (MRAA_CXX_WARNING_FLAGS > -+ -Wnon-virtual-dtor > -+ -Woverloaded-virtual > -+ -Wreorder > -+ ) > -+ > -+ enable_language (CXX) > -+ include (CheckCXXCompilerFlag) > -+endif () > - function (MRAA_SANITIZE_FLAG_NAME OUTPUT_VAR FLAG) > - string (REPLACE "-" "_" SANITIZED_FLAG_NAME "${FLAG}") > - string (REPLACE "/" "_" SANITIZED_FLAG_NAME "${SANITIZED_FLAG_NAME}") > -@@ -62,28 +67,30 @@ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_C_WARNING_FLAGS}) > - endif () > - endforeach () > - > --# Globally set C++ compiler warning flags that are supported and emit > --# a warning about unsupported flags > --foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) > -- MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") > -- CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) > -- if (HAS_CXX_${SANITIZED_FLAG_NAME}) > -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") > -- else () > -- message (WARNING "C++ compiler does not support flag \"${flag}\"") > -- endif () > --endforeach () > -- > --# This function adds the c++11 flag to a c++ target (if supported) > --function(use_cxx_11 targetname) > -- include(CheckCXXCompilerFlag) > -- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) > -- if (COMPILER_SUPPORTS_CXX11) > -- set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") > -- else() > -- message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") > -- endif() > --endfunction() > -+if (BUILDCPP) > -+ # Globally set C++ compiler warning flags that are supported and emit > -+ # a warning about unsupported flags > -+ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) > -+ MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") > -+ CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) > -+ if (HAS_CXX_${SANITIZED_FLAG_NAME}) > -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") > -+ else () > -+ message (WARNING "C++ compiler does not support flag \"${flag}\"") > -+ endif () > -+ endforeach () > -+ > -+ # This function adds the c++11 flag to a c++ target (if supported) > -+ function(use_cxx_11 targetname) > -+ include(CheckCXXCompilerFlag) > -+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) > -+ if (COMPILER_SUPPORTS_CXX11) > -+ set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") > -+ else() > -+ message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") > -+ endif() > -+ endfunction() > -+endif() > - > - # Set CMAKE_INSTALL_LIBDIR if not defined > - include(GNUInstallDirs) > -diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt > -index 231c755fa..cfa72a0df 100644 > ---- a/src/java/CMakeLists.txt > -+++ b/src/java/CMakeLists.txt > -@@ -16,7 +16,9 @@ include_directories ( > - set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src") > - set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) > - > --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") > -+if (BUILDCPP) > -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") > -+endif() > - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") > - > - if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) > -diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt > -index 25fd36275..99a96b49d 100644 > ---- a/src/javascript/CMakeLists.txt > -+++ b/src/javascript/CMakeLists.txt > -@@ -36,25 +36,27 @@ set_target_properties (mraajs PROPERTIES > - ) > - > - message (STATUS "INFO - swig Version ${SWIG_VERSION}") > --message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") > -+if (BUILDCPP) > -+ message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") > - > --if (${V8_VERSION_MAJOR} GREATER 3) > -- message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") > -- # Node 0.12.x V8 engine major version is '3'. > -- # Node 2.1.0 V8 engine major version is '4'. > -- set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) > -- set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) > -- if (CMAKE_VERSION VERSION_LESS "3.1") > -- message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") > -- if (CMAKE_COMPILER_IS_GNUCXX) > -- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") > -- message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") > -+ if (${V8_VERSION_MAJOR} GREATER 3) > -+ message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") > -+ # Node 0.12.x V8 engine major version is '3'. > -+ # Node 2.1.0 V8 engine major version is '4'. > -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) > -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) > -+ if (CMAKE_VERSION VERSION_LESS "3.1") > -+ message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") > -+ if (CMAKE_COMPILER_IS_GNUCXX) > -+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") > -+ message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") > -+ endif () > -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") > -+ else () > -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") > - endif () > -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") > -- else () > -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") > -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") > - endif () > -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") > - endif () > - endif () > - > diff --git a/package/mraa/mraa.hash b/package/mraa/mraa.hash > index f29a5ce838..321b6409ed 100644 > --- a/package/mraa/mraa.hash > +++ b/package/mraa/mraa.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345 mraa-2.1.0.tar.gz > +sha256 076669bee8423ffef3065735b293a329020be86630fea457174dbfcc67a0554a mraa-2.2.0.tar.gz > sha256 fac52622ed3badd86b34857b21777ab90296d6ccbc2ac0fd457c09fdeefa9ef1 COPYING > diff --git a/package/mraa/mraa.mk b/package/mraa/mraa.mk > index 910339b386..47178a423b 100644 > --- a/package/mraa/mraa.mk > +++ b/package/mraa/mraa.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MRAA_VERSION = 2.1.0 > +MRAA_VERSION = 2.2.0 > MRAA_SITE = $(call github,eclipse,mraa,v$(MRAA_VERSION)) > MRAA_LICENSE = MIT > MRAA_LICENSE_FILES = COPYING > From arnout at mind.be Tue Jan 4 17:50:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:50:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbredir: bump to version 0.12.0 In-Reply-To: <20220101220532.2057125-1-fontaine.fabrice@gmail.com> References: <20220101220532.2057125-1-fontaine.fabrice@gmail.com> Message-ID: <94b150cd-2e70-dc09-749e-cc567bc8db30@mind.be> On 01/01/2022 23:05, Fabrice Fontaine wrote: > Drop all patches (already in version) > > https://gitlab.freedesktop.org/spice/usbredir/-/blob/usbredir-0.12.0/ChangeLog.md > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0001-meson-add-tests-option.patch | 46 -------------- > ...002-meson-add-stack_protector-option.patch | 60 ------------------- > .../0003-meson.build-make-C-optional.patch | 39 ------------ > package/usbredir/usbredir.hash | 4 +- > package/usbredir/usbredir.mk | 2 +- > 5 files changed, 3 insertions(+), 148 deletions(-) > delete mode 100644 package/usbredir/0001-meson-add-tests-option.patch > delete mode 100644 package/usbredir/0002-meson-add-stack_protector-option.patch > delete mode 100644 package/usbredir/0003-meson.build-make-C-optional.patch > > diff --git a/package/usbredir/0001-meson-add-tests-option.patch b/package/usbredir/0001-meson-add-tests-option.patch > deleted file mode 100644 > index b2df1587b1..0000000000 > --- a/package/usbredir/0001-meson-add-tests-option.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From 8490a7ac101d4ee0a78c44b252d3b7a6c2508c74 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 21 Aug 2021 11:55:48 +0200 > -Subject: [PATCH] meson: add tests option > - > -Add tests option to allow the user to disable them > - > -Signed-off-by: Fabrice Fontaine > -[Retrieved from: > -https://gitlab.freedesktop.org/spice/usbredir/-/commit/8490a7ac101d4ee0a78c44b252d3b7a6c2508c74] > ---- > - meson.build | 4 +++- > - meson_options.txt | 5 +++++ > - 2 files changed, 8 insertions(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index 6e773a7..a6d21b8 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -106,7 +106,9 @@ if host_machine.system() != 'windows' > - subdir('fuzzing') > - endif > - endif > --subdir('tests') > -+if get_option('tests').enabled() > -+ subdir('tests') > -+endif > - subdir('data') > - > - summary(summary_info, bool_yn: true) > -diff --git a/meson_options.txt b/meson_options.txt > -index b35732b..63e8c85 100644 > ---- a/meson_options.txt > -+++ b/meson_options.txt > -@@ -21,3 +21,8 @@ option('tools', > - type : 'feature', > - value : 'enabled', > - description : 'Build usbredir\'s tools such as usbredirect') > -+ > -+option('tests', > -+ type : 'feature', > -+ value : 'enabled', > -+ description : 'Build usbredir\'s tests such as filter') > --- > -GitLab > - > diff --git a/package/usbredir/0002-meson-add-stack_protector-option.patch b/package/usbredir/0002-meson-add-stack_protector-option.patch > deleted file mode 100644 > index 613e2714e3..0000000000 > --- a/package/usbredir/0002-meson-add-stack_protector-option.patch > +++ /dev/null > @@ -1,60 +0,0 @@ > -From 54cf1897ef3aa4d0a35b5f4eb1f5c6928b033af5 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 24 Sep 2021 17:24:43 +0200 > -Subject: [PATCH] meson: add stack_protector option > - > -Add stack_protector option to allow the user to disable it as some > -embedded toolchains don't support it which will result in the following > -build failure: > - > -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: usbredirparser/libusbredirparser.so.1.1.0.p/usbredirparser.c.o: in function `va_log': > -usbredirparser.c:(.text+0x1c4): undefined reference to `__stack_chk_guard' > - > -Fixes: > - - http://autobuild.buildroot.org/results/40de5443e98157ad50c6841ea70a835cd5ad4fe9 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: > -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/53] > ---- > - meson.build | 6 +++++- > - meson_options.txt | 5 +++++ > - 2 files changed, 10 insertions(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index a6d21b8..4350f53 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -17,8 +17,12 @@ cc_flags = [ > - if host_machine.system() != 'windows' > - cc_flags += [ > - '-Wp,-D_FORTIFY_SOURCE=2', > -- '-fstack-protector', > - ] > -+ if get_option('stack_protector').enabled() > -+ cc_flags += [ > -+ '-fstack-protector', > -+ ] > -+ endif > - endif > - > - # Check if we are building from .git > -diff --git a/meson_options.txt b/meson_options.txt > -index 63e8c85..34dd392 100644 > ---- a/meson_options.txt > -+++ b/meson_options.txt > -@@ -17,6 +17,11 @@ option('fuzzing-install-dir', > - type : 'string', > - description : 'Installation directory for fuzzing binaries') > - > -+option('stack_protector', > -+ type : 'feature', > -+ value : 'enabled', > -+ description : 'Build usbredir\'s with stack-protector') > -+ > - option('tools', > - type : 'feature', > - value : 'enabled', > --- > -2.33.0 > - > diff --git a/package/usbredir/0003-meson.build-make-C-optional.patch b/package/usbredir/0003-meson.build-make-C-optional.patch > deleted file mode 100644 > index fe1ed3f698..0000000000 > --- a/package/usbredir/0003-meson.build-make-C-optional.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From 55fc307d23d657b52433d1c8508467d0589754d5 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 16 Oct 2021 15:45:57 +0200 > -Subject: [PATCH] meson.build: make C++ optional > - > -Remove cpp from meson project statement to make C++ optional and avoid > -the following build failure when the toolchain does not provide a C++ > -compiler: > - > -../output-1/build/usbredir-0.11.0/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++']] > -The following exception(s) were encountered: > -Running "/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++ --version" gave "[Errno 2] No such file or directory: '/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++'" > - > -Indeed C++ is only required for fuzzing which is already handled by > -meson through add_languages('cpp', required: true) > - > -Fixes: > - - http://autobuild.buildroot.org/results/eca1d8a2b73a769354ab1d24c7996be30f152138 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: > -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/55] > ---- > - meson.build | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index 49dbce4..ca19f22 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -1,4 +1,4 @@ > --project('usbredir', 'c', 'cpp', > -+project('usbredir', 'c', > - version: '0.11.0', > - license: 'LGPLv2.1+', > - meson_version : '>= 0.53', > --- > -2.33.0 > - > diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash > index e11d4aa720..f738c36690 100644 > --- a/package/usbredir/usbredir.hash > +++ b/package/usbredir/usbredir.hash > @@ -1,5 +1,5 @@ > -# https://spice-space.org/download/usbredir/usbredir-0.11.0.tar.xz.sha256sum > -sha256 72dd5f3aa90dfbc0510b5149bb5b1654c8f21fdc405dfce7b5dc163dcff19cba usbredir-0.11.0.tar.xz > +# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum > +sha256 fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d usbredir-0.12.0.tar.xz > > # Hash for license files > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk > index 0a8dbf012d..6792a3e758 100644 > --- a/package/usbredir/usbredir.mk > +++ b/package/usbredir/usbredir.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -USBREDIR_VERSION = 0.11.0 > +USBREDIR_VERSION = 0.12.0 > USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz > USBREDIR_SITE = http://spice-space.org/download/usbredir > USBREDIR_LICENSE = LGPL-2.1+ (libraries) > From arnout at mind.be Tue Jan 4 17:50:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:50:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: bump to version 0.8.1 In-Reply-To: <20220101221425.2059395-1-fontaine.fabrice@gmail.com> References: <20220101221425.2059395-1-fontaine.fabrice@gmail.com> Message-ID: <1b540313-e49f-e282-3db5-b9e51076c280@mind.be> On 01/01/2022 23:14, Fabrice Fontaine wrote: > - Drop first patch (already in version) > - Refresh upstream status of latest patch > - Update hash of LICENSE and add cli/COPYING: > https://github.com/Cyan4973/xxHash/commit/85e1ea2ab0d90463b804f4a65b0f67d99718c6f8 > > https://github.com/Cyan4973/xxHash/releases/tag/v0.8.1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...h => 0001-fix-man-page-installation.patch} | 0 > .../0001-fixed-man-page-installation.patch | 31 ------------------- > ...efile-add-dedicated-install-targets.patch} | 8 ++--- > package/xxhash/xxhash.hash | 5 +-- > package/xxhash/xxhash.mk | 4 +-- > 5 files changed, 8 insertions(+), 40 deletions(-) > rename package/xxhash/{0002-fix-man-page-installation.patch => 0001-fix-man-page-installation.patch} (100%) > delete mode 100644 package/xxhash/0001-fixed-man-page-installation.patch > rename package/xxhash/{0003-Makefile-add-dedicated-install-targets.patch => 0002-Makefile-add-dedicated-install-targets.patch} (94%) > > diff --git a/package/xxhash/0002-fix-man-page-installation.patch b/package/xxhash/0001-fix-man-page-installation.patch > similarity index 100% > rename from package/xxhash/0002-fix-man-page-installation.patch > rename to package/xxhash/0001-fix-man-page-installation.patch > diff --git a/package/xxhash/0001-fixed-man-page-installation.patch b/package/xxhash/0001-fixed-man-page-installation.patch > deleted file mode 100644 > index a9f68db4b4..0000000000 > --- a/package/xxhash/0001-fixed-man-page-installation.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6 Mon Sep 17 00:00:00 2001 > -From: Yann Collet > -Date: Fri, 6 Aug 2021 15:29:32 -0700 > -Subject: [PATCH] fixed man page installation > - > -[Retrieved from: > -https://github.com/Cyan4973/xxHash/commit/e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6] > -Signed-off-by: Fabrice Fontaine > ---- > - Makefile | 8 ++++---- > - 1 file changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index b8552a9f..556a32a0 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -498,10 +498,10 @@ endif > - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum > - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum > - @echo Installing man pages > -- $(Q)$(INSTALL_DATA) xxhsum.1 $(DESTDIR)$(MANDIR)/xxhsum.1 > -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 > -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 > -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 > -+ $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 > -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 > -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 > -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 > - @echo xxhash installation completed > - > - .PHONY: uninstall > diff --git a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch > similarity index 94% > rename from package/xxhash/0003-Makefile-add-dedicated-install-targets.patch > rename to package/xxhash/0002-Makefile-add-dedicated-install-targets.patch > index 0607c8ee82..17d34a0823 100644 > --- a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch > +++ b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch > @@ -10,13 +10,14 @@ This is especially useful on embedded systems where dynamic library is > not always supported by toolchains > > Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/Cyan4973/xxHash/pull/665] > +[Retrieved from: > +https://github.com/Cyan4973/xxHash/commit/db9c199e99f7b4d419647b1ef49c547fc2547516] > --- > Makefile | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > -index 8d4fcd2..5fe7297 100644 > +index 8d4fcd21..5fe72972 100644 > --- a/Makefile > +++ b/Makefile > @@ -505,11 +505,14 @@ libxxhash.pc: libxxhash.pc.in > @@ -68,6 +69,3 @@ index 8d4fcd2..5fe7297 100644 > @echo xxhash installation completed > > .PHONY: uninstall > --- > -2.33.0 > - > diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash > index feb5000808..2c99236a45 100644 > --- a/package/xxhash/xxhash.hash > +++ b/package/xxhash/xxhash.hash > @@ -1,3 +1,4 @@ > # locally computed > -sha256 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f xxhash-0.8.0.tar.gz > -sha256 9da63520e9293d82c4b1613be5c84058cadb82b02f5972179bad13731d589910 LICENSE > +sha256 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c xxhash-0.8.1.tar.gz > +sha256 553d0035773ddd1590045f8fdc3a4c6ead31e36336721aeca8421e88ed1c9f80 LICENSE > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING > diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk > index 3e7f3244b3..a8f8d1d179 100644 > --- a/package/xxhash/xxhash.mk > +++ b/package/xxhash/xxhash.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -XXHASH_VERSION = 0.8.0 > +XXHASH_VERSION = 0.8.1 > XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) > XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) > -XXHASH_LICENSE_FILES = LICENSE > +XXHASH_LICENSE_FILES = LICENSE cli/COPYING > XXHASH_INSTALL_STAGING = YES > > XXHASH_TARGETS = xxhsum > From arnout at mind.be Tue Jan 4 17:50:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:50:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: bump to version 2.0.0 In-Reply-To: <20220101223529.2111756-1-fontaine.fabrice@gmail.com> References: <20220101223529.2111756-1-fontaine.fabrice@gmail.com> Message-ID: <64cd02f8-a2b5-1f20-8198-ff522eb999e3@mind.be> On 01/01/2022 23:35, Fabrice Fontaine wrote: > - Switch to meson-package to drop first patch and disable examples and > utils > - Drop second patch (already in version) > - Update hash of NOTICE (empty new lines added with > https://github.com/tinyalsa/tinyalsa/commit/902b8c8f9fa5a2e1937007d7d5ee90f01790808b) > > https://github.com/tinyalsa/tinyalsa/releases/tag/v2.0.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../tinyalsa/0001-disable-doxygen-usage.patch | 35 ------------------ > .../0002-interval.h-add-missing-header.patch | 36 ------------------- > package/tinyalsa/tinyalsa.hash | 4 +-- > package/tinyalsa/tinyalsa.mk | 27 +++----------- > 4 files changed, 6 insertions(+), 96 deletions(-) > delete mode 100644 package/tinyalsa/0001-disable-doxygen-usage.patch > delete mode 100644 package/tinyalsa/0002-interval.h-add-missing-header.patch > > diff --git a/package/tinyalsa/0001-disable-doxygen-usage.patch b/package/tinyalsa/0001-disable-doxygen-usage.patch > deleted file mode 100644 > index ed939fb9bf..0000000000 > --- a/package/tinyalsa/0001-disable-doxygen-usage.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -Disable doxygen usage > - > -In order to avoid a dependency on doxygen on the build machine, this > -patch adjusts the main Makefile to not build and install the > -documentation. > - > -[Vincent: tweak patch for 1.1.1 version] > - > -Signed-off-by: Thomas Petazzoni > -Signed-off-by: Vicente Olivert Riera > - > -diff -rup a/Makefile b/Makefile > ---- a/Makefile 2017-05-24 05:23:57.000000000 +0100 > -+++ b/Makefile 2017-05-25 10:35:20.781747053 +0100 > -@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man > - all: > - $(MAKE) -C src > - $(MAKE) -C utils > -- $(MAKE) -C doxygen > - $(MAKE) -C examples > - > - .PHONY: clean > - clean: > - $(MAKE) -C src clean > - $(MAKE) -C utils clean > -- $(MAKE) -C doxygen clean > - $(MAKE) -C examples clean > - > - .PHONY: install > -@@ -30,5 +28,4 @@ install: > - install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/ > - $(MAKE) -C src install > - $(MAKE) -C utils install > -- $(MAKE) -C doxygen install > - > diff --git a/package/tinyalsa/0002-interval.h-add-missing-header.patch b/package/tinyalsa/0002-interval.h-add-missing-header.patch > deleted file mode 100644 > index c043145b55..0000000000 > --- a/package/tinyalsa/0002-interval.h-add-missing-header.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001 > -From: Baruch Siach > -Date: Fri, 2 Jun 2017 12:19:03 +0300 > -Subject: [PATCH] interval.h: add missing header > - > -The ssize_t type requires the unistd.h header. This fixes build with musl > -libc: > - > -In file included from ../include/tinyalsa/limits.h:32:0, > - from limits.c:1: > -../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t' > - ssize_t max; > - ^ > - > -Signed-off-by: Baruch Siach > ---- > -Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98 > - > - include/tinyalsa/interval.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h > -index 3f6f3dce5d90..068571df5a63 100644 > ---- a/include/tinyalsa/interval.h > -+++ b/include/tinyalsa/interval.h > -@@ -30,6 +30,7 @@ > - #define TINYALSA_INTERVAL_H > - > - #include > -+#include > - > - /** A closed range signed interval. */ > - > --- > -2.11.0 > - > diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash > index d078bab597..f7673b1769 100644 > --- a/package/tinyalsa/tinyalsa.hash > +++ b/package/tinyalsa/tinyalsa.hash > @@ -1,3 +1,3 @@ > # locally computed > -sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz > -sha256 ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d NOTICE > +sha256 573ae0b2d3480851c1d2a12503ead2beea27f92d44ed47b74b553ba947994ef1 tinyalsa-2.0.0.tar.gz > +sha256 ea22a4711f5250f88a4d7011fbc65367d1b02ac954dcc49f5b6d7c135e6537c4 NOTICE > diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk > index bd9d9a00d0..b5c39e35d6 100644 > --- a/package/tinyalsa/tinyalsa.mk > +++ b/package/tinyalsa/tinyalsa.mk > @@ -4,30 +4,11 @@ > # > ################################################################################ > > -TINYALSA_VERSION = 1.1.1 > -TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) > +TINYALSA_VERSION = 2.0.0 > +TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) > TINYALSA_LICENSE = BSD-3-Clause > TINYALSA_LICENSE_FILES = NOTICE > TINYALSA_INSTALL_STAGING = YES > +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled > > -define TINYALSA_BUILD_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) > -endef > - > -define TINYALSA_INSTALL_STAGING_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) \ > - -C $(@D) \ > - PREFIX="/usr" \ > - CROSS_COMPILE="$(TARGET_CROSS)" \ > - DESTDIR="$(STAGING_DIR)" install > -endef > - > -define TINYALSA_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) \ > - -C $(@D) \ > - PREFIX="/usr" \ > - CROSS_COMPILE="$(TARGET_CROSS)" \ > - DESTDIR="$(TARGET_DIR)" install > -endef > - > -$(eval $(generic-package)) > +$(eval $(meson-package)) > From arnout at mind.be Tue Jan 4 17:51:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:51:03 +0100 Subject: [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency In-Reply-To: <20220101223900.2970405-1-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> Message-ID: <2cf41923-653d-2e32-c5d3-352338c918ea@mind.be> On 01/01/2022 23:38, Erik Larsson wrote: > The last reference of uriparser was removed in: > https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e > > Signed-off-by: Erik Larsson Applied to master, thanks. Regards, Arnout > --- > package/tpm2-tss/tpm2-tss.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk > index 71aa3feb96..060883c377 100644 > --- a/package/tpm2-tss/tpm2-tss.mk > +++ b/package/tpm2-tss/tpm2-tss.mk > @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE > TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project > TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack > TPM2_TSS_INSTALL_STAGING = YES > -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf > +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf > > # 0001-configure-Only-use-CXX-when-fuzzing.patch > TPM2_TSS_AUTORECONF = YES > From arnout at mind.be Tue Jan 4 17:51:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:51:15 +0100 Subject: [Buildroot] [PATCH 2/3] package/tpm2-tools: bump version to 5.2 In-Reply-To: <20220102212559.43475-1-who+buildroot@cnackers.org> References: <20220101223900.2970405-2-who+buildroot@cnackers.org> <20220102212559.43475-1-who+buildroot@cnackers.org> Message-ID: <02ad5067-f0ed-884c-478c-3e7e83062e72@mind.be> On 02/01/2022 22:25, Erik Larsson wrote: > Depedency on libuuid was removed in: > https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd > > Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 > > Signed-off-by: Erik Larsson Applied to master, thanks. Regards, Arnout > --- > .../0001-configure-make-build-gnu99.patch | 30 ------------------- > package/tpm2-tools/Config.in | 2 -- > package/tpm2-tools/tpm2-tools.hash | 2 +- > package/tpm2-tools/tpm2-tools.mk | 6 ++-- > 4 files changed, 3 insertions(+), 37 deletions(-) > delete mode 100644 package/tpm2-tools/0001-configure-make-build-gnu99.patch > > diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch > deleted file mode 100644 > index 37ca6c5873..0000000000 > --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 > -From: William Roberts > -Date: Mon, 8 Feb 2021 11:57:28 -0600 > -Subject: [PATCH] configure: make build gnu99 > - > -Signed-off-by: William Roberts > - > -[Retrieved from: > -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c > -and updated to set gnu99 instead of c99 as done by > -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index dc15b5595..25039a0d9 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ > - # -D_GNU_SOURCE is required for execvpe() in options.c > - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) > - > -+# Enable gnu99 mode, since we use some of these features. > -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) > -+ > - # Best attempt compiler options that are on newer versions of GCC that > - # we can't widely enforce without killing other peoples builds. > - # Works with gcc only. Needs to be disabled on BSD and clang > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 3be947648f..1a6698570a 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_TPM2_TSS > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBUUID > help > TPM (Trusted Platform Module) 2.0 CLI tools based on system > API of TPM2-TSS. These tools can be used to manage keys, > diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash > index bfb7e9b220..f50a896363 100644 > --- a/package/tpm2-tools/tpm2-tools.hash > +++ b/package/tpm2-tools/tpm2-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz > +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz > sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index 41f5bcf201..8675344805 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -4,15 +4,13 @@ > # > ################################################################################ > > -TPM2_TOOLS_VERSION = 4.3.2 > +TPM2_TOOLS_VERSION = 5.2 > TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_LICENSE = BSD-3-Clause > TPM2_TOOLS_LICENSE_FILES = doc/LICENSE > TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project > TPM2_TOOLS_SELINUX_MODULES = tpm2 > -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux > -# We're patching configure.ac > -TPM2_TOOLS_AUTORECONF = YES > +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf > > # -fstack-protector-all and FORTIFY_SOURCE=2 is used by > # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options > From arnout at mind.be Tue Jan 4 17:52:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:52:12 +0100 Subject: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools In-Reply-To: <20220101223900.2970405-3-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> <20220101223900.2970405-3-who+buildroot@cnackers.org> Message-ID: On 01/01/2022 23:39, Erik Larsson wrote: > Signed-off-by: Erik Larsson > --- > package/tpm2-tools/Config.in | 11 +++++++++++ > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > 2 files changed, 17 insertions(+) > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 1a6698570a..cb3eb2b0a5 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > https://github.com/tpm2-software/tpm2-tools > > +if BR2_PACKAGE_TPM2_TOOLS > + > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > + bool "tpm2-tools fapi support" > + select BR2_PACKAGE_TPM2_TSS_FAPI > + help > + This option enables Feature API (FAPI) support in tpm2-tools. > + The FAPI tools are prefixed with tss2_. > + > +endif > + > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index df5fbbfff4..6894be195f 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > # do not build man pages > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) Does this optoin make a big difference in size? If not, we'd normally make it an automatic option, i.e. ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) (and remove the Config.in option). Regards, Arnout > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > +else > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > +endif > + > $(eval $(autotools-package)) > From arnout at mind.be Tue Jan 4 17:54:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:54:41 +0100 Subject: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools In-Reply-To: <20220101223900.2970405-3-who+buildroot@cnackers.org> References: <20220101223900.2970405-1-who+buildroot@cnackers.org> <20220101223900.2970405-3-who+buildroot@cnackers.org> Message-ID: On 01/01/2022 23:39, Erik Larsson wrote: > Signed-off-by: Erik Larsson > --- > package/tpm2-tools/Config.in | 11 +++++++++++ > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > 2 files changed, 17 insertions(+) > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > index 1a6698570a..cb3eb2b0a5 100644 > --- a/package/tpm2-tools/Config.in > +++ b/package/tpm2-tools/Config.in > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > https://github.com/tpm2-software/tpm2-tools > > +if BR2_PACKAGE_TPM2_TOOLS > + > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > + bool "tpm2-tools fapi support" > + select BR2_PACKAGE_TPM2_TSS_FAPI > + help > + This option enables Feature API (FAPI) support in tpm2-tools. > + The FAPI tools are prefixed with tss2_. > + > +endif > + > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > index df5fbbfff4..6894be195f 100644 > --- a/package/tpm2-tools/tpm2-tools.mk > +++ b/package/tpm2-tools/tpm2-tools.mk > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > # do not build man pages > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) Does this optoin make a big difference in size? If not, we'd normally make it an automatic option, i.e. ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) (and remove the Config.in option). Regards, Arnout > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > +else > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > +endif > + > $(eval $(autotools-package)) > From arnout at mind.be Tue Jan 4 17:56:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:56:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> Message-ID: <61aad133-ed50-1cda-80bb-b04ce9dbd133@mind.be> On 01/01/2022 23:59, Fabrice Fontaine wrote: > The LXC 4.0 branch is supported until June 2025. > Only bugfixes and securitiy issues get included into the stable bugfix > releases, so it's always safe and recommended to keep up and run the > latest bugfix release. > > https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/lxc/lxc.hash | 2 +- > package/lxc/lxc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash > index efd7a8e42c..2b58df2f1d 100644 > --- a/package/lxc/lxc.hash > +++ b/package/lxc/lxc.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz > +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk > index 93f6d2535f..4d63fc14cb 100644 > --- a/package/lxc/lxc.mk > +++ b/package/lxc/lxc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LXC_VERSION = 4.0.10 > +LXC_VERSION = 4.0.11 > LXC_SITE = https://linuxcontainers.org/downloads/lxc > LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ > LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 > From arnout at mind.be Tue Jan 4 17:56:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:56:58 +0100 Subject: [Buildroot] [PATCH] configs/cubieboard2: bump U-Boot and kernel In-Reply-To: <20220102080635.9405-1-abrodkin@synopsys.com> References: <20220102080635.9405-1-abrodkin@synopsys.com> Message-ID: On 02/01/2022 09:06, Alexey Brodkin via buildroot wrote: > Bump U-Boot to version 2021.10 and kernel to 5.15.11 > Among other things fixes U-Boot build failure, > see https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006081: > ---------------------->8------------------- > HOSTLD scripts/dtc/dtc > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > ---------------------->8------------------- > > Signed-off-by: Alexey Brodkin Applied to master, thanks. Regards, Arnout > --- > configs/cubieboard2_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig > index 8924c88c54..a9356295c1 100644 > --- a/configs/cubieboard2_defconfig > +++ b/configs/cubieboard2_defconfig > @@ -1,16 +1,16 @@ > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > -# Linux headers same as kernel, a 4.18 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y > +# Linux headers same as kernel, a 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" > BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" > BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14" > -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" > +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" > BR2_TARGET_ROOTFS_EXT2=y > @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > From arnout at mind.be Tue Jan 4 17:57:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:57:34 +0100 Subject: [Buildroot] [PATCH] package/perl: bump to version 5.34.0 In-Reply-To: <20220102104318.2631-1-francois.perrad@gadz.org> References: <20220102104318.2631-1-francois.perrad@gadz.org> Message-ID: <21297fa7-2ce2-c60d-6c55-d3872151587a@mind.be> On 02/01/2022 11:43, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/perl/perl.hash | 12 ++++++------ > package/perl/perl.mk | 6 +++--- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/package/perl/perl.hash b/package/perl/perl.hash > index 42b7cc66c..b0f60ef6f 100644 > --- a/package/perl/perl.hash > +++ b/package/perl/perl.hash > @@ -1,10 +1,10 @@ > -# Hashes from: https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz.{md5,sha1,sha256}.txt > -md5 7f104064b906ad8c7329ca5e409a32d7 perl-5.32.1.tar.xz > -sha1 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e perl-5.32.1.tar.xz > -sha256 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz > +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt > +md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz > +sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz > +sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz > > -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.hash > -sha256 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25 perl-cross-1.3.5.tar.gz > +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash > +sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz > > # Locally calculated > sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic > diff --git a/package/perl/perl.mk b/package/perl/perl.mk > index f661fef01..d7f9c58dd 100644 > --- a/package/perl/perl.mk > +++ b/package/perl/perl.mk > @@ -5,8 +5,8 @@ > ################################################################################ > > # When updating the version here, also update utils/scancpan > -PERL_VERSION_MAJOR = 32 > -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 > +PERL_VERSION_MAJOR = 34 > +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 > 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.3.5 > +PERL_CROSS_VERSION = 1.3.6 > # 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 arnout at mind.be Tue Jan 4 17:59:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:59:08 +0100 Subject: [Buildroot] [PATCH 1/2] configs/stm32f469_disco_xip: remove BR2_LINUX_KERNEL_XZ In-Reply-To: <20220102165849.1653228-1-dariobin@libero.it> References: <20220102165849.1653228-1-dariobin@libero.it> Message-ID: On 02/01/2022 17:58, Dario Binacchi wrote: > This is a XIP kernel, so it shouldn't be compressed. > > Signed-off-by: Dario Binacchi Both applied to master, thanks. Regards, Arnout > --- > configs/stm32f469_disco_xip_defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig > index f3d333278a53..6c4f227f582d 100644 > --- a/configs/stm32f469_disco_xip_defconfig > +++ b/configs/stm32f469_disco_xip_defconfig > @@ -7,7 +7,6 @@ BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" > BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > -BR2_LINUX_KERNEL_XZ=y > BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" > From arnout at mind.be Tue Jan 4 17:59:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:59:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/zchunk: needs MMU In-Reply-To: <20220102174226.2823845-1-fontaine.fabrice@gmail.com> References: <20220102174226.2823845-1-fontaine.fabrice@gmail.com> Message-ID: <9d62c676-5055-b373-0ece-7b83d5aa41a6@mind.be> On 02/01/2022 18:42, Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit c618da772df32679fdd338b99f44133655c9113f: > > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: src/zck_gen_zdict.p/zck_gen_zdict.c.o: in function `main': > zck_gen_zdict.c:(.text.startup+0x254): undefined reference to `fork' > > Fixes: > - http://autobuild.buildroot.org/results/582b994372435b8c35a56345c15bd0ffc722af79 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/zchunk/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/zchunk/Config.in b/package/zchunk/Config.in > index 2c8db434ce..2d2a78a210 100644 > --- a/package/zchunk/Config.in > +++ b/package/zchunk/Config.in > @@ -1,5 +1,6 @@ > config BR2_PACKAGE_ZCHUNK > bool "zchunk" > + depends on BR2_USE_MMU # fork() > select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL > select BR2_PACKAGE_LIBCURL > help > From arnout at mind.be Tue Jan 4 17:59:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:59:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiio: set PYTHON_EXECUTABLE In-Reply-To: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> References: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> Message-ID: On 02/01/2022 18:43, Fabrice Fontaine wrote: > Set PYTHON_EXECUTABLE to avoid the following build failure when > BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without > setuptools on host: > > -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter > -- new > -- Python_EXECUTABLE /usr/bin/python3.5 > > [...] > > Traceback (most recent call last): > File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in > from setuptools import setup > ImportError: No module named 'setuptools' > > Fixes: > - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libiio/libiio.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk > index f706298c22..38b2f83e6e 100644 > --- a/package/libiio/libiio.mk > +++ b/package/libiio/libiio.mk > @@ -76,8 +76,10 @@ endif > ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) > ifeq ($(BR2_PACKAGE_PYTHON),y) > LIBIIO_DEPENDENCIES += host-python-setuptools python > +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python > else ifeq ($(BR2_PACKAGE_PYTHON3),y) > LIBIIO_DEPENDENCIES += host-python3-setuptools python3 > +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 > endif > LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON > else > From arnout at mind.be Tue Jan 4 17:59:49 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 18:59:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with gcc 4.8 In-Reply-To: <20220102174556.2824179-1-fontaine.fabrice@gmail.com> References: <20220102174556.2824179-1-fontaine.fabrice@gmail.com> Message-ID: <2214f965-06d7-ddb8-1709-14bc1c7cdb4e@mind.be> On 02/01/2022 18:45, Fabrice Fontaine wrote: > Fix the following build failure with gcc 4.8 raised since bump to > version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: > > option.c: In function 'one_opt': > option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode > for (char *p = arg; *p; p++) { > ^ > option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code > option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode > for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-src-option.c-fix-build-with-gcc-4.8.patch | 52 +++++++++++++++++++ > ...9080ff8743133fbd52427b4b2213171-typo.patch | 36 +++++++++++++ > 2 files changed, 88 insertions(+) > create mode 100644 package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch > create mode 100644 package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch > > diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch > new file mode 100644 > index 0000000000..50ecf2f18a > --- /dev/null > +++ b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch > @@ -0,0 +1,52 @@ > +From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 31 Dec 2021 17:29:44 +0100 > +Subject: [PATCH] src/option.c: fix build with gcc 4.8 > + > +Fix the following build failure with gcc 4.8 raised since version 2.86: > + > +option.c: In function 'one_opt': > +option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode > + for (char *p = arg; *p; p++) { > + ^ > +option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code > +option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode > + for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > + ^ > + > +Fixes: > + - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] > +--- > + src/option.c | 6 ++++-- > + 1 file changed, 4 insertions(+), 2 deletions(-) > + > +diff --git a/src/option.c b/src/option.c > +index ff54def..c57f6d8 100644 > +--- a/src/option.c > ++++ b/src/option.c > +@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma > + arg += 9; > + if (strlen(arg) != 16) > + ret_err(gen_err); > +- for (char *p = arg; *p; p++) { > ++ char *p; > ++ for (*p = arg; *p; p++) { > + if (!isxdigit((int)*p)) > + ret_err(gen_err); > + } > +@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma > + > + u8 *u = daemon->umbrella_device; > + char word[3]; > +- for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > ++ u8 i; > ++ for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > + memcpy(word, &(arg[0]), 2); > + *u++ = strtoul(word, NULL, 16); > + } > +-- > +2.33.0 > + > diff --git a/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch > new file mode 100644 > index 0000000000..8cdf5b3f1b > --- /dev/null > +++ b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch > @@ -0,0 +1,36 @@ > +From 2748fb81e23b71e2c44956e99321816aca91905d Mon Sep 17 00:00:00 2001 > +From: Simon Kelley > +Date: Sat, 1 Jan 2022 23:03:26 +0000 > +Subject: [PATCH] Fix 46312909d9080ff8743133fbd52427b4b2213171 typo. > + > +[Upstream commit 2748fb81e23b71e2c44956e99321816aca91905d] > +Signed-off-by: Fabrice Fontaine > +--- > + src/option.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/src/option.c b/src/option.c > +index c57f6d8..6f56ce8 100644 > +--- a/src/option.c > ++++ b/src/option.c > +@@ -357,7 +357,7 @@ static const struct myoption opts[] = > + { "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID }, > + { "dynamic-host", 1, 0, LOPT_DYNHOST }, > + { "log-debug", 0, 0, LOPT_LOG_DEBUG }, > +- { "umbrella", 2, 0, LOPT_UMBRELLA }, > ++ { "umbrella", 2, 0, LOPT_UMBRELLA }, > + { "quiet-tftp", 0, 0, LOPT_QUIET_TFTP }, > + { NULL, 0, 0, 0 } > + }; > +@@ -2526,7 +2526,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma > + if (strlen(arg) != 16) > + ret_err(gen_err); > + char *p; > +- for (*p = arg; *p; p++) { > ++ for (p = arg; *p; p++) { > + if (!isxdigit((int)*p)) > + ret_err(gen_err); > + } > +-- > +2.33.0 > + > From arnout at mind.be Tue Jan 4 18:00:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:00:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix uclibc-ng build In-Reply-To: <20220102174501.2824124-1-fontaine.fabrice@gmail.com> References: <20220102174501.2824124-1-fontaine.fabrice@gmail.com> Message-ID: <05f28cff-efc0-0ac8-4219-055c39a807f3@mind.be> On 02/01/2022 18:45, Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit 663f39c88c01593855c18355a4decdceeffd884b: > > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': > /home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' > > Fixes: > - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0002-check-for-inb-and-outb.patch | 50 +++++++++++++++++++ > 1 file changed, 50 insertions(+) > create mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch > > diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch > new file mode 100644 > index 0000000000..3bc006acc7 > --- /dev/null > +++ b/package/freeipmi/0002-check-for-inb-and-outb.patch > @@ -0,0 +1,50 @@ > +From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 2 Jan 2022 10:37:00 +0100 > +Subject: [PATCH] check for inb and outb > + > +Check for inb and outb before using them to avoid the following build > +failure on uclibc-ng: > + > +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': > +/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' > + > +Fixes: > + - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] > +--- > + configure.ac | 2 +- > + libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 711b27674..bcc4156ff 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) > + AC_CHECK_FUNCS([getline getprogname]) > + AC_CHECK_FUNCS([strerror strerror_r]) > + AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) > +-AC_CHECK_FUNCS([iopl]) > ++AC_CHECK_FUNCS([inb iopl outb]) > + AC_CHECK_FUNCS([asprintf]) > + AC_CHECK_FUNCS([cbrt]) > + AC_CHECK_FUNCS([getmsg putmsg]) > +diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c > +index c212887c0..a9d4b2e96 100644 > +--- a/libfreeipmi/driver/ipmi-kcs-driver.c > ++++ b/libfreeipmi/driver/ipmi-kcs-driver.c > +@@ -162,7 +162,7 @@ > + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) > + # define _INB(port) inb (port) > + # define _OUTB(data, port) outb (port, data) > +-#elif defined(HAVE_IOPL) > ++#elif defined(HAVE_INB) && defined(HAVE_OUTB) > + # define _INB(port) inb (port) > + # define _OUTB(data, port) outb (data, port) > + #else > +-- > +2.33.0 > + > From arnout at mind.be Tue Jan 4 18:00:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:00:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-utils: bump to version 1.2.6 In-Reply-To: <20220102174659.2824253-1-fontaine.fabrice@gmail.com> References: <20220102174659.2824253-1-fontaine.fabrice@gmail.com> Message-ID: <44a80bd0-9257-9cd5-d192-d6a0985200d6@mind.be> On 02/01/2022 18:46, Fabrice Fontaine wrote: > https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.6 > https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5.1 > https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/alsa-utils/alsa-utils.hash | 2 +- > package/alsa-utils/alsa-utils.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash > index dda009c1af..c2d3ee9bb5 100644 > --- a/package/alsa-utils/alsa-utils.hash > +++ b/package/alsa-utils/alsa-utils.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2 > +sha256 6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d alsa-utils-1.2.6.tar.bz2 > sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING > diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk > index 2603e52f18..c1478bf847 100644 > --- a/package/alsa-utils/alsa-utils.mk > +++ b/package/alsa-utils/alsa-utils.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ALSA_UTILS_VERSION = 1.2.4 > +ALSA_UTILS_VERSION = 1.2.6 > ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 > ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils > ALSA_UTILS_LICENSE = GPL-2.0 > From arnout at mind.be Tue Jan 4 17:49:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:19 +0100 Subject: [Buildroot] [git commit] package/lxc: bump to version 4.0.11 Message-ID: <20220104180257.2D83783249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97a504ed30dbeaca4704cbac8699d98ce7f26102 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The LXC 4.0 branch is supported until June 2025. Only bugfixes and securitiy issues get included into the stable bugfix releases, so it's always safe and recommended to keep up and run the latest bugfix release. https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index efd7a8e42c..2b58df2f1d 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 93f6d2535f..4d63fc14cb 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.10 +LXC_VERSION = 4.0.11 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/usbredir: bump to version 0.12.0 Message-ID: <20220104180256.F2D248324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f6f3b99fbac974e4b8d977810e97500126ef4d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop all patches (already in version) https://gitlab.freedesktop.org/spice/usbredir/-/blob/usbredir-0.12.0/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/usbredir/0001-meson-add-tests-option.patch | 46 ----------------- .../0002-meson-add-stack_protector-option.patch | 60 ---------------------- .../0003-meson.build-make-C-optional.patch | 39 -------------- package/usbredir/usbredir.hash | 4 +- package/usbredir/usbredir.mk | 2 +- 5 files changed, 3 insertions(+), 148 deletions(-) diff --git a/package/usbredir/0001-meson-add-tests-option.patch b/package/usbredir/0001-meson-add-tests-option.patch deleted file mode 100644 index b2df1587b1..0000000000 --- a/package/usbredir/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8490a7ac101d4ee0a78c44b252d3b7a6c2508c74 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 21 Aug 2021 11:55:48 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to disable them - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/spice/usbredir/-/commit/8490a7ac101d4ee0a78c44b252d3b7a6c2508c74] ---- - meson.build | 4 +++- - meson_options.txt | 5 +++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6e773a7..a6d21b8 100644 ---- a/meson.build -+++ b/meson.build -@@ -106,7 +106,9 @@ if host_machine.system() != 'windows' - subdir('fuzzing') - endif - endif --subdir('tests') -+if get_option('tests').enabled() -+ subdir('tests') -+endif - subdir('data') - - summary(summary_info, bool_yn: true) -diff --git a/meson_options.txt b/meson_options.txt -index b35732b..63e8c85 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -21,3 +21,8 @@ option('tools', - type : 'feature', - value : 'enabled', - description : 'Build usbredir\'s tools such as usbredirect') -+ -+option('tests', -+ type : 'feature', -+ value : 'enabled', -+ description : 'Build usbredir\'s tests such as filter') --- -GitLab - diff --git a/package/usbredir/0002-meson-add-stack_protector-option.patch b/package/usbredir/0002-meson-add-stack_protector-option.patch deleted file mode 100644 index 613e2714e3..0000000000 --- a/package/usbredir/0002-meson-add-stack_protector-option.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 54cf1897ef3aa4d0a35b5f4eb1f5c6928b033af5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 24 Sep 2021 17:24:43 +0200 -Subject: [PATCH] meson: add stack_protector option - -Add stack_protector option to allow the user to disable it as some -embedded toolchains don't support it which will result in the following -build failure: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: usbredirparser/libusbredirparser.so.1.1.0.p/usbredirparser.c.o: in function `va_log': -usbredirparser.c:(.text+0x1c4): undefined reference to `__stack_chk_guard' - -Fixes: - - http://autobuild.buildroot.org/results/40de5443e98157ad50c6841ea70a835cd5ad4fe9 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/53] ---- - meson.build | 6 +++++- - meson_options.txt | 5 +++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index a6d21b8..4350f53 100644 ---- a/meson.build -+++ b/meson.build -@@ -17,8 +17,12 @@ cc_flags = [ - if host_machine.system() != 'windows' - cc_flags += [ - '-Wp,-D_FORTIFY_SOURCE=2', -- '-fstack-protector', - ] -+ if get_option('stack_protector').enabled() -+ cc_flags += [ -+ '-fstack-protector', -+ ] -+ endif - endif - - # Check if we are building from .git -diff --git a/meson_options.txt b/meson_options.txt -index 63e8c85..34dd392 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,6 +17,11 @@ option('fuzzing-install-dir', - type : 'string', - description : 'Installation directory for fuzzing binaries') - -+option('stack_protector', -+ type : 'feature', -+ value : 'enabled', -+ description : 'Build usbredir\'s with stack-protector') -+ - option('tools', - type : 'feature', - value : 'enabled', --- -2.33.0 - diff --git a/package/usbredir/0003-meson.build-make-C-optional.patch b/package/usbredir/0003-meson.build-make-C-optional.patch deleted file mode 100644 index fe1ed3f698..0000000000 --- a/package/usbredir/0003-meson.build-make-C-optional.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 55fc307d23d657b52433d1c8508467d0589754d5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 16 Oct 2021 15:45:57 +0200 -Subject: [PATCH] meson.build: make C++ optional - -Remove cpp from meson project statement to make C++ optional and avoid -the following build failure when the toolchain does not provide a C++ -compiler: - -../output-1/build/usbredir-0.11.0/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++']] -The following exception(s) were encountered: -Running "/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++ --version" gave "[Errno 2] No such file or directory: '/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++'" - -Indeed C++ is only required for fuzzing which is already handled by -meson through add_languages('cpp', required: true) - -Fixes: - - http://autobuild.buildroot.org/results/eca1d8a2b73a769354ab1d24c7996be30f152138 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/55] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 49dbce4..ca19f22 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('usbredir', 'c', 'cpp', -+project('usbredir', 'c', - version: '0.11.0', - license: 'LGPLv2.1+', - meson_version : '>= 0.53', --- -2.33.0 - diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash index e11d4aa720..f738c36690 100644 --- a/package/usbredir/usbredir.hash +++ b/package/usbredir/usbredir.hash @@ -1,5 +1,5 @@ -# https://spice-space.org/download/usbredir/usbredir-0.11.0.tar.xz.sha256sum -sha256 72dd5f3aa90dfbc0510b5149bb5b1654c8f21fdc405dfce7b5dc163dcff19cba usbredir-0.11.0.tar.xz +# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum +sha256 fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d usbredir-0.12.0.tar.xz # Hash for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index 0a8dbf012d..6792a3e758 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBREDIR_VERSION = 0.11.0 +USBREDIR_VERSION = 0.12.0 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz USBREDIR_SITE = http://spice-space.org/download/usbredir USBREDIR_LICENSE = LGPL-2.1+ (libraries) From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/perl: bump to version 5.34.0 Message-ID: <20220104180257.3F1E482BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c1ef8129f37200b046750c6405ecd304fd4f1bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/perl/perl.hash | 12 ++++++------ package/perl/perl.mk | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 42b7cc66c7..b0f60ef6f8 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,10 +1,10 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz.{md5,sha1,sha256}.txt -md5 7f104064b906ad8c7329ca5e409a32d7 perl-5.32.1.tar.xz -sha1 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e perl-5.32.1.tar.xz -sha256 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt +md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz +sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz +sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.hash -sha256 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25 perl-cross-1.3.5.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash +sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic diff --git a/package/perl/perl.mk b/package/perl/perl.mk index f661fef013..d7f9c58ddd 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 32 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION_MAJOR = 34 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 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.3.5 +PERL_CROSS_VERSION = 1.3.6 # 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 arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] configs/stm32f469_disco_xip: explicitly set the kernel version Message-ID: <20220104180257.4DE028324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ba47c2d4e8c84b57d52d12b60c9efa983eca98a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The version of the kernel and its headers must be explicitly set because if you keep the default setting, the kernel is continuously updated in buildroot with the risk that its image + dtb grow so much that it again exceeds the 2 MByte of the flash module. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/stm32f469_disco_xip_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 6c4f227f58..d95b7759f3 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -1,9 +1,12 @@ BR2_arm=y BR2_cortex_m4=y +BR2_KERNEL_HEADERS_5_15=y # BR2_UCLIBC_INSTALL_UTILS is not set BR2_GCC_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] configs/cubieboard2: bump U-Boot and kernel Message-ID: <20220104180257.36E7882BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06f10a88f30b73aaea5c0e0888d7ba9d9a6420f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump U-Boot to version 2021.10 and kernel to 5.15.11 Among other things fixes U-Boot build failure, see https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006081: ---------------------->8------------------- HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ---------------------->8------------------- Signed-off-by: Alexey Brodkin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/cubieboard2_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 8924c88c54..a9356295c1 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" BR2_TARGET_ROOTFS_EXT2=y @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/xxhash: bump to version 0.8.1 Message-ID: <20220104180257.0897E82BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dbdb2535c649ee617595b8c4ae3cbba0ee37b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop first patch (already in version) - Refresh upstream status of latest patch - Update hash of LICENSE and add cli/COPYING: https://github.com/Cyan4973/xxHash/commit/85e1ea2ab0d90463b804f4a65b0f67d99718c6f8 https://github.com/Cyan4973/xxHash/releases/tag/v0.8.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ....patch => 0001-fix-man-page-installation.patch} | 0 .../xxhash/0001-fixed-man-page-installation.patch | 31 ---------------------- ...2-Makefile-add-dedicated-install-targets.patch} | 8 +++--- package/xxhash/xxhash.hash | 5 ++-- package/xxhash/xxhash.mk | 4 +-- 5 files changed, 8 insertions(+), 40 deletions(-) diff --git a/package/xxhash/0002-fix-man-page-installation.patch b/package/xxhash/0001-fix-man-page-installation.patch similarity index 100% rename from package/xxhash/0002-fix-man-page-installation.patch rename to package/xxhash/0001-fix-man-page-installation.patch diff --git a/package/xxhash/0001-fixed-man-page-installation.patch b/package/xxhash/0001-fixed-man-page-installation.patch deleted file mode 100644 index a9f68db4b4..0000000000 --- a/package/xxhash/0001-fixed-man-page-installation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Fri, 6 Aug 2021 15:29:32 -0700 -Subject: [PATCH] fixed man page installation - -[Retrieved from: -https://github.com/Cyan4973/xxHash/commit/e345ccaf4daa8c35698ab02c0de346fcc0ca9ef6] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index b8552a9f..556a32a0 100644 ---- a/Makefile -+++ b/Makefile -@@ -498,10 +498,10 @@ endif - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum - @echo Installing man pages -- $(Q)$(INSTALL_DATA) xxhsum.1 $(DESTDIR)$(MANDIR)/xxhsum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 -- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 -+ $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 -+ $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 - @echo xxhash installation completed - - .PHONY: uninstall diff --git a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch similarity index 94% rename from package/xxhash/0003-Makefile-add-dedicated-install-targets.patch rename to package/xxhash/0002-Makefile-add-dedicated-install-targets.patch index 0607c8ee82..17d34a0823 100644 --- a/package/xxhash/0003-Makefile-add-dedicated-install-targets.patch +++ b/package/xxhash/0002-Makefile-add-dedicated-install-targets.patch @@ -10,13 +10,14 @@ This is especially useful on embedded systems where dynamic library is not always supported by toolchains Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/Cyan4973/xxHash/pull/665] +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/db9c199e99f7b4d419647b1ef49c547fc2547516] --- Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index 8d4fcd2..5fe7297 100644 +index 8d4fcd21..5fe72972 100644 --- a/Makefile +++ b/Makefile @@ -505,11 +505,14 @@ libxxhash.pc: libxxhash.pc.in @@ -68,6 +69,3 @@ index 8d4fcd2..5fe7297 100644 @echo xxhash installation completed .PHONY: uninstall --- -2.33.0 - diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash index feb5000808..2c99236a45 100644 --- a/package/xxhash/xxhash.hash +++ b/package/xxhash/xxhash.hash @@ -1,3 +1,4 @@ # locally computed -sha256 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f xxhash-0.8.0.tar.gz -sha256 9da63520e9293d82c4b1613be5c84058cadb82b02f5972179bad13731d589910 LICENSE +sha256 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c xxhash-0.8.1.tar.gz +sha256 553d0035773ddd1590045f8fdc3a4c6ead31e36336721aeca8421e88ed1c9f80 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 3e7f3244b3..a8f8d1d179 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -4,10 +4,10 @@ # ################################################################################ -XXHASH_VERSION = 0.8.0 +XXHASH_VERSION = 0.8.1 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) -XXHASH_LICENSE_FILES = LICENSE +XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES XXHASH_TARGETS = xxhsum From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/tpm2-tss: remove unused dependency Message-ID: <20220104180257.1C2CE8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=593683b45f72169dd94ec14fa18720b3cec9dda4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The last reference of uriparser was removed in: https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e Signed-off-by: Erik Larsson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/tpm2-tss/tpm2-tss.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 71aa3feb96..060883c377 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/alsa-utils: bump to version 1.2.6 Message-ID: <20220104180257.78A3C8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c1f6a6a7ba24e883fe089cd09cbc61a88f8508d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.6 https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5.1 https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index dda009c1af..c2d3ee9bb5 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2 +sha256 6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d alsa-utils-1.2.6.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 2603e52f18..c1478bf847 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.4 +ALSA_UTILS_VERSION = 1.2.6 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/zchunk: needs MMU Message-ID: <20220104180257.5622482BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48f790099399e3f74e4487148de437881fee990c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit c618da772df32679fdd338b99f44133655c9113f: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: src/zck_gen_zdict.p/zck_gen_zdict.c.o: in function `main': zck_gen_zdict.c:(.text.startup+0x254): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/582b994372435b8c35a56345c15bd0ffc722af79 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zchunk/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zchunk/Config.in b/package/zchunk/Config.in index 2c8db434ce..2d2a78a210 100644 --- a/package/zchunk/Config.in +++ b/package/zchunk/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ZCHUNK bool "zchunk" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_LIBCURL help From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/mraa: bump to version 2.2.0 Message-ID: <20220104180256.E939583249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a30732769c0ca54c2a7e0eeca64f42d8479e7f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Refresh upstream status of first patch - Drop second patch (already in version) https://github.com/eclipse/mraa/blob/v2.2.0/docs/changelog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...include-Declare-gVERSION-global-as-extern.patch | 7 +- .../0002-CMakeLists.txt-add-BUILDCPP-option.patch | 193 --------------------- package/mraa/mraa.hash | 2 +- package/mraa/mraa.mk | 2 +- 4 files changed, 6 insertions(+), 198 deletions(-) diff --git a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch index b3a1f5a03a..110c020a62 100644 --- a/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch +++ b/package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch @@ -1,13 +1,14 @@ -From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 +From aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 13 Apr 2020 20:12:11 +0200 Subject: [PATCH] include: Declare gVERSION global as 'extern'. Fixes build with '-fno-common'. +Signed-off-by: Thomas Ingleby [Retrieved from: -https://github.com/eclipse/mraa/pull/1012/commits/dbb5961f106ec42cd70689d933674c9c37aedfe1] -Signed-off-by: Fabrice Fontaine +https://github.com/eclipse/mraa/commit/aaa0a5cd4e401bde4fb3691dd4e6c70a5c61e031] +Signed-off-by: Fabrice Fontaine --- include/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch b/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch deleted file mode 100644 index fbadfe79ef..0000000000 --- a/package/mraa/0002-CMakeLists.txt-add-BUILDCPP-option.patch +++ /dev/null @@ -1,193 +0,0 @@ -From cb88e4dd1fbbb9d24e625dba2768b88ed99da309 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Jun 2020 22:51:37 +0200 -Subject: [PATCH] CMakeLists.txt: add BUILDCPP option - -C++ is a mandatory dependency since version 1.4.0 and -https://github.com/eclipse/mraa/commit/122cab1f1e53b7c9c7cd82905b962071f9bad9dc - -As a result, build on embedded toolchains that do not support C++ fails -on: - -CMake Error at CMakeLists.txt:2 (project): - The CMAKE_CXX_COMPILER: - - /home/naourr/work/instance-1/output-1/per-package/mraa/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - -Fixes: - - http://autobuild.buildroot.org/results/31086422e03611c16ab59c4418e3669b580bc0c0 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/eclipse/mraa/commit/cb88e4dd1fbbb9d24e625dba2768b88ed99da309] ---- - CMakeLists.txt | 69 +++++++++++++++++++---------------- - src/java/CMakeLists.txt | 4 +- - src/javascript/CMakeLists.txt | 34 +++++++++-------- - 3 files changed, 59 insertions(+), 48 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 250d9106e..90c0dc920 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required (VERSION 2.8.11) --project (mraa C CXX) -+project (mraa C) - - FIND_PACKAGE (Threads REQUIRED) - -@@ -11,6 +11,8 @@ else () - set (CMAKE_C_STANDARD 99) - endif () - -+option (BUILDCPP "Enable C++ (needed by FTDI4222 and tests)" ON) -+ - ############################################################################### - # Detect supported warning flags - # Modified from work By Dan Liew (fpbench - MIT) -@@ -33,15 +35,18 @@ set (MRAA_C_WARNING_FLAGS - -Werror=missing-parameter-type - ) - --# Warning flags for the C++ compiler only --set (MRAA_CXX_WARNING_FLAGS -- -Wnon-virtual-dtor -- -Woverloaded-virtual -- -Wreorder --) -- - include (CheckCCompilerFlag) --include (CheckCXXCompilerFlag) -+if (BUILDCPP) -+ # Warning flags for the C++ compiler only -+ set (MRAA_CXX_WARNING_FLAGS -+ -Wnon-virtual-dtor -+ -Woverloaded-virtual -+ -Wreorder -+ ) -+ -+ enable_language (CXX) -+ include (CheckCXXCompilerFlag) -+endif () - function (MRAA_SANITIZE_FLAG_NAME OUTPUT_VAR FLAG) - string (REPLACE "-" "_" SANITIZED_FLAG_NAME "${FLAG}") - string (REPLACE "/" "_" SANITIZED_FLAG_NAME "${SANITIZED_FLAG_NAME}") -@@ -62,28 +67,30 @@ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_C_WARNING_FLAGS}) - endif () - endforeach () - --# Globally set C++ compiler warning flags that are supported and emit --# a warning about unsupported flags --foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) -- MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") -- CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) -- if (HAS_CXX_${SANITIZED_FLAG_NAME}) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") -- else () -- message (WARNING "C++ compiler does not support flag \"${flag}\"") -- endif () --endforeach () -- --# This function adds the c++11 flag to a c++ target (if supported) --function(use_cxx_11 targetname) -- include(CheckCXXCompilerFlag) -- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -- if (COMPILER_SUPPORTS_CXX11) -- set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") -- else() -- message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") -- endif() --endfunction() -+if (BUILDCPP) -+ # Globally set C++ compiler warning flags that are supported and emit -+ # a warning about unsupported flags -+ foreach (flag ${MRAA_BOTH_WARNING_FLAGS} ${MRAA_CXX_WARNING_FLAGS}) -+ MRAA_SANITIZE_FLAG_NAME (SANITIZED_FLAG_NAME "${flag}") -+ CHECK_CXX_COMPILER_FLAG ("${flag}" HAS_CXX_${SANITIZED_FLAG_NAME}) -+ if (HAS_CXX_${SANITIZED_FLAG_NAME}) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") -+ else () -+ message (WARNING "C++ compiler does not support flag \"${flag}\"") -+ endif () -+ endforeach () -+ -+ # This function adds the c++11 flag to a c++ target (if supported) -+ function(use_cxx_11 targetname) -+ include(CheckCXXCompilerFlag) -+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -+ if (COMPILER_SUPPORTS_CXX11) -+ set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-std=c++11") -+ else() -+ message(FATAL_ERROR "Target '${targetname}' requires c++11 which is not supported by this compiler") -+ endif() -+ endfunction() -+endif() - - # Set CMAKE_INSTALL_LIBDIR if not defined - include(GNUInstallDirs) -diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt -index 231c755fa..cfa72a0df 100644 ---- a/src/java/CMakeLists.txt -+++ b/src/java/CMakeLists.txt -@@ -16,7 +16,9 @@ include_directories ( - set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src") - set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") -+if (BUILDCPP) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") -+endif() - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") - - if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) -diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt -index 25fd36275..99a96b49d 100644 ---- a/src/javascript/CMakeLists.txt -+++ b/src/javascript/CMakeLists.txt -@@ -36,25 +36,27 @@ set_target_properties (mraajs PROPERTIES - ) - - message (STATUS "INFO - swig Version ${SWIG_VERSION}") --message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") -+if (BUILDCPP) -+ message (STATUS "INFO - CXX compiler Version ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") - --if (${V8_VERSION_MAJOR} GREATER 3) -- message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") -- # Node 0.12.x V8 engine major version is '3'. -- # Node 2.1.0 V8 engine major version is '4'. -- set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) -- set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) -- if (CMAKE_VERSION VERSION_LESS "3.1") -- message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") -- if (CMAKE_COMPILER_IS_GNUCXX) -- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -- message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") -+ if (${V8_VERSION_MAJOR} GREATER 3) -+ message (STATUS "INFO - Using V8 version > 3 so requiring C++11 compiler") -+ # Node 0.12.x V8 engine major version is '3'. -+ # Node 2.1.0 V8 engine major version is '4'. -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD 11) -+ set_property (TARGET mraajs PROPERTY CXX_STANDARD_REQUIRED ON) -+ if (CMAKE_VERSION VERSION_LESS "3.1") -+ message (WARNING "Need to use CMAKE version 3.1+, but it is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}, using a workaround.") -+ if (CMAKE_COMPILER_IS_GNUCXX) -+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -+ message (FATAL_ERROR "GNU gcc compiler is also too old (need 4.7+, but ${CMAKE_CXX_COMPILER_VERSION}) and does not support C++11 standard.") -+ endif () -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") -+ else () -+ set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") - endif () -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=gnu++11") -- else () -- set (MRAA_CXX11_WORKAROUND_OPTION "-std=c++11") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") - endif () -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MRAA_CXX11_WORKAROUND_OPTION} ") - endif () - endif () - diff --git a/package/mraa/mraa.hash b/package/mraa/mraa.hash index f29a5ce838..321b6409ed 100644 --- a/package/mraa/mraa.hash +++ b/package/mraa/mraa.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345 mraa-2.1.0.tar.gz +sha256 076669bee8423ffef3065735b293a329020be86630fea457174dbfcc67a0554a mraa-2.2.0.tar.gz sha256 fac52622ed3badd86b34857b21777ab90296d6ccbc2ac0fd457c09fdeefa9ef1 COPYING diff --git a/package/mraa/mraa.mk b/package/mraa/mraa.mk index 910339b386..47178a423b 100644 --- a/package/mraa/mraa.mk +++ b/package/mraa/mraa.mk @@ -4,7 +4,7 @@ # ################################################################################ -MRAA_VERSION = 2.1.0 +MRAA_VERSION = 2.2.0 MRAA_SITE = $(call github,eclipse,mraa,v$(MRAA_VERSION)) MRAA_LICENSE = MIT MRAA_LICENSE_FILES = COPYING From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/jose: bump to version 11 Message-ID: <20220104180256.DFA4F82BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b72b849ad597810823ecf9efe471a40e2427c8e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to meson-package (and so drop second patch) - Update indentation in hash file (two spaces) https://github.com/latchset/jose/releases/tag/v11 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...02-configure-fix-build-with-old-compilers.patch | 165 --------------------- package/jose/jose.hash | 4 +- package/jose/jose.mk | 8 +- 3 files changed, 5 insertions(+), 172 deletions(-) diff --git a/package/jose/0002-configure-fix-build-with-old-compilers.patch b/package/jose/0002-configure-fix-build-with-old-compilers.patch deleted file mode 100644 index 0484f38f0d..0000000000 --- a/package/jose/0002-configure-fix-build-with-old-compilers.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 98e9faa4d39cd5b6aaab882877e19ae394ba3810 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Nov 2017 23:10:38 +0100 -Subject: [PATCH] configure: fix build with old compilers - -Old gcc versions (gcc 4.7) do not support all warnings flags currently -hard-coded by configure.ac. In order to fix this, we import the -AX_CHECK_COMPILE_FLAG() macro from the autoconf-archive, and use it in -the configure.ac to only use warning flags when the compiler supports -them. - -Submitted-upstream: https://github.com/latchset/jose/pull/51 -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 46 +++++++++++++++------------- - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 105 insertions(+), 22 deletions(-) - create mode 100644 m4/ax_check_compile_flag.m4 - -diff --git a/configure.ac b/configure.ac -index cf8c9a6..6fe4ded 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,6 @@ - AC_PREREQ(2.62) - AC_INIT(jose, 10) -+AC_CONFIG_MACRO_DIRS([m4]) - AC_CANONICAL_SYSTEM - AC_PROG_CC_C99 - -@@ -18,27 +19,30 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.0.2]) - AC_OPENMP - AC_SUBST([OPENMP_CFLAGS]) - --JOSE_CFLAGS="\ ---Wall \ ---Wextra \ ---Werror \ ---Wstrict-aliasing \ ---Wchar-subscripts \ ---Wformat-security \ ---Wmissing-declarations \ ---Wmissing-prototypes \ ---Wnested-externs \ ---Wpointer-arith \ ---Wshadow \ ---Wsign-compare \ ---Wstrict-prototypes \ ---Wtype-limits \ ---Wunused-function \ ---Wno-missing-field-initializers \ ---Wno-unused-command-line-argument \ ---Wno-unused-parameter \ ---Wno-unknown-pragmas \ --" -+for flag in \ -+ -Wall \ -+ -Wextra \ -+ -Werror \ -+ -Wstrict-aliasing \ -+ -Wchar-subscripts \ -+ -Wformat-security \ -+ -Wmissing-declarations \ -+ -Wmissing-prototypes \ -+ -Wnested-externs \ -+ -Wpointer-arith \ -+ -Wshadow \ -+ -Wsign-compare \ -+ -Wstrict-prototypes \ -+ -Wtype-limits \ -+ -Wunused-function \ -+ -Wno-missing-field-initializers \ -+ -Wno-unused-command-line-argument \ -+ -Wno-unused-parameter \ -+ -Wno-unknown-pragmas ; do -+ AX_CHECK_COMPILE_FLAG([${flag}], -+ [JOSE_CFLAGS="${JOSE_CFLAGS} ${flag}"]) -+done -+ - AC_SUBST([JOSE_CFLAGS]) - - AC_MSG_CHECKING([for linker script support]) -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..dcabb92 ---- /dev/null -+++ b/m4/ax_check_compile_flag.m4 -@@ -0,0 +1,74 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the current language's compiler -+# or gives an error. (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the current language's default -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -+# force the compiler to issue an error when a bad flag is given. -+# -+# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim -+# Copyright (c) 2011 Maarten Bosmans -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 5 -+ -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], -+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" -+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -+AS_VAR_IF(CACHEVAR,yes, -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_COMPILE_FLAGS --- -2.13.6 - diff --git a/package/jose/jose.hash b/package/jose/jose.hash index 376bc0b585..128d26d163 100644 --- a/package/jose/jose.hash +++ b/package/jose/jose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72 jose-10.tar.bz2 -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING +sha256 e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 jose-11.tar.xz +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING diff --git a/package/jose/jose.mk b/package/jose/jose.mk index 2758d408da..8a60e20cc6 100644 --- a/package/jose/jose.mk +++ b/package/jose/jose.mk @@ -4,14 +4,12 @@ # ################################################################################ -JOSE_VERSION = 10 -JOSE_SOURCE = jose-$(JOSE_VERSION).tar.bz2 +JOSE_VERSION = 11 +JOSE_SOURCE = jose-$(JOSE_VERSION).tar.xz JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) JOSE_LICENSE = Apache-2.0 JOSE_LICENSE_FILES = COPYING -# 0002-configure-fix-build-with-old-compilers.patch -JOSE_AUTORECONF = YES JOSE_INSTALL_STAGING = YES JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/freeipmi: fix uclibc-ng build Message-ID: <20220104180257.6F87983249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f1acbea1dc7ad7c6cbb4dfc2aafd4bd428b416e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit 663f39c88c01593855c18355a4decdceeffd884b: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': /home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' Fixes: - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/freeipmi/0002-check-for-inb-and-outb.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch new file mode 100644 index 0000000000..3bc006acc7 --- /dev/null +++ b/package/freeipmi/0002-check-for-inb-and-outb.patch @@ -0,0 +1,50 @@ +From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 10:37:00 +0100 +Subject: [PATCH] check for inb and outb + +Check for inb and outb before using them to avoid the following build +failure on uclibc-ng: + +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': +/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' + +Fixes: + - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] +--- + configure.ac | 2 +- + libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 711b27674..bcc4156ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) + AC_CHECK_FUNCS([getline getprogname]) + AC_CHECK_FUNCS([strerror strerror_r]) + AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) +-AC_CHECK_FUNCS([iopl]) ++AC_CHECK_FUNCS([inb iopl outb]) + AC_CHECK_FUNCS([asprintf]) + AC_CHECK_FUNCS([cbrt]) + AC_CHECK_FUNCS([getmsg putmsg]) +diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c +index c212887c0..a9d4b2e96 100644 +--- a/libfreeipmi/driver/ipmi-kcs-driver.c ++++ b/libfreeipmi/driver/ipmi-kcs-driver.c +@@ -162,7 +162,7 @@ + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + # define _INB(port) inb (port) + # define _OUTB(data, port) outb (port, data) +-#elif defined(HAVE_IOPL) ++#elif defined(HAVE_INB) && defined(HAVE_OUTB) + # define _INB(port) inb (port) + # define _OUTB(data, port) outb (data, port) + #else +-- +2.33.0 + From arnout at mind.be Tue Jan 4 18:00:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:00:33 +0100 Subject: [Buildroot] [git commit] package/python-pyqt5: Fix per-package build Message-ID: <20220104180257.81B8183249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51c22b4ba905f8e0a0f75189715eab628cefab6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pyqt5 uses qmake internally, but is python package rather than a qmake package. Therefore, we need to manually apply the same fixup as for qmake packages. Without this, top-level parallel build may fail because dependencies are looked for in the qt5 per-package staging directory instead of the python-pyqt5 one. Signed-off-by: Florent AUMAITRE Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pyqt5/python-pyqt5.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 8f28c90d15..b05043563e 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL ) endef +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP + PYTHON_PYQT5_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: fix build with gcc 4.8 Message-ID: <20220104180257.67D5282BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17aa836bd7a2c90da053398ce024b4113cf8b53c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: option.c: In function 'one_opt': option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode for (char *p = arg; *p; p++) { ^ option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { ^ Fixes: - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-src-option.c-fix-build-with-gcc-4.8.patch | 52 ++++++++++++++++++++++ ...2909d9080ff8743133fbd52427b4b2213171-typo.patch | 36 +++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..50ecf2f18a --- /dev/null +++ b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,52 @@ +From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 31 Dec 2021 17:29:44 +0100 +Subject: [PATCH] src/option.c: fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8 raised since version 2.86: + +option.c: In function 'one_opt': +option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode + for (char *p = arg; *p; p++) { + ^ +option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code +option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode + for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 + +Signed-off-by: Fabrice Fontaine +[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] +--- + src/option.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index ff54def..c57f6d8 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + arg += 9; + if (strlen(arg) != 16) + ret_err(gen_err); +- for (char *p = arg; *p; p++) { ++ char *p; ++ for (*p = arg; *p; p++) { + if (!isxdigit((int)*p)) + ret_err(gen_err); + } +@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + + u8 *u = daemon->umbrella_device; + char word[3]; +- for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { ++ u8 i; ++ for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { + memcpy(word, &(arg[0]), 2); + *u++ = strtoul(word, NULL, 16); + } +-- +2.33.0 + diff --git a/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch new file mode 100644 index 0000000000..8cdf5b3f1b --- /dev/null +++ b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch @@ -0,0 +1,36 @@ +From 2748fb81e23b71e2c44956e99321816aca91905d Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Sat, 1 Jan 2022 23:03:26 +0000 +Subject: [PATCH] Fix 46312909d9080ff8743133fbd52427b4b2213171 typo. + +[Upstream commit 2748fb81e23b71e2c44956e99321816aca91905d] +Signed-off-by: Fabrice Fontaine +--- + src/option.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/option.c b/src/option.c +index c57f6d8..6f56ce8 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -357,7 +357,7 @@ static const struct myoption opts[] = + { "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID }, + { "dynamic-host", 1, 0, LOPT_DYNHOST }, + { "log-debug", 0, 0, LOPT_LOG_DEBUG }, +- { "umbrella", 2, 0, LOPT_UMBRELLA }, ++ { "umbrella", 2, 0, LOPT_UMBRELLA }, + { "quiet-tftp", 0, 0, LOPT_QUIET_TFTP }, + { NULL, 0, 0, 0 } + }; +@@ -2526,7 +2526,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + if (strlen(arg) != 16) + ret_err(gen_err); + char *p; +- for (*p = arg; *p; p++) { ++ for (p = arg; *p; p++) { + if (!isxdigit((int)*p)) + ret_err(gen_err); + } +-- +2.33.0 + From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/tinyalsa: bump to version 2.0.0 Message-ID: <20220104180257.11C7483249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b9c8f8cb53e449e39899a40712703c272c5eeff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to meson-package to drop first patch and disable examples and utils - Drop second patch (already in version) - Update hash of NOTICE (empty new lines added with https://github.com/tinyalsa/tinyalsa/commit/902b8c8f9fa5a2e1937007d7d5ee90f01790808b) https://github.com/tinyalsa/tinyalsa/releases/tag/v2.0.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/tinyalsa/0001-disable-doxygen-usage.patch | 35 --------------------- .../0002-interval.h-add-missing-header.patch | 36 ---------------------- package/tinyalsa/tinyalsa.hash | 4 +-- package/tinyalsa/tinyalsa.mk | 27 +++------------- 4 files changed, 6 insertions(+), 96 deletions(-) diff --git a/package/tinyalsa/0001-disable-doxygen-usage.patch b/package/tinyalsa/0001-disable-doxygen-usage.patch deleted file mode 100644 index ed939fb9bf..0000000000 --- a/package/tinyalsa/0001-disable-doxygen-usage.patch +++ /dev/null @@ -1,35 +0,0 @@ -Disable doxygen usage - -In order to avoid a dependency on doxygen on the build machine, this -patch adjusts the main Makefile to not build and install the -documentation. - -[Vincent: tweak patch for 1.1.1 version] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Makefile b/Makefile ---- a/Makefile 2017-05-24 05:23:57.000000000 +0100 -+++ b/Makefile 2017-05-25 10:35:20.781747053 +0100 -@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man - all: - $(MAKE) -C src - $(MAKE) -C utils -- $(MAKE) -C doxygen - $(MAKE) -C examples - - .PHONY: clean - clean: - $(MAKE) -C src clean - $(MAKE) -C utils clean -- $(MAKE) -C doxygen clean - $(MAKE) -C examples clean - - .PHONY: install -@@ -30,5 +28,4 @@ install: - install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/ - $(MAKE) -C src install - $(MAKE) -C utils install -- $(MAKE) -C doxygen install - diff --git a/package/tinyalsa/0002-interval.h-add-missing-header.patch b/package/tinyalsa/0002-interval.h-add-missing-header.patch deleted file mode 100644 index c043145b55..0000000000 --- a/package/tinyalsa/0002-interval.h-add-missing-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 2 Jun 2017 12:19:03 +0300 -Subject: [PATCH] interval.h: add missing header - -The ssize_t type requires the unistd.h header. This fixes build with musl -libc: - -In file included from ../include/tinyalsa/limits.h:32:0, - from limits.c:1: -../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t' - ssize_t max; - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98 - - include/tinyalsa/interval.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h -index 3f6f3dce5d90..068571df5a63 100644 ---- a/include/tinyalsa/interval.h -+++ b/include/tinyalsa/interval.h -@@ -30,6 +30,7 @@ - #define TINYALSA_INTERVAL_H - - #include -+#include - - /** A closed range signed interval. */ - --- -2.11.0 - diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash index d078bab597..f7673b1769 100644 --- a/package/tinyalsa/tinyalsa.hash +++ b/package/tinyalsa/tinyalsa.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz -sha256 ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d NOTICE +sha256 573ae0b2d3480851c1d2a12503ead2beea27f92d44ed47b74b553ba947994ef1 tinyalsa-2.0.0.tar.gz +sha256 ea22a4711f5250f88a4d7011fbc65367d1b02ac954dcc49f5b6d7c135e6537c4 NOTICE diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index bd9d9a00d0..b5c39e35d6 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -4,30 +4,11 @@ # ################################################################################ -TINYALSA_VERSION = 1.1.1 -TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) +TINYALSA_VERSION = 2.0.0 +TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled -define TINYALSA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) -endef - -define TINYALSA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(STAGING_DIR)" install -endef - -define TINYALSA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) From arnout at mind.be Tue Jan 4 17:32:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:32:58 +0100 Subject: [Buildroot] [git commit] package/tpm2-tools: bump version to 5.2 Message-ID: <20220104180257.24DBE82BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e39bd0439be9f65a7b03f4bcd86bf2fbb16b212 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Depedency on libuuid was removed in: https://github.com/tpm2-software/tpm2-tools/commit/210b2d639c216df7fa68e38427b13b96edbf78fd Drop 0001-configure-make-build-gnu99.patch as it is in 5.2 Signed-off-by: Erik Larsson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-configure-make-build-gnu99.patch | 30 ---------------------- package/tpm2-tools/Config.in | 2 -- package/tpm2-tools/tpm2-tools.hash | 2 +- package/tpm2-tools/tpm2-tools.mk | 6 ++--- 4 files changed, 3 insertions(+), 37 deletions(-) diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch deleted file mode 100644 index 37ca6c5873..0000000000 --- a/package/tpm2-tools/0001-configure-make-build-gnu99.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 -From: William Roberts -Date: Mon, 8 Feb 2021 11:57:28 -0600 -Subject: [PATCH] configure: make build gnu99 - -Signed-off-by: William Roberts - -[Retrieved from: -https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c -and updated to set gnu99 instead of c99 as done by -https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dc15b5595..25039a0d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ - # -D_GNU_SOURCE is required for execvpe() in options.c - add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) - -+# Enable gnu99 mode, since we use some of these features. -+add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) -+ - # Best attempt compiler options that are on newer versions of GCC that - # we can't widely enforce without killing other peoples builds. - # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 3be947648f..1a6698570a 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_TPM2_TOOLS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_TPM2_TSS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help TPM (Trusted Platform Module) 2.0 CLI tools based on system API of TPM2-TSS. These tools can be used to manage keys, diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index bfb7e9b220..f50a896363 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350 tpm2-tools-4.3.2.tar.gz +sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 41f5bcf201..8675344805 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,15 +4,13 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 4.3.2 +TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 -TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux -# We're patching configure.ac -TPM2_TOOLS_AUTORECONF = YES +TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] configs/stm32f469_disco_xip: remove BR2_LINUX_KERNEL_XZ Message-ID: <20220104180257.4681183249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01a4446d1cff0ff67a4fdc7778a259105634643c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a XIP kernel, so it shouldn't be compressed. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/stm32f469_disco_xip_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index f3d333278a..6c4f227f58 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -7,7 +7,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_XZ=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" From arnout at mind.be Tue Jan 4 17:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 18:49:20 +0100 Subject: [Buildroot] [git commit] package/libiio: set PYTHON_EXECUTABLE Message-ID: <20220104180257.5E7EF82BA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f384de4f4ec646c28dab6c442dd6bb2f06628725 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set PYTHON_EXECUTABLE to avoid the following build failure when BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without setuptools on host: -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter -- new -- Python_EXECUTABLE /usr/bin/python3.5 [...] Traceback (most recent call last): File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in from setuptools import setup ImportError: No module named 'setuptools' Fixes: - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 Signed-off-by: Fabrice Fontaine Acked-by: Paul Cercueil Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libiio/libiio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index f706298c22..38b2f83e6e 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -76,8 +76,10 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) ifeq ($(BR2_PACKAGE_PYTHON),y) LIBIIO_DEPENDENCIES += host-python-setuptools python +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python else ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 endif LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON else From fontaine.fabrice at gmail.com Tue Jan 4 18:08:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:08:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcm-tools: fix static build Message-ID: <20220104180826.3171770-1-fontaine.fabrice@gmail.com> Don't build c_example which needs a dynamic library and so will raise the following static build failure since bump to version 2021.10 in commit d1d93d488c76d4bc2551270007096693d8194435 and https://github.com/opcm/pcm/commit/12647a6ee579c29bd306fd034470eb62dcb3156e: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: cannot find -lpcm Fixes: - http://autobuild.buildroot.org/results/1276a3d49c8848039f034e7f03632df365097e94 Signed-off-by: Fabrice Fontaine --- package/pcm-tools/pcm-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index 8a58034232..d676df57f9 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -17,7 +17,8 @@ define PCM_TOOLS_BUILD_CMDS touch $(@D)/daemon-binaries $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" \ - UNAME=Linux HOST=_LINUX + UNAME=Linux HOST=_LINUX \ + $(foreach f,$(PCM_TOOLS_EXE_FILES),$(f).x) endef ifeq ($(BR2_PACKAGE_PCM_TOOLS_PMU_QUERY),y) -- 2.34.1 From arnout at mind.be Tue Jan 4 18:09:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:09:31 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-pyqt5: Fix parallel build In-Reply-To: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> References: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> Message-ID: <8481639d-e8cd-89d2-dbf6-8d2ae54cabef@mind.be> On 03/01/2022 17:54, Florent AUMAITRE wrote: > This patch fix build of python-pyqt5 package when parallel build is used This explanation was a bit too terse. I tried to invent something that is more complete: pyqt5 uses qmake internally, but is python package rather than a qmake package. Therefore, we need to manually apply the same fixup as for qmake packages. Without this, top-level parallel build may fail because dependencies are looked for in the qt5 per-package staging directory instead of the python-pyqt5 one. Hopefully that's more or less correct :-) > > Signed-off-by: Florent AUMAITRE > > Changes v1 -> v2: > - Re-use the existing QT5_INSTALL_QT_CONF macro from package/qt5/qt5.mk (suggested by Thomas Petazzoni) This should go below a --- line, i.e.: --- Changes v1 -> v2: That way, it is not part of the git history. Applied to master with those things changed, thanks. Regards, Arnout > > Signed-off-by: Florent AUMAITRE > --- > package/python-pyqt5/python-pyqt5.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk > index 8f28c90d15..b05043563e 100644 > --- a/package/python-pyqt5/python-pyqt5.mk > +++ b/package/python-pyqt5/python-pyqt5.mk > @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL > ) > endef > > +# The file "qt.conf" can be used to override the hard-coded paths that are > +# compiled into the Qt library. We need it to make "qmake" relocatable and > +# tweak the per-package install pathes > +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP > + > PYTHON_PYQT5_CONF_OPTS = \ > --bindir $(TARGET_DIR)/usr/bin \ > --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ > From fontaine.fabrice at gmail.com Tue Jan 4 18:11:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:11:06 +0100 Subject: [Buildroot] [PATCH 1/2] package/liburing: new package Message-ID: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> This is the io_uring library, liburing. liburing provides helpers to setup and teardown io_uring instances, and also a simplified interface for applications that don't need (or want) to deal with the full kernel side implementation. https://git.kernel.dk/cgit/liburing Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/liburing/Config.in | 13 ++++++++++++ package/liburing/liburing.hash | 8 ++++++++ package/liburing/liburing.mk | 36 ++++++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 package/liburing/Config.in create mode 100644 package/liburing/liburing.hash create mode 100644 package/liburing/liburing.mk diff --git a/DEVELOPERS b/DEVELOPERS index 444e58714c..5017dde56e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -904,6 +904,7 @@ F: package/librsync/ F: package/libsoup/ F: package/libsoxr/ F: package/libupnp/ +F: package/liburing/ F: package/libv4l/ F: package/libxslt/ F: package/mbedtls/ diff --git a/package/Config.in b/package/Config.in index e09e4aad3f..1f3ec9a334 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2001,6 +2001,7 @@ menu "Other" source "package/libuci/Config.in" source "package/libunwind/Config.in" source "package/liburcu/Config.in" + source "package/liburing/Config.in" source "package/libuv/Config.in" source "package/lightning/Config.in" source "package/linux-pam/Config.in" diff --git a/package/liburing/Config.in b/package/liburing/Config.in new file mode 100644 index 0000000000..898d95cfa6 --- /dev/null +++ b/package/liburing/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBURING + bool "liburing" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + help + This is the io_uring library, liburing. liburing provides + helpers to setup and teardown io_uring instances, and also a + simplified interface for applications that don't need (or + want) to deal with the full kernel side implementation. + + https://git.kernel.dk/cgit/liburing + +comment "liburing needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash new file mode 100644 index 0000000000..56e90d71cc --- /dev/null +++ b/package/liburing/liburing.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 df7c8fd05fd39da622b2814e06f815f11f1beb429487a4330eed64bb7f353dbf liburing-2.1.tar.bz2 + +# Hash for license files +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 d0b225f17ef2d05d5cda6b25b2dc334ef6f5f12537c20edf6e391852a095ec19 LICENSE +sha256 97d62ff5d7cf0b1cef34c33a89877352911278ca4ac1c6c4f24a835baa5ea10b README diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk new file mode 100644 index 0000000000..a977e74b4f --- /dev/null +++ b/package/liburing/liburing.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# liburing +# +################################################################################ + +LIBURING_VERSION = 2.1 +LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 +LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot +LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT +LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README +LIBURING_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBURING_MAKE_OPTS += ENABLE_SHARED=0 +else +LIBURING_MAKE_OPTS += ENABLE_SHARED=1 +endif + +define LIBURING_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define LIBURING_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D)/src +endef + +define LIBURING_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install +endef + +define LIBURING_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 18:11:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:11:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/lxc: add liburing optional dependency In-Reply-To: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> Message-ID: <20220104181107.3171973-2-fontaine.fabrice@gmail.com> liburing is an optional dependency (enabed by default) since version 4.0.11 and https://github.com/lxc/lxc/commit/b1f9aee5c466b5a6d88582375ea15971d846d18b Signed-off-by: Fabrice Fontaine --- package/lxc/lxc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4d63fc14cb..08f64bcec7 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -44,6 +44,13 @@ else LXC_CONF_OPTS += --disable-selinux endif +ifeq ($(BR2_PACKAGE_LIBURING),y) +LXC_CONF_OPTS += --enable-liburing +LXC_DEPENDENCIES += liburing +else +LXC_CONF_OPTS += --disable-liburing +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LXC_CONF_OPTS += --enable-openssl LXC_DEPENDENCIES += openssl -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 18:17:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:17:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 Message-ID: <20220104181757.3207568-1-fontaine.fabrice@gmail.com> - Drop patch (already in version) - This bump will also fix the following build failure on musl raised since the addition of the package in commit e821078031e14df69e5142f23e9cb7b5a1ea0e77: text-scroller.cc: In function 'int main(int, char**)': text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? 220 | uint frame_counter = 0; | ^~~~ | rint Fixes: - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 Signed-off-by: Fabrice Fontaine --- .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 ------------------- .../rpi-rgb-led-matrix.hash | 2 +- .../rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 2 +- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch deleted file mode 100644 index f7a92f5fb2..0000000000 --- a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 -From: Grzegorz Blach -Date: Sat, 29 Aug 2020 20:48:57 +0200 -Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. - -This change allows additional flags to be added to the linker -from the command line. - -Signed-off-by: Grzegorz Blach ---- - utils/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/utils/Makefile b/utils/Makefile -index e751adc..e704442 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include - RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib - RGB_LIBRARY_NAME=rgbmatrix - RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a --LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread -+RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread - - # Imagemagic flags, only needed if actually compiled. - MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) -@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE - $(MAKE) -C $(RGB_LIBDIR) - - text-scroller: text-scroller.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) - - led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) -+ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) - - video-viewer: video-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) -+ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) - - %.o : %.cc - $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< --- -2.24.3 (Apple Git-128) - diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash index 3b1cb5fd76..265e4c4249 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz +sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk index e436755121..499fb408c2 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 +RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 18:20:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:20:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/openipmi: bump to version 2.0.32 Message-ID: <20220104182037.3292464-1-fontaine.fabrice@gmail.com> - Refresh patch and send it upstream - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...01-Avoid-searching-host-library-path.patch | 27 ++++++++++--------- package/openipmi/openipmi.hash | 12 ++++----- package/openipmi/openipmi.mk | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch index 44a57dcfb4..15b4510f67 100644 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ b/package/openipmi/0001-Avoid-searching-host-library-path.patch @@ -10,6 +10,9 @@ $(libdir) in the library search path. Signed-off-by: Baruch Siach Signed-off-by: Joel Stanley +[Fabrice: refresh patch for 2.0.32] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/openipmi/patches/35] --- cmdlang/Makefile.am | 3 +-- unix/Makefile.am | 6 ++---- @@ -19,13 +22,12 @@ diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am index 264ee12be79f..0b3843784656 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - libOpenIPMIcmdlang_la_LIBADD = -lm \ +@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined bin_PROGRAMS = openipmish @@ -33,20 +35,19 @@ diff --git a/unix/Makefile.am b/unix/Makefile.am index 5128839dad13..bd0f897ba8d6 100644 --- a/unix/Makefile.am +++ b/unix/Makefile.am -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c +@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ $(GDBM_LIB) $(RT_LIB) --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined noinst_HEADERS = heap.h diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index 2ec9dd31af..eded076ade 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 be0c87743a38e2fa00586df931f021c0b480385b OpenIPMI-2.0.28.tar.gz -md5 ba37f08e306062ec73c7ed2a2bd4d5f4 OpenIPMI-2.0.28.tar.gz +sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz +md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz # Locally computed -sha256 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 OpenIPMI-2.0.28.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB +sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index 3240b89894..ad2f2d2f4f 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.28 +OPENIPMI_VERSION = 2.0.32 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 18:25:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 19:25:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: bump to version 2.1.5 Message-ID: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, fixing two SMTP authentication issues, a crash bug on NetBSD, and a couple other issues. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog Signed-off-by: Fabrice Fontaine --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index dceae57b65..d439b23aa3 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz +sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 44d7864eb6..7e9046fe8a 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.4 +MUTT_VERSION = 2.1.5 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL -- 2.34.1 From arnout at mind.be Tue Jan 4 18:30:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:30:11 +0100 Subject: [Buildroot] [PATCH] package/terminology: bump to version 1.12.0 In-Reply-To: <20220103210713.8642-1-romain.naour@gmail.com> References: <20220103210713.8642-1-romain.naour@gmail.com> Message-ID: <2386b29d-68b3-5ffa-8a0e-6dfd3de3b83d@mind.be> On 03/01/2022 22:07, Romain Naour wrote: > Requires efl 1.26.0 [1] > > [1] https://git.enlightenment.org/apps/terminology.git/commit/?id=3e95d2ad9f59e01d498e90dcb4413dc886d49852 > > See: > https://www.enlightenment.org/news/2022-01-02-terminology-1.12.0 > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Arnout > --- > package/terminology/terminology.hash | 4 ++-- > package/terminology/terminology.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash > index be1d6f4269..7e9658482a 100644 > --- a/package/terminology/terminology.hash > +++ b/package/terminology/terminology.hash > @@ -1,3 +1,3 @@ > -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz.sha256sum > -sha256 3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c terminology-1.9.0.tar.xz > +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum > +sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz > sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING > diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk > index 29b59fb39e..787c9ad137 100644 > --- a/package/terminology/terminology.mk > +++ b/package/terminology/terminology.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TERMINOLOGY_VERSION = 1.9.0 > +TERMINOLOGY_VERSION = 1.12.0 > TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz > TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology > TERMINOLOGY_LICENSE = BSD-2-Clause > From arnout at mind.be Tue Jan 4 18:30:26 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:30:26 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.1.5 In-Reply-To: <20220103210816.26410-1-ps.report@gmx.net> References: <20220103210816.26410-1-ps.report@gmx.net> Message-ID: <9103e134-aa44-0218-da7e-5face2b74edc@mind.be> On 03/01/2022 22:08, Peter Seiderer wrote: > - remove 0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > (upstream applied [1]). > > For details see [2]. > > [1] https://github.com/assimp/assimp/commit/a099fe7cd331a839137115db5df1733c4c1c8070 > [2] https://github.com/assimp/assimp/releases/tag/v5.1.5 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > ...-explicit-namespace-instead-of-using.patch | 57 ------------------- > package/assimp/assimp.hash | 2 +- > package/assimp/assimp.mk | 2 +- > 3 files changed, 2 insertions(+), 59 deletions(-) > delete mode 100644 package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > > diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > deleted file mode 100644 > index c83e9c50a4..0000000000 > --- a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch > +++ /dev/null > @@ -1,57 +0,0 @@ > -From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer > -Date: Thu, 30 Dec 2021 18:01:54 +0100 > -Subject: [PATCH] BlenderScene: use explicit namespace instead of using > - namespace > - > -Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): > - > - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > - const FileDatabase &db) const { > - ^ > - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > - void Convert(T &dest, const FileDatabase &db) const; > - ^ > - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] > - const FileDatabase &db) const { > - ^ > - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, > - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: > - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] > - void Convert(T &dest, const FileDatabase &db) const; > - ^ > - > -[backport from upstream commit a099fe7cd331] > -Signed-off-by: Peter Seiderer > ---- > - code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- > - 1 file changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp > -index c93d913fc..9ad086fe6 100644 > ---- a/code/AssetLib/Blender/BlenderScene.cpp > -+++ b/code/AssetLib/Blender/BlenderScene.cpp > -@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > - #include "BlenderDNA.h" > - #include "BlenderSceneGen.h" > - > --using namespace Assimp; > --using namespace Assimp::Blender; > -+namespace Assimp { > -+namespace Blender { > - > - //-------------------------------------------------------------------------------- > - template <> > -@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { > - converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); > - } > - > -+} // namespace Blender > -+} //namespace Assimp > -+ > - #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER > --- > -2.34.1 > - > diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash > index 89b8d168c2..8f6d613bb4 100644 > --- a/package/assimp/assimp.hash > +++ b/package/assimp/assimp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6 assimp-5.1.4.tar.gz > +sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz > sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE > diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk > index ead5d73bca..b5f84ef56f 100644 > --- a/package/assimp/assimp.mk > +++ b/package/assimp/assimp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ASSIMP_VERSION = 5.1.4 > +ASSIMP_VERSION = 5.1.5 > ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) > ASSIMP_LICENSE = BSD-3-Clause > ASSIMP_LICENSE_FILES = LICENSE > From arnout at mind.be Tue Jan 4 18:30:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:30:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 In-Reply-To: <20220104181757.3207568-1-fontaine.fabrice@gmail.com> References: <20220104181757.3207568-1-fontaine.fabrice@gmail.com> Message-ID: <6812e29d-ecb5-fd13-53fc-828ec21bde82@mind.be> On 04/01/2022 19:17, Fabrice Fontaine wrote: > - Drop patch (already in version) > - This bump will also fix the following build failure on musl raised > since the addition of the package in commit > e821078031e14df69e5142f23e9cb7b5a1ea0e77: > > text-scroller.cc: In function 'int main(int, char**)': > text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? > 220 | uint frame_counter = 0; > | ^~~~ > | rint > > Fixes: > - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 ------------------- > .../rpi-rgb-led-matrix.hash | 2 +- > .../rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 2 +- > 3 files changed, 2 insertions(+), 48 deletions(-) > delete mode 100644 package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch > > diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch > deleted file mode 100644 > index f7a92f5fb2..0000000000 > --- a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 > -From: Grzegorz Blach > -Date: Sat, 29 Aug 2020 20:48:57 +0200 > -Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. > - > -This change allows additional flags to be added to the linker > -from the command line. > - > -Signed-off-by: Grzegorz Blach > ---- > - utils/Makefile | 8 ++++---- > - 1 file changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/utils/Makefile b/utils/Makefile > -index e751adc..e704442 100644 > ---- a/utils/Makefile > -+++ b/utils/Makefile > -@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include > - RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib > - RGB_LIBRARY_NAME=rgbmatrix > - RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a > --LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread > -+RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread > - > - # Imagemagic flags, only needed if actually compiled. > - MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) > -@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE > - $(MAKE) -C $(RGB_LIBDIR) > - > - text-scroller: text-scroller.o $(RGB_LIBRARY) > -- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) > -+ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) > - > - led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) > -- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) > -+ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) > - > - video-viewer: video-viewer.o $(RGB_LIBRARY) > -- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) > -+ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) > - > - %.o : %.cc > - $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< > --- > -2.24.3 (Apple Git-128) > - > diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash > index 3b1cb5fd76..265e4c4249 100644 > --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash > +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz > +sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk > index e436755121..499fb408c2 100644 > --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk > +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 > +RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 > RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) > RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 > RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING > From arnout at mind.be Tue Jan 4 18:31:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:31:03 +0100 Subject: [Buildroot] [PATCH 2/2] package/zfs: fix python3 version check In-Reply-To: <20220103225450.14459-2-romain.naour@gmail.com> References: <20220103225450.14459-1-romain.naour@gmail.com> <20220103225450.14459-2-romain.naour@gmail.com> Message-ID: On 03/01/2022 23:54, Romain Naour wrote: > Backport a patch to fix the python 3 version check that > broke the build since the python 3.10 version bump. > > Add host-python-packaging dependency since the backport > add "from packaging import version" while checking the > python version. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1935414730 > https://gitlab.com/buildroot.org/buildroot/-/jobs/1935415049 > > Signed-off-by: Romain Naour Both applied to master, thanks. Regards, Arnout > --- > ...law-in-the-Python-3-version-checking.patch | 106 ++++++++++++++++++ > package/zfs/zfs.mk | 5 +- > 2 files changed, 109 insertions(+), 2 deletions(-) > create mode 100644 package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch > > diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch > new file mode 100644 > index 0000000000..70978f9f4d > --- /dev/null > +++ b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch > @@ -0,0 +1,106 @@ > +From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 > +From: Rich Ercolani <214141+rincebrain at users.noreply.github.com> > +Date: Tue, 8 Jun 2021 20:20:16 -0400 > +Subject: [PATCH] Correct a flaw in the Python 3 version checking > + > +It turns out the ax_python_devel.m4 version check assumes that > +("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 > +is 10 or above and X is not. (Also presumably X+1=100 and ...) > + > +So let's remake the check to behave consistently, using the > +"packaging" or (if absent) the "distlib" modules. > + > +(Also, update the Github workflows to use the new packages.) > + > +Reviewed-by: Brian Behlendorf > +Reviewed-by: John Kennedy > +Signed-off-by: Rich Ercolani > +Closes: #12073 > +(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) > +[Romain: drop rpm spec and github workflows changes] > +Signed-off-by: Romain Naour > +--- > + config/always-pyzfs.m4 | 15 +++++++++++++++ > + config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ > + 2 files changed, 42 insertions(+), 6 deletions(-) > + > +diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 > +index 76e07b593..fa39fd885 100644 > +--- a/config/always-pyzfs.m4 > ++++ b/config/always-pyzfs.m4 > +@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ > + ]) > + AC_SUBST(DEFINE_PYZFS) > + > ++ dnl # > ++ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs > ++ dnl # > ++ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ > ++ ZFS_AC_PYTHON_MODULE([packaging], [], [ > ++ ZFS_AC_PYTHON_MODULE([distlib], [], [ > ++ AS_IF([test "x$enable_pyzfs" = xyes], [ > ++ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") > ++ ], [test "x$enable_pyzfs" != xno], [ > ++ enable_pyzfs=no > ++ ]) > ++ ]) > ++ ]) > ++ ]) > ++ > + dnl # > + dnl # Require python-devel libraries > + dnl # > +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 > +index c51b45b7d..cdfbbf81f 100644 > +--- a/config/ax_python_devel.m4 > ++++ b/config/ax_python_devel.m4 > +@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ > + # Check for a version of Python >= 2.1.0 > + # > + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) > +- ac_supports_python_ver=`$PYTHON -c "import sys; \ > +- ver = sys.version.split ()[[0]]; \ > +- print (ver >= '2.1.0')"` > ++ ac_supports_python_ver=`cat< ++from __future__ import print_function; > ++import sys; > ++try: > ++ from packaging import version; > ++except ImportError: > ++ from distlib import version; > ++ver = sys.version.split ()[[0]]; > ++(tst_cmp, tst_ver) = ">= '2.1.0'".split (); > ++tst_ver = tst_ver.strip ("'"); > ++eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))") > ++EOD` > + if test "$ac_supports_python_ver" != "True"; then > + if test -z "$PYTHON_NOVERSIONCHECK"; then > + AC_MSG_RESULT([no]) > +@@ -126,9 +135,21 @@ to something else than an empty string. > + # > + if test -n "$1"; then > + AC_MSG_CHECKING([for a version of Python $1]) > +- ac_supports_python_ver=`$PYTHON -c "import sys; \ > +- ver = sys.version.split ()[[0]]; \ > +- print (ver $1)"` > ++ # Why the strip ()? Because if we don't, version.parse > ++ # will, for example, report 3.10.0 >= '3.11.0' > ++ ac_supports_python_ver=`cat< ++ > ++from __future__ import print_function; > ++import sys; > ++try: > ++ from packaging import version; > ++except ImportError: > ++ from distlib import version; > ++ver = sys.version.split ()[[0]]; > ++(tst_cmp, tst_ver) = "$1".split (); > ++tst_ver = tst_ver.strip ("'"); > ++eval ("print (version.LegacyVersion (ver)"+ tst_cmp +"version.LegacyVersion (tst_ver))") > ++EOD` > + if test "$ac_supports_python_ver" = "True"; then > + AC_MSG_RESULT([yes]) > + else > +-- > +2.31.1 > + > diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk > index 3b1afb419a..0e7e3e4e74 100644 > --- a/package/zfs/zfs.mk > +++ b/package/zfs/zfs.mk > @@ -11,6 +11,7 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT > ZFS_CPE_ID_VENDOR = openzfs > ZFS_CPE_ID_PRODUCT = openzfs > > +# 0001-Correct-a-flaw-in-the-Python-3-version-checking.patch > ZFS_AUTORECONF = YES > > ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib > @@ -39,7 +40,7 @@ endif > # The optional PyZFS uses different scripts depending on the python > # version (ex: arc_summary2 or arc_summary3). > ifeq ($(BR2_PACKAGE_PYTHON),y) > -ZFS_DEPENDENCIES += python python-setuptools host-python-cffi > +ZFS_DEPENDENCIES += python python-setuptools host-python-cffi host-python-packaging > ZFS_CONF_ENV += \ > PYTHON=$(HOST_DIR)/usr/bin/python2 \ > PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ > @@ -47,7 +48,7 @@ ZFS_CONF_ENV += \ > PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" > ZFS_CONF_OPTS += --enable-pyzfs > else ifeq ($(BR2_PACKAGE_PYTHON3),y) > -ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi > +ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging > ZFS_CONF_ENV += \ > PYTHON=$(HOST_DIR)/usr/bin/python3 \ > PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ > From arnout at mind.be Tue Jan 4 18:31:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:31:17 +0100 Subject: [Buildroot] [PATCH] package/json-for-modern-cpp: bump version to 3.10.5 In-Reply-To: <20220104133416.5185-1-buildroot@heine.tech> References: <20220104133416.5185-1-buildroot@heine.tech> Message-ID: On 04/01/2022 14:34, Michael Nosthoff via buildroot wrote: > * Update License hash due to updated year > > Fixes: > - Make sure C++17 filesystem conversions are only used if the compiler supports it. > > Signed-off-by: Michael Nosthoff Applied to master, thanks. Regards, Arnout > --- > package/json-for-modern-cpp/json-for-modern-cpp.hash | 4 ++-- > package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash > index eb14d2fd6d..a193fa6d49 100644 > --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash > +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3 json-3.10.4.tar.gz > -sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT > +sha256 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz > +sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT > diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk > index 428473db5a..fd13ce1fd1 100644 > --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk > +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -JSON_FOR_MODERN_CPP_VERSION = 3.10.4 > +JSON_FOR_MODERN_CPP_VERSION = 3.10.5 > JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz > JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) > JSON_FOR_MODERN_CPP_LICENSE = MIT > From arnout at mind.be Tue Jan 4 18:33:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 4 Jan 2022 19:33:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: bump to version 5.212.0-alpha4 In-Reply-To: <20220104074821.1330228-1-james.hilliard1@gmail.com> References: <20220104074821.1330228-1-james.hilliard1@gmail.com> Message-ID: On 04/01/2022 08:48, James Hilliard wrote: > Switch to latest release in new active upstream: > https://github.com/qtwebkit/qtwebkit Perhaps you can push the remaining patch to upstream then? > > Migrate python2 build to python3. > > Drop patches that are upstream/no longer needed. > > Adapt/add patches to fix build issues. > > Rework build system to use cmake instead of qmake(which does not > currently support cross compilation). > > Signed-off-by: James Hilliard [snip] > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index dd99661be0..3af1918a46 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5WEBKIT_VERSION = 5.9.1 > -QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > +QT5WEBKIT_VERSION = 5.212.0-alpha4 > +QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION) Upstream README says: Use the following repository if you need to get latest snapshots of QtWebKit code: http://code.qt.io/cgit/qt/qtwebkit.git/ This repo aslo has a 5.212.0-alpha4 tag. Perhaps we should switch to that? Anyway, I applied to master as is. Regards, Arnout > +QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz > QT5WEBKIT_DEPENDENCIES = \ > - host-bison host-flex host-gperf host-python host-ruby \ > - leveldb sqlite > + host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ > + gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ > + qt5sensors qt5webchannel sqlite webp woff2 > QT5WEBKIT_INSTALL_STAGING = YES > > QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 > @@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender > +QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender > endif > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5WEBKIT_DEPENDENCIES += qt5declarative > endif > > -# QtWebkit's build system uses python, but only supports python2. We work > -# around this by forcing python2 early in the PATH, via a python->python2 > -# symlink. > -QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) > -QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) > -define QT5WEBKIT_PYTHON2_SYMLINK > - mkdir -p $(@D)/host-bin > - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python > -endef > -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK > +QT5WEBKIT_CONF_OPTS += \ > + -DPORT=Qt \ > + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > + -DUSE_LIBHYPHEN=OFF > > -QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb > - > -define QT5WEBKIT_INSTALL_TARGET_EXTRAS > - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ > -endef > - > -QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS > - > -$(eval $(qmake-package)) > +$(eval $(cmake-package)) > From arnout at mind.be Tue Jan 4 18:10:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:46 +0100 Subject: [Buildroot] [git commit] package/assimp: bump version to 5.1.5 Message-ID: <20220104182811.9D6D083249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5390200a722132365c90e07790b9a24a06af7134 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - remove 0002-BlenderScene-use-explicit-namespace-instead-of-using.patch (upstream applied [1]). For details see [2]. [1] https://github.com/assimp/assimp/commit/a099fe7cd331a839137115db5df1733c4c1c8070 [2] https://github.com/assimp/assimp/releases/tag/v5.1.5 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...e-use-explicit-namespace-instead-of-using.patch | 57 ---------------------- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 3 files changed, 2 insertions(+), 59 deletions(-) diff --git a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch b/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch deleted file mode 100644 index c83e9c50a4..0000000000 --- a/package/assimp/0002-BlenderScene-use-explicit-namespace-instead-of-using.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 30 Dec 2021 18:01:54 +0100 -Subject: [PATCH] BlenderScene: use explicit namespace instead of using - namespace - -Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320): - - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive] - const FileDatabase &db) const { - ^ - In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0, - from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47: - .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive] - void Convert(T &dest, const FileDatabase &db) const; - ^ - -[backport from upstream commit a099fe7cd331] -Signed-off-by: Peter Seiderer ---- - code/AssetLib/Blender/BlenderScene.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp -index c93d913fc..9ad086fe6 100644 ---- a/code/AssetLib/Blender/BlenderScene.cpp -+++ b/code/AssetLib/Blender/BlenderScene.cpp -@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "BlenderDNA.h" - #include "BlenderSceneGen.h" - --using namespace Assimp; --using namespace Assimp::Blender; -+namespace Assimp { -+namespace Blender { - - //-------------------------------------------------------------------------------- - template <> -@@ -885,4 +885,7 @@ void DNA::RegisterConverters() { - converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate, &Structure::Convert); - } - -+} // namespace Blender -+} //namespace Assimp -+ - #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER --- -2.34.1 - diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 89b8d168c2..8f6d613bb4 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6 assimp-5.1.4.tar.gz +sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index ead5d73bca..b5f84ef56f 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.4 +ASSIMP_VERSION = 5.1.5 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE From arnout at mind.be Tue Jan 4 18:10:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:47 +0100 Subject: [Buildroot] [git commit] package/python-packaging: add host variant Message-ID: <20220104182811.B0ADE82DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4cc445fd5fbb83c2b55f679f3d92223f34f214cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-packaging/python-packaging.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 6b54d2416d..1fd6f26d64 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -12,3 +12,4 @@ PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD $(eval $(python-package)) +$(eval $(host-python-package)) From arnout at mind.be Tue Jan 4 18:10:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:46 +0100 Subject: [Buildroot] [git commit] package/terminology: bump to version 1.12.0 Message-ID: <20220104182811.9472982DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a242529917cfa7025eb979a87b84b81b5ff25e1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Requires efl 1.26.0 [1] [1] https://git.enlightenment.org/apps/terminology.git/commit/?id=3e95d2ad9f59e01d498e90dcb4413dc886d49852 See: https://www.enlightenment.org/news/2022-01-02-terminology-1.12.0 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/terminology/terminology.hash | 4 ++-- package/terminology/terminology.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index be1d6f4269..7e9658482a 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz.sha256sum -sha256 3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c terminology-1.9.0.tar.xz +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum +sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index 29b59fb39e..787c9ad137 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.9.0 +TERMINOLOGY_VERSION = 1.12.0 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause From arnout at mind.be Tue Jan 4 18:10:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:47 +0100 Subject: [Buildroot] [git commit] package/json-for-modern-cpp: bump version to 3.10.5 Message-ID: <20220104182811.CD58F82DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7cbf6d2a42d482f54f58b2ed10b0078fa13a719e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master * Update License hash due to updated year Fixes: - Make sure C++17 filesystem conversions are only used if the compiler supports it. Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 4 ++-- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index eb14d2fd6d..a193fa6d49 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3 json-3.10.4.tar.gz -sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT +sha256 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz +sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 428473db5a..fd13ce1fd1 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.10.4 +JSON_FOR_MODERN_CPP_VERSION = 3.10.5 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From arnout at mind.be Tue Jan 4 18:10:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:47 +0100 Subject: [Buildroot] [git commit] package/zfs: fix python3 version check Message-ID: <20220104182811.B9A1183249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0197eb3a7121712d5ae1c8c5c3e180961fce1cdb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Backport a patch to fix the python 3 version check that broke the build since the python 3.10 version bump. Add host-python-packaging dependency since the backport add "from packaging import version" while checking the python version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1935414730 https://gitlab.com/buildroot.org/buildroot/-/jobs/1935415049 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...t-a-flaw-in-the-Python-3-version-checking.patch | 106 +++++++++++++++++++++ package/zfs/zfs.mk | 5 +- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch new file mode 100644 index 0000000000..70978f9f4d --- /dev/null +++ b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch @@ -0,0 +1,106 @@ +From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain at users.noreply.github.com> +Date: Tue, 8 Jun 2021 20:20:16 -0400 +Subject: [PATCH] Correct a flaw in the Python 3 version checking + +It turns out the ax_python_devel.m4 version check assumes that +("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 +is 10 or above and X is not. (Also presumably X+1=100 and ...) + +So let's remake the check to behave consistently, using the +"packaging" or (if absent) the "distlib" modules. + +(Also, update the Github workflows to use the new packages.) + +Reviewed-by: Brian Behlendorf +Reviewed-by: John Kennedy +Signed-off-by: Rich Ercolani +Closes: #12073 +(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) +[Romain: drop rpm spec and github workflows changes] +Signed-off-by: Romain Naour +--- + config/always-pyzfs.m4 | 15 +++++++++++++++ + config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ + 2 files changed, 42 insertions(+), 6 deletions(-) + +diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 +index 76e07b593..fa39fd885 100644 +--- a/config/always-pyzfs.m4 ++++ b/config/always-pyzfs.m4 +@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ + ]) + AC_SUBST(DEFINE_PYZFS) + ++ dnl # ++ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs ++ dnl # ++ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ ++ ZFS_AC_PYTHON_MODULE([packaging], [], [ ++ ZFS_AC_PYTHON_MODULE([distlib], [], [ ++ AS_IF([test "x$enable_pyzfs" = xyes], [ ++ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") ++ ], [test "x$enable_pyzfs" != xno], [ ++ enable_pyzfs=no ++ ]) ++ ]) ++ ]) ++ ]) ++ + dnl # + dnl # Require python-devel libraries + dnl # +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index c51b45b7d..cdfbbf81f 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split ()[[0]]; \ +- print (ver >= '2.1.0')"` ++ ac_supports_python_ver=`cat<= '3.11.0' ++ ac_supports_python_ver=`cat< commit: https://git.buildroot.net/buildroot/commit/?id=0d628aa9521ce79ed2a41a65981c466819dad29e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on musl raised since the addition of the package in commit e821078031e14df69e5142f23e9cb7b5a1ea0e77: text-scroller.cc: In function 'int main(int, char**)': text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? 220 | uint frame_counter = 0; | ^~~~ | rint Fixes: - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-utils-text-scroller.cc-replace-uint.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch new file mode 100644 index 0000000000..627415bac8 --- /dev/null +++ b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch @@ -0,0 +1,50 @@ +From a56338db0f003d5236f2ce98c73a591d64a70852 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Jan 2022 22:57:11 +0100 +Subject: [PATCH] utils/text-scroller.cc: replace uint (#1383) + +Replace uint by uint64_t to avoid the following build failure on musl: + +text-scroller.cc: In function 'int main(int, char**)': +text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? + 220 | uint frame_counter = 0; + | ^~~~ + | rint + +Fixes: + - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/hzeller/rpi-rgb-led-matrix/commit/a56338db0f003d5236f2ce98c73a591d64a70852] +--- + utils/text-scroller.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/utils/text-scroller.cc b/utils/text-scroller.cc +index a64ba0c89..28d4f7182 100644 +--- a/utils/text-scroller.cc ++++ b/utils/text-scroller.cc +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -217,12 +218,12 @@ int main(int argc, char *argv[]) { + + struct timespec next_frame = {0, 0}; + +- uint frame_counter = 0; ++ uint64_t frame_counter = 0; + while (!interrupt_received && loops != 0) { + ++frame_counter; + offscreen_canvas->Fill(bg_color.r, bg_color.g, bg_color.b); + const bool draw_on_frame = (blink_on <= 0) +- || (frame_counter % (blink_on + blink_off) < (uint)blink_on); ++ || (frame_counter % (blink_on + blink_off) < (uint64_t)blink_on); + + if (draw_on_frame) { + if (outline_font) { From arnout at mind.be Tue Jan 4 18:10:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 4 Jan 2022 19:10:47 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: bump to version 5.212.0-alpha4 Message-ID: <20220104182811.C4D2B8324B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df0b0fe6919c0d0f3750f439a3cfa765232bd569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to latest release in new active upstream: https://github.com/qtwebkit/qtwebkit Migrate python2 build to python3. Drop patches that are upstream/no longer needed. Adapt/add patches to fix build issues. Rework build system to use cmake instead of qmake(which does not currently support cross compilation). Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ated-compile-failures-from-capital-bool-d.patch | 147 +++++++++++++++++++++ .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 36 ----- ...ude-backtrace-API-for-non-glibc-libraries.patch | 44 ------ ...tion-with-Python-3.9-avoid-passing-encodi.patch | 33 +++++ .../0003-Detect-32-bits-armv8-a-architecture.patch | 48 ------- ...nerate-the-header-directly-to-fix-build-.patch} | 22 +-- .../0004-Fix-installation-of-class-headers.patch | 49 ------- ...lid-g_object-declarations-to-fix-build-wi.patch | 31 +++++ .../0005-Fix-ICU-related-compile-failures.patch | 67 ---------- ...emove-legacy-reference-to-qtConfig-mircli.patch | 34 ----- ...enerate-the-header-directly-to-fix-build-.patch | 31 ----- ...ated-compile-failures-from-capital-bool-d.patch | 99 -------------- package/qt5/qt5webkit/Config.in | 14 ++ package/qt5/qt5webkit/qt5webkit.hash | 4 +- package/qt5/qt5webkit/qt5webkit.mk | 37 ++---- 15 files changed, 250 insertions(+), 446 deletions(-) diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch new file mode 100644 index 0000000000..11d0b7b248 --- /dev/null +++ b/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch @@ -0,0 +1,147 @@ +From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001 +From: Henri Roosen +Date: Thu, 18 Mar 2021 11:53:57 +0100 +Subject: [PATCH] Fix ICU related compile failures from capital bool defines + +See ICU-21267 + +Signed-off-by: Henri Roosen +Signed-off-by: James Hilliard +--- + Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- + Source/WebCore/platform/text/icu/UTextProvider.h | 8 ++++---- + .../platform/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- + .../platform/text/icu/UTextProviderUTF16.cpp | 4 ++-- + 4 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp +index dd6ff0675bb1..e0f4bd718828 100644 +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h +index c254fc4c7ce2..6d1e1cbc5eb2 100644 +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +index cd6852c71e55..6a864b1c1567 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +index 7aaac48c8151..9ae0d367f1f6 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch deleted file mode 100644 index 669c7e6aa2..0000000000 --- a/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner -Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) - -Building qtwebkit causes a QA issue such that QtWebPluginProcess and -QtWebProcess contain bad RPATHs which point into the build location. This fix -adds a patch to not include the rpath.prf which causes this problem. - -Signed-off-by: Trevor Woerner -Signed-off-by: Martin Jansa - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0001-qtwebkit-fix-QA-issue-bad-RPATH.patch - -Signed-off-by: Gary Bisson ---- - Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index fd66af6..ef754c3 100644 ---- a/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -61,7 +61,6 @@ linux-*g++* { - } - } - --contains(TEMPLATE, app): CONFIG += rpath - - CONFIG(debug, debug|release)|force_debug_info { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. --- -2.7.0 - diff --git a/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted file mode 100644 index a2597a54bb..0000000000 --- a/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries - -It was excluding musl with current checks, so lets make it such that it -considers only glibc when using backtrace API - -Signed-off-by: Khem Raj - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0003-Exclude-backtrace-API-for-non-glibc-libraries.patch - -Signed-off-by: Gary Bisson ---- - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 1b2091f..ba03a28 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -61,7 +61,7 @@ - #include - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include - #include -@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined --- -2.7.0 - diff --git a/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch b/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch new file mode 100644 index 0000000000..d167a44bf3 --- /dev/null +++ b/package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch @@ -0,0 +1,33 @@ +From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Wed, 3 Jun 2020 15:01:42 +0300 +Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to + json.load() + +In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument +is not supported. + +Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +78360c01c796b6260bf828bc9c8a0ef73c5132fd] +--- + Source/JavaScriptCore/generate-bytecode-files | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files +index c5dab429c7b0..af3431275ecf 100644 +--- a/Source/JavaScriptCore/generate-bytecode-files ++++ b/Source/JavaScriptCore/generate-bytecode-files +@@ -163,7 +163,7 @@ if __name__ == "__main__": + initBytecodesFile = openOrExit(initASMFileName, "w") + + try: +- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") ++ bytecodeSections = json.load(bytecodeFile) + except: + print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) + +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch deleted file mode 100644 index 9c2205dd94..0000000000 --- a/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 15 Aug 2017 18:28:49 -0400 -Subject: [PATCH] Detect 32-bits armv8-a architecture -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Adds WTF platform support for the 32-bits armv8-a architectures. - -Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) -and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). - -This commit catches this new architecture (armv8a) within a #ifdef/#endif -inside the if statement dedicated for 32-bits ARM detection. - -Fixes: - - In file included from ./config.h:30:0, - from ... - ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" - # error "Not supported ARM architecture" - ^~~~~ - -Upstream-Status: Backport [with adaptations] -Signed-off-by: Ga??l PORTAY ---- - Source/WTF/wtf/Platform.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 562840cf7..9cf656845 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -243,6 +243,10 @@ - || defined(__ARM_ARCH_7S__) - #define WTF_ARM_ARCH_VERSION 7 - -+#elif defined(__ARM_ARCH_8__) \ -+ || defined(__ARM_ARCH_8A__) -+#define WTF_ARM_ARCH_VERSION 8 -+ - /* MSVC sets _M_ARM */ - #elif defined(_M_ARM) - #define WTF_ARM_ARCH_VERSION _M_ARM --- -2.16.1 - diff --git a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch similarity index 60% rename from package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch rename to package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch index 7bb81b1259..1591b8a82c 100644 --- a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch +++ b/package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch @@ -1,4 +1,4 @@ -From 894a5448ee8ce0f134845c877b4c0a2a660e4ab3 Mon Sep 17 00:00:00 2001 +From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Tue, 4 Aug 2020 21:04:06 +0300 Subject: [PATCH] Let Bison generate the header directly, to fix build with @@ -9,24 +9,25 @@ by default, instead of duplicating it. So we should not delete it. Remove the code to add #ifdef guards to the header, since Bison adds them itself since version 2.6.3. - -[Original patch taken from -https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch?id=69e618c88a9134f754264efc11aa0b1fdc028b88 -ported to qtwebkit-opensource-src-5.9.1] -Signed-off-by: Peter Seiderer +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +d92b11fea65364fefa700249bd3340e0cd4c5b31] --- Source/WebCore/css/makegrammar.pl | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 4e0452ed..9ef32963 100644 +index 5d63b08102eb..9435701c7061 100644 --- a/Source/WebCore/css/makegrammar.pl +++ b/Source/WebCore/css/makegrammar.pl -@@ -73,23 +73,4 @@ if ($suffix eq ".y.in") { +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { } my $fileBase = File::Spec->join($outputDir, $filename); --system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; - -open HEADER, ">$fileBase.h" or die; -print HEADER << "EOF"; @@ -46,7 +47,6 @@ index 4e0452ed..9ef32963 100644 -unlink("$fileBase.cpp.h"); -unlink("$fileBase.hpp"); - -+system("$bison --defines=$fileBase.h -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); -- -2.28.0 +2.25.1 diff --git a/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch b/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch deleted file mode 100644 index 92aab57111..0000000000 --- a/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7d763d441fd4fa78553a818ee75ac477eb6dbcbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= -Date: Sun, 2 Feb 2020 10:48:50 +0100 -Subject: [PATCH] Fix installation of class headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since Qt 5.11 (see commit [1]), the key word HEADER_CLASSES has been -removed. It has been replaced by a new variable GENERATED_HEADER_FILES. - -The class headers were not generated, this commit moves them directly to -HEADER_FILES. - -[1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 - -Signed-off-by: Ga??l PORTAY -[Converted to git formated patch] -Signed-off-by: Peter Seiderer ---- - include/QtWebKit/headers.pri | 3 +-- - include/QtWebKitWidgets/headers.pri | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/include/QtWebKit/headers.pri b/include/QtWebKit/headers.pri -index 6775f3a6..3a5c14cd 100644 ---- a/include/QtWebKit/headers.pri -+++ b/include/QtWebKit/headers.pri -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit --SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion -+SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFacto ry ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhis tory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = -diff --git a/include/QtWebKitWidgets/headers.pri b/include/QtWebKitWidgets/headers.pri -index 9d386e29..2b8b095c 100644 ---- a/include/QtWebKitWidgets/headers.pri -+++ b/include/QtWebKitWidgets/headers.pri -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets --SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion -+SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch new file mode 100644 index 0000000000..48605e4fe4 --- /dev/null +++ b/package/qt5/qt5webkit/0004-Remove-invalid-g_object-declarations-to-fix-build-wi.patch @@ -0,0 +1,31 @@ +From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 7 Apr 2021 13:38:09 +0200 +Subject: [PATCH] Remove invalid g_object declarations to fix build with glib + >= 2.68 + +g_object_ref_sink is defined as a macro meanwhile and so the build fails. +Just remove the declarations, glib.h is included anyway. +Signed-off-by: James Hilliard +[Retrieved from: https://github.com/qtwebkit/qtwebkit/pull/1058] +--- + Source/WTF/wtf/glib/GRefPtr.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h +index 06133d82cb35..d9a1d2f145f5 100644 +--- a/Source/WTF/wtf/glib/GRefPtr.h ++++ b/Source/WTF/wtf/glib/GRefPtr.h +@@ -29,9 +29,6 @@ + #include + #include + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt }; +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch b/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch deleted file mode 100644 index 1a99eb7f84..0000000000 --- a/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 2 Feb 2020 10:51:00 +0100 -Subject: [PATCH] Fix ICU related compile failures. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The ICU macro U16_NEXT() needs a trailing semicolon. - -Fixes: - - platform/graphics/SegmentedFontData.cpp:65:9: error: expected ???;??? before ???if??? - dom/Document.cpp:3850:5: error: expected ???;??? before ???if??? - dom/Document.cpp:3855:9: error: expected ???;??? before ???if??? - dom/Document.cpp:3918:9: error: expected ???;??? before ???if??? - -Signed-off-by: Peter Seiderer ---- - Source/WebCore/dom/Document.cpp | 6 +++--- - Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index af63b141..26f7312b 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S - const UChar* s = qualifiedName.characters(); - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(s, i, length, c) -+ U16_NEXT(s, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; -diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp -index efb20a8c..99b3e86c 100644 ---- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp -+++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp -@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length) - { - UChar32 c; - for (int i = 0; i < length; ) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!containsCharacter(c)) - return false; - } --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch b/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch deleted file mode 100644 index d9b94697da..0000000000 --- a/package/qt5/qt5webkit/0006-configure-remove-legacy-reference-to-qtConfig-mircli.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c408484e3a442ecf99d3cc61402f20c45c894b7c Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 3 Feb 2020 21:19:57 +0100 -Subject: [PATCH] configure: remove legacy reference to qtConfig(mirclient) - -The optio mirclient is removed since Qt-5.14.x (see [1]) -Fixes: - - Project ERROR: Could not find feature mirclient. - -[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405 - -Signed-off-by: Peter Seiderer ---- - Tools/qmake/mkspecs/features/configure.prf | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf -index 23d99040..783f6752 100644 ---- a/Tools/qmake/mkspecs/features/configure.prf -+++ b/Tools/qmake/mkspecs/features/configure.prf -@@ -130,9 +130,6 @@ defineTest(finalizeConfigure) { - addReasonForSkippingBuild("Build not supported on Android.") - } - QT_FOR_CONFIG += gui-private -- production_build:qtConfig(mirclient) { -- addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") -- } - !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) { - addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") - } --- -2.25.0 - diff --git a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch deleted file mode 100644 index 9deb2d8c63..0000000000 --- a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8959e226fac7f73b9a40e202610bd5e12334561b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 15 Sep 2020 19:11:18 +0200 -Subject: [PATCH] let bison generate the header directly, to fix build with - bison 3.7 - -Do the same as the patch taken from [1] for the bison call in -Source/WebCore/DerivedSources.pri to fix file generation -for bison 3.7. - -Signed-off-by: Peter Seiderer ---- - Source/WebCore/DerivedSources.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri -index 57a6b0f7..e9f52614 100644 ---- a/Source/WebCore/DerivedSources.pri -+++ b/Source/WebCore/DerivedSources.pri -@@ -987,7 +987,7 @@ GENERATORS += pluginsresources - # GENERATOR 11: XPATH grammar - xpathbison.output = ${QMAKE_FILE_BASE}.cpp - xpathbison.input = XPATHBISON --xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h -+xpathbison.commands = bison --defines=${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.h -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.cpp - xpathbison.depends = ${QMAKE_FILE_NAME} - GENERATORS += xpathbison - --- -2.28.0 - diff --git a/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch deleted file mode 100644 index 7d941a5683..0000000000 --- a/package/qt5/qt5webkit/0009-Fix-ICU-related-compile-failures-from-capital-bool-d.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 37ee268d9d07a8dad02c1d8db3bf96e0b30df10b Mon Sep 17 00:00:00 2001 -From: Henri Roosen -Date: Thu, 18 Mar 2021 11:53:57 +0100 -Subject: [PATCH] Fix ICU related compile failures from capital bool defines - -See ICU-21267 - -Signed-off-by: Henri Roosen ---- - .../platform/text/TextBreakIteratorICU.cpp | 16 ++++++++-------- - Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -index b4046ac9..832890a2 100644 ---- a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -+++ b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp -@@ -214,12 +214,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < numeric_limits::max()); - text->chunkOffset = offset < numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -228,12 +228,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < numeric_limits::max()); - text->chunkOffset = offset < numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } -@@ -243,7 +243,7 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = textNativeLength(text); - UBool isAccessible; - if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -263,7 +263,7 @@ static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward) - ASSERT(newContext == PriorContext); - textLatin1SwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static const struct UTextFuncs textLatin1Funcs = { -@@ -364,7 +364,7 @@ static void textUTF16SwitchToPriorContext(UText* text, int64_t nativeIndex, int6 - static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = textNativeLength(text); - UBool isAccessible; - if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -384,7 +384,7 @@ static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward) - ASSERT(newContext == PriorContext); - textUTF16SwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static const struct UTextFuncs textUTF16Funcs = { -diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp -index 86d4ea17..da152edd 100644 ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -269,7 +269,7 @@ void TextCodecICU::createICUConverter() const - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) --- -2.20.1 - diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 82e38dff52..b7beb2b252 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -9,10 +9,24 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_BINFMT_FLAT # icu # assumes a FPU is available on MIPS depends on !BR2_MIPS_SOFT_FLOAT + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_ICU + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION + select BR2_PACKAGE_QT5SENSORS + select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB help diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 312d58272a..d7c8bd6c8a 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,5 +1,5 @@ -# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz +# Locally calculated +sha256 9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6 qtwebkit-5.212.0-alpha4.tar.xz # Hashes for license files: sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index dd99661be0..3af1918a46 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBKIT_VERSION = 5.9.1 -QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_VERSION = 5.212.0-alpha4 +QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION) +QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ - host-bison host-flex host-gperf host-python host-ruby \ - leveldb sqlite + host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ + gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ + qt5sensors qt5webchannel sqlite webp woff2 QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 @@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender +QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_DEPENDENCIES += qt5declarative endif -# QtWebkit's build system uses python, but only supports python2. We work -# around this by forcing python2 early in the PATH, via a python->python2 -# symlink. -QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -define QT5WEBKIT_PYTHON2_SYMLINK - mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python -endef -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK +QT5WEBKIT_CONF_OPTS += \ + -DPORT=Qt \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DUSE_LIBHYPHEN=OFF -QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb - -define QT5WEBKIT_INSTALL_TARGET_EXTRAS - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ -endef - -QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS - -$(eval $(qmake-package)) +$(eval $(cmake-package)) From yann.morin.1998 at free.fr Tue Jan 4 19:58:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 20:58:30 +0100 Subject: [Buildroot] [git commit] package/mutt: bump to version 2.1.5 Message-ID: <20220104195259.7FBF982A54@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db156d693a54fadb43f6b487902ae6795477921f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, fixing two SMTP authentication issues, a crash bug on NetBSD, and a couple other issues. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index dceae57b65..d439b23aa3 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz +sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 44d7864eb6..7e9046fe8a 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.4 +MUTT_VERSION = 2.1.5 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From yann.morin.1998 at free.fr Tue Jan 4 19:59:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 20:59:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: bump to version 2.1.5 In-Reply-To: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> References: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> Message-ID: <20220104195934.GA614810@scaer> Fabrice, All, On 2022-01-04 19:25 +0100, Fabrice Fontaine spake thusly: > Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, > fixing two SMTP authentication issues, a crash bug on NetBSD, and a > couple other issues. > > https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/mutt/mutt.hash | 2 +- > package/mutt/mutt.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash > index dceae57b65..d439b23aa3 100644 > --- a/package/mutt/mutt.hash > +++ b/package/mutt/mutt.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz > +sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz > sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL > diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk > index 44d7864eb6..7e9046fe8a 100644 > --- a/package/mutt/mutt.mk > +++ b/package/mutt/mutt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MUTT_VERSION = 2.1.4 > +MUTT_VERSION = 2.1.5 > MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads > MUTT_LICENSE = GPL-2.0+ > MUTT_LICENSE_FILES = GPL > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 4 20:00:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 21:00:23 +0100 Subject: [Buildroot] [git commit] package/openipmi: bump to version 2.0.32 Message-ID: <20220104195526.E39BF82BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0be734b7b2272b9adfa9a5e51a40ca48e650eb9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Refresh patch and send it upstream - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Avoid-searching-host-library-path.patch | 27 +++++++++++----------- package/openipmi/openipmi.hash | 12 +++++----- package/openipmi/openipmi.mk | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch index 44a57dcfb4..15b4510f67 100644 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ b/package/openipmi/0001-Avoid-searching-host-library-path.patch @@ -10,6 +10,9 @@ $(libdir) in the library search path. Signed-off-by: Baruch Siach Signed-off-by: Joel Stanley +[Fabrice: refresh patch for 2.0.32] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/openipmi/patches/35] --- cmdlang/Makefile.am | 3 +-- unix/Makefile.am | 6 ++---- @@ -19,13 +22,12 @@ diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am index 264ee12be79f..0b3843784656 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - libOpenIPMIcmdlang_la_LIBADD = -lm \ +@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined bin_PROGRAMS = openipmish @@ -33,20 +35,19 @@ diff --git a/unix/Makefile.am b/unix/Makefile.am index 5128839dad13..bd0f897ba8d6 100644 --- a/unix/Makefile.am +++ b/unix/Makefile.am -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c +@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ $(GDBM_LIB) $(RT_LIB) --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) -no-undefined ++ -no-undefined noinst_HEADERS = heap.h diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index 2ec9dd31af..eded076ade 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 be0c87743a38e2fa00586df931f021c0b480385b OpenIPMI-2.0.28.tar.gz -md5 ba37f08e306062ec73c7ed2a2bd4d5f4 OpenIPMI-2.0.28.tar.gz +sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz +md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz # Locally computed -sha256 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 OpenIPMI-2.0.28.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB +sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index 3240b89894..ad2f2d2f4f 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.28 +OPENIPMI_VERSION = 2.0.32 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause From yann.morin.1998 at free.fr Tue Jan 4 20:03:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 21:03:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/openipmi: bump to version 2.0.32 In-Reply-To: <20220104182037.3292464-1-fontaine.fabrice@gmail.com> References: <20220104182037.3292464-1-fontaine.fabrice@gmail.com> Message-ID: <20220104200320.GB614810@scaer> Fabrice, All, On 2022-01-04 19:20 +0100, Fabrice Fontaine spake thusly: > - Refresh patch and send it upstream > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...01-Avoid-searching-host-library-path.patch | 27 ++++++++++--------- > package/openipmi/openipmi.hash | 12 ++++----- > package/openipmi/openipmi.mk | 2 +- > 3 files changed, 21 insertions(+), 20 deletions(-) > > diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch > index 44a57dcfb4..15b4510f67 100644 > --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch > +++ b/package/openipmi/0001-Avoid-searching-host-library-path.patch > @@ -10,6 +10,9 @@ $(libdir) in the library search path. > > Signed-off-by: Baruch Siach > Signed-off-by: Joel Stanley > +[Fabrice: refresh patch for 2.0.32] > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://sourceforge.net/p/openipmi/patches/35] > --- > cmdlang/Makefile.am | 3 +-- > unix/Makefile.am | 6 ++---- > @@ -19,13 +22,12 @@ diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am > index 264ee12be79f..0b3843784656 100644 > --- a/cmdlang/Makefile.am > +++ b/cmdlang/Makefile.am > -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ > - libOpenIPMIcmdlang_la_LIBADD = -lm \ > +@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ > $(top_builddir)/utils/libOpenIPMIutils.la \ > $(top_builddir)/lib/libOpenIPMI.la > --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > -- -L$(libdir) > -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) > + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > +- -L$(libdir) -no-undefined > ++ -no-undefined > > bin_PROGRAMS = openipmish > > @@ -33,20 +35,19 @@ diff --git a/unix/Makefile.am b/unix/Makefile.am > index 5128839dad13..bd0f897ba8d6 100644 > --- a/unix/Makefile.am > +++ b/unix/Makefile.am > -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la > - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c > +@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la > libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ > $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) > --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > -- -L$(libdir) > -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) > + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > +- -L$(libdir) -no-undefined > ++ -no-undefined > > libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c > libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ > $(GDBM_LIB) $(RT_LIB) > --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > -- -L$(libdir) > -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) > + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ > +- -L$(libdir) -no-undefined > ++ -no-undefined > > noinst_HEADERS = heap.h > > diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash > index 2ec9dd31af..eded076ade 100644 > --- a/package/openipmi/openipmi.hash > +++ b/package/openipmi/openipmi.hash > @@ -1,8 +1,8 @@ > # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ > -sha1 be0c87743a38e2fa00586df931f021c0b480385b OpenIPMI-2.0.28.tar.gz > -md5 ba37f08e306062ec73c7ed2a2bd4d5f4 OpenIPMI-2.0.28.tar.gz > +sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz > +md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz > # Locally computed > -sha256 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 OpenIPMI-2.0.28.tar.gz > -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING > -sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD > -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB > +sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz > +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING > +sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD > +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB > diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk > index 3240b89894..ad2f2d2f4f 100644 > --- a/package/openipmi/openipmi.mk > +++ b/package/openipmi/openipmi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -OPENIPMI_VERSION = 2.0.28 > +OPENIPMI_VERSION = 2.0.32 > OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library > OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz > OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From aduskett at gmail.com Tue Jan 4 20:09:04 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 4 Jan 2022 12:09:04 -0800 Subject: [Buildroot] [PATCH 1/1] package/gdb: remove python2 support Message-ID: <20220104200904.1422985-1-aduskett@gmail.com> According to the GDB 9.2 changelog, python3 has been supported since at least 2019. - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in Signed-off-by: Adam Duskett --- Config.in.legacy | 7 +++++++ package/gdb/Config.in | 2 +- package/gdb/Config.in.host | 5 ----- package/gdb/gdb.mk | 10 +--------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5994d94487..a126d56052 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_HOST_GDB_PYTHON + bool "GDB Python2 support removed" + select BR2_LEGACY + help + Python2 is deprecated and no longer supported. + Please migrate to Python3. + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" select BR2_LEGACY diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 6f1a883de7..daad6c910d 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI config BR2_PACKAGE_GDB_PYTHON bool "Python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help This option enables Python support in the target gdb. diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a6e1d7f53c..2c6c78f20a 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON help This option disables Python support in the cross gdb. -config BR2_PACKAGE_HOST_GDB_PYTHON - bool "Python 2" - help - This option enables the Python 2 support in the cross gdb. - config BR2_PACKAGE_HOST_GDB_PYTHON3 bool "Python 3" help diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4ff498230a..2929eaf058 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_DEPENDENCIES += python3 -else -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_DEPENDENCIES += python endif GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config else @@ -287,10 +282,7 @@ else HOST_GDB_CONF_OPTS += --disable-tui endif -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 -HOST_GDB_DEPENDENCIES += host-python -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 HOST_GDB_DEPENDENCIES += host-python3 else -- 2.33.1 From festevam at gmail.com Tue Jan 4 20:25:41 2022 From: festevam at gmail.com (Fabio Estevam) Date: Tue, 4 Jan 2022 17:25:41 -0300 Subject: [Buildroot] [PATCH] configs/imx6-sabresd: Bump U-Boot and kernel Message-ID: <20220104202541.1175048-1-festevam@gmail.com> Bump U-Boot to 2021.10 and kernel to 5.15.12 version. Signed-off-by: Fabio Estevam --- configs/imx6-sabresd_defconfig | 8 ++++---- configs/imx6-sabresd_qt5_defconfig | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 5a39f333d1ac..0e8300438fcd 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 1330b5cfbfa1..47d14da6a6d6 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,7 +30,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" -- 2.25.1 From festevam at gmail.com Tue Jan 4 20:32:42 2022 From: festevam at gmail.com (Fabio Estevam) Date: Tue, 4 Jan 2022 17:32:42 -0300 Subject: [Buildroot] [PATCH v2] configs/imx6-sabresd: Bump U-Boot and kernel Message-ID: <20220104203242.1175845-1-festevam@gmail.com> Bump U-Boot to 2021.10 and kernel to 5.15.12 version. Signed-off-by: Fabio Estevam --- Changes since v1: - Also select BR2_TARGET_UBOOT_NEEDS_OPENSSL=y as a requirement for U-Boot 2021.10. configs/imx6-sabresd_defconfig | 9 +++++---- configs/imx6-sabresd_qt5_defconfig | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 5a39f333d1ac..19986f2cbb54 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,15 +24,16 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 1330b5cfbfa1..38a86131dda3 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,15 +30,16 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" -- 2.25.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:41:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:41:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/gensio: add avahi optional dependency Message-ID: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> avahi-client is an optional dependency which is enabled by default since version 2.2.0 and https://github.com/cminyard/gensio/commit/5ab117c9743fd4719f610cf9f1ba45023cc25d7c Signed-off-by: Fabrice Fontaine --- package/gensio/gensio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 389de1e263..b4936d5f21 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING GENSIO_INSTALL_STAGING = YES +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) GENSIO_CONF_OPTS = \ --without-openipmi \ --without-swig \ -- 2.34.1 From aduskett at gmail.com Tue Jan 4 20:49:23 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 4 Jan 2022 12:49:23 -0800 Subject: [Buildroot] [PATCH v3 1/1] package/pkg-generic.mk: fix absolute paths in per-package config files Message-ID: <20220104204923.2124418-1-aduskett@gmail.com> Some packages (notably qmake packages) generate .cmake, .pc, and .pri files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in those files point outside the per-package sysroot for packages that have rsynced those same files. - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk to avoid more calls to ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) - Add a new step which searches for .cmake, .pc, and .pri files in a given per-package host and staging directory and replaces the old $(PER_PACKAGE_DIR) directory with the correct directory for the given package. This simple fix allows qt5 submodule packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- changes v2 -> v3: - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk (Yann) - Combine FIXUP_CONFIG_FILES_ABSOLUTE_PATHS with FIXUP_PER_PACKAGE_FILES (Yann) changes v1 -> v2 - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host directories in a single step. package/pkg-generic.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5626af1d87..65fe9baced 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -113,8 +113,16 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. +# +# When per-package is enabled, packages may generate files with absolute paths +# that point to the packages per-package sysroot. However, this breaks +# per-package isolation when the files are rsynced to a new package that depends +# on the first package. because the hard-coded paths point to directories +# outside the packages sysroot. Run sed on all .cmake, .pc, and .pri files in a +# given packages sysroot containing the word "per-package" and replace the path +# with the appropriate per-package directory. ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define FIXUP_PYTHON_SYSCONFIGDATA +define FIXUP_PER_PACKAGE_FILES $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ @@ -124,6 +132,11 @@ define FIXUP_PYTHON_SYSCONFIGDATA \) \ | xargs -0 --no-run-if-empty \ $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + + $(Q)find $(HOST_DIR)/ -name "*.pc" -o -name "*.cmake" -o -name "*.pri" \ + | xargs --no-run-if-empty \ + $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(NAME)/:g" + endef endif @@ -836,7 +849,7 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += FIXUP_PER_PACKAGE_FILES ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.33.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:50:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:50:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/libvirt: install in staging Message-ID: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> Install libvirt in staging to allow collectd to use it Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 9a4788c905..41218c0e53 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -10,6 +10,7 @@ LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ LIBVIRT_LICENSE_FILES = COPYING LIBVIRT_CPE_ID_VENDOR = redhat +LIBVIRT_INSTALL_STAGING = YES LIBVIRT_DEPENDENCIES = \ host-libxslt \ host-nfs-utils \ -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:50:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:50:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/collectd: add virt support In-Reply-To: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> References: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> Message-ID: <20220104205008.3631801-2-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/collectd/Config.in | 18 ++++++++++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 5e5dff6fe1..697dc51f7e 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -591,6 +591,24 @@ config BR2_PACKAGE_COLLECTD_USERS help Counts the number of users currently logged in. +config BR2_PACKAGE_COLLECTD_VIRT + bool "virt" + depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS # libvirt + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # libvirt + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 # libvirt + depends on BR2_PACKAGE_HAS_UDEV # libvirt + depends on BR2_USE_WCHAR # libvirt + select BR2_PACKAGE_LIBVIRT + select BR2_PACKAGE_LIBXML2 + help + Gather statistics about virtualized guests on a system. + +comment "virt needs udev /dev management, a toolchain w/ wchar, kernel headers >= 3.12 (4.11 for AArch64)" + depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR || \ + !(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \ + (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) + config BR2_PACKAGE_COLLECTD_VMEM bool "vmem" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 9d6f630fe3..5751757040 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -22,7 +22,7 @@ COLLECTD_PLUGINS_DISABLE = \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ - tokyotyrant turbostat uuid varnish virt vserver write_kafka \ + tokyotyrant turbostat uuid varnish vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone COLLECTD_CONF_ENV += LIBS="-lm" @@ -149,6 +149,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \ $(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \ $(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \ + $(if $(BR2_PACKAGE_COLLECTD_VIRT),--enable-virt,--disable-virt) \ $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ @@ -197,6 +198,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \ $(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ + $(if $(BR2_PACKAGE_COLLECTD_VIRT),libvirt libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) -- 2.34.1 From james.hilliard1 at gmail.com Tue Jan 4 20:52:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 4 Jan 2022 13:52:13 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: use backported ICU patch from upstream Message-ID: <20220104205213.1367539-1-james.hilliard1@gmail.com> Use backported upstream ICU fix instead of adapted downstream patch. Signed-off-by: James Hilliard --- ...ion-ICU-68.1-no-longer-exposes-FALS.patch} | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) rename package/qt5/qt5webkit/{0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch => 0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch} (86%) diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch similarity index 86% rename from package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch rename to package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch index 11d0b7b248..0c3e8b3586 100644 --- a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch +++ b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch @@ -1,18 +1,39 @@ -From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001 -From: Henri Roosen -Date: Thu, 18 Mar 2021 11:53:57 +0100 -Subject: [PATCH] Fix ICU related compile failures from capital bool defines +From 736e1d804d1efa2077c4f1fe0b9084927d82e249 Mon Sep 17 00:00:00 2001 +From: "stephan.szabo at sony.com" + +Date: Tue, 3 Nov 2020 20:06:15 +0000 +Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and + TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522 -See ICU-21267 +Reviewed by Don Olmstead. -Signed-off-by: Henri Roosen +Source/WebCore: + +* platform/text/TextCodecICU.cpp: Replace use of TRUE with true + +Source/WebKit: + +* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false + +Source/WTF: + +Replace uses of FALSE and TRUE with false and true. + +* wtf/text/icu/UTextProvider.h: +* wtf/text/icu/UTextProviderLatin1.cpp: +* wtf/text/icu/UTextProviderUTF16.cpp: + +Change-Id: I876cf2b10b8c858c3d265113c062d159749a2f3e +git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +736e1d804d1efa2077c4f1fe0b9084927d82e249] --- Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- Source/WebCore/platform/text/icu/UTextProvider.h | 8 ++++---- .../platform/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- .../platform/text/icu/UTextProviderUTF16.cpp | 4 ++-- - 4 files changed, 14 insertions(+), 14 deletions(-) + 7 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp index dd6ff0675bb1..e0f4bd718828 100644 -- 2.25.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:52:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:52:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/4th: bump to version 3.64.0 Message-ID: <20220104205204.3632035-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/4th/4th.hash | 2 +- package/4th/4th.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/4th/4th.hash b/package/4th/4th.hash index 36d2941055..ae08a6bf5e 100644 --- a/package/4th/4th.hash +++ b/package/4th/4th.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f822f7dd8cfb0b1744a62d653c6efe933578ae1789ec60a088509a38bca4b4fc 4th-3.62.5-unix.tar.gz +sha256 c0905e92316c151224858fcfff21c143c85efa4f9f1b2ade3c64cfd988e0a6a8 4th-3.64.0-unix.tar.gz sha256 8c6111b645a02219579ea66e84aa8e78a0ed4f4dd80857ffb91bcda5528717d4 COPYING diff --git a/package/4th/4th.mk b/package/4th/4th.mk index aee59c463f..d031c0e4b4 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -4,7 +4,7 @@ # ################################################################################ -4TH_VERSION = 3.62.5 +4TH_VERSION = 3.64.0 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) 4TH_LICENSE = GPL-3.0+, LGPL-3.0+ -- 2.34.1 From james.hilliard1 at gmail.com Tue Jan 4 20:53:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 4 Jan 2022 14:53:24 -0600 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: bump to version 5.212.0-alpha4 In-Reply-To: References: <20220104074821.1330228-1-james.hilliard1@gmail.com> Message-ID: On Tue, Jan 4, 2022 at 12:33 PM Arnout Vandecappelle wrote: > > > > On 04/01/2022 08:48, James Hilliard wrote: > > Switch to latest release in new active upstream: > > https://github.com/qtwebkit/qtwebkit > > Perhaps you can push the remaining patch to upstream then? Oh, it's already upstream, switched to that version here: https://patchwork.ozlabs.org/project/buildroot/patch/20220104205213.1367539-1-james.hilliard1 at gmail.com/ > > > > > Migrate python2 build to python3. > > > > Drop patches that are upstream/no longer needed. > > > > Adapt/add patches to fix build issues. > > > > Rework build system to use cmake instead of qmake(which does not > > currently support cross compilation). > > > > Signed-off-by: James Hilliard > > [snip] > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > > index dd99661be0..3af1918a46 100644 > > --- a/package/qt5/qt5webkit/qt5webkit.mk > > +++ b/package/qt5/qt5webkit/qt5webkit.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5WEBKIT_VERSION = 5.9.1 > > -QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > > -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > > +QT5WEBKIT_VERSION = 5.212.0-alpha4 > > +QT5WEBKIT_SITE = https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$(QT5WEBKIT_VERSION) > > Upstream README says: > > Use the following repository if you need to get latest snapshots of QtWebKit code: > > http://code.qt.io/cgit/qt/qtwebkit.git/ > > This repo aslo has a 5.212.0-alpha4 tag. Perhaps we should switch to that? That repo has no recent activity and appears abandoned, the new upstream is a fork of that, also I didn't see a release tarball from qt organization(which seems to no longer maintain qtwebkit at all). > > Anyway, I applied to master as is. > > Regards, > Arnout > > > +QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz > > QT5WEBKIT_DEPENDENCIES = \ > > - host-bison host-flex host-gperf host-python host-ruby \ > > - leveldb sqlite > > + host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ > > + gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ > > + qt5sensors qt5webchannel sqlite webp woff2 > > QT5WEBKIT_INSTALL_STAGING = YES > > > > QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 > > @@ -20,30 +21,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > > > > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > > -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender > > +QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender > > endif > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5WEBKIT_DEPENDENCIES += qt5declarative > > endif > > > > -# QtWebkit's build system uses python, but only supports python2. We work > > -# around this by forcing python2 early in the PATH, via a python->python2 > > -# symlink. > > -QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) > > -QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) > > -define QT5WEBKIT_PYTHON2_SYMLINK > > - mkdir -p $(@D)/host-bin > > - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python > > -endef > > -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK > > +QT5WEBKIT_CONF_OPTS += \ > > + -DPORT=Qt \ > > + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > > + -DUSE_LIBHYPHEN=OFF > > > > -QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb > > - > > -define QT5WEBKIT_INSTALL_TARGET_EXTRAS > > - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ > > -endef > > - > > -QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS > > - > > -$(eval $(qmake-package)) > > +$(eval $(cmake-package)) > > From fontaine.fabrice at gmail.com Tue Jan 4 20:54:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:54:55 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/file: fix build with gcc 4.8 Message-ID: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 5.41 in commit d38b72bcd75392a88b5100839ac410859d0a6a79: readelf.c: In function 'do_auxv_note': readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode for (size_t off = 0; off + elsize <= descsz; off += elsize) { ^ Fixes: - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Set ac_cv_prog_c99 for host as already done for target instead of adding an upstreamable patch package/file/file.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/file/file.mk b/package/file/file.mk index 12647af8bb..62cec4b2c9 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -9,6 +9,7 @@ FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file HOST_FILE_DEPENDENCIES = host-zlib FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' +HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:57:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:57:46 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 Message-ID: <20220104205746.3633354-1-fontaine.fabrice@gmail.com> Drop patches (already in version) Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Drop second patch now that it has been applied .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 ----------------- ...-utils-text-scroller.cc-replace-uint.patch | 50 ------------------- .../rpi-rgb-led-matrix.hash | 2 +- .../rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 2 +- 4 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch delete mode 100644 package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch deleted file mode 100644 index f7a92f5fb2..0000000000 --- a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 -From: Grzegorz Blach -Date: Sat, 29 Aug 2020 20:48:57 +0200 -Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. - -This change allows additional flags to be added to the linker -from the command line. - -Signed-off-by: Grzegorz Blach ---- - utils/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/utils/Makefile b/utils/Makefile -index e751adc..e704442 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include - RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib - RGB_LIBRARY_NAME=rgbmatrix - RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a --LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread -+RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread - - # Imagemagic flags, only needed if actually compiled. - MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) -@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE - $(MAKE) -C $(RGB_LIBDIR) - - text-scroller: text-scroller.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) - - led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) -+ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) - - video-viewer: video-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) -+ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) - - %.o : %.cc - $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< --- -2.24.3 (Apple Git-128) - diff --git a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch deleted file mode 100644 index 627415bac8..0000000000 --- a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a56338db0f003d5236f2ce98c73a591d64a70852 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 22:57:11 +0100 -Subject: [PATCH] utils/text-scroller.cc: replace uint (#1383) - -Replace uint by uint64_t to avoid the following build failure on musl: - -text-scroller.cc: In function 'int main(int, char**)': -text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? - 220 | uint frame_counter = 0; - | ^~~~ - | rint - -Fixes: - - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/hzeller/rpi-rgb-led-matrix/commit/a56338db0f003d5236f2ce98c73a591d64a70852] ---- - utils/text-scroller.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/utils/text-scroller.cc b/utils/text-scroller.cc -index a64ba0c89..28d4f7182 100644 ---- a/utils/text-scroller.cc -+++ b/utils/text-scroller.cc -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -217,12 +218,12 @@ int main(int argc, char *argv[]) { - - struct timespec next_frame = {0, 0}; - -- uint frame_counter = 0; -+ uint64_t frame_counter = 0; - while (!interrupt_received && loops != 0) { - ++frame_counter; - offscreen_canvas->Fill(bg_color.r, bg_color.g, bg_color.b); - const bool draw_on_frame = (blink_on <= 0) -- || (frame_counter % (blink_on + blink_off) < (uint)blink_on); -+ || (frame_counter % (blink_on + blink_off) < (uint64_t)blink_on); - - if (draw_on_frame) { - if (outline_font) { diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash index 3b1cb5fd76..265e4c4249 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz +sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk index e436755121..499fb408c2 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 +RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 20:59:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 21:59:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/openipmi: fix musl build with libexecinfo Message-ID: <20220104205948.3633747-1-fontaine.fabrice@gmail.com> Disable execinfo to avoid the following musl build failure raised since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 Signed-off-by: Fabrice Fontaine --- ...igure.ac-add-without-execinfo-option.patch | 55 +++++++++++++++++++ package/openipmi/openipmi.mk | 1 + 2 files changed, 56 insertions(+) create mode 100644 package/openipmi/0002-configure.ac-add-without-execinfo-option.patch diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch new file mode 100644 index 0000000000..e1838a06f4 --- /dev/null +++ b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch @@ -0,0 +1,55 @@ +From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Jan 2022 23:27:21 +0100 +Subject: [PATCH] configure.ac: add --without-execinfo option + +Add an option to allow the user to disable execinfo to avoid the +following build failure on musl with +https://github.com/mikroskeem/libexecinfo: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' + +Fixes: + - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/openipmi/patches/36] +--- + configure.ac | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 607864b9..f369166f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, + POPTLIBS="$withval" + ) + ++tryexecinfo=yes ++AC_ARG_WITH(execinfo, ++[ --with-execinfo[[=yes|no]] Look for execinfo.], ++ if test "x$withval" = "xyes"; then ++ tryexecinfo=yes ++ elif test "x$withval" = "xno"; then ++ tryexecinfo=no ++ fi, ++) ++ + # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib + tryopenssl=yes + AC_ARG_WITH(openssl, +@@ -275,7 +285,9 @@ AM_PROG_CC_C_O + AC_PROG_LIBTOOL + AC_STDC_HEADERS + +-AC_CHECK_HEADERS(execinfo.h) ++if test "x$tryexecinfo" != "xno"; then ++ AC_CHECK_HEADERS(execinfo.h) ++fi + AC_CHECK_HEADERS([netinet/ether.h]) + AC_CHECK_HEADERS([sys/ethernet.h]) + +-- +2.34.1 + diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index ad2f2d2f4f..b3a4d90d4b 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,6 +15,7 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ + --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 21:07:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 22:07:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/qpdf: needs atomic Message-ID: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> qpdf needs atomic since bump to version 10.5.0 in commit b5352c2177011ca389cbb7c68e78447549cbdaaa and https://github.com/qpdf/qpdf/commit/c5c1a028cdd3cf345046c46963fb0fdacfb2c33c: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-2/output-1/build/qpdf-10.5.0/libqpdf/build/.libs/libqpdf.a(QPDF.o): in function `QPDF::QPDF()': QPDF.cc:(.text+0x48de): undefined reference to `__atomic_fetch_add_8' Fixes: - http://autobuild.buildroot.org/results/7e18689670dcbe491c35f0597e5c3c787936263f Signed-off-by: Fabrice Fontaine --- package/cups-filters/Config.in | 2 ++ package/qpdf/Config.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in index 32381e6c1f..ded99a4774 100644 --- a/package/cups-filters/Config.in +++ b/package/cups-filters/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qpdf + depends on BR2_TOOLCHAIN_HAS_ATOMIC # qpdf select BR2_PACKAGE_JPEG select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE @@ -33,6 +34,7 @@ config BR2_PACKAGE_CUPS_FILTERS comment "cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 5" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/qpdf/Config.in b/package/qpdf/Config.in index 047c4c8a75..accf2b5f34 100644 --- a/package/qpdf/Config.in +++ b/package/qpdf/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QPDF bool "qpdf" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_ZLIB select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL @@ -16,5 +17,6 @@ config BR2_PACKAGE_QPDF http://qpdf.sourceforge.net/ comment "qpdf needs a toolchain w/ C++, gcc >= 5" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 -- 2.34.1 From matthew.weber at collins.com Tue Jan 4 21:55:41 2022 From: matthew.weber at collins.com (Matthew Weber) Date: Tue, 4 Jan 2022 15:55:41 -0600 Subject: [Buildroot] [PATCH v9] package/freeradius-server: new package Message-ID: <20220104215541.23003-1-matthew.weber@collins.com> From: David GOUARIN FreeRADIUS is an open source server which implements a protocol for remote user Authorization, Authentication and Accounting. Signed-off-by: David GOUARIN Signed-off-by: Kalpesh Panchal Signed-off-by: Matt Weber --- Changes v8 -> v9: - A systemd unit is installed if systemd is enabled. The default provided by `freeradius-server/redhat/radiusd.service` was not used because of extra options not compatible with Buildroot. The unit is instead based on a simplified version of that upstream file. v7 -> v8: - added dependencies to include libpcap - version bump to 3.0.25 v6 -> v7 - resolve rlm_sql module compilation error (Newer GCC) (remove mysql_version.h as mysql.h is included) v5 -> v6: - cleaned up patches to all be git formatted - added depends on BR2_USE_MMU - rebased on master - added CPE info v4 -> v5: - better package patches formatting v3 -> v4: Taken in account Thomas review - fix build with BR2_COMPILER_PARANOID_UNSAFE_PATH - import patches inside package directory instead of downloading them - remove config.cache file, pass the answers on the command line instead - add comments for weird TARGET_DIR and R directives - remove broken python optional feature. Managed to get it to build with python 2.7, not 3.0 and it still fails basic testing v2 -> v3: - As suggested by Matt, merge with pending upstream patch. Included most of it, including patches based on Yocto work : http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files Didn't kept all the --without directive, as they do not seem useful, nor the custom INSTALL_TARGET_CMDS. v1 -> v2: - fix invalid characters in Config.in --- DEVELOPERS | 2 + package/Config.in | 1 + .../0001-jlibtool-cross-with-host-CC.patch | 33 +++ .../0002-avoid-searching-host-dirs.patch | 201 ++++++++++++++++++ ...3-configure.ac-add-option-for-libcap.patch | 74 +++++++ ...configure.ac-allow-cross-compilation.patch | 41 ++++ ...r-for-expansion-of-macro-in-thread.h.patch | 65 ++++++ ...dules-rlm_sql-remove-mysql_version.h.patch | 36 ++++ package/freeradius-server/Config.in | 21 ++ .../freeradius-server/freeradius-server.hash | 3 + .../freeradius-server/freeradius-server.mk | 124 +++++++++++ package/freeradius-server/radiusd.service | 38 ++++ 12 files changed, 639 insertions(+) create mode 100644 package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch create mode 100644 package/freeradius-server/0002-avoid-searching-host-dirs.patch create mode 100644 package/freeradius-server/0003-configure.ac-add-option-for-libcap.patch create mode 100644 package/freeradius-server/0004-configure.ac-allow-cross-compilation.patch create mode 100644 package/freeradius-server/0005-fix-error-for-expansion-of-macro-in-thread.h.patch create mode 100644 package/freeradius-server/0006-modules-rlm_sql-remove-mysql_version.h.patch create mode 100644 package/freeradius-server/Config.in create mode 100644 package/freeradius-server/freeradius-server.hash create mode 100644 package/freeradius-server/freeradius-server.mk create mode 100644 package/freeradius-server/radiusd.service diff --git a/DEVELOPERS b/DEVELOPERS index 37c792816a..095e711197 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -658,6 +658,7 @@ N: David du Colombier <0intro at gmail.com> F: package/x264/ N: David GOUARIN +F: package/freeradius-server/ F: package/librelp/ F: package/libtalloc/ @@ -1833,6 +1834,7 @@ F: package/ethtool/ F: package/flashbench/ F: package/fmc/ F: package/fmlib/ +F: package/freeradius-server/ F: package/git/ F: package/gnutls/ F: package/hostapd/ diff --git a/package/Config.in b/package/Config.in index 7148639735..a095f6c536 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2186,6 +2186,7 @@ endif source "package/flannel/Config.in" source "package/fmc/Config.in" source "package/fping/Config.in" + source "package/freeradius-server/Config.in" source "package/freeswitch/Config.in" source "package/freeswitch-mod-bcg729/Config.in" source "package/frr/Config.in" diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch new file mode 100644 index 0000000000..398f88e4ad --- /dev/null +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -0,0 +1,33 @@ +From 8a8506320acf3ea18940a6e3a447d7d394a3bd8e Mon Sep 17 00:00:00 2001 +From: David Gouarin +Date: Mon, 12 Apr 2021 11:05:54 -0500 +Subject: [PATCH] jlibtool cross with host CC + +jlibtool.c: while cross compiling, use host CC instead of target CC to build jlibtool + +Upstream: Not applicable + +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + scripts/libtool.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/libtool.mk b/scripts/libtool.mk +index 57915e1053..c28260dd7e 100644 +--- a/scripts/libtool.mk ++++ b/scripts/libtool.mk +@@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" + # binary! + ${JLIBTOOL}: ${top_makedir}/jlibtool.c + $(Q)mkdir -p $(dir $@) +- $(Q)echo CC jlibtool.c +- $(Q)${CC} $< -o $@ ++ $(Q)echo HOSTCC jlibtool.c ++ $(Q)${HOSTCC} $< -o $@ + + clean: jlibtool_clean + +-- +2.17.1 + diff --git a/package/freeradius-server/0002-avoid-searching-host-dirs.patch b/package/freeradius-server/0002-avoid-searching-host-dirs.patch new file mode 100644 index 0000000000..163f10346c --- /dev/null +++ b/package/freeradius-server/0002-avoid-searching-host-dirs.patch @@ -0,0 +1,201 @@ +From 1dcbfce955edb834c9bb619b5ca44b0d58959de2 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Mon, 4 Jan 2016 01:44:04 -0500 +Subject: [PATCH] avoid searching host dirs + +Don't search the hardcoded host dirs to avoid +host contamination. + +Upstream-Status: Inappropriate [cross-compile specific] + +Signed-off-by: Jackie Huang + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + acinclude.m4 | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 6 +++--- + src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 2 +- + src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- + 8 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index da48acc08a..b513ae10cf 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -178,7 +178,7 @@ if test "x$smart_lib" = "x"; then + FR_LOCATE_DIR(smart_lib_dir,[lib$1${libltdl_cv_shlibext}]) + FR_LOCATE_DIR(smart_lib_dir,[lib$1.a]) + +- for try in $smart_lib_dir /usr/local/lib /opt/lib; do ++ for try in $smart_lib_dir; do + AC_MSG_CHECKING([for $2 in -l$1 in $try]) + LIBS="-l$1 $old_LIBS" + CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" +@@ -218,7 +218,7 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` + old_CPPFLAGS="$CPPFLAGS" + smart_include= + dnl # The default directories we search in (in addition to the compilers search path) +-smart_include_dir="/usr/local/include /opt/include" ++smart_include_dir= + + dnl # Our local versions + _smart_try_dir= +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac +index 75c851a135..a262d71d1a 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac +@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then + esac]) + + dnl Check for SQLConnect in -ldb2 +- smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib" ++ smart_try_dir="$ibmdb2_lib_dir" + FR_SMART_CHECK_LIB(db2, SQLConnect) + if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then + fail="$fail libdb2" + fi + + dnl Check for sqlcli.h +- smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include" ++ smart_try_dir="$ibmdb2_include_dir" + FR_SMART_CHECK_INCLUDE(sqlcli.h) + if test "x$ac_cv_header_sqlcli_h" != xyes; then + fail="$fail sqlcli.h" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac +index 4da57b308e..752b043ffb 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac +@@ -56,14 +56,14 @@ if test x$with_[]modname != xno; then + esac]) + + dnl Check for isc_attach_database in -lfbclient +- smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib" ++ smart_try_dir="$firebird_lib_dir" + FR_SMART_CHECK_LIB(fbclient, isc_attach_database) + if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then + fail="$fail libfbclient" + fi + + dnl Check for ibase.h +- smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include" ++ smart_try_dir="$firebird_include_dir" + FR_SMART_CHECK_INCLUDE(ibase.h) + if test "x$ac_cv_header_ibase_h" != xyes; then + fail="$fail ibase.h" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac +index ba6304fdcd..3393557cdb 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac +@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then + esac]) + + dnl Check for SQLConnect in -liodbc +- smart_try_dir="$iodbc_lib_dir /usr/lib /usr/lib/iodbc /usr/local/lib/iodbc /usr/local/iodbc/lib/iodbc" ++ smart_try_dir="$iodbc_lib_dir" + FR_SMART_CHECK_LIB(iodbc, SQLConnect) + if test "x$ac_cv_lib_iodbc_SQLConnect" != xyes; then + fail="$fail libiodbc" + fi + + dnl Check for isql.h +- smart_try_dir="$iodbc_include_dir /usr/include /usr/include/iodbc /usr/local/iodbc/include" ++ smart_try_dir="$iodbc_include_dir" + FR_SMART_CHECK_INCLUDE(isql.h) + if test "x$ac_cv_header_isql_h" != xyes; then + fail="$fail isql.h" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac +index fbe57b6c1d..ac6caacf71 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac +@@ -136,7 +136,7 @@ if test x$with_[]modname != xno; then + + dnl # Check for libmysqlclient_r + if test "x$have_a_libmysqlclient" != "xyes"; then +- smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" ++ smart_try_dir="$mysql_lib_dir" + FR_SMART_CHECK_LIB(mysqlclient_r, mysql_init) + if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then + have_a_libmysqlclient='yes' +@@ -145,7 +145,7 @@ if test x$with_[]modname != xno; then + + dnl # Check for libmysqlclient + if test "x$have_a_libmysqlclient" != "xyes"; then +- smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" ++ smart_try_dir="$mysql_lib_dir" + FR_SMART_CHECK_LIB(mysqlclient, mysql_init) + if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then + have_a_libmysqlclient='yes' +@@ -239,7 +239,7 @@ if test x$with_[]modname != xno; then + fi + + if test "x$have_mysql_h" != "xyes"; then +- smart_try_dir="$mysql_include_dir /usr/local/include /usr/local/mysql/include" ++ smart_try_dir="$mysql_include_dir" + FR_SMART_CHECK_INCLUDE(mysql/mysql.h) + if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then + AC_DEFINE(HAVE_MYSQL_MYSQL_H, [], [Define if you have ]) +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +index 2a97fd6764..2b4a4baed4 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +@@ -64,7 +64,7 @@ if test x$with_[]modname != xno; then + dnl # Check for header files + dnl ############################################################ + +- smart_try_dir="$oracle_include_dir /usr/local/instaclient/include" ++ smart_try_dir="$oracle_include_dir" + + if test "x$ORACLE_HOME" != "x"; then + smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +index 4f9a890ba0..e1cf811ce8 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +@@ -41,7 +41,7 @@ if test x$with_[]modname != xno; then + esac ] + ) + +- smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql" ++ smart_try_dir="$rlm_sql_postgresql_include_dir" + FR_SMART_CHECK_INCLUDE(libpq-fe.h) + if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then + fail="$fail libpq-fe.h" +@@ -76,7 +76,7 @@ if test x$with_[]modname != xno; then + ]) + fi + +- smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib" ++ smart_try_dir="$rlm_sql_postgresql_lib_dir" + FR_SMART_CHECK_LIB(pq, PQconnectdb) + if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then + fail="$fail libpq" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac +index 35453879e3..c543ed4d51 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac +@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then + esac]) + + dnl Check for SQLConnect in -lodbc +- smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib" ++ smart_try_dir="$unixodbc_lib_dir" + FR_SMART_CHECK_LIB(odbc, SQLConnect) + if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then + fail="$fail libodbc" + fi + + dnl Check for sql.h +- smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include" ++ smart_try_dir="$unixodbc_include_dir" + FR_SMART_CHECK_INCLUDE(sql.h) + if test "x$ac_cv_header_sql_h" != xyes; then + fail="$fail sql.h" +-- +2.17.1 + diff --git a/package/freeradius-server/0003-configure.ac-add-option-for-libcap.patch b/package/freeradius-server/0003-configure.ac-add-option-for-libcap.patch new file mode 100644 index 0000000000..05137ec6a8 --- /dev/null +++ b/package/freeradius-server/0003-configure.ac-add-option-for-libcap.patch @@ -0,0 +1,74 @@ +From 404f18da62e3708c9b290ee4eaf8461911df5475 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 22 Aug 2019 10:50:21 +0800 +Subject: [PATCH] configure.ac: add option for libcap + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang +Signed-off-by: Changqing Li + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + configure.ac | 36 +++++++++++++++++++++++++++--------- + 1 file changed, 27 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c72511ab39..de016b28e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -941,6 +941,22 @@ fi + dnl Set by FR_SMART_CHECKLIB + LIBS="${old_LIBS}" + ++dnl # ++dnl # extra argument: --with-libcap ++dnl # ++WITH_LIBCAP=yes ++AC_ARG_WITH(libcap, ++[ --with-licap use licap for debugger checks. (default=yes)], ++[ case "$withval" in ++ no) ++ WITH_LIBCAP=no ++ ;; ++ *) ++ WITH_LIBCAP=yes ++ ;; ++ esac ] ++) ++ + dnl Check for cap + dnl extra argument: --with-cap-lib-dir=DIR + cap_lib_dir= +@@ -974,15 +990,17 @@ AC_ARG_WITH(cap-include-dir, + ;; + esac]) + +-smart_try_dir="$cap_lib_dir" +-FR_SMART_CHECK_LIB(cap, cap_get_proc) +-if test "x$ac_cv_lib_cap_cap_get_proc" != "xyes"; then +- AC_MSG_WARN([cap library not found, debugger checks will not be enabled. Use --with-cap-lib-dir=.]) +-else +- AC_DEFINE(HAVE_LIBCAP, 1, +- [Define to 1 if you have the `cap' library (-lcap).] +- ) +- HAVE_LIBCAP=1 ++if test "x$WITH_LIBCAP" = xyes; then ++ smart_try_dir="$cap_lib_dir" ++ FR_SMART_CHECK_LIB(cap, cap_get_proc) ++ if test "x$ac_cv_lib_cap_cap_get_proc" != "xyes"; then ++ AC_MSG_WARN([cap library not found, debugger checks will not be enabled. Use --with-cap-lib-dir=.]) ++ else ++ AC_DEFINE(HAVE_LIBCAP, 1, ++ [Define to 1 if you have the `cap' library (-lcap).] ++ ) ++ HAVE_LIBCAP=1 ++ fi + fi + + dnl # +-- +2.17.1 + diff --git a/package/freeradius-server/0004-configure.ac-allow-cross-compilation.patch b/package/freeradius-server/0004-configure.ac-allow-cross-compilation.patch new file mode 100644 index 0000000000..248a5f0e34 --- /dev/null +++ b/package/freeradius-server/0004-configure.ac-allow-cross-compilation.patch @@ -0,0 +1,41 @@ +From d6c1da041da77902a06d10bf03ef454468921801 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 24 Jul 2018 15:03:39 +0800 +Subject: [PATCH] configure.ac: allow cross-compilation + +The checking OpenSSL library and header version consistency will +always fail in cross compiling, skip the check and give a warning +instead for cross compiling. + +Upstream-Status: Inappropriate[embedded specific] + +Signed-off-by: Jackie Huang +Signed-off-by: Yi Zhao + +update to new version 3.0.17 to fix patch warning +Signed-off-by: Changqing Li + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + src/modules/rlm_krb5/configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac +index efc9f29d7f..98a97e438a 100644 +--- a/src/modules/rlm_krb5/configure.ac ++++ b/src/modules/rlm_krb5/configure.ac +@@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then + FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) + if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[return krb5_is_thread_safe() ? 0 : 1]])], +- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) ++ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], ++ [AC_MSG_WARN(cross compiling: not checking)]) + fi + else + krb5threadsafe="" +-- +2.17.1 + diff --git a/package/freeradius-server/0005-fix-error-for-expansion-of-macro-in-thread.h.patch b/package/freeradius-server/0005-fix-error-for-expansion-of-macro-in-thread.h.patch new file mode 100644 index 0000000000..cf6ad81a14 --- /dev/null +++ b/package/freeradius-server/0005-fix-error-for-expansion-of-macro-in-thread.h.patch @@ -0,0 +1,65 @@ +From dae3b7c53171dfeacce91e0da1c8bd4e4166352e Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Wed, 18 Jan 2017 14:59:39 +0800 +Subject: [PATCH] fix error for expansion of macro in thread.h + +The parameter declaration is missing in expansion of macro +which cause the build error: +| In file included from src/freeradius-devel/libradius.h:80:0, +| from src/lib/log.c:26: +| src/lib/log.c: In function '__fr_thread_local_destroy_fr_strerror_buffer': +| src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function) +| fr_thread_local_setup(char *, fr_strerror_buffer) /* macro */ +| ^ + +Add the missing declaration in macro. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + src/include/threads.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/include/threads.h b/src/include/threads.h +index e36d81dac0..2bcb6aadcb 100644 +--- a/src/include/threads.h ++++ b/src/include/threads.h +@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ + # define fr_thread_local_get(_n) _n + #elif defined(HAVE_PTHREAD_H) + # include +-# define fr_thread_local_setup(_t, _n) \ ++# define fr_thread_local_setup(_t, _n) static __thread _t _n;\ + static pthread_key_t __fr_thread_local_key_##_n;\ + static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ + static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ +@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\ + static void __fr_thread_local_key_init_##_n(void)\ + {\ + (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ +- (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ + }\ + static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ + {\ + __fr_thread_local_destructor_##_n = func;\ + if (_n) return _n; \ + (void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\ ++ (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ + return _n;\ + } +-# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) +-# define fr_thread_local_set(_n, _v) __fr_thread_local_set_##_n(_v) +-# define fr_thread_local_get(_n) __fr_thread_local_get_##_n() ++# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) ++# define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1)) ++# define fr_thread_local_get(_n) _n + #endif + #endif +-- +2.17.1 + diff --git a/package/freeradius-server/0006-modules-rlm_sql-remove-mysql_version.h.patch b/package/freeradius-server/0006-modules-rlm_sql-remove-mysql_version.h.patch new file mode 100644 index 0000000000..03f8ef8805 --- /dev/null +++ b/package/freeradius-server/0006-modules-rlm_sql-remove-mysql_version.h.patch @@ -0,0 +1,36 @@ +From 77b8c75f9904897768f87e20fef5d7739ddcd3c7 Mon Sep 17 00:00:00 2001 +From: Jared Bents +Date: Tue, 4 Feb 2020 08:22:11 -0600 +Subject: [PATCH] modules/rlm_sql: remove mysql_version.h + +remove mysql_version.h as mysql.h is included and mysql_version.h +should not be included by per the header file warning + +Upstream: http://lists.freeradius.org/pipermail/freeradius-devel/2021-April/014218.html + +Signed-off-by: Jared Bents +Signed-off-by: Matt Weber +--- + src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c +index a7992647cd..ea44d0cc7a 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c ++++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c +@@ -34,12 +34,10 @@ RCSID("$Id$") + #include "config.h" + + #ifdef HAVE_MYSQL_MYSQL_H +-# include + # include + # include + # include + #elif defined(HAVE_MYSQL_H) +-# include + # include + # include + # include +-- +2.17.1 + diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in new file mode 100644 index 0000000000..0f796e21d2 --- /dev/null +++ b/package/freeradius-server/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_FREERADIUS_SERVER + bool "freeradius-server" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_MMU + select BR2_PACKAGE_LIBTALLOC + help + FreeRADIUS is an open source server which implements + a protocol for remote user Authorization, Authentication + and Accounting. + + http://wiki.freeradius.org/ + +comment "freeradius-server needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +comment "freeradius-server needs a glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC + +comment "freeradius-server needs a target w/ MMU" + depends on !BR2_USE_MMU diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash new file mode 100644 index 0000000000..68f7e05435 --- /dev/null +++ b/package/freeradius-server/freeradius-server.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4883a68bb3cee46025359a97c1691ce655e8babfd6dc3c021d00e109a2ff4c10 freeradius-server-3.0.25.tar.gz +sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk new file mode 100644 index 0000000000..0c071a2378 --- /dev/null +++ b/package/freeradius-server/freeradius-server.mk @@ -0,0 +1,124 @@ +################################################################################ +# +# freeradius-server +# +################################################################################ + +FREERADIUS_SERVER_VERSION = 3.0.25 +FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius +FREERADIUS_SERVER_LICENSE = GPL-2.0 +FREERADIUS_SERVER_LICENSE_FILES = COPYRIGHT +FREERADIUS_SERVER_DEPENDENCIES = libtalloc + +# some compiler checks are not supported while cross compiling. +# instead of removing those checks, we cache the answers +FREERADIUS_SERVER_CONF_OPTS += \ + ax_cv_cc_bounded_attribute=no \ + ax_cv_cc_builtin_bswap64=no \ + ax_cv_cc_builtin_choose_expr=no \ + ax_cv_cc_builtin_types_compatible_p=no + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-libcap +FREERADIUS_SERVER_DEPENDENCIES += libcap +else +FREERADIUS_SERVER_CONF_OPTS += --without-libcap +endif + +ifeq ($(BR2_PACKAGE_LIBPCAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-libpcap +FREERADIUS_SERVER_DEPENDENCIES += libpcap +else +FREERADIUS_SERVER_CONF_OPTS += --without-libpcap +endif + +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_krb5 +FREERADIUS_SERVER_DEPENDENCIES += libkrb5 +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_krb5 +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_pam +FREERADIUS_SERVER_DEPENDENCIES += linux-pam +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_pam +endif + +ifeq ($(BR2_PACKAGE_OPENLDAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ldap +FREERADIUS_SERVER_DEPENDENCIES += openldap +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ldap +endif + +ifeq ($(BR2_PACKAGE_MYSQL),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_mysql +FREERADIUS_SERVER_DEPENDENCIES += mysql +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_mysql +endif + +ifeq ($(BR2_PACKAGE_SQLITE),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_sqlite +FREERADIUS_SERVER_DEPENDENCIES += sqlite +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_sqlite +endif + +ifeq ($(BR2_PACKAGE_UNIXODBC),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_unixodbc +FREERADIUS_SERVER_DEPENDENCIES += unixodbc +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_unixodbc +endif + +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_postgresql +FREERADIUS_SERVER_DEPENDENCIES += postgresql +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_postgresql +endif + +ifeq ($(BR2_PACKAGE_HAS_OPENSSL),y) +FREERADIUS_SERVER_DEPENDENCIES += openssl +FREERADIUS_SERVER_CONF_OPTS += --with-openssl +else +FREERADIUS_SERVER_CONF_OPTS += --without-openssl +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +FREERADIUS_SERVER_CONF_OPTS += --with-pcre +FREERADIUS_SERVER_DEPENDENCIES += pcre +else +FREERADIUS_SERVER_CONF_OPTS += --without-pcre +endif + +ifeq ($(BR2_PACKAGE_RUBY),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ruby +FREERADIUS_SERVER_DEPENDENCIES += ruby +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ruby +endif + +ifeq ($(BR2_INIT_SYSTEMD),y) +FREERADIUS_SERVER_CONF_OPTS += --with-systemd +FREERADIUS_SERVER_DEPENDENCIES += systemd +else +FREERADIUS_SERVER_CONF_OPTS += --without-systemd +endif + +# TARGET_DIR is set to empty to avoid creation of symlinks in hardcoded host directories +# freeradius Makefile does not support an alternate DESTDIR, instead it uses the magic $(R) variable +FREERADIUS_SERVER_MAKE_ENV = R=$(TARGET_DIR) TARGET_DIR="" + +# use MAKE1 because make install does not support parallel build +FREERADIUS_SERVER_MAKE = $(MAKE1) + +define FREERADIUS_SERVER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/freeradius-server/radiusd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/radiusd.service +endef + +$(eval $(autotools-package)) diff --git a/package/freeradius-server/radiusd.service b/package/freeradius-server/radiusd.service new file mode 100644 index 0000000000..a55bce62d3 --- /dev/null +++ b/package/freeradius-server/radiusd.service @@ -0,0 +1,38 @@ +# Reference from: freeradius-server/redhat/radiusd.service + +[Unit] +Description=FreeRADIUS multi-protocol policy server +After=network-online.target +Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ http://networkradius.com/doc/ + +[Service] +Type=notify +WatchdogSec=60 +NotifyAccess=all +EnvironmentFile=-/etc/sysconfig/radiusd + +# FreeRADIUS can do static evaluation of policy language rules based +# on environmental variables which is very useful for doing per-host +# customization. +# Unfortunately systemd does not allow variable substitutions such +# as %H or $(hostname) in the EnvironmentFile. +# We provide HOSTNAME here for convenience. +Environment=HOSTNAME=%H + +# Limit memory to 2G this is fine for %99.99 of deployments. FreeRADIUS +# is not memory hungry, if it's using more than this, then there's probably +# a leak somewhere. +MemoryLimit=2G + +ExecStartPre=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cx -lstdout +ExecStart=/usr/sbin/radiusd -f $FREERADIUS_OPTIONS +Restart=on-failure +RestartSec=5 +ExecReload=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cxm -lstdout +ExecReload=/bin/kill -HUP $MAINPID + +# Only allow native system calls +SystemCallArchitectures=native + +[Install] +WantedBy=multi-user.target -- 2.17.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:40 +0100 Subject: [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 Message-ID: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Add gcc >= 5 dependency because __builtin_add_overflow is unconditionally used since https://github.com/SELinuxProject/selinux/commit/0744fa4f533c765d0a704fe8aa7174a0f93eb7bc https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/checkpolicy/Config.in | 6 ++++-- package/libselinux/Config.in | 6 ++++-- package/libsepol/Config.in | 6 ++++-- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 2 +- package/refpolicy/Config.in | 6 ++++-- package/restorecond/Config.in | 5 +++-- package/selinux-python/Config.in | 8 ++++++++ package/semodule-utils/Config.in | 6 ++++-- package/setools/Config.in | 5 +++-- 10 files changed, 36 insertions(+), 16 deletions(-) diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in index ad769d22b7..6a1f22991d 100644 --- a/package/checkpolicy/Config.in +++ b/package/checkpolicy/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_CHECKPOLICY bool "checkpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_FLEX help @@ -13,5 +14,6 @@ config BR2_PACKAGE_CHECKPOLICY http://selinuxproject.org/page/Main_Page -comment "checkpolicy needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "checkpolicy needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 62070c8d59..348757abce 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSELINUX bool "libselinux" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC @@ -16,5 +17,6 @@ config BR2_PACKAGE_LIBSELINUX http://selinuxproject.org/page/Main_Page -comment "libselinux needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "libselinux needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 04af880e67..7516076cd5 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBSEPOL bool "libsepol" depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 help Libsepol is the binary policy manipulation library. It doesn't depend upon or use any of the other SELinux components. @@ -35,5 +36,6 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION endif -comment "libsepol needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libsepol needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index b273f982b6..039e4e3c7e 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz +sha256 2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b libsepol-3.3.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 55125f2203..8551a5de79 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.2 +LIBSEPOL_VERSION = 3.3 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index c529b85e1d..043cc40a72 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol # Even though libsepol is not necessary for building, we get # the policy version from libsepol, so we select it, and treat # it like a runtime dependency. @@ -113,5 +114,6 @@ endif endif -comment "refpolicy needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "refpolicy needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in index 31f85f2882..5e5567b213 100644 --- a/package/restorecond/Config.in +++ b/package/restorecond/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RESTORECOND depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBGLIB2 @@ -15,7 +16,7 @@ config BR2_PACKAGE_RESTORECOND https://github.com/SELinuxProject/selinux/wiki/Releases -comment "restorecond needs a toolchain w/ wchar, threads, dynamic library" +comment "restorecond needs a toolchain w/ wchar, threads, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 0f1c281777..6a518f97d4 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -17,6 +17,7 @@ if BR2_PACKAGE_SELINUX_PYTHON config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW bool "audit2allow" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol select BR2_PACKAGE_CHECKPOLICY select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN select BR2_PACKAGE_SEMODULE_UTILS @@ -29,13 +30,20 @@ config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW audit2why - translates SELinux audit messages into a description of why the access was denied (audit2allow -w) +comment "audit2allow needs a toolchain w/ gcc 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN bool "sepolgen" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol select BR2_PACKAGE_SEMODULE_UTILS help This package contains a Python module that allows you to generate an initial SELinux policy module template. +comment "sepolgen needs a toolchain w/ gcc 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + endif comment "selinux-python needs python3" diff --git a/package/semodule-utils/Config.in b/package/semodule-utils/Config.in index 38e043dc2c..5d98dc615f 100644 --- a/package/semodule-utils/Config.in +++ b/package/semodule-utils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SEMODULE_UTILS bool "semodule-utils" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL help semodule-utils is a package that contains tools for handling @@ -15,5 +16,6 @@ config BR2_PACKAGE_SEMODULE_UTILS https://github.com/SELinuxProject/selinux/wiki/Releases -comment "semodule-utils needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "semodule-utils needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/setools/Config.in b/package/setools/Config.in index 3ab7f55948..5a71672bdf 100644 --- a/package/setools/Config.in +++ b/package/setools/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_USE_WCHAR depends on BR2_USE_MMU depends on BR2_PACKAGE_PYTHON3 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX @@ -19,10 +20,10 @@ config BR2_PACKAGE_SETOOLS https://github.com/SELinuxProject/setools/ -comment "setools needs a toolchain w/ threads, wchar, dynamic library" +comment "setools needs a toolchain w/ threads, wchar, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "setools needs python3" depends on BR2_USE_MMU -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:41 +0100 Subject: [Buildroot] [PATCH 2/6] package/libselinux: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-2-fontaine.fabrice@gmail.com> - Drop third patch (already in version) - Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- ...s-getseuser.c-fix-build-with-gcc-4.8.patch | 47 ------------------- package/libselinux/libselinux.hash | 4 +- package/libselinux/libselinux.mk | 2 +- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch diff --git a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch b/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 645e84b236..0000000000 --- a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5c4ddfc88f0a7f10a5e9edddbdbe8e8ef1f9945e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Jun 2021 07:38:02 +0200 -Subject: [PATCH] libselinux/utils/getseuser.c: fix build with gcc 4.8 - -Fix the following build failure with gcc 4.8 which is raised since -version 3.2 and -https://github.com/SELinuxProject/selinux/commit/156dd0de5cad31e7d437c64e11a8aef027f0a691 - -getseuser.c:53:2: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < n; i++) - ^ - -Fixes: - - http://autobuild.buildroot.org/results/37eb0952a763256fbf6ef3c668f6c95fbdf2dd35 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/selinux/pull/289] ---- - libselinux/utils/getseuser.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/getseuser.c b/utils/getseuser.c -index ce1b7b27..34f2e887 100644 ---- a/utils/getseuser.c -+++ b/utils/getseuser.c -@@ -9,7 +9,7 @@ int main(int argc, char **argv) - { - char *seuser = NULL, *level = NULL; - char **contextlist; -- int rc, n; -+ int rc, n, i; - - if (argc != 3) { - fprintf(stderr, "usage: %s linuxuser fromcon\n", argv[0]); -@@ -50,7 +50,7 @@ int main(int argc, char **argv) - if (n == 0) - printf("no valid context found\n"); - -- for (int i = 0; i < n; i++) -+ for (i = 0; i < n; i++) - printf("Context %d\t%s\n", i, contextlist[i]); - - freeconary(contextlist); --- -2.30.2 - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 797b978ee1..a2e0083f7b 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161 libselinux-3.2.tar.gz +sha256 acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057 libselinux-3.3.tar.gz # Hash for license file -sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE +sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 0f36db1cfd..c1e90130d2 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.2 +LIBSELINUX_VERSION = 3.3 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:42 +0100 Subject: [Buildroot] [PATCH 3/6] package/libsemanage: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-3-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/libsemanage/libsemanage.hash | 4 ++-- package/libsemanage/libsemanage.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 117fd40d6a..1f333aac30 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 d722a55ca4fe2d4e2b30527720db657e6238b28079e69e2e4affeb8e733ee511 libsemanage-3.2.tar.gz +sha256 84d0ec5afa34bbbb471f602d8c1bf317d12443d07852a34b60741d428d597ce8 libsemanage-3.3.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index bbe976a2c9..db9f16bb6a 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.2 +LIBSEMANAGE_VERSION = 3.3 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:43 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:43 +0100 Subject: [Buildroot] [PATCH 4/6] package/checkpolicy: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-4-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/checkpolicy/checkpolicy.hash | 4 ++-- package/checkpolicy/checkpolicy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index c237913eaf..3586389047 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 9b1c81fa86fe3867842164448d90c8e7ea94b2987497809c65d4caa87a5c5bc8 checkpolicy-3.2.tar.gz +sha256 25c84edfa3a10ab8cb073b97bc55cb66377532d54a2723da9accdabd05431485 checkpolicy-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index f8ce48c175..af9a58cee8 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.2 +CHECKPOLICY_VERSION = 3.3 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:44 +0100 Subject: [Buildroot] [PATCH 5/6] package/restorecond: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-5-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/restorecond/restorecond.hash | 4 ++-- package/restorecond/restorecond.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 1869100188..b38c6dcf14 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 471c17e64aa6d7226e861d4d0125d15fdf9b38892c542be32bd83d999e5e75f5 restorecond-3.2.tar.gz +sha256 218c3d8873f31764e3c82d53ac713c0c9faaa07caf42ed7184e93ca2b27d8f27 restorecond-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 671f071b1d..7d6ed86f08 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTORECOND_VERSION = 3.2 +RESTORECOND_VERSION = 3.3 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 4 22:02:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 4 Jan 2022 23:02:45 +0100 Subject: [Buildroot] [PATCH 6/6] package/selinux-python: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220104220245.3706221-6-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/selinux-python/selinux-python.hash | 4 ++-- package/selinux-python/selinux-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 00c28b722c..93a28becdd 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz +sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.2.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 61ec7eb595..0cec602f3d 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.2 +SELINUX_PYTHON_VERSION = 3.3 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING -- 2.34.1 From yann.morin.1998 at free.fr Tue Jan 4 22:12:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 23:12:32 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: fix removed bootlin riscv64 toolchains Message-ID: <20220104220637.88C20832AD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9290c6ea591ec1280c9a526c412a6a2ecf33d2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 bootlin toolchains by RISC-V LP64D. However, Config.in.legacy was added for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE, which never existed (the stable version was only added after the switch to LP64D). Conversely, BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE, which was removed, was not mentioned in Config.in.legacy. Correct the symbol name and its comment in Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5994d94487..e5349e58ac 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,8 +153,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE The RISC-V 64-bit LP64 Bootlin toolchains have been removed, in favor of RISC-V 64-bit LP64D toolchains. -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE - bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE + bool "Bootlin riscv64 musl bleeding-edge toolchain removed" select BR2_LEGACY help The RISC-V 64-bit LP64 Bootlin toolchains have been removed, From yann.morin.1998 at free.fr Tue Jan 4 22:14:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 23:14:07 +0100 Subject: [Buildroot] [PATCH] Config.in.legacy: fix removed bootlin riscv64 toolchains In-Reply-To: <20220104171128.956397-1-arnout@mind.be> References: <20220104171128.956397-1-arnout@mind.be> Message-ID: <20220104221407.GC614810@scaer> Arnout, All, On 2022-01-04 18:11 +0100, Arnout Vandecappelle (Essensium/Mind) spake thusly: > commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 > bootlin toolchains by RISC-V LP64D. However, Config.in.legacy was added > for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE, which never > existed (the stable version was only added after the switch to LP64D). > Conversely, BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE, > which was removed, was not mentioned in Config.in.legacy. > > Correct the symbol name and its comment in Config.in.legacy. Thanks for spotting what I missed. How did you notice, so that I can add that to my check-list? > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Applied to master, thanks. Regards, Yann E. MORIN. > --- > Config.in.legacy | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 5994d94487..e5349e58ac 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -153,8 +153,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE > The RISC-V 64-bit LP64 Bootlin toolchains have been removed, > in favor of RISC-V 64-bit LP64D toolchains. > > -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE > - bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" > +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE > + bool "Bootlin riscv64 musl bleeding-edge toolchain removed" > select BR2_LEGACY > help > The RISC-V 64-bit LP64 Bootlin toolchains have been removed, > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 4 22:15:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 4 Jan 2022 23:15:51 +0100 Subject: [Buildroot] [PATCH 1/1] support/config-fragments/autobuild: fix riscv64 toolchain configs In-Reply-To: References: <20220101213948.265173-1-ju.o@free.fr> Message-ID: <20220104221551.GD614810@scaer> Arnout, All, On 2022-01-04 18:16 +0100, Arnout Vandecappelle spake thusly: > On 01/01/2022 22:39, Julien Olivain wrote: > >commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 > >toolchains by RISC-V LP64D. The config symbols > >BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE and > >BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE were marked as legacy. > >Those changes were not reflected in the autobuild toolchain configs in > >support/config-fragments/autobuild/bootlin-riscv64-{glibc,musl}.config > > > >When testing a package with the command: > > > > ./utils/test-pkg --all --package somepackage > > > >bootlin-riscv64-{glibc,musl} toolchain are always skipped. The build > >logfile contains: > > > > [...] > > Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN not in final .config > > Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > > Actual value: > > > > Value requested for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE not in final .config > > Requested value: BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y > > Actual value: # BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE is not set > > > >This commit update the autobuild config fragments for RISC-V 64bit > >toolchains so they can be used by test-pkg. > > > >Signed-off-by: Julien Olivain > > Applied to master, thanks. > > While reviewing this, I noticed that > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE in fact never existed, > so I sent a patch to fix that as well [1]. Unfortunately, I forgot to Cc > Thomas on that, so Thomas consider yourself CCed now :-) Ah, I see how you noticed that issue, now. Regards, Yann E. MORIN. > Regards, > Arnout > > > >--- > > .../config-fragments/autobuild/bootlin-riscv64-glibc.config | 4 ++-- > > .../config-fragments/autobuild/bootlin-riscv64-musl.config | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > >diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > >index f6c6fcaa36..433a6e89f7 100644 > >--- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > >+++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config > >@@ -1,5 +1,5 @@ > > BR2_riscv=y > >-BR2_RISCV_ABI_LP64=y > >+BR2_RISCV_ABI_LP64D=y > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > >-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y > >+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y > >diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config > >index 2b6a6e56da..fee1f29f4a 100644 > >--- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config > >+++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config > >@@ -1,4 +1,4 @@ > > BR2_riscv=y > >-BR2_RISCV_ABI_LP64=y > >+BR2_RISCV_ABI_LP64D=y > > BR2_TOOLCHAIN_EXTERNAL=y > >-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y > >+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From f.fainelli at gmail.com Tue Jan 4 23:05:22 2022 From: f.fainelli at gmail.com (Florian Fainelli) Date: Tue, 4 Jan 2022 15:05:22 -0800 Subject: [Buildroot] [PATCH] package/elfutils: bump to version 0.186 Message-ID: <20220104230522.1433670-1-florian.fainelli@broadcom.com> From: Florian Fainelli https://sourceware.org/pipermail/elfutils-devel/2021q4/004346.html Signed-off-by: Florian Fainelli --- package/elfutils/elfutils.hash | 4 ++-- package/elfutils/elfutils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index 9148758e29f4..3274b3265081 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,5 +1,5 @@ -# From https://sourceware.org/elfutils/ftp/0.184/sha512.sum -sha512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8 elfutils-0.184.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.186/sha512.sum +sha512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78 elfutils-0.186.tar.bz2 # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index c64224a90f87..8116ae597241 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.184 +ELFUTILS_VERSION = 0.186 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES -- 2.25.1 From who+buildroot at cnackers.org Wed Jan 5 00:12:20 2022 From: who+buildroot at cnackers.org (Erik Larsson) Date: Wed, 05 Jan 2022 01:12:20 +0100 Subject: [Buildroot] [PATCH 3/3] package/tpm2-tools: add option for enabling FAPI tools In-Reply-To: References: <20220101223900.2970405-1-who+buildroot@cnackers.org> <20220101223900.2970405-3-who+buildroot@cnackers.org> Message-ID: <0ddf26619d1ef9d2df5d3c9de58ba91453b1a91b.camel@cnackers.org> On Tue, 2022-01-04 at 18:52 +0100, Arnout Vandecappelle wrote: > > On 01/01/2022 23:39, Erik Larsson wrote: > > Signed-off-by: Erik Larsson > > --- > > package/tpm2-tools/Config.in | 11 +++++++++++ > > package/tpm2-tools/tpm2-tools.mk | 6 ++++++ > > 2 files changed, 17 insertions(+) > > > > diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in > > index 1a6698570a..cb3eb2b0a5 100644 > > --- a/package/tpm2-tools/Config.in > > +++ b/package/tpm2-tools/Config.in > > @@ -21,6 +21,17 @@ config BR2_PACKAGE_TPM2_TOOLS > > > > https://github.com/tpm2-software/tpm2-tools > > > > +if BR2_PACKAGE_TPM2_TOOLS > > + > > +config BR2_PACKAGE_TPM2_TOOLS_FAPI > > + bool "tpm2-tools fapi support" > > + select BR2_PACKAGE_TPM2_TSS_FAPI > > + help > > + This option enables Feature API (FAPI) support in tpm2-tools. > > + The FAPI tools are prefixed with tss2_. > > + > > +endif > > + > > comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" > > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > > !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) > > diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk > > index df5fbbfff4..6894be195f 100644 > > --- a/package/tpm2-tools/tpm2-tools.mk > > +++ b/package/tpm2-tools/tpm2-tools.mk > > @@ -22,4 +22,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening > > # do not build man pages > > TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' > > > > +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) > > Does this optoin make a big difference in size? If not, we'd normally make it > an automatic option, i.e. > > ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) > > (and remove the Config.in option). The size difference is minimal (about 100K). The FAPI tools are enabled automatically if tss2-fapi is available, so I think this patch can be skipped in that case. /Erik > > Regards, > Arnout > > > +TPM2_TOOLS_CONF_OPTS += --enable-fapi > > +else > > +TPM2_TOOLS_CONF_OPTS += --disable-fapi > > +endif > > + > > $(eval $(autotools-package)) > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Wed Jan 5 07:39:01 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 05 Jan 2022 07:39:01 +0000 Subject: [Buildroot] [Bug 14501] New: lttng-modules v2.11 package fails to build Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 Bug ID: 14501 Summary: lttng-modules v2.11 package fails to build Product: buildroot Version: 2021.05 Hardware: All OS: Linux Status: NEW Severity: blocker Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: sreedharmahadevan at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Hello, I am not able to successfully build the lttng-modules package with Buildroot v2021.05. I get the following syntax errors: output/build/lttng-modules-2.11.0/./probes/../instrumentation/events/lttng-module/timer.h:313:41: error: invalid use of undefined type ?const struct itimerval? 313 | ctf_integer(long, interval_usec, value->it_interval.tv_usec) | ^~ output/build/lttng-modules-2.11.0/./lib/../lib/ringbuffer/frontend.h:82:6: error: implicit declaration of function ?smp_read_barrier_depends? [-Werror=implicit-function-declaration] 82 | smp_read_barrier_depends(); (cpu) < nr_cpu_ids; });) | ^~~~~~~~~~~~~~~~~~~~~~~~ /output/build/lttng-modules-2.11.0/./lib/../wrapper/trace-clock.h:168:3: error: implicit declaration of function ?read_barrier_depends? [-Werror=implicit-function-declaration] 168 | read_barrier_depends(); /* load ltc before content */ | ^~~~~~~~~~~~~~~~~~~~ The errors look mostly syntactical and is replicated with a fresh clone of v2021.08, v2021.11, v2020.05, v2020.08 also. The lttng-tools and lttng-babeltrace packages build without issues but the moment lttng-modules is selected and built, it fails. Is this issue known already? Are there any solutions for it? -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Wed Jan 5 07:54:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 08:54:40 +0100 Subject: [Buildroot] [PATCH] Config.in.legacy: fix removed bootlin riscv64 toolchains In-Reply-To: <20220104171128.956397-1-arnout@mind.be> References: <20220104171128.956397-1-arnout@mind.be> Message-ID: <20220105085440.6581a038@windsurf> Hello Arnout, On Tue, 4 Jan 2022 18:11:28 +0100 "Arnout Vandecappelle (Essensium/Mind)" wrote: > commit b3c66481e1f1503fcbf193d0c780271e880ad500 replaced RISC-V LP64 > bootlin toolchains by RISC-V LP64D. However, Config.in.legacy was added > for BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_STABLE, which never > existed (the stable version was only added after the switch to LP64D). > Conversely, BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE, > which was removed, was not mentioned in Config.in.legacy. > > Correct the symbol name and its comment in Config.in.legacy. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > Config.in.legacy | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Too late, but: Acked-by: Thomas Petazzoni Thanks for fixing this! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 5 09:20:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:20:29 +0100 Subject: [Buildroot] [git commit] package/elfutils: bump to version 0.186 Message-ID: <20220105091431.BD89382DD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eea674afbf5b437af3d31cc9fc003768cdde3e8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://sourceware.org/pipermail/elfutils-devel/2021q4/004346.html Signed-off-by: Florian Fainelli Signed-off-by: Yann E. MORIN --- package/elfutils/elfutils.hash | 4 ++-- package/elfutils/elfutils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index 9148758e29..3274b32650 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,5 +1,5 @@ -# From https://sourceware.org/elfutils/ftp/0.184/sha512.sum -sha512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8 elfutils-0.184.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.186/sha512.sum +sha512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78 elfutils-0.186.tar.bz2 # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index c64224a90f..8116ae5972 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.184 +ELFUTILS_VERSION = 0.186 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Jan 5 09:21:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:21:30 +0100 Subject: [Buildroot] [PATCH] package/elfutils: bump to version 0.186 In-Reply-To: <20220104230522.1433670-1-florian.fainelli@broadcom.com> References: <20220104230522.1433670-1-florian.fainelli@broadcom.com> Message-ID: <20220105092130.GE614810@scaer> Florian, All, On 2022-01-04 15:05 -0800, Florian Fainelli spake thusly: > From: Florian Fainelli > > https://sourceware.org/pipermail/elfutils-devel/2021q4/004346.html > > Signed-off-by: Florian Fainelli Applied to master, thanks. > --- > package/elfutils/elfutils.hash | 4 ++-- > package/elfutils/elfutils.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash > index 9148758e29f4..3274b3265081 100644 > --- a/package/elfutils/elfutils.hash > +++ b/package/elfutils/elfutils.hash > @@ -1,5 +1,5 @@ > -# From https://sourceware.org/elfutils/ftp/0.184/sha512.sum > -sha512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8 elfutils-0.184.tar.bz2 > +# From https://sourceware.org/elfutils/ftp/0.186/sha512.sum > +sha512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78 elfutils-0.186.tar.bz2 > # Locally calculated > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 > diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk > index c64224a90f87..8116ae597241 100644 > --- a/package/elfutils/elfutils.mk > +++ b/package/elfutils/elfutils.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELFUTILS_VERSION = 0.184 > +ELFUTILS_VERSION = 0.186 > ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 > ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) > ELFUTILS_INSTALL_STAGING = YES > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 5 09:29:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:52 +0100 Subject: [Buildroot] [git commit] package/checkpolicy: bump to version 3.3 Message-ID: <20220105092630.5016E82DD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75cfeb7c6fa80022ebb5ea332d7e466b3eb14e6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/checkpolicy/checkpolicy.hash | 4 ++-- package/checkpolicy/checkpolicy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index c237913eaf..3586389047 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 9b1c81fa86fe3867842164448d90c8e7ea94b2987497809c65d4caa87a5c5bc8 checkpolicy-3.2.tar.gz +sha256 25c84edfa3a10ab8cb073b97bc55cb66377532d54a2723da9accdabd05431485 checkpolicy-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index f8ce48c175..af9a58cee8 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.2 +CHECKPOLICY_VERSION = 3.3 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Jan 5 09:29:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:50 +0100 Subject: [Buildroot] [git commit] package/libsemanage: bump to version 3.3 Message-ID: <20220105092630.47147832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d43956f91d875d671c2563ba143fe71dabdbbff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsemanage/libsemanage.hash | 4 ++-- package/libsemanage/libsemanage.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 117fd40d6a..1f333aac30 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 d722a55ca4fe2d4e2b30527720db657e6238b28079e69e2e4affeb8e733ee511 libsemanage-3.2.tar.gz +sha256 84d0ec5afa34bbbb471f602d8c1bf317d12443d07852a34b60741d428d597ce8 libsemanage-3.3.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index bbe976a2c9..db9f16bb6a 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.2 +LIBSEMANAGE_VERSION = 3.3 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Jan 5 09:29:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:55 +0100 Subject: [Buildroot] [git commit] package/restorecond: bump to version 3.3 Message-ID: <20220105092630.5907083236@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6282553e764939bbe665fd0bafc46eca31dff51b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/restorecond/restorecond.hash | 4 ++-- package/restorecond/restorecond.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 1869100188..b38c6dcf14 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 471c17e64aa6d7226e861d4d0125d15fdf9b38892c542be32bd83d999e5e75f5 restorecond-3.2.tar.gz +sha256 218c3d8873f31764e3c82d53ac713c0c9faaa07caf42ed7184e93ca2b27d8f27 restorecond-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 671f071b1d..7d6ed86f08 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTORECOND_VERSION = 3.2 +RESTORECOND_VERSION = 3.3 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Jan 5 09:29:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:48 +0100 Subject: [Buildroot] [git commit] package/libselinux: bump to version 3.3 Message-ID: <20220105092630.3E12C83236@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75a4ab2e8708e118576326c026a4f98a924f31ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop third patch (already in version) - Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-utils-getseuser.c-fix-build-with-gcc-4.8.patch | 47 ---------------------- package/libselinux/libselinux.hash | 4 +- package/libselinux/libselinux.mk | 2 +- 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch b/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 645e84b236..0000000000 --- a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5c4ddfc88f0a7f10a5e9edddbdbe8e8ef1f9945e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Jun 2021 07:38:02 +0200 -Subject: [PATCH] libselinux/utils/getseuser.c: fix build with gcc 4.8 - -Fix the following build failure with gcc 4.8 which is raised since -version 3.2 and -https://github.com/SELinuxProject/selinux/commit/156dd0de5cad31e7d437c64e11a8aef027f0a691 - -getseuser.c:53:2: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < n; i++) - ^ - -Fixes: - - http://autobuild.buildroot.org/results/37eb0952a763256fbf6ef3c668f6c95fbdf2dd35 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/selinux/pull/289] ---- - libselinux/utils/getseuser.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/getseuser.c b/utils/getseuser.c -index ce1b7b27..34f2e887 100644 ---- a/utils/getseuser.c -+++ b/utils/getseuser.c -@@ -9,7 +9,7 @@ int main(int argc, char **argv) - { - char *seuser = NULL, *level = NULL; - char **contextlist; -- int rc, n; -+ int rc, n, i; - - if (argc != 3) { - fprintf(stderr, "usage: %s linuxuser fromcon\n", argv[0]); -@@ -50,7 +50,7 @@ int main(int argc, char **argv) - if (n == 0) - printf("no valid context found\n"); - -- for (int i = 0; i < n; i++) -+ for (i = 0; i < n; i++) - printf("Context %d\t%s\n", i, contextlist[i]); - - freeconary(contextlist); --- -2.30.2 - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 797b978ee1..a2e0083f7b 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161 libselinux-3.2.tar.gz +sha256 acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057 libselinux-3.3.tar.gz # Hash for license file -sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE +sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 0f36db1cfd..c1e90130d2 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.2 +LIBSELINUX_VERSION = 3.3 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Jan 5 09:32:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:32:15 +0100 Subject: [Buildroot] [git commit] package/selinux-python: bump to version 3.3 Message-ID: <20220105092630.619A4832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a478b17ae4c67b7d9282daf3db3af6b7917587c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/selinux-python/selinux-python.hash | 4 ++-- package/selinux-python/selinux-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 00c28b722c..6ada3fee36 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz +sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 61ec7eb595..0cec602f3d 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.2 +SELINUX_PYTHON_VERSION = 3.3 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Jan 5 09:29:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:29:45 +0100 Subject: [Buildroot] [git commit] package/libsepol: bump to version 3.3 Message-ID: <20220105092630.3547782DD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56d9b887685c86fd4fbadda247cdbe733d499e81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add gcc >= 5 dependency because __builtin_add_overflow is unconditionally used since https://github.com/SELinuxProject/selinux/commit/0744fa4f533c765d0a704fe8aa7174a0f93eb7bc https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/checkpolicy/Config.in | 6 ++++-- package/libselinux/Config.in | 6 ++++-- package/libsepol/Config.in | 6 ++++-- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 2 +- package/refpolicy/Config.in | 6 ++++-- package/restorecond/Config.in | 5 +++-- package/selinux-python/Config.in | 8 ++++++++ package/semodule-utils/Config.in | 6 ++++-- package/setools/Config.in | 5 +++-- 10 files changed, 36 insertions(+), 16 deletions(-) diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in index ad769d22b7..6a1f22991d 100644 --- a/package/checkpolicy/Config.in +++ b/package/checkpolicy/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_CHECKPOLICY bool "checkpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_FLEX help @@ -13,5 +14,6 @@ config BR2_PACKAGE_CHECKPOLICY http://selinuxproject.org/page/Main_Page -comment "checkpolicy needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "checkpolicy needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 62070c8d59..348757abce 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSELINUX bool "libselinux" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC @@ -16,5 +17,6 @@ config BR2_PACKAGE_LIBSELINUX http://selinuxproject.org/page/Main_Page -comment "libselinux needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "libselinux needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 04af880e67..7516076cd5 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBSEPOL bool "libsepol" depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 help Libsepol is the binary policy manipulation library. It doesn't depend upon or use any of the other SELinux components. @@ -35,5 +36,6 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION endif -comment "libsepol needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libsepol needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index b273f982b6..039e4e3c7e 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz +sha256 2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b libsepol-3.3.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 55125f2203..8551a5de79 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.2 +LIBSEPOL_VERSION = 3.3 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index c529b85e1d..043cc40a72 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol # Even though libsepol is not necessary for building, we get # the policy version from libsepol, so we select it, and treat # it like a runtime dependency. @@ -113,5 +114,6 @@ endif endif -comment "refpolicy needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "refpolicy needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in index 31f85f2882..5e5567b213 100644 --- a/package/restorecond/Config.in +++ b/package/restorecond/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RESTORECOND depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBGLIB2 @@ -15,7 +16,7 @@ config BR2_PACKAGE_RESTORECOND https://github.com/SELinuxProject/selinux/wiki/Releases -comment "restorecond needs a toolchain w/ wchar, threads, dynamic library" +comment "restorecond needs a toolchain w/ wchar, threads, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in index 0f1c281777..6a518f97d4 100644 --- a/package/selinux-python/Config.in +++ b/package/selinux-python/Config.in @@ -17,6 +17,7 @@ if BR2_PACKAGE_SELINUX_PYTHON config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW bool "audit2allow" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol select BR2_PACKAGE_CHECKPOLICY select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN select BR2_PACKAGE_SEMODULE_UTILS @@ -29,13 +30,20 @@ config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW audit2why - translates SELinux audit messages into a description of why the access was denied (audit2allow -w) +comment "audit2allow needs a toolchain w/ gcc 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN bool "sepolgen" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol select BR2_PACKAGE_SEMODULE_UTILS help This package contains a Python module that allows you to generate an initial SELinux policy module template. +comment "sepolgen needs a toolchain w/ gcc 5" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + endif comment "selinux-python needs python3" diff --git a/package/semodule-utils/Config.in b/package/semodule-utils/Config.in index 38e043dc2c..5d98dc615f 100644 --- a/package/semodule-utils/Config.in +++ b/package/semodule-utils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SEMODULE_UTILS bool "semodule-utils" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL help semodule-utils is a package that contains tools for handling @@ -15,5 +16,6 @@ config BR2_PACKAGE_SEMODULE_UTILS https://github.com/SELinuxProject/selinux/wiki/Releases -comment "semodule-utils needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "semodule-utils needs a toolchain w/ threads, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/setools/Config.in b/package/setools/Config.in index 3ab7f55948..5a71672bdf 100644 --- a/package/setools/Config.in +++ b/package/setools/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_USE_WCHAR depends on BR2_USE_MMU depends on BR2_PACKAGE_PYTHON3 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX @@ -19,10 +20,10 @@ config BR2_PACKAGE_SETOOLS https://github.com/SELinuxProject/setools/ -comment "setools needs a toolchain w/ threads, wchar, dynamic library" +comment "setools needs a toolchain w/ threads, wchar, dynamic library, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "setools needs python3" depends on BR2_USE_MMU From yann.morin.1998 at free.fr Wed Jan 5 09:33:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:33:08 +0100 Subject: [Buildroot] [PATCH 6/6] package/selinux-python: bump to version 3.3 In-Reply-To: <20220104220245.3706221-6-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> <20220104220245.3706221-6-fontaine.fabrice@gmail.com> Message-ID: <20220105093308.GF614810@scaer> Fabrice, All, On 2022-01-04 23:02 +0100, Fabrice Fontaine spake thusly: > Update indentation in hash file (two spaces) > > https://github.com/SELinuxProject/selinux/releases/tag/3.3 > > Signed-off-by: Fabrice Fontaine > --- > package/selinux-python/selinux-python.hash | 4 ++-- > package/selinux-python/selinux-python.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash > index 00c28b722c..93a28becdd 100644 > --- a/package/selinux-python/selinux-python.hash > +++ b/package/selinux-python/selinux-python.hash > @@ -1,5 +1,5 @@ > # https://github.com/SELinuxProject/selinux/wiki/Releases > -sha256 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz > +sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.2.tar.gz You did update the hash, but forgot to update the version. ;-) Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > # Hash for license file > -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING > +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING > diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk > index 61ec7eb595..0cec602f3d 100644 > --- a/package/selinux-python/selinux-python.mk > +++ b/package/selinux-python/selinux-python.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SELINUX_PYTHON_VERSION = 3.2 > +SELINUX_PYTHON_VERSION = 3.3 > SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) > SELINUX_PYTHON_LICENSE = GPL-2.0 > SELINUX_PYTHON_LICENSE_FILES = COPYING > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 5 09:33:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 10:33:28 +0100 Subject: [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 In-Reply-To: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> References: <20220104220245.3706221-1-fontaine.fabrice@gmail.com> Message-ID: <20220105093328.GG614810@scaer> Fabrice, All, On 2022-01-04 23:02 +0100, Fabrice Fontaine spake thusly: > Add gcc >= 5 dependency because __builtin_add_overflow is > unconditionally used since > https://github.com/SELinuxProject/selinux/commit/0744fa4f533c765d0a704fe8aa7174a0f93eb7bc > > https://github.com/SELinuxProject/selinux/releases/tag/3.3 > > Signed-off-by: Fabrice Fontaine Series of 6 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/checkpolicy/Config.in | 6 ++++-- > package/libselinux/Config.in | 6 ++++-- > package/libsepol/Config.in | 6 ++++-- > package/libsepol/libsepol.hash | 2 +- > package/libsepol/libsepol.mk | 2 +- > package/refpolicy/Config.in | 6 ++++-- > package/restorecond/Config.in | 5 +++-- > package/selinux-python/Config.in | 8 ++++++++ > package/semodule-utils/Config.in | 6 ++++-- > package/setools/Config.in | 5 +++-- > 10 files changed, 36 insertions(+), 16 deletions(-) > > diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in > index ad769d22b7..6a1f22991d 100644 > --- a/package/checkpolicy/Config.in > +++ b/package/checkpolicy/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_CHECKPOLICY > bool "checkpolicy" > depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux > depends on !BR2_STATIC_LIBS # libselinux > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol > select BR2_PACKAGE_LIBSELINUX > select BR2_PACKAGE_FLEX > help > @@ -13,5 +14,6 @@ config BR2_PACKAGE_CHECKPOLICY > > http://selinuxproject.org/page/Main_Page > > -comment "checkpolicy needs a toolchain w/ threads, dynamic library" > - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > +comment "checkpolicy needs a toolchain w/ threads, dynamic library, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in > index 62070c8d59..348757abce 100644 > --- a/package/libselinux/Config.in > +++ b/package/libselinux/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSELINUX > bool "libselinux" > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol > select BR2_PACKAGE_LIBSEPOL > select BR2_PACKAGE_PCRE > select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC > @@ -16,5 +17,6 @@ config BR2_PACKAGE_LIBSELINUX > > http://selinuxproject.org/page/Main_Page > > -comment "libselinux needs a toolchain w/ threads, dynamic library" > - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > +comment "libselinux needs a toolchain w/ threads, dynamic library, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in > index 04af880e67..7516076cd5 100644 > --- a/package/libsepol/Config.in > +++ b/package/libsepol/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_LIBSEPOL > bool "libsepol" > depends on BR2_TOOLCHAIN_HAS_THREADS # pthread > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 > help > Libsepol is the binary policy manipulation library. It doesn't > depend upon or use any of the other SELinux components. > @@ -35,5 +36,6 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION > > endif > > -comment "libsepol needs a toolchain w/ threads" > - depends on !BR2_TOOLCHAIN_HAS_THREADS > +comment "libsepol needs a toolchain w/ threads, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash > index b273f982b6..039e4e3c7e 100644 > --- a/package/libsepol/libsepol.hash > +++ b/package/libsepol/libsepol.hash > @@ -1,5 +1,5 @@ > # From: https://github.com/SELinuxProject/selinux/wiki/Releases > -sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz > +sha256 2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b libsepol-3.3.tar.gz > > # Hash for license file > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk > index 55125f2203..8551a5de79 100644 > --- a/package/libsepol/libsepol.mk > +++ b/package/libsepol/libsepol.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSEPOL_VERSION = 3.2 > +LIBSEPOL_VERSION = 3.3 > LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) > LIBSEPOL_LICENSE = LGPL-2.1+ > LIBSEPOL_LICENSE_FILES = COPYING > diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in > index c529b85e1d..043cc40a72 100644 > --- a/package/refpolicy/Config.in > +++ b/package/refpolicy/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_REFPOLICY > bool "refpolicy" > depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol > # Even though libsepol is not necessary for building, we get > # the policy version from libsepol, so we select it, and treat > # it like a runtime dependency. > @@ -113,5 +114,6 @@ endif > > endif > > -comment "refpolicy needs a toolchain w/ threads" > - depends on !BR2_TOOLCHAIN_HAS_THREADS > +comment "refpolicy needs a toolchain w/ threads, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in > index 31f85f2882..5e5567b213 100644 > --- a/package/restorecond/Config.in > +++ b/package/restorecond/Config.in > @@ -4,6 +4,7 @@ config BR2_PACKAGE_RESTORECOND > depends on BR2_USE_WCHAR # libglib2 > depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 > depends on !BR2_STATIC_LIBS # libselinux > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol > select BR2_PACKAGE_DBUS > select BR2_PACKAGE_DBUS_GLIB > select BR2_PACKAGE_LIBGLIB2 > @@ -15,7 +16,7 @@ config BR2_PACKAGE_RESTORECOND > > https://github.com/SELinuxProject/selinux/wiki/Releases > > -comment "restorecond needs a toolchain w/ wchar, threads, dynamic library" > +comment "restorecond needs a toolchain w/ wchar, threads, dynamic library, gcc >= 5" > depends on BR2_USE_MMU > depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ > - BR2_STATIC_LIBS > + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in > index 0f1c281777..6a518f97d4 100644 > --- a/package/selinux-python/Config.in > +++ b/package/selinux-python/Config.in > @@ -17,6 +17,7 @@ if BR2_PACKAGE_SELINUX_PYTHON > > config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW > bool "audit2allow" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol > select BR2_PACKAGE_CHECKPOLICY > select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN > select BR2_PACKAGE_SEMODULE_UTILS > @@ -29,13 +30,20 @@ config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW > audit2why - translates SELinux audit messages into a > description of why the access was denied (audit2allow -w) > > +comment "audit2allow needs a toolchain w/ gcc 5" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > + > config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN > bool "sepolgen" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol > select BR2_PACKAGE_SEMODULE_UTILS > help > This package contains a Python module that allows you to > generate an initial SELinux policy module template. > > +comment "sepolgen needs a toolchain w/ gcc 5" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > + > endif > > comment "selinux-python needs python3" > diff --git a/package/semodule-utils/Config.in b/package/semodule-utils/Config.in > index 38e043dc2c..5d98dc615f 100644 > --- a/package/semodule-utils/Config.in > +++ b/package/semodule-utils/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_SEMODULE_UTILS > bool "semodule-utils" > depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol > select BR2_PACKAGE_LIBSEPOL > help > semodule-utils is a package that contains tools for handling > @@ -15,5 +16,6 @@ config BR2_PACKAGE_SEMODULE_UTILS > > https://github.com/SELinuxProject/selinux/wiki/Releases > > -comment "semodule-utils needs a toolchain w/ threads" > - depends on !BR2_TOOLCHAIN_HAS_THREADS > +comment "semodule-utils needs a toolchain w/ threads, gcc >= 5" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/setools/Config.in b/package/setools/Config.in > index 3ab7f55948..5a71672bdf 100644 > --- a/package/setools/Config.in > +++ b/package/setools/Config.in > @@ -5,6 +5,7 @@ config BR2_PACKAGE_SETOOLS > depends on BR2_USE_WCHAR > depends on BR2_USE_MMU > depends on BR2_PACKAGE_PYTHON3 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol > select BR2_PACKAGE_PYTHON_NETWORKX # runtime > select BR2_PACKAGE_PYTHON_SETUPTOOLS > select BR2_PACKAGE_LIBSELINUX > @@ -19,10 +20,10 @@ config BR2_PACKAGE_SETOOLS > > https://github.com/SELinuxProject/setools/ > > -comment "setools needs a toolchain w/ threads, wchar, dynamic library" > +comment "setools needs a toolchain w/ threads, wchar, dynamic library, gcc >= 5" > depends on BR2_USE_MMU > depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > - !BR2_USE_WCHAR > + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > comment "setools needs python3" > depends on BR2_USE_MMU > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thierry.bultel at linatsea.fr Wed Jan 5 09:46:46 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Wed, 5 Jan 2022 10:46:46 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets Message-ID: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> Hi, For a number of companies, I can see a growing interest in having ros2 support in buildroot. Currently, people wanting to prototype (or make a product) a robotics applications, are stuck to either yocto, or, worse, to a desktop-like distribution. Another topic is charts displaying for sailing. The most famous application (mostly used on raspberry by sailors) is OpenCpn, which is great but relies on wxWidgets. Whereas I am looking for a sponsor for adding ros2 to buildroot, (because it is a quite significant work, that implies to add a new build framework), I am thinking about using my (little) free time for wxWidgets (and OpenCpn later). There has been an attempt is the past (https://bugs.busybox.net/show_bug.cgi?id=261) but it does not seem to have lead to anything else since that time. What are your thought about these both packages ? Any ideas, or links to some WIP stuff ? Best regards Thierry -- Re: test www.linatsea.fr -- www.linatsea.fr -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From arnout at mind.be Wed Jan 5 10:02:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 5 Jan 2022 11:02:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/avahi: add gobject-introspection optional dependency In-Reply-To: <20200407175535.409309-1-fontaine.fabrice@gmail.com> References: <20200407175535.409309-1-fontaine.fabrice@gmail.com> Message-ID: <495ad364-0adb-e8d0-bbe7-b1157f0cea70@mind.be> On 07/04/2020 19:55, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine > --- > package/avahi/avahi.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk > index 73db37545f..3546979d83 100644 > --- a/package/avahi/avahi.mk > +++ b/package/avahi/avahi.mk > @@ -82,6 +82,13 @@ else > AVAHI_CONF_OPTS += --disable-dbus > endif > > +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > +AVAHI_CONF_OPTS += --enable-introspection > +AVAHI_DEPENDENCIES += gobject-introspection It later turned out that this fails when DBUS is enabled, and the solution is too ugly to apply [1]. Therefore, I marked this as Rejected. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20200813232351.1552307-1-aduskett at gmail.com/ > +else > +AVAHI_CONF_OPTS += --disable-introspection > +endif > + > ifeq ($(BR2_PACKAGE_LIBEVENT),y) > AVAHI_DEPENDENCIES += libevent > else > From arnout at mind.be Wed Jan 5 10:04:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 5 Jan 2022 11:04:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/x11r7/xdriver_xf86-video-amdgpu: needs opengl In-Reply-To: <20200410123207.3145145-1-bernd.kuhls@t-online.de> References: <20200410123207.3145145-1-bernd.kuhls@t-online.de> Message-ID: <2033c239-7959-0072-464f-7090b4c736cc@mind.be> On 10/04/2020 14:32, Bernd Kuhls wrote: > The package needs dri.h > https://cgit.freedesktop.org/xorg/driver/xf86-video-amdgpu/tree/src/amdgpu_probe.c#n53 > https://cgit.freedesktop.org/xorg/driver/xf86-video-amdgpu/tree/src/drmmode_display.c#n50 > > which is only provided by xserver_xorg-server when opengl is enabled: > https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n123 > > Signed-off-by: Bernd Kuhls > --- > The build error was not recorded by the autobuilders because they fail > already during at configure stage due to wrong dependencies for glamor > support fixed in the second patch of this series. > > package/x11r7/xdriver_xf86-video-amdgpu/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in > index c42255f55c..fb18c0d812 100644 > --- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in > +++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU > bool "xf86-video-amdgpu" > depends on BR2_USE_MMU # libdrm > depends on BR2_PACKAGE_MESA3D_DRI_DRIVER > + depends on BR2_PACKAGE_MESA3D_OPENGL_GLX # dri.h The condition in xorg-server is: ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx XSERVER_XORG_SERVER_DEPENDENCIES += libgl else XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx endif So this should depend on HAS_LIBGL, no? > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm This one should probably also switch to the new gbm option. Regards, Arnout > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_LIBDRM_AMDGPU > @@ -14,4 +15,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU > comment "xf86-video-amdgpu needs egl/opengl support from mesa3d" > depends on BR2_USE_MMU > depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ > + !BR2_PACKAGE_MESA3D_OPENGL_GLX || \ > !BR2_PACKAGE_MESA3D_DRI_DRIVER > From arnout at mind.be Wed Jan 5 10:08:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 5 Jan 2022 11:08:03 +0100 Subject: [Buildroot] [PATCH 2/2] package/x11r7/xdriver_xf86-video-amdgpu: fix glamor dependency In-Reply-To: <20200410123207.3145145-2-bernd.kuhls@t-online.de> References: <20200410123207.3145145-1-bernd.kuhls@t-online.de> <20200410123207.3145145-2-bernd.kuhls@t-online.de> Message-ID: <980403ed-3b13-39a0-b8c6-01df3fb5be20@mind.be> On 10/04/2020 14:32, Bernd Kuhls wrote: > Copy glamor dependencies from xserver_xorg-server omitting libgl/libegl > because this package already depends on both options: > https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n192 > > Fixes: > http://autobuild.buildroot.net/results/4da/4da87d30e6f5a10aafae60abce1b89ed92204a4e/ > http://autobuild.buildroot.net/results/74c/74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/ > > Signed-off-by: Bernd Kuhls > --- > .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > index e7196956a3..ccb5b30d90 100644 > --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > @@ -15,6 +15,12 @@ XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ > xorgproto \ > xserver_xorg-server > > +ifeq ($(BR2_PACKAGE_LIBEPOXY),y) libepoxy is already select'ed in Config.in, so this condition is useless. Thus, this patch does exactly nothing since glamor is always enabled. But I guess the select could be removed from Config.in? I thought that maybe the issue was that libepoxy has to be added to _DEPENDS, but in fact, in the autobuild failures libepoxy is already built before this package (indirect dependency through xorg-server). So I'm not sure how this really should be fixed... BTW, the issue is still happening in autobuilders [1], just very very rarely (once every 4 months or so). Regards, Arnout [1] http://autobuild.buildroot.net/?reason=xdriver_xf86-video-amdgpu%25 > +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --enable-glamor > +else > +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --disable-glamor > +endif > + > # xdriver_xf86-video-amdgpu requires O_CLOEXEC > XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" > > From james.hilliard1 at gmail.com Wed Jan 5 10:14:28 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 03:14:28 -0700 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5webengine-chromium-catapult: new package Message-ID: <20220105101430.175648-1-james.hilliard1@gmail.com> This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium. Signed-off-by: James Hilliard --- .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 0000000000..8190a6dd5d --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 0000000000..fac3c996fa --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Wed Jan 5 10:14:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 03:14:30 -0700 Subject: [Buildroot] [PATCH 3/3] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220105101430.175648-1-james.hilliard1@gmail.com> References: <20220105101430.175648-1-james.hilliard1@gmail.com> Message-ID: <20220105101430.175648-3-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Signed-off-by: James Hilliard --- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 13 ++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 70 files changed, 213 insertions(+), 385 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..d10847ea04 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ba2971dc08..294542fabb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..58e167e483 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..8c0e02152d 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4bdb90b203 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..abffc2891d 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..d48a37fafe 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 84bc291739..3b14284e37 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -6,7 +6,7 @@ QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From james.hilliard1 at gmail.com Wed Jan 5 10:14:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 03:14:29 -0700 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220105101430.175648-1-james.hilliard1@gmail.com> References: <20220105101430.175648-1-james.hilliard1@gmail.com> Message-ID: <20220105101430.175648-2-james.hilliard1@gmail.com> We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages. We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version. There are python3 patches available that apply to this version with minor modifications(to be added in a future patch). We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive. We need to add some new required dependencies to qt5webengine so that it will build. Signed-off-by: James Hilliard --- package/qt5/qt5.mk | 5 +- .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 22 + package/qt5/qt5webengine/Config.in | 2 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 8 files changed, 2561 insertions(+), 2012 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 0000000000..ced431c9e9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 0000000000..103e27d889 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 0000000000..e6ac2706f2 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..017c01a8e7 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). @@ -60,6 +61,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc deleted file mode 100644 index a5fdfdc1f1..0000000000 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ /dev/null @@ -1,1000 +0,0 @@ -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/cityhash/COPYING \ - src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ - src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ - src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ - src/3rdparty/chromium/third_party/dav1d/LICENSE \ - src/3rdparty/chromium/third_party/dawn/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/ink/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jacoco/LICENSE \ - src/3rdparty/chromium/third_party/javalang/LICENSE \ - src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ - src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ - src/3rdparty/chromium/third_party/libipp/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libxslt/src/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/lottie/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mako/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/nasm/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/perfetto/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/pffft/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/r8/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/rnnoise/COPYING \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/schema_org/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/six/src/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ - src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/test_fonts/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/turbine/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/unrar/LICENSE \ - src/3rdparty/chromium/third_party/unrar/src/license.txt \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ - src/3rdparty/chromium/third_party/weston/LICENSE \ - src/3rdparty/chromium/third_party/weston/src/COPYING \ - src/3rdparty/chromium/third_party/weston/src/data/COPYING \ - src/3rdparty/chromium/third_party/widevine/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ - src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ - src/3rdparty/gn/base/third_party/icu/LICENSE \ - src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb..1d2b70c4f6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..1b5529d2bb 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -5,18 +5,18 @@ ################################################################################ QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python + qt5declarative qt5webchannel host-bison host-flex host-freetype \ + host-gperf host-nodejs host-pkgconf host-python +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libxkbfile xlib_libXrandr xlib_libXtst endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss @@ -44,7 +44,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python @@ -53,12 +55,20 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty +endef +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -- 2.25.1 From David.Laight at ACULAB.COM Wed Jan 5 12:01:42 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Wed, 5 Jan 2022 12:01:42 +0000 Subject: [Buildroot] [git commit] package/dnsmasq: fix build with gcc 4.8 In-Reply-To: <20220104180257.67D5282BA6@busybox.osuosl.org> References: <20220104180257.67D5282BA6@busybox.osuosl.org> Message-ID: <516a76d402014d0fb3d8e1b0cb8ef462@AcuMS.aculab.com> From: Arnout Vandecappelle > Sent: 04 January 2022 17:49 > > commit: https://git.buildroot.net/buildroot/commit/?id=17aa836bd7a2c90da053398ce024b4113cf8b53c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > Fix the following build failure with gcc 4.8 raised since bump to > version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: > > option.c: In function 'one_opt': > option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode > for (char *p = arg; *p; p++) { > ^ > option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code > option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode > for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > .../0001-src-option.c-fix-build-with-gcc-4.8.patch | 52 ++++++++++++++++++++++ > ...2909d9080ff8743133fbd52427b4b2213171-typo.patch | 36 +++++++++++++++ > 2 files changed, 88 insertions(+) > > diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001- > src-option.c-fix-build-with-gcc-4.8.patch > new file mode 100644 > index 0000000000..50ecf2f18a > --- /dev/null > +++ b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch > @@ -0,0 +1,52 @@ > +From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 31 Dec 2021 17:29:44 +0100 > +Subject: [PATCH] src/option.c: fix build with gcc 4.8 > + > +Fix the following build failure with gcc 4.8 raised since version 2.86: > + > +option.c: In function 'one_opt': > +option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode > + for (char *p = arg; *p; p++) { > + ^ > +option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code > +option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode > + for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { > + ^ > + > +Fixes: > + - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] > +--- > + src/option.c | 6 ++++-- > + 1 file changed, 4 insertions(+), 2 deletions(-) > + > +diff --git a/src/option.c b/src/option.c > +index ff54def..c57f6d8 100644 > +--- a/src/option.c > ++++ b/src/option.c > +@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int > comma > + arg += 9; > + if (strlen(arg) != 16) > + ret_err(gen_err); > +- for (char *p = arg; *p; p++) { > ++ char *p; > ++ for (*p = arg; *p; p++) { Isn't that going to get an error for mixing code and declarations? David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From thomas.petazzoni at bootlin.com Wed Jan 5 13:29:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 14:29:24 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> Message-ID: <20220105142924.4b11ed83@windsurf> Hello Thierry, On Wed, 5 Jan 2022 10:46:46 +0100 Thierry Bultel wrote: > For a number of companies, I can see a growing interest in having ros2 > support in buildroot. > Currently, people wanting to prototype (or make a product) a robotics > applications, are stuck > to either yocto, or, worse, to a desktop-like distribution. > > Another topic is charts displaying for sailing. The most famous > application (mostly used > on raspberry by sailors) is OpenCpn, which is great but relies on wxWidgets. > > Whereas I am looking for a sponsor for adding ros2 to buildroot, > (because it is a quite significant work, > that implies to add a new build framework), I am thinking about using my > (little) free time for wxWidgets (and OpenCpn later). > There has been an attempt is the past > (https://bugs.busybox.net/show_bug.cgi?id=261) but it does not > seem to have lead to anything else since that time. > > What are your thought about these both packages ? Any ideas, or links to > some WIP stuff ? These packages would certainly be very welcome. ROS2 especially makes a lot of sense. Some prior work: https://github.com/mchalain/br_ros http://lists.busybox.net/pipermail/buildroot/2019-March/246497.html I'll be happy to help in the review of such packages. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From bugzilla at busybox.net Wed Jan 5 13:36:30 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 05 Jan 2022 13:36:30 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #1 from Thomas Petazzoni --- Thanks for the bug report. Could you provide the Buildroot .config that allows to reproduce this issue ? -- You are receiving this mail because: You are on the CC list for the bug. From romain.naour at smile.fr Wed Jan 5 13:40:47 2022 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 5 Jan 2022 14:40:47 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <20220105142924.4b11ed83@windsurf> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> Message-ID: <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> Hello, Le 05/01/2022 ? 14:29, Thomas Petazzoni a ?crit?: > Hello Thierry, > > On Wed, 5 Jan 2022 10:46:46 +0100 > Thierry Bultel wrote: > >> For a number of companies, I can see a growing interest in having ros2 >> support in buildroot. >> Currently, people wanting to prototype (or make a product) a robotics >> applications, are stuck >> to either yocto, or, worse, to a desktop-like distribution. We also have some companies interested by ROS2 but they are using meta-ros Yocto layer. >> >> Another topic is charts displaying for sailing. The most famous >> application (mostly used >> on raspberry by sailors) is OpenCpn, which is great but relies on wxWidgets. >> >> Whereas I am looking for a sponsor for adding ros2 to buildroot, >> (because it is a quite significant work, >> that implies to add a new build framework), I am thinking about using my >> (little) free time for wxWidgets (and OpenCpn later). >> There has been an attempt is the past >> (https://bugs.busybox.net/show_bug.cgi?id=261) but it does not >> seem to have lead to anything else since that time. >> >> What are your thought about these both packages ? Any ideas, or links to >> some WIP stuff ? > > These packages would certainly be very welcome. ROS2 especially makes a > lot of sense. > > Some prior work: > > https://github.com/mchalain/br_ros > http://lists.busybox.net/pipermail/buildroot/2019-March/246497.html This is for ROS (v1), this series must be reworked for ROS2. Marc had no time for cleaning and upstreaming this series :-/ > > I'll be happy to help in the review of such packages. Same here, I'll try to help. Best regards, Romain > > Best regards, > > Thomas > From thierry.bultel at linatsea.fr Wed Jan 5 13:49:30 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Wed, 5 Jan 2022 14:49:30 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> Message-ID: <5be78f0b-fdb2-66a0-71a1-11538c064148@linatsea.fr> > We also have some companies interested by ROS2 but they are using meta-ros Yocto > layer. > That would be therefore of less interest to them, unless they are thinking of switching to buildroot. In my case, I rather see companies that just start to enter in "the embedded world" but already use ROS(1/2) on desktops, so it is still not to late for them to make the good choice. From romain.naour at smile.fr Wed Jan 5 14:32:52 2022 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 5 Jan 2022 15:32:52 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <5be78f0b-fdb2-66a0-71a1-11538c064148@linatsea.fr> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> <5be78f0b-fdb2-66a0-71a1-11538c064148@linatsea.fr> Message-ID: <21546798-75a4-c7ef-6b80-420bf5b516d8@smile.fr> Le 05/01/2022 ? 14:49, Thierry Bultel a ?crit?: >> We also have some companies interested by ROS2 but they are using meta-ros Yocto >> layer. >> > > That would be therefore of less interest to them, unless they are thinking of > switching to buildroot. Well, I guess they use Yocto by default since there is currently no other choice. > In my case, I rather see companies that just start to enter in "the embedded > world" but already use ROS(1/2) on desktops, > so it is still not to late for them to make the good choice. ROS is definitely not an easy framework to package into Buildroot, it's doable but requires a lot of work and time. Best regards, Romain > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Wed Jan 5 15:58:40 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 05 Jan 2022 15:58:40 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 Sreedhar Mahadevan changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |sreedharmahadevan at gmail.com --- Comment #2 from Sreedhar Mahadevan --- Created attachment 9196 --> https://bugs.busybox.net/attachment.cgi?id=9196&action=edit Buildroot .config files Hi Thomas, I am attaching two .config files here. The reason is that I suspected the external tool chain option to create the issue, because of which I tried using buildroot's own tool chain. Unfortunately I encountered the same error using both configurations. Request you to kindly use these configurations and check if you can reproduce the issue at your end. Thanks and regards, Sreedhar -- You are receiving this mail because: You are on the CC list for the bug. From marc.chalain at mailoo.org Wed Jan 5 15:57:21 2022 From: marc.chalain at mailoo.org (marc.chalain at mailoo.org) Date: Wed, 5 Jan 2022 16:57:21 +0100 (CET) Subject: [Buildroot] package/aravis: new package Message-ID: Hello and Happy new year, I propose the integration of a camera capture library: Aravis is a library to help GigE camera capture. https://github.com/AravisProject/aravis/releases/tag/0.8.16 This rules install on target: ?libaravis ?arv-camera-test ?arv-fake-gv-camera ?arv-test ?arv-tool and on staging ?aravis/*.h Signed-off-by: Marc Chalain --- ?DEVELOPERS???????????????? |? 3 +++ ?package/Config.in????????? |? 1 + ?package/aravis/Config.in?? | 16 ++++++++++++++++ ?package/aravis/aravis.hash |? 1 + ?package/aravis/aravis.mk?? | 20 ++++++++++++++++++++ ?5 files changed, 41 insertions(+) ?create mode 100644 package/aravis/Config.in ?create mode 100644 package/aravis/aravis.hash ?create mode 100644 package/aravis/aravis.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6dc2e68e42..05c1c3c921 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1653,6 +1653,9 @@ N:??? Manuel V?gele ?F:??? package/python-pyqt5/ ?F:??? package/python-requests-toolbelt/ ? +N:??? Marc Chalain +F:??? package/aravis + ?N:??? Marcin Bis ?F:??? package/bluez5_utils/ ?F:??? package/cc-tool/ diff --git a/package/Config.in b/package/Config.in index 9fed0ab4cb..2a1781afe9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1698,6 +1698,7 @@ menu "Logging" ?endmenu ? ?menu "Multimedia" +??? source "package/aravis/Config.in" ???? source "package/bitstream/Config.in" ???? source "package/dav1d/Config.in" ???? source "package/kvazaar/Config.in" diff --git a/package/aravis/Config.in b/package/aravis/Config.in new file mode 100644 index 0000000000..02c71c44da --- /dev/null +++ b/package/aravis/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_ARAVIS +??? bool "aravis - GigE Camera" +??? depends on BR2_USE_WCHAR +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL +??? depends on BR2_PACKAGE_PCRE_16 +??? depends on BR2_PACKAGE_PCRE_32 +??? select BR2_PACKAGE_LIBGLIB2 +??? select BR2_PACKAGE_LIBXML2 +??? help +??? ? aravis provides the support of GigE camera +??? ? and USB3Vision camera. +??? ? https://github.com/AravisProject/aravis + +comment "aravis needs a toolchain w/ wchar, NPTL, PCRE 16/32" +??? depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ +??? !BR2_PACKAGE_PCRE_16 || !BR2_PACKAGE_PCRE_32 diff --git a/package/aravis/aravis.hash b/package/aravis/aravis.hash new file mode 100644 index 0000000000..f8512491ec --- /dev/null +++ b/package/aravis/aravis.hash @@ -0,0 +1 @@ +sha256 057166753443acc115259ca1f74bd1b28ed4d48f35261cb248eafb8f86664bc7 aravis-0.8.16.tar.gz diff --git a/package/aravis/aravis.mk b/package/aravis/aravis.mk new file mode 100644 index 0000000000..bd783a0374 --- /dev/null +++ b/package/aravis/aravis.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# aravis +# +################################################################################ + +ARAVIS_VERSION = 0.8.16 +ARAVIS_SITE = $(call github,AravisProject,aravis,$(ARAVIS_VERSION)) +ARAVIS_DEPENDENCIES = \ +??? host-pkgconf \ +??? libglib2 \ +??? libxml2 +ARAVIS_INSTALL_STAGING = YES +ARAVIS_LICENSE = LGPL-2 +ARAVIS_LICENSE_FILES = COPYING +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +ARAVIS_CONF_OPTS += -Ddocumentation=disabled + +$(eval $(meson-package)) -- 2.30.2 -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-package-aravis-new-package.patch Type: text/x-patch Size: 3369 bytes Desc: not available URL: From danomimanchego123 at gmail.com Wed Jan 5 16:20:05 2022 From: danomimanchego123 at gmail.com (Danomi Manchego) Date: Wed, 5 Jan 2022 11:20:05 -0500 Subject: [Buildroot] call with hooks Message-ID: Hello all, I noticed a possible inconsistency, and thought I should post it. Looking at places where buildroot uses hooks: $ grep -r '$(hook))$(sep)' . ./Makefile: $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_EXTRACT_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_RSYNC_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) ./package/pkg-generic.mk: $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) Notice that the one hit in Makefile uses "$($(hook))$(sep)" while the hits in pkg-generic.mk use "$(call $(hook))$(sep)". My Make-fu isn't powerful enough to understand if there is an actual problem - should there be a "call" in the Makefile line? The general syntax for call is "$(call variable,param,param,?)" so I don't follow what the extra call in $(call $(hook) is doing for us. Thanks, Danomi - From fontaine.fabrice at gmail.com Wed Jan 5 18:03:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:03:59 +0100 Subject: [Buildroot] [PATCH 1/4] package/libsemanage: add gcc >= 5 dependency Message-ID: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libsemanage/Config.in | 6 ++++-- package/policycoreutils/Config.in | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/libsemanage/Config.in b/package/libsemanage/Config.in index 3c7050ee51..5103df3f15 100644 --- a/package/libsemanage/Config.in +++ b/package/libsemanage/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSEMANAGE depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_AUDIT select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_BZIP2 @@ -17,6 +18,7 @@ config BR2_PACKAGE_LIBSEMANAGE http://selinuxproject.org/page/Main_Page -comment "libsemanage needs a toolchain w/ threads, dynamic library" +comment "libsemanage needs a toolchain w/ threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 81900b4e41..3201c8fede 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -1,12 +1,14 @@ -comment "policycoreutils needs a toolchain w/ threads, dynamic library" +comment "policycoreutils needs a toolchain w/ threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_POLICYCOREUTILS bool "policycoreutils" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage - depends on !BR2_STATIC_LIBS #libsemanage + depends on !BR2_STATIC_LIBS # libsemanage + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol select BR2_PACKAGE_LIBSEMANAGE select BR2_PACKAGE_LIBCAP_NG help -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:04:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:04:00 +0100 Subject: [Buildroot] [PATCH 2/4] package/refpolicy: add host gcc >= 5 dependency In-Reply-To: <20220105180402.388388-1-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Message-ID: <20220105180402.388388-2-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/refpolicy/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 043cc40a72..0e72b895df 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol + depends on BR2_HOST_GCC_AT_LEAST_5 # host-setools -> host-libsepol # Even though libsepol is not necessary for building, we get # the policy version from libsepol, so we select it, and treat # it like a runtime dependency. @@ -114,6 +115,7 @@ endif endif -comment "refpolicy needs a toolchain w/ threads, gcc >= 5" +comment "refpolicy needs a toolchain w/ threads, gcc >= 5, host gcc >= 5" depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_5 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:04:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:04:01 +0100 Subject: [Buildroot] [PATCH 3/4] package/checkpolicy: add host gcc >= 5 dependency In-Reply-To: <20220105180402.388388-1-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Message-ID: <20220105180402.388388-3-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - http://autobuild.buildroot.org/results/fc727efc0c658aaae55c83632a91af83701f0c49 Signed-off-by: Fabrice Fontaine --- package/checkpolicy/Config.in.host | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/checkpolicy/Config.in.host b/package/checkpolicy/Config.in.host index 240a5b6dc4..38e35e2fc1 100644 --- a/package/checkpolicy/Config.in.host +++ b/package/checkpolicy/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_CHECKPOLICY bool "host checkpolicy" + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol help checkpolicy is the SELinux policy compiler. It uses libsepol to generate the binary policy. checkpolicy uses the static @@ -8,3 +9,6 @@ config BR2_PACKAGE_HOST_CHECKPOLICY shared library interface. http://selinuxproject.org/page/Main_Page + +comment "host checkpolicy needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:04:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:04:02 +0100 Subject: [Buildroot] [PATCH 4/4] package/android-tools: add host gcc >= 5 dependency In-Reply-To: <20220105180402.388388-1-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Message-ID: <20220105180402.388388-4-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/android-tools/Config.in.host | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/android-tools/Config.in.host b/package/android-tools/Config.in.host index 433f4e384f..576e53e8b5 100644 --- a/package/android-tools/Config.in.host +++ b/package/android-tools/Config.in.host @@ -10,12 +10,16 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS if BR2_PACKAGE_HOST_ANDROID_TOOLS config BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol bool "fastboot" help This option will build and install the fastboot utility for the host, which can be used to reflash target devices implementing the fastboot protocol. +comment "fastboot needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 + config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB bool "adb" help @@ -24,10 +28,14 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB implementing the ADB protocol. config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol bool "ext4 utils" help This option will build and install the ext4 utils for the host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg, simg2img and simg2simg. +comment "ext4 utils needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 + endif -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:04:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:04:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/mdadm: disable -Werror Message-ID: <20220105180453.388499-1-fontaine.fabrice@gmail.com> Disable -Werror by setting CWFLAGS to "" This will avoid the following build failure raised since bump to version 4.2 in commit b03fc7974536378ba102418451ba7e9801bc6251: mdadm.c: In function 'main': mdadm.c:156:28: error: this statement may fall through [-Werror=implicit-fallthrough=] 154 | if (mode == ASSEMBLE || mode == BUILD || | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c0f216b7aadb794110409d03dcef7fa58e833cd4 Signed-off-by: Fabrice Fontaine --- package/mdadm/mdadm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 6ee0bb60c9..0a2eb4e5bd 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -16,6 +16,7 @@ MDADM_BUILD_OPTS = \ CC=$(TARGET_CC) \ COROSYNC=-DNO_COROSYNC \ DLM=-DNO_DLM \ + CWFLAGS="" \ CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:06:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:06:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtorrent: disable execinfo Message-ID: <20220105180645.388855-1-fontaine.fabrice@gmail.com> Disable execinfo to avoid the following build failure raised since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: main.o: in function `do_panic(int)': /home/giuliobenetti/autobuild/run/instance-0/output-1/build/rtorrent-0.9.8/src/main.cc:606: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/10fc9016013931c58238240216c5950b23b56b30 Signed-off-by: Fabrice Fontaine --- ...disable-execinfo-option-to-configure.patch | 34 +++++++++++++++++++ package/rtorrent/rtorrent.mk | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch diff --git a/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch b/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch new file mode 100644 index 0000000000..4ff4182b61 --- /dev/null +++ b/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch @@ -0,0 +1,34 @@ +From 582e4e40256b43d3e5322168f1e1ed71ca70ab64 Mon Sep 17 00:00:00 2001 +From: rakshasa +Date: Wed, 16 Jun 2021 23:29:01 +0900 +Subject: [PATCH] Added '--disable-execinfo' option to configure. + +[Retrieved (and backported) from: +https://github.com/rakshasa/rtorrent/commit/582e4e40256b43d3e5322168f1e1ed71ca70ab64] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e3e7d3f1..0f45bc6a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,15 @@ TORRENT_WITHOUT_VARIABLE_FDSET + + AC_SYS_LARGEFILE + +-TORRENT_CHECK_EXECINFO ++AC_ARG_ENABLE(execinfo, ++ AC_HELP_STRING([--disable-execinfo], [disable libexecinfo [[default=enable]]]), ++ [ ++ if test "$enableval" = "yes"; then ++ TORRENT_CHECK_EXECINFO ++ fi ++ ],[ ++ TORRENT_CHECK_EXECINFO ++ ]) + + TORRENT_ENABLE_ARCH + TORRENT_WITH_SYSROOT + diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk index bc3afe8064..210b1d34dc 100644 --- a/package/rtorrent/rtorrent.mk +++ b/package/rtorrent/rtorrent.mk @@ -9,5 +9,8 @@ RTORRENT_SITE = http://rtorrent.net/downloads RTORRENT_DEPENDENCIES = host-pkgconf libcurl libtorrent ncurses RTORRENT_LICENSE = GPL-2.0 RTORRENT_LICENSE_FILES = COPYING +# We're patching configure.ac +RTORRENT_AUTORECONF = YES +RTORRENT_CONF_OPTS = --disable-execinfo $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 5 18:07:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 5 Jan 2022 19:07:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: fix uclibc build Message-ID: <20220105180751.388943-1-fontaine.fabrice@gmail.com> Fix the following uclibc build failure raised since bump to version 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: xxhash.o: in function `XXH3_hashLong_128b_internal.constprop.0': (.text+0xcbc): undefined reference to `static_assert' Fixes: - http://autobuild.buildroot.org/results/559/5595b21a711b482b84e582fc9f56e5468c9eb6d6/build-end.log Signed-off-by: Fabrice Fontaine --- ...nd-on-assert-h-for-XXH_STATIC_ASSERT.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch diff --git a/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch new file mode 100644 index 0000000000..3b65ae1d6c --- /dev/null +++ b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch @@ -0,0 +1,29 @@ +From 6189ecd3d44a693460f86280ccf49d33cb4b18e1 Mon Sep 17 00:00:00 2001 +From: Yann Collet +Date: Sun, 26 Dec 2021 15:15:26 -0800 +Subject: [PATCH] do no longer depend on `` for XXH_STATIC_ASSERT + +since some versions are buggy. + +Use `_Static_assert` instead, which is part of the C11 language. +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1] +Signed-off-by: Fabrice Fontaine +--- + xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/xxhash.h b/xxhash.h +index 311a69c7..5dfd5c45 100644 +--- a/xxhash.h ++++ b/xxhash.h +@@ -1749,8 +1749,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else -- 2.34.1 From jesse_dev at fastmail.com Wed Jan 5 19:03:09 2022 From: jesse_dev at fastmail.com (Jesse Millwood) Date: Wed, 05 Jan 2022 14:03:09 -0500 Subject: [Buildroot] Overriding Kconfig Values from external br2 Message-ID: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> Hello, I have an external C/C++ toolchain that I've put together that uses MUSL. I've also built an external Rust toolchain that uses my MUSL toolchain. My issue is that there is a Rust Kconfig variable that specifies if a specific architecture supports Rust. The Kconfig variable in question is BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS in package/rustc/Config.in.host. In my br2 external project I have the following setup: My issue is that I can't seem to override the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS, which masks all other Rust packages. . ??? external.desc ? |name: MINE ? |desc: My BR2 External ? `---- ??? external.mk ? |include $(sort $(wildcard $(BR2_EXTERNAL_MINE_PATH)/package/*/*.mk)) ? |include $(sort $(wildcard $(BR2_EXTERNAL_MINE_PATH)/toolchain/*/*.mk)) ? `---- ??? Config.in ? | source "$BR2_EXTERNAL_MINE_PATH/toolchain/my-external/Config.in.options" ? | source "$BR2_EXTERNAL_MINE_PATH/package/rpkg/Config.in" ? `---- ??? configs ? ??? my_gnu_defconfig ? ??? my_musl_defconfig | ??? package ? ??? rpkg ? ??? Config.in ? ??? rpkg.mk ??? provides ? ??? toolchains.in ? | config BR2_TOOLCHAIN_EXTERNAL_MY_MUSL ? | bool "My PowerPC MUSL Toolchain" ? | depends on BR2_powerpc ? | ? | config BR2_TOOLCHAIN_EXTERNAL_MY_GNU ? | bool "My PowerPC GNU Toolchain" ? | depends on BR2_powerpc ? `---- ??? toolchain ??? my-external ??? Config.in.options | if BR2_TOOLCHAIN_EXTERNAL_MY_MUSL | config BR2_TOOLCHAIN_EXTERNAL_PREFIX | default "powerpc-my-linux-musl" | config BR2_TOOLCHAIN_EXTERNAL_PATH | default "${WORKSPACE_DIR}/toolchain/powerpc-my-linux-musl" | | config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS | bool | default y if BR2_i386 | default y if BR2_x86_64 | default y if BR2_aarch64 | default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 \ | && !(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI) | default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le | default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_CPU_MIPS32R6 | default y if (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_CPU_MIPS64R6 \ | && BR2_MIPS_NABI64 | depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) | depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS | | endif | | if BR2_TOOLCHAIN_EXTERNAL_MY_GNU | config BR2_TOOLCHAIN_EXTERNAL_PREFIX | default "powerpc-my-linux-gnu" | config BR2_TOOLCHAIN_EXTERNAL_PATH | default "${WORKSPACE_DIR}/toolchain/powerpc-my-linux-gnu" | endif `---- You may notice that I changed the libc depends line to be or'd with BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get considered when I choose my external musl toolchain option. In the menuconfig when I search for the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with the "/" key it looks like it is only getting it from the original file. Does buildroot have a mechanism for overwriting this kind of setting and if not, does anyone have an idea of how I would accomplish what I am trying to do (make buildroot honor my external rust toolchain)? Thanks, Jesse -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Wed Jan 5 20:33:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 21:33:11 +0100 Subject: [Buildroot] [git commit] package/vdr: enable musl/uclibc build Message-ID: <20220105202826.3813D82C08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64843258ce59822ad8d52e75fd4d8fcf10c9b041 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Re-add patch 0001 to fix uClibc build, this patch was removed 2019: https://git.buildroot.net/buildroot/commit/?id=573d15b0790cfd2838cf0544ded79b415e20f5a7 Add two more patches from Alpine Linux to fix musl build. Add optional dependency to libexecinfo to provide execinfo.h. Add a patch that ensures an internal gettext symbol doesn't get used except on glibc and uclibc toolchains. Indeed, both glibc and uclibc provide the _nl_msg_cat_cntr variable, but not the musl implementation. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vdr/0001-getloadavg.patch | 55 ++++++++ package/vdr/0002-musl-compat.patch | 140 +++++++++++++++++++++ package/vdr/0003-include-missing-limits.patch | 30 +++++ ...msg_cat_cntr-is-an-internal-symbol-of-som.patch | 35 ++++++ package/vdr/Config.in | 7 +- package/vdr/vdr.mk | 5 + 6 files changed, 268 insertions(+), 4 deletions(-) diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch new file mode 100644 index 0000000000..9e6316e284 --- /dev/null +++ b/package/vdr/0001-getloadavg.patch @@ -0,0 +1,55 @@ +Fix compilation with uClibc + +Ported from +https://github.com/stschake/buildroot-grasshopper/blob/master/package/torsmo/torsmo-0.18-uclibc-getloadavg.patch + +Signed-off-by: Bernd Kuhls + +diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +--- vdr-2.3.1.org/skinlcars.c 2015-09-01 12:07:07.000000000 +0200 ++++ vdr-2.3.1/skinlcars.c 2016-07-31 21:00:11.000000000 +0200 +@@ -1100,6 +1100,44 @@ + } + } + ++/* uclibc and dietlibc do not have this junk -ReneR */ ++#if defined (__UCLIBC__) || defined (__dietlibc__) ++static int getloadavg (double loadavg[], int nelem) ++{ ++ int fd; ++ ++ fd = open ("/proc/loadavg", O_RDONLY); ++ if (fd < 0) ++ return -1; ++ else ++ { ++ char buf[65], *p; ++ ssize_t nread; ++ int i; ++ ++ nread = read (fd, buf, sizeof buf - 1); ++ close (fd); ++ if (nread <= 0) ++ return -1; ++ buf[nread - 1] = '\0'; ++ ++ if (nelem > 3) ++ nelem = 3; ++ p = buf; ++ for (i = 0; i < nelem; ++i) ++ { ++ char *endp; ++ loadavg[i] = strtod (p, &endp); ++ if (endp == p) ++ return -1; ++ p = endp; ++ } ++ ++ return i; ++ } ++} ++#endif ++ + void cSkinLCARSDisplayMenu::DrawLoad(void) + { + if (yb04) { diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-musl-compat.patch new file mode 100644 index 0000000000..b6f8f414a9 --- /dev/null +++ b/package/vdr/0002-musl-compat.patch @@ -0,0 +1,140 @@ +Fix musl build + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch + +Signed-off-by: Bernd Kuhls + +diff --git a/i18n.h b/i18n.h +index f8ad9de..b002bbf 100644 +--- a/i18n.h ++++ b/i18n.h +@@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); + ///< have an actual locale installed. The rest are just dummy entries + ///< to allow having three letter language codes for other languages + ///< that have no actual locale on this system. +-const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1); ++const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute__((__format_arg__ (1))); + ///< Translates the given string (with optional Plugin context) into + ///< the current language. If no translation is available, the original + ///< string will be returned. +diff --git a/osd.c b/osd.c +index 524700a..ef975f5 100644 +--- a/osd.c ++++ b/osd.c +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include "device.h" + #include "tools.h" + +diff --git a/thread.c b/thread.c +index 47eb977..58dba43 100644 +--- a/thread.c ++++ b/thread.c +@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) + writeLockThreadId = 0; + pthread_rwlockattr_t attr; + pthread_rwlockattr_init(&attr); ++#if defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP); ++#endif + pthread_rwlock_init(&rwlock, &attr); + } + +@@ -205,7 +207,7 @@ cMutex::cMutex(void) + locked = 0; + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); + pthread_mutex_init(&mutex, &attr); + } + +diff --git a/tools.c b/tools.c +index 754673d..fef9d2d 100644 +--- a/tools.c ++++ b/tools.c +@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) + { + if (!FileName) + return NULL; +- char *TargetName = canonicalize_file_name(FileName); ++ char *TargetName = realpath(FileName, NULL); + if (!TargetName) { + if (errno == ENOENT) // file doesn't exist + TargetName = strdup(FileName); +@@ -1528,7 +1528,7 @@ + struct dirent *cReadDir::Next(void) + { + if (directory) { +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + while (readdir_r(directory, &u.d, &result) == 0 && result) { + #else + while ((result = readdir(directory)) != NULL) { +diff --git a/tools.h b/tools.h +index 73cca5a..03f5fd1 100644 +--- a/tools.h ++++ b/tools.h +@@ -28,6 +28,16 @@ + #include + #include "thread.h" + ++#ifndef ACCESSPERMS ++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++#ifndef ALLPERMS ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ ++#endif ++#ifndef DEFFILEMODE ++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ ++#endif ++ + typedef unsigned char uchar; + + extern int SysLogLevel; +@@ -400,7 +410,7 @@ + private: + DIR *directory; + struct dirent *result; +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + union { // according to "The GNU C Library Reference Manual" + struct dirent d; + char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; +@@ -738,7 +748,7 @@ public: + data[i] = T(0); + size = 0; + } +- void Sort(__compar_fn_t Compare) ++ void Sort(int (*Compare)(const void *, const void *)) + { + qsort(data, size, sizeof(T), Compare); + } +diff --git a/vdr.c b/vdr.c +index 8a49471..c2a82aa 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) + } + } + else if (Terminal) { ++#ifdef __GLIBC__ + // Claim new controlling terminal + stdin = freopen(Terminal, "r", stdin); + stdout = freopen(Terminal, "w", stdout); + stderr = freopen(Terminal, "w", stderr); + HasStdin = true; + tcgetattr(STDIN_FILENO, &savedTm); ++#else ++ // stdin, stdout, stderr are declared FILE const* by musl C library ++ fprintf(stderr, "Option '-t' is only supported if VDR has been built against glibc.\n"); ++ return 2; ++#endif + } + + isyslog("VDR version %s started", VDRVERSION); diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch new file mode 100644 index 0000000000..c2efe291e6 --- /dev/null +++ b/package/vdr/0003-include-missing-limits.patch @@ -0,0 +1,30 @@ +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Signed-off-by: Bernd Kuhls +---- + +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + diff --git a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch new file mode 100644 index 0000000000..9cc45a96c1 --- /dev/null +++ b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch @@ -0,0 +1,35 @@ +From 8711ce9c4ded311705f281c99e013a26987fbf1d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 1 Jan 2022 23:35:29 +0100 +Subject: [PATCH] i18n.c: _nl_msg_cat_cntr is an internal symbol of some intl + implementation + +It is supported by glibc and uClibc (which both define __GLIBC__) but +not musl (which doesn't define __GLIBC__). On musl, it doesn't do +anything because musl has a basic NLS implementation. Even +gettext-tiny defines _nl_msg_cat_cntr as a dummy symbol in its stub +libintl-musl implementation. + +Signed-off-by: Thomas Petazzoni +--- + i18n.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/i18n.c b/i18n.c +index 0ef08fd4..da2a3ede 100644 +--- a/i18n.c ++++ b/i18n.c +@@ -123,8 +123,10 @@ static const char *SkipContext(const char *s) + static void SetEnvLanguage(const char *Locale) + { + setenv("LANGUAGE", Locale, 1); ++#if defined(__GLIBC__) + extern int _nl_msg_cat_cntr; + ++_nl_msg_cat_cntr; ++#endif + } + + static void SetLanguageNames(void) +-- +2.31.1 + diff --git a/package/vdr/Config.in b/package/vdr/Config.in index df602f26d6..38502729a7 100644 --- a/package/vdr/Config.in +++ b/package/vdr/Config.in @@ -4,23 +4,22 @@ config BR2_PACKAGE_VDR depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBCAP - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC help This project describes how to build your own digital satellite receiver and Video Disk Recorder. http://www.tvdr.de -comment "vdr needs a glibc toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9" +comment "vdr needs a toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_USE_WCHAR || \ + !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 51affe5a7b..bb7b1e22c0 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -26,6 +26,11 @@ VDR_MAKE_FLAGS = \ VIDEODIR=/var/lib/vdr VDR_LDFLAGS = $(TARGET_NLS_LIBS) +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +VDR_DEPENDENCIES += libexecinfo +VDR_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) VDR_DEPENDENCIES += libfribidi VDR_MAKE_FLAGS += BIDI=1 From yann.morin.1998 at free.fr Wed Jan 5 20:35:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:35:12 +0100 Subject: [Buildroot] [git commit] package/fakedate: fix finding the right date executable Message-ID: <20220105202916.C2ECF813FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd9c604c96480819c053811432b7c36073ad785e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, we look for the actual date be easrching form the end of the PATH, and keeping the last-found date that occurs after the wrapper. However, in some cases, the wrapper will be the last item in the PATH. This is the cae when users already have the HOST_DIR/bin at the end of their PATH, ??-la: PATH="${PATH}:/path/to/buildroot/output/host/bin" In this case, we would not find any matching date. The issue is that Buildroot adds HOST_DIR/bin at the beginning of the PATH, so the real date will be to be found after the HOST_DIR that is early in the PATH, but before the HOST_DIR that is at the end. We fix the issue by searching the PATH as it is expecte to be searched, shoud Buildroot had not added its date wrapper: we use the first date executable that is found in the PATH, starting from the beginning, that is after our wrapper, abd that is not the wrapper itself. Signed-off-by: Ignacy Gaw??dzki [yann.morin.1998 at free.fr: - iterate in order from first-to-last - stop on the first occurence - handle the case where no date was found - extend and expand the commit log ] Signed-off-by: Yann E. MORIN --- package/fakedate/fakedate | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate index 9bef113357..7ebbf1f0da 100755 --- a/package/fakedate/fakedate +++ b/package/fakedate/fakedate @@ -18,16 +18,23 @@ # Copyright (C) 2016 J??r??me Pouiller # -DATE_BIN=false # Do not call any 'date' before us in the PATH, or that would create # an infinite recursion. -for date in $(which -a date |tac); do +found=false +for date in $(which -a date); do if [ "${date}" -ef "$0" ]; then + found=true + elif ${found}; then + DATE_BIN="${date}" break fi - DATE_BIN="${date}" done +if [ -z "${DATE_BIN}" ]; then + printf 'fakedate: no real date found in PATH after "%s"\n' "${0}" >&2 + exit 1 +fi + if [ -n "$SOURCE_DATE_EPOCH" ]; then FORCE_EPOCH=1 for i in "$@"; do From thomas.petazzoni at bootlin.com Wed Jan 5 20:36:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 21:36:28 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/vdr: enable musl/uclibc build In-Reply-To: <20220101120920.2809336-1-bernd.kuhls@t-online.de> References: <20220101120920.2809336-1-bernd.kuhls@t-online.de> Message-ID: <20220105213628.763562b2@windsurf> Hello Bernd, On Sat, 1 Jan 2022 13:09:20 +0100 Bernd Kuhls wrote: > Re-add patch 0001 to fix uClibc build, this patch was removed 2019: > https://git.buildroot.net/buildroot/commit/?id=573d15b0790cfd2838cf0544ded79b415e20f5a7 > > Add two more patches from Alpine Linux to fix musl build. > > Add optional dependency to libexecinfo to provide execinfo.h. > > Depend on BR2_SYSTEM_ENABLE_NLS to have gettext being added as > dependency to provide _nl_msg_cat_cntr() needed by i18n.c. > > Signed-off-by: Bernd Kuhls > --- > v3: rework nls/gettext dependencies (Thomas) > v2: no changes I have applied, but after dropping the NLS dependency. Indeed, the _nl_msg_cat_cntr symbol is an internal symbol of gettext, which only glibc and uclibc provide in their built-in libintl implementation. Even the stub libintl-musl from the gettext-tiny project implements _nl_msg_cat_cntr as a dummy symbol, which really tells us that it serves no purpose on musl toolchains. So I've just added a patch for vdr that ensures _nl_msg_cat_cntr is only used on glibc/uclibc toolchains, by checking __GLIBC__. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 5 20:37:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:37:27 +0100 Subject: [Buildroot] [PATCH] package/fakedate: fix finding the right date executable In-Reply-To: <20211215173432.r75invoe3ff6mthg@zenon.in.qult.net> References: <20211215173432.r75invoe3ff6mthg@zenon.in.qult.net> Message-ID: <20220105203727.GH614810@scaer> Ignacy, All, On 2021-12-15 18:34 +0100, Ignacy Gaw?dzki spake thusly: > If the PATH initially contains host/bin, then the right date > executable is to be found after the *first* occurrence of fakedate in > normal (forward) PATH order. Fix the wrapper so that that first > occurrence is found indeed. > > Signed-off-by: Ignacy Gaw?dzki After discussing this with Arnout and Thomas, we concluded that Arnout's proposal, with my ltile amendment, was the proper solution. Except that the loop had to be broken on first hit, of course, so I added the proper break. I also added a test that we actually did find a date executable. Of course, if we missed something, then feel free to yel back! ;-) Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/fakedate/fakedate | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate > index 9bef113357..03a4f04079 100755 > --- a/package/fakedate/fakedate > +++ b/package/fakedate/fakedate > @@ -21,13 +21,18 @@ > DATE_BIN=false > # Do not call any 'date' before us in the PATH, or that would create > # an infinite recursion. > +last_date=false > for date in $(which -a date |tac); do > if [ "${date}" -ef "$0" ]; then > - break > + DATE_BIN=$last_date > fi > - DATE_BIN="${date}" > + last_date="${date}" > done > > +if [ "$DATE_BIN" = false ]; then > + DATE_BIN=$last_date > +fi > + > if [ -n "$SOURCE_DATE_EPOCH" ]; then > FORCE_EPOCH=1 > for i in "$@"; do > -- > 2.32.0 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Jan 5 20:41:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 21:41:29 +0100 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: <20211210141209.1812043-2-jose.pekkarinen@unikie.com> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> Message-ID: <20220105214129.2f5fffae@windsurf> Hello Jos?, On Fri, 10 Dec 2021 16:12:04 +0200 Jos? Pekkarinen wrote: > This patch adds a new package for minijail. > > Signed-off-by: Jos? Pekkarinen I wanted to apply after fixing the issues pointed by others, but there are in fact other issues, which I cannot resolve directly. See below. > diff --git a/package/minijail/0001-Fix-prlimit-call.patch b/package/minijail/0001-Fix-prlimit-call.patch > new file mode 100644 > index 0000000000..9f6902ed43 > --- /dev/null > +++ b/package/minijail/0001-Fix-prlimit-call.patch > @@ -0,0 +1,29 @@ > +From 09348f06104bf8101a24a0bce235a75a214e1380 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > +Date: Fri, 10 Dec 2021 14:20:30 +0200 > +Subject: [PATCH] Fix prlimit call What are you "fixing"? You're replacing a prlimit() call by by setrlimit(), but why? What problem does it solve? Why is it correct to do that? > diff --git a/package/minijail/0002-Fix-static-assert.patch b/package/minijail/0002-Fix-static-assert.patch > new file mode 100644 > index 0000000000..48139e8baa > --- /dev/null > +++ b/package/minijail/0002-Fix-static-assert.patch > @@ -0,0 +1,30 @@ > +From b5d91b793942747e5126e75abca2eebad60ab478 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > +Date: Fri, 10 Dec 2021 14:21:38 +0200 > +Subject: [PATCH] Fix static assert > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Signed-off-by: Jos? Pekkarinen > +--- > + libminijail.c | 3 --- > + 1 file changed, 3 deletions(-) > + > +diff --git a/libminijail.c b/libminijail.c > +index 45f133e..8323742 100644 > +--- a/libminijail.c > ++++ b/libminijail.c > +@@ -2620,9 +2620,6 @@ static int fd_is_open(int fd) > + return fcntl(fd, F_GETFD) != -1 || errno != EBADF; > + } > + > +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > +- "If true, ensure_no_fd_conflict will always find an unused fd."); You're not fixing the static_assert() here but simply dropping it. Why? When does it fail? What is the problem with it? Why is it safe to drop it? Could you take into account these comments as well as the others received, and send an update patch? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 5 20:59:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 21:59:08 +0100 Subject: [Buildroot] [PATCH] package/opensc: new package In-Reply-To: <20211213061551.4110-1-jose.pekkarinen@unikie.com> References: <20211213061551.4110-1-jose.pekkarinen@unikie.com> Message-ID: <20220105215908.1d8677b3@windsurf> Hello Jos?, On Mon, 13 Dec 2021 08:15:51 +0200 Jos? Pekkarinen wrote: > The patch will add opensc package. > > Signed-off-by: Jos? Pekkarinen I'm afraid that when I read the feedback from upstream in your patches, saying that they introduce memory leaks (and indeed they do), I'm not really keen on merging this. However, I saw you told upstream: It is a bit of a chiken and egg problem. Buildroot wants me to upstream the patches before the package would be accesible to you, you want me to give a testing case that doesn't come easy without upstreaming the package. This is not totally correct for two reason: * we don't require patches to be accepted upstream, except if we have serious doubts about the patches. * the package doesn't have to be accepted in Buildroot upstream to provide an easy way for the opensc developers to reproduce the issue. You can provide a Buildroot branch on a public Git repository, with the opensc package, and a very simple opensc_demo_defconfig in configs/ that uses some external toolchain and builds just opensc to demonstrate the build failure. Then for the opensc people, reproducing is as easy as: git clone -b git://your.repository.com cd buildroot/ make opensc_demo_defconfig make Could you resolve the remaining issues and send an updated patch? Also, please remember to add a version to your patches when submitting, it really makes things easier. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 5 20:59:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:59:00 +0100 Subject: [Buildroot] [git commit] package/refpolicy: add host gcc >= 5 dependency Message-ID: <20220105205428.160CA832CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a087dd17fcfb7df2053cde6286803d6ae326c14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/refpolicy/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 043cc40a72..0e72b895df 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol + depends on BR2_HOST_GCC_AT_LEAST_5 # host-setools -> host-libsepol # Even though libsepol is not necessary for building, we get # the policy version from libsepol, so we select it, and treat # it like a runtime dependency. @@ -114,6 +115,7 @@ endif endif -comment "refpolicy needs a toolchain w/ threads, gcc >= 5" +comment "refpolicy needs a toolchain w/ threads, gcc >= 5, host gcc >= 5" depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_5 From yann.morin.1998 at free.fr Wed Jan 5 20:59:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:59:37 +0100 Subject: [Buildroot] [git commit] package/android-tools: add host gcc >= 5 dependency Message-ID: <20220105205428.299DE832C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae2c55df06e2163b6094b72775180c3a3afc4250 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/android-tools/Config.in.host | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/android-tools/Config.in.host b/package/android-tools/Config.in.host index 433f4e384f..898ddb2199 100644 --- a/package/android-tools/Config.in.host +++ b/package/android-tools/Config.in.host @@ -11,11 +11,15 @@ if BR2_PACKAGE_HOST_ANDROID_TOOLS config BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT bool "fastboot" + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol help This option will build and install the fastboot utility for the host, which can be used to reflash target devices implementing the fastboot protocol. +comment "fastboot needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 + config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB bool "adb" help @@ -25,9 +29,13 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS bool "ext4 utils" + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol help This option will build and install the ext4 utils for the host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg, simg2img and simg2simg. +comment "ext4 utils needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 + endif From yann.morin.1998 at free.fr Wed Jan 5 20:58:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:58:58 +0100 Subject: [Buildroot] [git commit] package/libsemanage: add gcc >= 5 dependency Message-ID: <20220105205428.0D863832C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fb55340ef0781243b18a6f2519c02b5c1d7bf28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 dependency Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsemanage/Config.in | 6 ++++-- package/policycoreutils/Config.in | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/libsemanage/Config.in b/package/libsemanage/Config.in index 3c7050ee51..5103df3f15 100644 --- a/package/libsemanage/Config.in +++ b/package/libsemanage/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSEMANAGE depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol select BR2_PACKAGE_AUDIT select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_BZIP2 @@ -17,6 +18,7 @@ config BR2_PACKAGE_LIBSEMANAGE http://selinuxproject.org/page/Main_Page -comment "libsemanage needs a toolchain w/ threads, dynamic library" +comment "libsemanage needs a toolchain w/ threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 81900b4e41..3201c8fede 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -1,12 +1,14 @@ -comment "policycoreutils needs a toolchain w/ threads, dynamic library" +comment "policycoreutils needs a toolchain w/ threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_POLICYCOREUTILS bool "policycoreutils" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage - depends on !BR2_STATIC_LIBS #libsemanage + depends on !BR2_STATIC_LIBS # libsemanage + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol select BR2_PACKAGE_LIBSEMANAGE select BR2_PACKAGE_LIBCAP_NG help From yann.morin.1998 at free.fr Wed Jan 5 20:59:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 21:59:03 +0100 Subject: [Buildroot] [git commit] package/checkpolicy: add host gcc >= 5 dependency Message-ID: <20220105205428.1F557832DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c0b521987f929ce88ae97ee2bf6f923311061a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host gcc >= 5 dependency Fixes: - http://autobuild.buildroot.org/results/fc727efc0c658aaae55c83632a91af83701f0c49 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/checkpolicy/Config.in.host | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/checkpolicy/Config.in.host b/package/checkpolicy/Config.in.host index 240a5b6dc4..38e35e2fc1 100644 --- a/package/checkpolicy/Config.in.host +++ b/package/checkpolicy/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_CHECKPOLICY bool "host checkpolicy" + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol help checkpolicy is the SELinux policy compiler. It uses libsepol to generate the binary policy. checkpolicy uses the static @@ -8,3 +9,6 @@ config BR2_PACKAGE_HOST_CHECKPOLICY shared library interface. http://selinuxproject.org/page/Main_Page + +comment "host checkpolicy needs a toolchain w/ host gcc >= 5" + depends on !BR2_HOST_GCC_AT_LEAST_5 From yann.morin.1998 at free.fr Wed Jan 5 21:00:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 22:00:59 +0100 Subject: [Buildroot] [PATCH 1/4] package/libsemanage: add gcc >= 5 dependency In-Reply-To: <20220105180402.388388-1-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> Message-ID: <20220105210059.GI614810@scaer> Fabrice, All, On 2022-01-05 19:03 +0100, Fabrice Fontaine spake thusly: > Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 > dependency > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Series of 4 patches applied to master, thanks. I'll further reply to patch 4... Regards, Yann E. MORIN. > --- > package/libsemanage/Config.in | 6 ++++-- > package/policycoreutils/Config.in | 8 +++++--- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/package/libsemanage/Config.in b/package/libsemanage/Config.in > index 3c7050ee51..5103df3f15 100644 > --- a/package/libsemanage/Config.in > +++ b/package/libsemanage/Config.in > @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSEMANAGE > depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol > select BR2_PACKAGE_AUDIT > select BR2_PACKAGE_LIBSELINUX > select BR2_PACKAGE_BZIP2 > @@ -17,6 +18,7 @@ config BR2_PACKAGE_LIBSEMANAGE > > http://selinuxproject.org/page/Main_Page > > -comment "libsemanage needs a toolchain w/ threads, dynamic library" > +comment "libsemanage needs a toolchain w/ threads, dynamic library, gcc >= 5" > depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS > - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in > index 81900b4e41..3201c8fede 100644 > --- a/package/policycoreutils/Config.in > +++ b/package/policycoreutils/Config.in > @@ -1,12 +1,14 @@ > -comment "policycoreutils needs a toolchain w/ threads, dynamic library" > +comment "policycoreutils needs a toolchain w/ threads, dynamic library, gcc >= 5" > depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS > - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > > config BR2_PACKAGE_POLICYCOREUTILS > bool "policycoreutils" > depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage > depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage > - depends on !BR2_STATIC_LIBS #libsemanage > + depends on !BR2_STATIC_LIBS # libsemanage > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol > select BR2_PACKAGE_LIBSEMANAGE > select BR2_PACKAGE_LIBCAP_NG > help > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 5 21:02:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 22:02:08 +0100 Subject: [Buildroot] [PATCH 4/4] package/android-tools: add host gcc >= 5 dependency In-Reply-To: <20220105180402.388388-4-fontaine.fabrice@gmail.com> References: <20220105180402.388388-1-fontaine.fabrice@gmail.com> <20220105180402.388388-4-fontaine.fabrice@gmail.com> Message-ID: <20220105210208.GJ614810@scaer> Fabrice, All, On 2022-01-05 19:04 +0100, Fabrice Fontaine spake thusly: > Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add host > gcc >= 5 dependency > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/android-tools/Config.in.host | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/android-tools/Config.in.host b/package/android-tools/Config.in.host > index 433f4e384f..576e53e8b5 100644 > --- a/package/android-tools/Config.in.host > +++ b/package/android-tools/Config.in.host > @@ -10,12 +10,16 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS > if BR2_PACKAGE_HOST_ANDROID_TOOLS > > config BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT > + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol > bool "fastboot" > help > This option will build and install the fastboot utility for > the host, which can be used to reflash target devices > implementing the fastboot protocol. > > +comment "fastboot needs a toolchain w/ host gcc >= 5" > + depends on !BR2_HOST_GCC_AT_LEAST_5 > + > config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB > bool "adb" > help > @@ -24,10 +28,14 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB > implementing the ADB protocol. > > config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS > + depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol $ make check-package package/android-tools/Config.in.host:14: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) package/android-tools/Config.in.host:32: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) Applied to master after fixing this, thanks. Regards, Yann E. MORIN. > bool "ext4 utils" > help > This option will build and install the ext4 utils for the > host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg, > simg2img and simg2simg. > > +comment "ext4 utils needs a toolchain w/ host gcc >= 5" > + depends on !BR2_HOST_GCC_AT_LEAST_5 > + > endif > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Wed Jan 5 21:38:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 14:38:18 -0700 Subject: [Buildroot] [PATCH 1/1] Makefile: only check _FINAL_DEPENDENCIES are selected Message-ID: <20220105213818.331826-1-james.hilliard1@gmail.com> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may not need to be selected in kconfig in cases where building is not desired, so only check that _FINAL_DEPENDENCIES are selected. Signed-off-by: James Hilliard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ac98b84425..7a2da3b043 100644 --- a/Makefile +++ b/Makefile @@ -589,7 +589,7 @@ endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ - $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_ALL_DEPENDENCIES)),\ + $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_DEPENDENCIES)),\ $(eval $(call CHECK_ONE_DEPENDENCY,$(pkg),$(dep))$(sep)))) endif -- 2.25.1 From wiselord1983 at gmail.com Wed Jan 5 21:40:46 2022 From: wiselord1983 at gmail.com (Uladzimir Bely) Date: Thu, 6 Jan 2022 00:40:46 +0300 Subject: [Buildroot] [PATCH] package/linux-firmware: add option for Cypress FullMAC Message-ID: <20220105214046.14890-1-wiselord1983@gmail.com> Since 2016, Cypress is in charge of supporting old Broadcom wireless chips and producing new ones. Newer firmwares for now come with a different license and have anoter location in a package. Now, most of Broadcom FullMac firmwares in brcm/ directory should now be just symlinks to the corresponding files in cypress/ directory. Respectively, it also makes sence to autoselect corresponding CYPRESS options if user selectes BRCM wireless stuff. This patch was created as a result of investigation the issue with broken wireless support for such popular boards as Raspberry Pi Zero W and BananaPi M2 Zero. Signed-off-by: Uladzimir Bely --- package/linux-firmware/Config.in | 17 ++++++++++ package/linux-firmware/linux-firmware.hash | 1 + package/linux-firmware/linux-firmware.mk | 39 ++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 622b1ee685..c94ffe24de 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -140,11 +140,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX bool "Broadcom BRCM bcm43xx" + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX help Firmware files for the Broadcom bcm43xx SoftMAC and FullMAC. config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX bool "Broadcom BRCM bcm43xxx" + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX help Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. @@ -158,6 +160,21 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0 help Firmware file for the Broadcom 4366c0 FullMAC chip. +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX + bool "Cypress CY cyw43xx" + help + Firmware files for the Cypress cyw43xx FullMAC. + +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX + bool "Cypress CY cyw43xxx" + help + Firmware files for the Cypress cyw43xxx FullMAC. + +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX + bool "Cypress CY cyw54xxx" + help + Firmware files for the Cypress cyw54xxx FullMAC. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index d8edb37628..4c73374138 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -11,6 +11,7 @@ sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware +sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 281ed0189d..ac45bc8282 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -675,6 +675,45 @@ LINUX_FIRMWARE_FILES += brcm/brcmfmac4366c-pcie.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif +# cyfmac43xx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac4339-sdio.bin \ + cypress/cyfmac4354-sdio.bin \ + cypress/cyfmac4354-sdio.clm_blob \ + cypress/cyfmac4356-pcie.bin \ + cypress/cyfmac4356-pcie.clm_blob \ + cypress/cyfmac4356-sdio.bin \ + cypress/cyfmac4356-sdio.clm_blob \ + cypress/cyfmac4373-sdio.bin \ + cypress/cyfmac4373-sdio.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + +# cyfmac43xxx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac43012-sdio.bin \ + cypress/cyfmac43012-sdio.clm_blob \ + cypress/cyfmac43340-sdio.bin \ + cypress/cyfmac43362-sdio.bin \ + cypress/cyfmac43430-sdio.bin \ + cypress/cyfmac43430-sdio.clm_blob \ + cypress/cyfmac43455-sdio.bin \ + cypress/cyfmac43455-sdio.clm_blob \ + cypress/cyfmac43570-pcie.bin \ + cypress/cyfmac43570-pcie.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + +# cyfmac54xxx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac54591-pcie.bin \ + cypress/cyfmac54591-pcie.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + # ql2xxx ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX),y) LINUX_FIRMWARE_FILES += \ -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 5 22:03:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:03:24 +0100 Subject: [Buildroot] [git commit] package/bmx7: new package Message-ID: <20220105215728.A43E382AE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e065065777e2955f385ae51b14c9f284b83e477 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch will provide an initial package for bmx7 project. Signed-off-by: Jos?? Pekkarinen Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...dule.c-378-36-error-SIOCGSTAMP-undeclared.patch | 28 +++++++++++++++++ package/bmx7/0002-Fix-linking-error.patch | 29 ++++++++++++++++++ ...eorder-includes-to-avoid-ethhdr-collision.patch | 35 ++++++++++++++++++++++ package/bmx7/Config.in | 15 ++++++++++ package/bmx7/bmx7.hash | 3 ++ package/bmx7/bmx7.mk | 21 +++++++++++++ 8 files changed, 133 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 37c792816a..4cb07b6d9a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1485,6 +1485,7 @@ F: package/zfs/ F: support/testing/tests/package/test_zfs.py N: Jos?? Pekkarinen +F: package/bmx7/ F: package/softhsm2/ N: Joseph Kogut diff --git a/package/Config.in b/package/Config.in index 7148639735..d90fb5c450 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2145,6 +2145,7 @@ endif source "package/bluez-tools/Config.in" source "package/bluez5_utils/Config.in" source "package/bmon/Config.in" + source "package/bmx7/Config.in" source "package/boinc/Config.in" source "package/brcm-patchram-plus/Config.in" source "package/bridge-utils/Config.in" diff --git a/package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch b/package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch new file mode 100644 index 0000000000..d627cf6165 --- /dev/null +++ b/package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch @@ -0,0 +1,28 @@ +From f16fa9796e05ca9ea6ee764b3c1f0b8baed535e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 14:35:45 +0200 +Subject: [PATCH] Fix schedule.c:378:36: error: 'SIOCGSTAMP' undeclared +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jos?? Pekkarinen +--- + src/schedule.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/schedule.c b/src/schedule.c +index 8868b01..09ab248 100644 +--- a/src/schedule.c ++++ b/src/schedule.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + + #include "list.h" +-- +2.30.2 + diff --git a/package/bmx7/0002-Fix-linking-error.patch b/package/bmx7/0002-Fix-linking-error.patch new file mode 100644 index 0000000000..04354c6a0a --- /dev/null +++ b/package/bmx7/0002-Fix-linking-error.patch @@ -0,0 +1,29 @@ +From 974541b80bf8d7ec78ed9214a1b541957670f9cd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 14:36:55 +0200 +Subject: [PATCH] Fix linking error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jos?? Pekkarinen +--- + src/bmx.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bmx.h b/src/bmx.h +index 4269903..7789f7f 100644 +--- a/src/bmx.h ++++ b/src/bmx.h +@@ -290,7 +290,7 @@ enum ADGSN { + #define SUCCESS 0 + #define FAILURE -1 + +-const void* FAILURE_PTR; ++extern const void* FAILURE_PTR; + + + #define MAX_SELECT_TIMEOUT_MS 1100 /* MUST be smaller than (1000/2) to fit into max tv_usec */ +-- +2.30.2 + diff --git a/package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch b/package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch new file mode 100644 index 0000000000..75cc392513 --- /dev/null +++ b/package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch @@ -0,0 +1,35 @@ +From fc13da06c1de4d085e21dc2bf45e1e95eb6145d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 14:37:37 +0200 +Subject: [PATCH] Reorder includes to avoid ethhdr collision +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jos?? Pekkarinen +--- + src/ip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ip.c b/src/ip.c +index cd50074..4198e92 100644 +--- a/src/ip.c ++++ b/src/ip.c +@@ -43,13 +43,13 @@ + #include + #include + +-#include /* TUNSETPERSIST, ... */ + #include + + #ifndef BMX7_LIB_IWINFO + #define BMX7_LIB_IW + #include + #endif ++#include /* TUNSETPERSIST, ... */ + //#include + // apt-get install libiw-dev + //#include +-- +2.30.2 + diff --git a/package/bmx7/Config.in b/package/bmx7/Config.in new file mode 100644 index 0000000000..6fa6a07997 --- /dev/null +++ b/package/bmx7/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_BMX7 + bool "bmx7" + depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_MBEDTLS + select BR2_PACKAGE_WIRELESS_TOOLS + select BR2_PACKAGE_WIRELESS_TOOLS_LIB + help + BMX7 is a mesh routing protocol for Linux based + operating systems. + + https://github.com/bmx-routing/bmx7 + +comment "bmx7 needs a toolchain with dynamic library support" + depends on BR2_STATIC_LIBS diff --git a/package/bmx7/bmx7.hash b/package/bmx7/bmx7.hash new file mode 100644 index 0000000000..39203c979f --- /dev/null +++ b/package/bmx7/bmx7.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5f88df1c95e5cb842a6016bb1604e3e7f6097c63c5c9916edc3c84e96d4f5f65 bmx7-7.1.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/bmx7/bmx7.mk b/package/bmx7/bmx7.mk new file mode 100644 index 0000000000..54a9cc8eb5 --- /dev/null +++ b/package/bmx7/bmx7.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# bmx7 +# +################################################################################ + +BMX7_VERSION = 7.1.1 +BMX7_SITE = $(call github,bmx-routing,bmx7,v$(BMX7_VERSION)) +BMX7_LICENSE = GPL-2.0 +BMX7_LICENSE_FILES = LICENSE +BMX7_DEPENDENCIES = zlib mbedtls wireless_tools + +define BMX7_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(d)/src +endef + +define BMX7_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/src/bmx7 $(TARGET_DIR)/usr/bin/bmx7 +endef + +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Wed Jan 5 22:23:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:23:48 +0100 Subject: [Buildroot] [PATCH 3/7] package/bmx7: new package In-Reply-To: <20211210141209.1812043-3-jose.pekkarinen@unikie.com> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-3-jose.pekkarinen@unikie.com> Message-ID: <20220105232348.68986536@windsurf> Hello Jos?, On Fri, 10 Dec 2021 16:12:05 +0200 Jos? Pekkarinen wrote: > This patch will provide an initial package > for bmx7 project. > > Signed-off-by: Jos? Pekkarinen I have applied this patch, with a few changes (see below). But I must say I hesitated. Do you really use this? This project has not seen any updates since July 2019, there is a simple pull request fixing the SIOCGSTAMP issue that has never been looked at, and there are alternatives such as olsr and batman-adv which are actively maintained. Also, gcc generates tons and tons of warnings, which is quite worrying, as gcc tends to become more and more strict, and upstream is no longer active. So I've applied, but I really hesitated. > diff --git a/package/bmx7/Config.in b/package/bmx7/Config.in > new file mode 100644 > index 0000000000..3c13c047e9 > --- /dev/null > +++ b/package/bmx7/Config.in > @@ -0,0 +1,16 @@ > +config BR2_PACKAGE_BMX7 > + bool "bmx7" > + depends on !BR2_STATIC_LIBS # dlopen() > + select BR2_PACKAGE_ZLIB > + select BR2_PACKAGE_LIBZLIB I dropped that, and tested it builds fine with zlib-ng. > +BMX7_VERSION = v7.1.1 > +BMX7_SOURCE = $(BMX7_VERSION).tar.gz > +BMX7_SITE = https://github.com/bmx-routing/bmx7/archive/refs/tags Changed that to use the github macro that we have in Buildroot. > +BMX7_LICENSE = GPL-2 Changed to GPL-2.0. > +BMX7_LICENSE_FILES = LICENSE > +BMX7_DEPENDENCIES = zlib mbedtls wireless_tools > + > +define BMX7_BUILD_CMDS > + (cd $(@D); \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d)/src CC="$(TARGET_CC)") Changed to: $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(d)/src I.e, not need to cd into $(@D), and then using $(TARGET_CONFIGURE_OPTS) to pass all variables, not just CC. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 5 22:29:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 5 Jan 2022 23:29:18 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/cross-ldd: new package In-Reply-To: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> Message-ID: <20220105222918.GK614810@scaer> Thierry, All, On 2021-12-23 12:13 +0100, Thierry Bultel spake thusly: > cross-ldd works just as ldd, but supports > other architectures. It is needed by dracut, for instance. > > Signed-off-by: Thierry Bultel > --- [--SNIP--] > diff --git a/package/cross-ldd/Config.in b/package/cross-ldd/Config.in > new file mode 100644 > index 0000000000..3858fbc5fe > --- /dev/null > +++ b/package/cross-ldd/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_HOST_CROSS_LDD > + bool "cross-ldd" I don't think this tool warrants a Kconfig entry. I.e. it should be a blind host-only package, with no Config.in. > + help > + ldd drop-in replacement for cross-compilation > + toolchains. > + This is the officially supported version mentioned > + in the dracut documentation It would have been nice to add a pointer to that documentation (I spent quite some time look for it...). It's in: docs/README.cross > diff --git a/package/cross-ldd/cross-ldd.mk b/package/cross-ldd/cross-ldd.mk > new file mode 100644 > index 0000000000..fc0752adff > --- /dev/null > +++ b/package/cross-ldd/cross-ldd.mk > @@ -0,0 +1,19 @@ > +################################################################################ > +# > +# cross-ldd > +# > +################################################################################ > + > +CROSS_LDD_VERSION = 6c9c724ebd6a29c279c6e5734e44c07f067808ec > +CROSS_LDD_SOURCE = $(CROSS_LDD_VERSION).tar.gz > +CROSS_LDD_SITE = https://gist.github.com/jerome-pouiller/c403786c1394f53f44a3b61214489e6f/archive I find it really sad that we have to use a random gist without proper packaging or repository... :-( But I guess we don't have much options... You are missing the license for that script: CROSS_LDD_LICENSE = GPL-2.0 (I should know, I wrote it! ;-) And incidentally, it is also mentioned in the help text.) > +# Notice that we change the name to '-ldd-cross', in order to avoid conflict > +# with some external toolchains that implement it -ldd-cross is still too generic. Make it really specific to buildroot, by calling it -ldd-buildroot > +define HOST_CROSS_LDD_INSTALL_CMDS > + $(SED) 's/-ldd}/-ldd-cross}'/g $(@D)/cross-compile-ldd > + install -D -m 755 $(@D)/cross-compile-ldd $(TARGET_CROSS)ldd-cross > +endef This install comand does two things: - modify the source script - install the modified script Semantically, we want to separate actions that happen in the source tree into one of the extract, patch, configure, or build commands. Also, usually, we shy away from patching with sed expressions, and we prefer actual patches. Regards, Yann E. MORIN. > + > +$(eval $(host-generic-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Jan 5 22:38:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:38:53 +0100 Subject: [Buildroot] [git commit] package/alfred: new package Message-ID: <20220105223312.16076832CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b61366f3cc52ea54f9b5719d25ab09e595f53173 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Jos?? Pekkarinen Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/alfred/Config.in | 20 ++++++++++++++++++++ package/alfred/alfred.hash | 5 +++++ package/alfred/alfred.mk | 25 +++++++++++++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4cb07b6d9a..4b04f90ccb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1485,6 +1485,7 @@ F: package/zfs/ F: support/testing/tests/package/test_zfs.py N: Jos?? Pekkarinen +F: package/alfred/ F: package/bmx7/ F: package/softhsm2/ diff --git a/package/Config.in b/package/Config.in index d90fb5c450..9f4ab72a80 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2121,6 +2121,7 @@ endmenu menu "Networking applications" source "package/aircrack-ng/Config.in" + source "package/alfred/Config.in" source "package/aoetools/Config.in" source "package/apache/Config.in" if BR2_PACKAGE_APACHE diff --git a/package/alfred/Config.in b/package/alfred/Config.in new file mode 100644 index 0000000000..bfcfef0d40 --- /dev/null +++ b/package/alfred/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_ALFRED + bool "alfred" + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + select BR2_PACKAGE_LIBNL + help + Alfred is a user space daemon for distributing arbitrary + local information over the mesh/network in a decentralized + fashion. + + This data can be anything which appears to be useful - + originally designed to replace the batman-adv visualization + (vis), you may distribute hostnames, phone books, + administration information, DNS information, the local + weather forecast ... + + https://www.open-mesh.org/projects/alfred/wiki + +comment "alfred needs a toolchain w/ dynamic library, threads" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash new file mode 100644 index 0000000000..0799071231 --- /dev/null +++ b/package/alfred/alfred.hash @@ -0,0 +1,5 @@ +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2021.4.tar.gz.sha1 +sha1 be1e9c1317d40e46cfc881a31c632fec78c620a1 alfred-2021.4.tar.gz +# Locally computed +sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk new file mode 100644 index 0000000000..ed59066393 --- /dev/null +++ b/package/alfred/alfred.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# alfred +# +################################################################################ + +ALFRED_VERSION = 2021.4 +ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred +ALFRED_LICENSE = GPL-2.0 +ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 +ALFRED_DEPENDENCIES = libnl + +define ALFRED_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) \ + CONFIG_ALFRED_CAPABILITIES=n \ + CONFIG_ALFRED_GPSD=n +endef + +define ALFRED_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/alfred $(TARGET_DIR)/usr/bin/alfred + $(INSTALL) -m 0755 -D $(@D)/vis/batadv-vis $(TARGET_DIR)/usr/bin/batadv-vis +endef + +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Wed Jan 5 22:43:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:43:03 +0100 Subject: [Buildroot] [PATCH 4/7] package/alfred: new package In-Reply-To: <20211210141209.1812043-4-jose.pekkarinen@unikie.com> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-4-jose.pekkarinen@unikie.com> Message-ID: <20220105234303.28cabcc2@windsurf> Hello Jos?, On Fri, 10 Dec 2021 16:12:06 +0200 Jos? Pekkarinen wrote: > This patch will provide the initial > package for alfred project. > > Signed-off-by: Jos? Pekkarinen I have applied your patch, but after doing a number of changes. See below. > diff --git a/package/alfred/Config.in b/package/alfred/Config.in > new file mode 100644 > index 0000000000..5f9c6f2a6e > --- /dev/null > +++ b/package/alfred/Config.in > @@ -0,0 +1,20 @@ > +config BR2_PACKAGE_ALFRED > + bool "alfred" > + depends on !BR2_STATIC_LIBS # dlopen() > + select BR2_PACKAGE_LIBNL You have forgotten to account for the threads dependency of libnl, which must be replicated here; > + select BR2_PACKAGE_LIBCAP > + select BR2_PACKAGE_GPSD Neither libcap and gpsd are mandatory dependencies (see the README file from the alfred code base for details). So I dropped these entirely. If you want to have support for libcap and gpsd, you need to handle them in the .mk file like this: ifeq ($(BR2_PACKAGE_LIBCAP),y) ... do something ... else ... do something else ... endif > +comment "alfred needs a toolchain with dynamic library support" > + depends on BR2_STATIC_LIBS Modified to account for the threads dependency. > diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash > new file mode 100644 > index 0000000000..a2dd0116d7 > --- /dev/null > +++ b/package/alfred/alfred.hash > @@ -0,0 +1,4 @@ > +# From https://downloads.open-mesh.org/batman/stable/sources/alfred As pointed out by Giulio, this didn't make sense, as it doesn't point to a file that contains the sha256, and actually no file there contains the sha256. So instead I've added the sha1 from the file provided by upstream, and put the sha256 hash under the "Locally computed" comment. > +sha256 4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95 alfred-2021.4.tar.gz > +# Locally computed > +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 > diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk > new file mode 100644 > index 0000000000..4e38ddad92 > --- /dev/null > +++ b/package/alfred/alfred.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# alfred > +# > +################################################################################ > + > +ALFRED_VERSION = 2021.4 > +ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred > +ALFRED_LICENSE = GPL-2 used GPL-2.0 here, which is the correct SPDX code for the GPLv2. > +ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 > +ALFRED_DEPENDENCIES = libnl libcap gpsd Dropped libcap and gpsd from here. > + > +define ALFRED_BUILD_CMDS > + (cd $(@D); \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) CC="$(TARGET_CC)") Several things were wrong: - cd $(@D) was not needed, since you're doing -C $(@D) - the $(d) was wrong, as $(d) is an empty variable - doing that within a subshell is not necessary - passing $(TARGET_CONFIGURE_OPTS) is preferred over passing just CC. Applied with those changes, thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 5 22:44:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 5 Jan 2022 23:44:42 +0100 Subject: [Buildroot] [git commit] package/bmx7: drop useless $(d) Message-ID: <20220105223933.7B7C5832C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b4e139770b03a50dd93202bff50d2acda113346 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This was overlooked in commit 8e065065777e2955f385ae51b14c9f284b83e477 ("package/bmx7: new package") Signed-off-by: Thomas Petazzoni --- package/bmx7/bmx7.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bmx7/bmx7.mk b/package/bmx7/bmx7.mk index 54a9cc8eb5..7eb8a3d6ca 100644 --- a/package/bmx7/bmx7.mk +++ b/package/bmx7/bmx7.mk @@ -11,7 +11,7 @@ BMX7_LICENSE_FILES = LICENSE BMX7_DEPENDENCIES = zlib mbedtls wireless_tools define BMX7_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(d)/src + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/src endef define BMX7_INSTALL_TARGET_CMDS From wiselord1983 at gmail.com Wed Jan 5 23:15:43 2022 From: wiselord1983 at gmail.com (Uladzimir Bely) Date: Thu, 6 Jan 2022 02:15:43 +0300 Subject: [Buildroot] [PATCH] package/python-mpd2: new package Message-ID: <20220105231543.22467-1-wiselord1983@gmail.com> A client interface for the Music Player Daemon. Signed-off-by: Uladzimir Bely --- package/Config.in | 1 + package/python-mpd2/Config.in | 8 ++++++++ package/python-mpd2/python-mpd2.hash | 5 +++++ package/python-mpd2/python-mpd2.mk | 13 +++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-mpd2/Config.in create mode 100644 package/python-mpd2/python-mpd2.hash create mode 100644 package/python-mpd2/python-mpd2.mk diff --git a/package/Config.in b/package/Config.in index 7148639735..b9dc9b49e7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1091,6 +1091,7 @@ menu "External python modules" source "package/python-mistune/Config.in" source "package/python-modbus-tk/Config.in" source "package/python-more-itertools/Config.in" + source "package/python-mpd2/Config.in" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in new file mode 100644 index 0000000000..015ca47610 --- /dev/null +++ b/package/python-mpd2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MPD2 + bool "python-mpd2" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_MPD # runtime + help + A Python MPD client library. + + https://github.com/Mic92/python-mpd2 diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash new file mode 100644 index 0000000000..83487257ee --- /dev/null +++ b/package/python-mpd2/python-mpd2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-mpd2/json +md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz +sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz +# Locally computed sha256 checksums +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk new file mode 100644 index 0000000000..6a7358e8cd --- /dev/null +++ b/package/python-mpd2/python-mpd2.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-mpd2 +# +################################################################################ + +PYTHON_MPD2_VERSION = 3.0.4 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 +PYTHON_MPD2_SETUP_TYPE = setuptools +PYTHON_MPD2_LICENSE = GNU Library or Lesser General Public License (LGPL) +PYTHON_MPD2_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From yann.morin.1998 at free.fr Wed Jan 5 23:16:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 00:16:54 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dracut: new host package In-Reply-To: <20211223111348.3532601-2-thierry.bultel@linatsea.fr> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-2-thierry.bultel@linatsea.fr> Message-ID: <20220105231654.GL614810@scaer> Thierry, All, On 2021-12-23 12:13 +0100, Thierry Bultel spake thusly: > dracut is the tool used by desktop distributions to > build initrds. In the embedded world, it can be > very usefull, too, for instance when wanting to > create an initramfs for a system recovery mode. > Whereas it is definitively possible to achieve > this with buildroot, the process is to have a > dedicated buildroot configuration for that, > and perform a full build. Instead of doing that, > the idea is to use dracut to pick the needed > binaries/shared libraries, configuration files, > or kernel modules from the 'target' directory. > The advantage is to save build time, and also > to have a consistency between the packages versions > taken for the recovery and the production filesystem. Please, wrap your commit log to ~72 chars. > Signed-off-by: Thierry Bultel > --- [--SNIP--] > diff --git a/package/dracut/05busybox-buildroot/module-setup.sh b/package/dracut/05busybox-buildroot/module-setup.sh > new file mode 100755 > index 0000000000..b227571db4 > --- /dev/null > +++ b/package/dracut/05busybox-buildroot/module-setup.sh You will have to (briefly, maybe) explain how those 'modules' are meant to be used... > @@ -0,0 +1,69 @@ > +#!/bin/bash ... here you make it an executable (0755) shell script, but it only defines functions, it actually calls nothing. Are moduels supposed to be source-d from dracut itself? > +check() { > + require_binaries \ > + busybox | return 1 This can't possibly work: it will always fail (there is a single pipe, so the whole command will fail). Then what happens depends on whether the shell is set -e or not. If it is not set -e, the execution continues, and the check() function will always return 0 (success). If the shell is set -e, then execution of check() ends right there, and presumably check() is called as an if-block condition, and thus the condition will never be true. So, it was not tested? ;-) (also: commands that fit on a line should be on a single line, like so: require_binaries busybox || return 1 ) > + return 0 > +} > + > +depends() { > + return 0 > +} > + > + > +install_busybox_links() { > + dir=$1 > + linkname=$2 > + > + (cd "$dracutsysrootdir"$dir && $ shellcheck package/dracut/05busybox-buildroot/module-setup.sh (cd "$dracutsysrootdir"$dir && ^--^ SC2086: Double quote to prevent globbing and word splitting. Also, please do variable expansion with curly braces (everywhere): "${dracutsysrootdir}${dir}" > + for x in *; do > + if [ "$(readlink "$x")" = $linkname ]; then > + ln -sf $linkname $initdir/$dir/$x > + fi > + done > + ) > + > +} > + > +install() { > + No initial empty line at begining of function. [--SNIP--] > +# mkdir -p $initdir/etc/init.d > +# cp -a $dracutsysrootdir/etc/init.d/* $initdir/etc/init.d Commented-out debug code or non-function code should just be removed. > + No empty line at the end of function. > +} > + > diff --git a/package/dracut/06uclibc/module-setup.sh b/package/dracut/06uclibc/module-setup.sh > new file mode 100644 > index 0000000000..77e9bd864e > --- /dev/null > +++ b/package/dracut/06uclibc/module-setup.sh > @@ -0,0 +1,20 @@ > +#!/bin/bash > + > +check() { > + return 0 > +} > + > +depends() { > + return 0 > +} > + > + > + > +install() { > + > + # Despite of the fact that the listed dependency (reported by readelf -d) > + # is purely ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too > + > + ln -s ld-uClibc.so.1 $initdir/lib/ld-uClibc.so.0 > + Extra empty lines... But still, a little explanations (in the commit log) on how those scripts are supposed to be used would help further review. [--SNIP--] > diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk > new file mode 100644 > index 0000000000..6c82b4ba75 > --- /dev/null > +++ b/package/dracut/dracut.mk > @@ -0,0 +1,45 @@ > +################################################################################ > +# > +# dracut > +# > +################################################################################ > + > +DRACUT_VERSION = 055 > +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz > +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut > +DRACUT_LICENSE = GPL-2.0 > +DRACUT_LICENSE_FILES = COPYING > + > +HOST_DRACUT_DEPENDENCIES += host-pkgconf host-kmod host-cross-ldd First assignment should not be +=, but just =. > +define HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT > + $(SED) '/unset LD_LIBRARY_PATH/d' $(HOST_DIR)/bin/dracut > + $(SED) '/unset LD_PRELOAD/d' $(HOST_DIR)/bin/dracut As for cross-ldd, we prefer that patching be done with actual patches rather than sed expressions. > +endef > + > +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT > + $(INSTALL) -D -m 0755 package/dracut/dracut_wrapper.sh \ > + $(HOST_DIR)/usr/bin/dracut_wrapper.sh Your commit log does not explain the reason why we need to have a wrapper, or how it is going to be used... Usually, when we introduce a wrapper, it replace sthe original executable in name, and the original is renamed, with the wrapper eventually calling into the renamed original... So having a wrapper installed as you do it is slightly off-road... > +endef > + > +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) > +define HOST_DRACUT_POST_INSTALL_UCLIBC_MODULE > + $(INSTALL) -D -m 0755 package/dracut/06uclibc/module-setup.sh \ > + $(HOST_DIR)/lib/dracut/modules.d/06uclibc/module-setup.sh > +endef > +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_UCLIBC_MODULE > +endif And what about glibc? musl? Can we unconditionally install the modules and change their check() functions to decide whther the moduels is usable or not? Or something else dynamic? > +ifeq ($(BR2_INIT_BUSYBOX),y) > +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE > + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ > + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh > +endef > +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE And what about systemd as an init system? openrc? sysv-init? Others? > +endif > + > +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT > +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT Spaces around the operator. Also, since this is the same hook, a single assignment is better: HOST_DRACUT_POST_INSTALL_HOOKS += \ HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT \ HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT Note: we prefer to have uncondtional asignemnts come before the conditional ones, and we also prefer to have ythe hook assignment come right after the hook definitionm like so: define HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT blabla endef HOST_DRACUT_POST_INSTALL_HOOKS = HOST_DRACUT_POST_INSTALL_ENABLE_FAKEROOT define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT blabla endef HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT ifeq ($(BR2_INIT_BUSYBOX),y) define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE blabla endef HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE endif and so on... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Thu Jan 6 06:24:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:24:04 -0700 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected Message-ID: <20220106062407.3131530-1-james.hilliard1@gmail.com> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may not need to be selected in kconfig in cases where building is not desired, so only check that _FINAL_DEPENDENCIES are selected. Signed-off-by: James Hilliard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ac98b84425..7a2da3b043 100644 --- a/Makefile +++ b/Makefile @@ -589,7 +589,7 @@ endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ - $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_ALL_DEPENDENCIES)),\ + $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_DEPENDENCIES)),\ $(eval $(call CHECK_ONE_DEPENDENCY,$(pkg),$(dep))$(sep)))) endif -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 6 06:24:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:24:05 -0700 Subject: [Buildroot] [PATCH v2 2/4] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220106062407.3131530-1-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> Message-ID: <20220106062407.3131530-2-james.hilliard1@gmail.com> This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium. Signed-off-by: James Hilliard --- .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 0000000000..8190a6dd5d --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 0000000000..fac3c996fa --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 6 06:24:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:24:07 -0700 Subject: [Buildroot] [PATCH v2 4/4] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220106062407.3131530-1-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> Message-ID: <20220106062407.3131530-4-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags. Create a .git file so to trigger headers sync during configure. Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 13 ++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 71 files changed, 216 insertions(+), 386 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..d10847ea04 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ba2971dc08..294542fabb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..58e167e483 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..8c0e02152d 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4bdb90b203 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..abffc2891d 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..d48a37fafe 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 84bc291739..3b14284e37 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -6,7 +6,7 @@ QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 6 06:33:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:33:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit-examples: remove package Message-ID: <20220106063308.3132088-1-james.hilliard1@gmail.com> This package seems to have issues building with the latest qt5webkit release, as it has not received updates upstream since 2017 remove it as it is unlikely to be fixed. Signed-off-by: James Hilliard --- Config.in.legacy | 7 ++ .../0001-Build-examples.patch | 52 ------------- .../0002-Fix-QWebView-path.patch | 73 ------------------- .../0003-Fix-QPainterPath-include.patch | 36 --------- package/qt5/qt5webkit-examples/Config.in | 10 --- .../qt5webkit-examples.hash | 8 -- .../qt5webkit-examples/qt5webkit-examples.mk | 26 ------- 7 files changed, 7 insertions(+), 205 deletions(-) delete mode 100644 package/qt5/qt5webkit-examples/0001-Build-examples.patch delete mode 100644 package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch delete mode 100644 package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch delete mode 100644 package/qt5/qt5webkit-examples/Config.in delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk diff --git a/Config.in.legacy b/Config.in.legacy index e5349e58ac..004506e4bb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES + bool "qt5webkit-examples removed" + select BR2_LEGACY + help + The qt5webkit-examples package is unmaintained and has been + removed. + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" select BR2_LEGACY diff --git a/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/package/qt5/qt5webkit-examples/0001-Build-examples.patch deleted file mode 100644 index cd925e21c5..0000000000 --- a/package/qt5/qt5webkit-examples/0001-Build-examples.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 28 Nov 2017 23:14:42 -0500 -Subject: [PATCH] Build examples -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -This patch improves the qt5webkit examples build for 2 aspects: - - - Allows to build even if qt5base examples are not enabled - - Builds xmlpatterns example only if the qt5xmlpattern package - has been built - -Signed-off-by: Massimo Callegari -Signed-off-by: Ga?l PORTAY -[gportay: build imageanalyzer example if concurrent module is built] ---- - examples/webkitwidgets/webkitwidgets.pro | 7 ++++--- - qtwebkit-examples.pro | 1 + - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro -index ab20df4..67f6785 100644 ---- a/examples/webkitwidgets/webkitwidgets.pro -+++ b/examples/webkitwidgets/webkitwidgets.pro -@@ -4,9 +4,10 @@ SUBDIRS += domtraversal \ - previewer \ - fancybrowser \ - simpleselector \ -- imageanalyzer \ - framecapture \ - browser \ - embedded \ -- scroller \ -- xmlpatterns -+ scroller -+ -+qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns -+qtHaveModule(concurrent): SUBDIRS += imageanalyzer -diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro -index 3fcecf1..2ade7ff 100644 ---- a/qtwebkit-examples.pro -+++ b/qtwebkit-examples.pro -@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit)) - load(qt_parts) - - SUBDIRS += doc -+SUBDIRS += examples --- -2.15.0 - diff --git a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch deleted file mode 100644 index 30aab30167..0000000000 --- a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9fa73707216bd55dff380031a33aca701a7d9c8b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 May 2019 23:29:05 +0200 -Subject: [PATCH] Fix QWebView path - -QWebView is installed under QtWebKitWidgets - -Fixes: - - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e - -Signed-off-by: Fabrice Fontaine ---- - examples/webkitwidgets/formextractor/formextractor.ui | 2 +- - examples/webkitwidgets/previewer/previewer.ui | 2 +- - examples/webkitwidgets/simpleselector/window.ui | 2 +- - .../xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/examples/webkitwidgets/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui -index 5c4afec..a38bdd5 100644 ---- a/examples/webkitwidgets/formextractor/formextractor.ui -+++ b/examples/webkitwidgets/formextractor/formextractor.ui -@@ -151,7 +151,7 @@ - - QWebView - QWidget --
    QtWebKit/QWebView
    -+
    QtWebKitWidgets/QWebView
    -     - - -diff --git a/examples/webkitwidgets/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui -index d4c9992..69adb2e 100644 ---- a/examples/webkitwidgets/previewer/previewer.ui -+++ b/examples/webkitwidgets/previewer/previewer.ui -@@ -74,7 +74,7 @@ - - QWebView - QWidget --
    QtWebKit/QWebView
    -+
    QtWebKitWidgets/QWebView
    -     - - -diff --git a/examples/webkitwidgets/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui -index aa824df..7906186 100644 ---- a/examples/webkitwidgets/simpleselector/window.ui -+++ b/examples/webkitwidgets/simpleselector/window.ui -@@ -64,7 +64,7 @@ - - QWebView - QWidget --
    QtWebKit/QWebView
    -+
    QtWebKitWidgets/QWebView
    -     - - -diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -index ad43284..000cae7 100644 ---- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; } - - QWebView - QWidget --
    QtWebKit/QWebView
    -+
    QtWebKitWidgets/QWebView
    -     - - --- -2.20.1 - diff --git a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch b/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch deleted file mode 100644 index 2d5e8fae9a..0000000000 --- a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 452123a4491b26c5b078934477bd5864f1d004e4 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 28 May 2020 20:58:26 +0200 -Subject: [PATCH] Fix QPainterPath include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add missing QPainterPath (needed for Qt-5.15.0 compile). - -Fixes: - - searchlineedit.cpp:121:18: error: aggregate ?QPainterPath myPath? has incomplete type and cannot be defined - QPainterPath myPath; - ^~~~~~ - -Signed-off-by: Peter Seiderer ---- - examples/webkitwidgets/browser/searchlineedit.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/webkitwidgets/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp -index fbd73cb..7462c82 100644 ---- a/examples/webkitwidgets/browser/searchlineedit.cpp -+++ b/examples/webkitwidgets/browser/searchlineedit.cpp -@@ -34,6 +34,7 @@ - #include "searchlineedit.h" - - #include -+#include - #include - #include - #include --- -2.26.2 - diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in deleted file mode 100644 index 47bbcbaa68..0000000000 --- a/package/qt5/qt5webkit-examples/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_QT5WEBKIT_EXAMPLES - bool "qt5webkit-examples" - depends on BR2_PACKAGE_QT5WEBKIT - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package contains examples for the qt5webkit module. - - http://qt.io diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash deleted file mode 100644 index ea64f6f14e..0000000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz - -# Hashes for license files: -sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 -sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 -sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 -sha256 d3d9052b838761dbe00067168ed9ebc437734d53ebf71dea1c8e9f7532a5333b LICENSE.GPLv3 diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk deleted file mode 100644 index 84bc291739..0000000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# qt5webkit-examples -# -################################################################################ - -QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 -QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit - -QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 - -QT5WEBKIT_EXAMPLES_LICENSE = LGPL-2.1 with exception or LGPL-3 or GPL-2 or GPL-3 -# Source files contain references to LGPL_EXCEPTION.txt but it is not included -# in the archive. - -ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative -endif - -$(eval $(qmake-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Thu Jan 6 06:59:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 06 Jan 2022 06:59:31 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-05 Message-ID: <20220106065936.D6F5340291@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-05 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 67 | 6 | 0 | 73 | 2021.11.x | 29 | 9 | 0 | 38 | master | 99 | 64 | 0 | 163 | Classification of failures by reason for master ----------------------------------------------- xxhash-0.8.1 | 12 rygel-0.40.2 | 6 unknown | 6 host-file-5.41 | 4 cryptsetup-2.4.2 | 3 host-libsepol-3.3 | 3 mdadm-4.2 | 3 frr-8.1 | 2 gstreamer1-mm-1.10.0 | 2 ksmbd-tools-3.4.3 | 2 suricata-6.0.4 | 2 wavemon-0.9.4 | 2 android-tools-4.2.2+git2013... | 1 bird-2.0.8 | 1 efl-1.26.0 | 1 gstd-0.13.0 | 1 guile-3.0.7 | 1 kf5-kcoreaddons-5.47.0 | 1 libmicrohttpd-0.9.75 | 1 mesa3d-21.3.3 | 1 ndisc6-1.0.5 | 1 nodejs-14.18.2 | 1 opencv4-4.5.5 | 1 openipmi-2.0.32 | 1 qpdf-10.5.0 | 1 qt5webkit-5.212.0-alpha4 | 1 rtorrent-0.9.8 | 1 sg3_utils-1.47 | 1 sslh-1.22c | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/5c34c4db4122594d4a33b42f2ab29b0005f45f26 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/7c873e00ecb154ebd7070d31554e2ad908dddf95 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/8fc16173fa495b4c9536f285da8c8fb0180d80c0 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/338d49a38f9ae0e1c587925569383b1273ecad5a | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/69d83271fe06cf82ccde27d64c8b947e3b888fc5 | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/249e485cf93135e0bc48b4fdfea9daba9cbacf72 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/031511608153e3f52494ce709f73dc4d1c52d71f | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a4285d79815ab441bda9058e47846e19867f8719 | xtensa | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/7a9edf71a709c51672b8756d997bce4b6970822e | ORPH arm | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/6ab28825a1844358670fef8235ae50afc9e01359 | ORPH arc | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/d4e9a50b64c6f2768cb23feab188bae50d7caa77 | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/0447ecb4b424ccea38f004851b9aaa36a465596e | ORPH mips64el | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/f9427462f1cad39a71827ee1be6fcfbd25543d00 | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/64e3f0bebaf4b5b70dc6c4a432d48a10d7350b8c | ORPH powerpc | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/841777ac25cd7d928f16a88eb839ba3712d256cd | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/95ac0e73e3269cd917885d9e76b5d185dfe4fef6 | ORPH arc | host-libsepol-3.3 | NOK | http://autobuild.buildroot.net/results/77f1a65462748e78b3394587c995f2ecdad303e3 | arm | host-libsepol-3.3 | NOK | http://autobuild.buildroot.net/results/fc727efc0c658aaae55c83632a91af83701f0c49 | microblazeel | host-libsepol-3.3 | NOK | http://autobuild.buildroot.net/results/cc560919755e4559bfc01215deb8db65833c7d5f | xtensa | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/33783381177cf57abee850395f1c17b4767b2c48 | arc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/adc2a5095cbcd5fc9736b52976fdc0cfdf7efe3a | mips64el | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/fa88c5bc1924dfb352d9b8dddbb7fdbb192a6b07 | or1k | libmicrohttpd-0.9.75 | NOK | http://autobuild.buildroot.net/results/1320dc178f0170b42e4c861247d4531ddcf270d9 | arc | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/2762e8729ea781cd659de23b7946a9eda09a45af | ORPH arc | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/d7bce4874987695cabf3961db2294f2119000912 | ORPH arm | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/c0f216b7aadb794110409d03dcef7fa58e833cd4 | ORPH arm | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/20469984be330dc93d2873f540a5145e923facd3 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/1a48a65f0eba63e25bc654104f5b608e60921630 | ORPH arm | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/37d59def2590726853c9a107eeb4a2bb8a9212da | sh4 | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/8b2e99ed2866fa85b388d8f86f036b7fa0b7f1e8 | arm | openipmi-2.0.32 | NOK | http://autobuild.buildroot.net/results/d2fbfce984930d2ece1439a3a2b97afafb16859c | ORPH m68k | qpdf-10.5.0 | NOK | http://autobuild.buildroot.net/results/b5eff0f523334c9f34b02a418a172d1eccc536a8 | x86_64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/e94357924c031ab677863edfdff7117ae0c83275 | arc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/10fc9016013931c58238240216c5950b23b56b30 | ORPH xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9f2b3adde62b0bd4135d9c6a41549374de11c81e | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3ddba8cce20a209f5da43ea75cda6deef9fa3669 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f941a1a06d7a63dfeb397dbaf8d1b22bfda816b7 | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1986ade783dd8ebc5ec9bf7ea6d07cd91b74095b | microblazeel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1e9c7f5fe117e84a33b704a3cbdfdeb8bf8cb281 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f9434eff4f7dd913bb076d313556d7ce388ec09d | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/ede0b87fc571b6ab5fc7820cfd4fb937258db160 | arm | sslh-1.22c | NOK | http://autobuild.buildroot.net/results/a99a0291d59cbb38f78e7715b817879b830f7bb9 | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/ce5748005ab564f01ca853a91ab8345934ad7965 | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/9e6c249aff2f887be495f7b07cf0d33378325f62 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/0bfc0eaef4318b2bf4ca6acb8aa491d8a5a29853 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/41ba220cf5578da9a2dc620947a1292bf02e736f | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/b5f9b92e82b80352fedb84246879291559f0a8a4 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/f43f75390ed13fdfdafea281bf2de94f78b6a202 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/4f05c462c7633d2ea25f3bf91f9e9d81505775d0 | arm | unknown | NOK | http://autobuild.buildroot.net/results/10e3df5124bf128dc5dad1d346dfa26770622c1d | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/97e2c5112ca99b4935a25cf457650ba0ff5e205c | m68k | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0bf79e6a0699faddf3a95bf8beae7c1fd73fcff5 | sparc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/1927d514c2b2607b835b18710881f3d9eca8b151 | ORPH xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/118ff013af46c984c9886590c37a58343524f2b2 | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/3d924975ad7bfa7b5fe6a3c10b29d115b3e6f0f5 | ORPH microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/bb5bb1b413882df4c14a494b0764c6c45c9cd9d6 | ORPH i686 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6a3fed60835b4c11727e1340ad67b909e06ae56f | ORPH xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/4b4b3ce17c5947104d00d135f30745a524fc7a98 | ORPH microblazeel | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/5595b21a711b482b84e582fc9f56e5468c9eb6d6 | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9f2de7ff56fa8299b86734c31cdb7109098693a4 | ORPH xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/54710f0e7a87c4727e347dd1ba112af3f1630b55 | ORPH arc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/db8771c1b87284d2421140ab90872c29c2bcde12 | ORPH arc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/6e77ca6f27067c2a18206b0decc557b9946f3252 | ORPH sparc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/b396e5a8c96417802cf62ef80cfe43c1513731a3 | ORPH Classification of failures by reason for 2021.02.x -------------------------------------------------- capnproto-0.8.0 | 1 gobject-introspection-1.64.1 | 1 host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 qt5base-5.15.2 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | capnproto-0.8.0 | NOK | http://autobuild.buildroot.net/results/0c179d0a73a90fb909a644f8e7da95fe42982a99 | x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/a5b0f9a0e5feac089a756fc644eed19adb3dc9e3 | ORPH riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e662ce28adc59f65b4196eeac0c05ff83b4c2177 | i586 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/215f7c809ffdc299f3b1a7d2f136e30df627c6b4 | riscv32 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/1ad57d1c2d333e094cf19a0cc13330436eaa9304 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/12c35e4b2300c06ca2387bb45ebaad564b3e8a3a | Classification of failures by reason for 2021.11.x -------------------------------------------------- wavemon-0.9.4 | 2 bird-2.0.8 | 1 host-erlang-22.2 | 1 libqmi-1.30.2 | 1 log4cxx-0.12.0 | 1 ndisc6-1.0.5 | 1 openal-1.21.1 | 1 unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/37653c4495535948a144dd2aa3cd829480ae65f1 | riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/0c54c3e8216bbc46c157d869403ae8d33753a257 | arm | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/1498610256923e8d10f500d36ada245383ceb2b3 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/6d0d676d652f4c7578dae92646b9287d0b65558f | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/4a382bd2c960928574ef6f2572f0de1fe2b08c41 | ORPH or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/161a63a40e56dd317a695091ff7f93531c5e56d2 | arm | unknown | NOK | http://autobuild.buildroot.net/results/d2ed51f0508122d7a56c30507800d5f323ebfd19 | sparc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/46634286e31bb978eca22ef65730295c04655de4 | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/c74b91b4f85446d5cee429d48cdd4bb2c820354c | -- http://autobuild.buildroot.net From bugzilla at busybox.net Thu Jan 6 07:59:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 06 Jan 2022 07:59:58 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #3 from Sreedhar Mahadevan --- Would like to update one development from my end. I cloned the lttng-modules package directly from its Github repository: https://github.com/lttng/lttng-modules >From this lttng-modules environment, I tried building lttng-modules v2.13.0 based on the instructions in its README.md file by referencing the custom linux version that I was using (v5.10.x corresponding to Buildroot v2021.05) and it built successfully. When I tried building lttng-modules v2.12.0 and v2.11.0 and I got the exact error which I encountered in the Buildroot environment (reported earlier in this bug report). I see that buildroot v2021.08 and 2021.11 all continue using lttng-modules v2.11.0 and all seem to have the same issue. Is this possibly the reason for the issue? If yes, how do I solve it? I tried hacking into the buildroot/package/lttng-modules/lttng-modules.mk and lttng-modules.hash files but I still faced issues with the wrong sha256 hashes. Can you please help? -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Thu Jan 6 08:28:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 09:28:57 +0100 Subject: [Buildroot] [git commit] package/python-aexpect: new package Message-ID: <20220106082409.A920582A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63b72a7c15bcd56fe1570e3f7ecd43993c0fde90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package was initially requested by Jos?? Pekkarinen, so he is assigned as the maintainer for it. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-aexpect/Config.in | 8 ++++++++ package/python-aexpect/python-aexpect.hash | 5 +++++ package/python-aexpect/python-aexpect.mk | 14 ++++++++++++++ support/testing/tests/package/sample_python_aexpect.py | 1 + support/testing/tests/package/test_python_aexpect.py | 12 ++++++++++++ 7 files changed, 44 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4b04f90ccb..a52a8cfa38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1487,7 +1487,10 @@ F: support/testing/tests/package/test_zfs.py N: Jos?? Pekkarinen F: package/alfred/ F: package/bmx7/ +F: package/python-aexpect/ F: package/softhsm2/ +F: support/testing/tests/package/sample_python_aexpect.py +F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut F: package/at-spi2-atk/ diff --git a/package/Config.in b/package/Config.in index 9f4ab72a80..cb15574746 100644 --- a/package/Config.in +++ b/package/Config.in @@ -891,6 +891,7 @@ endif if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" + source "package/python-aexpect/Config.in" source "package/python-aioblescan/Config.in" source "package/python-aiocoap/Config.in" source "package/python-aioconsole/Config.in" diff --git a/package/python-aexpect/Config.in b/package/python-aexpect/Config.in new file mode 100644 index 0000000000..eddba8e0b7 --- /dev/null +++ b/package/python-aexpect/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AEXPECT + bool "python-aexpect" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Aexpect. + + http://avocado-framework.github.io/ diff --git a/package/python-aexpect/python-aexpect.hash b/package/python-aexpect/python-aexpect.hash new file mode 100644 index 0000000000..efe4f55fb8 --- /dev/null +++ b/package/python-aexpect/python-aexpect.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aexpect/json +md5 d37473ff0024c15938bfe86a543537e6 aexpect-1.6.4.tar.gz +sha256 3998aa84ae54963fd59488f0caa533f6edbb31bc6cb842da09b041cbad56ad88 aexpect-1.6.4.tar.gz +# Locally computed sha256 checksums +sha256 7be26abf35e531a226dc742d2379d42d372cb61f027a6e26477c0e2f1a03bfcb LICENSE diff --git a/package/python-aexpect/python-aexpect.mk b/package/python-aexpect/python-aexpect.mk new file mode 100644 index 0000000000..8b5e165135 --- /dev/null +++ b/package/python-aexpect/python-aexpect.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aexpect +# +################################################################################ + +PYTHON_AEXPECT_VERSION = 1.6.4 +PYTHON_AEXPECT_SOURCE = aexpect-$(PYTHON_AEXPECT_VERSION).tar.gz +PYTHON_AEXPECT_SITE = https://files.pythonhosted.org/packages/3b/22/f87ffa70348dde4597d9314995be89c8d4c7728260033b972a8d691e3f7d +PYTHON_AEXPECT_SETUP_TYPE = setuptools +PYTHON_AEXPECT_LICENSE = GPL-2.0+ +PYTHON_AEXPECT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_aexpect.py b/support/testing/tests/package/sample_python_aexpect.py new file mode 100644 index 0000000000..a31a17bd1d --- /dev/null +++ b/support/testing/tests/package/sample_python_aexpect.py @@ -0,0 +1 @@ +import aexpect diff --git a/support/testing/tests/package/test_python_aexpect.py b/support/testing/tests/package/test_python_aexpect.py new file mode 100644 index 0000000000..5b018399b3 --- /dev/null +++ b/support/testing/tests/package/test_python_aexpect.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Aexpect(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_AEXPECT=y + """ + sample_scripts = ["tests/package/sample_python_aexpect.py"] + timeout = 30 From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] testing/infra: Add docstrings to base test classes Message-ID: <20220106083242.B181283342@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2f11c0cbf312b339ae9c686a7734494a096ec24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It wasn't immediately obvious to me what the two Buildroot base test classes were for, so add docstrings to explain the differences between BRConfigTest and BRTest. Signed-off-by: Thomas Preston Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/infra/basetest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index a97a814441..96c6848dfc 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -29,6 +29,7 @@ MINIMAL_CONFIG = \ class BRConfigTest(unittest.TestCase): + """Test up to the configure stage.""" config = None br2_external = list() downloaddir = None @@ -66,6 +67,7 @@ class BRConfigTest(unittest.TestCase): class BRTest(BRConfigTest): + """Test up to the build stage and instantiate an emulator.""" def __init__(self, names): super(BRTest, self).__init__(names) self.emulator = None From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] .gitlab-ci.yml: update docker to 20220105.2314 Message-ID: <20220106083242.E629783455@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2dee09d36735c1e7c1dcf45fa2de620cc3532299 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A new docker image was created that includes openssh-server. Use this image in CI. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc45744a81..ea4ec20a17 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:20210922.2200 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20220105.2314 stages: - generate-gitlab-ci From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] support/download: Add SFTP support Message-ID: <20220106083242.C847383456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16f660f8ceaa2a6aa0c256a77f08149b449e5a3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add Secure File Transfer Program (SFTP) support using a simple wrapper. SFTP is a common protocol used to transfer files securely between enterprises, but it is not currently supported in Buildroot because all of the packages are usually available via HTTP, git or some other download method. SFTP is similar to FTP but it preforms all operations over an encrypted SSH transport using a specific protocol. This is unlike ftps, which is traditional FTP over an SSL/TLS connection. Signed-off-by: Thomas Preston Signed-off-by: Michael Drake [Arnout: - update documentation with sftp everywhere scp is mentioned; - rename "verbose" variable to "quiet"; - print the sftp command, similar to wget and scp helpers. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in | 4 ++++ docs/manual/adding-packages-generic.txt | 4 +++- docs/manual/prerequisite.txt | 1 + package/pkg-download.mk | 1 + support/download/dl-wrapper | 2 +- support/download/sftp | 41 +++++++++++++++++++++++++++++++++ 6 files changed, 51 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index 3db2c8dcab..f0cd6f48ed 100644 --- a/Config.in +++ b/Config.in @@ -119,6 +119,10 @@ config BR2_SCP string "Secure copy (scp) command" default "scp" +config BR2_SFTP + string "Secure file transfer (sftp) command" + default "sftp" + config BR2_HG string "Mercurial (hg) command" default "hg" diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 2d8a1a71ce..1384466f9b 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -256,7 +256,7 @@ not and can not work as people would expect it should: +scp://[user@]host:filepath+, and that filepath is relative to the user's home directory, so you may want to prepend the path with a slash for absolute paths: - +scp://[user@]host:/absolutepath+. + + +scp://[user@]host:/absolutepath+. The same goes for SFTP URLs. + If +HOST_LIBFOO_SITE+ is not specified, it defaults to +LIBFOO_SITE+. Examples: + @@ -291,6 +291,8 @@ not and can not work as people would expect it should: +ftp://+. ** +scp+ for downloads of tarballs over SSH with scp. Used by default when +LIBFOO_SITE+ begins with +scp://+. + ** +sftp+ for downloads of tarballs over SSH with sftp. Used by + default when +LIBFOO_SITE+ begins with +sftp://+. ** +svn+ for retrieving source code from a Subversion repository. Used by default when +LIBFOO_SITE+ begins with +svn://+. When a +http://+ Subversion repository URL is specified in diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt index 4e614cfa1b..40071491f8 100644 --- a/docs/manual/prerequisite.txt +++ b/docs/manual/prerequisite.txt @@ -78,6 +78,7 @@ corresponding tool on the host system: ** +mercurial+ ** +rsync+ ** +scp+ +** +sftp+ ** +subversion+ * Java-related packages, if the Java Classpath needs to be built for diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2527ba5c60..5c2bdfdb23 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -15,6 +15,7 @@ export BZR := $(call qstrip,$(BR2_BZR)) export GIT := $(call qstrip,$(BR2_GIT)) export HG := $(call qstrip,$(BR2_HG)) export SCP := $(call qstrip,$(BR2_SCP)) +export SFTP := $(call qstrip,$(BR2_SFTP)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) # Version of the format of the archives we generate in the corresponding diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 3315bd410e..6cf0b89cba 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -88,7 +88,7 @@ main() { backend_urlencode="${uri%%+*}" backend="${backend_urlencode%|*}" case "${backend}" in - git|svn|cvs|bzr|file|scp|hg) ;; + git|svn|cvs|bzr|file|scp|hg|sftp) ;; *) backend="wget" ;; esac uri=${uri#*+} diff --git a/support/download/sftp b/support/download/sftp new file mode 100755 index 0000000000..0a44be7e61 --- /dev/null +++ b/support/download/sftp @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +# We want to catch any unexpected failure, and exit immediately +set -e + +# Download helper for sftp, to be called from the download wrapper script +# +# Options: +# -q Be quiet. +# -o FILE Copy to local file FILE. +# -f FILE Copy from remote file FILE. +# -u URI Download file at URI. +# +# Environment: +# SFTP : the sftp command to call + +quiet= +while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do + case "${OPT}" in + q) quiet=-q;; + o) output="${OPTARG}";; + f) filename="${OPTARG}";; + u) uri="${OPTARG}";; + :) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;; + \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;; + esac +done + +shift $((OPTIND-1)) # Get rid of our options + +# Caller needs to single-quote its arguments to prevent them from +# being expanded a second time (in case there are spaces in them) +_sftp() { + if [ -z "${quiet}" ]; then + printf '%s ' ${SFTP} "${@}"; printf '\n' + fi + # Note: please keep command below aligned with what is printed above + eval ${SFTP} "${@}" +} + +_sftp ${quiet} "${@}" "'${uri}/${filename}'" "'${output}'" From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] support/testing: Add download tests for SCP/SFTP Message-ID: <20220106083242.DAEA583342@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd548e16fbfbe0ceb6fbc7b8d1276e3ef1f292f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add download test infrastructure which starts an OpenSSH server using the sshd binary installed on the Buildroot host. This server can then be used to test the expected usage of the SCP and SFTP download methods. The test creates new SSH keys for the server and client, so that the server can be run as a non-root user. A new test module has been added called `tests.download.sshd` which contains helper methods to create the SSH keys and a class called `OpenSSHDaemon` which handles the sshd server component. The tests download example packages in the br2-external project `ssh`. They check the following conditions for both SCP and SFTP download methods: - Correct hash. - Incorrect hash. - No hash file. The SSH download test infrastructure is based on test_git.py. Signed-off-by: Thomas Preston [Arnout: - remove spurious end-of-line backslash; - remove unnecessary executable bit; - skip test instead of failing if sshd, ssh-keygen, scp or sftp are not found; - decode the output of subprocess; - use subprocess.check_output instead of subprocess.get_output; - use subprocess.check_call instead of manually checking return code; - don't set always-overridden SSHD_PORT_NUMBER in .mk file; - explicitly set sshd options on commandline instead of relying on host /etc/sshd/sshd_config; - let sshd listen only on localhost; - user internal sftp server; - disable BACKUP_SITE, no network is supposed to be accessed; - remove the -bad and -nohash versions; - rename {sftp,scp}-good to plain {sftp,scp}; - move the sftp and scp packages into a single "ssh" external. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../tests/download/br2-external/ssh/Config.in | 0 .../tests/download/br2-external/ssh/external.desc | 1 + .../tests/download/br2-external/ssh/external.mk | 1 + .../download/br2-external/ssh/package/scp/scp.hash | 1 + .../download/br2-external/ssh/package/scp/scp.mk | 17 +++ .../br2-external/ssh/package/sftp/sftp.hash | 1 + .../download/br2-external/ssh/package/sftp/sftp.mk | 17 +++ support/testing/tests/download/sshd.py | 149 +++++++++++++++++++++ .../tests/download/sshd/ssh-test-1.0.tar.xz | Bin 0 -> 232 bytes support/testing/tests/download/test_ssh.py | 62 +++++++++ 10 files changed, 249 insertions(+) diff --git a/support/testing/tests/download/br2-external/ssh/Config.in b/support/testing/tests/download/br2-external/ssh/Config.in new file mode 100644 index 0000000000..e69de29bb2 diff --git a/support/testing/tests/download/br2-external/ssh/external.desc b/support/testing/tests/download/br2-external/ssh/external.desc new file mode 100644 index 0000000000..2fe078edce --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/external.desc @@ -0,0 +1 @@ +name: SSH diff --git a/support/testing/tests/download/br2-external/ssh/external.mk b/support/testing/tests/download/br2-external/ssh/external.mk new file mode 100644 index 0000000000..c8f0dc748e --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_SSH_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/download/br2-external/ssh/package/scp/scp.hash b/support/testing/tests/download/br2-external/ssh/package/scp/scp.hash new file mode 100644 index 0000000000..31353a88ba --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/package/scp/scp.hash @@ -0,0 +1 @@ +sha256 b457c1a37ba7405e8806b93f3d5cc82165db0b0cad25d203f112e32c7a30c0be ssh-test-1.0.tar.xz diff --git a/support/testing/tests/download/br2-external/ssh/package/scp/scp.mk b/support/testing/tests/download/br2-external/ssh/package/scp/scp.mk new file mode 100644 index 0000000000..3451aaf086 --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/package/scp/scp.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# scp +# +################################################################################ + +SCP_VERSION = 1.0 +SCP_SOURCE = ssh-test-$(SCP_VERSION).tar.xz +SCP_SITE = scp://localhost:$(SSHD_TEST_DIR) +SCP_DL_OPTS = \ + -P $(SSHD_PORT_NUMBER) \ + -i $(SSH_IDENTITY) \ + -o "UserKnownHostsFile=/dev/null" \ + -o "StrictHostKeyChecking=no" \ + -o "CheckHostIP=no" + +$(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.hash b/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.hash new file mode 100644 index 0000000000..31353a88ba --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.hash @@ -0,0 +1 @@ +sha256 b457c1a37ba7405e8806b93f3d5cc82165db0b0cad25d203f112e32c7a30c0be ssh-test-1.0.tar.xz diff --git a/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.mk b/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.mk new file mode 100644 index 0000000000..58d91f6a0d --- /dev/null +++ b/support/testing/tests/download/br2-external/ssh/package/sftp/sftp.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# sftp +# +################################################################################ + +SFTP_VERSION = 1.0 +SFTP_SOURCE = ssh-test-$(SFTP_VERSION).tar.xz +SFTP_SITE = sftp://localhost/$(SSHD_TEST_DIR) +SFTP_DL_OPTS = \ + -P $(SSHD_PORT_NUMBER) \ + -i $(SSH_IDENTITY) \ + -o "UserKnownHostsFile=/dev/null" \ + -o "StrictHostKeyChecking=no" \ + -o "CheckHostIP=no" + +$(eval $(generic-package)) diff --git a/support/testing/tests/download/sshd.py b/support/testing/tests/download/sshd.py new file mode 100644 index 0000000000..3345f768cc --- /dev/null +++ b/support/testing/tests/download/sshd.py @@ -0,0 +1,149 @@ +import os +import shutil +import subprocess +from unittest import SkipTest + +# subprocess does not kill the child daemon when a test case fails by raising +# an exception. So use pexpect instead. +import pexpect + +import infra + + +SSHD_PORT_INITIAL = 2222 +SSHD_PORT_LAST = SSHD_PORT_INITIAL + 99 +SSHD_PATH = "/usr/sbin/sshd" +SSHD_HOST_DIR = "host" + +# SSHD_KEY_DIR is where the /etc/ssh/ssh_host_*_key files go +SSHD_KEY_DIR = os.path.join(SSHD_HOST_DIR, "etc/ssh") +SSHD_KEY = os.path.join(SSHD_KEY_DIR, "ssh_host_ed25519_key") + +# SSH_CLIENT_KEY_DIR is where the client id_rsa key and authorized_keys files go +SSH_CLIENT_KEY_DIR = os.path.join(SSHD_HOST_DIR, "home/br-user/ssh") +SSH_CLIENT_KEY = os.path.join(SSH_CLIENT_KEY_DIR, "id_rsa") +SSH_AUTH_KEYS_FILE = os.path.join(SSH_CLIENT_KEY_DIR, "authorized_keys") + + +class OpenSSHDaemon(): + + def __init__(self, builddir, logtofile): + """ + Start an OpenSSH SSH Daemon + + In order to support test cases in parallel, select the port the + server will listen to in runtime. Since there is no reliable way + to allocate the port prior to starting the server (another + process in the host machine can use the port between it is + selected from a list and it is really allocated to the server) + try to start the server in a port and in the case it is already + in use, try the next one in the allowed range. + """ + self.daemon = None + self.port = None + + self.logfile = infra.open_log_file(builddir, "sshd", logtofile) + + server_keyfile = os.path.join(builddir, SSHD_KEY) + auth_keys_file = os.path.join(builddir, SSH_AUTH_KEYS_FILE) + daemon_cmd = [SSHD_PATH, + "-D", # or use -ddd to debug + "-e", + "-h", server_keyfile, + "-f", "/dev/null", + "-o", "ListenAddress=localhost", + "-o", "PidFile=none", + "-o", "AuthenticationMethods=publickey", + "-o", "StrictModes=no", + "-o", "Subsystem=sftp internal-sftp", + "-o", "AuthorizedKeysFile={}".format(auth_keys_file)] + for port in range(SSHD_PORT_INITIAL, SSHD_PORT_LAST + 1): + cmd = daemon_cmd + ["-p", "{}".format(port)] + self.logfile.write( + "> starting sshd with '{}'\n".format(" ".join(cmd))) + try: + self.daemon = pexpect.spawn(cmd[0], cmd[1:], logfile=self.logfile, + encoding='utf-8') + except pexpect.exceptions.ExceptionPexpect as e: + self.logfile.write("> {} - skipping\n".format(e)) + raise SkipTest(str(e)) + + ret = self.daemon.expect([ + # Success + "Server listening on .* port {}.".format(port), + # Failure + "Cannot bind any address."]) + if ret == 0: + self.port = port + return + raise SystemError("Could not find a free port to run sshd") + + def stop(self): + if self.daemon is None: + return + self.daemon.terminate(force=True) + + +def generate_keys_server(builddir, logfile): + """Generate keys required to run an OpenSSH Daemon.""" + keyfile = os.path.join(builddir, SSHD_KEY) + if os.path.exists(keyfile): + logfile.write("> SSH server key already exists '{}'".format(keyfile)) + return + + hostdir = os.path.join(builddir, SSHD_HOST_DIR) + keydir = os.path.join(builddir, SSHD_KEY_DIR) + os.makedirs(hostdir, exist_ok=True) + os.makedirs(keydir, exist_ok=True) + + cmd = ["ssh-keygen", "-A", "-f", hostdir] + logfile.write( + "> generating SSH server keys with '{}'\n".format(" ".join(cmd))) + # When ssh-keygen fails to create an SSH server key it doesn't return a + # useful error code. So use check for an error message in the output + # instead. + try: + out = subprocess.check_output(cmd, encoding='utf-8') + except FileNotFoundError: + logfile.write("> ssh-keygen not found - skipping\n") + raise SkipTest("ssh-keygen not found") + + logfile.write(out) + if "Could not save your public key" in out: + raise SystemError("Could not generate SSH server keys") + + +def generate_keys_client(builddir, logfile): + """Generate keys required to log into an OpenSSH Daemon via SCP or SFTP.""" + keyfile = os.path.join(builddir, SSH_CLIENT_KEY) + if os.path.exists(keyfile): + logfile.write("> SSH client key already exists '{}'".format(keyfile)) + return + + keydir = os.path.join(builddir, SSH_CLIENT_KEY_DIR) + os.makedirs(keydir, exist_ok=True) + + cmd = ["ssh-keygen", + "-f", keyfile, + "-b", "2048", + "-t", "rsa", + "-N", "", + "-q"] + logfile.write( + "> generating SSH client keys with '{}'\n".format(" ".join(cmd))) + try: + subprocess.check_call(cmd, stdout=logfile, stderr=logfile) + except FileNotFoundError: + logfile.write("> ssh-keygen not found - skipping\n") + raise SkipTest("ssh-keygen not found") + + # Allow key-based login for this user (so that we can fetch from localhost) + pubkeyfile = os.path.join(keydir, "{}.pub".format(keyfile)) + authfile = os.path.join(keydir, "authorized_keys") + shutil.copy(pubkeyfile, authfile) + + +def generate_keys(builddir, logtofile): + logfile = infra.open_log_file(builddir, "ssh-keygen", logtofile) + generate_keys_server(builddir, logfile) + generate_keys_client(builddir, logfile) diff --git a/support/testing/tests/download/sshd/ssh-test-1.0.tar.xz b/support/testing/tests/download/sshd/ssh-test-1.0.tar.xz new file mode 100644 index 0000000000..bd83d0aff5 Binary files /dev/null and b/support/testing/tests/download/sshd/ssh-test-1.0.tar.xz differ diff --git a/support/testing/tests/download/test_ssh.py b/support/testing/tests/download/test_ssh.py new file mode 100644 index 0000000000..126002a355 --- /dev/null +++ b/support/testing/tests/download/test_ssh.py @@ -0,0 +1,62 @@ +import os +import shutil + +import tests.download.sshd + +import infra + + +class SSHTestBase(infra.basetest.BRConfigTest): + config = infra.basetest.MINIMAL_CONFIG + ''' +BR2_BACKUP_SITE="" +''' + sshd_test_dir = infra.filepath("tests/download/sshd") + sshd = None + + def setUp(self): + super(SSHTestBase, self).setUp() + + self.show_msg("Generating keys") + tests.download.sshd.generate_keys(self.builddir, self.logtofile) + + self.show_msg("Starting sshd") + self.sshd = tests.download.sshd.OpenSSHDaemon(self.builddir, + self.logtofile) + + def tearDown(self): + self.show_msg("Stopping sshd") + if self.sshd: + self.sshd.stop() + super(SSHTestBase, self).tearDown() + + def download_package(self, package): + self.show_msg("Downloading {}".format(package)) + # store downloaded tarball inside the output dir so the test infra + # cleans it up at the end + dl_dir = os.path.join(self.builddir, "dl") + ssh_identity = os.path.join(self.builddir, + tests.download.sshd.SSH_CLIENT_KEY) + # enforce that we test the download + if os.path.exists(dl_dir): + shutil.rmtree(dl_dir) + env = {"BR2_DL_DIR": dl_dir, + "SSHD_PORT_NUMBER": str(self.sshd.port), + "SSHD_TEST_DIR": self.sshd_test_dir, + "SSH_IDENTITY": ssh_identity} + self.b.build(["{}-dirclean".format(package), + "{}-source".format(package)], + env) + + +class TestSCP(SSHTestBase): + br2_external = [infra.filepath("tests/download/br2-external/ssh")] + + def test_run(self): + self.download_package("scp") + + +class TestSFTP(SSHTestBase): + br2_external = [infra.filepath("tests/download/br2-external/ssh")] + + def test_run(self): + self.download_package("sftp") From arnout at mind.be Thu Jan 6 08:34:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 09:34:05 +0100 Subject: [Buildroot] [git commit] support/docker: Add openssh-server Message-ID: <20220106083242.BA00183455@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5d2400950fc053119bae0ceff047b3c9b4afa45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Install the openssh-server package into the test container. This package, as well as its dependency openssh-client, is required to test SCP and SFTP download methods on the localhost, as if these tools were already installed on the user's machine. Signed-off-by: Thomas Preston Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index ad8704873c..5ca087546e 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -36,6 +36,7 @@ RUN apt-get install -y --no-install-recommends \ libncurses5-dev \ locales \ mercurial \ + openssh-server \ python3 \ python3-flake8 \ python3-nose2 \ From thomas.petazzoni at bootlin.com Thu Jan 6 08:40:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 09:40:59 +0100 Subject: [Buildroot] [PATCH 5/7] package/aexpect: new package In-Reply-To: <20211210141209.1812043-5-jose.pekkarinen@unikie.com> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-5-jose.pekkarinen@unikie.com> Message-ID: <20220106094059.750a7141@windsurf> Hello Jos?, On Fri, 10 Dec 2021 16:12:07 +0200 Jos? Pekkarinen wrote: > Add package to avocado framework's aexpect. > > Signed-off-by: Jos? Pekkarinen > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/aexpect/Config.in | 12 ++++++++++++ > package/aexpect/aexpect.hash | 4 ++++ > package/aexpect/aexpect.mk | 13 +++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/aexpect/Config.in > create mode 100644 package/aexpect/aexpect.hash > create mode 100644 package/aexpect/aexpect.mk So I have "applied", but I put this between quotes because I've basically redone it entirely. First I've named the package python-aexpect because really aexpect is primarily a Python module. I've used scanpypi to generate the package. Also added a test case for it, noticed that the package doesn't work with Python 2 (syntax error when byte-compiling), so I made it Python 3 only. See the final commit: https://git.buildroot.org/buildroot/commit/?id=63b72a7c15bcd56fe1570e3f7ecd43993c0fde90 Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Thu Jan 6 08:43:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 09:43:06 +0100 Subject: [Buildroot] [PATCH v2 0/5] download: Add SFTP support and tests In-Reply-To: <20200415164846.122126-1-thomas.preston@codethink.co.uk> References: <20200415164846.122126-1-thomas.preston@codethink.co.uk> Message-ID: <0e32f7af-81fa-190f-1232-18940703f879@mind.be> Hi all, I finally applied this series. Since Thomas is no longer with CodeThink this is more for the others in Cc. On 15/04/2020 18:48, Thomas Preston wrote: > Hi, > Back in October 2019 I submitted a patch adding an SFTP download method > to Buildroot, however since there were no packages using SFTP the patch > was rejected. > > Yann E. MORIN suggested that it was a valid change however it required > tests to avoid bitrot - since there was no way to verify the SFTP > download method did not break over time without any packages using it. > > In this series I have re-added the SFTP download method and also some > test infrastructure which starts a local SSH server and uses SFTP to > download some test packages in a br2-external project. I've also added > tests for SCP! :D > > For this, I had to update the Dockerfile from Debian Stretch to Buster > which I explain a bit further in the patch. I'm not sure how to test if > this breaks anything else. Will all the tests run in a clean container + > Buildroot project clone? > > You can run the tests like so: > > support/testing/run-tests -o output -d dl \ > tests.download.test_ssh.TestSFTP \ > tests.download.test_ssh.TestSCP > > Thanks! > Thomas > > Thomas Preston (5): > support/docker: Update to debian:buster-20200327 I skipped this one because in the meanwhile we already updated to a more recent Debian. > support/docker: Add openssh-server > testing/infra: Add docstrings to base test classes > download: Add SFTP support (not FTPS) [Arnout: - update documentation with sftp everywhere scp is mentioned; - rename "verbose" variable to "quiet"; - print the sftp command, similar to wget and scp helpers. ] > support/testing: Add download tests for SCP/SFTP [Arnout: - remove spurious end-of-line backslash; - remove unnecessary executable bit; - skip test instead of failing if sshd, ssh-keygen, scp or sftp are not found; - decode the output of subprocess; - use subprocess.check_output instead of subprocess.get_output; - use subprocess.check_call instead of manually checking return code; - don't set always-overridden SSHD_PORT_NUMBER in .mk file; - explicitly set sshd options on commandline instead of relying on host /etc/sshd/sshd_config; - let sshd listen only on localhost; - user internal sftp server; - disable BACKUP_SITE, no network is supposed to be accessed; - remove the -bad and -nohash versions; - rename {sftp,scp}-good to plain {sftp,scp}; - move the sftp and scp packages into a single "ssh" external. ] > > .gitlab-ci.yml | 2 + > Config.in | 4 + > package/pkg-download.mk | 1 + > support/docker/Dockerfile | 3 +- > support/docker/apt-sources.list | 8 +- > support/download/dl-wrapper | 2 +- > support/download/sftp | 37 +++++ > support/testing/infra/basetest.py | 2 + > .../tests/download/br2-external/scp/Config.in | 0 > .../download/br2-external/scp/external.desc | 1 + > .../download/br2-external/scp/external.mk | 4 + > .../scp/package/scp-bad/scp-bad.hash | 1 + > .../scp/package/scp-bad/scp-bad.mk | 17 +++ > .../scp/package/scp-good/scp-good.hash | 1 + > .../scp/package/scp-good/scp-good.mk | 17 +++ > .../scp/package/scp-nohash/scp-nohash.mk | 17 +++ > .../download/br2-external/sftp/Config.in | 0 > .../download/br2-external/sftp/external.desc | 1 + > .../download/br2-external/sftp/external.mk | 4 + > .../sftp/package/sftp-bad/sftp-bad.hash | 1 + > .../sftp/package/sftp-bad/sftp-bad.mk | 17 +++ > .../sftp/package/sftp-good/sftp-good.hash | 1 + > .../sftp/package/sftp-good/sftp-good.mk | 17 +++ > .../sftp/package/sftp-nohash/sftp-nohash.mk | 17 +++ > support/testing/tests/download/sshd.py | 129 ++++++++++++++++++ > .../tests/download/sshd/ssh-test-1.0.tar.xz | Bin 0 -> 232 bytes > support/testing/tests/download/test_ssh.py | 66 +++++++++ > 27 files changed, 364 insertions(+), 6 deletions(-) > create mode 100755 support/download/sftp > create mode 100644 support/testing/tests/download/br2-external/scp/Config.in > create mode 100644 support/testing/tests/download/br2-external/scp/external.desc > create mode 100644 support/testing/tests/download/br2-external/scp/external.mk > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-bad/scp-bad.hash > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-bad/scp-bad.mk > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-good/scp-good.hash > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-good/scp-good.mk > create mode 100644 support/testing/tests/download/br2-external/scp/package/scp-nohash/scp-nohash.mk > create mode 100644 support/testing/tests/download/br2-external/sftp/Config.in > create mode 100644 support/testing/tests/download/br2-external/sftp/external.desc > create mode 100644 support/testing/tests/download/br2-external/sftp/external.mk > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-bad/sftp-bad.hash > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-bad/sftp-bad.mk > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-good/sftp-good.hash > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-good/sftp-good.mk > create mode 100644 support/testing/tests/download/br2-external/sftp/package/sftp-nohash/sftp-nohash.mk > create mode 100644 support/testing/tests/download/sshd.py > create mode 100644 support/testing/tests/download/sshd/ssh-test-1.0.tar.xz > create mode 100755 support/testing/tests/download/test_ssh.py > From romain.naour at smile.fr Thu Jan 6 09:24:53 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 10:24:53 +0100 Subject: [Buildroot] package/aravis: new package In-Reply-To: References: Message-ID: Hello Marc, Le 05/01/2022 ? 16:57, marc.chalain at mailoo.org a ?crit?: > Hello and Happy new year, > > > > I propose the integration of a camera capture library: > > > > Aravis is a library to help GigE camera capture. > https://github.com/AravisProject/aravis/releases/tag/0.8.16 > This rules install on target: > ?libaravis > ?arv-camera-test > ?arv-fake-gv-camera > ?arv-test > ?arv-tool > and on staging > ?aravis/*.h > > Signed-off-by: Marc Chalain > --- > ?DEVELOPERS???????????????? |? 3 +++ > ?package/Config.in????????? |? 1 + > ?package/aravis/Config.in?? | 16 ++++++++++++++++ > ?package/aravis/aravis.hash |? 1 + > ?package/aravis/aravis.mk?? | 20 ++++++++++++++++++++ > ?5 files changed, 41 insertions(+) > ?create mode 100644 package/aravis/Config.in > ?create mode 100644 package/aravis/aravis.hash > ?create mode 100644 package/aravis/aravis.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 6dc2e68e42..05c1c3c921 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1653,6 +1653,9 @@ N:??? Manuel V?gele > ?F:??? package/python-pyqt5/ > ?F:??? package/python-requests-toolbelt/ > ? > +N:??? Marc Chalain > +F:??? package/aravis Missing '/' at the end of the line > + > ?N:??? Marcin Bis > ?F:??? package/bluez5_utils/ > ?F:??? package/cc-tool/ > diff --git a/package/Config.in b/package/Config.in > index 9fed0ab4cb..2a1781afe9 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1698,6 +1698,7 @@ menu "Logging" > ?endmenu > ? > ?menu "Multimedia" > +??? source "package/aravis/Config.in" Probably more related to "Hardware Handling" since it support camera devices. > ???? source "package/bitstream/Config.in" > ???? source "package/dav1d/Config.in" > ???? source "package/kvazaar/Config.in" > diff --git a/package/aravis/Config.in b/package/aravis/Config.in > new file mode 100644 > index 0000000000..02c71c44da > --- /dev/null > +++ b/package/aravis/Config.in > @@ -0,0 +1,16 @@ > +config BR2_PACKAGE_ARAVIS > +??? bool "aravis - GigE Camera" > +??? depends on BR2_USE_WCHAR > +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > +??? depends on BR2_PACKAGE_PCRE_16 > +??? depends on BR2_PACKAGE_PCRE_32 > +??? select BR2_PACKAGE_LIBGLIB2 > +??? select BR2_PACKAGE_LIBXML2 > +??? help > +??? ? aravis provides the support of GigE camera > +??? ? and USB3Vision camera. Add an empty line Also use check-package script to check the coding style. > +??? ? https://github.com/AravisProject/aravis > + > +comment "aravis needs a toolchain w/ wchar, NPTL, PCRE 16/32" > +??? depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ > +??? !BR2_PACKAGE_PCRE_16 || !BR2_PACKAGE_PCRE_32 > diff --git a/package/aravis/aravis.hash b/package/aravis/aravis.hash > new file mode 100644 > index 0000000000..f8512491ec > --- /dev/null > +++ b/package/aravis/aravis.hash > @@ -0,0 +1 @@ > +sha256 057166753443acc115259ca1f74bd1b28ed4d48f35261cb248eafb8f86664bc7 aravis-0.8.16.tar.gz Add the license file hash here (COPYING) > diff --git a/package/aravis/aravis.mk b/package/aravis/aravis.mk > new file mode 100644 > index 0000000000..bd783a0374 > --- /dev/null > +++ b/package/aravis/aravis.mk > @@ -0,0 +1,20 @@ > +################################################################################ > +# > +# aravis > +# > +################################################################################ > + > +ARAVIS_VERSION = 0.8.16 Aravis project is moving fast, there is a new version 0.8.20 already. I'm fine with this version since it was released recently: https://github.com/AravisProject/aravis/releases/tag/0.8.16 > +ARAVIS_SITE = $(call github,AravisProject,aravis,$(ARAVIS_VERSION)) > +ARAVIS_DEPENDENCIES = \ > +??? host-pkgconf \ > +??? libglib2 \ > +??? libxml2 There is a list of dependencies in the Readme: https://github.com/AravisProject/aravis/blob/main/README.md#install-dependencies-on-ubuntu-2004 especially gstreamer and plugins etc.. > +ARAVIS_INSTALL_STAGING = YES > +ARAVIS_LICENSE = LGPL-2 It's a LGPL-2.1 license. > +ARAVIS_LICENSE_FILES = COPYING > +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) Is gettext a mandatory dependency ? At least gettext should be in ARAVIS_DEPENDENCIES when NLS support is enabled. I recommend to use test-pkg script to stress the buildsystem. Thanks to a recent change, you can test your package with test-pkg in gitlab-ci: https://gitlab.com/buildroot.org/buildroot/-/commit/12c7a05da154f2056d0a2a1a72f5d066b8d7b87e Can you send an updated version of your patch? Best regards, Romain > + > +ARAVIS_CONF_OPTS += -Ddocumentation=disabled > + > +$(eval $(meson-package)) > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Thu Jan 6 09:27:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 10:27:39 +0100 Subject: [Buildroot] [git commit] support/testing/tests/download/sshd.py: fix flake8 warning Message-ID: <20220106092256.C7BCE8343E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=007b5b483f2505c7af1f8b466b0f1b96e41d21fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master support/testing/tests/download/sshd.py:50:28: E261 at least two spaces before inline comment 1 E261 at least two spaces before inline comment Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/download/sshd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/download/sshd.py b/support/testing/tests/download/sshd.py index 3345f768cc..6555f0499f 100644 --- a/support/testing/tests/download/sshd.py +++ b/support/testing/tests/download/sshd.py @@ -47,7 +47,7 @@ class OpenSSHDaemon(): server_keyfile = os.path.join(builddir, SSHD_KEY) auth_keys_file = os.path.join(builddir, SSH_AUTH_KEYS_FILE) daemon_cmd = [SSHD_PATH, - "-D", # or use -ddd to debug + "-D", # or use -ddd to debug "-e", "-h", server_keyfile, "-f", "/dev/null", From thomas.petazzoni at bootlin.com Thu Jan 6 09:37:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 10:37:59 +0100 Subject: [Buildroot] package/aravis: new package In-Reply-To: References: Message-ID: <20220106103759.1166357c@windsurf> Hello, On Thu, 6 Jan 2022 10:24:53 +0100 Romain Naour wrote: > > diff --git a/package/aravis/Config.in b/package/aravis/Config.in > > new file mode 100644 > > index 0000000000..02c71c44da > > --- /dev/null > > +++ b/package/aravis/Config.in > > @@ -0,0 +1,16 @@ > > +config BR2_PACKAGE_ARAVIS > > +??? bool "aravis - GigE Camera" Just: bool "aravis" > > +??? depends on BR2_USE_WCHAR > > +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > > +??? depends on BR2_PACKAGE_PCRE_16 > > +??? depends on BR2_PACKAGE_PCRE_32 Please use "select" for pcre. > > +ARAVIS_LICENSE_FILES = COPYING > > +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) > > Is gettext a mandatory dependency ? > At least gettext should be in ARAVIS_DEPENDENCIES when NLS support is enabled. No, don't add gettext directly, use $(TARGET_NLS_DEPENDENCIES), which will automatically add (or not) host-gettext and/or gettext to the dependencies, depending on when it's needed or not. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Thu Jan 6 09:39:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 10:39:57 +0100 Subject: [Buildroot] call with hooks In-Reply-To: References: Message-ID: On 05/01/2022 17:20, Danomi Manchego wrote: > Hello all, > > I noticed a possible inconsistency, and thought I should post it. > Looking at places where buildroot uses hooks: > > $ grep -r '$(hook))$(sep)' . [snip] > > Notice that the one hit in Makefile uses "$($(hook))$(sep)" while the > hits in pkg-generic.mk use "$(call $(hook))$(sep)". My Make-fu isn't > powerful enough to understand if there is an actual problem - should > there be a "call" in the Makefile line? The general syntax for call > is "$(call variable,param,param,?)" so I don't follow what the extra > call in $(call $(hook) is doing for us. Historical accident. The person who first introduced the hooks back in the days didn't realize that $(call ...) is not for "something that looks like a function", but rather it is for "whenever you want to pass arguments". Reviewers also didn't realize this and just applied, and when more hooks were added later they copied the pattern. Regards, Arnout > > Thanks, > Danomi - > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Thu Jan 6 09:45:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 10:45:21 +0100 Subject: [Buildroot] Overriding Kconfig Values from external br2 In-Reply-To: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> References: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> Message-ID: <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> On 05/01/2022 20:03, Jesse Millwood wrote: > Hello, > > I have an external C/C++ toolchain that I've put together that uses MUSL. I've > also built an external Rust toolchain that uses my MUSL toolchain. > > My issue is that there is a Rust Kconfig variable that specifies if a specific > architecture supports Rust. > > The Kconfig variable in question is BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > in package/rustc/Config.in.host. [snip] > You may notice that I changed the libc depends line to be or'd with > BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get considered when I > choose my external musl toolchain option. In the menuconfig when I search for > the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with the "/" key it > looks like it is only getting it from the original file. Does buildroot have a > mechanism for overwriting this kind of setting and if not, does anyone have an > idea of how I would accomplish what I am trying to do (make buildroot honor my > external rust toolchain)? No, there's no way to override the dependencies of an existing Config.in symbol in an external. However, this was corrected in upstream Buildroot in commit d69d40c029dc7d8199b745eaee759d92b66c5d17. So you can try to backport that commit instead, or just update Buildroot to something more recent. Regards, Arnout > > Thanks, > Jesse > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Thu Jan 6 09:46:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 10:46:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit-examples: remove package In-Reply-To: <20220106063308.3132088-1-james.hilliard1@gmail.com> References: <20220106063308.3132088-1-james.hilliard1@gmail.com> Message-ID: <20220106094633.GM614810@scaer> James, All, On 2022-01-05 23:33 -0700, James Hilliard spake thusly: > This package seems to have issues building with the latest > qt5webkit release, as it has not received updates upstream > since 2017 remove it as it is unlikely to be fixed. Furthermore, it is no longer available upstream: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules Not Found The requested URL was not found on this server. So, applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > Config.in.legacy | 7 ++ > .../0001-Build-examples.patch | 52 ------------- > .../0002-Fix-QWebView-path.patch | 73 ------------------- > .../0003-Fix-QPainterPath-include.patch | 36 --------- > package/qt5/qt5webkit-examples/Config.in | 10 --- > .../qt5webkit-examples.hash | 8 -- > .../qt5webkit-examples/qt5webkit-examples.mk | 26 ------- > 7 files changed, 7 insertions(+), 205 deletions(-) > delete mode 100644 package/qt5/qt5webkit-examples/0001-Build-examples.patch > delete mode 100644 package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch > delete mode 100644 package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch > delete mode 100644 package/qt5/qt5webkit-examples/Config.in > delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.hash > delete mode 100644 package/qt5/qt5webkit-examples/qt5webkit-examples.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index e5349e58ac..004506e4bb 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES > + bool "qt5webkit-examples removed" > + select BR2_LEGACY > + help > + The qt5webkit-examples package is unmaintained and has been > + removed. > + > config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE > bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" > select BR2_LEGACY > diff --git a/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/package/qt5/qt5webkit-examples/0001-Build-examples.patch > deleted file mode 100644 > index cd925e21c5..0000000000 > --- a/package/qt5/qt5webkit-examples/0001-Build-examples.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001 > -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= > -Date: Tue, 28 Nov 2017 23:14:42 -0500 > -Subject: [PATCH] Build examples > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=utf-8 > -Content-Transfer-Encoding: 8bit > - > -This patch improves the qt5webkit examples build for 2 aspects: > - > - - Allows to build even if qt5base examples are not enabled > - - Builds xmlpatterns example only if the qt5xmlpattern package > - has been built > - > -Signed-off-by: Massimo Callegari > -Signed-off-by: Ga?l PORTAY > -[gportay: build imageanalyzer example if concurrent module is built] > ---- > - examples/webkitwidgets/webkitwidgets.pro | 7 ++++--- > - qtwebkit-examples.pro | 1 + > - 2 files changed, 5 insertions(+), 3 deletions(-) > - > -diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro > -index ab20df4..67f6785 100644 > ---- a/examples/webkitwidgets/webkitwidgets.pro > -+++ b/examples/webkitwidgets/webkitwidgets.pro > -@@ -4,9 +4,10 @@ SUBDIRS += domtraversal \ > - previewer \ > - fancybrowser \ > - simpleselector \ > -- imageanalyzer \ > - framecapture \ > - browser \ > - embedded \ > -- scroller \ > -- xmlpatterns > -+ scroller > -+ > -+qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns > -+qtHaveModule(concurrent): SUBDIRS += imageanalyzer > -diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro > -index 3fcecf1..2ade7ff 100644 > ---- a/qtwebkit-examples.pro > -+++ b/qtwebkit-examples.pro > -@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit)) > - load(qt_parts) > - > - SUBDIRS += doc > -+SUBDIRS += examples > --- > -2.15.0 > - > diff --git a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch > deleted file mode 100644 > index 30aab30167..0000000000 > --- a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch > +++ /dev/null > @@ -1,73 +0,0 @@ > -From 9fa73707216bd55dff380031a33aca701a7d9c8b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 12 May 2019 23:29:05 +0200 > -Subject: [PATCH] Fix QWebView path > - > -QWebView is installed under QtWebKitWidgets > - > -Fixes: > - - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e > - > -Signed-off-by: Fabrice Fontaine > ---- > - examples/webkitwidgets/formextractor/formextractor.ui | 2 +- > - examples/webkitwidgets/previewer/previewer.ui | 2 +- > - examples/webkitwidgets/simpleselector/window.ui | 2 +- > - .../xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui | 2 +- > - 4 files changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/examples/webkitwidgets/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui > -index 5c4afec..a38bdd5 100644 > ---- a/examples/webkitwidgets/formextractor/formextractor.ui > -+++ b/examples/webkitwidgets/formextractor/formextractor.ui > -@@ -151,7 +151,7 @@ > - > - QWebView > - QWidget > --
    QtWebKit/QWebView
    > -+
    QtWebKitWidgets/QWebView
    > -     > - > - > -diff --git a/examples/webkitwidgets/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui > -index d4c9992..69adb2e 100644 > ---- a/examples/webkitwidgets/previewer/previewer.ui > -+++ b/examples/webkitwidgets/previewer/previewer.ui > -@@ -74,7 +74,7 @@ > - > - QWebView > - QWidget > --
    QtWebKit/QWebView
    > -+
    QtWebKitWidgets/QWebView
    > -     > - > - > -diff --git a/examples/webkitwidgets/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui > -index aa824df..7906186 100644 > ---- a/examples/webkitwidgets/simpleselector/window.ui > -+++ b/examples/webkitwidgets/simpleselector/window.ui > -@@ -64,7 +64,7 @@ > - > - QWebView > - QWidget > --
    QtWebKit/QWebView
    > -+
    QtWebKitWidgets/QWebView
    > -     > - > - > -diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui > -index ad43284..000cae7 100644 > ---- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui > -+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui > -@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; } > - > - QWebView > - QWidget > --
    QtWebKit/QWebView
    > -+
    QtWebKitWidgets/QWebView
    > -     > - > - > --- > -2.20.1 > - > diff --git a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch b/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch > deleted file mode 100644 > index 2d5e8fae9a..0000000000 > --- a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 452123a4491b26c5b078934477bd5864f1d004e4 Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer > -Date: Thu, 28 May 2020 20:58:26 +0200 > -Subject: [PATCH] Fix QPainterPath include > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Add missing QPainterPath (needed for Qt-5.15.0 compile). > - > -Fixes: > - > - searchlineedit.cpp:121:18: error: aggregate ?QPainterPath myPath? has incomplete type and cannot be defined > - QPainterPath myPath; > - ^~~~~~ > - > -Signed-off-by: Peter Seiderer > ---- > - examples/webkitwidgets/browser/searchlineedit.cpp | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/examples/webkitwidgets/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp > -index fbd73cb..7462c82 100644 > ---- a/examples/webkitwidgets/browser/searchlineedit.cpp > -+++ b/examples/webkitwidgets/browser/searchlineedit.cpp > -@@ -34,6 +34,7 @@ > - #include "searchlineedit.h" > - > - #include > -+#include > - #include > - #include > - #include > --- > -2.26.2 > - > diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in > deleted file mode 100644 > index 47bbcbaa68..0000000000 > --- a/package/qt5/qt5webkit-examples/Config.in > +++ /dev/null > @@ -1,10 +0,0 @@ > -config BR2_PACKAGE_QT5WEBKIT_EXAMPLES > - bool "qt5webkit-examples" > - depends on BR2_PACKAGE_QT5WEBKIT > - help > - Qt is a cross-platform application and UI framework for > - developers using C++. > - > - This package contains examples for the qt5webkit module. > - > - http://qt.io > diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash > deleted file mode 100644 > index ea64f6f14e..0000000000 > --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash > +++ /dev/null > @@ -1,8 +0,0 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist > -sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz > - > -# Hashes for license files: > -sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 > -sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 > -sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 > -sha256 d3d9052b838761dbe00067168ed9ebc437734d53ebf71dea1c8e9f7532a5333b LICENSE.GPLv3 > diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > deleted file mode 100644 > index 84bc291739..0000000000 > --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > +++ /dev/null > @@ -1,26 +0,0 @@ > -################################################################################ > -# > -# qt5webkit-examples > -# > -################################################################################ > - > -QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 > -QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > -QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit > - > -QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 > - > -QT5WEBKIT_EXAMPLES_LICENSE = LGPL-2.1 with exception or LGPL-3 or GPL-2 or GPL-3 > -# Source files contain references to LGPL_EXCEPTION.txt but it is not included > -# in the archive. > - > -ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) > -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns > -endif > - > -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative > -endif > - > -$(eval $(qmake-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 6 09:45:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 10:45:02 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit-examples: remove package Message-ID: <20220106094059.6C6478345E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4841d722fb37f8c8c4715c7fe8b2502c9a3a9dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package seems to have issues building with the latest qt5webkit release, as it has not received updates upstream since 2017 remove it as it is unlikely to be fixed. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++ .../qt5webkit-examples/0001-Build-examples.patch | 52 --------------- .../0002-Fix-QWebView-path.patch | 73 ---------------------- .../0003-Fix-QPainterPath-include.patch | 36 ----------- package/qt5/qt5webkit-examples/Config.in | 10 --- .../qt5/qt5webkit-examples/qt5webkit-examples.hash | 8 --- .../qt5/qt5webkit-examples/qt5webkit-examples.mk | 26 -------- 7 files changed, 7 insertions(+), 205 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index e5349e58ac..004506e4bb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_QT5WEBKIT_EXAMPLES + bool "qt5webkit-examples removed" + select BR2_LEGACY + help + The qt5webkit-examples package is unmaintained and has been + removed. + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" select BR2_LEGACY diff --git a/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/package/qt5/qt5webkit-examples/0001-Build-examples.patch deleted file mode 100644 index cd925e21c5..0000000000 --- a/package/qt5/qt5webkit-examples/0001-Build-examples.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Tue, 28 Nov 2017 23:14:42 -0500 -Subject: [PATCH] Build examples -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -This patch improves the qt5webkit examples build for 2 aspects: - - - Allows to build even if qt5base examples are not enabled - - Builds xmlpatterns example only if the qt5xmlpattern package - has been built - -Signed-off-by: Massimo Callegari -Signed-off-by: Ga??l PORTAY -[gportay: build imageanalyzer example if concurrent module is built] ---- - examples/webkitwidgets/webkitwidgets.pro | 7 ++++--- - qtwebkit-examples.pro | 1 + - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro -index ab20df4..67f6785 100644 ---- a/examples/webkitwidgets/webkitwidgets.pro -+++ b/examples/webkitwidgets/webkitwidgets.pro -@@ -4,9 +4,10 @@ SUBDIRS += domtraversal \ - previewer \ - fancybrowser \ - simpleselector \ -- imageanalyzer \ - framecapture \ - browser \ - embedded \ -- scroller \ -- xmlpatterns -+ scroller -+ -+qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns -+qtHaveModule(concurrent): SUBDIRS += imageanalyzer -diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro -index 3fcecf1..2ade7ff 100644 ---- a/qtwebkit-examples.pro -+++ b/qtwebkit-examples.pro -@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit)) - load(qt_parts) - - SUBDIRS += doc -+SUBDIRS += examples --- -2.15.0 - diff --git a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch deleted file mode 100644 index 30aab30167..0000000000 --- a/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9fa73707216bd55dff380031a33aca701a7d9c8b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 May 2019 23:29:05 +0200 -Subject: [PATCH] Fix QWebView path - -QWebView is installed under QtWebKitWidgets - -Fixes: - - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e - -Signed-off-by: Fabrice Fontaine ---- - examples/webkitwidgets/formextractor/formextractor.ui | 2 +- - examples/webkitwidgets/previewer/previewer.ui | 2 +- - examples/webkitwidgets/simpleselector/window.ui | 2 +- - .../xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/examples/webkitwidgets/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui -index 5c4afec..a38bdd5 100644 ---- a/examples/webkitwidgets/formextractor/formextractor.ui -+++ b/examples/webkitwidgets/formextractor/formextractor.ui -@@ -151,7 +151,7 @@ - - QWebView - QWidget --
    QtWebKit/QWebView
    -+
    QtWebKitWidgets/QWebView
    -     - - -diff --git a/examples/webkitwidgets/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui -index d4c9992..69adb2e 100644 ---- a/examples/webkitwidgets/previewer/previewer.ui -+++ b/examples/webkitwidgets/previewer/previewer.ui -@@ -74,7 +74,7 @@ - - QWebView - QWidget --
    QtWebKit/QWebView
    -+
    QtWebKitWidgets/QWebView
    -     - - -diff --git a/examples/webkitwidgets/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui -index aa824df..7906186 100644 ---- a/examples/webkitwidgets/simpleselector/window.ui -+++ b/examples/webkitwidgets/simpleselector/window.ui -@@ -64,7 +64,7 @@ - - QWebView - QWidget --
    QtWebKit/QWebView
    -+
    QtWebKitWidgets/QWebView
    -     - - -diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -index ad43284..000cae7 100644 ---- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui -@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; } - - QWebView - QWidget --
    QtWebKit/QWebView
    -+
    QtWebKitWidgets/QWebView
    -     - - --- -2.20.1 - diff --git a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch b/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch deleted file mode 100644 index 2d5e8fae9a..0000000000 --- a/package/qt5/qt5webkit-examples/0003-Fix-QPainterPath-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 452123a4491b26c5b078934477bd5864f1d004e4 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 28 May 2020 20:58:26 +0200 -Subject: [PATCH] Fix QPainterPath include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add missing QPainterPath (needed for Qt-5.15.0 compile). - -Fixes: - - searchlineedit.cpp:121:18: error: aggregate ???QPainterPath myPath??? has incomplete type and cannot be defined - QPainterPath myPath; - ^~~~~~ - -Signed-off-by: Peter Seiderer ---- - examples/webkitwidgets/browser/searchlineedit.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/webkitwidgets/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp -index fbd73cb..7462c82 100644 ---- a/examples/webkitwidgets/browser/searchlineedit.cpp -+++ b/examples/webkitwidgets/browser/searchlineedit.cpp -@@ -34,6 +34,7 @@ - #include "searchlineedit.h" - - #include -+#include - #include - #include - #include --- -2.26.2 - diff --git a/package/qt5/qt5webkit-examples/Config.in b/package/qt5/qt5webkit-examples/Config.in deleted file mode 100644 index 47bbcbaa68..0000000000 --- a/package/qt5/qt5webkit-examples/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_QT5WEBKIT_EXAMPLES - bool "qt5webkit-examples" - depends on BR2_PACKAGE_QT5WEBKIT - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package contains examples for the qt5webkit module. - - http://qt.io diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash deleted file mode 100644 index ea64f6f14e..0000000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz - -# Hashes for license files: -sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 -sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 -sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 -sha256 d3d9052b838761dbe00067168ed9ebc437734d53ebf71dea1c8e9f7532a5333b LICENSE.GPLv3 diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk deleted file mode 100644 index 84bc291739..0000000000 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# qt5webkit-examples -# -################################################################################ - -QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 -QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit - -QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 - -QT5WEBKIT_EXAMPLES_LICENSE = LGPL-2.1 with exception or LGPL-3 or GPL-2 or GPL-3 -# Source files contain references to LGPL_EXCEPTION.txt but it is not included -# in the archive. - -ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative -endif - -$(eval $(qmake-package)) From yann.morin.1998 at free.fr Thu Jan 6 10:31:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 11:31:49 +0100 Subject: [Buildroot] [PATCH v3 3/3] fs/cpio: new option to use dracut tool In-Reply-To: <20211223111348.3532601-3-thierry.bultel@linatsea.fr> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-3-thierry.bultel@linatsea.fr> Message-ID: <20220106103149.GN614810@scaer> Thierry, All, On 2021-12-23 12:13 +0100, Thierry Bultel spake thusly: > Adds an option to invoke the dracut host tool, providing > a configuration file, instead of having a full cpio archive > of the whole target directory. > > Signed-off-by: Thierry Bultel [--SNIP--] > diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in > index c1151a2881..3d0f963a8d 100644 > --- a/fs/cpio/Config.in > +++ b/fs/cpio/Config.in > @@ -7,6 +7,33 @@ config BR2_TARGET_ROOTFS_CPIO > > if BR2_TARGET_ROOTFS_CPIO > > +choice > + prompt "cpio type" Missing empty line between the choice prompt and the first choice entry. > +config BR2_TARGET_ROOTFS_CPIO_FULL > + bool "cpio the whole root filesystem (ie the content of 'target')" > + help > + Build a cpio archive containing the whole the root filesystem. > + > +config BR2_TARGET_ROOTFS_CPIO_DRACUT > + bool "Invoke dracut to make an initramfs" > + select BR2_PACKAGE_HOST_DRACUT > + select BR2_PACKAGE_HOST_UBOOT_TOOLS > + help > + Builds an additional initramfs using dracut. > + This can be useful to create a recovery system, > + for instance. > + > +if BR2_TARGET_ROOTFS_CPIO_DRACUT > +config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE > + string "configuration file" > +endif Don't add the option in the choice, but outside of it. > diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk > index 81f8c393d1..e0e0eb2b1e 100644 > --- a/fs/cpio/cpio.mk > +++ b/fs/cpio/cpio.mk > @@ -29,6 +29,41 @@ endif # BR2_ROOTFS_DEVICE_CREATION_STATIC > > ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT > > +ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) > + > +export TARGET_CROSS Don't do such a global export. If you need it in the environment, then do so when calling the utility, like: TARGET_CROSS="$(TARGET_CROSS)" \ $(HOST_DIR)/bin/dracut \ blabla other options... > +ROOTFS_CPIO_DEPENDENCIES += host-dracut > + > +ifeq ($(BR2_LINUX_KERNEL),y) > +ROOTFS_CPIO_DEPENDENCIES += linux > +endif > + > +ifeq ($(BR_BUILDING).$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE),y.) > +$(error No dracut config file name specified, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE setting) > +endif > + > +ifeq ($(BR2_LINUX_KERNEL),y) > +ROOTFS_CPIO_DRACUT_CMD_OPTS += --kver $(LINUX_VERSION_PROBED) > +else > +ROOTFS_CPIO_DRACUT_CMD_OPTS += --no-kernel > +endif > + > +define ROOTFS_CPIO_CMD > + mkdir -p $(@D)/tmp > + rm -rf $(@D)/tmp/* The $(@D) for ROOTFS_*_CMD is $(BINARIES_DIR), i.e. output/images/ and so creating a te,mporary directory in there is not so nice. You should use $(ROOTFS_CPIO_DIR)/tmp Also, if I understand correctly, you are doing this mkdir+rm trick to ensure you have an empty tmp directory to start with. By using $(ROOTFS_CPIO_DIR) as base, this will be guaranteed, because $(ROOTFS_CPIO_DIR) is removed and recreated before running the fs commands. > + $(HOST_DIR)/usr/bin/dracut_wrapper.sh \ > + $(ROOTFS_CPIO_DRACUT_CMD_OPTS) \ > + -c $(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE) \ > + --tmpdir $(@D)/tmp \ > + -M \ > + --force \ > + --keep \ > + $@ > +endef > + > +else ifeq ($(BR2_TARGET_ROOTFS_CPIO_FULL),y) Please, keep the original, plain cpio first in the code, and add the dracut specificities after. > # --reproducible option was introduced in cpio v2.12, which may not be > # available in some old distributions, so we build host-cpio > ifeq ($(BR2_REPRODUCIBLE),y) > @@ -53,4 +88,6 @@ endef > ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE > endif > > +endif #BR2_TARGET_ROOTFS_CPIO_DRACUT > + > $(eval $(rootfs)) > diff --git a/support/testing/conf/dracut.conf b/support/testing/conf/dracut.conf > new file mode 100644 > index 0000000000..eb793a3562 > --- /dev/null > +++ b/support/testing/conf/dracut.conf > @@ -0,0 +1,93 @@ > +#Yuco dracut config "Yuco"? > +#Dracut configuration > + > +show_modules=yes > +i18n_install_all=no > +lvmconf=no > +mdadmconf=no > +early_microcode=no > +hostonly=no > +hostonly_cmdline=no > +use_fstab=no > +kernel_cmdline="rd.break=initqueue" > +do_strip=no > + > +# Dracut modules need > +add_dracutmodules+=" \ > +busybox-buildroot \ > +bash > +" > + > +# Modules to ignore > +omit_dracutmodules+=" \ [--SNIP big list of stuff--] > +" Rather than remove select stuff, can't we just start from an empty set and add just what is needed? Regards, Yann E. MORIN. > + > diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py > new file mode 100644 > index 0000000000..5570693dc2 > --- /dev/null > +++ b/support/testing/tests/fs/test_cpio.py > @@ -0,0 +1,44 @@ > +import os > +import infra.basetest > + > +CHECK_FS_CMD = "mount | grep 'rootfs on / type rootfs'" > + > +def boot_img(emulator, builddir): > + img = os.path.join(builddir, "images", "rootfs.cpio") > + emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", "{}".format(img)]) > + emulator.login() > + _, exit_code = emulator.run(CHECK_FS_CMD) > + return exit_code > + > +class TestCpioDracut(infra.basetest.BRTest): > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_INIT_BUSYBOX=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_DRACUT=y > + BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE="{}" > + """.format(infra.filepath("conf/dracut.conf")) > + > + def test_run(self): > + > + exit_code = boot_img(self.emulator, > + self.builddir) > + self.assertEqual(exit_code, 0) > + > +class TestCpioFull(infra.basetest.BRTest): > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_INIT_BUSYBOX=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_FULL=y > + """ > + > + def test_run(self): > + > + exit_code = boot_img(self.emulator, > + self.builddir) > + self.assertEqual(exit_code, 0) > + > + > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ignacy.gawedzki at green-communications.fr Thu Jan 6 10:32:29 2022 From: ignacy.gawedzki at green-communications.fr (Ignacy =?utf-8?B?R2F3xJlkemtp?=) Date: Thu, 6 Jan 2022 11:32:29 +0100 Subject: [Buildroot] [PATCH] package/fakedate: fix finding the right date executable In-Reply-To: <20220105203727.GH614810@scaer> References: <20211215173432.r75invoe3ff6mthg@zenon.in.qult.net> <20220105203727.GH614810@scaer> Message-ID: <20220106103229.brnw22bg5xb6sqpu@zenon.in.qult.net> On Wed, Jan 05, 2022 at 09:37:27PM +0100, thus spake Yann E. MORIN: > Ignacy, All, > > On 2021-12-15 18:34 +0100, Ignacy Gaw?dzki spake thusly: > > If the PATH initially contains host/bin, then the right date > > executable is to be found after the *first* occurrence of fakedate in > > normal (forward) PATH order. Fix the wrapper so that that first > > occurrence is found indeed. > > > > Signed-off-by: Ignacy Gaw?dzki > > After discussing this with Arnout and Thomas, we concluded that Arnout's > proposal, with my ltile amendment, was the proper solution. Except that > the loop had to be broken on first hit, of course, so I added the proper > break. > > I also added a test that we actually did find a date executable. > > Of course, if we missed something, then feel free to yel back! ;-) With this code, fakedate is not usable without having its path in PATH. If that will never be a problem, then I have no reason to yell. =) > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > --- > > package/fakedate/fakedate | 9 +++++++-- > > 1 file changed, 7 insertions(+), 2 deletions(-) > > > > diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate > > index 9bef113357..03a4f04079 100755 > > --- a/package/fakedate/fakedate > > +++ b/package/fakedate/fakedate > > @@ -21,13 +21,18 @@ > > DATE_BIN=false > > # Do not call any 'date' before us in the PATH, or that would create > > # an infinite recursion. > > +last_date=false > > for date in $(which -a date |tac); do > > if [ "${date}" -ef "$0" ]; then > > - break > > + DATE_BIN=$last_date > > fi > > - DATE_BIN="${date}" > > + last_date="${date}" > > done > > > > +if [ "$DATE_BIN" = false ]; then > > + DATE_BIN=$last_date > > +fi > > + > > if [ -n "$SOURCE_DATE_EPOCH" ]; then > > FORCE_EPOCH=1 > > for i in "$@"; do > > -- > > 2.32.0 > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > > -- Ignacy Gaw?dzki R&D Engineer Green Communications From thomas.petazzoni at bootlin.com Thu Jan 6 10:32:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 11:32:58 +0100 Subject: [Buildroot] [PATCH-NEXT v3 4/6] support/download/go-post-process: implement Go vendoring support In-Reply-To: <20211010234655.585526-4-christian@paral.in> References: <20211010234655.585526-1-christian@paral.in> <20211010234655.585526-4-christian@paral.in> Message-ID: <20220106113258.36ce7f11@windsurf> Hello Christian, On Sun, 10 Oct 2021 16:46:53 -0700 Christian Stewart via buildroot wrote: > From: Thomas Petazzoni > > This commit introduces the download post-process script > support/download/go-post-process, and hooks it into the Go package > infrastructure. > > Signed-off-by: Thomas Petazzoni > Signed-off-by: Christian Stewart > > v1 -> v2: > > - re-submitting Thomas's series with adjustments: > - run "go mod init" just before "go mod vendor" > - this fixes the case when go.mod does not exist > - use -modcacherw to fix "make clean" permissions errors > - use the mk_tar_gz helper in the post-process step > > Signed-off-by: Christian Stewart I am a bit confused by the changes you introduced here. You're labelling this patch series v3, so I assume it comes after my v2: https://patchwork.ozlabs.org/project/buildroot/patch/20201219153525.1361175-6-thomas.petazzoni at bootlin.com/ I'm particularly confused by the addition of the -g option to pass the argument of "go mod init" as opposed to using the BR_GOMOD environment variable. In the patch I linked above, you reported that it was causing some hash issues, but I don't understand which of your changes fixed that problem. Could you clarify? Also, my patch dropped the creation of go.mod from package/pkg-golang.mk (macro $(2)_GEN_GOMOD), but I'm not sure why your patch doesn't drop that. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Thu Jan 6 10:35:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 11:35:21 +0100 Subject: [Buildroot] [PATCH 1/1] download/git: support Git LFS In-Reply-To: <20200121203337.30856-1-vfazio@xes-inc.com> References: <20200121203337.30856-1-vfazio@xes-inc.com> Message-ID: Hi John, Vincent, I finally applied this to master, with a few minor changes. On 21/01/2020 21:33, Vincent Fazio wrote: > From: John Keeping > > Git Large File Storage replaces large files with text pointers in the > Git repository while storing the contents on a remote server. If a > repository is using this extension, then git-lfs must be used to > checkout the large files before the source archive is generated. > > Signed-off-by: John Keeping > [vfazio: > - add git-lfs to DL_TOOLS_DEPENDENCIES > - fixup for 5a0d6813948fea2cdb88a2e35984520eec856dec > ("infra/pkg-download: make the DOWNLOAD macro fully parameterised") > ] > Signed-off-by: Vincent Fazio [snip] > +# If there are large files then fetch them. > +if [ ${large_file} -eq 1 ]; then > + _git lfs install AFAICS an lfs install is not needed. IMHO it's pretty bad to do that because it updates ~/.gitconfig, which Buildroot shouldn't do. We could do lfs install --local, but even that is not needed. The lfs install just makes sure that lfs is done automatically whenever you do commit or pull or something like that, but in Buildroot we always do it explicitly so the smudge filter isn't needed. > + _git lfs fetch > + _git lfs checkout As already mentioned by Yann, this doesn't work when combined with submodules. The solution is pretty trivial: # If there are also submodules, recurse into them, if [ ${recurse} -eq 1 ]; then _git submodule foreach --recursive ${GIT} lfs fetch _git submodule foreach --recursive ${GIT} lfs checkout fi I haven't actually tested this though. Vincent (or anybody), it would be nice to have a runtime test for this feature. support/testing/tests/download/br2-external/git-refs/package/git-submodule-{enabled,disabled} can be a good source of inspiration. Only I'm not sure if it's possible to set up an LFS repository that is purely file-based. Regards, Arnout > +fi > + > # Generate the archive, sort with the C locale so that it is reproducible. > # We do not want the .git dir; we keep other .git files, in case they are the > # only files in their directory. > From arnout at mind.be Thu Jan 6 10:32:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 11:32:23 +0100 Subject: [Buildroot] [git commit] download/git: support Git LFS Message-ID: <20220106102930.F11C08344C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cff428fe313a9163098243789e2ac2bd7c20d447 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Git Large File Storage replaces large files with text pointers in the Git repository while storing the contents on a remote server. If a repository is using this extension, then git-lfs must be used to checkout the large files before the source archive is generated. Signed-off-by: John Keeping [vfazio: - add git-lfs to DL_TOOLS_DEPENDENCIES - fixup for 5a0d6813948fea2cdb88a2e35984520eec856dec ("infra/pkg-download: make the DOWNLOAD macro fully parameterised") ] Signed-off-by: Vincent Fazio [Arnout: - don't "git lfs install"; - recurse into submodules. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-packages-generic.txt | 4 ++++ package/pkg-download.mk | 1 + package/pkg-generic.mk | 3 +++ support/download/dl-wrapper | 9 +++++---- support/download/git | 13 +++++++++++++ 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 1384466f9b..8723da214a 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -344,6 +344,10 @@ not and can not work as people would expect it should: submodules when they contain bundled libraries, in which case we prefer to use those libraries from their own package. +* +LIBFOO_GIT_LFS+ should be set to +YES+ if the Git repository uses + Git LFS to store large files out of band. This is only available for + packages downloaded with git (i.e. when +LIBFOO_SITE_METHOD=git+). + * +LIBFOO_STRIP_COMPONENTS+ is the number of leading components (directories) that tar must strip from file names on extraction. The tarball for most packages has one leading component named diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 5c2bdfdb23..823b34981c 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -119,6 +119,7 @@ define DOWNLOAD -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ $(if $($(2)_GIT_SUBMODULES),-r) \ + $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ $(QUIET) \ -- \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5626af1d87..6a5fe5507b 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1207,6 +1207,9 @@ ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn else ifeq ($$($(2)_SITE_METHOD),git) DL_TOOLS_DEPENDENCIES += git +ifneq ($$($(2)_GIT_LFS),) +DL_TOOLS_DEPENDENCIES += git-lfs +endif else ifeq ($$($(2)_SITE_METHOD),bzr) DL_TOOLS_DEPENDENCIES += bzr else ifeq ($$($(2)_SITE_METHOD),scp) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 6cf0b89cba..3185887541 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -17,15 +17,15 @@ # We want to catch any unexpected failure, and exit immediately. set -e -export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:ru:qf:e" +export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:lru:qf:e" main() { local OPT OPTARG - local backend output hfile recurse quiet rc + local backend output hfile large_file recurse quiet rc local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:rf:u:q" OPT; do + while getopts ":c:d:D:o:n:N:H:lrf:u:q" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -34,6 +34,7 @@ main() { n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; H) hfile="${OPTARG}";; + l) large_file="-l";; r) recurse="-r";; f) filename="${OPTARG}";; u) uris+=( "${OPTARG}" );; @@ -127,7 +128,7 @@ main() { -f "${filename}" \ -u "${uri}" \ -o "${tmpf}" \ - ${quiet} ${recurse} -- "${@}" + ${quiet} ${large_file} ${recurse} -- "${@}" then # cd back to keep path coherence cd "${OLDPWD}" diff --git a/support/download/git b/support/download/git index 1e690d4444..41c3160099 100755 --- a/support/download/git +++ b/support/download/git @@ -51,10 +51,12 @@ _on_error() { } quiet= +large_file=0 recurse=0 while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in q) quiet=-q; exec >/dev/null;; + l) large_file=1;; r) recurse=1;; o) output="${OPTARG}";; u) uri="${OPTARG}";; @@ -205,6 +207,17 @@ if [ ${recurse} -eq 1 ]; then done fi +# If there are large files then fetch them. +if [ ${large_file} -eq 1 ]; then + _git lfs fetch + _git lfs checkout + # If there are also submodules, recurse into them, + if [ ${recurse} -eq 1 ]; then + _git submodule foreach --recursive ${GIT} lfs fetch + _git submodule foreach --recursive ${GIT} lfs checkout + fi +fi + popd >/dev/null # Generate the archive. From romain.naour at smile.fr Thu Jan 6 10:38:38 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 11:38:38 +0100 Subject: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 In-Reply-To: <20b2bd43-9fe6-f174-e437-7595ea5864d8@kaod.org> References: <20220103165805.3697636-1-clg@kaod.org> <5da6fe27-bf22-7bd9-fcb5-c43551f1ed5c@gmail.com> <5aba2002-9e94-4683-b79d-5443f2852ffc@kaod.org> <16687956-3831-261a-cdf1-2b02ce463602@kaod.org> <1b60df77-a795-f328-6651-4e3b5c4b0757@gmail.com> <20b2bd43-9fe6-f174-e437-7595ea5864d8@kaod.org> Message-ID: <273bf418-04c9-5e1a-b501-4324ee649a85@smile.fr> Hello, Le 04/01/2022 ? 10:05, C?dric Le Goater a ?crit?: > Hello, > > On 1/3/22 23:43, Romain Naour wrote: >> Le 03/01/2022 ? 23:20, C?dric Le Goater a ?crit?: >>> Hello, >>>> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >>>> >>>> Create a test branch named: qemu-6.2.0-defconfigs-qemu >>>> >>>> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >>>> Buildroot defconfis and "qemu" is a pattern. >>>> >>>> See: >>>> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >>>> >>>> >>>> >>>> "pushing a branch called "-defconfigs-" which will test all >>>> defconfigs whose name start with the pattern." >>> >>> That looks simple enough. Something is going wrong though : >>> >>> ?? https://gitlab.com/legoater/buildroot/-/jobs/1937752353 >>> >>> Am I missing something ? >> >> humm, maybe there is weakness in the script when foo is "qemu-6.2.0" >> ????????????????????????????????????????????????????????????? ^ >> Try again with something else like qemu_6.2.0-defconfigs-qemu > > Yes. That was it. @Thomas: maybe ignore all characters before "-defconfigs": sed 's%^.*-defconfigs-\(.*\)%\1%')sed 's%^.*-defconfigs-\(.*\)%\1%') Best regards, Romain > > Thanks, > > C. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Jan 6 10:53:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 11:53:56 +0100 Subject: [Buildroot] [PATCH 1/1] system/Config.in: introduce pre-build script In-Reply-To: <20200121230956.23129-2-mmayer@broadcom.com> References: <20200121230956.23129-1-mmayer@broadcom.com> <20200121230956.23129-2-mmayer@broadcom.com> Message-ID: <0e266f48-7464-84f1-e297-a5c6eb7d6f19@mind.be> Hi Markus, On 22/01/2020 00:09, Markus Mayer wrote: > We introduce the concept of a pre-build script that works similar to > the already existing post-build and post-image scripts. > > The pre-build script(s) are executed before the build commences. This > allows a user to run some preperatory tasks prior to the build. > > Signed-off-by: Markus Mayer Although the use case you presented in the cover letter is probably not a "good" one, as explained by Thomas, I'm pretty sure there are valid cases for having a pre-build script. I think in general it's actually better to have a wrapper script or Makefile around Buildroot, because that gives a lot more flexibility. Still, this proposal is symmetrical with the post-image script. And the overhead is negligible. So I applied to master after all. Regards, Arnout > --- > Makefile | 3 +++ > system/Config.in | 10 ++++++++++ > 2 files changed, 13 insertions(+) > > diff --git a/Makefile b/Makefile > index a58ca7821d2d..9bf9f1aa05ee 100644 > --- a/Makefile > +++ b/Makefile > @@ -579,6 +579,9 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) > > .PHONY: prepare > prepare: $(BUILD_DIR)/buildroot-config/auto.conf > + @$(foreach s, $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT)), \ > + $(call MESSAGE,"Executing pre-build script $(s)"); \ > + $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) > > .PHONY: world > world: target-post-image > diff --git a/system/Config.in b/system/Config.in > index c8c5be40e096..7b890aed1abb 100644 > --- a/system/Config.in > +++ b/system/Config.in > @@ -518,6 +518,16 @@ config BR2_ROOTFS_OVERLAY > They are copied as-is into the rootfs, excluding files ending > with ~ and .git, .svn and .hg directories. > > +config BR2_ROOTFS_PRE_BUILD_SCRIPT > + string "Custom scripts to run before commencing the build" > + default "" > + help > + Specify a space-separated list of scripts to be run before the > + build commences. > + > + This gives users the opportunity to do board-specific > + preparations before starting the build. > + > config BR2_ROOTFS_POST_BUILD_SCRIPT > string "Custom scripts to run before creating filesystem images" > default "" > From arnout at mind.be Thu Jan 6 10:43:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 11:43:40 +0100 Subject: [Buildroot] [git commit] system/Config.in: introduce pre-build script Message-ID: <20220106104801.6020782AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b2a377edb9e566aded20a0d9a25200416d873c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We introduce the concept of a pre-build script that works similar to the already existing post-build and post-image scripts. The pre-build script(s) are executed before the build commences. This allows a user to run some preperatory tasks prior to the build. Signed-off-by: Markus Mayer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 3 +++ system/Config.in | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index ac98b84425..3099d35158 100644 --- a/Makefile +++ b/Makefile @@ -599,6 +599,9 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) .PHONY: prepare prepare: $(BUILD_DIR)/buildroot-config/auto.conf + @$(foreach s, $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT)), \ + $(call MESSAGE,"Executing pre-build script $(s)"); \ + $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) .PHONY: world world: target-post-image diff --git a/system/Config.in b/system/Config.in index b3abeddd68..8c66cad12a 100644 --- a/system/Config.in +++ b/system/Config.in @@ -533,6 +533,16 @@ config BR2_ROOTFS_OVERLAY They are copied as-is into the rootfs, excluding files ending with ~ and .git, .svn and .hg directories. +config BR2_ROOTFS_PRE_BUILD_SCRIPT + string "Custom scripts to run before commencing the build" + default "" + help + Specify a space-separated list of scripts to be run before the + build commences. + + This gives users the opportunity to do board-specific + preparations before starting the build. + config BR2_ROOTFS_POST_BUILD_SCRIPT string "Custom scripts to run before creating filesystem images" default "" From romain.naour at smile.fr Thu Jan 6 11:24:25 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 12:24:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/ettercap: new package In-Reply-To: <652ca88f-a591-94b5-119a-14375ef3c850@smile.fr> References: <1597227392-9101-1-git-send-email-jugurtha.belkalem@smile.fr> <1597227392-9101-2-git-send-email-jugurtha.belkalem@smile.fr> <652ca88f-a591-94b5-119a-14375ef3c850@smile.fr> Message-ID: <3969d0bf-8292-9947-aa9a-42468a81f021@smile.fr> Hello Jugurtha, Le 15/09/2020 ? 23:13, Romain Naour a ?crit?: > Hi Heiko, > > Le 15/09/2020 ? 22:57, Heiko Thiery a ?crit?: >> Hi Jugurtha, Hi Romain, >> >> Am Mi., 12. Aug. 2020 um 12:16 Uhr schrieb Jugurtha BELKALEM >> : >>> >>> Signed-off-by: Jugurtha BELKALEM >>> --- >>> DEVELOPERS | 1 + >>> package/Config.in | 1 + >>> package/ettercap/Config.in | 32 ++++++++++++++++++++++++++++++++ >>> package/ettercap/ettercap.hash | 3 +++ >>> package/ettercap/ettercap.mk | 32 ++++++++++++++++++++++++++++++++ >>> 5 files changed, 69 insertions(+) >>> create mode 100644 package/ettercap/Config.in >>> create mode 100644 package/ettercap/ettercap.hash >>> create mode 100644 package/ettercap/ettercap.mk >>> >>> diff --git a/DEVELOPERS b/DEVELOPERS >>> index 42fa5a4..2097f4d 100644 >>> --- a/DEVELOPERS >>> +++ b/DEVELOPERS >>> @@ -1396,6 +1396,7 @@ N: Joshua Henderson >>> F: package/qt5/qt5wayland/ >>> >>> N: Jugurtha BELKALEM >>> +F: package/ettercap/ >>> F: package/python-cycler/ >>> F: package/python-matplotlib/ >>> >>> diff --git a/package/Config.in b/package/Config.in >>> index d7e79f4..db886a1 100644 >>> --- a/package/Config.in >>> +++ b/package/Config.in >>> @@ -2042,6 +2042,7 @@ menu "Networking applications" >>> source "package/ebtables/Config.in" >>> source "package/ejabberd/Config.in" >>> source "package/ethtool/Config.in" >>> + source "package/ettercap/Config.in" >>> source "package/faifa/Config.in" >>> source "package/fail2ban/Config.in" >>> source "package/fastd/Config.in" >>> diff --git a/package/ettercap/Config.in b/package/ettercap/Config.in >>> new file mode 100644 >>> index 0000000..e0693f4 >>> --- /dev/null >>> +++ b/package/ettercap/Config.in >>> @@ -0,0 +1,32 @@ >>> +config BR2_PACKAGE_ETTERCAP >>> + bool "ettercap" >>> + depends on !BR2_STATIC_LIBS >>> + depends on BR2_TOOLCHAIN_HAS_THREADS >>> + depends on BR2_USE_WCHAR # ncurses wchar >>> + select BR2_PACKAGE_ETHTOOL # runtime >>> + select BR2_PACKAGE_GEOIP >> >> As far as I can see in the CMakelist.txt this can be disabled. So this >> looks to me like an option for the package. > > Indeed, geoip is optional. But even when selected the geoip package doesn't > install MaxMind's GeoIP lite databases. > > Jugurtha, maybe we can just turn it off ? > >> >>> + select BR2_PACKAGE_LIBCURL >> >> Tried to build and failed due to missing: >> select BR2_PACKAGE_LIBICONV > > libiconv package is only used for uclibc based toolchain. The dependency must be > conditional. >> >>> + select BR2_PACKAGE_LIBNET >>> + select BR2_PACKAGE_LIBPCAP >>> + select BR2_PACKAGE_NCURSES >>> + select BR2_PACKAGE_NCURSES_WCHAR >> >> Same for ncurses support. This seems also to be optional. > > Jugurtha, can you have a look ? Based on the feedback from Heiko Thiery and I, I have marked this patch as "Changes Requested". Best regards, Romain > >> >>> + select BR2_PACKAGE_OPENSSL >>> + select BR2_PACKAGE_ZLIB >>> + help >>> + Ettercap is a comprehensive suite for man >>> + in the middle attacks. It features sniffing of >>> + live connections, content filtering on the fly >>> + and many other interesting tricks. It supports >>> + active and passive dissection of many protocols >>> + and includes many features for network and >>> + host analysis. >>> + >>> + Note : Ettercap can provide better tracking >>> + for IP addresses when GeoIP.dat is provided by >>> + users (GeoIP.dat is available on maxmind website). >>> + >>> + http://www.ettercap-project.org/ >>> + >>> +comment "ettercap needs a toolchain w/ threads, wchar, dynamic library" >>> + depends on BR2_TOOLCHAIN_HAS_THREADS \ >> ^ >> I think the "!" is missing?! > > Indeed > >> >>> + || !BR2_USE_WCHAR ||BR2_STATIC_LIBS > > need space between "||" and "BR2_STATIC_LIBS" > >> >>> diff --git a/package/ettercap/ettercap.hash b/package/ettercap/ettercap.hash >>> new file mode 100644 >>> index 0000000..61ecbec >>> --- /dev/null >>> +++ b/package/ettercap/ettercap.hash >>> @@ -0,0 +1,3 @@ >>> +# Locally calculated >>> +sha256 d0c3ef88dfc284b61d3d5b64d946c1160fd04276b448519c1ae4438a9cdffaf3 ettercap-0.8.3.1.tar.gz >>> +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE >>> diff --git a/package/ettercap/ettercap.mk b/package/ettercap/ettercap.mk >>> new file mode 100644 >>> index 0000000..ee8c8a2 >>> --- /dev/null >>> +++ b/package/ettercap/ettercap.mk >>> @@ -0,0 +1,32 @@ >>> +################################################################################ >>> +# >>> +# ettercap >>> +# >>> +################################################################################ >>> + >>> +ETTERCAP_VERSION = 0.8.3.1 >>> +ETTERCAP_SITE = $(call github,Ettercap,ettercap,v$(ETTERCAP_VERSION)) >>> +ETTERCAP_LICENSE = GPL-2.0+ >>> +ETTERCAP_LICENSE_FILES = LICENSE >>> +ETTERCAP_SUPPORTS_IN_SOURCE_BUILD = NO >>> +ETTERCAP_INSTALL_STAGING = YES >> >> Why do we need to install in staging? > > Ettercap should provide libettercap.so.0 (I need to check). > > https://rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/e/ettercap-0.8.3.1-1.fc33.i686.html > > Heiko, thanks for the review! > > Best regards, > Romain > >> >>> +ETTERCAP_DEPENDENCIES = geoip libcurl libnet libpcap ncurses openssl zlib \ >>> + host-bison host-flex host-pkgconf >> >> Add dependency for libiconv (see above). >> >>> + >>> +ETTERCAP_CONF_OPTS = -DENABLE_IPV6=ON -DENABLE_GTK=OFF -DBUNDLED_LIBS=OFF >>> + >>> +ifeq ($(BR2_PACKAGE_PCRE),y) >>> +ETTERCAP_DEPENDENCIES += pcre >>> +endif >>> + >>> +# Replaces default encoding set (ISO-8859-1) with UTF-8 in ettercap >>> +# configuration file installed by the package. >>> +# It ensures that all characters are properly decoded and avoids >>> +# any fatal errors while running in text mode (-T). >>> +define ETTERCAP_SET_UTF8_ENCODING >>> + $(SED) 's%^utf8_encoding.*%utf8_encoding = "UTF-8"%' \ >>> + $(TARGET_DIR)/etc/ettercap/etter.conf >>> +endef >>> +ETTERCAP_POST_INSTALL_TARGET_HOOKS += ETTERCAP_SET_UTF8_ENCODING >>> + >>> +$(eval $(cmake-package)) >> >> Thank you. >> > From romain.naour at smile.fr Thu Jan 6 12:34:49 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 13:34:49 +0100 Subject: [Buildroot] [PATCH v4] package/gitlab-runner: new package Message-ID: <20220106123449.344837-1-romain.naour@smile.fr> From: Marcin Niestroj We rely on config.toml to be created manually during first boot as setup stage. Even with an empty config.toml file, the gitlab-runner needs gitlab registration token to register to a gitlab server. Use the 14.5.1 release since 14.5.2 and 14.6.0 triggers a build error [1] due a patch for GO < 1.17. (helpers/patches/issue_28732/syscall.go:11:2: undefined: syscall.Issue28732Fix) Tested: https://gitlab.com/kubu93/buildroot/-/pipelines/442604876 [1] https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28766 Signed-off-by: Marcin Niestroj Signed-off-by: Romain Naour Cc: J?r?my Rosen --- Note: We used the gitlab-runner for shell or python jobs. Jobs using docker images (images: in gitlab-ci.yml) is not tested. v4: update to 14.5.1 Remove config.toml handling from .mk. We rely on config.toml to be created during first boot as setup stage. Even with an empty config.toml file, the gitlab-runner needs gitlab registration token to register to a gitlab server. (Marcin Niestroj) Remove alias gitlab-ci-multi-runner.service (Marcin Niestroj), gitlab-ci-multi-runner.service comme from Debian gitlab-runner systemd service file. v3: Change daemon process to gitlab-runner user. see as example: https://git.buildroot.net/buildroot/tree/package/tpm2-abrmd/S80tpm2-abrmd?h=2020.05-rc2#n31 [Romain: Tested only using systemd init on aarch64 target emulated by Qemu] v2: add service file, config file, gitlab user. add bash as runtime dependency. Add git, curl, ca-certificate, tar runtime dependencies from on debian control file for gitlab-runner package. Use gnu tar since we can expect tar options that are not supported by busybox tar implementation. Enable SSL/TLS library with openssl needed at runtime. Add me as "developer". test-pkg config: BR2_PACKAGE_GITLAB_RUNNER=y --- DEVELOPERS | 2 + package/Config.in | 1 + package/gitlab-runner/Config.in | 31 ++++++++++ package/gitlab-runner/S95gitlab-runner | 64 +++++++++++++++++++++ package/gitlab-runner/gitlab-runner.hash | 3 + package/gitlab-runner/gitlab-runner.mk | 33 +++++++++++ package/gitlab-runner/gitlab-runner.service | 18 ++++++ 7 files changed, 152 insertions(+) create mode 100644 package/gitlab-runner/Config.in create mode 100644 package/gitlab-runner/S95gitlab-runner create mode 100644 package/gitlab-runner/gitlab-runner.hash create mode 100644 package/gitlab-runner/gitlab-runner.mk create mode 100644 package/gitlab-runner/gitlab-runner.service diff --git a/DEVELOPERS b/DEVELOPERS index 4b04f90ccb..3b3c207495 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1722,6 +1722,7 @@ F: configs/orangepi_zero_plus_defconfig F: package/argparse/ F: package/dt-utils/ F: package/easydbus/ +F: package/gitlab-runner/ F: package/lua-flu/ F: package/lua-stdlib/ F: package/luaossl/ @@ -2407,6 +2408,7 @@ F: package/enlightenment/ F: package/flare-engine/ F: package/flare-game/ F: package/gcc/ +F: package/gitlab-runner/ F: package/glibc/ F: package/irrlicht/ F: package/liblinear/ diff --git a/package/Config.in b/package/Config.in index 9f4ab72a80..f43db927d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2098,6 +2098,7 @@ menu "Miscellaneous" source "package/collectl/Config.in" source "package/domoticz/Config.in" source "package/empty/Config.in" + source "package/gitlab-runner/Config.in" source "package/gnuradio/Config.in" source "package/googlefontdirectory/Config.in" source "package/gqrx/Config.in" diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in new file mode 100644 index 0000000000..72c2742562 --- /dev/null +++ b/package/gitlab-runner/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_GITLAB_RUNNER + bool "gitlab-runner" + 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_USE_MMU # git + depends on BR2_USE_WCHAR # tar + select BR2_PACKAGE_BASH # runtime, shells/bash.go probably want to support bashism. + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_CA_CERTIFICATES # runtime + select BR2_PACKAGE_GIT # runtime + select BR2_PACKAGE_LIBCURL # runtime + select BR2_PACKAGE_LIBCURL_CURL # runtime + select BR2_PACKAGE_LIBCURL_OPENSSL # runtime, for ca-certificates. + select BR2_PACKAGE_OPENSSL # runtime + select BR2_PACKAGE_LIBOPENSSL # runtime + select BR2_PACKAGE_LIBOPENSSL_BIN # runtime + select BR2_PACKAGE_TAR # runtime + help + GitLab Runner is the open source project that is used to run + your jobs and send the results back to GitLab. It is used in + conjunction with GitLab CI/CD, the open-source continuous + integration service included with GitLab that coordinates the + jobs. + + https://docs.gitlab.com/runner/ + +comment "gitlab-runner needs a toolchain w/ threads" + 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 diff --git a/package/gitlab-runner/S95gitlab-runner b/package/gitlab-runner/S95gitlab-runner new file mode 100644 index 0000000000..69dcb28cce --- /dev/null +++ b/package/gitlab-runner/S95gitlab-runner @@ -0,0 +1,64 @@ +#!/bin/sh + +DAEMON="gitlab-runner" +PIDFILE="/var/run/$DAEMON.pid" + +GITLAB_RUNNER_ARGS="run" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -m -b -p "$PIDFILE" -c "$DAEMON:$DAEMON" -x "/usr/bin/$DAEMON" \ + -- $GITLAB_RUNNER_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" -u "$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + printf 'Reloading %s: ' "$DAEMON" + start-stop-daemon -K -s HUP -q -p "$PIDFILE" -u "$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +case "$1" in + start|stop|restart|reload) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/gitlab-runner/gitlab-runner.hash b/package/gitlab-runner/gitlab-runner.hash new file mode 100644 index 0000000000..f4fab595b5 --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 63a7963f750ec45a7cb34a660b7247a0aa6def98706b7bd80efc95053e66822d gitlab-runner-14.5.1.tar.gz +sha256 0ae968b7ddd25da0209c3c6594aac1ac74ddf90385940b02b420463e2e0734de LICENSE diff --git a/package/gitlab-runner/gitlab-runner.mk b/package/gitlab-runner/gitlab-runner.mk new file mode 100644 index 0000000000..fde776e631 --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# gitlab-runner +# +################################################################################ + +GITLAB_RUNNER_VERSION = 14.5.1 +GITLAB_RUNNER_SITE = https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(GITLAB_RUNNER_VERSION) +GITLAB_RUNNER_LICENSE = MIT +GITLAB_RUNNER_LICENSE_FILES = LICENSE + +GITLAB_RUNNER_LDFLAGS = \ + -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=$(GITLAB_RUNNER_VERSION) + +# Don't run gitlab runner as root. +define GITLAB_RUNNER_USERS + gitlab-runner -1 gitlab-runner -1 * /var/run/dbus /bin/false - Gitlab Runner +endef + +define GITLAB_RUNNER_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/gitlab-runner/S95gitlab-runner \ + $(TARGET_DIR)/etc/init.d/S95gitlab-runner +endef + +define GITLAB_RUNNER_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/var/lib/gitlab-runner + $(INSTALL) -D -m 0644 package/gitlab-runner/gitlab-runner.service \ + $(TARGET_DIR)/usr/lib/systemd/system/gitlab-runner.service +endef + +GITLAB_RUNNER_POST_INSTALL_TARGET_HOOKS += GITLAB_RUNNER_INSTALL_CONFIG + +$(eval $(golang-package)) diff --git a/package/gitlab-runner/gitlab-runner.service b/package/gitlab-runner/gitlab-runner.service new file mode 100644 index 0000000000..cba751a3d6 --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.service @@ -0,0 +1,18 @@ +[Unit] +Description=GitLab Runner +After=network.target +ConditionFileIsExecutable=/usr/bin/gitlab-runner + +[Service] +Environment="DAEMON_ARGS=run --working-directory /var/lib/gitlab-runner --config /etc/gitlab-runner/config.toml --service gitlab-runner --syslog --user gitlab-runner" +EnvironmentFile=-/etc/default/%p +StartLimitInterval=5 +StartLimitBurst=10 +ExecStart=/usr/bin/gitlab-runner $DAEMON_ARGS +ExecReload=/bin/kill -HUP $MAINPID + +Restart=always +RestartSec=120 + +[Install] +WantedBy=multi-user.target -- 2.31.1 From romain.naour at smile.fr Thu Jan 6 13:07:14 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 14:07:14 +0100 Subject: [Buildroot] [PATCH] package/qt5: remove qt5webkit-examples from qt5/Config.in Message-ID: <20220106130714.347453-1-romain.naour@smile.fr> qt5webkit-examples was removed by commit [1] [1] b4841d722fb37f8c8c4715c7fe8b2502c9a3a9dd Signed-off-by: Romain Naour Cc: James Hilliard Cc: Yann E. MORIN --- package/qt5/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 6f2428d800..5751d6cb70 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -67,7 +67,6 @@ source "package/qt5/qt5virtualkeyboard/Config.in" source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5webengine/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" -- 2.31.1 From yann.morin.1998 at free.fr Thu Jan 6 13:35:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 14:35:27 +0100 Subject: [Buildroot] [git commit] package/qt5: remove qt5webkit-examples from qt5/Config.in Message-ID: <20220106132930.D76B0832CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0dc59ef8dca1965b3ed5d7b90f615a415ecbc863 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master qt5webkit-examples was removed by commit [1] [1] b4841d722fb37f8c8c4715c7fe8b2502c9a3a9dd Signed-off-by: Romain Naour Cc: James Hilliard Cc: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/qt5/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 6f2428d800..5751d6cb70 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -67,7 +67,6 @@ source "package/qt5/qt5virtualkeyboard/Config.in" source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5webengine/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" From yann.morin.1998 at free.fr Thu Jan 6 13:36:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 14:36:14 +0100 Subject: [Buildroot] [PATCH] package/qt5: remove qt5webkit-examples from qt5/Config.in In-Reply-To: <20220106130714.347453-1-romain.naour@smile.fr> References: <20220106130714.347453-1-romain.naour@smile.fr> Message-ID: <20220106133614.GO614810@scaer> Romain, All, On 2022-01-06 14:07 +0100, Romain Naour spake thusly: > qt5webkit-examples was removed by commit [1] > > [1] b4841d722fb37f8c8c4715c7fe8b2502c9a3a9dd > > Signed-off-by: Romain Naour > Cc: James Hilliard > Cc: Yann E. MORIN Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/qt5/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index 6f2428d800..5751d6cb70 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -67,7 +67,6 @@ source "package/qt5/qt5virtualkeyboard/Config.in" > source "package/qt5/qt5wayland/Config.in" > source "package/qt5/qt5webchannel/Config.in" > source "package/qt5/qt5webkit/Config.in" > -source "package/qt5/qt5webkit-examples/Config.in" > source "package/qt5/qt5webengine/Config.in" > source "package/qt5/qt5websockets/Config.in" > source "package/qt5/qt5webview/Config.in" > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thierry.bultel at linatsea.fr Thu Jan 6 13:48:52 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 6 Jan 2022 14:48:52 +0100 Subject: [Buildroot] [PATCH v3 3/3] fs/cpio: new option to use dracut tool In-Reply-To: <20220106103149.GN614810@scaer> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-3-thierry.bultel@linatsea.fr> <20220106103149.GN614810@scaer> Message-ID: <313f164a-4f58-3212-a75a-d64acbbc0168@linatsea.fr> >> + >> +show_modules=yes >> +i18n_install_all=no >> +lvmconf=no >> +mdadmconf=no >> +early_microcode=no >> +hostonly=no >> +hostonly_cmdline=no >> +use_fstab=no >> +kernel_cmdline="rd.break=initqueue" >> +do_strip=no >> + >> +# Dracut modules need >> +add_dracutmodules+=" \ >> +busybox-buildroot \ >> +bash >> +" >> + >> +# Modules to ignore >> +omit_dracutmodules+=" \ > [--SNIP big list of stuff--] >> +" > Rather than remove select stuff, can't we just start from an empty set > and add just what is needed? Yann, Unfortunately, This is not that simple. Dracut will unconditionally source a lot of unwanted modules present in host/usr/lib/modules.d (basically because it considers that the init system is systemd always) unless you tell it not to do it. There is no option to specify another directory to look in, nor a way to select the only needed modules. Only excluding them seems the way. Also, when you asked why I put the module-setup.sh as executable. You are right, it is not mandatory to do so, because dracut just sources these files. The fact is that all the ones that it provides are set as executables, with no real reason. Regards, Thierry From james.hilliard1 at gmail.com Thu Jan 6 06:24:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 5 Jan 2022 23:24:06 -0700 Subject: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220106062407.3131530-1-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> Message-ID: <20220106062407.3131530-3-james.hilliard1@gmail.com> We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages. We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version. There are python3 patches available that apply to this version with minor modifications(to be added in a future patch). We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive. We need to add some new required dependencies to qt5webengine so that it will build. Signed-off-by: James Hilliard --- package/qt5/qt5.mk | 5 +- .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 22 + package/qt5/qt5webengine/Config.in | 2 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 8 files changed, 2561 insertions(+), 2012 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 0000000000..ced431c9e9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 0000000000..103e27d889 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 0000000000..e6ac2706f2 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..017c01a8e7 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). @@ -60,6 +61,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc deleted file mode 100644 index a5fdfdc1f1..0000000000 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ /dev/null @@ -1,1000 +0,0 @@ -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/cityhash/COPYING \ - src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ - src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ - src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ - src/3rdparty/chromium/third_party/dav1d/LICENSE \ - src/3rdparty/chromium/third_party/dawn/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/ink/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jacoco/LICENSE \ - src/3rdparty/chromium/third_party/javalang/LICENSE \ - src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ - src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ - src/3rdparty/chromium/third_party/libipp/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libxslt/src/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/lottie/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mako/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/nasm/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/perfetto/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/pffft/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/r8/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/rnnoise/COPYING \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/schema_org/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/six/src/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ - src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/test_fonts/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/turbine/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/unrar/LICENSE \ - src/3rdparty/chromium/third_party/unrar/src/license.txt \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ - src/3rdparty/chromium/third_party/weston/LICENSE \ - src/3rdparty/chromium/third_party/weston/src/COPYING \ - src/3rdparty/chromium/third_party/weston/src/data/COPYING \ - src/3rdparty/chromium/third_party/widevine/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ - src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ - src/3rdparty/gn/base/third_party/icu/LICENSE \ - src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb..1d2b70c4f6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..1b5529d2bb 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -5,18 +5,18 @@ ################################################################################ QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python + qt5declarative qt5webchannel host-bison host-flex host-freetype \ + host-gperf host-nodejs host-pkgconf host-python +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libxkbfile xlib_libXrandr xlib_libXtst endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss @@ -44,7 +44,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python @@ -53,12 +55,20 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty +endef +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -- 2.25.1 From romain.naour at smile.fr Thu Jan 6 14:08:08 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 15:08:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/liburing: new package In-Reply-To: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> Message-ID: <3c9b632e-aae8-5766-c961-42627109d70a@smile.fr> Hello Fabrice, Le 04/01/2022 ? 19:11, Fabrice Fontaine a ?crit?: > This is the io_uring library, liburing. liburing provides helpers to > setup and teardown io_uring instances, and also a simplified interface > for applications that don't need (or want) to deal with the full kernel > side implementation. > > https://git.kernel.dk/cgit/liburing liburing is an optional Qemu dependency, it allows to use io_uring instead of the thread pool. Archlinux provide some infos about other packages using liburing: https://archlinux.org/packages/extra/x86_64/liburing/ > > Signed-off-by: Fabrice Fontaine > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/liburing/Config.in | 13 ++++++++++++ > package/liburing/liburing.hash | 8 ++++++++ > package/liburing/liburing.mk | 36 ++++++++++++++++++++++++++++++++++ > 5 files changed, 59 insertions(+) > create mode 100644 package/liburing/Config.in > create mode 100644 package/liburing/liburing.hash > create mode 100644 package/liburing/liburing.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 444e58714c..5017dde56e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -904,6 +904,7 @@ F: package/librsync/ > F: package/libsoup/ > F: package/libsoxr/ > F: package/libupnp/ > +F: package/liburing/ > F: package/libv4l/ > F: package/libxslt/ > F: package/mbedtls/ > diff --git a/package/Config.in b/package/Config.in > index e09e4aad3f..1f3ec9a334 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2001,6 +2001,7 @@ menu "Other" > source "package/libuci/Config.in" > source "package/libunwind/Config.in" > source "package/liburcu/Config.in" > + source "package/liburing/Config.in" > source "package/libuv/Config.in" > source "package/lightning/Config.in" > source "package/linux-pam/Config.in" > diff --git a/package/liburing/Config.in b/package/liburing/Config.in > new file mode 100644 > index 0000000000..898d95cfa6 > --- /dev/null > +++ b/package/liburing/Config.in > @@ -0,0 +1,13 @@ > +config BR2_PACKAGE_LIBURING > + bool "liburing" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h Is any linux-headers dependency (5.0 maybe). > + help > + This is the io_uring library, liburing. liburing provides > + helpers to setup and teardown io_uring instances, and also a > + simplified interface for applications that don't need (or > + want) to deal with the full kernel side implementation. > + > + https://git.kernel.dk/cgit/liburing > + > +comment "liburing needs a toolchain w/ gcc >= 4.9" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash > new file mode 100644 > index 0000000000..56e90d71cc > --- /dev/null > +++ b/package/liburing/liburing.hash > @@ -0,0 +1,8 @@ > +# Locally calculated > +sha256 df7c8fd05fd39da622b2814e06f815f11f1beb429487a4330eed64bb7f353dbf liburing-2.1.tar.bz2 > + > +# Hash for license files > +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL > +sha256 d0b225f17ef2d05d5cda6b25b2dc334ef6f5f12537c20edf6e391852a095ec19 LICENSE > +sha256 97d62ff5d7cf0b1cef34c33a89877352911278ca4ac1c6c4f24a835baa5ea10b README > diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk > new file mode 100644 > index 0000000000..a977e74b4f > --- /dev/null > +++ b/package/liburing/liburing.mk > @@ -0,0 +1,36 @@ > +################################################################################ > +# > +# liburing > +# > +################################################################################ > + > +LIBURING_VERSION = 2.1 > +LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 > +LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot > +LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT > +LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README > +LIBURING_INSTALL_STAGING = YES > + > +ifeq ($(BR2_STATIC_LIBS),y) > +LIBURING_MAKE_OPTS += ENABLE_SHARED=0 > +else > +LIBURING_MAKE_OPTS += ENABLE_SHARED=1 > +endif > + > +define LIBURING_CONFIGURE_CMDS > + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) > +endef Indeed, configure is a shell script. It's not generated by autotools. Best regards, Romain > + > +define LIBURING_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D)/src > +endef > + > +define LIBURING_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install > +endef > + > +define LIBURING_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install > +endef > + > +$(eval $(generic-package)) > From danomimanchego123 at gmail.com Thu Jan 6 14:20:50 2022 From: danomimanchego123 at gmail.com (Danomi Manchego) Date: Thu, 6 Jan 2022 09:20:50 -0500 Subject: [Buildroot] call with hooks In-Reply-To: References: Message-ID: Hu Arnout, Thanks for the explanation. I feel better now :) Danomi - On Thu, Jan 6, 2022 at 4:39 AM Arnout Vandecappelle wrote: > > > > On 05/01/2022 17:20, Danomi Manchego wrote: > > Hello all, > > > > I noticed a possible inconsistency, and thought I should post it. > > Looking at places where buildroot uses hooks: > > > > $ grep -r '$(hook))$(sep)' . > > [snip] > > > > Notice that the one hit in Makefile uses "$($(hook))$(sep)" while the > > hits in pkg-generic.mk use "$(call $(hook))$(sep)". My Make-fu isn't > > powerful enough to understand if there is an actual problem - should > > there be a "call" in the Makefile line? The general syntax for call > > is "$(call variable,param,param,?)" so I don't follow what the extra > > call in $(call $(hook) is doing for us. > > Historical accident. > > The person who first introduced the hooks back in the days didn't realize that > $(call ...) is not for "something that looks like a function", but rather it is > for "whenever you want to pass arguments". Reviewers also didn't realize this > and just applied, and when more hooks were added later they copied the pattern. > > Regards, > Arnout > > > > > Thanks, > > Danomi - > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From romain.naour at smile.fr Thu Jan 6 14:43:01 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 15:43:01 +0100 Subject: [Buildroot] [PATCHv6] board/mender: add a mender board example configuration. Message-ID: <20220106144301.1022644-1-romain.naour@smile.fr> From: Adam Duskett Buildroot currently has all of the needed packages to use Mender as the primary update system. However, there isn't any documentation or examples now that provide a starting point for users. This lack of documentation makes setting up a Mender based update system difficult and time-consuming. Provided in this patch series is a mender_x86_64_efi_defconfig of which sets up an x86_64 EFI based build that is ready to flash to a USB pen drive or use in a QEMU environment. The system partition schema comprises of two equally sized root partitions and a data partition that mounts to /var/lib/mender as a persistent data store partition. There is a board/mender/readme.txt provided, which gives users documentation on how to flash the built image or boot the image using QEMU as well. The post-build and post-image-efi scripts also have four options: -a --artifact-name: - The name of the artifact, this is added to /etc/mender/artifact_info -o --data-part-size: - The data partition size. -d --device-type - The device-type used by mender to catagorize registered devices. -g --generate-mender-image - Set to true to generate a mender image after a build. Signed-off-by: Adam Duskett Signed-off-by: Mikael Bourhis-Cloarec [Romain: rebase on master (01.2022) - update genimage-efi.cfg to use GPT partition table and genimage-15 syntax - bump the kernel to 5.15.13 - Add host-libelf kernel dependency - Use BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI after commit 82d1e8c628cc (boot/grub2: use none platform when building for host) - Add regexp grub mandatory module for mender-grubenv - remove startup.nsh from genimage-efi.cfg after commit 3efb5e31fc05 (board, boot, package: remove usage of startup.nsh in EFI partition)] Signed-off-by: Romain Naour --- Changes: v5 -> v6: - rebase on master (01.2022) - update genimage-efi.cfg to use GPT partition table and genimage-15 syntax - bump the kernel to 5.15.13 - Add host-libelf kernel dependency - Use BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI after commit 82d1e8c628cc (boot/grub2: use none platform when building for host) - Add regexp grub mandatory module for mender-grubenv - remove startup.nsh from genimage-efi.cfg after commit 3efb5e31fc05 (board, boot, package: remove usage of startup.nsh in EFI partition) Changes v4 -> v5: - Fix the patch format Changes v3 -> v4 (Mikael Bourhis-Cloarec): - Add fix: missing "=y" for SSP option in defconfig - Add fix: mounting point of '/dev/vda1' in 'overlay/etc/fstab' Changes v2 -> v3: - Bump kernel version to 5.5.7 - Move the board files form board/mender to board/mender/x86_64 - Add the four arguments to the post-build and post-image scripts. - Update genimage-efi.cfg to ensure that all partitions line up properly. - Update the readme.txt file to reflect the script argument changes. Changes v1 -> v2: - Remove uneeded entries in board/mender/overlays/etc/fstab - Rename post-image-efi-gpt.sh to post-image-efi.sh - Rename pre-image.sh to post-build.sh to keep with standard naming conventions. - Check if /var/lib/mender is a symlink, and if so; remove it and create a directory in its place. This change prevents the mender init script from doing the same thing and preventing the data partition from mounting correctly on the initial boot. - Make creating a mender artifact optional after the build. - Add more documentation in board/mender/readme.txt. - Add genimage-efi.cfg [Thomas] - Use genimage.sh instead of the old-style found in board/pc/post-image-efi-gpt.sh (Thomas) --- board/mender/x86_64/genimage-efi.cfg | 44 ++++++++++ board/mender/x86_64/linux.config | 64 ++++++++++++++ board/mender/x86_64/mender_grubenv_defines | 25 ++++++ board/mender/x86_64/overlay/etc/fstab | 7 ++ .../x86_64/overlay/etc/mender/mender.conf | 11 +++ board/mender/x86_64/post-build.sh | 54 ++++++++++++ board/mender/x86_64/post-image-efi.sh | 84 +++++++++++++++++++ board/mender/x86_64/readme.txt | 67 +++++++++++++++ configs/mender_x86_64_efi_defconfig | 81 ++++++++++++++++++ 9 files changed, 437 insertions(+) create mode 100644 board/mender/x86_64/genimage-efi.cfg create mode 100644 board/mender/x86_64/linux.config create mode 100644 board/mender/x86_64/mender_grubenv_defines create mode 100644 board/mender/x86_64/overlay/etc/fstab create mode 100644 board/mender/x86_64/overlay/etc/mender/mender.conf create mode 100755 board/mender/x86_64/post-build.sh create mode 100755 board/mender/x86_64/post-image-efi.sh create mode 100644 board/mender/x86_64/readme.txt create mode 100644 configs/mender_x86_64_efi_defconfig diff --git a/board/mender/x86_64/genimage-efi.cfg b/board/mender/x86_64/genimage-efi.cfg new file mode 100644 index 0000000000..73102d5c30 --- /dev/null +++ b/board/mender/x86_64/genimage-efi.cfg @@ -0,0 +1,44 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + file bzImage { + image = "bzImage" + } + } + + size = 16777216 +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32768 + size = 16777216 + image = "efi-part.vfat" + bootable = true + } + + partition roota { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + offset = 16809984 + image = "rootfs.ext2" + } + + partition rootb { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + offset = 151027712 + image = "rootfs.ext2" + } + + partition data { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + offset = 285245440 + image = "data-part.ext4" + } +} diff --git a/board/mender/x86_64/linux.config b/board/mender/x86_64/linux.config new file mode 100644 index 0000000000..f17fc18edb --- /dev/null +++ b/board/mender/x86_64/linux.config @@ -0,0 +1,64 @@ +CONFIG_SYSVIPC=y +CONFIG_SMP=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_EFI=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_NETFILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=m +CONFIG_PCI=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_ATH9K=m +CONFIG_ATH9K_HTC=m +CONFIG_CARL9170=m +CONFIG_ATH10K=m +CONFIG_RT2X00=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +# CONFIG_RTL_CARDS is not set +CONFIG_RTL8XXXU=m +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB_VESA=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VFAT_FS=y +CONFIG_SQUASHFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/board/mender/x86_64/mender_grubenv_defines b/board/mender/x86_64/mender_grubenv_defines new file mode 100644 index 0000000000..77f68fe6b2 --- /dev/null +++ b/board/mender/x86_64/mender_grubenv_defines @@ -0,0 +1,25 @@ +################################################################################ +# Mandatory +################################################################################ +# Warning: This file is an example and should be customized to fit your needs! + +# Partition index of root filesystem A +mender_rootfsa_part=2 + +# Partition index of root filesystem B +mender_rootfsb_part=3 + +# Device file corresponding to the root filesystem partitions, without index. +mender_kernel_root_base=/dev/vda + +# Name of the storage device containing root filesystem partitions in GRUB +# format. +mender_grub_storage_device=hd0 + +# Type of kernel (bzImage or zImage) +kernel_imagetype=bzImage + +# Type of initrd image. +# Note: An initrd image is not strictly necessary, and the system will boot and +# update without a initrd image. +# initrd_imagetype=initrd.img diff --git a/board/mender/x86_64/overlay/etc/fstab b/board/mender/x86_64/overlay/etc/fstab new file mode 100644 index 0000000000..45a7ba0260 --- /dev/null +++ b/board/mender/x86_64/overlay/etc/fstab @@ -0,0 +1,7 @@ +# +/dev/root / ext4 rw,noauto 0 1 +/dev/vda1 /boot vfat defaults 0 0 +/dev/vda4 /var/lib/mender ext4 rw,relatime 0 0 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0 +sysfs /sys sysfs defaults 0 0 diff --git a/board/mender/x86_64/overlay/etc/mender/mender.conf b/board/mender/x86_64/overlay/etc/mender/mender.conf new file mode 100644 index 0000000000..5f423fb2cb --- /dev/null +++ b/board/mender/x86_64/overlay/etc/mender/mender.conf @@ -0,0 +1,11 @@ +{ + "InventoryPollIntervalSeconds": 1800, + "UpdatePollIntervalSeconds": 1800, + "RetryPollIntervalSeconds": 300, + "RootfsPartA": "/dev/vda2", + "RootfsPartB": "/dev/vda3", + "ServerCertificate": "/etc/mender/server.crt", + "ServerURL": "https://docker.mender.io", + "TenantToken": "dummy", + "DeviceTypeFile": "/etc/mender/device_type" +} diff --git a/board/mender/x86_64/post-build.sh b/board/mender/x86_64/post-build.sh new file mode 100755 index 0000000000..e93a3cb1c2 --- /dev/null +++ b/board/mender/x86_64/post-build.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env bash +set -e +DEVICE_TYPE="buildroot-x86_64" +ARTIFACT_NAME="1.0" + +function parse_args(){ + local o O opts + o='a:o:d:g:' + O='artifact-name:,data-part-size:,device-type:,generate-mender-image:' + opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" + eval set -- "${opts}" + while [ ${#} -gt 0 ]; do + case "${1}" in + (-o|--data-part-size) + DATA_PART_SIZE="${2}"; shift 2 + ;; + (-d|--device-type) + DEVICE_TYPE="${2}"; shift 2 + ;; + (-g|--generate-mender-image) + GENERATE_MENDER_IMAGE="${2}"; shift 2 + ;; + (-a|--artifact-name) + ARTIFACT_NAME="${2}"; shift 2 + ;; + (--) + shift; break + ;; + esac + done +} + + # Create a persistent directory to mount the data partition at. +function mender_fixup(){ + cd ${TARGET_DIR} + if [[ -L var/lib/mender ]]; then + rm var/lib/mender + mkdir -p var/lib/mender + fi + + # The common paradigm is to have the persistent data volume at /data for mender. + if [[ ! -L data ]]; then + ln -s var/lib/mender data + fi +} + +function main(){ + parse_args "${@}" + mender_fixup + echo "device_type=${DEVICE_TYPE}" > ${TARGET_DIR}/etc/mender/device_type + echo "artifact_name=${ARTIFACT_NAME}" > ${TARGET_DIR}/etc/mender/artifact_info +} + +main "${@}" diff --git a/board/mender/x86_64/post-image-efi.sh b/board/mender/x86_64/post-image-efi.sh new file mode 100755 index 0000000000..2d3e36e614 --- /dev/null +++ b/board/mender/x86_64/post-image-efi.sh @@ -0,0 +1,84 @@ +#!/usr/bin/env bash +set -e +BOARD_DIR="$(realpath $(dirname $0))" +GENIMAGE_CFG="${BOARD_DIR}/genimage-efi.cfg" +DATA_PART_SIZE="32M" +DEVICE_TYPE="buildroot-x86_64" +GENERATE_MENDER_IMAGE="false" +ARTIFACT_NAME="1.0" + + +# Parse arguments. +function parse_args(){ + local o O opts + o='a:o:d:g:' + O='artifact-name:,data-part-size:,device-type:,generate-mender-image:' + opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" + eval set -- "${opts}" + while [ ${#} -gt 0 ]; do + case "${1}" in + (-o|--data-part-size) + DATA_PART_SIZE="${2}"; shift 2 + ;; + (-d|--device-type) + DEVICE_TYPE="${2}"; shift 2 + ;; + (-g|--generate-mender-image) + GENERATE_MENDER_IMAGE="${2}"; shift 2 + ;; + (-a|--artifact-name) + ARTIFACT_NAME="${2}"; shift 2 + ;; + (--) + shift; break + ;; + esac + done +} + +# Create the data partition +function make_data_partition(){ + rm -rf ${BINARIES_DIR}/data-part.ext4 + rm -rf ${BINARIES_DIR}/data-part + mkdir -p ${BINARIES_DIR}/data-part + + ${HOST_DIR}/sbin/mkfs.ext4 \ + -d ${BINARIES_DIR}/data-part \ + -r 1 \ + -N 0 \ + -m 5 \ + -L "data" \ + -O ^64bit ${BINARIES_DIR}/data-part.ext4 "${DATA_PART_SIZE}" + ${HOST_DIR}/sbin/e2fsck -y ${BINARIES_DIR}/data-part.ext4 +} + + +# Create a mender image. +function generate_mender_image(){ + if [[ ${GENERATE_MENDER_IMAGE} == "true" ]]; then + echo "Creating ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" + ${HOST_DIR}/bin/mender-artifact \ + --compression lzma \ + write rootfs-image \ + -t ${DEVICE_TYPE} \ + -n ${BR2_VERSION} \ + -f ${BINARIES_DIR}/rootfs.ext2 \ + -o ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender + fi +} + + +function generate_image(){ + sh support/scripts/genimage.sh -c ${BOARD_DIR}/genimage-efi.cfg +} + +# Main function. +function main(){ + parse_args "${@}" + make_data_partition + generate_image + generate_mender_image + exit $? + +} +main "${@}" diff --git a/board/mender/x86_64/readme.txt b/board/mender/x86_64/readme.txt new file mode 100644 index 0000000000..c006215e6f --- /dev/null +++ b/board/mender/x86_64/readme.txt @@ -0,0 +1,67 @@ +Mender UEFI PC sample config +===================== + +1. Build + + $ make mender_x86_64_efi_defconfig + + Add any additional packages required and build: + + $ make + +2. Write the Pendrive + + The build process will create a Pendrive image called disk.img in + output/images. + + Write the image to a pendrive: + + $ dd if=output/images/disk.img of=/dev/${pendrive}; sync + + Once the process is complete, insert it into the target PC and boot. + + Remember that if said PC has another boot device you might need to + select this alternative for it to boot. + + You might need to disable Secure Boot from the setup as well. + +3. Enjoy + +Emulation in qemu +======================== + +Run the emulation with: + +qemu-system-x86_64 \ + -M pc \ + -bios     \ + -drive file=output/images/disk.img,if=virtio,format=raw \ + -net nic,model=virtio \ + -net user + +Note that     needs to point to a valid x86_64 UEFI +firmware image for qemu. It may be provided by your distribution as an +edk2 or OVMF package, in a path such as /usr/share/edk2/ovmf/OVMF_CODE.fd. + +Optional arguments: + - -enable-kvm to speed up qemu. This requires a loaded kvm module on the host + system. + - Add -smp N to emulate an SMP system with N CPUs. + +The login prompt will appear in the serial window. + +Tested with QEMU 4.1.1 on Fedora 31 + +Creating a mender-artifact +======================== +In menuconfig -> System configuration, edit the field +"Extra arguments passed to custom scripts" +And change --generate-mender-image=false to --generate-mender-image=true + +You may wish to change --artifact-name=1.0 to a name that best suits your +particular needs, as this option changes the mender artifact name. + +Using mender +======================== +Please read the mender documentation at: +https://docs.mender.io/2.2/getting-started diff --git a/configs/mender_x86_64_efi_defconfig b/configs/mender_x86_64_efi_defconfig new file mode 100644 index 0000000000..aba1c38c7f --- /dev/null +++ b/configs/mender_x86_64_efi_defconfig @@ -0,0 +1,81 @@ +# Architecture +BR2_x86_64=y + +# Toolchain, required for eudev (to autoload drivers) +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +# Required for sysvinit +BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + +# Required as vda4 doesn't mount on first boot with busybox +BR2_INIT_SYSV=y + +# Required tools to create bootable media +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Bootloader +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +# Add mandatory modules from MENDER_GRUBENV_MANDATORY_MODULES +BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop loadenv hashsum echo halt gcry_sha256 test regexp" +BR2_TARGET_GRUB2_INSTALL_TOOLS=y + +# Required tools to create a mender image +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MENDER_ARTIFACT=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_OVERLAY="board/mender/x86_64/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/mender/x86_64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/mender/x86_64/post-image-efi.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--data-part-size=32M --device-type=buildroot-x86_64 --generate-mender-image=false --artifact-name=1.0" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/mender/x86_64/linux.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + +# Firmware +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y + +# Packages +# +# Use connman so that networking setup is simpler, via connmanctl tool +# acpid is for seamless power button support +BR2_PACKAGE_ACPID=y +BR2_PACKAGE_CONNMAN=y +BR2_PACKAGE_CONNMAN_CLIENT=y +BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_MENDER=y +BR2_PACKAGE_MENDER_GRUBENV=y +BR2_PACKAGE_MENDER_GRUBENV_DEFINES="board/mender/x86_64/mender_grubenv_defines" -- 2.31.1 From arnout at mind.be Thu Jan 6 14:45:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 15:45:38 +0100 Subject: [Buildroot] [PATCH v5 1/9] package/nxp: new package directory In-Reply-To: <20200207083857.28058-1-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> Message-ID: <737df820-79da-b710-22fc-dc8c53e9223c@mind.be> Hi Changming, I finally started picking up this series after two years. Unfortunately, I have a lot of requests for changes still. On 07/02/2020 09:38, Changming Huang wrote: > The "nxp" directory is intended to contain all NXP > QorIQ (including PowerPC and LayerScape serial) related packages, > together with their download site and version info. We try to avoid subdirectories in package/; we only add them in case there is some common functionality that needs to be factored out, like for e.g. qt5. In this series, the only commonality that I found is the binary extraction, but it ends up to be used only by qoriq-cadence-dp-firmware. That's not worth it IMHO. Therefore, I marked this patch and rejected. Note that it would make sense to do this if we would also move the freescale-imx stuff into the same directory (freescale is anyway nxp now so it should be OK to do that). > Signed-off-by: Changming Huang > --- > changes since v4: > no changes. > > changes since v3: > no changes. > > changes since v2: > 1. change the sub-direcotry to "nxp". > 2. add helper.mk macro to extract compressed file. > > changes since v1: > no changes. > --- > package/Config.in | 1 + > package/nxp/Config.in | 4 ++++ > package/nxp/helper.mk | 32 ++++++++++++++++++++++++++++++++ > 3 files changed, 37 insertions(+) > create mode 100644 package/nxp/Config.in > create mode 100644 package/nxp/helper.mk > > diff --git a/package/Config.in b/package/Config.in > index bad4f9cba6..f9827769a2 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -497,6 +497,7 @@ endmenu > source "package/nvidia-driver/Config.in" > source "package/nvidia-tegra23/Config.in" > source "package/nvme/Config.in" > + source "package/nxp/Config.in" > source "package/ofono/Config.in" > source "package/on2-8170-modules/Config.in" > source "package/open2300/Config.in" > diff --git a/package/nxp/Config.in b/package/nxp/Config.in > new file mode 100644 > index 0000000000..575542c7ab > --- /dev/null > +++ b/package/nxp/Config.in > @@ -0,0 +1,4 @@ > +menu "NXP QorIQ libraries" > + depends on BR2_aarch64 || BR2_arm || BR2_powerpc64 || BR2_powerpc > + > +endmenu > diff --git a/package/nxp/helper.mk b/package/nxp/helper.mk > new file mode 100644 > index 0000000000..79e4236249 > --- /dev/null > +++ b/package/nxp/helper.mk The .mk file should have the same name as the directory, so nxp.mk. Regards, Arnout > @@ -0,0 +1,32 @@ > +################################################################################ > +# > +# helper > +# > +################################################################################ > + > +# Helper for self-extracting binaries distributed by NXP. > +# > +# The --force option makes sure it doesn't fail if the source > +# directory already exists. The --auto-accept skips the license check, > +# as it is not needed in Buildroot because we have legal-info. Since > +# there's a EULA in the binary file, we extract it in this macro, and > +# it should therefore be added to the LICENSE_FILES variable of > +# packages using this macro. Also, remember to set REDISTRIBUTE to > +# "NO". Indeed, this is a legal minefield: the EULA specifies that the > +# Board Support Package includes software and hardware (sic!) for > +# which a separate license is needed... > +# > +# $(1): full path to the archive file > +# > +define NXP_EXTRACT_HELPER > + awk 'BEGIN { start = 0; } \ > + /^EOEULA/ { start = 0; } \ > + { if (start) print; } \ > + /< + $(1) > $(@D)/EULA > + cd $(@D) && sh $(1) --force --auto-accept > + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; > + rmdir $(@D)/$(basename $(notdir $(1))) > +endef > + > +include $(sort $(wildcard package/nxp/*/*.mk)) > From arnout at mind.be Thu Jan 6 14:48:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 15:48:21 +0100 Subject: [Buildroot] [PATCH v5 4/9] package/qoriq-rcw: add target rcw binary support In-Reply-To: <20200207083857.28058-4-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-4-jerry.huang@nxp.com> Message-ID: On 07/02/2020 09:38, Changming Huang wrote: > From: Jerry Huang > > For NXP QorIQ (PowerPC and Layerscape) platform, > we need to specify the RCW file and build it to binary. > > Introduce BR2_PACKAGE_HOST_QORIQ_RCW_BIN to specify the RCW binary file. It took me some time to understand: this is actually simply about an in-tree RCW source, rather than a custom one. So I heavily modified this patch: - rename the option to _RCW_INTREE; - update commit message, documentation, and internal variables accordingly; - reorganise condition tree so it becomes a little simpler; - add patsubst so the source can be specified as either %.rcw or %.bin; - always install it as PBL.bin, to be consistent with the custom option. Note that that last one (PBL.bin) also affects post-image scripts that use it. But I didn't get down to the ls1028ardb defconfig. Regards, Arnout > > Signed-off-by: Jerry Huang > --- > changes since v4: > no changes. > > changes since v3: > no changes. > > changes since v2: > 1. modify the patch descrition. > 2. more detail for BR2_PACKAGE_HOST_QORIQ_RCW_BIN. > 3. remove two options not used in this patch. > 4. add the condition detection in makefile for QorIQ RCW. > > changes since v1: > 1. add option BR2_PACKAGE_HOST_RCW_ATF for ATF. > --- > package/nxp/qoriq-rcw/Config.in.host | 12 ++++++++++++ > package/nxp/qoriq-rcw/qoriq-rcw.mk | 15 +++++++++++++++ > 2 files changed, 27 insertions(+) > > diff --git a/package/nxp/qoriq-rcw/Config.in.host b/package/nxp/qoriq-rcw/Config.in.host > index 8f78a40908..9bf55894e8 100644 > --- a/package/nxp/qoriq-rcw/Config.in.host > +++ b/package/nxp/qoriq-rcw/Config.in.host > @@ -25,4 +25,16 @@ config BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH > included for use in the SDK or with post scripts but no > RCW binary will not be generated. > > +config BR2_PACKAGE_HOST_QORIQ_RCW_BIN > + string "Custom RCW" > + depends on !BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH > + help > + This option is used to specify the RCW binary file for board. > + which is composed with platform/serdes_value/rcw_file, platform > + is the platform name, serdes_value is the setting of the Serdes, > + rcw_file is the file name of RCW, for example: > + "ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" > + > + If this option is empty, no rcw file is used. > + > endif > diff --git a/package/nxp/qoriq-rcw/qoriq-rcw.mk b/package/nxp/qoriq-rcw/qoriq-rcw.mk > index 7a0494adc6..bbd085f277 100644 > --- a/package/nxp/qoriq-rcw/qoriq-rcw.mk > +++ b/package/nxp/qoriq-rcw/qoriq-rcw.mk > @@ -37,6 +37,21 @@ endef > define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE > $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin > endef > +else > +QORIQ_RCW_PATH_FILE_BIN = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_BIN)) > + > +ifneq ($(QORIQ_RCW_PATH_FILE_BIN),) > +QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_PATH_FILE_BIN))) > +QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_PATH_FILE_BIN))) > + > +define HOST_QORIQ_RCW_BUILD_CMDS > + $(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM) > +endef > + > +define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE > + $(INSTALL) -D -m 0644 $(@D)/$(QORIQ_RCW_PATH_FILE_BIN) $(BINARIES_DIR)/$(QORIQ_RCW_FILE_BIN) > +endef > +endif > endif > > # Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer > From thierry.bultel at linatsea.fr Thu Jan 6 14:56:32 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 6 Jan 2022 15:56:32 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dracut: new host package In-Reply-To: <20220105231654.GL614810@scaer> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-2-thierry.bultel@linatsea.fr> <20220105231654.GL614810@scaer> Message-ID: <365b8f6c-18b5-e30b-3c94-4dff3c51215f@linatsea.fr> > And what about glibc? musl? > > Can we unconditionally install the modules and change their check() > functions to decide whther the moduels is usable or not? Or something > else dynamic? There is not extra work to do for glibc (this is my default configuration). I did not test with musl, yet. >> +ifeq ($(BR2_INIT_BUSYBOX),y) >> +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE >> + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ >> + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh >> +endef >> +HOST_DRACUT_POST_INSTALL_HOOKS+=HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE > And what about systemd as an init system? openrc? sysv-init? Others? Keeping in mind that systemd is the officially supported init system by dracut, there is no extra work for it. However, I brought support for busybox init, through the above dracut module (05busybox-buildroot). Adding support for the other ones could be done later, so I suggest we simply disable dracut when the init system is not supported; by adding ??? depends on !BR2_INIT_SYSV ??? depends on !BR2_INIT_OPENRC in Config.in.host; with the appropriate comment. Does that sound acceptable ? From michael at walle.cc Thu Jan 6 15:00:37 2022 From: michael at walle.cc (Michael Walle) Date: Thu, 06 Jan 2022 16:00:37 +0100 Subject: [Buildroot] [PATCH v5 1/9] package/nxp: new package directory In-Reply-To: <737df820-79da-b710-22fc-dc8c53e9223c@mind.be> References: <20200207083857.28058-1-jerry.huang@nxp.com> <737df820-79da-b710-22fc-dc8c53e9223c@mind.be> Message-ID: <70c6686e301152345e96b4a199d2a96c@walle.cc> Am 2022-01-06 15:45, schrieb Arnout Vandecappelle: > In this series, the only commonality that I found is the binary > extraction, but it ends up to be used only by > qoriq-cadence-dp-firmware. That's not worth it IMHO. mh? all the imx stuff is using this method. > > Therefore, I marked this patch and rejected. > > Note that it would make sense to do this if we would also move the > freescale-imx stuff into the same directory (freescale is anyway nxp > now so it should be OK to do that). ah. yes. that was the idea back then IMHO. -michael From arnout at mind.be Thu Jan 6 15:05:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 16:05:36 +0100 Subject: [Buildroot] [PATCH v5 5/9] boot/arm-trusted-firmware: allow additional make dependencies In-Reply-To: <20200207083857.28058-5-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-5-jerry.huang@nxp.com> Message-ID: On 07/02/2020 09:38, Changming Huang wrote: > Allow specifying additional build dependencies for ATF. > > This might be more useful when using a custom git repository. > > For example, when using with the ATF repository from NXP QorIQ, > the qoriq-rcw is used to build the pbl binary image. This is not a very user-friendly way to do it. Since RCW support is something that is in upstream ATF, I think it makes a whole lot more sense to make it an explicit option. Something like: config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW bool "Include RCW" depends on BR2_HOST_QORIQ_RCW help Include the RCW in BL2. That way you can also add the RCW=$(BINARIES_DIR)/PBL.bin automatically to the variables (and this is an advantage of always calling it PBL.bin :-) I've marked this patch as Changes Requested. Regards, Arnout > > Signed-off-by: Changming Huang > --- > changes since v4: > 1. remove the option BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS. > 2. modify the description. > > changes since v3: > no changes. > > changes since v2: > 1. introduce option BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS. > 2. introduce option BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_DEPENDENCIES. > 3. rewrite the makefile with these two options > > changes since v1: > 1. Use option BR2_PACKAGE_HOST_RCW_ATF as the condition for RCW used by ATF. > --- > boot/arm-trusted-firmware/Config.in | 5 +++++ > boot/arm-trusted-firmware/arm-trusted-firmware.mk | 3 +++ > 2 files changed, 8 insertions(+) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in > index 373591d497..c9b74064d7 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -142,6 +142,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS > E.G. When using the QorIQ custom ATF repository from NXP, > the target 'pbl' can be used to build the pbl binary. > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_DEPENDENCIES > + string "Additional AFT dependencies" > + help > + Additional dependencies for ATF build, E.G. "host-qoriq-rcw" > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES > string "Additional ATF build variables" > help > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > index bf1ac46cf6..43be2fef99 100644 > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > @@ -92,6 +92,9 @@ endif > > ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all > > +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += \ > + $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_DEPENDENCIES)) > + > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) > ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip > ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-openssl > From thomas.petazzoni at bootlin.com Thu Jan 6 15:13:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 16:13:47 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dracut: new host package In-Reply-To: <365b8f6c-18b5-e30b-3c94-4dff3c51215f@linatsea.fr> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-2-thierry.bultel@linatsea.fr> <20220105231654.GL614810@scaer> <365b8f6c-18b5-e30b-3c94-4dff3c51215f@linatsea.fr> Message-ID: <20220106161347.014794a6@windsurf> On Thu, 6 Jan 2022 15:56:32 +0100 Thierry Bultel wrote: > Keeping in mind that systemd is the officially supported init system by > dracut, there is no extra work > for it. However, I brought support for busybox init, through the above > dracut module (05busybox-buildroot). > Adding support for the other ones could be done later, so I suggest we > simply disable dracut when the > init system is not supported; by adding > > ??? depends on !BR2_INIT_SYSV > ??? depends on !BR2_INIT_OPENRC > > in Config.in.host; with the appropriate comment. Does that sound > acceptable ? But is it just the init system that requires those special dracut "modules" ? Or other aspects of the system will also require some special modules ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From michael at walle.cc Thu Jan 6 15:14:01 2022 From: michael at walle.cc (Michael Walle) Date: Thu, 06 Jan 2022 16:14:01 +0100 Subject: [Buildroot] [PATCH v5 6/9] package/qoriq-cadence-dp-firmware: new package In-Reply-To: <20200207083857.28058-6-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-6-jerry.huang@nxp.com> Message-ID: <8c5bab4b73c9feeca842eef7c51f9b12@walle.cc> Am 2020-02-07 09:38, schrieb Changming Huang: > From: Jerry Huang > > This package provides the firmware for LS1028ARDB DP (display port). > > Signed-off-by: Jerry Huang Arnout, please note that upstream uboot and linux won't use this firmware. So this can be dropped. Proper support for the cadence phy will likely be using the request_firmware() method in linux (and i guess binaries will then end up in the linux-firmware package). -michael From arnout at mind.be Thu Jan 6 15:19:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 16:19:13 +0100 Subject: [Buildroot] [PATCH v5 6/9] package/qoriq-cadence-dp-firmware: new package In-Reply-To: <20200207083857.28058-6-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-6-jerry.huang@nxp.com> Message-ID: <630ac08b-3908-c4eb-a8ba-18518e27d8cc@mind.be> On 07/02/2020 09:38, Changming Huang wrote: > From: Jerry Huang > > This package provides the firmware for LS1028ARDB DP (display port). > > Signed-off-by: Jerry Huang Applied to master, with a few changes: - move out of nxp directory; - add extraction helper; - set REDISTRIBUTE to NO. Regards, Arnout > --- > changes since v4: > 1. remove the variable NXP_QORIQ_SITE. > 2. use the url for qoriq-cadence-dp-firmware site directly. > > changes since v3: > no changes. > > changes since v2: > 1. change the package name to qoriq-cadence-dp-firmware. > 2. add the hash of COPYING. > 3. modify makefile with new option. > 4. update DEVELOPERS with alphabetic ordering > > changes since v1: > 1. rename the package to fsl-qoriq-cadence-dp-fw. > 2. update DEVELOPERS. > 3. add the hash of package. > 4. modify the context fo config file to package name. > 5. re-write the makefile according to rule of buildroot. > 6. add the license message in makefile. > --- > DEVELOPERS | 3 +++ > package/nxp/Config.in | 2 ++ > .../nxp/qoriq-cadence-dp-firmware/Config.in | 4 ++++ > .../qoriq-cadence-dp-firmware.hash | 3 +++ > .../qoriq-cadence-dp-firmware.mk | 23 +++++++++++++++++++ > 5 files changed, 35 insertions(+) > create mode 100644 package/nxp/qoriq-cadence-dp-firmware/Config.in > create mode 100644 package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash > create mode 100644 package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index e555b9773b..ffb07d67ea 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -529,6 +529,9 @@ F: configs/nanopi_m1_plus_defconfig > F: configs/olimex_a13_olinuxino_defconfig > F: configs/orangepi_plus_defconfig > > +N: Changming Huang > +F: package/nxp/qoriq-cadence-dp-firmware/ > + > N: Chris Packham > F: package/gstreamer1/gst1-shark/ > F: package/micropython/ > diff --git a/package/nxp/Config.in b/package/nxp/Config.in > index 575542c7ab..855d62700b 100644 > --- a/package/nxp/Config.in > +++ b/package/nxp/Config.in > @@ -1,4 +1,6 @@ > menu "NXP QorIQ libraries" > depends on BR2_aarch64 || BR2_arm || BR2_powerpc64 || BR2_powerpc > > +source "package/nxp/qoriq-cadence-dp-firmware/Config.in" > + > endmenu > diff --git a/package/nxp/qoriq-cadence-dp-firmware/Config.in b/package/nxp/qoriq-cadence-dp-firmware/Config.in > new file mode 100644 > index 0000000000..3f494bd3a3 > --- /dev/null > +++ b/package/nxp/qoriq-cadence-dp-firmware/Config.in > @@ -0,0 +1,4 @@ > +config BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE > + bool "qoriq-cadence-dp-firmware" > + help > + NXP QorIQ cadence DP firmware, a resident EL3 firmware. > diff --git a/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash b/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash > new file mode 100644 > index 0000000000..89aaf1d71b > --- /dev/null > +++ b/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 5871c5717be32f14a59624d5699d405e8ce9ae2e9c9ef86fd16e13d264a40e58 firmware-cadence-lsdk1909.bin > +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING > diff --git a/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk > new file mode 100644 > index 0000000000..5c29602574 > --- /dev/null > +++ b/package/nxp/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk > @@ -0,0 +1,23 @@ > +################################################################################ > +# > +# qoriq-cadence-dp-firmware > +# > +################################################################################ > + > +QORIQ_CADENCE_DP_FIRMWARE_VERSION = lsdk1909 > +QORIQ_CADENCE_DP_FIRMWARE_SITE = http://www.nxp.com/lgfiles/sdk/$(QORIQ_CADENCE_DP_FIRMWARE_VERSION) > +QORIQ_CADENCE_DP_FIRMWARE_SOURCE = firmware-cadence-$(QORIQ_CADENCE_DP_FIRMWARE_VERSION).bin > +QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP-Binary-EULA > +QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING > +QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES > +QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO > + > +define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS > + $(call NXP_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) > +endef > + > +define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS > + $(INSTALL) -D -m 0644 $(@D)/dp/ls1028a-dp-fw.bin $(BINARIES_DIR)/ls1028a-dp-fw.bin > +endef > + > +$(eval $(generic-package)) > From john at metanate.com Thu Jan 6 15:19:42 2022 From: john at metanate.com (John Keeping) Date: Thu, 6 Jan 2022 15:19:42 +0000 Subject: [Buildroot] [PATCH] download/git: fix LFS support Message-ID: <20220106151942.1506534-1-john@metanate.com> The original patch for commit cff428fe31 ("download/git: support Git LFS") included a call to "git lfs install" but this was a problem as it could modify ~/.gitconfig outside the dl/ tree. When this was updated it was thought that the modification to gitconfig was unnecessary because the LFS fetch and checkout steps are performed manually. Unfortunately, this is not correct and the LFS checkout fails with: Cannot checkout LFS objects, Git LFS is not installed. Add the call to "git lfs install", with the --local option so that only the repository's .git/config is modified and not the user's global ~/.gitconfig. This is also required for submodules as the parent repository's config is not inherited. Cc: Arnout Vandecappelle Cc: Vincent Fazio Signed-off-by: John Keeping --- support/download/git | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/download/git b/support/download/git index 41c3160099..1a1c315f73 100755 --- a/support/download/git +++ b/support/download/git @@ -209,10 +209,12 @@ fi # If there are large files then fetch them. if [ ${large_file} -eq 1 ]; then + _git lfs install --local _git lfs fetch _git lfs checkout # If there are also submodules, recurse into them, if [ ${recurse} -eq 1 ]; then + _git submodule foreach --recursive ${GIT} lfs install --local _git submodule foreach --recursive ${GIT} lfs fetch _git submodule foreach --recursive ${GIT} lfs checkout fi -- 2.34.1 From john at metanate.com Thu Jan 6 15:03:50 2022 From: john at metanate.com (John Keeping) Date: Thu, 6 Jan 2022 15:03:50 +0000 Subject: [Buildroot] [PATCH 1/1] download/git: support Git LFS In-Reply-To: References: <20200121203337.30856-1-vfazio@xes-inc.com> Message-ID: Hi Arnout, On Thu, Jan 06, 2022 at 11:35:21AM +0100, Arnout Vandecappelle wrote: > I finally applied this to master, with a few minor changes. Thanks for merging this! > On 21/01/2020 21:33, Vincent Fazio wrote: > > From: John Keeping > > > > Git Large File Storage replaces large files with text pointers in the > > Git repository while storing the contents on a remote server. If a > > repository is using this extension, then git-lfs must be used to > > checkout the large files before the source archive is generated. > > > > Signed-off-by: John Keeping > > [vfazio: > > - add git-lfs to DL_TOOLS_DEPENDENCIES > > - fixup for 5a0d6813948fea2cdb88a2e35984520eec856dec > > ("infra/pkg-download: make the DOWNLOAD macro fully parameterised") > > ] > > Signed-off-by: Vincent Fazio > > [snip] > > > +# If there are large files then fetch them. > > +if [ ${large_file} -eq 1 ]; then > > + _git lfs install > > AFAICS an lfs install is not needed. IMHO it's pretty bad to do that > because it updates ~/.gitconfig, which Buildroot shouldn't do. We could do > lfs install --local, but even that is not needed. The lfs install just makes > sure that lfs is done automatically whenever you do commit or pull or > something like that, but in Buildroot we always do it explicitly so the > smudge filter isn't needed. I had a local update with --local. Unfortunately it seems that install is necessary as when testing the committed version (having removed the filter config from ~/.gitconfig) I get: Cannot checkout LFS objects, Git LFS is not installed. I'll send a patch to do `git lfs install --local` here. > > + _git lfs fetch > > + _git lfs checkout > > As already mentioned by Yann, this doesn't work when combined with > submodules. The solution is pretty trivial: > > # If there are also submodules, recurse into them, > if [ ${recurse} -eq 1 ]; then > _git submodule foreach --recursive ${GIT} lfs fetch > _git submodule foreach --recursive ${GIT} lfs checkout > fi > > I haven't actually tested this though. I have a test repo with LFS submodules and I can confirm this works (modulo the install concern above). > Vincent (or anybody), it would be nice to have a runtime test for this > feature. support/testing/tests/download/br2-external/git-refs/package/git-submodule-{enabled,disabled} > can be a good source of inspiration. Only I'm not sure if it's possible to > set up an LFS repository that is purely file-based. Yes, I think you're right that LFS requires HTTPS. It's possible to combine that with any Git protocol, but the LFS transfer is always HTTPS, so any runtime tests would require a temporary server. John From romain.naour at smile.fr Thu Jan 6 15:35:41 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 16:35:41 +0100 Subject: [Buildroot] [PATCHv3 1/2] package/mender: remove single hyphen command Message-ID: <20220106153542.1668688-1-romain.naour@smile.fr> Single hyphen commands has been removed since Mender 3.0.0 [1] [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 Signed-off-by: Romain Naour Cc: Adam Duskett --- package/mender/S42mender | 2 +- package/mender/mender-client.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mender/S42mender b/package/mender/S42mender index 108fecfea9..dc60f94f8b 100644 --- a/package/mender/S42mender +++ b/package/mender/S42mender @@ -25,7 +25,7 @@ start() { umask 077 start-stop-daemon -S -q -b -m -p /var/run/mender.pid \ - --exec /usr/bin/mender -- -daemon + --exec /usr/bin/mender -- daemon [ $? = 0 ] && echo "OK" || echo "FAIL" } stop() { diff --git a/package/mender/mender-client.service b/package/mender/mender-client.service index 2a5f476ee5..5539a56fd6 100644 --- a/package/mender/mender-client.service +++ b/package/mender/mender-client.service @@ -17,7 +17,7 @@ if [ -L /var/lib/mender \ mkdir -p "$(readlink /var/lib/mender)"; \ fi; \ fi' -ExecStart=/usr/bin/mender -daemon +ExecStart=/usr/bin/mender daemon Restart=on-abort [Install] -- 2.31.1 From jesse_dev at fastmail.com Thu Jan 6 15:37:49 2022 From: jesse_dev at fastmail.com (Jesse Millwood) Date: Thu, 06 Jan 2022 10:37:49 -0500 Subject: [Buildroot] Overriding Kconfig Values from external br2 In-Reply-To: <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> References: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> Message-ID: On Thu, 2022-01-06 at 10:45 +0100, Arnout Vandecappelle wrote: > > > On 05/01/2022 20:03, Jesse Millwood wrote: > > Hello, > > > > I have an external C/C++ toolchain that I've put together that uses > > MUSL. I've > > also built an external Rust toolchain that uses my MUSL toolchain. > > > > My issue is that there is a Rust Kconfig variable that specifies if > > a specific > > architecture supports Rust. > > > > The Kconfig variable in question is > > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > > in package/rustc/Config.in.host. > > [snip] > > > You may notice that I changed the libc depends line to be or'd with > > BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get considered > > when I > > choose my external musl toolchain option. In the menuconfig when I > > search for > > the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with the > > "/" key it > > looks like it is only getting it from the original file. Does > > buildroot have a > > mechanism for overwriting this kind of setting and if not, does > > anyone have an > > idea of how I would accomplish what I am trying to do (make > > buildroot honor my > > external rust toolchain)? > > ? No, there's no way to override the dependencies of an existing > Config.in > symbol in an external. > > ? However, this was corrected in upstream Buildroot in commit > d69d40c029dc7d8199b745eaee759d92b66c5d17. So you can try to backport > that commit > instead, or just update Buildroot to something more recent. Arnout, thanks for the pointer to the commit. That is a logical way to support other platforms. However, I have a powerpc musl rust toolchain that I've built externally. With the changes in that commit can I set BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS to "y" in my external now that there is no depends expressions and it is all default logic? Or would I have to still add another expression that maybe defaults to "y" if a new variable is true like "BR2_EXTERNAL_RUSTC_TARGET_ARCH_SUPPORTS" that is defined in my external? Thanks, Jesse > > ? Regards, > ? Arnout > > > > > > Thanks, > > Jesse > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Jan 6 15:54:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 16:54:51 +0100 Subject: [Buildroot] [PATCH v5 7/9] package/qoriq-rcw:Enable IIC5_PMUX and CLK_OUT_PMUX for GPIO In-Reply-To: <20200207083857.28058-7-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-7-jerry.huang@nxp.com> Message-ID: <835d05ab-20ed-8445-a2ef-285760b215a3@mind.be> On 07/02/2020 09:38, Changming Huang wrote: > From: Jerry Huang > > Because GPIO is used as interrupt for eNETC PHY and Micro-bus, > IIC5_PMUX and CLK_OUT_PMUX are enabled for GPIO. This sounds like something really board specific, which should be applied upstream first and lacking that, it's IMHO better to use BR2_GLOBAL_PATCH_DIR and do it in the board-specific defconfig instead of patching qoriq-rcw package. In addition, qoriq-rcw has been updated so the patch maybe doesn't apply any more. Therefore, I marked this one as Rejected. Regards, Arnout > > Signed-off-by: Jerry Huang > --- > changes since v4: > no changes. > > changes since v3: > no changes. > > changes since v2: > no changes. > > changes since v1: > 1. change to unconditional for these two patches. > --- > ...b-Enable-IIC5_PMUX-for-GPIO-function.patch | 42 +++++++++++++++++++ > ...nable-CLK_OUT_PMUX-for-GPIO-function.patch | 40 ++++++++++++++++++ > 2 files changed, 82 insertions(+) > create mode 100644 package/nxp/qoriq-rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch > create mode 100644 package/nxp/qoriq-rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch > > diff --git a/package/nxp/qoriq-rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch b/package/nxp/qoriq-rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch > new file mode 100644 > index 0000000000..21c6c84cbd > --- /dev/null > +++ b/package/nxp/qoriq-rcw/0001-ls1028ardb-Enable-IIC5_PMUX-for-GPIO-function.patch > @@ -0,0 +1,42 @@ > +From 33b403cee1fa215927bc65dc14baf35a2fdbe7b3 Mon Sep 17 00:00:00 2001 > +From: Jerry Huang > +Date: Thu, 19 Sep 2019 12:12:20 +0800 > +Subject: [PATCH 1/2] ls1028ardb: Enable IIC5_PMUX for GPIO function > + > +Set IIC5_PMUX = 1 to enable GPIO function. > + > +Signed-off-by: Jianchao Wang > +Signed-off-by: Jerry Huang > +--- > + ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw | 2 +- > + ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > +index b46ea2e..5466a63 100644 > +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > +@@ -26,7 +26,7 @@ SYSCLK_FREQ=600 > + IIC2_PMUX=6 > + IIC3_PMUX=2 > + IIC4_PMUX=2 > +-IIC5_PMUX=2 > ++IIC5_PMUX=1 > + IIC6_PMUX=2 > + CLK_OUT_PMUX=2 > + EC1_SAI4_5_PMUX=5 > +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > +index 04e2208..1908d8c 100644 > +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > +@@ -26,7 +26,7 @@ SYSCLK_FREQ=600 > + IIC2_PMUX=6 > + IIC3_PMUX=2 > + IIC4_PMUX=2 > +-IIC5_PMUX=2 > ++IIC5_PMUX=1 > + IIC6_PMUX=3 > + CLK_OUT_PMUX=2 > + EC1_SAI4_5_PMUX=5 > +-- > +2.17.1 > diff --git a/package/nxp/qoriq-rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch b/package/nxp/qoriq-rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch > new file mode 100644 > index 0000000000..4f00541d69 > --- /dev/null > +++ b/package/nxp/qoriq-rcw/0002-ls1028ardb-Enable-CLK_OUT_PMUX-for-GPIO-function.patch > @@ -0,0 +1,40 @@ > +From 4a3c9ea5d0c7bf8eec8cb6276d6f4d940f3946db Mon Sep 17 00:00:00 2001 > +From: Jerry Huang > +Date: Thu, 19 Sep 2019 12:13:48 +0800 > +Subject: [PATCH 2/2] ls1028ardb/rcw: Enable CLK_OUT_PMUX for GPIO function > + > +Signed-off-by: Jianchao Wang > +Signed-off-by: Jerry Huang > +--- > + ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw | 2 +- > + ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > +index 5466a63..a5ed4d4 100644 > +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_emmcboot.rcw > +@@ -28,7 +28,7 @@ IIC3_PMUX=2 > + IIC4_PMUX=2 > + IIC5_PMUX=1 > + IIC6_PMUX=2 > +-CLK_OUT_PMUX=2 > ++CLK_OUT_PMUX=1 > + EC1_SAI4_5_PMUX=5 > + EC1_SAI3_6_PMUX=5 > + USB3_CLK_FSEL=39 > +diff --git a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > +index 1908d8c..c930b83 100644 > +--- a/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > ++++ b/ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.rcw > +@@ -28,7 +28,7 @@ IIC3_PMUX=2 > + IIC4_PMUX=2 > + IIC5_PMUX=1 > + IIC6_PMUX=3 > +-CLK_OUT_PMUX=2 > ++CLK_OUT_PMUX=1 > + EC1_SAI4_5_PMUX=5 > + EC1_SAI3_6_PMUX=5 > + USB3_CLK_FSEL=39 > +-- > +2.17.1 > From arnout at mind.be Thu Jan 6 15:55:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 16:55:41 +0100 Subject: [Buildroot] [PATCH v5 8/9] package/nxp/qoriq-rcw: introduce BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE for boot mode In-Reply-To: <20200207083857.28058-8-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-8-jerry.huang@nxp.com> Message-ID: <62235760-30ce-66a6-fe64-1ab11d3604e3@mind.be> On 07/02/2020 09:38, Changming Huang wrote: > Introduce BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE for the boot mode. > Because the RCW binary can be stored in different media, for example: > sd - RCW locate in SD card, boot the board from SD card > emmc - RCW locate in eMMC chip, boot the board from eMMC chip > qspi - RCW locate in QSPI flash, boot the board from QSPI flash > flexspi_nor - RCW locate in flexSPI, boot the board from flexSPI Nor/Nand flash > > Signed-off-by: Changming Huang > --- > changes since v4: > no changes. > > changes since v3: > 1. split this option from board patch. > --- > package/nxp/qoriq-rcw/Config.in.host | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/nxp/qoriq-rcw/Config.in.host b/package/nxp/qoriq-rcw/Config.in.host > index 9bf55894e8..7f5fbb3202 100644 > --- a/package/nxp/qoriq-rcw/Config.in.host > +++ b/package/nxp/qoriq-rcw/Config.in.host > @@ -37,4 +37,10 @@ config BR2_PACKAGE_HOST_QORIQ_RCW_BIN > > If this option is empty, no rcw file is used. > > +config BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE You introduce this symbol but it is not used anywhere. So what is the point? I marked it as rejected. Regards, Arnout > + string "QorIQ RCW Boot mode" > + depends on !BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH > + help > + Specify the boot mode, for example, sd, emmc, flexspi_nor. > + > endif > From thierry.bultel at linatsea.fr Thu Jan 6 15:56:52 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 6 Jan 2022 16:56:52 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dracut: new host package In-Reply-To: <20220106161347.014794a6@windsurf> References: <20211223111348.3532601-1-thierry.bultel@linatsea.fr> <20211223111348.3532601-2-thierry.bultel@linatsea.fr> <20220105231654.GL614810@scaer> <365b8f6c-18b5-e30b-3c94-4dff3c51215f@linatsea.fr> <20220106161347.014794a6@windsurf> Message-ID: Le 06/01/2022 ? 16:13, Thomas Petazzoni a ?crit?: > On Thu, 6 Jan 2022 15:56:32 +0100 > Thierry Bultel wrote: > >> Keeping in mind that systemd is the officially supported init system by >> dracut, there is no extra work >> for it. However, I brought support for busybox init, through the above >> dracut module (05busybox-buildroot). >> Adding support for the other ones could be done later, so I suggest we >> simply disable dracut when the >> init system is not supported; by adding >> >> ??? depends on !BR2_INIT_SYSV >> ??? depends on !BR2_INIT_OPENRC >> >> in Config.in.host; with the appropriate comment. Does that sound >> acceptable ? > But is it just the init system that requires those special dracut > "modules" ? Or other aspects of the system will also require some > special modules ? The dracut modules are used at build time. The rule is that any file that is expected in the dracut image must be handled by a dracut module. For instance, "host/lib/dracut/modules.d/00bash" "host/lib/dracut/modules.d/50sshd" work out of the box. The implicitely loaded "90kernel-modules" (that check modules dependencies to one another, and to firmwares) also work fine. But nothing handles /etc/init.d/rcS, typically. And all the wanted init scripts (/etc/init.d/S40network is a good example) must be taken individually. A huge work would be to contribute to dracut to bring whole support for initd scripts, but I think it is out of the scope. Another reason to write a module is when dracut does not support the feature, yet, for instance, I had to write one for hostapd. Apparently it is not a common case to have the wifi in an initramfs, but for a recovery system, that makes more sense. Adding support for SYSV or OPENRC basically consists in writing the appropriate rules in new modules to bring the expected files to the filesystem, nothing more. By the way, my suggestion to use "depends on !xxx" directives cannot work because it does an "unmet direct dependency detected", since BR2_PACKAGE_HOST_DRACUT is selected by BR2_TARGET_ROOTFS_CPIO_DRACUT I am a little bit confused about how to solve that properly. Thierry > Thomas From romain.naour at smile.fr Thu Jan 6 16:13:01 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 17:13:01 +0100 Subject: [Buildroot] [PATCHv3 2/2] support/testing: add package/test_mender.py Message-ID: <20220106161301.1910709-1-romain.naour@smile.fr> From: Mikael Bourhis-Cloarec Create a test to check Mender client at runtime. The aim of this test is: - to check the correct execution of simple Mender commands, in a minimal environment; - to validate there is no missing dependencies for runtime. This test is not a board integration test for Mender, including well-configured bootloader, partitioning, ... Check: - the daemon is started; - the current 'artifact name' (name of the image or update) of the active partition is read, without error. For that, we need to fake (see the 'overlay' directory): - some bootloader environment variables; - the name of an update. Signed-off-by: Mikael Bourhis-Cloarec [Romain: remove single hyphen command (Mender 3.0.0)] Signed-off-by: Romain Naour --- v3: remove single hyphen command (Mender 3.0.0) Changes v1 -> v2: - Update the test by removing unnecessary 'build' option (Thomas P.) - Remove a useless test case (Thomas P.) --- support/testing/tests/package/test_mender.py | 32 +++++++++++++++++++ .../rootfs-overlay/etc/mender/artifact_info | 1 + .../rootfs-overlay/usr/bin/fw_printenv | 6 ++++ 3 files changed, 39 insertions(+) create mode 100644 support/testing/tests/package/test_mender.py create mode 100644 support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info create mode 100755 support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv diff --git a/support/testing/tests/package/test_mender.py b/support/testing/tests/package/test_mender.py new file mode 100644 index 0000000000..fdf55ed616 --- /dev/null +++ b/support/testing/tests/package/test_mender.py @@ -0,0 +1,32 @@ +import os + +import infra.basetest + + +class TestMender(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MENDER=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_ROOTFS_OVERLAY="{}" + """.format( + # overlay to add a fake 'fw_printenv', used by Mender + infra.filepath("tests/package/test_mender/rootfs-overlay")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check if the Daemon is running + self.assertRunOk("ls /var/run/mender.pid") + self.assertRunOk("ps aux | egrep [m]ender") + + # Check if a simple Mender command is correctly executed + self.assertRunOk("mender -log-level debug show-artifact") + self.assertRunOk("mender -log-level debug show-artifact | grep 'RUNTIME_TEST_ARTIFACT_NAME'") + cmd = "mender show-artifact 2>&1 | grep -i 'err'" # Check if no 'error' among the traces + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 1) diff --git a/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info b/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info new file mode 100644 index 0000000000..4d54b8f89c --- /dev/null +++ b/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info @@ -0,0 +1 @@ +artifact_name=RUNTIME_TEST_ARTIFACT_NAME diff --git a/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv b/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv new file mode 100755 index 0000000000..c002a0f2b8 --- /dev/null +++ b/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv @@ -0,0 +1,6 @@ +#!/bin/sh + +# Fake 'fw_printenv' because UBoot is not installed: print some plausible 'key-value' +echo "bootcount=0" +echo "mender_boot_part=rootfs" +echo "upgrade_available=0" -- 2.31.1 From arnout at mind.be Thu Jan 6 16:27:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 17:27:51 +0100 Subject: [Buildroot] [PATCH v5 9/9] board/nxp/ls1028ardb: new board In-Reply-To: <20200207083857.28058-9-jerry.huang@nxp.com> References: <20200207083857.28058-1-jerry.huang@nxp.com> <20200207083857.28058-9-jerry.huang@nxp.com> Message-ID: <7bc67415-6ac6-de19-449c-a70c471e9b72@mind.be> On 07/02/2020 09:38, Changming Huang wrote: > This is to support NXP LS1028ARDB board in Buildroot. > The board is setup to track the Linux at 4.19 via NXP LSDK-19.09. > > The target will build uboot and RCW binary with arm-trusted-firmware support. > > board/nxp/ls1028ardb/: scripts related with ls1028ardb > nxp_ls1028ardb-64b_defconfig: defconfig boot from SD card > > Signed-off-by: Changming Huang Due to the changes in other packages and because some of the previous patches weren't applied, this defconfig wouldn't be valid any more so I marked it as Changes Requested. [snip] > diff --git a/board/nxp/common/ls/busybox.config b/board/nxp/common/ls/busybox.config > new file mode 100644 > index 0000000000..7074c65aa6 > --- /dev/null > +++ b/board/nxp/common/ls/busybox.config Since you're only adding a single board here, I prefer to put it in the board-specific directory, and to move it to common/ later if it turns out to be indeed shared. But that's a minor thing. > @@ -0,0 +1,9 @@ > +# > +# Additional Busybox Settings > +# > +CONFIG_TASKSET=y > +CONFIG_FEATURE_TASKSET_FANCY=y > +CONFIG_FEATURE_DF_FANCY=y > +CONFIG_FEATURE_SEAMLESS_GZ=y > +CONFIG_FEATURE_SEAMLESS_BZ2=y > +CONFIG_FEATURE_SEAMLESS_XZ=y I understand that you probably need taskset on a LayerScape (although, is it used by anything in this defconfig?). But I don't understand why you need all the rest. Please explain that in the commit message. > diff --git a/board/nxp/ls1028ardb/genimage.sd.cfg.template b/board/nxp/ls1028ardb/genimage.sd.cfg.template > new file mode 100644 > index 0000000000..ab50e103c1 > --- /dev/null > +++ b/board/nxp/ls1028ardb/genimage.sd.cfg.template > @@ -0,0 +1,52 @@ > +# Minimal SD card image for the NXP boards Template > +# > +# SD card image (sdcard.img) format: > +# * the SD card must have 4 kB free space at the beginning, > +# * U-Boot is dumped as is, > +# * a FAT partition at offset 64 MB is containing Image and DTB files I don't know if it's possible for this board, but generally we prefer to use the modern organisation with just a single rootfs partition which has the kernel and extlinux.conf in /boot. U-Boot should support that. But if that's an unusual configuration for this board, it's OK to keep it as is. > +# * a single root filesystem partition is required (ext2, ext3 or ext4) > +# > + > +image boot.vfat { > + vfat { > + files = { > + %FILES% > + } > + } > + size = 256M Isn't that way too much? I think it should fit in something like 16M, no? > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition rcw { > + in-partition-table = "no" > + image = "bl2_sd.pbl" > + offset = 4096 > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "fip.bin" > + offset = 1M > + } > + > + partition u-boot-environment { > + in-partition-table = "no" > + image = "uboot-env.bin" > + offset = 5M > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + offset = 64M Isnt this way too much? Everything before fits in 8M, so why such a large offset? > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext2" > + } > +} > diff --git a/board/nxp/ls1028ardb/post-image.sh b/board/nxp/ls1028ardb/post-image.sh > new file mode 100755 > index 0000000000..c655074386 > --- /dev/null > +++ b/board/nxp/ls1028ardb/post-image.sh > @@ -0,0 +1,57 @@ > +#!/usr/bin/env bash > +# args from BR2_ROOTFS_POST_SCRIPT_ARGS > +# $2 linux building directory > +# $3 buildroot top directory > +# $4 u-boot building directory AFAICS none of these arguments are actually used, so just remove them. > + > +# > +# dtb_list extracts the list of DTB files from BR2_LINUX_KERNEL_INTREE_DTS_NAME > +# in ${BR_CONFIG}, then prints the corresponding list of file names for the > +# genimage configuration file > +# > +dtb_file() > +{ > + local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" > + > + for dt in $DTB_LIST; do > + echo -n "\"`basename $dt`.dtb\", " > + done > +} Why not just ls $(BINARIES_DIR)/*.dtb ? > + > +# > +# genimage.sd.cfg.template: Boot from SD > +# genimage.emmc.cfg.template: Boot from eMMC > +# > +genimage_type() > +{ > + if grep -Eq "^BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE=\"emmc\"$" ${BR2_CONFIG}; then Ah, this is where you use boot mode! This is really not OK, we can't have a generic option in a package that gets used in a board specific config. In this case it's pretty simple: you only have sd support in this defconfig, so hardcode sd. If you later want to add another defconfig with emmc, you can add it as a BR2_ROOTFS_POST_SCRIPT_ARGS argument to the script. > + echo "genimage.emmc.cfg.template" > + elif grep -Eq "^BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE=\"sd\"$" ${BR2_CONFIG}; then > + echo "genimage.sd.cfg.template" > + fi > +} > + > +main() > +{ > + local FILES="$(dtb_file) "ls1028a-dp-fw.bin", "Image"" Just for my information: who is consuming that firmware file? Since it's in the FAT partition, I guess it's not loaded by the kernel, but by U-Boot or ATF or something? > + local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" > + local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > + sed -e "s/%FILES%/${FILES}/" \ > + board/nxp/ls1028ardb/$(genimage_type) > ${GENIMAGE_CFG} You can avoid the board/nxp/ls1028ardb hardcoding by using ${0%/*} ${0%/*}/genimage.$2.cfg.template > ${GENIMAGE_CFG} > + > + rm -rf "${GENIMAGE_TMP}" > + > + genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > + rm -f ${GENIMAGE_CFG} > + > + exit $? > +} > + > +main $@ main "$@" > diff --git a/board/nxp/ls1028ardb/readme.txt b/board/nxp/ls1028ardb/readme.txt > new file mode 100644 > index 0000000000..713babd7c3 > --- /dev/null > +++ b/board/nxp/ls1028ardb/readme.txt > @@ -0,0 +1,61 @@ > +LS1028ARDB board is one platform based on LS1028A silicon for industry, > +which is supported in LSDK-19.09. > + > +One simple image file is created by buildroot, which includes RCW, uboot, > +Linux kernel, rootfs and other necessary binaries for this board. > + > +To program the image file created by buildroot into the flash. > +There are two way to do it: > + > +1. Program the image file on PC machine for SD card boot > + $ sudo dd if=./output/images/sdcard.img of=/dev/sdx > + # or in some other host machine: > + $ sudo dd if=./output/images/sdcard.img of=/dev/mmcblkx > + > + # find the right SD Card device name in your host machine and replace the > + # ?sdx? or ?mmcblkx?. > + > +2. Program the image file on board for eMMC and XSPI boot > +Make sure your board has ipaddr, netmask, and serverip defined to reach your > +tftp server. > + > + 2.1 Program eMMC boot image file to eMMC chip > + # Make sure output/images/sdcard.img is stored to tftp server If you can simply use the SD image for eMMC as well, why do you distinguish between them? > + # Below command is one example > + => tftpboot 0xa0000000 sdcard.img > + => mmc dev 1 > + => mmc erase 0 0x200000 > + => mmc write 0xa0000000 0 0x200000 > + > + # The size "0x200000" will be changed when the image size is different. > + > + 2.2 Program XSPI boot image file to flash > + # Make sure output/images/xspi.cpio.img is stored to tftp server > + # Below command is one example > + => tftpboot 0xa0000000 xspi.cpio.img Where does this xspi.cpio.img come from? > + => sf probe > + => sf erase 0 $filesize > + => sf write 0xa0000000 0 $filesize > + > +3. Booting your new system > +Before booting the new system, we should make sure the switch setting is right. > +below switch setting is for each booting mode: > + +-----------+---------------------+ > + |Boot mode | Switch setting | > + +---------------------------------+ > + |SD boot | SW2[1~4] = 0b?1000 | > + +---------------------------------+ > + |eMMC boot | SW2[1~4] = 0b?1001 | > + +---------------------------------+ > + |XSPI boot | SW2[1~4] = 0b?1111 | > + +-----------+---------------------+ > + > +or we use following command to reset the board in uboot prompt: > + # boot from SD card > + => qixis_reset sd > + > + # boot from eMMC chip > + => qixis_reset emmc > + > + # boot from XSPI > + => qixis_reset qspi > diff --git a/board/nxp/ls1028ardb/rootfs_overlay/etc/udev/rules.d/10-network.rules b/board/nxp/ls1028ardb/rootfs_overlay/etc/udev/rules.d/10-network.rules > new file mode 100644 > index 0000000000..19f41634bd > --- /dev/null > +++ b/board/nxp/ls1028ardb/rootfs_overlay/etc/udev/rules.d/10-network.rules > @@ -0,0 +1,16 @@ > +# ENETC rules > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.0", DRIVERS=="fsl_enetc", NAME:="eno0" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.1", DRIVERS=="fsl_enetc", NAME:="eno1" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.2", DRIVERS=="fsl_enetc", NAME:="eno2" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.6", DRIVERS=="fsl_enetc", NAME:="eno3" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.0", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf0" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.1", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf1" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.2", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf0" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.3", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf1" > +# LS1028 switch rules > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p0", NAME="swp0" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p1", NAME="swp1" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p2", NAME="swp2" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p3", NAME="swp3" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p4", NAME="swp4" > +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p5", NAME="swp5" > diff --git a/board/nxp/ls1028ardb/u-boot-environment-sd.txt b/board/nxp/ls1028ardb/u-boot-environment-sd.txt > new file mode 100644 > index 0000000000..f91e6b585f > --- /dev/null > +++ b/board/nxp/ls1028ardb/u-boot-environment-sd.txt > @@ -0,0 +1,13 @@ > +baudrate=115200 > +bootcmd=setenv bootargs root=/dev/mmcblk0p2 rootwait rw earlycon=uart8250,0x21c0500 console=ttyS0,115200 cma=256M video=1920x1080-32 at 60;mmcinfo;fatload mmc 0:1 ${dp_load} ${dp_file}; hdp load ${dp_load} ${dp_offset};fatload mmc 0:1 ${loadaddr} ${bootfile};fatload mmc 0:1 ${fdtaddr} ${fdtfile};booti ${loadaddr} - ${fdtaddr} > +bootdelay=3 > +bootfile=Image > +fdtfile=fsl-ls1028a-rdb.dtb > +loadaddr=0xa0000000 > +fdtaddr=0xb0000000 > +dp_file=ls1028a-dp-fw.bin > +dp_load=0x90000000 > +dp_offset=0x2000 > +stderr=serial > +stdin=serial > +stdout=serial > diff --git a/configs/nxp_ls1028ardb-64b_defconfig b/configs/nxp_ls1028ardb-64b_defconfig > new file mode 100644 > index 0000000000..cb0131a35c > --- /dev/null > +++ b/configs/nxp_ls1028ardb-64b_defconfig > @@ -0,0 +1,85 @@ > +# Architecture > +BR2_aarch64=y > +BR2_cortex_a72=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Hostname and issue > +BR2_TARGET_GENERIC_HOSTNAME="LS1028ARDB" > + > +# toolchain > +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y Why a glibc toolchain? > +BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" This is a blind symbol, shouldn't be set in the defconfig. > + > +# Linux headers same as kernel > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y > + > +# bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BOARDNAME="ls1028ardb_tfa" > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="LSDK-19.09-update-311219" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_FORMAT_BIN=n > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-dtb.bin" > +BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE=y Why do you need mkimage on the target? (host-uboot-tools is built automatically by selecting envimage below). > +BR2_TARGET_UBOOT_ENVIMAGE=y > +BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/nxp/ls1028ardb/u-boot-environment-sd.txt" > +BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x2000" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/linux" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="LSDK-19.09-update-311219-V4.19" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-rdb" > +BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" Why doesn't BR2_LINUX_KERNEL_IMAGE work? > + > +# Serial port config > +BR2_TARGET_GENERIC_GETTY=y This is already the default. > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" The default "console" should work, doesn't it? > + > +# required tools to create the microSD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nxp/ls1028ardb/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="$(LINUX_DIR) $(TOPDIR) $(UBOOT_DIR)" > + > +# busybox setting > +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/nxp/common/ls/busybox.config" > +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > + > +# packages for rcw > +BR2_PACKAGE_HOST_QORIQ_RCW=y > +BR2_PACKAGE_HOST_QORIQ_RCW_BOOT_MODE="sd" > +BR2_PACKAGE_HOST_QORIQ_RCW_BIN="ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" > + > +#Display port firmware > +BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y > + > +#eudev support > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y It would be good to explain in the commit message why this is needed. Regards, Arnout > +BR2_ROOTFS_OVERLAY="board/nxp/ls1028ardb/rootfs_overlay" > + > +# Arm-Trusted-Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-dtb.bin" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/atf" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="LSDK-19.09-update-311219" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="pbl" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_DEPENDENCIES="host-qoriq-rcw" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd RCW=$(BINARIES_DIR)/rcw_1300_sdboot.bin" > From arnout at mind.be Thu Jan 6 14:35:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 15:35:28 +0100 Subject: [Buildroot] [git commit] package/qoriq-rcw: add in-tree rcw source support Message-ID: <20220106162435.B616C83460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d167f7006e724360994a88cb97ad65bec137db68 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The qoriq-rcw repository contains the RCW source for a lot of development boards already. Add a new option BR2_PACKAGE_HOST_QORIQ_RCW_INTREE to use one of these rather than a custom one. Signed-off-by: Jerry Huang [Arnout: - rename the option to _RCW_INTREE; - update commit message, documentation, and internal variables accordingly; - reorganise condition tree so it becomes a little simpler; - add patsubst so the source can be specified as either %.rcw or %.bin; - always install it as PBL.bin, to be consistent with the custom option. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qoriq-rcw/Config.in.host | 12 ++++++++++++ package/qoriq-rcw/qoriq-rcw.mk | 16 ++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/package/qoriq-rcw/Config.in.host b/package/qoriq-rcw/Config.in.host index 1f69c0389c..08fc83acd0 100644 --- a/package/qoriq-rcw/Config.in.host +++ b/package/qoriq-rcw/Config.in.host @@ -25,4 +25,16 @@ config BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH included for use in the SDK or with post scripts but no RCW binary will not be generated. +config BR2_PACKAGE_HOST_QORIQ_RCW_INTREE + string "In-tree RCW name" + depends on !BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH + help + This option is used to specify the RCW binary file for board. + which is composed as platform/serdes_value/rcw_file: platform + is the platform name, serdes_value is the setting of the + Serdes, and rcw_file is the file name of RCW. For example: + "ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" + + If this option is empty, no rcw file is used. + endif diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index bad4a451d3..93e660b1dd 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -13,8 +13,10 @@ QORIQ_RCW_LICENSE_FILES = LICENSE HOST_QORIQ_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) QORIQ_RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH)) +QORIQ_RCW_INTREE = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_INTREE)) ifneq ($(QORIQ_RCW_FILES),) + QORIQ_RCW_INCLUDES = $(filter-out %.rcw,$(QORIQ_RCW_FILES)) # Get the name of the custom rcw file from the custom list QORIQ_RCW_PROJECT = $(notdir $(filter %.rcw,$(QORIQ_RCW_FILES))) @@ -54,6 +56,20 @@ endef define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin endef + +else ifneq ($(QORIQ_RCW_INTREE),) + +QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_INTREE))) +QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_INTREE))) + +define HOST_QORIQ_RCW_BUILD_CMDS + $(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM) +endef + +define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE + $(INSTALL) -D -m 0644 $(@D)/$(patsubst %.rcw,%.bin,$(QORIQ_RCW_INTREE)) \ + $(BINARIES_DIR)/PBL.bin +endef endif # Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer From arnout at mind.be Thu Jan 6 15:17:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 16:17:27 +0100 Subject: [Buildroot] [git commit] package/qoriq-cadence-dp-firmware: new package Message-ID: <20220106162435.C1A9583470@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d164df0aefc121d4954d74d68491968a43ff73d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package provides the firmware for LS1028ARDB DP (display port). Signed-off-by: Jerry Huang [Arnout: - move out of nxp directory; - add extraction helper; - set REDISTRIBUTE to NO. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/qoriq-cadence-dp-firmware/Config.in | 4 ++ .../qoriq-cadence-dp-firmware.hash | 3 ++ .../qoriq-cadence-dp-firmware.mk | 49 ++++++++++++++++++++++ 5 files changed, 60 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a52a8cfa38..03918e4205 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -500,6 +500,9 @@ F: package/znc/ N: Charles Hardin F: package/alsa-plugins/ +N: Changming Huang +F: package/qoriq-cadence-dp-firmware/ + N: Chris Packham F: package/coremark/ F: package/coremark-pro/ diff --git a/package/Config.in b/package/Config.in index cb15574746..3c7340e27c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -544,6 +544,7 @@ endmenu source "package/pps-tools/Config.in" source "package/pru-software-support/Config.in" source "package/pulseview/Config.in" + source "package/qoriq-cadence-dp-firmware/Config.in" source "package/raspi-gpio/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" diff --git a/package/qoriq-cadence-dp-firmware/Config.in b/package/qoriq-cadence-dp-firmware/Config.in new file mode 100644 index 0000000000..3f494bd3a3 --- /dev/null +++ b/package/qoriq-cadence-dp-firmware/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE + bool "qoriq-cadence-dp-firmware" + help + NXP QorIQ cadence DP firmware, a resident EL3 firmware. diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash new file mode 100644 index 0000000000..89aaf1d71b --- /dev/null +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 5871c5717be32f14a59624d5699d405e8ce9ae2e9c9ef86fd16e13d264a40e58 firmware-cadence-lsdk1909.bin +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk new file mode 100644 index 0000000000..23643d24e0 --- /dev/null +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# qoriq-cadence-dp-firmware +# +################################################################################ + +QORIQ_CADENCE_DP_FIRMWARE_VERSION = lsdk1909 +QORIQ_CADENCE_DP_FIRMWARE_SITE = http://www.nxp.com/lgfiles/sdk/$(QORIQ_CADENCE_DP_FIRMWARE_VERSION) +QORIQ_CADENCE_DP_FIRMWARE_SOURCE = firmware-cadence-$(QORIQ_CADENCE_DP_FIRMWARE_VERSION).bin +QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP-Binary-EULA +QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING +QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO +QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES +QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO + +# Helper for self-extracting binaries distributed by NXP. +# +# The --force option makes sure it doesn't fail if the source +# directory already exists. The --auto-accept skips the license check, +# as it is not needed in Buildroot because we have legal-info. Since +# there's a EULA in the binary file, we extract it in this macro, and +# it should therefore be added to the LICENSE_FILES variable of +# packages using this macro. Also, remember to set REDISTRIBUTE to +# "NO". Indeed, this is a legal minefield: the EULA specifies that the +# Board Support Package includes software and hardware (sic!) for +# which a separate license is needed... +# +# $(1): full path to the archive file +# +define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER + awk 'BEGIN { start = 0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(@D) && sh $(1) --force --auto-accept + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; + rmdir $(@D)/$(basename $(notdir $(1))) +endef + +define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS + $(call QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) +endef + +define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 $(@D)/dp/ls1028a-dp-fw.bin $(BINARIES_DIR)/ls1028a-dp-fw.bin +endef + +$(eval $(generic-package)) From arnout at mind.be Thu Jan 6 17:09:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 18:09:47 +0100 Subject: [Buildroot] Overriding Kconfig Values from external br2 In-Reply-To: References: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> Message-ID: <4d73992c-3189-1989-525c-4506495c90ac@mind.be> On 06/01/2022 16:37, Jesse Millwood wrote: > On Thu, 2022-01-06 at 10:45 +0100, Arnout Vandecappelle wrote: >> >> >> On 05/01/2022 20:03, Jesse Millwood wrote: >>> Hello, >>> >>> I have an external C/C++ toolchain that I've put together that uses >>> MUSL. I've >>> also built an external Rust toolchain that uses my MUSL toolchain. >>> >>> My issue is that there is a Rust Kconfig variable that specifies if >>> a specific >>> architecture supports Rust. >>> >>> The Kconfig variable in question is >>> BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS >>> in package/rustc/Config.in.host. >> >> [snip] >> >>> You may notice that I changed the libc depends line to be or'd with >>> BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get considered >>> when I >>> choose my external musl toolchain option. In the menuconfig when I >>> search for >>> the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with the >>> "/" key it >>> looks like it is only getting it from the original file. Does >>> buildroot have a >>> mechanism for overwriting this kind of setting and if not, does >>> anyone have an >>> idea of how I would accomplish what I am trying to do (make >>> buildroot honor my >>> external rust toolchain)? >> >> ? No, there's no way to override the dependencies of an existing >> Config.in >> symbol in an external. >> >> ? However, this was corrected in upstream Buildroot in commit >> d69d40c029dc7d8199b745eaee759d92b66c5d17. So you can try to backport >> that commit >> instead, or just update Buildroot to something more recent. > > Arnout, thanks for the pointer to the commit. That is a logical way to > support other platforms. However, I have a powerpc musl rust toolchain > that I've built externally. > > With the changes in that commit can I set > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS to "y" in my external now Ah, no, you're right, powerpc-unknown-linux-musl is a Tier 3 platform and that patch only adds Tier 1 and 2. We could add a Tier 3 option as well (and disable the rust-bin option in that case). Note however that the stdlib status for this target is marked as "?" on [1], so I'm not sure it's ever going to work... > that there is no depends expressions and it is all default logic? Or > would I have to still add another expression that maybe defaults to "y" > if a new variable is true like > "BR2_EXTERNAL_RUSTC_TARGET_ARCH_SUPPORTS" that is defined in my > external? No, that's not going to work. I think you can make a hack: add "select BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS" to your BR2_TOOLCHAIN_EXTERNAL_MY_MUSL definition. I think that works. Regards, Arnout > > Thanks, > Jesse > >> >> ? Regards, >> ? Arnout >> >> >>> >>> Thanks, >>> Jesse >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From aduskett at gmail.com Thu Jan 6 17:17:20 2022 From: aduskett at gmail.com (Adam Duskett) Date: Thu, 6 Jan 2022 09:17:20 -0800 Subject: [Buildroot] [PATCH v4 1/1] package/pkg-generic.mk: fix absolute paths in per-package config files Message-ID: <20220106171720.12857-1-aduskett@gmail.com> Some packages (notably qmake packages) generate .cmake, .pc, and .pri files with absolute paths. Unfortunately, doing so breaks per-package builds because the paths in those files point outside the per-package sysroot for packages that have rsynced those same files. - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk to avoid more calls to ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) - Add .cmake, .pc, and .pri files to the files of which to find to sed the per-package paths. This simple fix allows qt5 submodule packages to build with per-package enabled. Based off of Louis-Paul's earlier work found here: https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ And Yann Morin's feedback found here: https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ Signed-off-by: Adam Duskett --- changes v3 -> v4: - Further compress the method by simply adding the files to the already existing find command. (Yann) changes v2 -> v3: - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk (Yann) - Combine FIXUP_CONFIG_FILES_ABSOLUTE_PATHS with FIXUP_PER_PACKAGE_FILES (Yann) changes v1 -> v2 - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host directories in a single step. package/pkg-generic.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6a5fe5507b..9952ff1963 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -113,8 +113,16 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. +# +# When per-package is enabled, packages may generate files with absolute paths +# that point to the packages per-package sysroot. However, this breaks +# per-package isolation when the files are rsynced to a new package that depends +# on the first package. because the hard-coded paths point to directories +# outside the packages sysroot. Run sed on all .cmake, .pc, and .pri files in a +# given packages sysroot containing the word "per-package" and replace the path +# with the appropriate per-package directory. ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define FIXUP_PYTHON_SYSCONFIGDATA +define FIXUP_PER_PACKAGE_FILES $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ @@ -122,6 +130,9 @@ define FIXUP_PYTHON_SYSCONFIGDATA \( \( -name "_sysconfigdata*.pyc" -delete \) \ -o \( -name "_sysconfigdata*.py" -print0 \) \ \) \ + -o -name "*.cmake" -print0 \ + -o -name "*.pc" -print0 \ + -o -name "*.pri" -print0 \ | xargs -0 --no-run-if-empty \ $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef @@ -836,7 +847,7 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += FIXUP_PER_PACKAGE_FILES ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.33.1 From aduskett at gmail.com Thu Jan 6 17:33:21 2022 From: aduskett at gmail.com (Adam Duskett) Date: Thu, 6 Jan 2022 09:33:21 -0800 Subject: [Buildroot] [PATCH v2 4/4] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220106062407.3131530-4-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-4-james.hilliard1@gmail.com> Message-ID: Hello! Thanks again for your help in getting rid of the scourge that is Python2! A few issues with this patch series: - Qt5base is the package that installs syncqt.pl. This results in an immediate failure at the begging of the build: /bin/bash: /output/host/bin/syncqt.pl: No such file or directory A simple solution would be to have a post_extract_hook to install the script: define QT5BASE_INSTALL_SYNCQT $(INSTALL) -m 0775 -D $(@D)/bin/syncqt.pl $(HOST_DIR)/bin/syncqt.pl endef QT5BASE_POST_EXTRACT_HOOKS += QT5BASE_INSTALL_SYNCQT After that, I get a lot of: "fatal error: private/qiodevice_p.h: No such file or directory" errors when compiling. The environment is a ubuntu 20.04 docker environment with the bare minimum requirements installed to compile buildroot. You can find the Dockerfile here: https://github.com/aduskett/buildroot-docker-devel/blob/master/Ubuntu/20.04/ Thanks! Adam On Wed, Jan 5, 2022 at 10:24 PM James Hilliard wrote: > > This points all qt5 packages to the latest kde submodule versions > available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > We need to remove some patches applied upstream already. > > We need to rework qt5location to pull in the mapboxgl dependency from > a separate package as that dependency is only included in release > archives. > > We need to pin qt5 packages not available in the new upstream to the > previous 5.15.2 version. > > We need to set SYNC_QT_HEADERS for all qt5 packages in the new > upstream as headers are only copied in release archives which are > not provided in the kde upstream. > > Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which > should be the closest release to the kde patches that don't have > lts tags. > > Create a .git file so to trigger headers sync during configure. > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - fix headers sync and update MODULE_VERSION > --- > package/pkg-qmake.mk | 4 +- > package/qt5/qt53d/qt53d.hash | 4 +- > package/qt5/qt53d/qt53d.mk | 7 ++- > ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- > .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- > .../0008-Add-missing-limits-include.patch | 32 ---------- > .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- > package/qt5/qt5base/qt5base.hash | 4 +- > package/qt5/qt5base/qt5base.mk | 7 ++- > package/qt5/qt5charts/qt5charts.hash | 4 +- > package/qt5/qt5charts/qt5charts.mk | 7 ++- > package/qt5/qt5coap/qt5coap.mk | 2 +- > .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- > .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- > ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- > .../qt5/qt5declarative/qt5declarative.hash | 4 +- > package/qt5/qt5declarative/qt5declarative.mk | 7 ++- > .../qt5graphicaleffects.hash | 4 +- > .../qt5graphicaleffects.mk | 7 ++- > .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- > .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- > package/qt5/qt5knx/qt5knx.mk | 2 +- > ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- > .../qt5location-mapboxgl.hash | 16 +++++ > .../qt5location-mapboxgl.mk | 13 ++++ > ...ix-compilation-for-no-opengl-builds.patch} | 0 > package/qt5/qt5location/qt5location.hash | 4 +- > package/qt5/qt5location/qt5location.mk | 14 ++++- > package/qt5/qt5lottie/qt5lottie.hash | 4 +- > package/qt5/qt5lottie/qt5lottie.mk | 7 ++- > package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- > package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- > package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- > package/qt5/qt5opcua/qt5opcua.mk | 2 +- > .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- > .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- > .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- > .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- > .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- > .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- > .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- > .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- > package/qt5/qt5script/qt5script.hash | 4 +- > package/qt5/qt5script/qt5script.mk | 7 ++- > package/qt5/qt5scxml/qt5scxml.hash | 4 +- > package/qt5/qt5scxml/qt5scxml.mk | 7 ++- > package/qt5/qt5sensors/qt5sensors.hash | 4 +- > package/qt5/qt5sensors/qt5sensors.mk | 7 ++- > package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- > package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- > package/qt5/qt5serialport/qt5serialport.hash | 4 +- > package/qt5/qt5serialport/qt5serialport.mk | 7 ++- > package/qt5/qt5svg/qt5svg.hash | 4 +- > package/qt5/qt5svg/qt5svg.mk | 7 ++- > package/qt5/qt5tools/qt5tools.hash | 4 +- > package/qt5/qt5tools/qt5tools.mk | 7 ++- > .../qt5virtualkeyboard.hash | 4 +- > .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- > package/qt5/qt5wayland/qt5wayland.hash | 4 +- > package/qt5/qt5wayland/qt5wayland.mk | 7 ++- > package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- > package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- > .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- > package/qt5/qt5websockets/qt5websockets.hash | 4 +- > package/qt5/qt5websockets/qt5websockets.mk | 7 ++- > package/qt5/qt5webview/qt5webview.hash | 4 +- > package/qt5/qt5webview/qt5webview.mk | 7 ++- > package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- > package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- > .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- > 71 files changed, 216 insertions(+), 386 deletions(-) > delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch > delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) > create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) > > diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk > index 4dcaf6dd62..fdaddf08df 100644 > --- a/package/pkg-qmake.mk > +++ b/package/pkg-qmake.mk > @@ -24,7 +24,9 @@ > # Hook to sync Qt headers > # > define QT_HEADERS_SYNC_HOOK > - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) > + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ > + $($(PKG)_BUILDDIR)/.qmake.conf > + touch $($(PKG)_BUILDDIR)/.git > endef > > ################################################################################ > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 43b2132cc7..32d3675619 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index f3eff9edf0..9a07d189bd 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT53D_VERSION = $(QT5_VERSION) > -QT53D_SITE = $(QT5_SITE) > -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz > +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 > +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > +QT53D_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_ASSIMP),y) > QT53D_DEPENDENCIES += assimp > diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > deleted file mode 100644 > index f014a160d5..0000000000 > --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > +++ /dev/null > @@ -1,53 +0,0 @@ > -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 > -From: Thiago Macieira > -Date: Mon, 18 Jan 2021 07:40:54 -0800 > -Subject: [PATCH] Fix build with GCC 11: include > - > -Fixes: QTBUG-90395 > -Pick-to: 6.0 > -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 > -Reviewed-by: Edward Welbourne > - > -[Retrieved (and backported) from: > -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] > -Signed-off-by: Fabrice Fontaine > ---- > - src/corelib/global/qendian.h | 6 ++++-- > - src/corelib/global/qfloat16.h | 1 + > - 2 files changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h > -index 99b529f17cd..c874c5e47ab 100644 > ---- a/src/corelib/global/qendian.h > -+++ b/src/corelib/global/qendian.h > -@@ -1,7 +1,7 @@ > - /**************************************************************************** > - ** > --** Copyright (C) 2016 The Qt Company Ltd. > --** Copyright (C) 2016 Intel Corporation. > -+** Copyright (C) 2021 The Qt Company Ltd. > -+** Copyright (C) 2021 Intel Corporation. > - ** Contact: https://www.qt.io/licensing/ > - ** > - ** This file is part of the QtCore module of the Qt Toolkit. > -@@ -44,6 +44,8 @@ > - #include > - #include > - > -+#include > -+ > - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems > - #include > - #include > -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h > -index e9477d2ecec..a25fac28862 100644 > ---- a/src/corelib/global/qfloat16.h > -+++ b/src/corelib/global/qfloat16.h > -@@ -44,6 +44,7 @@ > - > - #include > - #include > -+#include > - #include > - > - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) > diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > deleted file mode 100644 > index d20600c6ce..0000000000 > --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > +++ /dev/null > @@ -1,61 +0,0 @@ > -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 > -From: Ville Voutilainen > -Date: Mon, 18 Jan 2021 09:58:17 +0200 > -Subject: [PATCH] Build fixes for GCC 11 > - > -Task-number: QTBUG-89977 > -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 > -Reviewed-by: Lars Knoll > -Reviewed-by: Thiago Macieira > -[Retrieved (and backported) from: > -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] > -Signed-off-by: Maxim Kochetkov > ---- > - src/corelib/text/qbytearraymatcher.h | 2 ++ > - src/corelib/tools/qsharedpointer_impl.h | 3 --- > - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- > - 3 files changed, 3 insertions(+), 4 deletions(-) > - > -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h > -index 0eedfc1d20..f5f9bef7b8 100644 > ---- a/src/corelib/text/qbytearraymatcher.h > -+++ b/src/corelib/text/qbytearraymatcher.h > -@@ -42,6 +42,8 @@ > - > - #include > - > -+#include > -+ > - QT_BEGIN_NAMESPACE > - > - > -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h > -index 790c187cb9..4aee98af53 100644 > ---- a/src/corelib/tools/qsharedpointer_impl.h > -+++ b/src/corelib/tools/qsharedpointer_impl.h > -@@ -155,9 +155,6 @@ namespace QtSharedPointer { > - #endif > - inline void checkQObjectShared(...) { } > - inline void setQObjectShared(...) { } > -- > -- inline void operator delete(void *ptr) { ::operator delete(ptr); } > -- inline void operator delete(void *, void *) { } > - }; > - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) > - > -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp > -index 9e7e1a5572..f0866a90ac 100644 > ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp > -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp > -@@ -698,7 +698,7 @@ void QXcbWindow::show() > - if (isTransient(window())) { > - const QWindow *tp = window()->transientParent(); > - if (tp && tp->handle()) > -- transientXcbParent = static_cast(tp->handle())->winId(); > -+ transientXcbParent = tp->handle()->winId(); > - // Default to client leader if there is no transient parent, else modal dialogs can > - // be hidden by their parents. > - if (!transientXcbParent) > --- > -2.31.1 > - > diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch > deleted file mode 100644 > index e489f2e551..0000000000 > --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 > -From: Nicolas Fella > -Date: Sun, 20 Jun 2021 17:36:41 +0200 > -Subject: [PATCH] Add missing limits include > - > -The code uses std::numeric_limits but is lacking the appropriate include > - > -Pick-to: 5.15 6.1 6.2 > -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd > -Reviewed-by: Giuseppe D'Angelo > - > -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] > -Signed-off-by: Peter Seiderer > ---- > - src/corelib/tools/qoffsetstringarray_p.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h > -index 4dd9e960..e26a57ff 100644 > ---- a/src/corelib/tools/qoffsetstringarray_p.h > -+++ b/src/corelib/tools/qoffsetstringarray_p.h > -@@ -55,6 +55,7 @@ > - > - #include > - #include > -+#include > - > - QT_BEGIN_NAMESPACE > - > --- > -2.32.0 > - > diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > deleted file mode 100644 > index 98c7210551..0000000000 > --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > +++ /dev/null > @@ -1,45 +0,0 @@ > -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Fri, 27 Aug 2021 16:28:32 +0200 > -Subject: Fix build on riscv32 > - > -riscv32 fails to build because __NR_futex is not defined on this > -architecture: > - > -In file included from thread/qmutex_linux.cpp:45, > - from thread/qmutex.cpp:804: > -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': > -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? > - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); > - | ^~~~~~~~~~ > - | _q_futex > - > -Pick-to: 6.1 6.2 > -Fixes: QTBUG-96067 > -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 > -Reviewed-by: Thiago Macieira > -[Retrieved from: > -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] > ---- > - src/corelib/thread/qfutex_p.h | 5 +++++ > - 1 file changed, 5 insertions(+) > - > -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h > -index 40482b6fc1..037207a5c0 100644 > ---- a/src/corelib/thread/qfutex_p.h > -+++ b/src/corelib/thread/qfutex_p.h > -@@ -103,6 +103,11 @@ QT_END_NAMESPACE > - // if not defined in linux/futex.h > - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 > - > -+// RISC-V does not supply __NR_futex > -+# ifndef __NR_futex > -+# define __NR_futex __NR_futex_time64 > -+# endif > -+ > - QT_BEGIN_NAMESPACE > - namespace QtLinuxFutex { > - constexpr inline bool futexAvailable() { return true; } > --- > -cgit v1.2.1 > - > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index a824890e3c..d10847ea04 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ba2971dc08..294542fabb 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5BASE_VERSION = $(QT5_VERSION) > -QT5BASE_SITE = $(QT5_SITE) > -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz > +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a > +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib > QT5BASE_INSTALL_STAGING = YES > +QT5BASE_SYNC_QT_HEADERS = YES > > # A few comments: > # * -no-pch to workaround the issue described at > diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash > index b52be714b7..021d4ea19f 100644 > --- a/package/qt5/qt5charts/qt5charts.hash > +++ b/package/qt5/qt5charts/qt5charts.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk > index 2c40ac1c89..24e635b93b 100644 > --- a/package/qt5/qt5charts/qt5charts.mk > +++ b/package/qt5/qt5charts/qt5charts.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5CHARTS_VERSION = $(QT5_VERSION) > -QT5CHARTS_SITE = $(QT5_SITE) > -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz > +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 > +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) > +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 > QT5CHARTS_INSTALL_STAGING = YES > +QT5CHARTS_SYNC_QT_HEADERS = YES > > QT5CHARTS_LICENSE = GPL-3.0 > QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 > diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk > index 24de869120..a50f19d7f2 100644 > --- a/package/qt5/qt5coap/qt5coap.mk > +++ b/package/qt5/qt5coap/qt5coap.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5COAP_VERSION = $(QT5_VERSION) > +QT5COAP_VERSION = 5.15.2 > QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git > QT5COAP_SITE_METHOD = git > QT5COAP_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash > index 3edc2d666a..12e9d637b2 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.hash > +++ b/package/qt5/qt5connectivity/qt5connectivity.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk > index 6402b505bf..a4c79be10b 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.mk > +++ b/package/qt5/qt5connectivity/qt5connectivity.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) > -QT5CONNECTIVITY_SITE = $(QT5_SITE) > -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz > +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 > +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) > +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 > QT5CONNECTIVITY_INSTALL_STAGING = YES > +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES > > QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > deleted file mode 100644 > index 0e6da652f9..0000000000 > --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > +++ /dev/null > @@ -1,45 +0,0 @@ > -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer > -Date: Thu, 22 Jul 2021 23:13:43 +0200 > -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 > - compile) > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Fixes: > - > - In file included from qqmlprofilertypedevent_p.h:43, > - from qqmlprofilertypedevent.cpp:40: > - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: > - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > - | ^~~~~~~~~~~~~~ > - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > - | ^ > - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > - | ^~~ > - | std::max > - > -Signed-off-by: Peter Seiderer > ---- > - src/qmldebug/qqmlprofilerevent_p.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h > -index a7e37d1964..01b2f58f16 100644 > ---- a/src/qmldebug/qqmlprofilerevent_p.h > -+++ b/src/qmldebug/qqmlprofilerevent_p.h > -@@ -48,6 +48,7 @@ > - #include > - > - #include > -+#include > - #include > - > - // > --- > -2.32.0 > - > diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash > index ab83b71814..f9dc08a6e0 100644 > --- a/package/qt5/qt5declarative/qt5declarative.hash > +++ b/package/qt5/qt5declarative/qt5declarative.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > index 3318cd24c8..036baed444 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5DECLARATIVE_VERSION = $(QT5_VERSION) > -QT5DECLARATIVE_SITE = $(QT5_SITE) > -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz > +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 > +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) > +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 > QT5DECLARATIVE_INSTALL_STAGING = YES > +QT5DECLARATIVE_SYNC_QT_HEADERS = YES > > QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > index 9d7a837b8b..e755f0848b 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > index a9ddff454e..542eb4de90 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) > -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) > -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz > +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e > +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) > +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 > QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative > QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES > +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES > > QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash > index b4281e712d..49690de3bb 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.hash > +++ b/package/qt5/qt5imageformats/qt5imageformats.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk > index ffb094d566..506cd123a8 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.mk > +++ b/package/qt5/qt5imageformats/qt5imageformats.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) > -QT5IMAGEFORMATS_SITE = $(QT5_SITE) > -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz > +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f > +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) > +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 > QT5IMAGEFORMATS_INSTALL_STAGING = YES > +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES > > QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL > diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk > index 9fc121111c..412e31c652 100644 > --- a/package/qt5/qt5knx/qt5knx.mk > +++ b/package/qt5/qt5knx/qt5knx.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5KNX_VERSION = $(QT5_VERSION) > +QT5KNX_VERSION = 5.15.2 > QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git > QT5KNX_SITE_METHOD = git > QT5KNX_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > similarity index 81% > rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > index 0894af9ce5..0f56a488e3 100644 > --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer > [yann.morin.1998 at free.fr: add uClibc] > Signed-off-by: Yann E. MORIN > --- > - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- > + platform/default/thread.cpp | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp > index c7c79b4..3f135eb 100644 > ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > +--- a/platform/default/thread.cpp > ++++ b/platform/default/thread.cpp > @@ -11,8 +11,9 @@ namespace platform { > > std::string getCurrentThreadName() { > diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > new file mode 100644 > index 0000000000..e44081c465 > --- /dev/null > +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > @@ -0,0 +1,16 @@ > +# Locally calculated > +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 > + > +# Hashes for license files: > +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md > +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt > +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt > +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt > +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt > +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt > +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt > +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt > +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt > +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt > +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt > +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt > diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > new file mode 100644 > index 0000000000..58e167e483 > --- /dev/null > +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > @@ -0,0 +1,13 @@ > +################################################################################ > +# > +# qt5location-mapboxgl > +# > +################################################################################ > + > +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d > +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) > +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 > +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib > +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt > + > +$(eval $(generic-package)) > diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch > similarity index 100% > rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch > rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch > diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash > index 0bb293305c..52649897b1 100644 > --- a/package/qt5/qt5location/qt5location.hash > +++ b/package/qt5/qt5location/qt5location.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk > index ea741d0df6..98af8b233b 100644 > --- a/package/qt5/qt5location/qt5location.mk > +++ b/package/qt5/qt5location/qt5location.mk > @@ -4,10 +4,12 @@ > # > ################################################################################ > > -QT5LOCATION_VERSION = $(QT5_VERSION) > -QT5LOCATION_SITE = $(QT5_SITE) > -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz > +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f > +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) > +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 > +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl > QT5LOCATION_INSTALL_STAGING = YES > +QT5LOCATION_SYNC_QT_HEADERS = YES > > QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5LOCATION_DEPENDENCIES += qt5declarative > endif > > +define QT5LOCATION_COPY_MAPBOXGL > + rm -rf $(@D)/src/3rdparty/mapbox-gl-native > + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native > +endef > +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL > + > $(eval $(qmake-package)) > diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash > index 740f9072f2..46ab3f60df 100644 > --- a/package/qt5/qt5lottie/qt5lottie.hash > +++ b/package/qt5/qt5lottie/qt5lottie.hash > @@ -1,5 +1,5 @@ > -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk > index 1423a629b9..e9614fbecf 100644 > --- a/package/qt5/qt5lottie/qt5lottie.mk > +++ b/package/qt5/qt5lottie/qt5lottie.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5LOTTIE_VERSION = $(QT5_VERSION) > -QT5LOTTIE_SITE = $(QT5_SITE) > -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz > +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 > +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) > +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 > QT5LOTTIE_DEPENDENCIES = qt5declarative > QT5LOTTIE_INSTALL_STAGING = YES > +QT5LOTTIE_SYNC_QT_HEADERS = YES > > QT5LOTTIE_LICENSE = GPL-3.0 > QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT > diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk > index 54cc1de632..0b62cf1bed 100644 > --- a/package/qt5/qt5mqtt/qt5mqtt.mk > +++ b/package/qt5/qt5mqtt/qt5mqtt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5MQTT_VERSION = $(QT5_VERSION) > +QT5MQTT_VERSION = 5.15.2 > QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git > QT5MQTT_SITE_METHOD = git > QT5MQTT_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash > index b70a4ecf51..1c4d930248 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.hash > +++ b/package/qt5/qt5multimedia/qt5multimedia.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > index 39eddc3afc..6695369063 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) > -QT5MULTIMEDIA_SITE = $(QT5_SITE) > -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz > +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 > +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) > +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 > QT5MULTIMEDIA_INSTALL_STAGING = YES > +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES > > QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk > index a58c4c5e14..ef51abddf8 100644 > --- a/package/qt5/qt5opcua/qt5opcua.mk > +++ b/package/qt5/qt5opcua/qt5opcua.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5OPCUA_VERSION = $(QT5_VERSION) > +QT5OPCUA_VERSION = 5.15.2 > QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git > QT5OPCUA_SITE_METHOD = git > QT5OPCUA_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > index 1fa0d6430a..2138b3e313 100644 > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > index 1ac8689d6e..c2b5ae182e 100644 > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) > -QT5QUICKCONTROLS_SITE = $(QT5_SITE) > -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz > +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 > +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) > +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 > QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative > QT5QUICKCONTROLS_INSTALL_STAGING = YES > +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES > > QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > index f66a1186ee..8c0e02152d 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 > > # Hashes for license files: > sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > index 2f6dcd1f2f..4bdb90b203 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) > -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) > -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz > +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 > +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) > +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 > QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative > QT5QUICKCONTROLS2_INSTALL_STAGING = YES > +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES > > QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > index ac97fc319c..c2d0b11f2b 100644 > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > index ef6927f928..49d0cb330b 100644 > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) > -QT5QUICKTIMELINE_SITE = $(QT5_SITE) > -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz > +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 > +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) > +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 > QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative > QT5QUICKTIMELINE_INSTALL_STAGING = YES > +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES > > QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) > QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > index 30c5bfc51d..a2573a018a 100644 > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > index a6b5f0954c..b7dee4f2f3 100644 > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > > -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) > -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) > -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz > +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 > +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) > +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 > QT5REMOTEOBJECTS_DEPENDENCIES = qt5base > QT5REMOTEOBJECTS_INSTALL_STAGING = YES > QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) > QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 > +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative > diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash > index 783598047b..0b34ff3e8f 100644 > --- a/package/qt5/qt5script/qt5script.hash > +++ b/package/qt5/qt5script/qt5script.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk > index 77254fec0f..4e51eacfc3 100644 > --- a/package/qt5/qt5script/qt5script.mk > +++ b/package/qt5/qt5script/qt5script.mk > @@ -4,10 +4,11 @@ > # > ################################################################################ > > -QT5SCRIPT_VERSION = $(QT5_VERSION) > -QT5SCRIPT_SITE = $(QT5_SITE) > -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz > +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 > +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) > +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 > QT5SCRIPT_INSTALL_STAGING = YES > +QT5SCRIPT_SYNC_QT_HEADERS = YES > > # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. > # This is linked into libQt5Script, which also contains Qt sources under > diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash > index 6f816548e6..85e72f5378 100644 > --- a/package/qt5/qt5scxml/qt5scxml.hash > +++ b/package/qt5/qt5scxml/qt5scxml.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 > > # Hashes for license files: > sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT > diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk > index 186a2d381b..d5d26536a3 100644 > --- a/package/qt5/qt5scxml/qt5scxml.mk > +++ b/package/qt5/qt5scxml/qt5scxml.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5SCXML_VERSION = $(QT5_VERSION) > -QT5SCXML_SITE = $(QT5_SITE) > -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz > +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 > +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) > +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 > QT5SCXML_DEPENDENCIES = qt5declarative > QT5SCXML_INSTALL_STAGING = YES > +QT5SCXML_SYNC_QT_HEADERS = YES > > QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash > index 179c9833e0..6be87e8cf9 100644 > --- a/package/qt5/qt5sensors/qt5sensors.hash > +++ b/package/qt5/qt5sensors/qt5sensors.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk > index f928aad1c1..eebda912a9 100644 > --- a/package/qt5/qt5sensors/qt5sensors.mk > +++ b/package/qt5/qt5sensors/qt5sensors.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5SENSORS_VERSION = $(QT5_VERSION) > -QT5SENSORS_SITE = $(QT5_SITE) > -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz > +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 > +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) > +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 > QT5SENSORS_INSTALL_STAGING = YES > QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5SENSORS_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5SENSORS_DEPENDENCIES += qt5declarative > diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash > index 4f05049b99..8b560a8a83 100644 > --- a/package/qt5/qt5serialbus/qt5serialbus.hash > +++ b/package/qt5/qt5serialbus/qt5serialbus.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk > index 412a255612..fc62c85318 100644 > --- a/package/qt5/qt5serialbus/qt5serialbus.mk > +++ b/package/qt5/qt5serialbus/qt5serialbus.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5SERIALBUS_VERSION = $(QT5_VERSION) > -QT5SERIALBUS_SITE = $(QT5_SITE) > -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz > +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 > +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) > +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 > QT5SERIALBUS_DEPENDENCIES = qt5serialport > QT5SERIALBUS_INSTALL_STAGING = YES > +QT5SERIALBUS_SYNC_QT_HEADERS = YES > > QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash > index 37bc8401f8..6d821c387f 100644 > --- a/package/qt5/qt5serialport/qt5serialport.hash > +++ b/package/qt5/qt5serialport/qt5serialport.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk > index 902967c757..370093f6f8 100644 > --- a/package/qt5/qt5serialport/qt5serialport.mk > +++ b/package/qt5/qt5serialport/qt5serialport.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5SERIALPORT_VERSION = $(QT5_VERSION) > -QT5SERIALPORT_SITE = $(QT5_SITE) > -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz > +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 > +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) > +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 > QT5SERIALPORT_INSTALL_STAGING = YES > QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5SERIALPORT_SYNC_QT_HEADERS = YES > > $(eval $(qmake-package)) > diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash > index 7773a940bb..abffc2891d 100644 > --- a/package/qt5/qt5svg/qt5svg.hash > +++ b/package/qt5/qt5svg/qt5svg.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk > index d4b31c231e..d48a37fafe 100644 > --- a/package/qt5/qt5svg/qt5svg.mk > +++ b/package/qt5/qt5svg/qt5svg.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5SVG_VERSION = $(QT5_VERSION) > -QT5SVG_SITE = $(QT5_SITE) > -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz > +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e > +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) > +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 > QT5SVG_INSTALL_STAGING = YES > QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > +QT5SVG_SYNC_QT_HEADERS = YES > > $(eval $(qmake-package)) > diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash > index e52d8e6df7..a563801997 100644 > --- a/package/qt5/qt5tools/qt5tools.hash > +++ b/package/qt5/qt5tools/qt5tools.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk > index 0543afd8f7..e2385080ce 100644 > --- a/package/qt5/qt5tools/qt5tools.mk > +++ b/package/qt5/qt5tools/qt5tools.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5TOOLS_VERSION = $(QT5_VERSION) > -QT5TOOLS_SITE = $(QT5_SITE) > -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz > +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 > +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) > +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 > > QT5TOOLS_INSTALL_STAGING = YES > +QT5TOOLS_SYNC_QT_HEADERS = YES > > # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), > # but the condition is used only used to decide if lupdate will support > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > index 82f132378e..1e2c658109 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > index 3984c9866e..db0884fd18 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) > -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) > -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz > +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 > +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) > +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 > QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg > QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES > +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES > > QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 > QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > index b17dbdd10d..35708ec077 100644 > --- a/package/qt5/qt5wayland/qt5wayland.hash > +++ b/package/qt5/qt5wayland/qt5wayland.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > index 0076bbfe73..70e5b2655e 100644 > --- a/package/qt5/qt5wayland/qt5wayland.mk > +++ b/package/qt5/qt5wayland/qt5wayland.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5WAYLAND_VERSION = $(QT5_VERSION) > -QT5WAYLAND_SITE = $(QT5_SITE) > -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz > +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 > +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) > +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 > QT5WAYLAND_DEPENDENCIES = wayland > QT5WAYLAND_INSTALL_STAGING = YES > +QT5WAYLAND_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) > QT5WAYLAND_DEPENDENCIES += qt5declarative > diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash > index 47c7da3365..af195b32b3 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.hash > +++ b/package/qt5/qt5webchannel/qt5webchannel.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk > index 176c0fd7a3..042a28fca9 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.mk > +++ b/package/qt5/qt5webchannel/qt5webchannel.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > > -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) > -QT5WEBCHANNEL_SITE = $(QT5_SITE) > -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz > +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 > +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) > +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 > QT5WEBCHANNEL_DEPENDENCIES = qt5websockets > QT5WEBCHANNEL_INSTALL_STAGING = YES > QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) > diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > index 84bc291739..3b14284e37 100644 > --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > @@ -6,7 +6,7 @@ > > QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 > QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz > QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit > > QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 > diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash > index 29a9ebe439..3cc87865dc 100644 > --- a/package/qt5/qt5websockets/qt5websockets.hash > +++ b/package/qt5/qt5websockets/qt5websockets.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk > index a35cdc5799..d222f025ee 100644 > --- a/package/qt5/qt5websockets/qt5websockets.mk > +++ b/package/qt5/qt5websockets/qt5websockets.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) > -QT5WEBSOCKETS_SITE = $(QT5_SITE) > -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz > +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 > +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) > +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 > QT5WEBSOCKETS_INSTALL_STAGING = YES > QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) > QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 > +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) > diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash > index c1cee9cf85..51d0fb0d7a 100644 > --- a/package/qt5/qt5webview/qt5webview.hash > +++ b/package/qt5/qt5webview/qt5webview.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 > > # Hashes for license files: > sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL > diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk > index 0f37f3eb85..ed1cfe5065 100644 > --- a/package/qt5/qt5webview/qt5webview.mk > +++ b/package/qt5/qt5webview/qt5webview.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > > -QT5WEBVIEW_VERSION = $(QT5_VERSION) > -QT5WEBVIEW_SITE = $(QT5_SITE) > -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz > +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f > +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) > +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 > QT5WEBVIEW_DEPENDENCIES = qt5webengine > QT5WEBVIEW_INSTALL_STAGING = YES > QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) > QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > +QT5WEBVIEW_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) > diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash > index 08e6753f21..b854cedcb6 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.hash > +++ b/package/qt5/qt5x11extras/qt5x11extras.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk > index 075d36dcd8..7b1e32df17 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.mk > +++ b/package/qt5/qt5x11extras/qt5x11extras.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -QT5X11EXTRAS_VERSION = $(QT5_VERSION) > -QT5X11EXTRAS_SITE = $(QT5_SITE) > -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz > +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f > +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) > +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 > QT5X11EXTRAS_INSTALL_STAGING = YES > QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5X11EXTRAS_SYNC_QT_HEADERS = YES > > $(eval $(qmake-package)) > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > index 682e114a7f..c0e3caa407 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > @@ -1,5 +1,5 @@ > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 > -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz > +# Locally calculated > +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > index 6845483327..27818ecb78 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) > -QT5XMLPATTERNS_SITE = $(QT5_SITE) > -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz > +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c > +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) > +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 > QT5XMLPATTERNS_INSTALL_STAGING = YES > QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > QT5XMLPATTERNS_DEPENDENCIES += qt5declarative > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Thu Jan 6 17:49:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 6 Jan 2022 18:49:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/lttng-modules: bump to version 2.13.1 Message-ID: <20220106174949.1064731-1-fontaine.fabrice@gmail.com> - Add a dependency on kernel >= 3.0: https://github.com/lttng/lttng-modules/commit/88eafb709ac811960b1163482f5d537cb18b32df - Add CONFIG_KPROBES to Config.in for kernel >= 5.7: https://github.com/lttng/lttng-modules/commit/a65765406b03e4f3b7a4303e1c9ed83c86cdd358 - Update license files and their hash because SPDX v3.0 identifiers are used since https://github.com/lttng/lttng-modules/commit/b7cdc18250880cc44edeef4a4b42c8ac7a135a6d - This bump will fix a build failure with kernel >= 5.6 thanks to at least: https://github.com/lttng/lttng-modules/commit/edfdcb685c3f56dde803244449f79ad7bed03798 https://github.com/lttng/lttng-modules/blob/v2.13.1/ChangeLog Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14501 Signed-off-by: Fabrice Fontaine --- package/lttng-modules/Config.in | 12 +++++++++--- package/lttng-modules/lttng-modules.hash | 12 ++++++------ package/lttng-modules/lttng-modules.mk | 5 +++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/package/lttng-modules/Config.in b/package/lttng-modules/Config.in index e8ba9bad8c..cb56584155 100644 --- a/package/lttng-modules/Config.in +++ b/package/lttng-modules/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LTTNG_MODULES bool "lttng-modules" depends on BR2_LINUX_KERNEL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 help Linux kernel modules for the LTTng 2.x kernel tracing infrastructure. @@ -8,7 +9,8 @@ config BR2_PACKAGE_LTTNG_MODULES Make sure your target kernel has the following config options enabled: - * CONFIG_MODULES: loadable module support + * CONFIG_MODULES: loadable module support (not strictly + required when built into the kernel) * CONFIG_KALLSYMS: this is necessary until the few required missing symbols are exported to GPL modules from mainline @@ -17,6 +19,8 @@ config BR2_PACKAGE_LTTNG_MODULES * CONFIG_TRACEPOINTS: kernel tracepoint instrumentation (enabled as a side-effect of any of the perf/ftrace/blktrace instrumentation features) + * CONFIG_KPROBES (5.7+): use kallsyms for kernel 5.7 and + newer. The following kernel configuration options will affect the features available from LTTng: @@ -29,9 +33,11 @@ config BR2_PACKAGE_LTTNG_MODULES * CONFIG_KALLSYMS_ALL: state dump of mapping between block device number and name - The packaged version is compatible with Linux 2.6.38 to 3.16. - http://lttng.org comment "lttng-modules needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL + +comment "lttng-modules needs a toolchain w/ headers >= 3.0" + depends on BR2_LINUX_KERNEL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index f04247ab0b..fb253c9bf6 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,8 +1,8 @@ -# From https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2.sha256 -sha256 98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f lttng-modules-2.11.0.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.1.tar.bz2.sha256 +sha256 a7c86d91c9bbe66d27f025aa04b8cfc6d7785ed2fc7ef774930800ee44d7f343 lttng-modules-2.13.1.tar.bz2 # Hash for license files -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt -sha256 6334b377a5bd56b56a1e8a495830f2d28ed1b5cbedc7493aec9fba979efcdfe1 LICENSE +sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 +sha256 6841c85b94f9dab319356e3aaf9e969fcedad51d3aaadf665bf86f34f4186b62 LICENSES/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/MIT +sha256 0133d3c505f176845d7a8b4dcfe006ac615832c43c41e76fe3b365191bafca92 LICENSE diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index b8f9be8656..4c1c50d0a0 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,11 +4,12 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.11.0 +LTTNG_MODULES_VERSION = 2.13.1 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) -LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE +LTTNG_MODULES_LICENSE_FILES = \ + LICENSES/LGPL-2.1 LICENSES/GPL-2.0 LICENSES/MIT LICENSE LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $(eval $(kernel-module)) -- 2.34.1 From bugzilla at busybox.net Thu Jan 6 17:52:39 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 06 Jan 2022 17:52:39 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #4 from Fabrice Fontaine --- >From understanding, the issue is raised on kernel >= 5.6 and lttng-modules has fixed this issue with https://github.com/lttng/lttng-modules/commit/edfdcb685c3f56dde803244449f79ad7bed03798 But there is a lot of other commits needed to be able to build on newer kernels so I think that a bump is indeed the best course of action. You can find a patch here: https://patchwork.ozlabs.org/project/buildroot/patch/20220106174949.1064731-1-fontaine.fabrice at gmail.com/ -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Thu Jan 6 17:59:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 18:59:23 +0100 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: <20220106062407.3131530-1-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> Message-ID: <20220106185923.0cb1bb9c@windsurf> On Wed, 5 Jan 2022 23:24:04 -0700 James Hilliard wrote: > _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may > not need to be selected in kconfig in cases where building is not > desired, so only check that _FINAL_DEPENDENCIES are selected. Could you expand the commit log with some specific details of which packages/dependencies are causing issues? I haven't followed the problem and it's not obvious to me what this patch is fixing. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Thu Jan 6 18:02:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 19:02:09 +0100 Subject: [Buildroot] [git commit] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver Message-ID: <20220106175627.348AB8346F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8324bf87c38ddc3a746c01346ca39477021fd83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package provides a Mali kernel driver for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing this driver. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline-driver into sunxi-mali-utgard-driver. Add a legacy entry. Signed-off-by: Miquel Raynal Signed-off-by: Giulio Benetti [Giulio: rebase on master. Add legacy entry instead of substituting the blob's one] Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 12 +++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 2 +- configs/olimex_a20_olinuxino_lime_defconfig | 2 +- package/Config.in | 2 +- .../sunxi-mali-mainline-driver.mk | 41 ---------------------- .../Config.in | 16 ++++----- .../sunxi-mali-utgard-driver.hash} | 2 +- .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++++++++ 9 files changed, 66 insertions(+), 54 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ad5c43fb62..141d43a479 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER + bool "sunxi-mali-mainline-driver package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + help + Since the removal of the sunxi-mali-driver package, the + sunxi-mali-mainline-driver package that coexisted became the + only package to provide the Sunxi Mali driver. The "-mainline" + suffix being undescriptive nowadays and before adding new + packages bringing Mali support for other SoCs/GPU flavors, it + is clearer to rename it SUNXI_MALI_UTGARD_DRIVER. + config BR2_PACKAGE_SUNXI_MALI_MAINLINE bool "sunxi-mali-mainline package was renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index fcc94a5cd8..3d5c01f795 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1082,8 +1082,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline-driver/ F: package/sunxi-mali-utgard/ +F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 319ac48c58..64a66de5c8 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 4cec5689ca..17da786a8c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/package/Config.in b/package/Config.in index a45a652c87..e9ee4d2ef1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -571,8 +571,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline-driver/Config.in" source "package/sunxi-mali-utgard/Config.in" + source "package/sunxi-mali-utgard-driver/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk deleted file mode 100644 index 6782ca7fc2..0000000000 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline-driver -# -################################################################################ - -SUNXI_MALI_MAINLINE_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 -SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) -SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux -SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 -SUNXI_MALI_MAINLINE_DRIVER_LICENSE_FILES = LICENSE - -SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ - $(LINUX_MAKE_FLAGS) \ - KDIR=$(LINUX_DIR) - -define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches - $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ - $(@D)/build.sh -endef - -SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - -define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b -endef - -define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i -endef - -define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) -endef - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-utgard-driver/Config.in similarity index 67% rename from package/sunxi-mali-mainline-driver/Config.in rename to package/sunxi-mali-utgard-driver/Config.in index 236470db53..244283f44d 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-utgard-driver/Config.in @@ -1,22 +1,22 @@ -comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" +comment "sunxi-mali-utgard-driver needs a Linux kernel to be built" depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER - bool "sunxi-mali-mainline-driver" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + bool "sunxi-mali-utgard-driver" default y depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help This package builds and installs the Linux kernel driver for - the Mali GPU on Allwinner platforms, compatible with recent - Linux kernels (>= 4.4). Note that it should be installed - together with the corresponding userspace OpenGL libraries, - which are provided as binaries only at: + the Mali Utgard GPU on Allwinner platforms, compatible with + recent Linux kernels (>= 4.4). Note that it should be + installed together with the corresponding userspace OpenGL + libraries, which are provided as binaries only at: https://github.com/bootlin/mali-blobs - sunxi-mali-mainline-driver requires a Linux kernel >= 4.4 + sunxi-mali-utgard-driver requires a Linux kernel >= 4.4 with the following options enabled: - CONFIG_CMA diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash similarity index 66% rename from package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash rename to package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index f08e80f114..4b276fecb7 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-mainline-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz +sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-utgard-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk new file mode 100644 index 0000000000..5f9090f492 --- /dev/null +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# sunxi-mali-utgard-driver +# +################################################################################ + +SUNXI_MALI_UTGARD_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 +SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) +SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux +SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 +SUNXI_MALI_UTGARD_DRIVER_LICENSE_FILES = LICENSE + +SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \ + $(LINUX_MAKE_FLAGS) \ + KDIR=$(LINUX_DIR) + +define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches + $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ + $(@D)/build.sh +endef + +SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + +define SUNXI_MALI_UTGARD_DRIVER_BUILD_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b +endef + +define SUNXI_MALI_UTGARD_DRIVER_INSTALL_TARGET_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i +endef + +define SUNXI_MALI_UTGARD_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) +endef + +$(eval $(generic-package)) From arnout at mind.be Thu Jan 6 18:01:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 19:01:51 +0100 Subject: [Buildroot] [git commit] package/sunxi-mali-utgard: rename from sunxi-mali-mainline Message-ID: <20220106175627.26246832B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a7a652b143dfe8003c65e41ccb6914472023ee0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package provides Mali libraries for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing these libraries. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline into sunxi-mali-utgard. Add a legacy entry. Signed-off-by: Miquel Raynal Signed-off-by: Giulio Benetti [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in sunxi-mali-mainline-driver/Config.in to respect bisectability] Tested-by: Luca Ceresoli [Build tested only] Reviewed-by: Luca Ceresoli [Arnout: also update existing select in Config.in.legacy] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 32 +++++++++++++- DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 4 +- configs/olimex_a20_olinuxino_lime_defconfig | 4 +- docs/manual/adding-packages-virtual.txt | 2 +- package/Config.in | 2 +- package/glslsandbox-player/Config.in | 4 +- package/glslsandbox-player/glslsandbox-player.mk | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/sunxi-mali-mainline-driver/Config.in | 4 +- .../sunxi-mali-mainline-driver.mk | 6 +-- package/sunxi-mali-mainline/Config.in | 42 ------------------- package/sunxi-mali-mainline/sunxi-mali-mainline.mk | 49 ---------------------- package/sunxi-mali-utgard/Config.in | 43 +++++++++++++++++++ .../egl.pc | 0 .../glesv2.pc | 0 .../sunxi-mali-utgard.hash} | 2 +- package/sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 ++++++++++++++++++++++ 18 files changed, 140 insertions(+), 109 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 004506e4bb..ad5c43fb62 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,36 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_SUNXI_MALI_MAINLINE + bool "sunxi-mali-mainline package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD + help + Since the removal of the sunxi-mali package, the + sunxi-mali-mainline package that coexisted became the only + package to provide Mali blobs. The "-mainline" suffix being + undescriptive nowadays and before adding new packages bringing + Mali support for other SoCs/GPU flavors, it is clearer to + rename it SUNXI_MALI_UTGARD. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + bool "sunxi-mali-mainline-r6p2 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 + bool "sunxi-mali-mainline-r8p1 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" select BR2_LEGACY @@ -1451,7 +1481,7 @@ config BR2_PACKAGE_LIBUMP config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali package removed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_MAINLINE + select BR2_PACKAGE_SUNXI_MALI_UTGARD help The sunxi-mali package was removed, as the sunxi-mali-mainline package replaces it for mainline diff --git a/DEVELOPERS b/DEVELOPERS index 03918e4205..fcc94a5cd8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1082,8 +1082,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/sunxi-mali-utgard/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index ed279326bc..319ac48c58 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index cd88a2d19a..4cec5689ca 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/docs/manual/adding-packages-virtual.txt b/docs/manual/adding-packages-virtual.txt index 6326bb5455..722e6e3771 100644 --- a/docs/manual/adding-packages-virtual.txt +++ b/docs/manual/adding-packages-virtual.txt @@ -13,7 +13,7 @@ the provider used in the rootfs. For example, 'OpenGL ES' is an API for 2D and 3D graphics on embedded systems. The implementation of this API is different for the 'Allwinner Tech Sunxi' and the 'Texas Instruments OMAP35xx' platforms. So +libgles+ will be a virtual -package and +sunxi-mali+ and +ti-gfx+ will be the providers. +package and +sunxi-mali-utgard+ and +ti-gfx+ will be the providers. ==== +virtual-package+ tutorial diff --git a/package/Config.in b/package/Config.in index 3c7340e27c..a45a652c87 100644 --- a/package/Config.in +++ b/package/Config.in @@ -571,8 +571,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline/Config.in" source "package/sunxi-mali-mainline-driver/Config.in" + source "package/sunxi-mali-utgard/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 02d4c442ed..2d15a7e270 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -55,7 +55,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS choice prompt "Native windowing system" - default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_MAINLINE + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_UTGARD default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X if BR2_PACKAGE_MALI_T76X default BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI if BR2_PACKAGE_RPI_USERLAND default BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2 if BR2_PACKAGE_SDL2_OPENGLES @@ -73,7 +73,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI bool "Allwinner ARM/Mali Frame Buffer" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X bool "ARM/Mali T76x Frame Buffer" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index 1578608a42..c5fbf062b7 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) -GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-mainline +GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=mali else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += mali-t76x diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ba2971dc08..ec5264bfc9 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -271,7 +271,7 @@ endif ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv -else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +else ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in index 90bc308bc5..236470db53 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-mainline-driver/Config.in @@ -1,11 +1,11 @@ comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER bool "sunxi-mali-mainline-driver" default y - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE # runtime + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index feffaa7ae6..6782ca7fc2 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -15,7 +15,7 @@ SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ KDIR=$(LINUX_DIR) define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ $(@D)/build.sh endef @@ -24,12 +24,12 @@ SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_AP define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -b + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b endef define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i endef define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in deleted file mode 100644 index a2fb95bd79..0000000000 --- a/package/sunxi-mali-mainline/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI_MAINLINE - bool "sunxi-mali-mainline" - depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - help - Install userspace Allwinner OpenGL libraries. - - https://github.com/bootlin/mali-blobs - -if BR2_PACKAGE_SUNXI_MALI_MAINLINE - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali-mainline" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali-mainline" - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - help - Select the version of the userspace module. - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - bool "r6p2" -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - bool "r8p1" - -endchoice - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION - string - default "r6p2" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - default "r8p1" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - -endif - -comment "sunxi-mali needs an EABIhf glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk deleted file mode 100644 index b46f572311..0000000000 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline -# -################################################################################ - -SUNXI_MALI_MAINLINE_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d -SUNXI_MALI_MAINLINE_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION)) -SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES -SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles -SUNXI_MALI_MAINLINE_LICENSE = Allwinner End User Licence Agreement -SUNXI_MALI_MAINLINE_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf -SUNXI_MALI_MAINLINE_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf -SUNXI_MALI_MAINLINE_LICENSE_FILES = $(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) - -SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION)) - -ifeq ($(BR2_arm),y) -SUNXI_MALI_MAINLINE_ARCH=arm -else ifeq ($(BR2_aarch64),y) -SUNXI_MALI_MAINLINE_ARCH=arm64 -endif - -define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(STAGING_DIR)/usr/lib/ - cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ - - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(TARGET_DIR)/usr/lib/ -endef - -define SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - mv $(@D)/$(SUNXI_MALI_MAINLINE_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) -endef - -SUNXI_MALI_MAINLINE_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in new file mode 100644 index 0000000000..ff49ea03f1 --- /dev/null +++ b/package/sunxi-mali-utgard/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_SUNXI_MALI_UTGARD + bool "sunxi-mali-utgard" + depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + help + Install userspace Allwinner OpenGL libraries for Mali + Utgard GPUs. + + https://github.com/bootlin/mali-blobs + +if BR2_PACKAGE_SUNXI_MALI_UTGARD + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "sunxi-mali-utgard" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "sunxi-mali-utgard" + +choice + prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + Select the version of the userspace module. + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + bool "r6p2" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + bool "r8p1" + +endchoice + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION + string + default "r6p2" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + default "r8p1" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + +endif + +comment "sunxi-mali-utgard needs an EABIhf glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/egl.pc b/package/sunxi-mali-utgard/egl.pc similarity index 100% rename from package/sunxi-mali-mainline/egl.pc rename to package/sunxi-mali-utgard/egl.pc diff --git a/package/sunxi-mali-mainline/glesv2.pc b/package/sunxi-mali-utgard/glesv2.pc similarity index 100% rename from package/sunxi-mali-mainline/glesv2.pc rename to package/sunxi-mali-utgard/glesv2.pc diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash similarity index 70% rename from package/sunxi-mali-mainline/sunxi-mali-mainline.hash rename to package/sunxi-mali-utgard/sunxi-mali-utgard.hash index 96d8251f16..c86b927ea5 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-mainline-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz +sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-utgard-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf diff --git a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk new file mode 100644 index 0000000000..f693667955 --- /dev/null +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# sunxi-mali-utgard +# +################################################################################ + +SUNXI_MALI_UTGARD_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d +SUNXI_MALI_UTGARD_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_UTGARD_VERSION)) +SUNXI_MALI_UTGARD_INSTALL_STAGING = YES +SUNXI_MALI_UTGARD_PROVIDES = libegl libgles +SUNXI_MALI_UTGARD_LICENSE = Allwinner End User Licence Agreement +SUNXI_MALI_UTGARD_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf +SUNXI_MALI_UTGARD_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf +SUNXI_MALI_UTGARD_LICENSE_FILES = $(SUNXI_MALI_UTGARD_EULA_NO_SPACES) + +SUNXI_MALI_UTGARD_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION)) + +ifeq ($(BR2_arm),y) +SUNXI_MALI_UTGARD_ARCH=arm +else ifeq ($(BR2_aarch64),y) +SUNXI_MALI_UTGARD_ARCH=arm64 +endif + +define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include + + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(STAGING_DIR)/usr/lib/ + cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ + + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/egl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/glesv2.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef + +define SUNXI_MALI_UTGARD_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(TARGET_DIR)/usr/lib/ +endef + +define SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + mv $(@D)/$(SUNXI_MALI_UTGARD_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_UTGARD_EULA_NO_SPACES) +endef + +SUNXI_MALI_UTGARD_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + +$(eval $(generic-package)) From arnout at mind.be Thu Jan 6 18:03:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 19:03:16 +0100 Subject: [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading In-Reply-To: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> Message-ID: <5a11f784-6685-f33a-002d-654253e9bb61@mind.be> On 05/11/2021 23:17, Giulio Benetti wrote: > With this patchset I respin the first 2 patches. While testing on hardware > the patches they work, but I've left back an error while bumping linux > version to 5.14. The error is that Linux's sunxi_defconfig(used by both > a20_olinuxino_lime/2) enables Lima driver, but in this 2 boards we want > to use Mali driver, so when Mali driver tries to load(being it a module), > it finds that Lima already has taken gpu resources and fail. So here I add > 3 patches, 1 to add a Linux fragment to disable Lima in Linux and other 2 > to use that fragment in a20_olinuxino_lime/2. > > Giulio Benetti (3): > board/olimex/a20_olinuxino: add linux-disable-lima.fragment > configs/olimex_a20_olinuxino_lime2_defconfig: use > linux-disable-lima.fragment > configs/olimex_a20_olinuxino_lime_defconfig: use > linux-disable-lima.fragment > > Miquel Raynal (2): > package/sunxi-mali-utgard: rename from sunxi-mali-mainline > package/sunxi-mali-utgard-driver: rename from > sunxi-mali-mainline-driver I applied these two patches to master. Luca, your review was very much appreciated so if you could maybe review the rest of this series as well? :-) Regards, Arnout > > Config.in.legacy | 42 ++++++++++++++++ > DEVELOPERS | 4 +- > .../a20_olinuxino/linux-disable-lima.fragment | 2 + > configs/olimex_a20_olinuxino_lime2_defconfig | 7 +-- > configs/olimex_a20_olinuxino_lime_defconfig | 7 +-- > docs/manual/adding-packages-virtual.txt | 2 +- > package/Config.in | 4 +- > package/glslsandbox-player/Config.in | 4 +- > .../glslsandbox-player/glslsandbox-player.mk | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > .../sunxi-mali-mainline-driver.mk | 41 ---------------- > package/sunxi-mali-mainline/Config.in | 42 ---------------- > .../sunxi-mali-mainline.mk | 49 ------------------- > .../Config.in | 20 ++++---- > .../sunxi-mali-utgard-driver.hash} | 2 +- > .../sunxi-mali-utgard-driver.mk | 41 ++++++++++++++++ > package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ > .../egl.pc | 0 > .../glesv2.pc | 0 > .../sunxi-mali-utgard.hash} | 2 +- > .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ > 21 files changed, 206 insertions(+), 159 deletions(-) > create mode 100644 board/olimex/a20_olinuxino/linux-disable-lima.fragment > delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk > delete mode 100644 package/sunxi-mali-mainline/Config.in > delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk > rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (60%) > rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) > create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk > create mode 100644 package/sunxi-mali-utgard/Config.in > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) > rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) > rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) > create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk > From james.hilliard1 at gmail.com Thu Jan 6 18:51:59 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 12:51:59 -0600 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: <20220106185923.0cb1bb9c@windsurf> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> Message-ID: On Thu, Jan 6, 2022 at 11:59 AM Thomas Petazzoni wrote: > > On Wed, 5 Jan 2022 23:24:04 -0700 > James Hilliard wrote: > > > _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may > > not need to be selected in kconfig in cases where building is not > > desired, so only check that _FINAL_DEPENDENCIES are selected. > > Could you expand the commit log with some specific details of which > packages/dependencies are causing issues? I haven't followed the > problem and it's not obvious to me what this patch is fixing. It's needed for this series: https://patchwork.ozlabs.org/project/buildroot/list/?series=279567 > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From aduskett at gmail.com Thu Jan 6 18:54:33 2022 From: aduskett at gmail.com (Adam Duskett) Date: Thu, 6 Jan 2022 10:54:33 -0800 Subject: [Buildroot] [PATCH v2 4/4] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-4-james.hilliard1@gmail.com> Message-ID: All; Ignore my previous email. I didn't realize I was responding to a v2. This builds correctly! On Thu, Jan 6, 2022 at 9:33 AM Adam Duskett wrote: > > Hello! > > Thanks again for your help in getting rid of the scourge that is Python2! > A few issues with this patch series: > > - Qt5base is the package that installs syncqt.pl. This results in an > immediate failure > at the begging of the build: > /bin/bash: /output/host/bin/syncqt.pl: No such file or directory > > A simple solution would be to have a post_extract_hook to install the script: > define QT5BASE_INSTALL_SYNCQT > $(INSTALL) -m 0775 -D $(@D)/bin/syncqt.pl $(HOST_DIR)/bin/syncqt.pl > endef > QT5BASE_POST_EXTRACT_HOOKS += QT5BASE_INSTALL_SYNCQT > > After that, I get a lot of: > "fatal error: private/qiodevice_p.h: No such file or directory" errors > when compiling. > > The environment is a ubuntu 20.04 docker environment with the bare > minimum requirements > installed to compile buildroot. You can find the Dockerfile here: > https://github.com/aduskett/buildroot-docker-devel/blob/master/Ubuntu/20.04/ > > Thanks! > Adam > > On Wed, Jan 5, 2022 at 10:24 PM James Hilliard > wrote: > > > > This points all qt5 packages to the latest kde submodule versions > > available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > > > We need to remove some patches applied upstream already. > > > > We need to rework qt5location to pull in the mapboxgl dependency from > > a separate package as that dependency is only included in release > > archives. > > > > We need to pin qt5 packages not available in the new upstream to the > > previous 5.15.2 version. > > > > We need to set SYNC_QT_HEADERS for all qt5 packages in the new > > upstream as headers are only copied in release archives which are > > not provided in the kde upstream. > > > > Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which > > should be the closest release to the kde patches that don't have > > lts tags. > > > > Create a .git file so to trigger headers sync during configure. > > > > Signed-off-by: James Hilliard > > --- > > Changes v1 -> v2: > > - fix headers sync and update MODULE_VERSION > > --- > > package/pkg-qmake.mk | 4 +- > > package/qt5/qt53d/qt53d.hash | 4 +- > > package/qt5/qt53d/qt53d.mk | 7 ++- > > ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- > > .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- > > .../0008-Add-missing-limits-include.patch | 32 ---------- > > .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- > > package/qt5/qt5base/qt5base.hash | 4 +- > > package/qt5/qt5base/qt5base.mk | 7 ++- > > package/qt5/qt5charts/qt5charts.hash | 4 +- > > package/qt5/qt5charts/qt5charts.mk | 7 ++- > > package/qt5/qt5coap/qt5coap.mk | 2 +- > > .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- > > .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- > > ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- > > .../qt5/qt5declarative/qt5declarative.hash | 4 +- > > package/qt5/qt5declarative/qt5declarative.mk | 7 ++- > > .../qt5graphicaleffects.hash | 4 +- > > .../qt5graphicaleffects.mk | 7 ++- > > .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- > > .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- > > package/qt5/qt5knx/qt5knx.mk | 2 +- > > ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- > > .../qt5location-mapboxgl.hash | 16 +++++ > > .../qt5location-mapboxgl.mk | 13 ++++ > > ...ix-compilation-for-no-opengl-builds.patch} | 0 > > package/qt5/qt5location/qt5location.hash | 4 +- > > package/qt5/qt5location/qt5location.mk | 14 ++++- > > package/qt5/qt5lottie/qt5lottie.hash | 4 +- > > package/qt5/qt5lottie/qt5lottie.mk | 7 ++- > > package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- > > package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- > > package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- > > package/qt5/qt5opcua/qt5opcua.mk | 2 +- > > .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- > > .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- > > .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- > > .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- > > .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- > > .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- > > .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- > > .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- > > package/qt5/qt5script/qt5script.hash | 4 +- > > package/qt5/qt5script/qt5script.mk | 7 ++- > > package/qt5/qt5scxml/qt5scxml.hash | 4 +- > > package/qt5/qt5scxml/qt5scxml.mk | 7 ++- > > package/qt5/qt5sensors/qt5sensors.hash | 4 +- > > package/qt5/qt5sensors/qt5sensors.mk | 7 ++- > > package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- > > package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- > > package/qt5/qt5serialport/qt5serialport.hash | 4 +- > > package/qt5/qt5serialport/qt5serialport.mk | 7 ++- > > package/qt5/qt5svg/qt5svg.hash | 4 +- > > package/qt5/qt5svg/qt5svg.mk | 7 ++- > > package/qt5/qt5tools/qt5tools.hash | 4 +- > > package/qt5/qt5tools/qt5tools.mk | 7 ++- > > .../qt5virtualkeyboard.hash | 4 +- > > .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- > > package/qt5/qt5wayland/qt5wayland.hash | 4 +- > > package/qt5/qt5wayland/qt5wayland.mk | 7 ++- > > package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- > > package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- > > .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- > > package/qt5/qt5websockets/qt5websockets.hash | 4 +- > > package/qt5/qt5websockets/qt5websockets.mk | 7 ++- > > package/qt5/qt5webview/qt5webview.hash | 4 +- > > package/qt5/qt5webview/qt5webview.mk | 7 ++- > > package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- > > package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- > > .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- > > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- > > 71 files changed, 216 insertions(+), 386 deletions(-) > > delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > > delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > > delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch > > delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > > delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > > rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) > > create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > > create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > > rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) > > > > diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk > > index 4dcaf6dd62..fdaddf08df 100644 > > --- a/package/pkg-qmake.mk > > +++ b/package/pkg-qmake.mk > > @@ -24,7 +24,9 @@ > > # Hook to sync Qt headers > > # > > define QT_HEADERS_SYNC_HOOK > > - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) > > + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ > > + $($(PKG)_BUILDDIR)/.qmake.conf > > + touch $($(PKG)_BUILDDIR)/.git > > endef > > > > ################################################################################ > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > > index 43b2132cc7..32d3675619 100644 > > --- a/package/qt5/qt53d/qt53d.hash > > +++ b/package/qt5/qt53d/qt53d.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 > > > > # Hashes for license files: > > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > > index f3eff9edf0..9a07d189bd 100644 > > --- a/package/qt5/qt53d/qt53d.mk > > +++ b/package/qt5/qt53d/qt53d.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT53D_VERSION = $(QT5_VERSION) > > -QT53D_SITE = $(QT5_SITE) > > -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz > > +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 > > +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > > +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > > QT53D_DEPENDENCIES = qt5declarative > > QT53D_INSTALL_STAGING = YES > > +QT53D_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_ASSIMP),y) > > QT53D_DEPENDENCIES += assimp > > diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > > deleted file mode 100644 > > index f014a160d5..0000000000 > > --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch > > +++ /dev/null > > @@ -1,53 +0,0 @@ > > -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 > > -From: Thiago Macieira > > -Date: Mon, 18 Jan 2021 07:40:54 -0800 > > -Subject: [PATCH] Fix build with GCC 11: include > > - > > -Fixes: QTBUG-90395 > > -Pick-to: 6.0 > > -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 > > -Reviewed-by: Edward Welbourne > > - > > -[Retrieved (and backported) from: > > -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] > > -Signed-off-by: Fabrice Fontaine > > ---- > > - src/corelib/global/qendian.h | 6 ++++-- > > - src/corelib/global/qfloat16.h | 1 + > > - 2 files changed, 5 insertions(+), 2 deletions(-) > > - > > -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h > > -index 99b529f17cd..c874c5e47ab 100644 > > ---- a/src/corelib/global/qendian.h > > -+++ b/src/corelib/global/qendian.h > > -@@ -1,7 +1,7 @@ > > - /**************************************************************************** > > - ** > > --** Copyright (C) 2016 The Qt Company Ltd. > > --** Copyright (C) 2016 Intel Corporation. > > -+** Copyright (C) 2021 The Qt Company Ltd. > > -+** Copyright (C) 2021 Intel Corporation. > > - ** Contact: https://www.qt.io/licensing/ > > - ** > > - ** This file is part of the QtCore module of the Qt Toolkit. > > -@@ -44,6 +44,8 @@ > > - #include > > - #include > > - > > -+#include > > -+ > > - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems > > - #include > > - #include > > -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h > > -index e9477d2ecec..a25fac28862 100644 > > ---- a/src/corelib/global/qfloat16.h > > -+++ b/src/corelib/global/qfloat16.h > > -@@ -44,6 +44,7 @@ > > - > > - #include > > - #include > > -+#include > > - #include > > - > > - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) > > diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > > deleted file mode 100644 > > index d20600c6ce..0000000000 > > --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch > > +++ /dev/null > > @@ -1,61 +0,0 @@ > > -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 > > -From: Ville Voutilainen > > -Date: Mon, 18 Jan 2021 09:58:17 +0200 > > -Subject: [PATCH] Build fixes for GCC 11 > > - > > -Task-number: QTBUG-89977 > > -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 > > -Reviewed-by: Lars Knoll > > -Reviewed-by: Thiago Macieira > > -[Retrieved (and backported) from: > > -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] > > -Signed-off-by: Maxim Kochetkov > > ---- > > - src/corelib/text/qbytearraymatcher.h | 2 ++ > > - src/corelib/tools/qsharedpointer_impl.h | 3 --- > > - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- > > - 3 files changed, 3 insertions(+), 4 deletions(-) > > - > > -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h > > -index 0eedfc1d20..f5f9bef7b8 100644 > > ---- a/src/corelib/text/qbytearraymatcher.h > > -+++ b/src/corelib/text/qbytearraymatcher.h > > -@@ -42,6 +42,8 @@ > > - > > - #include > > - > > -+#include > > -+ > > - QT_BEGIN_NAMESPACE > > - > > - > > -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h > > -index 790c187cb9..4aee98af53 100644 > > ---- a/src/corelib/tools/qsharedpointer_impl.h > > -+++ b/src/corelib/tools/qsharedpointer_impl.h > > -@@ -155,9 +155,6 @@ namespace QtSharedPointer { > > - #endif > > - inline void checkQObjectShared(...) { } > > - inline void setQObjectShared(...) { } > > -- > > -- inline void operator delete(void *ptr) { ::operator delete(ptr); } > > -- inline void operator delete(void *, void *) { } > > - }; > > - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) > > - > > -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp > > -index 9e7e1a5572..f0866a90ac 100644 > > ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp > > -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp > > -@@ -698,7 +698,7 @@ void QXcbWindow::show() > > - if (isTransient(window())) { > > - const QWindow *tp = window()->transientParent(); > > - if (tp && tp->handle()) > > -- transientXcbParent = static_cast(tp->handle())->winId(); > > -+ transientXcbParent = tp->handle()->winId(); > > - // Default to client leader if there is no transient parent, else modal dialogs can > > - // be hidden by their parents. > > - if (!transientXcbParent) > > --- > > -2.31.1 > > - > > diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch > > deleted file mode 100644 > > index e489f2e551..0000000000 > > --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch > > +++ /dev/null > > @@ -1,32 +0,0 @@ > > -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 > > -From: Nicolas Fella > > -Date: Sun, 20 Jun 2021 17:36:41 +0200 > > -Subject: [PATCH] Add missing limits include > > - > > -The code uses std::numeric_limits but is lacking the appropriate include > > - > > -Pick-to: 5.15 6.1 6.2 > > -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd > > -Reviewed-by: Giuseppe D'Angelo > > - > > -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] > > -Signed-off-by: Peter Seiderer > > ---- > > - src/corelib/tools/qoffsetstringarray_p.h | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h > > -index 4dd9e960..e26a57ff 100644 > > ---- a/src/corelib/tools/qoffsetstringarray_p.h > > -+++ b/src/corelib/tools/qoffsetstringarray_p.h > > -@@ -55,6 +55,7 @@ > > - > > - #include > > - #include > > -+#include > > - > > - QT_BEGIN_NAMESPACE > > - > > --- > > -2.32.0 > > - > > diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > > deleted file mode 100644 > > index 98c7210551..0000000000 > > --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch > > +++ /dev/null > > @@ -1,45 +0,0 @@ > > -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 > > -From: Fabrice Fontaine > > -Date: Fri, 27 Aug 2021 16:28:32 +0200 > > -Subject: Fix build on riscv32 > > - > > -riscv32 fails to build because __NR_futex is not defined on this > > -architecture: > > - > > -In file included from thread/qmutex_linux.cpp:45, > > - from thread/qmutex.cpp:804: > > -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': > > -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? > > - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); > > - | ^~~~~~~~~~ > > - | _q_futex > > - > > -Pick-to: 6.1 6.2 > > -Fixes: QTBUG-96067 > > -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 > > -Reviewed-by: Thiago Macieira > > -[Retrieved from: > > -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] > > ---- > > - src/corelib/thread/qfutex_p.h | 5 +++++ > > - 1 file changed, 5 insertions(+) > > - > > -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h > > -index 40482b6fc1..037207a5c0 100644 > > ---- a/src/corelib/thread/qfutex_p.h > > -+++ b/src/corelib/thread/qfutex_p.h > > -@@ -103,6 +103,11 @@ QT_END_NAMESPACE > > - // if not defined in linux/futex.h > > - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 > > - > > -+// RISC-V does not supply __NR_futex > > -+# ifndef __NR_futex > > -+# define __NR_futex __NR_futex_time64 > > -+# endif > > -+ > > - QT_BEGIN_NAMESPACE > > - namespace QtLinuxFutex { > > - constexpr inline bool futexAvailable() { return true; } > > --- > > -cgit v1.2.1 > > - > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > > index a824890e3c..d10847ea04 100644 > > --- a/package/qt5/qt5base/qt5base.hash > > +++ b/package/qt5/qt5base/qt5base.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index ba2971dc08..294542fabb 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5BASE_VERSION = $(QT5_VERSION) > > -QT5BASE_SITE = $(QT5_SITE) > > -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz > > +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a > > +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > > +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > > > QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib > > QT5BASE_INSTALL_STAGING = YES > > +QT5BASE_SYNC_QT_HEADERS = YES > > > > # A few comments: > > # * -no-pch to workaround the issue described at > > diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash > > index b52be714b7..021d4ea19f 100644 > > --- a/package/qt5/qt5charts/qt5charts.hash > > +++ b/package/qt5/qt5charts/qt5charts.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk > > index 2c40ac1c89..24e635b93b 100644 > > --- a/package/qt5/qt5charts/qt5charts.mk > > +++ b/package/qt5/qt5charts/qt5charts.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5CHARTS_VERSION = $(QT5_VERSION) > > -QT5CHARTS_SITE = $(QT5_SITE) > > -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz > > +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 > > +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) > > +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 > > QT5CHARTS_INSTALL_STAGING = YES > > +QT5CHARTS_SYNC_QT_HEADERS = YES > > > > QT5CHARTS_LICENSE = GPL-3.0 > > QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 > > diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk > > index 24de869120..a50f19d7f2 100644 > > --- a/package/qt5/qt5coap/qt5coap.mk > > +++ b/package/qt5/qt5coap/qt5coap.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -QT5COAP_VERSION = $(QT5_VERSION) > > +QT5COAP_VERSION = 5.15.2 > > QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git > > QT5COAP_SITE_METHOD = git > > QT5COAP_INSTALL_STAGING = YES > > diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash > > index 3edc2d666a..12e9d637b2 100644 > > --- a/package/qt5/qt5connectivity/qt5connectivity.hash > > +++ b/package/qt5/qt5connectivity/qt5connectivity.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk > > index 6402b505bf..a4c79be10b 100644 > > --- a/package/qt5/qt5connectivity/qt5connectivity.mk > > +++ b/package/qt5/qt5connectivity/qt5connectivity.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) > > -QT5CONNECTIVITY_SITE = $(QT5_SITE) > > -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz > > +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 > > +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) > > +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 > > QT5CONNECTIVITY_INSTALL_STAGING = YES > > +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES > > > > QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > > deleted file mode 100644 > > index 0e6da652f9..0000000000 > > --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch > > +++ /dev/null > > @@ -1,45 +0,0 @@ > > -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 > > -From: Peter Seiderer > > -Date: Thu, 22 Jul 2021 23:13:43 +0200 > > -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 > > - compile) > > -MIME-Version: 1.0 > > -Content-Type: text/plain; charset=UTF-8 > > -Content-Transfer-Encoding: 8bit > > - > > -Fixes: > > - > > - In file included from qqmlprofilertypedevent_p.h:43, > > - from qqmlprofilertypedevent.cpp:40: > > - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: > > - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? > > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > > - | ^~~~~~~~~~~~~~ > > - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token > > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > > - | ^ > > - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? > > - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); > > - | ^~~ > > - | std::max > > - > > -Signed-off-by: Peter Seiderer > > ---- > > - src/qmldebug/qqmlprofilerevent_p.h | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h > > -index a7e37d1964..01b2f58f16 100644 > > ---- a/src/qmldebug/qqmlprofilerevent_p.h > > -+++ b/src/qmldebug/qqmlprofilerevent_p.h > > -@@ -48,6 +48,7 @@ > > - #include > > - > > - #include > > -+#include > > - #include > > - > > - // > > --- > > -2.32.0 > > - > > diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash > > index ab83b71814..f9dc08a6e0 100644 > > --- a/package/qt5/qt5declarative/qt5declarative.hash > > +++ b/package/qt5/qt5declarative/qt5declarative.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > > index 3318cd24c8..036baed444 100644 > > --- a/package/qt5/qt5declarative/qt5declarative.mk > > +++ b/package/qt5/qt5declarative/qt5declarative.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5DECLARATIVE_VERSION = $(QT5_VERSION) > > -QT5DECLARATIVE_SITE = $(QT5_SITE) > > -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz > > +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 > > +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) > > +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 > > QT5DECLARATIVE_INSTALL_STAGING = YES > > +QT5DECLARATIVE_SYNC_QT_HEADERS = YES > > > > QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > > index 9d7a837b8b..e755f0848b 100644 > > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > > index a9ddff454e..542eb4de90 100644 > > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) > > -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) > > -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz > > +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e > > +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) > > +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 > > QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative > > QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES > > +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES > > > > QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash > > index b4281e712d..49690de3bb 100644 > > --- a/package/qt5/qt5imageformats/qt5imageformats.hash > > +++ b/package/qt5/qt5imageformats/qt5imageformats.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 > > > > # Hashes for license files: > > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > > diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk > > index ffb094d566..506cd123a8 100644 > > --- a/package/qt5/qt5imageformats/qt5imageformats.mk > > +++ b/package/qt5/qt5imageformats/qt5imageformats.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) > > -QT5IMAGEFORMATS_SITE = $(QT5_SITE) > > -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz > > +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f > > +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) > > +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 > > QT5IMAGEFORMATS_INSTALL_STAGING = YES > > +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES > > > > QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL > > diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk > > index 9fc121111c..412e31c652 100644 > > --- a/package/qt5/qt5knx/qt5knx.mk > > +++ b/package/qt5/qt5knx/qt5knx.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -QT5KNX_VERSION = $(QT5_VERSION) > > +QT5KNX_VERSION = 5.15.2 > > QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git > > QT5KNX_SITE_METHOD = git > > QT5KNX_INSTALL_STAGING = YES > > diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > similarity index 81% > > rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > index 0894af9ce5..0f56a488e3 100644 > > --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch > > @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer > > [yann.morin.1998 at free.fr: add uClibc] > > Signed-off-by: Yann E. MORIN > > --- > > - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- > > + platform/default/thread.cpp | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > > +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp > > index c7c79b4..3f135eb 100644 > > ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > > -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp > > +--- a/platform/default/thread.cpp > > ++++ b/platform/default/thread.cpp > > @@ -11,8 +11,9 @@ namespace platform { > > > > std::string getCurrentThreadName() { > > diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > > new file mode 100644 > > index 0000000000..e44081c465 > > --- /dev/null > > +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash > > @@ -0,0 +1,16 @@ > > +# Locally calculated > > +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 > > + > > +# Hashes for license files: > > +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md > > +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt > > +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt > > +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt > > +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt > > +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt > > +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt > > +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt > > +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt > > +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt > > +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt > > +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt > > diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > > new file mode 100644 > > index 0000000000..58e167e483 > > --- /dev/null > > +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk > > @@ -0,0 +1,13 @@ > > +################################################################################ > > +# > > +# qt5location-mapboxgl > > +# > > +################################################################################ > > + > > +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d > > +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) > > +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 > > +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib > > +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt > > + > > +$(eval $(generic-package)) > > diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch > > similarity index 100% > > rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch > > rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch > > diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash > > index 0bb293305c..52649897b1 100644 > > --- a/package/qt5/qt5location/qt5location.hash > > +++ b/package/qt5/qt5location/qt5location.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk > > index ea741d0df6..98af8b233b 100644 > > --- a/package/qt5/qt5location/qt5location.mk > > +++ b/package/qt5/qt5location/qt5location.mk > > @@ -4,10 +4,12 @@ > > # > > ################################################################################ > > > > -QT5LOCATION_VERSION = $(QT5_VERSION) > > -QT5LOCATION_SITE = $(QT5_SITE) > > -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz > > +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f > > +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) > > +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 > > +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl > > QT5LOCATION_INSTALL_STAGING = YES > > +QT5LOCATION_SYNC_QT_HEADERS = YES > > > > QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5LOCATION_DEPENDENCIES += qt5declarative > > endif > > > > +define QT5LOCATION_COPY_MAPBOXGL > > + rm -rf $(@D)/src/3rdparty/mapbox-gl-native > > + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native > > +endef > > +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL > > + > > $(eval $(qmake-package)) > > diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash > > index 740f9072f2..46ab3f60df 100644 > > --- a/package/qt5/qt5lottie/qt5lottie.hash > > +++ b/package/qt5/qt5lottie/qt5lottie.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk > > index 1423a629b9..e9614fbecf 100644 > > --- a/package/qt5/qt5lottie/qt5lottie.mk > > +++ b/package/qt5/qt5lottie/qt5lottie.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5LOTTIE_VERSION = $(QT5_VERSION) > > -QT5LOTTIE_SITE = $(QT5_SITE) > > -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz > > +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 > > +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) > > +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 > > QT5LOTTIE_DEPENDENCIES = qt5declarative > > QT5LOTTIE_INSTALL_STAGING = YES > > +QT5LOTTIE_SYNC_QT_HEADERS = YES > > > > QT5LOTTIE_LICENSE = GPL-3.0 > > QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT > > diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk > > index 54cc1de632..0b62cf1bed 100644 > > --- a/package/qt5/qt5mqtt/qt5mqtt.mk > > +++ b/package/qt5/qt5mqtt/qt5mqtt.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -QT5MQTT_VERSION = $(QT5_VERSION) > > +QT5MQTT_VERSION = 5.15.2 > > QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git > > QT5MQTT_SITE_METHOD = git > > QT5MQTT_INSTALL_STAGING = YES > > diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash > > index b70a4ecf51..1c4d930248 100644 > > --- a/package/qt5/qt5multimedia/qt5multimedia.hash > > +++ b/package/qt5/qt5multimedia/qt5multimedia.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > > index 39eddc3afc..6695369063 100644 > > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) > > -QT5MULTIMEDIA_SITE = $(QT5_SITE) > > -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz > > +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 > > +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) > > +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 > > QT5MULTIMEDIA_INSTALL_STAGING = YES > > +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES > > > > QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk > > index a58c4c5e14..ef51abddf8 100644 > > --- a/package/qt5/qt5opcua/qt5opcua.mk > > +++ b/package/qt5/qt5opcua/qt5opcua.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -QT5OPCUA_VERSION = $(QT5_VERSION) > > +QT5OPCUA_VERSION = 5.15.2 > > QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git > > QT5OPCUA_SITE_METHOD = git > > QT5OPCUA_INSTALL_STAGING = YES > > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > > index 1fa0d6430a..2138b3e313 100644 > > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > > index 1ac8689d6e..c2b5ae182e 100644 > > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) > > -QT5QUICKCONTROLS_SITE = $(QT5_SITE) > > -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz > > +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 > > +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) > > +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 > > QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative > > QT5QUICKCONTROLS_INSTALL_STAGING = YES > > +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES > > > > QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > > QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > > index f66a1186ee..8c0e02152d 100644 > > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 > > > > # Hashes for license files: > > sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 > > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > > index 2f6dcd1f2f..4bdb90b203 100644 > > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) > > -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) > > -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz > > +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 > > +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) > > +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 > > QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative > > QT5QUICKCONTROLS2_INSTALL_STAGING = YES > > +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES > > > > QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > > QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > > index ac97fc319c..c2d0b11f2b 100644 > > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > > index ef6927f928..49d0cb330b 100644 > > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) > > -QT5QUICKTIMELINE_SITE = $(QT5_SITE) > > -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz > > +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 > > +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) > > +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 > > QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative > > QT5QUICKTIMELINE_INSTALL_STAGING = YES > > +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES > > > > QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) > > QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 > > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > > index 30c5bfc51d..a2573a018a 100644 > > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > > index a6b5f0954c..b7dee4f2f3 100644 > > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > > @@ -4,13 +4,14 @@ > > # > > ################################################################################ > > > > -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) > > -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) > > -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz > > +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 > > +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) > > +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 > > QT5REMOTEOBJECTS_DEPENDENCIES = qt5base > > QT5REMOTEOBJECTS_INSTALL_STAGING = YES > > QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) > > QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 > > +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative > > diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash > > index 783598047b..0b34ff3e8f 100644 > > --- a/package/qt5/qt5script/qt5script.hash > > +++ b/package/qt5/qt5script/qt5script.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk > > index 77254fec0f..4e51eacfc3 100644 > > --- a/package/qt5/qt5script/qt5script.mk > > +++ b/package/qt5/qt5script/qt5script.mk > > @@ -4,10 +4,11 @@ > > # > > ################################################################################ > > > > -QT5SCRIPT_VERSION = $(QT5_VERSION) > > -QT5SCRIPT_SITE = $(QT5_SITE) > > -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz > > +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 > > +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) > > +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 > > QT5SCRIPT_INSTALL_STAGING = YES > > +QT5SCRIPT_SYNC_QT_HEADERS = YES > > > > # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. > > # This is linked into libQt5Script, which also contains Qt sources under > > diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash > > index 6f816548e6..85e72f5378 100644 > > --- a/package/qt5/qt5scxml/qt5scxml.hash > > +++ b/package/qt5/qt5scxml/qt5scxml.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 > > > > # Hashes for license files: > > sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT > > diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk > > index 186a2d381b..d5d26536a3 100644 > > --- a/package/qt5/qt5scxml/qt5scxml.mk > > +++ b/package/qt5/qt5scxml/qt5scxml.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5SCXML_VERSION = $(QT5_VERSION) > > -QT5SCXML_SITE = $(QT5_SITE) > > -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz > > +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 > > +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) > > +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 > > QT5SCXML_DEPENDENCIES = qt5declarative > > QT5SCXML_INSTALL_STAGING = YES > > +QT5SCXML_SYNC_QT_HEADERS = YES > > > > QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash > > index 179c9833e0..6be87e8cf9 100644 > > --- a/package/qt5/qt5sensors/qt5sensors.hash > > +++ b/package/qt5/qt5sensors/qt5sensors.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk > > index f928aad1c1..eebda912a9 100644 > > --- a/package/qt5/qt5sensors/qt5sensors.mk > > +++ b/package/qt5/qt5sensors/qt5sensors.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5SENSORS_VERSION = $(QT5_VERSION) > > -QT5SENSORS_SITE = $(QT5_SITE) > > -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz > > +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 > > +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) > > +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 > > QT5SENSORS_INSTALL_STAGING = YES > > QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5SENSORS_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5SENSORS_DEPENDENCIES += qt5declarative > > diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash > > index 4f05049b99..8b560a8a83 100644 > > --- a/package/qt5/qt5serialbus/qt5serialbus.hash > > +++ b/package/qt5/qt5serialbus/qt5serialbus.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 > > > > # Hashes for license files: > > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > > diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk > > index 412a255612..fc62c85318 100644 > > --- a/package/qt5/qt5serialbus/qt5serialbus.mk > > +++ b/package/qt5/qt5serialbus/qt5serialbus.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5SERIALBUS_VERSION = $(QT5_VERSION) > > -QT5SERIALBUS_SITE = $(QT5_SITE) > > -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz > > +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 > > +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) > > +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 > > QT5SERIALBUS_DEPENDENCIES = qt5serialport > > QT5SERIALBUS_INSTALL_STAGING = YES > > +QT5SERIALBUS_SYNC_QT_HEADERS = YES > > > > QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) > > QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > > diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash > > index 37bc8401f8..6d821c387f 100644 > > --- a/package/qt5/qt5serialport/qt5serialport.hash > > +++ b/package/qt5/qt5serialport/qt5serialport.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk > > index 902967c757..370093f6f8 100644 > > --- a/package/qt5/qt5serialport/qt5serialport.mk > > +++ b/package/qt5/qt5serialport/qt5serialport.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5SERIALPORT_VERSION = $(QT5_VERSION) > > -QT5SERIALPORT_SITE = $(QT5_SITE) > > -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz > > +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 > > +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) > > +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 > > QT5SERIALPORT_INSTALL_STAGING = YES > > QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5SERIALPORT_SYNC_QT_HEADERS = YES > > > > $(eval $(qmake-package)) > > diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash > > index 7773a940bb..abffc2891d 100644 > > --- a/package/qt5/qt5svg/qt5svg.hash > > +++ b/package/qt5/qt5svg/qt5svg.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk > > index d4b31c231e..d48a37fafe 100644 > > --- a/package/qt5/qt5svg/qt5svg.mk > > +++ b/package/qt5/qt5svg/qt5svg.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5SVG_VERSION = $(QT5_VERSION) > > -QT5SVG_SITE = $(QT5_SITE) > > -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz > > +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e > > +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) > > +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 > > QT5SVG_INSTALL_STAGING = YES > > QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > > +QT5SVG_SYNC_QT_HEADERS = YES > > > > $(eval $(qmake-package)) > > diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash > > index e52d8e6df7..a563801997 100644 > > --- a/package/qt5/qt5tools/qt5tools.hash > > +++ b/package/qt5/qt5tools/qt5tools.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk > > index 0543afd8f7..e2385080ce 100644 > > --- a/package/qt5/qt5tools/qt5tools.mk > > +++ b/package/qt5/qt5tools/qt5tools.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5TOOLS_VERSION = $(QT5_VERSION) > > -QT5TOOLS_SITE = $(QT5_SITE) > > -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz > > +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 > > +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) > > +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 > > > > QT5TOOLS_INSTALL_STAGING = YES > > +QT5TOOLS_SYNC_QT_HEADERS = YES > > > > # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), > > # but the condition is used only used to decide if lupdate will support > > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > > index 82f132378e..1e2c658109 100644 > > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 > > > > # Hashes for license files: > > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > > index 3984c9866e..db0884fd18 100644 > > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) > > -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) > > -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz > > +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 > > +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) > > +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 > > QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg > > QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES > > +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES > > > > QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 > > QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 > > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > > index b17dbdd10d..35708ec077 100644 > > --- a/package/qt5/qt5wayland/qt5wayland.hash > > +++ b/package/qt5/qt5wayland/qt5wayland.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > > index 0076bbfe73..70e5b2655e 100644 > > --- a/package/qt5/qt5wayland/qt5wayland.mk > > +++ b/package/qt5/qt5wayland/qt5wayland.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5WAYLAND_VERSION = $(QT5_VERSION) > > -QT5WAYLAND_SITE = $(QT5_SITE) > > -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz > > +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 > > +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) > > +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 > > QT5WAYLAND_DEPENDENCIES = wayland > > QT5WAYLAND_INSTALL_STAGING = YES > > +QT5WAYLAND_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) > > QT5WAYLAND_DEPENDENCIES += qt5declarative > > diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash > > index 47c7da3365..af195b32b3 100644 > > --- a/package/qt5/qt5webchannel/qt5webchannel.hash > > +++ b/package/qt5/qt5webchannel/qt5webchannel.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk > > index 176c0fd7a3..042a28fca9 100644 > > --- a/package/qt5/qt5webchannel/qt5webchannel.mk > > +++ b/package/qt5/qt5webchannel/qt5webchannel.mk > > @@ -4,13 +4,14 @@ > > # > > ################################################################################ > > > > -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) > > -QT5WEBCHANNEL_SITE = $(QT5_SITE) > > -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz > > +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 > > +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) > > +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 > > QT5WEBCHANNEL_DEPENDENCIES = qt5websockets > > QT5WEBCHANNEL_INSTALL_STAGING = YES > > QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > > QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) > > diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > > index 84bc291739..3b14284e37 100644 > > --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > > +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk > > @@ -6,7 +6,7 @@ > > > > QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 > > QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules > > -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz > > +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz > > QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit > > > > QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 > > diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash > > index 29a9ebe439..3cc87865dc 100644 > > --- a/package/qt5/qt5websockets/qt5websockets.hash > > +++ b/package/qt5/qt5websockets/qt5websockets.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk > > index a35cdc5799..d222f025ee 100644 > > --- a/package/qt5/qt5websockets/qt5websockets.mk > > +++ b/package/qt5/qt5websockets/qt5websockets.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) > > -QT5WEBSOCKETS_SITE = $(QT5_SITE) > > -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz > > +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 > > +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) > > +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 > > QT5WEBSOCKETS_INSTALL_STAGING = YES > > QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) > > QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 > > +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > > QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) > > diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash > > index c1cee9cf85..51d0fb0d7a 100644 > > --- a/package/qt5/qt5webview/qt5webview.hash > > +++ b/package/qt5/qt5webview/qt5webview.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 > > > > # Hashes for license files: > > sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL > > diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk > > index 0f37f3eb85..ed1cfe5065 100644 > > --- a/package/qt5/qt5webview/qt5webview.mk > > +++ b/package/qt5/qt5webview/qt5webview.mk > > @@ -4,13 +4,14 @@ > > # > > ################################################################################ > > > > -QT5WEBVIEW_VERSION = $(QT5_VERSION) > > -QT5WEBVIEW_SITE = $(QT5_SITE) > > -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz > > +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f > > +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) > > +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 > > QT5WEBVIEW_DEPENDENCIES = qt5webengine > > QT5WEBVIEW_INSTALL_STAGING = YES > > QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) > > QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL > > +QT5WEBVIEW_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > > QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) > > diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash > > index 08e6753f21..b854cedcb6 100644 > > --- a/package/qt5/qt5x11extras/qt5x11extras.hash > > +++ b/package/qt5/qt5x11extras/qt5x11extras.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk > > index 075d36dcd8..7b1e32df17 100644 > > --- a/package/qt5/qt5x11extras/qt5x11extras.mk > > +++ b/package/qt5/qt5x11extras/qt5x11extras.mk > > @@ -4,11 +4,12 @@ > > # > > ################################################################################ > > > > -QT5X11EXTRAS_VERSION = $(QT5_VERSION) > > -QT5X11EXTRAS_SITE = $(QT5_SITE) > > -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz > > +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f > > +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) > > +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 > > QT5X11EXTRAS_INSTALL_STAGING = YES > > QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5X11EXTRAS_SYNC_QT_HEADERS = YES > > > > $(eval $(qmake-package)) > > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > > index 682e114a7f..c0e3caa407 100644 > > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > > @@ -1,5 +1,5 @@ > > -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 > > -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz > > +# Locally calculated > > +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 > > > > # Hashes for license files: > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > > index 6845483327..27818ecb78 100644 > > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > > @@ -4,12 +4,13 @@ > > # > > ################################################################################ > > > > -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) > > -QT5XMLPATTERNS_SITE = $(QT5_SITE) > > -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz > > +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c > > +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) > > +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 > > QT5XMLPATTERNS_INSTALL_STAGING = YES > > QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > > QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL > > +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES > > > > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) > > QT5XMLPATTERNS_DEPENDENCIES += qt5declarative > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Jan 6 19:06:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 20:06:58 +0100 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> Message-ID: On 06/01/2022 19:51, James Hilliard wrote: > On Thu, Jan 6, 2022 at 11:59 AM Thomas Petazzoni > wrote: >> >> On Wed, 5 Jan 2022 23:24:04 -0700 >> James Hilliard wrote: >> >>> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may >>> not need to be selected in kconfig in cases where building is not >>> desired, so only check that _FINAL_DEPENDENCIES are selected. >> >> Could you expand the commit log with some specific details of which >> packages/dependencies are causing issues? I haven't followed the >> problem and it's not obvious to me what this patch is fixing. > > It's needed for this series: > https://patchwork.ozlabs.org/project/buildroot/list/?series=279567 Well, obviously, since it's part of that series. I think the patch is wrong though. A patch dependency is still a dependency, so the package should be selected. The problem is that you add two target packages which have no Config.in. That is simply a no go: target packages should always have a Config.in symbol. I'm going to reply with more explanation down the line though. Regards, Arnout > >> >> Thanks! >> >> Thomas >> -- >> Thomas Petazzoni, co-owner and CEO, Bootlin >> Embedded Linux and Kernel engineering and training >> https://bootlin.com > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Thu Jan 6 19:10:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 6 Jan 2022 20:10:28 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump to version 3.74 Message-ID: <20220106191028.146979-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 100d2d7870..819c272a30 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_73_1_RTM/src/SHA256SUMS -sha256 c768f9fe3129e8bcc2e9679456d7edd9453a225784a8fc7dc4501806f1fe9abe nss-3.73.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_74_RTM/src/SHA256SUMS +sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index b6279fa921..537f6dd9b6 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.73.1 +LIBNSS_VERSION = 3.74 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist -- 2.25.1 From arnout at mind.be Thu Jan 6 19:13:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 20:13:44 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220106062407.3131530-3-james.hilliard1@gmail.com> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-3-james.hilliard1@gmail.com> Message-ID: On 06/01/2022 07:24, James Hilliard wrote: > We need to switch to the kde upstream as the existing upstream no > longer updates the qt5 branch for most packages. > > We need to add a separate package for the chromium submodule so that > we can apply patches for python3 support to it and replace catapult > with a python3 compatible version. Creating a separate package that does nothing more than download something that is later copied into another package's subdirectory is not the right approach. For this, we have FOO_EXTRA_DOWNLOADS, which can be followed by a _POST_EXTRACT_HOOK to graft it in. So what I think you should do is download both chromium and catapult with QT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories in POST_EXTRACT_HOOK and untar the download over it. That would vastly simplify this patch as well... Regards, Arnout > > There are python3 patches available that apply to this version with > minor modifications(to be added in a future patch). > > We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building > from a repository archive instead of a release archive. > > We need to add some new required dependencies to qt5webengine so that > it will build. > > Signed-off-by: James Hilliard > --- > package/qt5/qt5.mk | 5 +- > .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ > .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ > .../qt5webengine-chromium.mk | 22 + > package/qt5/qt5webengine/Config.in | 2 + > package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- > package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ > package/qt5/qt5webengine/qt5webengine.mk | 30 +- > 8 files changed, 2561 insertions(+), 2012 deletions(-) > create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc > create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash > create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk > delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc [snip] From giulio.benetti at benettiengineering.com Thu Jan 6 19:14:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 6 Jan 2022 20:14:35 +0100 Subject: [Buildroot] =?utf-8?q?=5BPATCH=5D_DEVELOPERS=3A_remove_qt5webkit?= =?utf-8?q?-examples_entry_from_Ga=C3=ABl_Portay?= Message-ID: <20220106191435.147543-1-giulio.benetti@benettiengineering.com> This causes warning on ./utils/get-developers: WARNING: 'package/qt5/qt5webkit-examples/' doesn't match any file because 'package/qt5/qt5webkit-examples/' has been removed, so let's remove its entry in this file. Signed-off-by: Giulio Benetti --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3d5c01f795..630196fd54 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1021,7 +1021,6 @@ N: Ga?l Portay F: package/qt5/qt5virtualkeyboard/ F: package/qt5/qt5webengine/ F: package/qt5/qt5webkit/ -F: package/qt5/qt5webkit-examples/ N: Gao Xiang F: package/erofs-utils/ -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 6 19:14:59 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 13:14:59 -0600 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> Message-ID: On Thu, Jan 6, 2022 at 1:07 PM Arnout Vandecappelle wrote: > > > > On 06/01/2022 19:51, James Hilliard wrote: > > On Thu, Jan 6, 2022 at 11:59 AM Thomas Petazzoni > > wrote: > >> > >> On Wed, 5 Jan 2022 23:24:04 -0700 > >> James Hilliard wrote: > >> > >>> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may > >>> not need to be selected in kconfig in cases where building is not > >>> desired, so only check that _FINAL_DEPENDENCIES are selected. > >> > >> Could you expand the commit log with some specific details of which > >> packages/dependencies are causing issues? I haven't followed the > >> problem and it's not obvious to me what this patch is fixing. > > > > It's needed for this series: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=279567 > > Well, obviously, since it's part of that series. > > I think the patch is wrong though. A patch dependency is still a dependency, > so the package should be selected. Well I thought selection was to enable a package build, I thought selection was only for packages that need their build executed. > > The problem is that you add two target packages which have no Config.in. That > is simply a no go: target packages should always have a Config.in symbol. Well we don't want to actually build the package, only extract+patch it, I wasn't sure how else to do that. > > I'm going to reply with more explanation down the line though. > > Regards, > Arnout > > > > >> > >> Thanks! > >> > >> Thomas > >> -- > >> Thomas Petazzoni, co-owner and CEO, Bootlin > >> Embedded Linux and Kernel engineering and training > >> https://bootlin.com > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From romain.naour at smile.fr Thu Jan 6 19:22:35 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 20:22:35 +0100 Subject: [Buildroot] [PATCH 3/3] package/python-stegano : new package In-Reply-To: <20200905232559.53e7b9a9@windsurf.home> References: <20200901143731.2916-1-jugurtha.belkalem@smile.fr> <20200901143731.2916-4-jugurtha.belkalem@smile.fr> <20200905232559.53e7b9a9@windsurf.home> Message-ID: <424a55f7-27ea-e369-a753-1453214ef408@smile.fr> Hello Jugurtha, Thomas, Le 05/09/2020 ? 23:25, Thomas Petazzoni a ?crit?: > Hello Jugurtha, > > On Tue, 1 Sep 2020 16:37:31 +0200 > Jugurtha BELKALEM wrote: > >> Steganography is the art and science of writing hidden >> messages in such a way that no one , apart from the sender >> and intended recipient , suspects the existence of the message, >> a form of security through obscurity. >> Steganography is often used with cryptography. >> >> More about python-stegano is available at : >> https://pypi.org/project/stegano/. >> >> Stegano can be tested : >> $ python3 >>>>> from stegano import lsb >>>>> secret = lsb.hide("./image.png", "Hello World") >>>>> secret.save("./image-with-steganography.png") >> To get back text : >>>>> clear_message = lsb.reveal("./image-with-steganography") > > Not a strict requirement, but since you have a simple test case, what > about adding a runtime test in support/testing/ ? > >> diff --git a/package/python-stegano/Config.in b/package/python-stegano/Config.in >> new file mode 100644 >> index 0000000000..b0b209c5f8 >> --- /dev/null >> +++ b/package/python-stegano/Config.in >> @@ -0,0 +1,14 @@ >> +config BR2_PACKAGE_PYTHON_STEGANO >> + bool "python-stegano" >> + depends on BR2_PACKAGE_PYTHON3 >> + select BR2_PACKAGE_JPEG #runtime >> + select BR2_PACKAGE_LIBXML2 #runtime >> + select BR2_PACKAGE_OPENJPEG #runtime > > Could you give more details about the dependency on those 3 libraries? > Is it because python-pillow must be built with openjpeg support and > jpeg support? Or is it just because in your situation, you were using > jpg pictures? > > What about the libxml2 dependency? No reply since September 2020, I have marked this patch as "Changes Requested". Best regards, Romain > > Best regards, > > Thomas > From james.hilliard1 at gmail.com Thu Jan 6 19:23:33 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 13:23:33 -0600 Subject: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-3-james.hilliard1@gmail.com> Message-ID: On Thu, Jan 6, 2022 at 1:13 PM Arnout Vandecappelle wrote: > > > > On 06/01/2022 07:24, James Hilliard wrote: > > We need to switch to the kde upstream as the existing upstream no > > longer updates the qt5 branch for most packages. > > > > We need to add a separate package for the chromium submodule so that > > we can apply patches for python3 support to it and replace catapult > > with a python3 compatible version. > > Creating a separate package that does nothing more than download something > that is later copied into another package's subdirectory is not the right > approach. For this, we have FOO_EXTRA_DOWNLOADS, which can be followed by a > _POST_EXTRACT_HOOK to graft it in. > > So what I think you should do is download both chromium and catapult with > QT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories in POST_EXTRACT_HOOK > and untar the download over it. > > That would vastly simplify this patch as well... One reason for doing this approach is that the available patches for adding python3 support to the qt5chromium-webengine tree apply to that dependency rather than the parent qt5chromium. > > Regards, > Arnout > > > > > There are python3 patches available that apply to this version with > > minor modifications(to be added in a future patch). > > > > We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building > > from a repository archive instead of a release archive. > > > > We need to add some new required dependencies to qt5webengine so that > > it will build. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/qt5.mk | 5 +- > > .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ > > .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ > > .../qt5webengine-chromium.mk | 22 + > > package/qt5/qt5webengine/Config.in | 2 + > > package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- > > package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ > > package/qt5/qt5webengine/qt5webengine.mk | 30 +- > > 8 files changed, 2561 insertions(+), 2012 deletions(-) > > create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc > > create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash > > create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk > > delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc > > [snip] From yann.morin.1998 at free.fr Thu Jan 6 20:19:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 6 Jan 2022 21:19:25 +0100 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> Message-ID: <20220106201925.GP614810@scaer> James, All, On 2022-01-06 13:14 -0600, James Hilliard spake thusly: > On Thu, Jan 6, 2022 at 1:07 PM Arnout Vandecappelle wrote: > > On 06/01/2022 19:51, James Hilliard wrote: > > > On Thu, Jan 6, 2022 at 11:59 AM Thomas Petazzoni > > > wrote: > > >> On Wed, 5 Jan 2022 23:24:04 -0700 > > >> James Hilliard wrote: > > >>> _FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may > > >>> not need to be selected in kconfig in cases where building is not > > >>> desired, so only check that _FINAL_DEPENDENCIES are selected. [--SNIP--] > > I think the patch is wrong though. A patch dependency is still a dependency, > > so the package should be selected. > Well I thought selection was to enable a package build, I thought selection > was only for packages that need their build executed. No, they are needed for all target packages. > > The problem is that you add two target packages which have no Config.in. That > > is simply a no go: target packages should always have a Config.in symbol. > Well we don't want to actually build the package, only extract+patch > it, I wasn't > sure how else to do that. >From what we discussed on IRC the other day, I thought I had udnerstood that qt5webengine-chromium-catapult was a hot package, that's why I suggested it to not have a Config.in entry. However, I might have misunderstood, and it really is a target package, so it needs to have a Config.in entry, even one that does not have a prompt we already have for a few packages in that situation, that are not user-selectable but are still target packages: glibc, mesa3d-headers, bluez5_utils-headers and a few others... Most interestingly, though, is that we already have a similar situation with linux extensions: they are packages that are present only to provide files that are copied into the kernel tree, like ev3dev-linux-drivers or fbtft. So, in your case, I believe that qt5webengine-chromium-catapult.mk is basically correct, but a simple Config.in is missing: # Not user-selectable, it is only needed to be copied # into the chromium source tree. config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT bool And then you should not have any issue anymore with patch-depednencies. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Thu Jan 6 20:34:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 21:34:52 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106062407.3131530-3-james.hilliard1@gmail.com> Message-ID: <1b8ece72-bfa0-e320-df9c-4991a143d90e@mind.be> On 06/01/2022 20:23, James Hilliard wrote: > On Thu, Jan 6, 2022 at 1:13 PM Arnout Vandecappelle wrote: >> >> >> >> On 06/01/2022 07:24, James Hilliard wrote: >>> We need to switch to the kde upstream as the existing upstream no >>> longer updates the qt5 branch for most packages. >>> >>> We need to add a separate package for the chromium submodule so that >>> we can apply patches for python3 support to it and replace catapult >>> with a python3 compatible version. >> >> Creating a separate package that does nothing more than download something >> that is later copied into another package's subdirectory is not the right >> approach. For this, we have FOO_EXTRA_DOWNLOADS, which can be followed by a >> _POST_EXTRACT_HOOK to graft it in. >> >> So what I think you should do is download both chromium and catapult with >> QT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories in POST_EXTRACT_HOOK >> and untar the download over it. >> >> That would vastly simplify this patch as well... > > One reason for doing this approach is that the available patches for > adding python3 > support to the qt5chromium-webengine tree apply to that dependency rather than > the parent qt5chromium. My eyesight is getting worse because I can't see those patches :-) The only thing I see in this series is that you download and extract catapult, then download and extract chromium, then remove catapult from it and overwrite it with the catapult sources, then download and extract qt5webengine, and finally remove chromium and overwrite it with the chromium sources (including catapult). All of that can be done (and easier) with _EXTRA_DOWNLOADS and _POST_EXTRACT_HOOKS. And if there is some upstream patch to catapult that you need to apply, it's really easy to edit the patch manually. Just search/replace \b\([ab]\)/ with \1// Regards, Arnout > >> >> Regards, >> Arnout >> >>> >>> There are python3 patches available that apply to this version with >>> minor modifications(to be added in a future patch). >>> >>> We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building >>> from a repository archive instead of a release archive. >>> >>> We need to add some new required dependencies to qt5webengine so that >>> it will build. >>> >>> Signed-off-by: James Hilliard >>> --- >>> package/qt5/qt5.mk | 5 +- >>> .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ >>> .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ >>> .../qt5webengine-chromium.mk | 22 + >>> package/qt5/qt5webengine/Config.in | 2 + >>> package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- >>> package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ >>> package/qt5/qt5webengine/qt5webengine.mk | 30 +- >>> 8 files changed, 2561 insertions(+), 2012 deletions(-) >>> create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc >>> create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash >>> create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk >>> delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc >> >> [snip] From arnout at mind.be Thu Jan 6 20:38:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 21:38:34 +0100 Subject: [Buildroot] [PATCH v2 1/4] Makefile: only check _FINAL_DEPENDENCIES are selected In-Reply-To: <20220106201925.GP614810@scaer> References: <20220106062407.3131530-1-james.hilliard1@gmail.com> <20220106185923.0cb1bb9c@windsurf> <20220106201925.GP614810@scaer> Message-ID: <2f267f86-8749-8a23-e7eb-aee39e6641c9@mind.be> On 06/01/2022 21:19, Yann E. MORIN wrote: [snip] > we already have for a few packages in that situation, that are not > user-selectable but are still target packages: glibc, mesa3d-headers, > bluez5_utils-headers and a few others... Most interestingly, though, is > that we already have a similar situation with linux extensions: they are > packages that are present only to provide files that are copied into the > kernel tree, like ev3dev-linux-drivers or fbtft. Yeah, true. I find that solution ugly but for those there really is no other way. But Yann is right, I'm putting a bit too much stress on dropping those additional packages and using EXTRA_DOWNLOADS instead. I won't mention it again. Regards, Arnout > So, in your case, I believe that qt5webengine-chromium-catapult.mk is > basically correct, but a simple Config.in is missing: > > # Not user-selectable, it is only needed to be copied > # into the chromium source tree. > config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT > bool > > And then you should not have any issue anymore with patch-depednencies. > > Regards, > Yann E. MORIN. > From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:49 +0100 Subject: [Buildroot] [PATCH v3 01/11] support/download/dl-wrapper: add concept of download post-processing In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-2-thomas.petazzoni@bootlin.com> In order to support package managers such as Cargo (Rust) or Go, we want to run some custom logic after the main download, but before packing the tarball and checking the hash. To implement this, this commit introduces a concept of download post-processing: if -p is passed to the dl-wrapper, then support/download/-post-process will be called. Signed-off-by: Thomas Petazzoni --- support/download/dl-wrapper | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 3315bd410e..e6509e5671 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,7 +25,7 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:rf:u:q" OPT; do + while getopts ":c:d:D:o:n:N:H:rf:u:qp:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -37,6 +37,7 @@ main() { r) recurse="-r";; f) filename="${OPTARG}";; u) uris+=( "${OPTARG}" );; + p) post_process="${OPTARG}";; q) quiet="-q";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; @@ -135,6 +136,12 @@ main() { continue fi + if [ -n "${post_process}" ] ; then + ${OLDPWD}/support/download/${post_process}-post-process \ + -o "${tmpf}" \ + -n "${raw_base_name}" + fi + # cd back to free the temp-dir, so we can remove it later cd "${OLDPWD}" -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:48 +0100 Subject: [Buildroot] [PATCH v3 00/11] Support for Cargo and Go vendoring Message-ID: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Hello, Believe it or not, but here is a new version of my patch series adding support for Go vendoring, as well as a Cargo package infrastructure that also supports vendoring. This series builds on top of the work from Patrick Havelange who worked on the Cargo integration, but extends it to also cover the case of Go, showing that we have a solution solving both of these language-specific package managers. For the Go vendoring, I've also used the indication provided by Christian Stewart . I've also integrated some changes that Christian did in his series at: https://patchwork.ozlabs.org/project/buildroot/list/?series=266310 Overall, the solution consists in a concept of "download post-process helper" is introduced in the download infrastructure. These are shell scripts that can be invoked right after the download is done, but before the tarball is hash-checked and stored in DL_DIR. The idea is that such "download post-process helpers" can run the language-specific vendoring logic to fetch the package dependencies. Thanks to this, the tarball in DL_DIR for a given package not only contains the package source code itself, but also the source code of its Cargo or Go dependencies. The tarball hash covers the entire source code, the complete tarball is cached in DL_DIR, in the primary site and backup site, and the build can fully be done offline. Such "download post-process helpers" are registered by means of the _DOWNLOAD_POST_PROCESS variable by the appropriate package infrastructure. This new series is available at: https://github.com/tpetazzoni/buildroot/tree/pkg-vendoring A useful defconfig to test this series is: BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_DELVE=y BR2_PACKAGE_RIPGREP=y BR2_PACKAGE_GOCRYPTFS=y BR2_PACKAGE_TINIFIER=y BR2_PACKAGE_FLANNEL=y BR2_PACKAGE_BALENA_ENGINE=y BR2_PACKAGE_DOCKER_CLI=y BR2_PACKAGE_DOCKER_ENGINE=y BR2_PACKAGE_EMBIGGEN_DISK=y BR2_PACKAGE_MENDER=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_MENDER_ARTIFACT=y BR2_PACKAGE_HOST_SENTRY_CLI=y It is useful because it builds: - All currently existing packages that use the golang-package or host-golang-package infrastructures. Those existing packages did not need vendoring support. - Builds the new tinifier, embiggen-disk and gocryptfs Go packages, which need vendoring. - Builds ripgrep, which is a target Cargo package. - Builds host-entry-cli, which is a host Cargo package. Here are the main changes compared to v2 (posted December 2020): - Use of the mk_tar_gz shell function to re-create the tarball after vendoring. This allows to benefit from the reproducible magic implemented by mk_tar_gz. - post-process download helpers moved to support/download/helpers instead of having their own files. - Usage of a proper timestamp for the re-created tarballs instead of a fixed hardcoded timestamp. - Keep the creation of go.mod in golang-package, as it is needed for Go packages that are already vendored in their upstream tarball. The creation of go.mod in the Go post-process download script, used for vendoring, now uses the same method to create a minimal go.mod file. - The Cargo infra is now added in one patch, with vendoring support, instead of adding it without vendoring support and add it after the fact. - For the same reason, the Cargo infrastructure documentation now comes through a single patch. - The ripgrep changes are modified to account for the ripgrep version bump. - The tinifier package (a Go package that needs vendoring) was version bumped. - The packages embiggen-disk and gocryptfs, which were submitted by Christian, are now part of this series. - host-sentry-cli, which had been removed previously due to the lack of Cargo vendoring support, is now re-added by this series. - Small formatting and coding style improvements. Best regards, Thomas Petazzoni Christian Stewart via buildroot (2): package/embiggen-disk: new package package/gocryptfs: new package Patrick Havelange (3): package/pkg-cargo.mk: introduce the cargo package infrastructure docs/manual/cargo: document the cargo-package infrastructure package/ripgrep: convert to cargo infrastructure Thomas Petazzoni (6): support/download/dl-wrapper: add concept of download post-processing package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable support/download/post-process-helpers: add helper function for post process scripts package/pkg-golang.mk: implement Go vendoring support package/sentry-cli: re-add package package/tinifier: new package DEVELOPERS | 4 + docs/manual/adding-packages-cargo.txt | 106 ++++++------ package/Config.in | 3 + package/Config.in.host | 1 + package/Makefile.in | 1 + ...-Fix-resizing-of-dev-mmcblk0pN-paths.patch | 45 ++++++ package/embiggen-disk/Config.in | 19 +++ package/embiggen-disk/embiggen-disk.hash | 3 + package/embiggen-disk/embiggen-disk.mk | 12 ++ package/gocryptfs/Config.in | 12 ++ package/gocryptfs/gocryptfs.hash | 3 + package/gocryptfs/gocryptfs.mk | 19 +++ package/pkg-cargo.mk | 153 ++++++++++++++++++ package/pkg-download.mk | 1 + package/pkg-golang.mk | 13 +- package/ripgrep/ripgrep.hash | 2 +- package/ripgrep/ripgrep.mk | 37 +---- package/sentry-cli/Config.in.host | 10 ++ package/sentry-cli/sentry-cli.hash | 3 + package/sentry-cli/sentry-cli.mk | 14 ++ package/tinifier/Config.in | 10 ++ package/tinifier/tinifier.hash | 3 + package/tinifier/tinifier.mk | 13 ++ support/download/cargo-post-process | 38 +++++ support/download/dl-wrapper | 9 +- support/download/go-post-process | 35 ++++ support/download/helpers | 22 +++ 27 files changed, 498 insertions(+), 93 deletions(-) create mode 100644 package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch create mode 100644 package/embiggen-disk/Config.in create mode 100644 package/embiggen-disk/embiggen-disk.hash create mode 100644 package/embiggen-disk/embiggen-disk.mk create mode 100644 package/gocryptfs/Config.in create mode 100644 package/gocryptfs/gocryptfs.hash create mode 100644 package/gocryptfs/gocryptfs.mk create mode 100644 package/pkg-cargo.mk create mode 100644 package/sentry-cli/Config.in.host create mode 100644 package/sentry-cli/sentry-cli.hash create mode 100644 package/sentry-cli/sentry-cli.mk create mode 100644 package/tinifier/Config.in create mode 100644 package/tinifier/tinifier.hash create mode 100644 package/tinifier/tinifier.mk create mode 100755 support/download/cargo-post-process create mode 100755 support/download/go-post-process -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:50 +0100 Subject: [Buildroot] [PATCH v3 02/11] package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-3-thomas.petazzoni@bootlin.com> This will allow packages to register than a download post-processing is needed. Note that this variable is intentionally not documented: it is an internal variable meant to be set by package infrastructures, not directly by packages. Signed-off-by: Thomas Petazzoni --- package/pkg-download.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 2527ba5c60..66a415cce0 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -117,6 +117,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_DOWNLOAD_POST_PROCESS),-p '$($(2)_DOWNLOAD_POST_PROCESS)') \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ $(QUIET) \ -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:51 +0100 Subject: [Buildroot] [PATCH v3 03/11] support/download/post-process-helpers: add helper function for post process scripts In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-4-thomas.petazzoni@bootlin.com> download post process scripts will often need to unpack the source code tarball, do some operation, and then repack it. In order to help with this, post-process-helpers provide an unpack() function and a repack() function. Signed-off-by: Thomas Petazzoni --- support/download/helpers | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/support/download/helpers b/support/download/helpers index 40d5eea591..4c5eb466cc 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -72,5 +72,27 @@ mk_tar_gz() { popd >/dev/null } +post_process_unpack() { + local dest="${1}" + local tarball="${2}" + local one_file + + mkdir "${dest}" + tar -C "${dest}" --strip-components=1 -xf "${tarball}" + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |head -z -n1 |tr -d "\0")" + touch -r "${one_file}" "${dest}.timestamp" +} + +post_process_repack() { + local in_dir="${1}" + local base_dir="${2}" + local out="${3}" + local date + + date="@$(stat -c '%Y' "${in_dir}/${base_dir}.timestamp")" + + mk_tar_gz "${in_dir}/${base_dir}" "${base_dir}" "${date}" "${out}" +} + # Keep this line and the following as last lines in this file. # vim: ft=bash -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:53 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> From: Patrick Havelange In order to be package agnostic, the install phase is now using cargo instead of install. TARGET_CONFIGURE_OPTS is now also set when running cargo in order to support cross compiling C code within cargo. This commit also adds support/download/cargo-post-process to perform the vendoring on Cargo packages. The _LICENSE variable of cargo packages is expanded with ", vendored dependencies licenses probably not listed" as currently for all packages, the licenses of the vendored dependencies are not taken into account. Signed-off-by: Patrick Havelange [Thomas: add support for host-cargo-package and vendoring] Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 1 + package/pkg-cargo.mk | 153 ++++++++++++++++++++++++++++ support/download/cargo-post-process | 38 +++++++ 3 files changed, 192 insertions(+) create mode 100644 package/pkg-cargo.mk create mode 100755 support/download/cargo-post-process diff --git a/package/Makefile.in b/package/Makefile.in index dae7a859fd..0ca2a5844e 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -441,3 +441,4 @@ include package/pkg-waf.mk include package/pkg-golang.mk include package/pkg-meson.mk include package/pkg-qmake.mk +include package/pkg-cargo.mk diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk new file mode 100644 index 0000000000..bf1436a86b --- /dev/null +++ b/package/pkg-cargo.mk @@ -0,0 +1,153 @@ +################################################################################ +# Cargo package infrastructure +# +# This file implements an infrastructure that eases development of package +# .mk files for Cargo packages. It should be used for all packages that use +# Cargo as their build system. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this Cargo infrastructure requires the .mk file +# to only specify metadata information about the package: name, version, +# download URL, etc. +# +# We still allow the package .mk file to override what the different steps +# are doing, if needed. For example, if _BUILD_CMDS is already defined, +# it is used as the list of commands to perform to build the package, +# instead of the default Cargo behaviour. The package can also define some +# post operation hooks. +# +################################################################################ + +################################################################################ +# inner-cargo-package -- defines how the configuration, compilation and +# installation of a cargo package should be done, implements a few hooks +# to tune the build process for cargo specifities and calls the generic +# package infrastructure to generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix +# for host packages +# argument 4 is the type (target or host) +################################################################################ + +define inner-cargo-package + +# We need host-rustc to run cargo +$(2)_DOWNLOAD_DEPENDENCIES += host-rustc + +$(2)_CARGO_ENV += \ + CARGO_HOME=$$(HOST_DIR)/share/cargo \ + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_TARGET_APPLIES_TO_HOST="false" + +$(2)_DOWNLOAD_POST_PROCESS = cargo +$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo + +# Due to vendoring, it is pretty likely that not all licenses are +# listed in _LICENSE. +$(2)_LICENSE += , vendored dependencies licenses probably not listed + +# Note: in all the steps below, we "cd" into the build directory to +# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the +# manifest-path. Indeed while the latter seems to work, it in fact +# breaks in subtle ways as the way cargo searches for its +# configuration file is based (among other rules) on the current +# directory. This means that if cargo is started outside of a package +# directory, its configuration file will not be taken into account. +# +# Also, we pass: +# * --offline to prevent cargo from downloading anything: all +# dependencies should have been built by the download post +# process logic +# * --locked to force cargo to use the Cargo.lock file, which ensures +# that a fixed set of dependency versions is used + +# +# Build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +ifeq ($(4),target) +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) \ + $$(TARGET_CONFIGURE_OPTS) \ + $$($(2)_CARGO_ENV) \ + cargo build \ + --offline \ + --target $$(RUSTC_TARGET_NAME) \ + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ + --manifest-path Cargo.toml \ + --locked \ + -Z target-applies-to-host \ + $$($(2)_CARGO_BUILD_OPTS) +endef +else # ifeq ($(4),target) +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(HOST_MAKE_ENV) \ + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ + $$($(2)_CARGO_ENV) \ + cargo build \ + --offline \ + --release \ + --manifest-path Cargo.toml \ + --locked \ + $$($(2)_CARGO_BUILD_OPTS) +endef +endif # ifeq ($(4),target) +endif # ifndef $(2)_BUILD_CMDS + +# +# Target installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ + cargo install \ + --target $$(RUSTC_TARGET_NAME) \ + --offline \ + --root $$(TARGET_DIR)/usr/ \ + --bins \ + --path ./ \ + --force \ + --locked \ + $$($(2)_CARGO_INSTALL_OPTS) +endef +endif + +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + cd $$(@D) && \ + $$(HOST_MAKE_ENV) \ + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ + $$($(2)_CARGO_ENV) \ + cargo install \ + --offline \ + --root $$(HOST_DIR) \ + --bins \ + --path ./ \ + --force \ + --locked \ + $$($(2)_CARGO_INSTALL_OPTS) +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +################################################################################ +# cargo-package -- the target generator macro for Cargo packages +################################################################################ + +cargo-package = $(call inner-cargo-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) +host-cargo-package = $(call inner-cargo-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process new file mode 100755 index 0000000000..25dbbedbfa --- /dev/null +++ b/support/download/cargo-post-process @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +set -e + +. "${0%/*}/helpers" + +while getopts "n:o:" OPT; do + case "${OPT}" in + o) output="${OPTARG}";; + n) base_name="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac +done + +# Already vendored tarball, nothing to do +if tar tf ${output} | grep -q "^[^/]*/VENDOR" ; then + exit 0 +fi + +post_process_unpack ${base_name} ${output} + +# Do the Cargo vendoring +pushd ${base_name} > /dev/null +cargo vendor --locked VENDOR + +# Create the local .cargo/config with vendor info +mkdir -p .cargo/ +cat <.cargo/config +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "VENDOR" +EOF +popd > /dev/null + +post_process_repack $(pwd) ${base_name} ${output} -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:54 +0100 Subject: [Buildroot] [PATCH v3 06/11] docs/manual/cargo: document the cargo-package infrastructure In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-7-thomas.petazzoni@bootlin.com> From: Patrick Havelange The Buildroot manual was already providing some details on how to integrate Cargo packages, and those details now need to be updated with a proper documentation for the cargo-package infrastructure, as well as updates related to vendoring support, which affects how dependencies are handled. Signed-off-by: Patrick Havelange [Thomas: numerous updates and extensions.] Signed-off-by: Thomas Petazzoni docs/manual/adding-packages-cargo.txt: rewrite explanation about dependency management Now that we have vendoring support for Cargo packages, let's rewrite the dependency management section in a more accurate way. We drop the part about the local cache of the registry, because +CARGO_HOME+ in Buildroot points to $(HOST_DIR)/share/cargo, which is not shared between builds nor preserved accross builds, so its effect as a cache is limited. Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-cargo.txt | 106 ++++++++++++-------------- 1 file changed, 47 insertions(+), 59 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index 8fcc80bcc6..fb3e7d0780 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -1,7 +1,7 @@ // -*- mode:doc; -*- // vim: set syntax=asciidoc: -=== Integration of Cargo-based packages +=== Infrastructure for Cargo-based packages Cargo is the package manager for the Rust programming language. It allows the user to build programs or libraries written in Rust, but it also downloads and @@ -10,7 +10,7 @@ called "crates". [[cargo-package-tutorial]] -==== Cargo-based package's +Config.in+ file +==== +cargo-package+ tutorial The +Config.in+ file of Cargo-based package 'foo' should contain: @@ -25,11 +25,7 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 08: http://foosoftware.org/foo/ --------------------------- -==== Cargo-based package's +.mk+ file - -Buildroot does not (yet) provide a dedicated package infrastructure for -Cargo-based packages. So, we will explain how to write a +.mk+ file for such a -package. Let's start with an example: +And the +.mk+ file for this package should contain: ------------------------------ 01: ################################################################################ @@ -44,66 +40,58 @@ package. Let's start with an example: 10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: -13: FOO_DEPENDENCIES = host-rustc -14: -15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo -16: -17: FOO_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(FOO_CARGO_MODE) -18: -19: FOO_CARGO_OPTS = \ -20: $(if $(BR2_ENABLE_DEBUG),,--release) \ -21: --target=$(RUSTC_TARGET_NAME) \ -22: --manifest-path=$(@D)/Cargo.toml -23: -24: define FOO_BUILD_CMDS -25: $(TARGET_MAKE_ENV) $(FOO_CARGO_ENV) \ -26: cargo build $(FOO_CARGO_OPTS) -27: endef -28: -29: define FOO_INSTALL_TARGET_CMDS -30: $(INSTALL) -D -m 0755 $(@D)/$(FOO_BIN_DIR)/foo \ -31: $(TARGET_DIR)/usr/bin/foo -32: endef -33: -34: $(eval $(generic-package)) +13: $(eval $(cargo-package)) -------------------------------- -The Makefile starts with the definition of the standard variables for package -declaration (lines 7 to 11). +The Makefile starts with the definition of the standard variables for +package declaration (lines 7 to 11). -As seen in line 34, it is based on the -xref:generic-package-tutorial[+generic-package+ infrastructure]. So, it defines -the variables required by this particular infrastructure, where Cargo is -invoked: +As seen in line 13, it is based on the +cargo-package+ +infrastructure. Cargo will be invoked automatically by this +infrastructure to build and install the package. -* +FOO_BUILD_CMDS+: Cargo is invoked to perform the build. The options required - to configure the cross-compilation of the package are passed via - +FOO_CONF_OPTS+. +It is still possible to define custom build commands or install +commands (i.e. with FOO_BUILD_CMDS and FOO_INSTALL_TARGET_CMDS). +Those will then replace the commands from the cargo infrastructure. -* +FOO_INSTALL_TARGET_CMDS+: The binary executable generated is installed on - the target. +==== +cargo-package+ reference -In order to have Cargo available for the build, +FOO_DEPENDENCIES+ needs to -contain +host-cargo+. +The main macros for the Cargo package infrastructure are ++cargo-package+ for target packages and +host-cargo-package+ for host +packages. -To sum it up, to add a new Cargo-based package, the Makefile example can be -copied verbatim then edited to replace all occurences of +FOO+ with the -uppercase name of the new package and update the values of the standard -variables. +Just like the generic infrastructure, the Cargo infrastructure works +by defining a number of variables before calling the +cargo-package+ +or +host-cargo-package+ macros. -==== About Dependencies Management +First, all the package metadata information variables that exist in +the generic infrastructure also exist in the Cargo infrastructure: ++FOO_VERSION+, +FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, ++FOO_DEPENDENCIES+, +FOO_LICENSE+, +FOO_LICENSE_FILES+, etc. + +A few additional variables, specific to the Cargo infrastructure, can +also be defined. Many of them are only useful in very specific cases, +typical packages will therefore only use a few of them. + +* +FOO_CARGO_ENV+ can be used to pass additional variables in the + environment of +cargo+ invocations. It used at both build and + installation time -A crate can depend on other libraries from crates.io or git repositories, listed -in its Cargo.toml file. Before starting a build, Cargo usually downloads -automatically them. This step can also be performed independently, via the -+cargo fetch+ command. +* +FOO_CARGO_BUILD_OPTS+ can be used to pass additional options to + +cargo+ at build time. + +* +FOO_CARGO_INSTALL_OPTS+ can be used to pass additional options to + +cargo+ at install time. + +==== About Dependencies Management -Cargo maintains a local cache of the registry index and of git checkouts of the -crates, whose location is given by +$CARGO_HOME+. As seen in the package -Makefile example at line 15, this environment variable is set to -+$(HOST_DIR)/share/cargo+. +A crate can depend on other libraries from crates.io or git +repositories, listed in its Cargo.toml file. Buildroot automatically +takes care of downloading such dependencies as part of the download +step of packages that use the +cargo-package+ infrastructure. Such +dependencies are then kept together with the package source code in +the tarball cached in Buildroot's +DL_DIR+, and therefore the hash of +the package's tarball includes such dependencies. -This dependency download mechanism is not convenient when performing an offline -build, as Cargo will fail to fetch the dependencies. In that case, it is advised -to generate a tarball of the dependencies using the +cargo vendor+ and add it to -+FOO_EXTRA_DOWNLOADS+. +This mechanism ensures that any change in the dependencies will be +detected, and allows the build to be performed completely offline. -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:55 +0100 Subject: [Buildroot] [PATCH v3 07/11] package/ripgrep: convert to cargo infrastructure In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-8-thomas.petazzoni@bootlin.com> From: Patrick Havelange This commit converts the ripgrep package to the cargo infrastructure. This causes the vendoring mechanism to kick in, which changes the contents of the tarball. To avoid a clash on the hash, we change the version of ripgrep to the Git commit hash matching the 13.0.0 tag, so there are no functional changes, but the tarball name is different. Signed-off-by: Patrick Havelange Signed-off-by: Thomas Petazzoni --- package/ripgrep/ripgrep.hash | 2 +- package/ripgrep/ripgrep.mk | 37 ++++++------------------------------ 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index b2f03a95e6..cd2dbedfb4 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2 ripgrep-13.0.0.tar.gz +sha256 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 7c2b79a4a7..d587441cfa 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -4,7 +4,11 @@ # ################################################################################ -RIPGREP_VERSION = 13.0.0 +# Same as 13.0.0, we use a Git commit hash because the hash of this +# tarball changed when moving to the cargo-package infrastructure, and +# we can't change the hash of existing tarball. Please switch back to +# a Git tag at the next version bump. +RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT @@ -13,33 +17,4 @@ RIPGREP_CPE_ID_VENDOR = ripgrep_project # CVE only impacts ripgrep on Windows RIPGREP_IGNORE_CVES += CVE-2021-3013 -RIPGREP_DEPENDENCIES = host-rustc -RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo \ - __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ - CARGO_TARGET_APPLIES_TO_HOST="false" - -RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_BIN_SUBDIR) - -RIPGREP_CARGO_OPTS = \ - -Z target-applies-to-host \ - --target=$(RUSTC_TARGET_NAME) \ - --manifest-path=$(@D)/Cargo.toml - -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) -RIPGREP_CARGO_BIN_SUBDIR = debug -else -RIPGREP_CARGO_OPTS += --release -RIPGREP_CARGO_BIN_SUBDIR = release -endif - -define RIPGREP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \ - cargo build $(RIPGREP_CARGO_OPTS) -endef - -define RIPGREP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(RIPGREP_BIN_DIR)/rg \ - $(TARGET_DIR)/usr/bin/rg -endef - -$(eval $(generic-package)) +$(eval $(cargo-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:56 +0100 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-9-thomas.petazzoni@bootlin.com> This reverts commit d19077677fc71fc8c8cd73945606f773d907a99a, but the package now uses the cargo-package infrastructure with its vendoring mechanism, which allows us to avoid the problems that caused the package to be removed in d19077677fc71fc8c8cd73945606f773d907a99a. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/sentry-cli/Config.in.host | 10 ++++++++++ package/sentry-cli/sentry-cli.hash | 3 +++ package/sentry-cli/sentry-cli.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/sentry-cli/Config.in.host create mode 100644 package/sentry-cli/sentry-cli.hash create mode 100644 package/sentry-cli/sentry-cli.mk diff --git a/DEVELOPERS b/DEVELOPERS index a52a8cfa38..55ea7805f7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1508,6 +1508,7 @@ F: package/python-schedule/ F: package/python-sentry-sdk/ F: package/python-websockets/ F: package/python-xlib/ +F: package/sentry-cli/ F: package/sentry-native/ F: package/unclutter-xfixes/ diff --git a/package/Config.in.host b/package/Config.in.host index 7400da5894..b3e00bb482 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -81,6 +81,7 @@ menu "Host utilities" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" source "package/sdbusplus/Config.in.host" + source "package/sentry-cli/Config.in.host" source "package/sloci-image/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" diff --git a/package/sentry-cli/Config.in.host b/package/sentry-cli/Config.in.host new file mode 100644 index 0000000000..3124015367 --- /dev/null +++ b/package/sentry-cli/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_SENTRY_CLI + bool "host sentry-cli" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Official Sentry command line interface + + For managing debug information files and source maps. + + https://docs.sentry.io/cli/ diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash new file mode 100644 index 0000000000..73f818125f --- /dev/null +++ b/package/sentry-cli/sentry-cli.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 d687336379fd96c4ee73f24bd062d31672bd7453af53311b72977be3c8c78fef sentry-cli-1.59.0.tar.gz +sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk new file mode 100644 index 0000000000..58f5f1e325 --- /dev/null +++ b/package/sentry-cli/sentry-cli.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# sentry-cli +# +################################################################################ + +SENTRY_CLI_VERSION = 1.59.0 +SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) +SENTRY_CLI_LICENSE = BSD-3-clause +SENTRY_CLI_LICENSE_FILES = LICENSE + +HOST_SENTRY_CLI_DEPENDENCIES = host-zlib + +$(eval $(host-cargo-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:57 +0100 Subject: [Buildroot] [PATCH v3 09/11] package/tinifier: new package In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-10-thomas.petazzoni@bootlin.com> This is a Go package that needs vendor modules to be downloaded at build time. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tinifier/Config.in | 10 ++++++++++ package/tinifier/tinifier.hash | 3 +++ package/tinifier/tinifier.mk | 13 +++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/tinifier/Config.in create mode 100644 package/tinifier/tinifier.hash create mode 100644 package/tinifier/tinifier.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55ea7805f7..774deb012f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2765,6 +2765,7 @@ F: package/rtc-tools/ F: package/sam-ba/ F: package/scons/ F: package/squashfs/ +F: package/tinifier/ F: package/wayland/ F: package/weston/ F: support/testing/tests/boot/test_syslinux.py diff --git a/package/Config.in b/package/Config.in index cb15574746..e47c49ade5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -314,6 +314,7 @@ comment "Graphic applications" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" source "package/tesseract-ocr/Config.in" + source "package/tinifier/Config.in" comment "Graphic libraries" source "package/cegui/Config.in" diff --git a/package/tinifier/Config.in b/package/tinifier/Config.in new file mode 100644 index 0000000000..fbadfe6bd9 --- /dev/null +++ b/package/tinifier/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_TINIFIER + bool "tinifier" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + CLI tool for images compressing + + This tool uses tinypng.com API endpoint for compressing your + local jpg/png images (it supports parallel jobs). + + https://github.com/tarampampam/tinifier diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash new file mode 100644 index 0000000000..5681ed6a55 --- /dev/null +++ b/package/tinifier/tinifier.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 927e966f9d23ea7cc1942967a8fc16ef4c55c51bd096d44f54b418844a51aa12 tinifier-3.4.0.tar.gz +sha256 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 LICENSE diff --git a/package/tinifier/tinifier.mk b/package/tinifier/tinifier.mk new file mode 100644 index 0000000000..d7ed6f7c93 --- /dev/null +++ b/package/tinifier/tinifier.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# tinifier +# +################################################################################ + +TINIFIER_VERSION = 3.4.0 +TINIFIER_SITE = $(call github,tarampampam,tinifier,v$(TINIFIER_VERSION)) +TINIFIER_LICENSE = MIT +TINIFIER_LICENSE_FILES = LICENSE +TINIFIER_GOMOD = ./cmd/tinifier + +$(eval $(golang-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:59 +0100 Subject: [Buildroot] [PATCH v3 11/11] package/gocryptfs: new package In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-12-thomas.petazzoni@bootlin.com> From: Christian Stewart via buildroot Adds the gocryptfs encrypted FUSE filesystem. Currently uses without_openssl build tag, to use the native Go cryptography. However, the package could be improved by conditionally enabling openssl if it is also configured to be built by Buildroot. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/gocryptfs/Config.in | 12 ++++++++++++ package/gocryptfs/gocryptfs.hash | 3 +++ package/gocryptfs/gocryptfs.mk | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/gocryptfs/Config.in create mode 100644 package/gocryptfs/gocryptfs.hash create mode 100644 package/gocryptfs/gocryptfs.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2649cf4ac4..bf58a20fc4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -521,6 +521,7 @@ F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/gocryptfs/ F: package/mbpfan/ F: package/mosh/ F: package/pkg-golang.mk diff --git a/package/Config.in b/package/Config.in index 34a36279ea..2946ce7a4b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -221,6 +221,7 @@ menu "Filesystem and flash utilities" source "package/genext2fs/Config.in" source "package/genpart/Config.in" source "package/genromfs/Config.in" + source "package/gocryptfs/Config.in" source "package/imx-usb-loader/Config.in" source "package/mmc-utils/Config.in" source "package/mtd/Config.in" diff --git a/package/gocryptfs/Config.in b/package/gocryptfs/Config.in new file mode 100644 index 0000000000..2630cafdcf --- /dev/null +++ b/package/gocryptfs/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_GOCRYPTFS + bool "gocryptfs" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + gocryptfs is an encrypted FUSE overlay filesystem. + + https://github.com/rfjakob/gocryptfs + +comment "gocryptfs needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash new file mode 100644 index 0000000000..94487815f5 --- /dev/null +++ b/package/gocryptfs/gocryptfs.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk new file mode 100644 index 0000000000..2a00e9a959 --- /dev/null +++ b/package/gocryptfs/gocryptfs.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# gocryptfs +# +################################################################################ + +GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) +GOCRYPTFS_LICENSE = MIT +GOCRYPTFS_LICENSE_FILES = LICENSE + +GOCRYPTFS_GOMOD = github.com/rfjakob/gocryptfs/v2 + +GOCRYPTFS_LDFLAGS = \ + -X main.GitVersion=$(GOCRYPTFS_VERSION) \ + -X main.GitVersionFuse=[vendored] +GOCRYPTFS_TAGS = without_openssl + +$(eval $(golang-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:58 +0100 Subject: [Buildroot] [PATCH v3 10/11] package/embiggen-disk: new package In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-11-thomas.petazzoni@bootlin.com> From: Christian Stewart via buildroot embiggen-disk is a tool to automatically resize disks to fill available space. Patch submitted upstream: https://github.com/bradfitz/embiggen-disk/pull/13 Adds support for /dev/mmcblk0pN type paths. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...-Fix-resizing-of-dev-mmcblk0pN-paths.patch | 45 +++++++++++++++++++ package/embiggen-disk/Config.in | 19 ++++++++ package/embiggen-disk/embiggen-disk.hash | 3 ++ package/embiggen-disk/embiggen-disk.mk | 12 +++++ 6 files changed, 81 insertions(+) create mode 100644 package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch create mode 100644 package/embiggen-disk/Config.in create mode 100644 package/embiggen-disk/embiggen-disk.hash create mode 100644 package/embiggen-disk/embiggen-disk.mk diff --git a/DEVELOPERS b/DEVELOPERS index 774deb012f..2649cf4ac4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -518,6 +518,7 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-engine/ F: package/docker-proxy/ +F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ F: package/mbpfan/ diff --git a/package/Config.in b/package/Config.in index e47c49ade5..34a36279ea 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2516,6 +2516,7 @@ menu "System tools" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" + source "package/embiggen-disk/Config.in" source "package/emlog/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" diff --git a/package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch b/package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch new file mode 100644 index 0000000000..31cfea9dde --- /dev/null +++ b/package/embiggen-disk/0001-Fix-resizing-of-dev-mmcblk0pN-paths.patch @@ -0,0 +1,45 @@ +From b628e4c561cb4d3ffc92a5d7aac8f4967e44977e Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Thu, 27 May 2021 20:07:07 -0700 +Subject: [PATCH] Fix resizing of /dev/mmcblk0pN paths + +Signed-off-by: Christian Stewart +--- + fs.go | 4 +++- + part.go | 5 +++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/fs.go b/fs.go +index 0b83e24..8ab3690 100644 +--- a/fs.go ++++ b/fs.go +@@ -67,7 +67,9 @@ func (e fsResizer) DepResizer() (Resizer, error) { + if dev == "/dev/root" { + return nil, errors.New("unexpected device /dev/root from statFS") + } +- if (strings.HasPrefix(dev, "/dev/sd") || strings.HasPrefix(dev, "/dev/nvme")) && ++ if (strings.HasPrefix(dev, "/dev/sd") || ++ strings.HasPrefix(dev, "/dev/mmcblk") || ++ strings.HasPrefix(dev, "/dev/nvme")) && + devEndsInNumber(dev) { + vlogf("fsResizer.DepResizer: returning partitionResizer(%q)", dev) + return partitionResizer(dev), nil +diff --git a/part.go b/part.go +index 0315a6e..f3e280f 100644 +--- a/part.go ++++ b/part.go +@@ -51,6 +51,11 @@ func diskDev(partDev string) string { + if strings.HasPrefix(partDev, "/dev/sd") { + return strings.TrimRight(partDev, "0123456789") + } ++ if strings.HasPrefix(partDev, "/dev/mmcblk") { ++ v := strings.TrimRight(partDev, "0123456789") ++ v = strings.TrimSuffix(v, "p") ++ return v ++ } + if strings.HasPrefix(partDev, "/dev/nvme") { + chopP := regexp.MustCompile(`p\d+$`) + if !chopP.MatchString(partDev) { +-- +2.31.1 + diff --git a/package/embiggen-disk/Config.in b/package/embiggen-disk/Config.in new file mode 100644 index 0000000000..667d71c86e --- /dev/null +++ b/package/embiggen-disk/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_EMBIGGEN_DISK + bool "embiggen-disk" + 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 # no fexecve + depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_UTIL_LINUX # sfdisk + select BR2_PACKAGE_UTIL_LINUX_BINARIES # sfdisk + help + embiggen-disk is a tool to resize disk partitions at runtime. + + https://github.com/bradfitz/embiggen-disk + +comment "embiggen-disk needs a glibc or musl toolchain w/ threads" + depends on BR2_USE_MMU + 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/embiggen-disk/embiggen-disk.hash b/package/embiggen-disk/embiggen-disk.hash new file mode 100644 index 0000000000..274958edc4 --- /dev/null +++ b/package/embiggen-disk/embiggen-disk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5ef943b1f6468cf0eaf9d7e6ca22d8b5692cbb5b80f19d95468fb41b675b986c embiggen-disk-c554fc1c93a4004ce0b6a3f69b0dabe0481a2308.tar.gz +sha256 063aedec1652c5a05c2d04c40e032b932453142ee8ef7fd53c04a9acc127fc95 LICENSE diff --git a/package/embiggen-disk/embiggen-disk.mk b/package/embiggen-disk/embiggen-disk.mk new file mode 100644 index 0000000000..5d5ac15ae8 --- /dev/null +++ b/package/embiggen-disk/embiggen-disk.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# embiggen-disk +# +################################################################################ + +EMBIGGEN_DISK_VERSION = c554fc1c93a4004ce0b6a3f69b0dabe0481a2308 +EMBIGGEN_DISK_SITE = $(call github,bradfitz,embiggen-disk,$(EMBIGGEN_DISK_VERSION)) +EMBIGGEN_DISK_LICENSE = Apache-2.0 +EMBIGGEN_DISK_LICENSE_FILES = LICENSE + +$(eval $(golang-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 21:05:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 22:05:59 +0100 Subject: [Buildroot] [PATCH-NEXT v3 1/6] support/download/dl-wrapper: add concept of download post-processing In-Reply-To: <20211010234655.585526-1-christian@paral.in> References: <20211010234655.585526-1-christian@paral.in> Message-ID: <20220106220559.68509598@windsurf> On Sun, 10 Oct 2021 16:46:50 -0700 Christian Stewart via buildroot wrote: > From: Thomas Petazzoni > > In order to support package managers such as Cargo (Rust) or Go, we > want to run some custom logic after the main download, but before > packing the tarball and checking the hash. > > To implement this, this commit introduces a concept of download > post-processing: if -p is passed to the dl-wrapper, then > support/download/-post-process will be called. > > Signed-off-by: Thomas Petazzoni > Signed-off-by: Christian Stewart > --- > support/download/dl-wrapper | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) I have marked this patch series as Superseded, as I have posted: https://patchwork.ozlabs.org/project/buildroot/list/?series=279698 which replaces it. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Thu Jan 6 21:05:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 22:05:03 +0100 Subject: [Buildroot] [git commit] support/testing: add runtime test for python-iptables Message-ID: <20220106205958.4FD627FE84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d7abbfed89683a7f1bef089c9fb5ab32b967cb0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/package/sample_python_iptables.py | 1 + support/testing/tests/package/test_python_iptables.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/support/testing/tests/package/sample_python_iptables.py b/support/testing/tests/package/sample_python_iptables.py new file mode 100644 index 0000000000..a3091cab31 --- /dev/null +++ b/support/testing/tests/package/sample_python_iptables.py @@ -0,0 +1 @@ +import iptc diff --git a/support/testing/tests/package/test_python_iptables.py b/support/testing/tests/package/test_python_iptables.py new file mode 100644 index 0000000000..a2ba365fa7 --- /dev/null +++ b/support/testing/tests/package/test_python_iptables.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Iptables(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_IPTABLES=y + """ + sample_scripts = ["tests/package/sample_python_iptables.py"] + timeout = 30 From arnout at mind.be Thu Jan 6 20:25:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 21:25:33 +0100 Subject: [Buildroot] [git commit] package/python-iptables: use installed iptables by default Message-ID: <20220106205958.46AFC81393@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d341ec035067120b456f669a826e26eb594c0237 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-iptables depends on ctypes.util.find_library() which does not work due to the absence of gcc and friends on target. The location of the xtables library and the iptables modules can be configured through environment variables. Within the scope of buildroot we can determine what these should be at build time and replace the calls to os.getenv() with the correct value. Fixes: https://bugs.busybox.net/show_bug.cgi?id=12271 Signed-off-by: Frank Vanbever Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-iptables/Config.in | 2 +- package/python-iptables/python-iptables.mk | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/python-iptables/Config.in b/package/python-iptables/Config.in index a35577bad3..0e24283d06 100644 --- a/package/python-iptables/Config.in +++ b/package/python-iptables/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_IPTABLES bool "python-iptables" depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_IPTABLES # runtime dependency + select BR2_PACKAGE_IPTABLES help Python bindings for iptables. diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk index 72bf292c77..0ccf064217 100644 --- a/package/python-iptables/python-iptables.mk +++ b/package/python-iptables/python-iptables.mk @@ -9,5 +9,14 @@ PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/ca/6e/cba9c6f4b5a PYTHON_IPTABLES_SETUP_TYPE = setuptools PYTHON_IPTABLES_LICENSE = Apache-2.0 PYTHON_IPTABLES_LICENSE_FILES = NOTICE +PYTHON_IPTABLES_DEPENDENCIES = iptables + +define PYTHON_IPTABLES_SET_XTABLES_ENV_VARS + XTABLES_VERSION=`awk '/XTABLES_VERSION_CODE/ {print $$NF}' $(STAGING_DIR)/usr/include/xtables-version.h`; \ + sed -i "s%os.getenv(\"PYTHON_IPTABLES_XTABLES_VERSION\")%$$XTABLES_VERSION%" $(@D)/iptc/xtables.py + sed -i "s%os.getenv(\"XTABLES_LIBDIR\")%\"/usr/lib/xtables\"%" $(@D)/iptc/xtables.py +endef + +PYTHON_IPTABLES_PRE_BUILD_HOOKS += PYTHON_IPTABLES_SET_XTABLES_ENV_VARS $(eval $(python-package)) From bugzilla at busybox.net Thu Jan 6 21:06:51 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 06 Jan 2022 21:06:51 +0000 Subject: [Buildroot] [Bug 12271] python-iptables runtime dependencies In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=12271 --- Comment #2 from Arnout Vandecappelle --- It was actually only fixed by https://git.buildroot.org/buildroot/commit/?id=d341ec035067120b456f669a826e26eb594c0237 -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Thu Jan 6 20:59:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 21:59:52 +0100 Subject: [Buildroot] [PATCH v3 04/11] package/pkg-golang.mk: implement Go vendoring support In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106210000.397694-5-thomas.petazzoni@bootlin.com> This commit introduces the download post-process script support/download/go-post-process, and hooks it into the Go package infrastructure. The -modcacherw flag is added to ensure that the Go cache is read/write, and can be deleted properly upon "make clean". The _LICENSE variable of golang packages is expanded with ", vendored dependencies licenses probably not listed" as currently for all packages, the licenses of the vendored dependencies are not taken into account. Signed-off-by: Thomas Petazzoni --- package/pkg-golang.mk | 13 +++++++++++- support/download/go-post-process | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100755 support/download/go-post-process diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index d07242310d..35bcb1673b 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -42,12 +42,13 @@ define inner-golang-package $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ + -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ -p $(PARALLEL_JOBS) # Target packages need the Go compiler on the host. -$(2)_DEPENDENCIES += host-go +$(2)_DOWNLOAD_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . @@ -81,6 +82,16 @@ define $(2)_GEN_GOMOD endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD +$(2)_DOWNLOAD_POST_PROCESS = go +$(2)_DL_ENV = \ + $(HOST_GO_COMMON_ENV) \ + GOPROXY=direct \ + BR_GOMOD=$$($(2)_GOMOD) + +# Due to vendoring, it is pretty likely that not all licenses are +# listed in _LICENSE. +$(2)_LICENSE += , vendored dependencies licenses probably not listed + # Build step. Only define it if not already defined by the package .mk # file. ifndef $(2)_BUILD_CMDS diff --git a/support/download/go-post-process b/support/download/go-post-process new file mode 100755 index 0000000000..a6e74e6221 --- /dev/null +++ b/support/download/go-post-process @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +set -e + +. "${0%/*}/helpers" + +# Parse our options +while getopts "n:o:" OPT; do + case "${OPT}" in + o) output="${OPTARG}";; + n) base_name="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac +done + +# Already vendored tarball, nothing to do +if tar tf ${output} | grep -q "^[^/]*/vendor" ; then + exit 0 +fi + +post_process_unpack ${base_name} ${output} + +# Do the Go vendoring +pushd ${base_name} > /dev/null + +# Generate go.mod if it doesn't exist +if [ ! -f go.mod ] && [ -n "${BR_GOMOD}" ]; then + printf "module ${BR_GOMOD}\n" > go.mod +fi + +go mod vendor -v -modcacherw +popd > /dev/null + +post_process_repack $(pwd) ${base_name} ${output} -- 2.33.1 From thomas.petazzoni at bootlin.com Thu Jan 6 21:08:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 22:08:24 +0100 Subject: [Buildroot] [PATCH-NEXT v3 4/6] support/download/go-post-process: implement Go vendoring support In-Reply-To: <20211010234655.585526-4-christian@paral.in> References: <20211010234655.585526-1-christian@paral.in> <20211010234655.585526-4-christian@paral.in> Message-ID: <20220106220824.31306aa6@windsurf> Hello, On Sun, 10 Oct 2021 16:46:53 -0700 Christian Stewart via buildroot wrote: > +# Do the Go vendoring > +pushd ${base_name} > /dev/null > +# modcacherw option leaves directories in the module cache at their default > +# permissions rather than making them read-only. > +if [ ! -f go.mod ] && [ -n "${gomod_init}" ]; then > + go mod init -modcacherw ${gomod_init} So here you're using "go mod init" to create the go.mod file, but in package/pkg-golang.mk, we're manually creating it. So for the sake of consistency, I tried using "go mod init" in package/pkg-golang.mk as well, but running that on balena-engine caused go mod init to start downloading stuff... which is wrong because balena-engine already comes with its vendored dependencies. So in the end, I ended up creating the go.mod manually (with the same logic) in both pkg-golang.mk and in this download post-process script. But if we find why "go mod init" didn't work in the context of pkg-golang.mk, we could switch back to using that. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Thu Jan 6 21:08:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 22:08:42 +0100 Subject: [Buildroot] [PATCH v3 3/4] package/python-iptables: use installed iptables by default In-Reply-To: <20200311105447.23808-3-frank.vanbever@essensium.com> References: <20200228163917.10596-1-frank.vanbever@essensium.com> <20200311105447.23808-1-frank.vanbever@essensium.com> <20200311105447.23808-3-frank.vanbever@essensium.com> Message-ID: On 11/03/2020 11:54, Frank Vanbever wrote: > python-iptables depends on ctypes.util.find_library() which does not work due to > the absence of gcc and friends on target. The location of the xtables library > and the iptables modules can be configured through environment variables. Within > the scope of buildroot we can determine what these should be at build time and > replace the calls to os.getenv() with the correct value. > > Fixes: https://bugs.busybox.net/show_bug.cgi?id=12271 > > Signed-off-by: Frank Vanbever This one had fallen through the cracks. I finally applied it to master. To verify that it really solves a bug, I also added a runtime test which indeed fails without this patch. Regards, Arnout > --- > v2 -> v3: > - None > v1 -> v2: > - Remove unnecessary continuation in pre-build hook > - Change sed separator to % > > Signed-off-by: Frank Vanbever > --- > package/python-iptables/Config.in | 2 +- > package/python-iptables/python-iptables.mk | 9 +++++++++ > 2 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/package/python-iptables/Config.in b/package/python-iptables/Config.in > index a35577bad3..0e24283d06 100644 > --- a/package/python-iptables/Config.in > +++ b/package/python-iptables/Config.in > @@ -1,7 +1,7 @@ > config BR2_PACKAGE_PYTHON_IPTABLES > bool "python-iptables" > depends on !BR2_STATIC_LIBS > - select BR2_PACKAGE_IPTABLES # runtime dependency > + select BR2_PACKAGE_IPTABLES > help > Python bindings for iptables. > > diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk > index 66e478a89a..38c6ee3950 100644 > --- a/package/python-iptables/python-iptables.mk > +++ b/package/python-iptables/python-iptables.mk > @@ -9,5 +9,14 @@ PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/08/5e/16a5ca35c42 > PYTHON_IPTABLES_SETUP_TYPE = setuptools > PYTHON_IPTABLES_LICENSE = Apache-2.0 > PYTHON_IPTABLES_LICENSE_FILES = NOTICE > +PYTHON_IPTABLES_DEPENDENCIES = iptables > + > +define PYTHON_IPTABLES_SET_XTABLES_ENV_VARS > + XTABLES_VERSION=`awk '/XTABLES_VERSION_CODE/ {print $$NF}' $(STAGING_DIR)/usr/include/xtables-version.h`; \ > + sed -i "s%os.getenv(\"PYTHON_IPTABLES_XTABLES_VERSION\")%$$XTABLES_VERSION%" $(@D)/iptc/xtables.py > + sed -i "s%os.getenv(\"XTABLES_LIBDIR\")%\"/usr/lib/xtables\"%" $(@D)/iptc/xtables.py > +endef > + > +PYTHON_IPTABLES_PRE_BUILD_HOOKS += PYTHON_IPTABLES_SET_XTABLES_ENV_VARS > > $(eval $(python-package)) > From thomas.petazzoni at bootlin.com Thu Jan 6 21:09:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 22:09:34 +0100 Subject: [Buildroot] [PATCH 1/1] pkg-rust: new infrastructure In-Reply-To: <20210610020632.236282-1-james.hilliard1@gmail.com> References: <20210610020632.236282-1-james.hilliard1@gmail.com> Message-ID: <20220106220934.24a8ba95@windsurf> Hello James, On Wed, 9 Jun 2021 20:06:32 -0600 James Hilliard wrote: > Add a new infrastructure to ease the development of packages that use > rust's cargo as their build system. > > Signed-off-by: James Hilliard > --- > package/Makefile.in | 1 + > package/pkg-rust.mk | 113 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 114 insertions(+) > create mode 100644 package/pkg-rust.mk I have re-submitted a new version of the Cargo package infrastructure, which I had submitted a long time ago. I think it's very close to what you have done, but also supports vendoring thanks to additional logic, also shared with the Go package infrastructure. Could you have a look at the series I just posted? Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Thu Jan 6 21:10:17 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 22:10:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: remove python2 support In-Reply-To: <20220104200904.1422985-1-aduskett@gmail.com> References: <20220104200904.1422985-1-aduskett@gmail.com> Message-ID: Hello Adam, Le 04/01/2022 ? 21:09, Adam Duskett a ?crit?: > According to the GDB 9.2 changelog, python3 has been supported since at least > 2019. > > - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host > > - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy > > - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to > depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in Agree on the principle but it seems that the gdb for csky is still based on gdb 7.12. https://github.com/c-sky/binutils-gdb/blob/4ecb98fbc2f94dbe01b69384afbc515107de73df/gdb/version.in But since csky toolchain has been removed recently, I guess we can remove the before applying your patch. For ARC, gdb is based on 10.x https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/blob/arc-2020.09-release-gdb/gdb/version.in Best regards, Romain > > Signed-off-by: Adam Duskett > --- > Config.in.legacy | 7 +++++++ > package/gdb/Config.in | 2 +- > package/gdb/Config.in.host | 5 ----- > package/gdb/gdb.mk | 10 +--------- > 4 files changed, 9 insertions(+), 15 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 5994d94487..a126d56052 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_HOST_GDB_PYTHON > + bool "GDB Python2 support removed" > + select BR2_LEGACY > + help > + Python2 is deprecated and no longer supported. > + Please migrate to Python3. > + > config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE > bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" > select BR2_LEGACY > diff --git a/package/gdb/Config.in b/package/gdb/Config.in > index 6f1a883de7..daad6c910d 100644 > --- a/package/gdb/Config.in > +++ b/package/gdb/Config.in > @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI > > config BR2_PACKAGE_GDB_PYTHON > bool "Python support" > - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 > + depends on BR2_PACKAGE_PYTHON3 > help > This option enables Python support in the target gdb. > > diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host > index a6e1d7f53c..2c6c78f20a 100644 > --- a/package/gdb/Config.in.host > +++ b/package/gdb/Config.in.host > @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON > help > This option disables Python support in the cross gdb. > > -config BR2_PACKAGE_HOST_GDB_PYTHON > - bool "Python 2" > - help > - This option enables the Python 2 support in the cross gdb. > - > config BR2_PACKAGE_HOST_GDB_PYTHON3 > bool "Python 3" > help > diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk > index 4ff498230a..2929eaf058 100644 > --- a/package/gdb/gdb.mk > +++ b/package/gdb/gdb.mk > @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) > GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) > GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) > GDB_DEPENDENCIES += python3 > -else > -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. > -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) > -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) > -GDB_DEPENDENCIES += python > endif > GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config > else > @@ -287,10 +282,7 @@ else > HOST_GDB_CONF_OPTS += --disable-tui > endif > > -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) > -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 > -HOST_GDB_DEPENDENCIES += host-python > -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) > +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) > HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 > HOST_GDB_DEPENDENCIES += host-python3 > else > From christian at paral.in Thu Jan 6 21:20:26 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 13:20:26 -0800 Subject: [Buildroot] [PATCH-NEXT v3 4/6] support/download/go-post-process: implement Go vendoring support In-Reply-To: <20220106220824.31306aa6@windsurf> References: <20211010234655.585526-1-christian@paral.in> <20211010234655.585526-4-christian@paral.in> <20220106220824.31306aa6@windsurf> Message-ID: Hi Thomas, The usage of "go mod init" converts package files from older package managers like Glide and vendor.conf into a go.mod and go.sum file with the checksums maintained. This is important for compatibility with some packages that don't have go.mod but use other approaches. On Thu, Jan 6, 2022 at 1:08 PM Thomas Petazzoni wrote: > On Sun, 10 Oct 2021 16:46:53 -0700 > Christian Stewart via buildroot wrote: > > > +# Do the Go vendoring > > +pushd ${base_name} > /dev/null > > +# modcacherw option leaves directories in the module cache at their default > > +# permissions rather than making them read-only. > > +if [ ! -f go.mod ] && [ -n "${gomod_init}" ]; then > > + go mod init -modcacherw ${gomod_init} > > So here you're using "go mod init" to create the go.mod file, but in > package/pkg-golang.mk, we're manually creating it. In this context it's OK to make network lookups and download things. GEN_GOMOD, it's not OK. > So for the sake of consistency, I tried using "go mod init" in > package/pkg-golang.mk as well, but running that on balena-engine caused > go mod init to start downloading stuff... which is wrong because > balena-engine already comes with its vendored dependencies. In this context we don't want downloads to occur, so generating manually makes sense. > So in the end, I ended up creating the go.mod manually (with the same > logic) in both pkg-golang.mk and in this download post-process script. > But if we find why "go mod init" didn't work in the context of > pkg-golang.mk, we could switch back to using that. I'd prefer to keep the "go mod init" in the download script for better compatibility with packages that don't yet use go.mod and go.sum. If you want to keep this in a separate patch & merge the manual-create in the meantime, that'd also work. Best regards, Christian From arnout at mind.be Thu Jan 6 21:28:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 22:28:56 +0100 Subject: [Buildroot] [PATCH] relocate-sdk: Allow relocating to any location In-Reply-To: <20200328234945.12552-1-glex.spb@gmail.com> References: <20200328234945.12552-1-glex.spb@gmail.com> Message-ID: <7a3b641c-93a1-4d20-b32e-8ff88bae8fef@mind.be> On 29/03/2020 00:49, Gleb Mazovetskiy wrote: > Previously, the script could only relocate to the current location. > > This caused issues for SDK maintainers, as the default target location > (e.g. /opt/my-sdk) would need to be created and the content copied > to it during the build process, which is error-prone. > > With this change you can now pass a target location argument to > ./relocate-sdk.sh (this does not move the directory). Even though, as Yann indicated, the use case is a bit iffy, the patch is simple enough. So I applied to master, thanks. Your Signed-off-by was missing, so I added that. Regards, Arnout > --- > support/misc/relocate-sdk.sh | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/support/misc/relocate-sdk.sh b/support/misc/relocate-sdk.sh > index caabeaa6f6..981d272425 100755 > --- a/support/misc/relocate-sdk.sh > +++ b/support/misc/relocate-sdk.sh > @@ -1,15 +1,20 @@ > #!/bin/sh > -# > -if [ "$#" -ne 0 ]; then > - echo "Run this script to relocate the buildroot SDK at that location" > + > +if [ "$#" -gt 1 ]; then > + echo "Usage: $0 [path]" > + echo "Run this script to relocate the buildroot SDK to the current location" > + echo "If [path] is given, sets the location to [path] (without moving it)" > exit 1 > fi > > -LOCFILE="share/buildroot/sdk-location" > -FILEPATH="$(readlink -f "$0")" > -NEWPATH="$(dirname "${FILEPATH}")" > +cd "$(dirname "$(readlink -f "$0")")" > +if [ "$#" -eq 1 ]; then > + NEWPATH="$1" > +else > + NEWPATH="${PWD}" > +fi > > -cd "${NEWPATH}" > +LOCFILE="share/buildroot/sdk-location" > if [ ! -r "${LOCFILE}" ]; then > echo "Previous location of the buildroot SDK not found!" > exit 1 > From arnout at mind.be Thu Jan 6 21:27:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 6 Jan 2022 22:27:56 +0100 Subject: [Buildroot] [git commit] support/misc/relocate-sdk.sh: allow relocating to any directory Message-ID: <20220106212331.A4B96829F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd8f8f8e89b9e2fdfe3262bc685368ad77d96e2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, relocate-sdk.sh must be run _after_ relocating the SDK. There are cases where it is useful to already prepare the SDK _before_ relocating. For example, it allows to prepare a tarball that the user has to extract to a specific, pre-defined location and nothing more than that, which is simpler for the user than requiring the script to be run. In addition, it hides the build directory that was used by the SDK builder (somewhat). Add an optional argument to relocate-sdk.sh that gives the target directory. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/misc/relocate-sdk.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/support/misc/relocate-sdk.sh b/support/misc/relocate-sdk.sh index caabeaa6f6..981d272425 100755 --- a/support/misc/relocate-sdk.sh +++ b/support/misc/relocate-sdk.sh @@ -1,15 +1,20 @@ #!/bin/sh -# -if [ "$#" -ne 0 ]; then - echo "Run this script to relocate the buildroot SDK at that location" + +if [ "$#" -gt 1 ]; then + echo "Usage: $0 [path]" + echo "Run this script to relocate the buildroot SDK to the current location" + echo "If [path] is given, sets the location to [path] (without moving it)" exit 1 fi -LOCFILE="share/buildroot/sdk-location" -FILEPATH="$(readlink -f "$0")" -NEWPATH="$(dirname "${FILEPATH}")" +cd "$(dirname "$(readlink -f "$0")")" +if [ "$#" -eq 1 ]; then + NEWPATH="$1" +else + NEWPATH="${PWD}" +fi -cd "${NEWPATH}" +LOCFILE="share/buildroot/sdk-location" if [ ! -r "${LOCFILE}" ]; then echo "Previous location of the buildroot SDK not found!" exit 1 From christian at paral.in Thu Jan 6 21:30:14 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 13:30:14 -0800 Subject: [Buildroot] [PATCH 1/1] package/go: bump version to 1.17.6 Message-ID: <20220106213014.433782-1-christian@paral.in> View the release notes for more information: https://go.dev/doc/devel/release.html#go1.17.minor Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 39f8226aae..9111c8c9aa 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz +sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 0d9ceab2bb..062bec378c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.5 +GO_VERSION = 1.17.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.34.1 From romain.naour at smile.fr Thu Jan 6 21:37:53 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 22:37:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: remove python2 support In-Reply-To: References: <20220104200904.1422985-1-aduskett@gmail.com> Message-ID: Le 06/01/2022 ? 22:10, Romain Naour a ?crit?: > Hello Adam, > > Le 04/01/2022 ? 21:09, Adam Duskett a ?crit?: >> According to the GDB 9.2 changelog, python3 has been supported since at least >> 2019. Actually python3 support is available since gdb 7.8 for Linux: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=9a27f2c60d760a95a27e336750f26f69f91dd156 It's gdb python3 support for windows that is available since version 9.2. Best regards, Romain >> >> - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host >> >> - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy >> >> - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to >> depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in > > Agree on the principle but it seems that the gdb for csky is still based on gdb > 7.12. > > https://github.com/c-sky/binutils-gdb/blob/4ecb98fbc2f94dbe01b69384afbc515107de73df/gdb/version.in > > But since csky toolchain has been removed recently, I guess we can remove the > before applying your patch. > > For ARC, gdb is based on 10.x > > https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/blob/arc-2020.09-release-gdb/gdb/version.in > > Best regards, > Romain > >> >> Signed-off-by: Adam Duskett >> --- >> Config.in.legacy | 7 +++++++ >> package/gdb/Config.in | 2 +- >> package/gdb/Config.in.host | 5 ----- >> package/gdb/gdb.mk | 10 +--------- >> 4 files changed, 9 insertions(+), 15 deletions(-) >> >> diff --git a/Config.in.legacy b/Config.in.legacy >> index 5994d94487..a126d56052 100644 >> --- a/Config.in.legacy >> +++ b/Config.in.legacy >> @@ -146,6 +146,13 @@ endif >> >> comment "Legacy options removed in 2022.02" >> >> +config BR2_PACKAGE_HOST_GDB_PYTHON >> + bool "GDB Python2 support removed" >> + select BR2_LEGACY >> + help >> + Python2 is deprecated and no longer supported. >> + Please migrate to Python3. >> + >> config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE >> bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" >> select BR2_LEGACY >> diff --git a/package/gdb/Config.in b/package/gdb/Config.in >> index 6f1a883de7..daad6c910d 100644 >> --- a/package/gdb/Config.in >> +++ b/package/gdb/Config.in >> @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI >> >> config BR2_PACKAGE_GDB_PYTHON >> bool "Python support" >> - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 >> + depends on BR2_PACKAGE_PYTHON3 >> help >> This option enables Python support in the target gdb. >> >> diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host >> index a6e1d7f53c..2c6c78f20a 100644 >> --- a/package/gdb/Config.in.host >> +++ b/package/gdb/Config.in.host >> @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON >> help >> This option disables Python support in the cross gdb. >> >> -config BR2_PACKAGE_HOST_GDB_PYTHON >> - bool "Python 2" >> - help >> - This option enables the Python 2 support in the cross gdb. >> - >> config BR2_PACKAGE_HOST_GDB_PYTHON3 >> bool "Python 3" >> help >> diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk >> index 4ff498230a..2929eaf058 100644 >> --- a/package/gdb/gdb.mk >> +++ b/package/gdb/gdb.mk >> @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) >> GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) >> GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) >> GDB_DEPENDENCIES += python3 >> -else >> -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. >> -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) >> -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) >> -GDB_DEPENDENCIES += python >> endif >> GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config >> else >> @@ -287,10 +282,7 @@ else >> HOST_GDB_CONF_OPTS += --disable-tui >> endif >> >> -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) >> -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 >> -HOST_GDB_DEPENDENCIES += host-python >> -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) >> +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) >> HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 >> HOST_GDB_DEPENDENCIES += host-python3 >> else >> > From christian at paral.in Thu Jan 6 21:39:35 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 13:39:35 -0800 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.5 In-Reply-To: <20211212090107.2975294-1-christian@paral.in> References: <20211212090107.2975294-1-christian@paral.in> Message-ID: Hi maintainers, all, Currently 2021.11.x branch is at version 1.17.3 which is vulnerable to: - CVE-2021-44716 - CVE-2021-44717 Is it currently policy to backport security patches? Similarly the 2021.02.x LTS branch is at 1.16.10, when the security fixes landed in 1.16.12. I've just submitted 1.17.6 to the list and will submit 1.16.12 for 2021.02.x as well. On Sun, Dec 12, 2021 at 1:01 AM Christian Stewart wrote: > --- a/package/go/go.hash > +++ b/package/go/go.hash > @@ -1,3 +1,3 @@ > # From https://golang.org/dl/ > -sha256 705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0 go1.17.3.src.tar.gz > +sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz > sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE > diff --git a/package/go/go.mk b/package/go/go.mk > index 59177e54db..0d9ceab2bb 100644 > --- a/package/go/go.mk > +++ b/package/go/go.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GO_VERSION = 1.17.3 > +GO_VERSION = 1.17.5 > GO_SITE = https://storage.googleapis.com/golang > GO_SOURCE = go$(GO_VERSION).src.tar.gz Thanks & best regards, Christian Stewart From bernd.kuhls at t-online.de Thu Jan 6 21:44:11 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 6 Jan 2022 22:44:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.3-Matrix Message-ID: <20220106214411.2684476-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 5d0e2738bd..cd96feef70 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f5a2c0d4c742db3e8465369f4845faa87c76572290edc1792cf188ad977752b4 kodi-pvr-mythtv-19.0.2-Matrix.tar.gz +sha256 87f696fdb973602967c7dbcc1db5492616f29bfabe687fddd3a276f663a05d44 kodi-pvr-mythtv-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index b897667d67..6edca8db50 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.2-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.3-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From christian at paral.in Thu Jan 6 21:44:26 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 13:44:26 -0800 Subject: [Buildroot] [2021.02 1/1] package/go: security bump to version 1.16.13 Message-ID: <20220106214426.442534-1-christian@paral.in> go1.16.11 (released 2021-12-02) includes fixes to the compiler, runtime, and the net/http, net/http/httptest, and time packages. go1.16.12 (released 2021-12-09) includes security fixes to the syscall and net/http packages. go1.16.13 (released 2022-01-06) includes fixes to the compiler, linker, runtime, and the net/http package. Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 10bbb741e0..7071fcd99d 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 a905472011585e403d00d2a41de7ced29b8884309d73482a307f689fd0f320b5 go1.16.10.src.tar.gz +sha256 b0926654eaeb01ef43816638f42d7b1681f2d3f41b9559f07735522b7afad41a go1.16.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 8a65e20380..cac83c65ff 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.10 +GO_VERSION = 1.16.13 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.34.1 From arnout at mind.be Thu Jan 6 21:54:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 6 Jan 2022 22:54:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.5 In-Reply-To: References: <20211212090107.2975294-1-christian@paral.in> Message-ID: On 06/01/2022 22:39, Christian Stewart via buildroot wrote: > Hi maintainers, all, > > Currently 2021.11.x branch is at version 1.17.3 which is vulnerable to: > > - CVE-2021-44716 > - CVE-2021-44717 > > Is it currently policy to backport security patches? Yes, of course. Peter regularly goes through the master branch and identifies commits for backporting. If he misses something, you can definitely ping him on it. Due to holidays, the last time he did that was somewhere mid-December, so the stable branches are running a bit behind. > Similarly the 2021.02.x LTS branch is at 1.16.10, when the security > fixes landed in 1.16.12. > > I've just submitted 1.17.6 to the list and will submit 1.16.12 for > 2021.02.x as well. A 1.1.6.12 bump for the 2021.02.x branch will definitely be welcome. Regards, Arnout > > On Sun, Dec 12, 2021 at 1:01 AM Christian Stewart wrote: >> --- a/package/go/go.hash >> +++ b/package/go/go.hash >> @@ -1,3 +1,3 @@ >> # From https://golang.org/dl/ >> -sha256 705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0 go1.17.3.src.tar.gz >> +sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz >> sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE >> diff --git a/package/go/go.mk b/package/go/go.mk >> index 59177e54db..0d9ceab2bb 100644 >> --- a/package/go/go.mk >> +++ b/package/go/go.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -GO_VERSION = 1.17.3 >> +GO_VERSION = 1.17.5 >> GO_SITE = https://storage.googleapis.com/golang >> GO_SOURCE = go$(GO_VERSION).src.tar.gz > > Thanks & best regards, > Christian Stewart > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From christian at paral.in Thu Jan 6 22:04:56 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:04:56 -0800 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: <20220106210000.397694-9-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-9-thomas.petazzoni@bootlin.com> Message-ID: Hi Thomas, all, I get a build error with "make host-sentry-cli": error: failed to run custom build command for `libc v0.2.71` Caused by: process didn't exit successfully: `/build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build` (exit status: 1) --- stderr /build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build: /lib64/libc.so.6: version `GLIBC_2.34' not found (required by /build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build) I guess this is a rust-related issue? I think it's complaining about the glibc version of my build system. On Thu, Jan 6, 2022 at 1:00 PM Thomas Petazzoni wrote: ############################################### > +SENTRY_CLI_VERSION = 1.59.0 > +SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) Thanks & best regards, Christian From christian at paral.in Thu Jan 6 22:11:31 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:11:31 -0800 Subject: [Buildroot] [PATCH v3 10/11] package/embiggen-disk: new package In-Reply-To: <20220106210000.397694-11-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-11-thomas.petazzoni@bootlin.com> Message-ID: Hi all, On Thu, Jan 6, 2022 at 1:00 PM Thomas Petazzoni wrote: > > From: Christian Stewart via buildroot > > embiggen-disk is a tool to automatically resize disks to fill available space. > > +EMBIGGEN_DISK_VERSION = c554fc1c93a4004ce0b6a3f69b0dabe0481a2308 > +EMBIGGEN_DISK_SITE = $(call github,bradfitz,embiggen-disk,$(EMBIGGEN_DISK_VERSION)) The PR to fix mmcblk resizing was just merged (thanks bradfitz): https://github.com/bradfitz/embiggen-disk/pull/13#event-5854783562 So the patch can be dropped and the VERSION changed to: 9e7b2fc7b99c4dece41a805489a6ca377ce55a62 Thanks & best, Christian Stewart From luca at lucaceresoli.net Thu Jan 6 22:24:49 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 6 Jan 2022 23:24:49 +0100 Subject: [Buildroot] [PATCH v2 0/5] Rename sunxi-mali-mainline* to sunxi-mali-utgard* and fix Mali loading In-Reply-To: <5a11f784-6685-f33a-002d-654253e9bb61@mind.be> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> <5a11f784-6685-f33a-002d-654253e9bb61@mind.be> Message-ID: <04340ad2-23fc-48e0-80da-54bded5158c8@lucaceresoli.net> Hi Arnout, On 06/01/22 19:03, Arnout Vandecappelle wrote: > > > On 05/11/2021 23:17, Giulio Benetti wrote: >> With this patchset I respin the first 2 patches. While testing on >> hardware >> the patches they work, but I've left back an error while bumping linux >> version to 5.14. The error is that Linux's sunxi_defconfig(used by both >> a20_olinuxino_lime/2) enables Lima driver, but in this 2 boards we want >> to use Mali driver, so when Mali driver tries to load(being it a module), >> it finds that Lima already has taken gpu resources and fail. So here I >> add >> 3 patches, 1 to add a Linux fragment to disable Lima in Linux and other 2 >> to use that fragment in a20_olinuxino_lime/2. >> >> Giulio Benetti (3): >> ?? board/olimex/a20_olinuxino: add linux-disable-lima.fragment >> ?? configs/olimex_a20_olinuxino_lime2_defconfig: use >> ???? linux-disable-lima.fragment >> ?? configs/olimex_a20_olinuxino_lime_defconfig: use >> ???? linux-disable-lima.fragment >> >> Miquel Raynal (2): >> ?? package/sunxi-mali-utgard: rename from sunxi-mali-mainline >> ?? package/sunxi-mali-utgard-driver: rename from >> ???? sunxi-mali-mainline-driver > > ?I applied these two patches to master. > > ?Luca, your review was very much appreciated so if you could maybe > review the rest of this series as well? :-) I'm afraid I'm unable to do so these days. Hopefully next week. -- Luca From christian at paral.in Thu Jan 6 22:26:13 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:26:13 -0800 Subject: [Buildroot] [PATCH v3 00/11] Support for Cargo and Go vendoring In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: Hi Thomas, Your time spent on this series is much appreciated. On Thu, Jan 6, 2022 at 1:00 PM Thomas Petazzoni wrote: > Christian Stewart via buildroot (2): > package/embiggen-disk: new package > package/gocryptfs: new package It'd be nice if the author on these commits could be edited to remove the "via buildroot" ... this was added by a Patchwork bug a while back. Best regards, Christian From thomas.petazzoni at bootlin.com Thu Jan 6 22:29:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 23:29:13 +0100 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-9-thomas.petazzoni@bootlin.com> Message-ID: <20220106232913.370ee876@windsurf> Hello Christian, On Thu, 6 Jan 2022 14:04:56 -0800 Christian Stewart wrote: > I get a build error with "make host-sentry-cli": > > error: failed to run custom build command for `libc v0.2.71` > > Caused by: > process didn't exit successfully: > `/build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build` > (exit status: 1) > --- stderr > /build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build: > /lib64/libc.so.6: version `GLIBC_2.34' not found (required by > /build/host-sentry-cli-1.59.0/target/release/build/libc-a39b7215be30da0c/build-script-build) > > I guess this is a rust-related issue? I think it's complaining about > the glibc version of my build system. It build fine on two machines here. Could you provide more details about your host distribution? Perhaps provide a docker container that reproduces this? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 6 22:29:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 23:29:49 +0100 Subject: [Buildroot] [PATCH v3 00/11] Support for Cargo and Go vendoring In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220106232949.636ec1ba@windsurf> On Thu, 6 Jan 2022 14:26:13 -0800 Christian Stewart wrote: > It'd be nice if the author on these commits could be edited to remove > the "via buildroot" > > ... this was added by a Patchwork bug a while back. ACK, will fix! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From christian at paral.in Thu Jan 6 22:30:08 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:30:08 -0800 Subject: [Buildroot] [PATCH v3 09/11] package/tinifier: new package In-Reply-To: <20220106210000.397694-10-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-10-thomas.petazzoni@bootlin.com> Message-ID: Hi all, On Thu, Jan 6, 2022 at 1:00 PM Thomas Petazzoni wrote: > > This is a Go package that needs vendor modules to be downloaded at > build time. > > Signed-off-by: Thomas Petazzoni > --- > +TINIFIER_VERSION = 3.4.0 > +TINIFIER_SITE = $(call github,tarampampam,tinifier,v$(TINIFIER_VERSION)) Build tested. Reviewed-by: Christian Stewart Thanks, Christian Stewart From fontaine.fabrice at gmail.com Thu Jan 6 22:30:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 6 Jan 2022 23:30:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/jitterentropy-library: needs threads Message-ID: <20220106223039.1065153-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 3.3.1 in commit 3965f09cb427af411055a783cd14b501b2b28285 and https://github.com/smuellerDD/jitterentropy-library/commit/1e94512db65450ffd950e04fac61408b5efb7e2d In file included from ./jitterentropy.h:98, from src/jitterentropy-gcd.c:22: ./jitterentropy-base-user.h:74:10: fatal error: pthread.h: No such file or directory 74 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7b01eca8f1442318dd35282605fc8815e6afb0d0 Signed-off-by: Fabrice Fontaine --- package/jitterentropy-library/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/jitterentropy-library/Config.in b/package/jitterentropy-library/Config.in index 02f8ff6164..f9ae1bac5a 100644 --- a/package/jitterentropy-library/Config.in +++ b/package/jitterentropy-library/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_JITTERENTROPY_LIBRARY bool "libjitterentropy" + depends on BR2_TOOLCHAIN_HAS_THREADS help Hardware RNG based on CPU timing jitter. https://github.com/smuellerDD/jitterentropy-library + +comment "libjitterentropy needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS -- 2.34.1 From christian at paral.in Thu Jan 6 22:38:06 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 14:38:06 -0800 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: <20220106232913.370ee876@windsurf> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-9-thomas.petazzoni@bootlin.com> <20220106232913.370ee876@windsurf> Message-ID: Hi Thomas, On Thu, Jan 6, 2022 at 2:29 PM Thomas Petazzoni wrote: > On Thu, 6 Jan 2022 14:04:56 -0800 > Christian Stewart wrote: > > > I get a build error with "make host-sentry-cli": > > > > error: failed to run custom build command for `libc v0.2.71` > > /lib64/libc.so.6: version `GLIBC_2.34' not found (required by > It build fine on two machines here. Could you provide more details > about your host distribution? Perhaps provide a docker container that > reproduces this? I'm running an up-to-date Gentoo system at version 2.33. Currently 2.34 is masked: https://packages.gentoo.org/packages/sys-libs/glibc I guess the host-rust packages expect at least glibc 2.34. Best regards, Christian Stewart From fontaine.fabrice at gmail.com Thu Jan 6 22:39:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 6 Jan 2022 23:39:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburiparser: security bump to version 0.9.6 Message-ID: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> - Fixed: [CVE-2021-46141] Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* functions where the text range in .hostText would not be duped using malloc but remain unchanged (and hence "not owned") for URIs with an IPv4 or IPv6 address hostname; depending on how an application uses uriparser, this could lead the application into a use-after-free situation. As the second half, fix uriFreeUriMembers* functions that would not free .hostText memory for URIs with an IPv4 or IPv6 address host; also, calling uriFreeUriMembers* multiple times on a URI of this very nature would result in trying to free pointers to stack (rather than heap) memory. - Fixed: [CVE-2021-46142] Fix functions uriNormalizeSyntax* for out-of-memory situations (i.e. malloc returning NULL) for URIs containing empty segments (any of user info, host text, query, or fragment) where previously pointers to stack (rather than heap) memory were freed. https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog Signed-off-by: Fabrice Fontaine --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 60acca2215..8b40807541 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c7bc604ece..c9903bd74f 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.5 -LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING -- 2.34.1 From romain.naour at smile.fr Thu Jan 6 22:42:20 2022 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 6 Jan 2022 23:42:20 +0100 Subject: [Buildroot] [PATCH v3 1/1] utils/check-package: add a check for the new spacing convention In-Reply-To: <20200603081253.14319-1-heiko.thiery@gmail.com> References: <20200603081253.14319-1-heiko.thiery@gmail.com> Message-ID: <9d963724-22c3-3f38-0535-8e0328e0f2f8@smile.fr> Hello, Le 03/06/2020 ? 10:12, Heiko Thiery a ?crit?: > The seperation of the fields in the hash file should be 2 spaces for > consistency. There are still a huge number of warnings when this patch is applied, because there are many packages still not fixed. Best regards, Romain > > Signed-off-by: Heiko Thiery > Cc: Yann E. MORIN > Cc: Thomas Petazzoni > --- > v1 -> v2: > removed re.escape() > > v2 -> v3: > re-add re.escape and removed '^' and '$' from regexp because they also are > escaped by re.escape(). > > Now 'make check-package' will not throw any exceptions. > > After conversion all hash files to the right format no more warnings > will occure: > > Oneliner provided by Yann will do that job: > $ find . -type f -name '*.hash' -print0 |xargs -0 sed -r -i -e 's/^(md5|sha(1|224|256|384|512))[[:space:]]+([^[:space:]]+)[[:space:]]+(.+)$/\1 \3 \4/' > > --- > utils/checkpackagelib/lib_hash.py | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py > index 3e381119a5..a72e8af0b9 100644 > --- a/utils/checkpackagelib/lib_hash.py > +++ b/utils/checkpackagelib/lib_hash.py > @@ -40,7 +40,7 @@ class HashType(_CheckFunction): > if len(fields) < 2: > return > > - htype, hexa = fields[:2] > + htype, hexa, filename = fields[:3] > if htype == "none": > return > if htype not in self.len_of_hash.keys(): > @@ -53,3 +53,7 @@ class HashType(_CheckFunction): > .format(self.filename, lineno, self.url_to_manual), > text, > "expected {} hex digits".format(self.len_of_hash[htype])] > + if not re.match(re.escape("{} {} {}".format(htype, hexa, filename)), text): > + return ["{}:{}: separation does not match expectation " > + "({}#adding-packages-hash)" > + .format(self.filename, lineno, self.url_to_manual), text] > From fontaine.fabrice at gmail.com Thu Jan 6 22:56:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 6 Jan 2022 23:56:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvdpau: bump to version 1.4 Message-ID: <20220106225647.1162108-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://gitlab.freedesktop.org/vdpau/libvdpau/-/tags/1.4 Signed-off-by: Fabrice Fontaine --- package/libvdpau/libvdpau.hash | 7 +++---- package/libvdpau/libvdpau.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libvdpau/libvdpau.hash b/package/libvdpau/libvdpau.hash index 0833d41bf4..653657322a 100644 --- a/package/libvdpau/libvdpau.hash +++ b/package/libvdpau/libvdpau.hash @@ -1,5 +1,4 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003021.html -sha256 b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e libvdpau-1.3.tar.bz2 -sha512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2 # Locally computed -sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING +sha256 4258824c5a4555ef31de0a7d82b3caf19e75a16a13949f1edafc5f6fb2d33f30 libvdpau-1.4.tar.bz2 +# Locally computed +sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING diff --git a/package/libvdpau/libvdpau.mk b/package/libvdpau/libvdpau.mk index 63aecaf744..ae2f388855 100644 --- a/package/libvdpau/libvdpau.mk +++ b/package/libvdpau/libvdpau.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVDPAU_VERSION = 1.3 +LIBVDPAU_VERSION = 1.4 LIBVDPAU_SOURCE = libvdpau-$(LIBVDPAU_VERSION).tar.bz2 LIBVDPAU_SITE = \ https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$(LIBVDPAU_VERSION) -- 2.34.1 From thomas.petazzoni at bootlin.com Thu Jan 6 22:59:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 6 Jan 2022 23:59:26 +0100 Subject: [Buildroot] [PATCH v3 08/11] package/sentry-cli: re-add package In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-9-thomas.petazzoni@bootlin.com> <20220106232913.370ee876@windsurf> Message-ID: <20220106235926.012b8ca8@windsurf> Hello, On Thu, 6 Jan 2022 14:38:06 -0800 Christian Stewart wrote: > I'm running an up-to-date Gentoo system at version 2.33. > > Currently 2.34 is masked: > > https://packages.gentoo.org/packages/sys-libs/glibc > > I guess the host-rust packages expect at least glibc 2.34. Seems unlikely, because I just built the following configuration in the buildroot/base:20200814.2228 container, which is very old Debian with glibc 2.24 (yes 2.24). BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_SENTRY_CLI=y $ dpkg -l | grep libc6 ii libc6:amd64 2.24-11+deb9u1 amd64 GNU C Library: Shared libraries ii libc6:i386 2.24-11+deb9u1 i386 GNU C Library: Shared libraries Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Fri Jan 7 00:14:04 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 01:14:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: fix blank entry in cross-compilation.conf In-Reply-To: References: <20201023061251.29900-1-derrick@meter.com> <20201024203231.36f8b4a5@gmx.net> Message-ID: Hello Derrick, Le 24/10/2020 ? 21:02, Derrick Pallas a ?crit?: > Thanks for looking Peter. > > On 10/24/20 11:32 AM, Peter Seiderer wrote: >> On my system (for a RPi4 configuration) already without your patch: >> >> ????$ grep cpu host/etc/meson/cross-compilation.conf >> cpu_family ='aarch64' >> cpu = 'cortex-a72' >> >> GCC_TARGET_CPU comes from arch/arch.mk: >> >> GCC_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU)) >> >> Anything special with your configuration/build environment (which >> buildroot version)? What is the BR2_GCC_TARGET_CPU entry in >> your .config file? > > I've tried this on both the development branch and on 2020.08.1 and I get the > same results. The target is an x86_64/silvermont. After taking a second look, > the problem seems to be that arch/Config.in.x86 does not actually set > BR2_GCC_TARGET_CPU; instead, it sets BR2_GCC_TARGET_ARCH with a value that might > better described as BR2_GCC_TARGET_CPU. Thus, my config has > > ????BR2_ARCH = x86_64 # because BR2_x86_64 > ????BR2_GCC_TARGET_ARCH = silvermont # because BR2_x86_silvermont > > Is the config variable misnamed for x86? Adding Thomas Petazzoni, since it looks > like he did the original breakout of BR2_GCC_TARGET_ARCH and then later removed > it from several archs (e.g. arm) in favor of cpu. > > Or should there be a fallback from BR2_GCC_TARGET_CPU to BR2_GCC_TARGET_ARCH if > the former does not exist? I don't see any change with this patch applied. Indeed, cpu is empty on x86_64 architecture: [host_machine] system = 'linux' cpu_family = 'x86_64' cpu = '' endian = 'little' On aach64: [host_machine] system = 'linux' cpu_family = 'aarch64' cpu = 'cortex-a53' endian = 'little' See meson documentation about cpu_family vs cpu: https://mesonbuild.com/Cross-compilation.html#machine-entries Yocto use TARGET_ARCH as cpu value: https://github.com/openembedded/openembedded-core/blob/dunfell/meta/classes/meson.bbclass#L119 Did you try to use BR2_GCC_TARGET_ARCH as cpu value ? Did you notice any change/improvement ? I not sure it's really annoying since Buildroot use a toolchain wrapper that provide -mcpu= or -march= flag on the gcc command line. Best regards, Romain > > Thanks, ~Derrick > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From christian at paral.in Fri Jan 7 00:45:37 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 6 Jan 2022 16:45:37 -0800 Subject: [Buildroot] [PATCH-NEXT v3 4/6] support/download/go-post-process: implement Go vendoring support In-Reply-To: References: <20211010234655.585526-1-christian@paral.in> <20211010234655.585526-4-christian@paral.in> <20220106220824.31306aa6@windsurf> Message-ID: Hi all, On Thu, Jan 6, 2022 at 1:20 PM Christian Stewart wrote: > The usage of "go mod init" converts package files from older package > managers like Glide and vendor.conf into a go.mod and go.sum file with > the checksums maintained. > > > +# Do the Go vendoring > > > +pushd ${base_name} > /dev/null > > > +# modcacherw option leaves directories in the module cache at their default > > > +# permissions rather than making them read-only. > > > +if [ ! -f go.mod ] && [ -n "${gomod_init}" ]; then > > > + go mod init -modcacherw ${gomod_init} > > > So in the end, I ended up creating the go.mod manually (with the same > > logic) in both pkg-golang.mk and in this download post-process script. > > But if we find why "go mod init" didn't work in the context of > > pkg-golang.mk, we could switch back to using that. One other potential issue is Go will append a line with "go 1.16" - the major Go version - for compatibility reasons. So if we update Go to a new major version the go.mod might not be the same, causing a hash mismatch. Something to take a look at. Maybe when manually creating go.mod, we can append "go 1.16" to make the go.mod follow the 1.16 format. Best regards, Christian From james.hilliard1 at gmail.com Fri Jan 7 01:12:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 19:12:51 -0600 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: On Thu, Jan 6, 2022 at 3:00 PM Thomas Petazzoni wrote: > > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > cargo in order to support cross compiling C code within cargo. > > This commit also adds support/download/cargo-post-process to perform > the vendoring on Cargo packages. > > The _LICENSE variable of cargo packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Patrick Havelange > [Thomas: add support for host-cargo-package and vendoring] > Signed-off-by: Thomas Petazzoni > --- > package/Makefile.in | 1 + > package/pkg-cargo.mk | 153 ++++++++++++++++++++++++++++ > support/download/cargo-post-process | 38 +++++++ > 3 files changed, 192 insertions(+) > create mode 100644 package/pkg-cargo.mk > create mode 100755 support/download/cargo-post-process > > diff --git a/package/Makefile.in b/package/Makefile.in > index dae7a859fd..0ca2a5844e 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -441,3 +441,4 @@ include package/pkg-waf.mk > include package/pkg-golang.mk > include package/pkg-meson.mk > include package/pkg-qmake.mk > +include package/pkg-cargo.mk > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > new file mode 100644 > index 0000000000..bf1436a86b > --- /dev/null > +++ b/package/pkg-cargo.mk > @@ -0,0 +1,153 @@ > +################################################################################ > +# Cargo package infrastructure > +# > +# This file implements an infrastructure that eases development of package > +# .mk files for Cargo packages. It should be used for all packages that use > +# Cargo as their build system. > +# > +# See the Buildroot documentation for details on the usage of this > +# infrastructure > +# > +# In terms of implementation, this Cargo infrastructure requires the .mk file > +# to only specify metadata information about the package: name, version, > +# download URL, etc. > +# > +# We still allow the package .mk file to override what the different steps > +# are doing, if needed. For example, if _BUILD_CMDS is already defined, > +# it is used as the list of commands to perform to build the package, > +# instead of the default Cargo behaviour. The package can also define some > +# post operation hooks. > +# > +################################################################################ > + > +################################################################################ > +# inner-cargo-package -- defines how the configuration, compilation and > +# installation of a cargo package should be done, implements a few hooks > +# to tune the build process for cargo specifities and calls the generic > +# package infrastructure to generate the necessary make targets > +# > +# argument 1 is the lowercase package name > +# argument 2 is the uppercase package name, including a HOST_ prefix > +# for host packages > +# argument 3 is the uppercase package name, without the HOST_ prefix > +# for host packages > +# argument 4 is the type (target or host) > +################################################################################ > + > +define inner-cargo-package > + > +# We need host-rustc to run cargo > +$(2)_DOWNLOAD_DEPENDENCIES += host-rustc > + > +$(2)_CARGO_ENV += \ > + CARGO_HOME=$$(HOST_DIR)/share/cargo \ > + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > + CARGO_TARGET_APPLIES_TO_HOST="false" Maybe want to set these additional options as well so that packages using cargo can build with only the env variables set(in some cases at least I think), still probably need to pass some command line args but this should reduce the amount at least: RUSTC_TARGET_TRIPLE = $(subst -,_,$(call UPPERCASE,$(RUSTC_TARGET_NAME))) PKG_RUST_CARGO_ENV = \ CARGO_HOME=$(HOST_DIR)/share/cargo \ CARGO_BUILD_TARGET=$(RUSTC_TARGET_NAME) \ CARGO_INSTALL_ROOT=$(TARGET_DIR)/usr \ CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_RUST_CARGO_ENV = \ CARGO_HOME=$(HOST_DIR)/share/cargo \ CARGO_INSTALL_ROOT=$(HOST_DIR) \ RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" > + > +$(2)_DOWNLOAD_POST_PROCESS = cargo > +$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo > + > +# Due to vendoring, it is pretty likely that not all licenses are > +# listed in _LICENSE. > +$(2)_LICENSE += , vendored dependencies licenses probably not listed > + > +# Note: in all the steps below, we "cd" into the build directory to > +# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the > +# manifest-path. Indeed while the latter seems to work, it in fact > +# breaks in subtle ways as the way cargo searches for its > +# configuration file is based (among other rules) on the current > +# directory. This means that if cargo is started outside of a package > +# directory, its configuration file will not be taken into account. > +# > +# Also, we pass: > +# * --offline to prevent cargo from downloading anything: all > +# dependencies should have been built by the download post > +# process logic > +# * --locked to force cargo to use the Cargo.lock file, which ensures > +# that a fixed set of dependency versions is used > + > +# > +# Build step. Only define it if not already defined by the package .mk > +# file. > +# > +ifndef $(2)_BUILD_CMDS > +ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) \ > + $$(TARGET_CONFIGURE_OPTS) \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --target $$(RUSTC_TARGET_NAME) \ > + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ > + --manifest-path Cargo.toml \ > + --locked \ > + -Z target-applies-to-host \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +else # ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --release \ > + --manifest-path Cargo.toml \ > + --locked \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +endif # ifeq ($(4),target) > +endif # ifndef $(2)_BUILD_CMDS > + > +# > +# Target installation step. Only define it if not already defined by > +# the package .mk file. > +# > +ifndef $(2)_INSTALL_TARGET_CMDS > +define $(2)_INSTALL_TARGET_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ > + cargo install \ > + --target $$(RUSTC_TARGET_NAME) \ > + --offline \ > + --root $$(TARGET_DIR)/usr/ \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +ifndef $(2)_INSTALL_CMDS > +define $(2)_INSTALL_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo install \ > + --offline \ > + --root $$(HOST_DIR) \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +# Call the generic package infrastructure to generate the necessary > +# make targets > +$(call inner-generic-package,$(1),$(2),$(3),$(4)) > + > +endef > + > +################################################################################ > +# cargo-package -- the target generator macro for Cargo packages > +################################################################################ > + > +cargo-package = $(call inner-cargo-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) > +host-cargo-package = $(call inner-cargo-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) > diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process > new file mode 100755 > index 0000000000..25dbbedbfa > --- /dev/null > +++ b/support/download/cargo-post-process > @@ -0,0 +1,38 @@ > +#!/usr/bin/env bash > + > +set -e > + > +. "${0%/*}/helpers" > + > +while getopts "n:o:" OPT; do > + case "${OPT}" in > + o) output="${OPTARG}";; > + n) base_name="${OPTARG}";; > + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; > + \?) error "unknown option '%s'\n" "${OPTARG}";; > + esac > +done > + > +# Already vendored tarball, nothing to do > +if tar tf ${output} | grep -q "^[^/]*/VENDOR" ; then > + exit 0 > +fi > + > +post_process_unpack ${base_name} ${output} > + > +# Do the Cargo vendoring > +pushd ${base_name} > /dev/null > +cargo vendor --locked VENDOR > + > +# Create the local .cargo/config with vendor info > +mkdir -p .cargo/ > +cat <.cargo/config > +[source.crates-io] > +replace-with = "vendored-sources" > + > +[source.vendored-sources] > +directory = "VENDOR" > +EOF > +popd > /dev/null > + > +post_process_repack $(pwd) ${base_name} ${output} > -- > 2.33.1 > From david.oberhollenzer at sigma-star.at Fri Jan 7 03:24:59 2022 From: david.oberhollenzer at sigma-star.at (David Oberhollenzer) Date: Fri, 07 Jan 2022 03:24:59 +0000 Subject: [Buildroot] [ANNOUNCE] mtd-utils-2.1.4 is released Message-ID: Hi, mtd-utils-2.1.4 is released. Tarball: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.4.tar.bz2 Tarball gpg signature: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.4.tar.bz2.asc Signed git tag: git://git.infradead.org/mtd-utils.git v2.1.4 Alternatively also mirrored here: Tarball: https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2 Tarball gpg signature: https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2.asc Signed git tag: https://git.infraroot.at/mtd-utils.git v2.1.4 Roughly half a year after the last release, this is a smaller, patch level release that primarily consists of a hand full of fixes that have accumulated since then. This includes some fixes regarding the user space ports of mtd-tests using the wrong page size, and most recently a fix regarding a missing jffs2 kernel header in the last release tarball, causing build failures on some systems. Changes from 2.1.3 to 2.1.4: Features: - ubiscan debugging and statistics utility Fixes: - Some mtd-tests erroneously using sub-pages instead of the full page size - Buffer overrun in fectest - Missing jffs2 kernel header in the last release, leading to build failures on some systems. Raw short log since the 2.1.3 release: David Oberhollenzer (2): Fix: add missing new-line-escape in jffsX-utils Makemodule.am Diego Ismirlian (1): Add ubiscan utility Miquel Raynal (1): mtd-tests: Read and write pages during speed tests Ralph Siemsen (2): mtd-tests: use pages during readtest and stress fectest.c: fix buffer overrun Regards, David From james.hilliard1 at gmail.com Fri Jan 7 04:55:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 21:55:29 -0700 Subject: [Buildroot] [PATCH v3 1/3] package/qt5/qt5webengine-chromium-catapult: new package Message-ID: <20220107045531.3985241-1-james.hilliard1@gmail.com> This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entry --- package/qt5/Config.in | 1 + .../qt5/qt5webengine-chromium-catapult/Config.in | 4 ++++ .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 14 ++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/Config.in create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..143926b743 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" source "package/qt5/qt5x11extras/Config.in" diff --git a/package/qt5/qt5webengine-chromium-catapult/Config.in b/package/qt5/qt5webengine-chromium-catapult/Config.in new file mode 100644 index 0000000000..471c2a2dbc --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the chromium source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT + bool diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 0000000000..8190a6dd5d --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 0000000000..5d0db1e790 --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE +QT5WEBENGINE_CHROMIUM_CATAPULT_INSTALL_TARGET = NO + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 04:55:31 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 21:55:31 -0700 Subject: [Buildroot] [PATCH v3 3/3] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220107045531.3985241-1-james.hilliard1@gmail.com> References: <20220107045531.3985241-1-james.hilliard1@gmail.com> Message-ID: <20220107045531.3985241-3-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags. Create a .git file so to trigger headers sync during configure. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- package/qt5/qt5location-mapboxgl/Config.in | 4 ++ .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 14 +++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 73 files changed, 222 insertions(+), 385 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 54e6f7d6a6..20a4a4f4c2 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..d10847ea04 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ec5264bfc9..df5b11557c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..8c0e02152d 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4bdb90b203 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..abffc2891d 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..d48a37fafe 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Jan 7 07:02:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 07 Jan 2022 07:02:49 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-06 Message-ID: <20220107071117.AE25F429CC@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-06 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 66 | 7 | 0 | 73 | 2021.11.x | 38 | 10 | 0 | 48 | master | 68 | 35 | 0 | 103 | Classification of failures by reason for master ----------------------------------------------- host-file-5.41 | 6 xxhash-0.8.1 | 6 mdadm-4.2 | 4 rygel-0.40.2 | 4 gstreamer1-mm-1.10.0 | 2 guile-3.0.7 | 2 jitterentropy-library-3.3.1 | 2 cryptsetup-2.4.2 | 1 docker-cli-20.10.11 | 1 frr-8.1 | 1 kf5-kcoreaddons-5.47.0 | 1 ksmbd-tools-3.4.3 | 1 nodejs-14.18.2 | 1 perl-5.34.0 | 1 rtorrent-0.9.8 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/0eb2a70d70203734395013b1860c7a090b085b48 | x86_64 | docker-cli-20.10.11 | NOK | http://autobuild.buildroot.net/results/4babe36e71ed822c8ea74408c3a0ab1fd5a419da | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/33761c0d9f826a87ec08953fa2cc8e96d99b30c8 | powerpc64 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/7245413aed7a36fa037812cad4a4115235da42be | ORPH xtensa | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/a0bc8536bd0ee8a1b9b80a9ab43acec72694fd73 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/4f07b50bc1a94ea7f84dfb6892341347625acba8 | ORPH riscv64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/2ee44be4d20b04e77b330c062e1b238268640b43 | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/067d3fe614db9076abb4fe8da2a95884e9e0d17e | ORPH riscv64 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/6a431b6eea4cac9a5fd969a27f4d0ecd661b3d68 | ORPH mips64el | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/c0054a41166aeccd2bb9b6792f1ca69631b03e99 | ORPH s390x | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/047f4d82412a45c39964c55a7a7fa91519632cb0 | ORPH mips64el | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/fbfabd0fd0e2852b52f6814369d1427f855b68e9 | ORPH i686 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/e4dd9d7f21d39a790e37e0968c6a36f335b8092a | ORPH arm | jitterentropy-library-3.3.1 | NOK | http://autobuild.buildroot.net/results/7b01eca8f1442318dd35282605fc8815e6afb0d0 | arm | jitterentropy-library-3.3.1 | NOK | http://autobuild.buildroot.net/results/c4fbfb5ab21ae0d231eb639add70c18f6427b753 | x86_64 | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/b9c165cb8915a0d749577aacd58d6dba0b25aba2 | arm | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/388ef9d258a45426deef76498f29e789b454a87d | arc | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/e0162cfce67ce116d05cd47ebfd2fb25a962ed18 | ORPH mips64el | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/c36127c93fdc43af95ab803893232f3f185f694f | ORPH mips64el | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/dc4def3b013717d5429e37e624db7d64ef490fa6 | ORPH arm | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/6cfae1bf8ef5e5492c117f9cecf8cbef154e25bd | ORPH mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/59b11ede8b55bf0ad01f6482373844fda1575edb | arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/2be1e8a878049e404ca16b131332ec3271175ef5 | x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/4804a2698323e80da546475dbaed0898e7edc76a | ORPH arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7da3584682c284ce7c1aed929fadf0786f412653 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7be99ab4d2d660850c226a4b2202ba1ffccff32a | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/cb4c60102778473d85be7de10ea667c282a225ff | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6f10eefde86c697e39aa40830978d8f916d7f6ea | powerpc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/15e0a4d80f60efb4f5058895bdc96c30649b5567 | mips64el | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/2be27ebfe555fb067254527fc4dd9804373db0aa | ORPH sparc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9dd8e9166e4ac6979301ae5629b9c2e5df6c2b14 | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/d826274bec640e4666885da6806233441f7d2fde | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/7672d5790993e0a99cfead40b53123972e21381d | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/81542df98312d44e60b4aae23fc2b50f30e51717 | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/433ab91ed2c29a98bef64a681f651a56e48290c2 | ORPH Classification of failures by reason for 2021.02.x -------------------------------------------------- zeromq-4.3.4 | 3 erlang-jiffy-1.0.6 | 1 host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | erlang-jiffy-1.0.6 | NOK | http://autobuild.buildroot.net/results/03aa44f014b919119c3cec583ebcdf56d518d497 | sparc64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c7c726103fdf4af56089a367fde59653c60545c9 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/339c5fee3102ffe2387712bbaeaeb8b41c7dcbd0 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/129f77be3ded7087e398fea805e8a8d4339e030e | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/61d91e03c28249df0ffee84444a2f359d0a22647 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/2a4c382963bf9af63e440e4ff6beb5a07d38f9a9 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/87dc8827f24abe4629bb6b2be3bc48063b83a002 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 5 unknown | 3 wavemon-0.9.4 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/44b3609ec0d0ab303d9fc7e14ea12096ed1bf4e1 | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/9f3b9c2ae25c5c87f98b28a30cff1f295d4a855c | powerpc | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/dfb587e294434b2f64ab1cb803db58d9a36069d3 | mipsel | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/3f2888b177af38b1ef02949740d2cefbf2607a43 | i586 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/7c9b4e0e2a55ad0584b36abd52e47722eaa92785 | sparc | unknown | NOK | http://autobuild.buildroot.net/results/90d94bff4f222b5560aa2eb8c6759e86fdddc17d | or1k | unknown | NOK | http://autobuild.buildroot.net/results/145f525743f74c364ac43df3dc304ee9d6d52f53 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/ce17b39b221506a90f7c4f644cece5ed50faf7fd | mips | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/28a08f675cc11242c2b5704cef90a4d3967f119c | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/27fe7985281bc05f6173c72b36ae6c7cd042e7a6 | Gitlab CI results for 2022-01-06 ================================ -- http://autobuild.buildroot.net From james.hilliard1 at gmail.com Fri Jan 7 08:00:55 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 01:00:55 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.43 Message-ID: <20220107080055.4003907-1-james.hilliard1@gmail.com> Add new meson configuration options and optional dependencies. Signed-off-by: James Hilliard --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index c41c0a3686..8464a56338 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b6a2eab8bda2f3cb87c3a0a714839696831ad27b5786674c4bd6c3776b9ebc97 pipewire-0.3.40.tar.bz2 +sha256 2e91f228ffb93494f2423956b930014de20e15639a03f3df4fca4ebf4bc51fc0 pipewire-0.3.43.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 7043745cc1..604d08f90d 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.40 +PIPEWIRE_VERSION = 0.3.43 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -28,7 +28,8 @@ PIPEWIRE_CONF_OPTS += \ -Dvideoconvert=enabled \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ - -Dsession-managers=[] + -Dsession-managers=[] \ + -Dlv2=disabled ifeq ($(BR2_PACKAGE_DBUS),y) PIPEWIRE_CONF_OPTS += -Ddbus=enabled @@ -174,6 +175,13 @@ else PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=disabled endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PIPEWIRE_CONF_OPTS += -Draop=enabled +PIPEWIRE_DEPENDENCIES += openssl +else +PIPEWIRE_CONF_OPTS += -Draop=disabled +endif + define PIPEWIRE_USERS pipewire -1 pipewire -1 * - - audio,video PipeWire System Daemon endef -- 2.25.1 From romain.naour at smile.fr Fri Jan 7 09:03:48 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 10:03:48 +0100 Subject: [Buildroot] [PATCHv4] package/bat: new package Message-ID: <20220107090348.3947187-1-romain.naour@smile.fr> From: David Pierret bat is a cat(1) clone with syntax highlighting and Git integration. Using the aarch64 ARM toolchain that use the prefix "aarch64-none-linux-gnu-", we need to set CC_aarch64_unknown_linux_gnu in the environment to provide the right toolchain prefix [1]. Otherwise the build fail because rust use aarch64-unknown-linux-gnu as default toolchain prefix. Indeed, the aarch64 ARM toolchain is not listed as supported toolchains [2][3]. The build succeed when the aarch64 Linaro toolchain is used (tuple "aarch64-unknown-linux-gnu-"). The problem occure during the package install step... For some reason bat is rebuilt during this step. A similar behavior has been observed for host-sentry-cli [4]. For now, only set CC_aarch64_unknown_linux_gnu in INSTALL_TARGET_CMDS (hack). Since we set CC_aarch64_unknown_linux_gnu, convert RUSTC_TARGET_NAME aarch64-unknown-linux-gnu to aarch64_unknown_linux_gnu since bash doesn't allow to minus characters in environement variables. [1] https://github.com/rust-lang/rust/blob/c367798cfd3817ca6ae908ce675d1d99242af148/src/ci/docker/dist-aarch64-linux/Dockerfile#L29 [2] https://github.com/rust-lang/rust/blob/52d2c7ac948d6abdc18eb9e05a53d03ddcaffd98/src/librustc_target/spec/mod.rs#L492 [3] https://doc.rust-lang.org/nightly/rustc/platform-support.html [4] https://lore.kernel.org/buildroot/20201210213122.035e149a at windsurf.home/ Signed-off-by: David Pierret Signed-off-by: Romain Naour [Romain: Use CC_$(RUSTC_TARGET_NAME)] Signed-off-by: Romain Naour Cc: Thomas Petazzoni ---- bat supports syntax highlighting for a large number of programming and markup languages. He can communicates with git to show modifications with respect to the index. For conveignance use, bat can pipe its own output to less if the output is too large for one screen. v4: Convert to cargo package infrastructure bump to version 0.18.3 remove "select BR2_PACKAGE_NCURSES" Improve the commit log about the issue between the aarch64-linaro and the aarch64-ARM toolchains ("aarch64-none-linux-gnu-" vs "aarch64-unknown-linux-gnu-") See: https://doc.rust-lang.org/nightly/rustc/platform-support.html This patch needs the series "Support for Cargo and Go vendoring" v3 http://lists.busybox.net/pipermail/buildroot/2022-January/632561.html v3: remove "env" and use CC_$(subst -,_,$(RUSTC_TARGET_NAME)) instead of CC_$(RUSTC_TARGET_NAME) v1 -> v2 Add selection of less out of busybox for command line option compatibility bat: bump to version 0.18 & switch to cargo infra --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/bat/Config.in | 11 +++++++++++ package/bat/bat.hash | 4 ++++ package/bat/bat.mk | 12 ++++++++++++ package/pkg-cargo.mk | 1 + 6 files changed, 32 insertions(+) create mode 100644 package/bat/Config.in create mode 100644 package/bat/bat.hash create mode 100644 package/bat/bat.mk diff --git a/DEVELOPERS b/DEVELOPERS index ff661e9357..99637c7ae3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -673,6 +673,9 @@ F: linux/linux-ext-ev3dev-linux-drivers.mk F: package/brickd/ F: package/ev3dev-linux-drivers/ +N: David Pierret +F: package/bat/ + N: Davide Viti F: board/friendlyarm/nanopi-r1/ F: configs/friendlyarm_nanopi_r1_defconfig diff --git a/package/Config.in b/package/Config.in index a88f0a6849..98a4d4c5f3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ menu "System tools" endmenu menu "Text editors and viewers" + source "package/bat/Config.in" source "package/ed/Config.in" source "package/joe/Config.in" source "package/less/Config.in" diff --git a/package/bat/Config.in b/package/bat/Config.in new file mode 100644 index 0000000000..515eaf591a --- /dev/null +++ b/package/bat/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_BAT + bool "bat" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + # we need a full version of less + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_LESS + help + A cat(1) clone with syntax highlighting and Git integration. + + https://github.com/sharkdp/bat diff --git a/package/bat/bat.hash b/package/bat/bat.hash new file mode 100644 index 0000000000..aa6c8d743d --- /dev/null +++ b/package/bat/bat.hash @@ -0,0 +1,4 @@ +# Locally generated +sha256 9c345788eb916777a60e7ff32031f1c92edc5565031e0c057bce860982768744 bat-0.18.3.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE +sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk new file mode 100644 index 0000000000..9b619af172 --- /dev/null +++ b/package/bat/bat.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# bat +# +################################################################################ + +BAT_VERSION = 0.18.3 +BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) +BAT_LICENSE = Apache-2.0 or MIT +BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index bf1436a86b..e2fe104cf3 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -110,6 +110,7 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ + CC_$$(subst -,_,$$(RUSTC_TARGET_NAME))=$$(TARGET_CC) \ cargo install \ --target $$(RUSTC_TARGET_NAME) \ --offline \ -- 2.31.1 From thomas.petazzoni at bootlin.com Fri Jan 7 09:52:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 10:52:23 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: <20220107105223.01912574@windsurf> Hello James, On Thu, 6 Jan 2022 19:12:51 -0600 James Hilliard wrote: > > +$(2)_CARGO_ENV += \ > > + CARGO_HOME=$$(HOST_DIR)/share/cargo \ > > + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > > + CARGO_TARGET_APPLIES_TO_HOST="false" > > Maybe want to set these additional options as well so that packages > using cargo can > build with only the env variables set(in some cases at least I think), Thanks for the suggestion. However, could you be more specific than "maybe" and "I think" ? The way you put it seems like we don't really know why those variables would be useful and what they do. > still probably > need to pass some command line args but this should reduce the amount at least: > RUSTC_TARGET_TRIPLE = $(subst -,_,$(call UPPERCASE,$(RUSTC_TARGET_NAME))) Which command line arguments would be replaced by those variables? > PKG_RUST_CARGO_ENV = \ > CARGO_HOME=$(HOST_DIR)/share/cargo \ This one we already pass. > CARGO_BUILD_TARGET=$(RUSTC_TARGET_NAME) \ This one would replace the --target argument? Just to understand, what would be the advantage of the variable compared to the comand line argument? > CARGO_INSTALL_ROOT=$(TARGET_DIR)/usr \ This would replace --root $$(TARGET_DIR)/usr/ I suppose. Here as well, any benefit/drawback of arguments vs. variables? > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc How come things are working today with this one? > > HOST_PKG_RUST_CARGO_ENV = \ > CARGO_HOME=$(HOST_DIR)/share/cargo \ This one already passed. > CARGO_INSTALL_ROOT=$(HOST_DIR) \ This would replace --root $$(HOST_DIR) I suppose. > RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" This is already passed, although replicated between the build and install steps of the host variant. So essentially the only questions is: - Advantage of variables vs. command line options - Relevance of CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 10:05:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 11:05:22 +0100 Subject: [Buildroot] [PATCHv4] package/bat: new package In-Reply-To: <20220107090348.3947187-1-romain.naour@smile.fr> References: <20220107090348.3947187-1-romain.naour@smile.fr> Message-ID: <20220107110522.523586ae@windsurf> Hello, On Fri, 7 Jan 2022 10:03:48 +0100 Romain Naour wrote: > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index bf1436a86b..e2fe104cf3 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -110,6 +110,7 @@ ifndef $(2)_INSTALL_TARGET_CMDS > define $(2)_INSTALL_TARGET_CMDS > cd $$(@D) && \ > $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ > + CC_$$(subst -,_,$$(RUSTC_TARGET_NAME))=$$(TARGET_CC) \ But we don't even pass this variable at build time.. why would it be needed at install time? Due to the fact that "bar" builds stuff during the install step, I understand that we might need extra variable during the installation step, but I would expect to only need variables that are already passed during the build step. Any idea? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Fri Jan 7 10:05:52 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 11:05:52 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: <8b8ad2f1-b915-ff0d-54c4-0e1c36112db0@smile.fr> Hello Thomas, All, Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > cargo in order to support cross compiling C code within cargo. > > This commit also adds support/download/cargo-post-process to perform > the vendoring on Cargo packages. > > The _LICENSE variable of cargo packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Patrick Havelange > [Thomas: add support for host-cargo-package and vendoring] > Signed-off-by: Thomas Petazzoni > --- > +# > +# Build step. Only define it if not already defined by the package .mk > +# file. > +# > +ifndef $(2)_BUILD_CMDS > +ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) \ > + $$(TARGET_CONFIGURE_OPTS) \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --target $$(RUSTC_TARGET_NAME) \ > + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ > + --manifest-path Cargo.toml \ > + --locked \ > + -Z target-applies-to-host \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +else # ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --release \ > + --manifest-path Cargo.toml \ > + --locked \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +endif # ifeq ($(4),target) > +endif # ifndef $(2)_BUILD_CMDS > + > +# > +# Target installation step. Only define it if not already defined by > +# the package .mk file. > +# > +ifndef $(2)_INSTALL_TARGET_CMDS > +define $(2)_INSTALL_TARGET_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ Removing "CC_$$(subst -,_,$$(RUSTC_TARGET_NAME))=$$(TARGET_CC) " [1] and adding $$(TARGET_CONFIGURE_OPTS) fixes the build of bat package. The package is still rebuild during the install step but at least it build... [1] http://lists.busybox.net/pipermail/buildroot/2022-January/632610.html Best regards, Romain > + cargo install \ > + --target $$(RUSTC_TARGET_NAME) \ > + --offline \ > + --root $$(TARGET_DIR)/usr/ \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +ifndef $(2)_INSTALL_CMDS > +define $(2)_INSTALL_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo install \ > + --offline \ > + --root $$(HOST_DIR) \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > From romain.naour at smile.fr Fri Jan 7 10:08:21 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 11:08:21 +0100 Subject: [Buildroot] [PATCHv4] package/bat: new package In-Reply-To: <20220107110522.523586ae@windsurf> References: <20220107090348.3947187-1-romain.naour@smile.fr> <20220107110522.523586ae@windsurf> Message-ID: <0ebbe6b2-2932-862f-52a1-a34ab7d0f11e@smile.fr> Le 07/01/2022 ? 11:05, Thomas Petazzoni a ?crit?: > Hello, > > On Fri, 7 Jan 2022 10:03:48 +0100 > Romain Naour wrote: > >> diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk >> index bf1436a86b..e2fe104cf3 100644 >> --- a/package/pkg-cargo.mk >> +++ b/package/pkg-cargo.mk >> @@ -110,6 +110,7 @@ ifndef $(2)_INSTALL_TARGET_CMDS >> define $(2)_INSTALL_TARGET_CMDS >> cd $$(@D) && \ >> $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ >> + CC_$$(subst -,_,$$(RUSTC_TARGET_NAME))=$$(TARGET_CC) \ > > But we don't even pass this variable at build time.. why would it be > needed at install time? Due to the fact that "bar" builds stuff during > the install step, I understand that we might need extra variable during > the installation step, but I would expect to only need variables that > are already passed during the build step. It seems we just need to add $$(TARGET_CONFIGURE_OPTS) to _INSTALL_TARGET_CMDS http://lists.busybox.net/pipermail/buildroot/2022-January/632613.html > > Any idea? > > Thomas > From thomas.petazzoni at bootlin.com Fri Jan 7 10:17:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 11:17:27 +0100 Subject: [Buildroot] [PATCHv4] package/bat: new package In-Reply-To: <0ebbe6b2-2932-862f-52a1-a34ab7d0f11e@smile.fr> References: <20220107090348.3947187-1-romain.naour@smile.fr> <20220107110522.523586ae@windsurf> <0ebbe6b2-2932-862f-52a1-a34ab7d0f11e@smile.fr> Message-ID: <20220107111727.1d021ffd@windsurf> Hello, On Fri, 7 Jan 2022 11:08:21 +0100 Romain Naour wrote: > > But we don't even pass this variable at build time.. why would it be > > needed at install time? Due to the fact that "bar" builds stuff during > > the install step, I understand that we might need extra variable during > > the installation step, but I would expect to only need variables that > > are already passed during the build step. > > It seems we just need to add $$(TARGET_CONFIGURE_OPTS) to _INSTALL_TARGET_CMDS > > http://lists.busybox.net/pipermail/buildroot/2022-January/632613.html Ah, OK. This indeed we are passing at build time, but not at install time currently. We can certainly add that at install time too. Though this "build during install step" thing is a bit annoying... Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Fri Jan 7 10:26:22 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 11:26:22 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > cargo in order to support cross compiling C code within cargo. > > This commit also adds support/download/cargo-post-process to perform > the vendoring on Cargo packages. Download post-processing does't work when we use _OVERRIDE_SRCDIR. Maybe we have to make sure that all download of vendor modules are already present in the source directory used by _OVERRIDE_SRCDIR. Best regards, Romain > > The _LICENSE variable of cargo packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Patrick Havelange > [Thomas: add support for host-cargo-package and vendoring] > Signed-off-by: Thomas Petazzoni From yann.morin.1998 at free.fr Fri Jan 7 10:21:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:21:06 +0100 Subject: [Buildroot] [git commit] package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable Message-ID: <20220107102059.7518F83486@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2da7b07a22fc2c610f670c153e987d35d966022b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will allow packages to register that a download post-processing is needed. Note that this variable is intentionally not documented: it is an internal variable meant to be set by package infrastructures, not directly by packages. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/pkg-download.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 823b34981c..a15e21e110 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -118,6 +118,7 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_DOWNLOAD_POST_PROCESS),-p '$($(2)_DOWNLOAD_POST_PROCESS)') \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ From yann.morin.1998 at free.fr Fri Jan 7 10:21:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:21:36 +0100 Subject: [Buildroot] [git commit] support/download/post-process-helpers: add helper function for post process scripts Message-ID: <20220107102059.7D10C83487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f42d06ecf350aaa2d20bf716bf549d55b95982e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master download post process scripts will often need to unpack the source code tarball, do some operation, and then repack it. In order to help with this, post-process-helpers provide an unpack() function and a repack() function. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/download/helpers | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/support/download/helpers b/support/download/helpers index 40d5eea591..4c5eb466cc 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -72,5 +72,27 @@ mk_tar_gz() { popd >/dev/null } +post_process_unpack() { + local dest="${1}" + local tarball="${2}" + local one_file + + mkdir "${dest}" + tar -C "${dest}" --strip-components=1 -xf "${tarball}" + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |head -z -n1 |tr -d "\0")" + touch -r "${one_file}" "${dest}.timestamp" +} + +post_process_repack() { + local in_dir="${1}" + local base_dir="${2}" + local out="${3}" + local date + + date="@$(stat -c '%Y' "${in_dir}/${base_dir}.timestamp")" + + mk_tar_gz "${in_dir}/${base_dir}" "${base_dir}" "${date}" "${out}" +} + # Keep this line and the following as last lines in this file. # vim: ft=bash From yann.morin.1998 at free.fr Fri Jan 7 10:19:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:19:10 +0100 Subject: [Buildroot] [git commit] support/download/dl-wrapper: add concept of download post-processing Message-ID: <20220107102059.6B7BC8296B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1db15e2853ff5a234e8ed1a70a75b5d426dceec5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to support package managers such as Cargo (Rust) or Go, we want to run some custom logic after the main download, but before packing the tarball and checking the hash. To implement this, this commit introduces a concept of download post-processing: if -p is passed to the dl-wrapper, then support/download/-post-process will be called. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - double-quote variable expansion when calling post-process script ] Signed-off-by: Yann E. MORIN --- support/download/dl-wrapper | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 3185887541..09a6ac1f1a 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -25,7 +25,7 @@ main() { local -a uris # Parse our options; anything after '--' is for the backend - while getopts ":c:d:D:o:n:N:H:lrf:u:q" OPT; do + while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do case "${OPT}" in c) cset="${OPTARG}";; d) dl_dir="${OPTARG}";; @@ -38,6 +38,7 @@ main() { r) recurse="-r";; f) filename="${OPTARG}";; u) uris+=( "${OPTARG}" );; + p) post_process="${OPTARG}";; q) quiet="-q";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; @@ -136,6 +137,12 @@ main() { continue fi + if [ -n "${post_process}" ] ; then + "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + fi + # cd back to free the temp-dir, so we can remove it later cd "${OLDPWD}" From yann.morin.1998 at free.fr Fri Jan 7 10:28:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:28:19 +0100 Subject: [Buildroot] [PATCH v3 01/11] support/download/dl-wrapper: add concept of download post-processing In-Reply-To: <20220106210000.397694-2-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-2-thomas.petazzoni@bootlin.com> Message-ID: <20220107102819.GA1268635@scaer> Thomas, All, On 2022-01-06 21:59 +0100, Thomas Petazzoni spake thusly: > In order to support package managers such as Cargo (Rust) or Go, we > want to run some custom logic after the main download, but before > packing the tarball and checking the hash. > > To implement this, this commit introduces a concept of download > post-processing: if -p is passed to the dl-wrapper, then > support/download/-post-process will be called. > > Signed-off-by: Thomas Petazzoni > --- > support/download/dl-wrapper | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper > index 3315bd410e..e6509e5671 100755 > --- a/support/download/dl-wrapper > +++ b/support/download/dl-wrapper > @@ -25,7 +25,7 @@ main() { > local -a uris > > # Parse our options; anything after '--' is for the backend > - while getopts ":c:d:D:o:n:N:H:rf:u:q" OPT; do > + while getopts ":c:d:D:o:n:N:H:rf:u:qp:" OPT; do > case "${OPT}" in > c) cset="${OPTARG}";; > d) dl_dir="${OPTARG}";; > @@ -37,6 +37,7 @@ main() { > r) recurse="-r";; > f) filename="${OPTARG}";; > u) uris+=( "${OPTARG}" );; > + p) post_process="${OPTARG}";; > q) quiet="-q";; > :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; > \?) error "unknown option '%s'\n" "${OPTARG}";; > @@ -135,6 +136,12 @@ main() { > continue > fi > > + if [ -n "${post_process}" ] ; then > + ${OLDPWD}/support/download/${post_process}-post-process \ I added double-quotes when expanding those variables. Applied to master, thanks. Regards, Yann E. MORIN. > + -o "${tmpf}" \ > + -n "${raw_base_name}" > + fi > + > # cd back to free the temp-dir, so we can remove it later > cd "${OLDPWD}" > > -- > 2.33.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 7 10:35:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:35:51 +0100 Subject: [Buildroot] [PATCH v3 02/11] package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable In-Reply-To: <20220106210000.397694-3-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-3-thomas.petazzoni@bootlin.com> Message-ID: <20220107103551.GB1268635@scaer> Thomas, All, On 2022-01-06 21:59 +0100, Thomas Petazzoni spake thusly: > This will allow packages to register than a download post-processing > is needed. Note that this variable is intentionally not documented: it > is an internal variable meant to be set by package infrastructures, > not directly by packages. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-download.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/pkg-download.mk b/package/pkg-download.mk > index 2527ba5c60..66a415cce0 100644 > --- a/package/pkg-download.mk > +++ b/package/pkg-download.mk > @@ -117,6 +117,7 @@ define DOWNLOAD > -n '$($(2)_BASENAME_RAW)' \ > -N '$($(2)_RAWNAME)' \ > -o '$($(2)_DL_DIR)/$(notdir $(1))' \ > + $(if $($(2)_DOWNLOAD_POST_PROCESS),-p '$($(2)_DOWNLOAD_POST_PROCESS)') \ > $(if $($(2)_GIT_SUBMODULES),-r) \ > $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ > $(QUIET) \ > -- > 2.33.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 7 10:36:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:36:13 +0100 Subject: [Buildroot] [PATCH v3 03/11] support/download/post-process-helpers: add helper function for post process scripts In-Reply-To: <20220106210000.397694-4-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-4-thomas.petazzoni@bootlin.com> Message-ID: <20220107103613.GC1268635@scaer> Thomas, All, On 2022-01-06 21:59 +0100, Thomas Petazzoni spake thusly: > download post process scripts will often need to unpack the source > code tarball, do some operation, and then repack it. In order to help > with this, post-process-helpers provide an unpack() function and a > repack() function. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/download/helpers | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/support/download/helpers b/support/download/helpers > index 40d5eea591..4c5eb466cc 100755 > --- a/support/download/helpers > +++ b/support/download/helpers > @@ -72,5 +72,27 @@ mk_tar_gz() { > popd >/dev/null > } > > +post_process_unpack() { > + local dest="${1}" > + local tarball="${2}" > + local one_file > + > + mkdir "${dest}" > + tar -C "${dest}" --strip-components=1 -xf "${tarball}" > + one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |head -z -n1 |tr -d "\0")" > + touch -r "${one_file}" "${dest}.timestamp" > +} > + > +post_process_repack() { > + local in_dir="${1}" > + local base_dir="${2}" > + local out="${3}" > + local date > + > + date="@$(stat -c '%Y' "${in_dir}/${base_dir}.timestamp")" > + > + mk_tar_gz "${in_dir}/${base_dir}" "${base_dir}" "${date}" "${out}" > +} > + > # Keep this line and the following as last lines in this file. > # vim: ft=bash > -- > 2.33.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 7 10:44:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 11:44:59 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: <20220107104459.GD1268635@scaer> Romain, All, On 2022-01-07 11:26 +0100, Romain Naour spake thusly: > Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > > cargo in order to support cross compiling C code within cargo. > > > > This commit also adds support/download/cargo-post-process to perform > > the vendoring on Cargo packages. > > Download post-processing does't work when we use _OVERRIDE_SRCDIR. This is indeed expected: _OVERRIDE_SRCDIR is skipping all the download, extract and patch steps. Developers that are using an _OVERRIDE_SRCDIR are responsible for providing an source tree that is ready to be configured. So, this is probably something that should be added to the manual, if it is not already there, or to emphasise it if already there: When you are using OVERRIDE_SRCDIR, you are responsible for providing a source tree that is ready to be configured. Care to send a patch, please? Regards, Yann E. MORIN. > Maybe we have to make sure that all download of vendor modules are already > present in the source directory used by _OVERRIDE_SRCDIR. > > Best regards, > Romain > > > > > The _LICENSE variable of cargo packages is expanded with ", > > vendored dependencies licenses probably not listed" as currently for > > all packages, the licenses of the vendored dependencies are not taken > > into account. > > > > Signed-off-by: Patrick Havelange > > [Thomas: add support for host-cargo-package and vendoring] > > Signed-off-by: Thomas Petazzoni -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Fri Jan 7 11:03:40 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 12:03:40 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220107104459.GD1268635@scaer> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107104459.GD1268635@scaer> Message-ID: Le 07/01/2022 ? 11:44, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-07 11:26 +0100, Romain Naour spake thusly: >> Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: >>> From: Patrick Havelange >>> In order to be package agnostic, the install phase is now using cargo >>> instead of install. TARGET_CONFIGURE_OPTS is now also set when running >>> cargo in order to support cross compiling C code within cargo. >>> >>> This commit also adds support/download/cargo-post-process to perform >>> the vendoring on Cargo packages. >> >> Download post-processing does't work when we use _OVERRIDE_SRCDIR. > > This is indeed expected: _OVERRIDE_SRCDIR is skipping all the download, > extract and patch steps. > > Developers that are using an _OVERRIDE_SRCDIR are responsible for > providing an source tree that is ready to be configured. > > So, this is probably something that should be added to the manual, if it > is not already there, or to emphasise it if already there: > > When you are using OVERRIDE_SRCDIR, you are responsible for > providing a source tree that is ready to be configured. I did a try, It's not just adding vendor sources into package sources (in my case "bat" package). We have to execute "cargo vendor" from "bat" sources and use CARGO_HOME used by Buildroot: CARGO_HOME=$HOST_DIR/share/cargo cargo vendor Do we want to document this method ? Best regards, Romain > > Care to send a patch, please? > > Regards, > Yann E. MORIN. > >> Maybe we have to make sure that all download of vendor modules are already >> present in the source directory used by _OVERRIDE_SRCDIR. >> >> Best regards, >> Romain >> >>> >>> The _LICENSE variable of cargo packages is expanded with ", >>> vendored dependencies licenses probably not listed" as currently for >>> all packages, the licenses of the vendored dependencies are not taken >>> into account. >>> >>> Signed-off-by: Patrick Havelange >>> [Thomas: add support for host-cargo-package and vendoring] >>> Signed-off-by: Thomas Petazzoni > From thomas.claveirole at green-communications.fr Fri Jan 7 13:05:07 2022 From: thomas.claveirole at green-communications.fr (Thomas Claveirole) Date: Fri, 7 Jan 2022 14:05:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.10.0 Message-ID: <20220107130507.19541-1-thomas.claveirole@green-communications.fr> Signed-off-by: Thomas Claveirole --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index e29365fc91..11eae3de36 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 35a0b37a5c1e7c48553215c6e8c24a12bac8e9048f008fc61c4b329cf6611b5c v6.9.0-dist.zip +sha256 da3025279bbd6cfb0e82b7af95666bede8fd65e8c620a1bc54bba04cebb7e1d4 v6.10.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index b20ea9977c..781f9901ea 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.9.0 +OPENLAYERS_VERSION = 6.10.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause -- 2.34.1 From bugzilla at busybox.net Fri Jan 7 13:50:07 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 07 Jan 2022 13:50:07 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #5 from Sreedhar Mahadevan --- Thanks a lot for the response. I shall try this out and give a feedback. -- You are receiving this mail because: You are on the CC list for the bug. From sebastien.szymanski at armadeus.com Fri Jan 7 14:05:46 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Fri, 7 Jan 2022 15:05:46 +0100 Subject: [Buildroot] [PATCH 2/2] package/gstreamer1/gst1-plugins-bayer2rgb-neon: show comment on aarch64 In-Reply-To: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> References: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> Message-ID: <20220107140546.1921-2-sebastien.szymanski@armadeus.com> On aarch64, the Config.in comment for gst1-plugins-bayer2rgb-neon is not shown when a dependency is missing. Fix that. Signed-off-by: S?bastien Szymanski --- package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in index d3e4d0e243..68d7a2bc56 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -15,6 +15,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON https://gitlab-ext.sigma-chemnitz.de/ensc/gst-bayer2rgb-neon comment "gst1-plugins-bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" - depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.34.1 From sebastien.szymanski at armadeus.com Fri Jan 7 14:05:45 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Fri, 7 Jan 2022 15:05:45 +0100 Subject: [Buildroot] [PATCH 1/2] package/gstreamer1/gst1-plugins-bayer2rgb-neon: use "config" Message-ID: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> gst1-plugins-bayer2rgb-neon doesn't have sub-options so use "config" instead of "menuconfig". Signed-off-by: S?bastien Szymanski --- package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in index 570300a304..d3e4d0e243 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -1,4 +1,4 @@ -menuconfig BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON +config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON bool "gst1-plugins-bayer2rgb-neon" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 # bayer2rgb-neon depends on !BR2_STATIC_LIBS # bayer2rgb-neon -- 2.34.1 From peter at korsgaard.com Fri Jan 7 17:06:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:06:56 +0100 Subject: [Buildroot] [git commit] package/liburiparser: security bump to version 0.9.6 Message-ID: <20220107170226.7363D826D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e00379361e16f24a348c12bb26eab4dc0af94e84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fixed: [CVE-2021-46141] Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* functions where the text range in .hostText would not be duped using malloc but remain unchanged (and hence "not owned") for URIs with an IPv4 or IPv6 address hostname; depending on how an application uses uriparser, this could lead the application into a use-after-free situation. As the second half, fix uriFreeUriMembers* functions that would not free .hostText memory for URIs with an IPv4 or IPv6 address host; also, calling uriFreeUriMembers* multiple times on a URI of this very nature would result in trying to free pointers to stack (rather than heap) memory. - Fixed: [CVE-2021-46142] Fix functions uriNormalizeSyntax* for out-of-memory situations (i.e. malloc returning NULL) for URIs containing empty segments (any of user info, host text, query, or fragment) where previously pointers to stack (rather than heap) memory were freed. https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 60acca2215..8b40807541 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c7bc604ece..c9903bd74f 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.5 -LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 7 17:08:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:08:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburiparser: security bump to version 0.9.6 In-Reply-To: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 6 Jan 2022 23:39:05 +0100") References: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> Message-ID: <87tuefmq1p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fixed: [CVE-2021-46141] > Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* > functions where the text range in .hostText would not be duped using > malloc but remain unchanged (and hence "not owned") for URIs with > an IPv4 or IPv6 address hostname; depending on how an application > uses uriparser, this could lead the application into a use-after-free > situation. > As the second half, fix uriFreeUriMembers* functions that would not > free .hostText memory for URIs with an IPv4 or IPv6 address host; > also, calling uriFreeUriMembers* multiple times on a URI of this > very nature would result in trying to free pointers to stack > (rather than heap) memory. > - Fixed: [CVE-2021-46142] > Fix functions uriNormalizeSyntax* for out-of-memory situations > (i.e. malloc returning NULL) for URIs containing empty segments > (any of user info, host text, query, or fragment) where previously > pointers to stack (rather than heap) memory were freed. > https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 17:11:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:11:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvdpau: bump to version 1.4 In-Reply-To: <20220106225647.1162108-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 6 Jan 2022 23:56:47 +0100") References: <20220106225647.1162108-1-fontaine.fabrice@gmail.com> Message-ID: <87pmp3mpx8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://gitlab.freedesktop.org/vdpau/libvdpau/-/tags/1.4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 17:09:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:09:47 +0100 Subject: [Buildroot] [git commit] package/libvdpau: bump to version 1.4 Message-ID: <20220107170533.A6369826D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=211063b9534b498d581c0a1d6a0d4c2bb1bb0679 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://gitlab.freedesktop.org/vdpau/libvdpau/-/tags/1.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libvdpau/libvdpau.hash | 7 +++---- package/libvdpau/libvdpau.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libvdpau/libvdpau.hash b/package/libvdpau/libvdpau.hash index 0833d41bf4..653657322a 100644 --- a/package/libvdpau/libvdpau.hash +++ b/package/libvdpau/libvdpau.hash @@ -1,5 +1,4 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003021.html -sha256 b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e libvdpau-1.3.tar.bz2 -sha512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2 # Locally computed -sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING +sha256 4258824c5a4555ef31de0a7d82b3caf19e75a16a13949f1edafc5f6fb2d33f30 libvdpau-1.4.tar.bz2 +# Locally computed +sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING diff --git a/package/libvdpau/libvdpau.mk b/package/libvdpau/libvdpau.mk index 63aecaf744..ae2f388855 100644 --- a/package/libvdpau/libvdpau.mk +++ b/package/libvdpau/libvdpau.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVDPAU_VERSION = 1.3 +LIBVDPAU_VERSION = 1.4 LIBVDPAU_SOURCE = libvdpau-$(LIBVDPAU_VERSION).tar.bz2 LIBVDPAU_SITE = \ https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$(LIBVDPAU_VERSION) From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:11 +0100 Subject: [Buildroot] [PATCH 1/7] package/ca-certificates: remove dependency on host-python-cryptography In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-2-thomas.petazzoni@bootlin.com> The host-python-cryptography module is only used by ca-certificates for a check of the expiration date of certificates, which is only a warning not even causing the build to abort, i.e something that Buildroot users are most likely never going to see. Since the host-python-cryptography dependency would soon require a dependency on rust, it's a lot simpler to just patch the certdata2pem.py script to no longer require cryptography, but only make use of it if available. Signed-off-by: Thomas Petazzoni --- ...2pem.py-make-cryptography-module-opt.patch | 59 +++++++++++++++++++ package/ca-certificates/ca-certificates.mk | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch diff --git a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch new file mode 100644 index 0000000000..b76c1bfd7f --- /dev/null +++ b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch @@ -0,0 +1,59 @@ +From bf18b564122e8f976681a2398862fde1eafd84ba Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 6 Jan 2022 23:15:00 +0100 +Subject: [PATCH] mozilla/certdata2pem.py: make cryptography module optional + +The Python cryptography module is only used to verify if trusted +certificates have expired, but this is only a warning. For some build +systems and distributions, providing Python cryptography is costly, +especially since it's now partly written in Rust. + +As the check is only a warning, it's anyway going to be overlooked by +most people. This commit changes the check to be optional: if the +cryptography Python module is there, we perform the check, otherwise +the check is skipped. + +Signed-off-by: Thomas Petazzoni +--- + mozilla/certdata2pem.py | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index ede23d4..a6261f8 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -28,9 +28,6 @@ import sys + import textwrap + import io + +-from cryptography import x509 +- +- + objects = [] + + # Dirty file parser. +@@ -122,11 +119,16 @@ for obj in objects: + if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: + continue + +- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) +- if cert.not_valid_after < datetime.datetime.now(): +- print('!'*74) +- print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) +- print('!'*74) ++ try: ++ from cryptography import x509 ++ ++ cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) ++ if cert.not_valid_after < datetime.datetime.now(): ++ print('!'*74) ++ print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) ++ print('!'*74) ++ except ImportError: ++ pass + + bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ + .replace(' ', '_')\ +-- +2.33.1 + diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 7084ab781e..0b6962ab7b 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -7,7 +7,7 @@ CA_CERTIFICATES_VERSION = 20211016 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates -CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 host-python-cryptography +CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:10 +0100 Subject: [Buildroot] [PATCH 0/7] Bump of python-cryptography and other Rust related fun Message-ID: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Hello, This series bumps the python-cryptography package to a new version. It is based on earlier work from James Hilliard at: https://patchwork.ozlabs.org/project/buildroot/patch/20210318044253.3202355-2-james.hilliard1 at gmail.com/ But it did require quite some more work, which is presented in this patch series. The unique challenge caused by this version bump is that python-cryptography now has some Rust code integrated, so suddenly this package, and all its reverse dependencies need to depend on Rust being available. There is also a host variant of python-cryptography, which is used solely by ca-certificates, which has a significant number of reverse dependencies. To avoid adding Rust dependencies to these, we broke the dependency of ca-certificates on host-python-cryptography using a simple patch, and dropped host-python-cryptography altogether. This patch series depends on the "Go/Cargo vendoring" patch series posted recently. Indeed, the Rust code in python-cryptography depends on other Cargo crates, which we don't want to download during the build, but really during the download step. There is however still one problem with the last patch of the series, see below. This series is available at: https://github.com/tpetazzoni/buildroot/tree/python-cryptography The patch series goes like this: - PATCH 1 modifies ca-certificates to no longer need host-python-cryptography - PATCH 2 drops host-python-cryptography itselef - PATCH 3 and 4 fix some issues in package/rustc/ in the description of the ARMv5 and RISC-V 64-bit Rust support. We noticed this because Rust binaries were not working on ARMv5 ("Illegal instruction"), this was due to the fact that we were using the pre-compiled Rust standard library for ARMv6, due to a bogus architecture name. This is fixed by PATCH 3. And while reviewing this, we spotted a similar issue for RISC-V 64-bit, which is fixed in PATCH 4. - PATCH 5 slightly improves the Cargo download post-process script to make it possible to pass a custom path to the Cargo.toml file, instead of assuming it's located at the root of the package source tree. - PATCH 6 modifies the runtime test cases that involve python-cryptography directly or indirectly to use a glibc toolchain instead of the default uclibc toolchain. Indeed, Rust is for now not available on uClibc platforms. This could have been done in the patch doing the version bump, but the version bump patch is already quite large, and the update of the runtime tests could be done as a separate preparation step. - PATCH 7 finally bumps python-cryptography itself. python-cryptography itself requires a bit of trickery to leverage the Cargo download post-process logic, to vendor dependencies during the download step. Then the patch also touches the entire reverse dependency tree (sometimes up to 5 levels deep!). This patch should NOT be applied for now, due to issues (see below). This series was tested by building the following configuration: BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_PYTHON_CHANNELS_REDIS=y BR2_PACKAGE_PYTHON_CROSSBAR=y BR2_PACKAGE_PYTHON_KEYRING=y BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO=y BR2_PACKAGE_PYTHON_TXDBUS=y BR2_PACKAGE_DOCKER_COMPOSE=y # BR2_TARGET_ROOTFS_TAR is not set that builds all affected packages. It was also tested by running all Python runtime test cases: https://gitlab.com/tpetazzoni/buildroot/-/pipelines/443445436 The one thing that fails is when building python-cryptography on a target arch that is the same as the host. This can be reproduced by running the tests.package.test_docker_compose.TestDockerCompose test case. We get this: Running `/home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build` error: failed to run custom build command for `proc-macro-hack v0.5.19` Caused by: process didn't exit successfully: `/home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build` (exi t status: 1) --- stderr /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio n `GLIBC_2.33' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio n `GLIBC_2.32' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio n `GLIBC_2.34' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) warning: build failed, waiting for other jobs to finish... error: build failed Which looks terribly similar to the issue on ripgrep which was fixed by commit 4b2be770b8a853a7dd97b5788d837f0d84923fa1. So I tried doing the same, i.e passing: __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ CARGO_TARGET_APPLIES_TO_HOST="false" in the environment, and -Z target-applies-to-host to cargo (by passing it to the args argument of the RustExtension class in python-cryptography's setup.py). But cargo doesn't like that, the build log goes like this: >>> python-cryptography 36.0.1 BuildingESC[27m ... calling setup.py ... cargo rustc --lib --manifest-path src/rust/Cargo.toml --features pyo3/abi3-py36 pyo3/extension-module --target x86_64-unknown-linux-gnu -Z target-applies-to-host --release --verbose -- --crate-type cdylib ... error: unknown `-Z` flag specified: target-applies-to-host The difference that I see with the cargo infrastructure is that this is not using "cargo build" but "cargo rustc". I would really appreciate some help on solving this (last?) issue. Best regards, Thomas Petazzoni Thomas Petazzoni (7): package/ca-certificates: remove dependency on host-python-cryptography package/python-cryptography: drop host variant package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 package/rustc: fix the riscv64gc architecture handling support/download/cargo-post-process: make manifest path configurable support/testing/tests: switch python-cryptography related tests to glibc DO-NOT-APPLY package/python-cryptography: bump version to 36.0.1 ...2pem.py-make-cryptography-module-opt.patch | 59 +++++++++++++++++++ package/ca-certificates/ca-certificates.mk | 2 +- package/docker-compose/Config.in | 8 ++- package/python-autobahn/Config.in | 6 +- package/python-channels-redis/Config.in | 7 +-- package/python-channels/Config.in | 7 +-- package/python-crossbar/Config.in | 6 +- package/python-cryptography/Config.in | 14 +---- .../python-cryptography.hash | 5 +- .../python-cryptography.mk | 20 ++++--- package/python-daphne/Config.in | 7 +-- package/python-keyring/Config.in | 7 +-- package/python-opcua-asyncio/Config.in | 1 + package/python-paramiko/Config.in | 8 +-- package/python-pyopenssl/Config.in | 8 +-- package/python-secretstorage/Config.in | 6 +- package/python-service-identity/Config.in | 10 ++-- package/python-treq/Config.in | 10 ++-- package/python-twisted/Config.in | 6 +- package/python-txdbus/Config.in | 5 +- package/python-txtorcon/Config.in | 7 +-- package/rustc/Config.in.host | 4 +- support/download/cargo-post-process | 2 +- .../tests/package/test_python_autobahn.py | 10 +++- .../tests/package/test_python_crossbar.py | 10 +++- .../tests/package/test_python_cryptography.py | 10 +++- .../package/test_python_service_identity.py | 10 +++- .../testing/tests/package/test_python_treq.py | 10 +++- .../tests/package/test_python_txtorcon.py | 10 +++- 29 files changed, 170 insertions(+), 105 deletions(-) create mode 100644 package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:12 +0100 Subject: [Buildroot] [PATCH 2/7] package/python-cryptography: drop host variant In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-3-thomas.petazzoni@bootlin.com> The host variant was only needed by ca-certificates, which no longer needs it, so drop this variant. Signed-off-by: Thomas Petazzoni --- package/python-cryptography/python-cryptography.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 081dfc06a0..9c00efb44f 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -13,11 +13,5 @@ PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl -HOST_PYTHON_CRYPTOGRAPHY_NEEDS_HOST_PYTHON = python3 -HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ - host-python3-cffi \ - host-python3-six \ - host-openssl $(eval $(python-package)) -$(eval $(host-python-package)) -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:13 +0100 Subject: [Buildroot] [PATCH 3/7] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-4-thomas.petazzoni@bootlin.com> BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for BR2_ARM_CPU_ARMV7A, but it also needs a special value for BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for ARMv5TE is identified with the "armv5te" architecture name, see https://doc.rust-lang.org/nightly/rustc/platform-support.html. We noticed this because Rust binaries wouldn't work on an ARMv5 platform (Illegal instruction). This was due to the usage of the arm-unknown-linux-gnueabi variant of the Rust standard library, which is for ARMv6. Thanks to this commit, we correctly use the armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly on ARMv5TE. Signed-off-by: Thomas Petazzoni --- package/rustc/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 90ea56f626..05324ad755 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -102,6 +102,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH string + default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A default BR2_ARCH if !BR2_ARM_CPU_ARMV7A -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:14 +0100 Subject: [Buildroot] [PATCH 4/7] package/rustc: fix the riscv64gc architecture handling In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-5-thomas.petazzoni@bootlin.com> riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true when BR2_riscv is true. Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to allow rust-bin to download its pre-compiled standard library correctly. Signed-off-by: Thomas Petazzoni --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 05324ad755..8c8b75c0a2 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -49,7 +49,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC # riscv64gc-unknown-linux-gnu # "g" stands for imafd, and we also need "c". - default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ + default y if BR2_RISCV_64 && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ BR2_TOOLCHAIN_USES_GLIBC @@ -104,6 +104,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH string default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A + default "riscv64gc" if BR2_RISCV_64 default BR2_ARCH if !BR2_ARM_CPU_ARMV7A config BR2_PACKAGE_HOST_RUSTC_ABI -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:15 +0100 Subject: [Buildroot] [PATCH 5/7] support/download/cargo-post-process: make manifest path configurable In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-6-thomas.petazzoni@bootlin.com> In most pure Rust packages, the Cargo.toml manifest is at the root directory, which is why we could call "cargo vendor" without specifying the path of the manifest. However, other packages, such as python-cryptography, which have parts implemented in Rust, have their Cargo.toml located in a specific subdirectory. This commit extends the cargo-post-process download script to understand a BR_CARGO_MANIFEST_PATH environment variable, which allows a package to pass the location of the Cargo.toml file. If not passed, "Cargo.toml" is used, preserving the existing behavior for other packages. Signed-off-by: Thomas Petazzoni --- support/download/cargo-post-process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 25dbbedbfa..51d9dd24c1 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -22,7 +22,7 @@ post_process_unpack ${base_name} ${output} # Do the Cargo vendoring pushd ${base_name} > /dev/null -cargo vendor --locked VENDOR +cargo vendor --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} --locked VENDOR # Create the local .cargo/config with vendor info mkdir -p .cargo/ -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:16 +0100 Subject: [Buildroot] [PATCH 6/7] support/testing/tests: switch python-cryptography related tests to glibc In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-7-thomas.petazzoni@bootlin.com> In a follow-up commit, we are about to bump python-cryptography to a new version, which has the interesting charateristic of using Rust code. This means python-cryptography will now only be available on platforms supported by Rust, which for now excludes uclibc-based configurations (none of the Rust Tier1/Tier2 platforms use uClibc, there is some uClibc support in Tier3 platforms but they have not been added to Buildroot for now). So in preparation for this bump, we switch the few test cases of Python packages that directly or indirectly use python-cryptography to use a glibc toolchain. Another impacted test case is the docker-compose test case, but it already uses a glibc toolchain; Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_autobahn.py | 10 +++++++++- support/testing/tests/package/test_python_crossbar.py | 10 +++++++++- .../testing/tests/package/test_python_cryptography.py | 10 +++++++++- .../tests/package/test_python_service_identity.py | 10 +++++++++- support/testing/tests/package/test_python_treq.py | 10 +++++++++- support/testing/tests/package/test_python_txtorcon.py | 10 +++++++++- 6 files changed, 54 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_autobahn.py b/support/testing/tests/package/test_python_autobahn.py index a237ce465d..6c1678a615 100644 --- a/support/testing/tests/package/test_python_autobahn.py +++ b/support/testing/tests/package/test_python_autobahn.py @@ -3,9 +3,17 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Autobahn(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AUTOBAHN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_autobahn.py"] diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py index d7843ddd8b..83649aeec2 100644 --- a/support/testing/tests/package/test_python_crossbar.py +++ b/support/testing/tests/package/test_python_crossbar.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Crossbar(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_crossbar.py"] timeout = 60 diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py index 62f0ca0def..bf11c02e5c 100644 --- a/support/testing/tests/package/test_python_cryptography.py +++ b/support/testing/tests/package/test_python_cryptography.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Cryptography(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_cryptography.py"] timeout = 40 diff --git a/support/testing/tests/package/test_python_service_identity.py b/support/testing/tests/package/test_python_service_identity.py index 09cfbe0a26..dbad5f931f 100644 --- a/support/testing/tests/package/test_python_service_identity.py +++ b/support/testing/tests/package/test_python_service_identity.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3ServiceIdentity(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_service_identity.py"] timeout = 30 diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index 307c9932b2..515f1ea304 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -14,8 +14,16 @@ class TestPythonTreq(TestPythonPackageBase): class TestPythonPy3Treq(TestPythonTreq): __test__ = True - config = TestPythonTreq.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TREQ=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 8e74190ee1..6f0c4ca1ed 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TXTORCON=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_txtorcon.py"] timeout = 30 -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:13:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:13:17 +0100 Subject: [Buildroot] [PATCH 7/7] DO-NOT-APPLY package/python-cryptography: bump version to 36.0.1 In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220107171318.1423075-8-thomas.petazzoni@bootlin.com> This version bump requires significant changes because python-cryptography is now partially implemented in Rust. This means that: - The C++ dependency is no longer needed. - We need to ensure we are on an architecture where Rust is available (BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS) - Almost all Python dependencies are no longer relevant, except for the python-cffi. - A number of magic environment variables are needed to make the Rust part build correctly (CARGO_BUILD_TARGET, PYO3_CROSS_LIB_DIR, CARGO_HOME) - We need to invoke the "cargo" download post-process hook to vendor the Cargo dependencies at download time. - We need to propagate to relatively significant reverse dependency tree the changes of dependencies on python-cryptography. DO-NOT-APPLY: this commit is currently broken when host arch == target arch. Co-developed-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/docker-compose/Config.in | 8 +++++--- package/python-autobahn/Config.in | 6 +----- package/python-channels-redis/Config.in | 7 ++----- package/python-channels/Config.in | 7 ++----- package/python-crossbar/Config.in | 6 +----- package/python-cryptography/Config.in | 14 ++------------ .../python-cryptography/python-cryptography.hash | 5 ++--- package/python-cryptography/python-cryptography.mk | 14 +++++++++++--- package/python-daphne/Config.in | 7 ++----- package/python-keyring/Config.in | 7 ++----- package/python-opcua-asyncio/Config.in | 1 + package/python-paramiko/Config.in | 8 ++------ package/python-pyopenssl/Config.in | 8 ++------ package/python-secretstorage/Config.in | 6 +----- package/python-service-identity/Config.in | 10 ++++------ package/python-treq/Config.in | 10 ++++------ package/python-twisted/Config.in | 6 ++---- package/python-txdbus/Config.in | 5 ++++- package/python-txtorcon/Config.in | 7 ++----- 19 files changed, 52 insertions(+), 90 deletions(-) diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 8e16b60521..761befea4d 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -5,7 +5,8 @@ config BR2_PACKAGE_DOCKER_COMPOSE depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_THREADS # python depends on !BR2_STATIC_LIBS # python - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko -> python-cryptography + # python-paramiko -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime select BR2_PACKAGE_PYTHON_DOCOPT # runtime @@ -23,7 +24,8 @@ config BR2_PACKAGE_DOCKER_COMPOSE https://www.docker.com/ -comment "docker-compose needs a toolchain w/ C++, wchar, threads, dynamic library" +comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + BR2_STATIC_LIBS diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in index f719dcc8f1..92ddad0ea4 100644 --- a/package/python-autobahn/Config.in +++ b/package/python-autobahn/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography -> python-pyasn + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime @@ -11,7 +11,3 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN framework. https://pypi.python.org/pypi/autobahn - -comment "python-autobahn needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-channels-redis/Config.in b/package/python-channels-redis/Config.in index 8946670180..bab801d2a9 100644 --- a/package/python-channels-redis/Config.in +++ b/package/python-channels-redis/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS bool "python-channels-redis" - depends on BR2_INSTALL_LIBSTDCPP # python-channels -> python-daphne + # python-channels -> python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-channels select BR2_PACKAGE_PYTHON_AIOREDIS # runtime select BR2_PACKAGE_PYTHON_ASGIREF # runtime @@ -12,7 +13,3 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS sharded configurations, as well as group support. http://github.com/django/channels_redis/ - -comment "python-channels-redis needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-channels/Config.in b/package/python-channels/Config.in index 5c70f20d1c..6cd6e5f60d 100644 --- a/package/python-channels/Config.in +++ b/package/python-channels/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHANNELS bool "python-channels" - depends on BR2_INSTALL_LIBSTDCPP # python-daphne -> python-autobahn -> python-cryptography + # python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-daphne select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_DAPHNE # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_CHANNELS own protocols and needs. http://github.com/django/channels - -comment "python-channels needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in index 50b70b8e02..b72d64c19d 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 # All the following dependencies are runtime dependencies select BR2_PACKAGE_PYTHON_ATTRS @@ -48,7 +48,3 @@ config BR2_PACKAGE_PYTHON_CROSSBAR components that can talk in real-time with each other. https://pypi.python.org/pypi/crossbar - -comment "python-crossbar needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index da4252d6da..07a22bf846 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -1,21 +1,11 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" - depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime - select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON3_SSL # runtime help cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. https://cryptography.io - -comment "python-cryptography needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 7cb38c8d3d..1219fa9b5f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,6 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/cryptography/json -md5 e2ce2ec8a63965fad351f36ed70fde4b cryptography-3.3.2.tar.gz -sha256 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed cryptography-3.3.2.tar.gz +# Locally calculated after vendoring +sha256 196bba703cebc052a19f5353614fcfa9d680471990c10305f110adcc05744eeb cryptography-36.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 9c00efb44f..d302f87405 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,14 +4,22 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 3.3.2 +PYTHON_CRYPTOGRAPHY_VERSION = 36.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d559879912eb8a1c5d16ad9f25d35f7c4f4c +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/f9/4b/1cf8e281f7ae4046a59e5e39dd7471d46db9f61bb564fddbff9084c4334f PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-setuptools-rust host-python-cffi host-rustc +PYTHON_CRYPTOGRAPHY_ENV = CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" \ + CARGO_HOME="$(HOST_DIR)/share/cargo" +# We need to vendor the Cargo crates at download time +PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo +PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_CRYPTOGRAPHY_DL_ENV = \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in index 601b2e1db8..c4479417e9 100644 --- a/package/python-daphne/Config.in +++ b/package/python-daphne/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_DAPHNE bool "python-daphne" - depends on BR2_INSTALL_LIBSTDCPP # python-autobahn -> python-cryptography + # python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_DAPHNE versus HTTP endpoints. https://github.com/django/daphne - -comment "python-daphne needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-keyring/Config.in b/package/python-keyring/Config.in index f7bb1ae820..61cb98952f 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_KEYRING bool "python-keyring" + # python-secretstorage -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help @@ -9,7 +10,3 @@ config BR2_PACKAGE_PYTHON_KEYRING system keyring service from Python. https://pypi.python.org/pypi/keyring - -comment "python-keyring needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in index 3700e00e1d..95715fdd08 100644 --- a/package/python-opcua-asyncio/Config.in +++ b/package/python-opcua-asyncio/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO bool "python-opcua-asyncio" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOFILES # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index 4b8495d76d..e44237b0c2 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" - depends on BR2_PACKAGE_PYTHON3 # python-bcrypt - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-bcrypt, python-cryptography select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime @@ -10,7 +10,3 @@ config BR2_PACKAGE_PYTHON_PARAMIKO SSH2 protocol library. https://github.com/paramiko/paramiko/ - -comment "python-paramiko needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index 99ea4e9408..65d516813f 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -1,14 +1,10 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL bool "python-pyopenssl" - depends on BR2_PACKAGE_PYTHON3 # python-cryptography -> python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help Python wrapper module around the OpenSSL library. https://github.com/pyca/pyopenssl - -comment "python-pyopenssl needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in index 8ae8c2d598..059ea097bb 100644 --- a/package/python-secretstorage/Config.in +++ b/package/python-secretstorage/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE bool "python-secretstorage" depends on BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime help Python bindings to FreeDesktop.org Secret Service API. https://github.com/mitya57/secretstorage - -comment "python-secretstorage needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index ab012347dc..c571065e92 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" - depends on BR2_PACKAGE_PYTHON3 # python-pyopenssl -> python-cryptography -> python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime @@ -11,7 +13,3 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY Service identity verification for pyOpenSSL. https://pypi.python.org/pypi/service_identity - -comment "python-service-identify needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 02c26a53f7..6e54c19e16 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" - depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-idna, python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime @@ -16,7 +18,3 @@ config BR2_PACKAGE_PYTHON_TREQ API for making HTTP requests when using Twisted. https://github.com/twisted/treq - -comment "python-treq needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 29536ecf9d..89298b2e0c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -23,12 +23,10 @@ config BR2_PACKAGE_PYTHON_TWISTED_HTTP2 config BR2_PACKAGE_PYTHON_TWISTED_TLS bool "TLS support" - depends on BR2_INSTALL_LIBSTDCPP # python-{pyopenssl,service-identity} + # python-{pyopenssl,service-identity} + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime -comment "TLS support needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - endif diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index c7de322f91..ffd00f153e 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_PYTHON_TXDBUS bool "python-txdbus" - depends on BR2_PACKAGE_PYTHON3 # python-twisted -> python-cryptography -> python-idna + # python-twisted -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-twisted -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index e8a1a233db..0606e5f442 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_TXTORCON bool "python-txtorcon" + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_TXTORCON configuration abstractions. https://github.com/meejah/txtorcon - -comment "python-txtorcon needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP -- 2.33.1 From peter at korsgaard.com Fri Jan 7 17:14:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:14:01 +0100 Subject: [Buildroot] [git commit] package/jitterentropy-library: needs threads Message-ID: <20220107170908.250D9832B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c28b93248a2e4ee79dc42e20d904505e7310a15f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 3.3.1 in commit 3965f09cb427af411055a783cd14b501b2b28285 and https://github.com/smuellerDD/jitterentropy-library/commit/1e94512db65450ffd950e04fac61408b5efb7e2d In file included from ./jitterentropy.h:98, from src/jitterentropy-gcd.c:22: ./jitterentropy-base-user.h:74:10: fatal error: pthread.h: No such file or directory 74 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7b01eca8f1442318dd35282605fc8815e6afb0d0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jitterentropy-library/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/jitterentropy-library/Config.in b/package/jitterentropy-library/Config.in index 02f8ff6164..f9ae1bac5a 100644 --- a/package/jitterentropy-library/Config.in +++ b/package/jitterentropy-library/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_JITTERENTROPY_LIBRARY bool "libjitterentropy" + depends on BR2_TOOLCHAIN_HAS_THREADS help Hardware RNG based on CPU timing jitter. https://github.com/smuellerDD/jitterentropy-library + +comment "libjitterentropy needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Fri Jan 7 17:15:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:15:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/jitterentropy-library: needs threads In-Reply-To: <20220106223039.1065153-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 6 Jan 2022 23:30:39 +0100") References: <20220106223039.1065153-1-fontaine.fabrice@gmail.com> Message-ID: <87lezrmpqz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump to version 3.3.1 in > commit 3965f09cb427af411055a783cd14b501b2b28285 and > https://github.com/smuellerDD/jitterentropy-library/commit/1e94512db65450ffd950e04fac61408b5efb7e2d > In file included from ./jitterentropy.h:98, > from src/jitterentropy-gcd.c:22: > ./jitterentropy-base-user.h:74:10: fatal error: pthread.h: No such file or directory > 74 | #include > | ^~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/7b01eca8f1442318dd35282605fc8815e6afb0d0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Fri Jan 7 04:55:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 6 Jan 2022 21:55:30 -0700 Subject: [Buildroot] [PATCH v3 2/3] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220107045531.3985241-1-james.hilliard1@gmail.com> References: <20220107045531.3985241-1-james.hilliard1@gmail.com> Message-ID: <20220107045531.3985241-2-james.hilliard1@gmail.com> We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages. We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version. There are python3 patches available that apply to this version with minor modifications(to be added in a future patch). We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive. We need to add some new required dependencies to qt5webengine so that it will build. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entries --- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 5 +- package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 23 + package/qt5/qt5webengine/Config.in | 3 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 10 files changed, 2569 insertions(+), 2012 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/Config.in create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 143926b743..54e6f7d6a6 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium/Config.in" source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine-chromium/Config.in b/package/qt5/qt5webengine-chromium/Config.in new file mode 100644 index 0000000000..8ba9ad7135 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/Config.in @@ -0,0 +1,5 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5webengine source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM + bool + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 0000000000..ced431c9e9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 0000000000..103e27d889 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 0000000000..2b061815b5 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult +QT5WEBENGINE_CHROMIUM_INSTALL_TARGET = NO + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..aded684ce2 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). @@ -57,9 +58,11 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_QT5QUICKCONTROLS2 select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5BASE_EXAMPLES select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc deleted file mode 100644 index a5fdfdc1f1..0000000000 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ /dev/null @@ -1,1000 +0,0 @@ -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/cityhash/COPYING \ - src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ - src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ - src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ - src/3rdparty/chromium/third_party/dav1d/LICENSE \ - src/3rdparty/chromium/third_party/dawn/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/ink/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jacoco/LICENSE \ - src/3rdparty/chromium/third_party/javalang/LICENSE \ - src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ - src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ - src/3rdparty/chromium/third_party/libipp/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libxslt/src/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/lottie/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mako/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/nasm/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/perfetto/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/pffft/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/r8/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/rnnoise/COPYING \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/schema_org/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/six/src/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ - src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/test_fonts/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/turbine/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/unrar/LICENSE \ - src/3rdparty/chromium/third_party/unrar/src/license.txt \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ - src/3rdparty/chromium/third_party/weston/LICENSE \ - src/3rdparty/chromium/third_party/weston/src/COPYING \ - src/3rdparty/chromium/third_party/weston/src/data/COPYING \ - src/3rdparty/chromium/third_party/widevine/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ - src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ - src/3rdparty/gn/base/third_party/icu/LICENSE \ - src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb..1d2b70c4f6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..1b5529d2bb 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -5,18 +5,18 @@ ################################################################################ QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python + qt5declarative qt5webchannel host-bison host-flex host-freetype \ + host-gperf host-nodejs host-pkgconf host-python +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libxkbfile xlib_libXrandr xlib_libXtst endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss @@ -44,7 +44,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python @@ -53,12 +55,20 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty +endef +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Jan 7 17:37:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:37:18 +0100 Subject: [Buildroot] [git commit] package/lttng-modules: bump to version 2.13.1 Message-ID: <20220107173116.5352C83488@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48b77b25b71fa3c47b8d6fac1da46ea122715350 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Add a dependency on kernel >= 3.0: https://github.com/lttng/lttng-modules/commit/88eafb709ac811960b1163482f5d537cb18b32df - Add CONFIG_KPROBES to Config.in for kernel >= 5.7: https://github.com/lttng/lttng-modules/commit/a65765406b03e4f3b7a4303e1c9ed83c86cdd358 - Update license files and their hash because SPDX v3.0 identifiers are used since https://github.com/lttng/lttng-modules/commit/b7cdc18250880cc44edeef4a4b42c8ac7a135a6d - This bump will fix a build failure with kernel >= 5.6 thanks to at least: https://github.com/lttng/lttng-modules/commit/edfdcb685c3f56dde803244449f79ad7bed03798 https://github.com/lttng/lttng-modules/blob/v2.13.1/ChangeLog Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14501 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lttng-modules/Config.in | 12 +++++++++--- package/lttng-modules/lttng-modules.hash | 12 ++++++------ package/lttng-modules/lttng-modules.mk | 5 +++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/package/lttng-modules/Config.in b/package/lttng-modules/Config.in index e8ba9bad8c..cb56584155 100644 --- a/package/lttng-modules/Config.in +++ b/package/lttng-modules/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LTTNG_MODULES bool "lttng-modules" depends on BR2_LINUX_KERNEL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 help Linux kernel modules for the LTTng 2.x kernel tracing infrastructure. @@ -8,7 +9,8 @@ config BR2_PACKAGE_LTTNG_MODULES Make sure your target kernel has the following config options enabled: - * CONFIG_MODULES: loadable module support + * CONFIG_MODULES: loadable module support (not strictly + required when built into the kernel) * CONFIG_KALLSYMS: this is necessary until the few required missing symbols are exported to GPL modules from mainline @@ -17,6 +19,8 @@ config BR2_PACKAGE_LTTNG_MODULES * CONFIG_TRACEPOINTS: kernel tracepoint instrumentation (enabled as a side-effect of any of the perf/ftrace/blktrace instrumentation features) + * CONFIG_KPROBES (5.7+): use kallsyms for kernel 5.7 and + newer. The following kernel configuration options will affect the features available from LTTng: @@ -29,9 +33,11 @@ config BR2_PACKAGE_LTTNG_MODULES * CONFIG_KALLSYMS_ALL: state dump of mapping between block device number and name - The packaged version is compatible with Linux 2.6.38 to 3.16. - http://lttng.org comment "lttng-modules needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL + +comment "lttng-modules needs a toolchain w/ headers >= 3.0" + depends on BR2_LINUX_KERNEL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index f04247ab0b..fb253c9bf6 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,8 +1,8 @@ -# From https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2.sha256 -sha256 98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f lttng-modules-2.11.0.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.1.tar.bz2.sha256 +sha256 a7c86d91c9bbe66d27f025aa04b8cfc6d7785ed2fc7ef774930800ee44d7f343 lttng-modules-2.13.1.tar.bz2 # Hash for license files -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt -sha256 6334b377a5bd56b56a1e8a495830f2d28ed1b5cbedc7493aec9fba979efcdfe1 LICENSE +sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 +sha256 6841c85b94f9dab319356e3aaf9e969fcedad51d3aaadf665bf86f34f4186b62 LICENSES/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/MIT +sha256 0133d3c505f176845d7a8b4dcfe006ac615832c43c41e76fe3b365191bafca92 LICENSE diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index b8f9be8656..4c1c50d0a0 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,11 +4,12 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.11.0 +LTTNG_MODULES_VERSION = 2.13.1 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) -LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE +LTTNG_MODULES_LICENSE_FILES = \ + LICENSES/LGPL-2.1 LICENSES/GPL-2.0 LICENSES/MIT LICENSE LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $(eval $(kernel-module)) From thomas.petazzoni at bootlin.com Fri Jan 7 17:40:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:40:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/lttng-modules: bump to version 2.13.1 In-Reply-To: <20220106174949.1064731-1-fontaine.fabrice@gmail.com> References: <20220106174949.1064731-1-fontaine.fabrice@gmail.com> Message-ID: <20220107184041.5a39d4e1@windsurf> Hello, On Thu, 6 Jan 2022 18:49:49 +0100 Fabrice Fontaine wrote: > - Add a dependency on kernel >= 3.0: > https://github.com/lttng/lttng-modules/commit/88eafb709ac811960b1163482f5d537cb18b32df > - Add CONFIG_KPROBES to Config.in for kernel >= 5.7: > https://github.com/lttng/lttng-modules/commit/a65765406b03e4f3b7a4303e1c9ed83c86cdd358 > - Update license files and their hash because SPDX v3.0 identifiers are > used since > https://github.com/lttng/lttng-modules/commit/b7cdc18250880cc44edeef4a4b42c8ac7a135a6d > - This bump will fix a build failure with kernel >= 5.6 thanks to at > least: > https://github.com/lttng/lttng-modules/commit/edfdcb685c3f56dde803244449f79ad7bed03798 > > https://github.com/lttng/lttng-modules/blob/v2.13.1/ChangeLog > > Fixes: > - https://bugs.busybox.net/show_bug.cgi?id=14501 > > Signed-off-by: Fabrice Fontaine > --- > package/lttng-modules/Config.in | 12 +++++++++--- > package/lttng-modules/lttng-modules.hash | 12 ++++++------ > package/lttng-modules/lttng-modules.mk | 5 +++-- > 3 files changed, 18 insertions(+), 11 deletions(-) Applied to master, thanks. I suppose you will close the bug? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Fri Jan 7 17:43:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:43:21 +0100 Subject: [Buildroot] [git commit] package/mdadm: disable -Werror Message-ID: <20220107174006.2400782678@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5408db0d9fae1c7735ba339b30498303994ca07f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable -Werror by setting CWFLAGS to "" This will avoid the following build failure raised since bump to version 4.2 in commit b03fc7974536378ba102418451ba7e9801bc6251: mdadm.c: In function 'main': mdadm.c:156:28: error: this statement may fall through [-Werror=implicit-fallthrough=] 154 | if (mode == ASSEMBLE || mode == BUILD || | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c0f216b7aadb794110409d03dcef7fa58e833cd4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mdadm/mdadm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 6ee0bb60c9..0a2eb4e5bd 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -16,6 +16,7 @@ MDADM_BUILD_OPTS = \ CC=$(TARGET_CC) \ COROSYNC=-DNO_COROSYNC \ DLM=-DNO_DLM \ + CWFLAGS="" \ CXFLAGS="$(MDADM_CXFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 From peter at korsgaard.com Fri Jan 7 17:46:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:46:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/mdadm: disable -Werror In-Reply-To: <20220105180453.388499-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 5 Jan 2022 19:04:53 +0100") References: <20220105180453.388499-1-fontaine.fabrice@gmail.com> Message-ID: <87czl3moal.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable -Werror by setting CWFLAGS to "" > This will avoid the following build failure raised since bump to version > 4.2 in commit b03fc7974536378ba102418451ba7e9801bc6251: > mdadm.c: In function 'main': > mdadm.c:156:28: error: this statement may fall through [-Werror=implicit-fallthrough=] > 154 | if (mode == ASSEMBLE || mode == BUILD || > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/c0f216b7aadb794110409d03dcef7fa58e833cd4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Fri Jan 7 17:49:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:49:03 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump to version 3.74 In-Reply-To: <20220106191028.146979-1-giulio.benetti@benettiengineering.com> References: <20220106191028.146979-1-giulio.benetti@benettiengineering.com> Message-ID: <20220107184903.65b34c20@windsurf> On Thu, 6 Jan 2022 20:10:28 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > package/libnss/libnss.hash | 4 ++-- > package/libnss/libnss.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 17:49:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:49:15 +0100 Subject: [Buildroot] [git commit] package/libnss: bump to version 3.74 Message-ID: <20220107174320.C457982DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dfce8d765cc8c7e1452493b7c02a8c014d2a6f1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 100d2d7870..819c272a30 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_73_1_RTM/src/SHA256SUMS -sha256 c768f9fe3129e8bcc2e9679456d7edd9453a225784a8fc7dc4501806f1fe9abe nss-3.73.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_74_RTM/src/SHA256SUMS +sha256 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056 nss-3.74.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index b6279fa921..537f6dd9b6 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.73.1 +LIBNSS_VERSION = 3.74 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From thomas.petazzoni at bootlin.com Fri Jan 7 17:49:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:49:21 +0100 Subject: [git commit] DEVELOPERS: remove qt5webkit-examples entry from Gaël Portay Message-ID: <20220107174320.CF1A983493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07e0923b58c9dd0788c012f5106491c0acff56d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This causes warning on ./utils/get-developers: WARNING: 'package/qt5/qt5webkit-examples/' doesn't match any file because 'package/qt5/qt5webkit-examples/' has been removed, so let's remove its entry in this file. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3d5c01f795..630196fd54 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1021,7 +1021,6 @@ N: Ga??l Portay F: package/qt5/qt5virtualkeyboard/ F: package/qt5/qt5webengine/ F: package/qt5/qt5webkit/ -F: package/qt5/qt5webkit-examples/ N: Gao Xiang F: package/erofs-utils/ From peter at korsgaard.com Fri Jan 7 17:51:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:51:44 +0100 Subject: [Buildroot] [git commit] package/go: bump version to 1.17.6 Message-ID: <20220107174547.40BA683493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7af6659cb2cbd54b2ca6bad2d91291815e83fbc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master View the release notes for more information: https://go.dev/doc/devel/release.html#go1.17.minor Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 39f8226aae..9111c8c9aa 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz +sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 0d9ceab2bb..062bec378c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.5 +GO_VERSION = 1.17.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Fri Jan 7 17:52:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:52:32 +0100 Subject: [Buildroot] [git commit] package/4th: bump to version 3.64.0 Message-ID: <20220107174659.667D982DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30cefccaf7916b0b635071b3aa11c6b368607b2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/4th/4th.hash | 2 +- package/4th/4th.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/4th/4th.hash b/package/4th/4th.hash index 36d2941055..ae08a6bf5e 100644 --- a/package/4th/4th.hash +++ b/package/4th/4th.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f822f7dd8cfb0b1744a62d653c6efe933578ae1789ec60a088509a38bca4b4fc 4th-3.62.5-unix.tar.gz +sha256 c0905e92316c151224858fcfff21c143c85efa4f9f1b2ade3c64cfd988e0a6a8 4th-3.64.0-unix.tar.gz sha256 8c6111b645a02219579ea66e84aa8e78a0ed4f4dd80857ffb91bcda5528717d4 COPYING diff --git a/package/4th/4th.mk b/package/4th/4th.mk index aee59c463f..d031c0e4b4 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -4,7 +4,7 @@ # ################################################################################ -4TH_VERSION = 3.62.5 +4TH_VERSION = 3.64.0 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) 4TH_LICENSE = GPL-3.0+, LGPL-3.0+ From thomas.petazzoni at bootlin.com Fri Jan 7 17:55:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:55:05 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-mythtv: bump version to 19.0.3-Matrix Message-ID: <20220107174859.E8F3982B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8604c57da7e54bfd55747ed161b5c51a870d3549 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 5d0e2738bd..cd96feef70 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f5a2c0d4c742db3e8465369f4845faa87c76572290edc1792cf188ad977752b4 kodi-pvr-mythtv-19.0.2-Matrix.tar.gz +sha256 87f696fdb973602967c7dbcc1db5492616f29bfabe687fddd3a276f663a05d44 kodi-pvr-mythtv-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index b897667d67..6edca8db50 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.2-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.3-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Fri Jan 7 17:55:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:55:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.3-Matrix In-Reply-To: <20220106214411.2684476-1-bernd.kuhls@t-online.de> References: <20220106214411.2684476-1-bernd.kuhls@t-online.de> Message-ID: <20220107185519.4f7336d7@windsurf> On Thu, 6 Jan 2022 22:44:11 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- > package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 17:55:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:55:49 +0100 Subject: [Buildroot] [git commit] package/pipewire: bump to version 0.3.43 Message-ID: <20220107174943.B39B682B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0cfb1b90c1bb41dc95d7d3ab9cef1ae358a067c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new meson configuration options and optional dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index c41c0a3686..8464a56338 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b6a2eab8bda2f3cb87c3a0a714839696831ad27b5786674c4bd6c3776b9ebc97 pipewire-0.3.40.tar.bz2 +sha256 2e91f228ffb93494f2423956b930014de20e15639a03f3df4fca4ebf4bc51fc0 pipewire-0.3.43.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 7043745cc1..604d08f90d 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.40 +PIPEWIRE_VERSION = 0.3.43 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -28,7 +28,8 @@ PIPEWIRE_CONF_OPTS += \ -Dvideoconvert=enabled \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ - -Dsession-managers=[] + -Dsession-managers=[] \ + -Dlv2=disabled ifeq ($(BR2_PACKAGE_DBUS),y) PIPEWIRE_CONF_OPTS += -Ddbus=enabled @@ -174,6 +175,13 @@ else PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=disabled endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PIPEWIRE_CONF_OPTS += -Draop=enabled +PIPEWIRE_DEPENDENCIES += openssl +else +PIPEWIRE_CONF_OPTS += -Draop=disabled +endif + define PIPEWIRE_USERS pipewire -1 pipewire -1 * - - audio,video PipeWire System Daemon endef From peter at korsgaard.com Fri Jan 7 17:55:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 18:55:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/go: security bump to version 1.16.13 Message-ID: <20220107174948.E089B82B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b39532a1624b19ba66cadebd71cd51ef218f72f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x go1.16.11 (released 2021-12-02) includes fixes to the compiler, runtime, and the net/http, net/http/httptest, and time packages. go1.16.12 (released 2021-12-09) includes security fixes to the syscall and net/http packages. go1.16.13 (released 2022-01-06) includes fixes to the compiler, linker, runtime, and the net/http package. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 10bbb741e0..7071fcd99d 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 a905472011585e403d00d2a41de7ced29b8884309d73482a307f689fd0f320b5 go1.16.10.src.tar.gz +sha256 b0926654eaeb01ef43816638f42d7b1681f2d3f41b9559f07735522b7afad41a go1.16.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 8a65e20380..cac83c65ff 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.10 +GO_VERSION = 1.16.13 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Fri Jan 7 17:55:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:55:51 +0100 Subject: [Buildroot] [2021.02 1/1] package/go: security bump to version 1.16.13 In-Reply-To: <20220106214426.442534-1-christian@paral.in> (Christian Stewart's message of "Thu, 6 Jan 2022 13:44:26 -0800") References: <20220106214426.442534-1-christian@paral.in> Message-ID: <87zgo7l9aw.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.16.11 (released 2021-12-02) includes fixes to the compiler, runtime, and the > net/http, net/http/httptest, and time packages. > go1.16.12 (released 2021-12-09) includes security fixes to the syscall and > net/http packages. > go1.16.13 (released 2022-01-06) includes fixes to the compiler, linker, runtime, > and the net/http package. > Signed-off-by: Christian Stewart Committed to 2021.02.x, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Fri Jan 7 17:56:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:56:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.43 In-Reply-To: <20220107080055.4003907-1-james.hilliard1@gmail.com> References: <20220107080055.4003907-1-james.hilliard1@gmail.com> Message-ID: <20220107185600.79ce9000@windsurf> On Fri, 7 Jan 2022 01:00:55 -0700 James Hilliard wrote: > Add new meson configuration options and optional dependencies. > > Signed-off-by: James Hilliard > --- > package/pipewire/pipewire.hash | 2 +- > package/pipewire/pipewire.mk | 12 ++++++++++-- > 2 files changed, 11 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 17:56:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:56:08 +0100 Subject: [Buildroot] [git commit] package/openlayers: bump to version 6.10.0 Message-ID: <20220107175001.8501682B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=702ebf1704d8789a696fab25a518890f68720026 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index e29365fc91..11eae3de36 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 35a0b37a5c1e7c48553215c6e8c24a12bac8e9048f008fc61c4b329cf6611b5c v6.9.0-dist.zip +sha256 da3025279bbd6cfb0e82b7af95666bede8fd65e8c620a1bc54bba04cebb7e1d4 v6.10.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index b20ea9977c..781f9901ea 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.9.0 +OPENLAYERS_VERSION = 6.10.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From thomas.petazzoni at bootlin.com Fri Jan 7 17:57:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:57:13 +0100 Subject: [Buildroot] [PATCH 3/7] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 In-Reply-To: <20220107171318.1423075-4-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> <20220107171318.1423075-4-thomas.petazzoni@bootlin.com> Message-ID: <20220107185713.7b1d5224@windsurf> On Fri, 7 Jan 2022 18:13:13 +0100 Thomas Petazzoni wrote: > BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for > BR2_ARM_CPU_ARMV7A, but it also needs a special value for > BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for > ARMv5TE is identified with the "armv5te" architecture name, see > https://doc.rust-lang.org/nightly/rustc/platform-support.html. > > We noticed this because Rust binaries wouldn't work on an ARMv5 > platform (Illegal instruction). This was due to the usage of the > arm-unknown-linux-gnueabi variant of the Rust standard library, which > is for ARMv6. Thanks to this commit, we correctly use the > armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly > on ARMv5TE. > > Signed-off-by: Thomas Petazzoni > --- > package/rustc/Config.in.host | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host > index 90ea56f626..05324ad755 100644 > --- a/package/rustc/Config.in.host > +++ b/package/rustc/Config.in.host > @@ -102,6 +102,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > > config BR2_PACKAGE_HOST_RUSTC_ARCH > string > + default "armv5te" if BR2_ARM_CPU_ARMV5 > default "armv7" if BR2_ARM_CPU_ARMV7A > default BR2_ARCH if !BR2_ARM_CPU_ARMV7A I need to drop the "if !BR2_ARM_CPU_ARMV7A" here. Will do in the next iteration, or can be done when applying if there are no other comments. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Fri Jan 7 17:51:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:51:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: bump version to 1.17.6 In-Reply-To: <20220106213014.433782-1-christian@paral.in> (Christian Stewart's message of "Thu, 6 Jan 2022 13:30:14 -0800") References: <20220106213014.433782-1-christian@paral.in> Message-ID: <878rvrmo2g.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > View the release notes for more information: > https://go.dev/doc/devel/release.html#go1.17.minor > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Fri Jan 7 17:57:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:57:40 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gst1-plugins-bayer2rgb-neon: use "config" Message-ID: <20220107175523.D658282AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=685ef8d47a8dc8abe679600386a112f4b8bbf235 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gst1-plugins-bayer2rgb-neon doesn't have sub-options so use "config" instead of "menuconfig". Signed-off-by: S??bastien Szymanski Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in index 570300a304..d3e4d0e243 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -1,4 +1,4 @@ -menuconfig BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON +config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON bool "gst1-plugins-bayer2rgb-neon" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 # bayer2rgb-neon depends on !BR2_STATIC_LIBS # bayer2rgb-neon From thomas.petazzoni at bootlin.com Fri Jan 7 18:01:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:01:06 +0100 Subject: [Buildroot] [git commit] package/bayer2rgb-neon: introduce BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS Message-ID: <20220107175523.DE61083493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2af6bef9c11b6438338f4ddb2f968a7f0141adb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In both bayer2rgb-neon and gst1-plugins-bayer2rgb-neon, the Config.in comment was not displayed on aarch64, even though both packages are available on this architecture. To fix this, this commit introduces BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS, and makes use of it in both packages. Signed-off-by: S??bastien Szymanski [Thomas: add BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS, use it to fix both packages] Signed-off-by: Thomas Petazzoni --- package/bayer2rgb-neon/Config.in | 9 +++++++-- package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/bayer2rgb-neon/Config.in b/package/bayer2rgb-neon/Config.in index 7822171020..b0e3017b9f 100644 --- a/package/bayer2rgb-neon/Config.in +++ b/package/bayer2rgb-neon/Config.in @@ -1,6 +1,11 @@ +config BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS + bool + default y if BR2_arm && BR2_ARM_CPU_HAS_NEON + default y if BR2_aarch64 + config BR2_PACKAGE_BAYER2RGB_NEON bool "bayer2rgb-neon" - depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 + depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 @@ -12,6 +17,6 @@ config BR2_PACKAGE_BAYER2RGB_NEON https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb comment "bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" - depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in index d3e4d0e243..57bafd33e2 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON bool "gst1-plugins-bayer2rgb-neon" - depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 # bayer2rgb-neon + depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # bayer2rgb-neon depends on BR2_INSTALL_LIBSTDCPP # bayer2rgb-neon depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # bayer2rgb-neon @@ -15,6 +15,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON https://gitlab-ext.sigma-chemnitz.de/ensc/gst-bayer2rgb-neon comment "gst1-plugins-bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" - depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From thomas.petazzoni at bootlin.com Fri Jan 7 18:01:45 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:01:45 +0100 Subject: [Buildroot] [PATCH 1/2] package/gstreamer1/gst1-plugins-bayer2rgb-neon: use "config" In-Reply-To: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> References: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> Message-ID: <20220107190145.152cf1ec@windsurf> On Fri, 7 Jan 2022 15:05:45 +0100 S?bastien Szymanski wrote: > gst1-plugins-bayer2rgb-neon doesn't have sub-options so use "config" > instead of "menuconfig". > > Signed-off-by: S?bastien Szymanski > --- > package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:02:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:02:59 +0100 Subject: [Buildroot] [PATCH 2/2] package/gstreamer1/gst1-plugins-bayer2rgb-neon: show comment on aarch64 In-Reply-To: <20220107140546.1921-2-sebastien.szymanski@armadeus.com> References: <20220107140546.1921-1-sebastien.szymanski@armadeus.com> <20220107140546.1921-2-sebastien.szymanski@armadeus.com> Message-ID: <20220107190259.5365b6ea@windsurf> Hello S?bastien, On Fri, 7 Jan 2022 15:05:46 +0100 S?bastien Szymanski wrote: > On aarch64, the Config.in comment for gst1-plugins-bayer2rgb-neon is not > shown when a dependency is missing. Fix that. > > Signed-off-by: S?bastien Szymanski > --- > package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This wasn't entirely correct, indeed the same problem exists in bayer2rgb-neon, which this package depends on. So to avoid this mistake, I've instead added a BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS blind option, and used it in both packages. Don't hesitate to double check that what I have committed is correct, of course! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Fri Jan 7 17:52:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 18:52:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/4th: bump to version 3.64.0 In-Reply-To: <20220104205204.3632035-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 21:52:04 +0100") References: <20220104205204.3632035-1-fontaine.fabrice@gmail.com> Message-ID: <874k6fmo0g.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Fri Jan 7 17:56:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 18:56:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.10.0 In-Reply-To: <20220107130507.19541-1-thomas.claveirole@green-communications.fr> References: <20220107130507.19541-1-thomas.claveirole@green-communications.fr> Message-ID: <20220107185636.3fa8681e@windsurf> On Fri, 7 Jan 2022 14:05:07 +0100 Thomas Claveirole wrote: > Signed-off-by: Thomas Claveirole > --- > package/openlayers/openlayers.hash | 2 +- > package/openlayers/openlayers.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:05:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:05:46 +0100 Subject: [Buildroot] [git commit] support/testing: add package/test_mender.py Message-ID: <20220107175940.D80247F903@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc91d35da7a04d8d28b20ba4ca32672a2dd1c736 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Create a test to check Mender client at runtime. The aim of this test is: - to check the correct execution of simple Mender commands, in a minimal environment; - to validate there is no missing dependencies for runtime. This test is not a board integration test for Mender, including well-configured bootloader, partitioning, ... Check: - the daemon is started; - the current 'artifact name' (name of the image or update) of the active partition is read, without error. For that, we need to fake (see the 'overlay' directory): - some bootloader environment variables; - the name of an update. Signed-off-by: Mikael Bourhis-Cloarec [Romain: remove single hyphen command (Mender 3.0.0)] Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_mender.py | 32 ++++++++++++++++++++++ .../rootfs-overlay/etc/mender/artifact_info | 1 + .../test_mender/rootfs-overlay/usr/bin/fw_printenv | 6 ++++ 3 files changed, 39 insertions(+) diff --git a/support/testing/tests/package/test_mender.py b/support/testing/tests/package/test_mender.py new file mode 100644 index 0000000000..fdf55ed616 --- /dev/null +++ b/support/testing/tests/package/test_mender.py @@ -0,0 +1,32 @@ +import os + +import infra.basetest + + +class TestMender(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MENDER=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_ROOTFS_OVERLAY="{}" + """.format( + # overlay to add a fake 'fw_printenv', used by Mender + infra.filepath("tests/package/test_mender/rootfs-overlay")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check if the Daemon is running + self.assertRunOk("ls /var/run/mender.pid") + self.assertRunOk("ps aux | egrep [m]ender") + + # Check if a simple Mender command is correctly executed + self.assertRunOk("mender -log-level debug show-artifact") + self.assertRunOk("mender -log-level debug show-artifact | grep 'RUNTIME_TEST_ARTIFACT_NAME'") + cmd = "mender show-artifact 2>&1 | grep -i 'err'" # Check if no 'error' among the traces + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 1) diff --git a/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info b/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info new file mode 100644 index 0000000000..4d54b8f89c --- /dev/null +++ b/support/testing/tests/package/test_mender/rootfs-overlay/etc/mender/artifact_info @@ -0,0 +1 @@ +artifact_name=RUNTIME_TEST_ARTIFACT_NAME diff --git a/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv b/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv new file mode 100755 index 0000000000..c002a0f2b8 --- /dev/null +++ b/support/testing/tests/package/test_mender/rootfs-overlay/usr/bin/fw_printenv @@ -0,0 +1,6 @@ +#!/bin/sh + +# Fake 'fw_printenv' because UBoot is not installed: print some plausible 'key-value' +echo "bootcount=0" +echo "mender_boot_part=rootfs" +echo "upgrade_available=0" From thomas.petazzoni at bootlin.com Fri Jan 7 18:05:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:05:01 +0100 Subject: [Buildroot] [git commit] package/mender: remove single hyphen command Message-ID: <20220107175940.CC16B832FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97daba5781bf58a6476c76a2910254bd9cbd329e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Single hyphen commands has been removed since Mender 3.0.0 [1] [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 Signed-off-by: Romain Naour Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/mender/S42mender | 2 +- package/mender/mender-client.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mender/S42mender b/package/mender/S42mender index 108fecfea9..dc60f94f8b 100644 --- a/package/mender/S42mender +++ b/package/mender/S42mender @@ -25,7 +25,7 @@ start() { umask 077 start-stop-daemon -S -q -b -m -p /var/run/mender.pid \ - --exec /usr/bin/mender -- -daemon + --exec /usr/bin/mender -- daemon [ $? = 0 ] && echo "OK" || echo "FAIL" } stop() { diff --git a/package/mender/mender-client.service b/package/mender/mender-client.service index 2a5f476ee5..5539a56fd6 100644 --- a/package/mender/mender-client.service +++ b/package/mender/mender-client.service @@ -17,7 +17,7 @@ if [ -L /var/lib/mender \ mkdir -p "$(readlink /var/lib/mender)"; \ fi; \ fi' -ExecStart=/usr/bin/mender -daemon +ExecStart=/usr/bin/mender daemon Restart=on-abort [Install] From thomas.petazzoni at bootlin.com Fri Jan 7 18:05:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:05:57 +0100 Subject: [Buildroot] [PATCHv3 1/2] package/mender: remove single hyphen command In-Reply-To: <20220106153542.1668688-1-romain.naour@smile.fr> References: <20220106153542.1668688-1-romain.naour@smile.fr> Message-ID: <20220107190557.47711dfa@windsurf> On Thu, 6 Jan 2022 16:35:41 +0100 Romain Naour wrote: > Single hyphen commands has been removed since Mender 3.0.0 [1] > > [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 > > Signed-off-by: Romain Naour > Cc: Adam Duskett > --- > package/mender/S42mender | 2 +- > package/mender/mender-client.service | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:06:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:06:48 +0100 Subject: [Buildroot] [git commit] support/download/git: add missing "git lfs install" invocation for LFS support Message-ID: <20220107180129.1E5F283493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=338b2e58d46ac32ded7877e2f211515024bd881a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The original patch for commit cff428fe31 ("download/git: support Git LFS") included a call to "git lfs install" but this was a problem as it could modify ~/.gitconfig outside the dl/ tree. When this was updated it was thought that the modification to gitconfig was unnecessary because the LFS fetch and checkout steps are performed manually. Unfortunately, this is not correct and the LFS checkout fails with: Cannot checkout LFS objects, Git LFS is not installed. Add the call to "git lfs install", with the --local option so that only the repository's .git/config is modified and not the user's global ~/.gitconfig. This is also required for submodules as the parent repository's config is not inherited. Cc: Arnout Vandecappelle Cc: Vincent Fazio Signed-off-by: John Keeping Signed-off-by: Thomas Petazzoni --- support/download/git | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/download/git b/support/download/git index 41c3160099..1a1c315f73 100755 --- a/support/download/git +++ b/support/download/git @@ -209,10 +209,12 @@ fi # If there are large files then fetch them. if [ ${large_file} -eq 1 ]; then + _git lfs install --local _git lfs fetch _git lfs checkout # If there are also submodules, recurse into them, if [ ${recurse} -eq 1 ]; then + _git submodule foreach --recursive ${GIT} lfs install --local _git submodule foreach --recursive ${GIT} lfs fetch _git submodule foreach --recursive ${GIT} lfs checkout fi From thomas.petazzoni at bootlin.com Fri Jan 7 18:07:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:07:46 +0100 Subject: [Buildroot] [PATCH] download/git: fix LFS support In-Reply-To: <20220106151942.1506534-1-john@metanate.com> References: <20220106151942.1506534-1-john@metanate.com> Message-ID: <20220107190746.0b714e72@windsurf> On Thu, 6 Jan 2022 15:19:42 +0000 John Keeping wrote: > The original patch for commit cff428fe31 ("download/git: support Git > LFS") included a call to "git lfs install" but this was a problem as it > could modify ~/.gitconfig outside the dl/ tree. When this was > updated it was thought that the modification to gitconfig was > unnecessary because the LFS fetch and checkout steps are performed > manually. > > Unfortunately, this is not correct and the LFS checkout fails with: > > Cannot checkout LFS objects, Git LFS is not installed. > > Add the call to "git lfs install", with the --local option so that only > the repository's .git/config is modified and not the user's global > ~/.gitconfig. > > This is also required for submodules as the parent repository's config > is not inherited. > > Cc: Arnout Vandecappelle > Cc: Vincent Fazio > Signed-off-by: John Keeping > --- > support/download/git | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:08:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:08:08 +0100 Subject: [Buildroot] [git commit] package/file: fix build with gcc 4.8 Message-ID: <20220107180204.0658583465@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b07842e20d945649dec1815afffba253c7932211 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 5.41 in commit d38b72bcd75392a88b5100839ac410859d0a6a79: readelf.c: In function 'do_auxv_note': readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode for (size_t off = 0; off + elsize <= descsz; off += elsize) { ^ Fixes: - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/file/file.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/file/file.mk b/package/file/file.mk index 12647af8bb..62cec4b2c9 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -9,6 +9,7 @@ FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file HOST_FILE_DEPENDENCIES = host-zlib FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' +HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c From thomas.petazzoni at bootlin.com Fri Jan 7 18:08:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:08:25 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> Message-ID: <20220107190825.14a54177@windsurf> On Tue, 4 Jan 2022 21:54:55 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 5.41 in > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > readelf.c: In function 'do_auxv_note': > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Set ac_cv_prog_c99 for host as already done for target instead of > adding an upstreamable patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:08:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:08:40 +0100 Subject: [Buildroot] [git commit] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 Message-ID: <20220107180235.E9FB883465@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f27270705762b1c0c142127fb8b6007102f9c331 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 -------------------- .../0002-utils-text-scroller.cc-replace-uint.patch | 50 ---------------------- package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash | 2 +- package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 2 +- 4 files changed, 2 insertions(+), 98 deletions(-) diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch deleted file mode 100644 index f7a92f5fb2..0000000000 --- a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 -From: Grzegorz Blach -Date: Sat, 29 Aug 2020 20:48:57 +0200 -Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. - -This change allows additional flags to be added to the linker -from the command line. - -Signed-off-by: Grzegorz Blach ---- - utils/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/utils/Makefile b/utils/Makefile -index e751adc..e704442 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include - RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib - RGB_LIBRARY_NAME=rgbmatrix - RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a --LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread -+RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread - - # Imagemagic flags, only needed if actually compiled. - MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) -@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE - $(MAKE) -C $(RGB_LIBDIR) - - text-scroller: text-scroller.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) - - led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) -+ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) - - video-viewer: video-viewer.o $(RGB_LIBRARY) -- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) -+ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) - - %.o : %.cc - $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< --- -2.24.3 (Apple Git-128) - diff --git a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch b/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch deleted file mode 100644 index 627415bac8..0000000000 --- a/package/rpi-rgb-led-matrix/0002-utils-text-scroller.cc-replace-uint.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a56338db0f003d5236f2ce98c73a591d64a70852 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 22:57:11 +0100 -Subject: [PATCH] utils/text-scroller.cc: replace uint (#1383) - -Replace uint by uint64_t to avoid the following build failure on musl: - -text-scroller.cc: In function 'int main(int, char**)': -text-scroller.cc:220:3: error: 'uint' was not declared in this scope; did you mean 'rint'? - 220 | uint frame_counter = 0; - | ^~~~ - | rint - -Fixes: - - http://autobuild.buildroot.org/results/1a230bd46eac35081bdb6fe9aaacbb7b62ea6b73 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/hzeller/rpi-rgb-led-matrix/commit/a56338db0f003d5236f2ce98c73a591d64a70852] ---- - utils/text-scroller.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/utils/text-scroller.cc b/utils/text-scroller.cc -index a64ba0c89..28d4f7182 100644 ---- a/utils/text-scroller.cc -+++ b/utils/text-scroller.cc -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -217,12 +218,12 @@ int main(int argc, char *argv[]) { - - struct timespec next_frame = {0, 0}; - -- uint frame_counter = 0; -+ uint64_t frame_counter = 0; - while (!interrupt_received && loops != 0) { - ++frame_counter; - offscreen_canvas->Fill(bg_color.r, bg_color.g, bg_color.b); - const bool draw_on_frame = (blink_on <= 0) -- || (frame_counter % (blink_on + blink_off) < (uint)blink_on); -+ || (frame_counter % (blink_on + blink_off) < (uint64_t)blink_on); - - if (draw_on_frame) { - if (outline_font) { diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash index 3b1cb5fd76..265e4c4249 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz +sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk index e436755121..499fb408c2 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 +RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Fri Jan 7 18:09:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:09:00 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/rpi-rgb-led-matrix: bump to version a56338db0f003d5236f2ce98c73a591d64a70852 In-Reply-To: <20220104205746.3633354-1-fontaine.fabrice@gmail.com> References: <20220104205746.3633354-1-fontaine.fabrice@gmail.com> Message-ID: <20220107190900.20083430@windsurf> On Tue, 4 Jan 2022 21:57:46 +0100 Fabrice Fontaine wrote: > Drop patches (already in version) > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Drop second patch now that it has been applied Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:14:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:14:02 +0100 Subject: [Buildroot] [git commit] package/openipmi: fix musl build with libexecinfo Message-ID: <20220107180756.A000A826D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=feda801885091a9e41faa45aa0416afa67a0e2ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable execinfo to avoid the following musl build failure raised since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-configure.ac-add-without-execinfo-option.patch | 55 ++++++++++++++++++++++ package/openipmi/openipmi.mk | 1 + 2 files changed, 56 insertions(+) diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch new file mode 100644 index 0000000000..e1838a06f4 --- /dev/null +++ b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch @@ -0,0 +1,55 @@ +From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Jan 2022 23:27:21 +0100 +Subject: [PATCH] configure.ac: add --without-execinfo option + +Add an option to allow the user to disable execinfo to avoid the +following build failure on musl with +https://github.com/mikroskeem/libexecinfo: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' + +Fixes: + - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/openipmi/patches/36] +--- + configure.ac | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 607864b9..f369166f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, + POPTLIBS="$withval" + ) + ++tryexecinfo=yes ++AC_ARG_WITH(execinfo, ++[ --with-execinfo[[=yes|no]] Look for execinfo.], ++ if test "x$withval" = "xyes"; then ++ tryexecinfo=yes ++ elif test "x$withval" = "xno"; then ++ tryexecinfo=no ++ fi, ++) ++ + # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib + tryopenssl=yes + AC_ARG_WITH(openssl, +@@ -275,7 +285,9 @@ AM_PROG_CC_C_O + AC_PROG_LIBTOOL + AC_STDC_HEADERS + +-AC_CHECK_HEADERS(execinfo.h) ++if test "x$tryexecinfo" != "xno"; then ++ AC_CHECK_HEADERS(execinfo.h) ++fi + AC_CHECK_HEADERS([netinet/ether.h]) + AC_CHECK_HEADERS([sys/ethernet.h]) + +-- +2.34.1 + diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index ad2f2d2f4f..b3a4d90d4b 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,6 +15,7 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ + --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ From thomas.petazzoni at bootlin.com Fri Jan 7 18:14:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:14:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/openipmi: fix musl build with libexecinfo In-Reply-To: <20220104205948.3633747-1-fontaine.fabrice@gmail.com> References: <20220104205948.3633747-1-fontaine.fabrice@gmail.com> Message-ID: <20220107191419.612c37bd@windsurf> On Tue, 4 Jan 2022 21:59:48 +0100 Fabrice Fontaine wrote: > Disable execinfo to avoid the following musl build failure raised since > the addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 > > Signed-off-by: Fabrice Fontaine > --- > ...igure.ac-add-without-execinfo-option.patch | 55 +++++++++++++++++++ > package/openipmi/openipmi.mk | 1 + > 2 files changed, 56 insertions(+) > create mode 100644 package/openipmi/0002-configure.ac-add-without-execinfo-option.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:15:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:15:38 +0100 Subject: [Buildroot] [git commit] package/binutils: add patches to fix binutils bug 28735 for or1k Message-ID: <20220107180939.3DCB481882@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a1f18a85784da3e4243b1c54a18fa88f02a8a00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master After fixing binutils bug 21464, bug 28735 showed up. It got fixed very soon after my request: https://sourceware.org/pipermail/binutils/2022-January/119078.html So let's add patch and backported patches to all binutils versions to make Buildroot free from bug 28735. Unfortunately Bootlin toolchains have just been rebuilt and will fail for this bug. This happened because libgeos has been bumped few time ago and was masked by bug 21464 dependency that prevented to build. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...R_OR1K_GOT16-signed-overflow-by-using-spe.patch | 75 ++++++++++++++++++++++ ...R_OR1K_GOT16-signed-overflow-by-using-spe.patch | 75 ++++++++++++++++++++++ ...R_OR1K_GOT16-signed-overflow-by-using-spe.patch | 75 ++++++++++++++++++++++ ...R_OR1K_GOT16-signed-overflow-by-using-spe.patch | 75 ++++++++++++++++++++++ 4 files changed, 300 insertions(+) diff --git a/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..7e92e2bfd8 --- /dev/null +++ b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 51def3dc6a168d03d28e0d4e2935d9ddb2929192 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index cfa292f0032..ecb70753b6a 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1477,12 +1494,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..e96d49122a --- /dev/null +++ b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From fbab8933bca6b7dba2aa19190a71f799a370c3d4 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 2ff998066a8..3df31172fcb 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1508,12 +1525,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..c4fedb719a --- /dev/null +++ b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 190091f9c1ec4cb80f8106e45ab4125eefa4114b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 431a8ee479f..ea26cdf1033 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + FALSE), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = TRUE; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 0000000000..8609db95b7 --- /dev/null +++ b/package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 362a20108782b87cd780a989c0dbd014fc2def8b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..7fd88d72442 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + false), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ false, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ false, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ false); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = true; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + From thomas.petazzoni at bootlin.com Fri Jan 7 18:15:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:15:43 +0100 Subject: [Buildroot] [git commit] toolchain: remove binutils bug 21464 Message-ID: <20220107180939.4685783493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55fcba2a7c41d29f3f93bb37eec1264af4b45fb0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Binutils bug 21464 is not present anymore in Buildroot so let's remove it and its depends on in libgeos and postgis packages. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/libgeos/Config.in | 4 +--- package/postgis/Config.in | 4 +--- toolchain/Config.in | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 5e861ab010..8411627d43 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 21464, 27597" +comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/postgis/Config.in b/package/postgis/Config.in index f4d913ece7..405c5c723a 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 # libgeos depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ @@ -19,8 +18,7 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 21464, 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/toolchain/Config.in b/toolchain/Config.in index 140d07ca38..fd005f4740 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=21464 -# Affect toolchains built with binutils 2.31.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 - bool - default y if BR2_or1k - # https://sourceware.org/bugzilla/show_bug.cgi?id=27597 # Affect toolchains built with binutils 2.36.1, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 From thomas.petazzoni at bootlin.com Fri Jan 7 18:16:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:16:05 +0100 Subject: [Buildroot] [PATCH 1/2] package/binutils: add patches to fix binutils bug 28735(or1k) In-Reply-To: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> References: <20220102210408.221439-1-giulio.benetti@benettiengineering.com> Message-ID: <20220107191605.78f71e6c@windsurf> On Sun, 2 Jan 2022 22:04:07 +0100 Giulio Benetti wrote: > After fixing binutils bug 21464, bug 28735 showed up. It got fixed very > soon after my request: > https://sourceware.org/pipermail/binutils/2022-January/119078.html > > So let's add patch and backported patches to all binutils versions to make > Buildroot free from bug 28735. Unfortunately Bootlin toolchains have just > been rebuilt and will fail for this bug. This happened because libgeos > has been bumped few time ago and was masked by bug 21464 dependency that > prevented to build. > > Signed-off-by: Giulio Benetti > --- > ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ > ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ > ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ > ...K_GOT16-signed-overflow-by-using-spe.patch | 75 +++++++++++++++++++ > 4 files changed, 300 insertions(+) > create mode 100644 package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch > create mode 100644 package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch > create mode 100644 package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch > create mode 100644 package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Fri Jan 7 18:24:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 19:24:38 +0100 Subject: [Buildroot] [PATCH 1/2] package/libvirt: install in staging In-Reply-To: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 21:50:07 +0100") References: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> Message-ID: <87v8yvl7yx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Install libvirt in staging to allow collectd to use it > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 18:24:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 19:24:42 +0100 Subject: [Buildroot] [PATCH 2/2] package/collectd: add virt support In-Reply-To: <20220104205008.3631801-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 21:50:08 +0100") References: <20220104205008.3631801-1-fontaine.fabrice@gmail.com> <20220104205008.3631801-2-fontaine.fabrice@gmail.com> Message-ID: <87r19jl7yt.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 18:23:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 19:23:04 +0100 Subject: [Buildroot] [git commit] package/libvirt: install in staging Message-ID: <20220107182140.E27B58344C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beac3aef6cf5ce9d09e5ace631faa3a3a9e41900 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Install libvirt in staging to allow collectd to use it Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 9a4788c905..41218c0e53 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -10,6 +10,7 @@ LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ LIBVIRT_LICENSE_FILES = COPYING LIBVIRT_CPE_ID_VENDOR = redhat +LIBVIRT_INSTALL_STAGING = YES LIBVIRT_DEPENDENCIES = \ host-libxslt \ host-nfs-utils \ From peter at korsgaard.com Fri Jan 7 18:23:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 19:23:16 +0100 Subject: [Buildroot] [git commit] package/collectd: add virt support Message-ID: <20220107182140.EC8C483493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=981e7b245aba835919300bb089013d3efe7e65d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 18 ++++++++++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 5e5dff6fe1..697dc51f7e 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -591,6 +591,24 @@ config BR2_PACKAGE_COLLECTD_USERS help Counts the number of users currently logged in. +config BR2_PACKAGE_COLLECTD_VIRT + bool "virt" + depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS # libvirt + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # libvirt + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 # libvirt + depends on BR2_PACKAGE_HAS_UDEV # libvirt + depends on BR2_USE_WCHAR # libvirt + select BR2_PACKAGE_LIBVIRT + select BR2_PACKAGE_LIBXML2 + help + Gather statistics about virtualized guests on a system. + +comment "virt needs udev /dev management, a toolchain w/ wchar, kernel headers >= 3.12 (4.11 for AArch64)" + depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR || \ + !(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \ + (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) + config BR2_PACKAGE_COLLECTD_VMEM bool "vmem" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 9d6f630fe3..5751757040 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -22,7 +22,7 @@ COLLECTD_PLUGINS_DISABLE = \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ - tokyotyrant turbostat uuid varnish virt vserver write_kafka \ + tokyotyrant turbostat uuid varnish vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone COLLECTD_CONF_ENV += LIBS="-lm" @@ -149,6 +149,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \ $(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \ $(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \ + $(if $(BR2_PACKAGE_COLLECTD_VIRT),--enable-virt,--disable-virt) \ $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ @@ -197,6 +198,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \ $(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ + $(if $(BR2_PACKAGE_COLLECTD_VIRT),libvirt libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) From peter at korsgaard.com Fri Jan 7 18:33:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 19:33:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcm-tools: fix static build In-Reply-To: <20220104180826.3171770-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 19:08:26 +0100") References: <20220104180826.3171770-1-fontaine.fabrice@gmail.com> Message-ID: <87mtk7l7jj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Don't build c_example which needs a dynamic library and so will raise > the following static build failure since bump to version 2021.10 in > commit d1d93d488c76d4bc2551270007096693d8194435 and > https://github.com/opcm/pcm/commit/12647a6ee579c29bd306fd034470eb62dcb3156e: > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: cannot find -lpcm > Fixes: > - http://autobuild.buildroot.org/results/1276a3d49c8848039f034e7f03632df365097e94 > Signed-off-by: Fabrice Fontaine > --- > package/pcm-tools/pcm-tools.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk > index 8a58034232..d676df57f9 100644 > --- a/package/pcm-tools/pcm-tools.mk > +++ b/package/pcm-tools/pcm-tools.mk > @@ -17,7 +17,8 @@ define PCM_TOOLS_BUILD_CMDS > touch $(@D)/daemon-binaries > $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ > CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" \ > - UNAME=Linux HOST=_LINUX > + UNAME=Linux HOST=_LINUX \ > + $(foreach f,$(PCM_TOOLS_EXE_FILES),$(f).x) This could also have used addsuffix, but OK. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 18:30:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 19:30:45 +0100 Subject: [Buildroot] [git commit] package/pcm-tools: fix static build Message-ID: <20220107182804.46EBD814EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93aa9db953f127509ed64b3a8caceca878963b6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Don't build c_example which needs a dynamic library and so will raise the following static build failure since bump to version 2021.10 in commit d1d93d488c76d4bc2551270007096693d8194435 and https://github.com/opcm/pcm/commit/12647a6ee579c29bd306fd034470eb62dcb3156e: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: cannot find -lpcm Fixes: - http://autobuild.buildroot.org/results/1276a3d49c8848039f034e7f03632df365097e94 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/pcm-tools/pcm-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index 8a58034232..d676df57f9 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -17,7 +17,8 @@ define PCM_TOOLS_BUILD_CMDS touch $(@D)/daemon-binaries $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" \ - UNAME=Linux HOST=_LINUX + UNAME=Linux HOST=_LINUX \ + $(foreach f,$(PCM_TOOLS_EXE_FILES),$(f).x) endef ifeq ($(BR2_PACKAGE_PCM_TOOLS_PMU_QUERY),y) From peter at korsgaard.com Fri Jan 7 18:39:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 19:39:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/liburing: new package In-Reply-To: <3c9b632e-aae8-5766-c961-42627109d70a@smile.fr> (Romain Naour's message of "Thu, 6 Jan 2022 15:08:08 +0100") References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> <3c9b632e-aae8-5766-c961-42627109d70a@smile.fr> Message-ID: <87iluvl79r.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: Hi, >> +++ b/package/liburing/Config.in >> @@ -0,0 +1,13 @@ >> +config BR2_PACKAGE_LIBURING >> + bool "liburing" >> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h > Is any linux-headers dependency (5.0 maybe). I believe io_uring was added in 5.1: https://kernelnewbies.org/Linux_5.1 -- Bye, Peter Korsgaard From festevam at gmail.com Fri Jan 7 18:42:05 2022 From: festevam at gmail.com (Fabio Estevam) Date: Fri, 7 Jan 2022 15:42:05 -0300 Subject: [Buildroot] [PATCH] configs/imx8mmevk_defconfig: new defconfig Message-ID: <20220107184205.971152-1-festevam@gmail.com> Add support for imx8mmevk_defconfig that allows booting a mainline kernel. This defconfig still relies on NXP ATF and U-Boot, but in the long term the plan is to switch to mainline ATF and U-Boot as well. Signed-off-by: Fabio Estevam --- DEVELOPERS | 1 + board/freescale/imx8mmevk/readme.txt | 6 ++++ configs/imx8mmevk_defconfig | 41 ++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 configs/imx8mmevk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 37c792816a1d..907600be7211 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -823,6 +823,7 @@ F: configs/imx6ullevk_defconfig F: configs/imx6ulpico_defconfig F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig +F: configs/imx8mmevk_defconfig F: configs/imx8mqevk_defconfig F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig diff --git a/board/freescale/imx8mmevk/readme.txt b/board/freescale/imx8mmevk/readme.txt index 7b69405d3030..a8e80a48f9ea 100644 --- a/board/freescale/imx8mmevk/readme.txt +++ b/board/freescale/imx8mmevk/readme.txt @@ -10,8 +10,14 @@ Build First, configure Buildroot for the i.MX8MM EVK board: +If you want to use the NXP kernel: + make freescale_imx8mmevk_defconfig +Or if you want to use a mainline kernel: + + make imx8mmevk_defconfig + Build all components: make diff --git a/configs/imx8mmevk_defconfig b/configs/imx8mmevk_defconfig new file mode 100644 index 000000000000..2b692342c559 --- /dev/null +++ b/configs/imx8mmevk_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Jan 7 18:51:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:51:36 +0100 Subject: [Buildroot] [PATCH 1/2] nodogsplash package added In-Reply-To: <20220102181525.9494-1-amrtmoh2006@gmail.com> References: <20220102181525.9494-1-amrtmoh2006@gmail.com> Message-ID: <20220107195136.183a4555@windsurf> Hello, First of all, thanks a lot for your contribution! Please see below a number of comments. It would be good if you could address those comments and send an updated version. On Sun, 2 Jan 2022 20:15:24 +0200 azxxza22 wrote: > Signed-off-by: azxxza22 We need contributions to be made under a real name. Could you adjust this? > package/Config.in | 1 + > package/nodogsplash/Config.in | 9 ++++++++ > package/nodogsplash/nodogsplash.mk | 37 ++++++++++++++++++++++++++++++ > 3 files changed, 47 insertions(+) You also need to add an entry in the DEVELOPERS file, so that we know who maintains this package. > diff --git a/package/nodogsplash/Config.in b/package/nodogsplash/Config.in > new file mode 100644 > index 0000000000..7a68bcccb0 > --- /dev/null > +++ b/package/nodogsplash/Config.in > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_NODOGSPLASH > + bool "nodogsplash" > + depends on BR2_PACKAGE_LIBMICROHTTPD This should be: select BR2_PACKAGE_LIBMICROHTTPD It would be useful to test the package with ./utils/test-pkg to make sure you have captured all toolchain dependencies. > + help > + Nodogsplash is a Captive Portal that offers > + a simple way to provide restricted access to the Internet by > + showing a splash page to the user before Internet access is granted I think this last line is too long. Could you run "make check-package" and make sure you haven't introduced new warnings? > + https://github.com/nodogsplash/nodogsplash/ > diff --git a/package/nodogsplash/nodogsplash.mk b/package/nodogsplash/nodogsplash.mk > new file mode 100644 > index 0000000000..3075b7e9f1 > --- /dev/null > +++ b/package/nodogsplash/nodogsplash.mk > @@ -0,0 +1,37 @@ > +################################################################################ > +# > +# nodogsplash > +# > +################################################################################ Empty new line needed here. > +NODOGSPLASH_VERSION = v4.5.1 Should be without the "v". > +NODOGSPLASH_SITE = git://github.com/nodogsplash/nodogsplash.git > +NODOGSPLASH_SITE_METHOD = git Instead of those two lines, use: NODOGSPLASH_SITE = $(call github,nodogsplash,nodogsplash,v$(NODOGSPLASH_VERSION)) > +NODOGSPLASH_LICENSE = GPL-2.0 > +NODOGSPLASH_LICENSE_FILES = COPYING > +NODOGSPLASH_DEPENDENCIES = libmicrohttpd > +NODOGSPLASH_INSTALL_STAGING = YES Why is this needed in staging? Does it install some library that another package will link against ? > + > +define NODOGSPLASH_BUILD_CMDS > + $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) Why is $(MAKE1) used? Isn't $(MAKE) working? Ideally, this should be: $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) > +endef > + > +define NODOGSPLASH_INSTALL_EXTRA_FILES > + mkdir -p $(TARGET_DIR)/usr/bin > + mkdir -p $(TARGET_DIR)/etc/nodogsplash/htdocs/images > + cp $(@D)/resources/nodogsplash.conf $(TARGET_DIR)/etc/nodogsplash/ > + cp $(@D)/resources/splash.html $(TARGET_DIR)/etc/nodogsplash/htdocs/ > + cp $(@D)/resources/splash.css $(TARGET_DIR)/etc/nodogsplash/htdocs/ > + cp $(@D)/resources/status.html $(TARGET_DIR)/etc/nodogsplash/htdocs/ > + cp $(@D)/resources/splash.jpg $(TARGET_DIR)/etc/nodogsplash/htdocs/images/ Use: $(INSTALL) -D -m 0644 src dst it will automatically create any missing destination directory for you. > +endef > + > +NODOGSPLASH_POST_INSTALL_TARGET_HOOKS += NODOGSPLASH_INSTALL_EXTRA_FILES There's no need for a post-install target hook, just put the commands directly inside NODOGSPLASH_INSTALL_TARGET_CMDS. > + > +define NODOGSPLASH_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/nodogsplash $(TARGET_DIR)/usr/bin > + $(INSTALL) -D -m 0755 $(@D)/ndsctl $(TARGET_DIR)/usr/bin Please use full destination paths, i.e: $(INSTALL) -D -m 0755 $(@D)/nodogsplash $(TARGET_DIR)/usr/bin/nodogsplash $(INSTALL) -D -m 0755 $(@D)/ndsctl $(TARGET_DIR)/usr/bin/ndsctl But I see the Makefile of the upstream project has an install target which seems to do the right thing. Why don't you use it? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 18:53:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 19:53:08 +0100 Subject: [Buildroot] [PATCH 2/2] hash file added In-Reply-To: <20220102181525.9494-2-amrtmoh2006@gmail.com> References: <20220102181525.9494-1-amrtmoh2006@gmail.com> <20220102181525.9494-2-amrtmoh2006@gmail.com> Message-ID: <20220107195308.282518bc@windsurf> Hello, On Sun, 2 Jan 2022 20:15:25 +0200 azxxza22 wrote: > Signed-off-by: azxxza22 > --- > package/nodogsplash/nodogsplash.hash | 2 ++ > 1 file changed, 2 insertions(+) > create mode 100644 package/nodogsplash/nodogsplash.hash This should be part of the patch adding the package. > diff --git a/package/nodogsplash/nodogsplash.hash b/package/nodogsplash/nodogsplash.hash > new file mode 100644 > index 0000000000..da059a854d > --- /dev/null > +++ b/package/nodogsplash/nodogsplash.hash > @@ -0,0 +1,2 @@ > +md5 edafdd4ef89218261f29a9074891cf7a nodogsplash-v4.5.1-br1.tar.gz > +md5 cbbd794e2a0a289b9dfcc9f513d1996e COPYING These should be sha256 hashes, and there should be a comment above that says: # Locally calculated Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 19:07:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 20:07:26 +0100 Subject: [Buildroot] [git commit] package/liburing: new package Message-ID: <20220107190148.C1E6882AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03ca6f4e39874583060317e7e15e9e360220877e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is the io_uring library, liburing. liburing provides helpers to setup and teardown io_uring instances, and also a simplified interface for applications that don't need (or want) to deal with the full kernel side implementation. https://git.kernel.dk/cgit/liburing Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/liburing/Config.in | 15 +++++++++++++++ package/liburing/liburing.hash | 8 ++++++++ package/liburing/liburing.mk | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 630196fd54..47ac7b5de6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -906,6 +906,7 @@ F: package/librsync/ F: package/libsoup/ F: package/libsoxr/ F: package/libupnp/ +F: package/liburing/ F: package/libv4l/ F: package/libxslt/ F: package/mbedtls/ diff --git a/package/Config.in b/package/Config.in index e9ee4d2ef1..193ccea1f7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2000,6 +2000,7 @@ menu "Other" source "package/libuci/Config.in" source "package/libunwind/Config.in" source "package/liburcu/Config.in" + source "package/liburing/Config.in" source "package/libuv/Config.in" source "package/lightning/Config.in" source "package/linux-pam/Config.in" diff --git a/package/liburing/Config.in b/package/liburing/Config.in new file mode 100644 index 0000000000..d65a3f1322 --- /dev/null +++ b/package/liburing/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBURING + bool "liburing" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + help + This is the io_uring library, liburing. liburing provides + helpers to setup and teardown io_uring instances, and also a + simplified interface for applications that don't need (or + want) to deal with the full kernel side implementation. + + https://git.kernel.dk/cgit/liburing + +comment "liburing needs a toolchain w/ gcc >= 4.9, headers >= 5.1" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash new file mode 100644 index 0000000000..56e90d71cc --- /dev/null +++ b/package/liburing/liburing.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 df7c8fd05fd39da622b2814e06f815f11f1beb429487a4330eed64bb7f353dbf liburing-2.1.tar.bz2 + +# Hash for license files +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 d0b225f17ef2d05d5cda6b25b2dc334ef6f5f12537c20edf6e391852a095ec19 LICENSE +sha256 97d62ff5d7cf0b1cef34c33a89877352911278ca4ac1c6c4f24a835baa5ea10b README diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk new file mode 100644 index 0000000000..a977e74b4f --- /dev/null +++ b/package/liburing/liburing.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# liburing +# +################################################################################ + +LIBURING_VERSION = 2.1 +LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 +LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot +LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT +LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README +LIBURING_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +LIBURING_MAKE_OPTS += ENABLE_SHARED=0 +else +LIBURING_MAKE_OPTS += ENABLE_SHARED=1 +endif + +define LIBURING_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define LIBURING_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D)/src +endef + +define LIBURING_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install +endef + +define LIBURING_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Fri Jan 7 19:07:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 20:07:49 +0100 Subject: [Buildroot] [git commit] package/lxc: add liburing optional dependency Message-ID: <20220107190148.CB02E8349D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=352252149e5617e6e2c69d09f9e118786db6ffa8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master liburing is an optional dependency (enabed by default) since version 4.0.11 and https://github.com/lxc/lxc/commit/b1f9aee5c466b5a6d88582375ea15971d846d18b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lxc/lxc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4d63fc14cb..08f64bcec7 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -44,6 +44,13 @@ else LXC_CONF_OPTS += --disable-selinux endif +ifeq ($(BR2_PACKAGE_LIBURING),y) +LXC_CONF_OPTS += --enable-liburing +LXC_DEPENDENCIES += liburing +else +LXC_CONF_OPTS += --disable-liburing +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LXC_CONF_OPTS += --enable-openssl LXC_DEPENDENCIES += openssl From thomas.petazzoni at bootlin.com Fri Jan 7 19:15:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 20:15:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/liburing: new package In-Reply-To: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> Message-ID: <20220107201544.39790a38@windsurf> On Tue, 4 Jan 2022 19:11:06 +0100 Fabrice Fontaine wrote: > This is the io_uring library, liburing. liburing provides helpers to > setup and teardown io_uring instances, and also a simplified interface > for applications that don't need (or want) to deal with the full kernel > side implementation. > > https://git.kernel.dk/cgit/liburing > > Signed-off-by: Fabrice Fontaine > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/liburing/Config.in | 13 ++++++++++++ > package/liburing/liburing.hash | 8 ++++++++ > package/liburing/liburing.mk | 36 ++++++++++++++++++++++++++++++++++ > 5 files changed, 59 insertions(+) > create mode 100644 package/liburing/Config.in > create mode 100644 package/liburing/liburing.hash > create mode 100644 package/liburing/liburing.mk I have applied, after adding a dependency on headers >= 5.1. I think this dependency is not strictly needed for building, because liburing apparently bundles a copy of the kernel header (if I understood correctly). But anyway, since it can't work on kernels < 5.1, this headers dependency also hints the user about this requirement. Maybe some kernel config fixup would be useful in liburing.mk, to ensure the kernel is built with the needed kernel config option; Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 19:15:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 20:15:48 +0100 Subject: [Buildroot] [PATCH 2/2] package/lxc: add liburing optional dependency In-Reply-To: <20220104181107.3171973-2-fontaine.fabrice@gmail.com> References: <20220104181107.3171973-1-fontaine.fabrice@gmail.com> <20220104181107.3171973-2-fontaine.fabrice@gmail.com> Message-ID: <20220107201548.7dde59bd@windsurf> On Tue, 4 Jan 2022 19:11:07 +0100 Fabrice Fontaine wrote: > liburing is an optional dependency (enabed by default) since version > 4.0.11 and > https://github.com/lxc/lxc/commit/b1f9aee5c466b5a6d88582375ea15971d846d18b > > Signed-off-by: Fabrice Fontaine > --- > package/lxc/lxc.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 7 19:29:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:29:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbuffer: bump to version 20211018 Message-ID: <20220107192952.1277336-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/mbuffer/mbuffer.hash | 4 ++-- package/mbuffer/mbuffer.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbuffer/mbuffer.hash b/package/mbuffer/mbuffer.hash index 7c200d543e..bab568d1d8 100644 --- a/package/mbuffer/mbuffer.hash +++ b/package/mbuffer/mbuffer.hash @@ -1,8 +1,8 @@ # From http://www.maier-komor.de/mbuffer.html -md5 4e4712db5fbd4e71bfbfa2c145c6c646 mbuffer-20210328.tgz +md5 b6787260112e3ac416c0febdb097caa8 mbuffer-20211018.tgz # Locally computed after checking signature upstream -sha256 51b5b8d8488991a55fe1dfce90130f9e47bc1ce286ba03b4f628c04b784fdc5d mbuffer-20210328.tgz +sha256 e240c1e4e4ac14c28be8c660ec47d44ce16b1e8ec92aa907ad13004ffd5db6e3 mbuffer-20211018.tgz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/mbuffer/mbuffer.mk b/package/mbuffer/mbuffer.mk index c7c4456651..bbf27579f1 100644 --- a/package/mbuffer/mbuffer.mk +++ b/package/mbuffer/mbuffer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBUFFER_VERSION = 20210328 +MBUFFER_VERSION = 20211018 MBUFFER_SOURCE = mbuffer-$(MBUFFER_VERSION).tgz MBUFFER_SITE = http://www.maier-komor.de/software/mbuffer MBUFFER_LICENSE = GPL-3.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 19:34:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:34:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: enable CONFIG_IO_URING Message-ID: <20220107193436.1278176-1-fontaine.fabrice@gmail.com> Enable CONFIG_IO_URING through LIBURING_LINUX_CONFIG_FIXUPS in case the user is also building a kernel Signed-off-by: Fabrice Fontaine --- package/liburing/liburing.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index a977e74b4f..74ce4156f8 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -11,6 +11,10 @@ LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README LIBURING_INSTALL_STAGING = YES +define LIBURING_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IO_URING) +endef + ifeq ($(BR2_STATIC_LIBS),y) LIBURING_MAKE_OPTS += ENABLE_SHARED=0 else -- 2.34.1 From bugzilla at busybox.net Fri Jan 7 19:39:32 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 07 Jan 2022 19:39:32 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 --- Comment #6 from Fabrice Fontaine --- FYI, patch was applied on master with https://git.buildroot.net/buildroot/commit/?id=48b77b25b71fa3c47b8d6fac1da46ea122715350 -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Fri Jan 7 19:49:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:49:56 +0100 Subject: [Buildroot] [PATCH 1/2] package/libosip2: bump to version 5.3.0 Message-ID: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> https://git.savannah.nongnu.org/cgit/osip.git/tree/ChangeLog?h=5.3.0 Signed-off-by: Fabrice Fontaine --- package/libosip2/libosip2.hash | 2 +- package/libosip2/libosip2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash index 7a08bf26a7..071ad7e61a 100644 --- a/package/libosip2/libosip2.hash +++ b/package/libosip2/libosip2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 ee3784bc8e7774f56ecd0e2ca6e3e11d38b373435115baf1f1aa0ca0bfd02bf2 libosip2-5.2.1.tar.gz +sha256 f4725916c22cf514969efb15c3c207233d64739383f7d42956038b78f6cae8c8 libosip2-5.3.0.tar.gz # Hash for license file: sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index 967602b426..2f9b7a9242 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSIP2_VERSION = 5.2.1 +LIBOSIP2_VERSION = 5.3.0 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 19:49:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:49:57 +0100 Subject: [Buildroot] [PATCH 2/2] package/libeXosip2: bump to version 5.3.0 In-Reply-To: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> References: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> Message-ID: <20220107194957.1320947-2-fontaine.fabrice@gmail.com> https://git.savannah.nongnu.org/cgit/exosip.git/tree/ChangeLog?h=5.3.0 Signed-off-by: Fabrice Fontaine --- package/libeXosip2/libeXosip2.hash | 2 +- package/libeXosip2/libeXosip2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libeXosip2/libeXosip2.hash b/package/libeXosip2/libeXosip2.hash index b88a5b4c21..5cfee3ab29 100644 --- a/package/libeXosip2/libeXosip2.hash +++ b/package/libeXosip2/libeXosip2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 87256b45a406f3c038e1e75e31372d526820366527c2af3bb89329bafd87ec42 libexosip2-5.2.1.tar.gz +sha256 5b7823986431ea5cedc9f095d6964ace966f093b2ae7d0b08404788bfcebc9c2 libexosip2-5.3.0.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index b550e293ae..86d821b02f 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEXOSIP2_VERSION = 5.2.1 +LIBEXOSIP2_VERSION = 5.3.0 # Since version 5.0, letter 'X' in library's name is in lower case LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 19:56:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 20:56:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/zlib-ng: bump to version 2.0.6 Message-ID: <20220107195605.1411244-1-fontaine.fabrice@gmail.com> RISC-V is supported since https://github.com/zlib-ng/zlib-ng/commit/81f1c8a41bd1427707f402450de8820816760fca https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.6 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.5 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.4 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.3 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.2 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.1 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.0 Signed-off-by: Fabrice Fontaine --- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- package/zlib/Config.in | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index 3e1dba35ba..a799cfe253 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 379723c0c954679a50d1d7df43084e2194dc51ecbc9987c889cb129d1f6734bc zlib-ng-1.9.9-b1.tar.gz +sha256 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6 zlib-ng-2.0.6.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index c56fa72d6f..fb497b8c11 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 1.9.9-b1 +ZLIB_NG_VERSION = 2.0.6 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md diff --git a/package/zlib/Config.in b/package/zlib/Config.in index 550c2efa93..d6d94889a7 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_i386 default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv default y if BR2_s390x default y if BR2_x86_64 -- 2.34.1 From marc.chalain at mailoo.org Fri Jan 7 20:08:47 2022 From: marc.chalain at mailoo.org (marc.chalain at mailoo.org) Date: Fri, 7 Jan 2022 21:08:47 +0100 (CET) Subject: [Buildroot] package/aravis: new package In-Reply-To: <20220106103759.1166357c@windsurf> Message-ID: Thank for all, I will send a new version quickly, but some questions first: > +ARAVIS_VERSION = 0.8.16 Aravis project is moving fast, there is a new version 0.8.20 already. I'm fine with this version since it was released recently: https://github.com/AravisProject/aravis/releases/tag/0.8.16 The 0.8.16 is available from June 2021. I had clearly well tested this version with several kernel configuration. What is it better ? the last version or the most tested version ? To send 0.8.20 I will need few weeks, to test. > +ARAVIS_SITE = $(call github,AravisProject,aravis,$(ARAVIS_VERSION)) > +ARAVIS_DEPENDENCIES = \ > +??? host-pkgconf \ > +??? libglib2 \ > +??? libxml2 There is a list of dependencies in the Readme: https://github.com/AravisProject/aravis/blob/main/README.md#install-dependencies-on-ubuntu-2004 especially gstreamer and plugins etc.. This rules is just for GigE Camera and not USB3Vision. I haven't tested this feature. The gstreamer is not mandator, it is only for the viewer. I am focused on Embeded system without any kind of display. If the gstreamer or libusb3 are availables, meson is able to detect and add them during the configuration process. To add as dependencies, forces to build the optionals features. What's the best ? Thank you., best regards, Marc. De : Thomas Petazzoni ? : Romain Naour Sujet : Re: [Buildroot] package/aravis: new package Date : 06/01/2022 10:37:59 Europe/Paris Copie ? : marc.chalain at mailoo.org; ???buildroot at buildroot.org; ???Eric Le Bihan ; ???Marc Chalain Hello, On Thu, 6 Jan 2022 10:24:53 +0100 Romain Naour wrote: > > diff --git a/package/aravis/Config.in b/package/aravis/Config.in > > new file mode 100644 > > index 0000000000..02c71c44da > > --- /dev/null > > +++ b/package/aravis/Config.in > > @@ -0,0 +1,16 @@ > > +config BR2_PACKAGE_ARAVIS > > +??? bool "aravis - GigE Camera" Just: bool "aravis" > > +??? depends on BR2_USE_WCHAR > > +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > > +??? depends on BR2_PACKAGE_PCRE_16 > > +??? depends on BR2_PACKAGE_PCRE_32 Please use "select" for pcre. > > +ARAVIS_LICENSE_FILES = COPYING > > +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) > > Is gettext a mandatory dependency ? > At least gettext should be in ARAVIS_DEPENDENCIES when NLS support is enabled. No, don't add gettext directly, use $(TARGET_NLS_DEPENDENCIES), which will automatically add (or not) host-gettext and/or gettext to the dependencies, depending on when it's needed or not. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Fri Jan 7 20:30:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:30:39 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: update openrisc toolchain Message-ID: <20220107202636.DF77682B53@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1fba3711d03687fb05c2c849ebe11a2761a7474 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Bootlin toolchains for the OpenRISC architecture have been rebuilt with the fix for binutils bug 28735, so let's update their definition in Buildroot. Signed-off-by: Thomas Petazzoni --- .../toolchain-external-bootlin/Config.in.options | 8 ++++---- .../toolchain-external-bootlin.hash | 16 ++++++++-------- .../toolchain-external-bootlin.mk | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 898a1ff511..94dea4a386 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -2400,7 +2400,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2021.11-1" + bool "openrisc musl bleeding-edge 2021.11-4" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -2423,7 +2423,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2021.11-1" + bool "openrisc musl stable 2021.11-4" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -2445,7 +2445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2021.11-1" + bool "openrisc uclibc bleeding-edge 2021.11-4" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -2468,7 +2468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2021.11-1" + bool "openrisc uclibc stable 2021.11-4" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 2a4c4179d4..638130d8b8 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -192,14 +192,14 @@ sha256 30d82c7ca41a0df9931a29a46ed881f21a889e9e59baf04e820c6679be87a7fb mips64 sha256 5c2dc11062f4817e81a328b12ab30be486b7e68c7c876eb45fffca72332a8804 nios2--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2021.11-1.sha256 sha256 f6f37f1e551edda0251ece8d906ed720bd8ec45da9d4b3e1d13721bdc9ef2882 nios2--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-1.sha256 -sha256 9b413c970bd3c92cd1c805e2fa1c5d86e808a18985f518be565afd9794a96c60 openrisc--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-1.sha256 -sha256 71ffaf12c0d8a317d301a236389483a12045064c088c213dd481eeab295e603d openrisc--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 85171daa8556bba550a48fe9ef7783ef465de79e2f41a2188cefea0c01dcb804 openrisc--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-1.sha256 -sha256 4f13b2ef95c3dfd886cd696de28bd29b20bc3379103fd6f76c9cf0816d34a5c6 openrisc--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-4.sha256 +sha256 9100a143a2f96c46d4d593fb25f4cab4a2efc61371f12bd1a686fbd52ee64c63 openrisc--musl--bleeding-edge-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-4.sha256 +sha256 72fce2be59c18a5b3a02f51ebb83119a0f3d29ab7f2d5cd560038ff6f94f137a openrisc--musl--stable-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-4.sha256 +sha256 ffbdedf741bcfeadaf0c52ac09af83b24eedca2e9a5fc563127c5fdbd10c79a6 openrisc--uclibc--bleeding-edge-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-4.sha256 +sha256 082ec406a6a516d582a092e63f9078e200a1e32dc24d47928f90c09b1e61819b openrisc--uclibc--stable-2021.11-4.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2021.11-1.sha256 sha256 53afdbe1e48d0c60d560db8d17042a99288661fe10eebbfcfec4e56a6c2ca594 powerpc-440fp--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2021.11-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 7093feb404..f28592272c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -583,25 +583,25 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif From thomas.petazzoni at bootlin.com Fri Jan 7 20:33:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:33:22 +0100 Subject: [Buildroot] [git commit] package/mbuffer: bump to version 20211018 Message-ID: <20220107202839.9283A82A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c86ec14d2aab1afe7815801d194d0da477e81db7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mbuffer/mbuffer.hash | 4 ++-- package/mbuffer/mbuffer.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbuffer/mbuffer.hash b/package/mbuffer/mbuffer.hash index 7c200d543e..bab568d1d8 100644 --- a/package/mbuffer/mbuffer.hash +++ b/package/mbuffer/mbuffer.hash @@ -1,8 +1,8 @@ # From http://www.maier-komor.de/mbuffer.html -md5 4e4712db5fbd4e71bfbfa2c145c6c646 mbuffer-20210328.tgz +md5 b6787260112e3ac416c0febdb097caa8 mbuffer-20211018.tgz # Locally computed after checking signature upstream -sha256 51b5b8d8488991a55fe1dfce90130f9e47bc1ce286ba03b4f628c04b784fdc5d mbuffer-20210328.tgz +sha256 e240c1e4e4ac14c28be8c660ec47d44ce16b1e8ec92aa907ad13004ffd5db6e3 mbuffer-20211018.tgz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/mbuffer/mbuffer.mk b/package/mbuffer/mbuffer.mk index c7c4456651..bbf27579f1 100644 --- a/package/mbuffer/mbuffer.mk +++ b/package/mbuffer/mbuffer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBUFFER_VERSION = 20210328 +MBUFFER_VERSION = 20211018 MBUFFER_SOURCE = mbuffer-$(MBUFFER_VERSION).tgz MBUFFER_SITE = http://www.maier-komor.de/software/mbuffer MBUFFER_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Fri Jan 7 20:33:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:33:34 +0100 Subject: [Buildroot] [git commit] package/libosip2: bump to version 5.3.0 Message-ID: <20220107202839.A8684834A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cb3475c5ad580adb9b783fd9684396281bca1fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.savannah.nongnu.org/cgit/osip.git/tree/ChangeLog?h=5.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libosip2/libosip2.hash | 2 +- package/libosip2/libosip2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash index 7a08bf26a7..071ad7e61a 100644 --- a/package/libosip2/libosip2.hash +++ b/package/libosip2/libosip2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 ee3784bc8e7774f56ecd0e2ca6e3e11d38b373435115baf1f1aa0ca0bfd02bf2 libosip2-5.2.1.tar.gz +sha256 f4725916c22cf514969efb15c3c207233d64739383f7d42956038b78f6cae8c8 libosip2-5.3.0.tar.gz # Hash for license file: sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index 967602b426..2f9b7a9242 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSIP2_VERSION = 5.2.1 +LIBOSIP2_VERSION = 5.3.0 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Fri Jan 7 20:33:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:33:29 +0100 Subject: [Buildroot] [git commit] package/liburing: enable CONFIG_IO_URING Message-ID: <20220107202839.9D94C8027C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b78e3a62477dad00a2c081883dae13d0f7e8856 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable CONFIG_IO_URING through LIBURING_LINUX_CONFIG_FIXUPS in case the user is also building a kernel Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/liburing/liburing.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index a977e74b4f..74ce4156f8 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -11,6 +11,10 @@ LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT LIBURING_LICENSE_FILES = COPYING COPYING.GPL LICENSE README LIBURING_INSTALL_STAGING = YES +define LIBURING_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IO_URING) +endef + ifeq ($(BR2_STATIC_LIBS),y) LIBURING_MAKE_OPTS += ENABLE_SHARED=0 else From thomas.petazzoni at bootlin.com Fri Jan 7 20:34:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:34:43 +0100 Subject: [Buildroot] [git commit] package/zlib-ng: bump to version 2.0.6 Message-ID: <20220107202839.BB31682A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d2249821d3f30202ca2a35ad24918378d9a0a0e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master RISC-V is supported since https://github.com/zlib-ng/zlib-ng/commit/81f1c8a41bd1427707f402450de8820816760fca https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.6 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.5 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.4 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.3 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.2 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.1 https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- package/zlib/Config.in | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index 3e1dba35ba..a799cfe253 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 379723c0c954679a50d1d7df43084e2194dc51ecbc9987c889cb129d1f6734bc zlib-ng-1.9.9-b1.tar.gz +sha256 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6 zlib-ng-2.0.6.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index c56fa72d6f..fb497b8c11 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 1.9.9-b1 +ZLIB_NG_VERSION = 2.0.6 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md diff --git a/package/zlib/Config.in b/package/zlib/Config.in index 550c2efa93..d6d94889a7 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_i386 default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv default y if BR2_s390x default y if BR2_x86_64 From thomas.petazzoni at bootlin.com Fri Jan 7 20:33:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:33:38 +0100 Subject: [Buildroot] [git commit] package/libeXosip2: bump to version 5.3.0 Message-ID: <20220107202839.B2E97834A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7f2b73fa510fd247aaadcf250d154893bde044d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.savannah.nongnu.org/cgit/exosip.git/tree/ChangeLog?h=5.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libeXosip2/libeXosip2.hash | 2 +- package/libeXosip2/libeXosip2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libeXosip2/libeXosip2.hash b/package/libeXosip2/libeXosip2.hash index b88a5b4c21..5cfee3ab29 100644 --- a/package/libeXosip2/libeXosip2.hash +++ b/package/libeXosip2/libeXosip2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 87256b45a406f3c038e1e75e31372d526820366527c2af3bb89329bafd87ec42 libexosip2-5.2.1.tar.gz +sha256 5b7823986431ea5cedc9f095d6964ace966f093b2ae7d0b08404788bfcebc9c2 libexosip2-5.3.0.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index b550e293ae..86d821b02f 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEXOSIP2_VERSION = 5.2.1 +LIBEXOSIP2_VERSION = 5.3.0 # Since version 5.0, letter 'X' in library's name is in lower case LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip From fontaine.fabrice at gmail.com Fri Jan 7 20:33:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:33:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/libedit: bump to version 20210910-3.1 Message-ID: <20220107203332.1461209-1-fontaine.fabrice@gmail.com> Refresh patch https://www.thrysoee.dk/editline Signed-off-by: Fabrice Fontaine --- package/libedit/0001-check-bsd-functions-in-libbsd.patch | 4 ++-- package/libedit/libedit.hash | 2 +- package/libedit/libedit.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libedit/0001-check-bsd-functions-in-libbsd.patch b/package/libedit/0001-check-bsd-functions-in-libbsd.patch index 7438340d48..0af9472f17 100644 --- a/package/libedit/0001-check-bsd-functions-in-libbsd.patch +++ b/package/libedit/0001-check-bsd-functions-in-libbsd.patch @@ -1,7 +1,7 @@ configure: on Linux, the BSD functions require linking against libbsd Signed-off-by: "Fabrice Fontaine" -(Rebased against 20170329-3.1) +(Rebased against 20210910-3.1) Signed-off-by: "Yann E. MORIN" (Rebased against 20150325-3.1) Signed-off-by: Bernd Kuhls @@ -17,6 +17,6 @@ diff -durN libedit-20130712-3.1.orig/configure.ac libedit-20130712-3.1/configure +# Search for libbsd for *vis functions +AC_CHECK_LIB([bsd], [vis]) + - AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat getline vis strvis strunvis __secure_getenv secure_getenv]) + AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat vis strvis strunvis __secure_getenv secure_getenv]) # strlcpy diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index d405e47b42..6d139730e8 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071 libedit-20191231-3.1.tar.gz +sha256 6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5 libedit-20210910-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index cb18b97f6d..595a59f702 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20191231-3.1 +LIBEDIT_VERSION = 20210910-3.1 LIBEDIT_SITE = http://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 20:35:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:35:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/libnftnl: bump to version 1.2.1 Message-ID: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> https://www.netfilter.org/projects/libnftnl/files/changes-libnftnl-1.2.1.txt Signed-off-by: Fabrice Fontaine --- package/libnftnl/libnftnl.hash | 2 +- package/libnftnl/libnftnl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 9737da1878..0a183eedcf 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 90b01fddfe9be8c3245c3ba5ff5a4424a8df708828f92b2b361976b658c074f5 libnftnl-1.2.0.tar.bz2 +sha256 7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c libnftnl-1.2.1.tar.bz2 sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index eff93b895f..616afa6307 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.0 +LIBNFTNL_VERSION = 1.2.1 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPL-2.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 20:35:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:35:34 +0100 Subject: [Buildroot] [PATCH 2/2] package/nftables: bump to version 1.0.1 In-Reply-To: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> References: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> Message-ID: <20220107203534.1461378-2-fontaine.fabrice@gmail.com> Set --with-cli=readline to avoid a build failure since https://git.netfilter.org/nftables/commit/?id=b4dded0ca78df2a67245a3db1448a51207577ff1 https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.1.txt Signed-off-by: Fabrice Fontaine --- package/nftables/nftables.hash | 2 +- package/nftables/nftables.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index bbf7e5a2b1..53878abba9 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 58bf547daf967a2b88ecb4f425f126006ebde22711db806b25c1d6cf84fe45f4 nftables-1.0.0.tar.bz2 +sha256 3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423 nftables-1.0.1.tar.bz2 sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 2409eb0571..d5c16ac2be 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.0 +NFTABLES_VERSION = 1.0.1 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) @@ -21,6 +21,7 @@ NFTABLES_CONF_OPTS += --with-mini-gmp endif ifeq ($(BR2_PACKAGE_READLINE),y) +NFTABLES_CONF_OPTS += --with-cli=readline NFTABLES_DEPENDENCIES += readline NFTABLES_LIBS += -lncurses else -- 2.34.1 From thomas.petazzoni at bootlin.com Fri Jan 7 20:38:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:38:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbuffer: bump to version 20211018 In-Reply-To: <20220107192952.1277336-1-fontaine.fabrice@gmail.com> References: <20220107192952.1277336-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213855.0f6e605c@windsurf> On Fri, 7 Jan 2022 20:29:52 +0100 Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine > --- > package/mbuffer/mbuffer.hash | 4 ++-- > package/mbuffer/mbuffer.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 20:38:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:38:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: enable CONFIG_IO_URING In-Reply-To: <20220107193436.1278176-1-fontaine.fabrice@gmail.com> References: <20220107193436.1278176-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213859.54ea3b77@windsurf> On Fri, 7 Jan 2022 20:34:36 +0100 Fabrice Fontaine wrote: > Enable CONFIG_IO_URING through LIBURING_LINUX_CONFIG_FIXUPS in case the > user is also building a kernel > > Signed-off-by: Fabrice Fontaine > --- > package/liburing/liburing.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 20:39:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:39:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/libosip2: bump to version 5.3.0 In-Reply-To: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> References: <20220107194957.1320947-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213928.18b0c875@windsurf> On Fri, 7 Jan 2022 20:49:56 +0100 Fabrice Fontaine wrote: > https://git.savannah.nongnu.org/cgit/osip.git/tree/ChangeLog?h=5.3.0 > > Signed-off-by: Fabrice Fontaine > --- > package/libosip2/libosip2.hash | 2 +- > package/libosip2/libosip2.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Both applied to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 20:39:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 21:39:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/zlib-ng: bump to version 2.0.6 In-Reply-To: <20220107195605.1411244-1-fontaine.fabrice@gmail.com> References: <20220107195605.1411244-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213933.506bab07@windsurf> On Fri, 7 Jan 2022 20:56:05 +0100 Fabrice Fontaine wrote: > RISC-V is supported since > https://github.com/zlib-ng/zlib-ng/commit/81f1c8a41bd1427707f402450de8820816760fca > > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.6 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.5 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.4 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.3 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.2 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.1 > https://github.com/zlib-ng/zlib-ng/releases/tag/2.0.0 > > Signed-off-by: Fabrice Fontaine > --- > package/zlib-ng/zlib-ng.hash | 2 +- > package/zlib-ng/zlib-ng.mk | 2 +- > package/zlib/Config.in | 1 + > 3 files changed, 3 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 7 20:40:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:40:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/semodule-utils: bump to version 3.3 Message-ID: <20220107204054.1461571-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine --- package/semodule-utils/semodule-utils.hash | 4 ++-- package/semodule-utils/semodule-utils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index 595183924d..c252506df5 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757 semodule-utils-3.2.tar.gz +sha256 3098ec5e5f04a1dbbf4aa569b63a4570750a9fe0d4da14ce45954aa300a17063 semodule-utils-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index 426dbdb7b6..a9388f7ee8 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.2 +SEMODULE_UTILS_VERSION = 3.3 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 20:47:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:47:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: fix build with libexecinfo Message-ID: <20220107204754.1462472-1-fontaine.fabrice@gmail.com> Fix build failure raised since the addition of the libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4 Fixes: - Not autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/domoticz/domoticz.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 826e6f5e58..0d1088d395 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -41,6 +41,11 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +DOMOTICZ_DEPENDENCIES += libexecinfo +DOMOTICZ_CONF_OPTS += -DEXECINFO_LIBRARIES=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) DOMOTICZ_DEPENDENCIES += libusb DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON -- 2.34.1 From peter at korsgaard.com Fri Jan 7 20:50:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 21:50:43 +0100 Subject: [Buildroot] [git commit] package/python-mpd2: new package Message-ID: <20220107204438.524C082A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9647e423db4abcba315d37e2fe0caae32238ce2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A client interface for the Music Player Daemon. [Peter: license is LGPL-3.0+, add DEVELOPERS entry] Signed-off-by: Uladzimir Bely Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-mpd2/Config.in | 7 +++++++ package/python-mpd2/python-mpd2.hash | 5 +++++ package/python-mpd2/python-mpd2.mk | 13 +++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 47ac7b5de6..d049b99b91 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2801,6 +2801,9 @@ N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ +N: Uladzimir Bely +F: package/python-mpd2/ + N: Vadim Kochan F: package/brcm-patchram-plus/ F: package/frr/ diff --git a/package/Config.in b/package/Config.in index 193ccea1f7..3a0cc0c585 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1093,6 +1093,7 @@ menu "External python modules" source "package/python-mistune/Config.in" source "package/python-modbus-tk/Config.in" source "package/python-more-itertools/Config.in" + source "package/python-mpd2/Config.in" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in new file mode 100644 index 0000000000..823c82e52d --- /dev/null +++ b/package/python-mpd2/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MPD2 + bool "python-mpd2" + depends on BR2_PACKAGE_PYTHON3 + help + A Python MPD client library. + + https://github.com/Mic92/python-mpd2 diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash new file mode 100644 index 0000000000..83487257ee --- /dev/null +++ b/package/python-mpd2/python-mpd2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-mpd2/json +md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz +sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz +# Locally computed sha256 checksums +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk new file mode 100644 index 0000000000..f357e302fd --- /dev/null +++ b/package/python-mpd2/python-mpd2.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-mpd2 +# +################################################################################ + +PYTHON_MPD2_VERSION = 3.0.4 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 +PYTHON_MPD2_SETUP_TYPE = setuptools +PYTHON_MPD2_LICENSE = LGPL-3.0+ +PYTHON_MPD2_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From fontaine.fabrice at gmail.com Fri Jan 7 20:53:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 21:53:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: fix comment Message-ID: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that BR2_USE_WCHAR is due to flac dependency but flac is optional so remove this comment and add boost instead Signed-off-by: Fabrice Fontaine --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 89c53f60fa..473ac31fb1 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,7 +1,7 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac + depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC -- 2.34.1 From peter at korsgaard.com Fri Jan 7 20:50:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 21:50:35 +0100 Subject: [Buildroot] [PATCH] package/python-mpd2: new package In-Reply-To: <20220105231543.22467-1-wiselord1983@gmail.com> (Uladzimir Bely's message of "Thu, 6 Jan 2022 02:15:43 +0300") References: <20220105231543.22467-1-wiselord1983@gmail.com> Message-ID: <87ee5jl17o.fsf@dell.be.48ers.dk> >>>>> "Uladzimir" == Uladzimir Bely writes: > A client interface for the Music Player Daemon. > Signed-off-by: Uladzimir Bely > --- > package/Config.in | 1 + > package/python-mpd2/Config.in | 8 ++++++++ > package/python-mpd2/python-mpd2.hash | 5 +++++ > package/python-mpd2/python-mpd2.mk | 13 +++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-mpd2/Config.in > create mode 100644 package/python-mpd2/python-mpd2.hash > create mode 100644 package/python-mpd2/python-mpd2.mk > diff --git a/package/Config.in b/package/Config.in > index 7148639735..b9dc9b49e7 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1091,6 +1091,7 @@ menu "External python modules" > source "package/python-mistune/Config.in" > source "package/python-modbus-tk/Config.in" > source "package/python-more-itertools/Config.in" > + source "package/python-mpd2/Config.in" > source "package/python-msgfy/Config.in" > source "package/python-msgpack/Config.in" > source "package/python-multidict/Config.in" > diff --git a/package/python-mpd2/Config.in b/package/python-mpd2/Config.in > new file mode 100644 > index 0000000000..015ca47610 > --- /dev/null > +++ b/package/python-mpd2/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_PYTHON_MPD2 > + bool "python-mpd2" > + depends on BR2_PACKAGE_PYTHON3 > + select BR2_PACKAGE_MPD # runtime This assumes that the MPD daemon must be running on the same machine as the client, which is probably not always the case, so I have removed this. > +++ b/package/python-mpd2/python-mpd2.mk > @@ -0,0 +1,13 @@ > +################################################################################ > +# > +# python-mpd2 > +# > +################################################################################ > + > +PYTHON_MPD2_VERSION = 3.0.4 > +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 > +PYTHON_MPD2_SETUP_TYPE = setuptools > +PYTHON_MPD2_LICENSE = GNU Library or Lesser General Public License (LGPL) We can be more specific than that. The license is actually version 3 (or later) of the LGPL, which is encoded as LGPL-3.0+ I also took the liberty to add an entry in DEVELOPERS for this package. Committed with these minor fixes, thanks! -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 20:59:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 21:59:45 +0100 Subject: [Buildroot] [git commit] package/mpd: fix comment Message-ID: <20220107205442.72D798349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20584d1ef270d5c1851c1cd537833ec5882edcba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that BR2_USE_WCHAR is due to flac dependency but flac is optional so remove this comment and add boost instead Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index ff2dd88d6c..eb10151df3 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,7 +1,7 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac + depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC From peter at korsgaard.com Fri Jan 7 21:00:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:00:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: fix comment In-Reply-To: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:53:14 +0100") References: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> Message-ID: <87a6g7l0qi.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that > BR2_USE_WCHAR is due to flac dependency but flac is optional so remove > this comment and add boost instead > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:01:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:01:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/semodule-utils: bump to version 3.3 In-Reply-To: <20220107204054.1461571-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:40:54 +0100") References: <20220107204054.1461571-1-fontaine.fabrice@gmail.com> Message-ID: <875yqvl0pp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/SELinuxProject/selinux/releases/tag/3.3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:01:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 22:01:17 +0100 Subject: [Buildroot] [git commit] package/semodule-utils: bump to version 3.3 Message-ID: <20220107205522.4A6A38349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fb16a85da1f5c1c34af0da4c247c79f8d76bcab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/SELinuxProject/selinux/releases/tag/3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/semodule-utils/semodule-utils.hash | 4 ++-- package/semodule-utils/semodule-utils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index 595183924d..c252506df5 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757 semodule-utils-3.2.tar.gz +sha256 3098ec5e5f04a1dbbf4aa569b63a4570750a9fe0d4da14ce45954aa300a17063 semodule-utils-3.3.tar.gz # Hash for license file -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index 426dbdb7b6..a9388f7ee8 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.2 +SEMODULE_UTILS_VERSION = 3.3 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 7 21:01:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:01:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libedit: bump to version 20210910-3.1 In-Reply-To: <20220107203332.1461209-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:33:32 +0100") References: <20220107203332.1461209-1-fontaine.fabrice@gmail.com> Message-ID: <871r1jl0oq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Refresh patch > https://www.thrysoee.dk/editline > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:02:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:02:12 +0100 Subject: [Buildroot] [PATCH 1/2] package/libnftnl: bump to version 1.2.1 In-Reply-To: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:35:33 +0100") References: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> Message-ID: <87wnjbjm3v.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://www.netfilter.org/projects/libnftnl/files/changes-libnftnl-1.2.1.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:02:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 22:02:52 +0100 Subject: [Buildroot] [PATCH 2/2] package/nftables: bump to version 1.0.1 In-Reply-To: <20220107203534.1461378-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:35:34 +0100") References: <20220107203534.1461378-1-fontaine.fabrice@gmail.com> <20220107203534.1461378-2-fontaine.fabrice@gmail.com> Message-ID: <87sftzjm2r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set --with-cli=readline to avoid a build failure since > https://git.netfilter.org/nftables/commit/?id=b4dded0ca78df2a67245a3db1448a51207577ff1 > https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.1.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 21:02:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 22:02:34 +0100 Subject: [Buildroot] [git commit] package/nftables: bump to version 1.0.1 Message-ID: <20220107205655.2F4F2834C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10b8d6e512de293f60ccda989d593683b6ccc263 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set --with-cli=readline to avoid a build failure since https://git.netfilter.org/nftables/commit/?id=b4dded0ca78df2a67245a3db1448a51207577ff1 https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.1.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nftables/nftables.hash | 2 +- package/nftables/nftables.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index bbf7e5a2b1..53878abba9 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 58bf547daf967a2b88ecb4f425f126006ebde22711db806b25c1d6cf84fe45f4 nftables-1.0.0.tar.bz2 +sha256 3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423 nftables-1.0.1.tar.bz2 sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 2409eb0571..d5c16ac2be 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.0 +NFTABLES_VERSION = 1.0.1 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) @@ -21,6 +21,7 @@ NFTABLES_CONF_OPTS += --with-mini-gmp endif ifeq ($(BR2_PACKAGE_READLINE),y) +NFTABLES_CONF_OPTS += --with-cli=readline NFTABLES_DEPENDENCIES += readline NFTABLES_LIBS += -lncurses else From peter at korsgaard.com Fri Jan 7 21:02:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 22:02:06 +0100 Subject: [Buildroot] [git commit] package/libnftnl: bump to version 1.2.1 Message-ID: <20220107205655.2684D834B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a636b55f873bdd00c5aa405f00d887a3a6a0eedd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://www.netfilter.org/projects/libnftnl/files/changes-libnftnl-1.2.1.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libnftnl/libnftnl.hash | 2 +- package/libnftnl/libnftnl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 9737da1878..0a183eedcf 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 90b01fddfe9be8c3245c3ba5ff5a4424a8df708828f92b2b361976b658c074f5 libnftnl-1.2.0.tar.bz2 +sha256 7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c libnftnl-1.2.1.tar.bz2 sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index eff93b895f..616afa6307 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.0 +LIBNFTNL_VERSION = 1.2.1 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPL-2.0+ From peter at korsgaard.com Fri Jan 7 21:01:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 22:01:46 +0100 Subject: [Buildroot] [git commit] package/libedit: bump to version 20210910-3.1 Message-ID: <20220107205655.1E77082B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc1b52c53ec23ea10f5893914fb17339694b3c26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Refresh patch https://www.thrysoee.dk/editline Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libedit/0001-check-bsd-functions-in-libbsd.patch | 4 ++-- package/libedit/libedit.hash | 2 +- package/libedit/libedit.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libedit/0001-check-bsd-functions-in-libbsd.patch b/package/libedit/0001-check-bsd-functions-in-libbsd.patch index 7438340d48..0af9472f17 100644 --- a/package/libedit/0001-check-bsd-functions-in-libbsd.patch +++ b/package/libedit/0001-check-bsd-functions-in-libbsd.patch @@ -1,7 +1,7 @@ configure: on Linux, the BSD functions require linking against libbsd Signed-off-by: "Fabrice Fontaine" -(Rebased against 20170329-3.1) +(Rebased against 20210910-3.1) Signed-off-by: "Yann E. MORIN" (Rebased against 20150325-3.1) Signed-off-by: Bernd Kuhls @@ -17,6 +17,6 @@ diff -durN libedit-20130712-3.1.orig/configure.ac libedit-20130712-3.1/configure +# Search for libbsd for *vis functions +AC_CHECK_LIB([bsd], [vis]) + - AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat getline vis strvis strunvis __secure_getenv secure_getenv]) + AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat vis strvis strunvis __secure_getenv secure_getenv]) # strlcpy diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index d405e47b42..6d139730e8 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071 libedit-20191231-3.1.tar.gz +sha256 6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5 libedit-20210910-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index cb18b97f6d..595a59f702 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20191231-3.1 +LIBEDIT_VERSION = 20210910-3.1 LIBEDIT_SITE = http://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses From thomas.petazzoni at bootlin.com Fri Jan 7 21:05:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:05:52 +0100 Subject: [Buildroot] [git commit] package/avahi: add option to enable/disable default services Message-ID: <20220107205949.26CA6826D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebce685e1d60b47b8fc5490a5820b79fc3a913ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master By default, Avahi installs service definitions for SSH and SFTP, but those might not be present on all systems. This commit adds an option to control the installation of those Avahi services. Even though that potentially breaks backward compatibility with older configuration, we have chosen to make the option default to disable, which means that now the SSH and SFTP avahi services are no longer installed by default. As there is no way to tell the Avahi package not to install the service files in the first place, we have to manually remove them from the target directory. Signed-off-by: Florian Larysch [Thomas: make the option default to disabled, fix small formatting issues.] Signed-off-by: Thomas Petazzoni --- package/avahi/Config.in | 7 +++++++ package/avahi/avahi.mk | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 5e303d044e..95b01bfe92 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -42,6 +42,13 @@ config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY Enable the libdns_sd (Bonjour) compatibility library support for legacy applications. +config BR2_PACKAGE_AVAHI_DEFAULT_SERVICES + bool "install default service definitions" + depends on BR2_PACKAGE_AVAHI_DAEMON + help + Install the SSH/SFTP service definitions included with the + Avahi daemon by default. + endif comment "avahi needs a toolchain w/ threads" diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 9de6ebc4d2..13e2106014 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -193,4 +193,13 @@ endef AVAHI_POST_INSTALL_STAGING_HOOKS += AVAHI_STAGING_INSTALL_LIBDNSSD_LINK endif +ifeq ($(BR2_PACKAGE_AVAHI_DEFAULT_SERVICES),) +define AVAHI_REMOVE_DEFAULT_SERVICES + $(foreach service,ssh sftp-ssh, \ + $(RM) -f $(TARGET_DIR)/etc/avahi/services/$(service).service + ) +endef +AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_DEFAULT_SERVICES +endif + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Fri Jan 7 21:07:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:07:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/avahi: allow disabling default services In-Reply-To: <20201204174507.8483-1-fl@n621.de> References: <20201204174507.8483-1-fl@n621.de> Message-ID: <20220107220711.2352f527@windsurf> Hello Florian, On Fri, 4 Dec 2020 18:45:08 +0100 Florian Larysch wrote: > By default, Avahi installs service definitions for SSH and SFTP, but > those might not be present on all systems. Add an option for disabling > them. > > As there is no way to tell the Avahi package not to install the service > files in the first place, we have to manually remove them from the > target directory. > > Signed-off-by: Florian Larysch > --- > package/avahi/Config.in | 8 ++++++++ > package/avahi/avahi.mk | 9 +++++++++ > 2 files changed, 17 insertions(+) I have finally applied this patch! With some changes: * I made the option default to disabled, following the discussion that took place * Fixed some formatting issues reported by "make check-package" * Used a make foreach loop instead of a shell for loop * Used $(...) to refer to the make variable instead of ${...} Thanks a lot, and sorry for the long delay! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Fri Jan 7 21:07:26 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 22:07:26 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220106210000.397694-6-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> Message-ID: <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> Hello, Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > From: Patrick Havelange > > In order to be package agnostic, the install phase is now using cargo > instead of install. TARGET_CONFIGURE_OPTS is now also set when running > cargo in order to support cross compiling C code within cargo. > > This commit also adds support/download/cargo-post-process to perform > the vendoring on Cargo packages. > > The _LICENSE variable of cargo packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Patrick Havelange > [Thomas: add support for host-cargo-package and vendoring] > Signed-off-by: Thomas Petazzoni > --- > package/Makefile.in | 1 + > package/pkg-cargo.mk | 153 ++++++++++++++++++++++++++++ > support/download/cargo-post-process | 38 +++++++ > 3 files changed, 192 insertions(+) > create mode 100644 package/pkg-cargo.mk > create mode 100755 support/download/cargo-post-process > > diff --git a/package/Makefile.in b/package/Makefile.in > index dae7a859fd..0ca2a5844e 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -441,3 +441,4 @@ include package/pkg-waf.mk > include package/pkg-golang.mk > include package/pkg-meson.mk > include package/pkg-qmake.mk > +include package/pkg-cargo.mk > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > new file mode 100644 > index 0000000000..bf1436a86b > --- /dev/null > +++ b/package/pkg-cargo.mk > @@ -0,0 +1,153 @@ > +################################################################################ > +# Cargo package infrastructure > +# > +# This file implements an infrastructure that eases development of package > +# .mk files for Cargo packages. It should be used for all packages that use > +# Cargo as their build system. > +# > +# See the Buildroot documentation for details on the usage of this > +# infrastructure > +# > +# In terms of implementation, this Cargo infrastructure requires the .mk file > +# to only specify metadata information about the package: name, version, > +# download URL, etc. > +# > +# We still allow the package .mk file to override what the different steps > +# are doing, if needed. For example, if _BUILD_CMDS is already defined, > +# it is used as the list of commands to perform to build the package, > +# instead of the default Cargo behaviour. The package can also define some > +# post operation hooks. > +# > +################################################################################ > + > +################################################################################ > +# inner-cargo-package -- defines how the configuration, compilation and > +# installation of a cargo package should be done, implements a few hooks > +# to tune the build process for cargo specifities and calls the generic > +# package infrastructure to generate the necessary make targets > +# > +# argument 1 is the lowercase package name > +# argument 2 is the uppercase package name, including a HOST_ prefix > +# for host packages > +# argument 3 is the uppercase package name, without the HOST_ prefix > +# for host packages > +# argument 4 is the type (target or host) > +################################################################################ > + > +define inner-cargo-package > + > +# We need host-rustc to run cargo > +$(2)_DOWNLOAD_DEPENDENCIES += host-rustc > + > +$(2)_CARGO_ENV += \ > + CARGO_HOME=$$(HOST_DIR)/share/cargo \ > + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > + CARGO_TARGET_APPLIES_TO_HOST="false" > + > +$(2)_DOWNLOAD_POST_PROCESS = cargo > +$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo > + > +# Due to vendoring, it is pretty likely that not all licenses are > +# listed in _LICENSE. > +$(2)_LICENSE += , vendored dependencies licenses probably not listed > + > +# Note: in all the steps below, we "cd" into the build directory to > +# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the > +# manifest-path. Indeed while the latter seems to work, it in fact > +# breaks in subtle ways as the way cargo searches for its > +# configuration file is based (among other rules) on the current > +# directory. This means that if cargo is started outside of a package > +# directory, its configuration file will not be taken into account. > +# > +# Also, we pass: > +# * --offline to prevent cargo from downloading anything: all > +# dependencies should have been built by the download post > +# process logic > +# * --locked to force cargo to use the Cargo.lock file, which ensures > +# that a fixed set of dependency versions is used > + > +# > +# Build step. Only define it if not already defined by the package .mk > +# file. > +# > +ifndef $(2)_BUILD_CMDS > +ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) \ > + $$(TARGET_CONFIGURE_OPTS) \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --target $$(RUSTC_TARGET_NAME) \ > + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ > + --manifest-path Cargo.toml \ > + --locked \ > + -Z target-applies-to-host \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +else # ifeq ($(4),target) > +define $(2)_BUILD_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo build \ > + --offline \ > + --release \ > + --manifest-path Cargo.toml \ > + --locked \ > + $$($(2)_CARGO_BUILD_OPTS) > +endef > +endif # ifeq ($(4),target) > +endif # ifndef $(2)_BUILD_CMDS > + is _INSTALL_STAGING_CMDS is missing here ? Rust package may wand to install *.rlib files [1] (similar to .a) > +# > +# Target installation step. Only define it if not already defined by > +# the package .mk file. > +# > +ifndef $(2)_INSTALL_TARGET_CMDS > +define $(2)_INSTALL_TARGET_CMDS > + cd $$(@D) && \ > + $$(TARGET_MAKE_ENV) $$($(2)_CARGO_ENV) \ > + cargo install \ cargo install seems overingeneered and produce unwanted rebuild when packages are using cargo features [2]. meta-rust doesn't use cago install at all but use an cargo_do_install() function that use manual install commandes [3]. [1] https://doc.rust-lang.org/reference/linkage.html [2] https://github.com/rust-lang/cargo/issues/8703 [3] https://github.com/meta-rust/meta-rust/blob/master/classes/cargo.bbclass#L55 > + --target $$(RUSTC_TARGET_NAME) \ > + --offline \ > + --root $$(TARGET_DIR)/usr/ \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +ifndef $(2)_INSTALL_CMDS > +define $(2)_INSTALL_CMDS > + cd $$(@D) && \ > + $$(HOST_MAKE_ENV) \ > + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ > + $$($(2)_CARGO_ENV) \ > + cargo install \ > + --offline \ > + --root $$(HOST_DIR) \ > + --bins \ > + --path ./ \ > + --force \ > + --locked \ > + $$($(2)_CARGO_INSTALL_OPTS) > +endef > +endif > + > +# Call the generic package infrastructure to generate the necessary > +# make targets > +$(call inner-generic-package,$(1),$(2),$(3),$(4)) > + > +endef > + From thomas.petazzoni at bootlin.com Fri Jan 7 21:08:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:08:05 +0100 Subject: [Buildroot] [git commit] package/qpdf: needs atomic Message-ID: <20220107210201.222E38349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abb9e8dae230dcd1024aacf53a41eed0efb06187 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master qpdf needs atomic since bump to version 10.5.0 in commit b5352c2177011ca389cbb7c68e78447549cbdaaa and https://github.com/qpdf/qpdf/commit/c5c1a028cdd3cf345046c46963fb0fdacfb2c33c: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-2/output-1/build/qpdf-10.5.0/libqpdf/build/.libs/libqpdf.a(QPDF.o): in function `QPDF::QPDF()': QPDF.cc:(.text+0x48de): undefined reference to `__atomic_fetch_add_8' Fixes: - http://autobuild.buildroot.org/results/7e18689670dcbe491c35f0597e5c3c787936263f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cups-filters/Config.in | 2 ++ package/qpdf/Config.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in index 32381e6c1f..ded99a4774 100644 --- a/package/cups-filters/Config.in +++ b/package/cups-filters/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qpdf + depends on BR2_TOOLCHAIN_HAS_ATOMIC # qpdf select BR2_PACKAGE_JPEG select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE @@ -33,6 +34,7 @@ config BR2_PACKAGE_CUPS_FILTERS comment "cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 5" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/qpdf/Config.in b/package/qpdf/Config.in index 047c4c8a75..accf2b5f34 100644 --- a/package/qpdf/Config.in +++ b/package/qpdf/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QPDF bool "qpdf" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_ZLIB select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL @@ -16,5 +17,6 @@ config BR2_PACKAGE_QPDF http://qpdf.sourceforge.net/ comment "qpdf needs a toolchain w/ C++, gcc >= 5" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From thomas.petazzoni at bootlin.com Fri Jan 7 21:08:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:08:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/qpdf: needs atomic In-Reply-To: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> References: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> Message-ID: <20220107220857.63b9a0da@windsurf> On Tue, 4 Jan 2022 22:07:27 +0100 Fabrice Fontaine wrote: > qpdf needs atomic since bump to version 10.5.0 in commit > b5352c2177011ca389cbb7c68e78447549cbdaaa and > https://github.com/qpdf/qpdf/commit/c5c1a028cdd3cf345046c46963fb0fdacfb2c33c: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-2/output-1/build/qpdf-10.5.0/libqpdf/build/.libs/libqpdf.a(QPDF.o): in function `QPDF::QPDF()': > QPDF.cc:(.text+0x48de): undefined reference to `__atomic_fetch_add_8' > > Fixes: > - http://autobuild.buildroot.org/results/7e18689670dcbe491c35f0597e5c3c787936263f > > Signed-off-by: Fabrice Fontaine > --- > package/cups-filters/Config.in | 2 ++ > package/qpdf/Config.in | 2 ++ > 2 files changed, 4 insertions(+) Applied to master, thanks. However, could you do a test build on sparcv8 ? Indeed normally when something needs atomic, it also needs to link with libatomic when available, as some architectures (such as sparcv8) have all atomic built-ins implemented in libatomic. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 21:09:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:09:11 +0100 Subject: [Buildroot] [git commit] package/rtorrent: disable execinfo Message-ID: <20220107210306.6FED48349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7fcfb71d7a2256a34554866e2b456a710b8ad0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable execinfo to avoid the following build failure raised since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: main.o: in function `do_panic(int)': /home/giuliobenetti/autobuild/run/instance-0/output-1/build/rtorrent-0.9.8/src/main.cc:606: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/10fc9016013931c58238240216c5950b23b56b30 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ded--disable-execinfo-option-to-configure.patch | 34 ++++++++++++++++++++++ package/rtorrent/rtorrent.mk | 3 ++ 2 files changed, 37 insertions(+) diff --git a/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch b/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch new file mode 100644 index 0000000000..4ff4182b61 --- /dev/null +++ b/package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch @@ -0,0 +1,34 @@ +From 582e4e40256b43d3e5322168f1e1ed71ca70ab64 Mon Sep 17 00:00:00 2001 +From: rakshasa +Date: Wed, 16 Jun 2021 23:29:01 +0900 +Subject: [PATCH] Added '--disable-execinfo' option to configure. + +[Retrieved (and backported) from: +https://github.com/rakshasa/rtorrent/commit/582e4e40256b43d3e5322168f1e1ed71ca70ab64] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e3e7d3f1..0f45bc6a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,15 @@ TORRENT_WITHOUT_VARIABLE_FDSET + + AC_SYS_LARGEFILE + +-TORRENT_CHECK_EXECINFO ++AC_ARG_ENABLE(execinfo, ++ AC_HELP_STRING([--disable-execinfo], [disable libexecinfo [[default=enable]]]), ++ [ ++ if test "$enableval" = "yes"; then ++ TORRENT_CHECK_EXECINFO ++ fi ++ ],[ ++ TORRENT_CHECK_EXECINFO ++ ]) + + TORRENT_ENABLE_ARCH + TORRENT_WITH_SYSROOT + diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk index bc3afe8064..210b1d34dc 100644 --- a/package/rtorrent/rtorrent.mk +++ b/package/rtorrent/rtorrent.mk @@ -9,5 +9,8 @@ RTORRENT_SITE = http://rtorrent.net/downloads RTORRENT_DEPENDENCIES = host-pkgconf libcurl libtorrent ncurses RTORRENT_LICENSE = GPL-2.0 RTORRENT_LICENSE_FILES = COPYING +# We're patching configure.ac +RTORRENT_AUTORECONF = YES +RTORRENT_CONF_OPTS = --disable-execinfo $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Fri Jan 7 21:09:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:09:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtorrent: disable execinfo In-Reply-To: <20220105180645.388855-1-fontaine.fabrice@gmail.com> References: <20220105180645.388855-1-fontaine.fabrice@gmail.com> Message-ID: <20220107220919.74e9ab74@windsurf> On Wed, 5 Jan 2022 19:06:45 +0100 Fabrice Fontaine wrote: > Disable execinfo to avoid the following build failure raised since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: main.o: in function `do_panic(int)': > /home/giuliobenetti/autobuild/run/instance-0/output-1/build/rtorrent-0.9.8/src/main.cc:606: undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/10fc9016013931c58238240216c5950b23b56b30 > > Signed-off-by: Fabrice Fontaine > --- > ...disable-execinfo-option-to-configure.patch | 34 +++++++++++++++++++ > package/rtorrent/rtorrent.mk | 3 ++ > 2 files changed, 37 insertions(+) > create mode 100644 package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 21:09:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:09:47 +0100 Subject: [Buildroot] [git commit] package/xxhash: fix uclibc build Message-ID: <20220107210342.736A9834B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e518c47dd6a16d0dee66b208d365728453cc655 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following uclibc build failure raised since bump to version 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: xxhash.o: in function `XXH3_hashLong_128b_internal.constprop.0': (.text+0xcbc): undefined reference to `static_assert' Fixes: - http://autobuild.buildroot.org/results/559/5595b21a711b482b84e582fc9f56e5468c9eb6d6/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch new file mode 100644 index 0000000000..3b65ae1d6c --- /dev/null +++ b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch @@ -0,0 +1,29 @@ +From 6189ecd3d44a693460f86280ccf49d33cb4b18e1 Mon Sep 17 00:00:00 2001 +From: Yann Collet +Date: Sun, 26 Dec 2021 15:15:26 -0800 +Subject: [PATCH] do no longer depend on `` for XXH_STATIC_ASSERT + +since some versions are buggy. + +Use `_Static_assert` instead, which is part of the C11 language. +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1] +Signed-off-by: Fabrice Fontaine +--- + xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/xxhash.h b/xxhash.h +index 311a69c7..5dfd5c45 100644 +--- a/xxhash.h ++++ b/xxhash.h +@@ -1749,8 +1749,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else From thomas.petazzoni at bootlin.com Fri Jan 7 21:09:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:09:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/xxhash: fix uclibc build In-Reply-To: <20220105180751.388943-1-fontaine.fabrice@gmail.com> References: <20220105180751.388943-1-fontaine.fabrice@gmail.com> Message-ID: <20220107220958.246f3c5f@windsurf> On Wed, 5 Jan 2022 19:07:51 +0100 Fabrice Fontaine wrote: > Fix the following uclibc build failure raised since bump to version > 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: xxhash.o: in function `XXH3_hashLong_128b_internal.constprop.0': > (.text+0xcbc): undefined reference to `static_assert' > > Fixes: > - http://autobuild.buildroot.org/results/559/5595b21a711b482b84e582fc9f56e5468c9eb6d6/build-end.log > > Signed-off-by: Fabrice Fontaine > --- > ...nd-on-assert-h-for-XXH_STATIC_ASSERT.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 7 21:16:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:16:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/qpdf: needs atomic In-Reply-To: <20220107220857.63b9a0da@windsurf> References: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> <20220107220857.63b9a0da@windsurf> Message-ID: Le ven. 7 janv. 2022 ? 22:08, Thomas Petazzoni a ?crit : > > On Tue, 4 Jan 2022 22:07:27 +0100 > Fabrice Fontaine wrote: > > > qpdf needs atomic since bump to version 10.5.0 in commit > > b5352c2177011ca389cbb7c68e78447549cbdaaa and > > https://github.com/qpdf/qpdf/commit/c5c1a028cdd3cf345046c46963fb0fdacfb2c33c: > > > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: /home/buildroot/autobuild/instance-2/output-1/build/qpdf-10.5.0/libqpdf/build/.libs/libqpdf.a(QPDF.o): in function `QPDF::QPDF()': > > QPDF.cc:(.text+0x48de): undefined reference to `__atomic_fetch_add_8' > > > > Fixes: > > - http://autobuild.buildroot.org/results/7e18689670dcbe491c35f0597e5c3c787936263f > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/cups-filters/Config.in | 2 ++ > > package/qpdf/Config.in | 2 ++ > > 2 files changed, 4 insertions(+) > > Applied to master, thanks. However, could you do a test build on > sparcv8 ? Indeed normally when something needs atomic, it also needs to > link with libatomic when available, as some architectures (such as > sparcv8) have all atomic built-ins implemented in libatomic. qpdf handles linking with atomic since version 10.0.2 and https://github.com/qpdf/qpdf/commit/66198f447f45a87718b6457756976baa8defb2fd > > Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice From arnout at mind.be Fri Jan 7 21:26:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Fri, 7 Jan 2022 22:26:08 +0100 Subject: [Buildroot] [git commit] package/python-pybind: switch to cmake package Message-ID: <20220107212044.5F31F8349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a19b822239c36cb40a632899bb5c3e848a5fc81e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pybind11 is not really a Python module; it is actually a set of headers that is used to wrap Python objects in C++. Since pybind version 2.6.1, it uses CMake internally. This causes a number of build issues for Buildroot because either no cmake is present or it is too old. pybind in fact has three parts: the C++ headers, a python module pybind11, and the tests. The python package's only purpose is to serve as a configure script for users of pybind. CMake is mainly used to build and run the tests, which use the (mock-installed) pybind11 module to find the (mock-installed) C++ headers. CMake is also used to install the headers. The setup.py script calls into CMake to install the headers and CMake support files to a temporary directory, then copies that together with the pybind11 module into the Python directory. The pybind11 module then returns the include and cmake paths relative to its install location (using __file__ to determine the install location). This is not at all compatible with how Buildroot expects things to be organised. - The include and CMake files are installed somewhere within the Python directories, where nobody will find them. - The Python module is installed for the target, but at build time Python modules are read from the host directory only. Therefore, a user of pybind can't actually load the module. To solve this, several options are possible: - Treat pybind as a host package. This causes users of pybind to build with an include path pointing into the host directory. This happens to work because pybind is a header-only library and because it is installed in a specific location which is not contaminated by other headers. However, it is philosophically wrong - a build for the target should never have an include path pointing to the host directory. - Install pybind in the usual way into staging, and add a stub module to the host directory that returns paths to the staging directory. This leaves a useless pybind11 module in the staging directory, and puts the headers and cmake files in an unusual location. In addition it is not so simple - we need to jump through hoops to make sure that cmake is called correctly when it goes through python-package. - Install the headers and cmake files using CMake, and add a (stub) python module in the host directory that points users to the staging directory. This puts the headers in the usual place (STAGING_DIR/usr/include) and still makes it possible to find them from a python package at build time. We choose the latter solution. First of all, convert to cmake-package. This installs just the headers and the cmake support files. We need to pass PYBIND11_NOPYTHON=ON because there is a cmake module that tries to find the python binary. It sometimes finds the system python, sometimes the host python. In either case, it checks whether this python's bitness and endianness correspond to that of the compiler - which generally it doesn't in cross-compilation. PYBIND_NOPYTHON bypasses this check. Install in staging and not in target. Before, it was installed to target but the python module would point to the target directory so it worked anyway; now, however, we can properly use the staging directory. Since it is no longer a python-package, the python module is not installed automatically. Install them manually in a post-staging-install hook. Since the python module is supposed to be used at build time, install it in the host directory rather than in staging. The python module normally looks in its current directory to find the include and cmake paths, but for cross-compilation this is wrong. Add a non-upstreamable patch that checks for STAGING_DIR in the environment. If it is set (which is the case in Buildroot), use that instead of the current directory. Add an explicit dependency on python3. The headers include Python.h, so any user of pybind needs to implicitly depend on python3. While we're at it, change it to support python3 only - even though pybind currently still supports python2, adding support for it in Buildroot is a little bit complicated and python2 will be removed soon anyway. Cc: Esben Haabendal Cc: Andreas Naumann Co-Developed-by: Jagan Teki Co-Developed-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-pybind11-commands.py-support-STAGING_DIR.patch | 36 ++++++++++++++++++++++ package/python-pybind/Config.in | 1 + package/python-pybind/python-pybind.mk | 19 ++++++++++-- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch new file mode 100644 index 0000000000..981a387be4 --- /dev/null +++ b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch @@ -0,0 +1,36 @@ +From 9feaba4792c1d0a28e560ae941fa9ebabbbe4013 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Fri, 7 Jan 2022 19:32:18 +0100 +Subject: [PATCH] pybind11/commands.py: support STAGING_DIR + +In Buildroot, we install build-time python scripts in the host directory +(otherwise they can't be run with host python), but when running +pybind11 --includes it should return the staging directory. + +Patch commands.py to use the STAGING_DIR environment variable instead of +the current directory, if it is set. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +Upstream-Status: N/A, Buildroot specific +--- + pybind11/commands.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pybind11/commands.py b/pybind11/commands.py +index 34dbaf8..8c4876d 100644 +--- a/pybind11/commands.py ++++ b/pybind11/commands.py +@@ -1,8 +1,8 @@ + # -*- coding: utf-8 -*- + import os + +- +-DIR = os.path.abspath(os.path.dirname(__file__)) ++DIR = os.environ.get('STAGING_DIR') or \ ++ os.path.abspath(os.path.dirname(__file__)) + + + def get_include(user=False): +-- +2.31.1 + diff --git a/package/python-pybind/Config.in b/package/python-pybind/Config.in index 604cb9ee67..27bc196e32 100644 --- a/package/python-pybind/Config.in +++ b/package/python-pybind/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYBIND bool "python-pybind" + depends on BR2_PACKAGE_PYTHON3 help PyBind is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index a6a1bdb976..4dd52003ad 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -8,6 +8,21 @@ PYTHON_PYBIND_VERSION = 2.6.1 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE -PYTHON_PYBIND_SETUP_TYPE = setuptools +PYTHON_PYBIND_INSTALL_STAGING = YES +PYTHON_PYBIND_INSTALL_TARGET = NO # Header-only library +PYTHON_PYBIND_DEPENDENCIES = python3 -$(eval $(python-package)) +PYTHON_PYBIND_CONF_OPTS = \ + -DPYBIND11_INSTALL=ON \ + -DPYBIND11_TEST=OFF \ + -DPYBIND11_NOPYTHON=ON + +PYTHON_PYBIND_INSTALL_PATH = $(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pybind11 + +define PYTHON_PYBIND_INSTALL_MODULE + mkdir -p $(PYTHON_PYBIND_INSTALL_PATH) + cp -dpf $(@D)/pybind11/*.py $(PYTHON_PYBIND_INSTALL_PATH) +endef +PYTHON_PYBIND_POST_INSTALL_STAGING_HOOKS += PYTHON_PYBIND_INSTALL_MODULE + +$(eval $(cmake-package)) From arnout at mind.be Fri Jan 7 21:26:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Fri, 7 Jan 2022 22:26:08 +0100 Subject: [Buildroot] [git commit] support/testing: add test for python-pybind Message-ID: <20220107212044.68E388177F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87f2b7004e6d40454d4b07bbe9b0058342c7767f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The way that python-pybind can be used is fairly complicated, so a runtime test for it is convenient. In addition, this test validates that the headers actually work at runtime. Signed-off-by: Guillaume W. Bres [Arnout: - Retain python3 only. - python-pybind is a target package, not host. - Select python-pybind instead of depend. - Simplify python-pybind-example package. - Check in python-pybind-example build if pybind11.get_include() produces output. - Don't use python3 -m pybind11 --includes: it includes the main python includes, which are for the host, not for the target. - Use TestPythonPackageBase instead of open-coding something imported with host python. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 ++ .../package/br2-external/python-pybind/Config.in | 1 + .../br2-external/python-pybind/external.desc | 1 + .../package/br2-external/python-pybind/external.mk | 1 + .../package/python-pybind-example/Config.in | 6 ++++ .../package/python-pybind-example/example.cpp | 16 +++++++++ .../python-pybind-example/python-pybind-example.mk | 41 ++++++++++++++++++++++ .../testing/tests/package/sample_python_pybind.py | 4 +++ .../testing/tests/package/test_python_pybind.py | 15 ++++++++ 9 files changed, 88 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d049b99b91..7874677f7e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1124,6 +1124,9 @@ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ F: package/reaver/ +F: support/testing/tests/package/br2-external/python-pybind +F: support/testing/tests/package/sample_python_pybind.py +F: support/testing/tests/package/test_python_pybind.py N: Guo Ren F: arch/Config.in.csky diff --git a/support/testing/tests/package/br2-external/python-pybind/Config.in b/support/testing/tests/package/br2-external/python-pybind/Config.in new file mode 100644 index 0000000000..70c77157b3 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in" diff --git a/support/testing/tests/package/br2-external/python-pybind/external.desc b/support/testing/tests/package/br2-external/python-pybind/external.desc new file mode 100644 index 0000000000..eef5e0f5a0 --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/external.desc @@ -0,0 +1 @@ +name: PYTHON_PYBIND diff --git a/support/testing/tests/package/br2-external/python-pybind/external.mk b/support/testing/tests/package/br2-external/python-pybind/external.mk new file mode 100644 index 0000000000..3501f3135e --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in new file mode 100644 index 0000000000..1b4d1e0d2c --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE + bool "python-pybind-example" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYBIND + help + This test creates a cpp macro later used on target in python diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp new file mode 100644 index 0000000000..f2eea8e48d --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp @@ -0,0 +1,16 @@ +#include +namespace py = pybind11; + +int add (int i, int j) { + return i + j; +} + +PYBIND11_MODULE (example, m) { + // optional module description + m.doc() = "pybind11 example plugin"; + // test a module method + m.def("add", &add, "example::add adds two integer numbers"); + // test a module attribute + py::object hello = py::cast("Hello World"); + m.attr("says") = hello; +} diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk new file mode 100644 index 0000000000..a6d7e0daaf --- /dev/null +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# python-pybind-example +# +################################################################################ + +# this builds a C++ macro "add(a,b)" +# that we expose to host-python with a custom install +# and that the python test script will later use +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = python-pybind + +PYTHON_PYBIND_EXAMPLE_PYBIND_INCLUDE = \ + $(shell $(HOST_DIR)/usr/bin/python3 -c 'import pybind11; print(pybind11.get_include())') + +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = \ + $(TARGET_CXXFLAGS) \ + -Wall -shared -std=c++11 -fPIC \ + -I$(PYTHON_PYBIND_EXAMPLE_PYBIND_INCLUDE) \ + $(shell $(STAGING_DIR)/usr/bin/python3-config --includes --libs --ldflags) + +# .so to be installed must have exact suffix +# otherwise import() in python will not work +HOST_LIB_BINARY_SUFFIX = \ + $(shell $(STAGING_DIR)/usr/bin/python3-config --extension-suffix) + +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS + if [ -z "$(PYTHON_PYBIND_EXAMPLE_PYBIND_INCLUDE)" ]; then \ + echo "pybind11.get_include() returned empty"; \ + exit 1; \ + fi + $(TARGET_CXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \ + $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp \ + -o $(@D)/example$(HOST_LIB_BINARY_SUFFIX) +endef + +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \ + $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/example$(HOST_LIB_BINARY_SUFFIX) +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py new file mode 100644 index 0000000000..605c0bab15 --- /dev/null +++ b/support/testing/tests/package/sample_python_pybind.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import example +print(example.add(1, 2)) +print(example.says) diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py new file mode 100644 index 0000000000..5e3c3b9cc5 --- /dev/null +++ b/support/testing/tests/package/test_python_pybind.py @@ -0,0 +1,15 @@ +import os +import infra +import subprocess +from tests.package.test_python import TestPythonPackageBase + +class TestPythonPybind (TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y + """ + sample_scripts = ["tests/package/sample_python_pybind.py"] + # ship examples macro & installs it to host + br2_external = [infra.filepath("tests/package/br2-external/python-pybind")] From yann.morin.1998 at free.fr Fri Jan 7 21:31:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 7 Jan 2022 22:31:10 +0100 Subject: [Buildroot] [PATCH v1 00/30] Add Chromium Embedded Framework library In-Reply-To: <20191205171517.96639-1-michael.drake@codethink.co.uk> References: <20191205171517.96639-1-michael.drake@codethink.co.uk> Message-ID: <20220107213110.GA1881783@scaer> Michael, Thomas, All, On 2019-12-05 17:14 +0000, Michael Drake spake thusly: > This patch series adds the Chromium Embedded Framework library to > Buildroot. We've discussed this series with the other maintainers today, and all we can say is that we are very sorry that we could not address it earlier. You are more than aware that this is a huge series, with a lot of complicated packages. I did not have the guts to delve into it initially, and as more time passed, I dreaded even more going back and look at it. The other maintainers also felt similarly... On the other hand, except for Romain who dared two comments, no one else ever replied or even pushed forward on that series; no one ever even sent a reply stating it was tested and worked for them.. It would have been nice to have chromium in the tree, I agree, but this is so big a stack that it is very hard to grasp and understand all that is going on in there... As a consequence, we have marked this series as rejected in patchwork... Thank you for contribution. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd.kuhls at t-online.de Fri Jan 7 21:32:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 7 Jan 2022 22:32:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-vdr-vnsi: bump version to 19.0.2-Matrix Message-ID: <20220107213253.75709-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index c6223fc8e4..4cd1f7ad6b 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz +sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index b281f00f19..65e69d2b23 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md -- 2.30.2 From ju.o at free.fr Fri Jan 7 21:35:01 2022 From: ju.o at free.fr (Julien Olivain) Date: Fri, 07 Jan 2022 22:35:01 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <20220105142924.4b11ed83@windsurf> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> Message-ID: Hi Thomas, Thierry, I would like to share some info about ROS in Buildroot. On 05/01/2022 14:29, Thomas Petazzoni wrote: > Hello Thierry, > > On Wed, 5 Jan 2022 10:46:46 +0100 > Thierry Bultel wrote: > >> For a number of companies, I can see a growing interest in having ros2 >> support in buildroot. >> Currently, people wanting to prototype (or make a product) a robotics >> applications, are stuck >> to either yocto, or, worse, to a desktop-like distribution. [...] >> What are your thought about these both packages ? Any ideas, or links >> to >> some WIP stuff ? > > These packages would certainly be very welcome. ROS2 especially makes a > lot of sense. > > Some prior work: > > https://github.com/mchalain/br_ros > http://lists.busybox.net/pipermail/buildroot/2019-March/246497.html > > I'll be happy to help in the review of such packages. In the context of the HoverGames https://www.hovergames.com/ drone challenge, I used ROS1 Noetic (last version for ROS1 series) with Buildroot on various boards (EMCraft NavQ, Technexion pico-pi, QEmu aarch64 and RV64). My actual need was the minimal dependencies to run "mavros" (at that time, mavros was not available for ROS2). I published my code here, for information: https://github.com/jolivain/buildroot/commits/navq See the demo defconfigs: https://github.com/jolivain/buildroot/commit/a50de54e721910a00ebe7192e37661cc0ad81b37 ROS1 can be tested in qemu Aarch64 virt with: make ros_defconfig make ./output/images/start-qemu.sh Login as root, then run a ros tutorial: roslaunch roscpp_tutorials talker_listener.launch or launch mavros: roslaunch mavros px4.launch fcu_url:=tcp-l://localhost While doing that, I did minor upstreaming work to let ROS play nicer with Buildroot, for example: https://github.com/ros-infrastructure/rospkg/commit/5ab4408e65f01bbb48971f6264f6c890b89cefa9 and few other buildroot fixes or updates. Prior that work, I was aware of a previous integration, like this one: https://github.com/flatmax/buildroot.rk3399.external/tree/master/package/rockchip/ros It was a bit outdated for what I wanted to do. I took some examples from it. While my Buildroot patches were sufficient to fulfill my needs, I don't think they were good enough to be upstreamed. Moreover, ROS1 Noetic is the last LTS version which will be EOL in 2025. See: https://wiki.ros.org/Distributions#List_of_Distributions This is why I didn't submitted my patches to Buildroot. For the next 2022 edition of the HoverGames challenge, I would like to switch to ROS2 in Buildroot. I'm currently exploring ways to regenerate ROS2 buildroot recipes automatically, using the ROS infrastructure packages. I believe this is the way the Gentoo and Yocto/OpenEmbedded recipes are currently generated. See: https://github.com/ros-infrastructure/superflore https://github.com/ros-infrastructure/superflore/tree/master/superflore/generators My current idea would be to: - Add in Buildroot the minimum changes, if needed (minimal infra things like pkg-catkin, other non-ROS package dependencies) - Propose a "buildroot" generator in superflore upstream that create an maintain some of the ROS2 recipes. Comments, ideas and suggestions are welcome! Do not hesitate to contact me to discuss that topic. Best regards, Julien. From thomas.petazzoni at bootlin.com Fri Jan 7 21:36:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:36:24 +0100 Subject: [Buildroot] [PATCH 1/3] package/refpolicy: Add patches pending the next release In-Reply-To: <20210107135307.1762186-2-maxime.chevallier@bootlin.com> References: <20210107135307.1762186-1-maxime.chevallier@bootlin.com> <20210107135307.1762186-2-maxime.chevallier@bootlin.com> Message-ID: <20220107223624.3ba7d348@windsurf> Hello Maxime, On Thu, 7 Jan 2021 14:53:05 +0100 Maxime Chevallier wrote: > In order to be able to run a basic system in enforcing mode, we need to > apply a few patches on top of RELEASE_2_20200818. > > This allows us to fix a few pending issues, most notably with systemd v246. > > Patch 0001 is a squash of a few patches written by Antoine Tenart that > are already in the refpolicy master branch. > > Patches 2, 3 and 4 are also in the master branch, and are needed by > subsequen patches so that systemd-tmpfiles and agetty can make use of > nsswitch. > > Patches 5 and 6 are part of a pull-request that haven't been merged yet, > that addresses the issues with agetty and systemd-tmpfiles : > https://github.com/SELinuxProject/refpolicy/pull/330 > > Patch 7 fixes the current issue with systemd v246 that is related to > sytemd-udevd now being a symlink to udevadm. > > The fix for that has been submitted on the refpolicy mailing-list, with > the review process ongoing : > https://lore.kernel.org/selinux-refpolicy/2b5b0f1e-2576-23f4-4ab4-26f8fcfb2c30 at ieee.org/T/#t > > Finally, Patch 8 addresses issues for which there's no clear strategy > yet for upstreaming in the refpolicy. So now, all of the patches except patch 8 are in upstream refpolicy, which is good. However, this patch 8 is really not good, it doesn't document anything about why those fixes are needed. I think it would be acceptable to have out of tree refpolicy patches, but they should be just a mixed bag of fixes all in a single patch that just says "Buildroot fixes". We need that patch 8 to be split up into multiple patches, each with a proper explanation of what it is fixing. Perhaps this would also help with the upstreaming. So I'm afraid we can't merge this patch series as it is, just because patch 8 isn't properly explained/detailed. Maxime: do you have that patch 8 broken down into smaller pieces with reasonable explanation about each piece? I really would like to see this being finalized. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Fri Jan 7 21:38:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:38:45 +0100 Subject: [Buildroot] [PATCH v8 4/5] support/testing: add python-pybind11 test In-Reply-To: <20200407111515.21131-5-jagan@amarulasolutions.com> References: <20200407111515.21131-1-jagan@amarulasolutions.com> <20200407111515.21131-5-jagan@amarulasolutions.com> Message-ID: On 07/04/2020 13:15, Jagan Teki wrote: > From: Adam Duskett > > This test is a simple integration test of the python-pybind11 package. > > It consists of the following: > - The python-pybind11-addition-example package compiles a simple cpp file > which adds two given numbers together and returns the results and installs > the compiled file to /root/ > This example is from the following URL: > https://pybind11.readthedocs.io/en/stable/basics.html > > - The python-pybind11-addition-example package installs the > sample_python_pybind11.py file which imports the above-compiled file and adds > 1 and 2 together to /root/ > > - Execute the sample_python_pybind11.py in an emulator with the expected output > of 3 and an exit code of 0. > > Signed-off-by: Adam Duskett > [jagan: rebase, fix trailing whitespace, new line warninings] > Signed-off-by: Jagan Teki I applied a heavily modified version of this to master. Unfortunately, Guillaume had posted a new version of this patch but had taken authorship of it, and I hadn't noticed that Adam was in fact the author. So it has gone in with just Guillaume as author and without credit to Adam or Jagan. Sorry for that. Regards, Arnout > --- > Changes for v8 > - new patch > > .gitlab-ci.yml | 2 + > DEVELOPERS | 2 + > .../br2-external/python-pybind11/Config.in | 1 + > .../python-pybind11/external.desc | 1 + > .../br2-external/python-pybind11/external.mk | 1 + > .../Config.in | 5 ++ > .../pybind11_addition_example.cpp | 9 +++ > .../python-pybind11-addition-example.mk | 39 ++++++++++ > .../sample_python_pybind11.py | 4 + > .../tests/package/test_python_pybind11.py | 76 +++++++++++++++++++ > 10 files changed, 140 insertions(+) > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/Config.in > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/external.desc > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/external.mk > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/Config.in > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/pybind11_addition_example.cpp > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/python-pybind11-addition-example.mk > create mode 100644 support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/sample_python_pybind11.py > create mode 100644 support/testing/tests/package/test_python_pybind11.py > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index d9519c3812..ce524337cb 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -471,6 +471,8 @@ tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test > tests.package.test_python_passlib.TestPythonPy3Passlib: { extends: .runtime_test } > tests.package.test_python_pexpect.TestPythonPy2Pexpect: { extends: .runtime_test } > tests.package.test_python_pexpect.TestPythonPy3Pexpect: { extends: .runtime_test } > +tests.package.test_python_pybind11.TestPythonPy2Pybind11: { extends: .runtime_test } > +tests.package.test_python_pybind11.TestPythonPy3Pybind11: { extends: .runtime_test } > tests.package.test_python_pynacl.TestPythonPy2Pynacl: { extends: .runtime_test } > tests.package.test_python_pynacl.TestPythonPy3Pynacl: { extends: .runtime_test } > tests.package.test_python_pyyaml.TestPythonPy2Pyyaml: { extends: .runtime_test } > diff --git a/DEVELOPERS b/DEVELOPERS > index 308a59b264..f06d54a662 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -85,6 +85,8 @@ F: package/sngrep/ > F: package/spidermonkey/ > F: package/systemd/ > F: support/testing/tests/package/test_python_gobject.py > +F: support/testing/tests/package/br2-external/python-pybind11/ > +F: support/testing/tests/package/test_python_pybind11.py > > N: Adam Heinrich > F: package/jack1/ > diff --git a/support/testing/tests/package/br2-external/python-pybind11/Config.in b/support/testing/tests/package/br2-external/python-pybind11/Config.in > new file mode 100644 > index 0000000000..27b502313b > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/Config.in > @@ -0,0 +1 @@ > +source "$BR2_EXTERNAL_PYTHON_PYBIND11_PATH/package/python-pybind11-addition-example/Config.in" > diff --git a/support/testing/tests/package/br2-external/python-pybind11/external.desc b/support/testing/tests/package/br2-external/python-pybind11/external.desc > new file mode 100644 > index 0000000000..04a636053a > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/external.desc > @@ -0,0 +1 @@ > +name: PYTHON_PYBIND11 > diff --git a/support/testing/tests/package/br2-external/python-pybind11/external.mk b/support/testing/tests/package/br2-external/python-pybind11/external.mk > new file mode 100644 > index 0000000000..db34e5f54d > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/external.mk > @@ -0,0 +1 @@ > +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND11_PATH)/package/*/*.mk)) > diff --git a/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/Config.in b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/Config.in > new file mode 100644 > index 0000000000..7860559a13 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/Config.in > @@ -0,0 +1,5 @@ > +config BR2_PACKAGE_PYTHON_PYBIND11_ADDITION_EXAMPLE > + bool "python-pybind11 addition example" > + depends on BR2_PACKAGE_PYTHON_PYBIND11 > + help > + Simple class for testing python-pybind11 > diff --git a/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/pybind11_addition_example.cpp b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/pybind11_addition_example.cpp > new file mode 100644 > index 0000000000..61b3fce051 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/pybind11_addition_example.cpp > @@ -0,0 +1,9 @@ > +#include > + > +int add(int i, int j) { > + return i + j; > +} > + > +PYBIND11_MODULE(pybind11_addition_example, m) { > + m.def("add", &add, "A function which adds two numbers"); > +} > diff --git a/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/python-pybind11-addition-example.mk b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/python-pybind11-addition-example.mk > new file mode 100644 > index 0000000000..f620424fca > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/python-pybind11-addition-example.mk > @@ -0,0 +1,39 @@ > +################################################################################ > +# > +# python-pybind11_addition_example > +# > +################################################################################ > + > +PYTHON_PYBIND11_ADDITION_EXAMPLE_DEPENDENCIES = python-pybind11 > + > +ifeq ($(BR2_PACKAGE_PYTHON),y) > +PYTHON_PYBIND11_ADDITION_EXAMPLE_INCLUDES=`$(STAGING_DIR)/usr/bin/python2-config --includes` > +PYTHON_PYBIND11_ADDITION_EXAMPLE_SUFFIX=`$(STAGING_DIR)/usr/bin/python2-config --extension-suffix` > +else > +PYTHON_PYBIND11_ADDITION_EXAMPLE_INCLUDES=`$(STAGING_DIR)/usr/bin/python3-config --includes` > +PYTHON_PYBIND11_ADDITION_EXAMPLE_SUFFIX=`$(STAGING_DIR)/usr/bin/python3-config --extension-suffix` > +endif > +PYTHON_PYBIND11_ADDITION_EXAMPLE_OUTPUT=pybind11_addition_example$(PYTHON_PYBIND11_ADDITION_EXAMPLE_SUFFIX) > + > +define PYTHON_PYBIND11_ADDITION_EXAMPLE_BUILD_CMDS > + $(INSTALL) -D $(PYTHON_PYBIND11_ADDITION_EXAMPLE_PKGDIR)/pybind11_addition_example.cpp \ > + $(@D)/pybind11_addition_example.cpp > + > + $(INSTALL) -D $(PYTHON_PYBIND11_ADDITION_EXAMPLE_PKGDIR)/sample_python_pybind11.py \ > + $(@D)/sample_python_pybind11.py > + > + cd $(@D); \ > + $(TARGET_CXX) -std=c++11 -fPIC -shared \ > + $(PYTHON_PYBIND11_ADDITION_EXAMPLE_INCLUDES) pybind11_addition_example.cpp \ > + -o $(PYTHON_PYBIND11_ADDITION_EXAMPLE_OUTPUT) > +endef > + > +define PYTHON_PYBIND11_ADDITION_EXAMPLE_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 755 $(@D)/$(PYTHON_PYBIND11_ADDITION_EXAMPLE_OUTPUT) \ > + $(TARGET_DIR)/root/$(PYTHON_PYBIND11_ADDITION_EXAMPLE_OUTPUT) > + > + $(INSTALL) -D -m 755 $(@D)/sample_python_pybind11.py \ > + $(TARGET_DIR)/root/sample_python_pybind11.py > +endef > + > +$(eval $(generic-package)) > diff --git a/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/sample_python_pybind11.py b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/sample_python_pybind11.py > new file mode 100644 > index 0000000000..29196481e1 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind11/package/python-pybind11-addition-example/sample_python_pybind11.py > @@ -0,0 +1,4 @@ > +#!/usr/bin/env python > +import pybind11_addition_example > + > +print(pybind11_addition_example.add(1, 2)) > diff --git a/support/testing/tests/package/test_python_pybind11.py b/support/testing/tests/package/test_python_pybind11.py > new file mode 100644 > index 0000000000..12bd77807e > --- /dev/null > +++ b/support/testing/tests/package/test_python_pybind11.py > @@ -0,0 +1,76 @@ > +import os > +import infra.basetest > + > +class TestPythonPy2Pybind11(infra.basetest.BRTest): > + br2_external = [infra.filepath("tests/package/br2-external/python-pybind11")] > + config = \ > + """ > + BR2_aarch64=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > + BR2_LINUX_KERNEL=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.86" > + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_GZIP=y > + BR2_PACKAGE_PYTHON=y > + BR2_PACKAGE_PYTHON_PYBIND11=y > + BR2_PACKAGE_PYTHON_PYBIND11_ADDITION_EXAMPLE=y > + """ > + > + def login(self): > + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") > + kern = os.path.join(self.builddir, "images", "Image") > + self.emulator.boot(arch="aarch64", > + kernel=kern, > + kernel_cmdline=["console=ttyAMA0"], > + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) > + self.emulator.login() > + > + def test_run(self): > + self.login() > + cmd = "python sample_python_pybind11.py" > + output, exit_code = self.emulator.run(cmd, 120) > + print(output) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output, ["3"]) > + > +class TestPythonPy3Pybind11(infra.basetest.BRTest): > + br2_external = [infra.filepath("tests/package/br2-external/python-pybind11")] > + config = \ > + """ > + BR2_aarch64=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > + BR2_LINUX_KERNEL=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.86" > + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_GZIP=y > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_PYBIND11=y > + BR2_PACKAGE_PYTHON_PYBIND11_ADDITION_EXAMPLE=y > + """ > + > + def login(self): > + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") > + kern = os.path.join(self.builddir, "images", "Image") > + self.emulator.boot(arch="aarch64", > + kernel=kern, > + kernel_cmdline=["console=ttyAMA0"], > + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) > + self.emulator.login() > + > + def test_run(self): > + self.login() > + cmd = "python3 sample_python_pybind11.py" > + output, exit_code = self.emulator.run(cmd, 120) > + print(output) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output, ["3"]) > From fontaine.fabrice at gmail.com Fri Jan 7 21:37:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:37:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/matchbox-lib: bump to version 1.12 Message-ID: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> Drop second and third patches (already in version) Signed-off-by: Fabrice Fontaine --- package/matchbox-lib/0002-libpng15.patch | 26 ------------------- .../matchbox-lib/0003-include-setjmp-h.patch | 17 ------------ package/matchbox-lib/matchbox-lib.hash | 3 +-- package/matchbox-lib/matchbox-lib.mk | 6 +++-- 4 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 package/matchbox-lib/0002-libpng15.patch delete mode 100644 package/matchbox-lib/0003-include-setjmp-h.patch diff --git a/package/matchbox-lib/0002-libpng15.patch b/package/matchbox-lib/0002-libpng15.patch deleted file mode 100644 index 3d68573b5f..0000000000 --- a/package/matchbox-lib/0002-libpng15.patch +++ /dev/null @@ -1,26 +0,0 @@ -Support for libpng 1.5+ shamelessly taken from Gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/libmb/mbpixbuf.c -+++ b/libmb/mbpixbuf.c -@@ -247,7 +247,7 @@ - return NULL; - } - -- if ( setjmp( png_ptr->jmpbuf ) ) { -+ if ( setjmp( png_jmpbuf(png_ptr) ) ) { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL); - fclose(fd); - return NULL; -@@ -269,8 +269,8 @@ - ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) - png_set_gray_to_rgb(png_ptr); - -- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA -- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA -+ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA -+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA - ) - *has_alpha = 1; - else diff --git a/package/matchbox-lib/0003-include-setjmp-h.patch b/package/matchbox-lib/0003-include-setjmp-h.patch deleted file mode 100644 index 72e1e45d8f..0000000000 --- a/package/matchbox-lib/0003-include-setjmp-h.patch +++ /dev/null @@ -1,17 +0,0 @@ -matchbox-lib: include setjmp.h - -Based on this upstream patch: - - http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d - -Signed-off-by: Vicente Olivert Riera ---- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000 -+++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000 -@@ -22,6 +22,7 @@ - - #include - #include "mbpixbuf.h" -+#include - - #define BYTE_ORD_24_RGB 0 - #define BYTE_ORD_24_RBG 1 diff --git a/package/matchbox-lib/matchbox-lib.hash b/package/matchbox-lib/matchbox-lib.hash index d48fb32043..8144c10258 100644 --- a/package/matchbox-lib/matchbox-lib.hash +++ b/package/matchbox-lib/matchbox-lib.hash @@ -1,4 +1,3 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5 -md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 # Locally computed +sha256 5c7795e46c24d848a2b960f3b994911165d95e5d5731e39105ee0d808d2373eb libmatchbox-1.12.tar.bz2 sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk index 5541867699..00ca4a0d15 100644 --- a/package/matchbox-lib/matchbox-lib.mk +++ b/package/matchbox-lib/matchbox-lib.mk @@ -4,11 +4,13 @@ # ################################################################################ -MATCHBOX_LIB_VERSION = 1.9 +MATCHBOX_LIB_VERSION = 1.12 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2 -MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION) +MATCHBOX_LIB_SITE = http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot MATCHBOX_LIB_LICENSE = LGPL-2.1+ MATCHBOX_LIB_LICENSE_FILES = COPYING +# From git +MATCHBOX_LIB_AUTORECONF = YES MATCHBOX_LIB_INSTALL_STAGING = YES MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 21:37:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:37:41 +0100 Subject: [Buildroot] [PATCH 2/2] package/matchbox-fakekey: bump to version 0.3 In-Reply-To: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> References: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> Message-ID: <20220107213741.1668818-2-fontaine.fabrice@gmail.com> Use src/libfakekey.c as the license file because there is no COPYING in the git tarball Signed-off-by: Fabrice Fontaine --- package/matchbox-fakekey/matchbox-fakekey.hash | 5 ++--- package/matchbox-fakekey/matchbox-fakekey.mk | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/matchbox-fakekey/matchbox-fakekey.hash b/package/matchbox-fakekey/matchbox-fakekey.hash index 516e0b6362..3627b13913 100644 --- a/package/matchbox-fakekey/matchbox-fakekey.hash +++ b/package/matchbox-fakekey/matchbox-fakekey.hash @@ -1,4 +1,3 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2.md5 -md5 83dbde4d77e8baf0176fe4291d8a2303 libfakekey-0.1.tar.bz2 # Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 4e2fdc9bc20df469d53885c40e104122140131e06d4c184902070ec0b0f2ca9f libfakekey-0.3.tar.bz2 +sha256 3271662131760e9b30dd92495a0ea0b598fc457798cc67948947365299dd607d src/libfakekey.c diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk index e607c48c15..99921ef8e7 100644 --- a/package/matchbox-fakekey/matchbox-fakekey.mk +++ b/package/matchbox-fakekey/matchbox-fakekey.mk @@ -4,11 +4,14 @@ # ################################################################################ -MATCHBOX_FAKEKEY_VERSION = 0.1 +MATCHBOX_FAKEKEY_VERSION = 0.3 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2 -MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION) +MATCHBOX_FAKEKEY_SITE = \ + http://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot MATCHBOX_FAKEKEY_LICENSE = GPL-2.0+ -MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING +MATCHBOX_FAKEKEY_LICENSE_FILES = src/libfakekey.c +# From git +MATCHBOX_FAKEKEY_AUTORECONF = YES MATCHBOX_FAKEKEY_INSTALL_STAGING = YES MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat -- 2.34.1 From romain.naour at smile.fr Fri Jan 7 21:46:00 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 22:46:00 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 250.1 Message-ID: <20220107214600.54727-1-romain.naour@smile.fr> Remove upstream patch Fixes a build issue with toolchains using kernel headers < 5.6, when the openat2(2) syscall is not available [2]. Add a new patch to fix homework-mount with linux-headers < 5.2. [1] https://github.com/systemd/systemd-stable/commit/cd88d010e862d26ce816eb3bd6735a80999ac41e [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fddb5d430ad9fa91b49b1d34d0202ffe2fa0e179 Signed-off-by: Romain Naour Cc: Norbert Lange Cc: Yann E. MORIN --- ...define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 ++++++++ ...ll-define-all-MOUNT_ATTR_-if-missing.patch | 84 ------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 4 files changed, 35 insertions(+), 86 deletions(-) create mode 100644 package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch delete mode 100644 package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch new file mode 100644 index 0000000000..0934886acb --- /dev/null +++ b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch @@ -0,0 +1,33 @@ +From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 7 Jan 2022 22:25:23 +0100 +Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing + +MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] +but it's defined in kernel headers since version 5.2. + +[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 + +Signed-off-by: Romain Naour +--- + src/basic/missing_syscall.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h +index 8267b1a90c..793d111c55 100644 +--- a/src/basic/missing_syscall.h ++++ b/src/basic/missing_syscall.h +@@ -569,6 +569,10 @@ static inline int missing_open_tree( + #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ + #endif + ++#ifndef MOVE_MOUNT_T_EMPTY_PATH ++#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ ++#endif ++ + static inline int missing_move_mount( + int from_dfd, + const char *from_pathname, +-- +2.31.1 + diff --git a/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch b/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch deleted file mode 100644 index d0c4f6eaa0..0000000000 --- a/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0764e3a327573e7bda2f0e1a914f28482ab00574 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Fri, 24 Dec 2021 09:15:51 +0900 -Subject: [PATCH] missing-syscall: define all MOUNT_ATTR_* if missing - -Fixes #21876. - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -0764e3a327573e7bda2f0e1a914f28482ab00574] ---- - src/basic/missing_syscall.h | 48 ++++++++++++++++++++++++++++++++----- - 1 file changed, 42 insertions(+), 6 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 3da30e6f0e..0b0cc3cec2 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -462,20 +462,56 @@ struct mount_attr { - struct mount_attr; - #endif - -+#ifndef MOUNT_ATTR_RDONLY -+#define MOUNT_ATTR_RDONLY 0x00000001 /* Mount read-only */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOSUID -+#define MOUNT_ATTR_NOSUID 0x00000002 /* Ignore suid and sgid bits */ -+#endif -+ -+#ifndef MOUNT_ATTR_NODEV -+#define MOUNT_ATTR_NODEV 0x00000004 /* Disallow access to device special files */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOEXEC -+#define MOUNT_ATTR_NOEXEC 0x00000008 /* Disallow program execution */ -+#endif -+ -+#ifndef MOUNT_ATTR__ATIME -+#define MOUNT_ATTR__ATIME 0x00000070 /* Setting on how atime should be updated */ -+#endif -+ -+#ifndef MOUNT_ATTR_RELATIME -+#define MOUNT_ATTR_RELATIME 0x00000000 /* - Update atime relative to mtime/ctime. */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOATIME -+#define MOUNT_ATTR_NOATIME 0x00000010 /* - Do not update access times. */ -+#endif -+ -+#ifndef MOUNT_ATTR_STRICTATIME -+#define MOUNT_ATTR_STRICTATIME 0x00000020 /* - Always perform atime updates */ -+#endif -+ -+#ifndef MOUNT_ATTR_NODIRATIME -+#define MOUNT_ATTR_NODIRATIME 0x00000080 /* Do not update directory access times */ -+#endif -+ - #ifndef MOUNT_ATTR_IDMAP --#define MOUNT_ATTR_IDMAP 0x00100000 -+#define MOUNT_ATTR_IDMAP 0x00100000 /* Idmap mount to @userns_fd in struct mount_attr. */ - #endif - - #ifndef MOUNT_ATTR_NOSYMFOLLOW --#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 -+#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 /* Do not follow symlinks */ - #endif - --#ifndef AT_RECURSIVE --#define AT_RECURSIVE 0x8000 -+#ifndef MOUNT_ATTR_SIZE_VER0 -+#define MOUNT_ATTR_SIZE_VER0 32 /* sizeof first published struct */ - #endif - --#ifndef MOUNT_ATTR_SIZE_VER0 --#define MOUNT_ATTR_SIZE_VER0 32 -+#ifndef AT_RECURSIVE -+#define AT_RECURSIVE 0x8000 - #endif - - static inline int missing_mount_setattr( --- -2.25.1 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index cc33cd4c52..f89b2ce17d 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 41317fb443f7555de427aea69fda36c74661e77b58203cd6587eb8e1f612f46b systemd-250.tar.gz +sha256 ccfdd97679972cd3d9fb15bc3c647a3ee3351a434e20e1e3eec2851caa1b4849 systemd-250.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 0b52cc47d1..404943c45c 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 250 +SYSTEMD_VERSION = 250.1 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.31.1 From arnout at mind.be Fri Jan 7 21:49:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:49:08 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> Message-ID: <7605fae5-42db-115c-e87a-0dbc3597a99a@mind.be> On 03/01/2022 09:24, Tomi Valkeinen wrote: > Hi, > > On 06/12/2021 23:57, Yann E. MORIN wrote: > >> So I think we really, really need a package (like scipy) that actually >> makes use of pybind, so we can see how it works, and to fix it... > > Jfyi, there are two relatively simple packages in buildroot that can use pybind: > kmsxx and rwmem. Both use meson for building. > > I can test the next version of this series with those packages. I tried to do that. Unfortunately, it turns out that both of those packages use the CMake way of finding the pybind11 dependency, and apparently our cross-compilation.conf doesn't support cmake yet... So it's not that trivial. I merged the pybind stuff but wasn't able to test the cmake handling, so it's even possible that that is broken as well... Regards, Arnout From thomas.petazzoni at bootlin.com Fri Jan 7 21:50:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:50:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/qpdf: needs atomic In-Reply-To: References: <20220104210727.3634208-1-fontaine.fabrice@gmail.com> <20220107220857.63b9a0da@windsurf> Message-ID: <20220107225029.1b8a5588@windsurf> On Fri, 7 Jan 2022 22:16:26 +0100 Fabrice Fontaine wrote: > qpdf handles linking with atomic since version 10.0.2 and > https://github.com/qpdf/qpdf/commit/66198f447f45a87718b6457756976baa8defb2fd Excellent, thanks for confirming! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 7 21:53:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 22:53:22 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> Message-ID: <20220107225322.43eb3e8b@windsurf> Hello, On Fri, 7 Jan 2022 22:07:26 +0100 Romain Naour wrote: > > +endef > > +endif # ifeq ($(4),target) > > +endif # ifndef $(2)_BUILD_CMDS > > + > > is _INSTALL_STAGING_CMDS is missing here ? > > Rust package may wand to install *.rlib files [1] (similar to .a) So far we haven't seen any package that needed staging installation, so I did not implement it (Yann asked a similar question today, live). > cargo install seems overingeneered and produce unwanted rebuild when packages > are using cargo features [2]. Why do you say "over engineered" ? Buggy perhaps, over-engineered, I'm not sure. > meta-rust doesn't use cago install at all but use an cargo_do_install() function > that use manual install commandes [3]. > > [1] https://doc.rust-lang.org/reference/linkage.html > [2] https://github.com/rust-lang/cargo/issues/8703 > [3] https://github.com/meta-rust/meta-rust/blob/master/classes/cargo.bbclass#L55 I was wondering how they knew what to install and how/where, but that link explains it. It would a lot simpler to be able to use "cargo install", but I agree those rebuilds during the install step are not very nice (and they are time consuming). Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 7 21:52:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:52:29 +0100 Subject: [Buildroot] [PATCH v6,1/2] package/libpcap: add host variant Message-ID: <20220107215230.1672766-1-fontaine.fabrice@gmail.com> host-libpcap is needed to build host-zeek Signed-off-by: Fabrice Fontaine --- package/libpcap/libpcap.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 1e02ec56e0..21422b2c0a 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -11,6 +11,7 @@ LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_CPE_ID_VENDOR = tcpdump LIBPCAP_INSTALL_STAGING = YES LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf +HOST_LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test # provided by autoconf relies on wchar_t. @@ -23,6 +24,13 @@ LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag \ --without-dpdk # Disable dbus to break recursive dependencies LIBPCAP_CONF_OPTS += --disable-dbus +HOST_LIBPCAP_CONF_OPTS = \ + --disable-bluetooth \ + --disable-dbus \ + --disable-yydebug \ + --with-pcap=linux \ + --without-dag \ + --without-libnl LIBPCAP_CONFIG_SCRIPTS = pcap-config # Omit -rpath from pcap-config output @@ -50,3 +58,4 @@ LIBPCAP_CFLAGS += -fPIC endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 7 21:52:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 22:52:30 +0100 Subject: [Buildroot] [PATCH v6,2/2] package/zeek: new package In-Reply-To: <20220107215230.1672766-1-fontaine.fabrice@gmail.com> References: <20220107215230.1672766-1-fontaine.fabrice@gmail.com> Message-ID: <20220107215230.1672766-2-fontaine.fabrice@gmail.com> The Zeek Network Security Monitor Zeek is a powerful network analysis framework that is much different from the typical IDS you may know. (Zeek is the new name for the long-established Bro system.) Signed-off-by: Fabrice Fontaine --- Changes v5 -> v6: ?- Set ZEEK_PYTHON_PREFIX Changes v4 -> v5: ?- host-python3 is mandatory Changes v3 -> v4: ?- Bump to latest version (4.1.1) and drop patch (already in version) ?- python 2 support dropped since ? ?https://github.com/zeek/zeek/commit/eeec219a66ed89235093fb63753d6baf6c21de78 ?- BSD-3-Clause added since ? ?https://github.com/zeek/zeek/commit/d070709c573fc01a40735a6c921a9095988306cc Changes v2 -> v3 (after review of Thomas Petazzoni): ?- Bump to version 3.2.2 (security fixes) ?- Add host-zeek dependencies ?- Install bifcl and binpac to HOST_DIR Changes v1 -> v2: ?- Bump to version 3.2.0 ?- Drop second and third patches (already in version) ?- Update ZEEK_SITE ?- Update indentation in hash file (two spaces) ?- Update third party licences DEVELOPERS | 1 + package/Config.in | 1 + package/zeek/Config.in | 43 ++++++++++++++++++++ package/zeek/zeek.hash | 6 +++ package/zeek/zeek.mk | 92 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 143 insertions(+) create mode 100644 package/zeek/Config.in create mode 100644 package/zeek/zeek.hash create mode 100644 package/zeek/zeek.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7874677f7e..bc82015789 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -935,6 +935,7 @@ F: package/tinycbor/ F: package/tinydtls/ F: package/tinymembench/ F: package/whois/ +F: package/zeek/ N: Fabrice Goucem F: board/freescale/imx6ullevk/ diff --git a/package/Config.in b/package/Config.in index 3a0cc0c585..3b37448a41 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2407,6 +2407,7 @@ endif source "package/xinetd/Config.in" source "package/xl2tp/Config.in" source "package/xtables-addons/Config.in" + source "package/zeek/Config.in" source "package/znc/Config.in" endmenu diff --git a/package/zeek/Config.in b/package/zeek/Config.in new file mode 100644 index 0000000000..e474251aeb --- /dev/null +++ b/package/zeek/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_ZEEK + bool "zeek" + depends on BR2_USE_MMU # fork() + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB + help + The Zeek Network Security Monitor + + Zeek is a powerful network analysis framework that is much + different from the typical IDS you may know. (Zeek is the new + name for the long-established Bro system.) + + https://www.zeek.org + +if BR2_PACKAGE_ZEEK + +config BR2_PACKAGE_ZEEK_ZEEKCTL + bool "zeekctl" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_PYTHON3_CURSES + select BR2_PACKAGE_PYTHON3_HASHLIB + select BR2_PACKAGE_PYTHON3_SQLITE + select BR2_PACKAGE_PYTHON3_ZLIB + help + Tool for managing Zeek deployments + +comment "zeekctl tools needs python3" + depends on !BR2_PACKAGE_PYTHON3 + +endif + +comment "zeek needs a toolchain w/ C++, wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/zeek/zeek.hash b/package/zeek/zeek.hash new file mode 100644 index 0000000000..05e57b5024 --- /dev/null +++ b/package/zeek/zeek.hash @@ -0,0 +1,6 @@ +# Locally computed: +sha256 8c0afc999a8dd1c1f677a5cf818479b99c2d527e679e1ef99fb1b03f989c0373 zeek-4.1.1.tar.gz + +# Hash for license files: +sha256 b2817e2fb935805ec9fc0e90c6b971efd810d9aedfc646bc5fcb535221e0266a COPYING +sha256 1a451eca7b3826a7df62991ba90dd6d23ff03d28c2eefb7f8c4f8b1eac97a61b COPYING.3rdparty diff --git a/package/zeek/zeek.mk b/package/zeek/zeek.mk new file mode 100644 index 0000000000..90f9584603 --- /dev/null +++ b/package/zeek/zeek.mk @@ -0,0 +1,92 @@ +################################################################################ +# +# zeek +# +################################################################################ + +ZEEK_VERSION = 4.1.1 +ZEEK_SITE = https://download.zeek.org +ZEEK_LICENSE = \ + BSD-3-Clause (zeek, C++ Actor Framework, ConvertUTF.c, CardinalityCounter.cc, pybind11), \ + Public Domain (sqlite), \ + MIT (doctest, libkqueue, RapidJSON, tsl-ordered-map, bro_inet_ntop.c), \ + LGPL-3.0+ (Multifast Project), \ + BSD-2-Clause (event.h), \ + BSD-3-Clause (in_cksum.cc) \ + BSD-4-Clause (Patricia.c, strsep.c, bsd-getopt-long.c), \ + Apache-2.0 (highwayhash, folly), \ + MPL-2.0 (mozilla-ca-list.zeek) +ZEEK_LICENSE_FILES = COPYING COPYING.3rdparty +ZEEK_SUPPORTS_IN_SOURCE_BUILD = NO +ZEEK_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-pkgconf \ + host-python3 \ + host-zeek \ + $(if $(BR2_PACKAGE_LIBKRB5),libkrb5) \ + $(if $(BR2_PACKAGE_LIBMAXMINDDB),libmaxminddb) \ + libpcap \ + openssl \ + $(if $(BR2_PACKAGE_ROCKSDB),rocksdb) \ + zlib +HOST_ZEEK_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-pkgconf \ + host-python3 \ + host-libpcap \ + host-openssl \ + host-zlib + +ZEEK_CONF_OPTS = \ + -DBIFCL_EXE_PATH=$(HOST_DIR)/bin/bifcl \ + -DBINPAC_EXE_PATH=$(HOST_DIR)/bin/binpac \ + -DBROKER_DISABLE_DOCS=ON \ + -DBROKER_DISABLE_TESTS=ON \ + -DINSTALL_AUX_TOOLS=ON \ + -DZEEK_ETC_INSTALL_DIR=/etc + +define ZEEK_FIX_PYTHON_PATH + $(SED) 's, at PYTHON_EXECUTABLE@,/usr/bin/python,' \ + $(@D)/auxil/zeekctl/ZeekControl/ssh_runner.py +endef + +ZEEK_POST_INSTALL_TARGET_HOOKS += ZEEK_FIX_PYTHON_PATH + +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +ZEEK_DEPENDENCIES += jemalloc +ZEEK_CONF_OPTS += -DENABLE_JEMALLOC=ON +else +ZEEK_CONF_OPTS += -DENABLE_JEMALLOC=OFF +endif + +ifeq ($(BR2_PACKAGE_ZEEK_ZEEKCTL),y) +ZEEK_DEPENDENCIES += host-swig python3 +ZEEK_CONF_OPTS += \ + -DDISABLE_PYTHON_BINDINGS=OFF \ + -DINSTALL_ZEEKCTL=ON \ + -DPY_MOD_INSTALL_DIR=/usr/lib/zeekctl \ + -DZEEK_PYTHON_PREFIX=/usr +else +ZEEK_CONF_OPTS += \ + -DDISABLE_PYTHON_BINDINGS=ON \ + -DINSTALL_ZEEKCTL=OFF +endif + +ifneq ($(BR2_TOOLCHAIN_USES_GLIBC),y) +ZEEK_DEPENDENCIES += musl-fts +ZEEK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lfts +endif + +HOST_ZEEK_MAKE_OPTS = binpac bifcl + +define HOST_ZEEK_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(HOST_ZEEK_BUILDDIR)/auxil/bifcl/bifcl \ + $(HOST_DIR)/bin/bifcl + $(INSTALL) -D -m 0755 $(HOST_ZEEK_BUILDDIR)/auxil/binpac/src/binpac \ + $(HOST_DIR)/bin/binpac +endef + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.34.1 From arnout at mind.be Fri Jan 7 21:55:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:55:24 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> <7d360d46-e4e5-bbf4-80a9-d5e1ff6a3ea1@mind.be> Message-ID: On 08/12/2021 12:19, Andreas Naumann wrote: [snip] > By chance I was playing with such a package just yesterday: zxing-cpp. Not the > version buildroot uses (from github glassechidna), but the nu-book one which > claims to be faster. (And is the one where the python bindings in the PyPi > package zxing-cpp originate from). > > Until recently they shipped their own pybind11 version, which throws an error > when included in a cmake project in a crosscompile environment. This is a known > problem, https://github.com/pybind/pybind11/issues/2139 but non of the proposed > fixes has been merged yet. > > However, the unreleased master version of zxing-cpp hast been changed so it can > be configured to use the a system pybind11. So I tried to include the br > packaged one (2.6.1 as well as 2.8.1). They both built on my system (no problem > with the hardcoded host cmake here) but I needed to change three things: > 1. Add PYTHON_PYBIND_INSTALL_STAGING = YES > 2. Set ZXING_CPP_CONF_OPTS += > -Dpybind11_DIR=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pybind11/share/cmake/pybind11 > > 3. Apply one of the proposed fixes for the pybind11 crosscompile problem (to > tools/pybind11Tools.cmake) > > So this patch here seems to help my (and possibly others) because 1. is already > included. If interested, I could send a patch for 3. I applied a slightly different approach to master [1]. If you'd like to give that one a go, we'd welcome an updated zxing-cpp package! Regards, Arnout [1] https://git.buildroot.org/buildroot/commit/?id=a19b822239c36cb40a632899bb5c3e848a5fc81e [snip] From arnout at mind.be Fri Jan 7 21:56:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:56:10 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/python-pybind: fix upgrade to 2.6.1 In-Reply-To: <20220104123901.23929-1-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> Message-ID: <64301b2b-e9c2-91b4-1906-d9e437251618@mind.be> On 04/01/2022 13:38, guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > Fixes > http://autobuild.buildroot.net/results/b89f1de64b308dffa73675f1f31ccb0b7be5a10d > http://autobuild.buildroot.net/results/d0287b7f64f206b0f074908c5780a3632e0cb799 > http://autobuild.buildroot.net/results/27efb545a5a719a5581c8f746d3a3555ff4216ce > http://autobuild.buildroot.net/results/d2f0a0ad8f6c7178517df109e7d885dac9134c3a > http://autobuild.buildroot.net/results/b57e9a3279260dae4a590f9421238fcabb2f7cab > http://autobuild.buildroot.net/results/515e6f2fc6b5780260d98d6bb52b541ce4bf1afe > http://autobuild.buildroot.net/results/d89c4ecc81222d4f80c951da2232d2e393fa1c69 > > Signed-off-by: Guillaume W. Bres I applied a completely reworked version to master, thanks. Regards, Arnout [snip] From arnout at mind.be Fri Jan 7 21:57:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 22:57:41 +0100 Subject: [Buildroot] [PATCH v2 3/3] support/testing: add test for python-pybind In-Reply-To: <20220104123901.23929-3-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> <20220104123901.23929-3-guillaume.bressaix@gmail.com> Message-ID: <267a64ba-8407-bcea-0e3b-994986433b0c@mind.be> On 04/01/2022 13:39, guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > python-pybind is a header only library, most of the time used as a host-package, > to customize the host/usr/python interpreter capacity (at build time) with C++ based features. > > Signed-off-by: Guillaume W. Bres I applied to master with many changes: - Retain python3 only. - python-pybind is a target package, not host. - Select python-pybind instead of depend. - Simplify python-pybind-example package. - Check in python-pybind-example build if pybind11.get_include() produces output. - Don't use python3 -m pybind11 --includes: it includes the main python includes, which are for the host, not for the target. - Use TestPythonPackageBase instead of open-coding something imported with host python. However, I hadn't noticed that the original author of this test was Adam. In the future, please make sure that you don't claim authorship on a patch that is actually from someone else! Regards, Arnout > --- > This test case enhances the /host/usr/python interpreter with a C++ macro. > > The test delivers a C++ macro contained in its br-external/example.cpp. > We compile it against the host context. > We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively contained > in the host-python system path (import is easy). > The macro is an integer adder, written in C++ that we can now call in host-python. > > The test infrastructure should actually be declared "host-generic-package" > instead of "generic-package", to be consistent with Buildroot infrastructure. > But I am not able to get this to actually do anything, if I declare this package > as a host-generic and "Config.in.host" instead of "Config.in". To me, this is > not too important > > * TestPythonPybind allows testing for both Py2 and Py3 like it is done > in many other packages > > * TestPythonPybind does not inherit from TestPythonPackageBase as usually done > (1) because I need the br2-external feature to ship the example.cpp containing the custom macro > (2) because TestPythonPackageBase always involves the emulator, which we do not want in our context > > * Although TestPythonPybind does have a TestPythonBase.config base at the same time, > as it is most convenient to have a valid python context > > * TestPythonPybind uses subprocess, as similarly done in 'core' on 'infra' test cases, > because we do not involve the emulator > > * TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3 > * TestPythonPybind tests a custom module attribute, written in C++, used in Python 2/3 > > --- > DEVELOPERS | 3 ++ > .../br2-external/python-pybind/Config.in | 1 + > .../br2-external/python-pybind/external.desc | 1 + > .../br2-external/python-pybind/external.mk | 1 + > .../package/python-pybind-example/Config.in | 5 ++ > .../package/python-pybind-example/example.cpp | 16 +++++++ > .../python-pybind-example.mk | 47 ++++++++++++++++++ > .../tests/package/sample_python_pybind.py | 4 ++ > .../tests/package/test_python_pybind.py | 48 +++++++++++++++++++ > 9 files changed, 126 insertions(+) > create mode 100644 support/testing/tests/package/br2-external/python-pybind/Config.in > create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.desc > create mode 100644 support/testing/tests/package/br2-external/python-pybind/external.mk > create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > create mode 100644 support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk > create mode 100644 support/testing/tests/package/sample_python_pybind.py > create mode 100644 support/testing/tests/package/test_python_pybind.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index 21e4f2a84c..130ac3db73 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1120,6 +1120,9 @@ F: package/liquid-dsp/ > F: package/pixiewps/ > F: package/python-pybind/ > F: package/reaver/ > +F: support/testing/tests/package/br2-external/python-pybind > +F: support/testing/tests/package/sample_python_pybind.py > +F: support/testing/tests/package/test_python_pybind.py > > N: Guo Ren > F: arch/Config.in.csky > diff --git a/support/testing/tests/package/br2-external/python-pybind/Config.in b/support/testing/tests/package/br2-external/python-pybind/Config.in > new file mode 100644 > index 0000000000..70c77157b3 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in > @@ -0,0 +1 @@ > +source "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in" > diff --git a/support/testing/tests/package/br2-external/python-pybind/external.desc b/support/testing/tests/package/br2-external/python-pybind/external.desc > new file mode 100644 > index 0000000000..eef5e0f5a0 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/external.desc > @@ -0,0 +1 @@ > +name: PYTHON_PYBIND > diff --git a/support/testing/tests/package/br2-external/python-pybind/external.mk b/support/testing/tests/package/br2-external/python-pybind/external.mk > new file mode 100644 > index 0000000000..3501f3135e > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/external.mk > @@ -0,0 +1 @@ > +include $(sort $(wildcard $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk)) > diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > new file mode 100644 > index 0000000000..773d021a53 > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > @@ -0,0 +1,5 @@ > +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE > + bool "python-pybind-example" > + depends on BR2_PACKAGE_PYTHON_PYBIND > + help > + This test creates a cpp macro later used on target in python > diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > new file mode 100644 > index 0000000000..f2eea8e48d > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > @@ -0,0 +1,16 @@ > +#include > +namespace py = pybind11; > + > +int add (int i, int j) { > + return i + j; > +} > + > +PYBIND11_MODULE (example, m) { > + // optional module description > + m.doc() = "pybind11 example plugin"; > + // test a module method > + m.def("add", &add, "example::add adds two integer numbers"); > + // test a module attribute > + py::object hello = py::cast("Hello World"); > + m.attr("says") = hello; > +} > diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk > new file mode 100644 > index 0000000000..85dd09d93f > --- /dev/null > +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk > @@ -0,0 +1,47 @@ > +################################################################################ > +# > +# python-pybind-example > +# > +################################################################################ > + > +# this builds a C++ macro "add(a,b)" > +# that we expose to host-python with a custom install > +# and that the python test script will later use > +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind > + > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS) > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC > + > +ifeq ($(BR2_PACKAGE_PYTHON3),y) > +PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR) > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3 > +else > +PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR) > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2 > +endif > + > +# retrieve pybind11 include paths > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \ > + $(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes) > + > +# .so to be installed must have exact suffix > +# otherwise import() in python will not work > +HOST_LIB_BINARY_SUFFIX = \ > + $(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix) > + > +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS > + $(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D) > + cd $(@D); \ > + $(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \ > + example.cpp -o example$(HOST_LIB_BINARY_SUFFIX) > +endef > + > +# installs into host/python sys.path > +# so the new macro is naturally known > +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \ > + $(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX) > +endef > + > +$(eval $(generic-package)) > diff --git a/support/testing/tests/package/sample_python_pybind.py b/support/testing/tests/package/sample_python_pybind.py > new file mode 100644 > index 0000000000..605c0bab15 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_pybind.py > @@ -0,0 +1,4 @@ > +#!/usr/bin/env python > +import example > +print(example.add(1, 2)) > +print(example.says) > diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py > new file mode 100644 > index 0000000000..7a68d6512a > --- /dev/null > +++ b/support/testing/tests/package/test_python_pybind.py > @@ -0,0 +1,48 @@ > +import os > +import infra > +import subprocess > +from tests.package.test_python import TestPythonPackageBase > + > +class TestPythonPybind (infra.basetest.BRTest): > + config = TestPythonPackageBase.config # python minimal requirements > + sample_script = "tests/package/sample_python_pybind.py" > + # ship examples macro & installs it to host > + br2_external = [infra.filepath("tests/package/br2-external/python-pybind")] > + > +class TestPythonPy2Pybind (TestPythonPybind): > + __test__ = True > + config = TestPythonPybind.config + \ > + """ > + BR2_PACKAGE_PYTHON=y > + BR2_PACKAGE_PYTHON_PYBIND=y > + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y > + """ > + > + def test_run(self): > + host_interpreter = os.path.join(self.builddir,"host","usr","bin","python") > + # test new c++->py macro exposed to host interpreter > + cmd = [host_interpreter, infra.filepath(self.sample_script)] > + output = subprocess.check_output(cmd) > + result = int(output.splitlines()[0]) > + attribute = output.splitlines()[1].decode("utf-8") > + self.assertEqual(result,3) # 2+1 using '+' macro from cpp > + self.assertEqual(attribute,"Hello World") # macro special attribute > + > +class TestPythonPy3Pybind (TestPythonPybind): > + __test__ = True > + config = TestPythonPybind.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_PYBIND=y > + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y > + """ > + > + def test_run(self): > + host_interpreter = os.path.join(self.builddir,"host","usr","bin","python") > + # test new c++->py macro exposed to host interpreter > + cmd = [host_interpreter, infra.filepath(self.sample_script)] > + output = subprocess.check_output(cmd) > + result = int(output.splitlines()[0]) > + attribute = output.splitlines()[1].decode("utf-8") > + self.assertEqual(result,3) # 2+1 using '+' macro from cpp > + self.assertEqual(attribute,"Hello World") # macro special attribute > From fontaine.fabrice at gmail.com Fri Jan 7 22:07:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 23:07:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: bump to version 5.0.1 Message-ID: <20220107220707.1679540-1-fontaine.fabrice@gmail.com> Drop first patch (already in version) Signed-off-by: Fabrice Fontaine --- package/mp4v2/0001-Fix-GCC7-build.patch | 33 ------------------- ...p4track.cpp-replace-nullptr-by-NULL.patch} | 2 +- ...atic-cast-to-unsigned-int-for-cases.patch} | 0 package/mp4v2/mp4v2.hash | 2 +- package/mp4v2/mp4v2.mk | 2 +- 5 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/mp4v2/0001-Fix-GCC7-build.patch rename package/mp4v2/{0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch => 0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch} (96%) rename package/mp4v2/{0003-Static-cast-to-unsigned-int-for-cases.patch => 0002-Static-cast-to-unsigned-int-for-cases.patch} (100%) diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch deleted file mode 100644 index 4e39be4a79..0000000000 --- a/package/mp4v2/0001-Fix-GCC7-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Wed, 8 Feb 2017 00:56:32 +0000 -Subject: [PATCH] Fix GCC7 build - -if (*pSlash != '\0') { - -As it stands the body of that if will always execute and when there are -no encoding parameters ppEncodingParams will be returned as a pointer to -an empty string rather than as a null pointer - -Signed-off-by: Peter Korsgaard -[Upstream status: https://github.com/TechSmith/mp4v2/pull/36] ---- - src/rtphint.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rtphint.cpp b/src/rtphint.cpp -index e07309d..1eb01f5 100644 ---- a/src/rtphint.cpp -+++ b/src/rtphint.cpp -@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( - pSlash = strchr(pSlash, '/'); - if (pSlash != NULL) { - pSlash++; -- if (pSlash != '\0') { -+ if (*pSlash != '\0') { - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); - *ppEncodingParams = (char *)MP4Calloc(length + 1); - strncpy(*ppEncodingParams, pSlash, length); --- -2.11.0 - diff --git a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch similarity index 96% rename from package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch rename to package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch index 72bae463c9..c279b9c56a 100644 --- a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch +++ b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] --- src/mp4track.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch similarity index 100% rename from package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch rename to package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 85fce49384..7aa5402c8f 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz +sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 478d10d472..6d29228a13 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MP4V2_VERSION = 4.1.3 +MP4V2_VERSION = 5.0.1 MP4V2_SITE = \ $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) MP4V2_INSTALL_STAGING = YES -- 2.34.1 From arnout at mind.be Fri Jan 7 21:41:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Fri, 7 Jan 2022 22:41:31 +0100 Subject: [Buildroot] [git commit] package/python-numpy: fixup npymath.ini for numpy extensions Message-ID: <20220107220414.EEAF8834B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2426002d6fc81d0b023e3f3b3ee4e94ab29438cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to build the numpy distutils extension packages like python-scipy, python-numba, it requires an explicit pkg-config path fixup for npymath.ini. This pkg-config path fixup would update the prefix path of npymath.ini with actual target staging area where numpy core was built, so that numpy distutils extension packages would explicitly link this config path for their package environment. Without this extension packages cannot find -lnpymath since it uses host libraries (like libnpymath.a). So, attach the post install staging hook with pkg-config path fixup for npymath.ini. Signed-off-by: Esben Haabendal Signed-off-by: Jagan Teki Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-numpy/python-numpy.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index ae72b87db0..f367b556ef 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -34,6 +34,21 @@ define PYTHON_NUMPY_CONFIGURE_CMDS echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg endef +# Fixup the npymath.ini prefix path with actual target staging area where +# numpy core was built. Without this, target builds using numpy distutils +# extensions like python-scipy, python-numba cannot find -lnpymath since +# it uses host libraries (like libnpymath.a). +# So, the numpy distutils extension packages would explicitly link this +# config path for their package environment. +PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy +PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config +define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES + sed -e '/^pkgdir=/d' \ + -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ + -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini +endef +PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES + # Some package may include few headers from NumPy, so let's install it # in the staging area. PYTHON_NUMPY_INSTALL_STAGING = YES From arnout at mind.be Fri Jan 7 22:03:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Fri, 7 Jan 2022 23:03:09 +0100 Subject: [Buildroot] [git commit] package/python-pybind: bump to version 2.9.0 Message-ID: <20220107220415.035CD834D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69255af2299cdde0a8d6276952a867a2cb58889a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Guillaume W. Bres [Arnout: bump to 2.9.0, refresh patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-pybind11-commands.py-support-STAGING_DIR.patch | 11 +++++------ package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch index 981a387be4..021321a9b7 100644 --- a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch +++ b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch @@ -1,4 +1,4 @@ -From 9feaba4792c1d0a28e560ae941fa9ebabbbe4013 Mon Sep 17 00:00:00 2001 +From bf9f0d619e2e0a424e471a2f9235d26ece5b348c Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Fri, 7 Jan 2022 19:32:18 +0100 Subject: [PATCH] pybind11/commands.py: support STAGING_DIR @@ -13,18 +13,17 @@ the current directory, if it is set. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Upstream-Status: N/A, Buildroot specific --- - pybind11/commands.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + pybind11/commands.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pybind11/commands.py b/pybind11/commands.py -index 34dbaf8..8c4876d 100644 +index 11f81d2..8c4876d 100644 --- a/pybind11/commands.py +++ b/pybind11/commands.py -@@ -1,8 +1,8 @@ +@@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- import os -- -DIR = os.path.abspath(os.path.dirname(__file__)) +DIR = os.environ.get('STAGING_DIR') or \ + os.path.abspath(os.path.dirname(__file__)) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index a68ac846e2..d5b4b4829e 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a python-pybind-2.6.1.tar.gz +sha256 057fb68dafd972bc13afb855f3b0d8cf0fa1a78ef053e815d9af79be7ff567cb python-pybind-2.9.0.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index 4dd52003ad..7448d246b2 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.6.1 +PYTHON_PYBIND_VERSION = 2.9.0 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE From arnout at mind.be Fri Jan 7 22:10:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 23:10:25 +0100 Subject: [Buildroot] [PATCH v8 2/5] package/python-numpy: fixup npymath.ini for numpy extensions In-Reply-To: <20200407111515.21131-3-jagan@amarulasolutions.com> References: <20200407111515.21131-1-jagan@amarulasolutions.com> <20200407111515.21131-3-jagan@amarulasolutions.com> Message-ID: <219ad3fa-0ae0-c979-b9cb-879dddf3f7f4@mind.be> On 07/04/2020 13:15, Jagan Teki wrote: > From: Esben Haabendal > > Inorder to build the numpy distutils extension packages like > python-scipy, python-numba, it require an explicit pkg-config > path fixup for npymath.ini. > > This pkg-config path fixup would update the prefix path of > npymath.ini with actual target staging area where numpy core > was built, so-that numpy distutils extension packages would > explicitly link this config path for their package environment. > > Without this extension packages cannot find -lnpymath since > it uses host libraries (like libnpymath.a). > > So, attach the post install staging hook with pkg-config > path fixup for npymath.ini. > > Signed-off-by: Esben Haabendal > Signed-off-by: Jagan Teki Applied to master, thanks. Regards, Arnout > --- > Changes for v8: > - none > Changes for v7: > - rephrase commit and comments of fixup npymath.ini > > package/python-numpy/python-numpy.mk | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk > index 3f0df7a640..4d2e852b43 100644 > --- a/package/python-numpy/python-numpy.mk > +++ b/package/python-numpy/python-numpy.mk > @@ -32,6 +32,21 @@ define PYTHON_NUMPY_CONFIGURE_CMDS > echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg > endef > > +# Fixup the npymath.ini prefix path with actual target staging area where > +# numpy core was built. Without this, target builds using numpy distutils > +# extensions like python-scipy, python-numba cannot find -lnpymath since > +# it uses host libraries (like libnpymath.a). > +# So, the numpy distutils extension packages would explicitly link this > +# config path for their package environment. > +PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy > +PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config > +define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES > + sed -e '/^pkgdir=/d' \ > + -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ > + -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini > +endef > +PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES > + > # Some package may include few headers from NumPy, so let's install it > # in the staging area. > PYTHON_NUMPY_INSTALL_STAGING = YES > From arnout at mind.be Fri Jan 7 22:10:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 7 Jan 2022 23:10:32 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/python-pybind: bump to version 2.8.1 In-Reply-To: <20220104123901.23929-2-guillaume.bressaix@gmail.com> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> <20220104123901.23929-2-guillaume.bressaix@gmail.com> Message-ID: <4f884b01-32c1-5469-b650-2e80a5934989@mind.be> On 04/01/2022 13:39, guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > Signed-off-by: Guillaume W. Bres I bumped to 2.9.0 instead and applied to master, thanks. Regards, Arnout > --- > package/python-pybind/python-pybind.hash | 2 +- > package/python-pybind/python-pybind.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash > index a68ac846e2..e1d86a4494 100644 > --- a/package/python-pybind/python-pybind.hash > +++ b/package/python-pybind/python-pybind.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a python-pybind-2.6.1.tar.gz > +sha256 f1bcc07caa568eb312411dde5308b1e250bd0e1bc020fae855bf9f43209940cc python-pybind-2.8.1.tar.gz > # License files, locally calculated > sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE > diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk > index 442ed3328f..cf6a642922 100644 > --- a/package/python-pybind/python-pybind.mk > +++ b/package/python-pybind/python-pybind.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PYTHON_PYBIND_VERSION = 2.6.1 > +PYTHON_PYBIND_VERSION = 2.8.1 > PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) > PYTHON_PYBIND_LICENSE = BSD-3-Clause > PYTHON_PYBIND_LICENSE_FILES = LICENSE > From peter at korsgaard.com Fri Jan 7 22:10:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 07 Jan 2022 23:10:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/netdata: add prometheus remote write backend support In-Reply-To: <20211105173048.2483666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 5 Nov 2021 18:30:48 +0100") References: <20211105173048.2483666-1-fontaine.fabrice@gmail.com> Message-ID: <87o84njixr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > prometheus remote write backend depends on protobuf and snappy and is > enabled by default since the addition of the package in commit > 1d2bb469078b5818aa2390b9868cd632200f17a2 > Signed-off-by: Fabrice Fontaine > --- > package/netdata/Config.in | 19 +++++++++++++++++++ > package/netdata/netdata.mk | 10 ++++++++++ > 2 files changed, 29 insertions(+) > diff --git a/package/netdata/Config.in b/package/netdata/Config.in > index 88f88cb7ed..34d139125d 100644 > --- a/package/netdata/Config.in > +++ b/package/netdata/Config.in > @@ -16,6 +16,25 @@ config BR2_PACKAGE_NETDATA > https://github.com/netdata/netdata > +if BR2_PACKAGE_NETDATA > + > +config BR2_PACKAGE_NETDATA_PROMETHEUS > + bool "prometheus remote write backend" > + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > + depends on BR2_INSTALL_LIBSTDCPP # protobuf, snappy > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf > + select BR2_PACKAGE_PROTOBUF > + select BR2_PACKAGE_SNAPPY > + help > + Enable prometheus remote write backend > + > +comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" > + depends on !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > + > +endif > + > comment "netdata needs a toolchain w/ NPTL, dynamic library" > depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > depends on BR2_USE_MMU > diff --git a/package/netdata/netdata.mk b/package/netdata/netdata.mk > index 34365cbf56..ac717d56b0 100644 > --- a/package/netdata/netdata.mk > +++ b/package/netdata/netdata.mk > @@ -60,6 +60,16 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > NETDATA_CONF_ENV += LIBS=-latomic > endif > +ifeq ($(BR2_PACKAGE_NETDATA_PROMETHEUS),y) > +# Override the result of AC_PATH_PROG([CXX_BINARY], [${CXX}], [no]) > +# which fails because CXX is set to the full CXX binary path > +NETDATA_CONF_ENV += ac_cv_path_CXX_BINARY=yes The issue is both the path issue and also the fact that the compiler may not be in the path. I guess they have used this odd check as you cannot do a conditional AC_PROG_CXX. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 22:10:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 7 Jan 2022 23:10:52 +0100 Subject: [Buildroot] [git commit] package/netdata: add prometheus remote write backend support Message-ID: <20220107220447.87472814EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62c2da0e7a54e96a12190bcaa79e552b497e634b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master prometheus remote write backend depends on protobuf and snappy and is enabled by default since the addition of the package in commit 1d2bb469078b5818aa2390b9868cd632200f17a2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/netdata/Config.in | 19 +++++++++++++++++++ package/netdata/netdata.mk | 10 ++++++++++ 2 files changed, 29 insertions(+) diff --git a/package/netdata/Config.in b/package/netdata/Config.in index 88f88cb7ed..34d139125d 100644 --- a/package/netdata/Config.in +++ b/package/netdata/Config.in @@ -16,6 +16,25 @@ config BR2_PACKAGE_NETDATA https://github.com/netdata/netdata +if BR2_PACKAGE_NETDATA + +config BR2_PACKAGE_NETDATA_PROMETHEUS + bool "prometheus remote write backend" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # protobuf, snappy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_SNAPPY + help + Enable prometheus remote write backend + +comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +endif + comment "netdata needs a toolchain w/ NPTL, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU diff --git a/package/netdata/netdata.mk b/package/netdata/netdata.mk index b20d5ea37b..6def59764a 100644 --- a/package/netdata/netdata.mk +++ b/package/netdata/netdata.mk @@ -61,6 +61,16 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) NETDATA_CONF_ENV += LIBS=-latomic endif +ifeq ($(BR2_PACKAGE_NETDATA_PROMETHEUS),y) +# Override the result of AC_PATH_PROG([CXX_BINARY], [${CXX}], [no]) +# which fails because CXX is set to the full CXX binary path +NETDATA_CONF_ENV += ac_cv_path_CXX_BINARY=yes +NETDATA_CONF_OPTS += --enable-backend-prometheus-remote-write +NETDATA_DEPENDENCIES += protobuf snappy +else +NETDATA_CONF_OPTS += --disable-backend-prometheus-remote-write +endif + define NETDATA_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/netdata/S60netdata \ $(TARGET_DIR)/etc/init.d/S60netdata From james.hilliard1 at gmail.com Fri Jan 7 22:26:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:09 -0700 Subject: [Buildroot] [PATCH 1/5] package/serd: new package Message-ID: <20220107222613.4124764-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/serd/Config.in | 8 ++++++++ package/serd/serd.hash | 4 ++++ package/serd/serd.mk | 20 ++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/serd/Config.in create mode 100644 package/serd/serd.hash create mode 100644 package/serd/serd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3d5c01f795..d99d7798db 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1299,6 +1299,7 @@ F: package/python-tinycss2/ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ +F: package/serd/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index e9ee4d2ef1..18ae22f227 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1704,6 +1704,7 @@ menu "JSON/XML" source "package/rapidjson/Config.in" source "package/rapidxml/Config.in" source "package/raptor/Config.in" + source "package/serd/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" diff --git a/package/serd/Config.in b/package/serd/Config.in new file mode 100644 index 0000000000..7633a979e2 --- /dev/null +++ b/package/serd/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SERD + bool "serd" + help + Serd is a lightweight C library for RDF syntax which + supports reading and writing Turtle, TriG, NTriples, and + NQuads. + + https://drobilla.net/software/serd.html diff --git a/package/serd/serd.hash b/package/serd/serd.hash new file mode 100644 index 0000000000..d64a2aa271 --- /dev/null +++ b/package/serd/serd.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig +sha256 affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf serd-0.30.10.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/serd/serd.mk b/package/serd/serd.mk new file mode 100644 index 0000000000..85b16f6866 --- /dev/null +++ b/package/serd/serd.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# serd +# +################################################################################ + +SERD_VERSION = 0.30.10 +SERD_SITE = https://download.drobilla.net +SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2 +SERD_LICENSE = ISC +SERD_LICENSE_FILES = COPYING +SERD_INSTALL_STAGING = YES + +SERD_CONF_OPTS += --largefile --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SERD_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:26:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:10 -0700 Subject: [Buildroot] [PATCH 2/5] package/sord: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: <20220107222613.4124764-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sord/Config.in | 8 ++++++++ package/sord/sord.hash | 4 ++++ package/sord/sord.mk | 25 +++++++++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/sord/Config.in create mode 100644 package/sord/sord.hash create mode 100644 package/sord/sord.mk diff --git a/DEVELOPERS b/DEVELOPERS index d99d7798db..bc54ab590c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1300,6 +1300,7 @@ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ F: package/serd/ +F: package/sord/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index 18ae22f227..6133d6ce32 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1705,6 +1705,7 @@ menu "JSON/XML" source "package/rapidxml/Config.in" source "package/raptor/Config.in" source "package/serd/Config.in" + source "package/sord/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" diff --git a/package/sord/Config.in b/package/sord/Config.in new file mode 100644 index 0000000000..91dfb41d0b --- /dev/null +++ b/package/sord/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SORD + bool "sord" + select BR2_PACKAGE_SERD + help + Sord is a lightweight C library for storing RDF data in + memory. + + https://drobilla.net/software/sord.html diff --git a/package/sord/sord.hash b/package/sord/sord.hash new file mode 100644 index 0000000000..af175f91f0 --- /dev/null +++ b/package/sord/sord.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc +sha256 7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14 sord-0.16.8.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/sord/sord.mk b/package/sord/sord.mk new file mode 100644 index 0000000000..f805805e9d --- /dev/null +++ b/package/sord/sord.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# sord +# +################################################################################ + +SORD_VERSION = 0.16.8 +SORD_SITE = https://download.drobilla.net +SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2 +SORD_LICENSE = ISC +SORD_LICENSE_FILES = COPYING +SORD_DEPENDENCIES = host-pkgconf serd +SORD_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_PCRE),y) +SORD_DEPENDENCIES += pcre +endif + +SORD_CONF_OPTS += --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SORD_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:26:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:11 -0700 Subject: [Buildroot] [PATCH 3/5] package/lv2: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: <20220107222613.4124764-3-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/lv2/Config.in | 8 ++++++++ package/lv2/lv2.hash | 4 ++++ package/lv2/lv2.mk | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 46 insertions(+) create mode 100644 package/lv2/Config.in create mode 100644 package/lv2/lv2.hash create mode 100644 package/lv2/lv2.mk diff --git a/DEVELOPERS b/DEVELOPERS index bc54ab590c..6c6e93f089 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1254,6 +1254,7 @@ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/lv2/ F: package/pipewire/ F: package/python-aioconsole/ F: package/python-aiodns/ diff --git a/package/Config.in b/package/Config.in index 6133d6ce32..a439a456a4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1358,6 +1358,7 @@ menu "Audio/Sound" source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" + source "package/lv2/Config.in" source "package/mp4v2/Config.in" source "package/openal/Config.in" source "package/opencore-amr/Config.in" diff --git a/package/lv2/Config.in b/package/lv2/Config.in new file mode 100644 index 0000000000..aeeb6d0451 --- /dev/null +++ b/package/lv2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LV2 + bool "lv2" + help + LV2 is a plugin standard for audio systems. It defines + a minimal yet extensible C API for plugin code and a + format for plugin "bundles". + + https://lv2plug.in/ diff --git a/package/lv2/lv2.hash b/package/lv2/lv2.hash new file mode 100644 index 0000000000..ed21620bee --- /dev/null +++ b/package/lv2/lv2.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://lv2plug.in/spec/lv2-1.18.2.tar.bz2.asc +sha256 4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e lv2-1.18.2.tar.bz2 +sha256 0b0b07d852e3ce7fa04986e141f73001bd7f260683968f0a19e02dbcc4131aa6 COPYING diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk new file mode 100644 index 0000000000..589b518545 --- /dev/null +++ b/package/lv2/lv2.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# lv2 +# +################################################################################ + +LV2_VERSION = 1.18.2 +LV2_SITE = https://lv2plug.in/spec +LV2_SOURCE = lv2-$(LV2_VERSION).tar.bz2 +LV2_LICENSE = ISC +LV2_LICENSE_FILES = COPYING +LV2_DEPENDENCIES = host-pkgconf +LV2_INSTALL_STAGING = YES + +LV2_CONF_OPTS += \ + --no-coverage \ + --no-check-links \ + --copy-headers + +ifeq ($(BR2_PACKAGE_CAIRO),y) +LV2_DEPENDENCIES += cairo +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +LV2_DEPENDENCIES += libsndfile +endif + +ifeq ($(BR2_PACKAGE_LIBGTK2),y) +LV2_DEPENDENCIES += libgtk2 +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:26:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:12 -0700 Subject: [Buildroot] [PATCH 4/5] package/sratom: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: <20220107222613.4124764-4-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sratom/Config.in | 10 ++++++++++ package/sratom/sratom.hash | 4 ++++ package/sratom/sratom.mk | 21 +++++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/sratom/Config.in create mode 100644 package/sratom/sratom.hash create mode 100644 package/sratom/sratom.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6c6e93f089..f8aa809294 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1302,6 +1302,7 @@ F: package/python-yarl/ F: package/python-zopfli/ F: package/serd/ F: package/sord/ +F: package/sratom/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index a439a456a4..51a4180569 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1369,6 +1369,7 @@ menu "Audio/Sound" source "package/spandsp/Config.in" source "package/speex/Config.in" source "package/speexdsp/Config.in" + source "package/sratom/Config.in" source "package/taglib/Config.in" source "package/tinyalsa/Config.in" source "package/tremor/Config.in" diff --git a/package/sratom/Config.in b/package/sratom/Config.in new file mode 100644 index 0000000000..771e82073d --- /dev/null +++ b/package/sratom/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_SRATOM + bool "sratom" + select BR2_PACKAGE_LV2 + select BR2_PACKAGE_SERD + select BR2_PACKAGE_SORD + help + Sratom is a library for serialising LV2 atoms to and from + RDF, particularly the Turtle syntax. + + https://drobilla.net/software/sratom.html diff --git a/package/sratom/sratom.hash b/package/sratom/sratom.hash new file mode 100644 index 0000000000..64d460b2ea --- /dev/null +++ b/package/sratom/sratom.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/sratom-0.6.8.tar.bz2.asc +sha256 3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df sratom-0.6.8.tar.bz2 +sha256 3fc429d6b944fa20306357196a28bb4dd7c25e2d67edebec771f44de5bd7f9e8 COPYING diff --git a/package/sratom/sratom.mk b/package/sratom/sratom.mk new file mode 100644 index 0000000000..e1e0f4e033 --- /dev/null +++ b/package/sratom/sratom.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# sratom +# +################################################################################ + +SRATOM_VERSION = 0.6.8 +SRATOM_SITE = https://download.drobilla.net +SRATOM_SOURCE = sratom-$(SRATOM_VERSION).tar.bz2 +SRATOM_LICENSE = ISC +SRATOM_LICENSE_FILES = COPYING +SRATOM_DEPENDENCIES = host-pkgconf lv2 serd sord +SRATOM_INSTALL_STAGING = YES + +SRATOM_CONF_OPTS += --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SRATOM_CONF_OPTS += --static --no-shared +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:26:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 15:26:13 -0700 Subject: [Buildroot] [PATCH 5/5] package/lilv: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: <20220107222613.4124764-5-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/lilv/Config.in | 11 +++++++++++ package/lilv/lilv.hash | 4 ++++ package/lilv/lilv.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 package/lilv/Config.in create mode 100644 package/lilv/lilv.hash create mode 100644 package/lilv/lilv.mk diff --git a/DEVELOPERS b/DEVELOPERS index f8aa809294..c214abe209 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1254,6 +1254,7 @@ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/lilv/ F: package/lv2/ F: package/pipewire/ F: package/python-aioconsole/ diff --git a/package/Config.in b/package/Config.in index 51a4180569..1cf2bb5219 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1358,6 +1358,7 @@ menu "Audio/Sound" source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" + source "package/lilv/Config.in" source "package/lv2/Config.in" source "package/mp4v2/Config.in" source "package/openal/Config.in" diff --git a/package/lilv/Config.in b/package/lilv/Config.in new file mode 100644 index 0000000000..086125cdc9 --- /dev/null +++ b/package/lilv/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LILV + bool "lilv" + select BR2_PACKAGE_LV2 + select BR2_PACKAGE_SERD + select BR2_PACKAGE_SORD + select BR2_PACKAGE_SRATOM + help + Lilv is a C library to make the use of LV2 plugins as simple + as possible for applications. + + https://drobilla.net/software/lilv.html diff --git a/package/lilv/lilv.hash b/package/lilv/lilv.hash new file mode 100644 index 0000000000..afa20fc083 --- /dev/null +++ b/package/lilv/lilv.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/lilv-0.24.12.tar.bz2.asc +sha256 26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061 lilv-0.24.12.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/lilv/lilv.mk b/package/lilv/lilv.mk new file mode 100644 index 0000000000..651597953d --- /dev/null +++ b/package/lilv/lilv.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# lilv +# +################################################################################ + +LILV_VERSION = 0.24.12 +LILV_SITE = https://download.drobilla.net +LILV_SOURCE = lilv-$(LILV_VERSION).tar.bz2 +LILV_LICENSE = ISC +LILV_LICENSE_FILES = COPYING +LILV_DEPENDENCIES = host-pkgconf lv2 serd sord sratom +LILV_INSTALL_STAGING = YES + +LILV_CONF_OPTS += \ + --dyn-manifest \ + --no-bash-completion \ + --no-coverage + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LILV_DEPENDENCIES += python3 +else +LILV_CONF_OPTS += --no-bindings +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +LILV_DEPENDENCIES += libsndfile +endif + +ifeq ($(BR2_STATIC_LIBS),y) +LILV_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From colin.foster at in-advantage.com Fri Jan 7 22:26:44 2022 From: colin.foster at in-advantage.com (Colin Foster) Date: Fri, 7 Jan 2022 14:26:44 -0800 Subject: [Buildroot] [PATCH v1 next] package/mstpd: bump version to 0.1.0 Message-ID: <20220107222644.1612206-1-colin.foster@in-advantage.com> Shortly after MSTPd was added, version 0.1.0 was released. Update to the latest version. Signed-off-by: Colin Foster --- package/mstpd/mstpd.hash | 1 + package/mstpd/mstpd.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mstpd/mstpd.hash b/package/mstpd/mstpd.hash index fd76b959db..64e946d6d1 100644 --- a/package/mstpd/mstpd.hash +++ b/package/mstpd/mstpd.hash @@ -1,4 +1,5 @@ # locally computed sha256 91a1862548b5b509caa2e96e5fb9912bc98d4d58cc98e99a577824735756c14d mstpd-0.0.9.tar.gz +sha256 03d1ff4ca189d54322562cb2891888768af719d2c73ceafa5f1ca96133dffeb2 mstpd-0.1.0.tar.gz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 LICENSE sha256 c5cfd44652276184374adf454150d436ce958ce50acc4ef9ccb3605a5ca7a9d3 hmac_md5.c diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk index a870352869..907d094242 100644 --- a/package/mstpd/mstpd.mk +++ b/package/mstpd/mstpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSTPD_VERSION = 0.0.9 +MSTPD_VERSION = 0.1.0 MSTPD_SITE = $(call github,mstpd,mstpd,$(MSTPD_VERSION)) MSTPD_AUTORECONF = YES MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 7 22:30:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 16:30:12 -0600 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220107105223.01912574@windsurf> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107105223.01912574@windsurf> Message-ID: On Fri, Jan 7, 2022 at 3:52 AM Thomas Petazzoni wrote: > > Hello James, > > On Thu, 6 Jan 2022 19:12:51 -0600 > James Hilliard wrote: > > > > +$(2)_CARGO_ENV += \ > > > + CARGO_HOME=$$(HOST_DIR)/share/cargo \ > > > + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > > > + CARGO_TARGET_APPLIES_TO_HOST="false" > > > > Maybe want to set these additional options as well so that packages > > using cargo can > > build with only the env variables set(in some cases at least I think), > > Thanks for the suggestion. However, could you be more specific than > "maybe" and "I think" ? The way you put it seems like we don't really > know why those variables would be useful and what they do. > > > still probably > > need to pass some command line args but this should reduce the amount at least: > > RUSTC_TARGET_TRIPLE = $(subst -,_,$(call UPPERCASE,$(RUSTC_TARGET_NAME))) > > Which command line arguments would be replaced by those variables? > > > PKG_RUST_CARGO_ENV = \ > > CARGO_HOME=$(HOST_DIR)/share/cargo \ > > This one we already pass. > > > CARGO_BUILD_TARGET=$(RUSTC_TARGET_NAME) \ > > This one would replace the --target argument? Just to understand, what > would be the advantage of the variable compared to the comand line > argument? Might be better for reusing this env for indirect cargo build invocations like those done by python-setuptools-rust. > > > CARGO_INSTALL_ROOT=$(TARGET_DIR)/usr \ > > This would replace --root $$(TARGET_DIR)/usr/ I suppose. Here as well, > any benefit/drawback of arguments vs. variables? Yeah, mostly for indict invocations as well. > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > How come things are working today with this one? I think this is currently set in the cargo config file. > > > > > HOST_PKG_RUST_CARGO_ENV = \ > > CARGO_HOME=$(HOST_DIR)/share/cargo \ > > This one already passed. > > > CARGO_INSTALL_ROOT=$(HOST_DIR) \ > > This would replace --root $$(HOST_DIR) I suppose. Yeah, sounds right. > > > RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" > > This is already passed, although replicated between the build and > install steps of the host variant. > > So essentially the only questions is: > > - Advantage of variables vs. command line options Makes setting cargo variables when cargo is not directly invoked simpler. > > - Relevance of CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc Set via CARGO_HOME currently, but I think may allow the cargo config to not be required. > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From romain.naour at smile.fr Fri Jan 7 22:39:55 2022 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 7 Jan 2022 23:39:55 +0100 Subject: [Buildroot] [PATCH] support/scripts/generate-gitlab-ci-yml: ignore branch name prefix containing a single hyphen Message-ID: <20220107223955.148266-1-romain.naour@smile.fr> The commit [1] added a sed command used to retreive a pattern to keep only defconfigs whose name start with the pattern. "-defconfigs-" The sed command doesn't work as expected if contains a single hyphen [2]: "qemu-6.2.0-defconfigs-qemu" Update the sed command to ignore completely the part before "-defconfigs-". [1] 65d2f04c012af492a9b9da04dfa3b3cbd20347f1 [2] http://lists.busybox.net/pipermail/buildroot/2022-January/632507.html Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- support/scripts/generate-gitlab-ci-yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index 3e0c68091b..bd79807914 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -66,8 +66,8 @@ gen_tests() { (*-defconfigs) do_defconfigs=base ;; - (*-defconfigs-*) - pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%[^\-]*-defconfigs-\(.*\)%\1%') + (*-defconfigs-*) + pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%^.*-defconfigs-\(.*\)%\1%') defconfigs=( $(cd configs; LC_ALL=C ls -1 | grep ^${pattern}) ) do_defconfigs=base ;; -- 2.31.1 From fontaine.fabrice at gmail.com Fri Jan 7 22:57:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 7 Jan 2022 23:57:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/xfsprogs: bump to version 5.14.2 Message-ID: <20220107225739.2145636-1-fontaine.fabrice@gmail.com> liburcu is a mandatory dependency since version 5.14.0 and https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e4da1b16e29f6fe6b34de9b9b0f97141fb2e1855 https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?h=v5.14.2 Signed-off-by: Fabrice Fontaine --- package/xfsprogs/Config.in | 3 +++ package/xfsprogs/xfsprogs.hash | 2 +- package/xfsprogs/xfsprogs.mk | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index b8e07cc83d..a382b63ff8 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -1,12 +1,15 @@ comment "xfsprogs needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_XFSPROGS bool "xfsprogs" + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH + select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index b379839e7e..bb546601dc 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9 xfsprogs-5.10.0.tar.xz +sha256 01ccd3ef9df2837753a5d876b8da84ea957d13d7a461b8c46e8afa4eb09aabc8 xfsprogs-5.14.2.tar.xz # Hash for license files sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 71d02278e9..695471bddc 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,13 +4,13 @@ # ################################################################################ -XFSPROGS_VERSION = 5.10.0 +XFSPROGS_VERSION = 5.14.2 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -XFSPROGS_DEPENDENCIES = inih util-linux +XFSPROGS_DEPENDENCIES = inih liburcu util-linux XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" XFSPROGS_CONF_OPTS = \ -- 2.34.1 From thomas.petazzoni at bootlin.com Fri Jan 7 22:59:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 23:59:59 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107105223.01912574@windsurf> Message-ID: <20220107235959.2638b513@windsurf> Hello James, On Fri, 7 Jan 2022 16:30:12 -0600 James Hilliard wrote: > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > > > How come things are working today with this one? > > I think this is currently set in the cargo config file. Ah, right: [target. at RUSTC_TARGET_NAME@] linker = "@CROSS_PREFIX at gcc" in package/rustc/cargo-config.in > > - Relevance of CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > Set via CARGO_HOME currently, but I think may allow the cargo config to not > be required. I'm no sure why you say this is set via CARGO_HOME? Because the config file is stored in $(CARGO_HOME)/config ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Fri Jan 7 23:10:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 00:10:34 +0100 Subject: [Buildroot] [WIP 1/4] package/python-gast: new host-only package Message-ID: <20220107231037.1380602-1-arnout@mind.be> Generated with scanpypi and converted to host. It is a dependency of python-beniget and python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-gast/python-gast.hash | 5 +++++ package/python-gast/python-gast.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-gast/python-gast.hash create mode 100644 package/python-gast/python-gast.mk diff --git a/package/python-gast/python-gast.hash b/package/python-gast/python-gast.hash new file mode 100644 index 0000000000..f16d001a6a --- /dev/null +++ b/package/python-gast/python-gast.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/gast/json +md5 fdff900805e03e9dd76d377eb4cbaed7 gast-0.5.3.tar.gz +sha256 cfbea25820e653af9c7d1807f659ce0a0a9c64f2439421a7bba4f0983f532dea gast-0.5.3.tar.gz +# Locally computed sha256 checksums +sha256 6a04bbabd9b48bea6bf7c0bd3f3a062e1476b3c403a746448fd69b0d902e148f LICENSE diff --git a/package/python-gast/python-gast.mk b/package/python-gast/python-gast.mk new file mode 100644 index 0000000000..e02e87fb23 --- /dev/null +++ b/package/python-gast/python-gast.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-gast +# +################################################################################ + +PYTHON_GAST_VERSION = 0.5.3 +PYTHON_GAST_SOURCE = gast-$(PYTHON_GAST_VERSION).tar.gz +PYTHON_GAST_SITE = https://files.pythonhosted.org/packages/48/a3/0bd844c54ae8141642088b7ae09dd38fec2ec7faa9b7d25bb6a23c1f266f +PYTHON_GAST_SETUP_TYPE = setuptools +PYTHON_GAST_LICENSE = BSD-3-Clause +PYTHON_GAST_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) -- 2.31.1 From arnout at mind.be Fri Jan 7 23:10:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 00:10:35 +0100 Subject: [Buildroot] [WIP 2/4] package/python-beniget: new host-only package In-Reply-To: <20220107231037.1380602-1-arnout@mind.be> References: <20220107231037.1380602-1-arnout@mind.be> Message-ID: <20220107231037.1380602-2-arnout@mind.be> Generated with scanpypi and converted to host. It is a dependency of python-pythran. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-beniget/python-beniget.hash | 5 +++++ package/python-beniget/python-beniget.mk | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/python-beniget/python-beniget.hash create mode 100644 package/python-beniget/python-beniget.mk diff --git a/package/python-beniget/python-beniget.hash b/package/python-beniget/python-beniget.hash new file mode 100644 index 0000000000..cd4fa7b873 --- /dev/null +++ b/package/python-beniget/python-beniget.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/beniget/json +md5 a2bbe7f17f10f9c127d8ef00692ddc55 beniget-0.4.1.tar.gz +sha256 75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c beniget-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 64ad3e304e9d2d8731c26ac3e652335a6016e38be2f71fe30350be51c6d500b0 LICENSE diff --git a/package/python-beniget/python-beniget.mk b/package/python-beniget/python-beniget.mk new file mode 100644 index 0000000000..9970546b14 --- /dev/null +++ b/package/python-beniget/python-beniget.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-beniget +# +################################################################################ + +PYTHON_BENIGET_VERSION = 0.4.1 +PYTHON_BENIGET_SOURCE = beniget-$(PYTHON_BENIGET_VERSION).tar.gz +PYTHON_BENIGET_SITE = https://files.pythonhosted.org/packages/14/e7/50cbac38f77eca8efd39516be6651fdb9f3c4c0fab8cf2cf05f612578737 +PYTHON_BENIGET_SETUP_TYPE = setuptools +PYTHON_BENIGET_LICENSE = BSD-3-Clause +PYTHON_BENIGET_LICENSE_FILES = LICENSE +HOST_PYTHON_BENIGET_DEPENDENCIES = host-python-gast + +$(eval $(host-python-package)) -- 2.31.1 From arnout at mind.be Fri Jan 7 23:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 00:10:36 +0100 Subject: [Buildroot] [WIP 3/4] package/python-pythran: new host-only package In-Reply-To: <20220107231037.1380602-1-arnout@mind.be> References: <20220107231037.1380602-1-arnout@mind.be> Message-ID: <20220107231037.1380602-3-arnout@mind.be> Generated with scanpypi and converted to host. It is a dependency of python-scipy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pythran/python-pythran.hash | 6 ++++++ package/python-pythran/python-pythran.mk | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 package/python-pythran/python-pythran.hash create mode 100644 package/python-pythran/python-pythran.mk diff --git a/package/python-pythran/python-pythran.hash b/package/python-pythran/python-pythran.hash new file mode 100644 index 0000000000..a24bb4dc4c --- /dev/null +++ b/package/python-pythran/python-pythran.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/pythran/json +md5 e09e90484771937ab499380858bdb18d pythran-0.11.0.tar.gz +sha256 0b2cba712e09f7630879dff69f268460bfe34a6d6000451b47d598558a92a875 pythran-0.11.0.tar.gz +# Locally computed sha256 checksums +sha256 0be9f14c66a9a3cb66d5263a6495437862ce0c9cdf60d4a6c36d1e51b1244c6e LICENSE +sha256 e1c0ed0a99e4462016d79d835f1f479b78c4d4a07fe66598e97f449503ffd178 docs/LICENSE.rst diff --git a/package/python-pythran/python-pythran.mk b/package/python-pythran/python-pythran.mk new file mode 100644 index 0000000000..8234513af3 --- /dev/null +++ b/package/python-pythran/python-pythran.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-pythran +# +################################################################################ + +PYTHON_PYTHRAN_VERSION = 0.11.0 +PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/88/9f/161f08131abf7f23920cee29b691de27f10fd97ac09fb2f3532b3a7f9b96 +PYTHON_PYTHRAN_SETUP_TYPE = setuptools +PYTHON_PYTHRAN_LICENSE = BSD-3-Clause +PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst +HOST_PYTHON_PYTHRAN_DEPENDENCIES = \ + host-python-beniget \ + host-python-gast \ + host-python-numpy \ + host-python-ply + +$(eval $(host-python-package)) -- 2.31.1 From arnout at mind.be Fri Jan 7 23:10:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 00:10:37 +0100 Subject: [Buildroot] [WIP 4/4] package/python-scipy: new package In-Reply-To: <20220107231037.1380602-1-arnout@mind.be> References: <20220107231037.1380602-1-arnout@mind.be> Message-ID: <20220107231037.1380602-4-arnout@mind.be> From: Jagan Teki Signed-off-by: Jagan Teki [Arnout: - Indent hash file with two spaces. - Bump to 1.7.3 to fix build failure with recent GCC. - Get from github instead of PyPI. - Add host-meson and host-python-pythran dependencies. - Properly propagate Config.in dependencies. - Correct usage of BR2_INSTALL_LIBSTDCPP symbol. - Remove F77, no longer used. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- This is v9 but changed so much that it warrants starting anew :-) The build still fails in several ways that are due to broken cross-compilation. A few examples: compile options: '-c' extra options: '-march=native' CCompilerOpt.dist_test[581] : CCompilerOpt._dist_test_spawn[716] : Command (.../host/bin/aarch64-linux-gcc -Wno-unused-result -Wsign-compare -DNDEBUG ... -fPIC -c .../host/lib/python3.10/site-packages/numpy/distutils/checks/test_flags.c -o /tmp/.../distutils/checks/test_flags.o -MMD -MF /tmp/.../numpy/distutils/checks/test_flags.o.d -march=native) failed with exit status 1 output -> cc1: error: unknown value ?native? for ?-march? (more errors like this when trying to use SSE flags on ARM) compile options: '-I.../host/lib/python3.10/site-packages/numpy/core/include -Ibuild/src.linux-x86_64-3.10/numpy/distutils/include -c (i.e. using host includes for target build) --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/python-scipy/Config.in | 29 ++++++++++++++ package/python-scipy/python-scipy.hash | 9 +++++ package/python-scipy/python-scipy.mk | 52 ++++++++++++++++++++++++++ 5 files changed, 94 insertions(+) create mode 100644 package/python-scipy/Config.in create mode 100644 package/python-scipy/python-scipy.hash create mode 100644 package/python-scipy/python-scipy.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7874677f7e..51bdb6c857 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1123,6 +1123,7 @@ F: package/libxcrypt/ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ +F: package/python-scipy/ F: package/reaver/ F: support/testing/tests/package/br2-external/python-pybind F: support/testing/tests/package/sample_python_pybind.py @@ -1250,6 +1251,8 @@ F: configs/orangepi_win_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig +F: package/python-pybind/ +F: package/python-scipy/ N: James Hilliard F: package/apcupsd/ diff --git a/package/Config.in b/package/Config.in index 3a0cc0c585..ad706a3587 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1213,6 +1213,7 @@ menu "External python modules" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" source "package/python-schedule/Config.in" + source "package/python-scipy/Config.in" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" source "package/python-see/Config.in" diff --git a/package/python-scipy/Config.in b/package/python-scipy/Config.in new file mode 100644 index 0000000000..98d02b28a8 --- /dev/null +++ b/package/python-scipy/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_PYTHON_SCIPY + bool "python-scipy" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # openblas + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS # lapack + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_HAS_FORTRAN # lapack + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_LAPACK + select BR2_PACKAGE_OPENBLAS + select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PYBIND + help + The SciPy library is one of the core packages that make up the + SciPy stack. It provides many user-friendly and efficient + numerical routines such as routines for numerical integration, + interpolation, optimization, linear algebra and statistics. + + https://www.scipy.org/scipylib/ + +comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \ + !BR2_INSTALL_LIBSTDCPP || \ + (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash new file mode 100644 index 0000000000..ef9a24e05d --- /dev/null +++ b/package/python-scipy/python-scipy.hash @@ -0,0 +1,9 @@ +# Locally generated +sha256 4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694 scipy-1.7.3.tar.xz +sha256 5cbdbe33385779958be8b9310497e32d2eec144d82ef425780d3e19f8af6de76 LICENSE.txt +sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE +sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt +sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE +sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/dsolve/SuperLU/License.txt +sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING +sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb scipy/spatial/qhull_src/COPYING.txt diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk new file mode 100644 index 0000000000..cadc58f6a9 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# python-scipy +# +################################################################################ + +PYTHON_SCIPY_VERSION = 1.7.3 +PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.xz +PYTHON_SCIPY_SITE = https://github.com/scipy/scipy/releases/download/v$(PYTHON_SCIPY_VERSION) +PYTHON_SCIPY_LICENSE = \ + BSD-3-Clause, \ + BSD-2-Clause, \ + BSD, \ + BSD-Style, \ + Apache-2.0, \ + MIT +PYTHON_SCIPY_LICENSE_FILES = \ + LICENSE.txt \ + scipy/linalg/src/lapack_deprecations/LICENSE \ + scipy/ndimage/LICENSE.txt \ + scipy/optimize/tnc/LICENSE \ + scipy/sparse/linalg/dsolve/SuperLU/License.txt \ + scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING \ + scipy/spatial/qhull_src/COPYING.txt +PYTHON_SCIPY_DEPENDENCIES += \ + host-meson \ + host-python-numpy \ + host-python-pythran \ + lapack \ + openblas \ + python-numpy \ + python-pybind +PYTHON_SCIPY_INSTALL_STAGING = YES + +PYTHON_SCIPY_SETUP_TYPE = setuptools +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH) \ + LDFLAGS="$(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib" + +# Provide system configuration options to numpy distutils extenions, telling +# to find all include files and libraries in staging directory. +define PYTHON_SCIPY_CONFIGURE_CMDS + -rm -f $(@D)/site.cfg + echo "[DEFAULT]" >> $(@D)/site.cfg + echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(@D)/site.cfg + echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg +endef + +$(eval $(python-package)) -- 2.31.1 From thomas.petazzoni at bootlin.com Fri Jan 7 23:10:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 00:10:47 +0100 Subject: [Buildroot] [PATCH v3] package/cryptopp: add a target build configuration In-Reply-To: <20200728095346.2103418-1-kamel.bouhara@bootlin.com> References: <20200728095346.2103418-1-kamel.bouhara@bootlin.com> Message-ID: <20220108001047.79e8bc24@windsurf> Hello Kamel, I finally applied, but with a good number of changes, see below. On Tue, 28 Jul 2020 11:53:46 +0200 Kamel Bouhara wrote: > diff --git a/package/cryptopp/0001-Add-fully-qualified-SONAME-to-shared-object-for-Linu.patch b/package/cryptopp/0001-Add-fully-qualified-SONAME-to-shared-object-for-Linu.patch > new file mode 100644 > index 0000000000..11f3090767 > --- /dev/null > +++ b/package/cryptopp/0001-Add-fully-qualified-SONAME-to-shared-object-for-Linu.patch > @@ -0,0 +1,30 @@ > +From 78eb43f50978ffd780cf31b1cea6736dadc6b155 Mon Sep 17 00:00:00 2001 > +From: Kamel Bouhara > +Date: Mon, 6 Jul 2020 17:10:55 +0200 > +Subject: [PATCH] Add fully-qualified SONAME to shared object for Linux That's not really what the patch does. What it does is create a symlink that matches with the SONAME of the library. The question is: how was it working before. Answer: because of the ldconfig call that creates such symlinks. But of course, we don't call ldconfig when cross-compiling, hence the need for your change. So, I improved the commit log, also changed the GNUmakefile-cross file, and submitted that upstream: https://github.com/weidai11/cryptopp/pull/1101 > define HOST_CRYPTOPP_INSTALL_CMDS > - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-lib > + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(HOST_DIR)" LDCONFIG=/bin/true install-lib These are unrelated changes, so I dropped them. > endef > > +define CRYPTOPP_EXTRACT_CMDS > + $(UNZIP) $(CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) > +endef > + > +CRYPTOPP_CXXFLAGS = $(TARGET_CFLAGS) -fPIC > + > +CRYPTOPP_MAKE_OPTS = \ > + $(TARGET_CONFIGURE_OPTS) \ > + CXXFLAGS="$(CRYPTOPP_CXXFLAGS)" You were missing the logic to handle gcc < 4.9 that exists for the host package, and that we also need for the target package. > + > +define CRYPTOPP_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CRYPTOPP_MAKE_OPTS) shared > +endef > + > +define CRYPTOPP_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true install-lib PREFIX=$(TARGET_DIR) is wrong. It should have been PREFIX=/usr DESTDIR=$(TARGET_DIR) > +endef > + > +define CRYPTOPP_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" libcryptopp.pc Building the libcryptopp.pc file is really a build step, so I moved this to the build step. > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" LDCONFIG=/bin/true install-lib Same as above, PREFIX=$(STAGING_DIR) is wrong, it should be PREFIX=/usr DESTDIR=$(STAGING_DIR) Applied with those changes. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Fri Jan 7 23:12:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 00:12:06 +0100 Subject: [Buildroot] [PATCH v8 5/5] package/python-scipy: new package In-Reply-To: <20200407111515.21131-6-jagan@amarulasolutions.com> References: <20200407111515.21131-1-jagan@amarulasolutions.com> <20200407111515.21131-6-jagan@amarulasolutions.com> Message-ID: <42fd555a-d9bc-c8be-8738-8bbdebf22497@mind.be> On 07/04/2020 13:15, Jagan Teki wrote: > Add python-scipy with 1.4.1 release version. > > Signed-off-by: Jagan Teki After merging the python-pybind changes, I tried to merge scipy as well. I made a bunch of fixes, updated the version, but unfortunately it still doesn't build due to cross-compilation issues. So I've sent a WIP version of the series and marked this one as superseded. I'll mark the WIP version as Changes Requested as well, since it doesn't work. Regards, Arnout > --- > Changes for v8: > - none > Changes for v7: > - update the commit message > - fix sha256 value of pybind11 LICENCE > > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-scipy/Config.in | 22 ++++++++++++ > package/python-scipy/python-scipy.hash | 9 +++++ > package/python-scipy/python-scipy.mk | 46 ++++++++++++++++++++++++++ > 5 files changed, 79 insertions(+) > create mode 100644 package/python-scipy/Config.in > create mode 100644 package/python-scipy/python-scipy.hash > create mode 100644 package/python-scipy/python-scipy.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index f06d54a662..3203b0bc47 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1154,6 +1154,7 @@ F: configs/orangepi_zero_plus2_defconfig > F: configs/pine64_defconfig > F: configs/pine64_sopine_defconfig > F: package/python-pybind11 > +F: package/python-scipy > > N: James Hilliard > F: package/gensio/ > diff --git a/package/Config.in b/package/Config.in > index afe32f52b4..f5af9b07ea 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1120,6 +1120,7 @@ menu "External python modules" > source "package/python-scandir/Config.in" > source "package/python-scapy/Config.in" > source "package/python-schedule/Config.in" > + source "package/python-scipy/Config.in" > source "package/python-sdnotify/Config.in" > source "package/python-secretstorage/Config.in" > source "package/python-see/Config.in" > diff --git a/package/python-scipy/Config.in b/package/python-scipy/Config.in > new file mode 100644 > index 0000000000..4d8227c31a > --- /dev/null > +++ b/package/python-scipy/Config.in > @@ -0,0 +1,22 @@ > +config BR2_PACKAGE_PYTHON_SCIPY > + bool "python-scipy" > + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy > + depends on BR2_TOOLCHAIN_HAS_FORTRAN > + depends on BR2_TOOLCHAIN_BUILDROOT_CXX > + depends on BR2_PACKAGE_PYTHON3 > + select BR2_PACKAGE_PYTHON_NUMPY > + select BR2_PACKAGE_LAPACK > + select BR2_PACKAGE_OPENBLAS > + help > + The SciPy library is one of the core packages that make up the SciPy > + stack. It provides many user-friendly and efficient numerical > + routines such as routines for numerical integration, interpolation, > + optimization, linear algebra and statistics. > + > + https://www.scipy.org/scipylib/ > + > +comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl" > + depends on BR2_PACKAGE_PYTHON3 > + depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \ > + !BR2_TOOLCHAIN_BUILDROOT_CXX || \ > + (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL) > diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash > new file mode 100644 > index 0000000000..c9d295ef6b > --- /dev/null > +++ b/package/python-scipy/python-scipy.hash > @@ -0,0 +1,9 @@ > +# Locally generated > +sha256 dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59 scipy-1.4.1.tar.gz > +sha256 5cbdbe33385779958be8b9310497e32d2eec144d82ef425780d3e19f8af6de76 LICENSE.txt > +sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE > +sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt > +sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE > +sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/dsolve/SuperLU/License.txt > +sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING > +sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb scipy/spatial/qhull_src/COPYING.txt > diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk > new file mode 100644 > index 0000000000..1d66b146ec > --- /dev/null > +++ b/package/python-scipy/python-scipy.mk > @@ -0,0 +1,46 @@ > +################################################################################ > +# > +# python-scipy > +# > +################################################################################ > + > +PYTHON_SCIPY_VERSION = 1.4.1 > +PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz > +PYTHON_SCIPY_SITE = https://pypi.python.org/packages/04/ab/e2eb3e3f90b9363040a3d885ccc5c79fe20c5b8a3caa8fe3bf47ff653260 > +PYTHON_SCIPY_LICENSE = BSD-3-Clause, BSD-2-Clause, BSD, BSD-Style, \ > + Apache-2.0, MIT > +PYTHON_SCIPY_LICENSE_FILES = \ > + LICENSE.txt \ > + scipy/linalg/src/lapack_deprecations/LICENSE \ > + scipy/ndimage/LICENSE.txt \ > + scipy/optimize/tnc/LICENSE \ > + scipy/sparse/linalg/dsolve/SuperLU/License.txt \ > + scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING \ > + scipy/spatial/qhull_src/COPYING.txt > +PYTHON_SCIPY_SETUP_TYPE = setuptools > +PYTHON_SCIPY_DEPENDENCIES += \ > + host-python-numpy \ > + host-python-pybind11 \ > + lapack \ > + openblas \ > + python-numpy > + > +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 > +PYTHON_SCIPY_ENV += F90=$(TARGET_CROSS)gfortran F77=$(TARGET_CROSS)gfortran > + > +# Provide system configuration options to numpy distutils extenions, telling > +# to find all include files and libraries in staging directory. > +define PYTHON_SCIPY_CONFIGURE_CMDS > + -rm -f $(@D)/site.cfg > + echo "[DEFAULT]" >> $(@D)/site.cfg > + echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(@D)/site.cfg > + echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg > +endef > + > +# Use the target numpy pkg-config configuration files modified for target > +# cross-compilation. Without this, numpy distutils will cause the linker to > +# link with host libnpymath.a. > +PYTHON_SCIPY_ENV += NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH) > +PYTHON_SCIPY_INSTALL_STAGING = YES > + > +$(eval $(python-package)) > From thomas.petazzoni at bootlin.com Fri Jan 7 23:12:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 00:12:52 +0100 Subject: [Buildroot] [PATCH] package/python-numpy: simplify PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES Message-ID: <20220107231253.1546336-1-thomas.petazzoni@bootlin.com> The PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES macro was introduced in commit 2426002d6fc81d0b023e3f3b3ee4e94ab29438cb ("package/python-numpy: fixup npymath.ini for numpy extensions"). However, it turns out that by using $(PYTHON3_PATH), we can simplify the intermediate variables, to the point where they are no longer needed. Not having the intermediate variables makes the logic a bit easier to understand. Also, the logic is changed to use a single sed expression, which we pass to $(SED). Signed-off-by: Thomas Petazzoni --- package/python-numpy/python-numpy.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index f367b556ef..9e8b032b78 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -40,12 +40,9 @@ endef # it uses host libraries (like libnpymath.a). # So, the numpy distutils extension packages would explicitly link this # config path for their package environment. -PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy -PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES - sed -e '/^pkgdir=/d' \ - -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ - -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini + $(SED) '/^pkgdir=/d;/^prefix=/i pkgdir=$(PYTHON3_PATH)/site-packages/numpy/core' \ + $(PYTHON3_PATH)/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini endef PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 7 23:13:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 00:13:54 +0100 Subject: [Buildroot] [git commit] configs/imx6-sabresd: bump U-Boot and kernel Message-ID: <20220107230754.A5FB6834E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b7d2989db6a1347107235acb487f8660dfcd733 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump U-Boot to 2021.10 and kernel to 5.15.12 version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6-sabresd_defconfig | 9 +++++---- configs/imx6-sabresd_qt5_defconfig | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 5a39f333d1..19986f2cbb 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,15 +24,16 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 1330b5cfbf..38a86131dd 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,15 +30,16 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" From thomas.petazzoni at bootlin.com Fri Jan 7 22:28:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 7 Jan 2022 23:28:05 +0100 Subject: [Buildroot] [git commit] package/cryptopp: add a target variant Message-ID: <20220107230754.9ECE38349A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf4cf9de833e2d571d98d1ca935ea08a3468e463 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master So far, cryptopp only had a host variant, but some use-cases require this library on the target, so this adjusts the cryptopp package accordingly. One patch (submitted upstream) is needed to have the proper symlink corresponding to the SONAME of the shared library. Signed-off-by: Kamel Bouhara Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...kefile-add-missing-shared-library-symlink.patch | 62 ++++++++++++++++++++++ package/cryptopp/Config.in | 8 +++ package/cryptopp/cryptopp.mk | 31 +++++++++++ 4 files changed, 102 insertions(+) diff --git a/package/Config.in b/package/Config.in index 3a0cc0c585..b424d20de4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1397,6 +1397,7 @@ menu "Crypto" source "package/botan/Config.in" source "package/ca-certificates/Config.in" source "package/cryptodev/Config.in" + source "package/cryptopp/Config.in" source "package/gcr/Config.in" source "package/gnutls/Config.in" source "package/libargon2/Config.in" diff --git a/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch b/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch new file mode 100644 index 0000000000..5f87414d53 --- /dev/null +++ b/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch @@ -0,0 +1,62 @@ +From e4c2e3bc8174f24cf63923619f5d06d85b84ae1d Mon Sep 17 00:00:00 2001 +From: Kamel Bouhara +Date: Fri, 7 Jan 2022 22:59:23 +0100 +Subject: [PATCH] GNUmakefile: add missing shared library symlink + +The GNUmakefile install-lib target currently installs the following +symlink: + + libcryptopp.so -> libcryptopp.so.8.6.0 + +However, it does not create the following symlink: + + libcryptopp.so.8 -> libcryptopp.so.8.6.0 + +This symlink is necessary at runtime because libcryptopp.so.8 is the +SONAME of the cryptopp library, and therefore this is what the dynamic +loader will search when starting a program that is linked against +cryptopp. + +For native compilation, the 'ldconfig' invocation that immediately +follows will create that symlink, so everything works. + +For cross-compilation however, ldconfig can't be used, and therefore +LDCONFIG is passed as /bin/true, and therefore it doesn't create the +symlink. So instead, create it directly inside the GNUmakefile, +without relying on ldconfig. + +Upstream: https://github.com/weidai11/cryptopp/pull/1101 +Signed-off-by: Kamel Bouhara +Signed-off-by: Thomas Petazzoni +--- + GNUmakefile | 1 + + GNUmakefile-cross | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/GNUmakefile b/GNUmakefile +index 23273edb..3b55e420 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -1412,6 +1412,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) + $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) + ifeq ($(HAS_SOLIB_VERSION),1) + -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so ++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + $(LDCONF) $(DESTDIR)$(LIBDIR) + endif + endif +diff --git a/GNUmakefile-cross b/GNUmakefile-cross +index 9847f04b..a2b87e4a 100644 +--- a/GNUmakefile-cross ++++ b/GNUmakefile-cross +@@ -856,6 +856,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) + $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) + ifeq ($(HAS_SOLIB_VERSION),1) + -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so ++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + $(LDCONF) $(DESTDIR)$(LIBDIR) + endif + endif +-- +2.33.1 + diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in new file mode 100644 index 0000000000..4ead5339ab --- /dev/null +++ b/package/cryptopp/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CRYPTOPP + bool "cryptopp" + depends on !BR2_STATIC_LIBS + help + A free C++ class library of cryptographic schemes + +comment "cryptopp needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 6711a37fbc..5e6eb9644d 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -36,4 +36,35 @@ define HOST_CRYPTOPP_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-lib endef +define CRYPTOPP_EXTRACT_CMDS + $(UNZIP) $(CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) +endef + +CRYPTOPP_CXXFLAGS = $(TARGET_CXXFLAGS) -fPIC + +# _mm256_broadcastsi128_si256 has been added only in gcc 4.9 +ifneq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_AVX2 +endif + +CRYPTOPP_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(CRYPTOPP_CXXFLAGS)" + +define CRYPTOPP_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CRYPTOPP_MAKE_OPTS) \ + PREFIX=/usr shared libcryptopp.pc +endef + +define CRYPTOPP_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) \ + LDCONFIG=/bin/true install-lib +endef + +define CRYPTOPP_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) \ + LDCONFIG=/bin/true install-lib +endef + +$(eval $(generic-package)) $(eval $(host-generic-package)) From thomas.petazzoni at bootlin.com Fri Jan 7 23:14:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 00:14:17 +0100 Subject: [Buildroot] [PATCH v2] configs/imx6-sabresd: Bump U-Boot and kernel In-Reply-To: <20220104203242.1175845-1-festevam@gmail.com> References: <20220104203242.1175845-1-festevam@gmail.com> Message-ID: <20220108001417.5c140682@windsurf> On Tue, 4 Jan 2022 17:32:42 -0300 Fabio Estevam wrote: > Bump U-Boot to 2021.10 and kernel to 5.15.12 version. > > Signed-off-by: Fabio Estevam > --- > Changes since v1: > - Also select BR2_TARGET_UBOOT_NEEDS_OPENSSL=y as a requirement for > U-Boot 2021.10. Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Fri Jan 7 23:24:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 00:24:31 +0100 Subject: [Buildroot] [PATCH 1/3] package/libks: new package In-Reply-To: <20211106111145.1648068-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 6 Nov 2021 12:11:43 +0100") References: <20211106111145.1648068-1-bernd.kuhls@t-online.de> Message-ID: <87k0fbjfio.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Needed to bump freeswitch to 1.10.7. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 23:24:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 00:24:40 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/sofia-sip: bump version to 1.13.6 In-Reply-To: <20211106111145.1648068-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 6 Nov 2021 12:11:44 +0100") References: <20211106111145.1648068-1-bernd.kuhls@t-online.de> <20211106111145.1648068-2-bernd.kuhls@t-online.de> Message-ID: <87fspzjfif.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Needed to bump freeswitch to 1.10.7. > Signed-off-by: Bernd Kuhls > --- > v2: no changes, added libks to v2 of this patch series Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 23:26:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 00:26:07 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/freeswitch: bump version to 1.10.7 In-Reply-To: <20211106111145.1648068-3-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 6 Nov 2021 12:11:45 +0100") References: <20211106111145.1648068-1-bernd.kuhls@t-online.de> <20211106111145.1648068-3-bernd.kuhls@t-online.de> Message-ID: <87bl0njfg0.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 > Removed patch, upstream applied a different fix: > https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b > Added optional dependency to libks, needed due to upstream commit > https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 > Added upstream patches to fix build errors. > Signed-off-by: Bernd Kuhls > --- > v2: no changes, added libks to v2 of this patch series This series was marked as superseeded in patchwork, but I applied it anyway as freeswitch 1.10.7 fixes a number of fairly serious security issues. Was there any specific reason why this was marked as superseeded? Updated the commit message to mention the security fixes and applied, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 7 23:26:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 00:26:20 +0100 Subject: [Buildroot] [git commit] package/libks: new package Message-ID: <20220107232021.F002C8225C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5752d18bfcdb060c9d3b8c13330344cbdee74b75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Needed to bump freeswitch to 1.10.7. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/libks/Config.in | 16 ++++++++++++++++ package/libks/libks.hash | 3 +++ package/libks/libks.mk | 14 ++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7874677f7e..25b6a56dc0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -371,6 +371,7 @@ F: package/libglfw/ F: package/libglu/ F: package/libhdhomerun/ F: package/libilbc/ +F: package/libks/ F: package/libldns/ F: package/libmicrohttpd/ F: package/libminiupnpc/ diff --git a/package/Config.in b/package/Config.in index b424d20de4..5afd7131fe 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1977,6 +1977,7 @@ menu "Other" source "package/libglob/Config.in" source "package/libical/Config.in" source "package/libite/Config.in" + source "package/libks/Config.in" source "package/liblinear/Config.in" source "package/libloki/Config.in" source "package/libnpth/Config.in" diff --git a/package/libks/Config.in b/package/libks/Config.in new file mode 100644 index 0000000000..366b5bda71 --- /dev/null +++ b/package/libks/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LIBKS + bool "libks" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Foundational support for signalwire C products + + https://github.com/signalwire/libks + +comment "libks needs a toolchain w/ C++, threads, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libks/libks.hash b/package/libks/libks.hash new file mode 100644 index 0000000000..5acbcd1ea6 --- /dev/null +++ b/package/libks/libks.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69 libks-1.7.0.tar.gz +sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk new file mode 100644 index 0000000000..adf0107b30 --- /dev/null +++ b/package/libks/libks.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libks +# +################################################################################ + +LIBKS_VERSION = 1.7.0 +LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) +LIBKS_LICENSE = MIT +LIBKS_LICENSE_FILES = copyright +LIBKS_INSTALL_STAGING = YES +LIBKS_DEPENDENCIES = openssl util-linux + +$(eval $(cmake-package)) From peter at korsgaard.com Fri Jan 7 23:26:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 00:26:21 +0100 Subject: [Buildroot] [git commit] package/sofia-sip: bump version to 1.13.6 Message-ID: <20220107232022.04480834E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30b2dbeae3930084634e126ead4e1e2930a58bad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Needed to bump freeswitch to 1.10.7. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 0484cc1501..6f6ff6d052 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.tar.gz +sha256 d39a3287038f1c9a747c1abc94a1379a726a9dfaf969285f955141883f7b810f sofia-sip-1.13.6-4152840260.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index fb565637eb..2bac480542 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.3-8071e8accd -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs +SOFIA_SIP_VERSION = 1.13.6-4152840260 +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Fri Jan 7 23:26:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 00:26:21 +0100 Subject: [Buildroot] [git commit] package/freeswitch: security bump version to 1.10.7 Message-ID: <20220107232022.0E707834E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=829777c1c9a0d40c8c5753e6fe86acfc78edfc92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: - CVE-2021-41105: FreeSWITCH susceptible to Denial of Service via invalid SRTP packets When handling SRTP calls, FreeSWITCH is susceptible to a DoS where calls can be terminated by remote attackers. This attack can be done continuously, thus denying encrypted calls during the attack. https://github.com/signalwire/freeswitch/security/advisories/GHSA-jh42-prph-gp36 - CVE-2021-41157: FreeSWITCH does not authenticate SIP SUBSCRIBE requests by default By default, SIP requests of the type SUBSCRIBE are not authenticated in the affected versions of FreeSWITCH. https://github.com/signalwire/freeswitch/security/advisories/GHSA-g7xg-7c54-rmpj - CVE-2021-37624: FreeSWITCH does not authenticate SIP MESSAGE requests, leading to spam and message spoofing By default, SIP requests of the type MESSAGE (RFC 3428) are not authenticated in the affected versions of FreeSWITCH. MESSAGE requests are relayed to SIP user agents registered with the FreeSWITCH server without requiring any authentication. Although this behaviour can be changed by setting the auth-messages parameter to true, it is not the default setting. https://github.com/signalwire/freeswitch/security/advisories/GHSA-mjcm-q9h8-9xv3 - CVE-2021-41145: FreeSWITCH susceptible to Denial of Service via SIP flooding When flooding FreeSWITCH with SIP messages, it was observed that after a number of seconds the process was killed by the operating system due to memory exhaustion https://github.com/signalwire/freeswitch/security/advisories/GHSA-jvpq-23v4-gp3m - CVE-2021-41158: FreeSWITCH vulnerable to SIP digest leak for configured gateways An attacker can perform a SIP digest leak attack against FreeSWITCH and receive the challenge response of a gateway configured on the FreeSWITCH server. This is done by challenging FreeSWITCH's SIP requests with the realm set to that of the gateway, thus forcing FreeSWITCH to respond with the challenge response which is based on the password of that targeted gateway. https://github.com/signalwire/freeswitch/security/advisories/GHSA-3v3f-99mv-qvj4 Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 Removed patch, upstream applied a different fix: https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b Added optional dependency to libks, needed due to upstream commit https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 Added upstream patches to fix build errors. Signed-off-by: Bernd Kuhls [Peter: mention security fixes] Signed-off-by: Peter Korsgaard --- ...-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch | 26 +++++ ...lications-mod_cv-mod_cv.cpp-fix-build-wit.patch | 44 ------- .../freeswitch/0002-core-fix--disable-libyuv.patch | 129 +++++++++++++++++++++ package/freeswitch/freeswitch.hash | 4 +- package/freeswitch/freeswitch.mk | 8 +- 5 files changed, 163 insertions(+), 48 deletions(-) diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch new file mode 100644 index 0000000000..57f6e660c1 --- /dev/null +++ b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch @@ -0,0 +1,26 @@ +From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 +From: Dragos Oancea +Date: Tue, 26 Oct 2021 08:42:58 +0000 +Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac + +Signed-off-by: Bernd Kuhls +--- + src/switch_rtp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/switch_rtp.c b/src/switch_rtp.c +index 1880bbb19c..843ee81381 100644 +--- a/src/switch_rtp.c ++++ b/src/switch_rtp.c +@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); + snprintf(header, sizeof(header), "Source-Lost"); + #if SWITCH_BYTE_ORDER == __BIG_ENDIAN +- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ ++ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ + #else + tmpLost = ntohl(rtcp_report_block->lost)>>8; + tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch b/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch deleted file mode 100644 index cd0a3ab4c2..0000000000 --- a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Oct 2020 23:06:36 +0200 -Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv - 3.4.9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use cvScalar instead of CV_RGB to avoid the following build failure with -opencv 3.4.9: - -mod_cv.cpp:693:24: error: conversion from ???cv::Scalar {aka cv::Scalar_}??? to non-scalar type ???CvScalar??? requested - CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); - ^ - -Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since -version 3.4.2 and -https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f - -It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/signalwire/freeswitch/pull/914] ---- - src/mod/applications/mod_cv/mod_cv.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp -index 582f925abf..bbec755e91 100644 ---- a/src/mod/applications/mod_cv/mod_cv.cpp -+++ b/src/mod/applications/mod_cv/mod_cv.cpp -@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context) - //printf("WTF %d\n", object_neighbors); - //cout << "Detected " << object_neighbors << " object neighbors" << endl; - const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors); -- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); -+ CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0); - rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1); - - parse_stats(&context->nestDetected, nestedObjects.size(), context->skip); --- -2.28.0 - diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch new file mode 100644 index 0000000000..137cb27cf8 --- /dev/null +++ b/package/freeswitch/0002-core-fix--disable-libyuv.patch @@ -0,0 +1,129 @@ +From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 +From: Sebastian Kemper +Date: Mon, 1 Nov 2021 09:59:09 +0100 +Subject: [PATCH] [core] fix "--disable-libyuv" + +Recent changes made it impossible to compile freeswitch without libyuv +support. + +src/switch_core_video.c: In function 'switch_img_read_from_file': +src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] +RAWToI420(data, width * 3, +^ +src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] +ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); +^ + +Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 + +Signed-off-by: Bernd Kuhls +Signed-off-by: Sebastian Kemper +--- + src/switch_core_video.c | 12 ++++++++++++ + tests/unit/switch_core_video.c | 4 ++++ + 2 files changed, 16 insertions(+) + +diff --git a/src/switch_core_video.c b/src/switch_core_video.c +index 7dbd685d6ee..0d377f9c3e4 100644 +--- a/src/switch_core_video.c ++++ b/src/switch_core_video.c +@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha + + SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) + { ++#ifdef SWITCH_HAVE_YUV + int width = 0, height = 0, channels = 0; + int comp = STBI_rgb; + unsigned char *data = NULL; +@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name + } else if (data) { + stbi_image_free(data); + } ++#endif + + return NULL; + } + + SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + const char *ext = strrchr(file_name, '.'); +@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co + free(data); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif + } + + typedef struct data_url_context_s { +@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { + char **urlP; + } data_url_context_t; + ++#ifdef SWITCH_HAVE_YUV + static void data_url_write_func(void *context, void *data, int size) + { + switch_buffer_t *buffer = (switch_buffer_t *)context; + switch_buffer_write(buffer, data, size); + } ++#endif + + SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + int stride_in_bytes = 0; +@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** + switch_buffer_destroy(&buffer); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif /* SWITCH_HAVE_YUV */ + } + + +diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c +index 27c96102929..e395db474d5 100644 +--- a/tests/unit/switch_core_video.c ++++ b/tests/unit/switch_core_video.c +@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEARDOWN_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(data_url_test) + { + char *data_url = NULL; +@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") + unlink(argb_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + + FST_TEST_BEGIN(img_patch) + { +@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEST_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(stb_data_url) + { + switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); +@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") + unlink(jpg_write_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + } + FST_SUITE_END() + } diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index dc5a67980f..8066c620c4 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 -sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 +sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 944867cc75..c576e5f267 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.6 +FREESWITCH_VERSION = 1.10.7 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -120,7 +120,6 @@ FREESWITCH_ENABLED_MODULES += \ endpoints/mod_rtc \ endpoints/mod_rtmp \ endpoints/mod_sofia \ - endpoints/mod_verto \ event_handlers/mod_cdr_csv \ event_handlers/mod_cdr_sqlite \ event_handlers/mod_event_socket \ @@ -209,6 +208,11 @@ FREESWITCH_DEPENDENCIES += libilbc FREESWITCH_ENABLED_MODULES += codecs/mod_ilbc endif +ifeq ($(BR2_PACKAGE_LIBKS),y) +FREESWITCH_DEPENDENCIES += libks +FREESWITCH_ENABLED_MODULES += endpoints/mod_verto +endif + ifeq ($(BR2_PACKAGE_LIBLDNS),y) FREESWITCH_DEPENDENCIES += libldns FREESWITCH_ENABLED_MODULES += applications/mod_enum From jesse_dev at fastmail.com Sat Jan 8 00:07:11 2022 From: jesse_dev at fastmail.com (Jesse Millwood) Date: Fri, 07 Jan 2022 19:07:11 -0500 Subject: [Buildroot] Overriding Kconfig Values from external br2 In-Reply-To: <4d73992c-3189-1989-525c-4506495c90ac@mind.be> References: <37282adb-8559-4124-874d-c1729bd3ce01@www.fastmail.com> <09340549-99c9-b79c-17db-3967b1ab6335@mind.be> <4d73992c-3189-1989-525c-4506495c90ac@mind.be> Message-ID: <99fefbe8119003202a02e7696a98711c71bd30c7.camel@fastmail.com> On Thu, 2022-01-06 at 18:09 +0100, Arnout Vandecappelle wrote: > > > On 06/01/2022 16:37, Jesse Millwood wrote: > > On Thu, 2022-01-06 at 10:45 +0100, Arnout Vandecappelle wrote: > > > > > > > > > On 05/01/2022 20:03, Jesse Millwood wrote: > > > > Hello, > > > > > > > > I have an external C/C++ toolchain that I've put together that > > > > uses > > > > MUSL. I've > > > > also built an external Rust toolchain that uses my MUSL > > > > toolchain. > > > > > > > > My issue is that there is a Rust Kconfig variable that > > > > specifies if > > > > a specific > > > > architecture supports Rust. > > > > > > > > The Kconfig variable in question is > > > > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > > > > in package/rustc/Config.in.host. > > > > > > [snip] > > > > > > > You may notice that I changed the libc depends line to be or'd > > > > with > > > > BR2_TOOLCHAIN_USES_MUSL. It seems that this does not get > > > > considered > > > > when I > > > > choose my external musl toolchain option. In the menuconfig > > > > when I > > > > search for > > > > the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS variable with > > > > the > > > > "/" key it > > > > looks like it is only getting it from the original file. Does > > > > buildroot have a > > > > mechanism for overwriting this kind of setting and if not, does > > > > anyone have an > > > > idea of how I would accomplish what I am trying to do (make > > > > buildroot honor my > > > > external rust toolchain)? > > > > > > ?? No, there's no way to override the dependencies of an existing > > > Config.in > > > symbol in an external. > > > > > > ?? However, this was corrected in upstream Buildroot in commit > > > d69d40c029dc7d8199b745eaee759d92b66c5d17. So you can try to > > > backport > > > that commit > > > instead, or just update Buildroot to something more recent. > > > > Arnout, thanks for the pointer to the commit. That is a logical way > > to > > support other platforms. However, I have a powerpc musl rust > > toolchain > > that I've built externally. > > > > With the changes in that commit can I set > > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS to "y" in my external > > now > > ? Ah, no, you're right, powerpc-unknown-linux-musl is a Tier 3 > platform and that > patch only adds Tier 1 and 2. We could add a Tier 3 option as well > (and disable > the rust-bin option in that case). > > ? Note however that the stdlib status for this target is marked as > "?" on [1], > so I'm not sure it's ever going to work... > I have it working actually. I had to patch my crosstool-ng toolchain to add an extra default macro so that libunwind builds. > > > that there is no depends expressions and it is all default logic? > > Or > > would I have to still add another expression that maybe defaults to > > "y" > > if a new variable is true like > > "BR2_EXTERNAL_RUSTC_TARGET_ARCH_SUPPORTS" that is defined in my > > external? > > ? No, that's not going to work. > > ? I think you can make a hack: add "select > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS" to your > BR2_TOOLCHAIN_EXTERNAL_MY_MUSL definition. I think that works. > > ? Regards, > ? Arnout > Thanks! I had to update some names of some things but I updated my buildroot repo and was able to use the select method to enable BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS. > > > > > Thanks, > > Jesse > > > > > > > > ?? Regards, > > > ?? Arnout > > > > > > > > > > > > > > Thanks, > > > > Jesse > > > > > > > > _______________________________________________ > > > > buildroot mailing list > > > > buildroot at buildroot.org > > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From alistair23 at gmail.com Sat Jan 8 00:23:15 2022 From: alistair23 at gmail.com (Alistair Francis) Date: Sat, 8 Jan 2022 10:23:15 +1000 Subject: [Buildroot] [PATCH 4/7] package/rustc: fix the riscv64gc architecture handling In-Reply-To: <20220107171318.1423075-5-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> <20220107171318.1423075-5-thomas.petazzoni@bootlin.com> Message-ID: On Sat, Jan 8, 2022 at 3:14 AM Thomas Petazzoni wrote: > > riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit > or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need > to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true > when BR2_riscv is true. > > Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to > allow rust-bin to download its pre-compiled standard library > correctly. > > Signed-off-by: Thomas Petazzoni Reviewed-by: Alistair Francis Alistair > --- > package/rustc/Config.in.host | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host > index 05324ad755..8c8b75c0a2 100644 > --- a/package/rustc/Config.in.host > +++ b/package/rustc/Config.in.host > @@ -49,7 +49,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS > default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC > # riscv64gc-unknown-linux-gnu > # "g" stands for imafd, and we also need "c". > - default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ > + default y if BR2_RISCV_64 && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ > BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ > BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ > BR2_TOOLCHAIN_USES_GLIBC > @@ -104,6 +104,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH > string > default "armv5te" if BR2_ARM_CPU_ARMV5 > default "armv7" if BR2_ARM_CPU_ARMV7A > + default "riscv64gc" if BR2_RISCV_64 > default BR2_ARCH if !BR2_ARM_CPU_ARMV7A > > config BR2_PACKAGE_HOST_RUSTC_ABI > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Sat Jan 8 03:21:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 7 Jan 2022 21:21:17 -0600 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220107235959.2638b513@windsurf> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107105223.01912574@windsurf> <20220107235959.2638b513@windsurf> Message-ID: On Fri, Jan 7, 2022 at 5:00 PM Thomas Petazzoni wrote: > > Hello James, > > On Fri, 7 Jan 2022 16:30:12 -0600 > James Hilliard wrote: > > > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > > > > > How come things are working today with this one? > > > > I think this is currently set in the cargo config file. > > Ah, right: > > [target. at RUSTC_TARGET_NAME@] > linker = "@CROSS_PREFIX at gcc" > > in package/rustc/cargo-config.in > > > > - Relevance of CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir $(TARGET_CROSS))gcc > > > > Set via CARGO_HOME currently, but I think may allow the cargo config to not > > be required. > > I'm no sure why you say this is set via CARGO_HOME? Because the > config file is stored in $(CARGO_HOME)/config ? Yeah, that's what I mean. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 07:05:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 08 Jan 2022 07:05:50 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-07 Message-ID: <20220108070555.8685C428E7@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-07 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 60 | 7 | 0 | 67 | 2021.11.x | 28 | 6 | 0 | 34 | master | 100 | 48 | 0 | 148 | Classification of failures by reason for master ----------------------------------------------- xxhash-0.8.1 | 10 host-file-5.41 | 7 rygel-0.40.2 | 6 frr-8.1 | 2 guile-3.0.7 | 2 ksmbd-tools-3.4.3 | 2 mdadm-4.2 | 2 unknown | 2 wavemon-0.9.4 | 2 gst1-rtsp-server-1.18.5 | 1 hiawatha-11.1 | 1 i2pd-2.40.0 | 1 ipmitool-1.8.18 | 1 libmicrohttpd-0.9.75 | 1 log4cxx-0.12.0 | 1 mongodb-4.2.11 | 1 nodejs-14.18.2 | 1 openipmi-2.0.32 | 1 perl-5.34.0 | 1 poppler-21.12.0 | 1 pulseview-0.4.2 | 1 ruby-3.1.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/837c592fd6f8432654d097362bcd3642eb1c3d80 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2ad3f23babdb7e398ff1b26728012f13651b0120 | riscv32 | gst1-rtsp-server-1.18.5 | NOK | http://autobuild.buildroot.net/results/da833542f6c53af80719107d3d76766a7bdc3464 | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/3de75297546b593adb0e9076486e47d51d75ccaf | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/f2dd39f0d4c5253c6c7584fae475b754d3b948bc | ORPH riscv64 | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/e255604dda0dc6567410e14690f58d00d093b498 | arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/dc5371f4e04257ba5e8f1ebf73483b52919d3b12 | ORPH i686 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/f148071bc55f2d8016295d0729e63c70b3f24c57 | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/78a56a35c0f30d007199d5bd32fdda337c33e6b3 | ORPH aarch64 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/97ce8deac2017cb7ea4af1af8265d373ea9451e9 | ORPH s390x | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/ff361fd57a4a7e80b492afa5594d7b342a278613 | ORPH i686 | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/58d35b677928d73ece2bb791975d0500177b940d | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/2308143bed92f99a4fe7b7ee40f043e449177ce7 | ORPH x86_64 | i2pd-2.40.0 | NOK | http://autobuild.buildroot.net/results/3825ce0953558347fdf30b66b647660a77b8f095 | m68k | ipmitool-1.8.18 | NOK | http://autobuild.buildroot.net/results/af2ff8788b28bffd16a00d196dd0ed4da630788f | i686 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/ad4bb4644fb1968cd16a6f061768a14cbd098359 | xtensa | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/7b197aab2d53972e1e59cfd031a1c4fc331eeb5f | or1k | libmicrohttpd-0.9.75 | NOK | http://autobuild.buildroot.net/results/f7668104dd64a93f0b343ce3ebbe50b12584184d | arc | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/352528dcc0e919da399eb25875096874fe419f01 | arm | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/469306768ebb2d871dc20a3e3449ea25f08c2712 | ORPH riscv32 | mdadm-4.2 | NOK | http://autobuild.buildroot.net/results/c967262963fa141ac6d9336131b89b44789ffd3a | ORPH arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/d7035fcbe841d6820012b1cad49c470cbbfecb92 | arm | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/3a851d659dbb9d6bbc2df8f89448262cf22c1a2c | arc | openipmi-2.0.32 | NOK | http://autobuild.buildroot.net/results/b0eb44ddbe2f10053a8a769d22d231caf82c7612 | ORPH arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/74d25607bbe9f9a3ea222b2453604bf2f382dc63 | riscv64 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/072275c19cb896669cd144cbeeb2d81aedccf608 | riscv64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/65ea69a417e4103efd6004d7f6ec3fb589f527e0 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/599ca54e97eb913e1436f0cbf32e53368751c24e | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2818db2e0a5453a83cb5369493cc6f7fb01258c6 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/693dcd618eaada02218919f06032d1c3c907fca5 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/fc34ea2a7ab09ac6629ce72f7780c1496a69a2bb | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f2cc87e201456eb8f1b261436369f150cfe677cc | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/86e1592a15e36be97434bcfecf3d0304b22f92d2 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c4af583d23095a05cd1bc4b6f10bf570fd975477 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/731a1de84dbcd753d3dd27d5f37257ae2615e66c | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/5701f17df21c913ae6a6dd029fe27a3e57dede13 | mips | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/17aa64727cbf51f28a77b925c9aa0db93b5b4f97 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0e50e75f343d18c7a830c57d36912d43e6034a94 | powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/651ff4db1fd21bab6c7cbd575e6a742632320abf | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/3e03cb469a3f273ca5febe8e110cc74abc749c89 | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/057b2fdc14fd9bfabb3a5653a5ecca4c8411da3e | ORPH xtensa | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/22a8b531c66e25b005f568cd673f2a08121f38e7 | ORPH sparc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/665dd9d2f5efcacc04a0d9164eb2885b5378db21 | ORPH powerpc | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/9ec98624bfed3bf71eed8bd92a1060461d466bb6 | ORPH arm | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/d5bb532a8a2f3f4fb20c4d81d4d88d2f2d4a06a6 | ORPH x86_64 | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/c099de5599d23970d4319927347a8c52c03d622f | ORPH m68k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/dce11718731c338ce290191c2241accf76c86bcc | ORPH m68k | xxhash-0.8.1 | NOK | http://autobuild.buildroot.net/results/b542eee260e1769dde761e498d5d108743fbeed2 | ORPH Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 asterisk-16.21.1 | 1 gvfs-1.44.1 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 wolfssl-4.8.1-stable | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | asterisk-16.21.1 | NOK | http://autobuild.buildroot.net/results/03b47775fda00eb0ba86b89c0442253083a9d4e9 | x86_64 | gvfs-1.44.1 | NOK | http://autobuild.buildroot.net/results/fc155bfa7a3b67e815026dc60174d0c9d000c6c4 | ORPH mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/f8898c73ff2a30715e2613646c9449f324ba88d2 | microblazeel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/7fcc97aa5714aea4e1ee049ae1c4373e7f62d418 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/6b0c96edb8b6a0c9bcf89260db84043b1dfd1e6f | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/56653962e44a775bca2ac8111dc11dcda2f74ab6 | arm | wolfssl-4.8.1-stable | NOK | http://autobuild.buildroot.net/results/c9847ab9690acdd503404b0e50b313114d115e00 | Classification of failures by reason for 2021.11.x -------------------------------------------------- gstd-0.13.0 | 2 host-erlang-22.2 | 2 libqmi-1.30.2 | 1 mpd-0.22.11 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/25c5f4f54abd0387ab0edcafe91b06883d0e079c | ORPH microblazeel | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/9484e42e21284e7a8ce5c9b21f7362047fa5e362 | ORPH i686 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/d03d7e34ac0533fd3e827d7e71cb5d795310175c | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/b58daf25c60d7f45e1c1c5610671b095f204a1c7 | powerpc64le | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/c78d32ee24bd259c0d503b68106824f6c5d66b9c | arm | mpd-0.22.11 | NOK | http://autobuild.buildroot.net/results/f6b0c9a78d4938e9efc40a4472b35a19deb04269 | Gitlab CI results for 2022-01-07 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650508 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650510 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650511 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650513 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650516 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650518 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650523 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650524 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650525 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650526 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650528 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650529 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650530 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650531 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650532 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650533 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650534 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650535 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650536 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650537 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650538 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650540 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650541 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650542 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650543 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650544 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650547 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650548 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650549 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650550 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650552 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650554 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650555 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650560 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650563 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650564 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650567 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650569 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650570 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650571 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650572 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650574 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650576 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650577 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650604 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650605 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650606 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650607 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650608 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650609 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650611 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650612 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650615 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650613 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650614 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650616 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650617 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650618 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650624 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650628 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650644 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650646 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650659 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650661 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650664 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650665 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650667 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650669 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650672 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650674 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650675 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650677 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650686 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650782 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650790 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650797 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650800 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650801 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650804 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650806 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650809 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650810 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650812 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650816 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650819 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650820 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650821 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650904 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650915 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650916 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650918 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650919 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650922 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650923 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650924 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650925 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650928 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650930 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650931 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650938 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650940 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650941 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650953 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650955 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650960 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650969 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650970 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650971 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650972 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650974 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650976 | -- http://autobuild.buildroot.net From bernd.kuhls at t-online.de Sat Jan 8 07:50:18 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 08:50:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmicrohttpd: fix pthread detection Message-ID: <20220108075018.22567-1-bernd.kuhls@t-online.de> Fix autobuild failures after bumping the package to 0.9.75 in commit 8ec001b467e22904c0a7ec5780d83afd44ad78f3: conftest.c:64:26: error: #error "_REENTRANT must be defined" Fixes: http://autobuild.buildroot.net/results/f76/f7668104dd64a93f0b343ce3ebbe50b12584184d/ Signed-off-by: Bernd Kuhls --- package/libmicrohttpd/libmicrohttpd.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f75178bc0a..344e1443fd 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -12,6 +12,10 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBMICROHTTPD_CFLAGS += -D_REENTRANT +endif + LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 07:59:30 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 08:59:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.63 Message-ID: <20220108075930.213063-1-bernd.kuhls@t-online.de> Release notes: http://www.bluez.org/release-of-bluez-5-63/ Signed-off-by: Bernd Kuhls --- package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index e671431093..5bfc652355 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.62 +BLUEZ5_UTILS_HEADERS_VERSION = 5.63 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 3ec4acac7f..a8f5399fa6 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2 bluez-5.62.tar.xz +sha256 9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 bluez-5.63.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index cf46d6e0d6..8cb9e42d72 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.62 +BLUEZ5_UTILS_VERSION = 5.63 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 08:16:45 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 08 Jan 2022 09:16:45 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/freeswitch: bump version to 1.10.7 References: <20211106111145.1648068-1-bernd.kuhls@t-online.de> <20211106111145.1648068-3-bernd.kuhls@t-online.de> <87bl0njfg0.fsf__32796.2444674753$1641597992$gmane$org@dell.be.48ers.dk> Message-ID: Am Sat, 08 Jan 2022 00:26:07 +0100 schrieb Peter Korsgaard: > This series was marked as superseeded in patchwork, but I applied it > anyway as freeswitch 1.10.7 fixes a number of fairly serious security > issues. Was there any specific reason why this was marked as > superseeded? Hi Peter, when posting the series I had not conducted a thorough runtime test. In expectation of more backported patches needed from upstream I marked the series as superseeded and lost track of the topic in the meantime. But do not worry, the current package is fine, no other backported patches are needed for my usecase. Regards, Bernd From arnout at mind.be Sat Jan 8 08:15:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 09:15:36 +0100 Subject: [Buildroot] [git commit] support/testing: tyest_python_pybind.py: fix flake8 errors Message-ID: <20220108081426.0E6B382946@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0233b84204766f3e6eefbc773e121a71b827eaf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master support/testing/tests/package/test_python_pybind.py:1:1: F401 'os' imported but unused support/testing/tests/package/test_python_pybind.py:3:1: F401 'subprocess' imported but unused support/testing/tests/package/test_python_pybind.py:6:1: E302 expected 2 blank lines, found 1 1 E302 expected 2 blank lines, found 1 2 F401 'os' imported but unused Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/package/test_python_pybind.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_python_pybind.py b/support/testing/tests/package/test_python_pybind.py index 5e3c3b9cc5..c0af7331a2 100644 --- a/support/testing/tests/package/test_python_pybind.py +++ b/support/testing/tests/package/test_python_pybind.py @@ -1,8 +1,7 @@ -import os import infra -import subprocess from tests.package.test_python import TestPythonPackageBase + class TestPythonPybind (TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ From bernd.kuhls at t-online.de Sat Jan 8 08:47:04 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 09:47:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/unrar: bump version to 6.1.3 Message-ID: <20220108084704.804720-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index 7900c44d1d..e354753bb2 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300 unrarsrc-5.9.4.tar.gz +sha256 d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636 unrarsrc-6.1.3.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index 3c8e37a220..6923660153 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 5.9.4 +UNRAR_VERSION = 6.1.3 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 08:50:09 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 09:50:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/pngquant: bump version to 2.17.0 Message-ID: <20220108085009.819370-1-bernd.kuhls@t-online.de> Changelog: https://github.com/kornelski/pngquant/blob/master/CHANGELOG Signed-off-by: Bernd Kuhls --- package/pngquant/pngquant.hash | 2 +- package/pngquant/pngquant.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index 3a0dcfd457..a7ea4aa997 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,4 +1,4 @@ # From https://pngquant.org/releases.html -sha256 06c6fdded675753fbdbeacc2b63507fb30f42fae813e48a1684b240bb5b63522 pngquant-2.16.0-src.tar.gz +sha256 a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66 pngquant-2.17.0-src.tar.gz # Locally computed sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index 72efafe64e..87537aa18e 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.16.0 +PNGQUANT_VERSION = 2.17.0 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 08:55:32 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 09:55:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/mtools: bump version to 4.0.36 Message-ID: <20220108085532.831188-1-bernd.kuhls@t-online.de> Release notes: http://svn.savannah.gnu.org/viewvc/mtools/trunk/NEWS?view=markup Signed-off-by: Bernd Kuhls --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 86cfe693d9..c37d4df456 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d09cff66d7277ad36a7573fc3e9803bfa558cdda83baabaafbf7761317462283 mtools-4.0.26.tar.lz +sha256 78ac74b2d1cae77bb2da29461a13ed862ff6b7c1289d5bf80fdb09e039c2c48f mtools-4.0.36.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 6d63a565bd..4908c3fa2f 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.26 +MTOOLS_VERSION = 4.0.36 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:00:03 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:00:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/exfatprogs: bump version to 1.1.3 Message-ID: <20220108090003.837129-1-bernd.kuhls@t-online.de> Updated license hash due to whitespace changes in upstream commit https://github.com/exfatprogs/exfatprogs/commit/7e30487e6d92f98e1ab91b037f5285453359ec9a Release notes: https://github.com/exfatprogs/exfatprogs/blob/master/NEWS Signed-off-by: Bernd Kuhls --- package/exfatprogs/exfatprogs.hash | 6 +++--- package/exfatprogs/exfatprogs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 4dc18cd4b6..99f57c9deb 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.0/exfatprogs-1.1.0.tar.xz.sha256 -sha256 69e2cf6430fc1d083c6ae0aea5eb80bf1b8e9775ed833bcd8331aef0fcacaf85 exfatprogs-1.1.0.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.3/exfatprogs-1.1.3.tar.xz.sha256 +sha256 3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809 exfatprogs-1.1.3.tar.xz # Hash for license file -sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index e10acc9e5f..2911d21f4f 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.1.0 +EXFATPROGS_VERSION = 1.1.3 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:13:49 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:13:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: bump version to 5.15.1 Message-ID: <20220108091349.918259-1-bernd.kuhls@t-online.de> Reformatted hashes. Upstream relicensed libbtrfsutil to LGPL-2.1+ and removed libbtrfsutil/COPYING.LESSER: https://github.com/kdave/btrfs-progs/commit/9e30f779e3cbf12a88ebe309ee371851fdfd3aa0 Add optional support for udev: https://github.com/kdave/btrfs-progs/commit/f74ebeee5c239e007a0144e93f0eee26949a85ec https://github.com/kdave/btrfs-progs/commit/1d0fa3781ef9374388b683cf96f9c48245025cf6 Changelog: https://github.com/kdave/btrfs-progs/blob/master/CHANGES Signed-off-by: Bernd Kuhls --- package/btrfs-progs/btrfs-progs.hash | 7 +++---- package/btrfs-progs/btrfs-progs.mk | 15 +++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index aac144963e..339eab02aa 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137 btrfs-progs-v5.11.tar.xz +sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz # Locally computed -sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING -sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 libbtrfsutil/COPYING.LESSER +sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 96456d1238..50c8e59e50 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,14 +4,13 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.11 +BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python -BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-3.0+ (libbtrfsutil) -BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING \ - libbtrfsutil/COPYING.LESSER +BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) +BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES # Doesn't autodetect static-only and tries to build both @@ -31,9 +30,17 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +BTRFS_PROGS_CONF_OPTS += --enable-libudev +BTRFS_PROGS_DEPENDENCIES += udev +else +BTRFS_PROGS_CONF_OPTS += --disable-libudev +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ + --disable-libudev \ --disable-zstd \ --disable-python \ --disable-convert -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:17:39 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:17:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/e2fsprogs: bump version to 1.46.5 Message-ID: <20220108091739.927609-1-bernd.kuhls@t-online.de> Release notes: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.5 Signed-off-by: Bernd Kuhls --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 63c7c9929f..452c8d5689 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.3/sha256sums.asc -sha256 b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713 e2fsprogs-1.46.4.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/sha256sums.asc +sha256 2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e e2fsprogs-1.46.5.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 76215e8c34..cd70e3a034 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.46.4 +E2FSPROGS_VERSION = 1.46.5 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:25:54 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:25:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/eudev/: bump version to 3.2.11 Message-ID: <20220108092554.989783-1-bernd.kuhls@t-online.de> Switch upstream URL to github due to changes in project ownership: https://github.com/eudev-project/eudev/commit/06ac38e2b876427dfa2ef47e74b46b99927dfe34 Signed-off-by: Bernd Kuhls --- package/eudev/Config.in | 2 +- package/eudev/eudev.hash | 4 +--- package/eudev/eudev.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 0e5bd0cee9..6e7bbe4648 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_EUDEV Upstart, older kernels, various toolchains and anything else required by users and various distributions. - https://wiki.gentoo.org/wiki/Project:Eudev + https://github.com/eudev-project/eudev if BR2_PACKAGE_EUDEV diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index fda0481351..fe6c7ef008 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,5 +1,3 @@ -# From http://dev.gentoo.org/~blueness/eudev/ -md5 60b135a189523f333cea5f71a3345c8d eudev-3.2.10.tar.gz # Locally calculated -sha256 87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz +sha256 19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b eudev-3.2.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 5d18b388c7..705370689d 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,8 +4,8 @@ # ################################################################################ -EUDEV_VERSION = 3.2.10 -EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev +EUDEV_VERSION = 3.2.11 +EUDEV_SITE = https://github.com/eudev-project/eudev/releases/download/v$(EUDEV_VERSION) EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING EUDEV_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:32:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:32:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/freetype: bump version to 2.11.1 Message-ID: <20220108093206.999409-1-bernd.kuhls@t-online.de> Updated license hash and location of LICENSE.TXT due to upstream commit: https://gitlab.freedesktop.org/freetype/freetype/-/commit/0606350c2a08eec120e4557a07f252e1c72963ce Signed-off-by: Bernd Kuhls --- package/freetype/freetype.hash | 8 ++++---- package/freetype/freetype.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 36571b51af..7abc3d96da 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ -sha1 0181862673f7216ad2b5074f95fc131209e30b27 freetype-2.10.4.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.11.1/ +sha1 86bdc98b37efe447cf53420bf2c18402ff905112 freetype-2.11.1.tar.xz # Locally calculated -sha256 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784 freetype-2.10.4.tar.xz -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT +sha256 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 freetype-2.11.1.tar.xz +sha256 c85e842b7ff04d95dab7d68e812773de0f8b67940e5449d35b42c66eb0f619fe LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 59d6dc0eb8..912e6c4daa 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,13 +4,13 @@ # ################################################################################ -FREETYPE_VERSION = 2.10.4 +FREETYPE_VERSION = 2.11.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" FREETYPE_LICENSE = Dual FTL/GPL-2.0+ -FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_CONFIG_SCRIPTS = freetype-config -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 8 09:39:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:39:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/icu: bump version to 70-1 Message-ID: <20220108093953.1022178-1-bernd.kuhls@t-online.de> Removed patch which was applied upstream: https://github.com/unicode-org/icu/commit/2dc5bea9061b4fb05cd03e21b775dd944a0eb81d Updated license hash due to typo fixes: https://github.com/unicode-org/icu/commit/73eca0a9c927045a3b5eafdbec9c17d2fcacd5da Updated project URL as recommended in the release notes: https://github.com/unicode-org/icu/releases/tag/release-70-1 Signed-off-by: Bernd Kuhls --- ...-ICU-21587-Fix-memory-bug-w-baseName.patch | 112 ------------------ package/icu/Config.in | 2 +- package/icu/icu.hash | 4 +- package/icu/icu.mk | 2 +- 4 files changed, 4 insertions(+), 116 deletions(-) delete mode 100644 package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch diff --git a/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch b/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch deleted file mode 100644 index 15af976e49..0000000000 --- a/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 2dc5bea9061b4fb05cd03e21b775dd944a0eb81d Mon Sep 17 00:00:00 2001 -From: Frank Tang -Date: Tue, 13 Apr 2021 15:16:50 -0700 -Subject: [PATCH] ICU-21587 Fix memory bug w/ baseName - -Edge cases not fixed in assign and move assign operator -while the locale is long and call setKeywordValue with incorrect -keyword/values. - -Signed-off-by: Peter Korsgaard -[Peter: Fixes CVE-2021-30535, adjust paths for tarball] ---- - source/common/locid.cpp | 11 +++++++++-- - source/test/intltest/loctest.cpp | 26 ++++++++++++++++++++++++++ - source/test/intltest/loctest.h | 2 ++ - 3 files changed, 37 insertions(+), 2 deletions(-) - -diff --git a/source/common/locid.cpp b/source/common/locid.cpp -index 02cd82a7b8..3c6e5b0669 100644 ---- a/source/common/locid.cpp -+++ b/source/common/locid.cpp -@@ -469,14 +469,18 @@ Locale& Locale::operator=(Locale&& other) U_NOEXCEPT { - if ((baseName != fullName) && (baseName != fullNameBuffer)) uprv_free(baseName); - if (fullName != fullNameBuffer) uprv_free(fullName); - -- if (other.fullName == other.fullNameBuffer) { -+ if (other.fullName == other.fullNameBuffer || other.baseName == other.fullNameBuffer) { - uprv_strcpy(fullNameBuffer, other.fullNameBuffer); -+ } -+ if (other.fullName == other.fullNameBuffer) { - fullName = fullNameBuffer; - } else { - fullName = other.fullName; - } - -- if (other.baseName == other.fullName) { -+ if (other.baseName == other.fullNameBuffer) { -+ baseName = fullNameBuffer; -+ } else if (other.baseName == other.fullName) { - baseName = fullName; - } else { - baseName = other.baseName; -@@ -2681,6 +2685,9 @@ Locale::setKeywordValue(const char* keywordName, const char* keywordValue, UErro - if (fullName != fullNameBuffer) { - // if full Name is already on the heap, need to free it. - uprv_free(fullName); -+ if (baseName == fullName) { -+ baseName = newFullName; // baseName should not point to freed memory. -+ } - } - fullName = newFullName; - status = U_ZERO_ERROR; -diff --git a/source/test/intltest/loctest.cpp b/source/test/intltest/loctest.cpp -index ce41a4c00e..5503b008b0 100644 ---- a/source/test/intltest/loctest.cpp -+++ b/source/test/intltest/loctest.cpp -@@ -284,6 +284,8 @@ void LocaleTest::runIndexedTest( int32_t index, UBool exec, const char* &name, c - TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale); - TESTCASE_AUTO(TestCanonicalize); - TESTCASE_AUTO(TestLeak21419); -+ TESTCASE_AUTO(TestLongLocaleSetKeywordAssign); -+ TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign); - TESTCASE_AUTO_END; - } - -@@ -6520,6 +6522,30 @@ void LocaleTest::TestSetUnicodeKeywordValueInLongLocale() { - } - } - -+void LocaleTest::TestLongLocaleSetKeywordAssign() { -+ IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordAssign"); -+ // A long base name, with an illegal keyword and copy constructor -+ icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_" -+ "AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_" -+ "AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17_AAAAAA18"); -+ Locale l2; -+ l.setUnicodeKeywordValue("co", "12", status); // Cause an error -+ status.reset(); -+ l2 = l; // copy operator on such bogus locale. -+} -+ -+void LocaleTest::TestLongLocaleSetKeywordMoveAssign() { -+ IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordMoveAssign"); -+ // A long base name, with an illegal keyword and copy constructor -+ icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_" -+ "AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_" -+ "AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17"); -+ Locale l2; -+ l.setUnicodeKeywordValue("co", "12", status); // Cause an error -+ status.reset(); -+ Locale l3 = std::move(l); // move assign -+} -+ - void LocaleTest::TestSetUnicodeKeywordValueNullInLongLocale() { - IcuTestErrorCode status(*this, "TestSetUnicodeKeywordValueNullInLongLocale"); - const char *exts[] = {"cf", "cu", "em", "kk", "kr", "ks", "kv", "lb", "lw", -diff --git a/source/test/intltest/loctest.h b/source/test/intltest/loctest.h -index 05be4037bd..12a93bde53 100644 ---- a/source/test/intltest/loctest.h -+++ b/source/test/intltest/loctest.h -@@ -156,6 +156,8 @@ class LocaleTest: public IntlTest { - void TestSetUnicodeKeywordValueInLongLocale(); - void TestSetUnicodeKeywordValueNullInLongLocale(); - void TestLeak21419(); -+ void TestLongLocaleSetKeywordAssign(); -+ void TestLongLocaleSetKeywordMoveAssign(); - - private: - void _checklocs(const char* label, --- -2.20.1 - diff --git a/package/icu/Config.in b/package/icu/Config.in index b0c9eac83d..8b410bfdb6 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_ICU help International Components for Unicode. - http://site.icu-project.org/ + https://icu.unicode.org/ if BR2_PACKAGE_ICU diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 5ed7cc4217..56a0a5dd53 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 icu4c-69_1-src.tgz -sha256 7915b19db903070778581ae05d8bf4ea241b34a05deb51ca4f5cbb15ea1cbba3 LICENSE +sha256 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 icu4c-70_1-src.tgz +sha256 861671f8c712aa046f8f5ac89239e6c33821636516c5d0cc8c4e1973085f27a6 LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index c5d0c3eefb..7e0c96e43a 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 69-1 +ICU_VERSION = 70-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:45:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:45:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.63 In-Reply-To: <20220108075930.213063-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 08:59:30 +0100") References: <20220108075930.213063-1-bernd.kuhls@t-online.de> Message-ID: <877dbak1cr.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: http://www.bluez.org/release-of-bluez-5-63/ The release notes mentions new build options for sanitizers, and it looks to be enabled by default: checking whether /home/peko/source/buildroot/output-bluez/host/bin/aarch64-linux-gnu-gcc accepts -fPIE... yes checking whether /home/peko/source/buildroot/output-bluez/host/bin/aarch64-linux-gnu-gcc accepts -fsanitize=address... yes checking whether /home/peko/source/buildroot/output-bluez/host/bin/aarch64-linux-gnu-gcc accepts -fsanitize=leak... yes checking whether /home/peko/source/buildroot/output-bluez/host/bin/aarch64-linux-gnu-gcc accepts -fsanitize=undefined... yes So I've added explicit --disable-* options for those. I also see that we are not explicitly disabling the -fpie logic (where we want the Buildroot option to decide if it should be used or not), so I've also added --disable-pie. Committed with these fixes, thanks. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Sat Jan 8 09:45:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:45:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcap: bump version to 2.62 Message-ID: <20220108094533.1025401-1-bernd.kuhls@t-online.de> Removed patch which was applied upstream: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=afbc554d16a32ed352191e49b3673f2f72d0002f Release notes: https://sites.google.com/site/fullycapable/release-notes-for-libcap Signed-off-by: Bernd Kuhls --- ...don-t-overwrite-empty-when-generatin.patch | 50 ------------------- package/libcap/libcap.hash | 2 +- package/libcap/libcap.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch diff --git a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch b/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch deleted file mode 100644 index a47a2c788e..0000000000 --- a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dc507a812d931c24f1ac98c811fdd29bffa21da9 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 24 Aug 2021 00:36:40 +0200 -Subject: [PATCH] libcap/Makefile: don't overwrite 'empty' when generating - loader.txt - -objcopy takes an input file and an output file as arguments. If the -output file is left out, the input file will be overwritten. - -Since the objcopy command used to generate loader.txt only does a -dump-section and no filtering, in practice there is no change to empty. -However, as a side-effect, its timestamp is updated. The timestamp of -empty and of loader.txt will be more or less the same; however, -loader.txt is closed just before the output file is closed, so it's -possible that the timestamp of loader.txt is just a little bit earlier. -If this happens, it causes loader.txt to be rebuilt later, which in turn -causes a number of other object files to be rebuilt. - -Usually that's harmless, but it sometimes causes the rebuild to happen -during 'make install'. This is particularly annoying if 'make install' -is done as root, since loader.txt becomes owned by root in that case. - -Fix this by specifying a harmless output file: /dev/null. - -While we're at it, take in an upstream change that removes the redundant -redirect. - -Fixes: ee3b25c0a877fa74d1aec88f325ac45b09963c82 - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - libcap/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libcap/Makefile b/libcap/Makefile -index 47cf8f4..18e4f4f 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -105,7 +105,7 @@ empty: empty.c - $(CC) -o $@ $< - - loader.txt: empty -- $(OBJCOPY) --dump-section .interp=/dev/stdout $< > $@ -+ $(OBJCOPY) --dump-section .interp=$@ $< /dev/null - - cap_magic.o: execable.h execable.c loader.txt - $(CC) $(CFLAGS) $(IPATH) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@ --- -2.31.1 - diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index eb8fe43f6f..396e592c5b 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97 libcap-2.52.tar.xz +sha256 190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2 libcap-2.62.tar.xz # Hash for license file: sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 45700e56ec..42acca9082 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.52 +LIBCAP_VERSION = 2.62 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:45:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:45:17 +0100 Subject: [Buildroot] [git commit] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.63 Message-ID: <20220108093945.2DCED82A99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4c6cf4b1fc0f34e72ff047e76de53d3634f5184 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: http://www.bluez.org/release-of-bluez-5-63/ Signed-off-by: Bernd Kuhls [Peter: explicitly disable asan/lsan/pie/ubsan] Signed-off-by: Peter Korsgaard --- package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index e671431093..5bfc652355 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.62 +BLUEZ5_UTILS_HEADERS_VERSION = 5.63 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 3ec4acac7f..a8f5399fa6 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2 bluez-5.62.tar.xz +sha256 9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 bluez-5.63.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index cf46d6e0d6..49f6eaac13 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.62 +BLUEZ5_UTILS_VERSION = 5.63 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -23,6 +23,10 @@ BLUEZ5_UTILS_CONF_OPTS = \ --enable-library \ --disable-cups \ --disable-manpages \ + --disable-asan \ + --disable-lsan \ + --disable-ubsan \ + --disable-pie \ --with-dbusconfdir=/etc ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y) From peter at korsgaard.com Sat Jan 8 09:47:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:47:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/unrar: bump version to 6.1.3 In-Reply-To: <20220108084704.804720-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 09:47:04 +0100") References: <20220108084704.804720-1-bernd.kuhls@t-online.de> Message-ID: <8735lyk199.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:47:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:47:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/pngquant: bump version to 2.17.0 In-Reply-To: <20220108085009.819370-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 09:50:09 +0100") References: <20220108085009.819370-1-bernd.kuhls@t-online.de> Message-ID: <87y23qimob.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://github.com/kornelski/pngquant/blob/master/CHANGELOG > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Sat Jan 8 09:47:56 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:47:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.81.0 Message-ID: <20220108094756.1057296-1-bernd.kuhls@t-online.de> Changelog: https://curl.se/changes.html Signed-off-by: Bernd Kuhls --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c488df57b1..63d6ba306c 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-7.80.0.tar.xz.asc +# https://curl.se/download/curl-7.81.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab curl-7.80.0.tar.xz +sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 24591f2e0a..20ebb4f271 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.80.0 +LIBCURL_VERSION = 7.81.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:49:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:49:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/mtools: bump version to 4.0.36 In-Reply-To: <20220108085532.831188-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 09:55:32 +0100") References: <20220108085532.831188-1-bernd.kuhls@t-online.de> Message-ID: <87tueeimlq.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > http://svn.savannah.gnu.org/viewvc/mtools/trunk/NEWS?view=markup > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:49:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:49:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/exfatprogs: bump version to 1.1.3 In-Reply-To: <20220108090003.837129-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:00:03 +0100") References: <20220108090003.837129-1-bernd.kuhls@t-online.de> Message-ID: <87pmp2iml1.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Updated license hash due to whitespace changes in upstream commit > https://github.com/exfatprogs/exfatprogs/commit/7e30487e6d92f98e1ab91b037f5285453359ec9a > Release notes: https://github.com/exfatprogs/exfatprogs/blob/master/NEWS > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:47:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:47:28 +0100 Subject: [Buildroot] [git commit] package/pngquant: bump version to 2.17.0 Message-ID: <20220108094337.8946E82AB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=545e61fffa2b9f03bf08f39d59016e4ee4f1ab92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/kornelski/pngquant/blob/master/CHANGELOG Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pngquant/pngquant.hash | 2 +- package/pngquant/pngquant.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash index 3a0dcfd457..a7ea4aa997 100644 --- a/package/pngquant/pngquant.hash +++ b/package/pngquant/pngquant.hash @@ -1,4 +1,4 @@ # From https://pngquant.org/releases.html -sha256 06c6fdded675753fbdbeacc2b63507fb30f42fae813e48a1684b240bb5b63522 pngquant-2.16.0-src.tar.gz +sha256 a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66 pngquant-2.17.0-src.tar.gz # Locally computed sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk index 72efafe64e..87537aa18e 100644 --- a/package/pngquant/pngquant.mk +++ b/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.16.0 +PNGQUANT_VERSION = 2.17.0 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ From peter at korsgaard.com Sat Jan 8 09:47:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:47:03 +0100 Subject: [Buildroot] [git commit] package/unrar: bump version to 6.1.3 Message-ID: <20220108094337.8113982AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2550344f7991105f3896340332e2f2dba9e44294 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index 7900c44d1d..e354753bb2 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300 unrarsrc-5.9.4.tar.gz +sha256 d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636 unrarsrc-6.1.3.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index 3c8e37a220..6923660153 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 5.9.4 +UNRAR_VERSION = 6.1.3 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar From peter at korsgaard.com Sat Jan 8 09:48:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:48:05 +0100 Subject: [Buildroot] [git commit] package/mtools: bump version to 4.0.36 Message-ID: <20220108094337.9122882ACB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4206de33e0dee3044fa36c555c48b439c3eeb0c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: http://svn.savannah.gnu.org/viewvc/mtools/trunk/NEWS?view=markup Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 86cfe693d9..c37d4df456 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d09cff66d7277ad36a7573fc3e9803bfa558cdda83baabaafbf7761317462283 mtools-4.0.26.tar.lz +sha256 78ac74b2d1cae77bb2da29461a13ed862ff6b7c1289d5bf80fdb09e039c2c48f mtools-4.0.36.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 6d63a565bd..4908c3fa2f 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.26 +MTOOLS_VERSION = 4.0.36 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From peter at korsgaard.com Sat Jan 8 09:49:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:49:21 +0100 Subject: [Buildroot] [git commit] package/exfatprogs: bump version to 1.1.3 Message-ID: <20220108094337.99D0E82AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b636c507c64792d91df336eb5c379b0bff17977 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updated license hash due to whitespace changes in upstream commit https://github.com/exfatprogs/exfatprogs/commit/7e30487e6d92f98e1ab91b037f5285453359ec9a Release notes: https://github.com/exfatprogs/exfatprogs/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/exfatprogs/exfatprogs.hash | 6 +++--- package/exfatprogs/exfatprogs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 4dc18cd4b6..99f57c9deb 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.0/exfatprogs-1.1.0.tar.xz.sha256 -sha256 69e2cf6430fc1d083c6ae0aea5eb80bf1b8e9775ed833bcd8331aef0fcacaf85 exfatprogs-1.1.0.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.3/exfatprogs-1.1.3.tar.xz.sha256 +sha256 3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809 exfatprogs-1.1.3.tar.xz # Hash for license file -sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index e10acc9e5f..2911d21f4f 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.1.0 +EXFATPROGS_VERSION = 1.1.3 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ From bernd.kuhls at t-online.de Sat Jan 8 09:50:37 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:50:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/libfribidi: bump version to 1.0.11 Message-ID: <20220108095037.1065173-1-bernd.kuhls@t-online.de> Release notes: https://github.com/fribidi/fribidi/releases/tag/v1.0.11 Signed-off-by: Bernd Kuhls --- package/libfribidi/libfribidi.hash | 2 +- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 8e7eb49bcd..da25b2d24d 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01 fribidi-1.0.10.tar.xz +sha256 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d fribidi-1.0.11.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 97e875b4a2..adbd786db1 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.10 +LIBFRIBIDI_VERSION = 1.0.11 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:54:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:54:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/xfsprogs: bump to version 5.14.2 In-Reply-To: <20220107225739.2145636-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 23:57:39 +0100") References: <20220107225739.2145636-1-fontaine.fabrice@gmail.com> Message-ID: <87lezqimd2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > liburcu is a mandatory dependency since version 5.14.0 and > https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e4da1b16e29f6fe6b34de9b9b0f97141fb2e1855 > https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?h=v5.14.2 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:51:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:51:37 +0100 Subject: [Buildroot] [git commit] package/xfsprogs: bump to version 5.14.2 Message-ID: <20220108094831.4045382A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f8f69012e0eee7f3e98212fb3da118c211f3c0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master liburcu is a mandatory dependency since version 5.14.0 and https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e4da1b16e29f6fe6b34de9b9b0f97141fb2e1855 https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?h=v5.14.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xfsprogs/Config.in | 3 +++ package/xfsprogs/xfsprogs.hash | 2 +- package/xfsprogs/xfsprogs.mk | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index b8e07cc83d..a382b63ff8 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -1,12 +1,15 @@ comment "xfsprogs needs a toolchain w/ threads" + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_XFSPROGS bool "xfsprogs" + depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH + select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index b379839e7e..bb546601dc 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9 xfsprogs-5.10.0.tar.xz +sha256 01ccd3ef9df2837753a5d876b8da84ea957d13d7a461b8c46e8afa4eb09aabc8 xfsprogs-5.14.2.tar.xz # Hash for license files sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 71d02278e9..695471bddc 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,13 +4,13 @@ # ################################################################################ -XFSPROGS_VERSION = 5.10.0 +XFSPROGS_VERSION = 5.14.2 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -XFSPROGS_DEPENDENCIES = inih util-linux +XFSPROGS_DEPENDENCIES = inih liburcu util-linux XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" XFSPROGS_CONF_OPTS = \ From bernd.kuhls at t-online.de Sat Jan 8 09:54:51 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 10:54:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: bump version to 1.8.1 Message-ID: <20220108095451.1078507-1-bernd.kuhls@t-online.de> Reformatted hashes. Changelog: https://github.com/NLnetLabs/ldns/blob/develop/Changelog Signed-off-by: Bernd Kuhls --- package/libldns/libldns.hash | 10 +++++----- package/libldns/libldns.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash index c8fb39d478..cab8b7dbdf 100644 --- a/package/libldns/libldns.hash +++ b/package/libldns/libldns.hash @@ -1,7 +1,7 @@ -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha1 -sha1 d075a08972c0f573101fb4a6250471daaa53cb3e ldns-1.7.1.tar.gz -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha256 -sha256 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 ldns-1.7.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha1 +sha1 df19a0404a608821b571525214a18988bc88bb46 ldns-1.8.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha256 +sha256 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 ldns-1.8.1.tar.gz # Hash for license file: -sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE +sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 9c248bbc19..7deca978da 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLDNS_VERSION = 1.7.1 +LIBLDNS_VERSION = 1.8.1 LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause -- 2.30.2 From peter at korsgaard.com Sat Jan 8 09:55:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:55:23 +0100 Subject: [Buildroot] [git commit] package/e2fsprogs: bump version to 1.46.5 Message-ID: <20220108095153.158F182A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16bfbeca6f4f2ec4a4fbb1a2325552190efcc687 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.5 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 63c7c9929f..452c8d5689 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.3/sha256sums.asc -sha256 b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713 e2fsprogs-1.46.4.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/sha256sums.asc +sha256 2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e e2fsprogs-1.46.5.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 76215e8c34..cd70e3a034 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.46.4 +E2FSPROGS_VERSION = 1.46.5 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) From peter at korsgaard.com Sat Jan 8 09:58:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:58:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/e2fsprogs: bump version to 1.46.5 In-Reply-To: <20220108091739.927609-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:17:39 +0100") References: <20220108091739.927609-1-bernd.kuhls@t-online.de> Message-ID: <87h7aeim6q.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.5 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Sat Jan 8 09:58:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 10:58:58 +0100 Subject: [Buildroot] [git commit] package/alsa-lib: disable versioned symbols only when unsupported Message-ID: <20220108095249.E414182ACB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21a1a5927004787217b19f09e6b113b68f91511e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Back in commit e90a4bf4af3b6466b2a2d8df12cfe84f5d364cca ("alsa-lib: don't use versioned symbols") from 2009, symbol versioning was disabled in alsa-lib, because it was causing problems with C libraries (such as uClibc) that doesn't support symbol versioning. The thread at http://mailman.alsa-project.org/pipermail/alsa-devel/2009-February/014999.html has some background discussion about this. Essentially, the issue was that alsa-lib in the new version of a given symbol calls into an old version of the same symbol. If your C library has symbol versioning, everything works fine. But if your C library doesn't support symbol versioning, the call from the new symbol into the old symbol will in fact end up in the new symbol, causing an infinite recursion. That problem was solved back then by unconditionally disabling symbol versioning in alsa-lib. However, some libraries such as CEF depend on versioned symbols from alsa-lib, and the build fails during linking with versioning disabled. This patch conditionally disables versioned symbols when unsupported by the toolchain, leaving them enabled otherwise. We assume only glibc has support for symbol versioning. uClibc has no support, and musl has some limited support, so we take the safe route of only enabling symbol versioning for glibc. Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- package/alsa-lib/alsa-lib.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index c43803f607..b5cd3f0d13 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -16,8 +16,11 @@ ALSA_LIB_AUTORECONF = YES ALSA_LIB_CONF_OPTS = \ --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \ --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \ - --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \ - --without-versioned + --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" + +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +ALSA_LIB_CONF_OPTS += --without-versioned +endif # Can't build with static & shared at the same time (1.0.25+) ifeq ($(BR2_STATIC_LIBS),y) From peter at korsgaard.com Sat Jan 8 09:59:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 10:59:40 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 250.1 In-Reply-To: <20220107214600.54727-1-romain.naour@smile.fr> (Romain Naour's message of "Fri, 7 Jan 2022 22:46:00 +0100") References: <20220107214600.54727-1-romain.naour@smile.fr> Message-ID: <87czl2im43.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Remove upstream patch > Fixes a build issue with toolchains using kernel headers < 5.6, > when the openat2(2) syscall is not available [2]. > Add a new patch to fix homework-mount with linux-headers < 5.2. > [1] https://github.com/systemd/systemd-stable/commit/cd88d010e862d26ce816eb3bd6735a80999ac41e > [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fddb5d430ad9fa91b49b1d34d0202ffe2fa0e179 > Signed-off-by: Romain Naour > Cc: Norbert Lange > Cc: Yann E. MORIN Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 09:59:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 10:59:10 +0100 Subject: [Buildroot] [git commit] package/systemd: bump to version 250.1 Message-ID: <20220108095426.DB02B82AB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=315ba5c26dd6bb0c01067e8346b4a7eceb7d0ee1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove upstream patch Fixes a build issue with toolchains using kernel headers < 5.6, when the openat2(2) syscall is not available [2]. Add a new patch to fix homework-mount with linux-headers < 5.2. [1] https://github.com/systemd/systemd-stable/commit/cd88d010e862d26ce816eb3bd6735a80999ac41e [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fddb5d430ad9fa91b49b1d34d0202ffe2fa0e179 Signed-off-by: Romain Naour Cc: Norbert Lange Cc: Yann E. MORIN Signed-off-by: Peter Korsgaard --- ...call-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 +++++++++ ...syscall-define-all-MOUNT_ATTR_-if-missing.patch | 84 ---------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 4 files changed, 35 insertions(+), 86 deletions(-) diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch new file mode 100644 index 0000000000..0934886acb --- /dev/null +++ b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch @@ -0,0 +1,33 @@ +From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 7 Jan 2022 22:25:23 +0100 +Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing + +MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] +but it's defined in kernel headers since version 5.2. + +[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 + +Signed-off-by: Romain Naour +--- + src/basic/missing_syscall.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h +index 8267b1a90c..793d111c55 100644 +--- a/src/basic/missing_syscall.h ++++ b/src/basic/missing_syscall.h +@@ -569,6 +569,10 @@ static inline int missing_open_tree( + #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ + #endif + ++#ifndef MOVE_MOUNT_T_EMPTY_PATH ++#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ ++#endif ++ + static inline int missing_move_mount( + int from_dfd, + const char *from_pathname, +-- +2.31.1 + diff --git a/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch b/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch deleted file mode 100644 index d0c4f6eaa0..0000000000 --- a/package/systemd/0001-missing-syscall-define-all-MOUNT_ATTR_-if-missing.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0764e3a327573e7bda2f0e1a914f28482ab00574 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Fri, 24 Dec 2021 09:15:51 +0900 -Subject: [PATCH] missing-syscall: define all MOUNT_ATTR_* if missing - -Fixes #21876. - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -0764e3a327573e7bda2f0e1a914f28482ab00574] ---- - src/basic/missing_syscall.h | 48 ++++++++++++++++++++++++++++++++----- - 1 file changed, 42 insertions(+), 6 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 3da30e6f0e..0b0cc3cec2 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -462,20 +462,56 @@ struct mount_attr { - struct mount_attr; - #endif - -+#ifndef MOUNT_ATTR_RDONLY -+#define MOUNT_ATTR_RDONLY 0x00000001 /* Mount read-only */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOSUID -+#define MOUNT_ATTR_NOSUID 0x00000002 /* Ignore suid and sgid bits */ -+#endif -+ -+#ifndef MOUNT_ATTR_NODEV -+#define MOUNT_ATTR_NODEV 0x00000004 /* Disallow access to device special files */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOEXEC -+#define MOUNT_ATTR_NOEXEC 0x00000008 /* Disallow program execution */ -+#endif -+ -+#ifndef MOUNT_ATTR__ATIME -+#define MOUNT_ATTR__ATIME 0x00000070 /* Setting on how atime should be updated */ -+#endif -+ -+#ifndef MOUNT_ATTR_RELATIME -+#define MOUNT_ATTR_RELATIME 0x00000000 /* - Update atime relative to mtime/ctime. */ -+#endif -+ -+#ifndef MOUNT_ATTR_NOATIME -+#define MOUNT_ATTR_NOATIME 0x00000010 /* - Do not update access times. */ -+#endif -+ -+#ifndef MOUNT_ATTR_STRICTATIME -+#define MOUNT_ATTR_STRICTATIME 0x00000020 /* - Always perform atime updates */ -+#endif -+ -+#ifndef MOUNT_ATTR_NODIRATIME -+#define MOUNT_ATTR_NODIRATIME 0x00000080 /* Do not update directory access times */ -+#endif -+ - #ifndef MOUNT_ATTR_IDMAP --#define MOUNT_ATTR_IDMAP 0x00100000 -+#define MOUNT_ATTR_IDMAP 0x00100000 /* Idmap mount to @userns_fd in struct mount_attr. */ - #endif - - #ifndef MOUNT_ATTR_NOSYMFOLLOW --#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 -+#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 /* Do not follow symlinks */ - #endif - --#ifndef AT_RECURSIVE --#define AT_RECURSIVE 0x8000 -+#ifndef MOUNT_ATTR_SIZE_VER0 -+#define MOUNT_ATTR_SIZE_VER0 32 /* sizeof first published struct */ - #endif - --#ifndef MOUNT_ATTR_SIZE_VER0 --#define MOUNT_ATTR_SIZE_VER0 32 -+#ifndef AT_RECURSIVE -+#define AT_RECURSIVE 0x8000 - #endif - - static inline int missing_mount_setattr( --- -2.25.1 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index cc33cd4c52..f89b2ce17d 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 41317fb443f7555de427aea69fda36c74661e77b58203cd6587eb8e1f612f46b systemd-250.tar.gz +sha256 ccfdd97679972cd3d9fb15bc3c647a3ee3351a434e20e1e3eec2851caa1b4849 systemd-250.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 0b52cc47d1..404943c45c 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 250 +SYSTEMD_VERSION = 250.1 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From peter at korsgaard.com Sat Jan 8 10:03:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:03:00 +0100 Subject: [Buildroot] [PATCH 1/2] package/matchbox-lib: bump to version 1.12 In-Reply-To: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 22:37:40 +0100") References: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> Message-ID: <878rvqilyj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop second and third patches (already in version) > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 10:03:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:03:05 +0100 Subject: [Buildroot] [PATCH 2/2] package/matchbox-fakekey: bump to version 0.3 In-Reply-To: <20220107213741.1668818-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 22:37:41 +0100") References: <20220107213741.1668818-1-fontaine.fabrice@gmail.com> <20220107213741.1668818-2-fontaine.fabrice@gmail.com> Message-ID: <874k6eilye.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Use src/libfakekey.c as the license file because there is no COPYING in > the git tarball > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 10:01:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:01:48 +0100 Subject: [Buildroot] [git commit] package/matchbox-lib: bump to version 1.12 Message-ID: <20220108095719.B7B0882AB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21648affd254d1cfe9e10735d558832ecb576155 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop second and third patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/matchbox-lib/0002-libpng15.patch | 26 ------------------------ package/matchbox-lib/0003-include-setjmp-h.patch | 17 ---------------- package/matchbox-lib/matchbox-lib.hash | 3 +-- package/matchbox-lib/matchbox-lib.mk | 6 ++++-- 4 files changed, 5 insertions(+), 47 deletions(-) diff --git a/package/matchbox-lib/0002-libpng15.patch b/package/matchbox-lib/0002-libpng15.patch deleted file mode 100644 index 3d68573b5f..0000000000 --- a/package/matchbox-lib/0002-libpng15.patch +++ /dev/null @@ -1,26 +0,0 @@ -Support for libpng 1.5+ shamelessly taken from Gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/libmb/mbpixbuf.c -+++ b/libmb/mbpixbuf.c -@@ -247,7 +247,7 @@ - return NULL; - } - -- if ( setjmp( png_ptr->jmpbuf ) ) { -+ if ( setjmp( png_jmpbuf(png_ptr) ) ) { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL); - fclose(fd); - return NULL; -@@ -269,8 +269,8 @@ - ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) - png_set_gray_to_rgb(png_ptr); - -- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA -- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA -+ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA -+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA - ) - *has_alpha = 1; - else diff --git a/package/matchbox-lib/0003-include-setjmp-h.patch b/package/matchbox-lib/0003-include-setjmp-h.patch deleted file mode 100644 index 72e1e45d8f..0000000000 --- a/package/matchbox-lib/0003-include-setjmp-h.patch +++ /dev/null @@ -1,17 +0,0 @@ -matchbox-lib: include setjmp.h - -Based on this upstream patch: - - http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d - -Signed-off-by: Vicente Olivert Riera ---- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000 -+++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000 -@@ -22,6 +22,7 @@ - - #include - #include "mbpixbuf.h" -+#include - - #define BYTE_ORD_24_RGB 0 - #define BYTE_ORD_24_RBG 1 diff --git a/package/matchbox-lib/matchbox-lib.hash b/package/matchbox-lib/matchbox-lib.hash index d48fb32043..8144c10258 100644 --- a/package/matchbox-lib/matchbox-lib.hash +++ b/package/matchbox-lib/matchbox-lib.hash @@ -1,4 +1,3 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5 -md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 # Locally computed +sha256 5c7795e46c24d848a2b960f3b994911165d95e5d5731e39105ee0d808d2373eb libmatchbox-1.12.tar.bz2 sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk index 5541867699..00ca4a0d15 100644 --- a/package/matchbox-lib/matchbox-lib.mk +++ b/package/matchbox-lib/matchbox-lib.mk @@ -4,11 +4,13 @@ # ################################################################################ -MATCHBOX_LIB_VERSION = 1.9 +MATCHBOX_LIB_VERSION = 1.12 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2 -MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION) +MATCHBOX_LIB_SITE = http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot MATCHBOX_LIB_LICENSE = LGPL-2.1+ MATCHBOX_LIB_LICENSE_FILES = COPYING +# From git +MATCHBOX_LIB_AUTORECONF = YES MATCHBOX_LIB_INSTALL_STAGING = YES MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs From peter at korsgaard.com Sat Jan 8 10:02:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:02:11 +0100 Subject: [Buildroot] [git commit] package/matchbox-fakekey: bump to version 0.3 Message-ID: <20220108095719.C1BEE82AD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5483ea9e972d8c18d63561cae5639b4510f2bb93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use src/libfakekey.c as the license file because there is no COPYING in the git tarball Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/matchbox-fakekey/matchbox-fakekey.hash | 5 ++--- package/matchbox-fakekey/matchbox-fakekey.mk | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/matchbox-fakekey/matchbox-fakekey.hash b/package/matchbox-fakekey/matchbox-fakekey.hash index 516e0b6362..3627b13913 100644 --- a/package/matchbox-fakekey/matchbox-fakekey.hash +++ b/package/matchbox-fakekey/matchbox-fakekey.hash @@ -1,4 +1,3 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2.md5 -md5 83dbde4d77e8baf0176fe4291d8a2303 libfakekey-0.1.tar.bz2 # Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 4e2fdc9bc20df469d53885c40e104122140131e06d4c184902070ec0b0f2ca9f libfakekey-0.3.tar.bz2 +sha256 3271662131760e9b30dd92495a0ea0b598fc457798cc67948947365299dd607d src/libfakekey.c diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk index e607c48c15..99921ef8e7 100644 --- a/package/matchbox-fakekey/matchbox-fakekey.mk +++ b/package/matchbox-fakekey/matchbox-fakekey.mk @@ -4,11 +4,14 @@ # ################################################################################ -MATCHBOX_FAKEKEY_VERSION = 0.1 +MATCHBOX_FAKEKEY_VERSION = 0.3 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2 -MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION) +MATCHBOX_FAKEKEY_SITE = \ + http://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot MATCHBOX_FAKEKEY_LICENSE = GPL-2.0+ -MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING +MATCHBOX_FAKEKEY_LICENSE_FILES = src/libfakekey.c +# From git +MATCHBOX_FAKEKEY_AUTORECONF = YES MATCHBOX_FAKEKEY_INSTALL_STAGING = YES MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat From bernd.kuhls at t-online.de Sat Jan 8 10:03:50 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 11:03:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsoundtouch: bump version to 2.3.1 Message-ID: <20220108100350.1102692-1-bernd.kuhls@t-online.de> Updated license hash due to upstream commit: https://codeberg.org/soundtouch/soundtouch/commit/d11a3adb2daddcdfafac2d86ec8de3b3f41d2f78 Updated _SITE: https://codeberg.org/soundtouch/soundtouch/commit/d063c0d9f9d29ef1f3302fbdee2f11f997bb2bce Signed-off-by: Bernd Kuhls --- package/libsoundtouch/libsoundtouch.hash | 4 ++-- package/libsoundtouch/libsoundtouch.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libsoundtouch/libsoundtouch.hash b/package/libsoundtouch/libsoundtouch.hash index fe6a108e33..9de72521bd 100644 --- a/package/libsoundtouch/libsoundtouch.hash +++ b/package/libsoundtouch/libsoundtouch.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f1ce96bac35779d3b752f4cc8696975b3d58f3deb9db47ffc45862767c2a2bdd libsoundtouch-2.2.tar.gz -sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT +sha256 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1 soundtouch-2.3.1.tar.gz +sha256 84c6d82dc7de80f5b73f231edfd3ddc5b53513908117452bfa37ea36bb4b7e0a COPYING.TXT diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk index 8a0e807d7a..c372c32ac7 100644 --- a/package/libsoundtouch/libsoundtouch.mk +++ b/package/libsoundtouch/libsoundtouch.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBSOUNDTOUCH_VERSION = 2.2 -LIBSOUNDTOUCH_SITE = $(call gitlab,soundtouch,soundtouch,$(LIBSOUNDTOUCH_VERSION)) +LIBSOUNDTOUCH_VERSION = 2.3.1 +LIBSOUNDTOUCH_SOURCE = soundtouch-$(LIBSOUNDTOUCH_VERSION).tar.gz +LIBSOUNDTOUCH_SITE = https://www.surina.net/soundtouch LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT LIBSOUNDTOUCH_AUTORECONF = YES -- 2.30.2 From thomas.petazzoni at bootlin.com Sat Jan 8 10:04:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 11:04:14 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/alsa-lib: disable versioned symbols only when unsupported In-Reply-To: <20200518051112.33798-1-joseph.kogut@gmail.com> References: <20200515183353.4183611-1-joseph.kogut@gmail.com> <20200518051112.33798-1-joseph.kogut@gmail.com> Message-ID: <20220108110414.69f9fb65@windsurf> Hello Joseph, On Sun, 17 May 2020 22:11:12 -0700 Joseph Kogut wrote: > Some libraries such as CEF depend on versioned symbols from alsa-lib, > and the build fails during linking with versioning disabled. > > Symbol versioning was originally disabled because some C libraries, such > as uClibc, don't support versioned symbols. > > This patch conditionally disables versioned symbols when unsupported by > the toolchain, leaving them enabled otherwise. > > Signed-off-by: Joseph Kogut > --- > package/alsa-lib/alsa-lib.mk | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Sorry for the delay. I have applied with a much more detailed commit log, and also after enabling versioned symbols only with glibc toolchains, as musl only has partial support for symbol versioning. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From bernd.kuhls at t-online.de Sat Jan 8 10:07:03 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 11:07:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/waf: bump version to 2.0.23 Message-ID: <20220108100703.1104859-1-bernd.kuhls@t-online.de> Changelog: https://gitlab.com/ita1024/waf/blob/master/ChangeLog Signed-off-by: Bernd Kuhls --- package/waf/waf.hash | 6 +++--- package/waf/waf.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/waf/waf.hash b/package/waf/waf.hash index e9d387e7d0..21f47f76d8 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,7 +1,7 @@ # Locally computed -sha1 494ada411468129ed229f946ecec3048400e320b waf-2.0.22 -sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf-2.0.22 +sha1 89b24f9c19328339c2c8103796755474b66f3a8d waf-2.0.23 +sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf-2.0.23 # The waf script also contains its license, but is renamed `waf` in the extract # step, so this is a synonym for the above, to check WAF_LICENSE -sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf +sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index 5cc0dc3714..2b1808ace4 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.0.22 +WAF_VERSION = 2.0.23 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io WAF_LICENSE = BSD-3-Clause -- 2.30.2 From tomi.valkeinen at ideasonboard.com Sat Jan 8 10:09:35 2022 From: tomi.valkeinen at ideasonboard.com (Tomi Valkeinen) Date: Sat, 8 Jan 2022 12:09:35 +0200 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: <7605fae5-42db-115c-e87a-0dbc3597a99a@mind.be> References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> <7605fae5-42db-115c-e87a-0dbc3597a99a@mind.be> Message-ID: On 07/01/2022 23:49, Arnout Vandecappelle wrote: > > > On 03/01/2022 09:24, Tomi Valkeinen wrote: >> Hi, >> >> On 06/12/2021 23:57, Yann E. MORIN wrote: >> >>> So I think we really, really need a package (like scipy) that actually >>> makes use of pybind, so we can see how it works, and to fix it... >> >> Jfyi, there are two relatively simple packages in buildroot that can >> use pybind: kmsxx and rwmem. Both use meson for building. >> >> I can test the next version of this series with those packages. > > ?I tried to do that. Unfortunately, it turns out that both of those > packages use the CMake way of finding the pybind11 dependency, and > apparently our cross-compilation.conf doesn't support cmake yet... So > it's not that trivial. Yes, I had a look at this also. kmsxx and rwmem use the plain meson dependency() to find the package. Works on Ubuntu, as Ubuntu's pybind11 installs the cmake files. I started testing with a more manual approach to finding pybind11, but didn't get it working yet. Tomi From guillaume.bressaix at gmail.com Sat Jan 8 10:26:14 2022 From: guillaume.bressaix at gmail.com (Guillaume Bres) Date: Sat, 8 Jan 2022 11:26:14 +0100 Subject: [Buildroot] [PATCH v2 3/3] support/testing: add test for python-pybind In-Reply-To: <267a64ba-8407-bcea-0e3b-994986433b0c@mind.be> References: <20220104123901.23929-1-guillaume.bressaix@gmail.com> <20220104123901.23929-3-guillaume.bressaix@gmail.com> <267a64ba-8407-bcea-0e3b-994986433b0c@mind.be> Message-ID: Hello Arnout, >In the future, please make sure that you don't claim authorship on a patch that is actually from someone else! well I don't understand how the first submitted test/example relates to a real use case or demonstrates something viable. For me pybind is a compile time feature to enhance the compiler capacity. So I was really confused as to what was submitted 2 years ago could actually demonstrate anything. Hence the different and kind of tweaked approach that I proposed. I think we will refer to these notes as the holy bible as of now https://git.busybox.net/buildroot/commit/?id=a19b822239c36cb40a632899bb5c3e848a5fc81e > Generated with scanpypi and converted to host. that seems a useful tool to use > I bumped [python-pybind] to 2.9.0 instead and applied to master, thanks. thanks I did not know it was out there Guillaume W. Bres Software engineer Le ven. 7 janv. 2022 ? 22:57, Arnout Vandecappelle a ?crit : > > > On 04/01/2022 13:39, guillaume.bressaix at gmail.com wrote: > > From: "Guillaume W. Bres" > > > > python-pybind is a header only library, most of the time used as a > host-package, > > to customize the host/usr/python interpreter capacity (at build time) > with C++ based features. > > > > Signed-off-by: Guillaume W. Bres > > I applied to master with many changes: > > - Retain python3 only. > - python-pybind is a target package, not host. > - Select python-pybind instead of depend. > - Simplify python-pybind-example package. > - Check in python-pybind-example build if pybind11.get_include() > produces output. > - Don't use python3 -m pybind11 --includes: it includes the main > python > includes, which are for the host, not for the target. > - Use TestPythonPackageBase instead of open-coding something imported > with host python. > > However, I hadn't noticed that the original author of this test was > Adam. In > the future, please make sure that you don't claim authorship on a patch > that is > actually from someone else! > > Regards, > Arnout > > > --- > > This test case enhances the /host/usr/python interpreter with a C++ > macro. > > > > The test delivers a C++ macro contained in its br-external/example.cpp. > > We compile it against the host context. > > We install it to $(HOST_DIR)/usr/lib/python3.9 as it is natively > contained > > in the host-python system path (import is easy). > > The macro is an integer adder, written in C++ that we can now call in > host-python. > > > > The test infrastructure should actually be declared > "host-generic-package" > > instead of "generic-package", to be consistent with Buildroot > infrastructure. > > But I am not able to get this to actually do anything, if I declare this > package > > as a host-generic and "Config.in.host" instead of "Config.in". To me, > this is > > not too important > > > > * TestPythonPybind allows testing for both Py2 and Py3 like it is done > > in many other packages > > > > * TestPythonPybind does not inherit from TestPythonPackageBase as > usually done > > (1) because I need the br2-external feature to ship the example.cpp > containing the custom macro > > (2) because TestPythonPackageBase always involves the emulator, which > we do not want in our context > > > > * Although TestPythonPybind does have a TestPythonBase.config base at > the same time, > > as it is most convenient to have a valid python context > > > > * TestPythonPybind uses subprocess, as similarly done in 'core' on > 'infra' test cases, > > because we do not involve the emulator > > > > * TestPythonPybind tests (1+2)=3 written in C++, used in Python 2/3 > > * TestPythonPybind tests a custom module attribute, written in C++, used > in Python 2/3 > > > > --- > > DEVELOPERS | 3 ++ > > .../br2-external/python-pybind/Config.in | 1 + > > .../br2-external/python-pybind/external.desc | 1 + > > .../br2-external/python-pybind/external.mk | 1 + > > .../package/python-pybind-example/Config.in | 5 ++ > > .../package/python-pybind-example/example.cpp | 16 +++++++ > > .../python-pybind-example.mk | 47 ++++++++++++++++++ > > .../tests/package/sample_python_pybind.py | 4 ++ > > .../tests/package/test_python_pybind.py | 48 +++++++++++++++++++ > > 9 files changed, 126 insertions(+) > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/Config.in > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/external.desc > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/external.mk > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > > create mode 100644 > support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/ > python-pybind-example.mk > > create mode 100644 > support/testing/tests/package/sample_python_pybind.py > > create mode 100644 support/testing/tests/package/test_python_pybind.py > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 21e4f2a84c..130ac3db73 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1120,6 +1120,9 @@ F: package/liquid-dsp/ > > F: package/pixiewps/ > > F: package/python-pybind/ > > F: package/reaver/ > > +F: support/testing/tests/package/br2-external/python-pybind > > +F: support/testing/tests/package/sample_python_pybind.py > > +F: support/testing/tests/package/test_python_pybind.py > > > > N: Guo Ren > > F: arch/Config.in.csky > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/Config.in > b/support/testing/tests/package/br2-external/python-pybind/Config.in > > new file mode 100644 > > index 0000000000..70c77157b3 > > --- /dev/null > > +++ b/support/testing/tests/package/br2-external/python-pybind/Config.in > > @@ -0,0 +1 @@ > > +source > "$BR2_EXTERNAL_PYTHON_PYBIND_PATH/package/python-pybind-example/Config.in" > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/external.desc > b/support/testing/tests/package/br2-external/python-pybind/external.desc > > new file mode 100644 > > index 0000000000..eef5e0f5a0 > > --- /dev/null > > +++ > b/support/testing/tests/package/br2-external/python-pybind/external.desc > > @@ -0,0 +1 @@ > > +name: PYTHON_PYBIND > > diff --git a/support/testing/tests/package/br2-external/python-pybind/ > external.mk b/support/testing/tests/package/br2-external/python-pybind/ > external.mk > > new file mode 100644 > > index 0000000000..3501f3135e > > --- /dev/null > > +++ b/support/testing/tests/package/br2-external/python-pybind/ > external.mk > > @@ -0,0 +1 @@ > > +include $(sort $(wildcard > $(BR2_EXTERNAL_PYTHON_PYBIND_PATH)/package/*/*.mk)) > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > > new file mode 100644 > > index 0000000000..773d021a53 > > --- /dev/null > > +++ > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/Config.in > > @@ -0,0 +1,5 @@ > > +config BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE > > + bool "python-pybind-example" > > + depends on BR2_PACKAGE_PYTHON_PYBIND > > + help > > + This test creates a cpp macro later used on target in python > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > > new file mode 100644 > > index 0000000000..f2eea8e48d > > --- /dev/null > > +++ > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/example.cpp > > @@ -0,0 +1,16 @@ > > +#include > > +namespace py = pybind11; > > + > > +int add (int i, int j) { > > + return i + j; > > +} > > + > > +PYBIND11_MODULE (example, m) { > > + // optional module description > > + m.doc() = "pybind11 example plugin"; > > + // test a module method > > + m.def("add", &add, "example::add adds two integer numbers"); > > + // test a module attribute > > + py::object hello = py::cast("Hello World"); > > + m.attr("says") = hello; > > +} > > diff --git > a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/ > python-pybind-example.mk > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/ > python-pybind-example.mk > > new file mode 100644 > > index 0000000000..85dd09d93f > > --- /dev/null > > +++ > b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/ > python-pybind-example.mk > > @@ -0,0 +1,47 @@ > > > +################################################################################ > > +# > > +# python-pybind-example > > +# > > > +################################################################################ > > + > > +# this builds a C++ macro "add(a,b)" > > +# that we expose to host-python with a custom install > > +# and that the python test script will later use > > +PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = host-python-pybind > > + > > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = $(HOST_CXXFLAGS) > > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -Wall -shared > > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += -std=c++11 -fPIC > > + > > +ifeq ($(BR2_PACKAGE_PYTHON3),y) > > +PYTHON_PYBIND_PYVER = python$(PYTHON3_VERSION_MAJOR) > > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python3 > > +else > > +PYTHON_PYBIND_PYVER = python$(PYTHON_VERSION_MAJOR) > > +PYTHON_PYBIND_PYTHON = $(HOST_DIR)/usr/bin/python2 > > +endif > > + > > +# retrieve pybind11 include paths > > +PYTHON_PYBIND_EXAMPLE_CXX_FLAGS += \ > > + $(shell $(PYTHON_PYBIND_PYTHON) -m pybind11 --includes) > > + > > +# .so to be installed must have exact suffix > > +# otherwise import() in python will not work > > +HOST_LIB_BINARY_SUFFIX = \ > > + $(shell $(PYTHON_PYBIND_PYTHON)-config --extension-suffix) > > + > > +define PYTHON_PYBIND_EXAMPLE_BUILD_CMDS > > + $(INSTALL) $(PYTHON_PYBIND_EXAMPLE_PKGDIR)/example.cpp $(@D) > > + cd $(@D); \ > > + $(HOSTCXX) $(PYTHON_PYBIND_EXAMPLE_CXX_FLAGS) \ > > + example.cpp -o > example$(HOST_LIB_BINARY_SUFFIX) > > +endef > > + > > +# installs into host/python sys.path > > +# so the new macro is naturally known > > +define PYTHON_PYBIND_EXAMPLE_INSTALL_TARGET_CMDS > > + $(INSTALL) -D -m 755 $(@D)/example$(HOST_LIB_BINARY_SUFFIX) \ > > + > $(HOST_DIR)/usr/lib/$(PYTHON_PYBIND_PYVER)/example$(HOST_LIB_BINARY_SUFFIX) > > +endef > > + > > +$(eval $(generic-package)) > > diff --git a/support/testing/tests/package/sample_python_pybind.py > b/support/testing/tests/package/sample_python_pybind.py > > new file mode 100644 > > index 0000000000..605c0bab15 > > --- /dev/null > > +++ b/support/testing/tests/package/sample_python_pybind.py > > @@ -0,0 +1,4 @@ > > +#!/usr/bin/env python > > +import example > > +print(example.add(1, 2)) > > +print(example.says) > > diff --git a/support/testing/tests/package/test_python_pybind.py > b/support/testing/tests/package/test_python_pybind.py > > new file mode 100644 > > index 0000000000..7a68d6512a > > --- /dev/null > > +++ b/support/testing/tests/package/test_python_pybind.py > > @@ -0,0 +1,48 @@ > > +import os > > +import infra > > +import subprocess > > +from tests.package.test_python import TestPythonPackageBase > > + > > +class TestPythonPybind (infra.basetest.BRTest): > > + config = TestPythonPackageBase.config # python minimal requirements > > + sample_script = "tests/package/sample_python_pybind.py" > > + # ship examples macro & installs it to host > > + br2_external = > [infra.filepath("tests/package/br2-external/python-pybind")] > > + > > +class TestPythonPy2Pybind (TestPythonPybind): > > + __test__ = True > > + config = TestPythonPybind.config + \ > > + """ > > + BR2_PACKAGE_PYTHON=y > > + BR2_PACKAGE_PYTHON_PYBIND=y > > + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y > > + """ > > + > > + def test_run(self): > > + host_interpreter = > os.path.join(self.builddir,"host","usr","bin","python") > > + # test new c++->py macro exposed to host interpreter > > + cmd = [host_interpreter, > infra.filepath(self.sample_script)] > > + output = subprocess.check_output(cmd) > > + result = int(output.splitlines()[0]) > > + attribute = output.splitlines()[1].decode("utf-8") > > + self.assertEqual(result,3) # 2+1 using '+' macro from cpp > > + self.assertEqual(attribute,"Hello World") # macro special > attribute > > + > > +class TestPythonPy3Pybind (TestPythonPybind): > > + __test__ = True > > + config = TestPythonPybind.config + \ > > + """ > > + BR2_PACKAGE_PYTHON3=y > > + BR2_PACKAGE_PYTHON_PYBIND=y > > + BR2_PACKAGE_PYTHON_PYBIND_EXAMPLE=y > > + """ > > + > > + def test_run(self): > > + host_interpreter = > os.path.join(self.builddir,"host","usr","bin","python") > > + # test new c++->py macro exposed to host interpreter > > + cmd = [host_interpreter, > infra.filepath(self.sample_script)] > > + output = subprocess.check_output(cmd) > > + result = int(output.splitlines()[0]) > > + attribute = output.splitlines()[1].decode("utf-8") > > + self.assertEqual(result,3) # 2+1 using '+' macro from cpp > > + self.assertEqual(attribute,"Hello World") # macro special > attribute > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bernd.kuhls at t-online.de Sat Jan 8 10:26:20 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 11:26:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: bump version to 0.23.5 Message-ID: <20220108102620.1603341-1-bernd.kuhls@t-online.de> Switched project URL to https. Added upstream patch to fix build error wich uClibc: https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 https://github.com/MusicPlayerDaemon/MPD/pull/1382 Changelog: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.5/NEWS Signed-off-by: Bernd Kuhls --- ...2-lib-alsa-Error-add-missing-include.patch | 25 +++++++++++++++++++ package/mpd/Config.in | 2 +- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 package/mpd/0002-lib-alsa-Error-add-missing-include.patch diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch new file mode 100644 index 0000000000..c45a087a54 --- /dev/null +++ b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch @@ -0,0 +1,25 @@ +From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 +From: aeolio +Date: Tue, 14 Dec 2021 09:01:23 +0100 +Subject: [PATCH] lib/alsa/Error: add missing #include + +Downloaded from upstream commit: +https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 + +Signed-off-by: Bernd Kuhls +--- + src/lib/alsa/Error.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx +index cd351f37d1..8ceb4417ca 100644 +--- a/src/lib/alsa/Error.cxx ++++ b/src/lib/alsa/Error.cxx +@@ -29,6 +29,7 @@ + + #include "Error.hxx" + ++#include + #include + + namespace Alsa { diff --git a/package/mpd/Config.in b/package/mpd/Config.in index eb10151df3..fc0f409448 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -16,7 +16,7 @@ menuconfig BR2_PACKAGE_MPD it can play a variety of sound files while being controlled by its network protocol. - http://www.musicpd.org + https://www.musicpd.org if BR2_PACKAGE_MPD diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index cb9d05cd32..56f88490cf 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b300625701005c6b14649f11dac118d05540529a5385d05b7c3062c0ce08f399 mpd-0.23.3.tar.xz +sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 7bda0963c6..42165b1308 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).3 +MPD_VERSION = $(MPD_VERSION_MAJOR).5 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt -- 2.30.2 From romain.naour at smile.fr Sat Jan 8 10:31:52 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 11:31:52 +0100 Subject: [Buildroot] package/aravis: new package In-Reply-To: References: Message-ID: Hello Marc, Le 07/01/2022 ? 21:08, marc.chalain at mailoo.org a ?crit?: > Thank for all, > > I will send a new version quickly, but some questions first: > > > >> +ARAVIS_VERSION = 0.8.16 > > Aravis project is moving fast, there is a new version 0.8.20 already. > I'm fine with this version since it was released recently: > https://github.com/AravisProject/aravis/releases/tag/0.8.16 > > > The 0.8.16 is available from June 2021. I had clearly well tested this version with several kernel configuration. What is it better ? the last version or the most tested version ? > > To send 0.8.20 I will need few weeks, to test. Using a version you are confident with is OK. Maybe add a comment in the commit log about your choice to use a previous version than the latest one. > > > >> +ARAVIS_SITE = $(call github,AravisProject,aravis,$(ARAVIS_VERSION)) >> +ARAVIS_DEPENDENCIES = \ >> +??? host-pkgconf \ >> +??? libglib2 \ >> +??? libxml2 > > There is a list of dependencies in the Readme: > > https://github.com/AravisProject/aravis/blob/main/README.md#install-dependencies-on-ubuntu-2004 > > especially gstreamer and plugins etc.. > > > This rules is just for GigE Camera and not USB3Vision. I haven't tested this feature. The gstreamer is not mandator, it is only for the viewer. I am focused on Embeded system without any kind of display. > > If the gstreamer or libusb3 are availables, meson is able to detect and add them during the configuration process. > > To add as dependencies, forces to build the optionals features. > > What's the best ? If you don't use an optional dependency, we recommend to disable it explicitly. Letting an optional dependency auto detected by a package without any handling in the Buildroot package is a problem for the build reproducibility. Best regards, Romain > > > > Thank you., best regards, > > Marc. > > > > > > > > De : Thomas Petazzoni > ? : Romain Naour > Sujet : Re: [Buildroot] package/aravis: new package > Date : 06/01/2022 10:37:59 Europe/Paris > Copie ? : marc.chalain at mailoo.org; > ???buildroot at buildroot.org; > ???Eric Le Bihan ; > ???Marc Chalain > > Hello, > > On Thu, 6 Jan 2022 10:24:53 +0100 > Romain Naour wrote: > >>> diff --git a/package/aravis/Config.in b/package/aravis/Config.in >>> new file mode 100644 >>> index 0000000000..02c71c44da >>> --- /dev/null >>> +++ b/package/aravis/Config.in >>> @@ -0,0 +1,16 @@ >>> +config BR2_PACKAGE_ARAVIS >>> +??? bool "aravis - GigE Camera" > > Just: > > bool "aravis" > >>> +??? depends on BR2_USE_WCHAR >>> +??? depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL >>> +??? depends on BR2_PACKAGE_PCRE_16 >>> +??? depends on BR2_PACKAGE_PCRE_32 > > Please use "select" for pcre. > >>> +ARAVIS_LICENSE_FILES = COPYING >>> +ARAVIS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) >> >> Is gettext a mandatory dependency ? >> At least gettext should be in ARAVIS_DEPENDENCIES when NLS support is enabled. > > No, don't add gettext directly, use $(TARGET_NLS_DEPENDENCIES), which > will automatically add (or not) host-gettext and/or gettext to the > dependencies, depending on when it's needed or not. > > Thomas > From peter at korsgaard.com Sat Jan 8 10:40:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:40:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/freetype: bump version to 2.11.1 In-Reply-To: <20220108093206.999409-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:32:06 +0100") References: <20220108093206.999409-1-bernd.kuhls@t-online.de> Message-ID: <87zgo6h5mw.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Updated license hash and location of LICENSE.TXT due to upstream commit: > https://gitlab.freedesktop.org/freetype/freetype/-/commit/0606350c2a08eec120e4557a07f252e1c72963ce > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 10:39:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:39:42 +0100 Subject: [Buildroot] [git commit] package/freetype: bump version to 2.11.1 Message-ID: <20220108103510.56A41811B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24999e2025fb53b237b4f8f79244e45b0b366ca0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updated license hash and location of LICENSE.TXT due to upstream commit: https://gitlab.freedesktop.org/freetype/freetype/-/commit/0606350c2a08eec120e4557a07f252e1c72963ce Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/freetype/freetype.hash | 8 ++++---- package/freetype/freetype.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 36571b51af..7abc3d96da 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ -sha1 0181862673f7216ad2b5074f95fc131209e30b27 freetype-2.10.4.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.11.1/ +sha1 86bdc98b37efe447cf53420bf2c18402ff905112 freetype-2.11.1.tar.xz # Locally calculated -sha256 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784 freetype-2.10.4.tar.xz -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT +sha256 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 freetype-2.11.1.tar.xz +sha256 c85e842b7ff04d95dab7d68e812773de0f8b67940e5449d35b42c66eb0f619fe LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 59d6dc0eb8..912e6c4daa 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,13 +4,13 @@ # ################################################################################ -FREETYPE_VERSION = 2.10.4 +FREETYPE_VERSION = 2.11.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" FREETYPE_LICENSE = Dual FTL/GPL-2.0+ -FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_CONFIG_SCRIPTS = freetype-config From peter at korsgaard.com Sat Jan 8 10:48:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:48:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.81.0 In-Reply-To: <20220108094756.1057296-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:47:56 +0100") References: <20220108094756.1057296-1-bernd.kuhls@t-online.de> Message-ID: <87v8yuh5a2.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://curl.se/changes.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sat Jan 8 10:49:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 11:49:20 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/python-pybind: fix upgrade to version 2.6.1 In-Reply-To: References: <20211206193109.21218-1-guillaume.bressaix@gmail.com> <20211206215730.GE2603@scaer> <7605fae5-42db-115c-e87a-0dbc3597a99a@mind.be> Message-ID: <0652aacd-46ea-6d4d-0e0b-ee9c6c6ba399@mind.be> On 08/01/2022 11:09, Tomi Valkeinen wrote: > On 07/01/2022 23:49, Arnout Vandecappelle wrote: >> >> >> On 03/01/2022 09:24, Tomi Valkeinen wrote: >>> Hi, >>> >>> On 06/12/2021 23:57, Yann E. MORIN wrote: >>> >>>> So I think we really, really need a package (like scipy) that actually >>>> makes use of pybind, so we can see how it works, and to fix it... >>> >>> Jfyi, there are two relatively simple packages in buildroot that can use >>> pybind: kmsxx and rwmem. Both use meson for building. >>> >>> I can test the next version of this series with those packages. >> >> ??I tried to do that. Unfortunately, it turns out that both of those packages >> use the CMake way of finding the pybind11 dependency, and apparently our >> cross-compilation.conf doesn't support cmake yet... So it's not that trivial. > > Yes, I had a look at this also. kmsxx and rwmem use the plain meson dependency() > to find the package. Works on Ubuntu, as Ubuntu's pybind11 installs the cmake > files. I also made sure that python-pybind installs the cmake files. I just haven't tested if they actually work. I already noticed that there's one of the files that is not cross-compile friendly because it found /usr/bin/python. But maybe that one isn't actually used in practice. > I started testing with a more manual approach to finding pybind11, but didn't > get it working yet. No, the cmake approach should be fine. We just have to update the meson cross-compilation.conf so it points to STAGING_DIR/usr/share/cmake. Regards, Arnout From thomas.petazzoni at bootlin.com Sat Jan 8 10:51:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 11:51:40 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> Message-ID: <20220108115140.760e195f@windsurf> On Tue, 4 Jan 2022 21:54:55 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 5.41 in > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > readelf.c: In function 'do_auxv_note': > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > > Signed-off-by: Fabrice Fontaine I am afraid it seems like this didn't fix the problem, see: http://autobuild.buildroot.net/results/957/9573e8b01d8f21cd89a67475daabdeef533d31d7/build-end.log ac_cv_prog_cc_c99='-std=gnu99' is properly passed to the configure script, but it still fails. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sat Jan 8 10:53:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 11:53:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcap: bump version to 2.62 In-Reply-To: <20220108094533.1025401-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:45:33 +0100") References: <20220108094533.1025401-1-bernd.kuhls@t-online.de> Message-ID: <87r19ih51l.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Removed patch which was applied upstream: > https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=afbc554d16a32ed352191e49b3673f2f72d0002f > Release notes: > https://sites.google.com/site/fullycapable/release-notes-for-libcap > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 10:47:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:47:50 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 7.81.0 Message-ID: <20220108104742.9ECD082A00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efd0435add883e24b1a7053c12e2d71df7f5c247 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://curl.se/changes.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c488df57b1..63d6ba306c 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-7.80.0.tar.xz.asc +# https://curl.se/download/curl-7.81.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab curl-7.80.0.tar.xz +sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 24591f2e0a..20ebb4f271 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.80.0 +LIBCURL_VERSION = 7.81.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From peter at korsgaard.com Sat Jan 8 10:49:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 11:49:55 +0100 Subject: [Buildroot] [git commit] package/libcap: bump version to 2.62 Message-ID: <20220108104742.A7F1C82B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5260f3189b6479dac1aa07af41f55056352a3c40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which was applied upstream: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=afbc554d16a32ed352191e49b3673f2f72d0002f Release notes: https://sites.google.com/site/fullycapable/release-notes-for-libcap Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...file-don-t-overwrite-empty-when-generatin.patch | 50 ---------------------- package/libcap/libcap.hash | 2 +- package/libcap/libcap.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch b/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch deleted file mode 100644 index a47a2c788e..0000000000 --- a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dc507a812d931c24f1ac98c811fdd29bffa21da9 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 24 Aug 2021 00:36:40 +0200 -Subject: [PATCH] libcap/Makefile: don't overwrite 'empty' when generating - loader.txt - -objcopy takes an input file and an output file as arguments. If the -output file is left out, the input file will be overwritten. - -Since the objcopy command used to generate loader.txt only does a -dump-section and no filtering, in practice there is no change to empty. -However, as a side-effect, its timestamp is updated. The timestamp of -empty and of loader.txt will be more or less the same; however, -loader.txt is closed just before the output file is closed, so it's -possible that the timestamp of loader.txt is just a little bit earlier. -If this happens, it causes loader.txt to be rebuilt later, which in turn -causes a number of other object files to be rebuilt. - -Usually that's harmless, but it sometimes causes the rebuild to happen -during 'make install'. This is particularly annoying if 'make install' -is done as root, since loader.txt becomes owned by root in that case. - -Fix this by specifying a harmless output file: /dev/null. - -While we're at it, take in an upstream change that removes the redundant -redirect. - -Fixes: ee3b25c0a877fa74d1aec88f325ac45b09963c82 - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - libcap/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libcap/Makefile b/libcap/Makefile -index 47cf8f4..18e4f4f 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -105,7 +105,7 @@ empty: empty.c - $(CC) -o $@ $< - - loader.txt: empty -- $(OBJCOPY) --dump-section .interp=/dev/stdout $< > $@ -+ $(OBJCOPY) --dump-section .interp=$@ $< /dev/null - - cap_magic.o: execable.h execable.c loader.txt - $(CC) $(CFLAGS) $(IPATH) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@ --- -2.31.1 - diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index eb8fe43f6f..396e592c5b 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97 libcap-2.52.tar.xz +sha256 190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2 libcap-2.62.tar.xz # Hash for license file: sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 45700e56ec..42acca9082 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.52 +LIBCAP_VERSION = 2.62 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause From romain.naour at smile.fr Sat Jan 8 10:56:54 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 11:56:54 +0100 Subject: [Buildroot] [PATH v2 1/1] docs/manual: add qemu defconfigs gitlab test In-Reply-To: <20200915165156.179380a9@windsurf.hq.k.grp> References: <20200915103806.13785-1-jugurtha.belkalem@smile.fr> <20200915165156.179380a9@windsurf.hq.k.grp> Message-ID: <90d1cd65-6cb7-d708-9b57-2089c5485d63@smile.fr> Hello Thomas, Le 15/09/2020 ? 16:51, Thomas Petazzoni a ?crit?: > On Tue, 15 Sep 2020 12:38:06 +0200 > Jugurtha BELKALEM wrote: > >> +=== Adding qemu defconfig gitlab test >> + >> +Buildroot provides a test script (support/scripts/boot-qemu-image.py) >> +to validate all defconfigs under +board/qemu/. Every supported qemu >> +architecture should append the comment : # qemu_ARCH_defconfig >> +at the end of its command line entry in board/qemu/ARCH/readme.txt (for >> +example aarch64-virt includes : # qemu_aarch64_virt_defconfig). >> +Once a week, every defconfig is tested under gitlab's pipelines : >> +* Launches a qemu instance. >> +* Enters root credentials and checks if login shell is available. >> +* Powers off the instance. >> +The job fails if one of above steps returns unsuccessful status code. >> +to trigger qemu defconfigs test jobs: >> + >> +--------------------- >> + $ git push gitlab HEAD:_defconfig >> +--------------------- > > While I understand the idea of documenting this, I am wondering if the > Buildroot manual is really the right place for this. Indeed, this bit > of documentation is really only useful for the very specific/narrow use > case of qemu defconfigs. > > Should this be in board/qemu/readme.txt ? I'm not sure. Maybe the manual needs a new chapter about the gitlab-ci in general and document all pipeline trigger supported. For a new qemu defconfigs, we need to take care of: - define "# qemu_ARCH_defconfig" tag in the file board/qemu/ARCH/readme.txt - Use board/qemu/post-image.sh post image script and provide the name of the defconfig as argument of this script: BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - Enable host-qemu to use qemu built by Buildroot for the host: BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y Being in the manual would promote gitlab-ci testing with Qemu. Best regards, Romain > > Thomas > From thomas.petazzoni at bootlin.com Sat Jan 8 11:04:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:04:14 +0100 Subject: [Buildroot] [git commit] package/scons: explicitly specify host Python 3 Message-ID: <20220108105818.A2FFA82A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd448234d284dc42730bef0ffa1e6d9b8e5b0096 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All packages using scons are now using Python 3 to run it, so explicitly set scons as using host-python3. This avoids a spurious host Python 2 dependency if BR2_PACKAGE_PYTHON3 is not set (for example, if no Python is packaged for the target). Signed-off-by: Robert Hancock Signed-off-by: Thomas Petazzoni --- package/scons/scons.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/scons/scons.mk b/package/scons/scons.mk index da2ccceb08..a95fa7fd69 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -10,6 +10,8 @@ SCONS_LICENSE = MIT SCONS_LICENSE_FILES = LICENSE.txt SCONS_SETUP_TYPE = distutils +HOST_SCONS_NEEDS_HOST_PYTHON = python3 + HOST_SCONS_INSTALL_OPTS = \ --install-lib=$(HOST_DIR)/lib/scons-$(SCONS_VERSION) From thomas.petazzoni at bootlin.com Sat Jan 8 11:04:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:04:14 +0100 Subject: [Buildroot] [git commit] package/{gpsd, benejson}: drop host-python3 dependency Message-ID: <20220108105818.B72C382B60@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c240410d4b38c7946d2dd65c1c1eec6d172a0814 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These packages needed to depend on host-python3 because their Scons machinery was written in python3, but host-scons itself was depending on host-python. Now that host-scons depends on host-python3, the packages that use host-scons no longer have to carry a host-python3 dependency. The other package using scons, mongodb, does not have a direct dependency on host-python3, but on a number of host Python 3.x modules which are needed during the build, so no changes is necessary there. Signed-off-by: Thomas Petazzoni --- package/benejson/benejson.mk | 2 +- package/gpsd/gpsd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/benejson/benejson.mk b/package/benejson/benejson.mk index f6f936ec71..680e5b5bda 100644 --- a/package/benejson/benejson.mk +++ b/package/benejson/benejson.mk @@ -9,7 +9,7 @@ BENEJSON_SITE = $(call github,codehero,benejson,$(BENEJSON_VERSION)) BENEJSON_LICENSE = MIT BENEJSON_LICENSE_FILES = LICENSE BENEJSON_INSTALL_STAGING = YES -BENEJSON_DEPENDENCIES = host-python3 host-scons +BENEJSON_DEPENDENCIES = host-scons # wchar support needs to be manually disabled ifeq ($(BR2_USE_WCHAR),) diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 61391f0e9b..636c6c95ba 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -12,7 +12,7 @@ GPSD_CPE_ID_VENDOR = gpsd_project GPSD_SELINUX_MODULES = gpsd GPSD_INSTALL_STAGING = YES -GPSD_DEPENDENCIES = host-python3 host-scons host-pkgconf +GPSD_DEPENDENCIES = host-scons host-pkgconf GPSD_LDFLAGS = $(TARGET_LDFLAGS) GPSD_CFLAGS = $(TARGET_CFLAGS) From thomas.petazzoni at bootlin.com Sat Jan 8 11:04:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:04:14 +0100 Subject: [Buildroot] [git commit] package/scons: bring back Python interpreter call in SCONS variable Message-ID: <20220108105818.AE3C881323@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=726209fc7999986fa414d629ff60d1bc76c63a2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Back in commit f72be49830404fb69480a9e5db4381dfcc6dc8ec ("package/scons: remove python from SCONS"), we changed the SCONS variable to not explicitly invoke the Python interpreter, because some scons-based packages used python2, some python3. Now that the 3 remaining packages using scons (gpsd, mongodb and benejson) all use python3, we can bring back the python3 interpreter call into the SCONS variable, and slightly simplify those packages. Signed-off-by: Thomas Petazzoni --- package/benejson/benejson.mk | 2 +- package/gpsd/gpsd.mk | 6 +++--- package/mongodb/mongodb.mk | 4 ++-- package/scons/scons.mk | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/benejson/benejson.mk b/package/benejson/benejson.mk index 5bb57d028d..f6f936ec71 100644 --- a/package/benejson/benejson.mk +++ b/package/benejson/benejson.mk @@ -41,7 +41,7 @@ endif # Shared enabled define BENEJSON_BUILD_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ - $(HOST_DIR)/bin/python3 $(SCONS) $(BENEJSON_SCONS_TARGETS)) + $(SCONS) $(BENEJSON_SCONS_TARGETS)) endef define BENEJSON_INSTALL_STAGING_CMDS diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index ff924c49e0..61391f0e9b 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -211,7 +211,7 @@ GPSD_SCONS_ENV += \ define GPSD_BUILD_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS)) endef @@ -219,7 +219,7 @@ define GPSD_INSTALL_TARGET_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(TARGET_DIR) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS) \ $(if $(BR2_PACKAGE_HAS_UDEV),udev-install,install)) endef @@ -241,7 +241,7 @@ define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(STAGING_DIR) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS) \ install) endef diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index ede03e44d6..c33c3c2eb7 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -86,7 +86,7 @@ endif define MONGODB_BUILD_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ $(MONGODB_SCONS_TARGETS)) @@ -94,7 +94,7 @@ endef define MONGODB_INSTALL_TARGET_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ --prefix=$(TARGET_DIR)/usr \ diff --git a/package/scons/scons.mk b/package/scons/scons.mk index a95fa7fd69..bc5d2a1ef9 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -18,4 +18,4 @@ HOST_SCONS_INSTALL_OPTS = \ $(eval $(host-python-package)) # variables used by other packages -SCONS = $(HOST_DIR)/bin/scons $(if $(QUIET),-s) +SCONS = $(HOST_DIR)/bin/python3 $(HOST_DIR)/bin/scons $(if $(QUIET),-s) From romain.naour at smile.fr Sat Jan 8 11:04:30 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 12:04:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <20201126152832.1115350-1-nolange79@gmail.com> References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> Hello Norbert, Le 26/11/2020 ? 16:28, Norbert Lange a ?crit?: > Systemd has very many options, adding a way for the user > to set custom options can help customizations > without changing buildroot files. This is also true of any package in Buildroot. Users may want to provide a custom option that is not handled yet by Buildroot. What if the option provided in BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG requires a build dependency ? Best regards, Romain From romain.naour at smile.fr Sat Jan 8 11:20:01 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 12:20:01 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: <20201126144722.502163-1-nolange79@gmail.com> References: <20201126144722.502163-1-nolange79@gmail.com> Message-ID: Le 26/11/2020 ? 15:47, Norbert Lange a ?crit?: > Especially for read-only filesystems it is helpfull to > pre-create all folders for non-volatile paths. > > This needs to run under fakeroot to allow setting > uids/gids/perms for the target fs. > > As systemd-tmpfilesd also supports specifiers, but so far > only resolves those from the host, it is necessary > to specially handle entries that contain problematic > specifiers. > > Entries containing problematic specifiers are either skipped, > but in some cases its possible to instead manually replace > them with correct replacements from the target. > > Signed-off-by: Norbert Lange > --- > v1->v2 > * add a script to skip/handle specifiers that might > otherwise take information from the host > > package/systemd: tmpfilesv2 > > Signed-off-by: Norbert Lange > --- > package/systemd/fakeroot_tmpfiles.sh | 66 ++++++++++++++++++++++++++++ > package/systemd/systemd.mk | 9 +++- > 2 files changed, 73 insertions(+), 2 deletions(-) > create mode 100644 package/systemd/fakeroot_tmpfiles.sh > > diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh > new file mode 100644 > index 0000000000..f5e4fb234c > --- /dev/null > +++ b/package/systemd/fakeroot_tmpfiles.sh > @@ -0,0 +1,66 @@ > +#!/bin/sh > +# > +# until a solution like [1] is upstreamed, > +# its necessary to mask out specs which will infer properties > +# from the host. > +# > +# TMPDIR= TEMP= TMP= makes sure %T and %V are set to the default > +# > +# shell expansion is critical to be POSIX compliant, > +# this script wont work with zsh in its default mode for example. > +# > +# The script takes everal measures to handle more complex stuff > +# like passing this correctly: > +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n > +# > +# [1] - https://github.com/systemd/systemd/issues/16183 It seems that systemd now include what you need since version 249 containing the commit [1]. The fakeroot_tmpfiles.sh script seems not neceesary anymore. [1] https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 Best regards, Romain > + > +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || > + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles > + > +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || > + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } > + > +# read OS specific variables from file, > +# buildroot already wrote this in target-finalize, > +# users might replace it by using an overlay > +BUILD_ID=; ID=; VERSION_ID=; VARIANT_ID=; > +for f in /etc/os-release /usr/lib/os-release; do > + # dont blindly set all variables, only pick the ones we need > + [ -r "$1"/$f ] && > + eval "$(sed -n -e '/^BUILD_ID=/p' -e '/^ID=/p' -e '/^VERSION_ID=/p' -e '/^VARIANT_ID=/p' "$1"/$f)" && > + break > +done > + > +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | > + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | > + while read -r line; do > + # it is allowed to use quotes around arguments, > + # so let the shell pack the arguments > + eval "set -- $line" > + > + # dont output warnings for directories we dont process > + [ "${2#/dev}" = "${2}" ] && [ "${2#/dev}" = "${2}" ] && > + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && > + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || > + continue > + > + # blank out all specs that are ok to use, > + # test if some remain > + if echo "$2 ${7-}" | sed -e 's,%[%ChLStTgGuUV],,g' | grep -v -q '%'; then > + # no "bad" specifiers, pass the line unmodified > + eval "printf '%s\n' '$line'" > + elif echo "$2 ${7-}" | sed -e 's,%[%ChLStTgGuUVBowW],,g' | grep -v -q '%'; then > + # something we can fix > + eval "printf '%s\n' '$line'" | > + sed -e "s#%B#$BUILD_ID#g" -e "s#%o#$ID#g" -e "s#%w#$VERSION_ID#g" -e "s#%W#$VARIANT_ID#g" > + else > + # warn > + eval "printf 'ignored spec: %s\n' '$line' 1>&2" > + fi > + done | > +\ > +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ > + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ > + --exclude-prefix=/tmp --exclude-prefix=/mnt \ > + - > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index ae99c02abf..629f4022d7 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -654,10 +654,15 @@ endef > > SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > +define SYSTEMD_CREATE_TMPFILES_HOOK > + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ > + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) > +endef > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL > > SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) > SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) > @@ -717,7 +722,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dvconsole=false \ > -Dquotacheck=false \ > -Dsysusers=false \ > - -Dtmpfiles=false \ > + -Dtmpfiles=true \ > -Dimportd=false \ > -Dhwdb=false \ > -Drfkill=false \ > From thomas.petazzoni at bootlin.com Sat Jan 8 11:20:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:20:53 +0100 Subject: [Buildroot] [PATCH] package/scons: explicitly specify host Python 3 In-Reply-To: <20200714033927.1516172-1-hancock@sedsystems.ca> References: <20200714033927.1516172-1-hancock@sedsystems.ca> Message-ID: <20220108122053.5ac56167@windsurf> On Mon, 13 Jul 2020 21:39:27 -0600 Robert Hancock wrote: > All packages using scons are now using Python 3 to run it, so > explicitly set scons as using host-python3. This avoids a > spurious host Python 2 dependency if BR2_PACKAGE_PYTHON3 is not > set (for example, if no Python is packaged for the target). > > Signed-off-by: Robert Hancock > --- > package/scons/scons.mk | 2 ++ > 1 file changed, 2 insertions(+) After so much time: patch applied! I also took the opportunity of your patch to do two scons-related changes: https://git.buildroot.org/buildroot/commit/?id=726209fc7999986fa414d629ff60d1bc76c63a2c https://git.buildroot.org/buildroot/commit/?id=c240410d4b38c7946d2dd65c1c1eec6d172a0814 Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 11:21:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:21:59 +0100 Subject: [Buildroot] [git commit] package/rhash: fix activation of gettext Message-ID: <20220108111557.3CBB282A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5630e83c8452d3e9039feb15fd30ea005bfc6b55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rhash/rhash.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index d19c355cbb..02af0aa57b 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -15,9 +15,9 @@ RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) -RHASH_CONF_OPTS += --disable-gettext -else RHASH_CONF_OPTS += --enable-gettext +else +RHASH_CONF_OPTS += --disable-gettext endif ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) From thomas.petazzoni at bootlin.com Sat Jan 8 11:22:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 12:22:28 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/rhash: fix activation of gettext In-Reply-To: <20201113065124.30364-1-fontaine.fabrice@gmail.com> References: <20201113065124.30364-1-fontaine.fabrice@gmail.com> Message-ID: <20220108122228.6ec1433a@windsurf> On Fri, 13 Nov 2020 07:51:24 +0100 Fabrice Fontaine wrote: > Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is > wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set > > Signed-off-by: Fabrice Fontaine > --- > package/rhash/rhash.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Sat Jan 8 11:55:38 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 12:55:38 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: <20201126144745.502228-1-nolange79@gmail.com> References: <20201126144745.502228-1-nolange79@gmail.com> Message-ID: <06dd49b7-5abc-7a18-2d56-3f69e624e8b7@smile.fr> Hello Norbert, Le 26/11/2020 ? 15:47, Norbert Lange a ?crit?: > journald supports catalog files, or rather a binary database of > those. > Functionality added includes: > > - A config option allows enabling the binary database. > > - if the option is enabled, the database is built and moved to > /usr/share/factory. A symlink is created in /var pointing to > that file. > If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the > language whitelist are deleted first. > > - the service normally used for creating the DB during boot, > and the catalog source files used as input are deleted. > > The move to /usr/share/factory is helpful for having /usr as whole > system distribution. > > Signed-off-by: Norbert Lange > --- > v1->v2: > - Moved all logic into systemd.mk > - solved the LOCALE_PURGE order that way > - use the factory to store the file > - option to enable the DB (similar to udev HWDB) > - cant be anabled with !ROOTFS_RW, tons of > issues with that one > v2->v3: > - use backticks instead of $$() > - be more explicit about what happens in > SYSTEMD_LOCALE_PURGE_CATALOGS > > Signed-off-by: Norbert Lange > --- > package/systemd/Config.in | 14 +++++++++++++ > package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index ec34478e3d..d576e6035b 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD > > http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands > > +config BR2_PACKAGE_SYSTEMD_CATALOGDB > + bool "enable journal catalog database installation" > + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic > + help > + Build and install the journal catalog database. > + > + catalog files are used to provide extended and potentially localized > + messages for the journal. > + > + The original catalog files will be built into a DB at > + /usr/share/factory/var/lib/systemd/catalog/database. > + > + https://www.freedesktop.org/wiki/Software/systemd/catalog/ > + > config BR2_PACKAGE_SYSTEMD_LOCALED > bool "enable locale daemon" > help > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index cb12f667d6..ae99c02abf 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD > $(SYSTEMD_INSTALL_NETWORK_CONFS) > endef > > +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) > +define SYSTEMD_LOCALE_PURGE_CATALOGS > + # go through all files with scheme ..catalog > + # and remove those where is not in LOCALE_NOPURGE > + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ Why not "systemd.*.catalog" ? On my system, all catalog files with are nammed starting with "systemd." > + do \ > + basename=$${cfile##*/}; \ > + basename=$${basename%.catalog}; \ > + langext=$${basename#*.}; \ > + [ "$$langext" = "$${basename}" ] && continue; \ > + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ > + rm -f "$$cfile"; \ > + done > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) > +define SYSTEMD_UPDATE_CATALOGS > + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog > + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ > + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database > + rm $(TARGET_DIR)/var/lib/systemd/catalog/database > + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ > + $(TARGET_DIR)/var/lib/systemd/catalog/database > + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ > + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS > +endif > + > +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ So we remove this directory. Why adding SYSTEMD_LOCALE_PURGE_CATALOGS then ? Best regards, Romain > + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > From peter at korsgaard.com Sat Jan 8 12:30:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 13:30:37 +0100 Subject: [Buildroot] [PATCH] busybox: background udhcpc by default if no lease is obtained In-Reply-To: <20211216124048.5968-1-lothar.felten@gmail.com> (Lothar Felten's message of "Thu, 16 Dec 2021 13:40:48 +0100") References: <20211216124048.5968-1-lothar.felten@gmail.com> Message-ID: <87mtk6h0k2.fsf@dell.be.48ers.dk> >>>>> "Lothar" == Lothar Felten writes: > The current behavior for busybox' udhcpc is to terminate if no lease is > obtained at start up. Therefore no address is acquired if the link is > established afterwards. > By setting the -b flag udhcpc will background allowing the link to be > established at any time. > Signed-off-by: Lothar Felten I was afraid that this would break the avahi-autoipd fallback logic, but looking at the udhcpc logic it still triggers the leasefail action on timeout, so that should be fine. > --- > package/busybox/busybox.config | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config > index 1ea810e5be..a854747286 100644 > --- a/package/busybox/busybox.config > +++ b/package/busybox/busybox.config > @@ -970,7 +970,7 @@ CONFIG_UDHCP_DEBUG=0 > CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 > CONFIG_FEATURE_UDHCP_RFC3397=y > CONFIG_FEATURE_UDHCP_8021Q=y > -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n -O search" > +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R -n -O search" Using -b (background on lease fail) and -n (exit on lease fail) together doesn't make much sense, so I've dropped -n. We also have busybox-minimal.config, so I've added it there as well and applied, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 12:32:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 13:32:18 +0100 Subject: [Buildroot] [git commit] busybox: background udhcpc by default if no lease is obtained Message-ID: <20220108122611.743AD82AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f33654365ffa8fc1b3d8f9e5394a81abb776f66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The current behavior for busybox' udhcpc is to terminate if no lease is obtained at start up. Therefore no address is acquired if the link is established afterwards. By setting the -b flag udhcpc will background allowing the link to be established at any time. Signed-off-by: Lothar Felten [Peter: drop incompatible -n, also fixup busybox-minimal.config] Signed-off-by: Peter Korsgaard --- package/busybox/busybox-minimal.config | 2 +- package/busybox/busybox.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index a7aa19ea8a..65a347756d 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -961,7 +961,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" # # Print Utilities diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 1ea810e5be..3925521f28 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -970,7 +970,7 @@ CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n -O search" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R -O search" # # Print Utilities From romain.naour at smile.fr Sat Jan 8 12:49:22 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 13:49:22 +0100 Subject: [Buildroot] [PATCH] package/terminology: bump to version 1.12.1 Message-ID: <20220108124922.157020-1-romain.naour@smile.fr> See: https://www.enlightenment.org/news/2022-01-03-terminology-1.12.1 Signed-off-by: Romain Naour --- package/terminology/terminology.hash | 4 ++-- package/terminology/terminology.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index 7e9658482a..2ad10af76f 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum -sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.1.tar.xz.sha256sum +sha256 f8ced9584c2e9ae87452ce7425fd25b2d3e122c7489785d2917890215c6b5aa9 terminology-1.12.1.tar.xz sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index 787c9ad137..c3125c71ec 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.12.0 +TERMINOLOGY_VERSION = 1.12.1 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause -- 2.31.1 From arnout at mind.be Sat Jan 8 13:08:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 14:08:08 +0100 Subject: [Buildroot] [git commit] package/zabbix: new package Message-ID: <20220108130215.59E6982BC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42382a171277ead59e365f5920e757f01c04ac77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Agent is always enabled. Even though a server without agent is a valid use case, the agent doesn't take much space compared to the server so making it optional is not worth it. Optional dependencies (openssl, libcurl, ...) are set globally, even though they are supposedly only used for the server. However, this is not so obvious from configure.ac so it's easy to accidentally miss one. Setting them globally doesn't hurt. The proxy, agent2 and webservice features are left disabled. agent2 requires go. zabbix also has support for sqlite3 as database backend, but only for the proxy, not for the server. Signed-off-by: Alexey Lukyanchuk [Arnout: - BR2_TOOLCHAIN_USES_GLIBC implies the other glibc options. - Fix wrapping in Config.in help text. - Add upstream URL. - Protect comments with "depends on" instead of "if". - Select postgresl/mysql instead of depends (and propagate dependencies). - Remove redundant condition around BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS. - Select PHP extensions instead of depends. - Make optional dependencies automatic instead of Config.in. - Improve some of the help texts. - Bump to 5.4.9 and update hashes. - Add COPYING as license file. - Switch to actual upstream at zabbix.com. - Explicitly disable all unused features. - Disable zabbix user login with '*'. - Don't add user to zabbix group twice. - Do patch of zabbix_*.conf in post-patch hook and do it for all conf files in one shot. - Remove workarounds for pending patches (which were merged). - Put web ui in /var/www/zabbix and SQL files in /var/lib/zabbix. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 + package/Config.in | 1 + package/zabbix/Config.in | 82 +++++++++++++++++++++ package/zabbix/zabbix-agent.service | 17 +++++ package/zabbix/zabbix-server.service | 17 +++++ package/zabbix/zabbix.hash | 4 ++ package/zabbix/zabbix.mk | 133 +++++++++++++++++++++++++++++++++++ 7 files changed, 257 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 25b6a56dc0..f362df2637 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -110,6 +110,9 @@ N: Alexey Brodkin F: board/cubietech/cubieboard2/ F: configs/cubieboard2_defconfig +N: Alexey Lukyanchuk +F: package/zabbix/ + N: Alistair Francis F: board/sifive/ F: boot/opensbi/ diff --git a/package/Config.in b/package/Config.in index 5afd7131fe..0ff44dcd25 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2409,6 +2409,7 @@ endif source "package/xinetd/Config.in" source "package/xl2tp/Config.in" source "package/xtables-addons/Config.in" + source "package/zabbix/Config.in" source "package/znc/Config.in" endmenu diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in new file mode 100644 index 0000000000..f859471b1c --- /dev/null +++ b/package/zabbix/Config.in @@ -0,0 +1,82 @@ +config BR2_PACKAGE_ZABBIX + bool "zabbix" + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_PCRE + help + Zabbix is an enterprise-class open source distributed + monitoring solution.Zabbix is free of cost. Zabbix is written + and distributed under the GPL General Public License version + 2. + + https://zabbix.com + +comment "zabbix need glibc" + depends on !BR2_TOOLCHAIN_USES_GLIBC + +if BR2_PACKAGE_ZABBIX + +comment "zabbix server needs C++ and threads or wchar and dynamic libs" + depends on BR2_USE_MMU + depends on \ + !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) && \ + !(BR2_USE_WCHAR && !BR2_STATIC_LIBS) + +config BR2_PACKAGE_ZABBIX_SERVER + bool "zabbix server" + depends on BR2_USE_MMU # mysql, postgresql + depends on \ + (BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) || \ + (BR2_USE_WCHAR && !BR2_STATIC_LIBS) + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBEVENT + +if BR2_PACKAGE_ZABBIX_SERVER + +choice + prompt "server database backend" + +config BR2_PACKAGE_ZABBIX_SERVER_MYSQL + bool "mysql" + depends on BR2_INSTALL_LIBSTDCPP # mysql + depends on BR2_TOOLCHAIN_HAS_THREADS # mysql + select BR2_PACKAGE_MYSQL + +config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL + bool "postgresql" + depends on BR2_USE_WCHAR # postgresql + depends on !BR2_STATIC_LIBS # postgresql + select BR2_PACKAGE_POSTGRESQL + +endchoice + +config BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS + bool "install SQL dumps" + help + Copy initial database dumps to /var/lib/zabbix/schema + + These still need to be imported into the database by hand. + +config BR2_PACKAGE_ZABBIX_SERVER_COPY_FRONTEND + bool "install web UI to target" + depends on BR2_PACKAGE_PHP # runtime + select BR2_PACKAGE_PHP_EXT_MYSQLI if BR2_PACKAGE_ZABBIX_SERVER_MYSQL + select BR2_PACKAGE_PHP_EXT_PGSQL if BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL + select BR2_PACKAGE_PHP_EXT_BCMATH + select BR2_PACKAGE_PHP_EXT_SOCKETS + select BR2_PACKAGE_PHP_EXT_MBSTRING + select BR2_PACKAGE_PHP_EXT_GD + select BR2_PACKAGE_PHP_EXT_LIBXML2 + select BR2_PACKAGE_PHP_EXT_CTYPE + select BR2_PACKAGE_PHP_EXT_SESSION + select BR2_PACKAGE_PHP_EXT_XMLREADER + select BR2_PACKAGE_PHP_EXT_XMLWRITER + help + Copy web-UI to /var/www/zabbix. You need to set up a web + server to access it. + +comment "zabbix web UI requires PHP" + depends on !BR2_PACKAGE_PHP + +endif + +endif diff --git a/package/zabbix/zabbix-agent.service b/package/zabbix/zabbix-agent.service new file mode 100644 index 0000000000..8b4f45a4fc --- /dev/null +++ b/package/zabbix/zabbix-agent.service @@ -0,0 +1,17 @@ +[Unit] +Description=Zabbix Agent Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/zabbix_agentd +ExecReload=/usr/sbin/zabbix_agentd -R config_cache_reload +RuntimeDirectory=zabbix +PIDFile=/run/zabbix/zabbix_agentd.pid +User=zabbix +Group=zabbix +WatchdogSec=30s +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/package/zabbix/zabbix-server.service b/package/zabbix/zabbix-server.service new file mode 100644 index 0000000000..b8ba0d1707 --- /dev/null +++ b/package/zabbix/zabbix-server.service @@ -0,0 +1,17 @@ +[Unit] +Description=Zabbix Server Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/zabbix_server +ExecReload=/usr/sbin/zabbix_server -R config_cache_reload +RuntimeDirectory=zabbix +PIDFile=/run/zabbix/zabbix_server.pid +User=zabbix +Group=zabbix +WatchdogSec=30s +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash new file mode 100644 index 0000000000..42cc0bda57 --- /dev/null +++ b/package/zabbix/zabbix.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz +sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk new file mode 100644 index 0000000000..e72d831b46 --- /dev/null +++ b/package/zabbix/zabbix.mk @@ -0,0 +1,133 @@ +################################################################################ +# +# zabbix +# +################################################################################ + +ZABBIX_VERSION_MAJOR = 5.4 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) +ZABBIX_LICENSE = GPL-2.0+ +ZABBIX_LICENSE_FILES = README COPYING + +ZABBIX_DEPENDENCIES = pcre +ZABBIX_CONF_OPTS = \ + --with-libpcre=$(STAGING_DIR)/usr/bin/ \ + --without-sqlite3 \ + --enable-agent \ + --disable-agent2 \ + --disable-java \ + --disable-proxy \ + --disable-webservice + +define ZABBIX_USERS + zabbix -1 zabbix -1 * /var/lib/zabbix - - zabbix user +endef + +ZABBIX_SYSTEMD_UNITS += zabbix-agent.service + +define ZABBIX_CHANGE_PIDFILE_LOCATION + $(SED) 's%\#\ PidFile=/tmp/zabbix\(.*\).pid%PidFile=/run/zabbix/zabbix\1.pid%g' $(@D)/conf/zabbix_*.conf +endef +ZABBIX_POST_PATCH_HOOKS += ZABBIX_CHANGE_PIDFILE_LOCATION + +ifeq ($(BR2_PACKAGE_OPENIPMI),y) +ZABBIX_CONF_OPTS += --with-openipmi=$(STAGING_DIR)/usr +ZABBIX_DEPENDENCIES += openipmi +else +ZABBIX_CONF_OPTS += --without-openipmi +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +ZABBIX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config +ZABBIX_DEPENDENCIES += libcurl +else +ZABBIX_CONF_OPTS += --without-libcurl +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +ZABBIX_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr/bin/xml2-config +ZABBIX_DEPENDENCIES += libxml2 +else +ZABBIX_CONF_OPTS += --without-libxml2 +endif + +ifeq ($(BR2_PACKAGE_NETSNMP),y) +ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config +ZABBIX_DEPENDENCIES += netsnmp +else +ZABBIX_CONF_OPTS += --without-net-snmp +endif + +ifeq ($(BR2_PACKAGE_OPENLDAP),y) +ZABBIX_CONF_OPTS += --with-ldap=$(STAGING_DIR)/usr +ZABBIX_DEPENDENCIES += openldap +else +ZABBIX_CONF_OPTS += --without-ldap +endif + +ifeq ($(BR2_PACKAGE_LIBSSH2),y) +ZABBIX_CONF_OPTS += --with-ssh2=$(STAGING_DIR)/usr +ZABBIX_DEPENDENCIES += libssh2 +else +ZABBIX_CONF_OPTS += --without-ssh2 +endif + +# Only one of openssl or gnutls should be enabled +ifeq ($(BR2_PACKAGE_OPENSSL),y) +ZABBIX_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr --without-gnutls +ZABBIX_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +ZABBIX_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr --without-openssl +ZABBIX_DEPENDENCIES += gnutls +else +ZABBIX_CONF_OPTS += --without-gnutls --without-openssl +endif + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER),y) + +ZABBIX_DEPENDENCIES += libevent zlib +ZABBIX_CONF_OPTS += \ + --enable-server \ + --with-libevent=$(STAGING_DIR)/usr \ + --with-libpthread=$(STAGING_DIR)/usr \ + --with-zlib=$(STAGING_DIR)/usr +ZABBIX_SYSTEMD_UNITS += zabbix-server.service + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_FRONTEND),y) +define ZABBIX_SERVER_COPY_FRONTEND + mkdir -p $(TARGET_DIR)/var/www/zabbix/ + cp -dpfr $(@D)/ui/* $(TARGET_DIR)/var/www/zabbix/ +endef +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_FRONTEND +endif + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_MYSQL),y) +ZABBIX_DEPENDENCIES += mysql +ZABBIX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config --without-postgresql +ZABBIX_DATABASE = mysql +else ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL),y) +ZABBIX_DEPENDENCIES += postgresql +ZABBIX_CONF_OPTS += --with-postgresql=$(STAGING_DIR)/usr/bin/pg_config --without-mysql +ZABBIX_DATABASE = postgresql +endif + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS),y) +define ZABBIX_SERVER_COPY_DUMPS + mkdir -p $(TARGET_DIR)/var/lib/zabbix/schema/ + install -m 644 $(@D)/database/$(ZABBIX_DATABASE)/*.sql $(TARGET_DIR)/var/lib/zabbix/schema/ +endef +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_DUMPS +endif + +endif # BR2_PACKAGE_ZABBIX_SERVER + +define ZABBIX_INSTALL_INIT_SYSTEMD + $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ + $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants && \ + ln -fs -r $(TARGET_DIR)/usr/lib/systemd/system/$(unit) $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/$(unit) + ) +endef + +$(eval $(autotools-package)) From arnout at mind.be Sat Jan 8 13:09:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 14:09:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: new package In-Reply-To: <20200423071752.23893-1-skif@skif-web.ru> References: <20200423071752.23893-1-skif@skif-web.ru> Message-ID: <4e5386f0-4fda-d2ea-fcc8-12e05c509e64@mind.be> On 23/04/2020 09:17, Alexey Lukyanchuk wrote: > Signed-off-by: Alexey Lukyanchuk Applied to master, thanks. I made the following changes. - BR2_TOOLCHAIN_USES_GLIBC implies the other glibc options. - Fix wrapping in Config.in help text. - Add upstream URL. - Protect comments with "depends on" instead of "if". - Select postgresl/mysql instead of depends (and propagate dependencies). - Remove redundant condition around BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS. - Select PHP extensions instead of depends. - Make optional dependencies automatic instead of Config.in. - Improve some of the help texts. - Bump to 5.4.9 and update hashes. - Add COPYING as license file. - Switch to actual upstream at zabbix.com. - Explicitly disable all unused features. - Disable zabbix user login with '*'. - Don't add user to zabbix group twice. - Do patch of zabbix_*.conf in post-patch hook and do it for all conf files in one shot. - Remove workarounds for pending patches (which were merged). - Put web ui in /var/www/zabbix and SQL files in /var/lib/zabbix. Sorry it took so long, but it still took me three hours to make all of the above fixes and maintainer time is scarce. Regards, Arnout > --- > DEVELOPERS | 3 + > package/Config.in | 1 + > package/zabbix/Config.in | 122 +++++++++++++++++++++ > package/zabbix/zabbix-agent.service | 17 +++ > package/zabbix/zabbix-server.service | 17 +++ > package/zabbix/zabbix.hash | 3 + > package/zabbix/zabbix.mk | 154 +++++++++++++++++++++++++++ > 7 files changed, 317 insertions(+) > create mode 100644 package/zabbix/Config.in > create mode 100644 package/zabbix/zabbix-agent.service > create mode 100644 package/zabbix/zabbix-server.service > create mode 100644 package/zabbix/zabbix.hash > create mode 100644 package/zabbix/zabbix.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index c57bc1c5c9..08a9aadf72 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -155,6 +155,9 @@ N: Alexey Brodkin > F: board/cubietech/cubieboard2/ > F: configs/cubieboard2_defconfig > > +N: Alexey Lukyanchuk > +F: package/zabbix/ > + > N: Alistair Francis > F: board/sifive/ > F: boot/opensbi/ > diff --git a/package/Config.in b/package/Config.in > index a9c6f6fcbc..aa244812db 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2234,6 +2234,7 @@ endif > source "package/xinetd/Config.in" > source "package/xl2tp/Config.in" > source "package/xtables-addons/Config.in" > + source "package/zabbix/Config.in" > source "package/znc/Config.in" > > endmenu > diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in > new file mode 100644 > index 0000000000..0ce60a37e5 > --- /dev/null > +++ b/package/zabbix/Config.in > @@ -0,0 +1,122 @@ > +config BR2_PACKAGE_ZABBIX > + bool "zabbix" > + depends on BR2_TOOLCHAIN_USES_GLIBC=y || BR2_TOOLCHAIN_EXTERNAL_GLIBC=y || BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y > + select BR2_PACKAGE_PCRE > + help > + Zabbix is an enterprise-class open source distributed > + monitoring solution.Zabbix is free of cost. Zabbix > + is written and distributed under the GPL General Public > + License version 2. > + > +if (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_EXTERNAL_GLIBC && !BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC) > +comment "zabbix need glibc" > +endif > + > +if BR2_PACKAGE_ZABBIX > + > +if (!BR2_PACKAGE_POSTGRESQL && !BR2_PACKAGE_MYSQL) > +comment "zabbix server needs postgresql or mysql support" > +endif > + > +config BR2_PACKAGE_ZABBIX_SERVER > + bool "zabbix server" > + depends on BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_MYSQL > + select BR2_PACKAGE_ZLIB > + select BR2_PACKAGE_LIBEVENT > + > +if BR2_PACKAGE_ZABBIX_SERVER > + > +choice > + prompt "server database backend" > + > +config BR2_PACKAGE_ZABBIX_SERVER_MYSQL > + bool "mysql" > + depends on BR2_PACKAGE_MYSQL > + > +config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL > + bool "postgresql" > + depends on BR2_PACKAGE_POSTGRESQL > + > +endchoice > + > +if BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL || BR2_PACKAGE_ZABBIX_SERVER_MYSQL > +config BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS > + bool "install sql dumps" > + help > + Copy inicitial database dumps to /usr/zabbix/ > +endif > + > +if (!BR2_PACKAGE_PHP || (!BR2_PACKAGE_PHP_EXT_MYSQLI && !BR2_PACKAGE_PHP_EXT_PGSQL) || \ > + !BR2_PACKAGE_PHP_EXT_MBSTRING || !BR2_PACKAGE_PHP_EXT_BCMATH || \ > + !BR2_PACKAGE_PHP_EXT_SOCKETS || !BR2_PACKAGE_PHP_EXT_GD || \ > + !BR2_PACKAGE_PHP_EXT_LIBXML2 || !BR2_PACKAGE_PHP_EXT_CTYPE || \ > + !BR2_PACKAGE_PHP_EXT_SESSION || !BR2_PACKAGE_PHP_EXT_XMLREADER || \ > + !BR2_PACKAGE_PHP_EXT_XMLWRITER ) > +comment "zabbix-frontend need php with extensions(bc, sockets, " > +comment "mbstring, gd, libxml2, ctype, session, xmlreader, xmlwriter, mysql or postgresql" > +endif > + > +choice > + prompt "server ssl/tls backend" > + > +config BR2_PACKAGE_ZABBIX_SERVER_NOTLS > + bool "none" > + > +config BR2_PACKAGE_ZABBIX_SERVER_OPENSSL > + bool "openssl" > + depends on BR2_PACKAGE_OPENSSL > + > +config BR2_PACKAGE_ZABBIX_SERVER_GNUTLS > + bool "gnutls" > + depends on BR2_PACKAGE_GNUTLS > + > +endchoice > + > +config BR2_PACKAGE_ZABBIX_SERVER_OPENIPMI > + bool "openipmi support" > + select BR2_PACKAGE_OPENIPMI > + > +config BR2_PACKAGE_ZABBIX_SERVER_LIBSSH2 > + bool "libssh2 support" > + select BR2_PACKAGE_LIBSSH2 > + > +config BR2_PACKAGE_ZABBIX_SERVER_LDAP > + bool "openldap support" > + select BR2_PACKAGE_OPENLDAP > + > +if (!BR2_USE_MMU) > +comment "netsnmp support need MMU" > +endif > + > +config BR2_PACKAGE_ZABBIX_SERVER_NETSNMP > + bool "net-snmp support" > + depends on BR2_USE_MMU # netsnmp > + select BR2_PACKAGE_NETSNMP > + > +config BR2_PACKAGE_ZABBIX_SERVER_LIBCURL > + bool "libcurl support" > + select BR2_PACKAGE_LIBCURL > + > +config BR2_PACKAGE_ZABBIX_SERVER_LIBXML2 > + bool "libxml2 support" > + select BR2_PACKAGE_LIBXML2 > + > +config BR2_PACKAGE_ZABBIX_SERVER_COPY_FRONTEND > + bool "copy php-frontend to target" > + depends on BR2_PACKAGE_PHP > + depends on BR2_PACKAGE_PHP_EXT_MYSQLI || BR2_PACKAGE_PHP_EXT_PGSQL > + depends on BR2_PACKAGE_PHP_EXT_BCMATH > + depends on BR2_PACKAGE_PHP_EXT_SOCKETS > + depends on BR2_PACKAGE_PHP_EXT_MBSTRING > + depends on BR2_PACKAGE_PHP_EXT_GD > + depends on BR2_PACKAGE_PHP_EXT_LIBXML2 > + depends on BR2_PACKAGE_PHP_EXT_CTYPE > + depends on BR2_PACKAGE_PHP_EXT_SESSION > + depends on BR2_PACKAGE_PHP_EXT_XMLREADER > + depends on BR2_PACKAGE_PHP_EXT_XMLWRITER > + help > + copy web-frontend to /usr/zabbix/php-frontend > + > +endif > + > +endif > diff --git a/package/zabbix/zabbix-agent.service b/package/zabbix/zabbix-agent.service > new file mode 100644 > index 0000000000..8b4f45a4fc > --- /dev/null > +++ b/package/zabbix/zabbix-agent.service > @@ -0,0 +1,17 @@ > +[Unit] > +Description=Zabbix Agent Daemon > +After=network.target > + > +[Service] > +Type=forking > +ExecStart=/usr/sbin/zabbix_agentd > +ExecReload=/usr/sbin/zabbix_agentd -R config_cache_reload > +RuntimeDirectory=zabbix > +PIDFile=/run/zabbix/zabbix_agentd.pid > +User=zabbix > +Group=zabbix > +WatchdogSec=30s > +Restart=on-failure > + > +[Install] > +WantedBy=multi-user.target > diff --git a/package/zabbix/zabbix-server.service b/package/zabbix/zabbix-server.service > new file mode 100644 > index 0000000000..b8ba0d1707 > --- /dev/null > +++ b/package/zabbix/zabbix-server.service > @@ -0,0 +1,17 @@ > +[Unit] > +Description=Zabbix Server Daemon > +After=network.target > + > +[Service] > +Type=forking > +ExecStart=/usr/sbin/zabbix_server > +ExecReload=/usr/sbin/zabbix_server -R config_cache_reload > +RuntimeDirectory=zabbix > +PIDFile=/run/zabbix/zabbix_server.pid > +User=zabbix > +Group=zabbix > +WatchdogSec=30s > +Restart=on-failure > + > +[Install] > +WantedBy=multi-user.target > diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash > new file mode 100644 > index 0000000000..5c4207f168 > --- /dev/null > +++ b/package/zabbix/zabbix.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 22bb28e667424ad4688f47732853f4241df0e78a7607727b043d704ba726ae0e zabbix-4.4.6.tar.gz > +sha256 a823e00bc7f0844874f90fee97136f178e7debc76bace5f09e15ee8ed55f04c3 README > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > new file mode 100644 > index 0000000000..a75914a816 > --- /dev/null > +++ b/package/zabbix/zabbix.mk > @@ -0,0 +1,154 @@ > +################################################################################ > +# > +# zabbix > +# > +################################################################################ > + > +ZABBIX_VERSION = 4.4.6 > +ZABBIX_SITE = https://sourceforge.net/projects/zabbix/files > +ZABBIX_LICENSE = GPL-2.0 > +ZABBIX_LICENSE_FILES = README > + > +ZABBIX_DEPENDENCIES = pcre > +ZABBIX_CONF_OPTS = --with-libpcre=$(STAGING_DIR)/usr/bin/ \ > + --enable-agent > + > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_CLIENT_CHANGE_PIDFILE_LOCATION > +ZABBIX_SYSTEMD_UNITS += zabbix-agent.service > + > +define ZABBIX_INSTALL_INIT_SYSTEMD > + $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ > + $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ > + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants && \ > + ln -fs -r $(TARGET_DIR)/usr/lib/systemd/system/$(unit) $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/$(unit) > + ) > +endef > + > +define ZABBIX_USERS > + zabbix -1 zabbix -1 !- /var/lib/zabbix - zabbix zabbix user > +endef > + > +define ZABBIX_CLIENT_CHANGE_PIDFILE_LOCATION > + $(SED) 's%\#\ PidFile=/tmp/zabbix_agentd.pid%PidFile=/run/zabbix/zabbix_agentd.pid%g' $(TARGET_DIR)/etc/zabbix_agentd.conf > +endef > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER),y) > +ZABBIX_SYSTEMD_UNITS += zabbix-server.service > +ZABBIX_CONF_OPTS += --enable-server \ > + --with-libevent \ > + --with-libpthread=$(STAGING_DIR)/usr \ > + --with-zlib=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += libevent zlib > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_CHANGE_PIDFILE_LOCATION > + > +# Need openipmi in staging dir. Patch submitted at 2019.12.16 > +# Before this patch enabled, use this crutch > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_OPENIPMI),y) > +ZABBIX_CONF_OPTS += --with-openipmi=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += openipmi > +ZABBIX_PRE_CONFIGURE_HOOKS += BR2_PACKAGE_ZABBIX_SERVER_OPENIPMI_FIX_LIBS > + > +define BR2_PACKAGE_ZABBIX_SERVER_OPENIPMI_FIX_LIBS > + if [ ! -f $(STAGING_DIR)/usr/lib/libOpenIPMI.so ]; then \ > + cp -rf $(TARGET_DIR)/usr/lib/libOpenIPMI* $(STAGING_DIR)/usr/lib/ ;\ > + cp -rf $(TARGET_DIR)/usr/include/OpenIPMI $(STAGING_DIR)/usr/include/ ;\ > + fi > +endef > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_LIBCURL),y) > +ZABBIX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config > +ZABBIX_DEPENDENCIES += libcurl > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_LIBXML2),y) > +ZABBIX_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr/bin/xml2-config > +ZABBIX_DEPENDENCIES += libxml2 > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_NETSNMP),y) > +ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config > +ZABBIX_DEPENDENCIES += netsnmp > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_LDAP),y) > +ZABBIX_CONF_OPTS += --with-ldap=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += openldap > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_LIBSSH2),y) > +ZABBIX_CONF_OPTS += --with-ssh2=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += libssh2 > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_OPENSSL),y) > +ZABBIX_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += openssl > +else ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_GNUTLS),y) > +ZABBIX_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr > +ZABBIX_DEPENDENCIES += gnutls > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_FRONTEND),y) > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_FRONTEND > + > +define ZABBIX_SERVER_COPY_FRONTEND > + mkdir -p $(TARGET_DIR)/usr/zabbix/php-frontend/ > + cp -r $(@D)/frontends/php/* $(TARGET_DIR)/usr/zabbix/php-frontend/ > +endef > + > +endif > + > +define ZABBIX_SERVER_CHANGE_PIDFILE_LOCATION > + $(SED) 's%\#\ PidFile=/tmp/zabbix_server.pid%PidFile=/run/zabbix/zabbix_server.pid%g' $(TARGET_DIR)/etc/zabbix_server.conf > +endef > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_MYSQL),y) > +ZABBIX_DEPENDENCIES += mysql > +ZABBIX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config > +# Need package/mariadb/0003-add-sysroot-path-to-mariadb_config.patch by Ryan Coe > +# While this patch not included, use this crutch > +ZABBIX_PRE_CONFIGURE_HOOKS += ZABBIX_DISABLE_MARIADB_CONFIG > +ZABBIX_POST_CONFIGURE_HOOKS += ZABBIX_ENABLE_MARIADB_CONFIG > + > +define ZABBIX_DISABLE_MARIADB_CONFIG > + if [ -f "$(STAGING_DIR)/usr/bin/mariadb_config" ]; then \ > + mv $(STAGING_DIR)/usr/bin/mariadb_config $(STAGING_DIR)/usr/bin/mariadb_config_save; \ > + fi > +endef > + > +define ZABBIX_ENABLE_MARIADB_CONFIG > + if [ -f "$(STAGING_DIR)/usr/bin/mariadb_confi_save" ]; then \ > + mv $(STAGING_DIR)/usr/bin/mariadb_config_save $(STAGING_DIR)/usr/bin/mariadb_config; \ > + fi > +endef > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS),y) > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_PREPARE_MYSQL > +endif > + > +define ZABBIX_SERVER_PREPARE_MYSQL > + mkdir -p $(TARGET_DIR)/usr/zabbix/mysql_schema/ > + cp -r $(@D) $(@D)/database/mysql/*\.sql $(TARGET_DIR)/usr/zabbix/mysql_schema/ > +endef > + > +endif > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL),y) > +ZABBIX_DEPENDENCIES += postgresql > +ZABBIX_CONF_OPTS += --with-postgresql=$(STAGING_DIR)/usr/bin/pg_config > + > +define ZABBIX_SERVER_PREPARE_POSTGRESQL > + mkdir -p $(TARGET_DIR)/usr/zabbix/postgresql_schema > + cp -r $(@D)/database/postgresql/*\.sql $(TARGET_DIR)/usr/zabbix/postgresql_schema/ > +endef > + > +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_COPY_DUMPS),y) > +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_PREPARE_POSTGRESQL > +endif > + > +endif > + > +endif > + > +$(eval $(autotools-package)) > From peter at korsgaard.com Sat Jan 8 13:12:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 14:12:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: add options to enable features In-Reply-To: <20200515140209.1355747-1-erwan.gautron@bertin.fr> References: <20200515140209.1355747-1-erwan.gautron@bertin.fr> Message-ID: On Fri, May 15, 2020 at 4:02 PM Erwan GAUTRON wrote: Hi, Sorry for the slow response! > GnuTls implements old, unsafe or unused protocols and cyphers > Secure embedded systems shall disable them in order to be certified. > This patch allows to select/unselect SSLv2 protocol and gost cypher > To ensure backward compatibility, all items are selected by default > > Signed-off-by: Erwan GAUTRON > --- > package/gnutls/Config.in | 12 ++++++++++++ > package/gnutls/gnutls.mk | 4 +++- > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in > index 15b930b6bd..56ea558969 100644 > --- a/package/gnutls/Config.in > +++ b/package/gnutls/Config.in > @@ -29,6 +29,18 @@ config BR2_PACKAGE_GNUTLS_TOOLS > Install GnuTLS command line tools for various cryptographic > tasks. > > +config BR2_PACKAGE_GNUTLS_ENABLE_SSL2 > + bool "enable SSLv2" > + default y These features should only be needed in very special situations, so I've dropped the default y. > + help > + Enable SSLv2 protocol. > + > +config BR2_PACKAGE_GNUTLS_ENABLE_GOST > + bool "enable GOST" > + default y > + help > + Enable GOST cypher. Elsewhere we use the cipher spelling, so I've changed that. > +++ b/package/gnutls/gnutls.mk > @@ -36,7 +36,9 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ > GNUTLS_INSTALL_STAGING = YES > > # libpthread autodetection poison the linkpath > -GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) > +GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) \ > + $(if $(BR2_PACKAGE_GNUTLS_ENABLE_SSL2),,--disable-ssl2-support) \ > + $(if $(BR2_PACKAGE_GNUTLS_ENABLE_GOST),,--disable-gost) It makes more sense to have this in the "main" _CONF_OPTS handling just after the _GNUTLS_TOOLS logic, so I've moved it there. I have also added explicit --enable logic like we have for the other options. Committed with these fixes, thanks. -- Bye, Peter Korsgaard From festevam at gmail.com Sat Jan 8 13:14:09 2022 From: festevam at gmail.com (Fabio Estevam) Date: Sat, 8 Jan 2022 10:14:09 -0300 Subject: [Buildroot] [PATCH] configs/imx6slevk: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220108131409.990135-1-festevam@gmail.com> Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650628 Signed-off-by: Fabio Estevam --- configs/imx6slevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6slevk_defconfig b/configs/imx6slevk_defconfig index 6f0bae5aa94d..9448267e2b28 100644 --- a/configs/imx6slevk_defconfig +++ b/configs/imx6slevk_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6slevk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -- 2.25.1 From peter at korsgaard.com Sat Jan 8 13:14:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 14:14:23 +0100 Subject: [Buildroot] [git commit] package/gnutls: add options to enable/disable legacy features Message-ID: <20220108131019.F06F082B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c91359697ee19639ea1025940821b0e332e02174 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master GnuTls implements old, unsafe or unused protocols and cyphers Secure embedded systems shall disable them in order to be certified. This patch allows to select/deselect SSLv2 protocol and gost cipher. Signed-off-by: Erwan GAUTRON [Peter: default options to 'n', move next to _GNUTLS_TOOLS, explicit --enable] Signed-off-by: Peter Korsgaard --- package/gnutls/Config.in | 10 ++++++++++ package/gnutls/gnutls.mk | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index cd83b375aa..d57bb8d135 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -27,6 +27,16 @@ config BR2_PACKAGE_GNUTLS_TOOLS Install GnuTLS command line tools for various cryptographic tasks. +config BR2_PACKAGE_GNUTLS_ENABLE_SSL2 + bool "enable SSLv2" + help + Enable SSLv2 protocol. + +config BR2_PACKAGE_GNUTLS_ENABLE_GOST + bool "enable GOST" + help + Enable GOST cipher. + endif comment "gnutls needs a toolchain w/ wchar, dynamic library" diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 11c2d81e7d..dbf7593854 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -29,7 +29,9 @@ GNUTLS_CONF_OPTS = \ --with-librt-prefix=$(STAGING_DIR) \ --without-tpm \ $(if $(BR2_PACKAGE_GNUTLS_OPENSSL),--enable,--disable)-openssl-compatibility \ - $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) + $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) \ + $(if $(BR2_PACKAGE_GNUTLS_ENABLE_SSL2),--enable,--disable)-ssl2-support \ + $(if $(BR2_PACKAGE_GNUTLS_ENABLE_GOST),--enable,--disable)-gost GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \ From peter at korsgaard.com Sat Jan 8 13:19:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 14:19:21 +0100 Subject: [Buildroot] [git commit] package/zabbix: Fix white space in help text Message-ID: <20220108131356.4A0ED82897@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ced407bde0e45c34f3e464e73642f09a21d79abd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- package/zabbix/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index f859471b1c..6f8a952936 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -4,9 +4,9 @@ config BR2_PACKAGE_ZABBIX select BR2_PACKAGE_PCRE help Zabbix is an enterprise-class open source distributed - monitoring solution.Zabbix is free of cost. Zabbix is written - and distributed under the GPL General Public License version - 2. + monitoring solution. Zabbix is free of cost. Zabbix is + written and distributed under the GPL General Public License + version 2. https://zabbix.com From arnout at mind.be Sat Jan 8 13:27:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 14:27:14 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> Message-ID: <74102482-7c2d-b08b-f97e-80cc54f03722@mind.be> On 07/01/2022 22:35, Julien Olivain wrote: > For the next 2022 edition of the HoverGames challenge, I would like > to switch to ROS2 in Buildroot.? I'm currently exploring ways to > regenerate ROS2 buildroot recipes automatically, using the ROS > infrastructure packages.? I believe this is the way the Gentoo and > Yocto/OpenEmbedded recipes are currently generated. > > See: > https://github.com/ros-infrastructure/superflore > https://github.com/ros-infrastructure/superflore/tree/master/superflore/generators > > My current idea would be to: > - Add in Buildroot the minimum changes, if needed > ? (minimal infra things like pkg-catkin, other non-ROS package dependencies) > - Propose a "buildroot" generator in superflore upstream that create > ? an maintain some of the ROS2 recipes. We generally prefer to keep everything upstream in Buildroot, because it simplifies making changes to infrastructure (that may also affect packages). We do keep generators in Buildroot as well: utils/scancpan, utils/scanpypi. So the generator could be added there. Alternatively, you could add a section in the Buildroot manual about how to install superflore and run it to add a Buildroot package. Regards, Arnout From arnout at mind.be Sat Jan 8 13:28:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 14:28:58 +0100 Subject: [Buildroot] [PATCH 1/3] package/refpolicy: Add patches pending the next release In-Reply-To: <20220107223624.3ba7d348@windsurf> References: <20210107135307.1762186-1-maxime.chevallier@bootlin.com> <20210107135307.1762186-2-maxime.chevallier@bootlin.com> <20220107223624.3ba7d348@windsurf> Message-ID: <44537b02-fabc-6533-bb37-d20268ff508f@mind.be> On 07/01/2022 22:36, Thomas Petazzoni wrote: > Maxime: do you have that patch 8 broken down into smaller pieces with > reasonable explanation about each piece? Just to be clear: "reasonable explanation" means: - indicate what the problem is; - why this is different for Buildroot than for others (i.e. why it is a problem to begin with); - possible solutions; - why this specific solution was chosen (which can very well be: the others are too complicated). Regards, Arnout From thomas.petazzoni at bootlin.com Sat Jan 8 13:29:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 14:29:27 +0100 Subject: [Buildroot] [git commit] package/libest: new package Message-ID: <20220108132323.E437F82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f0e1e58168dfa9194db2e073efd20a98c15728 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libest is a C implementation of RFC 7030 (Enrollment over Secure Transport). It can be used to provision public key certificates from a certificate authority (CA) or registration authority (RA) to end-user devices and network infrastructure devices. https://github.com/cisco/libest Notes on patches included in this package: - libest bundles a stubbed version of libsafec, and has no provision to build against a system-installed full (non-stubbed) libsafec. We add a patch to make that possible. - Added a configuration option --{enable,disable}-examples to toggle examples build by a separate patch. - There's a configuration option `--enable-jni` which allows to build a JNI library for binding libest to Java programs. And that library would be using an outdated version of OpenSSL 1.0. We fix that by adding support for OpenSSL 1.1 API for that library. - Fixed a bug when specifying either `--enable-FEATURE` or `--disable-FEATURE` has always been enabling the feature. Signed-off-by: Aleksandr Makarov [Thomas: - Added comments about the upstream status in existing patches - Added a patch fixing an autoreconf issue - Added a patch adding a missing "extern" on a variable to fix build with gcc 10 - Removed the glibc dependency by using the new libexecinfo package - Drastically simplified the complex libcoap disabling and client-only mode vs. OpenJDK issue. libcoap support is now forcefully disabled, and client-mode only option is made invisible when OpenJDK is enabled. - Fixed the license information; - Added missing host-pkgconf ] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 + package/Config.in | 1 + ...-jni-client.c-add-support-for-OpenSSL-1.1.patch | 112 ++++++++++++++ ...disable-examples-flag-to-toggle-examples-.patch | 90 +++++++++++ ...stem-libsafec-flag-to-link-against-system.patch | 109 ++++++++++++++ ...e.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch | 164 +++++++++++++++++++++ ...c-remove-duplicate-invocation-of-AM_INIT_.patch | 36 +++++ ..._locl.h-add-missing-extern-on-e_ctx_ssl_e.patch | 42 ++++++ package/libest/Config.in | 26 ++++ package/libest/libest.hash | 3 + package/libest/libest.mk | 71 +++++++++ package/libest/libest.pc | 10 ++ 12 files changed, 667 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f362df2637..73664feb48 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -90,6 +90,9 @@ F: package/minimodem/ N: Alexander Lukichev F: package/openpgm/ +N: Aleksandr Makarov +F: package/libest/ + N: Alexander Mukhin F: package/tinyproxy/ diff --git a/package/Config.in b/package/Config.in index 0ff44dcd25..a555e6fd78 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1802,6 +1802,7 @@ menu "Networking" source "package/libcurl/Config.in" source "package/libdnet/Config.in" source "package/libeXosip2/Config.in" + source "package/libest/Config.in" source "package/libfcgi/Config.in" source "package/libgsasl/Config.in" source "package/libhtp/Config.in" diff --git a/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch b/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch new file mode 100644 index 0000000000..3c0d890d3f --- /dev/null +++ b/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch @@ -0,0 +1,112 @@ +From 8f152a6e47484056968973a71a16e4f2142213a9 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Mon, 13 Jul 2020 23:05:26 +0000 +Subject: [PATCH] java/jni/client.c: add support for OpenSSL 1.1 + +This shall allow the java/jni to build with and link against OpenSSL 1.1. + +Additionally, the configuration program will not attempt to process the +java/jni/ subdirectory if no --enable-jni has been specified. + +Upstream: https://github.com/cisco/libest/pull/81/. It was merged +upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this +commit mixes multiple patches in one. + +Signed-off-by: Aleksandr Makarov +--- + Makefile.am | 8 ++++++-- + configure.ac | 10 ++++++---- + java/jni/client.c | 21 ++++++++++++++++----- + 3 files changed, 28 insertions(+), 11 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 10e38fd..9601de6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,9 +1,13 @@ + ACLOCAL_AMFLAGS = -I m4 + ++if ENABLE_JNI ++libest_jni = java/jni ++endif ++ + if ENABLE_CLIENT_ONLY +-SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/client-brski ++SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/client-brski + else +-SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/server example/proxy example/client-brski ++SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/server example/proxy example/client-brski + endif + + EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle +diff --git a/configure.ac b/configure.ac +index e02a54d..d648030 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -35,9 +35,9 @@ AM_COND_IF([FREEBSD], AC_MSG_RESULT([Skipping libdl check]), + AC_ARG_ENABLE([jni], + [AS_HELP_STRING([--enable-jni], + [Enable support for JNI library])], +- [jni_on=1], +- [jni_on=0]) +-AM_CONDITIONAL([ENABLE_JNI], [test x$jni_on = x1]) ++ [], ++ [enable_jni="no"]) ++AM_CONDITIONAL([ENABLE_JNI], [test "$enable_jni" = "yes"]) + AM_COND_IF([ENABLE_JNI], + AC_MSG_RESULT([JNI support enabled]) + AC_DEFINE([ENABLE_JNI]), +@@ -198,5 +198,7 @@ AC_PREFIX_DEFAULT([/usr/local/est]) + + cp confdefs.h est_config.h + +-AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile java/jni/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) ++AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) ++AM_COND_IF([ENABLE_JNI], ++ [AC_CONFIG_FILES([java/jni/Makefile])]) + AC_OUTPUT +diff --git a/java/jni/client.c b/java/jni/client.c +index 9a8a34e..f7aeefc 100644 +--- a/java/jni/client.c ++++ b/java/jni/client.c +@@ -130,11 +130,18 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ + { + int rv; + EVP_PKEY_CTX *pkctx = NULL; +- EVP_MD_CTX mctx; ++ EVP_MD_CTX *mctx; + +- EVP_MD_CTX_init(&mctx); ++#ifdef HAVE_OLD_OPENSSL ++ EVP_MD_CTX md_ctx; ++ mctx = &md_ctx; + +- if (!EVP_DigestSignInit(&mctx, &pkctx, md, NULL, pkey)) { ++ EVP_MD_CTX_init(mctx); ++#else ++ mctx = EVP_MD_CTX_new(); ++#endif ++ ++ if (!EVP_DigestSignInit(mctx, &pkctx, md, NULL, pkey)) { + return 0; + } + +@@ -150,9 +157,13 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ + x->req_info->enc.modified = 1; + #endif + +- rv = X509_REQ_sign_ctx(x, &mctx); ++ rv = X509_REQ_sign_ctx(x, mctx); + +- EVP_MD_CTX_cleanup(&mctx); ++#ifdef HAVE_OLD_OPENSSL ++ EVP_MD_CTX_cleanup(mctx); ++#else ++ EVP_MD_CTX_free(mctx); ++#endif + + return (rv); + } +-- +2.17.1 + diff --git a/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch b/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch new file mode 100644 index 0000000000..9b35e8831d --- /dev/null +++ b/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch @@ -0,0 +1,90 @@ +From 4bd41ea12924161baca48add39ba5ecfab2cae30 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Mon, 13 Jul 2020 23:42:42 +0000 +Subject: [PATCH] Add --{enable,disable}-examples flag to toggle examples + compilation + +Upstream: https://github.com/cisco/libest/pull/81/. It was merged +upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this +commit mixes multiple patches in one. + +Signed-off-by: Aleksandr Makarov +--- + Makefile.am | 11 +++++++---- + configure.ac | 24 ++++++++++++++++++------ + 2 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 9601de6..e2561e7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,10 +4,13 @@ if ENABLE_JNI + libest_jni = java/jni + endif + +-if ENABLE_CLIENT_ONLY +-SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/client-brski +-else +-SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/server example/proxy example/client-brski ++if ENABLE_EXAMPLES ++if ENABLE_CLIENT_ONLY ++examples = example/client example/client-simple example/client-brski ++else ++examples = example/client example/client-simple example/client-brski example/server example/proxy ++endif + endif + ++SUBDIRS = safe_c_stub src $(libest_jni) $(examples) + EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle +diff --git a/configure.ac b/configure.ac +index d648030..95b3223 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,11 +2,6 @@ dnl Process this file with autoconf to produce a configure script. + AC_INIT([libest],[3.2.0p],[libest-dev]) + AC_CONFIG_AUX_DIR(config) + AC_CONFIG_SRCDIR(src/est/est.c) +-AC_CONFIG_SRCDIR(example/client/estclient.c) +-AC_CONFIG_SRCDIR(example/client-simple/estclient-simple.c) +-AC_CONFIG_SRCDIR(example/client-brski/estclient-brski.c) +-AC_CONFIG_SRCDIR(example/server/estserver.c) +-AC_CONFIG_SRCDIR(example/proxy/estproxy.c) + AC_CONFIG_MACRO_DIR([m4]) + + AM_INIT_AUTOMAKE +@@ -80,6 +75,15 @@ AM_COND_IF([DISABLE_PTHREAD], [], + [AC_CHECK_LIB([pthread], [pthread_create], [], + [AC_MSG_FAILURE([can't find pthread lib])])]) + ++AC_ARG_ENABLE([examples], ++ [AS_HELP_STRING([--disable-examples], ++ [Disable examples compilation])], ++ [], ++ [enable_examples="yes"]) ++AC_MSG_CHECKING(whether to build examples) ++AM_CONDITIONAL([ENABLE_EXAMPLES], [test "$enable_examples" = "yes"]) ++AM_COND_IF([ENABLE_EXAMPLES], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) ++ + AC_ARG_WITH([ssl-dir], + [AS_HELP_STRING([--with-ssl-dir], + [location of OpenSSL install folder, defaults to /usr/local/ssl])], +@@ -198,7 +202,15 @@ AC_PREFIX_DEFAULT([/usr/local/est]) + + cp confdefs.h est_config.h + +-AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) ++AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile]) + AM_COND_IF([ENABLE_JNI], + [AC_CONFIG_FILES([java/jni/Makefile])]) ++AM_COND_IF([ENABLE_EXAMPLES], ++[ ++ AC_CONFIG_FILES([example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile]) ++ AM_COND_IF([ENABLE_CLIENT_ONLY], ++ [], ++ [AC_CONFIG_FILES([example/server/Makefile example/proxy/Makefile])]) ++]) ++ + AC_OUTPUT +-- +2.17.1 + diff --git a/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch b/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch new file mode 100644 index 0000000000..66574cd937 --- /dev/null +++ b/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch @@ -0,0 +1,109 @@ +From 017155b98ff3722816a52953b1079c9c8704d2ff Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Tue, 14 Jul 2020 10:03:14 +0000 +Subject: [PATCH] Add --with-system-libsafec flag to link against system + libsafec + +Specifying the --with-system-libsafec flag shall allow the configuration +program to search for and, if found, to link against the libsafec library +that is installed in the system. + +Upstream: https://github.com/cisco/libest/pull/81/. It was merged +upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this +commit mixes multiple patches in one. + +Signed-off-by: Aleksandr Makarov +--- + Makefile.am | 6 +++++- + configure.ac | 41 +++++++++++++++++++++++++++++++---------- + 2 files changed, 36 insertions(+), 11 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e2561e7..d53b0d5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,5 +12,9 @@ examples = example/client example/client-simple example/client-brski example/ser + endif + endif + +-SUBDIRS = safe_c_stub src $(libest_jni) $(examples) ++if ! WITH_SYSTEM_LIBSAFEC ++builtin_libsafec = safe_c_stub ++endif ++ ++SUBDIRS = $(builtin_libsafec) src $(libest_jni) $(examples) + EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle +diff --git a/configure.ac b/configure.ac +index 95b3223..048aa3c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10,6 +10,7 @@ AM_INIT_AUTOMAKE([subdir-objects]) + + AC_PROG_CC + AM_PROG_CC_C_O ++PKG_PROG_PKG_CONFIG + LT_INIT + AC_CANONICAL_HOST + case $host in +@@ -187,22 +188,39 @@ AC_ARG_WITH([libcoap-dir], + ] + ) + +-SAFEC_STUB_DIR='$(abs_top_builddir)/safe_c_stub' +-AC_SUBST(SAFEC_STUB_DIR) +-safecdir="$SAFEC_STUB_DIR" +-AC_SUBST([SAFEC_DIR], "$safecdir") +-AC_SUBST([SAFEC_CFLAGS], "$safecdir/include") +-AC_SUBST([SAFEC_LDFLAGS], "$safecdir/lib") ++AC_ARG_WITH(system-libsafec, ++ AS_HELP_STRING([--with-system-libsafec], ++ [select to use libsafec installed in the system]), ++ [], ++ [with_system_libsafec="no"]) + +-CFLAGS="$CFLAGS -Wall -I$safecdir/include" +-LDFLAGS="$LDFLAGS -L$safecdir/lib" +-LIBS="$LIBS -lsafe_lib" ++AC_MSG_CHECKING(which libsafec to use) ++AM_CONDITIONAL([WITH_SYSTEM_LIBSAFEC], [test "$with_system_libsafec" = "yes"]) ++AM_COND_IF([WITH_SYSTEM_LIBSAFEC], AC_MSG_RESULT([system]), AC_MSG_RESULT([built-in])) ++AM_COND_IF([WITH_SYSTEM_LIBSAFEC], ++[ ++ PKG_CHECK_MODULES([libsafec], [libsafec]) ++ LIBS="$LIBS $libsafec_LIBS" ++ CFLAGS="$CFLAGS $libsafec_CFLAGS" ++ CPPFLAGS="$CPPFLAGS $libsafec_CFLAGS" ++],[ ++ SAFEC_STUB_DIR='$(abs_top_builddir)/safe_c_stub' ++ AC_SUBST(SAFEC_STUB_DIR) ++ safecdir="$SAFEC_STUB_DIR" ++ AC_SUBST([SAFEC_DIR], "$safecdir") ++ AC_SUBST([SAFEC_CFLAGS], "$safecdir/include") ++ AC_SUBST([SAFEC_LDFLAGS], "$safecdir/lib") ++ ++ CFLAGS="$CFLAGS -Wall -I$safecdir/include" ++ LDFLAGS="$LDFLAGS -L$safecdir/lib" ++ LIBS="$LIBS -lsafe_lib" ++]) + + AC_PREFIX_DEFAULT([/usr/local/est]) + + cp confdefs.h est_config.h + +-AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile]) ++AC_CONFIG_FILES([Makefile version src/Makefile src/est/Makefile]) + AM_COND_IF([ENABLE_JNI], + [AC_CONFIG_FILES([java/jni/Makefile])]) + AM_COND_IF([ENABLE_EXAMPLES], +@@ -212,5 +230,8 @@ AM_COND_IF([ENABLE_EXAMPLES], + [], + [AC_CONFIG_FILES([example/server/Makefile example/proxy/Makefile])]) + ]) ++AM_COND_IF([WITH_SYSTEM_LIBSAFEC], ++ [], ++ [AC_CONFIG_FILES([safe_c_stub/Makefile safe_c_stub/lib/Makefile])]) + + AC_OUTPUT +-- +2.17.1 + diff --git a/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch b/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch new file mode 100644 index 0000000000..f5e1b0c41a --- /dev/null +++ b/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch @@ -0,0 +1,164 @@ +From 9a76187aa4d779de39afa12024d5a73a14175371 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Wed, 15 Jul 2020 11:25:05 +0000 +Subject: [PATCH] configure.ac: Fix AC_ARG_ENABLE/AC_ARG_WITH macros + +Multiple tests in configure.ac are flawed: + +[--snip--] + AC_ARG_ENABLE([pthreads], + [AS_HELP_STRING([--disable-pthreads], + [Disable support for pthreads])], + [pthreads_on=1], + [pthreads_on=0]) +[--snip--] + +The third argument is "action-if-given" and the fourth argument +is "action-if-not-given" [0]. Which means that, whether you pass +--enable-pthreads or --disable-pthreads, the third argument will be +executed, that is "pthreads_on=1". And if you pass neither, the fourth +argument will be executed, i.e. "pthreads_on=0". + +We want `--enable-pthreads` and `--disable-pthreads` flags to do their job. +The right way to do that will be to eliminate "action-if-given" and replace +the user-defined `FEATURE_on=0|1` shell variables with the `enable_FEATURE` +and `with_PACKAGE` shell variables provided by Autotools. + +[0] https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/autoconf.html#Package-Options + +Upstream: https://github.com/cisco/libest/pull/81/. It was merged +upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this +commit mixes multiple patches in one. + +Signed-off-by: Aleksandr Makarov +--- + configure.ac | 60 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 30 insertions(+), 30 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 048aa3c..0b930bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,9 +43,9 @@ AM_CONDITIONAL([JAVA_HOME_SET], [test ! -z "$JAVA_HOME"]) + AC_ARG_ENABLE([client-only], + [AS_HELP_STRING([--enable-client-only], + [Enable the building of only the client mode of libEST])], +- [clientonly_on=1], +- [clientonly_on=0]) +-AM_CONDITIONAL([ENABLE_CLIENT_ONLY], [test x$clientonly_on = x1]) ++ [], ++ [enable_client_only="no"]) ++AM_CONDITIONAL([ENABLE_CLIENT_ONLY], [test "$enable_client_only" = "yes"]) + AM_COND_IF([ENABLE_CLIENT_ONLY], + AC_MSG_RESULT([Client only build enabled]) + AC_DEFINE([ENABLE_CLIENT_ONLY]), +@@ -54,9 +54,9 @@ AM_COND_IF([ENABLE_CLIENT_ONLY], + AC_ARG_ENABLE([brski], + [AS_HELP_STRING([--enable-brski], + [Enable support for brski bootstrap functionality])], +- [brski_on=1], +- [brski_on=0]) +-AM_CONDITIONAL([ENABLE_BRSKI], [test x$brski_on = x1]) ++ [], ++ [enable_brski="no"]) ++AM_CONDITIONAL([ENABLE_BRSKI], [test "$enable_brski" = "yes"]) + AM_COND_IF([ENABLE_BRSKI], + AC_MSG_RESULT([BRSKI support enabled]) + AC_DEFINE([ENABLE_BRSKI]), +@@ -65,9 +65,9 @@ AM_COND_IF([ENABLE_BRSKI], + AC_ARG_ENABLE([pthreads], + [AS_HELP_STRING([--disable-pthreads], + [Disable support for pthreads])], +- [pthreads_on=1], +- [pthreads_on=0]) +-AM_CONDITIONAL([DISABLE_PTHREAD], [test x$pthreads_on = x1]) ++ [], ++ [enable_pthreads="yes"]) ++AM_CONDITIONAL([DISABLE_PTHREAD], [test "$enable_pthreads" = "no"]) + AM_COND_IF([DISABLE_PTHREAD], + AC_MSG_RESULT([pthread support disabled]) + AC_DEFINE([DISABLE_PTHREADS]), +@@ -88,13 +88,13 @@ AM_COND_IF([ENABLE_EXAMPLES], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) + AC_ARG_WITH([ssl-dir], + [AS_HELP_STRING([--with-ssl-dir], + [location of OpenSSL install folder, defaults to /usr/local/ssl])], +- [ssldir="$withval"], +- [ssldir="/usr/local/ssl"]) +-AC_SUBST([SSL_CFLAGS], "$ssldir/include") +-AC_SUBST([SSL_LDFLAGS], "$ssldir/lib") ++ [], ++ [with_ssl_dir="/usr/local/ssl"]) ++AC_SUBST([SSL_CFLAGS], "$with_ssl_dir/include") ++AC_SUBST([SSL_LDFLAGS], "$with_ssl_dir/lib") + +-CFLAGS="$CFLAGS -Wall -I$ssldir/include" +-LDFLAGS="$LDFLAGS -L$ssldir/lib" ++CFLAGS="$CFLAGS -Wall -I$with_ssl_dir/include" ++LDFLAGS="$LDFLAGS -L$with_ssl_dir/lib" + if test "$is_freebsd" = "1" ; then + AC_CHECK_LIB([crypto], [EVP_EncryptInit], [], + [AC_MSG_FAILURE([can't find openssl crypto lib])] +@@ -120,13 +120,13 @@ AC_CHECK_LIB([crypto], [EVP_CIPHER_CTX_reset], [], + AC_ARG_WITH([libcurl-dir], + [AS_HELP_STRING([--with-libcurl-dir], + [enable support for client proxy using libcurl])], +- [libcurldir="$withval"], +- [with_libcurldir=no]) ++ [], ++ [with_libcurl_dir=no]) + + AS_IF( +- [test "x$with_libcurldir" != xno], +- [[CFLAGS="$CFLAGS -I$libcurldir/include"] +- [LDFLAGS="$LDFLAGS -L$libcurldir/lib -lcurl"] ++ [test "$with_libcurl_dir" != "no"], ++ [[CFLAGS="$CFLAGS -I$with_libcurl_dir/include"] ++ [LDFLAGS="$LDFLAGS -L$with_libcurl_dir/lib -lcurl"] + AC_CHECK_LIB( + [curl], + [curl_easy_init], +@@ -143,17 +143,17 @@ AC_ARG_WITH([libcurl-dir], + AC_ARG_WITH([uriparser-dir], + [AS_HELP_STRING([--with-uriparser-dir], + [enable support for path segments using uriparser])], +- [uriparserdir="$withval"], +- [with_uriparserdir=no]) ++ [], ++ [with_uriparser_dir=no]) + + dnl CFLAGS="$CFLAGS -Wall -I$uriparserdir/include" + dnl CPPFLAGS="$CPPFLAGS -I$uriparser/include" + dnl LDFLAGS="$LDFLAGS -L$uriparserdir/lib -luriparser" + + AS_IF( +- [test "x$with_uriparserdir" != xno], +- [[CFLAGS="$CFLAGS -I$uriparserdir/include"] +- [LDFLAGS="$LDFLAGS -L$uriparserdir/lib -luriparser"] ++ [test "$with_uriparser_dir" != "no"], ++ [[CFLAGS="$CFLAGS -I$with_uriparser_dir/include"] ++ [LDFLAGS="$LDFLAGS -L$with_uriparser_dir/lib -luriparser"] + AC_CHECK_LIB( + [uriparser], + [uriParseUriA], +@@ -170,13 +170,13 @@ AC_ARG_WITH([uriparser-dir], + AC_ARG_WITH([libcoap-dir], + [AS_HELP_STRING([--with-libcoap-dir], + [enable support for ESToCoAP using libcoap library])], +- [libcoapdir="$withval"], +- [with_libcoapdir=no]) ++ [], ++ [with_libcoap_dir=no]) + + AS_IF( +- [test "x$with_libcoapdir" != xno], +- [[CFLAGS="$CFLAGS -I$libcoapdir/include"] +- [LDFLAGS="$LDFLAGS -L$libcoapdir/lib -lcoap-2-openssl"] ++ [test "$with_libcoap_dir" != "no"], ++ [[CFLAGS="$CFLAGS -I$with_libcoap_dir/include"] ++ [LDFLAGS="$LDFLAGS -L$with_libcoap_dir/lib -lcoap-2-openssl"] + AC_CHECK_LIB( + [coap-2-openssl], + [coap_startup], +-- +2.17.1 + diff --git a/package/libest/0005-configure.ac-remove-duplicate-invocation-of-AM_INIT_.patch b/package/libest/0005-configure.ac-remove-duplicate-invocation-of-AM_INIT_.patch new file mode 100644 index 0000000000..1ee35ad7f9 --- /dev/null +++ b/package/libest/0005-configure.ac-remove-duplicate-invocation-of-AM_INIT_.patch @@ -0,0 +1,36 @@ +From bd4fad5e427f4d2828f2edbe8063f6d6c9276c7b Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 8 Jan 2022 13:30:58 +0100 +Subject: [PATCH] configure.ac: remove duplicate invocation of AM_INIT_AUTOMAKE + +autoreconf fails with: + +configure.ac:9: error: AM_INIT_AUTOMAKE expanded multiple times +/home/thomas/projets/buildroot/output/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... +configure.ac:7: the top level +/home/thomas/projets/buildroot/output/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... +configure.ac:9: the top level + +Drop the duplicate invocation to AM_INIT_AUTOMAKE to solve this. + +Upstream: https://github.com/cisco/libest/pull/106 +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0b930bf..66a91f2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,6 @@ AC_CONFIG_AUX_DIR(config) + AC_CONFIG_SRCDIR(src/est/est.c) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE + AM_INIT_AUTOMAKE([subdir-objects]) + +-- +2.33.1 + diff --git a/package/libest/0006-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch b/package/libest/0006-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch new file mode 100644 index 0000000000..ba0ecb4a86 --- /dev/null +++ b/package/libest/0006-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch @@ -0,0 +1,42 @@ +From 32fe99fa403d2f51931615745a64f8aede1ca46f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 8 Jan 2022 13:38:17 +0100 +Subject: [PATCH] src/est/est_locl.h: add missing extern on + e_ctx_ssl_exdata_index + +Without this extern, the variable gets re-declared in each compilation +unit including est_locl.h, causing gcc >= 10 to complain with: + +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client.o:(.data+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server.o:(.bss+0xc): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server_http.o:(.bss+0x3b8): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_proxy.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client_http.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_ossl_util.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client_proxy.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_enhcd_cert_auth.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server_coap.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here +collect2: error: ld returned 1 exit status + +Upstream: https://github.com/cisco/libest/pull/107 +Signed-off-by: Thomas Petazzoni +--- + src/est/est_locl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/est/est_locl.h b/src/est/est_locl.h +index 62dcbea..b16f62d 100644 +--- a/src/est/est_locl.h ++++ b/src/est/est_locl.h +@@ -590,7 +590,7 @@ typedef struct est_oid_list { + /* + * Index used to link the EST Ctx into the SSL structures + */ +-int e_ctx_ssl_exdata_index; ++extern int e_ctx_ssl_exdata_index; + + LIBEST_TEST_API void est_log (EST_LOG_LEVEL lvl, char *format, ...); + LIBEST_TEST_API void est_log_backtrace (void); +-- +2.33.1 + diff --git a/package/libest/Config.in b/package/libest/Config.in new file mode 100644 index 0000000000..7ba2f32c09 --- /dev/null +++ b/package/libest/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_LIBEST + bool "libest" + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_OPENSSL + help + libest is a C implementation of RFC 7030 (Enrollment over + Secure Transport). + + It can be used to provision public key certificates from + a certificate authority (CA) or registration authority (RA) + to end-user devices and network infrastructure devices. + + https://github.com/cisco/libest + +if BR2_PACKAGE_LIBEST + +config BR2_PACKAGE_LIBEST_BRSKI + bool "BRSKI support" + +config BR2_PACKAGE_LIBEST_MODE_CLIENT_ONLY + bool "client-only mode" + # The client-only mode fails to build with OpenJDK/JNI + # bindings + depends on !BR2_PACKAGE_OPENJDK + +endif # BR2_PACKAGE_LIBEST diff --git a/package/libest/libest.hash b/package/libest/libest.hash new file mode 100644 index 0000000000..c902a9568f --- /dev/null +++ b/package/libest/libest.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 324b3a2b16cd14ea4234d75fa90f08b29509bac9cd3795c44268e22f906ee0ad libest-3.2.0.tar.gz +sha256 fbdb055f98babf8d86095d6f9b9e34d2ff21a8212e442b8f18bdcb403e44366c LICENSE diff --git a/package/libest/libest.mk b/package/libest/libest.mk new file mode 100644 index 0000000000..d9f3cf87bc --- /dev/null +++ b/package/libest/libest.mk @@ -0,0 +1,71 @@ +################################################################################ +# +# libest +# +################################################################################ + +LIBEST_VERSION = 3.2.0 +LIBEST_SITE = $(call github,cisco,libest,r$(LIBEST_VERSION)) +# We don't build examples, so we're not affected by the OpenSSL +# license +LIBEST_LICENSE = BSD-3-Clause, MIT, W3C +LIBEST_LICENSE_FILES = LICENSE +LIBEST_INSTALL_STAGING = YES +LIBEST_AUTORECONF = YES +LIBEST_DEPENDENCIES = openssl host-pkgconf +# libcoap support is explicitly disabled because it breaks the build +LIBEST_CONF_OPTS = \ + --with-ssl-dir=$(STAGING_DIR)/usr \ + $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-pthreads,--disable-pthreads) \ + $(if $(BR2_PACKAGE_LIBEST_BRSKI),--enable-brski,--disable-brski) \ + --disable-examples \ + --without-libcoap-dir + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LIBEST_DEPENDENCIES += libexecinfo +LIBEST_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + +ifeq ($(BR2_PACKAGE_LIBEST_MODE_CLIENT_ONLY),y) +LIBEST_CONF_OPTS += --enable-client-only +else +LIBEST_CONF_OPTS += --disable-client-only +endif + +ifeq ($(BR2_PACKAGE_OPENJDK),y) +LIBEST_MAKE_ENV += JAVA_HOME=$(HOST_DIR)/lib/jvm +LIBEST_CONF_ENV += JAVA_HOME=$(HOST_DIR)/lib/jvm +LIBEST_CONF_OPTS += --enable-jni +LIBEST_DEPENDENCIES += openjdk +else +LIBEST_CONF_OPTS += --disable-jni +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBEST_CONF_OPTS += --with-libcurl-dir=$(STAGING_DIR)/usr +LIBEST_DEPENDENCIES += libcurl +else +LIBEST_CONF_OPTS += --without-libcurl-dir +endif + +ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) +LIBEST_CONF_OPTS += --with-uriparser-dir=$(STAGING_DIR)/usr +LIBEST_DEPENDENCIES += liburiparser +else +LIBEST_CONF_OPTS += --without-uriparser-dir +endif + +ifeq ($(BR2_PACKAGE_SAFECLIB),y) +LIBEST_CONF_OPTS += --with-system-libsafec +LIBEST_DEPENDENCIES += safeclib +else +LIBEST_CONF_OPTS += --without-system-libsafec +endif + +define LIBEST_INSTALL_PC + $(INSTALL) -c -m 0644 $(LIBEST_PKGDIR)/libest.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/libest.pc +endef +LIBEST_POST_INSTALL_STAGING_HOOKS += LIBEST_INSTALL_PC + +$(eval $(autotools-package)) diff --git a/package/libest/libest.pc b/package/libest/libest.pc new file mode 100644 index 0000000000..166240f9d1 --- /dev/null +++ b/package/libest/libest.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libest +Description: implementation of RFC 7030 (Enrollment over Secure Transport) +Version: 2.1.0 +Libs: -lest +Cflags: -I${includedir}/est From thomas.petazzoni at bootlin.com Sat Jan 8 13:38:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 14:38:24 +0100 Subject: [Buildroot] [PATCH v2] package/libest: new package In-Reply-To: <20200715223514.15744-1-aleksandr.o.makarov@gmail.com> References: <20200715223514.15744-1-aleksandr.o.makarov@gmail.com> Message-ID: <20220108143824.2cdc9a29@windsurf> Hello Aleksandr, On Wed, 15 Jul 2020 16:35:14 -0600 Aleksandr Makarov wrote: > libest is a C implementation of RFC 7030 (Enrollment over > Secure Transport). > > It can be used to provision public key certificates from > a certificate authority (CA) or registration authority (RA) > to end-user devices and network infrastructure devices. > > https://github.com/cisco/libest > > Notes on patches included in this package: > > - libest bundles a stubbed version of libsafec, and has no provision > to build against a system-installed full (non-stubbed) libsafec. > We add a patch to make that possible. > > - Added a configuration option --{enable,disable}-examples to toggle > examples build by a separate patch. > > - There's a configuration option `--enable-jni` which allows to build > a JNI library for binding libest to Java programs. And that library > would be using an outdated version of OpenSSL 1.0. > We fix that by adding support for OpenSSL 1.1 API for that library. > > - Fixed a bug when specifying either `--enable-FEATURE` or `--disable-FEATURE` > has always been enabling the feature. Sorry for the long delay. I finally applied your patch, but after making some significant changes: [Thomas: - Added comments about the upstream status in existing patches - Added a patch fixing an autoreconf issue - Added a patch adding a missing "extern" on a variable to fix build with gcc 10 - Removed the glibc dependency by using the new libexecinfo package - Drastically simplified the complex libcoap disabling and client-only mode vs. OpenJDK issue. libcoap support is now forcefully disabled, and client-mode only option is made invisible when OpenJDK is enabled. - Fixed the license information; - Added missing host-pkgconf ] Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 13:40:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 14:40:38 +0100 Subject: [Buildroot] [git commit] package/libest: add !BR2_STATIC_LIBS dependency Message-ID: <20220108133456.4174882A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5ecbffe61594ea572da18d1550a7cbdc28b7e1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It should have been inherited from libexecinfo. Signed-off-by: Thomas Petazzoni --- package/libest/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libest/Config.in b/package/libest/Config.in index 7ba2f32c09..d8271ad69e 100644 --- a/package/libest/Config.in +++ b/package/libest/Config.in @@ -1,5 +1,9 @@ +comment "libest needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_LIBEST bool "libest" + depends on !BR2_STATIC_LIBS # libexecinfo or glibc select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL help From romain.naour at smile.fr Sat Jan 8 13:42:38 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 14:42:38 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: References: <20201126144722.502163-1-nolange79@gmail.com> Message-ID: <195311e2-38dc-53ee-80b8-09dca52320a0@smile.fr> Hello Norbert, >> +# >> +# [1] - https://github.com/systemd/systemd/issues/16183 > > It seems that systemd now include what you need since version 249 containing the > commit [1]. > > The fakeroot_tmpfiles.sh script seems not neceesary anymore. > > [1] > https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 I have marked this patch as "Changes Requested". Best regards, Romain > > Best regards, > Romain > > From peter at korsgaard.com Sat Jan 8 13:44:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 14:44:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: bump version to 0.23.5 In-Reply-To: <20220108102620.1603341-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 11:26:20 +0100") References: <20220108102620.1603341-1-bernd.kuhls@t-online.de> Message-ID: <87iluugx49.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Switched project URL to https. I added a short explaination why (HTTP redirects to HTTPS) > +++ b/package/mpd/mpd.mk > @@ -5,7 +5,7 @@ > ################################################################################ > MPD_VERSION_MAJOR = 0.23 > -MPD_VERSION = $(MPD_VERSION_MAJOR).3 > +MPD_VERSION = $(MPD_VERSION_MAJOR).5 > MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz > MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) And also changed it here. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 13:45:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 14:45:33 +0100 Subject: [Buildroot] [git commit] package/mpd: bump version to 0.23.5 Message-ID: <20220108133926.8C33582BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd84e1bcf9f116ccff2092124d56c1203d831a42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switched project URL to HTTPS as HTTP redirects to it. Added upstream patch to fix build error with uClibc: https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 https://github.com/MusicPlayerDaemon/MPD/pull/1382 Changelog: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.5/NEWS Signed-off-by: Bernd Kuhls [Peter: also update MPD_SITE] Signed-off-by: Peter Korsgaard --- .../0002-lib-alsa-Error-add-missing-include.patch | 25 ++++++++++++++++++++++ package/mpd/Config.in | 2 +- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 4 ++-- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch new file mode 100644 index 0000000000..c45a087a54 --- /dev/null +++ b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch @@ -0,0 +1,25 @@ +From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 +From: aeolio +Date: Tue, 14 Dec 2021 09:01:23 +0100 +Subject: [PATCH] lib/alsa/Error: add missing #include + +Downloaded from upstream commit: +https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 + +Signed-off-by: Bernd Kuhls +--- + src/lib/alsa/Error.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx +index cd351f37d1..8ceb4417ca 100644 +--- a/src/lib/alsa/Error.cxx ++++ b/src/lib/alsa/Error.cxx +@@ -29,6 +29,7 @@ + + #include "Error.hxx" + ++#include + #include + + namespace Alsa { diff --git a/package/mpd/Config.in b/package/mpd/Config.in index eb10151df3..fc0f409448 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -16,7 +16,7 @@ menuconfig BR2_PACKAGE_MPD it can play a variety of sound files while being controlled by its network protocol. - http://www.musicpd.org + https://www.musicpd.org if BR2_PACKAGE_MPD diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index cb9d05cd32..56f88490cf 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b300625701005c6b14649f11dac118d05540529a5385d05b7c3062c0ce08f399 mpd-0.23.3.tar.xz +sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 7bda0963c6..6f01b29c6d 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,9 +5,9 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).3 +MPD_VERSION = $(MPD_VERSION_MAJOR).5 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz -MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) +MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING From arnout at mind.be Sat Jan 8 13:49:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 14:49:19 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain/toolchain-wrapper: Handle debug info paths in gcc7 or below for reproducibility In-Reply-To: <20200415220032.140083-1-brandon.maier@rockwellcollins.com> References: <20200415220032.140083-1-brandon.maier@rockwellcollins.com> Message-ID: On 16/04/2020 00:00, Brandon Maier wrote: > In GCC8 the flag -ffile-prefix-map handles cleaning up both the __FILE__ > macros and the debug info paths. In GCC7 or below we are manually > handling the __FILE__ macros, but not debug info paths. Use > -fdebug-prefix-map to clean them up. > > See for more detail: https://reproducible-builds.org/docs/build-path/ > > Signed-off-by: Brandon Maier Both applied to master, thanks. Sorry it took so long for such a simple patch. Regards, Arnout > --- > toolchain/toolchain-wrapper.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk > index 09dda17890..7d55050135 100644 > --- a/toolchain/toolchain-wrapper.mk > +++ b/toolchain/toolchain-wrapper.mk > @@ -26,6 +26,7 @@ TOOLCHAIN_WRAPPER_OPTS += -Wl,--build-id=none > ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) > TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot > else > +TOOLCHAIN_WRAPPER_OPTS += -fdebug-prefix-map=$(BASE_DIR)=buildroot > TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined > endif > endif > From arnout at mind.be Sat Jan 8 13:48:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 14:48:22 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-wrapper: reproducible builds: handle debug info paths in GCC <7 Message-ID: <20220108134319.8972182BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=409e30a70fc28e05a11c903dc7918eee92e424d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In GCC8 the flag -ffile-prefix-map handles cleaning up both the __FILE__ macros and the debug info paths. In GCC7 or below we are manually handling the __FILE__ macros, but not debug info paths. Use -fdebug-prefix-map to clean them up. This option exists since GCC 4.3.0, which is our minimal supported GCC version. See for more detail: https://reproducible-builds.org/docs/build-path/ Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/toolchain-wrapper.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index 8b551e3a18..bc8d77b892 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -26,6 +26,7 @@ TOOLCHAIN_WRAPPER_OPTS += -Wl,--build-id=none ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot else +TOOLCHAIN_WRAPPER_OPTS += -fdebug-prefix-map=$(BASE_DIR)=buildroot TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined endif ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),) From arnout at mind.be Sat Jan 8 13:48:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 14:48:22 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-wrapper: reproducible builds: omit absolute paths from debug symbols Message-ID: <20220108134319.914E882D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ec9b3abd9dc8d24bc75f2b5b365ad78e2b09b8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In GCC6 the compiler was made smarter to omit the flag -fdebug-prefix-map from the DWARF DW_AT_producer section[1]. That flag contains the absolute path '$(BASE_DIR)' which breaks reproducibility. Prior to GCC6 however, the only way to omit the flag is to use -gno-record-gcc-switches which omits all flags. [1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=266cc0c181549c2fb6b50f8f26213cdc89101026 Signed-off-by: Brandon Maier [Arnout: invert condition to ifeq (,) instead of ifneq (,y)] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/toolchain-wrapper.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index bc8d77b892..cbf46f15fa 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -32,6 +32,9 @@ endif ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),) TOOLCHAIN_WRAPPER_OPTS += -DBR_NEED_SOURCE_DATE_EPOCH endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_6),) +TOOLCHAIN_WRAPPER_OPTS += -gno-record-gcc-switches +endif endif # Disable -ftree-loop-distribute-patterns on microblaze to From juergen at jstuber.net Sat Jan 8 13:52:44 2022 From: juergen at jstuber.net (Juergen Stuber) Date: Sat, 8 Jan 2022 14:52:44 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <20220107235959.2638b513@windsurf> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <20220107105223.01912574@windsurf> <20220107235959.2638b513@windsurf> Message-ID: <20220108145237.63a25b31@sju.home.jstuber.net> Hi Thomas, James, all, On Fri, 7 Jan 2022 23:59:59 +0100 Thomas Petazzoni wrote: > On Fri, 7 Jan 2022 16:30:12 -0600 > James Hilliard wrote: > > > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir > > > > $(TARGET_CROSS))gcc > > > > > > How come things are working today with this one? > > > > I think this is currently set in the cargo config file. > > Ah, right: > > [target. at RUSTC_TARGET_NAME@] > linker = "@CROSS_PREFIX at gcc" > > in package/rustc/cargo-config.in the config file has the problem that it is found via CARGO_HOME, which comes last in the search path, after searching upward in the directory hierarchy. When I used Rust under buildroot for the first time, a broken .cargo/config in my home directory which I had completely forgotten about caused the build to fail, and it took me a while to figure it out. Environment variables take precedence over config files, so IMHO they are the better choice. > > > - Relevance of > > > CARGO_TARGET_$(RUSTC_TARGET_TRIPLE)_LINKER=$(notdir > > > $(TARGET_CROSS))gcc > > > > Set via CARGO_HOME currently, but I think may allow the cargo > > config to not be required. > > I'm no sure why you say this is set via CARGO_HOME? Because the > config file is stored in $(CARGO_HOME)/config ? Greetings J?rgen -- J?rgen Stuber http://www.jstuber.net/ Tel: +49-208-304 20 50 Mobil: +49-178-39 39 628 1B78 A579 E159 2A85 67BB 1314 C083 224B 0F9C DA21 From peter at korsgaard.com Sat Jan 8 14:02:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 15:02:39 +0100 Subject: [Buildroot] [PATCH] configs/imx6slevk: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20220108131409.990135-1-festevam@gmail.com> (Fabio Estevam's message of "Sat, 8 Jan 2022 10:14:09 -0300") References: <20220108131409.990135-1-festevam@gmail.com> Message-ID: <87ee5igwao.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650628 > Signed-off-by: Fabio Estevam Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 14:02:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 15:02:46 +0100 Subject: [Buildroot] [git commit] configs/imx6slevk: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220108135639.B0B0082BC9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf2a7663ccc6089e98e0d6ec39fa8623749c0c24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ After the update of u-boot in commit 9a04bbec1cd59b (configs/imx6slevk: bump U-Boot). Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650628 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/imx6slevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6slevk_defconfig b/configs/imx6slevk_defconfig index 6f0bae5aa9..9448267e2b 100644 --- a/configs/imx6slevk_defconfig +++ b/configs/imx6slevk_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6slevk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From romain.naour at smile.fr Sat Jan 8 14:09:56 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 15:09:56 +0100 Subject: [Buildroot] [PATCH 1/2] qemu_arm_versatile: switch to in-kernel defconfig + fragment In-Reply-To: <20210316143822.3421019-1-masahiroy@kernel.org> References: <20210316143822.3421019-1-masahiroy@kernel.org> Message-ID: <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> Hello Masahiro, All Le 16/03/2021 ? 15:38, Masahiro Yamada a ?crit?: > This platform has its own kernel defconfig in Buildroot, but we cannot > get quick idea about how much it diverged from the in-kernel defconfig. > > Let's use the upstream arch/arm/config/versatile_defconfig as a base, > and maintain the diff as a merge-config fragment. The same .config is > still generated based on the 5.10.7 kernel. > > The diff is quite big, but this is a good start-point for cleanups. > Follow-up works can drop diff lines unless we find a good reason for > divergence. We use a custom kernel defconfig for this defconfig since it was added to Buildroot [1]. I guess the aim of having a custom kernel defconfig is to reduce the build time. This defconfig is used for boot testing on Qemu, I'm not sure if it really used for other use case. Have you tested without any additional fragment? [1] https://git.buildroot.net/buildroot/commit/?id=d3789ce3b70aaaa5e180d041b2ad282b36d929ed Best regards, Romain From thomas.petazzoni at bootlin.com Sat Jan 8 14:09:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:09:49 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime_defconfig: use linux-disable-lima.fragment Message-ID: <20220108140349.7E68082D96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dbdd8971df4c6d57cdf27c89810b3b2c6893e82c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This defconfig enables sunxi-mali-mainline-driver so we need to disable Lima in Linux to prevent Mali to not load. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 17da786a8c..698137e46c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -26,6 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y From thomas.petazzoni at bootlin.com Sat Jan 8 14:09:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:09:48 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment Message-ID: <20220108140349.7346E82D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddc3f428afa51b935a6a48fba8533913543d77ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This defconfig enables sunxi-mali-mainline-driver so we need to disable Lima in Linux to prevent Mali to not load. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 64a66de5c8..b46cf37433 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -26,6 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y From thomas.petazzoni at bootlin.com Sat Jan 8 14:09:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:09:48 +0100 Subject: [Buildroot] [git commit] board/olimex/a20_olinuxino: add linux-disable-lima.fragment Message-ID: <20220108140349.6CD9F82BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8eec48376095310119e54a1516e8f8c2cfc0afb0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This Linux defconfig fragment is needed to disable Lima driver in favour of Mali(if enabled). This because Lima is enabled by default in Linux's sunxi_defconfig and if we enable Mali driver in Buildroot it will fail to load. So let's set CONFIG_DRM_LIMA=n. Of course this fragment is only used by Buildroot defconfigs that enable Mali driver. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/olimex/a20_olinuxino/linux-disable-lima.fragment | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/olimex/a20_olinuxino/linux-disable-lima.fragment b/board/olimex/a20_olinuxino/linux-disable-lima.fragment new file mode 100644 index 0000000000..4c36f8aab3 --- /dev/null +++ b/board/olimex/a20_olinuxino/linux-disable-lima.fragment @@ -0,0 +1,2 @@ +# Disable LIMA in favour of Mali +# CONFIG_DRM_LIMA is not set From thomas.petazzoni at bootlin.com Sat Jan 8 14:10:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:10:49 +0100 Subject: [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment In-Reply-To: <20211105221800.1451167-4-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> <20211105221800.1451167-4-giulio.benetti@benettiengineering.com> Message-ID: <20220108151049.4ad9c666@windsurf> On Fri, 5 Nov 2021 23:17:58 +0100 Giulio Benetti wrote: > +CONFIG_DRM_LIMA=n Changed to: # CONFIG_DRM_LIMA is not set and applied. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 14:10:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:10:59 +0100 Subject: [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: use linux-disable-lima.fragment In-Reply-To: <20211105221800.1451167-6-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> <20211105221800.1451167-6-giulio.benetti@benettiengineering.com> Message-ID: <20220108151059.56e74aa4@windsurf> On Fri, 5 Nov 2021 23:18:00 +0100 Giulio Benetti wrote: > This defconfig enables sunxi-mali-mainline-driver so we need to disable > Lima in Linux to prevent Mali to not load. > > Signed-off-by: Giulio Benetti > --- > configs/olimex_a20_olinuxino_lime_defconfig | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 14:10:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:10:54 +0100 Subject: [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment In-Reply-To: <20211105221800.1451167-5-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> <20211105221800.1451167-5-giulio.benetti@benettiengineering.com> Message-ID: <20220108151054.68321880@windsurf> On Fri, 5 Nov 2021 23:17:59 +0100 Giulio Benetti wrote: > This defconfig enables sunxi-mali-mainline-driver so we need to disable > Lima in Linux to prevent Mali to not load. > > Signed-off-by: Giulio Benetti > --- > configs/olimex_a20_olinuxino_lime2_defconfig | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sat Jan 8 14:12:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:12:35 +0100 Subject: [Buildroot] [git commit] qemu_arm_versatile: switch to in-kernel defconfig + fragment Message-ID: <20220108140633.6913D819F0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34b725c412d9771127405276052398d09f522613 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This platform has its own kernel defconfig in Buildroot, but we cannot get quick idea about how much it diverged from the in-kernel defconfig. Let's use the upstream arch/arm/config/versatile_defconfig as a base, and maintain the diff as a merge-config fragment. The same .config is still generated (based on the 5.10.7 kernel). The diff is quite big, but this is a good start-point for cleanups. Follow-up works can drop diff lines unless we find a good reason for divergence. Signed-off-by: Masahiro Yamada [Arnout: rename linux.config to linux.fragment] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/qemu/arm-versatile/linux.config | 43 --------------------- board/qemu/arm-versatile/linux.fragment | 66 +++++++++++++++++++++++++++++++++ configs/qemu_arm_versatile_defconfig | 4 +- 3 files changed, 68 insertions(+), 45 deletions(-) diff --git a/board/qemu/arm-versatile/linux.config b/board/qemu/arm-versatile/linux.config deleted file mode 100644 index b1001d84a7..0000000000 --- a/board/qemu/arm-versatile/linux.config +++ /dev/null @@ -1,43 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_VERSATILE=y -CONFIG_PCI=y -CONFIG_PCI_VERSATILE=y -CONFIG_AEABI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_NETDEVICES=y -CONFIG_8139CP=y -CONFIG_PHYLIB=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_ARMAACI=m -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_MAGIC_SYSRQ=y diff --git a/board/qemu/arm-versatile/linux.fragment b/board/qemu/arm-versatile/linux.fragment new file mode 100644 index 0000000000..0aed558315 --- /dev/null +++ b/board/qemu/arm-versatile/linux.fragment @@ -0,0 +1,66 @@ +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CMA is not set +# CONFIG_CRAMFS is not set +CONFIG_CMDLINE="" +CONFIG_CRC16=y +CONFIG_CRYPTO=y +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DEVTMPFS=y +# CONFIG_DRM is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EXT2_FS is not set +CONFIG_EXT4_FS=y +CONFIG_FB_ARMCLCD=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FTRACE is not set +# CONFIG_GPIOLIB is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HWMON=y +CONFIG_HZ_PERIODIC=y +# CONFIG_I2C_VERSATILE is not set +CONFIG_INET_DIAG=y +CONFIG_INPUT_EVDEV=y +CONFIG_IPV6=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_PNP is not set +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOGO is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_MDIO_DEVICE=y +# CONFIG_MINIX_FS is not set +# CONFIG_MMC is not set +# CONFIG_MTD is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_NFSD is not set +# CONFIG_NFS_FS is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_NVMEM is not set +# CONFIG_OABI_COMPAT is not set +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PCI=y +CONFIG_PCI_VERSATILE=y +CONFIG_PHYLIB=y +# CONFIG_ROMFS_FS is not set +# CONFIG_RTC_CLASS is not set +CONFIG_SCSI=y +CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_SYM53C8XX_2=y +CONFIG_SERIO_SERPORT=y +CONFIG_SLUB=y +# CONFIG_SPI is not set +# CONFIG_SYNC_FILE is not set +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +# CONFIG_VFP is not set +# CONFIG_XZ_DEC is not set +CONFIG_8139CP=y +CONFIG_BLK_DEV_SD=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index a039c47729..5e399d17de 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -21,8 +21,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" +BR2_LINUX_KERNEL_DEFCONFIG="versatile" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" From arnout at mind.be Sat Jan 8 14:12:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:12:35 +0100 Subject: [Buildroot] [git commit] qemu_arm_versatile_nommu: switch to in-kernel defconfig + fragment Message-ID: <20220108140633.7190282D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53d82096b67ac23185e7cbece9a93aff00f0986c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This platform has its own kernel defconfig in Buildroot, but we cannot get quick idea about how much it diverged from the in-kernel defconfig. Let's use the upstream arch/arm/config/versatile_defconfig as a base, and maintain the diff as a merge-config fragment. The same .config is still generated based on the 5.10.7 kernel. The diff is quite big, but this is a good start-point for cleanups. Follow-up works can drop diff lines unless we find a good reason for divergence. Signed-off-by: Masahiro Yamada [Arnout: rename linux-nommu.config to linux-nommu.fragment] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/qemu/arm-versatile/linux-nommu.config | 47 --------------------- board/qemu/arm-versatile/linux-nommu.fragment | 59 +++++++++++++++++++++++++++ configs/qemu_arm_versatile_nommu_defconfig | 4 +- 3 files changed, 61 insertions(+), 49 deletions(-) diff --git a/board/qemu/arm-versatile/linux-nommu.config b/board/qemu/arm-versatile/linux-nommu.config deleted file mode 100644 index 1d91d51a14..0000000000 --- a/board/qemu/arm-versatile/linux-nommu.config +++ /dev/null @@ -1,47 +0,0 @@ -# CONFIG_MMU is not set -CONFIG_ARCH_VERSATILE=y -CONFIG_ARM_SINGLE_ARCH_VERSATILE=y -CONFIG_SET_MEM_PARAM=y -CONFIG_DRAM_BASE=0x00000000 -CONFIG_DRAM_SIZE=0x08000000 -CONFIG_ARCH_VERSATILE_PB=y -CONFIG_MACH_VERSATILE_AB=y -CONFIG_MACH_VERSATILE_DT=y -CONFIG_BINFMT_FLAT=y -CONFIG_SYSVIPC=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_AEABI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_NETDEVICES=y -CONFIG_SMC91X=y -CONFIG_PHYLIB=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_ARMAACI=m -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_MAGIC_SYSRQ=y diff --git a/board/qemu/arm-versatile/linux-nommu.fragment b/board/qemu/arm-versatile/linux-nommu.fragment new file mode 100644 index 0000000000..6f1cc3f26d --- /dev/null +++ b/board/qemu/arm-versatile/linux-nommu.fragment @@ -0,0 +1,59 @@ +# CONFIG_ARM_SINGLE_ARMV7M is not set +CONFIG_ARM_SINGLE_ARCH_VERSATILE=y +CONFIG_BINFMT_ELF_FDPIC=y +CONFIG_BINFMT_FLAT=y +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CRAMFS is not set +CONFIG_CMDLINE="" +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DRM is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EXT2_FS is not set +CONFIG_EXT4_FS=y +CONFIG_FB_ARMCLCD=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FTRACE is not set +# CONFIG_GPIO_PL061 is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HWMON=y +# CONFIG_I2C_VERSATILE is not set +CONFIG_INET_DIAG=y +CONFIG_INPUT_EVDEV=y +CONFIG_IPV6=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_PNP is not set +# CONFIG_MMU is not set +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOGO is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_MDIO_DEVICE=y +# CONFIG_MINIX_FS is not set +# CONFIG_MMC is not set +# CONFIG_MTD is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_NFSD is not set +# CONFIG_NFS_FS is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_NVMEM is not set +CONFIG_DRAM_BASE=0x00000000 +CONFIG_DRAM_SIZE=0x08000000 +CONFIG_INITRAMFS_SOURCE="${BR_BINARIES_DIR}/rootfs.cpio" +# CONFIG_PARTITION_ADVANCED is not set +# CONFIG_OABI_COMPAT is not set +CONFIG_PHYLIB=y +# CONFIG_ROMFS_FS is not set +# CONFIG_RTC_CLASS is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIO_SERPORT=y +CONFIG_SET_MEM_PARAM=y +CONFIG_SLUB=y +# CONFIG_SPI is not set +# CONFIG_SYNC_FILE is not set +# CONFIG_VFP is not set diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig index 59a6efd04f..1357742703 100644 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -32,8 +32,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" +BR2_LINUX_KERNEL_DEFCONFIG="versatile" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" From thomas.petazzoni at bootlin.com Sat Jan 8 14:13:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 15:13:42 +0100 Subject: [Buildroot] [PATCH 1/2] qemu_arm_versatile: switch to in-kernel defconfig + fragment In-Reply-To: <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> References: <20210316143822.3421019-1-masahiroy@kernel.org> <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> Message-ID: <20220108151342.063a9bc6@windsurf> On Sat, 8 Jan 2022 15:09:56 +0100 Romain Naour wrote: > We use a custom kernel defconfig for this defconfig since it was added to > Buildroot [1]. > > I guess the aim of having a custom kernel defconfig is to reduce the build time. Most likely yes, but when I see the fragment, it indeed disables a lot of things, which is nice as it speed up the build. Just like on x86, you could build the full defconfig to have something that boots under qemu, but having a stripped down configuration is a lot more useful/practical; Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fperrad at gmail.com Sat Jan 8 14:14:59 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sat, 8 Jan 2022 15:14:59 +0100 Subject: [Buildroot] [PATCH] configs/olimex_stmp157: bump U-Boot version Message-ID: <20220108141459.2972-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- configs/olimex_stmp157_olinuxino_lime_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index f54d899b3..74e7f9ba6 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20210821, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="acda542100fa83e4bc82634e4668f8106af37a61" +# release-20211130, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1c29714bc643c299e2ed4ba870be8d4538124144" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y -- 2.32.0 From arnout at mind.be Sat Jan 8 14:16:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 15:16:44 +0100 Subject: [Buildroot] [PATCH 1/2] qemu_arm_versatile: switch to in-kernel defconfig + fragment In-Reply-To: <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> References: <20210316143822.3421019-1-masahiroy@kernel.org> <8bfdc46b-bfbe-2470-0068-ca3a5d72fd89@smile.fr> Message-ID: <7e1c98d7-4d7b-698c-47e2-f7754257023b@mind.be> On 08/01/2022 15:09, Romain Naour wrote: > Hello Masahiro, All > > Le 16/03/2021 ? 15:38, Masahiro Yamada a ?crit?: >> This platform has its own kernel defconfig in Buildroot, but we cannot >> get quick idea about how much it diverged from the in-kernel defconfig. >> >> Let's use the upstream arch/arm/config/versatile_defconfig as a base, >> and maintain the diff as a merge-config fragment. The same .config is >> still generated based on the 5.10.7 kernel. >> >> The diff is quite big, but this is a good start-point for cleanups. >> Follow-up works can drop diff lines unless we find a good reason for >> divergence. > > We use a custom kernel defconfig for this defconfig since it was added to > Buildroot [1]. ... And at that time I don't think we had infrastructure for fragments yet. > > I guess the aim of having a custom kernel defconfig is to reduce the build time. Even so, it's better to have the difference as a fragment rather than having a full config, so at least we can easily see the difference (as Masahiro mentions in the commit message). > This defconfig is used for boot testing on Qemu, I'm not sure if it really used > for other use case. > > Have you tested without any additional fragment? Masahiro mentions that it yields exactly the same full config, so this is perfect to keep the reduced build time. We can decide later whether or not we want to move closer to the upstream defconfig. So, applied both to master, thanks! Sorry it took so long. Regards, Arnout > > [1] > https://git.buildroot.net/buildroot/commit/?id=d3789ce3b70aaaa5e180d041b2ad282b36d929ed > > Best regards, > Romain > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Sat Jan 8 14:14:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 15:14:05 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: (Fabrice Fontaine's message of "Sun, 2 Jan 2022 21:36:34 +0100") References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> Message-ID: <874k6egvrm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: Hi, > Indeed, this is also an alternative, even if I think that adding > mbedtls3 would be a great addition. > For example, libcurl supports mbedts 3.0 since its version 7.79 and > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. > Otherwise, as requested by Thomas, I sent an email to mbedtls mailing > list: > https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ What is the plan from upstream regarding mbedtls 2.x? Will it be maintained in parallel with 3.x for some time (and for how long?) or is it effectively EOL already? If it is EOL then I guess we should just update the current mbedtls package to 3.x (and disable mbedtls support for packages not compatible with it yet), but if the plan is to support 2.x for quite some time then indeed a separate mbedtls3 package makes more sense. -- Bye, Peter Korsgaard From arnout at mind.be Sat Jan 8 14:23:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 15:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> References: <20201126152832.1115350-1-nolange79@gmail.com> <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> Message-ID: On 08/01/2022 12:04, Romain Naour wrote: > Hello Norbert, > > Le 26/11/2020 ? 16:28, Norbert Lange a ?crit?: >> Systemd has very many options, adding a way for the user >> to set custom options can help customizations >> without changing buildroot files. > > This is also true of any package in Buildroot. Users may want to provide a > custom option that is not handled yet by Buildroot. > > What if the option provided in BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG requires a build > dependency ? Also, I think it's possible to do this in a br2-external. Something like: systemd-overrides.mk: ifeq ($(BR2_PACKAGE_SYSTEMD_OVERRIDES),y) SYSTEMD_CONF_OPTS += -Dfoo -Dbar SYSTEMD_DEPENDENCIES = foobar endif Regards, Arnout From nolange79 at gmail.com Sat Jan 8 14:33:33 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 15:33:33 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: <06dd49b7-5abc-7a18-2d56-3f69e624e8b7@smile.fr> References: <20201126144745.502228-1-nolange79@gmail.com> <06dd49b7-5abc-7a18-2d56-3f69e624e8b7@smile.fr> Message-ID: Am Sa., 8. Jan. 2022 um 12:55 Uhr schrieb Romain Naour : > > Hello Norbert, > > Le 26/11/2020 ? 15:47, Norbert Lange a ?crit : > > journald supports catalog files, or rather a binary database of > > those. > > Functionality added includes: > > > > - A config option allows enabling the binary database. > > > > - if the option is enabled, the database is built and moved to > > /usr/share/factory. A symlink is created in /var pointing to > > that file. > > If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the > > language whitelist are deleted first. > > > > - the service normally used for creating the DB during boot, > > and the catalog source files used as input are deleted. > > > > The move to /usr/share/factory is helpful for having /usr as whole > > system distribution. > > > > Signed-off-by: Norbert Lange > > --- > > v1->v2: > > - Moved all logic into systemd.mk > > - solved the LOCALE_PURGE order that way > > - use the factory to store the file > > - option to enable the DB (similar to udev HWDB) > > - cant be anabled with !ROOTFS_RW, tons of > > issues with that one > > v2->v3: > > - use backticks instead of $$() > > - be more explicit about what happens in > > SYSTEMD_LOCALE_PURGE_CATALOGS > > > > Signed-off-by: Norbert Lange > > --- > > package/systemd/Config.in | 14 +++++++++++++ > > package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 55 insertions(+) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index ec34478e3d..d576e6035b 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD > > > > http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands > > > > +config BR2_PACKAGE_SYSTEMD_CATALOGDB > > + bool "enable journal catalog database installation" > > + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic > > + help > > + Build and install the journal catalog database. > > + > > + catalog files are used to provide extended and potentially localized > > + messages for the journal. > > + > > + The original catalog files will be built into a DB at > > + /usr/share/factory/var/lib/systemd/catalog/database. > > + > > + https://www.freedesktop.org/wiki/Software/systemd/catalog/ > > + > > config BR2_PACKAGE_SYSTEMD_LOCALED > > bool "enable locale daemon" > > help > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index cb12f667d6..ae99c02abf 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD > > $(SYSTEMD_INSTALL_NETWORK_CONFS) > > endef > > > > +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) > > +define SYSTEMD_LOCALE_PURGE_CATALOGS > > + # go through all files with scheme ..catalog > > + # and remove those where is not in LOCALE_NOPURGE > > + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ > > Why not "systemd.*.catalog" ? > > On my system, all catalog files with are nammed starting with "systemd." Cause the idea is that other packages could extend log messages by dropping catalogs there, there might be a dbus-broker.catalog for example, see [1]. > > > + do \ > > + basename=$${cfile##*/}; \ > > + basename=$${basename%.catalog}; \ > > + langext=$${basename#*.}; \ > > + [ "$$langext" = "$${basename}" ] && continue; \ > > + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ > > + rm -f "$$cfile"; \ > > + done > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS > > +endif > > + > > +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) > > +define SYSTEMD_UPDATE_CATALOGS > > + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog > > + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ > > + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database > > + rm $(TARGET_DIR)/var/lib/systemd/catalog/database > > + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ > > + $(TARGET_DIR)/var/lib/systemd/catalog/database > > + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ > > + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS > > +endif > > + > > +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ > > So we remove this directory. > > Why adding SYSTEMD_LOCALE_PURGE_CATALOGS then ? The order is relevant, assuming LOCALE_NOPURGE = de, then - first remove the source-files for other languages (SYSTEMD_LOCALE_PURGE_CATALOGS) - then build and install the database from the source-files with the chosen languages - then remove all language source-files > > Best regards, > Romain > > > > + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ > > + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > + > > define SYSTEMD_PRESET_ALL > > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > > endef > > > Norbert [1] - https://github.com/bus1/dbus-broker/tree/main/src/catalog From nolange79 at gmail.com Sat Jan 8 14:36:29 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 15:36:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> References: <20201126152832.1115350-1-nolange79@gmail.com> <49065289-1e01-f807-3e4f-d5e6303de5b5@smile.fr> Message-ID: Am Sa., 8. Jan. 2022 um 12:04 Uhr schrieb Romain Naour : > > Hello Norbert, > > Le 26/11/2020 ? 16:28, Norbert Lange a ?crit : > > Systemd has very many options, adding a way for the user > > to set custom options can help customizations > > without changing buildroot files. > > This is also true of any package in Buildroot. Users may want to provide a > custom option that is not handled yet by Buildroot. > > What if the option provided in BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG requires a build > dependency ? Responsibility for the guy using those extra options. You have those extra options for a few packages like QT5. systemd has a remarkable bunch of options, and upstreaming changes takes years (I dont have any blackmail on the maintainers, your experience may differ ;) ) > > Best regards, > Romain Norbert From nolange79 at gmail.com Sat Jan 8 14:44:40 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 15:44:40 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: <195311e2-38dc-53ee-80b8-09dca52320a0@smile.fr> References: <20201126144722.502163-1-nolange79@gmail.com> <195311e2-38dc-53ee-80b8-09dca52320a0@smile.fr> Message-ID: Am Sa., 8. Jan. 2022 um 14:42 Uhr schrieb Romain Naour : > > Hello Norbert, > > >> +# > >> +# [1] - https://github.com/systemd/systemd/issues/16183 > > > > It seems that systemd now include what you need since version 249 containing the > > commit [1]. > > > > The fakeroot_tmpfiles.sh script seems not neceesary anymore. It is, this particular change did *not* get upstreamed, see [1]. Runtime specifiers might leak to places they should not, the script is necessary to filter out those dangerous specs. Some discussion was at [2]. > > > > [1] > > https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 > > I have marked this patch as "Changes Requested". > > Best regards, > Romain > > > > > Best regards, > > Romain > > > > Norbert [1] - https://github.com/systemd/systemd/pull/16187 [2] - https://lists.buildroot.org/pipermail/buildroot/2020-June/587414.html From fontaine.fabrice at gmail.com Sat Jan 8 15:03:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 16:03:49 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: <874k6egvrm.fsf@dell.be.48ers.dk> References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> Message-ID: Hi, Le sam. 8 janv. 2022 ? 15:14, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > Hi, > > > Indeed, this is also an alternative, even if I think that adding > > mbedtls3 would be a great addition. > > For example, libcurl supports mbedts 3.0 since its version 7.79 and > > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. > > Otherwise, as requested by Thomas, I sent an email to mbedtls mailing > > list: > > https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ > > What is the plan from upstream regarding mbedtls 2.x? Will it be > maintained in parallel with 3.x for some time (and for how long?) or is > it effectively EOL already? 2.16.x is EOL since December 2021: https://tls.mbed.org/tech-updates/blog/announcing-lts-branch-mbedtls-2.16 The next LTS branch is 2.28 which will be maintained until end of 2024: https://github.com/ARMmbed/mbedtls/blob/development/BRANCHES.md > > If it is EOL then I guess we should just update the current mbedtls > package to 3.x (and disable mbedtls support for packages not compatible > with it yet), but if the plan is to support 2.x for quite some time then > indeed a separate mbedtls3 package makes more sense. > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From romain.naour at smile.fr Sat Jan 8 15:05:33 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 16:05:33 +0100 Subject: [Buildroot] [PATCH] support/testing: add a runtime test for the systemd unit tests In-Reply-To: References: <20200420085156.2930014-1-romain.naour@gmail.com> <20200423202028.GQ5035@scaer> Message-ID: Hello, J?r?my, All, Le 24/04/2020 ? 14:52, J?r?my ROSEN a ?crit?: > Well... > > I see your point, but as you said, buildroot is a bit of a special case and > systemd is a bit of a special case > > I have used systemd's test suite as non-regression testing when I bumped > systemd previously and it > did catch quite a few regression/improper integration on the BR side > (mainly incompatibilites between > util-linux and busybox) so I think it is important to check that when > bumping systemd I updated this test for systemd 250.1 and the main issue with the testsuite is releated to busybox. Some test scripts are using command not supported by busybox: rev (util-linux) mktemp --tmpdir touch --version Busybox 1.35.0 add the mktemp --tmpdir option [1] This patch allowed to detect two build issue with old toolchain [2] Anyway this patch needs a respin if we want to merge it to Buildroot. [1] https://git.busybox.net/busybox/commit/?id=ecac9853f29dcb2e5e0d70c0effaae2cabeefabf [2] https://git.buildroot.net/buildroot/commit/?id=315ba5c26dd6bb0c01067e8346b4a7eceb7d0ee1 Best regards, Romain > > Making the testsuite run in buildroot is a bit tricky (as this patchset > proves) and having it upstreamed is not > just about reg-testing but also about making it easy for devs that would > bump systemd to check that everything > is fine. > > If we go with your argument that running package non-reg is useless because > upstream is supposed to run it > itself, then we won't run any gcc non-reg (since gcc is supposed to run it) > nor any boot-testing (the kernel is > supposed to test that) so basically we do no testing except some very > buildroot-specific test. > > And we know from experience that upstream is not as reliable as it should > be, especially on exotic setups/arch > and buildroot need to test that if it wants to improve quality, because > nobody else will do it... > > Regards > Jeremy > > Le jeu. 23 avr. 2020 ? 22:20, Yann E. MORIN a > ?crit : > >> Romain, J?r?my, All, >> >> On 2020-04-20 10:51 +0200, Romain Naour spake thusly: >>> Initial work by Jeremy Rosen [1]. >>> >>> In order to allow building the testsuite, add an BR2_external >>> to add new flags in SYSTEMD_CONF_OPTS: >> >> Thanks for the effort. But I am not very much enthusiastic about it. >> >> What good does it do to us, Buildroot, that we are able to run systemd's >> test suite? >> >> Sure, we have runtime tests inBuildroot. But IMHO those runtime tests >> are for validating that the packaging and integration in Buildroot is >> correct. For example, it allows us to test that python pakcages have all >> their dependencies, or that a systemd-based system dos indeed boots >> correctly to bring up network, spawn a login, etc... >> >> Test- suites on the other hand are for upstream to valisdate they have >> no regression, and that the code they write behaves as they expect it >> to. Test suites are usually not meant for downstream consumptions. >> >> Yes, Buildroot is in a special spot as a downstream, in that it targets >> so many different targets that upstream may nt have, or may not be even >> aware of. Still, it is of my opinion that we should not be responsible >> for being able to run that test suite. >> >> So I am not very in favour of carrying such a thing in Buildroot, >> unfortunately... >> >> I'm leaving the patch as "new" in patchwork, though, in case another >> maintainer as a stronger opinion in favour of it, or in case you can >> make a very strgin argument explaining why we need it. >> >> Regards, >> Yann E. MORIN. >> >>> "SYSTEMD_CONF_OPTS += -Dslow-tests=true -Dinstall-tests=true >> -Dtests=true" >>> >>> This allow to install run-unit-tests.py on the target to execute >>> all tests installed to /lib/systemd/tests. While at it, enable usafe >> tests >>> since we are using a rootfs image built only to run these tests. >>> >>> The run-integration-tests.sh script is not executed since it's intended >>> to run from the systemd build directory on the host machine. >>> >>> The rootfsoverlay from [1] is removed since it contains some >>> customization not needed for the tests. >>> >>> Some tests needs a high entropy level, otherwise they are stuck. >>> Install rng-tools and add -device virtio-rng-pci in qemu command line. >>> >>> In order to run as many tests as possible, activate as many systemd >>> options as possible. cgroupv2 is enabled from the kernel command >>> line to pass test-bfp-device test. >>> >>> Use the latest LTS kernel 5.4. >>> >>> Some unit files used by the systemd testsuite are using some program >>> functionnality not implemented by the busybox variant (grep, find). >>> >>> The stat command with custom format (-c) and display of filesystem >> status (-f) >>> used by exec-protecthome-tmpfs-vs-protectsystem-strict.service can be >> provided >>> by busybox or coreutils. Add a busybox config fragment to add "stat -fc" >> since >>> it's not enabled by the busybox defconfig used by Buildroot. >>> >>> The ionice command used by exec-ioschedulingclass-none.service is >> provided by >>> util-linux schedutils. >>> >>> libcap tools needed to provide capsh binary for test-execute. >>> >>> Skipped tests: >>> test-barrier: This test requires a baremetal machine. >>> test-bus-chat: This test requires an user account. >>> >>> Tested on gitlab: >>> https://gitlab.com/kubu93/buildroot/pipelines/137689982 >>> >>> [1] https://github.com/boucman/buildroot-systemd >>> >>> Signed-off-by: Romain Naour >>> Cc: J?r?my Rosen >>> Cc: Adam Duskett >>> Cc: Maxime Hadjinlian >>> Cc: Yann E. MORIN >>> --- >>> On my machine, the runtime test is completed in 287.761s. >>> >>> OK: 203 SKIP: 2 FAIL: 0 >>> --- >>> .../testing/conf/busybox-stat-fragment.config | 3 + >>> .../package/br2-external/systemd/Config.in | 0 >>> .../br2-external/systemd/external.desc | 2 + >>> .../package/br2-external/systemd/external.mk | 5 + >>> support/testing/tests/package/test_systemd.py | 123 ++++++++++++++++++ >>> .../test_systemd/systemd-kernel.config | 111 ++++++++++++++++ >>> 6 files changed, 244 insertions(+) >>> create mode 100644 support/testing/conf/busybox-stat-fragment.config >>> create mode 100644 >> support/testing/tests/package/br2-external/systemd/Config.in >>> create mode 100644 >> support/testing/tests/package/br2-external/systemd/external.desc >>> create mode 100644 support/testing/tests/package/br2-external/systemd/ >> external.mk >>> create mode 100644 support/testing/tests/package/test_systemd.py >>> create mode 100644 >> support/testing/tests/package/test_systemd/systemd-kernel.config >>> >>> diff --git a/support/testing/conf/busybox-stat-fragment.config >> b/support/testing/conf/busybox-stat-fragment.config >>> new file mode 100644 >>> index 0000000000..55f64c761f >>> --- /dev/null >>> +++ b/support/testing/conf/busybox-stat-fragment.config >>> @@ -0,0 +1,3 @@ >>> +CONFIG_STAT=y >>> +CONFIG_FEATURE_STAT_FORMAT=y >>> +CONFIG_FEATURE_STAT_FILESYSTEM=y >>> diff --git >> a/support/testing/tests/package/br2-external/systemd/Config.in >> b/support/testing/tests/package/br2-external/systemd/Config.in >>> new file mode 100644 >>> index 0000000000..e69de29bb2 >>> diff --git >> a/support/testing/tests/package/br2-external/systemd/external.desc >> b/support/testing/tests/package/br2-external/systemd/external.desc >>> new file mode 100644 >>> index 0000000000..2c7317f301 >>> --- /dev/null >>> +++ b/support/testing/tests/package/br2-external/systemd/external.desc >>> @@ -0,0 +1,2 @@ >>> +name: BUILDROOT_SYSTEMD_TESTSUITE >>> +desc: Buildroot to easily test systemd changes or changes to the >> systemd recipe in buildroot >>> diff --git a/support/testing/tests/package/br2-external/systemd/ >> external.mk b/support/testing/tests/package/br2-external/systemd/ >> external.mk >>> new file mode 100644 >>> index 0000000000..780d79153b >>> --- /dev/null >>> +++ b/support/testing/tests/package/br2-external/systemd/external.mk >>> @@ -0,0 +1,5 @@ >>> +# Append SYSTEMD_CONF_OPTS from this BR2_EXTERNAL due to include order >> in the Buildroot main Makefile: >>> +# -include $(PACKAGE_OVERRIDE_FILE) >>> +# -include $(sort $(wildcard package/*/*.mk)) >>> +# include $(BR2_EXTERNAL_FILE) >>> +SYSTEMD_CONF_OPTS += -Dslow-tests=true -Dinstall-tests=true -Dtests=true >>> diff --git a/support/testing/tests/package/test_systemd.py >> b/support/testing/tests/package/test_systemd.py >>> new file mode 100644 >>> index 0000000000..891c464652 >>> --- /dev/null >>> +++ b/support/testing/tests/package/test_systemd.py >>> @@ -0,0 +1,123 @@ >>> +import os >>> + >>> +import infra.basetest >>> + >>> +SYSTEMD_TIMEOUT = 400 >>> + >>> +# https://www.freedesktop.org/wiki/Software/systemd/VirtualizedTesting/ >>> +# Some unit files used by the systemd testsuite are using some program >> functionnality >>> +# not implemented by the busybox variant (grep, find). >>> +# The stat command with custom format (-c) and display of filesystem >> status (-f) used by >>> +# exec-protecthome-tmpfs-vs-protectsystem-strict.service can be >> provided by busybox or coreutils. >>> +# The ionice command used by exec-ioschedulingclass-none.service is >> provided by util-linux schedutils. >>> +# libcap tools needed to provide capsh binary for test-execute. >>> + >>> +# Skipped tests: >>> +# test-barrier: This test requires a baremetal machine. >>> +# test-bus-chat: This test requires an user account. >>> + >>> + >>> +class TestSystemd(infra.basetest.BRTest): >>> + br2_external = >> [infra.filepath("tests/package/br2-external/systemd")] >>> + config = \ >>> + """ >>> + BR2_x86_core2=y >>> + BR2_TOOLCHAIN_EXTERNAL=y >>> + BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y >>> + BR2_TOOLCHAIN_EXTERNAL_URL=" >> http://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2020.02-2.tar.bz2 >> " >>> + BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y >>> + BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y >>> + BR2_TOOLCHAIN_EXTERNAL_CXX=y >>> + BR2_INIT_SYSTEMD=y >>> + BR2_SYSTEM_BIN_SH_BASH=y >>> + BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" >>> + BR2_SYSTEM_DHCP="eth0" >>> + BR2_ENABLE_LOCALE_WHITELIST="C en_US C_UTF8 fr_FR" >>> + BR2_SYSTEM_ENABLE_NLS=y >>> + BR2_LINUX_KERNEL=y >>> + BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.32" >>> + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y >>> + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" >>> + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{}" >>> + BR2_PACKAGE_FINDUTILS=y >>> + BR2_PACKAGE_GREP=y >>> + BR2_PACKAGE_RNG_TOOLS=y >>> + BR2_PACKAGE_PYTHON3=y >>> + BR2_PACKAGE_GNUTLS=y >>> + BR2_PACKAGE_LIBQRENCODE=y >>> + BR2_PACKAGE_LIBXKBCOMMON=y >>> + BR2_PACKAGE_LIBIDN2=y >>> + BR2_PACKAGE_ELFUTILS=y >>> + BR2_PACKAGE_ELFUTILS_PROGS=y >>> + BR2_PACKAGE_LIBCAP_TOOLS=y >>> + BR2_PACKAGE_LIBCGROUP=y >>> + BR2_PACKAGE_LIBCGROUP_TOOLS=y >>> + BR2_PACKAGE_LIBSECCOMP=y >>> + BR2_PACKAGE_LINUX_PAM=y >>> + BR2_PACKAGE_P11_KIT=y >>> + BR2_PACKAGE_LIBSELINUX=y >>> + BR2_PACKAGE_PCRE2=y >>> + BR2_PACKAGE_IPTABLES=y >>> + BR2_PACKAGE_BASH_COMPLETION=y >>> + BR2_PACKAGE_ACL=y >>> + BR2_PACKAGE_AUDIT=y >>> + BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y >>> + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y >>> + BR2_PACKAGE_SYSTEMD_BACKLIGHT=y >>> + BR2_PACKAGE_SYSTEMD_BINFMT=y >>> + BR2_PACKAGE_SYSTEMD_COREDUMP=y >>> + BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y >>> + BR2_PACKAGE_SYSTEMD_HIBERNATE=y >>> + BR2_PACKAGE_SYSTEMD_HOMED=y >>> + BR2_PACKAGE_SYSTEMD_IMPORTD=y >>> + BR2_PACKAGE_SYSTEMD_LOCALED=y >>> + BR2_PACKAGE_SYSTEMD_LOGIND=y >>> + BR2_PACKAGE_SYSTEMD_MACHINED=y >>> + BR2_PACKAGE_SYSTEMD_POLKIT=y >>> + BR2_PACKAGE_SYSTEMD_QUOTACHECK=y >>> + BR2_PACKAGE_SYSTEMD_RANDOMSEED=y >>> + BR2_PACKAGE_SYSTEMD_REPART=y >>> + BR2_PACKAGE_SYSTEMD_RFKILL=y >>> + BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT=y >>> + BR2_PACKAGE_SYSTEMD_SYSUSERS=y >>> + BR2_PACKAGE_SYSTEMD_USERDB=y >>> + BR2_PACKAGE_UTIL_LINUX_MINIX=y >>> + BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y >>> + BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y >>> + BR2_PACKAGE_UTIL_LINUX_UNSHARE=y >>> + BR2_TARGET_ROOTFS_EXT2=y >>> + BR2_TARGET_ROOTFS_EXT2_4=y >>> + BR2_TARGET_ROOTFS_EXT2_SIZE="1G" >>> + # BR2_TARGET_ROOTFS_TAR is not set >>> + """.format( >>> + >> infra.filepath("tests/package/test_systemd/systemd-kernel.config"), >>> + infra.filepath("conf/busybox-stat-fragment.config")) >>> + >>> + def login(self): >>> + img = os.path.join(self.builddir, "images", "rootfs.ext2") >>> + kern = os.path.join(self.builddir, "images", "bzImage") >>> + >>> + # the complete boot with systemd takes more time than what the >> default multipler permits >>> + self.emulator.timeout_multiplier *= 10 >>> + >>> + # systemd testsuite overallocate memory and the minimum that >> seemed to work was 1G >>> + # systemd.unified_cgroup_hierarchy=1 for cgroup v2 and >> test-execute >>> + self.emulator.boot(arch="i386", >>> + kernel=kern, >>> + kernel_cmdline=["root=/dev/vda", "ro", >> "console=ttyS0", >>> + >> "systemd.unified_cgroup_hierarchy=1", >>> + "audit=0 >> cgroup_no_v1=\"all\""], >>> + options=["-M", "pc", "-m", "1G", "-device", >>> + "virtio-rng-pci", "-drive", >>> + >> "file={},if=virtio,format=raw".format(img)]) >>> + self.emulator.login() >>> + >>> + def test_run(self): >>> + timeout = SYSTEMD_TIMEOUT * self.emulator.timeout_multiplier >>> + >>> + self.login() >>> + >>> + cmd = "/usr/lib/systemd/tests/run-unit-tests.py --unsafe" >>> + _, exit_code = self.emulator.run(cmd, timeout) >>> + self.assertEqual(exit_code, 0) >>> diff --git >> a/support/testing/tests/package/test_systemd/systemd-kernel.config >> b/support/testing/tests/package/test_systemd/systemd-kernel.config >>> new file mode 100644 >>> index 0000000000..0c4efed77f >>> --- /dev/null >>> +++ b/support/testing/tests/package/test_systemd/systemd-kernel.config >>> @@ -0,0 +1,111 @@ >>> +CONFIG_SYSVIPC=y >>> +CONFIG_POSIX_MQUEUE=y >>> +CONFIG_PSI=y >>> +CONFIG_CGROUPS=y >>> +CONFIG_MEMCG=y >>> +CONFIG_MEMCG_SWAP=y >>> +# CONFIG_MEMCG_SWAP_ENABLED is not set >>> +CONFIG_BLK_CGROUP=y >>> +CONFIG_CGROUP_SCHED=y >>> +CONFIG_CFS_BANDWIDTH=y >>> +CONFIG_RT_GROUP_SCHED=y >>> +CONFIG_CGROUP_PIDS=y >>> +CONFIG_CGROUP_RDMA=y >>> +CONFIG_CGROUP_FREEZER=y >>> +CONFIG_CGROUP_HUGETLB=y >>> +CONFIG_CPUSETS=y >>> +CONFIG_CGROUP_DEVICE=y >>> +CONFIG_CGROUP_CPUACCT=y >>> +CONFIG_CGROUP_PERF=y >>> +CONFIG_CGROUP_BPF=y >>> +CONFIG_NAMESPACES=y >>> +CONFIG_USER_NS=y >>> +CONFIG_CHECKPOINT_RESTORE=y >>> +CONFIG_EXPERT=y >>> +CONFIG_BPF_SYSCALL=y >>> +CONFIG_USERFAULTFD=y >>> +CONFIG_SMP=y >>> +CONFIG_HYPERVISOR_GUEST=y >>> +CONFIG_PARAVIRT=y >>> +CONFIG_DMI_SYSFS=y >>> +CONFIG_MODULES=y >>> +CONFIG_MODULE_UNLOAD=y >>> +CONFIG_BLK_CGROUP_IOLATENCY=y >>> +CONFIG_BINFMT_MISC=y >>> +CONFIG_NET=y >>> +CONFIG_PACKET=y >>> +CONFIG_UNIX=y >>> +CONFIG_INET=y >>> +CONFIG_NET_SCHED=y >>> +CONFIG_NET_CLS_CGROUP=y >>> +CONFIG_CGROUP_NET_PRIO=y >>> +# CONFIG_WIRELESS is not set >>> +CONFIG_PCI=y >>> +CONFIG_DEVTMPFS=y >>> +CONFIG_DEVTMPFS_MOUNT=y >>> +CONFIG_VIRTIO_BLK=y >>> +CONFIG_BLK_DEV_SD=y >>> +CONFIG_SCSI_VIRTIO=y >>> +CONFIG_ATA=y >>> +CONFIG_ATA_PIIX=y >>> +CONFIG_NETDEVICES=y >>> +CONFIG_VIRTIO_NET=y >>> +CONFIG_NE2K_PCI=y >>> +CONFIG_8139CP=y >>> +# CONFIG_WLAN is not set >>> +CONFIG_INPUT_EVDEV=y >>> +CONFIG_INPUT_MISC=y >>> +CONFIG_INPUT_UINPUT=m >>> +CONFIG_SERIAL_8250=y >>> +CONFIG_SERIAL_8250_CONSOLE=y >>> +CONFIG_VIRTIO_CONSOLE=y >>> +CONFIG_HW_RANDOM=y >>> +CONFIG_HW_RANDOM_VIRTIO=y >>> +CONFIG_DRM=y >>> +CONFIG_DRM_QXL=y >>> +CONFIG_DRM_BOCHS=y >>> +CONFIG_DRM_VIRTIO_GPU=y >>> +CONFIG_FRAMEBUFFER_CONSOLE=y >>> +CONFIG_SOUND=y >>> +CONFIG_SND=y >>> +CONFIG_SND_HDA_INTEL=y >>> +CONFIG_SND_HDA_GENERIC=y >>> +CONFIG_HID_A4TECH=y >>> +CONFIG_HID_APPLE=y >>> +CONFIG_HID_BELKIN=y >>> +CONFIG_HID_CHERRY=y >>> +CONFIG_HID_CHICONY=y >>> +CONFIG_HID_CYPRESS=y >>> +CONFIG_HID_EZKEY=y >>> +CONFIG_HID_ITE=y >>> +CONFIG_HID_KENSINGTON=y >>> +CONFIG_HID_LOGITECH=y >>> +CONFIG_HID_REDRAGON=y >>> +CONFIG_HID_MICROSOFT=y >>> +CONFIG_HID_MONTEREY=y >>> +CONFIG_USB=y >>> +CONFIG_USB_XHCI_HCD=y >>> +CONFIG_USB_EHCI_HCD=y >>> +CONFIG_USB_UHCI_HCD=y >>> +CONFIG_USB_STORAGE=y >>> +CONFIG_VIRTIO_PCI=y >>> +CONFIG_VIRTIO_BALLOON=y >>> +CONFIG_VIRTIO_INPUT=y >>> +CONFIG_VIRTIO_MMIO=y >>> +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y >>> +CONFIG_EXT4_FS=y >>> +CONFIG_EXT4_FS_POSIX_ACL=y >>> +CONFIG_EXT4_FS_SECURITY=y >>> +CONFIG_FANOTIFY=y >>> +CONFIG_AUTOFS4_FS=y >>> +CONFIG_TMPFS=y >>> +CONFIG_TMPFS_POSIX_ACL=y >>> +CONFIG_HUGETLBFS=y >>> +CONFIG_SECURITY=y >>> +CONFIG_SECURITY_SMACK=y >>> +CONFIG_DEFAULT_SECURITY_DAC=y >>> +CONFIG_CRYPTO_HMAC=y >>> +CONFIG_CRYPTO_SHA256=y >>> +CONFIG_CRYPTO_USER_API_HASH=y >>> +CONFIG_DEBUG_FS=y >>> +# CONFIG_FTRACE is not set >>> -- >>> 2.25.3 >>> >> >> -- >> >> .-----------------.--------------------.------------------.--------------------. >> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' >> conspiracy: | >> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ >> | >> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is >> no | >> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v >> conspiracy. | >> >> '------------------------------^-------^------------------^--------------------' >> > > > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > From romain.naour at smile.fr Sat Jan 8 15:10:06 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 16:10:06 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: References: <20201126144745.502228-1-nolange79@gmail.com> <06dd49b7-5abc-7a18-2d56-3f69e624e8b7@smile.fr> Message-ID: Le 08/01/2022 ? 15:33, Norbert Lange a ?crit?: > Am Sa., 8. Jan. 2022 um 12:55 Uhr schrieb Romain Naour : >> [...] >>> >>> +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) >>> +define SYSTEMD_LOCALE_PURGE_CATALOGS >>> + # go through all files with scheme ..catalog >>> + # and remove those where is not in LOCALE_NOPURGE >>> + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ >> >> Why not "systemd.*.catalog" ? >> >> On my system, all catalog files with are nammed starting with "systemd." > > Cause the idea is that other packages could extend log messages by > dropping catalogs there, > there might be a dbus-broker.catalog for example, see [1]. dbus-broker.catalog doesn't match the find regex '*.*.catalog', this file is not removed. > >> >>> + do \ >>> + basename=$${cfile##*/}; \ >>> + basename=$${basename%.catalog}; \ >>> + langext=$${basename#*.}; \ >>> + [ "$$langext" = "$${basename}" ] && continue; \ >>> + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ >>> + rm -f "$$cfile"; \ >>> + done >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS >>> +endif >>> + >>> +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) >>> +define SYSTEMD_UPDATE_CATALOGS >>> + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog >>> + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ >>> + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database >>> + rm $(TARGET_DIR)/var/lib/systemd/catalog/database >>> + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ >>> + $(TARGET_DIR)/var/lib/systemd/catalog/database >>> + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ >>> + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS >>> +endif >>> + >>> +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>> + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ >> >> So we remove this directory. >> >> Why adding SYSTEMD_LOCALE_PURGE_CATALOGS then ? > > The order is relevant, assuming LOCALE_NOPURGE = de, then > > - first remove the source-files for other languages > (SYSTEMD_LOCALE_PURGE_CATALOGS) > - then build and install the database from the source-files with the > chosen languages > - then remove all language source-files Ok, maybe a comment would be necessary here. Best regards, Romain > >> >> Best regards, >> Romain >> >> >>> + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ >>> + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>> + >>> define SYSTEMD_PRESET_ALL >>> $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all >>> endef >>> >> > > Norbert > > [1] - https://github.com/bus1/dbus-broker/tree/main/src/catalog > From arnout at mind.be Sat Jan 8 15:11:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:11:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: fix build with libexecinfo In-Reply-To: <20220107204754.1462472-1-fontaine.fabrice@gmail.com> References: <20220107204754.1462472-1-fontaine.fabrice@gmail.com> Message-ID: On 07/01/2022 21:47, Fabrice Fontaine wrote: > Fix build failure raised since the addition of the libexecinfo package > in commit eea8ba446c10701a273432552108d80fb2224ef4 > > Fixes: > - Not autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/domoticz/domoticz.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk > index 826e6f5e58..0d1088d395 100644 > --- a/package/domoticz/domoticz.mk > +++ b/package/domoticz/domoticz.mk > @@ -41,6 +41,11 @@ DOMOTICZ_CONF_OPTS += \ > -DUSE_BUILTIN_SQLITE=OFF \ > -DUSE_BUILTIN_MQTT=OFF > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +DOMOTICZ_DEPENDENCIES += libexecinfo > +DOMOTICZ_CONF_OPTS += -DEXECINFO_LIBRARIES=-lexecinfo > +endif > + > ifeq ($(BR2_PACKAGE_LIBUSB),y) > DOMOTICZ_DEPENDENCIES += libusb > DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON > From arnout at mind.be Sat Jan 8 15:11:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:11:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-vdr-vnsi: bump version to 19.0.2-Matrix In-Reply-To: <20220107213253.75709-1-bernd.kuhls@t-online.de> References: <20220107213253.75709-1-bernd.kuhls@t-online.de> Message-ID: On 07/01/2022 22:32, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- > package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > index c6223fc8e4..4cd1f7ad6b 100644 > --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz > +sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > index b281f00f19..65e69d2b23 100644 > --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix > +KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix > KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) > KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ > KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md > From arnout at mind.be Sat Jan 8 15:11:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:11:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: bump to version 5.0.1 In-Reply-To: <20220107220707.1679540-1-fontaine.fabrice@gmail.com> References: <20220107220707.1679540-1-fontaine.fabrice@gmail.com> Message-ID: <2cd945fe-b535-fd6c-3439-c65c7c9a5c44@mind.be> On 07/01/2022 23:07, Fabrice Fontaine wrote: > Drop first patch (already in version) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/mp4v2/0001-Fix-GCC7-build.patch | 33 ------------------- > ...p4track.cpp-replace-nullptr-by-NULL.patch} | 2 +- > ...atic-cast-to-unsigned-int-for-cases.patch} | 0 > package/mp4v2/mp4v2.hash | 2 +- > package/mp4v2/mp4v2.mk | 2 +- > 5 files changed, 3 insertions(+), 36 deletions(-) > delete mode 100644 package/mp4v2/0001-Fix-GCC7-build.patch > rename package/mp4v2/{0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch => 0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch} (96%) > rename package/mp4v2/{0003-Static-cast-to-unsigned-int-for-cases.patch => 0002-Static-cast-to-unsigned-int-for-cases.patch} (100%) > > diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch > deleted file mode 100644 > index 4e39be4a79..0000000000 > --- a/package/mp4v2/0001-Fix-GCC7-build.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= > -Date: Wed, 8 Feb 2017 00:56:32 +0000 > -Subject: [PATCH] Fix GCC7 build > - > -if (*pSlash != '\0') { > - > -As it stands the body of that if will always execute and when there are > -no encoding parameters ppEncodingParams will be returned as a pointer to > -an empty string rather than as a null pointer > - > -Signed-off-by: Peter Korsgaard > -[Upstream status: https://github.com/TechSmith/mp4v2/pull/36] > ---- > - src/rtphint.cpp | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/rtphint.cpp b/src/rtphint.cpp > -index e07309d..1eb01f5 100644 > ---- a/src/rtphint.cpp > -+++ b/src/rtphint.cpp > -@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( > - pSlash = strchr(pSlash, '/'); > - if (pSlash != NULL) { > - pSlash++; > -- if (pSlash != '\0') { > -+ if (*pSlash != '\0') { > - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); > - *ppEncodingParams = (char *)MP4Calloc(length + 1); > - strncpy(*ppEncodingParams, pSlash, length); > --- > -2.11.0 > - > diff --git a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > similarity index 96% > rename from package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch > rename to package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > index 72bae463c9..c279b9c56a 100644 > --- a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch > +++ b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch > @@ -16,7 +16,7 @@ Fixes: > - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 > > Signed-off-by: Fabrice Fontaine > -[Upstream status: not sent yet] > +[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] > --- > src/mp4track.cpp | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > diff --git a/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch > similarity index 100% > rename from package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch > rename to package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch > diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash > index 85fce49384..7aa5402c8f 100644 > --- a/package/mp4v2/mp4v2.hash > +++ b/package/mp4v2/mp4v2.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz > +sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz > sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING > diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk > index 478d10d472..6d29228a13 100644 > --- a/package/mp4v2/mp4v2.mk > +++ b/package/mp4v2/mp4v2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MP4V2_VERSION = 4.1.3 > +MP4V2_VERSION = 5.0.1 > MP4V2_SITE = \ > $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) > MP4V2_INSTALL_STAGING = YES > From arnout at mind.be Sat Jan 8 15:12:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:12:13 +0100 Subject: [Buildroot] [PATCH v1 next] package/mstpd: bump version to 0.1.0 In-Reply-To: <20220107222644.1612206-1-colin.foster@in-advantage.com> References: <20220107222644.1612206-1-colin.foster@in-advantage.com> Message-ID: <89aa2f7a-5293-89ec-cdeb-89039cb1992c@mind.be> On 07/01/2022 23:26, Colin Foster wrote: > Shortly after MSTPd was added, version 0.1.0 was released. Update to the > latest version. > > Signed-off-by: Colin Foster Applied to master, thanks. Regards, Arnout > --- > package/mstpd/mstpd.hash | 1 + > package/mstpd/mstpd.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/mstpd/mstpd.hash b/package/mstpd/mstpd.hash > index fd76b959db..64e946d6d1 100644 > --- a/package/mstpd/mstpd.hash > +++ b/package/mstpd/mstpd.hash > @@ -1,4 +1,5 @@ > # locally computed > sha256 91a1862548b5b509caa2e96e5fb9912bc98d4d58cc98e99a577824735756c14d mstpd-0.0.9.tar.gz > +sha256 03d1ff4ca189d54322562cb2891888768af719d2c73ceafa5f1ca96133dffeb2 mstpd-0.1.0.tar.gz > sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 LICENSE > sha256 c5cfd44652276184374adf454150d436ce958ce50acc4ef9ccb3605a5ca7a9d3 hmac_md5.c > diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk > index a870352869..907d094242 100644 > --- a/package/mstpd/mstpd.mk > +++ b/package/mstpd/mstpd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MSTPD_VERSION = 0.0.9 > +MSTPD_VERSION = 0.1.0 > MSTPD_SITE = $(call github,mstpd,mstpd,$(MSTPD_VERSION)) > MSTPD_AUTORECONF = YES > MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5) > From arnout at mind.be Sat Jan 8 15:12:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:12:31 +0100 Subject: [Buildroot] [PATCH] support/scripts/generate-gitlab-ci-yml: ignore branch name prefix containing a single hyphen In-Reply-To: <20220107223955.148266-1-romain.naour@smile.fr> References: <20220107223955.148266-1-romain.naour@smile.fr> Message-ID: On 07/01/2022 23:39, Romain Naour wrote: > The commit [1] added a sed command used to retreive a pattern > to keep only defconfigs whose name start with the pattern. > > "-defconfigs-" > > The sed command doesn't work as expected if contains a > single hyphen [2]: > > "qemu-6.2.0-defconfigs-qemu" > > Update the sed command to ignore completely the part before > "-defconfigs-". > > [1] 65d2f04c012af492a9b9da04dfa3b3cbd20347f1 > [2] http://lists.busybox.net/pipermail/buildroot/2022-January/632507.html > > Signed-off-by: Romain Naour > Cc: Thomas Petazzoni Applied to master, thanks. Regards, Arnout > --- > support/scripts/generate-gitlab-ci-yml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml > index 3e0c68091b..bd79807914 100755 > --- a/support/scripts/generate-gitlab-ci-yml > +++ b/support/scripts/generate-gitlab-ci-yml > @@ -66,8 +66,8 @@ gen_tests() { > (*-defconfigs) > do_defconfigs=base > ;; > - (*-defconfigs-*) > - pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%[^\-]*-defconfigs-\(.*\)%\1%') > + (*-defconfigs-*) > + pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%^.*-defconfigs-\(.*\)%\1%') > defconfigs=( $(cd configs; LC_ALL=C ls -1 | grep ^${pattern}) ) > do_defconfigs=base > ;; > From arnout at mind.be Sat Jan 8 15:12:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:12:44 +0100 Subject: [Buildroot] [PATCH] package/python-numpy: simplify PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES In-Reply-To: <20220107231253.1546336-1-thomas.petazzoni@bootlin.com> References: <20220107231253.1546336-1-thomas.petazzoni@bootlin.com> Message-ID: <3f5b1b5f-5c4d-0968-923b-43b8c004ca49@mind.be> On 08/01/2022 00:12, Thomas Petazzoni wrote: > The PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES macro was introduced in > commit > 2426002d6fc81d0b023e3f3b3ee4e94ab29438cb ("package/python-numpy: fixup > npymath.ini for numpy extensions"). > > However, it turns out that by using $(PYTHON3_PATH), we can simplify > the intermediate variables, to the point where they are no longer > needed. Not having the intermediate variables makes the logic a bit > easier to understand. > > Also, the logic is changed to use a single sed expression, which we > pass to $(SED). > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Arnout > --- > package/python-numpy/python-numpy.mk | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk > index f367b556ef..9e8b032b78 100644 > --- a/package/python-numpy/python-numpy.mk > +++ b/package/python-numpy/python-numpy.mk > @@ -40,12 +40,9 @@ endef > # it uses host libraries (like libnpymath.a). > # So, the numpy distutils extension packages would explicitly link this > # config path for their package environment. > -PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy > -PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config > define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES > - sed -e '/^pkgdir=/d' \ > - -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ > - -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini > + $(SED) '/^pkgdir=/d;/^prefix=/i pkgdir=$(PYTHON3_PATH)/site-packages/numpy/core' \ > + $(PYTHON3_PATH)/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini > endef > PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES > > From arnout at mind.be Sat Jan 8 15:12:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:12:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmicrohttpd: fix pthread detection In-Reply-To: <20220108075018.22567-1-bernd.kuhls@t-online.de> References: <20220108075018.22567-1-bernd.kuhls@t-online.de> Message-ID: <37ccb64c-8d9b-ae34-1822-ed3aad14a047@mind.be> On 08/01/2022 08:50, Bernd Kuhls wrote: > Fix autobuild failures after bumping the package to 0.9.75 in commit > 8ec001b467e22904c0a7ec5780d83afd44ad78f3: > > conftest.c:64:26: error: #error "_REENTRANT must be defined" > > Fixes: > http://autobuild.buildroot.net/results/f76/f7668104dd64a93f0b343ce3ebbe50b12584184d/ > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libmicrohttpd/libmicrohttpd.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk > index f75178bc0a..344e1443fd 100644 > --- a/package/libmicrohttpd/libmicrohttpd.mk > +++ b/package/libmicrohttpd/libmicrohttpd.mk > @@ -12,6 +12,10 @@ LIBMICROHTTPD_INSTALL_STAGING = YES > LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples > LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 > > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) > +LIBMICROHTTPD_CFLAGS += -D_REENTRANT > +endif > + > LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" > > ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) > From arnout at mind.be Sat Jan 8 15:13:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:13:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: bump version to 5.15.1 In-Reply-To: <20220108091349.918259-1-bernd.kuhls@t-online.de> References: <20220108091349.918259-1-bernd.kuhls@t-online.de> Message-ID: On 08/01/2022 10:13, Bernd Kuhls wrote: > Reformatted hashes. > > Upstream relicensed libbtrfsutil to LGPL-2.1+ and removed > libbtrfsutil/COPYING.LESSER: > https://github.com/kdave/btrfs-progs/commit/9e30f779e3cbf12a88ebe309ee371851fdfd3aa0 > > Add optional support for udev: > https://github.com/kdave/btrfs-progs/commit/f74ebeee5c239e007a0144e93f0eee26949a85ec > https://github.com/kdave/btrfs-progs/commit/1d0fa3781ef9374388b683cf96f9c48245025cf6 > > Changelog: > https://github.com/kdave/btrfs-progs/blob/master/CHANGES > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/btrfs-progs/btrfs-progs.hash | 7 +++---- > package/btrfs-progs/btrfs-progs.mk | 15 +++++++++++---- > 2 files changed, 14 insertions(+), 8 deletions(-) > > diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash > index aac144963e..339eab02aa 100644 > --- a/package/btrfs-progs/btrfs-progs.hash > +++ b/package/btrfs-progs/btrfs-progs.hash > @@ -1,6 +1,5 @@ > # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc > -sha256 d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137 btrfs-progs-v5.11.tar.xz > +sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz > # Locally computed > -sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING > -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING > -sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 libbtrfsutil/COPYING.LESSER > +sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING > +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index 96456d1238..50c8e59e50 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -4,14 +4,13 @@ > # > ################################################################################ > > -BTRFS_PROGS_VERSION = 5.11 > +BTRFS_PROGS_VERSION = 5.15.1 > BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs > BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz > BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib > BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python > -BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-3.0+ (libbtrfsutil) > -BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING \ > - libbtrfsutil/COPYING.LESSER > +BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) > +BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING > BTRFS_PROGS_INSTALL_STAGING = YES > > # Doesn't autodetect static-only and tries to build both > @@ -31,9 +30,17 @@ else > BTRFS_PROGS_CONF_OPTS += --disable-convert > endif > > +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > +BTRFS_PROGS_CONF_OPTS += --enable-libudev > +BTRFS_PROGS_DEPENDENCIES += udev > +else > +BTRFS_PROGS_CONF_OPTS += --disable-libudev > +endif > + > HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib > HOST_BTRFS_PROGS_CONF_OPTS = \ > --disable-backtrace \ > + --disable-libudev \ > --disable-zstd \ > --disable-python \ > --disable-convert > From arnout at mind.be Sat Jan 8 15:13:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:13:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/eudev/: bump version to 3.2.11 In-Reply-To: <20220108092554.989783-1-bernd.kuhls@t-online.de> References: <20220108092554.989783-1-bernd.kuhls@t-online.de> Message-ID: <377ced22-7ea9-db41-4e7c-1df864d48308@mind.be> On 08/01/2022 10:25, Bernd Kuhls wrote: > Switch upstream URL to github due to changes in project ownership: > https://github.com/eudev-project/eudev/commit/06ac38e2b876427dfa2ef47e74b46b99927dfe34 > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/eudev/Config.in | 2 +- > package/eudev/eudev.hash | 4 +--- > package/eudev/eudev.mk | 4 ++-- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/package/eudev/Config.in b/package/eudev/Config.in > index 0e5bd0cee9..6e7bbe4648 100644 > --- a/package/eudev/Config.in > +++ b/package/eudev/Config.in > @@ -16,7 +16,7 @@ config BR2_PACKAGE_EUDEV > Upstart, older kernels, various toolchains and anything else > required by users and various distributions. > > - https://wiki.gentoo.org/wiki/Project:Eudev > + https://github.com/eudev-project/eudev > > if BR2_PACKAGE_EUDEV > > diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash > index fda0481351..fe6c7ef008 100644 > --- a/package/eudev/eudev.hash > +++ b/package/eudev/eudev.hash > @@ -1,5 +1,3 @@ > -# From http://dev.gentoo.org/~blueness/eudev/ > -md5 60b135a189523f333cea5f71a3345c8d eudev-3.2.10.tar.gz > # Locally calculated > -sha256 87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz > +sha256 19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b eudev-3.2.11.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING > diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk > index 5d18b388c7..705370689d 100644 > --- a/package/eudev/eudev.mk > +++ b/package/eudev/eudev.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -EUDEV_VERSION = 3.2.10 > -EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev > +EUDEV_VERSION = 3.2.11 > +EUDEV_SITE = https://github.com/eudev-project/eudev/releases/download/v$(EUDEV_VERSION) > EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) > EUDEV_LICENSE_FILES = COPYING > EUDEV_INSTALL_STAGING = YES > From arnout at mind.be Sat Jan 8 15:14:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:14:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/libfribidi: bump version to 1.0.11 In-Reply-To: <20220108095037.1065173-1-bernd.kuhls@t-online.de> References: <20220108095037.1065173-1-bernd.kuhls@t-online.de> Message-ID: <83ee7af9-fcfb-740f-412d-97b93787b265@mind.be> On 08/01/2022 10:50, Bernd Kuhls wrote: > Release notes: https://github.com/fribidi/fribidi/releases/tag/v1.0.11 > > Signed-off-by: Bernd Kuhls > --- Applied to master, thanks. Regards, Arnout > package/libfribidi/libfribidi.hash | 2 +- > package/libfribidi/libfribidi.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash > index 8e7eb49bcd..da25b2d24d 100644 > --- a/package/libfribidi/libfribidi.hash > +++ b/package/libfribidi/libfribidi.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01 fribidi-1.0.10.tar.xz > +sha256 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d fribidi-1.0.11.tar.xz > sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING > diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk > index 97e875b4a2..adbd786db1 100644 > --- a/package/libfribidi/libfribidi.mk > +++ b/package/libfribidi/libfribidi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBFRIBIDI_VERSION = 1.0.10 > +LIBFRIBIDI_VERSION = 1.0.11 > LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz > LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) > LIBFRIBIDI_LICENSE = LGPL-2.1+ > From arnout at mind.be Sat Jan 8 15:14:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: bump version to 1.8.1 In-Reply-To: <20220108095451.1078507-1-bernd.kuhls@t-online.de> References: <20220108095451.1078507-1-bernd.kuhls@t-online.de> Message-ID: <9e32dc06-12ef-02e9-619a-aaf2bbf4acc5@mind.be> On 08/01/2022 10:54, Bernd Kuhls wrote: > Reformatted hashes. > > Changelog: https://github.com/NLnetLabs/ldns/blob/develop/Changelog > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libldns/libldns.hash | 10 +++++----- > package/libldns/libldns.mk | 2 +- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash > index c8fb39d478..cab8b7dbdf 100644 > --- a/package/libldns/libldns.hash > +++ b/package/libldns/libldns.hash > @@ -1,7 +1,7 @@ > -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha1 > -sha1 d075a08972c0f573101fb4a6250471daaa53cb3e ldns-1.7.1.tar.gz > -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha256 > -sha256 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 ldns-1.7.1.tar.gz > +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha1 > +sha1 df19a0404a608821b571525214a18988bc88bb46 ldns-1.8.1.tar.gz > +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha256 > +sha256 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 ldns-1.8.1.tar.gz > > # Hash for license file: > -sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE > +sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE > diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk > index 9c248bbc19..7deca978da 100644 > --- a/package/libldns/libldns.mk > +++ b/package/libldns/libldns.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBLDNS_VERSION = 1.7.1 > +LIBLDNS_VERSION = 1.8.1 > LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz > LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns > LIBLDNS_LICENSE = BSD-3-Clause > From arnout at mind.be Sat Jan 8 15:14:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:14:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsoundtouch: bump version to 2.3.1 In-Reply-To: <20220108100350.1102692-1-bernd.kuhls@t-online.de> References: <20220108100350.1102692-1-bernd.kuhls@t-online.de> Message-ID: <6cfa041f-d61a-215e-246f-d0beb752f386@mind.be> On 08/01/2022 11:03, Bernd Kuhls wrote: > Updated license hash due to upstream commit: > https://codeberg.org/soundtouch/soundtouch/commit/d11a3adb2daddcdfafac2d86ec8de3b3f41d2f78 > > Updated _SITE: > https://codeberg.org/soundtouch/soundtouch/commit/d063c0d9f9d29ef1f3302fbdee2f11f997bb2bce > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libsoundtouch/libsoundtouch.hash | 4 ++-- > package/libsoundtouch/libsoundtouch.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/libsoundtouch/libsoundtouch.hash b/package/libsoundtouch/libsoundtouch.hash > index fe6a108e33..9de72521bd 100644 > --- a/package/libsoundtouch/libsoundtouch.hash > +++ b/package/libsoundtouch/libsoundtouch.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 f1ce96bac35779d3b752f4cc8696975b3d58f3deb9db47ffc45862767c2a2bdd libsoundtouch-2.2.tar.gz > -sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT > +sha256 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1 soundtouch-2.3.1.tar.gz > +sha256 84c6d82dc7de80f5b73f231edfd3ddc5b53513908117452bfa37ea36bb4b7e0a COPYING.TXT > diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk > index 8a0e807d7a..c372c32ac7 100644 > --- a/package/libsoundtouch/libsoundtouch.mk > +++ b/package/libsoundtouch/libsoundtouch.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -LIBSOUNDTOUCH_VERSION = 2.2 > -LIBSOUNDTOUCH_SITE = $(call gitlab,soundtouch,soundtouch,$(LIBSOUNDTOUCH_VERSION)) > +LIBSOUNDTOUCH_VERSION = 2.3.1 > +LIBSOUNDTOUCH_SOURCE = soundtouch-$(LIBSOUNDTOUCH_VERSION).tar.gz > +LIBSOUNDTOUCH_SITE = https://www.surina.net/soundtouch > LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ > LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT > LIBSOUNDTOUCH_AUTORECONF = YES > From arnout at mind.be Sat Jan 8 15:14:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:14:57 +0100 Subject: [Buildroot] [PATCH] package/terminology: bump to version 1.12.1 In-Reply-To: <20220108124922.157020-1-romain.naour@smile.fr> References: <20220108124922.157020-1-romain.naour@smile.fr> Message-ID: <3ecdadc4-142b-2806-69d1-43675bc81814@mind.be> On 08/01/2022 13:49, Romain Naour wrote: > See: > https://www.enlightenment.org/news/2022-01-03-terminology-1.12.1 > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Arnout > --- > package/terminology/terminology.hash | 4 ++-- > package/terminology/terminology.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash > index 7e9658482a..2ad10af76f 100644 > --- a/package/terminology/terminology.hash > +++ b/package/terminology/terminology.hash > @@ -1,3 +1,3 @@ > -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum > -sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz > +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.1.tar.xz.sha256sum > +sha256 f8ced9584c2e9ae87452ce7425fd25b2d3e122c7489785d2917890215c6b5aa9 terminology-1.12.1.tar.xz > sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING > diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk > index 787c9ad137..c3125c71ec 100644 > --- a/package/terminology/terminology.mk > +++ b/package/terminology/terminology.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TERMINOLOGY_VERSION = 1.12.0 > +TERMINOLOGY_VERSION = 1.12.1 > TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz > TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology > TERMINOLOGY_LICENSE = BSD-2-Clause > From arnout at mind.be Sat Jan 8 15:15:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:15:10 +0100 Subject: [Buildroot] [PATCH] configs/olimex_stmp157: bump U-Boot version In-Reply-To: <20220108141459.2972-1-francois.perrad@gadz.org> References: <20220108141459.2972-1-francois.perrad@gadz.org> Message-ID: <5f1bf6cc-7a01-327d-e91a-d0933924f1f2@mind.be> On 08/01/2022 15:14, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > configs/olimex_stmp157_olinuxino_lime_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig > index f54d899b3..74e7f9ba6 100644 > --- a/configs/olimex_stmp157_olinuxino_lime_defconfig > +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig > @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" > -# release-20210821, based on 2021.04 > -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="acda542100fa83e4bc82634e4668f8106af37a61" > +# release-20211130, based on 2021.04 > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1c29714bc643c299e2ed4ba870be8d4538124144" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" > # BR2_TARGET_UBOOT_FORMAT_BIN is not set > BR2_TARGET_UBOOT_FORMAT_IMG=y > From arnout at mind.be Sat Jan 8 14:48:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:37 +0100 Subject: [Buildroot] [git commit] package/domoticz: fix build with libexecinfo Message-ID: <20220108150928.21B6782AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9be2c73c59c1f4082040ab0d4fce12a867edd080 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix build failure raised since the addition of the libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4 Fixes: - Not autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/domoticz/domoticz.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index ee5a41b8c1..f142791830 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -41,6 +41,11 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +DOMOTICZ_DEPENDENCIES += libexecinfo +DOMOTICZ_CONF_OPTS += -DEXECINFO_LIBRARIES=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) DOMOTICZ_DEPENDENCIES += libusb DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON From arnout at mind.be Sat Jan 8 14:48:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:40 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-vdr-vnsi: bump version to 19.0.2-Matrix Message-ID: <20220108150928.2AA2A82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff375358383f3a355b022d1061f5ad43b5920fe4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index c6223fc8e4..4cd1f7ad6b 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 38a1c8662dda6eeb91a9924b7f5f9fef510c78f2faf8ae3248c10ec0885fe9f3 kodi-pvr-vdr-vnsi-19.0.1-Matrix.tar.gz +sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index b281f00f19..65e69d2b23 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.1-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Jan 8 14:48:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:48 +0100 Subject: [Buildroot] [git commit] support/scripts/generate-gitlab-ci-yml: ignore branch name prefix containing a single hyphen Message-ID: <20220108150928.43E1182DF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1cc6061fd368b987d8b03e63cd06a1f792492e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The commit [1] added a sed command used to retreive a pattern to keep only defconfigs whose name start with the pattern. "-defconfigs-" The sed command doesn't work as expected if contains a single hyphen [2]: "qemu-6.2.0-defconfigs-qemu" Update the sed command to ignore completely the part before "-defconfigs-". [1] 65d2f04c012af492a9b9da04dfa3b3cbd20347f1 [2] http://lists.busybox.net/pipermail/buildroot/2022-January/632507.html Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/generate-gitlab-ci-yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index 3e0c68091b..bd79807914 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -66,8 +66,8 @@ gen_tests() { (*-defconfigs) do_defconfigs=base ;; - (*-defconfigs-*) - pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%[^\-]*-defconfigs-\(.*\)%\1%') + (*-defconfigs-*) + pattern=$(echo ${CI_COMMIT_REF_NAME} | sed 's%^.*-defconfigs-\(.*\)%\1%') defconfigs=( $(cd configs; LC_ALL=C ls -1 | grep ^${pattern}) ) do_defconfigs=base ;; From arnout at mind.be Sat Jan 8 14:48:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:51 +0100 Subject: [Buildroot] [git commit] package/python-numpy: simplify PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES Message-ID: <20220108150928.4CA9482DF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3093444e9cf0c5343677799c9130d3aeb342dc3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES macro was introduced in commit 2426002d6fc81d0b023e3f3b3ee4e94ab29438cb ("package/python-numpy: fixup npymath.ini for numpy extensions"). However, it turns out that by using $(PYTHON3_PATH), we can simplify the intermediate variables, to the point where they are no longer needed. Not having the intermediate variables makes the logic a bit easier to understand. Also, the logic is changed to use a single sed expression, which we pass to $(SED). Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-numpy/python-numpy.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index f367b556ef..9e8b032b78 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -40,12 +40,9 @@ endef # it uses host libraries (like libnpymath.a). # So, the numpy distutils extension packages would explicitly link this # config path for their package environment. -PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy -PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES - sed -e '/^pkgdir=/d' \ - -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \ - -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini + $(SED) '/^pkgdir=/d;/^prefix=/i pkgdir=$(PYTHON3_PATH)/site-packages/numpy/core' \ + $(PYTHON3_PATH)/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini endef PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES From arnout at mind.be Sat Jan 8 14:48:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:46 +0100 Subject: [Buildroot] [git commit] package/mstpd: bump version to 0.1.0 Message-ID: <20220108150928.3BD5582AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7244efa8284627412a0385d9f07c2110717ee2c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Shortly after MSTPd was added, version 0.1.0 was released. Update to the latest version. Signed-off-by: Colin Foster Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mstpd/mstpd.hash | 1 + package/mstpd/mstpd.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mstpd/mstpd.hash b/package/mstpd/mstpd.hash index fd76b959db..64e946d6d1 100644 --- a/package/mstpd/mstpd.hash +++ b/package/mstpd/mstpd.hash @@ -1,4 +1,5 @@ # locally computed sha256 91a1862548b5b509caa2e96e5fb9912bc98d4d58cc98e99a577824735756c14d mstpd-0.0.9.tar.gz +sha256 03d1ff4ca189d54322562cb2891888768af719d2c73ceafa5f1ca96133dffeb2 mstpd-0.1.0.tar.gz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 LICENSE sha256 c5cfd44652276184374adf454150d436ce958ce50acc4ef9ccb3605a5ca7a9d3 hmac_md5.c diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk index a870352869..907d094242 100644 --- a/package/mstpd/mstpd.mk +++ b/package/mstpd/mstpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSTPD_VERSION = 0.0.9 +MSTPD_VERSION = 0.1.0 MSTPD_SITE = $(call github,mstpd,mstpd,$(MSTPD_VERSION)) MSTPD_AUTORECONF = YES MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5) From arnout at mind.be Sat Jan 8 14:48:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:55 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: bump version to 5.15.1 Message-ID: <20220108150928.5DBCD82DF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Reformatted hashes. Upstream relicensed libbtrfsutil to LGPL-2.1+ and removed libbtrfsutil/COPYING.LESSER: https://github.com/kdave/btrfs-progs/commit/9e30f779e3cbf12a88ebe309ee371851fdfd3aa0 Add optional support for udev: https://github.com/kdave/btrfs-progs/commit/f74ebeee5c239e007a0144e93f0eee26949a85ec https://github.com/kdave/btrfs-progs/commit/1d0fa3781ef9374388b683cf96f9c48245025cf6 Changelog: https://github.com/kdave/btrfs-progs/blob/master/CHANGES Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/btrfs-progs/btrfs-progs.hash | 7 +++---- package/btrfs-progs/btrfs-progs.mk | 15 +++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index aac144963e..339eab02aa 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137 btrfs-progs-v5.11.tar.xz +sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz # Locally computed -sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING -sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 libbtrfsutil/COPYING.LESSER +sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 96456d1238..50c8e59e50 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,14 +4,13 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.11 +BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python -BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-3.0+ (libbtrfsutil) -BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING \ - libbtrfsutil/COPYING.LESSER +BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) +BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES # Doesn't autodetect static-only and tries to build both @@ -31,9 +30,17 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +BTRFS_PROGS_CONF_OPTS += --enable-libudev +BTRFS_PROGS_DEPENDENCIES += udev +else +BTRFS_PROGS_CONF_OPTS += --disable-libudev +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ + --disable-libudev \ --disable-zstd \ --disable-python \ --disable-convert From arnout at mind.be Sat Jan 8 14:48:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:43 +0100 Subject: [Buildroot] [git commit] package/mp4v2: bump to version 5.0.1 Message-ID: <20220108150928.32E9A82DF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df22a9d6b77d9e245dceb7c8fd3f9d80c8917ca0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop first patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mp4v2/0001-Fix-GCC7-build.patch | 33 ---------------------- ...src-mp4track.cpp-replace-nullptr-by-NULL.patch} | 2 +- ...02-Static-cast-to-unsigned-int-for-cases.patch} | 0 package/mp4v2/mp4v2.hash | 2 +- package/mp4v2/mp4v2.mk | 2 +- 5 files changed, 3 insertions(+), 36 deletions(-) diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch deleted file mode 100644 index 4e39be4a79..0000000000 --- a/package/mp4v2/0001-Fix-GCC7-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Wed, 8 Feb 2017 00:56:32 +0000 -Subject: [PATCH] Fix GCC7 build - -if (*pSlash != '\0') { - -As it stands the body of that if will always execute and when there are -no encoding parameters ppEncodingParams will be returned as a pointer to -an empty string rather than as a null pointer - -Signed-off-by: Peter Korsgaard -[Upstream status: https://github.com/TechSmith/mp4v2/pull/36] ---- - src/rtphint.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rtphint.cpp b/src/rtphint.cpp -index e07309d..1eb01f5 100644 ---- a/src/rtphint.cpp -+++ b/src/rtphint.cpp -@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( - pSlash = strchr(pSlash, '/'); - if (pSlash != NULL) { - pSlash++; -- if (pSlash != '\0') { -+ if (*pSlash != '\0') { - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); - *ppEncodingParams = (char *)MP4Calloc(length + 1); - strncpy(*ppEncodingParams, pSlash, length); --- -2.11.0 - diff --git a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch similarity index 96% rename from package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch rename to package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch index 72bae463c9..c279b9c56a 100644 --- a/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch +++ b/package/mp4v2/0001-src-mp4track.cpp-replace-nullptr-by-NULL.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +[Upstream status: https://github.com/TechSmith/mp4v2/pull/62] --- src/mp4track.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch similarity index 100% rename from package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch rename to package/mp4v2/0002-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 85fce49384..7aa5402c8f 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz +sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 478d10d472..6d29228a13 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MP4V2_VERSION = 4.1.3 +MP4V2_VERSION = 5.0.1 MP4V2_SITE = \ $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) MP4V2_INSTALL_STAGING = YES From arnout at mind.be Sat Jan 8 14:48:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:53 +0100 Subject: [Buildroot] [git commit] package/libmicrohttpd: fix pthread detection Message-ID: <20220108150928.559D182AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=834464792e691a243d456335083b2a8b3363e261 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix autobuild failures after bumping the package to 0.9.75 in commit 8ec001b467e22904c0a7ec5780d83afd44ad78f3: conftest.c:64:26: error: #error "_REENTRANT must be defined" Fixes: http://autobuild.buildroot.net/results/f76/f7668104dd64a93f0b343ce3ebbe50b12584184d/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libmicrohttpd/libmicrohttpd.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f75178bc0a..344e1443fd 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -12,6 +12,10 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBMICROHTTPD_CFLAGS += -D_REENTRANT +endif + LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) From arnout at mind.be Sat Jan 8 14:49:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:08 +0100 Subject: [Buildroot] [git commit] package/libsoundtouch: bump version to 2.3.1 Message-ID: <20220108150928.88A0782DF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6afe7b1da38df60792302af82cd1069972c8613f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updated license hash due to upstream commit: https://codeberg.org/soundtouch/soundtouch/commit/d11a3adb2daddcdfafac2d86ec8de3b3f41d2f78 Updated _SITE: https://codeberg.org/soundtouch/soundtouch/commit/d063c0d9f9d29ef1f3302fbdee2f11f997bb2bce Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libsoundtouch/libsoundtouch.hash | 4 ++-- package/libsoundtouch/libsoundtouch.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libsoundtouch/libsoundtouch.hash b/package/libsoundtouch/libsoundtouch.hash index fe6a108e33..9de72521bd 100644 --- a/package/libsoundtouch/libsoundtouch.hash +++ b/package/libsoundtouch/libsoundtouch.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f1ce96bac35779d3b752f4cc8696975b3d58f3deb9db47ffc45862767c2a2bdd libsoundtouch-2.2.tar.gz -sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT +sha256 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1 soundtouch-2.3.1.tar.gz +sha256 84c6d82dc7de80f5b73f231edfd3ddc5b53513908117452bfa37ea36bb4b7e0a COPYING.TXT diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk index 8a0e807d7a..c372c32ac7 100644 --- a/package/libsoundtouch/libsoundtouch.mk +++ b/package/libsoundtouch/libsoundtouch.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBSOUNDTOUCH_VERSION = 2.2 -LIBSOUNDTOUCH_SITE = $(call gitlab,soundtouch,soundtouch,$(LIBSOUNDTOUCH_VERSION)) +LIBSOUNDTOUCH_VERSION = 2.3.1 +LIBSOUNDTOUCH_SOURCE = soundtouch-$(LIBSOUNDTOUCH_VERSION).tar.gz +LIBSOUNDTOUCH_SITE = https://www.surina.net/soundtouch LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT LIBSOUNDTOUCH_AUTORECONF = YES From arnout at mind.be Sat Jan 8 14:49:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:03 +0100 Subject: [Buildroot] [git commit] package/libfribidi: bump version to 1.0.11 Message-ID: <20220108150928.77B4582AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a67ba062a01be9262926a689178fe5ea9ae89d2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/fribidi/fribidi/releases/tag/v1.0.11 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libfribidi/libfribidi.hash | 2 +- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 8e7eb49bcd..da25b2d24d 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01 fribidi-1.0.10.tar.xz +sha256 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d fribidi-1.0.11.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 97e875b4a2..adbd786db1 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.10 +LIBFRIBIDI_VERSION = 1.0.11 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ From arnout at mind.be Sat Jan 8 14:49:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:05 +0100 Subject: [Buildroot] [git commit] package/libldns: bump version to 1.8.1 Message-ID: <20220108150928.8038F82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2cb372e0851f149d2c0c70667be369a4c09a2bc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Reformatted hashes. Changelog: https://github.com/NLnetLabs/ldns/blob/develop/Changelog Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libldns/libldns.hash | 10 +++++----- package/libldns/libldns.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash index c8fb39d478..cab8b7dbdf 100644 --- a/package/libldns/libldns.hash +++ b/package/libldns/libldns.hash @@ -1,7 +1,7 @@ -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha1 -sha1 d075a08972c0f573101fb4a6250471daaa53cb3e ldns-1.7.1.tar.gz -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha256 -sha256 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 ldns-1.7.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha1 +sha1 df19a0404a608821b571525214a18988bc88bb46 ldns-1.8.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha256 +sha256 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 ldns-1.8.1.tar.gz # Hash for license file: -sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE +sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 9c248bbc19..7deca978da 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLDNS_VERSION = 1.7.1 +LIBLDNS_VERSION = 1.8.1 LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause From arnout at mind.be Sat Jan 8 14:49:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:15 +0100 Subject: [Buildroot] [git commit] configs/olimex_stmp157: bump U-Boot version Message-ID: <20220108150928.A285E82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c49342adf1f72a1ca1745f02c7aca13d8145a3f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/olimex_stmp157_olinuxino_lime_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index f54d899b3e..74e7f9ba67 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -# release-20210821, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="acda542100fa83e4bc82634e4668f8106af37a61" +# release-20211130, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1c29714bc643c299e2ed4ba870be8d4538124144" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y From arnout at mind.be Sat Jan 8 14:49:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:00 +0100 Subject: [Buildroot] [git commit] package/icu: bump version to 70-1 Message-ID: <20220108150928.6EE8282AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7549e05bf83cf0b6a9db4c2c40122e676fb07e7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which was applied upstream: https://github.com/unicode-org/icu/commit/2dc5bea9061b4fb05cd03e21b775dd944a0eb81d Updated license hash due to typo fixes: https://github.com/unicode-org/icu/commit/73eca0a9c927045a3b5eafdbec9c17d2fcacd5da Updated project URL as recommended in the release notes: https://github.com/unicode-org/icu/releases/tag/release-70-1 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0005-ICU-21587-Fix-memory-bug-w-baseName.patch | 112 --------------------- package/icu/Config.in | 2 +- package/icu/icu.hash | 4 +- package/icu/icu.mk | 2 +- 4 files changed, 4 insertions(+), 116 deletions(-) diff --git a/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch b/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch deleted file mode 100644 index 15af976e49..0000000000 --- a/package/icu/0005-ICU-21587-Fix-memory-bug-w-baseName.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 2dc5bea9061b4fb05cd03e21b775dd944a0eb81d Mon Sep 17 00:00:00 2001 -From: Frank Tang -Date: Tue, 13 Apr 2021 15:16:50 -0700 -Subject: [PATCH] ICU-21587 Fix memory bug w/ baseName - -Edge cases not fixed in assign and move assign operator -while the locale is long and call setKeywordValue with incorrect -keyword/values. - -Signed-off-by: Peter Korsgaard -[Peter: Fixes CVE-2021-30535, adjust paths for tarball] ---- - source/common/locid.cpp | 11 +++++++++-- - source/test/intltest/loctest.cpp | 26 ++++++++++++++++++++++++++ - source/test/intltest/loctest.h | 2 ++ - 3 files changed, 37 insertions(+), 2 deletions(-) - -diff --git a/source/common/locid.cpp b/source/common/locid.cpp -index 02cd82a7b8..3c6e5b0669 100644 ---- a/source/common/locid.cpp -+++ b/source/common/locid.cpp -@@ -469,14 +469,18 @@ Locale& Locale::operator=(Locale&& other) U_NOEXCEPT { - if ((baseName != fullName) && (baseName != fullNameBuffer)) uprv_free(baseName); - if (fullName != fullNameBuffer) uprv_free(fullName); - -- if (other.fullName == other.fullNameBuffer) { -+ if (other.fullName == other.fullNameBuffer || other.baseName == other.fullNameBuffer) { - uprv_strcpy(fullNameBuffer, other.fullNameBuffer); -+ } -+ if (other.fullName == other.fullNameBuffer) { - fullName = fullNameBuffer; - } else { - fullName = other.fullName; - } - -- if (other.baseName == other.fullName) { -+ if (other.baseName == other.fullNameBuffer) { -+ baseName = fullNameBuffer; -+ } else if (other.baseName == other.fullName) { - baseName = fullName; - } else { - baseName = other.baseName; -@@ -2681,6 +2685,9 @@ Locale::setKeywordValue(const char* keywordName, const char* keywordValue, UErro - if (fullName != fullNameBuffer) { - // if full Name is already on the heap, need to free it. - uprv_free(fullName); -+ if (baseName == fullName) { -+ baseName = newFullName; // baseName should not point to freed memory. -+ } - } - fullName = newFullName; - status = U_ZERO_ERROR; -diff --git a/source/test/intltest/loctest.cpp b/source/test/intltest/loctest.cpp -index ce41a4c00e..5503b008b0 100644 ---- a/source/test/intltest/loctest.cpp -+++ b/source/test/intltest/loctest.cpp -@@ -284,6 +284,8 @@ void LocaleTest::runIndexedTest( int32_t index, UBool exec, const char* &name, c - TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale); - TESTCASE_AUTO(TestCanonicalize); - TESTCASE_AUTO(TestLeak21419); -+ TESTCASE_AUTO(TestLongLocaleSetKeywordAssign); -+ TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign); - TESTCASE_AUTO_END; - } - -@@ -6520,6 +6522,30 @@ void LocaleTest::TestSetUnicodeKeywordValueInLongLocale() { - } - } - -+void LocaleTest::TestLongLocaleSetKeywordAssign() { -+ IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordAssign"); -+ // A long base name, with an illegal keyword and copy constructor -+ icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_" -+ "AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_" -+ "AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17_AAAAAA18"); -+ Locale l2; -+ l.setUnicodeKeywordValue("co", "12", status); // Cause an error -+ status.reset(); -+ l2 = l; // copy operator on such bogus locale. -+} -+ -+void LocaleTest::TestLongLocaleSetKeywordMoveAssign() { -+ IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordMoveAssign"); -+ // A long base name, with an illegal keyword and copy constructor -+ icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_" -+ "AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_" -+ "AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17"); -+ Locale l2; -+ l.setUnicodeKeywordValue("co", "12", status); // Cause an error -+ status.reset(); -+ Locale l3 = std::move(l); // move assign -+} -+ - void LocaleTest::TestSetUnicodeKeywordValueNullInLongLocale() { - IcuTestErrorCode status(*this, "TestSetUnicodeKeywordValueNullInLongLocale"); - const char *exts[] = {"cf", "cu", "em", "kk", "kr", "ks", "kv", "lb", "lw", -diff --git a/source/test/intltest/loctest.h b/source/test/intltest/loctest.h -index 05be4037bd..12a93bde53 100644 ---- a/source/test/intltest/loctest.h -+++ b/source/test/intltest/loctest.h -@@ -156,6 +156,8 @@ class LocaleTest: public IntlTest { - void TestSetUnicodeKeywordValueInLongLocale(); - void TestSetUnicodeKeywordValueNullInLongLocale(); - void TestLeak21419(); -+ void TestLongLocaleSetKeywordAssign(); -+ void TestLongLocaleSetKeywordMoveAssign(); - - private: - void _checklocs(const char* label, --- -2.20.1 - diff --git a/package/icu/Config.in b/package/icu/Config.in index b0c9eac83d..8b410bfdb6 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_ICU help International Components for Unicode. - http://site.icu-project.org/ + https://icu.unicode.org/ if BR2_PACKAGE_ICU diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 5ed7cc4217..56a0a5dd53 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 icu4c-69_1-src.tgz -sha256 7915b19db903070778581ae05d8bf4ea241b34a05deb51ca4f5cbb15ea1cbba3 LICENSE +sha256 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 icu4c-70_1-src.tgz +sha256 861671f8c712aa046f8f5ac89239e6c33821636516c5d0cc8c4e1973085f27a6 LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index c5d0c3eefb..7e0c96e43a 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 69-1 +ICU_VERSION = 70-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) From arnout at mind.be Sat Jan 8 14:48:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:48:58 +0100 Subject: [Buildroot] [git commit] package/eudev/: bump version to 3.2.11 Message-ID: <20220108150928.665A082DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af1781844f853c0875093f1c71fd8dc8142fa3be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch upstream URL to github due to changes in project ownership: https://github.com/eudev-project/eudev/commit/06ac38e2b876427dfa2ef47e74b46b99927dfe34 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/eudev/Config.in | 2 +- package/eudev/eudev.hash | 4 +--- package/eudev/eudev.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 0e5bd0cee9..6e7bbe4648 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_EUDEV Upstart, older kernels, various toolchains and anything else required by users and various distributions. - https://wiki.gentoo.org/wiki/Project:Eudev + https://github.com/eudev-project/eudev if BR2_PACKAGE_EUDEV diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index fda0481351..fe6c7ef008 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,5 +1,3 @@ -# From http://dev.gentoo.org/~blueness/eudev/ -md5 60b135a189523f333cea5f71a3345c8d eudev-3.2.10.tar.gz # Locally calculated -sha256 87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz +sha256 19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b eudev-3.2.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 5d18b388c7..705370689d 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,8 +4,8 @@ # ################################################################################ -EUDEV_VERSION = 3.2.10 -EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev +EUDEV_VERSION = 3.2.11 +EUDEV_SITE = https://github.com/eudev-project/eudev/releases/download/v$(EUDEV_VERSION) EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING EUDEV_INSTALL_STAGING = YES From arnout at mind.be Sat Jan 8 14:49:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:10 +0100 Subject: [Buildroot] [git commit] package/waf: bump version to 2.0.23 Message-ID: <20220108150928.927BB82AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=027f172c8a8ef5784bd0e0650b3e9778a4040671 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://gitlab.com/ita1024/waf/blob/master/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/waf/waf.hash | 6 +++--- package/waf/waf.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/waf/waf.hash b/package/waf/waf.hash index e9d387e7d0..21f47f76d8 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,7 +1,7 @@ # Locally computed -sha1 494ada411468129ed229f946ecec3048400e320b waf-2.0.22 -sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf-2.0.22 +sha1 89b24f9c19328339c2c8103796755474b66f3a8d waf-2.0.23 +sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf-2.0.23 # The waf script also contains its license, but is renamed `waf` in the extract # step, so this is a synonym for the above, to check WAF_LICENSE -sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf +sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index 5cc0dc3714..2b1808ace4 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.0.22 +WAF_VERSION = 2.0.23 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io WAF_LICENSE = BSD-3-Clause From arnout at mind.be Sat Jan 8 14:49:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 15:49:13 +0100 Subject: [Buildroot] [git commit] package/terminology: bump to version 1.12.1 Message-ID: <20220108150928.9B15282AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf476b1e9584265dc7bec8cdba02444a31db837f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See: https://www.enlightenment.org/news/2022-01-03-terminology-1.12.1 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/terminology/terminology.hash | 4 ++-- package/terminology/terminology.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash index 7e9658482a..2ad10af76f 100644 --- a/package/terminology/terminology.hash +++ b/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.0.tar.xz.sha256sum -sha256 74d2d3b253a77bcb215fc36eedf0ccb59643452e2ef15c510430ffaa6034dcf0 terminology-1.12.0.tar.xz +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.12.1.tar.xz.sha256sum +sha256 f8ced9584c2e9ae87452ce7425fd25b2d3e122c7489785d2917890215c6b5aa9 terminology-1.12.1.tar.xz sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index 787c9ad137..c3125c71ec 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.12.0 +TERMINOLOGY_VERSION = 1.12.1 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause From romain.naour at smile.fr Sat Jan 8 15:19:44 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 16:19:44 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: References: <20201126144722.502163-1-nolange79@gmail.com> <195311e2-38dc-53ee-80b8-09dca52320a0@smile.fr> Message-ID: <67705a4b-cf84-ef2d-f073-4ea0a497902a@smile.fr> Le 08/01/2022 ? 15:44, Norbert Lange a ?crit?: > Am Sa., 8. Jan. 2022 um 14:42 Uhr schrieb Romain Naour : >> >> Hello Norbert, >> >>>> +# >>>> +# [1] - https://github.com/systemd/systemd/issues/16183 >>> >>> It seems that systemd now include what you need since version 249 containing the >>> commit [1]. >>> >>> The fakeroot_tmpfiles.sh script seems not neceesary anymore. > > It is, this particular change did *not* get upstreamed, see [1]. > Runtime specifiers might leak > to places they should not, the script is necessary to filter out those > dangerous specs. > Some discussion was at [2]. Ok, can you respin this patch with at least an updated comment in the script. We are now using systemd 250.1 and the issue in the comment has been closed by upstream. Best regards, Romain > >>> >>> [1] >>> https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3 >> >> I have marked this patch as "Changes Requested". >> >> Best regards, >> Romain >> >>> >>> Best regards, >>> Romain >>> >>> > > Norbert > > [1] - https://github.com/systemd/systemd/pull/16187 > [2] - https://lists.buildroot.org/pipermail/buildroot/2020-June/587414.html > From fontaine.fabrice at gmail.com Sat Jan 8 15:19:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 16:19:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: bump to version 2.28.0 Message-ID: <20220108151954.2235611-1-fontaine.fabrice@gmail.com> 2.16.12 was the last release of the 2.16 long-time support branch. Users who want a long-time branch should move to mbedtls-2.28, which is backward-compatible and will be supported for at least 3 years. Use LICENSE file as apache-2.0.txt was dropped with https://github.com/ARMmbed/mbedtls/commit/c76a54554ca8bffedf0e78a1cbdb64451e4ae957 https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0 Signed-off-by: Fabrice Fontaine --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 8247748afd..80ae173aff 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12: -sha256 294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393 mbedtls-2.16.12.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0: +sha256 6519579b836ed78cc549375c7c18b111df5717e86ca0eeff4cb64b2674f424cc mbedtls-2.28.0.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 93ac1bb163..c238d664f8 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,14 +4,14 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.12 +MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 -MBEDTLS_LICENSE_FILES = apache-2.0.txt +MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls -- 2.34.1 From arnout at mind.be Sat Jan 8 15:38:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 16:38:36 +0100 Subject: [Buildroot] [git commit] package/python-numpy: use fortran compiler when available Message-ID: <20220108153408.E2F7582A92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1842a1cb2c7baebbc6e0f78993dac7953fd3309c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-numpy can be built using fortran compiler if available. Pass the F90 environment variable to setup.py to make sure it picks up the cross-compiler. Otherwise, use --fcompiler to make sure it doesn't accidentally pick up the host compiler. Don't do anything like this for host compilation. We don't care whether or not it uses fortran. Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-numpy/python-numpy.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 9e8b032b78..417fe81f57 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -25,7 +25,12 @@ else PYTHON_NUMPY_ENV += BLAS=None LAPACK=None endif +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) +PYTHON_NUMPY_BUILD_OPTS = --fcompiler=gnu95 +PYTHON_NUMPY_ENV += F90=$(TARGET_FC) +else PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None +endif define PYTHON_NUMPY_CONFIGURE_CMDS -rm -f $(@D)/site.cfg From arnout at mind.be Sat Jan 8 15:41:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 16:41:52 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-numpy: use fortran compiler when available In-Reply-To: <20200627130805.8615-2-guillaume.bressaix@gmail.com> References: <20200627130805.8615-1-guillaume.bressaix@gmail.com> <20200627130805.8615-2-guillaume.bressaix@gmail.com> Message-ID: On 27/06/2020 15:08, guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > python-numpy can be built using fortran compiler if > available, this is the correct configure flag to do it > > Signed-off-by: Guillaume W. Bres > --- > package/python-numpy/python-numpy.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk > index f9c55c9f3c..9e08fd5f2e 100644 > --- a/package/python-numpy/python-numpy.mk > +++ b/package/python-numpy/python-numpy.mk > @@ -23,6 +23,10 @@ else > PYTHON_NUMPY_ENV += BLAS=None LAPACK=None > endif > > +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) > +PYTHON_NUMPY_ENV += F90=$(TARGET_FC) It's better to still explicitly pass --fcompiler=gnu95; same when fortran is not available, pass --fcompiler=None. That way, we get an error if it accidentally picks up the wrong compiler (e.g. from the host). Therefore, I squashed the two patches, and applied to master, thanks. Regards, Arnout > +endif > + > define PYTHON_NUMPY_CONFIGURE_CMDS > -rm -f $(@D)/site.cfg > echo "[DEFAULT]" >> $(@D)/site.cfg > From peter at korsgaard.com Sat Jan 8 15:42:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 16:42:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/crash: new package In-Reply-To: <20200926200021.28930-1-egorenar-dev@posteo.net> References: <20200926200021.28930-1-egorenar-dev@posteo.net> Message-ID: Hi, Sorry for the slow response. On Sat, Sep 26, 2020 at 10:00 PM Alexander Egorenkov wrote: > diff --git a/package/crash/0001-Support-cross-compilation.patch b/package/crash/0001-Support-cross-compilation.patch > new file mode 100644 > index 0000000000..7e1bd3f861 > --- /dev/null > +++ b/package/crash/0001-Support-cross-compilation.patch > @@ -0,0 +1,134 @@ > +From 44cb56ad5bbd78203fb6f346299ccfe45f2568fe Mon Sep 17 00:00:00 2001 > +From: Alexander Egorenkov > +Date: Sat, 26 Sep 2020 14:29:49 +0200 > +Subject: [PATCH 1/1] Support cross-compilation > + > +- Introduce CONF_CC variable to compile configure.c > +- Introduce CONF_HOST_ARCH to configure.c to enable overriding target > + at compile time > + > +Signed-off-by: Alexander Egorenkov I noticed that this patch is not yet upstream / I don't see a PR for it. Are you still interested in this package? The patch could be quite a bit smaller if you didn't move the ! CONF_HOST_ARCH lines, but otherwise it looks fine to me. > +++ b/package/crash/Config.in > +config BR2_PACKAGE_CRASH > + bool "crash" > + depends on BR2_PACKAGE_CRASH_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS # dlopen > + depends on BR2_USE_WCHAR > + depends on BR2_TOOLCHAIN_USES_GLIBC > + select BR2_PACKAGE_LESS The dependency on less looks odd. Presumably you mean this as a runtime dependency which we normally mark with a # runtime comment and then don't add to _DEPENDENCIES, but looking at the code it seems to work without less as well or with the busybox less applet? > +++ b/package/crash/crash.mk > @@ -0,0 +1,50 @@ > +################################################################################ > +# > +# crash > +# > +################################################################################ > + > +CRASH_VERSION = 7.2.8 > +CRASH_SITE = $(call github,crash-utility,crash,$(CRASH_VERSION)) > +CRASH_DEPENDENCIES = host-bison less ncurses zlib > +CRASH_LICENSE = GPL-3.0 Most of the code seems to come from the kernel and is marked as GPL-2.0+. > +CRASH_LICENSE_FILES = COPYING3 > + > +CRASH_GDB_CONF_FLAGS = \ > + --host=$(GNU_TARGET_NAME) That looked odd to me. It apparently downloads a GDB tarball during the build step, patches and builds that, completely sidestepping the download / mirror logic of Buildroot (and our existing gdb patches), so that is not good. What is this needed for exactly? Can it instead use our existing gdb package? > +ifeq ($(BR2_i386),y) > +CRASH_TARGET = X86 > +else ifeq ($(BR2_x86_64),y) > +CRASH_TARGET = X86_64 > +else ifeq ($(BR2_arm)$(BR2_armeb),y) > +CRASH_TARGET = ARM > +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) > +CRASH_TARGET = ARM64 > +else ifeq ($(BR2_powerpc),y) > +CRASH_TARGET = PPC > +else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > +CRASH_TARGET = PPC64 > +else ifeq ($(BR2_s390x),y) > +CRASH_TARGET = S390X > +else ifeq ($(BR2_sparc64),y) > +CRASH_TARGET = SPARC64 > +endif NIT: such conditional logic is a bit clearer / shorter in Config.in instead of in the .mk. What is the use case for this exactly? You are building it for the target, but wouldn't this make more sense as a host utility? The gdb download is a show stopper, so I have marked this as changes requested. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 8 15:41:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 16:41:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/trinity: fix build with libexecinfo Message-ID: <20220108154118.2320814-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: debug.o: in function `__show_backtrace': debug.c:(.text+0x10): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/bf78e4be9b9d9ca7d32f922d72ea6cd39a78d3d8 Signed-off-by: Fabrice Fontaine --- package/trinity/trinity.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index befb8de826..4dca50c0b6 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -11,16 +11,24 @@ TRINITY_LICENSE = GPL-2.0 TRINITY_LICENSE_FILES = COPYING TRINITY_CPE_ID_VENDOR = trinity_project +TRINITY_LDFLAGS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +TRINITY_DEPENDENCIES += libexecinfo +TRINITY_LDFLAGS += -lexecinfo +endif + define TRINITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) endef define TRINITY_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LDFLAGS="$(TRINITY_LDFLAGS)" endef define TRINITY_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + LDFLAGS="$(TRINITY_LDFLAGS)" DESTDIR=$(TARGET_DIR)/usr install endef # Install helper scripts -- 2.34.1 From romain.naour at smile.fr Sat Jan 8 16:07:31 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 17:07:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gpiod: add gpiod hardware handling daemon In-Reply-To: <20200626112919.27946-1-marc.chalain@gmail.com> References: <20200626112919.27946-1-marc.chalain@gmail.com> Message-ID: Hello Marc, Le 26/06/2020 ? 13:29, Marc Chalain a ?crit?: > Gpiod is a little daemon to trig gpio event and launch scripts on level > changing events. > As udev or mdev, it reads rules files to attach scripts on events. and > launch the scripts with environment variables to describe the event. > It uses libgpiod to monitor the gpio and libconfig to read the rules. > It is tested on Raspberry Pi (0,3,4) with success. Did you had some feedback from libgpiod upstream project about merging your work ? [1] Your gpiod daemon provided by libgpiod would be nice. [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587769.html > > Signed-off-by: Marc Chalain > --- > package/Config.in | 1 + > package/gpiod/Config.in | 14 +++++++++ > package/gpiod/S20gpiod.in | 56 ++++++++++++++++++++++++++++++++++ > package/gpiod/gpiod.hash | 2 ++ > package/gpiod/gpiod.mk | 52 +++++++++++++++++++++++++++++++ > package/gpiod/gpiod.service.in | 11 +++++++ > 6 files changed, 136 insertions(+) > create mode 100644 package/gpiod/Config.in > create mode 100755 package/gpiod/S20gpiod.in > create mode 100644 package/gpiod/gpiod.hash > create mode 100644 package/gpiod/gpiod.mk > create mode 100644 package/gpiod/gpiod.service.in > > diff --git a/package/Config.in b/package/Config.in > index 6a34a895af..c86315630f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -458,6 +458,7 @@ endmenu > source "package/freescale-imx/Config.in" > source "package/fxload/Config.in" > source "package/gcnano-binaries/Config.in" > + source "package/gpiod/Config.in" > source "package/gpm/Config.in" > source "package/gpsd/Config.in" > source "package/gptfdisk/Config.in" > diff --git a/package/gpiod/Config.in b/package/gpiod/Config.in > new file mode 100644 > index 0000000000..e9ba5bdba3 > --- /dev/null > +++ b/package/gpiod/Config.in > @@ -0,0 +1,14 @@ > +config BR2_PACKAGE_GPIOD > + bool "gpiod: gpio monitor daemon" > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod > + select BR2_PACKAGE_LIBGPIOD > + select BR2_PACKAGE_LIBCONFIG > + help > + GPIOD monitors gpio events and start scripts. > + The daemon loads rules defining a gpio and > + the scripts to launch when the level of gpio changes. Add the url to the project: https://github.com/mchalain/gpiod > + > +comment "gpiod needs a toolchain w/ kernel headers >= 4.8" > + depends on !BR2_USE_MMU > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 > diff --git a/package/gpiod/S20gpiod.in b/package/gpiod/S20gpiod.in > new file mode 100755 > index 0000000000..2cc77af145 > --- /dev/null > +++ b/package/gpiod/S20gpiod.in > @@ -0,0 +1,56 @@ > +#!/bin/sh > +# > +# Starts gpiod. > +# > + > +DAEMON="gpiod" > +PIDFILE="/var/run/$DAEMON.pid" > + > +OPTIONS="" > + > +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" > + > +start() { > + printf 'Starting %s: ' "$DAEMON" > + OPTIONS="${OPTIONS} -p ${PIDFILE}" > + OPTIONS="${OPTIONS} -D" > + start-stop-daemon -S -q -x "@PREFIX@/sbin/$DAEMON" \ > + -- $OPTIONS > + status=$? > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > + fi > + return "$status" > +} > + > +stop() { > + printf 'Stopping %s: ' "$DAEMON" > + start-stop-daemon -K -q -p "$PIDFILE" > + status=$? > + if [ "$status" -eq 0 ]; then > + rm -f "$PIDFILE" > + echo "OK" > + else > + echo "FAIL" > + fi > + return "$status" > +} > + > +restart() { > + stop > + sleep 1 > + start > +} > + > +case "$1" in > + start|stop|restart) > + "$1";; > + reload) > + # Restart, since there is no true "reload" feature. > + restart;; > + *) > + echo "Usage: $0 {start|stop|restart|reload}" > + exit 1 > +esac > diff --git a/package/gpiod/gpiod.hash b/package/gpiod/gpiod.hash > new file mode 100644 > index 0000000000..af0486f792 > --- /dev/null > +++ b/package/gpiod/gpiod.hash > @@ -0,0 +1,2 @@ > +sha256 d042c0394071ea8fc7464f02c2e599021d15a9891bd378677b000aa373436c89 gpiod-1.1.tar.gz > +sha256 dfba39760e099e2a64567309f0c6ceacaf9e6473bf79835fe0f8a8580651ff49 LICENSE > diff --git a/package/gpiod/gpiod.mk b/package/gpiod/gpiod.mk > new file mode 100644 > index 0000000000..cef3a58fd5 > --- /dev/null > +++ b/package/gpiod/gpiod.mk > @@ -0,0 +1,52 @@ > +################################################################################ > +# > +# gpiod > +# > +################################################################################ > + > +GPIOD_VERSION = 1.1 > +GPIOD_SITE = $(call github,mchalain,gpiod,$(GPIOD_VERSION)) > +GPIOD_LICENSE = BSD > +GPIOD_LICENSE_FILES = LICENSE > + > +PREFIX=/usr > +SYSCONFDIR=/etc/gpiod > + > +GPIOD_MAKE_OPTS = \ > + prefix=$(PREFIX) \ > + sysconfdir=$(SYSCONFDIR) > + > +GPIOD_DEPENDENCIES = \ > + libgpiod \ > + libconfig > + > +define GPIOD_CONFIGURE_CMDS > + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) \ > + $(MAKE1) -C $(@D) $(GPIOD_MAKE_OPTS) defconfig > +endef > + > +define GPIOD_BUILD_CMDS > + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) \ > + $(MAKE1) -C $(@D) $(GPIOD_MAKE_OPTS) > +endef > + > +define GPIOD_INSTALL_TARGET_CMDS > + $(INSTALL) -d -m 755 $(TARGET_DIR)$(SYSCONFDIR)/rules.d > + $(MAKE) -C $(@D) $(GPIOD_MAKE_OPTS) \ > + DESTDIR="$(TARGET_DIR)" install > +endef > + > +define GPIOD_INSTALL_INIT_SYSTEMD > + cp $(GPIOD_PKGDIR)/gpiod.service.in $(@D)/gpiod.service > + $(SED) "s, at PREFIX@,$(PREFIX),g" $(@D)/gpiod.service > + $(INSTALL) -D -m 644 $(@D)/gpiod.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/gpiod.service > +endef > +define GPIOD_INSTALL_INIT_SYSV > + cp $(GPIOD_PKGDIR)/S20gpiod.in $(@D)/S20gpiod > + $(SED) "s, at PREFIX@,$(PREFIX),g" $(@D)/S20gpiod > + $(INSTALL) -D -m 755 $(@D)/S20gpiod \ > + $(TARGET_DIR)/etc/init.d/S20gpiod > +endef > + > +$(eval $(generic-package)) > diff --git a/package/gpiod/gpiod.service.in b/package/gpiod/gpiod.service.in > new file mode 100644 > index 0000000000..38a573ccf4 > --- /dev/null > +++ b/package/gpiod/gpiod.service.in > @@ -0,0 +1,11 @@ > +[Unit] > +Description=GPIO event handler daemon > + > +[Service] > +Type=forking > +ExecStart=@PREFIX@/sbin/gpiod -D -p /var/run/gpiod.pid > +ExecStop=@PREFIX@/sbin/gpiod -K -p /var/run/gpiod.pid > +Restart=always > + > +[Install] > +WantedBy=multi-user.target > From fontaine.fabrice at gmail.com Sat Jan 8 16:13:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:13:47 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220108115140.760e195f@windsurf> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> Message-ID: Hi, Le sam. 8 janv. 2022 ? 11:51, Thomas Petazzoni a ?crit : > > On Tue, 4 Jan 2022 21:54:55 +0100 > Fabrice Fontaine wrote: > > > Fix the following build failure raised since bump to version 5.41 in > > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > > > readelf.c: In function 'do_auxv_note': > > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > > ^ > > > > Fixes: > > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > > > > Signed-off-by: Fabrice Fontaine > > I am afraid it seems like this didn't fix the problem, see: > > http://autobuild.buildroot.net/results/957/9573e8b01d8f21cd89a67475daabdeef533d31d7/build-end.log > > ac_cv_prog_cc_c99='-std=gnu99' is properly passed to the configure > script, but it still fails. Indeed, I suggest to revert this commit and apply the version 1 of this patch instead of trying to understand what is "broken" in the configure script. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From thomas.petazzoni at bootlin.com Sat Jan 8 16:14:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 17:14:55 +0100 Subject: [Buildroot] [git commit] package/opengl/libgbm: clarify option comments Message-ID: <20220108160854.2EB0F831C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b5f7ce29288e2ba393ca7cd4768a83cdb5dec48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The comments were *after* the option they applied to, which was confusing, so bring back the comments before the option they apply to. In addition, instead of saying "this option", explicitly name the option to clear any ambiguity. Signed-off-by: Thomas Petazzoni --- package/opengl/libgbm/Config.in | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/package/opengl/libgbm/Config.in b/package/opengl/libgbm/Config.in index 7aa3efb97a..6eb39761c4 100644 --- a/package/opengl/libgbm/Config.in +++ b/package/opengl/libgbm/Config.in @@ -5,20 +5,21 @@ config BR2_PACKAGE_PROVIDES_LIBGBM string depends on BR2_PACKAGE_HAS_LIBGBM +# gbm implementations should select +# BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT if they +# provide the format modifier plane count feature. This API was +# initially introduced in mesa3d version 17. A gbm implementation +# provides this feature if it is implement function +# gbm_device_get_format_modifier_plane_count. config BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT bool depends on BR2_PACKAGE_HAS_LIBGBM -# gbm implementations should select this option if they provide the -# format modifier plane count feature. This API was initially introduced -# in mesa3d version 17. A gbm implementation provides this feature if it -# is implement function gbm_device_get_format_modifier_plane_count. - +# gbm implementations should select +# BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF if they provide the dma +# buffer feature. This API was initially introduced in mesa3d version +# 10. A gbm implementation provides this feature if it is implement +# function gbm_bo_get_fd. config BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF bool depends on BR2_PACKAGE_HAS_LIBGBM - -# gbm implementations should select this option if they provide the -# dma buffer feature. This API was initially introduced in mesa3d -# version 10. A gbm implementation provides this feature if it -# is implement function gbm_bo_get_fd. From thomas.petazzoni at bootlin.com Sat Jan 8 16:14:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 17:14:40 +0100 Subject: [Buildroot] [git commit] package/rockchip-mali: new package Message-ID: <20220108160854.25EB282E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97c74a73e5dee17530647f89b2c7d8692781eb14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There is already a package adding Mali blobs for Sunxi Mali Utgard GPUs. Many Rockchip SoCs feature a Mali Bifrost GPU and need specific libraries provided under binary form with a non-GPL compliant license by Rockchip. Package these libraries. While the repository at https://github.com/rockchip-linux/libmali supports many GPU variants, this package for now only supports the Bifrost GPU blob. Support for other GPU blobs can be added later. Signed-off-by: Maxime Chevallier Signed-off-by: Miquel Raynal [Thomas: - Rename to rockchip-mali, because it contains other blobs than Bifrost ones - Add missing entry in DEVELOPERS file - Change BR2_arm to BR2_ARM_EABIHF as only EABIhf blobs are provided for arm32 - Add BR2_TOOLCHAIN_HAS_THREADS inherited from libdrm. - Expose as a libgbm provider. - Drop the patch, which was not necessary. - Rework the entire installation logic, to be much simpler.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/rockchip-mali/Config.in | 31 +++++++++++++ package/rockchip-mali/rockchip-mali.hash | 2 + package/rockchip-mali/rockchip-mali.mk | 77 ++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 73664feb48..a64a9ef384 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2020,6 +2020,9 @@ F: package/libfribidi/ N: Min Xu F: package/shadowsocks-libev/ +N: Miqu??l Raynal +F: package/rockchip-mali/ + N: Mircea Gliga F: package/mbuffer/ diff --git a/package/Config.in b/package/Config.in index a555e6fd78..bf7a346f75 100644 --- a/package/Config.in +++ b/package/Config.in @@ -548,6 +548,7 @@ endmenu source "package/raspi-gpio/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" + source "package/rockchip-mali/Config.in" source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in new file mode 100644 index 0000000000..b2033652a8 --- /dev/null +++ b/package/rockchip-mali/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_ROCKCHIP_MALI + bool "rockchip-mali" + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_ARM_EABIHF || BR2_aarch64 + # lidbrm. This would normally need a Config.in comment, but + # these blobs are linked against glibc, so we are sure to have + # thread support, so don't bother. + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + select BR2_PACKAGE_LIBDRM + help + Install the binary user-space libraries for the ARM Mali GPU + suitable for Rockchip platforrms. This package requires a + kernel with the ARM Mali GPU kernel driver enabled, as found + in the 'mali-driver' package. + +if BR2_PACKAGE_ROCKCHIP_MALI + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "rockchip-mali" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "rockchip-mali" + +config BR2_PACKAGE_PROVIDES_LIBGBM + default "rockchip-mali" + +endif diff --git a/package/rockchip-mali/rockchip-mali.hash b/package/rockchip-mali/rockchip-mali.hash new file mode 100644 index 0000000000..38efcb3077 --- /dev/null +++ b/package/rockchip-mali/rockchip-mali.hash @@ -0,0 +1,2 @@ +sha256 ee440d859e9d7dfdf29b9a00c7a633337913c407be567d3651c29c12eb75fd9c rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427.tar.gz +sha256 a78acc73de9909efb879800d4daa4640c4aaa55cd751238a133954aba15e4285 END_USER_LICENCE_AGREEMENT.txt diff --git a/package/rockchip-mali/rockchip-mali.mk b/package/rockchip-mali/rockchip-mali.mk new file mode 100644 index 0000000000..6200191a73 --- /dev/null +++ b/package/rockchip-mali/rockchip-mali.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# rockchip-mali +# +################################################################################ + +ROCKCHIP_MALI_VERSION = 721653b5b3b525a4f80d15aa7e2f9df7b7e60427 +ROCKCHIP_MALI_SITE = $(call github,rockchip-linux,libmali,$(ROCKCHIP_MALI_VERSION)) +ROCKCHIP_MALI_LICENSE = Proprietary +ROCKCHIP_MALI_LICENSE_FILES = END_USER_LICENCE_AGREEMENT.txt +ROCKCHIP_MALI_INSTALL_STAGING = YES +ROCKCHIP_MALI_DEPENDENCIES = host-patchelf libdrm +ROCKCHIP_MALI_PROVIDES = libegl libgles libgbm + +ROCKCHIP_MALI_LIB = libmali-bifrost-g31-rxp0$(ROCKCHIP_MALI_SUFFIX).so +ROCKCHIP_MALI_PKGCONFIG_FILES = egl gbm glesv2 mali +ROCKCHIP_MALI_ARCH_DIR = $(if $(BR2_arm),arm-linux-gnueabihf,aarch64-linux-gnu) +ROCKCHIP_MALI_HEADERS = EGL FBDEV GLES GLES2 GLES3 KHR gbm.h + +# We need to create: +# - The symlink that matches the library SONAME (libmali.so.1) +# - The .so symlinks needed at compile time by the compiler (*.so) +ROCKCHIP_MALI_LIB_SYMLINKS = \ + libmali.so.1 \ + libMali.so \ + libEGL.so \ + libgbm.so \ + libGLESv1_CM.so \ + libGLESv2.so + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +ROCKCHIP_MALI_SUFFIX = -wayland-gbm +ROCKCHIP_MALI_PKGCONFIG_FILES += wayland-egl +ROCKCHIP_MALI_LIB_SYMLINKS += libwayland-egl.so +ROCKCHIP_MALI_DEPENDENCIES += wayland +else +ROCKCHIP_MALI_SUFFIX = -gbm +endif + +define ROCKCHIP_MALI_INSTALL_CMDS +# Install the library + $(INSTALL) -D -m 0755 \ + $(@D)/lib/$(ROCKCHIP_MALI_ARCH_DIR)/$(ROCKCHIP_MALI_LIB) \ + $(1)/usr/lib/$(ROCKCHIP_MALI_LIB) + +# Ensure it has a proper soname + $(HOST_DIR)/bin/patchelf --set-soname libmali.so.1 \ + $(1)/usr/lib/$(ROCKCHIP_MALI_LIB) + +# Generate and install the .pc files + mkdir -p $(1)/usr/lib/pkgconfig + $(foreach pkgconfig,$(ROCKCHIP_MALI_PKGCONFIG_FILES), \ + sed -e 's%@CMAKE_INSTALL_LIBDIR@%lib%;s%@CMAKE_INSTALL_INCLUDEDIR@%include%' \ + $(@D)/pkgconfig/$(pkgconfig).pc.cmake > \ + $(1)/usr/lib/pkgconfig/$(pkgconfig).pc + ) + +# Install all headers + $(foreach d,$(ROCKCHIP_MALI_HEADERS), \ + cp -dpfr $(@D)/include/$(d) $(1)/usr/include/ + ) + +# Create symlinks + $(foreach symlink,$(ROCKCHIP_MALI_LIB_SYMLINKS), \ + ln -sf $(ROCKCHIP_MALI_LIB) $(1)/usr/lib/$(symlink) + ) +endef + +define ROCKCHIP_MALI_INSTALL_TARGET_CMDS + $(call ROCKCHIP_MALI_INSTALL_CMDS,$(TARGET_DIR)) +endef + +define ROCKCHIP_MALI_INSTALL_STAGING_CMDS + $(call ROCKCHIP_MALI_INSTALL_CMDS,$(STAGING_DIR)) +endef + +$(eval $(generic-package)) From fontaine.fabrice at gmail.com Sat Jan 8 16:16:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:16:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libeastl: drop duplicated sentence Message-ID: <20220108161630.2730118-1-fontaine.fabrice@gmail.com> Drop duplicated sentence from Config.in Signed-off-by: Fabrice Fontaine --- package/libeastl/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 7609434519..5abea8f810 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help EASTL stands for Electronic Arts Standard Template - Library. EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is an extensive -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Jan 8 16:20:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 17:20:19 +0100 Subject: [Buildroot] [PATCH 3/7] package/rockchip-mali-bifrost: new package with binary blobs In-Reply-To: <20200306071440.30433-4-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-4-miquel.raynal@bootlin.com> Message-ID: <20220108172019.4cb27c8e@windsurf> On Fri, 6 Mar 2020 08:14:36 +0100 Miquel Raynal wrote: > From: Maxime Chevallier > > There is already a package adding Mali blobs for Sunxi Mali Utgard > GPUs. Many Rockchip SoCs feature a Mali Bifrost GPU and need specific > libraries provided under binary form with a non-GPL compliant license > by Rockchip. Package these libraries. > > Define a common *_INSTALL_CMDS macro, which takes as argument the base > destination path, and use it to implement *_INSTALL_TARGET_CMDS and > *_INSTALL_STAGING_CMDS. > > Signed-off-by: Maxime Chevallier > Signed-off-by: Miquel Raynal > --- > package/Config.in | 1 + > ...4-binaries-and-only-install-the-bifr.patch | 169 ++++++++++++++++++ > package/rockchip-mali-bifrost/Config.in | 20 +++ > .../rockchip-mali-bifrost.hash | 2 + > .../rockchip-mali-bifrost.mk | 85 +++++++++ > 5 files changed, 277 insertions(+) > create mode 100644 package/rockchip-mali-bifrost/0001-cmake-Use-AArch64-binaries-and-only-install-the-bifr.patch > create mode 100644 package/rockchip-mali-bifrost/Config.in > create mode 100644 package/rockchip-mali-bifrost/rockchip-mali-bifrost.hash > create mode 100644 package/rockchip-mali-bifrost/rockchip-mali-bifrost.mk Thanks for this patch, which we have finally applied! I did a large number of changes, almost rewriting it entirely: [Thomas: - Rename to rockchip-mali, because it contains other blobs than Bifrost ones - Add missing entry in DEVELOPERS file - Change BR2_arm to BR2_ARM_EABIHF as only EABIhf blobs are provided for arm32 - Add BR2_TOOLCHAIN_HAS_THREADS inherited from libdrm. - Expose as a libgbm provider. - Drop the patch, which was not necessary. - Rework the entire installation logic, to be much simpler.] Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sat Jan 8 16:21:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:21:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump to version 2021.07.01 Message-ID: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- package/raspberrypi-usbboot/raspberrypi-usbboot.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 3f66b12ff1..cedc5fb7e1 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz +sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 5d7b433c64..2e4194da0b 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,8 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) +RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 +RASPBERRYPI_USBBOOT_SITE = \ + $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Sat Jan 8 16:29:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 8 Jan 2022 17:29:49 +0100 Subject: [Buildroot] [PATCH v2] configs/olimex_a20_olinuxino: fix mali not working because Linux version >= 4.20 In-Reply-To: <20211018234037.3e1ec4cc@windsurf> References: <20211018214535.5743fd67@windsurf> <41CC9CB4-4706-4071-B3A4-3268638ADFC8@benettiengineering.com> <20211018234037.3e1ec4cc@windsurf> Message-ID: On 18/10/21 23:40, Thomas Petazzoni wrote: > On Mon, 18 Oct 2021 21:59:41 +0200 > Giulio Benetti wrote: > >> They instead enable specifically sunxi-mali-mainline* in lime and >> lime2 defconfigs. So at the moment sunxi-mali-mainline is built but >> it can?t work and it doesn?t make sense. Also up to Linux 4.20 this >> neither worked because of lack of double buffer. So basically here >> sunxi-mali-mainline I?m pretty sure never worked. > > Aah, I hadn't realized/verified that they enabled sunxi-mali-mainline*. > In this case, obviously your patch makes sense. I've switched it back > to "New" in patchwork. > > Thanks for the additional explanation! > > Thomas > Ping. This is still needed for having Mali working with other applied patches: https://patchwork.ozlabs.org/project/buildroot/list/?series=270656&state=* -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sat Jan 8 16:46:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:46:46 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig Message-ID: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> .defconfig has not been updated since 2016 with commit 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't seem to be used Signed-off-by: Fabrice Fontaine --- .defconfig | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 .defconfig diff --git a/.defconfig b/.defconfig deleted file mode 100644 index 7ab0c3fbf0..0000000000 --- a/.defconfig +++ /dev/null @@ -1,51 +0,0 @@ -# -# Automatically generated make config: don't edit -# Mon Feb 18 09:11:56 2008 -# -BR2_HAVE_DOT_CONFIG=y -# BR2_alpha is not set -# BR2_arm is not set -# BR2_armeb is not set -# BR2_cris is not set -# BR2_ia64 is not set -BR2_i386=y -# BR2_m68k is not set -# BR2_mips is not set -# BR2_mipsel is not set -# BR2_nios2 is not set -# BR2_powerpc is not set -# BR2_sh is not set -# BR2_sparc is not set -# BR2_sparc64 is not set -# BR2_x86_64 is not set -# BR2_x86_i486 is not set -# BR2_x86_i586 is not set -BR2_x86_i686=y -# BR2_x86_pentiumpro is not set -# BR2_x86_pentium_mmx is not set -# BR2_x86_pentium_m is not set -# BR2_x86_pentium2 is not set -# BR2_x86_pentium3 is not set -# BR2_x86_pentium4 is not set -# BR2_x86_prescott is not set -# BR2_x86_nocona is not set -# BR2_x86_core2 is not set -# BR2_x86_k6 is not set -# BR2_x86_k6_2 is not set -# BR2_x86_athlon is not set -# BR2_x86_athlon_4 is not set -# BR2_x86_opteron is not set -# BR2_x86_opteron_sse3 is not set -# BR2_x86_barcelona is not set -# BR2_x86_geode is not set -# BR2_x86_c3 is not set -# BR2_x86_winchip_c6 is not set -# BR2_x86_winchip2 is not set -BR2_ARCH="i686" -BR2_ENDIAN="LITTLE" -BR2_GCC_TARGET_TUNE="i686" -BR2_GCC_TARGET_ARCH="i686" - -# -# Target options -# -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 16:50:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:50:03 +0100 Subject: [Buildroot] [PATCH 1/3] package/libpri: add Linux in comment Message-ID: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine --- package/libpri/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpri/Config.in b/package/libpri/Config.in index de2d96fcc4..0684d2ac83 100644 --- a/package/libpri/Config.in +++ b/package/libpri/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI http://www.asterisk.org/downloads/libpri -comment "libpri needs a kernel to be built" +comment "libpri needs a Linux kernel to be built" depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 16:50:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:50:04 +0100 Subject: [Buildroot] [PATCH 2/3] package/libss7: add Linux in comment In-Reply-To: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> References: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> Message-ID: <20220108165005.2737902-2-fontaine.fabrice@gmail.com> Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine --- package/libss7/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index bdf5fbe3a8..d8bcf11ce7 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBSS7 http://www.asterisk.org/downloads/libss7 -comment "libss7 needs a kernel to be built" +comment "libss7 needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL comment "libss7 needs a toolchain w/ threads" -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 16:50:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 17:50:05 +0100 Subject: [Buildroot] [PATCH 3/3] package/nvidia-driver: add Linux in comment In-Reply-To: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> References: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> Message-ID: <20220108165005.2737902-3-fontaine.fabrice@gmail.com> Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine --- package/nvidia-driver/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 9631b3e70c..a8617a939b 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -75,7 +75,7 @@ config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA -comment "nvidia kernel module needs a kernel to be built" +comment "nvidia kernel module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_NVIDIA_DRIVER_MODULE -- 2.34.1 From arnout at mind.be Sat Jan 8 16:51:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:51:24 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: drop host variant Message-ID: <20220108164622.91FA78324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9bf97cf16fa6945466a6712028c9a74104ff426 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The host variant was only needed by ca-certificates, which no longer needs it, so drop this variant. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-cryptography/python-cryptography.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 081dfc06a0..9c00efb44f 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -13,11 +13,5 @@ PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl -HOST_PYTHON_CRYPTOGRAPHY_NEEDS_HOST_PYTHON = python3 -HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ - host-python3-cffi \ - host-python3-six \ - host-openssl $(eval $(python-package)) -$(eval $(host-python-package)) From arnout at mind.be Sat Jan 8 16:51:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:51:24 +0100 Subject: [Buildroot] [git commit] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 Message-ID: <20220108164622.9ABE7832B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ed4147e76fe56322c47468be8a222204c459adf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for BR2_ARM_CPU_ARMV7A, but it also needs a special value for BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for ARMv5TE is identified with the "armv5te" architecture name, see https://doc.rust-lang.org/nightly/rustc/platform-support.html. We noticed this because Rust binaries wouldn't work on an ARMv5 platform (Illegal instruction). This was due to the usage of the arm-unknown-linux-gnueabi variant of the Rust standard library, which is for ARMv6. Thanks to this commit, we correctly use the armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly on ARMv5TE. A better approach would be to do the conversion from architecture options to Rust tuples in a single string symbol that also defines the supported architectures, similar to how it's done in e.g. openblas. However, that's a much bigger change. So for now, just do the easy thing and fix this one issue. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 90ea56f626..fe7404b3bd 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -102,8 +102,9 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH string + default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A - default BR2_ARCH if !BR2_ARM_CPU_ARMV7A + default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI string From arnout at mind.be Sat Jan 8 16:51:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:51:24 +0100 Subject: [Buildroot] [git commit] package/rustc: fix the riscv64gc architecture handling Message-ID: <20220108164622.A463581DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79c5639597e961a36ee10e55b0479e642013448f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true when BR2_riscv is true. Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to allow rust-bin to download its pre-compiled standard library correctly. Signed-off-by: Thomas Petazzoni Reviewed-by: Alistair Francis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index fe7404b3bd..80d1d1a3d8 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -49,7 +49,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC # riscv64gc-unknown-linux-gnu # "g" stands for imafd, and we also need "c". - default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ + default y if BR2_RISCV_64 && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ BR2_TOOLCHAIN_USES_GLIBC @@ -104,6 +104,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH string default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A + default "riscv64gc" if BR2_RISCV_64 default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI From arnout at mind.be Sat Jan 8 16:51:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:51:24 +0100 Subject: [Buildroot] [git commit] package/ca-certificates: remove dependency on host-python-cryptography Message-ID: <20220108164622.89A0281DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=363dd649f31c7e7732f3cd509d43cebbb53e51ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The host-python-cryptography module is only used by ca-certificates for a check of the expiration date of certificates, which is only a warning not even causing the build to abort, i.e something that Buildroot users are most likely never going to see. Since the host-python-cryptography dependency would soon require a dependency on rust, it's a lot simpler to just patch the certdata2pem.py script to no longer require cryptography, but only make use of it if available. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...tdata2pem.py-make-cryptography-module-opt.patch | 59 ++++++++++++++++++++++ package/ca-certificates/ca-certificates.mk | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch new file mode 100644 index 0000000000..b76c1bfd7f --- /dev/null +++ b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch @@ -0,0 +1,59 @@ +From bf18b564122e8f976681a2398862fde1eafd84ba Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 6 Jan 2022 23:15:00 +0100 +Subject: [PATCH] mozilla/certdata2pem.py: make cryptography module optional + +The Python cryptography module is only used to verify if trusted +certificates have expired, but this is only a warning. For some build +systems and distributions, providing Python cryptography is costly, +especially since it's now partly written in Rust. + +As the check is only a warning, it's anyway going to be overlooked by +most people. This commit changes the check to be optional: if the +cryptography Python module is there, we perform the check, otherwise +the check is skipped. + +Signed-off-by: Thomas Petazzoni +--- + mozilla/certdata2pem.py | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index ede23d4..a6261f8 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -28,9 +28,6 @@ import sys + import textwrap + import io + +-from cryptography import x509 +- +- + objects = [] + + # Dirty file parser. +@@ -122,11 +119,16 @@ for obj in objects: + if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: + continue + +- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) +- if cert.not_valid_after < datetime.datetime.now(): +- print('!'*74) +- print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) +- print('!'*74) ++ try: ++ from cryptography import x509 ++ ++ cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) ++ if cert.not_valid_after < datetime.datetime.now(): ++ print('!'*74) ++ print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) ++ print('!'*74) ++ except ImportError: ++ pass + + bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ + .replace(' ', '_')\ +-- +2.33.1 + diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 7084ab781e..0b6962ab7b 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -7,7 +7,7 @@ CA_CERTIFICATES_VERSION = 20211016 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates -CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 host-python-cryptography +CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright From arnout at mind.be Sat Jan 8 16:52:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 17:52:40 +0100 Subject: [Buildroot] [PATCH 0/7] Bump of python-cryptography and other Rust related fun In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <6147f82e-21fa-ad1e-5c89-96e1844c621e@mind.be> On 07/01/2022 18:13, Thomas Petazzoni wrote: > Hello, > > This series bumps the python-cryptography package to a new version. It > is based on earlier work from James Hilliard at: > > https://patchwork.ozlabs.org/project/buildroot/patch/20210318044253.3202355-2-james.hilliard1 at gmail.com/ > > But it did require quite some more work, which is presented in this > patch series. > > The unique challenge caused by this version bump is that > python-cryptography now has some Rust code integrated, so suddenly > this package, and all its reverse dependencies need to depend on Rust > being available. > > There is also a host variant of python-cryptography, which is used > solely by ca-certificates, which has a significant number of reverse > dependencies. To avoid adding Rust dependencies to these, we broke the > dependency of ca-certificates on host-python-cryptography using a > simple patch, and dropped host-python-cryptography altogether. > > This patch series depends on the "Go/Cargo vendoring" patch series > posted recently. Indeed, the Rust code in python-cryptography depends > on other Cargo crates, which we don't want to download during the > build, but really during the download step. > > There is however still one problem with the last patch of the series, > see below. > > This series is available at: > > https://github.com/tpetazzoni/buildroot/tree/python-cryptography > > The patch series goes like this: > > - PATCH 1 modifies ca-certificates to no longer need > host-python-cryptography > > - PATCH 2 drops host-python-cryptography itselef > > - PATCH 3 and 4 fix some issues in package/rustc/ in the description > of the ARMv5 and RISC-V 64-bit Rust support. We noticed this > because Rust binaries were not working on ARMv5 ("Illegal > instruction"), this was due to the fact that we were using the > pre-compiled Rust standard library for ARMv6, due to a bogus > architecture name. This is fixed by PATCH 3. And while reviewing > this, we spotted a similar issue for RISC-V 64-bit, which is fixed > in PATCH 4. First four patches applied to master, with the fixup that you mentioned on patch 3. Regards, Arnout > > - PATCH 5 slightly improves the Cargo download post-process script to > make it possible to pass a custom path to the Cargo.toml file, > instead of assuming it's located at the root of the package source > tree. > > - PATCH 6 modifies the runtime test cases that involve > python-cryptography directly or indirectly to use a glibc toolchain > instead of the default uclibc toolchain. Indeed, Rust is for now > not available on uClibc platforms. This could have been done in the > patch doing the version bump, but the version bump patch is already > quite large, and the update of the runtime tests could be done as a > separate preparation step. > > - PATCH 7 finally bumps python-cryptography > itself. python-cryptography itself requires a bit of trickery to > leverage the Cargo download post-process logic, to vendor > dependencies during the download step. Then the patch also touches > the entire reverse dependency tree (sometimes up to 5 levels > deep!). This patch should NOT be applied for now, due to issues > (see below). > > This series was tested by building the following configuration: > > BR2_arm=y > BR2_cortex_a9=y > BR2_ARM_ENABLE_VFP=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_PYTHON_CHANNELS_REDIS=y > BR2_PACKAGE_PYTHON_CROSSBAR=y > BR2_PACKAGE_PYTHON_KEYRING=y > BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO=y > BR2_PACKAGE_PYTHON_TXDBUS=y > BR2_PACKAGE_DOCKER_COMPOSE=y > # BR2_TARGET_ROOTFS_TAR is not set > > that builds all affected packages. > > It was also tested by running all Python runtime test cases: > > https://gitlab.com/tpetazzoni/buildroot/-/pipelines/443445436 > > The one thing that fails is when building python-cryptography on a > target arch that is the same as the host. This can be reproduced by > running the tests.package.test_docker_compose.TestDockerCompose test > case. > > We get this: > > Running `/home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build` > error: failed to run custom build command for `proc-macro-hack v0.5.19` > > Caused by: > process didn't exit successfully: `/home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build` (exi > t status: 1) > --- stderr > /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio > n `GLIBC_2.33' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) > /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio > n `GLIBC_2.32' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) > /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: versio > n `GLIBC_2.34' not found (required by /home/thomas/buildroot/buildroot/output/build/python-cryptography-36.0.1/src/rust/target/release/build/proc-macro-hack-f35f1313688107b0/build-script-build) > warning: build failed, waiting for other jobs to finish... > error: build failed > > Which looks terribly similar to the issue on ripgrep which was fixed > by commit 4b2be770b8a853a7dd97b5788d837f0d84923fa1. So I tried doing > the same, i.e passing: > > __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ > CARGO_TARGET_APPLIES_TO_HOST="false" > > in the environment, and -Z target-applies-to-host to cargo (by passing > it to the args argument of the RustExtension class in > python-cryptography's setup.py). But cargo doesn't like that, the > build log goes like this: > >>>> python-cryptography 36.0.1 BuildingESC[27m > ... calling setup.py ... > cargo rustc --lib --manifest-path src/rust/Cargo.toml --features pyo3/abi3-py36 pyo3/extension-module --target x86_64-unknown-linux-gnu -Z target-applies-to-host --release --verbose -- --crate-type cdylib > ... > error: unknown `-Z` flag specified: target-applies-to-host > > The difference that I see with the cargo infrastructure is that this > is not using "cargo build" but "cargo rustc". I would really > appreciate some help on solving this (last?) issue. > > Best regards, > > Thomas Petazzoni > > > Thomas Petazzoni (7): > package/ca-certificates: remove dependency on host-python-cryptography > package/python-cryptography: drop host variant > package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 > package/rustc: fix the riscv64gc architecture handling > support/download/cargo-post-process: make manifest path configurable > support/testing/tests: switch python-cryptography related tests to > glibc > DO-NOT-APPLY package/python-cryptography: bump version to 36.0.1 > > ...2pem.py-make-cryptography-module-opt.patch | 59 +++++++++++++++++++ > package/ca-certificates/ca-certificates.mk | 2 +- > package/docker-compose/Config.in | 8 ++- > package/python-autobahn/Config.in | 6 +- > package/python-channels-redis/Config.in | 7 +-- > package/python-channels/Config.in | 7 +-- > package/python-crossbar/Config.in | 6 +- > package/python-cryptography/Config.in | 14 +---- > .../python-cryptography.hash | 5 +- > .../python-cryptography.mk | 20 ++++--- > package/python-daphne/Config.in | 7 +-- > package/python-keyring/Config.in | 7 +-- > package/python-opcua-asyncio/Config.in | 1 + > package/python-paramiko/Config.in | 8 +-- > package/python-pyopenssl/Config.in | 8 +-- > package/python-secretstorage/Config.in | 6 +- > package/python-service-identity/Config.in | 10 ++-- > package/python-treq/Config.in | 10 ++-- > package/python-twisted/Config.in | 6 +- > package/python-txdbus/Config.in | 5 +- > package/python-txtorcon/Config.in | 7 +-- > package/rustc/Config.in.host | 4 +- > support/download/cargo-post-process | 2 +- > .../tests/package/test_python_autobahn.py | 10 +++- > .../tests/package/test_python_crossbar.py | 10 +++- > .../tests/package/test_python_cryptography.py | 10 +++- > .../package/test_python_service_identity.py | 10 +++- > .../testing/tests/package/test_python_treq.py | 10 +++- > .../tests/package/test_python_txtorcon.py | 10 +++- > 29 files changed, 170 insertions(+), 105 deletions(-) > create mode 100644 package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch > From peter at korsgaard.com Sat Jan 8 16:54:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 17:54:13 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: (Fabrice Fontaine's message of "Sat, 8 Jan 2022 16:03:49 +0100") References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> Message-ID: <87zgo6f9sa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Hi, > Le sam. 8 janv. 2022 ? 15:14, Peter Korsgaard a ?crit : >> >> >>>>> "Fabrice" == Fabrice Fontaine writes: >> >> Hi, >> >> > Indeed, this is also an alternative, even if I think that adding >> > mbedtls3 would be a great addition. >> > For example, libcurl supports mbedts 3.0 since its version 7.79 and >> > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. >> > Otherwise, as requested by Thomas, I sent an email to mbedtls mailing >> > list: >> > https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ >> >> What is the plan from upstream regarding mbedtls 2.x? Will it be >> maintained in parallel with 3.x for some time (and for how long?) or is >> it effectively EOL already? > 2.16.x is EOL since December 2021: > https://tls.mbed.org/tech-updates/blog/announcing-lts-branch-mbedtls-2.16 > The next LTS branch is 2.28 which will be maintained until end of > 2024: https://github.com/ARMmbed/mbedtls/blob/development/BRANCHES.md Ok, so we should ideally move our mbedtls version to 2.28.x before 2022.02. What about 3.x, is that also a LTS or is that considered a not-yet-stable development version? For the question if we need to maintain both 2.28.x and 3.x in parallel I guess it really depends on if the packages we have depending on mbedtls (E.G. bctoolbox, bmx7, mongrel2, shadowsocks-libev) can (be patched to) work with mbedtls 3.x or not? If they can (or are no longer maintained upstream), then I would prefer to only support mbedtls 3.x going forward. If on the other hand mbedtls 3.x isn't really stable yet and only needed for hiawatha, then indeed we should perhaps just postpone it a bit and use the internal mbedtls copy in hiawatha or downgrade / drop TLS support. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 16:57:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 17:57:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libldns: bump version to 1.8.1 In-Reply-To: <20220108095451.1078507-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 10:54:51 +0100") References: <20220108095451.1078507-1-bernd.kuhls@t-online.de> Message-ID: <87v8yuf9n0.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Reformatted hashes. > Changelog: https://github.com/NLnetLabs/ldns/blob/develop/Changelog > Signed-off-by: Bernd Kuhls Do you use libldns? I notice we have a comment in the .mk file: # --disable-dane-verify can be removed after openssl bump to 1.1.x Which sounds like something that could be updated? Please verify that it also works with libressl. -- Bye, Peter Korsgaard From arnout at mind.be Sat Jan 8 16:59:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 17:59:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-memory-profiler: new package In-Reply-To: <20201024145750.267540-1-asafka7@gmail.com> References: <20201024145750.267540-1-asafka7@gmail.com> Message-ID: <5bd067df-5e7b-1248-7dad-bf790a57ee68@mind.be> On 24/10/2020 16:57, Asaf Kahlon wrote: > A module for monitoring memory usage of a python program. > > Signed-off-by: Asaf Kahlon A bit late, but: applied to master, thanks. Sorry it took so long. Regards, Arnout > --- > package/Config.in | 1 + > package/python-memory-profiler/Config.in | 8 ++++++++ > .../python-memory-profiler.hash | 5 +++++ > .../python-memory-profiler.mk | 14 ++++++++++++++ > 4 files changed, 28 insertions(+) > create mode 100644 package/python-memory-profiler/Config.in > create mode 100644 package/python-memory-profiler/python-memory-profiler.hash > create mode 100644 package/python-memory-profiler/python-memory-profiler.mk > > diff --git a/package/Config.in b/package/Config.in > index 504cfec98e..4da49ad179 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1037,6 +1037,7 @@ menu "External python modules" > source "package/python-matplotlib/Config.in" > source "package/python-mbstrdecoder/Config.in" > source "package/python-meld3/Config.in" > + source "package/python-memory-profiler/Config.in" > source "package/python-mimeparse/Config.in" > source "package/python-mistune/Config.in" > source "package/python-modbus-tk/Config.in" > diff --git a/package/python-memory-profiler/Config.in b/package/python-memory-profiler/Config.in > new file mode 100644 > index 0000000000..60833304ae > --- /dev/null > +++ b/package/python-memory-profiler/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_PYTHON_MEMORY_PROFILER > + bool "python-memory-profiler" > + depends on BR2_PACKAGE_PYTHON3 > + select BR2_PACKAGE_PYTHON_PSUTIL # runtime > + help > + A module for monitoring memory usage of a python program. > + > + https://github.com/pythonprofilers/memory_profiler > diff --git a/package/python-memory-profiler/python-memory-profiler.hash b/package/python-memory-profiler/python-memory-profiler.hash > new file mode 100644 > index 0000000000..9ee515b529 > --- /dev/null > +++ b/package/python-memory-profiler/python-memory-profiler.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/memory-profiler/json > +md5 b1d1783064a1198fb21bc877e535ec1b memory_profiler-0.58.0.tar.gz > +sha256 01385ac0fec944fcf7969814ec4406c6d8a9c66c079d09276723c5a7680f44e5 memory_profiler-0.58.0.tar.gz > +# Locally computed sha256 checksums > +sha256 51926ce91b8283532efa9dfb02518582c15f49c105a3ac18cce1f7a4947e96ae COPYING > diff --git a/package/python-memory-profiler/python-memory-profiler.mk b/package/python-memory-profiler/python-memory-profiler.mk > new file mode 100644 > index 0000000000..053b0e2d62 > --- /dev/null > +++ b/package/python-memory-profiler/python-memory-profiler.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-memory-profiler > +# > +################################################################################ > + > +PYTHON_MEMORY_PROFILER_VERSION = 0.58.0 > +PYTHON_MEMORY_PROFILER_SOURCE = memory_profiler-$(PYTHON_MEMORY_PROFILER_VERSION).tar.gz > +PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/8f/fd/d92b3295657f8837e0177e7b48b32d6651436f0293af42b76d134c3bb489 > +PYTHON_MEMORY_PROFILER_SETUP_TYPE = setuptools > +PYTHON_MEMORY_PROFILER_LICENSE = BSD-3-Clause > +PYTHON_MEMORY_PROFILER_LICENSE_FILES = COPYING > + > +$(eval $(python-package)) > From arnout at mind.be Sat Jan 8 16:57:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 17:57:46 +0100 Subject: [Buildroot] [git commit] package/python-memory-profiler: new package Message-ID: <20220108165256.77BE482DF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c17a9b2de86ace9754ca874707736705865dd309 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A module for monitoring memory usage of a python program. Signed-off-by: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/python-memory-profiler/Config.in | 8 ++++++++ package/python-memory-profiler/python-memory-profiler.hash | 5 +++++ package/python-memory-profiler/python-memory-profiler.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/package/Config.in b/package/Config.in index bf7a346f75..bf18d5f4fb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1090,6 +1090,7 @@ menu "External python modules" source "package/python-markupsafe/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" + source "package/python-memory-profiler/Config.in" source "package/python-mimeparse/Config.in" source "package/python-mistune/Config.in" source "package/python-modbus-tk/Config.in" diff --git a/package/python-memory-profiler/Config.in b/package/python-memory-profiler/Config.in new file mode 100644 index 0000000000..60833304ae --- /dev/null +++ b/package/python-memory-profiler/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MEMORY_PROFILER + bool "python-memory-profiler" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PSUTIL # runtime + help + A module for monitoring memory usage of a python program. + + https://github.com/pythonprofilers/memory_profiler diff --git a/package/python-memory-profiler/python-memory-profiler.hash b/package/python-memory-profiler/python-memory-profiler.hash new file mode 100644 index 0000000000..9ee515b529 --- /dev/null +++ b/package/python-memory-profiler/python-memory-profiler.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/memory-profiler/json +md5 b1d1783064a1198fb21bc877e535ec1b memory_profiler-0.58.0.tar.gz +sha256 01385ac0fec944fcf7969814ec4406c6d8a9c66c079d09276723c5a7680f44e5 memory_profiler-0.58.0.tar.gz +# Locally computed sha256 checksums +sha256 51926ce91b8283532efa9dfb02518582c15f49c105a3ac18cce1f7a4947e96ae COPYING diff --git a/package/python-memory-profiler/python-memory-profiler.mk b/package/python-memory-profiler/python-memory-profiler.mk new file mode 100644 index 0000000000..053b0e2d62 --- /dev/null +++ b/package/python-memory-profiler/python-memory-profiler.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-memory-profiler +# +################################################################################ + +PYTHON_MEMORY_PROFILER_VERSION = 0.58.0 +PYTHON_MEMORY_PROFILER_SOURCE = memory_profiler-$(PYTHON_MEMORY_PROFILER_VERSION).tar.gz +PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/8f/fd/d92b3295657f8837e0177e7b48b32d6651436f0293af42b76d134c3bb489 +PYTHON_MEMORY_PROFILER_SETUP_TYPE = setuptools +PYTHON_MEMORY_PROFILER_LICENSE = BSD-3-Clause +PYTHON_MEMORY_PROFILER_LICENSE_FILES = COPYING + +$(eval $(python-package)) From arnout at mind.be Sat Jan 8 17:04:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 18:04:40 +0100 Subject: [Buildroot] [PATCH] package/lua-inotify: new package In-Reply-To: <20200518052345.1721724-1-francois.perrad@gadz.org> References: <20200518052345.1721724-1-francois.perrad@gadz.org> Message-ID: On 18/05/2020 07:23, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Sorry it took so long. I also added you to DEVELOPERS for this package. Regards, Arnout > --- > .gitlab-ci.yml | 2 ++ > package/Config.in | 1 + > package/lua-inotify/Config.in | 6 +++++ > package/lua-inotify/lua-inotify.hash | 3 +++ > package/lua-inotify/lua-inotify.mk | 14 +++++++++++ > .../testing/tests/package/test_lua_inotify.py | 25 +++++++++++++++++++ > 6 files changed, 51 insertions(+) > create mode 100644 package/lua-inotify/Config.in > create mode 100644 package/lua-inotify/lua-inotify.hash > create mode 100644 package/lua-inotify/lua-inotify.mk > create mode 100644 support/testing/tests/package/test_lua_inotify.py > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index fa8e077a0..85dadd00d 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -421,6 +421,8 @@ tests.package.test_lua_gd.TestLuaLuaGD: { extends: .runtime_test } > tests.package.test_lua_gd.TestLuajitLuaGD: { extends: .runtime_test } > tests.package.test_lua_http.TestLuaHttp: { extends: .runtime_test } > tests.package.test_lua_http.TestLuajitHttp: { extends: .runtime_test } > +tests.package.test_lua_inotify.TestLuaInotify: { extends: .runtime_test } > +tests.package.test_lua_inotify.TestLuajitInotify: { extends: .runtime_test } > tests.package.test_lua_lyaml.TestLuaLuaLyaml: { extends: .runtime_test } > tests.package.test_lua_lyaml.TestLuajitLuaLyaml: { extends: .runtime_test } > tests.package.test_lua_sdl2.TestLuaLuaSDL2: { extends: .runtime_test } > diff --git a/package/Config.in b/package/Config.in > index c12676d85..191eea859 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -653,6 +653,7 @@ menu "Lua libraries/modules" > source "package/lua-gd/Config.in" > source "package/lua-http/Config.in" > source "package/lua-iconv/Config.in" > + source "package/lua-inotify/Config.in" > source "package/lua-livr/Config.in" > source "package/lua-livr-extra/Config.in" > source "package/lua-lpeg-patterns/Config.in" > diff --git a/package/lua-inotify/Config.in b/package/lua-inotify/Config.in > new file mode 100644 > index 000000000..2b0c943c6 > --- /dev/null > +++ b/package/lua-inotify/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_LUA_INOTIFY > + bool "lua-inotify" > + help > + Inotify bindings for Lua. > + > + http://hoelz.ro/projects/linotify > diff --git a/package/lua-inotify/lua-inotify.hash b/package/lua-inotify/lua-inotify.hash > new file mode 100644 > index 000000000..183638954 > --- /dev/null > +++ b/package/lua-inotify/lua-inotify.hash > @@ -0,0 +1,3 @@ > +# computed by luarocks/buildroot > +sha256 9164b5777b132d7e1e073478d8837a526262991c57e32d75d517100f533eb436 inotify-0.5-1.src.rock > +sha256 b02158adb3c7763e1183a9386672f4f037bfeaab0cb0c73d684f34f3ea1993d8 linotify-0.5/COPYRIGHT > diff --git a/package/lua-inotify/lua-inotify.mk b/package/lua-inotify/lua-inotify.mk > new file mode 100644 > index 000000000..dde7fc0fa > --- /dev/null > +++ b/package/lua-inotify/lua-inotify.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# lua-inotify > +# > +################################################################################ > + > +LUA_INOTIFY_VERSION_UPSTREAM = 0.5 > +LUA_INOTIFY_VERSION = $(LUA_INOTIFY_VERSION_UPSTREAM)-1 > +LUA_INOTIFY_NAME_UPSTREAM = inotify > +LUA_INOTIFY_SUBDIR = linotify-$(LUA_INOTIFY_VERSION_UPSTREAM) > +LUA_INOTIFY_LICENSE = MIT > +LUA_INOTIFY_LICENSE_FILES = $(LUA_INOTIFY_SUBDIR)/COPYRIGHT > + > +$(eval $(luarocks-package)) > diff --git a/support/testing/tests/package/test_lua_inotify.py b/support/testing/tests/package/test_lua_inotify.py > new file mode 100644 > index 000000000..c951a9c5d > --- /dev/null > +++ b/support/testing/tests/package/test_lua_inotify.py > @@ -0,0 +1,25 @@ > +from tests.package.test_lua import TestLuaBase > + > + > +class TestLuaInotify(TestLuaBase): > + config = TestLuaBase.config + \ > + """ > + BR2_PACKAGE_LUA=y > + BR2_PACKAGE_LUA_INOTIFY=y > + """ > + > + def test_run(self): > + self.login() > + self.module_test("inotify") > + > + > +class TestLuajitInotify(TestLuaBase): > + config = TestLuaBase.config + \ > + """ > + BR2_PACKAGE_LUAJIT=y > + BR2_PACKAGE_LUA_INOTIFY=y > + """ > + > + def test_run(self): > + self.login() > + self.module_test("inotify") > From arnout at mind.be Sat Jan 8 17:03:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 18:03:59 +0100 Subject: [Buildroot] [git commit] package/lua-inotify: new package Message-ID: <20220108165832.A627B82A9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e39379ff595d189c714bb758f5da1a0882fa1a2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/lua-inotify/Config.in | 6 ++++++ package/lua-inotify/lua-inotify.hash | 3 +++ package/lua-inotify/lua-inotify.mk | 14 +++++++++++++ support/testing/tests/package/test_lua_inotify.py | 25 +++++++++++++++++++++++ 6 files changed, 50 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a64a9ef384..eb605b9170 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -983,6 +983,7 @@ F: package/libtommath/ F: package/libwpe/ F: package/linenoise/ F: package/ljlinenoise/ +F: package/lua-inotify/ F: package/lpeg/ F: package/lpty/ F: package/lrandom/ diff --git a/package/Config.in b/package/Config.in index bf18d5f4fb..3b1c38db47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -685,6 +685,7 @@ menu "Lua libraries/modules" source "package/lua-gd/Config.in" source "package/lua-http/Config.in" source "package/lua-iconv/Config.in" + source "package/lua-inotify/Config.in" source "package/lua-livr/Config.in" source "package/lua-livr-extra/Config.in" source "package/lua-lpeg-patterns/Config.in" diff --git a/package/lua-inotify/Config.in b/package/lua-inotify/Config.in new file mode 100644 index 0000000000..2b0c943c60 --- /dev/null +++ b/package/lua-inotify/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_INOTIFY + bool "lua-inotify" + help + Inotify bindings for Lua. + + http://hoelz.ro/projects/linotify diff --git a/package/lua-inotify/lua-inotify.hash b/package/lua-inotify/lua-inotify.hash new file mode 100644 index 0000000000..183638954c --- /dev/null +++ b/package/lua-inotify/lua-inotify.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 9164b5777b132d7e1e073478d8837a526262991c57e32d75d517100f533eb436 inotify-0.5-1.src.rock +sha256 b02158adb3c7763e1183a9386672f4f037bfeaab0cb0c73d684f34f3ea1993d8 linotify-0.5/COPYRIGHT diff --git a/package/lua-inotify/lua-inotify.mk b/package/lua-inotify/lua-inotify.mk new file mode 100644 index 0000000000..dde7fc0fa4 --- /dev/null +++ b/package/lua-inotify/lua-inotify.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# lua-inotify +# +################################################################################ + +LUA_INOTIFY_VERSION_UPSTREAM = 0.5 +LUA_INOTIFY_VERSION = $(LUA_INOTIFY_VERSION_UPSTREAM)-1 +LUA_INOTIFY_NAME_UPSTREAM = inotify +LUA_INOTIFY_SUBDIR = linotify-$(LUA_INOTIFY_VERSION_UPSTREAM) +LUA_INOTIFY_LICENSE = MIT +LUA_INOTIFY_LICENSE_FILES = $(LUA_INOTIFY_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/support/testing/tests/package/test_lua_inotify.py b/support/testing/tests/package/test_lua_inotify.py new file mode 100644 index 0000000000..c951a9c5d6 --- /dev/null +++ b/support/testing/tests/package/test_lua_inotify.py @@ -0,0 +1,25 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaInotify(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_INOTIFY=y + """ + + def test_run(self): + self.login() + self.module_test("inotify") + + +class TestLuajitInotify(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_LUA_INOTIFY=y + """ + + def test_run(self): + self.login() + self.module_test("inotify") From fontaine.fabrice at gmail.com Sat Jan 8 17:15:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:15:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: <87zgo6f9sa.fsf@dell.be.48ers.dk> References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> <87zgo6f9sa.fsf@dell.be.48ers.dk> Message-ID: Le sam. 8 janv. 2022 ? 17:54, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > > Hi, > > Le sam. 8 janv. 2022 ? 15:14, Peter Korsgaard a ?crit : > >> > >> >>>>> "Fabrice" == Fabrice Fontaine writes: > >> > >> Hi, > >> > >> > Indeed, this is also an alternative, even if I think that adding > >> > mbedtls3 would be a great addition. > >> > For example, libcurl supports mbedts 3.0 since its version 7.79 and > >> > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad. > >> > Otherwise, as requested by Thomas, I sent an email to mbedtls mailing > >> > list: > >> > https://lists.trustedfirmware.org/archives/list/mbed-tls at lists.trustedfirmware.org/thread/HEHCNQZTBOZV56RTGRTGSQQRMEWYJPGI/ > >> > >> What is the plan from upstream regarding mbedtls 2.x? Will it be > >> maintained in parallel with 3.x for some time (and for how long?) or is > >> it effectively EOL already? > > 2.16.x is EOL since December 2021: > > https://tls.mbed.org/tech-updates/blog/announcing-lts-branch-mbedtls-2.16 > > The next LTS branch is 2.28 which will be maintained until end of > > 2024: https://github.com/ARMmbed/mbedtls/blob/development/BRANCHES.md > > Ok, so we should ideally move our mbedtls version to 2.28.x before > 2022.02. What about 3.x, is that also a LTS or is that considered a > not-yet-stable development version? > > For the question if we need to maintain both 2.28.x and 3.x in > parallel I guess it really depends on if the packages we have depending > on mbedtls (E.G. bctoolbox, bmx7, mongrel2, shadowsocks-libev) can (be > patched to) work with mbedtls 3.x or not? It is really unlikely that all these packages will be patched to work with mbedtls 3.x. To my knowledge, only hiawatha and curl have been patched to support mbedtls 3.x. and it should be noted that curl supports mbedtls 2.x and 3.x: https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad lighttpd is trying to migrate but has a lot of issues: https://github.com/ARMmbed/mbedtls/issues/5331 > > If they can (or are no longer maintained upstream), then I would prefer > to only support mbedtls 3.x going forward. If on the other hand mbedtls > 3.x isn't really stable yet and only needed for hiawatha, then indeed we > should perhaps just postpone it a bit and use the internal mbedtls copy > in hiawatha or downgrade / drop TLS support. 3.x is more "secure" because many obsolete cryptographic mechanisms and TLS protocol versions and options have been removed. However, it is probably ok to postpone the addition of mbedtls 3.x until more packages support it. It should be noted that we'll have the same issue/question with openssl 3.x ... > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From peter at korsgaard.com Sat Jan 8 17:26:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:26:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump to version 2021.07.01 In-Reply-To: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 17:21:46 +0100") References: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> Message-ID: <87mtk6f8aj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From bernd.kuhls at t-online.de Sat Jan 8 17:26:43 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 8 Jan 2022 18:26:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-argustv: bump version to 19.2.0-Matrix Message-ID: <20220108172643.3465687-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 47ecd18975..e58f9a4608 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 31f0ac72c8549339c18c828e51ce2531c24686c6ce6c734db0f2b0ce67ff41a3 kodi-pvr-argustv-19.1.1-Matrix.tar.gz +sha256 dfd19f9c1c4efe556d3764a5bec7842092b246932159ff69cf5bb1f64c8b9473 kodi-pvr-argustv-19.2.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 793f7f1adc..230ef1067c 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.1.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.2.0-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From fontaine.fabrice at gmail.com Sat Jan 8 17:24:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:24:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: bump to version 02092020 Message-ID: <20220108172441.2819559-1-fontaine.fabrice@gmail.com> - Update indentation in hash file (two spaces) - This bump will fix the following build failure with libest which was added with commit f6f0e1e58168dfa9194db2e073efd20a98c15728: In file included from /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_lib.h:43:0, from est_server_http.c:39: /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_types.h:42:9: error: unknown type name 'size_t' typedef size_t rsize_t; ^~~~~~ https://github.com/rurban/safeclib/blob/v02092020/ChangeLog Fixes: - http://autobuild.buildroot.org/results/5a12f1cb4153834078522b6068ff24ac0300d51d Signed-off-by: Fabrice Fontaine --- package/safeclib/safeclib.hash | 6 +++--- package/safeclib/safeclib.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/safeclib/safeclib.hash b/package/safeclib/safeclib.hash index 7e1c6794e4..af732f93fd 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,5 +1,5 @@ -# From https://github.com/rurban/safeclib/releases/tag/v08112019 -sha256 bc2f25875522c50a3a5901981020d906db0b6a7d365619b8d72412c126be3923 libsafec-08112019.0-gad76c7.tar.bz2 +# From https://github.com/rurban/safeclib/releases/tag/v02092020 +sha256 d374bdcbfcdc4c9a76abed3707667372ca212fd87a369e7bcaaa54e716d27c0a libsafec-02092020.tar.xz # Hash for license file -sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING +sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 3af8fbb167..032a73bf67 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,10 +4,10 @@ # ################################################################################ -SAFECLIB_VERSION = 08112019 +SAFECLIB_VERSION = 02092020 SAFECLIB_SITE = \ https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) -SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).0-gad76c7.tar.bz2 +SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES -- 2.34.1 From peter at korsgaard.com Sat Jan 8 17:28:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:28:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libeastl: drop duplicated sentence In-Reply-To: <20220108161630.2730118-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 17:16:30 +0100") References: <20220108161630.2730118-1-fontaine.fabrice@gmail.com> Message-ID: <87iluuf87c.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop duplicated sentence from Config.in > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sat Jan 8 17:28:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 18:28:30 +0100 Subject: [Buildroot] [PATCH 0/1] [RFC] add support for icecc In-Reply-To: <20200429140729.3325-1-cturner@igalia.com> References: <20200429140729.3325-1-cturner@igalia.com> Message-ID: Hi Charlie, Sorry that you didn't get any reaction to this for almost two years. Covid was burning the maintainers out a bit :-( Anyway, here are some answers in case it's still relevant. Also, IceCC support would really be welcome in Buildroot. There are some users that need to build really big configurations so parallel build is welcome. Note of course that you'll have to combine it with top-level parallel build to be fully efficient, otherwise you're quickly going to run into serialisation. On 29/04/2020 16:07, Charlie Turner wrote: > ? Host packages are still compiled locally, I would like this to > extend to host builds as well. Could just prepend icecc in the > $PATH on the host. Need to test, potential complication is > switching icecc's toolchain mid-build. Might not be an issue, just > not gone there yet. What we do for ccache is simply use the wrapper for target compile and have it as part of HOSTCC for host builds. There are some packages that don't support CC with spaces, so there's HOSTCC_NOCCACHE for that. You can simply add icecc to HOSTCC (and leave HOSTCC_NOCCACHE without either ccache or icecc). > ? Generating the `ICECC_VERSION' tarball from the Makefiles. Ideally > it would all be transparent to the user if, say, > `BR2_ICECC=y'. It's inconvenient for the user to have to call > `--build-native' and arrange for `ICECC_VERSION' to be in the > `make' environment. You need to first build the cross-toolchain, > setup the tarball, and then so long as your toolchain doesn't > change, subsequent rebuilds are distributed. This all needs > automation. Yeah, I think that that's pretty essential. If you want to avoid that complexity and get something merged to start with, you could start with having icecc depend on BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED (and the assumption that the toolchain is already installed on all builders). That should simplify things a bit, no? > ? Number of jobs to simultaneously run has be manually selected, I > don't know of a method to find out how many remote CPUs you have > available with Icecream automatically. Not a big deal. Ideally it should be possible to do this both from the .config but make it possible to override from the environment, similar like how it's with BR2_DL_DIR. But that's a minor nit. Regards, Arnout From peter at korsgaard.com Sat Jan 8 17:28:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:28:20 +0100 Subject: [Buildroot] [git commit] package/libeastl: drop duplicated sentence Message-ID: <20220108172225.2F0708324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59bbe7cc7418d61a5d2963f1d30e558c3111a95e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop duplicated sentence from Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libeastl/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 7609434519..5abea8f810 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help EASTL stands for Electronic Arts Standard Template - Library. EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is an extensive From peter at korsgaard.com Sat Jan 8 17:26:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:26:01 +0100 Subject: [Buildroot] [git commit] package/raspberrypi-usbboot: bump to version 2021.07.01 Message-ID: <20220108172225.2381182A9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1a48f1bac19ac679803353bd048d91d02ffd75d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- package/raspberrypi-usbboot/raspberrypi-usbboot.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 3f66b12ff1..cedc5fb7e1 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz +sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 5d7b433c64..2e4194da0b 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,8 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) +RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 +RASPBERRYPI_USBBOOT_SITE = \ + $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Jan 8 17:29:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:29:56 +0100 Subject: [Buildroot] [git commit] package/mbedtls: bump to version 2.28.0 Message-ID: <20220108172418.A830682AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f8aab08e762742d753d5920718f31c629d0f8d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 2.16.12 was the last release of the 2.16 long-time support branch. Users who want a long-time branch should move to mbedtls-2.28, which is backward-compatible and will be supported for at least 3 years. Use LICENSE file as apache-2.0.txt was dropped with https://github.com/ARMmbed/mbedtls/commit/c76a54554ca8bffedf0e78a1cbdb64451e4ae957 https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 8247748afd..80ae173aff 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12: -sha256 294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393 mbedtls-2.16.12.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0: +sha256 6519579b836ed78cc549375c7c18b111df5717e86ca0eeff4cb64b2674f424cc mbedtls-2.28.0.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 93ac1bb163..c238d664f8 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,14 +4,14 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.12 +MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 -MBEDTLS_LICENSE_FILES = apache-2.0.txt +MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls From peter at korsgaard.com Sat Jan 8 17:30:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:30:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: bump to version 2.28.0 In-Reply-To: <20220108151954.2235611-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 16:19:54 +0100") References: <20220108151954.2235611-1-fontaine.fabrice@gmail.com> Message-ID: <87ee5if83r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > 2.16.12 was the last release of the 2.16 long-time support branch. > Users who want a long-time branch should move to mbedtls-2.28, which > is backward-compatible and will be supported for at least 3 years. > Use LICENSE file as apache-2.0.txt was dropped with > https://github.com/ARMmbed/mbedtls/commit/c76a54554ca8bffedf0e78a1cbdb64451e4ae957 > https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 8 17:34:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:34:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/hackrf: add a comma between licenses Message-ID: <20220108173403.2819830-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/hackrf/hackrf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 391bddcdb0..d80f87e6b9 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -7,7 +7,7 @@ HACKRF_VERSION = 2018.01.1 HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz -HACKRF_LICENSE = GPL-2.0+ BSD-3-Clause +HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host -- 2.34.1 From peter at korsgaard.com Sat Jan 8 17:35:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:35:26 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: (Fabrice Fontaine's message of "Sat, 8 Jan 2022 18:15:46 +0100") References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> <87zgo6f9sa.fsf@dell.be.48ers.dk> Message-ID: <87a6g6f7vl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: Hi, >> For the question if we need to maintain both 2.28.x and 3.x in >> parallel I guess it really depends on if the packages we have depending >> on mbedtls (E.G. bctoolbox, bmx7, mongrel2, shadowsocks-libev) can (be >> patched to) work with mbedtls 3.x or not? > It is really unlikely that all these packages will be patched to work > with mbedtls 3.x. > To my knowledge, only hiawatha and curl have been patched to support > mbedtls 3.x. > and it should be noted that curl supports mbedtls 2.x and 3.x: > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad > lighttpd is trying to migrate but has a lot of issues: > https://github.com/ARMmbed/mbedtls/issues/5331 Ok, thanks. >> If they can (or are no longer maintained upstream), then I would prefer >> to only support mbedtls 3.x going forward. If on the other hand mbedtls >> 3.x isn't really stable yet and only needed for hiawatha, then indeed we >> should perhaps just postpone it a bit and use the internal mbedtls copy >> in hiawatha or downgrade / drop TLS support. > 3.x is more "secure" because many obsolete cryptographic mechanisms and > TLS protocol versions and options have been removed. However, it is probably > ok to postpone the addition of mbedtls 3.x until more packages support it. Yes, I agree. What will we do about hiawatha? Patch it to work with 2.x as well, move to the internal mbedtls copy or revert the bump? Did you try contacting upstream about the issue? > It should be noted that we'll have the same issue/question with openssl 3.x ... Indeed, that is another can of worms that has been on my TODO list for a while... -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 8 17:35:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:35:39 +0100 Subject: [Buildroot] [PATCH 0/3] core: fixup PPD paths (branch yem/ppd-fixup-paths) Message-ID: Hello All! This series builds upon previous good work from Andreas [0], Louis-Paul [1], and Adam [2]. The second patch is the core of the change: rather than have multiple hooks that each cater for different types of files (.py, .pc, .pri, .cmake and so on), we jut do what we already do in relocate-sdk: we just look for all text files that have a PPD prefix in them, and replace tht with the cirrent package's PPD. The third patch ensures that we can build reliable filrs lists, so that files we tweak in the infra are not believed to be installed/modified by the current package. The first patch is just a little formatting cleanup. [0] https://lore.kernel.org/buildroot/20200217212350.29750-21-anaumann at ultratronik.de/ [1] https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ [2] https://lore.kernel.org/buildroot/20220106171720.12857-1-aduskett at gmail.com/ Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (3): core/pkg-utils: properly indent per-package-rsync core/pkg-generic: fixup all PPD paths in a generic fashion core/pkg-generic: apply post-prepare hooks before monitoring directories package/pkg-generic.mk | 45 ++++++++++++++++++++++----------------------- package/pkg-utils.mk | 4 ++-- 2 files changed, 24 insertions(+), 25 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 8 17:35:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:35:40 +0100 Subject: [Buildroot] [PATCH 1/3] core/pkg-utils: properly indent per-package-rsync In-Reply-To: References: Message-ID: Continuation lines should be indented one level more than the line the are the continuation of. Signed-off-by: Yann E. MORIN --- package/pkg-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 38ba5bca93..6aa64a2096 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -213,8 +213,8 @@ define per-package-rsync mkdir -p $(3) $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3)$(sep)) + $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ + $(3) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 8 17:35:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:35:41 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: References: Message-ID: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> Some files contain hard-coded absolute paths that point to the host and/or staging directories. With per-package directories (aka. PPD), these paths point to the PPD of the package that created the files, when we want them to point to the PPD of the package that uses them. Up until now, we had two hooks that attempted to fix those files: - a libtool-specific hook that searches for all .la files and seds them with the proper PPD, - a python-specific hook that tweaks just the sysconfigdata and removes the byte-compiled version of the sysconfigdata. But now, we also have a few other kinds of files for which we need to fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others as well. We solve this issue by just replacing any PPD in text files, with the current package's PPD. This is very similar to, and inspired from what is done when relocating the SDK. However, we can't use the existing relocate-sdk script, because that needs to know the original location, which we do not have when we aggregate the PPD (we could store it, but we can easily do without it). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Adam Duskett Cc: Louis-Paul CORDIER Cc: Andreas Naumann --- package/pkg-generic.mk | 43 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6a5fe5507b..1022062bcf 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -90,21 +90,24 @@ endif ####################################### # Helper functions -# Make sure .la files only reference the current per-package -# directory. - -# $1: package name (lower case) -# $2: staging directory of the package ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define fixup-libtool-files - $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ - -name "*.la" -print0 | xargs -0 --no-run-if-empty \ - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" + +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the +# proper staging and host directories for the current package: find +# all text files that contain the PPD root, and replace it with the +# current package's PPD. +define PPD_FIXUP_PATHS + $(Q)grep -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ + |while read -d '' f; do \ + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ + printf '%s\0' "$${f}"; \ + done \ + |xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef -endif -# Make sure python _sysconfigdata*.py files only reference the current -# per-package directory. +# Remove python's pre-compiled "sysconfigdata", as it may contain paths to +# the original staging or host dirs. # # Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) # because those directories may be created in the same recipe this macro will @@ -113,19 +116,15 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define FIXUP_PYTHON_SYSCONFIGDATA $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ \) \ - \( \( -name "_sysconfigdata*.pyc" -delete \) \ - -o \( -name "_sysconfigdata*.py" -print0 \) \ - \) \ - | xargs -0 --no-run-if-empty \ - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + \( -name "_sysconfigdata*.pyc" -delete \) endef -endif + +endif # PPD # Functions to collect statistics about installed files @@ -278,8 +277,6 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) - $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) @@ -836,7 +833,9 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += \ + PPD_FIXUP_PATHS \ + FIXUP_PYTHON_SYSCONFIGDATA ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 8 17:35:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:35:42 +0100 Subject: [Buildroot] [PATCH 3/3] core/pkg-generic: apply post-prepare hooks before monitoring directories In-Reply-To: References: Message-ID: <13e59bc22d9299b2f829d541c1ecdd995f583f95.1641663315.git.yann.morin.1998@free.fr> Monitoring the target/ and host/ directories and so on, will serve to generate lists of files installed by the packages. Those lists are then used to generate graphs of the size those package take on the target for example. With PPD, we will also want to use those lists to only copy those files actually installed by each dependencies of a package, recursively. Currently, those lists are not entirely reliable, as the starting points are established before we apply PPD fixup hooks. As such, at the end of a package installation, fixed up files will be found to belong to the current package, while they were in fact provided by one of its dependency. While this does no big harm, if at all, for the size graphs, it will trigger overwrite detection when we eventually gather packages together to aggregate a PPD or te final host and target. So, we better have the lists of files be reliable. So, we only start monitoring the directories after we apply the PPD fixups (or seen the other way around for a smaller diff: we apply the PPD fixups before we start monitoring the directories). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Herve Codina --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 1022062bcf..b1f4d219bb 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call MESSAGE,"Configuring") $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) @$(call pkg_size_before,$(TARGET_DIR)) @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) -- 2.25.1 From arnout at mind.be Sat Jan 8 17:37:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 18:37:15 +0100 Subject: [Buildroot] [PATCH 1/1] [RFC] add support for icecc In-Reply-To: <20200429140729.3325-2-cturner@igalia.com> References: <20200429140729.3325-1-cturner@igalia.com> <20200429140729.3325-2-cturner@igalia.com> Message-ID: <6baa15d6-7df0-1aa7-71c5-dea500fe9bfb@mind.be> On 29/04/2020 16:07, Charlie Turner wrote: > Signed-off-by: Charlie Turner > --- > Config.in | 9 +++++++++ > Makefile | 2 ++ > toolchain/toolchain-wrapper.c | 26 ++++++++++++++++++++++++++ > toolchain/toolchain-wrapper.mk | 4 ++++ > 4 files changed, 41 insertions(+) > > diff --git a/Config.in b/Config.in > index 48fd36ff98..bda65e8daf 100644 > --- a/Config.in > +++ b/Config.in > @@ -367,6 +367,15 @@ config BR2_CCACHE_USE_BASEDIR > > endif > > +config BR2_ICECC > + bool "Enable distributed compilation" > + help > + Write a nice explanation. > + > +if BR2_ICECC > + > +endif > + > config BR2_ENABLE_DEBUG > bool "build packages with debugging symbols" > help > diff --git a/Makefile b/Makefile > index ae29b042ec..30000b2390 100644 > --- a/Makefile > +++ b/Makefile > @@ -472,6 +472,8 @@ BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)" > # should not be used as the root filesystem. > TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM > > +# FIXME: Add the appropriate stuff for BR2_ICECC for accelerated host > +# builds? > ifeq ($(BR2_CCACHE),y) > CCACHE = $(HOST_DIR)/bin/ccache > BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR)) > diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c > index 8cfc963ccd..3e6c9c2603 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -28,6 +28,9 @@ > #ifdef BR_CCACHE > static char ccache_path[PATH_MAX]; > #endif > +#ifdef BR_ICECC > +static char icecc_path[PATH_MAX]; > +#endif > static char path[PATH_MAX]; > static char sysroot[PATH_MAX]; > /* As would be defined by gcc: > @@ -59,6 +62,13 @@ static char _date_[sizeof("-D__DATE__=\"MMM DD YYYY\"")]; > static char *predef_args[] = { > #ifdef BR_CCACHE > ccache_path, > +#endif > +#if defined(BR_ICECC) && !defined(BR_CCACHE) > +/* When icecc and ccache are used together, ccache is used as the Actually, I expect that combining the two (with a cluster of >5 machines) and with top-level parallel build) will slow down the build because the ccache calculations are not serialized and they're relatively expensive (on most object files, ccache is only a few times faster than just doing the compilation). So to simplify our life we could just make ccache and icecc mutually exclusive. > + * wrapper, which then rewraps with icecc via the CCACHE_PREFIX > + * environment variable, see below. > + */ > + icecc_path, > #endif > path, > "--sysroot", sysroot, > @@ -312,6 +322,15 @@ int main(int argc, char **argv) > return 3; > } > #endif > + > +#ifdef BR_ICECC > + /* FIXME: hardcoding. Copy how ccache is installed in the abspath in output/host? */ ccache is built by Buildroot itself. If you assume that icecc is pre-installed, you could just make the path a Config.in option and pass it in with a -D option, similar to e.g. BR_ABI. You can even reuse the BR_ICECC macro, i.e. -DBR_ICECC=\"$(call qstrip, $(BR2_ICECC_PATH))\" > + ret = snprintf(icecc_path, sizeof(icecc_path), "/home/cht/local/bin/icecc"); > + if (ret >= sizeof(icecc_path)) { > + perror(__FILE__ ": overflow"); > + return 3; > + } > +#endif > ret = snprintf(sysroot, sizeof(sysroot), "%s/" BR_SYSROOT, absbasedir); > if (ret >= sizeof(sysroot)) { > perror(__FILE__ ": overflow"); > @@ -532,6 +551,13 @@ int main(int argc, char **argv) > } > #endif > > +#if defined(BR_CCACHE) && defined(BR_ICECC) > + if (setenv("CCACHE_PREFIX", icecc_path, 0)) { Again, I don't think it's worth supporting the combination of the two. Regards, Arnout > + perror(__FILE__ ": Failed to set CCACHE_PREFIX"); > + return 3; > + } > +#endif > + > if (execv(exec_args[0], exec_args)) > perror(path); > > diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk > index 09dda17890..1a8532208c 100644 > --- a/toolchain/toolchain-wrapper.mk > +++ b/toolchain/toolchain-wrapper.mk > @@ -39,6 +39,10 @@ ifeq ($(BR2_CCACHE),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE > endif > > +ifeq ($(BR2_ICECC),y) > +TOOLCHAIN_WRAPPER_ARGS += -DBR_ICECC > +endif > + > ifeq ($(BR2_x86_x1000),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR_OMIT_LOCK_PREFIX > endif > From fontaine.fabrice at gmail.com Sat Jan 8 17:36:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:36:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburcu: bump to version 0.13.1 Message-ID: <20220108173613.2820050-1-fontaine.fabrice@gmail.com> https://github.com/urcu/userspace-rcu/blob/v0.13.1/ChangeLog Signed-off-by: Fabrice Fontaine --- package/liburcu/liburcu.hash | 4 ++-- package/liburcu/liburcu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburcu/liburcu.hash b/package/liburcu/liburcu.hash index 8ff11623d0..1968c3784e 100644 --- a/package/liburcu/liburcu.hash +++ b/package/liburcu/liburcu.hash @@ -1,5 +1,5 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.13.0.tar.bz2.sha256 -sha256 cbb20dbe1a892c2a4d8898bac4316176e585392693d498766ccbbc68cf20ba20 userspace-rcu-0.13.0.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2.sha256 +sha256 3213f33d2b8f710eb920eb1abb279ec04bf8ae6361f44f2513c28c20d3363083 userspace-rcu-0.13.1.tar.bz2 # Hash for license files sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk index e29784abe4..895dd6bb66 100644 --- a/package/liburcu/liburcu.mk +++ b/package/liburcu/liburcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURCU_VERSION = 0.13.0 +LIBURCU_VERSION = 0.13.1 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) -- 2.34.1 From ps.report at gmx.net Sat Jan 8 17:39:19 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 8 Jan 2022 18:39:19 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> Message-ID: <20220108183919.238c1885@gmx.net> Hello Fabrice, *, On Sat, 8 Jan 2022 17:13:47 +0100, Fabrice Fontaine wrote: > Hi, > > Le sam. 8 janv. 2022 ? 11:51, Thomas Petazzoni > a ?crit : > > > > On Tue, 4 Jan 2022 21:54:55 +0100 > > Fabrice Fontaine wrote: > > > > > Fix the following build failure raised since bump to version 5.41 in > > > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > > > > > readelf.c: In function 'do_auxv_note': > > > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > > > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > > > ^ > > > > > > Fixes: > > > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc > > > > > > Signed-off-by: Fabrice Fontaine > > > > I am afraid it seems like this didn't fix the problem, see: > > > > http://autobuild.buildroot.net/results/957/9573e8b01d8f21cd89a67475daabdeef533d31d7/build-end.log > > > > ac_cv_prog_cc_c99='-std=gnu99' is properly passed to the configure > > script, but it still fails. > Indeed, I suggest to revert this commit and apply the version 1 of > this patch instead of trying to understand what is "broken" in the > configure script. The difference seems to be: $ diff -ru file-5.38/configure.ac file-5.41/configure.ac [...] @@ -88,7 +88,7 @@ AC_SUBST(WARNINGS) dnl Checks for programs. -AC_PROG_CC_STDC +AC_PROG_CC AC_USE_SYSTEM_EXTENSIONS AM_PROG_CC_C_O AC_C_BIGENDIAN [...] According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 feature is gone (still used for target/host in package/file/file.mk)... Regards, Peter [1] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/C-Compiler.html > > > > Thomas > > -- > > Thomas Petazzoni, co-owner and CEO, Bootlin > > Embedded Linux and Kernel engineering and training > > https://bootlin.com > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From yann.morin.1998 at free.fr Sat Jan 8 17:39:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:39:25 +0100 Subject: [Buildroot] [git commit] package/libpri: add Linux in comment Message-ID: <20220108173322.F35FB83242@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0730b8b8228391ec36ace6e1d1d0831590b8d0cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libpri/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpri/Config.in b/package/libpri/Config.in index de2d96fcc4..0684d2ac83 100644 --- a/package/libpri/Config.in +++ b/package/libpri/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI http://www.asterisk.org/downloads/libpri -comment "libpri needs a kernel to be built" +comment "libpri needs a Linux kernel to be built" depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL From yann.morin.1998 at free.fr Sat Jan 8 17:39:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:39:25 +0100 Subject: [Buildroot] [git commit] package/libss7: add Linux in comment Message-ID: <20220108173323.0886D832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0de6291e3fe8d9f6c572a5206b8ead3719f6829 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libss7/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index bdf5fbe3a8..d8bcf11ce7 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBSS7 http://www.asterisk.org/downloads/libss7 -comment "libss7 needs a kernel to be built" +comment "libss7 needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL comment "libss7 needs a toolchain w/ threads" From yann.morin.1998 at free.fr Sat Jan 8 17:39:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:39:25 +0100 Subject: [Buildroot] [git commit] package/nvidia-driver: add Linux in comment Message-ID: <20220108173323.11DED832CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=956cd5b9b7136344bc2641fbe3e1abfa2eff1bc8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nvidia-driver/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 9631b3e70c..a8617a939b 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -75,7 +75,7 @@ config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA -comment "nvidia kernel module needs a kernel to be built" +comment "nvidia kernel module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_NVIDIA_DRIVER_MODULE From yann.morin.1998 at free.fr Sat Jan 8 17:40:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 18:40:37 +0100 Subject: [Buildroot] [PATCH 1/3] package/libpri: add Linux in comment In-Reply-To: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> References: <20220108165005.2737902-1-fontaine.fabrice@gmail.com> Message-ID: <20220108174037.GB1881783@scaer> Fabrice, All, On 2022-01-08 17:50 +0100, Fabrice Fontaine spake thusly: > Add "Linux" before kernel in comment to be consistent with other > packages and manual > > Signed-off-by: Fabrice Fontaine Series of 3 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libpri/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libpri/Config.in b/package/libpri/Config.in > index de2d96fcc4..0684d2ac83 100644 > --- a/package/libpri/Config.in > +++ b/package/libpri/Config.in > @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI > > http://www.asterisk.org/downloads/libpri > > -comment "libpri needs a kernel to be built" > +comment "libpri needs a Linux kernel to be built" > depends on BR2_USE_MMU > depends on !BR2_LINUX_KERNEL > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 8 17:48:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:48:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-argustv: bump version to 19.2.0-Matrix In-Reply-To: <20220108172643.3465687-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sat, 8 Jan 2022 18:26:43 +0100") References: <20220108172643.3465687-1-bernd.kuhls@t-online.de> Message-ID: <875yquf79p.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 17:48:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:48:24 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-argustv: bump version to 19.2.0-Matrix Message-ID: <20220108174233.D4D248324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e9479aa0a734791c20a44d133e31828a807baa7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 47ecd18975..e58f9a4608 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 31f0ac72c8549339c18c828e51ce2531c24686c6ce6c734db0f2b0ce67ff41a3 kodi-pvr-argustv-19.1.1-Matrix.tar.gz +sha256 dfd19f9c1c4efe556d3764a5bec7842092b246932159ff69cf5bb1f64c8b9473 kodi-pvr-argustv-19.2.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 793f7f1adc..230ef1067c 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.1.1-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.2.0-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md From fontaine.fabrice at gmail.com Sat Jan 8 17:47:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:47:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/refpolicy: bump to version 2.20220106 Message-ID: <20220108174749.2898891-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20220106 Signed-off-by: Fabrice Fontaine --- ...ervices-samba.te-make-crack-optional.patch | 83 ------------------- ...ervices-wireguard.te-make-iptables-o.patch | 54 ------------ package/refpolicy/refpolicy.hash | 2 +- package/refpolicy/refpolicy.mk | 2 +- 4 files changed, 2 insertions(+), 139 deletions(-) delete mode 100644 package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch delete mode 100644 package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch diff --git a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch b/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch deleted file mode 100644 index 2dae5d4a76..0000000000 --- a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 7c58f2508efc115dea03e18e1fa611ebf81f6ee6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:12:01 +0200 -Subject: [PATCH] policy/modules/services/samba.te: make crack optional - -Make crack optional to avoid the following build failure: - - Compiling targeted policy.31 - env LD_LIBRARY_PATH="/tmp/instance-5/output-1/host/lib:/tmp/instance-5/output-1/host/usr/lib" /tmp/instance-5/output-1/host/usr/bin/checkpolicy -c 31 -U deny -S -O -E policy.conf -o policy.31 - policy/modules/services/samba.te:399:ERROR 'type crack_db_t is not within scope' at token ';' on line 360232: - allow smbd_t crack_db_t:dir { getattr search open }; - #line 399 - checkpolicy: error(s) encountered while parsing configuration - -Fixes: - - http://autobuild.buildroot.org/results/ab7098948d1920e42fa587e07f0513f23ba7fc74 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/407] ---- - policy/modules/services/samba.te | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) - -diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te -index 9d4665ae6..6c37625a9 100644 ---- a/policy/modules/services/samba.te -+++ b/policy/modules/services/samba.te -@@ -396,8 +396,6 @@ userdom_signal_all_users(smbd_t) - userdom_home_filetrans_user_home_dir(smbd_t) - userdom_user_home_dir_filetrans_user_home_content(smbd_t, { dir file lnk_file sock_file fifo_file }) - --usermanage_read_crack_db(smbd_t) -- - ifdef(`hide_broken_symptoms',` - files_dontaudit_getattr_default_dirs(smbd_t) - files_dontaudit_getattr_boot_dirs(smbd_t) -@@ -413,18 +411,6 @@ tunable_policy(`samba_create_home_dirs',` - userdom_create_user_home_dirs(smbd_t) - ') - --tunable_policy(`samba_domain_controller',` -- gen_require(` -- class passwd passwd; -- ') -- -- usermanage_domtrans_passwd(smbd_t) -- usermanage_kill_passwd(smbd_t) -- usermanage_domtrans_useradd(smbd_t) -- usermanage_domtrans_groupadd(smbd_t) -- allow smbd_t self:passwd passwd; --') -- - tunable_policy(`samba_enable_home_dirs',` - userdom_manage_user_home_content_dirs(smbd_t) - userdom_manage_user_home_content_files(smbd_t) -@@ -505,6 +491,24 @@ optional_policy(` - seutil_sigchld_newrole(smbd_t) - ') - -+optional_policy(` -+ usermanage_read_crack_db(smbd_t) -+') -+ -+optional_policy(` -+ tunable_policy(`samba_domain_controller',` -+ gen_require(` -+ class passwd passwd; -+ ') -+ -+ usermanage_domtrans_passwd(smbd_t) -+ usermanage_kill_passwd(smbd_t) -+ usermanage_domtrans_useradd(smbd_t) -+ usermanage_domtrans_groupadd(smbd_t) -+ allow smbd_t self:passwd passwd; -+ ') -+') -+ - ######################################## - # - # Nmbd Local policy --- -2.30.2 - diff --git a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch b/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch deleted file mode 100644 index 4cd1f96558..0000000000 --- a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 67394d078c2e1438293b25d08cf408b0b0d55755 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 22 Sep 2021 23:55:59 +0200 -Subject: [PATCH] policy/modules/services/wireguard.te: make iptables optional - -Make iptables optional to avoid the following build failure raised since -version 2.20210908 and -https://github.com/SELinuxProject/refpolicy/commit/7f1a7b1cacd5d211077ce62fbb4e91890e65c820: - - Compiling targeted policy.33 - env LD_LIBRARY_PATH="/tmp/instance-0/output-1/host/lib:/tmp/instance-0/output-1/host/usr/lib" /tmp/instance-0/output-1/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 - policy/modules/services/wireguard.te:66:ERROR 'type iptables_exec_t is not within scope' at token ';' on line 591892: - #line 66 - allow wireguard_t iptables_exec_t:file { getattr open map read execute ioctl }; - checkpolicy: error(s) encountered while parsing configuration - make[1]: *** [Rules.monolithic:79: policy.33] Error 1 - -Fixes: - - http://autobuild.buildroot.org/results/a4223accc6adb70b06fd4e74ca4f28484446b6fa - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/408] ---- - policy/modules/services/wireguard.te | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/policy/modules/services/wireguard.te b/policy/modules/services/wireguard.te -index 7241f65e6..33fd3c55d 100644 ---- a/policy/modules/services/wireguard.te -+++ b/policy/modules/services/wireguard.te -@@ -61,10 +61,6 @@ corecmd_exec_shell(wireguard_t) - - domain_use_interactive_fds(wireguard_t) - --# wg-quick can be configured to run iptables and other networking --# config tools when bringing up/down the wg interfaces --iptables_domtrans(wireguard_t) -- - # wg-quick tries to read /proc/filesystem when running "stat" and "mv" commands - kernel_dontaudit_read_system_state(wireguard_t) - kernel_dontaudit_search_kernel_sysctl(wireguard_t) -@@ -75,3 +71,9 @@ miscfiles_read_localization(wireguard_t) - sysnet_run_ifconfig(wireguard_t, wireguard_roles) - - userdom_use_user_terminals(wireguard_t) -+ -+# wg-quick can be configured to run iptables and other networking -+# config tools when bringing up/down the wg interfaces -+optional_policy(` -+ iptables_domtrans(wireguard_t) -+') --- -2.33.0 - diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index b8f6f023eb..b08c22ed4e 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 4d3140d9fbb91322f5de36d73959464ce1d8946dcd149e36fcaf60e92444e902 refpolicy-2.20210908.tar.bz2 +sha256 965f98f0b68a24fd0b8e8d973d319332aea88973e1d6c455ef9c2a31aefaeaa6 refpolicy-2.20220106.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 975c3b584c..44c50af278 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20210908 +REFPOLICY_VERSION = 2.20220106 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) endif -- 2.34.1 From peter at korsgaard.com Sat Jan 8 17:49:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:49:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: bump to version 02092020 In-Reply-To: <20220108172441.2819559-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 18:24:41 +0100") References: <20220108172441.2819559-1-fontaine.fabrice@gmail.com> Message-ID: <871r1if77w.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Update indentation in hash file (two spaces) > - This bump will fix the following build failure with libest which was > added with commit f6f0e1e58168dfa9194db2e073efd20a98c15728: > In file included from /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_lib.h:43:0, > from est_server_http.c:39: > /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_types.h:42:9: error: unknown type name 'size_t' > typedef size_t rsize_t; > ^~~~~~ > https://github.com/rurban/safeclib/blob/v02092020/ChangeLog > Fixes: > - http://autobuild.buildroot.org/results/5a12f1cb4153834078522b6068ff24ac0300d51d > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 17:49:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:49:28 +0100 Subject: [Buildroot] [git commit] package/safeclib: bump to version 02092020 Message-ID: <20220108174338.A04838324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebe808ac4071395b4d1e90d617c33a5e6e514af1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update indentation in hash file (two spaces) - This bump will fix the following build failure with libest which was added with commit f6f0e1e58168dfa9194db2e073efd20a98c15728: In file included from /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_lib.h:43:0, from est_server_http.c:39: /home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/include/libsafec/safe_types.h:42:9: error: unknown type name 'size_t' typedef size_t rsize_t; ^~~~~~ https://github.com/rurban/safeclib/blob/v02092020/ChangeLog Fixes: - http://autobuild.buildroot.org/results/5a12f1cb4153834078522b6068ff24ac0300d51d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/safeclib/safeclib.hash | 6 +++--- package/safeclib/safeclib.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/safeclib/safeclib.hash b/package/safeclib/safeclib.hash index 7e1c6794e4..af732f93fd 100644 --- a/package/safeclib/safeclib.hash +++ b/package/safeclib/safeclib.hash @@ -1,5 +1,5 @@ -# From https://github.com/rurban/safeclib/releases/tag/v08112019 -sha256 bc2f25875522c50a3a5901981020d906db0b6a7d365619b8d72412c126be3923 libsafec-08112019.0-gad76c7.tar.bz2 +# From https://github.com/rurban/safeclib/releases/tag/v02092020 +sha256 d374bdcbfcdc4c9a76abed3707667372ca212fd87a369e7bcaaa54e716d27c0a libsafec-02092020.tar.xz # Hash for license file -sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING +sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 3af8fbb167..032a73bf67 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -4,10 +4,10 @@ # ################################################################################ -SAFECLIB_VERSION = 08112019 +SAFECLIB_VERSION = 02092020 SAFECLIB_SITE = \ https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) -SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).0-gad76c7.tar.bz2 +SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sat Jan 8 17:52:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 18:52:12 +0100 Subject: [Buildroot] [PATH v2 1/1] docs/manual: add qemu defconfigs gitlab test In-Reply-To: <90d1cd65-6cb7-d708-9b57-2089c5485d63@smile.fr> References: <20200915103806.13785-1-jugurtha.belkalem@smile.fr> <20200915165156.179380a9@windsurf.hq.k.grp> <90d1cd65-6cb7-d708-9b57-2089c5485d63@smile.fr> Message-ID: <20220108185212.49ba2aae@windsurf> Hello Romain, On Sat, 8 Jan 2022 11:56:54 +0100 Romain Naour wrote: > Maybe the manual needs a new chapter about the gitlab-ci in general and document > all pipeline trigger supported. > > For a new qemu defconfigs, we need to take care of: > > - define "# qemu_ARCH_defconfig" tag in the file board/qemu/ARCH/readme.txt > > - Use board/qemu/post-image.sh post image script and provide the name of the > defconfig as argument of this script: > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > > - Enable host-qemu to use qemu built by Buildroot for the host: > BR2_PACKAGE_HOST_QEMU=y > BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y > > Being in the manual would promote gitlab-ci testing with Qemu. Yes, I agree! We need a single place in the chapter with all the Gitlab CI details. Like the test-pkg integration, testing of defconfigs, testing of runtime tests, etc. I'll mark this patch as Changes Requested, because we don't want just a section/chapter specifically for the qemu defconfig testing in Gitlab CI, but a broader section; Please note that Gitlab CI testing of runtime tests is already documented in the manual, so it will have to be refactored. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sat Jan 8 17:52:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:52:17 +0100 Subject: [Buildroot] [PATCH 1/3] core/pkg-utils: properly indent per-package-rsync In-Reply-To: (Yann E. MORIN's message of "Sat, 8 Jan 2022 18:35:40 +0100") References: Message-ID: <87wnjadsj2.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Continuation lines should be indented one level more than the line the > are the continuation of. > Signed-off-by: Yann E. MORIN Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 17:52:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:52:12 +0100 Subject: [Buildroot] [git commit] core/pkg-utils: properly indent per-package-rsync Message-ID: <20220108174616.5D91C8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Continuation lines should be indented one level more than the line the are the continuation of. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 38ba5bca93..6aa64a2096 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -213,8 +213,8 @@ define per-package-rsync mkdir -p $(3) $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3)$(sep)) + $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ + $(3) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current From peter at korsgaard.com Sat Jan 8 17:52:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 18:52:44 +0100 Subject: [Buildroot] [git commit] package/liburcu: bump to version 0.13.1 Message-ID: <20220108174643.D307B8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=babd5bdadbf249d8e0baa06987e33b042b2b3fe5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/urcu/userspace-rcu/blob/v0.13.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/liburcu/liburcu.hash | 4 ++-- package/liburcu/liburcu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburcu/liburcu.hash b/package/liburcu/liburcu.hash index 8ff11623d0..1968c3784e 100644 --- a/package/liburcu/liburcu.hash +++ b/package/liburcu/liburcu.hash @@ -1,5 +1,5 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.13.0.tar.bz2.sha256 -sha256 cbb20dbe1a892c2a4d8898bac4316176e585392693d498766ccbbc68cf20ba20 userspace-rcu-0.13.0.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2.sha256 +sha256 3213f33d2b8f710eb920eb1abb279ec04bf8ae6361f44f2513c28c20d3363083 userspace-rcu-0.13.1.tar.bz2 # Hash for license files sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk index e29784abe4..895dd6bb66 100644 --- a/package/liburcu/liburcu.mk +++ b/package/liburcu/liburcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURCU_VERSION = 0.13.0 +LIBURCU_VERSION = 0.13.1 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) From peter at korsgaard.com Sat Jan 8 17:52:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 18:52:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburcu: bump to version 0.13.1 In-Reply-To: <20220108173613.2820050-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 18:36:13 +0100") References: <20220108173613.2820050-1-fontaine.fabrice@gmail.com> Message-ID: <87sftydshz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/urcu/userspace-rcu/blob/v0.13.1/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 8 17:58:11 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 18:58:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/babeltrace2: bump to version 2.0.4 Message-ID: <20220108175811.2978380-1-fontaine.fabrice@gmail.com> - Drop second patch (already in version) - Update indentation in hash file (two spaces) https://github.com/efficios/babeltrace/releases/tag/v2.0.4 Signed-off-by: Fabrice Fontaine --- ...trace_ir_ref.c-rename-user-structure.patch | 57 ------------------- package/babeltrace2/babeltrace2.hash | 12 ++-- package/babeltrace2/babeltrace2.mk | 2 +- 3 files changed, 7 insertions(+), 64 deletions(-) delete mode 100644 package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch diff --git a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch b/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch deleted file mode 100644 index ac9eee82d8..0000000000 --- a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 26 Sep 2020 22:03:10 +0200 -Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure - -Rename user structure to bt_user to avoid the following build failure -with uclibc: - -test_trace_ir_ref.c:41:8: error: redefinition of 'struct user' - struct user { - ^ -In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34, - from ../../src/common/assert.h:28, - from ../../src/lib/object.h:28, - from test_trace_ir_ref.c:25: -/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here - struct user - ^~~~ - -Fixes: - - http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/efficios/babeltrace/pull/115] ---- - tests/lib/test_trace_ir_ref.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c -index d5dfa9cf..70caf29c 100644 ---- a/tests/lib/test_trace_ir_ref.c -+++ b/tests/lib/test_trace_ir_ref.c -@@ -25,7 +25,7 @@ - - #define NR_TESTS 37 - --struct user { -+struct bt_user { - bt_trace_class *tc; - bt_stream_class *sc; - bt_event_class *ec; -@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp) - bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL; - bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL, - *weak_ec3 = NULL; -- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; -+ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; - - /* The only reference which exists at this point is on TC1. */ - tc1 = create_tc1(self_comp); --- -2.28.0 - diff --git a/package/babeltrace2/babeltrace2.hash b/package/babeltrace2/babeltrace2.hash index 27c47ba26f..164e65cded 100644 --- a/package/babeltrace2/babeltrace2.hash +++ b/package/babeltrace2/babeltrace2.hash @@ -1,8 +1,8 @@ -# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.3.tar.bz2.sha256 -sha256 a53625152554102d868ba8395347d0daba0bec9c4b854c3e9bd97c77b0bf04a0 babeltrace2-2.0.3.tar.bz2 +# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2.sha256 +sha256 774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca babeltrace2-2.0.4.tar.bz2 # Hash for license files -sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt +sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk index 1e03f5fdd2..eedfc72b8c 100644 --- a/package/babeltrace2/babeltrace2.mk +++ b/package/babeltrace2/babeltrace2.mk @@ -5,7 +5,7 @@ ################################################################################ BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace -BABELTRACE2_VERSION = 2.0.3 +BABELTRACE2_VERSION = 2.0.4 BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2 BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code) BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE -- 2.34.1 From ps.report at gmx.net Sat Jan 8 18:04:14 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 8 Jan 2022 19:04:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump to version 2021.07.01 In-Reply-To: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> References: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> Message-ID: <20220108190414.6b638ea8@gmx.net> Hello Fabrice, On Sat, 8 Jan 2022 17:21:46 +0100, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine > --- > package/raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- > package/raspberrypi-usbboot/raspberrypi-usbboot.mk | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > index 3f66b12ff1..cedc5fb7e1 100644 > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz > +sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz > > # License files > sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > index 5d7b433c64..2e4194da0b 100644 > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e > -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) > +RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 $ git log --oneline --reverse [...] 9324fd7 Add native Raspberry Pi Imager port - beta ead3e30 readme: add macOS build step 2048ae6 (2021.07.01) Merge pull request #83 from mrpollo/patch-1 6c4d444 Update Raspberry Pi 4 EEPROM to pieeprom-2021-07-06 59830ea Merge pull request #85 from timg236/pieeprom-2021-07-06 8b1ccc1 Update changelog 9a4887e Fix `install` and `uninstall` targets in Makefile. 3840f3b Merge pull request #86 from cpb-/feature/add-install-target-in-makefile ff986e4 bootloader: Remove NVMe beta files c2da05c Merge pull request #88 from peterharperuk/remove_nvme 4608d57 Update bootcode4.bin 76e856d Merge pull request #89 from peterharperuk/master_update 8bcd5ce Bump bootcode.bin d1a9a5c beta: Add support for secure-boot - see Readme.md 6eb9976 secure-boot: Added example boot.img 78e1830 make-boot-image: Fix typo in docs AFT_SIZE -> FAT_SIZE 58bdaf4 make-boot-image: Use losetup instead of udisksctl 4bdd032 secure-boot BETA documentation updates 5247ffe Merge pull request #77 from nils-werner/patch-1 dc1b95f secure-boot: Move the example PEM file to secure-boot-example 80945ed secure-boot: Update recovery,bootcode4 + EEPROM to latest beta - 2021-10-27 a6e0d8b secure-boot: Update Readme to update max ramdisk size to 96MB 14e28be Corrected the board flag 7b429ab Merge pull request #96 from Dodain/master 09852a9 Corrected the -b flag in the readme.md 879641f Readme: Add docs for examining the contents of boot.img 5f8c233 secure-boot: Add more documentation about the RSA signatures and add optional public key argument d1ad057 Merge pull request #98 from timg236/secure-boot-hsm 6154fe2 make-boot-image: Fix unmount and set GID 8b390fe make-boot-image: Enable the image size to be specified fc4035e Update the default EEPROM image to 2021-11-22 a7ed8d1 rpi-eeprom-config: Pull in --edit fixes from rpi-eeprom repo 83c9a96 Merge pull request #103 from timg236/pieeprom-2021-11-22 396b98f secure-boot-recovery: Update to latest 2021-11-22 EEPROM 14ea684 msd: Fix non-2711 MSD support 515b972 Update the default EEPROM image to 2021-12-02 1aca6bc Merge pull request #104 from peterharperuk/update_dec e5e4994 Remove imager beta release 8bb5820 Use pkg-config to locate libusb-1.0 6b05a3a bootloader: Enable revoke_devkey in secure-boot recovery.bin a7d4ec4 (HEAD) Merge pull request #108 from timg236/secure-boot-revoke-devkey The version bump to 2021.07.01 gains one readme update, why not bump to head/latest (after testing the result)? Regards, Peter > +RASPBERRYPI_USBBOOT_SITE = \ > + $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) > RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 > RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE > From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:33 +0100 Subject: [Buildroot] [git commit] package/rockchip-mali: select the kernel driver Message-ID: <20220108175845.B0419832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc715b13b50d2f19c2d534f794a5345e61ee179f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If the rockchip-mali blobs are enabled, we also want the corresponding kernel driver. Signed-off-by: Thomas Petazzoni --- package/rockchip-mali/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index b2033652a8..2a8cd786be 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_ROCKCHIP_MALI select BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_MALI_DRIVER if BR2_LINUX_KERNEL help Install the binary user-space libraries for the ARM Mali GPU suitable for Rockchip platforrms. This package requires a From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:32 +0100 Subject: [Buildroot] [git commit] package/mali-driver: new package Message-ID: <20220108175845.89D9C82BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3ecd9ea4a40d601317f3b7195be4f5d1bdb3146 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a new package to build and install the Mali kernel driver for Midgard and Bifrost GPU. Signed-off-by: Miquel Raynal Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/mali-driver/Config.in | 14 ++++++++++++++ package/mali-driver/mali-driver.hash | 3 +++ package/mali-driver/mali-driver.mk | 15 +++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/package/Config.in b/package/Config.in index 3b1c38db47..d32a87fe20 100644 --- a/package/Config.in +++ b/package/Config.in @@ -512,6 +512,7 @@ endmenu source "package/lsuio/Config.in" source "package/luksmeta/Config.in" source "package/lvm2/Config.in" + source "package/mali-driver/Config.in" source "package/mali-t76x/Config.in" source "package/mbpfan/Config.in" source "package/mdadm/Config.in" diff --git a/package/mali-driver/Config.in b/package/mali-driver/Config.in new file mode 100644 index 0000000000..fee67096c8 --- /dev/null +++ b/package/mali-driver/Config.in @@ -0,0 +1,14 @@ +comment "mali-driver needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_MALI_DRIVER + bool "mali-driver" + depends on BR2_LINUX_KERNEL + help + This package builds and installs the Linux kernel driver for + the Mali Midgard/Bifrost GPU, compatible with recent Linux + kernels (>= 5.4). Note that it should be installed together + with the corresponding userspace OpenGL libraries, which are + usually provided as binaries only by hardware vendors. + + mali-driver requires a Linux kernel >= 5.4. diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash new file mode 100644 index 0000000000..a144d5189e --- /dev/null +++ b/package/mali-driver/mali-driver.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 76464e5ed55e9d21062cf154733ce61217211172629ec8742af902607f14d41a mali-driver-a742530232d1de41b57465744a1259fa6c35049e.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk new file mode 100644 index 0000000000..b12bfec69d --- /dev/null +++ b/package/mali-driver/mali-driver.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# mali-driver +# +################################################################################ + +MALI_DRIVER_VERSION = a742530232d1de41b57465744a1259fa6c35049e +MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) +MALI_DRIVER_DEPENDENCIES = linux +MALI_DRIVER_LICENSE = GPL-2.0 +MALI_DRIVER_LICENSE_FILE = LICENSE +MALI_DRIVER_MODULE_SUBDIRS = r8p0/drivers/gpu/arm/midgard + +$(eval $(kernel-module)) +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:32 +0100 Subject: [Buildroot] [git commit] package/ti-sgx-um: add missing _PROVIDES variable Message-ID: <20220108175845.938CC832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=203f0a917d2f726f7af241025c10663c01ae5c53 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The ti-sgx-um package provides 3 virtual packages, but doesn't have the TI_SGX_UM_PROVIDES variable. This commit fixes that by adding the missing variable. Signed-off-by: Thomas Petazzoni --- package/ti-sgx-um/ti-sgx-um.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ti-sgx-um/ti-sgx-um.mk b/package/ti-sgx-um/ti-sgx-um.mk index 83dbc6804c..0a1d46c384 100644 --- a/package/ti-sgx-um/ti-sgx-um.mk +++ b/package/ti-sgx-um/ti-sgx-um.mk @@ -11,6 +11,7 @@ TI_SGX_UM_SITE_METHOD = git TI_SGX_UM_LICENSE = TI TSPA License TI_SGX_UM_LICENSE_FILES = TI-Linux-Graphics-DDK-UM-Manifest.doc TI_SGX_UM_INSTALL_STAGING = YES +TI_SGX_UM_PROVIDES = libegl libgles powervr TI_SGX_UM_TARGET=ti335x # ti-sgx-um is a egl/gles provider only if libdrm is installed From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:32 +0100 Subject: [Buildroot] [git commit] package/ti-sgx-um: make it a provider of libgbm Message-ID: <20220108175845.9D162832CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8b6d3931ffdb83833590ba596d595e661b0156c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The OpenGL ES implementation provides a libgbm implementation, so provide the corresponding virtual package. Signed-off-by: Thomas Petazzoni --- package/ti-sgx-um/Config.in | 5 +++++ package/ti-sgx-um/ti-sgx-um.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ti-sgx-um/Config.in b/package/ti-sgx-um/Config.in index b97469a364..2dea104b58 100644 --- a/package/ti-sgx-um/Config.in +++ b/package/ti-sgx-um/Config.in @@ -15,6 +15,8 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_OMAP select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_POWERVR select BR2_PACKAGE_LIBFFI @@ -31,6 +33,9 @@ if BR2_PACKAGE_TI_SGX_UM config BR2_PACKAGE_PROVIDES_LIBEGL default "ti-sgx-um" +config BR2_PACKAGE_PROVIDES_LIBGBM + default "ti-sgx-um" + config BR2_PACKAGE_PROVIDES_LIBGLES default "ti-sgx-um" diff --git a/package/ti-sgx-um/ti-sgx-um.mk b/package/ti-sgx-um/ti-sgx-um.mk index 0a1d46c384..aeee90686b 100644 --- a/package/ti-sgx-um/ti-sgx-um.mk +++ b/package/ti-sgx-um/ti-sgx-um.mk @@ -11,7 +11,7 @@ TI_SGX_UM_SITE_METHOD = git TI_SGX_UM_LICENSE = TI TSPA License TI_SGX_UM_LICENSE_FILES = TI-Linux-Graphics-DDK-UM-Manifest.doc TI_SGX_UM_INSTALL_STAGING = YES -TI_SGX_UM_PROVIDES = libegl libgles powervr +TI_SGX_UM_PROVIDES = libegl libgbm libgles powervr TI_SGX_UM_TARGET=ti335x # ti-sgx-um is a egl/gles provider only if libdrm is installed From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:32 +0100 Subject: [Buildroot] [git commit] package/ti-sgx-um: do not depend on the kernel driver, select it Message-ID: <20220108175845.A6FB782BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f19ea10137e204d2478a7221053122b4e12e54b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Depending on the kernel driver is annoying because it means you can't build ti-sgx-um without enabling a kernel. This prevents easy testing of ti-sgx-um, and it also means ti-sgx-um is never built by the autobuilders. So instead, we select the kernel driver if a kernel is built by Buildroot. This requires propagating the BR2_arm dependency from ti-sgx-km to ti-sgx-um. Signed-off-by: Thomas Petazzoni --- package/ti-sgx-um/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/ti-sgx-um/Config.in b/package/ti-sgx-um/Config.in index 2dea104b58..13c7cc8856 100644 --- a/package/ti-sgx-um/Config.in +++ b/package/ti-sgx-um/Config.in @@ -1,17 +1,15 @@ -comment "ti-sgx-um needs the ti-sgx-km driver" - depends on !BR2_PACKAGE_TI_SGX_KM - comment "ti-sgx-um needs udev and a glibc toolchain w/ threads" + depends on BR2_arm depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC \ || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_TI_SGX_UM bool "ti-sgx-um" - depends on BR2_PACKAGE_TI_SGX_KM depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_HAS_UDEV # pre-built binaries depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_arm select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_OMAP select BR2_PACKAGE_HAS_LIBEGL @@ -21,6 +19,7 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_HAS_POWERVR select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_TI_SGX_KM if BR2_LINUX_KERNEL help Graphics libraries for TI CPUs with SGX5xx GPU. This package supports AM335x, AM437x, AM4430 and AM5430. From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:33 +0100 Subject: [Buildroot] [git commit] package/freescale-imx/imx-gpu-viv: declare as a libgbm provider Message-ID: <20220108175845.B9354832CE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=627464367ea7a3ea76a25beebed9a8f069b3cfc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Interestingly, only the aarch64 blobs provide libgbm support. This will help in fixing an issue that exists today, where ARM32 + imx-gpu-viv + wayland + qt5 fails to build, because qt5 is told that libgbm is available, i.e the following configuration: BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_GUI=y BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y BR2_PACKAGE_IMX_GPU_VIV=y BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL=y # BR2_TARGET_ROOTFS_TAR is not set fails to build during the qt5base configure step with: ERROR: Feature 'gbm' was enabled, but the pre-condition 'libs.gbm' failed. Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/Config.in | 11 +++++++++++ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index f465167acd..9ba3d0428e 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -17,6 +17,10 @@ config BR2_PACKAGE_IMX_GPU_VIV select BR2_PACKAGE_LIBDRM if !(BR2_arm && BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB) select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES + # gbm is only available in the aarch64 blobs + select BR2_PACKAGE_HAS_LIBGBM if BR2_aarch64 + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF if BR2_aarch64 + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT if BR2_aarch64 select BR2_PACKAGE_HAS_LIBOPENCL select BR2_PACKAGE_HAS_LIBOPENVG help @@ -82,6 +86,13 @@ config BR2_PACKAGE_PROVIDES_LIBOPENCL config BR2_PACKAGE_PROVIDES_LIBOPENVG default "imx-gpu-viv" +if BR2_aarch64 + +config BR2_PACKAGE_PROVIDES_LIBGBM + default "imx-gpu-viv" + +endif + config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES bool "install examples" # example binaries are linked against libstdc++.so.6 diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index ace025c656..1d76d79e2b 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -19,6 +19,11 @@ IMX_GPU_VIV_LICENSE_FILES = EULA COPYING IMX_GPU_VIV_REDISTRIBUTE = NO IMX_GPU_VIV_PROVIDES = libegl libgles libopencl libopenvg + +ifeq ($(BR2_aarch64),y) +IMX_GPU_VIV_PROVIDES += libgbm +endif + IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) From thomas.petazzoni at bootlin.com Sat Jan 8 18:04:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:04:33 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: use the libgbm virtual package Message-ID: <20220108175845.C27DB82BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ba2ee0b7a756c6499febf30f7db0346f2c1e6f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that we have a libgbm virtual package, it makes sense to use it to replace the open-coded list of gbm providers in qt5base. All of mesa3d, gcnano-binaries, ti-sgx-um and imx-gpu-viv are libgbm providers now. Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ec5264bfc9..4db2294ad3 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -69,19 +69,9 @@ else QT5BASE_CONFIGURE_OPTS += -no-kms endif -# Uses libgbm from mesa3d -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += mesa3d -else ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) -QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += gcnano-binaries -else ifeq ($(BR2_PACKAGE_TI_SGX_UM),y) -QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += ti-sgx-um -else ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) -QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += imx-gpu-viv +QT5BASE_DEPENDENCIES += libgbm else QT5BASE_CONFIGURE_OPTS += -no-gbm endif From thomas.petazzoni at bootlin.com Sat Jan 8 18:07:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:07:07 +0100 Subject: [git commit] DEVELOPERS: add entry for mali-driver to Miquèl Raynal Message-ID: <20220108180112.D651882BDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d41f020bdc974a44b3e83da0daaa42ff109d157e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index eb605b9170..2eeba07002 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2022,6 +2022,7 @@ N: Min Xu F: package/shadowsocks-libev/ N: Miqu??l Raynal +F: package/mali-driver/ F: package/rockchip-mali/ N: Mircea Gliga From thomas.petazzoni at bootlin.com Sat Jan 8 18:07:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:07:43 +0100 Subject: [Buildroot] [PATCH 4/7] package/mali-bifrost-driver: new package In-Reply-To: <20200306071440.30433-5-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-5-miquel.raynal@bootlin.com> Message-ID: <20220108190743.3ccfc87c@windsurf> On Fri, 6 Mar 2020 08:14:37 +0100 Miquel Raynal wrote: > Add a new package to build and install a generic ARM Mali Bifrost GPU > Linux kernel module. > > This module is compliant with the standard kernel-module > infrastructure. > > Signed-off-by: Miquel Raynal > --- > package/Config.in | 1 + > package/mali-bifrost-driver/Config.in | 17 +++++++++++++++++ > .../mali-bifrost-driver.hash | 3 +++ > .../mali-bifrost-driver/mali-bifrost-driver.mk | 15 +++++++++++++++ > 4 files changed, 36 insertions(+) > create mode 100644 package/mali-bifrost-driver/Config.in > create mode 100644 package/mali-bifrost-driver/mali-bifrost-driver.hash > create mode 100644 package/mali-bifrost-driver/mali-bifrost-driver.mk I finally applied, after renaming to "mali-driver", updating to the latest version, and doing a few small changes. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 18:07:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 19:07:51 +0100 Subject: [Buildroot] [git commit] package/hackrf: add a comma between licenses Message-ID: <20220108180145.BF08482BDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4afa6fd8c1457dce95b830da3ad3b0d255ca1d09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/hackrf/hackrf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 391bddcdb0..d80f87e6b9 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -7,7 +7,7 @@ HACKRF_VERSION = 2018.01.1 HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz -HACKRF_LICENSE = GPL-2.0+ BSD-3-Clause +HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host From thomas.petazzoni at bootlin.com Sat Jan 8 18:08:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:08:53 +0100 Subject: [Buildroot] [PATCH 5/7] package/qt5: make it possible to use rockchip-mali-bifrost as GBM provider In-Reply-To: <20200306071440.30433-6-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-6-miquel.raynal@bootlin.com> Message-ID: <20220108190853.79d9922f@windsurf> On Fri, 6 Mar 2020 08:14:38 +0100 Miquel Raynal wrote: > From: Thomas Petazzoni > > Signed-off-by: Thomas Petazzoni > Signed-off-by: Miquel Raynal I did not apply this patch. Instead, I reworked qt5base.mk to use the libgbm virtual package. And since the rockhip-mali package is a provider of libgbm, qt5base is able to use it. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 18:10:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 19:10:37 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig In-Reply-To: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> References: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> Message-ID: <20220108181037.GC1881783@scaer> Fabrice, All, On 2022-01-08 17:46 +0100, Fabrice Fontaine spake thusly: > .defconfig has not been updated since 2016 with commit > 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't > seem to be used This breaks out-of-tree builds: $ mkdir /tmp/foo $ cd /tmp/foo $ make -C /path/to/buildroot O=$(pwd) defconfig [...] *** *** Can't find default configuration ".defconfig"! *** make[1]: *** [Makefile:1024: defconfig] Error 1 make: *** [Makefile:23: _all] Error 2 So, rejected (although I do agree that this should work...) Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > .defconfig | 51 --------------------------------------------------- > 1 file changed, 51 deletions(-) > delete mode 100644 .defconfig > > diff --git a/.defconfig b/.defconfig > deleted file mode 100644 > index 7ab0c3fbf0..0000000000 > --- a/.defconfig > +++ /dev/null > @@ -1,51 +0,0 @@ > -# > -# Automatically generated make config: don't edit > -# Mon Feb 18 09:11:56 2008 > -# > -BR2_HAVE_DOT_CONFIG=y > -# BR2_alpha is not set > -# BR2_arm is not set > -# BR2_armeb is not set > -# BR2_cris is not set > -# BR2_ia64 is not set > -BR2_i386=y > -# BR2_m68k is not set > -# BR2_mips is not set > -# BR2_mipsel is not set > -# BR2_nios2 is not set > -# BR2_powerpc is not set > -# BR2_sh is not set > -# BR2_sparc is not set > -# BR2_sparc64 is not set > -# BR2_x86_64 is not set > -# BR2_x86_i486 is not set > -# BR2_x86_i586 is not set > -BR2_x86_i686=y > -# BR2_x86_pentiumpro is not set > -# BR2_x86_pentium_mmx is not set > -# BR2_x86_pentium_m is not set > -# BR2_x86_pentium2 is not set > -# BR2_x86_pentium3 is not set > -# BR2_x86_pentium4 is not set > -# BR2_x86_prescott is not set > -# BR2_x86_nocona is not set > -# BR2_x86_core2 is not set > -# BR2_x86_k6 is not set > -# BR2_x86_k6_2 is not set > -# BR2_x86_athlon is not set > -# BR2_x86_athlon_4 is not set > -# BR2_x86_opteron is not set > -# BR2_x86_opteron_sse3 is not set > -# BR2_x86_barcelona is not set > -# BR2_x86_geode is not set > -# BR2_x86_c3 is not set > -# BR2_x86_winchip_c6 is not set > -# BR2_x86_winchip2 is not set > -BR2_ARCH="i686" > -BR2_ENDIAN="LITTLE" > -BR2_GCC_TARGET_TUNE="i686" > -BR2_GCC_TARGET_ARCH="i686" > - > -# > -# Target options > -# > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 8 18:10:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:10:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump to version 2021.07.01 In-Reply-To: <20220108190414.6b638ea8@gmx.net> References: <20220108162146.2735403-1-fontaine.fabrice@gmail.com> <20220108190414.6b638ea8@gmx.net> Message-ID: Hi Peter, Le sam. 8 janv. 2022 ? 19:04, Peter Seiderer a ?crit : > > Hello Fabrice, > > On Sat, 8 Jan 2022 17:21:46 +0100, Fabrice Fontaine wrote: > > > Signed-off-by: Fabrice Fontaine > > --- > > package/raspberrypi-usbboot/raspberrypi-usbboot.hash | 2 +- > > package/raspberrypi-usbboot/raspberrypi-usbboot.mk | 5 +++-- > > 2 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > > index 3f66b12ff1..cedc5fb7e1 100644 > > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash > > @@ -1,5 +1,5 @@ > > # Locally calculated > > -sha256 e4a07df05c23e0eba100d4013367e7823e3b8bc72da7b79b031bd346616c6ae5 raspberrypi-usbboot-9324fd7034b9d3606aed8a27da74d6d57e066e7e.tar.gz > > +sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz > > > > # License files > > sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > > diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > > index 5d7b433c64..2e4194da0b 100644 > > --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > > +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk > > @@ -4,8 +4,9 @@ > > # > > ################################################################################ > > > > -RASPBERRYPI_USBBOOT_VERSION = 9324fd7034b9d3606aed8a27da74d6d57e066e7e > > -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) > > +RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 > > $ git log --oneline --reverse > [...] > 9324fd7 Add native Raspberry Pi Imager port - beta > ead3e30 readme: add macOS build step > > 2048ae6 (2021.07.01) Merge pull request #83 from mrpollo/patch-1 > > 6c4d444 Update Raspberry Pi 4 EEPROM to pieeprom-2021-07-06 > 59830ea Merge pull request #85 from timg236/pieeprom-2021-07-06 > 8b1ccc1 Update changelog > 9a4887e Fix `install` and `uninstall` targets in Makefile. > 3840f3b Merge pull request #86 from cpb-/feature/add-install-target-in-makefile > ff986e4 bootloader: Remove NVMe beta files > c2da05c Merge pull request #88 from peterharperuk/remove_nvme > 4608d57 Update bootcode4.bin > 76e856d Merge pull request #89 from peterharperuk/master_update > 8bcd5ce Bump bootcode.bin > d1a9a5c beta: Add support for secure-boot - see Readme.md > 6eb9976 secure-boot: Added example boot.img > 78e1830 make-boot-image: Fix typo in docs AFT_SIZE -> FAT_SIZE > 58bdaf4 make-boot-image: Use losetup instead of udisksctl > 4bdd032 secure-boot BETA documentation updates > 5247ffe Merge pull request #77 from nils-werner/patch-1 > dc1b95f secure-boot: Move the example PEM file to secure-boot-example > 80945ed secure-boot: Update recovery,bootcode4 + EEPROM to latest beta - 2021-10-27 > a6e0d8b secure-boot: Update Readme to update max ramdisk size to 96MB > 14e28be Corrected the board flag > 7b429ab Merge pull request #96 from Dodain/master > 09852a9 Corrected the -b flag in the readme.md > 879641f Readme: Add docs for examining the contents of boot.img > 5f8c233 secure-boot: Add more documentation about the RSA signatures and add optional public key argument > d1ad057 Merge pull request #98 from timg236/secure-boot-hsm > 6154fe2 make-boot-image: Fix unmount and set GID > 8b390fe make-boot-image: Enable the image size to be specified > fc4035e Update the default EEPROM image to 2021-11-22 > a7ed8d1 rpi-eeprom-config: Pull in --edit fixes from rpi-eeprom repo > 83c9a96 Merge pull request #103 from timg236/pieeprom-2021-11-22 > 396b98f secure-boot-recovery: Update to latest 2021-11-22 EEPROM > 14ea684 msd: Fix non-2711 MSD support > 515b972 Update the default EEPROM image to 2021-12-02 > 1aca6bc Merge pull request #104 from peterharperuk/update_dec > e5e4994 Remove imager beta release > 8bb5820 Use pkg-config to locate libusb-1.0 > 6b05a3a bootloader: Enable revoke_devkey in secure-boot recovery.bin > a7d4ec4 (HEAD) Merge pull request #108 from timg236/secure-boot-revoke-devkey > > The version bump to 2021.07.01 gains one readme update, why not bump > to head/latest (after testing the result)? Because I prefer to bump to a stable release. This is "safer" and release-monitoring.org will warn us when a new version will be made available by usptream. For example, it is pretty likely that commit 8bb5820 will raise a build failure as pkg-config is hard-coded (but I have not tested it to confirm it). > > Regards, > Peter > > > > +RASPBERRYPI_USBBOOT_SITE = \ > > + $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) > > RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 > > RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE > > > Best Regards, Fabrice From thomas.petazzoni at bootlin.com Sat Jan 8 18:12:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:12:02 +0100 Subject: [Buildroot] [PATCH 6/7] package/qt5: generalize the condition on which EGLFS KMS gets supported In-Reply-To: <20200306071440.30433-7-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-7-miquel.raynal@bootlin.com> Message-ID: <20220108191202.374d45ae@windsurf> On Fri, 6 Mar 2020 08:14:39 +0100 Miquel Raynal wrote: > BR2_PACKAGE_HAS_LIBEGL indicates that the virtual libegl packet is > enabled. This packet may be provided by mesa3d (this is actually what > happens when selecting BR2_PACKAGE_MESA3D_OPENGL_EGL) but > other providers may exist. > > Generalize the condition on which EGLFS KMS support is added to Qt5 to > allow rockchip-mali-bifrost (and potentially other) to use the KMS > back-end. > > Suggested-by: Thomas Petazzoni > Signed-off-by: Miquel Raynal > --- > package/qt5/qt5base/qt5base.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This is no longer needed since commit 469829d9c55b7f5461e29f3f6436417836504410. All that conditional logic to determine which Qt libraries and plugins to install is gone, as we now use the Qt "make install" logic. So I'll mark this patch as Superseded. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 18:12:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 19:12:51 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig In-Reply-To: <20220108181037.GC1881783@scaer> References: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> <20220108181037.GC1881783@scaer> Message-ID: <20220108181251.GD1881783@scaer> Fabrice, All, On 2022-01-08 19:10 +0100, Yann E. MORIN spake thusly: > Fabrice, All, > > On 2022-01-08 17:46 +0100, Fabrice Fontaine spake thusly: > > .defconfig has not been updated since 2016 with commit > > 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't > > seem to be used > This breaks out-of-tree builds: Well, this is also broken for in-tree builds: $ git clean -dX $ make defconfig [...] *** *** Can't find default configuration ".defconfig"! *** make[1]: *** [Makefile:1024: defconfig] Error 1 make: *** [Makefile:84: _all] Error 2 So, meh... This file should indeed not be needed... Regards, Yann E. MORIN. > Regards, > Yann E. MORIN. > > > Signed-off-by: Fabrice Fontaine > > --- > > .defconfig | 51 --------------------------------------------------- > > 1 file changed, 51 deletions(-) > > delete mode 100644 .defconfig > > > > diff --git a/.defconfig b/.defconfig > > deleted file mode 100644 > > index 7ab0c3fbf0..0000000000 > > --- a/.defconfig > > +++ /dev/null > > @@ -1,51 +0,0 @@ > > -# > > -# Automatically generated make config: don't edit > > -# Mon Feb 18 09:11:56 2008 > > -# > > -BR2_HAVE_DOT_CONFIG=y > > -# BR2_alpha is not set > > -# BR2_arm is not set > > -# BR2_armeb is not set > > -# BR2_cris is not set > > -# BR2_ia64 is not set > > -BR2_i386=y > > -# BR2_m68k is not set > > -# BR2_mips is not set > > -# BR2_mipsel is not set > > -# BR2_nios2 is not set > > -# BR2_powerpc is not set > > -# BR2_sh is not set > > -# BR2_sparc is not set > > -# BR2_sparc64 is not set > > -# BR2_x86_64 is not set > > -# BR2_x86_i486 is not set > > -# BR2_x86_i586 is not set > > -BR2_x86_i686=y > > -# BR2_x86_pentiumpro is not set > > -# BR2_x86_pentium_mmx is not set > > -# BR2_x86_pentium_m is not set > > -# BR2_x86_pentium2 is not set > > -# BR2_x86_pentium3 is not set > > -# BR2_x86_pentium4 is not set > > -# BR2_x86_prescott is not set > > -# BR2_x86_nocona is not set > > -# BR2_x86_core2 is not set > > -# BR2_x86_k6 is not set > > -# BR2_x86_k6_2 is not set > > -# BR2_x86_athlon is not set > > -# BR2_x86_athlon_4 is not set > > -# BR2_x86_opteron is not set > > -# BR2_x86_opteron_sse3 is not set > > -# BR2_x86_barcelona is not set > > -# BR2_x86_geode is not set > > -# BR2_x86_c3 is not set > > -# BR2_x86_winchip_c6 is not set > > -# BR2_x86_winchip2 is not set > > -BR2_ARCH="i686" > > -BR2_ENDIAN="LITTLE" > > -BR2_GCC_TARGET_TUNE="i686" > > -BR2_GCC_TARGET_ARCH="i686" > > - > > -# > > -# Target options > > -# > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 8 18:19:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:19:20 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig In-Reply-To: <20220108181251.GD1881783@scaer> References: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> <20220108181037.GC1881783@scaer> <20220108181251.GD1881783@scaer> Message-ID: Yann, Le sam. 8 janv. 2022 ? 19:12, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-01-08 19:10 +0100, Yann E. MORIN spake thusly: > > Fabrice, All, > > > > On 2022-01-08 17:46 +0100, Fabrice Fontaine spake thusly: > > > .defconfig has not been updated since 2016 with commit > > > 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't > > > seem to be used > > This breaks out-of-tree builds: > > Well, this is also broken for in-tree builds: > > $ git clean -dX > $ make defconfig > [...] > *** > *** Can't find default configuration ".defconfig"! > *** > make[1]: *** [Makefile:1024: defconfig] Error 1 > make: *** [Makefile:84: _all] Error 2 > > So, meh... OK so this file is needed for "make defconfig". I'm always running "make xxx_defconfig" and "make menuconfig" However, perhaps it would be better to use a symlink for .defconfig? We could symlink it to raspberrypi4_defconfig or any other config. I found it strange that this file wasn't updated for so long. > > This file should indeed not be needed... > > Regards, > Yann E. MORIN. > > > Regards, > > Yann E. MORIN. > > > > > Signed-off-by: Fabrice Fontaine > > > --- > > > .defconfig | 51 --------------------------------------------------- > > > 1 file changed, 51 deletions(-) > > > delete mode 100644 .defconfig > > > > > > diff --git a/.defconfig b/.defconfig > > > deleted file mode 100644 > > > index 7ab0c3fbf0..0000000000 > > > --- a/.defconfig > > > +++ /dev/null > > > @@ -1,51 +0,0 @@ > > > -# > > > -# Automatically generated make config: don't edit > > > -# Mon Feb 18 09:11:56 2008 > > > -# > > > -BR2_HAVE_DOT_CONFIG=y > > > -# BR2_alpha is not set > > > -# BR2_arm is not set > > > -# BR2_armeb is not set > > > -# BR2_cris is not set > > > -# BR2_ia64 is not set > > > -BR2_i386=y > > > -# BR2_m68k is not set > > > -# BR2_mips is not set > > > -# BR2_mipsel is not set > > > -# BR2_nios2 is not set > > > -# BR2_powerpc is not set > > > -# BR2_sh is not set > > > -# BR2_sparc is not set > > > -# BR2_sparc64 is not set > > > -# BR2_x86_64 is not set > > > -# BR2_x86_i486 is not set > > > -# BR2_x86_i586 is not set > > > -BR2_x86_i686=y > > > -# BR2_x86_pentiumpro is not set > > > -# BR2_x86_pentium_mmx is not set > > > -# BR2_x86_pentium_m is not set > > > -# BR2_x86_pentium2 is not set > > > -# BR2_x86_pentium3 is not set > > > -# BR2_x86_pentium4 is not set > > > -# BR2_x86_prescott is not set > > > -# BR2_x86_nocona is not set > > > -# BR2_x86_core2 is not set > > > -# BR2_x86_k6 is not set > > > -# BR2_x86_k6_2 is not set > > > -# BR2_x86_athlon is not set > > > -# BR2_x86_athlon_4 is not set > > > -# BR2_x86_opteron is not set > > > -# BR2_x86_opteron_sse3 is not set > > > -# BR2_x86_barcelona is not set > > > -# BR2_x86_geode is not set > > > -# BR2_x86_c3 is not set > > > -# BR2_x86_winchip_c6 is not set > > > -# BR2_x86_winchip2 is not set > > > -BR2_ARCH="i686" > > > -BR2_ENDIAN="LITTLE" > > > -BR2_GCC_TARGET_TUNE="i686" > > > -BR2_GCC_TARGET_ARCH="i686" > > > - > > > -# > > > -# Target options > > > -# > > > -- > > > 2.34.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > -- > > .-----------------.--------------------.------------------.--------------------. > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > '------------------------------^-------^------------------^--------------------' > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From yann.morin.1998 at free.fr Sat Jan 8 18:22:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 19:22:19 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/pkg-generic.mk: fix absolute paths in per-package config files In-Reply-To: <20220106171720.12857-1-aduskett@gmail.com> References: <20220106171720.12857-1-aduskett@gmail.com> Message-ID: <20220108182219.GE1881783@scaer> Adam, All, On 2022-01-06 09:17 -0800, Adam Duskett spake thusly: > Some packages (notably qmake packages) generate .cmake, .pc, and .pri files > with absolute paths. Unfortunately, doing so breaks per-package builds because > the paths in those files point outside the per-package sysroot for packages > that have rsynced those same files. > > - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in pkg-generic.mk > to avoid more calls to ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > > - Add .cmake, .pc, and .pri files to the files of which to find to sed the > per-package paths. > > This simple fix allows qt5 submodule packages to build with per-package enabled. > > Based off of Louis-Paul's earlier work found here: > https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ > > And Yann Morin's feedback found here: > https://patchwork.ozlabs.org/project/buildroot/patch/20200217212350.29750-21-anaumann at ultratronik.de/ > > Signed-off-by: Adam Duskett Thanks for this iteration! While discussing with the otehr maintainers int he room, we concluded that we did want an even more generic soltuion, so I've sent a further series; https://lore.kernel.org/buildroot/cover.1641663315.git.yann.morin.1998 at free.fr/T/#t Thanks for your persistence! ;-) Regards, Yann E. MORIN. > --- > changes v3 -> v4: > - Further compress the method by simply adding the files to the already > existing find command. (Yann) > > changes v2 -> v3: > - Rename FIXUP_PYTHON_SYSCONFIGDATA to FIXUP_PER_PACKAGE_FILES in > pkg-generic.mk (Yann) > > - Combine FIXUP_CONFIG_FILES_ABSOLUTE_PATHS with FIXUP_PER_PACKAGE_FILES (Yann) > > changes v1 -> v2 > - Drop patches 2 and 3 and combine them into a single macro in pkg-generic.mk > - Move the PRE_CONFIGURE_HOOK to inner-generic-package so it actually runs > - Rename FIXUP_PC_FILES_ABSOLUTE_PATHS to FIXUP_CONFIG_FILES_ABSOLUTE_PATHS > - Use $(HOST_DIR) instead of $(STAGING_DIR) to cover both stagin and host > directories in a single step. > > package/pkg-generic.mk | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 6a5fe5507b..9952ff1963 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -113,8 +113,16 @@ endif > # fail. > # So we just use HOST_DIR as a starting point, and filter on the two directories > # of interest. > +# > +# When per-package is enabled, packages may generate files with absolute paths > +# that point to the packages per-package sysroot. However, this breaks > +# per-package isolation when the files are rsynced to a new package that depends > +# on the first package. because the hard-coded paths point to directories > +# outside the packages sysroot. Run sed on all .cmake, .pc, and .pri files in a > +# given packages sysroot containing the word "per-package" and replace the path > +# with the appropriate per-package directory. > ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define FIXUP_PYTHON_SYSCONFIGDATA > +define FIXUP_PER_PACKAGE_FILES > $(Q)find $(HOST_DIR) \ > \( -path '$(HOST_DIR)/lib/python*' \ > -o -path '$(STAGING_DIR)/usr/lib/python*' \ > @@ -122,6 +130,9 @@ define FIXUP_PYTHON_SYSCONFIGDATA > \( \( -name "_sysconfigdata*.pyc" -delete \) \ > -o \( -name "_sysconfigdata*.py" -print0 \) \ > \) \ > + -o -name "*.cmake" -print0 \ > + -o -name "*.pc" -print0 \ > + -o -name "*.pri" -print0 \ > | xargs -0 --no-run-if-empty \ > $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' > endef > @@ -836,7 +847,7 @@ $(2)_EXTRACT_CMDS ?= \ > $$(TAR_OPTIONS) -) > > # pre/post-steps hooks > -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA > +$(2)_POST_PREPARE_HOOKS += FIXUP_PER_PACKAGE_FILES > > ifeq ($$($(2)_TYPE),target) > ifneq ($$(HOST_$(2)_KCONFIG_VAR),) > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sat Jan 8 18:25:12 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 19:25:12 +0100 Subject: [Buildroot] [PATCH 1/1] toolchain/toolchain-external: Allow relative paths in BR2_TOOLCHAIN_EXTERNAL_PATH. In-Reply-To: <20210527145118.31373-1-juergen@jstuber.net> References: <20210527145118.31373-1-juergen@jstuber.net> Message-ID: Hello Juergen, Le 27/05/2021 ? 16:51, Juergen Stuber a ?crit?: > Convert BR2_TOOLCHAIN_EXTERNAL_PATH to an absolute path when used. > > Otherwise the symbolic links to the external toolchain binaries are > not installed in host/bin when BR2_TOOLCHAIN_EXTERNAL_PATH is relative. > This happens because TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER > changes directory into host/bin to create the symbolic links. > From there the tools are no longer found via the relative path and > a single symbolic link host/bin/$(prefix)-* is created instead. Indeed, using a relative path for BR2_TOOLCHAIN_EXTERNAL_PATH doesn't work $ ls -l test/ext-preinstalled-relative-toolchain/host/bin/* lrwxrwxrwx. 1 romnao romnao 95 8 janv. 19:18 'test/ext-preinstalled-relative-toolchain/host/bin/arm-none-linux-gnueabihf-*' -> '../toolchain/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-*' -rwxr-xr-x. 1 romnao romnao 21288 8 janv. 19:17 test/ext-preinstalled-relative-toolchain/host/bin/toolchain-wrapper With your patch applied the toolchain is imported correctly (busybox build). Reviewed-by: Romain Naour Best regards, Romain > > Signed-off-by: Juergen Stuber > --- > toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk > index 6d91cb5d1e..2b70007a34 100644 > --- a/toolchain/toolchain-external/pkg-toolchain-external.mk > +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk > @@ -68,7 +68,7 @@ TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain > ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) > TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) > else > -TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) > +TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(abspath $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))) > endif > > ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),) > From thomas.petazzoni at bootlin.com Sat Jan 8 18:27:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:27:51 +0100 Subject: [Buildroot] [git commit] package/qt5: enable eglfs_kms integration plugin for rockchip-mali Message-ID: <20220108182146.5A82E82D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e070d606675ce3750496128b50227673d5a47944 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to be able to use OpenGL with QT5 with a Rockchip Mali Bifrost GPU, a device integration provider has to be selected. We are interested in the KMS integration that works well with Mali Bifrost, make sure it gets build when using rockchip-mali-bifrost as OpenGL provider. Signed-off-by: Maxime Chevallier Signed-off-by: Miquel Raynal Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4db2294ad3..bcdf036f00 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -264,6 +264,9 @@ QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv else ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali +else ifeq ($(BR2_PACKAGE_ROCKCHIP_MALI),y) +# use kms backend +QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_kms endif ifneq ($(QT5BASE_CONFIG_FILE),) From thomas.petazzoni at bootlin.com Sat Jan 8 18:28:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:28:34 +0100 Subject: [Buildroot] [PATCH 7/7] package/qt5: allows using rockchip-mali-bifrost as OpenGL/KMS provider In-Reply-To: <20200306071440.30433-8-miquel.raynal@bootlin.com> References: <20200306071440.30433-1-miquel.raynal@bootlin.com> <20200306071440.30433-8-miquel.raynal@bootlin.com> Message-ID: <20220108192834.424eeeed@windsurf> On Fri, 6 Mar 2020 08:14:40 +0100 Miquel Raynal wrote: > From: Maxime Chevallier > > In order to be able to use OpenGL with QT5 with a Rockchip Mali > Bifrost GPU, a device integration provider has to be selected. We are > interested in the KMS integration that works well with Mali Bifrost, > make sure it gets build when using rockchip-mali-bifrost as OpenGL > provider. > > Signed-off-by: Maxime Chevallier > Signed-off-by: Miquel Raynal > --- > package/qt5/qt5base/qt5base.mk | 3 +++ > 1 file changed, 3 insertions(+) Applied to master, thanks. Ideally, I would like to understand better when this eglfs_kms device integration plugin can be used. If you (or Paul) have more insights about this, it would be very useful. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sat Jan 8 18:28:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 19:28:59 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: pre-create directories for services In-Reply-To: <20200726202449.7108-1-nolange79@gmail.com> References: <20200726202449.7108-1-nolange79@gmail.com> Message-ID: <8c4e865d-62e3-7e33-87f2-36547df54a1c@mind.be> On 26/07/2020 22:24, Norbert Lange wrote: > various services need directories in /var when they are started, > and create them if necessary. Creating those before, allows > those services to start even if /var is read-only. > > Signed-off-by: Norbert Lange I in the end applied this to master, but I think we should instead follow Jeremy's suggestion, as I'll explain in the v1 thread. Regards, Arnout > --- > v1->v2: > - dont use a new hook, use SYSTEMD_PERMISSIONS > - no conditionals, but variables that are set or not > --- > package/systemd/systemd.mk | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index c49922d78f..42da1c889f 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -317,12 +317,14 @@ endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) > SYSTEMD_CONF_OPTS += -Dlogind=true > +SYSTEMD_LOGIND_PERMISSIONS = /var/lib/systemd/linger d 755 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dlogind=false > endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) > SYSTEMD_CONF_OPTS += -Dmachined=true -Dnss-mymachines=true > +SYSTEMD_MACHINED_PERMISSIONS = /var/lib/machines d 700 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dmachined=false -Dnss-mymachines=false > endif > @@ -336,6 +338,7 @@ endif > ifeq ($(BR2_PACKAGE_SYSTEMD_HOMED),y) > SYSTEMD_CONF_OPTS += -Dhomed=true > SYSTEMD_DEPENDENCIES += cryptsetup openssl > +SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/home d 755 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dhomed=false > endif > @@ -380,12 +383,14 @@ endif > ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) > SYSTEMD_CONF_OPTS += -Dcoredump=true > SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing > +SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dcoredump=false > endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_PSTORE),y) > SYSTEMD_CONF_OPTS += -Dpstore=true > +SYSTEMD_PSTORE_PERMISSIONS = /var/lib/systemd/pstore d 755 0 0 - - - - - > else > SYSTEMD_CONF_OPTS += -Dpstore=false > endif > @@ -436,6 +441,7 @@ endif > ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) > SYSTEMD_CONF_OPTS += -Dtimesyncd=true > SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization > +SYSTEMD_TIMESYNCD_PERMISSIONS = /var/lib/systemd/timesync d 755 systemd-timesync systemd-timesync - - - - - > else > SYSTEMD_CONF_OPTS += -Dtimesyncd=false > endif > @@ -503,6 +509,19 @@ define SYSTEMD_INSTALL_IMAGES_CMDS > $(SYSTEMD_INSTALL_BOOT_FILES) > endef > > +define SYSTEMD_PERMISSIONS > + /var/spool d 755 0 0 - - - - - > + /var/lib d 755 0 0 - - - - - > + /var/lib/private d 700 0 0 - - - - - > + /var/log/private d 700 0 0 - - - - - > + /var/cache/private d 700 0 0 - - - - - > + $(SYSTEMD_LOGIND_PERMISSIONS) > + $(SYSTEMD_MACHINED_PERMISSIONS) > + $(SYSTEMD_HOMED_PERMISSIONS) > + $(SYSTEMD_PSTORE_PERMISSIONS) > + $(SYSTEMD_TIMESYNCD_PERMISSIONS) > +endef > + > define SYSTEMD_USERS > # udev user groups > - - input -1 * - - - Input device group > From thomas.petazzoni at bootlin.com Sat Jan 8 18:33:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:33:07 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/libcap: drop host-gperf dependency In-Reply-To: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> References: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> Message-ID: <20220108193307.6db645fa@windsurf> On Sun, 30 Aug 2020 12:00:57 +0200 Fabrice Fontaine wrote: > host-gperf dependency was added in commit > 5d8926add5da1b0bdfb90a41f4d7f857864c5524 without any explanation in the > commit message but gperf can be disabled through BUILD_GPERF since > https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=3c22870c762f7925b5ff143d76f9affbade275ba > > So use this variable and drop this unneeded dependency > > Signed-off-by: Fabrice Fontaine > --- > package/libcap/libcap.mk | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) So we discussed this with Yann, Peter and Arnout and found that host-gperf is really quick to build, and provides a better way for libcap to lookup symbols, thanks to a hash table. So we prefer to keep things as they are with the host-gperf dependency. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sat Jan 8 18:32:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:32:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/squid: bump to version 5.3 Message-ID: <20220108183241.3051683-1-fontaine.fabrice@gmail.com> 5.x is the latest stable version, 4.x is provided for archival purpose only and is not intended for general use in new installations. http://www.squid-cache.org/Versions/v5/squid-5.3-RELEASENOTES.html Signed-off-by: Fabrice Fontaine --- package/squid/squid.hash | 8 ++++---- package/squid/squid.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/squid/squid.hash b/package/squid/squid.hash index b1a8feb78e..e18ed8961e 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.17.tar.xz.asc -md5 47b94b2d27516f1764c9d5dc1b9645e5 squid-4.17.tar.xz -sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 squid-4.17.tar.xz +# From http://www.squid-cache.org/Versions/v5/squid-5.3.tar.xz.asc +md5 9249f30169ab6600e53b4f9b8129b3b0 squid-5.3.tar.xz +sha1 d3a8310c725616fa7565d60f3bf8fdf5fa20b15a squid-5.3.tar.xz # Locally calculated -sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418 squid-4.17.tar.xz +sha256 45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715 squid-5.3.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index a30a87e20d..3847fb49dc 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,9 +4,9 @@ # ################################################################################ -SQUID_VERSION = 4.17 +SQUID_VERSION = 5.3 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz -SQUID_SITE = http://www.squid-cache.org/Versions/v4 +SQUID_SITE = http://www.squid-cache.org/Versions/v5 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING SQUID_CPE_ID_VENDOR = squid-cache -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Jan 8 18:38:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 19:38:00 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220108183919.238c1885@gmx.net> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> <20220108183919.238c1885@gmx.net> Message-ID: <20220108193800.5f91ac3b@windsurf> On Sat, 8 Jan 2022 18:39:19 +0100 Peter Seiderer wrote: > The difference seems to be: > > $ diff -ru file-5.38/configure.ac file-5.41/configure.ac > [...] > @@ -88,7 +88,7 @@ > AC_SUBST(WARNINGS) > > dnl Checks for programs. > -AC_PROG_CC_STDC > +AC_PROG_CC > AC_USE_SYSTEM_EXTENSIONS > AM_PROG_CC_C_O > AC_C_BIGENDIAN > [...] > > According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or > use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 > feature is gone (still used for target/host in package/file/file.mk)... But why the solution we use for the target package doesn't work for the host package? Or perhaps we're no longer testing the target package with gcc 4.8 ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Sat Jan 8 18:43:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 19:43:07 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/systemd: pre-create directories for services In-Reply-To: <8c4e865d-62e3-7e33-87f2-36547df54a1c@mind.be> References: <20200726202449.7108-1-nolange79@gmail.com> <8c4e865d-62e3-7e33-87f2-36547df54a1c@mind.be> Message-ID: <4ef1b31c-9d29-1c05-5ce4-fbe6457bfc95@mind.be> On 08/01/2022 19:28, Arnout Vandecappelle wrote: > > > On 26/07/2020 22:24, Norbert Lange wrote: >> various services need directories in /var when they are started, >> and create them if necessary. Creating those before, allows >> those services to start even if /var is read-only. >> >> Signed-off-by: Norbert Lange > > ?I in the end applied this to master, but I think we should instead follow > Jeremy's suggestion, as I'll explain in the v1 thread. ?Never mind, after reading your reply to Jeremy in full, I think you have the greater authority there so I believe you if you say this is the proper approach. ?Regards, ?Arnout [snip] From romain.naour at smile.fr Sat Jan 8 18:43:11 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 19:43:11 +0100 Subject: [Buildroot] [PATCH] package/python-greenlet: enable as host package In-Reply-To: <20210623145231.19243-1-cyrilbur@gmail.com> References: <20210623145231.19243-1-cyrilbur@gmail.com> Message-ID: <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> Hello, Le 23/06/2021 ? 16:52, Cyril Bur a ?crit?: Why? There is not package using host-python-greenlet in the tree. Best regards, Romain > Signed-off-by: Cyril Bur > --- > package/python-greenlet/python-greenlet.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk > index 01d578a183..e90d1c0f56 100644 > --- a/package/python-greenlet/python-greenlet.mk > +++ b/package/python-greenlet/python-greenlet.mk > @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > > $(eval $(python-package)) > +$(eval $(host-python-package)) > From arnout at mind.be Sat Jan 8 18:45:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 19:45:38 +0100 Subject: [Buildroot] [PATCH 1/1] drop .defconfig In-Reply-To: References: <20220108164646.2737567-1-fontaine.fabrice@gmail.com> <20220108181037.GC1881783@scaer> <20220108181251.GD1881783@scaer> Message-ID: <50ba83a8-df9d-0146-ad7b-acc27545d1ef@mind.be> On 08/01/2022 19:19, Fabrice Fontaine wrote: > Yann, > > Le sam. 8 janv. 2022 ? 19:12, Yann E. MORIN a ?crit : >> >> Fabrice, All, >> >> On 2022-01-08 19:10 +0100, Yann E. MORIN spake thusly: >>> Fabrice, All, >>> >>> On 2022-01-08 17:46 +0100, Fabrice Fontaine spake thusly: >>>> .defconfig has not been updated since 2016 with commit >>>> 4338a319b72570e433fd7484f8a95e1e0e978941 so drop this file which doesn't >>>> seem to be used >>> This breaks out-of-tree builds: >> >> Well, this is also broken for in-tree builds: >> >> $ git clean -dX >> $ make defconfig >> [...] >> *** >> *** Can't find default configuration ".defconfig"! >> *** >> make[1]: *** [Makefile:1024: defconfig] Error 1 >> make: *** [Makefile:84: _all] Error 2 >> >> So, meh... > OK so this file is needed for "make defconfig". > I'm always running "make xxx_defconfig" and "make menuconfig" > However, perhaps it would be better to use a symlink for .defconfig? > We could symlink it to raspberrypi4_defconfig or any other config. > I found it strange that this file wasn't updated for so long. >> >> This file should indeed not be needed... Apparently the file is needed but the contents doesn't matter, so maybe replace it with just # This file is needed to make 'make defconfig' work. Regards, Arnout >> >> Regards, >> Yann E. MORIN. >> >>> Regards, >>> Yann E. MORIN. >>> >>>> Signed-off-by: Fabrice Fontaine >>>> --- >>>> .defconfig | 51 --------------------------------------------------- >>>> 1 file changed, 51 deletions(-) >>>> delete mode 100644 .defconfig >>>> >>>> diff --git a/.defconfig b/.defconfig >>>> deleted file mode 100644 >>>> index 7ab0c3fbf0..0000000000 >>>> --- a/.defconfig >>>> +++ /dev/null >>>> @@ -1,51 +0,0 @@ >>>> -# >>>> -# Automatically generated make config: don't edit >>>> -# Mon Feb 18 09:11:56 2008 >>>> -# >>>> -BR2_HAVE_DOT_CONFIG=y >>>> -# BR2_alpha is not set >>>> -# BR2_arm is not set >>>> -# BR2_armeb is not set >>>> -# BR2_cris is not set >>>> -# BR2_ia64 is not set >>>> -BR2_i386=y >>>> -# BR2_m68k is not set >>>> -# BR2_mips is not set >>>> -# BR2_mipsel is not set >>>> -# BR2_nios2 is not set >>>> -# BR2_powerpc is not set >>>> -# BR2_sh is not set >>>> -# BR2_sparc is not set >>>> -# BR2_sparc64 is not set >>>> -# BR2_x86_64 is not set >>>> -# BR2_x86_i486 is not set >>>> -# BR2_x86_i586 is not set >>>> -BR2_x86_i686=y >>>> -# BR2_x86_pentiumpro is not set >>>> -# BR2_x86_pentium_mmx is not set >>>> -# BR2_x86_pentium_m is not set >>>> -# BR2_x86_pentium2 is not set >>>> -# BR2_x86_pentium3 is not set >>>> -# BR2_x86_pentium4 is not set >>>> -# BR2_x86_prescott is not set >>>> -# BR2_x86_nocona is not set >>>> -# BR2_x86_core2 is not set >>>> -# BR2_x86_k6 is not set >>>> -# BR2_x86_k6_2 is not set >>>> -# BR2_x86_athlon is not set >>>> -# BR2_x86_athlon_4 is not set >>>> -# BR2_x86_opteron is not set >>>> -# BR2_x86_opteron_sse3 is not set >>>> -# BR2_x86_barcelona is not set >>>> -# BR2_x86_geode is not set >>>> -# BR2_x86_c3 is not set >>>> -# BR2_x86_winchip_c6 is not set >>>> -# BR2_x86_winchip2 is not set >>>> -BR2_ARCH="i686" >>>> -BR2_ENDIAN="LITTLE" >>>> -BR2_GCC_TARGET_TUNE="i686" >>>> -BR2_GCC_TARGET_ARCH="i686" >>>> - >>>> -# >>>> -# Target options >>>> -# >>>> -- >>>> 2.34.1 >>>> >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> -- >>> .-----------------.--------------------.------------------.--------------------. >>> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | >>> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | >>> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | >>> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | >>> '------------------------------^-------^------------------^--------------------' >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> >> -- >> .-----------------.--------------------.------------------.--------------------. >> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | >> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | >> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | >> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | >> '------------------------------^-------^------------------^--------------------' > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From fontaine.fabrice at gmail.com Sat Jan 8 18:46:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:46:26 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220108193800.5f91ac3b@windsurf> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> <20220108183919.238c1885@gmx.net> <20220108193800.5f91ac3b@windsurf> Message-ID: Le sam. 8 janv. 2022 ? 19:38, Thomas Petazzoni a ?crit : > > On Sat, 8 Jan 2022 18:39:19 +0100 > Peter Seiderer wrote: > > > The difference seems to be: > > > > $ diff -ru file-5.38/configure.ac file-5.41/configure.ac > > [...] > > @@ -88,7 +88,7 @@ > > AC_SUBST(WARNINGS) > > > > dnl Checks for programs. > > -AC_PROG_CC_STDC > > +AC_PROG_CC > > AC_USE_SYSTEM_EXTENSIONS > > AM_PROG_CC_C_O > > AC_C_BIGENDIAN > > [...] > > > > According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or > > use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 > > feature is gone (still used for target/host in package/file/file.mk)... > > But why the solution we use for the target package doesn't work for the > host package? > > Or perhaps we're no longer testing the target package with gcc 4.8 ? host-file is a dependency of file that's why we have only build failure with host-file. Build failures are raised only since the bump. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From arnout at mind.be Sat Jan 8 18:50:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 19:50:10 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220108193800.5f91ac3b@windsurf> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> <20220108183919.238c1885@gmx.net> <20220108193800.5f91ac3b@windsurf> Message-ID: On 08/01/2022 19:38, Thomas Petazzoni wrote: > On Sat, 8 Jan 2022 18:39:19 +0100 > Peter Seiderer wrote: > >> The difference seems to be: >> >> $ diff -ru file-5.38/configure.ac file-5.41/configure.ac >> [...] >> @@ -88,7 +88,7 @@ >> AC_SUBST(WARNINGS) >> >> dnl Checks for programs. >> -AC_PROG_CC_STDC >> +AC_PROG_CC >> AC_USE_SYSTEM_EXTENSIONS >> AM_PROG_CC_C_O >> AC_C_BIGENDIAN >> [...] >> >> According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or >> use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 >> feature is gone (still used for target/host in package/file/file.mk)... > > But why the solution we use for the target package doesn't work for the > host package? > > Or perhaps we're no longer testing the target package with gcc 4.8 ? sourcery-arm*.config uses the CodeSourcery toolchain which has gcc 4.8, so yes we should be testing it with gcc 4.8... Regards, Arnout From arnout at mind.be Sat Jan 8 18:33:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:33:39 +0100 Subject: [Buildroot] [git commit] package/systemd: pre-create directories for services Message-ID: <20220108185105.A359082693@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be256690788fefad93ab00f0233ddb9414d29727 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master various services need directories in /var when they are started, and create them if necessary. Creating those before, allows those services to start even if /var is read-only. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 404943c45c..17bb922f51 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -353,12 +353,14 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) SYSTEMD_CONF_OPTS += -Dlogind=true +SYSTEMD_LOGIND_PERMISSIONS = /var/lib/systemd/linger d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dlogind=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) SYSTEMD_CONF_OPTS += -Dmachined=true -Dnss-mymachines=true +SYSTEMD_MACHINED_PERMISSIONS = /var/lib/machines d 700 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dmachined=false -Dnss-mymachines=false endif @@ -372,6 +374,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HOMED),y) SYSTEMD_CONF_OPTS += -Dhomed=true SYSTEMD_DEPENDENCIES += cryptsetup openssl +SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/home d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dhomed=false endif @@ -416,12 +419,14 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing +SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dcoredump=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_PSTORE),y) SYSTEMD_CONF_OPTS += -Dpstore=true +SYSTEMD_PSTORE_PERMISSIONS = /var/lib/systemd/pstore d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dpstore=false endif @@ -502,6 +507,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization +SYSTEMD_TIMESYNCD_PERMISSIONS = /var/lib/systemd/timesync d 755 systemd-timesync systemd-timesync - - - - - else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif @@ -565,6 +571,19 @@ define SYSTEMD_INSTALL_IMAGES_CMDS $(SYSTEMD_INSTALL_BOOT_FILES) endef +define SYSTEMD_PERMISSIONS + /var/spool d 755 0 0 - - - - - + /var/lib d 755 0 0 - - - - - + /var/lib/private d 700 0 0 - - - - - + /var/log/private d 700 0 0 - - - - - + /var/cache/private d 700 0 0 - - - - - + $(SYSTEMD_LOGIND_PERMISSIONS) + $(SYSTEMD_MACHINED_PERMISSIONS) + $(SYSTEMD_HOMED_PERMISSIONS) + $(SYSTEMD_PSTORE_PERMISSIONS) + $(SYSTEMD_TIMESYNCD_PERMISSIONS) +endef + define SYSTEMD_USERS # udev user groups # systemd user groups From fontaine.fabrice at gmail.com Sat Jan 8 18:57:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 19:57:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: disable zoned on host Message-ID: <20220108185713.3193240-1-fontaine.fabrice@gmail.com> Disable zoned on host variant to avoid the following build failure since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 and https://github.com/kdave/btrfs-progs/commit/7953f4357bfc6c6526451bc889527b07f0840816: checking linux/blkzoned.h usability... yes checking linux/blkzoned.h presence... yes checking for linux/blkzoned.h... yes checking for struct blk_zone.capacity... no checking for BLKGETZONESZ defined in linux/blkzoned.h... no configure: error: linux/blkzoned.h does not provide blk_zone.capacity Fixes: - http://autobuild.buildroot.org/results/03235edd829436d784a9b214050cc97584f372fb Signed-off-by: Fabrice Fontaine --- package/btrfs-progs/btrfs-progs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 50c8e59e50..4c26cf0df5 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -41,6 +41,7 @@ HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ --disable-libudev \ + --disable-zoned \ --disable-zstd \ --disable-python \ --disable-convert -- 2.34.1 From arnout at mind.be Sat Jan 8 18:57:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:57:22 +0100 Subject: [Buildroot] [git commit] package/trinity: fix build with libexecinfo Message-ID: <20220108185255.76D4A81D36@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7dc225c38a0c81c2202bbfca1c5e674b47d09f26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: debug.o: in function `__show_backtrace': debug.c:(.text+0x10): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/bf78e4be9b9d9ca7d32f922d72ea6cd39a78d3d8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/trinity/trinity.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index befb8de826..4dca50c0b6 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -11,16 +11,24 @@ TRINITY_LICENSE = GPL-2.0 TRINITY_LICENSE_FILES = COPYING TRINITY_CPE_ID_VENDOR = trinity_project +TRINITY_LDFLAGS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +TRINITY_DEPENDENCIES += libexecinfo +TRINITY_LDFLAGS += -lexecinfo +endif + define TRINITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) endef define TRINITY_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LDFLAGS="$(TRINITY_LDFLAGS)" endef define TRINITY_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + LDFLAGS="$(TRINITY_LDFLAGS)" DESTDIR=$(TARGET_DIR)/usr install endef # Install helper scripts From arnout at mind.be Sat Jan 8 18:58:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:58:28 +0100 Subject: [Buildroot] [git commit] package/squid: bump to version 5.3 Message-ID: <20220108185255.91BC281D36@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efc07b7a1818787229ddb335ca26ff2cf03820ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 5.x is the latest stable version, 4.x is provided for archival purpose only and is not intended for general use in new installations. http://www.squid-cache.org/Versions/v5/squid-5.3-RELEASENOTES.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/squid/squid.hash | 8 ++++---- package/squid/squid.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/squid/squid.hash b/package/squid/squid.hash index b1a8feb78e..e18ed8961e 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.17.tar.xz.asc -md5 47b94b2d27516f1764c9d5dc1b9645e5 squid-4.17.tar.xz -sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 squid-4.17.tar.xz +# From http://www.squid-cache.org/Versions/v5/squid-5.3.tar.xz.asc +md5 9249f30169ab6600e53b4f9b8129b3b0 squid-5.3.tar.xz +sha1 d3a8310c725616fa7565d60f3bf8fdf5fa20b15a squid-5.3.tar.xz # Locally calculated -sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418 squid-4.17.tar.xz +sha256 45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715 squid-5.3.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index a30a87e20d..3847fb49dc 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,9 +4,9 @@ # ################################################################################ -SQUID_VERSION = 4.17 +SQUID_VERSION = 5.3 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz -SQUID_SITE = http://www.squid-cache.org/Versions/v4 +SQUID_SITE = http://www.squid-cache.org/Versions/v5 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING SQUID_CPE_ID_VENDOR = squid-cache From arnout at mind.be Sat Jan 8 18:57:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:57:59 +0100 Subject: [Buildroot] [git commit] package/babeltrace2: bump to version 2.0.4 Message-ID: <20220108185255.88EE3832FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f88a08aeedfb1d0ad57ee6b7f8ff306252308d6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop second patch (already in version) - Update indentation in hash file (two spaces) https://github.com/efficios/babeltrace/releases/tag/v2.0.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...test_trace_ir_ref.c-rename-user-structure.patch | 57 ---------------------- package/babeltrace2/babeltrace2.hash | 12 ++--- package/babeltrace2/babeltrace2.mk | 2 +- 3 files changed, 7 insertions(+), 64 deletions(-) diff --git a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch b/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch deleted file mode 100644 index ac9eee82d8..0000000000 --- a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 26 Sep 2020 22:03:10 +0200 -Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure - -Rename user structure to bt_user to avoid the following build failure -with uclibc: - -test_trace_ir_ref.c:41:8: error: redefinition of 'struct user' - struct user { - ^ -In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34, - from ../../src/common/assert.h:28, - from ../../src/lib/object.h:28, - from test_trace_ir_ref.c:25: -/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here - struct user - ^~~~ - -Fixes: - - http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/efficios/babeltrace/pull/115] ---- - tests/lib/test_trace_ir_ref.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c -index d5dfa9cf..70caf29c 100644 ---- a/tests/lib/test_trace_ir_ref.c -+++ b/tests/lib/test_trace_ir_ref.c -@@ -25,7 +25,7 @@ - - #define NR_TESTS 37 - --struct user { -+struct bt_user { - bt_trace_class *tc; - bt_stream_class *sc; - bt_event_class *ec; -@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp) - bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL; - bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL, - *weak_ec3 = NULL; -- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; -+ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; - - /* The only reference which exists at this point is on TC1. */ - tc1 = create_tc1(self_comp); --- -2.28.0 - diff --git a/package/babeltrace2/babeltrace2.hash b/package/babeltrace2/babeltrace2.hash index 27c47ba26f..164e65cded 100644 --- a/package/babeltrace2/babeltrace2.hash +++ b/package/babeltrace2/babeltrace2.hash @@ -1,8 +1,8 @@ -# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.3.tar.bz2.sha256 -sha256 a53625152554102d868ba8395347d0daba0bec9c4b854c3e9bd97c77b0bf04a0 babeltrace2-2.0.3.tar.bz2 +# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2.sha256 +sha256 774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca babeltrace2-2.0.4.tar.bz2 # Hash for license files -sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt +sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk index 1e03f5fdd2..eedfc72b8c 100644 --- a/package/babeltrace2/babeltrace2.mk +++ b/package/babeltrace2/babeltrace2.mk @@ -5,7 +5,7 @@ ################################################################################ BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace -BABELTRACE2_VERSION = 2.0.3 +BABELTRACE2_VERSION = 2.0.4 BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2 BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code) BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE From arnout at mind.be Sat Jan 8 18:57:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 19:57:33 +0100 Subject: [Buildroot] [git commit] package/refpolicy: bump to version 2.20220106 Message-ID: <20220108185255.80475832E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6691d122ce25fc580ca88243f79f75cc2808ca7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20220106 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...les-services-samba.te-make-crack-optional.patch | 83 ---------------------- ...les-services-wireguard.te-make-iptables-o.patch | 54 -------------- package/refpolicy/refpolicy.hash | 2 +- package/refpolicy/refpolicy.mk | 2 +- 4 files changed, 2 insertions(+), 139 deletions(-) diff --git a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch b/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch deleted file mode 100644 index 2dae5d4a76..0000000000 --- a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 7c58f2508efc115dea03e18e1fa611ebf81f6ee6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:12:01 +0200 -Subject: [PATCH] policy/modules/services/samba.te: make crack optional - -Make crack optional to avoid the following build failure: - - Compiling targeted policy.31 - env LD_LIBRARY_PATH="/tmp/instance-5/output-1/host/lib:/tmp/instance-5/output-1/host/usr/lib" /tmp/instance-5/output-1/host/usr/bin/checkpolicy -c 31 -U deny -S -O -E policy.conf -o policy.31 - policy/modules/services/samba.te:399:ERROR 'type crack_db_t is not within scope' at token ';' on line 360232: - allow smbd_t crack_db_t:dir { getattr search open }; - #line 399 - checkpolicy: error(s) encountered while parsing configuration - -Fixes: - - http://autobuild.buildroot.org/results/ab7098948d1920e42fa587e07f0513f23ba7fc74 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/407] ---- - policy/modules/services/samba.te | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) - -diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te -index 9d4665ae6..6c37625a9 100644 ---- a/policy/modules/services/samba.te -+++ b/policy/modules/services/samba.te -@@ -396,8 +396,6 @@ userdom_signal_all_users(smbd_t) - userdom_home_filetrans_user_home_dir(smbd_t) - userdom_user_home_dir_filetrans_user_home_content(smbd_t, { dir file lnk_file sock_file fifo_file }) - --usermanage_read_crack_db(smbd_t) -- - ifdef(`hide_broken_symptoms',` - files_dontaudit_getattr_default_dirs(smbd_t) - files_dontaudit_getattr_boot_dirs(smbd_t) -@@ -413,18 +411,6 @@ tunable_policy(`samba_create_home_dirs',` - userdom_create_user_home_dirs(smbd_t) - ') - --tunable_policy(`samba_domain_controller',` -- gen_require(` -- class passwd passwd; -- ') -- -- usermanage_domtrans_passwd(smbd_t) -- usermanage_kill_passwd(smbd_t) -- usermanage_domtrans_useradd(smbd_t) -- usermanage_domtrans_groupadd(smbd_t) -- allow smbd_t self:passwd passwd; --') -- - tunable_policy(`samba_enable_home_dirs',` - userdom_manage_user_home_content_dirs(smbd_t) - userdom_manage_user_home_content_files(smbd_t) -@@ -505,6 +491,24 @@ optional_policy(` - seutil_sigchld_newrole(smbd_t) - ') - -+optional_policy(` -+ usermanage_read_crack_db(smbd_t) -+') -+ -+optional_policy(` -+ tunable_policy(`samba_domain_controller',` -+ gen_require(` -+ class passwd passwd; -+ ') -+ -+ usermanage_domtrans_passwd(smbd_t) -+ usermanage_kill_passwd(smbd_t) -+ usermanage_domtrans_useradd(smbd_t) -+ usermanage_domtrans_groupadd(smbd_t) -+ allow smbd_t self:passwd passwd; -+ ') -+') -+ - ######################################## - # - # Nmbd Local policy --- -2.30.2 - diff --git a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch b/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch deleted file mode 100644 index 4cd1f96558..0000000000 --- a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 67394d078c2e1438293b25d08cf408b0b0d55755 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 22 Sep 2021 23:55:59 +0200 -Subject: [PATCH] policy/modules/services/wireguard.te: make iptables optional - -Make iptables optional to avoid the following build failure raised since -version 2.20210908 and -https://github.com/SELinuxProject/refpolicy/commit/7f1a7b1cacd5d211077ce62fbb4e91890e65c820: - - Compiling targeted policy.33 - env LD_LIBRARY_PATH="/tmp/instance-0/output-1/host/lib:/tmp/instance-0/output-1/host/usr/lib" /tmp/instance-0/output-1/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 - policy/modules/services/wireguard.te:66:ERROR 'type iptables_exec_t is not within scope' at token ';' on line 591892: - #line 66 - allow wireguard_t iptables_exec_t:file { getattr open map read execute ioctl }; - checkpolicy: error(s) encountered while parsing configuration - make[1]: *** [Rules.monolithic:79: policy.33] Error 1 - -Fixes: - - http://autobuild.buildroot.org/results/a4223accc6adb70b06fd4e74ca4f28484446b6fa - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/408] ---- - policy/modules/services/wireguard.te | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/policy/modules/services/wireguard.te b/policy/modules/services/wireguard.te -index 7241f65e6..33fd3c55d 100644 ---- a/policy/modules/services/wireguard.te -+++ b/policy/modules/services/wireguard.te -@@ -61,10 +61,6 @@ corecmd_exec_shell(wireguard_t) - - domain_use_interactive_fds(wireguard_t) - --# wg-quick can be configured to run iptables and other networking --# config tools when bringing up/down the wg interfaces --iptables_domtrans(wireguard_t) -- - # wg-quick tries to read /proc/filesystem when running "stat" and "mv" commands - kernel_dontaudit_read_system_state(wireguard_t) - kernel_dontaudit_search_kernel_sysctl(wireguard_t) -@@ -75,3 +71,9 @@ miscfiles_read_localization(wireguard_t) - sysnet_run_ifconfig(wireguard_t, wireguard_roles) - - userdom_use_user_terminals(wireguard_t) -+ -+# wg-quick can be configured to run iptables and other networking -+# config tools when bringing up/down the wg interfaces -+optional_policy(` -+ iptables_domtrans(wireguard_t) -+') --- -2.33.0 - diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index b8f6f023eb..b08c22ed4e 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 4d3140d9fbb91322f5de36d73959464ce1d8946dcd149e36fcaf60e92444e902 refpolicy-2.20210908.tar.bz2 +sha256 965f98f0b68a24fd0b8e8d973d319332aea88973e1d6c455ef9c2a31aefaeaa6 refpolicy-2.20220106.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 975c3b584c..44c50af278 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20210908 +REFPOLICY_VERSION = 2.20220106 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) endif From arnout at mind.be Sat Jan 8 19:00:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:00:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/squid: bump to version 5.3 In-Reply-To: <20220108183241.3051683-1-fontaine.fabrice@gmail.com> References: <20220108183241.3051683-1-fontaine.fabrice@gmail.com> Message-ID: <22056f35-a7a1-a900-b8e5-4cb5735a9eb7@mind.be> On 08/01/2022 19:32, Fabrice Fontaine wrote: > 5.x is the latest stable version, 4.x is provided for archival purpose > only and is not intended for general use in new installations. > > http://www.squid-cache.org/Versions/v5/squid-5.3-RELEASENOTES.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/squid/squid.hash | 8 ++++---- > package/squid/squid.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/squid/squid.hash b/package/squid/squid.hash > index b1a8feb78e..e18ed8961e 100644 > --- a/package/squid/squid.hash > +++ b/package/squid/squid.hash > @@ -1,6 +1,6 @@ > -# From http://www.squid-cache.org/Versions/v4/squid-4.17.tar.xz.asc > -md5 47b94b2d27516f1764c9d5dc1b9645e5 squid-4.17.tar.xz > -sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 squid-4.17.tar.xz > +# From http://www.squid-cache.org/Versions/v5/squid-5.3.tar.xz.asc > +md5 9249f30169ab6600e53b4f9b8129b3b0 squid-5.3.tar.xz > +sha1 d3a8310c725616fa7565d60f3bf8fdf5fa20b15a squid-5.3.tar.xz > # Locally calculated > -sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418 squid-4.17.tar.xz > +sha256 45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715 squid-5.3.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/squid/squid.mk b/package/squid/squid.mk > index a30a87e20d..3847fb49dc 100644 > --- a/package/squid/squid.mk > +++ b/package/squid/squid.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -SQUID_VERSION = 4.17 > +SQUID_VERSION = 5.3 > SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz > -SQUID_SITE = http://www.squid-cache.org/Versions/v4 > +SQUID_SITE = http://www.squid-cache.org/Versions/v5 > SQUID_LICENSE = GPL-2.0+ > SQUID_LICENSE_FILES = COPYING > SQUID_CPE_ID_VENDOR = squid-cache > From arnout at mind.be Sat Jan 8 19:00:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:00:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/babeltrace2: bump to version 2.0.4 In-Reply-To: <20220108175811.2978380-1-fontaine.fabrice@gmail.com> References: <20220108175811.2978380-1-fontaine.fabrice@gmail.com> Message-ID: On 08/01/2022 18:58, Fabrice Fontaine wrote: > - Drop second patch (already in version) > - Update indentation in hash file (two spaces) > > https://github.com/efficios/babeltrace/releases/tag/v2.0.4 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...trace_ir_ref.c-rename-user-structure.patch | 57 ------------------- > package/babeltrace2/babeltrace2.hash | 12 ++-- > package/babeltrace2/babeltrace2.mk | 2 +- > 3 files changed, 7 insertions(+), 64 deletions(-) > delete mode 100644 package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch > > diff --git a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch b/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch > deleted file mode 100644 > index ac9eee82d8..0000000000 > --- a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch > +++ /dev/null > @@ -1,57 +0,0 @@ > -From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 26 Sep 2020 22:03:10 +0200 > -Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure > - > -Rename user structure to bt_user to avoid the following build failure > -with uclibc: > - > -test_trace_ir_ref.c:41:8: error: redefinition of 'struct user' > - struct user { > - ^ > -In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33, > - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25, > - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329, > - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, > - from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34, > - from ../../src/common/assert.h:28, > - from ../../src/lib/object.h:28, > - from test_trace_ir_ref.c:25: > -/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here > - struct user > - ^~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/efficios/babeltrace/pull/115] > ---- > - tests/lib/test_trace_ir_ref.c | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c > -index d5dfa9cf..70caf29c 100644 > ---- a/tests/lib/test_trace_ir_ref.c > -+++ b/tests/lib/test_trace_ir_ref.c > -@@ -25,7 +25,7 @@ > - > - #define NR_TESTS 37 > - > --struct user { > -+struct bt_user { > - bt_trace_class *tc; > - bt_stream_class *sc; > - bt_event_class *ec; > -@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp) > - bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL; > - bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL, > - *weak_ec3 = NULL; > -- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; > -+ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; > - > - /* The only reference which exists at this point is on TC1. */ > - tc1 = create_tc1(self_comp); > --- > -2.28.0 > - > diff --git a/package/babeltrace2/babeltrace2.hash b/package/babeltrace2/babeltrace2.hash > index 27c47ba26f..164e65cded 100644 > --- a/package/babeltrace2/babeltrace2.hash > +++ b/package/babeltrace2/babeltrace2.hash > @@ -1,8 +1,8 @@ > -# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.3.tar.bz2.sha256 > -sha256 a53625152554102d868ba8395347d0daba0bec9c4b854c3e9bd97c77b0bf04a0 babeltrace2-2.0.3.tar.bz2 > +# From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2.sha256 > +sha256 774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca babeltrace2-2.0.4.tar.bz2 > > # Hash for license files > -sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE > -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt > -sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt > -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt > +sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE > +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt > +sha256 c68fd1ffc1623ea0dace21abf57305818e4998a4ae0c79010aaaa943eb660b55 lgpl-2.1.txt > +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt > diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk > index 1e03f5fdd2..eedfc72b8c 100644 > --- a/package/babeltrace2/babeltrace2.mk > +++ b/package/babeltrace2/babeltrace2.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace > -BABELTRACE2_VERSION = 2.0.3 > +BABELTRACE2_VERSION = 2.0.4 > BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2 > BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code) > BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE > From arnout at mind.be Sat Jan 8 19:00:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:00:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/refpolicy: bump to version 2.20220106 In-Reply-To: <20220108174749.2898891-1-fontaine.fabrice@gmail.com> References: <20220108174749.2898891-1-fontaine.fabrice@gmail.com> Message-ID: <5d4ae946-0cca-183e-c6ee-ad08518d4e78@mind.be> On 08/01/2022 18:47, Fabrice Fontaine wrote: > Drop patches (already in version) > > https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20220106 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...ervices-samba.te-make-crack-optional.patch | 83 ------------------- > ...ervices-wireguard.te-make-iptables-o.patch | 54 ------------ > package/refpolicy/refpolicy.hash | 2 +- > package/refpolicy/refpolicy.mk | 2 +- > 4 files changed, 2 insertions(+), 139 deletions(-) > delete mode 100644 package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch > delete mode 100644 package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch > > diff --git a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch b/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch > deleted file mode 100644 > index 2dae5d4a76..0000000000 > --- a/package/refpolicy/2.20210908/0001-policy-modules-services-samba.te-make-crack-optional.patch > +++ /dev/null > @@ -1,83 +0,0 @@ > -From 7c58f2508efc115dea03e18e1fa611ebf81f6ee6 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Wed, 4 Aug 2021 11:12:01 +0200 > -Subject: [PATCH] policy/modules/services/samba.te: make crack optional > - > -Make crack optional to avoid the following build failure: > - > - Compiling targeted policy.31 > - env LD_LIBRARY_PATH="/tmp/instance-5/output-1/host/lib:/tmp/instance-5/output-1/host/usr/lib" /tmp/instance-5/output-1/host/usr/bin/checkpolicy -c 31 -U deny -S -O -E policy.conf -o policy.31 > - policy/modules/services/samba.te:399:ERROR 'type crack_db_t is not within scope' at token ';' on line 360232: > - allow smbd_t crack_db_t:dir { getattr search open }; > - #line 399 > - checkpolicy: error(s) encountered while parsing configuration > - > -Fixes: > - - http://autobuild.buildroot.org/results/ab7098948d1920e42fa587e07f0513f23ba7fc74 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/407] > ---- > - policy/modules/services/samba.te | 32 ++++++++++++++++++-------------- > - 1 file changed, 18 insertions(+), 14 deletions(-) > - > -diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te > -index 9d4665ae6..6c37625a9 100644 > ---- a/policy/modules/services/samba.te > -+++ b/policy/modules/services/samba.te > -@@ -396,8 +396,6 @@ userdom_signal_all_users(smbd_t) > - userdom_home_filetrans_user_home_dir(smbd_t) > - userdom_user_home_dir_filetrans_user_home_content(smbd_t, { dir file lnk_file sock_file fifo_file }) > - > --usermanage_read_crack_db(smbd_t) > -- > - ifdef(`hide_broken_symptoms',` > - files_dontaudit_getattr_default_dirs(smbd_t) > - files_dontaudit_getattr_boot_dirs(smbd_t) > -@@ -413,18 +411,6 @@ tunable_policy(`samba_create_home_dirs',` > - userdom_create_user_home_dirs(smbd_t) > - ') > - > --tunable_policy(`samba_domain_controller',` > -- gen_require(` > -- class passwd passwd; > -- ') > -- > -- usermanage_domtrans_passwd(smbd_t) > -- usermanage_kill_passwd(smbd_t) > -- usermanage_domtrans_useradd(smbd_t) > -- usermanage_domtrans_groupadd(smbd_t) > -- allow smbd_t self:passwd passwd; > --') > -- > - tunable_policy(`samba_enable_home_dirs',` > - userdom_manage_user_home_content_dirs(smbd_t) > - userdom_manage_user_home_content_files(smbd_t) > -@@ -505,6 +491,24 @@ optional_policy(` > - seutil_sigchld_newrole(smbd_t) > - ') > - > -+optional_policy(` > -+ usermanage_read_crack_db(smbd_t) > -+') > -+ > -+optional_policy(` > -+ tunable_policy(`samba_domain_controller',` > -+ gen_require(` > -+ class passwd passwd; > -+ ') > -+ > -+ usermanage_domtrans_passwd(smbd_t) > -+ usermanage_kill_passwd(smbd_t) > -+ usermanage_domtrans_useradd(smbd_t) > -+ usermanage_domtrans_groupadd(smbd_t) > -+ allow smbd_t self:passwd passwd; > -+ ') > -+') > -+ > - ######################################## > - # > - # Nmbd Local policy > --- > -2.30.2 > - > diff --git a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch b/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch > deleted file mode 100644 > index 4cd1f96558..0000000000 > --- a/package/refpolicy/2.20210908/0002-policy-modules-services-wireguard.te-make-iptables-o.patch > +++ /dev/null > @@ -1,54 +0,0 @@ > -From 67394d078c2e1438293b25d08cf408b0b0d55755 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Wed, 22 Sep 2021 23:55:59 +0200 > -Subject: [PATCH] policy/modules/services/wireguard.te: make iptables optional > - > -Make iptables optional to avoid the following build failure raised since > -version 2.20210908 and > -https://github.com/SELinuxProject/refpolicy/commit/7f1a7b1cacd5d211077ce62fbb4e91890e65c820: > - > - Compiling targeted policy.33 > - env LD_LIBRARY_PATH="/tmp/instance-0/output-1/host/lib:/tmp/instance-0/output-1/host/usr/lib" /tmp/instance-0/output-1/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 > - policy/modules/services/wireguard.te:66:ERROR 'type iptables_exec_t is not within scope' at token ';' on line 591892: > - #line 66 > - allow wireguard_t iptables_exec_t:file { getattr open map read execute ioctl }; > - checkpolicy: error(s) encountered while parsing configuration > - make[1]: *** [Rules.monolithic:79: policy.33] Error 1 > - > -Fixes: > - - http://autobuild.buildroot.org/results/a4223accc6adb70b06fd4e74ca4f28484446b6fa > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/SELinuxProject/refpolicy/pull/408] > ---- > - policy/modules/services/wireguard.te | 10 ++++++---- > - 1 file changed, 6 insertions(+), 4 deletions(-) > - > -diff --git a/policy/modules/services/wireguard.te b/policy/modules/services/wireguard.te > -index 7241f65e6..33fd3c55d 100644 > ---- a/policy/modules/services/wireguard.te > -+++ b/policy/modules/services/wireguard.te > -@@ -61,10 +61,6 @@ corecmd_exec_shell(wireguard_t) > - > - domain_use_interactive_fds(wireguard_t) > - > --# wg-quick can be configured to run iptables and other networking > --# config tools when bringing up/down the wg interfaces > --iptables_domtrans(wireguard_t) > -- > - # wg-quick tries to read /proc/filesystem when running "stat" and "mv" commands > - kernel_dontaudit_read_system_state(wireguard_t) > - kernel_dontaudit_search_kernel_sysctl(wireguard_t) > -@@ -75,3 +71,9 @@ miscfiles_read_localization(wireguard_t) > - sysnet_run_ifconfig(wireguard_t, wireguard_roles) > - > - userdom_use_user_terminals(wireguard_t) > -+ > -+# wg-quick can be configured to run iptables and other networking > -+# config tools when bringing up/down the wg interfaces > -+optional_policy(` > -+ iptables_domtrans(wireguard_t) > -+') > --- > -2.33.0 > - > diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash > index b8f6f023eb..b08c22ed4e 100644 > --- a/package/refpolicy/refpolicy.hash > +++ b/package/refpolicy/refpolicy.hash > @@ -1,5 +1,5 @@ > # From https://github.com/SELinuxProject/refpolicy/releases > -sha256 4d3140d9fbb91322f5de36d73959464ce1d8946dcd149e36fcaf60e92444e902 refpolicy-2.20210908.tar.bz2 > +sha256 965f98f0b68a24fd0b8e8d973d319332aea88973e1d6c455ef9c2a31aefaeaa6 refpolicy-2.20220106.tar.bz2 > > # Locally computed > sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING > diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk > index 975c3b584c..44c50af278 100644 > --- a/package/refpolicy/refpolicy.mk > +++ b/package/refpolicy/refpolicy.mk > @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) > REFPOLICY_SITE_METHOD = git > BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) > else > -REFPOLICY_VERSION = 2.20210908 > +REFPOLICY_VERSION = 2.20220106 > REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 > REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) > endif > From arnout at mind.be Sat Jan 8 19:01:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:01:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/trinity: fix build with libexecinfo In-Reply-To: <20220108154118.2320814-1-fontaine.fabrice@gmail.com> References: <20220108154118.2320814-1-fontaine.fabrice@gmail.com> Message-ID: <2d3fc713-d7dd-3821-338d-768a17102abc@mind.be> On 08/01/2022 16:41, Fabrice Fontaine wrote: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: debug.o: in function `__show_backtrace': > debug.c:(.text+0x10): undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/bf78e4be9b9d9ca7d32f922d72ea6cd39a78d3d8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/trinity/trinity.mk | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk > index befb8de826..4dca50c0b6 100644 > --- a/package/trinity/trinity.mk > +++ b/package/trinity/trinity.mk > @@ -11,16 +11,24 @@ TRINITY_LICENSE = GPL-2.0 > TRINITY_LICENSE_FILES = COPYING > TRINITY_CPE_ID_VENDOR = trinity_project > > +TRINITY_LDFLAGS = $(TARGET_LDFLAGS) > + > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +TRINITY_DEPENDENCIES += libexecinfo > +TRINITY_LDFLAGS += -lexecinfo > +endif > + > define TRINITY_CONFIGURE_CMDS > (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) > endef > > define TRINITY_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) > + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LDFLAGS="$(TRINITY_LDFLAGS)" > endef > > define TRINITY_INSTALL_TARGET_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install > + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ > + LDFLAGS="$(TRINITY_LDFLAGS)" DESTDIR=$(TARGET_DIR)/usr install > endef > > # Install helper scripts > From cyrilbur at gmail.com Sat Jan 8 19:03:17 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Sat, 8 Jan 2022 19:03:17 +0000 Subject: [Buildroot] [PATCH] package/python-greenlet: enable as host package In-Reply-To: <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> References: <20210623145231.19243-1-cyrilbur@gmail.com> <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> Message-ID: Hi Romain, Thanks for your interest. My employer has some custom packages which do depend on host python greenlet. I'm keen to avoid any forks (however small) of buildroot internally, it just makes life easier. Cyril On Sat, 8 Jan 2022, 18:43 Romain Naour, wrote: > Hello, > > Le 23/06/2021 ? 16:52, Cyril Bur a ?crit : > > Why? > > There is not package using host-python-greenlet in the tree. > > Best regards, > Romain > > > Signed-off-by: Cyril Bur > > --- > > package/python-greenlet/python-greenlet.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/python-greenlet/python-greenlet.mk > b/package/python-greenlet/python-greenlet.mk > > index 01d578a183..e90d1c0f56 100644 > > --- a/package/python-greenlet/python-greenlet.mk > > +++ b/package/python-greenlet/python-greenlet.mk > > @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > > PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > > > > $(eval $(python-package)) > > +$(eval $(host-python-package)) > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Sat Jan 8 19:04:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 12:04:04 -0700 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <20201126152832.1115350-1-nolange79@gmail.com> References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange wrote: > > Systemd has very many options, adding a way for the user > to set custom options can help customizations > without changing buildroot files. I'm not sure this is a good idea, if a configuration option needs customizability it probably needs a specific kconfig option. Systemd config options tend to require dependency selection and special handling so this seems likely to cause spurious errors due to improper usage. Seems to be a pretty big footgun IMO. What systemd configure option would you want to be using that isn't currently able to be enabled? > > Signed-off-by: Norbert Lange > --- > package/systemd/Config.in | 8 ++++++++ > package/systemd/systemd.mk | 2 ++ > 2 files changed, 10 insertions(+) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 2c89538987..946b2d9905 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -89,6 +89,14 @@ if BR2_PACKAGE_SYSTEMD > config BR2_PACKAGE_PROVIDES_UDEV > default "systemd" > > +config BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG > + string "Additional target systemd options" > + default "" > + help > + Any additional systemd configure options you may want to > + include. The options are appended to Buildroot generated > + options and can override these. > + > config BR2_PACKAGE_SYSTEMD_BOOT > bool "systemd-boot" > depends on BR2_i386 || BR2_x86_64 > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 2f1d898e0d..878e99ed00 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -500,6 +500,8 @@ ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) > SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) > endif > > +SYSTEMD_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_SYSTEMD_EXTRA_CONFIG)) > + > define SYSTEMD_INSTALL_INIT_HOOK > ln -fs multi-user.target \ > $(TARGET_DIR)/usr/lib/systemd/system/default.target > -- > 2.29.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From arnout at mind.be Sat Jan 8 19:08:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 20:08:02 +0100 Subject: [Buildroot] [git commit] systemd: ensure tmpfiles.d/legacy.conf is installed Message-ID: <20220108190207.B98B1832C7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e71f5111988fe57531d1c84bdf631f1932b14bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity isn't enabled. This config sets up /var/lock, which many programs such as uboot's fw_printenv/setenv still depend on by default. Signed-off-by: Joseph Kogut Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 17bb922f51..b3b5ed600d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -563,9 +563,17 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef +# systemd doesn't install legacy.conf without sysv-compat +# This config ensures /var/lock is created +define SYSTEMD_INSTALL_LEGACY_CONF_HOOK + $(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \ + $(TARGET_DIR)/usr/lib/tmpfiles.d +endef + SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_INIT_HOOK \ - SYSTEMD_INSTALL_MACHINEID_HOOK + SYSTEMD_INSTALL_MACHINEID_HOOK \ + SYSTEMD_INSTALL_LEGACY_CONF_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS $(SYSTEMD_INSTALL_BOOT_FILES) From arnout at mind.be Sat Jan 8 19:12:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:12:16 +0100 Subject: [Buildroot] [PATCH 1/1] systemd: ensure tmpfiles.d/legacy.conf is installed In-Reply-To: <20200825000246.4035-1-joseph.kogut@gmail.com> References: <20200825000246.4035-1-joseph.kogut@gmail.com> Message-ID: <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> On 25/08/2020 02:02, Joseph Kogut wrote: > Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity > isn't enabled. This config sets up /var/lock, which many programs such > as uboot's fw_printenv/setenv still depend on by default. > > Signed-off-by: Joseph Kogut After all the discussion, I did finally apply to master, thanks. For Norbert: we simply have legacy packages that write to /var/lock instead of /run/lock. In an ideal world, we'd patch all of them to do the right thing. However, that's not realistic. So let's enable this legacy stuff to make sure that those legacy packages don't actually write to disk. We could indeed instead enable sysv compatibility, for maximum support of legacy packages. What exactly would be the effects of that? Regards, Arnout > --- > package/systemd/systemd.mk | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index e356cb1add..8454993823 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -512,10 +512,18 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK > touch $(TARGET_DIR)/etc/machine-id > endef > > +# systemd doesn't install legacy.conf without sysv-compat > +# This config ensures /var/lock is created > +define SYSTEMD_INSTALL_LEGACY_CONF_HOOK > + $(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \ > + $(TARGET_DIR)/usr/lib/tmpfiles.d > +endef > + > SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ > SYSTEMD_INSTALL_INIT_HOOK \ > SYSTEMD_INSTALL_MACHINEID_HOOK \ > - SYSTEMD_INSTALL_RESOLVCONF_HOOK > + SYSTEMD_INSTALL_RESOLVCONF_HOOK \ > + SYSTEMD_INSTALL_LEGACY_CONF_HOOK > > define SYSTEMD_INSTALL_IMAGES_CMDS > $(SYSTEMD_INSTALL_BOOT_FILES) > From romain.naour at smile.fr Sat Jan 8 19:13:17 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 20:13:17 +0100 Subject: [Buildroot] [PATCH] package/python-greenlet: enable as host package In-Reply-To: References: <20210623145231.19243-1-cyrilbur@gmail.com> <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> Message-ID: Hello Cyril, Le 08/01/2022 ? 20:03, Cyril Bur a ?crit?: > Hi Romain, > > Thanks for your interest. > > My employer has some custom packages which do depend on host python > greenlet. > > I'm keen to avoid any forks (however small) of buildroot internally, it > just makes life easier. I understand. It seems there is an exception in the tree (host-python-lxml), but you have to add at least a Config.in.host: https://git.buildroot.net/buildroot/commit/?id=4f147ae0a0f940dfc7ec93af8e70b6625821d91d Also add a comment to explain why we don't have any package using it in the tree. I have marked this patch as "Changes Requested". Best regards, Romain > > Cyril > > > On Sat, 8 Jan 2022, 18:43 Romain Naour, wrote: > >> Hello, >> >> Le 23/06/2021 ? 16:52, Cyril Bur a ?crit : >> >> Why? >> >> There is not package using host-python-greenlet in the tree. >> >> Best regards, >> Romain >> >>> Signed-off-by: Cyril Bur >>> --- >>> package/python-greenlet/python-greenlet.mk | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/package/python-greenlet/python-greenlet.mk >> b/package/python-greenlet/python-greenlet.mk >>> index 01d578a183..e90d1c0f56 100644 >>> --- a/package/python-greenlet/python-greenlet.mk >>> +++ b/package/python-greenlet/python-greenlet.mk >>> @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 >>> PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF >>> >>> $(eval $(python-package)) >>> +$(eval $(host-python-package)) >>> >> >> > From cyrilbur at gmail.com Sat Jan 8 19:16:10 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Sat, 8 Jan 2022 19:16:10 +0000 Subject: [Buildroot] [PATCH] package/python-greenlet: enable as host package In-Reply-To: References: <20210623145231.19243-1-cyrilbur@gmail.com> <382b2896-92a6-4a75-0093-bea2b6f91bf9@smile.fr> Message-ID: On Sat, 8 Jan 2022, 19:13 Romain Naour, wrote: > Hello Cyril, > > Le 08/01/2022 ? 20:03, Cyril Bur a ?crit : > > Hi Romain, > > > > Thanks for your interest. > > > > My employer has some custom packages which do depend on host python > > greenlet. > > > > I'm keen to avoid any forks (however small) of buildroot internally, it > > just makes life easier. > > I understand. > > It seems there is an exception in the tree (host-python-lxml), but you > have to > add at least a Config.in.host: > Ah sorry! Yep will do. > > > https://git.buildroot.net/buildroot/commit/?id=4f147ae0a0f940dfc7ec93af8e70b6625821d91d > > Also add a comment to explain why we don't have any package using it in > the tree. > Perfect will do. Thanks, Cyril > > I have marked this patch as "Changes Requested". > > Best regards, > Romain > > > > > > Cyril > > > > > > On Sat, 8 Jan 2022, 18:43 Romain Naour, wrote: > > > >> Hello, > >> > >> Le 23/06/2021 ? 16:52, Cyril Bur a ?crit : > >> > >> Why? > >> > >> There is not package using host-python-greenlet in the tree. > >> > >> Best regards, > >> Romain > >> > >>> Signed-off-by: Cyril Bur > >>> --- > >>> package/python-greenlet/python-greenlet.mk | 1 + > >>> 1 file changed, 1 insertion(+) > >>> > >>> diff --git a/package/python-greenlet/python-greenlet.mk > >> b/package/python-greenlet/python-greenlet.mk > >>> index 01d578a183..e90d1c0f56 100644 > >>> --- a/package/python-greenlet/python-greenlet.mk > >>> +++ b/package/python-greenlet/python-greenlet.mk > >>> @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > >>> PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > >>> > >>> $(eval $(python-package)) > >>> +$(eval $(host-python-package)) > >>> > >> > >> > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Sat Jan 8 19:18:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 20:18:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/civetweb: drop BR2_PACKAGE_CIVETWEB_WITH_LUA In-Reply-To: <20201104074311.491932-1-fontaine.fabrice@gmail.com> References: <20201104074311.491932-1-fontaine.fabrice@gmail.com> Message-ID: Hi, Sorry for the very slow response. On Wed, Nov 4, 2020 at 8:44 AM Fabrice Fontaine wrote: > > Drop BR2_PACKAGE_CIVETWEB_WITH_LUA and enable Lua support depending on > BR2_PACKAGE_LUA and BR2_PACKAGE_LUAJIT > > It should be noted that civetweb will still use its embedded version of > sqlite > > Signed-off-by: Fabrice Fontaine > --- > Config.in.legacy | 9 +++++++++ > package/civetweb/Config.in | 12 ------------ > package/civetweb/civetweb.mk | 20 +++++++++++++++++--- > 3 files changed, 26 insertions(+), 15 deletions(-) > +++ b/package/civetweb/civetweb.mk > @@ -25,9 +25,23 @@ ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),) > CIVETWEB_COPT += -DNO_ATOMICS=1 > endif > > -ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y) > -CIVETWEB_CONF_OPTS += WITH_LUA=1 > -CIVETWEB_LIBS += -ldl > +ifeq ($(BR2_PACKAGE_LUA),y) You forgot about the !BR2_STATIC_LIBS dependency. > +CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUA_SHARED=1 I also had to pass LUA_SHARED_LIB_FLAG='' to not get civetweb to pass -llua5.3 or similar (we only install liblua.so*) > +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs lua` > +CIVETWEB_DEPENDENCIES += host-pkgconf lua > +ifeq ($(BR2_PACKAGE_LUA_5_1),y) > +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=501 > +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) > +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=503 > +else ifeq ($(BR2_PACKAGE_LUA_5_4),y) > +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=504 > +endif > +endif > + > +ifeq ($(BR2_PACKAGE_LUAJIT),y) I know that you cannot enable luajit and lua at the same time, but I still find it easier to reason about if these two are mutually exclusive, so I reworked it to do that. > +CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUAJIT_SHARED=1 > +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs luajit` The luajit .pc file doesn't add -ldl, so I had to maually add that as well. Committed with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 19:26:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 20:26:07 +0100 Subject: [Buildroot] [git commit] package/civetweb: drop BR2_PACKAGE_CIVETWEB_WITH_LUA Message-ID: <20220108192000.9F710832B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=329f71ed3038af9403d606ec1f1b0d2d96c6f340 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop BR2_PACKAGE_CIVETWEB_WITH_LUA and enable Lua support depending on BR2_PACKAGE_LUA and BR2_PACKAGE_LUAJIT It should be noted that civetweb will still use its embedded version of sqlite Signed-off-by: Fabrice Fontaine [Peter: add !BR2_STATIC_LIBS, pass LUA_SHARED_LIB_FLAG, explicitly link with -ldl, rework order] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 9 +++++++++ package/civetweb/Config.in | 12 ------------ package/civetweb/civetweb.mk | 18 +++++++++++++++--- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 141d43a479..75873ff74b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_CIVETWEB_WITH_LUA + bool "civetweb lua support option removed" + select BR2_LEGACY + help + Lua support does not depend on a version of Lua bundled + within the Civetweb sources anymore. Lua support is + automatically enabled if an Lua interpreter (lua or luajit) + is enabled in Buildroot. + config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER bool "sunxi-mali-mainline-driver package was renamed" select BR2_LEGACY diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in index 9e43969085..6bca5ed8fd 100644 --- a/package/civetweb/Config.in +++ b/package/civetweb/Config.in @@ -21,18 +21,6 @@ config BR2_PACKAGE_CIVETWEB_LIB Enable the civetweb library for embedding in another application. -config BR2_PACKAGE_CIVETWEB_WITH_LUA - bool "enable Lua support" - # required by the bundled Sqlite3 and Lua code - depends on !BR2_STATIC_LIBS - help - Enable Lua support in Civetweb. Note that this will use a - version of Lua and Sqlite bundled within the Civetweb - sources, and not the packages from Buildroot. - -comment "lua support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - endif comment "civetweb needs a toolchain w/ threads" diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 22618fb443..a299de85e9 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -26,9 +26,21 @@ ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),) CIVETWEB_COPT += -DNO_ATOMICS=1 endif -ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y) -CIVETWEB_CONF_OPTS += WITH_LUA=1 -CIVETWEB_LIBS += -ldl +ifeq ($(BR2_PACKAGE_LUAJIT),y) +CIVETWEB_CONF_OPTS += WITH_LUAJIT_SHARED=1 +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs luajit` -ldl +CIVETWEB_DEPENDENCIES += host-pkgconf luajit +else ifeq ($(BR2_PACKAGE_LUA):$(BR2_STATIC_LIBS),y:) +CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUA_SHARED=1 LUA_SHARED_LIB_FLAG='' +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs lua` +CIVETWEB_DEPENDENCIES += host-pkgconf lua +ifeq ($(BR2_PACKAGE_LUA_5_1),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=501 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=503 +else ifeq ($(BR2_PACKAGE_LUA_5_4),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=504 +endif endif ifeq ($(BR2_PACKAGE_OPENSSL),y) From yann.morin.1998 at free.fr Sat Jan 8 19:40:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 20:40:00 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: disable zoned on host Message-ID: <20220108193401.304D88345B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=188f8c836d9a3224c8cc6dda429108b0938c8cc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable zoned on host variant to avoid the following build failure since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 and https://github.com/kdave/btrfs-progs/commit/7953f4357bfc6c6526451bc889527b07f0840816: checking linux/blkzoned.h usability... yes checking linux/blkzoned.h presence... yes checking for linux/blkzoned.h... yes checking for struct blk_zone.capacity... no checking for BLKGETZONESZ defined in linux/blkzoned.h... no configure: error: linux/blkzoned.h does not provide blk_zone.capacity Fixes: - http://autobuild.buildroot.org/results/03235edd829436d784a9b214050cc97584f372fb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/btrfs-progs/btrfs-progs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 50c8e59e50..4c26cf0df5 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -41,6 +41,7 @@ HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ --disable-libudev \ + --disable-zoned \ --disable-zstd \ --disable-python \ --disable-convert From thomas.petazzoni at bootlin.com Sat Jan 8 19:40:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 20:40:22 +0100 Subject: [Buildroot] [PATCH] boot/uboot: add option to define custom dependencies In-Reply-To: <20200425000629.2068191-1-heiko@sntech.de> References: <20200425000629.2068191-1-heiko@sntech.de> Message-ID: <20220108204022.550a7909@windsurf> Hello Heiko, On Sat, 25 Apr 2020 02:06:29 +0200 Heiko Stuebner wrote: > From: Heiko Stuebner > > A custom uboot version my depend on additional unspecified packages > to be built before the uboot build is attempted. > > One example is an additional config fragment referencing things > from other packages, so add an option similar to the config fragments > where these can be defined. > > Signed-off-by: Heiko Stuebner > --- > boot/uboot/Config.in | 8 ++++++++ > boot/uboot/uboot.mk | 1 + > 2 files changed, 9 insertions(+) Sorry to come back to you so long after the patch was submitted. We finally had a discussion, and decided that we would prefer to see the actual practical use cases of this, before merging this option. Maybe this option is a good idea, but we really want to hear about specific use cases first. If you have one, we're definitely interested to hear about it! Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 19:40:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 20:40:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: disable zoned on host In-Reply-To: <20220108185713.3193240-1-fontaine.fabrice@gmail.com> References: <20220108185713.3193240-1-fontaine.fabrice@gmail.com> Message-ID: <20220108194035.GF1881783@scaer> Fabrice, All, On 2022-01-08 19:57 +0100, Fabrice Fontaine spake thusly: > Disable zoned on host variant to avoid the following build failure since > bump to version 5.15.1 in commit > 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 and > https://github.com/kdave/btrfs-progs/commit/7953f4357bfc6c6526451bc889527b07f0840816: > > checking linux/blkzoned.h usability... yes > checking linux/blkzoned.h presence... yes > checking for linux/blkzoned.h... yes > checking for struct blk_zone.capacity... no > checking for BLKGETZONESZ defined in linux/blkzoned.h... no > configure: error: linux/blkzoned.h does not provide blk_zone.capacity > > Fixes: > - http://autobuild.buildroot.org/results/03235edd829436d784a9b214050cc97584f372fb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/btrfs-progs/btrfs-progs.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index 50c8e59e50..4c26cf0df5 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -41,6 +41,7 @@ HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib > HOST_BTRFS_PROGS_CONF_OPTS = \ > --disable-backtrace \ > --disable-libudev \ > + --disable-zoned \ > --disable-zstd \ > --disable-python \ > --disable-convert > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Jan 8 19:41:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 20:41:27 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: <20201126144745.502228-1-nolange79@gmail.com> References: <20201126144745.502228-1-nolange79@gmail.com> Message-ID: Hi Norbert, On 26/11/2020 15:47, Norbert Lange wrote: > journald supports catalog files, or rather a binary database of > those. > Functionality added includes: > > - A config option allows enabling the binary database. > > - if the option is enabled, the database is built and moved to > /usr/share/factory. A symlink is created in /var pointing to > that file. > If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the > language whitelist are deleted first. > > - the service normally used for creating the DB during boot, > and the catalog source files used as input are deleted. > > The move to /usr/share/factory is helpful for having /usr as whole > system distribution. > > Signed-off-by: Norbert Lange I was going to apply a second time, but then I noticed that I made some comments on v2 [1] that you haven't answered to and I still think they're valid. So I've marked this patch as Changes Requested. If you respin, please also include in the commit message the additional explanations you made in reply to Romain. Regards, Arnout [1] https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ > --- > v1->v2: > - Moved all logic into systemd.mk > - solved the LOCALE_PURGE order that way > - use the factory to store the file > - option to enable the DB (similar to udev HWDB) > - cant be anabled with !ROOTFS_RW, tons of > issues with that one > v2->v3: > - use backticks instead of $$() > - be more explicit about what happens in > SYSTEMD_LOCALE_PURGE_CATALOGS > > Signed-off-by: Norbert Lange > --- > package/systemd/Config.in | 14 +++++++++++++ > package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index ec34478e3d..d576e6035b 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD > > http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands > > +config BR2_PACKAGE_SYSTEMD_CATALOGDB > + bool "enable journal catalog database installation" > + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic > + help > + Build and install the journal catalog database. > + > + catalog files are used to provide extended and potentially localized > + messages for the journal. > + > + The original catalog files will be built into a DB at > + /usr/share/factory/var/lib/systemd/catalog/database. > + > + https://www.freedesktop.org/wiki/Software/systemd/catalog/ > + > config BR2_PACKAGE_SYSTEMD_LOCALED > bool "enable locale daemon" > help > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index cb12f667d6..ae99c02abf 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD > $(SYSTEMD_INSTALL_NETWORK_CONFS) > endef > > +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) > +define SYSTEMD_LOCALE_PURGE_CATALOGS > + # go through all files with scheme ..catalog > + # and remove those where is not in LOCALE_NOPURGE > + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ > + do \ > + basename=$${cfile##*/}; \ > + basename=$${basename%.catalog}; \ > + langext=$${basename#*.}; \ > + [ "$$langext" = "$${basename}" ] && continue; \ > + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ > + rm -f "$$cfile"; \ > + done > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) > +define SYSTEMD_UPDATE_CATALOGS > + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog > + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ > + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database > + rm $(TARGET_DIR)/var/lib/systemd/catalog/database > + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ > + $(TARGET_DIR)/var/lib/systemd/catalog/database > + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ > + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS > +endif > + > +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ > + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service > +endef > + > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > From thomas.petazzoni at bootlin.com Sat Jan 8 19:42:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 20:42:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyext: new package In-Reply-To: <20210213102055.24378-1-guillaume.bresaix@gmail.com> References: <20210213102055.24378-1-guillaume.bresaix@gmail.com> Message-ID: <20220108204223.2e904905@windsurf> Hello Guillaume, On Sat, 13 Feb 2021 11:20:55 +0100 guillaume.bressaix at gmail.com wrote: > From: "Guillaume W. Bres" > > Python-pyext is a set of scripts to enhance python. > This includes features such as function overloading, > the "switch" statement.. > > Signed-off-by: Guillaume W. Bres > --- We looked at this package, and upstream has not made any release since 2014, and there is apparently no publicly available version control system. With python moving so fast, a package that hasn't been touched since 2014 doesn't seem like a good idea. So I'll mark this patch as Rejected. If you have a reason to think this is still maintained, could you provide some more details? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sat Jan 8 20:40:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 21:40:39 +0100 Subject: [Buildroot] [PATCH 1/1] systemd: ensure tmpfiles.d/legacy.conf is installed In-Reply-To: <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> References: <20200825000246.4035-1-joseph.kogut@gmail.com> <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> Message-ID: <0570b1f3-5229-5c0e-796a-53f8747b540a@mind.be> On 08/01/2022 20:12, Arnout Vandecappelle wrote: > > > On 25/08/2020 02:02, Joseph Kogut wrote: >> Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity >> isn't enabled. This config sets up /var/lock, which many programs such >> as uboot's fw_printenv/setenv still depend on by default. >> >> Signed-off-by: Joseph Kogut > > ?After all the discussion, I did finally apply to master, thanks. ?And I ended up reverting it again - legacy.conf is now legacy.conf.in and it needs to be preprocessed, but that is only done if sysv-compat is enabled. ?So if we want this, our only option is to enable sysv-compat (which is probably something we should do anyway). ?Regards, ?Arnout > > ?For Norbert: we simply have legacy packages that write to /var/lock instead > of /run/lock. In an ideal world, we'd patch all of them to do the right thing. > However, that's not realistic. So let's enable this legacy stuff to make sure > that those legacy packages don't actually write to disk. > > ?We could indeed instead enable sysv compatibility, for maximum support of > legacy packages. What exactly would be the effects of that? > > ?Regards, > ?Arnout > > >> --- >> ? package/systemd/systemd.mk | 10 +++++++++- >> ? 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >> index e356cb1add..8454993823 100644 >> --- a/package/systemd/systemd.mk >> +++ b/package/systemd/systemd.mk >> @@ -512,10 +512,18 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK >> ????? touch $(TARGET_DIR)/etc/machine-id >> ? endef >> ? +# systemd doesn't install legacy.conf without sysv-compat >> +# This config ensures /var/lock is created >> +define SYSTEMD_INSTALL_LEGACY_CONF_HOOK >> +??? $(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \ >> +??????? $(TARGET_DIR)/usr/lib/tmpfiles.d >> +endef >> + >> ? SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ >> ????? SYSTEMD_INSTALL_INIT_HOOK \ >> ????? SYSTEMD_INSTALL_MACHINEID_HOOK \ >> -??? SYSTEMD_INSTALL_RESOLVCONF_HOOK >> +??? SYSTEMD_INSTALL_RESOLVCONF_HOOK \ >> +??? SYSTEMD_INSTALL_LEGACY_CONF_HOOK >> ? ? define SYSTEMD_INSTALL_IMAGES_CMDS >> ????? $(SYSTEMD_INSTALL_BOOT_FILES) >> From arnout at mind.be Sat Jan 8 20:40:44 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 21:40:44 +0100 Subject: [Buildroot] [git commit] Revert "systemd: ensure tmpfiles.d/legacy.conf is installed" Message-ID: <20220108203441.1B53583456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fc0d98699b91bbdc9e6fe7064ecb1d966aaa4a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master legacy.conf no longer exists, it's now legacy.conf.in that has to be preprocessed. The preprocessing is only done if sysv-compat is enabled. This reverts commit 0e71f5111988fe57531d1c84bdf631f1932b14bc. --- package/systemd/systemd.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b3b5ed600d..17bb922f51 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -563,17 +563,9 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef -# systemd doesn't install legacy.conf without sysv-compat -# This config ensures /var/lock is created -define SYSTEMD_INSTALL_LEGACY_CONF_HOOK - $(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \ - $(TARGET_DIR)/usr/lib/tmpfiles.d -endef - SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_INIT_HOOK \ - SYSTEMD_INSTALL_MACHINEID_HOOK \ - SYSTEMD_INSTALL_LEGACY_CONF_HOOK + SYSTEMD_INSTALL_MACHINEID_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS $(SYSTEMD_INSTALL_BOOT_FILES) From thomas.petazzoni at bootlin.com Sat Jan 8 20:41:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 21:41:33 +0100 Subject: [Buildroot] [git commit] package/libcap: drop host-libcap dependency Message-ID: <20220108203526.DA7AC83456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0651b22d638faecb3688f1fd4e0760c31bfba893 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-libcap was added as a dependency of libcap in commit efae605c88deb15d9c50fd67bdd80f46a78b06c1 because back then at installation time, the setcap utility was called. However, since commit 57155c6b6a7a40523075626353375109fe159c04, we use RAISE_SETFCAP=no, which disables calling setcap at install time. Therefore, having host-libcap built before libcap is no longer needed. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcap/libcap.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 42acca9082..1207995333 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -11,7 +11,7 @@ LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause LIBCAP_LICENSE_FILES = License LIBCAP_CPE_ID_VENDOR = libcap_project -LIBCAP_DEPENDENCIES = host-libcap host-gperf +LIBCAP_DEPENDENCIES = host-gperf LIBCAP_INSTALL_STAGING = YES HOST_LIBCAP_DEPENDENCIES = host-gperf From fontaine.fabrice at gmail.com Sat Jan 8 20:41:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 21:41:06 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> <20220108115140.760e195f@windsurf> <20220108183919.238c1885@gmx.net> <20220108193800.5f91ac3b@windsurf> Message-ID: Le sam. 8 janv. 2022 ? 19:50, Arnout Vandecappelle a ?crit : > > > > On 08/01/2022 19:38, Thomas Petazzoni wrote: > > On Sat, 8 Jan 2022 18:39:19 +0100 > > Peter Seiderer wrote: > > > >> The difference seems to be: > >> > >> $ diff -ru file-5.38/configure.ac file-5.41/configure.ac > >> [...] > >> @@ -88,7 +88,7 @@ > >> AC_SUBST(WARNINGS) > >> > >> dnl Checks for programs. > >> -AC_PROG_CC_STDC > >> +AC_PROG_CC > >> AC_USE_SYSTEM_EXTENSIONS > >> AM_PROG_CC_C_O > >> AC_C_BIGENDIAN > >> [...] > >> > >> According to [1] AC_PROG_CC checks/enables c89 and AC_PROG_CC_STDC checks/enabls C99 (or > >> use AC_PROG_CC_C99 to be more explicit)..., note that with AC_PROG_CC the ac_cv_prog_cc_c99 > >> feature is gone (still used for target/host in package/file/file.mk)... > > > > But why the solution we use for the target package doesn't work for the > > host package? > > > > Or perhaps we're no longer testing the target package with gcc 4.8 ? > > sourcery-arm*.config uses the CodeSourcery toolchain which has gcc 4.8, so yes > we should be testing it with gcc 4.8... Here is the first build failure with gcc 4.8: http://autobuild.buildroot.org/results/9e7/9e7868be00f2cd18205b2ce664be95f8b9e2b063/build-end.log > > Regards, > Arnout Best Regards, Fabrice From romain.naour at smile.fr Sat Jan 8 20:44:49 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 21:44:49 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/libcap: drop host-libcap dependency In-Reply-To: <20200830100058.4180798-2-fontaine.fabrice@gmail.com> References: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> <20200830100058.4180798-2-fontaine.fabrice@gmail.com> Message-ID: <04eb7314-3beb-c40f-483d-aa142f63a0c6@smile.fr> Hello Fabrice, Le 30/08/2020 ? 12:00, Fabrice Fontaine a ?crit?: > host-libcap was added as a dependency of libcap in commit > efae605c88deb15d9c50fd67bdd80f46a78b06c1 without any explanation in the > commit message. Drop this dependency that does seem to be needed. I dont see why host-libcap would be needed to build libcap for the target. libcap in Yocto doesn't add libcap-native in dependency: https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-support/libcap/libcap_2.62.bb This patch needs to be rebased on master since host-gperf has been added rencently. Best regards, Romain > > Signed-off-by: Fabrice Fontaine > --- > package/libcap/libcap.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk > index 208f8eade1..ead5a17dcc 100644 > --- a/package/libcap/libcap.mk > +++ b/package/libcap/libcap.mk > @@ -10,7 +10,6 @@ LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz > LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause > LIBCAP_LICENSE_FILES = License > > -LIBCAP_DEPENDENCIES = host-libcap > LIBCAP_INSTALL_STAGING = YES > > ifeq ($(BR2_STATIC_LIBS),y) > From thomas.petazzoni at bootlin.com Sat Jan 8 20:54:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 21:54:47 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/libcap: drop host-libcap dependency In-Reply-To: <20200830100058.4180798-2-fontaine.fabrice@gmail.com> References: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> <20200830100058.4180798-2-fontaine.fabrice@gmail.com> Message-ID: <20220108215447.3c858d9e@windsurf> On Sun, 30 Aug 2020 12:00:58 +0200 Fabrice Fontaine wrote: > host-libcap was added as a dependency of libcap in commit > efae605c88deb15d9c50fd67bdd80f46a78b06c1 without any explanation in the > commit message. Drop this dependency that does seem to be needed. > > Signed-off-by: Fabrice Fontaine > --- > package/libcap/libcap.mk | 1 - > 1 file changed, 1 deletion(-) We did some research, and figured out why the dependency was needed back then, and is no longer now. I've expanded the commit log with the explanation, and applied. See the final commit at: https://git.buildroot.org/buildroot/commit/?id=0651b22d638faecb3688f1fd4e0760c31bfba893 Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sat Jan 8 20:55:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 21:55:32 +0100 Subject: [Buildroot] [PATCH 1/1] rtl8189es: new package In-Reply-To: <20200511181051.9347-1-aussedat.louis@gmail.com> References: <20200511181051.9347-1-aussedat.louis@gmail.com> Message-ID: <5af07a98-a5dd-6ca5-2f78-75aed51c70f1@mind.be> On 11/05/2020 20:10, Louis Aussedat wrote: > This package adds the rtl8189es WiFi driver. > repo: https://github.com/jwrdegoede/rtl8189ES_linux.git > branch: master > > Driver is known to support Realtek RTL8189ES-VB-CG chip. > > Signed-off-by: Louis Aussedat Applied to master, thanks. Sorry it took so long. Regards, Arnout > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/rtl8189es/Config.in | 10 ++++++++++ > package/rtl8189es/rtl8189es.hash | 2 ++ > package/rtl8189es/rtl8189es.mk | 17 +++++++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/rtl8189es/Config.in > create mode 100644 package/rtl8189es/rtl8189es.hash > create mode 100644 package/rtl8189es/rtl8189es.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index e427ab15d4..83b47b77b6 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1520,6 +1520,7 @@ F: package/python-dnspython/ > F: package/python-future/ > F: package/python-huepy/ > F: package/python-tqdm/ > +F: package/rtl8189es/ > > N: Louis-Paul Cordier > F: package/intel-gmmlib/ > diff --git a/package/Config.in b/package/Config.in > index c12676d859..32f4b21625 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -525,6 +525,7 @@ endmenu > source "package/rs485conf/Config.in" > source "package/rtc-tools/Config.in" > source "package/rtl8188eu/Config.in" > + source "package/rtl8189es/Config.in" > source "package/rtl8189fs/Config.in" > source "package/rtl8723bs/Config.in" > source "package/rtl8723bu/Config.in" > diff --git a/package/rtl8189es/Config.in b/package/rtl8189es/Config.in > new file mode 100644 > index 0000000000..2e3474e5e1 > --- /dev/null > +++ b/package/rtl8189es/Config.in > @@ -0,0 +1,10 @@ > +config BR2_PACKAGE_RTL8189ES > + bool "rtl8189es" > + depends on BR2_LINUX_KERNEL > + help > + Wireless driver rtl8189es. > + > + https://github.com/jwrdegoede/rtl8189ES_linux.git > + > +comment "rtl8189es needs a Linux kernel to be built" > + depends on !BR2_LINUX_KERNEL > diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash > new file mode 100644 > index 0000000000..624c51ac0d > --- /dev/null > +++ b/package/rtl8189es/rtl8189es.hash > @@ -0,0 +1,2 @@ > +# Locally calculated > +sha256 bf972b6494844c66885dc6846228994fac6075477cf9a7122ffd521e25ac791c rtl8189es-2c8d44ae26485052f39d933a3a132b3ff395803a.tar.gz > diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk > new file mode 100644 > index 0000000000..9e4053ae83 > --- /dev/null > +++ b/package/rtl8189es/rtl8189es.mk > @@ -0,0 +1,17 @@ > +################################################################################ > +# > +# rtl8189es > +# > +################################################################################ > + > +RTL8189ES_VERSION = 2c8d44ae26485052f39d933a3a132b3ff395803a > +RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) > +RTL8189ES_LICENSE = GPL-2.0 > + > +RTL8189ES_MODULE_MAKE_OPTS = \ > + CONFIG_RTL8189ES=m \ > + KVER=$(LINUX_VERSION_PROBED) \ > + KSRC=$(LINUX_DIR) > + > +$(eval $(kernel-module)) > +$(eval $(generic-package)) > From arnout at mind.be Sat Jan 8 20:54:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 8 Jan 2022 21:54:08 +0100 Subject: [Buildroot] [git commit] rtl8189es: new package Message-ID: <20220108204928.0BC928345E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65da7755d9266f245b711a19dd97499594415bde branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package adds the rtl8189es WiFi driver. repo: https://github.com/jwrdegoede/rtl8189ES_linux.git branch: master Driver is known to support Realtek RTL8189ES-VB-CG chip. Signed-off-by: Louis Aussedat Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8189es/Config.in | 10 ++++++++++ package/rtl8189es/rtl8189es.hash | 2 ++ package/rtl8189es/rtl8189es.mk | 17 +++++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eeba07002..c0ea5777f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1665,6 +1665,7 @@ F: package/python-dnspython/ F: package/python-future/ F: package/python-huepy/ F: package/python-tqdm/ +F: package/rtl8189es/ N: Louis-Paul Cordier F: package/intel-gmmlib/ diff --git a/package/Config.in b/package/Config.in index d32a87fe20..c933f51d10 100644 --- a/package/Config.in +++ b/package/Config.in @@ -554,6 +554,7 @@ endmenu source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" source "package/rtl8188eu/Config.in" + source "package/rtl8189es/Config.in" source "package/rtl8189fs/Config.in" source "package/rtl8723bs/Config.in" source "package/rtl8723bu/Config.in" diff --git a/package/rtl8189es/Config.in b/package/rtl8189es/Config.in new file mode 100644 index 0000000000..2e3474e5e1 --- /dev/null +++ b/package/rtl8189es/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_RTL8189ES + bool "rtl8189es" + depends on BR2_LINUX_KERNEL + help + Wireless driver rtl8189es. + + https://github.com/jwrdegoede/rtl8189ES_linux.git + +comment "rtl8189es needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash new file mode 100644 index 0000000000..624c51ac0d --- /dev/null +++ b/package/rtl8189es/rtl8189es.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 bf972b6494844c66885dc6846228994fac6075477cf9a7122ffd521e25ac791c rtl8189es-2c8d44ae26485052f39d933a3a132b3ff395803a.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk new file mode 100644 index 0000000000..9e4053ae83 --- /dev/null +++ b/package/rtl8189es/rtl8189es.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# rtl8189es +# +################################################################################ + +RTL8189ES_VERSION = 2c8d44ae26485052f39d933a3a132b3ff395803a +RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) +RTL8189ES_LICENSE = GPL-2.0 + +RTL8189ES_MODULE_MAKE_OPTS = \ + CONFIG_RTL8189ES=m \ + KVER=$(LINUX_VERSION_PROBED) \ + KSRC=$(LINUX_DIR) + +$(eval $(kernel-module)) +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 20:56:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 21:56:55 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino: fix mali not working because Linux version >= 4.20 Message-ID: <20220108205052.4509883456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=220716ab67736311209e3b7a4c7d1c12f569dc95 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since on olinuxino_lime/lime2 we have a Linux version >= 4.20 we need to pass drm_kms_helper.drm_leak_fbdev_smem=1 to kernel command-line that really enables DRM_FBDEV_LEAK_PHYS_SMEM. CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM only adds the code for this, but drm_leak_fbdev_smem is 0 by default, so we need to override it with 1. Same goes for drm_fbdev_overalloc that must be at least 200 for having a double buffer that is required by Mali. This fixes both olimex_a20_olinuxino_lime and lime2 that use extlinux.conf. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf b/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf index f754da3623..358bda056b 100644 --- a/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf +++ b/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label Olinuxino kernel /boot/zImage fdtdir /boot - append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} + append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 drm_kms_helper.drm_leak_fbdev_smem=1 drm_kms_helper.drm_fbdev_overalloc=200 ${extra} From thomas.petazzoni at bootlin.com Sat Jan 8 20:57:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 21:57:15 +0100 Subject: [Buildroot] [PATCH] configs/olimex_a20_olinuxino: fix mali not working because Linux version >= 4.20 In-Reply-To: <20211014213630.2436055-1-giulio.benetti@benettiengineering.com> References: <20211014213630.2436055-1-giulio.benetti@benettiengineering.com> Message-ID: <20220108215715.68e72a50@windsurf> On Thu, 14 Oct 2021 23:36:30 +0200 Giulio Benetti wrote: > Since on olinuxino_lime/lime2 we have a Linux version >= 4.20 we need to > pass drm_kms_helper.drm_leak_fbdev_smem=1 to kernel command-line that > really enables DRM_FBDEV_LEAK_PHYS_SMEM. CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM > only adds the code for this, but drm_leak_fbdev_smem is 0 by default, so we > need to override it. This fixes both olimex_a20_olinuxino_lime and lime2 > that use extlinux.conf. > > Signed-off-by: Giulio Benetti > --- > .../a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Sat Jan 8 20:58:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 21:58:32 +0100 Subject: [Buildroot] [git commit] package/sdbus-cpp: new package Message-ID: <20220108205250.3C5E883456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1025766c8a2c9d0a5956ca0d720bb07b9a47076d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master sdbus-c++ is a high-level C++ D-Bus library for Linux. Signed-off-by: Sergey Bobrenok [Peter: add host-pkgconf, drop host package] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/sdbus-cpp/Config.in | 16 ++++++++++++++++ package/sdbus-cpp/sdbus-cpp.hash | 3 +++ package/sdbus-cpp/sdbus-cpp.mk | 15 +++++++++++++++ 5 files changed, 38 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c0ea5777f2..b80d886809 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2502,6 +2502,9 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ +N: Sergey Bobrenok +F: package/sdbus-cpp/ + N: Sergey Matyukevich F: boot/arm-trusted-firmware/ F: board/linksprite/pcduino diff --git a/package/Config.in b/package/Config.in index c933f51d10..15a831c1bf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2576,6 +2576,7 @@ menu "System tools" source "package/s6-rc/Config.in" source "package/scrub/Config.in" source "package/scrypt/Config.in" + source "package/sdbus-cpp/Config.in" source "package/sdbusplus/Config.in" source "package/seatd/Config.in" source "package/smack/Config.in" diff --git a/package/sdbus-cpp/Config.in b/package/sdbus-cpp/Config.in new file mode 100644 index 0000000000..85f149eaa1 --- /dev/null +++ b/package/sdbus-cpp/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_SDBUS_CPP + bool "sdbus-c++" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_SYSTEMD + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + help + sdbus-c++ is a high-level C++ D-Bus library for Linux + designed to provide expressive, easy-to-use API in modern C++. + + This will build the target library. + + https://github.com/Kistler-Group/sdbus-cpp + +comment "sdbus-c++ needs systemd and a toolchain w/ C++, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_SYSTEMD || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash new file mode 100644 index 0000000000..8b87653dfd --- /dev/null +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 0fd575ae0f463773dd9141242d1133731e2b780fd6526650ce992ba711d88628 v0.8.3.tar.gz +sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk new file mode 100644 index 0000000000..24904ee26f --- /dev/null +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# sdbus-c++ +# +################################################################################ + +SDBUS_CPP_VERSION = 0.8.3 +SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz +SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) +SDBUS_CPP_INSTALL_STAGING = YES +SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd +SDBUS_CPP_LICENSE = LGPL-2.1+ +SDBUS_CPP_LICENSE_FILES = COPYING + +$(eval $(cmake-package)) From fontaine.fabrice at gmail.com Sat Jan 8 21:07:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 22:07:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix build without stack-protector Message-ID: <20220108210752.3245794-1-fontaine.fabrice@gmail.com> Fix the following build failure without stack-protector raised since bump to version 02092020 in commit ebe808ac4071395b4d1e90d617c33a5e6e514af1 and https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function `handle_mem_bos_chk_warn': safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' If stack-protector is enabled in the Buildroot config, the toolchain wrapper will make sure it is used, so there's no need for the safeclib configure to handle it. Fixes: - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 Signed-off-by: Fabrice Fontaine --- ...gure.ac-add-disable-hardening-option.patch | 63 +++++++++++++++++++ package/safeclib/safeclib.mk | 3 + 2 files changed, 66 insertions(+) create mode 100644 package/safeclib/0001-configure.ac-add-disable-hardening-option.patch diff --git a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch new file mode 100644 index 0000000000..e851fce993 --- /dev/null +++ b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch @@ -0,0 +1,63 @@ +From 94c612016834d7bdc2b721ff5f4f5e158bda6fdd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 8 Jan 2022 21:49:22 +0100 +Subject: [PATCH] configure.ac: add --disable-hardening option + +Allow the user to disable hardening which is enabled by default since +version 02092020 and +https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa +to avoid the following build failure when the toolchain doesn't support +stack-protector: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function `handle_mem_bos_chk_warn': +safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rurban/safeclib/pull/107] +--- + configure.ac | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 55756b06..f852ed44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -383,6 +383,21 @@ AC_ARG_ENABLE(debug-build, + esac], [enable_debug_build=false ]) + AM_CONDITIONAL(ENABLE_DEBUG_BUILD, test "x$enable_debug_build" = "xtrue") + ++AC_ARG_ENABLE(hardening, ++ AS_HELP_STRING([--disable-hardening], ++ [disable hardening @<:@default=no@:>@]), ++ [case "${enableval}" in ++ yes) enable_hardening=true ;; ++ no) enable_hardening=false ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-hardening]) ;; ++ esac], [enable_hardening=true]) ++ ++if test "x$enable_hardening" = "xtrue" ; then ++ AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], ++ [WARN_CFLAGS],[$ax_ccf_err]) ++ AX_APPEND_LINK_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], ++ [WARN_LDFLAGS],[$ax_ccf_err]) ++fi + + AC_MSG_NOTICE([Check programs]) + # =============================================== +@@ -543,10 +562,6 @@ case $host_os in + [],[$ax_ccf_err]) + ;; + esac +-AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], +- [WARN_CFLAGS],[$ax_ccf_err]) +-AX_APPEND_LINK_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], +- [WARN_LDFLAGS],[$ax_ccf_err]) + + if test x$ax_cv_check_cflags__Wrestrict = xyes; then + AC_DEFINE([HAVE_WARNING_RESTRICT], 1, [Have -Wrestrict]) +-- +2.34.1 + diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 032a73bf67..87b710b37d 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,5 +11,8 @@ SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES +# We're patching configure.ac +SAFECLIB_AUTORECONF = YES +SAFECLIB_CONF_OPTS = --disable-hardening $(eval $(autotools-package)) -- 2.34.1 From guillaume.bressaix at gmail.com Sat Jan 8 21:14:47 2022 From: guillaume.bressaix at gmail.com (Guillaume Bres) Date: Sat, 8 Jan 2022 22:14:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyext: new package In-Reply-To: <20220108204223.2e904905@windsurf> References: <20210213102055.24378-1-guillaume.bresaix@gmail.com> <20220108204223.2e904905@windsurf> Message-ID: > If you have a reason to think this is still maintained, could you provide some more details? Hello Thomas, Please discard this package. I thought it was a requirement for ntpsec that i was about to submit at the time. But it turns out ntpsec does not require it, or at least, not in modern versions Guillaume W. Bres Software engineer Le sam. 8 janv. 2022 ? 20:42, Thomas Petazzoni a ?crit : > Hello Guillaume, > > On Sat, 13 Feb 2021 11:20:55 +0100 > guillaume.bressaix at gmail.com wrote: > > > From: "Guillaume W. Bres" > > > > Python-pyext is a set of scripts to enhance python. > > This includes features such as function overloading, > > the "switch" statement.. > > > > Signed-off-by: Guillaume W. Bres > > --- > > We looked at this package, and upstream has not made any release since > 2014, and there is apparently no publicly available version control > system. With python moving so fast, a package that hasn't been touched > since 2014 doesn't seem like a good idea. > > So I'll mark this patch as Rejected. If you have a reason to think this > is still maintained, could you provide some more details? > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From nolange79 at gmail.com Sat Jan 8 21:17:27 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 22:17:27 +0100 Subject: [Buildroot] [PATCH 1/1] systemd: ensure tmpfiles.d/legacy.conf is installed In-Reply-To: <0570b1f3-5229-5c0e-796a-53f8747b540a@mind.be> References: <20200825000246.4035-1-joseph.kogut@gmail.com> <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> <0570b1f3-5229-5c0e-796a-53f8747b540a@mind.be> Message-ID: Am Sa., 8. Jan. 2022 um 21:40 Uhr schrieb Arnout Vandecappelle : > > > On 08/01/2022 20:12, Arnout Vandecappelle wrote: > > > > > > On 25/08/2020 02:02, Joseph Kogut wrote: > >> Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity > >> isn't enabled. This config sets up /var/lock, which many programs such > >> as uboot's fw_printenv/setenv still depend on by default. > >> > >> Signed-off-by: Joseph Kogut > > > > After all the discussion, I did finally apply to master, thanks. > > And I ended up reverting it again - legacy.conf is now legacy.conf.in and it > needs to be preprocessed, but that is only done if sysv-compat is enabled. > > So if we want this, our only option is to enable sysv-compat (which is > probably something we should do anyway). Why the only option? you should just ship your own legacy.conf, it wont change. Adding sysv compatibility, which is alot more than just the mkdir and symlink, would mean adding alot baggage. Baggage that wont even work as Yann spake thusly [1] a tmpfile.conf with those 3 lines would be enough: d /run/lock 0755 root root - L /var/lock - - - - ../run/lock d /run/lock/subsys 0755 root root - Norbert. PS. I am too lazy to google everything up, but I believe I brought up this very topic before. [1] - https://lists.buildroot.org/pipermail/buildroot/2020-July/287275.html From nolange79 at gmail.com Sat Jan 8 21:31:32 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 22:31:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: Am Sa., 8. Jan. 2022 um 20:04 Uhr schrieb James Hilliard : > > On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange wrote: > > > > Systemd has very many options, adding a way for the user > > to set custom options can help customizations > > without changing buildroot files. > > I'm not sure this is a good idea, if a configuration option needs > customizability it > probably needs a specific kconfig option. Systemd config options tend to require > dependency selection and special handling so this seems likely to cause > spurious errors due to improper usage. Seems to be a pretty big footgun IMO. Sure, you are aware that many of my buildroot patches are stuck in limbo since early 2020? Just doesnt seem feasible to timely fix everything and version bumps often leave more untapped options. Some part of the necessity would be just being pragmatic. One example would be using the unified cgroups hierarchy (-Ddefault-hierarchy=unified), hybrid is pretty much deprecated, and some systemd features that buildroot allows to enable (OOMD for example) wont work without it. > > What systemd configure option would you want to be using that isn't > currently able to be enabled? FYI those are the ones I currently use: -Ddefault-hierarchy=unified \ -Dutmp=false \ -Ddefault-dnssec=no \ -Didn=false \ -Denvironment-d=false \ -Dxdg-autostart=false \ -Ddns-over-tls=false \ -Ddefault-llmnr=no \ -Ddns-over-tls=false \ -Ddefault-mdns=no \ -Dlz4=false Norbert From nolange79 at gmail.com Sat Jan 8 21:46:54 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sat, 8 Jan 2022 22:46:54 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: References: <20201126144745.502228-1-nolange79@gmail.com> Message-ID: Am Sa., 8. Jan. 2022 um 20:41 Uhr schrieb Arnout Vandecappelle : > > Hi Norbert, > > On 26/11/2020 15:47, Norbert Lange wrote: > > journald supports catalog files, or rather a binary database of > > those. > > Functionality added includes: > > > > - A config option allows enabling the binary database. > > > > - if the option is enabled, the database is built and moved to > > /usr/share/factory. A symlink is created in /var pointing to > > that file. > > If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the > > language whitelist are deleted first. > > > > - the service normally used for creating the DB during boot, > > and the catalog source files used as input are deleted. > > > > The move to /usr/share/factory is helpful for having /usr as whole > > system distribution. > > > > Signed-off-by: Norbert Lange > > I was going to apply a second time, but then I noticed that I made some > comments on v2 [1] that you haven't answered to and I still think they're valid. > So I've marked this patch as Changes Requested. I did reply and cover the comments in [2], not sure whats missing? Separating into 2 independent patches is not really helpfull IMHO. > > If you respin, please also include in the commit message the additional > explanations you made in reply to Romain. > > Regards, > Arnout > > [1] https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ > > > > --- > > v1->v2: > > - Moved all logic into systemd.mk > > - solved the LOCALE_PURGE order that way > > - use the factory to store the file > > - option to enable the DB (similar to udev HWDB) > > - cant be anabled with !ROOTFS_RW, tons of > > issues with that one > > v2->v3: > > - use backticks instead of $$() > > - be more explicit about what happens in > > SYSTEMD_LOCALE_PURGE_CATALOGS > > > > Signed-off-by: Norbert Lange > > --- > > package/systemd/Config.in | 14 +++++++++++++ > > package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 55 insertions(+) > > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index ec34478e3d..d576e6035b 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD > > > > http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands > > > > +config BR2_PACKAGE_SYSTEMD_CATALOGDB > > + bool "enable journal catalog database installation" > > + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic > > + help > > + Build and install the journal catalog database. > > + > > + catalog files are used to provide extended and potentially localized > > + messages for the journal. > > + > > + The original catalog files will be built into a DB at > > + /usr/share/factory/var/lib/systemd/catalog/database. > > + > > + https://www.freedesktop.org/wiki/Software/systemd/catalog/ > > + > > config BR2_PACKAGE_SYSTEMD_LOCALED > > bool "enable locale daemon" > > help > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index cb12f667d6..ae99c02abf 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD > > $(SYSTEMD_INSTALL_NETWORK_CONFS) > > endef > > > > +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) > > +define SYSTEMD_LOCALE_PURGE_CATALOGS > > + # go through all files with scheme ..catalog > > + # and remove those where is not in LOCALE_NOPURGE > > + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ > > + do \ > > + basename=$${cfile##*/}; \ > > + basename=$${basename%.catalog}; \ > > + langext=$${basename#*.}; \ > > + [ "$$langext" = "$${basename}" ] && continue; \ > > + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ > > + rm -f "$$cfile"; \ > > + done > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS > > +endif > > + > > +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) > > +define SYSTEMD_UPDATE_CATALOGS > > + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog > > + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ > > + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database > > + rm $(TARGET_DIR)/var/lib/systemd/catalog/database > > + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ > > + $(TARGET_DIR)/var/lib/systemd/catalog/database > > + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ > > + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS > > +endif > > + > > +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ > > + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ > > + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service > > +endef > > + > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > + > > define SYSTEMD_PRESET_ALL > > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > > endef > > Norbert [2] - https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ From fontaine.fabrice at gmail.com Sat Jan 8 21:48:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 22:48:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/jimtcl: bump to version 0.81 Message-ID: <20220108214815.3492490-1-fontaine.fabrice@gmail.com> http://jim.tcl.tk/index.html/doc/www/www/articles/jim-release-0-81/ Signed-off-by: Fabrice Fontaine --- package/jimtcl/jimtcl.hash | 2 +- package/jimtcl/jimtcl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jimtcl/jimtcl.hash b/package/jimtcl/jimtcl.hash index 7960f4fddb..d4174a3da6 100644 --- a/package/jimtcl/jimtcl.hash +++ b/package/jimtcl/jimtcl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9e79a960de925552eeb4df51121f0ea017e34409568117b1ac461f4c3071289e jimtcl-0.80.tar.gz +sha256 ab7eb3680ba0d16f4a9eb1e05b7fcbb7d23438e25185462c55cd032a1954a985 jimtcl-0.81.tar.gz sha256 419f1146334e57fb258d6c957d1f94d43455ec0d24b1b54c4447e5f61a353950 LICENSE diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 5d6b379260..2f8e0e6c69 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -4,7 +4,7 @@ # ################################################################################ -JIMTCL_VERSION = 0.80 +JIMTCL_VERSION = 0.81 JIMTCL_SITE = $(call github,msteveb,jimtcl,$(JIMTCL_VERSION)) JIMTCL_INSTALL_STAGING = YES JIMTCL_LICENSE = BSD-2-Clause -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 21:49:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 22:49:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: add zstd support Message-ID: <20220108214952.3493782-1-fontaine.fabrice@gmail.com> zstd is supported since version 4.13.1 and https://github.com/kdave/btrfs-progs/commit/717a8b1e5d1ba69154ef84b35be75c9cf7730e1d Signed-off-by: Fabrice Fontaine --- package/btrfs-progs/btrfs-progs.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 4c26cf0df5..b010a0e0be 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -8,7 +8,7 @@ BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib -BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python +BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-python BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES @@ -30,6 +30,13 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +BTRFS_PROGS_CONF_OPTS += --enable-zstd +BTRFS_PROGS_DEPENDENCIES += zstd +else +BTRFS_PROGS_CONF_OPTS += --disable-zstd +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) BTRFS_PROGS_CONF_OPTS += --enable-libudev BTRFS_PROGS_DEPENDENCIES += udev -- 2.34.1 From yann.morin.1998 at free.fr Sat Jan 8 21:48:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 22:48:07 +0100 Subject: [Buildroot] [git commit] package/file: reorganise variables in a more logical fashion Message-ID: <20220108215501.0919383455@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99adfe6750fbe7485a90473cccae0f37cbe14d83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yann E. MORIN --- package/file/file.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/file/file.mk b/package/file/file.mk index 62cec4b2c9..b7e833e834 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -6,15 +6,17 @@ FILE_VERSION = 5.41 FILE_SITE = ftp://ftp.astron.com/pub/file -FILE_DEPENDENCIES = host-file -HOST_FILE_DEPENDENCIES = host-zlib -FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c FILE_CPE_ID_VENDOR = file_project + +FILE_DEPENDENCIES = host-file +FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' +FILE_INSTALL_STAGING = YES + +HOST_FILE_DEPENDENCIES = host-zlib HOST_FILE_CONF_OPTS = --disable-libseccomp +HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' ifeq ($(BR2_PACKAGE_BZIP2),y) FILE_CONF_OPTS += --enable-bzlib From yann.morin.1998 at free.fr Sat Jan 8 21:48:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 22:48:16 +0100 Subject: [Buildroot] [git commit] package/file: fix build with gcc-4.8 Message-ID: <20220108215501.113EC83460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=590d89fdad50f48c120b91ac008cc2ea4b625e15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master file-5.41 uses AC_PROG_CC, and was generated with autoconf 2.69. That oldish version of autoconf does not check the C standard when AC_PROG_CC is called, and standard-specific macros must be called instead: AC_PROG_CC_C89, AC_PROG_CC_C99, or AC_PROG_CC_STDC. So we would need to patch configure.ac to call either of those options, and then we'd have to autoreocnf. However, that would autoreconf with our autoconf, version 2.71. In that version, AC_PROG_CC always check what C standards are available and sets the appropriate ac_cv_XXX variables, and the previous macros, AC_PROG_CC_C89, AC_PROG_CC_C99, and AC_PROG_CC_STDC are deprecated. So it turns out that we just need to autoreconf. Fixes: - http://autobuild.buildroot.org/results/9e7868be00f2cd18205b2ce664be95f8b9e2b063 - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/file/file.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/file/file.mk b/package/file/file.mk index b7e833e834..c06975460f 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -10,6 +10,8 @@ FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c FILE_CPE_ID_VENDOR = file_project +FILE_AUTORECONF = YES + FILE_DEPENDENCIES = host-file FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES From peter at korsgaard.com Sat Jan 8 22:01:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 23:01:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/jimtcl: bump to version 0.81 In-Reply-To: <20220108214815.3492490-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 22:48:15 +0100") References: <20220108214815.3492490-1-fontaine.fabrice@gmail.com> Message-ID: <87lezpevju.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > http://jim.tcl.tk/index.html/doc/www/www/articles/jim-release-0-81/ > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 22:01:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 23:01:54 +0100 Subject: [Buildroot] [git commit] package/jimtcl: bump to version 0.81 Message-ID: <20220108215546.A8C3282626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6fc1b09211abc1c724e3665cec606c3bbdb209e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master http://jim.tcl.tk/index.html/doc/www/www/articles/jim-release-0-81/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jimtcl/jimtcl.hash | 2 +- package/jimtcl/jimtcl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jimtcl/jimtcl.hash b/package/jimtcl/jimtcl.hash index 7960f4fddb..d4174a3da6 100644 --- a/package/jimtcl/jimtcl.hash +++ b/package/jimtcl/jimtcl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9e79a960de925552eeb4df51121f0ea017e34409568117b1ac461f4c3071289e jimtcl-0.80.tar.gz +sha256 ab7eb3680ba0d16f4a9eb1e05b7fcbb7d23438e25185462c55cd032a1954a985 jimtcl-0.81.tar.gz sha256 419f1146334e57fb258d6c957d1f94d43455ec0d24b1b54c4447e5f61a353950 LICENSE diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 5d6b379260..2f8e0e6c69 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -4,7 +4,7 @@ # ################################################################################ -JIMTCL_VERSION = 0.80 +JIMTCL_VERSION = 0.81 JIMTCL_SITE = $(call github,msteveb,jimtcl,$(JIMTCL_VERSION)) JIMTCL_INSTALL_STAGING = YES JIMTCL_LICENSE = BSD-2-Clause From thomas.petazzoni at bootlin.com Sat Jan 8 22:03:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:03:52 +0100 Subject: [Buildroot] [PATCH/next 2/2] package/libcap: drop host-libcap dependency In-Reply-To: <04eb7314-3beb-c40f-483d-aa142f63a0c6@smile.fr> References: <20200830100058.4180798-1-fontaine.fabrice@gmail.com> <20200830100058.4180798-2-fontaine.fabrice@gmail.com> <04eb7314-3beb-c40f-483d-aa142f63a0c6@smile.fr> Message-ID: <20220108230352.17e5d57e@windsurf> On Sat, 8 Jan 2022 21:44:49 +0100 Romain Naour wrote: > Hello Fabrice, > > Le 30/08/2020 ? 12:00, Fabrice Fontaine a ?crit?: > > host-libcap was added as a dependency of libcap in commit > > efae605c88deb15d9c50fd67bdd80f46a78b06c1 without any explanation in the > > commit message. Drop this dependency that does seem to be needed. > > I dont see why host-libcap would be needed to build libcap for the target. > > libcap in Yocto doesn't add libcap-native in dependency: > > https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-support/libcap/libcap_2.62.bb > > This patch needs to be rebased on master since host-gperf has been added rencently. See https://git.buildroot.org/buildroot/commit/?id=0651b22d638faecb3688f1fd4e0760c31bfba893 Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 22:04:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 23:04:13 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/file: fix build with gcc 4.8 In-Reply-To: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> References: <20220104205455.3632671-1-fontaine.fabrice@gmail.com> Message-ID: <20220108220413.GG1881783@scaer> Fabrice, All, On 2022-01-04 21:54 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 5.41 in > commit d38b72bcd75392a88b5100839ac410859d0a6a79: > > readelf.c: In function 'do_auxv_note': > readelf.c:1046:2: error: 'for' loop initial declarations are only allowed in C99 mode > for (size_t off = 0; off + elsize <= descsz; off += elsize) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/31cbc313fceb84c0cbb1969fca5ac44244871dbc It turned out that all that was needed is to tun autoreconf. See the commti for the explanations: https://git.buildroot.org/buildroot/commit/package/file/file.mk?id=590d89fdad50f48c120b91ac008cc2ea4b625e15 Thanks! Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Set ac_cv_prog_c99 for host as already done for target instead of > adding an upstreamable patch > > package/file/file.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/file/file.mk b/package/file/file.mk > index 12647af8bb..62cec4b2c9 100644 > --- a/package/file/file.mk > +++ b/package/file/file.mk > @@ -9,6 +9,7 @@ FILE_SITE = ftp://ftp.astron.com/pub/file > FILE_DEPENDENCIES = host-file > HOST_FILE_DEPENDENCIES = host-zlib > FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' > +HOST_FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' > FILE_INSTALL_STAGING = YES > FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) > FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 8 22:05:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 23:05:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix build without stack-protector In-Reply-To: <20220108210752.3245794-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 22:07:52 +0100") References: <20220108210752.3245794-1-fontaine.fabrice@gmail.com> Message-ID: <87h7adevcz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without stack-protector raised since > bump to version 02092020 in commit > ebe808ac4071395b4d1e90d617c33a5e6e514af1 and > https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa: > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: > ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function > `handle_mem_bos_chk_warn': > safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' > If stack-protector is enabled in the Buildroot config, the toolchain > wrapper will make sure it is used, so there's no need for the safeclib > configure to handle it. > Fixes: > - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 > Signed-off-by: Fabrice Fontaine > --- > +++ b/package/safeclib/safeclib.mk > @@ -11,5 +11,8 @@ SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz > SAFECLIB_LICENSE = MIT > SAFECLIB_LICENSE_FILES = COPYING > SAFECLIB_INSTALL_STAGING = YES > +# We're patching configure.ac > +SAFECLIB_AUTORECONF = YES > +SAFECLIB_CONF_OPTS = --disable-hardening I've added a comment explaining why this is done, similar to how we do it in tpm2-tools.mk and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 22:04:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 23:04:54 +0100 Subject: [Buildroot] [git commit] package/safeclib: fix build without stack-protector Message-ID: <20220108215947.D4B4E82972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fac3b2b88574e605d713ac917024ba39d444563 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without stack-protector raised since bump to version 02092020 in commit ebe808ac4071395b4d1e90d617c33a5e6e514af1 and https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function `handle_mem_bos_chk_warn': safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' If stack-protector is enabled in the Buildroot config, the toolchain wrapper will make sure it is used, so there's no need for the safeclib configure to handle it. Fixes: - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 Signed-off-by: Fabrice Fontaine [Peter: add comment explaining why this is done] Signed-off-by: Peter Korsgaard --- ...configure.ac-add-disable-hardening-option.patch | 63 ++++++++++++++++++++++ package/safeclib/safeclib.mk | 5 ++ 2 files changed, 68 insertions(+) diff --git a/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch new file mode 100644 index 0000000000..e851fce993 --- /dev/null +++ b/package/safeclib/0001-configure.ac-add-disable-hardening-option.patch @@ -0,0 +1,63 @@ +From 94c612016834d7bdc2b721ff5f4f5e158bda6fdd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 8 Jan 2022 21:49:22 +0100 +Subject: [PATCH] configure.ac: add --disable-hardening option + +Allow the user to disable hardening which is enabled by default since +version 02092020 and +https://github.com/rurban/safeclib/commit/caa4408eb4a5c767f0474258af3b6ccf444e10aa +to avoid the following build failure when the toolchain doesn't support +stack-protector: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: ../src/.libs/libsafec-3.6.0.a(safe_mem_constraint.o): in function `handle_mem_bos_chk_warn': +safe_mem_constraint.c:(.text+0x40): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/a481ee2d26a094358b0298617cce691be3077f22 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rurban/safeclib/pull/107] +--- + configure.ac | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 55756b06..f852ed44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -383,6 +383,21 @@ AC_ARG_ENABLE(debug-build, + esac], [enable_debug_build=false ]) + AM_CONDITIONAL(ENABLE_DEBUG_BUILD, test "x$enable_debug_build" = "xtrue") + ++AC_ARG_ENABLE(hardening, ++ AS_HELP_STRING([--disable-hardening], ++ [disable hardening @<:@default=no@:>@]), ++ [case "${enableval}" in ++ yes) enable_hardening=true ;; ++ no) enable_hardening=false ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-hardening]) ;; ++ esac], [enable_hardening=true]) ++ ++if test "x$enable_hardening" = "xtrue" ; then ++ AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], ++ [WARN_CFLAGS],[$ax_ccf_err]) ++ AX_APPEND_LINK_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], ++ [WARN_LDFLAGS],[$ax_ccf_err]) ++fi + + AC_MSG_NOTICE([Check programs]) + # =============================================== +@@ -543,10 +562,6 @@ case $host_os in + [],[$ax_ccf_err]) + ;; + esac +-AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], +- [WARN_CFLAGS],[$ax_ccf_err]) +-AX_APPEND_LINK_FLAGS([-fstack-protector-strong -fstack-clash-protection -fcf-protection], +- [WARN_LDFLAGS],[$ax_ccf_err]) + + if test x$ax_cv_check_cflags__Wrestrict = xyes; then + AC_DEFINE([HAVE_WARNING_RESTRICT], 1, [Have -Wrestrict]) +-- +2.34.1 + diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk index 032a73bf67..29ffea7f2e 100644 --- a/package/safeclib/safeclib.mk +++ b/package/safeclib/safeclib.mk @@ -11,5 +11,10 @@ SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).tar.xz SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES +# We're patching configure.ac +SAFECLIB_AUTORECONF = YES +# -fstack-protector-strong is used by default. Disable that so the +# BR2_SSP_* options in the toolchain wrapper are used instead +SAFECLIB_CONF_OPTS = --disable-hardening $(eval $(autotools-package)) From yann.morin.1998 at free.fr Sat Jan 8 22:07:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 23:07:25 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: add zstd support Message-ID: <20220108220140.D1167832D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9437db2720c64b55d67178fc678f7bf8e6c5fd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master zstd is supported since version 4.13.1 and https://github.com/kdave/btrfs-progs/commit/717a8b1e5d1ba69154ef84b35be75c9cf7730e1d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/btrfs-progs/btrfs-progs.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 4c26cf0df5..b010a0e0be 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -8,7 +8,7 @@ BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib -BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python +BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-python BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES @@ -30,6 +30,13 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +BTRFS_PROGS_CONF_OPTS += --enable-zstd +BTRFS_PROGS_DEPENDENCIES += zstd +else +BTRFS_PROGS_CONF_OPTS += --disable-zstd +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) BTRFS_PROGS_CONF_OPTS += --enable-libudev BTRFS_PROGS_DEPENDENCIES += udev From yann.morin.1998 at free.fr Sat Jan 8 22:13:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 8 Jan 2022 23:13:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: add zstd support In-Reply-To: <20220108214952.3493782-1-fontaine.fabrice@gmail.com> References: <20220108214952.3493782-1-fontaine.fabrice@gmail.com> Message-ID: <20220108221314.GH1881783@scaer> Fabrice, All, On 2022-01-08 22:49 +0100, Fabrice Fontaine spake thusly: > zstd is supported since version 4.13.1 and > https://github.com/kdave/btrfs-progs/commit/717a8b1e5d1ba69154ef84b35be75c9cf7730e1d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/btrfs-progs/btrfs-progs.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index 4c26cf0df5..b010a0e0be 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -8,7 +8,7 @@ BTRFS_PROGS_VERSION = 5.15.1 > BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs > BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz > BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib > -BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python > +BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-python > BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) > BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING > BTRFS_PROGS_INSTALL_STAGING = YES > @@ -30,6 +30,13 @@ else > BTRFS_PROGS_CONF_OPTS += --disable-convert > endif > > +ifeq ($(BR2_PACKAGE_ZSTD),y) > +BTRFS_PROGS_CONF_OPTS += --enable-zstd > +BTRFS_PROGS_DEPENDENCIES += zstd > +else > +BTRFS_PROGS_CONF_OPTS += --disable-zstd > +endif > + > ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > BTRFS_PROGS_CONF_OPTS += --enable-libudev > BTRFS_PROGS_DEPENDENCIES += udev > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Jan 8 22:15:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 23:15:56 +0100 Subject: [Buildroot] [PATCH] support/testing: add a runtime test for the systemd unit tests In-Reply-To: References: <20200420085156.2930014-1-romain.naour@gmail.com> <20200423202028.GQ5035@scaer> Message-ID: <25bf60fe-d8d9-08dc-0fac-d7508ae22eff@mind.be> On 08/01/2022 16:05, Romain Naour wrote: > Hello, J?r?my, All, > > Le 24/04/2020 ? 14:52, J?r?my ROSEN a ?crit?: >> Well... >> >> I see your point, but as you said, buildroot is a bit of a special case and >> systemd is a bit of a special case >> >> I have used systemd's test suite as non-regression testing when I bumped >> systemd previously and it >> did catch quite a few regression/improper integration on the BR side >> (mainly incompatibilites between >> util-linux and busybox) so I think it is important to check that when >> bumping systemd > > I updated this test for systemd 250.1 and the main issue with the testsuite is > releated to busybox. > > Some test scripts are using command not supported by busybox: > > rev (util-linux) > mktemp --tmpdir > touch --version > > Busybox 1.35.0 add the mktemp --tmpdir option [1] > > This patch allowed to detect two build issue with old toolchain [2] Yeah, but that's just because the toolchain we use as default for the runtime tests just happens to be one with older headres. To really capture regressions with this test suite, we would have to run it with various toolchains and system configurations. But that's not what the runtime tests are currently doing. To support such a scenario what we should do instead is to run the package tests from the autobuilders, with the various different configurations that are tried out there. Of course, at the moment that is not really possible because the results that are produced by the autobuilders can't necessarily easily be loaded into qemu. Plus of course we'd need to have a kernel for each of the various configurations. Regards, Arnout > > Anyway this patch needs a respin if we want to merge it to Buildroot. > > [1] > https://git.busybox.net/busybox/commit/?id=ecac9853f29dcb2e5e0d70c0effaae2cabeefabf > [2] > https://git.buildroot.net/buildroot/commit/?id=315ba5c26dd6bb0c01067e8346b4a7eceb7d0ee1 > > Best regards, > Romain > >> >> Making the testsuite run in buildroot is a bit tricky (as this patchset >> proves) and having it upstreamed is not >> just about reg-testing but also about making it easy for devs that would >> bump systemd to check that everything >> is fine. >> >> If we go with your argument that running package non-reg is useless because >> upstream is supposed to run it >> itself, then we won't run any gcc non-reg (since gcc is supposed to run it) >> nor any boot-testing (the kernel is >> supposed to test that) so basically we do no testing except some very >> buildroot-specific test. >> >> And we know from experience that upstream is not as reliable as it should >> be, especially on exotic setups/arch >> and buildroot need to test that if it wants to improve quality, because >> nobody else will do it... >> >> Regards >> Jeremy >> >> Le jeu. 23 avr. 2020 ? 22:20, Yann E. MORIN a >> ?crit : >> >>> Romain, J?r?my, All, >>> >>> On 2020-04-20 10:51 +0200, Romain Naour spake thusly: >>>> Initial work by Jeremy Rosen [1]. >>>> >>>> In order to allow building the testsuite, add an BR2_external >>>> to add new flags in SYSTEMD_CONF_OPTS: >>> >>> Thanks for the effort. But I am not very much enthusiastic about it. >>> >>> What good does it do to us, Buildroot, that we are able to run systemd's >>> test suite? >>> >>> Sure, we have runtime tests inBuildroot. But IMHO those runtime tests >>> are for validating that the packaging and integration in Buildroot is >>> correct. For example, it allows us to test that python pakcages have all >>> their dependencies, or that a systemd-based system dos indeed boots >>> correctly to bring up network, spawn a login, etc... >>> >>> Test- suites on the other hand are for upstream to valisdate they have >>> no regression, and that the code they write behaves as they expect it >>> to. Test suites are usually not meant for downstream consumptions. >>> >>> Yes, Buildroot is in a special spot as a downstream, in that it targets >>> so many different targets that upstream may nt have, or may not be even >>> aware of. Still, it is of my opinion that we should not be responsible >>> for being able to run that test suite. >>> >>> So I am not very in favour of carrying such a thing in Buildroot, >>> unfortunately... >>> >>> I'm leaving the patch as "new" in patchwork, though, in case another >>> maintainer as a stronger opinion in favour of it, or in case you can >>> make a very strgin argument explaining why we need it. >>> >>> Regards, >>> Yann E. MORIN. >>> >>>> "SYSTEMD_CONF_OPTS += -Dslow-tests=true -Dinstall-tests=true >>> -Dtests=true" >>>> >>>> This allow to install run-unit-tests.py on the target to execute >>>> all tests installed to /lib/systemd/tests. While at it, enable usafe >>> tests >>>> since we are using a rootfs image built only to run these tests. >>>> >>>> The run-integration-tests.sh script is not executed since it's intended >>>> to run from the systemd build directory on the host machine. >>>> >>>> The rootfsoverlay from [1] is removed since it contains some >>>> customization not needed for the tests. >>>> >>>> Some tests needs a high entropy level, otherwise they are stuck. >>>> Install rng-tools and add -device virtio-rng-pci in qemu command line. >>>> >>>> In order to run as many tests as possible, activate as many systemd >>>> options as possible. cgroupv2 is enabled from the kernel command >>>> line to pass test-bfp-device test. >>>> >>>> Use the latest LTS kernel 5.4. >>>> >>>> Some unit files used by the systemd testsuite are using some program >>>> functionnality not implemented by the busybox variant (grep, find). >>>> >>>> The stat command with custom format (-c) and display of filesystem >>> status (-f) >>>> used by exec-protecthome-tmpfs-vs-protectsystem-strict.service can be >>> provided >>>> by busybox or coreutils. Add a busybox config fragment to add "stat -fc" >>> since >>>> it's not enabled by the busybox defconfig used by Buildroot. >>>> >>>> The ionice command used by exec-ioschedulingclass-none.service is >>> provided by >>>> util-linux schedutils. >>>> >>>> libcap tools needed to provide capsh binary for test-execute. >>>> >>>> Skipped tests: >>>> test-barrier: This test requires a baremetal machine. >>>> test-bus-chat: This test requires an user account. >>>> >>>> Tested on gitlab: >>>> https://gitlab.com/kubu93/buildroot/pipelines/137689982 >>>> >>>> [1] https://github.com/boucman/buildroot-systemd >>>> >>>> Signed-off-by: Romain Naour >>>> Cc: J?r?my Rosen >>>> Cc: Adam Duskett >>>> Cc: Maxime Hadjinlian >>>> Cc: Yann E. MORIN >>>> --- >>>> On my machine, the runtime test is completed in 287.761s. >>>> >>>> OK: 203 SKIP: 2 FAIL: 0 >>>> --- >>>> .../testing/conf/busybox-stat-fragment.config | 3 + >>>> .../package/br2-external/systemd/Config.in | 0 >>>> .../br2-external/systemd/external.desc | 2 + >>>> .../package/br2-external/systemd/external.mk | 5 + >>>> support/testing/tests/package/test_systemd.py | 123 ++++++++++++++++++ >>>> .../test_systemd/systemd-kernel.config | 111 ++++++++++++++++ >>>> 6 files changed, 244 insertions(+) >>>> create mode 100644 support/testing/conf/busybox-stat-fragment.config >>>> create mode 100644 >>> support/testing/tests/package/br2-external/systemd/Config.in >>>> create mode 100644 >>> support/testing/tests/package/br2-external/systemd/external.desc >>>> create mode 100644 support/testing/tests/package/br2-external/systemd/ >>> external.mk >>>> create mode 100644 support/testing/tests/package/test_systemd.py >>>> create mode 100644 >>> support/testing/tests/package/test_systemd/systemd-kernel.config >>>> >>>> diff --git a/support/testing/conf/busybox-stat-fragment.config >>> b/support/testing/conf/busybox-stat-fragment.config >>>> new file mode 100644 >>>> index 0000000000..55f64c761f >>>> --- /dev/null >>>> +++ b/support/testing/conf/busybox-stat-fragment.config >>>> @@ -0,0 +1,3 @@ >>>> +CONFIG_STAT=y >>>> +CONFIG_FEATURE_STAT_FORMAT=y >>>> +CONFIG_FEATURE_STAT_FILESYSTEM=y >>>> diff --git >>> a/support/testing/tests/package/br2-external/systemd/Config.in >>> b/support/testing/tests/package/br2-external/systemd/Config.in >>>> new file mode 100644 >>>> index 0000000000..e69de29bb2 >>>> diff --git >>> a/support/testing/tests/package/br2-external/systemd/external.desc >>> b/support/testing/tests/package/br2-external/systemd/external.desc >>>> new file mode 100644 >>>> index 0000000000..2c7317f301 >>>> --- /dev/null >>>> +++ b/support/testing/tests/package/br2-external/systemd/external.desc >>>> @@ -0,0 +1,2 @@ >>>> +name: BUILDROOT_SYSTEMD_TESTSUITE >>>> +desc: Buildroot to easily test systemd changes or changes to the >>> systemd recipe in buildroot >>>> diff --git a/support/testing/tests/package/br2-external/systemd/ >>> external.mk b/support/testing/tests/package/br2-external/systemd/ >>> external.mk >>>> new file mode 100644 >>>> index 0000000000..780d79153b >>>> --- /dev/null >>>> +++ b/support/testing/tests/package/br2-external/systemd/external.mk >>>> @@ -0,0 +1,5 @@ >>>> +# Append SYSTEMD_CONF_OPTS from this BR2_EXTERNAL due to include order >>> in the Buildroot main Makefile: >>>> +# -include $(PACKAGE_OVERRIDE_FILE) >>>> +# -include $(sort $(wildcard package/*/*.mk)) >>>> +# include $(BR2_EXTERNAL_FILE) >>>> +SYSTEMD_CONF_OPTS += -Dslow-tests=true -Dinstall-tests=true -Dtests=true >>>> diff --git a/support/testing/tests/package/test_systemd.py >>> b/support/testing/tests/package/test_systemd.py >>>> new file mode 100644 >>>> index 0000000000..891c464652 >>>> --- /dev/null >>>> +++ b/support/testing/tests/package/test_systemd.py >>>> @@ -0,0 +1,123 @@ >>>> +import os >>>> + >>>> +import infra.basetest >>>> + >>>> +SYSTEMD_TIMEOUT = 400 >>>> + >>>> +# https://www.freedesktop.org/wiki/Software/systemd/VirtualizedTesting/ >>>> +# Some unit files used by the systemd testsuite are using some program >>> functionnality >>>> +# not implemented by the busybox variant (grep, find). >>>> +# The stat command with custom format (-c) and display of filesystem >>> status (-f) used by >>>> +# exec-protecthome-tmpfs-vs-protectsystem-strict.service can be >>> provided by busybox or coreutils. >>>> +# The ionice command used by exec-ioschedulingclass-none.service is >>> provided by util-linux schedutils. >>>> +# libcap tools needed to provide capsh binary for test-execute. >>>> + >>>> +# Skipped tests: >>>> +# test-barrier: This test requires a baremetal machine. >>>> +# test-bus-chat: This test requires an user account. >>>> + >>>> + >>>> +class TestSystemd(infra.basetest.BRTest): >>>> + br2_external = >>> [infra.filepath("tests/package/br2-external/systemd")] >>>> + config = \ >>>> + """ >>>> + BR2_x86_core2=y >>>> + BR2_TOOLCHAIN_EXTERNAL=y >>>> + BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y >>>> + BR2_TOOLCHAIN_EXTERNAL_URL=" >>> http://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2020.02-2.tar.bz2 >>> " >>>> + BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y >>>> + BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y >>>> + BR2_TOOLCHAIN_EXTERNAL_CXX=y >>>> + BR2_INIT_SYSTEMD=y >>>> + BR2_SYSTEM_BIN_SH_BASH=y >>>> + BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" >>>> + BR2_SYSTEM_DHCP="eth0" >>>> + BR2_ENABLE_LOCALE_WHITELIST="C en_US C_UTF8 fr_FR" >>>> + BR2_SYSTEM_ENABLE_NLS=y >>>> + BR2_LINUX_KERNEL=y >>>> + BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>>> + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.32" >>>> + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y >>>> + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" >>>> + BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="{}" >>>> + BR2_PACKAGE_FINDUTILS=y >>>> + BR2_PACKAGE_GREP=y >>>> + BR2_PACKAGE_RNG_TOOLS=y >>>> + BR2_PACKAGE_PYTHON3=y >>>> + BR2_PACKAGE_GNUTLS=y >>>> + BR2_PACKAGE_LIBQRENCODE=y >>>> + BR2_PACKAGE_LIBXKBCOMMON=y >>>> + BR2_PACKAGE_LIBIDN2=y >>>> + BR2_PACKAGE_ELFUTILS=y >>>> + BR2_PACKAGE_ELFUTILS_PROGS=y >>>> + BR2_PACKAGE_LIBCAP_TOOLS=y >>>> + BR2_PACKAGE_LIBCGROUP=y >>>> + BR2_PACKAGE_LIBCGROUP_TOOLS=y >>>> + BR2_PACKAGE_LIBSECCOMP=y >>>> + BR2_PACKAGE_LINUX_PAM=y >>>> + BR2_PACKAGE_P11_KIT=y >>>> + BR2_PACKAGE_LIBSELINUX=y >>>> + BR2_PACKAGE_PCRE2=y >>>> + BR2_PACKAGE_IPTABLES=y >>>> + BR2_PACKAGE_BASH_COMPLETION=y >>>> + BR2_PACKAGE_ACL=y >>>> + BR2_PACKAGE_AUDIT=y >>>> + BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y >>>> + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y >>>> + BR2_PACKAGE_SYSTEMD_BACKLIGHT=y >>>> + BR2_PACKAGE_SYSTEMD_BINFMT=y >>>> + BR2_PACKAGE_SYSTEMD_COREDUMP=y >>>> + BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y >>>> + BR2_PACKAGE_SYSTEMD_HIBERNATE=y >>>> + BR2_PACKAGE_SYSTEMD_HOMED=y >>>> + BR2_PACKAGE_SYSTEMD_IMPORTD=y >>>> + BR2_PACKAGE_SYSTEMD_LOCALED=y >>>> + BR2_PACKAGE_SYSTEMD_LOGIND=y >>>> + BR2_PACKAGE_SYSTEMD_MACHINED=y >>>> + BR2_PACKAGE_SYSTEMD_POLKIT=y >>>> + BR2_PACKAGE_SYSTEMD_QUOTACHECK=y >>>> + BR2_PACKAGE_SYSTEMD_RANDOMSEED=y >>>> + BR2_PACKAGE_SYSTEMD_REPART=y >>>> + BR2_PACKAGE_SYSTEMD_RFKILL=y >>>> + BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT=y >>>> + BR2_PACKAGE_SYSTEMD_SYSUSERS=y >>>> + BR2_PACKAGE_SYSTEMD_USERDB=y >>>> + BR2_PACKAGE_UTIL_LINUX_MINIX=y >>>> + BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y >>>> + BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y >>>> + BR2_PACKAGE_UTIL_LINUX_UNSHARE=y >>>> + BR2_TARGET_ROOTFS_EXT2=y >>>> + BR2_TARGET_ROOTFS_EXT2_4=y >>>> + BR2_TARGET_ROOTFS_EXT2_SIZE="1G" >>>> + # BR2_TARGET_ROOTFS_TAR is not set >>>> + """.format( >>>> + >>> infra.filepath("tests/package/test_systemd/systemd-kernel.config"), >>>> + infra.filepath("conf/busybox-stat-fragment.config")) >>>> + >>>> + def login(self): >>>> + img = os.path.join(self.builddir, "images", "rootfs.ext2") >>>> + kern = os.path.join(self.builddir, "images", "bzImage") >>>> + >>>> + # the complete boot with systemd takes more time than what the >>> default multipler permits >>>> + self.emulator.timeout_multiplier *= 10 >>>> + >>>> + # systemd testsuite overallocate memory and the minimum that >>> seemed to work was 1G >>>> + # systemd.unified_cgroup_hierarchy=1 for cgroup v2 and >>> test-execute >>>> + self.emulator.boot(arch="i386", >>>> + kernel=kern, >>>> + kernel_cmdline=["root=/dev/vda", "ro", >>> "console=ttyS0", >>>> + >>> "systemd.unified_cgroup_hierarchy=1", >>>> + "audit=0 >>> cgroup_no_v1=\"all\""], >>>> + options=["-M", "pc", "-m", "1G", "-device", >>>> + "virtio-rng-pci", "-drive", >>>> + >>> "file={},if=virtio,format=raw".format(img)]) >>>> + self.emulator.login() >>>> + >>>> + def test_run(self): >>>> + timeout = SYSTEMD_TIMEOUT * self.emulator.timeout_multiplier >>>> + >>>> + self.login() >>>> + >>>> + cmd = "/usr/lib/systemd/tests/run-unit-tests.py --unsafe" >>>> + _, exit_code = self.emulator.run(cmd, timeout) >>>> + self.assertEqual(exit_code, 0) >>>> diff --git >>> a/support/testing/tests/package/test_systemd/systemd-kernel.config >>> b/support/testing/tests/package/test_systemd/systemd-kernel.config >>>> new file mode 100644 >>>> index 0000000000..0c4efed77f >>>> --- /dev/null >>>> +++ b/support/testing/tests/package/test_systemd/systemd-kernel.config >>>> @@ -0,0 +1,111 @@ >>>> +CONFIG_SYSVIPC=y >>>> +CONFIG_POSIX_MQUEUE=y >>>> +CONFIG_PSI=y >>>> +CONFIG_CGROUPS=y >>>> +CONFIG_MEMCG=y >>>> +CONFIG_MEMCG_SWAP=y >>>> +# CONFIG_MEMCG_SWAP_ENABLED is not set >>>> +CONFIG_BLK_CGROUP=y >>>> +CONFIG_CGROUP_SCHED=y >>>> +CONFIG_CFS_BANDWIDTH=y >>>> +CONFIG_RT_GROUP_SCHED=y >>>> +CONFIG_CGROUP_PIDS=y >>>> +CONFIG_CGROUP_RDMA=y >>>> +CONFIG_CGROUP_FREEZER=y >>>> +CONFIG_CGROUP_HUGETLB=y >>>> +CONFIG_CPUSETS=y >>>> +CONFIG_CGROUP_DEVICE=y >>>> +CONFIG_CGROUP_CPUACCT=y >>>> +CONFIG_CGROUP_PERF=y >>>> +CONFIG_CGROUP_BPF=y >>>> +CONFIG_NAMESPACES=y >>>> +CONFIG_USER_NS=y >>>> +CONFIG_CHECKPOINT_RESTORE=y >>>> +CONFIG_EXPERT=y >>>> +CONFIG_BPF_SYSCALL=y >>>> +CONFIG_USERFAULTFD=y >>>> +CONFIG_SMP=y >>>> +CONFIG_HYPERVISOR_GUEST=y >>>> +CONFIG_PARAVIRT=y >>>> +CONFIG_DMI_SYSFS=y >>>> +CONFIG_MODULES=y >>>> +CONFIG_MODULE_UNLOAD=y >>>> +CONFIG_BLK_CGROUP_IOLATENCY=y >>>> +CONFIG_BINFMT_MISC=y >>>> +CONFIG_NET=y >>>> +CONFIG_PACKET=y >>>> +CONFIG_UNIX=y >>>> +CONFIG_INET=y >>>> +CONFIG_NET_SCHED=y >>>> +CONFIG_NET_CLS_CGROUP=y >>>> +CONFIG_CGROUP_NET_PRIO=y >>>> +# CONFIG_WIRELESS is not set >>>> +CONFIG_PCI=y >>>> +CONFIG_DEVTMPFS=y >>>> +CONFIG_DEVTMPFS_MOUNT=y >>>> +CONFIG_VIRTIO_BLK=y >>>> +CONFIG_BLK_DEV_SD=y >>>> +CONFIG_SCSI_VIRTIO=y >>>> +CONFIG_ATA=y >>>> +CONFIG_ATA_PIIX=y >>>> +CONFIG_NETDEVICES=y >>>> +CONFIG_VIRTIO_NET=y >>>> +CONFIG_NE2K_PCI=y >>>> +CONFIG_8139CP=y >>>> +# CONFIG_WLAN is not set >>>> +CONFIG_INPUT_EVDEV=y >>>> +CONFIG_INPUT_MISC=y >>>> +CONFIG_INPUT_UINPUT=m >>>> +CONFIG_SERIAL_8250=y >>>> +CONFIG_SERIAL_8250_CONSOLE=y >>>> +CONFIG_VIRTIO_CONSOLE=y >>>> +CONFIG_HW_RANDOM=y >>>> +CONFIG_HW_RANDOM_VIRTIO=y >>>> +CONFIG_DRM=y >>>> +CONFIG_DRM_QXL=y >>>> +CONFIG_DRM_BOCHS=y >>>> +CONFIG_DRM_VIRTIO_GPU=y >>>> +CONFIG_FRAMEBUFFER_CONSOLE=y >>>> +CONFIG_SOUND=y >>>> +CONFIG_SND=y >>>> +CONFIG_SND_HDA_INTEL=y >>>> +CONFIG_SND_HDA_GENERIC=y >>>> +CONFIG_HID_A4TECH=y >>>> +CONFIG_HID_APPLE=y >>>> +CONFIG_HID_BELKIN=y >>>> +CONFIG_HID_CHERRY=y >>>> +CONFIG_HID_CHICONY=y >>>> +CONFIG_HID_CYPRESS=y >>>> +CONFIG_HID_EZKEY=y >>>> +CONFIG_HID_ITE=y >>>> +CONFIG_HID_KENSINGTON=y >>>> +CONFIG_HID_LOGITECH=y >>>> +CONFIG_HID_REDRAGON=y >>>> +CONFIG_HID_MICROSOFT=y >>>> +CONFIG_HID_MONTEREY=y >>>> +CONFIG_USB=y >>>> +CONFIG_USB_XHCI_HCD=y >>>> +CONFIG_USB_EHCI_HCD=y >>>> +CONFIG_USB_UHCI_HCD=y >>>> +CONFIG_USB_STORAGE=y >>>> +CONFIG_VIRTIO_PCI=y >>>> +CONFIG_VIRTIO_BALLOON=y >>>> +CONFIG_VIRTIO_INPUT=y >>>> +CONFIG_VIRTIO_MMIO=y >>>> +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y >>>> +CONFIG_EXT4_FS=y >>>> +CONFIG_EXT4_FS_POSIX_ACL=y >>>> +CONFIG_EXT4_FS_SECURITY=y >>>> +CONFIG_FANOTIFY=y >>>> +CONFIG_AUTOFS4_FS=y >>>> +CONFIG_TMPFS=y >>>> +CONFIG_TMPFS_POSIX_ACL=y >>>> +CONFIG_HUGETLBFS=y >>>> +CONFIG_SECURITY=y >>>> +CONFIG_SECURITY_SMACK=y >>>> +CONFIG_DEFAULT_SECURITY_DAC=y >>>> +CONFIG_CRYPTO_HMAC=y >>>> +CONFIG_CRYPTO_SHA256=y >>>> +CONFIG_CRYPTO_USER_API_HASH=y >>>> +CONFIG_DEBUG_FS=y >>>> +# CONFIG_FTRACE is not set >>>> -- >>>> 2.25.3 >>>> >>> >>> -- >>> >>> .-----------------.--------------------.------------------.--------------------. >>> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' >>> conspiracy: | >>> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ >>> | >>> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is >>> no | >>> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v >>> conspiracy. | >>> >>> '------------------------------^-------^------------------^--------------------' >>> >> >> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at busybox.net >> http://lists.busybox.net/mailman/listinfo/buildroot >> > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From fontaine.fabrice at gmail.com Sat Jan 8 22:17:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:17:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/janus-gateway: bump to version 0.11.6 Message-ID: <20220108221707.3626671-1-fontaine.fabrice@gmail.com> - Add upstream status (rejected) to first and second patches - Drop third patch (already in version) https://github.com/meetecho/janus-gateway/blob/v0.11.6/CHANGELOG.md Signed-off-by: Fabrice Fontaine --- package/janus-gateway/0001-disable-ssp.patch | 2 + ...dd-test-for-Wunused-but-set-variable.patch | 2 + ...site-Scripting-XSS-exploits-in-demos.patch | 357 ------------------ ...> 0003-Fixed-missing-XSS-mitigation.patch} | 0 package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 7 +- 6 files changed, 7 insertions(+), 363 deletions(-) delete mode 100644 package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch rename package/janus-gateway/{0004-Fixed-missing-XSS-mitigation.patch => 0003-Fixed-missing-XSS-mitigation.patch} (100%) diff --git a/package/janus-gateway/0001-disable-ssp.patch b/package/janus-gateway/0001-disable-ssp.patch index 22f7f1a417..0c9b006ed9 100644 --- a/package/janus-gateway/0001-disable-ssp.patch +++ b/package/janus-gateway/0001-disable-ssp.patch @@ -12,6 +12,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[Upstream status: rejected +(https://github.com/meetecho/janus-gateway/pull/1801)] --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index b54c8cbec6..2dfcc76d68 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -18,6 +18,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[Upstream status: rejected +(https://github.com/meetecho/janus-gateway/pull/1789)] --- Makefile.am | 1 + configure.ac | 6 ++- diff --git a/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch b/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch deleted file mode 100644 index 9f3adfcc8e..0000000000 --- a/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch +++ /dev/null @@ -1,357 +0,0 @@ -From ba166e9adebfe5343f826c6a9e02299d35414ffd Mon Sep 17 00:00:00 2001 -From: Lorenzo Miniero -Date: Thu, 25 Nov 2021 17:20:53 +0100 -Subject: [PATCH] Fix potential Cross-site Scripting (XSS) exploits in demos - (#2817) - -[Retrieved (and backported) from: -https://github.com/meetecho/janus-gateway/commit/ba166e9adebfe5343f826c6a9e02299d35414ffd] -Signed-off-by: Fabrice Fontaine ---- - html/audiobridgetest.js | 17 +++++++++++++---- - html/recordplaytest.js | 13 +++++++++++-- - html/screensharingtest.js | 11 ++++++++++- - html/streamingtest.js | 13 +++++++++++-- - html/textroomtest.js | 23 ++++++++++++++--------- - html/videocalltest.js | 15 ++++++++++++--- - html/videoroomtest.js | 13 +++++++++++-- - html/vp9svctest.js | 13 +++++++++++-- - 8 files changed, 93 insertions(+), 25 deletions(-) - -diff --git a/html/audiobridgetest.js b/html/audiobridgetest.js -index 18e1cc1839..f757789708 100644 ---- a/html/audiobridgetest.js -+++ b/html/audiobridgetest.js -@@ -178,7 +178,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -222,7 +222,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -267,7 +267,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -429,7 +429,7 @@ function registerUsername() { - return; - } - var register = { request: "join", room: myroom, display: username }; -- myusername = username; -+ myusername = escapeXmlTags(username); - mixertest.send({ message: register}); - } - } -@@ -448,3 +448,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/recordplaytest.js b/html/recordplaytest.js -index 74ee7bed95..52b5ccbc4c 100644 ---- a/html/recordplaytest.js -+++ b/html/recordplaytest.js -@@ -423,11 +423,11 @@ function updateRecsList() { - Janus.debug("Got a list of available recordings:", list); - for(var mp in list) { - Janus.debug(" >> [" + list[mp]["id"] + "] " + list[mp]["name"] + " (" + list[mp]["date"] + ")"); -- $('#recslist').append("
  • " + list[mp]["name"] + " [" + list[mp]["date"] + "]" + "
    • "); -+ $('#recslist').append("
  • " + escapeXmlTags(list[mp]["name"]) + " [" + list[mp]["date"] + "]" + "
    • "); - } - $('#recslist a').unbind('click').click(function() { - selectedRecording = $(this).attr("id"); -- selectedRecordingInfo = $(this).text(); -+ selectedRecordingInfo = escapeXmlTags($(this).text()); - $('#recset').html($(this).html()).parent().removeClass('open'); - $('#play').removeAttr('disabled').click(startPlayout); - return false; -@@ -545,3 +545,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/screensharingtest.js b/html/screensharingtest.js -index 61eac70f43..c64d8dbd67 100644 ---- a/html/screensharingtest.js -+++ b/html/screensharingtest.js -@@ -161,7 +161,7 @@ $(document).ready(function() { - if(event === "joined") { - myid = msg["id"]; - $('#session').html(room); -- $('#title').html(msg["description"]); -+ $('#title').html(escapeXmlTags(msg["description"])); - Janus.log("Successfully joined room " + msg["room"] + " with ID " + myid); - if(role === "publisher") { - // This is our session, publish our stream -@@ -514,3 +514,12 @@ function newRemoteFeed(id, display) { - } - }); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/streamingtest.js b/html/streamingtest.js -index 7dd2e1f681..3f9937f11c 100644 ---- a/html/streamingtest.js -+++ b/html/streamingtest.js -@@ -323,7 +323,7 @@ function updateStreamsList() { - Janus.debug(list); - for(var mp in list) { - Janus.debug(" >> [" + list[mp]["id"] + "] " + list[mp]["description"] + " (" + list[mp]["type"] + ")"); -- $('#streamslist').append("
  • " + list[mp]["description"] + " (" + list[mp]["type"] + ")" + "
    • "); -+ $('#streamslist').append("
  • " + escapeXmlTags(list[mp]["description"]) + " (" + list[mp]["type"] + ")" + "
    • "); - } - $('#streamslist a').unbind('click').click(function() { - selectedStream = $(this).attr("id"); -@@ -345,7 +345,7 @@ function getStreamInfo() { - var body = { request: "info", id: parseInt(selectedStream) || selectedStream }; - streaming.send({ message: body, success: function(result) { - if(result && result.info && result.info.metadata) { -- $('#metadata').html(result.info.metadata); -+ $('#metadata').html(escapeXmlTags(result.info.metadata)); - $('#info').removeClass('hide').show(); - } - }}); -@@ -394,6 +394,15 @@ function stopStream() { - simulcastStarted = false; - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons() { - $('#curres').parent().append( -diff --git a/html/textroomtest.js b/html/textroomtest.js -index 082ae44905..3d0697e35a 100644 ---- a/html/textroomtest.js -+++ b/html/textroomtest.js -@@ -153,9 +153,7 @@ $(document).ready(function() { - var what = json["textroom"]; - if(what === "message") { - // Incoming message: public or private? -- var msg = json["text"]; -- msg = msg.replace(new RegExp('<', 'g'), '<'); -- msg = msg.replace(new RegExp('>', 'g'), '>'); -+ var msg = escapeXmlTags(json["text"]); - var from = json["from"]; - var dateString = getDateString(json["date"]); - var whisper = json["whisper"]; -@@ -170,9 +168,7 @@ $(document).ready(function() { - } - } else if(what === "announcement") { - // Room announcement -- var msg = json["text"]; -- msg = msg.replace(new RegExp('<', 'g'), '<'); -- msg = msg.replace(new RegExp('>', 'g'), '>'); -+ var msg = escapeXmlTags(json["text"]); - var dateString = getDateString(json["date"]); - $('#chatroom').append('

    [' + dateString + '] ' + msg + ''); - $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; -@@ -180,7 +176,7 @@ $(document).ready(function() { - // Somebody joined - var username = json["username"]; - var display = json["display"]; -- participants[username] = display ? display : username; -+ participants[username] = escapeXmlTags(display ? display : username); - if(username !== myid && $('#rp' + username).length === 0) { - // Add to the participants list - $('#list').append('

  • ' + participants[username] + '
    • '); -@@ -282,7 +278,7 @@ function registerUsername() { - username: myid, - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - transactions[transaction] = function(response) { - if(response["textroom"] === "error") { - // Something went wrong -@@ -312,7 +308,7 @@ function registerUsername() { - if(response.participants && response.participants.length > 0) { - for(var i in response.participants) { - var p = response.participants[i]; -- participants[p.username] = p.display ? p.display : p.username; -+ participants[p.username] = escapeXmlTags(p.display ? p.display : p.username); - if(p.username !== myid && $('#rp' + p.username).length === 0) { - // Add to the participants list - $('#list').append('
  • ' + participants[p.username] + '
    • '); -@@ -418,3 +414,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/videocalltest.js b/html/videocalltest.js -index d1c1ab8d07..18ccbc2c47 100644 ---- a/html/videocalltest.js -+++ b/html/videocalltest.js -@@ -148,7 +148,7 @@ $(document).ready(function() { - } else if(result["event"]) { - var event = result["event"]; - if(event === 'registered') { -- myusername = result["username"]; -+ myusername = escapeXmlTags(result["username"]); - Janus.log("Successfully registered as " + myusername + "!"); - $('#youok').removeClass('hide').show().html("Registered as '" + myusername + "'"); - // Get a list of available peers, just for fun -@@ -163,7 +163,7 @@ $(document).ready(function() { - bootbox.alert("Waiting for the peer to answer..."); - } else if(event === 'incomingcall') { - Janus.log("Incoming call from " + result["username"] + "!"); -- yourusername = result["username"]; -+ yourusername = escapeXmlTags(result["username"]); - // Notify user - bootbox.hideAll(); - incoming = bootbox.dialog({ -@@ -213,7 +213,7 @@ $(document).ready(function() { - }); - } else if(event === 'accepted') { - bootbox.hideAll(); -- var peer = result["username"]; -+ var peer = escapeXmlTags(result["username"]); - if(!peer) { - Janus.log("Call started!"); - } else { -@@ -598,6 +598,15 @@ function getQueryStringValue(name) { - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons(temporal) { - $('#curres').parent().append( -diff --git a/html/videoroomtest.js b/html/videoroomtest.js -index 6a566891d8..5a3ade9be9 100644 ---- a/html/videoroomtest.js -+++ b/html/videoroomtest.js -@@ -400,7 +400,7 @@ function registerUsername() { - ptype: "publisher", - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - sfutest.send({ message: register }); - } - } -@@ -530,7 +530,7 @@ function newRemoteFeed(id, display, audio, video) { - } - } - remoteFeed.rfid = msg["id"]; -- remoteFeed.rfdisplay = msg["display"]; -+ remoteFeed.rfdisplay = escapeXmlTags(msg["display"]); - if(!remoteFeed.spinner) { - var target = document.getElementById('videoremote'+remoteFeed.rfindex); - remoteFeed.spinner = new Spinner({top:100}).spin(target); -@@ -685,6 +685,15 @@ function getQueryStringValue(name) { - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons(feed, temporal) { - var index = feed; -diff --git a/html/vp9svctest.js b/html/vp9svctest.js -index eca0239c32..b22ccf3340 100644 ---- a/html/vp9svctest.js -+++ b/html/vp9svctest.js -@@ -387,7 +387,7 @@ function registerUsername() { - ptype: "publisher", - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - sfutest.send({ message: register }); - } - } -@@ -486,7 +486,7 @@ function newRemoteFeed(id, display, audio, video) { - } - } - remoteFeed.rfid = msg["id"]; -- remoteFeed.rfdisplay = msg["display"]; -+ remoteFeed.rfdisplay = escapeXmlTags(msg["display"]); - if(!remoteFeed.spinner) { - var target = document.getElementById('videoremote'+remoteFeed.rfindex); - remoteFeed.spinner = new Spinner({top:100}).spin(target); -@@ -630,6 +630,15 @@ function newRemoteFeed(id, display, audio, video) { - }); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create SVC-related UI for a new viewer - function addSvcButtons(feed) { - var index = feed; diff --git a/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch similarity index 100% rename from package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch rename to package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 83afc72c98..7aec3d2aa3 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 21e2fc7dee4b20ed8d749a69577eccd961b0bfe5b863d42f39ddfcd2af903718 janus-gateway-0.10.10.tar.gz +sha256 b5fe70d95b9288200df15d5f75cb8eb6db66484c6ded159422a81e880ecb7104 janus-gateway-0.11.6.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 83d28ff6c7..84ca0bc116 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,17 +4,14 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 0.10.10 +JANUS_GATEWAY_VERSION = 0.11.6 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING JANUS_GATEWAY_CPE_ID_VENDOR = meetecho JANUS_GATEWAY_CPE_ID_PRODUCT = janus -# 0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch -JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4020 - -# 0004-Fixed-missing-XSS-mitigation.patch +# 0003-Fixed-missing-XSS-mitigation.patch JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 # ding-libs provides the ini_config library -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 22:21:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:21:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/snort: bump to version 2.9.19 Message-ID: <20220108222153.3689389-1-fontaine.fabrice@gmail.com> https://snort.org/downloads/snort/release_notes_2.9.19.txt Signed-off-by: Fabrice Fontaine --- package/snort/snort.hash | 4 ++-- package/snort/snort.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snort/snort.hash b/package/snort/snort.hash index 6df7ae5229..ac098564aa 100644 --- a/package/snort/snort.hash +++ b/package/snort/snort.hash @@ -1,8 +1,8 @@ # From https://www.snort.org/downloads/snort/md5s -md5 2b4e30300ef6feca1f60c267e727c6c0 snort-2.9.18.1.tar.gz +md5 b0350425e0c1e9c044c25aa13b47edf8 snort-2.9.19.tar.gz # Locally computed: -sha256 da8af0f1b2e4f247d970c6a3c0e83fb6dcd5c84faa21aea49f306f269e8e28aa snort-2.9.18.1.tar.gz +sha256 b12fc6db72afb58987a2bf1954b8f45bde02047c235513c7663857b9506369c7 snort-2.9.19.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 54017d3460..41f450541f 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.18.1 +SNORT_VERSION = 2.9.19 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING -- 2.34.1 From arnout at mind.be Sat Jan 8 22:28:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 23:28:46 +0100 Subject: [Buildroot] [PATCH 1/1] systemd: ensure tmpfiles.d/legacy.conf is installed In-Reply-To: References: <20200825000246.4035-1-joseph.kogut@gmail.com> <8bcace28-352f-1da3-51c6-0de868fa429f@mind.be> <0570b1f3-5229-5c0e-796a-53f8747b540a@mind.be> Message-ID: <516a0c55-6d67-f46a-b60b-4475b043c971@mind.be> On 08/01/2022 22:17, Norbert Lange wrote: > Am Sa., 8. Jan. 2022 um 21:40 Uhr schrieb Arnout Vandecappelle : >> >> >> On 08/01/2022 20:12, Arnout Vandecappelle wrote: >>> >>> >>> On 25/08/2020 02:02, Joseph Kogut wrote: >>>> Systemd doesn't install tmpfiles.d/legacy.conf when sysv compatiblity >>>> isn't enabled. This config sets up /var/lock, which many programs such >>>> as uboot's fw_printenv/setenv still depend on by default. >>>> >>>> Signed-off-by: Joseph Kogut >>> >>> After all the discussion, I did finally apply to master, thanks. >> >> And I ended up reverting it again - legacy.conf is now legacy.conf.in and it >> needs to be preprocessed, but that is only done if sysv-compat is enabled. >> >> So if we want this, our only option is to enable sysv-compat (which is >> probably something we should do anyway). > > Why the only option? you should just ship your own legacy.conf, it wont change. I meant: if we want to use the legacy.conf from upstream. But you're right it's not the only option, we could also manually sed out stuff from the .in file. > Adding sysv compatibility, which is alot more than just the mkdir and > symlink, would mean adding alot baggage. Ack. > Baggage that wont even work as Yann spake thusly [1] > > a tmpfile.conf with those 3 lines would be enough: > d /run/lock 0755 root root - > L /var/lock - - - - ../run/lock > d /run/lock/subsys 0755 root root - All right, I hope I remember this by the time a see the patch :-) > > Norbert. > > PS. I am too lazy to google everything up, but I believe I brought up > this very topic before. I'm also too lazy to google it. Regards, Arnout > > [1] - https://lists.buildroot.org/pipermail/buildroot/2020-July/287275.html > From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-golang.txt: add some details about vendoring Message-ID: <20220108222949.4FB2583466@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad034892d8b8748eea52b45aa05dbeb271645dbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-golang.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/manual/adding-packages-golang.txt b/docs/manual/adding-packages-golang.txt index 3b34579200..c952cde577 100644 --- a/docs/manual/adding-packages-golang.txt +++ b/docs/manual/adding-packages-golang.txt @@ -120,3 +120,14 @@ possible to customize what is done in any particular step: +FOO_BUILD_CMDS+ variable, it will be used instead of the default Go one. However, using this method should be restricted to very specific cases. Do not use it in the general case. + +A Go package can depend on other Go modules, listed in its +go.mod+ +file. Buildroot automatically takes care of downloading such +dependencies as part of the download step of packages that use the ++golang-package+ infrastructure. Such dependencies are then kept +together with the package source code in the tarball cached in +Buildroot's +DL_DIR+, and therefore the hash of the package's tarball +includes such dependencies. + +This mechanism ensures that any change in the dependencies will be +detected, and allows the build to be performed completely offline. From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] support/download/helpers: use tar xzf in post_process_unpack() Message-ID: <20220108222949.3E50A832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ccff780f49a24f01c44d31f4fe3bc1ea0a36d5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For now, the download post-process logic uses mk_tar_gz, which repacks a tarball compressed with gzip. So we can only accept as input a tarball also compressed with gzip. To enforce that, this commit changes post_process_unpack() to use tar xzf. This makes sure that if a tarball compressed with something else than gzip gets used, it will bail out and we will notice. Support for other compression schemes can be added later on. Signed-off-by: Thomas Petazzoni --- support/download/helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/helpers b/support/download/helpers index 4c5eb466cc..ab31e27a69 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -78,7 +78,7 @@ post_process_unpack() { local one_file mkdir "${dest}" - tar -C "${dest}" --strip-components=1 -xf "${tarball}" + tar -C "${dest}" --strip-components=1 -xzf "${tarball}" one_file="$(find "${dest}" -type f -print0 |LC_ALL=C sort -z |head -z -n1 |tr -d "\0")" touch -r "${one_file}" "${dest}.timestamp" } From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] package/sentry-cli: re-add package Message-ID: <20220108222949.72A05832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=049ca10248a4c5a808e7d96acd8711563916d318 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit d19077677fc71fc8c8cd73945606f773d907a99a, but the package now uses the cargo-package infrastructure with its vendoring mechanism, which allows us to avoid the problems that caused the package to be removed in d19077677fc71fc8c8cd73945606f773d907a99a. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/sentry-cli/Config.in.host | 10 ++++++++++ package/sentry-cli/sentry-cli.hash | 3 +++ package/sentry-cli/sentry-cli.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b80d886809..df7d988279 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1522,6 +1522,7 @@ F: package/python-schedule/ F: package/python-sentry-sdk/ F: package/python-websockets/ F: package/python-xlib/ +F: package/sentry-cli/ F: package/sentry-native/ F: package/unclutter-xfixes/ diff --git a/package/Config.in.host b/package/Config.in.host index 7400da5894..b3e00bb482 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -81,6 +81,7 @@ menu "Host utilities" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" source "package/sdbusplus/Config.in.host" + source "package/sentry-cli/Config.in.host" source "package/sloci-image/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" diff --git a/package/sentry-cli/Config.in.host b/package/sentry-cli/Config.in.host new file mode 100644 index 0000000000..3124015367 --- /dev/null +++ b/package/sentry-cli/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_SENTRY_CLI + bool "host sentry-cli" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Official Sentry command line interface + + For managing debug information files and source maps. + + https://docs.sentry.io/cli/ diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash new file mode 100644 index 0000000000..73f818125f --- /dev/null +++ b/package/sentry-cli/sentry-cli.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 d687336379fd96c4ee73f24bd062d31672bd7453af53311b72977be3c8c78fef sentry-cli-1.59.0.tar.gz +sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk new file mode 100644 index 0000000000..58f5f1e325 --- /dev/null +++ b/package/sentry-cli/sentry-cli.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# sentry-cli +# +################################################################################ + +SENTRY_CLI_VERSION = 1.59.0 +SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) +SENTRY_CLI_LICENSE = BSD-3-clause +SENTRY_CLI_LICENSE_FILES = LICENSE + +HOST_SENTRY_CLI_DEPENDENCIES = host-zlib + +$(eval $(host-cargo-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] package/pkg-golang.mk: implement Go vendoring support Message-ID: <20220108222949.470D683460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24ac316ff58e2c1deca8dc329705b0810414c8db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit introduces the download post-process script support/download/go-post-process, and hooks it into the Go package infrastructure. The -modcacherw flag is added to ensure that the Go cache is read/write, and can be deleted properly upon "make clean". The _LICENSE variable of golang packages is expanded with ", vendored dependencies licenses probably not listed" as currently for all packages, the licenses of the vendored dependencies are not taken into account. Signed-off-by: Thomas Petazzoni --- package/pkg-golang.mk | 13 ++++++++++++- support/download/go-post-process | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index d07242310d..35bcb1673b 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -42,12 +42,13 @@ define inner-golang-package $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ + -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ -p $(PARALLEL_JOBS) # Target packages need the Go compiler on the host. -$(2)_DEPENDENCIES += host-go +$(2)_DOWNLOAD_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . @@ -81,6 +82,16 @@ define $(2)_GEN_GOMOD endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD +$(2)_DOWNLOAD_POST_PROCESS = go +$(2)_DL_ENV = \ + $(HOST_GO_COMMON_ENV) \ + GOPROXY=direct \ + BR_GOMOD=$$($(2)_GOMOD) + +# Due to vendoring, it is pretty likely that not all licenses are +# listed in _LICENSE. +$(2)_LICENSE += , vendored dependencies licenses probably not listed + # Build step. Only define it if not already defined by the package .mk # file. ifndef $(2)_BUILD_CMDS diff --git a/support/download/go-post-process b/support/download/go-post-process new file mode 100755 index 0000000000..be202a4c0f --- /dev/null +++ b/support/download/go-post-process @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +. "${0%/*}/helpers" + +# Parse our options +while getopts "n:o:" OPT; do + case "${OPT}" in + o) output="${OPTARG}";; + n) base_name="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac +done + +# Already vendored tarball, nothing to do +if tar tf "${output}" | grep -q "^[^/]*/vendor" ; then + exit 0 +fi + +post_process_unpack "${base_name}" "${output}" + +# Do the Go vendoring +pushd "${base_name}" > /dev/null + +if [ ! -f go.mod ]; then + echo "ERROR: no vendor/ folder and no go.mod, aborting" + exit 1 +fi + +go mod vendor -v -modcacherw +popd > /dev/null + +post_process_repack $(pwd) "${base_name}" "${output}" From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:41 +0100 Subject: [Buildroot] [git commit] package/gocryptfs: new package Message-ID: <20220108222949.92D9A832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffc503fab767c9d2381f7152bcaab024a6358748 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Adds the gocryptfs encrypted FUSE filesystem. Currently uses without_openssl build tag, to use the native Go cryptography. However, the package could be improved by conditionally enabling openssl if it is also configured to be built by Buildroot. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/gocryptfs/Config.in | 12 ++++++++++++ package/gocryptfs/gocryptfs.hash | 3 +++ package/gocryptfs/gocryptfs.mk | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2e3500e788..259cace487 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -531,6 +531,7 @@ F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/gocryptfs/ F: package/mbpfan/ F: package/mosh/ F: package/pkg-golang.mk diff --git a/package/Config.in b/package/Config.in index f127b6bf45..081268527c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -221,6 +221,7 @@ menu "Filesystem and flash utilities" source "package/genext2fs/Config.in" source "package/genpart/Config.in" source "package/genromfs/Config.in" + source "package/gocryptfs/Config.in" source "package/imx-usb-loader/Config.in" source "package/mmc-utils/Config.in" source "package/mtd/Config.in" diff --git a/package/gocryptfs/Config.in b/package/gocryptfs/Config.in new file mode 100644 index 0000000000..2630cafdcf --- /dev/null +++ b/package/gocryptfs/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_GOCRYPTFS + bool "gocryptfs" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + gocryptfs is an encrypted FUSE overlay filesystem. + + https://github.com/rfjakob/gocryptfs + +comment "gocryptfs needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash new file mode 100644 index 0000000000..94487815f5 --- /dev/null +++ b/package/gocryptfs/gocryptfs.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk new file mode 100644 index 0000000000..2a00e9a959 --- /dev/null +++ b/package/gocryptfs/gocryptfs.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# gocryptfs +# +################################################################################ + +GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) +GOCRYPTFS_LICENSE = MIT +GOCRYPTFS_LICENSE_FILES = LICENSE + +GOCRYPTFS_GOMOD = github.com/rfjakob/gocryptfs/v2 + +GOCRYPTFS_LDFLAGS = \ + -X main.GitVersion=$(GOCRYPTFS_VERSION) \ + -X main.GitVersionFuse=[vendored] +GOCRYPTFS_TAGS = without_openssl + +$(eval $(golang-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:41 +0100 Subject: [Buildroot] [git commit] package/tinifier: new package Message-ID: <20220108222949.7D75D832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43c580ac9f848449333ecbe4336c2c9f2ba12158 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a Go package that needs vendor modules to be downloaded at build time. Signed-off-by: Thomas Petazzoni Reviewed-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/tinifier/Config.in | 10 ++++++++++ package/tinifier/tinifier.hash | 3 +++ package/tinifier/tinifier.mk | 13 +++++++++++++ 5 files changed, 28 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index df7d988279..ab6648cec2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2787,6 +2787,7 @@ F: package/rtc-tools/ F: package/sam-ba/ F: package/scons/ F: package/squashfs/ +F: package/tinifier/ F: package/wayland/ F: package/weston/ F: support/testing/tests/boot/test_syslinux.py diff --git a/package/Config.in b/package/Config.in index 15a831c1bf..ad6741f74c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -314,6 +314,7 @@ comment "Graphic applications" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" source "package/tesseract-ocr/Config.in" + source "package/tinifier/Config.in" comment "Graphic libraries" source "package/cegui/Config.in" diff --git a/package/tinifier/Config.in b/package/tinifier/Config.in new file mode 100644 index 0000000000..fbadfe6bd9 --- /dev/null +++ b/package/tinifier/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_TINIFIER + bool "tinifier" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + CLI tool for images compressing + + This tool uses tinypng.com API endpoint for compressing your + local jpg/png images (it supports parallel jobs). + + https://github.com/tarampampam/tinifier diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash new file mode 100644 index 0000000000..5681ed6a55 --- /dev/null +++ b/package/tinifier/tinifier.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 927e966f9d23ea7cc1942967a8fc16ef4c55c51bd096d44f54b418844a51aa12 tinifier-3.4.0.tar.gz +sha256 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 LICENSE diff --git a/package/tinifier/tinifier.mk b/package/tinifier/tinifier.mk new file mode 100644 index 0000000000..d7ed6f7c93 --- /dev/null +++ b/package/tinifier/tinifier.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# tinifier +# +################################################################################ + +TINIFIER_VERSION = 3.4.0 +TINIFIER_SITE = $(call github,tarampampam,tinifier,v$(TINIFIER_VERSION)) +TINIFIER_LICENSE = MIT +TINIFIER_LICENSE_FILES = LICENSE +TINIFIER_GOMOD = ./cmd/tinifier + +$(eval $(golang-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] package/ripgrep: convert to cargo infrastructure Message-ID: <20220108222949.6945883466@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=342fd3e7350479dc368541ac77a5130ebb53194c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit converts the ripgrep package to the cargo infrastructure. This causes the vendoring mechanism to kick in, which changes the contents of the tarball. To avoid a clash on the hash, we change the version of ripgrep to the Git commit hash matching the 13.0.0 tag, so there are no functional changes, but the tarball name is different. Signed-off-by: Patrick Havelange Signed-off-by: Thomas Petazzoni --- package/ripgrep/ripgrep.hash | 2 +- package/ripgrep/ripgrep.mk | 37 ++++++------------------------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index b2f03a95e6..cd2dbedfb4 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2 ripgrep-13.0.0.tar.gz +sha256 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 7c2b79a4a7..d587441cfa 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -4,7 +4,11 @@ # ################################################################################ -RIPGREP_VERSION = 13.0.0 +# Same as 13.0.0, we use a Git commit hash because the hash of this +# tarball changed when moving to the cargo-package infrastructure, and +# we can't change the hash of existing tarball. Please switch back to +# a Git tag at the next version bump. +RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT @@ -13,33 +17,4 @@ RIPGREP_CPE_ID_VENDOR = ripgrep_project # CVE only impacts ripgrep on Windows RIPGREP_IGNORE_CVES += CVE-2021-3013 -RIPGREP_DEPENDENCIES = host-rustc -RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo \ - __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ - CARGO_TARGET_APPLIES_TO_HOST="false" - -RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_BIN_SUBDIR) - -RIPGREP_CARGO_OPTS = \ - -Z target-applies-to-host \ - --target=$(RUSTC_TARGET_NAME) \ - --manifest-path=$(@D)/Cargo.toml - -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) -RIPGREP_CARGO_BIN_SUBDIR = debug -else -RIPGREP_CARGO_OPTS += --release -RIPGREP_CARGO_BIN_SUBDIR = release -endif - -define RIPGREP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \ - cargo build $(RIPGREP_CARGO_OPTS) -endef - -define RIPGREP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(RIPGREP_BIN_DIR)/rg \ - $(TARGET_DIR)/usr/bin/rg -endef - -$(eval $(generic-package)) +$(eval $(cargo-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:41 +0100 Subject: [Buildroot] [git commit] package/embiggen-disk: new package Message-ID: <20220108222949.8752983460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e5d2c0b9559f1aef62c8d547f9b38cc2ebb2099 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master embiggen-disk is a tool to automatically resize disks to fill available space. Patch submitted upstream: https://github.com/bradfitz/embiggen-disk/pull/13 Adds support for /dev/mmcblk0pN type paths. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/embiggen-disk/Config.in | 19 +++++++++++++++++++ package/embiggen-disk/embiggen-disk.hash | 3 +++ package/embiggen-disk/embiggen-disk.mk | 12 ++++++++++++ 5 files changed, 36 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ab6648cec2..2e3500e788 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -528,6 +528,7 @@ F: package/delve/ F: package/docker-cli/ F: package/docker-engine/ F: package/docker-proxy/ +F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ F: package/mbpfan/ diff --git a/package/Config.in b/package/Config.in index ad6741f74c..f127b6bf45 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2528,6 +2528,7 @@ menu "System tools" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" + source "package/embiggen-disk/Config.in" source "package/emlog/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" diff --git a/package/embiggen-disk/Config.in b/package/embiggen-disk/Config.in new file mode 100644 index 0000000000..667d71c86e --- /dev/null +++ b/package/embiggen-disk/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_EMBIGGEN_DISK + bool "embiggen-disk" + 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 # no fexecve + depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_UTIL_LINUX # sfdisk + select BR2_PACKAGE_UTIL_LINUX_BINARIES # sfdisk + help + embiggen-disk is a tool to resize disk partitions at runtime. + + https://github.com/bradfitz/embiggen-disk + +comment "embiggen-disk needs a glibc or musl toolchain w/ threads" + depends on BR2_USE_MMU + 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/embiggen-disk/embiggen-disk.hash b/package/embiggen-disk/embiggen-disk.hash new file mode 100644 index 0000000000..3a290e2ec8 --- /dev/null +++ b/package/embiggen-disk/embiggen-disk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 514cde66ab9fe6af91b97f17acc19b37976f675ebea0e1be741d6bd621811d87 embiggen-disk-9e7b2fc7b99c4dece41a805489a6ca377ce55a62.tar.gz +sha256 063aedec1652c5a05c2d04c40e032b932453142ee8ef7fd53c04a9acc127fc95 LICENSE diff --git a/package/embiggen-disk/embiggen-disk.mk b/package/embiggen-disk/embiggen-disk.mk new file mode 100644 index 0000000000..66f2087dbd --- /dev/null +++ b/package/embiggen-disk/embiggen-disk.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# embiggen-disk +# +################################################################################ + +EMBIGGEN_DISK_VERSION = 9e7b2fc7b99c4dece41a805489a6ca377ce55a62 +EMBIGGEN_DISK_SITE = $(call github,bradfitz,embiggen-disk,$(EMBIGGEN_DISK_VERSION)) +EMBIGGEN_DISK_LICENSE = Apache-2.0 +EMBIGGEN_DISK_LICENSE_FILES = LICENSE + +$(eval $(golang-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:41 +0100 Subject: [Buildroot] [git commit] package/bat: new package Message-ID: <20220108222949.9CB40832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fd3770cc64679d5ff541fdaa5d0fdb2f9d16111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master bat is a cat(1) clone with syntax highlighting and Git integration. Signed-off-by: David Pierret Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/bat/Config.in | 11 +++++++++++ package/bat/bat.hash | 4 ++++ package/bat/bat.mk | 12 ++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 259cace487..bc07fdbde3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -680,6 +680,9 @@ F: linux/linux-ext-ev3dev-linux-drivers.mk F: package/brickd/ F: package/ev3dev-linux-drivers/ +N: David Pierret +F: package/bat/ + N: Davide Viti F: board/friendlyarm/nanopi-r1/ F: configs/friendlyarm_nanopi_r1_defconfig diff --git a/package/Config.in b/package/Config.in index 081268527c..dbfdcf6ce3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2607,6 +2607,7 @@ menu "System tools" endmenu menu "Text editors and viewers" + source "package/bat/Config.in" source "package/ed/Config.in" source "package/joe/Config.in" source "package/less/Config.in" diff --git a/package/bat/Config.in b/package/bat/Config.in new file mode 100644 index 0000000000..515eaf591a --- /dev/null +++ b/package/bat/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_BAT + bool "bat" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + # we need a full version of less + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_LESS + help + A cat(1) clone with syntax highlighting and Git integration. + + https://github.com/sharkdp/bat diff --git a/package/bat/bat.hash b/package/bat/bat.hash new file mode 100644 index 0000000000..aa6c8d743d --- /dev/null +++ b/package/bat/bat.hash @@ -0,0 +1,4 @@ +# Locally generated +sha256 9c345788eb916777a60e7ff32031f1c92edc5565031e0c057bce860982768744 bat-0.18.3.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE +sha256 64de710b6309a7db5e44ad0af382300c7fb6f6d116d8ae32f0164e05db033068 LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk new file mode 100644 index 0000000000..9b619af172 --- /dev/null +++ b/package/bat/bat.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# bat +# +################################################################################ + +BAT_VERSION = 0.18.3 +BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) +BAT_LICENSE = Apache-2.0 or MIT +BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: introduce the cargo package infrastructure Message-ID: <20220108222949.59034832C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=301a8eae0c2aded1821b44da1ab051c53df60486 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to be package agnostic, the install phase is now using cargo instead of install. TARGET_CONFIGURE_OPTS is now also set when running cargo in order to support cross compiling C code within cargo. This commit also adds support/download/cargo-post-process to perform the vendoring on Cargo packages. The _LICENSE variable of cargo packages is expanded with ", vendored dependencies licenses probably not listed" as currently for all packages, the licenses of the vendored dependencies are not taken into account. Signed-off-by: Patrick Havelange [Thomas: add support for host-cargo-package and vendoring] Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 1 + package/pkg-cargo.mk | 166 ++++++++++++++++++++++++++++++++++++ support/download/cargo-post-process | 38 +++++++++ 3 files changed, 205 insertions(+) diff --git a/package/Makefile.in b/package/Makefile.in index dae7a859fd..0ca2a5844e 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -441,3 +441,4 @@ include package/pkg-waf.mk include package/pkg-golang.mk include package/pkg-meson.mk include package/pkg-qmake.mk +include package/pkg-cargo.mk diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk new file mode 100644 index 0000000000..47ae86bfae --- /dev/null +++ b/package/pkg-cargo.mk @@ -0,0 +1,166 @@ +################################################################################ +# Cargo package infrastructure +# +# This file implements an infrastructure that eases development of package +# .mk files for Cargo packages. It should be used for all packages that use +# Cargo as their build system. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this Cargo infrastructure requires the .mk file +# to only specify metadata information about the package: name, version, +# download URL, etc. +# +# We still allow the package .mk file to override what the different steps +# are doing, if needed. For example, if _BUILD_CMDS is already defined, +# it is used as the list of commands to perform to build the package, +# instead of the default Cargo behaviour. The package can also define some +# post operation hooks. +# +################################################################################ + +# __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS is needed to allow +# passing the -Z target-applies-to-host, which is needed together with +# CARGO_TARGET_APPLIES_TO_HOST to fix build problems when target +# architecture == host architecture. +PKG_CARGO_ENV = \ + CARGO_HOME=$(HOST_DIR)/share/cargo \ + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_TARGET_APPLIES_TO_HOST="false" + +################################################################################ +# inner-cargo-package -- defines how the configuration, compilation and +# installation of a cargo package should be done, implements a few hooks +# to tune the build process for cargo specifities and calls the generic +# package infrastructure to generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix +# for host packages +# argument 4 is the type (target or host) +################################################################################ + +define inner-cargo-package + +# We need host-rustc to run cargo +$(2)_DOWNLOAD_DEPENDENCIES += host-rustc + +$(2)_DOWNLOAD_POST_PROCESS = cargo +$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo + +# Due to vendoring, it is pretty likely that not all licenses are +# listed in _LICENSE. +$(2)_LICENSE += , vendored dependencies licenses probably not listed + +# Note: in all the steps below, we "cd" into the build directory to +# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the +# manifest-path. Indeed while the latter seems to work, it in fact +# breaks in subtle ways as the way cargo searches for its +# configuration file is based (among other rules) on the current +# directory. This means that if cargo is started outside of a package +# directory, its configuration file will not be taken into account. +# +# Also, we pass: +# * --offline to prevent cargo from downloading anything: all +# dependencies should have been built by the download post +# process logic +# * --locked to force cargo to use the Cargo.lock file, which ensures +# that a fixed set of dependency versions is used + +# +# Build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +ifeq ($(4),target) +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) \ + $$(TARGET_CONFIGURE_OPTS) \ + $$(PKG_CARGO_ENV) \ + $$($(2)_CARGO_ENV) \ + cargo build \ + --offline \ + --target $$(RUSTC_TARGET_NAME) \ + $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ + --manifest-path Cargo.toml \ + --locked \ + -Z target-applies-to-host \ + $$($(2)_CARGO_BUILD_OPTS) +endef +else # ifeq ($(4),target) +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(HOST_MAKE_ENV) \ + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ + $$(HOST_CONFIGURE_OPTS) \ + $$(PKG_CARGO_ENV) \ + $$($(2)_CARGO_ENV) \ + cargo build \ + --offline \ + --release \ + --manifest-path Cargo.toml \ + --locked \ + $$($(2)_CARGO_BUILD_OPTS) +endef +endif # ifeq ($(4),target) +endif # ifndef $(2)_BUILD_CMDS + +# +# Target installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) \ + $$(TARGET_CONFIGURE_OPTS) \ + $$(PKG_CARGO_ENV) \ + $$($(2)_CARGO_ENV) \ + cargo install \ + --target $$(RUSTC_TARGET_NAME) \ + --offline \ + --root $$(TARGET_DIR)/usr/ \ + --bins \ + --path ./ \ + --force \ + --locked \ + -Z target-applies-to-host \ + $$($(2)_CARGO_INSTALL_OPTS) +endef +endif + +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + cd $$(@D) && \ + $$(HOST_MAKE_ENV) \ + RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ + $$(HOST_CONFIGURE_OPTS) \ + $$(PKG_CARGO_ENV) \ + $$($(2)_CARGO_ENV) \ + cargo install \ + --offline \ + --root $$(HOST_DIR) \ + --bins \ + --path ./ \ + --force \ + --locked \ + $$($(2)_CARGO_INSTALL_OPTS) +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +################################################################################ +# cargo-package -- the target generator macro for Cargo packages +################################################################################ + +cargo-package = $(call inner-cargo-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) +host-cargo-package = $(call inner-cargo-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process new file mode 100755 index 0000000000..2d1c66661d --- /dev/null +++ b/support/download/cargo-post-process @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +set -e + +. "${0%/*}/helpers" + +while getopts "n:o:" OPT; do + case "${OPT}" in + o) output="${OPTARG}";; + n) base_name="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac +done + +# Already vendored tarball, nothing to do +if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then + exit 0 +fi + +post_process_unpack "${base_name}" "${output}" + +# Do the Cargo vendoring +pushd "${base_name}" > /dev/null +cargo vendor --locked VENDOR + +# Create the local .cargo/config with vendor info +mkdir -p .cargo/ +cat <.cargo/config +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "VENDOR" +EOF +popd > /dev/null + +post_process_repack "$(pwd)" "${base_name}" "${output}" From thomas.petazzoni at bootlin.com Sat Jan 8 22:35:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:35:40 +0100 Subject: [Buildroot] [git commit] docs/manual/cargo: document the cargo-package infrastructure Message-ID: <20220108222949.6133583460@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d5749d2de9f2d4b0681593fbe0d95096612a1c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Buildroot manual was already providing some details on how to integrate Cargo packages, and those details now need to be updated with a proper documentation for the cargo-package infrastructure, as well as updates related to vendoring support, which affects how dependencies are handled. In addition, now that we have vendoring support for Cargo packages, let's rewrite the dependency management section in a more accurate way. We drop the part about the local cache of the registry, because +CARGO_HOME+ in Buildroot points to $(HOST_DIR)/share/cargo, which is not shared between builds nor preserved accross builds, so its effect as a cache is limited. Signed-off-by: Patrick Havelange [Thomas: numerous updates and extensions.] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-cargo.txt | 104 +++++++++++++++------------------- 1 file changed, 45 insertions(+), 59 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index 8fcc80bcc6..5343fbd4e6 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -1,7 +1,7 @@ // -*- mode:doc; -*- // vim: set syntax=asciidoc: -=== Integration of Cargo-based packages +=== Infrastructure for Cargo-based packages Cargo is the package manager for the Rust programming language. It allows the user to build programs or libraries written in Rust, but it also downloads and @@ -10,7 +10,7 @@ called "crates". [[cargo-package-tutorial]] -==== Cargo-based package's +Config.in+ file +==== +cargo-package+ tutorial The +Config.in+ file of Cargo-based package 'foo' should contain: @@ -25,11 +25,7 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 08: http://foosoftware.org/foo/ --------------------------- -==== Cargo-based package's +.mk+ file - -Buildroot does not (yet) provide a dedicated package infrastructure for -Cargo-based packages. So, we will explain how to write a +.mk+ file for such a -package. Let's start with an example: +And the +.mk+ file for this package should contain: ------------------------------ 01: ################################################################################ @@ -44,66 +40,56 @@ package. Let's start with an example: 10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: -13: FOO_DEPENDENCIES = host-rustc -14: -15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo -16: -17: FOO_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(FOO_CARGO_MODE) -18: -19: FOO_CARGO_OPTS = \ -20: $(if $(BR2_ENABLE_DEBUG),,--release) \ -21: --target=$(RUSTC_TARGET_NAME) \ -22: --manifest-path=$(@D)/Cargo.toml -23: -24: define FOO_BUILD_CMDS -25: $(TARGET_MAKE_ENV) $(FOO_CARGO_ENV) \ -26: cargo build $(FOO_CARGO_OPTS) -27: endef -28: -29: define FOO_INSTALL_TARGET_CMDS -30: $(INSTALL) -D -m 0755 $(@D)/$(FOO_BIN_DIR)/foo \ -31: $(TARGET_DIR)/usr/bin/foo -32: endef -33: -34: $(eval $(generic-package)) +13: $(eval $(cargo-package)) -------------------------------- -The Makefile starts with the definition of the standard variables for package -declaration (lines 7 to 11). +The Makefile starts with the definition of the standard variables for +package declaration (lines 7 to 11). + +As seen in line 13, it is based on the +cargo-package+ +infrastructure. Cargo will be invoked automatically by this +infrastructure to build and install the package. + +It is still possible to define custom build commands or install +commands (i.e. with FOO_BUILD_CMDS and FOO_INSTALL_TARGET_CMDS). +Those will then replace the commands from the cargo infrastructure. + +==== +cargo-package+ reference -As seen in line 34, it is based on the -xref:generic-package-tutorial[+generic-package+ infrastructure]. So, it defines -the variables required by this particular infrastructure, where Cargo is -invoked: +The main macros for the Cargo package infrastructure are ++cargo-package+ for target packages and +host-cargo-package+ for host +packages. -* +FOO_BUILD_CMDS+: Cargo is invoked to perform the build. The options required - to configure the cross-compilation of the package are passed via - +FOO_CONF_OPTS+. +Just like the generic infrastructure, the Cargo infrastructure works +by defining a number of variables before calling the +cargo-package+ +or +host-cargo-package+ macros. -* +FOO_INSTALL_TARGET_CMDS+: The binary executable generated is installed on - the target. +First, all the package metadata information variables that exist in +the generic infrastructure also exist in the Cargo infrastructure: ++FOO_VERSION+, +FOO_SOURCE+, +FOO_PATCH+, +FOO_SITE+, ++FOO_DEPENDENCIES+, +FOO_LICENSE+, +FOO_LICENSE_FILES+, etc. -In order to have Cargo available for the build, +FOO_DEPENDENCIES+ needs to -contain +host-cargo+. +A few additional variables, specific to the Cargo infrastructure, can +also be defined. Many of them are only useful in very specific cases, +typical packages will therefore only use a few of them. -To sum it up, to add a new Cargo-based package, the Makefile example can be -copied verbatim then edited to replace all occurences of +FOO+ with the -uppercase name of the new package and update the values of the standard -variables. +* +FOO_CARGO_ENV+ can be used to pass additional variables in the + environment of +cargo+ invocations. It used at both build and + installation time -==== About Dependencies Management +* +FOO_CARGO_BUILD_OPTS+ can be used to pass additional options to + +cargo+ at build time. -A crate can depend on other libraries from crates.io or git repositories, listed -in its Cargo.toml file. Before starting a build, Cargo usually downloads -automatically them. This step can also be performed independently, via the -+cargo fetch+ command. +* +FOO_CARGO_INSTALL_OPTS+ can be used to pass additional options to + +cargo+ at install time. -Cargo maintains a local cache of the registry index and of git checkouts of the -crates, whose location is given by +$CARGO_HOME+. As seen in the package -Makefile example at line 15, this environment variable is set to -+$(HOST_DIR)/share/cargo+. +A crate can depend on other libraries from crates.io or git +repositories, listed in its +Cargo.toml+ file. Buildroot automatically +takes care of downloading such dependencies as part of the download +step of packages that use the +cargo-package+ infrastructure. Such +dependencies are then kept together with the package source code in +the tarball cached in Buildroot's +DL_DIR+, and therefore the hash of +the package's tarball includes such dependencies. -This dependency download mechanism is not convenient when performing an offline -build, as Cargo will fail to fetch the dependencies. In that case, it is advised -to generate a tarball of the dependencies using the +cargo vendor+ and add it to -+FOO_EXTRA_DOWNLOADS+. +This mechanism ensures that any change in the dependencies will be +detected, and allows the build to be performed completely offline. From arnout at mind.be Sat Jan 8 22:37:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 23:37:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: <00e4f4ae-de7d-d159-c557-18a56b66b499@mind.be> On 08/01/2022 22:31, Norbert Lange wrote: > Am Sa., 8. Jan. 2022 um 20:04 Uhr schrieb James Hilliard > : >> >> On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange wrote: >>> >>> Systemd has very many options, adding a way for the user >>> to set custom options can help customizations >>> without changing buildroot files. >> >> I'm not sure this is a good idea, if a configuration option needs >> customizability it >> probably needs a specific kconfig option. Systemd config options tend to require >> dependency selection and special handling so this seems likely to cause >> spurious errors due to improper usage. Seems to be a pretty big footgun IMO. > > Sure, you are aware that many of my buildroot patches are stuck in limbo > since early 2020? Yes, due to various circumstances, maintainer time between Feb 2020 and May 2021 has been very limited, and nobody in the community stepped up to review patches. We finally have a hackaton again where we're processing the backlog and we're making good progress. But we're not going to be able to fully catch up, so unless someone reviews and acks your patches, or unless they're trivial, they're likely to still face long delays in the coming months. It doesn't help to get your patches in faster, but it does help the community in general if you do reviews. Another thing that may help you get patches merged is if you collect them in a series and repost the entire series when something changes. Ideally you also carry patches from other people in that series. This makes life easier for the maintainers because it shows that it the series makes the whole more cohesive. > Just doesnt seem feasible to timely fix everything and version bumps often leave > more untapped options. Some part of the necessity would be just being pragmatic. > > One example would be using the unified cgroups hierarchy > (-Ddefault-hierarchy=unified), hybrid is pretty much deprecated, > and some systemd features that buildroot allows to enable (OOMD for example) > wont work without it. That's still a fairly recent series :-) >> What systemd configure option would you want to be using that isn't >> currently able to be enabled? > > FYI those are the ones I currently use: > > -Ddefault-hierarchy=unified \ > -Dutmp=false \ > -Ddefault-dnssec=no \ > -Didn=false \ > -Denvironment-d=false \ > -Dxdg-autostart=false \ > -Ddns-over-tls=false \ > -Ddefault-llmnr=no \ > -Ddns-over-tls=false \ > -Ddefault-mdns=no \ > -Dlz4=false Except for the unified hierarchy, all of these look like they should have been added when systemd was bumped and the option was created... Regards, Arnout > > Norbert > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From romain.naour at smile.fr Sat Jan 8 22:37:31 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sat, 8 Jan 2022 23:37:31 +0100 Subject: [Buildroot] [PATCH-next 1/4] utils/checkpackagelib: add unit tests In-Reply-To: <20211205105318.2755542-1-ricardo.martincoski@gmail.com> References: <20211205105318.2755542-1-ricardo.martincoski@gmail.com> Message-ID: <30b13507-5744-de89-0e04-503e264bc1e5@smile.fr> Hello Ricardo, Le 05/12/2021 ? 11:53, Ricardo Martincoski a ?crit?: > So anyone willing to contribute to check-package can run all tests in > less than 1 second by using: > $ python3 -m pytest -v utils/checkpackagelib/ > > Most test cases are in the form: > @pytest.mark.parametrize('testname,filename,string,expected', function) > - testname: a short description of the scenario tested, added in order > to improve readability of the log when some tests fail > - filename: the filename the check-package function being tested thinks > it is testing > - string: the content of the file being sent to the function under test > - expect: all expected warnings that a given function from > check-package should generate for a given file named filename and > with string as its content. I spend some time to review this patch to find something to say :) Actually the test_lib_hash tests are not checking with the new spacing convention we want to use in .hash files. I applied this patch [1] after your series and some tests failed. I would recommand to use the new spacing convention by default in this testsuite. [1] http://patchwork.ozlabs.org/project/buildroot/patch/20200603081253.14319-1-heiko.thiery at gmail.com/ Best regards, Romain > > Signed-off-by: Ricardo Martincoski > Cc: Arnout Vandecappelle > --- > NOTICE there are 2 tests failing, see the fix in: > http://patchwork.ozlabs.org/project/buildroot/patch/20211115235336.3814968-1-ricardo.martincoski at gmail.com/ > > See a sample running in the GitLab CI: > without the fix: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/422862195 > with the fix: > https://gitlab.com/RicardoMartincoski/buildroot/-/pipelines/422862127 > > Example of a failure, showing enough information to track down the test > that fails: > |testname = 'immediate assignment inside conditional and unconditional override outside' > |filename = 'any.mk' > |string = 'VAR_1 = VALUE1\nifeq (condition)\nVAR_1 := $(VAR_1), VALUE2\nendif\nVAR_1 := $(VAR_1), VALUE2\n' > |expected = [['any.mk:3: immediate assignment to append to variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'], ['any.mk:5: unconditional override of variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n']] > | > | @pytest.mark.parametrize('testname,filename,string,expected', overridden_variable) > | def test_overridden_variable(testname, filename, string, expected): > | warnings = util.check_file(m.OverriddenVariable, filename, string) > |> assert warnings == expected > |E AssertionError: assert [['any.mk:3: ...), VALUE2\n']] == [['any.mk:3: i...), VALUE2\n']] > |E At index 0 diff: ['any.mk:3: conditional override of variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'] != ['any.mk:3: immediate assignment to append to variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'] > |E Full diff: > |E - [['any.mk:3: conditional override of variable VAR_1', > |E + [['any.mk:3: immediate assignment to append to variable VAR_1', > |E 'VAR_1 := $(VAR_1), VALUE2\n'], > |E ['any.mk:5: unconditional override of variable VAR_1', > |E 'VAR_1 := $(VAR_1), VALUE2\n']] > | > |utils/checkpackagelib/test_lib_mk.py:168: AssertionError > |===================== 2 failed, 180 passed in 0.79 seconds ===================== > --- > utils/checkpackagelib/test_lib.py | 212 ++++++++ > utils/checkpackagelib/test_lib_config.py | 387 +++++++++++++++ > utils/checkpackagelib/test_lib_hash.py | 137 ++++++ > utils/checkpackagelib/test_lib_mk.py | 590 +++++++++++++++++++++++ > utils/checkpackagelib/test_lib_patch.py | 96 ++++ > utils/checkpackagelib/test_util.py | 8 + > 6 files changed, 1430 insertions(+) > create mode 100644 utils/checkpackagelib/test_lib.py > create mode 100644 utils/checkpackagelib/test_lib_config.py > create mode 100644 utils/checkpackagelib/test_lib_hash.py > create mode 100644 utils/checkpackagelib/test_lib_mk.py > create mode 100644 utils/checkpackagelib/test_lib_patch.py > create mode 100644 utils/checkpackagelib/test_util.py > > diff --git a/utils/checkpackagelib/test_lib.py b/utils/checkpackagelib/test_lib.py > new file mode 100644 > index 0000000000..976a63d84d > --- /dev/null > +++ b/utils/checkpackagelib/test_lib.py > @@ -0,0 +1,212 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib as m > + > + > +ConsecutiveEmptyLines = [ > + ('1 line (no newline)', > + 'any', > + '', > + []), > + ('1 line', > + 'any', > + '\n', > + []), > + ('2 lines', > + 'any', > + '\n' > + '\n', > + [['any:2: consecutive empty lines']]), > + ('more than 2 consecutive', > + 'any', > + '\n' > + '\n' > + '\n', > + [['any:2: consecutive empty lines'], > + ['any:3: consecutive empty lines']]), > + ('ignore whitespace 1', > + 'any', > + '\n' > + ' ', > + [['any:2: consecutive empty lines']]), > + ('ignore whitespace 2', > + 'any', > + ' \n' > + '\t\n', > + [['any:2: consecutive empty lines']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', ConsecutiveEmptyLines) > +def test_ConsecutiveEmptyLines(testname, filename, string, expected): > + warnings = util.check_file(m.ConsecutiveEmptyLines, filename, string) > + assert warnings == expected > + > + > +EmptyLastLine = [ > + ('ignore empty file', > + 'any', > + '', > + []), > + ('empty line (newline)', > + 'any', > + '\n', > + [['any:1: empty line at end of file']]), > + ('empty line (space, newline)', > + 'any', > + ' \n', > + [['any:1: empty line at end of file']]), > + ('empty line (space, no newline)', > + 'any', > + ' ', > + [['any:1: empty line at end of file']]), > + ('warn for the last of 2', > + 'any', > + '\n' > + '\n', > + [['any:2: empty line at end of file']]), > + ('warn for the last of 3', > + 'any', > + '\n' > + '\n' > + '\n', > + [['any:3: empty line at end of file']]), > + ('ignore whitespace', > + 'any', > + ' \n' > + '\t\n', > + [['any:2: empty line at end of file']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', EmptyLastLine) > +def test_EmptyLastLine(testname, filename, string, expected): > + warnings = util.check_file(m.EmptyLastLine, filename, string) > + assert warnings == expected > + > + > +NewlineAtEof = [ > + ('good', > + 'any', > + 'text\n', > + []), > + ('text (bad)', > + 'any', > + '\n' > + 'text', > + [['any:2: missing newline at end of file', > + 'text']]), > + ('space (bad)', > + 'any', > + '\n' > + ' ', > + [['any:2: missing newline at end of file', > + ' ']]), > + ('tab (bad)', > + 'any', > + '\n' > + '\t', > + [['any:2: missing newline at end of file', > + '\t']]), > + ('even for file with one line', > + 'any', > + ' ', > + [['any:1: missing newline at end of file', > + ' ']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', NewlineAtEof) > +def test_NewlineAtEof(testname, filename, string, expected): > + warnings = util.check_file(m.NewlineAtEof, filename, string) > + assert warnings == expected > + > + > +TrailingSpace = [ > + ('good', > + 'any', > + 'text\n', > + []), > + ('ignore missing newline', > + 'any', > + '\n' > + 'text', > + []), > + ('spaces', > + 'any', > + 'text \n', > + [['any:1: line contains trailing whitespace', > + 'text \n']]), > + ('tabs after text', > + 'any', > + 'text\t\t\n', > + [['any:1: line contains trailing whitespace', > + 'text\t\t\n']]), > + ('mix of tabs and spaces', > + 'any', > + ' \n' > + ' ', > + [['any:1: line contains trailing whitespace', > + ' \n'], > + ['any:2: line contains trailing whitespace', > + ' ']]), > + ('blank line with tabs', > + 'any', > + '\n' > + '\t', > + [['any:2: line contains trailing whitespace', > + '\t']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', TrailingSpace) > +def test_TrailingSpace(testname, filename, string, expected): > + warnings = util.check_file(m.TrailingSpace, filename, string) > + assert warnings == expected > + > + > +Utf8Characters = [ > + ('usual', > + 'any', > + 'text\n', > + []), > + ('acceptable character', > + 'any', > + '\x60', > + []), > + ('unacceptable character', > + 'any', > + '\x81', > + [['any:1: line contains UTF-8 characters', > + '\x81']]), > + ('2 warnings', > + 'any', > + 'text\n' > + 'text \xc8 text\n' > + '\xc9\n', > + [['any:2: line contains UTF-8 characters', > + 'text \xc8 text\n'], > + ['any:3: line contains UTF-8 characters', > + '\xc9\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', Utf8Characters) > +def test_Utf8Characters(testname, filename, string, expected): > + warnings = util.check_file(m.Utf8Characters, filename, string) > + assert warnings == expected > + > + > +def test_all_check_functions_are_used(): > + import inspect > + import checkpackagelib.lib_config as lib_config > + import checkpackagelib.lib_hash as lib_hash > + import checkpackagelib.lib_mk as lib_mk > + import checkpackagelib.lib_patch as lib_patch > + c_config = [c[0] for c in inspect.getmembers(lib_config, inspect.isclass)] > + c_hash = [c[0] for c in inspect.getmembers(lib_hash, inspect.isclass)] > + c_mk = [c[0] for c in inspect.getmembers(lib_mk, inspect.isclass)] > + c_patch = [c[0] for c in inspect.getmembers(lib_patch, inspect.isclass)] > + c_all = c_config + c_hash + c_mk + c_patch > + c_common = [c[0] for c in inspect.getmembers(m, inspect.isclass)] > + assert set(c_common) <= set(c_all) > diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py > new file mode 100644 > index 0000000000..91a549adf2 > --- /dev/null > +++ b/utils/checkpackagelib/test_lib_config.py > @@ -0,0 +1,387 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib_config as m > + > + > +AttributesOrder = [ > + ('good example', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'default y\n' > + 'depends on BR2_USE_BAR # runtime\n' > + 'select BR2_PACKAGE_BAZ\n' > + 'help\n' > + '\t help text\n', > + []), > + ('depends before default', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'depends on BR2_USE_BAR\n' > + 'default y\n', > + [['any:4: attributes order: type, default, depends on, select, help (url#_config_files)', > + 'default y\n']]), > + ('select after help', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'help\n' > + '\t help text\n' > + 'select BR2_PACKAGE_BAZ\n', > + [['any:5: attributes order: type, default, depends on, select, help (url#_config_files)', > + 'select BR2_PACKAGE_BAZ\n']]), > + ('string', > + 'any', > + 'config BR2_PACKAGE_FOO_PLUGINS\n' > + 'string "foo plugins"\n' > + 'default "all"\n', > + []), > + ('ignore tabs', > + 'any', > + 'config\tBR2_PACKAGE_FOO_PLUGINS\n' > + 'default\t"all"\n' > + 'string\t"foo plugins"\n', > + [['any:3: attributes order: type, default, depends on, select, help (url#_config_files)', > + 'string\t"foo plugins"\n']]), > + ('choice', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'if BR2_PACKAGE_FOO\n' > + '\n' > + 'choice\n' > + 'prompt "type of foo"\n' > + 'default BR2_PACKAGE_FOO_STRING\n' > + '\n' > + 'config BR2_PACKAGE_FOO_NONE\n' > + 'bool "none"\n' > + '\n' > + 'config BR2_PACKAGE_FOO_STRING\n' > + 'bool "string"\n' > + '\n' > + 'endchoice\n' > + '\n' > + 'endif\n' > + '\n', > + []), > + ('type after default', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'if BR2_PACKAGE_FOO\n' > + '\n' > + 'choice\n' > + 'default BR2_PACKAGE_FOO_STRING\n' > + 'prompt "type of foo"\n', > + [['any:7: attributes order: type, default, depends on, select, help (url#_config_files)', > + 'prompt "type of foo"\n']]), > + ('menu', > + 'any', > + 'menuconfig BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'help\n' > + '\t help text\n' > + '\t help text\n' > + '\n' > + 'if BR2_PACKAGE_FOO\n' > + '\n' > + 'menu "foo plugins"\n' > + 'config BR2_PACKAGE_FOO_COUNTER\n' > + 'bool "counter"\n' > + '\n' > + 'endmenu\n' > + '\n' > + 'endif\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', AttributesOrder) > +def test_AttributesOrder(testname, filename, string, expected): > + warnings = util.check_file(m.AttributesOrder, filename, string) > + assert warnings == expected > + > + > +CommentsMenusPackagesOrder = [ > + ('top menu (good)', > + 'package/Config.in', > + 'menu "Target packages"\n' > + 'source "package/busybox/Config.in"\n' > + 'source "package/skeleton/Config.in"\n', > + []), > + ('top menu (bad)', > + 'package/Config.in', > + 'source "package/skeleton/Config.in"\n' > + 'source "package/busybox/Config.in"\n', > + [['package/Config.in:2: Packages in: The top level menu,\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: busybox', > + 'source "package/busybox/Config.in"\n']]), > + ('menu (bad)', > + 'package/Config.in', > + 'menu "Target packages"\n' > + 'source "package/skeleton/Config.in"\n' > + 'source "package/busybox/Config.in"\n', > + [['package/Config.in:3: Packages in: menu "Target packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: busybox', > + 'source "package/busybox/Config.in"\n']]), > + ('underscore (good)', > + 'package/Config.in.host', > + 'menu "Hardware handling"\n' > + 'menu "Firmware"\n' > + 'endmenu\n' > + 'source "package/usb_modeswitch/Config.in"\n' > + 'source "package/usbmount/Config.in"\n', > + []), > + ('underscore (bad)', > + 'package/Config.in.host', > + 'menu "Hardware handling"\n' > + 'menu "Firmware"\n' > + 'endmenu\n' > + 'source "package/usbmount/Config.in"\n' > + 'source "package/usb_modeswitch/Config.in"\n', > + [['package/Config.in.host:5: Packages in: menu "Hardware handling",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: usb_modeswitch', > + 'source "package/usb_modeswitch/Config.in"\n']]), > + ('ignore other files', > + 'any other file', > + 'menu "Hardware handling"\n' > + 'source "package/bbb/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + []), > + ('dash (bad)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/aAa/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + [['package/Config.in:3: Packages in: menu "packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: a-a', > + 'source "package/a-a/Config.in"\n']]), > + ('underscore (bad)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/aAa/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + [['package/Config.in:4: Packages in: menu "packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: a_a', > + 'source "package/a_a/Config.in"\n']]), > + ('digit (bad)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/aAa/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + [['package/Config.in:5: Packages in: menu "packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: a1a', > + 'source "package/a1a/Config.in"\n']]), > + ('capitals (bad)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/aaa/Config.in"\n' > + 'source "package/aAa/Config.in"\n', > + [['package/Config.in:6: Packages in: menu "packages",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: aAa', > + 'source "package/aAa/Config.in"\n']]), > + ('digits, capitals, underscore (good)', > + 'package/Config.in', > + 'menu "packages"\n' > + 'source "package/a-a/Config.in"\n' > + 'source "package/a_a/Config.in"\n' > + 'source "package/a1a/Config.in"\n' > + 'source "package/aAa/Config.in"\n' > + 'source "package/aaa/Config.in"\n', > + []), > + ('conditional menu (good)', > + 'package/Config.in', > + 'menu "Other"\n' > + 'source "package/linux-pam/Config.in"\n' > + 'if BR2_PACKAGE_LINUX_PAM\n' > + 'comment "linux-pam plugins"\n' > + 'source "package/libpam-radius-auth/Config.in"\n' > + 'source "package/libpam-tacplus/Config.in"\n' > + 'endif\n' > + 'source "package/liquid-dsp/Config.in"\n', > + []), > + ('conditional menu (bad)', > + 'package/Config.in', > + 'menu "Other"\n' > + 'source "package/linux-pam/Config.in"\n' > + 'if BR2_PACKAGE_LINUX_PAM\n' > + 'comment "linux-pam plugins"\n' > + 'source "package/libpam-tacplus/Config.in"\n' > + 'source "package/libpam-radius-auth/Config.in"\n' > + 'endif\n' > + 'source "package/liquid-dsp/Config.in"\n', > + [['package/Config.in:6: Packages in: comment "linux-pam plugins",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: libpam-radius-auth', > + 'source "package/libpam-radius-auth/Config.in"\n']]), > + ('no conditional (bad)', > + 'package/Config.in', > + 'menu "Other"\n' > + 'source "package/linux-pam/Config.in"\n' > + 'source "package/libpam-radius-auth/Config.in"\n' > + 'source "package/libpam-tacplus/Config.in"\n' > + 'source "package/liquid-dsp/Config.in"\n', > + [['package/Config.in:3: Packages in: menu "Other",\n' > + ' are not alphabetically ordered;\n' > + " correct order: '-', '_', digits, capitals, lowercase;\n" > + ' first incorrect package: libpam-radius-auth', > + 'source "package/libpam-radius-auth/Config.in"\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', CommentsMenusPackagesOrder) > +def test_CommentsMenusPackagesOrder(testname, filename, string, expected): > + warnings = util.check_file(m.CommentsMenusPackagesOrder, filename, string) > + assert warnings == expected > + > + > +HelpText = [ > + ('single line', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'bool "foo"\n' > + 'default y\n' > + 'depends on BR2_USE_BAR # runtime\n' > + 'select BR2_PACKAGE_BAZ\n' > + 'help\n' > + '\t help text\n', > + []), > + ('larger than 72', > + 'any', > + 'help\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 123\n' > + '\t help text\n', > + [['any:3: help text: <2 spaces><62 chars> (url#writing-rules-config-in)', > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 123\n', > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12']]), > + ('long url at beginning of line', > + 'any', > + 'help\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' > + '\t http://url.that.is.longer.than.seventy.two.characthers/folder_name\n' > + '\t https://url.that.is.longer.than.seventy.two.characthers/folder_name\n' > + '\t git://url.that.is.longer.than.seventy.two.characthers/folder_name\n', > + []), > + ('long url not at beginning of line', > + 'any', > + 'help\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' > + '\t refer to http://url.that.is.longer.than.seventy.two.characthers/folder_name\n' > + '\n' > + '\t http://url.that.is.longer.than.seventy.two.characthers/folder_name\n', > + [['any:3: help text: <2 spaces><62 chars> (url#writing-rules-config-in)', > + '\t refer to http://url.that.is.longer.than.seventy.two.characthers/folder_name\n', > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12']]), > + ('allow beautified items', > + 'any', > + 'help\n' > + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' > + '\t summary:\n' > + '\t - enable that config\n' > + '\t - built it\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', HelpText) > +def test_HelpText(testname, filename, string, expected): > + warnings = util.check_file(m.HelpText, filename, string) > + assert warnings == expected > + > + > +Indent = [ > + ('good example', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + '\tbool "foo"\n' > + '\tdefault y\n' > + '\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n' > + '\tdepends on BR2_INSTALL_LIBSTDCPP\n' > + '# very useful comment\n' > + '\tselect BR2_PACKAGE_BAZ\n' > + '\thelp\n' > + '\t help text\n' > + '\n' > + 'comment "foo needs toolchain w/ C++, threads"\n' > + '\tdepends on !BR2_INSTALL_LIBSTDCPP || \\\n' > + '\t\t!BR2_TOOLCHAIN_HAS_THREADS\n' > + '\n' > + 'source "package/foo/bar/Config.in"\n', > + []), > + ('spaces', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + ' bool "foo"\n', > + [['any:2: should be indented with one tab (url#_config_files)', > + ' bool "foo"\n']]), > + ('without indent', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + 'default y\n', > + [['any:2: should be indented with one tab (url#_config_files)', > + 'default y\n']]), > + ('too much tabs', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + '\t\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n', > + [['any:2: should be indented with one tab (url#_config_files)', > + '\t\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n']]), > + ('help', > + 'any', > + 'config BR2_PACKAGE_FOO\n' > + ' help\n', > + [['any:2: should be indented with one tab (url#_config_files)', > + ' help\n']]), > + ('continuation line', > + 'any', > + 'comment "foo needs toolchain w/ C++, threads"\n' > + '\tdepends on !BR2_INSTALL_LIBSTDCPP || \\\n' > + ' !BR2_TOOLCHAIN_HAS_THREADS\n', > + [['any:3: continuation line should be indented using tabs', > + ' !BR2_TOOLCHAIN_HAS_THREADS\n']]), > + ('comment with tabs', > + 'any', > + '\tcomment "foo needs toolchain w/ C++, threads"\n', > + [['any:1: should not be indented', > + '\tcomment "foo needs toolchain w/ C++, threads"\n']]), > + ('comment with spaces', > + 'any', > + ' comment "foo needs toolchain w/ C++, threads"\n', > + [['any:1: should not be indented', > + ' comment "foo needs toolchain w/ C++, threads"\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', Indent) > +def test_Indent(testname, filename, string, expected): > + warnings = util.check_file(m.Indent, filename, string) > + assert warnings == expected > diff --git a/utils/checkpackagelib/test_lib_hash.py b/utils/checkpackagelib/test_lib_hash.py > new file mode 100644 > index 0000000000..c160a394e9 > --- /dev/null > +++ b/utils/checkpackagelib/test_lib_hash.py > @@ -0,0 +1,137 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib_hash as m > + > + > +HashNumberOfFields = [ > + ('empty file', > + 'any', > + '', > + []), > + ('empty line', > + 'any', > + '\n', > + []), > + ('ignore whitespace', > + 'any', > + '\t\n', > + []), > + ('ignore comments', > + 'any', > + '# text\n', > + []), > + ('1 field', > + 'any', > + 'field1\n', > + [['any:1: expected three fields (url#adding-packages-hash)', > + 'field1\n']]), > + ('2 fields', > + 'any', > + 'field1 field2\n', > + [['any:1: expected three fields (url#adding-packages-hash)', > + 'field1 field2\n']]), > + ('4 fields', > + 'any', > + 'field1 field2 field3 field4\n', > + [['any:1: expected three fields (url#adding-packages-hash)', > + 'field1 field2 field3 field4\n']]), > + ('with 1 space', > + 'any', > + 'field1 field2 field3\n', > + []), > + ('many spaces', > + 'any', > + ' field1 field2 field3\n', > + []), > + ('tabs', > + 'any', > + 'field1\tfield2\tfield3\n', > + []), > + ('mix of tabs and spaces', > + 'any', > + '\tfield1\t field2\t field3 \n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', HashNumberOfFields) > +def test_HashNumberOfFields(testname, filename, string, expected): > + warnings = util.check_file(m.HashNumberOfFields, filename, string) > + assert warnings == expected > + > + > +HashType = [ > + ('ignore empty files', > + 'any', > + '', > + []), > + ('ignore 1 field', > + 'any', > + 'text\n', > + []), > + ('wrong type', > + 'any', > + 'text text\n', > + [['any:1: unexpected type of hash (url#adding-packages-hash)', > + 'text text\n']]), > + ('none', > + 'any', > + 'none text\n', > + []), > + ('md5 (good)', > + 'any', > + 'md5 12345678901234567890123456789012\n', > + []), > + ('md5 (short)', > + 'any', > + 'md5 123456\n', > + [['any:1: hash size does not match type (url#adding-packages-hash)', > + 'md5 123456\n', > + 'expected 32 hex digits']]), > + ('ignore space before', > + 'any', > + ' md5 12345678901234567890123456789012\n', > + []), > + ('2 spaces', > + 'any', > + 'md5 12345678901234567890123456789012\n', > + []), > + ('ignore tabs', > + 'any', > + 'md5\t12345678901234567890123456789012\n', > + []), > + ('common typo', > + 'any', > + 'md5sum 12345678901234567890123456789012\n', > + [['any:1: unexpected type of hash (url#adding-packages-hash)', > + 'md5sum 12345678901234567890123456789012\n']]), > + ('md5 (too long)', > + 'any', > + 'md5 123456789012345678901234567890123\n', > + [['any:1: hash size does not match type (url#adding-packages-hash)', > + 'md5 123456789012345678901234567890123\n', > + 'expected 32 hex digits']]), > + ('sha1 (good)', > + 'any', > + 'sha1 1234567890123456789012345678901234567890\n', > + []), > + ('sha256', > + 'any', > + 'sha256 1234567890123456789012345678901234567890123456789012345678901234\n', > + []), > + ('sha384', > + 'any', > + 'sha384 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456\n', > + []), > + ('sha512', > + 'any', > + 'sha512 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678' > + '9012345678\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', HashType) > +def test_HashType(testname, filename, string, expected): > + warnings = util.check_file(m.HashType, filename, string) > + assert warnings == expected > diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py > new file mode 100644 > index 0000000000..49fa216fcd > --- /dev/null > +++ b/utils/checkpackagelib/test_lib_mk.py > @@ -0,0 +1,590 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib_mk as m > + > + > +Indent = [ > + ('ignore comment at beginning of line', > + 'any', > + '# very useful comment\n', > + []), > + ('ignore comment at end of line', > + 'any', > + ' # very useful comment\n', > + []), > + ('do not indent on conditional (good)', > + 'any', > + 'ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)\n' > + 'FOO_CONF_OPTS += something\n' > + 'endef\n', > + []), > + ('do not indent on conditional (bad)', > + 'any', > + 'ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)\n' > + '\tFOO_CONF_OPTS += something\n' > + 'endef\n', > + [['any:2: unexpected indent with tabs', > + '\tFOO_CONF_OPTS += something\n']]), > + ('indent after line that ends in backslash (good)', > + 'any', > + 'FOO_CONF_OPTS += \\\n' > + '\tsomething\n', > + []), > + ('indent after line that ends in backslash (bad)', > + 'any', > + 'FOO_CONF_OPTS += \\\n' > + 'something\n', > + [['any:2: expected indent with tabs', > + 'something\n']]), > + ('indent after 2 lines that ends in backslash (good)', > + 'any', > + 'FOO_CONF_OPTS += \\\n' > + '\tsomething \\\n' > + '\tsomething_else\n', > + []), > + ('indent after 2 lines that ends in backslash (bad)', > + 'any', > + 'FOO_CONF_OPTS += \\\n' > + '\tsomething \\\n' > + '\tsomething_else \\\n' > + 'FOO_CONF_OPTS += another_thing\n', > + [['any:4: expected indent with tabs', > + 'FOO_CONF_OPTS += another_thing\n']]), > + ('indent inside define (good)', > + 'any', > + 'define FOO_SOMETHING\n' > + '\tcommand\n' > + '\tcommand \\\n' > + '\t\targuments\n' > + 'endef\n' > + 'FOO_POST_PATCH_HOOKS += FOO_SOMETHING\n', > + []), > + ('indent inside define (bad, no indent)', > + 'any', > + 'define FOO_SOMETHING\n' > + 'command\n' > + 'endef\n', > + [['any:2: expected indent with tabs', > + 'command\n']]), > + ('indent inside define (bad, spaces)', > + 'any', > + 'define FOO_SOMETHING\n' > + ' command\n' > + 'endef\n', > + [['any:2: expected indent with tabs', > + ' command\n']]), > + ('indent make target (good)', > + 'any', > + 'make_target:\n' > + '\tcommand\n' > + '\n', > + []), > + ('indent make target (bad)', > + 'any', > + 'make_target:\n' > + ' command\n' > + '\n', > + [['any:2: expected indent with tabs', > + ' command\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', Indent) > +def test_Indent(testname, filename, string, expected): > + warnings = util.check_file(m.Indent, filename, string) > + assert warnings == expected > + > + > +OverriddenVariable = [ > + ('simple assignment', > + 'any.mk', > + 'VAR_1 = VALUE1\n', > + []), > + ('unconditional override (variable without underscore)', > + 'any.mk', > + 'VAR1 = VALUE1\n' > + 'VAR1 = VALUE1\n', > + [['any.mk:2: unconditional override of variable VAR1', > + 'VAR1 = VALUE1\n']]), > + ('unconditional override (variable with underscore, same value)', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 = VALUE1\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 = VALUE1\n']]), > + ('unconditional override (variable with underscore, different value)', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 = VALUE2\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 = VALUE2\n']]), > + ('warn for unconditional override even with wrong number of spaces', > + 'any.mk', > + 'VAR_1= VALUE1\n' > + 'VAR_1 =VALUE2\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 =VALUE2\n']]), > + ('warn for := override', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 := VALUE2\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 := VALUE2\n']]), > + ('append values outside conditional (good)', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 += VALUE2\n', > + []), > + ('append values outside conditional (bad)', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'VAR_1 := $(VAR_1), VALUE2\n', > + [['any.mk:2: unconditional override of variable VAR_1', > + 'VAR_1 := $(VAR_1), VALUE2\n']]), > + ('immediate assignment inside conditional', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'ifeq (condition)\n' > + 'VAR_1 := $(VAR_1), VALUE2\n', > + [['any.mk:3: immediate assignment to append to variable VAR_1', > + 'VAR_1 := $(VAR_1), VALUE2\n']]), > + ('immediate assignment inside conditional and unconditional override outside', > + 'any.mk', > + 'VAR_1 = VALUE1\n' > + 'ifeq (condition)\n' > + 'VAR_1 := $(VAR_1), VALUE2\n' > + 'endif\n' > + 'VAR_1 := $(VAR_1), VALUE2\n', > + [['any.mk:3: immediate assignment to append to variable VAR_1', > + 'VAR_1 := $(VAR_1), VALUE2\n'], > + ['any.mk:5: unconditional override of variable VAR_1', > + 'VAR_1 := $(VAR_1), VALUE2\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', OverriddenVariable) > +def test_OverriddenVariable(testname, filename, string, expected): > + warnings = util.check_file(m.OverriddenVariable, filename, string) > + assert warnings == expected > + > + > +PackageHeader = [ > + ('first line (good)', > + 'any', > + 80 * '#' + '\n', > + []), > + ('first line (bad)', > + 'any', > + '# very useful comment\n', > + [['any:1: should be 80 hashes (url#writing-rules-mk)', > + '# very useful comment\n', > + 80 * '#']]), > + ('second line (bad)', > + 'any', > + 80 * '#' + '\n' > + '# package\n', > + [['any:2: should be 1 hash (url#writing-rules-mk)', > + '# package\n']]), > + ('full header (good)', > + 'any', > + 80 * '#' + '\n' > + '#\n' > + '# package\n' > + '#\n' + > + 80 * '#' + '\n' > + '\n', > + []), > + ('blank line after header (good)', > + 'any', > + 80 * '#' + '\n' > + '#\n' > + '# package\n' > + '#\n' + > + 80 * '#' + '\n' > + '\n' > + 'FOO_VERSION = 1\n', > + []), > + ('blank line after header (bad)', > + 'any', > + 80 * '#' + '\n' > + '#\n' > + '# package\n' > + '#\n' + > + 80 * '#' + '\n' > + 'FOO_VERSION = 1\n', > + [['any:6: should be a blank line (url#writing-rules-mk)', > + 'FOO_VERSION = 1\n']]), > + ('wrong number of hashes', > + 'any', > + 79 * '#' + '\n' > + '#\n' > + '# package\n' > + '#\n' + > + 81 * '#' + '\n' > + '\n', > + [['any:1: should be 80 hashes (url#writing-rules-mk)', > + 79 * '#' + '\n', > + 80 * '#'], > + ['any:5: should be 80 hashes (url#writing-rules-mk)', > + 81 * '#' + '\n', > + 80 * '#']]), > + ('allow include without header', > + 'any', > + 'include $(sort $(wildcard package/foo/*/*.mk))\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', PackageHeader) > +def test_PackageHeader(testname, filename, string, expected): > + warnings = util.check_file(m.PackageHeader, filename, string) > + assert warnings == expected > + > + > +RemoveDefaultPackageSourceVariable = [ > + ('bad', > + 'any.mk', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', > + [['any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), > + ('bad with path', > + './any.mk', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', > + [['./any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), > + ('warn for correct line', > + './any.mk', > + '\n' > + '\n' > + '\n' > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', > + [['./any.mk:4: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), > + ('warn ignoring missing spaces', > + './any.mk', > + 'ANY_SOURCE=any-$(ANY_VERSION).tar.gz\n', > + [['./any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'ANY_SOURCE=any-$(ANY_VERSION).tar.gz\n']]), > + ('good', > + './any.mk', > + 'ANY_SOURCE = aNy-$(ANY_VERSION).tar.gz\n', > + []), > + ('gcc exception', > + 'gcc.mk', > + 'GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz\n', > + []), > + ('binutils exception', > + './binutils.mk', > + 'BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz\n', > + []), > + ('gdb exception', > + 'gdb/gdb.mk', > + 'GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz\n', > + []), > + ('package name with dash', > + 'python-subprocess32.mk', > + 'PYTHON_SUBPROCESS32_SOURCE = python-subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz\n', > + [['python-subprocess32.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', > + 'PYTHON_SUBPROCESS32_SOURCE = python-subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', RemoveDefaultPackageSourceVariable) > +def test_RemoveDefaultPackageSourceVariable(testname, filename, string, expected): > + warnings = util.check_file(m.RemoveDefaultPackageSourceVariable, filename, string) > + assert warnings == expected > + > + > +SpaceBeforeBackslash = [ > + ('no backslash', > + 'any.mk', > + '\n', > + []), > + ('ignore missing indent', > + 'any.mk', > + 'define ANY_SOME_FIXUP\n' > + 'for i in $$(find $(STAGING_DIR)/usr/lib* -name "any*.la"); do \\\n', > + []), > + ('ignore missing space', > + 'any.mk', > + 'ANY_CONF_ENV= \\\n' > + '\tap_cv_void_ptr_lt_long=no \\\n', > + []), > + ('variable', > + 'any.mk', > + '\n' > + 'ANY = \\\n', > + []), > + ('2 spaces', > + 'any.mk', > + 'ANY = \\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY = \\\n']]), > + ('warn about correct line', > + 'any.mk', > + '\n' > + 'ANY = \\\n', > + [['any.mk:2: use only one space before backslash', > + 'ANY = \\\n']]), > + ('tab', > + 'any.mk', > + 'ANY =\t\\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY =\t\\\n']]), > + ('tabs', > + 'any.mk', > + 'ANY =\t\t\\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY =\t\t\\\n']]), > + ('spaces and tabs', > + 'any.mk', > + 'ANY = \t\t\\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY = \t\t\\\n']]), > + ('mixed spaces and tabs 1', > + 'any.mk', > + 'ANY = \t \t\\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY = \t \t\\\n']]), > + ('mixed spaces and tabs 2', > + 'any.mk', > + 'ANY = \t \\\n', > + [['any.mk:1: use only one space before backslash', > + 'ANY = \t \\\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', SpaceBeforeBackslash) > +def test_SpaceBeforeBackslash(testname, filename, string, expected): > + warnings = util.check_file(m.SpaceBeforeBackslash, filename, string) > + assert warnings == expected > + > + > +TrailingBackslash = [ > + ('no backslash', > + 'any.mk', > + 'ANY = \n', > + []), > + ('one line', > + 'any.mk', > + 'ANY = \\\n', > + []), > + ('2 lines', > + 'any.mk', > + 'ANY = \\\n' > + '\\\n', > + []), > + ('empty line after', > + 'any.mk', > + 'ANY = \\\n' > + '\n', > + [['any.mk:1: remove trailing backslash', > + 'ANY = \\\n']]), > + ('line with spaces after', > + 'any.mk', > + 'ANY = \\\n' > + ' \n', > + [['any.mk:1: remove trailing backslash', > + 'ANY = \\\n']]), > + ('line with tabs after', > + 'any.mk', > + 'ANY = \\\n' > + '\t\n', > + [['any.mk:1: remove trailing backslash', > + 'ANY = \\\n']]), > + ('ignore if commented', > + 'any.mk', > + '# ANY = \\\n' > + '\n', > + []), > + ('real example', > + 'any.mk', > + 'ANY_CONF_ENV= \t\\\n' > + '\tap_cv_void_ptr_lt_long=no \\\n' > + '\n', > + [['any.mk:2: remove trailing backslash', > + '\tap_cv_void_ptr_lt_long=no \\\n']]), > + ('ignore whitespace 1', > + 'any.mk', > + 'ANY = \t\t\\\n', > + []), > + ('ignore whitespace 2', > + 'any.mk', > + 'ANY = \t \t\\\n', > + []), > + ('ignore whitespace 3', > + 'any.mk', > + 'ANY = \t \\\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', TrailingBackslash) > +def test_TrailingBackslash(testname, filename, string, expected): > + warnings = util.check_file(m.TrailingBackslash, filename, string) > + assert warnings == expected > + > + > +TypoInPackageVariable = [ > + ('good', > + 'any.mk', > + 'ANY_VAR = \n', > + []), > + ('good with path 1', > + './any.mk', > + 'ANY_VAR += \n', > + []), > + ('good with path 2', > + 'any/any.mk', > + 'ANY_VAR = \n', > + []), > + ('bad =', > + 'any.mk', > + 'OTHER_VAR = \n', > + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', > + 'OTHER_VAR = \n']]), > + ('bad +=', > + 'any.mk', > + 'OTHER_VAR += \n', > + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', > + 'OTHER_VAR += \n']]), > + ('ignore missing space', > + 'any.mk', > + 'OTHER_VAR= \n', > + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', > + 'OTHER_VAR= \n']]), > + ('use path in the warning', > + './any.mk', > + 'OTHER_VAR = \n', > + [['./any.mk:1: possible typo: OTHER_VAR -> *ANY*', > + 'OTHER_VAR = \n']]), > + ('another name', > + 'other.mk', > + 'ANY_VAR = \n', > + [['other.mk:1: possible typo: ANY_VAR -> *OTHER*', > + 'ANY_VAR = \n']]), > + ('libc exception', > + './any.mk', > + 'BR_LIBC = \n', > + []), > + ('rootfs exception', > + 'any.mk', > + 'ROOTFS_ANY_VAR += \n', > + []), > + ('host (good)', > + 'any.mk', > + 'HOST_ANY_VAR += \n', > + []), > + ('host (bad)', > + 'any.mk', > + 'HOST_OTHER_VAR = \n', > + [['any.mk:1: possible typo: HOST_OTHER_VAR -> *ANY*', > + 'HOST_OTHER_VAR = \n']]), > + ('provides', > + 'any.mk', > + 'ANY_PROVIDES = other thing\n' > + 'OTHER_VAR = \n', > + []), > + ('ignore space', > + 'any.mk', > + 'ANY_PROVIDES = thing other \n' > + 'OTHER_VAR = \n', > + []), > + ('wrong provides', > + 'any.mk', > + 'ANY_PROVIDES = other\n' > + 'OTHERS_VAR = \n', > + [['any.mk:2: possible typo: OTHERS_VAR -> *ANY*', > + 'OTHERS_VAR = \n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', TypoInPackageVariable) > +def test_TypoInPackageVariable(testname, filename, string, expected): > + warnings = util.check_file(m.TypoInPackageVariable, filename, string) > + assert warnings == expected > + > + > +UselessFlag = [ > + ('autoreconf no', > + 'any.mk', > + 'ANY_AUTORECONF=NO\n', > + [['any.mk:1: useless default value (url#_infrastructure_for_autotools_based_packages)', > + 'ANY_AUTORECONF=NO\n']]), > + ('host autoreconf no', > + 'any.mk', > + 'HOST_ANY_AUTORECONF\n', > + []), > + ('autoreconf yes', > + 'any.mk', > + 'ANY_AUTORECONF=YES\n', > + []), > + ('libtool_patch yes', > + 'any.mk', > + 'ANY_LIBTOOL_PATCH\t= YES\n', > + [['any.mk:1: useless default value (url#_infrastructure_for_autotools_based_packages)', > + 'ANY_LIBTOOL_PATCH\t= YES\n']]), > + ('libtool_patch no', > + 'any.mk', > + 'ANY_LIBTOOL_PATCH= \t NO\n', > + []), > + ('generic', > + 'any.mk', > + 'ANY_INSTALL_IMAGES = NO\n' > + 'ANY_INSTALL_REDISTRIBUTE = YES\n' > + 'ANY_INSTALL_STAGING = NO\n' > + 'ANY_INSTALL_TARGET = YES\n', > + [['any.mk:1: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_IMAGES = NO\n'], > + ['any.mk:2: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_REDISTRIBUTE = YES\n'], > + ['any.mk:3: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_STAGING = NO\n'], > + ['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_TARGET = YES\n']]), > + ('conditional', > + 'any.mk', > + 'ifneq (condition)\n' > + 'ANY_INSTALL_IMAGES = NO\n' > + 'endif\n' > + 'ANY_INSTALL_REDISTRIBUTE = YES\n', > + [['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', > + 'ANY_INSTALL_REDISTRIBUTE = YES\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', UselessFlag) > +def test_UselessFlag(testname, filename, string, expected): > + warnings = util.check_file(m.UselessFlag, filename, string) > + assert warnings == expected > + > + > +VariableWithBraces = [ > + ('good', > + 'xmlstarlet.mk', > + 'XMLSTARLET_CONF_OPTS += \\\n' > + '\t--with-libxml-prefix=$(STAGING_DIR)/usr \\\n', > + []), > + ('bad', > + 'xmlstarlet.mk', > + 'XMLSTARLET_CONF_OPTS += \\\n' > + '\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n', > + [['xmlstarlet.mk:2: use $() to delimit variables, not ${}', > + '\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n']]), > + ('expanded by the shell', > + 'sg3_utils.mk', > + '\tfor prog in xcopy zone; do \\\n' > + '\t\t$(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \\\n' > + '\tdone\n', > + []), > + ('comments', > + 'any.mk', > + '#\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n', > + []), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', VariableWithBraces) > +def test_VariableWithBraces(testname, filename, string, expected): > + warnings = util.check_file(m.VariableWithBraces, filename, string) > + assert warnings == expected > diff --git a/utils/checkpackagelib/test_lib_patch.py b/utils/checkpackagelib/test_lib_patch.py > new file mode 100644 > index 0000000000..3b6fadf38c > --- /dev/null > +++ b/utils/checkpackagelib/test_lib_patch.py > @@ -0,0 +1,96 @@ > +import pytest > +import checkpackagelib.test_util as util > +import checkpackagelib.lib_patch as m > + > + > +ApplyOrder = [ > + ('standard', # catches https://bugs.busybox.net/show_bug.cgi?id=11271 > + '0001-description.patch', > + '', > + []), > + ('standard with path', > + 'path/0001-description.patch', > + '', > + []), > + ('acceptable format', > + '1-description.patch', > + '', > + []), > + ('acceptable format with path', > + 'path/1-description.patch', > + '', > + []), > + ('old format', > + 'package-0001-description.patch', > + '', > + [['package-0001-description.patch:0: use name -.patch (url#_providing_patches)']]), > + ('old format with path', > + 'path/package-0001-description.patch', > + '', > + [['path/package-0001-description.patch:0: use name -.patch (url#_providing_patches)']]), > + ('missing number', > + 'description.patch', > + '', > + [['description.patch:0: use name -.patch (url#_providing_patches)']]), > + ('missing number with path', > + 'path/description.patch', > + '', > + [['path/description.patch:0: use name -.patch (url#_providing_patches)']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', ApplyOrder) > +def test_ApplyOrder(testname, filename, string, expected): > + warnings = util.check_file(m.ApplyOrder, filename, string) > + assert warnings == expected > + > + > +NumberedSubject = [ > + ('no subject', > + 'patch', > + '', > + []), > + ('acceptable because it is not a git patch', > + 'patch', > + 'Subject: [PATCH 24/105] text\n', > + []), > + ('good', > + 'patch', > + 'Subject: [PATCH] text\n' > + 'diff --git a/configure.ac b/configure.ac\n', > + []), > + ('bad', > + 'patch', > + 'Subject: [PATCH 24/105] text\n' > + 'diff --git a/configure.ac b/configure.ac\n', > + [["patch:1: generate your patches with 'git format-patch -N'", > + 'Subject: [PATCH 24/105] text\n']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', NumberedSubject) > +def test_NumberedSubject(testname, filename, string, expected): > + warnings = util.check_file(m.NumberedSubject, filename, string) > + assert warnings == expected > + > + > +Sob = [ > + ('good', > + 'patch', > + 'Signed-off-by: John Doe \n', > + []), > + ('empty', > + 'patch', > + '', > + [['patch:0: missing Signed-off-by in the header (url#_format_and_licensing_of_the_package_patches)']]), > + ('bad', > + 'patch', > + 'Subject: [PATCH 24/105] text\n', > + [['patch:0: missing Signed-off-by in the header (url#_format_and_licensing_of_the_package_patches)']]), > + ] > + > + > + at pytest.mark.parametrize('testname,filename,string,expected', Sob) > +def test_Sob(testname, filename, string, expected): > + warnings = util.check_file(m.Sob, filename, string) > + assert warnings == expected > diff --git a/utils/checkpackagelib/test_util.py b/utils/checkpackagelib/test_util.py > new file mode 100644 > index 0000000000..23f2995e27 > --- /dev/null > +++ b/utils/checkpackagelib/test_util.py > @@ -0,0 +1,8 @@ > +def check_file(check_function, filename, string): > + obj = check_function(filename, 'url') > + result = [] > + result.append(obj.before()) > + for i, line in enumerate(string.splitlines(True)): > + result.append(obj.check_line(i + 1, line)) > + result.append(obj.after()) > + return [r for r in result if r is not None] > From arnout at mind.be Sat Jan 8 22:38:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 8 Jan 2022 23:38:29 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: References: <20201126144745.502228-1-nolange79@gmail.com> Message-ID: <6025dff1-66cb-f56e-21ad-41042efc5517@mind.be> On 08/01/2022 22:46, Norbert Lange wrote: > Am Sa., 8. Jan. 2022 um 20:41 Uhr schrieb Arnout Vandecappelle : >> >> Hi Norbert, >> >> On 26/11/2020 15:47, Norbert Lange wrote: >>> journald supports catalog files, or rather a binary database of >>> those. >>> Functionality added includes: >>> >>> - A config option allows enabling the binary database. >>> >>> - if the option is enabled, the database is built and moved to >>> /usr/share/factory. A symlink is created in /var pointing to >>> that file. >>> If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the >>> language whitelist are deleted first. >>> >>> - the service normally used for creating the DB during boot, >>> and the catalog source files used as input are deleted. >>> >>> The move to /usr/share/factory is helpful for having /usr as whole >>> system distribution. >>> >>> Signed-off-by: Norbert Lange >> >> I was going to apply a second time, but then I noticed that I made some >> comments on v2 [1] that you haven't answered to and I still think they're valid. >> So I've marked this patch as Changes Requested. > > I did reply and cover the comments in [2], not sure whats missing? > Separating into 2 independent patches is not really helpfull IMHO. Oops, you're right. I'll look at the patch again tomorrow morning. Regards, Arnout > >> >> If you respin, please also include in the commit message the additional >> explanations you made in reply to Romain. >> >> Regards, >> Arnout >> >> [1] https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ >> >> >>> --- >>> v1->v2: >>> - Moved all logic into systemd.mk >>> - solved the LOCALE_PURGE order that way >>> - use the factory to store the file >>> - option to enable the DB (similar to udev HWDB) >>> - cant be anabled with !ROOTFS_RW, tons of >>> issues with that one >>> v2->v3: >>> - use backticks instead of $$() >>> - be more explicit about what happens in >>> SYSTEMD_LOCALE_PURGE_CATALOGS >>> >>> Signed-off-by: Norbert Lange >>> --- >>> package/systemd/Config.in | 14 +++++++++++++ >>> package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ >>> 2 files changed, 55 insertions(+) >>> >>> diff --git a/package/systemd/Config.in b/package/systemd/Config.in >>> index ec34478e3d..d576e6035b 100644 >>> --- a/package/systemd/Config.in >>> +++ b/package/systemd/Config.in >>> @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD >>> >>> http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands >>> >>> +config BR2_PACKAGE_SYSTEMD_CATALOGDB >>> + bool "enable journal catalog database installation" >>> + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic >>> + help >>> + Build and install the journal catalog database. >>> + >>> + catalog files are used to provide extended and potentially localized >>> + messages for the journal. >>> + >>> + The original catalog files will be built into a DB at >>> + /usr/share/factory/var/lib/systemd/catalog/database. >>> + >>> + https://www.freedesktop.org/wiki/Software/systemd/catalog/ >>> + >>> config BR2_PACKAGE_SYSTEMD_LOCALED >>> bool "enable locale daemon" >>> help >>> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >>> index cb12f667d6..ae99c02abf 100644 >>> --- a/package/systemd/systemd.mk >>> +++ b/package/systemd/systemd.mk >>> @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD >>> $(SYSTEMD_INSTALL_NETWORK_CONFS) >>> endef >>> >>> +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) >>> +define SYSTEMD_LOCALE_PURGE_CATALOGS >>> + # go through all files with scheme ..catalog >>> + # and remove those where is not in LOCALE_NOPURGE >>> + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ >>> + do \ >>> + basename=$${cfile##*/}; \ >>> + basename=$${basename%.catalog}; \ >>> + langext=$${basename#*.}; \ >>> + [ "$$langext" = "$${basename}" ] && continue; \ >>> + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ >>> + rm -f "$$cfile"; \ >>> + done >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS >>> +endif >>> + >>> +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) >>> +define SYSTEMD_UPDATE_CATALOGS >>> + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog >>> + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ >>> + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database >>> + rm $(TARGET_DIR)/var/lib/systemd/catalog/database >>> + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ >>> + $(TARGET_DIR)/var/lib/systemd/catalog/database >>> + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ >>> + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS >>> +endif >>> + >>> +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>> + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ >>> + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ >>> + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service >>> +endef >>> + >>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>> + >>> define SYSTEMD_PRESET_ALL >>> $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all >>> endef >>> > > Norbert > > [2] - https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ > From fontaine.fabrice at gmail.com Sat Jan 8 22:38:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:38:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/libmd: new package Message-ID: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> This library provides message digest functions found on BSD systems either on their libc (NetBSD, OpenBSD) or libmd (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking on others like GNU systems. https://www.hadrons.org/software/libmd/ Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/libmd/Config.in | 9 +++++++++ package/libmd/libmd.hash | 5 +++++ package/libmd/libmd.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/libmd/Config.in create mode 100644 package/libmd/libmd.hash create mode 100644 package/libmd/libmd.mk diff --git a/DEVELOPERS b/DEVELOPERS index cb06de820d..c1ccab966c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -899,6 +899,7 @@ F: package/libidn2/ F: package/libjpeg/ F: package/liblockfile/ F: package/libmatroska/ +F: package/libmd/ F: package/libmpdclient/ F: package/libnetfilter_conntrack/ F: package/libnetfilter_queue/ diff --git a/package/Config.in b/package/Config.in index ad542ac8bc..d8ee96a588 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1412,6 +1412,7 @@ menu "Crypto" source "package/libgpgme/Config.in" source "package/libkcapi/Config.in" source "package/libksba/Config.in" + source "package/libmd/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libolm/Config.in" diff --git a/package/libmd/Config.in b/package/libmd/Config.in new file mode 100644 index 0000000000..63139ad69b --- /dev/null +++ b/package/libmd/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBMD + bool "libmd" + help + This library provides message digest functions found on BSD + systems either on their libc (NetBSD, OpenBSD) or libmd + (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking + on others like GNU systems. + + https://www.hadrons.org/software/libmd/ diff --git a/package/libmd/libmd.hash b/package/libmd/libmd.hash new file mode 100644 index 0000000000..1a3c9d80df --- /dev/null +++ b/package/libmd/libmd.hash @@ -0,0 +1,5 @@ +# From https://lists.freedesktop.org/archives/libbsd/2021-October/000311.html +sha512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3 libmd-1.0.4.tar.xz + +# Hash for license file +sha256 4365ef6255ad553fce69dd4bc0e093472c5d0e41b8ea493a545cc926ce171aa6 COPYING diff --git a/package/libmd/libmd.mk b/package/libmd/libmd.mk new file mode 100644 index 0000000000..19a2458982 --- /dev/null +++ b/package/libmd/libmd.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libmd +# +################################################################################ + +LIBMD_VERSION = 1.0.4 +LIBMD_SOURCE = libmd-$(LIBMD_VERSION).tar.xz +LIBMD_SITE = https://archive.hadrons.org/software/libmd +LIBMD_LICENSE = BSD-2-Clause, BSD-3-Clause, Beerware, ISC, Public Domain +LIBMD_LICENSE_FILES = COPYING +LIBMD_INSTALL_STAGING = YES + +$(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 22:38:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:38:29 +0100 Subject: [Buildroot] [PATCH 2/2] package/libbsd: bump to version 0.11.3 In-Reply-To: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> References: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> Message-ID: <20220108223829.3701891-2-fontaine.fabrice@gmail.com> - Update indentation in hash file (two spaces) - Update hash of COPYING: - files added and year updated with https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/01f0d1ea1e71f1018a009ebd9203dd48e6d90c45 https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/37a9b56c05339301510213c41fc507ea31cc2464 https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/d54ceb37ce9d7c04fa450a6638eaee31375bbde1 - files removed with https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/847e682f8de452d5f0038458f06ae68ae3959b3a - libmmd is a mandatory dependency since version 0.11 and https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/847e682f8de452d5f0038458f06ae68ae3959b3a https://lists.freedesktop.org/archives/libbsd/2021-February/000298.html https://lists.freedesktop.org/archives/libbsd/2021-February/000302.html https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html Signed-off-by: Fabrice Fontaine --- package/libbsd/Config.in | 1 + package/libbsd/libbsd.hash | 6 +++--- package/libbsd/libbsd.mk | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index 845a22162b..093a2e646c 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_LIBBSD depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBMD help This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 95887bd607..17bb32e01c 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,3 +1,3 @@ -# From https://lists.freedesktop.org/archives/libbsd/2019-August/000229.html -sha256 34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887 libbsd-0.10.0.tar.xz -sha256 933d14a6bc89ee1fd7adbf5b6ec97f6ff0e002549d0b0c164f8a8895371d78f8 COPYING +# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html +sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz +sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 256a75f15e..86df8a97a2 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBSD_VERSION = 0.10.0 +LIBBSD_VERSION = 0.11.3 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = https://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ @@ -12,5 +12,6 @@ LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ LIBBSD_LICENSE_FILES = COPYING LIBBSD_CPE_ID_VENDOR = freedesktop LIBBSD_INSTALL_STAGING = YES +LIBBSD_DEPENDENCIES = libmd $(eval $(autotools-package)) -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Jan 8 22:39:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 8 Jan 2022 23:39:56 +0100 Subject: [Buildroot] [PATCH v3 00/11] Support for Cargo and Go vendoring In-Reply-To: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> Message-ID: <20220108233956.3f145631@windsurf> Hello, On Thu, 6 Jan 2022 21:59:48 +0100 Thomas Petazzoni wrote: > Christian Stewart via buildroot (2): > package/embiggen-disk: new package > package/gocryptfs: new package > > Patrick Havelange (3): > package/pkg-cargo.mk: introduce the cargo package infrastructure > docs/manual/cargo: document the cargo-package infrastructure > package/ripgrep: convert to cargo infrastructure > > Thomas Petazzoni (6): > support/download/dl-wrapper: add concept of download post-processing > package/pkg-download.mk: add _DOWNLOAD_POST_PROCESS variable > support/download/post-process-helpers: add helper function for post > process scripts > package/pkg-golang.mk: implement Go vendoring support > package/sentry-cli: re-add package > package/tinifier: new package So, this series has been applied, with some additional tweaks based on your feedback + review from Yann and Arnout. Here are the things that have *not* yet been taken into account, and left for future work: * We still use "cargo install" even though that causes rebuilds with some packages. Either we switch to a manual installation, or we "wait" for some better solution from cargo maintainers. * We don't use environment variables for everything, and some flags are passed through a cargo config file, which is not ideal. * We only support cargo/go packages that use .tar.gz tarballs, because the repacking with mk_tar_gz assumes .tar.gz is used. These 3 limitations have been captured in the TODO list at https://elinux.org/Buildroot#Core_Buildroot_infrastructure. Patches welcome to implement these things of course, but we wanted to get the initial infrastructure in place and merged, so that we can build on top of it. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Sat Jan 8 22:43:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:43:36 +0100 Subject: [Buildroot] [PATCH 1/2] package/minizip: add minizip-zlib support Message-ID: <20220108224337.3702128-1-fontaine.fabrice@gmail.com> Add a virtual package to allow the user to select the minizip provider: - the current minizip (which has been renamed minizip-ng since https://github.com/zlib-ng/minizip-ng/commit/db95894646b87f6178ceaa389cbdb5b1ba8cd97a) - the 'legacy' minizip provided by zlib which is still widely supported by various opensource packages such as domoticz There is no need to add entries in Config.legacy as the previous options are kept and the default provider of minizip is minizip-ng. Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 2 + .../minizip-ng.hash} | 2 +- package/minizip-ng/minizip-ng.mk | 76 +++++++++++++++++++ package/minizip-zlib/minizip-zlib.hash | 4 + package/minizip-zlib/minizip-zlib.mk | 24 ++++++ package/minizip/Config.in | 40 +++++++++- package/minizip/minizip.mk | 69 +---------------- 7 files changed, 144 insertions(+), 73 deletions(-) rename package/{minizip/minizip.hash => minizip-ng/minizip-ng.hash} (82%) create mode 100644 package/minizip-ng/minizip-ng.mk create mode 100644 package/minizip-zlib/minizip-zlib.hash create mode 100644 package/minizip-zlib/minizip-zlib.mk diff --git a/DEVELOPERS b/DEVELOPERS index bbbb47f6ac..47a3d4bfe0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -922,6 +922,8 @@ F: package/mbedtls/ F: package/mbedtls3/ F: package/minissdpd/ F: package/minizip/ +F: package/minizip-ng/ +F: package/minizip-zlib/ F: package/mongodb/ F: package/motion/ F: package/mutt/ diff --git a/package/minizip/minizip.hash b/package/minizip-ng/minizip-ng.hash similarity index 82% rename from package/minizip/minizip.hash rename to package/minizip-ng/minizip-ng.hash index 3e87e64dae..f866363c93 100644 --- a/package/minizip/minizip.hash +++ b/package/minizip-ng/minizip-ng.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2ab219f651901a337a7d3c268128711b80330a99ea36bdc528c76b591a624c3c minizip-3.0.4.tar.gz +sha256 2ab219f651901a337a7d3c268128711b80330a99ea36bdc528c76b591a624c3c minizip-ng-3.0.4.tar.gz sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE diff --git a/package/minizip-ng/minizip-ng.mk b/package/minizip-ng/minizip-ng.mk new file mode 100644 index 0000000000..ec3903d226 --- /dev/null +++ b/package/minizip-ng/minizip-ng.mk @@ -0,0 +1,76 @@ +################################################################################ +# +# minizip-ng +# +################################################################################ + +MINIZIP_NG_VERSION = 3.0.4 +MINIZIP_NG_SITE = $(call github,zlib-ng,minizip-ng,$(MINIZIP_NG_VERSION)) +MINIZIP_NG_LICENSE = Zlib +MINIZIP_NG_LICENSE_FILES = LICENSE +MINIZIP_NG_CPE_ID_VENDOR = minizip_project +MINIZIP_NG_CPE_ID_PRODUCT = minizip +MINIZIP_NG_INSTALL_STAGING = YES +MINIZIP_NG_PROVIDES = minizip +MINIZIP_NG_DEPENDENCIES = host-pkgconf +MINIZIP_NG_CONF_OPTS = \ + $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \ + -DMZ_COMPAT=OFF \ + -DMZ_FETCH_LIBS=OFF + +ifeq ($(BR2_PACKAGE_BZIP2),y) +MINIZIP_NG_DEPENDENCIES += bzip2 +MINIZIP_NG_CONF_OPTS += -DMZ_BZIP2=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_BZIP2=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +MINIZIP_NG_DEPENDENCIES += libiconv +MINIZIP_NG_CONF_OPTS += -DMZ_ICONV=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_ICONV=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBBSD),y) +MINIZIP_NG_DEPENDENCIES += libbsd +MINIZIP_NG_CONF_OPTS += -DMZ_LIBBSD=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_LIBBSD=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MINIZIP_NG_DEPENDENCIES += openssl +MINIZIP_NG_CONF_OPTS += \ + -DMZ_OPENSSL=ON \ + -DMZ_PKCRYPT=ON \ + -DMZ_WZAES=ON +else +MINIZIP_NG_CONF_OPTS += \ + -DMZ_OPENSSL=OFF \ + -DMZ_PKCRYPT=OFF \ + -DMZ_WZAES=OFF +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +MINIZIP_NG_DEPENDENCIES += xz +MINIZIP_NG_CONF_OPTS += -DMZ_LZMA=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_LZMA=OFF +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +MINIZIP_NG_DEPENDENCIES += zlib +MINIZIP_NG_CONF_OPTS += -DMZ_ZLIB=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_ZLIB=OFF +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +MINIZIP_NG_DEPENDENCIES += zstd +MINIZIP_NG_CONF_OPTS += -DMZ_ZSTD=ON +else +MINIZIP_NG_CONF_OPTS += -DMZ_ZSTD=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/minizip-zlib/minizip-zlib.hash b/package/minizip-zlib/minizip-zlib.hash new file mode 100644 index 0000000000..4d2c5c29d3 --- /dev/null +++ b/package/minizip-zlib/minizip-zlib.hash @@ -0,0 +1,4 @@ +# From http://www.zlib.net/ +sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +# License files, locally calculated +sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README diff --git a/package/minizip-zlib/minizip-zlib.mk b/package/minizip-zlib/minizip-zlib.mk new file mode 100644 index 0000000000..67d4e31f41 --- /dev/null +++ b/package/minizip-zlib/minizip-zlib.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# minizip-zlib +# +################################################################################ + +MINIZIP_ZLIB_VERSION = 1.2.11 +MINIZIP_ZLIB_SOURCE = zlib-$(MINIZIP_ZLIB_VERSION).tar.xz +MINIZIP_ZLIB_SITE = http://www.zlib.net +MINIZIP_ZLIB_LICENSE = Zlib +MINIZIP_ZLIB_LICENSE_FILES = README +MINIZIP_ZLIB_INSTALL_STAGING = YES +MINIZIP_ZLIB_PROVIDES = minizip +MINIZIP_ZLIB_SUBDIR = contrib/minizip +MINIZIP_ZLIB_AUTORECONF = YES +MINIZIP_ZLIB_DEPENDENCIES = zlib + +ifeq ($(BR2_PACKAGE_MINIZIP_DEMOS),y) +MINIZIP_ZLIB_CONF_OPTS += --enable-demos +else +MINIZIP_ZLIB_CONF_OPTS += --disable-demos +endif + +$(eval $(autotools-package)) diff --git a/package/minizip/Config.in b/package/minizip/Config.in index e4d185d9d7..b88091e809 100644 --- a/package/minizip/Config.in +++ b/package/minizip/Config.in @@ -1,13 +1,38 @@ config BR2_PACKAGE_MINIZIP - bool "minizip" + bool "minizip support" + help + Select the desired minizip provider. + +if BR2_PACKAGE_MINIZIP + +choice + prompt "minizip variant" + default BR2_PACKAGE_MINIZIP_NG + help + Select the desired minizip provider. + +config BR2_PACKAGE_MINIZIP_NG + bool "minizip-ng" depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_HAS_MINIZIP help Enables to extract files from a .zip archive file. It is compatible with PKZip 2.04g, WinZip, InfoZip, MimarSinan Codex Suite 2002 tools, and compatible sofware. - https://github.com/nmoinvaz/minizip + https://github.com/zlib-ng/minizip-ng + +config BR2_PACKAGE_MINIZIP_ZLIB + bool "minizip-zlib" + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_HAS_MINIZIP + help + Legacy minizip provided in contrib/minizip of zlib. + + https://www.winimage.com/zLibDll/minizip.html + +endchoice config BR2_PACKAGE_MINIZIP_DEMOS bool "minizip" @@ -15,5 +40,12 @@ config BR2_PACKAGE_MINIZIP_DEMOS help Enable minizip binary tool. -comment "minizip needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +config BR2_PACKAGE_HAS_MINIZIP + bool + +config BR2_PACKAGE_PROVIDES_MINIZIP + string + default "minizip-zlib" if BR2_PACKAGE_MINIZIP_ZLIB + default "minizip-ng" if BR2_PACKAGE_MINIZIP_NG + +endif diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 07f67c1354..95f1a17156 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -4,71 +4,4 @@ # ################################################################################ -MINIZIP_VERSION = 3.0.4 -MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = host-pkgconf -MINIZIP_INSTALL_STAGING = YES -MINIZIP_CONF_OPTS = \ - $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \ - -DMZ_COMPAT=OFF \ - -DMZ_FETCH_LIBS=OFF -MINIZIP_LICENSE = Zlib -MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project - -ifeq ($(BR2_PACKAGE_BZIP2),y) -MINIZIP_DEPENDENCIES += bzip2 -MINIZIP_CONF_OPTS += -DMZ_BZIP2=ON -else -MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -MINIZIP_DEPENDENCIES += libiconv -MINIZIP_CONF_OPTS += -DMZ_ICONV=ON -else -MINIZIP_CONF_OPTS += -DMZ_ICONV=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBBSD),y) -MINIZIP_DEPENDENCIES += libbsd -MINIZIP_CONF_OPTS += -DMZ_LIBBSD=ON -else -MINIZIP_CONF_OPTS += -DMZ_LIBBSD=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MINIZIP_DEPENDENCIES += openssl -MINIZIP_CONF_OPTS += \ - -DMZ_OPENSSL=ON \ - -DMZ_PKCRYPT=ON \ - -DMZ_WZAES=ON -else -MINIZIP_CONF_OPTS += \ - -DMZ_OPENSSL=OFF \ - -DMZ_PKCRYPT=OFF \ - -DMZ_WZAES=OFF -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -MINIZIP_DEPENDENCIES += xz -MINIZIP_CONF_OPTS += -DMZ_LZMA=ON -else -MINIZIP_CONF_OPTS += -DMZ_LZMA=OFF -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -MINIZIP_DEPENDENCIES += zlib -MINIZIP_CONF_OPTS += -DMZ_ZLIB=ON -else -MINIZIP_CONF_OPTS += -DMZ_ZLIB=OFF -endif - -ifeq ($(BR2_PACKAGE_ZSTD),y) -MINIZIP_DEPENDENCIES += zstd -MINIZIP_CONF_OPTS += -DMZ_ZSTD=ON -else -MINIZIP_CONF_OPTS += -DMZ_ZSTD=OFF -endif - -$(eval $(cmake-package)) +$(eval $(virtual-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 8 22:43:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 8 Jan 2022 23:43:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/domoticz: depends on minizip-zlib In-Reply-To: <20220108224337.3702128-1-fontaine.fabrice@gmail.com> References: <20220108224337.3702128-1-fontaine.fabrice@gmail.com> Message-ID: <20220108224337.3702128-2-fontaine.fabrice@gmail.com> Depends on minizip-zlib and so drop git submodules Signed-off-by: Fabrice Fontaine --- package/domoticz/Config.in | 4 ++++ package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 4324d13cee..fa7fd546fa 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_DOMOTICZ depends on BR2_PACKAGE_LUA_5_3 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_PACKAGE_MINIZIP_ZLIB select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME @@ -43,3 +44,6 @@ comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 6, NPTL, wchar, d comment "domoticz needs exception_ptr" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +comment "domoticz needs minizip-zlib" + depends on !BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index dcd5bead1e..2c6c837e64 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d8e99e0f96873aa105b57f73656ef7a14c89e0acf2649b2d4ef1167b14bab4b2 domoticz-2021.1-br1.tar.gz +sha256 c4dc3455edae8bf00d2e950002f70d5b90ac577b1559ef7ada6870d970069fbb domoticz-2021.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index f142791830..0d1088d395 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -5,9 +5,7 @@ ################################################################################ DOMOTICZ_VERSION = 2021.1 -DOMOTICZ_SITE = https://github.com/domoticz/domoticz -DOMOTICZ_SITE_METHOD = git -DOMOTICZ_GIT_SUBMODULES = YES +DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt DOMOTICZ_CPE_ID_VENDOR = domoticz @@ -19,6 +17,7 @@ DOMOTICZ_DEPENDENCIES = \ jsoncpp \ libcurl \ lua \ + minizip \ mosquitto \ openssl \ sqlite \ @@ -34,10 +33,11 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_OPENSSL_STATIC=OFF # Do not use any built-in libraries which are enabled by default for -# jsoncpp, fmt, sqlite and mqtt +# jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ -DUSE_BUILTIN_LIBFMT=OFF \ + -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF -- 2.34.1 From peter at korsgaard.com Sat Jan 8 22:47:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 23:47:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/janus-gateway: bump to version 0.11.6 In-Reply-To: <20220108221707.3626671-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 23:17:07 +0100") References: <20220108221707.3626671-1-fontaine.fabrice@gmail.com> Message-ID: <87czl1etfw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Add upstream status (rejected) to first and second patches > - Drop third patch (already in version) > https://github.com/meetecho/janus-gateway/blob/v0.11.6/CHANGELOG.md > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 8 22:42:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 23:42:08 +0100 Subject: [Buildroot] [git commit] package/janus-gateway: bump to version 0.11.6 Message-ID: <20220108224114.84A4D807EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65b351fc9b7d70c96a0efc96182685899c5b9111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Add upstream status (rejected) to first and second patches - Drop third patch (already in version) https://github.com/meetecho/janus-gateway/blob/v0.11.6/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/janus-gateway/0001-disable-ssp.patch | 2 + ...002-Add-test-for-Wunused-but-set-variable.patch | 2 + ...ross-site-Scripting-XSS-exploits-in-demos.patch | 357 --------------------- ...tch => 0003-Fixed-missing-XSS-mitigation.patch} | 0 package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 7 +- 6 files changed, 7 insertions(+), 363 deletions(-) diff --git a/package/janus-gateway/0001-disable-ssp.patch b/package/janus-gateway/0001-disable-ssp.patch index 22f7f1a417..0c9b006ed9 100644 --- a/package/janus-gateway/0001-disable-ssp.patch +++ b/package/janus-gateway/0001-disable-ssp.patch @@ -12,6 +12,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[Upstream status: rejected +(https://github.com/meetecho/janus-gateway/pull/1801)] --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index b54c8cbec6..2dfcc76d68 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -18,6 +18,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[Upstream status: rejected +(https://github.com/meetecho/janus-gateway/pull/1789)] --- Makefile.am | 1 + configure.ac | 6 ++- diff --git a/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch b/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch deleted file mode 100644 index 9f3adfcc8e..0000000000 --- a/package/janus-gateway/0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch +++ /dev/null @@ -1,357 +0,0 @@ -From ba166e9adebfe5343f826c6a9e02299d35414ffd Mon Sep 17 00:00:00 2001 -From: Lorenzo Miniero -Date: Thu, 25 Nov 2021 17:20:53 +0100 -Subject: [PATCH] Fix potential Cross-site Scripting (XSS) exploits in demos - (#2817) - -[Retrieved (and backported) from: -https://github.com/meetecho/janus-gateway/commit/ba166e9adebfe5343f826c6a9e02299d35414ffd] -Signed-off-by: Fabrice Fontaine ---- - html/audiobridgetest.js | 17 +++++++++++++---- - html/recordplaytest.js | 13 +++++++++++-- - html/screensharingtest.js | 11 ++++++++++- - html/streamingtest.js | 13 +++++++++++-- - html/textroomtest.js | 23 ++++++++++++++--------- - html/videocalltest.js | 15 ++++++++++++--- - html/videoroomtest.js | 13 +++++++++++-- - html/vp9svctest.js | 13 +++++++++++-- - 8 files changed, 93 insertions(+), 25 deletions(-) - -diff --git a/html/audiobridgetest.js b/html/audiobridgetest.js -index 18e1cc1839..f757789708 100644 ---- a/html/audiobridgetest.js -+++ b/html/audiobridgetest.js -@@ -178,7 +178,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -222,7 +222,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -267,7 +267,7 @@ $(document).ready(function() { - Janus.debug("Got a list of participants:", list); - for(var f in list) { - var id = list[f]["id"]; -- var display = list[f]["display"]; -+ var display = escapeXmlTags(list[f]["display"]); - var setup = list[f]["setup"]; - var muted = list[f]["muted"]; - var spatial = list[f]["spatial_position"]; -@@ -429,7 +429,7 @@ function registerUsername() { - return; - } - var register = { request: "join", room: myroom, display: username }; -- myusername = username; -+ myusername = escapeXmlTags(username); - mixertest.send({ message: register}); - } - } -@@ -448,3 +448,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/recordplaytest.js b/html/recordplaytest.js -index 74ee7bed95..52b5ccbc4c 100644 ---- a/html/recordplaytest.js -+++ b/html/recordplaytest.js -@@ -423,11 +423,11 @@ function updateRecsList() { - Janus.debug("Got a list of available recordings:", list); - for(var mp in list) { - Janus.debug(" >> [" + list[mp]["id"] + "] " + list[mp]["name"] + " (" + list[mp]["date"] + ")"); -- $('#recslist').append("
  • " + list[mp]["name"] + " [" + list[mp]["date"] + "]" + "
    • "); -+ $('#recslist').append("
  • " + escapeXmlTags(list[mp]["name"]) + " [" + list[mp]["date"] + "]" + "
    • "); - } - $('#recslist a').unbind('click').click(function() { - selectedRecording = $(this).attr("id"); -- selectedRecordingInfo = $(this).text(); -+ selectedRecordingInfo = escapeXmlTags($(this).text()); - $('#recset').html($(this).html()).parent().removeClass('open'); - $('#play').removeAttr('disabled').click(startPlayout); - return false; -@@ -545,3 +545,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/screensharingtest.js b/html/screensharingtest.js -index 61eac70f43..c64d8dbd67 100644 ---- a/html/screensharingtest.js -+++ b/html/screensharingtest.js -@@ -161,7 +161,7 @@ $(document).ready(function() { - if(event === "joined") { - myid = msg["id"]; - $('#session').html(room); -- $('#title').html(msg["description"]); -+ $('#title').html(escapeXmlTags(msg["description"])); - Janus.log("Successfully joined room " + msg["room"] + " with ID " + myid); - if(role === "publisher") { - // This is our session, publish our stream -@@ -514,3 +514,12 @@ function newRemoteFeed(id, display) { - } - }); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/streamingtest.js b/html/streamingtest.js -index 7dd2e1f681..3f9937f11c 100644 ---- a/html/streamingtest.js -+++ b/html/streamingtest.js -@@ -323,7 +323,7 @@ function updateStreamsList() { - Janus.debug(list); - for(var mp in list) { - Janus.debug(" >> [" + list[mp]["id"] + "] " + list[mp]["description"] + " (" + list[mp]["type"] + ")"); -- $('#streamslist').append("
  • " + list[mp]["description"] + " (" + list[mp]["type"] + ")" + "
    • "); -+ $('#streamslist').append("
  • " + escapeXmlTags(list[mp]["description"]) + " (" + list[mp]["type"] + ")" + "
    • "); - } - $('#streamslist a').unbind('click').click(function() { - selectedStream = $(this).attr("id"); -@@ -345,7 +345,7 @@ function getStreamInfo() { - var body = { request: "info", id: parseInt(selectedStream) || selectedStream }; - streaming.send({ message: body, success: function(result) { - if(result && result.info && result.info.metadata) { -- $('#metadata').html(result.info.metadata); -+ $('#metadata').html(escapeXmlTags(result.info.metadata)); - $('#info').removeClass('hide').show(); - } - }}); -@@ -394,6 +394,15 @@ function stopStream() { - simulcastStarted = false; - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons() { - $('#curres').parent().append( -diff --git a/html/textroomtest.js b/html/textroomtest.js -index 082ae44905..3d0697e35a 100644 ---- a/html/textroomtest.js -+++ b/html/textroomtest.js -@@ -153,9 +153,7 @@ $(document).ready(function() { - var what = json["textroom"]; - if(what === "message") { - // Incoming message: public or private? -- var msg = json["text"]; -- msg = msg.replace(new RegExp('<', 'g'), '<'); -- msg = msg.replace(new RegExp('>', 'g'), '>'); -+ var msg = escapeXmlTags(json["text"]); - var from = json["from"]; - var dateString = getDateString(json["date"]); - var whisper = json["whisper"]; -@@ -170,9 +168,7 @@ $(document).ready(function() { - } - } else if(what === "announcement") { - // Room announcement -- var msg = json["text"]; -- msg = msg.replace(new RegExp('<', 'g'), '<'); -- msg = msg.replace(new RegExp('>', 'g'), '>'); -+ var msg = escapeXmlTags(json["text"]); - var dateString = getDateString(json["date"]); - $('#chatroom').append('

    [' + dateString + '] ' + msg + ''); - $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; -@@ -180,7 +176,7 @@ $(document).ready(function() { - // Somebody joined - var username = json["username"]; - var display = json["display"]; -- participants[username] = display ? display : username; -+ participants[username] = escapeXmlTags(display ? display : username); - if(username !== myid && $('#rp' + username).length === 0) { - // Add to the participants list - $('#list').append('

  • ' + participants[username] + '
    • '); -@@ -282,7 +278,7 @@ function registerUsername() { - username: myid, - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - transactions[transaction] = function(response) { - if(response["textroom"] === "error") { - // Something went wrong -@@ -312,7 +308,7 @@ function registerUsername() { - if(response.participants && response.participants.length > 0) { - for(var i in response.participants) { - var p = response.participants[i]; -- participants[p.username] = p.display ? p.display : p.username; -+ participants[p.username] = escapeXmlTags(p.display ? p.display : p.username); - if(p.username !== myid && $('#rp' + p.username).length === 0) { - // Add to the participants list - $('#list').append('
  • ' + participants[p.username] + '
    • '); -@@ -418,3 +414,12 @@ function getQueryStringValue(name) { - results = regex.exec(location.search); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } -+ -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -diff --git a/html/videocalltest.js b/html/videocalltest.js -index d1c1ab8d07..18ccbc2c47 100644 ---- a/html/videocalltest.js -+++ b/html/videocalltest.js -@@ -148,7 +148,7 @@ $(document).ready(function() { - } else if(result["event"]) { - var event = result["event"]; - if(event === 'registered') { -- myusername = result["username"]; -+ myusername = escapeXmlTags(result["username"]); - Janus.log("Successfully registered as " + myusername + "!"); - $('#youok').removeClass('hide').show().html("Registered as '" + myusername + "'"); - // Get a list of available peers, just for fun -@@ -163,7 +163,7 @@ $(document).ready(function() { - bootbox.alert("Waiting for the peer to answer..."); - } else if(event === 'incomingcall') { - Janus.log("Incoming call from " + result["username"] + "!"); -- yourusername = result["username"]; -+ yourusername = escapeXmlTags(result["username"]); - // Notify user - bootbox.hideAll(); - incoming = bootbox.dialog({ -@@ -213,7 +213,7 @@ $(document).ready(function() { - }); - } else if(event === 'accepted') { - bootbox.hideAll(); -- var peer = result["username"]; -+ var peer = escapeXmlTags(result["username"]); - if(!peer) { - Janus.log("Call started!"); - } else { -@@ -598,6 +598,15 @@ function getQueryStringValue(name) { - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons(temporal) { - $('#curres').parent().append( -diff --git a/html/videoroomtest.js b/html/videoroomtest.js -index 6a566891d8..5a3ade9be9 100644 ---- a/html/videoroomtest.js -+++ b/html/videoroomtest.js -@@ -400,7 +400,7 @@ function registerUsername() { - ptype: "publisher", - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - sfutest.send({ message: register }); - } - } -@@ -530,7 +530,7 @@ function newRemoteFeed(id, display, audio, video) { - } - } - remoteFeed.rfid = msg["id"]; -- remoteFeed.rfdisplay = msg["display"]; -+ remoteFeed.rfdisplay = escapeXmlTags(msg["display"]); - if(!remoteFeed.spinner) { - var target = document.getElementById('videoremote'+remoteFeed.rfindex); - remoteFeed.spinner = new Spinner({top:100}).spin(target); -@@ -685,6 +685,15 @@ function getQueryStringValue(name) { - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create Simulcast-related UI, if enabled - function addSimulcastButtons(feed, temporal) { - var index = feed; -diff --git a/html/vp9svctest.js b/html/vp9svctest.js -index eca0239c32..b22ccf3340 100644 ---- a/html/vp9svctest.js -+++ b/html/vp9svctest.js -@@ -387,7 +387,7 @@ function registerUsername() { - ptype: "publisher", - display: username - }; -- myusername = username; -+ myusername = escapeXmlTags(username); - sfutest.send({ message: register }); - } - } -@@ -486,7 +486,7 @@ function newRemoteFeed(id, display, audio, video) { - } - } - remoteFeed.rfid = msg["id"]; -- remoteFeed.rfdisplay = msg["display"]; -+ remoteFeed.rfdisplay = escapeXmlTags(msg["display"]); - if(!remoteFeed.spinner) { - var target = document.getElementById('videoremote'+remoteFeed.rfindex); - remoteFeed.spinner = new Spinner({top:100}).spin(target); -@@ -630,6 +630,15 @@ function newRemoteFeed(id, display, audio, video) { - }); - } - -+// Helper to escape XML tags -+function escapeXmlTags(value) { -+ if(value) { -+ var escapedValue = value.replace(new RegExp('<', 'g'), '<'); -+ escapedValue = escapedValue.replace(new RegExp('>', 'g'), '>'); -+ return escapedValue; -+ } -+} -+ - // Helpers to create SVC-related UI for a new viewer - function addSvcButtons(feed) { - var index = feed; diff --git a/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch similarity index 100% rename from package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch rename to package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 83afc72c98..7aec3d2aa3 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 21e2fc7dee4b20ed8d749a69577eccd961b0bfe5b863d42f39ddfcd2af903718 janus-gateway-0.10.10.tar.gz +sha256 b5fe70d95b9288200df15d5f75cb8eb6db66484c6ded159422a81e880ecb7104 janus-gateway-0.11.6.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 83d28ff6c7..84ca0bc116 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,17 +4,14 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 0.10.10 +JANUS_GATEWAY_VERSION = 0.11.6 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING JANUS_GATEWAY_CPE_ID_VENDOR = meetecho JANUS_GATEWAY_CPE_ID_PRODUCT = janus -# 0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch -JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4020 - -# 0004-Fixed-missing-XSS-mitigation.patch +# 0003-Fixed-missing-XSS-mitigation.patch JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 # ding-libs provides the ini_config library From peter at korsgaard.com Sat Jan 8 22:53:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 8 Jan 2022 23:53:28 +0100 Subject: [Buildroot] [git commit] package/snort: bump to version 2.9.19 Message-ID: <20220108224729.AA20580462@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65ed981ce0135379b7faeb69519f4e3e666c0717 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://snort.org/downloads/snort/release_notes_2.9.19.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/snort/snort.hash | 4 ++-- package/snort/snort.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snort/snort.hash b/package/snort/snort.hash index 6df7ae5229..ac098564aa 100644 --- a/package/snort/snort.hash +++ b/package/snort/snort.hash @@ -1,8 +1,8 @@ # From https://www.snort.org/downloads/snort/md5s -md5 2b4e30300ef6feca1f60c267e727c6c0 snort-2.9.18.1.tar.gz +md5 b0350425e0c1e9c044c25aa13b47edf8 snort-2.9.19.tar.gz # Locally computed: -sha256 da8af0f1b2e4f247d970c6a3c0e83fb6dcd5c84faa21aea49f306f269e8e28aa snort-2.9.18.1.tar.gz +sha256 b12fc6db72afb58987a2bf1954b8f45bde02047c235513c7663857b9506369c7 snort-2.9.19.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 54017d3460..41f450541f 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.18.1 +SNORT_VERSION = 2.9.19 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING From peter at korsgaard.com Sat Jan 8 22:53:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 08 Jan 2022 23:53:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/snort: bump to version 2.9.19 In-Reply-To: <20220108222153.3689389-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 23:21:53 +0100") References: <20220108222153.3689389-1-fontaine.fabrice@gmail.com> Message-ID: <878rvpet52.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://snort.org/downloads/snort/release_notes_2.9.19.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Sat Jan 8 23:03:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:03:12 +0100 Subject: [Buildroot] [PATCH] external-toolchain: Detect linux/version.h via cross compiler In-Reply-To: <20201023093641.619746-1-raj.khem@gmail.com> References: <20201023093641.619746-1-raj.khem@gmail.com> Message-ID: <20220109000312.6b307c17@windsurf> Hello Khem, On Fri, 23 Oct 2020 02:36:41 -0700 Khem Raj wrote: > Using linux/version.h is assumed to be hardcoded inside sysroot but this > does not consider the case where toolchains might be built with > --with-native-system-header-dir which means the header directories will > not be under /usr/include but customized, archlinux, debian > built cross toolchains use these install settings ( due to multiarch ) > they have the headers installed like /usr/aarch64-linux-gnu/include and > not /usr/aarch64-linux-gnu/usr/include > > This patch adds logic to use cross compiler to compute the path to > linux/version.h on the fly, it means we do not really need to assume the > install structure > > Fixes built when using external toolchains provided by archlinux e.g. > > Signed-off-by: Khem Raj > Cc: Thomas Petazzoni > --- > support/scripts/check-kernel-headers.sh | 15 ++++++++++++++- > toolchain/helpers.mk | 2 +- > .../toolchain-external/pkg-toolchain-external.mk | 3 ++- > 3 files changed, 17 insertions(+), 3 deletions(-) We finally took some time to review and discuss this patch. As you can probably imagine due to the delay, we are (at least in its current form) not going to apply it. While it would be nice to not hardcode /usr/include/linux/version.h, we would need: - To account for CFLAGS, as they can affect which sysroot is used by the toolchain in case of multilib toolchains. - A solution that also uses the cross-compiler to detect where is in the case of the internal toolchain backend. However, overall, the motivation of using distribution toolchains is dubious. We still believe that it cannot work, because distribution toolchains can contain any number of random libraries. The sysroot of those toolchains (including the random set of libraries that have been installed) will be copied to Buildroot STAGING_DIR, causing confusion with the packages that Buildroot will build. So overall, we feel that the benefit of the patch is not sufficient compared to the extra effort to fix the remaining comments that we have on it. If you're still interested in pursuing this, we would welcome a new patch that addresses the above two issues. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sat Jan 8 23:02:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 00:02:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrok: fix C++ build with glibmm 2.68 Message-ID: <20220108230259.3703237-1-fontaine.fabrice@gmail.com> cxx bindings are, silently, disabled since bump of glibmm to version 2.68.2 in commit dddb65efbdf2c7952f22a1e51009f17f1676db4a resulting in the following build failure with pulseview: -- Package 'libsigrokcxx', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf Signed-off-by: Fabrice Fontaine --- .../libsigrok/0001-Support-glibmm-2.68.patch | 129 ++++++++++++++++++ package/libsigrok/libsigrok.mk | 3 + 2 files changed, 132 insertions(+) create mode 100644 package/libsigrok/0001-Support-glibmm-2.68.patch diff --git a/package/libsigrok/0001-Support-glibmm-2.68.patch b/package/libsigrok/0001-Support-glibmm-2.68.patch new file mode 100644 index 0000000000..14d14ec406 --- /dev/null +++ b/package/libsigrok/0001-Support-glibmm-2.68.patch @@ -0,0 +1,129 @@ +From 31ad5ec50ec0c9cc7a92f009925c5f58aecdcce1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 Dec 2021 14:58:11 +0100 +Subject: [PATCH] Support glibmm 2.68 + +Support glibmm 2.68 which has been released one year ago and is the +first stable release in the glibmm-2.68 ABI series: +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS + +As TimeVal is not available with glibmm 2.68, use DateTime which is +available since version 2.26 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceforge.net/p/sigrok/mailman/message/37410614] +--- + README | 2 +- + bindings/cxx/classes.cpp | 13 ++++++------- + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp | 4 ++-- + bindings/cxx/libsigrokcxx.pc.in | 2 +- + configure.ac | 7 ++++++- + 5 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/README b/README +index 768c8ca2..2515f059 100644 +--- a/README ++++ b/README +@@ -63,7 +63,7 @@ Requirements for the C++ bindings: + - doxygen (required for building the bindings, not only for C++ API docs!) + - graphviz (optional, only needed for the C++ API docs) + - Python (2 or 3) executable (development files are not needed) +- - glibmm-2.4 (>= 2.32.0) ++ - glibmm-2.4 (>= 2.32.0) or glibmm-2.68 (>= 2.68.0) + + Requirements for the Python bindings: + +diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp +index f9f79273..de600d03 100644 +--- a/bindings/cxx/classes.cpp ++++ b/bindings/cxx/classes.cpp +@@ -287,12 +287,12 @@ shared_ptr Context::create_user_device( + default_delete{}}; + } + +-shared_ptr Context::create_header_packet(Glib::TimeVal start_time) ++shared_ptr Context::create_header_packet(Glib::DateTime start_time) + { + auto header = g_new(struct sr_datafeed_header, 1); + header->feed_version = 1; +- header->starttime.tv_sec = start_time.tv_sec; +- header->starttime.tv_usec = start_time.tv_usec; ++ header->starttime.tv_sec = start_time.to_unix(); ++ header->starttime.tv_usec = start_time.get_microsecond(); + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_HEADER; + packet->payload = header; +@@ -1154,11 +1154,10 @@ int Header::feed_version() const + return _structure->feed_version; + } + +-Glib::TimeVal Header::start_time() const ++Glib::DateTime Header::start_time() const + { +- return Glib::TimeVal( +- _structure->starttime.tv_sec, +- _structure->starttime.tv_usec); ++ Glib::DateTime time = Glib::DateTime::create_now_utc(_structure->starttime.tv_sec); ++ return time.add_seconds(_structure->starttime.tv_usec / 1.0e6); + } + + Meta::Meta(const struct sr_datafeed_meta *structure) : +diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +index 97e54e17..d090c379 100644 +--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp ++++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +@@ -274,7 +274,7 @@ public: + std::shared_ptr create_user_device( + std::string vendor, std::string model, std::string version); + /** Create a header packet. */ +- std::shared_ptr create_header_packet(Glib::TimeVal start_time); ++ std::shared_ptr create_header_packet(Glib::DateTime start_time); + /** Create a meta packet. */ + std::shared_ptr create_meta_packet( + std::map config); +@@ -711,7 +711,7 @@ public: + /* Feed version number. */ + int feed_version() const; + /* Start time of this session. */ +- Glib::TimeVal start_time() const; ++ Glib::DateTime start_time() const; + private: + explicit Header(const struct sr_datafeed_header *structure); + ~Header(); +diff --git a/bindings/cxx/libsigrokcxx.pc.in b/bindings/cxx/libsigrokcxx.pc.in +index 10a92f2d..7d2723fc 100644 +--- a/bindings/cxx/libsigrokcxx.pc.in ++++ b/bindings/cxx/libsigrokcxx.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: libsigrokcxx + Description: C++ bindings for libsigrok + URL: http://www.sigrok.org +-Requires: libsigrok glibmm-2.4 ++Requires: libsigrok @SR_GLIBMM_REQUIRES@ + Version: @SR_PACKAGE_VERSION@ + Libs: -L${libdir} -lsigrokcxx + Libs.private: -lm +diff --git a/configure.ac b/configure.ac +index 424b0002..d70575b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -407,9 +407,14 @@ AS_IF([test "x$HAVE_CXX11" != x1], + [SR_APPEND([sr_cxx_missing], [', '], ['C++11'])]) + + # The C++ bindings need glibmm. +-SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0]) ++SR_GLIBMM_REQUIRES=glibmm-2.4 ++SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.32.0]) ++AS_IF([test "x$sr_have_glibmm" != xyes], ++ [SR_GLIBMM_REQUIRES=glibmm-2.68 ++ SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.68.0])]) + AS_IF([test "x$sr_have_glibmm" != xyes], + [SR_APPEND([sr_cxx_missing], [', '], [glibmm])]) ++AC_SUBST(SR_GLIBMM_REQUIRES) + + # The C++ bindings use Doxygen to parse libsigrok symbols. + AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no]) +-- +2.34.1 + diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 8e7c355fd0..2a26518614 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -11,6 +11,8 @@ LIBSIGROK_LICENSE_FILES = COPYING LIBSIGROK_INSTALL_STAGING = YES LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf LIBSIGROK_CONF_OPTS = --disable-java --disable-python +# We're patching configure.ac +LIBSIGROK_AUTORECONF = YES ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) LIBSIGROK_CONF_OPTS += --with-libbluez @@ -52,6 +54,7 @@ LIBSIGROK_DEPENDENCIES += glibmm endif ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) +LIBSIGROK_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++17" LIBSIGROK_CONF_OPTS += --enable-cxx # host-doxygen is used by C++ bindings to parse libsigrok symbols LIBSIGROK_DEPENDENCIES += \ -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Jan 8 23:08:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:08:39 +0100 Subject: [Buildroot] [git commit] package/python-packaging: fix host variant Message-ID: <20220108230234.BF7858136C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f5ce3ad2c833d2025b2202a4fdcbb06629f1ece branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The host variant of python-packaging was added in commit 4cc445fd5fbb83c2b55f679f3d92223f34f214cb, but has two missing things: - It's a python3 only package, so it should have HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3 - It depends on the pyparsing module, so it should have a dependency on it. Signed-off-by: Thomas Petazzoni --- package/python-packaging/python-packaging.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 1fd6f26d64..e2fb9b120b 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -10,6 +10,8 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3a PYTHON_PACKAGING_SETUP_TYPE = setuptools PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD +HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing $(eval $(python-package)) $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:15:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:15:11 +0100 Subject: [Buildroot] [git commit] package/python-pyparsing: enable host build Message-ID: <20220108231001.D1609813CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea077d89ec4af31d5203a50b451f0fba28c5e1fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will be required by host-python-packaging. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- package/python-pyparsing/python-pyparsing.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 0dacf2371d..5741458d65 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -10,5 +10,7 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools +HOST_PYTHON_PYPARSING_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:15:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:15:15 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm: bump to version 6.3.2 Message-ID: <20220108231001.DD70E813F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12e3527fd97df9ae1b60b892c61d10ce291b7a00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new host-python-packaging and host-python-tomli dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 79999fca0d..22b9afd2c2 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 c11bf23d80224691a46ee5deb84c42db setuptools_scm-5.0.1.tar.gz -sha256 c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a setuptools_scm-5.0.1.tar.gz +md5 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz +sha256 a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 setuptools_scm-6.3.2.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index caca6d4314..f7f4e3ef27 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 5.0.1 +PYTHON_SETUPTOOLS_SCM_VERSION = 6.3.2 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/af/df/f8aa8a78d4d29e0cffa4512e9bc223ed02f24893fe1837c6cee2749ebd67 +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4b/0d/ecb9595fae02467edba5023eb8a23c688d2b438a6a8d1a9e2b8649faf23d PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools +HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:15:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:15:22 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-rust: bump to version 1.1.2 Message-ID: <20220108231002.02F58813CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5138621497a9a6621d1ef36faf66a3e1ac1677f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni --- package/python-setuptools-rust/python-setuptools-rust.hash | 4 ++-- package/python-setuptools-rust/python-setuptools-rust.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.hash b/package/python-setuptools-rust/python-setuptools-rust.hash index a93e98e8c8..6bb42d918c 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.hash +++ b/package/python-setuptools-rust/python-setuptools-rust.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-rust/json -md5 33c3fd3bcde2877483ab782353bee54c setuptools-rust-0.12.1.tar.gz -sha256 647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e setuptools-rust-0.12.1.tar.gz +md5 479fcd267ff48929bec9a7270e1a96d7 setuptools-rust-1.1.2.tar.gz +sha256 a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1 setuptools-rust-1.1.2.tar.gz # Locally computed sha256 checksums sha256 b20668c1590582b3882854050ccfbdb7aee1f71a1ffe9eacc4c5aeb08a14161b LICENSE diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index fe299e8057..c87a0da3c7 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_SETUPTOOLS_RUST_VERSION = 0.12.1 +PYTHON_SETUPTOOLS_RUST_VERSION = 1.1.2 PYTHON_SETUPTOOLS_RUST_SOURCE = setuptools-rust-$(PYTHON_SETUPTOOLS_RUST_VERSION).tar.gz -PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/12/22/6ba3031e7cbd6eb002e13ffc7397e136df95813b6a2bd71ece52a8f89613 +PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-setuptools-scm host-python-toml host-python-semantic-version +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-setuptools-scm host-python-toml host-python-semantic-version host-python-typing-extensions HOST_PYTHON_SETUPTOOLS_RUST_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:15:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:15:19 +0100 Subject: [Buildroot] [git commit] package/python-typing-extensions: add host variant Message-ID: <20220108231001.EB8AA813AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf0cc7d7b4fecde6c350bd886e7f60b95660ef10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Needed by a newer version of host-python-setuptools-rust. Signed-off-by: Thomas Petazzoni --- package/python-typing-extensions/python-typing-extensions.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 46c2977cd7..407fe99b54 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -10,5 +10,7 @@ PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/ed/12/c5 PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = setuptools PYTHON_TYPING_EXTENSIONS_LICENSE = Python-2.0 PYTHON_TYPING_EXTENSIONS_LICENSE_FILES = LICENSE +HOST_PYTHON_TYPING_EXTENSIONS_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:14:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:14:52 +0100 Subject: [Buildroot] [git commit] package/python-tomli: new package Message-ID: <20220108231001.C77C6813AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fff307fc4a4c58c8ba2faafd69614d0bb2d75a93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-tomli/Config.in | 7 +++++++ package/python-tomli/python-tomli.hash | 5 +++++ package/python-tomli/python-tomli.mk | 16 ++++++++++++++++ 5 files changed, 30 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bc07fdbde3..690a43f81b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1312,6 +1312,7 @@ F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ +F: package/python-tomli/ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ diff --git a/package/Config.in b/package/Config.in index dbfdcf6ce3..54d9f81e87 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1264,6 +1264,7 @@ menu "External python modules" source "package/python-tinyrpc/Config.in" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" + source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in new file mode 100644 index 0000000000..e1cecaaa36 --- /dev/null +++ b/package/python-tomli/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TOMLI + bool "python-tomli" + depends on BR2_PACKAGE_PYTHON3 + help + A lil' TOML parser. + + https://github.com/hukkin/tomli diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash new file mode 100644 index 0000000000..1a274c8a40 --- /dev/null +++ b/package/python-tomli/python-tomli.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tomli/json +md5 2ecbc7a23b8c8dc2fe96f588f88463d9 tomli-1.2.0.tar.gz +sha256 d60e681734099207a6add7a10326bc2ddd1fdc36c1b0f547d00ef73ac63739c2 tomli-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk new file mode 100644 index 0000000000..4e6b023ef7 --- /dev/null +++ b/package/python-tomli/python-tomli.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-tomli +# +################################################################################ + +PYTHON_TOMLI_VERSION = 1.2.0 +PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa +PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_LICENSE = MIT +PYTHON_TOMLI_LICENSE_FILES = LICENSE +HOST_PYTHON_TOMLI_NEEDS_HOST_PYTHON = python3 + +$(eval $(python-package)) +$(eval $(host-python-package)) From yann.morin.1998 at free.fr Sat Jan 8 23:17:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 00:17:09 +0100 Subject: [Buildroot] [git commit] package/libbsd: bump to version 0.11.3 Message-ID: <20220108231108.F1D18813F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcaed85304d14d3d0a8020e17af2d6daeca0be58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update indentation in hash file (two spaces) - Update hash of COPYING: - files added and year updated with https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/01f0d1ea1e71f1018a009ebd9203dd48e6d90c45 https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/37a9b56c05339301510213c41fc507ea31cc2464 https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/d54ceb37ce9d7c04fa450a6638eaee31375bbde1 - files removed with https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/847e682f8de452d5f0038458f06ae68ae3959b3a - libmmd is a mandatory dependency since version 0.11 and https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/847e682f8de452d5f0038458f06ae68ae3959b3a https://lists.freedesktop.org/archives/libbsd/2021-February/000298.html https://lists.freedesktop.org/archives/libbsd/2021-February/000302.html https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libbsd/Config.in | 1 + package/libbsd/libbsd.hash | 6 +++--- package/libbsd/libbsd.mk | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index 845a22162b..093a2e646c 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_LIBBSD depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBMD help This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 95887bd607..17bb32e01c 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,3 +1,3 @@ -# From https://lists.freedesktop.org/archives/libbsd/2019-August/000229.html -sha256 34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887 libbsd-0.10.0.tar.xz -sha256 933d14a6bc89ee1fd7adbf5b6ec97f6ff0e002549d0b0c164f8a8895371d78f8 COPYING +# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html +sha512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5 libbsd-0.11.3.tar.xz +sha256 ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864 COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 256a75f15e..86df8a97a2 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBSD_VERSION = 0.10.0 +LIBBSD_VERSION = 0.11.3 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = https://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ @@ -12,5 +12,6 @@ LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ LIBBSD_LICENSE_FILES = COPYING LIBBSD_CPE_ID_VENDOR = freedesktop LIBBSD_INSTALL_STAGING = YES +LIBBSD_DEPENDENCIES = libmd $(eval $(autotools-package)) From yann.morin.1998 at free.fr Sat Jan 8 23:17:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 00:17:09 +0100 Subject: [Buildroot] [git commit] package/libmd: new package Message-ID: <20220108231108.E7FB6813CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc232de771baf51f17f59264246d722ff241e125 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This library provides message digest functions found on BSD systems either on their libc (NetBSD, OpenBSD) or libmd (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking on others like GNU systems. https://www.hadrons.org/software/libmd/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/libmd/Config.in | 9 +++++++++ package/libmd/libmd.hash | 5 +++++ package/libmd/libmd.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 690a43f81b..3b544cae6b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -904,6 +904,7 @@ F: package/libidn2/ F: package/libjpeg/ F: package/liblockfile/ F: package/libmatroska/ +F: package/libmd/ F: package/libmpdclient/ F: package/libnetfilter_conntrack/ F: package/libnetfilter_queue/ diff --git a/package/Config.in b/package/Config.in index 54d9f81e87..378d6e8c0c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1415,6 +1415,7 @@ menu "Crypto" source "package/libgpgme/Config.in" source "package/libkcapi/Config.in" source "package/libksba/Config.in" + source "package/libmd/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libolm/Config.in" diff --git a/package/libmd/Config.in b/package/libmd/Config.in new file mode 100644 index 0000000000..63139ad69b --- /dev/null +++ b/package/libmd/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBMD + bool "libmd" + help + This library provides message digest functions found on BSD + systems either on their libc (NetBSD, OpenBSD) or libmd + (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking + on others like GNU systems. + + https://www.hadrons.org/software/libmd/ diff --git a/package/libmd/libmd.hash b/package/libmd/libmd.hash new file mode 100644 index 0000000000..1a3c9d80df --- /dev/null +++ b/package/libmd/libmd.hash @@ -0,0 +1,5 @@ +# From https://lists.freedesktop.org/archives/libbsd/2021-October/000311.html +sha512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3 libmd-1.0.4.tar.xz + +# Hash for license file +sha256 4365ef6255ad553fce69dd4bc0e093472c5d0e41b8ea493a545cc926ce171aa6 COPYING diff --git a/package/libmd/libmd.mk b/package/libmd/libmd.mk new file mode 100644 index 0000000000..19a2458982 --- /dev/null +++ b/package/libmd/libmd.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libmd +# +################################################################################ + +LIBMD_VERSION = 1.0.4 +LIBMD_SOURCE = libmd-$(LIBMD_VERSION).tar.xz +LIBMD_SITE = https://archive.hadrons.org/software/libmd +LIBMD_LICENSE = BSD-2-Clause, BSD-3-Clause, Beerware, ISC, Public Domain +LIBMD_LICENSE_FILES = COPYING +LIBMD_INSTALL_STAGING = YES + +$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Sat Jan 8 23:17:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:17:21 +0100 Subject: [Buildroot] [PATCH 1/5] package/python-tomli: new package In-Reply-To: <20220101193018.404937-1-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> Message-ID: <20220109001721.739a76ba@windsurf> On Sat, 1 Jan 2022 12:30:14 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-tomli/Config.in | 7 +++++++ > package/python-tomli/python-tomli.hash | 5 +++++ > package/python-tomli/python-tomli.mk | 16 ++++++++++++++++ > 5 files changed, 30 insertions(+) > create mode 100644 package/python-tomli/Config.in > create mode 100644 package/python-tomli/python-tomli.hash > create mode 100644 package/python-tomli/python-tomli.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 23:17:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:17:27 +0100 Subject: [Buildroot] [PATCH 2/5] package/python-pyparsing: enable host build In-Reply-To: <20220101193018.404937-2-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-2-james.hilliard1@gmail.com> Message-ID: <20220109001727.7fc225c6@windsurf> On Sat, 1 Jan 2022 12:30:15 -0700 James Hilliard wrote: > This will be required by host-python-packaging. > > Signed-off-by: James Hilliard > --- > package/python-pyparsing/python-pyparsing.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 23:17:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:17:49 +0100 Subject: [Buildroot] [PATCH 3/5] package/python-packaging: enable host build In-Reply-To: <20220101193018.404937-3-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-3-james.hilliard1@gmail.com> Message-ID: <20220109001749.6bf44252@windsurf> On Sat, 1 Jan 2022 12:30:16 -0700 James Hilliard wrote: > This is required by python-setuptools-scm. > > Signed-off-by: James Hilliard > --- > package/python-packaging/python-packaging.mk | 3 +++ > 1 file changed, 3 insertions(+) Something similar was separately applied, but had issues, so I fixed it up so that it is similar to what you had posted. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 8 23:17:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 00:17:53 +0100 Subject: [Buildroot] [PATCH 4/5] package/python-setuptools-scm: bump to version 6.3.2 In-Reply-To: <20220101193018.404937-4-james.hilliard1@gmail.com> References: <20220101193018.404937-1-james.hilliard1@gmail.com> <20220101193018.404937-4-james.hilliard1@gmail.com> Message-ID: <20220109001753.4c25ed12@windsurf> On Sat, 1 Jan 2022 12:30:17 -0700 James Hilliard wrote: > Add new host-python-packaging and host-python-tomli dependencies. > > Signed-off-by: James Hilliard > --- > package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- > package/python-setuptools-scm/python-setuptools-scm.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sat Jan 8 23:17:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 00:17:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/libmd: new package In-Reply-To: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> References: <20220108223829.3701891-1-fontaine.fabrice@gmail.com> Message-ID: <20220108231754.GI1881783@scaer> Fabrice, All, On 2022-01-08 23:38 +0100, Fabrice Fontaine spake thusly: > This library provides message digest functions found on BSD systems > either on their libc (NetBSD, OpenBSD) or libmd (FreeBSD, DragonflyBSD, > macOS, Solaris) libraries and lacking on others like GNU systems. > > https://www.hadrons.org/software/libmd/ > > Signed-off-by: Fabrice Fontaine Series of 2 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/libmd/Config.in | 9 +++++++++ > package/libmd/libmd.hash | 5 +++++ > package/libmd/libmd.mk | 14 ++++++++++++++ > 5 files changed, 30 insertions(+) > create mode 100644 package/libmd/Config.in > create mode 100644 package/libmd/libmd.hash > create mode 100644 package/libmd/libmd.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index cb06de820d..c1ccab966c 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -899,6 +899,7 @@ F: package/libidn2/ > F: package/libjpeg/ > F: package/liblockfile/ > F: package/libmatroska/ > +F: package/libmd/ > F: package/libmpdclient/ > F: package/libnetfilter_conntrack/ > F: package/libnetfilter_queue/ > diff --git a/package/Config.in b/package/Config.in > index ad542ac8bc..d8ee96a588 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1412,6 +1412,7 @@ menu "Crypto" > source "package/libgpgme/Config.in" > source "package/libkcapi/Config.in" > source "package/libksba/Config.in" > + source "package/libmd/Config.in" > source "package/libmhash/Config.in" > source "package/libnss/Config.in" > source "package/libolm/Config.in" > diff --git a/package/libmd/Config.in b/package/libmd/Config.in > new file mode 100644 > index 0000000000..63139ad69b > --- /dev/null > +++ b/package/libmd/Config.in > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_LIBMD > + bool "libmd" > + help > + This library provides message digest functions found on BSD > + systems either on their libc (NetBSD, OpenBSD) or libmd > + (FreeBSD, DragonflyBSD, macOS, Solaris) libraries and lacking > + on others like GNU systems. > + > + https://www.hadrons.org/software/libmd/ > diff --git a/package/libmd/libmd.hash b/package/libmd/libmd.hash > new file mode 100644 > index 0000000000..1a3c9d80df > --- /dev/null > +++ b/package/libmd/libmd.hash > @@ -0,0 +1,5 @@ > +# From https://lists.freedesktop.org/archives/libbsd/2021-October/000311.html > +sha512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3 libmd-1.0.4.tar.xz > + > +# Hash for license file > +sha256 4365ef6255ad553fce69dd4bc0e093472c5d0e41b8ea493a545cc926ce171aa6 COPYING > diff --git a/package/libmd/libmd.mk b/package/libmd/libmd.mk > new file mode 100644 > index 0000000000..19a2458982 > --- /dev/null > +++ b/package/libmd/libmd.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# libmd > +# > +################################################################################ > + > +LIBMD_VERSION = 1.0.4 > +LIBMD_SOURCE = libmd-$(LIBMD_VERSION).tar.xz > +LIBMD_SITE = https://archive.hadrons.org/software/libmd > +LIBMD_LICENSE = BSD-2-Clause, BSD-3-Clause, Beerware, ISC, Public Domain > +LIBMD_LICENSE_FILES = COPYING > +LIBMD_INSTALL_STAGING = YES > + > +$(eval $(autotools-package)) > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 8 23:39:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 00:39:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongrel2: bump to version 1.13.0 Message-ID: <20220108233910.114777-1-fontaine.fabrice@gmail.com> - Drop third patch (already in version) - Drop fourth patch (not needed since https://github.com/mongrel2/mongrel2/commit/8a6db3beb32da1d66757a746f440d92edff166f9) https://github.com/mongrel2/mongrel2/blob/v1.13.0/changelog.txt Signed-off-by: Fabrice Fontaine --- ...ition-error-when-building-with-gcc10.patch | 25 ---- .../0004-Support-urandom-inside-chroot.patch | 113 ------------------ package/mongrel2/mongrel2.hash | 4 +- package/mongrel2/mongrel2.mk | 2 +- 4 files changed, 3 insertions(+), 141 deletions(-) delete mode 100644 package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch delete mode 100644 package/mongrel2/0004-Support-urandom-inside-chroot.patch diff --git a/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch b/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch deleted file mode 100644 index e1b5788494..0000000000 --- a/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c51815b10c39c6e802bd1b56549f1d479b480fcc Mon Sep 17 00:00:00 2001 -From: Andrew Sun -Date: Sat, 18 Jul 2020 09:11:11 -0400 -Subject: [PATCH] fix multiple definition error when building with gcc10 - -[Retrieved from: -https://github.com/mongrel2/mongrel2/pull/343/commits/c51815b10c39c6e802bd1b56549f1d479b480fcc] -Signed-off-by: Fabrice Fontaine ---- - src/unixy.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unixy.h b/src/unixy.h -index 045e7c28..4225220c 100644 ---- a/src/unixy.h -+++ b/src/unixy.h -@@ -38,7 +38,7 @@ - #include - #include - --char *m2program; -+extern char *m2program; - - int Unixy_chroot(bstring path); - diff --git a/package/mongrel2/0004-Support-urandom-inside-chroot.patch b/package/mongrel2/0004-Support-urandom-inside-chroot.patch deleted file mode 100644 index 468ddb83fe..0000000000 --- a/package/mongrel2/0004-Support-urandom-inside-chroot.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 330e8c8352eb0ed3c178ac6e0102403c0a835492 Mon Sep 17 00:00:00 2001 -From: Jason Miller -Date: Thu, 5 Jul 2018 20:53:51 -0700 -Subject: [PATCH] Support urandom inside chroot - -This adds a new default entropy function that uses a /dev/urandom stream -opened before the chroot. If initializing that fails, it fallsback on -HAVEGE only if HAVEGE is supported by the mbedTLS. - -This should remove the hard requirement on HAVEGE - -resolves #326 -resolves #327 - -[Upstream status: https://github.com/mongrel2/mongrel2/pull/328] -Signed-off-by: Fabrice Fontaine ---- - src/mongrel2.c | 7 ------- - src/server.c | 36 +++++++++++++++++++++++------------- - 2 files changed, 23 insertions(+), 20 deletions(-) - -diff --git a/src/mongrel2.c b/src/mongrel2.c -index da632d95..48ece8a5 100644 ---- a/src/mongrel2.c -+++ b/src/mongrel2.c -@@ -404,13 +404,6 @@ void taskmain(int argc, char **argv) - rc = attempt_chroot_drop(srv); - check(rc == 0, "Major failure in chroot/droppriv, aborting."); - -- // set up rng after chroot -- // TODO: once mbedtls is updated, we can move this back into Server_create -- if(srv->use_ssl) { -- rc = Server_init_rng(srv); -- check(rc == 0, "Failed to initialize rng for server %s", bdata(srv->uuid)); -- } -- - final_setup(); - - taskcreate(tickertask, NULL, TICKER_TASK_STACK); -diff --git a/src/server.c b/src/server.c -index 45761db4..e44e199b 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -149,35 +149,45 @@ static int Server_load_ciphers(Server *srv, bstring ssl_ciphers_val) - return -1; - } - -+static int urandom_entropy_func(void *data, unsigned char *output, size_t len) -+{ -+ FILE* urandom = (FILE *)data; -+ size_t rc = fread(output, 1, len, urandom); -+ -+ if (rc != len) return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED; -+ -+ return 0; -+} -+ - int Server_init_rng(Server *srv) - { - int rc; -- unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE]; - void *ctx = NULL; - -- mbedtls_entropy_init( &srv->entropy ); -+ FILE *urandom = fopen("/dev/urandom","r"); - -- // test the entropy source -- rc = mbedtls_entropy_func(&srv->entropy, buf, MBEDTLS_ENTROPY_BLOCK_SIZE); -- -- if(rc == 0) { -+ if(urandom != NULL) { - ctx = calloc(sizeof(mbedtls_ctr_drbg_context), 1); - - mbedtls_ctr_drbg_init((mbedtls_ctr_drbg_context *)ctx); - rc = mbedtls_ctr_drbg_seed((mbedtls_ctr_drbg_context *)ctx, -- mbedtls_entropy_func, &srv->entropy, NULL, 0); -+ urandom_entropy_func, urandom, NULL, 0); - check(rc == 0, "Init rng failed: ctr_drbg_init returned %d\n", rc); - - srv->rng_func = mbedtls_ctr_drbg_random; - srv->rng_ctx = ctx; - } else { -- log_warn("entropy source unavailable. falling back to havege rng"); - -+#if defined(MBEDTLS_HAVEGE_C) -+ log_warn("entropy source unavailable. falling back to havege rng"); - ctx = calloc(sizeof(mbedtls_havege_state), 1); - mbedtls_havege_init((mbedtls_havege_state *)ctx); -- - srv->rng_func = mbedtls_havege_random; - srv->rng_ctx = ctx; -+#else -+ log_err("Unable to initialize urandom entropy source, and mbedTLS compiled without HAVEGE"); -+ goto error; -+#endif - } - - return 0; -@@ -278,10 +288,10 @@ Server *Server_create(bstring uuid, bstring default_host, - - // TODO: once mbedtls supports opening urandom early and keeping it open, - // put the rng initialization back here (before chroot) -- //if(use_ssl) { -- // rc = Server_init_rng(srv); -- // check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); -- //} -+ if(use_ssl) { -+ rc = Server_init_rng(srv); -+ check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); -+ } - - if(blength(chroot) > 0) { - srv->chroot = bstrcpy(chroot); check_mem(srv->chroot); diff --git a/package/mongrel2/mongrel2.hash b/package/mongrel2/mongrel2.hash index ea3a1cb426..f4f094ea03 100644 --- a/package/mongrel2/mongrel2.hash +++ b/package/mongrel2/mongrel2.hash @@ -1,6 +1,6 @@ # From https://mongrel2.org -sha1 6f81fa747a1e198d1a655c3677b6de686a5a51f7 mongrel2-v1.12.2.tar.bz2 +sha1 6057f9cbfae41e2cdef1e0f715df3c1a4d3a1884 mongrel2-v1.13.0.tar.bz2 # Locally computed -sha256 3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f mongrel2-v1.12.2.tar.bz2 +sha256 b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10 mongrel2-v1.13.0.tar.bz2 sha256 eb6e2a2baa637d06f6aa762886fbc8939934eb5fdb0b3a5b3882f2a61e9a4357 LICENSE diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk index cbe7e3fb91..07914ad0fe 100644 --- a/package/mongrel2/mongrel2.mk +++ b/package/mongrel2/mongrel2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGREL2_VERSION = 1.12.2 +MONGREL2_VERSION = 1.13.0 MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2 # Do not use the github helper here, the generated tarball is *NOT* the same # as the one uploaded by upstream for the release. -- 2.34.1 From james.hilliard1 at gmail.com Sun Jan 9 03:55:59 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:55:59 -0700 Subject: [Buildroot] [PATCH v3 1/3] package/python-pep517: new package In-Reply-To: <20220109035601.2483360-1-james.hilliard1@gmail.com> References: <20220109035601.2483360-1-james.hilliard1@gmail.com> Message-ID: <20220109035601.2483360-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-pep517/python-pep517.hash | 5 +++++ package/python-pep517/python-pep517.mk | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/python-pep517/python-pep517.hash create mode 100644 package/python-pep517/python-pep517.mk diff --git a/package/python-pep517/python-pep517.hash b/package/python-pep517/python-pep517.hash new file mode 100644 index 0000000000..4dd4c47fa0 --- /dev/null +++ b/package/python-pep517/python-pep517.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pep517/json +md5 7ed0adb5f737c316e071d48d66329a5d pep517-0.12.0.tar.gz +sha256 931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 pep517-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk new file mode 100644 index 0000000000..da0431a637 --- /dev/null +++ b/package/python-pep517/python-pep517.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pep517 +# +################################################################################ + +PYTHON_PEP517_VERSION = 0.12.0 +PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz +PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 +PYTHON_PEP517_LICENSE = MIT +PYTHON_PEP517_LICENSE_FILES = LICENSE +PYTHON_PEP517_SETUP_TYPE = distutils +HOST_PYTHON_PEP517_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli + +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 03:56:00 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:56:00 -0700 Subject: [Buildroot] [PATCH v3 2/3] package/python-pypa-build: new package In-Reply-To: <20220109035601.2483360-1-james.hilliard1@gmail.com> References: <20220109035601.2483360-1-james.hilliard1@gmail.com> Message-ID: <20220109035601.2483360-3-james.hilliard1@gmail.com> Due to a namespace clash with python-build we need to use a different package name. Signed-off-by: James Hilliard --- .../python-pypa-build/python-pypa-build.hash | 5 +++++ .../python-pypa-build/python-pypa-build.mk | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 package/python-pypa-build/python-pypa-build.hash create mode 100644 package/python-pypa-build/python-pypa-build.mk diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash new file mode 100644 index 0000000000..c7daedc6b3 --- /dev/null +++ b/package/python-pypa-build/python-pypa-build.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/build/json +md5 ec3dbe55359ee735b45766b30dfad877 build-0.7.0.tar.gz +sha256 1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f build-0.7.0.tar.gz +# Locally computed sha256 checksums +sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk new file mode 100644 index 0000000000..6babade672 --- /dev/null +++ b/package/python-pypa-build/python-pypa-build.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-pypa-build +# +################################################################################ + +PYTHON_PYPA_BUILD_VERSION = 0.7.0 +PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b775216bb1f34962beaf005f38460c6161177fef6e068a7a0c30a1597 +PYTHON_PYPA_BUILD_LICENSE = MIT +PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE +PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools +HOST_PYTHON_PYPA_BUILD_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ + host-python-packaging \ + host-python-pep517 \ + host-python-tomli + +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 03:55:58 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:55:58 -0700 Subject: [Buildroot] [PATCH v3 0/3] PEP517 host packages Message-ID: <20220109035601.2483360-1-james.hilliard1@gmail.com> This series adds host packages that will be used for PEP517 based python-package infrastructure in a future series. See: https://www.python.org/dev/peps/pep-0517/ --- Changes v2 -> v3: - rebase on master James Hilliard (3): package/python-pep517: new package package/python-pypa-build: new package package/python-installer: new package .../python-installer/python-installer.hash | 5 +++++ package/python-installer/python-installer.mk | 15 +++++++++++++++ package/python-pep517/python-pep517.hash | 5 +++++ package/python-pep517/python-pep517.mk | 16 ++++++++++++++++ .../python-pypa-build/python-pypa-build.hash | 5 +++++ .../python-pypa-build/python-pypa-build.mk | 19 +++++++++++++++++++ 6 files changed, 65 insertions(+) create mode 100644 package/python-installer/python-installer.hash create mode 100644 package/python-installer/python-installer.mk create mode 100644 package/python-pep517/python-pep517.hash create mode 100644 package/python-pep517/python-pep517.mk create mode 100644 package/python-pypa-build/python-pypa-build.hash create mode 100644 package/python-pypa-build/python-pypa-build.mk -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 03:56:01 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:56:01 -0700 Subject: [Buildroot] [PATCH v3 3/3] package/python-installer: new package In-Reply-To: <20220109035601.2483360-1-james.hilliard1@gmail.com> References: <20220109035601.2483360-1-james.hilliard1@gmail.com> Message-ID: <20220109035601.2483360-4-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-installer/python-installer.hash | 5 +++++ package/python-installer/python-installer.mk | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/python-installer/python-installer.hash create mode 100644 package/python-installer/python-installer.mk diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash new file mode 100644 index 0000000000..68af457664 --- /dev/null +++ b/package/python-installer/python-installer.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/installer/json +md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz +sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk new file mode 100644 index 0000000000..2c1d371dab --- /dev/null +++ b/package/python-installer/python-installer.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-installer +# +################################################################################ + +PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_LICENSE = MIT +PYTHON_INSTALLER_LICENSE_FILES = LICENSE +PYTHON_INSTALLER_SETUP_TYPE = distutils +HOST_PYTHON_INSTALLER_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 03:59:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 20:59:35 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-argon2-cffi-bindings: new package Message-ID: <20220109035935.2698421-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - rebase on master --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-argon2-cffi-bindings/Config.in | 11 ++++++++ .../python-argon2-cffi-bindings.hash | 5 ++++ .../python-argon2-cffi-bindings.mk | 25 +++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/python-argon2-cffi-bindings/Config.in create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3b544cae6b..c5186e029a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1291,6 +1291,7 @@ F: package/python-aiorwlock/ F: package/python-aiosignal/ F: package/python-aiozipkin/ F: package/python-argon2-cffi/ +F: package/python-argon2-cffi-bindings/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-bidict/ diff --git a/package/Config.in b/package/Config.in index 378d6e8c0c..bc2113765b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -925,6 +925,7 @@ menu "External python modules" source "package/python-ansicolors/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" + source "package/python-argon2-cffi-bindings/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in new file mode 100644 index 0000000000..3d409759e0 --- /dev/null +++ b/package/python-argon2-cffi-bindings/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS + bool "python-argon2-cffi-bindings" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU # libargon2 + depends on !BR2_STATIC_LIBS # libargon2 + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_LIBARGON2 + help + Low-level CFFI bindings for Argon2. + + https://github.com/hynek/argon2-cffi-bindings diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash new file mode 100644 index 0000000000..e088d3dad1 --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/argon2-cffi-bindings/json +md5 f1591e1af7dea9ef3e5b982e2c196c1d argon2-cffi-bindings-21.2.0.tar.gz +sha256 bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 argon2-cffi-bindings-21.2.0.tar.gz +# Locally computed sha256 checksums +sha256 9c158d4f433627f48ac24b6b4d37970afe4172514673c5318014d7cca157c6df LICENSE diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk new file mode 100644 index 0000000000..f0d71e803a --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# python-argon2-cffi-bindings +# +################################################################################ + +PYTHON_ARGON2_CFFI_BINDINGS_VERSION = 21.2.0 +PYTHON_ARGON2_CFFI_BINDINGS_SOURCE = argon2-cffi-bindings-$(PYTHON_ARGON2_CFFI_BINDINGS_VERSION).tar.gz +PYTHON_ARGON2_CFFI_BINDINGS_SITE = https://files.pythonhosted.org/packages/b9/e9/184b8ccce6683b0aa2fbb7ba5683ea4b9c5763f1356347f1312c32e3c66e +PYTHON_ARGON2_CFFI_BINDINGS_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE = MIT +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE_FILES = LICENSE +PYTHON_ARGON2_CFFI_BINDINGS_DEPENDENCIES = \ + host-python-cffi \ + host-python-setuptools-scm \ + libargon2 +PYTHON_ARGON2_CFFI_BINDINGS_ENV = ARGON2_CFFI_USE_SYSTEM=1 + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=1 +else +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=0 +endif + +$(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 06:36:01 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 23:36:01 -0700 Subject: [Buildroot] [PATCH 1/1] core/pkg-utils: add missing bracket Message-ID: <20220109063601.4133447-1-james.hilliard1@gmail.com> This appears to have been incorrectly removed in: 03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df Fixes: package/pkg-utils.mk:212: *** unterminated call to function 'foreach': missing ')'. Stop. make: *** [Makefile:84: _all] Error 2 Signed-off-by: James Hilliard --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 6aa64a2096..df55ab685b 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -214,7 +214,7 @@ define per-package-rsync $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3) + $(3)) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 9 06:44:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 8 Jan 2022 23:44:06 -0700 Subject: [Buildroot] [PATCH v2 1/1] core/pkg-utils: add missing bracket/sep Message-ID: <20220109064406.122409-1-james.hilliard1@gmail.com> This appears to have been incorrectly removed in: 03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df Fixes: package/pkg-utils.mk:212: *** unterminated call to function 'foreach': missing ')'. Stop. make: *** [Makefile:84: _all] Error 2 Signed-off-by: James Hilliard --- Changes v1 -> v2: - add sep as well --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 6aa64a2096..7d1aea7710 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -214,7 +214,7 @@ define per-package-rsync $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3) + $(3)$(sep)) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current -- 2.25.1 From thomas.petazzoni at bootlin.com Sun Jan 9 07:08:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 09 Jan 2022 07:08:08 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-08 Message-ID: <20220109070813.5796960A93@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-01-08 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 59 | 10 | 0 | 69 | 2021.11.x | 26 | 2 | 0 | 28 | master | 114 | 53 | 0 | 167 | Classification of failures by reason for master ----------------------------------------------- unknown | 8 rygel-0.40.2 | 7 frr-8.1 | 4 gstreamer1-mm-1.10.0 | 3 host-file-5.41 | 3 wavemon-0.9.4 | 3 host-btrfs-progs-5.15.1 | 2 poppler-21.12.0 | 2 rtorrent-0.9.8 | 2 safeclib-02092020 | 2 apcupsd-3.14.14 | 1 bluez5_utils-5.63 | 1 efl-1.26.0 | 1 file-5.41 | 1 google-breakpad-7515ab13768... | 1 hiawatha-11.1 | 1 ksmbd-tools-3.4.3 | 1 libcamera-40f5fddca7f774944... | 1 libest-3.2.0 | 1 libupnp-1.14.12 | 1 log4cxx-0.12.0 | 1 ndisc6-1.0.5 | 1 pcsc-lite-1.9.5 | 1 qt5webkit-5.212.0-alpha4 | 1 rabbitmq-server-3.8.2 | 1 tpm2-pkcs11-1.7.0 | 1 trinity-1.9 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/89405f6a1516c8eb30cba204753113d635c12db6 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/5cb75bd1fe0e21c53db9fe092d59d392f85dd933 | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/748bae634f8f968447473efccfb9546d20f435d6 | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/9e7868be00f2cd18205b2ce664be95f8b9e2b063 | ORPH mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b6afa559edbea07a73571d84cb6733f07c2fe234 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f2c10861616442974e441f6315a813d93297a2b5 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a901769c168d704b30ace5be43f9cb8ce4d34502 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2b4c58ec3fb0567de0fb334a24f86b6815406fb4 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/f923a7262425961343dcca992007458b2ec7746f | arm | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/f55df28f1b7174f7606a75f00090334541c0873c | ORPH i686 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/cba0f064628ce842ac21aacb60aad767fd62440c | ORPH riscv32 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/8dd0ef5864a66a4b13819c855b6b349d3db840fd | ORPH aarch64 | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/51f5c021e8e67ffba1a0d1e77db5cb1dd6ea0474 | or1k | host-btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/03235edd829436d784a9b214050cc97584f372fb | ORPH powerpc | host-btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/3677d943d048915c0fcd81ab9666dbf792962f4d | ORPH powerpc | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/47c7d17c343dec2a8a534d15f44f53ab3aa06f41 | ORPH mips64el | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/9573e8b01d8f21cd89a67475daabdeef533d31d7 | ORPH arm | host-file-5.41 | NOK | http://autobuild.buildroot.net/results/c35b141140c0bd600753b9596482ceeb1935e49f | ORPH xtensa | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/a1806b5aede0c92ff13b4846157dec654abe217e | i686 | libcamera-40f5fddca7f774944... | NOK | http://autobuild.buildroot.net/results/3155e9c22d3789efd16724e9d0098909c6be4876 | nios2 | libest-3.2.0 | NOK | http://autobuild.buildroot.net/results/5a12f1cb4153834078522b6068ff24ac0300d51d | or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/585ea0a093280a522b5aaaf0947b9d4588815eef | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/be07b31f6b8ecb49921be154a30aab3721cce94a | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/ed78a5c7621b324944fc2121306844127c7a95a9 | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/ba29ee57ff8a329c05f7a29a97a18a9768b6237c | ORPH x86_64 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/67102ac2716b3cd19c092fe6381dea035a213a12 | arc | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/9610685ab49a9739a8cc4c748da64d07647c4668 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/eefcf9badadbbec8c756c8161407f51f421bb7ee | riscv64 | rabbitmq-server-3.8.2 | NOK | http://autobuild.buildroot.net/results/e6c743af815948f90960e294a615af4294bead82 | i586 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/98e698ce57ea85737fc72322d036a76495dda75d | ORPH arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/30e60c354c918acbcec23ccb74b8a7d3ff1fce1d | ORPH xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/910b583f1e2007c19ccc9470e98bdea4d32e2440 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1f7ca12def09125503898d95c11ddb8cbeec6f0b | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/42319fbb0a43f2473127447ccc4b3585b5b53b3f | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/830608ff93a7bb3600de3e6ffabd1dfabf880867 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c02ec04c71a4c1c3d67666a9a6f267b1987f5feb | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/45396bce4f40bf01d21c044be0ba4384bebc97c6 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5f99e3fde4402e1324e5a453396c71c8608420b6 | m68k | safeclib-02092020 | NOK | http://autobuild.buildroot.net/results/a481ee2d26a094358b0298617cce691be3077f22 | arm | safeclib-02092020 | NOK | http://autobuild.buildroot.net/results/fc9e4dd08b653af1fd988323eb20293d5dbb579c | or1k | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/51009a0e648813833f5102ac3f9ab8979ef91929 | mipsel | trinity-1.9 | NOK | http://autobuild.buildroot.net/results/bf78e4be9b9d9ca7d32f922d72ea6cd39a78d3d8 | ORPH sparc | unknown | NOK | http://autobuild.buildroot.net/results/e32211fbfbbd5b614f582d12b988d48a69ae85ca | arm | unknown | NOK | http://autobuild.buildroot.net/results/234779f7136c72af997a09d61b9201762834b1e6 | or1k | unknown | NOK | http://autobuild.buildroot.net/results/60c7eff8810c4d0bc057cfabed2e0311dc860ee9 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/ad8691bef1cbe03de2ebf7574105948d103a1ec4 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/4abea4e63c0a9244a8aa22e3d2cfe48dce877540 | arm | unknown | NOK | http://autobuild.buildroot.net/results/093729bba8788bd4cbe33fd7a651028d6a23c485 | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/3b71087f743d4d0b23eb4ac52cd741eba0370d87 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/41cabe55edf3c0e8321f77066a47b454d5ef8caf | powerpc64le | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/776f0bbdae9db3dd940f4b29858c21c9fc325e32 | xtensa | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9486bbc10ceff9fe9a3de00dcbc280b14de2433c | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0dc3298e1125708cafeb56dd95ffcfd035ea2ca3 | Classification of failures by reason for 2021.02.x -------------------------------------------------- monkey-f54856ce250c4e257354... | 2 ndisc6-1.0.4 | 2 glib-networking-2.66.0 | 1 host-sentry-cli-1.57.0 | 1 mesa3d-20.3.5 | 1 openal-1.20.1 | 1 rocksdb-6.13.3 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/fd6dc9122a2d6d88afb92d1ef0f193b98ada3522 | ORPH microblazeel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/55b24023a7f28af397499b4f8e33a67d889b6d07 | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/a85c36357e364c6370e76b7ea5e947c6099520cd | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/92c5e7a376afe3161f330b2e2267b1bf89f9d7d9 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/623c67cb53a1b62f7d3be9616936127cbbbd2809 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/3d641651e7b4a869461d02eff169df1b5bbe9d6b | ORPH arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/90c75c76205cd84d72c4d527cea8dca41a46c330 | ORPH or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/012d4bd6c596593389650457bda967e7c9eb7293 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/09d43fc0bd1a8df8b8a4ae740836213149df3991 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/4ef4f5e434ee4a52c508540732cc50f2a6a0f747 | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 libqmi-1.30.2 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/ec1be36aea617d496b21c92d18593b9675dc8b18 | powerpc64le | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/e17210a5131de2ad56fe539944e39bba02c05847 | -- http://autobuild.buildroot.net From arnout at mind.be Sun Jan 9 07:26:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 08:26:51 +0100 Subject: [Buildroot] [git commit] core/pkg-utils: add missing bracket/sep Message-ID: <20220109072048.8FA0082962@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e27a700f3e140015c02be05853d94b7f3dcc0f28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This appears to have been incorrectly removed in: 03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df Fixes: package/pkg-utils.mk:212: *** unterminated call to function 'foreach': missing ')'. Stop. make: *** [Makefile:84: _all] Error 2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 6aa64a2096..7d1aea7710 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -214,7 +214,7 @@ define per-package-rsync $(foreach pkg,$(1),\ rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ - $(3) + $(3)$(sep)) endef # prepares the per-package HOST_DIR and TARGET_DIR of the current From arnout at mind.be Sun Jan 9 07:27:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 08:27:10 +0100 Subject: [Buildroot] [PATCH v2 1/1] core/pkg-utils: add missing bracket/sep In-Reply-To: <20220109064406.122409-1-james.hilliard1@gmail.com> References: <20220109064406.122409-1-james.hilliard1@gmail.com> Message-ID: On 09/01/2022 07:44, James Hilliard wrote: > This appears to have been incorrectly removed in: > 03aa3e6ac71a0fe1ff87fe192c8de0b1acebd0df > > Fixes: > package/pkg-utils.mk:212: *** unterminated call to function 'foreach': missing ')'. Stop. > make: *** [Makefile:84: _all] Error 2 > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - add sep as well > --- > package/pkg-utils.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk > index 6aa64a2096..7d1aea7710 100644 > --- a/package/pkg-utils.mk > +++ b/package/pkg-utils.mk > @@ -214,7 +214,7 @@ define per-package-rsync > $(foreach pkg,$(1),\ > rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ > $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ > - $(3) > + $(3)$(sep)) > endef > > # prepares the per-package HOST_DIR and TARGET_DIR of the current > From peter at korsgaard.com Sun Jan 9 07:44:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 08:44:36 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/iwd: enable required kernel dependencies In-Reply-To: <20211204234005.2051254-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 4 Dec 2021 16:40:05 -0700") References: <20211204234005.2051254-1-james.hilliard1@gmail.com> Message-ID: <874k6de4kb.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Required kernel options are listed in check_crypto() in srv/main.c: > https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/src/main.c?h=1.20#n268 > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - remove optional kconfig options > - remove a duplicate option Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 07:42:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 08:42:47 +0100 Subject: [Buildroot] [git commit] package/iwd: enable required kernel dependencies Message-ID: <20220109073836.1833282A01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c12a6bf51bc4b166948b4392e96344259a64778 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Required kernel options are listed in check_crypto() in srv/main.c: https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/src/main.c?h=1.20#n268 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/iwd/iwd.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 7b122811c5..42f176b05b 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -63,4 +63,27 @@ define IWD_INSTALL_INIT_SYSV ln -sf /tmp/iwd/hotspot $(TARGET_DIR)/var/lib/iwd/hotspot endef +define IWD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_ASYMMETRIC_KEY_TYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_AES) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_CBC) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_CMAC) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_DES) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_ECB) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_HMAC) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MD4) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MD5) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_SHA1) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_SHA256) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_SHA512) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_USER_API_HASH) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_USER_API_SKCIPHER) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEY_DH_OPERATIONS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PKCS7_MESSAGE_PARSER) + $(call KCONFIG_ENABLE_OPT,CONFIG_PKCS8_PRIVATE_KEY_PARSER) + $(call KCONFIG_ENABLE_OPT,CONFIG_X509_CERTIFICATE_PARSER) +endef + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Sun Jan 9 08:01:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 09:01:22 +0100 Subject: [Buildroot] [PATCH 1/2] arch/Config.in.x86: add option for -march=x86-64 Message-ID: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> We already have support for a wide range of x86-64 CPUs, but we don't have any option to build for the most generic possible x86-64 CPU, as made available by the -march=x86-64 GCC option. This commit makes this option available in Buildroot. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 7aae3cafb7..794d808d96 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -81,6 +81,16 @@ config BR2_x86_prescott select BR2_X86_CPU_HAS_SSE select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 +config BR2_x86_x86_64 + bool "x86-64" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + help + This option corresponds to -march=x86-64, documented as a + "Generic CPU with 64-bit extensions" by the GCC + documentation. It is a 64-bit CPU with MMX, SSE and SSE2 + support. config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -281,6 +291,7 @@ config BR2_GCC_TARGET_ARCH default "pentium3" if BR2_x86_pentium3 default "pentium4" if BR2_x86_pentium4 default "prescott" if BR2_x86_prescott + default "x86-64" if BR2_x86_x86_64 default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 -- 2.33.1 From thomas.petazzoni at bootlin.com Sun Jan 9 08:01:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 09:01:23 +0100 Subject: [Buildroot] [PATCH 2/2] arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4 In-Reply-To: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> References: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> Message-ID: <20220109080124.2271241-2-thomas.petazzoni@bootlin.com> In the face of the vast amount of x86-64 CPU architecture variants, Linux distributions have worked together to define "micro-architecture levels" in the x86-64 psABI, called x86-64-v2, x86-64-v3 and x86-64-v4. They standardize a set of CPU features, and GCC since its version 11.x has support for these micro-architecture levels as -march= options. It makes sense to support them in Buildroot, especially for those who want to build toolchains that aim at targeting a reasonably broad family of x86-64 processors. More details: https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 794d808d96..153c8bad38 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -91,6 +91,63 @@ config BR2_x86_x86_64 "Generic CPU with 64-bit extensions" by the GCC documentation. It is a 64-bit CPU with MMX, SSE and SSE2 support. +config BR2_x86_x86_64_v2 + bool "x86-64-v2" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v2 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is close to the Nehalem CPU architecture, and is + applicable for CPUs that support CMPXCHG16B, LAHF-SAHF, + POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3. +config BR2_x86_x86_64_v3 + bool "x86-64-v3" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v3 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is close to the Haswell CPU architecture, and is + applicable for CPUs that support all of x86-64-v2 plus AVX, + AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE. +config BR2_x86_x86_64_v4 + bool "x86-64-v4" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v4 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is applicable for CPUs that support all of x86-64-v3 plus + AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL. config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -292,6 +349,9 @@ config BR2_GCC_TARGET_ARCH default "pentium4" if BR2_x86_pentium4 default "prescott" if BR2_x86_prescott default "x86-64" if BR2_x86_x86_64 + default "x86-64-v2" if BR2_x86_x86_64_v2 + default "x86-64-v3" if BR2_x86_x86_64_v3 + default "x86-64-v4" if BR2_x86_x86_64_v4 default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 -- 2.33.1 From arnout at mind.be Sun Jan 9 08:04:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 09:04:48 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/systemd: add support for creating journal catalog DB In-Reply-To: <6025dff1-66cb-f56e-21ad-41042efc5517@mind.be> References: <20201126144745.502228-1-nolange79@gmail.com> <6025dff1-66cb-f56e-21ad-41042efc5517@mind.be> Message-ID: On 08/01/2022 23:38, Arnout Vandecappelle wrote: > > > On 08/01/2022 22:46, Norbert Lange wrote: >> Am Sa., 8. Jan. 2022 um 20:41 Uhr schrieb Arnout Vandecappelle : >>> >>> ?? Hi Norbert, >>> >>> On 26/11/2020 15:47, Norbert Lange wrote: >>>> journald supports catalog files, or rather a binary database of >>>> those. >>>> Functionality added includes: >>>> >>>> -?? A config option allows enabling the binary database. >>>> >>>> -?? if the option is enabled, the database is built and moved to >>>> ????? /usr/share/factory. A symlink is created in /var pointing to >>>> ????? that file. >>>> ????? If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the >>>> ????? language whitelist are deleted first. >>>> >>>> -?? the service normally used for creating the DB during boot, >>>> ????? and the catalog source files used as input are deleted. >>>> >>>> The move to /usr/share/factory is helpful for having /usr as whole >>>> system distribution. >>>> >>>> Signed-off-by: Norbert Lange >>> >>> ?? I was going to apply a second time, but then I noticed that I made some >>> comments on v2 [1] that you haven't answered to and I still think they're >>> valid. >>> So I've marked this patch as Changes Requested. >> >> I did reply and cover the comments in [2], not sure whats missing? >> Separating into 2 independent patches is not really helpfull IMHO. > > ?Oops, you're right. I'll look at the patch again tomorrow morning. ?As promised, I applied to master now. I changed the commit message quite a bit to (hopefully) better explain what is going on. package/systemd: add support for creating journal catalog DB ???journald supports catalog files, or rather a binary database of ???those. ???Functionality added includes: ???- ??A config option allows enabling the binary database. ???- ??If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the ???????language whitelist are deleted first. This is done independently ???????of the new option, since the catalogs are removed later anyway. ???- ??If the option is enabled, the database is built and moved to ???????/usr/share/factory. This makes sure that /usr contains the entire ???????system. A symlink is created in /var pointing to that file. ???- ??The catalog source files are deleted. They serve no purpose on the ???????target once the database exists. ???- ??All of the above is done in a ROOTFS_PRE_CMD_HOOK rather than in the ???????build/install step, because other packages than systemd itself may ???????also install catalogs. This also makes sure that it is possible to ???????do a re-build, because the catalog files are not removed in ???????$(TARGET_DIR) itself, only in the temporary copy for rootfs creation. ???- ??The service normally used for creating the DB during boot is ???????deleted. If the DB is not enabled, we also don't want to waste time ???????and space on re-generating every boot. Conversely, if the DB is ???????enabled, it is already there so doesn't need to be re-done on every ???????boot either. ???The new option depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW because ???if the rootfs is not RW, /var is overmounted with a tmpfs. The factory ???should handle this, but this only half-works [1]. ???[1] http://lists.busybox.net/pipermail/buildroot/2020-July/287016.html ???Signed-off-by: Norbert Lange ???Reviewed-by: Je?re?my Rosen ???Reviewed-by: Adam Duskett ???Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ?Two remarks about this: - By digging deeply into the mailing list archives, I discovered that in fact Je?re?my and Adam had already approved this patch. In this case, it helps a lot if you carry the Reviewed-by tag in follow-up versions. With a Reviewed-by we can have a lot more confidence about applying something (that we don't fully understand anyway). And you can't expect the maintainers to either remember everything that was ever posted on the list, or to go digging through the mailing list to find such details (we often do do that, but it's exactly because we have to do that that it takes a long time before patches get applied). - In the patch changelog, it helps if you mention that a change is due to a review request, e.g.: v2->v3: - use backticks instead of $$() [Arnout] ?And one final thing. This BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW thing is really shitty. I hope we can one day have a properly working systemd with readonly rootfs... ?Regards, ?Arnout > > ?Regards, > ?Arnout > >> >>> >>> ?? If you respin, please also include in the commit message the additional >>> explanations you made in reply to Romain. >>> >>> ?? Regards, >>> ?? Arnout >>> >>> [1] >>> https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ >>> >>> >>>> --- >>>> v1->v2: >>>> -?? Moved all logic into systemd.mk >>>> -?? solved the LOCALE_PURGE order that way >>>> -?? use the factory to store the file >>>> -?? option to enable the DB (similar to udev HWDB) >>>> -?? cant be anabled with !ROOTFS_RW, tons of >>>> ????? issues with that one >>>> v2->v3: >>>> -?? use backticks instead of $$() >>>> -?? be more explicit about what happens in >>>> ????? SYSTEMD_LOCALE_PURGE_CATALOGS >>>> >>>> Signed-off-by: Norbert Lange >>>> --- >>>> ?? package/systemd/Config.in? | 14 +++++++++++++ >>>> ?? package/systemd/systemd.mk | 41 ++++++++++++++++++++++++++++++++++++++ >>>> ?? 2 files changed, 55 insertions(+) >>>> >>>> diff --git a/package/systemd/Config.in b/package/systemd/Config.in >>>> index ec34478e3d..d576e6035b 100644 >>>> --- a/package/systemd/Config.in >>>> +++ b/package/systemd/Config.in >>>> @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD >>>> >>>> http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands >>>> >>>> +config BR2_PACKAGE_SYSTEMD_CATALOGDB >>>> +???? bool "enable journal catalog database installation" >>>> +???? depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting >>>> tmpfiles magic >>>> +???? help >>>> +?????? Build and install the journal catalog database. >>>> + >>>> +?????? catalog files are used to provide extended and potentially localized >>>> +?????? messages for the journal. >>>> + >>>> +?????? The original catalog files will be built into a DB at >>>> +?????? /usr/share/factory/var/lib/systemd/catalog/database. >>>> + >>>> + https://www.freedesktop.org/wiki/Software/systemd/catalog/ >>>> + >>>> ?? config BR2_PACKAGE_SYSTEMD_LOCALED >>>> ?????? bool "enable locale daemon" >>>> ?????? help >>>> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >>>> index cb12f667d6..ae99c02abf 100644 >>>> --- a/package/systemd/systemd.mk >>>> +++ b/package/systemd/systemd.mk >>>> @@ -613,6 +613,47 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD >>>> ?????? $(SYSTEMD_INSTALL_NETWORK_CONFS) >>>> ?? endef >>>> >>>> +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) >>>> +define SYSTEMD_LOCALE_PURGE_CATALOGS >>>> +???? # go through all files with scheme ..catalog >>>> +???? # and remove those where is not in LOCALE_NOPURGE >>>> +???? for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name >>>> '*.*.catalog'`; \ >>>> +???? do \ >>>> +???????????? basename=$${cfile##*/}; \ >>>> +???????????? basename=$${basename%.catalog}; \ >>>> +???????????? langext=$${basename#*.}; \ >>>> +???????????? [ "$$langext" = "$${basename}" ] && continue; \ >>>> +???????????? expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && >>>> continue; \ >>>> +???????????? rm -f "$$cfile"; \ >>>> +???? done >>>> +endef >>>> + >>>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS >>>> +endif >>>> + >>>> +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) >>>> +define SYSTEMD_UPDATE_CATALOGS >>>> +???? $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog >>>> +???? install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ >>>> + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database >>>> +???? rm $(TARGET_DIR)/var/lib/systemd/catalog/database >>>> +???? ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ >>>> +???????????? $(TARGET_DIR)/var/lib/systemd/catalog/database >>>> +???? grep -q '^L /var/lib/systemd/catalog/database' >>>> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ >>>> +???????????? printf "\nL /var/lib/systemd/catalog/database\n" >> >>>> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf >>>> +endef >>>> + >>>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS >>>> +endif >>>> + >>>> +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>>> +???? rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ >>>> + >>>> $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ >>>> + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service >>>> +endef >>>> + >>>> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE >>>> + >>>> ?? define SYSTEMD_PRESET_ALL >>>> ?????? $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all >>>> ?? endef >>>> >> >> Norbert >> >> [2] - >> https://lore.kernel.org/buildroot/1d09c49a-6d08-1cd7-9785-92b56c17ae06 at mind.be/ >> From arnout at mind.be Sun Jan 9 08:43:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 09:43:28 +0100 Subject: [Buildroot] [git commit] package/systemd: add support for creating journal catalog DB Message-ID: <20220109083723.B68F882A95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01a7e1a9f8bcfa4d7f8b1dab85f84ec53797ea2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master journald supports catalog files, or rather a binary database of those. Functionality added includes: - A config option allows enabling the binary database. - If BR2_ENABLE_LOCALE_PURGE is enabled, the catalogs not in the language whitelist are deleted first. This is done independently of the new option, since the catalogs are removed later anyway. - If the option is enabled, the database is built and moved to /usr/share/factory. This makes sure that /usr contains the entire system. A symlink is created in /var pointing to that file. - The catalog source files are deleted. They serve no purpose on the target once the database exists. - All of the above is done in a ROOTFS_PRE_CMD_HOOK rather than in the build/install step, because other packages than systemd itself may also install catalogs. This also makes sure that it is possible to do a re-build, because the catalog files are not removed in $(TARGET_DIR) itself, only in the temporary copy for rootfs creation. - The service normally used for creating the DB during boot is deleted. If the DB is not enabled, we also don't want to waste time and space on re-generating every boot. Conversely, if the DB is enabled, it is already there so doesn't need to be re-done on every boot either. The new option depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW because if the rootfs is not RW, /var is overmounted with a tmpfs. The factory should handle this, but this only half-works [1]. [1] http://lists.busybox.net/pipermail/buildroot/2020-July/287016.html Signed-off-by: Norbert Lange Reviewed-by: Je??re??my Rosen Reviewed-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/Config.in | 14 ++++++++++++++ package/systemd/systemd.mk | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 0148cad791..c8c5a9c47b 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -269,6 +269,20 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands +config BR2_PACKAGE_SYSTEMD_CATALOGDB + bool "enable journal catalog database installation" + depends on BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW # conflicting tmpfiles magic + help + Build and install the journal catalog database. + + catalog files are used to provide extended and potentially + localized messages for the journal. + + The original catalog files will be built into a DB at + /usr/share/factory/var/lib/systemd/catalog/database. + + https://www.freedesktop.org/wiki/Software/systemd/catalog/ + config BR2_PACKAGE_SYSTEMD_LOCALED bool "enable locale daemon" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 17bb922f51..a2417ebe19 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -678,6 +678,44 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD $(SYSTEMD_INSTALL_NETWORK_CONFS) endef +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) +# Go through all files with scheme ..catalog +# and remove those where is not in LOCALE_NOPURGE +define SYSTEMD_LOCALE_PURGE_CATALOGS + for cfile in `find $(TARGET_DIR)/usr/lib/systemd/catalog -name '*.*.catalog'`; \ + do \ + basename=$${cfile##*/}; \ + basename=$${basename%.catalog}; \ + langext=$${basename#*.}; \ + [ "$$langext" = "$${basename}" ] && continue; \ + expr '$(LOCALE_NOPURGE)' : ".*\b$${langext}\b" >/dev/null && continue; \ + rm -f "$$cfile"; \ + done +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_LOCALE_PURGE_CATALOGS +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_CATALOGDB),y) +define SYSTEMD_UPDATE_CATALOGS + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog + install -D $(TARGET_DIR)/var/lib/systemd/catalog/database \ + $(TARGET_DIR)/usr/share/factory/var/lib/systemd/catalog/database + rm $(TARGET_DIR)/var/lib/systemd/catalog/database + ln -sf /usr/share/factory/var/lib/systemd/catalog/database \ + $(TARGET_DIR)/var/lib/systemd/catalog/database + grep -q '^L /var/lib/systemd/catalog/database' $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf || \ + printf "\nL /var/lib/systemd/catalog/database\n" >> $(TARGET_DIR)/usr/lib/tmpfiles.d/var.conf +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS +endif + +define SYSTEMD_RM_CATALOG_UPDATE_SERVICE + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \ + $(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \ + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-journal-catalog-update.service +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE + define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef From james.hilliard1 at gmail.com Sun Jan 9 08:47:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 01:47:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env Message-ID: <20220109084732.2567404-1-james.hilliard1@gmail.com> This should be more reliable and fix the host == target bug when doing indirect invocations using the cargo env. Signed-off-by: James Hilliard --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 47ae86bfae..b6cb65c4f0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -27,6 +27,7 @@ PKG_CARGO_ENV = \ CARGO_HOME=$(HOST_DIR)/share/cargo \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" ################################################################################ @@ -88,7 +89,6 @@ define $(2)_BUILD_CMDS $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ --manifest-path Cargo.toml \ --locked \ - -Z target-applies-to-host \ $$($(2)_CARGO_BUILD_OPTS) endef else # ifeq ($(4),target) -- 2.25.1 From peter at korsgaard.com Sun Jan 9 08:57:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 09:57:12 +0100 Subject: [Buildroot] [PATCH next 2/3] package/inadyn: refactor start script In-Reply-To: <20211205102907.2836980-3-troglobit@gmail.com> (Joachim Wiberg's message of "Sun, 5 Dec 2021 11:29:05 +0100") References: <20211205102907.2836980-1-troglobit@gmail.com> <20211205102907.2836980-3-troglobit@gmail.com> Message-ID: <87zgo5cmmv.fsf@dell.be.48ers.dk> >>>>> "Joachim" == Joachim Wiberg writes: > This patch is a complete rewrite of the Inadyn start script, based on > the BusyBox S01syslogd template. Additional features, compared to the > template, are limited to the ability to: > - Check if enabled, using an ENABLED="yes" from /etc/default/inadyn, > this for compatibility with the previous version of the script > - Override INADYN_ARGS from /etc/default/inadyn > - A reload command that sends SIGHUP, since that works and is both > quicker and a less resource intensive operation > Signed-off-by: Joachim Wiberg > --- > package/inadyn/S70inadyn | 100 +++++++++++++++++++++++++-------------- > 1 file changed, 65 insertions(+), 35 deletions(-) > mode change 100644 => 100755 package/inadyn/S70inadyn > diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn > old mode 100644 > new mode 100755 > index ca7b414678..d44acacec3 > --- a/package/inadyn/S70inadyn > +++ b/package/inadyn/S70inadyn > @@ -1,44 +1,74 @@ > #!/bin/sh > +# Customizations are sourced from /etc/default/inadyn. For example, > +# override INADYN_ARGS to adjust log level, add a startup delay, etc. > # > -# Start & stop the inadyn client > -# > +# NOTE: to start, add a line ENABLED="yes" to /etc/default/inadyn > + > +DAEMON="inadyn" > +PIDFILE="/var/run/$DAEMON.pid" > + > +INADYN_ARGS="" > -CONFIG=/etc/inadyn.conf > +# shellcheck source=/dev/null > +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" > -# check if CONFIG exists, print message & exit if it doesn't > -[ ! -f $CONFIG ] && ( echo "The config file "$CONFIG" is missing...exiting now." && exit 2 ) > +start() > +{ Our other init scripts have the { on the same line as the function, so changed that and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 08:56:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 09:56:13 +0100 Subject: [Buildroot] [git commit] package/inadyn: refactor start script Message-ID: <20220109085114.8F3B482A95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=787f7b58a7fb7c68e1f54573b6c0a29defdc5dcb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch is a complete rewrite of the Inadyn start script, based on the BusyBox S01syslogd template. Additional features, compared to the template, are limited to the ability to: - Check if enabled, using an ENABLED="yes" from /etc/default/inadyn, this for compatibility with the previous version of the script - Override INADYN_ARGS from /etc/default/inadyn - A reload command that sends SIGHUP, since that works and is both quicker and a less resource intensive operation Signed-off-by: Joachim Wiberg Signed-off-by: Peter Korsgaard --- package/inadyn/S70inadyn | 96 ++++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 35 deletions(-) diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn old mode 100644 new mode 100755 index ca7b414678..8a71693cba --- a/package/inadyn/S70inadyn +++ b/package/inadyn/S70inadyn @@ -1,44 +1,70 @@ #!/bin/sh +# Customizations are sourced from /etc/default/inadyn. For example, +# override INADYN_ARGS to adjust log level, add a startup delay, etc. # -# Start & stop the inadyn client -# +# NOTE: to start, add a line ENABLED="yes" to /etc/default/inadyn + +DAEMON="inadyn" +PIDFILE="/var/run/$DAEMON.pid" + +INADYN_ARGS="" -CONFIG=/etc/inadyn.conf +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" -# check if CONFIG exists, print message & exit if it doesn't -[ ! -f $CONFIG ] && ( echo "The config file "$CONFIG" is missing...exiting now." && exit 2 ) +start() { + printf 'Starting %s: ' "$DAEMON" + if [ "$ENABLED" != "yes" ]; then + echo "SKIPPED" + exit 0 + fi + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $INADYN_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} -# Allow a few customizations from a config file. Especially inadyn -# must be explicitly enabled by adding ENABLED="yes" in this file. -test -r /etc/default/inadyn && . /etc/default/inadyn +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + printf 'Reloading %s: ' "$DAEMON" + start-stop-daemon -K -s HUP -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} case "$1" in - start) - printf "Starting inadyn: " - if test "${ENABLED}" != "yes" ; then - echo "SKIPPED" - exit 0 - fi - start-stop-daemon -b -q -S -p /var/run/inadyn.pid -x /usr/sbin/inadyn - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping inadyn: " - if test "${ENABLED}" != "yes" ; then - echo "SKIPPED" - exit 0 - fi - start-stop-daemon -q -K -p /var/run/inadyn.pid -x /usr/sbin/inadyn - [ $? = 0 ] && echo "OK" || echo "FAIL" - rm -f /var/run/inadyn.pid - ;; - restart) - "$0" stop - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" + start|stop|restart|reload) + "$1";; + *) + echo "Usage: $0 {start|stop|restart|reload}" exit 1 esac - -exit $? From thomas.petazzoni at bootlin.com Sun Jan 9 08:58:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 09:58:48 +0100 Subject: [Buildroot] [git commit] package/simple-mail: new package Message-ID: <20220109085442.D6F6E8269E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32ecd0242de75a1c01e295d30f78f155a8da1d17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Zoltan Gyarmati [Thomas: - bump to 2.3.0 - don't build demos, they need QtWidgets] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/simple-mail/Config.in | 9 +++++++++ package/simple-mail/simple-mail.hash | 5 +++++ package/simple-mail/simple-mail.mk | 15 +++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3b544cae6b..ed65c74319 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3017,4 +3017,5 @@ F: package/python-iniparse/ F: package/qjson/ F: package/quazip/ F: package/shapelib/ +F: package/simple-mail/ F: package/tinc/ diff --git a/package/Config.in b/package/Config.in index 378d6e8c0c..2d3ca6a3b6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -364,6 +364,7 @@ comment "QT libraries and helper libraries" source "package/qjson/Config.in" source "package/quazip/Config.in" source "package/qwt/Config.in" + source "package/simple-mail/Config.in" endif source "package/tekui/Config.in" source "package/weston/Config.in" diff --git a/package/simple-mail/Config.in b/package/simple-mail/Config.in new file mode 100644 index 0000000000..681a8410db --- /dev/null +++ b/package/simple-mail/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SIMPLE_MAIL + bool "simple-mail" + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_NETWORK + select BR2_PACKAGE_OPENSSL + help + An SMTP library written in C++ for Qt. + + https://github.com/cutelyst/simple-mail diff --git a/package/simple-mail/simple-mail.hash b/package/simple-mail/simple-mail.hash new file mode 100644 index 0000000000..67d6caff87 --- /dev/null +++ b/package/simple-mail/simple-mail.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 2026f2017662508b0f25da72694f1dd13ab3ccf82c0454f7c40f8a6cc450c410 simple-mail-2.3.0.tar.gz + +# Hash for license file +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c LICENSE diff --git a/package/simple-mail/simple-mail.mk b/package/simple-mail/simple-mail.mk new file mode 100644 index 0000000000..68484f79b0 --- /dev/null +++ b/package/simple-mail/simple-mail.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# simple-mail +# +################################################################################ + +SIMPLE_MAIL_VERSION = 2.3.0 +SIMPLE_MAIL_SITE = $(call github,cutelyst,simple-mail,v$(SIMPLE_MAIL_VERSION)) +SIMPLE_MAIL_INSTALL_STAGING = YES +SIMPLE_MAIL_LICENSE = LGPL-2.1+ +SIMPLE_MAIL_LICENSE_FILES = LICENSE +SIMPLE_MAIL_DEPENDENCIES = qt5base +SIMPLE_MAIL_CONF_OPTS = -DBUILD_DEMOS=OFF + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Sun Jan 9 09:02:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 10:02:08 +0100 Subject: [Buildroot] [PATCH] package/simple-mail: new package In-Reply-To: <20210106205206.433749-1-zgyarmati@zgyarmati.de> References: <20210106205206.433749-1-zgyarmati@zgyarmati.de> Message-ID: <20220109100208.2a1d351d@windsurf> On Wed, 6 Jan 2021 21:52:06 +0100 Zoltan Gyarmati wrote: > Signed-off-by: Zoltan Gyarmati > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/simple-mail/Config.in | 9 +++++++++ > package/simple-mail/simple-mail.hash | 5 +++++ > package/simple-mail/simple-mail.mk | 14 ++++++++++++++ > 5 files changed, 30 insertions(+) > create mode 100644 package/simple-mail/Config.in > create mode 100644 package/simple-mail/simple-mail.hash > create mode 100644 package/simple-mail/simple-mail.mk After almost one year, patch is applied! I bumped to the latest version, 2.3.0, and had to disable the demos because some of them need QtWidgets, which this package doesn't require. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sun Jan 9 09:04:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 10:04:34 +0100 Subject: [Buildroot] [git commit] fs: clean the volatile /run and /tmp directories Message-ID: <20220109090438.04CA982940@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e78e7e97d772124f0d31653aca33731abe5b4db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master At run time, /run and /tmp get overmounted with a tmpfs, so anything that is there becomes inaccessible. Scripts in the fakeroot environment could call tools preparing the early environment, leaving traces in /run or /tmp. For example, mkusers might create home directories in /run: openssh sets the sshd home directory to /run/sshd, so mkusers creates it. But since a tmpfs is mounted over it, it doesn't exist at runtime, so the openssh service creates it at startup (and deletes it when the service is stopped). In addition, packages or rootfs overlay may leave things there as well. Those may actually pose a runtime problem because the created file or directory is missing - or it may not be a problem because the package creates the missing files/directories on startup. In this situation, it's better not to have them in the rootfs image (because they're not functional anyway), but it's good to leave them in TARGET_DIR to make it easier to debug the situation. Therefore, remove the contents of /run and /tmp in the fakeroot environment after ROOTFS_PRE_GEN_HOOKS, so they are still left in TARGET_DIR. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- fs/common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/common.mk b/fs/common.mk index afab7b50fb..45beb5ae7b 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,6 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) From arnout at mind.be Sun Jan 9 09:11:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 10:11:23 +0100 Subject: [Buildroot] [PATCH 2/2] fs: clean the volatile /run and /tmp directories In-Reply-To: <20200605224858.12870-2-nolange79@gmail.com> References: <20200605224858.12870-1-nolange79@gmail.com> <20200605224858.12870-2-nolange79@gmail.com> Message-ID: Hi Norbert, On 06/06/2020 00:48, Norbert Lange wrote: > Scripts in the fakeroot environment could call > tools preparing the early environment, leaving > traces in /run or /tmp. > > mkusers might create home directories in /run for > example. > > Signed-off-by: Norbert Lange I finally applied to master, thanks. I extended the commit message based on the discussion on the patch. Regards, Arnout > --- > fs/common.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/common.mk b/fs/common.mk > index 842ea924a5..a5c6b4ea96 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -171,6 +171,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > chmod a+x $$(FAKEROOT_SCRIPT) > From peter at korsgaard.com Sun Jan 9 09:37:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 10:37:33 +0100 Subject: [Buildroot] [PATCH] package/poppler: use HTTPS for upstream URL Message-ID: <20220109093735.4860-1-peter@korsgaard.com> Fixes: http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget versions (E.G. s.b.o): wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz DEBUG output created by Wget 1.14 on linux-gnu. URI encoding = ?UTF-8? Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 Caching poppler.freedesktop.org => 147.75.198.156 Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. Created socket 3. Releasing 0x0000000001ceda80 (new refcount 1). ---request begin--- GET /poppler-21.12.0.tar.xz HTTP/1.1 User-Agent: Wget/1.14 (linux-gnu) Accept: */* Host: poppler.freedesktop.org Connection: Keep-Alive ---request end--- HTTP request sent, awaiting response... ---response begin--- HTTP/1.1 308 Permanent Redirect Date: Sun, 09 Jan 2022 09:28:02 GMT Content-Type: text/html Content-Length: 164 Connection: keep-alive Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz ---response end--- 308 Permanent Redirect Registered socket 3 for persistent reuse. Skipping 164 bytes of body: [ 308 Permanent Redirect

    308 Permanent Redirect

    nginx
    ] done. 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. Signed-off-by: Peter Korsgaard --- package/poppler/Config.in | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index f59115813d..21c4d86cf6 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POPPLER Poppler is a PDF rendering library based on the xpdf-3.0 code base. - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ if BR2_PACKAGE_POPPLER diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 23f04f6e51..9e9bfc9cba 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -6,7 +6,7 @@ POPPLER_VERSION = 21.12.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org +POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING -- 2.20.1 From thomas.petazzoni at bootlin.com Sun Jan 9 10:04:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 11:04:18 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/pkg-cargo.mk: introduce the cargo package infrastructure In-Reply-To: <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-6-thomas.petazzoni@bootlin.com> <310621ef-6a6e-f7e6-18d1-20ace14a81b7@smile.fr> Message-ID: <20220109110418.0c7fc038@windsurf> On Fri, 7 Jan 2022 22:07:26 +0100 Romain Naour wrote: > > +endif # ifeq ($(4),target) > > +endif # ifndef $(2)_BUILD_CMDS > > + > > is _INSTALL_STAGING_CMDS is missing here ? > > Rust package may wand to install *.rlib files [1] (similar to .a) But will Cargo pick up .rlib files from STAGING_DIR ? I don't see how Cargo/Rust knows about STAGING_DIR. Aren't those .rlib files anyway installed in CARGO_HOME, and Cargo picks them up from here, or something like that? Installing to STAGING_DIR is one thing, but what's important is to figure out if Cargo is really going to use what we install in STAGING_DIR. Do we have a specific example where one package installs a .rlib and another package uses it? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 10:07:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 11:07:37 +0100 Subject: [Buildroot] [git commit] support/download/go-post-process: drop -o pipefail Message-ID: <20220109100242.803BA82B60@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfd1a31d0e590c8545df7159a9e61febbd220370 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This breaks the post_process_unpack() function in support/download/helpers, which had a sequence of pipe, with "head" that can abort early and cause the pipe to fail. Fixes intermitent: make[1]: *** [package/pkg-generic.mk:190: /builds/tpetazzoni/buildroot/test-output/TestDockerCompose/build/containerd-1.5.8/.stamp_downloaded] Error 141 Signed-off-by: Thomas Petazzoni --- support/download/go-post-process | 1 - 1 file changed, 1 deletion(-) diff --git a/support/download/go-post-process b/support/download/go-post-process index be202a4c0f..ef96a76948 100755 --- a/support/download/go-post-process +++ b/support/download/go-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" From arnout at mind.be Sun Jan 9 10:29:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 11:29:32 +0100 Subject: [Buildroot] [PATCH] skeleton + init: prepare /run/lock and adjust compat symlinks In-Reply-To: <20201004224137.193808-1-nolange79@gmail.com> References: <20201004224137.193808-1-nolange79@gmail.com> Message-ID: On 05/10/2020 00:41, Norbert Lange wrote: > Linux distros changed /var/run and /var/lock to reside on an tmpfs in > /run a long time ago, and buildroot seems to agree by providing this > tmpfs on all supported init systems. > > Packages on the other hand are currently free to either use /var/run > or /run, and similarly using /var/lock should be identical to the > replacement /run/lock. > > This series aims to ensure that *if* /var/lock is needed, then > it will be a symlink to /run/lock. Allowing packages to continue > working and allowing them to migrate to using /run/lock. > > If all relevant packages are fixed, > the compatibility symlinks in /var can be dropped. > > Status before this patch: > > * Systemd > > /run will be mounted by PID1, /var/run will be recreated by > /usr/lib/tmpfiles.d/var.conf. > > Creating /run/lock/subsys and the compatibility symlink is handled > in /usr/lib/tmpfiles.d/legacy.conf. > But this is *currently not installed* by Buildroot, see [1]. > > * OpenRC > > Seems to check for existence of a /run directory and does all > necessary setup. > > * SysV > > /var/lock is currently a symlink to /tmp. > > * Busybox > > Same as sysv (Buildroot uses the sysv skeleton) > > Note that we create /run/lock/subsys, so sysv scrips could expect this > directory to exist. Apart from simplifying scripts, creating the dir > early as root adds some security. > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Arnout > --- > package/busybox/inittab | 1 + > package/skeleton-init-openrc/skeleton/var/lock | 2 +- > package/skeleton-init-sysv/skeleton/var/lock | 2 +- > package/sysvinit/inittab | 13 +++++++------ > 4 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/package/busybox/inittab b/package/busybox/inittab > index ff1725c775..f2b4df801b 100644 > --- a/package/busybox/inittab > +++ b/package/busybox/inittab > @@ -18,6 +18,7 @@ > ::sysinit:/bin/mount -o remount,rw / > ::sysinit:/bin/mkdir -p /dev/pts /dev/shm > ::sysinit:/bin/mount -a > +::sysinit:/bin/mkdir -p /run/lock/subsys > ::sysinit:/sbin/swapon -a > null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd > null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin > diff --git a/package/skeleton-init-openrc/skeleton/var/lock b/package/skeleton-init-openrc/skeleton/var/lock > index 1431b0e432..386c09e727 120000 > --- a/package/skeleton-init-openrc/skeleton/var/lock > +++ b/package/skeleton-init-openrc/skeleton/var/lock > @@ -1 +1 @@ > -../tmp > \ No newline at end of file > +../run/lock > \ No newline at end of file > diff --git a/package/skeleton-init-sysv/skeleton/var/lock b/package/skeleton-init-sysv/skeleton/var/lock > index 1431b0e432..386c09e727 120000 > --- a/package/skeleton-init-sysv/skeleton/var/lock > +++ b/package/skeleton-init-sysv/skeleton/var/lock > @@ -1 +1 @@ > -../tmp > \ No newline at end of file > +../run/lock > \ No newline at end of file > diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab > index a31471031f..afc28e6c03 100644 > --- a/package/sysvinit/inittab > +++ b/package/sysvinit/inittab > @@ -8,12 +8,13 @@ si0::sysinit:/bin/mount -t proc proc /proc > si1::sysinit:/bin/mount -o remount,rw / > si2::sysinit:/bin/mkdir -p /dev/pts /dev/shm > si3::sysinit:/bin/mount -a > -si4::sysinit:/sbin/swapon -a > -si5::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null > -si6::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null > -si7::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null > -si8::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null > -si9::sysinit:/bin/hostname -F /etc/hostname > +si4::sysinit:/bin/mkdir -p /run/lock/subsys > +si5::sysinit:/sbin/swapon -a > +si6::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null > +si7::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null > +si8::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null > +si9::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null > +si10::sysinit:/bin/hostname -F /etc/hostname > rcS:12345:wait:/etc/init.d/rcS > > # S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL > From arnout at mind.be Sun Jan 9 10:28:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 11:28:56 +0100 Subject: [Buildroot] [git commit] skeleton + init: prepare /run/lock and adjust compat symlinks Message-ID: <20220109102332.4052482963@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf01e51f3c626c2235f587b561af4bfac192c05e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Linux distros changed /var/run and /var/lock to reside on an tmpfs in /run a long time ago, and buildroot seems to agree by providing this tmpfs on all supported init systems. Packages on the other hand are currently free to either use /var/run or /run, and similarly using /var/lock should be identical to the replacement /run/lock. This series aims to ensure that *if* /var/lock is needed, then it will be a symlink to /run/lock. Allowing packages to continue working and allowing them to migrate to using /run/lock. If all relevant packages are fixed, the compatibility symlinks in /var can be dropped. Status before this patch: * Systemd /run will be mounted by PID1, /var/run will be recreated by /usr/lib/tmpfiles.d/var.conf. Creating /run/lock/subsys and the compatibility symlink is handled in /usr/lib/tmpfiles.d/legacy.conf. But this is *currently not installed* by Buildroot, see [1]. * OpenRC Seems to check for existence of a /run directory and does all necessary setup. * SysV /var/lock is currently a symlink to /tmp. * Busybox Same as sysv (Buildroot uses the sysv skeleton) Note that we create /run/lock/subsys, so sysv scrips could expect this directory to exist. Apart from simplifying scripts, creating the dir early as root adds some security. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/inittab | 1 + package/skeleton-init-openrc/skeleton/var/lock | 2 +- package/skeleton-init-sysv/skeleton/var/lock | 2 +- package/sysvinit/inittab | 13 +++++++------ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/busybox/inittab b/package/busybox/inittab index ff1725c775..f2b4df801b 100644 --- a/package/busybox/inittab +++ b/package/busybox/inittab @@ -18,6 +18,7 @@ ::sysinit:/bin/mount -o remount,rw / ::sysinit:/bin/mkdir -p /dev/pts /dev/shm ::sysinit:/bin/mount -a +::sysinit:/bin/mkdir -p /run/lock/subsys ::sysinit:/sbin/swapon -a null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin diff --git a/package/skeleton-init-openrc/skeleton/var/lock b/package/skeleton-init-openrc/skeleton/var/lock index 1431b0e432..386c09e727 120000 --- a/package/skeleton-init-openrc/skeleton/var/lock +++ b/package/skeleton-init-openrc/skeleton/var/lock @@ -1 +1 @@ -../tmp \ No newline at end of file +../run/lock \ No newline at end of file diff --git a/package/skeleton-init-sysv/skeleton/var/lock b/package/skeleton-init-sysv/skeleton/var/lock index 1431b0e432..386c09e727 120000 --- a/package/skeleton-init-sysv/skeleton/var/lock +++ b/package/skeleton-init-sysv/skeleton/var/lock @@ -1 +1 @@ -../tmp \ No newline at end of file +../run/lock \ No newline at end of file diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab index a31471031f..afc28e6c03 100644 --- a/package/sysvinit/inittab +++ b/package/sysvinit/inittab @@ -8,12 +8,13 @@ si0::sysinit:/bin/mount -t proc proc /proc si1::sysinit:/bin/mount -o remount,rw / si2::sysinit:/bin/mkdir -p /dev/pts /dev/shm si3::sysinit:/bin/mount -a -si4::sysinit:/sbin/swapon -a -si5::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null -si6::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null -si7::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null -si8::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null -si9::sysinit:/bin/hostname -F /etc/hostname +si4::sysinit:/bin/mkdir -p /run/lock/subsys +si5::sysinit:/sbin/swapon -a +si6::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null +si7::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null +si8::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null +si9::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null +si10::sysinit:/bin/hostname -F /etc/hostname rcS:12345:wait:/etc/init.d/rcS # S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL From yann.morin.1998 at free.fr Sun Jan 9 10:30:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 11:30:26 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4 Message-ID: <20220109102523.6DBBB82B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eeace1cc13ce09a0c88ce177465b836d6eb58298 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In the face of the vast amount of x86-64 CPU architecture variants, Linux distributions have worked together to define "micro-architecture levels" in the x86-64 psABI, called x86-64-v2, x86-64-v3 and x86-64-v4. They standardize a set of CPU features, and GCC since its version 11.x has support for these micro-architecture levels as -march= options. It makes sense to support them in Buildroot, especially for those who want to build toolchains that aim at targeting a reasonably broad family of x86-64 processors. It only really makes sense to use as 64-bit CPUs, and not as 32-bit ones, so we guard them behind BR2_x86_64. More details: https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=59482fa1e7243bd905c7e27c92ae2b89c79fff87 Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - they are x86-64-only CPUs - add gcc commit URL ] Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 34564c1ed1..0ba9ecbcea 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -92,6 +92,66 @@ config BR2_x86_x86_64 "Generic CPU with 64-bit extensions" by the GCC documentation. It is a 64-bit CPU with MMX, SSE and SSE2 support. +config BR2_x86_x86_64_v2 + bool "x86-64-v2" + depends on BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v2 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is close to the Nehalem CPU architecture, and is + applicable for CPUs that support CMPXCHG16B, LAHF-SAHF, + POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3. +config BR2_x86_x86_64_v3 + bool "x86-64-v3" + depends on BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v3 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is close to the Haswell CPU architecture, and is + applicable for CPUs that support all of x86-64-v2 plus AVX, + AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE. +config BR2_x86_x86_64_v4 + bool "x86-64-v4" + depends on BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + help + This option corresponds to the x86-64-v4 micro-architecture + level, as defined by the x86-64 psABI document, see + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. + + It is applicable for CPUs that support all of x86-64-v3 plus + AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL. config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -293,6 +353,9 @@ config BR2_GCC_TARGET_ARCH default "pentium4" if BR2_x86_pentium4 default "prescott" if BR2_x86_prescott default "x86-64" if BR2_x86_x86_64 + default "x86-64-v2" if BR2_x86_x86_64_v2 + default "x86-64-v3" if BR2_x86_x86_64_v3 + default "x86-64-v4" if BR2_x86_x86_64_v4 default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 From yann.morin.1998 at free.fr Sun Jan 9 10:30:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 11:30:26 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add option for -march=x86-64 Message-ID: <20220109102523.65CEC812B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6ce2a16814fd96a45888a774da6a4db74cd540a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We already have support for a wide range of x86-64 CPUs, but we don't have any option to build for the most generic possible x86-64 CPU, as made available by the -march=x86-64 GCC option. This commit makes this option available in Buildroot. It only really makes sense to use as a 64-bit CPU, and not as a 32-bit one, so we guard it behind BR2_x86_64. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: it's an x86-64-only CPU] Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 7aae3cafb7..34564c1ed1 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -81,6 +81,17 @@ config BR2_x86_prescott select BR2_X86_CPU_HAS_SSE select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 +config BR2_x86_x86_64 + bool "x86-64" + depends on BR2_x86_64 + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + help + This option corresponds to -march=x86-64, documented as a + "Generic CPU with 64-bit extensions" by the GCC + documentation. It is a 64-bit CPU with MMX, SSE and SSE2 + support. config BR2_x86_nocona bool "nocona" select BR2_X86_CPU_HAS_MMX @@ -281,6 +292,7 @@ config BR2_GCC_TARGET_ARCH default "pentium3" if BR2_x86_pentium3 default "pentium4" if BR2_x86_pentium4 default "prescott" if BR2_x86_prescott + default "x86-64" if BR2_x86_x86_64 default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 From yann.morin.1998 at free.fr Sun Jan 9 10:33:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 11:33:51 +0100 Subject: [Buildroot] [PATCH 1/2] arch/Config.in.x86: add option for -march=x86-64 In-Reply-To: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> References: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> Message-ID: <20220109103351.GJ1881783@scaer> Thomas, All, On 2022-01-09 09:01 +0100, Thomas Petazzoni spake thusly: > We already have support for a wide range of x86-64 CPUs, but we don't > have any option to build for the most generic possible x86-64 CPU, as > made available by the -march=x86-64 GCC option. As discussed, it only really makes sense to use them as a 64-bit CPU, so I've added a dependency on BR2_x86_64. > This commit makes this option available in Buildroot. > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > arch/Config.in.x86 | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 > index 7aae3cafb7..794d808d96 100644 > --- a/arch/Config.in.x86 > +++ b/arch/Config.in.x86 > @@ -81,6 +81,16 @@ config BR2_x86_prescott > select BR2_X86_CPU_HAS_SSE > select BR2_X86_CPU_HAS_SSE2 > select BR2_X86_CPU_HAS_SSE3 > +config BR2_x86_x86_64 > + bool "x86-64" > + select BR2_X86_CPU_HAS_MMX > + select BR2_X86_CPU_HAS_SSE > + select BR2_X86_CPU_HAS_SSE2 > + help > + This option corresponds to -march=x86-64, documented as a > + "Generic CPU with 64-bit extensions" by the GCC > + documentation. It is a 64-bit CPU with MMX, SSE and SSE2 > + support. > config BR2_x86_nocona > bool "nocona" > select BR2_X86_CPU_HAS_MMX > @@ -281,6 +291,7 @@ config BR2_GCC_TARGET_ARCH > default "pentium3" if BR2_x86_pentium3 > default "pentium4" if BR2_x86_pentium4 > default "prescott" if BR2_x86_prescott > + default "x86-64" if BR2_x86_x86_64 > default "nocona" if BR2_x86_nocona > default "core2" if BR2_x86_core2 > default "corei7" if BR2_x86_corei7 > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 10:36:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 11:36:07 +0100 Subject: [Buildroot] [PATCH 2/2] arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4 In-Reply-To: <20220109080124.2271241-2-thomas.petazzoni@bootlin.com> References: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> <20220109080124.2271241-2-thomas.petazzoni@bootlin.com> Message-ID: <20220109103607.GK1881783@scaer> Thomas, All, On 2022-01-09 09:01 +0100, Thomas Petazzoni spake thusly: > In the face of the vast amount of x86-64 CPU architecture variants, > Linux distributions have worked together to define "micro-architecture > levels" in the x86-64 psABI, called x86-64-v2, x86-64-v3 and > x86-64-v4. They standardize a set of CPU features, and GCC since its > version 11.x has support for these micro-architecture levels as > -march= options. > > It makes sense to support them in Buildroot, especially for those who > want to build toolchains that aim at targeting a reasonably broad > family of x86-64 processors. As for x86-64, I've added a dependency on BR2_x86_64. > More details: > > https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex > https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level > https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels I've added a URL to the upstream commit too. > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > arch/Config.in.x86 | 60 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 > index 794d808d96..153c8bad38 100644 > --- a/arch/Config.in.x86 > +++ b/arch/Config.in.x86 > @@ -91,6 +91,63 @@ config BR2_x86_x86_64 > "Generic CPU with 64-bit extensions" by the GCC > documentation. It is a 64-bit CPU with MMX, SSE and SSE2 > support. > +config BR2_x86_x86_64_v2 > + bool "x86-64-v2" > + select BR2_X86_CPU_HAS_MMX > + select BR2_X86_CPU_HAS_SSE > + select BR2_X86_CPU_HAS_SSE2 > + select BR2_X86_CPU_HAS_SSE3 > + select BR2_X86_CPU_HAS_SSSE3 > + select BR2_X86_CPU_HAS_SSE4 > + select BR2_X86_CPU_HAS_SSE42 > + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 > + help > + This option corresponds to the x86-64-v2 micro-architecture > + level, as defined by the x86-64 psABI document, see > + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. > + > + It is close to the Nehalem CPU architecture, and is > + applicable for CPUs that support CMPXCHG16B, LAHF-SAHF, > + POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3. > +config BR2_x86_x86_64_v3 > + bool "x86-64-v3" > + select BR2_X86_CPU_HAS_MMX > + select BR2_X86_CPU_HAS_SSE > + select BR2_X86_CPU_HAS_SSE2 > + select BR2_X86_CPU_HAS_SSE3 > + select BR2_X86_CPU_HAS_SSSE3 > + select BR2_X86_CPU_HAS_SSE4 > + select BR2_X86_CPU_HAS_SSE42 > + select BR2_X86_CPU_HAS_AVX > + select BR2_X86_CPU_HAS_AVX2 > + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 > + help > + This option corresponds to the x86-64-v3 micro-architecture > + level, as defined by the x86-64 psABI document, see > + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. > + > + It is close to the Haswell CPU architecture, and is > + applicable for CPUs that support all of x86-64-v2 plus AVX, > + AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE. > +config BR2_x86_x86_64_v4 > + bool "x86-64-v4" > + select BR2_X86_CPU_HAS_MMX > + select BR2_X86_CPU_HAS_SSE > + select BR2_X86_CPU_HAS_SSE2 > + select BR2_X86_CPU_HAS_SSE3 > + select BR2_X86_CPU_HAS_SSSE3 > + select BR2_X86_CPU_HAS_SSE4 > + select BR2_X86_CPU_HAS_SSE42 > + select BR2_X86_CPU_HAS_AVX > + select BR2_X86_CPU_HAS_AVX2 > + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 > + help > + This option corresponds to the x86-64-v4 micro-architecture > + level, as defined by the x86-64 psABI document, see > + https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex. > + > + It is applicable for CPUs that support all of x86-64-v3 plus > + AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL. > config BR2_x86_nocona > bool "nocona" > select BR2_X86_CPU_HAS_MMX > @@ -292,6 +349,9 @@ config BR2_GCC_TARGET_ARCH > default "pentium4" if BR2_x86_pentium4 > default "prescott" if BR2_x86_prescott > default "x86-64" if BR2_x86_x86_64 > + default "x86-64-v2" if BR2_x86_x86_64_v2 > + default "x86-64-v3" if BR2_x86_x86_64_v3 > + default "x86-64-v4" if BR2_x86_x86_64_v4 > default "nocona" if BR2_x86_nocona > default "core2" if BR2_x86_core2 > default "corei7" if BR2_x86_corei7 > -- > 2.33.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sun Jan 9 10:46:07 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 11:46:07 +0100 Subject: [Buildroot] [PATCH 2/2] arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4 In-Reply-To: <20220109103607.GK1881783@scaer> References: <20220109080124.2271241-1-thomas.petazzoni@bootlin.com> <20220109080124.2271241-2-thomas.petazzoni@bootlin.com> <20220109103607.GK1881783@scaer> Message-ID: <43cb4bd6-d40d-5a58-051a-75c9f4b1e1c2@smile.fr> Hello Thomas, Yann, Le 09/01/2022 ? 11:36, Yann E. MORIN a ?crit?: > Thomas, All, > > On 2022-01-09 09:01 +0100, Thomas Petazzoni spake thusly: >> In the face of the vast amount of x86-64 CPU architecture variants, >> Linux distributions have worked together to define "micro-architecture >> levels" in the x86-64 psABI, called x86-64-v2, x86-64-v3 and >> x86-64-v4. They standardize a set of CPU features, and GCC since its >> version 11.x has support for these micro-architecture levels as >> -march= options. >> >> It makes sense to support them in Buildroot, especially for those who >> want to build toolchains that aim at targeting a reasonably broad >> family of x86-64 processors. > > As for x86-64, I've added a dependency on BR2_x86_64. > >> More details: >> >> https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex >> https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level >> https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels > > I've added a URL to the upstream commit too. Sorry I'm late, but I had a look at this series to use x86-64-v3 and x86-64-v4 for Qemu runtime testing. There are some limitation with the current version of Qemu (6.2.0): "Note that TCG is not capable of supporting the 2 newest ABI levels currently: * x86-64-abi3: CPUID.01H:ECX.fma [bit 12] CPUID.01H:ECX.avx [bit 28] CPUID.01H:ECX.f16c [bit 29] CPUID.07H:EBX.avx2 [bit 5] * x86-64-abi4: CPUID.01H:ECX.pcid [bit 17] CPUID.01H:ECX.x2apic [bit 21] CPUID.01H:ECX.tsc-deadline [bit 24] CPUID.07H:EBX.invpcid [bit 10] CPUID.07H:EBX.avx512f [bit 16] CPUID.07H:EBX.avx512dq [bit 17] CPUID.07H:EBX.rdseed [bit 18] CPUID.07H:EBX.avx512cd [bit 28] CPUID.07H:EBX.avx512bw [bit 30] CPUID.07H:EBX.avx512vl [bit 31] CPUID.80000001H:ECX.3dnowprefetch [bit 8] CPUID.0DH:EAX.xsavec [bit 1]" https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg00170.html I wanted to reply to add this info in the commit log. Best regards, Romain > >> Signed-off-by: Thomas Petazzoni > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > From romain.naour at smile.fr Sun Jan 9 10:51:37 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 11:51:37 +0100 Subject: [Buildroot] [PATCH-next 2/4] support/docker: add python3-pytest In-Reply-To: <20211205105318.2755542-2-ricardo.martincoski@gmail.com> References: <20211205105318.2755542-1-ricardo.martincoski@gmail.com> <20211205105318.2755542-2-ricardo.martincoski@gmail.com> Message-ID: <66959117-0faa-1e56-3bb0-54b2167c9175@smile.fr> Hello Ricardo, In order to be ready for merging your series, add python3-pytest to the docker image now. Acked-by: Romain Naour Best regards, Romain Le 05/12/2021 ? 11:53, Ricardo Martincoski a ?crit?: > ... so the unit tests for check-package can run in the GitLab CI. > > Signed-off-by: Ricardo Martincoski > --- > support/docker/Dockerfile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile > index 2aee129668..a5d54b6e9d 100644 > --- a/support/docker/Dockerfile > +++ b/support/docker/Dockerfile > @@ -40,6 +40,7 @@ RUN apt-get install -y --no-install-recommends \ > python3-flake8 \ > python3-nose2 \ > python3-pexpect \ > + python3-pytest \ > qemu-system-arm \ > qemu-system-x86 \ > rsync \ > From romain.naour at smile.fr Sun Jan 9 10:52:39 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 11:52:39 +0100 Subject: [Buildroot] [PATCH 4/5] support/docker: add shellcheck In-Reply-To: <20211226184919.2753591-5-ricardo.martincoski@gmail.com> References: <20211226184919.2753591-1-ricardo.martincoski@gmail.com> <20211226184919.2753591-5-ricardo.martincoski@gmail.com> Message-ID: <4a065445-d2a7-4796-2b54-570260095ad4@smile.fr> Hello Ricardo, Acked-by: Romain Naour Best regards, Romain Le 26/12/2021 ? 19:49, Ricardo Martincoski a ?crit?: > Allow developers to run check-package for init scripts, that call > shellcheck, without having to install the tool. > > Since the docker have a fixed version of the tool, there will be no > difference between runs in different machines. > > One can call: > $ utils/docker-run utils/check-package package/package/S* > $ utils/docker-run shellcheck package/package/S* > > This change also allows to eventually run check-package for init scripts > in the GitLab CI. > > Signed-off-by: Ricardo Martincoski > --- > Please read the cover letter before applying. > --- > support/docker/Dockerfile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile > index 792e70e292..2b14f0f7a7 100644 > --- a/support/docker/Dockerfile > +++ b/support/docker/Dockerfile > @@ -44,6 +44,7 @@ RUN apt-get install -y --no-install-recommends \ > qemu-system-arm \ > qemu-system-x86 \ > rsync \ > + shellcheck \ > subversion \ > unzip \ > wget \ > From peter at korsgaard.com Sun Jan 9 10:53:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 11:53:04 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/openblas: security bump to version 0.3.18 In-Reply-To: <20211216070925.123117-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Dec 2021 08:09:25 +0100") References: <20211216070925.123117-1-fontaine.fabrice@gmail.com> Message-ID: <87v8ytch9r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, > DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, > as also used in OpenBLAS before version 0.3.18. Specially crafted > inputs passed to these functions could cause an application using > lapack to crash or possibly disclose portions of its memory. > - Drop first and second patches (already in version) > https://github.com/xianyi/OpenBLAS/blob/v0.3.18/Changelog.txt > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 10:38:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 11:38:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/openblas: security bump to version 0.3.18 Message-ID: <20220109104743.F003982B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0f648eb6bf3602d9e34691bea43cd6fae1eb40f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. - Drop first and second patches (already in version) https://github.com/xianyi/OpenBLAS/blob/v0.3.18/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...o-consider-Os-when-determining-LAPACK_NO.patch} | 0 package/openblas/0001-fix-gfortran-detection.patch | 30 -------------- ...x-support-for-passing-FFLAGS-on-the-make-.patch | 47 ---------------------- ...tem-don-t-specify-optimization-level-bui.patch} | 0 package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 4 +- 6 files changed, 3 insertions(+), 80 deletions(-) diff --git a/package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch similarity index 100% rename from package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch rename to package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch diff --git a/package/openblas/0001-fix-gfortran-detection.patch b/package/openblas/0001-fix-gfortran-detection.patch deleted file mode 100644 index 1fecdac3e5..0000000000 --- a/package/openblas/0001-fix-gfortran-detection.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ece3ce581e3ec530eaccfe7f284c52e115ec7aa9 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker -Date: Wed, 10 Feb 2021 14:22:59 +0100 -Subject: [PATCH] Strip parenthesized (pkgversion) data from GCC version string - to avoid misinterpretation - -See https://github.com/xianyi/OpenBLAS/issues/3099 for details. - -Upstream-status: backport - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire - - ---- - f_check | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/f_check b/f_check -index e9aca4ff9..ffe9c6b46 100644 ---- a/f_check -+++ b/f_check -@@ -75,6 +75,7 @@ if ($compiler eq "") { - - } elsif ($data =~ /GNU/ || $data =~ /GCC/ ) { - -+ $data =~ s/\(+.*?\)+//g; - $data =~ /(\d+)\.(\d+).(\d+)/; - $major = $1; - $minor = $2; diff --git a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch b/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch deleted file mode 100644 index 72b387b93e..0000000000 --- a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4d3829fa52240c2b7e48770ab19584db33ba7863 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:17:59 +0100 -Subject: [PATCH] Makefile: fix support for passing FFLAGS on the make - command line - -When openblas is built while passing FFLAGS on the make command line, the -compilation of lapack objects will not contain the flags specified in -Makefile but _only_ those passed in FFLAGS. - -This can lead to build failure, e.g. because -fPIC is not passed to the -compilation of most lapack objects, but is given to the link command: - -.../buildroot/output/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -O2 -DMAX_STACK_ALLOC=2048 -Wall -m64 -DF_INTERFACE_GFORT -fPIC -DNO_WARMUP -DMAX_CPU_NUMBER=4 -DMAX_PARALLEL_NUMBER=1 -DVERSION=\"0.3.9\" -DASMNAME= -DASMFNAME=_ -DNAME=_ -DCNAME= -DCHAR_NAME=\"_\" -DCHAR_CNAME=\"\" -DNO_AFFINITY -I.. -shared -o ../libopenblas_nehalem-r0.3.9.so \ --Wl,--whole-archive ../libopenblas_nehalem-r0.3.9.a -Wl,--no-whole-archive \ --Wl,-soname,libopenblas.so.0 -lm -lgfortran -lm -lgfortran -.../buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/9.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: ../libopenblas_nehalem-r0.3.9.a(sbdsvdx.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC - -In the initial support for this principle, added in commit -d0e731e8b825e7a554f245aa8f1118dcec9e2728, the flags specified in the -makefile were appended to the flags specified on the command-line. - -Fix this situation by using 'override' for 'FFLAGS' in -lapack-netlib/make.inc. The flags passed on the command-line are already -part of the LAPACK_FFLAGS variable, so no '+=' is needed here. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index fc5fe3f5..8ae1ff47 100644 ---- a/Makefile -+++ b/Makefile -@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild - lapack_prebuild : - ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) - - at echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc -- - at echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -+ - at echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc --- -2.26.2 - diff --git a/package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 100% rename from package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index c58def9d5d..a1e35f4fc4 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17d4677264dfbc4433e97076220adc79b050e4f8a083ea3f853a53af253bc380 openblas-0.3.9.tar.gz +sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 60b9d9b15b..4d506fa618 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.9 -OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION)) +OPENBLAS_VERSION = 0.3.18 +OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES From peter at korsgaard.com Sun Jan 9 10:40:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 11:40:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openblas: security bump to version 0.3.18 Message-ID: <20220109104813.DC21D82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=095ba6763a9516158924d969276c131736148518 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. - Drop first and second patches (already in version) https://github.com/xianyi/OpenBLAS/blob/v0.3.18/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...o-consider-Os-when-determining-LAPACK_NO.patch} | 0 package/openblas/0001-fix-gfortran-detection.patch | 30 -------------- ...x-support-for-passing-FFLAGS-on-the-make-.patch | 47 ---------------------- ...tem-don-t-specify-optimization-level-bui.patch} | 0 package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 4 +- 6 files changed, 3 insertions(+), 80 deletions(-) diff --git a/package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch similarity index 100% rename from package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch rename to package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch diff --git a/package/openblas/0001-fix-gfortran-detection.patch b/package/openblas/0001-fix-gfortran-detection.patch deleted file mode 100644 index 1fecdac3e5..0000000000 --- a/package/openblas/0001-fix-gfortran-detection.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ece3ce581e3ec530eaccfe7f284c52e115ec7aa9 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker -Date: Wed, 10 Feb 2021 14:22:59 +0100 -Subject: [PATCH] Strip parenthesized (pkgversion) data from GCC version string - to avoid misinterpretation - -See https://github.com/xianyi/OpenBLAS/issues/3099 for details. - -Upstream-status: backport - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire - - ---- - f_check | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/f_check b/f_check -index e9aca4ff9..ffe9c6b46 100644 ---- a/f_check -+++ b/f_check -@@ -75,6 +75,7 @@ if ($compiler eq "") { - - } elsif ($data =~ /GNU/ || $data =~ /GCC/ ) { - -+ $data =~ s/\(+.*?\)+//g; - $data =~ /(\d+)\.(\d+).(\d+)/; - $major = $1; - $minor = $2; diff --git a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch b/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch deleted file mode 100644 index 72b387b93e..0000000000 --- a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4d3829fa52240c2b7e48770ab19584db33ba7863 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:17:59 +0100 -Subject: [PATCH] Makefile: fix support for passing FFLAGS on the make - command line - -When openblas is built while passing FFLAGS on the make command line, the -compilation of lapack objects will not contain the flags specified in -Makefile but _only_ those passed in FFLAGS. - -This can lead to build failure, e.g. because -fPIC is not passed to the -compilation of most lapack objects, but is given to the link command: - -.../buildroot/output/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -O2 -DMAX_STACK_ALLOC=2048 -Wall -m64 -DF_INTERFACE_GFORT -fPIC -DNO_WARMUP -DMAX_CPU_NUMBER=4 -DMAX_PARALLEL_NUMBER=1 -DVERSION=\"0.3.9\" -DASMNAME= -DASMFNAME=_ -DNAME=_ -DCNAME= -DCHAR_NAME=\"_\" -DCHAR_CNAME=\"\" -DNO_AFFINITY -I.. -shared -o ../libopenblas_nehalem-r0.3.9.so \ --Wl,--whole-archive ../libopenblas_nehalem-r0.3.9.a -Wl,--no-whole-archive \ --Wl,-soname,libopenblas.so.0 -lm -lgfortran -lm -lgfortran -.../buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/9.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: ../libopenblas_nehalem-r0.3.9.a(sbdsvdx.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC - -In the initial support for this principle, added in commit -d0e731e8b825e7a554f245aa8f1118dcec9e2728, the flags specified in the -makefile were appended to the flags specified on the command-line. - -Fix this situation by using 'override' for 'FFLAGS' in -lapack-netlib/make.inc. The flags passed on the command-line are already -part of the LAPACK_FFLAGS variable, so no '+=' is needed here. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index fc5fe3f5..8ae1ff47 100644 ---- a/Makefile -+++ b/Makefile -@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild - lapack_prebuild : - ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) - - at echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc -- - at echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -+ - at echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc - - at echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc --- -2.26.2 - diff --git a/package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 100% rename from package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index c58def9d5d..a1e35f4fc4 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17d4677264dfbc4433e97076220adc79b050e4f8a083ea3f853a53af253bc380 openblas-0.3.9.tar.gz +sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 21d05cf30d..2a9bd8b18c 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.9 -OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION)) +OPENBLAS_VERSION = 0.3.18 +OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES From nolange79 at gmail.com Sun Jan 9 11:01:30 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:01:30 +0100 Subject: [Buildroot] [PATCH] package/skeleton-init-systemd: support /var/lock again Message-ID: <20220109110132.3430-1-nolange79@gmail.com> systemd's own configuration file is not installed anymore, as side effect of disabling sysv support. the funtionality is added back in skeleton-init-systemd, since this is a buildroot feature to support software expecting this directories to exist, as well as trying to be similar to other init systems. Signed-off-by: Norbert Lange --- package/skeleton-init-systemd/legacy.conf | 7 +++++++ package/skeleton-init-systemd/skeleton-init-systemd.mk | 1 + 2 files changed, 8 insertions(+) create mode 100644 package/skeleton-init-systemd/legacy.conf diff --git a/package/skeleton-init-systemd/legacy.conf b/package/skeleton-init-systemd/legacy.conf new file mode 100644 index 0000000000..0a5393408c --- /dev/null +++ b/package/skeleton-init-systemd/legacy.conf @@ -0,0 +1,7 @@ +# Create legacy directories for buildroot +# This is a subset of systemd's legacy.conf + +d /run/lock 0755 root root - +d /run/lock/subsys 0755 root root - + +L /var/lock - - - - ../run/lock diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 5d6b716f7a..1e212cc2f7 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,7 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef -- 2.34.1 From peter at korsgaard.com Sun Jan 9 11:02:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 12:02:03 +0100 Subject: [Buildroot] [git commit] package/mongrel2: bump to version 1.13.0 Message-ID: <20220109105604.E141C82A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0a7bffad9e041d9920171802621b67903f9389e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop third patch (already in version) - Drop fourth patch (not needed since https://github.com/mongrel2/mongrel2/commit/8a6db3beb32da1d66757a746f440d92edff166f9) https://github.com/mongrel2/mongrel2/blob/v1.13.0/changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...definition-error-when-building-with-gcc10.patch | 25 ----- .../0004-Support-urandom-inside-chroot.patch | 113 --------------------- package/mongrel2/mongrel2.hash | 4 +- package/mongrel2/mongrel2.mk | 2 +- 4 files changed, 3 insertions(+), 141 deletions(-) diff --git a/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch b/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch deleted file mode 100644 index e1b5788494..0000000000 --- a/package/mongrel2/0003-fix-multiple-definition-error-when-building-with-gcc10.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c51815b10c39c6e802bd1b56549f1d479b480fcc Mon Sep 17 00:00:00 2001 -From: Andrew Sun -Date: Sat, 18 Jul 2020 09:11:11 -0400 -Subject: [PATCH] fix multiple definition error when building with gcc10 - -[Retrieved from: -https://github.com/mongrel2/mongrel2/pull/343/commits/c51815b10c39c6e802bd1b56549f1d479b480fcc] -Signed-off-by: Fabrice Fontaine ---- - src/unixy.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unixy.h b/src/unixy.h -index 045e7c28..4225220c 100644 ---- a/src/unixy.h -+++ b/src/unixy.h -@@ -38,7 +38,7 @@ - #include - #include - --char *m2program; -+extern char *m2program; - - int Unixy_chroot(bstring path); - diff --git a/package/mongrel2/0004-Support-urandom-inside-chroot.patch b/package/mongrel2/0004-Support-urandom-inside-chroot.patch deleted file mode 100644 index 468ddb83fe..0000000000 --- a/package/mongrel2/0004-Support-urandom-inside-chroot.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 330e8c8352eb0ed3c178ac6e0102403c0a835492 Mon Sep 17 00:00:00 2001 -From: Jason Miller -Date: Thu, 5 Jul 2018 20:53:51 -0700 -Subject: [PATCH] Support urandom inside chroot - -This adds a new default entropy function that uses a /dev/urandom stream -opened before the chroot. If initializing that fails, it fallsback on -HAVEGE only if HAVEGE is supported by the mbedTLS. - -This should remove the hard requirement on HAVEGE - -resolves #326 -resolves #327 - -[Upstream status: https://github.com/mongrel2/mongrel2/pull/328] -Signed-off-by: Fabrice Fontaine ---- - src/mongrel2.c | 7 ------- - src/server.c | 36 +++++++++++++++++++++++------------- - 2 files changed, 23 insertions(+), 20 deletions(-) - -diff --git a/src/mongrel2.c b/src/mongrel2.c -index da632d95..48ece8a5 100644 ---- a/src/mongrel2.c -+++ b/src/mongrel2.c -@@ -404,13 +404,6 @@ void taskmain(int argc, char **argv) - rc = attempt_chroot_drop(srv); - check(rc == 0, "Major failure in chroot/droppriv, aborting."); - -- // set up rng after chroot -- // TODO: once mbedtls is updated, we can move this back into Server_create -- if(srv->use_ssl) { -- rc = Server_init_rng(srv); -- check(rc == 0, "Failed to initialize rng for server %s", bdata(srv->uuid)); -- } -- - final_setup(); - - taskcreate(tickertask, NULL, TICKER_TASK_STACK); -diff --git a/src/server.c b/src/server.c -index 45761db4..e44e199b 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -149,35 +149,45 @@ static int Server_load_ciphers(Server *srv, bstring ssl_ciphers_val) - return -1; - } - -+static int urandom_entropy_func(void *data, unsigned char *output, size_t len) -+{ -+ FILE* urandom = (FILE *)data; -+ size_t rc = fread(output, 1, len, urandom); -+ -+ if (rc != len) return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED; -+ -+ return 0; -+} -+ - int Server_init_rng(Server *srv) - { - int rc; -- unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE]; - void *ctx = NULL; - -- mbedtls_entropy_init( &srv->entropy ); -+ FILE *urandom = fopen("/dev/urandom","r"); - -- // test the entropy source -- rc = mbedtls_entropy_func(&srv->entropy, buf, MBEDTLS_ENTROPY_BLOCK_SIZE); -- -- if(rc == 0) { -+ if(urandom != NULL) { - ctx = calloc(sizeof(mbedtls_ctr_drbg_context), 1); - - mbedtls_ctr_drbg_init((mbedtls_ctr_drbg_context *)ctx); - rc = mbedtls_ctr_drbg_seed((mbedtls_ctr_drbg_context *)ctx, -- mbedtls_entropy_func, &srv->entropy, NULL, 0); -+ urandom_entropy_func, urandom, NULL, 0); - check(rc == 0, "Init rng failed: ctr_drbg_init returned %d\n", rc); - - srv->rng_func = mbedtls_ctr_drbg_random; - srv->rng_ctx = ctx; - } else { -- log_warn("entropy source unavailable. falling back to havege rng"); - -+#if defined(MBEDTLS_HAVEGE_C) -+ log_warn("entropy source unavailable. falling back to havege rng"); - ctx = calloc(sizeof(mbedtls_havege_state), 1); - mbedtls_havege_init((mbedtls_havege_state *)ctx); -- - srv->rng_func = mbedtls_havege_random; - srv->rng_ctx = ctx; -+#else -+ log_err("Unable to initialize urandom entropy source, and mbedTLS compiled without HAVEGE"); -+ goto error; -+#endif - } - - return 0; -@@ -278,10 +288,10 @@ Server *Server_create(bstring uuid, bstring default_host, - - // TODO: once mbedtls supports opening urandom early and keeping it open, - // put the rng initialization back here (before chroot) -- //if(use_ssl) { -- // rc = Server_init_rng(srv); -- // check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); -- //} -+ if(use_ssl) { -+ rc = Server_init_rng(srv); -+ check(rc == 0, "Failed to initialize rng for server %s", bdata(uuid)); -+ } - - if(blength(chroot) > 0) { - srv->chroot = bstrcpy(chroot); check_mem(srv->chroot); diff --git a/package/mongrel2/mongrel2.hash b/package/mongrel2/mongrel2.hash index ea3a1cb426..f4f094ea03 100644 --- a/package/mongrel2/mongrel2.hash +++ b/package/mongrel2/mongrel2.hash @@ -1,6 +1,6 @@ # From https://mongrel2.org -sha1 6f81fa747a1e198d1a655c3677b6de686a5a51f7 mongrel2-v1.12.2.tar.bz2 +sha1 6057f9cbfae41e2cdef1e0f715df3c1a4d3a1884 mongrel2-v1.13.0.tar.bz2 # Locally computed -sha256 3bffeae198c37a1efc9c12f77d5f1eb61cdf62b35d661babc2527dd030aa7d8f mongrel2-v1.12.2.tar.bz2 +sha256 b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10 mongrel2-v1.13.0.tar.bz2 sha256 eb6e2a2baa637d06f6aa762886fbc8939934eb5fdb0b3a5b3882f2a61e9a4357 LICENSE diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk index cbe7e3fb91..07914ad0fe 100644 --- a/package/mongrel2/mongrel2.mk +++ b/package/mongrel2/mongrel2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGREL2_VERSION = 1.12.2 +MONGREL2_VERSION = 1.13.0 MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2 # Do not use the github helper here, the generated tarball is *NOT* the same # as the one uploaded by upstream for the release. From peter at korsgaard.com Sun Jan 9 11:02:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 12:02:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongrel2: bump to version 1.13.0 In-Reply-To: <20220108233910.114777-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 00:39:10 +0100") References: <20220108233910.114777-1-fontaine.fabrice@gmail.com> Message-ID: <87r19hcgu6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop third patch (already in version) > - Drop fourth patch (not needed since > https://github.com/mongrel2/mongrel2/commit/8a6db3beb32da1d66757a746f440d92edff166f9) > https://github.com/mongrel2/mongrel2/blob/v1.13.0/changelog.txt > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From nolange79 at gmail.com Sun Jan 9 11:05:55 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:05:55 +0100 Subject: [Buildroot] [PATCH v2] package/openrc: add patch to create /run/lock/subsys Message-ID: <20220109110555.3789-1-nolange79@gmail.com> Together with changes to sysv/busybox init, this directory will already exist on all init systems before any service scripts are run. Signed-off-by: Norbert Lange --- v1->v2: * refresh patch --- ...lso-create-run-lock-subsys-directory.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/openrc/0006-Also-create-run-lock-subsys-directory.patch diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch new file mode 100644 index 0000000000..cf592a88b0 --- /dev/null +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch @@ -0,0 +1,29 @@ +From 49e5929b468f604d80a0c04a6ce78eb96ca36090 Mon Sep 17 00:00:00 2001 +From: Norbert Lange +Date: Sun, 9 Jan 2022 00:22:40 +0100 +Subject: [PATCH] Also create /run/lock/subsys directory + +Buildroot service scripts regularly use this directory, so +create it in the most appropriate spot. + +Signed-off-by: Norbert Lange +--- + sh/init.sh.Linux.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in +index e8afc1fb..662ab223 100644 +--- a/sh/init.sh.Linux.in ++++ b/sh/init.sh.Linux.in +@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then + fi + + checkpath -d "$RC_SVCDIR" +-checkpath -d -m 0775 -o root:daemon /run/lock ++checkpath -d -m 0775 -o root:daemon /run/lock /run/lock/subsys + + # Try to mount xenfs as early as possible, otherwise rc_sys() will always + # return RC_SYS_XENU and will think that we are in a domU while it's not. +-- +2.34.1 + -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 11:07:35 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:07:35 +0100 Subject: [Buildroot] [PATCH v3] package/systemd: invoke systemd-tmpfilesd on final image Message-ID: <20220109110736.3963-1-nolange79@gmail.com> Especially for read-only filesystems it is helpfull to pre-create all folders for non-volatile paths. This needs to run under fakeroot to allow setting uids/gids/perms for the target fs. systemd-tmpfilesd supports specifiers and target rootfs, but some specifiers resolve to information from the host, it is necessary to specially handle (skip) entries that contain problematic specifiers. Signed-off-by: Norbert Lange --- v1->v2 * add a script to skip/handle specifiers that might otherwise take information from the host v2->v3 * adopt fakeroot_tmpfiles.sh to current systemd-tmpfilesd (v250), several more specifiers are supported directly for our usecase. --- package/systemd/fakeroot_tmpfiles.sh | 57 ++++++++++++++++++++++++++++ package/systemd/systemd.mk | 9 ++++- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 package/systemd/fakeroot_tmpfiles.sh diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh new file mode 100644 index 0000000000..7e9b02cc0a --- /dev/null +++ b/package/systemd/fakeroot_tmpfiles.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# +# The systemd-tmpfiles has the ability to grab information +# from the filesystem (instead from the running system). +# +# However there are a few specifiers that *always* will grab +# information from the running system examples are %a, %b, %m, %H +# (Architecture, Boot UUID, Machine UUID, Hostname). +# +# See [1] for historic information. +# +# This script will (conservatively) skip tmpfiles lines that have +# such an specifier to prevent leaking host information. +# +# shell expansion is critical to be POSIX compliant, +# this script wont work with zsh in its default mode for example. +# +# The script takes several measures to handle more complex stuff +# like passing this correctly: +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n +# +# [1] - https://github.com/systemd/systemd/pull/16187 + +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles + +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } + +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | + while read -r line; do + # it is allowed to use quotes around arguments, + # so let the shell pack the arguments + eval "set -- $line" + + # dont output warnings for directories we dont process + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || + continue + + # blank out all specs that are ok to use, + # test if some remain. (Specs up to date with v250) + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then + # no "bad" specifiers, pass the line unmodified + eval "printf '%s\n' '$line'" + else + # warn + eval "printf 'ignored spec: %s\n' '$line' 1>&2" + fi + done | +\ +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ + --exclude-prefix=/tmp --exclude-prefix=/mnt \ + - diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 7bf8018438..e136229c8e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -709,10 +709,15 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE +define SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef + define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) @@ -783,7 +788,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dvconsole=false \ -Dquotacheck=false \ -Dsysusers=false \ - -Dtmpfiles=false \ + -Dtmpfiles=true \ -Dimportd=false \ -Dhwdb=false \ -Drfkill=false \ -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 11:09:57 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:09:57 +0100 Subject: [Buildroot] [PATCH] package/systemd: add systemd-oomd user Message-ID: <20220109110958.4251-1-nolange79@gmail.com> add the missing user if homed is enabled. Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 13520126d6..f5ddd928c9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -428,6 +428,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_OOMD),y) SYSTEMD_CONF_OPTS += -Doomd=true +SYSTEMD_OOMD_USER = systemd-oom -1 systemd-oom -1 * - - - systemd Userspace OOM Killer else SYSTEMD_CONF_OPTS += -Doomd=false endif @@ -586,6 +587,7 @@ define SYSTEMD_USERS - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) + $(SYSTEMD_OOMD_USER) $(SYSTEMD_NETWORKD_USER) $(SYSTEMD_RESOLVED_USER) $(SYSTEMD_TIMESYNCD_USER) -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 11:09:58 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 12:09:58 +0100 Subject: [Buildroot] [PATCH] package/systemd: fix pre-create directories for coredump In-Reply-To: <20220109110958.4251-1-nolange79@gmail.com> References: <20220109110958.4251-1-nolange79@gmail.com> Message-ID: <20220109110958.4251-2-nolange79@gmail.com> Fix a copy-pasta bug Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e136229c8e..13520126d6 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -414,7 +414,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing -SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - +SYSTEMD_COREDUMP_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -575,6 +575,7 @@ define SYSTEMD_PERMISSIONS $(SYSTEMD_LOGIND_PERMISSIONS) $(SYSTEMD_MACHINED_PERMISSIONS) $(SYSTEMD_HOMED_PERMISSIONS) + $(SYSTEMD_COREDUMP_PERMISSIONS) $(SYSTEMD_PSTORE_PERMISSIONS) $(SYSTEMD_TIMESYNCD_PERMISSIONS) endef -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: use CARGO_BUILD_TARGET instead of --target Message-ID: <20220109110756.9242882B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91a5a2d317a02d7fb41e706a490fe5063039d55c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will allow PKG_CARGO_ENV to be used in other contexts, such as the upcoming python-cryptography version bump. Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index c8dfc62db2..7f63595831 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -42,7 +42,8 @@ PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ - CARGO_TARGET_APPLIES_TO_HOST="false" + CARGO_TARGET_APPLIES_TO_HOST="false" \ + CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) @@ -102,7 +103,6 @@ define $(2)_BUILD_CMDS $$($(2)_CARGO_ENV) \ cargo build \ --offline \ - --target $$(RUSTC_TARGET_NAME) \ $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ --manifest-path Cargo.toml \ --locked \ @@ -138,7 +138,6 @@ define $(2)_INSTALL_TARGET_CMDS $$(PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ cargo install \ - --target $$(RUSTC_TARGET_NAME) \ --offline \ --root $$(TARGET_DIR)/usr/ \ --bins \ From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: split PKG_CARGO_ENV into target/host variables Message-ID: <20220109110756.7F7DC82B9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0894937f7fc4ac9d04d65bc6cdd5fc1927483976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some variables should only be passed for target packages, such as the target-applies-to-host variable. Additional target-specific variables will also be added. Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 47ae86bfae..5f09f39a3f 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -20,15 +20,21 @@ # ################################################################################ +PKG_COMMON_CARGO_ENV = \ + CARGO_HOME=$(HOST_DIR)/share/cargo + # __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS is needed to allow # passing the -Z target-applies-to-host, which is needed together with # CARGO_TARGET_APPLIES_TO_HOST to fix build problems when target # architecture == host architecture. PKG_CARGO_ENV = \ - CARGO_HOME=$(HOST_DIR)/share/cargo \ + $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ CARGO_TARGET_APPLIES_TO_HOST="false" +HOST_PKG_CARGO_ENV = \ + $(PKG_COMMON_CARGO_ENV) + ################################################################################ # inner-cargo-package -- defines how the configuration, compilation and # installation of a cargo package should be done, implements a few hooks @@ -97,7 +103,7 @@ define $(2)_BUILD_CMDS $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ - $$(PKG_CARGO_ENV) \ + $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ cargo build \ --offline \ @@ -139,7 +145,7 @@ define $(2)_INSTALL_CMDS $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ - $$(PKG_CARGO_ENV) \ + $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ cargo install \ --offline \ From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: use CARGO_TARGET__LINKER instead of cargo config file Message-ID: <20220109110756.9AD6A82B96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6378631c2609742382984f6f7b93c1d9d2cdb78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master package/rustc/rustc.mk produces a config file in $(CARGO_HOME) that points to the linker. We can simplify that by using the CARGO_TARGET__LINKER environment variable. This will also fix problems when host == target, where the target linker gets picked up incorrectly. Fixes: http://autobuild.buildroot.net/results/2183f1835f2ef553e45e83959910205127b2b259/ Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 3 ++- package/rustc/cargo-config.in | 2 -- package/rustc/rustc.mk | 12 ------------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 7f63595831..77d2f66b17 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -43,7 +43,8 @@ PKG_CARGO_ENV = \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ - CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" + CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ + CARGO_TARGET_$(subst,-,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) diff --git a/package/rustc/cargo-config.in b/package/rustc/cargo-config.in deleted file mode 100644 index 47fad026be..0000000000 --- a/package/rustc/cargo-config.in +++ /dev/null @@ -1,2 +0,0 @@ -[target. at RUSTC_TARGET_NAME@] -linker = "@CROSS_PREFIX at gcc" diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 52860b7eff..0513dd0b40 100644 --- a/package/rustc/rustc.mk +++ b/package/rustc/rustc.mk @@ -20,15 +20,3 @@ endif RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu $(eval $(host-virtual-package)) - -ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) -define RUSTC_INSTALL_CARGO_CONFIG - mkdir -p $(HOST_DIR)/share/cargo - sed -e 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ - -e 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ - package/rustc/cargo-config.in \ - > $(HOST_DIR)/share/cargo/config -endef -# check-package disable TypoInPackageVariable - TOOLCHAIN intended -TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += RUSTC_INSTALL_CARGO_CONFIG -endif From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] support/testing/tests: switch python-cryptography related tests to glibc Message-ID: <20220109110756.769C882941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5ead094e18cd4a5a9a22b69a42e687f43ee8a8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In a follow-up commit, we are about to bump python-cryptography to a new version, which has the interesting charateristic of using Rust code. This means python-cryptography will now only be available on platforms supported by Rust, which for now excludes uclibc-based configurations (none of the Rust Tier1/Tier2 platforms use uClibc, there is some uClibc support in Tier3 platforms but they have not been added to Buildroot for now). So in preparation for this bump, we switch the few test cases of Python packages that directly or indirectly use python-cryptography to use a glibc toolchain. Another impacted test case is the docker-compose test case, but it already uses a glibc toolchain; Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_autobahn.py | 10 +++++++++- support/testing/tests/package/test_python_crossbar.py | 10 +++++++++- support/testing/tests/package/test_python_cryptography.py | 10 +++++++++- support/testing/tests/package/test_python_service_identity.py | 10 +++++++++- support/testing/tests/package/test_python_treq.py | 10 +++++++++- support/testing/tests/package/test_python_txtorcon.py | 10 +++++++++- 6 files changed, 54 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_autobahn.py b/support/testing/tests/package/test_python_autobahn.py index a237ce465d..6c1678a615 100644 --- a/support/testing/tests/package/test_python_autobahn.py +++ b/support/testing/tests/package/test_python_autobahn.py @@ -3,9 +3,17 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Autobahn(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AUTOBAHN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_autobahn.py"] diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py index d7843ddd8b..83649aeec2 100644 --- a/support/testing/tests/package/test_python_crossbar.py +++ b/support/testing/tests/package/test_python_crossbar.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Crossbar(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_crossbar.py"] timeout = 60 diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py index 62f0ca0def..bf11c02e5c 100644 --- a/support/testing/tests/package/test_python_cryptography.py +++ b/support/testing/tests/package/test_python_cryptography.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Cryptography(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_cryptography.py"] timeout = 40 diff --git a/support/testing/tests/package/test_python_service_identity.py b/support/testing/tests/package/test_python_service_identity.py index 09cfbe0a26..dbad5f931f 100644 --- a/support/testing/tests/package/test_python_service_identity.py +++ b/support/testing/tests/package/test_python_service_identity.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3ServiceIdentity(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_service_identity.py"] timeout = 30 diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index 307c9932b2..515f1ea304 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -14,8 +14,16 @@ class TestPythonTreq(TestPythonPackageBase): class TestPythonPy3Treq(TestPythonTreq): __test__ = True - config = TestPythonTreq.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TREQ=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 8e74190ee1..6f0c4ca1ed 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -3,10 +3,18 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # python-cryptography using Rust (not available with uclibc) + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TXTORCON=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_txtorcon.py"] timeout = 30 From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:48 +0100 Subject: [Buildroot] [git commit] support/download/cargo-post-process: make manifest path configurable Message-ID: <20220109110756.6E22D82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36e8743da181420775b79d5be9bbe872b00f2c01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In most pure Rust packages, the Cargo.toml manifest is at the root directory, which is why we could call "cargo vendor" without specifying the path of the manifest. However, other packages, such as python-cryptography, which have parts implemented in Rust, have their Cargo.toml located in a specific subdirectory. This commit extends the cargo-post-process download script to understand a BR_CARGO_MANIFEST_PATH environment variable, which allows a package to pass the location of the Cargo.toml file. If not passed, "Cargo.toml" is used, preserving the existing behavior for other packages. Signed-off-by: Thomas Petazzoni --- support/download/cargo-post-process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 2d1c66661d..a4a4718a2a 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -22,7 +22,7 @@ post_process_unpack "${base_name}" "${output}" # Do the Cargo vendoring pushd "${base_name}" > /dev/null -cargo vendor --locked VENDOR +cargo vendor --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} --locked VENDOR # Create the local .cargo/config with vendor info mkdir -p .cargo/ From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: enable -Z target-applies-to-host via env Message-ID: <20220109110756.8863282BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98c7ea3ddf11d08acd11e30be36b4b56c682d239 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This should be more reliable and fix the host == target bug when doing indirect invocations using the cargo env. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 5f09f39a3f..c8dfc62db2 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -27,9 +27,21 @@ PKG_COMMON_CARGO_ENV = \ # passing the -Z target-applies-to-host, which is needed together with # CARGO_TARGET_APPLIES_TO_HOST to fix build problems when target # architecture == host architecture. + +# __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" is to allow +# using nighly features on stable releases, i.e features that are not +# yet considered stable. +# +# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" "enables the nightly +# configuration option target-applies-to-host value to be set +# +# CARGO_TARGET_APPLIES_TO_HOST="false" is actually setting the value +# for this feature, which we disable, to make sure builds where target +# arch == host arch work correctly PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" HOST_PKG_CARGO_ENV = \ @@ -94,7 +106,6 @@ define $(2)_BUILD_CMDS $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ --manifest-path Cargo.toml \ --locked \ - -Z target-applies-to-host \ $$($(2)_CARGO_BUILD_OPTS) endef else # ifeq ($(4),target) From thomas.petazzoni at bootlin.com Sun Jan 9 11:13:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:13:49 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: bump version to 36.0.1 Message-ID: <20220109110756.A5D1C82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01764876e3d4e7ab95c8365f1c83e6c12d49757c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version bump requires significant changes because python-cryptography is now partially implemented in Rust. This means that: - The C++ dependency is no longer needed. - We need to ensure we are on an architecture where Rust is available (BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS) - Almost all Python dependencies are no longer relevant, except for the python-cffi. - A number of environment variables are needed to make the Rust part build correctly. - We need to invoke the "cargo" download post-process hook to vendor the Cargo dependencies at download time. - We need to propagate to relatively significant reverse dependency tree the changes of dependencies on python-cryptography. Co-developed-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/docker-compose/Config.in | 8 +++++--- package/python-autobahn/Config.in | 6 +----- package/python-channels-redis/Config.in | 7 ++----- package/python-channels/Config.in | 7 ++----- package/python-crossbar/Config.in | 6 +----- package/python-cryptography/Config.in | 14 ++------------ package/python-cryptography/python-cryptography.hash | 5 ++--- package/python-cryptography/python-cryptography.mk | 14 +++++++++++--- package/python-daphne/Config.in | 7 ++----- package/python-keyring/Config.in | 7 ++----- package/python-opcua-asyncio/Config.in | 1 + package/python-paramiko/Config.in | 8 ++------ package/python-pyopenssl/Config.in | 8 ++------ package/python-secretstorage/Config.in | 6 +----- package/python-service-identity/Config.in | 10 ++++------ package/python-treq/Config.in | 10 ++++------ package/python-twisted/Config.in | 6 ++---- package/python-txdbus/Config.in | 5 ++++- package/python-txtorcon/Config.in | 7 ++----- 19 files changed, 52 insertions(+), 90 deletions(-) diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 8e16b60521..761befea4d 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -5,7 +5,8 @@ config BR2_PACKAGE_DOCKER_COMPOSE depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_THREADS # python depends on !BR2_STATIC_LIBS # python - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko -> python-cryptography + # python-paramiko -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime select BR2_PACKAGE_PYTHON_DOCOPT # runtime @@ -23,7 +24,8 @@ config BR2_PACKAGE_DOCKER_COMPOSE https://www.docker.com/ -comment "docker-compose needs a toolchain w/ C++, wchar, threads, dynamic library" +comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP + BR2_STATIC_LIBS diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in index f719dcc8f1..92ddad0ea4 100644 --- a/package/python-autobahn/Config.in +++ b/package/python-autobahn/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography -> python-pyasn + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime @@ -11,7 +11,3 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN framework. https://pypi.python.org/pypi/autobahn - -comment "python-autobahn needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-channels-redis/Config.in b/package/python-channels-redis/Config.in index 8946670180..bab801d2a9 100644 --- a/package/python-channels-redis/Config.in +++ b/package/python-channels-redis/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS bool "python-channels-redis" - depends on BR2_INSTALL_LIBSTDCPP # python-channels -> python-daphne + # python-channels -> python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-channels select BR2_PACKAGE_PYTHON_AIOREDIS # runtime select BR2_PACKAGE_PYTHON_ASGIREF # runtime @@ -12,7 +13,3 @@ config BR2_PACKAGE_PYTHON_CHANNELS_REDIS sharded configurations, as well as group support. http://github.com/django/channels_redis/ - -comment "python-channels-redis needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-channels/Config.in b/package/python-channels/Config.in index 5c70f20d1c..6cd6e5f60d 100644 --- a/package/python-channels/Config.in +++ b/package/python-channels/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CHANNELS bool "python-channels" - depends on BR2_INSTALL_LIBSTDCPP # python-daphne -> python-autobahn -> python-cryptography + # python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-daphne select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_DAPHNE # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_CHANNELS own protocols and needs. http://github.com/django/channels - -comment "python-channels needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in index 50b70b8e02..b72d64c19d 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 # All the following dependencies are runtime dependencies select BR2_PACKAGE_PYTHON_ATTRS @@ -48,7 +48,3 @@ config BR2_PACKAGE_PYTHON_CROSSBAR components that can talk in real-time with each other. https://pypi.python.org/pypi/crossbar - -comment "python-crossbar needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index da4252d6da..07a22bf846 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -1,21 +1,11 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" - depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime - select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON3_SSL # runtime help cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. https://cryptography.io - -comment "python-cryptography needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 7cb38c8d3d..1219fa9b5f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,6 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/cryptography/json -md5 e2ce2ec8a63965fad351f36ed70fde4b cryptography-3.3.2.tar.gz -sha256 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed cryptography-3.3.2.tar.gz +# Locally calculated after vendoring +sha256 196bba703cebc052a19f5353614fcfa9d680471990c10305f110adcc05744eeb cryptography-36.0.1.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 9c00efb44f..fc1686af9a 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,14 +4,22 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 3.3.2 +PYTHON_CRYPTOGRAPHY_VERSION = 36.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d559879912eb8a1c5d16ad9f25d35f7c4f4c +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/f9/4b/1cf8e281f7ae4046a59e5e39dd7471d46db9f61bb564fddbff9084c4334f PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-setuptools-rust host-python-cffi host-rustc +PYTHON_CRYPTOGRAPHY_ENV = \ + $(PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +# We need to vendor the Cargo crates at download time +PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo +PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_CRYPTOGRAPHY_DL_ENV = \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in index 601b2e1db8..c4479417e9 100644 --- a/package/python-daphne/Config.in +++ b/package/python-daphne/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_DAPHNE bool "python-daphne" - depends on BR2_INSTALL_LIBSTDCPP # python-autobahn -> python-cryptography + # python-autobahn -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_DAPHNE versus HTTP endpoints. https://github.com/django/daphne - -comment "python-daphne needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_PYTHON3 diff --git a/package/python-keyring/Config.in b/package/python-keyring/Config.in index f7bb1ae820..61cb98952f 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_KEYRING bool "python-keyring" + # python-secretstorage -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help @@ -9,7 +10,3 @@ config BR2_PACKAGE_PYTHON_KEYRING system keyring service from Python. https://pypi.python.org/pypi/keyring - -comment "python-keyring needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in index 3700e00e1d..95715fdd08 100644 --- a/package/python-opcua-asyncio/Config.in +++ b/package/python-opcua-asyncio/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO bool "python-opcua-asyncio" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_AIOFILES # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index 4b8495d76d..e44237b0c2 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" - depends on BR2_PACKAGE_PYTHON3 # python-bcrypt - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-bcrypt, python-cryptography select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime @@ -10,7 +10,3 @@ config BR2_PACKAGE_PYTHON_PARAMIKO SSH2 protocol library. https://github.com/paramiko/paramiko/ - -comment "python-paramiko needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index 99ea4e9408..65d516813f 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -1,14 +1,10 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL bool "python-pyopenssl" - depends on BR2_PACKAGE_PYTHON3 # python-cryptography -> python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help Python wrapper module around the OpenSSL library. https://github.com/pyca/pyopenssl - -comment "python-pyopenssl needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in index 8ae8c2d598..059ea097bb 100644 --- a/package/python-secretstorage/Config.in +++ b/package/python-secretstorage/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE bool "python-secretstorage" depends on BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime help Python bindings to FreeDesktop.org Secret Service API. https://github.com/mitya57/secretstorage - -comment "python-secretstorage needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index ab012347dc..c571065e92 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" - depends on BR2_PACKAGE_PYTHON3 # python-pyopenssl -> python-cryptography -> python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime @@ -11,7 +13,3 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY Service identity verification for pyOpenSSL. https://pypi.python.org/pypi/service_identity - -comment "python-service-identify needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 02c26a53f7..6e54c19e16 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" - depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-idna, python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime @@ -16,7 +18,3 @@ config BR2_PACKAGE_PYTHON_TREQ API for making HTTP requests when using Twisted. https://github.com/twisted/treq - -comment "python-treq needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 29536ecf9d..89298b2e0c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -23,12 +23,10 @@ config BR2_PACKAGE_PYTHON_TWISTED_HTTP2 config BR2_PACKAGE_PYTHON_TWISTED_TLS bool "TLS support" - depends on BR2_INSTALL_LIBSTDCPP # python-{pyopenssl,service-identity} + # python-{pyopenssl,service-identity} + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime -comment "TLS support needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - endif diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index c7de322f91..ffd00f153e 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_PYTHON_TXDBUS bool "python-txdbus" - depends on BR2_PACKAGE_PYTHON3 # python-twisted -> python-cryptography -> python-idna + # python-twisted -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # python-twisted -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index e8a1a233db..0606e5f442 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_TXTORCON bool "python-txtorcon" + # python-pyopenssl -> python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 # python-idna - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime @@ -14,7 +15,3 @@ config BR2_PACKAGE_PYTHON_TXTORCON configuration abstractions. https://github.com/meejah/txtorcon - -comment "python-txtorcon needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP From thomas.petazzoni at bootlin.com Sun Jan 9 11:14:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:14:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: enable -Z target-applies-to-host via env In-Reply-To: <20220109084732.2567404-1-james.hilliard1@gmail.com> References: <20220109084732.2567404-1-james.hilliard1@gmail.com> Message-ID: <20220109121440.7b2fb23c@windsurf> On Sun, 9 Jan 2022 01:47:32 -0700 James Hilliard wrote: > This should be more reliable and fix the host == target bug when > doing indirect invocations using the cargo env. > > Signed-off-by: James Hilliard > --- > package/pkg-cargo.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I've applied, after integrating that into a larger series, and adding more comments in the code about all those variables. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 11:16:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 12:16:00 +0100 Subject: [Buildroot] [PATCH 0/7] Bump of python-cryptography and other Rust related fun In-Reply-To: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> References: <20220107171318.1423075-1-thomas.petazzoni@bootlin.com> Message-ID: <20220109121600.21fb8f5d@windsurf> Hello, On Fri, 7 Jan 2022 18:13:10 +0100 Thomas Petazzoni wrote: > Thomas Petazzoni (7): > package/ca-certificates: remove dependency on host-python-cryptography > package/python-cryptography: drop host variant > package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 > package/rustc: fix the riscv64gc architecture handling > support/download/cargo-post-process: make manifest path configurable > support/testing/tests: switch python-cryptography related tests to > glibc > DO-NOT-APPLY package/python-cryptography: bump version to 36.0.1 Thanks to the help of James, we were able to figure out the last issues, so I pushed those last 3 patches, but with a number of additional preparation patches: 01764876e3d4e7ab95c8365f1c83e6c12d49757c package/python-cryptography: bump version to 36.0.1 b6378631c2609742382984f6f7b93c1d9d2cdb78 package/pkg-cargo.mk: use CARGO_TARGET__LINKER instead of cargo config file 91a5a2d317a02d7fb41e706a490fe5063039d55c package/pkg-cargo.mk: use CARGO_BUILD_TARGET instead of --target 98c7ea3ddf11d08acd11e30be36b4b56c682d239 package/pkg-cargo.mk: enable -Z target-applies-to-host via env 0894937f7fc4ac9d04d65bc6cdd5fc1927483976 package/pkg-cargo.mk: split PKG_CARGO_ENV into target/host variables e5ead094e18cd4a5a9a22b69a42e687f43ee8a8b support/testing/tests: switch python-cryptography related tests to glibc 36e8743da181420775b79d5be9bbe872b00f2c01 support/download/cargo-post-process: make manifest path configurable Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Sun Jan 9 11:22:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 12:22:25 +0100 Subject: [Buildroot] [PATCH] package/poppler: use HTTPS for upstream URL In-Reply-To: <20220109093735.4860-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 9 Jan 2022 10:37:33 +0100") References: <20220109093735.4860-1-peter@korsgaard.com> Message-ID: <87mtk5cfwu.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ > The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget > versions (E.G. s.b.o): > wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz > DEBUG output created by Wget 1.14 on linux-gnu. > URI encoding = ?UTF-8? > Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) > Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) > --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz > Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 > Caching poppler.freedesktop.org => 147.75.198.156 > Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. > Created socket 3. > Releasing 0x0000000001ceda80 (new refcount 1). > ---request begin--- > GET /poppler-21.12.0.tar.xz HTTP/1.1 > User-Agent: Wget/1.14 (linux-gnu) > Accept: */* > Host: poppler.freedesktop.org > Connection: Keep-Alive > ---request end--- > HTTP request sent, awaiting response... > ---response begin--- > HTTP/1.1 308 Permanent Redirect > Date: Sun, 09 Jan 2022 09:28:02 GMT > Content-Type: text/html > Content-Length: 164 > Connection: keep-alive > Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz > ---response end--- > 308 Permanent Redirect > Registered socket 3 for persistent reuse. > Skipping 164 bytes of body: [ > 308 Permanent Redirect > >

    308 Permanent Redirect

    >
    nginx
    > > > ] done. > 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 11:21:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 12:21:50 +0100 Subject: [Buildroot] [git commit] package/poppler: use HTTPS for upstream URL Message-ID: <20220109111822.50FE882A93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c39e0abba945dcc52e2e9e70b92fc94f1c351c0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget versions (E.G. s.b.o): wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz DEBUG output created by Wget 1.14 on linux-gnu. URI encoding = ???UTF-8??? Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 Caching poppler.freedesktop.org => 147.75.198.156 Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. Created socket 3. Releasing 0x0000000001ceda80 (new refcount 1). ---request begin--- GET /poppler-21.12.0.tar.xz HTTP/1.1 User-Agent: Wget/1.14 (linux-gnu) Accept: */* Host: poppler.freedesktop.org Connection: Keep-Alive ---request end--- HTTP request sent, awaiting response... ---response begin--- HTTP/1.1 308 Permanent Redirect Date: Sun, 09 Jan 2022 09:28:02 GMT Content-Type: text/html Content-Length: 164 Connection: keep-alive Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz ---response end--- 308 Permanent Redirect Registered socket 3 for persistent reuse. Skipping 164 bytes of body: [ 308 Permanent Redirect

    308 Permanent Redirect

    nginx
    ] done. 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. Signed-off-by: Peter Korsgaard --- package/poppler/Config.in | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index f59115813d..21c4d86cf6 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POPPLER Poppler is a PDF rendering library based on the xpdf-3.0 code base. - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ if BR2_PACKAGE_POPPLER diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 23f04f6e51..9e9bfc9cba 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -6,7 +6,7 @@ POPPLER_VERSION = 21.12.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org +POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING From fontaine.fabrice at gmail.com Sun Jan 9 11:23:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 12:23:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix build on kernel < 5.10 Message-ID: <20220109112337.294418-1-fontaine.fabrice@gmail.com> zoned depends on kernel >= 5.10: https://github.com/kdave/btrfs-progs/commit/d4b4baf312ff083fb1e85de92167ea3e968c684c Fix the following build failure raised since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: checking linux/blkzoned.h usability... yes checking linux/blkzoned.h presence... yes checking for linux/blkzoned.h... yes checking for struct blk_zone.capacity... no checking for BLKGETZONESZ defined in linux/blkzoned.h... yes configure: error: linux/blkzoned.h does not provide blk_zone.capacity Fixes: - http://autobuild.buildroot.org/results/381c7e8b4bfa624c3eca3ce072cfa412aba57f84 Signed-off-by: Fabrice Fontaine --- package/btrfs-progs/btrfs-progs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index b010a0e0be..54922df839 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -44,6 +44,12 @@ else BTRFS_PROGS_CONF_OPTS += --disable-libudev endif +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10),y) +BTRFS_PROGS_CONF_OPTS += --enable-zoned +else +BTRFS_PROGS_CONF_OPTS += --disable-zoned +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ -- 2.34.1 From gilles.talis at gmail.com Sun Jan 9 11:32:23 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 9 Jan 2022 12:32:23 +0100 Subject: [Buildroot] [PATCH] package/libolm: bump to version 3.2.9 Message-ID: <20220109113223.755567-1-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/libolm/libolm.hash | 2 +- package/libolm/libolm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 80210a2e5f..044bb24f06 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9b61bd9182bb0ae0c5a800a8b0496b69600a0a22e3a21fce0aad119d2b1c99ae olm-3.2.6.tar.gz +sha256 614c0e4dc4721f57e56c3385bd8def2f71c6631f928a480efd0b4bd8e5435df9 olm-3.2.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 0049fb6001..607e50702f 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.2.6 +LIBOLM_VERSION = 3.2.9 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 -- 2.32.0 From gilles.talis at gmail.com Sun Jan 9 11:33:12 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 9 Jan 2022 12:33:12 +0100 Subject: [Buildroot] [PATCH] package/xapian: bump to version 1.4.19 Message-ID: <20220109113312.755637-1-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/xapian/xapian.hash | 4 ++-- package/xapian/xapian.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index 192032e6db..e570f7e2f2 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2021-January/009856.html -sha256 196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 xapian-core-1.4.18.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2022-January/009934.html +sha256 1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3 xapian-core-1.4.19.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 4f40babcf9..464e5478df 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.18 +XAPIAN_VERSION = 1.4.19 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ -- 2.32.0 From gilles.talis at gmail.com Sun Jan 9 11:47:57 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 9 Jan 2022 12:47:57 +0100 Subject: [Buildroot] [PATCH] package/tesseract-ocr: bump to version 5.0.1 Message-ID: <20220109114757.785223-1-gilles.talis@gmail.com> - Updated language training data version to 4.1.0 - Removed current patch as not required anymore - Added patch to fix uclibc failures - Supported C++ version has moved from C++11 to C++17 Signed-off-by: Gilles Talis --- ...-if-platform-supports-feenableexcept.patch | 42 +++++++++++++++++++ ...-Fix-timeval-structure-build-failure.patch | 27 ------------ package/tesseract-ocr/Config.in | 6 +-- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 4 +- 5 files changed, 48 insertions(+), 33 deletions(-) create mode 100644 package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch delete mode 100644 package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch diff --git a/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch new file mode 100644 index 0000000000..5280f01aba --- /dev/null +++ b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch @@ -0,0 +1,42 @@ +From 52484af83a58664c3cc91b8af07aeeea271f67ef Mon Sep 17 00:00:00 2001 +From: Gilles Talis +Date: Sun, 9 Jan 2022 10:58:36 +0100 +Subject: [PATCH] Check if platform supports feenableexcept + +Signed-off-by: Gilles Talis +--- + configure.ac | 4 ++++ + src/tesseract.cpp | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9177d64..80cd735 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,10 @@ case "${host_cpu}" in + + esac + ++# check whether feenableexcept is supported. some C libraries (e.g. uclibc) don't. ++AC_CHECK_FUNC(feenableexcept, [feenableexcept=true], [feenableexcept=false]) ++AM_CONDITIONAL([HAVE_FEENABLEEXCEPT], $feenableexcept) ++ + AX_CHECK_COMPILE_FLAG([-fopenmp-simd], [openmp_simd=true], [openmp_simd=false], [$WERROR]) + AM_CONDITIONAL([OPENMP_SIMD], $openmp_simd) + +diff --git a/src/tesseract.cpp b/src/tesseract.cpp +index 933116e..9154db8 100644 +--- a/src/tesseract.cpp ++++ b/src/tesseract.cpp +@@ -629,7 +629,7 @@ static void PreloadRenderers(tesseract::TessBaseAPI &api, + **********************************************************************/ + + int main(int argc, char **argv) { +-#if defined(__USE_GNU) ++#if defined(__USE_GNU) && defined(HAVE_FEENABLEEXCEPT) + // Raise SIGFPE. + # if defined(__clang__) + // clang creates code which causes some FP exceptions, so don't enable those. +-- +2.32.0 + diff --git a/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch b/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch deleted file mode 100644 index 0b0bb1a899..0000000000 --- a/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ea1e1ddfc0af9966a0c613a93087bc3e0a5979a7 Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Fri, 19 Jul 2019 18:52:03 +0200 -Subject: [PATCH] Fix timeval structure build failure - -timeval structure definition requires to be included - -Signed-off-by: Gilles Talis ---- - src/ccutil/ocrclass.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h -index d39a6dd..2a01118 100644 ---- a/src/ccutil/ocrclass.h -+++ b/src/ccutil/ocrclass.h -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #ifdef _WIN32 - #include // for timeval - #endif --- -2.7.4 - diff --git a/package/tesseract-ocr/Config.in b/package/tesseract-ocr/Config.in index 3afaca771a..4d9b78733e 100644 --- a/package/tesseract-ocr/Config.in +++ b/package/tesseract-ocr/Config.in @@ -1,13 +1,13 @@ -comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 4.8, dynamic library, wchar" +comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, wchar" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR menuconfig BR2_PACKAGE_TESSERACT_OCR bool "tesseract-ocr" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 808ea174ef..9e526423d3 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb tesseract-ocr-4.1.1.tar.gz +sha256 b5b0e561650ed67feb1e9de38d4746121d302ae4c876c95b99b8b6f9f89d5c58 tesseract-ocr-5.0.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index fc083c27f6..7e23e64136 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,8 +4,8 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 4.1.1 -TESSERACT_OCR_DATA_VERSION = 4.0.0 +TESSERACT_OCR_VERSION = 5.0.1 +TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 TESSERACT_OCR_LICENSE_FILES = LICENSE -- 2.32.0 From romain.naour at smile.fr Sun Jan 9 11:49:59 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 12:49:59 +0100 Subject: [Buildroot] [PATCH v3 04/11] package/pkg-golang.mk: implement Go vendoring support In-Reply-To: <20220106210000.397694-5-thomas.petazzoni@bootlin.com> References: <20220106210000.397694-1-thomas.petazzoni@bootlin.com> <20220106210000.397694-5-thomas.petazzoni@bootlin.com> Message-ID: <92584bdf-0c5c-2d32-45af-01f80a584189@smile.fr> Hello Thomas, Le 06/01/2022 ? 21:59, Thomas Petazzoni a ?crit?: > This commit introduces the download post-process script > support/download/go-post-process, and hooks it into the Go package > infrastructure. > > The -modcacherw flag is added to ensure that the Go cache is > read/write, and can be deleted properly upon "make clean". > > The _LICENSE variable of golang packages is expanded with ", > vendored dependencies licenses probably not listed" as currently for > all packages, the licenses of the vendored dependencies are not taken > into account. > > Signed-off-by: Thomas Petazzoni > --- I'm testing the golang infra with telegraf package and I got an error while downloading go modules: "verifying collectd.org at v0.5.0: checksum mismatch downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= SECURITY ERROR This download does NOT match an earlier download recorded in go.sum. The bits may have been replaced on the origin server, or an attacker may have intercepted the download attempt. For more information, see 'go help module-auth'." It seems there is something wrong in go.sum file from telegraf... but we are in download step not in patch step. It seems there is no way to fix locally (by patching) this problem. This is not the first time that infludb/telegraf releases are broken due to change in git repo listed in go.sum. Best regards, Romain From herve.codina at bootlin.com Sun Jan 9 12:14:22 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Sun, 9 Jan 2022 13:14:22 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> References: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> Message-ID: <20220109131422.4f774dfd@bootlin.com> On Sat, 8 Jan 2022 18:35:41 +0100 "Yann E. MORIN" wrote: > Some files contain hard-coded absolute paths that point to the host > and/or staging directories. > > With per-package directories (aka. PPD), these paths point to the PPD > of the package that created the files, when we want them to point to the > PPD of the package that uses them. > > Up until now, we had two hooks that attempted to fix those files: > > - a libtool-specific hook that searches for all .la files and seds > them with the proper PPD, > > - a python-specific hook that tweaks just the sysconfigdata and > removes the byte-compiled version of the sysconfigdata. > > But now, we also have a few other kinds of files for which we need to > fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others > as well. > > We solve this issue by just replacing any PPD in text files, with the > current package's PPD. > > This is very similar to, and inspired from what is done when relocating > the SDK. However, we can't use the existing relocate-sdk script, because > that needs to know the original location, which we do not have when we > aggregate the PPD (we could store it, but we can easily do without it). > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle (Essensium/Mind) > Cc: Adam Duskett > Cc: Louis-Paul CORDIER > Cc: Andreas Naumann > --- > package/pkg-generic.mk | 43 +++++++++++++++++++++--------------------- > 1 file changed, 21 insertions(+), 22 deletions(-) > [...] Acked-by: Herve Codina Best regards, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From herve.codina at bootlin.com Sun Jan 9 12:11:15 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Sun, 9 Jan 2022 13:11:15 +0100 Subject: [Buildroot] [PATCH 3/3] core/pkg-generic: apply post-prepare hooks before monitoring directories In-Reply-To: <13e59bc22d9299b2f829d541c1ecdd995f583f95.1641663315.git.yann.morin.1998@free.fr> References: <13e59bc22d9299b2f829d541c1ecdd995f583f95.1641663315.git.yann.morin.1998@free.fr> Message-ID: <20220109131115.57c37cbd@bootlin.com> On Sat, 8 Jan 2022 18:35:42 +0100 "Yann E. MORIN" wrote: > Monitoring the target/ and host/ directories and so on, will serve to > generate lists of files installed by the packages. Those lists are then > used to generate graphs of the size those package take on the target > for example. > > With PPD, we will also want to use those lists to only copy those files > actually installed by each dependencies of a package, recursively. > > Currently, those lists are not entirely reliable, as the starting points > are established before we apply PPD fixup hooks. As such, at the end of > a package installation, fixed up files will be found to belong to the > current package, while they were in fact provided by one of its > dependency. > > While this does no big harm, if at all, for the size graphs, it will > trigger overwrite detection when we eventually gather packages together > to aggregate a PPD or te final host and target. So, we better have the > lists of files be reliable. > > So, we only start monitoring the directories after we apply the PPD > fixups (or seen the other way around for a smaller diff: we apply the > PPD fixups before we start monitoring the directories). > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Herve Codina > --- > package/pkg-generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 1022062bcf..b1f4d219bb 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: > @$(call MESSAGE,"Configuring") > $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) > $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) > + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) > @$(call pkg_size_before,$(TARGET_DIR)) > @$(call pkg_size_before,$(STAGING_DIR),-staging) > @$(call pkg_size_before,$(BINARIES_DIR),-images) > @$(call pkg_size_before,$(HOST_DIR),-host) > - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) > $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) > $($(PKG)_CONFIGURE_CMDS) > $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) Acked-by: Herve Codina Best regards, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Jan 9 12:43:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 13:43:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: needs python3 Message-ID: <20220109124335.302679-1-fontaine.fabrice@gmail.com> python-setuptools-scm dropped python 2 support since https://github.com/pypa/setuptools_scm/commit/f0be71fbcf150bfc68e4169226399d6ae4da8f1b resulting in the following build failure since bump to version 6.3.2 in commit 12e3527fd97df9ae1b60b892c61d10ce291b7a00: /buildroot/autobuild/instance-2/output-1/host/lib" INTLTOOL_PERL=/usr/bin/perl /home/buildroot/autobuild/instance-2/output-1/host/bin/python setup.py build ) File "setup.py", line 22 f"{type(self).__name__} is forbidden, " ^ Fixes: - http://autobuild.buildroot.org/results/2f6125993de364b4a44d259f16806e6dfd792402 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - .../Config.in | 7 ------- .../python-backports-functools-lru-cache.hash | 5 ----- .../python-backports-functools-lru-cache.mk | 15 --------------- package/python-crontab/Config.in | 1 + package/python-dateutil/Config.in | 1 + package/python-jaraco-classes/Config.in | 1 + package/python-jsonmodels/Config.in | 1 + package/python-py/Config.in | 1 + .../python-setuptools-scm-git-archive.mk | 1 + .../python-setuptools-scm.mk | 1 + package/python-xlib/Config.in | 1 + 13 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 package/python-backports-functools-lru-cache/Config.in delete mode 100644 package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash delete mode 100644 package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk diff --git a/Config.in.legacy b/Config.in.legacy index 75873ff74b..d36eac3302 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE + bool "python-backports-functools-lru-cache package removed" + select BR2_LEGACY + help + This package has been removed as python-setuptools-scm + dropped support of python 2 since version 6.0.0. + config BR2_PACKAGE_CIVETWEB_WITH_LUA bool "civetweb lua support option removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 8a7dd446b7..2f6b03841f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -938,7 +938,6 @@ menu "External python modules" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" source "package/python-backports-abc/Config.in" - source "package/python-backports-functools-lru-cache/Config.in" source "package/python-backports-shutil-get-terminal-size/Config.in" source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" diff --git a/package/python-backports-functools-lru-cache/Config.in b/package/python-backports-functools-lru-cache/Config.in deleted file mode 100644 index a5b7771e4d..0000000000 --- a/package/python-backports-functools-lru-cache/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE - bool "python-backports-functools-lru-cache" - depends on BR2_PACKAGE_PYTHON - help - Backport of functools.lru_cache from Python 3.3 - - https://github.com/jaraco/backports.functools_lru_cache diff --git a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash b/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash deleted file mode 100644 index 3db4aec1fb..0000000000 --- a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/backports.functools_lru_cache/json -md5 20f53f54cd3f04b3346ce75a54959754 backports.functools_lru_cache-1.5.tar.gz -sha256 9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a backports.functools_lru_cache-1.5.tar.gz -# Localy computed sha256 checksumms -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk b/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk deleted file mode 100644 index 334d6d8c49..0000000000 --- a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-backports-functools-lru-cache -# -################################################################################ - -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION = 1.5 -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SOURCE = backports.functools_lru_cache-$(PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION).tar.gz -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SITE = https://files.pythonhosted.org/packages/57/d4/156eb5fbb08d2e85ab0a632e2bebdad355798dece07d4752f66a8d02d1ea -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SETUP_TYPE = setuptools -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_DEPENDENCIES = host-python-setuptools-scm -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE = MIT -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package/python-crontab/Config.in b/package/python-crontab/Config.in index 102dbbdb6b..7514a3866b 100644 --- a/package/python-crontab/Config.in +++ b/package/python-crontab/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CRONTAB bool "python-crontab" + depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm select BR2_PACKAGE_PYTHON_DATEUTIL # runtime help Crontab module for reading and writing crontab files and diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in index 1a36a150b1..bbf61f6813 100644 --- a/package/python-dateutil/Config.in +++ b/package/python-dateutil/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_DATEUTIL bool "python-dateutil" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX help Extensions to the standard Python datetime module. diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in index 05c11237ab..271e085c6f 100644 --- a/package/python-jaraco-classes/Config.in +++ b/package/python-jaraco-classes/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JARACO_CLASSES bool "python-jaraco-classes" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX # runtime help Utility functions for Python class constructs. diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in index f66982874a..84a269f171 100644 --- a/package/python-jsonmodels/Config.in +++ b/package/python-jsonmodels/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JSONMODELS bool "python-jsonmodels" + depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-py/Config.in b/package/python-py/Config.in index 354372f5b4..0e3c3390a0 100644 --- a/package/python-py/Config.in +++ b/package/python-py/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PY bool "python-py" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm help library with cross-python path, ini-parsing, io, code, log facilities. diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 032e2d3fc9..48ca9c89ae 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index f7f4e3ef27..b2990a56cb 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli +HOST_PYTHON_SETUPTOOLS_SCM_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-xlib/Config.in b/package/python-xlib/Config.in index 081af6a2fc..20e585db9a 100644 --- a/package/python-xlib/Config.in +++ b/package/python-xlib/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_XLIB bool "python-xlib" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX # runtime help XLib in pure Python (Py2/Py3 compatible) -- 2.34.1 From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: set cgroups default-hierarchy to unified Message-ID: <20220109124415.7EF1582C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f90d23112d2b9d52d2368a0a3f907ba37e2c60ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use the unified hierarchy, which is systemds default since v243. The biggest holdover was docker which now supports the unified layout. Note that systemd will automatically fallback to hybrid if the kernel is too old or the unified hierarchy fails for other reasons. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a2417ebe19..d7d5e5289b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -46,7 +46,7 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ - -Ddefault-hierarchy=hybrid \ + -Ddefault-hierarchy=unified \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: always enable systemd-tmpfilesd Message-ID: <20220109124415.A248D82D32@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7a928f883b7f4c783b966fd6832332976517885 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master this tool and service is pretty much expected to be enabled, making this a certainty will enable future improvements. The config variable BR2_PACKAGE_SYSTEMD_TMPFILES is still availabe and always set. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dhcp/Config.in | 1 - package/systemd/Config.in | 9 +-------- package/systemd/systemd.mk | 7 +------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in index e6e70908dd..515040c612 100644 --- a/package/dhcp/Config.in +++ b/package/dhcp/Config.in @@ -13,7 +13,6 @@ if BR2_PACKAGE_DHCP config BR2_PACKAGE_DHCP_SERVER bool "dhcp server" - select BR2_PACKAGE_SYSTEMD_TMPFILES if BR2_PACKAGE_SYSTEMD help DHCP server from the ISC DHCP distribution. diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 27a12bc947..833c89eaa2 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -501,15 +501,8 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html config BR2_PACKAGE_SYSTEMD_TMPFILES - bool "enable tmpfiles support" + bool default y - help - systemd-tmpfiles creates, deletes, and cleans up volatile - and temporary files and directories, based on the - configuration file format and location specified in - tmpfiles.d(5). - - http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 540a4d64f9..7bf8018438 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -71,6 +71,7 @@ SYSTEMD_CONF_OPTS += \ -Dsysvrcnd-path= \ -Dtelinit-path= \ -Dtests=false \ + -Dtmpfiles=true \ -Dumount-path=/usr/bin/umount \ -Dutmp=false @@ -315,12 +316,6 @@ else SYSTEMD_CONF_OPTS += -Dquotacheck=false endif -ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) -SYSTEMD_CONF_OPTS += -Dtmpfiles=true -else -SYSTEMD_CONF_OPTS += -Dtmpfiles=false -endif - ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y) SYSTEMD_CONF_OPTS += -Dsysusers=true else From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: remove BR2_PACKAGE_SYSTEMD_TMPFILES completely Message-ID: <20220109124415.B1CC082C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83319384fdb5d6666cb21ad915576385f232efb7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since tmpfiles is no longer optional, the Config.in symbol serves no purpose. It was only used in cryptsetup.mk, where we replace it with BR2_PACKAGE_SYSTEMD. Advise to do the same in Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 9 +++++++++ package/cryptsetup/cryptsetup.mk | 4 +--- package/systemd/Config.in | 4 ---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 75873ff74b..a9e95d6f58 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_SYSTEMD_TMPFILES + bool "systemd tmpfiles support always enabled" + select BR2_LEGACY + help + The systemd tmpfiles support is always enabled, so the symbol + to make it optional has been removed. You need to update any + external packages that use this symbol to use + BR2_PACKAGE_SYSTEMD instead. + config BR2_PACKAGE_CIVETWEB_WITH_LUA bool "civetweb lua support option removed" select BR2_LEGACY diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 676cd25be4..9cfd647ac6 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -42,10 +42,8 @@ else CRYPTSETUP_CONF_OPTS += --disable-ssh-token endif -ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) +ifeq ($(BR2_PACKAGE_SYSTEMD),y) CRYPTSETUP_CONF_OPTS += --with-tmpfilesdir=/usr/lib/tmpfiles.d -else -CRYPTSETUP_CONF_OPTS += --without-tmpfilesdir endif HOST_CRYPTSETUP_DEPENDENCIES = \ diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 833c89eaa2..cc0736561e 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -500,10 +500,6 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html -config BR2_PACKAGE_SYSTEMD_TMPFILES - bool - default y - config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" help From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: Update description and kernel options Message-ID: <20220109124415.8A8BF82CFA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb49354eb34842f88218fcf9ef60576b85653e38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master realign the configuration to the README. enable CONFIG_AUTOFS_FS (kernel >= 4.18) as well as the someday to be removed CONFIG_AUTOFS4_FS option. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/Config.in | 22 +++++++++++++++++----- package/systemd/systemd.mk | 16 ++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index c8c5a9c47b..27a12bc947 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV @@ -51,13 +51,25 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Systemd requires a Linux kernel >= 3.0 with the following + Systemd requires a Linux kernel >= 3.13 with the following options enabled: - - CONFIG_CGROUPS + - CONFIG_DEVTMPFS + - CONFIG_CGROUPS (it is OK to disable all controllers) - CONFIG_INOTIFY_USER - - CONFIG_FHANDLE - - CONFIG_AUTOFS4_FS + - CONFIG_SIGNALFD + - CONFIG_TIMERFD + - CONFIG_EPOLL + - CONFIG_UNIX (it requires CONFIG_NET, but every other flag in + it is not necessary) + - CONFIG_SYSFS + - CONFIG_PROC_FS + - CONFIG_FHANDLE (libudev, mount and bind mount handling) + + - CONFIG_NET_NS (needed by PrivateNetwork=, used in some + systemd units) + + - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS - CONFIG_TMPFS_POSIX_ACL - CONFIG_TMPFS_XATTR diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d7d5e5289b..330619e206 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -725,14 +725,22 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) define SYSTEMD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE) - $(call KCONFIG_ENABLE_OPT,CONFIG_EPOLL) + $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER) $(call KCONFIG_ENABLE_OPT,CONFIG_SIGNALFD) $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERFD) - $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER) - $(call KCONFIG_ENABLE_OPT,CONFIG_PROC_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_EPOLL) + $(call KCONFIG_ENABLE_OPT,CONFIG_UNIX) $(call KCONFIG_ENABLE_OPT,CONFIG_SYSFS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PROC_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE) + + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + + $(call KCONFIG_DISABLE_OPT,CONFIG_SYSFS_DEPRECATED) + + $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR) From arnout at mind.be Sun Jan 9 12:48:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 13:48:26 +0100 Subject: [Buildroot] [git commit] package/systemd: adopt odering in nsswitch to newer versions Message-ID: <20220109124415.9601282C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f9828e5cf2a58f3f9be78ff32e97601c31356aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This modifies the order of the nss modules, reflecting the current state of the documentation. nss-mymachines lost support for resolution of users and groups, and now only does resolution of hostnames. Changed in v246. Multiple changes in regards to nss-myhostname now recommend placement after nss-files and before nss-dns. See commits ce266330, f918c67. nss-resolve handles the nss-files logic itself, and its suggested to move in front of nss-files. Changed in v249. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 330619e206..540a4d64f9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -602,13 +602,11 @@ define SYSTEMD_INSTALL_NSSCONFIG_HOOK -e '/^gshadow:/ {/systemd/! s/$$/ systemd/}' \ $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ -e '/^hosts:/ s/[[:space:]]*mymachines//' \ - -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ + -e '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' ) \ $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ - -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ + -e '/^hosts:/ {/myhostname/! s/files/files myhostname/}' ) \ $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ - -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ - -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ - -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ + -e '/^hosts:/ {/mymachines/! s/^\(hosts:[[:space:]]*\)/\1mymachines /}' ) \ $(TARGET_DIR)/etc/nsswitch.conf endef From arnout at mind.be Sun Jan 9 12:55:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 13:55:45 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/systemd: adopt odering in nsswitch to newer versions In-Reply-To: <20211203223127.274985-3-nolange79@gmail.com> References: <20211203223127.274985-1-nolange79@gmail.com> <20211203223127.274985-3-nolange79@gmail.com> Message-ID: On 03/12/2021 23:31, Norbert Lange wrote: > This modifies the order of the nss modules, reflecting the current > state of the documentation. > > nss-mymachines lost support for resolution of users and groups, > and now only does resolution of hostnames. Changed in v246. > > Multiple changes in regards to nss-myhostname now recommend placement > after nss-files and before nss-dns. See commits ce266330, f918c67. > > nss-resolve handles the nss-files logic itself, and its suggested to > move in front of nss-files. Changed in v249. > > Signed-off-by: Norbert Lange This patch was superseded by [1], which is marked as v2 just like this patch. I hope you understand that this is a little confusing for the maintainers (or for anyone reviewing it). If you want to make life easier for use, please: - Re-post the entire series when one patch changes. - Make sure you include a patch changelog (you do that, I'm just saying it here for completeness). Patches which haven't changed can have a "No changes" version, but personally I don't care too much about that (it's implied by the fact that there is a patch changelog but this particular version is not included). That saves a bit of time during the rebase since you don't have to reword every commit. - Mark the old series as Superseded in patchwork. When you create an account, you can always update your own patches. I applied the series (including the [1]) to master. There's one comment I'll post separately. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20211203230919.683527-1-nolange79 at gmail.com/ > --- > package/systemd/systemd.mk | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 373e5c82bb..16202d4ac9 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -563,13 +563,11 @@ define SYSTEMD_INSTALL_NSSCONFIG_HOOK > -e '/^gshadow:/ {/systemd/! s/$$/ systemd/}' \ > $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ > -e '/^hosts:/ s/[[:space:]]*mymachines//' \ > - -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ > + -e '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' ) \ > $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ > - -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ > + -e '/^hosts:/ {/myhostname/! s/files/files myhostname/}' ) \ > $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ > - -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ > - -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ > - -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ > + -e '/^hosts:/ {/mymachines/! s/^\(hosts:[[:space:]]*\)/\1 mymachines/}' ) \ > $(TARGET_DIR)/etc/nsswitch.conf > endef > > From fontaine.fabrice at gmail.com Sun Jan 9 12:54:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 13:54:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuchess: security bump to version 6.2.9 Message-ID: <20220109125456.316484-1-fontaine.fabrice@gmail.com> Fixed potential buffer overflow in pgnload and pgnreplay (CVE-2021-30184) https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 Signed-off-by: Fabrice Fontaine --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index b68eb6e0ee..0248abcf71 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 29d3590849..630b3aefa7 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.8 +GNUCHESS_VERSION = 6.2.9 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING -- 2.34.1 From arnout at mind.be Sun Jan 9 12:59:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 13:59:07 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/systemd: always enable systemd-tmpfilesd In-Reply-To: <20211203223127.274985-4-nolange79@gmail.com> References: <20211203223127.274985-1-nolange79@gmail.com> <20211203223127.274985-4-nolange79@gmail.com> Message-ID: On 03/12/2021 23:31, Norbert Lange wrote: > this tool and service is pretty much expected to be enabled, > making this a certainty will enable future improvements. > > The config variable BR2_PACKAGE_SYSTEMD_TMPFILES is still > availabe and always set. I don't understand why it's not simply removed. (The commit message should primarily explain *why* things are done, not so much *what* is done.) Since I think that the symbol can be removed entirely, I pushed a follow-up patch that - removes the symbol; - removes its use in cryptsetup.mk; - adds it in Config.in.legacy, with an explanation of what to do if it's used in br2-external. It's a separate commit, so if you think that it really shouldn't have been removed we can easily revert it. Regards, Arnout > > Signed-off-by: Norbert Lange > --- > v1->v2 > - dont remove the config, instead just set it to 1 > --- > package/dhcp/Config.in | 1 - > package/systemd/Config.in | 9 +-------- > package/systemd/systemd.mk | 7 +------ > 3 files changed, 2 insertions(+), 15 deletions(-) > > diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in > index e6e70908dd..515040c612 100644 > --- a/package/dhcp/Config.in > +++ b/package/dhcp/Config.in > @@ -13,7 +13,6 @@ if BR2_PACKAGE_DHCP > > config BR2_PACKAGE_DHCP_SERVER > bool "dhcp server" > - select BR2_PACKAGE_SYSTEMD_TMPFILES if BR2_PACKAGE_SYSTEMD > help > DHCP server from the ISC DHCP distribution. > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 6f622c73f3..52c86aad59 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -485,15 +485,8 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD > http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html > > config BR2_PACKAGE_SYSTEMD_TMPFILES > - bool "enable tmpfiles support" > + bool > default y > - help > - systemd-tmpfiles creates, deletes, and cleans up volatile > - and temporary files and directories, based on the > - configuration file format and location specified in > - tmpfiles.d(5). > - > - http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html > > config BR2_PACKAGE_SYSTEMD_USERDB > bool "enable userdb daemon" > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 16202d4ac9..dfe9a1a5c7 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -49,6 +49,7 @@ SYSTEMD_CONF_OPTS += \ > -Dsysvrcnd-path= \ > -Dtelinit-path= \ > -Dtests=false \ > + -Dtmpfiles=true \ > -Dumount-path=/usr/bin/umount \ > -Dutmp=false > > @@ -307,12 +308,6 @@ else > SYSTEMD_CONF_OPTS += -Dquotacheck=false > endif > > -ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) > -SYSTEMD_CONF_OPTS += -Dtmpfiles=true > -else > -SYSTEMD_CONF_OPTS += -Dtmpfiles=false > -endif > - > ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y) > SYSTEMD_CONF_OPTS += -Dsysusers=true > else > From peter at korsgaard.com Sun Jan 9 13:01:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 14:01:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuchess: security bump to version 6.2.9 In-Reply-To: <20220109125456.316484-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 13:54:56 +0100") References: <20220109125456.316484-1-fontaine.fabrice@gmail.com> Message-ID: <87ilutcbbq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fixed potential buffer overflow in pgnload and pgnreplay > (CVE-2021-30184) > https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html > https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 13:01:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 14:01:17 +0100 Subject: [Buildroot] [git commit] package/gnuchess: security bump to version 6.2.9 Message-ID: <20220109125532.53FBE82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85aab41ef9f818216635c9b0f64bf9c20c176135 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixed potential buffer overflow in pgnload and pgnreplay (CVE-2021-30184) https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index b68eb6e0ee..0248abcf71 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 29d3590849..630b3aefa7 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.8 +GNUCHESS_VERSION = 6.2.9 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From arnout at mind.be Sun Jan 9 13:04:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 14:04:17 +0100 Subject: [Buildroot] [PATCH] package/skeleton-init-systemd: support /var/lock again In-Reply-To: <20220109110132.3430-1-nolange79@gmail.com> References: <20220109110132.3430-1-nolange79@gmail.com> Message-ID: <8f621d1a-c021-13ed-18c6-fbd800f03ce3@mind.be> On 09/01/2022 12:01, Norbert Lange wrote: > systemd's own configuration file is not installed anymore, > as side effect of disabling sysv support. > > the funtionality is added back in skeleton-init-systemd, > since this is a buildroot feature to support software expecting > this directories to exist, as well as trying to be similar to > other init systems. > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Arnout > --- > package/skeleton-init-systemd/legacy.conf | 7 +++++++ > package/skeleton-init-systemd/skeleton-init-systemd.mk | 1 + > 2 files changed, 8 insertions(+) > create mode 100644 package/skeleton-init-systemd/legacy.conf > > diff --git a/package/skeleton-init-systemd/legacy.conf b/package/skeleton-init-systemd/legacy.conf > new file mode 100644 > index 0000000000..0a5393408c > --- /dev/null > +++ b/package/skeleton-init-systemd/legacy.conf > @@ -0,0 +1,7 @@ > +# Create legacy directories for buildroot > +# This is a subset of systemd's legacy.conf > + > +d /run/lock 0755 root root - > +d /run/lock/subsys 0755 root root - > + > +L /var/lock - - - - ../run/lock > diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk > index 5d6b716f7a..1e212cc2f7 100644 > --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk > +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk > @@ -62,6 +62,7 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS > mkdir -p $(TARGET_DIR)/srv > mkdir -p $(TARGET_DIR)/var > ln -s ../run $(TARGET_DIR)/var/run > + install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf > $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) > endef > > From arnout at mind.be Sun Jan 9 13:04:21 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 14:04:21 +0100 Subject: [Buildroot] [git commit] package/skeleton-init-systemd: support /var/lock again Message-ID: <20220109125818.5984E82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97eb7d0c131feb060a6f55fffbcda8a82c9b5bb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master systemd's own configuration file is not installed anymore, as side effect of disabling sysv support in commit 96f0d9969e6220154b39d9d80cda97998d41f670. Add the legacy.conf functionality back in skeleton-init-systemd, since this is a buildroot feature to support software expecting these directories to exist, as well as trying to be similar to other init systems. Create our own legacy.conf instead of using the one from upstream, because: - upstream has legacy.conf.in which has to be preprocessed; - we don't want to enable upstream's full sysv support as explained in commit 96f0d9969e6220154b39d9d80cda97998d41f670; - we would probably need to post-process upstream's legacy.conf anyway since it doesn't fully match with buildroot expectations. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/skeleton-init-systemd/legacy.conf | 7 +++++++ package/skeleton-init-systemd/skeleton-init-systemd.mk | 1 + 2 files changed, 8 insertions(+) diff --git a/package/skeleton-init-systemd/legacy.conf b/package/skeleton-init-systemd/legacy.conf new file mode 100644 index 0000000000..0a5393408c --- /dev/null +++ b/package/skeleton-init-systemd/legacy.conf @@ -0,0 +1,7 @@ +# Create legacy directories for buildroot +# This is a subset of systemd's legacy.conf + +d /run/lock 0755 root root - +d /run/lock/subsys 0755 root root - + +L /var/lock - - - - ../run/lock diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 5d6b716f7a..1e212cc2f7 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,7 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef From fontaine.fabrice at gmail.com Sun Jan 9 13:07:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:07:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/gupnp-av: bump to version 0.14.0 In-Reply-To: <20220109130732.430160-1-fontaine.fabrice@gmail.com> References: <20220109130732.430160-1-fontaine.fabrice@gmail.com> Message-ID: <20220109130732.430160-2-fontaine.fabrice@gmail.com> https://gitlab.gnome.org/GNOME/gupnp-av/-/blob/gupnp-av-0.14.0/NEWS Signed-off-by: Fabrice Fontaine --- package/gupnp-av/gupnp-av.hash | 4 ++-- package/gupnp-av/gupnp-av.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index 570f8ab3d0..ceab42ef52 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.13/gupnp-av-0.13.0.sha256sum: -sha256 578b8f562b0f7e908416a41efbe2b7e6b892cd2ed7eac61ac63c48fdc8d7e6c8 gupnp-av-0.13.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: +sha256 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156 gupnp-av-0.14.0.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index c2d3c3ba18..655de87608 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUPNP_AV_VERSION_MAJOR = 0.13 +GUPNP_AV_VERSION_MAJOR = 0.14 GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 13:07:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:07:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/gupnp: bump to version 1.4.2 Message-ID: <20220109130732.430160-1-fontaine.fabrice@gmail.com> https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.2/NEWS Signed-off-by: Fabrice Fontaine --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 1825298f24..cc78be7d5d 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.1.sha256sum: -sha256 899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c gupnp-1.4.1.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.2.sha256sum: +sha256 bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc gupnp-1.4.2.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index 02d9b289e0..aebf9225a8 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ -- 2.34.1 From arnout at mind.be Sun Jan 9 13:04:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 14:04:48 +0100 Subject: [Buildroot] [git commit] package/openrc: add patch to create /run/lock/subsys Message-ID: <20220109130244.6DD2D82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92297637d7e408be927c6ca5994751549eba7bf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Together with changes to sysv/busybox init, this directory will already exist on all init systems before any service scripts are run. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...006-Also-create-run-lock-subsys-directory.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch new file mode 100644 index 0000000000..cf592a88b0 --- /dev/null +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch @@ -0,0 +1,29 @@ +From 49e5929b468f604d80a0c04a6ce78eb96ca36090 Mon Sep 17 00:00:00 2001 +From: Norbert Lange +Date: Sun, 9 Jan 2022 00:22:40 +0100 +Subject: [PATCH] Also create /run/lock/subsys directory + +Buildroot service scripts regularly use this directory, so +create it in the most appropriate spot. + +Signed-off-by: Norbert Lange +--- + sh/init.sh.Linux.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in +index e8afc1fb..662ab223 100644 +--- a/sh/init.sh.Linux.in ++++ b/sh/init.sh.Linux.in +@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then + fi + + checkpath -d "$RC_SVCDIR" +-checkpath -d -m 0775 -o root:daemon /run/lock ++checkpath -d -m 0775 -o root:daemon /run/lock /run/lock/subsys + + # Try to mount xenfs as early as possible, otherwise rc_sys() will always + # return RC_SYS_XENU and will think that we are in a domU while it's not. +-- +2.34.1 + From peter at korsgaard.com Sun Jan 9 13:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 14:09:08 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm: needs python3 Message-ID: <20220109130308.F2AC282B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31848ba595bfd77e5471601edc35cf587de4ce34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-setuptools-scm dropped python 2 support since https://github.com/pypa/setuptools_scm/commit/f0be71fbcf150bfc68e4169226399d6ae4da8f1b resulting in the following build failure since bump to version 6.3.2 in commit 12e3527fd97df9ae1b60b892c61d10ce291b7a00: /buildroot/autobuild/instance-2/output-1/host/lib" INTLTOOL_PERL=/usr/bin/perl /home/buildroot/autobuild/instance-2/output-1/host/bin/python setup.py build ) File "setup.py", line 22 f"{type(self).__name__} is forbidden, " ^ Fixes: - http://autobuild.buildroot.org/results/2f6125993de364b4a44d259f16806e6dfd792402 With python 2 support dropped, python-backports-functools-lru-cache can no longer be built, so drop it. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/python-backports-functools-lru-cache/Config.in | 7 ------- .../python-backports-functools-lru-cache.hash | 5 ----- .../python-backports-functools-lru-cache.mk | 15 --------------- package/python-crontab/Config.in | 1 + package/python-dateutil/Config.in | 1 + package/python-jaraco-classes/Config.in | 1 + package/python-jsonmodels/Config.in | 1 + package/python-py/Config.in | 1 + .../python-setuptools-scm-git-archive.mk | 1 + package/python-setuptools-scm/python-setuptools-scm.mk | 1 + package/python-xlib/Config.in | 1 + 13 files changed, 15 insertions(+), 28 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a9e95d6f58..5a3e9b5cc7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE + bool "python-backports-functools-lru-cache package removed" + select BR2_LEGACY + help + This package has been removed as python-setuptools-scm + dropped support of python 2 since version 6.0.0. + config BR2_PACKAGE_SYSTEMD_TMPFILES bool "systemd tmpfiles support always enabled" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 2d3ca6a3b6..85193f7802 100644 --- a/package/Config.in +++ b/package/Config.in @@ -939,7 +939,6 @@ menu "External python modules" source "package/python-babel/Config.in" source "package/python-backcall/Config.in" source "package/python-backports-abc/Config.in" - source "package/python-backports-functools-lru-cache/Config.in" source "package/python-backports-shutil-get-terminal-size/Config.in" source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" diff --git a/package/python-backports-functools-lru-cache/Config.in b/package/python-backports-functools-lru-cache/Config.in deleted file mode 100644 index a5b7771e4d..0000000000 --- a/package/python-backports-functools-lru-cache/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE - bool "python-backports-functools-lru-cache" - depends on BR2_PACKAGE_PYTHON - help - Backport of functools.lru_cache from Python 3.3 - - https://github.com/jaraco/backports.functools_lru_cache diff --git a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash b/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash deleted file mode 100644 index 3db4aec1fb..0000000000 --- a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/backports.functools_lru_cache/json -md5 20f53f54cd3f04b3346ce75a54959754 backports.functools_lru_cache-1.5.tar.gz -sha256 9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a backports.functools_lru_cache-1.5.tar.gz -# Localy computed sha256 checksumms -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk b/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk deleted file mode 100644 index 334d6d8c49..0000000000 --- a/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-backports-functools-lru-cache -# -################################################################################ - -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION = 1.5 -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SOURCE = backports.functools_lru_cache-$(PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION).tar.gz -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SITE = https://files.pythonhosted.org/packages/57/d4/156eb5fbb08d2e85ab0a632e2bebdad355798dece07d4752f66a8d02d1ea -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SETUP_TYPE = setuptools -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_DEPENDENCIES = host-python-setuptools-scm -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE = MIT -PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package/python-crontab/Config.in b/package/python-crontab/Config.in index 102dbbdb6b..7514a3866b 100644 --- a/package/python-crontab/Config.in +++ b/package/python-crontab/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CRONTAB bool "python-crontab" + depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm select BR2_PACKAGE_PYTHON_DATEUTIL # runtime help Crontab module for reading and writing crontab files and diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in index 1a36a150b1..bbf61f6813 100644 --- a/package/python-dateutil/Config.in +++ b/package/python-dateutil/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_DATEUTIL bool "python-dateutil" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX help Extensions to the standard Python datetime module. diff --git a/package/python-jaraco-classes/Config.in b/package/python-jaraco-classes/Config.in index 05c11237ab..271e085c6f 100644 --- a/package/python-jaraco-classes/Config.in +++ b/package/python-jaraco-classes/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JARACO_CLASSES bool "python-jaraco-classes" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX # runtime help Utility functions for Python class constructs. diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in index f66982874a..84a269f171 100644 --- a/package/python-jsonmodels/Config.in +++ b/package/python-jsonmodels/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JSONMODELS bool "python-jsonmodels" + depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-py/Config.in b/package/python-py/Config.in index 354372f5b4..0e3c3390a0 100644 --- a/package/python-py/Config.in +++ b/package/python-py/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PY bool "python-py" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm help library with cross-python path, ini-parsing, io, code, log facilities. diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 032e2d3fc9..48ca9c89ae 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index f7f4e3ef27..b2990a56cb 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli +HOST_PYTHON_SETUPTOOLS_SCM_NEEDS_HOST_PYTHON = python3 $(eval $(host-python-package)) diff --git a/package/python-xlib/Config.in b/package/python-xlib/Config.in index 081af6a2fc..20e585db9a 100644 --- a/package/python-xlib/Config.in +++ b/package/python-xlib/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_XLIB bool "python-xlib" + depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm select BR2_PACKAGE_PYTHON_SIX # runtime help XLib in pure Python (Py2/Py3 compatible) From peter at korsgaard.com Sun Jan 9 13:09:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 14:09:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: needs python3 In-Reply-To: <20220109124335.302679-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 13:43:35 +0100") References: <20220109124335.302679-1-fontaine.fabrice@gmail.com> Message-ID: <87ee5hcayb.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > python-setuptools-scm dropped python 2 support since > https://github.com/pypa/setuptools_scm/commit/f0be71fbcf150bfc68e4169226399d6ae4da8f1b > resulting in the following build failure since bump to version 6.3.2 in > commit 12e3527fd97df9ae1b60b892c61d10ce291b7a00: > /buildroot/autobuild/instance-2/output-1/host/lib" INTLTOOL_PERL=/usr/bin/perl /home/buildroot/autobuild/instance-2/output-1/host/bin/python setup.py build ) > File "setup.py", line 22 > f"{type(self).__name__} is forbidden, " > ^ > Fixes: > - http://autobuild.buildroot.org/results/2f6125993de364b4a44d259f16806e6dfd792402 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sun Jan 9 13:12:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 14:12:16 +0100 Subject: [Buildroot] [PATCH v2] package/openrc: add patch to create /run/lock/subsys In-Reply-To: <20220109110555.3789-1-nolange79@gmail.com> References: <20220109110555.3789-1-nolange79@gmail.com> Message-ID: On 09/01/2022 12:05, Norbert Lange wrote: > Together with changes to sysv/busybox init, this directory > will already exist on all init systems before any service > scripts are run. > > Signed-off-by: Norbert Lange Applied to master, thanks. Normally we require patches to be upstreamed first, but there are already plenty of other patches that haven't been sent upstream. It could also be a bit buildroot-specific (though I think the subsys is there because some packages actually use that directory). Still, Micha?, do you think this patch would be acceptable upstream? Obviously not in its current form since upstream has group uucp rather than daemon. Regards, Arnout > --- > v1->v2: > * refresh patch > --- > ...lso-create-run-lock-subsys-directory.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/openrc/0006-Also-create-run-lock-subsys-directory.patch > > diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch > new file mode 100644 > index 0000000000..cf592a88b0 > --- /dev/null > +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch > @@ -0,0 +1,29 @@ > +From 49e5929b468f604d80a0c04a6ce78eb96ca36090 Mon Sep 17 00:00:00 2001 > +From: Norbert Lange > +Date: Sun, 9 Jan 2022 00:22:40 +0100 > +Subject: [PATCH] Also create /run/lock/subsys directory > + > +Buildroot service scripts regularly use this directory, so > +create it in the most appropriate spot. > + > +Signed-off-by: Norbert Lange > +--- > + sh/init.sh.Linux.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in > +index e8afc1fb..662ab223 100644 > +--- a/sh/init.sh.Linux.in > ++++ b/sh/init.sh.Linux.in > +@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then > + fi > + > + checkpath -d "$RC_SVCDIR" > +-checkpath -d -m 0775 -o root:daemon /run/lock > ++checkpath -d -m 0775 -o root:daemon /run/lock /run/lock/subsys > + > + # Try to mount xenfs as early as possible, otherwise rc_sys() will always > + # return RC_SYS_XENU and will think that we are in a domU while it's not. > +-- > +2.34.1 > + > From fontaine.fabrice at gmail.com Sun Jan 9 13:11:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:11:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbytesize: bump to version 2.6 Message-ID: <20220109131128.468829-1-fontaine.fabrice@gmail.com> https://github.com/storaged-project/libbytesize/releases/tag/2.6 https://github.com/storaged-project/libbytesize/blob/2.6/NEWS.rst Signed-off-by: Fabrice Fontaine --- package/libbytesize/libbytesize.hash | 2 +- package/libbytesize/libbytesize.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbytesize/libbytesize.hash b/package/libbytesize/libbytesize.hash index 51fa43aef1..2dfa97dd6a 100644 --- a/package/libbytesize/libbytesize.hash +++ b/package/libbytesize/libbytesize.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6305addae2b7be313dbfc36b96094ec0544d5144859ab4a5685ca6d314d6fdda libbytesize-2.5.tar.gz +sha256 efaa2b35b2bb3b52bf7b4ff5d0ed2c5c61360a5196053808d615dd0aa2cf0741 libbytesize-2.6.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libbytesize/libbytesize.mk b/package/libbytesize/libbytesize.mk index 0ba380dc74..2ef08211c5 100644 --- a/package/libbytesize/libbytesize.mk +++ b/package/libbytesize/libbytesize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.5 +LIBBYTESIZE_VERSION = 2.6 LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) LIBBYTESIZE_LICENSE = LGPL-2.1+ LIBBYTESIZE_LICENSE_FILES = LICENSE -- 2.34.1 From peter at korsgaard.com Sun Jan 9 13:19:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 14:19:00 +0100 Subject: [Buildroot] [git commit] package/pkg-python.mk: fix typos Message-ID: <20220109131517.5AC4782B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65054d1a1964548a72c320b075cb20a122117952 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s/interperter/interpreter/ and drop 'use use' / 'depend on use'. Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 4cc416cea0..22ea77352c 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -155,8 +155,8 @@ endif # - for target packages, we always depend on the default python interpreter # (the one selected by the config); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we depend on use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) @@ -215,8 +215,8 @@ endif # SETUP_TYPE # - for target packages, we always use the default python interpreter (which # is the same version as the one built and installed on the target); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we use use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) From peter at korsgaard.com Sun Jan 9 13:27:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 14:27:15 +0100 Subject: [Buildroot] [git commit] package/systemd: Update description and kernel options In-Reply-To: <20220109124415.8A8BF82CFA@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sun, 9 Jan 2022 13:48:26 +0100") References: <20220109124415.8A8BF82CFA@busybox.osuosl.org> Message-ID: <8735lxca4s.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=eb49354eb34842f88218fcf9ef60576b85653e38 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > realign the configuration to the README. > enable CONFIG_AUTOFS_FS (kernel >= 4.18) as well as the someday > to be removed CONFIG_AUTOFS4_FS option. > Signed-off-by: Norbert Lange > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/systemd/Config.in | 22 +++++++++++++++++----- > package/systemd/systemd.mk | 16 ++++++++++++---- > 2 files changed, 29 insertions(+), 9 deletions(-) > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index c8c5a9c47b..27a12bc947 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > depends on !BR2_STATIC_LIBS # kmod > depends on BR2_TOOLCHAIN_USES_GLIBC > depends on BR2_TOOLCHAIN_HAS_SSP > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 Is that correct? The corresponding BR2_INIT_SYSTEMD dependency was not updated. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Sun Jan 9 13:27:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 14:27:48 +0100 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20201221203952.22168-3-ps.report@gmx.net> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> Message-ID: <20220109142748.4f7c1a59@windsurf> On Mon, 21 Dec 2020 21:39:51 +0100 Peter Seiderer wrote: > - add optional host-freetype dependency > > Fixes: > > Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 > Returned 1. > stderr: > > Package freetype2 was not found in the pkg-config search path. > Perhaps you should add the directory containing `freetype2.pc' > to the PKG_CONFIG_PATH environment variable > Package 'freetype2', required by 'virtual:world', not found > Could not run pkg-config. > > See //build/linux/BUILD.gn:24:3: whence it was called. > pkg_config("freetype_from_pkgconfig") { > ^-------------------------------------- > See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included. > public_configs = [ "//build/linux:freetype_from_pkgconfig" ] > ^-------------------------------------- > Project ERROR: GN run error! > make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 I am falling into this issue while building the following defconfig: BR2_arm=y BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5WEBENGINE=y BR2_PACKAGE_RPI_USERLAND=y Did you had the chance to investigate more deeply why having fontconfig support in Qt leads qt5webengine wanting to find freetype2 on the host? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Jan 9 13:39:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:39:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/hiawatha: disable system mbedtls Message-ID: <20220109133939.496946-1-fontaine.fabrice@gmail.com> hiawatha needs mbedtls3 since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e: /home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory 39 | #include "mbedtls/psa_util.h" | ^~~~~~~~~~~~~~~~~~~~ As mbedtls 3.x is not backward compatible with mbedtls 2.x, disable system mbedtls to let hiawatha uses its own copy (which will be installed in $(TARGET_DIR)/usr/lib/hiawatha) Fixes: - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a Signed-off-by: Fabrice Fontaine --- package/hiawatha/Config.in | 1 - package/hiawatha/hiawatha.mk | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 8f1908f6f4..4b1a3ca86c 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -32,6 +32,5 @@ if BR2_PACKAGE_HIAWATHA config BR2_PACKAGE_HIAWATHA_SSL bool "hiawatha TLS support" - select BR2_PACKAGE_MBEDTLS endif diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 5618e6900d..017592de1e 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -20,8 +20,11 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON -HIAWATHA_DEPENDENCIES += mbedtls +# Disable system mbedtls as hiawatha needs mbedtls 3.x +HIAWATHA_CONF_OPTS += \ + -DENABLE_TLS=ON \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 13:41:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 14:41:29 +0100 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package In-Reply-To: <87a6g6f7vl.fsf@dell.be.48ers.dk> References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> <20211228164916.2beec0d6@windsurf> <20211228181447.2a42dc86@windsurf> <874k6egvrm.fsf@dell.be.48ers.dk> <87zgo6f9sa.fsf@dell.be.48ers.dk> <87a6g6f7vl.fsf@dell.be.48ers.dk> Message-ID: Le sam. 8 janv. 2022 ? 18:35, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > Hi, > > >> For the question if we need to maintain both 2.28.x and 3.x in > >> parallel I guess it really depends on if the packages we have depending > >> on mbedtls (E.G. bctoolbox, bmx7, mongrel2, shadowsocks-libev) can (be > >> patched to) work with mbedtls 3.x or not? > > > It is really unlikely that all these packages will be patched to work > > with mbedtls 3.x. > > To my knowledge, only hiawatha and curl have been patched to support > > mbedtls 3.x. > > and it should be noted that curl supports mbedtls 2.x and 3.x: > > https://github.com/curl/curl/commit/3f126138be3c459a2794d35f8170e92e65a50dad > > lighttpd is trying to migrate but has a lot of issues: > > https://github.com/ARMmbed/mbedtls/issues/5331 > > Ok, thanks. > > >> If they can (or are no longer maintained upstream), then I would prefer > >> to only support mbedtls 3.x going forward. If on the other hand mbedtls > >> 3.x isn't really stable yet and only needed for hiawatha, then indeed we > >> should perhaps just postpone it a bit and use the internal mbedtls copy > >> in hiawatha or downgrade / drop TLS support. > > > 3.x is more "secure" because many obsolete cryptographic mechanisms and > > TLS protocol versions and options have been removed. However, it is probably > > ok to postpone the addition of mbedtls 3.x until more packages support it. > > Yes, I agree. What will we do about hiawatha? Patch it to work with 2.x > as well, move to the internal mbedtls copy or revert the bump? Did you > try contacting upstream about the issue? I didn't try to contact hiawatha but I think the easiest course of action would be to use the internal copy. I sent a patch. > > > > It should be noted that we'll have the same issue/question with openssl 3.x ... > > Indeed, that is another can of worms that has been on my TODO list for a > while... > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From thomas.petazzoni at bootlin.com Sun Jan 9 13:44:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 14:44:30 +0100 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20220109142748.4f7c1a59@windsurf> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> <20220109142748.4f7c1a59@windsurf> Message-ID: <20220109144430.1064ea1c@windsurf> On Sun, 9 Jan 2022 14:27:48 +0100 Thomas Petazzoni wrote: > I am falling into this issue while building the following defconfig: > > BR2_arm=y > BR2_arm1176jzf_s=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_QT5WEBENGINE=y > BR2_PACKAGE_RPI_USERLAND=y > > Did you had the chance to investigate more deeply why having fontconfig > support in Qt leads qt5webengine wanting to find freetype2 on the host? Interestingly, in commit https://github.com/meta-qt5/meta-qt5/commit/280487f20bca829527a597d6263b0344a01917ac#diff-f0ffde666f6ff0282f8400203b3ba20968494d3c7245106eca761bd79baa1c78R26 the meta-qt5 layer, when upgrading Qt to 5.15.2 added jpeg-native and freetype-native as new unconditional dependencies. But there are no explanations. Is it really because the Chromium stuff is building a host tool with freetype/jpeg, or is it just a workaround for some incorrect behavior of the Chromium build process that needs freetype/jpeg on the target, but checks for them on the host? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 14:03:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 15:03:04 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/qt5webengine: fix compile flags for arm In-Reply-To: <20200306203410.25008-1-ps.report@gmx.net> References: <20200306203410.25008-1-ps.report@gmx.net> Message-ID: <20220109150304.45e12aea@windsurf> Hello Peter, On Fri, 6 Mar 2020 21:34:09 +0100 Peter Seiderer wrote: > The qt5webengine configure simple takes QT_ARCH ('arm') to determine the > chromium compiler flags and uses some hard coded ARMv7 default values > for the compiler command line: '... -march=armv7-a -mfloat-abi=hard > -mtune=generic-armv7-a -mfpu=vfpv3-d16 ...'. > > This results e.g. in an illegal instruction failure for rpi zero > (reported on the mailing list, see [1]). > > Disable all arm custom cpu flags (march/mfloat-abi/mtune/mfpu/mthumb) as > these are already set by the compiler wrapper (via a patch to the chromium > GN build system BUILD.gn file). > > Despite the patch set all known values in the chromium GN build > system config file chromium/build/config/arm.gni to not disturb > the compile defines settings logic. It's been a very long time since this patch was posted. Does the problem still occur? There is a patch series from James Hilliard upgrading qt5webengine: https://patchwork.ozlabs.org/project/buildroot/list/?series=279766 Some more questions below. > +diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn > +index d223a4f6f..16dec5c6a 100644 > +--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn > ++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn > +@@ -672,7 +672,8 @@ config("compiler") { > + # TODO(pcc): The contents of .ARM.attributes should be based on the > + # -march flag passed at compile time (see llvm.org/pr36291). > + if (current_cpu == "arm") { > +- ldflags += [ "-march=$arm_arch" ] > ++ # disabled for the buildroot compile > ++ # ldflags += [ "-march=$arm_arch" ] > + } > + } > + > +@@ -752,13 +753,15 @@ config("compiler_cpu_abi") { > + ldflags += [ "--target=arm-linux-gnueabihf" ] > + } > + if (!is_nacl) { > +- cflags += [ > +- "-march=$arm_arch", > +- "-mfloat-abi=$arm_float_abi", > +- ] > ++ # disabled for the buildroot compile > ++ # cflags += [ > ++ # "-march=$arm_arch", > ++ # "-mfloat-abi=$arm_float_abi", > ++ # ] > + } > + if (arm_tune != "") { > +- cflags += [ "-mtune=$arm_tune" ] > ++ # disabled for the buildroot compile > ++ # cflags += [ "-mtune=$arm_tune" ] > + } > + } else if (current_cpu == "arm64") { > + if (is_clang && !is_android && !is_nacl && !is_fuchsia) { > +@@ -1130,7 +1133,9 @@ config("clang_revision") { > + > + config("compiler_arm_fpu") { > + if (current_cpu == "arm" && !is_ios && !is_nacl) { > +- cflags = [ "-mfpu=$arm_fpu" ] > ++ # disabled for the buildroot compile > ++ # cflags = [ "-mfpu=$arm_fpu" ] > ++ cflags = [] > + asmflags = cflags > + } > + } > +@@ -1138,7 +1143,9 @@ config("compiler_arm_fpu") { > + config("compiler_arm_thumb") { > + if (current_cpu == "arm" && arm_use_thumb && is_posix && > + !(is_mac || is_ios || is_nacl)) { > +- cflags = [ "-mthumb" ] > ++ # disabled for the buildroot compile > ++ # cflags = [ "-mthumb" ] > ++ cflags = [] > + if (is_android && !is_clang) { > + # Clang doesn't support this option. > + cflags += [ "-mthumb-interwork" ] You're fixing the problem for ARM, but is there some similar mess for other CPU architectures? > +# configure arm architecture paramter for chromium compile > +ifeq ($(BR2_arm),y) > +ifeq ($(BR2_ARM_CPU_ARMV4),y) > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > + $(SED) 's/^ arm_version = 7$$/ arm_version = 4/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV5),y) > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > + $(SED) 's/^ arm_version = 7$$/ arm_version = 5/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV6),y) > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > + $(SED) 's/^ arm_version = 7$$/ arm_version = 6/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +# no entriy for BR2_ARM_CPU_ARMV7A/BR2_ARM_CPU_ARMV7M, arm_vesion = 7 is already set by default > + > +ifeq ($(BR2_ARM_CPU_ARMV8A),y) > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > + $(SED) 's/^ arm_version = 7$$/ arm_version = 8/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +# not known by buildroot, set to some dummy to disable all default logic > +define QT5WEBENGINE_CONFIGURE_ARM_ARCH > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "arm-dummy-arch"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +define QT5WEBENGINE_CONFIGURE_ARM_FPU > + $(SED) 's/^ arm_fpu = ""$$/ arm_fpu = $(BR2_GCC_TARGET_FPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +define QT5WEBENGINE_CONFIGURE_ARM_FLOAT_ABI > + $(SED) 's/^ arm_float_abi = ""$$/ arm_float_abi = $(BR2_GCC_TARGET_FLOAT_ABI)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +define QT5WEBENGINE_CONFIGURE_ARM_TUNE > + $(SED) 's/^ arm_tune = ""$$/ arm_tune = $(BR2_GCC_TARGET_CPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "true"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +else > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "false"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_HAS_THUMB),) > +define QT5WEBENGINE_CONFIGURE_ARM_THUMB > + $(SED) 's/^ arm_use_thumb = true$$/ arm_use_thumb = false/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > +endif What are all those variables doing in the GN Chromium stuff? I'm kind of worried by two aspects: - This is all very ARM specific, but we have other CPU architectures supported in Buildroot - We already pass the proper CFLAGS, so it's always annoying to duplicate this logic into package-specific flags Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 14:03:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 15:03:59 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/qt5webengine: use buildroot cflags/ldflags for arm In-Reply-To: <20200306203410.25008-2-ps.report@gmx.net> References: <20200306203410.25008-1-ps.report@gmx.net> <20200306203410.25008-2-ps.report@gmx.net> Message-ID: <20220109150359.1c4a717b@windsurf> On Fri, 6 Mar 2020 21:34:10 +0100 Peter Seiderer wrote: > +define QT5WEBENGINE_CONFIGURE_COMPILER_FLAGS > + $(SED) 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))%g' $(@D)/src/3rdparty/chromium/build/config/compiler/BUILD.gn > + $(SED) 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))%g' $(@D)/src/3rdparty/chromium/build/config/compiler/BUILD.gn > +endef This looks like a good thing. Could it replace the ARM-specific logic you had in your PATCH 1/2 ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yegorslists at googlemail.com Sun Jan 9 14:04:21 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Sun, 9 Jan 2022 15:04:21 +0100 Subject: [Buildroot] [PATCH] package/avrdude: bump to version 6.4 Message-ID: <20220109140421.27820-1-yegorslists@googlemail.com> From: Yegor Yefremov The project moved to GitHub, hence change the download location. Signed-off-by: Yegor Yefremov --- package/avrdude/avrdude.hash | 4 ++-- package/avrdude/avrdude.mk | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index ec43355451..1c7758afcd 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a09913450c6457c3fe8d43d5141de579d4e57d67e593e7399a4cd3768cc60f9 avrdude-r1450-br2.tar.gz -sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 avrdude/COPYING +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz +sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index ae623a7929..5bbbc4e8c2 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,13 +4,12 @@ # ################################################################################ -AVRDUDE_VERSION = r1450 -AVRDUDE_SITE_METHOD = svn -AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk +AVRDUDE_VERSION = v6.4 +AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ -AVRDUDE_LICENSE_FILES = avrdude/COPYING -AVRDUDE_SUBDIR = avrdude -# Sources coming from svn, without generated configure and Makefile.in +AVRDUDE_LICENSE_FILES = COPYING + +# Sources coming from git, without generated configure and Makefile.in # files. AVRDUDE_AUTORECONF = YES AVRDUDE_CONF_OPTS = --enable-linuxgpio -- 2.17.0 From fontaine.fabrice at gmail.com Sun Jan 9 14:03:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 15:03:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/gvfs: bump to version 1.48.1 Message-ID: <20220109140301.663692-1-fontaine.fabrice@gmail.com> Drop patch (not needed since https://gitlab.gnome.org/GNOME/gvfs/-/commit/eee4bb846038e4440ffc8a591869974639c72bb0) https://gitlab.gnome.org/GNOME/gvfs/-/blob/1.48.1/NEWS Signed-off-by: Fabrice Fontaine --- ...n.build-fix-linking-with-libmetadata.patch | 78 ------------------- package/gvfs/gvfs.hash | 4 +- package/gvfs/gvfs.mk | 2 +- 3 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch diff --git a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch b/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch deleted file mode 100644 index 3ee4a28e94..0000000000 --- a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 731256d7517f0d9cf0b999bb22f864080d5e8690 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 18 Jul 2020 10:00:50 +0200 -Subject: [PATCH] meson.build: fix linking with libmetadata - -libmetadata is built as a static library and depends on libgvfscommon so -change the dependencies order to put libgvfscommon_dep after -libmetadata_dep or gvfsd-metadata will fail to link on: - -FAILED: metadata/gvfsd-metadata -/home/naourr/work/instance-3/output-1/host/bin/arm-none-linux-gnueabi-gcc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata at exe/meta-daemon.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgio-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgobject-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/common -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/metadata -metadata/libmetadata.a(metatree.c.o): In function `safe_open': -metatree.c:(.text+0x9c8): undefined reference to `gvfs_randomize_string' -collect2: error: ld returned 1 exit status - -Apply this change in the whole source code and not only for -gvfsd-metadata to avoid any other build failures. - -Fixes: - - http://autobuild.buildroot.org/results//fa892c41b6b9285839a0164b000e37fb04dcc194 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/92] ---- - client/meson.build | 2 +- - metadata/meson.build | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/client/meson.build b/client/meson.build -index 8f57d0d3..1d251481 100644 ---- a/client/meson.build -+++ b/client/meson.build -@@ -33,8 +33,8 @@ sources = uri_parser_sources + uri_utils + files( - - deps = [ - gio_unix_dep, -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ] - - cflags = [ -diff --git a/metadata/meson.build b/metadata/meson.build -index 4e120d18..5699e6f2 100644 ---- a/metadata/meson.build -+++ b/metadata/meson.build -@@ -72,8 +72,8 @@ libmetadata_dep = declare_dependency( - ) - - deps = [ -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ] - - if enable_gudev -@@ -105,8 +105,8 @@ if enable_devel_utils - app + '.c', - include_directories: top_inc, - dependencies: [ -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ], - c_args: cflags, - ) -@@ -119,6 +119,7 @@ if enable_devel_utils - include_directories: top_inc, - dependencies: [ - libmetadata_dep, -+ libgvfscommon_dep, - libxml_dep, - ], - c_args: cflags, --- -2.27.0 - diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 2ee945e710..f4a5364f1f 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.44/gvfs-1.44.1.sha256sum -sha256 50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46 gvfs-1.44.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.48/gvfs-1.48.1.sha256sum +sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz # Hash for license file sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index fc77e8e1aa..4174592455 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.44 +GVFS_VERSION_MAJOR = 1.48 GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 14:10:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 15:10:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/atop: bump to version 2.7.1 Message-ID: <20220109141050.665536-1-fontaine.fabrice@gmail.com> https://www.atoptool.nl/downloadatop.php Signed-off-by: Fabrice Fontaine --- package/atop/atop.hash | 2 +- package/atop/atop.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index fb2eb1c727..18ba42340c 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 a606705aaca940a6d44d67c886529a75db98fd88140f743eb0aaebb184c38af7 atop-2.7.0.tar.gz +sha256 ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e atop-2.7.1.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index f2a1f1de51..8a0fcda33b 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.7.0 +ATOP_VERSION = 2.7.1 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Jan 9 14:19:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 15:19:12 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5declarative: remove optional quick module option In-Reply-To: <20200923182300.58950-1-b.bilas@grinn-global.com> References: <20200923182300.58950-1-b.bilas@grinn-global.com> Message-ID: <20220109151912.6423b8f1@windsurf> On Wed, 23 Sep 2020 20:23:00 +0200 Bartosz Bilas wrote: > Since commit [1] we are not able to disable/enable this module > so let's force to set Qt5 OpenGL support by default > if it's possible because currently quick's components > are being built anyway. > > This should fix the build errors with qt5location package > which includes couple of built-in components that require > OpenGL support [2] when Qt Quick module is detected. > > http://autobuild.buildroot.net/results/ddd/ddda7cdb9400f6ca7d548e9b5ada18674fbe42e0/ > http://autobuild.buildroot.net/results/ddb/ddb25ebb591ed6029a7bd4934464171358553936/ > > [1] https://git.buildroot.net/buildroot/commit/package/qt5/qt5declarative/qt5declarative.mk?id=1bdceb5d735aad5fbf32b35e3a7f573ecb727e20 > [2] https://code.woboq.org/qt5/qtdeclarative/src/quick/scenegraph/coreapi/qsgmaterialshader.h.html#105 > > Signed-off-by: Bartosz Bilas > --- > package/qt5/qt5declarative/Config.in | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) Sorry for the slow feedback/decision. The proper fix for this issue has been committed in December: https://git.buildroot.net/buildroot/commit/package/qt5/qt5location?id=cea2b082eb35d9fd466833098463e2adcbb40022 This allows qt5location to build without opengl, so there's no longer a need to force qt5declarative to enable opengl support. The BR2_PACKAGE_QT5DECLARATIVE_QUICK indeed no longer does anything in qt5declarative.mk itself, but it does ensure that the necessary dependencies for the quick module are enabled, and that therefore the quick module will be built. So I've marked the patch as Superseded. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Sun Jan 9 14:49:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 15:49:07 +0100 Subject: [Buildroot] [PATCH v3] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: <20220109110736.3963-1-nolange79@gmail.com> References: <20220109110736.3963-1-nolange79@gmail.com> Message-ID: Hi Norbert, Applied to master, thanks. I have a bunch of stylistic remarks, but it's nitpicky so I didn't apply them. The only thing I did is the indentation (4 spaces in shell scripts). On 09/01/2022 12:07, Norbert Lange wrote: [snip] > diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh > new file mode 100644 > index 0000000000..7e9b02cc0a > --- /dev/null > +++ b/package/systemd/fakeroot_tmpfiles.sh > @@ -0,0 +1,57 @@ > +#!/bin/sh > +# > +# The systemd-tmpfiles has the ability to grab information > +# from the filesystem (instead from the running system). > +# > +# However there are a few specifiers that *always* will grab > +# information from the running system examples are %a, %b, %m, %H > +# (Architecture, Boot UUID, Machine UUID, Hostname). > +# > +# See [1] for historic information. > +# > +# This script will (conservatively) skip tmpfiles lines that have > +# such an specifier to prevent leaking host information. Instead of skipping, perhaps we should terminate with an error? Or would that mean that it never passes with current systemd? > +# > +# shell expansion is critical to be POSIX compliant, > +# this script wont work with zsh in its default mode for example. I don't get this... If the script doesn't work with /bin/sh == zsh, maybe use /usr/bin/env bash instead? (We already check for bash in dependencies.sh so it's fine to require it.) > +# > +# The script takes several measures to handle more complex stuff > +# like passing this correctly: > +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n > +# > +# [1] - https://github.com/systemd/systemd/pull/16187 The end of that is that Lennart merged something which does (AFAIU) part of what you need done. Would it be possible to rebase your changes on top of that? > + > +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || > + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles > + > +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || I don't understand why you need "${1-}" and not simply "$1". In this context (with the quotes around it) there is no difference at all between the two, right? Also, I prefer ROOTFS="$1" and use $ROOTFS further down; IMHO that's more readable. > + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } > + > +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | > + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | > + while read -r line; do > + # it is allowed to use quotes around arguments, > + # so let the shell pack the arguments > + eval "set -- $line" > + > + # dont output warnings for directories we dont process > + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && > + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && > + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || > + continue > + > + # blank out all specs that are ok to use, > + # test if some remain. (Specs up to date with v250) > + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then > + # no "bad" specifiers, pass the line unmodified > + eval "printf '%s\n' '$line'" > + else > + # warn > + eval "printf 'ignored spec: %s\n' '$line' 1>&2" > + fi > + done | > +\ > +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ > + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ > + --exclude-prefix=/tmp --exclude-prefix=/mnt \ All these excludes are already excluded above from the "directories we don't process" block, so maybe it can be removed? OTOH, if we can later get upstream to no longer have those ignored specs, we can remove the preprocessing and it's handy to have the exclude statements already. Anyway, I added a comment to the comment block in the beginning to explain why they're excluded: # tmpfs directories (/tmp, /proc, ...) are skipped since they're not # relevant for the rootfs image. > + - > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 7bf8018438..e136229c8e 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -709,10 +709,15 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > endef > SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > +define SYSTEMD_CREATE_TMPFILES_HOOK > + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ > + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) Since the script has a shebang line, I remove the /bin/sh here and made it executable. > +endef > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL We normally add the hook immediately after the definition of the hook, so I changed that as well. Regards, Arnout PS There's no need to keep Maxime in Cc, he's no longer involved in Buildroot at all. > > SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) > SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) > @@ -783,7 +788,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dvconsole=false \ > -Dquotacheck=false \ > -Dsysusers=false \ > - -Dtmpfiles=false \ > + -Dtmpfiles=true \ > -Dimportd=false \ > -Dhwdb=false \ > -Drfkill=false \ > From arnout at mind.be Sun Jan 9 14:29:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 15:29:28 +0100 Subject: [Buildroot] [git commit] package/systemd: add systemd-oomd user Message-ID: <20220109144258.0858082DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b94dab2ee4f7467e017ebd8aaa8b26aaa1cc70e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master add the missing user if oomd is enabled. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 4cf8dd5707..a72ed04aeb 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -428,6 +428,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_OOMD),y) SYSTEMD_CONF_OPTS += -Doomd=true +SYSTEMD_OOMD_USER = systemd-oom -1 systemd-oom -1 * - - - systemd Userspace OOM Killer else SYSTEMD_CONF_OPTS += -Doomd=false endif @@ -585,6 +586,7 @@ define SYSTEMD_USERS - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) + $(SYSTEMD_OOMD_USER) $(SYSTEMD_NETWORKD_USER) $(SYSTEMD_RESOLVED_USER) $(SYSTEMD_TIMESYNCD_USER) From arnout at mind.be Sun Jan 9 14:30:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 15:30:12 +0100 Subject: [Buildroot] [git commit] package/systemd: fix pre-creation of directories for coredump Message-ID: <20220109144258.11CCD82DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99dabffc096c81bcd01198edc81b7ce262091ffb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix a copy-paste bug in commit be256690788fefad93ab00f0233ddb9414d29727. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a72ed04aeb..3811dbae42 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -414,7 +414,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing -SYSTEMD_HOMED_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - +SYSTEMD_COREDUMP_PERMISSIONS = /var/lib/systemd/coredump d 755 0 0 - - - - - else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -576,6 +576,7 @@ define SYSTEMD_PERMISSIONS $(SYSTEMD_LOGIND_PERMISSIONS) $(SYSTEMD_MACHINED_PERMISSIONS) $(SYSTEMD_HOMED_PERMISSIONS) + $(SYSTEMD_COREDUMP_PERMISSIONS) $(SYSTEMD_PSTORE_PERMISSIONS) $(SYSTEMD_TIMESYNCD_PERMISSIONS) endef From arnout at mind.be Sun Jan 9 14:09:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 15:09:39 +0100 Subject: [Buildroot] [git commit] package/systemd: invoke systemd-tmpfilesd on final image Message-ID: <20220109144257.F34A7817B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d9b84b7a83fef1048a026a3d1804c8b32a0990d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Especially for read-only filesystems it is helpful to pre-create all folders for non-volatile paths. This needs to run under fakeroot to allow setting uids/gids/perms for the target fs. systemd-tmpfilesd supports specifiers and target rootfs, but some specifiers resolve to information from the host, it is necessary to specially handle (skip) entries that contain problematic specifiers. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/fakeroot_tmpfiles.sh | 59 ++++++++++++++++++++++++++++++++++++ package/systemd/systemd.mk | 8 ++++- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh new file mode 100755 index 0000000000..9498638f0b --- /dev/null +++ b/package/systemd/fakeroot_tmpfiles.sh @@ -0,0 +1,59 @@ +#!/bin/sh +# +# The systemd-tmpfiles has the ability to grab information +# from the filesystem (instead from the running system). +# +# tmpfs directories (/tmp, /proc, ...) are skipped since they're not +# relevant for the rootfs image. +# +# However there are a few specifiers that *always* will grab +# information from the running system examples are %a, %b, %m, %H +# (Architecture, Boot UUID, Machine UUID, Hostname). +# +# See [1] for historic information. +# +# This script will (conservatively) skip tmpfiles lines that have +# such an specifier to prevent leaking host information. +# +# shell expansion is critical to be POSIX compliant, +# this script wont work with zsh in its default mode for example. +# +# The script takes several measures to handle more complex stuff +# like passing this correctly: +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n +# +# [1] - https://github.com/systemd/systemd/pull/16187 + +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles + +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } + +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | + while read -r line; do + # it is allowed to use quotes around arguments, + # so let the shell pack the arguments + eval "set -- $line" + + # dont output warnings for directories we dont process + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || + continue + + # blank out all specs that are ok to use, + # test if some remain. (Specs up to date with v250) + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then + # no "bad" specifiers, pass the line unmodified + eval "printf '%s\n' '$line'" + else + # warn + eval "printf 'ignored spec: %s\n' '$line' 1>&2" + fi + done | + TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run \ + --exclude-prefix=/sys --exclude-prefix=/tmp --exclude-prefix=/mnt \ + - diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 7bf8018438..4cf8dd5707 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -709,6 +709,12 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE +define SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK + define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef @@ -783,7 +789,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dvconsole=false \ -Dquotacheck=false \ -Dsysusers=false \ - -Dtmpfiles=false \ + -Dtmpfiles=true \ -Dimportd=false \ -Dhwdb=false \ -Drfkill=false \ From arnout at mind.be Sun Jan 9 14:49:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 15:49:24 +0100 Subject: [Buildroot] [PATCH v2] package/openrc: add patch to create /run/lock/subsys In-Reply-To: <20220109110555.3789-1-nolange79@gmail.com> References: <20220109110555.3789-1-nolange79@gmail.com> Message-ID: <7fb03a8b-f75f-8318-ce76-0ad5a96e6bc5@mind.be> On 09/01/2022 12:05, Norbert Lange wrote: > Together with changes to sysv/busybox init, this directory > will already exist on all init systems before any service > scripts are run. > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Arnout > --- > v1->v2: > * refresh patch > --- > ...lso-create-run-lock-subsys-directory.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/openrc/0006-Also-create-run-lock-subsys-directory.patch > > diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch > new file mode 100644 > index 0000000000..cf592a88b0 > --- /dev/null > +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch > @@ -0,0 +1,29 @@ > +From 49e5929b468f604d80a0c04a6ce78eb96ca36090 Mon Sep 17 00:00:00 2001 > +From: Norbert Lange > +Date: Sun, 9 Jan 2022 00:22:40 +0100 > +Subject: [PATCH] Also create /run/lock/subsys directory > + > +Buildroot service scripts regularly use this directory, so > +create it in the most appropriate spot. > + > +Signed-off-by: Norbert Lange > +--- > + sh/init.sh.Linux.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in > +index e8afc1fb..662ab223 100644 > +--- a/sh/init.sh.Linux.in > ++++ b/sh/init.sh.Linux.in > +@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then > + fi > + > + checkpath -d "$RC_SVCDIR" > +-checkpath -d -m 0775 -o root:daemon /run/lock > ++checkpath -d -m 0775 -o root:daemon /run/lock /run/lock/subsys > + > + # Try to mount xenfs as early as possible, otherwise rc_sys() will always > + # return RC_SYS_XENU and will think that we are in a domU while it's not. > +-- > +2.34.1 > + > From arnout at mind.be Sun Jan 9 14:49:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 15:49:34 +0100 Subject: [Buildroot] [PATCH v3] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: <20220109110736.3963-1-nolange79@gmail.com> References: <20220109110736.3963-1-nolange79@gmail.com> Message-ID: <41020492-1207-aaae-4a38-03f096c5b0e1@mind.be> On 09/01/2022 12:07, Norbert Lange wrote: > Especially for read-only filesystems it is helpfull to > pre-create all folders for non-volatile paths. > > This needs to run under fakeroot to allow setting > uids/gids/perms for the target fs. > > systemd-tmpfilesd supports specifiers and target rootfs, > but some specifiers resolve to information from the host, > it is necessary to specially handle (skip) entries that > contain problematic specifiers. > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Arnout > --- > v1->v2 > * add a script to skip/handle specifiers that might > otherwise take information from the host > v2->v3 > * adopt fakeroot_tmpfiles.sh to current systemd-tmpfilesd (v250), > several more specifiers are supported directly for our usecase. > --- > package/systemd/fakeroot_tmpfiles.sh | 57 ++++++++++++++++++++++++++++ > package/systemd/systemd.mk | 9 ++++- > 2 files changed, 64 insertions(+), 2 deletions(-) > create mode 100644 package/systemd/fakeroot_tmpfiles.sh > > diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh > new file mode 100644 > index 0000000000..7e9b02cc0a > --- /dev/null > +++ b/package/systemd/fakeroot_tmpfiles.sh > @@ -0,0 +1,57 @@ > +#!/bin/sh > +# > +# The systemd-tmpfiles has the ability to grab information > +# from the filesystem (instead from the running system). > +# > +# However there are a few specifiers that *always* will grab > +# information from the running system examples are %a, %b, %m, %H > +# (Architecture, Boot UUID, Machine UUID, Hostname). > +# > +# See [1] for historic information. > +# > +# This script will (conservatively) skip tmpfiles lines that have > +# such an specifier to prevent leaking host information. > +# > +# shell expansion is critical to be POSIX compliant, > +# this script wont work with zsh in its default mode for example. > +# > +# The script takes several measures to handle more complex stuff > +# like passing this correctly: > +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n > +# > +# [1] - https://github.com/systemd/systemd/pull/16187 > + > +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || > + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles > + > +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || > + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } > + > +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | > + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | > + while read -r line; do > + # it is allowed to use quotes around arguments, > + # so let the shell pack the arguments > + eval "set -- $line" > + > + # dont output warnings for directories we dont process > + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && > + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && > + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || > + continue > + > + # blank out all specs that are ok to use, > + # test if some remain. (Specs up to date with v250) > + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then > + # no "bad" specifiers, pass the line unmodified > + eval "printf '%s\n' '$line'" > + else > + # warn > + eval "printf 'ignored spec: %s\n' '$line' 1>&2" > + fi > + done | > +\ > +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ > + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ > + --exclude-prefix=/tmp --exclude-prefix=/mnt \ > + - > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 7bf8018438..e136229c8e 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -709,10 +709,15 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > endef > SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > +define SYSTEMD_CREATE_TMPFILES_HOOK > + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ > + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) > +endef > + > define SYSTEMD_PRESET_ALL > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > endef > -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL > > SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) > SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) > @@ -783,7 +788,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > -Dvconsole=false \ > -Dquotacheck=false \ > -Dsysusers=false \ > - -Dtmpfiles=false \ > + -Dtmpfiles=true \ > -Dimportd=false \ > -Dhwdb=false \ > -Drfkill=false \ > From arnout at mind.be Sun Jan 9 14:54:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 15:54:17 +0100 Subject: [Buildroot] [PATCH 1/1] boot/uboot/: Name U-Boot boot script image In-Reply-To: References: Message-ID: <5a29a382-a3c4-cd0a-24e2-85d478f79ece@mind.be> Hi Yair, On 24/06/2020 01:04, Yair Ben-Avraham wrote: > Signed-off-by: Yair Ben Avraham Shortly after you submitted this patch, the logic for U-boot scripts moved from boot/uboot to package/u-boot-tools. Could you update this patch to take that into account? Also, please update the commit message to explain the use case. Why would you want the name field in the script image to be set to anything? AFAIK it is not visible or used anywhere. > --- > boot/uboot/Config.in | 5 +++++ > boot/uboot/uboot.mk | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index 8cce9b1bae..310c4f8186 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -568,6 +568,11 @@ config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE > help > Source file to generate the U-Boot boot script. > > +config BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME > + string "U-Boot boot script image name" > + help > + Image (*not* file) name. > + > endif > > if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 71689207e3..ab945eb159 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -340,6 +340,7 @@ define UBOOT_INSTALL_IMAGES_CMDS > $(UBOOT_GENERATE_ENV_IMAGE) > $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT), > $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \ > + -n $(BR2_TARGET_UBOOT_BOOT_SCRIPT_IMAGE_NAME) \ We generally prefer explicit quoting, i.e. -n "$(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_SCRIPT_IMAGE_NAME))" Regards, Arnout > -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \ > $(BINARIES_DIR)/boot.scr) > endef > -- > 2.20.1 > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > From peter at korsgaard.com Sun Jan 9 14:57:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:57:48 +0100 Subject: [Buildroot] [PATCH] package/xapian: bump to version 1.4.19 In-Reply-To: <20220109113312.755637-1-gilles.talis@gmail.com> (Gilles Talis's message of "Sun, 9 Jan 2022 12:33:12 +0100") References: <20220109113312.755637-1-gilles.talis@gmail.com> Message-ID: <87y23pardf.fsf@dell.be.48ers.dk> >>>>> "Gilles" == Gilles Talis writes: > Signed-off-by: Gilles Talis Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:58:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:58:00 +0100 Subject: [Buildroot] [PATCH] package/libolm: bump to version 3.2.9 In-Reply-To: <20220109113223.755567-1-gilles.talis@gmail.com> (Gilles Talis's message of "Sun, 9 Jan 2022 12:32:23 +0100") References: <20220109113223.755567-1-gilles.talis@gmail.com> Message-ID: <87tuedard3.fsf@dell.be.48ers.dk> >>>>> "Gilles" == Gilles Talis writes: > Signed-off-by: Gilles Talis Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:58:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:58:50 +0100 Subject: [Buildroot] [PATCH] package/tesseract-ocr: bump to version 5.0.1 In-Reply-To: <20220109114757.785223-1-gilles.talis@gmail.com> (Gilles Talis's message of "Sun, 9 Jan 2022 12:47:57 +0100") References: <20220109114757.785223-1-gilles.talis@gmail.com> Message-ID: <87pmp1arbp.fsf@dell.be.48ers.dk> >>>>> "Gilles" == Gilles Talis writes: > - Updated language training data version to 4.1.0 > - Removed current patch as not required anymore > - Added patch to fix uclibc failures > - Supported C++ version has moved from C++11 to C++17 > Signed-off-by: Gilles Talis Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:59:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:59:15 +0100 Subject: [Buildroot] [PATCH 1/2] package/gupnp: bump to version 1.4.2 In-Reply-To: <20220109130732.430160-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 14:07:31 +0100") References: <20220109130732.430160-1-fontaine.fabrice@gmail.com> Message-ID: <87lezparb0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.2/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:59:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:59:30 +0100 Subject: [Buildroot] [PATCH 2/2] package/gupnp-av: bump to version 0.14.0 In-Reply-To: <20220109130732.430160-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 14:07:32 +0100") References: <20220109130732.430160-1-fontaine.fabrice@gmail.com> <20220109130732.430160-2-fontaine.fabrice@gmail.com> Message-ID: <87h7adaral.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://gitlab.gnome.org/GNOME/gupnp-av/-/blob/gupnp-av-0.14.0/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:59:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 15:59:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbytesize: bump to version 2.6 In-Reply-To: <20220109131128.468829-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 14:11:28 +0100") References: <20220109131128.468829-1-fontaine.fabrice@gmail.com> Message-ID: <87czl1ar9t.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/storaged-project/libbytesize/releases/tag/2.6 > https://github.com/storaged-project/libbytesize/blob/2.6/NEWS.rst > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 14:57:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:57:30 +0100 Subject: [Buildroot] [git commit] package/xapian: bump to version 1.4.19 Message-ID: <20220109145350.C1C4E82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ed3288e44e12817d1ea8bd56956f1af0a209798 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/xapian/xapian.hash | 4 ++-- package/xapian/xapian.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index 192032e6db..e570f7e2f2 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2021-January/009856.html -sha256 196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 xapian-core-1.4.18.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2022-January/009934.html +sha256 1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3 xapian-core-1.4.19.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 4f40babcf9..464e5478df 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.18 +XAPIAN_VERSION = 1.4.19 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Jan 9 14:59:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:59:08 +0100 Subject: [Buildroot] [git commit] package/gupnp: bump to version 1.4.2 Message-ID: <20220109145350.E10FE82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e89b555a4d20799990f954d545d180832bb3cd05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 1825298f24..cc78be7d5d 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.1.sha256sum: -sha256 899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c gupnp-1.4.1.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.2.sha256sum: +sha256 bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc gupnp-1.4.2.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index 02d9b289e0..aebf9225a8 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sun Jan 9 14:57:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:57:58 +0100 Subject: [Buildroot] [git commit] package/libolm: bump to version 3.2.9 Message-ID: <20220109145350.CC0FD82DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6050df28b225a686d750b6f9d6825de977735ad1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/libolm/libolm.hash | 2 +- package/libolm/libolm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 80210a2e5f..044bb24f06 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9b61bd9182bb0ae0c5a800a8b0496b69600a0a22e3a21fce0aad119d2b1c99ae olm-3.2.6.tar.gz +sha256 614c0e4dc4721f57e56c3385bd8def2f71c6631f928a480efd0b4bd8e5435df9 olm-3.2.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 0049fb6001..607e50702f 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.2.6 +LIBOLM_VERSION = 3.2.9 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 From peter at korsgaard.com Sun Jan 9 14:59:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:59:26 +0100 Subject: [Buildroot] [git commit] package/gupnp-av: bump to version 0.14.0 Message-ID: <20220109145350.EC30982DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=490d8b13b16f32d23fc69ebf00ac1c98d9f523e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.gnome.org/GNOME/gupnp-av/-/blob/gupnp-av-0.14.0/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gupnp-av/gupnp-av.hash | 4 ++-- package/gupnp-av/gupnp-av.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index 570f8ab3d0..ceab42ef52 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.13/gupnp-av-0.13.0.sha256sum: -sha256 578b8f562b0f7e908416a41efbe2b7e6b892cd2ed7eac61ac63c48fdc8d7e6c8 gupnp-av-0.13.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: +sha256 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156 gupnp-av-0.14.0.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index c2d3c3ba18..655de87608 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUPNP_AV_VERSION_MAJOR = 0.13 +GUPNP_AV_VERSION_MAJOR = 0.14 GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) From peter at korsgaard.com Sun Jan 9 14:59:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:59:45 +0100 Subject: [Buildroot] [git commit] package/libbytesize: bump to version 2.6 Message-ID: <20220109145351.00FF082DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4353279ce2231c702eac1d1c6f875e3e6708375 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/storaged-project/libbytesize/releases/tag/2.6 https://github.com/storaged-project/libbytesize/blob/2.6/NEWS.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libbytesize/libbytesize.hash | 2 +- package/libbytesize/libbytesize.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbytesize/libbytesize.hash b/package/libbytesize/libbytesize.hash index 51fa43aef1..2dfa97dd6a 100644 --- a/package/libbytesize/libbytesize.hash +++ b/package/libbytesize/libbytesize.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6305addae2b7be313dbfc36b96094ec0544d5144859ab4a5685ca6d314d6fdda libbytesize-2.5.tar.gz +sha256 efaa2b35b2bb3b52bf7b4ff5d0ed2c5c61360a5196053808d615dd0aa2cf0741 libbytesize-2.6.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libbytesize/libbytesize.mk b/package/libbytesize/libbytesize.mk index 0ba380dc74..2ef08211c5 100644 --- a/package/libbytesize/libbytesize.mk +++ b/package/libbytesize/libbytesize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.5 +LIBBYTESIZE_VERSION = 2.6 LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) LIBBYTESIZE_LICENSE = LGPL-2.1+ LIBBYTESIZE_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Jan 9 14:58:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 15:58:45 +0100 Subject: [Buildroot] [git commit] package/tesseract-ocr: bump to version 5.0.1 Message-ID: <20220109145350.D5EB882DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df3f0c226fccd8d6143b09a1e05a0f5f23587136 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Updated language training data version to 4.1.0 - Removed current patch as not required anymore - Added patch to fix uclibc failures - Supported C++ version has moved from C++11 to C++17 Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- ...Check-if-platform-supports-feenableexcept.patch | 42 ++++++++++++++++++++++ .../0001-Fix-timeval-structure-build-failure.patch | 27 -------------- package/tesseract-ocr/Config.in | 6 ++-- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 4 +-- 5 files changed, 48 insertions(+), 33 deletions(-) diff --git a/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch new file mode 100644 index 0000000000..5280f01aba --- /dev/null +++ b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch @@ -0,0 +1,42 @@ +From 52484af83a58664c3cc91b8af07aeeea271f67ef Mon Sep 17 00:00:00 2001 +From: Gilles Talis +Date: Sun, 9 Jan 2022 10:58:36 +0100 +Subject: [PATCH] Check if platform supports feenableexcept + +Signed-off-by: Gilles Talis +--- + configure.ac | 4 ++++ + src/tesseract.cpp | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9177d64..80cd735 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,10 @@ case "${host_cpu}" in + + esac + ++# check whether feenableexcept is supported. some C libraries (e.g. uclibc) don't. ++AC_CHECK_FUNC(feenableexcept, [feenableexcept=true], [feenableexcept=false]) ++AM_CONDITIONAL([HAVE_FEENABLEEXCEPT], $feenableexcept) ++ + AX_CHECK_COMPILE_FLAG([-fopenmp-simd], [openmp_simd=true], [openmp_simd=false], [$WERROR]) + AM_CONDITIONAL([OPENMP_SIMD], $openmp_simd) + +diff --git a/src/tesseract.cpp b/src/tesseract.cpp +index 933116e..9154db8 100644 +--- a/src/tesseract.cpp ++++ b/src/tesseract.cpp +@@ -629,7 +629,7 @@ static void PreloadRenderers(tesseract::TessBaseAPI &api, + **********************************************************************/ + + int main(int argc, char **argv) { +-#if defined(__USE_GNU) ++#if defined(__USE_GNU) && defined(HAVE_FEENABLEEXCEPT) + // Raise SIGFPE. + # if defined(__clang__) + // clang creates code which causes some FP exceptions, so don't enable those. +-- +2.32.0 + diff --git a/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch b/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch deleted file mode 100644 index 0b0bb1a899..0000000000 --- a/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ea1e1ddfc0af9966a0c613a93087bc3e0a5979a7 Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Fri, 19 Jul 2019 18:52:03 +0200 -Subject: [PATCH] Fix timeval structure build failure - -timeval structure definition requires to be included - -Signed-off-by: Gilles Talis ---- - src/ccutil/ocrclass.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h -index d39a6dd..2a01118 100644 ---- a/src/ccutil/ocrclass.h -+++ b/src/ccutil/ocrclass.h -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #ifdef _WIN32 - #include // for timeval - #endif --- -2.7.4 - diff --git a/package/tesseract-ocr/Config.in b/package/tesseract-ocr/Config.in index 3afaca771a..4d9b78733e 100644 --- a/package/tesseract-ocr/Config.in +++ b/package/tesseract-ocr/Config.in @@ -1,13 +1,13 @@ -comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 4.8, dynamic library, wchar" +comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, wchar" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR menuconfig BR2_PACKAGE_TESSERACT_OCR bool "tesseract-ocr" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 808ea174ef..9e526423d3 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb tesseract-ocr-4.1.1.tar.gz +sha256 b5b0e561650ed67feb1e9de38d4746121d302ae4c876c95b99b8b6f9f89d5c58 tesseract-ocr-5.0.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index fc083c27f6..7e23e64136 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,8 +4,8 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 4.1.1 -TESSERACT_OCR_DATA_VERSION = 4.0.0 +TESSERACT_OCR_VERSION = 5.0.1 +TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 TESSERACT_OCR_LICENSE_FILES = LICENSE From romain.naour at smile.fr Sun Jan 9 15:00:11 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 16:00:11 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org Message-ID: <20220109150012.1907226-1-romain.naour@smile.fr> While packaging telegraf [1] the download step failed due to a checksum mismatch: go: downloading collectd.org v0.5.0 get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 verifying collectd.org at v0.5.0: checksum mismatch downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= SECURITY ERROR This download does NOT match an earlier download recorded in go.sum. The bits may have been replaced on the origin server, or an attacker may have intercepted the download attempt. For more information, see 'go help module-auth'. go-collectd was bumped in telegraf since several releases (since v1.19.0) without any changes regarding the go-collectd hash. Some users reported an issue [3] when using "GOPROXY=direct" and used "GOPROXY=proxy.golang.org" as a workaround. [1] https://github.com/influxdata/telegraf/ [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- package/pkg-golang.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 35bcb1673b..e23778d96a 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV = \ $(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ + GOPROXY=proxy.golang.org \ BR_GOMOD=$$($(2)_GOMOD) # Due to vendoring, it is pretty likely that not all licenses are -- 2.31.1 From romain.naour at smile.fr Sun Jan 9 15:00:12 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 16:00:12 +0100 Subject: [Buildroot] [PATCH 2/2] package/telegraf: new package In-Reply-To: <20220109150012.1907226-1-romain.naour@smile.fr> References: <20220109150012.1907226-1-romain.naour@smile.fr> Message-ID: <20220109150012.1907226-2-romain.naour@smile.fr> Install the telegraf default configuration and the systemd service files provided by the project [1]. [1] https://github.com/influxdata/telegraf/blob/v1.21.2/scripts/deb/post-install.sh Signed-off-by: Romain Naour --- Telegraf also provide an SysVinit script but I didn't tested it. --- DEVELOPERS | 1 + package/Config.in | 1 + package/telegraf/Config.in | 19 +++++++++++++++++++ package/telegraf/telegraf.hash | 3 +++ package/telegraf/telegraf.mk | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 package/telegraf/Config.in create mode 100644 package/telegraf/telegraf.hash create mode 100644 package/telegraf/telegraf.mk diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..ab4d5ba446 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2462,6 +2462,7 @@ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ F: package/supertuxkart/ +F: package/telegraf/ F: package/terminology/ F: package/tk/ F: package/upower/ diff --git a/package/Config.in b/package/Config.in index 2d3ca6a3b6..d77c843465 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ menu "System tools" source "package/systemd-bootchart/Config.in" source "package/sysvinit/Config.in" source "package/tar/Config.in" + source "package/telegraf/Config.in" source "package/thermald/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" diff --git a/package/telegraf/Config.in b/package/telegraf/Config.in new file mode 100644 index 0000000000..c95145f386 --- /dev/null +++ b/package/telegraf/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_TELEGRAF + bool "telegraf" + 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_USE_MMU # logrotate + depends on BR2_USE_WCHAR # logrotate + select BR2_PACKAGE_LOGROTATE # runtime + help + Telegraf is the open source server agent to help you + collect metrics from your stacks, sensors and systems. + + https://www.influxdata.com/time-series-platform/telegraf + +comment "telegraf needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU diff --git a/package/telegraf/telegraf.hash b/package/telegraf/telegraf.hash new file mode 100644 index 0000000000..0547621ea4 --- /dev/null +++ b/package/telegraf/telegraf.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 bdd33f9248872dca282f8649713dedf7fc0eafd8876664031fb37a0350059ab6 v1.21.2.tar.gz +sha256 29d6b3c9c5671e8375a42bf4c5d4e85e05efd314ef363a56bb1728621e9cad5a LICENSE diff --git a/package/telegraf/telegraf.mk b/package/telegraf/telegraf.mk new file mode 100644 index 0000000000..42b19a11e9 --- /dev/null +++ b/package/telegraf/telegraf.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# telegraf +# +################################################################################ + +TELEGRAF_VERSION = 1.21.2 +TELEGRAF_SITE = https://github.com/influxdata/telegraf/archive +TELEGRAF_SOURCE = v$(TELEGRAF_VERSION).tar.gz +TELEGRAF_LICENSE = MIT +TELEGRAF_LICENSE_FILES = LICENSE + +TELEGRAF_LDFLAGS = -X main.version=$(TELEGRAF_VERSION) +TELEGRAF_BUILD_TARGETS = cmd/telegraf + +define TELEGRAF_INSTALL_TARGET_FIXUP + mkdir -p $(TARGET_DIR)/etc/telegraf/telegraf.d + $(INSTALL) -D -m 644 $(@D)/etc/telegraf.conf $(TARGET_DIR)/etc/telegraf.conf + mkdir -p $(TARGET_DIR)/etc/logrotate.d + $(INSTALL) -D -m 644 $(@D)/etc/logrotate.d/telegraf $(TARGET_DIR)/etc/logrotate.d/telegraf + mkdir -p $(TARGET_DIR)/etc/default + touch $(TARGET_DIR)/etc/default/telegraf +endef + +TELEGRAF_POST_INSTALL_TARGET_HOOKS += TELEGRAF_INSTALL_TARGET_FIXUP + +define TELEGRAF_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/scripts/telegraf.service \ + $(TARGET_DIR)/usr/lib/systemd/system/telegraf.service +endef + +$(eval $(golang-package)) -- 2.31.1 From peter at korsgaard.com Sun Jan 9 15:01:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 16:01:18 +0100 Subject: [Buildroot] [git commit] package/atop: bump to version 2.7.1 Message-ID: <20220109145517.EF29B82C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=353483b1e71a5169ca97315dae7d1814740070ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://www.atoptool.nl/downloadatop.php Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/atop/atop.hash | 2 +- package/atop/atop.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index fb2eb1c727..18ba42340c 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 a606705aaca940a6d44d67c886529a75db98fd88140f743eb0aaebb184c38af7 atop-2.7.0.tar.gz +sha256 ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e atop-2.7.1.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index f2a1f1de51..8a0fcda33b 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.7.0 +ATOP_VERSION = 2.7.1 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Jan 9 15:01:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 16:01:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/atop: bump to version 2.7.1 In-Reply-To: <20220109141050.665536-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 15:10:50 +0100") References: <20220109141050.665536-1-fontaine.fabrice@gmail.com> Message-ID: <878rvpar79.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://www.atoptool.nl/downloadatop.php > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Jan 9 15:04:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 16:04:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: add mysql_config to MARIADB_CONFIG_SCRIPTS Message-ID: <20220109150422.792641-1-fontaine.fabrice@gmail.com> Add mysql_config to MARIADB_CONFIG_SCRIPTS, this won't fix any build failure at the moment but will avoid possible issues in the future Signed-off-by: Fabrice Fontaine --- package/mariadb/mariadb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d08b768a2e..db967ca3ed 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -14,6 +14,7 @@ MARIADB_CPE_ID_VENDOR = mariadb MARIADB_SELINUX_MODULES = mysql MARIADB_INSTALL_STAGING = YES MARIADB_PROVIDES = mysql +MARIADB_CONFIG_SCRIPTS = mysql_config MARIADB_DEPENDENCIES = \ host-mariadb \ -- 2.34.1 From yann.morin.1998 at free.fr Sun Jan 9 15:03:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:03:38 +0100 Subject: [Buildroot] [git commit] package/busybox: explicitly state binutils paths Message-ID: <20220109150224.C229D82DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c669bd5115d748a76018490af0c798df2747657d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We are not passing TARGET_CONFIGURE_OPTS when building busybox; instead we are passing variables explicitly. As thus, it is missing the ar, nm, and ranlib that we are using. We add explicit AR, NM, and RANLIB, so that the ones we want to use (i.e. the gcc-wrapped ones) are actually used. Signed-off-by: Norbert Lange [yann.morin.1998 at free.fr: - reword the commit log to explain why we need that ] Signed-off-by: Yann E. MORIN --- package/busybox/busybox.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 3523cf21d0..60ebc4985f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -91,6 +91,9 @@ BUSYBOX_MAKE_ENV += \ endif BUSYBOX_MAKE_OPTS = \ + AR="$(TARGET_AR)" \ + NM="$(TARGET_NM)" \ + RANLIB="$(TARGET_RANLIB)" \ CC="$(TARGET_CC)" \ ARCH=$(KERNEL_ARCH) \ PREFIX="$(TARGET_DIR)" \ From yann.morin.1998 at free.fr Sun Jan 9 15:03:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:03:23 +0100 Subject: [Buildroot] [git commit] package/Makefile.in: use gcc wrappers for binutils tools Message-ID: <20220109150224.B7C1982C0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c08fa13d363b7e3faa2f065f6261af6fa52445f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will use gcc-ar, gcc-nm and gcc-ranlib instead of the normal binutils tools. The difference is that with the wrappers, gcc plugins will be automatically picked up. gcc 4.7 introduced these wrappers, to detect the prefix and keep gcc specifics out of Makefile.in, a new variable BR2_TOOLCHAIN_BUTILS_PREFIX will be used to carry the prefix on supported versions. Note that binutils added some automatic loading with the 'bfd-plugins' directory (somewhere around 2.28), but the first implementation had issues, and generally depends on correctly setup symlinks (often broken, may point to some other gcc's library). The wrappers always work painless. The original motivation (now ~2 years in use) was to add "-flto -ffat-lto-objects" to both BR2_TARGET_OPTIMIZATION and BR2_TARGET_LDFLAGS, and have target binaries lto optimized. Not all packages will compile with this option, further work could white/blacklist packages (adding -fno-lto to the options). Signed-off-by: Norbert Lange [yann.morin.1998 at free.fr: don't introduce a Config.in blind option] Signed-off-by: Yann E. MORIN --- package/Makefile.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 0ca2a5844e..508ea7c366 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -210,16 +210,23 @@ else TARGET_CROSS = $(HOST_DIR)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- endif +# gcc-4.7 and later ships with wrappers that will automatically pass +# arguments to the binutils tools. Those are paths to necessary linker +# plugins. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +TARGET_GCC_WRAPPERS_PREFIX = gcc- +endif + # Define TARGET_xx variables for all common binutils/gcc -TARGET_AR = $(TARGET_CROSS)ar +TARGET_AR = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)ar TARGET_AS = $(TARGET_CROSS)as TARGET_CC = $(TARGET_CROSS)gcc TARGET_CPP = $(TARGET_CROSS)cpp TARGET_CXX = $(TARGET_CROSS)g++ TARGET_FC = $(TARGET_CROSS)gfortran TARGET_LD = $(TARGET_CROSS)ld -TARGET_NM = $(TARGET_CROSS)nm -TARGET_RANLIB = $(TARGET_CROSS)ranlib +TARGET_NM = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)nm +TARGET_RANLIB = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)ranlib TARGET_READELF = $(TARGET_CROSS)readelf TARGET_OBJCOPY = $(TARGET_CROSS)objcopy TARGET_OBJDUMP = $(TARGET_CROSS)objdump From yann.morin.1998 at free.fr Sun Jan 9 15:08:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:08:40 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/Makefile.in: use gcc wrappers for binutils tools In-Reply-To: <20201017221743.160029-1-nolange79@gmail.com> References: <20201017221743.160029-1-nolange79@gmail.com> Message-ID: <20220109150840.GA1477939@scaer> Norbert, All, On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > This will use gcc-ar, gcc-nm and gcc-ranlib instead of the > normal binutils tools. The difference is that with the > wrappers, gcc plugins will be automatically picked up. > > gcc 4.7 introduced these wrappers, to detect the prefix and > keep gcc specifics out of Makefile.in, a new variable > BR2_TOOLCHAIN_BUTILS_PREFIX will be used to carry the > prefix on supported versions. > > Note that binutils added some automatic loading with the > 'bfd-plugins' directory (somewhere around 2.28), but > the first implementation had issues, and generally depends on > correctly setup symlinks (often broken, may point to some > other gcc's library). The wrappers always work painless. > > The original motivation (now ~2 years in use) was to add > "-flto -ffat-lto-objects" to both BR2_TARGET_OPTIMIZATION and > BR2_TARGET_LDFLAGS, and have target binaries lto optimized. > > Not all packages will compile with this option, further work > could white/blacklist packages (adding -fno-lto to the > options). > > Signed-off-by: Norbert Lange > --- > v1->v2: > * support older gcc versions missing those wrappers > --- > package/Makefile.in | 6 +++--- > toolchain/Config.in | 7 +++++++ > 2 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/package/Makefile.in b/package/Makefile.in > index 51f5cbce4f..665edec539 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -198,15 +198,15 @@ TARGET_CROSS = $(HOST_DIR)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- > endif > > # Define TARGET_xx variables for all common binutils/gcc > -TARGET_AR = $(TARGET_CROSS)ar > +TARGET_AR = $(TARGET_CROSS)$(call qstrip,$(BR2_TOOLCHAIN_BUTILS_PREFIX))ar > TARGET_AS = $(TARGET_CROSS)as > TARGET_CC = $(TARGET_CROSS)gcc > TARGET_CPP = $(TARGET_CROSS)cpp > TARGET_CXX = $(TARGET_CROSS)g++ > TARGET_FC = $(TARGET_CROSS)gfortran > TARGET_LD = $(TARGET_CROSS)ld > -TARGET_NM = $(TARGET_CROSS)nm > -TARGET_RANLIB = $(TARGET_CROSS)ranlib > +TARGET_NM = $(TARGET_CROSS)$(call qstrip,$(BR2_TOOLCHAIN_BUTILS_PREFIX))nm > +TARGET_RANLIB = $(TARGET_CROSS)$(call qstrip,$(BR2_TOOLCHAIN_BUTILS_PREFIX))ranlib > TARGET_READELF = $(TARGET_CROSS)readelf > TARGET_OBJCOPY = $(TARGET_CROSS)objcopy > TARGET_OBJDUMP = $(TARGET_CROSS)objdump > diff --git a/toolchain/Config.in b/toolchain/Config.in > index db2ab0f059..7a2becc09a 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -732,4 +732,11 @@ config BR2_TOOLCHAIN_HAS_LIBQUADMATH > bool > default y if BR2_i386 || BR2_x86_64 > > +# gcc ships with wrappers that will automatically pass arguments > +# to the binutils tools. > +# So far, those are paths to necessary linker plugins > +config BR2_TOOLCHAIN_BUTILS_PREFIX > + string > + default "gcc-" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 There was no need for a Kconfig option, so I moved that to the Makefile side. Applied to master, thanks. Regards, Yann E. MORIN. > endmenu > -- > 2.28.0 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 15:09:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:09:14 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/busybox: explicitly state binutil paths In-Reply-To: <20201017221743.160029-3-nolange79@gmail.com> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-3-nolange79@gmail.com> Message-ID: <20220109150914.GB1477939@scaer> Norbet, All, On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > Pass paths to ar, nm, ranlib binaries. This allows linker-plugins > to be used. I have expanded/reworded the commit log to explain why this is needed specifically for busybox. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Norbert Lange > --- > package/busybox/busybox.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index 01f7331221..221b8adf59 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -94,6 +94,9 @@ BUSYBOX_MAKE_ENV += \ > endif > > BUSYBOX_MAKE_OPTS = \ > + AR="$(TARGET_AR)" \ > + NM="$(TARGET_NM)" \ > + RANLIB="$(TARGET_RANLIB)" \ > CC="$(TARGET_CC)" \ > ARCH=$(KERNEL_ARCH) \ > PREFIX="$(TARGET_DIR)" \ > -- > 2.28.0 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sun Jan 9 15:14:13 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 16:14:13 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org Message-ID: <20220109151414.1908259-1-romain.naour@smile.fr> While packaging telegraf [1] the download step failed due to a checksum mismatch: go: downloading collectd.org v0.5.0 get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 verifying collectd.org at v0.5.0: checksum mismatch downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= SECURITY ERROR This download does NOT match an earlier download recorded in go.sum. The bits may have been replaced on the origin server, or an attacker may have intercepted the download attempt. For more information, see 'go help module-auth'. go-collectd was bumped in telegraf since several releases (since v1.19.0) without any changes regarding the go-collectd hash. Some users reported an issue [3] when using "GOPROXY=direct" and used "GOPROXY=proxy.golang.org" as a workaround. [1] https://github.com/influxdata/telegraf/ [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 Signed-off-by: Romain Naour Cc: Thomas Petazzoni --- package/pkg-golang.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 35bcb1673b..e23778d96a 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV = \ $(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ + GOPROXY=proxy.golang.org \ BR_GOMOD=$$($(2)_GOMOD) # Due to vendoring, it is pretty likely that not all licenses are -- 2.31.1 From romain.naour at smile.fr Sun Jan 9 15:14:14 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 16:14:14 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/telegraf: new package In-Reply-To: <20220109151414.1908259-1-romain.naour@smile.fr> References: <20220109151414.1908259-1-romain.naour@smile.fr> Message-ID: <20220109151414.1908259-2-romain.naour@smile.fr> Install the telegraf default configuration and the systemd service files provided by the project [1]. [1] https://github.com/influxdata/telegraf/blob/v1.21.2/scripts/deb/post-install.sh Signed-off-by: Romain Naour --- Telegraf also provide an SysVinit script but I didn't tested it. v2: re-add TELEGRAF_USERS removed while cleaning the package. --- DEVELOPERS | 1 + package/Config.in | 1 + package/telegraf/Config.in | 19 +++++++++++++++++ package/telegraf/telegraf.hash | 3 +++ package/telegraf/telegraf.mk | 37 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) create mode 100644 package/telegraf/Config.in create mode 100644 package/telegraf/telegraf.hash create mode 100644 package/telegraf/telegraf.mk diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..ab4d5ba446 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2462,6 +2462,7 @@ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ F: package/supertuxkart/ +F: package/telegraf/ F: package/terminology/ F: package/tk/ F: package/upower/ diff --git a/package/Config.in b/package/Config.in index 2d3ca6a3b6..d77c843465 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ menu "System tools" source "package/systemd-bootchart/Config.in" source "package/sysvinit/Config.in" source "package/tar/Config.in" + source "package/telegraf/Config.in" source "package/thermald/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" diff --git a/package/telegraf/Config.in b/package/telegraf/Config.in new file mode 100644 index 0000000000..c95145f386 --- /dev/null +++ b/package/telegraf/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_TELEGRAF + bool "telegraf" + 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_USE_MMU # logrotate + depends on BR2_USE_WCHAR # logrotate + select BR2_PACKAGE_LOGROTATE # runtime + help + Telegraf is the open source server agent to help you + collect metrics from your stacks, sensors and systems. + + https://www.influxdata.com/time-series-platform/telegraf + +comment "telegraf needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU diff --git a/package/telegraf/telegraf.hash b/package/telegraf/telegraf.hash new file mode 100644 index 0000000000..0547621ea4 --- /dev/null +++ b/package/telegraf/telegraf.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 bdd33f9248872dca282f8649713dedf7fc0eafd8876664031fb37a0350059ab6 v1.21.2.tar.gz +sha256 29d6b3c9c5671e8375a42bf4c5d4e85e05efd314ef363a56bb1728621e9cad5a LICENSE diff --git a/package/telegraf/telegraf.mk b/package/telegraf/telegraf.mk new file mode 100644 index 0000000000..90156e4ca7 --- /dev/null +++ b/package/telegraf/telegraf.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# telegraf +# +################################################################################ + +TELEGRAF_VERSION = 1.21.2 +TELEGRAF_SITE = https://github.com/influxdata/telegraf/archive +TELEGRAF_SOURCE = v$(TELEGRAF_VERSION).tar.gz +TELEGRAF_LICENSE = MIT +TELEGRAF_LICENSE_FILES = LICENSE + +TELEGRAF_LDFLAGS = -X main.version=$(TELEGRAF_VERSION) +TELEGRAF_BUILD_TARGETS = cmd/telegraf + +define TELEGRAF_INSTALL_TARGET_FIXUP + mkdir -p $(TARGET_DIR)/etc/telegraf/telegraf.d + $(INSTALL) -D -m 644 $(@D)/etc/telegraf.conf $(TARGET_DIR)/etc/telegraf.conf + mkdir -p $(TARGET_DIR)/etc/logrotate.d + $(INSTALL) -D -m 644 $(@D)/etc/logrotate.d/telegraf $(TARGET_DIR)/etc/logrotate.d/telegraf + mkdir -p $(TARGET_DIR)/etc/default + touch $(TARGET_DIR)/etc/default/telegraf +endef + +TELEGRAF_POST_INSTALL_TARGET_HOOKS += TELEGRAF_INSTALL_TARGET_FIXUP + +define TELEGRAF_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/scripts/telegraf.service \ + $(TARGET_DIR)/usr/lib/systemd/system/telegraf.service +endef + +# telegraf.service provided by telegraf use "telegraf" user to start the service. +define TELEGRAF_USERS + telegraf -1 telegraf -1 * /etc/telegraf - - Telegraf user +endef + +$(eval $(golang-package)) -- 2.31.1 From yann.morin.1998 at free.fr Sun Jan 9 15:16:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 16:16:53 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/gcc: use binutils wrappers for target libs In-Reply-To: <20201017221743.160029-2-nolange79@gmail.com> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-2-nolange79@gmail.com> Message-ID: <20220109151653.GC1477939@scaer> Nrobert, All, On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > This will use gcc-ar, gcc-nm and gcc-ranlib instead of the > normal binutils tools. The difference is that with the > wrappers, gcc plugins will be automatically picked up, > which might be necessary with some flags. > > Signed-off-by: Norbert Lange > --- > v1->v2: > * Only set those wrappers if gc 4.7 or newer > --- > package/gcc/gcc.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > index 114c2887a0..a24ffe3ee2 100644 > --- a/package/gcc/gcc.mk > +++ b/package/gcc/gcc.mk > @@ -99,6 +99,9 @@ GCC_COMMON_TARGET_CFLAGS += -Wno-error > endif > > # Propagate options used for target software building to GCC target libs > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) > +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib So we were a bit skeptical about this one. First, we believe that only the final gcc should be using those. Indeed, we do not need much of the initial gcc, except libgcc.a, which anyway gets overwitten by the final gcc, so we do not care that the libgcc.a is built with LTO (and thus the gcc wrappers). Second, gcc initial is only used to build glibc, and as your patch 4 states, glibc must not be built with LTO, we we also do not care that the initial gcc uses its wrappers to build libgcc. Third, shouldn't we be using the tupple-prefixed wrappers? Or does it just happens that gcc will internally add its build directory to PATH so that it can find the un-prefixed just-built ones? For that last point, I added gcc-ar, gcc-nm, and gcc-ranlib in my PATH, that are just simple wrapper scripts that trace their being called, and then call to the actual gcca-r et al.: #!/bin/sh me="${0}" my_name="${0##*/}" found=false for i in $(which -a "${my_name}"); do if [ "${i}" -ef "${me}" ]; then found=true elif ${found}; then me="${i}" fi done if ! ${found}; then exit 42 fi printf "YEM: wrapped %s\n" "${me}" exec "${me}" "${@}" Turns out that the 'YEM: wrapped' string occurs nowhere in the build directory (so it does not end up in config.log or whatever), and it does not even appear on the stdout/stderr either. So I am wondering how we can exercise these... Any hint? Regards, Yann E. MORIN. > +endif > HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" > HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" > > -- > 2.28.0 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From herve.codina at bootlin.com Sun Jan 9 15:17:49 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Sun, 9 Jan 2022 16:17:49 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/alchemy: new host package In-Reply-To: <20220101155022.GD2777@scaer> References: <20211112131258.2671293-1-herve.codina@bootlin.com> <20211112131258.2671293-2-herve.codina@bootlin.com> <20220101155022.GD2777@scaer> Message-ID: <20220109161749.758edd3c@bootlin.com> Hi Yann, On Sat, 1 Jan 2022 16:50:22 +0100 "Yann E. MORIN" wrote: > Herv?, All, > > On 2021-11-12 14:12 +0100, Herve Codina spake thusly: > > Alchemy is a build system developed by Parrot. > > > > It is a new build system based on the one used in Android. > > A central makefile instance scans a workspace to find user > > makefiles, includes them and register modules to be built. > > > > https://github.com/Parrot-Developers/alchemy > > > > Signed-off-by: Herve Codina > > I was about to push this, with a few changes, but I have some questions > about the packages, so here's the patch of the changes I did: > > [yann.morin.1998 at free.fr: > - use ALCHEMY_HOME everywhere rather than repeating the location in > the install macro > - don't remove install dir before installing > - use a template for atom.mk, not in-line in alchemy.mk > ] > > diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk > index 63d5a941c5..f802c62425 100644 > --- a/package/alchemy/alchemy.mk > +++ b/package/alchemy/alchemy.mk > @@ -10,19 +10,19 @@ ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) > ALCHEMY_LICENSE_FILES = COPYING README > HOST_ALCHEMY_DEPENDENCIES = host-python3 > > +ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy > ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk > > define HOST_ALCHEMY_INSTALL_CMDS > - rm -rf $(HOST_DIR)/opt/alchemy > - mkdir -p $(HOST_DIR)/opt/alchemy > - cp -rf $(@D)/* $(HOST_DIR)/opt/alchemy/ > + mkdir -p $(ALCHEMY_HOME) > + cp -rf $(@D)/* $(ALCHEMY_HOME) > + cp $(ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOM E)/atom.mk.in > endef > > $(eval $(host-generic-package)) > > # Variables used by other packages > > -ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy > ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake > > # TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture. > @@ -59,14 +59,11 @@ endif > # $2: Alchemy module name > # $3: Alchemy module file name > define ALCHEMY_INSTALL_LIB_SDK_FILE > - mkdir -p $(ALCHEMY_SDK_BASEDIR)/$(strip $(1)) > - ( \ > - echo 'LOCAL_PATH := $$(call my-dir)'; \ > - echo 'include $$(CLEAR_VARS)'; \ > - echo 'LOCAL_MODULE := $(strip $(2))'; \ > - echo 'LOCAL_SDK := $(STAGING_DIR)'; \ > - echo 'LOCAL_DESTDIR := usr/lib'; \ > - echo 'LOCAL_MODULE_FILENAME := $(strip $(3))'; \ > - echo 'include $$(BUILD_LIBRARY)'; \ > - ) > $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk > + $(INSTALL) -m 0644 -D \ > + $(ALCHEMY_HOME)/atom.mk.in \ > + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk > + $(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \ > + -e 's#@MODULE@#$(strip $(2))#' \ > + -e 's#@MODULE_FILENAME@#$(strip $(3))#' \ > + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk > endef > diff --git a/package/alchemy/atom.mk.in b/package/alchemy/atom.mk.in > new file mode 100644 > index 0000000000..30eb6d5e23 > --- /dev/null > +++ b/package/alchemy/atom.mk.in > @@ -0,0 +1,7 @@ > +LOCAL_PATH := $(call my-dir) > +include $(CLEAR_VARS) > +LOCAL_MODULE := @MODULE@ > +LOCAL_SDK := @STAGING_DIR@ > +LOCAL_DESTDIR := usr/lib > +LOCAL_MODULE_FILENAME := @MODULE_FILENAME@ > +include $(BUILD_LIBRARY) > I take these modifications with a few changes. They will be part of the v3 series. Thanks, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Sun Jan 9 15:35:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 16:35:50 +0100 Subject: [Buildroot] [git commit] package/hiawatha: disable system mbedtls Message-ID: <20220109153345.8414082D9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e36e8f2081a66f477dd038793082045876d65ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master hiawatha needs mbedtls3 since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e: /home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory 39 | #include "mbedtls/psa_util.h" | ^~~~~~~~~~~~~~~~~~~~ As mbedtls 3.x is not backward compatible with mbedtls 2.x, disable system mbedtls to let hiawatha uses its own copy (which will be installed in $(TARGET_DIR)/usr/lib/hiawatha) Fixes: - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/hiawatha/Config.in | 1 - package/hiawatha/hiawatha.mk | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 8f1908f6f4..4b1a3ca86c 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -32,6 +32,5 @@ if BR2_PACKAGE_HIAWATHA config BR2_PACKAGE_HIAWATHA_SSL bool "hiawatha TLS support" - select BR2_PACKAGE_MBEDTLS endif diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 5618e6900d..017592de1e 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -20,8 +20,11 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON -HIAWATHA_DEPENDENCIES += mbedtls +# Disable system mbedtls as hiawatha needs mbedtls 3.x +HIAWATHA_CONF_OPTS += \ + -DENABLE_TLS=ON \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif From peter at korsgaard.com Sun Jan 9 15:40:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 16:40:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/hiawatha: disable system mbedtls In-Reply-To: <20220109133939.496946-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 14:39:39 +0100") References: <20220109133939.496946-1-fontaine.fabrice@gmail.com> Message-ID: <874k6cc3z6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > hiawatha needs mbedtls3 since bump to version 11.1 in commit > 24e4c888c3d36e3943206ea55894b84344cc8b2e: > /home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory > 39 | #include "mbedtls/psa_util.h" > | ^~~~~~~~~~~~~~~~~~~~ > As mbedtls 3.x is not backward compatible with mbedtls 2.x, disable > system mbedtls to let hiawatha uses its own copy (which will be > installed in $(TARGET_DIR)/usr/lib/hiawatha) > Fixes: > - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sun Jan 9 15:46:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 16:46:20 +0100 Subject: [Buildroot] [git commit] package/mesa3d: select vc4 driver for gallium v3d Message-ID: <20220109154018.8A02A82BA1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcf114234b00a07d45de63f7321fd47a66ed4c43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Although the Gallium V3D driver for RPi4 can be built independently, in practice the accelaration doesn't work unless the VC4 driver is also enabled. Select VC4 automatically when V3D is selected. Signed-off-by: Howard Mitchell Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7c3a1beff3..c01f12529a 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -262,7 +262,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_LIBDRM_VC4 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 # runtime select BR2_PACKAGE_MESA3D_OPENGL_EGL help Driver for Broadcom VC6 (rpi4) GPUs (needs vc4). From arnout at mind.be Sun Jan 9 15:46:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 16:46:20 +0100 Subject: [Buildroot] [git commit] package/mesa3d: always enable glx-direct if glx is enabled Message-ID: <20220109154018.94FCC82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a51177af14a2ddaa6431bb7fc618fe138b59b72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Many applications that use GLX want to combine it with DRI3 to bypass the X server and send GL commands directly to the graphics driver. This is only available in mesa3d if glx-direct=true. Up to now, we only enabled glx-direct when a DRI driver was enabled. Historically, this is either because only DRI drivers had DRI3, or because we didn't know better at the time. However, glx-direct is not related to DRI drivers at all. Setting it for a DRI driver when there is no GLX is effectively a NOP. Conversely, we also want to set it for Gallium drivers when GLX is enabled, otherwise GLX-direct applications don't work. Note that glx-direct is only functional if glx=dri. If glx=xlib or glx=gallium-xlib, GLX always goes through the X server so direct is not possible (as far as we understand). Set glx-direct=true unconditionally when GLX is selected. Remove it from DRI drivers. Reported-by: Howard Mitchell Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/mesa3d.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 28ff0669e0..cd3a33a38e 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -73,7 +73,10 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. -MESA3D_CONF_OPTS += -Dglx=dri +# Always enable glx-direct; without it, amy GLX applications don't work. +MESA3D_CONF_OPTS += \ + -Dglx=dri \ + -Dglx-direct=true ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) MESA3D_CONF_OPTS += -Dgallium-xa=enabled else @@ -136,7 +139,6 @@ MESA3D_CONF_OPTS += \ else MESA3D_CONF_OPTS += \ -Dshared-glapi=enabled \ - -Dglx-direct=true \ -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif From arnout at mind.be Sun Jan 9 15:47:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 16:47:42 +0100 Subject: [Buildroot] [PATCH 1/2] package/mesa3d: select vc4 and kmsro driver for gallium v3d In-Reply-To: <20200306092504.30340-1-hm@hmbedded.co.uk> References: <20200306092504.30340-1-hm@hmbedded.co.uk> Message-ID: <44832a2e-18c5-568d-9085-73efce59b1fc@mind.be> On 06/03/2020 10:25, Howard Mitchell wrote: > Currently, when building for rpi2/3 it is only necessary to to select > vc4 to get acceleration working. However, when building for rpi4 v3d, > vc4 and kmsro have to be selected. Therefore this commit forces the > selection of vc4 and kmsro when v3d is selected. > > Signed-off-by: Howard Mitchell (Finally) applied to master, thanks. I had to fix it up a little since the KMSRO option was removed. Regards, Arnout > --- > package/mesa3d/Config.in | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 13e516e452..3950170533 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -257,12 +257,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D > bool "Gallium v3d driver" > depends on BR2_arm || BR2_aarch64 > - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > - select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO > - select BR2_PACKAGE_LIBDRM_VC4 > - select BR2_PACKAGE_MESA3D_OPENGL_EGL > + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 > + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO > help > - Driver for Broadcom VC6 (rpi4) GPUs (needs kmsro and vc4). > + Driver for Broadcom VC6 (rpi4) GPUs. > > It requires a kernel 4.18+ with DRM V3D support enabled: > > From peter at korsgaard.com Sun Jan 9 15:48:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 16:48:54 +0100 Subject: [Buildroot] [git commit] package/gvfs: bump to version 1.48.1 Message-ID: <20220109154316.6A69582AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2e1a39a203c5476fb464d8ec164a9c6b0fc4aa0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (not needed since https://gitlab.gnome.org/GNOME/gvfs/-/commit/eee4bb846038e4440ffc8a591869974639c72bb0) https://gitlab.gnome.org/GNOME/gvfs/-/blob/1.48.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-meson.build-fix-linking-with-libmetadata.patch | 78 ---------------------- package/gvfs/gvfs.hash | 4 +- package/gvfs/gvfs.mk | 2 +- 3 files changed, 3 insertions(+), 81 deletions(-) diff --git a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch b/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch deleted file mode 100644 index 3ee4a28e94..0000000000 --- a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 731256d7517f0d9cf0b999bb22f864080d5e8690 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 18 Jul 2020 10:00:50 +0200 -Subject: [PATCH] meson.build: fix linking with libmetadata - -libmetadata is built as a static library and depends on libgvfscommon so -change the dependencies order to put libgvfscommon_dep after -libmetadata_dep or gvfsd-metadata will fail to link on: - -FAILED: metadata/gvfsd-metadata -/home/naourr/work/instance-3/output-1/host/bin/arm-none-linux-gnueabi-gcc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata at exe/meta-daemon.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgio-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgobject-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/common -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/metadata -metadata/libmetadata.a(metatree.c.o): In function `safe_open': -metatree.c:(.text+0x9c8): undefined reference to `gvfs_randomize_string' -collect2: error: ld returned 1 exit status - -Apply this change in the whole source code and not only for -gvfsd-metadata to avoid any other build failures. - -Fixes: - - http://autobuild.buildroot.org/results//fa892c41b6b9285839a0164b000e37fb04dcc194 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/92] ---- - client/meson.build | 2 +- - metadata/meson.build | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/client/meson.build b/client/meson.build -index 8f57d0d3..1d251481 100644 ---- a/client/meson.build -+++ b/client/meson.build -@@ -33,8 +33,8 @@ sources = uri_parser_sources + uri_utils + files( - - deps = [ - gio_unix_dep, -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ] - - cflags = [ -diff --git a/metadata/meson.build b/metadata/meson.build -index 4e120d18..5699e6f2 100644 ---- a/metadata/meson.build -+++ b/metadata/meson.build -@@ -72,8 +72,8 @@ libmetadata_dep = declare_dependency( - ) - - deps = [ -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ] - - if enable_gudev -@@ -105,8 +105,8 @@ if enable_devel_utils - app + '.c', - include_directories: top_inc, - dependencies: [ -- libgvfscommon_dep, - libmetadata_dep, -+ libgvfscommon_dep, - ], - c_args: cflags, - ) -@@ -119,6 +119,7 @@ if enable_devel_utils - include_directories: top_inc, - dependencies: [ - libmetadata_dep, -+ libgvfscommon_dep, - libxml_dep, - ], - c_args: cflags, --- -2.27.0 - diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 2ee945e710..f4a5364f1f 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.44/gvfs-1.44.1.sha256sum -sha256 50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46 gvfs-1.44.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.48/gvfs-1.48.1.sha256sum +sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz # Hash for license file sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index fc77e8e1aa..4174592455 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.44 +GVFS_VERSION_MAJOR = 1.48 GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) From peter at korsgaard.com Sun Jan 9 15:49:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 16:49:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/gvfs: bump to version 1.48.1 In-Reply-To: <20220109140301.663692-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 15:03:01 +0100") References: <20220109140301.663692-1-fontaine.fabrice@gmail.com> Message-ID: <87zgo4aoz7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (not needed since > https://gitlab.gnome.org/GNOME/gvfs/-/commit/eee4bb846038e4440ffc8a591869974639c72bb0) > https://gitlab.gnome.org/GNOME/gvfs/-/blob/1.48.1/NEWS > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Sun Jan 9 15:55:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 16:55:31 +0100 Subject: [Buildroot] [PATCH 2/2] package/mesa3d: get glxgears working for v3d/vc4 minimal builds In-Reply-To: <20200306092504.30340-2-hm@hmbedded.co.uk> References: <20200306092504.30340-1-hm@hmbedded.co.uk> <20200306092504.30340-2-hm@hmbedded.co.uk> Message-ID: On 06/03/2020 10:25, Howard Mitchell wrote: > Currently a minimal build for rpi2/3/4 (i.e. only v3d and/or vc4 > selected, no dri drivers selected) results in working X11 except that > glxgears shows a blank window. This commit effectively results in the > following conf options being added: -Dglx-direct=true -Ddri3=true > > Signed-off-by: Howard Mitchell Instead of this patch, I applied [1]. Based on Howard's observation, the key is in fact the -Dglx-direct=true. I did a bit of investigation and I concluded that we can always enable that if GLX is enabled. Bernd, Peter, could you shout if that doesn't work for you? Regards, Arnout [1] https://git.buildroot.org/buildroot/commit/?id=6a51177af14a2ddaa6431bb7fc618fe138b59b72 > --- > package/mesa3d/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 3950170533..59b8f60773 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -274,6 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 > select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO > select BR2_PACKAGE_LIBDRM_VC4 > select BR2_PACKAGE_MESA3D_OPENGL_EGL > + select BR2_PACKAGE_MESA3D_DRI_DRIVER > help > Driver for Broadcom VC4 (rpi2/3) GPUs. > It requires a vanilla 4.5+ kernel with drm vc4 (open) support. > From peter at korsgaard.com Sun Jan 9 16:26:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 17:26:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: force host-python3 In-Reply-To: <20211222140737.1179968-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 22 Dec 2021 15:07:37 +0100") References: <20211222140737.1179968-1-fontaine.fabrice@gmail.com> Message-ID: <87sftwan9z.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Build of nodejs fails if python 3.10 is installed on host. > As suggested by Arnout in > https://bugs.buildroot.org/show_bug.cgi?id=14451, use the same > workaround than in qt5webkit to force host-python3 (which is in version > 3.9) > It should be noted that python 3.10 support has been added in version > 14.18.2: https://github.com/nodejs/node/releases/tag/v14.18.2 > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14451 > Signed-off-by: Fabrice Fontaine 14.18.2 has in the mean time been applied, but the build should indeed use our host-python3 - So committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 16:24:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 17:24:08 +0100 Subject: [Buildroot] [git commit] package/nodejs: force host-python3 Message-ID: <20220109162027.CAF9882DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ad7eb6c61d281912a8c692f0b69d46726394b10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Build of nodejs fails if python 3.10 is installed on host. As suggested by Arnout in https://bugs.buildroot.org/show_bug.cgi?id=14451, use the same workaround than in qt5webkit to force host-python3 (which is in version 3.9) It should be noted that python 3.10 support has been added in version 14.18.2: https://github.com/nodejs/node/releases/tag/v14.18.2 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14451 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.mk | 54 ++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 44bf786dfd..7d5c93eb93 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -27,6 +27,30 @@ NODEJS_CONF_OPTS = \ --cross-compiling \ --dest-os=linux +HOST_NODEJS_MAKE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ + LDFLAGS.host="$(HOST_LDFLAGS)" \ + NO_LOAD=cctest.target.mk \ + PATH=$(@D)/bin:$(BR_PATH) + +NODEJS_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + NO_LOAD=cctest.target.mk \ + PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ + LD="$(TARGET_CXX)" + +# nodejs's build system uses python which can be a symlink to an unsupported +# python version (e.g. python 3.10 with nodejs 14.18.1). We work around this by +# forcing host-python3 early in the PATH, via a python->python3 symlink. +define NODEJS_PYTHON3_SYMLINK + mkdir -p $(@D)/bin + ln -sf $(HOST_DIR)/bin/python3 $(@D)/bin/python +endef +HOST_NODEJS_PRE_CONFIGURE_HOOKS += NODEJS_PYTHON3_SYMLINK +NODEJS_PRE_CONFIGURE_HOOKS += NODEJS_PYTHON3_SYMLINK + ifeq ($(BR2_PACKAGE_OPENSSL),y) NODEJS_DEPENDENCIES += openssl NODEJS_CONF_OPTS += --shared-openssl @@ -75,21 +99,13 @@ HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) \ - $(HOST_CONFIGURE_OPTS) \ - CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ - LDFLAGS.host="$(HOST_LDFLAGS)" \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) + $(HOST_NODEJS_MAKE_OPTS) endef define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) install \ - $(HOST_CONFIGURE_OPTS) \ - CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ - LDFLAGS.host="$(HOST_LDFLAGS)" \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) + $(HOST_NODEJS_MAKE_OPTS) $(foreach f,$(NODEJS_HOST_TOOLS), \ $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f) @@ -195,11 +211,7 @@ endef define NODEJS_BUILD_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) \ - LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + $(NODEJS_MAKE_OPTS) endef # @@ -236,22 +248,14 @@ define NODEJS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) install \ DESTDIR=$(STAGING_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) \ - LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + $(NODEJS_MAKE_OPTS) endef define NODEJS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) install \ DESTDIR=$(TARGET_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) \ - LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + $(NODEJS_MAKE_OPTS) $(NODEJS_INSTALL_MODULES) endef From bugzilla at busybox.net Sun Jan 9 16:28:13 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 09 Jan 2022 16:28:13 +0000 Subject: [Buildroot] [Bug 14451] nodejs won't build on Fedora 35 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14451 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Peter Korsgaard --- Fixed by https://git.buildroot.org/buildroot/commit/?id=5ad7eb6c61d281912a8c692f0b69d46726394b10, thanks -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Sun Jan 9 16:31:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:31:55 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: add --disable option Message-ID: <20220109162602.991D282DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b102352b62917b053cae1f5d0591fe6507d81522 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When debugging pkg-stats, it's quite useful to be able to disable some features that are quite long (checking upstream URL, checking latest version, checking CVE). This commit adds a --disable option, which can take a comma-separated list of features to disable, such as: ./support/scripts/pkg-stats --disable url,upstream Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 00ca5647ee..7e20ccc0da 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1099,6 +1099,10 @@ def resolvepath(path): return os.path.abspath(os.path.expanduser(path)) +def list_str(values): + return values.split(',') + + def parse_args(): parser = argparse.ArgumentParser() output = parser.add_argument_group('output', 'Output file(s)') @@ -1115,6 +1119,9 @@ def parse_args(): help='List of packages (comma separated)') parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) + parser.add_argument('--disable', type=list_str, + help='Features to disable, comma-separated (cve, upstream, url)', + default=[]) args = parser.parse_args() if not args.html and not args.json: parser.error('at least one of --html or --json (or both) is required') @@ -1161,13 +1168,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - print("Checking URL status") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_urls(packages)) - print("Getting latest versions ...") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_latest_version(packages)) - if args.nvd_path: + if not "url" in args.disable: + print("Checking URL status") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_urls(packages)) + if not "upstream" in args.disable: + print("Getting latest versions ...") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_latest_version(packages)) + if not "cve" in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From thomas.petazzoni at bootlin.com Sun Jan 9 16:31:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:31:55 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: account for unsure CVEs Message-ID: <20220109162602.909E582A93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a206bbc5fe3453f8763268261c4a7aa6ba2c275d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The .affects() method of the CVE class in support/scripts/cve.py can return 3 values: CVE_AFFECTS, CVE_DOESNT_AFFECT and CVE_UNKNOWN. We of course properly account for CVEs where .affects() return CVE_AFFECTS, but the ones for which CVE_UNKNOWN is returned are currently ignored, and therefore treated as if they did not affect the package. However CVE_UNKNOWN in fact indicates that the v_start/v_end fields of the CPE entry could not be parsed by distutils.version.LooseVersion(). Instead of ignoring such cases, this commit adds support for the concept of "unsure CVEs", which will be listed next to CVEs known to affect the package, so that we are aware of them and can investigate the version issue. Signed-off-by: Gregory CLEMENT Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index a435abff3d..00ca5647ee 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -101,6 +101,7 @@ class Package: self.cpeid = None self.cves = list() self.ignored_cves = list() + self.unsure_cves = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -580,8 +581,11 @@ def check_package_cve_affects(cve, cpe_product_pkgs): if product not in cpe_product_pkgs: continue for pkg in cpe_product_pkgs[product]: - if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS: + cve_status = cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) + if cve_status == cve.CVE_AFFECTS: pkg.cves.append(cve.identifier) + elif cve_status == cve.CVE_UNKNOWN: + pkg.unsure_cves.append(cve.identifier) def check_package_cves(nvd_path, packages): @@ -607,7 +611,7 @@ def check_package_cves(nvd_path, packages): for pkg in packages: if 'cve' not in pkg.status: - if pkg.cves: + if pkg.cves or pkg.unsure_cves: pkg.status['cve'] = ("error", "affected by CVEs") else: pkg.status['cve'] = ("ok", "not affected by CVEs") @@ -662,8 +666,11 @@ def calculate_stats(packages): stats["version-not-uptodate"] += 1 stats["patches"] += pkg.patch_count stats["total-cves"] += len(pkg.cves) + stats["total-unsure-cves"] += len(pkg.unsure_cves) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 + if len(pkg.unsure_cves) != 0: + stats["pkg-unsure-cves"] += 1 if pkg.cpeid: stats["cpe-id"] += 1 else: @@ -921,6 +928,8 @@ def dump_html_pkg(f, pkg): if pkg.is_status_error("cve"): for cve in pkg.cves: f.write(" %s
    \n" % (cve, cve)) + for cve in pkg.unsure_cves: + f.write("     %s (unsure)
    \n" % (cve, cve)) elif pkg.is_status_na("cve"): f.write(" %s" % pkg.status['cve'][1]) else: @@ -1024,6 +1033,10 @@ def dump_html_stats(f, stats): stats["pkg-cves"]) f.write("Total number of CVEs affecting all packages%s\n" % stats["total-cves"]) + f.write("Packages affected by unsure CVEs%s\n" % + stats["pkg-unsure-cves"]) + f.write("Total number of unsure CVEs affecting all packages%s\n" % + stats["total-unsure-cves"]) f.write("Packages with CPE ID%s\n" % stats["cpe-id"]) f.write("Packages without CPE ID%s\n" % From thomas.petazzoni at bootlin.com Sun Jan 9 16:33:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:33:22 +0100 Subject: [Buildroot] [PATCH v5 1/3] support/script/pkg-stats: Manage the CVEs that need to be check In-Reply-To: <20200921101515.132359-2-gregory.clement@bootlin.com> References: <20200921101515.132359-1-gregory.clement@bootlin.com> <20200921101515.132359-2-gregory.clement@bootlin.com> Message-ID: <20220109173322.7be771ad@windsurf> On Mon, 21 Sep 2020 12:15:13 +0200 Gregory CLEMENT wrote: > When looking for if a package is affected, the version comparison can > fail. This means that we don't know if the version of the package used > is affected or not and we need to check manually the version. > > This patch exposes this new information in json and html format. > > Signed-off-by: Gregory CLEMENT > --- > support/scripts/pkg-stats | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) I finally applied this patch, but after renaming the concept from "CVEs to check" to "unsure CVEs", and listing them in the same column as normal CVEs in the HTML rendering, but with a "(unsure)" notice next to them. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 16:33:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:33:49 +0100 Subject: [Buildroot] [PATCH v5 2/3] support/script/cve-checker: Manage the CVEs that need to be check In-Reply-To: <20200921101515.132359-3-gregory.clement@bootlin.com> References: <20200921101515.132359-1-gregory.clement@bootlin.com> <20200921101515.132359-3-gregory.clement@bootlin.com> Message-ID: <20220109173349.62a8d794@windsurf> On Mon, 21 Sep 2020 12:15:14 +0200 Gregory CLEMENT wrote: > When looking for if a package is affected, the version comparison can > fail. This means that we don't know if the version of the package used > is affected or not and we need to check manually the version. > > This patch exposes this new information in json and html format. > > Signed-off-by: Gregory CLEMENT > --- > support/scripts/cve-checker | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) The cve-checker script was removed and merged back into pkg-stats, for which this feature was added by PATCH 1/3 in this series, so I've marked this patch as Rejected. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 9 16:34:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 9 Jan 2022 17:34:27 +0100 Subject: [Buildroot] [PATCH v5 3/3] package/pkg-utils/cve.py: Manage case when package version doesn't exist In-Reply-To: <20200921101515.132359-4-gregory.clement@bootlin.com> References: <20200921101515.132359-1-gregory.clement@bootlin.com> <20200921101515.132359-4-gregory.clement@bootlin.com> Message-ID: <20220109173427.07372dae@windsurf> On Mon, 21 Sep 2020 12:15:15 +0200 Gregory CLEMENT wrote: > Until now, when a package didn't report a version, then the CVE > comparison was just skipped. It leads most of the time to declare the > package not affected by the CVE. > > Instead of it, report the CVE_UNKNOWN status in order to be aware that > the CVE related to this package has to be checked. > > Signed-off-by: Gregory CLEMENT Do you remember which packages/cases this was handling? > if not pkg_version: > + unknown_pkg_version = True I've added a print() here, and did a full run of pkg-stats on all packages, and did not get any match. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Sun Jan 9 16:47:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 17:47:05 +0100 Subject: [Buildroot] [git commit] package/libglvnd: new package Message-ID: <20220109164105.40F1D82DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0378e2e5d9ce9d5676975dfbff501360094fdc1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libglvnd is the GL Vendor-Neutral Dispatch library, used to dispatch GL calls across multiple GL implementations at runtime. Full GL support, as usual, requires (parts of) the X11 stack: libX11, libXext, and xorgproto (for glproto). However, with just libX11, it is possible to do EGL on X11. EGL and GLES have no dependencies. Note: x11 and glx are 'features', so need to be 'enabled' or 'disabled' (or 'auto', but we don't care in Buildroot), while egl and gles1/2 are 'booleans', so need to be 'true' or 'false'. When an actual provider for GL, EGL, or GLES is enabled, so must the corresponding flavour be enabled in libglvnd. Conversely, when there is no actual provider, the corresponding support must be disabled in libglvnd. So we make each flavour selectable with hidden options, which actual providers will have to select. The license for libglvnd itself is a custom license by NVidia. It is pretty close to MIT, but it's different (although Debian does classify it as MIT); SPDX has no identifier for that license either. As such, we choose to just identify it as 'libglvnd license', and let users deal that with their legal department. Additionally, libglvnd bundles some code from other projects, so we list them explicitly as well. Signed-off-by: Jakub Skrzypnik [yann.morin.1998 at free.fr: - provide help text - don't force X11 libraries, split them between X11 and full GL - make each flavour selectable - fix make check-package issues - fix and complete licensing information - bump to 1.3.2 - expand commit log ] Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/libglvnd/Config.in | 44 +++++++++++++++++++++++++++++++++++ package/libglvnd/libglvnd.hash | 7 ++++++ package/libglvnd/libglvnd.mk | 53 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..2ad76a80e4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1265,6 +1265,9 @@ F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig +N: Jakub Skrzypnik +F: package/libglvnd/ + N: James Hilliard F: package/apcupsd/ F: package/exfatprogs/ diff --git a/package/Config.in b/package/Config.in index 85193f7802..edae7e4f62 100644 --- a/package/Config.in +++ b/package/Config.in @@ -331,6 +331,7 @@ comment "Graphic libraries" source "package/freerdp/Config.in" source "package/graphicsmagick/Config.in" source "package/imagemagick/Config.in" + source "package/libglvnd/Config.in" source "package/linux-fusion/Config.in" source "package/lite/Config.in" source "package/mesa3d/Config.in" diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in new file mode 100644 index 0000000000..acf6247e94 --- /dev/null +++ b/package/libglvnd/Config.in @@ -0,0 +1,44 @@ +config BR2_PACKAGE_LIBGLVND + bool "libglvnd" + help + The GL Vendor-Neutral Dispatch library + + libglvnd is a vendor-neutral dispatch layer for arbitrating + OpenGL API calls between multiple vendors. It allows multiple + drivers from different vendors to coexist on the same + filesystem, and determines which vendor to dispatch each API + call to at runtime. + + Both GLX and EGL are supported, in any combination with OpenGL + and OpenGL ES. + +if BR2_PACKAGE_LIBGLVND + +# The following symbols should be selected by the libglvnd-aware +# GL/EGL/GLES providers. +config BR2_PACKAGE_LIBGLVND_DISPATCH_GL + bool + depends on BR2_PACKAGE_XORG7 # libx11, libXext, xorgproto + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_XORGPROTO + select BR2_PACKAGE_HAS_LIBGL + +config BR2_PACKAGE_LIBGLVND_DISPATCH_EGL + bool + select BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_LIBGLVND_DISPATCH_GLES + bool + select BR2_PACKAGE_HAS_LIBGLES + +config BR2_PACKAGE_PROVIDES_LIBGL + default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_GL + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_EGL + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_GLES + +endif diff --git a/package/libglvnd/libglvnd.hash b/package/libglvnd/libglvnd.hash new file mode 100644 index 0000000000..15e76ea9e8 --- /dev/null +++ b/package/libglvnd/libglvnd.hash @@ -0,0 +1,7 @@ +# Locally computed +sha256 6332c27f4c792b09a3eb1d7ae18c2d6ff6a0acaf3a746489caf859e659fca2f7 libglvnd-v1.3.2.tar.gz + +# Locally computed hashes for license files +sha256 224534547628a9e5e889d8808385bd38839e6bdb77d89c90ac04dad6891a4f5f README.md +sha256 bebdc0fd27cd37af8406e47af23c113866b7856c3f7349ffcbc672029ec8acf7 src/util/uthash/LICENSE +sha256 f6f207863675ca5a5128fd120b9aef4f4bbab73ffa57e5f771ccffc8e3cc56b7 src/util/cJSON/LICENSE diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk new file mode 100644 index 0000000000..3df609f6eb --- /dev/null +++ b/package/libglvnd/libglvnd.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# libglvnd +# +################################################################################ + +LIBGLVND_VERSION = 1.3.2 +LIBGLVND_SOURCE = libglvnd-v$(LIBGLVND_VERSION).tar.gz +LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$(LIBGLVND_VERSION) + +LIBGLVND_LICENSE = \ + libglvnd license, \ + Apache-2.0 (Khronos headers), \ + MIT (Xorg; mesa; cJSON), \ + BSD-1=Clause (uthash) + +LIBGLVND_LICENSE_FILES = \ + README.md \ + src/util/uthash/LICENSE \ + src/util/cJSON/LICENSE + +LIBGLVND_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +LIBGLVND_DEPENDENCIES += xlib_libX11 +LIBGLVND_CONF_OPTS += -Dx11=enabled +else +LIBGLVND_CONF_OPTS += -Dx11=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GL),y) +LIBGLVND_DEPENDENCIES += xlib_libXext xorgproto +LIBGLVND_CONF_OPTS += -Dglx=enabled +LIBGLVND_PROVIDES += libgl +else +LIBGLVND_CONF_OPTS += -Dglx=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y) +LIBGLVND_CONF_OPTS = -Degl=true +LIBGLVND_PROVIDES += libegl +else +LIBGLVND_CONF_OPTS = -Degl=false +endif + +ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y) +LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true +LIBGLVND_PROVIDES += libgles +else +LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false +endif + +$(eval $(meson-package)) From arnout at mind.be Sun Jan 9 16:47:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 17:47:05 +0100 Subject: [Buildroot] [git commit] package/mesa3d: make it aware of libglvnd and support it when present Message-ID: <20220109164105.49CF382DF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f8fd984d89e25a2e1a2cc6d25c915ecd39c444b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When libglvnd is enabled, mesa3d must be told so, so as it installs its libraries with the vendor suffix (e.g. libEGL_mesa.so instead of libEGL.so). Additionally, the provider (in Buildroot parlance) is libglvnd, not mesa3d. Signed-off-by: Jakub Skrzypnik [yann.morin.1998 at free.fr: - don't override the _PROVIDES variable, only assign when needed ] Signed-off-by: Yann E. MORIN Tested-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 15 +++++++++------ package/mesa3d/mesa3d.mk | 15 +++++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index c01f12529a..34b0352056 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -423,7 +423,8 @@ comment "gbm support needs a dri driver or a gallium driver w/ EGL support." config BR2_PACKAGE_MESA3D_OPENGL_GLX bool "OpenGL GLX" depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_HAS_LIBGL if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_GL if BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_MESA3D_NEEDS_X11 help Enable GLX graphic acceleration (OpenGL + X11). @@ -433,7 +434,8 @@ comment "OpenGL GLX support needs X11" config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" - select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_HAS_LIBEGL_WAYLAND select BR2_PACKAGE_MESA3D_GBM help @@ -442,7 +444,8 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL config BR2_PACKAGE_MESA3D_OPENGL_ES bool "OpenGL ES" - select BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_HAS_LIBGLES if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_GLES if BR2_PACKAGE_LIBGLVND help Use the Khronos OpenGL ES APIs. This is commonly used on embedded systems and represents a subset of the OpenGL API. @@ -453,13 +456,13 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "mesa3d" if BR2_PACKAGE_MESA3D_GBM config BR2_PACKAGE_PROVIDES_LIBGL - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX && !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBEGL - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBGLES - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES && !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBOPENCL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index cd3a33a38e..e34ed4264f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -167,9 +167,9 @@ MESA3D_CONF_OPTS += -Dopengl=true # we do not need libva support in mesa3d, therefore disable this option MESA3D_CONF_OPTS += -Dgallium-va=disabled -# libGL is only provided for a full xorg stack +# libGL is only provided for a full xorg stack, without libglvnd ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) -MESA3D_PROVIDES += libgl +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgl) else define MESA3D_REMOVE_OPENGL_HEADERS rm -rf $(STAGING_DIR)/usr/include/GL/ @@ -207,7 +207,7 @@ MESA3D_CONF_OPTS += \ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -MESA3D_PROVIDES += libegl +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libegl) MESA3D_CONF_OPTS += \ -Degl=enabled else @@ -216,7 +216,7 @@ MESA3D_CONF_OPTS += \ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) -MESA3D_PROVIDES += libgles +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgles) MESA3D_CONF_OPTS += -Dgles1=enabled -Dgles2=enabled else MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled @@ -271,4 +271,11 @@ ifeq ($(BR2_m68k),y) MESA3D_CFLAGS += -mlong-jump-table-offsets endif +ifeq ($(BR2_PACKAGE_LIBGLVND),y) +MESA3D_DEPENDENCIES += libglvnd +MESA3D_CONF_OPTS += -Dglvnd=true +else +MESA3D_CONF_OPTS += -Dglvnd=false +endif + $(eval $(meson-package)) From ju.o at free.fr Sun Jan 9 16:47:55 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 9 Jan 2022 17:47:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/riscv-isa-sim: new package Message-ID: <20220109164756.1312023-1-ju.o@free.fr> Spike, the RISC-V ISA Simulator, implements a functional model of one or more RISC-V harts. The host package provides an alternative solution to qemu. https://github.com/riscv-software-src/riscv-isa-sim Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/Config.in.host | 1 + ...01-riscv-disable-precompiled-headers.patch | 34 +++++++++++++++++++ package/riscv-isa-sim/Config.in | 18 ++++++++++ package/riscv-isa-sim/Config.in.host | 13 +++++++ package/riscv-isa-sim/riscv-isa-sim.hash | 3 ++ package/riscv-isa-sim/riscv-isa-sim.mk | 13 +++++++ 8 files changed, 84 insertions(+) create mode 100644 package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch create mode 100644 package/riscv-isa-sim/Config.in create mode 100644 package/riscv-isa-sim/Config.in.host create mode 100644 package/riscv-isa-sim/riscv-isa-sim.hash create mode 100644 package/riscv-isa-sim/riscv-isa-sim.mk diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..59a8dba2ab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1588,6 +1588,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ F: package/python-pyalsa/ +F: package/riscv-isa-sim/ N: Julien Viard de Galbert F: package/dieharder/ diff --git a/package/Config.in b/package/Config.in index 85193f7802..b20cf45698 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2126,6 +2126,7 @@ menu "Miscellaneous" source "package/proj/Config.in" source "package/qemu/Config.in" source "package/qpdf/Config.in" + source "package/riscv-isa-sim/Config.in" source "package/rtl_433/Config.in" source "package/shared-mime-info/Config.in" source "package/sunwait/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..22aafb858a 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -77,6 +77,7 @@ menu "Host utilities" source "package/qoriq-rcw/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" + source "package/riscv-isa-sim/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch new file mode 100644 index 0000000000..461f34e3a1 --- /dev/null +++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch @@ -0,0 +1,34 @@ +From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sun, 9 Jan 2022 13:38:48 +0100 +Subject: [PATCH] riscv: disable precompiled headers + +While precompiling header, some toolchains fail with the message: + + /path/to/toolchain/bin/ld: /path/to/sysroot/usr/lib/Scrt1.o: in function `_start': + (.text+0x54): undefined reference to `main' + +The patch totally disable precompiled headers. + +Signed-off-by: Julien Olivain +--- + riscv/riscv.mk.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in +index 2347ce6..4f56eaf 100644 +--- a/riscv/riscv.mk.in ++++ b/riscv/riscv.mk.in +@@ -35,9 +35,6 @@ riscv_hdrs = \ + + riscv_install_hdrs = mmio_plugin.h + +-riscv_precompiled_hdrs = \ +- insn_template.h \ +- + riscv_srcs = \ + processor.cc \ + execute.cc \ +-- +2.34.1 + diff --git a/package/riscv-isa-sim/Config.in b/package/riscv-isa-sim/Config.in new file mode 100644 index 0000000000..1f5c8aad18 --- /dev/null +++ b/package/riscv-isa-sim/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_RISCV_ISA_SIM + bool "riscv-isa-sim" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + help + Spike, the RISC-V ISA Simulator, implements a functional + model of one or more RISC-V harts. + + https://github.com/riscv-software-src/riscv-isa-sim + +comment "riscv-isa-sim needs a toolchain w/ C++11, threads, wchar and dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || \ + BR2_STATIC diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host new file mode 100644 index 0000000000..01a189a075 --- /dev/null +++ b/package/riscv-isa-sim/Config.in.host @@ -0,0 +1,13 @@ +config BR2_PACKAGE_HOST_RISCV_ISA_SIM + bool "host riscv-isa-sim" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + help + Spike, the RISC-V ISA Simulator, implements a functional + model of one or more RISC-V harts. + + The host package provides an alternative solution to qemu. + + https://github.com/riscv-software-src/riscv-isa-sim + +comment "host riscv-isa-sim needs a toolchain w/ C++11" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/riscv-isa-sim/riscv-isa-sim.hash b/package/riscv-isa-sim/riscv-isa-sim.hash new file mode 100644 index 0000000000..d787a03e4c --- /dev/null +++ b/package/riscv-isa-sim/riscv-isa-sim.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9b29c220fed1e867e3bea4b5c565f2629237d525a4d9fe1668699c4406003a1f riscv-isa-sim-1.1.0.tar.gz +sha256 c65e436d18972c9c4bd192494fe4870bd2e158179474975b80a3559f27631632 LICENSE diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk new file mode 100644 index 0000000000..df5d4db9a2 --- /dev/null +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# riscv-isa-sim +# +################################################################################ + +RISCV_ISA_SIM_VERSION = 1.1.0 +RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) +RISCV_ISA_SIM_LICENSE = BSD-3-Clause +RISCV_ISA_SIM_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.34.1 From ju.o at free.fr Sun Jan 9 16:47:56 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 9 Jan 2022 17:47:56 +0100 Subject: [Buildroot] [PATCH 2/2] configs/spike_riscv64: new defconfig In-Reply-To: <20220109164756.1312023-1-ju.o@free.fr> References: <20220109164756.1312023-1-ju.o@free.fr> Message-ID: <20220109164756.1312023-2-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 ++ board/spike/riscv64/readme.txt | 39 +++++++++++++++++++++++++++++++++ board/spike/riscv64/start.sh | 13 +++++++++++ configs/spike_riscv64_defconfig | 12 ++++++++++ 4 files changed, 66 insertions(+) create mode 100644 board/spike/riscv64/readme.txt create mode 100755 board/spike/riscv64/start.sh create mode 100644 configs/spike_riscv64_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 59a8dba2ab..bf495be538 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1578,10 +1578,12 @@ F: package/paho-mqtt-c N: Julien Olivain F: board/qmtech/zynq/ +F: board/spike/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig +F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ diff --git a/board/spike/riscv64/readme.txt b/board/spike/riscv64/readme.txt new file mode 100644 index 0000000000..5ad7df46df --- /dev/null +++ b/board/spike/riscv64/readme.txt @@ -0,0 +1,39 @@ +Linux on Spike RISC-V ISA simulator +=================================== + +This configuration provides a minimal working setup to run a Linux +kernel in the Spike RISC-V ISA simulator. + +The Spike ISA simulator can be an interresting alternative to Qemu, in +some specific cases. For example: simulating new instructions (see [1]), +simulating riscv-openocd/gdb debug sessions (see [2], [3]), or +generating an accurate per-instruction log of execution (see +riscv-isa-sim spike -l option)... + +To run Buildroot Linux in Spike, use the commands: + + make spike_riscv64_defconfig + make + ./board/spike/riscv64/start.sh + +The boot is made with the standard RISC-V OpenSBI boot loader. In +order to keep the simulation simple, the rootfs is passed as an initrd +ramfs. + +Note: at the time of this writing, Spike v1.1.0 and OpenSBI v1.0 does +not support console input emulation for 32bit RISC-V systems. A 32bit +Linux system can boot and reach the login, but it's not possible to +login. See [4]. + + +[1]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new-instruction + +[2]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#debugging-with-gdb + +[3]. +https://github.com/riscv/riscv-openocd + +[4]. +https://github.com/riscv-software-src/opensbi/blob/v1.0/lib/utils/sys/htif.c#L127 diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh new file mode 100755 index 0000000000..75b1412df8 --- /dev/null +++ b/board/spike/riscv64/start.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +SCRIPT_DIR="$(dirname "$0")" +BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" + +# Use Buildroot host spike by default, but allow the caller to +# redefine another spike binary +: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" + +exec "${SPIKE}" \ + --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ + "${@}" \ + "${BR_BASEDIR}"/output/images/fw_payload.elf diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig new file mode 100644 index 0000000000..4cce20b360 --- /dev/null +++ b/configs/spike_riscv64_defconfig @@ -0,0 +1,12 @@ +BR2_riscv=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_TARGET_ROOTFS_CPIO=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y +BR2_PACKAGE_HOST_RISCV_ISA_SIM=y -- 2.34.1 From arnout at mind.be Sun Jan 9 16:50:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 17:50:46 +0100 Subject: [Buildroot] [PATCH 0/2 v4] package/libglvnd: introduce the GL vendor-neutral proxy (branch yem/libglvnd) In-Reply-To: References: Message-ID: <3ed33c49-e94e-9573-450d-9bddd1fb9610@mind.be> On 27/07/2020 10:46, Yann E. MORIN wrote: > Hello All! > > This is a respin from the original series by Jakub, heavily massaged > by me (Yann); thanks Jakub for your initial work! :-) What follows is > Jakub's original cover letter (tweaked to drop the reference to other > patches not include in this respin): > > Here comes support for GLVND which is a GL Vendor-Neutral disaptches, > initially proposed by NVidia, currently done within the Freedestop/ > RedHat project team as libglvnd. > > It's useful not only for NVidia (they were first to adopt it though) > but might be also beneficial for others, for example allowing you to > deliver an image running on multiple machines with different GPUs and > their respective OpenGL providers, which happens quite often on x86_64 > and was the major reason to implement it in Buildroot for me. > > On the other hand, if your board has multiple GPUs it also helps a lot > - for example when you have a "display" unit and "compute/accel" > graphics units from different vendors. Happens on some ARM boards > recently and there are already efforts to integrate it in these GL > stacks. > > The only EXT needed by GL provider is to implement GL_EXT_libglvnd > which is a dummy extension allowing GL lib to "register" to let it > receive GL calls. > > In practive it's very simple, the libglvnd delivers its own set of > "dummy" libraries: > > - libGL.so > - libGLX.so > - libOpenGL.so > - libEGL.so > > and needs the actual providers to be present as they already are but > with names like libGLX_nvidia.so. > > It allows developers to link against vendor-neutral dummy libs and > openGL contexts without thinking about target GPU too much as long as > it supports desired GL/EGL standard. > > Also delivers GL API headers (GL/gl.h, GL/egl.h, etc.) so removes need > of mesa3d-headers in GLVND-supported drivers. > > Currently it's supported by all Mesa-compatible drivers and NVidia. For > simplicity sake, and to ease introduction of libglvnd, only mesa3d is > converted to be compatible with libglvnd. Other providers, like NVidia, > can be converted (or added!) in follow-up patches. > > Changes v3 -> v4: > - bump to libglvnd 1.3.2 > > > Regards, > Yann E. MORIN. > > > The following changes since commit 1640b0c1f967e394f87eb7a0ca04ae40aade11b4 > > package/mbpfan: new package (2020-07-27 10:13:06 +0200) > > > are available in the git repository at: > > https://git.busybox.net/~ymorin/git/buildroot > > for you to fetch changes up to c48baa11cd0c06ec5af3fd4989306c3ec581d0e9 > > package/mesa3d: make it aware of libglvnd and support it when present (2020-07-27 10:45:34 +0200) > > > ---------------------------------------------------------------- > Jakub Skrzypnik (2): > package/libglvnd: new package > package/mesa3d: make it aware of libglvnd and support it when present Series (finally) applied to master, thanks. Jakub, I also added you to DEVELOPERS for the package. Regards, Arnout > > package/Config.in | 1 + > package/libglvnd/Config.in | 42 +++++++++++++++++++++++++++++++++ > package/libglvnd/libglvnd.hash | 7 ++++++ > package/libglvnd/libglvnd.mk | 53 ++++++++++++++++++++++++++++++++++++++++++ > package/mesa3d/Config.in | 15 +++++++----- > package/mesa3d/mesa3d.mk | 15 ++++++++---- > 6 files changed, 123 insertions(+), 10 deletions(-) > create mode 100644 package/libglvnd/Config.in > create mode 100644 package/libglvnd/libglvnd.hash > create mode 100644 package/libglvnd/libglvnd.mk > From ju.o at free.fr Sun Jan 9 17:02:00 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 9 Jan 2022 18:02:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: new package Message-ID: <20220109170200.1315505-1-ju.o@free.fr> python-distro provides information about the OS distribution it runs on, such as a reliable machine-readable ID, or version information. It is the recommended replacement for Python's original platform.linux_distribution function (removed in Python 3.8). It also provides much more functionality which isn't necessarily Python bound, like a command-line interface. https://github.com/nir0s/distro Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-distro/Config.in | 13 +++++++++++++ package/python-distro/python-distro.hash | 3 +++ package/python-distro/python-distro.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/python-distro/Config.in create mode 100644 package/python-distro/python-distro.hash create mode 100644 package/python-distro/python-distro.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2ad76a80e4..a44f07be97 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1590,6 +1590,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ +F: package/python-distro/ F: package/python-pyalsa/ N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index edae7e4f62..47087f52cb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -999,6 +999,7 @@ menu "External python modules" source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" + source "package/python-distro/Config.in" source "package/python-django/Config.in" source "package/python-django-enumfields/Config.in" source "package/python-dnspython/Config.in" diff --git a/package/python-distro/Config.in b/package/python-distro/Config.in new file mode 100644 index 0000000000..bb4151541e --- /dev/null +++ b/package/python-distro/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_DISTRO + bool "python distro" + help + distro provides information about the OS distribution it + runs on, such as a reliable machine-readable ID, or version + information. + + It is the recommended replacement for Python's original + platform.linux_distribution function (removed in Python + 3.8). It also provides much more functionality which isn't + necessarily Python bound, like a command-line interface. + + https://github.com/nir0s/distro diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash new file mode 100644 index 0000000000..e2b3c0a444 --- /dev/null +++ b/package/python-distro/python-distro.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk new file mode 100644 index 0000000000..753e74d020 --- /dev/null +++ b/package/python-distro/python-distro.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-distro +# +################################################################################ + +PYTHON_DISTRO_VERSION = 1.6.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz +PYTHON_DISTRO_LICENSE = Apache-2.0 +PYTHON_DISTRO_LICENSE_FILES = LICENSE +PYTHON_DISTRO_SETUP_TYPE = setuptools + +$(eval $(python-package)) -- 2.34.1 From arnout at mind.be Sun Jan 9 17:15:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 18:15:11 +0100 Subject: [Buildroot] [PATCH] package/mesa3d: Gallium VC4 driver depends on NEON Message-ID: <20220109171511.3293111-1-arnout@mind.be> Since version 21.3.0 of mesa3d, the generic broadcom infrastructure (which is called v3d but is used also for VC4) started using NEON instructions. This leads to assembler failures when VC4 is built for 32-bit ARM without NEON: FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c /tmp/ccAvufNv.s: Assembler messages: /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode [...] /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has NEON, so no condition is needed there. Fixes: http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 34b0352056..37c4f8078e 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" - depends on BR2_arm || BR2_aarch64 + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER -- 2.31.1 From fontaine.fabrice at gmail.com Sun Jan 9 17:16:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 18:16:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/vte: bump to version 0.66.2 Message-ID: <20220109171609.2527192-1-fontaine.fabrice@gmail.com> - Switch to meson-package and so replace host-intltool dependency by TARGET_NLS_DEPENDENCIES: https://gitlab.gnome.org/GNOME/vte/-/issues/87 - Retrieve upstream hash - Switch license file to LGPL-3.0+: https://gitlab.gnome.org/GNOME/vte/-/commit/5e14529d4219f3792690566ef7ec70febd87e070 - Drop libxml2 dependency (not needed with meson) - Add uclibc or glibc dependency, upstream doesn't want to support musl: https://gitlab.gnome.org/GNOME/vte/-/issues/72 https://gitlab.gnome.org/GNOME/vte/-/issues/247 - Add optional icu dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/9e4fbae2cabcd937ac4d1a984ba844d24b44b83f - Add optional libfribidi dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/7d3704f1c54e58443624355835f675ec22c6b9d3 - Add optional systemd dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/81bd158c24ef1d716d3cbf801e72fda2e11b81b4 - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...-with-kernel-headers-from-linux-4-13.patch | 54 +++++++++++++++++++ ...or-fstack-protector-compiler-support.patch | 43 +++++++++++++++ package/vte/Config.in | 7 +-- package/vte/vte.hash | 8 +-- package/vte/vte.mk | 45 +++++++++++----- 5 files changed, 139 insertions(+), 18 deletions(-) create mode 100644 package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch create mode 100644 package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch diff --git a/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch new file mode 100644 index 0000000000..7c3a5ab05e --- /dev/null +++ b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch @@ -0,0 +1,54 @@ +From 91123bb5201156e3d3adbe24305488f5eea2c8d7 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Mon, 27 Sep 2021 22:46:47 +0200 +Subject: [PATCH] build: Fix build with kernel headers from linux < 4.13 + +We already support running with a kernel that doesn't support this +ioctl, so let's also support building with one. Add the missing +ioctl definition to missing.hh. + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2514 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/vte/-/commit/91123bb5201156e3d3adbe24305488f5eea2c8d7] +Signed-off-by: Fabrice Fontaine +--- + src/missing.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/missing.hh b/src/missing.hh +index e5a58727..7902e41e 100644 +--- a/src/missing.hh ++++ b/src/missing.hh +@@ -23,11 +23,14 @@ + #include + + #ifdef __linux__ ++ ++#include + #include + + #if defined(__mips__) || defined(__mips64__) + #include + #endif ++ + #endif + + /* NSIG isn't in POSIX, so if it doesn't exist use this here. See bug #759196 */ +@@ -128,4 +131,13 @@ char* strchrnul(char const* s, + #define CLOSE_RANGE_CLOEXEC (1u << 2) + #endif + ++#if !defined(TIOCGPTPEER) ++/* See linux commit 54ebbfb1603415d9953c150535850d30609ef077 */ ++#if defined(__sparc__) ++#define TIOCGPTPEER _IOR('t', 137, int) ++#else ++#define TIOCGPTPEER _IOR('T', 0x41, int) ++#endif ++#endif /* !TIOCGPTPEER */ ++ + #endif /* __linux__ */ +-- +GitLab + diff --git a/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch new file mode 100644 index 0000000000..67b6c47482 --- /dev/null +++ b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch @@ -0,0 +1,43 @@ +From e32dba1d5cf884959af5b2c0691db00c263ea048 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Mon, 27 Dec 2021 19:24:46 +0100 +Subject: [PATCH] build: Fix check for -fstack-protector* compiler support + +Need to use has_link_argument() on some platforms. + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2535 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/vte/-/commit/e32dba1d5cf884959af5b2c0691db00c263ea048] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 93b7f376..381d5d58 100644 +--- a/meson.build ++++ b/meson.build +@@ -461,8 +461,6 @@ compiler_flags_common = [ + '-fdiagnostics-show-option', + '-fno-common', + '-fno-semantic-interposition', +- '-fstack-protector', +- '-fstack-protector-strong', + ] + + if enable_debug +@@ -550,6 +548,10 @@ add_project_arguments(global_cxxflags, language: 'cpp') + linker_flags = [ + ['-Wl,-Bsymbolic', false,], + ['-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),], ++ ++ # See issue vte#2535. ++ ['-fstack-protector', false], ++ ['-fstack-protector-strong', false], + ] + + foreach flag: linker_flags +-- +GitLab + diff --git a/package/vte/Config.in b/package/vte/Config.in index 96de3d38cc..2635a6007c 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -7,11 +7,11 @@ config BR2_PACKAGE_VTE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PCRE2 help VTE is a library (libvte) implementing a terminal emulator @@ -22,13 +22,14 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte -comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + BR2_TOOLCHAIN_USES_MUSL comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS diff --git a/package/vte/vte.hash b/package/vte/vte.hash index 3fbc5acab0..90818d31f3 100644 --- a/package/vte/vte.hash +++ b/package/vte/vte.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 vte-0.48.3.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum +sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz + +# Hash for license file: +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LGPL3 diff --git a/package/vte/vte.mk b/package/vte/vte.mk index 6c8d1433f5..07e813685e 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -4,26 +4,47 @@ # ################################################################################ -VTE_VERSION = 0.48.3 +VTE_VERSION_MAJOR = 0.66 +VTE_VERSION = $(VTE_VERSION_MAJOR).2 VTE_SOURCE = vte-$(VTE_VERSION).tar.xz -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48 -VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2 -VTE_LICENSE = LGPL-2.1+ -VTE_LICENSE_FILES = COPYING -VTE_CONF_OPTS += --disable-vala +VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) +VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) +VTE_LICENSE = LGPL-3.0+ +VTE_LICENSE_FILES = COPYING.LGPL3 + +ifeq ($(BR2_PACKAGE_ICU),y) +VTE_CONF_OPTS += -Dicu=true +VTE_DEPENDENCIES += icu +else +VTE_CONF_OPTS += -Dicu=false +endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -VTE_CONF_OPTS += --enable-introspection -VTE_DEPENDENCIES += gobject-introspection +VTE_CONF_OPTS += -Dgir=true -Dvapi=true +VTE_DEPENDENCIES += host-vala gobject-introspection else -VTE_CONF_OPTS += --disable-introspection +VTE_CONF_OPTS += -Dgir=false -Dvapi=false endif ifeq ($(BR2_PACKAGE_GNUTLS),y) -VTE_CONF_OPTS += --with-gnutls +VTE_CONF_OPTS += -Dgnutls=true VTE_DEPENDENCIES += gnutls else -VTE_CONF_OPTS += --without-gnutls +VTE_CONF_OPTS += -Dgnutls=false +endif + +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) +VTE_CONF_OPTS += -Dfribidi=true +VTE_DEPENDENCIES += libfribidi +else +VTE_CONF_OPTS += -Dfribidi=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +VTE_CONF_OPTS += -D_systemd=true +VTE_DEPENDENCIES += systemd +else +VTE_CONF_OPTS += -D_systemd=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.34.1 From romain.naour at smile.fr Sun Jan 9 17:24:04 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 18:24:04 +0100 Subject: [Buildroot] [PATCH] package/mesa3d: Gallium VC4 driver depends on NEON In-Reply-To: <20220109171511.3293111-1-arnout@mind.be> References: <20220109171511.3293111-1-arnout@mind.be> Message-ID: <73b148ec-c6bd-fb58-64fd-fd4e224f966e@smile.fr> Hello Arnout, Le 09/01/2022 ? 18:15, Arnout Vandecappelle (Essensium/Mind) a ?crit?: > Since version 21.3.0 of mesa3d, the generic broadcom infrastructure > (which is called v3d but is used also for VC4) started using NEON > instructions. This leads to assembler failures when VC4 is built for > 32-bit ARM without NEON: > > FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o > /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c > /tmp/ccAvufNv.s: Assembler messages: > /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode > [...] > /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode > > Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has > NEON, so no condition is needed there. BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D selecting BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 already requires NEON. Reviewed-by: Romain Naour Best regards, Romain > > Fixes: > http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ > http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/mesa3d/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 34b0352056..37c4f8078e 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D > > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 > bool "Gallium vc4 driver" > - depends on BR2_arm || BR2_aarch64 > + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence > select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > From arnout at mind.be Sun Jan 9 17:35:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 18:35:42 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: remove BR2_PACKAGE_SYSTEMD_TMPFILES Message-ID: <20220109173436.F2E0982DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7818ba0d6fde9ce9836e6c869d2a5faa5f32586d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When the BR2_PACKAGE_SYSTEMD_TMPFILES was removed, it was added to Config.in. The idea was to warn users who use the symbol in their br2-external. However, most users don't have a br2-external that uses this symbol. Since the symbol defaults to y when systemd is enabled, they'll get this legacy warning - which is completely meaningless for them since nothing changes. The annoyance of the many is worse than the possible unexpected change for the few. And anyone actually relying on BR2_PACKAGE_SYSTEMD_TMPFILES will probably easily discover the issue in testing (e.g. because the tmpfiles conf is missing in the target). Therefore, remove BR2_PACKAGE_SYSTEMD_TMPFILES from Config.in.legacy. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5a3e9b5cc7..d36eac3302 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,15 +153,6 @@ config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE This package has been removed as python-setuptools-scm dropped support of python 2 since version 6.0.0. -config BR2_PACKAGE_SYSTEMD_TMPFILES - bool "systemd tmpfiles support always enabled" - select BR2_LEGACY - help - The systemd tmpfiles support is always enabled, so the symbol - to make it optional has been removed. You need to update any - external packages that use this symbol to use - BR2_PACKAGE_SYSTEMD instead. - config BR2_PACKAGE_CIVETWEB_WITH_LUA bool "civetweb lua support option removed" select BR2_LEGACY From arnout at mind.be Sun Jan 9 17:33:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 18:33:02 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: correctly call $(subst ...) Message-ID: <20220109173436.E8E2F82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56d50e835441f384cc2d1b29ccbeed0b1f936728 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b6378631c2609742382984f6f7b93c1d9d2cdb78 introduced a call to the subst make function, but did it incorrectly (followed by comma instead of space). The result is that it expands to empty. Fix the call. Fixes: http://autobuild.buildroot.net/results/8ea/8eacd455e4767cc7b1e912a3f910c940110c3be0/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 77d2f66b17..067c45a920 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -44,7 +44,7 @@ PKG_CARGO_ENV = \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ - CARGO_TARGET_$(subst,-,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc + CARGO_TARGET_$(subst -,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) From arnout at mind.be Sun Jan 9 17:42:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 18:42:53 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Jakub Skrzypnik Message-ID: <20220109173711.1CDE38105A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=106aa6ce0e92f367226f6aba3caa1a84ff7a9640 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The e-mail bounces. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 2ad76a80e4..ed65c74319 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1265,9 +1265,6 @@ F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig -N: Jakub Skrzypnik -F: package/libglvnd/ - N: James Hilliard F: package/apcupsd/ F: package/exfatprogs/ From giulio.benetti at benettiengineering.com Sun Jan 9 17:52:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 9 Jan 2022 18:52:59 +0100 Subject: [Buildroot] [PATCH] package/pkg-cargo: convert to uppercase RUSTC_TARGET_NAME Message-ID: <20220109175259.86238-1-giulio.benetti@benettiengineering.com> RUSTC_TARGET_NAME's dashes are substituted with underscores, but this is not enough to fix building, we also need to make it UPPERCASE. So let make it like that by using UPPERCASE macro. Fixes: http://autobuild.buildroot.net/results/498/498b96224c8bcff91542ca3731dfd66891f4ec23/ Signed-off-by: Giulio Benetti --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 067c45a920..71f4dc4c91 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -44,7 +44,7 @@ PKG_CARGO_ENV = \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ - CARGO_TARGET_$(subst -,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc + CARGO_TARGET_$(call UPPERCASE,$(subst -,_,$(RUSTC_TARGET_NAME)))_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) -- 2.25.1 From fontaine.fabrice at gmail.com Sun Jan 9 18:06:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 19:06:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: disable MBEDTLS_FATAL_WARNINGS Message-ID: <20220109180657.2765079-1-fontaine.fabrice@gmail.com> Disable MBEDTLS_FATAL_WARNINGS to avoid the following build failure since bump to version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:412:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] 412 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/af017382bb5772de7383d71ed7b8af44717981f9 Signed-off-by: Fabrice Fontaine --- package/mbedtls/mbedtls.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index c238d664f8..5facb99b2a 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -8,7 +8,8 @@ MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ - -DENABLE_TESTING=OFF + -DENABLE_TESTING=OFF \ + -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 MBEDTLS_LICENSE_FILES = LICENSE -- 2.34.1 From arnout at mind.be Sun Jan 9 18:08:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 19:08:25 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: convert to uppercase RUSTC_TARGET_NAME Message-ID: <20220109180238.CB79282E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac573c55aac3cbb4257f5388c91321c81095c654 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master RUSTC_TARGET_NAME's dashes are substituted with underscores, but this is not enough to fix building, we also need to make it UPPERCASE. So let make it like that by using UPPERCASE macro. Fixes: http://autobuild.buildroot.net/results/498/498b96224c8bcff91542ca3731dfd66891f4ec23/ Signed-off-by: Giulio Benetti [Arnout: remove subst, implied by UPPERCASE] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 067c45a920..614d46ad64 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -44,7 +44,7 @@ PKG_CARGO_ENV = \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ - CARGO_TARGET_$(subst -,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc + CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) From arnout at mind.be Sun Jan 9 18:01:32 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 19:01:32 +0100 Subject: [Buildroot] [git commit] package/mesa3d: fix vulkan intel dependencies Message-ID: <20220109180238.BF0BF82D96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7178fd1ca0340d0fad34734ab5a462c7f95debd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It is possible to build the vulkan intel driver without X11/GLX. - remove xorgproto dependency; it is already given via BR2_PACKAGE_MESA3D_OPENGL_GLX/BR2_PACKAGE_MESA3D_NEEDS_X11 and was already gone from the .mk file - enable DRI3 automatically when X11 is enabled, like we do for other drivers - libxshmfence is implied by DRI3 (both in Config.in and mesa3d.mk), but we need to propagate dependencies (RISCV_32 doesn't apply since it's x86 only) Signed-off-by: Peter Seiderer [Arnout: select DRI3 like other drivers though, which simplifies the whole thing] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 12 +++++------- package/mesa3d/mesa3d.mk | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 34b0352056..b9a5574b63 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -378,21 +378,19 @@ comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL bool "Vulkan Intel driver" depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert - depends on BR2_PACKAGE_XORG7 # xorgproto - select BR2_PACKAGE_MESA3D_DRI3 + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER - select BR2_PACKAGE_XORGPROTO help Vulkan driver for Intel hardware from Ivy Bridge onward. -comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= 3.17" +comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 + !BR2_TOOLCHAIN_USES_GLIBC comment "Off-screen Rendering" diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index e34ed4264f..aa365838ab 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -146,7 +146,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= else -MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif From arnout at mind.be Sun Jan 9 18:09:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 19:09:08 +0100 Subject: [Buildroot] [RFC v2 02/12] package/mesa3d: fix vulkan/intel dependencies In-Reply-To: <20210110222833.26301-3-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-3-ps.report@gmx.net> Message-ID: Hi Peter, I'm finally reviewing this series. Since it's RFC, I'm going to mark it as changes requested right away. On 10/01/2021 23:28, Peter Seiderer wrote: > - enable X11/GLX free build > > - remove xorgproto dependency is already given via BR2_PACKAGE_MESA3D_OPENGL_GLX/BR2_PACKAGE_MESA3D_NEEDS_X11 > > - libxshmfence only needed in case BR2_PACKAGE_MESA3D_OPENGL_GLX is enabled > > - the correct dependency for BR2_PACKAGE_XLIB_LIBXSHMFENCE would > be 'depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX', > but this results in: > > package/mesa3d/Config.in:81:error: recursive dependency detected! > package/mesa3d/Config.in:81: symbol BR2_PACKAGE_MESA3D_DRIVER is selected by BR2_PACKAGE_MESA3D_VULKAN_DRIVER > package/mesa3d/Config.in:77: symbol BR2_PACKAGE_MESA3D_VULKAN_DRIVER is selected by BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL > package/mesa3d/Config.in:406: symbol BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL depends on BR2_PACKAGE_MESA3D_OPENGL_GLX > package/mesa3d/Config.in:461: symbol BR2_PACKAGE_MESA3D_OPENGL_GLX depends on BR2_PACKAGE_MESA3D_DRIVER > For a resolution refer to Documentation/kbuild/kconfig-language.txt > subsection "Kconfig recursive dependency limitations" > > so use unconditional 'depends on BR2_TOOLCHAIN_HAS_SYNC_4' instead > > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/mesa3d/Config.in | 10 ++++++---- > package/mesa3d/mesa3d.mk | 2 ++ > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 347b1a2726..d9c27f8b5c 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -398,15 +398,17 @@ comment "Vulkan drivers" > config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL > bool "Vulkan Intel driver" > depends on BR2_i386 || BR2_x86_64 > + # depends on BR2_TOOLCHAIN_HAS_SYNC_4 because of libxshmfence only > + # in case GLX is enabled but the following results in 'recursive > + # dependency detected!', so simple depend always on BR2_TOOLCHAIN_HAS_SYNC_4 > + # depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX # libxshmfence in case GLX is enabled > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h > depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert > - depends on BR2_PACKAGE_XORG7 # xorgproto > select BR2_PACKAGE_EXPAT > - select BR2_PACKAGE_MESA3D_DRI3 > + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_MESA3D_OPENGL_GLX In other drivers we enable DRI3 uncondtionally when X11 is enabled, i.e. even if GLX is not enabled: select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 I am not entirely sure if DRI3 makes any sense at all without GLX, but why not I'd say. Anyway, by working that way, you can resolve the circular dependency, because it simply becomes (as you see in many other drivers) depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_MESA3D_VULKAN_DRIVER > - select BR2_PACKAGE_XORGPROTO > - select BR2_PACKAGE_XLIB_LIBXSHMFENCE > + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_MESA3D_OPENGL_GLX > help > Vulkan driver for Intel hardware from Ivy Bridge onward. > > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index ea6265d723..967b86810f 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -146,7 +146,9 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers= > else > +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)$(BR2_PACKAGE_MESA3D_OPENGL_GLX),yy) > MESA3D_DEPENDENCIES += xlib_libxshmfence That also means that this can simply be removed, since it's already done by DRI3. Actually, I don't need feedback on those changes, so applied to master, thanks! Regards, Arnout > +endif > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) > endif > From arnout at mind.be Sun Jan 9 18:11:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 19:11:29 +0100 Subject: [Buildroot] [PATCH] package/pkg-cargo: convert to uppercase RUSTC_TARGET_NAME In-Reply-To: <20220109175259.86238-1-giulio.benetti@benettiengineering.com> References: <20220109175259.86238-1-giulio.benetti@benettiengineering.com> Message-ID: On 09/01/2022 18:52, Giulio Benetti wrote: > RUSTC_TARGET_NAME's dashes are substituted with underscores, but this is > not enough to fix building, we also need to make it UPPERCASE. So let make > it like that by using UPPERCASE macro. > > Fixes: > http://autobuild.buildroot.net/results/498/498b96224c8bcff91542ca3731dfd66891f4ec23/ > > Signed-off-by: Giulio Benetti > --- > package/pkg-cargo.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index 067c45a920..71f4dc4c91 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -44,7 +44,7 @@ PKG_CARGO_ENV = \ > CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ > CARGO_TARGET_APPLIES_TO_HOST="false" \ > CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ > - CARGO_TARGET_$(subst -,_,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc > + CARGO_TARGET_$(call UPPERCASE,$(subst -,_,$(RUSTC_TARGET_NAME)))_LINKER=$(notdir $(TARGET_CROSS))gcc UPPERCASE already does the subst, so that's redundant. Applied to master with that fixed, thanks. With the two of us working together, the autobuilder failure should finally be fixed! Regards, Arnout > > HOST_PKG_CARGO_ENV = \ > $(PKG_COMMON_CARGO_ENV) > From arnout at mind.be Sun Jan 9 18:11:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 19:11:54 +0100 Subject: [Buildroot] [PATCH] package/mesa3d: Gallium VC4 driver depends on NEON In-Reply-To: <73b148ec-c6bd-fb58-64fd-fd4e224f966e@smile.fr> References: <20220109171511.3293111-1-arnout@mind.be> <73b148ec-c6bd-fb58-64fd-fd4e224f966e@smile.fr> Message-ID: On 09/01/2022 18:24, Romain Naour wrote: > Hello Arnout, > > Le 09/01/2022 ? 18:15, Arnout Vandecappelle (Essensium/Mind) a ?crit?: >> Since version 21.3.0 of mesa3d, the generic broadcom infrastructure >> (which is called v3d but is used also for VC4) started using NEON >> instructions. This leads to assembler failures when VC4 is built for >> 32-bit ARM without NEON: >> >> FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o >> /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c >> /tmp/ccAvufNv.s: Assembler messages: >> /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode >> [...] >> /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode >> >> Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has >> NEON, so no condition is needed there. > > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D selecting > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 already requires NEON. Yeah, but VC4 doesn't select V3D so that doesn't mean anything. Regards, Arnout > > Reviewed-by: Romain Naour > > Best regards, > Romain > > >> >> Fixes: >> http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ >> http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ >> >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) >> --- >> package/mesa3d/Config.in | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in >> index 34b0352056..37c4f8078e 100644 >> --- a/package/mesa3d/Config.in >> +++ b/package/mesa3d/Config.in >> @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D >> >> config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 >> bool "Gallium vc4 driver" >> - depends on BR2_arm || BR2_aarch64 >> + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 >> depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence >> select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 >> select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER >> > From romain.naour at smile.fr Sun Jan 9 18:13:42 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 19:13:42 +0100 Subject: [Buildroot] [PATCH v9] package/freeradius-server: new package In-Reply-To: <20220104215541.23003-1-matthew.weber@collins.com> References: <20220104215541.23003-1-matthew.weber@collins.com> Message-ID: <6344a4e4-129c-dc79-6257-aa54da908093@smile.fr> Hello Matt, Le 04/01/2022 ? 22:55, Matthew Weber via buildroot a ?crit?: > From: David GOUARIN > > FreeRADIUS is an open source server which implements > a protocol for remote user Authorization, Authentication > and Accounting. > > Signed-off-by: David GOUARIN > Signed-off-by: Kalpesh Panchal > Signed-off-by: Matt Weber > --- > Changes > v8 -> v9: > - A systemd unit is installed if systemd is enabled. The default provided > by `freeradius-server/redhat/radiusd.service` was not used because of > extra options not compatible with Buildroot. The unit is instead based > on a simplified version of that upstream file. > [...] > diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk > new file mode 100644 > index 0000000000..0c071a2378 > --- /dev/null > +++ b/package/freeradius-server/freeradius-server.mk > @@ -0,0 +1,124 @@ > +################################################################################ > +# > +# freeradius-server > +# > +################################################################################ > + > +FREERADIUS_SERVER_VERSION = 3.0.25 > +FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius > +FREERADIUS_SERVER_LICENSE = GPL-2.0 > +FREERADIUS_SERVER_LICENSE_FILES = COPYRIGHT > +FREERADIUS_SERVER_DEPENDENCIES = libtalloc > + > +# some compiler checks are not supported while cross compiling. > +# instead of removing those checks, we cache the answers > +FREERADIUS_SERVER_CONF_OPTS += \ > + ax_cv_cc_bounded_attribute=no \ > + ax_cv_cc_builtin_bswap64=no \ > + ax_cv_cc_builtin_choose_expr=no \ > + ax_cv_cc_builtin_types_compatible_p=no > + > +ifeq ($(BR2_PACKAGE_LIBCAP),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-libcap > +FREERADIUS_SERVER_DEPENDENCIES += libcap > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-libcap > +endif > + > +ifeq ($(BR2_PACKAGE_LIBPCAP),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-libpcap > +FREERADIUS_SERVER_DEPENDENCIES += libpcap > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-libpcap > +endif > + > +ifeq ($(BR2_PACKAGE_LIBKRB5),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_krb5 > +FREERADIUS_SERVER_DEPENDENCIES += libkrb5 > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_krb5 > +endif > + > +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_pam > +FREERADIUS_SERVER_DEPENDENCIES += linux-pam > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_pam > +endif > + > +ifeq ($(BR2_PACKAGE_OPENLDAP),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ldap > +FREERADIUS_SERVER_DEPENDENCIES += openldap > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ldap > +endif > + > +ifeq ($(BR2_PACKAGE_MYSQL),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_mysql > +FREERADIUS_SERVER_DEPENDENCIES += mysql > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_mysql > +endif > + > +ifeq ($(BR2_PACKAGE_SQLITE),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_sqlite > +FREERADIUS_SERVER_DEPENDENCIES += sqlite > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_sqlite > +endif > + > +ifeq ($(BR2_PACKAGE_UNIXODBC),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_unixodbc > +FREERADIUS_SERVER_DEPENDENCIES += unixodbc > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_unixodbc > +endif > + > +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_postgresql > +FREERADIUS_SERVER_DEPENDENCIES += postgresql > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_postgresql > +endif > + > +ifeq ($(BR2_PACKAGE_HAS_OPENSSL),y) > +FREERADIUS_SERVER_DEPENDENCIES += openssl > +FREERADIUS_SERVER_CONF_OPTS += --with-openssl > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-openssl > +endif > + > +ifeq ($(BR2_PACKAGE_PCRE),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-pcre > +FREERADIUS_SERVER_DEPENDENCIES += pcre > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-pcre > +endif > + > +ifeq ($(BR2_PACKAGE_RUBY),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ruby > +FREERADIUS_SERVER_DEPENDENCIES += ruby > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ruby > +endif > + > +ifeq ($(BR2_INIT_SYSTEMD),y) > +FREERADIUS_SERVER_CONF_OPTS += --with-systemd > +FREERADIUS_SERVER_DEPENDENCIES += systemd > +else > +FREERADIUS_SERVER_CONF_OPTS += --without-systemd > +endif > + > +# TARGET_DIR is set to empty to avoid creation of symlinks in hardcoded host directories > +# freeradius Makefile does not support an alternate DESTDIR, instead it uses the magic $(R) variable > +FREERADIUS_SERVER_MAKE_ENV = R=$(TARGET_DIR) TARGET_DIR="" > + > +# use MAKE1 because make install does not support parallel build > +FREERADIUS_SERVER_MAKE = $(MAKE1) > + > +define FREERADIUS_SERVER_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 644 package/freeradius-server/radiusd.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/radiusd.service > +endef > + > +$(eval $(autotools-package)) > diff --git a/package/freeradius-server/radiusd.service b/package/freeradius-server/radiusd.service > new file mode 100644 > index 0000000000..a55bce62d3 > --- /dev/null > +++ b/package/freeradius-server/radiusd.service > @@ -0,0 +1,38 @@ > +# Reference from: freeradius-server/redhat/radiusd.service > + > +[Unit] > +Description=FreeRADIUS multi-protocol policy server > +After=network-online.target > +Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ http://networkradius.com/doc/ > + > +[Service] > +Type=notify > +WatchdogSec=60 > +NotifyAccess=all > +EnvironmentFile=-/etc/sysconfig/radiusd /etc/sysconfig is a redhat things. I don't think it apply to Buildroot. This file is not installed by the package. Otherwise the package seems ok even if it requires some magic $(R). Best regards, Romain > + > +# FreeRADIUS can do static evaluation of policy language rules based > +# on environmental variables which is very useful for doing per-host > +# customization. > +# Unfortunately systemd does not allow variable substitutions such > +# as %H or $(hostname) in the EnvironmentFile. > +# We provide HOSTNAME here for convenience. > +Environment=HOSTNAME=%H > + > +# Limit memory to 2G this is fine for %99.99 of deployments. FreeRADIUS > +# is not memory hungry, if it's using more than this, then there's probably > +# a leak somewhere. > +MemoryLimit=2G > + > +ExecStartPre=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cx -lstdout > +ExecStart=/usr/sbin/radiusd -f $FREERADIUS_OPTIONS > +Restart=on-failure > +RestartSec=5 > +ExecReload=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cxm -lstdout > +ExecReload=/bin/kill -HUP $MAINPID > + > +# Only allow native system calls > +SystemCallArchitectures=native > + > +[Install] > +WantedBy=multi-user.target > From peter at korsgaard.com Sun Jan 9 18:18:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 19:18:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: disable MBEDTLS_FATAL_WARNINGS In-Reply-To: <20220109180657.2765079-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 19:06:57 +0100") References: <20220109180657.2765079-1-fontaine.fabrice@gmail.com> Message-ID: <87o84kai3h.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable MBEDTLS_FATAL_WARNINGS to avoid the following build failure > since bump to version 2.28.0 in commit > 0f8aab08e762742d753d5920718f31c629d0f8d7: > /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:412:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] > 412 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) > | ^~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/af017382bb5772de7383d71ed7b8af44717981f9 Committed, thanks. The error message is a bit odd as we should be building with -Os. Do you know what is going on? -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 18:17:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 19:17:07 +0100 Subject: [Buildroot] [git commit] package/mbedtls: disable MBEDTLS_FATAL_WARNINGS Message-ID: <20220109181211.7F87B82DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf9dcd3b08fd88ef21550f75dc57de212fcea26c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable MBEDTLS_FATAL_WARNINGS to avoid the following build failure since bump to version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:412:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] 412 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/af017382bb5772de7383d71ed7b8af44717981f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index c238d664f8..5facb99b2a 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -8,7 +8,8 @@ MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ - -DENABLE_TESTING=OFF + -DENABLE_TESTING=OFF \ + -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 MBEDTLS_LICENSE_FILES = LICENSE From tambewilliam at gmail.com Sun Jan 9 18:18:36 2022 From: tambewilliam at gmail.com (William Tambe) Date: Sun, 9 Jan 2022 12:18:36 -0600 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory Message-ID: I am attempting to build: +BR2_PACKAGE_DHCP=y +BR2_PACKAGE_DHCP_CLIENT=y However it fails as follow complaining about not finding readline/history.h: making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include -I../../lib/lwres/unix/include -I../../lib/lwres/include -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include -I../../lib/dns/include -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include -I../../lib/bind9/include -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks \ -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ -c ./nsupdate.c ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory 104 | #include | ^~~~~~~~~~~~~~~~~~~~ compilation terminated. make[5]: *** [Makefile:473: nsupdate.o] Error 1 make[4]: *** [Makefile:79: subdirs] Error 1 make[3]: *** [Makefile:88: subdirs] Error 1 make[2]: *** [package/pkg-generic.mk:270: /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] Error 2 make[1]: *** [Makefile:23: _all] Error 2 make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 From peter at korsgaard.com Sun Jan 9 18:31:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 09 Jan 2022 19:31:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: add mysql_config to MARIADB_CONFIG_SCRIPTS In-Reply-To: <20220109150422.792641-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 16:04:22 +0100") References: <20220109150422.792641-1-fontaine.fabrice@gmail.com> Message-ID: <87k0f8ahh8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Add mysql_config to MARIADB_CONFIG_SCRIPTS, this won't fix any build > failure at the moment but will avoid possible issues in the future > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 9 18:31:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 9 Jan 2022 19:31:07 +0100 Subject: [Buildroot] [git commit] package/mariadb: add mysql_config to MARIADB_CONFIG_SCRIPTS Message-ID: <20220109182532.38C4E82DB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee8ccad5d7cbb4981e6960d5712e9936eb28724e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add mysql_config to MARIADB_CONFIG_SCRIPTS, this won't fix any build failure at the moment but will avoid possible issues in the future Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d08b768a2e..db967ca3ed 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -14,6 +14,7 @@ MARIADB_CPE_ID_VENDOR = mariadb MARIADB_SELINUX_MODULES = mysql MARIADB_INSTALL_STAGING = YES MARIADB_PROVIDES = mysql +MARIADB_CONFIG_SCRIPTS = mysql_config MARIADB_DEPENDENCIES = \ host-mariadb \ From romain.naour at smile.fr Sun Jan 9 18:32:02 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 19:32:02 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/moby-buildkit: new package In-Reply-To: <20201216084058.102180-1-christian@paral.in> References: <20201216084058.102180-1-christian@paral.in> Message-ID: Hello Christian, Le 16/12/2020 ? 09:40, Christian Stewart a ?crit?: > Signed-off-by: Christian Stewart > --- > package/Config.in | 1 + > package/moby-buildkit/Config.in | 19 +++++++++++++++++++ > package/moby-buildkit/moby-buildkit.hash | 3 +++ > package/moby-buildkit/moby-buildkit.mk | 24 ++++++++++++++++++++++++ > 4 files changed, 47 insertions(+) > create mode 100644 package/moby-buildkit/Config.in > create mode 100644 package/moby-buildkit/moby-buildkit.hash > create mode 100644 package/moby-buildkit/moby-buildkit.mk > > diff --git a/package/Config.in b/package/Config.in > index dc7139a49a..ce37a2ed35 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2414,6 +2414,7 @@ menu "System tools" > source "package/mender/Config.in" > source "package/mender-grubenv/Config.in" > source "package/mfoc/Config.in" > + source "package/moby-buildkit/Config.in" > source "package/monit/Config.in" > source "package/multipath-tools/Config.in" > source "package/ncdu/Config.in" > diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in > new file mode 100644 > index 0000000000..14134aa7ae > --- /dev/null > +++ b/package/moby-buildkit/Config.in > @@ -0,0 +1,19 @@ > +config BR2_PACKAGE_MOBY_BUILDKIT > + bool "moby-buildkit" > + 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 > + depends on BR2_USE_MMU > + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency > + help > + BuildKit is a toolkit for converting source code to build artifacts in an This line is trigger a check-package warning: $ ./utils/check-package package/moby-buildkit/* package/moby-buildkit/Config.in:10: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > + efficient, expressive and repeatable manner. > + > + https://github.com/moby/buildkit > + > +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" > + 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 || BR2_TOOLCHAIN_USES_UCLIBC > + depends on BR2_USE_MMU > diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash > new file mode 100644 > index 0000000000..a6bfdce4f1 > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz > +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE Checking legal-info report a problem with the LICENSE file hash: ERROR: LICENSE has wrong sha256 hash: ERROR: expected: 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 ERROR: got : c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 > diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk > new file mode 100644 > index 0000000000..fb4e78e3a6 > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.mk > @@ -0,0 +1,24 @@ > +################################################################################ > +# > +# moby-buildkit > +# > +################################################################################ > + > +MOBY_BUILDKIT_VERSION = 0.8.1 > +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) > + > +MOBY_BUILDKIT_LICENSE = Apache-2.0 > +MOBY_BUILDKIT_LICENSE_FILES = LICENSE > + > +MOBY_BUILDKIT_DEPENDENCIES = host-pkgconf Why host-pkgconfig is needed ? It doesn't seems used by the build system. Best regards, Romain > +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit > + > +MOBY_BUILDKIT_TAGS = cgo > +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd > + > +MOBY_BUILDKIT_LDFLAGS = \ > + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" > + > +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) > + > +$(eval $(golang-package)) > From romain.naour at smile.fr Sun Jan 9 19:06:18 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 20:06:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/daemonize: new package In-Reply-To: <87d2f33b-08cc-6b84-35d4-11e5140bb222@gmail.com> References: <20210124102241.1207866-1-christian@paral.in> <87d2f33b-08cc-6b84-35d4-11e5140bb222@gmail.com> Message-ID: <2c1bf212-6ec5-6fca-2df4-cee2b0a5e117@smile.fr> Hello Christian, Le 31/12/2021 ? 10:45, Joachim Wiberg a ?crit?: > Hi, > > sorry for the late review: > > On 1/24/21 11:22 AM, Christian Stewart wrote: >> Daemonize is a command line utility to run a program as a Unix daemon. >> Signed-off-by: Christian Stewart >> --- > > Missing entry in DEVELOPERS. > >> package/Config.in | 1 + >> ...de-setpgrp-to-enable-cross-compiling.patch | 55 +++++++++++++++++++ >> package/daemonize/Config.in | 5 ++ >> package/daemonize/daemonize.hash | 1 + >> package/daemonize/daemonize.mk | 12 ++++ >> 5 files changed, 74 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 f42cc01032..b335aa4dd8 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -2413,6 +2413,7 @@ menu "System tools" >> source "package/coreutils/Config.in" >> source "package/cpuload/Config.in" >> source "package/daemon/Config.in" >> + source "package/daemonize/Config.in" > > How does this program differ from the already existing daemon(1) we have > in Buildroot? Are there programs that depend on it perhaps, or does it > offer more functionality than daemon(1)? > >> 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 > > We don't usually allow for patches in the tree that are not submitted > upstream, i.e. only backported patches. However, issues like these are > usually better solved by instead overriding the autoconf cache value > (ac_cv_foo) from the .mk file. There are lots of examples of this in > the tree, e.g. package/mtools/mtools.mk There is a configure.in, if possible patch this file instead and use DAEMONIZE_AUTORECONF = YES. > >> diff --git a/package/daemonize/Config.in b/package/daemonize/Config.in >> new file mode 100644 >> index 0000000000..f7f3288d9a >> --- /dev/null >> +++ b/package/daemonize/Config.in >> @@ -0,0 +1,5 @@ >> +menuconfig BR2_PACKAGE_DAEMONIZE >> + bool "daemonize" is there any toolchain dependency ? glibc, uclibc-ng, musl ? Have you check with test-pkg ? >> + help >> + Command line utility to run a daemon. >> + > > Here would be a good place to mention any added value in this package, > as compared to BR2_PACKAGE_DAEMON. Alse add the link to the project: http://software.clapper.org/daemonize (Use check-package) > >> 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 license file hash is missing. >> 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 Maybe we should add the getopt.c license: https://github.com/bmc/daemonize/blob/master/LICENSE.md#license-for-getoptc >> +DAEMONIZE_LICENSE_FILES = LICENSE.md >> + >> +$(eval $(autotools-package)) > > Other than my comments above, the packaging looks fine to me. > > Reviewed-by: Joachim Wiberg I have marked this patch as "Changes Requested". Best regards, Romain > > Best regards > /Joachim > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sun Jan 9 19:55:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 20:55:39 +0100 Subject: [Buildroot] [git commit] system/Config.in: update systemd dependencies Message-ID: <20220109195041.1ADDA82DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efa07944c59acd312d392d4e39f8470b38735282 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit eb49354eb34842f88218fcf9ef60576b85653e38 updated systemd's minimal kernel headers version to 3.13, but forgot to update the dependencies of BR2_INIT_SYSTEMD. Update BR2_INIT_SYSTEMD kernel headers dependency to 3.13. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- system/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 8c66cad12a..a4ffbfa18c 100644 --- a/system/Config.in +++ b/system/Config.in @@ -125,7 +125,7 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR From arnout at mind.be Sun Jan 9 19:57:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 20:57:32 +0100 Subject: [Buildroot] [git commit] package/systemd: Update description and kernel options In-Reply-To: <8735lxca4s.fsf@dell.be.48ers.dk> References: <20220109124415.8A8BF82CFA@busybox.osuosl.org> <8735lxca4s.fsf@dell.be.48ers.dk> Message-ID: <84bd72d3-426f-f028-b4fc-a5337fa8defc@mind.be> On 09/01/2022 14:27, Peter Korsgaard wrote: >>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > > > commit: https://git.buildroot.net/buildroot/commit/?id=eb49354eb34842f88218fcf9ef60576b85653e38 > > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > > realign the configuration to the README. > > > enable CONFIG_AUTOFS_FS (kernel >= 4.18) as well as the someday > > to be removed CONFIG_AUTOFS4_FS option. > > > Signed-off-by: Norbert Lange > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > > --- > > package/systemd/Config.in | 22 +++++++++++++++++----- > > package/systemd/systemd.mk | 16 ++++++++++++---- > > 2 files changed, 29 insertions(+), 9 deletions(-) > > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > > index c8c5a9c47b..27a12bc947 100644 > > --- a/package/systemd/Config.in > > +++ b/package/systemd/Config.in > > @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > > depends on !BR2_STATIC_LIBS # kmod > > depends on BR2_TOOLCHAIN_USES_GLIBC > > depends on BR2_TOOLCHAIN_HAS_SSP > > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 > > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 > > Is that correct? The corresponding BR2_INIT_SYSTEMD dependency was not > updated. My bad, fixed in efa07944c59acd312d392d4e39f8470b38735282. Regards, Arnout From arnout at mind.be Sun Jan 9 20:00:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 21:00:56 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: fix flake8 errors Message-ID: <20220109195612.5354B82DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02e679d8bf8acae9e110820858d1f242ff971af8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master support/scripts/pkg-stats:1171:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1175:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1179:8: E713 test for membership should be 'not in' 3 E713 test for membership should be 'not in' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1955772278 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7e20ccc0da..abd36a3dd5 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1168,15 +1168,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - if not "url" in args.disable: + if "url" not in args.disable: print("Checking URL status") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_urls(packages)) - if not "upstream" in args.disable: + if "upstream" not in args.disable: print("Getting latest versions ...") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_latest_version(packages)) - if not "cve" in args.disable and args.nvd_path: + if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From fontaine.fabrice at gmail.com Sun Jan 9 20:00:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 21:00:37 +0100 Subject: [Buildroot] [PATCH 1/3] package/libvirt: fix ssh2 option Message-ID: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 41218c0e53..0c1ee82f43 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -220,10 +220,10 @@ LIBVIRT_CONF_OPTS += -Dsasl=disabled endif ifeq ($(BR2_PACKAGE_LIBSSH2),y) -LIBVIRT_CONF_OPTS += -Dssh2=enabled +LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 else -LIBVIRT_CONF_OPTS += -Dssh2=disabled +LIBVIRT_CONF_OPTS += -Dlibssh2=disabled endif ifeq ($(BR2_PACKAGE_LIBVIRT_LXC),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 20:00:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 21:00:38 +0100 Subject: [Buildroot] [PATCH 2/3] package/libvirt: disable sasl In-Reply-To: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Message-ID: <20220109200039.3188788-2-fontaine.fabrice@gmail.com> sasl depends on libsasl2 (https://github.com/cyrusimap/cyrus-sasl) which is not packaged yet in buildroot and will result in the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1212:2: ERROR: Dependency "libsasl2" not found, tried pkgconfig Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 0c1ee82f43..816bb0760d 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -63,6 +63,7 @@ LIBVIRT_CONF_OPTS = \ -Dpciaccess=enabled \ -Dpm_utils=disabled \ -Dsanlock=disabled \ + -Dsasl=disabled \ -Dsecdriver_apparmor=disabled \ -Dstorage_iscsi=disabled \ -Dstorage_iscsi_direct=disabled \ @@ -212,13 +213,6 @@ else LIBVIRT_CONF_OPTS += -Dnss=disabled endif -ifeq ($(BR2_PACKAGE_LIBGSASL),y) -LIBVIRT_CONF_OPTS += -Dsasl=enabled -LIBVIRT_DEPENDENCIES += libgsasl -else -LIBVIRT_CONF_OPTS += -Dsasl=disabled -endif - ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 20:00:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 21:00:39 +0100 Subject: [Buildroot] [PATCH 3/3] package/libvirt: bump to version 7.10.0 In-Reply-To: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Message-ID: <20220109200039.3188788-3-fontaine.fabrice@gmail.com> https://gitlab.com/libvirt/libvirt/-/blob/v7.10.0/NEWS.rst Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.hash | 2 +- package/libvirt/libvirt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.hash b/package/libvirt/libvirt.hash index e8cbb34e2a..de9ebff564 100644 --- a/package/libvirt/libvirt.hash +++ b/package/libvirt/libvirt.hash @@ -1,3 +1,3 @@ # locally computed -sha256 1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2 libvirt-7.7.0.tar.xz +sha256 cb318014af097327928c6e3d72922e3be02a3e6401247b2aa52d9ab8e0b480f9 libvirt-7.10.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 816bb0760d..7b0ed5e52e 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVIRT_VERSION = 7.7.0 +LIBVIRT_VERSION = 7.10.0 LIBVIRT_SITE = https://libvirt.org/sources LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ -- 2.34.1 From yann.morin.1998 at free.fr Sun Jan 9 20:08:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:08:06 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org In-Reply-To: <20220109151414.1908259-1-romain.naour@smile.fr> References: <20220109151414.1908259-1-romain.naour@smile.fr> Message-ID: <20220109200806.GD1477939@scaer> Romain, All, On 2022-01-09 16:14 +0100, Romain Naour spake thusly: > While packaging telegraf [1] the download step failed due to a checksum > mismatch: > > go: downloading collectd.org v0.5.0 > get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 > verifying collectd.org at v0.5.0: checksum mismatch > downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= > go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= > > SECURITY ERROR > This download does NOT match an earlier download recorded in go.sum. > The bits may have been replaced on the origin server, or an attacker may > have intercepted the download attempt. > > For more information, see 'go help module-auth'. > > go-collectd was bumped in telegraf since several releases (since v1.19.0) without > any changes regarding the go-collectd hash. > > Some users reported an issue [3] when using "GOPROXY=direct" and used > "GOPROXY=proxy.golang.org" as a workaround. I'll put down what we discussed on IRC: Unfortunately, there are cases the other way around: using a proxy broke the vendoring, while a direct connection solved it. So we won't be able to satisfy both cases. Furthermore, relying on a proxy having a cached archive risks breaking in the future anyway, as that archived may get eventually get evicted out of the cache of the proxy. Or the proxy may disapear in the future, or whatever. In any case, a bad hash is most probably due to one of the following issues: - upstream messed up when adding the dependency and incorrectly copied the hash (but that should not happen as adding a dependency is supposed to be done with go tools already), - the upstream of the dependency changed their release (i.e. they re-tagged a release) - the go proxy is caching an incorrect archive (e.g. a partial download, or an older archive, or is malicious, or whatever). In any case, we can't do anything about it, and the upstream of the project has to fix the mess. So, from my point of view, this is a NACK on this patch. Regards, Yann E. MORIN. > [1] https://github.com/influxdata/telegraf/ > [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e > [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 > > Signed-off-by: Romain Naour > Cc: Thomas Petazzoni > --- > package/pkg-golang.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index 35bcb1673b..e23778d96a 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD > $(2)_DOWNLOAD_POST_PROCESS = go > $(2)_DL_ENV = \ > $(HOST_GO_COMMON_ENV) \ > - GOPROXY=direct \ > + GOPROXY=proxy.golang.org \ > BR_GOMOD=$$($(2)_GOMOD) > > # Due to vendoring, it is pretty likely that not all licenses are > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Jan 9 20:08:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 21:08:34 +0100 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory In-Reply-To: References: Message-ID: On 09/01/2022 19:18, William Tambe wrote: > I am attempting to build: > > +BR2_PACKAGE_DHCP=y > +BR2_PACKAGE_DHCP_CLIENT=y > > However it fails as follow complaining about not finding readline/history.h: > > making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate > /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc pu32 doesn't exist in Buildroot, so this may very well be due to external changes. > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 > -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include > -I../../lib/lwres/unix/include -I../../lib/lwres/include > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include > -I../../lib/dns/include > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include > -I../../lib/bind9/include > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include > -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include > -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include > -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" > -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall > -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat > -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks > \ > -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ > -c ./nsupdate.c > ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory > 104 | #include > | ^~~~~~~~~~~~~~~~~~~~ This sounds like you changed your configuration without doing 'make clean'. Is that possible? Is BR2_PACKAGE_READLINE enabled in your configuration? Has it been built? Regards, Arnout > compilation terminated. > make[5]: *** [Makefile:473: nsupdate.o] Error 1 > make[4]: *** [Makefile:79: subdirs] Error 1 > make[3]: *** [Makefile:88: subdirs] Error 1 > make[2]: *** [package/pkg-generic.mk:270: > /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] > Error 2 > make[1]: *** [Makefile:23: _all] Error 2 > make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' > make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From yann.morin.1998 at free.fr Sun Jan 9 20:13:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:13:25 +0100 Subject: [Buildroot] [git commit] package/mesa3d: Gallium VC4 driver depends on NEON Message-ID: <20220109200716.79FDC82AB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5cdb54ed78b136c83dd44aebfa27f715cda5ea3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since version 21.3.0 of mesa3d, the generic broadcom infrastructure (which is called v3d but is used also for VC4) started using NEON instructions. This leads to assembler failures when VC4 is built for 32-bit ARM without NEON: FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c /tmp/ccAvufNv.s: Assembler messages: /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode [...] /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has NEON, so no condition is needed there. Fixes: http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/mesa3d/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index b9a5574b63..7cf5c26227 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" - depends on BR2_arm || BR2_aarch64 + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER From yann.morin.1998 at free.fr Sun Jan 9 20:14:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:14:02 +0100 Subject: [Buildroot] [PATCH] package/mesa3d: Gallium VC4 driver depends on NEON In-Reply-To: <20220109171511.3293111-1-arnout@mind.be> References: <20220109171511.3293111-1-arnout@mind.be> Message-ID: <20220109201402.GE1477939@scaer> Arnout, All, On 2022-01-09 18:15 +0100, Arnout Vandecappelle (Essensium/Mind) spake thusly: > Since version 21.3.0 of mesa3d, the generic broadcom infrastructure > (which is called v3d but is used also for VC4) started using NEON > instructions. This leads to assembler failures when VC4 is built for > 32-bit ARM without NEON: > > FAILED: src/broadcom/libv3d_neon.a.p/common_v3d_tiling.c.o > /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc [...] -c ../src/broadcom/common/v3d_tiling.c > /tmp/ccAvufNv.s: Assembler messages: > /tmp/ccAvufNv.s:602: Error: selected processor does not support `vldm r7,{q0,q1,q2,q3}' in ARM mode > [...] > /tmp/ccAvufNv.s:686: Error: selected processor does not support `vstm r7,{q0,q1,q2,q3}' in ARM mode > > Let the VC4 driver depend on NEON for 32-bit ARM. Aarch64 always has > NEON, so no condition is needed there. > > Fixes: > http://autobuild.buildroot.net/results/2b5/2b531f7aa4506ee31a7252c87a2e401fffab9dfb/ > http://autobuild.buildroot.net/results/6f9/6f9e7c864808dc0fafbca7c8984651fe92edbaf2/ > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/mesa3d/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 34b0352056..37c4f8078e 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -274,7 +274,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D > > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 > bool "Gallium vc4 driver" > - depends on BR2_arm || BR2_aarch64 > + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence > select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 20:16:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:16:02 +0100 Subject: [Buildroot] [git commit] package/libvirt: disable sasl Message-ID: <20220109201037.1519B831C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba2016dc04271844416088b766284f9a22a6b58d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master sasl depends on libsasl2 (https://github.com/cyrusimap/cyrus-sasl) which is not packaged yet in buildroot and will result in the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1212:2: ERROR: Dependency "libsasl2" not found, tried pkgconfig Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libvirt/libvirt.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 0c1ee82f43..816bb0760d 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -63,6 +63,7 @@ LIBVIRT_CONF_OPTS = \ -Dpciaccess=enabled \ -Dpm_utils=disabled \ -Dsanlock=disabled \ + -Dsasl=disabled \ -Dsecdriver_apparmor=disabled \ -Dstorage_iscsi=disabled \ -Dstorage_iscsi_direct=disabled \ @@ -212,13 +213,6 @@ else LIBVIRT_CONF_OPTS += -Dnss=disabled endif -ifeq ($(BR2_PACKAGE_LIBGSASL),y) -LIBVIRT_CONF_OPTS += -Dsasl=enabled -LIBVIRT_DEPENDENCIES += libgsasl -else -LIBVIRT_CONF_OPTS += -Dsasl=disabled -endif - ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 From yann.morin.1998 at free.fr Sun Jan 9 20:15:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:15:59 +0100 Subject: [Buildroot] [git commit] package/libvirt: fix ssh2 option Message-ID: <20220109201037.0BAD382D9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c077b4a919d697c0b4f5c0c30d945418691e2e23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libvirt/libvirt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 41218c0e53..0c1ee82f43 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -220,10 +220,10 @@ LIBVIRT_CONF_OPTS += -Dsasl=disabled endif ifeq ($(BR2_PACKAGE_LIBSSH2),y) -LIBVIRT_CONF_OPTS += -Dssh2=enabled +LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 else -LIBVIRT_CONF_OPTS += -Dssh2=disabled +LIBVIRT_CONF_OPTS += -Dlibssh2=disabled endif ifeq ($(BR2_PACKAGE_LIBVIRT_LXC),y) From arnout at mind.be Sun Jan 9 20:19:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 21:19:56 +0100 Subject: [Buildroot] [RFC v2 03/12] package/mesa3d: fix gbm config warning In-Reply-To: <20210110222833.26301-4-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-4-ps.report@gmx.net> Message-ID: On 10/01/2021 23:28, Peter Seiderer wrote: > Fixes for the following defconfig: > > BR2_x86_64=y > BR2_TOOLCHAIN_BUILDROOT_GLIBC=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_TARGET_GENERIC_GETTY_PORT="tty1" > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > > this warning: > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM > Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y]) > Selected by [y]: > - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM > Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y]) > Selected by [y]: > - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] > > as BR2_PACKAGE_MESA3D_VULKAN_DRIVER selects BR2_PACKAGE_MESA3D_DRIVER which > enables possible selection of BR2_PACKAGE_MESA3D_OPENGL_EGL selecting > BR2_PACKAGE_MESA3D_GBM. > > Selecting EGL with only a vulkan driver selected gives the following configure > failure: > > .../build/mesa3d-20.3.2/meson.build:424:4: ERROR: Problem encountered: EGL requires dri > > Note dri means here an dri or gallium driver (see meson.build and look > for with_dri). > > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/mesa3d/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index d9c27f8b5c..7a976f4b2c 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -452,6 +452,8 @@ config BR2_PACKAGE_MESA3D_OPENGL_GLX > comment "OpenGL GLX support needs X11" > depends on !BR2_PACKAGE_XORG7 > > +if BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER Since there's only one symbol inside, we prefer "depends on" Applied to master with that fixed, thanks. Regards, Arnout > + > config BR2_PACKAGE_MESA3D_OPENGL_EGL > bool "OpenGL EGL" > select BR2_PACKAGE_HAS_LIBEGL > @@ -461,6 +463,8 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL > Use the Khronos EGL APIs. EGL is a window manager for OpenGL > applications similar to GLX, for X, and WGL, for Windows. > > +endif # BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > + > config BR2_PACKAGE_MESA3D_OPENGL_ES > bool "OpenGL ES" > select BR2_PACKAGE_HAS_LIBGLES > From fontaine.fabrice at gmail.com Sun Jan 9 20:20:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 21:20:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: libvirtd needs C++ Message-ID: <20220109202003.3338357-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] Selected by [y]: - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libvirt/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index a35295bc97..d7ca5f8db5 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -37,6 +37,7 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y + depends on BR2_INSTALL_LIBSTDCPP # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES @@ -50,6 +51,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. +comment "libvirtd needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON -- 2.34.1 From arnout at mind.be Sun Jan 9 20:23:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 21:23:06 +0100 Subject: [Buildroot] [RFC v2 04/12] package/mesa3d: DRI3 with GLX needs xshmfence In-Reply-To: <20210110222833.26301-5-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-5-ps.report@gmx.net> Message-ID: On 10/01/2021 23:28, Peter Seiderer wrote: > Fixes for the following defconfig: > > BR2_arm=y > BR2_cortex_a72=y > BR2_ARM_FPU_NEON_VFPV4=y > BR2_TOOLCHAIN_BUILDROOT_GLIBC=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_DRI3=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y > BR2_PACKAGE_MESA3D_OPENGL_GLX=y > > this configure error: > > .../build/mesa3d-20.3.2/meson.build:1772:6: ERROR: Dependency "xshmfence" not found, tried pkgconfig and cmake > > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/mesa3d/Config.in | 5 +++-- > package/mesa3d/mesa3d.mk | 6 +++--- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 7a976f4b2c..8a01fa95e2 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -17,6 +17,8 @@ if BR2_PACKAGE_MESA3D > > config BR2_PACKAGE_MESA3D_DRI3 > bool "Enable DRI3 support" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX > + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_MESA3D_OPENGL_GLX This was already done, but without the depends on and without the if GLX. I'm not entirely sure if the if GLX is actually needed. But really, mesa3d needs a big overhaul where the Config.in is compared to the meson.build to check how the dependencies and interactions *really* work. Therefore, I've marked this patch as Superseded. Regards, Arnout > help > Enable DRI3 support. > > @@ -398,7 +400,7 @@ comment "Vulkan drivers" > config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL > bool "Vulkan Intel driver" > depends on BR2_i386 || BR2_x86_64 > - # depends on BR2_TOOLCHAIN_HAS_SYNC_4 because of libxshmfence only > + # depends on BR2_TOOLCHAIN_HAS_SYNC_4 because of dri3/libxshmfence only > # in case GLX is enabled but the following results in 'recursive > # dependency detected!', so simple depend always on BR2_TOOLCHAIN_HAS_SYNC_4 > # depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX # libxshmfence in case GLX is enabled > @@ -408,7 +410,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL > select BR2_PACKAGE_EXPAT > select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_MESA3D_OPENGL_GLX > select BR2_PACKAGE_MESA3D_VULKAN_DRIVER > - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_MESA3D_OPENGL_GLX > help > Vulkan driver for Intel hardware from Ivy Bridge onward. > > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 967b86810f..31f1c12d63 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -38,6 +38,9 @@ endif > > ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) > MESA3D_CONF_OPTS += -Ddri3=enabled > +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) > +MESA3D_DEPENDENCIES += xlib_libxshmfence > +endif > else > MESA3D_CONF_OPTS += -Ddri3=disabled > endif > @@ -146,9 +149,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers= > else > -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)$(BR2_PACKAGE_MESA3D_OPENGL_GLX),yy) > -MESA3D_DEPENDENCIES += xlib_libxshmfence > -endif > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) > endif > From yann.morin.1998 at free.fr Sun Jan 9 20:17:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:17:52 +0100 Subject: [Buildroot] [git commit] package/libvirt: bump to version 7.10.0 Message-ID: <20220109201729.CD73382B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5c69dc19fb0f6c7aabadb6700dac527304f54a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.com/libvirt/libvirt/-/blob/v7.10.0/NEWS.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libvirt/libvirt.hash | 2 +- package/libvirt/libvirt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.hash b/package/libvirt/libvirt.hash index e8cbb34e2a..de9ebff564 100644 --- a/package/libvirt/libvirt.hash +++ b/package/libvirt/libvirt.hash @@ -1,3 +1,3 @@ # locally computed -sha256 1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2 libvirt-7.7.0.tar.xz +sha256 cb318014af097327928c6e3d72922e3be02a3e6401247b2aa52d9ab8e0b480f9 libvirt-7.10.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 816bb0760d..7b0ed5e52e 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVIRT_VERSION = 7.7.0 +LIBVIRT_VERSION = 7.10.0 LIBVIRT_SITE = https://libvirt.org/sources LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Sun Jan 9 20:24:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:24:19 +0100 Subject: [Buildroot] [PATCH 1/3] package/libvirt: fix ssh2 option In-Reply-To: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Message-ID: <20220109202419.GF1477939@scaer> Fabrice, All, On 2022-01-09 21:00 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since commit > fbf25acfbfd5a73b3560918bea081768abbe5723: > > output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Series of 3 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libvirt/libvirt.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk > index 41218c0e53..0c1ee82f43 100644 > --- a/package/libvirt/libvirt.mk > +++ b/package/libvirt/libvirt.mk > @@ -220,10 +220,10 @@ LIBVIRT_CONF_OPTS += -Dsasl=disabled > endif > > ifeq ($(BR2_PACKAGE_LIBSSH2),y) > -LIBVIRT_CONF_OPTS += -Dssh2=enabled > +LIBVIRT_CONF_OPTS += -Dlibssh2=enabled > LIBVIRT_DEPENDENCIES += libssh2 > else > -LIBVIRT_CONF_OPTS += -Dssh2=disabled > +LIBVIRT_CONF_OPTS += -Dlibssh2=disabled > endif > > ifeq ($(BR2_PACKAGE_LIBVIRT_LXC),y) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Jan 9 20:25:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 21:25:16 +0100 Subject: [Buildroot] [git commit] package/mesa3d: fix gbm config warning Message-ID: <20220109201912.7439582B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69d5165bc44276e580690dad234abe9a4298f3b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes for the following defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y this warning: WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y]) Selected by [y]: - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_MESA3D_GBM Depends on [n]: BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] && (BR2_PACKAGE_MESA3D_DRI_DRIVER [=n] || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER [=n] && BR2_PACKAGE_MESA3D_OPENGL_EGL [=y]) Selected by [y]: - BR2_PACKAGE_MESA3D_OPENGL_EGL [=y] && BR2_PACKAGE_MESA3D [=y] && BR2_PACKAGE_MESA3D_DRIVER [=y] as BR2_PACKAGE_MESA3D_VULKAN_DRIVER selects BR2_PACKAGE_MESA3D_DRIVER which enables possible selection of BR2_PACKAGE_MESA3D_OPENGL_EGL selecting BR2_PACKAGE_MESA3D_GBM. Selecting EGL with only a vulkan driver selected gives the following configure failure: .../build/mesa3d-20.3.2/meson.build:424:4: ERROR: Problem encountered: EGL requires dri Note dri means here an dri or gallium driver (see meson.build and look for with_dri). Signed-off-by: Peter Seiderer [Arnout: convert if to depends] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7cf5c26227..e41da562dc 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -432,6 +432,7 @@ comment "OpenGL GLX support needs X11" config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_HAS_LIBEGL_WAYLAND From arnout at mind.be Sun Jan 9 20:29:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 21:29:31 +0100 Subject: [Buildroot] [git commit] package/vulkan-headers: new package Message-ID: <20220109202417.2D2F282AB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb588f078045082e48ebcf8e62f486888ad2956b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer [Arnout: update to 1.2.203] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/vulkan-headers/Config.in | 7 +++++++ package/vulkan-headers/vulkan-headers.hash | 3 +++ package/vulkan-headers/vulkan-headers.mk | 13 +++++++++++++ 4 files changed, 24 insertions(+) diff --git a/package/Config.in b/package/Config.in index edae7e4f62..5e01187b83 100644 --- a/package/Config.in +++ b/package/Config.in @@ -353,6 +353,7 @@ comment "Graphic libraries" source "package/sdl2_net/Config.in" source "package/sdl2_ttf/Config.in" source "package/tk/Config.in" + source "package/vulkan-headers/Config.in" comment "Other GUIs" source "package/qt5/Config.in" diff --git a/package/vulkan-headers/Config.in b/package/vulkan-headers/Config.in new file mode 100644 index 0000000000..c0fc8f20b0 --- /dev/null +++ b/package/vulkan-headers/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_VULKAN_HEADERS + bool "vulkan-headers" + help + The Khronos official Vulkan header files and API + registry. + + https://github.com/KhronosGroup/Vulkan-Headers diff --git a/package/vulkan-headers/vulkan-headers.hash b/package/vulkan-headers/vulkan-headers.hash new file mode 100644 index 0000000000..c43736405c --- /dev/null +++ b/package/vulkan-headers/vulkan-headers.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7239108c372f1fbe365bd8d1610ca2bb4e72b73b2151f2551bf9df54dd539639 vulkan-headers-1.2.203.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/vulkan-headers/vulkan-headers.mk b/package/vulkan-headers/vulkan-headers.mk new file mode 100644 index 0000000000..13cae1e685 --- /dev/null +++ b/package/vulkan-headers/vulkan-headers.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# vulkan-headers +# +################################################################################ + +VULKAN_HEADERS_VERSION = 1.2.203 +VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,v$(VULKAN_HEADERS_VERSION)) +VULKAN_HEADERS_LICENSE = Apache-2.0 +VULKAN_HEADERS_LICENSE_FILES = LICENSE.txt +VULKAN_HEADERS_INSTALL_STAGING = YES + +$(eval $(cmake-package)) From arnout at mind.be Sun Jan 9 20:30:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 21:30:35 +0100 Subject: [Buildroot] [RFC v2 05/12] package/vulkan-headers: new package In-Reply-To: <20210110222833.26301-6-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-6-ps.report@gmx.net> Message-ID: On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - fix license SPDX (Yann E. MORIN) > --- > package/Config.in | 1 + > package/vulkan-headers/Config.in | 7 +++++++ > package/vulkan-headers/vulkan-headers.hash | 3 +++ > package/vulkan-headers/vulkan-headers.mk | 13 +++++++++++++ > 4 files changed, 24 insertions(+) > create mode 100644 package/vulkan-headers/Config.in > create mode 100644 package/vulkan-headers/vulkan-headers.hash > create mode 100644 package/vulkan-headers/vulkan-headers.mk > > diff --git a/package/Config.in b/package/Config.in > index 9ed02ec890..9a91e6324c 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -338,6 +338,7 @@ comment "Graphic libraries" > source "package/sdl2_net/Config.in" > source "package/sdl2_ttf/Config.in" > source "package/tk/Config.in" > + source "package/vulkan-headers/Config.in" > > comment "Other GUIs" > source "package/qt5/Config.in" > diff --git a/package/vulkan-headers/Config.in b/package/vulkan-headers/Config.in > new file mode 100644 > index 0000000000..c0fc8f20b0 > --- /dev/null > +++ b/package/vulkan-headers/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_VULKAN_HEADERS > + bool "vulkan-headers" > + help > + The Khronos official Vulkan header files and API > + registry. > + > + https://github.com/KhronosGroup/Vulkan-Headers > diff --git a/package/vulkan-headers/vulkan-headers.hash b/package/vulkan-headers/vulkan-headers.hash > new file mode 100644 > index 0000000000..678a38e0d4 > --- /dev/null > +++ b/package/vulkan-headers/vulkan-headers.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 3f9435a93ba13d94d0c3265a47e0436579e46bb9ca085e9b16a753458e4d79d2 vulkan-headers-1.2.165.tar.gz > +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt > diff --git a/package/vulkan-headers/vulkan-headers.mk b/package/vulkan-headers/vulkan-headers.mk > new file mode 100644 > index 0000000000..48d390a581 > --- /dev/null > +++ b/package/vulkan-headers/vulkan-headers.mk > @@ -0,0 +1,13 @@ > +################################################################################ > +# > +# vulkan-headers > +# > +################################################################################ > + > +VULKAN_HEADERS_VERSION = 1.2.165 There's a 1.2.203 now, so I bumped to that version and applied to master, thanks. Regards, Arnout > +VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,v$(VULKAN_HEADERS_VERSION)) > +VULKAN_HEADERS_LICENSE = Apache-2.0 > +VULKAN_HEADERS_LICENSE_FILES = LICENSE.txt > +VULKAN_HEADERS_INSTALL_STAGING = YES > + > +$(eval $(cmake-package)) > From nolange79 at gmail.com Sun Jan 9 20:37:53 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 21:37:53 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/systemd: adopt odering in nsswitch to newer versions In-Reply-To: References: <20211203223127.274985-1-nolange79@gmail.com> <20211203223127.274985-3-nolange79@gmail.com> Message-ID: Am So., 9. Jan. 2022 um 13:55 Uhr schrieb Arnout Vandecappelle : > > > > On 03/12/2021 23:31, Norbert Lange wrote: > > This modifies the order of the nss modules, reflecting the current > > state of the documentation. > > > > nss-mymachines lost support for resolution of users and groups, > > and now only does resolution of hostnames. Changed in v246. > > > > Multiple changes in regards to nss-myhostname now recommend placement > > after nss-files and before nss-dns. See commits ce266330, f918c67. > > > > nss-resolve handles the nss-files logic itself, and its suggested to > > move in front of nss-files. Changed in v249. > > > > Signed-off-by: Norbert Lange > > This patch was superseded by [1], which is marked as v2 just like this patch. > I hope you understand that this is a little confusing for the maintainers (or > for anyone reviewing it). Yeah sorry, still got my troubles with the mailing list conventions. > > If you want to make life easier for use, please: > > - Re-post the entire series when one patch changes. > > - Make sure you include a patch changelog (you do that, I'm just saying it here > for completeness). Patches which haven't changed can have a "No changes" > version, but personally I don't care too much about that (it's implied by the > fact that there is a patch changelog but this particular version is not > included). That saves a bit of time during the rebase since you don't have to > reword every commit. ok, so far I thought I should not change the version unless the commit changed. > > - Mark the old series as Superseded in patchwork. When you create an account, > you can always update your own patches. > > I applied the series (including the [1]) to master. There's one comment I'll > post separately. > > Regards, > Arnout > > [1] > https://patchwork.ozlabs.org/project/buildroot/patch/20211203230919.683527-1-nolange79 at gmail.com/ > > > > > --- > > package/systemd/systemd.mk | 8 +++----- > > 1 file changed, 3 insertions(+), 5 deletions(-) > > > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index 373e5c82bb..16202d4ac9 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -563,13 +563,11 @@ define SYSTEMD_INSTALL_NSSCONFIG_HOOK > > -e '/^gshadow:/ {/systemd/! s/$$/ systemd/}' \ > > $(if $(BR2_PACKAGE_SYSTEMD_RESOLVED), \ > > -e '/^hosts:/ s/[[:space:]]*mymachines//' \ > > - -e '/^hosts:/ {/resolve/! s/files/files resolve [!UNAVAIL=return]/}' ) \ > > + -e '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' ) \ > > $(if $(BR2_PACKAGE_SYSTEMD_MYHOSTNAME), \ > > - -e '/^hosts:/ {/myhostname/! s/$$/ myhostname/}' ) \ > > + -e '/^hosts:/ {/myhostname/! s/files/files myhostname/}' ) \ > > $(if $(BR2_PACKAGE_SYSTEMD_MACHINED), \ > > - -e '/^passwd:/ {/mymachines/! s/files/files mymachines/}' \ > > - -e '/^group:/ {/mymachines/! s/files/files [SUCCESS=merge] mymachines/}' \ > > - -e '/^hosts:/ {/mymachines/! s/files/files mymachines/}' ) \ > > + -e '/^hosts:/ {/mymachines/! s/^\(hosts:[[:space:]]*\)/\1 mymachines/}' ) \ > > $(TARGET_DIR)/etc/nsswitch.conf > > endef > > > > From yann.morin.1998 at free.fr Sun Jan 9 20:37:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:37:54 +0100 Subject: [Buildroot] [git commit] package/avrdude: bump to version 6.4 Message-ID: <20220109203223.54E6E82156@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7f3b75d59bd3ae480fe99fc435ae0c715f9f204 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The project moved to GitHub, hence change the download location. Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- package/avrdude/avrdude.hash | 4 ++-- package/avrdude/avrdude.mk | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index ec43355451..1c7758afcd 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a09913450c6457c3fe8d43d5141de579d4e57d67e593e7399a4cd3768cc60f9 avrdude-r1450-br2.tar.gz -sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 avrdude/COPYING +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz +sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index ae623a7929..5bbbc4e8c2 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,13 +4,12 @@ # ################################################################################ -AVRDUDE_VERSION = r1450 -AVRDUDE_SITE_METHOD = svn -AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk +AVRDUDE_VERSION = v6.4 +AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ -AVRDUDE_LICENSE_FILES = avrdude/COPYING -AVRDUDE_SUBDIR = avrdude -# Sources coming from svn, without generated configure and Makefile.in +AVRDUDE_LICENSE_FILES = COPYING + +# Sources coming from git, without generated configure and Makefile.in # files. AVRDUDE_AUTORECONF = YES AVRDUDE_CONF_OPTS = --enable-linuxgpio From yann.morin.1998 at free.fr Sun Jan 9 20:39:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:39:16 +0100 Subject: [Buildroot] [PATCH] package/avrdude: bump to version 6.4 In-Reply-To: <20220109140421.27820-1-yegorslists@googlemail.com> References: <20220109140421.27820-1-yegorslists@googlemail.com> Message-ID: <20220109203916.GG1477939@scaer> Yegor, All, On 2022-01-09 15:04 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > The project moved to GitHub, hence change the download location. > > Signed-off-by: Yegor Yefremov Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/avrdude/avrdude.hash | 4 ++-- > package/avrdude/avrdude.mk | 11 +++++------ > 2 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash > index ec43355451..1c7758afcd 100644 > --- a/package/avrdude/avrdude.hash > +++ b/package/avrdude/avrdude.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 2a09913450c6457c3fe8d43d5141de579d4e57d67e593e7399a4cd3768cc60f9 avrdude-r1450-br2.tar.gz > -sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 avrdude/COPYING > +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz > +sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index ae623a7929..5bbbc4e8c2 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -4,13 +4,12 @@ > # > ################################################################################ > > -AVRDUDE_VERSION = r1450 > -AVRDUDE_SITE_METHOD = svn > -AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk > +AVRDUDE_VERSION = v6.4 > +AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) > AVRDUDE_LICENSE = GPL-2.0+ > -AVRDUDE_LICENSE_FILES = avrdude/COPYING > -AVRDUDE_SUBDIR = avrdude > -# Sources coming from svn, without generated configure and Makefile.in > +AVRDUDE_LICENSE_FILES = COPYING > + > +# Sources coming from git, without generated configure and Makefile.in > # files. > AVRDUDE_AUTORECONF = YES > AVRDUDE_CONF_OPTS = --enable-linuxgpio > -- > 2.17.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 20:47:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:47:19 +0100 Subject: [Buildroot] [git commit] package/libvirt: libvirtd needs C++ for nmap-ncat Message-ID: <20220109204212.4FD7E82984@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dff1be05e906f5c3cfd56ebc1458579635b4ca7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] Selected by [y]: - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: C++ only needed without NETCAT_OPENBSD] Signed-off-by: Yann E. MORIN --- package/libvirt/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index e75f1cf15f..103d1b9543 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,6 +44,7 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y + depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES @@ -57,6 +58,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. +comment "libvirtd needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD + # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON From yann.morin.1998 at free.fr Sun Jan 9 20:48:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:48:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: libvirtd needs C++ In-Reply-To: <20220109202003.3338357-1-fontaine.fabrice@gmail.com> References: <20220109202003.3338357-1-fontaine.fabrice@gmail.com> Message-ID: <20220109204853.GH1477939@scaer> Fabrice, All, You little joker, sending a fix right when I was applying your bump... ;-) On 2022-01-09 21:20 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since commit > fbf25acfbfd5a73b3560918bea081768abbe5723: > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP > Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] > Selected by [y]: > - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/libvirt/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in > index a35295bc97..d7ca5f8db5 100644 > --- a/package/libvirt/Config.in > +++ b/package/libvirt/Config.in > @@ -37,6 +37,7 @@ if BR2_PACKAGE_LIBVIRT > config BR2_PACKAGE_LIBVIRT_DAEMON > bool "libvirtd" > default y > + depends on BR2_INSTALL_LIBSTDCPP # nmap In fact, the requirement on C++ is due to nmap-ncat, which is enabled only if netcat-openbsd is not available, so I relaxed the requirement accordingly. Applied to master, thanks. Regards, Yann E. MORIN. > select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > select BR2_PACKAGE_DNSMASQ > select BR2_PACKAGE_EBTABLES > @@ -50,6 +51,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON > Build the libvirt daemon (libvirtd) otherwise build only the > utility programs. > > +comment "libvirtd needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > + > # Stateful drivers are useful only when building the daemon. > if BR2_PACKAGE_LIBVIRT_DAEMON > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 20:53:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 21:53:40 +0100 Subject: [Buildroot] [git commit] package/gtest: host-gtest install like a normal cmake package Message-ID: <20220109205306.8D25B82B94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0f9e2447d57194f0b02edb93cd16a677ebb326c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, host-gtest does not actually build and install gtest libraries or header files; it just installs the gmock_gen stuff. Host gtest can however be used by packages to build and run their unit-tests natively. This patch will now build and install gtest to the host like a normal cmake package. To limit the disruption for existing users of host-gtest, the gmock_gen stuff is still installed (as a post-install hook now). Signed-off-by: Paul Soucy Signed-off-by: Yann E. MORIN --- package/gtest/gtest.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 6447954e36..673e626c45 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -52,14 +52,14 @@ else GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF endif -define HOST_GTEST_INSTALL_CMDS +define HOST_GTEST_POST_INSTALL_PYTHON $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ $(HOST_DIR)/bin/gmock_gen cp -rp $(@D)/googlemock/scripts/generator/cpp \ $(HOST_GTEST_GMOCK_PYTHONPATH) endef +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON + $(eval $(cmake-package)) -# The host package does not build anything, just installs gmock_gen stuff, so -# it does not need to be a host-cmake-package. -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From yegorslists at googlemail.com Sun Jan 9 20:59:46 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Sun, 9 Jan 2022 21:59:46 +0100 Subject: [Buildroot] [PATCH] package/avrdude: add support for hidapi Message-ID: <20220109205946.14456-1-yegorslists@googlemail.com> From: Yegor Yefremov If BR2_PACKAGE_HIDAPI is selected, add it to avrdude build dependencies. Signed-off-by: Yegor Yefremov --- package/avrdude/avrdude.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 5bbbc4e8c2..63cc3bbc7e 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -28,6 +28,10 @@ else ifeq ($(BR2_PACKAGE_LIBFTDI),y) AVRDUDE_DEPENDENCIES += libftdi endif +ifeq ($(BR2_PACKAGE_HIDAPI),y) +AVRDUDE_DEPENDENCIES += hidapi +endif + # if /etc/avrdude.conf exists, the installation process creates a # backup file, which we do not want in the context of Buildroot. define AVRDUDE_REMOVE_BACKUP_FILE -- 2.17.0 From yann.morin.1998 at free.fr Sun Jan 9 21:00:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 22:00:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package In-Reply-To: <20201216174404.47363-1-paul.soucy@sense.com> References: <20201216174404.47363-1-paul.soucy@sense.com> Message-ID: <20220109210020.GI1477939@scaer> Paul, All, Sorry for the long delay... On 2020-12-16 12:44 -0500, Paul Soucy spake thusly: > host-gtest does not actually build and install gtest libraries or header files, it just installs the gmock_gen stuff. This patch will now build and install gtest to the host like a normal cmake package. I rewrapped the commit log, and slightly extended it with the information you rpovided elsewhere in the thread. > Signed-off-by: Paul Soucy > --- > package/gtest/gtest.mk | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk > index 7f967b8bfb..f35ae63383 100644 > --- a/package/gtest/gtest.mk > +++ b/package/gtest/gtest.mk > @@ -88,14 +88,15 @@ else > GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF > endif > > -define HOST_GTEST_INSTALL_CMDS > +define HOST_GTEST_POST_INSTALL_PYTHON > $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ > $(HOST_DIR)/bin/gmock_gen > cp -rp $(@D)/googlemock/scripts/generator/cpp \ > $(HOST_GTEST_GMOCK_PYTHONPATH) > endef > > +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON > + > + $ make check-package package/gtest/gtest.mk:64: consecutive empty lines Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > $(eval $(cmake-package)) > -# The host package does not build anything, just installs gmock_gen stuff, so > -# it does not need to be a host-cmake-package. > -$(eval $(host-generic-package)) > +$(eval $(host-cmake-package)) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Jan 9 21:00:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:00:31 +0100 Subject: [Buildroot] [RFC v2 06/12] package/vulkan-loader: new package In-Reply-To: <20210110222833.26301-7-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-7-ps.report@gmx.net> Message-ID: <0945e7b9-2741-2ecc-1ad5-8fbe54c46da5@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - fix license SPDX (Yann E. MORIN) > - add sob line > --- > package/Config.in | 1 + > .../0001-loader-fix-asm_offset-call.patch | 32 +++++++++++++++++++ > package/vulkan-loader/Config.in | 14 ++++++++ > package/vulkan-loader/vulkan-loader.hash | 3 ++ > package/vulkan-loader/vulkan-loader.mk | 22 +++++++++++++ > 5 files changed, 72 insertions(+) > create mode 100644 package/vulkan-loader/0001-loader-fix-asm_offset-call.patch > create mode 100644 package/vulkan-loader/Config.in > create mode 100644 package/vulkan-loader/vulkan-loader.hash > create mode 100644 package/vulkan-loader/vulkan-loader.mk > > diff --git a/package/Config.in b/package/Config.in > index 9a91e6324c..86676b57ef 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -339,6 +339,7 @@ comment "Graphic libraries" > source "package/sdl2_ttf/Config.in" > source "package/tk/Config.in" > source "package/vulkan-headers/Config.in" > + source "package/vulkan-loader/Config.in" > > comment "Other GUIs" > source "package/qt5/Config.in" > diff --git a/package/vulkan-loader/0001-loader-fix-asm_offset-call.patch b/package/vulkan-loader/0001-loader-fix-asm_offset-call.patch > new file mode 100644 > index 0000000000..d62b9390d8 > --- /dev/null > +++ b/package/vulkan-loader/0001-loader-fix-asm_offset-call.patch > @@ -0,0 +1,32 @@ > +From 45098898f7fa25dfd12d2c4f1aed889f678aa870 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Wed, 23 Dec 2020 14:46:02 +0100 > +Subject: [PATCH] loader: fix asm_offset call > + > +Disable assembler usage (not cross compile capable): > + > + [ 21%] Generating gen_defines.asm > + /bin/sh: asm_offset: command not found > + make[3]: *** [loader/CMakeFiles/loader_asm_gen_files.dir/build.make:80: loader/gen_defines.asm] Error 127 > + > +Signed-off-by: Peter Seiderer > +--- > + loader/CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt > +index ba9f460f1..dbebfb058 100644 > +--- a/loader/CMakeLists.txt > ++++ b/loader/CMakeLists.txt > +@@ -187,7 +187,7 @@ else(UNIX AND NOT APPLE) # i.e.: Linux > + endif() > + set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) > + try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/asm_test.S) > +- if(ASSEMBLER_WORKS) > ++ if(FALSE) This doesn't look OK to me. With the assembler disabled, you get this warning: Note that this may be unsafe, as the C code requires tail-call optimizations to remove the stack frame for certain calls. If the compiler does not do this, then unknown device extensions will suffer from a corrupted stack. Since CMake doesn't make mixed host and target compilation possible, I see two solutions. 1. A simple solution that is a bit of a hack. In a _PRE_BUILD_HOOK, manually build the asm_offset offset program. It actually needs the Vulkan headers, so we also need host-vulkan-headers. We would normally use host-vulkan-loader to build the program, but in this case it's so simple that manual compilation is much easier. Install the program in the source directory where it's expected. Most likely it will already work like that because the program is more recent than the source. If not, solution 2 is needed. 2. Add host-vulkan-loader to build asm_offset. Since we only need asm_offset, it's easier to use a generic-package rather than cmake-package - especially since the program doesn't get installed by cmake anyway. In this case, you'll need to add a new variable to CMakeLists.txt that allows to pass the path to an external asm_offset and point that to HOST_DIR. In addition, the loader only supports aarch64 and x86, so I think the whole package should depend on that. I've marked as Changes Requested. > + set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas.S) > + add_executable(asm_offset asm_offset.c) > + target_link_libraries(asm_offset Vulkan::Headers) > +-- > +2.29.2 > + > diff --git a/package/vulkan-loader/Config.in b/package/vulkan-loader/Config.in > new file mode 100644 > index 0000000000..9c215dc9ce > --- /dev/null > +++ b/package/vulkan-loader/Config.in > @@ -0,0 +1,14 @@ > +config BR2_PACKAGE_VULKAN_LOADER > + bool "vulkan-loader" > + depends on BR2_INSTALL_LIBSTDCPP AFAICS C++ is only needed for tests, so you could patch CMakeLists.txt with enable_language(C) and only add enable_language(CXX) if BUILD_TESTS is ON. Regards, Arnout > + depends on !BR2_STATIC_LIBS # dlfcn.h > + depends on BR2_TOOLCHAIN_HAS_THREADS > + select BR2_PACKAGE_VULKAN_HEADERS > + help > + The Khronos official Vulkan ICD desktop loader. > + > + https://github.com/KhronosGroup/Vulkan-Loader > + > +comment "vulkan-loader needs a toolchain w/ C++, dynamic library, threads" > + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/vulkan-loader/vulkan-loader.hash b/package/vulkan-loader/vulkan-loader.hash > new file mode 100644 > index 0000000000..c70ed90be6 > --- /dev/null > +++ b/package/vulkan-loader/vulkan-loader.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 e582dce35051a34af82db2a8fcd38fbc5837b4506e76e6cda685dca02dee01c7 vulkan-loader-1.2.162.tar.gz > +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece LICENSE.txt > diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk > new file mode 100644 > index 0000000000..9c9ccb2458 > --- /dev/null > +++ b/package/vulkan-loader/vulkan-loader.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# vulkan-loader > +# > +################################################################################ > + > +VULKAN_LOADER_VERSION = 1.2.162 > +VULKAN_LOADER_SITE = $(call github,KhronosGroup,Vulkan-Loader,v$(VULKAN_LOADER_VERSION)) > +VULKAN_LOADER_LICENSE = Apache-2.0 > +VULKAN_LOADER_LICENSE_FILES = LICENSE.txt > +VULKAN_LOADER_INSTALL_STAGING = YES > + > +VULKAN_LOADER_DEPENDENCIES = vulkan-headers > + > +VULKAN_LOADER_CONF_OPTS += \ > + -DBUILD_WSI_XCB_SUPPORT=OFF \ > + -DBUILD_WSI_XLIB_SUPPORT=OFF \ > + -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ > + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > + -DUSE_CCACHE=OFF > + > +$(eval $(cmake-package)) > From nolange79 at gmail.com Sun Jan 9 21:01:42 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 22:01:42 +0100 Subject: [Buildroot] [PATCH v3] package/systemd: invoke systemd-tmpfilesd on final image In-Reply-To: References: <20220109110736.3963-1-nolange79@gmail.com> Message-ID: Am So., 9. Jan. 2022 um 15:49 Uhr schrieb Arnout Vandecappelle : > > Hi Norbert, > > Applied to master, thanks. I have a bunch of stylistic remarks, but it's > nitpicky so I didn't apply them. The only thing I did is the indentation (4 > spaces in shell scripts). > > > On 09/01/2022 12:07, Norbert Lange wrote: > [snip] > > diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/systemd/fakeroot_tmpfiles.sh > > new file mode 100644 > > index 0000000000..7e9b02cc0a > > --- /dev/null > > +++ b/package/systemd/fakeroot_tmpfiles.sh > > @@ -0,0 +1,57 @@ > > +#!/bin/sh > > +# > > +# The systemd-tmpfiles has the ability to grab information > > +# from the filesystem (instead from the running system). > > +# > > +# However there are a few specifiers that *always* will grab > > +# information from the running system examples are %a, %b, %m, %H > > +# (Architecture, Boot UUID, Machine UUID, Hostname). > > +# > > +# See [1] for historic information. > > +# > > +# This script will (conservatively) skip tmpfiles lines that have > > +# such an specifier to prevent leaking host information. > > Instead of skipping, perhaps we should terminate with an error? Or would that > mean that it never passes with current systemd? Nope, there are for example directories created for each boot with an boot uuid, those should be skipped. systemd-tmpfilesd will create those on the real boot, so its no error, just something you cant do ahead of time. > > > +# > > +# shell expansion is critical to be POSIX compliant, > > +# this script wont work with zsh in its default mode for example. > > I don't get this... If the script doesn't work with /bin/sh == zsh, maybe use > /usr/bin/env bash instead? (We already check for bash in dependencies.sh so it's > fine to require it.) Sorry, worded badly. the script should run with any shell, as they will use a POSIX compliant mode if run as /bin/sh. You cant copy paste the lines into a zsh terminal, as then it would not work due to some differences in parameter expansion. > > > +# > > +# The script takes several measures to handle more complex stuff > > +# like passing this correctly: > > +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n > > +# > > +# [1] - https://github.com/systemd/systemd/pull/16187 > > The end of that is that Lennart merged something which does (AFAIU) part of > what you need done. Would it be possible to rebase your changes on top of that? That's more or less what I did with v3 of the buildroot patch. Lennart did his own Implementation of handling a staged rootfs. The things he did not include, he did so on purpose (as noted in the PR). Notably, you will end up creating some directories containing the boot UUID of your running system. Filtering out the offending lines seems to me the smallest amount of pain. > > > + > > +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || > > + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles > > + > > +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || > > I don't understand why you need "${1-}" and not simply "$1". In this context > (with the quotes around it) there is no difference at all between the two, right? Yes, I typically write my scripts to not fault on "set -e". No difference if this mode is not enabled. > > Also, I prefer > > ROOTFS="$1" > > and use $ROOTFS further down; IMHO that's more readable. Yeah, its a reasonably simple script tho ;) > > > > + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } > > + > > +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | > > + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | > > + while read -r line; do > > + # it is allowed to use quotes around arguments, > > + # so let the shell pack the arguments > > + eval "set -- $line" > > + > > + # dont output warnings for directories we dont process > > + [ "${2#/dev}" = "${2}" ] && [ "${2#/proc}" = "${2}" ] && > > + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && > > + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || > > + continue > > + > > + # blank out all specs that are ok to use, > > + # test if some remain. (Specs up to date with v250) > > + if echo "$2 ${7-}" | sed -e 's,%[%BCEgGhLMosStTuUVwW],,g' | grep -v -q '%'; then > > + # no "bad" specifiers, pass the line unmodified > > + eval "printf '%s\n' '$line'" > > + else > > + # warn > > + eval "printf 'ignored spec: %s\n' '$line' 1>&2" > > + fi > > + done | > > +\ > > +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ > > + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ > > + --exclude-prefix=/tmp --exclude-prefix=/mnt \ > > All these excludes are already excluded above from the "directories we don't > process" block, so maybe it can be removed? Yep. doesn't hurt having them tho > > OTOH, if we can later get upstream to no longer have those ignored specs, we > can remove the preprocessing and it's handy to have the exclude statements already. upstream does just do the wrong thing *for us* on those specs and its unlikely to change, the way it is now makes sense for running in containers. > Anyway, I added a comment to the comment block in the beginning to explain why > they're excluded: > > # tmpfs directories (/tmp, /proc, ...) are skipped since they're not > # relevant for the rootfs image. > > > + - > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index 7bf8018438..e136229c8e 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -709,10 +709,15 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > endef > > SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE > > > > +define SYSTEMD_CREATE_TMPFILES_HOOK > > + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ > > + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) > > Since the script has a shebang line, I remove the /bin/sh here and made it > executable. Sure > > > +endef > > + > > define SYSTEMD_PRESET_ALL > > $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all > > endef > > -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL > > +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL > > We normally add the hook immediately after the definition of the hook, so I > changed that as well. Ok > Regards, > Arnout > > PS There's no need to keep Maxime in Cc, he's no longer involved in Buildroot > at all. > > > > > SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) > > SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) > > @@ -783,7 +788,7 @@ HOST_SYSTEMD_CONF_OPTS = \ > > -Dvconsole=false \ > > -Dquotacheck=false \ > > -Dsysusers=false \ > > - -Dtmpfiles=false \ > > + -Dtmpfiles=true \ > > -Dimportd=false \ > > -Dhwdb=false \ > > -Drfkill=false \ > > Maybe its easier with an example, these are the lines I get when running buildroot: PATH="/tmp/ZBuild/host/bin:/tmp/ZBuild/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" FAKEROOTDONTTRYCHOWN=1 /tmp/ZBuild/host/bin/fakeroot -- /tmp/ZBuild/build/buildroot-fs/tar/fakeroot rootdir=/tmp/ZBuild/build/buildroot-fs/tar/target table='/tmp/ZBuild/build/buildroot-fs/full_devices_table.txt' ignored spec: h /var/log/journal/%m - - - - +C ignored spec: x /var/tmp/systemd-private-%b-* ignored spec: X /var/tmp/systemd-private-%b-*/tmp ignored spec: x /var/lib/systemd/coredump/.#core*.%b* ignored spec: z /var/log/journal/%m 2755 root systemd-journal - - ignored spec: z /var/log/journal/%m/system.journal 0640 root systemd-journal - - Norbert From arnout at mind.be Sun Jan 9 21:02:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:02:38 +0100 Subject: [Buildroot] [RFC v2 07/12] package/vulkan-tools: new package In-Reply-To: <20210110222833.26301-8-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-8-ps.report@gmx.net> Message-ID: <249a1325-0fe2-0691-b599-950d839665d4@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Rest of the series is Changes Requested because it all depends on vulkan-loader. Regards, Arnout > --- > Changes v1 -> v2: > - fix license SPDX (Yann E. MORIN) > - disable ICD (as it is only a mock ICD for testing purpouse) > --- > package/Config.in | 1 + > package/vulkan-tools/Config.in | 17 +++++++++++++++++ > package/vulkan-tools/vulkan-tools.hash | 3 +++ > package/vulkan-tools/vulkan-tools.mk | 25 +++++++++++++++++++++++++ > 4 files changed, 46 insertions(+) > create mode 100644 package/vulkan-tools/Config.in > create mode 100644 package/vulkan-tools/vulkan-tools.hash > create mode 100644 package/vulkan-tools/vulkan-tools.mk > > diff --git a/package/Config.in b/package/Config.in > index 86676b57ef..b156d8de1a 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -340,6 +340,7 @@ comment "Graphic libraries" > source "package/tk/Config.in" > source "package/vulkan-headers/Config.in" > source "package/vulkan-loader/Config.in" > + source "package/vulkan-tools/Config.in" > > comment "Other GUIs" > source "package/qt5/Config.in" > diff --git a/package/vulkan-tools/Config.in b/package/vulkan-tools/Config.in > new file mode 100644 > index 0000000000..54fa539dab > --- /dev/null > +++ b/package/vulkan-tools/Config.in > @@ -0,0 +1,17 @@ > +config BR2_PACKAGE_VULKAN_TOOLS > + bool "vulkan-tools" > + depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader > + depends on !BR2_STATIC_LIBS # vullan-loader > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 > + depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader > + select BR2_PACKAGE_VULKAN_HEADERS > + select BR2_PACKAGE_VULKAN_LOADER > + > + help > + The Khronos official Vulkan Tools and Utilities. > + > + https://github.com/KhronosGroup/Vulkan-Tools > + > +comment "vulkan-tools needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.9" > + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/vulkan-tools/vulkan-tools.hash b/package/vulkan-tools/vulkan-tools.hash > new file mode 100644 > index 0000000000..a4cf97ab34 > --- /dev/null > +++ b/package/vulkan-tools/vulkan-tools.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 98a3a00471da65df833b4ffeb1ab29ec1d169d5feab54270cf4cd8f50f82e682 vulkan-tools-1.2.162.tar.gz > +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt > diff --git a/package/vulkan-tools/vulkan-tools.mk b/package/vulkan-tools/vulkan-tools.mk > new file mode 100644 > index 0000000000..129efddf3b > --- /dev/null > +++ b/package/vulkan-tools/vulkan-tools.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# vulkan-tools > +# > +################################################################################ > + > +VULKAN_TOOLS_VERSION = 1.2.162 > +VULKAN_TOOLS_SITE = $(call github,KhronosGroup,Vulkan-Tools,v$(VULKAN_TOOLS_VERSION)) > +VULKAN_TOOLS_LICENSE = Apache-2.0 > +VULKAN_TOOLS_LICENSE_FILES = LICENSE.txt > + > +VULKAN_TOOLS_DEPENDENCIES = vulkan-headers vulkan-loader > + > +VULKAN_TOOLS_CONF_OPTS += \ > + -DBUILD_CUBE=OFF \ > + -DBUILD_VULKANINFO=ON \ > + -DBUILD_ICD=OFF \ > + -DINSTALL_ICD=OFF \ > + -DBUILD_WSI_XCB_SUPPORT=OFF \ > + -DBUILD_WSI_XLIB_SUPPORT=OFF \ > + -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ > + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > + -DUSE_CCACHE=OFF > + > +$(eval $(cmake-package)) > From romain.naour at smile.fr Sun Jan 9 21:06:07 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 22:06:07 +0100 Subject: [Buildroot] [PATCH v2] package/moby-buildkit: new package Message-ID: <20220109210607.2270978-1-romain.naour@smile.fr> From: Christian Stewart Signed-off-by: Christian Stewart [Romain: - remove host-pkgconf dependency - Add the license file hash - Fix the check-package warning in Config.in] Signed-off-by: Romain Naour --- The license file hash was a copy past error. The 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 belong to balena-engine package from [1] [1] https://git.buildroot.net/buildroot/commit/?id=cb0d87004c824dc6bb421fe8316428d51e1335bd --- package/Config.in | 1 + package/moby-buildkit/Config.in | 19 +++++++++++++++++++ package/moby-buildkit/moby-buildkit.hash | 3 +++ package/moby-buildkit/moby-buildkit.mk | 22 ++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 package/moby-buildkit/Config.in create mode 100644 package/moby-buildkit/moby-buildkit.hash create mode 100644 package/moby-buildkit/moby-buildkit.mk diff --git a/package/Config.in b/package/Config.in index edae7e4f62..7bf17f486e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2554,6 +2554,7 @@ menu "System tools" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" + source "package/moby-buildkit/Config.in" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in new file mode 100644 index 0000000000..93c852bcdb --- /dev/null +++ b/package/moby-buildkit/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_MOBY_BUILDKIT + bool "moby-buildkit" + 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 + depends on BR2_USE_MMU + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + help + BuildKit is a toolkit for converting source code to build + artifacts in an efficient, expressive and repeatable manner. + + https://github.com/moby/buildkit + +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" + 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 || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_USE_MMU diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash new file mode 100644 index 0000000000..3015e479f6 --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk new file mode 100644 index 0000000000..3f0df351ef --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# moby-buildkit +# +################################################################################ + +MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) +MOBY_BUILDKIT_LICENSE = Apache-2.0 +MOBY_BUILDKIT_LICENSE_FILES = LICENSE + +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit + +MOBY_BUILDKIT_TAGS = cgo +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd + +MOBY_BUILDKIT_LDFLAGS = \ + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" + +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) + +$(eval $(golang-package)) -- 2.31.1 From nolange79 at gmail.com Sun Jan 9 21:08:57 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 22:08:57 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/gcc: use binutils wrappers for target libs In-Reply-To: <20220109151653.GC1477939@scaer> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-2-nolange79@gmail.com> <20220109151653.GC1477939@scaer> Message-ID: Am So., 9. Jan. 2022 um 16:16 Uhr schrieb Yann E. MORIN : > > Nrobert, All, > > On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > > This will use gcc-ar, gcc-nm and gcc-ranlib instead of the > > normal binutils tools. The difference is that with the > > wrappers, gcc plugins will be automatically picked up, > > which might be necessary with some flags. > > > > Signed-off-by: Norbert Lange > > --- > > v1->v2: > > * Only set those wrappers if gc 4.7 or newer > > --- > > package/gcc/gcc.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > > index 114c2887a0..a24ffe3ee2 100644 > > --- a/package/gcc/gcc.mk > > +++ b/package/gcc/gcc.mk > > @@ -99,6 +99,9 @@ GCC_COMMON_TARGET_CFLAGS += -Wno-error > > endif > > > > # Propagate options used for target software building to GCC target libs > > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) > > +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib > > So we were a bit skeptical about this one. > > First, we believe that only the final gcc should be using those. Indeed, > we do not need much of the initial gcc, except libgcc.a, which anyway > gets overwitten by the final gcc, so we do not care that the libgcc.a is > built with LTO (and thus the gcc wrappers). > > Second, gcc initial is only used to build glibc, and as your patch 4 > states, glibc must not be built with LTO, we we also do not care that > the initial gcc uses its wrappers to build libgcc. > > Third, shouldn't we be using the tupple-prefixed wrappers? Or does it > just happens that gcc will internally add its build directory to PATH so > that it can find the un-prefixed just-built ones? > > For that last point, I added gcc-ar, gcc-nm, and gcc-ranlib in my PATH, > that are just simple wrapper scripts that trace their being called, and > then call to the actual gcca-r et al.: > > #!/bin/sh > me="${0}" > my_name="${0##*/}" > found=false > for i in $(which -a "${my_name}"); do > if [ "${i}" -ef "${me}" ]; then > found=true > elif ${found}; then > me="${i}" > fi > done > if ! ${found}; then > exit 42 > fi > printf "YEM: wrapped %s\n" "${me}" > exec "${me}" "${@}" > > Turns out that the 'YEM: wrapped' string occurs nowhere in the build > directory (so it does not end up in config.log or whatever), and it > does not even appear on the stdout/stderr either. > > So I am wondering how we can exercise these... Any hint? Can't tell anymore, I went to crosstool-ng for the compiler some time ago, so unlike my other patches I dont use them anymore. >From my memory, it affected some of the additional libs gcc builds, libstdc++, some sanitizers maybe. there was not absolute paths or tuples as the various stages should use the wrappers from the previous ones. I believe the final compiler ignores PATH and uses the stage2-compiler with abs path to build the included target libraries. I am just sure it was very deliberately done *this* way. Norbert From arnout at mind.be Sun Jan 9 21:31:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:31:43 +0100 Subject: [Buildroot] [RFC v2 09/12] package/qt5base: add vulkan option In-Reply-To: <20210110222833.26301-10-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-10-ps.report@gmx.net> Message-ID: <09e43668-2c6a-05c2-cb54-c2a2468f1ed8@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - no changes > > Notes: > - eglfs/vulkan is only implemented for eglfs_viv > (see stub implementation for QEglFSDeviceIntegration::createPlatformVulkanInstance() > in src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp and > real implementation for QEglFSVivIntegration::createPlatformVulkanInstance() > in src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp) > - or for xcb (see QXcbIntegration::createPlatformVulkanInstance() > in src/plugins/platforms/xcb/qxcbintegration.cpp) > --- > package/qt5/qt5base/Config.in | 11 +++++++++++ > package/qt5/qt5base/qt5base.mk | 7 +++++++ > 2 files changed, 18 insertions(+) > > diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in > index ee7c757c60..377a754f37 100644 > --- a/package/qt5/qt5base/Config.in > +++ b/package/qt5/qt5base/Config.in > @@ -175,6 +175,17 @@ config BR2_PACKAGE_QT5BASE_OPENGL_LIB > > endif > > +config BR2_PACKAGE_QT5BASE_VULKAN > + bool "Vulkan support" > + # all vulkan-loader introduced dependencies superseeded by qt5 own ones > + # depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader > + # depends on !BR2_STATIC_LIBS # vulkan-loader > + # depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader Just keep them, doesn't matter that qt5 already has them. Only if it becomes very complicated it's worth optimising it. However, shouldn't we have a virtual package to make sure there's also a vulkan provider, similar like we have for GL? Or isn't that needed because it's mediated through the loader library? It indeed doesn't look like Qt needs to link with the vulkan provider (i.e. mesa3d at this point). Regards, Arnout > + select BR2_PACKAGE_VULKAN_HEADERS > + select BR2_PACKAGE_VULKAN_LOADER > + help > + This option enables Vulkan support. > + > config BR2_PACKAGE_QT5BASE_LINUXFB > bool "linuxfb support" > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 84e9fa4edb..3755e306d1 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -196,6 +196,13 @@ else > QT5BASE_CONFIGURE_OPTS += -no-opengl > endif > > +ifeq ($(BR2_PACKAGE_QT5BASE_VULKAN),y) > +QT5BASE_CONFIGURE_OPTS += -feature-vulkan > +QT5BASE_DEPENDENCIES += vulkan-headers vulkan-loader > +else > +QT5BASE_CONFIGURE_OPTS += -no-feature-vulkan > +endif > + > QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) > QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) > > From arnout at mind.be Sun Jan 9 21:33:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:33:59 +0100 Subject: [Buildroot] [RFC v2 10/12] package/vulkan-loader: add XCB support In-Reply-To: <20210110222833.26301-11-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-11-ps.report@gmx.net> Message-ID: <08d28504-394a-9857-084b-b7cb107c87a8@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/vulkan-loader/Config.in | 12 ++++++++++++ > package/vulkan-loader/vulkan-loader.mk | 8 +++++++- > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/package/vulkan-loader/Config.in b/package/vulkan-loader/Config.in > index 9c215dc9ce..6ec4b13030 100644 > --- a/package/vulkan-loader/Config.in > +++ b/package/vulkan-loader/Config.in > @@ -9,6 +9,18 @@ config BR2_PACKAGE_VULKAN_LOADER > > https://github.com/KhronosGroup/Vulkan-Loader > > +if BR2_PACKAGE_VULKAN_LOADER > + > +config BR2_PACKAGE_VULKAN_LOADER_XCB > + bool "X.org XCB support" I don't think it makes much sense to make this a user-visible option. > + depends on BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_LIBXCB > + > +comment "X.org XCB support available if X.org is enabled" > + depends on !BR2_PACKAGE_XORG7 > + > +endif # BR2_PACKAGE_VULKAN_LOADER > + > comment "vulkan-loader needs a toolchain w/ C++, dynamic library, threads" > depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk > index 9c9ccb2458..f0c20f5687 100644 > --- a/package/vulkan-loader/vulkan-loader.mk > +++ b/package/vulkan-loader/vulkan-loader.mk > @@ -13,10 +13,16 @@ VULKAN_LOADER_INSTALL_STAGING = YES > VULKAN_LOADER_DEPENDENCIES = vulkan-headers > > VULKAN_LOADER_CONF_OPTS += \ > - -DBUILD_WSI_XCB_SUPPORT=OFF \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ > -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > -DUSE_CCACHE=OFF > > +ifeq ($(BR2_PACKAGE_VULKAN_LOADER_XCB),y) Just use BR2_PACKAGE_LIBXCB here. With that, this can be squashed in the patch that adds vulkan-loader (it's not complicated). Regards, Arnout > +VULKAN_LOADER_DEPENDENCIES += libxcb > +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON > +else > +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF > +endif > + > $(eval $(cmake-package)) > From arnout at mind.be Sun Jan 9 21:36:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:36:28 +0100 Subject: [Buildroot] [RFC v2 11/12] package/vulkan-tools: add XCB support In-Reply-To: <20210110222833.26301-12-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-12-ps.report@gmx.net> Message-ID: On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - new patch > --- > package/vulkan-tools/Config.in | 14 ++++++++++++++ > package/vulkan-tools/vulkan-tools.mk | 8 +++++++- > 2 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/package/vulkan-tools/Config.in b/package/vulkan-tools/Config.in > index 54fa539dab..14c4059074 100644 > --- a/package/vulkan-tools/Config.in > +++ b/package/vulkan-tools/Config.in > @@ -12,6 +12,20 @@ config BR2_PACKAGE_VULKAN_TOOLS > > https://github.com/KhronosGroup/Vulkan-Tools > > +if BR2_PACKAGE_VULKAN_TOOLS > + > +config BR2_PACKAGE_VULKAN_TOOLS_XCB > + bool "X.org XCB support" > + depends on BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBX11 > + select BR2_PACKAGE_LIBXCB > + select BR2_PACKAGE_VULKAN_LOADER_XCB > + > +comment "X.org XCB support available if X.org is enabled" > + depends on !BR2_PACKAGE_XORG7 > + > +endif # BR2_PACKAGE_VULKAN_TOOLS > + > comment "vulkan-tools needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.9" > depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/vulkan-tools/vulkan-tools.mk b/package/vulkan-tools/vulkan-tools.mk > index 129efddf3b..5b4d761ddb 100644 > --- a/package/vulkan-tools/vulkan-tools.mk > +++ b/package/vulkan-tools/vulkan-tools.mk > @@ -16,10 +16,16 @@ VULKAN_TOOLS_CONF_OPTS += \ > -DBUILD_VULKANINFO=ON \ > -DBUILD_ICD=OFF \ > -DINSTALL_ICD=OFF \ > - -DBUILD_WSI_XCB_SUPPORT=OFF \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ > -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > -DUSE_CCACHE=OFF > > +ifeq ($(BR2_PACKAGE_VULKAN_TOOLS_XCB),y) Same, BR2_PACKAGE_LIBXCB. > +VULKAN_TOOLS_DEPENDENCIES += libxcb xlib_libX11 Hm, maybe this should go together with BUILD_WSI_XLIB_SUPPORT ? Regards, Arnout > +VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON > +else > +VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF > +endif > + > $(eval $(cmake-package)) > From romain.naour at smile.fr Sun Jan 9 21:42:53 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 22:42:53 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org In-Reply-To: <20220109200806.GD1477939@scaer> References: <20220109151414.1908259-1-romain.naour@smile.fr> <20220109200806.GD1477939@scaer> Message-ID: <7c25f4d7-309c-6eb1-00de-552242a64a97@smile.fr> Hello Yann, All, Le 09/01/2022 ? 21:08, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-09 16:14 +0100, Romain Naour spake thusly: >> While packaging telegraf [1] the download step failed due to a checksum >> mismatch: >> >> go: downloading collectd.org v0.5.0 >> get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 >> verifying collectd.org at v0.5.0: checksum mismatch >> downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= >> go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= >> >> SECURITY ERROR >> This download does NOT match an earlier download recorded in go.sum. >> The bits may have been replaced on the origin server, or an attacker may >> have intercepted the download attempt. >> >> For more information, see 'go help module-auth'. >> >> go-collectd was bumped in telegraf since several releases (since v1.19.0) without >> any changes regarding the go-collectd hash. >> >> Some users reported an issue [3] when using "GOPROXY=direct" and used >> "GOPROXY=proxy.golang.org" as a workaround. > > I'll put down what we discussed on IRC: > > Unfortunately, there are cases the other way around: using a proxy broke > the vendoring, while a direct connection solved it. So we won't be able > to satisfy both cases. Sure, at least I posted the workaround on the ml. > > Furthermore, relying on a proxy having a cached archive risks breaking > in the future anyway, as that archived may get eventually get evicted > out of the cache of the proxy. Or the proxy may disapear in the future, > or whatever. > > In any case, a bad hash is most probably due to one of the following > issues: > > - upstream messed up when adding the dependency and incorrectly copied > the hash (but that should not happen as adding a dependency is > supposed to be done with go tools already), > > - the upstream of the dependency changed their release (i.e. they > re-tagged a release) > > - the go proxy is caching an incorrect archive (e.g. a partial > download, or an older archive, or is malicious, or whatever). > > In any case, we can't do anything about it, and the upstream of the > project has to fix the mess. > > So, from my point of view, this is a NACK on this patch. I created an issue on Telegraf github: https://github.com/influxdata/telegraf/issues/10408 Best regards, Romain > > Regards, > Yann E. MORIN. > >> [1] https://github.com/influxdata/telegraf/ >> [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e >> [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 >> >> Signed-off-by: Romain Naour >> Cc: Thomas Petazzoni >> --- >> package/pkg-golang.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk >> index 35bcb1673b..e23778d96a 100644 >> --- a/package/pkg-golang.mk >> +++ b/package/pkg-golang.mk >> @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD >> $(2)_DOWNLOAD_POST_PROCESS = go >> $(2)_DL_ENV = \ >> $(HOST_GO_COMMON_ENV) \ >> - GOPROXY=direct \ >> + GOPROXY=proxy.golang.org \ >> BR_GOMOD=$$($(2)_GOMOD) >> >> # Due to vendoring, it is pretty likely that not all licenses are >> -- >> 2.31.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From giulio.benetti at benettiengineering.com Sun Jan 9 21:47:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 9 Jan 2022 22:47:24 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Giulio Benetti as co-maintainer to mali-driver and rockchip-mali packages Message-ID: <20220109214724.94900-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..09da2dda1a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1093,9 +1093,11 @@ F: package/harfbuzz/ F: package/libfuse3/ F: package/libnspr/ F: package/libnss/ +F: package/mali-driver/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ +F: package/rockchip-mali/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ -- 2.25.1 From arnout at mind.be Sun Jan 9 21:47:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 22:47:42 +0100 Subject: [Buildroot] [RFC v2 12/12] WIP: package/mesa3d: add vulkan swrast driver support In-Reply-To: <20210110222833.26301-13-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> <20210110222833.26301-13-ps.report@gmx.net> Message-ID: <74914dd5-1c62-1e3c-fd8b-a57bc33e5293@mind.be> On 10/01/2021 23:28, Peter Seiderer wrote: > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - no changes (besides clearifying notes comment) > > Notes: > - link failure when selected stand alone, fine in case > vulkan-broadcom is selected too (selecting vulkan-intel > instead does not work) In future submissions, paste the link error so others can give some idea about debugging it. > --- > package/mesa3d/Config.in | 13 +++++++++++++ > package/mesa3d/mesa3d.mk | 1 + > 2 files changed, 14 insertions(+) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index 5da9bfe08a..66776c9ad9 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -429,6 +429,19 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= > depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ > !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 > > +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST > + bool "Vulkan swrast driver" > + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST These kind of dependencies are somewhat annoying, but OK. Fortunately, dri-swrast was removed upstream, so it's no longer relevant. > + select BR2_PACKAGE_EXPAT > + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER Implied by gallium-swrast. Regards, Arnout > + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST > + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER > + help > + Vulkan swrast driver. > + > +comment "Vulkan swrast: Only one swrast provider can be built" > + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST > + > comment "Off-screen Rendering" > > config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 62dc7db91d..4679416b4d 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -121,6 +121,7 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 > # Vulkan Drivers > MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom > MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel > +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast > > ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) > MESA3D_CONF_OPTS += \ > From yann.morin.1998 at free.fr Sun Jan 9 21:52:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 22:52:05 +0100 Subject: [Buildroot] [git commit] package/libvirtd: fix recursive dependency in Kconfig Message-ID: <20220109214950.95CF3812D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f81242ae4fb64ab85af5d38e70246222276552ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4dff1be05e90 (package/libvirt: libvirtd needs C++ for nmap-ncat) introduce a recursive dependency (really: a circular dependency): package/busybox/Config.in:33:error: recursive dependency detected! package/busybox/Config.in:33: symbol BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is selected by BR2_PACKAGE_EBTABLES_UTILS_SAVE package/ebtables/Config.in:11: symbol BR2_PACKAGE_EBTABLES_UTILS_SAVE depends on BR2_PACKAGE_EBTABLES package/ebtables/Config.in:1: symbol BR2_PACKAGE_EBTABLES is selected by BR2_PACKAGE_LIBVIRT_DAEMON package/libvirt/Config.in:44: symbol BR2_PACKAGE_LIBVIRT_DAEMON depends on BR2_PACKAGE_NETCAT_OPENBSD package/netcat-openbsd/Config.in:1: symbol BR2_PACKAGE_NETCAT_OPENBSD depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS As usual with this kind of circular depednency, it is not trivial to see what the real cuplrit is, or where to cut the circle. A simple solution in this case is to drop the C++ dependency, and switch the netcat-openbsd and nmap-ncat dependencies conditions. Signed-off-by: Yann E. MORIN --- package/libvirt/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 103d1b9543..b91b8e2c1c 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,15 +44,13 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y - depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES select BR2_PACKAGE_IPTABLES select BR2_PACKAGE_IPROUTE2 # These are required because there is no way to unequivocally select a modern netcat - select BR2_PACKAGE_NMAP if !BR2_PACKAGE_NETCAT_OPENBSD - select BR2_PACKAGE_NMAP_NCAT if !BR2_PACKAGE_NETCAT_OPENBSD + select BR2_PACKAGE_NETCAT_OPENBSD if !BR2_PACKAGE_NMAP_NCAT select BR2_PACKAGE_RADVD help Build the libvirt daemon (libvirtd) otherwise build only the From yann.morin.1998 at free.fr Sun Jan 9 21:58:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 22:58:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: libvirtd needs C++ In-Reply-To: <20220109204853.GH1477939@scaer> References: <20220109202003.3338357-1-fontaine.fabrice@gmail.com> <20220109204853.GH1477939@scaer> Message-ID: <20220109215803.GJ1477939@scaer> Fabrice, All, On 2022-01-09 21:48 +0100, Yann E. MORIN spake thusly: > On 2022-01-09 21:20 +0100, Fabrice Fontaine spake thusly: > > Fix the following build failure raised since commit > > fbf25acfbfd5a73b3560918bea081768abbe5723: > > > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP > > Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] > > Selected by [y]: > > - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] > > > > Fixes: > > - No autobuilder failures (yet) > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/libvirt/Config.in | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in > > index a35295bc97..d7ca5f8db5 100644 > > --- a/package/libvirt/Config.in > > +++ b/package/libvirt/Config.in > > @@ -37,6 +37,7 @@ if BR2_PACKAGE_LIBVIRT > > config BR2_PACKAGE_LIBVIRT_DAEMON > > bool "libvirtd" > > default y > > + depends on BR2_INSTALL_LIBSTDCPP # nmap > > In fact, the requirement on C++ is due to nmap-ncat, which is enabled > only if netcat-openbsd is not available, so I relaxed the requirement > accordingly. This introduced a messy circular dependency, so I pushed another patch that; - remove the C++ dependency - switches the nmap-ncat and netcat-openbsd conditional dependnecies Regards, Yann E. MORIN. > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > > select BR2_PACKAGE_DNSMASQ > > select BR2_PACKAGE_EBTABLES > > @@ -50,6 +51,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON > > Build the libvirt daemon (libvirtd) otherwise build only the > > utility programs. > > > > +comment "libvirtd needs a toolchain w/ C++" > > + depends on !BR2_INSTALL_LIBSTDCPP > > + > > # Stateful drivers are useful only when building the daemon. > > if BR2_PACKAGE_LIBVIRT_DAEMON > > > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sun Jan 9 22:01:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:01:53 +0100 Subject: [Buildroot] [git commit] utils/check-package: add a check for the new spacing convention Message-ID: <20220109215941.06D9F80250@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f35a4b4ae22046fb04edc165edbb27ee5439aa4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The seperation of the fields in the hash file should be 2 spaces for consistency. Since a large number of hash files still violate this rule, exclude it from "make check-package" (and thus from CI). Signed-off-by: Heiko Thiery Cc: Yann E. MORIN Cc: Thomas Petazzoni [Arnout: - Move it to a separate class, so it can be excluded. - Exclude it from "make check-package" ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Makefile | 2 +- utils/checkpackagelib/lib_hash.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3099d35158..5fc7137e5a 100644 --- a/Makefile +++ b/Makefile @@ -1258,7 +1258,7 @@ check-flake8: check-package: find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -exec ./utils/check-package --exclude=Sob {} + + -exec ./utils/check-package --exclude=Sob --exclude=HashSpaces {} + include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py index 3e381119a5..698d24fd6b 100644 --- a/utils/checkpackagelib/lib_hash.py +++ b/utils/checkpackagelib/lib_hash.py @@ -53,3 +53,19 @@ class HashType(_CheckFunction): .format(self.filename, lineno, self.url_to_manual), text, "expected {} hex digits".format(self.len_of_hash[htype])] + + +class HashSpaces(_CheckFunction): + def check_line(self, lineno, text): + if _empty_line_or_comment(text): + return + + fields = text.split() + if len(fields) != 3: + # Handled by HashNumberOfFields + return + + if not re.match(re.escape("{} {} {}".format(*fields)), text): + return ["{}:{}: separation does not match expectation " + "({}#adding-packages-hash)" + .format(self.filename, lineno, self.url_to_manual), text] From nolange79 at gmail.com Sun Jan 9 22:16:47 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:16:47 +0100 Subject: [Buildroot] [PATCH v6 1/4] package/dbus-broker: new package Message-ID: <20220109221650.777610-1-nolange79@gmail.com> dbus-broker is an alternate implementation of a dbus dameon. It can be used as a drop-in replacement for the system bus daemon, as well as the session bus daemon. dbus-broker is (basically, and as far as we're concerned in Buildroot) split in two components: - the actual message bus daemon, that relays messages across clients - a launcher, which is responsible for setting various aspects of the bus, like setting the policy et al. and opening the socket(s) the message bus daemon will have to listen on... The launcher can only be used in a systemd setup (it makes heavy use of systemd facilities), while the message bus is generic. However, the message bus daemon is useless without a launcher. There does not exist a non-systemd launcher, which makes dbus-broker actually a systemd-only package; this can be revisited when/if a non-systemd launcher appears. Note, however, that libdbus is not provided by dbus-borker. People who want to use dbus-broker as the bus daemon, and need libdbus, will have to enable both, see below. There are two cases: 1. original dbus disabled Here, we install the config files and systemd socket activation units; dbus-broker provides the system and sessions bus daemons. In this case, libdbus is not available. 2. original dbus enabled In this case, we do not install the config files and systemd socket activation units, or define a user: they all are provided by the original dbus, and we piggy-back on those. In this situation, the default system and sessions message bus are the original dbus, and libdbus is available; dbus-broker is not enabled. So far, we believe it would be over-engineered to provide a way to allow choosing the bus daemon in the configuraiton. However, users may opt-in to use dbus-broker in a few ways: - at build-time: by calling systemctl enable/disable from a post-build script (preferred), or by providing drop-in units or presets in an overlay (less preferred) or custom skeleton (as a last resort), - at runtime (on a RW filesystem): by calling systemctl enable/disable Note about the user: the path to the system bus socket is a so-called "well-known location": it is expected to be there, by spec. Moving it elsewhere is going to break existing programs. So, the user running the system bus daemon must be able to create that socket. As we may have two packages providing a system bus daemon, they have to be both able to create the socket, and thus must both be able to write in the directory containing the socket. And since they can be switched at runtime, they must be running as the same user. We can't just reference the original dbus user, so we duplicate the entry. What is important, is that the user be named 'dbus', as that's what we use in both cases. Finally, the licensing terms are pretty trivial for dbus-broker itself, but it makes use of third-party code that it inherits as git submodules (that are bundled in the release archive). Thus the licensing is a bit convoluted... The third-party codes claim to be licensed as "Apache-2.0 and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files. The individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the situation with "Apache-2.0 and/or LGPL-2.1+". Signed-off-by: Norbert Lange [yann.morin.1998 at free.fr: - don't select systemd; depend on it instead - only install config files and systemd units without original dbus - install a user to run the message bus as - fix licensing info - entirely reword and extend the commit log - add myself to DEVELOPERS as well ] Signed-off-by: Yann E. MORIN --- Changes v5 -> v6 (Norbert, respinning after Yann): - bump version to v29 - Linux 4.17 is now a hard requirement, drop passing option - sync dbus_broker user to dbus package ( home = /run/dbus ) Changes v4 -> v5 (Yann, after review by Norbert): - define the user to run as directly in system.conf - as a consequence, drop the unit drop-in - add myself to DEVELOPERS as well Changes v3 -> v4 (Yann, respining after review by Norbert): - drop the non-systemd case - drop the launcher option - reinstate BR2_COREUTILS_HOST_DEPENDENCY and ln --relative - reinstate the user, explain it Changes v2 -> v3 (Norbert, respinning after Yann): - add an own config entry for dbus-broker-launch enabled by default if systemd init is used - undo BR2_COREUTILS_HOST_DEPENDENCY - undo adding dbus user - never used by this package - add condtional audit dependency - cleanup conditional logic a bit Changes v1 -> v2 (Yann): - make launcher conditional - don't select systemd; don't depend on it either - don't install systemd units without systemd - only install config files and systemd units wihtout original dbus - rename hooks with meaningful names - fix licensing info - entirely reword and extend the commit log --- DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 23 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 71 ++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123 +++++++++++++++++++++++++++ 8 files changed, 293 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.conf diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..02ba98e410 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2111,6 +2111,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange +F: package/dbus-broker/ F: package/systemd/ F: package/tcf-agent/ @@ -2914,6 +2915,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/ diff --git a/package/Config.in b/package/Config.in index 5e01187b83..ebc64a25f2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -459,6 +459,7 @@ endmenu source "package/dahdi-tools/Config.in" source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in" diff --git a/package/dbus-broker/Config.in b/package/dbus-broker/Config.in new file mode 100644 index 0000000000..c7206232da --- /dev/null +++ b/package/dbus-broker/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of a message bus + as defined by the D-Bus specification. Its aim is to provide + high performance and reliability, while keeping compatibility + to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makes use of + many modern features provided by recent linux kernel releases. + + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMD diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash new file mode 100644 index 0000000000..26ebab7ac1 --- /dev/null +++ b/package/dbus-broker/dbus-broker.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4eca425db52b7ab1027153e93fea9b3f11759db9e93ffbf88759b73ddfb8026a dbus-broker-29.tar.xz +sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk new file mode 100644 index 0000000000..547b79eb84 --- /dev/null +++ b/package/dbus-broker/dbus-broker.mk @@ -0,0 +1,71 @@ +################################################################################ +# +# dbus-broker +# +################################################################################ + +DBUS_BROKER_VERSION = 29 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) + +# For the third-party code, the licensing legla-info is inconsistent between +# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list, c-rbtree, c-shquote, c-stdaux, c-utf8) +DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ + subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ + subprojects/c-list/AUTHORS subprojects/c-list/README.md \ + subprojects/c-rbtree/AUTHORS subprojects/c-rbtree/README.md \ + subprojects/c-shquote/AUTHORS subprojects/c-shquote/README.md \ + subprojects/c-stdaux/AUTHORS subprojects/c-stdaux/README.md \ + subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_BROKER_DEPENDENCIES += audit +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +else +DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we can share +# the home directory and create a socket there. As a consequence, the +# username and groupname must be dbus:dbus, and they both need to have +# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /run/dbus - dbus DBus messagebus user +endef + +# Only install units for system bus daemon socket if original dbus is not present +# Only install config and service files if original dbus is not present +# +# Note: BR2_COREUTILS_HOST_DEPENDENCY to be able to use ln --relative +ifeq ($(BR2_PACKAGE_DBUS),) +DBUS_BROKER_DEPENDENCIES += $(BR2_COREUTILS_HOST_DEPENDENCY) + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \ + $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf --relative \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket +endef +endif # !BR2_PACKAGE_DBUS + +$(eval $(meson-package)) diff --git a/package/dbus-broker/dbus.socket b/package/dbus-broker/dbus.socket new file mode 100644 index 0000000000..5c373cf450 --- /dev/null +++ b/package/dbus-broker/dbus.socket @@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socket diff --git a/package/dbus-broker/session.conf b/package/dbus-broker/session.conf new file mode 100644 index 0000000000..e4758fa218 --- /dev/null +++ b/package/dbus-broker/session.conf @@ -0,0 +1,65 @@ + + + + + + session + + + + + + + + + + + + + + + + + session.d + + /etc/dbus-1/session.d + + + /etc/dbus-1/session-local.conf + + contexts/dbus_contexts + + + + + 1000000000 + 250000000 + 1000000000 + 250000000 + 1000000000 + + 120000 + 240000 + 150000 + 100000 + 10000 + 100000 + 10000 + 50000 + 50000 + 50000 + + diff --git a/package/dbus-broker/system.conf b/package/dbus-broker/system.conf new file mode 100644 index 0000000000..4b17fbd90e --- /dev/null +++ b/package/dbus-broker/system.conf @@ -0,0 +1,123 @@ + + + + + + + + + system + + + + + + dbus + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + system.d + + /etc/dbus-1/system.d + + + /etc/dbus-1/system-local.conf + + contexts/dbus_contexts + + -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 22:16:48 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:16:48 +0100 Subject: [Buildroot] [PATCH v6 2/4] package/systemd: do not force dbus if dbus-broker is available In-Reply-To: <20220109221650.777610-1-nolange79@gmail.com> References: <20220109221650.777610-1-nolange79@gmail.com> Message-ID: <20220109221650.777610-2-nolange79@gmail.com> From: "Yann E. MORIN" dbus-broker fits the bill as a message bus daemon, so only enable the original dbus if dbus-broker is not enabled. Signed-off-by: Yann E. MORIN Cc: Norbert Lange --- package/systemd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index cc0736561e..1c227bb07f 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -26,7 +26,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_DBUS # runtime dependency only + select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBS -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 22:16:49 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:16:49 +0100 Subject: [Buildroot] [PATCH v6 3/4] support/testsuite: de-duplicate the systemd runtime tests In-Reply-To: <20220109221650.777610-1-nolange79@gmail.com> References: <20220109221650.777610-1-nolange79@gmail.com> Message-ID: <20220109221650.777610-3-nolange79@gmail.com> From: "Yann E. MORIN" Of all the systemd init tests, only one does some additional tests, and for just this lone wolf, we duplicate the test function. Signed-off-by: Yann E. MORIN --- support/testing/tests/init/test_systemd.py | 32 ++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index f0cc52bac8..80c6776f59 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -21,8 +21,9 @@ class InitSystemSystemdBase(InitSystemBase): # BR2_TARGET_ROOTFS_TAR is not set """.format(infra.filepath("conf/binfmt-misc-kernel-fragment.config")) - def check_init(self): - super(InitSystemSystemdBase, self).check_init("/lib/systemd/systemd") + def check_systemd(self, fs): + self.start_emulator(fs, "zImage", "vexpress-v2p-ca9") + self.check_init("/lib/systemd/systemd") # Test all units are OK output, _ = self.emulator.run("systemctl --no-pager --failed --no-legend") @@ -35,6 +36,9 @@ class InitSystemSystemdBase(InitSystemBase): output, _ = self.emulator.run("journalctl --no-pager --lines 1 --quiet") self.assertEqual(len(output), 1) + # Check the network is up + self.check_network("eth0") + class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ @@ -46,9 +50,7 @@ class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase): """.format(infra.filepath("tests/init/systemd-factory")) def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") # This one must be executed on the target, to check that # the factory feature works as expected @@ -65,9 +67,7 @@ class TestInitSystemSystemdRwNetworkd(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): @@ -80,9 +80,7 @@ class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): @@ -94,9 +92,7 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") class TestInitSystemSystemdRoFull(InitSystemSystemdBase): @@ -125,9 +121,7 @@ class TestInitSystemSystemdRoFull(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") class TestInitSystemSystemdRwFull(InitSystemSystemdBase): @@ -155,6 +149,4 @@ class TestInitSystemSystemdRwFull(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") -- 2.34.1 From nolange79 at gmail.com Sun Jan 9 22:16:50 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:16:50 +0100 Subject: [Buildroot] [PATCH v6 4/4] support/run-test: add test for systemd using dbus-broker In-Reply-To: <20220109221650.777610-1-nolange79@gmail.com> References: <20220109221650.777610-1-nolange79@gmail.com> Message-ID: <20220109221650.777610-4-nolange79@gmail.com> From: "Yann E. MORIN" Add four new tests for systemd (rw and ro in each case): - use dbus-broker instead of the original dbus - use the original dbus, with dbus-broker installed The first two extend the existing IfUpDown test cases by just enabling dbus-broker; the second ones extend this further, by explicitly enabling the original dbus. For one of the tests, we overload the test_run() function to test that the dbus-broker daemon is indeed running as root. We need not replicate that check in the other dbus-broker-only test, and it does not make sense to test that in tests that have the original dbus enabled. Presence of the original dbus and dbus-broker on the same system is valid: the original dbus is used as the default system bus daemon. We do not test switching between the two at runtime, though as this is really too corner-case specific. We just test to ensure the original dbus system bus daemon is not impacted by the presence of dbus-broker. Note: the 'full' test-case enables all systemd options, and some of them do pull the original dbus package, so we can't use that to test the integration of dbus-broker; instead, we extend the ifupdown case, which does not enable the original dbus. Signed-off-by: Yann E. MORIN Cc: Norbert Lange --- support/testing/tests/init/test_systemd.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 80c6776f59..80d172e5e2 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -83,6 +83,29 @@ class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): self.check_systemd("squashfs") +class TestInitSystemSystemdRoIfupdownDbusbroker(TestInitSystemSystemdRoIfupdown): + config = TestInitSystemSystemdRoIfupdown.config + \ + """ + BR2_PACKAGE_DBUS_BROKER=y + """ + + def test_run(self): + # Parent class' test_run() method does exactly that, no more: + self.check_systemd("squashfs") + + # Check that the dbus-broker daemon is running as non-root + cmd = "find /proc/$(pidof dbus-broker) -maxdepth 1 -name exe -user dbus" + out, _ = self.emulator.run(cmd) + self.assertEqual(len(out), 1) + + +class TestInitSystemSystemdRoIfupdownDbusbrokerDbus(TestInitSystemSystemdRoIfupdownDbusbroker): + config = TestInitSystemSystemdRoIfupdownDbusbroker.config + \ + """ + BR2_PACKAGE_DBUS=y + """ + + class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ """ @@ -95,6 +118,20 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): self.check_systemd("ext2") +class TestInitSystemSystemdRwIfupdownDbusbroker(TestInitSystemSystemdRwIfupdown): + config = TestInitSystemSystemdRwIfupdown.config + \ + """ + BR2_PACKAGE_DBUS_BROKER=y + """ + + +class TestInitSystemSystemdRwIfupdownDbusbrokerDbus(TestInitSystemSystemdRwIfupdownDbusbroker): + config = TestInitSystemSystemdRwIfupdownDbusbroker.config + \ + """ + BR2_PACKAGE_DBUS=y + """ + + class TestInitSystemSystemdRoFull(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ """ -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 22:16:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:16:32 +0100 Subject: [Buildroot] [PATCH 1/2] package/hiawatha: mbedtls is mandatory, not optional Message-ID: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> hiawatha is unconditionally using mbedtls since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e (e.g. wigwam.c includes "mbedtls/md5.h") Signed-off-by: Fabrice Fontaine --- package/hiawatha/hiawatha.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 017592de1e..ed9f8aba54 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -11,7 +11,10 @@ HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver +# Disable system mbedtls as hiawatha needs mbedtls 3.x HIAWATHA_CONF_OPTS = \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF \ -DENABLE_TOOLKIT=OFF \ -DCONFIG_DIR=/etc/hiawatha \ -DLOG_DIR=/var/log \ @@ -20,11 +23,7 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -# Disable system mbedtls as hiawatha needs mbedtls 3.x -HIAWATHA_CONF_OPTS += \ - -DENABLE_TLS=ON \ - -DINSTALL_MBEDTLS_HEADERS=OFF \ - -DUSE_SYSTEM_MBEDTLS=OFF +HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 22:16:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:16:33 +0100 Subject: [Buildroot] [PATCH 2/2] package/hiawatha: disable ASM if needed In-Reply-To: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> References: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> Message-ID: <20220109221633.1307381-2-fontaine.fabrice@gmail.com> Disable ASM as already done in mbedtls package to avoid the following build failure raised since commit 4e36e8f2081a66f477dd038793082045876d65ee: In file included from /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c:41: /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c: In function 'mpi_mul_hlp': /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bn_mul.h:86:13: error: the register 'hi' cannot be clobbered in 'asm' for the current target 86 | #define asm __asm | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/5436b44777c5d417ae427b99602f516fd8f9489d Signed-off-by: Fabrice Fontaine --- package/hiawatha/hiawatha.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index ed9f8aba54..14d3c9f1ee 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -22,6 +22,24 @@ HIAWATHA_CONF_OPTS = \ -DWEBROOT_DIR=/var/www/hiawatha \ -DWORK_DIR=/var/lib/hiawatha +define HIAWATHA_MBEDTLS_DISABLE_ASM + $(SED) '/^#define MBEDTLS_AESNI_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h +endef + +# ARM in thumb mode breaks debugging with asm optimizations +# Microblaze asm optimizations are broken in general +# MIPS R6 asm is not yet supported +ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +endif + ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 22:18:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:18:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: drop C++ comment Message-ID: <20220109221830.1343278-1-fontaine.fabrice@gmail.com> Commit f81242ae4fb64ab85af5d38e70246222276552ae forgot to drop C++ comment Signed-off-by: Fabrice Fontaine --- package/libvirt/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index aeb560a498..5a6b067a0d 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -50,9 +50,6 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. -comment "libvirtd needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD - # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 9 22:22:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:22:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/avrdude: fix version Message-ID: <20220109222203.1397934-1-fontaine.fabrice@gmail.com> Fix AVRDUDE_VERSION so that it matches what is returned by release-monitoring.org Signed-off-by: Fabrice Fontaine --- package/avrdude/avrdude.hash | 2 +- package/avrdude/avrdude.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index 1c7758afcd..d53d4dd60d 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-6.4.tar.gz sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 5bbbc4e8c2..6a8e9074b7 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,8 +4,8 @@ # ################################################################################ -AVRDUDE_VERSION = v6.4 -AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) +AVRDUDE_VERSION = 6.4 +AVRDUDE_SITE = $(call github,avrdudes,avrdude,v$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ AVRDUDE_LICENSE_FILES = COPYING -- 2.34.1 From yann.morin.1998 at free.fr Sun Jan 9 22:26:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:26:36 +0100 Subject: [Buildroot] [git commit] package/glibc: force -fno-lto Message-ID: <20220109222042.3C1C1829F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7a00b39bca0df9737890145b7f59b9c1c3d2e4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master glibc requires compilation barriers between files, and will fail with LTO enabled. So force LTO off by appending -fno-lto to the flags, but only if the GCC version is recent enough that an LTO build would be possible. Signed-off-by: Norbert Lange Signed-off-by: Yann E. MORIN --- package/glibc/glibc.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 3862e0624b..5c26b0e6df 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -53,6 +53,11 @@ ifeq ($(BR2_ENABLE_DEBUG),y) GLIBC_EXTRA_CFLAGS += -g endif +# glibc explicitly requires compile barriers between files +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +GLIBC_EXTRA_CFLAGS += -fno-lto +endif + # The stubs.h header is not installed by install-headers, but is # needed for the gcc build. An empty stubs.h will work, as explained # in http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html. The same trick From yann.morin.1998 at free.fr Sun Jan 9 22:31:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:31:45 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/glibc: force -fno-lto In-Reply-To: <20201017221743.160029-4-nolange79@gmail.com> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-4-nolange79@gmail.com> Message-ID: <20220109223145.GK1477939@scaer> Norbert, All, On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > glibc requires compilation barriers between files, and will > fail with LTO enabled. > So force LTO off by appending -fno-lto to the flags, but only > if the GCC version is recent enough that an LTO build would > be possible. > > Signed-off-by: Norbert Lange Applied to master, thanks. Are the other C libraries (uClibc, musl) also affected by such an issue? Regards, Yann E. MORIN. > --- > package/glibc/glibc.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index 4721177d83..6d07495edc 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -67,6 +67,11 @@ ifeq ($(BR2_ENABLE_DEBUG),y) > GLIBC_EXTRA_CFLAGS += -g > endif > > +# glibc explicitly requires compile barriers between files > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) > +GLIBC_EXTRA_CFLAGS += -fno-lto > +endif > + > # The stubs.h header is not installed by install-headers, but is > # needed for the gcc build. An empty stubs.h will work, as explained > # in http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html. The same trick > -- > 2.28.0 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Jan 9 22:31:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 9 Jan 2022 23:31:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/squid: needs threads Message-ID: <20220109223135.1409181-1-fontaine.fabrice@gmail.com> squid needs threads and https://github.com/squid-cache/squid/commit/7dba4ac446341548a0b101489785f2cef9a33caa to avoid the following build failure raised since bump to version 5.3 in commit efc07b7a1818787229ddb335ca26ff2cf03820ae: ntlm_fake_auth.cc: In function 'int main(int, char**)': ntlm_fake_auth.cc:187:18: error: 'std::this_thread' has not been declared 187 | std::this_thread::sleep_for(std::chrono::milliseconds(response_delay)); | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/2aabc8375d41ad4d047d20ff8ee4fe1c978e7ee1 Signed-off-by: Fabrice Fontaine --- package/squid/Config.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 0df2aedef6..6272140768 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,13 +1,16 @@ -comment "squid needs a toolchain w/ C++, gcc >= 4.8 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 # needs fork() -- 2.34.1 From yann.morin.1998 at free.fr Sun Jan 9 22:34:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:34:56 +0100 Subject: [Buildroot] [git commit] package/libvirt: drop C++ comment Message-ID: <20220109222851.F177C82B53@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb9a65d98b128c1b06069013e0ab874779ef5228 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit f81242ae4fb64ab85af5d38e70246222276552ae forgot to drop C++ comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libvirt/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index b91b8e2c1c..af0fc36aea 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -56,9 +56,6 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. -comment "libvirtd needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD - # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON From yann.morin.1998 at free.fr Sun Jan 9 22:34:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:34:58 +0100 Subject: [Buildroot] [git commit] package/avrdude: fix version Message-ID: <20220109222852.059EF812B9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcfce11044212166fc164d68f1dfdb01f3517a4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix AVRDUDE_VERSION so that it matches what is returned by release-monitoring.org Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/avrdude/avrdude.hash | 2 +- package/avrdude/avrdude.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index 1c7758afcd..d53d4dd60d 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-6.4.tar.gz sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 5bbbc4e8c2..6a8e9074b7 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,8 +4,8 @@ # ################################################################################ -AVRDUDE_VERSION = v6.4 -AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) +AVRDUDE_VERSION = 6.4 +AVRDUDE_SITE = $(call github,avrdudes,avrdude,v$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ AVRDUDE_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sun Jan 9 22:35:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:35:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: drop C++ comment In-Reply-To: <20220109221830.1343278-1-fontaine.fabrice@gmail.com> References: <20220109221830.1343278-1-fontaine.fabrice@gmail.com> Message-ID: <20220109223548.GL1477939@scaer> Fabrice, All, On 2022-01-09 23:18 +0100, Fabrice Fontaine spake thusly: > Commit f81242ae4fb64ab85af5d38e70246222276552ae forgot to drop C++ > comment Yeah, thanks for fixing my mess! :-) > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libvirt/Config.in | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in > index aeb560a498..5a6b067a0d 100644 > --- a/package/libvirt/Config.in > +++ b/package/libvirt/Config.in > @@ -50,9 +50,6 @@ config BR2_PACKAGE_LIBVIRT_DAEMON > Build the libvirt daemon (libvirtd) otherwise build only the > utility programs. > > -comment "libvirtd needs a toolchain w/ C++" > - depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD > - > # Stateful drivers are useful only when building the daemon. > if BR2_PACKAGE_LIBVIRT_DAEMON > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 9 22:36:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 9 Jan 2022 23:36:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/avrdude: fix version In-Reply-To: <20220109222203.1397934-1-fontaine.fabrice@gmail.com> References: <20220109222203.1397934-1-fontaine.fabrice@gmail.com> Message-ID: <20220109223625.GM1477939@scaer> Fabrice, All, On 2022-01-09 23:22 +0100, Fabrice Fontaine spake thusly: > Fix AVRDUDE_VERSION so that it matches what is returned by > release-monitoring.org Thanks for spotting that, I totally missed it... > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/avrdude/avrdude.hash | 2 +- > package/avrdude/avrdude.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash > index 1c7758afcd..d53d4dd60d 100644 > --- a/package/avrdude/avrdude.hash > +++ b/package/avrdude/avrdude.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-v6.4.tar.gz > +sha256 bbe2cf09163b3561ea28e9d48c2a588838f7adcd7858e34ced9c886feacb5be6 avrdude-6.4.tar.gz > sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index 5bbbc4e8c2..6a8e9074b7 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -AVRDUDE_VERSION = v6.4 > -AVRDUDE_SITE = $(call github,avrdudes,avrdude,$(AVRDUDE_VERSION)) > +AVRDUDE_VERSION = 6.4 > +AVRDUDE_SITE = $(call github,avrdudes,avrdude,v$(AVRDUDE_VERSION)) > AVRDUDE_LICENSE = GPL-2.0+ > AVRDUDE_LICENSE_FILES = COPYING > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Sun Jan 9 22:40:56 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 15:40:56 -0700 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: On Sat, Jan 8, 2022 at 2:31 PM Norbert Lange wrote: > > Am Sa., 8. Jan. 2022 um 20:04 Uhr schrieb James Hilliard > : > > > > On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange wrote: > > > > > > Systemd has very many options, adding a way for the user > > > to set custom options can help customizations > > > without changing buildroot files. > > > > I'm not sure this is a good idea, if a configuration option needs > > customizability it > > probably needs a specific kconfig option. Systemd config options tend to require > > dependency selection and special handling so this seems likely to cause > > spurious errors due to improper usage. Seems to be a pretty big footgun IMO. > > Sure, you are aware that many of my buildroot patches are stuck in limbo > since early 2020? Different issue IMO. > Just doesnt seem feasible to timely fix everything and version bumps often leave > more untapped options. Some part of the necessity would be just being pragmatic. I generally try to add any new options when bumping but I sometimes miss some. > > One example would be using the unified cgroups hierarchy > (-Ddefault-hierarchy=unified), hybrid is pretty much deprecated, > and some systemd features that buildroot allows to enable (OOMD for example) > wont work without it. I mean, this sounds like something that needs to be fixed in upstream buildroot. > > > > > What systemd configure option would you want to be using that isn't > > currently able to be enabled? > > FYI those are the ones I currently use: > > -Ddefault-hierarchy=unified \ > -Dutmp=false \ > -Ddefault-dnssec=no \ > -Didn=false \ > -Denvironment-d=false \ > -Dxdg-autostart=false \ > -Ddns-over-tls=false \ > -Ddefault-llmnr=no \ > -Ddns-over-tls=false \ > -Ddefault-mdns=no \ > -Dlz4=false I'm seeing a lot of these added though(I remember adding some of them myself), are you trying to use a newer systemd than the version supported by the buildroot version you are building from? Note that systemd defaults can generally be overridden via configs in the overlay as well. > > Norbert From arnout at mind.be Sun Jan 9 22:41:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:41:17 +0100 Subject: [Buildroot] [PATCH v2] package/moby-buildkit: new package In-Reply-To: <20220109210607.2270978-1-romain.naour@smile.fr> References: <20220109210607.2270978-1-romain.naour@smile.fr> Message-ID: On 09/01/2022 22:06, Romain Naour wrote: > From: Christian Stewart > > Signed-off-by: Christian Stewart > [Romain: > - remove host-pkgconf dependency > - Add the license file hash > - Fix the check-package warning in Config.in] > Signed-off-by: Romain Naour Applied to master, thanks. I also added Christian to DEVELOPERS. Regards, Arnout > --- > > The license file hash was a copy past error. > The 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 belong to > balena-engine package from [1] > > [1] https://git.buildroot.net/buildroot/commit/?id=cb0d87004c824dc6bb421fe8316428d51e1335bd > --- > package/Config.in | 1 + > package/moby-buildkit/Config.in | 19 +++++++++++++++++++ > package/moby-buildkit/moby-buildkit.hash | 3 +++ > package/moby-buildkit/moby-buildkit.mk | 22 ++++++++++++++++++++++ > 4 files changed, 45 insertions(+) > create mode 100644 package/moby-buildkit/Config.in > create mode 100644 package/moby-buildkit/moby-buildkit.hash > create mode 100644 package/moby-buildkit/moby-buildkit.mk > > diff --git a/package/Config.in b/package/Config.in > index edae7e4f62..7bf17f486e 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2554,6 +2554,7 @@ menu "System tools" > source "package/mender/Config.in" > source "package/mender-grubenv/Config.in" > source "package/mfoc/Config.in" > + source "package/moby-buildkit/Config.in" > source "package/monit/Config.in" > source "package/multipath-tools/Config.in" > source "package/ncdu/Config.in" > diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in > new file mode 100644 > index 0000000000..93c852bcdb > --- /dev/null > +++ b/package/moby-buildkit/Config.in > @@ -0,0 +1,19 @@ > +config BR2_PACKAGE_MOBY_BUILDKIT > + bool "moby-buildkit" > + 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 > + depends on BR2_USE_MMU > + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency > + help > + BuildKit is a toolkit for converting source code to build > + artifacts in an efficient, expressive and repeatable manner. > + > + https://github.com/moby/buildkit > + > +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" > + 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 || BR2_TOOLCHAIN_USES_UCLIBC > + depends on BR2_USE_MMU > diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash > new file mode 100644 > index 0000000000..3015e479f6 > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz > +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk > new file mode 100644 > index 0000000000..3f0df351ef > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# moby-buildkit > +# > +################################################################################ > + > +MOBY_BUILDKIT_VERSION = 0.8.1 > +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) > +MOBY_BUILDKIT_LICENSE = Apache-2.0 > +MOBY_BUILDKIT_LICENSE_FILES = LICENSE > + > +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit > + > +MOBY_BUILDKIT_TAGS = cgo > +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd > + > +MOBY_BUILDKIT_LDFLAGS = \ > + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" > + > +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) > + > +$(eval $(golang-package)) > From arnout at mind.be Sun Jan 9 22:41:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:41:43 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Giulio Benetti as co-maintainer to mali-driver and rockchip-mali packages In-Reply-To: <20220109214724.94900-1-giulio.benetti@benettiengineering.com> References: <20220109214724.94900-1-giulio.benetti@benettiengineering.com> Message-ID: <68cd9523-d7f3-3f7d-0cc0-cddb7711a1f9@mind.be> On 09/01/2022 22:47, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ed65c74319..09da2dda1a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1093,9 +1093,11 @@ F: package/harfbuzz/ > F: package/libfuse3/ > F: package/libnspr/ > F: package/libnss/ > +F: package/mali-driver/ > F: package/minicom/ > F: package/nfs-utils/ > F: package/python-uvloop/ > +F: package/rockchip-mali/ > F: package/sunxi-mali-utgard/ > F: package/sunxi-mali-utgard-driver/ > F: package/trace-cmd/ > From arnout at mind.be Sun Jan 9 22:45:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:45:53 +0100 Subject: [Buildroot] [PATCH] package/avrdude: add support for hidapi In-Reply-To: <20220109205946.14456-1-yegorslists@googlemail.com> References: <20220109205946.14456-1-yegorslists@googlemail.com> Message-ID: <3a7818ff-a958-0bce-2d08-10fe8f000721@mind.be> On 09/01/2022 21:59, yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > If BR2_PACKAGE_HIDAPI is selected, add it to avrdude build > dependencies. > > Signed-off-by: Yegor Yefremov Applied to master, thanks. Regards, Arnout > --- > package/avrdude/avrdude.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index 5bbbc4e8c2..63cc3bbc7e 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -28,6 +28,10 @@ else ifeq ($(BR2_PACKAGE_LIBFTDI),y) > AVRDUDE_DEPENDENCIES += libftdi > endif > > +ifeq ($(BR2_PACKAGE_HIDAPI),y) > +AVRDUDE_DEPENDENCIES += hidapi > +endif > + > # if /etc/avrdude.conf exists, the installation process creates a > # backup file, which we do not want in the context of Buildroot. > define AVRDUDE_REMOVE_BACKUP_FILE > From arnout at mind.be Sun Jan 9 22:46:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:46:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsigrok: fix C++ build with glibmm 2.68 In-Reply-To: <20220108230259.3703237-1-fontaine.fabrice@gmail.com> References: <20220108230259.3703237-1-fontaine.fabrice@gmail.com> Message-ID: <77b3c32f-3794-7504-de10-6c9a11beeb24@mind.be> On 09/01/2022 00:02, Fabrice Fontaine wrote: > cxx bindings are, silently, disabled since bump of glibmm to version > 2.68.2 in commit dddb65efbdf2c7952f22a1e51009f17f1676db4a resulting in > the following build failure with pulseview: > > -- Package 'libsigrokcxx', required by 'virtual:world', not found > > Fixes: > - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../libsigrok/0001-Support-glibmm-2.68.patch | 129 ++++++++++++++++++ > package/libsigrok/libsigrok.mk | 3 + > 2 files changed, 132 insertions(+) > create mode 100644 package/libsigrok/0001-Support-glibmm-2.68.patch > > diff --git a/package/libsigrok/0001-Support-glibmm-2.68.patch b/package/libsigrok/0001-Support-glibmm-2.68.patch > new file mode 100644 > index 0000000000..14d14ec406 > --- /dev/null > +++ b/package/libsigrok/0001-Support-glibmm-2.68.patch > @@ -0,0 +1,129 @@ > +From 31ad5ec50ec0c9cc7a92f009925c5f58aecdcce1 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 30 Dec 2021 14:58:11 +0100 > +Subject: [PATCH] Support glibmm 2.68 > + > +Support glibmm 2.68 which has been released one year ago and is the > +first stable release in the glibmm-2.68 ABI series: > +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS > + > +As TimeVal is not available with glibmm 2.68, use DateTime which is > +available since version 2.26 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://sourceforge.net/p/sigrok/mailman/message/37410614] > +--- > + README | 2 +- > + bindings/cxx/classes.cpp | 13 ++++++------- > + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp | 4 ++-- > + bindings/cxx/libsigrokcxx.pc.in | 2 +- > + configure.ac | 7 ++++++- > + 5 files changed, 16 insertions(+), 12 deletions(-) > + > +diff --git a/README b/README > +index 768c8ca2..2515f059 100644 > +--- a/README > ++++ b/README > +@@ -63,7 +63,7 @@ Requirements for the C++ bindings: > + - doxygen (required for building the bindings, not only for C++ API docs!) > + - graphviz (optional, only needed for the C++ API docs) > + - Python (2 or 3) executable (development files are not needed) > +- - glibmm-2.4 (>= 2.32.0) > ++ - glibmm-2.4 (>= 2.32.0) or glibmm-2.68 (>= 2.68.0) > + > + Requirements for the Python bindings: > + > +diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp > +index f9f79273..de600d03 100644 > +--- a/bindings/cxx/classes.cpp > ++++ b/bindings/cxx/classes.cpp > +@@ -287,12 +287,12 @@ shared_ptr Context::create_user_device( > + default_delete{}}; > + } > + > +-shared_ptr Context::create_header_packet(Glib::TimeVal start_time) > ++shared_ptr Context::create_header_packet(Glib::DateTime start_time) > + { > + auto header = g_new(struct sr_datafeed_header, 1); > + header->feed_version = 1; > +- header->starttime.tv_sec = start_time.tv_sec; > +- header->starttime.tv_usec = start_time.tv_usec; > ++ header->starttime.tv_sec = start_time.to_unix(); > ++ header->starttime.tv_usec = start_time.get_microsecond(); > + auto packet = g_new(struct sr_datafeed_packet, 1); > + packet->type = SR_DF_HEADER; > + packet->payload = header; > +@@ -1154,11 +1154,10 @@ int Header::feed_version() const > + return _structure->feed_version; > + } > + > +-Glib::TimeVal Header::start_time() const > ++Glib::DateTime Header::start_time() const > + { > +- return Glib::TimeVal( > +- _structure->starttime.tv_sec, > +- _structure->starttime.tv_usec); > ++ Glib::DateTime time = Glib::DateTime::create_now_utc(_structure->starttime.tv_sec); > ++ return time.add_seconds(_structure->starttime.tv_usec / 1.0e6); > + } > + > + Meta::Meta(const struct sr_datafeed_meta *structure) : > +diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp > +index 97e54e17..d090c379 100644 > +--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp > ++++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp > +@@ -274,7 +274,7 @@ public: > + std::shared_ptr create_user_device( > + std::string vendor, std::string model, std::string version); > + /** Create a header packet. */ > +- std::shared_ptr create_header_packet(Glib::TimeVal start_time); > ++ std::shared_ptr create_header_packet(Glib::DateTime start_time); > + /** Create a meta packet. */ > + std::shared_ptr create_meta_packet( > + std::map config); > +@@ -711,7 +711,7 @@ public: > + /* Feed version number. */ > + int feed_version() const; > + /* Start time of this session. */ > +- Glib::TimeVal start_time() const; > ++ Glib::DateTime start_time() const; > + private: > + explicit Header(const struct sr_datafeed_header *structure); > + ~Header(); > +diff --git a/bindings/cxx/libsigrokcxx.pc.in b/bindings/cxx/libsigrokcxx.pc.in > +index 10a92f2d..7d2723fc 100644 > +--- a/bindings/cxx/libsigrokcxx.pc.in > ++++ b/bindings/cxx/libsigrokcxx.pc.in > +@@ -6,7 +6,7 @@ includedir=@includedir@ > + Name: libsigrokcxx > + Description: C++ bindings for libsigrok > + URL: http://www.sigrok.org > +-Requires: libsigrok glibmm-2.4 > ++Requires: libsigrok @SR_GLIBMM_REQUIRES@ > + Version: @SR_PACKAGE_VERSION@ > + Libs: -L${libdir} -lsigrokcxx > + Libs.private: -lm > +diff --git a/configure.ac b/configure.ac > +index 424b0002..d70575b7 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -407,9 +407,14 @@ AS_IF([test "x$HAVE_CXX11" != x1], > + [SR_APPEND([sr_cxx_missing], [', '], ['C++11'])]) > + > + # The C++ bindings need glibmm. > +-SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0]) > ++SR_GLIBMM_REQUIRES=glibmm-2.4 > ++SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.32.0]) > ++AS_IF([test "x$sr_have_glibmm" != xyes], > ++ [SR_GLIBMM_REQUIRES=glibmm-2.68 > ++ SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.68.0])]) > + AS_IF([test "x$sr_have_glibmm" != xyes], > + [SR_APPEND([sr_cxx_missing], [', '], [glibmm])]) > ++AC_SUBST(SR_GLIBMM_REQUIRES) > + > + # The C++ bindings use Doxygen to parse libsigrok symbols. > + AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no]) > +-- > +2.34.1 > + > diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk > index 8e7c355fd0..2a26518614 100644 > --- a/package/libsigrok/libsigrok.mk > +++ b/package/libsigrok/libsigrok.mk > @@ -11,6 +11,8 @@ LIBSIGROK_LICENSE_FILES = COPYING > LIBSIGROK_INSTALL_STAGING = YES > LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf > LIBSIGROK_CONF_OPTS = --disable-java --disable-python > +# We're patching configure.ac > +LIBSIGROK_AUTORECONF = YES > > ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) > LIBSIGROK_CONF_OPTS += --with-libbluez > @@ -52,6 +54,7 @@ LIBSIGROK_DEPENDENCIES += glibmm > endif > > ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) > +LIBSIGROK_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++17" > LIBSIGROK_CONF_OPTS += --enable-cxx > # host-doxygen is used by C++ bindings to parse libsigrok symbols > LIBSIGROK_DEPENDENCIES += \ > From romain.naour at smile.fr Sun Jan 9 22:46:12 2022 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 9 Jan 2022 23:46:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmapnik: new package In-Reply-To: <20210205051640.9602-1-fido_max@inbox.ru> References: <20210205051640.9602-1-fido_max@inbox.ru> Message-ID: Hello Maxim, All Le 05/02/2021 ? 06:16, Maxim Kochetkov via buildroot a ?crit?: > Mapnik is an open source toolkit for developing mapping applications. > At the core is a C++ shared library providing algorithms and patterns > for spatial data access and visualization. Mapnik is basically > a collection of geographic objects like maps, layers, datasources, > features, and geometries. > The library doesn't rely on any OS specific "windowing systems" and > it can be deployed to any server environment. It is intended to play fair > in a multi-threaded environment and is aimed primarily, but > not exclusively, at web-based development. > For further information see http://mapnik.org and also our wiki > documentation. > > https://github.com/mapnik/mapnik > > Signed-off-by: Maxim Kochetkov > --- > package/Config.in | 1 + > ...-to-check-dlfcn-when-cross-compiling.patch | 34 ++++++ > ...-libs-detection-when-cross-compiling.patch | 50 +++++++++ > ...-data-detection-when-cross-compiling.patch | 70 ++++++++++++ > package/libmapnik/Config.in | 29 +++++ > package/libmapnik/libmapnik.mk | 100 ++++++++++++++++++ > 6 files changed, 284 insertions(+) > create mode 100644 package/libmapnik/0001-Allow-to-check-dlfcn-when-cross-compiling.patch > create mode 100644 package/libmapnik/0002-Allow-optional-libs-detection-when-cross-compiling.patch > create mode 100644 package/libmapnik/0003-Allow-lib-data-detection-when-cross-compiling.patch > create mode 100644 package/libmapnik/Config.in > create mode 100644 package/libmapnik/libmapnik.mk > > diff --git a/package/Config.in b/package/Config.in > index 06dfc32cc6..7ef9d9d1dd 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1909,6 +1909,7 @@ menu "Other" > source "package/libite/Config.in" > source "package/liblinear/Config.in" > source "package/libloki/Config.in" > + source "package/libmapnik/Config.in" > source "package/libnpth/Config.in" > source "package/libnspr/Config.in" > source "package/libpfm4/Config.in" > diff --git a/package/libmapnik/0001-Allow-to-check-dlfcn-when-cross-compiling.patch b/package/libmapnik/0001-Allow-to-check-dlfcn-when-cross-compiling.patch > new file mode 100644 > index 0000000000..fa25de7346 > --- /dev/null > +++ b/package/libmapnik/0001-Allow-to-check-dlfcn-when-cross-compiling.patch > @@ -0,0 +1,34 @@ > +From 45441e99809ee6cd75b9691bff35127936e96f28 Mon Sep 17 00:00:00 2001 > +From: fidomax > +Date: Thu, 28 Jan 2021 14:34:34 +0300 > +Subject: [PATCH 1/3] Allow to check dlfcn when cross-compiling > + > +Signed-off-by: Maxim Kochetkov > +Fetch from: https://github.com/mapnik/mapnik/commit/28ff0be6b91db2891e040b482fce45a532ab0add.patch > +--- > + SConstruct | 9 ++++----- > + 1 file changed, 4 insertions(+), 5 deletions(-) > + > +diff --git a/SConstruct b/SConstruct > +index 35b68f73c..6e169e34c 100644 > +--- a/SConstruct > ++++ b/SConstruct > +@@ -1545,11 +1545,10 @@ if not preconfigured: > + else: > + env['MISSING_DEPS'].append('libxml2') > + > +- if not env['HOST']: > +- if conf.CheckHasDlfcn(): > +- env.Append(CPPDEFINES = '-DMAPNIK_HAS_DLCFN') > +- else: > +- env['SKIPPED_DEPS'].append('dlfcn') > ++ if conf.CheckHasDlfcn(): > ++ env.Append(CPPDEFINES = '-DMAPNIK_HAS_DLCFN') > ++ else: > ++ env['SKIPPED_DEPS'].append('dlfcn') > + > + if env['JPEG']: > + OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG']) > +-- > +2.29.2 > + > diff --git a/package/libmapnik/0002-Allow-optional-libs-detection-when-cross-compiling.patch b/package/libmapnik/0002-Allow-optional-libs-detection-when-cross-compiling.patch > new file mode 100644 > index 0000000000..1291f6de66 > --- /dev/null > +++ b/package/libmapnik/0002-Allow-optional-libs-detection-when-cross-compiling.patch > @@ -0,0 +1,50 @@ > +From 3ef9f8296e5308c00b6558e750f7f7fbff45a743 Mon Sep 17 00:00:00 2001 > +From: fidomax > +Date: Thu, 28 Jan 2021 14:48:32 +0300 > +Subject: [PATCH 2/3] Allow optional libs detection when cross-compiling > + > +Signed-off-by: Maxim Kochetkov > +Fetch from: https://github.com/mapnik/mapnik/commit/cf9bde7bf1033f800e5bc9640c586369d45814c6.patch > +--- > + SConstruct | 17 +++++++---------- > + 1 file changed, 7 insertions(+), 10 deletions(-) > + > +diff --git a/SConstruct b/SConstruct > +index 6e169e34c..9e03db662 100644 > +--- a/SConstruct > ++++ b/SConstruct > +@@ -1692,7 +1692,7 @@ if not preconfigured: > + elif boost_version < [1, 57]: > + env.Append(CXXFLAGS = '-DBOOST_NO_CXX11_SCOPED_ENUMS') > + > +- if not env['HOST'] and env['ICU_LIB_NAME'] not in env['MISSING_DEPS']: > ++ if env['ICU_LIB_NAME'] not in env['MISSING_DEPS']: > + # http://lists.boost.org/Archives/boost/2009/03/150076.php > + # we need libicui18n if using static boost libraries, so it is > + # important to try this check with the library linked > +@@ -1703,16 +1703,13 @@ if not preconfigured: > + env['SKIPPED_DEPS'].append('boost_regex_icu') > + > + for libname, headers, required, lang, define in OPTIONAL_LIBSHEADERS: > +- if not env['HOST']: > +- if not conf.CheckLibWithHeader(libname, headers, lang): > +- if required: > +- color_print(1, 'Could not find required header or shared library for %s' % libname) > +- env['MISSING_DEPS'].append(libname) > +- else: > +- color_print(4, 'Could not find optional header or shared library for %s' % libname) > +- env['SKIPPED_DEPS'].append(libname) > ++ if not conf.CheckLibWithHeader(libname, headers, lang): > ++ if required: > ++ color_print(1, 'Could not find required header or shared library for %s' % libname) > ++ env['MISSING_DEPS'].append(libname) > + else: > +- env.Append(CPPDEFINES = define) > ++ color_print(4, 'Could not find optional header or shared library for %s' % libname) > ++ env['SKIPPED_DEPS'].append(libname) > + else: > + env.Append(CPPDEFINES = define) > + > +-- > +2.29.2 > + > diff --git a/package/libmapnik/0003-Allow-lib-data-detection-when-cross-compiling.patch b/package/libmapnik/0003-Allow-lib-data-detection-when-cross-compiling.patch > new file mode 100644 > index 0000000000..5a6d503dc6 > --- /dev/null > +++ b/package/libmapnik/0003-Allow-lib-data-detection-when-cross-compiling.patch > @@ -0,0 +1,70 @@ > +From 3e48998d7beb2f6277ed955b1698c6ce581fad01 Mon Sep 17 00:00:00 2001 > +From: fidomax > +Date: Thu, 28 Jan 2021 15:15:19 +0300 > +Subject: [PATCH 3/3] Allow lib/data detection when cross-compiling generate your patches with 'git format-patch -N'. > + > +Signed-off-by: Maxim Kochetkov > +Fetch from: https://github.com/mapnik/mapnik/commit/4b0d181f6e3dbfe9fdb59fd1fdbd1a6986aaafda.patch Usually we add the patch upstream status: Upstream status: Pending Your patch come from the PR you created: https://github.com/mapnik/mapnik/pull/4208 > +--- > + SConstruct | 45 ++++++++++++++++++++++----------------------- > + 1 file changed, 22 insertions(+), 23 deletions(-) > + > +diff --git a/SConstruct b/SConstruct > +index 9e03db662..4989e6607 100644 > +--- a/SConstruct > ++++ b/SConstruct > +@@ -1719,29 +1719,28 @@ if not preconfigured: > + if env['HOST']: > + SQLITE_HAS_RTREE = True > + > +- if not env['HOST']: > +- env['QUERIED_PROJ_LIB'] = conf.CheckProjData() > +- if os.environ.get('PROJ_LIB'): > +- env['QUERIED_PROJ_LIB'] = os.environ['PROJ_LIB'] > +- color_print(4,'Detected PROJ_LIB in environ, using env value instead: %s' % os.environ['PROJ_LIB'] ) > +- env['QUERIED_ICU_DATA'] = conf.CheckIcuData() > +- if os.environ.get('ICU_DATA'): > +- env['QUERIED_ICU_DATA'] = os.environ['ICU_DATA'] > +- color_print(4,'Detected ICU_DATA in environ, using env value instead: %s' % os.environ['ICU_DATA'] ) > +- env['QUERIED_GDAL_DATA'] = conf.CheckGdalData() > +- if os.environ.get('GDAL_DATA'): > +- env['QUERIED_GDAL_DATA'] = os.environ['GDAL_DATA'] > +- color_print(4,'Detected GDAL_DATA in environ, using env value instead: %s' % os.environ['GDAL_DATA'] ) > +- # now validate the paths actually exist > +- if env['QUERIED_PROJ_LIB'] and not os.path.exists(env['QUERIED_PROJ_LIB']): > +- color_print(1,'%s not detected on your system' % env['QUERIED_PROJ_LIB'] ) > +- env['MISSING_DEPS'].append('PROJ_LIB') > +- if env['QUERIED_GDAL_DATA'] and not os.path.exists(env['QUERIED_GDAL_DATA']): > +- color_print(1,'%s not detected on your system' % env['QUERIED_GDAL_DATA'] ) > +- env['MISSING_DEPS'].append('GDAL_DATA') > +- if env['QUERIED_ICU_DATA'] and not os.path.exists(env['QUERIED_ICU_DATA']): > +- color_print(1,'%s not detected on your system' % env['QUERIED_ICU_DATA'] ) > +- env['MISSING_DEPS'].append('ICU_DATA') > ++ env['QUERIED_PROJ_LIB'] = conf.CheckProjData() > ++ if os.environ.get('PROJ_LIB'): > ++ env['QUERIED_PROJ_LIB'] = os.environ['PROJ_LIB'] > ++ color_print(4,'Detected PROJ_LIB in environ, using env value instead: %s' % os.environ['PROJ_LIB'] ) > ++ env['QUERIED_ICU_DATA'] = conf.CheckIcuData() > ++ if os.environ.get('ICU_DATA'): > ++ env['QUERIED_ICU_DATA'] = os.environ['ICU_DATA'] > ++ color_print(4,'Detected ICU_DATA in environ, using env value instead: %s' % os.environ['ICU_DATA'] ) > ++ env['QUERIED_GDAL_DATA'] = conf.CheckGdalData() > ++ if os.environ.get('GDAL_DATA'): > ++ env['QUERIED_GDAL_DATA'] = os.environ['GDAL_DATA'] > ++ color_print(4,'Detected GDAL_DATA in environ, using env value instead: %s' % os.environ['GDAL_DATA'] ) > ++ # now validate the paths actually exist > ++ if env['QUERIED_PROJ_LIB'] and not os.path.exists(env['QUERIED_PROJ_LIB']): > ++ color_print(1,'%s not detected on your system' % env['QUERIED_PROJ_LIB'] ) > ++ env['MISSING_DEPS'].append('PROJ_LIB') > ++ if env['QUERIED_GDAL_DATA'] and not os.path.exists(env['QUERIED_GDAL_DATA']): > ++ color_print(1,'%s not detected on your system' % env['QUERIED_GDAL_DATA'] ) > ++ env['MISSING_DEPS'].append('GDAL_DATA') > ++ if env['QUERIED_ICU_DATA'] and not os.path.exists(env['QUERIED_ICU_DATA']): > ++ color_print(1,'%s not detected on your system' % env['QUERIED_ICU_DATA'] ) > ++ env['MISSING_DEPS'].append('ICU_DATA') > + > + if len(env['REQUESTED_PLUGINS']): > + if env['HOST']: > +-- > +2.29.2 > + > diff --git a/package/libmapnik/Config.in b/package/libmapnik/Config.in > new file mode 100644 > index 0000000000..06428e59a2 > --- /dev/null > +++ b/package/libmapnik/Config.in > @@ -0,0 +1,29 @@ > +config BR2_PACKAGE_LIBMAPNIK > + bool "libmapnik" There is not dependency ? At least you have to add all reverse dependencies. For example icu package needs the following dependencies: depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 PR56019 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 PR56019 depends on BR2_TOOLCHAIN_HAS_THREADS Same for all other package selected by libmapnik. The SConstruct seems to add -std=c++14 for C++14. This requires a more recent gcc compiler (BR2_TOOLCHAIN_GCC_AT_LEAST_5) > + select BR2_PACKAGE_ICU> + select BR2_PACKAGE_HARFBUZZ > + select BR2_PACKAGE_CAIRO > + select BR2_PACKAGE_CAIRO_PNG > + select BR2_PACKAGE_CAIRO_SVG > + select BR2_PACKAGE_POSTGRESQL > + select BR2_PACKAGE_BOOST > + select BR2_PACKAGE_BOOST_FILESYSTEM > + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS > + select BR2_PACKAGE_BOOST_REGEX > + select BR2_PACKAGE_LIBXML2 > + select BR2_PACKAGE_SQLITE Have you tested with several toolchains ? You can use the script ./utils/test-pkg to do a build test for all supported architectures, supported libc and different gcc compiler versions. > + > + help > + Mapnik is an open source toolkit for developing mapping applications. > + At the core is a C++ shared library providing algorithms and patterns > + for spatial data access and visualization. Mapnik is basically > + a collection of geographic objects like maps, layers, datasources, > + features, and geometries. > + The library doesn't rely on any OS specific "windowing systems" and > + it can be deployed to any server environment. It is intended to play fair > + in a multi-threaded environment and is aimed primarily, but > + not exclusively, at web-based development. > + For further information see http://mapnik.org and also our wiki > + documentation. Use ./utils/check-package package/libmapnik/* to check the coding style: package/libmapnik/Config.in:17: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:18: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:20: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:22: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:22: line contains trailing whitespace package/libmapnik/Config.in:23: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/libmapnik/Config.in:24: line contains trailing whitespace package/libmapnik/Config.in:26: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > + > + https://github.com/mapnik/mapnik > diff --git a/package/libmapnik/libmapnik.mk b/package/libmapnik/libmapnik.mk > new file mode 100644 > index 0000000000..2a019375fd > --- /dev/null > +++ b/package/libmapnik/libmapnik.mk > @@ -0,0 +1,100 @@ > +################################################################################ > +# > +# libmapnik > +# > +################################################################################ > + > +LIBMAPNIK_VERSION = 3.1.0 > +LIBMAPNIK_SITE = https://github.com/mapnik/mapnik/releases/download/v$(LIBMAPNIK_VERSION) > +LIBMAPNIK_SOURCE = mapnik-v$(LIBMAPNIK_VERSION).tar.bz2 > +LIBMAPNIK_LICENSE = LGPL It's a LGPL-2.1 license Use SPDX-License-Identifier. > +LIBMAPNIK_LICENSE_FILES = $(LIBMAPNIK_SUBDIR)/COPYING LIBMAPNIK_SUBDIR is not needed here. The COPYING file is in the main source directory. > +LIBMAPNIK_DEPENDENCIES += host-python3 host-scons icu harfbuzz freetype postgresql boost cairo libxml2 sqlite > +LIBMAPNIK_SCONS_ENV = $(TARGET_CONFIGURE_OPTS) > +LIBMAPNIK_INSTALL_STAGING = YES > + > +ifeq ($(BR2_PACKAGE_JPEG),y) > +LIBMAPNIK_DEPENDENCIES += jpeg > +endif For all optionnal dependencies we needs to handle explicitely the variable provided by the build system. ifeq ($(BR2_PACKAGE_JPEG),y) LIBMAPNIK_DEPENDENCIES += jpeg LIBMAPNIK_SCONS_OPTS += JPEG="True" else LIBMAPNIK_SCONS_OPTS += JPEG="False" endif > + > +ifeq ($(BR2_PACKAGE_PROJ),y) > +LIBMAPNIK_DEPENDENCIES += proj > +endif > + > +ifeq ($(BR2_PACKAGE_LIBPNG),y) > +LIBMAPNIK_DEPENDENCIES += libpng > +endif > + > +ifeq ($(BR2_PACKAGE_WEBP),y) > +LIBMAPNIK_DEPENDENCIES += webp > +endif > + > +ifeq ($(BR2_PACKAGE_TIFF),y) > +LIBMAPNIK_DEPENDENCIES += tiff > +endif > + > + > +LIBMAPNIK_SCONS_OPTS = \ Be carefull with previous LIBMAPNIK_SCONS_OPTS already set by optional dependencies. Maybe move this block before optional dependencies handling. > + CC="$(TARGET_CC)" \ > + CXX="$(TARGET_CXX)" \ Using $(TARGET_CONFIGURE_OPTS) whould set most common values used to cross-build a package. > + HOST="$(GNU_TARGET_NAME)" \ > + CUSTOM_CXXFLAGS="$(TARGET_CXXFLAGS) -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" \ > + CUSTOM_CFLAGS="$(TARGET_CFLAGS) -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" \ > + PLUGIN_LINKING=shared \ > + PREFIX=/usr \ > + DEMO=no \ > + CPP_TESTS=no \ > + PRIORITIZE_LINKING=no \ > + INPUT_PLUGINS=postgis,pgraster,sqlite,shape,csv,raster,geojson,topojson \ > + ICU_INCLUDES=$(STAGING_DIR)/usr/include \ > + ICU_LIBS=$(TARGET_DIR)/usr/lib \ > + SQLITE_INCLUDES=$(STAGING_DIR)/usr/include \ > + SQLITE_LIBS=$(TARGET_DIR)/usr/lib \ > + HB_INCLUDES=$(STAGING_DIR)/usr/include \ > + HB_LIBS=$(TARGET_DIR)/usr/lib \ > + JPEG_INCLUDES=$(STAGING_DIR)/usr/include \ > + JPEG_LIBS=$(TARGET_DIR)/usr/lib \ > + PROJ_INCLUDES=$(STAGING_DIR)/usr/include \ > + PROJ_LIBS=$(TARGET_DIR)/usr/lib \ > + PNG_INCLUDES=$(STAGING_DIR)/usr/include \ > + PNG_LIBS=$(TARGET_DIR)/usr/lib \ > + WEBP_INCLUDES=$(STAGING_DIR)/usr/include \ > + WEBP_LIBS=$(TARGET_DIR)/usr/lib \ > + TIFF_INCLUDES=$(STAGING_DIR)/usr/include \ > + TIFF_LIBS=$(TARGET_DIR)/usr/lib \ > + BOOST_INCLUDES=$(STAGING_DIR)/usr/include/boost \ > + BOOST_LIBS=$(TARGET_DIR)/usr/lib \ > + RASTERLITE_LIBS=$(TARGET_DIR)/usr/lib \ > + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig \ > + FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config The scons build system really needs all the above... > + > +define LIBMAPNIK_CONFIGURE_CMDS > + (export PROJ_LIB=$(TARGET_DIR)/usr/lib; cd $(@D); $(LIBMAPNIK_SCONS_ENV) $(HOST_DIR)/bin/python3 scons/scons.py configure Add PROJ_LIB directly in LIBMAPNIK_SCONS_ENV Maybe you can provide -j$(PARALLEL_JOBS) but the build system seems fragile... Try to replace "$(HOST_DIR)/bin/python3 scons/scons.py" by $(SCONS) $(LIBMAPNIK_SCONS_OPTS)) > +endef > + > +define LIBMAPNIK_BUILD_CMDS > + (cd $(@D); $(LIBMAPNIK_SCONS_ENV) $(HOST_DIR)/bin/python3 scons/scons.py) > +endef > + > +define LIBMAPNIK_INSTALL_STAGING_CMDS > + cp -rdpf $(@D)/src/libmapnik.* \ > + $(STAGING_DIR)/usr/lib/ > + $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/mapnik > + cp -rdpf $(@D)/include/mapnik/. \ > + $(STAGING_DIR)/usr/include/mapnik > + $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/mapbox > + cp -rdpf $(@D)/deps/mapbox/variant/include/mapbox/. \ > + $(STAGING_DIR)/usr/include/mapbox > + When possible use the intall command provided by the build system: DESTDIR=$(STAGING_DIR) $(SCONS) -j$(JOBS) --config=cache --implicit-cache --max-drift=1 install (see the install command from the Makefile) > +endef > + > +define LIBMAPNIK_INSTALL_TARGET_CMDS > + cp -rdpf $(@D)/src/libmapnik.* \ > + $(TARGET_DIR)/usr/lib/ > + $(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/lib/mapnik/input > + cp -rdpf $(@D)/plugins/input/*.input \ > + $(TARGET_DIR)/usr/lib/mapnik/input > + > +endef DESTDIR=$(STAGING_DIR) $(SCONS) -j$(JOBS) --config=cache --implicit-cache --max-drift=1 install I have marked this patch as "Changes Requested". Please use test-pkg script and post the test result. For example: https://gitlab.com/buildroot.org/buildroot/-/commit/c7e23ecd442032cc860b77135eda8bb8888d8f70 Best regards, Romain > + > +$(eval $(generic-package)) > From arnout at mind.be Sun Jan 9 22:48:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:48:56 +0100 Subject: [Buildroot] [PATCH v3 0/3] PEP517 host packages In-Reply-To: <20220109035601.2483360-1-james.hilliard1@gmail.com> References: <20220109035601.2483360-1-james.hilliard1@gmail.com> Message-ID: <34f36744-bb9d-f638-512a-ca42e711986c@mind.be> On 09/01/2022 04:55, James Hilliard wrote: > This series adds host packages that will be used for PEP517 based > python-package infrastructure in a future series. > > See: > https://www.python.org/dev/peps/pep-0517/ > > --- > Changes v2 -> v3: > - rebase on master > > James Hilliard (3): > package/python-pep517: new package > package/python-pypa-build: new package > package/python-installer: new package Series applied to master, after adding you to DEVELOPERS. Regards, Arnout > > .../python-installer/python-installer.hash | 5 +++++ > package/python-installer/python-installer.mk | 15 +++++++++++++++ > package/python-pep517/python-pep517.hash | 5 +++++ > package/python-pep517/python-pep517.mk | 16 ++++++++++++++++ > .../python-pypa-build/python-pypa-build.hash | 5 +++++ > .../python-pypa-build/python-pypa-build.mk | 19 +++++++++++++++++++ > 6 files changed, 65 insertions(+) > create mode 100644 package/python-installer/python-installer.hash > create mode 100644 package/python-installer/python-installer.mk > create mode 100644 package/python-pep517/python-pep517.hash > create mode 100644 package/python-pep517/python-pep517.mk > create mode 100644 package/python-pypa-build/python-pypa-build.hash > create mode 100644 package/python-pypa-build/python-pypa-build.mk > From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/python-pep517: new package Message-ID: <20220109224247.4E89D832B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=860e9b3f553511d772573427ebaa6371e205aa9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/python-pep517/python-pep517.hash | 5 +++++ package/python-pep517/python-pep517.mk | 16 ++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ed65c74319..260dcce912 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1306,6 +1306,7 @@ F: package/python-greenlet/ F: package/python-janus/ F: package/python-logstash/ F: package/python-multidict/ +F: package/python-pep517/ F: package/python-pycares/ F: package/python-pydyf/ F: package/python-pyphen/ diff --git a/package/python-pep517/python-pep517.hash b/package/python-pep517/python-pep517.hash new file mode 100644 index 0000000000..4dd4c47fa0 --- /dev/null +++ b/package/python-pep517/python-pep517.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pep517/json +md5 7ed0adb5f737c316e071d48d66329a5d pep517-0.12.0.tar.gz +sha256 931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 pep517-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk new file mode 100644 index 0000000000..da0431a637 --- /dev/null +++ b/package/python-pep517/python-pep517.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pep517 +# +################################################################################ + +PYTHON_PEP517_VERSION = 0.12.0 +PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz +PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 +PYTHON_PEP517_LICENSE = MIT +PYTHON_PEP517_LICENSE_FILES = LICENSE +PYTHON_PEP517_SETUP_TYPE = distutils +HOST_PYTHON_PEP517_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli + +$(eval $(host-python-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/python-installer: new package Message-ID: <20220109224247.634AC832C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f51c6f6b5c75499bb55be913b5c3533d5a8f648 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/python-installer/python-installer.hash | 5 +++++ package/python-installer/python-installer.mk | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1c83c53658..e715d8d353 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1303,6 +1303,7 @@ F: package/python-flatbuffers/ F: package/python-fonttools/ F: package/python-frozenlist/ F: package/python-greenlet/ +F: package/python-installer/ F: package/python-janus/ F: package/python-logstash/ F: package/python-multidict/ diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash new file mode 100644 index 0000000000..68af457664 --- /dev/null +++ b/package/python-installer/python-installer.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/installer/json +md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz +sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk new file mode 100644 index 0000000000..2c1d371dab --- /dev/null +++ b/package/python-installer/python-installer.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-installer +# +################################################################################ + +PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_LICENSE = MIT +PYTHON_INSTALLER_LICENSE_FILES = LICENSE +PYTHON_INSTALLER_SETUP_TYPE = distutils +HOST_PYTHON_INSTALLER_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/avrdude: add support for hidapi Message-ID: <20220109224247.87B10832C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7bdb65b3109a8256c6052f2cb35a989432f7a508 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master If BR2_PACKAGE_HIDAPI is selected, add it to avrdude build dependencies. Signed-off-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/avrdude/avrdude.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 6a8e9074b7..accd92c1d5 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -28,6 +28,10 @@ else ifeq ($(BR2_PACKAGE_LIBFTDI),y) AVRDUDE_DEPENDENCIES += libftdi endif +ifeq ($(BR2_PACKAGE_HIDAPI),y) +AVRDUDE_DEPENDENCIES += hidapi +endif + # if /etc/avrdude.conf exists, the installation process creates a # backup file, which we do not want in the context of Buildroot. define AVRDUDE_REMOVE_BACKUP_FILE From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/libsigrok: fix C++ build with glibmm 2.68 Message-ID: <20220109224247.3B9328324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4872d527319d710d5ebc04ed0b93b4e4a733e035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cxx bindings are, silently, disabled since bump of glibmm to version 2.68.2 in commit dddb65efbdf2c7952f22a1e51009f17f1676db4a resulting in the following build failure with pulseview: -- Package 'libsigrokcxx', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libsigrok/0001-Support-glibmm-2.68.patch | 129 +++++++++++++++++++++++ package/libsigrok/libsigrok.mk | 3 + 2 files changed, 132 insertions(+) diff --git a/package/libsigrok/0001-Support-glibmm-2.68.patch b/package/libsigrok/0001-Support-glibmm-2.68.patch new file mode 100644 index 0000000000..14d14ec406 --- /dev/null +++ b/package/libsigrok/0001-Support-glibmm-2.68.patch @@ -0,0 +1,129 @@ +From 31ad5ec50ec0c9cc7a92f009925c5f58aecdcce1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 Dec 2021 14:58:11 +0100 +Subject: [PATCH] Support glibmm 2.68 + +Support glibmm 2.68 which has been released one year ago and is the +first stable release in the glibmm-2.68 ABI series: +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS + +As TimeVal is not available with glibmm 2.68, use DateTime which is +available since version 2.26 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceforge.net/p/sigrok/mailman/message/37410614] +--- + README | 2 +- + bindings/cxx/classes.cpp | 13 ++++++------- + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp | 4 ++-- + bindings/cxx/libsigrokcxx.pc.in | 2 +- + configure.ac | 7 ++++++- + 5 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/README b/README +index 768c8ca2..2515f059 100644 +--- a/README ++++ b/README +@@ -63,7 +63,7 @@ Requirements for the C++ bindings: + - doxygen (required for building the bindings, not only for C++ API docs!) + - graphviz (optional, only needed for the C++ API docs) + - Python (2 or 3) executable (development files are not needed) +- - glibmm-2.4 (>= 2.32.0) ++ - glibmm-2.4 (>= 2.32.0) or glibmm-2.68 (>= 2.68.0) + + Requirements for the Python bindings: + +diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp +index f9f79273..de600d03 100644 +--- a/bindings/cxx/classes.cpp ++++ b/bindings/cxx/classes.cpp +@@ -287,12 +287,12 @@ shared_ptr Context::create_user_device( + default_delete{}}; + } + +-shared_ptr Context::create_header_packet(Glib::TimeVal start_time) ++shared_ptr Context::create_header_packet(Glib::DateTime start_time) + { + auto header = g_new(struct sr_datafeed_header, 1); + header->feed_version = 1; +- header->starttime.tv_sec = start_time.tv_sec; +- header->starttime.tv_usec = start_time.tv_usec; ++ header->starttime.tv_sec = start_time.to_unix(); ++ header->starttime.tv_usec = start_time.get_microsecond(); + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_HEADER; + packet->payload = header; +@@ -1154,11 +1154,10 @@ int Header::feed_version() const + return _structure->feed_version; + } + +-Glib::TimeVal Header::start_time() const ++Glib::DateTime Header::start_time() const + { +- return Glib::TimeVal( +- _structure->starttime.tv_sec, +- _structure->starttime.tv_usec); ++ Glib::DateTime time = Glib::DateTime::create_now_utc(_structure->starttime.tv_sec); ++ return time.add_seconds(_structure->starttime.tv_usec / 1.0e6); + } + + Meta::Meta(const struct sr_datafeed_meta *structure) : +diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +index 97e54e17..d090c379 100644 +--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp ++++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +@@ -274,7 +274,7 @@ public: + std::shared_ptr create_user_device( + std::string vendor, std::string model, std::string version); + /** Create a header packet. */ +- std::shared_ptr create_header_packet(Glib::TimeVal start_time); ++ std::shared_ptr create_header_packet(Glib::DateTime start_time); + /** Create a meta packet. */ + std::shared_ptr create_meta_packet( + std::map config); +@@ -711,7 +711,7 @@ public: + /* Feed version number. */ + int feed_version() const; + /* Start time of this session. */ +- Glib::TimeVal start_time() const; ++ Glib::DateTime start_time() const; + private: + explicit Header(const struct sr_datafeed_header *structure); + ~Header(); +diff --git a/bindings/cxx/libsigrokcxx.pc.in b/bindings/cxx/libsigrokcxx.pc.in +index 10a92f2d..7d2723fc 100644 +--- a/bindings/cxx/libsigrokcxx.pc.in ++++ b/bindings/cxx/libsigrokcxx.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: libsigrokcxx + Description: C++ bindings for libsigrok + URL: http://www.sigrok.org +-Requires: libsigrok glibmm-2.4 ++Requires: libsigrok @SR_GLIBMM_REQUIRES@ + Version: @SR_PACKAGE_VERSION@ + Libs: -L${libdir} -lsigrokcxx + Libs.private: -lm +diff --git a/configure.ac b/configure.ac +index 424b0002..d70575b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -407,9 +407,14 @@ AS_IF([test "x$HAVE_CXX11" != x1], + [SR_APPEND([sr_cxx_missing], [', '], ['C++11'])]) + + # The C++ bindings need glibmm. +-SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0]) ++SR_GLIBMM_REQUIRES=glibmm-2.4 ++SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.32.0]) ++AS_IF([test "x$sr_have_glibmm" != xyes], ++ [SR_GLIBMM_REQUIRES=glibmm-2.68 ++ SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [$SR_GLIBMM_REQUIRES >= 2.68.0])]) + AS_IF([test "x$sr_have_glibmm" != xyes], + [SR_APPEND([sr_cxx_missing], [', '], [glibmm])]) ++AC_SUBST(SR_GLIBMM_REQUIRES) + + # The C++ bindings use Doxygen to parse libsigrok symbols. + AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no]) +-- +2.34.1 + diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 8e7c355fd0..2a26518614 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -11,6 +11,8 @@ LIBSIGROK_LICENSE_FILES = COPYING LIBSIGROK_INSTALL_STAGING = YES LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf LIBSIGROK_CONF_OPTS = --disable-java --disable-python +# We're patching configure.ac +LIBSIGROK_AUTORECONF = YES ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) LIBSIGROK_CONF_OPTS += --with-libbluez @@ -52,6 +54,7 @@ LIBSIGROK_DEPENDENCIES += glibmm endif ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) +LIBSIGROK_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++17" LIBSIGROK_CONF_OPTS += --enable-cxx # host-doxygen is used by C++ bindings to parse libsigrok symbols LIBSIGROK_DEPENDENCIES += \ From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/python-argon2-cffi-bindings: new package Message-ID: <20220109224247.6F02C8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7be02d67a939a42e323cd199798f215197bf5f87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-argon2-cffi-bindings/Config.in | 11 ++++++++++ .../python-argon2-cffi-bindings.hash | 5 +++++ .../python-argon2-cffi-bindings.mk | 25 ++++++++++++++++++++++ 5 files changed, 43 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e715d8d353..2aeb80844e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1291,6 +1291,7 @@ F: package/python-aiorwlock/ F: package/python-aiosignal/ F: package/python-aiozipkin/ F: package/python-argon2-cffi/ +F: package/python-argon2-cffi-bindings/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-bidict/ diff --git a/package/Config.in b/package/Config.in index 5e01187b83..c9d099bd39 100644 --- a/package/Config.in +++ b/package/Config.in @@ -928,6 +928,7 @@ menu "External python modules" source "package/python-ansicolors/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" + source "package/python-argon2-cffi-bindings/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in new file mode 100644 index 0000000000..3d409759e0 --- /dev/null +++ b/package/python-argon2-cffi-bindings/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS + bool "python-argon2-cffi-bindings" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU # libargon2 + depends on !BR2_STATIC_LIBS # libargon2 + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_LIBARGON2 + help + Low-level CFFI bindings for Argon2. + + https://github.com/hynek/argon2-cffi-bindings diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash new file mode 100644 index 0000000000..e088d3dad1 --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/argon2-cffi-bindings/json +md5 f1591e1af7dea9ef3e5b982e2c196c1d argon2-cffi-bindings-21.2.0.tar.gz +sha256 bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 argon2-cffi-bindings-21.2.0.tar.gz +# Locally computed sha256 checksums +sha256 9c158d4f433627f48ac24b6b4d37970afe4172514673c5318014d7cca157c6df LICENSE diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk new file mode 100644 index 0000000000..f0d71e803a --- /dev/null +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# python-argon2-cffi-bindings +# +################################################################################ + +PYTHON_ARGON2_CFFI_BINDINGS_VERSION = 21.2.0 +PYTHON_ARGON2_CFFI_BINDINGS_SOURCE = argon2-cffi-bindings-$(PYTHON_ARGON2_CFFI_BINDINGS_VERSION).tar.gz +PYTHON_ARGON2_CFFI_BINDINGS_SITE = https://files.pythonhosted.org/packages/b9/e9/184b8ccce6683b0aa2fbb7ba5683ea4b9c5763f1356347f1312c32e3c66e +PYTHON_ARGON2_CFFI_BINDINGS_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE = MIT +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE_FILES = LICENSE +PYTHON_ARGON2_CFFI_BINDINGS_DEPENDENCIES = \ + host-python-cffi \ + host-python-setuptools-scm \ + libargon2 +PYTHON_ARGON2_CFFI_BINDINGS_ENV = ARGON2_CFFI_USE_SYSTEM=1 + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=1 +else +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=0 +endif + +$(eval $(python-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: fix build on kernel < 5.10 Message-ID: <20220109224247.772EB8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=570ed7b8229222de70c11c2550f4694475445997 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master zoned depends on kernel >= 5.10: https://github.com/kdave/btrfs-progs/commit/d4b4baf312ff083fb1e85de92167ea3e968c684c Fix the following build failure raised since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: checking linux/blkzoned.h usability... yes checking linux/blkzoned.h presence... yes checking for linux/blkzoned.h... yes checking for struct blk_zone.capacity... no checking for BLKGETZONESZ defined in linux/blkzoned.h... yes configure: error: linux/blkzoned.h does not provide blk_zone.capacity Fixes: - http://autobuild.buildroot.org/results/381c7e8b4bfa624c3eca3ce072cfa412aba57f84 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/btrfs-progs/btrfs-progs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index b010a0e0be..54922df839 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -44,6 +44,12 @@ else BTRFS_PROGS_CONF_OPTS += --disable-libudev endif +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10),y) +BTRFS_PROGS_CONF_OPTS += --enable-zoned +else +BTRFS_PROGS_CONF_OPTS += --disable-zoned +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Giulio Benetti as co-maintainer to mali-driver and rockchip-mali packages Message-ID: <20220109224247.9B301832B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=622a1f7140b5148031c16c40e2323e11af12da99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 933736de7d..55f37dfe62 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1094,9 +1094,11 @@ F: package/harfbuzz/ F: package/libfuse3/ F: package/libnspr/ F: package/libnss/ +F: package/mali-driver/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ +F: package/rockchip-mali/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/moby-buildkit: new package Message-ID: <20220109224247.92DB88324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e33104c26139f7a6cfc14d5a1b71ac552630e14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart [Romain: - remove host-pkgconf dependency - Add the license file hash - Fix the check-package warning in Config.in] Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/moby-buildkit/Config.in | 19 +++++++++++++++++++ package/moby-buildkit/moby-buildkit.hash | 3 +++ package/moby-buildkit/moby-buildkit.mk | 22 ++++++++++++++++++++++ 5 files changed, 46 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2aeb80844e..933736de7d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -533,6 +533,7 @@ F: package/fuse-overlayfs/ F: package/go/ F: package/gocryptfs/ F: package/mbpfan/ +F: package/moby-buildkit/ F: package/mosh/ F: package/pkg-golang.mk F: package/rtl8821au/ diff --git a/package/Config.in b/package/Config.in index c9d099bd39..a1924f96df 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2556,6 +2556,7 @@ menu "System tools" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" + source "package/moby-buildkit/Config.in" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in new file mode 100644 index 0000000000..93c852bcdb --- /dev/null +++ b/package/moby-buildkit/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_MOBY_BUILDKIT + bool "moby-buildkit" + 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 + depends on BR2_USE_MMU + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + help + BuildKit is a toolkit for converting source code to build + artifacts in an efficient, expressive and repeatable manner. + + https://github.com/moby/buildkit + +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" + 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 || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_USE_MMU diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash new file mode 100644 index 0000000000..3015e479f6 --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk new file mode 100644 index 0000000000..3f0df351ef --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# moby-buildkit +# +################################################################################ + +MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) +MOBY_BUILDKIT_LICENSE = Apache-2.0 +MOBY_BUILDKIT_LICENSE_FILES = LICENSE + +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit + +MOBY_BUILDKIT_TAGS = cgo +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd + +MOBY_BUILDKIT_LDFLAGS = \ + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" + +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) + +$(eval $(golang-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/vte: bump to version 0.66.2 Message-ID: <20220109224247.7FABD832B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53c0c7dd01228122c7ceb44d65f2800dbcf473f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to meson-package and so replace host-intltool dependency by TARGET_NLS_DEPENDENCIES: https://gitlab.gnome.org/GNOME/vte/-/issues/87 - Retrieve upstream hash - Switch license file to LGPL-3.0+: https://gitlab.gnome.org/GNOME/vte/-/commit/5e14529d4219f3792690566ef7ec70febd87e070 - Drop libxml2 dependency (not needed with meson) - Add uclibc or glibc dependency, upstream doesn't want to support musl: https://gitlab.gnome.org/GNOME/vte/-/issues/72 https://gitlab.gnome.org/GNOME/vte/-/issues/247 - Add optional icu dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/9e4fbae2cabcd937ac4d1a984ba844d24b44b83f - Add optional libfribidi dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/7d3704f1c54e58443624355835f675ec22c6b9d3 - Add optional systemd dependency: https://gitlab.gnome.org/GNOME/vte/-/commit/81bd158c24ef1d716d3cbf801e72fda2e11b81b4 - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...build-with-kernel-headers-from-linux-4-13.patch | 54 ++++++++++++++++++++++ ...eck-for-fstack-protector-compiler-support.patch | 43 +++++++++++++++++ package/vte/Config.in | 7 +-- package/vte/vte.hash | 8 ++-- package/vte/vte.mk | 45 +++++++++++++----- 5 files changed, 139 insertions(+), 18 deletions(-) diff --git a/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch new file mode 100644 index 0000000000..7c3a5ab05e --- /dev/null +++ b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch @@ -0,0 +1,54 @@ +From 91123bb5201156e3d3adbe24305488f5eea2c8d7 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Mon, 27 Sep 2021 22:46:47 +0200 +Subject: [PATCH] build: Fix build with kernel headers from linux < 4.13 + +We already support running with a kernel that doesn't support this +ioctl, so let's also support building with one. Add the missing +ioctl definition to missing.hh. + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2514 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/vte/-/commit/91123bb5201156e3d3adbe24305488f5eea2c8d7] +Signed-off-by: Fabrice Fontaine +--- + src/missing.hh | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/missing.hh b/src/missing.hh +index e5a58727..7902e41e 100644 +--- a/src/missing.hh ++++ b/src/missing.hh +@@ -23,11 +23,14 @@ + #include + + #ifdef __linux__ ++ ++#include + #include + + #if defined(__mips__) || defined(__mips64__) + #include + #endif ++ + #endif + + /* NSIG isn't in POSIX, so if it doesn't exist use this here. See bug #759196 */ +@@ -128,4 +131,13 @@ char* strchrnul(char const* s, + #define CLOSE_RANGE_CLOEXEC (1u << 2) + #endif + ++#if !defined(TIOCGPTPEER) ++/* See linux commit 54ebbfb1603415d9953c150535850d30609ef077 */ ++#if defined(__sparc__) ++#define TIOCGPTPEER _IOR('t', 137, int) ++#else ++#define TIOCGPTPEER _IOR('T', 0x41, int) ++#endif ++#endif /* !TIOCGPTPEER */ ++ + #endif /* __linux__ */ +-- +GitLab + diff --git a/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch new file mode 100644 index 0000000000..67b6c47482 --- /dev/null +++ b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch @@ -0,0 +1,43 @@ +From e32dba1d5cf884959af5b2c0691db00c263ea048 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Mon, 27 Dec 2021 19:24:46 +0100 +Subject: [PATCH] build: Fix check for -fstack-protector* compiler support + +Need to use has_link_argument() on some platforms. + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2535 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/vte/-/commit/e32dba1d5cf884959af5b2c0691db00c263ea048] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 93b7f376..381d5d58 100644 +--- a/meson.build ++++ b/meson.build +@@ -461,8 +461,6 @@ compiler_flags_common = [ + '-fdiagnostics-show-option', + '-fno-common', + '-fno-semantic-interposition', +- '-fstack-protector', +- '-fstack-protector-strong', + ] + + if enable_debug +@@ -550,6 +548,10 @@ add_project_arguments(global_cxxflags, language: 'cpp') + linker_flags = [ + ['-Wl,-Bsymbolic', false,], + ['-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),], ++ ++ # See issue vte#2535. ++ ['-fstack-protector', false], ++ ['-fstack-protector-strong', false], + ] + + foreach flag: linker_flags +-- +GitLab + diff --git a/package/vte/Config.in b/package/vte/Config.in index 96de3d38cc..2635a6007c 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -7,11 +7,11 @@ config BR2_PACKAGE_VTE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PCRE2 help VTE is a library (libvte) implementing a terminal emulator @@ -22,13 +22,14 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte -comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + BR2_TOOLCHAIN_USES_MUSL comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS diff --git a/package/vte/vte.hash b/package/vte/vte.hash index 3fbc5acab0..90818d31f3 100644 --- a/package/vte/vte.hash +++ b/package/vte/vte.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 vte-0.48.3.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum +sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz + +# Hash for license file: +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LGPL3 diff --git a/package/vte/vte.mk b/package/vte/vte.mk index 6c8d1433f5..07e813685e 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -4,26 +4,47 @@ # ################################################################################ -VTE_VERSION = 0.48.3 +VTE_VERSION_MAJOR = 0.66 +VTE_VERSION = $(VTE_VERSION_MAJOR).2 VTE_SOURCE = vte-$(VTE_VERSION).tar.xz -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48 -VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2 -VTE_LICENSE = LGPL-2.1+ -VTE_LICENSE_FILES = COPYING -VTE_CONF_OPTS += --disable-vala +VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) +VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) +VTE_LICENSE = LGPL-3.0+ +VTE_LICENSE_FILES = COPYING.LGPL3 + +ifeq ($(BR2_PACKAGE_ICU),y) +VTE_CONF_OPTS += -Dicu=true +VTE_DEPENDENCIES += icu +else +VTE_CONF_OPTS += -Dicu=false +endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -VTE_CONF_OPTS += --enable-introspection -VTE_DEPENDENCIES += gobject-introspection +VTE_CONF_OPTS += -Dgir=true -Dvapi=true +VTE_DEPENDENCIES += host-vala gobject-introspection else -VTE_CONF_OPTS += --disable-introspection +VTE_CONF_OPTS += -Dgir=false -Dvapi=false endif ifeq ($(BR2_PACKAGE_GNUTLS),y) -VTE_CONF_OPTS += --with-gnutls +VTE_CONF_OPTS += -Dgnutls=true VTE_DEPENDENCIES += gnutls else -VTE_CONF_OPTS += --without-gnutls +VTE_CONF_OPTS += -Dgnutls=false +endif + +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) +VTE_CONF_OPTS += -Dfribidi=true +VTE_DEPENDENCIES += libfribidi +else +VTE_CONF_OPTS += -Dfribidi=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +VTE_CONF_OPTS += -D_systemd=true +VTE_DEPENDENCIES += systemd +else +VTE_CONF_OPTS += -D_systemd=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Sun Jan 9 22:45:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 9 Jan 2022 23:45:11 +0100 Subject: [Buildroot] [git commit] package/python-pypa-build: new package Message-ID: <20220109224247.595AC8324A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7786524be67e98ffa88f75581b41531fb69c4372 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Due to a namespace clash with python-build we need to use a different package name. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/python-pypa-build/python-pypa-build.hash | 5 +++++ package/python-pypa-build/python-pypa-build.mk | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 260dcce912..1c83c53658 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1309,6 +1309,7 @@ F: package/python-multidict/ F: package/python-pep517/ F: package/python-pycares/ F: package/python-pydyf/ +F: package/python-pypa-build/ F: package/python-pyphen/ F: package/python-snappy/ F: package/python-sockjs/ diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash new file mode 100644 index 0000000000..c7daedc6b3 --- /dev/null +++ b/package/python-pypa-build/python-pypa-build.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/build/json +md5 ec3dbe55359ee735b45766b30dfad877 build-0.7.0.tar.gz +sha256 1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f build-0.7.0.tar.gz +# Locally computed sha256 checksums +sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk new file mode 100644 index 0000000000..6babade672 --- /dev/null +++ b/package/python-pypa-build/python-pypa-build.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-pypa-build +# +################################################################################ + +PYTHON_PYPA_BUILD_VERSION = 0.7.0 +PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b775216bb1f34962beaf005f38460c6161177fef6e068a7a0c30a1597 +PYTHON_PYPA_BUILD_LICENSE = MIT +PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE +PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools +HOST_PYTHON_PYPA_BUILD_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ + host-python-packaging \ + host-python-pep517 \ + host-python-tomli + +$(eval $(host-python-package)) From arnout at mind.be Sun Jan 9 22:49:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:49:11 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-argon2-cffi-bindings: new package In-Reply-To: <20220109035935.2698421-1-james.hilliard1@gmail.com> References: <20220109035935.2698421-1-james.hilliard1@gmail.com> Message-ID: <756040b6-aff4-da3f-f6c8-468c58517288@mind.be> On 09/01/2022 04:59, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - rebase on master > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-argon2-cffi-bindings/Config.in | 11 ++++++++ > .../python-argon2-cffi-bindings.hash | 5 ++++ > .../python-argon2-cffi-bindings.mk | 25 +++++++++++++++++++ > 5 files changed, 43 insertions(+) > create mode 100644 package/python-argon2-cffi-bindings/Config.in > create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash > create mode 100644 package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 3b544cae6b..c5186e029a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1291,6 +1291,7 @@ F: package/python-aiorwlock/ > F: package/python-aiosignal/ > F: package/python-aiozipkin/ > F: package/python-argon2-cffi/ > +F: package/python-argon2-cffi-bindings/ > F: package/python-async-lru/ > F: package/python-async-timeout/ > F: package/python-bidict/ > diff --git a/package/Config.in b/package/Config.in > index 378d6e8c0c..bc2113765b 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -925,6 +925,7 @@ menu "External python modules" > source "package/python-ansicolors/Config.in" > source "package/python-argh/Config.in" > source "package/python-argon2-cffi/Config.in" > + source "package/python-argon2-cffi-bindings/Config.in" > source "package/python-arrow/Config.in" > source "package/python-asgiref/Config.in" > source "package/python-asn1crypto/Config.in" > diff --git a/package/python-argon2-cffi-bindings/Config.in b/package/python-argon2-cffi-bindings/Config.in > new file mode 100644 > index 0000000000..3d409759e0 > --- /dev/null > +++ b/package/python-argon2-cffi-bindings/Config.in > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS > + bool "python-argon2-cffi-bindings" > + depends on BR2_PACKAGE_PYTHON3 > + depends on BR2_USE_MMU # libargon2 > + depends on !BR2_STATIC_LIBS # libargon2 > + select BR2_PACKAGE_PYTHON_CFFI # runtime > + select BR2_PACKAGE_LIBARGON2 > + help > + Low-level CFFI bindings for Argon2. > + > + https://github.com/hynek/argon2-cffi-bindings > diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash > new file mode 100644 > index 0000000000..e088d3dad1 > --- /dev/null > +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/argon2-cffi-bindings/json > +md5 f1591e1af7dea9ef3e5b982e2c196c1d argon2-cffi-bindings-21.2.0.tar.gz > +sha256 bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 argon2-cffi-bindings-21.2.0.tar.gz > +# Locally computed sha256 checksums > +sha256 9c158d4f433627f48ac24b6b4d37970afe4172514673c5318014d7cca157c6df LICENSE > diff --git a/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk > new file mode 100644 > index 0000000000..f0d71e803a > --- /dev/null > +++ b/package/python-argon2-cffi-bindings/python-argon2-cffi-bindings.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# python-argon2-cffi-bindings > +# > +################################################################################ > + > +PYTHON_ARGON2_CFFI_BINDINGS_VERSION = 21.2.0 > +PYTHON_ARGON2_CFFI_BINDINGS_SOURCE = argon2-cffi-bindings-$(PYTHON_ARGON2_CFFI_BINDINGS_VERSION).tar.gz > +PYTHON_ARGON2_CFFI_BINDINGS_SITE = https://files.pythonhosted.org/packages/b9/e9/184b8ccce6683b0aa2fbb7ba5683ea4b9c5763f1356347f1312c32e3c66e > +PYTHON_ARGON2_CFFI_BINDINGS_SETUP_TYPE = setuptools > +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE = MIT > +PYTHON_ARGON2_CFFI_BINDINGS_LICENSE_FILES = LICENSE > +PYTHON_ARGON2_CFFI_BINDINGS_DEPENDENCIES = \ > + host-python-cffi \ > + host-python-setuptools-scm \ > + libargon2 > +PYTHON_ARGON2_CFFI_BINDINGS_ENV = ARGON2_CFFI_USE_SYSTEM=1 > + > +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) > +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=1 > +else > +PYTHON_ARGON2_CFFI_BINDINGS_ENV += ARGON2_CFFI_USE_SSE2=0 > +endif > + > +$(eval $(python-package)) > From arnout at mind.be Sun Jan 9 22:49:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:49:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/vte: bump to version 0.66.2 In-Reply-To: <20220109171609.2527192-1-fontaine.fabrice@gmail.com> References: <20220109171609.2527192-1-fontaine.fabrice@gmail.com> Message-ID: <65a72688-6b48-47f0-f4b7-fffd5346e7ee@mind.be> On 09/01/2022 18:16, Fabrice Fontaine wrote: > - Switch to meson-package and so replace host-intltool dependency by > TARGET_NLS_DEPENDENCIES: > https://gitlab.gnome.org/GNOME/vte/-/issues/87 > - Retrieve upstream hash > - Switch license file to LGPL-3.0+: > https://gitlab.gnome.org/GNOME/vte/-/commit/5e14529d4219f3792690566ef7ec70febd87e070 > - Drop libxml2 dependency (not needed with meson) > - Add uclibc or glibc dependency, upstream doesn't want to support musl: > https://gitlab.gnome.org/GNOME/vte/-/issues/72 > https://gitlab.gnome.org/GNOME/vte/-/issues/247 > - Add optional icu dependency: > https://gitlab.gnome.org/GNOME/vte/-/commit/9e4fbae2cabcd937ac4d1a984ba844d24b44b83f > - Add optional libfribidi dependency: > https://gitlab.gnome.org/GNOME/vte/-/commit/7d3704f1c54e58443624355835f675ec22c6b9d3 > - Add optional systemd dependency: > https://gitlab.gnome.org/GNOME/vte/-/commit/81bd158c24ef1d716d3cbf801e72fda2e11b81b4 > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-with-kernel-headers-from-linux-4-13.patch | 54 +++++++++++++++++++ > ...or-fstack-protector-compiler-support.patch | 43 +++++++++++++++ > package/vte/Config.in | 7 +-- > package/vte/vte.hash | 8 +-- > package/vte/vte.mk | 45 +++++++++++----- > 5 files changed, 139 insertions(+), 18 deletions(-) > create mode 100644 package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch > create mode 100644 package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch > > diff --git a/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch > new file mode 100644 > index 0000000000..7c3a5ab05e > --- /dev/null > +++ b/package/vte/0001-build-Fix-build-with-kernel-headers-from-linux-4-13.patch > @@ -0,0 +1,54 @@ > +From 91123bb5201156e3d3adbe24305488f5eea2c8d7 Mon Sep 17 00:00:00 2001 > +From: Christian Persch > +Date: Mon, 27 Sep 2021 22:46:47 +0200 > +Subject: [PATCH] build: Fix build with kernel headers from linux < 4.13 > + > +We already support running with a kernel that doesn't support this > +ioctl, so let's also support building with one. Add the missing > +ioctl definition to missing.hh. > + > +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2514 > + > +[Retrieved from: > +https://gitlab.gnome.org/GNOME/vte/-/commit/91123bb5201156e3d3adbe24305488f5eea2c8d7] > +Signed-off-by: Fabrice Fontaine > +--- > + src/missing.hh | 12 ++++++++++++ > + 1 file changed, 12 insertions(+) > + > +diff --git a/src/missing.hh b/src/missing.hh > +index e5a58727..7902e41e 100644 > +--- a/src/missing.hh > ++++ b/src/missing.hh > +@@ -23,11 +23,14 @@ > + #include > + > + #ifdef __linux__ > ++ > ++#include > + #include > + > + #if defined(__mips__) || defined(__mips64__) > + #include > + #endif > ++ > + #endif > + > + /* NSIG isn't in POSIX, so if it doesn't exist use this here. See bug #759196 */ > +@@ -128,4 +131,13 @@ char* strchrnul(char const* s, > + #define CLOSE_RANGE_CLOEXEC (1u << 2) > + #endif > + > ++#if !defined(TIOCGPTPEER) > ++/* See linux commit 54ebbfb1603415d9953c150535850d30609ef077 */ > ++#if defined(__sparc__) > ++#define TIOCGPTPEER _IOR('t', 137, int) > ++#else > ++#define TIOCGPTPEER _IOR('T', 0x41, int) > ++#endif > ++#endif /* !TIOCGPTPEER */ > ++ > + #endif /* __linux__ */ > +-- > +GitLab > + > diff --git a/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch > new file mode 100644 > index 0000000000..67b6c47482 > --- /dev/null > +++ b/package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch > @@ -0,0 +1,43 @@ > +From e32dba1d5cf884959af5b2c0691db00c263ea048 Mon Sep 17 00:00:00 2001 > +From: Christian Persch > +Date: Mon, 27 Dec 2021 19:24:46 +0100 > +Subject: [PATCH] build: Fix check for -fstack-protector* compiler support > + > +Need to use has_link_argument() on some platforms. > + > +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2535 > + > +[Retrieved from: > +https://gitlab.gnome.org/GNOME/vte/-/commit/e32dba1d5cf884959af5b2c0691db00c263ea048] > +Signed-off-by: Fabrice Fontaine > +--- > + meson.build | 6 ++++-- > + 1 file changed, 4 insertions(+), 2 deletions(-) > + > +diff --git a/meson.build b/meson.build > +index 93b7f376..381d5d58 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -461,8 +461,6 @@ compiler_flags_common = [ > + '-fdiagnostics-show-option', > + '-fno-common', > + '-fno-semantic-interposition', > +- '-fstack-protector', > +- '-fstack-protector-strong', > + ] > + > + if enable_debug > +@@ -550,6 +548,10 @@ add_project_arguments(global_cxxflags, language: 'cpp') > + linker_flags = [ > + ['-Wl,-Bsymbolic', false,], > + ['-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),], > ++ > ++ # See issue vte#2535. > ++ ['-fstack-protector', false], > ++ ['-fstack-protector-strong', false], > + ] > + > + foreach flag: linker_flags > +-- > +GitLab > + > diff --git a/package/vte/Config.in b/package/vte/Config.in > index 96de3d38cc..2635a6007c 100644 > --- a/package/vte/Config.in > +++ b/package/vte/Config.in > @@ -7,11 +7,11 @@ config BR2_PACKAGE_VTE > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_TOOLCHAIN_USES_MUSL > depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > BR2_PACKAGE_HAS_LIBGL > depends on BR2_PACKAGE_XORG7 > select BR2_PACKAGE_LIBGTK3 > - select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_PCRE2 > help > VTE is a library (libvte) implementing a terminal emulator > @@ -22,13 +22,14 @@ config BR2_PACKAGE_VTE > > http://github.com/GNOME/vte > > -comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" > +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" > depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > depends on BR2_USE_MMU > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_HAS_THREADS || \ > - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ > + BR2_TOOLCHAIN_USES_MUSL > > comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" > depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > diff --git a/package/vte/vte.hash b/package/vte/vte.hash > index 3fbc5acab0..90818d31f3 100644 > --- a/package/vte/vte.hash > +++ b/package/vte/vte.hash > @@ -1,3 +1,5 @@ > -# Locally calculated > -sha256 a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 vte-0.48.3.tar.xz > -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > +# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum > +sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz > + > +# Hash for license file: > +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LGPL3 > diff --git a/package/vte/vte.mk b/package/vte/vte.mk > index 6c8d1433f5..07e813685e 100644 > --- a/package/vte/vte.mk > +++ b/package/vte/vte.mk > @@ -4,26 +4,47 @@ > # > ################################################################################ > > -VTE_VERSION = 0.48.3 > +VTE_VERSION_MAJOR = 0.66 > +VTE_VERSION = $(VTE_VERSION_MAJOR).2 > VTE_SOURCE = vte-$(VTE_VERSION).tar.xz > -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48 > -VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2 > -VTE_LICENSE = LGPL-2.1+ > -VTE_LICENSE_FILES = COPYING > -VTE_CONF_OPTS += --disable-vala > +VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) > +VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) > +VTE_LICENSE = LGPL-3.0+ > +VTE_LICENSE_FILES = COPYING.LGPL3 > + > +ifeq ($(BR2_PACKAGE_ICU),y) > +VTE_CONF_OPTS += -Dicu=true > +VTE_DEPENDENCIES += icu > +else > +VTE_CONF_OPTS += -Dicu=false > +endif > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -VTE_CONF_OPTS += --enable-introspection > -VTE_DEPENDENCIES += gobject-introspection > +VTE_CONF_OPTS += -Dgir=true -Dvapi=true > +VTE_DEPENDENCIES += host-vala gobject-introspection > else > -VTE_CONF_OPTS += --disable-introspection > +VTE_CONF_OPTS += -Dgir=false -Dvapi=false > endif > > ifeq ($(BR2_PACKAGE_GNUTLS),y) > -VTE_CONF_OPTS += --with-gnutls > +VTE_CONF_OPTS += -Dgnutls=true > VTE_DEPENDENCIES += gnutls > else > -VTE_CONF_OPTS += --without-gnutls > +VTE_CONF_OPTS += -Dgnutls=false > +endif > + > +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) > +VTE_CONF_OPTS += -Dfribidi=true > +VTE_DEPENDENCIES += libfribidi > +else > +VTE_CONF_OPTS += -Dfribidi=false > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > +VTE_CONF_OPTS += -D_systemd=true > +VTE_DEPENDENCIES += systemd > +else > +VTE_CONF_OPTS += -D_systemd=false > endif > > -$(eval $(autotools-package)) > +$(eval $(meson-package)) > From arnout at mind.be Sun Jan 9 22:49:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 9 Jan 2022 23:49:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix build on kernel < 5.10 In-Reply-To: <20220109112337.294418-1-fontaine.fabrice@gmail.com> References: <20220109112337.294418-1-fontaine.fabrice@gmail.com> Message-ID: <2c1b9114-6723-d670-3031-2345735d2b58@mind.be> On 09/01/2022 12:23, Fabrice Fontaine wrote: > zoned depends on kernel >= 5.10: > https://github.com/kdave/btrfs-progs/commit/d4b4baf312ff083fb1e85de92167ea3e968c684c > > Fix the following build failure raised since bump to version 5.15.1 in > commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: > > checking linux/blkzoned.h usability... yes > checking linux/blkzoned.h presence... yes > checking for linux/blkzoned.h... yes > checking for struct blk_zone.capacity... no > checking for BLKGETZONESZ defined in linux/blkzoned.h... yes > configure: error: linux/blkzoned.h does not provide blk_zone.capacity > > Fixes: > - http://autobuild.buildroot.org/results/381c7e8b4bfa624c3eca3ce072cfa412aba57f84 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/btrfs-progs/btrfs-progs.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index b010a0e0be..54922df839 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -44,6 +44,12 @@ else > BTRFS_PROGS_CONF_OPTS += --disable-libudev > endif > > +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10),y) > +BTRFS_PROGS_CONF_OPTS += --enable-zoned > +else > +BTRFS_PROGS_CONF_OPTS += --disable-zoned > +endif > + > HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib > HOST_BTRFS_PROGS_CONF_OPTS = \ > --disable-backtrace \ > From nolange79 at gmail.com Sun Jan 9 22:52:31 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Sun, 9 Jan 2022 23:52:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: James Hilliard schrieb am So., 9. Jan. 2022, 23:41: > On Sat, Jan 8, 2022 at 2:31 PM Norbert Lange wrote: > > > > Am Sa., 8. Jan. 2022 um 20:04 Uhr schrieb James Hilliard > > : > > > > > > On Thu, Nov 26, 2020 at 8:28 AM Norbert Lange > wrote: > > > > > > > > Systemd has very many options, adding a way for the user > > > > to set custom options can help customizations > > > > without changing buildroot files. > > > > > > I'm not sure this is a good idea, if a configuration option needs > > > customizability it > > > probably needs a specific kconfig option. Systemd config options tend > to require > > > dependency selection and special handling so this seems likely to cause > > > spurious errors due to improper usage. Seems to be a pretty big > footgun IMO. > > > > Sure, you are aware that many of my buildroot patches are stuck in limbo > > since early 2020? > > Different issue IMO. > Yep, but seemed reasonable way out to me. > > Just doesnt seem feasible to timely fix everything and version bumps > often leave > > more untapped options. Some part of the necessity would be just being > pragmatic. > > I generally try to add any new options when bumping but I sometimes miss > some. > > > > > One example would be using the unified cgroups hierarchy > > (-Ddefault-hierarchy=unified), hybrid is pretty much deprecated, > > and some systemd features that buildroot allows to enable (OOMD for > example) > > wont work without it. > > I mean, this sounds like something that needs to be fixed in upstream > buildroot. > And it did finally. > > > > > > > > What systemd configure option would you want to be using that isn't > > > currently able to be enabled? > > > > FYI those are the ones I currently use: > > > > -Ddefault-hierarchy=unified \ > > -Dutmp=false \ > > -Ddefault-dnssec=no \ > > -Didn=false \ > > -Denvironment-d=false \ > > -Dxdg-autostart=false \ > > -Ddns-over-tls=false \ > > -Ddefault-llmnr=no \ > > -Ddns-over-tls=false \ > > -Ddefault-mdns=no \ > > -Dlz4=false > > I'm seeing a lot of these added though(I remember adding some of them > myself), are you > trying to use a newer systemd than the version supported by the > buildroot version you are > building from? > Not only missing, but I sometimes need a *different* config. For example i don't want to link against lz4, since I use zstd instead. > Note that systemd defaults can generally be overridden via configs in > the overlay as well. > Yeah, gonna have to look that up. News to me. I will shelve that one in patchwork then Norbert. -------------- next part -------------- An HTML attachment was scrubbed... URL: From nolange79 at gmail.com Sun Jan 9 23:09:45 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Mon, 10 Jan 2022 00:09:45 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/glibc: force -fno-lto In-Reply-To: <20220109223145.GK1477939@scaer> References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-4-nolange79@gmail.com> <20220109223145.GK1477939@scaer> Message-ID: Yann E. MORIN schrieb am So., 9. Jan. 2022, 23:31: > Norbert, All, > > On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > > glibc requires compilation barriers between files, and will > > fail with LTO enabled. > > So force LTO off by appending -fno-lto to the flags, but only > > if the GCC version is recent enough that an LTO build would > > be possible. > > > > Signed-off-by: Norbert Lange > > Applied to master, thanks. > > Are the other C libraries (uClibc, musl) also affected by such an issue? > Likely, and unless they are tested with LTO I would not trust them to not have weird runtime issues. Ideally there would be a whitelist for packages doing fine with LTO, for now I can only vouch for the couple I am using LTOed since years. Since a few distros now use LTO by default, hopefully things will get better. Norbert -------------- next part -------------- An HTML attachment was scrubbed... URL: From romain.naour at smile.fr Sun Jan 9 23:13:37 2022 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 10 Jan 2022 00:13:37 +0100 Subject: [Buildroot] [PATCH 1/2] package/dotnet-sdk: new package In-Reply-To: <20210113074647.1826-1-deinok@deinok.com> References: <20210113074647.1826-1-deinok@deinok.com> Message-ID: Hello Raul, Your SoB line is missing. It was present on your v1: http://lists.busybox.net/pipermail/buildroot/2021-January/300681.html Le 13/01/2021 ? 08:46, Raul Hidalgo Caballero a ?crit?: > --- > DEVELOPERS | 5 ++++ > package/Config.in.host | 1 + > package/dotnet-sdk/dotnet-sdk.hash | 3 ++ > package/dotnet-sdk/dotnet-sdk.mk | 20 +++++++++++++ > package/dotnet/Config.in.host | 15 ++++++++++ > .../testing/tests/package/test_dotnet_sdk.py | 28 +++++++++++++++++++ > 6 files changed, 72 insertions(+) > create mode 100644 package/dotnet-sdk/dotnet-sdk.hash > create mode 100644 package/dotnet-sdk/dotnet-sdk.mk > create mode 100644 package/dotnet/Config.in.host > create mode 100644 support/testing/tests/package/test_dotnet_sdk.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index 05b509c9c4..ea85f7c9c3 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2206,6 +2206,11 @@ F: package/python-botocore/ > F: package/python-jmespath/ > F: package/python-s3transfer/ > > +N: Raul Hidalgo Caballero > +F: package/dotnet/ > +F: package/dotnet-sdk/ > +F: support/testing/tests/package/test_dotnet_sdk.py > + > N: Refik Tuzakli > F: package/freescale-imx/ > F: package/paho-mqtt-cpp/ > diff --git a/package/Config.in.host b/package/Config.in.host > index ba6a68c728..16f0e9f690 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -16,6 +16,7 @@ menu "Host utilities" > source "package/dfu-util/Config.in.host" > source "package/dos2unix/Config.in.host" > source "package/dosfstools/Config.in.host" > + source "package/dotnet/Config.in.host" Must be "dotnet-sdk" here. > source "package/doxygen/Config.in.host" > source "package/dtc/Config.in.host" > source "package/e2fsprogs/Config.in.host" > diff --git a/package/dotnet-sdk/dotnet-sdk.hash b/package/dotnet-sdk/dotnet-sdk.hash > new file mode 100644 > index 0000000000..a3016b2e49 > --- /dev/null > +++ b/package/dotnet-sdk/dotnet-sdk.hash > @@ -0,0 +1,3 @@ > +sha256 cfc21f5e8bd655ae997eec916138b707b1d290b83272c02a95c9f821b8c87310 LICENSE.txt > +sha256 01564961f8ca9744d0ecc5d3e72d7c1659df95898f3a077fd9140fd4023f3579 ThirdPartyNotices.txt > +sha256 23df1eca7eb1302dfb10f4edce7edf7150e57698576f61b2dcb777c833cbd80c dotnet-sdk-5.0.101-linux-x64.tar.gz > diff --git a/package/dotnet-sdk/dotnet-sdk.mk b/package/dotnet-sdk/dotnet-sdk.mk > new file mode 100644 > index 0000000000..133b39b3f5 > --- /dev/null > +++ b/package/dotnet-sdk/dotnet-sdk.mk > @@ -0,0 +1,20 @@ > +################################################################################ > +# > +# dotnet-sdk > +# > +################################################################################ > + > +HOST_DOTNET_SDK_VERSION = 5.0.101 > +HOST_DOTNET_SDK_SITE = https://dotnetcli.azureedge.net/dotnet/Sdk/$(HOST_DOTNET_SDK_VERSION) > +HOST_DOTNET_SDK_SOURCE = dotnet-sdk-$(HOST_DOTNET_SDK_VERSION)-$(call qstrip,$(BR2_PACKAGE_HOST_DOTNET_RID)).tar.gz > +HOST_DOTNET_SDK_LICENSE = MIT > +HOST_DOTNET_SDK_LICENSE_FILES = LICENSE.txt ThirdPartyNotices.txt > + > +define HOST_DOTNET_SDK_INSTALL_CMDS > + mkdir -p $(HOST_DIR)/usr/share/dotnet/ > + cp -dpfr $(@D)/* $(HOST_DIR)/usr/share/dotnet/ > + mkdir -p $(HOST_DIR)/usr/bin/ > + ln -s ../share/dotnet/dotnet $(HOST_DIR)/usr/bin/dotnet The dotnet is a binary blob, there is no sources for it ? > +endef > + > +$(eval $(host-generic-package)) > diff --git a/package/dotnet/Config.in.host b/package/dotnet/Config.in.host > new file mode 100644 > index 0000000000..90b477a6a1 > --- /dev/null > +++ b/package/dotnet/Config.in.host > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_HOST_DOTNET_ARCH_SUPPORTS > + bool > + default y if BR2_HOSTARCH = "x86_64" > + > +config BR2_PACKAGE_HOST_DOTNET_RID > + string > + default "linux-x64" if BR2_HOSTARCH = "x86_64" > + > +config BR2_PACKAGE_HOST_DOTNET_SDK > + bool "host dotnet-sdk" > + depends on BR2_PACKAGE_HOST_DOTNET_ARCH_SUPPORTS > + help > + Dotnet SDK > + > + https://dotnet.microsoft.com/ Indent the help text with on tab and two spaces. You can check the coding style with ./utils/check-package script > diff --git a/support/testing/tests/package/test_dotnet_sdk.py b/support/testing/tests/package/test_dotnet_sdk.py > new file mode 100644 > index 0000000000..288e873597 > --- /dev/null > +++ b/support/testing/tests/package/test_dotnet_sdk.py > @@ -0,0 +1,28 @@ > +import os > +import tempfile > +import subprocess > +import shutil > + > +import infra.basetest > + > + > +class TestDotnetSdkBase(infra.basetest.BRTest): > + > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_TARGET_ROOTFS_CPIO=y > + """ > + > +class TestHostDotnetSdk(TestDotnetSdkBase): > + config = TestDotnetSdkBase.config + \ > + """ > + BR2_PACKAGE_HOST_DOTNET_SDK=y > + """ > + > + def test_run(self): > + env = os.environ.copy() You second patch remove this line [1]. Squash you two patch into one. > + hostdir = os.path.join(self.builddir, 'host') > + dotnet = os.path.join(hostdir, 'usr', 'bin', 'dotnet') > + cmd = [dotnet, '--version'] Running "dotnet --version" on the host is really worth it ? Have you made some progress on dotnet-runtime and dotnet-aspnet [2] I have marked your patches as "Changes Requested". [1] http://patchwork.ozlabs.org/project/buildroot/patch/20210113074647.1826-2-deinok at deinok.com/ [2] http://lists.busybox.net/pipermail/buildroot/2021-January/603271.html Best regards, Romain > + exit_code = subprocess.call(cmd, stdout=self.b.logfile, stderr=self.b.logfile, env=env) > + self.assertEqual(exit_code, 0) > From romain.naour at smile.fr Sun Jan 9 23:27:14 2022 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 10 Jan 2022 00:27:14 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <20210518113652.29609-4-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> Message-ID: <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> Hello Thomas, Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > There are cases where a 64-bit architecture is running a 64-bit kernel but > 32-bit userspace. Examples include: > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace Can you provide a new qemu defconfig that cover this use case? This is for gitlab-ci runtime testing. Best regards, Romain PS: (This email doesn't count as a review of this series :)) > > In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to > the 32-bit architecture, but the kernel needs to be built with the 64-bit > architecture. > > Make it possible to define the correct architecture to be used for the > kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is > expected to know the valid values. > > Signed-off-by: Thomas De Schampheleire > --- > Makefile | 4 ++++ > arch/Config.in | 15 +++++++++++++++ > 2 files changed, 19 insertions(+) > > diff --git a/Makefile b/Makefile > index c5399e9a35..d09cf7c958 100644 > --- a/Makefile > +++ b/Makefile > @@ -434,7 +434,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > # Strip off the annoying quoting > ARCH := $(call qstrip,$(BR2_ARCH)) > NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > +else > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) > +endif > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > BZCAT := $(call qstrip,$(BR2_BZCAT)) > diff --git a/arch/Config.in b/arch/Config.in > index 7575acf48c..c82100f541 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -329,6 +329,21 @@ config BR2_ARCH > config BR2_KERNEL_ARCH > string > > +config BR2_KERNEL_ARCH_OVERRIDE > + string "Kernel architecture override" > + help > + Normally, the correct kernel architecture value is derived > + from the selected architecture, and you should keep this > + option empty. > + However, there are cases where you may want to enter a custom > + value, for example when using a 64-bit architecture but > + running userspace in 32-bit mode. > + As an example, in case of an x86_64 processor where you want > + 32-bit userspace, BR2_ARCH will be 'i386'/'i486'/'i686' and > + BR2_KERNEL_ARCH_OVERRIDE should be set to 'x86_64'. Note that > + in this example you will also need a multilib toolchain and > + pass '-m32' via BR2_TARGET_OPTIMIZATION. > + > config BR2_ENDIAN > string > > From tambewilliam at gmail.com Sun Jan 9 23:46:59 2022 From: tambewilliam at gmail.com (William Tambe) Date: Sun, 9 Jan 2022 17:46:59 -0600 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory In-Reply-To: References: Message-ID: On Sun, Jan 9, 2022 at 2:08 PM Arnout Vandecappelle wrote: > > > > On 09/01/2022 19:18, William Tambe wrote: > > I am attempting to build: > > > > +BR2_PACKAGE_DHCP=y > > +BR2_PACKAGE_DHCP_CLIENT=y > > > > However it fails as follow complaining about not finding readline/history.h: > > > > making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate > > /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc > > pu32 doesn't exist in Buildroot, so this may very well be due to external changes. > > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 > > -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include > > -I../../lib/lwres/unix/include -I../../lib/lwres/include > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include > > -I../../lib/dns/include > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include > > -I../../lib/bind9/include > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include > > -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include > > -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include > > -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include > > -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" > > -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > > -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall > > -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat > > -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks > > \ > > -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ > > -c ./nsupdate.c > > ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory > > 104 | #include > > | ^~~~~~~~~~~~~~~~~~~~ > > This sounds like you changed your configuration without doing 'make clean'. Is > that possible? I am building from clean or from scratch. > > Is BR2_PACKAGE_READLINE enabled in your configuration? Has it been built? Yes, BR2_PACKAGE_READLINE is enabled in my configuration. > > Regards, > Arnout > > > compilation terminated. > > make[5]: *** [Makefile:473: nsupdate.o] Error 1 > > make[4]: *** [Makefile:79: subdirs] Error 1 > > make[3]: *** [Makefile:88: subdirs] Error 1 > > make[2]: *** [package/pkg-generic.mk:270: > > /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] > > Error 2 > > make[1]: *** [Makefile:23: _all] Error 2 > > make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' > > make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From michal.lyszczek at bofc.pl Sun Jan 9 23:52:22 2022 From: michal.lyszczek at bofc.pl (michal.lyszczek at bofc.pl) Date: Mon, 10 Jan 2022 00:52:22 +0100 Subject: [Buildroot] [PATCH v2] package/openrc: add patch to create /run/lock/subsys In-Reply-To: References: <20220109110555.3789-1-nolange79@gmail.com> Message-ID: <20220109235222.ylomtonoeuzcak2c@marchewa.kurwinet.pl> On 2022-01-09 14:12:16, Arnout Vandecappelle wrote: > > > On 09/01/2022 12:05, Norbert Lange wrote: > > Together with changes to sysv/busybox init, this directory > > will already exist on all init systems before any service > > scripts are run. > > > > Signed-off-by: Norbert Lange > > Applied to master, thanks. > > Normally we require patches to be upstreamed first, but there are already > plenty of other patches that haven't been sent upstream. It could also be a > bit buildroot-specific (though I think the subsys is there because some > packages actually use that directory). > > Still, Micha?, do you think this patch would be acceptable upstream? > Obviously not in its current form since upstream has group uucp rather than > daemon. I think it won't be accepted by upstream. Seems that openrc does not use /var/lock/subsys anywhere, nor does Gentoo. I also think that /var/lock/susbsys is used mainly by redhat/rpm packages with plain rc.d scripts. So in that case this rather seem like buildroot specific change and is not really related to openrc, thus I don't see why openrc would commit this patch. But bear in mind, I am not a Gentoo nor openrc developer, so that might not be true. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: From jose.pekkarinen at unikie.com Mon Jan 10 05:29:04 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Mon, 10 Jan 2022 07:29:04 +0200 Subject: [Buildroot] [PATCH] package/opensc: new package In-Reply-To: <20220105215908.1d8677b3@windsurf> References: <20211213061551.4110-1-jose.pekkarinen@unikie.com> <20220105215908.1d8677b3@windsurf> Message-ID: On Wed, Jan 5, 2022 at 10:59 PM Thomas Petazzoni wrote: > > Hello Jos?, > > On Mon, 13 Dec 2021 08:15:51 +0200 > Jos? Pekkarinen wrote: > > > The patch will add opensc package. > > > > Signed-off-by: Jos? Pekkarinen > > I'm afraid that when I read the feedback from upstream in your patches, > saying that they introduce memory leaks (and indeed they do), I'm not > really keen on merging this. > > However, I saw you told upstream: > > It is a bit of a chiken and egg problem. Buildroot wants me to > upstream the patches before the package would be accesible to you, > you want me to give a testing case that doesn't come easy without > upstreaming the package. > > This is not totally correct for two reason: > > * we don't require patches to be accepted upstream, except if we have > serious doubts about the patches. > > * the package doesn't have to be accepted in Buildroot upstream to > provide an easy way for the opensc developers to reproduce the > issue. You can provide a Buildroot branch on a public Git > repository, with the opensc package, and a very simple > opensc_demo_defconfig in configs/ that uses some external toolchain > and builds just opensc to demonstrate the build failure. Then for > the opensc people, reproducing is as easy as: > > git clone -b git://your.repository.com > cd buildroot/ > make opensc_demo_defconfig > make > > Could you resolve the remaining issues and send an updated patch? Also, > please remember to add a version to your patches when submitting, it > really makes things easier. > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Ack! Thanks for the comments! Jos?. From jose.pekkarinen at unikie.com Mon Jan 10 05:36:03 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Mon, 10 Jan 2022 07:36:03 +0200 Subject: [Buildroot] [PATCH 3/7] package/bmx7: new package In-Reply-To: <20220105232348.68986536@windsurf> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-3-jose.pekkarinen@unikie.com> <20220105232348.68986536@windsurf> Message-ID: On Thu, Jan 6, 2022 at 12:23 AM Thomas Petazzoni wrote: > > Hello Jos?, > > On Fri, 10 Dec 2021 16:12:05 +0200 > Jos? Pekkarinen wrote: > > > This patch will provide an initial package > > for bmx7 project. > > > > Signed-off-by: Jos? Pekkarinen > > I have applied this patch, with a few changes (see below). But I must > say I hesitated. Do you really use this? This project has not seen any > updates since July 2019, there is a simple pull request fixing the > SIOCGSTAMP issue that has never been looked at, and there are > alternatives such as olsr and batman-adv which are actively maintained. Hi, Thanks! I took some time to ask the project participants to confirm they use these packages before starting the upstreaming process. Apparently this may be of use in communications over wifi mesh networks. Best regards. Jos?. From james.hilliard1 at gmail.com Mon Jan 10 05:41:42 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 22:41:42 -0700 Subject: [Buildroot] [PATCH v4 1/3] package/qt5/qt5webengine-chromium-catapult: new package Message-ID: <20220110054144.1294907-1-james.hilliard1@gmail.com> This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entry --- package/qt5/Config.in | 1 + .../qt5/qt5webengine-chromium-catapult/Config.in | 4 ++++ .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 14 ++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/Config.in create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..143926b743 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" source "package/qt5/qt5x11extras/Config.in" diff --git a/package/qt5/qt5webengine-chromium-catapult/Config.in b/package/qt5/qt5webengine-chromium-catapult/Config.in new file mode 100644 index 0000000000..471c2a2dbc --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the chromium source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT + bool diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 0000000000..8190a6dd5d --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 0000000000..5d0db1e790 --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE +QT5WEBENGINE_CHROMIUM_CATAPULT_INSTALL_TARGET = NO + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 10 05:41:44 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 22:41:44 -0700 Subject: [Buildroot] [PATCH v4 3/3] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20220110054144.1294907-1-james.hilliard1@gmail.com> References: <20220110054144.1294907-1-james.hilliard1@gmail.com> Message-ID: <20220110054144.1294907-3-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags. Create a .git file so to trigger headers sync during configure. Signed-off-by: James Hilliard --- Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- package/qt5/qt5location-mapboxgl/Config.in | 4 ++ .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 14 +++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 73 files changed, 222 insertions(+), 385 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 54e6f7d6a6..20a4a4f4c2 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..d10847ea04 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..3b0362f383 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..8c0e02152d 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4bdb90b203 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..abffc2891d 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..d48a37fafe 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 10 06:20:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 23:20:15 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-packaging: bump to version 21.3 Message-ID: <20220110062015.1299719-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-packaging/python-packaging.hash | 4 ++-- package/python-packaging/python-packaging.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 0c23a5f71c..0f353a9e36 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 240ba5823ed31051a1254e74c9d18d55 packaging-21.0.tar.gz -sha256 7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 packaging-21.0.tar.gz +md5 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz +sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index e2fb9b120b..569dc0bf58 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 21.0 +PYTHON_PACKAGING_VERSION = 21.3 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3afd461faecf9955a6501c4999933a48394e90f03cd512aad844 +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c PYTHON_PACKAGING_SETUP_TYPE = setuptools PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 10 06:23:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 23:23:27 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: bump to version 3.0.6 Message-ID: <20220110062327.1302104-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-pyparsing/python-pyparsing.hash | 4 ++-- package/python-pyparsing/python-pyparsing.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index 2c52ff0843..a21baf46e5 100644 --- a/package/python-pyparsing/python-pyparsing.hash +++ b/package/python-pyparsing/python-pyparsing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyparsing/json -md5 f0953e47a0112f7a65aec2305ffdf7b4 pyparsing-2.4.7.tar.gz -sha256 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz +md5 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz +sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz # Locally computed sha256 checksums sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 5741458d65..b6ab353a6d 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 2.4.7 +PYTHON_PYPARSING_VERSION = 3.0.6 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210 +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools -- 2.25.1 From thomas.petazzoni at bootlin.com Mon Jan 10 07:07:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 10 Jan 2022 07:07:23 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-09 Message-ID: <20220110070733.A70B381426@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-01-09 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 67 | 3 | 1 | 71 | 2021.11.x | 27 | 6 | 0 | 33 | master | 83 | 61 | 0 | 144 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 6 gstreamer1-mm-1.10.0 | 5 bluez5_utils-5.63 | 4 unknown | 4 bat-0.18.3 | 3 cryptopp-8.6.0 | 3 drbd-utils-9.19.0 | 3 hiawatha-11.1 | 3 host-python-setuptools-scm-... | 3 mbedtls-2.28.0 | 3 poppler-21.12.0 | 3 btrfs-progs-5.15.1 | 2 frr-8.1 | 2 host-mender-artifact-3.6.1 | 2 apitrace-10.0 | 1 babeltrace2-2.0.4 | 1 balena-engine-19.03.14 | 1 belle-sip-4.4.8 | 1 efl-1.26.0 | 1 ejabberd-20.07 | 1 libkrb5-1.18.4 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.3 | 1 nodejs-14.18.2 | 1 perl-5.34.0 | 1 pulseview-0.4.2 | 1 ripgrep-af6b6c543b224d348a8... | 1 rtorrent-0.9.8 | 1 squid-5.3 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-10.0 | NOK | http://autobuild.buildroot.net/results/984c38f176594654ada3dc1cff18e193f276c7e8 | or1k | babeltrace2-2.0.4 | NOK | http://autobuild.buildroot.net/results/cdf8191a07a9bac5bd63c9938fe97d9c9b903ea9 | aarch64 | balena-engine-19.03.14 | NOK | http://autobuild.buildroot.net/results/438bb2252f7c5052c7f945401aea053c55a60994 | ORPH i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/8eacd455e4767cc7b1e912a3f910c940110c3be0 | x86_64 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/ff16a74ac395379ce74059d6d763fd921a4afa30 | aarch64 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/498b96224c8bcff91542ca3731dfd66891f4ec23 | xtensa | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/4b3480a21c3909abd6e1331662addbf63db8cf70 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c0a44dead5fb46d6f4475856889d43bff9578a00 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/47f63871cad5ae6038c9ef8614c631cdacdf5b7a | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c71b8313e495fdb5e001a0bf8aa2a381e8a4ccc4 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e36e33956d1e5b4b5209624d045313046fe649d7 | aarch64 | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/381c7e8b4bfa624c3eca3ce072cfa412aba57f84 | ORPH i586 | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc | ORPH arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/cfc80eed73f608dc37ac234a9918a9558b3b9bad | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/36bf881a2eabc408f22247e1baa0e3036bc30ff3 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/d9af96474b331632e315063c63d581f493334d09 | microblazeel | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/8c524590b1454f8853593baefb53d8859106fa3a | powerpc | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/c46e2eae822db8529e68e73726a28dbfb2e9a509 | nios2 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/b1fd8a6393f0f514ba8b88684dd0c467e5f10b25 | powerpc | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/0fa47366a7280535ee556014171f0003e706be70 | riscv64 | ejabberd-20.07 | NOK | http://autobuild.buildroot.net/results/4816301ddfb03504051ee8cca1ddad03b53f1d1f | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8fc5ea2b29a678800ca36d1903b66b369ea2f48f | mips | frr-8.1 | NOK | http://autobuild.buildroot.net/results/758deec2e33f50afda15d27b22a6bfeae933fc14 | sparc64 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/6b88f1057dcce4b8bab778d75dca10d9eaa267cc | ORPH i686 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/e7a3bb6e9e13cb4d1dd9250cb41c33d3deac9672 | ORPH mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/d4f2247f23ad84022cbf549b4d5038fe59b8b31b | ORPH microblazeel | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/26f1d08370c4be3dc91dd3f2e3bbbedd675a041e | ORPH powerpc | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/efb03fdd1c26fd992c98ce758a1a8f6e73efeeb9 | ORPH xtensa | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/2861bbc2c52a20d95ed406f59baab7cabe56a4cf | mipsel | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/5436b44777c5d417ae427b99602f516fd8f9489d | mips64el | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/2bbf26fe49038c29f7ee1270ad1fff148ab0224a | microblazeel | host-mender-artifact-3.6.1 | NOK | http://autobuild.buildroot.net/results/81ea143dc110d65581e583dc14562bc6d8dbf8b6 | riscv64 | host-mender-artifact-3.6.1 | NOK | http://autobuild.buildroot.net/results/e54c7afaf336e7010d808c2506cedff566a78609 | riscv64 | host-python-setuptools-scm-... | NOK | http://autobuild.buildroot.net/results/e0b0f6c8633ec218d9d3e0d02053832bf48027dd | powerpc | host-python-setuptools-scm-... | NOK | http://autobuild.buildroot.net/results/2f6125993de364b4a44d259f16806e6dfd792402 | mipsel | host-python-setuptools-scm-... | NOK | http://autobuild.buildroot.net/results/772bd9946e7820a6d939a0de991d70ae23875d42 | or1k | libkrb5-1.18.4 | NOK | http://autobuild.buildroot.net/results/b68b23d143308a8411e730dbb0308b756b199841 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/04518ed512bea107a649ab1ff8e8c4c13771d098 | arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/0f5b9b439cfff48d3275a1f65999c06dd97ac597 | arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/56ac0a8726d09eed8f45f865934fa7781a0e667a | arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/af017382bb5772de7383d71ed7b8af44717981f9 | arm | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/2b531f7aa4506ee31a7252c87a2e401fffab9dfb | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/f52a4de8f3a6b3eef7cf79a9ef24802ef99c7066 | microblazeel | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/c7fd9159edc86c119973ed191abea1162cc01f9e | arc | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/3d886fe0ef628ed5becb20dc89f80e0b189c745e | x86_64 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/c7716d3979d330078d030f21dd9cfd2820cecf2e | riscv32 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/1456f9512371ecb5a0a374943178e4bd7b0967e8 | xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/f3ae94835b874ecd22928ee5f05f11d190c31a44 | x86_64 | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/772ebdd6a39950457a59419bdc1376cb0e0a3611 | xtensa | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/d8bc5c25f53012955ccd5ec1a59524279eaddf39 | ORPH riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/af8c4cb700fbdf263bcd78a183a6ea51617b7d28 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c8a9be8677ce45b3344dc45cbee13088542fe473 | microblazeel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b6ba900bcade6920513bb2c6e3753da5b5d83ec4 | i686 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/57960ed2419bbd3ae6b9c2a90ab26266171cca6b | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/17f7afb627a4658b85e9c6beee7a94ae5853dd57 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e5aa94be49463f3a3202410478caaaeaae9c50e6 | arm | squid-5.3 | NOK | http://autobuild.buildroot.net/results/2aabc8375d41ad4d047d20ff8ee4fe1c978e7ee1 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/6d8e63e0f26a11f7d76dba5de9f7eabf558284fa | arm | unknown | NOK | http://autobuild.buildroot.net/results/94d6fd886b0a984c962002d4ce2fc88c97e47ad7 | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/69871d3d0b66b0bb480956a1398cd0367b5004f4 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/0cbcce0ef372c29f34769f0eb5047c8203098e96 | Classification of failures by reason for 2021.02.x -------------------------------------------------- cutelyst-2.11.0 | 1 python-lxml | 1 rocksdb-6.13.3 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | cutelyst-2.11.0 | NOK | http://autobuild.buildroot.net/results/986c4d66902adea7da570ec4f1bba031a2f19fad | m68k | python-lxml | TIM | http://autobuild.buildroot.net/results/74ba5ca5cc916170c8b81d7ac7581fdaf8ab15d5 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/7ad5bd178b331ce8d468f6807cb20cc46faa4422 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/777589411c7e8e82e2c02e3d50941981d89262a4 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 2 libnss-3.73 | 1 ndisc6-1.0.5 | 1 nodejs-14.18.1 | 1 suricata-6.0.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/59ed3d9a339bc5c2bad4980a2bed34f3c218b5ab | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/8e2b532e80f56133ba41f30f2367a6c76c21103f | powerpc64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/c0083245b7a7e19c713e31113a4817fd28f04c28 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/97403793ff837e920cef3d8c0f0ad6f7ac740eb6 | ORPH mipsel | nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/fb9d3832d0520d81cae5517018e625d4289a9aad | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/2183f1835f2ef553e45e83959910205127b2b259 | Gitlab CI results for 2022-01-09 ================================ Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- acpica | DISTRO | https://release-monitoring.org/project/00018 | 20200717 | 20211217 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 41.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.3.1 | 4.5.2 | alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.6 | 1.2.6.1 | alsa-plugins | DISTRO | https://release-monitoring.org/project/00041 | 1.2.5 | 1.2.6 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 12.0.0_r26 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.0 | assimp | DISTRO | https://release-monitoring.org/project/06988 | 5.1.5 | 5.1.6 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.42.0 | avro-c | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.10 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 19.03.14 | 20.10.11 | ORPH bash | DISTRO | https://release-monitoring.org/project/00166 | 5.1 | 5.1.16 | ORPH bat | DISTRO | https://release-monitoring.org/project/241901 | 0.18.3 | 0.19.0 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2021.4 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.1 | 2021.4 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.5.0 | bcg729 | DISTRO | https://release-monitoring.org/project/14743 | 1.0.4 | 1.1.1 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.0.66 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.66 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.66 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.4 | ORPH bind | DISTRO | https://release-monitoring.org/project/14923 | 9.11.36 | 9.17.21 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.37 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 22.0 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.1.3 | bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.09 | 3.21 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.34.1 | 1.35.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.7 | 0.5.9 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.4 | 0.5.5 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.4 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.5.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.4.34 | 1.4.36 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.1 | 4.2 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.13 | 6.14 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.17.1 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.4 | 0.104.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.0 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.1 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.2 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.8 | 1.5.9 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.2.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.11.3 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.1.1 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.0.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.5 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.6.1 | 1.8.0 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20211214 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.11 | 20.10.12 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.11 | 20.10.12 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.19.1 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.0 | 1.26.1 | eigen | DISTRO | https://release-monitoring.org/project/00666 | 3.3.7 | 3.4.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 20.07 | 21.12 | elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.13.1 | ell | DISTRO | https://release-monitoring.org/project/17781 | 0.46 | 0.47 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.0 | 0.25.1 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.17 | 1.0.21 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-idna | DISTRO | https://release-monitoring.org/project/45374 | 6.0.0 | 6.1.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.9.0 | 1.11.2 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.6.10 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.9 | 1.0.16 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.25 | 1.0.29 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.10 | 1.0.14 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.7 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.6 | 1.0.8 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.38 | 1.0.45 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.23 | 1.0.27 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.39 | 1.1.0 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.9 | 1.1.13 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.20 | 1.0.24 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.44 | 1.1.48 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.4.10 | 1.5.6 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.28 | 1.0.32 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.8 | 1.0.12 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.9 | 1.0.10 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.3 | 1.4 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.8.0.1 | 2.8.2.0 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.8 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.24 | 6.4.26 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.29 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.16.1 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.2 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | fsl-sdk-v2.0 | 0.2.0 | fmt | DISTRO | https://release-monitoring.org/project/11526 | 8.0.1 | 8.1.1 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 5.15.4 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.94 | ORPH fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 21.12.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.10 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdk-pixbuf | DISTRO | https://release-monitoring.org/project/09533 | 2.42.4 | 2.42.6 | ORPH gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.2.9 | 2.3.5 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.53.3 | 9.55.0 | git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.34.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.66.0 | 2.70.1 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.70.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.10 | 3.0.14 | gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.2.32 | 2.3.4 | ORPH gnuplot | DISTRO | https://release-monitoring.org/project/01216 | 5.4.2 | 5.4.3 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.8.2.0 | 3.9.5.0 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.68.0 | 1.70.0 | ORPH gocryptfs | DISTRO | https://release-monitoring.org/project/21085 | 2.2.0 | 2.2.1 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.2 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grub2 | DISTRO | https://release-monitoring.org/project/01257 | 2.04 | 2.06 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 41.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gst-omx | DISTRO | https://release-monitoring.org/project/21845 | 1.18.5 | 1.19.3 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.5 | 1.19.3 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-libav | DISTRO | https://release-monitoring.org/project/21848 | 1.18.5 | 1.19.3 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.5 | 1.19.3 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.2 | ORPH gtkmm3 | DISTRO | https://release-monitoring.org/project/07963 | 3.22.0 | 4.4.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.49.1 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2018.01.1 | 2021.03.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.4.8 | 2.5.0 | haveged | DISTRO | https://release-monitoring.org/project/11695 | 1.9.15 | 1.9.17 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.11.2 | ORPH hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.21.12 | ORPH hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.354 | 0.355 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.4.1 | 2.7.0 | ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.36+nmu1 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.0.11-13 | 7.1.0-19 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.7.5 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.21.9.6 | ORPH iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.492 | 3.493 | ipmiutil | DISTRO | https://release-monitoring.org/project/01391 | 3.1.7 | 3.1.8 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | isl | DISTRO | https://release-monitoring.org/project/13286 | 0.23 | 0.24 | ORPH iwd | DISTRO | https://release-monitoring.org/project/18380 | 1.20 | 1.21 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.17 | 1.9.19 | janet | DISTRO | https://release-monitoring.org/project/155612 | 1.18.1 | 1.19.2 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.28 | 2.0.33 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.4 | 1.6 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.3 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.10.4 | 1.13.0 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.0 | json-glib | DISTRO | https://release-monitoring.org/project/13144 | 1.4.4 | 1.6.6 | jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.2.2 | 3.7.1 | keepalived | DISTRO | https://release-monitoring.org/project/01504 | 2.1.4 | 2.2.4 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.0-Ma... | 20.4.1-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.4-Ma... | 20.2.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.3-Ma... | 20.2.2-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.1.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.10-M... | 20.2.1-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.2.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.2-Ma... | 20.1.0-Nexus | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 1.2.0 | 2.1.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | lft | DISTRO | https://release-monitoring.org/project/21863 | 3.8 | 3.91 | ORPH libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.25 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.4.0 | 0.6.1 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 2.0 | libcodec2 | DISTRO | https://release-monitoring.org/project/14605 | 1.0.1 | 1.03 | libev | DISTRO | https://release-monitoring.org/project/01605 | 4.27 | 4.33 | ORPH libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgeotiff | DISTRO | https://release-monitoring.org/project/21361 | 1.6.0 | 1.7.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.2 | 3.3.6 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.68.4 | 2.70.2 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.3.2 | 1.4.0 | ORPH libgpg-error | DISTRO | https://release-monitoring.org/project/01628 | 1.42 | 1.43 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.28 | ORPH libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.6.0 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.37 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.12 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.16 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.1 | 0.11.3 | libmhash | DISTRO | https://release-monitoring.org/project/21488 | 0.9.9.9 | 1.4 | ORPH libminiupnpc | DISTRO | https://release-monitoring.org/project/01986 | 2.1.20201016 | 2.2.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.6 | 3.1.7 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.1.5 | 4.2.1 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 1.1.1m | 3.0.1 | libostree | DISTRO | https://release-monitoring.org/project/10899 | 2021.6 | 2022.1 | libpagekite | DISTRO | https://release-monitoring.org/project/21366 | 0.91.190530 | 0.91.201110 | libpam-radius-auth | DISTRO | https://release-monitoring.org/project/57834 | 1.4.0 | 2.0.0 | ORPH libpjsip | DISTRO | https://release-monitoring.org/project/15701 | 2.10 | 2.11.1 | libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.6.1 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.5.0 | 1.6.0 | libqb | DISTRO | https://release-monitoring.org/project/09399 | 2.0.3 | 2.0.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.53.0 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigsegv | DISTRO | https://release-monitoring.org/project/01722 | 2.13 | 2.14 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.0 | 3.0.4 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.1 | 2.4.2 | libss7 | DISTRO | https://release-monitoring.org/project/21690 | 2.0.0 | 2.0.1 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.5 | libuhttpd | DISTRO | https://release-monitoring.org/project/89386 | 3.12.1 | 3.14.1 | libunistring | DISTRO | https://release-monitoring.org/project/01747 | 0.9.10 | 1.0 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.5.0 | 1.6.2 | ORPH libuv | DISTRO | https://release-monitoring.org/project/10784 | 1.42.0 | 1.43.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.1 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.0.21 | 4.3.0 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.26 | 4.4.27 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.66 | ORPH linux-firmware | DISTRO | https://release-monitoring.org/project/141464 | 20210919 | 20211216 | live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.01.06 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.9 | 1.0.13 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.12.0 | 0.12.1 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.18.0 | 3.19.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.3 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.8 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.3 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.12 | 2.03.14 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.3 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.30 | 10.7.1 | ORPH matchbox-keyboard | DISTRO | https://release-monitoring.org/project/230595 | 0.1 | 0.1.1 | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.0 | 3.1.0 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.4.0 | 0.1.5.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.0.66 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 5.31b | memtester | DISTRO | https://release-monitoring.org/project/01967 | 4.5.0 | 4.5.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.42.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2021.12 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20190618 | 20210805 | ORPH modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.16.10 | 1.18.4 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.11 | 5.1.1 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.5 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.29.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.164 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.0 | 2.5.1 | mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.29.3 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.34.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 4.0.3 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.14 | 1.8.19 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtd | DISTRO | https://release-monitoring.org/project/02026 | 2.1.3 | 2.1.4 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.36 | 4.0.37 | multipath-tools | DISTRO | https://release-monitoring.org/project/00424 | 0.8.7 | 0.8.8 | mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.0.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220101 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.30.2 | 0.32.1 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | debian_1.... | 1.218 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.32.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.6.1 | 0.7.3 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9 | 5.9.1 | ORPH network-manager-openvpn | DISTRO | https://release-monitoring.org/project/69977 | 1.8.14 | 1.8.16 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.46.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.5 | nmon | DISTRO | https://release-monitoring.org/project/02097 | 16m | 16n | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.2 | 17.3.0 | nss-mdns | DISTRO | https://release-monitoring.org/project/05491 | 0.14.1 | 0.15.1 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.132 | 390.147 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 495.46 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 1.16 | ORPH ocf-linux | DISTRO | https://release-monitoring.org/project/21541 | 20120127 | 20171122 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.31 | 1.34 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.2.4 | omniorb | DISTRO | https://release-monitoring.org/project/21545 | 4.2.4 | 4.3.0 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.3 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.19 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.5.5 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.7.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.13+8 | 19+4 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.10.0 | 6.11.0 | openldap | DISTRO | https://release-monitoring.org/project/02551 | 2.4.59 | 2.6.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.2 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.44.10 | opentracing-cpp | DISTRO | https://release-monitoring.org/project/21553 | 1.5.1 | 1.6.0 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 10.3.5-10... | 11.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.5.0 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.27 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.0.66 | ORPH p11-kit | DISTRO | https://release-monitoring.org/project/02582 | 0.23.22 | 0.24.0 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.0 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH parted | DISTRO | https://release-monitoring.org/project/02596 | 3.3 | 3.4 | patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.9 | 0.14.3 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.3 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202112 | ORPH perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-guess | DISTRO | https://release-monitoring.org/project/17375 | 0.12 | 0.14 | perl-crypt-openssl-rsa | DISTRO | https://release-monitoring.org/project/02748 | 0.31 | 0.32 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.85 | 6.86 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-http-message | DISTRO | https://release-monitoring.org/project/02977 | 6.33 | 6.36 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.072 | 2.074 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.57 | 6.60 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20200907 | perl-net-dns | DISTRO | https://release-monitoring.org/project/03147 | 1.32 | 1.33 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.85 | 1.90 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-try-tiny | DISTRO | https://release-monitoring.org/project/11921 | 0.30 | 0.31 | perl-uri | DISTRO | https://release-monitoring.org/project/03485 | 5.09 | 5.10 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0207 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.0.14 | 8.1.1 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.21 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-imagick | DISTRO | https://release-monitoring.org/project/17401 | 3.5.0 | 3.6.0 | ORPH php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.1.2 | php-yaml | DISTRO | https://release-monitoring.org/project/12515 | 2.2.1 | 2.2.2 | ORPH pigpio | DISTRO | https://release-monitoring.org/project/21577 | 79 | 7301 | pinentry | DISTRO | https://release-monitoring.org/project/03643 | 1.1.1 | 1.2.0 | ORPH pkcs11-helper | DISTRO | https://release-monitoring.org/project/91990 | 1.27 | 1.28 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.8.0 | ORPH poco | DISTRO | https://release-monitoring.org/project/05418 | 1.10.1 | 1.11.1 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.01.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.8 | 1.3.9 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.14 | proftpd | DISTRO | https://release-monitoring.org/project/07609 | 1.3.6e | 1.3.7c | proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 8.2.1 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.2 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.15 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 14.2 | 15.0 | python-aenum | DISTRO | https://release-monitoring.org/project/34074 | 3.1.0 | 3.1.5 | python-aioblescan | DISTRO | https://release-monitoring.org/project/21242 | 0.2.8 | 0.2.10 | python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.1 | 0.4.3 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiojobs | DISTRO | https://release-monitoring.org/project/21252 | 0.3.0 | 1.0.0 | python-alsaaudio | DISTRO | https://release-monitoring.org/project/10072 | 0.8.4 | 0.9.0 | python-argon2-cffi | DISTRO | https://release-monitoring.org/project/33377 | 21.1.0 | 21.3.0 | python-arrow | DISTRO | https://release-monitoring.org/project/05314 | 1.2.0 | 1.2.1 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.4.1 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 21.2.0 | 21.4.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 21.3.1 | 21.11.1 | python-avro | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | python-bidict | DISTRO | https://release-monitoring.org/project/114352 | 0.21.3 | 0.21.4 | python-bleak | DISTRO | https://release-monitoring.org/project/26271 | 0.12.1 | 0.13.0 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.31 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.31 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2021.5.30 | 2021.10.8 | python-channels | DISTRO | https://release-monitoring.org/project/21937 | 2.3.1 | 3.0.4 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 2.4.1 | 3.3.1 | python-charset-normalizer | DISTRO | https://release-monitoring.org/project/55366 | 2.0.7 | 2.0.10 | python-cheroot | DISTRO | https://release-monitoring.org/project/20163 | 8.2.1 | 8.6.0 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 12.0.1 | 18.6.1 | python-click | DISTRO | https://release-monitoring.org/project/03802 | 7.1.2 | 8.0.3 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.4.1 | 6.6.0 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.fb18 | 1.5 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 1.0.2 | 2.3.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python-daemon | DISTRO | https://release-monitoring.org/project/03816 | 2.2.3 | 2.3.0 | python-daphne | DISTRO | https://release-monitoring.org/project/21939 | 2.4.1 | 3.0.2 | python-dataproperty | DISTRO | https://release-monitoring.org/project/21697 | 0.53.0 | 0.54.2 | python-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog | DISTRO | https://release-monitoring.org/project/03823 | 3.4.0 | 3.5.3 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 3.2.10 | 4.0.1 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 4.1.0 | 5.0.3 | python-docutils | DISTRO | https://release-monitoring.org/project/03849 | 0.15.2 | 0.18.1 | python-ecdsa | DISTRO | https://release-monitoring.org/project/08370 | 0.17.0 | 0.18.0b2 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.2.1 | 4.3.0 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.4.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.2 | python-flask-expects-json | DISTRO | https://release-monitoring.org/project/127659 | 1.5.0 | 1.7.0 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 0.3.1 | 2.1.0 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 2.4.1 | 2.5.1 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 0.15.1 | 1.0.0 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.28.2 | 4.28.5 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.25 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.9 | python-h2 | DISTRO | https://release-monitoring.org/project/19033 | 3.2.0 | 4.1.0 | python-hpack | DISTRO | https://release-monitoring.org/project/19034 | 3.0.0 | 4.0.0 | python-httplib2 | DISTRO | https://release-monitoring.org/project/03887 | 0.19.1 | 0.20.2 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.13.1 | python-hyperframe | DISTRO | https://release-monitoring.org/project/19035 | 5.2.0 | 6.0.1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.2 | 3.3 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.28.0 | 8.0.0b1 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 1.1.0 | 2.0.1 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-janus | DISTRO | https://release-monitoring.org/project/56567 | 0.6.1 | 1.0.0 | python-jaraco-classes | DISTRO | https://release-monitoring.org/project/20150 | 2.0 | 3.2.1 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 2.0 | 3.5.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.0.2 | 3.0.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 2.5.1 | 4.3.3 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 19.2.0 | 23.5.0 | python-kiwisolver | DISTRO | https://release-monitoring.org/project/16910 | 1.1.0 | 1.3.2 | python-lmdb | DISTRO | https://release-monitoring.org/project/15512 | 1.2.1 | 1.3.0 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.6.5 | 4.7.1 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.1.5 | 1.1.6 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.3.4 | 3.3.6 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.1 | 2.4.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.5.1 | python-memory-profiler | DISTRO | https://release-monitoring.org/project/38508 | 0.58.0 | 0.60.0 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 0.8.4 | 2.0.1 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 8.10.0 | 8.12.0 | python-msgfy | DISTRO | https://release-monitoring.org/project/29716 | 0.1.0 | 0.2.0 | python-msgpack | DISTRO | https://release-monitoring.org/project/21831 | 1.0.2 | 1.0.3 | python-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-nfc | DISTRO | https://release-monitoring.org/project/21829 | 0.13.5 | 1.0.3 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.0 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 0.8.4 | 0.98.9 | python-packaging | DISTRO | https://release-monitoring.org/project/11718 | 21.0 | 21.3 | python-paho-mqtt | DISTRO | https://release-monitoring.org/project/06084 | 1.4.0 | 1.6.1 | python-pam | DISTRO | https://release-monitoring.org/project/05725 | 0.5.0 | 1.8.4 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | python-pathlib2 | DISTRO | https://release-monitoring.org/project/12723 | 2.3.5 | 2.3.6 | python-pathpy | DISTRO | https://release-monitoring.org/project/21703 | 12.0.1 | 12.5.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.6.0 | 5.8.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 8.4.0 | 9.0.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 21.3.1 | python-portend | DISTRO | https://release-monitoring.org/project/20203 | 2.5 | 3.1.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.20 | 3.0.24 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.2 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python-psycopg2 | DISTRO | https://release-monitoring.org/project/03979 | 2.9.1 | 2.9.3 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2021.1 | 2022.1 | python-py | DISTRO | https://release-monitoring.org/project/03981 | 1.10.0 | 1.11.0 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0a2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.5 | 1.5.6 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.7.4 | 2.11.2 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.2 | 2.0.3 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 1.9.7 | 2.8 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.19.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 2.2.0 | 2.5.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.18.14 | 1.19.4 | python-pynacl | DISTRO | https://release-monitoring.org/project/12703 | 1.4.0 | 1.5.0 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 19.1.0 | 21.0.0 | python-pyparsing | DISTRO | https://release-monitoring.org/project/03756 | 2.4.7 | 3.0.6 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.11.6 | 3.11.7 | python-pyphen | DISTRO | https://release-monitoring.org/project/19681 | 0.11.0 | 0.12.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.7 | 5.15.6 | python-pyro | DISTRO | https://release-monitoring.org/project/19993 | 3.16 | 4.82 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.5 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.1 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.16.0 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2019.3 | 2021.3 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | python-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 19.0.2 | 22.3.0 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 3.5.3 | 4.1.0 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.26.0 | 2.27.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.1 | python-rsa | DISTRO | https://release-monitoring.org/project/08808 | 4.7.2 | 4.8 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.fb57 | 2.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.1 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 18.1.0 | 21.1.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 44.0.0 | 60.5.0 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.17.5 | 3.17.6 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 0.45.2 | 1.3.0 | python-singledispatch | DISTRO | https://release-monitoring.org/project/12013 | 3.4.0.3 | 3.7.0 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.18 | 5.0.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 4.0.0 | 5.0.0 | python-snappy | DISTRO | https://release-monitoring.org/project/07203 | 0.5.4 | 0.6.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.0 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.2.1 | 2.3.1 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.3.10 | 1.4.29 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.2.0 | 1.2.1 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.3.0 | 0.4.2 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 1.14.1 | 5.0.0 | python-terminaltables | DISTRO | https://release-monitoring.org/project/15542 | 3.1.0 | 3.1.10 | python-thrift | DISTRO | https://release-monitoring.org/project/21614 | 0.13.0 | 0.15.0 | python-tinycss2 | DISTRO | https://release-monitoring.org/project/16655 | 1.1.0 | 1.1.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.1 | 1.1.3 | python-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.0 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.0.4 | 6.1 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.40.1 | 4.62.3 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.1.0 | 5.1.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 20.3.0 | 21.5.0 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 20.3.0 | 21.7.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.0.1 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 4.2.0 | 5.1.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.7 | 1.26.8 | python-validators | DISTRO | https://release-monitoring.org/project/19818 | 0.15.0 | 0.18.2 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.1.9 | 0.2.5 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 53.4 | 54.0b1 | python-webpy | DISTRO | https://release-monitoring.org/project/04090 | 0.40 | 0.62 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 0.58.0 | 1.2.3 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.2 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.12.1 | 1.13.3 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 2.3.3 | 3.0.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.27 | 0.31 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.1 | 3.0.2 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.1 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python3-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 59.8.0 | 60.5.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt53d | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5base | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5charts | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5connectivity | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5declarative | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5graphicaleffects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5imageformats | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5location | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5lottie | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5multimedia | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols2 | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quicktimeline | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5remoteobjects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5script | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5scxml | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5sensors | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialbus | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialport | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5svg | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5tools | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5virtualkeyboard | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5wayland | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webchannel | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.212.0-a... | 6.2.2 | qt5websockets | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webview | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5x11extras | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5xmlpatterns | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.1 | 1.2 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-server | DISTRO | https://release-monitoring.org/project/05585 | 3.8.2 | 3.9.12 | ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | readline | DISTRO | https://release-monitoring.org/project/04173 | 8.1 | 8.1.2 | ORPH restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.4 | 1.10.5 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.27.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2112.0 | rtai | DISTRO | https://release-monitoring.org/project/21658 | 4.0.1 | 5.3 | ORPH rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.0.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.57.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.57.0 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.10.0.3 | 2.11.0.1 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.1 | 2.3.5.3 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.6.3 | 1.0.7.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.5.1.5 | 2.5.1.7 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.4.1.1 | 2.5.1.0 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.3.2 | 2.2.3.4 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.2.2 | 0.5.3.0 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.3.0 | sdbus-cpp | DISTRO | https://release-monitoring.org/project/70626 | 0.8.3 | 1.1.0 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | sedutil | DISTRO | https://release-monitoring.org/project/15203 | 1.15.1 | 1.20.0 | sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 1.59.0 | 1.71.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.13 | sg3_utils | DISTRO | https://release-monitoring.org/project/04801 | 1.47 | 1.47r915 | shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.1 | ORPH skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.10.0.3 | 2.11.1.0 | snappy | DISTRO | https://release-monitoring.org/project/04844 | 1.1.8 | 1.1.9 | sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.4.7 | 1.4.10 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.2 | 3.4.8 | socat | DISTRO | https://release-monitoring.org/project/04848 | 1.7.4.2 | 1.7.4.3 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | speexdsp | DISTRO | https://release-monitoring.org/project/08419 | SpeexDSP-... | 1.2.0 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.1 | 3.37.2 | sshfs | DISTRO | https://release-monitoring.org/project/11058 | 3.7.1 | 3.7.2 | ORPH start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.1 | ORPH startup-notification | DISTRO | https://release-monitoring.org/project/10089 | 0.9 | 0.12 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.4 | 1.0.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.61 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.4 | ORPH synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.23.1 | 0.28.0 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.34.1 | 3.35.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.42.1 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.4.2 | 12.5.5 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.01 | ORPH targetcli-fb | DISTRO | https://release-monitoring.org/project/09174 | 2.1.fb41 | 2.1.54 | tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.4.6 | 2.4.7 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.15.0 | ORPH tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.2a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 2.4.0 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | trace-cmd... | 2.9.4 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.1 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2021.10 | udpcast | DISTRO | https://release-monitoring.org/project/10206 | 20200328 | 20211207 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.10 | 0.11 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 3.15.0.0 | 4.1.0.5 | umtprd | DISTRO | https://release-monitoring.org/project/46129 | 1.3.10 | 1.6.2 | unclutter-xfixes | DISTRO | https://release-monitoring.org/project/09206 | 1.5 | 1.6 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 2.2 | upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.54.6 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.3930 | 8.2.4046 | ORPH vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.22 | 3.2.26 | waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.6.1 | 1.7.0 | wayland | DISTRO | https://release-monitoring.org/project/10061 | 1.19.0 | 1.20.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.23 | 1.24 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.32.4 | 2.34.3 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.10 | 5.5.11 | wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 6.23 | wireguard-linux-compat | DISTRO | https://release-monitoring.org/project/62379 | 1.0.20210606 | 1.0.20211208 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.2 | 0.4.6 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.10 | 3.6.1 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.0 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.1.1 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.3 | 2.35.1 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20210218 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 21.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.3 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xml-security-c | DISTRO | https://release-monitoring.org/project/05197 | 2.0.2 | 2.0.4 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 5.45 | 6.02 | xserver_xorg-server | DISTRO | https://release-monitoring.org/project/05250 | 21.1.2 | 21.1.3 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.17 | 3.18 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.0 | 0.3.1 | yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | zic | DISTRO | https://release-monitoring.org/project/16905 | 2020f | 2021e | zynq-boot-bin | DISTRO | https://release-monitoring.org/project/21623 | 2015.1 | 2021.2 | ORPH Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 bash | CVE-2019-18276 | https://security-tracker.debian.org/tracker/CVE-2019-18276 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-3487 | https://security-tracker.debian.org/tracker/CVE-2021-3487 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bird | CVE-2021-26928 | https://security-tracker.debian.org/tracker/CVE-2021-26928 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2021-42376 | https://security-tracker.debian.org/tracker/CVE-2021-42376 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 civetweb | CVE-2020-27304 | https://security-tracker.debian.org/tracker/CVE-2020-27304 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exim | CVE-2021-38371 | https://security-tracker.debian.org/tracker/CVE-2021-38371 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2020-35965 | https://security-tracker.debian.org/tracker/CVE-2020-35965 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 flatbuffers | CVE-2020-35864 | https://security-tracker.debian.org/tracker/CVE-2020-35864 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41157 | https://security-tracker.debian.org/tracker/CVE-2021-41157 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-27645 | https://security-tracker.debian.org/tracker/CVE-2021-27645 glibc | CVE-2021-33574 | https://security-tracker.debian.org/tracker/CVE-2021-33574 glibc | CVE-2021-38604 | https://security-tracker.debian.org/tracker/CVE-2021-38604 gnuchess | CVE-2021-30184 | https://security-tracker.debian.org/tracker/CVE-2021-30184 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 go | CVE-2021-29923 | https://security-tracker.debian.org/tracker/CVE-2021-29923 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2020-6624 | https://security-tracker.debian.org/tracker/CVE-2020-6624 jhead | CVE-2020-6625 | https://security-tracker.debian.org/tracker/CVE-2020-6625 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 keepalived | CVE-2021-44225 | https://security-tracker.debian.org/tracker/CVE-2021-44225 kodi | CVE-2021-42917 | https://security-tracker.debian.org/tracker/CVE-2021-42917 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libesmtp | CVE-2019-19977 | https://security-tracker.debian.org/tracker/CVE-2019-19977 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libnss | CVE-2021-43527 | https://security-tracker.debian.org/tracker/CVE-2021-43527 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libressl | CVE-2021-41581 | https://security-tracker.debian.org/tracker/CVE-2021-41581 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 monkey | CVE-2013-1771 | https://security-tracker.debian.org/tracker/CVE-2013-1771 monkey | CVE-2013-2183 | https://security-tracker.debian.org/tracker/CVE-2013-2183 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 mutt | CVE-2021-32055 | https://security-tracker.debian.org/tracker/CVE-2021-32055 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 network-manager | CVE-2021-20297 | https://security-tracker.debian.org/tracker/CVE-2021-20297 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvpn | CVE-2021-3606 | https://security-tracker.debian.org/tracker/CVE-2021-3606 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php-imagick | CVE-2019-11037 | https://security-tracker.debian.org/tracker/CVE-2019-11037 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 privoxy | CVE-2021-44540 | https://security-tracker.debian.org/tracker/CVE-2021-44540 privoxy | CVE-2021-44541 | https://security-tracker.debian.org/tracker/CVE-2021-44541 privoxy | CVE-2021-44542 | https://security-tracker.debian.org/tracker/CVE-2021-44542 privoxy | CVE-2021-44543 | https://security-tracker.debian.org/tracker/CVE-2021-44543 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-autobahn | CVE-2020-35678 | https://security-tracker.debian.org/tracker/CVE-2020-35678 python-cryptography | CVE-2020-36242 | https://security-tracker.debian.org/tracker/CVE-2020-36242 python-django | CVE-2021-44420 | https://security-tracker.debian.org/tracker/CVE-2021-44420 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2020-35503 | https://security-tracker.debian.org/tracker/CVE-2020-35503 qemu | CVE-2020-35504 | https://security-tracker.debian.org/tracker/CVE-2020-35504 qemu | CVE-2020-35505 | https://security-tracker.debian.org/tracker/CVE-2020-35505 qemu | CVE-2020-35506 | https://security-tracker.debian.org/tracker/CVE-2020-35506 qemu | CVE-2020-35517 | https://security-tracker.debian.org/tracker/CVE-2020-35517 qemu | CVE-2021-20181 | https://security-tracker.debian.org/tracker/CVE-2021-20181 qemu | CVE-2021-20196 | https://security-tracker.debian.org/tracker/CVE-2021-20196 qemu | CVE-2021-20203 | https://security-tracker.debian.org/tracker/CVE-2021-20203 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-20263 | https://security-tracker.debian.org/tracker/CVE-2021-20263 qemu | CVE-2021-3392 | https://security-tracker.debian.org/tracker/CVE-2021-3392 qemu | CVE-2021-3409 | https://security-tracker.debian.org/tracker/CVE-2021-3409 qemu | CVE-2021-3416 | https://security-tracker.debian.org/tracker/CVE-2021-3416 qemu | CVE-2021-3507 | https://security-tracker.debian.org/tracker/CVE-2021-3507 qemu | CVE-2021-3527 | https://security-tracker.debian.org/tracker/CVE-2021-3527 qemu | CVE-2021-3544 | https://security-tracker.debian.org/tracker/CVE-2021-3544 qemu | CVE-2021-3545 | https://security-tracker.debian.org/tracker/CVE-2021-3545 qemu | CVE-2021-3546 | https://security-tracker.debian.org/tracker/CVE-2021-3546 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 qpid-proton | CVE-2016-2166 | https://security-tracker.debian.org/tracker/CVE-2016-2166 qpid-proton | CVE-2016-4467 | https://security-tracker.debian.org/tracker/CVE-2016-4467 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2021-28966 | https://security-tracker.debian.org/tracker/CVE-2021-28966 runc | CVE-2021-43784 | https://security-tracker.debian.org/tracker/CVE-2021-43784 rust | CVE-2021-29922 | https://security-tracker.debian.org/tracker/CVE-2021-29922 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2021-3156 | https://security-tracker.debian.org/tracker/CVE-2021-3156 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tools | CVE-2021-3565 | https://security-tracker.debian.org/tracker/CVE-2021-3565 uboot-tools | CVE-2021-27097 | https://security-tracker.debian.org/tracker/CVE-2021-27097 uboot-tools | CVE-2021-27138 | https://security-tracker.debian.org/tracker/CVE-2021-27138 util-linux | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 util-linux-libs | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 vim | CVE-2021-4069 | https://security-tracker.debian.org/tracker/CVE-2021-4069 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 webkitgtk | CVE-2021-45481 | https://security-tracker.debian.org/tracker/CVE-2021-45481 webkitgtk | CVE-2021-45482 | https://security-tracker.debian.org/tracker/CVE-2021-45482 webkitgtk | CVE-2021-45483 | https://security-tracker.debian.org/tracker/CVE-2021-45483 wget | CVE-2021-31879 | https://security-tracker.debian.org/tracker/CVE-2021-31879 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28705 | https://security-tracker.debian.org/tracker/CVE-2021-28705 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28709 | https://security-tracker.debian.org/tracker/CVE-2021-28709 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 keepalived | CVE-2021-44225 | https://security-tracker.debian.org/tracker/CVE-2021-44225 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 privoxy | CVE-2021-44540 | https://security-tracker.debian.org/tracker/CVE-2021-44540 privoxy | CVE-2021-44541 | https://security-tracker.debian.org/tracker/CVE-2021-44541 privoxy | CVE-2021-44542 | https://security-tracker.debian.org/tracker/CVE-2021-44542 privoxy | CVE-2021-44543 | https://security-tracker.debian.org/tracker/CVE-2021-44543 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-django | CVE-2021-44420 | https://security-tracker.debian.org/tracker/CVE-2021-44420 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 runc | CVE-2021-43784 | https://security-tracker.debian.org/tracker/CVE-2021-43784 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2021-36690 | https://security-tracker.debian.org/tracker/CVE-2021-36690 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4069 | https://security-tracker.debian.org/tracker/CVE-2021-4069 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28705 | https://security-tracker.debian.org/tracker/CVE-2021-28705 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28709 | https://security-tracker.debian.org/tracker/CVE-2021-28709 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From arnout at mind.be Mon Jan 10 07:13:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:13:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/gensio: add avahi optional dependency In-Reply-To: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> References: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> Message-ID: On 04/01/2022 21:41, Fabrice Fontaine wrote: > avahi-client is an optional dependency which is enabled by default since > version 2.2.0 and > https://github.com/cminyard/gensio/commit/5ab117c9743fd4719f610cf9f1ba45023cc25d7c > > Signed-off-by: Fabrice Fontaine > --- > package/gensio/gensio.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk > index 389de1e263..b4936d5f21 100644 > --- a/package/gensio/gensio.mk > +++ b/package/gensio/gensio.mk > @@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net > GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) > GENSIO_LICENSE_FILES = COPYING.LIB COPYING > GENSIO_INSTALL_STAGING = YES > +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) In the commit message you talk about avahi-client, but here it's avahi-daemon. That looks a bit weird... Can you explain? Regards, Arnout > GENSIO_CONF_OPTS = \ > --without-openipmi \ > --without-swig \ > From arnout at mind.be Mon Jan 10 07:18:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:18:37 +0100 Subject: [Buildroot] [PATCH] package/linux-firmware: add option for Cypress FullMAC In-Reply-To: <20220105214046.14890-1-wiselord1983@gmail.com> References: <20220105214046.14890-1-wiselord1983@gmail.com> Message-ID: <2a9ec923-a4dc-8555-1c98-3562c2f7d3ef@mind.be> On 05/01/2022 22:40, Uladzimir Bely wrote: > Since 2016, Cypress is in charge of supporting old Broadcom wireless > chips and producing new ones. Newer firmwares for now come with > a different license and have anoter location in a package. > > Now, most of Broadcom FullMac firmwares in brcm/ directory should now > be just symlinks to the corresponding files in cypress/ directory. It's not actually most, just about half. > > Respectively, it also makes sence to autoselect corresponding CYPRESS > options if user selectes BRCM wireless stuff. This looked very suspicious at first, but indeed, with our linux-firmware infrastructure, this is the only reasonable way we can make sure that all the BCM firmware blobs are actually installed. Applied to master, thanks. Regards, Arnout > > This patch was created as a result of investigation the issue with > broken wireless support for such popular boards as Raspberry Pi Zero W > and BananaPi M2 Zero. > > Signed-off-by: Uladzimir Bely > --- > package/linux-firmware/Config.in | 17 ++++++++++ > package/linux-firmware/linux-firmware.hash | 1 + > package/linux-firmware/linux-firmware.mk | 39 ++++++++++++++++++++++ > 3 files changed, 57 insertions(+) > > diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in > index 622b1ee685..c94ffe24de 100644 > --- a/package/linux-firmware/Config.in > +++ b/package/linux-firmware/Config.in > @@ -140,11 +140,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X > > config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX > bool "Broadcom BRCM bcm43xx" > + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX > help > Firmware files for the Broadcom bcm43xx SoftMAC and FullMAC. > > config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > bool "Broadcom BRCM bcm43xxx" > + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX > help > Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. > > @@ -158,6 +160,21 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0 > help > Firmware file for the Broadcom 4366c0 FullMAC chip. > > +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX > + bool "Cypress CY cyw43xx" > + help > + Firmware files for the Cypress cyw43xx FullMAC. > + > +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX > + bool "Cypress CY cyw43xxx" > + help > + Firmware files for the Cypress cyw43xxx FullMAC. > + > +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX > + bool "Cypress CY cyw54xxx" > + help > + Firmware files for the Cypress cyw54xxx FullMAC. > + > config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 > bool "Intel iwlwifi 22260" > help > diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash > index d8edb37628..4c73374138 100644 > --- a/package/linux-firmware/linux-firmware.hash > +++ b/package/linux-firmware/linux-firmware.hash > @@ -11,6 +11,7 @@ sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k > sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt > sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx > sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware > +sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress > sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 > sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware > sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk > index 281ed0189d..ac45bc8282 100644 > --- a/package/linux-firmware/linux-firmware.mk > +++ b/package/linux-firmware/linux-firmware.mk > @@ -675,6 +675,45 @@ LINUX_FIRMWARE_FILES += brcm/brcmfmac4366c-pcie.bin > LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx > endif > > +# cyfmac43xx > +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX),y) > +LINUX_FIRMWARE_FILES += \ > + cypress/cyfmac4339-sdio.bin \ > + cypress/cyfmac4354-sdio.bin \ > + cypress/cyfmac4354-sdio.clm_blob \ > + cypress/cyfmac4356-pcie.bin \ > + cypress/cyfmac4356-pcie.clm_blob \ > + cypress/cyfmac4356-sdio.bin \ > + cypress/cyfmac4356-sdio.clm_blob \ > + cypress/cyfmac4373-sdio.bin \ > + cypress/cyfmac4373-sdio.clm_blob > +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress > +endif > + > +# cyfmac43xxx > +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX),y) > +LINUX_FIRMWARE_FILES += \ > + cypress/cyfmac43012-sdio.bin \ > + cypress/cyfmac43012-sdio.clm_blob \ > + cypress/cyfmac43340-sdio.bin \ > + cypress/cyfmac43362-sdio.bin \ > + cypress/cyfmac43430-sdio.bin \ > + cypress/cyfmac43430-sdio.clm_blob \ > + cypress/cyfmac43455-sdio.bin \ > + cypress/cyfmac43455-sdio.clm_blob \ > + cypress/cyfmac43570-pcie.bin \ > + cypress/cyfmac43570-pcie.clm_blob > +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress > +endif > + > +# cyfmac54xxx > +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX),y) > +LINUX_FIRMWARE_FILES += \ > + cypress/cyfmac54591-pcie.bin \ > + cypress/cyfmac54591-pcie.clm_blob > +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress > +endif > + > # ql2xxx > ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX),y) > LINUX_FIRMWARE_FILES += \ > From arnout at mind.be Mon Jan 10 07:19:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:19:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: new package In-Reply-To: <20220109170200.1315505-1-ju.o@free.fr> References: <20220109170200.1315505-1-ju.o@free.fr> Message-ID: On 09/01/2022 18:02, Julien Olivain wrote: > python-distro provides information about the OS distribution it runs on, > such as a reliable machine-readable ID, or version information. > > It is the recommended replacement for Python's original > platform.linux_distribution function (removed in Python 3.8). It also > provides much more functionality which isn't necessarily Python bound, > like a command-line interface. > > https://github.com/nir0s/distro > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-distro/Config.in | 13 +++++++++++++ > package/python-distro/python-distro.hash | 3 +++ > package/python-distro/python-distro.mk | 14 ++++++++++++++ > 5 files changed, 32 insertions(+) > create mode 100644 package/python-distro/Config.in > create mode 100644 package/python-distro/python-distro.hash > create mode 100644 package/python-distro/python-distro.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 2ad76a80e4..a44f07be97 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1590,6 +1590,7 @@ F: package/fluid-soundfont/ > F: package/fluidsynth/ > F: package/glslsandbox-player/ > F: package/ptm2human/ > +F: package/python-distro/ > F: package/python-pyalsa/ > > N: Julien Viard de Galbert > diff --git a/package/Config.in b/package/Config.in > index edae7e4f62..47087f52cb 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -999,6 +999,7 @@ menu "External python modules" > source "package/python-dialog/Config.in" > source "package/python-dialog3/Config.in" > source "package/python-dicttoxml/Config.in" > + source "package/python-distro/Config.in" > source "package/python-django/Config.in" > source "package/python-django-enumfields/Config.in" > source "package/python-dnspython/Config.in" > diff --git a/package/python-distro/Config.in b/package/python-distro/Config.in > new file mode 100644 > index 0000000000..bb4151541e > --- /dev/null > +++ b/package/python-distro/Config.in > @@ -0,0 +1,13 @@ > +config BR2_PACKAGE_PYTHON_DISTRO > + bool "python distro" > + help > + distro provides information about the OS distribution it > + runs on, such as a reliable machine-readable ID, or version > + information. > + > + It is the recommended replacement for Python's original > + platform.linux_distribution function (removed in Python > + 3.8). It also provides much more functionality which isn't > + necessarily Python bound, like a command-line interface. > + > + https://github.com/nir0s/distro > diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash > new file mode 100644 > index 0000000000..e2b3c0a444 > --- /dev/null > +++ b/package/python-distro/python-distro.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz > +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE > diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk > new file mode 100644 > index 0000000000..753e74d020 > --- /dev/null > +++ b/package/python-distro/python-distro.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-distro > +# > +################################################################################ > + > +PYTHON_DISTRO_VERSION = 1.6.0 > +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 > +PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz > +PYTHON_DISTRO_LICENSE = Apache-2.0 > +PYTHON_DISTRO_LICENSE_FILES = LICENSE > +PYTHON_DISTRO_SETUP_TYPE = setuptools > + > +$(eval $(python-package)) > From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/hiawatha: disable ASM if needed Message-ID: <20220110071316.C1D1E82ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89ecfb3c789b57552373eb323e6b2ac9001295a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable ASM as already done in mbedtls package to avoid the following build failure raised since commit 4e36e8f2081a66f477dd038793082045876d65ee: In file included from /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c:41: /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c: In function 'mpi_mul_hlp': /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bn_mul.h:86:13: error: the register 'hi' cannot be clobbered in 'asm' for the current target 86 | #define asm __asm | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/5436b44777c5d417ae427b99602f516fd8f9489d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/hiawatha/hiawatha.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index ed9f8aba54..14d3c9f1ee 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -22,6 +22,24 @@ HIAWATHA_CONF_OPTS = \ -DWEBROOT_DIR=/var/www/hiawatha \ -DWORK_DIR=/var/lib/hiawatha +define HIAWATHA_MBEDTLS_DISABLE_ASM + $(SED) '/^#define MBEDTLS_AESNI_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h +endef + +# ARM in thumb mode breaks debugging with asm optimizations +# Microblaze asm optimizations are broken in general +# MIPS R6 asm is not yet supported +ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +endif + ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/hiawatha: mbedtls is mandatory, not optional Message-ID: <20220110071316.B786D82DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4043bc0c9c55e1bcac58677c361cd1b8724716b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master hiawatha is unconditionally using mbedtls since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e (e.g. wigwam.c includes "mbedtls/md5.h") Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/hiawatha/hiawatha.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 017592de1e..ed9f8aba54 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -11,7 +11,10 @@ HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver +# Disable system mbedtls as hiawatha needs mbedtls 3.x HIAWATHA_CONF_OPTS = \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF \ -DENABLE_TOOLKIT=OFF \ -DCONFIG_DIR=/etc/hiawatha \ -DLOG_DIR=/var/log \ @@ -20,11 +23,7 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -# Disable system mbedtls as hiawatha needs mbedtls 3.x -HIAWATHA_CONF_OPTS += \ - -DENABLE_TLS=ON \ - -DINSTALL_MBEDTLS_HEADERS=OFF \ - -DUSE_SYSTEM_MBEDTLS=OFF +HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: add option for Cypress FullMAC Message-ID: <20220110071316.A3D0182ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27cbd680cb6386a2326a3a95f41de80deba440b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since 2016, Cypress is in charge of supporting old Broadcom wireless chips and producing new ones. Newer firmwares for now come with a different license and have anoter location in a package. Now, most of Broadcom FullMac firmwares in brcm/ directory should now be just symlinks to the corresponding files in cypress/ directory. Respectively, it also makes sence to autoselect corresponding CYPRESS options if user selectes BRCM wireless stuff. This patch was created as a result of investigation the issue with broken wireless support for such popular boards as Raspberry Pi Zero W and BananaPi M2 Zero. Signed-off-by: Uladzimir Bely Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/linux-firmware/Config.in | 17 +++++++++++++ package/linux-firmware/linux-firmware.hash | 1 + package/linux-firmware/linux-firmware.mk | 39 ++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 622b1ee685..c94ffe24de 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -140,11 +140,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX bool "Broadcom BRCM bcm43xx" + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX help Firmware files for the Broadcom bcm43xx SoftMAC and FullMAC. config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX bool "Broadcom BRCM bcm43xxx" + select BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX help Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. @@ -158,6 +160,21 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0 help Firmware file for the Broadcom 4366c0 FullMAC chip. +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX + bool "Cypress CY cyw43xx" + help + Firmware files for the Cypress cyw43xx FullMAC. + +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX + bool "Cypress CY cyw43xxx" + help + Firmware files for the Cypress cyw43xxx FullMAC. + +config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX + bool "Cypress CY cyw54xxx" + help + Firmware files for the Cypress cyw54xxx FullMAC. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index d8edb37628..4c73374138 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -11,6 +11,7 @@ sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware +sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 281ed0189d..ac45bc8282 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -675,6 +675,45 @@ LINUX_FIRMWARE_FILES += brcm/brcmfmac4366c-pcie.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif +# cyfmac43xx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac4339-sdio.bin \ + cypress/cyfmac4354-sdio.bin \ + cypress/cyfmac4354-sdio.clm_blob \ + cypress/cyfmac4356-pcie.bin \ + cypress/cyfmac4356-pcie.clm_blob \ + cypress/cyfmac4356-sdio.bin \ + cypress/cyfmac4356-sdio.clm_blob \ + cypress/cyfmac4373-sdio.bin \ + cypress/cyfmac4373-sdio.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + +# cyfmac43xxx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW43XXX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac43012-sdio.bin \ + cypress/cyfmac43012-sdio.clm_blob \ + cypress/cyfmac43340-sdio.bin \ + cypress/cyfmac43362-sdio.bin \ + cypress/cyfmac43430-sdio.bin \ + cypress/cyfmac43430-sdio.clm_blob \ + cypress/cyfmac43455-sdio.bin \ + cypress/cyfmac43455-sdio.clm_blob \ + cypress/cyfmac43570-pcie.bin \ + cypress/cyfmac43570-pcie.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + +# cyfmac54xxx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX),y) +LINUX_FIRMWARE_FILES += \ + cypress/cyfmac54591-pcie.bin \ + cypress/cyfmac54591-pcie.clm_blob +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cypress +endif + # ql2xxx ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX),y) LINUX_FIRMWARE_FILES += \ From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/python-distro: new package Message-ID: <20220110071316.AEA1682DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d01f3401320077c6d572135e47ffc4ae218a6ef5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-distro provides information about the OS distribution it runs on, such as a reliable machine-readable ID, or version information. It is the recommended replacement for Python's original platform.linux_distribution function (removed in Python 3.8). It also provides much more functionality which isn't necessarily Python bound, like a command-line interface. https://github.com/nir0s/distro Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-distro/Config.in | 13 +++++++++++++ package/python-distro/python-distro.hash | 3 +++ package/python-distro/python-distro.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 55f37dfe62..cd0b54b041 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1594,6 +1594,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ +F: package/python-distro/ F: package/python-pyalsa/ N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index a1924f96df..3a2ad30df9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1001,6 +1001,7 @@ menu "External python modules" source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" + source "package/python-distro/Config.in" source "package/python-django/Config.in" source "package/python-django-enumfields/Config.in" source "package/python-dnspython/Config.in" diff --git a/package/python-distro/Config.in b/package/python-distro/Config.in new file mode 100644 index 0000000000..bb4151541e --- /dev/null +++ b/package/python-distro/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_DISTRO + bool "python distro" + help + distro provides information about the OS distribution it + runs on, such as a reliable machine-readable ID, or version + information. + + It is the recommended replacement for Python's original + platform.linux_distribution function (removed in Python + 3.8). It also provides much more functionality which isn't + necessarily Python bound, like a command-line interface. + + https://github.com/nir0s/distro diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash new file mode 100644 index 0000000000..e2b3c0a444 --- /dev/null +++ b/package/python-distro/python-distro.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk new file mode 100644 index 0000000000..753e74d020 --- /dev/null +++ b/package/python-distro/python-distro.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-distro +# +################################################################################ + +PYTHON_DISTRO_VERSION = 1.6.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz +PYTHON_DISTRO_LICENSE = Apache-2.0 +PYTHON_DISTRO_LICENSE_FILES = LICENSE +PYTHON_DISTRO_SETUP_TYPE = setuptools + +$(eval $(python-package)) From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/python-packaging: bump to version 21.3 Message-ID: <20220110071316.D4A0782DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f56ecaad4b5a771ea97275c33e3bcb2497d289bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-packaging/python-packaging.hash | 4 ++-- package/python-packaging/python-packaging.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 0c23a5f71c..0f353a9e36 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 240ba5823ed31051a1254e74c9d18d55 packaging-21.0.tar.gz -sha256 7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 packaging-21.0.tar.gz +md5 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz +sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index e2fb9b120b..569dc0bf58 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 21.0 +PYTHON_PACKAGING_VERSION = 21.3 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3afd461faecf9955a6501c4999933a48394e90f03cd512aad844 +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c PYTHON_PACKAGING_SETUP_TYPE = setuptools PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/squid: needs threads Message-ID: <20220110071316.CAF4A82DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90be89396bcbdd529f4cff64e44aa9fa3b0983e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master squid needs threads and https://github.com/squid-cache/squid/commit/7dba4ac446341548a0b101489785f2cef9a33caa to avoid the following build failure raised since bump to version 5.3 in commit efc07b7a1818787229ddb335ca26ff2cf03820ae: ntlm_fake_auth.cc: In function 'int main(int, char**)': ntlm_fake_auth.cc:187:18: error: 'std::this_thread' has not been declared 187 | std::this_thread::sleep_for(std::chrono::milliseconds(response_delay)); | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/2aabc8375d41ad4d047d20ff8ee4fe1c978e7ee1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/squid/Config.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 0df2aedef6..6272140768 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,13 +1,16 @@ -comment "squid needs a toolchain w/ C++, gcc >= 4.8 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 # needs fork() From arnout at mind.be Mon Jan 10 07:17:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:17:15 +0100 Subject: [Buildroot] [git commit] package/python-pyparsing: bump to version 3.0.6 Message-ID: <20220110071316.DD32982ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7affc7827aee0e07ec94d3b4d91c2e23bda8d937 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pyparsing/python-pyparsing.hash | 4 ++-- package/python-pyparsing/python-pyparsing.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index 2c52ff0843..a21baf46e5 100644 --- a/package/python-pyparsing/python-pyparsing.hash +++ b/package/python-pyparsing/python-pyparsing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyparsing/json -md5 f0953e47a0112f7a65aec2305ffdf7b4 pyparsing-2.4.7.tar.gz -sha256 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz +md5 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz +sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz # Locally computed sha256 checksums sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 5741458d65..b6ab353a6d 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 2.4.7 +PYTHON_PYPARSING_VERSION = 3.0.6 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210 +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools From arnout at mind.be Mon Jan 10 07:20:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:20:25 +0100 Subject: [Buildroot] [PATCH 1/2] package/hiawatha: mbedtls is mandatory, not optional In-Reply-To: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> References: <20220109221633.1307381-1-fontaine.fabrice@gmail.com> Message-ID: <1151a8f7-e692-6fc7-9bae-44b39ae0ad21@mind.be> On 09/01/2022 23:16, Fabrice Fontaine wrote: > hiawatha is unconditionally using mbedtls since bump to version 11.1 in > commit 24e4c888c3d36e3943206ea55894b84344cc8b2e (e.g. wigwam.c includes > "mbedtls/md5.h") > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/hiawatha/hiawatha.mk | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk > index 017592de1e..ed9f8aba54 100644 > --- a/package/hiawatha/hiawatha.mk > +++ b/package/hiawatha/hiawatha.mk > @@ -11,7 +11,10 @@ HIAWATHA_LICENSE = GPL-2.0 > HIAWATHA_LICENSE_FILES = LICENSE > HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver > > +# Disable system mbedtls as hiawatha needs mbedtls 3.x > HIAWATHA_CONF_OPTS = \ > + -DINSTALL_MBEDTLS_HEADERS=OFF \ > + -DUSE_SYSTEM_MBEDTLS=OFF \ > -DENABLE_TOOLKIT=OFF \ > -DCONFIG_DIR=/etc/hiawatha \ > -DLOG_DIR=/var/log \ > @@ -20,11 +23,7 @@ HIAWATHA_CONF_OPTS = \ > -DWORK_DIR=/var/lib/hiawatha > > ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) > -# Disable system mbedtls as hiawatha needs mbedtls 3.x > -HIAWATHA_CONF_OPTS += \ > - -DENABLE_TLS=ON \ > - -DINSTALL_MBEDTLS_HEADERS=OFF \ > - -DUSE_SYSTEM_MBEDTLS=OFF > +HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON > else > HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF > endif > From arnout at mind.be Mon Jan 10 07:20:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:20:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/squid: needs threads In-Reply-To: <20220109223135.1409181-1-fontaine.fabrice@gmail.com> References: <20220109223135.1409181-1-fontaine.fabrice@gmail.com> Message-ID: <47d73898-1b4a-322d-a2e5-432d00eb1f91@mind.be> On 09/01/2022 23:31, Fabrice Fontaine wrote: > squid needs threads and > https://github.com/squid-cache/squid/commit/7dba4ac446341548a0b101489785f2cef9a33caa > to avoid the following build failure raised since > bump to version 5.3 in commit efc07b7a1818787229ddb335ca26ff2cf03820ae: > > ntlm_fake_auth.cc: In function 'int main(int, char**)': > ntlm_fake_auth.cc:187:18: error: 'std::this_thread' has not been declared > 187 | std::this_thread::sleep_for(std::chrono::milliseconds(response_delay)); > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/2aabc8375d41ad4d047d20ff8ee4fe1c978e7ee1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/squid/Config.in | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/package/squid/Config.in b/package/squid/Config.in > index 0df2aedef6..6272140768 100644 > --- a/package/squid/Config.in > +++ b/package/squid/Config.in > @@ -1,13 +1,16 @@ > -comment "squid needs a toolchain w/ C++, gcc >= 4.8 not affected by bug 64735" > +comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" > depends on BR2_USE_MMU > depends on BR2_TOOLCHAIN_HAS_ATOMIC > depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ > - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > > config BR2_PACKAGE_SQUID > bool "squid" > depends on BR2_TOOLCHAIN_HAS_ATOMIC > depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 > # needs fork() > From arnout at mind.be Mon Jan 10 07:21:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:21:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-packaging: bump to version 21.3 In-Reply-To: <20220110062015.1299719-1-james.hilliard1@gmail.com> References: <20220110062015.1299719-1-james.hilliard1@gmail.com> Message-ID: On 10/01/2022 07:20, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-packaging/python-packaging.hash | 4 ++-- > package/python-packaging/python-packaging.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash > index 0c23a5f71c..0f353a9e36 100644 > --- a/package/python-packaging/python-packaging.hash > +++ b/package/python-packaging/python-packaging.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/packaging/json > -md5 240ba5823ed31051a1254e74c9d18d55 packaging-21.0.tar.gz > -sha256 7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 packaging-21.0.tar.gz > +md5 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz > +sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz > # Locally computed sha256 checksums > sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE > sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE > diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk > index e2fb9b120b..569dc0bf58 100644 > --- a/package/python-packaging/python-packaging.mk > +++ b/package/python-packaging/python-packaging.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PACKAGING_VERSION = 21.0 > +PYTHON_PACKAGING_VERSION = 21.3 > PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz > -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/86/aef78bab3afd461faecf9955a6501c4999933a48394e90f03cd512aad844 > +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c > PYTHON_PACKAGING_SETUP_TYPE = setuptools > PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause > PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD > From arnout at mind.be Mon Jan 10 07:21:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:21:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: bump to version 3.0.6 In-Reply-To: <20220110062327.1302104-1-james.hilliard1@gmail.com> References: <20220110062327.1302104-1-james.hilliard1@gmail.com> Message-ID: <83376eb4-465e-c603-b989-26b0684520b2@mind.be> On 10/01/2022 07:23, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyparsing/python-pyparsing.hash | 4 ++-- > package/python-pyparsing/python-pyparsing.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash > index 2c52ff0843..a21baf46e5 100644 > --- a/package/python-pyparsing/python-pyparsing.hash > +++ b/package/python-pyparsing/python-pyparsing.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyparsing/json > -md5 f0953e47a0112f7a65aec2305ffdf7b4 pyparsing-2.4.7.tar.gz > -sha256 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz > +md5 2f5fad6c8e99ac2562ab08ad9e45b195 pyparsing-3.0.6.tar.gz > +sha256 d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81 pyparsing-3.0.6.tar.gz > # Locally computed sha256 checksums > sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE > diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk > index 5741458d65..b6ab353a6d 100644 > --- a/package/python-pyparsing/python-pyparsing.mk > +++ b/package/python-pyparsing/python-pyparsing.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYPARSING_VERSION = 2.4.7 > +PYTHON_PYPARSING_VERSION = 3.0.6 > PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz > -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210 > +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/ab/61/1a1613e3dcca483a7aa9d446cb4614e6425eb853b90db131c305bd9674cb > PYTHON_PYPARSING_LICENSE = MIT > PYTHON_PYPARSING_LICENSE_FILES = LICENSE > PYTHON_PYPARSING_SETUP_TYPE = setuptools > From arnout at mind.be Mon Jan 10 07:26:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:26:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: References: <20201126152832.1115350-1-nolange79@gmail.com> Message-ID: <7229983a-cbde-eb3f-83cb-984544f3b355@mind.be> On 09/01/2022 23:52, Norbert Lange wrote: > Not only missing, but I sometimes need a *different* config. For example i don't > want to link against lz4, since I use zstd instead. Which is a great example of why the option doesn't work: it would affect dependencies as well. However, specifically for this one, we have in the .mk file: ifeq ($(BR2_PACKAGE_ZSTD),y) SYSTEMD_DEPENDENCIES += zstd SYSTEMD_CONF_OPTS += -Dzstd=true else SYSTEMD_CONF_OPTS += -Dzstd=false endif ifeq ($(BR2_PACKAGE_LZ4),y) SYSTEMD_DEPENDENCIES += lz4 SYSTEMD_CONF_OPTS += -Dlz4=true else SYSTEMD_CONF_OPTS += -Dlz4=false endif So it should already do what you need, no? Regards, Arnout From arnout at mind.be Mon Jan 10 07:29:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:29:43 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/glibc: force -fno-lto In-Reply-To: References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-4-nolange79@gmail.com> <20220109223145.GK1477939@scaer> Message-ID: On 10/01/2022 00:09, Norbert Lange wrote: > > > Yann E. MORIN > schrieb > am So., 9. Jan. 2022, 23:31: > > Norbert, All, > > On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: > > glibc requires compilation barriers between files, and will > > fail with LTO enabled. > > So force LTO off by appending -fno-lto to the flags, but only > > if the GCC version is recent enough that an LTO build would > > be possible. > > > > Signed-off-by: Norbert Lange > > > Applied to master, thanks. > > Are the other C libraries (uClibc, musl) also affected by such an issue? > > > Likely, and unless they are tested with LTO I would not trust them to not have > weird runtime issues. > > Ideally there would be a whitelist for packages doing fine with LTO, for now I > can only vouch for the couple I am using LTOed since years. Up to now, the idea was that packages that support LTO would check for it themselves in their configure step and enable it if available. It would be a good idea though to add a global option to enable LTO, similar to SSP etc. The first step for that would be to add a hidden symbol that indicates if the toolchain has LTO, and that gets selected by the toolchains that have LTO. Then we have to look at each external toolchain to verify if LTO is available, and add a checker function to validate that it is correct. Finally, we can randomly turn on the LTO option in the genrandconfig script, and fix the fallout on abo. Regards, Arnout > > Since a few distros now use LTO by default, hopefully things will get better. > > Norbert > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Mon Jan 10 07:33:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:33:12 +0100 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory In-Reply-To: References: Message-ID: <420ac869-6aea-a492-7a74-3014b7bb4cf3@mind.be> On 10/01/2022 00:46, William Tambe wrote: > On Sun, Jan 9, 2022 at 2:08 PM Arnout Vandecappelle wrote: >> >> >> >> On 09/01/2022 19:18, William Tambe wrote: >>> I am attempting to build: >>> >>> +BR2_PACKAGE_DHCP=y >>> +BR2_PACKAGE_DHCP_CLIENT=y >>> >>> However it fails as follow complaining about not finding readline/history.h: >>> >>> making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate >>> /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc >> >> pu32 doesn't exist in Buildroot, so this may very well be due to external changes. So, do you have external changes that may be the cause of this? IOW, can you reproduce the problem on upstream Buildroot? >> >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 >>> -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include >>> -I../../lib/lwres/unix/include -I../../lib/lwres/include >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include >>> -I../../lib/dns/include >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include >>> -I../../lib/bind9/include >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include >>> -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include >>> -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include >>> -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" >>> -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE >>> -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall >>> -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat >>> -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks >>> \ >>> -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ >>> -c ./nsupdate.c >>> ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory >>> 104 | #include >>> | ^~~~~~~~~~~~~~~~~~~~ >> >> This sounds like you changed your configuration without doing 'make clean'. Is >> that possible? > > I am building from clean or from scratch. > >> >> Is BR2_PACKAGE_READLINE enabled in your configuration? Has it been built? > > Yes, BR2_PACKAGE_READLINE is enabled in my configuration. And does it get built? Does output/build/readline/.stamp_staging_installed exist? The bind.mk file has this: ifeq ($(BR2_PACKAGE_READLINE),y) BIND_DEPENDENCIES += readline else BIND_CONF_OPTS += --with-readline=no endif which should make sure that readline is built and installed before bind. This in turn should make sure that output/host/*/sysroot/usr/include/readline/history.h exists. Regards, Arnout > >> >> Regards, >> Arnout >> >>> compilation terminated. >>> make[5]: *** [Makefile:473: nsupdate.o] Error 1 >>> make[4]: *** [Makefile:79: subdirs] Error 1 >>> make[3]: *** [Makefile:88: subdirs] Error 1 >>> make[2]: *** [package/pkg-generic.mk:270: >>> /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] >>> Error 2 >>> make[1]: *** [Makefile:23: _all] Error 2 >>> make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' >>> make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> From james.hilliard1 at gmail.com Mon Jan 10 07:38:50 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 00:38:50 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-tinycss2: bump to version 1.1.1 In-Reply-To: <20220110073850.1603711-1-james.hilliard1@gmail.com> References: <20220110073850.1603711-1-james.hilliard1@gmail.com> Message-ID: <20220110073850.1603711-2-james.hilliard1@gmail.com> This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard --- package/python-tinycss2/Config.in | 2 ++ package/python-tinycss2/python-tinycss2.hash | 4 ++-- package/python-tinycss2/python-tinycss2.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index e6c992b8c5..e7a5bb3659 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -4,3 +4,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. + + https://www.courtbouillon.org/tinycss2 diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash index eeb3754752..e8e1d93f83 100644 --- a/package/python-tinycss2/python-tinycss2.hash +++ b/package/python-tinycss2/python-tinycss2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinycss2/json -md5 7caf513c4e87fc2449dcfbf407a8416f tinycss2-1.1.0.tar.gz -sha256 fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a tinycss2-1.1.0.tar.gz +md5 60272f58f8d5834b2e09ffbc9bd5de53 tinycss2-1.1.1.tar.gz +sha256 b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf tinycss2-1.1.1.tar.gz # Locally computed sha256 checksums sha256 6b94acee20ec9f2709333134f3ba70322535fb420af0ce8c1455d9cbe297f1d5 LICENSE diff --git a/package/python-tinycss2/python-tinycss2.mk b/package/python-tinycss2/python-tinycss2.mk index 4bf5b97766..e4fc5dc9c5 100644 --- a/package/python-tinycss2/python-tinycss2.mk +++ b/package/python-tinycss2/python-tinycss2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_TINYCSS2_VERSION = 1.1.0 +PYTHON_TINYCSS2_VERSION = 1.1.1 PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz -PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8 -PYTHON_TINYCSS2_SETUP_TYPE = distutils +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/1e/5a/576828164b5486f319c4323915b915a8af3fa4a654bbb6f8fc8e87b5cb17 +PYTHON_TINYCSS2_SETUP_TYPE = flit PYTHON_TINYCSS2_LICENSE = BSD-3-Clause PYTHON_TINYCSS2_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 10 07:38:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 00:38:49 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-flit-core: new package/infrastructure Message-ID: <20220110073850.1603711-1-james.hilliard1@gmail.com> This adds pep517(needed for flit-core to build itself) and flit python package types. We need to add an installer script and pass it appropriate options for installing pep517 wheels generated by python-pypa-build during the build stage. Unfortunately it seems pep517 does not support builds without using the wheel format. We also need to add a patch fixing the version parser in flit-core. Signed-off-by: James Hilliard --- package/pkg-python.mk | 99 +++++++++++++++++++ ...sion-parser-for-multiple-assignments.patch | 80 +++++++++++++++ .../python-flit-core/python-flit-core.hash | 3 + package/python-flit-core/python-flit-core.mk | 15 +++ support/scripts/pyinstaller.py | 69 +++++++++++++ 5 files changed, 266 insertions(+) create mode 100644 package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch create mode 100644 package/python-flit-core/python-flit-core.hash create mode 100644 package/python-flit-core/python-flit-core.mk create mode 100755 support/scripts/pyinstaller.py diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 22ea77352c..6bd3f43286 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -92,6 +92,47 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ + _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ + PATH=$(BR_PATH) \ + $(TARGET_CONFIGURE_OPTS) \ + PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONNOUSERSITE=1 \ + _python_sysroot=$(STAGING_DIR) \ + _python_prefix=/usr \ + _python_exec_prefix=/usr + +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) + +HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/usr/bin \ + --data=$(HOST_DIR)/usr + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -141,6 +182,19 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_TGT = build $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +ifeq ($(4),target) +$(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_TGT = -w +$(2)_BASE_BUILD_OPTS = +$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) +else +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_TGT = -w +$(2)_BASE_BUILD_OPTS = +$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") endif @@ -203,6 +257,12 @@ $(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3 else $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) endif +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-pypa-build,$(1)),,host-python-pypa-build) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-installer,$(1)),,host-python-installer) +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) +endif endif # SETUP_TYPE # Python interpreter to use for building the package. @@ -234,6 +294,15 @@ endif # file. # ifndef $(2)_BUILD_CMDS +ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +define $(2)_BUILD_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) -m build -n \ + $$($$(PKG)_BASE_BUILD_TGT) \ + $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) +endef +else define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ @@ -242,12 +311,21 @@ define $(2)_BUILD_CMDS $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef endif +endif # # Host installation step. Only define it if not already defined by the # package .mk file. # ifndef $(2)_INSTALL_CMDS +ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +define $(2)_INSTALL_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) $(TOPDIR)/support/scripts/pyinstaller.py dist/* \ + $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) +endef +else define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ @@ -255,12 +333,22 @@ define $(2)_INSTALL_CMDS $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) endef endif +endif # # Target installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_TARGET_CMDS +ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +define $(2)_INSTALL_TARGET_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) $(TOPDIR)/support/scripts/pyinstaller.py dist/* \ + $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ + $$($$(PKG)_INSTALL_TARGET_OPTS)) +endef +else define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ @@ -269,12 +357,22 @@ define $(2)_INSTALL_TARGET_CMDS $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif +endif # # Staging installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_STAGING_CMDS +ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +define $(2)_INSTALL_STAGING_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) $(TOPDIR)/support/scripts/pyinstaller.py dist/* \ + $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($$(PKG)_INSTALL_STAGING_OPTS)) +endef +else define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ @@ -283,6 +381,7 @@ define $(2)_INSTALL_STAGING_CMDS $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif +endif # Call the generic package infrastructure to generate the necessary # make targets diff --git a/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch new file mode 100644 index 0000000000..5a94e1dcab --- /dev/null +++ b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch @@ -0,0 +1,80 @@ +From 2cd8b5708be88b90ea2fa0fb35407a5ec2038c8e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 27 Nov 2021 02:36:15 -0700 +Subject: [PATCH] Fix ast version parser for multiple assignments + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/takluyver/flit/pull/474] +--- + flit_core/common.py | 21 +++++++++++-------- + .../tests/samples/moduleunimportabledouble.py | 8 +++++++ + flit_core/tests/test_common.py | 5 +++++ + 3 files changed, 25 insertions(+), 9 deletions(-) + create mode 100644 flit_core/tests/samples/moduleunimportabledouble.py + +diff --git a/flit_core/common.py b/flit_core/common.py +index f1f378f..86bcf4b 100644 +--- a/flit_core/common.py ++++ b/flit_core/common.py +@@ -132,15 +132,18 @@ def get_docstring_and_version_via_ast(target): + for child in node.body: + # Only use the version from the given module if it's a simple + # string assignment to __version__ +- is_version_str = ( +- isinstance(child, ast.Assign) +- and len(child.targets) == 1 +- and isinstance(child.targets[0], ast.Name) +- and child.targets[0].id == "__version__" +- and isinstance(child.value, ast.Str) +- ) +- if is_version_str: +- version = child.value.s ++ if isinstance(child, ast.Assign): ++ for target in child.targets: ++ is_version_str = ( ++ isinstance(target, ast.Name) ++ and target.id == "__version__" ++ and isinstance(child.value, ast.Str) ++ ) ++ if is_version_str: ++ version = child.value.s ++ break ++ else: ++ continue + break + else: + version = None +diff --git a/flit_core/tests/samples/moduleunimportabledouble.py b/flit_core/tests/samples/moduleunimportabledouble.py +new file mode 100644 +index 0000000..42d51f3 +--- /dev/null ++++ b/flit_core/tests/samples/moduleunimportabledouble.py +@@ -0,0 +1,8 @@ ++ ++""" ++A sample unimportable module with double assignment ++""" ++ ++raise ImportError() ++ ++VERSION = __version__ = "0.1" +diff --git a/flit_core/tests/test_common.py b/flit_core/tests/test_common.py +index 02cfab7..42e230b 100644 +--- a/flit_core/tests/test_common.py ++++ b/flit_core/tests/test_common.py +@@ -70,6 +70,11 @@ class ModuleTests(TestCase): + 'version': '0.1'} + ) + ++ info = get_info_from_module(Module('moduleunimportabledouble', samples_dir)) ++ self.assertEqual(info, {'summary': 'A sample unimportable module with double assignment', ++ 'version': '0.1'} ++ ) ++ + info = get_info_from_module(Module('module1', samples_dir / 'constructed_version')) + self.assertEqual(info, {'summary': 'This module has a __version__ that requires runtime interpretation', + 'version': '1.2.3'} +-- +2.33.1 + diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash new file mode 100644 index 0000000000..bd47fd4f6b --- /dev/null +++ b/package/python-flit-core/python-flit-core.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/flit_core/json +md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz +sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk new file mode 100644 index 0000000000..539a6c99fe --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-flit-core +# +################################################################################ + +PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_SETUP_TYPE = pep517 +PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +HOST_PYTHON_FLIT_CORE_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_FLIT_CORE_DEPENDENCIES = host-python-pypa-build + +$(eval $(host-python-package)) diff --git a/support/scripts/pyinstaller.py b/support/scripts/pyinstaller.py new file mode 100755 index 0000000000..6dd9242327 --- /dev/null +++ b/support/scripts/pyinstaller.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 + +import argparse +import glob + +from installer import install +from installer.destinations import SchemeDictionaryDestination +from installer.sources import WheelFile + + +def main(): + """Entry point for CLI.""" + ap = argparse.ArgumentParser("python pyinstaller.py") + ap.add_argument("wheel_file", help="Path to a .whl file to install") + + ap.add_argument( + "--interpreter", required=True, help="Interpreter path to be used in scripts" + ) + ap.add_argument( + "--script-kind", + required=True, + choices=["posix", "win-ia32", "win-amd64", "win-arm", "win-arm64"], + help="Kind of launcher to create for each script", + ) + + dest_args = ap.add_argument_group("Destination directories") + dest_args.add_argument( + "--purelib", + required=True, + help="Directory for platform-independent Python modules", + ) + dest_args.add_argument( + "--platlib", + help="Directory for platform-dependent Python modules (same as purelib " + "if not specified)", + ) + dest_args.add_argument( + "--headers", required=True, help="Directory for C header files" + ) + dest_args.add_argument( + "--scripts", required=True, help="Directory for executable scripts" + ) + dest_args.add_argument( + "--data", required=True, help="Directory for external data files" + ) + args = ap.parse_args() + + destination = SchemeDictionaryDestination( + { + "purelib": args.purelib, + "platlib": args.platlib if args.platlib is not None else args.purelib, + "headers": args.headers, + "scripts": args.scripts, + "data": args.data, + }, + interpreter=args.interpreter, + script_kind=args.script_kind, + ) + + with WheelFile.open(glob.glob(args.wheel_file)[0]) as source: + install( + source=source, + destination=destination, + additional_metadata={}, + ) + + +if __name__ == "__main__": + main() -- 2.25.1 From fontaine.fabrice at gmail.com Mon Jan 10 07:45:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 08:45:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/gensio: add avahi optional dependency In-Reply-To: References: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> Message-ID: Le lun. 10 janv. 2022 ? 08:13, Arnout Vandecappelle a ?crit : > > > > On 04/01/2022 21:41, Fabrice Fontaine wrote: > > avahi-client is an optional dependency which is enabled by default since > > version 2.2.0 and > > https://github.com/cminyard/gensio/commit/5ab117c9743fd4719f610cf9f1ba45023cc25d7c > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/gensio/gensio.mk | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk > > index 389de1e263..b4936d5f21 100644 > > --- a/package/gensio/gensio.mk > > +++ b/package/gensio/gensio.mk > > @@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net > > GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) > > GENSIO_LICENSE_FILES = COPYING.LIB COPYING > > GENSIO_INSTALL_STAGING = YES > > +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) > > In the commit message you talk about avahi-client, but here it's avahi-daemon. > That looks a bit weird... Can you explain? avahi-client needs avahi-daemon and dbus but perhaps we should add a BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT hidden option. > > Regards, > Arnout > > > GENSIO_CONF_OPTS = \ > > --without-openipmi \ > > --without-swig \ > > Best Regards, Fabrice From arnout at mind.be Mon Jan 10 07:52:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 08:52:58 +0100 Subject: [Buildroot] [git commit] utils/test-pkg: add check that show-info is proper json Message-ID: <20220110074744.C56A782DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f29239cf9bc21d9632031077354b6ba5c868cc1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master JSON parser are usually rather strict when parsing their input. Both jq and the python json module choke on non-conformant inputs. Commit e4c284e6b9 (package/pkg-utils: escape \ in generated legal-info) fixed the \-escaping case, but we want to ensure that we do not have other data that would be improperly encoded. To more easily catch issues, also run show-info and send its output through jq, to try and validate the output. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/test-pkg | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/utils/test-pkg b/utils/test-pkg index 526b95b1fb..ce6e43b965 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -13,7 +13,7 @@ do_clean() { main() { local o O opts local cfg dir pkg random toolchains_csv toolchain all number mode prepare_only - local ret nb nb_skip nb_fail nb_legal nb_tc build_dir keep + local ret nb nb_skip nb_fail nb_legal nb_show nb_tc build_dir keep local -a toolchains local pkg_br_name @@ -126,6 +126,7 @@ main() { nb_skip=0 nb_fail=0 nb_legal=0 + nb_show=0 for toolchainconfig in "${toolchains[@]}"; do : $((nb++)) toolchain="$(basename "${toolchainconfig}" .config)" @@ -137,11 +138,12 @@ main() { (1) : $((nb_skip++)); printf "SKIPPED\n";; (2) : $((nb_fail++)); printf "FAILED\n";; (3) : $((nb_legal++)); printf "FAILED\n";; + (4) : $((nb_show++)); printf "FAILED\n";; esac done - printf "%d builds, %d skipped, %d build failed, %d legal-info failed\n" \ - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} + printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ + ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} return $((nb_fail + nb_legal)) } @@ -197,6 +199,20 @@ build_one() { return 3 fi + # Validate that we generate proper json as show-info + { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; + JQ="$(which jq)" + if [ -z "${JQ}" ]; then + make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 + JQ="${dir}/host/bin/jq" + fi + if ! make O="${dir}" "${pkg:+${pkg}-}show-info" > "${dir}/info.json" 2>> "${dir}/logfile"; then + return 4 + fi + if ! "${JQ}" . < "${dir}/info.json" >> "${dir}/logfile" 2>&1; then + return 4 + fi + # If we get here, the build was successful. Clean up the build/host # directories to save disk space, unless 'keep' was set. if [ ${keep} -ne 1 ]; then From arnout at mind.be Mon Jan 10 07:54:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 08:54:29 +0100 Subject: [Buildroot] [PATCH] utils/test-pkg: add check that show-info is proper json In-Reply-To: <20210207212101.1527766-1-yann.morin.1998@free.fr> References: <20210207212101.1527766-1-yann.morin.1998@free.fr> Message-ID: <3edd836c-3bb1-4ed7-c312-459d3eda75cb@mind.be> On 07/02/2021 22:21, Yann E. MORIN wrote: > JSON parser are usually rather strict when parsing their input. Both > jq and the python json module choke on non-conformant inputs. > > Commit e4c284e6b9 (package/pkg-utils: escape \ in generated legal-info) > fixed the \-escaping case, but we want to ensure that we do not have > other data that would be improperly encoded. > > To more easily catch issues, also run show-info and send its output > through jq, to try and validate the output. > > Reported-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN Applied to master, thanks. The same thing should be added to the autobuilder tests as well. Regards, Arnout > --- > utils/test-pkg | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/utils/test-pkg b/utils/test-pkg > index a317d8c17a..5e00b589b8 100755 > --- a/utils/test-pkg > +++ b/utils/test-pkg > @@ -13,7 +13,7 @@ do_clean() { > main() { > local o O opts > local cfg dir pkg random toolchains_csv toolchain all number mode > - local ret nb nb_skip nb_fail nb_legal nb_tc build_dir keep > + local ret nb nb_skip nb_fail nb_legal nb_show nb_tc build_dir keep > local -a toolchains > local pkg_br_name > > @@ -122,6 +122,7 @@ main() { > nb_skip=0 > nb_fail=0 > nb_legal=0 > + nb_show=0 > for toolchainconfig in "${toolchains[@]}"; do > : $((nb++)) > toolchain="$(basename "${toolchainconfig}" .config)" > @@ -133,11 +134,12 @@ main() { > (1) : $((nb_skip++)); printf "SKIPPED\n";; > (2) : $((nb_fail++)); printf "FAILED\n";; > (3) : $((nb_legal++)); printf "FAILED\n";; > + (4) : $((nb_show++)); printf "FAILED\n";; > esac > done > > - printf "%d builds, %d skipped, %d build failed, %d legal-info failed\n" \ > - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} > + printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ > + ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} > > return $((nb_fail + nb_legal)) > } > @@ -183,6 +185,20 @@ build_one() { > return 3 > fi > > + # Validate that we generate proper json as show-info > + { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; > + JQ="$(which jq)" > + if [ -z "${JQ}" ]; then > + make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 > + JQ="${dir}/host/bin/jq" > + fi > + if ! make O="${dir}" "${pkg:+${pkg}-}show-info" > "${dir}/info.json" 2>> "${dir}/logfile"; then > + return 4 > + fi > + if ! "${JQ}" . < "${dir}/info.json" >> "${dir}/logfile" 2>&1; then > + return 4 > + fi > + > # If we get here, the build was successful. Clean up the build/host > # directories to save disk space, unless 'keep' was set. > if [ ${keep} -ne 1 ]; then > From fontaine.fabrice at gmail.com Mon Jan 10 07:58:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 08:58:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/git: add xdg SELinux module Message-ID: <20220110075804.1499122-1-fontaine.fabrice@gmail.com> xdg SELinux module is needed to avoid the following build failure raised since bump of refpolicy to version 2.20220106 in commit f6691d122ce25fc580ca88243f79f75cc2808ca7 and https://github.com/SELinuxProject/refpolicy/commit/64e637d895c516d7a6b6cbcd46b187136279fddd: policy/modules/services/git.te:121:ERROR 'attribute xdg_config_type is not declared' at token ';' on line 115358: typeattribute git_xdg_config_t xdg_config_type; #line 121 checkpolicy: error(s) encountered while parsing configuration Rules.monolithic:78: recipe for target 'policy.30' failed Fixes: - http://autobuild.buildroot.org/results/98d5b3db313000855721c0ad994951fe8cc781c0 Signed-off-by: Fabrice Fontaine --- package/git/git.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/git/git.mk b/package/git/git.mk index 556921a9fc..90b1acd6a4 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -10,7 +10,7 @@ GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_CPE_ID_VENDOR = git-scm -GIT_SELINUX_MODULES = apache git +GIT_SELINUX_MODULES = apache git xdg GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) # We're patching configure.ac GIT_AUTORECONF = YES -- 2.34.1 From marcus.folkesson at gmail.com Mon Jan 10 08:03:01 2022 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 10 Jan 2022 09:03:01 +0100 Subject: [Buildroot] [PATCH] package/libostree: bump to version 2022.1 Message-ID: <20220110080301.2805134-1-marcus.folkesson@gmail.com> Signed-off-by: Marcus Folkesson --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index e81deb82a6..3a06340575 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e80631cb1363d4734fe9d0c91f69a68be3848166d6e0481db19ce44a9cb4f531 libostree-2021.6.tar.xz +sha256 43a00e7856842b8a34f6616fc2ce1ce238ef43210cca41f70e6b4b0d2a9fcad5 libostree-2022.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index a6b09f95e5..22cb83d039 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2021.6 +LIBOSTREE_VERSION = 2022.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) -- 2.33.0 From arnout at mind.be Mon Jan 10 08:11:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 09:11:56 +0100 Subject: [Buildroot] [git commit] package/libostree: bump to version 2022.1 Message-ID: <20220110080616.442B783241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26e886ac9088c284553afbd08128b332e5f5096c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Folkesson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libostree/libostree.hash | 2 +- package/libostree/libostree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index e81deb82a6..3a06340575 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e80631cb1363d4734fe9d0c91f69a68be3848166d6e0481db19ce44a9cb4f531 libostree-2021.6.tar.xz +sha256 43a00e7856842b8a34f6616fc2ce1ce238ef43210cca41f70e6b4b0d2a9fcad5 libostree-2022.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index a6b09f95e5..22cb83d039 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2021.6 +LIBOSTREE_VERSION = 2022.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From arnout at mind.be Mon Jan 10 08:13:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 09:13:20 +0100 Subject: [Buildroot] [PATCH] package/libostree: bump to version 2022.1 In-Reply-To: <20220110080301.2805134-1-marcus.folkesson@gmail.com> References: <20220110080301.2805134-1-marcus.folkesson@gmail.com> Message-ID: On 10/01/2022 09:03, Marcus Folkesson wrote: > Signed-off-by: Marcus Folkesson Applied to master, thanks. Regards, Arnout > --- > package/libostree/libostree.hash | 2 +- > package/libostree/libostree.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash > index e81deb82a6..3a06340575 100644 > --- a/package/libostree/libostree.hash > +++ b/package/libostree/libostree.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 e80631cb1363d4734fe9d0c91f69a68be3848166d6e0481db19ce44a9cb4f531 libostree-2021.6.tar.xz > +sha256 43a00e7856842b8a34f6616fc2ce1ce238ef43210cca41f70e6b4b0d2a9fcad5 libostree-2022.1.tar.xz > sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING > diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk > index a6b09f95e5..22cb83d039 100644 > --- a/package/libostree/libostree.mk > +++ b/package/libostree/libostree.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBOSTREE_VERSION = 2021.6 > +LIBOSTREE_VERSION = 2022.1 > LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz > LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) > > From yann.morin.1998 at free.fr Mon Jan 10 08:14:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 09:14:17 +0100 Subject: [Buildroot] [PATCH for-next] package/gtest: remove partial host package In-Reply-To: <20210802123300.564709-1-arnout@mind.be> References: <20210802123300.564709-1-arnout@mind.be> Message-ID: <20220110081417.GN1477939@scaer> Arnout, All, On 2021-08-02 14:33 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly: > gmock (which is part of the gtest package) has a host variant that is > not actually the full host package, but instead just installs a single > python script. > > This script, however, is no longer maintained and is not needed for most > practical uses of gmock. Even if it is used, its output is meant to be > hand-edited, so it shouldn't be used as part of the build flow. > > Therefore, remove the host-gtest package. A proper, full host package > may make sense (for building other host packages that use gtest), but > this single script really doesn't. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > Cc: Norbert Lange > Reviewed-by: Norbert Lange In fact, we applied a different patch that makes host-gtests a proper host package; https://git.buildroot.org/buildroot/commit/?id=c0f9e2447d57194f0b02edb93cd16a677ebb326c I marked your patch as rejected, then. Thanks! ;-) Regards, Yann E. MORIN. > --- > Since we're so close to the 2021.08 release, this should probably be > delayed a little. > --- > package/gtest/gtest.mk | 27 --------------------------- > 1 file changed, 27 deletions(-) > > diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk > index 6447954e36..a9ac49957b 100644 > --- a/package/gtest/gtest.mk > +++ b/package/gtest/gtest.mk > @@ -13,23 +13,6 @@ GTEST_LICENSE_FILES = LICENSE > GTEST_CPE_ID_VENDOR = google > GTEST_CPE_ID_PRODUCT = google_test > > -ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) > -GTEST_DEPENDENCIES += host-gtest > -endif > - > -HOST_GTEST_LICENSE = Apache-2.0 > -HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE > -ifeq ($(BR2_PACKAGE_PYTHON3),y) > -HOST_GTEST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) > -HOST_GTEST_DEPENDENCIES += host-python3 > -else > -HOST_GTEST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) > -HOST_GTEST_DEPENDENCIES += host-python > -endif > - > -HOST_GTEST_GMOCK_PYTHONPATH = \ > - $(HOST_DIR)/lib/python$(HOST_GTEST_PYTHON_VERSION)/site-packages > - > # While it is possible to build gtest as shared library, using this gtest shared > # library requires to set some special configure option in the project using > # gtest. > @@ -52,14 +35,4 @@ else > GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF > endif > > -define HOST_GTEST_INSTALL_CMDS > - $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ > - $(HOST_DIR)/bin/gmock_gen > - cp -rp $(@D)/googlemock/scripts/generator/cpp \ > - $(HOST_GTEST_GMOCK_PYTHONPATH) > -endef > - > $(eval $(cmake-package)) > -# The host package does not build anything, just installs gmock_gen stuff, so > -# it does not need to be a host-cmake-package. > -$(eval $(host-generic-package)) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From nolange79 at gmail.com Mon Jan 10 08:28:00 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Mon, 10 Jan 2022 09:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: Allow extra config options In-Reply-To: <7229983a-cbde-eb3f-83cb-984544f3b355@mind.be> References: <20201126152832.1115350-1-nolange79@gmail.com> <7229983a-cbde-eb3f-83cb-984544f3b355@mind.be> Message-ID: Arnout Vandecappelle schrieb am Mo., 10. Jan. 2022, 08:26: > > > On 09/01/2022 23:52, Norbert Lange wrote: > > Not only missing, but I sometimes need a *different* config. For example > i don't > > want to link against lz4, since I use zstd instead. > > Which is a great example of why the option doesn't work: it would affect > dependencies as well. > > However, specifically for this one, we have in the .mk file: > > ifeq ($(BR2_PACKAGE_ZSTD),y) > SYSTEMD_DEPENDENCIES += zstd > SYSTEMD_CONF_OPTS += -Dzstd=true > else > SYSTEMD_CONF_OPTS += -Dzstd=false > endif > > ifeq ($(BR2_PACKAGE_LZ4),y) > SYSTEMD_DEPENDENCIES += lz4 > SYSTEMD_CONF_OPTS += -Dlz4=true > else > SYSTEMD_CONF_OPTS += -Dlz4=false > endif > > So it should already do what you need, no? > I want lz4 in the rootfs, i don't want systemd to be linked against it (doesn't add anything for me, if zstd is available too) Norbert -------------- next part -------------- An HTML attachment was scrubbed... URL: From yegorslists at googlemail.com Mon Jan 10 08:58:49 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Mon, 10 Jan 2022 09:58:49 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: add entry for avrdude to Yegor Yefremov Message-ID: <20220110085850.11095-1-yegorslists@googlemail.com> From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index cd0b54b041..7a9f0f7370 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2968,6 +2968,7 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ +F: package/avrdude/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ -- 2.17.0 From yegorslists at googlemail.com Mon Jan 10 08:58:50 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Mon, 10 Jan 2022 09:58:50 +0100 Subject: [Buildroot] [PATCH 2/2] package/avrdude: add support for Linux sysfs GPIO interface In-Reply-To: <20220110085850.11095-1-yegorslists@googlemail.com> References: <20220110085850.11095-1-yegorslists@googlemail.com> Message-ID: <20220110085850.11095-2-yegorslists@googlemail.com> From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- package/avrdude/Config.in | 3 +++ package/avrdude/avrdude.mk | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in index 89558a5ff5..57a8df66ea 100644 --- a/package/avrdude/Config.in +++ b/package/avrdude/Config.in @@ -17,6 +17,9 @@ config BR2_PACKAGE_AVRDUDE if BR2_PACKAGE_AVRDUDE +config BR2_PACKAGE_AVRDUDE_LINUXGPIO + bool "Linux sysfs GPIO interface support" + config BR2_PACKAGE_AVRDUDE_SPI bool "SPI support" default y # Backward compatibility diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index accd92c1d5..3ccba80d8e 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -16,6 +16,12 @@ AVRDUDE_CONF_OPTS = --enable-linuxgpio AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ host-flex host-bison +ifeq ($(BR2_PACKAGE_AVRDUDE_LINUXGPIO),y) +AVRDUDE_CONF_OPTS += --enable-linuxgpio +else +AVRDUDE_CONF_OPTS += --disable-linuxgpio +endif + ifeq ($(BR2_PACKAGE_AVRDUDE_SPI),y) AVRDUDE_CONF_OPTS += --enable-linuxspi else -- 2.17.0 From herve.codina at bootlin.com Mon Jan 10 09:02:18 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 10:02:18 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/ulog: new package In-Reply-To: <20220101160533.GE2777@scaer> References: <20211112131258.2671293-1-herve.codina@bootlin.com> <20211112131258.2671293-3-herve.codina@bootlin.com> <20220101160533.GE2777@scaer> Message-ID: <20220110100218.1a1319ec@bootlin.com> Hi Yann, On Sat, 1 Jan 2022 17:05:33 +0100 "Yann E. MORIN" wrote: > Herv?, All, > > On 2021-11-12 14:12 +0100, Herve Codina spake thusly: > > The ulog library is a minimalistic logging library derived from > > Android logger. > > > > https://github.com/Parrot-Developers/ulog > > > > Signed-off-by: Herve Codina > [--SNIP--] > > diff --git a/package/ulog/ulog.mk b/package/ulog/ulog.mk > > new file mode 100644 > > index 0000000000..fab16e80d8 > > --- /dev/null > > +++ b/package/ulog/ulog.mk > > @@ -0,0 +1,44 @@ > > +################################################################################ > > +# > > +# ulog > > +# > > +################################################################################ > > + > > +ULOG_VERSION = 0389d243352255f6182326dccdae3d56dadc078f > > +ULOG_SITE = $(call github,Parrot-Developers,ulog,$(ULOG_VERSION)) > > +ULOG_LICENSE = Apache-2.0 > > +ULOG_LICENSE_FILES = COPYING > > +ULOG_DEPENDENCIES = host-alchemy > > +ULOG_INSTALL_STAGING = YES > > + > > +define ULOG_BUILD_CMDS > > + $(ALCHEMY_TARGET_ENV) \ > > + $(ALCHEMY_MAKE) libulog > > +endef > > + > > +define ULOG_INSTALL_STATIC_LIBS > > + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.a $(1)/usr/lib/ > > +endef > > So, it looks like you are always going to install the static library, > but the package does not have: depends on !BR2_STATIC_LIBS The v3 series will take care of BR2_STATIC_LIBS. > > > + > > +define ULOG_INSTALL_HEADERS > > + cp -Raf $(@D)/libulog/include/* $(1)/usr/include/ > > +endef > > + > > +ifeq ($(BR2_STATIC_LIBS),) > > +define ULOG_INSTALL_SHARED_LIBS > > + $(INSTALL) -m 755 $(@D)/alchemy-out/staging/usr/lib/libulog.so* $(1)/usr/lib/ > > Although it is very improbable that the destination directory does not > already exist, that is still a possibility, especially in target/. And > for consistency with all the other packages, you must create the > destination directory first before you start copying multiple files in > there. Will be fixed in v3 > > Also for consistency, use either 'cp' or '$(INSTALL)', not both , in the > same .mk (you used 'cp' for headers, and '$(INSTALL)' for libs, although > I don't see a reason not to use them consistently). > > Oh, and shared libraries do not need to be +x, so -m 644 is enough. Ok, I will use '$(INSTALL) -m 644 ' in v3 series > > > +endef > > +endif > > + > > +define ULOG_INSTALL_TARGET_CMDS > > + $(call ULOG_INSTALL_SHARED_LIBS, $(TARGET_DIR)) > > +endef > > + > > +define ULOG_INSTALL_STAGING_CMDS > > + $(call ULOG_INSTALL_STATIC_LIBS, $(STAGING_DIR)) > > + $(call ULOG_INSTALL_SHARED_LIBS, $(STAGING_DIR)) > > + $(call ULOG_INSTALL_HEADERS, $(STAGING_DIR)) > > + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, ulog, libulog, libulog.so) > > So, what happens with BR2_STATIC_LIBS=y? The .so would not exist in that > case, would it? But then, this is what would be registered in the > atom.mk... The file passed to Alchemy must be the .so. Internally, the static name will be deduced by replacing the shared suffix (.so) by the static suffix (.a) > > And with BR2_STATIC_LIBS not set, then the .a should not be built (or at > least not installed!), yet the installation of the static lib is > unconditional (and see the first comment too). > > It is difficult to understand if all of the static-shared combinations > are supported, so could you please check/clarify this? > > If the three combinations are indeed supported, then both the shared and > the staic install macros should be conditional. Otherwise, proper guards > should be added in the Config.in. In the next version (v3) of this series, I will install .a and .so according to flags set (BR2_{STATIC,SHARED}_LIBS). I will have one exception: libshdata, libshdata-section-lookup.a. This static lib is needed to use libshdata and cannot be a shared library. It is forced as static in libshdata atom.mk file (include $(BUILD_STATIC_LIBRARY)) So, I choose to install it even if we supposed to be shared library only (ie BR2_SHARED_LIBS=y) > > Those comments apply to all the pakcages in this series. > Thanks for the review, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Jan 10 09:10:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 10:10:36 +0100 Subject: [Buildroot] [PATCH 2/2] package/musl: disable LTO unconditionally In-Reply-To: <20220110091036.4165679-1-yann.morin.1998@free.fr> References: <20220110091036.4165679-1-yann.morin.1998@free.fr> Message-ID: <20220110091036.4165679-2-yann.morin.1998@free.fr> Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered for glibc, but all C libraries, like musl, are impacted, for very similar reasons. Disable LTO unconditionally for musl too. Signed-off-by: Yann E. MORIN Cc: Norbert Lange --- package/musl/musl.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/musl/musl.mk b/package/musl/musl.mk index d4f26b50a7..b89945e3be 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -26,6 +26,12 @@ MUSL_ADD_TOOLCHAIN_DEPENDENCY = NO MUSL_INSTALL_STAGING = YES +# musl does not build with LTO, so explicitly disable it +# when using a compiler that may have support for LTO +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +MUSL_EXTRA_CFLAGS += -fno-lto +endif + # Thumb build is broken, build in ARM mode, since all architectures # that support Thumb1 also support ARM. ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -- 2.25.1 From yann.morin.1998 at free.fr Mon Jan 10 09:10:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 10:10:35 +0100 Subject: [Buildroot] [PATCH 1/2] package/uclibc: disable LTO unconditionally Message-ID: <20220110091036.4165679-1-yann.morin.1998@free.fr> Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered for glibc, but all C libraries, like uClibc-NG, are impacted, for very similar reasons. Disable LTO unconditionally for uClibc-NG too. Signed-off-by: Yann E. MORIN Cc: Norbert Lange --- package/uclibc/uclibc.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 87e283de2a..0feedb6cfa 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -362,10 +362,18 @@ endif # Commands # +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) + +# uClibc-ng does not build with LTO, so explicitly disable it +# when using a compiler that may have support for LTO +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +UCLIBC_EXTRA_CFLAGS += -fno-lto +endif + UCLIBC_MAKE_FLAGS = \ ARCH="$(UCLIBC_TARGET_ARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \ + UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS)" \ HOSTCC="$(HOSTCC)" define UCLIBC_KCONFIG_FIXUP_CMDS -- 2.25.1 From thomas.claveirole at green-communications.fr Mon Jan 10 09:23:52 2022 From: thomas.claveirole at green-communications.fr (Thomas Claveirole) Date: Mon, 10 Jan 2022 10:23:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.11.0 Message-ID: <20220110092352.1247528-1-thomas.claveirole@green-communications.fr> Signed-off-by: Thomas Claveirole --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 11eae3de36..b72d5fcde8 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 da3025279bbd6cfb0e82b7af95666bede8fd65e8c620a1bc54bba04cebb7e1d4 v6.10.0-dist.zip +sha256 8c4751915808a5a84adcd760fff453429a95993cadf77003ac94eae127240c1a v6.11.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 781f9901ea..1f8b485018 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.10.0 +OPENLAYERS_VERSION = 6.11.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause -- 2.34.1 From michael at walle.cc Mon Jan 10 09:50:39 2022 From: michael at walle.cc (Michael Walle) Date: Mon, 10 Jan 2022 10:50:39 +0100 Subject: [Buildroot] [PATCH 1/2] {linux, linux-headers}: add version 5.16 Message-ID: <20220110095040.2212639-1-michael@walle.cc> Signed-off-by: Michael Walle --- linux/Config.in | 4 ++-- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 6c30100921..d2dc33209a 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,7 +28,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.15)" + bool "Latest version (5.16)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.83-cip1)" @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.16" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" 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 2f144427f4..86dc8d7af9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9bc3c873c5..fb0f147752 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_15 + default BR2_KERNEL_HEADERS_5_16 help Select the kernel version to get headers from. @@ -65,6 +65,10 @@ config BR2_KERNEL_HEADERS_5_14 config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + +config BR2_KERNEL_HEADERS_5_16 + bool "Linux 5.16.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -139,8 +143,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 + bool "5.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 - bool "5.15.x or later" + bool "5.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14 @@ -382,6 +390,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.83" if BR2_KERNEL_HEADERS_5_10 default "5.14.21" if BR2_KERNEL_HEADERS_5_14 default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index fd005f4740..adc93ab725 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -566,6 +566,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -579,6 +583,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 default "5.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 default "5.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1cea64d105..9346fa3feb 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -123,8 +123,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_16 + bool "5.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_15 - bool "5.15.x or later" + bool "5.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_14 -- 2.30.2 From michael at walle.cc Mon Jan 10 09:50:40 2022 From: michael at walle.cc (Michael Walle) Date: Mon, 10 Jan 2022 10:50:40 +0100 Subject: [Buildroot] [PATCH 2/2] configs/kontron_smarc_sal28: use kernel 5.16 In-Reply-To: <20220110095040.2212639-1-michael@walle.cc> References: <20220110095040.2212639-1-michael@walle.cc> Message-ID: <20220110095040.2212639-2-michael@walle.cc> Signed-off-by: Michael Walle --- configs/kontron_smarc_sal28_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index ce8f8323ae..37e415cf32 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3-ads2 freescale/fsl-ls1028a-kontron-sl28-var4 freescale/fsl-ls1028a-kontron-kbox-a-230-ls" -- 2.30.2 From m.niestroj at grinn-global.com Mon Jan 10 10:01:16 2022 From: m.niestroj at grinn-global.com (Marcin =?utf-8?Q?Niestr=C3=B3j?=) Date: Mon, 10 Jan 2022 11:01:16 +0100 Subject: [Buildroot] [PATCH v4] package/gitlab-runner: new package In-Reply-To: <20220106123449.344837-1-romain.naour@smile.fr> References: <20220106123449.344837-1-romain.naour@smile.fr> Message-ID: <87mtk3vrg6.fsf@grinn-global.com> Romain Naour writes: > From: Marcin Niestroj > > We rely on config.toml to be created manually during first boot as setup stage. > Even with an empty config.toml file, the gitlab-runner needs gitlab > registration token to register to a gitlab server. > > Use the 14.5.1 release since 14.5.2 and 14.6.0 triggers a build error [1] > due a patch for GO < 1.17. > (helpers/patches/issue_28732/syscall.go:11:2: undefined: syscall.Issue28732Fix) > > Tested: > https://gitlab.com/kubu93/buildroot/-/pipelines/442604876 > > [1] https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28766 > > Signed-off-by: Marcin Niestroj > Signed-off-by: Romain Naour > Cc: J?r?my Rosen > --- > Note: We used the gitlab-runner for shell or python jobs. > Jobs using docker images (images: in gitlab-ci.yml) is not tested. > > v4: update to 14.5.1 > Remove config.toml handling from .mk. > We rely on config.toml to be created during first boot as setup stage. > Even with an empty config.toml file, the gitlab-runner needs gitlab > registration token to register to a gitlab server. (Marcin Niestroj) > Remove alias gitlab-ci-multi-runner.service (Marcin Niestroj), > gitlab-ci-multi-runner.service comme from Debian gitlab-runner systemd > service file. > > v3: Change daemon process to gitlab-runner user. > see as example: https://git.buildroot.net/buildroot/tree/package/tpm2-abrmd/S80tpm2-abrmd?h=2020.05-rc2#n31 > > [Romain: Tested only using systemd init on aarch64 target emulated by Qemu] > v2: add service file, config file, gitlab user. > add bash as runtime dependency. > Add git, curl, ca-certificate, tar runtime dependencies from on debian control file for gitlab-runner package. > Use gnu tar since we can expect tar options that are not supported by busybox tar implementation. > Enable SSL/TLS library with openssl needed at runtime. > Add me as "developer". > > test-pkg config: > BR2_PACKAGE_GITLAB_RUNNER=y > --- Thanks Romain for updating and resending this patch! Looks fine to me as it is! -- Regards, Marcin Niestr?j From arnout at mind.be Mon Jan 10 10:43:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 11:43:45 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/gcc: use binutils wrappers for target libs In-Reply-To: References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-2-nolange79@gmail.com> <20220109151653.GC1477939@scaer> Message-ID: On 09/01/2022 22:08, Norbert Lange wrote: > Am So., 9. Jan. 2022 um 16:16 Uhr schrieb Yann E. MORIN > : >> >> Nrobert, All, >> >> On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: >>> This will use gcc-ar, gcc-nm and gcc-ranlib instead of the >>> normal binutils tools. The difference is that with the >>> wrappers, gcc plugins will be automatically picked up, >>> which might be necessary with some flags. >>> >>> Signed-off-by: Norbert Lange >>> --- >>> v1->v2: >>> * Only set those wrappers if gc 4.7 or newer >>> --- >>> package/gcc/gcc.mk | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk >>> index 114c2887a0..a24ffe3ee2 100644 >>> --- a/package/gcc/gcc.mk >>> +++ b/package/gcc/gcc.mk >>> @@ -99,6 +99,9 @@ GCC_COMMON_TARGET_CFLAGS += -Wno-error >>> endif >>> >>> # Propagate options used for target software building to GCC target libs >>> +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) >>> +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib >> >> So we were a bit skeptical about this one. >> >> First, we believe that only the final gcc should be using those. Indeed, >> we do not need much of the initial gcc, except libgcc.a, which anyway >> gets overwitten by the final gcc, so we do not care that the libgcc.a is >> built with LTO (and thus the gcc wrappers). >> >> Second, gcc initial is only used to build glibc, and as your patch 4 >> states, glibc must not be built with LTO, we we also do not care that >> the initial gcc uses its wrappers to build libgcc. Although I may have been the one to make this obvservation to begin with, I'm starting to come back on that. Even though indeed it is probably not very useful to apply the wrappers to gcc-initial, it doesn't hurt either. And by putting it in _COMMON_CONF_ENV, we make sure that (almost) all of the options are together in gcc.mk. Note that --enable-lto is also in COMMON_OPTS. >> >> Third, shouldn't we be using the tupple-prefixed wrappers? Or does it >> just happens that gcc will internally add its build directory to PATH so >> that it can find the un-prefixed just-built ones? >> >> For that last point, I added gcc-ar, gcc-nm, and gcc-ranlib in my PATH, >> that are just simple wrapper scripts that trace their being called, and >> then call to the actual gcca-r et al.: >> >> #!/bin/sh >> me="${0}" >> my_name="${0##*/}" >> found=false >> for i in $(which -a "${my_name}"); do >> if [ "${i}" -ef "${me}" ]; then >> found=true >> elif ${found}; then >> me="${i}" >> fi >> done >> if ! ${found}; then >> exit 42 >> fi >> printf "YEM: wrapped %s\n" "${me}" >> exec "${me}" "${@}" >> >> Turns out that the 'YEM: wrapped' string occurs nowhere in the build >> directory (so it does not end up in config.log or whatever), and it >> does not even appear on the stdout/stderr either. >> >> So I am wondering how we can exercise these... Any hint? > > Can't tell anymore, I went to crosstool-ng for the compiler some time ago, > so unlike my other patches I dont use them anymore. > > From my memory, it affected some of the additional libs gcc builds, > libstdc++, some sanitizers maybe. > there was not absolute paths or tuples as the various stages should > use the wrappers from the previous ones. I believe the final compiler > ignores PATH and uses the stage2-compiler with abs path to build the > included target libraries. That it doesn't look in PATH indeed sounds feasible. However, what is very surprising is that GCC doesn't automatically use the plugins when --enable-lto is passed. Before blindly adding some random options, we want to really understand why it is needed, in case maybe things are already broken in some other way, and to be able in the future to make changes and understand if they're OK or not. That said, I have checked and indeed, without these options it seems to use plain ar instead of gcc-ar. So I looked a bit deeper, and found this really old bug about enabling lto for libgcc [1]. It refers to a bunch of other issues found while doing this. For me, however, the conclusion is that the patch should be applied, but with better explanation. That way, you can set BR2_TARGET_OPTIMIZATION to -flto and get an LTO'ed libgcc/libstdc++/etc. If LTO is not used, it doesn't harm to use the wrapper. There's just one little concern though: I think the wrappers aren't even generated unless LTO is enabled. But that point is moot - since GCC N (where N > 4.9 and < 9), LTO is enabled by default, and we don't pass --disable-lto if LTO is not enabled. In other words, nowadays the BR2_GCC_ENABLE_LTO symbol is useless. Regards, Arnout [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59893 > > I am just sure it was very deliberately done *this* way. > > Norbert > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From post at lespocky.de Mon Jan 10 12:17:16 2022 From: post at lespocky.de (Alexander Dahl) Date: Mon, 10 Jan 2022 13:17:16 +0100 Subject: [Buildroot] [ANNOUNCE] mtd-utils-2.1.4 is released In-Reply-To: References: Message-ID: <20220110121715.GA6032@falbala.internal.home.lespocky.de> Hello David, On Fri, Jan 07, 2022 at 03:24:59AM +0000, David Oberhollenzer wrote: > mtd-utils-2.1.4 is released. > > Tarball: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.4.tar.bz2 > Tarball gpg signature: ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.4.tar.bz2.asc > Signed git tag: git://git.infradead.org/mtd-utils.git v2.1.4 > > Alternatively also mirrored here: > > Tarball: https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2 > Tarball gpg signature: https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2.asc > Signed git tag: https://git.infraroot.at/mtd-utils.git v2.1.4 I tried to verify the gpg signature, but I could not find a public key. At https://keys.openpgp.org/ you only get a not working key: gpg: key BCE5DC3C741A02D1: new key but contains no user ID - skipped I also searched at http://www.linux-mtd.infradead.org/index.html and could not find a key, could you please point us to a recent version? Greets Alex -- /"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From thierry.bultel at linatsea.fr Mon Jan 10 12:46:42 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Mon, 10 Jan 2022 13:46:42 +0100 Subject: [Buildroot] [PATCH v4 1/3] package/cross-ldd: new package Message-ID: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> cross-ldd works just as ldd, but supports other architectures. It is needed by dracut, for instance. It is suffixed with "-ldd-buildroot" to avoid conflicts with toolchains that already implement it. Signed-off-by: Thierry Bultel --- Changes v1 -> v2: - simplified the download (suggested by Arnoult) Changes v2 -> v3 - changed the name to -ldd-cross, in order to avoid a conflict with the external toolchains that implement it Changes v3 -> v4 - No more Config.in. It is just a bind host-only package - cross-ldd.mk: added pointer to dracut documentation in the comment - Changed the suffix to -ldd-buildroot - No longer uses SED, but uses an actual patch for that Signed-off-by: Thierry Bultel --- .../cross-ldd/000-change-extension-name.patch | 12 ++++++++++ package/cross-ldd/cross-ldd.mk | 23 +++++++++++++++++++ package/dracut/dracut | 15 ++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 package/cross-ldd/000-change-extension-name.patch create mode 100644 package/cross-ldd/cross-ldd.mk create mode 100644 package/dracut/dracut diff --git a/package/cross-ldd/000-change-extension-name.patch b/package/cross-ldd/000-change-extension-name.patch new file mode 100644 index 0000000000..74364adc88 --- /dev/null +++ b/package/cross-ldd/000-change-extension-name.patch @@ -0,0 +1,12 @@ +diff -purN host-cross-ldd-6c9c724ebd6a29c279c6e5734e44c07f067808ec.orig/cross-compile-ldd host-cross-ldd-6c9c724ebd6a29c279c6e5734e44c07f067808ec/cross-compile-ldd +--- host-cross-ldd-6c9c724ebd6a29c279c6e5734e44c07f067808ec.orig/cross-compile-ldd 2022-01-06 12:25:40.144852639 +0000 ++++ host-cross-ldd-6c9c724ebd6a29c279c6e5734e44c07f067808ec/cross-compile-ldd 2022-01-06 12:25:40.148852681 +0000 +@@ -19,7 +19,7 @@ sed="${SED:-sed}" + grep="${GREP:-grep}" + + my_name="$( basename "${0}" )" +-prefix="${0%-ldd}" ++prefix="${0%-ldd-buildroot}" + gcc="${prefix}-gcc" + readelf="${prefix}-readelf" + fake_load_addr_root="$((0xdeadbeef))" diff --git a/package/cross-ldd/cross-ldd.mk b/package/cross-ldd/cross-ldd.mk new file mode 100644 index 0000000000..845e819aee --- /dev/null +++ b/package/cross-ldd/cross-ldd.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# cross-ldd +# +# ldd drop-in replacement for cross-compilation toolchains. +# This is the officially supported version mentioned +# in the dracut documentation (see dracut/docs/README.cross) +# +################################################################################ + +CROSS_LDD_VERSION = 6c9c724ebd6a29c279c6e5734e44c07f067808ec +CROSS_LDD_SOURCE = $(CROSS_LDD_VERSION).tar.gz +CROSS_LDD_SITE = https://gist.github.com/jerome-pouiller/c403786c1394f53f44a3b61214489e6f/archive +CROSS_LDD_LICENSE = GPL-2.0 + +# Notice that we change the name to '-ldd-buildroot', in order to avoid conflict +# with some external toolchains that implement it + +define HOST_CROSS_LDD_INSTALL_CMDS + install -D -m 755 $(@D)/cross-compile-ldd $(TARGET_CROSS)ldd-buildroot +endef + +$(eval $(host-generic-package)) diff --git a/package/dracut/dracut b/package/dracut/dracut new file mode 100644 index 0000000000..9d3db3b58e --- /dev/null +++ b/package/dracut/dracut @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -x + +if [ -z "$*" ]; then + echo "No argument supplied" + exit +fi + +DRACUT_LDD=${TARGET_CROSS}ldd-cross \ +DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ +dracutbasedir=${HOST_DIR}/usr/lib/dracut \ +dracutsysrootdir=${TARGET_DIR} \ +${HOST_DIR}/bin/dracut "$@" -- 2.25.1 From thierry.bultel at linatsea.fr Mon Jan 10 12:46:44 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Mon, 10 Jan 2022 13:46:44 +0100 Subject: [Buildroot] [PATCH v4 3/3] fs/cpio: new option to use dracut tool In-Reply-To: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> Message-ID: <20220110124644.1388438-3-thierry.bultel@linatsea.fr> Adds an option to invoke the dracut host tool, providing a configuration file, instead of having a full cpio archive of the whole target directory. Signed-off-by: Thierry Bultel Changes v1 -> v2 (suggested by Arnoult and Yann) - was a new fs type, now an option of cpio - deals with the case of a build with no kernel - gets the kernel name in a smarter way - checks for the name of dracut configuration file Changes v2 -> v3 - fixed a typo on the --no-kernel option for dracut - removed the unneeded dependency to kernel - added tests for cpio, for both full, and dracut modes Changes v3 -> v4 - Config.in: applied Yann's comments on syntax and option in choice - do no export TARGET_CROSS but give it in command line instead - use $(ROOTFS_CPIO_DIR) as base for tmp directory - let original, full cpio, first in the code, and dracut mode after - removed unwanted comment in dracut.conf (in tests) Signed-off-by: Thierry Bultel --- fs/cpio/Config.in | 35 ++++++++++ fs/cpio/cpio.mk | 36 +++++++++++ support/testing/conf/dracut.conf | 93 +++++++++++++++++++++++++++ support/testing/tests/fs/test_cpio.py | 44 +++++++++++++ 4 files changed, 208 insertions(+) create mode 100644 support/testing/conf/dracut.conf create mode 100644 support/testing/tests/fs/test_cpio.py diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index c1151a2881..efc5bd7857 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -7,6 +7,41 @@ config BR2_TARGET_ROOTFS_CPIO if BR2_TARGET_ROOTFS_CPIO +choice + prompt "cpio type" + default BR2_TARGET_ROOTFS_CPIO_FULL + +config BR2_TARGET_ROOTFS_CPIO_FULL + bool "cpio the whole root filesystem (ie the content of 'target')" + help + Build a cpio archive containing the whole the root filesystem. + +comment "dracut cpio needs busybox, or systemd init system" + depends on !BR2_INIT_BUSYBOX + depends on !BR2_INIT_SYSTEMD + +config BR2_TARGET_ROOTFS_CPIO_DRACUT + bool "Invoke dracut to make an initramfs" + select BR2_PACKAGE_HOST_DRACUT + select BR2_PACKAGE_HOST_UBOOT_TOOLS + depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSTEMD + help + Builds an additional initramfs using dracut. + This can be useful to create a recovery system, + for instance. + +endchoice + +if BR2_TARGET_ROOTFS_CPIO_DRACUT +config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE + string "configuration file" +endif + + +endif # BR2_TARGET_ROOTFS_CPIO + +if BR2_TARGET_ROOTFS_CPIO_FULL + choice prompt "Compression method" default BR2_TARGET_ROOTFS_CPIO_NONE diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 81f8c393d1..62e73de8be 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -29,6 +29,8 @@ endif # BR2_ROOTFS_DEVICE_CREATION_STATIC ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT +ifeq ($(BR2_TARGET_ROOTFS_CPIO_FULL),y) + # --reproducible option was introduced in cpio v2.12, which may not be # available in some old distributions, so we build host-cpio ifeq ($(BR2_REPRODUCIBLE),y) @@ -53,4 +55,38 @@ endef ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE endif +else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) + +ROOTFS_CPIO_DEPENDENCIES += host-dracut + +ifeq ($(BR2_LINUX_KERNEL),y) +ROOTFS_CPIO_DEPENDENCIES += linux +endif + +ifeq ($(BR_BUILDING).$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE),y.) +$(error No dracut config file name specified, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE setting) +endif + +ifeq ($(BR2_LINUX_KERNEL),y) +ROOTFS_CPIO_DRACUT_CMD_OPTS += --kver $(LINUX_VERSION_PROBED) +else +ROOTFS_CPIO_DRACUT_CMD_OPTS += --no-kernel +endif + +define ROOTFS_CPIO_CMD + mkdir -p $(ROOTFS_CPIO_DIR)/tmp + + TARGET_CROSS="$(TARGET_CROSS)" \ + $(HOST_DIR)/sbin/dracut \ + $(ROOTFS_CPIO_DRACUT_CMD_OPTS) \ + -c $(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE) \ + --tmpdir $(ROOTFS_CPIO_DIR)/tmp \ + -M \ + --force \ + --keep \ + $@ +endef + +endif #BR2_TARGET_ROOTFS_CPIO_DRACUT + $(eval $(rootfs)) diff --git a/support/testing/conf/dracut.conf b/support/testing/conf/dracut.conf new file mode 100644 index 0000000000..5aeecd18ce --- /dev/null +++ b/support/testing/conf/dracut.conf @@ -0,0 +1,93 @@ +#Simple dracut config for a system without systemd + +#Dracut configuration + +show_modules=yes +i18n_install_all=no +lvmconf=no +mdadmconf=no +early_microcode=no +hostonly=no +hostonly_cmdline=no +use_fstab=no +kernel_cmdline="rd.break=initqueue" +do_strip=no + +# Dracut modules need +add_dracutmodules+=" \ +busybox-buildroot \ +bash +" + +# Modules to ignore +omit_dracutmodules+=" \ +biosdevname \ +btrfs \ +bluetooth \ +busybox \ +caps \ +cifs \ +crypt \ +crypt-gpg \ +dash \ +dbus-broker \ +dbus-daemon \ +dm \ +dmraid \ +dmsquash-live-ntfs \ +dracut-systemd \ +fcoe \ +fcoe-uefi \ +fs-lib \ +iscsi \ +i18n \ +lvmmerge \ +lvm \ +lunmask \ +mdraid \ +memstrack \ +mksh \ +modsign \ +mount-root \ +multipath \ +nbd \ +network-legacy \ +network-wicked \ +nfs \ +nvdimm \ +nvmf \ +parse-lunmask \ +qemu \ +qemu-net \ +resume \ +rootfs-block \ +rngd \ +systemd \ +systemd-udevd \ +systemd-coredump \ +systemd-ask-password \ +systemd-timedated \ +systemd-rfkill \ +systemd-resolved \ +systemd-hostnamed \ +systemd-initrd \ +systemd-journald \ +systemd-ldconfig \ +systemd-networkd \ +systemd-timesyncd \ +systemd-veritysetup \ +systemd-modules-load \ +systemd-sysctl \ +systemd-repart \ +systemd-sysext \ +systemd-sysusers \ +systemd-tmpfiles \ +squash \ +ssh-client \ +stratis \ +tpm2-tss \ +udev-rules \ +url-lib \ +usrmount \ +" + diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py new file mode 100644 index 0000000000..5570693dc2 --- /dev/null +++ b/support/testing/tests/fs/test_cpio.py @@ -0,0 +1,44 @@ +import os +import infra.basetest + +CHECK_FS_CMD = "mount | grep 'rootfs on / type rootfs'" + +def boot_img(emulator, builddir): + img = os.path.join(builddir, "images", "rootfs.cpio") + emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", "{}".format(img)]) + emulator.login() + _, exit_code = emulator.run(CHECK_FS_CMD) + return exit_code + +class TestCpioDracut(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_INIT_BUSYBOX=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_DRACUT=y + BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE="{}" + """.format(infra.filepath("conf/dracut.conf")) + + def test_run(self): + + exit_code = boot_img(self.emulator, + self.builddir) + self.assertEqual(exit_code, 0) + +class TestCpioFull(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_INIT_BUSYBOX=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_FULL=y + """ + + def test_run(self): + + exit_code = boot_img(self.emulator, + self.builddir) + self.assertEqual(exit_code, 0) + + -- 2.25.1 From thierry.bultel at linatsea.fr Mon Jan 10 12:46:43 2022 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Mon, 10 Jan 2022 13:46:43 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/dracut: new host package In-Reply-To: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> References: <20220110124644.1388438-1-thierry.bultel@linatsea.fr> Message-ID: <20220110124644.1388438-2-thierry.bultel@linatsea.fr> Dracut is the tool used by desktop distributions to build initrds. In the embedded world, it can be very usefull, too, for instance when wanting to create an initramfs for a system recovery mode. Whereas it is definitively possible to achieve this with buildroot, the process is to have a dedicated buildroot configuration for that, and perform a full build. Instead of doing that, the idea is to use dracut to pick the needed binaries/shared libraries, configuration files, or kernel modules from the 'target' directory. The advantage is to save build time, and also to have a consistency between the packages versions taken for the recovery and the production filesystem. The principle of dracut is based on the so-called 'dracut modules' On the host, they are on host/lib/dracut/modules.d Each directory as a prefix number for the order of execution, and at least a "module-setup.sh" script. Dracut sources all of them, and typically calls the "check()" function, which is the placeholder for required binaries (that are aimed to be polulated in the initrd), then the "depends()" function, that lists other modules to depend on, and the "install()" function, that makes the actual work. Dracut was initially thought to work with systems using systemd, but it can also work without it. Do to so, every "systemd-xxx" modules must be disabled in the dracut configuration file. For convenience, the 05busybox-buildroot module is provided, to support busybox init system. Signed-off-by: Thierry Bultel --- Changes v1 -> v2 (all suggested by Arnoult) - added a wrapper script Changes v2 -> v3 - added modules for: - supporting busybox system init type - fixing a missing symlink for uClibc Changes v3 -> v4 - some explanations on the dracut modules in the commit log - fixed a bug on the 'require_binary' line in busybox module - expanded variables with double quotes and curly braces - removed commented out code - fixes for 'fakeroot' and 'uclibc' and 'musl' as patches - musl and uclibc dynamic fix - renamed dracut wrapper - disabled when using another init system than systemd or busybox Signed-off-by: Thierry Bultel --- package/Config.in.host | 1 + package/dracut/0000-enable-fakeroot.patch | 12 ++++ ...01-add-a-module-to-fix-libc-ld-links.patch | 56 +++++++++++++++++ .../05busybox-buildroot/module-setup.sh | 60 +++++++++++++++++++ package/dracut/Config.in.host | 10 ++++ package/dracut/dracut | 2 +- package/dracut/dracut.mk | 41 +++++++++++++ package/dracut/dracut_wrapper.sh | 15 +++++ 8 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 package/dracut/0000-enable-fakeroot.patch create mode 100644 package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch create mode 100644 package/dracut/05busybox-buildroot/module-setup.sh create mode 100644 package/dracut/Config.in.host create mode 100644 package/dracut/dracut.mk create mode 100644 package/dracut/dracut_wrapper.sh diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..caa28262be 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/cramfs/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" + source "package/dracut/Config.in.host" source "package/dfu-util/Config.in.host" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" diff --git a/package/dracut/0000-enable-fakeroot.patch b/package/dracut/0000-enable-fakeroot.patch new file mode 100644 index 0000000000..e148485135 --- /dev/null +++ b/package/dracut/0000-enable-fakeroot.patch @@ -0,0 +1,12 @@ +diff -purN host-dracut-055.orig/dracut.sh host-dracut-055/dracut.sh +--- host-dracut-055.orig/dracut.sh 2021-05-27 12:34:19.000000000 +0000 ++++ host-dracut-055/dracut.sh 2022-01-06 14:17:57.022317138 +0000 +@@ -868,8 +868,6 @@ export LC_ALL=C + export LANG=C + unset LC_MESSAGES + unset LC_CTYPE +-unset LD_LIBRARY_PATH +-unset LD_PRELOAD + unset GREP_OPTIONS + + export DRACUT_LOG_LEVEL=warning diff --git a/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch new file mode 100644 index 0000000000..ad5e97b34a --- /dev/null +++ b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch @@ -0,0 +1,56 @@ +From 2c0188164223563adfce4852faa83d2553bee367 Mon Sep 17 00:00:00 2001 +From: Thierry Bultel +Date: Mon, 10 Jan 2022 09:09:43 +0100 +Subject: [PATCH] add a module to fix libc ld links + +When using uClibc or musl, there must +be "ls-uClibc.so.1" or "ld-musl-x.so" symlinks, +respectively (else the init process cannot +start) + +Signed-off-by: Thierry Bultel +--- + modules.d/05libc-links/module-setup.sh | 31 ++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + create mode 100755 modules.d/05libc-links/module-setup.sh + +diff --git a/modules.d/05libc-links/module-setup.sh b/modules.d/05libc-links/module-setup.sh +new file mode 100755 +index 00000000..249bb80c +--- /dev/null ++++ b/modules.d/05libc-links/module-setup.sh +@@ -0,0 +1,31 @@ ++#!/bin/bash ++ ++# Adds the missing links for uClibc or musl, if needed ++ ++check() { ++ return 0 ++} ++ ++depends() { ++ return 0 ++} ++ ++install() { ++ ++ # Despite of the fact that the listed dependency (reported by readelf -d) ++ # is purely /lib/libc.so, the musl symlink is needed anyway. ++ ++ musl_link=$(find "${dracutsysrootdir}"/lib -name "ld-musl-*.so*") ++ if [ $? -eq 0 ] ; then ++ ln -s /lib/libc.so ${initdir}/lib/`basename "${musl_link}"` ++ fi ++ ++ # Same for uClibc, the listed dependency ++ # is ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too ++ ++ uclibc_link = $(find "${dracutsysrootdir}"/lib -name "ld-uClibc-*.so*") ++ if [ $? -eq 0 ] ; then ++ ln -s ld-uClibc.so.1 "${initdir}"/`basename "${uclibc_link}"` ++ fi ++ ++} +-- +2.25.1 + diff --git a/package/dracut/05busybox-buildroot/module-setup.sh b/package/dracut/05busybox-buildroot/module-setup.sh new file mode 100644 index 0000000000..ab4e0a5c50 --- /dev/null +++ b/package/dracut/05busybox-buildroot/module-setup.sh @@ -0,0 +1,60 @@ +#!/bin/bash + +check() { + require_binaries busybox || return 1 + return 0 +} + +depends() { + return 0 +} + +install_busybox_links() { + dir=$1 + linkname=$2 + + (cd "${dracutsysrootdir}${dir}" && + for x in *; do + if [ "$(readlink "$x")" = "${linkname}" ]; then + ln -sf "${linkname}" "${initdir}/${dir}/$x" + fi + done + ) +} + +install() { + inst_multiple /bin/busybox + + # wrapper script for early console; will launch /sbin/init + # after having mounted devtmpfs + inst_multiple /init + + ln -s ../bin/busybox "${initdir}"/sbin/init + + if [ -e "${dracutsysrootdir}/lib64" ]; then + ln -s lib "${initdir}/lib64" + ln -s lib "${initdir}/usr/lib64" + fi + + if [ -e "${dracutsysrootdir}/lib32" ]; then + ln -s lib "${initdir}/lib32" + ln -s lib "${initdir}/usr/lib32" + fi + + install_busybox_links "/bin" "busybox" + install_busybox_links "/sbin" "../bin/busybox" + install_busybox_links "/usr/bin" "../../bin/busybox" + install_busybox_links "/usr/sbin" "../../bin/busybox" + + inst_multiple \ + /etc/inittab \ + /etc/init.d/rcS \ + /etc/init.d/rcK \ + /etc/issue \ + /etc/fstab \ + /etc/group \ + /etc/passwd \ + /etc/shadow \ + /etc/hostname +} + diff --git a/package/dracut/Config.in.host b/package/dracut/Config.in.host new file mode 100644 index 0000000000..074d46f623 --- /dev/null +++ b/package/dracut/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_DRACUT + bool + select BR2_PACKAGE_HOST_KMOD + select BR2_PACKAGE_HOST_CROSS_LDD + help + dracut is used to create an initramfs image by + copying tools and files from an installed system + and combining it with the dracut framework. + + https://dracut.wiki.kernel.org diff --git a/package/dracut/dracut b/package/dracut/dracut index 9d3db3b58e..eb15ea9abd 100644 --- a/package/dracut/dracut +++ b/package/dracut/dracut @@ -8,7 +8,7 @@ if [ -z "$*" ]; then exit fi -DRACUT_LDD=${TARGET_CROSS}ldd-cross \ +DRACUT_LDD=${TARGET_CROSS}ldd-buildroot \ DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ dracutbasedir=${HOST_DIR}/usr/lib/dracut \ dracutsysrootdir=${TARGET_DIR} \ diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk new file mode 100644 index 0000000000..5a9e154ccc --- /dev/null +++ b/package/dracut/dracut.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# dracut +# +################################################################################ + +DRACUT_VERSION = 055 +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut +DRACUT_LICENSE = GPL-2.0 +DRACUT_LICENSE_FILES = COPYING + +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd + +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + $(INSTALL) -D -m 0755 package/dracut/dracut \ + $(HOST_DIR)/sbin/dracut +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + + +# Dracut does not support busybox init (systemd init is assumed to work +# out of the box, though). It provides a busybox module, that does not +# use the same paths as buildroot, and is not meant to be used as an init +# system. +# So it is simplier for users to disable the standard 'busybox' module in +# the configuration file, and enable the "busybox-buildroot' module +# instead. +# Notice that setting the script as executable (0755) is not mandatory, +# but this is what dracut does on all its modules, so lets just conform +# to it. + +ifeq ($(BR2_INIT_BUSYBOX),y) +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE +endif + +$(eval $(host-autotools-package)) diff --git a/package/dracut/dracut_wrapper.sh b/package/dracut/dracut_wrapper.sh new file mode 100644 index 0000000000..9d3db3b58e --- /dev/null +++ b/package/dracut/dracut_wrapper.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -x + +if [ -z "$*" ]; then + echo "No argument supplied" + exit +fi + +DRACUT_LDD=${TARGET_CROSS}ldd-cross \ +DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ +dracutbasedir=${HOST_DIR}/usr/lib/dracut \ +dracutsysrootdir=${TARGET_DIR} \ +${HOST_DIR}/bin/dracut "$@" -- 2.25.1 From cyrilbur at gmail.com Mon Jan 10 13:02:49 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Mon, 10 Jan 2022 13:02:49 +0000 Subject: [Buildroot] [PATCH v2] package/python-greenlet: enable as host package In-Reply-To: <20210623145231.19243-1-cyrilbur@gmail.com> References: <20210623145231.19243-1-cyrilbur@gmail.com> Message-ID: <20220110130249.5b897804@camb691.localdomain> While currently there is no in-tree Buildroot package which depends on host-python-lxml, we (Adder Technology) have some proprietary modules that use it as part of their builds. I've tested python-greenlet as host package and confirmed that it builds and works correctly. Someone else might require it, so we are proposing its inclusion. Signed-off-by: Cyril Bur --- V2: Added Config.in.host and a better commit message package/Config.in.host | 1 + package/python-greenlet/Config.in.host | 7 +++++++ package/python-greenlet/python-greenlet.mk | 1 + 3 files changed, 9 insertions(+) create mode 100644 package/python-greenlet/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..6e027d96c2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,6 +69,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" + source "package/python-greenlet/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host new file mode 100644 index 0000000000..673fee8cc5 --- /dev/null +++ b/package/python-greenlet/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_GREENLET + bool "host python-greenlet" + help + Greenlets are lightweight coroutines for in-process concurrent + programming. + + https://greenlet.readthedocs.io/ diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 7b983ff0ef..3b1ef7e314 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From arnout at mind.be Mon Jan 10 13:16:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 10 Jan 2022 14:16:24 +0100 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats Message-ID: <20220110131624.3639727-1-arnout@mind.be> Bumping the version of systemd is a little more complicated than the usual package, and it's easy to forget some of the things that need to be done - and this has happened several times in the past. Add a checklist of things to worry about when updating systemd. Note that there are many other complicated packages that also need a lot of attention when upgrading. However, systemd is a really critical package so it's more important that we get that one right than, say, valgrind. Cc: Norbert Lange Cc: J?r?my ROSEN Cc: Adam Duskett Cc: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 3811dbae42..4d82d2ab81 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,6 +4,18 @@ # ################################################################################ +# When updating systemd, take care of the following: +# - Check if the requirements have changed (see README), in particular +# arch and headers +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD +# - If the required kernel options have changed, update the Config.in +# help text and the list of KCONFIG_ENABLE_OPT. +# - Check if there are new meson_options. Make sure all options are set +# explicitly (usually to default value). +# - If there are new services: +# - create new options for them (if they really are optional); +# - create a new _USER if necessary; +# - create new directionry (with _PERMISSIONS) if necessary. SYSTEMD_VERSION = 250.1 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ -- 2.31.1 From arnout at mind.be Mon Jan 10 13:26:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 10 Jan 2022 14:26:21 +0100 Subject: [Buildroot] Buildroot hackaton and how to help Message-ID: ?Hi all, ?Over the past two years, the backlog of not-yet-applied patches has accumulated very badly, to the level that we reached more than 500 "New" patches in patchwork by mid-December 2021. Worse still, there were about 150 patches of more than a year old. One important reason for this is that the maintainers haven't been able to meet face-to-face during all that time. This makes it difficult to handle contributions that are not completely ready yet, or not perfectly aligned with the Buildroot philosophy. ?Over the past four days, we have finally been able to to get together again. We had dedicated time to look at complicated situations, and we had the opportunity to discuss individual patches and come to decisions. We also had Giulio and Romain helping out remotely. This has allowed us to reduce the backlog from about 350 on Wednesday down to only 128 this morning. In this time, we've applied 293 patches. ?THe picture is a bit less rosy than it seems, however. Of the 128 remaining patches, more than half (78) are more than 2 months old, and one third (42) are more than 6 months old. Older patches are always more difficult to treat because it isn't fair to ask the original submitter for some trivial changes after such a long time. ?The good news, on the other hand, is that we are fairly good with applying trivial patches and patches that have been reviewed. It can take a week, sometimes two, but they don't linger for months in patchwork. Trivial patches are: version bumps, documentation, spelling and whitespace fixes, DEVELOPERS entries, simple fixes that either add toolchain exclusions or take an upstream patch, simple new packages (python packages for example), etc. ?There is a lot that you can do to improve the situation for the non-trivial patches that still stay behind in patchwork for a long time. - Review patches. Even if you don't feel comfortable to assert that a patch is entirely perfect, you can still do a review and catch some of the obvious problems, and it's one less thing for the maintainers to have to fix. - Add your Reviewed-by, Acked-by or Tested-by tag if you think the patch is good enough. The maintainers will still take a look at it, so don't worry if you don't feel experienced enough to approve patches, just go ahead and do it. These tags help because they make a patch stand out in patchwork. To make sure it stands out, please reply to each individual patch of the series, or at least the first ones. - Adopt a patch. When reviewing, it is often easier to fix the issues than to explain what needs to be done in a reply. You can easily get and apply a patch with pwclient (pip install pwclient to get it). Make the fixes, send the new version (make sure you keep the original authorship information and Signed-off-by, and add your own), and let someone on IRC know that the old one is to be marked as Superseded (talk to y_morin, Kubu, jacmet, kos_tom and/or arnout). - When submitting patches, take into account the submission policies. This reduces the work for maintainers to process your patch. ? * Write a good commit message that describes the problem and why this ??? particular solution is chosen. ? * Run check-package and (if necessary) flake8. ? * Put people who might be interested in Cc. Use get-developers, ??? possibly also git log. ? * When re-submitting: ??? - Add people who previously reviewed it in Cc. ??? - Keep Reviewed/Tested/Acked-by tags that people previously gave it. ??? - Mark the previous one as Superseded in patchwork. ??? - Include a version number (and increment it, obviously). ??? - Include a patch changelog. ??? - When it's part of a series, resubmit the entire series, including ????? patches that haven't changed. - Add tests. They make it easier to feel safe about making changes. - All of the above should of course be in our manual. Most of it already is, but you could help by looking at docs/manual/contribute.txt and extend where needed. ?Most importantly however: thank you everybody for your continued contributions. It is thanks to all of you that Buildroot is such a great project! Yann, Thomas, Peter and Arnout From santosh.multhalli at rockwellcollins.com Mon Jan 10 13:42:29 2022 From: santosh.multhalli at rockwellcollins.com (Santosh Multhalli) Date: Mon, 10 Jan 2022 19:12:29 +0530 Subject: [Buildroot] [PATCH 1/1] Removed Santosh Multhalli (santosh.multhalli@rockwellcollins.com) as active developer of valjson Message-ID: <20220110134229.1381-1-santosh.multhalli@rockwellcollins.com> Signed-off-by: Santosh Multhalli --- DEVELOPERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 215506c71c..3a530aa3f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1761,8 +1761,6 @@ F: package/urg/ F: package/ussp-push/ F: support/misc/toolchainfile.cmake.in -N: Santosh Multhalli -F: package/valijson/ N: Scott Fan F: package/libssh/ -- 2.25.1 From yann.morin.1998 at free.fr Mon Jan 10 14:04:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:04:50 +0100 Subject: [Buildroot] [PATCH 2/2] package/avrdude: add support for Linux sysfs GPIO interface In-Reply-To: <20220110085850.11095-2-yegorslists@googlemail.com> References: <20220110085850.11095-1-yegorslists@googlemail.com> <20220110085850.11095-2-yegorslists@googlemail.com> Message-ID: <20220110140450.GO1477939@scaer> Yegor, All, On 2022-01-10 09:58 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > Signed-off-by: Yegor Yefremov > --- > package/avrdude/Config.in | 3 +++ > package/avrdude/avrdude.mk | 6 ++++++ > 2 files changed, 9 insertions(+) > > diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in > index 89558a5ff5..57a8df66ea 100644 > --- a/package/avrdude/Config.in > +++ b/package/avrdude/Config.in > @@ -17,6 +17,9 @@ config BR2_PACKAGE_AVRDUDE > > if BR2_PACKAGE_AVRDUDE > > +config BR2_PACKAGE_AVRDUDE_LINUXGPIO > + bool "Linux sysfs GPIO interface support" > + > config BR2_PACKAGE_AVRDUDE_SPI > bool "SPI support" > default y # Backward compatibility > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index accd92c1d5..3ccba80d8e 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -16,6 +16,12 @@ AVRDUDE_CONF_OPTS = --enable-linuxgpio > AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ > host-flex host-bison > > +ifeq ($(BR2_PACKAGE_AVRDUDE_LINUXGPIO),y) > +AVRDUDE_CONF_OPTS += --enable-linuxgpio > +else > +AVRDUDE_CONF_OPTS += --disable-linuxgpio > +endif We already have an unconditional activation of those: https://github.com/buildroot/buildroot/blob/master/package/avrdude/avrdude.mk#L15 (which you can btw. incidentally also notice as part the hunk header). So, if the intention was to be able to enable linux-gpio, then this is a noop as they are already enabled. If the intention was to be able to disable them, then the unconditional enable should be dropped. But then, does it make sense to be able to disable linux GPIO? And what if both SPI and GPIO are disabled? Regards, Yann E. MORIN. > ifeq ($(BR2_PACKAGE_AVRDUDE_SPI),y) > AVRDUDE_CONF_OPTS += --enable-linuxspi > else > -- > 2.17.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From cyrilbur at gmail.com Mon Jan 10 14:07:37 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Mon, 10 Jan 2022 14:07:37 +0000 Subject: [Buildroot] [PATCH v2] package/python-greenlet: enable as host package In-Reply-To: <20220110130249.5b897804@camb691.localdomain> References: <20210623145231.19243-1-cyrilbur@gmail.com> <20220110130249.5b897804@camb691.localdomain> Message-ID: Sorry ignore me, sent a version with mistakes. I'll send v3. On Mon, 10 Jan 2022 at 13:02, Cyril Bur wrote: > > While currently there is no in-tree Buildroot package which depends on > host-python-lxml, we (Adder Technology) have some proprietary modules > that use it as part of their builds. > > I've tested python-greenlet as host package and confirmed that it builds > and works correctly. Someone else might require it, so we are proposing > its inclusion. > > Signed-off-by: Cyril Bur > --- > V2: Added Config.in.host and a better commit message > > package/Config.in.host | 1 + > package/python-greenlet/Config.in.host | 7 +++++++ > package/python-greenlet/python-greenlet.mk | 1 + > 3 files changed, 9 insertions(+) > create mode 100644 package/python-greenlet/Config.in.host > > diff --git a/package/Config.in.host b/package/Config.in.host > index b3e00bb482..6e027d96c2 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -69,6 +69,7 @@ menu "Host utilities" > source "package/pwgen/Config.in.host" > source "package/python/Config.in.host" > source "package/python-cython/Config.in.host" > + source "package/python-greenlet/Config.in.host" > source "package/python-lxml/Config.in.host" > source "package/python-six/Config.in.host" > source "package/python-xlrd/Config.in.host" > diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host > new file mode 100644 > index 0000000000..673fee8cc5 > --- /dev/null > +++ b/package/python-greenlet/Config.in.host > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_HOST_PYTHON_GREENLET > + bool "host python-greenlet" > + help > + Greenlets are lightweight coroutines for in-process concurrent > + programming. > + > + https://greenlet.readthedocs.io/ > diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk > index 7b983ff0ef..3b1ef7e314 100644 > --- a/package/python-greenlet/python-greenlet.mk > +++ b/package/python-greenlet/python-greenlet.mk > @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.34.1 > -- Cyril From cyrilbur at gmail.com Mon Jan 10 14:11:40 2022 From: cyrilbur at gmail.com (Cyril Bur) Date: Mon, 10 Jan 2022 14:11:40 +0000 Subject: [Buildroot] [PATCH v3] package/python-greenlet: enable as host package In-Reply-To: <20210623145231.19243-1-cyrilbur@gmail.com> References: <20210623145231.19243-1-cyrilbur@gmail.com> Message-ID: <20220110141140.77224ac0@camb691.localdomain> While currently there is no in-tree Buildroot package which depends on host-python-greenlet, we (Adder Technology) have some proprietary modules that use it as part of their builds. I've tested python-greenlet as host package and confirmed that it builds and works correctly. Someone else might require it, so I'm proposing its inclusion. Signed-off-by: Cyril Bur --- v2: Half completed commit message update - sorry v3: Updated commit message and Config.in.host package/Config.in.host | 1 + package/python-greenlet/Config.in.host | 7 +++++++ package/python-greenlet/python-greenlet.mk | 1 + 3 files changed, 9 insertions(+) create mode 100644 package/python-greenlet/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..6e027d96c2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,6 +69,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" + source "package/python-greenlet/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host new file mode 100644 index 0000000000..673fee8cc5 --- /dev/null +++ b/package/python-greenlet/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_GREENLET + bool "host python-greenlet" + help + Greenlets are lightweight coroutines for in-process concurrent + programming. + + https://greenlet.readthedocs.io/ diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 7b983ff0ef..3b1ef7e314 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From yann.morin.1998 at free.fr Mon Jan 10 14:09:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:09:25 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add entry for avrdude to Yegor Yefremov Message-ID: <20220110140611.1F28D82A2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=922fdcd47d092e9d2f7000afcb7997a2a2ed2111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index cd0b54b041..7a9f0f7370 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2968,6 +2968,7 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ +F: package/avrdude/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ From yann.morin.1998 at free.fr Mon Jan 10 14:11:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:11:53 +0100 Subject: [Buildroot] [git commit] Developpers: remove Santosh Multhalli for valjson Message-ID: <20220110140611.2CCBF83241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31fd98c6ae7c39d779e7f9729e55ec65a7f847ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Santosh Multhalli Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7a9f0f7370..12777e8d61 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2503,9 +2503,6 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Santosh Multhalli -F: package/valijson/ - N: S??bastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ From yann.morin.1998 at free.fr Mon Jan 10 14:13:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:13:49 +0100 Subject: [Buildroot] [PATCH 1/1] Removed Santosh Multhalli (santosh.multhalli@rockwellcollins.com) as active developer of valjson In-Reply-To: <20220110134229.1381-1-santosh.multhalli@rockwellcollins.com> References: <20220110134229.1381-1-santosh.multhalli@rockwellcollins.com> Message-ID: <20220110141349.GP1477939@scaer> Santosh, All, On 2022-01-10 19:12 +0530, Santosh Multhalli spake thusly: > Signed-off-by: Santosh Multhalli Applied to master, thanks. Thanks you for taking care of it until now! :-) Regards, Yann E. MORIN. > --- > DEVELOPERS | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 215506c71c..3a530aa3f2 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1761,8 +1761,6 @@ F: package/urg/ > F: package/ussp-push/ > F: support/misc/toolchainfile.cmake.in > > -N: Santosh Multhalli > -F: package/valijson/ > > N: Scott Fan > F: package/libssh/ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 10 14:14:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 15:14:09 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: add entry for avrdude to Yegor Yefremov In-Reply-To: <20220110085850.11095-1-yegorslists@googlemail.com> References: <20220110085850.11095-1-yegorslists@googlemail.com> Message-ID: <20220110141409.GQ1477939@scaer> Yegor, All, On 2022-01-10 09:58 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > Signed-off-by: Yegor Yefremov Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index cd0b54b041..7a9f0f7370 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2968,6 +2968,7 @@ F: configs/beaglebone_defconfig > F: configs/beaglebone_qt5_defconfig > F: package/acl/ > F: package/attr/ > +F: package/avrdude/ > F: package/boost/ > F: package/bootstrap/ > F: package/cannelloni/ > -- > 2.17.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From herve.codina at bootlin.com Mon Jan 10 14:50:02 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:02 +0100 Subject: [Buildroot] [PATCH v3 0/5] Add Alchemy build system and some related libs Message-ID: <20220110145007.133329-1-herve.codina@bootlin.com> Hi, This patch series introduces the Parrot Alchemy build system as a host tool (patch 1). This tool is then used to build several libs (patch 2, 3 and 4). Finaly (patch 5), a test is provided to check that the binaries were correctly built. As it was mentionned by Thomas Peteazzoni in the previous review, a new package infrastructure was not added for the Alchemy build system. Indeed, we do not expect to have a significant number of packages that will rely on the Alchemy build system. Of course, should we have more of these packages in the future, we can consider adding a package infrastructure. This v3 series takes care of the Yann Morin's review. Changes v2->v3 are detailed in each patch. Best regards, Herv? Codina Herve Codina (5): package/alchemy: new host package package/ulog: new package package/libfutils: new package package/libshdata: new package support/testing/tests/package/test_libshdata: new test DEVELOPERS | 5 ++ package/Config.in | 3 + ...lchains-remove-hash-style-management.patch | 36 +++++++++ package/alchemy/alchemy.hash | 4 + package/alchemy/alchemy.mk | 71 ++++++++++++++++++ package/alchemy/atom.mk.in | 8 ++ package/libfutils/Config.in | 15 ++++ package/libfutils/libfutils.hash | 3 + package/libfutils/libfutils.mk | 56 ++++++++++++++ ...01-backend-Add-missing-include-files.patch | 47 ++++++++++++ ...stress_test-Fix-build-with-musl-libc.patch | 34 +++++++++ package/libshdata/Config.in | 29 +++++++ package/libshdata/libshdata.hash | 3 + package/libshdata/libshdata.mk | 75 +++++++++++++++++++ package/ulog/Config.in | 12 +++ package/ulog/ulog.hash | 3 + package/ulog/ulog.mk | 50 +++++++++++++ .../testing/tests/package/test_libshdata.py | 25 +++++++ 18 files changed, 479 insertions(+) create mode 100644 package/alchemy/0001-toolchains-remove-hash-style-management.patch create mode 100644 package/alchemy/alchemy.hash create mode 100644 package/alchemy/alchemy.mk create mode 100644 package/alchemy/atom.mk.in create mode 100644 package/libfutils/Config.in create mode 100644 package/libfutils/libfutils.hash create mode 100644 package/libfutils/libfutils.mk create mode 100644 package/libshdata/0001-backend-Add-missing-include-files.patch create mode 100644 package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch create mode 100644 package/libshdata/Config.in create mode 100644 package/libshdata/libshdata.hash create mode 100644 package/libshdata/libshdata.mk create mode 100644 package/ulog/Config.in create mode 100644 package/ulog/ulog.hash create mode 100644 package/ulog/ulog.mk create mode 100644 support/testing/tests/package/test_libshdata.py -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:03 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:03 +0100 Subject: [Buildroot] [PATCH v3 1/5] package/alchemy: new host package In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-2-herve.codina@bootlin.com> Alchemy is a build system developed by Parrot. It is a new build system based on the one used in Android. A central makefile instance scans a workspace to find user makefiles, includes them and register modules to be built. https://github.com/Parrot-Developers/alchemy Signed-off-by: Herve Codina --- Changes v1 -> v2 - Fixed missing license information related to kconfig - Installed Alchemy in $(HOST_DIR)/opt/alchemy - Renamed ALCHEMY_TARGET_CONFIGURE_ENV to ALCHEMY_TARGET_ENV - Removed ALCHEMY_TARGET_CONFIGURE_SDKS macro Changes v2 -> v3 - Introduced atom.mk.in as suggested by Yann - Added LIBRARIES in atom.mk.in to set Alchemy dependencies chain. This is needed to have a complete .a file list for the link command in case of static lib only. DEVELOPERS | 1 + ...lchains-remove-hash-style-management.patch | 36 ++++++++++ package/alchemy/alchemy.hash | 4 ++ package/alchemy/alchemy.mk | 71 +++++++++++++++++++ package/alchemy/atom.mk.in | 8 +++ 5 files changed, 120 insertions(+) create mode 100644 package/alchemy/0001-toolchains-remove-hash-style-management.patch create mode 100644 package/alchemy/alchemy.hash create mode 100644 package/alchemy/alchemy.mk create mode 100644 package/alchemy/atom.mk.in diff --git a/DEVELOPERS b/DEVELOPERS index cd0b54b041..79b33e9f22 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1187,6 +1187,7 @@ N: Henrique Camargo F: package/json-glib/ N: Herv? Codina +F: package/alchemy/ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ diff --git a/package/alchemy/0001-toolchains-remove-hash-style-management.patch b/package/alchemy/0001-toolchains-remove-hash-style-management.patch new file mode 100644 index 0000000000..522766b977 --- /dev/null +++ b/package/alchemy/0001-toolchains-remove-hash-style-management.patch @@ -0,0 +1,36 @@ +From 4cb9681ab99db3d8e330ac789e17ec69583aecd4 Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Thu, 28 Oct 2021 18:39:18 +0200 +Subject: [PATCH] toolchains: remove --hash-style management + +Using an external toolchain, with an external configuration given +using TARGET_GLOBAL_XXXX variables, having '--hash-style=both' +in Alchemy toolchains can lead to compilation failure. + +This patch simply removes all --hash-style settings. + +Signed-off-by: Herve Codina +--- + toolchains/linux/eglibc/flags.mk | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/toolchains/linux/eglibc/flags.mk b/toolchains/linux/eglibc/flags.mk +index 95c0a46..4474729 100644 +--- a/toolchains/linux/eglibc/flags.mk ++++ b/toolchains/linux/eglibc/flags.mk +@@ -11,11 +11,4 @@ TARGET_GLOBAL_LDLIBS += -pthread -lrt + TARGET_GLOBAL_CFLAGS += -funwind-tables + + # Enable link optimization for binutils's ld. +-# gnu hash not supported by mips ABI +-ifeq ("$(TARGET_ARCH)","mips") +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-else ifeq ("$(TARGET_ARCH)","mips64") +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-else +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1,--hash-style=both +-endif ++TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-- +2.31.1 + diff --git a/package/alchemy/alchemy.hash b/package/alchemy/alchemy.hash new file mode 100644 index 0000000000..33895263cc --- /dev/null +++ b/package/alchemy/alchemy.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 346c06b9317691a9371d878b850e61f8bcec4f20132ac95340b9d2571be25ee8 alchemy-d95b3c38cd37814a1b98d0bbf813de7adaaecfbc.tar.gz +sha256 542f44eecd9f8806ec1ae285201e442ab547c82d9f8c70e44c977d6332a2bea0 COPYING +sha256 49872815ee3de163f07a83737c996e77a5bffa186d06b1e3bb969bfb68c251df README diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk new file mode 100644 index 0000000000..33d40478b7 --- /dev/null +++ b/package/alchemy/alchemy.mk @@ -0,0 +1,71 @@ +################################################################################ +# +# alchemy +# +################################################################################ + +ALCHEMY_VERSION = d95b3c38cd37814a1b98d0bbf813de7adaaecfbc +ALCHEMY_SITE = $(call github,Parrot-Developers,alchemy,$(ALCHEMY_VERSION)) +ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) +ALCHEMY_LICENSE_FILES = COPYING README +HOST_ALCHEMY_DEPENDENCIES = host-python3 + +ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy +ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk + +define HOST_ALCHEMY_INSTALL_CMDS + mkdir -p $(ALCHEMY_HOME) + cp -rf $(@D)/* $(ALCHEMY_HOME) + cp $(HOST_ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOME)/atom.mk.in +endef + +$(eval $(host-generic-package)) + +# Variables used by other packages + +ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake + +# TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture. +# When Alchemy manages the architecture, it can add some flags to CFGLAGS and +# can lead to incorrect result with the toolchain provided in TARGET_CROSS. +# 'xxx' is an unknown architecture for Alchemy. Using this value is a simple +# way to disable the Alchemy architecture management. +ALCHEMY_TARGET_ENV = \ + $(TARGET_MAKE_ENV) \ + ALCHEMY_HOME=$(ALCHEMY_HOME) \ + ALCHEMY_WORKSPACE_DIR="$(@D)" \ + ALCHEMY_TARGET_OUT=alchemy-out \ + TARGET_OS=linux \ + TARGET_OS_FLAVOUR=buildroot \ + TARGET_CROSS="$(TARGET_CROSS)" \ + TARGET_ARCH=xxx \ + TARGET_GLOBAL_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + TARGET_GLOBAL_LDFLAGS="$(TARGET_LDFLAGS)" \ + TARGET_GLOBAL_FFLAGS="$(TARGET_FCFLAGS)" \ + TARGET_GLOBAL_FCFLAGS="$(TARGET_FCFLAGS)" + +ifeq ($(BR2_STATIC_LIBS),y) +ALCHEMY_TARGET_ENV += \ + TARGET_FORCE_STATIC=1 \ + TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS)" +else +ALCHEMY_TARGET_ENV += \ + TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS) -fPIC" +endif + +# Install an Alchemy SDK file. +# This macro can be used by Alchemy packages +# $1: Buildroot package name +# $2: Alchemy module name +# $3: Alchemy module file name +# $4: Alchemy module libraries this module depends on +define ALCHEMY_INSTALL_LIB_SDK_FILE + $(INSTALL) -m 0644 -D \ + $(ALCHEMY_HOME)/atom.mk.in \ + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk + $(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \ + -e 's#@MODULE@#$(strip $(2))#' \ + -e 's#@MODULE_FILENAME@#$(strip $(3))#' \ + -e 's#@LIBRARIES@#$(strip $(4))#' \ + $(ALCHEMY_SDK_BASEDIR)/$(strip $(1))/atom.mk +endef diff --git a/package/alchemy/atom.mk.in b/package/alchemy/atom.mk.in new file mode 100644 index 0000000000..084ae0e89f --- /dev/null +++ b/package/alchemy/atom.mk.in @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE := @MODULE@ +LOCAL_SDK := @STAGING_DIR@ +LOCAL_DESTDIR := usr/lib +LOCAL_MODULE_FILENAME := @MODULE_FILENAME@ +LOCAL_LIBRARIES := @LIBRARIES@ +include $(BUILD_LIBRARY) -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:04 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:04 +0100 Subject: [Buildroot] [PATCH v3 2/5] package/ulog: new package In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-3-herve.codina@bootlin.com> The ulog library is a minimalistic logging library derived from Android logger. https://github.com/Parrot-Developers/ulog Signed-off-by: Herve Codina --- Changes v1 -> v2 - Renamed ALCHEMY_TARGET_CONFIGURE_ENV to ALCHEMY_TARGET_ENV - Removed $(strip ...) - Fixed indentation Changes v2 -> v3 - Installed .a files when needed (ie not shared lib only) - Used $(INSTALL) in all installation commands - Created installation directories when needed DEVELOPERS | 1 + package/Config.in | 1 + package/ulog/Config.in | 12 ++++++++++ package/ulog/ulog.hash | 3 +++ package/ulog/ulog.mk | 50 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 package/ulog/Config.in create mode 100644 package/ulog/ulog.hash create mode 100644 package/ulog/ulog.mk diff --git a/DEVELOPERS b/DEVELOPERS index 79b33e9f22..31ca7bf608 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1197,6 +1197,7 @@ F: package/php-apcu/ F: package/php-lua/ F: package/php-pam/ F: package/php-pecl-dbus/ +F: package/ulog/ F: support/testing/tests/package/test_dtbocfg.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..39a98fcc66 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1738,6 +1738,7 @@ menu "Logging" source "package/log4qt/Config.in" source "package/opentracing-cpp/Config.in" source "package/spdlog/Config.in" + source "package/ulog/Config.in" source "package/zlog/Config.in" endmenu diff --git a/package/ulog/Config.in b/package/ulog/Config.in new file mode 100644 index 0000000000..ef155005c2 --- /dev/null +++ b/package/ulog/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_ULOG + bool "ulog" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + help + This is a minimalistic logging library derived from + Android logger. + + https://github.com/Parrot-Developers/ulog + +comment "ulog needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ulog/ulog.hash b/package/ulog/ulog.hash new file mode 100644 index 0000000000..47adc093b9 --- /dev/null +++ b/package/ulog/ulog.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 14e5773b32a79fa5380bdc7ac73a39a7cd3ab182830f57cf6f2994fb49cf38dc ulog-0389d243352255f6182326dccdae3d56dadc078f.tar.gz +sha256 cbb97dd2528af2aa2b9aee6c1b3ff1caed758044c17b2c811cf44b2528c496da COPYING diff --git a/package/ulog/ulog.mk b/package/ulog/ulog.mk new file mode 100644 index 0000000000..4bfb913499 --- /dev/null +++ b/package/ulog/ulog.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# ulog +# +################################################################################ + +ULOG_VERSION = 0389d243352255f6182326dccdae3d56dadc078f +ULOG_SITE = $(call github,Parrot-Developers,ulog,$(ULOG_VERSION)) +ULOG_LICENSE = Apache-2.0 +ULOG_LICENSE_FILES = COPYING +ULOG_DEPENDENCIES = host-alchemy +ULOG_INSTALL_STAGING = YES + +define ULOG_BUILD_CMDS + $(ALCHEMY_TARGET_ENV) \ + $(ALCHEMY_MAKE) libulog +endef + +ifeq ($(BR2_SHARED_LIBS),) +define ULOG_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.a \ + $(1)/usr/lib/libulog.a +endef +endif + +define ULOG_INSTALL_HEADERS + mkdir -p $(1)/usr/include/ + $(INSTALL) -m 644 $(@D)/libulog/include/* $(1)/usr/include/ +endef + +ifeq ($(BR2_STATIC_LIBS),) +define ULOG_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.so* \ + $(1)/usr/lib/ +endef +endif + +define ULOG_INSTALL_TARGET_CMDS + $(call ULOG_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +define ULOG_INSTALL_STAGING_CMDS + $(call ULOG_INSTALL_STATIC_LIBS, $(STAGING_DIR)) + $(call ULOG_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call ULOG_INSTALL_HEADERS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, ulog, libulog, libulog.so) +endef + +$(eval $(generic-package)) -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:05 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:05 +0100 Subject: [Buildroot] [PATCH v3 3/5] package/libfutils: new package In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-4-herve.codina@bootlin.com> The libfutils library is a library that contains some common useful functions (list, hash, time). https://github.com/Parrot-Developers/libfutils Signed-off-by: Herve Codina --- Changes v1 -> v2 - Renamed ALCHEMY_TARGET_CONFIGURE_ENV to ALCHEMY_TARGET_ENV - Removed ALCHEMY_TARGET_CONFIGURE_SDKS and set ALCHEMY_TARGET_SDK_DIRS - Removed $(strip ...) - Fixed indentation - Added missing "depends on" in Config.in comment Changes v2 -> v3 - Installed .a files when needed (ie not shared lib only) - Used $(INSTALL) in all installation commands - Created installation directories when needed - Fixed dependencies chain in Alchemy atom.mk DEVELOPERS | 1 + package/Config.in | 1 + package/libfutils/Config.in | 15 +++++++++ package/libfutils/libfutils.hash | 3 ++ package/libfutils/libfutils.mk | 56 ++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 package/libfutils/Config.in create mode 100644 package/libfutils/libfutils.hash create mode 100644 package/libfutils/libfutils.mk diff --git a/DEVELOPERS b/DEVELOPERS index 31ca7bf608..ecb0837398 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1191,6 +1191,7 @@ F: package/alchemy/ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ +F: package/libfutils/ F: package/lua-augeas/ F: package/modsecurity2/ F: package/php-apcu/ diff --git a/package/Config.in b/package/Config.in index 39a98fcc66..163fd53e12 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1986,6 +1986,7 @@ menu "Other" source "package/libevent/Config.in" source "package/libexecinfo/Config.in" source "package/libffi/Config.in" + source "package/libfutils/Config.in" source "package/libgee/Config.in" source "package/libgeos/Config.in" source "package/libglib2/Config.in" diff --git a/package/libfutils/Config.in b/package/libfutils/Config.in new file mode 100644 index 0000000000..7f795fc7e0 --- /dev/null +++ b/package/libfutils/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBFUTILS + bool "libfutils" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP # ulog + depends on BR2_TOOLCHAIN_HAS_THREADS # ulog + select BR2_PACKAGE_ULOG + help + This library contains some common useful functions (list, + hash, time) + + https://github.com/Parrot-Developers/libfutils + +comment "libfutils needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_ATOMIC diff --git a/package/libfutils/libfutils.hash b/package/libfutils/libfutils.hash new file mode 100644 index 0000000000..1fdcd84b13 --- /dev/null +++ b/package/libfutils/libfutils.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 b38d40c46b83e448d8c1716ddfb04b7ecd384f5cd2cb773db5c26c0589accdb3 libfutils-c326ce0cc2a7354381265a7664bb215be587fac6.tar.gz +sha256 eca11a1c62fae8d64a1247d93271375baecff8396141d7ff8d89671ee7e3ed0d COPYING diff --git a/package/libfutils/libfutils.mk b/package/libfutils/libfutils.mk new file mode 100644 index 0000000000..0772d16ad7 --- /dev/null +++ b/package/libfutils/libfutils.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# libfutils +# +################################################################################ + +LIBFUTILS_VERSION = c326ce0cc2a7354381265a7664bb215be587fac6 +LIBFUTILS_SITE = $(call github,Parrot-Developers,libfutils,$(LIBFUTILS_VERSION)) +LIBFUTILS_LICENSE = BSD-3-Clause +LIBFUTILS_LICENSE_FILES = COPYING +LIBFUTILS_DEPENDENCIES = ulog host-alchemy +LIBFUTILS_INSTALL_STAGING = YES + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBFUTILS_CONF_ENV += TARGET_GLOBAL_LDLIBS='-latomic' +endif + +define LIBFUTILS_BUILD_CMDS + $(ALCHEMY_TARGET_ENV) \ + ALCHEMY_TARGET_SDK_DIRS="$(ALCHEMY_SDK_BASEDIR)/ulog" \ + $(LIBFUTILS_CONF_ENV) \ + $(ALCHEMY_MAKE) libfutils +endef + +ifeq ($(BR2_SHARED_LIBS),) +define LIBFUTILS_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libfutils.a \ + $(1)/usr/lib/libfutils.a +endef +endif + +define LIBFUTILS_INSTALL_HEADERS + mkdir -p $(1)/usr/include/futils + $(INSTALL) -m 644 $(@D)/include/futils/* $(1)/usr/include/futils/ +endef + +ifeq ($(BR2_STATIC_LIBS),) +define LIBFUTILS_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libfutils.so* \ + $(1)/usr/lib/ +endef +endif + +define LIBFUTILS_INSTALL_TARGET_CMDS + $(call LIBFUTILS_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +define LIBFUTILS_INSTALL_STAGING_CMDS + $(call LIBFUTILS_INSTALL_STATIC_LIBS, $(STAGING_DIR)) + $(call LIBFUTILS_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call LIBFUTILS_INSTALL_HEADERS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libfutils, libfutils, libfutils.so, libulog) +endef + +$(eval $(generic-package)) -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:07 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:07 +0100 Subject: [Buildroot] [PATCH v3 5/5] support/testing/tests/package/test_libshdata: new test In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-6-herve.codina@bootlin.com> This new test ensures that libraries and binaries generated using Parrot Alchemy build system are correct. Indeed, the test uses libshdata-stress. This binary depends on libshdata. libshdata depends on libfutils and libfutils depends on ulog. All of these binaries and libraries are built using Alchemy. Signed-off-by: Herve Codina --- Changed v1 -> v2: none Changed v2 -> v3: none DEVELOPERS | 1 + .../testing/tests/package/test_libshdata.py | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 support/testing/tests/package/test_libshdata.py diff --git a/DEVELOPERS b/DEVELOPERS index 8d0258d7e8..68d66e08a7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1201,6 +1201,7 @@ F: package/php-pam/ F: package/php-pecl-dbus/ F: package/ulog/ F: support/testing/tests/package/test_dtbocfg.py +F: support/testing/tests/package/test_libshdata.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py F: support/testing/tests/package/test_php_lua.py diff --git a/support/testing/tests/package/test_libshdata.py b/support/testing/tests/package/test_libshdata.py new file mode 100644 index 0000000000..80b032ac69 --- /dev/null +++ b/support/testing/tests/package/test_libshdata.py @@ -0,0 +1,25 @@ +import os + +import infra.basetest + + +class TestLibshdata(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LIBSHDATA=y + BR2_PACKAGE_LIBSHDATA_STRESS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", img]) + self.emulator.login() + + # Just run libshdata-stress. + # This ensures that library are well compiled and that all dependencies + # are met using Parrot Alchemy build system. + self.assertRunOk("libshdata-stress") -- 2.33.1 From herve.codina at bootlin.com Mon Jan 10 14:50:06 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Mon, 10 Jan 2022 15:50:06 +0100 Subject: [Buildroot] [PATCH v3 4/5] package/libshdata: new package In-Reply-To: <20220110145007.133329-1-herve.codina@bootlin.com> References: <20220110145007.133329-1-herve.codina@bootlin.com> Message-ID: <20220110145007.133329-5-herve.codina@bootlin.com> The libshdata library provides lock free shared-memory tools. https://github.com/Parrot-Developers/libshdata libshdata-stress utility does not compile using static libs only (BR2_STATIC_LIBS=y). The issue was raised upstream: https://github.com/Parrot-Developers/libshdata/issues/2 For now, libshdata-stress simply depends on !BR2_STATIC_LIBS. Signed-off-by: Herve Codina --- Changes v1 -> v2 - Added comment related to "patch submitted upstream" in the patch itself - Renamed ALCHEMY_TARGET_CONFIGURE_ENV to ALCHEMY_TARGET_ENV - Removed ALCHEMY_TARGET_CONFIGURE_SDKS and set ALCHEMY_TARGET_SDK_DIRS - Removed $(strip ...) - Fixed indentation - Added missing "depends on" in Config.in comment - Moved the Config.in "comment" block after the if...endif block - Removed unneeded LIBSHDATA_CONF_ENV Changes v2 -> v3 - Installed .a files when needed (ie not shared lib only) - Used $(INSTALL) in all installation commands - Created installation directories when needed - Added ulog as buildroot package dependency and fixed the dependencies chain in Alchemy atom.mk - Added 0002-examples-stress_test-Fix-build-with-musl-libc.patch - Added 'depends on !BR2_STATIC_LIBS' for libshdata-stress DEVELOPERS | 1 + package/Config.in | 1 + ...01-backend-Add-missing-include-files.patch | 47 ++++++++++++ ...stress_test-Fix-build-with-musl-libc.patch | 37 +++++++++ package/libshdata/Config.in | 30 ++++++++ package/libshdata/libshdata.hash | 3 + package/libshdata/libshdata.mk | 75 +++++++++++++++++++ 7 files changed, 194 insertions(+) create mode 100644 package/libshdata/0001-backend-Add-missing-include-files.patch create mode 100644 package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch create mode 100644 package/libshdata/Config.in create mode 100644 package/libshdata/libshdata.hash create mode 100644 package/libshdata/libshdata.mk diff --git a/DEVELOPERS b/DEVELOPERS index ecb0837398..8d0258d7e8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1192,6 +1192,7 @@ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ F: package/libfutils/ +F: package/libshdata/ F: package/lua-augeas/ F: package/modsecurity2/ F: package/php-apcu/ diff --git a/package/Config.in b/package/Config.in index 163fd53e12..2a1bc0dfb8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2030,6 +2030,7 @@ comment "linux-pam plugins" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" + source "package/libshdata/Config.in" source "package/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/libshdata/0001-backend-Add-missing-include-files.patch b/package/libshdata/0001-backend-Add-missing-include-files.patch new file mode 100644 index 0000000000..78c9e669c3 --- /dev/null +++ b/package/libshdata/0001-backend-Add-missing-include-files.patch @@ -0,0 +1,47 @@ +From 3eaf11bd957555674f5993435ef79dd4717ce890 Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Tue, 26 Oct 2021 08:45:10 +0200 +Subject: [PATCH] backend: Add missing include files + +With some libc library (musl), shd_dev_mem.c and shd_shm.c do not +compile. Indeed, open() needs (Cf. man open). + +This patch fixes the compilation issue adding this +include file. + +This patch was submitted upstream. +https://github.com/Parrot-Developers/libshdata/issues/1 + +Signed-off-by: Herve Codina +--- + src/backend/shd_dev_mem.c | 1 + + src/backend/shd_shm.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/backend/shd_dev_mem.c b/src/backend/shd_dev_mem.c +index 14573c1..a65f052 100644 +--- a/src/backend/shd_dev_mem.c ++++ b/src/backend/shd_dev_mem.c +@@ -33,6 +33,7 @@ + #include + #include + #include /* For ftruncate */ ++#include /* For open */ + #include /* for flock */ + #include /* For shm and PROT flags */ + #include +diff --git a/src/backend/shd_shm.c b/src/backend/shd_shm.c +index 117bf01..1e5a38c 100644 +--- a/src/backend/shd_shm.c ++++ b/src/backend/shd_shm.c +@@ -35,6 +35,7 @@ + #include + #include + #include /* For ftruncate */ ++#include /* For open */ + #include /* For NAME_MAX macro */ + #include /* for flock */ + #include /* For shm and PROT flags */ +-- +2.31.1 + diff --git a/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch b/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..c2a8e5f240 --- /dev/null +++ b/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch @@ -0,0 +1,37 @@ +From ddded7337812a2797d31f276624da98932d8e17f Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Sun, 9 Jan 2022 14:59:27 +0100 +Subject: [PATCH] examples/stress_test: Fix build with musl libc + +The musl C library uses sched_priority instead of +__sched_priority as GNU libc and uClibc do. +Use sched_priority instead. + +This does not break compilation with GNU libc and uClibc +because they both define in sched.h: + #define sched_priority __sched_priority + +This patch was submitted upstream. +https://github.com/Parrot-Developers/libshdata/issues/3 + +Signed-off-by: Herve Codina +--- + examples/stress_test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/stress_test.c b/examples/stress_test.c +index a859115..cfb5418 100644 +--- a/examples/stress_test.c ++++ b/examples/stress_test.c +@@ -617,7 +617,7 @@ static void launch_test(int timer_fd, struct test_setup *setup) + if (ret < 0) + ULOGI("Error setting the timer : %s", strerror(errno)); + struct sched_param sched_params; +- sched_params.__sched_priority = sched_get_priority_max(SCHED_RR); ++ sched_params.sched_priority = sched_get_priority_max(SCHED_RR); + + pid_t pid = fork(); + +-- +2.33.1 + diff --git a/package/libshdata/Config.in b/package/libshdata/Config.in new file mode 100644 index 0000000000..b2c24c94c5 --- /dev/null +++ b/package/libshdata/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_LIBSHDATA + bool "libshdata" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC # libfutils + depends on BR2_INSTALL_LIBSTDCPP # libfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # libfutils + select BR2_PACKAGE_LIBFUTILS + select BR2_PACKAGE_ULOG + help + This library provides lock free shared-memory tools + + https://github.com/Parrot-Developers/libshdata + +if BR2_PACKAGE_LIBSHDATA + +config BR2_PACKAGE_LIBSHDATA_STRESS + bool "libshdata-stress binary" + depends on !BR2_STATIC_LIBS + help + Install libshdata-stress binary as well + +comment "libshdata-stress needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +endif + +comment "libshdata needs a toolchain w/ C++, threads" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libshdata/libshdata.hash b/package/libshdata/libshdata.hash new file mode 100644 index 0000000000..880404cf52 --- /dev/null +++ b/package/libshdata/libshdata.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 1ae83ac73c2b5b17c726067737b8d446b99f190e16fe6198eb464368796ecce3 libshdata-d9ec4bdba834d8f3daf6bf9aa6da374bc462961f.tar.gz +sha256 eca11a1c62fae8d64a1247d93271375baecff8396141d7ff8d89671ee7e3ed0d COPYING diff --git a/package/libshdata/libshdata.mk b/package/libshdata/libshdata.mk new file mode 100644 index 0000000000..dc0937e11e --- /dev/null +++ b/package/libshdata/libshdata.mk @@ -0,0 +1,75 @@ +################################################################################ +# +# libshdata +# +################################################################################ + +LIBSHDATA_VERSION = d9ec4bdba834d8f3daf6bf9aa6da374bc462961f +LIBSHDATA_SITE = $(call github,Parrot-Developers,libshdata,$(LIBSHDATA_VERSION)) +LIBSHDATA_LICENSE = BSD-3-Clause +LIBSHDATA_LICENSE_FILES = COPYING +LIBSHDATA_DEPENDENCIES = libfutils ulog host-alchemy +LIBSHDATA_INSTALL_STAGING = YES + +LIBSHDATA_TARGETS = libshdata +ifeq ($(BR2_PACKAGE_LIBSHDATA_STRESS),y) +LIBSHDATA_TARGETS += libshdata-stress +endif + +define LIBSHDATA_BUILD_CMDS + $(ALCHEMY_TARGET_ENV) \ + ALCHEMY_TARGET_SDK_DIRS="$(ALCHEMY_SDK_BASEDIR)/libfutils \ + $(ALCHEMY_SDK_BASEDIR)/ulog" \ + $(ALCHEMY_MAKE) $(LIBSHDATA_TARGETS) +endef + +ifeq ($(BR2_SHARED_LIBS),) +define LIBSHDATA_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata.a \ + $(1)/usr/lib/libshdata.a + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata-section-lookup.a \ + $(1)/usr/lib/libshdata-section-lookup.a +endef +else +# We should be dynamic libraries only but libshdata-section-lookup is only +# build as a static lib (include $(BUILD_STATIC_LIBRARY) in atom.mk) and it +# is needed for libshdata usage. +define LIBSHDATA_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata-section-lookup.a \ + $(1)/usr/lib/libshdata-section-lookup.a +endef +endif + +define LIBSHDATA_INSTALL_HEADERS + mkdir -p $(1)/usr/include/ + $(INSTALL) -m 644 $(@D)/include/* $(1)/usr/include/ +endef + +ifeq ($(BR2_STATIC_LIBS),) +define LIBSHDATA_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata.so* \ + $(1)/usr/lib/ +endef +endif + +ifeq ($(BR2_PACKAGE_LIBSHDATA_STRESS),y) +define LIBSHDATA_INSTALL_BIN + $(INSTALL) -D -m 755 $(@D)/alchemy-out/staging/usr/bin/libshdata-stress \ + $(1)/usr/bin/libshdata-stress +endef +endif + +define LIBSHDATA_INSTALL_TARGET_CMDS + $(call LIBSHDATA_INSTALL_SHARED_LIBS, $(TARGET_DIR)) + $(call LIBSHDATA_INSTALL_BIN, $(TARGET_DIR)) +endef + +define LIBSHDATA_INSTALL_STAGING_CMDS + $(call LIBSHDATA_INSTALL_STATIC_LIBS, $(STAGING_DIR)) + $(call LIBSHDATA_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call LIBSHDATA_INSTALL_HEADERS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libshdata, libshdata, libshdata.so, libfutils, libulog) +endef + +$(eval $(generic-package)) -- 2.33.1 From mf at go-sys.de Mon Jan 10 15:13:02 2022 From: mf at go-sys.de (Michael Fischer) Date: Mon, 10 Jan 2022 16:13:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl8723bu: bump version to d34603a39a7c925d810fe17c6e8dea5063d43a33 Message-ID: <20220110151302.21093-1-mf@go-sys.de> patch 0001: Disable concurrrent mode. This causes disconnections. Signed-off-by: Michael Fischer --- package/rtl8723bu/0001-disable_concurent_mode.patch | 12 ++++++++++++ package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 package/rtl8723bu/0001-disable_concurent_mode.patch diff --git a/package/rtl8723bu/0001-disable_concurent_mode.patch b/package/rtl8723bu/0001-disable_concurent_mode.patch new file mode 100644 index 0000000000..037b1642fc --- /dev/null +++ b/package/rtl8723bu/0001-disable_concurent_mode.patch @@ -0,0 +1,12 @@ +diff -purN a/Makefile b/Makefile +--- a/Makefile 2021-11-04 20:36:55.000000000 +0100 ++++ b/Makefile 2022-01-10 14:35:17.333934039 +0100 +@@ -18,7 +18,7 @@ EXTRA_CFLAGS += -Wno-unused-label + EXTRA_CFLAGS += -Wno-unused-parameter + EXTRA_CFLAGS += -Wno-unused-function + EXTRA_CFLAGS += -Wno-unused +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE ++#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE + + ccflags-y += -D__CHECK_ENDIAN__ + diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 04bc776a07..df990a8d63 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz +sha256 c9cde757941c88c6117560a2c350dc9c4382dcd6a313b1cae7c6e7eade7055bf rtl8723bu-d34603a39a7c925d810fe17c6e8dea5063d43a33.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index c35fad5832..e73987cfeb 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 +RTL8723BU_VERSION = d34603a39a7c925d810fe17c6e8dea5063d43a33 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) -- 2.20.1 From james.hilliard1 at gmail.com Mon Jan 10 05:41:43 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 9 Jan 2022 22:41:43 -0700 Subject: [Buildroot] [PATCH v4 2/3] package/qt5/qt5webengine: bump to version 5.15.8 In-Reply-To: <20220110054144.1294907-1-james.hilliard1@gmail.com> References: <20220110054144.1294907-1-james.hilliard1@gmail.com> Message-ID: <20220110054144.1294907-2-james.hilliard1@gmail.com> We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages. We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version. There are python3 patches available that apply to this version with minor modifications(to be added in a future patch). We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive. We need to add some new required dependencies to qt5webengine so that it will build. Signed-off-by: James Hilliard --- Changes v3 -> v4: - linker fixes Changes v2 -> v3: - add kconfig entries --- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 5 +- package/qt5/qt5webengine-chromium/Config.in | 5 + .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 23 + package/qt5/qt5webengine/Config.in | 3 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 39 +- 10 files changed, 2565 insertions(+), 2025 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/Config.in create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 143926b743..54e6f7d6a6 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -68,6 +68,7 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium/Config.in" source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..0706c3548d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5webengine-chromium/Config.in b/package/qt5/qt5webengine-chromium/Config.in new file mode 100644 index 0000000000..8ba9ad7135 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/Config.in @@ -0,0 +1,5 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5webengine source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM + bool + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 0000000000..ced431c9e9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 0000000000..103e27d889 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 0000000000..2b061815b5 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult +QT5WEBENGINE_CHROMIUM_INSTALL_TARGET = NO + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..aded684ce2 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). @@ -57,9 +58,11 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_QT5QUICKCONTROLS2 select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5BASE_EXAMPLES select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc deleted file mode 100644 index a5fdfdc1f1..0000000000 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ /dev/null @@ -1,1000 +0,0 @@ -# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ -# find src/3rdparty/ -type f \ -# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ -# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ -# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc -QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/base/third_party/cityhash/COPYING \ - src/3rdparty/chromium/base/third_party/double_conversion/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/icu/LICENSE \ - src/3rdparty/chromium/base/third_party/libevent/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/net/third_party/quiche/src/LICENSE \ - src/3rdparty/chromium/net/third_party/uri_template/LICENSE \ - src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ - src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ - src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ - src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ - src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ - src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE \ - src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/catapult/tracing/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING \ - src/3rdparty/chromium/third_party/dav1d/LICENSE \ - src/3rdparty/chromium/third_party/dawn/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ - src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/expat/src/expat/COPYING \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ - src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/flac/COPYING.GPL \ - src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ - src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/ink/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/jacoco/LICENSE \ - src/3rdparty/chromium/third_party/javalang/LICENSE \ - src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ - src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ - src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ - src/3rdparty/chromium/third_party/libipp/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/libxml/src/Copyright \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/libxslt/src/Copyright \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/lottie/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/mako/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/mesa_headers/LICENSE \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/nasm/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ - src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/perfetto/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/pffft/LICENSE \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/polymer/LICENSE.polymer \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE \ - src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ - src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/r8/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/rnnoise/COPYING \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/schema_org/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/six/LICENSE \ - src/3rdparty/chromium/third_party/six/src/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ - src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ - src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/LICENSE \ - src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ - src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/test_fonts/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/turbine/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/unrar/LICENSE \ - src/3rdparty/chromium/third_party/unrar/src/license.txt \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ - src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ - src/3rdparty/chromium/third_party/weston/LICENSE \ - src/3rdparty/chromium/third_party/weston/src/COPYING \ - src/3rdparty/chromium/third_party/weston/src/data/COPYING \ - src/3rdparty/chromium/third_party/widevine/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/LICENSE \ - src/3rdparty/chromium/third_party/wuffs/src/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE \ - src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE \ - src/3rdparty/gn/base/third_party/icu/LICENSE \ - src/3rdparty/gn/LICENSE \ - src/3rdparty/ninja/COPYING \ diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb..1d2b70c4f6 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..42f54cbbc6 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -5,18 +5,18 @@ ################################################################################ QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python + qt5declarative qt5webchannel host-bison host-flex host-freetype \ + host-gperf host-nodejs host-pkgconf host-python +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg @@ -24,7 +24,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libxkbfile xlib_libXrandr xlib_libXtst endif QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss @@ -41,24 +41,17 @@ else QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa endif -# QtWebengine's build system uses python, but only supports python2. We work -# around this by forcing python2 early in the PATH, via a python->python2 -# symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -define QT5WEBENGINE_PYTHON2_SYMLINK - mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python -endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK - QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" -define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG - sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config - chmod +x $(@D)/host-bin/host-pkg-config +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST="$(HOST_DIR)/bin/pkgconf" \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS) $(HOST_LDFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -- 2.25.1 From yann.morin.1998 at free.fr Mon Jan 10 15:40:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 16:40:30 +0100 Subject: [Buildroot] [git commit] package/python-greenlet: enable as host package Message-ID: <20220110154005.68A7682B46@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb104bc0777926528e1e3a29bea7d32320ef2173 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While currently there is no in-tree Buildroot package which depends on host-python-greenlet, we (Adder Technology) have some proprietary modules that use it as part of their builds. I've tested python-greenlet as host package and confirmed that it builds and works correctly. Someone else might require it, so I'm proposing its inclusion. Signed-off-by: Cyril Bur Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/python-greenlet/Config.in.host | 7 +++++++ package/python-greenlet/python-greenlet.mk | 1 + 3 files changed, 9 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..6e027d96c2 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,6 +69,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" + source "package/python-greenlet/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host new file mode 100644 index 0000000000..673fee8cc5 --- /dev/null +++ b/package/python-greenlet/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_GREENLET + bool "host python-greenlet" + help + Greenlets are lightweight coroutines for in-process concurrent + programming. + + https://greenlet.readthedocs.io/ diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 7b983ff0ef..3b1ef7e314 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF $(eval $(python-package)) +$(eval $(host-python-package)) From yann.morin.1998 at free.fr Mon Jan 10 15:49:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 16:49:54 +0100 Subject: [Buildroot] [PATCH v3] package/python-greenlet: enable as host package In-Reply-To: <20220110141140.77224ac0@camb691.localdomain> References: <20220110141140.77224ac0@camb691.localdomain> Message-ID: <20220110154954.GR1477939@scaer> Cyril, All, On 2022-01-10 14:11 +0000, Cyril Bur spake thusly: > While currently there is no in-tree Buildroot package which depends on > host-python-greenlet, we (Adder Technology) have some proprietary > modules that use it as part of their builds. > > I've tested python-greenlet as host package and confirmed that it builds > and works correctly. Someone else might require it, so I'm proposing its > inclusion. In all theory, host-python-greenlet should have the same dependencies toward the host that the target variant has toward the target: config BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS bool default y if BR2_arm || BR2_armeb default y if BR2_aarch64 default y if BR2_csky default y if BR2_m68k default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if BR2_riscv default y if BR2_sparc || BR2_sparc64 default y if BR2_i386 || BR2_x86_64 However, in practice, hosts that are commonly used to run Buildroot are virtually all in that list: x86 or x86_64, AArch64 (and maybe a very few arms just for the fun), PPC, and maybe a few adventurous on riscv. So in practice, we do not care. > Signed-off-by: Cyril Bur Applied to master, thanks. Regards, Yann E. MORIN. > --- > v2: Half completed commit message update - sorry > v3: Updated commit message and Config.in.host > > package/Config.in.host | 1 + > package/python-greenlet/Config.in.host | 7 +++++++ > package/python-greenlet/python-greenlet.mk | 1 + > 3 files changed, 9 insertions(+) > create mode 100644 package/python-greenlet/Config.in.host > > diff --git a/package/Config.in.host b/package/Config.in.host > index b3e00bb482..6e027d96c2 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -69,6 +69,7 @@ menu "Host utilities" > source "package/pwgen/Config.in.host" > source "package/python/Config.in.host" > source "package/python-cython/Config.in.host" > + source "package/python-greenlet/Config.in.host" > source "package/python-lxml/Config.in.host" > source "package/python-six/Config.in.host" > source "package/python-xlrd/Config.in.host" > diff --git a/package/python-greenlet/Config.in.host b/package/python-greenlet/Config.in.host > new file mode 100644 > index 0000000000..673fee8cc5 > --- /dev/null > +++ b/package/python-greenlet/Config.in.host > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_HOST_PYTHON_GREENLET > + bool "host python-greenlet" > + help > + Greenlets are lightweight coroutines for in-process concurrent > + programming. > + > + https://greenlet.readthedocs.io/ > diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk > index 7b983ff0ef..3b1ef7e314 100644 > --- a/package/python-greenlet/python-greenlet.mk > +++ b/package/python-greenlet/python-greenlet.mk > @@ -12,3 +12,4 @@ PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 > PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.34.1 > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 10 15:58:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 16:58:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl8723bu: bump version to d34603a39a7c925d810fe17c6e8dea5063d43a33 In-Reply-To: <20220110151302.21093-1-mf@go-sys.de> References: <20220110151302.21093-1-mf@go-sys.de> Message-ID: <20220110155823.GS1477939@scaer> Michael, All, On 2022-01-10 16:13 +0100, Michael Fischer spake thusly: > patch 0001: Disable concurrrent mode. This causes disconnections. That patch is missing a commit log and a sign-off for itself: # ./utils/check-package package/rtl8723bu/0001-disable_concurent_mode.patch package/rtl8723bu/0001-disable_concurent_mode.patch:0: missing Signed-off-by in the header (http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches) But see below... > Signed-off-by: Michael Fischer > --- > package/rtl8723bu/0001-disable_concurent_mode.patch | 12 ++++++++++++ > package/rtl8723bu/rtl8723bu.hash | 2 +- > package/rtl8723bu/rtl8723bu.mk | 2 +- > 3 files changed, 14 insertions(+), 2 deletions(-) > create mode 100644 package/rtl8723bu/0001-disable_concurent_mode.patch > > diff --git a/package/rtl8723bu/0001-disable_concurent_mode.patch b/package/rtl8723bu/0001-disable_concurent_mode.patch > new file mode 100644 > index 0000000000..037b1642fc > --- /dev/null > +++ b/package/rtl8723bu/0001-disable_concurent_mode.patch > @@ -0,0 +1,12 @@ > +diff -purN a/Makefile b/Makefile > +--- a/Makefile 2021-11-04 20:36:55.000000000 +0100 > ++++ b/Makefile 2022-01-10 14:35:17.333934039 +0100 > +@@ -18,7 +18,7 @@ EXTRA_CFLAGS += -Wno-unused-label > + EXTRA_CFLAGS += -Wno-unused-parameter > + EXTRA_CFLAGS += -Wno-unused-function > + EXTRA_CFLAGS += -Wno-unused > +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE > ++#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE When patching out unused code, don't comment it; just remove it. Can you fix those two issues and resubmit, plese? Regards, Yann E. MORIN. > + ccflags-y += -D__CHECK_ENDIAN__ > + > diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash > index 04bc776a07..df990a8d63 100644 > --- a/package/rtl8723bu/rtl8723bu.hash > +++ b/package/rtl8723bu/rtl8723bu.hash > @@ -1,2 +1,2 @@ > # Locally computed > -sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz > +sha256 c9cde757941c88c6117560a2c350dc9c4382dcd6a313b1cae7c6e7eade7055bf rtl8723bu-d34603a39a7c925d810fe17c6e8dea5063d43a33.tar.gz > diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk > index c35fad5832..e73987cfeb 100644 > --- a/package/rtl8723bu/rtl8723bu.mk > +++ b/package/rtl8723bu/rtl8723bu.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 > +RTL8723BU_VERSION = d34603a39a7c925d810fe17c6e8dea5063d43a33 > RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) > RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) > > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 10 16:23:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 17:23:19 +0100 Subject: [Buildroot] [PATCH] support/download: drop support for the 'none' hash Message-ID: <20220110162319.294088-1-yann.morin.1998@free.fr> Commit 1ba85b7f874d (support/download: add explicit no-hash support) introduced the 'none' hash type, in an attempt to make hash files mandatory, but not failing on archives localy generated, like those for git or svn repositories, especially for those packages where a version choice was present, which would allow for either remote archives for which we'd have a hash or VCS trees for which we could not have a hash for the localy generated archive. Indeed, back in the time, we did not have a mean to generate reproducible archives, so having a hash file without a hash for thosel ocally generated archives would trigger an error in the hash0-checking machinery. But now, low-and-behold, we do know how to generate those archives, and we have a mechanism to explicitly exclude some archives from being hash-checked (e.g. when the verison string itself can be user-provided). As such, the 'none' hash type no longer has any raison d'?tre, we do not use it in-tree, and its use in a br2-external tree is most probably inexistent (as is the use of hash files alotgether most probably). So we simply drop the support for that. Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-directory.txt | 9 +-------- support/download/check-hash | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 4ceb3fd772..6c68d7aa67 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -464,9 +464,8 @@ The format of this file is one line for each file for which to check the hash, each line with the following three fields separated by two spaces: * the type of hash, one of: -** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+, +none+ +** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+ * the hash of the file: -** for +none+, one or more non-space chars, usually just the string +xxx+ ** for +md5+, 32 hexadecimal characters ** for +sha1+, 40 hexadecimal characters ** for +sha224+, 56 hexadecimal characters @@ -500,9 +499,6 @@ target run. For a package with multiple versions (like Qt5), create the hash file in a subdirectory ++ of that package (see also xref:patch-apply-order[]). -The +none+ hash type is reserved to those archives downloaded from a -repository, like a 'git clone', a 'subversion checkout'... - The example below defines a +sha1+ and a +sha256+ published by upstream for the main +libfoo-1.2.3.tar.bz2+ tarball, an +md5+ from upstream and a locally-computed +sha256+ hashes for a binary blob, a +sha256+ for a @@ -520,9 +516,6 @@ sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo # Locally computed: sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch -# No hash for 1234: -none xxx libfoo-1234.tar.gz - # Hash for license files: sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL diff --git a/support/download/check-hash b/support/download/check-hash index fe9c10570e..5a47f49bc3 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -53,11 +53,7 @@ check_one_hash() { # Note: md5 is supported, but undocumented on purpose. # Note: sha3 is not supported, since there is currently no implementation # (the NIST has yet to publish the parameters). - # Note: 'none' means there is explicitly no hash for that file. case "${_h}" in - none) - return 0 - ;; md5|sha1) ;; sha224|sha256|sha384|sha512) ;; *) # Unknown hash, exit with error -- 2.25.1 From baruch at tkos.co.il Mon Jan 10 16:35:55 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 10 Jan 2022 18:35:55 +0200 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats In-Reply-To: <20220110131624.3639727-1-arnout@mind.be> References: <20220110131624.3639727-1-arnout@mind.be> Message-ID: <871r1fy2ca.fsf@tarshish> Hi Arnout, On Mon, Jan 10 2022, Arnout Vandecappelle (Essensium/Mind) wrote: > Bumping the version of systemd is a little more complicated than the > usual package, and it's easy to forget some of the things that need to > be done - and this has happened several times in the past. > > Add a checklist of things to worry about when updating systemd. > > Note that there are many other complicated packages that also need a lot > of attention when upgrading. However, systemd is a really critical > package so it's more important that we get that one right than, say, > valgrind. > > Cc: Norbert Lange > Cc: J?r?my ROSEN > Cc: Adam Duskett > Cc: James Hilliard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/systemd/systemd.mk | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 3811dbae42..4d82d2ab81 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -4,6 +4,18 @@ > # > ################################################################################ > > +# When updating systemd, take care of the following: > +# - Check if the requirements have changed (see README), in particular > +# arch and headers > +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD > +# - If the required kernel options have changed, update the Config.in > +# help text and the list of KCONFIG_ENABLE_OPT. > +# - Check if there are new meson_options. Make sure all options are set > +# explicitly (usually to default value). > +# - If there are new services: > +# - create new options for them (if they really are optional); > +# - create a new _USER if necessary; > +# - create new directionry (with _PERMISSIONS) if necessary. s/directionry/directory/ baruch > SYSTEMD_VERSION = 250.1 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From nolange79 at gmail.com Mon Jan 10 17:25:21 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Mon, 10 Jan 2022 18:25:21 +0100 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats In-Reply-To: <20220110131624.3639727-1-arnout@mind.be> References: <20220110131624.3639727-1-arnout@mind.be> Message-ID: Hello, Am Mo., 10. Jan. 2022 um 14:16 Uhr schrieb Arnout Vandecappelle (Essensium/Mind) : > > Bumping the version of systemd is a little more complicated than the > usual package, and it's easy to forget some of the things that need to > be done - and this has happened several times in the past. > > Add a checklist of things to worry about when updating systemd. > > Note that there are many other complicated packages that also need a lot > of attention when upgrading. However, systemd is a really critical > package so it's more important that we get that one right than, say, > valgrind. > > Cc: Norbert Lange > Cc: J?r?my ROSEN > Cc: Adam Duskett > Cc: James Hilliard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/systemd/systemd.mk | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 3811dbae42..4d82d2ab81 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -4,6 +4,18 @@ > # > ################################################################################ > > +# When updating systemd, take care of the following: > +# - Check if the requirements have changed (see README), in particular > +# arch and headers > +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD > +# - If the required kernel options have changed, update the Config.in > +# help text and the list of KCONFIG_ENABLE_OPT. > +# - Check if there are new meson_options. Make sure all options are set > +# explicitly (usually to default value). > +# - If there are new services: > +# - create new options for them (if they really are optional); > +# - create a new _USER if necessary; > +# - create new directionry (with _PERMISSIONS) if necessary. > SYSTEMD_VERSION = 250.1 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > -- > 2.31.1 > I wouldd add these: # - diff sysusers.d with the previous version # - diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) and, somewhat more cynical: # - dont bother with x.0 versions Norbert From fontaine.fabrice at gmail.com Mon Jan 10 17:35:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 18:35:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: needs wchar Message-ID: <20220110173542.1748804-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: In file included from seckey.h:11, from 3way.h:10, from 3way.cpp:5: misc.h:1528:6: error: 'wstring' in namespace 'std' does not name a type 1528 | std::wstring StringWiden(const char *str, bool throwOnError = true); | ^~~~~~~ In file included from seckey.h:11, from 3way.h:10, from 3way.cpp:5: misc.h:14:1: note: 'std::wstring' is defined in header ''; did you forget to '#include '? 13 | #include "smartptr.h" +++ |+#include 14 | #include "stdcpp.h" Fixes: - http://autobuild.buildroot.org/results/174fe03da7a40dd152703de93af6a213d9cac698 Signed-off-by: Fabrice Fontaine --- package/cryptopp/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index 4ead5339ab..feb945db2f 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_CRYPTOPP bool "cryptopp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR help A free C++ class library of cryptographic schemes -comment "cryptopp needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "cryptopp needs a toolchain w/ dynamic library, wchar" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 10 17:36:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 18:36:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: disable neon if needed Message-ID: <20220110173640.1748895-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: In file included from aria_simd.cpp:18:0: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/lib/gcc/arm-none-linux-gnueabi/4.8.3/include/arm_neon.h:32:2: error: #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h ^ Fixes: - http://autobuild.buildroot.org/results/e4fd947c118174a4fad62cbed18816f02d39ec25 Signed-off-by: Fabrice Fontaine --- package/cryptopp/cryptopp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 5e6eb9644d..4353e35e0a 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -47,6 +47,10 @@ ifneq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),y) CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_AVX2 endif +ifneq ($(BR2_ARM_CPU_HAS_NEON),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON +endif + CRYPTOPP_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ CXXFLAGS="$(CRYPTOPP_CXXFLAGS)" -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 10 17:44:11 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 18:44:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: fix build with gcc 4.8 Message-ID: <20220110174411.1761440-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c: In function 'mpi_select': /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: error: 'for' loop initial declarations are only allowed in C99 mode for( size_t i = 0; i < T_size; i++ ) ^ /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: - http://autobuild.buildroot.org/results/56ac0a8726d09eed8f45f865934fa7781a0e667a Signed-off-by: Fabrice Fontaine --- package/mbedtls/mbedtls.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 5facb99b2a..8745ff33f4 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -7,6 +7,7 @@ MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF -- 2.34.1 From yegorslists at googlemail.com Mon Jan 10 17:59:55 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 10 Jan 2022 18:59:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/avrdude: add support for Linux sysfs GPIO interface In-Reply-To: <20220110140450.GO1477939@scaer> References: <20220110085850.11095-1-yegorslists@googlemail.com> <20220110085850.11095-2-yegorslists@googlemail.com> <20220110140450.GO1477939@scaer> Message-ID: Hi Yann, all, On Mon, Jan 10, 2022 at 3:04 PM Yann E. MORIN wrote: > > Yegor, All, > > On 2022-01-10 09:58 +0100, yegorslists--- via buildroot spake thusly: > > From: Yegor Yefremov > > > > Signed-off-by: Yegor Yefremov > > --- > > package/avrdude/Config.in | 3 +++ > > package/avrdude/avrdude.mk | 6 ++++++ > > 2 files changed, 9 insertions(+) > > > > diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in > > index 89558a5ff5..57a8df66ea 100644 > > --- a/package/avrdude/Config.in > > +++ b/package/avrdude/Config.in > > @@ -17,6 +17,9 @@ config BR2_PACKAGE_AVRDUDE > > > > if BR2_PACKAGE_AVRDUDE > > > > +config BR2_PACKAGE_AVRDUDE_LINUXGPIO > > + bool "Linux sysfs GPIO interface support" > > + > > config BR2_PACKAGE_AVRDUDE_SPI > > bool "SPI support" > > default y # Backward compatibility > > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > > index accd92c1d5..3ccba80d8e 100644 > > --- a/package/avrdude/avrdude.mk > > +++ b/package/avrdude/avrdude.mk > > @@ -16,6 +16,12 @@ AVRDUDE_CONF_OPTS = --enable-linuxgpio > > AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ > > host-flex host-bison > > > > +ifeq ($(BR2_PACKAGE_AVRDUDE_LINUXGPIO),y) > > +AVRDUDE_CONF_OPTS += --enable-linuxgpio > > +else > > +AVRDUDE_CONF_OPTS += --disable-linuxgpio > > +endif > > We already have an unconditional activation of those: > > https://github.com/buildroot/buildroot/blob/master/package/avrdude/avrdude.mk#L15 > > (which you can btw. incidentally also notice as part the hunk header). My bad. I have just overlooked this setting. You can drop the patch. Regards, Yegor > So, if the intention was to be able to enable linux-gpio, then this is a > noop as they are already enabled. If the intention was to be able to > disable them, then the unconditional enable should be dropped. > > But then, does it make sense to be able to disable linux GPIO? > > And what if both SPI and GPIO are disabled? > > Regards, > Yann E. MORIN. > > > ifeq ($(BR2_PACKAGE_AVRDUDE_SPI),y) > > AVRDUDE_CONF_OPTS += --enable-linuxspi > > else > > -- > > 2.17.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From buildroot at heine.tech Mon Jan 10 18:51:40 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 10 Jan 2022 19:51:40 +0100 Subject: [Buildroot] [PATCH v5] package/networkd-dispatcher: new package Message-ID: <20220110185147.84697-1-buildroot@heine.tech> From: Michael Nosthoff via buildroot Networkd-dispatcher is a dispatcher daemon for systemd-networkd connection status changes. This daemon is similar to NetworkManager-dispatcher, but is much more limited in the types of events it supports due to the limited nature of systemd-networkd. Signed-off-by: Michael Nosthoff --- Changes v1 -> v2 - add .hash file - use tabs for DEVELOPERS indentation v2 -> v3 - bump version to 2.1 (fixes an issue with systemd 246) - resolve merge conflict in DEVELOPERS v3 -> v4 - adjust to changed dependencies of python-gobject - removed dependencies already covered by depends on BR2_PACKAGE_DBUS - sorted dependencies - resolve merge conflict in DEVELOPERS v4 -> v5 - update dependencies of gobject-introspection --- DEVELOPERS | 1 + package/Config.in | 1 + package/networkd-dispatcher/Config.in | 21 ++++++++++++++++ .../networkd-dispatcher.hash | 3 +++ .../networkd-dispatcher.mk | 25 +++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 package/networkd-dispatcher/Config.in create mode 100644 package/networkd-dispatcher/networkd-dispatcher.hash create mode 100644 package/networkd-dispatcher/networkd-dispatcher.mk diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..4b65d219c9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1991,6 +1991,7 @@ N: Michael Nosthoff F: package/grpc/ F: package/gtest/ F: package/libabseil-cpp/ +F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..23264afd9d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2294,6 +2294,7 @@ endif source "package/netstat-nat/Config.in" source "package/network-manager/Config.in" source "package/network-manager-openvpn/Config.in" + source "package/networkd-dispatcher/Config.in" source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in new file mode 100644 index 0000000000..1dfa12ba45 --- /dev/null +++ b/package/networkd-dispatcher/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_NETWORKD_DISPATCHER + bool "networkd-dispatcher" + depends on BR2_USE_WCHAR # dbus-python -> glib2 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python -> glib2 + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_DBUS # dbus-python + depends on BR2_PACKAGE_PYTHON3 # runtime, python-gobject + depends on BR2_PACKAGE_SYSTEMD_NETWORKD # runtime + select BR2_PACKAGE_DBUS_PYTHON + select BR2_PACKAGE_PYTHON_GOBJECT + help + Networkd-dispatcher is a dispatcher daemon for + systemd-networkd connection status changes. + This daemon is similar to NetworkManager-dispatcher, + but is much more limited in the types of events it + supports due to the limited nature of systemd-networkd. + + https://gitlab.com/craftyguy/networkd-dispatcher diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash new file mode 100644 index 0000000000..ca7c300783 --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk new file mode 100644 index 0000000000..4f609db73a --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# networkd-dispatcher +# +################################################################################ + +NETWORKD_DISPATCHER_VERSION = 2.1 +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE + +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d +endef + +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf +endef + +$(eval $(generic-package)) -- 2.25.1 From buildroot at heine.tech Mon Jan 10 18:51:40 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 10 Jan 2022 19:51:40 +0100 Subject: [Buildroot] [PATCH v5] package/networkd-dispatcher: new package Message-ID: <20220110185147.84697-1-buildroot@heine.tech> From: Michael Nosthoff via buildroot Networkd-dispatcher is a dispatcher daemon for systemd-networkd connection status changes. This daemon is similar to NetworkManager-dispatcher, but is much more limited in the types of events it supports due to the limited nature of systemd-networkd. Signed-off-by: Michael Nosthoff --- Changes v1 -> v2 - add .hash file - use tabs for DEVELOPERS indentation v2 -> v3 - bump version to 2.1 (fixes an issue with systemd 246) - resolve merge conflict in DEVELOPERS v3 -> v4 - adjust to changed dependencies of python-gobject - removed dependencies already covered by depends on BR2_PACKAGE_DBUS - sorted dependencies - resolve merge conflict in DEVELOPERS v4 -> v5 - update dependencies of gobject-introspection --- DEVELOPERS | 1 + package/Config.in | 1 + package/networkd-dispatcher/Config.in | 21 ++++++++++++++++ .../networkd-dispatcher.hash | 3 +++ .../networkd-dispatcher.mk | 25 +++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 package/networkd-dispatcher/Config.in create mode 100644 package/networkd-dispatcher/networkd-dispatcher.hash create mode 100644 package/networkd-dispatcher/networkd-dispatcher.mk diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..4b65d219c9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1991,6 +1991,7 @@ N: Michael Nosthoff F: package/grpc/ F: package/gtest/ F: package/libabseil-cpp/ +F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..23264afd9d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2294,6 +2294,7 @@ endif source "package/netstat-nat/Config.in" source "package/network-manager/Config.in" source "package/network-manager-openvpn/Config.in" + source "package/networkd-dispatcher/Config.in" source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in new file mode 100644 index 0000000000..1dfa12ba45 --- /dev/null +++ b/package/networkd-dispatcher/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_NETWORKD_DISPATCHER + bool "networkd-dispatcher" + depends on BR2_USE_WCHAR # dbus-python -> glib2 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python -> glib2 + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_DBUS # dbus-python + depends on BR2_PACKAGE_PYTHON3 # runtime, python-gobject + depends on BR2_PACKAGE_SYSTEMD_NETWORKD # runtime + select BR2_PACKAGE_DBUS_PYTHON + select BR2_PACKAGE_PYTHON_GOBJECT + help + Networkd-dispatcher is a dispatcher daemon for + systemd-networkd connection status changes. + This daemon is similar to NetworkManager-dispatcher, + but is much more limited in the types of events it + supports due to the limited nature of systemd-networkd. + + https://gitlab.com/craftyguy/networkd-dispatcher diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash new file mode 100644 index 0000000000..ca7c300783 --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk new file mode 100644 index 0000000000..4f609db73a --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# networkd-dispatcher +# +################################################################################ + +NETWORKD_DISPATCHER_VERSION = 2.1 +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE + +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d +endef + +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf +endef + +$(eval $(generic-package)) -- 2.25.1 From festevam at gmail.com Mon Jan 10 19:44:39 2022 From: festevam at gmail.com (Fabio Estevam) Date: Mon, 10 Jan 2022 16:44:39 -0300 Subject: [Buildroot] [PATCH] boot/uboot: bump to version 2022.01 Message-ID: <20220110194439.1809166-1-festevam@gmail.com> Signed-off-by: Fabio Estevam --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index bffb7cfb19b9..c630fc655291 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2021.10" + bool "2022.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2021.10" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 68259f69f26e..9171a794a168 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4 u-boot-2021.10.tar.bz2 +sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.25.1 From fperrad at gmail.com Mon Jan 10 19:51:31 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 10 Jan 2022 20:51:31 +0100 Subject: [Buildroot] [PATCH] configs/mx6cubox: bump Linux and U-Boot versions Message-ID: <20220110195131.78165-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- configs/mx6cubox_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index e80d99552..6ea4f6e41 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -6,8 +6,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y # Toolchain -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.70" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" @@ -32,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -- 2.32.0 From ju.o at free.fr Mon Jan 10 20:01:51 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 10 Jan 2022 21:01:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package Message-ID: <20220110200151.830192-1-ju.o@free.fr> A wrapper for the Gnu Privacy Guard (GPG or GnuPG). The gnupg module allows Python programs to make use of the functionality provided by the GNU Privacy Guard (abbreviated GPG or GnuPG). Using this module, Python programs can encrypt and decrypt data, digitally sign documents and verify digital signatures, manage (generate, list and delete) encryption keys, using Public Key Infrastructure (PKI) encryption technology based on OpenPGP. https://docs.red-dove.com/python-gnupg/ Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-gnupg/Config.in | 15 +++++++++++++++ package/python-gnupg/python-gnupg.hash | 5 +++++ package/python-gnupg/python-gnupg.mk | 13 +++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/python-gnupg/Config.in create mode 100644 package/python-gnupg/python-gnupg.hash create mode 100644 package/python-gnupg/python-gnupg.mk diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..036e752d84 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1595,6 +1595,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ F: package/python-distro/ +F: package/python-gnupg/ F: package/python-pyalsa/ N: Julien Viard de Galbert diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..af09209905 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1038,6 +1038,7 @@ menu "External python modules" source "package/python-futures/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" + source "package/python-gnupg/Config.in" source "package/python-gobject/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in new file mode 100644 index 0000000000..54f8fb6a29 --- /dev/null +++ b/package/python-gnupg/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_GNUPG + bool "python-gnupg" + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime + help + A wrapper for the Gnu Privacy Guard (GPG or GnuPG). + + The gnupg module allows Python programs to make use of the + functionality provided by the GNU Privacy Guard (abbreviated + GPG or GnuPG). Using this module, Python programs can + encrypt and decrypt data, digitally sign documents and + verify digital signatures, manage (generate, list and + delete) encryption keys, using Public Key Infrastructure + (PKI) encryption technology based on OpenPGP. + + https://docs.red-dove.com/python-gnupg/ diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash new file mode 100644 index 0000000000..fa0e8ae6e5 --- /dev/null +++ b/package/python-gnupg/python-gnupg.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-gnupg/json +md5 02c5d77b8db9dfba0741627560d89bd5 python-gnupg-0.4.8.tar.gz +sha256 b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7 python-gnupg-0.4.8.tar.gz +# Locally computed sha256 checksums +sha256 9620da3d3afdfca7dea53c4375c1507ab2d3a4af4e706827023acb49a9ec4a5e LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk new file mode 100644 index 0000000000..f16910e517 --- /dev/null +++ b/package/python-gnupg/python-gnupg.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-gnupg +# +################################################################################ + +PYTHON_GNUPG_VERSION = 0.4.8 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 +PYTHON_GNUPG_LICENSE = BSD-3-Clause +PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt +PYTHON_GNUPG_SETUP_TYPE = setuptools + +$(eval $(python-package)) -- 2.34.1 From festevam at gmail.com Mon Jan 10 20:18:10 2022 From: festevam at gmail.com (Fabio Estevam) Date: Mon, 10 Jan 2022 17:18:10 -0300 Subject: [Buildroot] [PATCH] configs/mx6sx_udoo: Bump U-Boot and kernel Message-ID: <20220110201810.2277642-1-festevam@gmail.com> Bump U-Boot to 2022.01 and kernel to 5.15.13. After the conversion to U-Boot device model, the SD card is device '1', so change the boot script accordingly. Signed-off-by: Fabio Estevam --- board/udoo/common/boot.scr.txt | 6 +++--- configs/mx6sx_udoo_neo_defconfig | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/udoo/common/boot.scr.txt b/board/udoo/common/boot.scr.txt index 7acceed0fb29..7a7d756c3c71 100644 --- a/board/udoo/common/boot.scr.txt +++ b/board/udoo/common/boot.scr.txt @@ -1,7 +1,7 @@ -setenv finduuid "part uuid mmc 0:1 uuid" +setenv finduuid "part uuid mmc 1:1 uuid" run finduuid run findfdt setenv bootargs "console=${console} root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage +load mmc 1:1 ${fdt_addr} boot/${fdtfile} +load mmc 1:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdt_addr} diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 2bdcade25296..3e1dc33bd4ba 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y @@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" -- 2.25.1 From clg at kaod.org Mon Jan 10 20:58:42 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 21:58:42 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration Message-ID: <20220110205844.815899-1-clg@kaod.org> PowerNV is the platform using the OPAL [1] firmware on OpenPOWER systems. OPAL first loads a kernel and an initramfs image based on buildroot including a second boot loader petitboot [2]. The latter does device discovery and kexecs a new Linux image from disk or network. QEMU implements PowerNV machines [3] for the POWER8, POWER9 and Power10 processors which are used for dev and tests. POWER8 images being compatible with POWER9 and Power10, simply add a single qemu_ppc64le_powernv8 board for all. The QEMU script boots directly from a nvme disk because it is simple enough but a real system would boot from a ramfs first. [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst [2] https://github.com/open-power/petitboot/ [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html Signed-off-by: C?dric Le Goater --- board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 board/qemu/ppc64le-powernv8/readme.txt create mode 100644 configs/qemu_ppc64le_powernv8_defconfig diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt new file mode 100644 index 000000000000..059f55fbc917 --- /dev/null +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig + +The login prompt will appear in the terminal window. diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig new file mode 100644 index 000000000000..d8ea6655fce0 --- /dev/null +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -0,0 +1,29 @@ +# Architecture +BR2_powerpc64le=y +BR2_powerpc_power8=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="hvc0" +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="powernv" +BR2_LINUX_KERNEL_VMLINUX=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.31.1 From clg at kaod.org Mon Jan 10 20:58:44 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 21:58:44 +0100 Subject: [Buildroot] [PATCH 3/3] package/qemu: Add support for PPC970 processors In-Reply-To: <20220110205844.815899-1-clg@kaod.org> References: <20220110205844.815899-1-clg@kaod.org> Message-ID: <20220110205844.815899-3-clg@kaod.org> PPC970 processors are well supported by the QEMU pseries and macbook machines. The latest debian 11 (big endian) runs with SMP. Re-add support. Fixes: efc67deef38c ("qemu: remove support for some PowerPC processors in host qemu") Signed-off-by: C?dric Le Goater --- package/qemu/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index df5d92112582..f9cdb9b70371 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -22,7 +22,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_xtensa default y if BR2_x86_64 depends on !BR2_x86_steamroller && !BR2_x86_core_avx2 - depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 + depends on !BR2_powerpc_620 && !BR2_powerpc_630 config BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS bool -- 2.31.1 From clg at kaod.org Mon Jan 10 21:04:02 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Mon, 10 Jan 2022 22:04:02 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration In-Reply-To: <20220110210235.817082-1-clg@kaod.org> References: <20220110210235.817082-1-clg@kaod.org> Message-ID: oops. I sent the patchset twice. Sorry for the noise. C. On 1/10/22 22:02, C?dric Le Goater wrote: > PowerNV is the platform using the OPAL [1] firmware on OpenPOWER > systems. OPAL first loads a kernel and an initramfs image based on > buildroot including a second boot loader petitboot [2]. The latter > does device discovery and kexecs a new Linux image from disk or > network. > > QEMU implements PowerNV machines [3] for the POWER8, POWER9 and > Power10 processors which are used for dev and tests. POWER8 images > being compatible with POWER9 and Power10, simply add a single > qemu_ppc64le_powernv8 board for all. > > The QEMU script boots directly from a nvme disk because it is simple > enough but a real system would boot from a ramfs first. > > [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst > [2] https://github.com/open-power/petitboot/ > [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html > > Signed-off-by: C?dric Le Goater > --- > board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ > configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++ > 2 files changed, 34 insertions(+) > create mode 100644 board/qemu/ppc64le-powernv8/readme.txt > create mode 100644 configs/qemu_ppc64le_powernv8_defconfig > > diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt > new file mode 100644 > index 000000000000..059f55fbc917 > --- /dev/null > +++ b/board/qemu/ppc64le-powernv8/readme.txt > @@ -0,0 +1,5 @@ > +Run the emulation with: > + > +qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig > + > +The login prompt will appear in the terminal window. > diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig > new file mode 100644 > index 000000000000..d8ea6655fce0 > --- /dev/null > +++ b/configs/qemu_ppc64le_powernv8_defconfig > @@ -0,0 +1,29 @@ > +# Architecture > +BR2_powerpc64le=y > +BR2_powerpc_power8=y > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="hvc0" > +BR2_SYSTEM_DHCP="eth0" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +# BR2_TARGET_ROOTFS_TAR is not set > + > +# Image > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" > + > +# Linux headers same as kernel > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > +BR2_LINUX_KERNEL_DEFCONFIG="powernv" > +BR2_LINUX_KERNEL_VMLINUX=y > + > +# host-qemu for gitlab testing > +BR2_PACKAGE_HOST_QEMU=y > +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y > From clg at kaod.org Mon Jan 10 21:02:33 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 22:02:33 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration Message-ID: <20220110210235.817082-1-clg@kaod.org> PowerNV is the platform using the OPAL [1] firmware on OpenPOWER systems. OPAL first loads a kernel and an initramfs image based on buildroot including a second boot loader petitboot [2]. The latter does device discovery and kexecs a new Linux image from disk or network. QEMU implements PowerNV machines [3] for the POWER8, POWER9 and Power10 processors which are used for dev and tests. POWER8 images being compatible with POWER9 and Power10, simply add a single qemu_ppc64le_powernv8 board for all. The QEMU script boots directly from a nvme disk because it is simple enough but a real system would boot from a ramfs first. [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst [2] https://github.com/open-power/petitboot/ [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html Signed-off-by: C?dric Le Goater --- board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 board/qemu/ppc64le-powernv8/readme.txt create mode 100644 configs/qemu_ppc64le_powernv8_defconfig diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt new file mode 100644 index 000000000000..059f55fbc917 --- /dev/null +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig + +The login prompt will appear in the terminal window. diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig new file mode 100644 index 000000000000..d8ea6655fce0 --- /dev/null +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -0,0 +1,29 @@ +# Architecture +BR2_powerpc64le=y +BR2_powerpc_power8=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="hvc0" +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="powernv" +BR2_LINUX_KERNEL_VMLINUX=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.31.1 From james.hilliard1 at gmail.com Mon Jan 10 21:13:23 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 14:13:23 -0700 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 Message-ID: <20220110211323.1828141-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 02d8900003..c9be54be05 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.60.3/meson-0.60.3.tar.gz.asc -sha256 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e meson-0.60.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz.asc +sha256 ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c meson-0.61.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e8443eacba..e63dc725bf 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.60.3 +MESON_VERSION = 0.61.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From clg at kaod.org Mon Jan 10 20:58:43 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 21:58:43 +0100 Subject: [Buildroot] [PATCH 2/3] configs/qemu: Add a ppc-bamboo configuration In-Reply-To: <20220110205844.815899-1-clg@kaod.org> References: <20220110205844.815899-1-clg@kaod.org> Message-ID: <20220110205844.815899-2-clg@kaod.org> The Bamboo board is an evaluation board for PowerPC 440EP CPUs. Signed-off-by: C?dric Le Goater --- board/qemu/ppc-bamboo/linux.fragment | 6 +++++ board/qemu/ppc-bamboo/readme.txt | 5 ++++ configs/qemu_ppc_bamboo_defconfig | 36 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 board/qemu/ppc-bamboo/linux.fragment create mode 100644 board/qemu/ppc-bamboo/readme.txt create mode 100644 configs/qemu_ppc_bamboo_defconfig diff --git a/board/qemu/ppc-bamboo/linux.fragment b/board/qemu/ppc-bamboo/linux.fragment new file mode 100644 index 000000000000..cc272d0541f0 --- /dev/null +++ b/board/qemu/ppc-bamboo/linux.fragment @@ -0,0 +1,6 @@ +# Enable virtio (blk, rng and net devices) +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_NET=y diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt new file mode 100644 index 000000000000..0b70d2fa5443 --- /dev/null +++ b/board/qemu/ppc-bamboo/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc -nographic -M bamboo -kernel vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig + +The login prompt will appear in the terminal that started Qemu. diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig new file mode 100644 index 000000000000..d6abbeb45296 --- /dev/null +++ b/configs/qemu_ppc_bamboo_defconfig @@ -0,0 +1,36 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_440fp=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" +BR2_LINUX_KERNEL_VMLINUX=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.31.1 From ps.report at gmx.net Mon Jan 10 21:39:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 22:39:00 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/ell: bump version to 0.47 Message-ID: <20220110213901.13597-1-ps.report@gmx.net> - Changelog (since 0.46, from [1]): ver 0.47: Fix issue with memory leaking from DHCP leases. Fix issue with NULL terminating of Base64 encoding. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 20b568dde4..cd724eae2d 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 f4fc647eff32f622e21f8851ed0c8b7270f4800149c91be601754e22d82cbb4d ell-0.46.tar.xz +sha256 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 4fad6e8d1b..3ce64b6f2f 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.46 +ELL_VERSION = 0.47 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Mon Jan 10 21:39:01 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 22:39:01 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/iwd: bump version to 1.21 In-Reply-To: <20220110213901.13597-1-ps.report@gmx.net> References: <20220110213901.13597-1-ps.report@gmx.net> Message-ID: <20220110213901.13597-2-ps.report@gmx.net> - add 0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch - Changelog (since 1.20, from [1]): ver 1.21: Fix issue with handling disconnect events issued by AP. Add experimental support for DPP feature. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer --- ...-declaration-of-function-explicit_bz.patch | 39 +++++++++++++++++++ package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch new file mode 100644 index 0000000000..fc1e67fe9c --- /dev/null +++ b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch @@ -0,0 +1,39 @@ +From 6805884743645d8d16186dbb0de7d9cd50cfd9a5 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 10 Jan 2022 22:20:53 +0100 +Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero + warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- add missing src/missing.h include for explicit_bzero, fixes uclibc + compile/linking + +Fixes: + + src/dpp.c:166:2: warning: implicit declaration of function ?explicit_bzero? [-Wimplicit-function-declaration] + 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); + | ^~~~~~~~~~~~~~ + +[Upstream: https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/HXV2B7L3RXDIFMKFZTI72TKZRK2IMUPP] +Signed-off-by: Peter Seiderer +--- + src/dpp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dpp.c b/src/dpp.c +index 84e89f6c..8091ded1 100644 +--- a/src/dpp.c ++++ b/src/dpp.c +@@ -30,6 +30,7 @@ + + #include "linux/nl80211.h" + ++#include "src/missing.h" + #include "src/dbus.h" + #include "src/netdev.h" + #include "src/module.h" +-- +2.34.1 + diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 58224170e6..8e34d2983f 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz +sha256 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 42f176b05b..a70da86ecc 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.20 +IWD_VERSION = 1.21 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Mon Jan 10 21:43:56 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 22:43:56 +0100 Subject: [Buildroot] [PATCH v1] package/linux-firmware: bump version to 20211216 Message-ID: <20220110214356.14562-1-ps.report@gmx.net> - update hash of WHENCE file Signed-off-by: Peter Seiderer --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 4c73374138..83275ec6d7 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 2fb22a5d7d23bf1f5800ab8152b39a00a445fbf4923de5a01b59d3f6253f0a9f linux-firmware-20210919.tar.xz +sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 a06edfd3649df6b0cbac8304d6d53f661963381f1231fd02da259806763d4162 WHENCE +sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b 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 ac45bc8282..2d103df05c 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20210919 +LINUX_FIRMWARE_VERSION = 20211216 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -- 2.34.1 From ps.report at gmx.net Mon Jan 10 22:05:15 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 23:05:15 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.1.6 Message-ID: <20220110220515.10921-1-ps.report@gmx.net> For details see [1]. [1] https://github.com/assimp/assimp/releases/tag/v5.1.6 Signed-off-by: Peter Seiderer --- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 8f6d613bb4..50f0b3e6d6 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz +sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index b5f84ef56f..766b2c9b5a 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.5 +ASSIMP_VERSION = 5.1.6 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE -- 2.34.1 From yann.morin.1998 at free.fr Mon Jan 10 22:10:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 23:10:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: <20211231202620.3521230-1-james.hilliard1@gmail.com> References: <20211231202620.3521230-1-james.hilliard1@gmail.com> Message-ID: <20220110221051.GT1477939@scaer> James, All, On 2021-12-31 13:26 -0700, James Hilliard spake thusly: > The zynq-boot-bin.py script is no longer maintained upstream, so move > it to support/scripts/zynq-boot-bin.py and port to python3. > > The python3 version produces the same output as the original python2 > version. So, zynq-boot-bin.py has disapeared in upstream repository [0] somewhere between v2015.4 and v2016.1 (they are mreging branches here and there, and git-bisect gets lost and finds spurious bad commits... meh...) Use of zynq-boot-bin.py in Buildroot is guarded by BR2_TARGET_UBOOT_ZYNQ_IMAGE and none of our defconfigs, not even any of our 5 zynq defconfigs. In 2016, with commit 6b669b61a84f (zynq_microzed: bump U-Boot to xilinx-v2016.2), we eventually got rid of the latest defconfig that used BR2_TARGET_UBOOT_ZYNQ_IMAGE. What's more, in commit 6dd5a33c485c (zynq_zed: bump U-Boot to xilinx-v2016.2), Masahiro stated: - Replace BR2_TARGET_UBOOT_ZYNQ_IMAGE with BR2_TARGET_UBOOT_SPL_NAME since U-Boot can natively generate the Zynq boot image now. The Zynq image support for mkimage tool was upstreamed at v2016.01 (so xilinx-v2016.1 as well), so no additional tool is needed any more. So I wonder if it even makes sense to keep package/zynq-boot-bin now. [0] https://github.com/Xilinx/u-boot-xlnx Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > boot/uboot/uboot.mk | 6 +- > package/zynq-boot-bin/zynq-boot-bin.hash | 2 - > package/zynq-boot-bin/zynq-boot-bin.mk | 22 --- > support/scripts/zynq-boot-bin.py | 230 +++++++++++++++++++++++ > 4 files changed, 233 insertions(+), 27 deletions(-) > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk > create mode 100755 support/scripts/zynq-boot-bin.py > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 574fc7089a..9ff2ccda68 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -434,12 +434,12 @@ endif > > ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y) > define UBOOT_GENERATE_ZYNQ_IMAGE > - $(HOST_DIR)/bin/python2 \ > - $(HOST_DIR)/bin/zynq-boot-bin.py \ > + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \ > + $(TOPDIR)/support/scripts/zynq-boot-bin.py \ > -u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \ > -o $(BINARIES_DIR)/BOOT.BIN > endef > -UBOOT_DEPENDENCIES += host-zynq-boot-bin > +UBOOT_DEPENDENCIES += host-python3 > UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE > endif > > diff --git a/package/zynq-boot-bin/zynq-boot-bin.hash b/package/zynq-boot-bin/zynq-boot-bin.hash > deleted file mode 100644 > index 0bc23de197..0000000000 > --- a/package/zynq-boot-bin/zynq-boot-bin.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# From https://raw.githubusercontent.com/Xilinx/u-boot-xlnx > -sha1 940331ee02b0007099effa61e382fe7ea4174054 zynq-boot-bin.py > diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk > deleted file mode 100644 > index deba5f4096..0000000000 > --- a/package/zynq-boot-bin/zynq-boot-bin.mk > +++ /dev/null > @@ -1,22 +0,0 @@ > -################################################################################ > -# > -# zynq-boot-bin > -# > -################################################################################ > - > -ZYNQ_BOOT_BIN_VERSION = 2015.1 > -ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py > -ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/xilinx-v$(ZYNQ_BOOT_BIN_VERSION)/tools > -ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ > - > -HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python > - > -define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS > - cp $(HOST_ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) > -endef > - > -define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS > - $(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/bin/$(ZYNQ_BOOT_BIN_SOURCE) > -endef > - > -$(eval $(host-generic-package)) > diff --git a/support/scripts/zynq-boot-bin.py b/support/scripts/zynq-boot-bin.py > new file mode 100755 > index 0000000000..f7fb18225d > --- /dev/null > +++ b/support/scripts/zynq-boot-bin.py > @@ -0,0 +1,230 @@ > +#!/usr/bin/env python3 > +# -*- coding: utf-8 -*- > +# Copyright (C) 2014, Xilinx.inc. > +# > +# Hack origin version and just take the part which generate boot.bin > +# for U-BOOT SPL. > +# > +# Copyright (C) 2013, Elphel.inc. > +# pre-u-boot configuration of the Xilinx Zynq(R) SoC > +# This program is free software: you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation, either version 3 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see . > + > +__author__ = "Andrey Filippov" > +__copyright__ = "Copyright 2013, Elphel, Inc." > +__license__ = "GPL" > +__version__ = "3.0+" > +__maintainer__ = "Andrey Filippov" > +__email__ = "andrey at elphel.com" > +__status__ = "Development" > +import os > +import struct > +import sys, getopt > +from functools import reduce > + > +inputfile = '' > +outputfile = '' > +argv = sys.argv[1:] > +try: > + opts, args = getopt.getopt(argv,"hu:o:",["uboot=","outfile="]) > +except getopt.GetoptError: > + print('test.py -u -o ') > + sys.exit(2) > + > +if len(argv) == 0: > + print('test.py -u -o ') > + sys.exit() > + > +for opt, arg in opts: > + if opt == '-h': > + print('test.py -u -o ') > + sys.exit() > + elif opt in ("-u", "--uboot"): > + inputfile = arg > + elif opt in ("-o", "--outfile"): > + outputfile = arg > +print('Input file is:', inputfile) > +print('Output file is:', outputfile) > + > +exit > + > +ACCESSIBLE_REGISTERS=((0xe0001000,0xe0001fff), # UART1 controller registers > + (0xe000d000,0xe000efff), # QUAD SPI controller registers > + (0xe0100004,0xe0100057), # SDIO 0 controller registers > + (0xe0100059,0xe0100fff), # SDIO 0 controller registers > + (0xe000e000,0xe000efff), # SMC controller > + (0xf8006000,0xf8006fff), # DDR controller > + # SLCR_LOCK disables all (0xf8000000,0xf8000b74), but it is locked at reset seems to be unlocked, http://www.xilinx.com/support/answers/47570.html > + #prohibited: SLCR_SCL, SLCR_LOCK, SLCR_UNLOCK, SLCR_STA > + (0xf8000100,0xf80001b0), # SLCR registers > + #DOes not seem to be any gap between 0xf80001b0 and 0xf80001b4 > + (0xf80001b4,0xf80001ff), # SLCR registers > + #prohibited SLCR_PSS_RST_CTRL 0xf8000200 > + (0xf8000204,0xf8000234), # SLCR registers - is SLCR_SMC_RST_CTRL 0xf8000234 also prohibited? > + #prohibited? SLCR_OCM_RST_CTRL 0xf8000238 SLCR_FPGA_RST_CTRL 0xf8000240 > + (0xf800024c,0xf800024c), # SLCR registers SLCR_AWDT_CTRL - watchdog timer reset control > + #prohibited SLSR_REBOOT_STATUS 0xf8000258, SLCR_BOOT_MODE 0xf800025c, SLCR_APU_CTRL 0xf8000300, > + (0xf8000304,0xf8000834), # SLCR registers SLCR_AWDT_CLK_SEL, DDR, MIO > + #prohibited SLCR_LVL_SHFTR_ON 0xf8000900, SLCR_OCM_CFG 0xf8000910, > + (0xf8000a00,0xf8000a8c), # SLCR registers All shown "reserved" ??? > + (0xf8000ab0,0xf8000b74)) # SLCR registers iostd, voltages, - more DDR stuff > + > +def verify_register_accessible(address): > + for interval in ACCESSIBLE_REGISTERS: > + if (address >= interval[0]) and (address <= interval[1]): > + print('Register accessible:' , hex(interval[0]),'<=', hex(address), '<=', hex(interval[1])) > + return True > + else: > + return False > + > +def image_generator (image, > + reg_sets, # registers, > + options, > + user_def, > + ocm_offset, > + ocm_len, > + start_exec): > + reserved0044=0; > + > + rfi_word=0xeafffffe #from actual image > + waddr=0 > + for _ in range (0x20//4): > + image[waddr]=rfi_word # fill reserved for interrupts fields > + waddr+=1 > + #width detection > + image[waddr]=0xaa995566 # offset 0x20 > + waddr+=1 > + > + #image identification > + image[waddr]=0x584c4e58 # offset 0x24, XLNX > + waddr+=1 > + > + #encryption status > + image[waddr]=0x0 # offset 0x28, no encryption > + waddr+=1 > + > + #User defined word > + image[waddr]=user_def # offset 0x2c > + waddr+=1 > + > + #ocm_offset > + if ocm_offset<0x8c0: > + print('Start offset should be >= 0x8c0, specified', hex(ocm_offset)) > + exit (ERROR_DEFS['HEAD']) > + elif (ocm_offset & 0x3f) != 0: > + print('Start offset should be 64-bytes aligned, specified', hex(ocm_offset)) > + exit (ERROR_DEFS['HEAD']) > + image[waddr]=ocm_offset # offset 0x30 > + waddr+=1 > + > + #ocm_len > + if ocm_len>0x30000: > + print('Loaded to the OCM image should fit into 3 mapped pages of OCM - 192K (0x30000), specified ',hex(ocm_len)) > + exit (ERROR_DEFS['HEAD']) > + image[waddr]=ocm_len # offset 0x34 > + waddr+=1 > + > + #reserved 0 > + image[waddr]=0 # offset 0x38 > + waddr+=1 > + > + #start_exec > + if (start_exec>0x30000) or (start_exec<0): > + print('Start address is relative to OCM and should fit there - in 192K (0x30000), specified ',hex(start_exec)) > + exit (ERROR_DEFS['HEAD']) > + image[waddr]=start_exec # offset 0x3c > + waddr+=1 > + > + #img_len == ocm_len for unsecure images > + img_len = ocm_len > + image[waddr]=img_len # offset 0x40 > + waddr+=1 > + > + #reserved 0 > + image[waddr]=reserved0044 #0 # offset 0x44 > + waddr+=1 > + > + #calculate image checksum > + def add (x,y): return x+y > + checksum=(reduce(add,image[0x20//4:0x48//4]) ^ 0xffffffff) & 0xffffffff > + image[waddr]=checksum # offset 0x48 > + waddr+=1 > + print('After checksum waddr=',hex(waddr),' byte addr=',hex(4*waddr)) > + > + > + #initialize registers > + print('Number of registers to initialize',len(reg_sets)) > + if len (reg_sets)>256: > + print('Too many registers to initialize, only 256 allowed,',len(reg_sets),'> 256') > + waddr=0xa0//4 > + # new_sets.append((addr,data,mask,self.module_name,register_name,self.defs[register_name])) > + > + for register in reg_sets: > + op=register[0] > + addr=register[1] > + data=register[2] > + if (op != 's'): > + raise Exception ('Can not test registers (0x%08x) in RBL, it should be done in user code'%addr) > + if not verify_register_accessible (addr): > + print('Tried to set non-accessible register', hex(addr),' with data ', hex(data)) > + exit (ERROR_DEFS['NONACCESSIBLE_REGISTER']) > + image[waddr]=addr > + waddr+=1 > + image[waddr]=data > + waddr+=1 > + #Fill in FFs for unused registers > + while waddr < (0x8c0//4): > + image[waddr]=0xffffffff > + waddr+=1 > + image[waddr]=0 > + waddr+=1 > + > +if (inputfile): > + try: > + uboot_image_len=os.path.getsize(inputfile) > + print('Using %s to get image length - it is %i (0x%x) bytes'%(os.path.abspath(inputfile),uboot_image_len,uboot_image_len)) > + except: > + print('Specified u-boot.bin file: %s (%s) not found'%(inputfile,os.path.abspath(inputfile))) > + sys.exit() > +else: > + uboot_image_len=int(raw_options['CONFIG_EZYNQ_BOOT_OCM_IMAGE_LENGTH'],0) > + print('No u-boot.bin path specified, using provided CONFIG_EZYNQ_BOOT_OCM_IMAGE_LENGTH as image size of %i (0x%x) bytes for the RBL header'%(uboot_image_len,uboot_image_len)) > + > +image =[ 0 for k in range (0x8c0//4)] > +reg_sets=[] > +num_rbl_regs=0 > + > +raw_configs="" > +raw_options={} > + > + > +image_generator (image, > + reg_sets[:num_rbl_regs], # > + #registers, > + raw_options, > + 0x1010000, # user_def > + 0x8c0, # ocm_offset, > + uboot_image_len, #ocm_len, > + 0) #start_exec) > + > +if outputfile: > + print('Generating binary output ',os.path.abspath(outputfile)) > + bf=open(outputfile,'wb') > + data=struct.pack('I' * len(image), *image) > + bf.write(data) > + > + spl=open(inputfile,'rb') > + bf.write(spl.read()) > + > + bf.close() > + spl.close() > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From clg at kaod.org Mon Jan 10 21:02:34 2022 From: clg at kaod.org (=?UTF-8?q?C=C3=A9dric=20Le=20Goater?=) Date: Mon, 10 Jan 2022 22:02:34 +0100 Subject: [Buildroot] [PATCH 2/3] configs/qemu: Add a ppc-bamboo configuration In-Reply-To: <20220110210235.817082-1-clg@kaod.org> References: <20220110210235.817082-1-clg@kaod.org> Message-ID: <20220110210235.817082-2-clg@kaod.org> The Bamboo board is an evaluation board for PowerPC 440EP CPUs. Signed-off-by: C?dric Le Goater --- board/qemu/ppc-bamboo/linux.fragment | 6 +++++ board/qemu/ppc-bamboo/readme.txt | 5 ++++ configs/qemu_ppc_bamboo_defconfig | 36 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 board/qemu/ppc-bamboo/linux.fragment create mode 100644 board/qemu/ppc-bamboo/readme.txt create mode 100644 configs/qemu_ppc_bamboo_defconfig diff --git a/board/qemu/ppc-bamboo/linux.fragment b/board/qemu/ppc-bamboo/linux.fragment new file mode 100644 index 000000000000..cc272d0541f0 --- /dev/null +++ b/board/qemu/ppc-bamboo/linux.fragment @@ -0,0 +1,6 @@ +# Enable virtio (blk, rng and net devices) +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_NET=y diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt new file mode 100644 index 000000000000..0b70d2fa5443 --- /dev/null +++ b/board/qemu/ppc-bamboo/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc -nographic -M bamboo -kernel vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig + +The login prompt will appear in the terminal that started Qemu. diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig new file mode 100644 index 000000000000..d6abbeb45296 --- /dev/null +++ b/configs/qemu_ppc_bamboo_defconfig @@ -0,0 +1,36 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_440fp=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" +BR2_LINUX_KERNEL_VMLINUX=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.31.1 From james.hilliard1 at gmail.com Mon Jan 10 22:18:56 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 15:18:56 -0700 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: <20220110221051.GT1477939@scaer> References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> Message-ID: On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: > > James, All, > > On 2021-12-31 13:26 -0700, James Hilliard spake thusly: > > The zynq-boot-bin.py script is no longer maintained upstream, so move > > it to support/scripts/zynq-boot-bin.py and port to python3. > > > > The python3 version produces the same output as the original python2 > > version. > > So, zynq-boot-bin.py has disapeared in upstream repository [0] somewhere > between v2015.4 and v2016.1 (they are mreging branches here and there, > and git-bisect gets lost and finds spurious bad commits... meh...) > > Use of zynq-boot-bin.py in Buildroot is guarded by BR2_TARGET_UBOOT_ZYNQ_IMAGE > and none of our defconfigs, not even any of our 5 zynq defconfigs. In 2016, > with commit 6b669b61a84f (zynq_microzed: bump U-Boot to xilinx-v2016.2), > we eventually got rid of the latest defconfig that used > BR2_TARGET_UBOOT_ZYNQ_IMAGE. > > What's more, in commit 6dd5a33c485c (zynq_zed: bump U-Boot to > xilinx-v2016.2), Masahiro stated: > > - Replace BR2_TARGET_UBOOT_ZYNQ_IMAGE with BR2_TARGET_UBOOT_SPL_NAME > since U-Boot can natively generate the Zynq boot image now. The > Zynq image support for mkimage tool was upstreamed at v2016.01 > (so xilinx-v2016.1 as well), so no additional tool is needed > any more. Yeah, it's somewhat unclear if this is equivalent to what the zynq-boot-bin script does. > > So I wonder if it even makes sense to keep package/zynq-boot-bin now. Well if someone is using an older uboot that doesn't have the generation capability integrated then it's probably still needed right? > > [0] https://github.com/Xilinx/u-boot-xlnx > > Regards, > Yann E. MORIN. > > > Signed-off-by: James Hilliard > > --- > > boot/uboot/uboot.mk | 6 +- > > package/zynq-boot-bin/zynq-boot-bin.hash | 2 - > > package/zynq-boot-bin/zynq-boot-bin.mk | 22 --- > > support/scripts/zynq-boot-bin.py | 230 +++++++++++++++++++++++ > > 4 files changed, 233 insertions(+), 27 deletions(-) > > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash > > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk > > create mode 100755 support/scripts/zynq-boot-bin.py > > > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index 574fc7089a..9ff2ccda68 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -434,12 +434,12 @@ endif > > > > ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y) > > define UBOOT_GENERATE_ZYNQ_IMAGE > > - $(HOST_DIR)/bin/python2 \ > > - $(HOST_DIR)/bin/zynq-boot-bin.py \ > > + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \ > > + $(TOPDIR)/support/scripts/zynq-boot-bin.py \ > > -u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \ > > -o $(BINARIES_DIR)/BOOT.BIN > > endef > > -UBOOT_DEPENDENCIES += host-zynq-boot-bin > > +UBOOT_DEPENDENCIES += host-python3 > > UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE > > endif > > > > diff --git a/package/zynq-boot-bin/zynq-boot-bin.hash b/package/zynq-boot-bin/zynq-boot-bin.hash > > deleted file mode 100644 > > index 0bc23de197..0000000000 > > --- a/package/zynq-boot-bin/zynq-boot-bin.hash > > +++ /dev/null > > @@ -1,2 +0,0 @@ > > -# From https://raw.githubusercontent.com/Xilinx/u-boot-xlnx > > -sha1 940331ee02b0007099effa61e382fe7ea4174054 zynq-boot-bin.py > > diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk > > deleted file mode 100644 > > index deba5f4096..0000000000 > > --- a/package/zynq-boot-bin/zynq-boot-bin.mk > > +++ /dev/null > > @@ -1,22 +0,0 @@ > > -################################################################################ > > -# > > -# zynq-boot-bin > > -# > > -################################################################################ > > - > > -ZYNQ_BOOT_BIN_VERSION = 2015.1 > > -ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py > > -ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/xilinx-v$(ZYNQ_BOOT_BIN_VERSION)/tools > > -ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ > > - > > -HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python > > - > > -define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS > > - cp $(HOST_ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) > > -endef > > - > > -define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS > > - $(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/bin/$(ZYNQ_BOOT_BIN_SOURCE) > > -endef > > - > > -$(eval $(host-generic-package)) > > diff --git a/support/scripts/zynq-boot-bin.py b/support/scripts/zynq-boot-bin.py > > new file mode 100755 > > index 0000000000..f7fb18225d > > --- /dev/null > > +++ b/support/scripts/zynq-boot-bin.py > > @@ -0,0 +1,230 @@ > > +#!/usr/bin/env python3 > > +# -*- coding: utf-8 -*- > > +# Copyright (C) 2014, Xilinx.inc. > > +# > > +# Hack origin version and just take the part which generate boot.bin > > +# for U-BOOT SPL. > > +# > > +# Copyright (C) 2013, Elphel.inc. > > +# pre-u-boot configuration of the Xilinx Zynq(R) SoC > > +# This program is free software: you can redistribute it and/or modify > > +# it under the terms of the GNU General Public License as published by > > +# the Free Software Foundation, either version 3 of the License, or > > +# (at your option) any later version. > > +# > > +# This program is distributed in the hope that it will be useful, > > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > +# GNU General Public License for more details. > > +# > > +# You should have received a copy of the GNU General Public License > > +# along with this program. If not, see . > > + > > +__author__ = "Andrey Filippov" > > +__copyright__ = "Copyright 2013, Elphel, Inc." > > +__license__ = "GPL" > > +__version__ = "3.0+" > > +__maintainer__ = "Andrey Filippov" > > +__email__ = "andrey at elphel.com" > > +__status__ = "Development" > > +import os > > +import struct > > +import sys, getopt > > +from functools import reduce > > + > > +inputfile = '' > > +outputfile = '' > > +argv = sys.argv[1:] > > +try: > > + opts, args = getopt.getopt(argv,"hu:o:",["uboot=","outfile="]) > > +except getopt.GetoptError: > > + print('test.py -u -o ') > > + sys.exit(2) > > + > > +if len(argv) == 0: > > + print('test.py -u -o ') > > + sys.exit() > > + > > +for opt, arg in opts: > > + if opt == '-h': > > + print('test.py -u -o ') > > + sys.exit() > > + elif opt in ("-u", "--uboot"): > > + inputfile = arg > > + elif opt in ("-o", "--outfile"): > > + outputfile = arg > > +print('Input file is:', inputfile) > > +print('Output file is:', outputfile) > > + > > +exit > > + > > +ACCESSIBLE_REGISTERS=((0xe0001000,0xe0001fff), # UART1 controller registers > > + (0xe000d000,0xe000efff), # QUAD SPI controller registers > > + (0xe0100004,0xe0100057), # SDIO 0 controller registers > > + (0xe0100059,0xe0100fff), # SDIO 0 controller registers > > + (0xe000e000,0xe000efff), # SMC controller > > + (0xf8006000,0xf8006fff), # DDR controller > > + # SLCR_LOCK disables all (0xf8000000,0xf8000b74), but it is locked at reset seems to be unlocked, http://www.xilinx.com/support/answers/47570.html > > + #prohibited: SLCR_SCL, SLCR_LOCK, SLCR_UNLOCK, SLCR_STA > > + (0xf8000100,0xf80001b0), # SLCR registers > > + #DOes not seem to be any gap between 0xf80001b0 and 0xf80001b4 > > + (0xf80001b4,0xf80001ff), # SLCR registers > > + #prohibited SLCR_PSS_RST_CTRL 0xf8000200 > > + (0xf8000204,0xf8000234), # SLCR registers - is SLCR_SMC_RST_CTRL 0xf8000234 also prohibited? > > + #prohibited? SLCR_OCM_RST_CTRL 0xf8000238 SLCR_FPGA_RST_CTRL 0xf8000240 > > + (0xf800024c,0xf800024c), # SLCR registers SLCR_AWDT_CTRL - watchdog timer reset control > > + #prohibited SLSR_REBOOT_STATUS 0xf8000258, SLCR_BOOT_MODE 0xf800025c, SLCR_APU_CTRL 0xf8000300, > > + (0xf8000304,0xf8000834), # SLCR registers SLCR_AWDT_CLK_SEL, DDR, MIO > > + #prohibited SLCR_LVL_SHFTR_ON 0xf8000900, SLCR_OCM_CFG 0xf8000910, > > + (0xf8000a00,0xf8000a8c), # SLCR registers All shown "reserved" ??? > > + (0xf8000ab0,0xf8000b74)) # SLCR registers iostd, voltages, - more DDR stuff > > + > > +def verify_register_accessible(address): > > + for interval in ACCESSIBLE_REGISTERS: > > + if (address >= interval[0]) and (address <= interval[1]): > > + print('Register accessible:' , hex(interval[0]),'<=', hex(address), '<=', hex(interval[1])) > > + return True > > + else: > > + return False > > + > > +def image_generator (image, > > + reg_sets, # registers, > > + options, > > + user_def, > > + ocm_offset, > > + ocm_len, > > + start_exec): > > + reserved0044=0; > > + > > + rfi_word=0xeafffffe #from actual image > > + waddr=0 > > + for _ in range (0x20//4): > > + image[waddr]=rfi_word # fill reserved for interrupts fields > > + waddr+=1 > > + #width detection > > + image[waddr]=0xaa995566 # offset 0x20 > > + waddr+=1 > > + > > + #image identification > > + image[waddr]=0x584c4e58 # offset 0x24, XLNX > > + waddr+=1 > > + > > + #encryption status > > + image[waddr]=0x0 # offset 0x28, no encryption > > + waddr+=1 > > + > > + #User defined word > > + image[waddr]=user_def # offset 0x2c > > + waddr+=1 > > + > > + #ocm_offset > > + if ocm_offset<0x8c0: > > + print('Start offset should be >= 0x8c0, specified', hex(ocm_offset)) > > + exit (ERROR_DEFS['HEAD']) > > + elif (ocm_offset & 0x3f) != 0: > > + print('Start offset should be 64-bytes aligned, specified', hex(ocm_offset)) > > + exit (ERROR_DEFS['HEAD']) > > + image[waddr]=ocm_offset # offset 0x30 > > + waddr+=1 > > + > > + #ocm_len > > + if ocm_len>0x30000: > > + print('Loaded to the OCM image should fit into 3 mapped pages of OCM - 192K (0x30000), specified ',hex(ocm_len)) > > + exit (ERROR_DEFS['HEAD']) > > + image[waddr]=ocm_len # offset 0x34 > > + waddr+=1 > > + > > + #reserved 0 > > + image[waddr]=0 # offset 0x38 > > + waddr+=1 > > + > > + #start_exec > > + if (start_exec>0x30000) or (start_exec<0): > > + print('Start address is relative to OCM and should fit there - in 192K (0x30000), specified ',hex(start_exec)) > > + exit (ERROR_DEFS['HEAD']) > > + image[waddr]=start_exec # offset 0x3c > > + waddr+=1 > > + > > + #img_len == ocm_len for unsecure images > > + img_len = ocm_len > > + image[waddr]=img_len # offset 0x40 > > + waddr+=1 > > + > > + #reserved 0 > > + image[waddr]=reserved0044 #0 # offset 0x44 > > + waddr+=1 > > + > > + #calculate image checksum > > + def add (x,y): return x+y > > + checksum=(reduce(add,image[0x20//4:0x48//4]) ^ 0xffffffff) & 0xffffffff > > + image[waddr]=checksum # offset 0x48 > > + waddr+=1 > > + print('After checksum waddr=',hex(waddr),' byte addr=',hex(4*waddr)) > > + > > + > > + #initialize registers > > + print('Number of registers to initialize',len(reg_sets)) > > + if len (reg_sets)>256: > > + print('Too many registers to initialize, only 256 allowed,',len(reg_sets),'> 256') > > + waddr=0xa0//4 > > + # new_sets.append((addr,data,mask,self.module_name,register_name,self.defs[register_name])) > > + > > + for register in reg_sets: > > + op=register[0] > > + addr=register[1] > > + data=register[2] > > + if (op != 's'): > > + raise Exception ('Can not test registers (0x%08x) in RBL, it should be done in user code'%addr) > > + if not verify_register_accessible (addr): > > + print('Tried to set non-accessible register', hex(addr),' with data ', hex(data)) > > + exit (ERROR_DEFS['NONACCESSIBLE_REGISTER']) > > + image[waddr]=addr > > + waddr+=1 > > + image[waddr]=data > > + waddr+=1 > > + #Fill in FFs for unused registers > > + while waddr < (0x8c0//4): > > + image[waddr]=0xffffffff > > + waddr+=1 > > + image[waddr]=0 > > + waddr+=1 > > + > > +if (inputfile): > > + try: > > + uboot_image_len=os.path.getsize(inputfile) > > + print('Using %s to get image length - it is %i (0x%x) bytes'%(os.path.abspath(inputfile),uboot_image_len,uboot_image_len)) > > + except: > > + print('Specified u-boot.bin file: %s (%s) not found'%(inputfile,os.path.abspath(inputfile))) > > + sys.exit() > > +else: > > + uboot_image_len=int(raw_options['CONFIG_EZYNQ_BOOT_OCM_IMAGE_LENGTH'],0) > > + print('No u-boot.bin path specified, using provided CONFIG_EZYNQ_BOOT_OCM_IMAGE_LENGTH as image size of %i (0x%x) bytes for the RBL header'%(uboot_image_len,uboot_image_len)) > > + > > +image =[ 0 for k in range (0x8c0//4)] > > +reg_sets=[] > > +num_rbl_regs=0 > > + > > +raw_configs="" > > +raw_options={} > > + > > + > > +image_generator (image, > > + reg_sets[:num_rbl_regs], # > > + #registers, > > + raw_options, > > + 0x1010000, # user_def > > + 0x8c0, # ocm_offset, > > + uboot_image_len, #ocm_len, > > + 0) #start_exec) > > + > > +if outputfile: > > + print('Generating binary output ',os.path.abspath(outputfile)) > > + bf=open(outputfile,'wb') > > + data=struct.pack('I' * len(image), *image) > > + bf.write(data) > > + > > + spl=open(inputfile,'rb') > > + bf.write(spl.read()) > > + > > + bf.close() > > + spl.close() > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 10 22:28:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 10 Jan 2022 23:28:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> Message-ID: <20220110222808.GU1477939@scaer> James, All, On 2022-01-10 15:18 -0700, James Hilliard spake thusly: > On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: [--SNIP--] > > So I wonder if it even makes sense to keep package/zynq-boot-bin now. > Well if someone is using an older uboot that doesn't have the > generation capability > integrated then it's probably still needed right? But then, they would have that tool in their uboot tree, and then nothing would prevent them from running it as a post-build (or post-image) script. Yes, they would need to have a python2 on their host. But that will be the case if they stick to such older tools which may break on more recent systems, not just uboot... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Mon Jan 10 22:31:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 15:31:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: <20220110222808.GU1477939@scaer> References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> <20220110222808.GU1477939@scaer> Message-ID: On Mon, Jan 10, 2022 at 3:28 PM Yann E. MORIN wrote: > > James, All, > > On 2022-01-10 15:18 -0700, James Hilliard spake thusly: > > On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: > [--SNIP--] > > > So I wonder if it even makes sense to keep package/zynq-boot-bin now. > > Well if someone is using an older uboot that doesn't have the > > generation capability > > integrated then it's probably still needed right? > > But then, they would have that tool in their uboot tree, and then > nothing would prevent them from running it as a post-build (or > post-image) script. > > Yes, they would need to have a python2 on their host. But that will be > the case if they stick to such older tools which may break on more > recent systems, not just uboot... Yeah, the advantage here is that it works with python3 as is with older uboot versions. I guess the main issue is that vendor uboot trees are often ancient and rarely updated so this would be mostly useful for those situations. > > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From ricardo.martincoski at gmail.com Mon Jan 10 22:42:07 2022 From: ricardo.martincoski at gmail.com (ricardo.martincoski at gmail.com) Date: Mon, 10 Jan 2022 19:42:07 -0300 Subject: [Buildroot] [PATCH-next 1/4] utils/checkpackagelib: add unit tests References: <30b13507-5744-de89-0e04-503e264bc1e5@smile.fr> Message-ID: <61dcb63fc08f3_8fcf9ec-3fa@xultri.mail> Hello Romain, On Sat, Jan 08, 2022 at 07:37 PM, Romain Naour wrote: > Hello Ricardo, > > Le 05/12/2021 ? 11:53, Ricardo Martincoski a ?crit?: >> So anyone willing to contribute to check-package can run all tests in >> less than 1 second by using: >> $ python3 -m pytest -v utils/checkpackagelib/ >> >> Most test cases are in the form: >> @pytest.mark.parametrize('testname,filename,string,expected', function) >> - testname: a short description of the scenario tested, added in order >> to improve readability of the log when some tests fail >> - filename: the filename the check-package function being tested thinks >> it is testing >> - string: the content of the file being sent to the function under test >> - expect: all expected warnings that a given function from >> check-package should generate for a given file named filename and >> with string as its content. > > I spend some time to review this patch to find something to say :) Thank you for your time. I imagine how boring was to review this patch :) > > Actually the test_lib_hash tests are not checking with the new spacing > convention we want to use in .hash files. > > I applied this patch [1] after your series and some tests failed. Now it landed on master. > > I would recommand to use the new spacing convention by default in this testsuite. Sure. I will send v2. Regards, Ricardo From ricardo.martincoski at gmail.com Mon Jan 10 22:43:13 2022 From: ricardo.martincoski at gmail.com (ricardo.martincoski at gmail.com) Date: Mon, 10 Jan 2022 19:43:13 -0300 Subject: [Buildroot] [PATCH] support/download: drop support for the 'none' hash References: <20220110162319.294088-1-yann.morin.1998@free.fr> Message-ID: <61dcb681410a7_8fcfa78-19a@xultri.mail> Hello Yann, On Mon, Jan 10, 2022 at 01:23 PM, Yann E. MORIN wrote: [snip] > --- > docs/manual/adding-packages-directory.txt | 9 +-------- > support/download/check-hash | 4 ---- > 2 files changed, 1 insertion(+), 12 deletions(-) Another file to change: utils/checkpackagelib/lib_hash.py: if htype == "none": Regards, Ricardo From luca at lucaceresoli.net Mon Jan 10 22:46:30 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 10 Jan 2022 23:46:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> <20220110222808.GU1477939@scaer> Message-ID: <2846b399-f095-acb3-c086-e44b3b74698e@lucaceresoli.net> Hi James, Yann, On 10/01/22 23:31, James Hilliard wrote: > On Mon, Jan 10, 2022 at 3:28 PM Yann E. MORIN wrote: >> >> James, All, >> >> On 2022-01-10 15:18 -0700, James Hilliard spake thusly: >>> On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: >> [--SNIP--] >>>> So I wonder if it even makes sense to keep package/zynq-boot-bin now. >>> Well if someone is using an older uboot that doesn't have the >>> generation capability >>> integrated then it's probably still needed right? >> >> But then, they would have that tool in their uboot tree, and then >> nothing would prevent them from running it as a post-build (or >> post-image) script. >> >> Yes, they would need to have a python2 on their host. But that will be >> the case if they stick to such older tools which may break on more >> recent systems, not just uboot... > > Yeah, the advantage here is that it works with python3 as is with older uboot > versions. I guess the main issue is that vendor uboot trees are often ancient > and rarely updated so this would be mostly useful for those situations. Is upgrading to python 3 just to simplify potential legacy users the only motivation for this patch? Then I would not touch this package at all and avoid keeping our own copy of the script. -- Luca From ps.report at gmx.net Mon Jan 10 22:49:48 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 10 Jan 2022 23:49:48 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/iwd: bump version to 1.21 In-Reply-To: <20220110213901.13597-2-ps.report@gmx.net> References: <20220110213901.13597-1-ps.report@gmx.net> <20220110213901.13597-2-ps.report@gmx.net> Message-ID: <20220110234948.347edf2d@gmx.net> On Mon, 10 Jan 2022 22:39:01 +0100, Peter Seiderer wrote: > - add 0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch > > - Changelog (since 1.20, from [1]): > > ver 1.21: > Fix issue with handling disconnect events issued by AP. > Add experimental support for DPP feature. > > [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog > > Signed-off-by: Peter Seiderer > --- > ...-declaration-of-function-explicit_bz.patch | 39 +++++++++++++++++++ > package/iwd/iwd.hash | 2 +- > package/iwd/iwd.mk | 2 +- > 3 files changed, 41 insertions(+), 2 deletions(-) > create mode 100644 package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch > > diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch > new file mode 100644 > index 0000000000..fc1e67fe9c > --- /dev/null > +++ b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch > @@ -0,0 +1,39 @@ > +From 6805884743645d8d16186dbb0de7d9cd50cfd9a5 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Mon, 10 Jan 2022 22:20:53 +0100 > +Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero > + warning > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +- add missing src/missing.h include for explicit_bzero, fixes uclibc > + compile/linking > + > +Fixes: > + > + src/dpp.c:166:2: warning: implicit declaration of function ?explicit_bzero? [-Wimplicit-function-declaration] > + 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); > + | ^~~~~~~~~~~~~~ > + > +[Upstream: https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/HXV2B7L3RXDIFMKFZTI72TKZRK2IMUPP] Upstream applied: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=6ce41f621154eff0145dab41308bc145c0440f16 Regards, Peter > +Signed-off-by: Peter Seiderer > +--- > + src/dpp.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/dpp.c b/src/dpp.c > +index 84e89f6c..8091ded1 100644 > +--- a/src/dpp.c > ++++ b/src/dpp.c > +@@ -30,6 +30,7 @@ > + > + #include "linux/nl80211.h" > + > ++#include "src/missing.h" > + #include "src/dbus.h" > + #include "src/netdev.h" > + #include "src/module.h" > +-- > +2.34.1 > + > diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash > index 58224170e6..8e34d2983f 100644 > --- a/package/iwd/iwd.hash > +++ b/package/iwd/iwd.hash > @@ -1,5 +1,5 @@ > # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc > -sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz > +sha256 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk > index 42f176b05b..a70da86ecc 100644 > --- a/package/iwd/iwd.mk > +++ b/package/iwd/iwd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -IWD_VERSION = 1.20 > +IWD_VERSION = 1.21 > IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz > IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless > IWD_LICENSE = LGPL-2.1+ From fontaine.fabrice at gmail.com Mon Jan 10 22:52:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 10 Jan 2022 23:52:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix musl build Message-ID: <20220110225200.2000095-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: In file included from /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, from ./kerncompat.h:31, from common/utils.c:42: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' 7 | struct sysinfo { | ^~~~~~~ In file included from common/utils.c:27: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here 10 | struct sysinfo { | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc Signed-off-by: Fabrice Fontaine --- ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ++++++++++++++++ ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch create mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch new file mode 100644 index 0000000000..b6c1a42456 --- /dev/null +++ b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch @@ -0,0 +1,43 @@ +From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Thu, 30 Dec 2021 15:23:59 +0200 +Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ + headers + +btrfs-tools compile fails with mips, musl and 5.12+ headers. + +The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we +add an explicit include of const.h to pickup the macro: + + | make: *** [Makefile:595: mkfs.btrfs] Error 1 + | make: *** Waiting for unfinished jobs.... + | libbtrfs.a(volumes.o): in function `dev_extent_search_start': + | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' + | collect2: error: ld returned 1 exit status + +This is safe for older kernel's as well, since the header still +exists, and is valid to include. + +Signed-off-by: Bruce Ashfield +[remove invalid OE Upstream-status] +Signed-off-by: Stijn Tintel +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] +Signed-off-by: Fabrice Fontaine +--- + kerncompat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kerncompat.h b/kerncompat.h +index df167fe6c..2503d1afa 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch new file mode 100644 index 0000000000..7473fe67cb --- /dev/null +++ b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch @@ -0,0 +1,49 @@ +From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 8 Jan 2022 22:44:44 +0100 +Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl + +Make inclusion of sys/sysinfo.h conditional to avoid the following build +failure on musl: + +In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, + from ./kerncompat.h:31, + from common/utils.c:42: +.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' + 7 | struct sysinfo { + | ^~~~~~~ +In file included from common/utils.c:27: +.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + 10 | struct sysinfo { + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc + +The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, +while both must not be included at the same time. Stop including +linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and +causes the double definition for some reason. As we now include +linux/const.h directly, there's no other effective change. + +Pull-request: #433 +Signed-off-by: Fabrice Fontaine +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] +--- + kerncompat.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 2503d1afa..6ca1526e2 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #include + #include + -- 2.34.1 From james.hilliard1 at gmail.com Mon Jan 10 22:55:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 10 Jan 2022 15:55:22 -0700 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: <2846b399-f095-acb3-c086-e44b3b74698e@lucaceresoli.net> References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> <20220110222808.GU1477939@scaer> <2846b399-f095-acb3-c086-e44b3b74698e@lucaceresoli.net> Message-ID: On Mon, Jan 10, 2022 at 3:46 PM Luca Ceresoli wrote: > > Hi James, Yann, > > On 10/01/22 23:31, James Hilliard wrote: > > On Mon, Jan 10, 2022 at 3:28 PM Yann E. MORIN wrote: > >> > >> James, All, > >> > >> On 2022-01-10 15:18 -0700, James Hilliard spake thusly: > >>> On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: > >> [--SNIP--] > >>>> So I wonder if it even makes sense to keep package/zynq-boot-bin now. > >>> Well if someone is using an older uboot that doesn't have the > >>> generation capability > >>> integrated then it's probably still needed right? > >> > >> But then, they would have that tool in their uboot tree, and then > >> nothing would prevent them from running it as a post-build (or > >> post-image) script. > >> > >> Yes, they would need to have a python2 on their host. But that will be > >> the case if they stick to such older tools which may break on more > >> recent systems, not just uboot... > > > > Yeah, the advantage here is that it works with python3 as is with older uboot > > versions. I guess the main issue is that vendor uboot trees are often ancient > > and rarely updated so this would be mostly useful for those situations. > > Is upgrading to python 3 just to simplify potential legacy users the > only motivation for this patch? Then I would not touch this package at > all and avoid keeping our own copy of the script. Well the motivation is that we want to drop python 2 from the toolchain entirely, so leaving this package as is would not be an option(since it depends on the host python2 interpreter support we want to remove). We either need to remove it or use the python3 ported version(which due to the simplicity of the script should not cause any significant maintenance issues for us IMO). > > -- > Luca From peter at korsgaard.com Mon Jan 10 22:56:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 10 Jan 2022 23:56:46 +0100 Subject: [Buildroot] [PATCH 2/2] configs/kontron_smarc_sal28: use kernel 5.16 In-Reply-To: <20220110095040.2212639-2-michael@walle.cc> (Michael Walle's message of "Mon, 10 Jan 2022 10:50:40 +0100") References: <20220110095040.2212639-1-michael@walle.cc> <20220110095040.2212639-2-michael@walle.cc> Message-ID: <877db79p3l.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Walle writes: > Signed-off-by: Michael Walle Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 10 22:56:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 10 Jan 2022 23:56:38 +0100 Subject: [Buildroot] [PATCH 1/2] {linux, linux-headers}: add version 5.16 In-Reply-To: <20220110095040.2212639-1-michael@walle.cc> (Michael Walle's message of "Mon, 10 Jan 2022 10:50:39 +0100") References: <20220110095040.2212639-1-michael@walle.cc> Message-ID: <87bl0j9p3t.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Walle writes: > Signed-off-by: Michael Walle I've kept the default at 5.15.x given that it is a LTS and we are almost ready to release 2022.02 and committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 10 22:54:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 10 Jan 2022 23:54:53 +0100 Subject: [Buildroot] [git commit] configs/kontron_smarc_sal28: use kernel 5.16 Message-ID: <20220110225049.D72B483467@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c27065870a9ff8dac23b94fcf24699c003df4f2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Walle Signed-off-by: Peter Korsgaard --- configs/kontron_smarc_sal28_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index ce8f8323ae..37e415cf32 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3-ads2 freescale/fsl-ls1028a-kontron-sl28-var4 freescale/fsl-ls1028a-kontron-kbox-a-230-ls" From peter at korsgaard.com Mon Jan 10 22:54:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 10 Jan 2022 23:54:16 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: add version 5.16 Message-ID: <20220110225049.CF3A982984@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85459426d9f4f5909b359d9456f71bdeac3c46ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Walle [Peter: Keep default at 5.15.x for 2022.02] Signed-off-by: Peter Korsgaard --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 11 ++++++++++- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 2f144427f4..86dc8d7af9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9bc3c873c5..8ee86e09af 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -65,6 +65,10 @@ config BR2_KERNEL_HEADERS_5_14 config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + +config BR2_KERNEL_HEADERS_5_16 + bool "Linux 5.16.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -139,8 +143,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 + bool "5.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 - bool "5.15.x or later" + bool "5.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14 @@ -382,6 +390,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.83" if BR2_KERNEL_HEADERS_5_10 default "5.14.21" if BR2_KERNEL_HEADERS_5_14 default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index fd005f4740..adc93ab725 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -566,6 +566,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -579,6 +583,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 default "5.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 default "5.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1cea64d105..9346fa3feb 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -123,8 +123,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_16 + bool "5.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_15 - bool "5.15.x or later" + bool "5.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_14 From peter at korsgaard.com Mon Jan 10 23:13:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 11 Jan 2022 00:13:01 +0100 Subject: [Buildroot] [PATCH 1/2] package/linux-headers: drop 5.14.x headers Message-ID: <20220110231303.31275-1-peter@korsgaard.com> The 5.14.x series is now EOL, so drop it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index d36eac3302..b3e8d5a6d8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_KERNEL_HEADERS_5_14 + bool "kernel headers version 5.14.x are no longer supported" + select BR2_LEGACY + help + Version 5.14.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE bool "python-backports-functools-lru-cache package removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 86dc8d7af9..c40c26c1b2 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz -sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8ee86e09af..115ff0d3f9 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,7 +388,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.219" if BR2_KERNEL_HEADERS_4_19 default "5.4.163" if BR2_KERNEL_HEADERS_5_4 default "5.10.83" if BR2_KERNEL_HEADERS_5_10 - default "5.14.21" if BR2_KERNEL_HEADERS_5_14 default "5.15.6" if BR2_KERNEL_HEADERS_5_15 default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION -- 2.20.1 From peter at korsgaard.com Mon Jan 10 23:13:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 11 Jan 2022 00:13:02 +0100 Subject: [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series In-Reply-To: <20220110231303.31275-1-peter@korsgaard.com> References: <20220110231303.31275-1-peter@korsgaard.com> Message-ID: <20220110231303.31275-2-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 6c30100921..891e2cdcb6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" 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 c40c26c1b2..d0813e5db4 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz -sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz +sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 115ff0d3f9..1c24afed97 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -382,13 +382,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 - default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 + default "5.15.13" if BR2_KERNEL_HEADERS_5_15 default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL -- 2.20.1 From peterlin at andestech.com Tue Jan 11 03:58:58 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 11 Jan 2022 11:58:58 +0800 Subject: [Buildroot] [PATCH 1/2] board/andes: rearrange nds32 folder structure Message-ID: <20220111035859.12895-1-peterlin@andestech.com> Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 board/andes/{ => ae3xx}/readme.txt | 0 configs/andes_ae3xx_defconfig | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae3xx}/readme.txt (100%) diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae3xx/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch similarity index 100% rename from board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch rename to board/andes/ae3xx/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/readme.txt b/board/andes/ae3xx/readme.txt similarity index 100% rename from board/andes/readme.txt rename to board/andes/ae3xx/readme.txt diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae3xx_defconfig index 52634caa50..18051115c3 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae3xx_defconfig @@ -1,5 +1,5 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae3xx/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y -- 2.17.1 From peterlin at andestech.com Tue Jan 11 03:58:59 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 11 Jan 2022 11:58:59 +0800 Subject: [Buildroot] [PATCH 2/2] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220111035859.12895-1-peterlin@andestech.com> References: <20220111035859.12895-1-peterlin@andestech.com> Message-ID: <20220111035859.12895-2-peterlin@andestech.com> This patch provides defconfig and basic support for the Andes 45 series RISC-V architecture. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- DEVELOPERS | 3 +- board/andes/ae350/ae350.dts | 274 ++ board/andes/ae350/boot.cmd | 3 + board/andes/ae350/genimage_sdcard.cfg | 29 + board/andes/ae350/linux.config.fragment | 2 + .../0001-Add-AE350-platform-defconfig.patch | 158 + ...002-Andes-support-for-Faraday-ATCMAC.patch | 510 +++ .../0003-Andes-support-for-ATCDMAC.patch | 3301 +++++++++++++++++ .../linux/0004-Andes-support-for-FTSDC.patch | 1884 ++++++++++ ...5-Non-cacheability-and-Cache-support.patch | 1132 ++++++ ...-Add-andes-sbi-call-vendor-extension.patch | 231 ++ ...e-update-function-local_flush_tlb_al.patch | 101 + ...rt-time32-stat64-sys_clone3-syscalls.patch | 47 + .../0009-dma-Support-smp-up-with-dma.patch | 120 + ...ix-atcdmac300-chained-irq-mapping-is.patch | 300 ++ .../linux/0011-DMA-Add-msb-bit-patch.patch | 387 ++ .../0012-Remove-unused-Andes-SBI-call.patch | 147 + ...isable-PIC-explicitly-for-assembling.patch | 29 + ...2-Enable-cache-for-opensbi-jump-mode.patch | 25 + ...001-Fix-mmc-no-partition-table-error.patch | 27 + ...2-Prevent-fw_dynamic-from-relocation.patch | 27 + ...0003-Fix-u-boot-proper-booting-issue.patch | 26 + ...04-Enable-printing-OpenSBI-boot-logo.patch | 25 + board/andes/ae350/readme.txt | 66 + board/andes/ae350/uboot.config.fragment | 5 + configs/ae350_andestar45_defconfig | 46 + 26 files changed, 8904 insertions(+), 1 deletion(-) create mode 100755 board/andes/ae350/ae350.dts create mode 100644 board/andes/ae350/boot.cmd create mode 100644 board/andes/ae350/genimage_sdcard.cfg create mode 100644 board/andes/ae350/linux.config.fragment create mode 100644 board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch create mode 100644 board/andes/ae350/patches/linux/0002-Andes-support-for-Faraday-ATCMAC.patch create mode 100644 board/andes/ae350/patches/linux/0003-Andes-support-for-ATCDMAC.patch create mode 100644 board/andes/ae350/patches/linux/0004-Andes-support-for-FTSDC.patch create mode 100644 board/andes/ae350/patches/linux/0005-Non-cacheability-and-Cache-support.patch create mode 100644 board/andes/ae350/patches/linux/0006-Add-andes-sbi-call-vendor-extension.patch create mode 100644 board/andes/ae350/patches/linux/0007-riscv-Porting-pte-update-function-local_flush_tlb_al.patch create mode 100644 board/andes/ae350/patches/linux/0008-Support-time32-stat64-sys_clone3-syscalls.patch create mode 100644 board/andes/ae350/patches/linux/0009-dma-Support-smp-up-with-dma.patch create mode 100644 board/andes/ae350/patches/linux/0010-riscv-platform-Fix-atcdmac300-chained-irq-mapping-is.patch create mode 100644 board/andes/ae350/patches/linux/0011-DMA-Add-msb-bit-patch.patch create mode 100644 board/andes/ae350/patches/linux/0012-Remove-unused-Andes-SBI-call.patch create mode 100644 board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch create mode 100644 board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch create mode 100644 board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch create mode 100644 board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch create mode 100644 board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch create mode 100644 board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/uboot.config.fragment create mode 100644 configs/ae350_andestar45_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..18b0444c72 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2122,10 +2122,11 @@ N: Norbert Lange F: package/systemd/ F: package/tcf-agent/ -N: Nylon Chen +N: Yu Chien Peter Lin F: arch/Config.in.nds32 F: board/andes F: configs/andes_ae3xx_defconfig +F: configs/ae350_andestar45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel diff --git a/board/andes/ae350/ae350.dts b/board/andes/ae350/ae350.dts new file mode 100755 index 0000000000..fe64234eef --- /dev/null +++ b/board/andes/ae350/ae350.dts @@ -0,0 +1,274 @@ +/dts-v1/; + +/ { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,ae350"; + model = "andestech,ax45"; + aliases { + uart0 = &serial0; + spi0 = &spi; + }; + + chosen { + bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7"; + stdout-path = "uart0:38400n8"; + }; + cpus { + #address-cells = <1>; + #size-cells = <0>; + timebase-frequency = <60000000>; + CPU0: cpu at 0 { + device_type = "cpu"; + reg = <0>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU0_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU1: cpu at 1 { + device_type = "cpu"; + reg = <1>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU1_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU2: cpu at 2 { + device_type = "cpu"; + reg = <2>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU2_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU3: cpu at 3 { + device_type = "cpu"; + reg = <3>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU3_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + }; + L2: l2-cache at e0500000 { + compatible = "cache"; + cache-level = <2>; + cache-size = <0x80000>; + reg = <0x00000000 0xe0500000 0x00000000 0x00001000>; + andes,inst-prefetch = <3>; + andes,data-prefetch = <3>; + // The value format is + andes,tag-ram-ctl = <0 0>; + andes,data-ram-ctl = <0 0>; + }; + memory at 0 { + reg = <0x00000000 0x00000000 0x00000000 0x80000000>; + device_type = "memory"; + }; + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,riscv-ae350-soc", "simple-bus"; + ranges; + plic0: interrupt-controller at e4000000 { + compatible = "riscv,plic0"; + reg = <0x00000000 0xe4000000 0x00000000 0x02000000>; + interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <71>; + }; + plic1: interrupt-controller at e6400000 { + compatible = "riscv,plic1"; + reg = <0x00000000 0xe6400000 0x00000000 0x00400000>; + interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <4>; + }; + plmt0: plmt0 at e6000000 { + compatible = "riscv,plmt0"; + reg = <0x00000000 0xe6000000 0x00000000 0x00100000>; + interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>; + }; + spiclk: virt_100mhz { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; + timer0: timer at f0400000 { + compatible = "andestech,atcpit100"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + }; + pwm: pwm at f0400000 { + compatible = "andestech,atcpit100-pwm"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + pwm-cells = <2>; + }; + wdt: wdt at f0500000 { + compatible = "andestech,atcwdt200"; + reg = <0x00000000 0xf0500000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <15000000>; + }; + serial0: serial at f0300000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x00000000 0xf0300000 0x00000000 0x00001000>; + interrupts = <9 4>; + interrupt-parent = <&plic0>; + clock-frequency = <19660800>; + reg-shift = <2>; + reg-offset = <32>; + no-loopback-test = <1>; + }; + rtc0: rtc at f0600000 { + compatible = "andestech,atcrtc100"; + reg = <0x00000000 0xf0600000 0x00000000 0x00001000>; + interrupts = <1 4 2 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + gpio: gpio at f0700000 { + compatible = "andestech,atcgpio100"; + reg = <0x00000000 0xf0700000 0x00000000 0x00001000>; + interrupts = <7 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + mac0: mac at e0100000 { + compatible = "andestech,atmac100"; + reg = <0x00000000 0xe0100000 0x00000000 0x00001000>; + interrupts = <19 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + smu: smu at f0100000 { + compatible = "andestech,atcsmu"; + reg = <0x00000000 0xf0100000 0x00000000 0x00001000>; + }; + mmc0: mmc at f0e00000 { + compatible = "andestech,atfsdc010"; + reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>; + interrupts = <18 4>; + interrupt-parent = <&plic0>; + clock-freq-min-max = <400000 100000000>; + max-frequency = <100000000>; + fifo-depth = <16>; + cap-sd-highspeed; + dma-coherent; + }; + dma0: dma at f0c00000 { + compatible = "andestech,atcdmac300"; + reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>; + interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>; + interrupt-parent = <&plic0>; + dma-channels = <8>; + }; + lcd0: lcd at e0200000 { + compatible = "andestech,atflcdc100"; + reg = <0x00000000 0xe0200000 0x00000000 0x00001000>; + interrupts = <20 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + pmu: pmu { + compatible = "riscv,andes-pmu"; + device_type = "pmu"; + }; + spi: spi at f0b00000 { + compatible = "andestech,atcspi200"; + reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>; + interrupts = <4 4>; + interrupt-parent = <&plic0>; + #address-cells = <1>; + #size-cells = <0>; + num-cs = <1>; + clocks = <&spiclk>; + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0x00000000>; + spi-max-frequency = <50000000>; + spi-cpol; + spi-cpha; + }; + }; + }; +}; diff --git a/board/andes/ae350/boot.cmd b/board/andes/ae350/boot.cmd new file mode 100644 index 0000000000..2a046c6c7a --- /dev/null +++ b/board/andes/ae350/boot.cmd @@ -0,0 +1,3 @@ +setenv bootargs earlycon=sbi root=/dev/mmcblk0p2 rootwait +load mmc 0:1 0x600000 Image +booti 0x600000 - $fdtcontroladdr diff --git a/board/andes/ae350/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..e8bb3d4903 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,29 @@ +image boot.vfat { + vfat { + files = { + "Image", + "boot.scr", + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 128M +} + +image sdcard.img { + hdimage { + gpt = true + } + + partition u-boot { + partition-type-uuid = ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4 + image = "rootfs.ext4" + } +} diff --git a/board/andes/ae350/linux.config.fragment b/board/andes/ae350/linux.config.fragment new file mode 100644 index 0000000000..299b75d2f4 --- /dev/null +++ b/board/andes/ae350/linux.config.fragment @@ -0,0 +1,2 @@ +CONFIG_INITRAMFS_SOURCE="" +CONFIG_EFI_PARTITION=y diff --git a/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch b/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch new file mode 100644 index 0000000000..1384369972 --- /dev/null +++ b/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch @@ -0,0 +1,158 @@ +From 8a9097c1be79fdab3d907a8bbc66a222807cb81a Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 09:05:34 +0800 +Subject: [PATCH 01/12] Add AE350 platform defconfig + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/configs/ae350_rv64_smp_defconfig | 138 ++++++++++++++++++++ + 1 file changed, 138 insertions(+) + create mode 100755 arch/riscv/configs/ae350_rv64_smp_defconfig + +diff --git a/arch/riscv/configs/ae350_rv64_smp_defconfig b/arch/riscv/configs/ae350_rv64_smp_defconfig +new file mode 100755 +index 000000000000..8c6b84b2b9fe +--- /dev/null ++++ b/arch/riscv/configs/ae350_rv64_smp_defconfig +@@ -0,0 +1,138 @@ ++CONFIG_SMP=y ++CONFIG_NR_CPUS=4 ++CONFIG_ANDES_PMU=y ++CONFIG_PREEMPT=y ++CONFIG_HZ_100=y ++CONFIG_CROSS_COMPILE="riscv64-linux-" ++CONFIG_DEFAULT_HOSTNAME="andes-test" ++# CONFIG_SWAP is not set ++CONFIG_SYSVIPC=y ++CONFIG_POSIX_MQUEUE=y ++CONFIG_HIGH_RES_TIMERS=y ++CONFIG_BSD_PROCESS_ACCT=y ++CONFIG_BSD_PROCESS_ACCT_V3=y ++CONFIG_IKCONFIG=y ++CONFIG_IKCONFIG_PROC=y ++CONFIG_LOG_BUF_SHIFT=14 ++CONFIG_CGROUPS=y ++CONFIG_CGROUP_SCHED=y ++CONFIG_CFS_BANDWIDTH=y ++CONFIG_CGROUP_CPUACCT=y ++CONFIG_NAMESPACES=y ++CONFIG_USER_NS=y ++CONFIG_BLK_DEV_INITRD=y ++CONFIG_INITRAMFS_SOURCE="rootfs-lite initramfs.txt.lite" ++# CONFIG_RD_BZIP2 is not set ++# CONFIG_RD_LZMA is not set ++# CONFIG_RD_XZ is not set ++# CONFIG_RD_LZO is not set ++# CONFIG_RD_LZ4 is not set ++CONFIG_INITRAMFS_COMPRESSION_GZIP=y ++CONFIG_SYSCTL_SYSCALL=y ++CONFIG_CHECKPOINT_RESTORE=y ++CONFIG_KALLSYMS_ALL=y ++CONFIG_EMBEDDED=y ++CONFIG_PROFILING=y ++CONFIG_MODULES=y ++CONFIG_MODULE_UNLOAD=y ++# CONFIG_BLK_DEV_BSG is not set ++CONFIG_PARTITION_ADVANCED=y ++# CONFIG_EFI_PARTITION is not set ++# CONFIG_IOSCHED_DEADLINE is not set ++CONFIG_NET=y ++CONFIG_PACKET=y ++CONFIG_UNIX=y ++CONFIG_NET_KEY=y ++CONFIG_INET=y ++# CONFIG_INET_XFRM_MODE_TRANSPORT is not set ++# CONFIG_INET_XFRM_MODE_TUNNEL is not set ++# CONFIG_INET_XFRM_MODE_BEET is not set ++# CONFIG_INET_DIAG is not set ++# CONFIG_WIRELESS is not set ++CONFIG_DEVTMPFS=y ++CONFIG_DEVTMPFS_MOUNT=y ++CONFIG_BLK_DEV_LOOP=y ++CONFIG_NETDEVICES=y ++CONFIG_TUN=y ++CONFIG_FTMAC100=y ++# CONFIG_WLAN is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_KEYBOARD is not set ++# CONFIG_INPUT_MOUSE is not set ++CONFIG_INPUT_TOUCHSCREEN=y ++CONFIG_DEVKMEM=y ++CONFIG_SERIAL_8250=y ++# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set ++CONFIG_SERIAL_8250_CONSOLE=y ++CONFIG_SERIAL_OF_PLATFORM=y ++# CONFIG_HW_RANDOM is not set ++CONFIG_GPIOLIB=y ++CONFIG_DEBUG_GPIO=y ++CONFIG_GPIO_SYSFS=y ++CONFIG_GPIO_ATCGPIO100=y ++# CONFIG_HWMON is not set ++CONFIG_I2C=y ++CONFIG_I2C_CHARDEV=y ++CONFIG_I2C_ATCIIC100=y ++CONFIG_FB=y ++CONFIG_FB_FTLCDC100=y ++CONFIG_DUMMY_CONSOLE_COLUMNS=40 ++CONFIG_DUMMY_CONSOLE_ROWS=30 ++CONFIG_FRAMEBUFFER_CONSOLE=y ++CONFIG_LOGO=y ++CONFIG_SOUND=y ++CONFIG_SND=y ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_PCM_OSS=y ++CONFIG_SND_FTSSP010=y ++# CONFIG_USB_SUPPORT is not set ++CONFIG_MMC=y ++CONFIG_MMC_FTSDC=y ++# CONFIG_IOMMU_SUPPORT is not set ++CONFIG_GENERIC_PHY=y ++CONFIG_EXT2_FS=y ++CONFIG_EXT4_FS=y ++CONFIG_EXT4_FS_POSIX_ACL=y ++CONFIG_EXT4_FS_SECURITY=y ++CONFIG_EXT4_ENCRYPTION=y ++CONFIG_FANOTIFY=y ++CONFIG_MSDOS_FS=y ++CONFIG_VFAT_FS=y ++CONFIG_TMPFS=y ++CONFIG_TMPFS_POSIX_ACL=y ++CONFIG_CONFIGFS_FS=y ++# CONFIG_MISC_FILESYSTEMS is not set ++CONFIG_NFS_FS=y ++CONFIG_NFS_V3_ACL=y ++CONFIG_NFS_V4=y ++CONFIG_NFS_V4_1=y ++CONFIG_NFS_V4_2=y ++CONFIG_NFS_USE_LEGACY_DNS=y ++CONFIG_NLS_CODEPAGE_437=y ++CONFIG_NLS_ISO8859_1=y ++CONFIG_DEBUG_INFO=y ++CONFIG_DEBUG_INFO_DWARF4=y ++CONFIG_GDB_SCRIPTS=y ++CONFIG_READABLE_ASM=y ++CONFIG_DEBUG_FS=y ++CONFIG_HEADERS_CHECK=y ++CONFIG_DEBUG_SECTION_MISMATCH=y ++CONFIG_PANIC_ON_OOPS=y ++# CONFIG_DEBUG_PREEMPT is not set ++CONFIG_STACKTRACE=y ++CONFIG_RCU_CPU_STALL_TIMEOUT=300 ++# CONFIG_FTRACE is not set ++CONFIG_CRYPTO_ECHAINIV=y ++# CONFIG_CRYPTO_HW is not set ++CONFIG_SOC_SIFIVE=y ++CONFIG_SERIAL_SIFIVE=y ++CONFIG_SERIAL_SIFIVE_CONSOLE=y ++CONFIG_CLK_SIFIVE=y ++CONFIG_CLK_ANALOGBITS_WRPLL_CLN28HPC=y ++CONFIG_CLK_SIFIVE_FU540_PRCI=y ++CONFIG_SIFIVE_PLIC=y ++CONFIG_PRINTK_TIME=y ++CONFIG_RISCV_BASE_PMU=n ++CONFIG_PERF_EVENTS=n ++CONFIG_MODULES_TREE_LOOKUP=n ++CONFIG_SERIAL_EARLYCON_RISCV_SBI=y +\ No newline at end of file +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0002-Andes-support-for-Faraday-ATCMAC.patch b/board/andes/ae350/patches/linux/0002-Andes-support-for-Faraday-ATCMAC.patch new file mode 100644 index 0000000000..772700ba55 --- /dev/null +++ b/board/andes/ae350/patches/linux/0002-Andes-support-for-Faraday-ATCMAC.patch @@ -0,0 +1,510 @@ +From 1966040a640c5629cd8a437111072e092caad205 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 09:06:19 +0800 +Subject: [PATCH 02/12] Andes support for Faraday ATCMAC + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/net/ethernet/faraday/Kconfig | 13 +- + drivers/net/ethernet/faraday/ftmac100.c | 154 ++++++++++++++---------- + drivers/net/ethernet/faraday/ftmac100.h | 28 ++++- + 3 files changed, 121 insertions(+), 74 deletions(-) + +diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig +index 3d1e9a302148..d3ed03cc984d 100644 +--- a/drivers/net/ethernet/faraday/Kconfig ++++ b/drivers/net/ethernet/faraday/Kconfig +@@ -6,7 +6,7 @@ + config NET_VENDOR_FARADAY + bool "Faraday devices" + default y +- depends on ARM || NDS32 || COMPILE_TEST ++ depends on ARM || RISCV || COMPILE_TEST + help + If you have a network (Ethernet) card belonging to this class, say Y. + +@@ -19,24 +19,21 @@ if NET_VENDOR_FARADAY + + config FTMAC100 + tristate "Faraday FTMAC100 10/100 Ethernet support" +- depends on ARM || NDS32 || COMPILE_TEST +- depends on !64BIT || BROKEN ++ depends on ARM || RISCV || COMPILE_TEST + select MII + help + This driver supports the FTMAC100 10/100 Ethernet controller + from Faraday. It is used on Faraday A320, Andes AG101 and some +- other ARM/NDS32 SoC's. ++ other ARM/RISCV SoC's. + + config FTGMAC100 + tristate "Faraday FTGMAC100 Gigabit Ethernet support" +- depends on ARM || NDS32 || COMPILE_TEST +- depends on !64BIT || BROKEN ++ depends on ARM || RISCV || COMPILE_TEST + select PHYLIB + select MDIO_ASPEED if MACH_ASPEED_G6 +- select CRC32 + help + This driver supports the FTGMAC100 Gigabit Ethernet controller + from Faraday. It is used on Faraday A369, Andes AG102 and some +- other ARM/NDS32 SoC's. ++ other ARM/RISCV SoC's. + + endif # NET_VENDOR_FARADAY +diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c +index 473b337b2e3b..49a9d4ea5826 100644 +--- a/drivers/net/ethernet/faraday/ftmac100.c ++++ b/drivers/net/ethernet/faraday/ftmac100.c +@@ -4,6 +4,20 @@ + * + * (C) Copyright 2009-2011 Faraday Technology + * Po-Yu Chuang ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +@@ -38,12 +52,25 @@ + #error invalid RX_BUF_SIZE + #endif + ++#define xprintk(...) ++ ++#define FTMAC100_RX_DESC(priv, index) (&priv->descs->rxdes[index]) ++#define FTMAC100_RX_DESC_EXT(priv, index) (&priv->descs->rxdes_ext[index]) ++#define FTMAC100_TX_DESC(priv, index) (&priv->descs->txdes[index]) ++#define FTMAC100_TX_DESC_EXT(priv, index) (&priv->descs->txdes_ext[index]) ++ ++#define FTMAC100_CURRENT_RX_DESC_INDEX(priv) (priv->rx_pointer) ++#define FTMAC100_CURRENT_TX_DESC_INDEX(priv) (priv->tx_pointer); ++#define FTMAC100_CURRENT_CLEAN_TX_DESC_INDEX(priv) (priv->tx_clean_pointer); ++ + /****************************************************************************** + * private data + *****************************************************************************/ + struct ftmac100_descs { + struct ftmac100_rxdes rxdes[RX_QUEUE_ENTRIES]; + struct ftmac100_txdes txdes[TX_QUEUE_ENTRIES]; ++ struct ftmac100_rxdes_ext rxdes_ext[RX_QUEUE_ENTRIES]; ++ struct ftmac100_txdes_ext txdes_ext[TX_QUEUE_ENTRIES]; + }; + + struct ftmac100 { +@@ -69,7 +96,7 @@ struct ftmac100 { + }; + + static int ftmac100_alloc_rx_page(struct ftmac100 *priv, +- struct ftmac100_rxdes *rxdes, gfp_t gfp); ++ int index, gfp_t gfp); + + /****************************************************************************** + * internal functions (hardware register access) +@@ -96,11 +123,13 @@ static void ftmac100_disable_all_int(struct ftmac100 *priv) + + static void ftmac100_set_rx_ring_base(struct ftmac100 *priv, dma_addr_t addr) + { ++ xprintk("%s: addr %p\n", __func__, (void*)addr); + iowrite32(addr, priv->base + FTMAC100_OFFSET_RXR_BADR); + } + + static void ftmac100_set_tx_ring_base(struct ftmac100 *priv, dma_addr_t addr) + { ++ xprintk("%s: addr %p\n", __func__, (void*)addr); + iowrite32(addr, priv->base + FTMAC100_OFFSET_TXR_BADR); + } + +@@ -259,25 +288,22 @@ static void ftmac100_rxdes_set_dma_addr(struct ftmac100_rxdes *rxdes, + dma_addr_t addr) + { + rxdes->rxdes2 = cpu_to_le32(addr); ++ rxdes->rxdes3 = cpu_to_le32(addr >> 32); + } + + static dma_addr_t ftmac100_rxdes_get_dma_addr(struct ftmac100_rxdes *rxdes) + { +- return le32_to_cpu(rxdes->rxdes2); ++ return le32_to_cpu(rxdes->rxdes2) | (dma_addr_t)le32_to_cpu(rxdes->rxdes3) << 32; + } + +-/* +- * rxdes3 is not used by hardware. We use it to keep track of page. +- * Since hardware does not touch it, we can skip cpu_to_le32()/le32_to_cpu(). +- */ +-static void ftmac100_rxdes_set_page(struct ftmac100_rxdes *rxdes, struct page *page) ++static void ftmac100_rxdes_set_page(struct ftmac100 *priv, int index, struct page *page) + { +- rxdes->rxdes3 = (unsigned int)page; ++ FTMAC100_RX_DESC_EXT(priv, index)->page = page; + } + +-static struct page *ftmac100_rxdes_get_page(struct ftmac100_rxdes *rxdes) ++static struct page *ftmac100_rxdes_get_page(struct ftmac100 *priv, int index) + { +- return (struct page *)rxdes->rxdes3; ++ return (struct page *)FTMAC100_RX_DESC_EXT(priv, index)->page; + } + + /****************************************************************************** +@@ -293,26 +319,23 @@ static void ftmac100_rx_pointer_advance(struct ftmac100 *priv) + priv->rx_pointer = ftmac100_next_rx_pointer(priv->rx_pointer); + } + +-static struct ftmac100_rxdes *ftmac100_current_rxdes(struct ftmac100 *priv) +-{ +- return &priv->descs->rxdes[priv->rx_pointer]; +-} +- +-static struct ftmac100_rxdes * ++static int + ftmac100_rx_locate_first_segment(struct ftmac100 *priv) + { +- struct ftmac100_rxdes *rxdes = ftmac100_current_rxdes(priv); ++ int index = FTMAC100_CURRENT_RX_DESC_INDEX(priv); ++ struct ftmac100_rxdes *rxdes = FTMAC100_RX_DESC(priv, index); + + while (!ftmac100_rxdes_owned_by_dma(rxdes)) { + if (ftmac100_rxdes_first_segment(rxdes)) +- return rxdes; ++ return index; + + ftmac100_rxdes_set_dma_own(rxdes); + ftmac100_rx_pointer_advance(priv); +- rxdes = ftmac100_current_rxdes(priv); ++ index = FTMAC100_CURRENT_RX_DESC_INDEX(priv); ++ rxdes = FTMAC100_RX_DESC(priv, index); + } + +- return NULL; ++ return -1; + } + + static bool ftmac100_rx_packet_error(struct ftmac100 *priv, +@@ -363,9 +386,13 @@ static bool ftmac100_rx_packet_error(struct ftmac100 *priv, + static void ftmac100_rx_drop_packet(struct ftmac100 *priv) + { + struct net_device *netdev = priv->netdev; +- struct ftmac100_rxdes *rxdes = ftmac100_current_rxdes(priv); ++ struct ftmac100_rxdes *rxdes; ++ int index; + bool done = false; + ++ index = FTMAC100_CURRENT_RX_DESC_INDEX(priv); ++ rxdes = FTMAC100_RX_DESC(priv, index); ++ + if (net_ratelimit()) + netdev_dbg(netdev, "drop packet %p\n", rxdes); + +@@ -375,7 +402,8 @@ static void ftmac100_rx_drop_packet(struct ftmac100 *priv) + + ftmac100_rxdes_set_dma_own(rxdes); + ftmac100_rx_pointer_advance(priv); +- rxdes = ftmac100_current_rxdes(priv); ++ index = FTMAC100_CURRENT_RX_DESC_INDEX(priv); ++ rxdes = FTMAC100_RX_DESC(priv, index); + } while (!done && !ftmac100_rxdes_owned_by_dma(rxdes)); + + netdev->stats.rx_dropped++; +@@ -389,11 +417,12 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed) + struct page *page; + dma_addr_t map; + int length; +- bool ret; ++ int index; + +- rxdes = ftmac100_rx_locate_first_segment(priv); +- if (!rxdes) ++ index = ftmac100_rx_locate_first_segment(priv); ++ if (index < 0) + return false; ++ rxdes = FTMAC100_RX_DESC(priv, index); + + if (unlikely(ftmac100_rx_packet_error(priv, rxdes))) { + ftmac100_rx_drop_packet(priv); +@@ -404,8 +433,8 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed) + * It is impossible to get multi-segment packets + * because we always provide big enough receive buffers. + */ +- ret = ftmac100_rxdes_last_segment(rxdes); +- BUG_ON(!ret); ++ if (unlikely(!ftmac100_rxdes_last_segment(rxdes))) ++ BUG(); + + /* start processing */ + skb = netdev_alloc_skb_ip_align(netdev, 128); +@@ -424,7 +453,7 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed) + dma_unmap_page(priv->dev, map, RX_BUF_SIZE, DMA_FROM_DEVICE); + + length = ftmac100_rxdes_frame_length(rxdes); +- page = ftmac100_rxdes_get_page(rxdes); ++ page = ftmac100_rxdes_get_page(priv, index); + skb_fill_page_desc(skb, 0, page, 0, length); + skb->len += length; + skb->data_len += length; +@@ -437,7 +466,7 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed) + /* Small frames are copied into linear part to free one page */ + __pskb_pull_tail(skb, length); + } +- ftmac100_alloc_rx_page(priv, rxdes, GFP_ATOMIC); ++ ftmac100_alloc_rx_page(priv, index, GFP_ATOMIC); + + ftmac100_rx_pointer_advance(priv); + +@@ -520,25 +549,27 @@ static void ftmac100_txdes_set_dma_addr(struct ftmac100_txdes *txdes, + dma_addr_t addr) + { + txdes->txdes2 = cpu_to_le32(addr); ++ txdes->txdes3 = cpu_to_le32(addr >> 32); + } + + static dma_addr_t ftmac100_txdes_get_dma_addr(struct ftmac100_txdes *txdes) + { +- return le32_to_cpu(txdes->txdes2); ++ return le32_to_cpu(txdes->txdes2) | (dma_addr_t)le32_to_cpu(txdes->txdes3) << 32; + } + +-/* +- * txdes3 is not used by hardware. We use it to keep track of socket buffer. +- * Since hardware does not touch it, we can skip cpu_to_le32()/le32_to_cpu(). +- */ +-static void ftmac100_txdes_set_skb(struct ftmac100_txdes *txdes, struct sk_buff *skb) ++static void ftmac100_txdes_skb_reset(struct ftmac100_txdes *txdes) + { +- txdes->txdes3 = (unsigned int)skb; ++ txdes->txdes3 = 0; + } + +-static struct sk_buff *ftmac100_txdes_get_skb(struct ftmac100_txdes *txdes) ++static void ftmac100_txdes_set_skb(struct ftmac100 *priv, int index, struct sk_buff *skb) + { +- return (struct sk_buff *)txdes->txdes3; ++ FTMAC100_TX_DESC_EXT(priv, index)->skb = skb; ++} ++ ++static struct sk_buff *ftmac100_txdes_get_skb(struct ftmac100 *priv, int index) ++{ ++ return (struct sk_buff *)FTMAC100_TX_DESC_EXT(priv, index)->skb; + } + + /****************************************************************************** +@@ -559,32 +590,24 @@ static void ftmac100_tx_clean_pointer_advance(struct ftmac100 *priv) + priv->tx_clean_pointer = ftmac100_next_tx_pointer(priv->tx_clean_pointer); + } + +-static struct ftmac100_txdes *ftmac100_current_txdes(struct ftmac100 *priv) +-{ +- return &priv->descs->txdes[priv->tx_pointer]; +-} +- +-static struct ftmac100_txdes *ftmac100_current_clean_txdes(struct ftmac100 *priv) +-{ +- return &priv->descs->txdes[priv->tx_clean_pointer]; +-} +- + static bool ftmac100_tx_complete_packet(struct ftmac100 *priv) + { + struct net_device *netdev = priv->netdev; + struct ftmac100_txdes *txdes; + struct sk_buff *skb; + dma_addr_t map; ++ int index; + + if (priv->tx_pending == 0) + return false; + +- txdes = ftmac100_current_clean_txdes(priv); ++ index = FTMAC100_CURRENT_CLEAN_TX_DESC_INDEX(priv); ++ txdes = FTMAC100_TX_DESC(priv, index); + + if (ftmac100_txdes_owned_by_dma(txdes)) + return false; + +- skb = ftmac100_txdes_get_skb(txdes); ++ skb = ftmac100_txdes_get_skb(priv, index); + map = ftmac100_txdes_get_dma_addr(txdes); + + if (unlikely(ftmac100_txdes_excessive_collision(txdes) || +@@ -603,6 +626,7 @@ static bool ftmac100_tx_complete_packet(struct ftmac100 *priv) + dev_kfree_skb(skb); + + ftmac100_txdes_reset(txdes); ++ ftmac100_txdes_skb_reset(txdes); + + ftmac100_tx_clean_pointer_advance(priv); + +@@ -620,18 +644,20 @@ static void ftmac100_tx_complete(struct ftmac100 *priv) + ; + } + +-static netdev_tx_t ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb, ++static int ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb, + dma_addr_t map) + { + struct net_device *netdev = priv->netdev; + struct ftmac100_txdes *txdes; + unsigned int len = (skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len; ++ int index; + +- txdes = ftmac100_current_txdes(priv); ++ index = FTMAC100_CURRENT_TX_DESC_INDEX(priv); ++ txdes = FTMAC100_TX_DESC(priv, index); + ftmac100_tx_pointer_advance(priv); + + /* setup TX descriptor */ +- ftmac100_txdes_set_skb(txdes, skb); ++ ftmac100_txdes_set_skb(priv, index, skb); + ftmac100_txdes_set_dma_addr(txdes, map); + + ftmac100_txdes_set_first_segment(txdes); +@@ -656,9 +682,10 @@ static netdev_tx_t ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb, + * internal functions (buffer) + *****************************************************************************/ + static int ftmac100_alloc_rx_page(struct ftmac100 *priv, +- struct ftmac100_rxdes *rxdes, gfp_t gfp) ++ int index, gfp_t gfp) + { + struct net_device *netdev = priv->netdev; ++ struct ftmac100_rxdes *rxdes = FTMAC100_RX_DESC(priv, index); + struct page *page; + dma_addr_t map; + +@@ -677,7 +704,7 @@ static int ftmac100_alloc_rx_page(struct ftmac100 *priv, + return -ENOMEM; + } + +- ftmac100_rxdes_set_page(rxdes, page); ++ ftmac100_rxdes_set_page(priv, index, page); + ftmac100_rxdes_set_dma_addr(rxdes, map); + ftmac100_rxdes_set_buffer_size(rxdes, RX_BUF_SIZE); + ftmac100_rxdes_set_dma_own(rxdes); +@@ -689,8 +716,8 @@ static void ftmac100_free_buffers(struct ftmac100 *priv) + int i; + + for (i = 0; i < RX_QUEUE_ENTRIES; i++) { +- struct ftmac100_rxdes *rxdes = &priv->descs->rxdes[i]; +- struct page *page = ftmac100_rxdes_get_page(rxdes); ++ struct ftmac100_rxdes *rxdes = FTMAC100_RX_DESC(priv, i); ++ struct page *page = ftmac100_rxdes_get_page(priv, i); + dma_addr_t map = ftmac100_rxdes_get_dma_addr(rxdes); + + if (!page) +@@ -701,8 +728,8 @@ static void ftmac100_free_buffers(struct ftmac100 *priv) + } + + for (i = 0; i < TX_QUEUE_ENTRIES; i++) { +- struct ftmac100_txdes *txdes = &priv->descs->txdes[i]; +- struct sk_buff *skb = ftmac100_txdes_get_skb(txdes); ++ struct ftmac100_txdes *txdes = FTMAC100_TX_DESC(priv, i); ++ struct sk_buff *skb = ftmac100_txdes_get_skb(priv, i); + dma_addr_t map = ftmac100_txdes_get_dma_addr(txdes); + + if (!skb) +@@ -722,7 +749,8 @@ static int ftmac100_alloc_buffers(struct ftmac100 *priv) + + priv->descs = dma_alloc_coherent(priv->dev, + sizeof(struct ftmac100_descs), +- &priv->descs_dma_addr, GFP_KERNEL); ++ &priv->descs_dma_addr, ++ GFP_KERNEL); + if (!priv->descs) + return -ENOMEM; + +@@ -730,9 +758,7 @@ static int ftmac100_alloc_buffers(struct ftmac100 *priv) + ftmac100_rxdes_set_end_of_ring(&priv->descs->rxdes[RX_QUEUE_ENTRIES - 1]); + + for (i = 0; i < RX_QUEUE_ENTRIES; i++) { +- struct ftmac100_rxdes *rxdes = &priv->descs->rxdes[i]; +- +- if (ftmac100_alloc_rx_page(priv, rxdes, GFP_KERNEL)) ++ if (ftmac100_alloc_rx_page(priv, i, GFP_KERNEL)) + goto err; + } + +@@ -999,7 +1025,7 @@ static int ftmac100_stop(struct net_device *netdev) + return 0; + } + +-static netdev_tx_t ++static int + ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev) + { + struct ftmac100 *priv = netdev_priv(netdev); +diff --git a/drivers/net/ethernet/faraday/ftmac100.h b/drivers/net/ethernet/faraday/ftmac100.h +index fe986f1673fc..1e65a7ef27ba 100644 +--- a/drivers/net/ethernet/faraday/ftmac100.h ++++ b/drivers/net/ethernet/faraday/ftmac100.h +@@ -4,6 +4,20 @@ + * + * (C) Copyright 2009-2011 Faraday Technology + * Po-Yu Chuang ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + #ifndef __FTMAC100_H +@@ -22,6 +36,8 @@ + #define FTMAC100_OFFSET_ITC 0x28 + #define FTMAC100_OFFSET_APTC 0x2c + #define FTMAC100_OFFSET_DBLAC 0x30 ++#define FTMAC100_OFFSET_TXR_BADR_H 0x40 ++#define FTMAC100_OFFSET_RXR_BADR_H 0x44 + #define FTMAC100_OFFSET_MACCR 0x88 + #define FTMAC100_OFFSET_MACSR 0x8c + #define FTMAC100_OFFSET_PHYCR 0x90 +@@ -125,7 +141,7 @@ struct ftmac100_txdes { + unsigned int txdes0; + unsigned int txdes1; + unsigned int txdes2; /* TXBUF_BADR */ +- unsigned int txdes3; /* not used by HW */ ++ unsigned int txdes3; /* TXBUF_BADR_H */ + } __attribute__ ((aligned(16))); + + #define FTMAC100_TXDES0_TXPKT_LATECOL (1 << 0) +@@ -146,7 +162,7 @@ struct ftmac100_rxdes { + unsigned int rxdes0; + unsigned int rxdes1; + unsigned int rxdes2; /* RXBUF_BADR */ +- unsigned int rxdes3; /* not used by HW */ ++ unsigned int rxdes3; /* RXBUF_BADR_H */ + } __attribute__ ((aligned(16))); + + #define FTMAC100_RXDES0_RFL 0x7ff +@@ -164,4 +180,12 @@ struct ftmac100_rxdes { + #define FTMAC100_RXDES1_RXBUF_SIZE(x) ((x) & 0x7ff) + #define FTMAC100_RXDES1_EDORR (1 << 31) + ++struct ftmac100_txdes_ext { ++ void *skb; ++}; ++ ++struct ftmac100_rxdes_ext { ++ void *page; ++}; ++ + #endif /* __FTMAC100_H */ +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0003-Andes-support-for-ATCDMAC.patch b/board/andes/ae350/patches/linux/0003-Andes-support-for-ATCDMAC.patch new file mode 100644 index 0000000000..eb50c1f02d --- /dev/null +++ b/board/andes/ae350/patches/linux/0003-Andes-support-for-ATCDMAC.patch @@ -0,0 +1,3301 @@ +From ddc5b4035397fcdc91afc3a008b6632fa82e3715 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 10:55:06 +0800 +Subject: [PATCH 03/12] Andes support for ATCDMAC + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/include/asm/atcdmac300.h | 543 +++++ + arch/riscv/include/asm/dmad.h | 71 + + arch/riscv/platforms/Kconfig | 21 + + arch/riscv/platforms/Makefile | 2 + + arch/riscv/platforms/ae350/Kconfig | 7 + + arch/riscv/platforms/ae350/Makefile | 1 + + arch/riscv/platforms/ae350/atcdmac300.c | 2531 +++++++++++++++++++++++ + arch/riscv/platforms/dmad_intc.c | 49 + + 8 files changed, 3225 insertions(+) + create mode 100644 arch/riscv/include/asm/atcdmac300.h + create mode 100644 arch/riscv/include/asm/dmad.h + create mode 100644 arch/riscv/platforms/Kconfig + create mode 100644 arch/riscv/platforms/Makefile + create mode 100644 arch/riscv/platforms/ae350/Kconfig + create mode 100644 arch/riscv/platforms/ae350/Makefile + create mode 100644 arch/riscv/platforms/ae350/atcdmac300.c + create mode 100644 arch/riscv/platforms/dmad_intc.c + +diff --git a/arch/riscv/include/asm/atcdmac300.h b/arch/riscv/include/asm/atcdmac300.h +new file mode 100644 +index 000000000000..20fe88212dfc +--- /dev/null ++++ b/arch/riscv/include/asm/atcdmac300.h +@@ -0,0 +1,543 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018 Andes Technology Corporation ++ * ++ */ ++ ++#ifndef __NDS_DMAD_ATF_INC__ ++#define __NDS_DMAD_ATF_INC__ ++ ++/***************************************************************************** ++ * Configuration section ++*****************************************************************************/ ++/* Debug trace enable switch */ ++#define DMAD_ERROR_TRACE 1 /* message for fatal errors */ ++#define DMAD_DEBUG_TRACE 0 /* message for debug trace */ ++typedef u32 addr_t; ++ ++/* Device base address */ ++ ++extern resource_size_t dmac_base; ++#define DMAC_BASE (dmac_base) ++ ++/* ID and Revision Register */ ++#define ID_REV (DMAC_BASE + 0x00) ++/* DMAC Configuration Register*/ ++#define CFG (DMAC_BASE + 0x10) ++#define REQSYNC 30 ++#define CTL (DMAC_BASE + 0x20) ++#define CH_ABT (DMAC_BASE + 0x24) ++/* Interrupt Status Register */ ++#define INT_STA (DMAC_BASE + 0x30) ++#define TC_OFFSET 16 ++#define ABT_OFFSET 8 ++#define ERR_OFFSET 0 ++ ++ ++#define CH_EN (DMAC_BASE + 0x34) ++ ++ ++ ++#define DMAC_CH_OFFSET 0x40 ++#define CH_CTL_OFF 0x0 ++#define CH_SIZE_OFF 0x4 ++#define CH_SRC_LOW_OFF 0x8 ++#define CH_SRC_HIGH_OFF 0xc ++#define CH_DST_LOW_OFF 0x10 ++#define CH_DST_HIGH_OFF 0x14 ++#define CH_LLP_LOW_OFF 0x18 ++#define CH_LLP_HIGH_OFF 0x1c ++ ++ ++#define DMAC_C0_BASE (DMAC_BASE + DMAC_CH_OFFSET) ++#define DMAC_MAX_CHANNELS 8 ++#define DMAC_BASE_CH(n) (DMAC_C0_BASE + n*0x20) ++ ++/***** Channel n Control Register ******/ ++#define CH_CTL(n) DMAC_BASE_CH(n)+CH_CTL_OFF ++#define PRIORITY_SHIFT 29 ++#define PRIORITY_LOW 0 ++#define PRIORITY_HIGH 1 ++#define DMAC_CSR_CHPRI_0 PRIORITY_LOW ++#define DMAC_CSR_CHPRI_1 PRIORITY_LOW ++#define DMAC_CSR_CHPRI_2 PRIORITY_HIGH ++#define DMAC_CSR_CHPRI_3 PRIORITY_HIGH ++ ++ ++#define SBURST_SIZE_SHIFT 24 ++#define SBURST_SIZE_MASK (0xf<<24) ++#define DMAC_CSR_SIZE_1 0x0 ++#define DMAC_CSR_SIZE_2 0x1 ++#define DMAC_CSR_SIZE_4 0x2 ++#define DMAC_CSR_SIZE_8 0x3 ++#define DMAC_CSR_SIZE_16 0x4 ++#define DMAC_CSR_SIZE_32 0x5 ++#define DMAC_CSR_SIZE_64 0x6 ++#define DMAC_CSR_SIZE_128 0x7 ++#define DMAC_CSR_SIZE_256 0x8 ++#define DMAC_CSR_SIZE_512 0x9 ++#define DMAC_CSR_SIZE_1024 0xa ++/* Source transfer width */ ++#define SRCWIDTH 21 ++#define SRCWIDTH_MASK (0x7<> (width)) ++#else ++#define DMAC_CYCLE_TO_BYTES(cycle, width) 0 ++#define DMAC_BYTES_TO_CYCLE(bytes, width) 0 ++#endif /* CONFIG_PLATFORM_AHBDMA */ ++ ++ ++/* Assignment of DMA hardware handshake ID */ ++#define DMAC_REQN_SPITX 0 ++#define DMAC_REQN_SPIRX 1 ++#ifdef CONFIG_PLAT_AE350 ++#define DMAC_REQN_I2SAC97TX 14 ++#define DMAC_REQN_I2SAC97RX 15 ++#else ++ ++#define DMAC_REQN_I2SAC97TX 2 ++#define DMAC_REQN_I2SAC97RX 3 ++#endif ++#define DMAC_REQN_UART1TX 4 ++#define DMAC_REQN_UART1RX 5 ++#define DMAC_REQN_UART2TX 6 ++#define DMAC_REQN_UART2RX 7 ++#define DMAC_REQN_I2C 8 ++#define DMAC_REQN_SDC 9 ++#define DMAC_REQN_NONE 15 ++ ++ ++enum DMAD_DMAC_CORE { ++ DMAD_DMAC_AHB_CORE, ++ DMAD_DMAC_APB_CORE ++}; ++ ++enum DMAD_CHREG_FLAGS { ++ DMAD_FLAGS_NON_BLOCK = 0x00000000, ++ DMAD_FLAGS_SLEEP_BLOCK = 0x00000001, ++ DMAD_FLAGS_SPIN_BLOCK = 0x00000002, ++ DMAD_FLAGS_RING_MODE = 0x00000008, /* ring submission mode */ ++ DMAD_FLAGS_BIDIRECTION = 0x00000010, /* indicates both tx and rx */ ++}; ++ ++enum DMAD_CHDIR ++{ ++ DMAD_DIR_A0_TO_A1 = 0, ++ DMAD_DIR_A1_TO_A0 = 1, ++}; ++ ++/* AHB Channel Request ++ * ++ * Notes for developers: ++ * These should be channel-only properties. Controller-specific properties ++ * should be separated as other driver structure or driver buildin-hardcode. ++ * If controller properties are embeded in this union, request for a channel ++ * may unexpectedly override the controller setting of the request of other ++ * channels. ++ */ ++typedef struct dmad_ahb_chreq ++{ ++ /* channel property */ ++ u32 sync; /* (in) different clock domain */ ++ u32 priority; /* (in) DMAC_CSR_CHPRI_xxx */ ++ u32 hw_handshake; /* (in) hardware handshaking on/off */ ++ u32 burst_size; /* (in) DMAC_CSR_SIZE_xxx */ ++ ++ /* source property */ ++ union { ++ u32 src_width; /* (in) DMAC_CSR_WIDTH_xxx */ ++ u32 addr0_width; /* (in) bi-direction mode alias */ ++ u32 ring_width; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 src_ctrl; /* (in) DMAC_CSR_AD_xxx */ ++ u32 addr0_ctrl; /* (in) bi-direction mode alias */ ++ u32 ring_ctrl; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 src_reqn; /* (in) DMAC_REQN_xxx */ ++ u32 addr0_reqn; /* (in) bi-direction mode alias */ ++ u32 ring_reqn; /* (in) ring-mode alias */ ++ }; ++ ++ /* destination property */ ++ union { ++ u32 dst_width; /* (in) DMAC_CSR_WIDTH_xxx */ ++ u32 addr1_width; /* (in) bi-direction mode alias */ ++ u32 dev_width; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 dst_ctrl; /* (in) DMAC_CSR_AD_xxx */ ++ u32 addr1_ctrl; /* (in) bi-direction mode alias */ ++ u32 dev_ctrl; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 dst_reqn; /* (in) DMAC_REQN_xxx */ ++ u32 addr1_reqn; /* (in) bi-direction mode alias */ ++ u32 dev_reqn; /* (in) ring-mode alias */ ++ }; ++ ++ /* (in) transfer direction, valid only if following flags were set ... ++ * DMAD_FLAGS_BIDIRECTION or ++ * DMAD_FLAGS_RING_MODE ++ * value: ++ * 0 (addr0 -> addr1, or ring-buff to device) ++ * 1 (addr0 <- addr1, or device to ring-buff) ++ */ ++ u32 tx_dir; ++ ++} dmad_ahb_chreq; ++ ++/* APB Channel Request ++ * ++ * Notes for developers: ++ * These should be channel-only properties. Controller-specific properties ++ * should be separated as other driver structure or driver buildin-hardcode. ++ * If controller properties are embeded in this union, request for a channel ++ * may unexpectedly override the controller setting of the request of other ++ * channels. ++ */ ++typedef struct dmad_apb_chreq ++{ ++ /* controller property (removed! should not exist in this struct) */ ++ ++ /* channel property */ ++ u32 burst_mode; /* (in) Burst mode (0/1) */ ++ u32 data_width; /* (in) APBBR_DATAWIDTH_xxx */ ++ ++ /* source property */ ++ union { ++ u32 src_ctrl; /* (in) APBBR_ADDRINC_xxx */ ++ u32 addr0_ctrl; /* (in) bi-direction mode alias */ ++ u32 ring_ctrl; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 src_reqn; /* (in) APBBR_REQN_xxx */ ++ u32 addr0_reqn; /* (in) bi-direction mode alias */ ++ u32 ring_reqn; /* (in) ring-mode alias */ ++ }; ++ ++ /* destination property */ ++ union { ++ u32 dst_ctrl; /* (in) APBBR_ADDRINC_xxx */ ++ u32 addr1_ctrl; /* (in) bi-direction mode alias */ ++ u32 dev_ctrl; /* (in) ring-mode alias */ ++ }; ++ union { ++ u32 dst_reqn; /* (in) APBBR_REQN_xxx */ ++ u32 addr1_reqn; /* (in) bi-direction mode alias */ ++ u32 dev_reqn; /* (in) ring-mode alias */ ++ }; ++ ++ /* (in) transfer direction, valid only if following flags were set ... ++ * DMAD_FLAGS_BIDIRECTION or ++ * DMAD_FLAGS_RING_MODE ++ * value: ++ * 0 (addr0 -> addr1, or ring-buff to device) ++ * 1 (addr0 <- addr1, or device to ring-buff) ++ */ ++ u32 tx_dir; ++ ++} dmad_apb_chreq; ++ ++/* Channel Request Descriptor */ ++typedef struct dmad_chreq ++{ ++ /* common fields */ ++ u32 controller; /* (in) enum DMAD_DMAC_CORE */ ++ u32 flags; /* (in) enum DMAD_CHREQ_FLAGS */ ++ ++ /********************************************************************** ++ * ring mode specific fields (valid only for DMAD_FLAGS_RING_MODE) ++ * note: ++ * - size fields are in unit of data width ++ * * for AHB, ring size is limited to 4K * data_width of data if ++ * hw-LLP is not used ++ * * for AHB, ring size is limited to 4K * data_width * LLP-count ++ * hw-if LLP is used ++ * * for APB, ring size is limited to 16M * data_width of data ++ * - currently sw ring mode dma supports only fixed or incremental ++ * src/dst addressing ++ * - ring_size shoule >= periods * period_size ++ */ ++ dma_addr_t ring_base; /* (in) ring buffer base (pa) */ ++ dma_addr_t ring_size; /* (in) unit of data width */ ++ dma_addr_t dev_addr; /* (in) device data port address */ ++ dma_addr_t periods; /* (in) number of ints per ring */ ++ dma_addr_t period_size; /* (in) size per int, data-width */ ++ ++ ++ /* channel-wise completion callback - called when hw-ptr catches sw-ptr ++ * (i.e., channel stops) ++ * ++ * completion_cb: (in) client supplied callback function, executed in ++ * interrupt context. ++ * completion_data: (in) client private data to be passed to data ++ * argument of completion_cb(). ++ */ ++ void (*completion_cb)(int channel, u16 status, void *data); ++ void *completion_data; ++ /*********************************************************************/ ++ ++ /* channel allocation output */ ++ u32 channel; /* (out) allocated channel */ ++ void *drq; /* (out) internal use (DMAD_DRQ *)*/ ++ ++ /* channel-alloc parameters (channel-wise properties) */ ++ union { ++#ifdef CONFIG_PLATFORM_AHBDMA ++ dmad_ahb_chreq ahb_req; /* (in) for AHB DMA parameters */ ++#endif ++#ifdef CONFIG_PLATFORM_APBDMA ++ dmad_apb_chreq apb_req; /* (in) APB Bridge DMA params */ ++#endif ++ }; ++ ++} dmad_chreq; ++ ++/* drb states are mutual exclusive */ ++enum DMAD_DRB_STATE ++{ ++ DMAD_DRB_STATE_FREE = 0, ++ DMAD_DRB_STATE_READY = 0x00000001, ++ DMAD_DRB_STATE_SUBMITTED = 0x00000002, ++ DMAD_DRB_STATE_EXECUTED = 0x00000004, ++ DMAD_DRB_STATE_COMPLETED = 0x00000008, ++ //DMAD_DRB_STATE_ERROR = 0x00000010, ++ DMAD_DRB_STATE_ABORT = 0x00000020, ++}; ++ ++/* DMA request block ++ * todo: replaced link with kernel struct list_head ?? ++ */ ++typedef struct dmad_drb ++{ ++ u32 prev; /* (internal) previous node */ ++ u32 next; /* (internal) next node */ ++ u32 node; /* (internal) this node */ ++ ++ u32 state; /* (out) DRB's current state */ ++ ++ union { ++ dma_addr_t src_addr; /* (in) source pa */ ++ dma_addr_t addr0; /* (in) bi-direction mode alias */ ++ }; ++ ++ union { ++ dma_addr_t dst_addr; /* (in) destination pa */ ++ dma_addr_t addr1; /* (in) bi-direction mode alias */ ++ }; ++ ++ /* (in) AHB DMA (22 bits): 0 ~ 4M-1, unit is "data width" ++ * APB DMA (24 bits): 0 ~ 16M-1, unit is "data width * burst size" ++ * => for safe without mistakes, use dmad_make_req_cycles() to ++ * compose this value if the addressing mode is incremental ++ * mode (not working yet for decremental mode). ++ */ ++ dma_addr_t req_cycle; ++ ++ /* (in) if non-null, this sync object will be signaled upon dma ++ * completion (for blocked-waiting dma completion) ++ */ ++ struct completion *sync; ++ ++} dmad_drb; ++ ++ ++/****************************************************************************** ++ * Debug Trace Mechanism ++ */ ++#if (DMAD_ERROR_TRACE) ++#define dmad_err(format, arg...) printk(KERN_ERR format , ## arg) ++#else ++#define dmad_err(format, arg...) (void)(0) ++#endif ++ ++#if (DMAD_DEBUG_TRACE) ++#define dmad_dbg(format, arg...) printk(KERN_INFO format , ## arg) ++#else ++#define dmad_dbg(format, arg...) (void)(0) ++#endif ++ ++#if (defined(CONFIG_PLATFORM_AHBDMA) || defined(CONFIG_PLATFORM_APBDMA)) ++ ++/****************************************************************************** ++ * DMAD Driver Interface ++******************************************************************************/ ++ ++extern int dmad_channel_alloc(dmad_chreq *ch_req); ++extern int dmad_channel_free(dmad_chreq *ch_req); ++extern int dmad_channel_enable(const dmad_chreq *ch_req, u8 enable); ++extern u32 dmad_max_size_per_drb(dmad_chreq *ch_req); ++extern u32 dmad_bytes_to_cycles(dmad_chreq *ch_req, u32 byte_size); ++ ++extern int dmad_kickoff_requests(dmad_chreq *ch_req); ++extern int dmad_drain_requests(dmad_chreq *ch_req, u8 shutdown); ++ ++/* for performance reason, these two functions are platform-specific */ ++#ifdef CONFIG_PLATFORM_AHBDMA ++extern int dmad_probe_irq_source_ahb(void); ++#endif ++#ifdef CONFIG_PLATFORM_APBDMA ++extern int dmad_probe_irq_source_apb(void); ++#endif ++ ++/* note: hw_ptr here is phyical address of dma source or destination */ ++extern dma_addr_t dmad_probe_hw_ptr_src(dmad_chreq *ch_req); ++extern dma_addr_t dmad_probe_hw_ptr_dst(dmad_chreq *ch_req); ++ ++/***************************************************************************** ++ * routines only valid in discrete (non-ring) mode ++ */ ++extern int dmad_config_channel_dir(dmad_chreq *ch_req, u8 dir); ++extern int dmad_alloc_drb(dmad_chreq *ch_req, dmad_drb **drb); ++extern int dmad_free_drb(dmad_chreq *ch_req, dmad_drb *drb); ++extern int dmad_submit_request(dmad_chreq *ch_req, ++ dmad_drb *drb, u8 keep_fired); ++extern int dmad_withdraw_request(dmad_chreq *ch_req, dmad_drb *drb); ++/****************************************************************************/ ++ ++/***************************************************************************** ++ * routines only valid in ring mode ++ * note: sw_ptr and hw_ptr are values offset from the ring buffer base ++ * unit of sw_ptr is data-width ++ * unit of hw_ptr returned is byte ++ */ ++extern int dmad_update_ring(dmad_chreq *ch_req); ++extern int dmad_update_ring_sw_ptr(dmad_chreq *ch_req, ++ dma_addr_t sw_ptr, u8 keep_fired); ++extern dma_addr_t dmad_probe_ring_hw_ptr(dmad_chreq *ch_req); ++/****************************************************************************/ ++ ++#else /* CONFIG_PLATFORM_AHBDMA || CONFIG_PLATFORM_APBDMA */ ++ ++static inline int dmad_channel_alloc(dmad_chreq *ch_req) { return -EFAULT; } ++static inline int dmad_channel_free(dmad_chreq *ch_req) { return -EFAULT; } ++static inline int dmad_channel_enable(const dmad_chreq *ch_req, u8 enable) ++ { return -EFAULT; } ++static inline u32 dmad_max_size_per_drb(dmad_chreq *ch_req) { return 0; } ++static inline u32 dmad_bytes_to_cycles(dmad_chreq *ch_req, u32 byte_size) ++ { return 0; } ++static inline int dmad_kickoff_requests(dmad_chreq *ch_req) { return -EFAULT; } ++static inline int dmad_drain_requests(dmad_chreq *ch_req, u8 shutdown) ++ { return -EFAULT; } ++static inline int dmad_probe_irq_source_ahb(void) { return -EFAULT; } ++static inline int dmad_probe_irq_source_apb(void) { return -EFAULT; } ++static inline dma_addr_t dmad_probe_hw_ptr_src(dmad_chreq *ch_req) ++ { return (dma_addr_t)NULL; } ++static inline dma_addr_t dmad_probe_hw_ptr_dst(dmad_chreq *ch_req) ++ { return (dma_addr_t)NULL; } ++static inline int dmad_config_channel_dir(dmad_chreq *ch_req, u8 dir) ++ { return -EFAULT; } ++static inline int dmad_alloc_drb(dmad_chreq *ch_req, dmad_drb **drb) ++ { return -EFAULT; } ++static inline int dmad_free_drb(dmad_chreq *ch_req, dmad_drb *drb) ++ { return -EFAULT; } ++static inline int dmad_submit_request(dmad_chreq *ch_req, ++ dmad_drb *drb, u8 keep_fired) { return -EFAULT; } ++static inline int dmad_withdraw_request(dmad_chreq *ch_req, dmad_drb *drb) ++ { return -EFAULT; } ++static inline int dmad_update_ring(dmad_chreq *ch_req) ++ { return -EFAULT; } ++static inline int dmad_update_ring_sw_ptr(dmad_chreq *ch_req, ++ dma_addr_t sw_ptr, u8 keep_fired) { return -EFAULT; } ++static inline dma_addr_t dmad_probe_ring_hw_ptr(dmad_chreq *ch_req) ++ { return (dma_addr_t)NULL; } ++ ++#endif /* CONFIG_PLATFORM_AHBDMA || CONFIG_PLATFORM_APBDMA */ ++ ++#endif /* __NDS_DMAD_ATF_INC__ */ +diff --git a/arch/riscv/include/asm/dmad.h b/arch/riscv/include/asm/dmad.h +new file mode 100644 +index 000000000000..44c87b49e606 +--- /dev/null ++++ b/arch/riscv/include/asm/dmad.h +@@ -0,0 +1,71 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018 Andes Technology Corporation ++ * ++ */ ++ ++#ifndef __NDS_DMAD_INC__ ++#define __NDS_DMAD_INC__ ++ ++#include ++ ++#ifdef CONFIG_PLATFORM_AHBDMA ++int intc_ftdmac020_init_irq(int irq); ++#endif ++ ++extern resource_size_t ahb_base; ++extern resource_size_t pmu_base; ++ ++#define AMERALD_PRODUCT_ID 0x41471000 ++#define AMERALD_MASK 0xFFFFF000 ++ ++/* DMAC */ ++#define DMAC_FTDMAC020_IRQ_COUNT 8 ++#define DMAC_FTDMAC020_IRQ0 64 ++#define DMAC_FTDMAC020_IRQ1 65 ++#define DMAC_FTDMAC020_IRQ2 66 ++#define DMAC_FTDMAC020_IRQ3 67 ++#define DMAC_FTDMAC020_IRQ4 68 ++#define DMAC_FTDMAC020_IRQ5 69 ++#define DMAC_FTDMAC020_IRQ6 70 ++#define DMAC_FTDMAC020_IRQ7 71 ++ ++/* APBBRG */ ++#define APBBRG_FTAPBBRG020S_IRQ_COUNT 4 ++#define APBBRG_FTAPBBRG020S_IRQ0 72 ++#define APBBRG_FTAPBBRG020S_IRQ1 73 ++#define APBBRG_FTAPBBRG020S_IRQ2 74 ++#define APBBRG_FTAPBBRG020S_IRQ3 75 ++ ++ ++/* Dma irq */ ++#define DMA_IRQ_COUNT DMAC_FTDMAC020_IRQ_COUNT ++#define DMA_IRQ0 DMAC_FTDMAC020_IRQ0 ++#define DMA_IRQ1 DMAC_FTDMAC020_IRQ1 ++#define DMA_IRQ2 DMAC_FTDMAC020_IRQ2 ++#define DMA_IRQ3 DMAC_FTDMAC020_IRQ3 ++#define DMA_IRQ4 DMAC_FTDMAC020_IRQ4 ++#define DMA_IRQ5 DMAC_FTDMAC020_IRQ5 ++#define DMA_IRQ6 DMAC_FTDMAC020_IRQ6 ++#define DMA_IRQ7 DMAC_FTDMAC020_IRQ7 ++ ++ ++struct at_dma_platform_data { ++ unsigned int nr_channels; ++ bool is_private; ++#define CHAN_ALLOCATION_ASCENDING 0 /* zero to seven */ ++#define CHAN_ALLOCATION_DESCENDING 1 /* seven to zero */ ++ unsigned char chan_allocation_order; ++#define CHAN_PRIORITY_ASCENDING 0 /* chan0 highest */ ++#define CHAN_PRIORITY_DESCENDING 1 /* chan7 highest */ ++ unsigned char chan_priority; ++ unsigned short block_size; ++ unsigned char nr_masters; ++ unsigned char data_width[4]; ++ struct resource *io; ++ void __iomem *dmac_regs; ++ void __iomem *pmu_regs; ++ void __iomem *apb_regs; ++}; ++ ++#endif /* __NDS_DMAD_INC__ */ +diff --git a/arch/riscv/platforms/Kconfig b/arch/riscv/platforms/Kconfig +new file mode 100644 +index 000000000000..96462808c5ef +--- /dev/null ++++ b/arch/riscv/platforms/Kconfig +@@ -0,0 +1,21 @@ ++choice ++ prompt "platform type" ++ default PLAT_AE350 ++ ++config PLAT_AE350 ++ bool "ae350 platform" ++ ++endchoice ++ ++if PLAT_AE350 ++source "arch/riscv/platforms/ae350/Kconfig" ++endif ++ ++menu "Common Platform Options" ++ ++config PLATFORM_AHBDMA ++ prompt "platform AHB DMA support" ++ bool ++ default y ++ ++endmenu +diff --git a/arch/riscv/platforms/Makefile b/arch/riscv/platforms/Makefile +new file mode 100644 +index 000000000000..a95c2e44a903 +--- /dev/null ++++ b/arch/riscv/platforms/Makefile +@@ -0,0 +1,2 @@ ++obj-$(CONFIG_PLATFORM_AHBDMA) += dmad_intc.o ++obj-$(CONFIG_PLAT_AE350) += ae350/ +\ No newline at end of file +diff --git a/arch/riscv/platforms/ae350/Kconfig b/arch/riscv/platforms/ae350/Kconfig +new file mode 100644 +index 000000000000..57d3a9aa5508 +--- /dev/null ++++ b/arch/riscv/platforms/ae350/Kconfig +@@ -0,0 +1,7 @@ ++menu "AE3XX Platform Options" ++ ++config ATCDMAC300 ++ def_bool y ++ depends on PLATFORM_AHBDMA ++ ++endmenu +diff --git a/arch/riscv/platforms/ae350/Makefile b/arch/riscv/platforms/ae350/Makefile +new file mode 100644 +index 000000000000..36c86ca38e3b +--- /dev/null ++++ b/arch/riscv/platforms/ae350/Makefile +@@ -0,0 +1 @@ ++obj-y = atcdmac300.o +diff --git a/arch/riscv/platforms/ae350/atcdmac300.c b/arch/riscv/platforms/ae350/atcdmac300.c +new file mode 100644 +index 000000000000..e635328f9362 +--- /dev/null ++++ b/arch/riscv/platforms/ae350/atcdmac300.c +@@ -0,0 +1,2531 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018 Andes Technology Corporation ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++resource_size_t dmac_base; ++ ++static inline addr_t REG_READ(unsigned long r) ++{ ++ return readl((volatile void __iomem *) (unsigned long) r); ++} ++ ++static inline void REG_WRITE(addr_t d, unsigned long r) ++{ ++ writel(d, (volatile void __iomem *) (unsigned long) r); ++} ++ ++#if (defined(CONFIG_PLATFORM_AHBDMA)) ++#define DMAD_AHB_MAX_CHANNELS DMAC_MAX_CHANNELS ++ ++#define DMAD_DRB_POOL_SIZE 32 /* 128 */ ++ ++ ++static inline addr_t din(unsigned long r) ++{ ++ return REG_READ(r); ++} ++ ++static inline void dout(addr_t d, unsigned long r) ++{ ++ REG_WRITE(d,r); ++} ++ ++/* reg/io supplementals */ ++ ++static void setbl(addr_t bit, unsigned long reg) ++{ ++ REG_WRITE(REG_READ(reg) | (addr_t) ((addr_t) 1 << bit), reg); ++} ++ ++static inline void clrbl(addr_t bit, unsigned long reg) ++{ ++ REG_WRITE(REG_READ(reg) & (~((addr_t) ((addr_t) 1 << bit))), reg); ++} ++ ++static inline addr_t getbl(addr_t bit, unsigned long reg) ++{ ++ return REG_READ(reg) & (addr_t) ((addr_t) 1 << bit); ++} ++/******************************************************************************/ ++ ++enum DMAD_DRQ_FLAGS { ++ DMAD_DRQ_STATE_READY = 0x00000001, /* channel allocation status */ ++ DMAD_DRQ_STATE_ABORT = 0x00000002, /* abort drb alloc block-wait */ ++ DMAD_DRQ_DIR_A1_TO_A0 = 0x00000004, /* Transfer direction */ ++}; ++ ++#define DMAD_DRQ_DIR_MASK DMAD_DRQ_DIR_A1_TO_A0 ++ ++/* DMA request queue, one instance per channel */ ++typedef struct dmad_drq { ++ u32 state; /* enum DMAD_DRQ_STATE */ ++ ++ unsigned long channel_base; /* register base address */ ++ unsigned long enable_port; /* enable register */ ++ unsigned long src_port; /* source address register */ ++ unsigned long dst_port; /* dest address register */ ++ unsigned long cyc_port; /* size(cycle) register */ ++ ++ u32 flags; /* enum DMAD_CHREQ_FLAGS */ ++ ++ spinlock_t drb_pool_lock; ++ dmad_drb *drb_pool; /* drb pool */ ++ ++ unsigned long fre_head; /* free list head */ ++ unsigned long fre_tail; /* free list tail */ ++ ++ unsigned long rdy_head; /* ready list head */ ++ unsigned long rdy_tail; /* ready list tail */ ++ ++ unsigned long sbt_head; /* submitted list head */ ++ unsigned long sbt_tail; /* submitted list tail */ ++ ++ u32 data_width; /* dma transfer data width */ ++ ++ struct completion drb_alloc_sync; ++ ++ /* client supplied callback function, executed in interrupt context ++ * client private data to be passed to data argument of completion_cb(). ++ */ ++ void (*completion_cb) (int channel, u16 status, void *data); ++ void *completion_data; ++ ++ /* ring-mode fields are valid for DMAD_FLAGS_RING_MODE */ ++ dma_addr_t ring_base; /* ring buffer base address */ ++ int ring_size; /* size (of data width) */ ++ unsigned long ring_port; /* for setup/fetch hw_ptr */ ++ dmad_drb *ring_drb; ++ ++ addr_t dev_addr; /* device data port */ ++ ++ int periods; /* interrupts periods */ ++ int period_size; /* of dma data with */ ++ dma_addr_t period_bytes; /* Period size, in bytes */ ++ ++ /* ring_size - period_size * periods */ ++ dma_addr_t remnant_size; ++ ++ dma_addr_t sw_ptr; /* sw pointer */ ++ int sw_p_idx; /* current ring_ptr */ ++ dma_addr_t sw_p_off; /* offset to period base */ ++ ++} dmad_drq; ++ ++static inline void dmad_enable_channel(dmad_drq * drq) ++{ ++ setbl(CHEN, drq->enable_port); ++} ++ ++static inline void dmad_disable_channel(dmad_drq * drq) ++{ ++ clrbl(CHEN, drq->enable_port); ++} ++ ++static inline addr_t dmad_is_channel_enabled(dmad_drq * drq) ++{ ++ return (addr_t) getbl(CHEN, drq->enable_port); ++} ++ ++/* system irq number (per channel, ahb) */ ++static const unsigned int ahb_irqs[DMAD_AHB_MAX_CHANNELS] = { ++ DMA_IRQ0, ++ DMA_IRQ1, ++ DMA_IRQ2, ++ DMA_IRQ3, ++ DMA_IRQ4, ++ DMA_IRQ5, ++ DMA_IRQ6, ++ DMA_IRQ7, ++}; ++ ++/* Driver data structure, one instance per system */ ++typedef struct DMAD_DATA_STRUCT { ++ /* Driver data initialization flag */ ++ ++ /* DMA queue pool access control object */ ++ spinlock_t drq_pool_lock; ++ ++ /* DMA queue base address, to ease alloc/free flow */ ++ dmad_drq *drq_pool; ++ /* DMA queue for AHB DMA channels */ ++ dmad_drq *ahb_drq_pool; ++ void *plat; ++} DMAD_DATA; ++ ++/* Driver data structure instance, one instance per system */ ++ ++static DMAD_DATA dmad __attribute__ ((aligned(8))) = { ++ ++ .drq_pool_lock = __SPIN_LOCK_UNLOCKED(dmad.drq_pool_lock), ++ .drq_pool = 0, ++ .ahb_drq_pool = 0, ++ .plat = 0, ++}; ++ ++/** ++ * dmad_next_drb - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @node : [in] The node number to lookup its next node ++ * @drb : [out] The drb next to the "node" node number ++ * ++ * Lookup next DRB of the specified node number. "drb" is null if reaches end ++ * of the list. ++ */ ++static inline void dmad_next_drb(dmad_drb * drb_pool, u32 node, dmad_drb ** drb) ++{ ++ if (likely(drb_pool[node].next != 0)) ++ *drb = &drb_pool[drb_pool[node].next]; ++ else ++ *drb = 0; ++} ++ ++/** ++ * dmad_prev_drb - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @node : [in] The node number to lookup its previous node ++ * @drb : [out] The drb previous to the "node" node number ++ * ++ * Lookup previous DRB of the specified node number. "drb" is null if reaches ++ * head-end of the list. ++ */ ++static inline void dmad_prev_drb(dmad_drb * drb_pool, u32 node, dmad_drb ** drb) ++{ ++ if (unlikely(drb_pool[node].prev != 0)) ++ *drb = &drb_pool[drb_pool[node].prev]; ++ else ++ *drb = 0; ++} ++ ++/** ++ * dmad_detach_node - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @node : [in] The node to be dettached from the queue ++ * ++ * Detached a DRB specified by the node number from the queue. The head and ++ * tail records will be updated accordingly. ++ */ ++static inline void dmad_detach_node(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, u32 node) ++{ ++ if (likely(drb_pool[node].prev != 0)) { ++ /* prev->next = this->next (= 0, if this is a tail) */ ++ drb_pool[drb_pool[node].prev].next = drb_pool[node].next; ++ } else { ++ /* this node is head, move head to next node ++ * (= 0, if this is the only one node) */ ++ *head = drb_pool[node].next; ++ } ++ ++ if (unlikely(drb_pool[node].next != 0)) { ++ /* next->prev = this->prev (= 0, if this is a head) */ ++ drb_pool[drb_pool[node].next].prev = drb_pool[node].prev; ++ } else { ++ /* this node is tail, move tail to previous node ++ * (= 0, if this is the only one node) */ ++ *tail = drb_pool[node].prev; ++ } ++ ++ drb_pool[node].prev = drb_pool[node].next = 0; ++} ++ ++/** ++ * dmad_detach_head - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @drb : [out] The detached head node; null if the queue is empty ++ * ++ * Detached a DRB from the head of the queue. The head and tail records will ++ * be updated accordingly. ++ */ ++static inline void dmad_detach_head(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, dmad_drb ** drb) ++{ ++ if (unlikely(*head == 0)) { ++ *drb = NULL; ++ return; ++ } ++ ++ *drb = &drb_pool[*head]; ++ ++ if (likely((*drb)->next != 0)) { ++ /* next->prev = this->prev (= 0, if this is a head) */ ++ drb_pool[(*drb)->next].prev = 0; ++ ++ /* prev->next = this->next (do nothing, if this is a head) */ ++ ++ /* head = this->next */ ++ *head = (*drb)->next; ++ } else { ++ /* head = tail = 0 */ ++ *head = 0; ++ *tail = 0; ++ } ++ ++ /* this->prev = this->next = 0 (do nothing, if save code size) */ ++ (*drb)->prev = (*drb)->next = 0; ++} ++ ++/** ++ * dmad_get_head - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @drb : [out] The head node; null if the queue is empty ++ * ++ * Get a DRB from the head of the queue. The head and tail records remain ++ * unchanged. ++ */ ++static inline void dmad_get_head(dmad_drb * drb_pool, const unsigned long * head, ++ const unsigned long * tail, dmad_drb ** drb) ++{ ++ if (unlikely(*head == 0)) { ++ *drb = NULL; ++ return; ++ } ++ ++ *drb = &drb_pool[*head]; ++} ++ ++/** ++ * dmad_detach_tail - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @drb : [out] The tail node; null if the queue is empty ++ * ++ * Detached a DRB from the head of the queue. The head and tail records will ++ * be updated accordingly. ++ */ ++static inline void dmad_detach_tail(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, dmad_drb ** drb) ++{ ++ if (unlikely(*tail == 0)) { ++ *drb = NULL; ++ return; ++ } ++ ++ *drb = &drb_pool[*tail]; ++ ++ if (likely((*drb)->prev != 0)) { ++ /* prev->next = this->next (= 0, if this is a tail) */ ++ drb_pool[(*drb)->prev].next = 0; ++ ++ /* next->prev = this->prev (do nothing, if this is a tail) */ ++ ++ /* tail = this->prev */ ++ *tail = (*drb)->prev; ++ } else { ++ /* head = tail = 0 */ ++ *head = 0; ++ *tail = 0; ++ } ++ ++ /* this->next = this->prev = 0 (do nothing, if save code size) */ ++ (*drb)->prev = (*drb)->next = 0; ++} ++ ++/** ++ * dmad_get_tail - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @drb : [out] The tail node; null if the queue is empty ++ * ++ * Get a DRB from the tail of the queue. The head and tail records remain ++ * unchanged. ++ */ ++static inline void dmad_get_tail(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, dmad_drb ** drb) ++{ ++ if (unlikely(*tail == 0)) { ++ *drb = NULL; ++ return; ++ } ++ ++ *drb = &drb_pool[*tail]; ++} ++ ++/** ++ * dmad_attach_head - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @node : [in] The node to be attached ++ * ++ * Attach a DRB node to the head of the queue. The head and tail records will ++ * be updated accordingly. ++ */ ++static inline void dmad_attach_head(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, u32 node) ++{ ++ if (likely(*head != 0)) { ++ /* head->prev = this */ ++ drb_pool[*head].prev = node; ++ ++ /* this->next = head */ ++ drb_pool[node].next = *head; ++ /* this->prev = 0 */ ++ drb_pool[node].prev = 0; ++ ++ /* head = node */ ++ *head = node; ++ } else { ++ /* head = tail = node */ ++ *head = *tail = node; ++ drb_pool[node].prev = drb_pool[node].next = 0; ++ } ++} ++ ++/** ++ * dmad_attach_head - static function ++ * @drb_pool : [in] The raw DRB pool of a DMA channel ++ * @head : [in/out] Reference to the head node number ++ * @tail : [in/out] Reference to the tail node number ++ * @node : [in] The node to be attached ++ * ++ * Attach a DRB node to the tail of the queue. The head and tail records will ++ * be updated accordingly. ++ */ ++static inline void dmad_attach_tail(dmad_drb * drb_pool, ++ unsigned long * head, unsigned long * tail, u32 node) ++{ ++ if (likely(*tail != 0)) { ++ /* tail->next = this */ ++ drb_pool[*tail].next = node; ++ ++ /* this->prev = tail */ ++ drb_pool[node].prev = *tail; ++ /* this->next = 0 */ ++ drb_pool[node].next = 0; ++ ++ /* tail = node */ ++ *tail = node; ++ } else { ++ /* head = tail = node */ ++ *head = *tail = node; ++ drb_pool[node].prev = drb_pool[node].next = 0; ++ } ++} ++ ++#ifdef CONFIG_PLATFORM_AHBDMA ++ ++/** ++ * dmad_ahb_isr - AHB DMA interrupt service routine ++ * ++ * @irq : [in] The irq number ++ * @dev_id : [in] The identifier to identify the asserted channel ++ * ++ * This is the ISR that services all AHB DMA channels. ++ */ ++static irqreturn_t dmad_ahb_isr(int irq, void *dev_id) ++{ ++ dmad_drq *drq; ++ dmad_drb *drb, *drb_iter; ++ u32 channel = ((unsigned long) dev_id) - 1; ++ u8 tc_int = 0; ++ u8 err_int = 0; ++ u8 abt_int = 0; ++ u8 cpl_events = 1; ++ ++ dmad_dbg("%s() >> channel(%d)\n", __func__, channel); ++ ++ if (channel >= DMAD_AHB_MAX_CHANNELS) { ++ dmad_err("%s() invlaid channel number: %d!\n", ++ __func__, channel); ++ return IRQ_HANDLED; ++ } ++ ++ /* Fetch channel's DRQ struct (DMA Request Queue) */ ++ drq = (dmad_drq *) & dmad.ahb_drq_pool[channel]; ++ ++ /* Check DMA status register to get channel number */ ++ if (likely(getbl(channel+TC_OFFSET, (unsigned long)INT_STA))) { ++ ++ /* Mark as TC int */ ++ tc_int = 1; ++ ++ /* DMAC INT TC status clear */ ++ setbl(channel+TC_OFFSET, (unsigned long)INT_STA); ++ ++ } else if (getbl(channel+ERR_OFFSET, (unsigned long)INT_STA)) { ++ ++ /* Mark as ERR int */ ++ err_int = 1; ++ ++ /* DMAC INT ERR status clear */ ++ setbl(channel+ERR_OFFSET, (unsigned long)INT_STA); ++ ++ } else if (getbl(channel+ABT_OFFSET, (unsigned long)INT_STA)) { ++ ++ /* Mark as ABT int */ ++ abt_int = 1; ++ ++ /* DMAC INT ABT status clear */ ++ setbl(channel+INT_STA, (unsigned long)INT_STA); ++ ++ } else { ++ ++ dmad_err("%s() possible false-fired ahb dma int," ++ "channel %d status-reg: status(0x%08x)\n", ++ __func__, channel,din((unsigned long)INT_STA)); ++ ++ /* Stop DMA channel (make sure the channel will be stopped) */ ++ clrbl(CH_EN, drq->enable_port); ++ return IRQ_HANDLED; ++ } ++ ++ /* DMAC ++ * Stop DMA channel temporarily */ ++ dmad_disable_channel(drq); ++ ++ spin_lock(&drq->drb_pool_lock); ++ ++ /* Lookup/detach latest submitted DRB (DMA Request Block) from ++ * the DRQ (DMA Request Queue), so ISR could kick off next DRB */ ++ dmad_detach_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); ++ if (drb == NULL) { ++ spin_unlock(&drq->drb_pool_lock); ++ /* submitted list could be empty if client cancel all requests ++ * of the channel. */ ++ return IRQ_HANDLED; ++ } ++ ++ /* release blocking of drb-allocation, if any ... */ ++ if (unlikely((drq->fre_head == 0) && ++ (drq->flags & DMAD_FLAGS_SLEEP_BLOCK))) { ++ complete_all(&drq->drb_alloc_sync); ++ } ++ ++ /* Process DRBs according to interrupt reason */ ++ if (tc_int) { ++ ++ dmad_dbg("dma finish\n"); ++ ++ dmad_dbg("finish drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x)\n", ++ drb->node, (u32) drb, drb->src_addr, ++ drb->dst_addr, drb->req_cycle); ++ ++ if (drb->req_cycle == 0) ++ cpl_events = 0; ++ ++ // Mark DRB state as completed ++ drb->state = DMAD_DRB_STATE_COMPLETED; ++ if (cpl_events && drb->sync) ++ complete_all(drb->sync); ++ ++ dmad_attach_tail(drq->drb_pool, &drq->fre_head, ++ &drq->fre_tail, drb->node); ++ ++ // Check whether there are pending requests in the DRQ ++ if (drq->sbt_head != 0) { ++ ++ // Lookup next DRB (DMA Request Block) ++ drb_iter = &drq->drb_pool[drq->sbt_head]; ++ ++ dmad_dbg("exec drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x)\n", ++ drb_iter->node, (u32) drb_iter, ++ drb_iter->src_addr, drb_iter->dst_addr, ++ drb_iter->req_cycle); ++ ++ // Kick-off DMA for next DRB ++ // - Source and destination address ++ if (drq->flags & DMAD_DRQ_DIR_A1_TO_A0) { ++ dout(drb_iter->addr1, (unsigned long)drq->src_port); ++ dout(drb_iter->addr0, (unsigned long)drq->dst_port); ++ } else { ++ dout(drb_iter->addr0, (unsigned long)drq->src_port); ++ dout(drb_iter->addr1, (unsigned long)drq->dst_port); ++ } ++ ++ /* - Transfer size (in units of source width) */ ++ dout(drb_iter->req_cycle, (unsigned long)drq->cyc_port); ++ ++ /* Kick off next request */ ++ dmad_enable_channel(drq); ++ ++ drb_iter->state = DMAD_DRB_STATE_EXECUTED; ++ ++ } else { ++ /* No pending requests, keep the DMA channel stopped */ ++ } ++ ++ } else { ++ ++ dmad_err("%s() ahb dma channel %d error!\n", __func__, channel); ++ ++ /* Zero out src, dst, and size */ ++ dout(0, (unsigned long)drq->src_port); ++ dout(0, (unsigned long)drq->dst_port); ++ dout(0, (unsigned long)drq->cyc_port); ++ ++ /* Remove all pending requests in the queue */ ++ drb_iter = drb; ++ while (drb_iter) { ++ ++ dmad_err("abort drb "); ++ ++ if (drb_iter->req_cycle == 0) ++ cpl_events = 0; ++ ++ /* Mark DRB state as abort */ ++ drb_iter->state = DMAD_DRB_STATE_ABORT; ++ ++ if (cpl_events && drb_iter->sync) ++ complete_all(drb_iter->sync); ++ ++ dmad_attach_tail(drq->drb_pool, &drq->fre_head, ++ &drq->fre_tail, drb_iter->node); ++ ++ /* Detach next submitted DRB (DMA Request Block) ++ * from the DRQ (DMA Request Queue) */ ++ dmad_detach_head(drq->drb_pool, &drq->sbt_head, ++ &drq->sbt_tail, &drb_iter); ++ } ++ } ++ ++ spin_unlock(&drq->drb_pool_lock); ++ ++ /* dispatch interrupt-context level callbacks */ ++ if (cpl_events && drq->completion_cb) { ++ /* signal DMA driver that new node is available */ ++ drq->completion_cb(channel, tc_int, drq->completion_data); ++ } ++ ++ dmad_dbg("%s() <<\n", __func__); ++ ++ return IRQ_HANDLED; ++} ++ ++/** ++ * dmad_ahb_config_dir - prepare command reg according to tx direction ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @channel_cmds : [out] Reference to array of command words to be prepared with ++ * @return : none ++ * ++ * Prepare command registers according to transfer direction ... ++ * channel_cmd[0] DMAC_CSR ++ * channel_cmd[1] DMAC_CFG ++ * ++ * This function only serves as local helper. No protection wrappers. ++ */ ++static void dmad_ahb_config_dir(dmad_chreq * ch_req, unsigned long * channel_cmds) ++{ ++ dmad_drq *drq = (dmad_drq *) ch_req->drq; ++ dmad_ahb_chreq *ahb_req = (dmad_ahb_chreq *) (&ch_req->ahb_req); ++ channel_control ch_ctl; ++ dmad_dbg("%s() channel_cmds(0x%08x)\n",__func__, channel_cmds[0]); ++ channel_cmds[0] &= ~(u32)(SRCWIDTH_MASK|SRCADDRCTRL_MASK| ++ DSTWIDTH_MASK|DSTADDRCTRL_MASK| ++ SRC_HS|DST_HS|SRCREQSEL_MASK|DSTREQSEL_MASK); ++ ++ if (ahb_req->tx_dir == 0) { ++ dmad_dbg("%s() addr0 --> addr1\n", __func__); ++ memcpy((u8 *)&ch_ctl.sWidth,(u8 *)&ahb_req->addr0_width,12); ++ memcpy((u8 *)&ch_ctl.dWidth,(u8 *)&ahb_req->addr1_width,12); ++ drq->flags &= ~(addr_t) DMAD_DRQ_DIR_A1_TO_A0; ++ }else{ ++ dmad_dbg("%s() addr0 <-- addr1\n", __func__); ++ memcpy((u8 *)&ch_ctl.sWidth,(u8 *)&ahb_req->addr1_width,12); ++ memcpy((u8 *)&ch_ctl.dWidth,(u8 *)&ahb_req->addr0_width,12); ++ drq->flags |= (addr_t) DMAD_DRQ_DIR_A1_TO_A0; ++ } ++ channel_cmds[0] |=(((ch_ctl.sWidth << SRCWIDTH) &SRCWIDTH_MASK) | ++ ((ch_ctl.sCtrl << SRCADDRCTRL) &SRCADDRCTRL_MASK) | ++ ((ch_ctl.dWidth << DSTWIDTH) &DSTWIDTH_MASK) | ++ ((ch_ctl.dCtrl << DSTADDRCTRL) &DSTADDRCTRL_MASK)); ++ drq->data_width = ch_ctl.sWidth; ++ if (likely(ahb_req->hw_handshake != 0)) { ++ if (ch_ctl.sReqn != DMAC_REQN_NONE) ++ { ++ channel_cmds[0] |= (SRC_HS | ++ ((ch_ctl.sReqn <drq; ++ dmad_ahb_chreq *ahb_req = (dmad_ahb_chreq *) (&ch_req->ahb_req); ++ u32 channel = (u32) ch_req->channel; ++ ++ unsigned long channel_base = drq->channel_base; ++ addr_t channel_cmds[1]; ++ unsigned long lock_flags; ++ dmad_dbg("%s()\n", __func__); ++ /* register interrupt handler */ ++ err = request_irq(ahb_irqs[channel], dmad_ahb_isr, 0, ++ "AHB_DMA", (void *)(unsigned long)(channel + 1)); ++ if (unlikely(err != 0)) { ++ dmad_err("unable to request IRQ %d for AHB DMA " ++ "(error %d)\n", ahb_irqs[channel], err); ++ free_irq(ahb_irqs[channel], (void *)(unsigned long)(channel + 1)); ++ return err; ++ } ++ spin_lock_irqsave(&dmad.drq_pool_lock, lock_flags); ++ ++ /* - INT TC/ERR/ABT status clear */ ++ setbl(channel+TC_OFFSET, (unsigned long)INT_STA); ++ setbl(channel+ABT_OFFSET, (unsigned long)INT_STA); ++ setbl(channel+ERR_OFFSET, (unsigned long)INT_STA); ++ ++ /* - SYNC */ ++ if (ahb_req->sync != (getbl(REQSYNC, CFG)>>REQSYNC)) ++ { ++ printk("sync configuration error !\n"); ++ return EINVAL; ++ } ++ if(ahb_req->priority > PRIORITY_HIGH) ++ ahb_req->priority = PRIORITY_HIGH; ++ ++ channel_cmds[0] = (ahb_req->priority << PRIORITY_SHIFT); ++ channel_cmds[0] |= (ahb_req->burst_size << SBURST_SIZE_SHIFT) & ++ SBURST_SIZE_MASK; ++ ++ if (0 == ++ (ch_req->flags & (DMAD_FLAGS_RING_MODE | DMAD_FLAGS_BIDIRECTION))) ++ ahb_req->tx_dir = 0; ++ ++ dmad_ahb_config_dir(ch_req, (unsigned long *)channel_cmds); ++ dout(channel_cmds[0], (unsigned long)drq->enable_port); ++ ++ /* SRCADR and DESADR */ ++ dout(0, (unsigned long) drq->src_port); ++ dout(0, (unsigned long) drq->dst_port); ++ /* CYC (transfer size) */ ++ dout(0, (unsigned long) drq->cyc_port); ++ /* LLP */ ++ dout(0, (unsigned long)channel_base + CH_LLP_LOW_OFF); ++ ++ /* TOT_SIZE - not now */ ++ spin_unlock_irqrestore(&dmad.drq_pool_lock, lock_flags); ++ ++ return err; ++} ++ ++#endif /* CONFIG_PLATFORM_AHBDMA */ ++/** ++ * dmad_channel_init - initialize given dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * This function serves as the abstraction layer of dmad_ahb_init() ++ * and dmad_apb_init() functions. ++ */ ++static int dmad_channel_init(dmad_chreq * ch_req) ++{ ++ int err = 0; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) ++ return -EFAULT; ++ ++ if (unlikely(ch_req->drq == NULL)) ++ return -EBADR; ++ ++ /* Initialize DMA controller */ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ err = dmad_ahb_init(ch_req); ++ return err; ++} ++ ++static inline void dmad_reset_channel(dmad_drq * drq) ++{ ++ /* disable dma controller */ ++ dmad_disable_channel(drq); ++ ++ /* Source and destination address */ ++ dout(0, (unsigned long)drq->src_port); ++ dout(0, (unsigned long)drq->dst_port); ++ ++ /* Transfer size (in units of source width) */ ++ dout(0, (unsigned long)drq->cyc_port); ++} ++ ++/** ++ * dmad_channel_reset - reset given dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * This function serves as the abstraction layer of dmad_ahb_reset() ++ * and dmad_apb_reset() functions. ++ */ ++static int dmad_channel_reset(dmad_chreq * ch_req) ++{ ++ u32 channel = (u32) ch_req->channel; ++ unsigned long lock_flags; ++ int err = 0; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) ++ return -EFAULT; ++ ++ if (unlikely(ch_req->drq == NULL)) ++ return -EBADR; ++ ++ spin_lock_irqsave(&((dmad_drq *) ch_req->drq)->drb_pool_lock, ++ lock_flags); ++ ++ /* stop DMA channel */ ++ dmad_reset_channel((dmad_drq *) ch_req->drq); ++ ++ spin_unlock_irqrestore(&((dmad_drq *) ch_req->drq)->drb_pool_lock, ++ lock_flags); ++ ++ /* unregister interrupt handler */ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ free_irq(ahb_irqs[channel], (void *)(unsigned long)(channel + 1)); ++ ++ return err; ++} ++ ++/** ++ * dmad_channel_alloc - allocates and initialize a dma channel ++ * @ch_req : [in/out] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * This function allocates a DMA channel according to client's request ++ * parameters. ISR and HW state will also be initialized accordingly. ++ */ ++int dmad_channel_alloc(dmad_chreq * ch_req) ++{ ++ dmad_drq *drq_iter = NULL; ++ dmad_drb *drb_iter; ++ int err = 0; ++ u32 i = 0; ++ dmad_dbg("%s()\n", __func__); ++ ++ if (ch_req == NULL) { ++ printk(KERN_ERR "%s() invalid argument!\n", __func__); ++ return -EFAULT; ++ } ++ ++ spin_lock(&dmad.drq_pool_lock); ++ ++ /* locate an available DMA channel */ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ ++ drq_iter = dmad.ahb_drq_pool; ++ ++ if ((ch_req->ahb_req.src_reqn != DMAC_REQN_NONE) || ++ (ch_req->ahb_req.dst_reqn != DMAC_REQN_NONE)) { ++ /* [2007-12-03] It looks current board have problem to ++ * do dma traffic for APB devices on DMAC channel 0/1. ++ * Redirect all APB devices to start from channel 2. ++ */ ++ ++ /* [todo] include USB controller ? */ ++ drq_iter = &dmad.ahb_drq_pool[2]; ++ for (i = 2; i < DMAD_AHB_MAX_CHANNELS; ++i, ++drq_iter) { ++ if (!(drq_iter->state & DMAD_DRQ_STATE_READY)) ++ break; ++ } ++ } else { ++ /* channel for other devices is free to allocate */ ++ for (i = 0; i < DMAD_AHB_MAX_CHANNELS; ++i, ++drq_iter) { ++ if (!(drq_iter->state & DMAD_DRQ_STATE_READY)) ++ break; ++ } ++ } ++ if (unlikely(i == DMAD_AHB_MAX_CHANNELS)) { ++ spin_unlock(&dmad.drq_pool_lock); ++ dmad_err("out of available channels (AHB DMAC)!\n"); ++ return -ENOSPC; ++ } ++ ++ dmad_dbg("allocated channel: %d (AHB DMAC)\n", i); ++ } ++ ++ if (drq_iter == NULL) { ++ spin_unlock(&dmad.drq_pool_lock); ++ printk(KERN_ERR "%s() invalid argument!\n", __func__); ++ return -EFAULT; ++ } ++ ++ spin_unlock(&dmad.drq_pool_lock); ++ memset(drq_iter, 0, sizeof(dmad_drq)); ++ ++ /* Initialize DMA channel's DRB pool as list of free DRBs */ ++ drq_iter->drb_pool = ++ kmalloc(DMAD_DRB_POOL_SIZE * sizeof(dmad_drb), GFP_ATOMIC); ++ ++ if (drq_iter->drb_pool == NULL) { ++ printk(KERN_ERR "%s() failed to allocate drb pool!\n", ++ __func__); ++ return -ENOMEM; ++ } ++ ++ /* Allocate the DMA channel */ ++ drq_iter->state = DMAD_DRQ_STATE_READY; ++ drq_iter->flags = ch_req->flags; ++ ++ /* Initialize synchronization object for DMA queue access control */ ++ spin_lock_init(&drq_iter->drb_pool_lock); ++ ++ /* Initialize synchronization object for free drb notification */ ++ init_completion(&drq_iter->drb_alloc_sync); ++ ++ /* Record the channel number in client's struct */ ++ ch_req->channel = i; ++ /* Record the channel's queue handle in client's struct */ ++ ch_req->drq = drq_iter; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ drq_iter->channel_base = (unsigned long) DMAC_BASE_CH(i); ++ drq_iter->enable_port = (unsigned long) CH_CTL(i); ++ drq_iter->src_port = (unsigned long) CH_SRC_L(i); ++ drq_iter->dst_port = (unsigned long) CH_DST_L(i); ++ drq_iter->cyc_port = (unsigned long) CH_SIZE(i); ++ } ++ /* drb-0 is an invalid node - for node validation */ ++ drb_iter = &drq_iter->drb_pool[0]; ++ drb_iter->prev = 0; ++ drb_iter->next = 0; ++ drb_iter->node = 0; ++ ++drb_iter; ++ ++ /* init other drbs - link in order */ ++ for (i = 1; i < DMAD_DRB_POOL_SIZE; ++i, ++drb_iter) { ++ drb_iter->prev = i - 1; ++ drb_iter->next = i + 1; ++ drb_iter->node = i; ++ } ++ drq_iter->drb_pool[DMAD_DRB_POOL_SIZE - 1].next = 0; ++ ++ /* Initialize channel's DRB free-list, ready-list, and submitted-list */ ++ drq_iter->fre_head = 1; ++ drq_iter->fre_tail = DMAD_DRB_POOL_SIZE - 1; ++ drq_iter->rdy_head = drq_iter->rdy_tail = 0; ++ drq_iter->sbt_head = drq_iter->sbt_tail = 0; ++ ++ /* initialize ring buffer mode resources */ ++ if (ch_req->flags & DMAD_FLAGS_RING_MODE) { ++ ++ int remnant = (int)ch_req->ring_size - ++ (int)ch_req->periods * (int)ch_req->period_size; ++ if (remnant == 0) { ++ drq_iter->periods = ch_req->periods; ++ } else if (remnant > 0) { ++ drq_iter->periods = ch_req->periods; // + 1; ++ } else { ++ dmad_err("%s() Error - buffer_size < " ++ "periods * period_size!\n", __func__); ++ err = -EFAULT; ++ goto _err_exit; ++ } ++ ++ drq_iter->ring_size = ch_req->ring_size; ++ drq_iter->period_size = ch_req->period_size; ++ drq_iter->remnant_size = (dma_addr_t) remnant; ++ ++ drq_iter->ring_base = (dma_addr_t) ch_req->ring_base; ++ drq_iter->dev_addr = (dma_addr_t) ch_req->dev_addr; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ if ((ch_req->ahb_req.ring_ctrl == DMAC_CSR_AD_DEC) || ++ (ch_req->ahb_req.dev_ctrl == DMAC_CSR_AD_DEC)) { ++ dmad_err("%s() Error - decremental" ++ " addressing DMA is not supported in" ++ " ring mode currently!\n", __func__); ++ err = -EFAULT; ++ goto _err_exit; ++ } ++ ++ if (ch_req->ahb_req.ring_ctrl == DMAC_CSR_AD_FIX) { ++ dmad_err("%s() Error - ring address control is " ++ "fixed in ring DMA mode!\n", __func__); ++ err = -EFAULT; ++ goto _err_exit; ++ } ++ ++ drq_iter->period_bytes = ++ DMAC_CYCLE_TO_BYTES(ch_req->period_size, ++ ch_req->ahb_req.ring_width); ++ ++ /* 0 - addr0 to addr1; 1 - addr1 to addr0 */ ++ if (ch_req->ahb_req.tx_dir == 0) ++ drq_iter->ring_port =(unsigned long) drq_iter->src_port; ++ else ++ drq_iter->ring_port =(unsigned long) drq_iter->dst_port; ++ ++ } ++ ++ dmad_dbg("%s() ring: base(0x%08x) port(0x%08x) periods(0x%08x)" ++ " period_size(0x%08x) period_bytes(0x%08x)" ++ " remnant_size(0x%08x)\n", ++ __func__, drq_iter->ring_base, drq_iter->ring_port, ++ drq_iter->periods, drq_iter->period_size, ++ drq_iter->period_bytes, drq_iter->remnant_size); ++ } ++ ++ drq_iter->completion_cb = ch_req->completion_cb; ++ drq_iter->completion_data = ch_req->completion_data; ++ ++ /* Initialize the channel && register isr */ ++ err = dmad_channel_init(ch_req); ++ ++_err_exit: ++ ++ if (err != 0) { ++ spin_lock(&dmad.drq_pool_lock); ++ ++ kfree(drq_iter->drb_pool); ++ memset(drq_iter, 0, sizeof(dmad_drq)); ++ ++ ch_req->channel = -1; ++ ch_req->drq = (void *)0; ++ ++ spin_unlock(&dmad.drq_pool_lock); ++ ++ dmad_err("Failed to initialize APB DMA! " ++ "Channel allocation aborted!\n"); ++ } ++ ++ return err; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_channel_alloc); ++ ++/** ++ * dmad_channel_free - release a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * This function releases a DMA channel. The channel is available for future ++ * allocation after the invokation. ++ */ ++int dmad_channel_free(dmad_chreq * ch_req) ++{ ++ dmad_drq *drq; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ if (unlikely((ch_req->channel < 0) || ++ ((drq->state & DMAD_DRQ_STATE_READY) == 0))) { ++ dmad_err("try to free a free channel!\n"); ++ return -EBADR; ++ } ++ ++ /* Stop/abort channel I/O ++ * (forced to shutdown and should be protected against isr) ++ */ ++ dmad_drain_requests(ch_req, 1); ++ dmad_channel_reset(ch_req); ++ ++ dmad_dbg("freed channel: %d\n", ch_req->channel); ++ ++ spin_lock(&dmad.drq_pool_lock); ++ ++ kfree(drq->drb_pool); ++ memset(drq, 0, sizeof(dmad_drq)); ++ ++ ch_req->drq = 0; ++ ch_req->channel = (u32) - 1; ++ ++ spin_unlock(&dmad.drq_pool_lock); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_channel_free); ++ ++/** ++ * dmad_channel_enable - enable/disable a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @enable : [in] 1 to enable the channel, 0 to disable ++ * @return : 0 if success, non-zero if any error ++ * ++ * Enable or disable the given DMA channel. ++ */ ++int dmad_channel_enable(const dmad_chreq * ch_req, u8 enable) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) ++ return -EFAULT; ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) ++ return -EBADR; ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* Enable/disable DMA channel */ ++ if (enable) ++ dmad_enable_channel(drq); ++ else ++ dmad_disable_channel(drq); ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_channel_enable); ++ ++/** ++ * dmad_config_channel_dir - config dma channel transfer direction ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @dir : [in] DMAD_DRQ_DIR_A0_TO_A1 or DMAD_DRQ_DIR_A1_TO_A0 ++ * @return : 0 if success, non-zero if any error ++ * ++ * Reconfigure the channel transfer direction. This function works only if ++ * the channel was allocated with the DMAD_FLAGS_BIDIRECTION flags. Note ++ * that bi-direction mode and ring mode are mutual-exclusive from user's ++ * perspective. ++ */ ++int dmad_config_channel_dir(dmad_chreq * ch_req, u8 dir) ++{ ++ dmad_drq *drq; ++ addr_t channel_cmds[1]; ++ unsigned long lock_flags; ++ u8 cur_dir; ++ ++ if (unlikely(ch_req == NULL)) ++ return -EFAULT; ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) ++ return -EBADR; ++ ++ if (unlikely(!(ch_req->flags & DMAD_FLAGS_BIDIRECTION))) { ++ dmad_err("%s() Channel is not configured as" ++ " bidirectional!\n", __func__); ++ return -EFAULT; ++ } ++ ++ cur_dir = drq->flags & DMAD_DRQ_DIR_MASK; ++ if (dir == cur_dir) { ++ dmad_dbg("%s() cur_dir(%d) == dir(%d) skip reprogramming hw.\n", ++ __func__, cur_dir, dir); ++ return 0; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ if (unlikely((drq->sbt_head != 0) /*||dmad_is_channel_enabled(drq) */ )) { ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ dmad_err("%s() Cannot change direction while the " ++ "channel has pending requests!\n", __func__); ++ return -EFAULT; ++ } ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ channel_cmds[0] = din((unsigned long)drq->enable_port); ++ ch_req->ahb_req.tx_dir = dir; ++ dmad_ahb_config_dir(ch_req, (unsigned long *)channel_cmds); ++ dout(channel_cmds[0], (unsigned long)drq->enable_port); ++ } ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_config_channel_dir); ++ ++/** ++ * dmad_max_size_per_drb - return maximum transfer size per drb ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : The maximum transfer size per drb, in bytes. ++ * ++ * Calculate the maximum transfer size per drb according to the setting of ++ * data width during channel initialization. ++ * ++ * Return size is aligned to 4-byte boundary; this ensures the alignment ++ * requirement of dma starting address if the function was used in a loop to ++ * separate a large size dma transfer. ++ */ ++u32 dmad_max_size_per_drb(dmad_chreq * ch_req) ++{ ++ addr_t size = 0; ++ addr_t data_width = (addr_t) ((dmad_drq *) ch_req->drq)->data_width; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ size = DMAC_CYCLE_TO_BYTES(DMAC_TOT_SIZE_MASK & ((addr_t) ~ 3), ++ data_width); ++ } ++ ++ dmad_dbg("%s() - 0x%08x bytes\n", __func__, size); ++ ++ return size; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_max_size_per_drb); ++ ++/** ++ * dmad_bytes_to_cycles - calculate drb transfer size, in cycles ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @byte_size : [in] The DMA transfer size to be converted, in bytes ++ * @return : The drb transfer size, in cycles. ++ * ++ * Calculate the drb transfer cycle according to the setting of channel data ++ * width and burst setting. ++ * ++ * AHB DMA : unit is number of "data width". ++ * APB DMA : unit is number of "data width * burst size" ++ * ++ * APB Note: According to specification, decrement addressing seems to regard ++ * the burst size setting. For code efficiency, ++ * dmad_make_req_cycles() does not take care of this case and might ++ * produce wrong result. ++ */ ++u32 dmad_bytes_to_cycles(dmad_chreq * ch_req, u32 byte_size) ++{ ++ addr_t cycle = 0; ++ addr_t data_width = (addr_t) ((dmad_drq *) ch_req->drq)->data_width; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ cycle = DMAC_BYTES_TO_CYCLE(byte_size, data_width); ++ } ++ ++ dmad_dbg("%s() - 0x%08x bytes --> 0x%08x cycles\n", ++ __func__, byte_size, cycle); ++ return cycle; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_bytes_to_cycles); ++ ++/** ++ * dmad_alloc_drb_internal - allocate a dma-request-block of a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [out] Reference to a drb pointer to receive the allocated drb ++ * @return : 0 if success, non-zero if any error ++ * ++ * Allocates a DRB (DMA request block) of the given DMA channel. DRB is a ++ * single dma request which will be pushed into the submission queue of the ++ * given DMA channel. This is a lightweight internal version of ++ * dmad_alloc_drb() majorly for use in ring mode. Critical access to the ++ * drb pool should be protected before entering this function. ++ */ ++static inline int dmad_alloc_drb_internal(dmad_drq * drq, dmad_drb ** drb) ++{ ++ /* Initialize drb ptr in case of fail allocation */ ++ *drb = NULL; ++ ++ if (unlikely(drq->fre_head == 0)) { ++ return -EAGAIN; ++ } ++ ++ dmad_detach_head(drq->drb_pool, &drq->fre_head, &drq->fre_tail, drb); ++ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, (*drb)->node); ++ ++ (*drb)->state = DMAD_DRB_STATE_READY; ++ (*drb)->sync = 0; ++ ++ dmad_dbg("%s() drb(%d 0x%08x)\n", __func__, (*drb)->node, (u32) (*drb)); ++ ++ return 0; ++} ++ ++/** ++ * dmad_alloc_drb - allocate a dma-request-block of a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [out] Reference to a drb pointer to receive the allocated drb ++ * @return : 0 if success, non-zero if any error ++ * ++ * Allocates a DRB (DMA request block) of the given DMA channel. DRB is a ++ * single dma request which will be pushed into the submission queue of the ++ * given DMA channel. ++ */ ++int dmad_alloc_drb(dmad_chreq * ch_req, dmad_drb ** drb) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (likely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* Initialize drb ptr in case of fail allocation */ ++ *drb = NULL; ++ ++ if (unlikely(drq->fre_head == 0)) { ++ ++ drq->state &= (u32) ~ DMAD_DRQ_STATE_ABORT; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++_wait_for_free_drbs: ++ ++ /* Wait for free urbs */ ++ if (drq->flags & DMAD_FLAGS_SLEEP_BLOCK) { ++ ++ int timeout = ++ wait_for_completion_interruptible_timeout(&drq-> ++ drb_alloc_sync, ++ msecs_to_jiffies ++ (6000)); ++ ++ /* reset sync object */ ++ reinit_completion(&drq->drb_alloc_sync); ++ ++ if (timeout < 0) { ++ dmad_err("%s() wait for" ++ " completion error! (%d)\n", ++ __func__, timeout); ++ return timeout; ++ } ++ ++ } else if (drq->flags & DMAD_FLAGS_SPIN_BLOCK) { ++ ++ u32 timeout = 0x00ffffff; ++ ++ while ((drq->fre_head == 0) && (--timeout != 0)) { ++ } ++ if (timeout == 0) { ++ dmad_err("%s() polling wait for " ++ "completion timeout!\n", __func__); ++ return -EAGAIN; ++ } ++ ++ } else { ++ return -EAGAIN; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* check whether all the requests of the channel has been ++ * abandoned or not */ ++ if (unlikely(drq->state & DMAD_DRQ_STATE_ABORT)) { ++ dmad_dbg("%s() drb-allocation aborted due" ++ " to cancel-request ...\n", __func__); ++ drq->state &= (u32) ~ DMAD_DRQ_STATE_ABORT; ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -ECANCELED; ++ } ++ ++ /* check again to avoid non-atomic operation between above ++ * two calls */ ++ if (unlikely(drq->fre_head == 0)) { ++ dmad_dbg("%s() lost free drbs ... " ++ "continue waiting ...\n", __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ goto _wait_for_free_drbs; ++ } ++ } ++ ++ dmad_detach_head(drq->drb_pool, &drq->fre_head, &drq->fre_tail, drb); ++ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, (*drb)->node); ++ ++ (*drb)->state = DMAD_DRB_STATE_READY; ++ (*drb)->sync = 0; ++ ++ dmad_dbg("%s() drb(%d 0x%08x)\n", __func__, (*drb)->node, (u32) (*drb)); ++ ++ drq->state &= (u32) ~ DMAD_DRQ_STATE_ABORT; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_alloc_drb); ++ ++/** ++ * dmad_free_drb - free a dma-request-block of a dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [in] Reference to a drb to be freed ++ * @return : 0 if success, non-zero if any error ++ * ++ * Frees a DRB (DMA request block) of the given DMA channel. DRB is a ++ * single dma request which will be pushed into the submission queue of the ++ * given DMA channel. ++ */ ++int dmad_free_drb(dmad_chreq * ch_req, dmad_drb * drb) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /**************************************************** ++ * Following code requires _safe_exit return path ++ */ ++ ++ if (unlikely((drq->rdy_head == 0) || (drb->node == 0) || ++ (drb->state != DMAD_DRB_STATE_READY) || ++ (drb->node >= DMAD_DRB_POOL_SIZE))) { ++ dmad_err("Ready-queue is empty or invalid node!\n"); ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -EBADR; ++ } ++ ++ dmad_detach_node(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, drb->node); ++ dmad_attach_tail(drq->drb_pool, ++ &drq->fre_head, &drq->fre_tail, drb->node); ++ ++ drb->state = DMAD_DRB_STATE_FREE; ++ drb->sync = 0; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_free_drb); ++ ++/** ++ * dmad_submit_request_internal - submit a dma-request-block to the dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [in] Reference to a drb to be submitted ++ * @keep_fired : [in] non-zero to kickoff dma even the channel has stopped due ++ * to finishing its previous request ++ * @return : 0 if success, non-zero if any error ++ * ++ * Submit a DRB (DMA request block) of the given DMA channel to submission ++ * queue. DRB is a single dma request which will be pushed into the ++ * submission queue of the given DMA channel. This is a lightweight internal ++ * version of dmad_alloc_drb() majorly for use in ring mode. Critical access to ++ * the drb pool should be protected before entering this function. ++ */ ++static inline int dmad_submit_request_internal(dmad_drq * drq, dmad_drb * drb) ++{ ++ if (drb->state == DMAD_DRB_STATE_READY) { ++ /* Detach user node from ready list */ ++ dmad_detach_node(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, drb->node); ++ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->sbt_head, &drq->sbt_tail, drb->node); ++ ++ drb->state = DMAD_DRB_STATE_SUBMITTED; ++ ++ dmad_dbg("%s() submit drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x) state(%d)\n", __func__, ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, drb->state); ++ } else { ++ dmad_dbg("%s() skip drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x)" ++ " size(0x%08x) state(%d)\n", __func__, ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, drb->state); ++ } ++ ++ return 0; ++} ++ ++/** ++ * dmad_submit_request - submit a dma-request-block to the dma channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [in] Reference to a drb to be submitted ++ * @keep_fired : [in] non-zero to kickoff dma even the channel has stopped due ++ * to finishing its previous request ++ * @return : 0 if success, non-zero if any error ++ * ++ * Submit a DRB (DMA request block) of the given DMA channel to submission ++ * queue. DRB is a single dma request which will be pushed into the ++ * submission queue of the given DMA channel. ++ */ ++int dmad_submit_request(dmad_chreq * ch_req, dmad_drb * drb, u8 keep_fired) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /****************************************************** ++ * Following code require _safe_exit return path ++ */ ++ ++ if (unlikely((drq->rdy_head == 0) || (drb->node == 0) || ++ (drb->node >= DMAD_DRB_POOL_SIZE))) { ++ printk("node error\n"); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -EBADR; ++ } ++ ++ /* Detach user node from ready list */ ++ dmad_detach_node(drq->drb_pool, &drq->rdy_head, &drq->rdy_tail, ++ drb->node); ++ ++ /* Queue DRB to the end of the submitted list */ ++ dmad_dbg("submit drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) sync(0x%08x) fire(%d)\n", ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, (u32) drb->sync, keep_fired); ++ ++ /* Check if submission is performed to an empty queue */ ++ if (unlikely(keep_fired && (drq->sbt_head == 0))) { ++ /* DMA is not running, so kick off transmission */ ++ dmad_dbg("kickoff dma engine.\n"); ++ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->sbt_head, &drq->sbt_tail, drb->node); ++ /* Source and destination address */ ++ if (drq->flags & DMAD_DRQ_DIR_A1_TO_A0) { ++ dout(drb->addr1, (unsigned long) drq->src_port); ++ dout(drb->addr0, (unsigned long) drq->dst_port); ++ } else { ++ dout(drb->addr0, (unsigned long) drq->src_port); ++ dout(drb->addr1, (unsigned long) drq->dst_port); ++ } ++ ++ /* Transfer size (in units of source width) */ ++ dout(drb->req_cycle, (unsigned long) drq->cyc_port); ++ ++ /* Enable DMA channel (Kick off transmission when client ++ * enable it's transfer state) */ ++ dmad_enable_channel(drq); ++ drb->state = DMAD_DRB_STATE_EXECUTED; ++ } else { ++ /* DMA is already running, so only queue DRB to the end of the ++ * list */ ++ dmad_attach_tail(drq->drb_pool, ++ &drq->sbt_head, &drq->sbt_tail, drb->node); ++ drb->state = DMAD_DRB_STATE_SUBMITTED; ++ } ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_submit_request); ++ ++/** ++ * dmad_withdraw_request - cancel a submitted dma-request-block ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @drb : [in] Reference to a drb to be submitted ++ * @keep_fired : [in] non-zero to kickoff dma even the channel has stopped due ++ * to finishing its previous request ++ * @return : 0 if success, non-zero if any error ++ * ++ * Cancel a submitted DRB (DMA request block) of the given DMA channel in its ++ * submission queue. DRB is a single dma request which will be pushed into the ++ * submission queue of the given DMA channel. Cancellation fails if the DRB has ++ * already been kicked off. ++ */ ++int dmad_withdraw_request(dmad_chreq * ch_req, dmad_drb * drb) ++{ ++ dmad_drq *drq = 0; ++ unsigned long lock_flags; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ if (unlikely(drq->sbt_head == 0)) ++ return -EBADR; ++ ++ if (unlikely((drb->node == 0) || (drb->node >= DMAD_DRB_POOL_SIZE))) ++ return -EBADR; ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ if (unlikely((drq->sbt_head == 0) || (drb->node == 0) || ++ (drb->state != DMAD_DRB_STATE_SUBMITTED) || ++ (drb->node >= DMAD_DRB_POOL_SIZE))) { ++ dmad_err("Submitted-queue is empty or invalid node!\n"); ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -EBADR; ++ } ++ ++ dmad_dbg("cancel drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, drb->state); ++ ++ if (unlikely(drb->state == DMAD_DRB_STATE_EXECUTED)) { ++ dmad_dbg("Already running drb cannot be stopped currently!\n"); ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return 0;/*-EBADR; */ ++ } ++ ++ dmad_detach_node(drq->drb_pool, ++ &drq->rdy_head, &drq->rdy_tail, drb->node); ++ dmad_attach_tail(drq->drb_pool, ++ &drq->fre_head, &drq->fre_tail, drb->node); ++ ++ drb->state = DMAD_DRB_STATE_FREE; ++ ++ if (drb->sync) ++ complete_all(drb->sync); ++ drb->sync = 0; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_withdraw_request); ++ ++/** ++ * dmad_kickoff_requests_internal - kickoff hw DMA transmission ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * Kickoff hw DMA transmission of the given DMA channel. This function is ++ * valid for both ring & non-ring mode. This is a lightweight internal version ++ * of dmad_kickoff_requests() majorly for use in ring mode. Critical access to ++ * the drb pool should be protected before entering this function. ++ */ ++static inline int dmad_kickoff_requests_internal(dmad_drq * drq) ++{ ++ dmad_drb *drb; ++ ++ dmad_get_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); ++ ++ if (!drb) { ++ dmad_err("%s() null drb!\n", __func__); ++ return -EBADR; ++ } ++ ++ dmad_dbg("%s() drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", __func__, ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, drb->state); ++ ++ if (drb->state == DMAD_DRB_STATE_SUBMITTED) { ++ /* Transfer size (in units of source width) */ ++ dout(drb->req_cycle, (unsigned long) drq->cyc_port); ++ ++ /* Source and destination address */ ++ if (drq->flags & DMAD_DRQ_DIR_A1_TO_A0) { ++ dout(drb->addr1, (unsigned long) drq->src_port); ++ dout(drb->addr0, (unsigned long) drq->dst_port); ++ } else { ++ dout(drb->addr0, (unsigned long) drq->src_port); ++ dout(drb->addr1, (unsigned long) drq->dst_port); ++ } ++ ++ drb->state = DMAD_DRB_STATE_EXECUTED; ++ } ++ ++ /* Enable DMA channel */ ++ if (!dmad_is_channel_enabled(drq)) { ++ dmad_enable_channel(drq); ++ } ++ ++ return 0; ++} ++ ++/** ++ * dmad_kickoff_requests - kickoff hw DMA transmission of the given DMA channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : 0 if success, non-zero if any error ++ * ++ * Kickoff hw DMA transmission of the given DMA channel. This function is ++ * valid for both ring & non-ring mode. ++ */ ++int dmad_kickoff_requests(dmad_chreq * ch_req) ++{ ++ dmad_drq *drq = 0; ++ dmad_drb *drb = 0; ++ unsigned long lock_flags; ++ dma_addr_t req_cycle; ++ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (unlikely(ch_req == NULL)) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ dmad_get_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); ++ ++ dmad_dbg("drq(0x%08x) channel_base(0x%08x)\n", ++ (u32) drq, drq->channel_base); ++ dmad_dbg("kick off drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d) a1_to_a0(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, ++ drb->req_cycle, drb->state, ++ drq->flags & DMAD_DRQ_DIR_A1_TO_A0); ++ ++ /* do nothing if no drbs are in the submission queue */ ++ if (unlikely((drb == 0) || (drb->state != DMAD_DRB_STATE_SUBMITTED))) { ++ dmad_dbg("%s() invalid drb(%d 0x%08x) or drb-state(%d)!\n", ++ __func__, ++ drb->node, (u32) drb, drb ? drb->state : 0xffffffff); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return 0; ++ } ++ ++ req_cycle = drb->req_cycle; ++ ++ if (unlikely(req_cycle == 0)) { ++ dmad_dbg("%s() zero transfer size!\n", __func__); ++ goto _safe_exit; ++ } ++ ++ /* Transfer size (in units of source width) */ ++ dout(req_cycle, (unsigned long) drq->cyc_port); ++ ++ /* Source and destination address */ ++ if (drq->flags & DMAD_DRQ_DIR_A1_TO_A0) { ++ dout(drb->addr1, (unsigned long) drq->src_port); ++ dout(drb->addr0, (unsigned long) drq->dst_port); ++ } else { ++ dout(drb->addr0, (unsigned long) drq->src_port); ++ dout(drb->addr1, (unsigned long) drq->dst_port); ++ } ++ ++ drb->state = DMAD_DRB_STATE_EXECUTED; ++ ++ /* Enable DMA channel */ ++ dmad_enable_channel(drq); ++ ++_safe_exit: ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_kickoff_requests); ++ ++/** ++ * dmad_probe_hw_ptr_src - probe DMA source hw-address of the given channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : physical address of current HW source pointer ++ * ++ * Probe DMA source hw-address of the given channel. ++ */ ++dma_addr_t dmad_probe_hw_ptr_src(dmad_chreq * ch_req) ++{ ++ return (dma_addr_t) din(((dmad_drq *) ch_req->drq)->src_port); ++} ++ ++EXPORT_SYMBOL_GPL(dmad_probe_hw_ptr_src); ++ ++/** ++ * dmad_probe_hw_ptr_dst - probe DMA destination hw-address of the given channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : physical address of current HW destination pointer ++ * ++ * Probe DMA destination hw-address of the given channel. ++ */ ++dma_addr_t dmad_probe_hw_ptr_dst(dmad_chreq * ch_req) ++{ ++ return (dma_addr_t) din(((dmad_drq *) ch_req->drq)->dst_port); ++} ++ ++EXPORT_SYMBOL_GPL(dmad_probe_hw_ptr_dst); ++ ++/** ++ * dmad_update_ring - update DMA ring buffer base && size of the given channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @size : [in] The new ring buffer size, in unit of data width (cycles) ++ * @return : 0 if success, non-zero if any error ++ * ++ * Update DMA ring buffer size of the given channel. This function is valid ++ * only if the channel is initialized as ring buffer mode. ++ */ ++int dmad_update_ring(dmad_chreq * ch_req) ++{ ++ unsigned long lock_flags; ++ dmad_drq *drq = (dmad_drq *) ch_req->drq; ++ int remnant; ++ ++ if (unlikely(dmad_is_channel_enabled(drq))) { ++ dmad_err("%s() Error - dma channel should be " ++ "disabled before updating ring size!\n", __func__); ++ return -EFAULT; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* todo: range checking */ ++ ++ remnant = (int)ch_req->ring_size - ++ (int)ch_req->periods * (int)ch_req->period_size; ++ if (remnant == 0) { ++ drq->periods = ch_req->periods; ++ } else if (remnant > 0) { ++ drq->periods = ch_req->periods; // + 1; ++ } else { ++ dmad_err("%s() Error - buffer_size < " ++ "periods * period_size!\n", __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -EFAULT; ++ } ++ ++ drq->ring_base = ch_req->ring_base; ++ drq->ring_size = ch_req->ring_size; ++ drq->period_size = ch_req->period_size; ++ drq->remnant_size = (dma_addr_t) remnant; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) { ++ drq->period_bytes = ++ DMAC_CYCLE_TO_BYTES(drq->period_size, drq->data_width); ++ } ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ dmad_dbg("%s() ring: base(0x%08x) port(0x%08x) periods(0x%08x) " ++ "period_size(0x%08x) period_bytes(0x%08x) " ++ "remnant_size(0x%08x)\n", ++ __func__, drq->ring_base, drq->ring_port, ++ drq->periods, drq->period_size, drq->period_bytes, ++ drq->remnant_size); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_update_ring); ++ ++/** ++ * dmad_update_ring_sw_ptr - update DMA ring buffer sw-pointer ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @sw_ptr : [in] The new sw-pointer for the hw-pointer to chase of ++ * @keep_fired : [in] non-zero to kickoff dma even the channel has stopped due ++ * to finishing its previous request ++ * @return : 0 if success, non-zero if any error ++ * ++ * Update DMA ring buffer sw-pointer of the given channel on the fly. This ++ * function is valid only if the channel is initialized as ring buffer mode. ++ * Uint of sw_ptr is in number of dma data width. ++ */ ++int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, ++ dma_addr_t sw_ptr, u8 keep_fired) ++{ ++ dmad_drq *drq; ++ unsigned long lock_flags; ++ dma_addr_t hw_off = 0, ring_ptr; ++ dma_addr_t sw_p_off, ring_p_off, period_bytes; ++ dma_addr_t remnant_size; ++ int period_size; ++ int sw_p_idx, ring_p_idx, period, periods; ++ dmad_drb *drb = NULL; ++ ++ /*if (ch_req == NULL) { */ ++ /* dmad_dbg("%s() null ch_req!\n", __func__); */ ++ /* return -EFAULT; */ ++ /*} */ ++ ++ drq = (dmad_drq *) ch_req->drq; ++ ++ /*if (drq == NULL) { */ ++ /* dmad_dbg("%s() null ch_req->drq!\n", __func__); */ ++ /* return -EBADR; */ ++ /*} */ ++ ++ if (unlikely(sw_ptr > drq->ring_size)) { ++// dmad_err("%s() Invalid ring buffer sw-pointer "); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ periods = drq->periods; ++ period_size = drq->period_size; ++ period_bytes = drq->period_bytes; ++ remnant_size = drq->remnant_size; ++ ++ ring_ptr = drq->sw_ptr; ++ ring_p_idx = drq->sw_p_idx; ++ ring_p_off = drq->sw_p_off; ++ ++ sw_p_idx = div_u64(sw_ptr, period_size); ++ __iter_div_u64_rem(sw_ptr, period_size, &sw_p_off); ++ ++ if (remnant_size && (sw_p_idx == periods)) { ++ --sw_p_idx; ++ sw_p_off += period_size; ++ } ++ ++ dmad_dbg("%s() ring_ptr(0x%08x) ring_p_idx(0x%08x) " ++ "ring_p_off(0x%08x)\n", ++ __func__, ring_ptr, ring_p_idx, ring_p_off); ++ dmad_dbg("%s() sw_ptr(0x%08x) sw_p_idx(0x%08x) sw_p_off(0x%08x)\n", ++ __func__, sw_ptr, sw_p_idx, sw_p_off); ++ ++ if (drq->ring_drb && ++ (drq->ring_drb->state & (DMAD_DRB_STATE_READY | ++ DMAD_DRB_STATE_SUBMITTED | ++ DMAD_DRB_STATE_EXECUTED))) { ++ drb = drq->ring_drb; ++ } else { ++ /* alloc new drb if there is none yet at ring_ptr */ ++ if (0 != dmad_alloc_drb_internal(drq, &drb)) { ++ dmad_err("%s() drb allocation failed!\n", __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -ENOSPC; ++ } ++ drb->addr0 = ((dma_addr_t) ring_p_idx * period_bytes) + ++ drq->ring_base; ++ drb->addr1 = drq->dev_addr; ++ drb->req_cycle = 0; // redundent, though, no harm to performance ++ ++ dmad_dbg("init_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->src_addr, ++ drb->dst_addr, drb->req_cycle, drb->state); ++ ++ drq->ring_drb = drb; ++ } ++ ++ /* Following code-path has been optimized. The design flow is expanded ++ * below for reference. ++ * ++ * if (sw_ptr >= ring_ptr) ++ * if (sw_p_idx == ring_p_idx) ++ * ring_drb::req_cycle <- sw_p_off ++ * if (ring_drb::state == executed) ++ * hw_cycle <- sw_p_idx ++ * fi ++ * else ++ * ring_drb::req_cycle <- period_size ++ * if (ring_drb::state == executed) ++ * hw_cycle <- period_size ++ * fi ++ * for (i = ring_p_idx+1 ~ sw_p_idx-1) ++ * new_drb::ring_addr <- i * period_bytes + ring_base ++ * new_drb::req_cycle <- period_size ++ * rof ++ * sw_drb::ring_addr <- sw_p_idx * period_bytes + ring_base ++ * sw_drb::req_cycle <- sw_p_off ++ * else ++ * // sw_ptr < ring_ptr ++ * ring_drb::req_cycle <- period_size ++ * if (ring_drb::state == executed) ++ * hw_cycle <- period_size ++ * fi ++ * for (i = ring_p_idx+1 ~ idx_max) ++ * new_drb::ring_addr <- i * period_bytes + ring_base ++ * new_drb::req_cycle <- period_size ++ * rof ++ * for (i = 0 ~ sw_p_idx-1) ++ * new_drb::ring_addr <- i * period_bytes + ring_base ++ * new_drb::req_cycle <- period_size ++ * rof ++ * sw_drb::ring_addr <- sw_p_idx * period_bytes + ring_base ++ * sw_drb::req_cycle <- sw_p_off ++ * fi ++ */ ++ if ((sw_ptr >= ring_ptr) && (sw_p_idx == ring_p_idx) && (sw_p_off != 0)) { ++ ++ dmad_dbg("update ring drb\n"); ++ ++ /* update drb size at ring_ptr */ ++ drb->req_cycle = sw_p_off; ++ ++ dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, ++ drb->req_cycle, drb->state); ++ ++ /* update hw dma size of this drb if it has been sent to the ++ * controller */ ++ if (drb->state == DMAD_DRB_STATE_EXECUTED) { ++ dmad_disable_channel(drq); ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ hw_off = DMAC_BYTES_TO_CYCLE((addr_t) ++ din((addr_t) drq-> ++ ring_port) - ++ (addr_t) drb-> ++ addr0, ++ drq->data_width); ++ ++ dmad_dbg("hw_off(0x%08x) sw_p_off(0x%08x)\n", ++ (u32) hw_off, (u32) sw_p_off); ++ ++ if (sw_p_off < hw_off) ++ dmad_err("%s() underrun! sw_p_off(0x%08x) <" ++ " hw_off(0x%08x)\n", __func__, ++ (u32) sw_p_off, (u32) hw_off); ++ else ++ dout(sw_p_off - hw_off, (unsigned long)drq->cyc_port); ++ ++ dmad_enable_channel(drq); ++ ++ } else { ++ dmad_submit_request_internal(drq, drb); ++ } ++ ++ } else { ++ ++ dmad_dbg("fulfill ring drb - sw_ptr(0x%08x) ring_ptr(0x%08x)\n", ++ (u32) sw_ptr, (u32) ring_ptr); ++ ++ /* fulfill last drb at ring_ptr */ ++ if (ring_p_idx == (periods - 1)) ++ drb->req_cycle = period_size + remnant_size; ++ else ++ drb->req_cycle = period_size; ++ ++ dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, ++ drb->req_cycle, drb->state); ++ ++ if (drb->state == DMAD_DRB_STATE_EXECUTED) { ++ dmad_disable_channel(drq); ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ hw_off = DMAC_BYTES_TO_CYCLE((addr_t) ++ din((addr_t) drq-> ++ ring_port) - ++ (addr_t) drb-> ++ addr0, ++ drq->data_width); ++ ++ dmad_dbg("hw_off(0x%08x) period_size(0x%08x)\n", ++ (u32) hw_off, (u32) period_size); ++ ++ if (ring_p_idx == (periods - 1)) { ++ if (period_size < hw_off) ++ dmad_err("%s() illegal! " ++ "period_size(0x%08x) + " ++ "remnant_size(0x%08x) < " ++ "hw_off(0x%08x)\n", __func__, ++ (u32) period_size, ++ (u32) remnant_size, ++ (u32) hw_off); ++ else ++ dout(period_size + remnant_size - ++ hw_off, (unsigned long)drq->cyc_port); ++ } else { ++ if (period_size < hw_off) ++ dmad_err("%s() illegal! " ++ "period_size(0x%08x) < " ++ "hw_off(0x%08x)\n", __func__, ++ (u32) period_size, ++ (u32) hw_off); ++ else ++ dout(period_size - hw_off, ++ (unsigned long)drq->cyc_port); ++ } ++ ++ dmad_enable_channel(drq); ++ ++ } else { ++ dmad_submit_request_internal(drq, drb); ++ } ++ ++ ++ring_p_idx; ++ ++ /* adjust sw_ptr period index ahead by one ring cycle */ ++ //if (sw_ptr < ring_ptr) { ++ if (sw_p_idx < ring_p_idx) { ++ sw_p_idx += periods; ++ } ++ ++ /* allocate in-between (ring_ptr+1 to sw_ptr-1) ++ * full-cycle drbs */ ++ for (period = ring_p_idx; period < sw_p_idx; ++period) { ++ if (0 != dmad_alloc_drb_internal(drq, &drb)) { ++ dmad_err("%s() drb allocation failed!\n", ++ __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, ++ lock_flags); ++ return -ENOSPC; ++ } ++ ++ drb->addr0 = (dma_addr_t) (period % periods) * ++ period_bytes + drq->ring_base; ++ drb->addr1 = drq->dev_addr; ++ ++ if (period == (periods - 1)) { ++ drb->req_cycle = period_size + remnant_size; ++ } else { ++ drb->req_cycle = period_size; ++ } ++ ++ dmad_dbg("inbtw_drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, ++ drb->addr1, drb->req_cycle, drb->state); ++ ++ dmad_submit_request_internal(drq, drb); ++ } ++ ++ /* allocate drb right at sw_ptr */ ++ if (0 != dmad_alloc_drb_internal(drq, &drb)) { ++ dmad_err("%s() drb allocation failed!\n", __func__); ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ return -ENOSPC; ++ } ++ drb->addr0 = (dma_addr_t) (sw_p_idx % periods) * ++ period_bytes + drq->ring_base; ++ drb->addr1 = drq->dev_addr; ++ drb->req_cycle = sw_p_off; ++ ++ dmad_dbg("swptr_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " ++ "size(0x%08x) state(%d)\n", ++ (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, ++ drb->req_cycle, drb->state); ++ ++ drq->ring_drb = drb; ++ ++ if (sw_p_off > 0) ++ dmad_submit_request_internal(drq, drb); ++ } ++ ++ __iter_div_u64_rem(sw_ptr, drq->ring_size, &drq->sw_ptr); ++ drq->sw_p_idx = sw_p_idx % periods; ++ drq->sw_p_off = sw_p_off; ++ ++ if (likely(keep_fired)) { ++ dmad_kickoff_requests_internal(drq); ++ } ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_update_ring_sw_ptr); ++ ++/** ++ * dmad_probe_ring_hw_ptr - probe DMA ring buffer position of the given channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @return : Ring buffer position of current HW ring buffer pointer ++ * ++ * Probe DMA ring buffer position of the given channel. The position is ++ * relative to the ring buffer base. This function is valid only if the ++ * channel is initialized as ring buffer mode. ++ */ ++dma_addr_t dmad_probe_ring_hw_ptr(dmad_chreq * ch_req) ++{ ++ dmad_drq *drq = (dmad_drq *) ch_req->drq; ++ dma_addr_t cycles = ++ (dma_addr_t) din(drq->ring_port) - (dma_addr_t) drq->ring_base; ++ ++ if (ch_req->controller == DMAD_DMAC_AHB_CORE) ++ cycles = DMAC_BYTES_TO_CYCLE(cycles, drq->data_width); ++ ++ return cycles; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_probe_ring_hw_ptr); ++ ++/** ++ * dmad_channel_drain - cancel DMA transmission of the given DMA channel ++ * @controller : [in] One of the enum value of DMAD_DMAC_CORE ++ * @drq : [in] Reference to the DMA queue structure (dmad_drq) ++ * @shutdown : [in] Non-zero to force a immediate channel shutdown ++ * @return : 0 if success, non-zero if any error ++ * ++ * Stop the DMA transmission and cancel all submitted requests of the given ++ * DMA channel. This function drains a single channel and is the internal ++ * implementation of the interface routine dmad_drain_requests() and the ++ * module_exit function. ++ */ ++static int dmad_channel_drain(u32 controller, dmad_drq * drq, u8 shutdown) ++{ ++ dmad_drb *drb = 0; ++ unsigned long lock_flags; ++ ++ if (unlikely(drq == NULL)) { ++ dmad_err("null ch_req->drq!\n"); ++ return -EBADR; ++ } ++ ++ spin_lock_irqsave(&drq->drb_pool_lock, lock_flags); ++ ++ /* Stop DMA channel if forced to shutdown immediately */ ++ if (shutdown) { ++ /* disable dma controller */ ++ dmad_reset_channel(drq); ++ ++ /* todo: more settings to stop DMA controller ?? */ ++ ++ /*if (drb->state == DMAD_DRB_STATE_EXECUTED) { */ ++ /*} */ ++ } ++ ++ /* Detach DRBs in submit queue */ ++ dmad_detach_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); ++ ++ while (drb) { ++ dmad_dbg("cancel sbt drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, (u32) drb->state); ++ ++ /* Mark DRB state as abort */ ++ drb->state = DMAD_DRB_STATE_ABORT; ++ ++ if (drb->sync) ++ complete_all(drb->sync); ++ ++ dmad_attach_tail(drq->drb_pool, &drq->fre_head, &drq->fre_tail, ++ drb->node); ++ ++ dmad_detach_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, ++ &drb); ++ } ++ ++ /* Detach DRBs in ready queue */ ++ dmad_detach_head(drq->drb_pool, &drq->rdy_head, &drq->rdy_tail, &drb); ++ ++ while (drb) { ++ dmad_dbg("cancel rdy drb(%d 0x%08x) addr0(0x%08x) " ++ "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ drb->node, (u32) drb, drb->src_addr, drb->dst_addr, ++ drb->req_cycle, (u32) drb->state); ++ ++ /* Mark DRB state as abort */ ++ drb->state = DMAD_DRB_STATE_ABORT; ++ ++ dmad_attach_tail(drq->drb_pool, &drq->fre_head, &drq->fre_tail, ++ drb->node); ++ ++ /* Detach next submitted DRB (DMA Request Block) from the ++ * DRQ (DMA Request Queue) */ ++ dmad_detach_head(drq->drb_pool, &drq->rdy_head, &drq->rdy_tail, ++ &drb); ++ } ++ ++ drq->state |= DMAD_DRQ_STATE_ABORT; ++ ++ drq->ring_drb = NULL; ++ drq->sw_ptr = 0; ++ drq->sw_p_idx = 0; ++ drq->sw_p_off = 0; ++ ++ spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); ++ ++ if ( /*(drq->fre_head == 0) && */ (drq->flags & DMAD_FLAGS_SLEEP_BLOCK)) { ++ complete_all(&drq->drb_alloc_sync); ++ } ++ ++ return 0; ++} ++ ++/** ++ * dmad_cancel_requests - cancel DMA transmission of the given DMA channel ++ * @ch_req : [in] Reference to the DMA request descriptor structure ++ * @shutdown : [in] Non-zero to force a immediate channel shutdown ++ * @return : 0 if success, non-zero if any error ++ * ++ * Stop the DMA transmission and cancel all submitted requests of the given ++ * DMA channel. ++ */ ++int dmad_drain_requests(dmad_chreq * ch_req, u8 shutdown) ++{ ++ dmad_dbg("%s()\n", __func__); ++ ++ if (ch_req == NULL) { ++ dmad_err("null ch_req!\n"); ++ return -EFAULT; ++ } ++ ++ return dmad_channel_drain(ch_req->controller, ch_req->drq, shutdown); ++} ++ ++EXPORT_SYMBOL_GPL(dmad_drain_requests); ++ ++/** ++ * dmad_probe_irq_source - probe DMA channel who asserts the shared sw-irq line ++ * @return : The channel number which asserts the shared sw-irq line ++ * ++ * Probe DMA channel who asserts the shared sw-irq line. ++ */ ++int dmad_probe_irq_source_ahb(void) ++{ ++ int channel; /* interrupt channel number */ ++ ++ /* todo: spin_lock */ ++ ++ /* - Check DMA status register to get channel number */ ++ for (channel = 0; channel < DMAD_AHB_MAX_CHANNELS; ++channel) { ++ if (getbl(channel+TC_OFFSET, (unsigned long)INT_STA)) ++ return channel; ++ } ++ ++ /* Perform DMA error checking if no valid channel was found who ++ * assert the finish signal. */ ++ for (channel = 0; channel < DMAD_AHB_MAX_CHANNELS; ++channel) { ++ if (getbl(channel+ERR_OFFSET, (unsigned long)INT_STA)) ++ return channel; ++ if (getbl(channel+ABT_OFFSET, (unsigned long)INT_STA)) ++ return channel; ++ } ++ ++ /* todo: spin_unlock */ ++ ++ return -EFAULT; ++} ++ ++EXPORT_SYMBOL_GPL(dmad_probe_irq_source_ahb); ++ ++ ++/** ++ * dmad_module_init - dma module-init function ++ * @return : 0 if success, non-zero if any error ++ */ ++int dmad_module_init(void) ++{ ++ int err = 0; ++ dmad_dbg("%s() >>\n", __func__); ++ ++ /* clear device struct since the module may be load/unload many times */ ++ memset(&dmad, 0, sizeof(dmad)-4); ++ dmad.drq_pool = ++ kmalloc(DMAD_AHB_MAX_CHANNELS * sizeof(dmad_drq), GFP_KERNEL); ++ if (dmad.drq_pool == NULL) { ++ dmad_err("%s() failed to allocate drb pool!\n", __func__); ++ return -ENOMEM; ++ } ++ memset(dmad.drq_pool, 0,DMAD_AHB_MAX_CHANNELS*sizeof(dmad_drq)); ++ spin_lock_init(&dmad.drq_pool_lock); ++ dmad.ahb_drq_pool = dmad.drq_pool; ++ dmad_dbg("DMA module init result: (%d)\n", err); ++ dmad_dbg(" AHB channels: %d\n;" ++ "DRBs per channel: %d\n", ++ DMAC_MAX_CHANNELS, DMAD_DRB_POOL_SIZE); ++ ++ dmad_dbg("%s() return code (%d) <<\n", __func__, err); ++ return err; ++} ++ ++/** ++ * dmad_module_init - dma module clean up function ++ */ ++int __exit dmad_module_exit(struct platform_device *pdev) ++{ ++ dmad_drq *drq; ++ u32 channel; ++ struct at_dma_platform_data *pdata; ++ pdata = dev_get_platdata(&pdev->dev); ++ ++ dmad_dbg("%s() >>\n", __func__); ++ ++ spin_lock(&dmad.drq_pool_lock); ++ ++ /* cancel existing requests and unregister interrupt handler */ ++ for (channel = 0; channel < DMAD_AHB_MAX_CHANNELS; ++channel) { ++ ++ /* shutdown dma requests */ ++ drq = (dmad_drq *) & dmad.ahb_drq_pool[channel]; ++ ++ if ((drq->state & DMAD_DRQ_STATE_READY) != 0) ++ dmad_channel_drain(DMAD_DMAC_AHB_CORE, drq, 1); ++ ++ /* free registered irq handlers */ ++ free_irq(ahb_irqs[channel], (void *)(unsigned long)(channel + 1)); ++ } ++ ++ spin_unlock(&dmad.drq_pool_lock); ++ ++ if (dmad.drq_pool) ++ kfree(dmad.drq_pool); ++ memset(&dmad, 0, sizeof(dmad)); ++ ++ /* release I/O space */ ++ release_region((uintptr_t)pdata->dmac_regs, resource_size(pdata->io)); ++ dmad_dbg("DMA module unloaded!\n"); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_OF ++static const struct of_device_id atcdma100_of_id_table[] = { ++ { .compatible = "andestech,atcdmac300" }, ++ {} ++}; ++MODULE_DEVICE_TABLE(of, atcdma100_of_id_table); ++ ++static struct at_dma_platform_data * ++at_dma_parse_dt(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ struct at_dma_platform_data *pdata; ++ ++ if (!np) { ++ dev_err(&pdev->dev, "Missing DT data\n"); ++ return NULL; ++ } ++ ++ pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); ++ if (!pdata) ++ return NULL; ++ ++ if (of_property_read_u32(np, "dma-channels", &pdata->nr_channels)) ++ return NULL; ++ ++ return pdata; ++} ++#else ++static inline struct at_dma_platform_data * ++at_dma_parse_dt(struct platform_device *pdev) ++{ ++ return NULL; ++} ++#endif ++ ++static int atcdma_probe(struct platform_device *pdev) ++{ ++ struct at_dma_platform_data *pdata; ++ struct resource *io=0; ++ struct resource *mem = NULL; ++ int irq; ++ ++ pdata = dev_get_platdata(&pdev->dev); ++ dmad.plat = pdev; ++ ++ if (!pdata) ++ pdata = at_dma_parse_dt(pdev); ++ pdev->dev.platform_data = pdata; ++ io = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ pdata->io = io; ++ mem = request_mem_region(io->start, resource_size(io), pdev->name); ++ ++ if (!mem){ ++ printk("failed to get io memory region resouce.\n"); ++ return -EINVAL; ++ } ++ ++ pdata->dmac_regs = (void __iomem *) ioremap(mem->start, resource_size(io)); ++ dmac_base = (uintptr_t)pdata->dmac_regs; ++ ++ irq = platform_get_irq(pdev, 0); ++ ++ if (irq < 0) ++ return irq; ++ ++ intc_ftdmac020_init_irq(irq); ++ ++ return dmad_module_init(); ++ ++} ++ ++static int __exit atcdma_remove(struct platform_device *pdev) ++{ ++ return dmad_module_exit(pdev); ++} ++ ++ ++static struct platform_driver atcdma100_driver = { ++ .probe = atcdma_probe, ++ .remove = __exit_p(atcdma_remove), ++ .driver = { ++ .name = "atcdmac100", ++ .of_match_table = of_match_ptr(atcdma100_of_id_table), ++ }, ++}; ++ ++static int __init atcdma_init(void) ++{ ++ return platform_driver_register(&atcdma100_driver); ++} ++subsys_initcall(atcdma_init); ++ ++#endif /* CONFIG_PLATFORM_AHBDMA */ +diff --git a/arch/riscv/platforms/dmad_intc.c b/arch/riscv/platforms/dmad_intc.c +new file mode 100644 +index 000000000000..5f831add709a +--- /dev/null ++++ b/arch/riscv/platforms/dmad_intc.c +@@ -0,0 +1,49 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018 Andes Technology Corporation ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef CONFIG_PLATFORM_AHBDMA ++extern int dmad_probe_irq_source_ahb(void); ++void AHBDMA_irq_rounter(struct irq_desc *desc) ++{ ++ int ahb_irq; ++ struct irq_desc *ahb_desc; ++ ++ raw_spin_lock(&desc->lock); ++ ahb_irq = dmad_probe_irq_source_ahb(); ++ ++ if (ahb_irq >= 0) { ++ ahb_irq += DMA_IRQ0; ++ ahb_desc = irq_to_desc(ahb_irq); ++ ahb_desc->irq_data.irq = ahb_irq; ++ raw_spin_unlock(&desc->lock); ++ ahb_desc->handle_irq(ahb_desc); ++ raw_spin_lock(&desc->lock); ++ } ++ desc->irq_data.chip->irq_unmask(&desc->irq_data); ++ raw_spin_unlock(&desc->lock); ++} ++ ++int intc_ftdmac020_init_irq(int irq) ++{ ++ int i; ++ int ret; ++ /* Register all IRQ */ ++ for (i = DMA_IRQ0; ++ i < DMA_IRQ0 + DMA_IRQ_COUNT; i++) { ++ // level trigger ++ ret = irq_set_chip(i, &dummy_irq_chip); ++ irq_set_handler(i, handle_simple_irq); ++ } ++ irq_set_chained_handler(irq, AHBDMA_irq_rounter); ++ return 0; ++} ++#endif /* CONFIG_PLATFORM_AHBDMA */ +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0004-Andes-support-for-FTSDC.patch b/board/andes/ae350/patches/linux/0004-Andes-support-for-FTSDC.patch new file mode 100644 index 0000000000..9e0fd7303b --- /dev/null +++ b/board/andes/ae350/patches/linux/0004-Andes-support-for-FTSDC.patch @@ -0,0 +1,1884 @@ +From 8ffdbcee891ea3b127f34d0ff745d7578b487a71 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:16:45 +0800 +Subject: [PATCH 04/12] Andes support for FTSDC + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/host/Kconfig | 11 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/ftsdc010.c | 1557 +++++++++++++++++++++++++++++++++++ + drivers/mmc/host/ftsdc010.h | 257 ++++++ + 4 files changed, 1825 insertions(+), 1 deletion(-) + create mode 100644 drivers/mmc/host/ftsdc010.c + create mode 100644 drivers/mmc/host/ftsdc010.h + +diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig +index 30ff42fd173e..834cdb8b73cc 100644 +--- a/drivers/mmc/host/Kconfig ++++ b/drivers/mmc/host/Kconfig +@@ -503,7 +503,7 @@ config MMC_OMAP_HS + + config MMC_WBSD + tristate "Winbond W83L51xD SD/MMC Card Interface support" +- depends on ISA_DMA_API && !M68K ++ depends on ISA_DMA_API + help + This selects the Winbond(R) W83L51xD Secure digital and + Multimedia card Interface. +@@ -608,6 +608,15 @@ config MMC_DAVINCI + If you have an DAVINCI board with a Multimedia Card slot, + say Y or M here. If unsure, say N. + ++config MMC_FTSDC ++ tristate "Andestech SDC Multimedia Card Interface support" ++ depends on RISCV ++ help ++ This selects the TI DAVINCI Multimedia card Interface. ++ If you have an DAVINCI board with a Multimedia Card slot, ++ say Y or M here. If unsure, say N. ++ ++ + config MMC_GOLDFISH + tristate "goldfish qemu Multimedia Card Interface support" + depends on GOLDFISH || COMPILE_TEST +diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile +index 451c25fc2c69..fbc58512f23a 100644 +--- a/drivers/mmc/host/Makefile ++++ b/drivers/mmc/host/Makefile +@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o + obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o + obj-$(CONFIG_MMC_MVSDIO) += mvsdio.o + obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o ++obj-$(CONFIG_MMC_FTSDC) += ftsdc010.o + obj-$(CONFIG_MMC_GOLDFISH) += android-goldfish.o + obj-$(CONFIG_MMC_SPI) += mmc_spi.o + ifeq ($(CONFIG_OF),y) +diff --git a/drivers/mmc/host/ftsdc010.c b/drivers/mmc/host/ftsdc010.c +new file mode 100644 +index 000000000000..940b4c03787c +--- /dev/null ++++ b/drivers/mmc/host/ftsdc010.c +@@ -0,0 +1,1557 @@ ++/* drivers/mmc/host/ftsdc010.c ++ * Copyright (C) 2010 Andestech ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "ftsdc010.h" ++#include "../core/core.h" ++ ++#define DRIVER_NAME "ftsdc010" ++#define REG_READ(addr) readl((host->base + addr)) ++#define REG_WRITE(data, addr) writel((data), (host->base + addr)) ++ ++enum dbg_channels { ++ dbg_err = (1 << 0), ++ dbg_debug = (1 << 1), ++ dbg_info = (1 << 2), ++ dbg_irq = (1 << 3), ++ dbg_sg = (1 << 4), ++ dbg_dma = (1 << 5), ++ dbg_pio = (1 << 6), ++ dbg_fail = (1 << 7), ++ dbg_conf = (1 << 8), ++}; ++ ++static struct workqueue_struct *mywq; ++ ++static const int dbgmap_err = dbg_fail; ++static const int dbgmap_info = dbg_info | dbg_conf; ++static const int dbgmap_debug = dbg_err | dbg_debug | dbg_info | dbg_conf; ++#define dbg(host, channels, args...) \ ++ do { \ ++ if (dbgmap_err & channels) \ ++ dev_err(&host->pdev->dev, args); \ ++ else if (dbgmap_info & channels) \ ++ dev_info(&host->pdev->dev, args); \ ++ else if (dbgmap_debug & channels) \ ++ dev_dbg(&host->pdev->dev, args); \ ++ } while (0) ++static void finalize_request(struct ftsdc_host *host); ++static void ftsdc_send_request(struct mmc_host *mmc); ++#ifdef CONFIG_MMC_DEBUG ++static void dbg_dumpregs(struct ftsdc_host *host, char *prefix) ++{ ++ u32 con, cmdarg, r0, r1, r2, r3, rcmd, dcon, dtimer, ++ dlen, sta, clr, imask, pcon, ccon, bwidth, scon1, ++ scon2, ssta, fea; ++ ++ con = REG_READ(SDC_CMD_REG); ++ cmdarg = REG_READ(SDC_ARGU_REG); ++ r0 = REG_READ(SDC_RESPONSE0_REG); ++ r1 = REG_READ(SDC_RESPONSE1_REG); ++ r2 = REG_READ(SDC_RESPONSE2_REG); ++ r3 = REG_READ(SDC_RESPONSE3_REG); ++ rcmd = REG_READ(SDC_RSP_CMD_REG); ++ dcon = REG_READ(SDC_DATA_CTRL_REG); ++ dtimer = REG_READ(SDC_DATA_TIMER_REG); ++ dlen = REG_READ(SDC_DATA_LEN_REG); ++ sta = REG_READ(SDC_STATUS_REG); ++ clr = REG_READ(SDC_CLEAR_REG); ++ imask = REG_READ(SDC_INT_MASK_REG); ++ pcon = REG_READ(SDC_POWER_CTRL_REG); ++ ccon = REG_READ(SDC_CLOCK_CTRL_REG); ++ bwidth = REG_READ(SDC_BUS_WIDTH_REG); ++ scon1 = REG_READ(SDC_SDIO_CTRL1_REG); ++ scon2 = REG_READ(SDC_SDIO_CTRL2_REG); ++ ssta = REG_READ(SDC_SDIO_STATUS_REG); ++ fea = REG_READ(SDC_FEATURE_REG); ++ ++ dbg(host, dbg_debug, "%s CON:[%08x] STA:[%08x] INT:[%08x], PWR:[%08x], CLK:[%08x]\n", ++ prefix, con, sta, imask, pcon, ccon); ++ ++ dbg(host, dbg_debug, "%s DCON:[%08x] DTIME:[%08x]" ++ " DLEN:[%08x] DWIDTH:[%08x]\n", ++ prefix, dcon, dtimer, dlen, bwidth); ++ ++ dbg(host, dbg_debug, "%s R0:[%08x] R1:[%08x]" ++ " R2:[%08x] R3:[%08x]\n", ++ prefix, r0, r1, r2, r3); ++ ++ dbg(host, dbg_debug, "%s SCON1:[%08x] SCON2:[%08x]" ++ " SSTA:[%08x] FEA:[%08x]\n", ++ prefix, scon1, scon2, ssta, fea); ++} ++ ++static void prepare_dbgmsg(struct ftsdc_host *host, struct mmc_command *cmd, ++ int stop) ++{ ++ snprintf(host->dbgmsg_cmd, 300, ++ "#%u%s op:%i arg:0x%08x flags:0x08%x retries:%u", ++ host->ccnt, (stop ? " (STOP)" : ""), ++ cmd->opcode, cmd->arg, cmd->flags, cmd->retries); ++ ++ if (cmd->data) { ++ snprintf(host->dbgmsg_dat, 300, ++ "#%u bsize:%u blocks:%u bytes:%u", ++ host->dcnt, cmd->data->blksz, ++ cmd->data->blocks, ++ cmd->data->blocks * cmd->data->blksz); ++ } else { ++ host->dbgmsg_dat[0] = '\0'; ++ } ++} ++ ++static void dbg_dumpcmd(struct ftsdc_host *host, struct mmc_command *cmd, ++ int fail) ++{ ++ unsigned int dbglvl = fail ? dbg_fail : dbg_debug; ++ ++ if (!cmd) ++ return; ++ ++ if (cmd->error == 0) { ++ dbg(host, dbglvl, "CMD[OK] %s R0:0x%08x\n", ++ host->dbgmsg_cmd, cmd->resp[0]); ++ } else { ++ dbg(host, dbglvl, "CMD[ERR %i] %s Status:%s\n", ++ cmd->error, host->dbgmsg_cmd, host->status); ++ } ++ ++ if (!cmd->data) ++ return; ++ ++ if (cmd->data->error == 0) { ++ dbg(host, dbglvl, "DAT[OK] %s\n", host->dbgmsg_dat); ++ } else { ++ dbg(host, dbglvl, "DAT[ERR %i] %s DCNT:0x%08x\n", ++ cmd->data->error, host->dbgmsg_dat, ++ REG_READ(SDC_DATA_LEN_REG)); ++ } ++} ++#else ++static void dbg_dumpcmd(struct ftsdc_host *host, ++ struct mmc_command *cmd, int fail) { } ++ ++static void prepare_dbgmsg(struct ftsdc_host *host, struct mmc_command *cmd, ++ int stop) { } ++ ++static void dbg_dumpregs(struct ftsdc_host *host, char *prefix) { } ++ ++#endif /* CONFIG_MMC_DEBUG */ ++ ++static inline bool ftsdc_dmaexist(struct ftsdc_host *host) ++{ ++ return (host->dma_req != NULL); ++} ++ ++static inline u32 enable_imask(struct ftsdc_host *host, u32 imask) ++{ ++ u32 newmask; ++ ++#ifdef CONFIG_MMC_DEBUG ++ if (imask & SDC_STATUS_REG_SDIO_INTR) printk("\n*** E ***\n"); ++#endif ++ newmask = REG_READ(SDC_INT_MASK_REG); ++ newmask |= imask; ++ ++ REG_WRITE(newmask, SDC_INT_MASK_REG); ++ ++ return newmask; ++} ++ ++static inline u32 disable_imask(struct ftsdc_host *host, u32 imask) ++{ ++ u32 newmask; ++ ++#ifdef CONFIG_MMC_DEBUG ++ if (imask & SDC_STATUS_REG_SDIO_INTR) printk("\n*** D ***\n"); ++#endif ++ newmask = REG_READ(SDC_INT_MASK_REG); ++ newmask &= ~imask; ++ ++ REG_WRITE(newmask, SDC_INT_MASK_REG); ++ ++ return newmask; ++} ++ ++static inline void clear_imask(struct ftsdc_host *host) ++{ ++ u32 mask = REG_READ(SDC_INT_MASK_REG); ++ ++ /* preserve the SDIO IRQ mask state */ ++ mask &= (SDC_INT_MASK_REG_SDIO_INTR | SDC_INT_MASK_REG_CARD_CHANGE); ++ REG_WRITE(mask, SDC_INT_MASK_REG); ++} ++ ++static inline void get_data_buffer(struct ftsdc_host *host) ++{ ++ struct scatterlist *sg; ++ ++ BUG_ON(host->buf_sgptr >= host->mrq->data->sg_len); ++ ++ sg = &host->mrq->data->sg[host->buf_sgptr]; ++ ++ host->buf_bytes = sg->length; ++ host->buf_ptr = host->dodma ? (u32 *)sg->dma_address : sg_virt(sg); ++ host->buf_sgptr++; ++} ++ ++static inline u32 cal_blksz(unsigned int blksz) ++{ ++ u32 blksztwo = 0; ++ ++ while (blksz >>= 1) ++ blksztwo++; ++ ++ return blksztwo; ++} ++ ++/** ++ * ftsdc_enable_irq - enable IRQ, after having disabled it. ++ * @host: The device state. ++ * @more: True if more IRQs are expected from transfer. ++ * ++ * Enable the main IRQ if needed after it has been disabled. ++ * ++ * The IRQ can be one of the following states: ++ * - enable after data read/write ++ * - disable when handle data read/write ++ */ ++static void ftsdc_enable_irq(struct ftsdc_host *host, bool enable) ++{ ++ unsigned long flags; ++ local_irq_save(flags); ++ ++ host->irq_enabled = enable; ++ ++ if (enable) ++ enable_irq(host->irq); ++ else ++ disable_irq(host->irq); ++ ++ local_irq_restore(flags); ++} ++ ++static void do_pio_read(struct ftsdc_host *host) ++{ ++ u32 fifo; ++ u32 fifo_words; ++ u32 *ptr; ++ u32 status; ++ u32 retry = 0; ++ ++ BUG_ON(host->buf_bytes != 0); ++ ++ while (host->buf_sgptr < host->mrq->data->sg_len) { ++ get_data_buffer(host); ++ ++ dbg(host, dbg_pio, ++ "pio_read(): new target: [%i]@[%p]\n", ++ host->buf_bytes, host->buf_ptr); ++ ++ while (host->buf_bytes) { ++ status = REG_READ(SDC_STATUS_REG); ++ if (status & SDC_STATUS_REG_FIFO_OVERRUN) { ++ fifo = host->fifo_len > host->buf_bytes ? ++ host->buf_bytes : host->fifo_len; ++ dbg(host, dbg_pio, ++ "pio_read(): fifo:[%02i] buffer:[%03i] dcnt:[%08X]\n", ++ fifo, host->buf_bytes, ++ REG_READ(SDC_DATA_LEN_REG)); ++ host->buf_bytes -= fifo; ++ host->buf_count += fifo; ++ fifo_words = fifo >> 2; ++ ptr = host->buf_ptr; ++ while (fifo_words--) ++ *ptr++ = REG_READ(SDC_DATA_WINDOW_REG); ++ host->buf_ptr = ptr; ++ if (fifo & 3) { ++ u32 n = fifo & 3; ++ u32 data = REG_READ(SDC_DATA_WINDOW_REG); ++ u8 *p = (u8 *)host->buf_ptr; ++ ++ while (n--) { ++ *p++ = data; ++ data >>= 8; ++ } ++ } ++ } else { ++ udelay(1); ++ if (++retry >= SDC_PIO_RETRY) { ++ host->mrq->data->error = -EIO; ++ goto err; ++ } ++ } ++ } ++ } ++err: ++ ++ host->buf_active = XFER_NONE; ++ host->complete_what = COMPLETION_FINALIZE; ++} ++ ++static void do_pio_write(struct ftsdc_host *host) ++{ ++ u32 fifo; ++ u32 *ptr; ++ u32 status; ++ u32 retry = 0; ++ ++ BUG_ON(host->buf_bytes != 0); ++ ++ while (host->buf_sgptr < host->mrq->data->sg_len) { ++ get_data_buffer(host); ++ ++ dbg(host, dbg_pio, ++ "pio_write(): new source: [%i]@[%p]\n", ++ host->buf_bytes, host->buf_ptr); ++ ++ while (host->buf_bytes) { ++ status = REG_READ(SDC_STATUS_REG); ++ if (status & SDC_STATUS_REG_FIFO_UNDERRUN) { ++ fifo = host->fifo_len > host->buf_bytes ? ++ host->buf_bytes : host->fifo_len; ++ ++ dbg(host, dbg_pio, ++ "pio_write(): fifo:[%02i] buffer:[%03i] dcnt:[%08X]\n", ++ fifo, host->buf_bytes, ++ REG_READ(SDC_DATA_LEN_REG)); ++ ++ host->buf_bytes -= fifo; ++ host->buf_count += fifo; ++ ++ fifo = (fifo + 3) >> 2; ++ ptr = host->buf_ptr; ++ while (fifo--) { ++ REG_WRITE(*ptr, SDC_DATA_WINDOW_REG); ++ ptr++; ++ } ++ host->buf_ptr = ptr; ++ } else { ++ udelay(1); ++ if (++retry >= SDC_PIO_RETRY) { ++ host->mrq->data->error = -EIO; ++ goto err; ++ } ++ } ++ } ++ } ++ ++err: ++ host->buf_active = XFER_NONE; ++ host->complete_what = COMPLETION_FINALIZE; ++} ++ ++static void do_dma_access(struct ftsdc_host *host) ++{ ++ int res; ++ unsigned long timeout; ++ dmad_chreq *req = host->dma_req; ++ dmad_drb *drb = 0; ++ ++ while (host->buf_sgptr < host->mrq->data->sg_len) { ++ ++ reinit_completion(&host->dma_complete); ++ get_data_buffer(host); ++ ++ dbg(host, dbg_dma, ++ "dma_%s(): new target: [%i]@[%p]\n", ++ host->buf_active == XFER_READ ? "read" : "write", ++ host->buf_bytes, host->buf_ptr); ++ ++ res = dmad_alloc_drb(req, &drb); ++ ++ if (res != 0 || (drb == 0)) { ++ dbg(host, dbg_err, "%s() Failed to allocate dma request block!\n", __func__); ++ host->mrq->data->error = -ENODEV; ++ goto err; ++ } ++ drb->addr0 = host->mem->start + SDC_DATA_WINDOW_REG; ++ drb->addr1 = (dma_addr_t)host->buf_ptr; ++ drb->req_cycle = dmad_bytes_to_cycles(req, host->buf_bytes); ++ drb->sync = &host->dma_complete; ++ timeout = SDC_TIMEOUT_BASE*((host->buf_bytes+511)>>9); ++ res = dmad_submit_request(req, drb, 1); ++ if (res != 0) { ++ dbg(host, dbg_err, "%s() Failed to submit dma request block!\n", __func__); ++ host->mrq->data->error = -ENODEV; ++ goto err; ++ } ++ dbg(host, dbg_err, "reach here!\n"); ++ if (wait_for_completion_timeout(&host->dma_complete, timeout) == 0) { ++ dbg(host, dbg_err, "%s: read timeout\n", __func__); ++ host->mrq->data->error = -ETIMEDOUT; ++ goto err; ++ } ++ } ++ ++ host->dma_finish = true; ++err: ++ host->buf_active = XFER_NONE; ++ host->complete_what = COMPLETION_FINALIZE; ++} ++ ++static void ftsdc_work(struct work_struct *work) ++{ ++ struct ftsdc_host *host = ++ container_of(work, struct ftsdc_host, work); ++ ++ ftsdc_enable_irq(host, false); ++ if (host->dodma) { ++ do_dma_access(host); ++ } else { ++ if (host->buf_active == XFER_WRITE) ++ do_pio_write(host); ++ ++ if (host->buf_active == XFER_READ) ++ do_pio_read(host); ++ } ++ ++ tasklet_schedule(&host->pio_tasklet); ++ ftsdc_enable_irq(host, true); ++} ++ ++static void pio_tasklet(unsigned long data) ++{ ++ struct ftsdc_host *host = (struct ftsdc_host *) data; ++ ++ if (host->complete_what == COMPLETION_XFER_PROGRESS) { ++ queue_work(mywq, (struct work_struct *)&host->work); ++ return; ++ } ++ ++ if (host->complete_what == COMPLETION_FINALIZE) { ++ clear_imask(host); ++ if (host->buf_active != XFER_NONE) { ++ dbg(host, dbg_err, "unfinished %s " ++ "- buf_count:[%u] buf_bytes:[%u]\n", ++ (host->buf_active == XFER_READ) ? "read" : "write", ++ host->buf_count, host->buf_bytes); ++ ++ if (host->mrq->data) ++ host->mrq->data->error = -EINVAL; ++ } ++ ++ finalize_request(host); ++ } ++} ++ ++static void finalize_request(struct ftsdc_host *host) ++{ ++ struct mmc_request *mrq = host->mrq; ++ struct mmc_command *cmd; ++ u32 con; ++ int debug_as_failure = 0; ++ if (host->complete_what != COMPLETION_FINALIZE) ++ return; ++ ++ if (!mrq) ++ return; ++ ++ cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd; ++ ++ if (cmd->data && (cmd->error == 0) && ++ (cmd->data->error == 0)) { ++ if (host->dodma && (!host->dma_finish)) { ++ dbg(host, dbg_dma, "DMA Missing (%d)!\n", ++ host->dma_finish); ++ return; ++ } ++ host->dodma = false; ++ } ++ ++ /* Read response from controller. */ ++ if (cmd->flags & MMC_RSP_136) { ++ cmd->resp[3] = REG_READ(SDC_RESPONSE0_REG); ++ cmd->resp[2] = REG_READ(SDC_RESPONSE1_REG); ++ cmd->resp[1] = REG_READ(SDC_RESPONSE2_REG); ++ cmd->resp[0] = REG_READ(SDC_RESPONSE3_REG); ++ } else if (cmd->flags & MMC_RSP_PRESENT) { ++ cmd->resp[0] = REG_READ(SDC_RESPONSE0_REG); ++ } ++ ++ if (cmd->error) ++ debug_as_failure = 1; ++ ++ if (cmd->data && cmd->data->error) ++ debug_as_failure = 1; ++ ++ dbg_dumpcmd(host, cmd, debug_as_failure); ++ ++ clear_imask(host); ++ con = REG_READ(SDC_STATUS_REG); ++ con &= ~SDC_CLEAR_REG_SDIO_INTR; ++ REG_WRITE(con, SDC_CLEAR_REG); ++ ++ if (cmd->data && cmd->error) ++ cmd->data->error = cmd->error; ++ ++ if (cmd->data && cmd->data->stop && (!host->cmd_is_stop)) { ++ host->cmd_is_stop = 1; ++ ftsdc_send_request(host->mmc); ++ return; ++ } ++ ++ /* If we have no data transfer we are finished here */ ++ if (!mrq->data) ++ goto request_done; ++ ++ /* Calulate the amout of bytes transfer if there was no error */ ++ if (mrq->data->error == 0) { ++ mrq->data->bytes_xfered = ++ (mrq->data->blocks * mrq->data->blksz); ++ } else { ++ mrq->data->bytes_xfered = 0; ++ } ++ ++request_done: ++ host->complete_what = COMPLETION_NONE; ++ host->mrq = NULL; ++ ++ host->last_opcode = mrq->cmd->opcode; ++ mmc_request_done(host->mmc, mrq); ++} ++ ++static void ftsdc_send_command(struct ftsdc_host *host, ++ struct mmc_command *cmd) ++{ ++ u32 ccon = 0; ++ u32 newmask = 0; ++ u32 scon; ++ ++ if (cmd->data) { ++ host->complete_what = COMPLETION_XFER_PROGRESS; ++ newmask |= SDC_INT_MASK_REG_RSP_TIMEOUT; ++ } else if (cmd->flags & MMC_RSP_PRESENT) { ++ host->complete_what = COMPLETION_RSPFIN; ++ newmask |= SDC_INT_MASK_REG_RSP_TIMEOUT; ++ } else { ++ host->complete_what = COMPLETION_CMDSENT; ++ newmask |= SDC_INT_MASK_REG_CMD_SEND; ++ } ++ ++ ccon |= cmd->opcode & SDC_CMD_REG_INDEX; ++ ccon |= SDC_CMD_REG_CMD_EN; ++ ++ if (cmd->flags & MMC_RSP_PRESENT) { ++ ccon |= SDC_CMD_REG_NEED_RSP; ++ newmask |= SDC_INT_MASK_REG_RSP_CRC_OK | ++ SDC_INT_MASK_REG_RSP_CRC_FAIL; ++ } ++ ++ if (cmd->flags & MMC_RSP_136) ++ ccon |= SDC_CMD_REG_LONG_RSP; ++ ++ /* applicatiion specific cmd must follow an MMC_APP_CMD. The ++ * value will be updated in finalize_request function */ ++ if (host->last_opcode == MMC_APP_CMD) ++ ccon |= SDC_CMD_REG_APP_CMD; ++ ++ enable_imask(host, newmask); ++ REG_WRITE(cmd->arg, SDC_ARGU_REG); ++ ++ scon = REG_READ(SDC_SDIO_CTRL1_REG); ++ if (host->mmc->card != NULL && mmc_card_sdio(host->mmc->card)) ++ scon |= SDC_SDIO_CTRL1_REG_SDIO_ENABLE; ++ else ++ scon &= ~SDC_SDIO_CTRL1_REG_SDIO_ENABLE; ++ REG_WRITE(scon, SDC_SDIO_CTRL1_REG); ++ ++ dbg_dumpregs(host, ""); ++ dbg(host, dbg_debug, "CON[%x]\n", ccon); ++ ++ REG_WRITE(ccon, SDC_CMD_REG); ++} ++ ++static int ftsdc_setup_data(struct ftsdc_host *host, struct mmc_data *data) ++{ ++ u32 dcon, newmask = 0; ++ ++ /* configure data transfer paramter */ ++ if (!data) ++ return 0; ++ if(host->mmc->card && host->mmc->card->type==(unsigned int)MMC_TYPE_SD){ ++ if (((data->blksz - 1) & data->blksz) != 0) { ++ pr_warn("%s: can't do non-power-of 2 sized block transfers (blksz %d)\n", __func__, data->blksz); ++ return -EINVAL; ++ } ++ } ++ ++ if (data->blksz <= 2) { ++ /* We cannot deal with unaligned blocks with more than ++ * one block being transfered. */ ++ ++ if (data->blocks > 1) { ++ pr_warn("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz); ++ return -EINVAL; ++ } ++ } ++ ++ /* data length */ ++ dcon = data->blksz * data->blocks; ++ REG_WRITE(dcon, SDC_DATA_LEN_REG); ++ ++ /* write data control */ ++ dcon = 0; ++ dcon = cal_blksz(data->blksz); ++ ++ /* enable UNDERFUN will trigger interrupt immediatedly ++ * So setup it when rsp is received successfully ++ */ ++ if (data->flags & MMC_DATA_WRITE) { ++ dcon |= SDC_DATA_CTRL_REG_DATA_WRITE; ++ } else { ++ dcon &= ~SDC_DATA_CTRL_REG_DATA_WRITE; ++ newmask |= SDC_INT_MASK_REG_FIFO_OVERRUN; ++ } ++ ++ /* always reset fifo since last transfer may fail */ ++ dcon |= SDC_DATA_CTRL_REG_FIFO_RST; ++ ++ /* enable data transfer which will be pended until cmd is send */ ++ dcon |= SDC_DATA_CTRL_REG_DATA_EN; ++ if (ftsdc_dmaexist(host) && ++ ((data->blksz * data->blocks) & 0xf) == 0) { ++ newmask &= ~SDC_INT_MASK_REG_FIFO_OVERRUN; ++ dcon |= SDC_DATA_CTRL_REG_DMA_EN; ++ dcon |= SDC_DMA_TYPE_4; ++ host->dodma = true; ++ ++ } ++ REG_WRITE(dcon, SDC_DATA_CTRL_REG); ++ /* add to IMASK register */ ++ newmask |= SDC_INT_MASK_REG_DATA_CRC_FAIL | ++ SDC_INT_MASK_REG_DATA_TIMEOUT; ++ ++ enable_imask(host, newmask); ++ /* handle sdio */ ++ dcon = SDC_SDIO_CTRL1_REG_READ_WAIT_ENABLE & REG_READ(SDC_SDIO_CTRL1_REG); ++ dcon |= data->blksz | data->blocks << 15; ++ if (1 < data->blocks) ++ dcon |= SDC_SDIO_CTRL1_REG_SDIO_BLK_MODE; ++ REG_WRITE(dcon, SDC_SDIO_CTRL1_REG); ++ ++ return 0; ++} ++ ++#define BOTH_DIR (MMC_DATA_WRITE | MMC_DATA_READ) ++ ++static int ftsdc_prepare_buffer(struct ftsdc_host *host, struct mmc_data *data) ++{ ++ int rw = (data->flags & MMC_DATA_WRITE) ? 1 : 0; ++ ++ if ((!host->mrq) || (!host->mrq->data)) ++ return -EINVAL; ++ ++ BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR); ++ host->buf_sgptr = 0; ++ host->buf_bytes = 0; ++ host->buf_count = 0; ++ host->buf_active = rw ? XFER_WRITE : XFER_READ; ++ if (host->dodma) { ++ u32 dma_len; ++ u32 drb_size; ++ dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len, ++ rw ? DMA_TO_DEVICE : DMA_FROM_DEVICE); ++ if (dma_len == 0) ++ return -ENOMEM; ++ ++ dmad_config_channel_dir(host->dma_req, ++ rw ? DMAD_DIR_A1_TO_A0 : DMAD_DIR_A0_TO_A1); ++ drb_size = dmad_max_size_per_drb(host->dma_req); ++ if (drb_size < (data->blksz & data->blocks)) ++ return -ENODEV; ++ ++ host->dma_finish = false; ++ } ++ return 0; ++} ++ ++static irqreturn_t ftsdc_irq(int irq, void *dev_id) ++{ ++ struct ftsdc_host *host = dev_id; ++ struct mmc_command *cmd; ++ u32 mci_status; ++ u32 mci_clear; ++ u32 mci_imsk; ++ unsigned long iflags; ++ ++ mci_status = REG_READ(SDC_STATUS_REG); ++ mci_imsk = REG_READ(SDC_INT_MASK_REG); ++ ++ dbg(host, dbg_debug, "irq: status:0x%08x, mask : %08x\n", mci_status, mci_imsk); ++ ++ if (mci_status & SDC_STATUS_REG_SDIO_INTR) { ++ if (mci_imsk & SDC_INT_MASK_REG_SDIO_INTR) { ++ mci_clear = SDC_CLEAR_REG_SDIO_INTR; ++ REG_WRITE(mci_clear, SDC_CLEAR_REG); ++ ++ mmc_signal_sdio_irq(host->mmc); ++ return IRQ_HANDLED; ++ } ++ } ++ ++ spin_lock_irqsave(&host->complete_lock, iflags); ++ ++ mci_status = REG_READ(SDC_STATUS_REG); ++ mci_clear = 0; ++ ++ if (mci_status & SDC_STATUS_REG_CARD_CHANGE) { ++ if ((mci_status & SDC_STATUS_REG_CARD_DETECT) ++ == SDC_CARD_INSERT) { ++ host->status = "card insert"; ++ mmc_detect_change(host->mmc, msecs_to_jiffies(500)); ++ } else { ++ host->status = "card remove"; ++ } ++ mci_clear |= SDC_CLEAR_REG_CARD_CHANGE; ++ dbg(host, dbg_irq, "%s\n", host->status); ++ ++ if (host->complete_what != COMPLETION_NONE) { ++ host->mrq->cmd->error = -EIO; ++ goto close_transfer; ++ } ++ ++ goto irq_out; ++ } ++ ++ if ((host->complete_what == COMPLETION_NONE) || ++ (host->complete_what == COMPLETION_FINALIZE)) { ++ host->status = "nothing to complete"; ++ mci_clear = -1u; ++ goto irq_out; ++ } ++ ++ if (!host->mrq) { ++ host->status = "no active mrq"; ++ clear_imask(host); ++ goto irq_out; ++ } ++ ++ cmd = host->cmd_is_stop ? host->mrq->stop : host->mrq->cmd; ++ ++ if (!cmd) { ++ host->status = "no active cmd"; ++ clear_imask(host); ++ goto irq_out; ++ } ++ ++ if (mci_status & SDC_STATUS_REG_CMD_SEND) { ++ mci_clear |= SDC_CLEAR_REG_CMD_SEND; ++ ++ if (host->complete_what == COMPLETION_CMDSENT) { ++ host->status = "ok: command sent"; ++ goto close_transfer; ++ } else { ++ host->status = "error: command sent(status not match)"; ++ cmd->error = -EINVAL; ++ goto fail_transfer; ++ } ++ } ++ ++ /* handle error status */ ++ if (mci_status & SDC_STATUS_REG_RSP_TIMEOUT) { ++ dbg(host, dbg_err, "CMDSTAT: error RSP TIMEOUT\n"); ++ mci_clear |= SDC_CLEAR_REG_RSP_TIMEOUT; ++ cmd->error = -ETIMEDOUT; ++ host->status = "error: response timeout"; ++ goto fail_transfer; ++ } ++ ++ if (mci_status & SDC_STATUS_REG_RSP_CRC_FAIL) { ++ mci_clear |= SDC_CLEAR_REG_RSP_CRC_FAIL; ++ /* This is wierd hack */ ++ if (cmd->flags & MMC_RSP_CRC) { ++ dbg(host, dbg_err, "CMDSTAT: error RSP CRC\n"); ++ cmd->error = -EILSEQ; ++ host->status = "error: RSP CRC failed"; ++ goto fail_transfer; ++ } else { ++ host->status = "R3 or R4 type command"; ++ goto close_transfer; ++ } ++ } ++ ++ if (mci_status & SDC_STATUS_REG_RSP_CRC_OK) { ++ mci_clear |= SDC_CLEAR_REG_RSP_CRC_OK; ++ ++ if (host->complete_what == COMPLETION_XFER_PROGRESS) { ++ REG_WRITE(mci_clear, SDC_CLEAR_REG); ++ ++ host->status = "RSP recv OK"; ++ if (!cmd->data) ++ goto close_transfer; ++ ++ if (host->dodma) { ++ tasklet_schedule(&host->pio_tasklet); ++ host->status = "dma access"; ++ goto irq_out; ++ } ++ ++ if (host->buf_active == XFER_WRITE) ++ enable_imask(host, SDC_INT_MASK_REG_FIFO_UNDERRUN); ++ } else if (host->complete_what == COMPLETION_RSPFIN) { ++ goto close_transfer; ++ } ++ } ++ ++ /* handler data transfer */ ++ if (mci_status & SDC_STATUS_REG_DATA_TIMEOUT) { ++ dbg(host, dbg_err, "CMDSTAT: error DATA TIMEOUT\n"); ++ mci_clear |= SDC_CLEAR_REG_DATA_TIMEOUT; ++ cmd->error = -ETIMEDOUT; ++ host->status = "error: data timeout"; ++ goto fail_transfer; ++ } ++ ++ if (mci_status & SDC_STATUS_REG_DATA_CRC_FAIL) { ++ dbg(host, dbg_err, "CMDSTAT: error DATA CRC\n"); ++ mci_clear |= SDC_CLEAR_REG_DATA_CRC_FAIL; ++ cmd->error = -EILSEQ; ++ host->status = "error: data CRC fail"; ++ goto fail_transfer; ++ } ++ ++ if ((mci_status & SDC_STATUS_REG_FIFO_UNDERRUN) || ++ mci_status & SDC_STATUS_REG_FIFO_OVERRUN) { ++ ++ disable_imask(host, SDC_INT_MASK_REG_FIFO_OVERRUN | ++ SDC_INT_MASK_REG_FIFO_UNDERRUN); ++ ++ if (!host->dodma) { ++ if (host->buf_active == XFER_WRITE) { ++ tasklet_schedule(&host->pio_tasklet); ++ host->status = "pio tx"; ++ } else if (host->buf_active == XFER_READ) { ++ ++ tasklet_schedule(&host->pio_tasklet); ++ host->status = "pio rx"; ++ } ++ } ++ } ++ ++ goto irq_out; ++ ++fail_transfer: ++ host->buf_active = XFER_NONE; ++ ++close_transfer: ++ host->complete_what = COMPLETION_FINALIZE; ++ ++ clear_imask(host); ++ tasklet_schedule(&host->pio_tasklet); ++ ++irq_out: ++ REG_WRITE(mci_clear, SDC_CLEAR_REG); ++ ++ dbg(host, dbg_debug, "irq: %s\n", host->status); ++ spin_unlock_irqrestore(&host->complete_lock, iflags); ++ return IRQ_HANDLED; ++} ++ ++static void ftsdc_send_request(struct mmc_host *mmc) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ struct mmc_request *mrq = host->mrq; ++ struct mmc_command *cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd; ++ ++ host->ccnt++; ++ prepare_dbgmsg(host, cmd, host->cmd_is_stop); ++ dbg(host, dbg_debug, "%s\n", host->dbgmsg_cmd); ++ ++ if (cmd->data) { ++ int res = ftsdc_setup_data(host, cmd->data); ++ ++ host->dcnt++; ++ ++ if (res) { ++ dbg(host, dbg_err, "setup data error %d\n", res); ++ cmd->error = res; ++ cmd->data->error = res; ++ ++ mmc_request_done(mmc, mrq); ++ return; ++ } ++ ++ res = ftsdc_prepare_buffer(host, cmd->data); ++ ++ if (res) { ++ dbg(host, dbg_err, "data prepare error %d\n", res); ++ cmd->error = res; ++ cmd->data->error = res; ++ ++ mmc_request_done(mmc, mrq); ++ return; ++ } ++ } ++ ++ /* Send command */ ++ ftsdc_send_command(host, cmd); ++} ++ ++static int ftsdc_get_cd(struct mmc_host *mmc) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ ++ u32 con = REG_READ(SDC_STATUS_REG); ++ dbg(host, dbg_debug, "get_cd status:%.8x\n\n", con); ++ ++ return (con & SDC_STATUS_REG_CARD_DETECT) ? 0 : 1; ++} ++ ++static void ftsdc_request(struct mmc_host *mmc, struct mmc_request *mrq) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ host->status = "mmc request"; ++ host->cmd_is_stop = 0; ++ host->mrq = mrq; ++ if (ftsdc_get_cd(mmc) == 0) { ++ dbg(host, dbg_err, "%s: no medium present\n", __func__); ++ host->mrq->cmd->error = -ENOMEDIUM; ++ mmc_request_done(mmc, mrq); ++ } else { ++ ftsdc_send_request(mmc); ++ } ++ dbg(host, dbg_debug, "send request \n"); ++} ++ ++static void ftsdc_set_clk(struct ftsdc_host *host, struct mmc_ios *ios) ++{ ++ u32 clk_div = 0; ++ u32 con; ++ struct ftsdc_mmc_config *pdata = host->pdev->dev.platform_data; ++ u32 freq = pdata->max_freq; ++ ++ dbg(host, dbg_debug, "request clk : %u \n", ios->clock); ++ con = REG_READ(SDC_CLOCK_CTRL_REG); ++ if (ios->clock == 0) { ++ host->real_rate = 0; ++ con |= SDC_CLOCK_CTRL_REG_CLK_DIS; ++ } else { ++ clk_div = (freq / (ios->clock << 1)) - 1; ++ host->real_rate = freq / ((clk_div+1)<<1); ++ if (host->real_rate > ios->clock) { ++ ++clk_div; ++ host->real_rate = freq / ((clk_div+1)<<1); ++ } ++ if (clk_div > 127) ++ dbg(host, dbg_err, "%s: no match clock rate, %u\n", __func__, ios->clock); ++ ++ con = (con & ~SDC_CLOCK_CTRL_REG_CLK_DIV) | (clk_div & SDC_CLOCK_CTRL_REG_CLK_DIV); ++ con &= ~SDC_CLOCK_CTRL_REG_CLK_DIS; ++ } ++ ++ REG_WRITE(con, SDC_CLOCK_CTRL_REG); ++} ++ ++static void ftsdc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ u32 con; ++ ++ con = REG_READ(SDC_POWER_CTRL_REG); ++ switch (ios->power_mode) { ++ case MMC_POWER_ON: ++ case MMC_POWER_UP: ++ con |= SDC_POWER_CTRL_REG_POWER_ON; ++ break; ++ case MMC_POWER_OFF: ++ default: ++ con &= ~SDC_POWER_CTRL_REG_POWER_ON; ++ break; ++ } ++ ++ REG_WRITE(con, SDC_POWER_CTRL_REG); ++ ++ ftsdc_set_clk(host, ios); ++ ++ if ((ios->power_mode == MMC_POWER_ON) || ++ (ios->power_mode == MMC_POWER_UP)) { ++ dbg(host, dbg_debug, "running at %ukHz (requested: %ukHz).\n", ++ host->real_rate/1000, ios->clock/1000); ++ } else { ++ dbg(host, dbg_debug, "powered down.\n"); ++ } ++ ++ host->bus_width = ios->bus_width; ++ /* write bus configure */ ++ con = REG_READ(SDC_BUS_WIDTH_REG); ++ ++ con &= ~(SDC_BUS_WIDTH_REG_SINGLE_BUS | ++ SDC_BUS_WIDTH_REG_WIDE_4_BUS | ++ SDC_BUS_WIDTH_REG_WIDE_8_BUS); ++ if (host->bus_width == MMC_BUS_WIDTH_1) ++ con |= SDC_BUS_WIDTH_REG_SINGLE_BUS; ++ else if (host->bus_width == MMC_BUS_WIDTH_4) ++ con |= SDC_BUS_WIDTH_REG_WIDE_4_BUS; ++ else if (host->bus_width == MMC_BUS_WIDTH_8) ++ con |= SDC_BUS_WIDTH_REG_WIDE_8_BUS; ++ else { ++ dbg(host, dbg_err, "set_ios: can't support bus mode"); ++ } ++ REG_WRITE(con, SDC_BUS_WIDTH_REG); ++ ++ /*set rsp and data timeout */ ++ con = -1; ++ REG_WRITE(con, SDC_DATA_TIMER_REG); ++ if (ios->power_mode == MMC_POWER_UP) ++ mmc_delay(250); ++} ++ ++static int ftsdc_get_ro(struct mmc_host *mmc) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ u32 con = REG_READ(SDC_STATUS_REG); ++ dbg(host, dbg_debug, "get_ro status:%.8x\n", con); ++ ++ return (con & SDC_STATUS_REG_CARD_LOCK) ? 1 : 0; ++} ++ ++ ++static void ftsdc_enable_sdio_irq(struct mmc_host *mmc, int enable) ++{ ++ struct ftsdc_host *host = mmc_priv(mmc); ++ unsigned long flags; ++ u32 con; ++#ifdef CONFIG_MMC_DEBUG ++ u32 ena; ++#endif ++ ++ local_irq_save(flags); ++ ++ con = REG_READ(SDC_INT_MASK_REG); ++#ifdef CONFIG_MMC_DEBUG ++ ena = (con & SDC_STATUS_REG_SDIO_INTR) ? 1:0; ++ if (ena == enable) ++ printk("\n*** XXX ***\n"); ++#endif ++ ++ con = enable ? (con | SDC_STATUS_REG_SDIO_INTR) : (con & ~SDC_STATUS_REG_SDIO_INTR); ++ REG_WRITE(con, SDC_INT_MASK_REG); ++ ++#ifdef CONFIG_MMC_DEBUG ++ //check and ensure data out to SD host controller ++ ena = (REG_READ(SDC_INT_MASK_REG) & SDC_STATUS_REG_SDIO_INTR) ? 1:0; ++ if (ena != enable) { ++ printk("\n*** YYY ***\n"); ++ } ++#endif ++ ++ local_irq_restore(flags); ++} ++ ++static struct mmc_host_ops ftsdc_ops = { ++ .request = ftsdc_request, ++ .set_ios = ftsdc_set_ios, ++ .get_ro = ftsdc_get_ro, ++ .get_cd = ftsdc_get_cd, ++ .enable_sdio_irq = ftsdc_enable_sdio_irq, ++}; ++ ++#ifdef CONFIG_DEBUG_FS ++ ++static int ftsdc_state_show(struct seq_file *seq, void *v) ++{ ++ struct ftsdc_host *host = seq->private; ++ ++ seq_printf(seq, "Register base = 0x%08x\n", (u32)host->base); ++ seq_printf(seq, "Clock rate = %u\n", host->real_rate); ++ seq_printf(seq, "host status = %s\n", host->status); ++ seq_printf(seq, "IRQ = %d\n", host->irq); ++ seq_printf(seq, "IRQ enabled = %d\n", host->irq_enabled); ++ seq_printf(seq, "complete what = %d\n", host->complete_what); ++ seq_printf(seq, "dma support = %d\n", ftsdc_dmaexist(host)); ++ seq_printf(seq, "use dma = %d\n", host->dodma); ++ ++ return 0; ++} ++ ++static int ftsdc_state_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, ftsdc_state_show, inode->i_private); ++} ++ ++static const struct file_operations ftsdc_fops_state = { ++ .owner = THIS_MODULE, ++ .open = ftsdc_state_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++#define DBG_REG(_r) { .addr = SDC_## _r ## _REG, .name = #_r } ++ ++struct ftsdc_reg { ++ unsigned short addr; ++ unsigned char *name; ++} debug_regs[] = { ++ DBG_REG(CMD), ++ DBG_REG(ARGU), ++ DBG_REG(RESPONSE0), ++ DBG_REG(RESPONSE1), ++ DBG_REG(RESPONSE2), ++ DBG_REG(RESPONSE3), ++ DBG_REG(RSP_CMD), ++ DBG_REG(DATA_CTRL), ++ DBG_REG(DATA_TIMER), ++ DBG_REG(DATA_LEN), ++ DBG_REG(STATUS), ++ DBG_REG(CLEAR), ++ DBG_REG(INT_MASK), ++ DBG_REG(POWER_CTRL), ++ DBG_REG(CLOCK_CTRL), ++ DBG_REG(BUS_WIDTH), ++ DBG_REG(SDIO_CTRL1), ++ DBG_REG(SDIO_CTRL2), ++ DBG_REG(SDIO_STATUS), ++ DBG_REG(FEATURE), ++ DBG_REG(REVISION), ++ {} ++}; ++ ++static int ftsdc_regs_show(struct seq_file *seq, void *v) ++{ ++ struct ftsdc_host *host = seq->private; ++ struct ftsdc_reg *rptr = debug_regs; ++ ++ for (; rptr->name; rptr++) ++ seq_printf(seq, "SDI%s\t=0x%08x\n", rptr->name, ++ REG_READ(rptr->addr)); ++ ++ return 0; ++} ++ ++static int ftsdc_regs_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, ftsdc_regs_show, inode->i_private); ++} ++ ++static const struct file_operations ftsdc_fops_regs = { ++ .owner = THIS_MODULE, ++ .open = ftsdc_regs_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++ ++static void ftsdc_debugfs_attach(struct ftsdc_host *host) ++{ ++ struct device *dev = &host->pdev->dev; ++ ++ host->debug_root = debugfs_create_dir(dev_name(dev), NULL); ++ if (IS_ERR(host->debug_root)) { ++ dev_err(dev, "failed to create debugfs root\n"); ++ return; ++ } ++ ++ host->debug_state = debugfs_create_file("state", 0444, ++ host->debug_root, host, ++ &ftsdc_fops_state); ++ ++ if (IS_ERR(host->debug_state)) ++ dev_err(dev, "failed to create debug state file\n"); ++ ++ host->debug_regs = debugfs_create_file("regs", 0444, ++ host->debug_root, host, ++ &ftsdc_fops_regs); ++ ++ if (IS_ERR(host->debug_regs)) ++ dev_err(dev, "failed to create debug regs file\n"); ++} ++ ++static void ftsdc_debugfs_remove(struct ftsdc_host *host) ++{ ++ debugfs_remove(host->debug_regs); ++ debugfs_remove(host->debug_state); ++ debugfs_remove(host->debug_root); ++} ++ ++#else ++static inline void ftsdc_debugfs_attach(struct ftsdc_host *host) { } ++static inline void ftsdc_debugfs_remove(struct ftsdc_host *host) { } ++ ++#endif /* CONFIG_DEBUG_FS */ ++ ++#if (defined(CONFIG_PLATFORM_AHBDMA) || defined(CONFIG_PLATFORM_APBDMA)) ++static int ftsdc_alloc_dma(struct ftsdc_host *host) ++{ ++ dmad_chreq *req = host->dma_req; ++ req = kzalloc(sizeof(dmad_chreq), GFP_KERNEL); ++#ifdef CONFIG_PLATFORM_APBDMA ++ req->apb_req.addr0_ctrl = APBBR_ADDRINC_FIXED; /* (in) APBBR_ADDRINC_xxx */ ++/* for amerald */ ++#if !defined(CONFIG_PLAT_AE3XX) ++ if((inl(pmu_base) & AMERALD_MASK) == AMERALD_PRODUCT_ID){ ++ req->apb_req.addr0_reqn = APBBR_REQN_SDC_AMERALD; ++ }else ++#endif ++ { ++ req->apb_req.addr0_reqn = APBBR_REQN_SDC; /* (in) APBBR_REQN_xxx (also used to help determine bus selection) */ ++ } ++ req->apb_req.addr1_ctrl = APBBR_ADDRINC_I4X; /* (in) APBBR_ADDRINC_xxx */ ++ req->apb_req.addr1_reqn = APBBR_REQN_NONE; /* (in) APBBR_REQN_xxx (also used to help determine bus selection) */ ++ req->apb_req.burst_mode = 1; /* (in) Burst mode (0: no burst 1-, 1: burst 4- data cycles per dma cycle) */ ++ req->apb_req.data_width = APBBR_DATAWIDTH_4; /* (in) APBBR_DATAWIDTH_4(word), APBBR_DATAWIDTH_2(half-word), APBBR_DATAWIDTH_1(byte) */ ++ req->apb_req.tx_dir = DMAD_DIR_A0_TO_A1; /* (in) DMAD_DIR_A0_TO_A1, DMAD_DIR_A1_TO_A0 */ ++ req->controller = DMAD_DMAC_APB_CORE; /* (in) DMAD_DMAC_AHB_CORE, DMAD_DMAC_APB_CORE */ ++ req->flags = DMAD_FLAGS_SLEEP_BLOCK | DMAD_FLAGS_BIDIRECTION; ++ ++ if (dmad_channel_alloc(req) == 0) { ++ dbg(host, dbg_debug, "%s: APB dma channel allocated (ch: %d)\n", __func__, req->channel); ++ host->dma_req = req; ++ return 0; ++ } ++ ++ memset(req, 0, sizeof(dmad_chreq)); ++ dbg(host, dbg_info, "%s: APB dma channel allocation failed\n", __func__); ++#endif /* CONFIG_PLATFORM_APBDMA */ ++ ++#ifdef CONFIG_PLATFORM_AHBDMA ++ req->ahb_req.sync = 1; /* (in) non-zero if src and dst have different clock domain */ ++ req->ahb_req.priority = DMAC_CSR_CHPRI_1; /* (in) DMAC_CSR_CHPRI_0 (lowest) ~ DMAC_CSR_CHPRI_3 (highest) */ ++ req->ahb_req.hw_handshake = 1; /* (in) non-zero to enable hardware handshake mode */ ++ req->ahb_req.burst_size = DMAC_CSR_SIZE_4; /* (in) DMAC_CSR_SIZE_1 ~ DMAC_CSR_SIZE_256 */ ++ req->ahb_req.addr0_width = DMAC_CSR_WIDTH_32; /* (in) DMAC_CSR_WIDTH_8, DMAC_CSR_WIDTH_16, or DMAC_CSR_WIDTH_32 */ ++ req->ahb_req.addr0_ctrl = DMAC_CSR_AD_FIX; /* (in) DMAC_CSR_AD_INC, DMAC_CSR_AD_DEC, or DMAC_CSR_AD_FIX */ ++ req->ahb_req.addr0_reqn = DMAC_REQN_SDC; /* (in) DMAC_REQN_xxx (also used to help determine channel number) */ ++ req->ahb_req.addr1_width = DMAC_CSR_WIDTH_32; /* (in) DMAC_CSR_WIDTH_8, DMAC_CSR_WIDTH_16, or DMAC_CSR_WIDTH_32 */ ++ req->ahb_req.addr1_ctrl = DMAC_CSR_AD_INC; /* (in) DMAC_CSR_AD_INC, DMAC_CSR_AD_DEC, or DMAC_CSR_AD_FIX */ ++ req->ahb_req.addr1_reqn = DMAC_REQN_NONE; /* (in) DMAC_REQN_xxx (also used to help determine channel number) */ ++ req->ahb_req.tx_dir = DMAD_DIR_A0_TO_A1; /* (in) DMAD_DIR_A0_TO_A1, DMAD_DIR_A1_TO_A0 */ ++ ++ req->controller = DMAD_DMAC_AHB_CORE; /* (in) DMAD_DMAC_AHB_CORE, DMAD_DMAC_APB_CORE */ ++ req->flags = DMAD_FLAGS_SLEEP_BLOCK | DMAD_FLAGS_BIDIRECTION; ++ ++ if (dmad_channel_alloc(req) == 0) { ++ dbg(host, dbg_debug, "%s: AHB dma channel allocated (ch: %d)\n", __func__, req->channel); ++ host->dma_req = req; ++ return 0; ++ } ++ dbg(host, dbg_info, "%s: AHB dma channel allocation failed\n", __func__); ++#endif ++ ++ kfree(req); ++ return -ENODEV; ++ ++} ++#endif ++ ++enum { ++ MMC_CTLR_VERSION_1 = 0, ++ MMC_CTLR_VERSION_2, ++}; ++ ++ ++static struct platform_device_id ftsdc_mmc_devtype[] = { ++ { ++ .name = "ag101p", ++ .driver_data = MMC_CTLR_VERSION_1, ++ }, { ++ .name = "ae3xx", ++ .driver_data = MMC_CTLR_VERSION_2, ++ }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(platform, ftsdc_mmc_devtype); ++ ++static const struct of_device_id ftsdc_mmc_dt_ids[] = { ++ { ++ .compatible = "andestech,atfsdc010", ++ .data = &ftsdc_mmc_devtype[MMC_CTLR_VERSION_1], ++ }, ++ { ++ .compatible = "andestech,atfsdc010", ++ .data = &ftsdc_mmc_devtype[MMC_CTLR_VERSION_2], ++ }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, ftsdc_mmc_dt_ids); ++ ++ ++static struct ftsdc_mmc_config ++ *mmc_parse_pdata(struct platform_device *pdev) ++{ ++ struct device_node *np; ++ struct ftsdc_mmc_config *pdata = pdev->dev.platform_data; ++ const struct of_device_id *match = ++ of_match_device(of_match_ptr(ftsdc_mmc_dt_ids), &pdev->dev); ++ u32 data; ++ ++ np = pdev->dev.of_node; ++ if (!np) ++ return pdata; ++ ++ pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); ++ pdev->dev.platform_data = (void *)pdata; ++ ++ if (!pdata) { ++ dev_err(&pdev->dev, "Failed to allocate memory for struct ftsdc_mmc_config\n"); ++ goto nodata; ++ } ++ ++ if (match) ++ pdev->id_entry = match->data; ++ ++ if (of_property_read_u32(np, "max-frequency", &pdata->max_freq)) ++ dev_info(&pdev->dev, "'max-frequency' property not specified, defaulting to 25MHz\n"); ++ ++ of_property_read_u32(np, "bus-width", &data); ++ switch (data) { ++ case 1: ++ case 4: ++ case 8: ++ pdata->wires = data; ++ break; ++ default: ++ pdata->wires = 1; ++/* ++ dev_info(&pdev->dev, "Unsupported buswidth, defaulting to 1 bit\n"); ++*/ ++ } ++nodata: ++ return pdata; ++} ++ ++static int __init ftsdc_probe(struct platform_device *pdev) ++{ ++ struct ftsdc_host *host; ++ struct mmc_host *mmc; ++ struct ftsdc_mmc_config *pdata = NULL; ++ struct resource *r, *mem = NULL; ++ int ret = -ENOMEM; ++ u32 con; ++ int irq = 0; ++ size_t mem_size; ++ ++ pdata = mmc_parse_pdata(pdev); ++ if (pdata == NULL) { ++ dev_err(&pdev->dev, "Couldn't get platform data\n"); ++ return -ENOENT; ++ } ++ ret = -ENODEV; ++ r = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ irq = platform_get_irq(pdev, 0); ++ ++ if (!r || irq == NO_IRQ) ++ goto probe_out; ++ ++ ret = -EBUSY; ++ mem_size = resource_size(r); ++ mem = request_mem_region(r->start, mem_size, pdev->name); ++ ++ if (!mem){ ++ dev_err(&pdev->dev, ++ "failed to get io memory region resouce.\n"); ++ goto probe_out; ++ } ++ ret = -ENOMEM; ++ mmc = mmc_alloc_host(sizeof(struct ftsdc_host), &pdev->dev); ++ if (!mmc) { ++ goto probe_out; ++ } ++ ++ host = mmc_priv(mmc); ++ host->mmc = mmc; ++ host->pdev = pdev; ++ mywq = create_workqueue("atcsdc_queue"); ++ if (NULL == mywq) ++ goto probe_free_host; ++ ++ spin_lock_init(&host->complete_lock); ++ tasklet_init(&host->pio_tasklet, pio_tasklet, (unsigned long) host); ++ init_completion(&host->dma_complete); ++ INIT_WORK(&host->work, ftsdc_work); ++ ++ host->complete_what = COMPLETION_NONE; ++ host->buf_active = XFER_NONE; ++ ++#if (defined(CONFIG_PLATFORM_AHBDMA) || defined(CONFIG_PLATFORM_APBDMA)) ++ ftsdc_alloc_dma(host); ++#endif ++ host->mem = mem; ++ host->base = (void __iomem *) ioremap(mem->start, mem_size); ++ if (IS_ERR(host->base)){ ++ ret = PTR_ERR(host->base); ++ goto probe_free_mem_region; ++ } ++ host->irq = irq; ++ ++ ret = request_irq(host->irq, ftsdc_irq, 0, DRIVER_NAME, host); ++ if (ret) { ++ dev_err(&pdev->dev, "failed to request mci interrupt.\n"); ++ ret = -ENOENT; ++ goto probe_free_mem_region; ++ } ++ host->irq_enabled = true; ++ /* enable card change interruption */ ++ con = REG_READ(SDC_INT_MASK_REG); ++ con |= SDC_INT_MASK_REG_CARD_CHANGE; ++ REG_WRITE(con, SDC_INT_MASK_REG); ++ ++ con = REG_READ(SDC_BUS_WIDTH_REG); ++ mmc->ops = &ftsdc_ops; ++ mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; ++ ++ if (con & SDC_WIDE_4_BUS_SUPPORT) ++ mmc->caps |= MMC_CAP_4_BIT_DATA; ++ else if (con & SDC_WIDE_8_BUS_SUPPORT) ++ mmc->caps |= MMC_CAP_8_BIT_DATA; ++ ++#ifndef A320D_BUILDIN_SDC ++ mmc->caps |= MMC_CAP_SDIO_IRQ; ++#endif ++ mmc->f_min = pdata->max_freq / (2 * 128); ++ mmc->f_max = pdata->max_freq / 2; ++ /* limit SDIO mode max size */ ++ mmc->max_req_size = 128 * 1024 * 1024 - 1; ++ mmc->max_blk_size = 2047; ++ mmc->max_req_size = (mmc->max_req_size + 1) / (mmc->max_blk_size + 1); ++ mmc->max_seg_size = mmc->max_req_size; ++ mmc->max_blk_count = (1<<17)-1; ++ ++ /* kernel default value. see Doc/block/biodocs.txt */ ++ /* ++ 'struct mmc_host' has no member named 'max_phys_segs' ++ 'struct mmc_host' has no member named 'max_hw_segs' ++ */ ++// mmc->max_phys_segs = 128; ++// mmc->max_hw_segs = 128; ++ ++ /* set fifo lenght and default threshold half */ ++ con = REG_READ(SDC_FEATURE_REG); ++ host->fifo_len = (con & SDC_FEATURE_REG_FIFO_DEPTH) * sizeof(u32); ++ ++ dbg(host, dbg_debug, ++ "probe: mapped mci_base:%p irq:%u.\n", ++ host->base, host->irq); ++ ++ dbg_dumpregs(host, ""); ++ ret = mmc_add_host(mmc); ++ if (ret) { ++ dev_err(&pdev->dev, "failed to add mmc host.\n"); ++ goto probe_free_irq; ++ } ++ ftsdc_debugfs_attach(host); ++ platform_set_drvdata(pdev, mmc); ++ dev_info(&pdev->dev, "%s - using %s SDIO IRQ\n", mmc_hostname(mmc), ++ mmc->caps & MMC_CAP_SDIO_IRQ ? "hw" : "sw"); ++ return 0; ++ ++ probe_free_irq: ++ free_irq(host->irq, host); ++ ++ probe_free_mem_region: ++ release_mem_region(host->mem->start, resource_size(host->mem)); ++ destroy_workqueue(mywq); ++ ++ probe_free_host: ++ mmc_free_host(mmc); ++ ++ probe_out: ++ return ret; ++} ++ ++static void ftsdc_shutdown(struct platform_device *pdev) ++{ ++ struct mmc_host *mmc = platform_get_drvdata(pdev); ++ struct ftsdc_host *host = mmc_priv(mmc); ++ ++ flush_workqueue(mywq); ++ destroy_workqueue(mywq); ++ ++ ftsdc_debugfs_remove(host); ++ mmc_remove_host(mmc); ++} ++ ++static int __exit ftsdc_remove(struct platform_device *pdev) ++{ ++ struct mmc_host *mmc = platform_get_drvdata(pdev); ++ struct ftsdc_host *host = mmc_priv(mmc); ++ ++ ftsdc_shutdown(pdev); ++ ++ tasklet_disable(&host->pio_tasklet); ++ ++ if (ftsdc_dmaexist(host)) ++ kfree(host->dma_req); ++ ++ free_irq(host->irq, host); ++ ++ iounmap(host->base); ++ release_mem_region(host->mem->start, resource_size(host->mem)); ++ ++ mmc_free_host(mmc); ++ return 0; ++} ++ ++#ifdef CONFIG_PM ++static int ftsdc_free_dma(struct ftsdc_host *host) ++{ ++ dmad_channel_free(host->dma_req); ++ return 0; ++} ++ ++static int ftsdc_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ struct mmc_host *mmc = platform_get_drvdata(pdev); ++ struct ftsdc_host *host = mmc_priv(mmc); ++ int ret = 0; ++ if (mmc) { ++ ftsdc_free_dma(host); ++ } ++ return ret; ++ ++} ++ ++static int ftsdc_resume(struct platform_device *pdev) ++{ ++ struct mmc_host *mmc = platform_get_drvdata(pdev); ++ int ret = 0; ++ struct ftsdc_host *host = mmc_priv(mmc); ++ if (mmc) { ++#if (defined(CONFIG_PLATFORM_AHBDMA) || defined(CONFIG_PLATFORM_APBDMA)) ++ ftsdc_alloc_dma(host); ++#endif ++ } ++ return ret; ++} ++ ++#else ++#define ftsdc_suspend NULL ++#define ftsdc_resume NULL ++#endif ++ ++static struct platform_driver ftsdc_driver = { ++ .driver = { ++ .name = "ftsdc010", ++ .owner = THIS_MODULE, ++ .of_match_table = of_match_ptr(ftsdc_mmc_dt_ids), ++ }, ++ .remove = __exit_p(ftsdc_remove), ++ .shutdown = ftsdc_shutdown, ++ .suspend = ftsdc_suspend, ++ .resume = ftsdc_resume, ++}; ++ ++module_platform_driver_probe(ftsdc_driver, ftsdc_probe); ++MODULE_DESCRIPTION("Andestech Leopard MMC/SD Card Interface driver"); ++MODULE_LICENSE("GPL v2"); +diff --git a/drivers/mmc/host/ftsdc010.h b/drivers/mmc/host/ftsdc010.h +new file mode 100644 +index 000000000000..d8cbe57fab1d +--- /dev/null ++++ b/drivers/mmc/host/ftsdc010.h +@@ -0,0 +1,257 @@ ++/* ++ * linux/driver/mmc/ftsdc010.h - Andestech MMC/SD driver ++ * Andestech FTSDC010 Device Driver ++ * ++ * Andestech (C) 2005 Faraday Corp. (http://www.Andestech.com) ++ * ++ * All Rights Reserved ++ */ ++#ifndef _FTSDC010_H_ ++#define _FTSDC010_H_ ++ ++#define DELAY_FOR_DMA_READ ++ ++#ifdef SD_DEBUG ++ #define P_DEBUG(fmt, args...) printk(KERN_ALERT "SD: " fmt, ## args) ++#else ++ #define P_DEBUG(a...) ++#endif ++#define P_DEBUGG(a...) ++ ++/* used for dma timeout */ ++#define SDC_TIMEOUT_BASE (HZ/2) // Unit is 500 ms ++ ++/* used for pio retry times */ ++#define SDC_PIO_RETRY 0x300000 ++ ++/* sd controller register */ ++#define SDC_CMD_REG 0x00000000 ++#define SDC_ARGU_REG 0x00000004 ++#define SDC_RESPONSE0_REG 0x00000008 ++#define SDC_RESPONSE1_REG 0x0000000C ++#define SDC_RESPONSE2_REG 0x00000010 ++#define SDC_RESPONSE3_REG 0x00000014 ++#define SDC_RSP_CMD_REG 0x00000018 ++#define SDC_DATA_CTRL_REG 0x0000001C ++#define SDC_DATA_TIMER_REG 0x00000020 ++#define SDC_DATA_LEN_REG 0x00000024 ++#define SDC_STATUS_REG 0x00000028 ++#define SDC_CLEAR_REG 0x0000002C ++#define SDC_INT_MASK_REG 0x00000030 ++#define SDC_POWER_CTRL_REG 0x00000034 ++#define SDC_CLOCK_CTRL_REG 0x00000038 ++#define SDC_BUS_WIDTH_REG 0x0000003C ++#define SDC_DATA_WINDOW_REG 0x00000040 ++ ++#ifdef A320D_BUILDIN_SDC ++#define SDC_FEATURE_REG 0x00000044 ++#define SDC_REVISION_REG 0x00000048 ++#else ++#define SDC_MMC_INT_RSP_REG 0x00000044 ++#define SDC_GP_OUTPUT_REG 0x00000048 ++#define SDC_FEATURE_REG 0x0000009C ++#define SDC_REVISION_REG 0x000000A0 ++#endif ++ ++#define SDC_SDIO_CTRL1_REG 0x0000006C ++#define SDC_SDIO_CTRL2_REG 0x00000070 ++#define SDC_SDIO_STATUS_REG 0x00000074 ++ ++/* bit mapping of command register */ ++#define SDC_CMD_REG_INDEX 0x0000003F ++#define SDC_CMD_REG_NEED_RSP 0x00000040 ++#define SDC_CMD_REG_LONG_RSP 0x00000080 ++#define SDC_CMD_REG_APP_CMD 0x00000100 ++#define SDC_CMD_REG_CMD_EN 0x00000200 ++#define SDC_CMD_REG_SDC_RST 0x00000400 ++#define SDC_CMD_MMC_INT_STOP 0x00000800 ++ ++/* bit mapping of response command register */ ++#define SDC_RSP_CMD_REG_INDEX 0x0000003F ++#define SDC_RSP_CMD_REG_APP 0x00000040 ++ ++/* bit mapping of data control register */ ++#define SDC_DATA_CTRL_REG_BLK_SIZE 0x0000000F ++#define SDC_DATA_CTRL_REG_DATA_WRITE 0x00000010 ++#define SDC_DATA_CTRL_REG_DMA_EN 0x00000020 ++#define SDC_DATA_CTRL_REG_DATA_EN 0x00000040 ++#define SDC_DATA_CTRL_REG_FIFOTH 0x00000080 ++#define SDC_DATA_CTRL_REG_DMA_TYPE 0x00000300 ++#define SDC_DATA_CTRL_REG_FIFO_RST 0x00000400 ++#define SDC_CPRM_DATA_CHANGE_ENDIAN_EN 0x00000800 ++#define SDC_CPRM_DATA_SWAP_HL_EN 0x00001000 ++ ++#define SDC_DMA_TYPE_1 0x00000000 ++#define SDC_DMA_TYPE_4 0x00000100 ++#define SDC_DMA_TYPE_8 0x00000200 ++ ++/* bit mapping of status register */ ++#define SDC_STATUS_REG_RSP_CRC_FAIL 0x00000001 ++#define SDC_STATUS_REG_DATA_CRC_FAIL 0x00000002 ++#define SDC_STATUS_REG_RSP_TIMEOUT 0x00000004 ++#define SDC_STATUS_REG_DATA_TIMEOUT 0x00000008 ++#define SDC_STATUS_REG_RSP_CRC_OK 0x00000010 ++#define SDC_STATUS_REG_DATA_CRC_OK 0x00000020 ++#define SDC_STATUS_REG_CMD_SEND 0x00000040 ++#define SDC_STATUS_REG_DATA_END 0x00000080 ++#define SDC_STATUS_REG_FIFO_UNDERRUN 0x00000100 ++#define SDC_STATUS_REG_FIFO_OVERRUN 0x00000200 ++#define SDC_STATUS_REG_CARD_CHANGE 0x00000400 ++#define SDC_STATUS_REG_CARD_DETECT 0x00000800 ++#define SDC_STATUS_REG_CARD_LOCK 0x00001000 ++#define SDC_STATUS_REG_CP_READY 0x00002000 ++#define SDC_STATUS_REG_CP_BUF_READY 0x00004000 ++#define SDC_STATUS_REG_PLAIN_TEXT_READY 0x00008000 ++#define SDC_STATUS_REG_SDIO_INTR 0x00010000 ++ ++/* bit mapping of clear register */ ++#define SDC_CLEAR_REG_RSP_CRC_FAIL 0x00000001 ++#define SDC_CLEAR_REG_DATA_CRC_FAIL 0x00000002 ++#define SDC_CLEAR_REG_RSP_TIMEOUT 0x00000004 ++#define SDC_CLEAR_REG_DATA_TIMEOUT 0x00000008 ++#define SDC_CLEAR_REG_RSP_CRC_OK 0x00000010 ++#define SDC_CLEAR_REG_DATA_CRC_OK 0x00000020 ++#define SDC_CLEAR_REG_CMD_SEND 0x00000040 ++#define SDC_CLEAR_REG_DATA_END 0x00000080 ++#define SDC_CLEAR_REG_CARD_CHANGE 0x00000400 ++#define SDC_CLEAR_REG_SDIO_INTR 0x00010000 ++ ++/* bit mapping of int_mask register */ ++#define SDC_INT_MASK_REG_RSP_CRC_FAIL 0x00000001 ++#define SDC_INT_MASK_REG_DATA_CRC_FAIL 0x00000002 ++#define SDC_INT_MASK_REG_RSP_TIMEOUT 0x00000004 ++#define SDC_INT_MASK_REG_DATA_TIMEOUT 0x00000008 ++#define SDC_INT_MASK_REG_RSP_CRC_OK 0x00000010 ++#define SDC_INT_MASK_REG_DATA_CRC_OK 0x00000020 ++#define SDC_INT_MASK_REG_CMD_SEND 0x00000040 ++#define SDC_INT_MASK_REG_DATA_END 0x00000080 ++#define SDC_INT_MASK_REG_FIFO_UNDERRUN 0x00000100 ++#define SDC_INT_MASK_REG_FIFO_OVERRUN 0x00000200 ++#define SDC_INT_MASK_REG_CARD_CHANGE 0x00000400 ++#define SDC_INT_MASK_REG_CARD_LOCK 0x00001000 ++#define SDC_INT_MASK_REG_CP_READY 0x00002000 ++#define SDC_INT_MASK_REG_CP_BUF_READY 0x00004000 ++#define SDC_INT_MASK_REG_PLAIN_TEXT_READY 0x00008000 ++#define SDC_INT_MASK_REG_SDIO_INTR 0x00010000 ++ ++ ++#define SDC_CARD_INSERT 0x0 ++#define SDC_CARD_REMOVE SDC_STATUS_REG_CARD_DETECT ++ ++/* bit mapping of power control register */ ++#define SDC_POWER_CTRL_REG_POWER_ON 0x00000010 ++#define SDC_POWER_CTRL_REG_POWER_BITS 0x0000000F ++ ++/* bit mapping of clock control register */ ++#define SDC_CLOCK_CTRL_REG_CLK_DIV 0x0000007F ++#define SDC_CLOCK_CTRL_REG_CARD_TYPE 0x00000080 ++#define SDC_CLOCK_CTRL_REG_CLK_DIS 0x00000100 ++ ++/* card type */ ++#define SDC_CARD_TYPE_SD SDC_CLOCK_REG_CARD_TYPE ++#define SDC_CARD_TYPE_MMC 0x0 ++ ++/* bit mapping of bus width register */ ++#define SDC_BUS_WIDTH_REG_SINGLE_BUS 0x00000001 ++#define SDC_BUS_WIDTH_REG_WIDE_8_BUS 0x00000002 ++#define SDC_BUS_WIDTH_REG_WIDE_4_BUS 0x00000004 ++#define SDC_BUS_WIDTH_REG_WIDE_BUS_SUPPORT 0x00000018 ++#define SDC_BUS_WIDTH_REG_CARD_DETECT 0x00000020 ++ ++#define SDC_WIDE_4_BUS_SUPPORT 0x00000008 ++#define SDC_WIDE_8_BUS_SUPPORT 0x00000010 ++ ++/* bit mapping of feature register */ ++#define SDC_FEATURE_REG_FIFO_DEPTH 0x000000FF ++#define SDC_FEATURE_REG_CPRM_FUNCTION 0x00000100 ++ ++/* bit mapping of sdio control register */ ++#define SDC_SDIO_CTRL1_REG_SDIO_BLK_NO 0xFFFF8000 ++#define SDC_SDIO_CTRL1_REG_SDIO_ENABLE 0x00004000 ++#define SDC_SDIO_CTRL1_REG_READ_WAIT_ENABLE 0x00002000 ++#define SDC_SDIO_CTRL1_REG_SDIO_BLK_MODE 0x00001000 ++#define SDC_SDIO_CTRL1_REG_SDIO_BLK_SIZE 0x00000FFF ++ ++/* bit mapping of sdio status register */ ++#define SDC_SDIO_SDIO_STATUS_REG_FIFO_REMAIN_NO 0x00FE0000 ++#define SDC_SDIO_SDIO_STATUS_REG_SDIO_BLK_CNT 0x0001FFFF ++ ++enum ftsdc_waitfor { ++ COMPLETION_NONE, ++ COMPLETION_FINALIZE, ++ COMPLETION_CMDSENT, ++ COMPLETION_RSPFIN, ++ COMPLETION_XFER_PROGRESS, ++}; ++ ++struct ftsdc_host { ++ struct platform_device *pdev; ++ struct mmc_host *mmc; ++ struct resource *mem; ++ struct clk *clk; ++ void __iomem *base; ++ int irq; ++ ++ unsigned int real_rate; ++ bool irq_enabled; ++ unsigned int fifo_len; /* bytes */ ++ unsigned int last_opcode; /* keep last successful cmd to judge application specific command */ ++ ++ struct mmc_request *mrq; ++ int cmd_is_stop; ++ ++ spinlock_t complete_lock; ++ enum ftsdc_waitfor complete_what; ++ ++ struct completion dma_complete; ++ dmad_chreq *dma_req; ++ bool dodma; ++ bool dma_finish; ++ ++ ++ u32 buf_sgptr; /* keep next scallterlist buffer index */ ++ u32 buf_bytes; /* keep current total scallterlist buffer length */ ++ u32 buf_count; /* keep real data size rw from sd */ ++ u32 *buf_ptr; /* keep current scallterlist buffer address */ ++#define XFER_NONE 0 ++#define XFER_READ 1 ++#define XFER_WRITE 2 ++ u32 buf_active; /* keep current transfer mode */ ++ ++ int bus_width; ++ ++ char dbgmsg_cmd[301]; ++ char dbgmsg_dat[301]; ++ char *status; ++ ++ unsigned int ccnt, dcnt; ++ struct tasklet_struct pio_tasklet; ++ struct work_struct work; ++ ++#ifdef CONFIG_DEBUG_FS ++ struct dentry *debug_root; ++ struct dentry *debug_state; ++ struct dentry *debug_regs; ++#endif ++}; ++ ++struct ftsdc_mmc_config { ++ /* get_cd()/get_wp() may sleep */ ++ int (*get_cd)(int module); ++ int (*get_ro)(int module); ++ ++ void (*set_power)(int module, bool on); ++ ++ /* wires == 0 is equivalent to wires == 4 (4-bit parallel) */ ++ u8 wires; ++ ++ u32 max_freq; ++ ++ /* any additional host capabilities: OR'd in to mmc->f_caps */ ++ u32 caps; ++ ++ /* Number of sg segments */ ++ u8 nr_sg; ++}; ++ ++#endif +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0005-Non-cacheability-and-Cache-support.patch b/board/andes/ae350/patches/linux/0005-Non-cacheability-and-Cache-support.patch new file mode 100644 index 0000000000..326bbb71c7 --- /dev/null +++ b/board/andes/ae350/patches/linux/0005-Non-cacheability-and-Cache-support.patch @@ -0,0 +1,1132 @@ +From e0f510874201d32d720fc94948a266a29d9b4b52 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:20:40 +0800 +Subject: [PATCH 05/12] Non-cacheability and Cache support + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/andesv5/Makefile | 4 + + arch/riscv/andesv5/cache.c | 414 ++++++++++++++++++++++++++ + arch/riscv/andesv5/cctl.c | 260 ++++++++++++++++ + arch/riscv/andesv5/noncache_dma.c | 113 +++++++ + arch/riscv/include/asm/andesv5/csr.h | 160 ++++++++++ + arch/riscv/include/asm/andesv5/proc.h | 36 +++ + arch/riscv/include/asm/andesv5/smu.h | 78 +++++ + 7 files changed, 1065 insertions(+) + create mode 100644 arch/riscv/andesv5/Makefile + create mode 100644 arch/riscv/andesv5/cache.c + create mode 100644 arch/riscv/andesv5/cctl.c + create mode 100644 arch/riscv/andesv5/noncache_dma.c + create mode 100644 arch/riscv/include/asm/andesv5/csr.h + create mode 100644 arch/riscv/include/asm/andesv5/proc.h + create mode 100644 arch/riscv/include/asm/andesv5/smu.h + +diff --git a/arch/riscv/andesv5/Makefile b/arch/riscv/andesv5/Makefile +new file mode 100644 +index 000000000000..6188956ae944 +--- /dev/null ++++ b/arch/riscv/andesv5/Makefile +@@ -0,0 +1,4 @@ ++obj-y += cctl.o ++obj-y += cache.o ++obj-y += noncache_dma.o ++obj-y += sbi.o +diff --git a/arch/riscv/andesv5/cache.c b/arch/riscv/andesv5/cache.c +new file mode 100644 +index 000000000000..3d4e82f3525e +--- /dev/null ++++ b/arch/riscv/andesv5/cache.c +@@ -0,0 +1,414 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_PERF_EVENTS ++#include ++#endif ++ ++#define MAX_CACHE_LINE_SIZE 256 ++#define EVSEL_MASK 0xff ++#define SEL_PER_CTL 8 ++#define SEL_OFF(id) (8 * (id % 8)) ++ ++static void __iomem *l2c_base; ++ ++DEFINE_PER_CPU(struct andesv5_cache_info, cpu_cache_info) = { ++ .init_done = 0, ++ .dcache_line_size = SZ_32 ++}; ++static void fill_cpu_cache_info(struct andesv5_cache_info *cpu_ci) ++{ ++ struct cpu_cacheinfo *this_cpu_ci = ++ get_cpu_cacheinfo(smp_processor_id()); ++ struct cacheinfo *this_leaf = this_cpu_ci->info_list; ++ unsigned int i = 0; ++ ++ for(; i< this_cpu_ci->num_leaves ; i++, this_leaf++) ++ if(this_leaf->type == CACHE_TYPE_DATA) { ++ cpu_ci->dcache_line_size = this_leaf->coherency_line_size; ++ } ++ cpu_ci->init_done = true; ++} ++ ++ ++inline int get_cache_line_size(void) ++{ ++ struct andesv5_cache_info *cpu_ci = ++ &per_cpu(cpu_cache_info, smp_processor_id()); ++ ++ if(unlikely(cpu_ci->init_done == false)) ++ fill_cpu_cache_info(cpu_ci); ++ return cpu_ci->dcache_line_size; ++} ++ ++static uint32_t cpu_l2c_get_cctl_status(void) ++{ ++ return readl((void*)(l2c_base + L2C_REG_STATUS_OFFSET)); ++} ++ ++void cpu_dcache_wb_range(unsigned long start, unsigned long end, int line_size) ++{ ++ int mhartid = smp_processor_id(); ++ unsigned long pa; ++ while (end > start) { ++ custom_csr_write(CCTL_REG_UCCTLBEGINADDR_NUM, start); ++ custom_csr_write(CCTL_REG_UCCTLCOMMAND_NUM, CCTL_L1D_VA_WB); ++ ++ if (l2c_base) { ++ pa = virt_to_phys((void*)start); ++ writel(pa, (void*)(l2c_base + L2C_REG_CN_ACC_OFFSET(mhartid))); ++ writel(CCTL_L2_PA_WB, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ } ++ ++ start += line_size; ++ } ++} ++ ++void cpu_dcache_inval_range(unsigned long start, unsigned long end, int line_size) ++{ ++ int mhartid = smp_processor_id(); ++ unsigned long pa; ++ while (end > start) { ++ custom_csr_write(CCTL_REG_UCCTLBEGINADDR_NUM, start); ++ custom_csr_write(CCTL_REG_UCCTLCOMMAND_NUM, CCTL_L1D_VA_INVAL); ++ ++ if (l2c_base) { ++ pa = virt_to_phys((void*)start); ++ writel(pa, (void*)(l2c_base + L2C_REG_CN_ACC_OFFSET(mhartid))); ++ writel(CCTL_L2_PA_INVAL, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ } ++ ++ start += line_size; ++ } ++} ++void cpu_dma_inval_range(unsigned long start, unsigned long end) ++{ ++ unsigned long flags; ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long old_start = start; ++ unsigned long old_end = end; ++ char cache_buf[2][MAX_CACHE_LINE_SIZE]={0}; ++ ++ if (unlikely(start == end)) ++ return; ++ ++ start = start & (~(line_size - 1)); ++ end = ((end + line_size - 1) & (~(line_size - 1))); ++ ++ local_irq_save(flags); ++ if (unlikely(start != old_start)) { ++ memcpy(&cache_buf[0][0], (void *)start, line_size); ++ } ++ if (unlikely(end != old_end)) { ++ memcpy(&cache_buf[1][0], (void *)(old_end & (~(line_size - 1))), line_size); ++ } ++ cpu_dcache_inval_range(start, end, line_size); ++ if (unlikely(start != old_start)) { ++ memcpy((void *)start, &cache_buf[0][0], (old_start & (line_size - 1))); ++ } ++ if (unlikely(end != old_end)) { ++ memcpy((void *)(old_end + 1), &cache_buf[1][(old_end & (line_size - 1)) + 1], end - old_end - 1); ++ } ++ local_irq_restore(flags); ++ ++} ++EXPORT_SYMBOL(cpu_dma_inval_range); ++ ++void cpu_dma_wb_range(unsigned long start, unsigned long end) ++{ ++ unsigned long flags; ++ unsigned long line_size = get_cache_line_size(); ++ ++ local_irq_save(flags); ++ start = start & (~(line_size - 1)); ++ cpu_dcache_wb_range(start, end, line_size); ++ local_irq_restore(flags); ++} ++EXPORT_SYMBOL(cpu_dma_wb_range); ++ ++/* L1 Cache */ ++int cpu_l1c_status(void) ++{ ++ /* TODO */ ++ // return SBI_CALL_0(SBI_L1CACHE_STATUS); ++ return 0; ++} ++ ++void cpu_icache_enable(void *info) ++{ ++ /* TODO */ ++ // SBI_CALL_1(SBI_ICACHE_OP, 1); ++} ++ ++void cpu_icache_disable(void *info) ++{ ++ /* TODO */ ++ // unsigned long flags; ++ ++ // local_irq_save(flags); ++ // SBI_CALL_1(SBI_ICACHE_OP, 0); ++ // local_irq_restore(flags); ++} ++ ++void cpu_dcache_enable(void *info) ++{ ++ /* TODO */ ++ // SBI_CALL_1(SBI_DCACHE_OP, 1); ++} ++ ++void cpu_dcache_disable(void *info) ++{ ++ /* TODO */ ++ // unsigned long flags; ++ ++ // local_irq_save(flags); ++ // SBI_CALL_1(SBI_DCACHE_OP, 0); ++ // local_irq_restore(flags); ++} ++ ++/* L2 Cache */ ++uint32_t cpu_l2c_ctl_status(void) ++{ ++ return readl((void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++} ++ ++void cpu_l2c_enable(void) ++{ ++#ifdef CONFIG_SMP ++ int mhartid = smp_processor_id(); ++#else ++ int mhartid = 0; ++#endif ++ unsigned int val; ++ ++ /* No l2 cache */ ++ if(!l2c_base) ++ return; ++ ++ /* l2 cache has enabled */ ++ if(cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN) ++ return; ++ ++ /* Enable l2 cache*/ ++ val = readl((void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++ val |= L2_CACHE_CTL_mskCEN; ++ ++ writel(val, (void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++} ++ ++void cpu_l2c_disable(void) ++{ ++#ifdef CONFIG_SMP ++ int mhartid = smp_processor_id(); ++#else ++ int mhartid = 0; ++#endif ++ unsigned int val; ++ ++ /*No l2 cache */ ++ if(!l2c_base) ++ return; ++ ++ /*l2 cache has disabled*/ ++ if(!(cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN)) ++ return; ++ ++ /*L2 write-back and invalidate all*/ ++ writel(CCTL_L2_WBINVAL_ALL, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ ++ /*Disable L2 cache*/ ++ val = readl((void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++ val &= (~L2_CACHE_CTL_mskCEN); ++ ++ writel(val, (void*)(l2c_base + L2C_REG_CTL_OFFSET)); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++} ++ ++#ifndef CONFIG_SMP ++void cpu_l2c_inval_range(unsigned long pa, unsigned long size) ++{ ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long start = pa, end = pa + size; ++ unsigned long align_start, align_end; ++ ++ align_start = start & ~(line_size - 1); ++ align_end = (end + line_size - 1) & ~(line_size - 1); ++ ++ while(align_end > align_start){ ++ writel(align_start, (void*)(l2c_base + L2C_REG_C0_ACC_OFFSET)); ++ writel(CCTL_L2_PA_INVAL, (void*)(l2c_base + L2C_REG_C0_CMD_OFFSET)); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_C0_MASK) ++ != CCTL_L2_STATUS_IDLE); ++ align_start += line_size; ++ } ++} ++EXPORT_SYMBOL(cpu_l2c_inval_range); ++ ++void cpu_l2c_wb_range(unsigned long pa, unsigned long size) ++{ ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long start = pa, end = pa + size; ++ unsigned long align_start, align_end; ++ ++ align_start = start & ~(line_size - 1); ++ align_end = (end + line_size - 1) & ~(line_size - 1); ++ ++ while(align_end > align_start){ ++ writel(align_start, (void*)(l2c_base + L2C_REG_C0_ACC_OFFSET)); ++ writel(CCTL_L2_PA_WB, (void*)(l2c_base + L2C_REG_C0_CMD_OFFSET)); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_C0_MASK) ++ != CCTL_L2_STATUS_IDLE); ++ align_start += line_size; ++ } ++} ++EXPORT_SYMBOL(cpu_l2c_wb_range); ++#else ++void cpu_l2c_inval_range(unsigned long pa, unsigned long size) ++{ ++ int mhartid = smp_processor_id(); ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long start = pa, end = pa + size; ++ unsigned long align_start, align_end; ++ ++ align_start = start & ~(line_size - 1); ++ align_end = (end + line_size - 1) & ~(line_size - 1); ++ ++ while(align_end > align_start){ ++ writel(align_start, (void*)(l2c_base + L2C_REG_CN_ACC_OFFSET(mhartid))); ++ writel(CCTL_L2_PA_INVAL, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ align_start += line_size; ++ } ++} ++EXPORT_SYMBOL(cpu_l2c_inval_range); ++ ++void cpu_l2c_wb_range(unsigned long pa, unsigned long size) ++{ ++ int mhartid = smp_processor_id(); ++ unsigned long line_size = get_cache_line_size(); ++ unsigned long start = pa, end = pa + size; ++ unsigned long align_start, align_end; ++ ++ align_start = start & ~(line_size - 1); ++ align_end = (end + line_size - 1) & ~(line_size - 1); ++ ++ while(align_end > align_start){ ++ writel(align_start, (void*)(l2c_base + L2C_REG_CN_ACC_OFFSET(mhartid))); ++ writel(CCTL_L2_PA_WB, (void*)(l2c_base + L2C_REG_CN_CMD_OFFSET(mhartid))); ++ while ((cpu_l2c_get_cctl_status() & CCTL_L2_STATUS_CN_MASK(mhartid)) ++ != CCTL_L2_STATUS_IDLE); ++ align_start += line_size; ++ } ++} ++EXPORT_SYMBOL(cpu_l2c_wb_range); ++#endif ++ ++#ifdef CONFIG_PERF_EVENTS ++int cpu_l2c_get_counter_idx(struct l2c_hw_events *l2c) ++{ ++ int idx; ++ ++ idx = find_next_zero_bit(l2c->used_mask, L2C_MAX_COUNTERS - 1, 0); ++ return idx; ++} ++ ++void l2c_write_counter(int idx, u64 value) ++{ ++ u32 vall = value; ++ u32 valh = value >> 32; ++ ++ writel(vall, (void*)(l2c_base + L2C_REG_CN_HPM_OFFSET(idx))); ++ writel(valh, (void*)(l2c_base + L2C_REG_CN_HPM_OFFSET(idx) + 0x4)); ++} ++ ++u64 l2c_read_counter(int idx) ++{ ++ u32 vall = readl((void*)(l2c_base + L2C_REG_CN_HPM_OFFSET(idx))); ++ u32 valh = readl((void*)(l2c_base + L2C_REG_CN_HPM_OFFSET(idx) + 0x4)); ++ u64 val = ((u64)valh << 32) | vall; ++ ++ return val; ++} ++ ++void l2c_pmu_disable_counter(int idx) ++{ ++ int n = idx / SEL_PER_CTL; ++ u32 vall = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ u32 valh = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++ u64 val = ((u64)valh << 32) | vall; ++ ++ val |= (EVSEL_MASK << SEL_OFF(idx)); ++ vall = val; ++ valh = val >> 32; ++ writel(vall, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ writel(valh, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++} ++ ++#ifndef CONFIG_SMP ++void l2c_pmu_event_enable(u64 config, int idx) ++{ ++ int n = idx / SEL_PER_CTL; ++ u32 vall = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ u32 valh = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++ u64 val = ((u64)valh << 32) | vall; ++ ++ val = val & ~(EVSEL_MASK << SEL_OFF(idx)); ++ val = val | (config << SEL_OFF(idx)); ++ vall = val; ++ valh = val >> 32; ++ writel(vall, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ writel(valh, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++} ++#else ++void l2c_pmu_event_enable(u64 config, int idx) ++{ ++ int n = idx / SEL_PER_CTL; ++ int mhartid = smp_processor_id(); ++ u32 vall = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ u32 valh = readl((void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++ u64 val = ((u64)valh << 32) | vall; ++ ++ if (config <= (CN_RECV_SNOOP_DATA(NR_CPUS - 1) & EVSEL_MASK)) ++ config = config + mhartid * L2C_REG_PER_CORE_OFFSET; ++ ++ val = val & ~(EVSEL_MASK << SEL_OFF(idx)); ++ val = val | (config << SEL_OFF(idx)); ++ vall = val; ++ valh = val >> 32; ++ writel(vall, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n))); ++ writel(valh, (void*)(l2c_base + L2C_HPM_CN_CTL_OFFSET(n) + 0x4)); ++} ++#endif ++#endif ++ ++int __init l2c_init(void) ++{ ++ struct device_node *node ; ++ ++ node = of_find_compatible_node(NULL, NULL, "cache"); ++ l2c_base = of_iomap(node, 0); ++ ++ return 0; ++} ++arch_initcall(l2c_init) +diff --git a/arch/riscv/andesv5/cctl.c b/arch/riscv/andesv5/cctl.c +new file mode 100644 +index 000000000000..f3f61db29e0d +--- /dev/null ++++ b/arch/riscv/andesv5/cctl.c +@@ -0,0 +1,260 @@ ++/* ++ * Copyright (C) 2009 Andes Technology Corporation ++ * Copyright (C) 2019 Andes Technology Corporation ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define INPUTLEN 32 ++ ++struct entry_struct{ ++ ++ char *name; ++ int perm; ++ const struct proc_ops *fops; ++}; ++ ++static struct proc_dir_entry *proc_cctl; ++ ++#define DEBUG( enable, tagged, ...) \ ++ do{ \ ++ if(enable){ \ ++ if(tagged) \ ++ printk( "[ %30s() ] ", __func__); \ ++ printk( __VA_ARGS__); \ ++ } \ ++ } while( 0) ++ ++static int debug = 0; ++module_param(debug, int, 0); ++ ++void cpu_icache_smp_enable(void) ++{ ++ int cpu_num = num_online_cpus(); ++ int id = smp_processor_id(); ++ int i, ret; ++ ++ for(i = 0; i < cpu_num; i++){ ++ if(i == id) ++ continue; ++ ret = smp_call_function_single(i, cpu_icache_enable, ++ NULL, true); ++ if(ret) ++ pr_err("Core %d enable I-cache Fail\n" ++ "Error Code:%d \n", i, ret); ++ } ++ cpu_icache_enable(NULL); ++} ++ ++void cpu_icache_smp_disable(void) ++{ ++ int cpu_num = num_online_cpus(); ++ int id = smp_processor_id(); ++ int i, ret; ++ ++ for(i = 0; i < cpu_num; i++){ ++ if(i == id) ++ continue; ++ ret = smp_call_function_single(i, cpu_icache_disable, ++ NULL, true); ++ if(ret) ++ pr_err("Core %d disable I-cache Fail \n" ++ "Error Code:%d \n", i, ret); ++ } ++ cpu_icache_disable(NULL); ++} ++ ++void cpu_dcache_smp_enable(void) ++{ ++ int cpu_num = num_online_cpus(); ++ int id = smp_processor_id(); ++ int i, ret; ++ ++ for(i = 0; i < cpu_num; i++){ ++ if(i == id) ++ continue; ++ ret = smp_call_function_single(i, cpu_dcache_enable, ++ NULL, true); ++ if(ret) ++ pr_err("Core %d disable D-cache Fail \n" ++ "Error Code:%d \n", i, ret); ++ } ++ cpu_dcache_enable(NULL); ++} ++ ++void cpu_dcache_smp_disable(void) ++{ ++ int cpu_num = num_online_cpus(); ++ int id = smp_processor_id(); ++ int i, ret; ++ ++ for(i = 0; i < cpu_num; i++){ ++ if(i == id) ++ continue; ++ ret = smp_call_function_single(i, cpu_dcache_disable, ++ NULL, true); ++ if(ret) ++ pr_err("Core %d disable D-cache Fail \n" ++ "Error Code:%d \n", i, ret); ++ } ++ cpu_dcache_disable(NULL); ++} ++ ++static ssize_t proc_read_cache_en(struct file *file, char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ int ret; ++ char buf[18]; ++ if (!strncmp(file->f_path.dentry->d_name.name, "ic_en", 7)) ++ ret = sprintf(buf, "I-cache: %s\n", (cpu_l1c_status() & CACHE_CTL_mskIC_EN) ? "Enabled" : "Disabled"); ++ else if(!strncmp(file->f_path.dentry->d_name.name, "dc_en", 7)) ++ ret = sprintf(buf, "D-cache: %s\n", (cpu_l1c_status() & CACHE_CTL_mskDC_EN) ? "Enabled" : "Disabled"); ++ else if(!strncmp(file->f_path.dentry->d_name.name, "l2c_en", 7)) ++ ret = sprintf(buf, "L2-cache: %s\n", (cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN) ? "Enabled" : "Disabled"); ++ else ++ return -EFAULT; ++ ++ return simple_read_from_buffer(userbuf, count, ppos, buf, ret); ++} ++ ++static ssize_t proc_write_cache_en(struct file *file, ++ const char __user *buffer, size_t count, loff_t *ppos) ++{ ++ ++ unsigned long en; ++ char inbuf[INPUTLEN]; ++ ++ if (count > INPUTLEN - 1) ++ count = INPUTLEN - 1; ++ ++ if (copy_from_user(inbuf, buffer, count)) ++ return -EFAULT; ++ ++ inbuf[count] = '\0'; ++ ++ if (!sscanf(inbuf, "%lu", &en) || en > 1) ++ return -EFAULT; ++ ++ if (!strncmp(file->f_path.dentry->d_name.name, "ic_en", 7)) { ++ if (en && !(cpu_l1c_status() & CACHE_CTL_mskIC_EN)) { ++#ifdef CONFIG_SMP ++ cpu_icache_smp_enable(); ++#else ++ cpu_icache_enable(NULL); ++#endif ++ DEBUG(debug, 1, "I-cache: Enabled\n"); ++ } else if (!en && (cpu_l1c_status() & CACHE_CTL_mskIC_EN)) { ++#ifdef CONFIG_SMP ++ cpu_icache_smp_disable(); ++#else ++ cpu_icache_disable(NULL); ++#endif ++ DEBUG(debug, 1, "I-cache: Disabled\n"); ++ } ++ } else if(!strncmp(file->f_path.dentry->d_name.name, "dc_en", 7)) { ++ if (en && !(cpu_l1c_status() & CACHE_CTL_mskDC_EN)) { ++#ifdef CONFIG_SMP ++ cpu_dcache_smp_enable(); ++#else ++ cpu_dcache_enable(NULL); ++#endif ++ DEBUG(debug, 1, "D-cache: Enabled\n"); ++ } else if (!en && (cpu_l1c_status() & CACHE_CTL_mskDC_EN)) { ++#ifdef CONFIG_SMP ++ cpu_dcache_smp_disable(); ++#else ++ cpu_dcache_disable(NULL); ++#endif ++ DEBUG(debug, 1, "D-cache: Disabled\n"); ++ } ++ }else if(!strncmp(file->f_path.dentry->d_name.name, "l2c_en", 7)){ ++ if (en && !(cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN)) { ++ cpu_l2c_enable(); ++ DEBUG(debug, 1, "L2-cache: Enabled\n"); ++ } else if (!en && (cpu_l2c_ctl_status() & L2_CACHE_CTL_mskCEN)) { ++ cpu_l2c_disable(); ++ DEBUG(debug, 1, "L2-cache: Disabled\n"); ++ } ++ }else{ ++ return -EFAULT; ++ } ++ ++ return count; ++} ++ ++static const struct proc_ops en_fops = { ++ .proc_open = simple_open, ++ .proc_read = proc_read_cache_en, ++ .proc_write = proc_write_cache_en, ++}; ++ ++static void create_seq_entry(struct entry_struct *e, mode_t mode, ++ struct proc_dir_entry *parent) ++{ ++ ++ struct proc_dir_entry *entry = proc_create(e->name, mode, parent, e->fops); ++ ++ if (!entry) ++ printk(KERN_ERR "invalid %s register.\n", e->name); ++} ++ ++static void install_proc_table(struct entry_struct *table) ++{ ++ while (table->name) { ++ ++ create_seq_entry(table, table->perm, proc_cctl); ++ table++; ++ } ++} ++ ++static void remove_proc_table(struct entry_struct *table) ++{ ++ ++ while (table->name) { ++ remove_proc_entry(table->name, proc_cctl); ++ table++; ++ } ++} ++ ++struct entry_struct proc_table_cache[] = { ++ ++ {"ic_en", 0644, &en_fops}, ++ {"dc_en", 0644, &en_fops}, ++ {"l2c_en", 0644, &en_fops}, ++ {NULL, 0, 0} ++}; ++static int __init init_cctl(void) ++{ ++ ++ DEBUG(debug, 0, "CCTL module registered\n"); ++ ++ if(!(proc_cctl = proc_mkdir("cctl", NULL))) ++ return -ENOMEM; ++ ++ install_proc_table(proc_table_cache); ++ ++ return 0; ++} ++ ++static void __exit cleanup_cctl(void) ++{ ++ ++ remove_proc_table(proc_table_cache); ++ remove_proc_entry("cctl", NULL); ++ ++ DEBUG(debug, 1, "CCTL module unregistered\n"); ++} ++ ++module_init(init_cctl); ++module_exit(cleanup_cctl); ++ ++MODULE_LICENSE("GPL"); ++MODULE_DESCRIPTION("Userspace Cache Control Module"); +diff --git a/arch/riscv/andesv5/noncache_dma.c b/arch/riscv/andesv5/noncache_dma.c +new file mode 100644 +index 000000000000..fa83cebad777 +--- /dev/null ++++ b/arch/riscv/andesv5/noncache_dma.c +@@ -0,0 +1,113 @@ ++/* ++ * Copyright (C) 2017 SiFive ++ * Wesley Terpstra ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see the file COPYING, or write ++ * to the Free Software Foundation, Inc., ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static void dma_flush_page(struct page *page, size_t size) ++{ ++ unsigned long k_d_vaddr; ++ /* ++ * Invalidate any data that might be lurking in the ++ * kernel direct-mapped region for device DMA. ++ */ ++ k_d_vaddr = (unsigned long)page_address(page); ++ memset((void *)k_d_vaddr, 0, size); ++ cpu_dma_wb_range(k_d_vaddr, k_d_vaddr + size); ++ cpu_dma_inval_range(k_d_vaddr, k_d_vaddr + size); ++ ++} ++ ++ ++static inline void cache_op(phys_addr_t paddr, size_t size, ++ void (*fn)(unsigned long start, unsigned long end)) ++{ ++ unsigned long start; ++ ++ start = (unsigned long)phys_to_virt(paddr); ++ fn(start, start + size); ++} ++ ++void arch_sync_dma_for_device(phys_addr_t paddr, ++ size_t size, enum dma_data_direction dir) ++{ ++ switch (dir) { ++ case DMA_FROM_DEVICE: ++ cache_op(paddr, size, cpu_dma_inval_range); ++ break; ++ case DMA_TO_DEVICE: ++ case DMA_BIDIRECTIONAL: ++ cache_op(paddr, size, cpu_dma_wb_range); ++ break; ++ default: ++ BUG(); ++ } ++} ++ ++void arch_sync_dma_for_cpu(phys_addr_t paddr, ++ size_t size, enum dma_data_direction dir) ++{ ++ switch (dir) { ++ case DMA_TO_DEVICE: ++ break; ++ case DMA_FROM_DEVICE: ++ case DMA_BIDIRECTIONAL: ++ cache_op(paddr, size, cpu_dma_inval_range); ++ break; ++ default: ++ BUG(); ++ } ++} ++ ++void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, ++ gfp_t gfp, unsigned long attrs) ++{ ++ void* kvaddr, *coherent_kvaddr; ++ size = PAGE_ALIGN(size); ++ ++ kvaddr = dma_direct_alloc_pages(dev, size, handle, gfp, attrs); ++ if (!kvaddr) ++ goto no_mem; ++ coherent_kvaddr = ioremap_nocache(dma_to_phys(dev, *handle), size); ++ if (!coherent_kvaddr) ++ goto no_map; ++ ++ dma_flush_page(virt_to_page(kvaddr),size); ++ return coherent_kvaddr; ++no_map: ++ dma_direct_free_pages(dev, size, kvaddr, *handle, attrs); ++no_mem: ++ return NULL; ++} ++ ++void arch_dma_free(struct device *dev, size_t size, void *vaddr, ++ dma_addr_t handle, unsigned long attrs) ++{ ++ void *kvaddr = phys_to_virt(dma_to_phys(dev, handle)); ++ ++ size = PAGE_ALIGN(size); ++ iounmap(vaddr); ++ dma_direct_free_pages(dev, size, kvaddr, handle, attrs); ++ ++ return; ++} +diff --git a/arch/riscv/include/asm/andesv5/csr.h b/arch/riscv/include/asm/andesv5/csr.h +new file mode 100644 +index 000000000000..43936e1fb658 +--- /dev/null ++++ b/arch/riscv/include/asm/andesv5/csr.h +@@ -0,0 +1,160 @@ ++/* micm_cfg: Instruction Cache/Memory Configuration Register */ ++#define MICM_CFG 0xfc0 ++ ++#define MICM_CFG_ISET_OFFSET 0 ++#define MICM_CFG_IWAY_OFFSET 3 ++#define MICM_CFG_ISZ_OFFSET 6 ++#define MICM_CFG_ILCK_OFFSET 9 ++#define MICM_CFG_IC_ECC_OFFSET 10 ++#define MICM_CFG_ILMB_OFFSET 12 ++#define MICM_CFG_ILMSZ_OFFSET 15 ++#define MICM_CFG_ULM_2BANK_OFFSET 20 ++#define MICM_CFG_ILM_ECC_OFFSET 21 ++ ++ ++#define MICM_CFG_ISET_MASK (0x7 << MICM_CFG_ISET_OFFSET) ++#define MICM_CFG_IWAY_MASK (0x7 << MICM_CFG_IWAY_OFFSET) ++#define MICM_CFG_ISZ_MASK (0x7 << MICM_CFG_ISZ_OFFSET) ++#define MICM_CFG_ILCK_MASK (0x1 << MICM_CFG_ILCK_OFFSET) ++#define MICM_CFG_IC_ECC_MASK (0x3 << MICM_CFG_IC_ECC_OFFSET) ++#define MICM_CFG_ILMB_MASK (0x7 << MICM_CFG_ILMB_OFFSET) ++#define MICM_CFG_ILMSZ_MASK (0x1f << MICM_CFG_ILMSZ_OFFSET) ++#define MICM_CFG_ULM_2BANK_MASK (0x1 << MICM_CFG_ULM_2BANK_OFFSET) ++#define MICM_CFG_ILM_ECC_MASK (0x3 << MICM_CFG_ILM_ECC_OFFSET) ++ ++/* mdcm_cfg: Data Cache/Memory Configuration Register */ ++#define MDCM_CFG 0xfc1 ++ ++#define MDCM_CFG_DSET_OFFSET 0 ++#define MDCM_CFG_DWAY_OFFSET 3 ++#define MDCM_CFG_DSZ_OFFSET 6 ++#define MDCM_CFG_DLCK_OFFSET 9 ++#define MDCM_CFG_DC_ECC_OFFSET 10 ++#define MDCM_CFG_DLMB_OFFSET 12 ++#define MDCM_CFG_DLMSZ_OFFSET 15 ++#define MDCM_CFG_ULM_2BANK_OFFSET 20 ++#define MDCM_CFG_DLM_ECC_OFFSET 21 ++ ++ ++#define MDCM_CFG_DSET_MASK (0x7 << MDCM_CFG_DSET_OFFSET) ++#define MDCM_CFG_DWAY_MASK (0x7 << MDCM_CFG_DWAY_OFFSET) ++#define MDCM_CFG_DSZ_MASK (0x7 << MDCM_CFG_DSZ_OFFSET) ++#define MDCM_CFG_DLCK_MASK (0x1 << MDCM_CFG_DLCK_OFFSET) ++#define MDCM_CFG_DC_ECC_MASK (0x3 << MDCM_CFG_DC_ECC_OFFSET) ++#define MDCM_CFG_DLMB_MASK (0x7 << MDCM_CFG_DLMB_OFFSET) ++#define MDCM_CFG_DLMSZ_MASK (0x1f << MDCM_CFG_DLMSZ_OFFSET) ++#define MDCM_CFG_ULM_2BANK_MASK (0x1 << MDCM_CFG_ULM_2BANK_OFFSET) ++#define MDCM_CFG_DLM_ECC_MASK (0x3 << MDCM_CFG_DLM_ECC_OFFSET) ++ ++/* User mode control registers */ ++#define CSR_UITB 0x800 ++#define CSR_UCODE 0x801 ++#define CSR_UDCAUSE 0x809 ++#define CCTL_REG_UCCTLBEGINADDR_NUM 0x80b ++#define CCTL_REG_UCCTLCOMMAND_NUM 0x80c ++#define CSR_WFE 0x810 ++#define CSR_SLEEPVALUE 0x811 ++#define CSR_TXEVT 0x812 ++ ++#define custom_csr_write(csr_num,val) csr_write(csr_num,val) ++/* ucctlcommand */ ++/* D-cache operation */ ++#define CCTL_L1D_VA_INVAL 0 ++#define CCTL_L1D_VA_WB 1 ++#define CCTL_L1D_VA_WBINVAL 2 ++ ++/* non-blocking & write around */ ++#define MMISC_CTL_NON_BLOCKING_ENABLE (0x1 << MMISC_CTL_NON_BLOCKING_OFFSET) ++#define MMISC_CTL_NON_BLOCKING_OFFSET 0x8 ++ ++#define MCACHE_CTL_L1I_PREFETCH_OFFSET 9 ++#define MCACHE_CTL_L1D_PREFETCH_OFFSET 10 ++#define MCACHE_CTL_DC_WAROUND_OFFSET_1 13 ++#define MCACHE_CTL_DC_WAROUND_OFFSET_2 14 ++#define MCACHE_CTL_L1I_PREFETCH_EN (0x1 << MCACHE_CTL_L1I_PREFETCH_OFFSET) ++#define MCACHE_CTL_L1D_PREFETCH_EN (0x1 << MCACHE_CTL_L1D_PREFETCH_OFFSET) ++#define MCACHE_CTL_DC_WAROUND_1_EN (0x1 << MCACHE_CTL_DC_WAROUND_OFFSET_1) ++#define MCACHE_CTL_DC_WAROUND_2_EN (0x1 << MCACHE_CTL_DC_WAROUND_OFFSET_2) ++#define WRITE_AROUND_ENABLE (MCACHE_CTL_L1I_PREFETCH_EN | MCACHE_CTL_L1D_PREFETCH_EN | MCACHE_CTL_DC_WAROUND_1_EN) ++ ++/* L1 I-cache , D-cache */ ++#define CACHE_CTL_offIC_EN 0 /* Enable I-cache */ ++#define CACHE_CTL_offDC_EN 1 /* Enable D-cache */ ++#define CACHE_CTL_mskIC_EN ( 0x1 << CACHE_CTL_offIC_EN ) ++#define CACHE_CTL_mskDC_EN ( 0x1 << CACHE_CTL_offDC_EN ) ++ ++ ++/* L2 cache */ ++#define L2_CACHE_CTL_mskCEN 1 ++/* L2 cache registers */ ++#define L2C_REG_CFG_OFFSET 0 ++#define L2C_REG_CTL_OFFSET 0x8 ++#define L2C_HPM_C0_CTL_OFFSET 0x10 ++#define L2C_HPM_C1_CTL_OFFSET 0x18 ++#define L2C_HPM_C2_CTL_OFFSET 0x20 ++#define L2C_HPM_C3_CTL_OFFSET 0x28 ++#define L2C_REG_C0_CMD_OFFSET 0x40 ++#define L2C_REG_C0_ACC_OFFSET 0x48 ++#define L2C_REG_C1_CMD_OFFSET 0x50 ++#define L2C_REG_C1_ACC_OFFSET 0x58 ++#define L2C_REG_C2_CMD_OFFSET 0x60 ++#define L2C_REG_C2_ACC_OFFSET 0x68 ++#define L2C_REG_C3_CMD_OFFSET 0x70 ++#define L2C_REG_C3_ACC_OFFSET 0x78 ++#define L2C_REG_STATUS_OFFSET 0x80 ++#define L2C_REG_C0_HPM_OFFSET 0x200 ++ ++/* L2 CCTL status */ ++#define CCTL_L2_STATUS_IDLE 0 ++#define CCTL_L2_STATUS_PROCESS 1 ++#define CCTL_L2_STATUS_ILLEGAL 2 ++/* L2 CCTL status cores mask */ ++#define CCTL_L2_STATUS_C0_MASK 0xF ++#define CCTL_L2_STATUS_C1_MASK 0xF0 ++#define CCTL_L2_STATUS_C2_MASK 0xF00 ++#define CCTL_L2_STATUS_C3_MASK 0xF000 ++ ++/* L2 cache operation */ ++#define CCTL_L2_PA_INVAL 0x8 ++#define CCTL_L2_PA_WB 0x9 ++#define CCTL_L2_PA_WBINVAL 0xA ++#define CCTL_L2_WBINVAL_ALL 0x12 ++ ++#define L2C_HPM_PER_CORE_OFFSET 0x8 ++#define L2C_REG_PER_CORE_OFFSET 0x10 ++#define CCTL_L2_STATUS_PER_CORE_OFFSET 4 ++#define L2C_REG_CN_CMD_OFFSET(n) \ ++ L2C_REG_C0_CMD_OFFSET + (n * L2C_REG_PER_CORE_OFFSET) ++#define L2C_REG_CN_ACC_OFFSET(n) \ ++ L2C_REG_C0_ACC_OFFSET + (n * L2C_REG_PER_CORE_OFFSET) ++#define CCTL_L2_STATUS_CN_MASK(n) \ ++ CCTL_L2_STATUS_C0_MASK << (n * CCTL_L2_STATUS_PER_CORE_OFFSET) ++#define L2C_HPM_CN_CTL_OFFSET(n) \ ++ L2C_HPM_C0_CTL_OFFSET + (n * L2C_HPM_PER_CORE_OFFSET) ++#define L2C_REG_CN_HPM_OFFSET(n) \ ++ L2C_REG_C0_HPM_OFFSET + (n * L2C_HPM_PER_CORE_OFFSET) ++ ++ ++/* Debug/Trace Registers (shared with Debug Mode) */ ++#define CSR_SCONTEXT 0x7aa ++ ++/* Supervisor trap registers */ ++#define CSR_SLIE 0x9c4 ++#define CSR_SLIP 0x9c5 ++#define CSR_SDCAUSE 0x9c9 ++ ++/* Supervisor counter registers */ ++#define CSR_SCOUNTERINTEN 0x9cf ++#define CSR_SCOUNTERMASK_M 0x9d1 ++#define CSR_SCOUNTERMASK_S 0x9d2 ++#define CSR_SCOUNTERMASK_U 0x9d3 ++#define CSR_SCOUNTEROVF 0x9d4 ++#define CSR_SCOUNTINHIBIT 0x9e0 ++#define CSR_SHPMEVENT3 0x9e3 ++#define CSR_SHPMEVENT4 0x9e4 ++#define CSR_SHPMEVENT5 0x9e5 ++#define CSR_SHPMEVENT6 0x9e6 ++ ++/* Supervisor control registers */ ++#define CSR_SCCTLDATA 0x9cd ++#define CSR_SMISC_CTL 0x9d0 +diff --git a/arch/riscv/include/asm/andesv5/proc.h b/arch/riscv/include/asm/andesv5/proc.h +new file mode 100644 +index 000000000000..d06fbff65ad0 +--- /dev/null ++++ b/arch/riscv/include/asm/andesv5/proc.h +@@ -0,0 +1,36 @@ ++#include ++#include ++ ++int cpu_l1c_status(void); ++void cpu_icache_enable(void *info); ++void cpu_icache_disable(void *info); ++void cpu_dcache_enable(void *info); ++void cpu_dcache_disable(void *info); ++uint32_t cpu_l2c_ctl_status(void); ++void cpu_l2c_enable(void); ++void cpu_l2c_disable(void); ++ ++void cpu_dma_inval_range(unsigned long start, unsigned long end); ++void cpu_dma_wb_range(unsigned long start, unsigned long end); ++void cpu_l2c_inval_range(unsigned long pa, unsigned long size); ++void cpu_l2c_wb_range(unsigned long pa, unsigned long size); ++ ++extern phys_addr_t pa_msb;; ++ ++#define dma_remap(pa, size) ioremap((pa|(pa_msb << PAGE_SHIFT)), size) ++ ++#define dma_unmap(vaddr) iounmap((void __force __iomem *)vaddr) ++ ++ ++/* ++ * struct andesv5_cache_info ++ * The member of this struct is dupilcated to some content of struct cacheinfo ++ * to reduce the latence of searching dcache inforamtion in andesv5/cache.c. ++ * At current only dcache-line-size is needed. when the content of ++ * andesv5_cache_info has been initilized by function fill_cpu_cache_info(), ++ * member init_done is set as true ++ */ ++struct andesv5_cache_info { ++ bool init_done; ++ int dcache_line_size; ++}; +diff --git a/arch/riscv/include/asm/andesv5/smu.h b/arch/riscv/include/asm/andesv5/smu.h +new file mode 100644 +index 000000000000..14813492c159 +--- /dev/null ++++ b/arch/riscv/include/asm/andesv5/smu.h +@@ -0,0 +1,78 @@ ++#ifndef _ASM_RISCV_SMU_H ++#define _ASM_RISCV_SMU_H ++ ++#include ++#define MAX_PCS_SLOT 7 ++ ++#define PCS0_WE_OFF 0x90 ++#define PCS0_CTL_OFF 0x94 ++#define PCS0_STATUS_OFF 0x98 ++ ++/* ++ * PCS0 --> Always on power domain, includes the JTAG tap and DMI_AHB bus in ++ * ncejdtm200. ++ * PCS1 --> Power domain for debug subsystem ++ * PCS2 --> Main power domain, includes the system bus and AHB, APB peripheral ++ * IPs. ++ * PCS3 --> Power domain for Core0 and L2C. ++ * PCSN --> Power domain for Core (N-3) ++ */ ++ ++#define PCSN_WE_OFF(n) n * 0x20 + PCS0_WE_OFF ++#define CN_PCS_WE_OFF(n) (n + 3) * 0x20 + PCS0_WE_OFF ++#define CN_PCS_STATUS_OFF(n) (n + 3) * 0x20 + PCS0_STATUS_OFF ++#define CN_PCS_CTL_OFF(n) (n + 3) * 0x20 + PCS0_CTL_OFF ++ ++ ++#define PD_TYPE_MASK 0x7 ++#define PD_STATUS_MASK 0xf8 ++#define GET_PD_TYPE(val) val & PD_TYPE_MASK ++#define GET_PD_STATUS(val) (val & PD_STATUS_MASK) >> 3 ++ ++// PD_type ++#define ACTIVE 0 ++#define RESET 1 ++#define SLEEP 2 ++#define TIMEOUT 7 ++ ++// PD_status for sleep type ++#define LightSleep_STATUS 0 ++#define DeepSleep_STATUS 16 ++ ++// param of PCS_CTL for sleep cmd ++#define LightSleep_CTL 0 ++#define DeepSleep_CTL 1 ++ ++// PCS_CTL ++#define PCS_CTL_PARAM_OFF 3 ++#define SLEEP_CMD 3 ++ ++// wakeup events source offset ++#define PCS_WAKE_DBG_OFF 28 ++#define PCS_WAKE_MSIP_OFF 29 ++ ++#define L2_CTL_OFF 0x8 ++#define L2_COMMAND_OFF(cpu) 0x40 + 0x10 * cpu ++#define L2_STATUS_REG 0x80 ++#define L2_WBINVAL_COMMAND 0x12 ++ ++extern unsigned int *wake_mask; ++extern void __iomem *l2c_base; ++ ++void set_wakeup_enable(int cpu, unsigned int events); ++void set_sleep(int cpu, unsigned char sleep); ++void andes_suspend2standby(void); ++void andes_suspend2ram(void); ++ ++static inline void sbi_suspend_prepare(char main_core, char enable) ++{ ++ /* TODO */ ++ // SBI_CALL_2(SBI_SUSPEND_PREPARE, main_core, enable); ++} ++ ++static inline void sbi_suspend_mem(void) ++{ ++ /* TODO */ ++ // SBI_CALL_0(SBI_SUSPEND_MEM); ++} ++#endif +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0006-Add-andes-sbi-call-vendor-extension.patch b/board/andes/ae350/patches/linux/0006-Add-andes-sbi-call-vendor-extension.patch new file mode 100644 index 0000000000..51b4277930 --- /dev/null +++ b/board/andes/ae350/patches/linux/0006-Add-andes-sbi-call-vendor-extension.patch @@ -0,0 +1,231 @@ +From d4d9304e009a8c754e16e1ebb17c0ec3071eb68e Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:22:56 +0800 +Subject: [PATCH 06/12] Add andes sbi call vendor extension + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/andesv5/sbi.c | 111 +++++++++++++++++++++++++++++++++++ + arch/riscv/include/asm/sbi.h | 59 ++++++++++++++++++- + 2 files changed, 168 insertions(+), 2 deletions(-) + create mode 100755 arch/riscv/andesv5/sbi.c + +diff --git a/arch/riscv/andesv5/sbi.c b/arch/riscv/andesv5/sbi.c +new file mode 100755 +index 000000000000..c5d2afd83ae0 +--- /dev/null ++++ b/arch/riscv/andesv5/sbi.c +@@ -0,0 +1,111 @@ ++/* ++ * Copyright (C) 2020 Andes Technology Corporation ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++ ++void sbi_suspend_prepare(char main_core, char enable) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SUSPEND_PREPARE, main_core, enable, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_suspend_prepare); ++ ++void sbi_suspend_mem(void) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SUSPEND_MEM, 0, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_suspend_mem); ++ ++void sbi_restart(int cpu_num) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_RESTART, cpu_num, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_restart); ++ ++void sbi_write_powerbrake(int val) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_WRITE_POWERBRAKE, val, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_write_powerbrake); ++ ++int sbi_read_powerbrake(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_READ_POWERBRAKE, 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_read_powerbrake); ++ ++void sbi_set_suspend_mode(int suspend_mode) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_SUSPEND_MODE, suspend_mode, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_set_suspend_mode); ++ ++void sbi_set_reset_vec(int val) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_RESET_VEC, val, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_set_reset_vec); ++ ++void sbi_set_pma(void *arg) ++{ ++ phys_addr_t offset = ((struct pma_arg_t*)arg)->offset; ++ unsigned long vaddr = ((struct pma_arg_t*)arg)->vaddr; ++ size_t size = ((struct pma_arg_t*)arg)->size; ++ size_t entry_id = ((struct pma_arg_t*)arg)->entry_id; ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_PMA, offset, vaddr, size, entry_id, 0, 0); ++} ++EXPORT_SYMBOL(sbi_set_pma); ++ ++void sbi_free_pma(unsigned long entry_id) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_FREE_PMA, entry_id, 0, 0, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_free_pma); ++ ++long sbi_probe_pma(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_PROBE_PMA, 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_probe_pma); ++ ++void sbi_set_trigger(unsigned int type, uintptr_t data, int enable) ++{ ++ sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_TRIGGER, type, data, enable, 0, 0, 0); ++} ++EXPORT_SYMBOL(sbi_set_trigger); ++ ++long sbi_get_marchid(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_BASE, SBI_EXT_BASE_GET_MARCHID, 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_get_marchid); ++ ++long sbi_get_micm_cfg(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_GET_MICM_CFG, ++ 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_get_micm_cfg); ++ ++long sbi_get_mdcm_cfg(void) ++{ ++ struct sbiret ret; ++ ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_GET_MDCM_CFG, ++ 0, 0, 0, 0, 0, 0); ++ return ret.value; ++} ++EXPORT_SYMBOL(sbi_get_mdcm_cfg); +diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h +index c0fdb05ffa0b..d3b2d34136f0 100644 +--- a/arch/riscv/include/asm/sbi.h ++++ b/arch/riscv/include/asm/sbi.h +@@ -10,6 +10,14 @@ + #include + + #ifdef CONFIG_RISCV_SBI ++ ++struct pma_arg_t { ++ phys_addr_t offset; ++ unsigned long vaddr; ++ size_t size; ++ size_t entry_id; ++}; ++ + enum sbi_ext_id { + #ifdef CONFIG_RISCV_SBI_V01 + SBI_EXT_0_1_SET_TIMER = 0x0, +@@ -27,6 +35,7 @@ enum sbi_ext_id { + SBI_EXT_IPI = 0x735049, + SBI_EXT_RFENCE = 0x52464E43, + SBI_EXT_HSM = 0x48534D, ++ SBI_EXT_ANDES = 0x0900031E, + }; + + enum sbi_ext_base_fid { +@@ -51,10 +60,10 @@ enum sbi_ext_rfence_fid { + SBI_EXT_RFENCE_REMOTE_FENCE_I = 0, + SBI_EXT_RFENCE_REMOTE_SFENCE_VMA, + SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID, +- SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID, + SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA, +- SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID, ++ SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID, + SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA, ++ SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID, + }; + + enum sbi_ext_hsm_fid { +@@ -63,6 +72,35 @@ enum sbi_ext_hsm_fid { + SBI_EXT_HSM_HART_STATUS, + }; + ++enum sbi_ext_andes_fid { ++ SBI_EXT_ANDES_GET_MCACHE_CTL_STATUS = 0, ++ SBI_EXT_ANDES_GET_MMISC_CTL_STATUS, ++ SBI_EXT_ANDES_SET_MCACHE_CTL, ++ SBI_EXT_ANDES_SET_MMISC_CTL, ++ SBI_EXT_ANDES_ICACHE_OP, ++ SBI_EXT_ANDES_DCACHE_OP, ++ SBI_EXT_ANDES_L1CACHE_I_PREFETCH, ++ SBI_EXT_ANDES_L1CACHE_D_PREFETCH, ++ SBI_EXT_ANDES_NON_BLOCKING_LOAD_STORE, ++ SBI_EXT_ANDES_WRITE_AROUND, ++ SBI_EXT_ANDES_TRIGGER, ++ SBI_EXT_ANDES_SET_PFM, ++ SBI_EXT_ANDES_READ_POWERBRAKE, ++ SBI_EXT_ANDES_WRITE_POWERBRAKE, ++ SBI_EXT_ANDES_SUSPEND_PREPARE, ++ SBI_EXT_ANDES_SUSPEND_MEM, ++ SBI_EXT_ANDES_SET_SUSPEND_MODE, ++ SBI_EXT_ANDES_ENTER_SUSPEND_MODE, ++ SBI_EXT_ANDES_RESTART, ++ SBI_EXT_ANDES_SET_RESET_VEC, ++ SBI_EXT_ANDES_SET_PMA, ++ SBI_EXT_ANDES_FREE_PMA, ++ SBI_EXT_ANDES_PROBE_PMA, ++ SBI_EXT_ANDES_DCACHE_WBINVAL_ALL, ++ SBI_EXT_ANDES_GET_MICM_CFG, ++ SBI_EXT_ANDES_GET_MDCM_CFG, ++}; ++ + enum sbi_hsm_hart_status { + SBI_HSM_HART_STATUS_STARTED = 0, + SBI_HSM_HART_STATUS_STOPPED, +@@ -146,6 +184,23 @@ static inline unsigned long sbi_minor_version(void) + } + + int sbi_err_map_linux_errno(int err); ++ ++void sbi_suspend_prepare(char main_core, char enable); ++void sbi_suspend_mem(void); ++void sbi_restart(int cpu_num); ++void sbi_write_powerbrake(int val); ++int sbi_read_powerbrake(void); ++void sbi_set_suspend_mode(int suspend_mode); ++void sbi_set_reset_vec(int val); ++void sbi_set_pma(void *arg); ++void sbi_free_pma(unsigned long entry_id); ++long sbi_probe_pma(void); ++void sbi_set_trigger(unsigned int type, uintptr_t data, int enable); ++long sbi_get_marchid(void); ++int get_custom_csr_cacheinfo(const char *propname, u32 *out_value); ++long sbi_get_micm_cfg(void); ++long sbi_get_mdcm_cfg(void); ++ + #else /* CONFIG_RISCV_SBI */ + /* stubs for code that is only reachable under IS_ENABLED(CONFIG_RISCV_SBI): */ + void sbi_set_timer(uint64_t stime_value); +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0007-riscv-Porting-pte-update-function-local_flush_tlb_al.patch b/board/andes/ae350/patches/linux/0007-riscv-Porting-pte-update-function-local_flush_tlb_al.patch new file mode 100644 index 0000000000..238a71841d --- /dev/null +++ b/board/andes/ae350/patches/linux/0007-riscv-Porting-pte-update-function-local_flush_tlb_al.patch @@ -0,0 +1,101 @@ +From 7c7587775d5b86d5822777e226a6bf0bb3704bed Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:44:26 +0800 +Subject: [PATCH 07/12] riscv: Porting pte update function + "local_flush_tlb_all" + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/include/asm/pgtable-64.h | 1 + + arch/riscv/include/asm/pgtable.h | 20 ++++++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h +index f3b0da64c6c8..69a9a87b3365 100644 +--- a/arch/riscv/include/asm/pgtable-64.h ++++ b/arch/riscv/include/asm/pgtable-64.h +@@ -53,6 +53,7 @@ static inline int pud_leaf(pud_t pud) + static inline void set_pud(pud_t *pudp, pud_t pud) + { + *pudp = pud; ++ local_flush_tlb_all(); + } + + static inline void pud_clear(pud_t *pudp) +diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h +index 73e8b5e5bb65..0fa3fc6658ed 100644 +--- a/arch/riscv/include/asm/pgtable.h ++++ b/arch/riscv/include/asm/pgtable.h +@@ -7,7 +7,6 @@ + #define _ASM_RISCV_PGTABLE_H + + #include +-#include + + #include + +@@ -18,6 +17,7 @@ + #include + #include + #include ++#include + + #ifdef CONFIG_MMU + +@@ -99,6 +99,7 @@ + | _PAGE_DIRTY) + + #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) ++#define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL | _PAGE_EXEC) + #define PAGE_KERNEL_READ __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) + #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL | _PAGE_EXEC) + #define PAGE_KERNEL_READ_EXEC __pgprot((_PAGE_KERNEL & ~_PAGE_WRITE) \ +@@ -134,6 +135,12 @@ extern pgd_t swapper_pg_dir[]; + #define __S110 PAGE_SHARED_EXEC + #define __S111 PAGE_SHARED_EXEC + ++#define pgprot_noncached pgprot_noncached ++static inline pgprot_t pgprot_noncached(pgprot_t _prot) ++{ ++ return __pgprot(pgprot_val(_prot) | _PAGE_NONCACHEABLE); ++} ++ + static inline int pmd_present(pmd_t pmd) + { + return (pmd_val(pmd) & (_PAGE_PRESENT | _PAGE_PROT_NONE)); +@@ -159,6 +166,7 @@ static inline int pmd_leaf(pmd_t pmd) + static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) + { + *pmdp = pmd; ++ local_flush_tlb_all(); + } + + static inline void pmd_clear(pmd_t *pmdp) +@@ -195,9 +203,16 @@ static inline unsigned long pte_pfn(pte_t pte) + #define pte_page(x) pfn_to_page(pte_pfn(x)) + + /* Constructs a page table entry */ ++extern phys_addr_t pa_msb; + static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot) + { +- return __pte((pfn << _PAGE_PFN_SHIFT) | pgprot_val(prot)); ++ pte_t ret; ++ if (pgprot_val(prot) & _PAGE_NONCACHEABLE) { ++ ret = __pte(((pfn|pa_msb) << _PAGE_PFN_SHIFT) | (pgprot_val(prot) & ~_PAGE_NONCACHEABLE)); ++ } else { ++ ret = __pte((pfn << _PAGE_PFN_SHIFT) | pgprot_val(prot)); ++ } ++ return ret; + } + + #define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot) +@@ -327,6 +342,7 @@ static inline int pte_same(pte_t pte_a, pte_t pte_b) + static inline void set_pte(pte_t *ptep, pte_t pteval) + { + *ptep = pteval; ++ local_flush_tlb_all(); + } + + void flush_icache_pte(pte_t pte); +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0008-Support-time32-stat64-sys_clone3-syscalls.patch b/board/andes/ae350/patches/linux/0008-Support-time32-stat64-sys_clone3-syscalls.patch new file mode 100644 index 0000000000..9d604ae5bc --- /dev/null +++ b/board/andes/ae350/patches/linux/0008-Support-time32-stat64-sys_clone3-syscalls.patch @@ -0,0 +1,47 @@ +From 4d02088e32ecb5abb3c84d9364f15db2044fadf3 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:47:28 +0800 +Subject: [PATCH 08/12] Support time32, stat64, sys_clone3 syscalls + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/include/asm/unistd.h | 3 +++ + arch/riscv/include/uapi/asm/unistd.h | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/arch/riscv/include/asm/unistd.h b/arch/riscv/include/asm/unistd.h +index 977ee6181dab..42ebae0693b1 100644 +--- a/arch/riscv/include/asm/unistd.h ++++ b/arch/riscv/include/asm/unistd.h +@@ -9,6 +9,9 @@ + */ + + #define __ARCH_WANT_SYS_CLONE ++#define __ARCH_WANT_STAT64 ++#define __ARCH_WANT_SYS_CLONE3 ++#define __ARCH_WANT_TIME32_SYSCALLS + + #include + +diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h +index 8062996c2dfd..c05ce62b2b33 100644 +--- a/arch/riscv/include/uapi/asm/unistd.h ++++ b/arch/riscv/include/uapi/asm/unistd.h +@@ -15,12 +15,12 @@ + * along with this program. If not, see . + */ + +-#ifdef __LP64__ + #define __ARCH_WANT_NEW_STAT + #define __ARCH_WANT_SET_GET_RLIMIT +-#endif /* __LP64__ */ +- ++#define __ARCH_WANT_SYS_NEWFSTATAT + #define __ARCH_WANT_SYS_CLONE3 ++#define __ARCH_WANT_TIME32_SYSCALLS ++#define __ARCH_WANT_STAT64 + + #include + +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0009-dma-Support-smp-up-with-dma.patch b/board/andes/ae350/patches/linux/0009-dma-Support-smp-up-with-dma.patch new file mode 100644 index 0000000000..9c731f003b --- /dev/null +++ b/board/andes/ae350/patches/linux/0009-dma-Support-smp-up-with-dma.patch @@ -0,0 +1,120 @@ +From 27a98deea31b3d724fccb2728f43053ee1a814df Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 16:59:12 +0800 +Subject: [PATCH 09/12] dma: Support smp/up with dma + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/mm/dma-mapping.c | 101 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 101 insertions(+) + create mode 100755 arch/riscv/mm/dma-mapping.c + +diff --git a/arch/riscv/mm/dma-mapping.c b/arch/riscv/mm/dma-mapping.c +new file mode 100755 +index 000000000000..8072e765f3ae +--- /dev/null ++++ b/arch/riscv/mm/dma-mapping.c +@@ -0,0 +1,101 @@ ++#include ++#include ++ ++ ++/******************************************** ++ * The following APIs are for dummy DMA ops * ++ ********************************************/ ++ ++static void *__dummy_alloc(struct device *dev, size_t size, ++ dma_addr_t *dma_handle, gfp_t flags, ++ unsigned long attrs) ++{ ++ return NULL; ++} ++ ++static void __dummy_free(struct device *dev, size_t size, ++ void *vaddr, dma_addr_t dma_handle, ++ unsigned long attrs) ++{ ++} ++ ++static int __dummy_mmap(struct device *dev, ++ struct vm_area_struct *vma, ++ void *cpu_addr, dma_addr_t dma_addr, size_t size, ++ unsigned long attrs) ++{ ++ return -ENXIO; ++} ++ ++static dma_addr_t __dummy_map_page(struct device *dev, struct page *page, ++ unsigned long offset, size_t size, ++ enum dma_data_direction dir, ++ unsigned long attrs) ++{ ++ return 0; ++} ++ ++static void __dummy_unmap_page(struct device *dev, dma_addr_t dev_addr, ++ size_t size, enum dma_data_direction dir, ++ unsigned long attrs) ++{ ++} ++ ++static int __dummy_map_sg(struct device *dev, struct scatterlist *sgl, ++ int nelems, enum dma_data_direction dir, ++ unsigned long attrs) ++{ ++ return 0; ++} ++ ++static void __dummy_unmap_sg(struct device *dev, ++ struct scatterlist *sgl, int nelems, ++ enum dma_data_direction dir, ++ unsigned long attrs) ++{ ++} ++ ++static void __dummy_sync_single(struct device *dev, ++ dma_addr_t dev_addr, size_t size, ++ enum dma_data_direction dir) ++{ ++} ++ ++static void __dummy_sync_sg(struct device *dev, ++ struct scatterlist *sgl, int nelems, ++ enum dma_data_direction dir) ++{ ++} ++ ++// static int __dummy_mapping_error(struct device *hwdev, dma_addr_t dma_addr) ++// { ++// return 1; ++// } ++ ++static int __dummy_dma_supported(struct device *hwdev, u64 mask) ++{ ++ return 0; ++} ++ ++const struct dma_map_ops dummy_dma_ops = { ++ .alloc = __dummy_alloc, ++ .free = __dummy_free, ++ .mmap = __dummy_mmap, ++ .map_page = __dummy_map_page, ++ .unmap_page = __dummy_unmap_page, ++ .map_sg = __dummy_map_sg, ++ .unmap_sg = __dummy_unmap_sg, ++ .sync_single_for_cpu = __dummy_sync_single, ++ .sync_single_for_device = __dummy_sync_single, ++ .sync_sg_for_cpu = __dummy_sync_sg, ++ .sync_sg_for_device = __dummy_sync_sg, ++ // .mapping_error = __dummy_mapping_error, ++ .dma_supported = __dummy_dma_supported, ++}; ++EXPORT_SYMBOL(dummy_dma_ops); ++ ++void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, ++ const struct iommu_ops *iommu, bool coherent) ++{ ++ dev->dma_coherent = coherent; ++} +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0010-riscv-platform-Fix-atcdmac300-chained-irq-mapping-is.patch b/board/andes/ae350/patches/linux/0010-riscv-platform-Fix-atcdmac300-chained-irq-mapping-is.patch new file mode 100644 index 0000000000..b81c9dce8b --- /dev/null +++ b/board/andes/ae350/patches/linux/0010-riscv-platform-Fix-atcdmac300-chained-irq-mapping-is.patch @@ -0,0 +1,300 @@ +From 356bf37d40fb4b9f9044cb872d3ebd74a3b0c4ff Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 17:02:35 +0800 +Subject: [PATCH 10/12] riscv/platform: Fix atcdmac300 chained irq mapping + issue + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/include/asm/atcdmac300.h | 2 +- + arch/riscv/platforms/ae350/atcdmac300.c | 95 +++++++++++++------------ + 2 files changed, 51 insertions(+), 46 deletions(-) + +diff --git a/arch/riscv/include/asm/atcdmac300.h b/arch/riscv/include/asm/atcdmac300.h +index 20fe88212dfc..0d4dcc08e7f3 100644 +--- a/arch/riscv/include/asm/atcdmac300.h ++++ b/arch/riscv/include/asm/atcdmac300.h +@@ -198,7 +198,7 @@ typedef struct channel_control + #define DMAC_REQN_UART2RX 7 + #define DMAC_REQN_I2C 8 + #define DMAC_REQN_SDC 9 +-#define DMAC_REQN_NONE 15 ++#define DMAC_REQN_NONE 16 + + + enum DMAD_DMAC_CORE { +diff --git a/arch/riscv/platforms/ae350/atcdmac300.c b/arch/riscv/platforms/ae350/atcdmac300.c +index e635328f9362..8f434b1f8845 100644 +--- a/arch/riscv/platforms/ae350/atcdmac300.c ++++ b/arch/riscv/platforms/ae350/atcdmac300.c +@@ -526,8 +526,8 @@ static irqreturn_t dmad_ahb_isr(int irq, void *dev_id) + + dmad_dbg("dma finish\n"); + +- dmad_dbg("finish drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x)\n", ++ dmad_dbg("finish drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx)\n", + drb->node, (u32) drb, drb->src_addr, + drb->dst_addr, drb->req_cycle); + +@@ -548,8 +548,8 @@ static irqreturn_t dmad_ahb_isr(int irq, void *dev_id) + // Lookup next DRB (DMA Request Block) + drb_iter = &drq->drb_pool[drq->sbt_head]; + +- dmad_dbg("exec drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x)\n", ++ dmad_dbg("exec drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx)\n", + drb_iter->node, (u32) drb_iter, + drb_iter->src_addr, drb_iter->dst_addr, + drb_iter->req_cycle); +@@ -640,7 +640,7 @@ static void dmad_ahb_config_dir(dmad_chreq * ch_req, unsigned long * channel_cmd + dmad_drq *drq = (dmad_drq *) ch_req->drq; + dmad_ahb_chreq *ahb_req = (dmad_ahb_chreq *) (&ch_req->ahb_req); + channel_control ch_ctl; +- dmad_dbg("%s() channel_cmds(0x%08x)\n",__func__, channel_cmds[0]); ++ dmad_dbg("%s() channel_cmds(0x%08lx)\n",__func__, channel_cmds[0]); + channel_cmds[0] &= ~(u32)(SRCWIDTH_MASK|SRCADDRCTRL_MASK| + DSTWIDTH_MASK|DSTADDRCTRL_MASK| + SRC_HS|DST_HS|SRCREQSEL_MASK|DSTREQSEL_MASK); +@@ -656,6 +656,7 @@ static void dmad_ahb_config_dir(dmad_chreq * ch_req, unsigned long * channel_cmd + memcpy((u8 *)&ch_ctl.dWidth,(u8 *)&ahb_req->addr0_width,12); + drq->flags |= (addr_t) DMAD_DRQ_DIR_A1_TO_A0; + } ++ + channel_cmds[0] |=(((ch_ctl.sWidth << SRCWIDTH) &SRCWIDTH_MASK) | + ((ch_ctl.sCtrl << SRCADDRCTRL) &SRCADDRCTRL_MASK) | + ((ch_ctl.dWidth << DSTWIDTH) &DSTWIDTH_MASK) | +@@ -673,7 +674,7 @@ static void dmad_ahb_config_dir(dmad_chreq * ch_req, unsigned long * channel_cmd + ((ch_ctl.dReqn <ahb_req); + u32 channel = (u32) ch_req->channel; + ++ int virq=0; ++ + unsigned long channel_base = drq->channel_base; + addr_t channel_cmds[1]; + unsigned long lock_flags; + dmad_dbg("%s()\n", __func__); + /* register interrupt handler */ +- err = request_irq(ahb_irqs[channel], dmad_ahb_isr, 0, ++ virq = ftdmac020_find_irq(ahb_irqs[channel]); ++ err = request_irq(virq, dmad_ahb_isr, 0, + "AHB_DMA", (void *)(unsigned long)(channel + 1)); + if (unlikely(err != 0)) { + dmad_err("unable to request IRQ %d for AHB DMA " +- "(error %d)\n", ahb_irqs[channel], err); ++ "(error %d)\n", virq, err); + free_irq(ahb_irqs[channel], (void *)(unsigned long)(channel + 1)); + return err; + } +@@ -995,9 +999,9 @@ int dmad_channel_alloc(dmad_chreq * ch_req) + + } + +- dmad_dbg("%s() ring: base(0x%08x) port(0x%08x) periods(0x%08x)" +- " period_size(0x%08x) period_bytes(0x%08x)" +- " remnant_size(0x%08x)\n", ++ dmad_dbg("%s() ring: base(0x%08llx) port(0x%08lx) periods(0x%08x)" ++ " period_size(0x%08x) period_bytes(0x%08llx)" ++ " remnant_size(0x%08llx)\n", + __func__, drq_iter->ring_base, drq_iter->ring_port, + drq_iter->periods, drq_iter->period_size, + drq_iter->period_bytes, drq_iter->remnant_size); +@@ -1484,13 +1488,13 @@ static inline int dmad_submit_request_internal(dmad_drq * drq, dmad_drb * drb) + + drb->state = DMAD_DRB_STATE_SUBMITTED; + +- dmad_dbg("%s() submit drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x) state(%d)\n", __func__, ++ dmad_dbg("%s() submit drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx) state(%d)\n", __func__, + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, drb->state); + } else { +- dmad_dbg("%s() skip drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x)" +- " size(0x%08x) state(%d)\n", __func__, ++ dmad_dbg("%s() skip drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx)" ++ " size(0x%08llx) state(%d)\n", __func__, + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, drb->state); + } +@@ -1545,8 +1549,8 @@ int dmad_submit_request(dmad_chreq * ch_req, dmad_drb * drb, u8 keep_fired) + drb->node); + + /* Queue DRB to the end of the submitted list */ +- dmad_dbg("submit drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) sync(0x%08x) fire(%d)\n", ++ dmad_dbg("submit drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) sync(0x%08x) fire(%d)\n", + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, (u32) drb->sync, keep_fired); + +@@ -1636,8 +1640,8 @@ int dmad_withdraw_request(dmad_chreq * ch_req, dmad_drb * drb) + return -EBADR; + } + +- dmad_dbg("cancel drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("cancel drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, drb->state); + +@@ -1687,8 +1691,8 @@ static inline int dmad_kickoff_requests_internal(dmad_drq * drq) + return -EBADR; + } + +- dmad_dbg("%s() drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", __func__, ++ dmad_dbg("%s() drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", __func__, + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, drb->state); + +@@ -1749,10 +1753,10 @@ int dmad_kickoff_requests(dmad_chreq * ch_req) + + dmad_get_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); + +- dmad_dbg("drq(0x%08x) channel_base(0x%08x)\n", ++ dmad_dbg("drq(0x%08x) channel_base(0x%08lx)\n", + (u32) drq, drq->channel_base); +- dmad_dbg("kick off drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d) a1_to_a0(%d)\n", ++ dmad_dbg("kick off drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d) a1_to_a0(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, + drb->req_cycle, drb->state, + drq->flags & DMAD_DRQ_DIR_A1_TO_A0); +@@ -1876,9 +1880,9 @@ int dmad_update_ring(dmad_chreq * ch_req) + + spin_unlock_irqrestore(&drq->drb_pool_lock, lock_flags); + +- dmad_dbg("%s() ring: base(0x%08x) port(0x%08x) periods(0x%08x) " +- "period_size(0x%08x) period_bytes(0x%08x) " +- "remnant_size(0x%08x)\n", ++ dmad_dbg("%s() ring: base(0x%08llx) port(0x%08lx) periods(0x%08x) " ++ "period_size(0x%08x) period_bytes(0x%08llx) " ++ "remnant_size(0x%08llx)\n", + __func__, drq->ring_base, drq->ring_port, + drq->periods, drq->period_size, drq->period_bytes, + drq->remnant_size); +@@ -1948,10 +1952,10 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + sw_p_off += period_size; + } + +- dmad_dbg("%s() ring_ptr(0x%08x) ring_p_idx(0x%08x) " +- "ring_p_off(0x%08x)\n", ++ dmad_dbg("%s() ring_ptr(0x%08llx) ring_p_idx(0x%08x) " ++ "ring_p_off(0x%08llx)\n", + __func__, ring_ptr, ring_p_idx, ring_p_off); +- dmad_dbg("%s() sw_ptr(0x%08x) sw_p_idx(0x%08x) sw_p_off(0x%08x)\n", ++ dmad_dbg("%s() sw_ptr(0x%08llx) sw_p_idx(0x%08x) sw_p_off(0x%08llx)\n", + __func__, sw_ptr, sw_p_idx, sw_p_off); + + if (drq->ring_drb && +@@ -1971,8 +1975,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + drb->addr1 = drq->dev_addr; + drb->req_cycle = 0; // redundent, though, no harm to performance + +- dmad_dbg("init_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("init_drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->src_addr, + drb->dst_addr, drb->req_cycle, drb->state); + +@@ -2024,8 +2028,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + /* update drb size at ring_ptr */ + drb->req_cycle = sw_p_off; + +- dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, + drb->req_cycle, drb->state); + +@@ -2069,8 +2073,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + else + drb->req_cycle = period_size; + +- dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("ring_drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, + drb->req_cycle, drb->state); + +@@ -2147,8 +2151,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + drb->req_cycle = period_size; + } + +- dmad_dbg("inbtw_drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ dmad_dbg("inbtw_drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, + drb->addr1, drb->req_cycle, drb->state); + +@@ -2166,8 +2170,8 @@ int dmad_update_ring_sw_ptr(dmad_chreq * ch_req, + drb->addr1 = drq->dev_addr; + drb->req_cycle = sw_p_off; + +- dmad_dbg("swptr_drb(%d 0x%08x) addr0(0x%08x) addr1(0x%08x) " +- "size(0x%08x) state(%d)\n", ++ dmad_dbg("swptr_drb(%d 0x%08x) addr0(0x%08llx) addr1(0x%08llx) " ++ "size(0x%08llx) state(%d)\n", + (u32) drb->node, (u32) drb, drb->addr0, drb->addr1, + drb->req_cycle, drb->state); + +@@ -2254,8 +2258,8 @@ static int dmad_channel_drain(u32 controller, dmad_drq * drq, u8 shutdown) + dmad_detach_head(drq->drb_pool, &drq->sbt_head, &drq->sbt_tail, &drb); + + while (drb) { +- dmad_dbg("cancel sbt drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ dmad_dbg("cancel sbt drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx) state(%d)\n", + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, (u32) drb->state); + +@@ -2276,8 +2280,8 @@ static int dmad_channel_drain(u32 controller, dmad_drq * drq, u8 shutdown) + dmad_detach_head(drq->drb_pool, &drq->rdy_head, &drq->rdy_tail, &drb); + + while (drb) { +- dmad_dbg("cancel rdy drb(%d 0x%08x) addr0(0x%08x) " +- "addr1(0x%08x) size(0x%08x) state(%d)\n", ++ dmad_dbg("cancel rdy drb(%d 0x%08x) addr0(0x%08llx) " ++ "addr1(0x%08llx) size(0x%08llx) state(%d)\n", + drb->node, (u32) drb, drb->src_addr, drb->dst_addr, + drb->req_cycle, (u32) drb->state); + +@@ -2474,6 +2478,7 @@ at_dma_parse_dt(struct platform_device *pdev) + static int atcdma_probe(struct platform_device *pdev) + { + struct at_dma_platform_data *pdata; ++ struct device_node *np = pdev->dev.of_node; + struct resource *io=0; + struct resource *mem = NULL; + int irq; +@@ -2501,7 +2506,7 @@ static int atcdma_probe(struct platform_device *pdev) + if (irq < 0) + return irq; + +- intc_ftdmac020_init_irq(irq); ++ ftdmac020_init(np, irq); + + return dmad_module_init(); + +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0011-DMA-Add-msb-bit-patch.patch b/board/andes/ae350/patches/linux/0011-DMA-Add-msb-bit-patch.patch new file mode 100644 index 0000000000..3f60ce850e --- /dev/null +++ b/board/andes/ae350/patches/linux/0011-DMA-Add-msb-bit-patch.patch @@ -0,0 +1,387 @@ +From 6a328cfbcec652d8a56eb4103ace8b818b76240d Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 17:04:05 +0800 +Subject: [PATCH 11/12] DMA: Add msb bit patch + +Reformed from the commit: +c32ef675cffe7a609d7afe2eb1ae92981a503144 + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/Kconfig | 5 ++ + arch/riscv/Makefile | 2 +- + arch/riscv/include/asm/device.h | 11 ++++ + arch/riscv/include/asm/dmad.h | 3 + + arch/riscv/include/asm/io.h | 14 ++++ + arch/riscv/include/asm/irq.h | 14 ++++ + arch/riscv/include/asm/perf_event.h | 7 +- + arch/riscv/include/asm/pgtable-bits.h | 6 ++ + arch/riscv/kernel/head.S | 1 + + arch/riscv/kernel/setup.c | 7 ++ + arch/riscv/mm/Makefile | 5 +- + arch/riscv/mm/ioremap_nocache.c | 16 +++++ + arch/riscv/platforms/dmad_intc.c | 93 +++++++++++++++++++++++---- + 13 files changed, 169 insertions(+), 15 deletions(-) + create mode 100755 arch/riscv/include/asm/device.h + create mode 100644 arch/riscv/mm/ioremap_nocache.c + +diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig +index 1b894c327578..84a83f3a1af6 100644 +--- a/arch/riscv/Kconfig ++++ b/arch/riscv/Kconfig +@@ -14,6 +14,7 @@ config RISCV + def_bool y + select ARCH_CLOCKSOURCE_INIT + select ARCH_SUPPORTS_ATOMIC_RMW ++ select PHYS_ADDR_T_64BIT + select ARCH_HAS_BINFMT_FLAT + select ARCH_HAS_DEBUG_VM_PGTABLE + select ARCH_HAS_DEBUG_VIRTUAL if MMU +@@ -88,6 +89,9 @@ config RISCV + select SYSCTL_EXCEPTION_TRACE + select THREAD_INFO_IN_TASK + select UACCESS_MEMCPY if !MMU ++ select ARCH_HAS_SETUP_DMA_OPS ++ select ARCH_HAS_SYNC_DMA_FOR_CPU ++ select ARCH_HAS_SYNC_DMA_FOR_DEVICE + + config ARCH_MMAP_RND_BITS_MIN + default 18 if 64BIT +@@ -204,6 +208,7 @@ source "arch/riscv/Kconfig.socs" + + menu "Platform type" + ++source "arch/riscv/platforms/Kconfig" + choice + prompt "Base ISA" + default ARCH_RV64I +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 226c366072da..2d539750c20e 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -83,7 +83,7 @@ KBUILD_IMAGE := $(boot)/Image.gz + + head-y := arch/riscv/kernel/head.o + +-core-y += arch/riscv/ ++core-y += arch/riscv/kernel/ arch/riscv/mm/ arch/riscv/net/ arch/riscv/platforms/ arch/riscv/andesv5/ + + libs-y += arch/riscv/lib/ + libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a +diff --git a/arch/riscv/include/asm/device.h b/arch/riscv/include/asm/device.h +new file mode 100755 +index 000000000000..122a483f7f03 +--- /dev/null ++++ b/arch/riscv/include/asm/device.h +@@ -0,0 +1,11 @@ ++#ifndef __ASM_DEVICE_H ++#define __ASM_DEVICE_H ++ ++struct dev_archdata { ++ bool dma_coherent; ++}; ++ ++struct pdev_archdata { ++}; ++ ++#endif +\ No newline at end of file +diff --git a/arch/riscv/include/asm/dmad.h b/arch/riscv/include/asm/dmad.h +index 44c87b49e606..54b47c410915 100644 +--- a/arch/riscv/include/asm/dmad.h ++++ b/arch/riscv/include/asm/dmad.h +@@ -68,4 +68,7 @@ struct at_dma_platform_data { + void __iomem *apb_regs; + }; + ++int ftdmac020_find_irq(int hwirq); ++int ftdmac020_init(struct device_node *node, int irq); ++ + #endif /* __NDS_DMAD_INC__ */ +diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h +index c025a746a148..328afc17b1f6 100644 +--- a/arch/riscv/include/asm/io.h ++++ b/arch/riscv/include/asm/io.h +@@ -16,6 +16,20 @@ + #include + #include + ++/* ++ * The RISC-V ISA doesn't yet specify how to query or modify PMAs, so we can't ++ * change the properties of memory regions. This should be fixed by the ++ * upcoming platform spec. ++ */ ++/* ++ * That being said, before PMA is ready, Andes augmented PA with an MSB bit ++ * to indicate the non-cacheability. ++ */ ++#define ioremap_nocache ioremap_nocache ++extern void __iomem *ioremap_nocache(phys_addr_t offset, size_t size); ++#define ioremap_wc(addr, size) ioremap_nocache((addr), (size)) ++#define ioremap_wt(addr, size) ioremap_nocache((addr), (size)) ++ + /* + * MMIO access functions are separated out to break dependency cycles + * when using {read,write}* fns in low-level headers +diff --git a/arch/riscv/include/asm/irq.h b/arch/riscv/include/asm/irq.h +index 9807ad164015..65e5d0514bfc 100644 +--- a/arch/riscv/include/asm/irq.h ++++ b/arch/riscv/include/asm/irq.h +@@ -10,6 +10,20 @@ + #include + #include + ++#define NR_IRQS 72 ++ ++/* ++ * Use this value to indicate lack of interrupt ++ * capability ++ */ ++#ifndef NO_IRQ ++#define NO_IRQ ((unsigned int)(-1)) ++#endif ++ ++#define INTERRUPT_CAUSE_PMU 274 ++ ++void riscv_software_interrupt(void); ++ + #include + + #endif /* _ASM_RISCV_IRQ_H */ +diff --git a/arch/riscv/include/asm/perf_event.h b/arch/riscv/include/asm/perf_event.h +index 062efd3a1d5d..216462b7578a 100644 +--- a/arch/riscv/include/asm/perf_event.h ++++ b/arch/riscv/include/asm/perf_event.h +@@ -18,8 +18,13 @@ + /* + * The RISCV_MAX_COUNTERS parameter should be specified. + */ +- ++#ifdef CONFIG_ANDES_PMU ++#define RISCV_MAX_COUNTERS 7 ++#define L2C_MAX_COUNTERS 32 ++#define BASE_COUNTERS 3 ++#else + #define RISCV_MAX_COUNTERS 2 ++#endif /* CONFIG_ANDES_PMU */ + + /* + * These are the indexes of bits in counteren register *minus* 1, +diff --git a/arch/riscv/include/asm/pgtable-bits.h b/arch/riscv/include/asm/pgtable-bits.h +index bbaeb5d35842..5a04317040bf 100644 +--- a/arch/riscv/include/asm/pgtable-bits.h ++++ b/arch/riscv/include/asm/pgtable-bits.h +@@ -24,6 +24,12 @@ + #define _PAGE_DIRTY (1 << 7) /* Set by hardware on any write */ + #define _PAGE_SOFT (1 << 8) /* Reserved for software */ + ++#ifdef CONFIG_ANDES_QEMU_SUPPORT ++#define _PAGE_NONCACHEABLE 0 ++#else ++#define _PAGE_NONCACHEABLE (1 << 31) ++#endif ++ + #define _PAGE_SPECIAL _PAGE_SOFT + #define _PAGE_TABLE _PAGE_PRESENT + +diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S +index 1a819c18bede..dd0e3280c62c 100644 +--- a/arch/riscv/kernel/head.S ++++ b/arch/riscv/kernel/head.S +@@ -263,6 +263,7 @@ clear_bss_done: + /* Initialize page tables and relocate to virtual addresses */ + la sp, init_thread_union + THREAD_SIZE + mv a0, s1 ++ call setup_maxpa + call setup_vm + #ifdef CONFIG_MMU + la a0, early_pg_dir +diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c +index 117f3212a8e4..115a5c91bdae 100644 +--- a/arch/riscv/kernel/setup.c ++++ b/arch/riscv/kernel/setup.c +@@ -48,6 +48,13 @@ struct screen_info screen_info __section(".data") = { + * BSS. + */ + atomic_t hart_lottery __section(".sdata"); ++phys_addr_t pa_msb; ++asmlinkage void __init setup_maxpa(void) ++{ ++ csr_write(satp, SATP_PPN); ++ pa_msb = (csr_read(satp) + 1) >>1; ++} ++ + unsigned long boot_cpu_hartid; + static DEFINE_PER_CPU(struct cpu, cpu_devices); + +diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile +index 7ebaef10ea1b..2c154ae85b10 100644 +--- a/arch/riscv/mm/Makefile ++++ b/arch/riscv/mm/Makefile +@@ -2,8 +2,7 @@ + + CFLAGS_init.o := -mcmodel=medany + ifdef CONFIG_FTRACE +-CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE) +-CFLAGS_REMOVE_cacheflush.o = $(CC_FLAGS_FTRACE) ++CFLAGS_REMOVE_init.o = -pg + endif + + KCOV_INSTRUMENT_init.o := n +@@ -12,7 +11,9 @@ obj-y += init.o + obj-y += extable.o + obj-$(CONFIG_MMU) += fault.o pageattr.o + obj-y += cacheflush.o ++obj-y += dma-mapping.o + obj-y += context.o ++obj-y += ioremap_nocache.o + + ifeq ($(CONFIG_MMU),y) + obj-$(CONFIG_SMP) += tlbflush.o +diff --git a/arch/riscv/mm/ioremap_nocache.c b/arch/riscv/mm/ioremap_nocache.c +new file mode 100644 +index 000000000000..c7422219d561 +--- /dev/null ++++ b/arch/riscv/mm/ioremap_nocache.c +@@ -0,0 +1,16 @@ ++// SPDX-License-Identifier: GPL-2.0-only ++/* ++ * (C) Copyright 1995 1996 Linus Torvalds ++ * (C) Copyright 2012 Regents of the University of California ++ */ ++#include ++ ++#include ++void __iomem *ioremap_nocache(phys_addr_t offset, size_t size) ++{ ++ void __iomem *ret; ++ pgprot_t pgprot = pgprot_noncached(PAGE_KERNEL); ++ ret = ioremap_prot(offset, size, pgprot.pgprot); ++ return ret; ++} ++EXPORT_SYMBOL(ioremap_nocache); +diff --git a/arch/riscv/platforms/dmad_intc.c b/arch/riscv/platforms/dmad_intc.c +index 5f831add709a..e270e31e999b 100644 +--- a/arch/riscv/platforms/dmad_intc.c ++++ b/arch/riscv/platforms/dmad_intc.c +@@ -5,6 +5,9 @@ + */ + + #include ++#include ++#include ++#include + #include + #include + #include +@@ -12,7 +15,49 @@ + + #ifdef CONFIG_PLATFORM_AHBDMA + extern int dmad_probe_irq_source_ahb(void); +-void AHBDMA_irq_rounter(struct irq_desc *desc) ++ ++/* ++ * Generic dummy implementation which can be used for ++ * real dumb interrupt sources ++ */ ++struct irq_chip atcdmac_irq_chip = { ++ .name = "Andes DMAC", ++}; ++ ++struct ftdmac020_info { ++ int parent_irq; ++ struct irq_domain *irq_domain; ++}; ++ ++struct ftdmac020_info *ftdmac020; ++ ++static int ftdmac020_irq_map(struct irq_domain *domain, unsigned int virq, ++ irq_hw_number_t hwirq) ++{ ++ irq_set_chip_and_handler(virq, &atcdmac_irq_chip, handle_simple_irq); ++ irq_set_chip_data(virq, domain->host_data); ++ ++ return 0; ++} ++ ++static void ftdmac020_irq_unmap(struct irq_domain *d, unsigned int virq) ++{ ++ irq_set_chip_and_handler(virq, NULL, NULL); ++ irq_set_chip_data(virq, NULL); ++} ++ ++static const struct irq_domain_ops ftdmac020_irq_ops = { ++ .map = ftdmac020_irq_map, ++ .unmap = ftdmac020_irq_unmap, ++}; ++ ++ ++/* ++ * The atcdmac300 provides a single hardware interrupt for all of the dmad ++ * channel, so we use a self-defined interrupt chip to translate this single interrupt ++ * into multiple interrupts, each associated with a single dma channel. ++ */ ++static void AHBDMA_irq_rounter(struct irq_desc *desc) + { + int ahb_irq; + struct irq_desc *ahb_desc; +@@ -29,21 +74,47 @@ void AHBDMA_irq_rounter(struct irq_desc *desc) + raw_spin_lock(&desc->lock); + } + desc->irq_data.chip->irq_unmask(&desc->irq_data); ++ desc->irq_data.chip->irq_eoi(&desc->irq_data); + raw_spin_unlock(&desc->lock); + } + +-int intc_ftdmac020_init_irq(int irq) ++int ftdmac020_find_irq(int hwirq){ ++ int virq; ++ ++ virq = irq_find_mapping(ftdmac020->irq_domain, hwirq); ++ printk("[ftdmac020_irq_mapping]: virq=%d, hwirq=%d,\n",virq,hwirq); ++ if (!virq) ++ return -EINVAL; ++ ++ return virq; ++} ++ ++int ftdmac020_init(struct device_node *node, int irq) + { +- int i; +- int ret; +- /* Register all IRQ */ +- for (i = DMA_IRQ0; +- i < DMA_IRQ0 + DMA_IRQ_COUNT; i++) { +- // level trigger +- ret = irq_set_chip(i, &dummy_irq_chip); +- irq_set_handler(i, handle_simple_irq); ++ int ret=0; ++ ++ ftdmac020 = kzalloc(sizeof(struct ftdmac020_info), GFP_KERNEL); ++ ++ ftdmac020->parent_irq=irq; ++ ++ ftdmac020->irq_domain = __irq_domain_add(of_node_to_fwnode(node), DMA_IRQ_COUNT, DMA_IRQ0+DMA_IRQ_COUNT, ++ ~0, &ftdmac020_irq_ops, ftdmac020); ++ if (!ftdmac020->irq_domain) { ++ printk("ftdmac020: Failed to create irqdomain\n"); ++ return -EINVAL; ++ } ++ ++ ret = irq_create_strict_mappings(ftdmac020->irq_domain, DMA_IRQ0, DMA_IRQ0, DMA_IRQ_COUNT); ++ if(unlikely(ret < 0)){ ++ printk("ftdmac020: Failed to create irq_create_strict_mappings()\n"); ++ return -EINVAL; + } +- irq_set_chained_handler(irq, AHBDMA_irq_rounter); ++ ++ ftdmac020->irq_domain->name = "ftdmac020-domain"; ++ irq_set_chained_handler_and_data(ftdmac020->parent_irq, ++ AHBDMA_irq_rounter, ftdmac020); ++ + return 0; + } ++ + #endif /* CONFIG_PLATFORM_AHBDMA */ +-- +2.25.1 diff --git a/board/andes/ae350/patches/linux/0012-Remove-unused-Andes-SBI-call.patch b/board/andes/ae350/patches/linux/0012-Remove-unused-Andes-SBI-call.patch new file mode 100644 index 0000000000..22a278ddff --- /dev/null +++ b/board/andes/ae350/patches/linux/0012-Remove-unused-Andes-SBI-call.patch @@ -0,0 +1,147 @@ +From f476cc67c2821f931ff6ffd841327417b9967909 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Tue, 28 Dec 2021 17:34:59 +0800 +Subject: [PATCH 12/12] Remove unused Andes SBI call + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/andesv5/sbi.c | 92 ------------------------------------ + arch/riscv/include/asm/sbi.h | 16 ------- + 2 files changed, 108 deletions(-) + +diff --git a/arch/riscv/andesv5/sbi.c b/arch/riscv/andesv5/sbi.c +index c5d2afd83ae0..647587b81988 100755 +--- a/arch/riscv/andesv5/sbi.c ++++ b/arch/riscv/andesv5/sbi.c +@@ -10,80 +10,6 @@ + #include + #include + +-void sbi_suspend_prepare(char main_core, char enable) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SUSPEND_PREPARE, main_core, enable, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_suspend_prepare); +- +-void sbi_suspend_mem(void) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SUSPEND_MEM, 0, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_suspend_mem); +- +-void sbi_restart(int cpu_num) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_RESTART, cpu_num, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_restart); +- +-void sbi_write_powerbrake(int val) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_WRITE_POWERBRAKE, val, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_write_powerbrake); +- +-int sbi_read_powerbrake(void) +-{ +- struct sbiret ret; +- ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_READ_POWERBRAKE, 0, 0, 0, 0, 0, 0); +- return ret.value; +-} +-EXPORT_SYMBOL(sbi_read_powerbrake); +- +-void sbi_set_suspend_mode(int suspend_mode) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_SUSPEND_MODE, suspend_mode, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_set_suspend_mode); +- +-void sbi_set_reset_vec(int val) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_RESET_VEC, val, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_set_reset_vec); +- +-void sbi_set_pma(void *arg) +-{ +- phys_addr_t offset = ((struct pma_arg_t*)arg)->offset; +- unsigned long vaddr = ((struct pma_arg_t*)arg)->vaddr; +- size_t size = ((struct pma_arg_t*)arg)->size; +- size_t entry_id = ((struct pma_arg_t*)arg)->entry_id; +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_SET_PMA, offset, vaddr, size, entry_id, 0, 0); +-} +-EXPORT_SYMBOL(sbi_set_pma); +- +-void sbi_free_pma(unsigned long entry_id) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_FREE_PMA, entry_id, 0, 0, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_free_pma); +- +-long sbi_probe_pma(void) +-{ +- struct sbiret ret; +- ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_PROBE_PMA, 0, 0, 0, 0, 0, 0); +- return ret.value; +-} +-EXPORT_SYMBOL(sbi_probe_pma); +- +-void sbi_set_trigger(unsigned int type, uintptr_t data, int enable) +-{ +- sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_TRIGGER, type, data, enable, 0, 0, 0); +-} +-EXPORT_SYMBOL(sbi_set_trigger); +- + long sbi_get_marchid(void) + { + struct sbiret ret; +@@ -91,21 +17,3 @@ long sbi_get_marchid(void) + return ret.value; + } + EXPORT_SYMBOL(sbi_get_marchid); +- +-long sbi_get_micm_cfg(void) +-{ +- struct sbiret ret; +- ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_GET_MICM_CFG, +- 0, 0, 0, 0, 0, 0); +- return ret.value; +-} +-EXPORT_SYMBOL(sbi_get_micm_cfg); +- +-long sbi_get_mdcm_cfg(void) +-{ +- struct sbiret ret; +- ret = sbi_ecall(SBI_EXT_ANDES, SBI_EXT_ANDES_GET_MDCM_CFG, +- 0, 0, 0, 0, 0, 0); +- return ret.value; +-} +-EXPORT_SYMBOL(sbi_get_mdcm_cfg); +diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h +index d3b2d34136f0..40dc3a54a32c 100644 +--- a/arch/riscv/include/asm/sbi.h ++++ b/arch/riscv/include/asm/sbi.h +@@ -83,22 +83,6 @@ enum sbi_ext_andes_fid { + SBI_EXT_ANDES_L1CACHE_D_PREFETCH, + SBI_EXT_ANDES_NON_BLOCKING_LOAD_STORE, + SBI_EXT_ANDES_WRITE_AROUND, +- SBI_EXT_ANDES_TRIGGER, +- SBI_EXT_ANDES_SET_PFM, +- SBI_EXT_ANDES_READ_POWERBRAKE, +- SBI_EXT_ANDES_WRITE_POWERBRAKE, +- SBI_EXT_ANDES_SUSPEND_PREPARE, +- SBI_EXT_ANDES_SUSPEND_MEM, +- SBI_EXT_ANDES_SET_SUSPEND_MODE, +- SBI_EXT_ANDES_ENTER_SUSPEND_MODE, +- SBI_EXT_ANDES_RESTART, +- SBI_EXT_ANDES_SET_RESET_VEC, +- SBI_EXT_ANDES_SET_PMA, +- SBI_EXT_ANDES_FREE_PMA, +- SBI_EXT_ANDES_PROBE_PMA, +- SBI_EXT_ANDES_DCACHE_WBINVAL_ALL, +- SBI_EXT_ANDES_GET_MICM_CFG, +- SBI_EXT_ANDES_GET_MDCM_CFG, + }; + + enum sbi_hsm_hart_status { +-- +2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch new file mode 100644 index 0000000000..aeafed4c9f --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch @@ -0,0 +1,29 @@ +From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 29 Dec 2021 16:04:54 +0800 +Subject: [PATCH] Disable PIC explicitly for assembling + +This patch is necessary if the fw_dynamic load address +is not equal to link address. +However, they are equal currently, since we include an u-boot +patch for preventing fw_dynamic relocation. + +Signed-off-by: Yu Chien Peter Lin +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index d6f097d..441518d 100644 +--- a/Makefile ++++ b/Makefile +@@ -225,6 +225,7 @@ ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + ASFLAGS += $(GENFLAGS) + ASFLAGS += $(platform-asflags-y) + ASFLAGS += $(firmware-asflags-y) ++ASFLAGS += -fno-pic + + ARFLAGS = rcs + +-- +2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch new file mode 100644 index 0000000000..ae48a760c8 --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch @@ -0,0 +1,25 @@ +From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 30 Dec 2021 08:47:34 +0800 +Subject: [PATCH] Enable cache for opensbi jump mode + +Signed-off-by: Yu Chien Peter Lin +--- + firmware/fw_base.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/firmware/fw_base.S b/firmware/fw_base.S +index ab33e11..155d230 100644 +--- a/firmware/fw_base.S ++++ b/firmware/fw_base.S +@@ -46,6 +46,8 @@ + .globl _start + .globl _start_warm + _start: ++ li t0, 0x80003 ++ csrw 0x7ca, t0 + /* Find preferred boot HART id */ + MOV_3R s0, a0, s1, a1, s2, a2 + call fw_boot_hart +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch new file mode 100644 index 0000000000..2b0bae875e --- /dev/null +++ b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch @@ -0,0 +1,27 @@ +From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:00:59 +0800 +Subject: [PATCH 1/3] Fix mmc no partition table error + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf..3b1e0aa0 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev) + return ret; + #endif + +- if (dev_read_bool(dev, "cap-mmc-highspeed") || \ +- dev_read_bool(dev, "cap-sd-highspeed")) +- chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz; +- + ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps, + priv->minmax[1] , priv->minmax[0]); + chip->mmc = &plat->mmc; +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch new file mode 100644 index 0000000000..8ee4240619 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch @@ -0,0 +1,27 @@ +From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:02:26 +0800 +Subject: [PATCH 2/3] Prevent fw_dynamic from relocation + +This patch prevents OpenSBI relocation, load fw_dynamic to link address + +Signed-off-by: Yu Chien Peter Lin +--- + board/AndesTech/ax25-ae350/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig +index e50f505a..385c4c11 100644 +--- a/board/AndesTech/ax25-ae350/Kconfig ++++ b/board/AndesTech/ax25-ae350/Kconfig +@@ -25,7 +25,7 @@ config SPL_TEXT_BASE + default 0x800000 + + config SPL_OPENSBI_LOAD_ADDR +- default 0x01000000 ++ default 0x0 + + config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch new file mode 100644 index 0000000000..81870647b8 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch @@ -0,0 +1,26 @@ +From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 18:17:39 +0800 +Subject: [PATCH 3/3] Fix u-boot proper booting issue + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/cpu/start.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S +index 76850ec9..2ccda4f5 100644 +--- a/arch/riscv/cpu/start.S ++++ b/arch/riscv/cpu/start.S +@@ -139,7 +139,9 @@ call_harts_early_init: + * accesses gd). + */ + mv gp, s0 ++#if !CONFIG_IS_ENABLED(RISCV_SMODE) + bnez tp, secondary_hart_loop ++#endif + #endif + + jal board_init_f_init_reserve +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch new file mode 100644 index 0000000000..efd78ab26d --- /dev/null +++ b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch @@ -0,0 +1,25 @@ +From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 6 Jan 2022 13:50:07 +0800 +Subject: [PATCH] Enable printing OpenSBI boot logo + +Signed-off-by: Yu Chien Peter Lin +--- + include/opensbi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/opensbi.h b/include/opensbi.h +index d812cc8c..91fb8fd9 100644 +--- a/include/opensbi.h ++++ b/include/opensbi.h +@@ -20,7 +20,7 @@ + + enum sbi_scratch_options { + /** Disable prints during boot */ +- SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0), ++ SBI_SCRATCH_NO_BOOT_PRINTS = 0, + }; + + /** Representation dynamic info passed by previous booting stage */ +-- +2.25.1 diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..19cfa721a7 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,66 @@ +Intro +===== + +Andestech AE350 Platform + +The AE350 prototype demonstrates the AE350 platform on the FPGA. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make ae350_andestar45_defconfig + +If you want to customize your configuration: + + $ make menuconfig + +Build everything +---------------- +Note: you will need to access to the network, since Buildroot will +download the packages' sources. + + $ make + +Result of the build +------------------- + +After building, you should obtain the following files: + + output/images/ + |-- Image + |-- ae350.dtb + |-- boot.scr + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- rootfs.cpio + |-- rootfs.ext2 + |-- rootfs.ext4 -> rootfs.ext2 + |-- rootfs.tar + |-- sdcard.img + |-- u-boot-spl.bin + `-- u-boot.itb + + +Copy the sdcard.img to a SD card with "dd": + + $ sudo dd if=sdcard.img of=/dev/sdX bs=4096 + +Your SD card partition should be: + + Disk /dev/mmcblk0: 31457280 sectors, 3072M + Logical sector size: 512 + Disk identifier (GUID): 546663ee-d2f1-427f-93a5-5c7b69dd801c + Partition table holds up to 128 entries + First usable sector is 34, last usable sector is 385062 + + Number Start (sector) End (sector) Size Name + 1 34 262177 128M u-boot + 2 262178 385057 60.0M rootfs + +Insert SD card and reset the board, should boot Linux from mmc. diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment new file mode 100644 index 0000000000..4992d712a5 --- /dev/null +++ b/board/andes/ae350/uboot.config.fragment @@ -0,0 +1,5 @@ +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_MMC=y +# CONFIG_SPL_RAM_SUPPORT is not set +# CONFIG_OF_BOARD is not set +CONFIG_OF_SEPARATE=y diff --git a/configs/ae350_andestar45_defconfig b/configs/ae350_andestar45_defconfig new file mode 100644 index 0000000000..fb4587b1a7 --- /dev/null +++ b/configs/ae350_andestar45_defconfig @@ -0,0 +1,46 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_BINUTILS_VERSION_2_37_X=y +BR2_GCC_VERSION_11_X=y +BR2_GCC_ENABLE_OPENMP=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.84" +BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae350/linux.config.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" +BR2_PACKAGE_OPENSSL=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="andes/ae350" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/andes/ae350/boot.cmd" -- 2.17.1 From thomas.petazzoni at bootlin.com Tue Jan 11 06:58:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 06:58:10 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-10 Message-ID: <20220111065815.9358382D07@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-01-10 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 51 | 7 | 0 | 58 | 2021.11.x | 28 | 3 | 0 | 31 | master | 98 | 61 | 0 | 159 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 6 vtun-3.0.4 | 6 cryptopp-8.6.0 | 5 drbd-utils-9.19.0 | 5 unknown | 4 gstreamer1-mm-1.10.0 | 2 guile-3.0.7 | 2 ksmbd-tools-3.4.3 | 2 package/tinifier/tinifier.m... | 2 refpolicy-2.20220106 | 2 samba4-4.15.3 | 2 apparmor-3.0.3 | 1 bat-0.18.3 | 1 bird-2.0.8 | 1 domoticz-2021.1 | 1 efl-1.26.0 | 1 ejabberd-20.07 | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 host-go-1.17.6 | 1 libqb-2.0.3 | 1 libupnp-1.14.12 | 1 mbedtls-2.28.0 | 1 mesa3d-21.3.3 | 1 mongodb-4.2.11 | 1 nodejs-14.18.2 | 1 opencv4-4.5.5 | 1 pcsc-lite-1.9.5 | 1 pulseview-0.4.2 | 1 tesseract-ocr-5.0.1 | 1 tinifier-legal-info | 1 tinyalsa-2.0.0 | 1 vlc-3.0.16 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | apparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/ec5251d05fc25e46dd33d2ea38d400438fcdbec8 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/88cccf3fe4bb22322f1d36cf7f16e920b758df4d | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/a3e189c5eee2de216f59ccad3d56dc1a6753dd00 | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/e9dab1bfd05ea7e659a0ec751c6467bc8186fccc | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/1fd47187c9936ae385a12cd74c70eb8aa440fc81 | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/e4fd947c118174a4fad62cbed18816f02d39ec25 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/c22c5fc939f11e034c350dfc76d138fa0506a856 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/174fe03da7a40dd152703de93af6a213d9cac698 | arc | domoticz-2021.1 | NOK | http://autobuild.buildroot.net/results/302f65e535a6a29c7458dce4ff4676219f487df8 | x86_64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/c63252f08544ccbad1bb72e7ea1f44091451544d | riscv64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/42d078006ff98aa25c4f8b3a015cf96568ae29b5 | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/68ffaffcf4e8d05f9aed75147104cca5a0ac60e9 | microblazeel | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/b03b4315cbcefedd68d6a68f8a895f55a6b1ab17 | mips | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/bb6fdc13b137261924f879591bec9ddf3a7ebde0 | aarch64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/0a8616ff8a496719875d21103ac390782ca42e19 | aarch64 | ejabberd-20.07 | NOK | http://autobuild.buildroot.net/results/0adc757a364ebd375d40df536130cc4ca0c02f80 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/41bbbba582d14be454943ad0ff097edaa84e9947 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/b202f65426be25e7aad196a0a05fbca94da1e847 | aarch64 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/e7f943ad6f2a94d4d82ac65e4c611723e369dac4 | ORPH x86_64 | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/3c4ccc87fb09f40862b66e03afa8cc6d9723de4d | ORPH sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/d2b5949b3f82b946fb33135ba06569191c49c5f9 | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/779b98575eb8d0c154f3f3e3804e19b15ee8edcb | ORPH mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/0945b3caea98be6c77aaab4fec9f11b3ecc3b2f6 | riscv64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/f667cbf81163cc11d4abe0f06b83e628139e2865 | mips | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/d7390217cce0efadee0d62a0e668bba18dd014a3 | or1k | libqb-2.0.3 | NOK | http://autobuild.buildroot.net/results/2e438c1317188373b99b9a7ffd19ca3693112fb3 | or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/478b1664555820657aedbe3f6eb5aec3a5247660 | arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/cecdcd64da211dd235efda7a1ba33c1208907c66 | sh4 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/036d827be5c044f421f95dcc061f33b76789e006 | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/12b89bdee71411b9ec850ef5e8d7632f3c87f6ef | x86_64 | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/6c6cc3fb07152172da87e5e15763c34bc228e96c | mips64el | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/817d9f6ffdab34d57396c3bd390fcba96820885e | arm | package/tinifier/tinifier.m... | NOK | http://autobuild.buildroot.net/results/2757e70e92860a7bf636dcd444c97aafdf5868ad | x86_64 | package/tinifier/tinifier.m... | NOK | http://autobuild.buildroot.net/results/2056ba96424806eb8c2e41f29a014b6beff467ab | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/14503c57268616aff87159bfc5ad5153e7fd8cc7 | ORPH xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/32b3d88d01ea4b6aad099fa90970bf3074b5837d | xtensa | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/98d5b3db313000855721c0ad994951fe8cc781c0 | arc | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/b476a32b5d0518f35c9fac62485e7ede408d8fb7 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f17d305be7bf5535e0c758fac66b27498900eef2 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/0c71db6d4c0d951ed78432d3c3898e46a4d82288 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/040c5e1314e0e7575e8e0de06bdcae0844bc6282 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3a145a742ab1dd243b82c8fa6a10242372bffbc2 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/4977bb11825095aec159d44f01e662aeb458eeac | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/32f0a8e1392e98e3ab8045792733510a233c587d | i686 | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/542ade6fe1cd6e8c22e33ba9632c19018c8a634a | x86_64 | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/5944753efc113a7c76225458c11c7faafc6c3542 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/f6e310728b00ae13d0889e4ad1f7d0cd4e92ebc1 | x86_64 | tinifier-legal-info | NOK | http://autobuild.buildroot.net/results/8d74a1d6698c1522d1eded771bdc50e80a63529a | i586 | tinyalsa-2.0.0 | NOK | http://autobuild.buildroot.net/results/a75e23dc585bd071f4d65face5489ed6ac22edbe | ORPH powerpc | unknown | NOK | http://autobuild.buildroot.net/results/0898a310aa19dd1770042fba0cd4c2e9030864f2 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/a5e154d16dc192ba5e89fb5030004b7b7b0808ba | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/f67aba89e1764024cead72d8f64138ed36f51df0 | arm | unknown | NOK | http://autobuild.buildroot.net/results/7608338a8372c93a9f20229be95c2ca640e1357e | powerpc64 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/5841b5f1ed771923b4c99067b55bc11c052dfb89 | arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/d6eb63493c5023d35ed54f1a06484f8d072728be | ORPH mips64el | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/d7166d32f17ad1a9d3f296bac39ea231c94aea6e | ORPH xtensa | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/8491ec3f852043d18867760c7adf6349e8db2e8d | ORPH arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/3a1bb52324d9bea7e138806f63edf728ba9eeb42 | ORPH arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/b406284bd013566452b33302a9332f8b23ff3c36 | ORPH i686 | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/0db342fbca14447849569676f2c77ba79f294502 | ORPH mipsel | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/672427e5711be790bb3164b79f8589f73f459060 | Classification of failures by reason for 2021.02.x -------------------------------------------------- bluez5_utils-5.62 | 1 gobject-introspection-1.64.1 | 1 host-sentry-cli-1.57.0 | 1 libtheora-1.1.1 | 1 ndisc6-1.0.4 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | bluez5_utils-5.62 | NOK | http://autobuild.buildroot.net/results/d050dc909f9e1fe6db29f20d69cdd404f609cb4c | nios2 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/bfb56d315dfe9b6a9d7ac5e156f157450eb51b52 | ORPH i686 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/460b16121d528b307a7d266c564c77a5ba2708fd | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/2e4f84c318ce0c99378682b59a3f57b51f4de1c4 | ORPH arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/b3c6881b1bcac64fdc1f8a09ff34153a523d6067 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/3db274858f5556e163eccbe4bd7a3329f069c356 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/d7ee6d14377583cb1b5d80c76f6220ccc577f0cc | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 log4cxx-0.12.0 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- xtensa | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/5cabce045fde39370269d9da7693a837cfafec42 | mips64el | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/74b8a7439b1bfb2a9e25e89f8dd0cfa71e3e805c | riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a1ad5d09002131eea6f48ea36ed9374c0b2884c1 | Gitlab CI results for 2022-01-10 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestIso9660Grub2Hybrid | https://gitlab.com/buildroot.org/buildroot/-/jobs/1956557939 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1956558084 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/1956558205 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/1956558206 | ORPH -- http://autobuild.buildroot.net From fontaine.fabrice at gmail.com Tue Jan 11 07:28:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 08:28:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyparsing: needs python3 Message-ID: <20220111072809.2133986-1-fontaine.fabrice@gmail.com> python-pyparsing dropped python2 support since version 3.0.0: https://github.com/pyparsing/pyparsing/blob/master/docs/whats_new_in_3_0_0.rst#python-2-x-no-longer-supported resulting in the following build failure since bump to version 3.0.6 in commit 7affc7827aee0e07ec94d3b4d91c2e23bda8d937: File "setup.py", line 8, in from pyparsing import __version__ as pyparsing_version File "/home/buildroot/autobuild/instance-0/output-1/build/python-pyparsing-3.0.6/pyparsing/__init__.py", line 100 major: int ^ SyntaxError: invalid syntax Fixes: - http://autobuild.buildroot.org/results/8ac5224f4b6c2c59035dbfb53541e76f58b15e47 Signed-off-by: Fabrice Fontaine --- package/python-httplib2/Config.in | 7 +++---- package/python-pyparsing/Config.in | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in index 39671f2386..0095d95b51 100644 --- a/package/python-httplib2/Config.in +++ b/package/python-httplib2/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_PYTHON_HTTPLIB2 bool "python-httplib2" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 # python-pyparsing + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL select BR2_PACKAGE_PYTHON_PYPARSING # runtime help httplib2 is a comprehensive HTTP client library, httplib2.py diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 926ca07ed7..9b5894116d 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYPARSING bool "python-pyparsing" + depends on BR2_PACKAGE_PYTHON3 help The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc -- 2.34.1 From mf at go-sys.de Tue Jan 11 08:36:18 2022 From: mf at go-sys.de (Michael Fischer) Date: Tue, 11 Jan 2022 08:36:18 +0000 Subject: [Buildroot] [PATCH 1/1] package/rtl8723bu: bump version to d34603a39a7c925d810fe17c6e8dea5063d43a33 In-Reply-To: <20220110155823.GS1477939@scaer> References: <20220110151302.21093-1-mf@go-sys.de> <20220110155823.GS1477939@scaer> Message-ID: <1988ce33e1294da4ad3f35d32eec3ab8@go-sys.de> Yann E.,All > When patching out unused code, don't comment it; just remove it. I just followed the README.md, but no problem i'll change that. - Step 2: Find the line that contains `EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE` and insert a `#` symbol at the beginning of that line. This comments that line and disables concurrent mode. PS: Is there something wrong with the mailing list ? I have not received any mails for a week now. Regards, Michael Fischer > -----Urspr?ngliche Nachricht----- > Von: Yann E. MORIN [mailto:yann.morin.1998 at free.fr] > Gesendet: Montag, 10. Januar 2022 16:58 > An: Michael Fischer > Cc: buildroot at busybox.net > Betreff: Re: [Buildroot] [PATCH 1/1] package/rtl8723bu: bump version to > d34603a39a7c925d810fe17c6e8dea5063d43a33 > > Michael, All, > > On 2022-01-10 16:13 +0100, Michael Fischer spake thusly: > > patch 0001: Disable concurrrent mode. This causes disconnections. > > That patch is missing a commit log and a sign-off for itself: > > # ./utils/check-package package/rtl8723bu/0001- > disable_concurent_mode.patch > package/rtl8723bu/0001-disable_concurent_mode.patch:0: missing Signed- > off-by in the header > > (http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches) > > But see below... > > > Signed-off-by: Michael Fischer > > --- > > package/rtl8723bu/0001-disable_concurent_mode.patch | 12 ++++++++++++ > > package/rtl8723bu/rtl8723bu.hash | 2 +- > > package/rtl8723bu/rtl8723bu.mk | 2 +- > > 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 > > package/rtl8723bu/0001-disable_concurent_mode.patch > > > > diff --git a/package/rtl8723bu/0001-disable_concurent_mode.patch > > b/package/rtl8723bu/0001-disable_concurent_mode.patch > > new file mode 100644 > > index 0000000000..037b1642fc > > --- /dev/null > > +++ b/package/rtl8723bu/0001-disable_concurent_mode.patch > > @@ -0,0 +1,12 @@ > > +diff -purN a/Makefile b/Makefile > > +--- a/Makefile 2021-11-04 20:36:55.000000000 +0100 > > ++++ b/Makefile 2022-01-10 14:35:17.333934039 +0100 > > +@@ -18,7 +18,7 @@ EXTRA_CFLAGS += -Wno-unused-label EXTRA_CFLAGS > += > > +-Wno-unused-parameter EXTRA_CFLAGS += -Wno-unused-function > > +EXTRA_CFLAGS += -Wno-unused -EXTRA_CFLAGS += - > DCONFIG_CONCURRENT_MODE > > ++#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE > > When patching out unused code, don't comment it; just remove it. > > Can you fix those two issues and resubmit, plese? > > Regards, > Yann E. MORIN. > > > + ccflags-y += -D__CHECK_ENDIAN__ > > + > > diff --git a/package/rtl8723bu/rtl8723bu.hash > > b/package/rtl8723bu/rtl8723bu.hash > > index 04bc776a07..df990a8d63 100644 > > --- a/package/rtl8723bu/rtl8723bu.hash > > +++ b/package/rtl8723bu/rtl8723bu.hash > > @@ -1,2 +1,2 @@ > > # Locally computed > > -sha256 > > 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc > > rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz > > +sha256 > > +c9cde757941c88c6117560a2c350dc9c4382dcd6a313b1cae7c6e7eade7055bf > > +rtl8723bu-d34603a39a7c925d810fe17c6e8dea5063d43a33.tar.gz > > diff --git a/package/rtl8723bu/rtl8723bu.mk > > b/package/rtl8723bu/rtl8723bu.mk index c35fad5832..e73987cfeb 100644 > > --- a/package/rtl8723bu/rtl8723bu.mk > > +++ b/package/rtl8723bu/rtl8723bu.mk > > @@ -4,7 +4,7 @@ > > # > > > > > ################################################################ > ###### > > ########## > > > > -RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 > > +RTL8723BU_VERSION = d34603a39a7c925d810fe17c6e8dea5063d43a33 > > RTL8723BU_SITE = $(call > > github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) > > RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) > > > > -- > > 2.20.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > | conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > > From luca at lucaceresoli.net Tue Jan 11 09:10:06 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Tue, 11 Jan 2022 10:10:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynq-boot-bin: port to python3 and move to support/scripts In-Reply-To: References: <20211231202620.3521230-1-james.hilliard1@gmail.com> <20220110221051.GT1477939@scaer> <20220110222808.GU1477939@scaer> <2846b399-f095-acb3-c086-e44b3b74698e@lucaceresoli.net> Message-ID: <7659ce4e-a509-8ff3-1f98-17b7d2766623@lucaceresoli.net> Hi James, Yann, On 10/01/22 23:55, James Hilliard wrote: > On Mon, Jan 10, 2022 at 3:46 PM Luca Ceresoli wrote: >> >> Hi James, Yann, >> >> On 10/01/22 23:31, James Hilliard wrote: >>> On Mon, Jan 10, 2022 at 3:28 PM Yann E. MORIN wrote: >>>> >>>> James, All, >>>> >>>> On 2022-01-10 15:18 -0700, James Hilliard spake thusly: >>>>> On Mon, Jan 10, 2022 at 3:10 PM Yann E. MORIN wrote: >>>> [--SNIP--] >>>>>> So I wonder if it even makes sense to keep package/zynq-boot-bin now. >>>>> Well if someone is using an older uboot that doesn't have the >>>>> generation capability >>>>> integrated then it's probably still needed right? >>>> >>>> But then, they would have that tool in their uboot tree, and then >>>> nothing would prevent them from running it as a post-build (or >>>> post-image) script. >>>> >>>> Yes, they would need to have a python2 on their host. But that will be >>>> the case if they stick to such older tools which may break on more >>>> recent systems, not just uboot... >>> >>> Yeah, the advantage here is that it works with python3 as is with older uboot >>> versions. I guess the main issue is that vendor uboot trees are often ancient >>> and rarely updated so this would be mostly useful for those situations. >> >> Is upgrading to python 3 just to simplify potential legacy users the >> only motivation for this patch? Then I would not touch this package at >> all and avoid keeping our own copy of the script. > > Well the motivation is that we want to drop python 2 from the > toolchain entirely, > so leaving this package as is would not be an option(since it depends > on the host > python2 interpreter support we want to remove). I see. I'm currently unable to keep up to date with current Buildroot development, apologies for the noise. > We either need to > remove it or use > the python3 ported version(which due to the simplicity of the script > should not cause > any significant maintenance issues for us IMO). I agree it would not create much maintenance burden, especially since the script it is unchanged since ages. But the question is for how long we want to maintain this tool in Buildroot. There is no in-tree user, there is an alternative in U-Boot since many years, even Xilinx removed their script years from their repo and looking for info about this tool on the Internet leads to almost nothing after ~2015. Users using this script nowadays with recent Buildroot are most probably zero or close to zero. And, as Yann pointed out, such users can still handle it with just a small annoyance. For the above I'm in favor of removal, with a small paragraph in Config.in.legacy saying it's been removed but one can still download it from and call it in a post-build script after installing python2 on the host. -- Luca From bugzilla at busybox.net Tue Jan 11 13:20:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 11 Jan 2022 13:20:10 +0000 Subject: [Buildroot] [Bug 14501] lttng-modules v2.11 package fails to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14501 Sreedhar Mahadevan changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #7 from Sreedhar Mahadevan --- Thanks a lot for the solutions and sorry for the late reply. I was able to get it built successfully using the v2.11.9 version of lttng-modules by changing the versions in the lttng-modules.mk and lttng-modules.hash files. Thanks again for the information about the patch on master. Really appreciate it. The bug report can be closed. -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Tue Jan 11 14:46:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 15:46:59 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: drop Henrique Camargo Message-ID: <20220111144110.01B1D82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f51be73f25bdc9b370db42996475136098ebd251 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master He has privately requested to no longer be notified regarding this package. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..44911a7d94 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1183,9 +1183,6 @@ F: package/linuxptp/ F: package/netopeer2/ F: package/sysrepo/ -N: Henrique Camargo -F: package/json-glib/ - N: Herv?? Codina F: package/dtbocfg/ F: package/libdbi/ From aperez at igalia.com Tue Jan 11 14:55:27 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Tue, 11 Jan 2022 16:55:27 +0200 Subject: [Buildroot] [PATCH RFC 1/1] package/wpewebkit: use ninja for faster builds Message-ID: <20220111145527.3422053-1-aperez@igalia.com> Instruct CMake to use the Ninja generator, and override build/install commands to use Ninja instead, which results in faster builds. The host-ninja package is required to build some of the dependencies used by wpewebkit (e.g. libepoxy) so in practice this is not introducing a new host dependency that would slow down the build. Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.mk | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 64c179534f..2cbed60cb3 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,11 +14,12 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit -WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ +WPEWEBKIT_DEPENDENCIES = host-gperf host-ninja host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo WPEWEBKIT_CONF_OPTS = \ + -GNinja \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ @@ -101,4 +102,24 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \ + $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -- $(NINJA_OPTS) $(WPEWEBKIT_NINJA_OPTS) +endef + +define WPEWEBKIT_INSTALL_CMDS + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \ + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) DESTDIR=$(STAGING_DIR) \ + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(WPEWEBKIT_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) -- 2.34.1 From Murali.Karicheri at sandc.com Tue Jan 11 16:01:42 2022 From: Murali.Karicheri at sandc.com (Karicheri, Murali) Date: Tue, 11 Jan 2022 16:01:42 +0000 Subject: [Buildroot] creating packages for opkg for buildroot based embedded platform software Message-ID: Hello, buildroot experts, I am new to buildroot and was working with a buildroot expert for migrating our yocto based build system to use buildroot. Unfortunately, he has left our company for another oppotunity. Ever since I have started using buildroot for our build, I am very happy with its simplicity compared to yocto based build system. However, I have learned that buildroot expect the entire rootfs to be updated on a running system for updating fixes which is very expensive for deployment where there is limited bandwidth available to update the system. So that is the challenge that I am facing. Good news is opkg tools are supported in buildroot which is good. Typically, we would like to let our customer do periodic update to the system to have vulnerability fixes and other fixes released by buildroot. For example, let us say we base our system on 2021.02.x. So, when there is a maintenance update to this branch say, 2021.02.06, we would like to create an ipk file with the changes and provide that for system update. Idea is the file will be smaller and thus requires less bandwidth and will result in quicker update to the system. Do you have information on any project that is working to create a package manager for systems that uses buildroot for their build? My research showed one resource but is for open embedded or yocto or openwrt and is here. https://raymii.org/s/tutorials/Building_IPK_packages_by_hand.html Do you think this is what I should try or any other relevant information on this topic? Thanks Murali Karicheri, Software Architect S&C Electric Company ________________________________ NOTICE OF CONFIDENTIALITY: This message may contain information that is considered confidential and which may be prohibited from disclosure under applicable law or by contractual agreement. The information is intended solely for the use of the individual or entity named above. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution or use of the information contained in or attached to this message is strictly prohibited. If you have received this email transmission in error, please notify the sender by replying to this email and then delete it from your system. From grant.b.edwards at gmail.com Tue Jan 11 16:11:41 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Tue, 11 Jan 2022 16:11:41 -0000 (UTC) Subject: [Buildroot] Diagnosing conflicts due to new Python version Message-ID: It seems that every time a new Python version is unmasks, it breaks things. This time it's a python-exec version conflict that prevents emerge -u. FAICT, Python 3.10 requires python-exec 2.4.8, and some other package requires 2.4.6. I've fixed things temporarily with: package.use: */* PYTHON_TARGETS: -python3_10 */* PYTHON_SINGLE_TARGET -python3_10 package.mask: =dev-lang/python-3.10 No, at least I can continue to update the machine. When I eventually get the spare time to try to get Python 3.10 working, how does one figure out which package is causing the problem by requring the older version of python-exec? I've tried adding a 't' to the emerge flags, but that doesn't seem to show anything useful. Is there any documentation on how to determine the cause of a package version conflict? -- Grant From baruch at tkos.co.il Tue Jan 11 16:13:15 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Tue, 11 Jan 2022 18:13:15 +0200 Subject: [Buildroot] creating packages for opkg for buildroot based embedded platform software In-Reply-To: References: Message-ID: <87o84iw8qc.fsf@tarshish> Hi Murali, On Tue, Jan 11 2022, Karicheri, Murali wrote: > Hello, buildroot experts, > > I am new to buildroot and was working with a buildroot expert for migrating > our yocto based build system to use buildroot. Unfortunately, he has left our > company for another oppotunity. Ever since I have started using buildroot for > our build, I am very happy with its simplicity compared to yocto based build > system. However, I have learned that buildroot expect the entire rootfs to be > updated on a running system for updating fixes which is very expensive for > deployment where there is limited bandwidth available to update the system. So > that is the challenge that I am facing. Good news is opkg tools are supported > in buildroot which is good. Typically, we would like to let our customer do > periodic update to the system to have vulnerability fixes and other fixes > released by buildroot. For example, let us say we base our system on > 2021.02.x. So, when there is a maintenance update to this branch say, > 2021.02.06, we would like to create an ipk file with the changes and provide > that for syst > em update. Idea is the file will be smaller and thus requires less bandwidth > and will result in quicker update to the system. Do you have information on > any project that is working to create a package manager for systems that uses > buildroot for their build? > > My research showed one resource but is for open embedded or yocto or openwrt > and is here. https://raymii.org/s/tutorials/Building_IPK_packages_by_hand.html > > Do you think this is what I should try or any other relevant information on this topic? This Buildroot FAQ is relevant: https://buildroot.org/downloads/manual/manual.html#faq-no-binary-packages baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From yann.morin.1998 at free.fr Tue Jan 11 17:09:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 18:09:18 +0100 Subject: [Buildroot] [PATCH RFC 1/1] package/wpewebkit: use ninja for faster builds In-Reply-To: <20220111145527.3422053-1-aperez@igalia.com> References: <20220111145527.3422053-1-aperez@igalia.com> Message-ID: <20220111170918.GV1477939@scaer> Adrian, All, On 2022-01-11 16:55 +0200, Adrian Perez de Castro spake thusly: > Instruct CMake to use the Ninja generator, and override build/install > commands to use Ninja instead, which results in faster builds. The > host-ninja package is required to build some of the dependencies used > by wpewebkit (e.g. libepoxy) so in practice this is not introducing > a new host dependency that would slow down the build. As discussed on IRC, we concluded that a better option is to make the cmake-package infrastructure in Buildroot ninja-aware, and that you were going to have a look at it. Thanks! :-) So, I've marked this patch as rejected in patchwork. Regards, Yann E. MORIN. > Signed-off-by: Adrian Perez de Castro > --- > package/wpewebkit/wpewebkit.mk | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk > index 64c179534f..2cbed60cb3 100644 > --- a/package/wpewebkit/wpewebkit.mk > +++ b/package/wpewebkit/wpewebkit.mk > @@ -14,11 +14,12 @@ WPEWEBKIT_LICENSE_FILES = \ > Source/WebCore/LICENSE-LGPL-2.1 > WPEWEBKIT_CPE_ID_VENDOR = wpewebkit > WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit > -WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ > +WPEWEBKIT_DEPENDENCIES = host-gperf host-ninja host-python3 host-ruby \ > harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ > libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo > > WPEWEBKIT_CONF_OPTS = \ > + -GNinja \ > -DPORT=WPE \ > -DENABLE_ACCESSIBILITY=OFF \ > -DENABLE_API_TESTS=OFF \ > @@ -101,4 +102,24 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS > WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF > endif > > +define WPEWEBKIT_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \ > + $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -- $(NINJA_OPTS) $(WPEWEBKIT_NINJA_OPTS) > +endef > + > +define WPEWEBKIT_INSTALL_CMDS > + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \ > + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) > +endef > + > +define WPEWEBKIT_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) DESTDIR=$(STAGING_DIR) \ > + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) > +endef > + > +define WPEWEBKIT_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(WPEWEBKIT_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ > + $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) > +endef > + > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From Murali.Karicheri at sandc.com Tue Jan 11 17:37:37 2022 From: Murali.Karicheri at sandc.com (Karicheri, Murali) Date: Tue, 11 Jan 2022 17:37:37 +0000 Subject: [Buildroot] creating packages for opkg for buildroot based embedded platform software Message-ID: Hi Baruch, -----Original Message----- From: buildroot On Behalf Of Baruch Siach via buildroot Sent: Tuesday, January 11, 2022 11:13 AM To: Karicheri, Murali Cc: buildroot at buildroot.org Subject: Re: [Buildroot] creating packages for opkg for buildroot based embedded platform software Hi Murali, On Tue, Jan 11 2022, Karicheri, Murali wrote: > Hello, buildroot experts, > > I am new to buildroot and was working with a buildroot expert for > migrating our yocto based build system to use buildroot. > Unfortunately, he has left our company for another oppotunity. Ever > since I have started using buildroot for our build, I am very happy > with its simplicity compared to yocto based build system. However, I > have learned that buildroot expect the entire rootfs to be updated on > a running system for updating fixes which is very expensive for > deployment where there is limited bandwidth available to update the > system. So that is the challenge that I am facing. Good news is opkg > tools are supported in buildroot which is good. Typically, we would > like to let our customer do periodic update to the system to have > vulnerability fixes and other fixes released by buildroot. For > example, let us say we base our system on 2021.02.x. So, when there is > a maintenance update to this branch say, 2021.02.06, we would like to > create an ipk file with the changes and provide that for syst em > update. Idea is the file will be smaller and thus requires less > bandwidth and will result in quicker update to the system. Do you have > information on any project that is working to create a package manager for systems that uses buildroot for their build? > > My research showed one resource but is for open embedded or yocto or > openwrt and is here. > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fraym > ii.org%2Fs%2Ftutorials%2FBuilding_IPK_packages_by_hand.html&data=0 > 4%7C01%7Cmurali.karicheri%40sandc.com%7Ced2996e04284449528fe08d9d51d6d > f3%7C21c4b724f908455e813c11c8d17f3e9a%7C0%7C0%7C637775144649082517%7CU > nknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1ha > WwiLCJXVCI6Mn0%3D%7C3000&sdata=VUvduRq9pPaHLRGnflGcQNzDo8ihorz8hOG > GJp%2Bd%2FhA%3D&reserved=0 > > Do you think this is what I should try or any other relevant information on this topic? This Buildroot FAQ is relevant: https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbuildroot.org%2Fdownloads%2Fmanual%2Fmanual.html%23faq-no-binary-packages&data=04%7C01%7Cmurali.karicheri%40sandc.com%7Ced2996e04284449528fe08d9d51d6df3%7C21c4b724f908455e813c11c8d17f3e9a%7C0%7C0%7C637775144649082517%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=4XHwDcvvpLQiwcSTMDuJ3vF%2Bammr84VU013NXlhwoxM%3D&reserved=0 Thanks for your quick response! Hope my email client (Outlook) doesn't create any annoying email format. My company also process these emails. So not sure if it messes up the format. I fully appreciate the intentions of buildroot to keep it simple. I had already reviewed the FAQ you had pointed out. What I am looking for is something outside buildroot. Typically, embedded systems that I am working with have firmware update mechanism in place. System doesn't modify the active rootfs but update an alternate set of partitions and switch to that once update is successful. So, we could potentially generate two rootfs contents using buildroot. One using say version 2021.02.02 and another with 2021.02.06 for example. We are using ARM tool chain for our build and assume we will keep it same for incremental updates. Understand that we might have to change the tool chain as well since there could be vulnerability fixes to tool chain. So, wondering if we could do a diff of both rootfs contents and create an ipk for the diff and update the alternate media for this purpose. Also, we will do extensive testing of our product software. So, this will be QA tested before pushing to field. Is there anything work done for this type of use cases? Regards, Murali baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.tkos.co.il%2F&data=04%7C01%7Cmurali.karicheri%40sandc.com%7Ced2996e04284449528fe08d9d51d6df3%7C21c4b724f908455e813c11c8d17f3e9a%7C0%7C0%7C637775144649082517%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=CI61wXVl0JJizrtYTd16lsPIUvw6s5nRLm0ez7XVZDQ%3D&reserved=0 - _______________________________________________ buildroot mailing list buildroot at buildroot.org https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.buildroot.org%2Fmailman%2Flistinfo%2Fbuildroot&data=04%7C01%7Cmurali.karicheri%40sandc.com%7Ced2996e04284449528fe08d9d51d6df3%7C21c4b724f908455e813c11c8d17f3e9a%7C0%7C0%7C637775144649082517%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=SVbBPgU%2B%2FMgWtx%2BDdXQ3AlSlkMBi2D96hDxDXXk6IMA%3D&reserved=0 ________________________________ NOTICE OF CONFIDENTIALITY: This message may contain information that is considered confidential and which may be prohibited from disclosure under applicable law or by contractual agreement. The information is intended solely for the use of the individual or entity named above. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution or use of the information contained in or attached to this message is strictly prohibited. If you have received this email transmission in error, please notify the sender by replying to this email and then delete it from your system. From fontaine.fabrice at gmail.com Tue Jan 11 17:43:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 18:43:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-mm: drop package Message-ID: <20220111174345.2482393-1-fontaine.fabrice@gmail.com> gstreamer1-mm is not compatible with glibmm-2.68 API and not actively maintained anymore (one commit during the last 3 years): https://gitlab.gnome.org/GNOME/gstreamermm/-/issues/17 https://gitlab.gnome.org/GNOME/gstreamermm/-/commits/master As this is the only package that doesn't support glibmm-2.68 and because it can't be easily patched, drop it to avoid the following build failure raised since commit dddb65efbdf2c7952f22a1e51009f17f1676db4a: Package 'giomm-2.4', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/3479688334765fbbe4cb9620f4d3596f7d710404 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++ package/gstreamer1/Config.in | 1 - .../0001-Fix-build-against-glib-2-68.patch | 44 ------------------- package/gstreamer1/gstreamer1-mm/Config.in | 29 ------------ .../gstreamer1-mm/gstreamer1-mm.hash | 6 --- .../gstreamer1/gstreamer1-mm/gstreamer1-mm.mk | 24 ---------- 6 files changed, 7 insertions(+), 104 deletions(-) delete mode 100644 package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch delete mode 100644 package/gstreamer1/gstreamer1-mm/Config.in delete mode 100644 package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash delete mode 100644 package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk diff --git a/Config.in.legacy b/Config.in.legacy index d36eac3302..a548ebf1a9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_GSTREAMER1_MM + bool "gstreamer1-mm package removed" + select BR2_LEGACY + help + This package has been removed as it is not actively + maintained anymore and does not support glibmm-2.68 API. + config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE bool "python-backports-functools-lru-cache package removed" select BR2_LEGACY diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index a2a15397e9..8fe8a34395 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -2,7 +2,6 @@ source "package/gstreamer1/gstreamer1/Config.in" if BR2_PACKAGE_GSTREAMER1 -source "package/gstreamer1/gstreamer1-mm/Config.in" source "package/gstreamer1/gst1-plugins-base/Config.in" source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in" source "package/gstreamer1/gst1-plugins-good/Config.in" diff --git a/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch b/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch deleted file mode 100644 index 3ffdbb9cbf..0000000000 --- a/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0c0b5f8cef3b1f0a06f56c34340e210e0f23d1b0 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Tue, 13 Jul 2021 10:32:30 +0000 -Subject: [PATCH] Fix build against glib 2.68 - -volatile has been misused in the past - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gstreamermm/-/merge_requests/4] -Signed-off-by: Fabrice Fontaine ---- - gstreamer/gstreamermm/register.h | 2 +- - tests/integration/test-integration-seekonstartup.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gstreamer/gstreamermm/register.h b/gstreamer/gstreamermm/register.h -index db66d172..a7ab3a63 100644 ---- a/gstreamer/gstreamermm/register.h -+++ b/gstreamer/gstreamermm/register.h -@@ -110,7 +110,7 @@ register_mm_type(const gchar * type_name) - /* The typedef for GType may be gulong or gsize, depending on the - * system and whether the compiler is c++ or not. The g_once_init_* - * functions always take a gsize * though ... */ -- static volatile gsize gonce_data = 0; -+ static gsize gonce_data = 0; - if (g_once_init_enter (&gonce_data)) { - GTypeInfo info; - -diff --git a/tests/integration/test-integration-seekonstartup.cc b/tests/integration/test-integration-seekonstartup.cc -index 247ac499..cd43a125 100644 ---- a/tests/integration/test-integration-seekonstartup.cc -+++ b/tests/integration/test-integration-seekonstartup.cc -@@ -18,7 +18,7 @@ RefPtr mainloop; - RefPtr bus; - RefPtr pipeline; - RefPtr sink_pad; --static volatile gint counter; -+static gint counter; - bool prerolled = false; - gboolean was_check = 0; - --- -GitLab - diff --git a/package/gstreamer1/gstreamer1-mm/Config.in b/package/gstreamer1/gstreamer1-mm/Config.in deleted file mode 100644 index 3225e394f4..0000000000 --- a/package/gstreamer1/gstreamer1-mm/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_GSTREAMER1_MM - bool "gstreamer1-mm" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # glibmm -> libsigc - depends on BR2_INSTALL_LIBSTDCPP # glibmm - depends on BR2_USE_WCHAR # glibmm -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # glibmm -> libglib2 - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_GSTREAMER1_CHECK - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - gstreamermm provides C++ bindings for the GStreamer streaming - multimedia library (http://gstreamer.freedesktop.org). With - gstreamermm it is possible to develop applications that work - with multimedia in C++. - - gstreamermm is developed over glibmm, libsigc++ and libxml++ - and the functionalities they provide. This means that, among - other things, referencing and unreferencing of GObjects is - handled automatically via glibmm's automatic pointer class, - Glib::RefPtr, and libsigc++'s slots are used for callbacks and - signals. - - https://gstreamer.freedesktop.org/bindings/cplusplus.html - -comment "gstreamer1-mm needs a toolchain w/ C++, wchar, threads, gcc >= 7" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash b/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash deleted file mode 100644 index 425cf05f39..0000000000 --- a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gstreamermm/1.10/gstreamermm-1.10.0.sha256sum -sha256 be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60 gstreamermm-1.10.0.tar.xz - -# Locally computed -sha256 7c78a8d7fc6781d51402d5a6036bedda9cffb0e5d28757e25d54d6eacbb1949f COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.examples diff --git a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk b/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk deleted file mode 100644 index 539c9df1cb..0000000000 --- a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# gstreamer1-mm -# -################################################################################ - -GSTREAMER1_MM_VERSION_MAJOR = 1.10 -GSTREAMER1_MM_VERSION = $(GSTREAMER1_MM_VERSION_MAJOR).0 -GSTREAMER1_MM_SITE = http://ftp.gnome.org/pub/gnome/sources/gstreamermm/$(GSTREAMER1_MM_VERSION_MAJOR) -GSTREAMER1_MM_SOURCE = gstreamermm-$(GSTREAMER1_MM_VERSION).tar.xz -GSTREAMER1_MM_LICENSE = LGPL-2.1+ (library), GPL-2.0 (examples) -GSTREAMER1_MM_LICENSE_FILES = COPYING COPYING.examples -GSTREAMER1_MM_INSTALL_STAGING = YES -GSTREAMER1_MM_DEPENDENCIES += \ - glibmm \ - gstreamer1 \ - gst1-plugins-base - -GSTREAMER1_MM_CONF_OPTS += \ - --disable-gl \ - --enable-unittests=no \ - --disable-deprecated-api - -$(eval $(autotools-package)) -- 2.34.1 From yann.morin.1998 at free.fr Tue Jan 11 18:28:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 19:28:06 +0100 Subject: [Buildroot] [git commit] package/linux-headers: drop 5.14.x headers Message-ID: <20220111182359.DE1A282A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27eb296a202b6559e8b6d363effb36af4319cb9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 5.14.x series is now EOL, so drop it. Signed-off-by: Peter Korsgaard [yann.morin.1998 at free.fr: actualyl drop it from the choice list] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index d36eac3302..b3e8d5a6d8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_KERNEL_HEADERS_5_14 + bool "kernel headers version 5.14.x are no longer supported" + select BR2_LEGACY + help + Version 5.14.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE bool "python-backports-functools-lru-cache package removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 86dc8d7af9..c40c26c1b2 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz -sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8ee86e09af..bf306faf92 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -58,10 +58,6 @@ config BR2_KERNEL_HEADERS_5_10 bool "Linux 5.10.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 -config BR2_KERNEL_HEADERS_5_14 - bool "Linux 5.14.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 - config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 @@ -388,7 +384,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.219" if BR2_KERNEL_HEADERS_4_19 default "5.4.163" if BR2_KERNEL_HEADERS_5_4 default "5.10.83" if BR2_KERNEL_HEADERS_5_10 - default "5.14.21" if BR2_KERNEL_HEADERS_5_14 default "5.15.6" if BR2_KERNEL_HEADERS_5_15 default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From yann.morin.1998 at free.fr Tue Jan 11 18:28:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 19:28:47 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series Message-ID: <20220111182359.E72F1811E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db14f7d71505aad2ae1e4aefc5c0ece97f5eacec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 6c30100921..891e2cdcb6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" 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 c40c26c1b2..d0813e5db4 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz -sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz +sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index bf306faf92..248a9a2d97 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -378,13 +378,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 - default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 + default "5.15.13" if BR2_KERNEL_HEADERS_5_15 default "5.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From yann.morin.1998 at free.fr Tue Jan 11 18:31:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 19:31:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/linux-headers: drop 5.14.x headers In-Reply-To: <20220110231303.31275-1-peter@korsgaard.com> References: <20220110231303.31275-1-peter@korsgaard.com> Message-ID: <20220111183119.GW1477939@scaer> Peter, All, On 2022-01-11 00:13 +0100, Peter Korsgaard spake thusly: > The 5.14.x series is now EOL, so drop it. You forgot to remove it from the choice list, so I did. Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > Signed-off-by: Peter Korsgaard > --- > Config.in.legacy | 7 +++++++ > linux/linux.hash | 1 - > package/linux-headers/Config.in.host | 1 - > 3 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index d36eac3302..b3e8d5a6d8 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_KERNEL_HEADERS_5_14 > + bool "kernel headers version 5.14.x are no longer supported" > + select BR2_LEGACY > + help > + Version 5.14.x of the Linux kernel headers are no longer > + maintained upstream and are now removed. > + > config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE > bool "python-backports-functools-lru-cache package removed" > select BR2_LEGACY > diff --git a/linux/linux.hash b/linux/linux.hash > index 86dc8d7af9..c40c26c1b2 100644 > --- a/linux/linux.hash > +++ b/linux/linux.hash > @@ -1,7 +1,6 @@ > # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc > sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz > sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz > -sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz > sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz > sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc > diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host > index 8ee86e09af..115ff0d3f9 100644 > --- a/package/linux-headers/Config.in.host > +++ b/package/linux-headers/Config.in.host > @@ -388,7 +388,6 @@ config BR2_DEFAULT_KERNEL_HEADERS > default "4.19.219" if BR2_KERNEL_HEADERS_4_19 > default "5.4.163" if BR2_KERNEL_HEADERS_5_4 > default "5.10.83" if BR2_KERNEL_HEADERS_5_10 > - default "5.14.21" if BR2_KERNEL_HEADERS_5_14 > default "5.15.6" if BR2_KERNEL_HEADERS_5_15 > default "5.16" if BR2_KERNEL_HEADERS_5_16 > default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 11 18:31:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 19:31:33 +0100 Subject: [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series In-Reply-To: <20220110231303.31275-2-peter@korsgaard.com> References: <20220110231303.31275-1-peter@korsgaard.com> <20220110231303.31275-2-peter@korsgaard.com> Message-ID: <20220111183133.GX1477939@scaer> Peter, All, On 2022-01-11 00:13 +0100, Peter Korsgaard spake thusly: > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > linux/Config.in | 2 +- > linux/linux.hash | 14 +++++++------- > package/linux-headers/Config.in.host | 14 +++++++------- > 3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/linux/Config.in b/linux/Config.in > index 6c30100921..891e2cdcb6 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -125,7 +125,7 @@ endif > > config BR2_LINUX_KERNEL_VERSION > string > - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION > + default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION > default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION > default "5.10.83-cip1-rt1" 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 c40c26c1b2..d0813e5db4 100644 > --- a/linux/linux.hash > +++ b/linux/linux.hash > @@ -1,13 +1,13 @@ > # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc > sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz > -sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz > -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz > -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz > +sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz > +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz > +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc > -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz > -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz > -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz > -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz > +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz > +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz > +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz > +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz > # Locally computed > sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz > sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz > diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host > index 115ff0d3f9..1c24afed97 100644 > --- a/package/linux-headers/Config.in.host > +++ b/package/linux-headers/Config.in.host > @@ -382,13 +382,13 @@ endchoice > > config BR2_DEFAULT_KERNEL_HEADERS > string > - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 > - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 > - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 > - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 > - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 > - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 > - default "5.15.6" if BR2_KERNEL_HEADERS_5_15 > + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 > + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 > + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 > + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 > + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 > + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 > + default "5.15.13" if BR2_KERNEL_HEADERS_5_15 > default "5.16" if BR2_KERNEL_HEADERS_5_16 > default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION > default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fperrad at gmail.com Tue Jan 11 19:17:12 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 11 Jan 2022 20:17:12 +0100 Subject: [Buildroot] [PATCH 1/2] package/zic: bump to version 2021e Message-ID: <20220111191713.11473-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- .../zic/0001-remove-dependency-check-on-version-file.patch | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index 193c26304..62adc59c8 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,7 +18,7 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 +@@ -593,7 +593,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 3cee80bcd..9e17621de 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html -sha512 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed tzcode2020f.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html +sha512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a tzcode2021e.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 7529b682a..13f3a83bc 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2020f +ZIC_VERSION = 2021e ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 -- 2.32.0 From fperrad at gmail.com Tue Jan 11 19:17:13 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 11 Jan 2022 20:17:13 +0100 Subject: [Buildroot] [PATCH 2/2] package/tzdata: bump to version 2021e In-Reply-To: <20220111191713.11473-1-francois.perrad@gadz.org> References: <20220111191713.11473-1-francois.perrad@gadz.org> Message-ID: <20220111191713.11473-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index f70627481..55346539a 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html -sha512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 tzdata2021a.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html +sha512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 tzdata2021e.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 922e7420b..9cf8c2ea4 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2021a +TZDATA_VERSION = 2021e TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 -- 2.32.0 From ps.report at gmx.net Tue Jan 11 19:53:14 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 11 Jan 2022 20:53:14 +0100 Subject: [Buildroot] [PATCH v1] package/dhcp: change download URL to https Message-ID: <20220111195314.25173-1-ps.report@gmx.net> - change download URL to https Signed-off-by: Peter Seiderer --- package/dhcp/dhcp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 1edb3c5e99..18765a3639 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -5,7 +5,7 @@ ################################################################################ DHCP_VERSION = 4.4.2-P1 -DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) +DHCP_SITE = https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 11 19:59:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 20:59:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinifier: fix license hash Message-ID: <20220111195948.2565030-1-fontaine.fabrice@gmail.com> license hash is wrong since the addition of the package in commit 43c580ac9f848449333ecbe4336c2c9f2ba12158: >>> tinifier 3.4.0 Collecting legal info ERROR: LICENSE has wrong sha256 hash: ERROR: expected: 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 ERROR: got : 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c Fixes: - http://autobuild.buildroot.org/results/5fce7f16daca17216d786391ea0fffff856c5404 Signed-off-by: Fabrice Fontaine --- package/tinifier/tinifier.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash index 5681ed6a55..0c35508ebc 100644 --- a/package/tinifier/tinifier.hash +++ b/package/tinifier/tinifier.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 927e966f9d23ea7cc1942967a8fc16ef4c55c51bd096d44f54b418844a51aa12 tinifier-3.4.0.tar.gz -sha256 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 LICENSE +sha256 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Jan 11 20:06:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:06:48 +0100 Subject: [Buildroot] [git commit] package/tzdata: bump to version 2021e Message-ID: <20220111200043.7F5228348D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15e20ace94a1c2ecd2e843e7e628bfdecc58c295 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index f70627481a..55346539ab 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html -sha512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 tzdata2021a.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html +sha512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 tzdata2021e.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 922e7420bc..9cf8c2ea45 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2021a +TZDATA_VERSION = 2021e TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 From thomas.petazzoni at bootlin.com Tue Jan 11 20:06:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:06:59 +0100 Subject: [Buildroot] [git commit] package/tinifier: fix license hash Message-ID: <20220111200043.91B3F83483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=184e710c82b87bf2eaf1d200e148e686263945e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master license hash is wrong since the addition of the package in commit 43c580ac9f848449333ecbe4336c2c9f2ba12158: >>> tinifier 3.4.0 Collecting legal info ERROR: LICENSE has wrong sha256 hash: ERROR: expected: 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 ERROR: got : 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c Fixes: - http://autobuild.buildroot.org/results/5fce7f16daca17216d786391ea0fffff856c5404 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinifier/tinifier.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash index 5681ed6a55..0c35508ebc 100644 --- a/package/tinifier/tinifier.hash +++ b/package/tinifier/tinifier.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 927e966f9d23ea7cc1942967a8fc16ef4c55c51bd096d44f54b418844a51aa12 tinifier-3.4.0.tar.gz -sha256 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 LICENSE +sha256 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c LICENSE From thomas.petazzoni at bootlin.com Tue Jan 11 20:06:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:06:39 +0100 Subject: [Buildroot] [git commit] package/zic: bump to version 2021e Message-ID: <20220111200043.77B3183483@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c99c961629fff186849c8340a9da5da2ae85a3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/zic/0001-remove-dependency-check-on-version-file.patch | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index 193c263049..62adc59c83 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,7 +18,7 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 +@@ -593,7 +593,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 3cee80bcdd..9e17621de8 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html -sha512 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed tzcode2020f.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html +sha512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a tzcode2021e.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 7529b682a2..13f3a83bce 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2020f +ZIC_VERSION = 2021e ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From thomas.petazzoni at bootlin.com Tue Jan 11 20:06:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:06:54 +0100 Subject: [Buildroot] [git commit] package/dhcp: change download URL to https Message-ID: <20220111200043.87E7A83492@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e93068e049c85df6ac2777ca58539e2fced51f01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - change download URL to https Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/dhcp/dhcp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 1edb3c5e99..18765a3639 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -5,7 +5,7 @@ ################################################################################ DHCP_VERSION = 4.4.2-P1 -DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) +DHCP_SITE = https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Jan 11 20:08:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:08:14 +0100 Subject: [Buildroot] [PATCH 1/2] package/zic: bump to version 2021e In-Reply-To: <20220111191713.11473-1-francois.perrad@gadz.org> References: <20220111191713.11473-1-francois.perrad@gadz.org> Message-ID: <20220111210814.4a68b0d4@windsurf> On Tue, 11 Jan 2022 20:17:12 +0100 Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > .../zic/0001-remove-dependency-check-on-version-file.patch | 2 +- > package/zic/zic.hash | 4 ++-- > package/zic/zic.mk | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) Both applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:08:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:08:21 +0100 Subject: [Buildroot] [PATCH v1] package/dhcp: change download URL to https In-Reply-To: <20220111195314.25173-1-ps.report@gmx.net> References: <20220111195314.25173-1-ps.report@gmx.net> Message-ID: <20220111210821.786840a1@windsurf> On Tue, 11 Jan 2022 20:53:14 +0100 Peter Seiderer wrote: > - change download URL to https > > Signed-off-by: Peter Seiderer > --- > package/dhcp/dhcp.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:08:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:08:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinifier: fix license hash In-Reply-To: <20220111195948.2565030-1-fontaine.fabrice@gmail.com> References: <20220111195948.2565030-1-fontaine.fabrice@gmail.com> Message-ID: <20220111210825.4fd0fb22@windsurf> On Tue, 11 Jan 2022 20:59:48 +0100 Fabrice Fontaine wrote: > license hash is wrong since the addition of the package in commit > 43c580ac9f848449333ecbe4336c2c9f2ba12158: > > >>> tinifier 3.4.0 Collecting legal info > ERROR: LICENSE has wrong sha256 hash: > ERROR: expected: 791d8fd993ace44d4d83e2f4820a64d5ad3e37412f029afad46d17a9259de2b6 > ERROR: got : 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c > > Fixes: > - http://autobuild.buildroot.org/results/5fce7f16daca17216d786391ea0fffff856c5404 > > Signed-off-by: Fabrice Fontaine > --- > package/tinifier/tinifier.hash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:10:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:10:18 +0100 Subject: [Buildroot] Diagnosing conflicts due to new Python version In-Reply-To: References: Message-ID: <20220111211018.4d236002@windsurf> Hello Grant, On Tue, 11 Jan 2022 16:11:41 -0000 (UTC) Grant Edwards wrote: > It seems that every time a new Python version is unmasks, it breaks > things. > > This time it's a python-exec version conflict that prevents emerge > -u. FAICT, Python 3.10 requires python-exec 2.4.8, and some other > package requires 2.4.6. > > I've fixed things temporarily with: > > package.use: > > */* PYTHON_TARGETS: -python3_10 > */* PYTHON_SINGLE_TARGET -python3_10 > > package.mask: > > =dev-lang/python-3.10 > > No, at least I can continue to update the machine. I am confused by your e-mail. It seems to be a Gentoo question, but you sent it to the Buildroot mailing list. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Tue Jan 11 20:11:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 21:11:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs dynamic library Message-ID: <20220111201129.2568175-1-fontaine.fabrice@gmail.com> libglvnd needs dynamic library since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: /libglvnd_pthread.a.p/glvnd_pthread.c.o -c ../src/util/glvnd_pthread.c ../src/util/glvnd_pthread.c:33:10: fatal error: dlfcn.h: No such file or directory 33 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c5e92f0b355c91cdcebe0070499889473996f337 Signed-off-by: Fabrice Fontaine --- package/libglvnd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index acf6247e94..2d99be8632 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" + depends on !BR2_STATIC_LIBS # dlfcn.h help The GL Vendor-Neutral Dispatch library @@ -42,3 +43,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_GLES endif + +comment "libglvnd needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Jan 11 20:13:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:13:16 +0100 Subject: [Buildroot] [PATCH 1/2] board/andes: rearrange nds32 folder structure In-Reply-To: <20220111035859.12895-1-peterlin@andestech.com> References: <20220111035859.12895-1-peterlin@andestech.com> Message-ID: <20220111211316.7f94cb45@windsurf> Hello Yu, On Tue, 11 Jan 2022 11:58:58 +0800 Yu Chien Peter Lin wrote: > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao > --- > .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 > board/andes/{ => ae3xx}/readme.txt | 0 > configs/andes_ae3xx_defconfig | 2 +- > 3 files changed, 1 insertion(+), 1 deletion(-) > rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > rename board/andes/{ => ae3xx}/readme.txt (100%) Thanks for your patch. However, I am a bit confused, because after your two patches, we will have: board/andes/ae3xx/ => the NDS32 platform board/andes/ae350/ => the RISC-V platform but the ae3xx wildcard matches ae350, so it feels really odd. Could you clarify? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:21:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:21:44 +0100 Subject: [Buildroot] [PATCH 2/2] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220111035859.12895-2-peterlin@andestech.com> References: <20220111035859.12895-1-peterlin@andestech.com> <20220111035859.12895-2-peterlin@andestech.com> Message-ID: <20220111212144.5ed9fc6f@windsurf> Hello Yu, On Tue, 11 Jan 2022 11:58:59 +0800 Yu Chien Peter Lin wrote: > This patch provides defconfig and basic support for the Andes > 45 series RISC-V architecture. > > Signed-off-by: Yu Chien Peter Lin > Signed-off-by: Alan Kao Thanks for your patch! See below a number of comments. > --- > DEVELOPERS | 3 +- > board/andes/ae350/ae350.dts | 274 ++ > board/andes/ae350/boot.cmd | 3 + > board/andes/ae350/genimage_sdcard.cfg | 29 + > board/andes/ae350/linux.config.fragment | 2 + > .../0001-Add-AE350-platform-defconfig.patch | 158 + > ...002-Andes-support-for-Faraday-ATCMAC.patch | 510 +++ > .../0003-Andes-support-for-ATCDMAC.patch | 3301 +++++++++++++++++ > .../linux/0004-Andes-support-for-FTSDC.patch | 1884 ++++++++++ > ...5-Non-cacheability-and-Cache-support.patch | 1132 ++++++ > ...-Add-andes-sbi-call-vendor-extension.patch | 231 ++ > ...e-update-function-local_flush_tlb_al.patch | 101 + > ...rt-time32-stat64-sys_clone3-syscalls.patch | 47 + > .../0009-dma-Support-smp-up-with-dma.patch | 120 + > ...ix-atcdmac300-chained-irq-mapping-is.patch | 300 ++ > .../linux/0011-DMA-Add-msb-bit-patch.patch | 387 ++ > .../0012-Remove-unused-Andes-SBI-call.patch | 147 + > ...isable-PIC-explicitly-for-assembling.patch | 29 + > ...2-Enable-cache-for-opensbi-jump-mode.patch | 25 + > ...001-Fix-mmc-no-partition-table-error.patch | 27 + > ...2-Prevent-fw_dynamic-from-relocation.patch | 27 + > ...0003-Fix-u-boot-proper-booting-issue.patch | 26 + > ...04-Enable-printing-OpenSBI-boot-logo.patch | 25 + That is really a *huge* number of patches, and some of them are very large. I'm not sure we want all of them in Buildroot. It's of course nice to see that it allows your defconfig to use the upstream Linux kernel, but I think at this point it would be nicer to have a Git repository with your Linux kernel code, and fetch that code. Have all those patches been submitted to their respective upstream projects? > diff --git a/DEVELOPERS b/DEVELOPERS > index 12777e8d61..18b0444c72 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2122,10 +2122,11 @@ N: Norbert Lange > F: package/systemd/ > F: package/tcf-agent/ > > -N: Nylon Chen > +N: Yu Chien Peter Lin It would be nicer to have a separate patch to re-assign yourself on this DEVELOPERS entry. > F: arch/Config.in.nds32 > F: board/andes > F: configs/andes_ae3xx_defconfig > +F: configs/ae350_andestar45_defconfig It would probably be nicer to have a defconfig that starts with "andes", to match the previous defconfig? > diff --git a/board/andes/ae350/linux.config.fragment b/board/andes/ae350/linux.config.fragment > new file mode 100644 > index 0000000000..299b75d2f4 > --- /dev/null > +++ b/board/andes/ae350/linux.config.fragment > @@ -0,0 +1,2 @@ > +CONFIG_INITRAMFS_SOURCE="" > +CONFIG_EFI_PARTITION=y It feels quite odd that you need a linux configuration fragment, while just below there is a patch adding the Linux kernel defconfig. Why not adjust the Linux kernel defconfig directly? > diff --git a/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch b/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch > new file mode 100644 > index 0000000000..1384369972 > --- /dev/null > +++ b/board/andes/ae350/patches/linux/0001-Add-AE350-platform-defconfig.patch > @@ -0,0 +1,158 @@ > +From 8a9097c1be79fdab3d907a8bbc66a222807cb81a Mon Sep 17 00:00:00 2001 > +From: Yu Chien Peter Lin > +Date: Tue, 28 Dec 2021 09:05:34 +0800 > +Subject: [PATCH 01/12] Add AE350 platform defconfig Please use "git format-patch -N" to generate patches. > diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt > new file mode 100644 > index 0000000000..19cfa721a7 > --- /dev/null > +++ b/board/andes/ae350/readme.txt > @@ -0,0 +1,66 @@ > +Intro > +===== > + > +Andestech AE350 Platform > + > +The AE350 prototype demonstrates the AE350 platform on the FPGA. Is this platform publicly available? The way I read this sentence, it seems like it's an internal prototyping platform. If that's the case, I'm not sure what's the value for you to upstream these patches in Buildroot, and what's the value for Buildroot to have this defconfig. > diff --git a/configs/ae350_andestar45_defconfig b/configs/ae350_andestar45_defconfig > new file mode 100644 > index 0000000000..fb4587b1a7 > --- /dev/null > +++ b/configs/ae350_andestar45_defconfig > @@ -0,0 +1,46 @@ > +BR2_riscv=y > +BR2_riscv_custom=y > +BR2_RISCV_ISA_CUSTOM_RVM=y > +BR2_RISCV_ISA_CUSTOM_RVF=y > +BR2_RISCV_ISA_CUSTOM_RVD=y > +BR2_RISCV_ISA_CUSTOM_RVC=y > +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" > +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y Any reason to override the default C library? > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_BINUTILS_VERSION_2_37_X=y > +BR2_GCC_VERSION_11_X=y > +BR2_GCC_ENABLE_OPENMP=y Please keep the default binutils and gcc version, and don't enable OpenMP support. The defconfigs should be minimal. > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.84" > +BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae350/linux.config.fragment" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" > +BR2_PACKAGE_OPENSSL=y Please remove OpenSSL. > +BR2_TARGET_ROOTFS_CPIO=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y Why both cpio and ext4 ? Only one of them should be needed. > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_PLAT="andes/ae350" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/andes/ae350/boot.cmd" Could you rework your patch to take into account those comments and post an updated version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:32:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:32:38 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: fix musl build Message-ID: <20220111202622.EC60F83465@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f363bc2958812539cf248f6cf44fe519445adf7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following musl build failure raised since bump to version 5.15.1 in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: In file included from /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, from ./kerncompat.h:31, from common/utils.c:42: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' 7 | struct sysinfo { | ^~~~~~~ In file included from common/utils.c:27: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here 10 | struct sysinfo { | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ux-const-h-to-fix-build-with-5-12-headers.patch | 43 +++++++++++++++++++ ...clude-sys-sysinfo-h-conditionally-on-musl.patch | 49 ++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch new file mode 100644 index 0000000000..b6c1a42456 --- /dev/null +++ b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch @@ -0,0 +1,43 @@ +From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Thu, 30 Dec 2021 15:23:59 +0200 +Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ + headers + +btrfs-tools compile fails with mips, musl and 5.12+ headers. + +The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we +add an explicit include of const.h to pickup the macro: + + | make: *** [Makefile:595: mkfs.btrfs] Error 1 + | make: *** Waiting for unfinished jobs.... + | libbtrfs.a(volumes.o): in function `dev_extent_search_start': + | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' + | collect2: error: ld returned 1 exit status + +This is safe for older kernel's as well, since the header still +exists, and is valid to include. + +Signed-off-by: Bruce Ashfield +[remove invalid OE Upstream-status] +Signed-off-by: Stijn Tintel +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] +Signed-off-by: Fabrice Fontaine +--- + kerncompat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kerncompat.h b/kerncompat.h +index df167fe6c..2503d1afa 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch new file mode 100644 index 0000000000..7473fe67cb --- /dev/null +++ b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch @@ -0,0 +1,49 @@ +From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 8 Jan 2022 22:44:44 +0100 +Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl + +Make inclusion of sys/sysinfo.h conditional to avoid the following build +failure on musl: + +In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, + from ./kerncompat.h:31, + from common/utils.c:42: +.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' + 7 | struct sysinfo { + | ^~~~~~~ +In file included from common/utils.c:27: +.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + 10 | struct sysinfo { + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc + +The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, +while both must not be included at the same time. Stop including +linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and +causes the double definition for some reason. As we now include +linux/const.h directly, there's no other effective change. + +Pull-request: #433 +Signed-off-by: Fabrice Fontaine +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] +--- + kerncompat.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 2503d1afa..6ca1526e2 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #include + #include + From thomas.petazzoni at bootlin.com Tue Jan 11 20:32:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:32:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix musl build In-Reply-To: <20220110225200.2000095-1-fontaine.fabrice@gmail.com> References: <20220110225200.2000095-1-fontaine.fabrice@gmail.com> Message-ID: <20220111213254.0073693d@windsurf> On Mon, 10 Jan 2022 23:52:00 +0100 Fabrice Fontaine wrote: > Fix the following musl build failure raised since bump to version 5.15.1 > in commit 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359: > > In file included from /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, > from ./kerncompat.h:31, > from common/utils.c:42: > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' > 7 | struct sysinfo { > | ^~~~~~~ > In file included from common/utils.c:27: > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here > 10 | struct sysinfo { > | ^~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc > > Signed-off-by: Fabrice Fontaine > --- > ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ++++++++++++++++ > ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 +++++++++++++++++++ > 2 files changed, 92 insertions(+) > create mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch > create mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:33:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:33:03 +0100 Subject: [Buildroot] [git commit] package/assimp: bump version to 5.1.6 Message-ID: <20220111202939.7D6F58324B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7194084e99676a1792e5ff7b8dfc6469337508e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/assimp/assimp/releases/tag/v5.1.6 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 8f6d613bb4..50f0b3e6d6 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced assimp-5.1.5.tar.gz +sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index b5f84ef56f..766b2c9b5a 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.5 +ASSIMP_VERSION = 5.1.6 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Jan 11 20:36:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:36:06 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.1.6 In-Reply-To: <20220110220515.10921-1-ps.report@gmx.net> References: <20220110220515.10921-1-ps.report@gmx.net> Message-ID: <20220111213606.44a74adc@windsurf> On Mon, 10 Jan 2022 23:05:15 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] https://github.com/assimp/assimp/releases/tag/v5.1.6 > > Signed-off-by: Peter Seiderer > --- > package/assimp/assimp.hash | 2 +- > package/assimp/assimp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:36:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:36:16 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: bump version to 20211216 Message-ID: <20220111203000.8E9288324B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdb390085f212f3d6a243249cccb32bff018ea93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - update hash of WHENCE file Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.hash | 4 ++-- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 4c73374138..83275ec6d7 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 2fb22a5d7d23bf1f5800ab8152b39a00a445fbf4923de5a01b59d3f6253f0a9f linux-firmware-20210919.tar.xz +sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 a06edfd3649df6b0cbac8304d6d53f661963381f1231fd02da259806763d4162 WHENCE +sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b 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 ac45bc8282..2d103df05c 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20210919 +LINUX_FIRMWARE_VERSION = 20211216 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES From thomas.petazzoni at bootlin.com Tue Jan 11 20:36:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:36:28 +0100 Subject: [Buildroot] [PATCH v1] package/linux-firmware: bump version to 20211216 In-Reply-To: <20220110214356.14562-1-ps.report@gmx.net> References: <20220110214356.14562-1-ps.report@gmx.net> Message-ID: <20220111213628.53f85a7e@windsurf> On Mon, 10 Jan 2022 22:43:56 +0100 Peter Seiderer wrote: > - update hash of WHENCE file > > Signed-off-by: Peter Seiderer > --- > package/linux-firmware/linux-firmware.hash | 4 ++-- > package/linux-firmware/linux-firmware.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:37:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:37:28 +0100 Subject: [Buildroot] [git commit] configs/qemu_ppc64le_powernv8: new defconfig Message-ID: <20220111203211.C07FD81476@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d914839a4ff8c1dd4672b68dac445634cce230f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PowerNV is the platform using the OPAL [1] firmware on OpenPOWER systems. OPAL first loads a kernel and an initramfs image based on buildroot including a second boot loader petitboot [2]. The latter does device discovery and kexecs a new Linux image from disk or network. QEMU implements PowerNV machines [3] for the POWER8, POWER9 and Power10 processors which are used for dev and tests. POWER8 images being compatible with POWER9 and Power10, simply add a single qemu_ppc64le_powernv8 board for all. The QEMU script boots directly from a nvme disk because it is simple enough but a real system would boot from a ramfs first. [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst [2] https://github.com/open-power/petitboot/ [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html Signed-off-by: C??dric Le Goater Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 44911a7d94..bac58ffc7b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -504,6 +504,10 @@ F: package/libsvg-cairo/ N: C??dric Ch??pied F: package/znc/ +N: C??dric Le Goater +F: board/qemu/ppc64le-powernv8/readme.txt +F: configs/qemu_ppc64le_powernv8_defconfig + N: Charles Hardin F: package/alsa-plugins/ diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt new file mode 100644 index 0000000000..059f55fbc9 --- /dev/null +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig + +The login prompt will appear in the terminal window. diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig new file mode 100644 index 0000000000..d8ea6655fc --- /dev/null +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -0,0 +1,29 @@ +# Architecture +BR2_powerpc64le=y +BR2_powerpc_power8=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="hvc0" +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="powernv" +BR2_LINUX_KERNEL_VMLINUX=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From yann.morin.1998 at free.fr Tue Jan 11 20:38:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 21:38:48 +0100 Subject: [Buildroot] [git commit] package/libglvnd: needs dynamic library Message-ID: <20220111203235.0A4A681476@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=965d19386dfa0659ed0b1668085df1918b020281 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libglvnd needs dynamic library since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: /libglvnd_pthread.a.p/glvnd_pthread.c.o -c ../src/util/glvnd_pthread.c ../src/util/glvnd_pthread.c:33:10: fatal error: dlfcn.h: No such file or directory 33 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/c5e92f0b355c91cdcebe0070499889473996f337 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libglvnd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index acf6247e94..2d99be8632 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" + depends on !BR2_STATIC_LIBS # dlfcn.h help The GL Vendor-Neutral Dispatch library @@ -42,3 +43,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES default "libglvnd" if BR2_PACKAGE_LIBGLVND_DISPATCH_GLES endif + +comment "libglvnd needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS From thomas.petazzoni at bootlin.com Tue Jan 11 20:44:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:44:33 +0100 Subject: [Buildroot] [git commit] configs/qemu_ppc_bamboo: new defconfig Message-ID: <20220111203818.65DDF832DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ac0775130426e1ebc6d291bb3b131e19afc92fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Bamboo board is an evaluation board for PowerPC 440EP CPUs. Signed-off-by: C??dric Le Goater Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ board/qemu/ppc-bamboo/linux.fragment | 6 ++++++ board/qemu/ppc-bamboo/readme.txt | 5 +++++ configs/qemu_ppc_bamboo_defconfig | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bac58ffc7b..c8242df8a6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -505,7 +505,9 @@ N: C??dric Ch??pied F: package/znc/ N: C??dric Le Goater +F: board/qemu/ppc-bamboo/ F: board/qemu/ppc64le-powernv8/readme.txt +F: configs/qemu_ppc_bamboo_defconfig F: configs/qemu_ppc64le_powernv8_defconfig N: Charles Hardin diff --git a/board/qemu/ppc-bamboo/linux.fragment b/board/qemu/ppc-bamboo/linux.fragment new file mode 100644 index 0000000000..cc272d0541 --- /dev/null +++ b/board/qemu/ppc-bamboo/linux.fragment @@ -0,0 +1,6 @@ +# Enable virtio (blk, rng and net devices) +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_NET=y diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt new file mode 100644 index 0000000000..0b70d2fa54 --- /dev/null +++ b/board/qemu/ppc-bamboo/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + +qemu-system-ppc -nographic -M bamboo -kernel vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig + +The login prompt will appear in the terminal that started Qemu. diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig new file mode 100644 index 0000000000..d6abbeb452 --- /dev/null +++ b/configs/qemu_ppc_bamboo_defconfig @@ -0,0 +1,36 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_440fp=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" +BR2_LINUX_KERNEL_VMLINUX=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From thomas.petazzoni at bootlin.com Tue Jan 11 20:44:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:44:33 +0100 Subject: [Buildroot] [git commit] package/qemu: add support for PPC970 processors Message-ID: <20220111203818.6EEF7834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0662d0ec61e83581a96f162bb32637c01304a47d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PPC970 processors are well supported by the QEMU pseries and macbook machines. The latest debian 11 (big endian) runs with SMP. Re-add support. Fixes: efc67deef38c ("qemu: remove support for some PowerPC processors in host qemu") Signed-off-by: C??dric Le Goater Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index df5d921125..f9cdb9b703 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -22,7 +22,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_xtensa default y if BR2_x86_64 depends on !BR2_x86_steamroller && !BR2_x86_core_avx2 - depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 + depends on !BR2_powerpc_620 && !BR2_powerpc_630 config BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS bool From thomas.petazzoni at bootlin.com Tue Jan 11 20:45:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:45:09 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration In-Reply-To: <20220110210235.817082-1-clg@kaod.org> References: <20220110210235.817082-1-clg@kaod.org> Message-ID: <20220111214509.79c5c88e@windsurf> Hello C?dric, On Mon, 10 Jan 2022 22:02:33 +0100 C?dric Le Goater wrote: > PowerNV is the platform using the OPAL [1] firmware on OpenPOWER > systems. OPAL first loads a kernel and an initramfs image based on > buildroot including a second boot loader petitboot [2]. The latter > does device discovery and kexecs a new Linux image from disk or > network. > > QEMU implements PowerNV machines [3] for the POWER8, POWER9 and > Power10 processors which are used for dev and tests. POWER8 images > being compatible with POWER9 and Power10, simply add a single > qemu_ppc64le_powernv8 board for all. > > The QEMU script boots directly from a nvme disk because it is simple > enough but a real system would boot from a ramfs first. > > [1] https://github.com/open-power/skiboot/blob/master/doc/overview.rst > [2] https://github.com/open-power/petitboot/ > [3] https://qemu.readthedocs.io/en/latest/system/ppc/powernv.html > > Signed-off-by: C?dric Le Goater > --- > board/qemu/ppc64le-powernv8/readme.txt | 5 +++++ > configs/qemu_ppc64le_powernv8_defconfig | 29 +++++++++++++++++++++++++ > 2 files changed, 34 insertions(+) > create mode 100644 board/qemu/ppc64le-powernv8/readme.txt > create mode 100644 configs/qemu_ppc64le_powernv8_defconfig Thanks, entire patch series applied. One small change was done: add appropriate entries to the DEVELOPERS file, so that we know who to contact for those defconfigs :-) Especially if our Gitlab CI infrastructure detects build issues, you will be notified. Since you are a PowerPC expert, I'd like to take this opportunity to ask you about the toolchains we're providing at https://toolchains.bootlin.com/. For the moment for PowerPC, we are providing the following toolchains: powerpc-440fp, not tested powerpc64-e5500, tested with qemu_ppc64_e5500_defconfig powerpc64-e6500, not tested powerpc64le-power8, tested with qemu_ppc64le_pseries_defconfig powerpc64-power8, tested with qemu_ppc64_pseries_defconfig powerpc-e300c3, not tested powerpc-e500mc, not tested I suppose I could now test the powerpc-440fp toolchain with the qemu_ppc_bamboo_defconfig you have added. Is that correct? What about the other toolchain configurations? Is there some matching Qemu emulation? And generally speaking, does this selection of PowerPC architecture variants make sense to offer pre-compiled toolchains? For quite a while, we've had requests for other PowerPC variants: https://github.com/bootlin/toolchains-builder/issues/2. Your input would be very welcome :-) Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Jan 11 20:48:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 21:48:23 +0100 Subject: [Buildroot] [git commit] package/python-pyparsing: needs python3 Message-ID: <20220111204311.E3062834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4705dfdd43d9e62c11d42bc2fb3f6600a5a7e33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-pyparsing dropped python2 support since version 3.0.0: https://github.com/pyparsing/pyparsing/blob/master/docs/whats_new_in_3_0_0.rst#python-2-x-no-longer-supported resulting in the following build failure since bump to version 3.0.6 in commit 7affc7827aee0e07ec94d3b4d91c2e23bda8d937: File "setup.py", line 8, in from pyparsing import __version__ as pyparsing_version File "/home/buildroot/autobuild/instance-0/output-1/build/python-pyparsing-3.0.6/pyparsing/__init__.py", line 100 major: int ^ SyntaxError: invalid syntax Fixes: - http://autobuild.buildroot.org/results/8ac5224f4b6c2c59035dbfb53541e76f58b15e47 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-httplib2/Config.in | 7 +++---- package/python-pyparsing/Config.in | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in index 39671f2386..0095d95b51 100644 --- a/package/python-httplib2/Config.in +++ b/package/python-httplib2/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_PYTHON_HTTPLIB2 bool "python-httplib2" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 # python-pyparsing + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL select BR2_PACKAGE_PYTHON_PYPARSING # runtime help httplib2 is a comprehensive HTTP client library, httplib2.py diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 926ca07ed7..9b5894116d 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYPARSING bool "python-pyparsing" + depends on BR2_PACKAGE_PYTHON3 help The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc From yann.morin.1998 at free.fr Tue Jan 11 20:51:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 21:51:38 +0100 Subject: [Buildroot] [git commit] package/ell: bump version to 0.47 Message-ID: <20220111204945.9B93C8345B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84781152c98ceff1c6872d1b87cf59f2fca45af8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Changelog (since 0.46, from [1]): ver 0.47: Fix issue with memory leaking from DHCP leases. Fix issue with NULL terminating of Base64 encoding. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 20b568dde4..cd724eae2d 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 f4fc647eff32f622e21f8851ed0c8b7270f4800149c91be601754e22d82cbb4d ell-0.46.tar.xz +sha256 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 4fad6e8d1b..3ce64b6f2f 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.46 +ELL_VERSION = 0.47 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Tue Jan 11 20:55:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 21:55:53 +0100 Subject: [Buildroot] [git commit] package/iwd: bump version to 1.21 Message-ID: <20220111204945.A3BE5832DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a3bdbb88094a7ffc2edc5d94cb2f7af8be360b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add 0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch - Changelog (since 1.20, from [1]): ver 1.21: Fix issue with handling disconnect events issued by AP. Add experimental support for DPP feature. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...licit-declaration-of-function-explicit_bz.patch | 41 ++++++++++++++++++++++ package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch new file mode 100644 index 0000000000..6b9cfb3e70 --- /dev/null +++ b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch @@ -0,0 +1,41 @@ +From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 10 Jan 2022 22:32:18 +0100 +Subject: [PATCH 1/1] dpp: fix implicit declaration of function explicit_bzero + warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- add missing src/missing.h include for explicit_bzero, fixes uclibc + compile/linking + +Fixes: + + src/dpp.c:166:2: warning: implicit declaration of function ???explicit_bzero??? [-Wimplicit-function-declaration] + 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); + | ^~~~~~~~~~~~~~ + +[backport from upstream] +Signed-off-by: Peter Seiderer +[yann.morin.1998 at free.fr: actual backport now upstreamn applied] +Signed-off-by: Yann E. MORIN +--- + src/dpp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dpp.c b/src/dpp.c +index 84e89f6c..8091ded1 100644 +--- a/src/dpp.c ++++ b/src/dpp.c +@@ -30,6 +30,7 @@ + + #include "linux/nl80211.h" + ++#include "src/missing.h" + #include "src/dbus.h" + #include "src/netdev.h" + #include "src/module.h" +-- +2.34.1 + diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 58224170e6..8e34d2983f 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz +sha256 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 42f176b05b..a70da86ecc 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.20 +IWD_VERSION = 1.21 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Tue Jan 11 20:59:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:59:12 +0100 Subject: [Buildroot] [PATCH] support/download: drop support for the 'none' hash In-Reply-To: <61dcb681410a7_8fcfa78-19a@xultri.mail> References: <20220110162319.294088-1-yann.morin.1998@free.fr> <61dcb681410a7_8fcfa78-19a@xultri.mail> Message-ID: <20220111215912.40bea95e@windsurf> On Mon, 10 Jan 2022 19:43:13 -0300 ricardo.martincoski at gmail.com wrote: > Hello Yann, > > On Mon, Jan 10, 2022 at 01:23 PM, Yann E. MORIN wrote: > > [snip] > > --- > > docs/manual/adding-packages-directory.txt | 9 +-------- > > support/download/check-hash | 4 ---- > > 2 files changed, 1 insertion(+), 12 deletions(-) > > Another file to change: > utils/checkpackagelib/lib_hash.py: if htype == "none": Good point, I fixed that when applying. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 20:59:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:59:22 +0100 Subject: [Buildroot] [git commit] package/cryptopp: needs wchar Message-ID: <20220111205334.07D6A834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7425450ba27ecd3dacf795e42bb70ef0c98684e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: In file included from seckey.h:11, from 3way.h:10, from 3way.cpp:5: misc.h:1528:6: error: 'wstring' in namespace 'std' does not name a type 1528 | std::wstring StringWiden(const char *str, bool throwOnError = true); | ^~~~~~~ In file included from seckey.h:11, from 3way.h:10, from 3way.cpp:5: misc.h:14:1: note: 'std::wstring' is defined in header ''; did you forget to '#include '? 13 | #include "smartptr.h" +++ |+#include 14 | #include "stdcpp.h" Fixes: - http://autobuild.buildroot.org/results/174fe03da7a40dd152703de93af6a213d9cac698 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cryptopp/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index 4ead5339ab..feb945db2f 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_CRYPTOPP bool "cryptopp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR help A free C++ class library of cryptographic schemes -comment "cryptopp needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "cryptopp needs a toolchain w/ dynamic library, wchar" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR From thomas.petazzoni at bootlin.com Tue Jan 11 20:58:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:58:01 +0100 Subject: [Buildroot] [git commit] support/download: drop support for the 'none' hash Message-ID: <20220111205334.0013A82BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5da82181846b81a967c48f02f7404812a8acd60a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 1ba85b7f874d (support/download: add explicit no-hash support) introduced the 'none' hash type, in an attempt to make hash files mandatory, but not failing on archives localy generated, like those for git or svn repositories, especially for those packages where a version choice was present, which would allow for either remote archives for which we'd have a hash or VCS trees for which we could not have a hash for the localy generated archive. Indeed, back in the time, we did not have a mean to generate reproducible archives, so having a hash file without a hash for thosel ocally generated archives would trigger an error in the hash-checking machinery. But now, low-and-behold, we do know how to generate those archives, and we have a mechanism to explicitly exclude some archives from being hash-checked (e.g. when the version string itself can be user-provided). As such, the 'none' hash type no longer has any raison d'??tre, we do not use it in-tree, and its use in a br2-external tree is most probably inexistent (as is the use of hash files alotgether most probably). So we simply drop the support for that. Signed-off-by: Yann E. MORIN [Thomas: drop support in checkpackagelib, as reported by Ricardo.] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.txt | 9 +-------- support/download/check-hash | 4 ---- utils/checkpackagelib/lib_hash.py | 2 -- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 4ceb3fd772..6c68d7aa67 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -464,9 +464,8 @@ The format of this file is one line for each file for which to check the hash, each line with the following three fields separated by two spaces: * the type of hash, one of: -** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+, +none+ +** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+ * the hash of the file: -** for +none+, one or more non-space chars, usually just the string +xxx+ ** for +md5+, 32 hexadecimal characters ** for +sha1+, 40 hexadecimal characters ** for +sha224+, 56 hexadecimal characters @@ -500,9 +499,6 @@ target run. For a package with multiple versions (like Qt5), create the hash file in a subdirectory ++ of that package (see also xref:patch-apply-order[]). -The +none+ hash type is reserved to those archives downloaded from a -repository, like a 'git clone', a 'subversion checkout'... - The example below defines a +sha1+ and a +sha256+ published by upstream for the main +libfoo-1.2.3.tar.bz2+ tarball, an +md5+ from upstream and a locally-computed +sha256+ hashes for a binary blob, a +sha256+ for a @@ -520,9 +516,6 @@ sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo # Locally computed: sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch -# No hash for 1234: -none xxx libfoo-1234.tar.gz - # Hash for license files: sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL diff --git a/support/download/check-hash b/support/download/check-hash index fe9c10570e..5a47f49bc3 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -53,11 +53,7 @@ check_one_hash() { # Note: md5 is supported, but undocumented on purpose. # Note: sha3 is not supported, since there is currently no implementation # (the NIST has yet to publish the parameters). - # Note: 'none' means there is explicitly no hash for that file. case "${_h}" in - none) - return 0 - ;; md5|sha1) ;; sha224|sha256|sha384|sha512) ;; *) # Unknown hash, exit with error diff --git a/utils/checkpackagelib/lib_hash.py b/utils/checkpackagelib/lib_hash.py index 698d24fd6b..1c595e84b8 100644 --- a/utils/checkpackagelib/lib_hash.py +++ b/utils/checkpackagelib/lib_hash.py @@ -41,8 +41,6 @@ class HashType(_CheckFunction): return htype, hexa = fields[:2] - if htype == "none": - return if htype not in self.len_of_hash.keys(): return ["{}:{}: unexpected type of hash ({}#adding-packages-hash)" .format(self.filename, lineno, self.url_to_manual), From thomas.petazzoni at bootlin.com Tue Jan 11 20:59:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:59:27 +0100 Subject: [Buildroot] [git commit] package/cryptopp: disable neon if needed Message-ID: <20220111205334.0FC89834E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81945bde7c282d0ab5f304dc9795e2d68033cd98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit bf4cf9de833e2d571d98d1ca935ea08a3468e463: In file included from aria_simd.cpp:18:0: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/lib/gcc/arm-none-linux-gnueabi/4.8.3/include/arm_neon.h:32:2: error: #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h ^ Fixes: - http://autobuild.buildroot.org/results/e4fd947c118174a4fad62cbed18816f02d39ec25 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cryptopp/cryptopp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 5e6eb9644d..4353e35e0a 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -47,6 +47,10 @@ ifneq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),y) CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_AVX2 endif +ifneq ($(BR2_ARM_CPU_HAS_NEON),y) +CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_ARM_NEON +endif + CRYPTOPP_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ CXXFLAGS="$(CRYPTOPP_CXXFLAGS)" From thomas.petazzoni at bootlin.com Tue Jan 11 21:00:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:00:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: needs wchar In-Reply-To: <20220110173542.1748804-1-fontaine.fabrice@gmail.com> References: <20220110173542.1748804-1-fontaine.fabrice@gmail.com> Message-ID: <20220111220007.50a69ce1@windsurf> On Mon, 10 Jan 2022 18:35:42 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since commit > bf4cf9de833e2d571d98d1ca935ea08a3468e463: > > In file included from seckey.h:11, > from 3way.h:10, > from 3way.cpp:5: > misc.h:1528:6: error: 'wstring' in namespace 'std' does not name a type > 1528 | std::wstring StringWiden(const char *str, bool throwOnError = true); > | ^~~~~~~ > In file included from seckey.h:11, > from 3way.h:10, > from 3way.cpp:5: > misc.h:14:1: note: 'std::wstring' is defined in header ''; did you forget to '#include '? > 13 | #include "smartptr.h" > +++ |+#include > 14 | #include "stdcpp.h" > > Fixes: > - http://autobuild.buildroot.org/results/174fe03da7a40dd152703de93af6a213d9cac698 > > Signed-off-by: Fabrice Fontaine > --- > package/cryptopp/Config.in | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:00:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:00:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/cryptopp: disable neon if needed In-Reply-To: <20220110173640.1748895-1-fontaine.fabrice@gmail.com> References: <20220110173640.1748895-1-fontaine.fabrice@gmail.com> Message-ID: <20220111220010.75401b91@windsurf> On Mon, 10 Jan 2022 18:36:40 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since commit > bf4cf9de833e2d571d98d1ca935ea08a3468e463: > > In file included from aria_simd.cpp:18:0: > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/lib/gcc/arm-none-linux-gnueabi/4.8.3/include/arm_neon.h:32:2: error: #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h > #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h > ^ > > Fixes: > - http://autobuild.buildroot.org/results/e4fd947c118174a4fad62cbed18816f02d39ec25 > > Signed-off-by: Fabrice Fontaine > --- > package/cryptopp/cryptopp.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:01:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:01:40 +0100 Subject: [Buildroot] [git commit] package/mbedtls: fix build with gcc 4.8 Message-ID: <20220111205543.4DCF682DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef4dfe8fcee9fff152d938619562776a9ae03c18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since bump to version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c: In function 'mpi_select': /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: error: 'for' loop initial declarations are only allowed in C99 mode for( size_t i = 0; i < T_size; i++ ) ^ /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: - http://autobuild.buildroot.org/results/56ac0a8726d09eed8f45f865934fa7781a0e667a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mbedtls/mbedtls.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 5facb99b2a..8745ff33f4 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -7,6 +7,7 @@ MBEDTLS_VERSION = 2.28.0 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF From thomas.petazzoni at bootlin.com Tue Jan 11 21:01:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:01:58 +0100 Subject: [Buildroot] [git commit] boot/uboot: bump to version 2022.01 Message-ID: <20220111205543.56E39834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf009f31ef317af3ca9f9f5508a818f871b4159e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index bffb7cfb19..c630fc6552 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2021.10" + bool "2022.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2021.10" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 68259f69f2..9171a794a1 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4 u-boot-2021.10.tar.bz2 +sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt From thomas.petazzoni at bootlin.com Tue Jan 11 21:02:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:02:08 +0100 Subject: [Buildroot] [PATCH] boot/uboot: bump to version 2022.01 In-Reply-To: <20220110194439.1809166-1-festevam@gmail.com> References: <20220110194439.1809166-1-festevam@gmail.com> Message-ID: <20220111220208.3faa3a86@windsurf> On Mon, 10 Jan 2022 16:44:39 -0300 Fabio Estevam wrote: > Signed-off-by: Fabio Estevam > --- > boot/uboot/Config.in | 4 ++-- > boot/uboot/uboot.hash | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:02:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:02:18 +0100 Subject: [Buildroot] [git commit] configs/mx6cubox: bump Linux and U-Boot versions Message-ID: <20220111205604.1310E82DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcbd1ed224ac61cc7be8db0f5eb5f26da4e2ddc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/mx6cubox_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index e80d995525..6ea4f6e416 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -6,8 +6,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y # Toolchain -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.70" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" @@ -32,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From thomas.petazzoni at bootlin.com Tue Jan 11 21:02:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:02:29 +0100 Subject: [Buildroot] [PATCH] configs/mx6cubox: bump Linux and U-Boot versions In-Reply-To: <20220110195131.78165-1-francois.perrad@gadz.org> References: <20220110195131.78165-1-francois.perrad@gadz.org> Message-ID: <20220111220229.6a2ab660@windsurf> On Mon, 10 Jan 2022 20:51:31 +0100 Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > configs/mx6cubox_defconfig | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:14 +0100 Subject: [Buildroot] [git commit] package/musl: disable LTO unconditionally Message-ID: <20220111205658.B50F3834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5a4de201bf0f747ba438c6f1d45fb4bd2c4dfbc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered for glibc, but all C libraries, like musl, are impacted, for very similar reasons. Disable LTO unconditionally for musl too. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/musl/musl.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/musl/musl.mk b/package/musl/musl.mk index d4f26b50a7..b89945e3be 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -26,6 +26,12 @@ MUSL_ADD_TOOLCHAIN_DEPENDENCY = NO MUSL_INSTALL_STAGING = YES +# musl does not build with LTO, so explicitly disable it +# when using a compiler that may have support for LTO +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +MUSL_EXTRA_CFLAGS += -fno-lto +endif + # Thumb build is broken, build in ARM mode, since all architectures # that support Thumb1 also support ARM. ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:10 +0100 Subject: [Buildroot] [git commit] package/uclibc: disable LTO unconditionally Message-ID: <20220111205658.AD1DE82DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54bd9691c876ff12780a3d6e7f8de900d8cbd14e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered for glibc, but all C libraries, like uClibc-NG, are impacted, for very similar reasons. Disable LTO unconditionally for uClibc-NG too. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/uclibc/uclibc.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 87e283de2a..0feedb6cfa 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -362,10 +362,18 @@ endif # Commands # +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) + +# uClibc-ng does not build with LTO, so explicitly disable it +# when using a compiler that may have support for LTO +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) +UCLIBC_EXTRA_CFLAGS += -fno-lto +endif + UCLIBC_MAKE_FLAGS = \ ARCH="$(UCLIBC_TARGET_ARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \ + UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS)" \ HOSTCC="$(HOSTCC)" define UCLIBC_KCONFIG_FIXUP_CMDS From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:27 +0100 Subject: [Buildroot] [PATCH 1/2] package/uclibc: disable LTO unconditionally In-Reply-To: <20220110091036.4165679-1-yann.morin.1998@free.fr> References: <20220110091036.4165679-1-yann.morin.1998@free.fr> Message-ID: <20220111220327.4819a1ba@windsurf> On Mon, 10 Jan 2022 10:10:35 +0100 "Yann E. MORIN" wrote: > Recent commit b7a00b39bca0 (package/glibc: force -fno-lto) only catered > for glibc, but all C libraries, like uClibc-NG, are impacted, for very > similar reasons. > > Disable LTO unconditionally for uClibc-NG too. > > Signed-off-by: Yann E. MORIN > Cc: Norbert Lange > --- > package/uclibc/uclibc.mk | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) Series applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:43 +0100 Subject: [Buildroot] [git commit] package/openlayers: bump to version 6.11.0 Message-ID: <20220111205726.7541B82DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=baf74fe3df91e7b2d53a5533d06057965423ba7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 11eae3de36..b72d5fcde8 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 da3025279bbd6cfb0e82b7af95666bede8fd65e8c620a1bc54bba04cebb7e1d4 v6.10.0-dist.zip +sha256 8c4751915808a5a84adcd760fff453429a95993cadf77003ac94eae127240c1a v6.11.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 781f9901ea..1f8b485018 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.10.0 +OPENLAYERS_VERSION = 6.11.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From thomas.petazzoni at bootlin.com Tue Jan 11 21:03:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:03:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/openlayers: bump to version 6.11.0 In-Reply-To: <20220110092352.1247528-1-thomas.claveirole@green-communications.fr> References: <20220110092352.1247528-1-thomas.claveirole@green-communications.fr> Message-ID: <20220111220349.44fdfef8@windsurf> On Mon, 10 Jan 2022 10:23:52 +0100 Thomas Claveirole wrote: > Signed-off-by: Thomas Claveirole > --- > package/openlayers/openlayers.hash | 2 +- > package/openlayers/openlayers.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Jan 11 21:04:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 11 Jan 2022 22:04:09 +0100 Subject: [Buildroot] [PATCH 1/2] package/linux-headers: drop 5.14.x headers In-Reply-To: <20220111183119.GW1477939@scaer> (Yann E. MORIN's message of "Tue, 11 Jan 2022 19:31:19 +0100") References: <20220110231303.31275-1-peter@korsgaard.com> <20220111183119.GW1477939@scaer> Message-ID: <871r1e9e7q.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2022-01-11 00:13 +0100, Peter Korsgaard spake thusly: >> The 5.14.x series is now EOL, so drop it. > You forgot to remove it from the choice list, so I did. > Applied to master with the above fixed, thanks. Ups, thanks for fixing it! -- Bye, Peter Korsgaard From ps.report at gmx.net Tue Jan 11 21:05:26 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 11 Jan 2022 22:05:26 +0100 Subject: [Buildroot] [PATCH v1] package/imagemagick: bump version to 7.1.0-19 Message-ID: <20220111210526.23536-1-ps.report@gmx.net> For details see [1]. [1] https://github.com/ImageMagick/ImageMagick/blob/main/ChangeLog Signed-off-by: Peter Seiderer --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index b787643fde..278becd2ab 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fc454be622724c6224fa6c8230bb9c50191a05fbf05b9c9c25aa3e5497090b83 imagemagick-7.0.11-13.tar.gz +sha256 385ca5bd8ce9b37e685779c46868171af949265c9db40067c1c4d7442dbc723e imagemagick-7.1.0-19.tar.gz sha256 040badb77b659e751ea16113490a937e1e01f3f5d32181e966b8982413533fb2 LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index a6eaf99887..64a530c6d2 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.11-13 +IMAGEMAGICK_VERSION = 7.1.0-19 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Jan 11 20:58:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 21:58:59 +0100 Subject: [Buildroot] [PATCH] support/download: drop support for the 'none' hash In-Reply-To: <20220110162319.294088-1-yann.morin.1998@free.fr> References: <20220110162319.294088-1-yann.morin.1998@free.fr> Message-ID: <20220111215859.15821eda@windsurf> On Mon, 10 Jan 2022 17:23:19 +0100 "Yann E. MORIN" wrote: > Commit 1ba85b7f874d (support/download: add explicit no-hash support) > introduced the 'none' hash type, in an attempt to make hash files > mandatory, but not failing on archives localy generated, like those > for git or svn repositories, especially for those packages where a > version choice was present, which would allow for either remote > archives for which we'd have a hash or VCS trees for which we could > not have a hash for the localy generated archive. > > Indeed, back in the time, we did not have a mean to generate > reproducible archives, so having a hash file without a hash for > thosel ocally generated archives would trigger an error in the > hash0-checking machinery. > > But now, low-and-behold, we do know how to generate those archives, > and we have a mechanism to explicitly exclude some archives from being > hash-checked (e.g. when the verison string itself can be user-provided). > > As such, the 'none' hash type no longer has any raison d'?tre, we do not > use it in-tree, and its use in a br2-external tree is most probably > inexistent (as is the use of hash files alotgether most probably). > > So we simply drop the support for that. > > Signed-off-by: Yann E. MORIN > --- > docs/manual/adding-packages-directory.txt | 9 +-------- > support/download/check-hash | 4 ---- > 2 files changed, 1 insertion(+), 12 deletions(-) Applied to master, with the fix suggested by Ricardo. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:01:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:01:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: fix build with gcc 4.8 In-Reply-To: <20220110174411.1761440-1-fontaine.fabrice@gmail.com> References: <20220110174411.1761440-1-fontaine.fabrice@gmail.com> Message-ID: <20220111220147.2aa99684@windsurf> On Mon, 10 Jan 2022 18:44:11 +0100 Fabrice Fontaine wrote: > Fix the following build failure with gcc 4.8 raised since bump to > version 2.28.0 in commit 0f8aab08e762742d753d5920718f31c629d0f8d7: > > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c: In function 'mpi_select': > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: error: 'for' loop initial declarations are only allowed in C99 mode > for( size_t i = 0; i < T_size; i++ ) > ^ > /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/build/mbedtls-2.28.0/library/bignum.c:1994:5: note: use option -std=c99 or -std=gnu99 to compile your code > > Fixes: > - http://autobuild.buildroot.org/results/56ac0a8726d09eed8f45f865934fa7781a0e667a > > Signed-off-by: Fabrice Fontaine > --- > package/mbedtls/mbedtls.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:14:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:14:20 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gstreamer1-mm: drop package Message-ID: <20220111210816.ABAEE82BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdb8cbb15c8f55da9a2d98ed206f8dfb10f2c8e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gstreamer1-mm is not compatible with glibmm-2.68 API and not actively maintained anymore (one commit during the last 3 years): https://gitlab.gnome.org/GNOME/gstreamermm/-/issues/17 https://gitlab.gnome.org/GNOME/gstreamermm/-/commits/master As this is the only package that doesn't support glibmm-2.68 and because it can't be easily patched, drop it to avoid the following build failure raised since commit dddb65efbdf2c7952f22a1e51009f17f1676db4a: Package 'giomm-2.4', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/3479688334765fbbe4cb9620f4d3596f7d710404 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 ++++ package/gstreamer1/Config.in | 1 - .../0001-Fix-build-against-glib-2-68.patch | 44 ---------------------- package/gstreamer1/gstreamer1-mm/Config.in | 29 -------------- .../gstreamer1/gstreamer1-mm/gstreamer1-mm.hash | 6 --- package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk | 24 ------------ 6 files changed, 7 insertions(+), 104 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b3e8d5a6d8..6c6aca5ac9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_GSTREAMER1_MM + bool "gstreamer1-mm package removed" + select BR2_LEGACY + help + This package has been removed as it is not actively + maintained anymore and does not support glibmm-2.68 API. + config BR2_KERNEL_HEADERS_5_14 bool "kernel headers version 5.14.x are no longer supported" select BR2_LEGACY diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index a2a15397e9..8fe8a34395 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -2,7 +2,6 @@ source "package/gstreamer1/gstreamer1/Config.in" if BR2_PACKAGE_GSTREAMER1 -source "package/gstreamer1/gstreamer1-mm/Config.in" source "package/gstreamer1/gst1-plugins-base/Config.in" source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in" source "package/gstreamer1/gst1-plugins-good/Config.in" diff --git a/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch b/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch deleted file mode 100644 index 3ffdbb9cbf..0000000000 --- a/package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0c0b5f8cef3b1f0a06f56c34340e210e0f23d1b0 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Tue, 13 Jul 2021 10:32:30 +0000 -Subject: [PATCH] Fix build against glib 2.68 - -volatile has been misused in the past - -[Retrieved from: -https://gitlab.gnome.org/GNOME/gstreamermm/-/merge_requests/4] -Signed-off-by: Fabrice Fontaine ---- - gstreamer/gstreamermm/register.h | 2 +- - tests/integration/test-integration-seekonstartup.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gstreamer/gstreamermm/register.h b/gstreamer/gstreamermm/register.h -index db66d172..a7ab3a63 100644 ---- a/gstreamer/gstreamermm/register.h -+++ b/gstreamer/gstreamermm/register.h -@@ -110,7 +110,7 @@ register_mm_type(const gchar * type_name) - /* The typedef for GType may be gulong or gsize, depending on the - * system and whether the compiler is c++ or not. The g_once_init_* - * functions always take a gsize * though ... */ -- static volatile gsize gonce_data = 0; -+ static gsize gonce_data = 0; - if (g_once_init_enter (&gonce_data)) { - GTypeInfo info; - -diff --git a/tests/integration/test-integration-seekonstartup.cc b/tests/integration/test-integration-seekonstartup.cc -index 247ac499..cd43a125 100644 ---- a/tests/integration/test-integration-seekonstartup.cc -+++ b/tests/integration/test-integration-seekonstartup.cc -@@ -18,7 +18,7 @@ RefPtr mainloop; - RefPtr bus; - RefPtr pipeline; - RefPtr sink_pad; --static volatile gint counter; -+static gint counter; - bool prerolled = false; - gboolean was_check = 0; - --- -GitLab - diff --git a/package/gstreamer1/gstreamer1-mm/Config.in b/package/gstreamer1/gstreamer1-mm/Config.in deleted file mode 100644 index 3225e394f4..0000000000 --- a/package/gstreamer1/gstreamer1-mm/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_GSTREAMER1_MM - bool "gstreamer1-mm" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # glibmm -> libsigc - depends on BR2_INSTALL_LIBSTDCPP # glibmm - depends on BR2_USE_WCHAR # glibmm -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # glibmm -> libglib2 - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_GSTREAMER1_CHECK - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - gstreamermm provides C++ bindings for the GStreamer streaming - multimedia library (http://gstreamer.freedesktop.org). With - gstreamermm it is possible to develop applications that work - with multimedia in C++. - - gstreamermm is developed over glibmm, libsigc++ and libxml++ - and the functionalities they provide. This means that, among - other things, referencing and unreferencing of GObjects is - handled automatically via glibmm's automatic pointer class, - Glib::RefPtr, and libsigc++'s slots are used for callbacks and - signals. - - https://gstreamer.freedesktop.org/bindings/cplusplus.html - -comment "gstreamer1-mm needs a toolchain w/ C++, wchar, threads, gcc >= 7" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash b/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash deleted file mode 100644 index 425cf05f39..0000000000 --- a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gstreamermm/1.10/gstreamermm-1.10.0.sha256sum -sha256 be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60 gstreamermm-1.10.0.tar.xz - -# Locally computed -sha256 7c78a8d7fc6781d51402d5a6036bedda9cffb0e5d28757e25d54d6eacbb1949f COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.examples diff --git a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk b/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk deleted file mode 100644 index 539c9df1cb..0000000000 --- a/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# gstreamer1-mm -# -################################################################################ - -GSTREAMER1_MM_VERSION_MAJOR = 1.10 -GSTREAMER1_MM_VERSION = $(GSTREAMER1_MM_VERSION_MAJOR).0 -GSTREAMER1_MM_SITE = http://ftp.gnome.org/pub/gnome/sources/gstreamermm/$(GSTREAMER1_MM_VERSION_MAJOR) -GSTREAMER1_MM_SOURCE = gstreamermm-$(GSTREAMER1_MM_VERSION).tar.xz -GSTREAMER1_MM_LICENSE = LGPL-2.1+ (library), GPL-2.0 (examples) -GSTREAMER1_MM_LICENSE_FILES = COPYING COPYING.examples -GSTREAMER1_MM_INSTALL_STAGING = YES -GSTREAMER1_MM_DEPENDENCIES += \ - glibmm \ - gstreamer1 \ - gst1-plugins-base - -GSTREAMER1_MM_CONF_OPTS += \ - --disable-gl \ - --enable-unittests=no \ - --disable-deprecated-api - -$(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Tue Jan 11 21:14:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:14:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1-mm: drop package In-Reply-To: <20220111174345.2482393-1-fontaine.fabrice@gmail.com> References: <20220111174345.2482393-1-fontaine.fabrice@gmail.com> Message-ID: <20220111221456.6b96cc93@windsurf> On Tue, 11 Jan 2022 18:43:45 +0100 Fabrice Fontaine wrote: > gstreamer1-mm is not compatible with glibmm-2.68 API and not actively > maintained anymore (one commit during the last 3 years): > https://gitlab.gnome.org/GNOME/gstreamermm/-/issues/17 > https://gitlab.gnome.org/GNOME/gstreamermm/-/commits/master > > As this is the only package that doesn't support glibmm-2.68 and because > it can't be easily patched, drop it to avoid the following build failure > raised since commit dddb65efbdf2c7952f22a1e51009f17f1676db4a: > > Package 'giomm-2.4', required by 'virtual:world', not found > > Fixes: > - http://autobuild.buildroot.org/results/3479688334765fbbe4cb9620f4d3596f7d710404 > > Signed-off-by: Fabrice Fontaine > --- > Config.in.legacy | 7 +++ > package/gstreamer1/Config.in | 1 - > .../0001-Fix-build-against-glib-2-68.patch | 44 ------------------- > package/gstreamer1/gstreamer1-mm/Config.in | 29 ------------ > .../gstreamer1-mm/gstreamer1-mm.hash | 6 --- > .../gstreamer1/gstreamer1-mm/gstreamer1-mm.mk | 24 ---------- > 6 files changed, 7 insertions(+), 104 deletions(-) > delete mode 100644 package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch > delete mode 100644 package/gstreamer1/gstreamer1-mm/Config.in > delete mode 100644 package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash > delete mode 100644 package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:15:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:15:02 +0100 Subject: [Buildroot] [git commit] package/meson: bump to version 0.61.0 Message-ID: <20220111210902.D71FD82941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 02d8900003..c9be54be05 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.60.3/meson-0.60.3.tar.gz.asc -sha256 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e meson-0.60.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz.asc +sha256 ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c meson-0.61.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e8443eacba..e63dc725bf 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.60.3 +MESON_VERSION = 0.61.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Tue Jan 11 21:15:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:15:03 +0100 Subject: [Buildroot] [git commit] package/imagemagick: bump version to 7.1.0-19 Message-ID: <20220111210902.DF41F834DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ead58eaad3cab6593356a1a254fac1eb15f8ef7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/ImageMagick/ImageMagick/blob/main/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index b787643fde..278becd2ab 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fc454be622724c6224fa6c8230bb9c50191a05fbf05b9c9c25aa3e5497090b83 imagemagick-7.0.11-13.tar.gz +sha256 385ca5bd8ce9b37e685779c46868171af949265c9db40067c1c4d7442dbc723e imagemagick-7.1.0-19.tar.gz sha256 040badb77b659e751ea16113490a937e1e01f3f5d32181e966b8982413533fb2 LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index a6eaf99887..64a530c6d2 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.11-13 +IMAGEMAGICK_VERSION = 7.1.0-19 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Jan 11 21:15:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:15:11 +0100 Subject: [Buildroot] [git commit] configs/mx6sx_udoo: bump U-Boot and kernel Message-ID: <20220111210902.E6AEB834E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=350bddf7efa17f5cc67023d2f4537b7f6d65fb41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump U-Boot to 2022.01 and kernel to 5.15.13. After the conversion to U-Boot device model, the SD card is device '1', so change the boot script accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/udoo/common/boot.scr.txt | 6 +++--- configs/mx6sx_udoo_neo_defconfig | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/udoo/common/boot.scr.txt b/board/udoo/common/boot.scr.txt index 7acceed0fb..7a7d756c3c 100644 --- a/board/udoo/common/boot.scr.txt +++ b/board/udoo/common/boot.scr.txt @@ -1,7 +1,7 @@ -setenv finduuid "part uuid mmc 0:1 uuid" +setenv finduuid "part uuid mmc 1:1 uuid" run finduuid run findfdt setenv bootargs "console=${console} root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage +load mmc 1:1 ${fdt_addr} boot/${fdtfile} +load mmc 1:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdt_addr} diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 2bdcade252..3e1dc33bd4 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y @@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" From yann.morin.1998 at free.fr Tue Jan 11 21:17:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 22:17:08 +0100 Subject: [Buildroot] [PATCH] package/zynq-boot-bin: drop legacy package Message-ID: <20220111211708.517341-1-yann.morin.1998@free.fr> Since commit 6dd5a33c485c (zynq_zed: bump U-Boot to xilinx-v2016.2), we have no in-tree users of zynq-boot-bin.py, as U-Boot has since v2016.01 been able to natively generate Xilinx images. zynq-boot-bin.py is python2-only and there is zero chance that upstream will move it to python3. WE could carry a pytohn3-compatible copy, but that tool is now virtually unused. 6 years have passed now; let it rest in peace at last. Signed-off-by: Yann E. MORIN Cc: James Hilliard Cc: Thomas Petazzoni Cc: Masahiro Yamada Cc: Luca Ceresoli --- Config.in.legacy | 7 +++++++ boot/uboot/Config.in | 12 ------------ boot/uboot/uboot.mk | 11 ----------- package/zynq-boot-bin/zynq-boot-bin.hash | 2 -- package/zynq-boot-bin/zynq-boot-bin.mk | 22 ---------------------- 5 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk diff --git a/Config.in.legacy b/Config.in.legacy index b3e8d5a6d8..16d5ac40b3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_TARGET_UBOOT_ZYNQ_IMAGE + bool "Generate image for Xilinx Zynq" + select BR2_LEGACY + help + Since 2016.1, U-Boot can natively generate the Zynq boot image, + and so the Xilinx-specific format and tools have been removed. + config BR2_KERNEL_HEADERS_5_14 bool "kernel headers version 5.14.x are no longer supported" select BR2_LEGACY diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index c630fc6552..1fd4dede92 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -455,18 +455,6 @@ config BR2_TARGET_UBOOT_SPL_NAME and TPL name is tpl/u-boot-tpl.bin but not always. SPL name is MLO on OMAP and SPL on i.MX6 for example. -config BR2_TARGET_UBOOT_ZYNQ_IMAGE - bool "Generate image for Xilinx Zynq" - depends on BR2_arm - depends on BR2_TARGET_UBOOT_SPL - depends on BR2_TARGET_UBOOT_FORMAT_DTB_IMG - help - Generate the BOOT.BIN file from U-Boot's SPL. The image - boots the Xilinx Zynq chip without any FPGA bitstream. - A bitstream can be loaded by the U-Boot. The SPL searchs - for u-boot-dtb.img file so this U-Boot format is required - to be set. - config BR2_TARGET_UBOOT_ZYNQMP bool "Boot on the Xilinx ZynqMP SoCs" depends on BR2_aarch64 diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 574fc7089a..a61d1c8135 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -432,17 +432,6 @@ UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE endif -ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y) -define UBOOT_GENERATE_ZYNQ_IMAGE - $(HOST_DIR)/bin/python2 \ - $(HOST_DIR)/bin/zynq-boot-bin.py \ - -u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \ - -o $(BINARIES_DIR)/BOOT.BIN -endef -UBOOT_DEPENDENCIES += host-zynq-boot-bin -UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE -endif - ifeq ($(BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC),y) ifeq ($(BR2_TARGET_UBOOT_SPL),y) UBOOT_CRC_ALTERA_SOCFPGA_INPUT_IMAGES = $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)) diff --git a/package/zynq-boot-bin/zynq-boot-bin.hash b/package/zynq-boot-bin/zynq-boot-bin.hash deleted file mode 100644 index 0bc23de197..0000000000 --- a/package/zynq-boot-bin/zynq-boot-bin.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://raw.githubusercontent.com/Xilinx/u-boot-xlnx -sha1 940331ee02b0007099effa61e382fe7ea4174054 zynq-boot-bin.py diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk deleted file mode 100644 index deba5f4096..0000000000 --- a/package/zynq-boot-bin/zynq-boot-bin.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# zynq-boot-bin -# -################################################################################ - -ZYNQ_BOOT_BIN_VERSION = 2015.1 -ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py -ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/xilinx-v$(ZYNQ_BOOT_BIN_VERSION)/tools -ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ - -HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python - -define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS - cp $(HOST_ZYNQ_BOOT_BIN_DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) -endef - -define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/bin/$(ZYNQ_BOOT_BIN_SOURCE) -endef - -$(eval $(host-generic-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Tue Jan 11 21:21:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:21:27 +0100 Subject: [Buildroot] [PATCH v1] package/imagemagick: bump version to 7.1.0-19 In-Reply-To: <20220111210526.23536-1-ps.report@gmx.net> References: <20220111210526.23536-1-ps.report@gmx.net> Message-ID: <20220111222127.65d7e1ba@windsurf> On Tue, 11 Jan 2022 22:05:26 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] https://github.com/ImageMagick/ImageMagick/blob/main/ChangeLog > > Signed-off-by: Peter Seiderer > --- > package/imagemagick/imagemagick.hash | 2 +- > package/imagemagick/imagemagick.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:21:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:21:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 In-Reply-To: <20220110211323.1828141-1-james.hilliard1@gmail.com> References: <20220110211323.1828141-1-james.hilliard1@gmail.com> Message-ID: <20220111222135.693a88f2@windsurf> On Mon, 10 Jan 2022 14:13:23 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:21:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:21:56 +0100 Subject: [Buildroot] [PATCH] configs/mx6sx_udoo: Bump U-Boot and kernel In-Reply-To: <20220110201810.2277642-1-festevam@gmail.com> References: <20220110201810.2277642-1-festevam@gmail.com> Message-ID: <20220111222156.5e5993d2@windsurf> On Mon, 10 Jan 2022 17:18:10 -0300 Fabio Estevam wrote: > Bump U-Boot to 2022.01 and kernel to 5.15.13. > > After the conversion to U-Boot device model, the SD card is > device '1', so change the boot script accordingly. > > Signed-off-by: Fabio Estevam > --- > board/udoo/common/boot.scr.txt | 6 +++--- > configs/mx6sx_udoo_neo_defconfig | 8 ++++---- > 2 files changed, 7 insertions(+), 7 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 21:22:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:22:17 +0100 Subject: [Buildroot] [git commit] package/git: add xdg SELinux module Message-ID: <20220111211601.898B782DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c60df47735e2bfc91f7dbaf5642fc82744feeb86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master xdg SELinux module is needed to avoid the following build failure raised since bump of refpolicy to version 2.20220106 in commit f6691d122ce25fc580ca88243f79f75cc2808ca7 and https://github.com/SELinuxProject/refpolicy/commit/64e637d895c516d7a6b6cbcd46b187136279fddd: policy/modules/services/git.te:121:ERROR 'attribute xdg_config_type is not declared' at token ';' on line 115358: typeattribute git_xdg_config_t xdg_config_type; #line 121 checkpolicy: error(s) encountered while parsing configuration Rules.monolithic:78: recipe for target 'policy.30' failed Fixes: - http://autobuild.buildroot.org/results/98d5b3db313000855721c0ad994951fe8cc781c0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/git/git.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/git/git.mk b/package/git/git.mk index 556921a9fc..90b1acd6a4 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -10,7 +10,7 @@ GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_CPE_ID_VENDOR = git-scm -GIT_SELINUX_MODULES = apache git +GIT_SELINUX_MODULES = apache git xdg GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) # We're patching configure.ac GIT_AUTORECONF = YES From thomas.petazzoni at bootlin.com Tue Jan 11 21:22:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:22:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/git: add xdg SELinux module In-Reply-To: <20220110075804.1499122-1-fontaine.fabrice@gmail.com> References: <20220110075804.1499122-1-fontaine.fabrice@gmail.com> Message-ID: <20220111222224.221ef0da@windsurf> On Mon, 10 Jan 2022 08:58:04 +0100 Fabrice Fontaine wrote: > xdg SELinux module is needed to avoid the following build failure raised > since bump of refpolicy to version 2.20220106 in commit > f6691d122ce25fc580ca88243f79f75cc2808ca7 and > https://github.com/SELinuxProject/refpolicy/commit/64e637d895c516d7a6b6cbcd46b187136279fddd: > > policy/modules/services/git.te:121:ERROR 'attribute xdg_config_type is not declared' at token ';' on line 115358: > typeattribute git_xdg_config_t xdg_config_type; > #line 121 > checkpolicy: error(s) encountered while parsing configuration > Rules.monolithic:78: recipe for target 'policy.30' failed > > Fixes: > - http://autobuild.buildroot.org/results/98d5b3db313000855721c0ad994951fe8cc781c0 > > Signed-off-by: Fabrice Fontaine > --- > package/git/git.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From luca at lucaceresoli.net Tue Jan 11 22:00:04 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Tue, 11 Jan 2022 23:00:04 +0100 Subject: [Buildroot] [PATCH] package/zynq-boot-bin: drop legacy package In-Reply-To: <20220111211708.517341-1-yann.morin.1998@free.fr> References: <20220111211708.517341-1-yann.morin.1998@free.fr> Message-ID: <5c2d7de5-56e5-d98a-3f13-3ef18ffcaa5e@lucaceresoli.net> Hi Yann, On 11/01/22 22:17, Yann E. MORIN wrote: > Since commit 6dd5a33c485c (zynq_zed: bump U-Boot to xilinx-v2016.2), we > have no in-tree users of zynq-boot-bin.py, as U-Boot has since v2016.01 > been able to natively generate Xilinx images. > > zynq-boot-bin.py is python2-only and there is zero chance that upstream > will move it to python3. WE could carry a pytohn3-compatible copy, but s/pytohn3/python3/ > that tool is now virtually unused. > > 6 years have passed now; let it rest in peace at last. > > Signed-off-by: Yann E. MORIN > Cc: James Hilliard > Cc: Thomas Petazzoni > Cc: Masahiro Yamada > Cc: Luca Ceresoli > --- > Config.in.legacy | 7 +++++++ > boot/uboot/Config.in | 12 ------------ > boot/uboot/uboot.mk | 11 ----------- > package/zynq-boot-bin/zynq-boot-bin.hash | 2 -- > package/zynq-boot-bin/zynq-boot-bin.mk | 22 ---------------------- > 5 files changed, 7 insertions(+), 47 deletions(-) > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index b3e8d5a6d8..16d5ac40b3 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_TARGET_UBOOT_ZYNQ_IMAGE > + bool "Generate image for Xilinx Zynq" > + select BR2_LEGACY > + help > + Since 2016.1, U-Boot can natively generate the Zynq boot image, > + and so the Xilinx-specific format and tools have been removed. As said in the discussion after James' patch, I would add something like: Should you still need zynq-boot-bin.py you can download it at and call it from a post-build script. You will need to install python2 on your host to run it. -- Luca From thomas.petazzoni at bootlin.com Tue Jan 11 21:55:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:55:08 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: new package Message-ID: <20220111220020.EA83A83478@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea033cecf990ed3f86619647523a9ad2ccb09adb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Spike, the RISC-V ISA Simulator, implements a functional model of one or more RISC-V harts. The host package provides an alternative solution to qemu. https://github.com/riscv-software-src/riscv-isa-sim Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in.host | 1 + .../0001-riscv-disable-precompiled-headers.patch | 34 ++++++++++++++++++++++ package/riscv-isa-sim/Config.in.host | 13 +++++++++ package/riscv-isa-sim/riscv-isa-sim.hash | 3 ++ package/riscv-isa-sim/riscv-isa-sim.mk | 12 ++++++++ 6 files changed, 64 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c8242df8a6..13464178c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1599,6 +1599,7 @@ F: package/glslsandbox-player/ F: package/ptm2human/ F: package/python-distro/ F: package/python-pyalsa/ +F: package/riscv-isa-sim/ N: Julien Viard de Galbert F: package/dieharder/ diff --git a/package/Config.in.host b/package/Config.in.host index 6e027d96c2..c390ae3e7d 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -78,6 +78,7 @@ menu "Host utilities" source "package/qoriq-rcw/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" + source "package/riscv-isa-sim/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch new file mode 100644 index 0000000000..461f34e3a1 --- /dev/null +++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch @@ -0,0 +1,34 @@ +From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sun, 9 Jan 2022 13:38:48 +0100 +Subject: [PATCH] riscv: disable precompiled headers + +While precompiling header, some toolchains fail with the message: + + /path/to/toolchain/bin/ld: /path/to/sysroot/usr/lib/Scrt1.o: in function `_start': + (.text+0x54): undefined reference to `main' + +The patch totally disable precompiled headers. + +Signed-off-by: Julien Olivain +--- + riscv/riscv.mk.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in +index 2347ce6..4f56eaf 100644 +--- a/riscv/riscv.mk.in ++++ b/riscv/riscv.mk.in +@@ -35,9 +35,6 @@ riscv_hdrs = \ + + riscv_install_hdrs = mmio_plugin.h + +-riscv_precompiled_hdrs = \ +- insn_template.h \ +- + riscv_srcs = \ + processor.cc \ + execute.cc \ +-- +2.34.1 + diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host new file mode 100644 index 0000000000..35e404caf0 --- /dev/null +++ b/package/riscv-isa-sim/Config.in.host @@ -0,0 +1,13 @@ +config BR2_PACKAGE_HOST_RISCV_ISA_SIM + bool "host riscv-isa-sim" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++1 + help + Spike, the RISC-V ISA Simulator, implements a functional + model of one or more RISC-V harts. + + The host package provides an alternative solution to qemu. + + https://github.com/riscv-software-src/riscv-isa-sim + +comment "host riscv-isa-sim needs host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/riscv-isa-sim/riscv-isa-sim.hash b/package/riscv-isa-sim/riscv-isa-sim.hash new file mode 100644 index 0000000000..d787a03e4c --- /dev/null +++ b/package/riscv-isa-sim/riscv-isa-sim.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9b29c220fed1e867e3bea4b5c565f2629237d525a4d9fe1668699c4406003a1f riscv-isa-sim-1.1.0.tar.gz +sha256 c65e436d18972c9c4bd192494fe4870bd2e158179474975b80a3559f27631632 LICENSE diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk new file mode 100644 index 0000000000..e10dd4c662 --- /dev/null +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# riscv-isa-sim +# +################################################################################ + +RISCV_ISA_SIM_VERSION = 1.1.0 +RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) +RISCV_ISA_SIM_LICENSE = BSD-3-Clause +RISCV_ISA_SIM_LICENSE_FILES = LICENSE + +$(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Tue Jan 11 21:58:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 22:58:52 +0100 Subject: [Buildroot] [git commit] configs/spike_riscv64: new defconfig Message-ID: <20220111220020.F3EB9825F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24d07fdc1404901fb1872ac55f875fe1d555cbb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ board/spike/riscv64/readme.txt | 39 +++++++++++++++++++++++++++++++++++++++ board/spike/riscv64/start.sh | 13 +++++++++++++ configs/spike_riscv64_defconfig | 13 +++++++++++++ 4 files changed, 67 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 13464178c0..bcc54bd11b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1588,10 +1588,12 @@ F: package/paho-mqtt-c N: Julien Olivain F: board/qmtech/zynq/ +F: board/spike/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig +F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ diff --git a/board/spike/riscv64/readme.txt b/board/spike/riscv64/readme.txt new file mode 100644 index 0000000000..5ad7df46df --- /dev/null +++ b/board/spike/riscv64/readme.txt @@ -0,0 +1,39 @@ +Linux on Spike RISC-V ISA simulator +=================================== + +This configuration provides a minimal working setup to run a Linux +kernel in the Spike RISC-V ISA simulator. + +The Spike ISA simulator can be an interresting alternative to Qemu, in +some specific cases. For example: simulating new instructions (see [1]), +simulating riscv-openocd/gdb debug sessions (see [2], [3]), or +generating an accurate per-instruction log of execution (see +riscv-isa-sim spike -l option)... + +To run Buildroot Linux in Spike, use the commands: + + make spike_riscv64_defconfig + make + ./board/spike/riscv64/start.sh + +The boot is made with the standard RISC-V OpenSBI boot loader. In +order to keep the simulation simple, the rootfs is passed as an initrd +ramfs. + +Note: at the time of this writing, Spike v1.1.0 and OpenSBI v1.0 does +not support console input emulation for 32bit RISC-V systems. A 32bit +Linux system can boot and reach the login, but it's not possible to +login. See [4]. + + +[1]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#simulating-a-new-instruction + +[2]. +https://github.com/riscv-software-src/riscv-isa-sim/tree/v1.1.0#debugging-with-gdb + +[3]. +https://github.com/riscv/riscv-openocd + +[4]. +https://github.com/riscv-software-src/opensbi/blob/v1.0/lib/utils/sys/htif.c#L127 diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh new file mode 100755 index 0000000000..75b1412df8 --- /dev/null +++ b/board/spike/riscv64/start.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +SCRIPT_DIR="$(dirname "$0")" +BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" + +# Use Buildroot host spike by default, but allow the caller to +# redefine another spike binary +: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" + +exec "${SPIKE}" \ + --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ + "${@}" \ + "${BR_BASEDIR}"/output/images/fw_payload.elf diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig new file mode 100644 index 0000000000..cc145bcd8e --- /dev/null +++ b/configs/spike_riscv64_defconfig @@ -0,0 +1,13 @@ +BR2_riscv=y +BR2_RISCV_64=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_TARGET_ROOTFS_CPIO=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y +BR2_PACKAGE_HOST_RISCV_ISA_SIM=y From thomas.petazzoni at bootlin.com Tue Jan 11 22:08:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 23:08:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/riscv-isa-sim: new package In-Reply-To: <20220109164756.1312023-1-ju.o@free.fr> References: <20220109164756.1312023-1-ju.o@free.fr> Message-ID: <20220111230808.5c9f298e@windsurf> On Sun, 9 Jan 2022 17:47:55 +0100 Julien Olivain wrote: > Spike, the RISC-V ISA Simulator, implements a functional model of one > or more RISC-V harts. > > The host package provides an alternative solution to qemu. > > https://github.com/riscv-software-src/riscv-isa-sim > > Signed-off-by: Julien Olivain Thanks for your patch! > diff --git a/package/Config.in b/package/Config.in > index 85193f7802..b20cf45698 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2126,6 +2126,7 @@ menu "Miscellaneous" > source "package/proj/Config.in" > source "package/qemu/Config.in" > source "package/qpdf/Config.in" > + source "package/riscv-isa-sim/Config.in" > source "package/rtl_433/Config.in" > source "package/shared-mime-info/Config.in" > source "package/sunwait/Config.in" It wasn't clear to me what was the use-case/reasoning for having a target variant of this package, so I've dropped the target variant and kept only the host variant. > diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch > new file mode 100644 > index 0000000000..461f34e3a1 > --- /dev/null > +++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch > @@ -0,0 +1,34 @@ > +From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Sun, 9 Jan 2022 13:38:48 +0100 > +Subject: [PATCH] riscv: disable precompiled headers > + > +While precompiling header, some toolchains fail with the message: > + > + /path/to/toolchain/bin/ld: /path/to/sysroot/usr/lib/Scrt1.o: in function `_start': > + (.text+0x54): undefined reference to `main' Has this been reported upstream? Will it be fixed upstream? Anyway: patch applied to master, with the target variant dropped. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Jan 11 22:08:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 11 Jan 2022 23:08:46 +0100 Subject: [Buildroot] [PATCH 2/2] configs/spike_riscv64: new defconfig In-Reply-To: <20220109164756.1312023-2-ju.o@free.fr> References: <20220109164756.1312023-1-ju.o@free.fr> <20220109164756.1312023-2-ju.o@free.fr> Message-ID: <20220111230846.2460ac6a@windsurf> On Sun, 9 Jan 2022 17:47:56 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 2 ++ > board/spike/riscv64/readme.txt | 39 +++++++++++++++++++++++++++++++++ > board/spike/riscv64/start.sh | 13 +++++++++++ > configs/spike_riscv64_defconfig | 12 ++++++++++ > 4 files changed, 66 insertions(+) > create mode 100644 board/spike/riscv64/readme.txt > create mode 100755 board/spike/riscv64/start.sh > create mode 100644 configs/spike_riscv64_defconfig Applied to master, thanks. I've just added an explicit BR2_RISCV_64=y in the defconfig to really clarify that this is a RISC-V 64-bit configuration (even though BR2_RISCV_64=y is indeed the default). Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Tue Jan 11 22:08:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 23:08:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: fix host dependencies Message-ID: <20220111220815.2570293-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit 78d7c5f803c2f59385b57525e2d1d09da15e22a6: WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU Depends on [n]: (BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS [=n] || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n]) && BR2_HOST_GCC_AT_LEAST_8 [=y] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Depends on [n]: BR2_PACKAGE_HOST_QEMU [=y] && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU Depends on [n]: (BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS [=n] || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n]) && BR2_HOST_GCC_AT_LEAST_8 [=y] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Depends on [n]: BR2_PACKAGE_HOST_QEMU [=y] && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] Fixes: - http://autobuild.buildroot.org/results/d78f660ca4a609a0a072b3f2e04d456bf8cf663f Signed-off-by: Fabrice Fontaine --- package/nodejs/Config.in.host | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 86eaf21dac..4ceaf0c73e 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_NODEJS bool "host nodejs" - depends on BR2_HOST_GCC_AT_LEAST_7 + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_8 select BR2_PACKAGE_HOST_PYTHON3 select BR2_PACKAGE_HOST_PYTHON3_BZIP2 select BR2_PACKAGE_HOST_PYTHON3_SSL @@ -11,3 +12,7 @@ config BR2_PACKAGE_HOST_NODEJS V8. http://nodejs.org/ + +comment "host nodejs needs a host gcc >= 8" + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_8 -- 2.34.1 From james.hilliard1 at gmail.com Tue Jan 11 22:10:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 11 Jan 2022 15:10:39 -0700 Subject: [Buildroot] [PATCH] package/zynq-boot-bin: drop legacy package In-Reply-To: <5c2d7de5-56e5-d98a-3f13-3ef18ffcaa5e@lucaceresoli.net> References: <20220111211708.517341-1-yann.morin.1998@free.fr> <5c2d7de5-56e5-d98a-3f13-3ef18ffcaa5e@lucaceresoli.net> Message-ID: On Tue, Jan 11, 2022 at 3:00 PM Luca Ceresoli wrote: > > Hi Yann, > > On 11/01/22 22:17, Yann E. MORIN wrote: > > Since commit 6dd5a33c485c (zynq_zed: bump U-Boot to xilinx-v2016.2), we > > have no in-tree users of zynq-boot-bin.py, as U-Boot has since v2016.01 > > been able to natively generate Xilinx images. > > > > zynq-boot-bin.py is python2-only and there is zero chance that upstream > > will move it to python3. WE could carry a pytohn3-compatible copy, but > > s/pytohn3/python3/ > > > that tool is now virtually unused. > > > > 6 years have passed now; let it rest in peace at last. > > > > Signed-off-by: Yann E. MORIN > > Cc: James Hilliard > > Cc: Thomas Petazzoni > > Cc: Masahiro Yamada > > Cc: Luca Ceresoli > > --- > > Config.in.legacy | 7 +++++++ > > boot/uboot/Config.in | 12 ------------ > > boot/uboot/uboot.mk | 11 ----------- > > package/zynq-boot-bin/zynq-boot-bin.hash | 2 -- > > package/zynq-boot-bin/zynq-boot-bin.mk | 22 ---------------------- > > 5 files changed, 7 insertions(+), 47 deletions(-) > > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.hash > > delete mode 100644 package/zynq-boot-bin/zynq-boot-bin.mk > > > > diff --git a/Config.in.legacy b/Config.in.legacy > > index b3e8d5a6d8..16d5ac40b3 100644 > > --- a/Config.in.legacy > > +++ b/Config.in.legacy > > @@ -146,6 +146,13 @@ endif > > > > comment "Legacy options removed in 2022.02" > > > > +config BR2_TARGET_UBOOT_ZYNQ_IMAGE > > + bool "Generate image for Xilinx Zynq" > > + select BR2_LEGACY > > + help > > + Since 2016.1, U-Boot can natively generate the Zynq boot image, > > + and so the Xilinx-specific format and tools have been removed. > > As said in the discussion after James' patch, I would add something like: > > Should you still need zynq-boot-bin.py you can download it at > and call it from a post-build script. You will need to install python2 > on your host to run it. I uploaded the python3 version here if anyone needs it: https://gist.githubusercontent.com/jameshilliard/e09235dfc6f96c11418a134e6ebf7890/raw/135b7480c405ae8a77a9db615e495f9a9f2d3242/zynq-boot-bin.py > > -- > Luca From fontaine.fabrice at gmail.com Tue Jan 11 22:24:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 23:24:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: fix typo in comment Message-ID: <20220111222428.2711661-1-fontaine.fabrice@gmail.com> Fix typo in comment added by commit ea033cecf990ed3f86619647523a9ad2ccb09adb Signed-off-by: Fabrice Fontaine --- package/riscv-isa-sim/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host index 35e404caf0..4ccf6e9546 100644 --- a/package/riscv-isa-sim/Config.in.host +++ b/package/riscv-isa-sim/Config.in.host @@ -1,6 +1,6 @@ config BR2_PACKAGE_HOST_RISCV_ISA_SIM bool "host riscv-isa-sim" - depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++1 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 help Spike, the RISC-V ISA Simulator, implements a functional model of one or more RISC-V harts. -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 11 22:41:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 11 Jan 2022 23:41:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/snappy: bump to version 1.1.9 Message-ID: <20220111224156.2800195-1-fontaine.fabrice@gmail.com> - Disable benchmarks through option added by https://github.com/google/snappy/commit/4ebd8b2f23dd4ab67ca695256a128cd796d39ce6 - Update indentation in hash file (two spaces) https://github.com/google/snappy/releases/tag/1.1.9 Signed-off-by: Fabrice Fontaine --- ...-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch | 71 +++++++++++++++++++ package/snappy/snappy.hash | 4 +- package/snappy/snappy.mk | 4 +- 3 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch diff --git a/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch new file mode 100644 index 0000000000..bd2ef07794 --- /dev/null +++ b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch @@ -0,0 +1,71 @@ +From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001 +From: "Georgi D. Sotirov" +Date: Wed, 5 May 2021 14:16:46 +0300 +Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE + +Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to +fix the following compilation errors and a warning with GCC: + +[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o +/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS +-I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 +-march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 +-DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c +/tmp/snappy-1.1.9/snappy.cc +/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline +function might not be inlinable [-Wattributes] + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair snappy::DecompressBranchless(const uint8_t*, const +uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned +char; ptrdiff_t = int]': +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +CMakeFiles/snappy.dir/build.make:137: recipe for target +'CMakeFiles/snappy.dir/snappy.cc.o' failed + +Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE +macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ +inline specifier. + +[Retrieved from: +https://github.com/google/snappy/pull/128/commits/0c716d435abe65250100c2caea0e5126ac4e14bd] +Signed-off-by: Fabrice Fontaine +--- + snappy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snappy.cc b/snappy.cc +index 79dc0e8d..51157be2 100644 +--- a/snappy.cc ++++ b/snappy.cc +@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { + } + + SNAPPY_ATTRIBUTE_ALWAYS_INLINE +-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { ++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + const uint8_t*& ip = *ip_p; + // This section is crucial for the throughput of the decompression loop. + // The latency of an iteration is fundamentally constrained by the diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index c08c5b7fe4..b49b0e7e3b 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f snappy-1.1.8.tar.gz -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING +sha256 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 snappy-1.1.9.tar.gz +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index e1fa28fbce..d31dcdd5fe 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,12 +4,12 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.8 +SNAPPY_VERSION = 1.1.9 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING SNAPPY_CPE_ID_VENDOR = google SNAPPY_INSTALL_STAGING = YES -SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_TESTS=OFF +SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_BENCHMARKS=OFF -DSNAPPY_BUILD_TESTS=OFF $(eval $(cmake-package)) -- 2.34.1 From grant.b.edwards at gmail.com Tue Jan 11 22:57:32 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Tue, 11 Jan 2022 22:57:32 -0000 (UTC) Subject: [Buildroot] Diagnosing conflicts due to new Python version References: <20220111211018.4d236002@windsurf> Message-ID: On 2022-01-11, Thomas Petazzoni wrote: > I am confused by your e-mail. It seems to be a Gentoo question, but > you sent it to the Buildroot mailing list. Doh! That message was indeed intended for the gentoo mailing list. Sorry about that. [I was wondering why it hadn't showed up on that list.] -- Grant From grant.b.edwards at gmail.com Tue Jan 11 22:57:32 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Tue, 11 Jan 2022 22:57:32 -0000 (UTC) Subject: [Buildroot] Diagnosing conflicts due to new Python version References: <20220111211018.4d236002@windsurf> Message-ID: On 2022-01-11, Thomas Petazzoni wrote: > I am confused by your e-mail. It seems to be a Gentoo question, but > you sent it to the Buildroot mailing list. Doh! That message was indeed intended for the gentoo mailing list. Sorry about that. [I was wondering why it hadn't showed up on that list.] -- Grant From yann.morin.1998 at free.fr Tue Jan 11 23:30:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 00:30:06 +0100 Subject: [Buildroot] [git commit] support/testing/tests/package/test_libshdata: new test Message-ID: <20220111232835.8DE2383508@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af5b1ec68bf0af0af61de6b58e3c64d632a9a1e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This new test ensures that libraries and binaries generated using Parrot Alchemy build system are correct. Indeed, the test uses libshdata-stress. This binary depends on libshdata. libshdata depends on libfutils and libfutils depends on ulog. All of these binaries and libraries are built using Alchemy. Signed-off-by: Herve Codina Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + support/testing/tests/package/test_libshdata.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b5be1d6352..c0bfde69da 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1204,6 +1204,7 @@ F: package/php-pam/ F: package/php-pecl-dbus/ F: package/ulog/ F: support/testing/tests/package/test_dtbocfg.py +F: support/testing/tests/package/test_libshdata.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py F: support/testing/tests/package/test_php_lua.py diff --git a/support/testing/tests/package/test_libshdata.py b/support/testing/tests/package/test_libshdata.py new file mode 100644 index 0000000000..80b032ac69 --- /dev/null +++ b/support/testing/tests/package/test_libshdata.py @@ -0,0 +1,25 @@ +import os + +import infra.basetest + + +class TestLibshdata(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LIBSHDATA=y + BR2_PACKAGE_LIBSHDATA_STRESS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", img]) + self.emulator.login() + + # Just run libshdata-stress. + # This ensures that library are well compiled and that all dependencies + # are met using Parrot Alchemy build system. + self.assertRunOk("libshdata-stress") From yann.morin.1998 at free.fr Tue Jan 11 23:25:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 00:25:05 +0100 Subject: [Buildroot] [git commit] package/ulog: new package Message-ID: <20220111232835.6C4C883508@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e88d6570f18748111e3ec81a3121e3e0376a277 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The ulog library is a minimalistic logging library derived from Android logger. https://github.com/Parrot-Developers/ulog Signed-off-by: Herve Codina [yann.morin.1998 at free.fr: - do not macro-ify headers install - do not parameterise static libs install dest - reordr macros decaration and use - implicit module name - BUILD_CMDS fit on a single line ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/ulog/Config.in | 12 ++++++++++++ package/ulog/ulog.hash | 3 +++ package/ulog/ulog.mk | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 33b9c1cd73..563f6df3ff 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1200,6 +1200,7 @@ F: package/php-apcu/ F: package/php-lua/ F: package/php-pam/ F: package/php-pecl-dbus/ +F: package/ulog/ F: support/testing/tests/package/test_dtbocfg.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py diff --git a/package/Config.in b/package/Config.in index 3a2ad30df9..39a98fcc66 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1738,6 +1738,7 @@ menu "Logging" source "package/log4qt/Config.in" source "package/opentracing-cpp/Config.in" source "package/spdlog/Config.in" + source "package/ulog/Config.in" source "package/zlog/Config.in" endmenu diff --git a/package/ulog/Config.in b/package/ulog/Config.in new file mode 100644 index 0000000000..ef155005c2 --- /dev/null +++ b/package/ulog/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_ULOG + bool "ulog" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + help + This is a minimalistic logging library derived from + Android logger. + + https://github.com/Parrot-Developers/ulog + +comment "ulog needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ulog/ulog.hash b/package/ulog/ulog.hash new file mode 100644 index 0000000000..47adc093b9 --- /dev/null +++ b/package/ulog/ulog.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 14e5773b32a79fa5380bdc7ac73a39a7cd3ab182830f57cf6f2994fb49cf38dc ulog-0389d243352255f6182326dccdae3d56dadc078f.tar.gz +sha256 cbb97dd2528af2aa2b9aee6c1b3ff1caed758044c17b2c811cf44b2528c496da COPYING diff --git a/package/ulog/ulog.mk b/package/ulog/ulog.mk new file mode 100644 index 0000000000..8e8b1aa1c1 --- /dev/null +++ b/package/ulog/ulog.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# ulog +# +################################################################################ + +ULOG_VERSION = 0389d243352255f6182326dccdae3d56dadc078f +ULOG_SITE = $(call github,Parrot-Developers,ulog,$(ULOG_VERSION)) +ULOG_LICENSE = Apache-2.0 +ULOG_LICENSE_FILES = COPYING +ULOG_DEPENDENCIES = host-alchemy +ULOG_INSTALL_STAGING = YES + +define ULOG_BUILD_CMDS + $(ALCHEMY_TARGET_ENV) $(ALCHEMY_MAKE) libulog +endef + +ifeq ($(BR2_SHARED_LIBS),) +define ULOG_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.a \ + $(STAGING_DIR)/usr/lib/libulog.a +endef +endif + +ifeq ($(BR2_STATIC_LIBS),) +# $(1): destination directory: target or staging +define ULOG_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libulog.so* \ + $(1)/usr/lib/ +endef +endif + +define ULOG_INSTALL_TARGET_CMDS + $(call ULOG_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +define ULOG_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/ + $(INSTALL) -m 644 $(@D)/libulog/include/* $(STAGING_DIR)/usr/include/ + $(ULOG_INSTALL_STATIC_LIBS) + $(call ULOG_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libulog, libulog.so) +endef + +$(eval $(generic-package)) From yann.morin.1998 at free.fr Tue Jan 11 23:29:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 00:29:54 +0100 Subject: [Buildroot] [git commit] package/libshdata: new package Message-ID: <20220111232835.84BDC82650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1e8f787e97e4576509143d5c65f02bdf4ffcea4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The libshdata library provides lock free shared-memory tools. https://github.com/Parrot-Developers/libshdata libshdata-stress utility does not compile using static libs only (BR2_STATIC_LIBS=y). The issue was raised upstream: https://github.com/Parrot-Developers/libshdata/issues/2 For now, libshdata-stress simply depends on !BR2_STATIC_LIBS. Signed-off-by: Herve Codina [yann.morin.1998 at free.fr: - do not macro-ify headers install - do not parameterise static libs install dest - do not parameterise binaries install dest - reorder macros decaration and use - remove spurious comma between module dependencies - implicit module name ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-backend-Add-missing-include-files.patch | 47 +++++++++++++++ ...ples-stress_test-Fix-build-with-musl-libc.patch | 37 ++++++++++++ package/libshdata/Config.in | 30 ++++++++++ package/libshdata/libshdata.hash | 3 + package/libshdata/libshdata.mk | 68 ++++++++++++++++++++++ 7 files changed, 187 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e0385c7b81..b5be1d6352 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1195,6 +1195,7 @@ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ F: package/libfutils/ +F: package/libshdata/ F: package/lua-augeas/ F: package/modsecurity2/ F: package/php-apcu/ diff --git a/package/Config.in b/package/Config.in index 163fd53e12..59297c3f3d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2008,6 +2008,7 @@ menu "Other" source "package/libpwquality/Config.in" source "package/libqb/Config.in" source "package/libseccomp/Config.in" + source "package/libshdata/Config.in" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" source "package/libspatialindex/Config.in" diff --git a/package/libshdata/0001-backend-Add-missing-include-files.patch b/package/libshdata/0001-backend-Add-missing-include-files.patch new file mode 100644 index 0000000000..78c9e669c3 --- /dev/null +++ b/package/libshdata/0001-backend-Add-missing-include-files.patch @@ -0,0 +1,47 @@ +From 3eaf11bd957555674f5993435ef79dd4717ce890 Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Tue, 26 Oct 2021 08:45:10 +0200 +Subject: [PATCH] backend: Add missing include files + +With some libc library (musl), shd_dev_mem.c and shd_shm.c do not +compile. Indeed, open() needs (Cf. man open). + +This patch fixes the compilation issue adding this +include file. + +This patch was submitted upstream. +https://github.com/Parrot-Developers/libshdata/issues/1 + +Signed-off-by: Herve Codina +--- + src/backend/shd_dev_mem.c | 1 + + src/backend/shd_shm.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/backend/shd_dev_mem.c b/src/backend/shd_dev_mem.c +index 14573c1..a65f052 100644 +--- a/src/backend/shd_dev_mem.c ++++ b/src/backend/shd_dev_mem.c +@@ -33,6 +33,7 @@ + #include + #include + #include /* For ftruncate */ ++#include /* For open */ + #include /* for flock */ + #include /* For shm and PROT flags */ + #include +diff --git a/src/backend/shd_shm.c b/src/backend/shd_shm.c +index 117bf01..1e5a38c 100644 +--- a/src/backend/shd_shm.c ++++ b/src/backend/shd_shm.c +@@ -35,6 +35,7 @@ + #include + #include + #include /* For ftruncate */ ++#include /* For open */ + #include /* For NAME_MAX macro */ + #include /* for flock */ + #include /* For shm and PROT flags */ +-- +2.31.1 + diff --git a/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch b/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..c2a8e5f240 --- /dev/null +++ b/package/libshdata/0002-examples-stress_test-Fix-build-with-musl-libc.patch @@ -0,0 +1,37 @@ +From ddded7337812a2797d31f276624da98932d8e17f Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Sun, 9 Jan 2022 14:59:27 +0100 +Subject: [PATCH] examples/stress_test: Fix build with musl libc + +The musl C library uses sched_priority instead of +__sched_priority as GNU libc and uClibc do. +Use sched_priority instead. + +This does not break compilation with GNU libc and uClibc +because they both define in sched.h: + #define sched_priority __sched_priority + +This patch was submitted upstream. +https://github.com/Parrot-Developers/libshdata/issues/3 + +Signed-off-by: Herve Codina +--- + examples/stress_test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/stress_test.c b/examples/stress_test.c +index a859115..cfb5418 100644 +--- a/examples/stress_test.c ++++ b/examples/stress_test.c +@@ -617,7 +617,7 @@ static void launch_test(int timer_fd, struct test_setup *setup) + if (ret < 0) + ULOGI("Error setting the timer : %s", strerror(errno)); + struct sched_param sched_params; +- sched_params.__sched_priority = sched_get_priority_max(SCHED_RR); ++ sched_params.sched_priority = sched_get_priority_max(SCHED_RR); + + pid_t pid = fork(); + +-- +2.33.1 + diff --git a/package/libshdata/Config.in b/package/libshdata/Config.in new file mode 100644 index 0000000000..b2c24c94c5 --- /dev/null +++ b/package/libshdata/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_LIBSHDATA + bool "libshdata" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC # libfutils + depends on BR2_INSTALL_LIBSTDCPP # libfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # libfutils + select BR2_PACKAGE_LIBFUTILS + select BR2_PACKAGE_ULOG + help + This library provides lock free shared-memory tools + + https://github.com/Parrot-Developers/libshdata + +if BR2_PACKAGE_LIBSHDATA + +config BR2_PACKAGE_LIBSHDATA_STRESS + bool "libshdata-stress binary" + depends on !BR2_STATIC_LIBS + help + Install libshdata-stress binary as well + +comment "libshdata-stress needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +endif + +comment "libshdata needs a toolchain w/ C++, threads" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libshdata/libshdata.hash b/package/libshdata/libshdata.hash new file mode 100644 index 0000000000..880404cf52 --- /dev/null +++ b/package/libshdata/libshdata.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 1ae83ac73c2b5b17c726067737b8d446b99f190e16fe6198eb464368796ecce3 libshdata-d9ec4bdba834d8f3daf6bf9aa6da374bc462961f.tar.gz +sha256 eca11a1c62fae8d64a1247d93271375baecff8396141d7ff8d89671ee7e3ed0d COPYING diff --git a/package/libshdata/libshdata.mk b/package/libshdata/libshdata.mk new file mode 100644 index 0000000000..2e600359c1 --- /dev/null +++ b/package/libshdata/libshdata.mk @@ -0,0 +1,68 @@ +################################################################################ +# +# libshdata +# +################################################################################ + +LIBSHDATA_VERSION = d9ec4bdba834d8f3daf6bf9aa6da374bc462961f +LIBSHDATA_SITE = $(call github,Parrot-Developers,libshdata,$(LIBSHDATA_VERSION)) +LIBSHDATA_LICENSE = BSD-3-Clause +LIBSHDATA_LICENSE_FILES = COPYING +LIBSHDATA_DEPENDENCIES = libfutils ulog host-alchemy +LIBSHDATA_INSTALL_STAGING = YES + +LIBSHDATA_TARGETS = libshdata +ifeq ($(BR2_PACKAGE_LIBSHDATA_STRESS),y) +LIBSHDATA_TARGETS += libshdata-stress +endif + +LIBSHDATA_TARGET_ENV = \ + $(ALCHEMY_TARGET_ENV) \ + ALCHEMY_TARGET_SDK_DIRS="$(ALCHEMY_SDK_BASEDIR)/libfutils $(ALCHEMY_SDK_BASEDIR)/ulog" + +define LIBSHDATA_BUILD_CMDS + $(LIBSHDATA_TARGET_ENV) $(ALCHEMY_MAKE) $(LIBSHDATA_TARGETS) +endef + +ifeq ($(BR2_SHARED_LIBS),) +define LIBSHDATA_INSTALL_STATIC_LIBS + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata.a \ + $(STAGING_DIR)/usr/lib/libshdata.a +endef +endif + +ifeq ($(BR2_STATIC_LIBS),) +# $(1): destination directory: target or staging +define LIBSHDATA_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata.so* \ + $(1)/usr/lib/ +endef +endif + +ifeq ($(BR2_PACKAGE_LIBSHDATA_STRESS),y) +define LIBSHDATA_INSTALL_BIN + $(INSTALL) -D -m 755 $(@D)/alchemy-out/staging/usr/bin/libshdata-stress \ + $(TARGET_DIR)/usr/bin/libshdata-stress +endef +endif + +define LIBSHDATA_INSTALL_TARGET_CMDS + $(LIBSHDATA_INSTALL_BIN) + $(call LIBSHDATA_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +# Even in dynamic libraries only, libshdata-section-lookup is only built as +# a static lib (include $(BUILD_STATIC_LIBRARY) in atom.mk) and it is needed +# for libshdata usage. +define LIBSHDATA_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/ + $(INSTALL) -m 644 $(@D)/include/* $(STAGING_DIR)/usr/include/ + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libshdata-section-lookup.a \ + $(STAGING_DIR)/usr/lib/libshdata-section-lookup.a + $(LIBSHDATA_INSTALL_STATIC_LIBS) + $(call LIBSHDATA_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libshdata, libshdata.so, libfutils libulog) +endef + +$(eval $(generic-package)) From yann.morin.1998 at free.fr Tue Jan 11 22:39:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 11 Jan 2022 23:39:37 +0100 Subject: [Buildroot] [git commit] package/alchemy: new host package Message-ID: <20220111232835.60E3582650@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f1f3f87868fa333833dbba9f4f07adc338b34ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Alchemy is a build system developed by Parrot. It is a new build system based on the one used in Android. A central makefile instance scans a workspace to find user makefiles, includes them and register modules to be built. https://github.com/Parrot-Developers/alchemy Signed-off-by: Herve Codina [yann.morin.1998 at free.fr: implicit package name with $($(PKG)_NAME)] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + ...1-toolchains-remove-hash-style-management.patch | 36 +++++++++++ package/alchemy/alchemy.hash | 4 ++ package/alchemy/alchemy.mk | 70 ++++++++++++++++++++++ package/alchemy/atom.mk.in | 8 +++ 5 files changed, 119 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index bcc54bd11b..33b9c1cd73 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1190,6 +1190,7 @@ F: package/netopeer2/ F: package/sysrepo/ N: Herv?? Codina +F: package/alchemy/ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ diff --git a/package/alchemy/0001-toolchains-remove-hash-style-management.patch b/package/alchemy/0001-toolchains-remove-hash-style-management.patch new file mode 100644 index 0000000000..522766b977 --- /dev/null +++ b/package/alchemy/0001-toolchains-remove-hash-style-management.patch @@ -0,0 +1,36 @@ +From 4cb9681ab99db3d8e330ac789e17ec69583aecd4 Mon Sep 17 00:00:00 2001 +From: Herve Codina +Date: Thu, 28 Oct 2021 18:39:18 +0200 +Subject: [PATCH] toolchains: remove --hash-style management + +Using an external toolchain, with an external configuration given +using TARGET_GLOBAL_XXXX variables, having '--hash-style=both' +in Alchemy toolchains can lead to compilation failure. + +This patch simply removes all --hash-style settings. + +Signed-off-by: Herve Codina +--- + toolchains/linux/eglibc/flags.mk | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/toolchains/linux/eglibc/flags.mk b/toolchains/linux/eglibc/flags.mk +index 95c0a46..4474729 100644 +--- a/toolchains/linux/eglibc/flags.mk ++++ b/toolchains/linux/eglibc/flags.mk +@@ -11,11 +11,4 @@ TARGET_GLOBAL_LDLIBS += -pthread -lrt + TARGET_GLOBAL_CFLAGS += -funwind-tables + + # Enable link optimization for binutils's ld. +-# gnu hash not supported by mips ABI +-ifeq ("$(TARGET_ARCH)","mips") +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-else ifeq ("$(TARGET_ARCH)","mips64") +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-else +- TARGET_GLOBAL_LDFLAGS += -Wl,-O1,--hash-style=both +-endif ++TARGET_GLOBAL_LDFLAGS += -Wl,-O1 +-- +2.31.1 + diff --git a/package/alchemy/alchemy.hash b/package/alchemy/alchemy.hash new file mode 100644 index 0000000000..33895263cc --- /dev/null +++ b/package/alchemy/alchemy.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 346c06b9317691a9371d878b850e61f8bcec4f20132ac95340b9d2571be25ee8 alchemy-d95b3c38cd37814a1b98d0bbf813de7adaaecfbc.tar.gz +sha256 542f44eecd9f8806ec1ae285201e442ab547c82d9f8c70e44c977d6332a2bea0 COPYING +sha256 49872815ee3de163f07a83737c996e77a5bffa186d06b1e3bb969bfb68c251df README diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk new file mode 100644 index 0000000000..18cdd0a645 --- /dev/null +++ b/package/alchemy/alchemy.mk @@ -0,0 +1,70 @@ +################################################################################ +# +# alchemy +# +################################################################################ + +ALCHEMY_VERSION = d95b3c38cd37814a1b98d0bbf813de7adaaecfbc +ALCHEMY_SITE = $(call github,Parrot-Developers,alchemy,$(ALCHEMY_VERSION)) +ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) +ALCHEMY_LICENSE_FILES = COPYING README +HOST_ALCHEMY_DEPENDENCIES = host-python3 + +ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy +ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk + +define HOST_ALCHEMY_INSTALL_CMDS + mkdir -p $(ALCHEMY_HOME) + cp -rf $(@D)/* $(ALCHEMY_HOME) + cp $(HOST_ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOME)/atom.mk.in +endef + +$(eval $(host-generic-package)) + +# Variables used by other packages + +ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake + +# TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture. +# When Alchemy manages the architecture, it can add some flags to CFGLAGS and +# can lead to incorrect result with the toolchain provided in TARGET_CROSS. +# 'xxx' is an unknown architecture for Alchemy. Using this value is a simple +# way to disable the Alchemy architecture management. +ALCHEMY_TARGET_ENV = \ + $(TARGET_MAKE_ENV) \ + ALCHEMY_HOME=$(ALCHEMY_HOME) \ + ALCHEMY_WORKSPACE_DIR="$(@D)" \ + ALCHEMY_TARGET_OUT=alchemy-out \ + TARGET_OS=linux \ + TARGET_OS_FLAVOUR=buildroot \ + TARGET_CROSS="$(TARGET_CROSS)" \ + TARGET_ARCH=xxx \ + TARGET_GLOBAL_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + TARGET_GLOBAL_LDFLAGS="$(TARGET_LDFLAGS)" \ + TARGET_GLOBAL_FFLAGS="$(TARGET_FCFLAGS)" \ + TARGET_GLOBAL_FCFLAGS="$(TARGET_FCFLAGS)" + +ifeq ($(BR2_STATIC_LIBS),y) +ALCHEMY_TARGET_ENV += \ + TARGET_FORCE_STATIC=1 \ + TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS)" +else +ALCHEMY_TARGET_ENV += \ + TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS) -fPIC" +endif + +# Install an Alchemy SDK file. +# This macro can be used by Alchemy packages +# $1: Alchemy module name +# $2: Alchemy module file name +# $3: Alchemy module libraries this module depends on +define ALCHEMY_INSTALL_LIB_SDK_FILE + $(INSTALL) -m 0644 -D \ + $(ALCHEMY_HOME)/atom.mk.in \ + $(ALCHEMY_SDK_BASEDIR)/$($(PKG)_NAME)/atom.mk + $(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \ + -e 's#@MODULE@#$(strip $(1))#' \ + -e 's#@MODULE_FILENAME@#$(strip $(2))#' \ + -e 's#@LIBRARIES@#$(strip $(3))#' \ + $(ALCHEMY_SDK_BASEDIR)/$($(PKG)_NAME)/atom.mk +endef diff --git a/package/alchemy/atom.mk.in b/package/alchemy/atom.mk.in new file mode 100644 index 0000000000..084ae0e89f --- /dev/null +++ b/package/alchemy/atom.mk.in @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE := @MODULE@ +LOCAL_SDK := @STAGING_DIR@ +LOCAL_DESTDIR := usr/lib +LOCAL_MODULE_FILENAME := @MODULE_FILENAME@ +LOCAL_LIBRARIES := @LIBRARIES@ +include $(BUILD_LIBRARY) From yann.morin.1998 at free.fr Tue Jan 11 23:27:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 00:27:39 +0100 Subject: [Buildroot] [git commit] package/libfutils: new package Message-ID: <20220111232835.78D4E83509@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef5d311a84a71e52e4163c3df7277bd70286fca4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The libfutils library is a library that contains some common useful functions (list, hash, time). https://github.com/Parrot-Developers/libfutils Signed-off-by: Herve Codina [yann.morin.1998 at free.fr: - do not macro-ify headers install - do not parameterise static libs install dest - reorder macros decaration and use - implicit module name - BUILD_CMDS fit on a single line - LIBFUTILS_TARGET_ENV is all env, not just extra env - add missing mkdir in shared-libs case ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/libfutils/Config.in | 15 +++++++++++ package/libfutils/libfutils.hash | 3 +++ package/libfutils/libfutils.mk | 56 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 563f6df3ff..e0385c7b81 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1194,6 +1194,7 @@ F: package/alchemy/ F: package/dtbocfg/ F: package/libdbi/ F: package/libdbi-drivers/ +F: package/libfutils/ F: package/lua-augeas/ F: package/modsecurity2/ F: package/php-apcu/ diff --git a/package/Config.in b/package/Config.in index 39a98fcc66..163fd53e12 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1986,6 +1986,7 @@ menu "Other" source "package/libevent/Config.in" source "package/libexecinfo/Config.in" source "package/libffi/Config.in" + source "package/libfutils/Config.in" source "package/libgee/Config.in" source "package/libgeos/Config.in" source "package/libglib2/Config.in" diff --git a/package/libfutils/Config.in b/package/libfutils/Config.in new file mode 100644 index 0000000000..7f795fc7e0 --- /dev/null +++ b/package/libfutils/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBFUTILS + bool "libfutils" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP # ulog + depends on BR2_TOOLCHAIN_HAS_THREADS # ulog + select BR2_PACKAGE_ULOG + help + This library contains some common useful functions (list, + hash, time) + + https://github.com/Parrot-Developers/libfutils + +comment "libfutils needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_ATOMIC diff --git a/package/libfutils/libfutils.hash b/package/libfutils/libfutils.hash new file mode 100644 index 0000000000..1fdcd84b13 --- /dev/null +++ b/package/libfutils/libfutils.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 b38d40c46b83e448d8c1716ddfb04b7ecd384f5cd2cb773db5c26c0589accdb3 libfutils-c326ce0cc2a7354381265a7664bb215be587fac6.tar.gz +sha256 eca11a1c62fae8d64a1247d93271375baecff8396141d7ff8d89671ee7e3ed0d COPYING diff --git a/package/libfutils/libfutils.mk b/package/libfutils/libfutils.mk new file mode 100644 index 0000000000..84b53cca3c --- /dev/null +++ b/package/libfutils/libfutils.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# libfutils +# +################################################################################ + +LIBFUTILS_VERSION = c326ce0cc2a7354381265a7664bb215be587fac6 +LIBFUTILS_SITE = $(call github,Parrot-Developers,libfutils,$(LIBFUTILS_VERSION)) +LIBFUTILS_LICENSE = BSD-3-Clause +LIBFUTILS_LICENSE_FILES = COPYING +LIBFUTILS_DEPENDENCIES = host-alchemy ulog +LIBFUTILS_INSTALL_STAGING = YES + +LIBFUTILS_TARGET_ENV = \ + $(ALCHEMY_TARGET_ENV) \ + ALCHEMY_TARGET_SDK_DIRS="$(ALCHEMY_SDK_BASEDIR)/ulog" + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBFUTILS_TARGET_ENV += TARGET_GLOBAL_LDLIBS='-latomic' +endif + +define LIBFUTILS_BUILD_CMDS + $(LIBFUTILS_TARGET_ENV) $(ALCHEMY_MAKE) libfutils +endef + +ifeq ($(BR2_STATIC_LIBS),) +# $(1): destination directory: target or staging +define LIBFUTILS_INSTALL_SHARED_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -m 644 $(@D)/alchemy-out/staging/usr/lib/libfutils.so* \ + $(1)/usr/lib/ +endef +endif + +ifeq ($(BR2_SHARED_LIBS),) +define LIBFUTILS_INSTALL_STATIC_LIBS + mkdir -p $(1)/usr/lib/ + $(INSTALL) -D -m 644 $(@D)/alchemy-out/staging/usr/lib/libfutils.a \ + $(STAGING_DIR)/usr/lib/libfutils.a +endef +endif + +define LIBFUTILS_INSTALL_TARGET_CMDS + $(call LIBFUTILS_INSTALL_SHARED_LIBS, $(TARGET_DIR)) +endef + +define LIBFUTILS_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/futils + $(INSTALL) -m 644 $(@D)/include/futils/* \ + $(STAGING_DIR)/usr/include/futils/ + $(LIBFUTILS_INSTALL_STATIC_LIBS) + $(call LIBFUTILS_INSTALL_SHARED_LIBS, $(STAGING_DIR)) + $(call ALCHEMY_INSTALL_LIB_SDK_FILE, libfutils, libfutils.so, libulog) +endef + +$(eval $(generic-package)) From james.hilliard1 at gmail.com Wed Jan 12 01:25:37 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 11 Jan 2022 18:25:37 -0700 Subject: [Buildroot] [PATCH 1/1] package/gobject-introspection: bump to version 1.70.0 Message-ID: <20220112012537.1362197-1-james.hilliard1@gmail.com> Rebase patches. Backport a patch to fix a build error on latest meson. giscanner/scannerlexer.l license hash change due to add float types: https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/60b0cf2fc2fdc74d13832d1fdde21cfdc813b84e Signed-off-by: James Hilliard --- .../0001-disable-tests.patch | 10 +- .../0002-Add-rpath-links-to-ccompiler.patch | 6 +- ...error-return-codes-from-ldd-wrapper.patch} | 7 +- ...04-build-Avoid-the-doctemplates-hack.patch | 221 ++++++++++++++++++ .../gobject-introspection.hash | 6 +- .../gobject-introspection.mk | 2 +- 6 files changed, 238 insertions(+), 14 deletions(-) rename package/gobject-introspection/{0003-ignore-error-return-codes-from-ldd-wrapper.patch => 0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch} (90%) create mode 100644 package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index 01b11998bd..ed2d9d6fc0 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -1,4 +1,4 @@ -From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001 +From c87faf380ddf44da9d624dabd28178c9065f0f76 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 3 Feb 2020 10:07:15 -0800 Subject: [PATCH] disable tests @@ -13,22 +13,22 @@ Signed-off-by: Adam Duskett 1 file changed, 6 deletions(-) diff --git a/meson.build b/meson.build -index eed4d6b..5058664 100644 +index c2cb577f..65ce7adf 100644 --- a/meson.build +++ b/meson.build -@@ -222,12 +222,6 @@ if get_option('build_introspection_data') == true +@@ -225,12 +225,6 @@ else endif subdir('docs') -# The tests will also run, which is not possible if they -# were built for a different architecture. -if not meson.is_cross_build() -- subdir('tests') +- subdir('tests') -endif - install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) -- -2.24.1 +2.25.1 diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch index 9b9ae99779..e21da42ce7 100644 --- a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch +++ b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch @@ -1,4 +1,4 @@ -From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001 +From 952e2e2bb6a22ec8824223b03b65cb28361c6e34 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 14 Mar 2018 12:07:10 -0400 Subject: [PATCH] Add rpath links to ccompiler @@ -12,7 +12,7 @@ Signed-off-by: Adam Duskett 1 file changed, 2 insertions(+) diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index a8bd5b1..51bb9bc 100644 +index cb97e76f..d29b28c8 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -231,6 +231,8 @@ class CCompiler(object): @@ -25,5 +25,5 @@ index a8bd5b1..51bb9bc 100644 os.pathsep.join(runtime_paths + [os.environ[envvar]]) else: -- -2.14.3 +2.25.1 diff --git a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch similarity index 90% rename from package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch rename to package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch index d43dc1393e..f1ea518954 100644 --- a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch +++ b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch @@ -1,4 +1,4 @@ -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 +From e0fc4a2a5161a36483ddc518be9bb14390f11b19 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 5 Sep 2018 16:46:52 +0200 Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper @@ -14,7 +14,7 @@ Signed-off-by: Adam Duskett 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index d67df95..80352a6 100644 +index 9f8ab5df..7a1a72fe 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries): @@ -26,3 +26,6 @@ index d67df95..80352a6 100644 if isinstance(output, bytes): output = output.decode("utf-8", "replace") +-- +2.25.1 + diff --git a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch new file mode 100644 index 0000000000..0b70b5c4c0 --- /dev/null +++ b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch @@ -0,0 +1,221 @@ +From 0504b26ec2adb13dfdff51679d84ad2f69af5918 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:51:10 +0000 +Subject: [PATCH] build: Avoid the doctemplates hack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The hack that copies the doctemplates directory into the build +directory has stopped working with newer versions of Meson; while it's +possible to copy files, custom_target() cannot depend on a directory. +Additionally, the dependency has always been broken. + +Instead, we enumerate the template files?after all, it's not like they +change a lot?and then we list them as dependencies for the test targets. + +Fixes: #414 + +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +effb1e09dee263cdac4ec593e8caf316e6f01fe2] +--- + giscanner/doctemplates/devdocs/meson.build | 19 +++++++ + giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ + giscanner/meson.build | 14 ++--- + tests/scanner/meson.build | 24 +++++---- + 4 files changed, 98 insertions(+), 22 deletions(-) + create mode 100644 giscanner/doctemplates/devdocs/meson.build + create mode 100644 giscanner/doctemplates/mallard/meson.build + +diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build +new file mode 100644 +index 00000000..2037182a +--- /dev/null ++++ b/giscanner/doctemplates/devdocs/meson.build +@@ -0,0 +1,19 @@ ++doc_templates += files([ ++ 'Gjs/_doc.tmpl', ++ 'Gjs/_index.tmpl', ++ 'Gjs/_method.tmpl', ++ 'Gjs/_methods.tmpl', ++ 'Gjs/_properties.tmpl', ++ 'Gjs/_signals.tmpl', ++ 'Gjs/_staticmethods.tmpl', ++ 'Gjs/_vfuncs.tmpl', ++ 'Gjs/base.tmpl', ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++]) +diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build +new file mode 100644 +index 00000000..5fe4e2af +--- /dev/null ++++ b/giscanner/doctemplates/mallard/meson.build +@@ -0,0 +1,63 @@ ++base_templates = files([ ++ 'base.tmpl', ++ 'class.tmpl', ++ 'namespace.tmpl', ++]) ++ ++c_templates = files([ ++ 'C/callback.tmpl', ++ 'C/class.tmpl', ++ 'C/constructor.tmpl', ++ 'C/default.tmpl', ++ 'C/enum.tmpl', ++ 'C/field.tmpl', ++ 'C/function.tmpl', ++ 'C/interface.tmpl', ++ 'C/method.tmpl', ++ 'C/namespace.tmpl', ++ 'C/property.tmpl', ++ 'C/record.tmpl', ++ 'C/signal.tmpl', ++ 'C/vfunc.tmpl', ++]) ++ ++gjs_templates = files([ ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/constructor.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/field.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++ 'Gjs/property.tmpl', ++ 'Gjs/record.tmpl', ++ 'Gjs/signal.tmpl', ++ 'Gjs/vfunc.tmpl', ++]) ++ ++py_templates = files([ ++ 'Python/callback.tmpl', ++ 'Python/class.tmpl', ++ 'Python/constructor.tmpl', ++ 'Python/default.tmpl', ++ 'Python/enum.tmpl', ++ 'Python/field.tmpl', ++ 'Python/function.tmpl', ++ 'Python/interface.tmpl', ++ 'Python/method.tmpl', ++ 'Python/namespace.tmpl', ++ 'Python/property.tmpl', ++ 'Python/record.tmpl', ++ 'Python/signal.tmpl', ++ 'Python/vfunc.tmpl', ++]) ++ ++doc_templates += [ ++ base_templates, ++ c_templates, ++ gjs_templates, ++ py_templates, ++] +diff --git a/giscanner/meson.build b/giscanner/meson.build +index 41edcd44..3d7dc678 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', + + install_subdir('doctemplates', install_dir: giscannerdir) + +-# XXX: this doesn't track the input, but there is nothing to copy many files +-# in meson. +-doc_templates = custom_target('copy-templates', +- input : 'doctemplates', +- output : 'doctemplates', +- command : [ +- python, '-c', +- 'import sys, shutil;' + +- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + +- 'shutil.copytree(sys.argv[1], sys.argv[2])', +- '@INPUT@', '@OUTPUT@']) ++doc_templates = [] ++subdir('doctemplates/devdocs') ++subdir('doctemplates/mallard') + + flex = find_program('flex', 'win_flex') + bison = find_program('bison', 'win_bison') +diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build +index 5176b957..b81b3fd5 100644 +--- a/tests/scanner/meson.build ++++ b/tests/scanner/meson.build +@@ -525,19 +525,26 @@ foreach gir : test_girs + endforeach + + if has_girdoctool and glib_dep.type_name() == 'pkgconfig' ++ doctool_env = environment() ++ doctool_env.set('srcdir', meson.current_source_dir()) ++ doctool_env.set('builddir', meson.current_build_dir()) ++ + foreach language : ['C', 'Python', 'Gjs'] + regress_docs = custom_target( + 'generate-docs-' + language, + input: regress_gir, +- depends: [doc_templates], ++ depend_files: doc_templates, + build_by_default: not cairo_deps_found, ++ env: doctool_env, + output: 'Regress-1.0-' + language, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), + '--add-include-path=' + meson.current_build_dir(), + '--language', language, +- '@INPUT@', '-o', '@OUTPUT@'], ++ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), ++ '@INPUT@', '-o', '@OUTPUT@', ++ ], + ) + + if cairo_deps_found +@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-' + language], + depends: [regress_docs], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endforeach +@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + regress_sections = custom_target( + 'generate-docs-sections', + input: regress_gir, +- depends: [doc_templates], ++ depend_files: [doc_templates], + build_by_default: not cairo_deps_found, + output: 'Regress-1.0-sections.txt', ++ env: doctool_env, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), +@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-sections.txt'], + depends: [regress_sections], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endif +-- +2.25.1 + diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index e859ba1d3b..5b76df6b40 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.sha256sum -sha256 d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 gobject-introspection-1.68.0.tar.xz +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.sha256sum +sha256 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a gobject-introspection-1.70.0.tar.xz sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad35e98ae9342a3539c36f2171e84d175394ddcff625887290c751302cb02983 giscanner/scannerlexer.l +sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 6a3d321cc7..41d64171a7 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.68 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.70 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz -- 2.25.1 From yann.morin.1998 at free.fr Wed Jan 12 06:43:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 07:43:16 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: fix typo in comment Message-ID: <20220112063713.1B60C82E00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=280ad2e3d3b85bca5a45e8ff365445fe3f111d4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix typo in comment added by commit ea033cecf990ed3f86619647523a9ad2ccb09adb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/riscv-isa-sim/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host index 35e404caf0..4ccf6e9546 100644 --- a/package/riscv-isa-sim/Config.in.host +++ b/package/riscv-isa-sim/Config.in.host @@ -1,6 +1,6 @@ config BR2_PACKAGE_HOST_RISCV_ISA_SIM bool "host riscv-isa-sim" - depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++1 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 help Spike, the RISC-V ISA Simulator, implements a functional model of one or more RISC-V harts. From yann.morin.1998 at free.fr Wed Jan 12 06:47:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 12 Jan 2022 07:47:50 +0100 Subject: [Buildroot] [git commit] package/nodejs: fix host dependencies Message-ID: <20220112064136.B90CD82582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1bbe25437f3120a26067e6f08e4258510f644a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since commit 78d7c5f803c2f59385b57525e2d1d09da15e22a6: WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU Depends on [n]: (BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS [=n] || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n]) && BR2_HOST_GCC_AT_LEAST_8 [=y] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Depends on [n]: BR2_PACKAGE_HOST_QEMU [=y] && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU Depends on [n]: (BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS [=n] || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n]) && BR2_HOST_GCC_AT_LEAST_8 [=y] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Depends on [n]: BR2_PACKAGE_HOST_QEMU [=y] && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_HOST_NODEJS [=y] && BR2_HOST_GCC_AT_LEAST_7 [=y] Fixes: - http://autobuild.buildroot.org/results/d78f660ca4a609a0a072b3f2e04d456bf8cf663f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nodejs/Config.in.host | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 86eaf21dac..4ceaf0c73e 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_NODEJS bool "host nodejs" - depends on BR2_HOST_GCC_AT_LEAST_7 + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_8 select BR2_PACKAGE_HOST_PYTHON3 select BR2_PACKAGE_HOST_PYTHON3_BZIP2 select BR2_PACKAGE_HOST_PYTHON3_SSL @@ -11,3 +12,7 @@ config BR2_PACKAGE_HOST_NODEJS V8. http://nodejs.org/ + +comment "host nodejs needs a host gcc >= 8" + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_8 From thomas.petazzoni at bootlin.com Wed Jan 12 07:09:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 07:09:52 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-11 Message-ID: <20220112070957.64A2D4054B@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-11 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 67 | 9 | 0 | 76 | 2021.11.x | 26 | 9 | 0 | 35 | master | 78 | 70 | 0 | 148 | Classification of failures by reason for master ----------------------------------------------- drbd-utils-9.19.0 | 9 unknown | 6 ksmbd-tools-3.4.3 | 4 python-pyparsing-3.0.6 | 4 refpolicy-2.20220106 | 4 bluez5_utils-5.63 | 3 frr-8.1 | 3 gstreamer1-mm-1.10.0 | 3 libglvnd-1.3.2 | 3 rygel-0.40.2 | 3 vtun-3.0.4 | 3 cryptopp-8.6.0 | 2 package/tinifier/tinifier.m... | 2 qt5base-5.15.2 | 2 samba4-4.15.3 | 2 tinifier-legal-info | 2 vlc-3.0.16 | 2 wavemon-0.9.4 | 2 bat-0.18.3 | 1 btrfs-progs-5.15.1 | 1 cryptsetup-2.4.2 | 1 guile-3.0.7 | 1 host-go-1.17.6 | 1 host-qemu-6.2.0 | 1 libsecret-0.20.4 | 1 linux-pam-1.5.2 | 1 mbedtls-2.28.0 | 1 mesa3d-21.3.3 | 1 tinyalsa-2.0.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/15a9cf2aa8430a4bebd8158e927c281546cb65c9 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b50d796c443371c14792b81e9c3e032bd859fc2b | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/fb8aa5c0705596cebb058b2c8045926dfa70a249 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1b5af409c76708a4a92280f2f09cae0a620f934d | i586 | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/eed8a4b3043dfd851710206c7d8053213f8b6600 | ORPH arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/dd8a0c44a60733d8cbe503a2aadbc2ab90658e7c | arm | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/3b9bc115d4b9b93033fd84d4780a811fe9514f0a | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/888ba0afbd0da0b791e39773eb192319e4e65eac | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/ca008268443235d3f2db19e97bab7f57d576d2ed | or1k | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/33d873317031b09dfcd626cc9745c3565919cb2a | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/24cd2d2b494e215990c94bdb053e6bcefc3ac723 | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/68005d98331f60b567f4ae396af48cd4d562d051 | powerpc64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/ab70984a2f3fc01b028ab27371e7ca7001a6e312 | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/5cb46f3472da8fa51cfc7a82cf77064f5143a062 | riscv64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/bf3b2067d1eb48287aec6d7cd44da3bf11a93aad | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/5e0c47e5c0ab1bfc9874dcfe48313da69789de0a | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/3172057672e33315ceb36732ba9ac59d79a86a48 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b709eec5b78ffa60d9d81e98e2e25cd3234978a4 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9fefef4acf1c3f43544c164b2ee1611e9148d47f | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a9f32f9a09f31e5aed6e2deba1c624b2eb074abf | arm | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/15beae9ce27e5778bd00a4cc77096394583c5f0d | ORPH sparc | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/2c6ee2af3b4cd125b4ffab3bdecc5be22a1fb84c | ORPH microblazeel | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/3479688334765fbbe4cb9620f4d3596f7d710404 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/82a1eb9b63ab62d4cb1a6beae662fcaf1849f950 | ORPH mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/0a509b6ea5b96380f54769b6a82a218669082a89 | arc | host-qemu-6.2.0 | NOK | http://autobuild.buildroot.net/results/d78f660ca4a609a0a072b3f2e04d456bf8cf663f | i586 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/ee8cf10252470ba3ca18eeb7806d4572ddc3e300 | aarch64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/845e3286a8c74ffe909430e6c35fc0e57fe6deee | mipsel | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/56dfc95f1409c9bd738a55d8195cb4a76d988d77 | mips | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/d3fe227349f6f609651e645bb52a62cdc6d98a69 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/c15a522e0696103638a0059860a33d5c29f98c15 | ORPH arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/c5e92f0b355c91cdcebe0070499889473996f337 | ORPH arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/d4cab434d75e3e32d116e040d626704a039618e8 | ORPH arm | libsecret-0.20.4 | NOK | http://autobuild.buildroot.net/results/165b12da9c7f24dada875686fb70b395024db008 | ORPH xtensa | linux-pam-1.5.2 | NOK | http://autobuild.buildroot.net/results/ce74a0b093a0e4745877175444cd4d7a7727eadd | ORPH arm | mbedtls-2.28.0 | NOK | http://autobuild.buildroot.net/results/94498587c121bdfa7d92552f994502766c8f664b | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/0e79790f4d97f4dd91311c4798be17dbe195f745 | i586 | package/tinifier/tinifier.m... | NOK | http://autobuild.buildroot.net/results/6e79e832d6e0752aac39127d731021899b750d1b | arm | package/tinifier/tinifier.m... | NOK | http://autobuild.buildroot.net/results/7d25a2f37a9c9fe2b52da92756653dfd715576a9 | xtensa | python-pyparsing-3.0.6 | NOK | http://autobuild.buildroot.net/results/7f3cadaf55eb05e1bcc8035ebb95e1318f1cb61e | xtensa | python-pyparsing-3.0.6 | NOK | http://autobuild.buildroot.net/results/8ac5224f4b6c2c59035dbfb53541e76f58b15e47 | xtensa | python-pyparsing-3.0.6 | NOK | http://autobuild.buildroot.net/results/1112d9fb6f822f797dad5ca95a6ab60ae9d52146 | mipsel | python-pyparsing-3.0.6 | NOK | http://autobuild.buildroot.net/results/86107109b574a5640ee591e9b578e014b4093785 | riscv64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/8edd742299ef151bb0c247483821666ff4c647a0 | arm | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/87bbab66b99e3cb69aabb86bbb86602a8f53fb8f | s390x | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/d262c9c49afb5fb502fe4a0bd03cf8e09bb9b12d | sh4 | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/b069e816d290459f6ccd4e397b9102a692f4264b | sparc64 | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/a926e27bcd4a3dc416436dcfc3925cbb46e722a4 | sparc | refpolicy-2.20220106 | NOK | http://autobuild.buildroot.net/results/d76c128e73beb2d7f6eafdd415bd7016810c41e7 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a1148517ab0a5b7df108869b7f0f5266fcbae52d | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6a0ba5394dd8ae893435aa804f3647b9e6941ea2 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7cad4263866c9566cf592fea2f00ad4a9b0976fb | arc | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/60f435a9b24e0b4907766287c42f1ca6d0574681 | riscv64 | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/5403db8ae628a54c03191b54c16d9fb28e85937d | x86_64 | tinifier-legal-info | NOK | http://autobuild.buildroot.net/results/02260de5d46506e75b9edc682d2d0361a545125c | powerpc64le | tinifier-legal-info | NOK | http://autobuild.buildroot.net/results/5fce7f16daca17216d786391ea0fffff856c5404 | arm | tinyalsa-2.0.0 | NOK | http://autobuild.buildroot.net/results/14f5860a67d54eda2c492b1ba273a52d481c2a7a | ORPH powerpc | unknown | NOK | http://autobuild.buildroot.net/results/b9901e1bce6c69f57013647527cc128d024ff193 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/df276776863b58d5ded93bf934512944305c4a06 | i586 | unknown | NOK | http://autobuild.buildroot.net/results/1ad5951bf63fe4f2b5c09b10a4931df1dd79c4e2 | aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/736b119603a7939e96327245e0d3d7c1b950d141 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/e2de9096dc52e242b6684c20aad548aeb77a8bd7 | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/a122834187fc7a3b8bb7d5cf2c6cae9c7ba837bc | mips | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/756e1403005de8edce4130234774ab2399fbcbb6 | nios2 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/6f6d72e1f927031c76f87291c68895125a46024c | nios2 | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/fd48559118993d5f86141f0b3a2c548c42912ece | ORPH riscv64 | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/d62427d04dd468265e2981a57eb708394653a02e | ORPH arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/12417b4769fa29094837f76fca2e5e7c4ba0c4b3 | ORPH s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/4e1cb1fb9b09aa374463aed4ff0c6b355fe6a79d | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/67c03ff8555b892bd89a54eb4ccad47b0b6badcc | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 4 gstreamer1-mm-1.10.0 | 1 host-meson-tools-0a02e2d344... | 1 mesa3d-20.3.5 | 1 monkey-f54856ce250c4e257354... | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/e86de759cfb0b1c73afd84eb050fe5c5ee1ab50c | ORPH arc | host-meson-tools-0a02e2d344... | NOK | http://autobuild.buildroot.net/results/bb2bb006c3c6d3c83902d90be2b1363f9cd590fa | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/82b6df5a1b01489249e306e72305fe4a55787b96 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/8c56ea9f82b536179f3443d507cf057b23126f11 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e7b7d1698bfe494dfcd8c9421f5112a20a04fd84 | arc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/d36384e0fb1fa6c57bd774b186831b6de15e47d6 | sh4 | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/2bf60016ecdb68e549911b6e712ffc91ea61d293 | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/312c5aa2809f5d0e43c679a54fa247c140cf0e89 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/f24096094fdebd2951fca67dc057ba78039a6f87 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 4 azmq-1.0.2 | 1 bird-2.0.8 | 1 nodejs-14.18.1 | 1 pipewire-0.3.39 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | azmq-1.0.2 | NOK | http://autobuild.buildroot.net/results/811cf7fe70ab39e8f9408d3ad7803cbcb20de76b | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/3cf8a099bcc8f6ec3e93b288342a95847bcc1424 | aarch64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/a282914cedc659f3d5cad38fac0da02dbac1458d | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/7594eb3a733380be8703b7a243e7a26c1090fedb | riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/70c3c80c346aa723600a2b2ef7af6a7525917a2d | powerpc | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/59bdb605f108641300cf5cf4a72acb16fb46b9b0 | arm | nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/1fcaf3c2f3c37e9cd578054ac84eaaa35be21df3 | mips | pipewire-0.3.39 | NOK | http://autobuild.buildroot.net/results/d3dbca9b909a8cfef9a8d56abe4bc7c2c7dbc9e4 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/52d98e1cec9c4ac71c9c35c2b6e22babd17c8147 | Gitlab CI results for 2022-01-11 ================================ -- http://autobuild.buildroot.net From clg at kaod.org Wed Jan 12 07:07:40 2022 From: clg at kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Wed, 12 Jan 2022 08:07:40 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu: Add a ppc64le-powernv8 configuration In-Reply-To: <20220111214509.79c5c88e@windsurf> References: <20220110210235.817082-1-clg@kaod.org> <20220111214509.79c5c88e@windsurf> Message-ID: <09709dad-59ac-23b6-e3f0-3ec3457c7a14@kaod.org> Hello Thomas, > Thanks, entire patch series applied. One small change was done: add > appropriate entries to the DEVELOPERS file, so that we know who to > contact for those defconfigs :-) Especially if our Gitlab CI > infrastructure detects build issues, you will be notified. sure. I have a generated set here : https://github.com/legoater/qemu-ppc-boot/tree/main/buildroot that I use for non regression on QEMU PPC. > Since you are a PowerPC expert, I'd like to take this opportunity to > ask you about the toolchains we're providing at > https://toolchains.bootlin.com/. For the moment for PowerPC, we are > providing the following toolchains: > > powerpc-440fp, not tested The bamboo machine uses a 440EP CPU implementation, which has a floating point unit. > powerpc64-e5500, tested with qemu_ppc64_e5500_defconfig > powerpc64-e6500, not tested e6500 is nearly the same CPU as e5500. AFAIK, the main differences are altivec instructions and more HV support for guest translations. More info here : https://www.linux-kvm.org/page/E500_virtual_CPU_specification > powerpc64le-power8, tested with qemu_ppc64le_pseries_defconfig > powerpc64-power8, tested with qemu_ppc64_pseries_defconfig > powerpc-e300c3, not tested > powerpc-e500mc, not tested you could use the 32bit ppce500 machine for that. > I suppose I could now test the powerpc-440fp toolchain with the > qemu_ppc_bamboo_defconfig you have added. Is that correct? yes. > What about the other toolchain configurations? Is there some matching > Qemu emulation?> > And generally speaking, does this selection of PowerPC architecture > variants make sense to offer pre-compiled toolchains? For quite a Here is a quick status of machine/CPUs that QEMU implements : * prep prep: 604 CPU (we might remove 601-603 CPUs) * embedded ref405ep: 405EP (user space segfaults but same image works on 44x CPUs I hope to get that one fixed by QEMU 7.0 ) bambo: 440FP sam460ex: 460EP is very much like the 440fp * Mac g3beige: G3 (or 75x CPU) family mac99: G4 (7400 7410 7441 7447 7448 7450 7451 7455 7457) family * book3e 32bit: ppce500: e500mc mpc8544ds: mpc8544 * book3e 64bit: ppce500 (KVM): e5500, e6500 * book3s 64bit (para virtualized and baremetal): mac99: PPC970 pseries (BE only): PPC970, PPC970mp, POWER5+ pseries (LE, BE and KVM) : POWER7, POWER8, POWER9, POWER10 powernv: POWER8, POWER9, POWER10 Most of the attention is on book3s 64bit CPUs. MAC emulation is well maintained. Embedded world is not. > while, we've had requests for other PowerPC variants: > https://github.com/bootlin/toolchains-builder/issues/2. Your input > would be very welcome :-) OK. I will take a look. Thanks, C. From thomas.petazzoni at bootlin.com Wed Jan 12 08:10:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 09:10:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 In-Reply-To: <20220110211323.1828141-1-james.hilliard1@gmail.com> References: <20220110211323.1828141-1-james.hilliard1@gmail.com> Message-ID: <20220112091058.76318df8@windsurf> Hello James, On Mon, 10 Jan 2022 14:13:23 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) I am wondering if this update hasn't broken some meson packages: * polkit http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f/build-end.log ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. * host-gobject-introspection http://autobuild.buildroot.net/results/95e/95e4a23c16f6bd96566dc497663f38a0858c5a6e/build-end.log ../output-1/build/host-gobject-introspection-1.68.0/giscanner/meson.build:51:0: ERROR: File doctemplates does not exist. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 08:14:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 09:14:22 +0100 Subject: [Buildroot] [PATCH] skeleton + init: prepare /run/lock and adjust compat symlinks In-Reply-To: <20201004224137.193808-1-nolange79@gmail.com> References: <20201004224137.193808-1-nolange79@gmail.com> Message-ID: <20220112091422.1cd29c1f@windsurf> Hello Norbert, On Mon, 5 Oct 2020 00:41:36 +0200 Norbert Lange wrote: > Linux distros changed /var/run and /var/lock to reside on an tmpfs in > /run a long time ago, and buildroot seems to agree by providing this > tmpfs on all supported init systems. I am not 100% sure but it seems like this patch has potentially broken the build of vtun, which now fails with: /usr/bin/install: cannot create directory '/home/giuliobenetti/autobuild/run/instance-0/output-1/target/var/lock': File exists If you look at http://autobuild.buildroot.net/?reason=vtun%, vtun version 3.0.4 restarted failing to build on January 10, with this error. Could you have a look ? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From nolange79 at gmail.com Wed Jan 12 08:53:44 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 12 Jan 2022 09:53:44 +0100 Subject: [Buildroot] [PATCH] skeleton + init: prepare /run/lock and adjust compat symlinks In-Reply-To: <20220112091422.1cd29c1f@windsurf> References: <20201004224137.193808-1-nolange79@gmail.com> <20220112091422.1cd29c1f@windsurf> Message-ID: Thomas Petazzoni schrieb am Mi., 12. Jan. 2022, 09:14: > Hello Norbert, > > On Mon, 5 Oct 2020 00:41:36 +0200 > Norbert Lange wrote: > > > Linux distros changed /var/run and /var/lock to reside on an tmpfs in > > /run a long time ago, and buildroot seems to agree by providing this > > tmpfs on all supported init systems. > > I am not 100% sure but it seems like this patch has potentially broken > the build of vtun, which now fails with: > > /usr/bin/install: cannot create directory > '/home/giuliobenetti/autobuild/run/instance-0/output-1/target/var/lock': > File exists > > If you look at http://autobuild.buildroot.net/?reason=vtun%, vtun > version 3.0.4 restarted failing to build on January 10, with this error. > > Could you have a look ? > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Seems like the issue is, that run/lock is not existing when installing. Anything installed there will be gone (already before this commit), so it's kinda pointless to do so. I don't know how many packages have this issue, imho it would be better to fix them instead of making a run/lock directory for broken packages (that will get removed later) Norbert -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Jan 12 09:11:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 02:11:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 In-Reply-To: <20220112091058.76318df8@windsurf> References: <20220110211323.1828141-1-james.hilliard1@gmail.com> <20220112091058.76318df8@windsurf> Message-ID: On Wed, Jan 12, 2022 at 1:11 AM Thomas Petazzoni wrote: > > Hello James, > > On Mon, 10 Jan 2022 14:13:23 -0700 > James Hilliard wrote: > > > Signed-off-by: James Hilliard > > --- > > package/meson/meson.hash | 4 ++-- > > package/meson/meson.mk | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > I am wondering if this update hasn't broken some meson packages: > > * polkit > http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f/build-end.log > > ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. > > * host-gobject-introspection > http://autobuild.buildroot.net/results/95e/95e4a23c16f6bd96566dc497663f38a0858c5a6e/build-end.log > > ../output-1/build/host-gobject-introspection-1.68.0/giscanner/meson.build:51:0: ERROR: File doctemplates does not exist. That one should be fixed by this update: https://patchwork.ozlabs.org/project/buildroot/patch/20220112012537.1362197-1-james.hilliard1 at gmail.com/ > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From sebastien.szymanski at armadeus.com Wed Jan 12 09:42:50 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Wed, 12 Jan 2022 10:42:50 +0100 Subject: [Buildroot] [PATCH 3/3] package/gstreamer1/gst1-imx2: new package In-Reply-To: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> Message-ID: <20220112094250.27022-3-sebastien.szymanski@armadeus.com> This is version 2 of gst1-imx. Signed-off-by: S?bastien Szymanski --- package/gstreamer1/Config.in | 1 + package/gstreamer1/gst1-imx2/Config.in | 75 +++++++++++++++++++++ package/gstreamer1/gst1-imx2/gst1-imx2.hash | 3 + package/gstreamer1/gst1-imx2/gst1-imx2.mk | 75 +++++++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 package/gstreamer1/gst1-imx2/Config.in create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.hash create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.mk diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index 8fe8a34395..436c76379d 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -9,6 +9,7 @@ source "package/gstreamer1/gst1-plugins-bad/Config.in" source "package/gstreamer1/gst1-plugins-ugly/Config.in" source "package/gstreamer1/gst1-devtools/Config.in" source "package/gstreamer1/gst1-imx/Config.in" +source "package/gstreamer1/gst1-imx2/Config.in" source "package/gstreamer1/gst1-interpipe/Config.in" source "package/gstreamer1/gst1-libav/Config.in" source "package/gstreamer1/gst1-python/Config.in" diff --git a/package/gstreamer1/gst1-imx2/Config.in b/package/gstreamer1/gst1-imx2/Config.in new file mode 100644 index 0000000000..b95e6bdb21 --- /dev/null +++ b/package/gstreamer1/gst1-imx2/Config.in @@ -0,0 +1,75 @@ +menuconfig BR2_PACKAGE_GST1_IMX2 + bool "gst1-imx2" + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX + depends on BR2_PACKAGE_LIBIMXDMABUFFER + select BR2_PACKAGE_GST1_PLUGINS_BASE + help + This is a set of GStreamer 1.0 plugins for plugins for + Freescale's i.MX platforms, which make use of the i.MX + multimedia capabilities. + + https://github.com/Freescale/gstreamer-imx + +if BR2_PACKAGE_GST1_IMX2 + +config BR2_PACKAGE_GST1_IMX2_G2D + bool "imxg2d" + depends on BR2_PACKAGE_IMX_GPU_G2D + help + Elements leveraging the 2D GPU + +comment "imxg2d needs the G2D libraries" + depends on !BR2_PACKAGE_IMX_GPU_G2D + +config BR2_PACKAGE_GST1_IMX2_IPU + bool "imxipu" + depends on BR2_LINUX_KERNEL + help + Elements leveraging the IPU + +comment "imxipu needs an imx-specific Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_GST1_IMX2_MP3ENCODER + bool "mp3encoder" + depends on BR2_PACKAGE_IMX_CODEC + help + Elements for MP3 encoding + +comment "mp3encoder needs the i.MX codec binaries" + depends on !BR2_PACKAGE_IMX_CODEC + +config BR2_PACKAGE_GST1_IMX2_PXP + bool "imxpxp" + depends on BR2_LINUX_KERNEL + help + Elements leveraging the PXP + +comment "imxpxp needs an imx-specific Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_GST1_IMX2_UNIAUDIODEC + bool "uniaudiodec" + depends on BR2_PACKAGE_IMX_CODEC + help + Elements for audio decoding + +comment "uniaudiodec needs the i.MX codec binaries" + depends on !BR2_PACKAGE_IMX_CODEC + +config BR2_PACKAGE_GST1_IMX2_VPU + bool "imxvpu" + depends on BR2_PACKAGE_LIBIMXVPUAPI2 + help + Elements leveraging the VPU + +comment "imxvpu needs the VPU imxvpuapi2 library" + depends on !BR2_PACKAGE_LIBIMXVPUAPI2 + +config BR2_PACKAGE_GST1_IMX2_V4L2 + bool "imxv4l2" + select BR2_PACKAGE_GST1_PLUGINS_BAD + help + Elements for V4L2 capture and output + +endif diff --git a/package/gstreamer1/gst1-imx2/gst1-imx2.hash b/package/gstreamer1/gst1-imx2/gst1-imx2.hash new file mode 100644 index 0000000000..cc0734fd52 --- /dev/null +++ b/package/gstreamer1/gst1-imx2/gst1-imx2.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 57c0e05b3d57f90df8a16760f4373e04ed60c3a7fab7844c00392f67f889d196 gst1-imx2-9a200b1551c4531234f9b6437eac2c42a07334b0.tar.gz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE diff --git a/package/gstreamer1/gst1-imx2/gst1-imx2.mk b/package/gstreamer1/gst1-imx2/gst1-imx2.mk new file mode 100644 index 0000000000..f71aeae4f6 --- /dev/null +++ b/package/gstreamer1/gst1-imx2/gst1-imx2.mk @@ -0,0 +1,75 @@ +################################################################################ +# +# gst1-imx2 +# +################################################################################ + +GST1_IMX2_VERSION = 9a200b1551c4531234f9b6437eac2c42a07334b0 +GST1_IMX2_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX2_VERSION)) +GST1_IMX2_LICENSE = LGPL-2.0+ +GST1_IMX2_LICENSE_FILES = LICENSE +GST1_IMX2_INSTALL_STAGING = YES + +GST1_IMX2_DEPENDENCIES = \ + host-pkgconf \ + gstreamer1 \ + gst1-plugins-base \ + libimxdmabuffer + +GST1_IMX2_CONF_OPTS = -Dsysroot=$(STAGING_DIR) + +ifeq ($(BR2_LINUX_KERNEL),y) +# IPU and PXP need access to imx-specific kernel headers +GST1_IMX2_DEPENDENCIES += linux +endif + +ifeq ($(BR2_PACKAGE_IMX_CODEC),y) +GST1_IMX2_DEPENDENCIES += imx-codec +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_G2D),y) +GST1_IMX2_CONF_OPTS += -Dg2d=enabled +GST1_IMX2_DEPENDENCIES += imx-gpu-g2d +else +GST1_IMX2_CONF_OPTS += -Dg2d=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_IPU),y) +GST1_IMX2_CONF_OPTS += -Dipu=enabled +else +GST1_IMX2_CONF_OPTS += -Dipu=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_MP3ENCODER),y) +GST1_IMX2_CONF_OPTS += -Dmp3encoder=enabled +else +GST1_IMX2_CONF_OPTS += -Dmp3encoder=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_PXP),y) +GST1_IMX2_CONF_OPTS += -Dpxp=enabled +else +GST1_IMX2_CONF_OPTS += -Dpxp=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_UNIAUDIODEC),y) +GST1_IMX2_CONF_OPTS += -Duniaudiodec=enabled +else +GST1_IMX2_CONF_OPTS += -Duniaudiodec=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_VPU),y) +GST1_IMX2_DEPENDENCIES += libimxvpuapi2 +GST1_IMX2_CONF_OPTS += -Dvpu=enabled +else +GST1_IMX2_CONF_OPTS += -Dvpu=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_IMX2_V4L2),y) +GST1_IMX2_DEPENDENCIES += gst1-plugins-bad +GST1_IMX2_CONF_OPTS += -Dv4l2=true +else +GST1_IMX2_CONF_OPTS += -Dv4l2=false +endif + +$(eval $(meson-package)) -- 2.34.1 From james.hilliard1 at gmail.com Wed Jan 12 09:47:31 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 02:47:31 -0700 Subject: [Buildroot] [PATCH 1/1] package/polkit: fix build on meson 0.61.0 Message-ID: <20220112094731.2117910-1-james.hilliard1@gmail.com> Backport a patch removing invalid positional arguments: ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. Fixes: - http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f Signed-off-by: James Hilliard --- ...tional-parameters-to-i18n.merge_file.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch diff --git a/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch new file mode 100644 index 0000000000..25fa4ef19b --- /dev/null +++ b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch @@ -0,0 +1,45 @@ +From 30c368a6b729bc8a0a9d0d023739c4fa07b0928b Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 25 Oct 2021 20:21:27 +0100 +Subject: [PATCH] Don't pass positional parameters to i18n.merge_file + +These were always ignored, and Meson 0.60.0 disallowed them. + +Resolves: https://gitlab.freedesktop.org/polkit/polkit/-/issues/160 +Reference: https://github.com/mesonbuild/meson/pull/9445 +Signed-off-by: Simon McVittie +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99] +--- + actions/meson.build | 1 - + src/examples/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/actions/meson.build b/actions/meson.build +index 2abaaf3..1e3f370 100644 +--- a/actions/meson.build ++++ b/actions/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +diff --git a/src/examples/meson.build b/src/examples/meson.build +index c6305ab..8c18de5 100644 +--- a/src/examples/meson.build ++++ b/src/examples/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.examples.pkexec.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +2.25.1 + -- 2.25.1 From james.hilliard1 at gmail.com Wed Jan 12 09:48:32 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 02:48:32 -0700 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.0 In-Reply-To: <20220112091058.76318df8@windsurf> References: <20220110211323.1828141-1-james.hilliard1@gmail.com> <20220112091058.76318df8@windsurf> Message-ID: On Wed, Jan 12, 2022 at 1:11 AM Thomas Petazzoni wrote: > > Hello James, > > On Mon, 10 Jan 2022 14:13:23 -0700 > James Hilliard wrote: > > > Signed-off-by: James Hilliard > > --- > > package/meson/meson.hash | 4 ++-- > > package/meson/meson.mk | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > I am wondering if this update hasn't broken some meson packages: > > * polkit > http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f/build-end.log > > ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. Yeah, this should fix that bug: https://patchwork.ozlabs.org/project/buildroot/patch/20220112094731.2117910-1-james.hilliard1 at gmail.com/ > > * host-gobject-introspection > http://autobuild.buildroot.net/results/95e/95e4a23c16f6bd96566dc497663f38a0858c5a6e/build-end.log > > ../output-1/build/host-gobject-introspection-1.68.0/giscanner/meson.build:51:0: ERROR: File doctemplates does not exist. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From sebastien.szymanski at armadeus.com Wed Jan 12 09:42:49 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Wed, 12 Jan 2022 10:42:49 +0100 Subject: [Buildroot] [PATCH 2/3] package/libimxvpuapi2: new package In-Reply-To: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> Message-ID: <20220112094250.27022-2-sebastien.szymanski@armadeus.com> This is version 2 of libimxvpuapi. The API has been rewritten, and is incompatible with the older one. Currently, the following platforms are supported (listed with their VPUs): * i.MX6 (Chips&Media CODA960 codec) * i.MX8m (Hantro G1/G2 decoder, no encoder) * i.MX8mm (Hantro G1/G2 decoder, Hantro H1 encoder) Signed-off-by: S?bastien Szymanski --- package/Config.in | 1 + package/libimxvpuapi2/Config.in | 48 ++++++++++++++++++++++++ package/libimxvpuapi2/libimxvpuapi2.hash | 3 ++ package/libimxvpuapi2/libimxvpuapi2.mk | 28 ++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 package/libimxvpuapi2/Config.in create mode 100644 package/libimxvpuapi2/libimxvpuapi2.hash create mode 100644 package/libimxvpuapi2/libimxvpuapi2.mk diff --git a/package/Config.in b/package/Config.in index 8d844aa11e..009d2006f0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1763,6 +1763,7 @@ menu "Multimedia" source "package/libebml/Config.in" source "package/libhdhomerun/Config.in" source "package/libimxvpuapi/Config.in" + source "package/libimxvpuapi2/Config.in" source "package/libmatroska/Config.in" source "package/libmms/Config.in" source "package/libmpeg2/Config.in" diff --git a/package/libimxvpuapi2/Config.in b/package/libimxvpuapi2/Config.in new file mode 100644 index 0000000000..0954718cc0 --- /dev/null +++ b/package/libimxvpuapi2/Config.in @@ -0,0 +1,48 @@ +comment "libimxvpuapi2 needs an i.MX platform with VPU support and libimxdmabuffer" + depends on BR2_arm || BR2_aarch64 + depends on (!BR2_PACKAGE_FREESCALE_IMX_HAS_VPU \ + && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO) \ + || !BR2_PACKAGE_LIBIMXDMABUFFER + +config BR2_PACKAGE_LIBIMXVPUAPI2 + bool "libimxvpuapi2" + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU || BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO + depends on BR2_PACKAGE_LIBIMXDMABUFFER + select BR2_PACKAGE_IMX_VPU if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + select BR2_PACKAGE_IMX_VPU_HANTRO if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO + help + This library provides an API for using hardware video codecs + on i.MX platforms. The API abstracts away platform specific + details and allows for using the same code with different + hardware video codecs on different i.MX platforms. + + This is version 2 of libimxvpuapi. The API has been rewritten, + and is incompatible with the older one. + + https://github.com/Freescale/libimxvpuapi + +if BR2_PACKAGE_LIBIMXVPUAPI2 +choice + prompt "Platform" + +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 + bool "i.MX6 (Coda)" + depends on BR2_PACKAGE_IMX_VPU + +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M + bool "i.MX8M (Hantro)" + depends on BR2_PACKAGE_IMX_VPU_HANTRO + +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM + bool "i.MX8MM (Hantro)" + depends on BR2_PACKAGE_IMX_VPU_HANTRO +endchoice + +config BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM + string + default "imx6" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 + default "imx8m" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M + default "imx8mm" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM + +endif diff --git a/package/libimxvpuapi2/libimxvpuapi2.hash b/package/libimxvpuapi2/libimxvpuapi2.hash new file mode 100644 index 0000000000..d26cf8767b --- /dev/null +++ b/package/libimxvpuapi2/libimxvpuapi2.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 611a5176e37e5132d97817e6d6048acf229f67efd2201e3f4aab6f720e7b67d1 libimxvpuapi2-2.2.0.tar.gz +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE diff --git a/package/libimxvpuapi2/libimxvpuapi2.mk b/package/libimxvpuapi2/libimxvpuapi2.mk new file mode 100644 index 0000000000..6957171ad3 --- /dev/null +++ b/package/libimxvpuapi2/libimxvpuapi2.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# libimxvpuapi2 +# +################################################################################ + +LIBIMXVPUAPI2_VERSION = 2.2.0 +LIBIMXVPUAPI2_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI2_VERSION)) +LIBIMXVPUAPI2_LICENSE = LGPL-2.1+ +LIBIMXVPUAPI2_LICENSE_FILES = LICENSE +LIBIMXVPUAPI2_DEPENDENCIES = host-pkgconf host-python3 libimxdmabuffer +LIBIMXVPUAPI2_INSTALL_STAGING = YES +LIBIMXVPUAPI2_NEEDS_EXTERNAL_WAF = NO + +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX6),y) +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu +endif + +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M)$(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM),y) +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu-hantro +endif + +LIBIMXVPUAPI2_CONF_OPTS += \ + --imx-headers=$(STAGING_DIR)/usr/include/ \ + --sysroot-path=$(STAGING_DIR) \ + --imx-platform=$(BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM) + +$(eval $(waf-package)) -- 2.34.1 From nolange79 at gmail.com Wed Jan 12 10:10:20 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 12 Jan 2022 11:10:20 +0100 Subject: [Buildroot] [PATCH] system/skeleton: provide run/lock directory Message-ID: <20220112101021.456463-1-nolange79@gmail.com> We changed the skeletons in bf01e51f3c, so that var/lock points to run/lock. This resulted in build failures as some packages want to work with these paths. - Create run/lock, the run directory will be purged later anyway (since 5e78e7e97d). - for init == systemd, create the var/lock symlink early to prevent packages creating this path as directory. Signed-off-by: Norbert Lange --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 2 ++ system/skeleton/run/{ => lock}/.empty | 0 2 files changed, 2 insertions(+) rename system/skeleton/run/{ => lock}/.empty (100%) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 1e212cc2f7..795a171809 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,8 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + # prevent install scripts to create var/lock as directory + ln -s ../run/lock $(TARGET_DIR)/var/lock install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef diff --git a/system/skeleton/run/.empty b/system/skeleton/run/lock/.empty similarity index 100% rename from system/skeleton/run/.empty rename to system/skeleton/run/lock/.empty -- 2.34.1 From nolange79 at gmail.com Wed Jan 12 10:19:18 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 12 Jan 2022 11:19:18 +0100 Subject: [Buildroot] [PATCH] system/skeleton: provide run/lock directory In-Reply-To: <20220112101021.456463-1-nolange79@gmail.com> References: <20220112101021.456463-1-nolange79@gmail.com> Message-ID: Am Mi., 12. Jan. 2022 um 11:10 Uhr schrieb Norbert Lange : > > We changed the skeletons in bf01e51f3c, so that var/lock > points to run/lock. This resulted in build failures as > some packages want to work with these paths. > > - Create run/lock, the run directory will be purged > later anyway (since 5e78e7e97d). > - for init == systemd, create the var/lock symlink early > to prevent packages creating this path as directory. > > Signed-off-by: Norbert Lange > --- > package/skeleton-init-systemd/skeleton-init-systemd.mk | 2 ++ > system/skeleton/run/{ => lock}/.empty | 0 > 2 files changed, 2 insertions(+) > rename system/skeleton/run/{ => lock}/.empty (100%) > > diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk > index 1e212cc2f7..795a171809 100644 > --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk > +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk > @@ -62,6 +62,8 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS > mkdir -p $(TARGET_DIR)/srv > mkdir -p $(TARGET_DIR)/var > ln -s ../run $(TARGET_DIR)/var/run > + # prevent install scripts to create var/lock as directory > + ln -s ../run/lock $(TARGET_DIR)/var/lock > install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf > $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) > endef > diff --git a/system/skeleton/run/.empty b/system/skeleton/run/lock/.empty > similarity index 100% > rename from system/skeleton/run/.empty > rename to system/skeleton/run/lock/.empty > -- > 2.34.1 > Fixes: http://autobuild.buildroot.net/results/3ee/3ee8f9ee55e51af38e9dbe7b9840c9589d88a30f (and alot more containing the vtun package) For someone not fluent with mailing list workflows, and working with a couple projects, it might help having a few example commit messages (-templates) in the docs. ie for respins, bug fixes, versioning (potentially of series) Norbert From baruch at tkos.co.il Wed Jan 12 10:31:58 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Wed, 12 Jan 2022 12:31:58 +0200 Subject: [Buildroot] [PATCH 2/3] package/libimxvpuapi2: new package In-Reply-To: <20220112094250.27022-2-sebastien.szymanski@armadeus.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> <20220112094250.27022-2-sebastien.szymanski@armadeus.com> Message-ID: <87bl0hw8ek.fsf@tarshish> Hi S?bastien, On Wed, Jan 12 2022, S?bastien Szymanski wrote: > This is version 2 of libimxvpuapi. > The API has been rewritten, and is incompatible with the older one. > Currently, the following platforms are supported (listed with their VPUs): > * i.MX6 (Chips&Media CODA960 codec) > * i.MX8m (Hantro G1/G2 decoder, no encoder) > * i.MX8mm (Hantro G1/G2 decoder, Hantro H1 encoder) Is there patch 1/3 in this series? I didn't show up in the list. Thanks, baruch > > Signed-off-by: S?bastien Szymanski > --- > package/Config.in | 1 + > package/libimxvpuapi2/Config.in | 48 ++++++++++++++++++++++++ > package/libimxvpuapi2/libimxvpuapi2.hash | 3 ++ > package/libimxvpuapi2/libimxvpuapi2.mk | 28 ++++++++++++++ > 4 files changed, 80 insertions(+) > create mode 100644 package/libimxvpuapi2/Config.in > create mode 100644 package/libimxvpuapi2/libimxvpuapi2.hash > create mode 100644 package/libimxvpuapi2/libimxvpuapi2.mk > > diff --git a/package/Config.in b/package/Config.in > index 8d844aa11e..009d2006f0 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1763,6 +1763,7 @@ menu "Multimedia" > source "package/libebml/Config.in" > source "package/libhdhomerun/Config.in" > source "package/libimxvpuapi/Config.in" > + source "package/libimxvpuapi2/Config.in" > source "package/libmatroska/Config.in" > source "package/libmms/Config.in" > source "package/libmpeg2/Config.in" > diff --git a/package/libimxvpuapi2/Config.in b/package/libimxvpuapi2/Config.in > new file mode 100644 > index 0000000000..0954718cc0 > --- /dev/null > +++ b/package/libimxvpuapi2/Config.in > @@ -0,0 +1,48 @@ > +comment "libimxvpuapi2 needs an i.MX platform with VPU support and libimxdmabuffer" > + depends on BR2_arm || BR2_aarch64 > + depends on (!BR2_PACKAGE_FREESCALE_IMX_HAS_VPU \ > + && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO) \ > + || !BR2_PACKAGE_LIBIMXDMABUFFER > + > +config BR2_PACKAGE_LIBIMXVPUAPI2 > + bool "libimxvpuapi2" > + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX > + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU || BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO > + depends on BR2_PACKAGE_LIBIMXDMABUFFER > + select BR2_PACKAGE_IMX_VPU if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU > + select BR2_PACKAGE_IMX_VPU_HANTRO if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO > + help > + This library provides an API for using hardware video codecs > + on i.MX platforms. The API abstracts away platform specific > + details and allows for using the same code with different > + hardware video codecs on different i.MX platforms. > + > + This is version 2 of libimxvpuapi. The API has been rewritten, > + and is incompatible with the older one. > + > + https://github.com/Freescale/libimxvpuapi > + > +if BR2_PACKAGE_LIBIMXVPUAPI2 > +choice > + prompt "Platform" > + > +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 > + bool "i.MX6 (Coda)" > + depends on BR2_PACKAGE_IMX_VPU > + > +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M > + bool "i.MX8M (Hantro)" > + depends on BR2_PACKAGE_IMX_VPU_HANTRO > + > +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM > + bool "i.MX8MM (Hantro)" > + depends on BR2_PACKAGE_IMX_VPU_HANTRO > +endchoice > + > +config BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM > + string > + default "imx6" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 > + default "imx8m" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M > + default "imx8mm" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM > + > +endif > diff --git a/package/libimxvpuapi2/libimxvpuapi2.hash b/package/libimxvpuapi2/libimxvpuapi2.hash > new file mode 100644 > index 0000000000..d26cf8767b > --- /dev/null > +++ b/package/libimxvpuapi2/libimxvpuapi2.hash > @@ -0,0 +1,3 @@ > +# locally computed hash > +sha256 611a5176e37e5132d97817e6d6048acf229f67efd2201e3f4aab6f720e7b67d1 libimxvpuapi2-2.2.0.tar.gz > +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE > diff --git a/package/libimxvpuapi2/libimxvpuapi2.mk b/package/libimxvpuapi2/libimxvpuapi2.mk > new file mode 100644 > index 0000000000..6957171ad3 > --- /dev/null > +++ b/package/libimxvpuapi2/libimxvpuapi2.mk > @@ -0,0 +1,28 @@ > +################################################################################ > +# > +# libimxvpuapi2 > +# > +################################################################################ > + > +LIBIMXVPUAPI2_VERSION = 2.2.0 > +LIBIMXVPUAPI2_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI2_VERSION)) > +LIBIMXVPUAPI2_LICENSE = LGPL-2.1+ > +LIBIMXVPUAPI2_LICENSE_FILES = LICENSE > +LIBIMXVPUAPI2_DEPENDENCIES = host-pkgconf host-python3 libimxdmabuffer > +LIBIMXVPUAPI2_INSTALL_STAGING = YES > +LIBIMXVPUAPI2_NEEDS_EXTERNAL_WAF = NO > + > +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX6),y) > +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu > +endif > + > +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M)$(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM),y) > +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu-hantro > +endif > + > +LIBIMXVPUAPI2_CONF_OPTS += \ > + --imx-headers=$(STAGING_DIR)/usr/include/ \ > + --sysroot-path=$(STAGING_DIR) \ > + --imx-platform=$(BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM) > + > +$(eval $(waf-package)) -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From thomas.petazzoni at bootlin.com Wed Jan 12 10:36:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:36:00 +0100 Subject: [Buildroot] [git commit] package/snappy: bump to version 1.1.9 Message-ID: <20220112103044.4B7238349D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4317b1f9f21eda6d01c10da1ed15a2d87cfc666c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Disable benchmarks through option added by https://github.com/google/snappy/commit/4ebd8b2f23dd4ab67ca695256a128cd796d39ce6 - Update indentation in hash file (two spaces) https://github.com/google/snappy/releases/tag/1.1.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...nline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch | 71 ++++++++++++++++++++++ package/snappy/snappy.hash | 4 +- package/snappy/snappy.mk | 4 +- 3 files changed, 75 insertions(+), 4 deletions(-) diff --git a/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch new file mode 100644 index 0000000000..bd2ef07794 --- /dev/null +++ b/package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch @@ -0,0 +1,71 @@ +From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001 +From: "Georgi D. Sotirov" +Date: Wed, 5 May 2021 14:16:46 +0300 +Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE + +Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to +fix the following compilation errors and a warning with GCC: + +[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o +/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS +-I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 +-march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 +-DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c +/tmp/snappy-1.1.9/snappy.cc +/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline +function might not be inlinable [-Wattributes] + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair snappy::DecompressBranchless(const uint8_t*, const +uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned +char; ptrdiff_t = int]': +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in +call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, +size_t*)': function body can be overwritten at link time + size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + ^ +/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here + size_t tag_type = AdvanceToNextTag(&ip, &tag); + ^ +CMakeFiles/snappy.dir/build.make:137: recipe for target +'CMakeFiles/snappy.dir/snappy.cc.o' failed + +Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE +macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ +inline specifier. + +[Retrieved from: +https://github.com/google/snappy/pull/128/commits/0c716d435abe65250100c2caea0e5126ac4e14bd] +Signed-off-by: Fabrice Fontaine +--- + snappy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snappy.cc b/snappy.cc +index 79dc0e8d..51157be2 100644 +--- a/snappy.cc ++++ b/snappy.cc +@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) { + } + + SNAPPY_ATTRIBUTE_ALWAYS_INLINE +-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { ++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { + const uint8_t*& ip = *ip_p; + // This section is crucial for the throughput of the decompression loop. + // The latency of an iteration is fundamentally constrained by the diff --git a/package/snappy/snappy.hash b/package/snappy/snappy.hash index c08c5b7fe4..b49b0e7e3b 100644 --- a/package/snappy/snappy.hash +++ b/package/snappy/snappy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f snappy-1.1.8.tar.gz -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING +sha256 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 snappy-1.1.9.tar.gz +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 COPYING diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index e1fa28fbce..d31dcdd5fe 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -4,12 +4,12 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.8 +SNAPPY_VERSION = 1.1.9 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING SNAPPY_CPE_ID_VENDOR = google SNAPPY_INSTALL_STAGING = YES -SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_TESTS=OFF +SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_BENCHMARKS=OFF -DSNAPPY_BUILD_TESTS=OFF $(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Jan 12 10:36:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:36:03 +0100 Subject: [Buildroot] [git commit] package/polkit: fix build on meson 0.61.0 Message-ID: <20220112103044.6999E82A79@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e0118a6a7d85081529ad66aa72f74025d682c60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Backport a patch removing invalid positional arguments: ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. Fixes: - http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...-positional-parameters-to-i18n.merge_file.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch new file mode 100644 index 0000000000..25fa4ef19b --- /dev/null +++ b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch @@ -0,0 +1,45 @@ +From 30c368a6b729bc8a0a9d0d023739c4fa07b0928b Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 25 Oct 2021 20:21:27 +0100 +Subject: [PATCH] Don't pass positional parameters to i18n.merge_file + +These were always ignored, and Meson 0.60.0 disallowed them. + +Resolves: https://gitlab.freedesktop.org/polkit/polkit/-/issues/160 +Reference: https://github.com/mesonbuild/meson/pull/9445 +Signed-off-by: Simon McVittie +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99] +--- + actions/meson.build | 1 - + src/examples/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/actions/meson.build b/actions/meson.build +index 2abaaf3..1e3f370 100644 +--- a/actions/meson.build ++++ b/actions/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +diff --git a/src/examples/meson.build b/src/examples/meson.build +index c6305ab..8c18de5 100644 +--- a/src/examples/meson.build ++++ b/src/examples/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.examples.pkexec.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +2.25.1 + From thomas.petazzoni at bootlin.com Wed Jan 12 10:36:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:36:02 +0100 Subject: [Buildroot] [git commit] package/gobject-introspection: bump to version 1.70.0 Message-ID: <20220112103044.59AD77FC20@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c97b8925ed01bfa18d66da9ab01863191c591f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Rebase patches. Backport a patch to fix a build error on latest meson. giscanner/scannerlexer.l license hash change due to add float types: https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/60b0cf2fc2fdc74d13832d1fdde21cfdc813b84e Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../gobject-introspection/0001-disable-tests.patch | 10 +- .../0002-Add-rpath-links-to-ccompiler.patch | 6 +- ...nore-error-return-codes-from-ldd-wrapper.patch} | 7 +- .../0004-build-Avoid-the-doctemplates-hack.patch | 221 +++++++++++++++++++++ .../gobject-introspection.hash | 6 +- .../gobject-introspection/gobject-introspection.mk | 2 +- 6 files changed, 238 insertions(+), 14 deletions(-) diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index 01b11998bd..ed2d9d6fc0 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -1,4 +1,4 @@ -From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001 +From c87faf380ddf44da9d624dabd28178c9065f0f76 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 3 Feb 2020 10:07:15 -0800 Subject: [PATCH] disable tests @@ -13,22 +13,22 @@ Signed-off-by: Adam Duskett 1 file changed, 6 deletions(-) diff --git a/meson.build b/meson.build -index eed4d6b..5058664 100644 +index c2cb577f..65ce7adf 100644 --- a/meson.build +++ b/meson.build -@@ -222,12 +222,6 @@ if get_option('build_introspection_data') == true +@@ -225,12 +225,6 @@ else endif subdir('docs') -# The tests will also run, which is not possible if they -# were built for a different architecture. -if not meson.is_cross_build() -- subdir('tests') +- subdir('tests') -endif - install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) -- -2.24.1 +2.25.1 diff --git a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch index 9b9ae99779..e21da42ce7 100644 --- a/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch +++ b/package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch @@ -1,4 +1,4 @@ -From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001 +From 952e2e2bb6a22ec8824223b03b65cb28361c6e34 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 14 Mar 2018 12:07:10 -0400 Subject: [PATCH] Add rpath links to ccompiler @@ -12,7 +12,7 @@ Signed-off-by: Adam Duskett 1 file changed, 2 insertions(+) diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index a8bd5b1..51bb9bc 100644 +index cb97e76f..d29b28c8 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -231,6 +231,8 @@ class CCompiler(object): @@ -25,5 +25,5 @@ index a8bd5b1..51bb9bc 100644 os.pathsep.join(runtime_paths + [os.environ[envvar]]) else: -- -2.14.3 +2.25.1 diff --git a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch similarity index 90% rename from package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch rename to package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch index d43dc1393e..f1ea518954 100644 --- a/package/gobject-introspection/0003-ignore-error-return-codes-from-ldd-wrapper.patch +++ b/package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch @@ -1,4 +1,4 @@ -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 +From e0fc4a2a5161a36483ddc518be9bb14390f11b19 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 5 Sep 2018 16:46:52 +0200 Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper @@ -14,7 +14,7 @@ Signed-off-by: Adam Duskett 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index d67df95..80352a6 100644 +index 9f8ab5df..7a1a72fe 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries): @@ -26,3 +26,6 @@ index d67df95..80352a6 100644 if isinstance(output, bytes): output = output.decode("utf-8", "replace") +-- +2.25.1 + diff --git a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch new file mode 100644 index 0000000000..0b70b5c4c0 --- /dev/null +++ b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch @@ -0,0 +1,221 @@ +From 0504b26ec2adb13dfdff51679d84ad2f69af5918 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:51:10 +0000 +Subject: [PATCH] build: Avoid the doctemplates hack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The hack that copies the doctemplates directory into the build +directory has stopped working with newer versions of Meson; while it's +possible to copy files, custom_target() cannot depend on a directory. +Additionally, the dependency has always been broken. + +Instead, we enumerate the template files???after all, it's not like they +change a lot???and then we list them as dependencies for the test targets. + +Fixes: #414 + +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +effb1e09dee263cdac4ec593e8caf316e6f01fe2] +--- + giscanner/doctemplates/devdocs/meson.build | 19 +++++++ + giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ + giscanner/meson.build | 14 ++--- + tests/scanner/meson.build | 24 +++++---- + 4 files changed, 98 insertions(+), 22 deletions(-) + create mode 100644 giscanner/doctemplates/devdocs/meson.build + create mode 100644 giscanner/doctemplates/mallard/meson.build + +diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build +new file mode 100644 +index 00000000..2037182a +--- /dev/null ++++ b/giscanner/doctemplates/devdocs/meson.build +@@ -0,0 +1,19 @@ ++doc_templates += files([ ++ 'Gjs/_doc.tmpl', ++ 'Gjs/_index.tmpl', ++ 'Gjs/_method.tmpl', ++ 'Gjs/_methods.tmpl', ++ 'Gjs/_properties.tmpl', ++ 'Gjs/_signals.tmpl', ++ 'Gjs/_staticmethods.tmpl', ++ 'Gjs/_vfuncs.tmpl', ++ 'Gjs/base.tmpl', ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++]) +diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build +new file mode 100644 +index 00000000..5fe4e2af +--- /dev/null ++++ b/giscanner/doctemplates/mallard/meson.build +@@ -0,0 +1,63 @@ ++base_templates = files([ ++ 'base.tmpl', ++ 'class.tmpl', ++ 'namespace.tmpl', ++]) ++ ++c_templates = files([ ++ 'C/callback.tmpl', ++ 'C/class.tmpl', ++ 'C/constructor.tmpl', ++ 'C/default.tmpl', ++ 'C/enum.tmpl', ++ 'C/field.tmpl', ++ 'C/function.tmpl', ++ 'C/interface.tmpl', ++ 'C/method.tmpl', ++ 'C/namespace.tmpl', ++ 'C/property.tmpl', ++ 'C/record.tmpl', ++ 'C/signal.tmpl', ++ 'C/vfunc.tmpl', ++]) ++ ++gjs_templates = files([ ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/constructor.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/field.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++ 'Gjs/property.tmpl', ++ 'Gjs/record.tmpl', ++ 'Gjs/signal.tmpl', ++ 'Gjs/vfunc.tmpl', ++]) ++ ++py_templates = files([ ++ 'Python/callback.tmpl', ++ 'Python/class.tmpl', ++ 'Python/constructor.tmpl', ++ 'Python/default.tmpl', ++ 'Python/enum.tmpl', ++ 'Python/field.tmpl', ++ 'Python/function.tmpl', ++ 'Python/interface.tmpl', ++ 'Python/method.tmpl', ++ 'Python/namespace.tmpl', ++ 'Python/property.tmpl', ++ 'Python/record.tmpl', ++ 'Python/signal.tmpl', ++ 'Python/vfunc.tmpl', ++]) ++ ++doc_templates += [ ++ base_templates, ++ c_templates, ++ gjs_templates, ++ py_templates, ++] +diff --git a/giscanner/meson.build b/giscanner/meson.build +index 41edcd44..3d7dc678 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', + + install_subdir('doctemplates', install_dir: giscannerdir) + +-# XXX: this doesn't track the input, but there is nothing to copy many files +-# in meson. +-doc_templates = custom_target('copy-templates', +- input : 'doctemplates', +- output : 'doctemplates', +- command : [ +- python, '-c', +- 'import sys, shutil;' + +- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + +- 'shutil.copytree(sys.argv[1], sys.argv[2])', +- '@INPUT@', '@OUTPUT@']) ++doc_templates = [] ++subdir('doctemplates/devdocs') ++subdir('doctemplates/mallard') + + flex = find_program('flex', 'win_flex') + bison = find_program('bison', 'win_bison') +diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build +index 5176b957..b81b3fd5 100644 +--- a/tests/scanner/meson.build ++++ b/tests/scanner/meson.build +@@ -525,19 +525,26 @@ foreach gir : test_girs + endforeach + + if has_girdoctool and glib_dep.type_name() == 'pkgconfig' ++ doctool_env = environment() ++ doctool_env.set('srcdir', meson.current_source_dir()) ++ doctool_env.set('builddir', meson.current_build_dir()) ++ + foreach language : ['C', 'Python', 'Gjs'] + regress_docs = custom_target( + 'generate-docs-' + language, + input: regress_gir, +- depends: [doc_templates], ++ depend_files: doc_templates, + build_by_default: not cairo_deps_found, ++ env: doctool_env, + output: 'Regress-1.0-' + language, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), + '--add-include-path=' + meson.current_build_dir(), + '--language', language, +- '@INPUT@', '-o', '@OUTPUT@'], ++ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), ++ '@INPUT@', '-o', '@OUTPUT@', ++ ], + ) + + if cairo_deps_found +@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-' + language], + depends: [regress_docs], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endforeach +@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + regress_sections = custom_target( + 'generate-docs-sections', + input: regress_gir, +- depends: [doc_templates], ++ depend_files: [doc_templates], + build_by_default: not cairo_deps_found, + output: 'Regress-1.0-sections.txt', ++ env: doctool_env, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), +@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-sections.txt'], + depends: [regress_sections], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endif +-- +2.25.1 + diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index e859ba1d3b..5b76df6b40 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.sha256sum -sha256 d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 gobject-introspection-1.68.0.tar.xz +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.sha256sum +sha256 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a gobject-introspection-1.70.0.tar.xz sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad35e98ae9342a3539c36f2171e84d175394ddcff625887290c751302cb02983 giscanner/scannerlexer.l +sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 6a3d321cc7..41d64171a7 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.68 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.70 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz From thomas.petazzoni at bootlin.com Wed Jan 12 10:37:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:37:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/snappy: bump to version 1.1.9 In-Reply-To: <20220111224156.2800195-1-fontaine.fabrice@gmail.com> References: <20220111224156.2800195-1-fontaine.fabrice@gmail.com> Message-ID: <20220112113735.6c6e4c9b@windsurf> On Tue, 11 Jan 2022 23:41:56 +0100 Fabrice Fontaine wrote: > - Disable benchmarks through option added by > https://github.com/google/snappy/commit/4ebd8b2f23dd4ab67ca695256a128cd796d39ce6 > - Update indentation in hash file (two spaces) > > https://github.com/google/snappy/releases/tag/1.1.9 > > Signed-off-by: Fabrice Fontaine > --- > ...-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch | 71 +++++++++++++++++++ > package/snappy/snappy.hash | 4 +- > package/snappy/snappy.mk | 4 +- > 3 files changed, 75 insertions(+), 4 deletions(-) > create mode 100644 package/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 10:37:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:37:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/gobject-introspection: bump to version 1.70.0 In-Reply-To: <20220112012537.1362197-1-james.hilliard1@gmail.com> References: <20220112012537.1362197-1-james.hilliard1@gmail.com> Message-ID: <20220112113746.2fe95d2c@windsurf> On Tue, 11 Jan 2022 18:25:37 -0700 James Hilliard wrote: > Rebase patches. > > Backport a patch to fix a build error on latest meson. > > giscanner/scannerlexer.l license hash change due to add float types: > https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/60b0cf2fc2fdc74d13832d1fdde21cfdc813b84e > > Signed-off-by: James Hilliard > --- > .../0001-disable-tests.patch | 10 +- > .../0002-Add-rpath-links-to-ccompiler.patch | 6 +- > ...error-return-codes-from-ldd-wrapper.patch} | 7 +- > ...04-build-Avoid-the-doctemplates-hack.patch | 221 ++++++++++++++++++ > .../gobject-introspection.hash | 6 +- > .../gobject-introspection.mk | 2 +- > 6 files changed, 238 insertions(+), 14 deletions(-) > rename package/gobject-introspection/{0003-ignore-error-return-codes-from-ldd-wrapper.patch => 0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch} (90%) > create mode 100644 package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 10:38:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:38:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/polkit: fix build on meson 0.61.0 In-Reply-To: <20220112094731.2117910-1-james.hilliard1@gmail.com> References: <20220112094731.2117910-1-james.hilliard1@gmail.com> Message-ID: <20220112113800.659a0ee4@windsurf> On Wed, 12 Jan 2022 02:47:31 -0700 James Hilliard wrote: > Backport a patch removing invalid positional arguments: > ../output-1/build/polkit-0.120/actions/meson.build:3:5: ERROR: Function does not take positional arguments. > > Fixes: > - http://autobuild.buildroot.net/results/b2d/b2d2b27844b32b3609e11005966d85dc0dfb7a9f > > Signed-off-by: James Hilliard > --- > ...tional-parameters-to-i18n.merge_file.patch | 45 +++++++++++++++++++ > 1 file changed, 45 insertions(+) > create mode 100644 package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 10:51:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 11:51:00 +0100 Subject: [Buildroot] [PATCHv2] package/grpc: restrict host-grpc to the absolute minimum In-Reply-To: <20210525182044.13785-1-patrickdepinguin@gmail.com> References: <20210525182044.13785-1-patrickdepinguin@gmail.com> Message-ID: <20220112115100.4bab9b25@windsurf> Hello Thomas, +Yann, Arnout, Peter, to raise their attention on this patch. On Tue, 25 May 2021 20:20:44 +0200 Thomas De Schampheleire wrote: > From: Thomas De Schampheleire > > Currently, grpc depends on the full host-grpc, which in turn depends on host > versions of many other libraries. One of these, host-libabseil-cpp, also > requires a host gcc 4.9 or larger, a dependency which is not met on CentOS > 7. > But in fact, the target grpc only needs the 'grpc_cpp_plugin' binary from > host-grpc. And that binary does not depend on host-libabseil-cpp or other > libraries, only on host-protobuf. > > Given the above, simplify the grpc/host-grpc situation. > - Add a patch to the (host-)grpc CMakeLists.txt file to add an option to > only build grpc_cpp_plugin. > - Update grpc.mk and Config.in to remove the unnecessary dependencies, and > change the host-grpc configure options to make cmake happy. > > The advantages of these changes are: > - making grpc available to older hosts with gcc < 4.8, like CentOS 7 > - significantly reducing the build time of host-grpc and its dependencies > > The patch was proposed upstream but not accepted with below rationale. > Perhaps input from others can help in persuading upstream in a future > attempt. > > 'What you're doing sounds like quite a narrow use case. But we simply > cannot provide a cmake option for every possible scenario in the world. > Introducing a new cmake option isn't for free and requires careful > design and maintenance.' > > Nevertheless, given the benefits in terms of build time and dependency > reduction, it makes sense to apply this patch in spite of the disadvantage > of a local non-upstreamed patch. > > Signed-off-by: Thomas De Schampheleire So I had a look at this, and indeed, upstream has not been very supportive. The patch on CMakeLists.txt that you have is not too crazy, but it would certainly be a bit annoying to maintain forever (even though for some packages, like python3, we do have many more patches than that). I have thought of enabling the download of the git submodules for just the host variant, and use the make target that builds just the native tool that is needed. However, using the git submodules just for the host variant doesn't work: the tarball has to be the same between host and target. An option would be to have a separate package, for just the host variant. A bit meh. Perhaps we should just take your patch in fact? :-) Yann, Peter, Arnout, any opinion on this? Best regards, Thomas > --- > > v2: fix typo in Config.in comment (Baruch Siach) > > > .../grpc/0004-host-grpc-only-cpp-plugin.patch | 223 ++++++++++++++++++ > package/grpc/Config.in | 6 +- > package/grpc/grpc.mk | 27 ++- > 3 files changed, 244 insertions(+), 12 deletions(-) > create mode 100644 package/grpc/0004-host-grpc-only-cpp-plugin.patch > > diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch > new file mode 100644 > index 0000000000..43fad7e3d6 > --- /dev/null > +++ b/package/grpc/0004-host-grpc-only-cpp-plugin.patch > @@ -0,0 +1,223 @@ > +From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 Mon Sep 17 00:00:00 2001 > +From: Thomas De Schampheleire > +Date: Tue, 25 May 2021 14:55:23 +0200 > +Subject: [PATCH] Add option to restrict building of (host-)grpc to > + grpc_cpp_plugin only. > + > +This avoids unnecessary dependencies on big packages like libabseil-cpp and > +others. > + > +Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) > + > +Signed-off-by: Thomas De Schampheleire > +--- > + CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- > + 1 file changed, 35 insertions(+), 8 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index e8934a3e03..c2df332cc6 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -48,12 +48,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) > + option(gRPC_BUILD_CODEGEN "Build codegen" ON) > + option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) > + option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) > ++option(gRPC_BUILD_PLUGIN_SUPPORT_ONLY "Build plugin support only" OFF) > + > + set(gRPC_INSTALL_default ON) > + if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) > + # Disable gRPC_INSTALL by default if building as a submodule > + set(gRPC_INSTALL_default OFF) > + endif() > ++if(gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ set(gRPC_INSTALL_default OFF) > ++endif() > + set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL > + "Generate installation target") > + > +@@ -367,6 +371,8 @@ add_custom_target(plugins > + DEPENDS ${_gRPC_PLUGIN_LIST} > + ) > + > ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_custom_target(tools_c > + DEPENDS > + check_epollexclusive > +@@ -382,6 +388,8 @@ add_custom_target(tools_cxx > + add_custom_target(tools > + DEPENDS tools_c tools_cxx) > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + protobuf_generate_grpc_cpp( > + src/proto/grpc/channelz/channelz.proto > + ) > +@@ -1000,6 +1008,7 @@ if(gRPC_BUILD_TESTS) > + DEPENDS buildtests_c buildtests_cxx) > + endif() > + > ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > + > + add_library(address_sorting > + third_party/address_sorting/address_sorting.c > +@@ -1051,6 +1060,8 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + if(gRPC_BUILD_TESTS) > + > + add_library(end2end_nosec_tests > +@@ -1313,6 +1324,8 @@ target_link_libraries(end2end_tests > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(gpr > + src/core/lib/gpr/alloc.cc > + src/core/lib/gpr/atm.cc > +@@ -2106,6 +2119,8 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + if(gRPC_BUILD_CSHARP_EXT) > + > + add_library(grpc_csharp_ext SHARED > +@@ -2288,6 +2303,8 @@ endif() > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(grpc_unsecure > + src/core/ext/filters/census/grpc_context.cc > + src/core/ext/filters/client_channel/backend_metric.cc > +@@ -2650,6 +2667,8 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + if(gRPC_BUILD_TESTS) > + > + if(gRPC_BUILD_CODEGEN) > +@@ -2717,6 +2736,8 @@ endif() > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(grpc++ > + src/cpp/client/channel_cc.cc > + src/cpp/client/client_callback.cc > +@@ -3134,6 +3155,7 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > + > + if(gRPC_BUILD_CODEGEN) > + add_library(grpc++_reflection > +@@ -3374,6 +3396,8 @@ target_link_libraries(grpc++_test_util > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(grpc++_unsecure > + src/cpp/client/channel_cc.cc > + src/cpp/client/client_callback.cc > +@@ -3656,6 +3680,7 @@ if(gRPC_INSTALL) > + ) > + endif() > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > + > + add_library(grpc_plugin_support > + src/compiler/cpp_generator.cc > +@@ -3715,7 +3740,7 @@ foreach(_hdr > + endforeach() > + > + > +-if(gRPC_INSTALL) > ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > + install(TARGETS grpc_plugin_support EXPORT gRPCTargets > + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > +@@ -3795,6 +3820,8 @@ endif() > + > + endif() > + > ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > ++ > + add_library(upb > + third_party/upb/upb/decode_fast.c > + third_party/upb/upb/decode.c > +@@ -3852,8 +3879,6 @@ if(gRPC_INSTALL) > + ) > + endif() > + > +- > +- > + add_executable(check_epollexclusive > + test/build/check_epollexclusive.c > + ) > +@@ -3906,8 +3931,6 @@ target_link_libraries(gen_hpack_tables > + gpr > + ) > + > +- > +- > + add_executable(gen_legal_metadata_characters > + tools/codegen/core/gen_legal_metadata_characters.cc > + ) > +@@ -3958,6 +3981,8 @@ target_link_libraries(gen_percent_encoding_tables > + ${_gRPC_ALLTARGETS_LIBRARIES} > + ) > + > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > ++ > + > + if(gRPC_BUILD_TESTS) > + > +@@ -10722,7 +10747,7 @@ target_link_libraries(grpc_cli > + > + > + endif() > +-if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN) > ++if(gRPC_BUILD_GRPC_CPP_PLUGIN) > + > + add_executable(grpc_cpp_plugin > + src/compiler/cpp_plugin.cc > +@@ -10752,7 +10777,7 @@ target_link_libraries(grpc_cpp_plugin > + > + > + > +-if(gRPC_INSTALL) > ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > + install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets > + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > +@@ -15420,7 +15445,7 @@ endif() > + > + > + > +- > ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) > + > + if(gRPC_INSTALL) > + install(EXPORT gRPCTargets > +@@ -15517,3 +15542,5 @@ generate_pkgconfig( > + "-lgrpc++_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" > + "" > + "grpc++_unsecure.pc") > ++ > ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY > +-- > +2.26.3 > + > diff --git a/package/grpc/Config.in b/package/grpc/Config.in > index d1bf0d078d..ad3ddbcf19 100644 > --- a/package/grpc/Config.in > +++ b/package/grpc/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_GRPC > depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 > depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp > - depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libabseil-cpp > depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC > depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS > @@ -20,10 +19,9 @@ config BR2_PACKAGE_GRPC > > http://github.com/grpc/grpc > > -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" > +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9" > depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ > - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ > - || !BR2_HOST_GCC_AT_LEAST_4_9 > + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > index ee8dc38e70..8718b0e956 100644 > --- a/package/grpc/grpc.mk > +++ b/package/grpc/grpc.mk > @@ -14,8 +14,7 @@ GRPC_INSTALL_STAGING = YES > > # Need to use host grpc_cpp_plugin during cross compilation. > GRPC_DEPENDENCIES = c-ares host-grpc libabseil-cpp openssl protobuf re2 zlib > -HOST_GRPC_DEPENDENCIES = host-c-ares host-libabseil-cpp host-openssl host-protobuf \ > - host-re2 host-zlib > +HOST_GRPC_DEPENDENCIES = host-protobuf > > # gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have > # installed a cmake config file, but buildroot uses c-ares' autotools build, > @@ -70,14 +69,26 @@ GRPC_CONF_OPTS += \ > -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ > -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" > > +# For host-grpc, we only need the 'grpc_cpp_plugin' binary, which is needed for > +# target grpc compilation. To avoid unnecessary build steps and host > +# dependencies, supply enough options to pass the configure checks without > +# requiring other host packages, unless those needed by grpc_cpp_plugin. > HOST_GRPC_CONF_OPTS = \ > - -DgRPC_ABSL_PROVIDER=package \ > - -D_gRPC_CARES_LIBRARIES=cares \ > - -DgRPC_CARES_PROVIDER=none \ > -DgRPC_PROTOBUF_PROVIDER=package \ > - -DgRPC_RE2_PROVIDER=package \ > - -DgRPC_SSL_PROVIDER=package \ > - -DgRPC_ZLIB_PROVIDER=package > + -DgRPC_ABSL_PROVIDER=none \ > + -DgRPC_CARES_PROVIDER=none \ > + -DgRPC_RE2_PROVIDER=none \ > + -DgRPC_SSL_PROVIDER=none \ > + -DgRPC_ZLIB_PROVIDER=none \ > + -DgRPC_BUILD_CODEGEN=OFF \ > + -DgRPC_BUILD_CSHARP_EXT=OFF \ > + -DgRPC_BUILD_PLUGIN_SUPPORT_ONLY=ON \ > + -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ > + -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF > > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From patrickdepinguin at gmail.com Wed Jan 12 11:04:31 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Wed, 12 Jan 2022 12:04:31 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> Message-ID: Hi Romain, El lun, 10 ene 2022 a las 0:27, Romain Naour () escribi?: > > Hello Thomas, > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > There are cases where a 64-bit architecture is running a 64-bit kernel but > > 32-bit userspace. Examples include: > > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > Can you provide a new qemu defconfig that cover this use case? > This is for gitlab-ci runtime testing. > > Best regards, > Romain > > PS: (This email doesn't count as a review of this series :)) Thanks for your interest in this series :-) Currently the qemu defconfig that I use uses an external toolchain built via crosstool-ng. Crosstool-ng is capable of creating a multilib toolchain supporting 32-bit and 64-bit binaries. However, Buildroot does not currently support this for internal toolchains. How do you suggest to proceed here? Could we perhaps add a crosstool-ng-built multilib toolchain to the Bootlin toolchains? Thanks, Thomas From sebastien.szymanski at armadeus.com Wed Jan 12 09:42:48 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Wed, 12 Jan 2022 10:42:48 +0100 Subject: [Buildroot] [PATCH 1/3] package/libimxdmabuffer: new package Message-ID: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> Library for allocating and managing physically contiguous memory ("DMA memory" or "DMA buffers") on i.MX devices. Needed for libimxvpuapi2 and gst1-imx2. The user has to choose an allocator depending on the i.MX device. Signed-off-by: S?bastien Szymanski --- package/Config.in | 1 + package/libimxdmabuffer/Config.in | 59 ++++++++++++++++++++ package/libimxdmabuffer/libimxdmabuffer.hash | 3 + package/libimxdmabuffer/libimxdmabuffer.mk | 51 +++++++++++++++++ 4 files changed, 114 insertions(+) create mode 100644 package/libimxdmabuffer/Config.in create mode 100644 package/libimxdmabuffer/libimxdmabuffer.hash create mode 100644 package/libimxdmabuffer/libimxdmabuffer.mk diff --git a/package/Config.in b/package/Config.in index 59297c3f3d..8d844aa11e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -505,6 +505,7 @@ endmenu source "package/kbd/Config.in" source "package/lcdproc/Config.in" source "package/libiec61850/Config.in" + source "package/libimxdmabuffer/Config.in" source "package/libubootenv/Config.in" source "package/libuio/Config.in" source "package/linux-backports/Config.in" diff --git a/package/libimxdmabuffer/Config.in b/package/libimxdmabuffer/Config.in new file mode 100644 index 0000000000..9e81a69123 --- /dev/null +++ b/package/libimxdmabuffer/Config.in @@ -0,0 +1,59 @@ +comment "libimxdmabuffer needs an imx-specific Linux kernel to be built" + depends on (BR2_arm || BR2_aarch64) && !BR2_LINUX_KERNEL + +config BR2_PACKAGE_LIBIMXDMABUFFER + bool "libimxdmabuffer" + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX + depends on BR2_LINUX_KERNEL + help + Library for allocating and managing physically contiguous + memory ("DMA memory" or "DMA buffers") on i.MX devices. + + It requires a kernel that includes the i.MX specific headers + to be built. + + https://github.com/Freescale/libimxdmabuffer + +if BR2_PACKAGE_LIBIMXDMABUFFER +choice + prompt "Allocator" + +config BR2_PACKAGE_LIBIMXDMABUFFER_DWL + bool "dwl" + depends on BR2_PACKAGE_IMX_VPU_HANTRO + +comment "dwl allocator needs imx-vpu-hantro" + depends on !BR2_PACKAGE_IMX_VPU_HANTRO + +config BR2_PACKAGE_LIBIMXDMABUFFER_IPU + bool "ipu" + +config BR2_PACKAGE_LIBIMXDMABUFFER_G2D + bool "g2d" + depends on BR2_PACKAGE_IMX_GPU_G2D + +comment "g2d allocator needs imx-gpu-g2d" + depends on !BR2_PACKAGE_IMX_GPU_G2D + +config BR2_PACKAGE_LIBIMXDMABUFFER_PXP + bool "pxp" +endchoice + +if BR2_PACKAGE_LIBIMXDMABUFFER_DWL +choice + prompt "Hantro decoder version" + +config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G1 + bool "G1" + +config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G2 + bool "G2" +endchoice + +config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_HANTRO_DEC_VERSION + string + default "G1" if BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G1 + default "G2" if BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G2 +endif + +endif diff --git a/package/libimxdmabuffer/libimxdmabuffer.hash b/package/libimxdmabuffer/libimxdmabuffer.hash new file mode 100644 index 0000000000..7d317005df --- /dev/null +++ b/package/libimxdmabuffer/libimxdmabuffer.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 cea163d213206f5451eb75a4501b52d861ed00bfd14cd3e4e8734c6181edb6cc libimxdmabuffer-1.0.1.tar.gz +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE diff --git a/package/libimxdmabuffer/libimxdmabuffer.mk b/package/libimxdmabuffer/libimxdmabuffer.mk new file mode 100644 index 0000000000..c8adf03365 --- /dev/null +++ b/package/libimxdmabuffer/libimxdmabuffer.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# libimxdmabuffer +# +################################################################################ + +LIBIMXDMABUFFER_VERSION = 1.0.1 +LIBIMXDMABUFFER_SITE = $(call github,Freescale,libimxdmabuffer,$(LIBIMXDMABUFFER_VERSION)) +LIBIMXDMABUFFER_LICENSE = LGPL-2.1+ +LIBIMXDMABUFFER_LICENSE_FILES = LICENSE +LIBIMXDMABUFFER_DEPENDENCIES = host-pkgconf host-python3 +LIBIMXDMABUFFER_INSTALL_STAGING = YES +LIBIMXDMABUFFER_NEEDS_EXTERNAL_WAF = NO + +# libimxdmabuffer needs access to imx-specific kernel headers +LIBIMXDMABUFFER_DEPENDENCIES += linux + +LIBIMXDMABUFFER_CONF_OPTS += \ + --imx-linux-headers-path=$(STAGING_DIR)/usr/include/ \ + --with-ion-allocator=no + +ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_DWL),y) +LIBIMXDMABUFFER_CONF_OPTS += \ + --with-dwl-allocator=yes \ + --hantro-headers-path=$(STAGING_DIR)/usr/include/hantro_dec \ + --hantro-decoder-version=$(BR2_PACKAGE_LIBIMXDMABUFFER_DWL_HANTRO_DEC_VERSION) +LIBIMXDMABUFFER_DEPENDENCIES += imx-vpu-hantro +else +LIBIMXDMABUFFER_CONF_OPTS += --with-dwl-allocator=no +endif + +ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_IPU),y) +LIBIMXDMABUFFER_CONF_OPTS += --with-ipu-allocator=yes +else +LIBIMXDMABUFFER_CONF_OPTS += --with-ipu-allocator=no +endif + +ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_G2D),y) +LIBIMXDMABUFFER_CONF_OPTS += --with-g2d-allocator=yes +LIBIMXDMABUFFER_DEPENDENCIES += imx-gpu-g2d +else +LIBIMXDMABUFFER_CONF_OPTS += --with-g2d-allocator=no +endif + +ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_PXP),y) +LIBIMXDMABUFFER_CONF_OPTS += --with-pxp-allocator=yes +else +LIBIMXDMABUFFER_CONF_OPTS += --with-pxp-allocator=no +endif + +$(eval $(waf-package)) -- 2.34.1 From sebastien.szymanski at armadeus.com Wed Jan 12 12:53:40 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=c3=a9bastien_Szymanski?=) Date: Wed, 12 Jan 2022 13:53:40 +0100 Subject: [Buildroot] [PATCH 2/3] package/libimxvpuapi2: new package In-Reply-To: <87bl0hw8ek.fsf@tarshish> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> <20220112094250.27022-2-sebastien.szymanski@armadeus.com> <87bl0hw8ek.fsf@tarshish> Message-ID: <551de001-1c47-7f9a-998f-37c9088b2670@armadeus.com> Hi Baruch, On 1/12/22 11:31, Baruch Siach wrote: > Hi S?bastien, > > On Wed, Jan 12 2022, S?bastien Szymanski wrote: >> This is version 2 of libimxvpuapi. >> The API has been rewritten, and is incompatible with the older one. >> Currently, the following platforms are supported (listed with their VPUs): >> * i.MX6 (Chips&Media CODA960 codec) >> * i.MX8m (Hantro G1/G2 decoder, no encoder) >> * i.MX8mm (Hantro G1/G2 decoder, Hantro H1 encoder) > > Is there patch 1/3 in this series? I didn't show up in the list. Yes. Looks like it took more time to reach the mailing list. Regards, > > Thanks, > baruch > >> >> Signed-off-by: S?bastien Szymanski >> --- >> package/Config.in | 1 + >> package/libimxvpuapi2/Config.in | 48 ++++++++++++++++++++++++ >> package/libimxvpuapi2/libimxvpuapi2.hash | 3 ++ >> package/libimxvpuapi2/libimxvpuapi2.mk | 28 ++++++++++++++ >> 4 files changed, 80 insertions(+) >> create mode 100644 package/libimxvpuapi2/Config.in >> create mode 100644 package/libimxvpuapi2/libimxvpuapi2.hash >> create mode 100644 package/libimxvpuapi2/libimxvpuapi2.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index 8d844aa11e..009d2006f0 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -1763,6 +1763,7 @@ menu "Multimedia" >> source "package/libebml/Config.in" >> source "package/libhdhomerun/Config.in" >> source "package/libimxvpuapi/Config.in" >> + source "package/libimxvpuapi2/Config.in" >> source "package/libmatroska/Config.in" >> source "package/libmms/Config.in" >> source "package/libmpeg2/Config.in" >> diff --git a/package/libimxvpuapi2/Config.in b/package/libimxvpuapi2/Config.in >> new file mode 100644 >> index 0000000000..0954718cc0 >> --- /dev/null >> +++ b/package/libimxvpuapi2/Config.in >> @@ -0,0 +1,48 @@ >> +comment "libimxvpuapi2 needs an i.MX platform with VPU support and libimxdmabuffer" >> + depends on BR2_arm || BR2_aarch64 >> + depends on (!BR2_PACKAGE_FREESCALE_IMX_HAS_VPU \ >> + && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO) \ >> + || !BR2_PACKAGE_LIBIMXDMABUFFER >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2 >> + bool "libimxvpuapi2" >> + depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX >> + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU || BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO >> + depends on BR2_PACKAGE_LIBIMXDMABUFFER >> + select BR2_PACKAGE_IMX_VPU if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU >> + select BR2_PACKAGE_IMX_VPU_HANTRO if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO >> + help >> + This library provides an API for using hardware video codecs >> + on i.MX platforms. The API abstracts away platform specific >> + details and allows for using the same code with different >> + hardware video codecs on different i.MX platforms. >> + >> + This is version 2 of libimxvpuapi. The API has been rewritten, >> + and is incompatible with the older one. >> + >> + https://github.com/Freescale/libimxvpuapi >> + >> +if BR2_PACKAGE_LIBIMXVPUAPI2 >> +choice >> + prompt "Platform" >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 >> + bool "i.MX6 (Coda)" >> + depends on BR2_PACKAGE_IMX_VPU >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M >> + bool "i.MX8M (Hantro)" >> + depends on BR2_PACKAGE_IMX_VPU_HANTRO >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM >> + bool "i.MX8MM (Hantro)" >> + depends on BR2_PACKAGE_IMX_VPU_HANTRO >> +endchoice >> + >> +config BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM >> + string >> + default "imx6" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX6 >> + default "imx8m" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M >> + default "imx8mm" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM >> + >> +endif >> diff --git a/package/libimxvpuapi2/libimxvpuapi2.hash b/package/libimxvpuapi2/libimxvpuapi2.hash >> new file mode 100644 >> index 0000000000..d26cf8767b >> --- /dev/null >> +++ b/package/libimxvpuapi2/libimxvpuapi2.hash >> @@ -0,0 +1,3 @@ >> +# locally computed hash >> +sha256 611a5176e37e5132d97817e6d6048acf229f67efd2201e3f4aab6f720e7b67d1 libimxvpuapi2-2.2.0.tar.gz >> +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE >> diff --git a/package/libimxvpuapi2/libimxvpuapi2.mk b/package/libimxvpuapi2/libimxvpuapi2.mk >> new file mode 100644 >> index 0000000000..6957171ad3 >> --- /dev/null >> +++ b/package/libimxvpuapi2/libimxvpuapi2.mk >> @@ -0,0 +1,28 @@ >> +################################################################################ >> +# >> +# libimxvpuapi2 >> +# >> +################################################################################ >> + >> +LIBIMXVPUAPI2_VERSION = 2.2.0 >> +LIBIMXVPUAPI2_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI2_VERSION)) >> +LIBIMXVPUAPI2_LICENSE = LGPL-2.1+ >> +LIBIMXVPUAPI2_LICENSE_FILES = LICENSE >> +LIBIMXVPUAPI2_DEPENDENCIES = host-pkgconf host-python3 libimxdmabuffer >> +LIBIMXVPUAPI2_INSTALL_STAGING = YES >> +LIBIMXVPUAPI2_NEEDS_EXTERNAL_WAF = NO >> + >> +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX6),y) >> +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu >> +endif >> + >> +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M)$(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM),y) >> +LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu-hantro >> +endif >> + >> +LIBIMXVPUAPI2_CONF_OPTS += \ >> + --imx-headers=$(STAGING_DIR)/usr/include/ \ >> + --sysroot-path=$(STAGING_DIR) \ >> + --imx-platform=$(BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM) >> + >> +$(eval $(waf-package)) > > -- S?bastien Szymanski, Armadeus Systems Software engineer From thomas.petazzoni at bootlin.com Wed Jan 12 12:56:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 13:56:37 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220107045531.3985241-1-james.hilliard1@gmail.com> References: <20220107045531.3985241-1-james.hilliard1@gmail.com> Message-ID: <20220112135637.12c5edc4@windsurf> Hello James, On Thu, 6 Jan 2022 21:55:29 -0700 James Hilliard wrote: > This version of catapult is python3 compatible and will be used to > replace the python2 only version in qt5webengine-chromium. > > Signed-off-by: James Hilliard > --- > Changes v2 -> v3: > - add kconfig entry > --- > package/qt5/Config.in | 1 + > .../qt5/qt5webengine-chromium-catapult/Config.in | 4 ++++ > .../qt5webengine-chromium-catapult.hash | 3 +++ > .../qt5webengine-chromium-catapult.mk | 14 ++++++++++++++ > 4 files changed, 22 insertions(+) > create mode 100644 package/qt5/qt5webengine-chromium-catapult/Config.in > create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash > create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk I have tested this patch series (I'm replying to the v3 because that's the one I tested) with the following defconfig: BR2_arm=y BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5WEBENGINE=y BR2_PACKAGE_RPI_USERLAND=y and it failed to build like this: FAILED: host/obj/crypto/crypto/nss_key_util.o /usr/bin/g++ -MMD -MF host/obj/crypto/crypto/nss_key_util.o.d -DCRYPTO_IMPLEMENTATION -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Ihost/gen -I../../3rdparty/chromium -I../../3rdparty/chromium/third_party/perfetto/include -Ihost/gen/third_party/perfetto/build_config -Ihost/gen/third_party/perfetto -I../../3rdparty/chromium/third_party/boringssl/src/include -I../../3rdparty/chromium/third_party/abseil-cpp -I../../3rdparty/chromium/third_party/protobuf/src -Ihost/gen/protoc_out -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointe r-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -I/usr/include/nss -I/usr/include/nspr -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -I/home/thomas/buildroot/buildroot/output/host/include -c ../../3rdparty/chromium/crypto/nss_key_util.cc -o host/obj/crypto/crypto/nss_key_util.o In file included from ../../3rdparty/chromium/crypto/nss_key_util.cc:5: ../../3rdparty/chromium/crypto/nss_key_util.h:8:10: fatal error: secoidt.h: No such file or directory 8 | #include | ^~~~~~~~~~~ compilation terminated. [19912/23484] CXX host/obj/crypto/crypto/sha2.o [19913/23484] CXX host/obj/crypto/crypto/secure_hash.o [19914/23484] CXX host/obj/base/base/base_jumbo_7.o [19915/23484] CXX host/obj/crypto/crypto/signature_creator.o [19916/23484] CXX host/obj/base/base/base_jumbo_11.o [19917/23484] CXX host/obj/crypto/crypto/symmetric_key.o [19918/23484] CXX host/obj/crypto/crypto/signature_verifier.o [19919/23484] CXX host/obj/base/base/base_jumbo_4.o In file included from host/gen/base/base_jumbo_4.cc:6: ./../../3rdparty/chromium/base/debug/alias.cc:11: warning: ignoring #pragma clang max_tokens_here [-Wunknown-pragmas] 11 | #pragma clang max_tokens_here 250 | ninja: build stopped: subcommand failed. make[5]: *** [Makefile.gn_run:356: run_ninja] Error 1 make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 2 make[3]: *** [Makefile:79: sub-core-make_first] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.8/.stamp_built] Error 2 make: *** [Makefile:84: _all] Error 2 Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Jan 12 13:02:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 14:02:25 +0100 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats In-Reply-To: References: <20220110131624.3639727-1-arnout@mind.be> Message-ID: <38cad31f-a5ed-6054-9fb3-f2abd5edae92@mind.be> On 10/01/2022 18:25, Norbert Lange wrote: > Hello, > > Am Mo., 10. Jan. 2022 um 14:16 Uhr schrieb Arnout Vandecappelle > (Essensium/Mind) : >> >> Bumping the version of systemd is a little more complicated than the >> usual package, and it's easy to forget some of the things that need to >> be done - and this has happened several times in the past. >> >> Add a checklist of things to worry about when updating systemd. >> >> Note that there are many other complicated packages that also need a lot >> of attention when upgrading. However, systemd is a really critical >> package so it's more important that we get that one right than, say, >> valgrind. >> >> Cc: Norbert Lange >> Cc: J?r?my ROSEN >> Cc: Adam Duskett >> Cc: James Hilliard >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) >> --- >> package/systemd/systemd.mk | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >> index 3811dbae42..4d82d2ab81 100644 >> --- a/package/systemd/systemd.mk >> +++ b/package/systemd/systemd.mk >> @@ -4,6 +4,18 @@ >> # >> ################################################################################ >> >> +# When updating systemd, take care of the following: >> +# - Check if the requirements have changed (see README), in particular >> +# arch and headers >> +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD >> +# - If the required kernel options have changed, update the Config.in >> +# help text and the list of KCONFIG_ENABLE_OPT. >> +# - Check if there are new meson_options. Make sure all options are set >> +# explicitly (usually to default value). >> +# - If there are new services: >> +# - create new options for them (if they really are optional); >> +# - create a new _USER if necessary; >> +# - create new directionry (with _PERMISSIONS) if necessary. >> SYSTEMD_VERSION = 250.1 >> SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) >> SYSTEMD_LICENSE = \ >> -- >> 2.31.1 >> > > I wouldd add these: > > # - diff sysusers.d with the previous version > # - diff factory/etc/nsswitch.conf with the previous version > # (details are often sprinkled around in README and manpages) If you think a patch is good to go with some changes applied, please add something like: With those changes applied, you can add my Reviewed-by: ... If you reply with just a few comments (or worse, if you don't reply at all), it's hard to know for us as maintainers if we should consider the patch approved or not. Regards, Arnout > > and, somewhat more cynical: > > # - dont bother with x.0 versions > > Norbert > From aperez at igalia.com Wed Jan 12 13:26:16 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 15:26:16 +0200 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages Message-ID: <20220112132618.2634250-1-aperez@igalia.com> Hello everybody, As discussed yesterday, here is a quick stab for testing and getting the conversation started about using Ninja for CMake-based packages (hence the missing documentation updates and the "RFC" tag in the subject :-D). In order to avoid the circular dependency of host-ninja requiring itself, ninja.mk gets changed to use host-generic-package with a build command that plainly runs the compiler on the set of sources we know are needed to build a minimal usable version of it under Unix-y systems. This is basically the list of sources that CMake would have picked (as per the CMakeLists.txt file) passed straight to $(HOSTCXX). The next change modifies pkg-cmake.mk to always pass -GNinja and removes the $(_INSTALL[_STAGING,_TARGET]_OPTS) variables, because when using Ninja the "install/fast" targets are not generated by CMake (those are an internal detail of the Makefile generator, it seems). For consistency with the Meson package infrastructure variables $(NINJA), $(_NINJA_ENV) and $(NINJA_OPTS) are honored by the default set of build/install commands. Now, there might be packages that break with this, and I would be particularly concerned about things like packages which use CMake and build out-of-tree kernel modules (as the kernel build infrastructure is all Make, and only Make!) but the changes included were enough for me to get Raspberry Pi images built with WebKit (both GTK and WPE ports) in it, which results in the following built using [host-]cmake-package: - brotli - cog - jpeg-turbo - openjpeg - webkitgtk - webp - woff2 - wpewebkit While not a long list by any means, I think it shows a decent sample of packages coming from different development teams that work just fine switching to Ninja. If anybody can suggest something with a bigger number of CMake packages to build (or a .config file to share) I will be more than happy to give it a test this with these patches applied :) Cheers, -Adrian Adrian Perez de Castro (2): package/ninja: do not require cmake package/pkg-cmake.mk: use ninja instead of make package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- package/pkg-cmake.mk | 24 ++++++++++++++---------- 2 files changed, 49 insertions(+), 11 deletions(-) -- 2.34.1 From aperez at igalia.com Wed Jan 12 13:26:17 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 15:26:17 +0200 Subject: [Buildroot] [PATCH RFC 1/2] package/ninja: do not require cmake In-Reply-To: <20220112132618.2634250-1-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> Message-ID: <20220112132618.2634250-2-aperez@igalia.com> Use host-generic-package to manually build ninja. This avoids the need for host-cmake in preparation for the CMake build system machinery being changed to use ninja instead of make. Signed-off-by: Adrian Perez de Castro --- package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index ab1941023e..ae3be6a14f 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -9,8 +9,42 @@ NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING +# Ninja is used by CMake-based packages, avoid a circular dependency by +# by using host-generic-package instead and using a single command to +# compile the binary. This does in essence the same as the "bootstrap.py" +# included in the distribution avoiding the need for host-python. +define HOST_NINJA_BUILD_CMDS + cd $(@D) && $(HOSTCXX) $(HOST_CXXFLAGS) $(HOST_LDFLAGS) \ + src/build_log.cc \ + src/build.cc \ + src/clean.cc \ + src/clparser.cc \ + src/dyndep.cc \ + src/dyndep_parser.cc \ + src/debug_flags.cc \ + src/deps_log.cc \ + src/disk_interface.cc \ + src/edit_distance.cc \ + src/eval_env.cc \ + src/graph.cc \ + src/graphviz.cc \ + src/line_printer.cc \ + src/manifest_parser.cc \ + src/metrics.cc \ + src/parser.cc \ + src/state.cc \ + src/string_piece_util.cc \ + src/util.cc \ + src/version.cc \ + src/depfile_parser.cc \ + src/lexer.cc \ + src/subprocess-posix.cc \ + src/ninja.cc \ + -o ninja +endef + define HOST_NINJA_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja endef -$(eval $(host-cmake-package)) +$(eval $(host-generic-package)) -- 2.34.1 From aperez at igalia.com Wed Jan 12 13:26:18 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 15:26:18 +0200 Subject: [Buildroot] [PATCH RFC 2/2] package/pkg-cmake.mk: use ninja instead of make In-Reply-To: <20220112132618.2634250-1-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> Message-ID: <20220112132618.2634250-3-aperez@igalia.com> Switch to ninja as the build tool for the CMake package infrastructure. Note that the changes make packages which use [host-]cmake-package depend on host-ninja. Signed-off-by: Adrian Perez de Castro --- package/pkg-cmake.mk | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..65f005a914 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -88,6 +83,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ @@ -117,6 +113,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -154,6 +151,8 @@ endif # primitives to find {C,LD}FLAGS, add it to the dependency list. $(2)_DEPENDENCIES += host-pkgconf +$(2)_DEPENDENCIES += host-ninja + $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # @@ -163,11 +162,13 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif endif @@ -178,7 +179,8 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -188,7 +190,8 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -198,7 +201,8 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif -- 2.34.1 From aperez at igalia.com Wed Jan 12 13:29:40 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 15:29:40 +0200 Subject: [Buildroot] [PATCH RFC 1/1] package/wpewebkit: use ninja for faster builds In-Reply-To: <20220111170918.GV1477939@scaer> References: <20220111145527.3422053-1-aperez@igalia.com> <20220111170918.GV1477939@scaer> Message-ID: <20220112152940.GC1050037@momiji> Hi Yann, all, On Tue, 11 Jan 2022 18:09:18 +0100 "Yann E. MORIN" wrote: > Adrian, All, > > On 2022-01-11 16:55 +0200, Adrian Perez de Castro spake thusly: > > Instruct CMake to use the Ninja generator, and override build/install > > commands to use Ninja instead, which results in faster builds. The > > host-ninja package is required to build some of the dependencies used > > by wpewebkit (e.g. libepoxy) so in practice this is not introducing > > a new host dependency that would slow down the build. > > As discussed on IRC, we concluded that a better option is to make the > cmake-package infrastructure in Buildroot ninja-aware, and that you were > going to have a look at it. Thanks! :-) Here goes: https://patchwork.ozlabs.org/project/buildroot/list/?series=280723 > So, I've marked this patch as rejected in patchwork. Good, as said on IRC, I also agree it worth it to take the long route and try to get all CMake packages (or most, if all is not possible) working with Ninja :) Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From jose.pekkarinen at unikie.com Wed Jan 12 14:15:16 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Wed, 12 Jan 2022 16:15:16 +0200 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: <20220105214129.2f5fffae@windsurf> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> Message-ID: On Wed, Jan 5, 2022 at 10:41 PM Thomas Petazzoni wrote: > > Hello Jos?, > > On Fri, 10 Dec 2021 16:12:04 +0200 > Jos? Pekkarinen wrote: > > > This patch adds a new package for minijail. > > > > Signed-off-by: Jos? Pekkarinen > > I wanted to apply after fixing the issues pointed by others, but there > are in fact other issues, which I cannot resolve directly. See below. > > > diff --git a/package/minijail/0001-Fix-prlimit-call.patch b/package/minijail/0001-Fix-prlimit-call.patch > > new file mode 100644 > > index 0000000000..9f6902ed43 > > --- /dev/null > > +++ b/package/minijail/0001-Fix-prlimit-call.patch > > @@ -0,0 +1,29 @@ > > +From 09348f06104bf8101a24a0bce235a75a214e1380 Mon Sep 17 00:00:00 2001 > > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > > +Date: Fri, 10 Dec 2021 14:20:30 +0200 > > +Subject: [PATCH] Fix prlimit call > > What are you "fixing"? You're replacing a prlimit() call by by > setrlimit(), but why? What problem does it solve? Why is it correct to > do that? The problem is shown from as this: /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c: In function ?set_rlimits_or_die?: /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:1911:7: error: implicit declaration of function ?prlimit?; did you mean ?setrlimit?? [-Werror=implicit-function-declaration] 1911 | if (prlimit(j->initpid, j->rlimits[i].type, &limit, NULL)) | ^~~~~~~ | setrlimit So I followed the suggestion, no more, no less. > > diff --git a/package/minijail/0002-Fix-static-assert.patch b/package/minijail/0002-Fix-static-assert.patch > > new file mode 100644 > > index 0000000000..48139e8baa > > --- /dev/null > > +++ b/package/minijail/0002-Fix-static-assert.patch > > @@ -0,0 +1,30 @@ > > +From b5d91b793942747e5126e75abca2eebad60ab478 Mon Sep 17 00:00:00 2001 > > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > > +Date: Fri, 10 Dec 2021 14:21:38 +0200 > > +Subject: [PATCH] Fix static assert > > +MIME-Version: 1.0 > > +Content-Type: text/plain; charset=UTF-8 > > +Content-Transfer-Encoding: 8bit > > + > > +Signed-off-by: Jos? Pekkarinen > > +--- > > + libminijail.c | 3 --- > > + 1 file changed, 3 deletions(-) > > + > > +diff --git a/libminijail.c b/libminijail.c > > +index 45f133e..8323742 100644 > > +--- a/libminijail.c > > ++++ b/libminijail.c > > +@@ -2620,9 +2620,6 @@ static int fd_is_open(int fd) > > + return fcntl(fd, F_GETFD) != -1 || errno != EBADF; > > + } > > + > > +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > > +- "If true, ensure_no_fd_conflict will always find an unused fd."); > > You're not fixing the static_assert() here but simply dropping it. Why? > When does it fail? What is the problem with it? Why is it safe to drop > it? It fails like this: /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2623:15: error: expected declaration specifiers or ?...? before numeric constant 2623 | static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, | ^~~~~~~~~~ /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2624:8: error: expected declaration specifiers or ?...? before string constant 2624 | "If true, ensure_no_fd_conflict will always find an unused fd."); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So my understanding is that this platform may define static_assert in a different manner, and I find no traces of the purpose of that isolated assert, so the easier way to get around this was removing it. Best regards Jos?. From thomas.petazzoni at bootlin.com Wed Jan 12 14:35:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 15:35:16 +0100 Subject: [Buildroot] [PATCH RFC 2/2] package/pkg-cmake.mk: use ninja instead of make In-Reply-To: <20220112132618.2634250-3-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112132618.2634250-3-aperez@igalia.com> Message-ID: <20220112153516.239321c8@windsurf> Hello, On Wed, 12 Jan 2022 15:26:18 +0200 Adrian Perez de Castro wrote: > Switch to ninja as the build tool for the CMake package infrastructure. > Note that the changes make packages which use [host-]cmake-package > depend on host-ninja. > > Signed-off-by: Adrian Perez de Castro > --- > package/pkg-cmake.mk | 24 ++++++++++++++---------- > 1 file changed, 14 insertions(+), 10 deletions(-) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 3b1db35fb6..65f005a914 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -51,11 +51,6 @@ endif > > define inner-cmake-package > > -$(2)_MAKE ?= $$(MAKE) > -$(2)_INSTALL_OPTS ?= install > -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast This means an audit of all cmake-package packages need to be done to see if any of those variables is used. I could spot: MUSEPACK_MAKE = $(MAKE1) But also: HOST_MARIADB_MAKE_OPTS = import_executables Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 14:36:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 15:36:34 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112132618.2634250-1-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> Message-ID: <20220112153634.3e604cbc@windsurf> Hello Adrian, On Wed, 12 Jan 2022 15:26:16 +0200 Adrian Perez de Castro wrote: > While not a long list by any means, I think it shows a decent sample of > packages coming from different development teams that work just fine > switching to Ninja. > > If anybody can suggest something with a bigger number of CMake packages to > build (or a .config file to share) I will be more than happy to give it a > test this with these patches applied :) Packages that need to be tested: ./package/alure/alure.mk ./package/apitrace/apitrace.mk ./package/armadillo/armadillo.mk ./package/assimp/assimp.mk ./package/avro-c/avro-c.mk ./package/azmq/azmq.mk ./package/azure-iot-sdk-c/azure-iot-sdk-c.mk ./package/bcg729/bcg729.mk ./package/bctoolbox/bctoolbox.mk ./package/belle-sip/belle-sip.mk ./package/belr/belr.mk ./package/bento4/bento4.mk ./package/brickd/brickd.mk ./package/brotli/brotli.mk ./package/bullet/bullet.mk ./package/cannelloni/cannelloni.mk ./package/cctz/cctz.mk ./package/cdrkit/cdrkit.mk ./package/cegui/cegui.mk ./package/cereal/cereal.mk ./package/cfm/cfm.mk ./package/chipmunk/chipmunk.mk ./package/cjson/cjson.mk ./package/clang/clang.mk ./package/cmake/cmake.mk ./package/cmocka/cmocka.mk ./package/cog/cog.mk ./package/c-periphery/c-periphery.mk ./package/cppcms/cppcms.mk ./package/cppdb/cppdb.mk ./package/cppzmq/cppzmq.mk ./package/curlpp/curlpp.mk ./package/cutelyst/cutelyst.mk ./package/domoticz/domoticz.mk ./package/doxygen/doxygen.mk ./package/easydbus/easydbus.mk ./package/easyframes/easyframes.mk ./package/eigen/eigen.mk ./package/exiv2/exiv2.mk ./package/fatcat/fatcat.mk ./package/firmware-utils/firmware-utils.mk ./package/flann/flann.mk ./package/flare-engine/flare-engine.mk ./package/flare-game/flare-game.mk ./package/flatbuffers/flatbuffers.mk ./package/flatcc/flatcc.mk ./package/fluidsynth/fluidsynth.mk ./package/fmt/fmt.mk ./package/freerdp/freerdp.mk ./package/gerbera/gerbera.mk ./package/gflags/gflags.mk ./package/gli/gli.mk ./package/glm/glm.mk ./package/glog/glog.mk ./package/gnuradio/gnuradio.mk ./package/gqrx/gqrx.mk ./package/grantlee/grantlee.mk ./package/graphite2/graphite2.mk ./package/gr-osmosdr/gr-osmosdr.mk ./package/grpc/grpc.mk ./package/gtest/gtest.mk ./package/hackrf/hackrf.mk ./package/hiawatha/hiawatha.mk ./package/hiredis/hiredis.mk ./package/i2pd/i2pd.mk ./package/intel-gmmlib/intel-gmmlib.mk ./package/intel-mediadriver/intel-mediadriver.mk ./package/intel-mediasdk/intel-mediasdk.mk ./package/jasper/jasper.mk ./package/jpeg-turbo/jpeg-turbo.mk ./package/json-c/json-c.mk ./package/json-for-modern-cpp/json-for-modern-cpp.mk ./package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk ./package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk ./package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk ./package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk ./package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk ./package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk ./package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk ./package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk ./package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk ./package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk ./package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk ./package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk ./package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk ./package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk ./package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk ./package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk ./package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk ./package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk ./package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk ./package/kodi/kodi.mk ./package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk ./package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk ./package/kodi-pvr-argustv/kodi-pvr-argustv.mk ./package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk ./package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk ./package/kodi-pvr-filmon/kodi-pvr-filmon.mk ./package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk ./package/kodi-pvr-hts/kodi-pvr-hts.mk ./package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk ./package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk ./package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk ./package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk ./package/kodi-pvr-njoy/kodi-pvr-njoy.mk ./package/kodi-pvr-octonet/kodi-pvr-octonet.mk ./package/kodi-pvr-pctv/kodi-pvr-pctv.mk ./package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk ./package/kodi-pvr-stalker/kodi-pvr-stalker.mk ./package/kodi-pvr-vbox/kodi-pvr-vbox.mk ./package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk ./package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk ./package/kodi-pvr-waipu/kodi-pvr-waipu.mk ./package/kodi-pvr-wmc/kodi-pvr-wmc.mk ./package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk ./package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk ./package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk ./package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk ./package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk ./package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk ./package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk ./package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk ./package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk ./package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk ./package/kodi-screensaver-stars/kodi-screensaver-stars.mk ./package/kodi-texturepacker/kodi-texturepacker.mk ./package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk ./package/kodi-vfs-rar/kodi-vfs-rar.mk ./package/kodi-vfs-sftp/kodi-vfs-sftp.mk ./package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk ./package/kodi-visualisation-goom/kodi-visualisation-goom.mk ./package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk ./package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk ./package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk ./package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk ./package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk ./package/lapack/lapack.mk ./package/lensfun/lensfun.mk ./package/let-me-create/let-me-create.mk ./package/leveldb/leveldb.mk ./package/libabseil-cpp/libabseil-cpp.mk ./package/libasplib/libasplib.mk ./package/libcec/libcec.mk ./package/libcgi/libcgi.mk ./package/libcodec2/libcodec2.mk ./package/libcorrect/libcorrect.mk ./package/libcpprestsdk/libcpprestsdk.mk ./package/libcuefile/libcuefile.mk ./package/libcue/libcue.mk ./package/libeastl/libeastl.mk ./package/libebml/libebml.mk ./package/libebur128/libebur128.mk ./package/libfreeglut/libfreeglut.mk ./package/libftdi1/libftdi1.mk ./package/libgeos/libgeos.mk ./package/libgit2/libgit2.mk ./package/libglfw/libglfw.mk ./package/libgta/libgta.mk ./package/libical/libical.mk ./package/libiec61850/libiec61850.mk ./package/libiio/libiio.mk ./package/libiqrf/libiqrf.mk ./package/libks/libks.mk ./package/libmatroska/libmatroska.mk ./package/libmdbx/libmdbx.mk ./package/libminiupnpc/libminiupnpc.mk ./package/libnetconf2/libnetconf2.mk ./package/libolm/libolm.mk ./package/libosmium/libosmium.mk ./package/libplatform/libplatform.mk ./package/libressl/libressl.mk ./package/librsync/librsync.mk ./package/librtlsdr/librtlsdr.mk ./package/libsoxr/libsoxr.mk ./package/libspatialindex/libspatialindex.mk ./package/libssh/libssh.mk ./package/libubootenv/libubootenv.mk ./package/libubox/libubox.mk ./package/libuci/libuci.mk ./package/libuecc/libuecc.mk ./package/libuhttpd/libuhttpd.mk ./package/liburiparser/liburiparser.mk ./package/libuwsc/libuwsc.mk ./package/libvncserver/libvncserver.mk ./package/libwebsockets/libwebsockets.mk ./package/libyang/libyang.mk ./package/libyuv/libyuv.mk ./package/libzip/libzip.mk ./package/linphone/linphone.mk ./package/linux-serial-test/linux-serial-test.mk ./package/lld/lld.mk ./package/llvm/llvm.mk ./package/log4cxx/log4cxx.mk ./package/log4qt/log4qt.mk ./package/lua-ev/lua-ev.mk ./package/lua-sdl2/lua-sdl2.mk ./package/lugaru/lugaru.mk ./package/luvi/luvi.mk ./package/luv/luv.mk ./package/lzlib/lzlib.mk ./package/lzo/lzo.mk ./package/mariadb/mariadb.mk ./package/mbedtls/mbedtls.mk ./package/mediastreamer/mediastreamer.mk ./package/mfgtools/mfgtools.mk ./package/midori/midori.mk ./package/minetest/minetest.mk ./package/minizip/minizip.mk ./package/mjpg-streamer/mjpg-streamer.mk ./package/mraa/mraa.mk ./package/mrp/mrp.mk ./package/msgpack/msgpack.mk ./package/musepack/musepack.mk ./package/nanomsg/nanomsg.mk ./package/ne10/ne10.mk ./package/netopeer2/netopeer2.mk ./package/ninja/ninja.mk ./package/odhcp6c/odhcp6c.mk ./package/ogre/ogre.mk ./package/open62541/open62541.mk ./package/openal/openal.mk ./package/opencv3/opencv3.mk ./package/opencv4/opencv4.mk ./package/openfpgaloader/openfpgaloader.mk ./package/openjpeg/openjpeg.mk ./package/openobex/openobex.mk ./package/openpowerlink/openpowerlink.mk ./package/opentracing-cpp/opentracing-cpp.mk ./package/optee-benchmark/optee-benchmark.mk ./package/optee-client/optee-client.mk ./package/optee-examples/optee-examples.mk ./package/optee-test/optee-test.mk ./package/ortp/ortp.mk ./package/osm2pgsql/osm2pgsql.mk ./package/paho-mqtt-c/paho-mqtt-c.mk ./package/paho-mqtt-cpp/paho-mqtt-cpp.mk ./package/physfs/physfs.mk ./package/piglit/piglit.mk ./package/pistache/pistache.mk ./package/pkg-cmake.mk ./package/poppler/poppler.mk ./package/protozero/protozero.mk ./package/pugixml/pugixml.mk ./package/pulseview/pulseview.mk ./package/python-pybind/python-pybind.mk ./package/qhull/qhull.mk ./package/qjson/qjson.mk ./package/qpid-proton/qpid-proton.mk ./package/qt5/qt5webkit/qt5webkit.mk ./package/quazip/quazip.mk ./package/rabbitmq-c/rabbitmq-c.mk ./package/racehound/racehound.mk ./package/rapidjson/rapidjson.mk ./package/re2/re2.mk ./package/read-edid/read-edid.mk ./package/rpi-userland/rpi-userland.mk ./package/rtl_433/rtl_433.mk ./package/rtty/rtty.mk ./package/sdbus-cpp/sdbus-cpp.mk ./package/sentry-native/sentry-native.mk ./package/simple-mail/simple-mail.mk ./package/snappy/snappy.mk ./package/snort3/snort3.mk ./package/solarus/solarus.mk ./package/spdlog/spdlog.mk ./package/stellarium/stellarium.mk ./package/supertuxkart/supertuxkart.mk ./package/supertux/supertux.mk ./package/synergy/synergy.mk ./package/sysdig/sysdig.mk ./package/sysrepo/sysrepo.mk ./package/taglib/taglib.mk ./package/taskd/taskd.mk ./package/tcf-agent/tcf-agent.mk ./package/thrift/thrift.mk ./package/timescaledb/timescaledb.mk ./package/tinyxml2/tinyxml2.mk ./package/ttyd/ttyd.mk ./package/ubus/ubus.mk ./package/uhd/uhd.mk ./package/uhttpd/uhttpd.mk ./package/unionfs/unionfs.mk ./package/unzip/unzip.mk ./package/uqmi/uqmi.mk ./package/ustream-ssl/ustream-ssl.mk ./package/utf8proc/utf8proc.mk ./package/uvw/uvw.mk ./package/valijson/valijson.mk ./package/vulkan-headers/vulkan-headers.mk ./package/waffle/waffle.mk ./package/wampcc/wampcc.mk ./package/waylandpp/waylandpp.mk ./package/webkitgtk/webkitgtk.mk ./package/websocketpp/websocketpp.mk ./package/wireshark/wireshark.mk ./package/woff2/woff2.mk ./package/wpewebkit/wpewebkit.mk ./package/x265/x265.mk ./package/xerces/xerces.mk ./package/xmrig/xmrig.mk ./package/yajl/yajl.mk ./package/yaml-cpp/yaml-cpp.mk ./package/ympd/ympd.mk ./package/zlib-ng/zlib-ng.mk ./package/znc/znc.mk ./package/zxing-cpp/zxing-cpp.mk ./package/zziplib/zziplib.mk The list is much longer than the ~10 samples you have taken I'm afraid :-) Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 14:51:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 15:51:03 +0100 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> Message-ID: <20220112155103.7e6c11c0@windsurf> Hello, On Wed, 12 Jan 2022 16:15:16 +0200 Jos? Pekkarinen wrote: > > What are you "fixing"? You're replacing a prlimit() call by by > > setrlimit(), but why? What problem does it solve? Why is it correct to > > do that? > > The problem is shown from as this: > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c: > In function ?set_rlimits_or_die?: > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:1911:7: > error: implicit declaration of function ?prlimit?; did you mean > ?setrlimit?? [-Werror=implicit-function-declaration] > 1911 | if (prlimit(j->initpid, j->rlimits[i].type, &limit, NULL)) > | ^~~~~~~ > | setrlimit > > So I followed the suggestion, no more, no less. You shouldn't blindly follow compiler suggestions :-) prlimit() exists in musl. Was included, as suggested by the prlimit() man page ? > > > +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > > > +- "If true, ensure_no_fd_conflict will always find an unused fd."); > > > > You're not fixing the static_assert() here but simply dropping it. Why? > > When does it fail? What is the problem with it? Why is it safe to drop > > it? > > It fails like this: > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2623:15: > error: expected declaration specifiers or ?...? before numeric > constant > 2623 | static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > | ^~~~~~~~~~ > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2624:8: > error: expected declaration specifiers or ?...? before string constant > 2624 | "If true, ensure_no_fd_conflict will always find an unused fd."); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > So my understanding is that this platform may > define static_assert in a different manner, and I > find no traces of the purpose of that isolated assert, > so the easier way to get around this was removing it. Well, the assert is there for a reason, so we need to understand what it is verifying, and whether it is safe to drop it. After checking, FD_SETSIZE seems to be defined to 1024 by glibc, musl and uclibc-ng, and MAX_PRESERVED_FDS is defined as 128 by the minijail code. Can you try using _Static_assert() instead, which is part of the C11 standard? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From jose.pekkarinen at unikie.com Wed Jan 12 15:08:26 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Wed, 12 Jan 2022 17:08:26 +0200 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: <20220112155103.7e6c11c0@windsurf> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> <20220112155103.7e6c11c0@windsurf> Message-ID: On Wed, Jan 12, 2022 at 4:51 PM Thomas Petazzoni wrote: > > Hello, > > On Wed, 12 Jan 2022 16:15:16 +0200 > Jos? Pekkarinen wrote: > > > > What are you "fixing"? You're replacing a prlimit() call by by > > > setrlimit(), but why? What problem does it solve? Why is it correct to > > > do that? > > > > The problem is shown from as this: > > > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c: > > In function ?set_rlimits_or_die?: > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:1911:7: > > error: implicit declaration of function ?prlimit?; did you mean > > ?setrlimit?? [-Werror=implicit-function-declaration] > > 1911 | if (prlimit(j->initpid, j->rlimits[i].type, &limit, NULL)) > > | ^~~~~~~ > > | setrlimit > > > > So I followed the suggestion, no more, no less. > > You shouldn't blindly follow compiler suggestions :-) > > prlimit() exists in musl. Was included, as suggested > by the prlimit() man page ? It is: $ cat libminijail.c [...] #include [...] > > > > +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > > > > +- "If true, ensure_no_fd_conflict will always find an unused fd."); > > > > > > You're not fixing the static_assert() here but simply dropping it. Why? > > > When does it fail? What is the problem with it? Why is it safe to drop > > > it? > > > > It fails like this: > > > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2623:15: > > error: expected declaration specifiers or ?...? before numeric > > constant > > 2623 | static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, > > | ^~~~~~~~~~ > > /home/pekkari/br-test-pkg/bootlin-armv5-uclibc/build/minijail-linux-v17/libminijail.c:2624:8: > > error: expected declaration specifiers or ?...? before string constant > > 2624 | "If true, ensure_no_fd_conflict will always find an unused fd."); > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > So my understanding is that this platform may > > define static_assert in a different manner, and I > > find no traces of the purpose of that isolated assert, > > so the easier way to get around this was removing it. > > Well, the assert is there for a reason, so we need to understand what > it is verifying, and whether it is safe to drop it. > > After checking, FD_SETSIZE seems to be defined to 1024 by glibc, musl > and uclibc-ng, and MAX_PRESERVED_FDS is defined as 128 by the minijail > code. > > Can you try using _Static_assert() instead, which is part of the C11 > standard? I'll do. Thanks! Jos?. From aperez at igalia.com Wed Jan 12 15:09:38 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 17:09:38 +0200 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112153634.3e604cbc@windsurf> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112153634.3e604cbc@windsurf> Message-ID: <20220112170938.GB2519@momiji> Hi Thomas, all, On Wed, 12 Jan 2022 15:36:34 +0100 Thomas Petazzoni wrote: > On Wed, 12 Jan 2022 15:26:16 +0200 > Adrian Perez de Castro wrote: > > > While not a long list by any means, I think it shows a decent sample of > > packages coming from different development teams that work just fine > > switching to Ninja. > > > > If anybody can suggest something with a bigger number of CMake packages to > > build (or a .config file to share) I will be more than happy to give it a > > test this with these patches applied :) > > Packages that need to be tested: > > ./package/alure/alure.mk > ./package/apitrace/apitrace.mk > ./package/armadillo/armadillo.mk > ./package/assimp/assimp.mk > ./package/avro-c/avro-c.mk > ./package/azmq/azmq.mk > ./package/azure-iot-sdk-c/azure-iot-sdk-c.mk > ./package/bcg729/bcg729.mk > ./package/bctoolbox/bctoolbox.mk > ./package/belle-sip/belle-sip.mk > ./package/belr/belr.mk > ./package/bento4/bento4.mk > ./package/brickd/brickd.mk > ./package/brotli/brotli.mk > ./package/bullet/bullet.mk > ./package/cannelloni/cannelloni.mk > ./package/cctz/cctz.mk > ./package/cdrkit/cdrkit.mk > ./package/cegui/cegui.mk > ./package/cereal/cereal.mk > ./package/cfm/cfm.mk > ./package/chipmunk/chipmunk.mk > ./package/cjson/cjson.mk > ./package/clang/clang.mk > ./package/cmake/cmake.mk > ./package/cmocka/cmocka.mk > ./package/cog/cog.mk > ./package/c-periphery/c-periphery.mk > ./package/cppcms/cppcms.mk > ./package/cppdb/cppdb.mk > ./package/cppzmq/cppzmq.mk > ./package/curlpp/curlpp.mk > ./package/cutelyst/cutelyst.mk > ./package/domoticz/domoticz.mk > ./package/doxygen/doxygen.mk > ./package/easydbus/easydbus.mk > ./package/easyframes/easyframes.mk > ./package/eigen/eigen.mk > ./package/exiv2/exiv2.mk > ./package/fatcat/fatcat.mk > ./package/firmware-utils/firmware-utils.mk > ./package/flann/flann.mk > ./package/flare-engine/flare-engine.mk > ./package/flare-game/flare-game.mk > ./package/flatbuffers/flatbuffers.mk > ./package/flatcc/flatcc.mk > ./package/fluidsynth/fluidsynth.mk > ./package/fmt/fmt.mk > ./package/freerdp/freerdp.mk > ./package/gerbera/gerbera.mk > ./package/gflags/gflags.mk > ./package/gli/gli.mk > ./package/glm/glm.mk > ./package/glog/glog.mk > ./package/gnuradio/gnuradio.mk > ./package/gqrx/gqrx.mk > ./package/grantlee/grantlee.mk > ./package/graphite2/graphite2.mk > ./package/gr-osmosdr/gr-osmosdr.mk > ./package/grpc/grpc.mk > ./package/gtest/gtest.mk > ./package/hackrf/hackrf.mk > ./package/hiawatha/hiawatha.mk > ./package/hiredis/hiredis.mk > ./package/i2pd/i2pd.mk > ./package/intel-gmmlib/intel-gmmlib.mk > ./package/intel-mediadriver/intel-mediadriver.mk > ./package/intel-mediasdk/intel-mediasdk.mk > ./package/jasper/jasper.mk > ./package/jpeg-turbo/jpeg-turbo.mk > ./package/json-c/json-c.mk > ./package/json-for-modern-cpp/json-for-modern-cpp.mk > ./package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk > ./package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk > ./package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk > ./package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk > ./package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk > ./package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk > ./package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk > ./package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk > ./package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk > ./package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk > ./package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk > ./package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk > ./package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk > ./package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk > ./package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk > ./package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > ./package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk > ./package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk > ./package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > ./package/kodi/kodi.mk > ./package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk > ./package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk > ./package/kodi-pvr-argustv/kodi-pvr-argustv.mk > ./package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk > ./package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk > ./package/kodi-pvr-filmon/kodi-pvr-filmon.mk > ./package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk > ./package/kodi-pvr-hts/kodi-pvr-hts.mk > ./package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk > ./package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk > ./package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk > ./package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk > ./package/kodi-pvr-njoy/kodi-pvr-njoy.mk > ./package/kodi-pvr-octonet/kodi-pvr-octonet.mk > ./package/kodi-pvr-pctv/kodi-pvr-pctv.mk > ./package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk > ./package/kodi-pvr-stalker/kodi-pvr-stalker.mk > ./package/kodi-pvr-vbox/kodi-pvr-vbox.mk > ./package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > ./package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk > ./package/kodi-pvr-waipu/kodi-pvr-waipu.mk > ./package/kodi-pvr-wmc/kodi-pvr-wmc.mk > ./package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk > ./package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk > ./package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk > ./package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk > ./package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk > ./package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk > ./package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk > ./package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk > ./package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk > ./package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk > ./package/kodi-screensaver-stars/kodi-screensaver-stars.mk > ./package/kodi-texturepacker/kodi-texturepacker.mk > ./package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk > ./package/kodi-vfs-rar/kodi-vfs-rar.mk > ./package/kodi-vfs-sftp/kodi-vfs-sftp.mk > ./package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk > ./package/kodi-visualisation-goom/kodi-visualisation-goom.mk > ./package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk > ./package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk > ./package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk > ./package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk > ./package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk > ./package/lapack/lapack.mk > ./package/lensfun/lensfun.mk > ./package/let-me-create/let-me-create.mk > ./package/leveldb/leveldb.mk > ./package/libabseil-cpp/libabseil-cpp.mk > ./package/libasplib/libasplib.mk > ./package/libcec/libcec.mk > ./package/libcgi/libcgi.mk > ./package/libcodec2/libcodec2.mk > ./package/libcorrect/libcorrect.mk > ./package/libcpprestsdk/libcpprestsdk.mk > ./package/libcuefile/libcuefile.mk > ./package/libcue/libcue.mk > ./package/libeastl/libeastl.mk > ./package/libebml/libebml.mk > ./package/libebur128/libebur128.mk > ./package/libfreeglut/libfreeglut.mk > ./package/libftdi1/libftdi1.mk > ./package/libgeos/libgeos.mk > ./package/libgit2/libgit2.mk > ./package/libglfw/libglfw.mk > ./package/libgta/libgta.mk > ./package/libical/libical.mk > ./package/libiec61850/libiec61850.mk > ./package/libiio/libiio.mk > ./package/libiqrf/libiqrf.mk > ./package/libks/libks.mk > ./package/libmatroska/libmatroska.mk > ./package/libmdbx/libmdbx.mk > ./package/libminiupnpc/libminiupnpc.mk > ./package/libnetconf2/libnetconf2.mk > ./package/libolm/libolm.mk > ./package/libosmium/libosmium.mk > ./package/libplatform/libplatform.mk > ./package/libressl/libressl.mk > ./package/librsync/librsync.mk > ./package/librtlsdr/librtlsdr.mk > ./package/libsoxr/libsoxr.mk > ./package/libspatialindex/libspatialindex.mk > ./package/libssh/libssh.mk > ./package/libubootenv/libubootenv.mk > ./package/libubox/libubox.mk > ./package/libuci/libuci.mk > ./package/libuecc/libuecc.mk > ./package/libuhttpd/libuhttpd.mk > ./package/liburiparser/liburiparser.mk > ./package/libuwsc/libuwsc.mk > ./package/libvncserver/libvncserver.mk > ./package/libwebsockets/libwebsockets.mk > ./package/libyang/libyang.mk > ./package/libyuv/libyuv.mk > ./package/libzip/libzip.mk > ./package/linphone/linphone.mk > ./package/linux-serial-test/linux-serial-test.mk > ./package/lld/lld.mk > ./package/llvm/llvm.mk > ./package/log4cxx/log4cxx.mk > ./package/log4qt/log4qt.mk > ./package/lua-ev/lua-ev.mk > ./package/lua-sdl2/lua-sdl2.mk > ./package/lugaru/lugaru.mk > ./package/luvi/luvi.mk > ./package/luv/luv.mk > ./package/lzlib/lzlib.mk > ./package/lzo/lzo.mk > ./package/mariadb/mariadb.mk > ./package/mbedtls/mbedtls.mk > ./package/mediastreamer/mediastreamer.mk > ./package/mfgtools/mfgtools.mk > ./package/midori/midori.mk > ./package/minetest/minetest.mk > ./package/minizip/minizip.mk > ./package/mjpg-streamer/mjpg-streamer.mk > ./package/mraa/mraa.mk > ./package/mrp/mrp.mk > ./package/msgpack/msgpack.mk > ./package/musepack/musepack.mk > ./package/nanomsg/nanomsg.mk > ./package/ne10/ne10.mk > ./package/netopeer2/netopeer2.mk > ./package/ninja/ninja.mk > ./package/odhcp6c/odhcp6c.mk > ./package/ogre/ogre.mk > ./package/open62541/open62541.mk > ./package/openal/openal.mk > ./package/opencv3/opencv3.mk > ./package/opencv4/opencv4.mk > ./package/openfpgaloader/openfpgaloader.mk > ./package/openjpeg/openjpeg.mk > ./package/openobex/openobex.mk > ./package/openpowerlink/openpowerlink.mk > ./package/opentracing-cpp/opentracing-cpp.mk > ./package/optee-benchmark/optee-benchmark.mk > ./package/optee-client/optee-client.mk > ./package/optee-examples/optee-examples.mk > ./package/optee-test/optee-test.mk > ./package/ortp/ortp.mk > ./package/osm2pgsql/osm2pgsql.mk > ./package/paho-mqtt-c/paho-mqtt-c.mk > ./package/paho-mqtt-cpp/paho-mqtt-cpp.mk > ./package/physfs/physfs.mk > ./package/piglit/piglit.mk > ./package/pistache/pistache.mk > ./package/pkg-cmake.mk > ./package/poppler/poppler.mk > ./package/protozero/protozero.mk > ./package/pugixml/pugixml.mk > ./package/pulseview/pulseview.mk > ./package/python-pybind/python-pybind.mk > ./package/qhull/qhull.mk > ./package/qjson/qjson.mk > ./package/qpid-proton/qpid-proton.mk > ./package/qt5/qt5webkit/qt5webkit.mk > ./package/quazip/quazip.mk > ./package/rabbitmq-c/rabbitmq-c.mk > ./package/racehound/racehound.mk > ./package/rapidjson/rapidjson.mk > ./package/re2/re2.mk > ./package/read-edid/read-edid.mk > ./package/rpi-userland/rpi-userland.mk > ./package/rtl_433/rtl_433.mk > ./package/rtty/rtty.mk > ./package/sdbus-cpp/sdbus-cpp.mk > ./package/sentry-native/sentry-native.mk > ./package/simple-mail/simple-mail.mk > ./package/snappy/snappy.mk > ./package/snort3/snort3.mk > ./package/solarus/solarus.mk > ./package/spdlog/spdlog.mk > ./package/stellarium/stellarium.mk > ./package/supertuxkart/supertuxkart.mk > ./package/supertux/supertux.mk > ./package/synergy/synergy.mk > ./package/sysdig/sysdig.mk > ./package/sysrepo/sysrepo.mk > ./package/taglib/taglib.mk > ./package/taskd/taskd.mk > ./package/tcf-agent/tcf-agent.mk > ./package/thrift/thrift.mk > ./package/timescaledb/timescaledb.mk > ./package/tinyxml2/tinyxml2.mk > ./package/ttyd/ttyd.mk > ./package/ubus/ubus.mk > ./package/uhd/uhd.mk > ./package/uhttpd/uhttpd.mk > ./package/unionfs/unionfs.mk > ./package/unzip/unzip.mk > ./package/uqmi/uqmi.mk > ./package/ustream-ssl/ustream-ssl.mk > ./package/utf8proc/utf8proc.mk > ./package/uvw/uvw.mk > ./package/valijson/valijson.mk > ./package/vulkan-headers/vulkan-headers.mk > ./package/waffle/waffle.mk > ./package/wampcc/wampcc.mk > ./package/waylandpp/waylandpp.mk > ./package/webkitgtk/webkitgtk.mk > ./package/websocketpp/websocketpp.mk > ./package/wireshark/wireshark.mk > ./package/woff2/woff2.mk > ./package/wpewebkit/wpewebkit.mk > ./package/x265/x265.mk > ./package/xerces/xerces.mk > ./package/xmrig/xmrig.mk > ./package/yajl/yajl.mk > ./package/yaml-cpp/yaml-cpp.mk > ./package/ympd/ympd.mk > ./package/zlib-ng/zlib-ng.mk > ./package/znc/znc.mk > ./package/zxing-cpp/zxing-cpp.mk > ./package/zziplib/zziplib.mk Ah, I guess you grepped the *.mk files for "cmake-package"; that didn't cross my mind but now that it crossed my mind I feel silly for not thinking about it before ^_^ > The list is much longer than the ~10 samples you have taken I'm afraid :-) Of course I knew it would be way longer, but I wanted to show something quick after yesterday's discussion on IRC. I'll keep poking at things to see how it fares for the rest of packages above and publish updated versions of the patch set as I go fixing things. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From thomas.petazzoni at bootlin.com Wed Jan 12 16:00:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 17:00:43 +0100 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> <20220112155103.7e6c11c0@windsurf> Message-ID: <20220112170043.03abd8c1@windsurf> On Wed, 12 Jan 2022 17:08:26 +0200 Jos? Pekkarinen wrote: > > prlimit() exists in musl. Was included, as suggested > > by the prlimit() man page ? > > It is: > > $ cat libminijail.c > [...] > #include > [...] Ah, it's uClibc that is missing prlimit(). Can you confirm that minijail builds fine with glibc and musl, but breaks on uClibc due to prlimit() being missing? I'm not sure it's possible to replace prlimit() by setrlimit(). Indeed, prlimit() has a PID as the first argument, which allows to ste resource limits on other processes, while setrlimit() only takes care of the current process. I'm afraid it seems we will have to disallow the use of minijail with uClibc toolchains. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 12 16:02:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 12 Jan 2022 17:02:34 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112170938.GB2519@momiji> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112153634.3e604cbc@windsurf> <20220112170938.GB2519@momiji> Message-ID: <20220112170226.1f5c8cea@windsurf> On Wed, 12 Jan 2022 17:09:38 +0200 Adrian Perez de Castro wrote: > Ah, I guess you grepped the *.mk files for "cmake-package"; that didn't > cross my mind but now that it crossed my mind I feel silly for not thinking > about it before ^_^ Exactly what I did, indeed. Please note that we do not require that absolutely all packages are tested before merging this. The autobuilders will not their amount of work there to validate everything. But it would be good to have tested a wider configuration with more CMake packages enabled. Make sure to include the defconfig you have tested in the cover letter. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From post at lespocky.de Wed Jan 12 16:05:13 2022 From: post at lespocky.de (Alexander Dahl) Date: Wed, 12 Jan 2022 17:05:13 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112132618.2634250-1-aperez@igalia.com> References: <20220112132618.2634250-1-aperez@igalia.com> Message-ID: <20220112160512.GC6032@falbala.internal.home.lespocky.de> Hello Adrian, On Wed, Jan 12, 2022 at 03:26:16PM +0200, Adrian Perez de Castro wrote: > As discussed yesterday, here is a quick stab for testing and getting the > conversation started about using Ninja for CMake-based packages (hence the > missing documentation updates and the "RFC" tag in the subject :-D). I miss some general motivation for switching from Makefile to Ninja generator. Can you add some reasoning or numbers to upcoming patch set revisions? Thanks and greets Alex > > In order to avoid the circular dependency of host-ninja requiring itself, > ninja.mk gets changed to use host-generic-package with a build command > that plainly runs the compiler on the set of sources we know are needed > to build a minimal usable version of it under Unix-y systems. This is > basically the list of sources that CMake would have picked (as per the > CMakeLists.txt file) passed straight to $(HOSTCXX). > > The next change modifies pkg-cmake.mk to always pass -GNinja and removes > the $(_INSTALL[_STAGING,_TARGET]_OPTS) variables, because when using > Ninja the "install/fast" targets are not generated by CMake (those are > an internal detail of the Makefile generator, it seems). For consistency > with the Meson package infrastructure variables $(NINJA), $(_NINJA_ENV) > and $(NINJA_OPTS) are honored by the default set of build/install commands. > > Now, there might be packages that break with this, and I would be > particularly concerned about things like packages which use CMake and > build out-of-tree kernel modules (as the kernel build infrastructure is > all Make, and only Make!) but the changes included were enough for me > to get Raspberry Pi images built with WebKit (both GTK and WPE ports) > in it, which results in the following built using [host-]cmake-package: > > - brotli > - cog > - jpeg-turbo > - openjpeg > - webkitgtk > - webp > - woff2 > - wpewebkit > > While not a long list by any means, I think it shows a decent sample of > packages coming from different development teams that work just fine > switching to Ninja. > > If anybody can suggest something with a bigger number of CMake packages to > build (or a .config file to share) I will be more than happy to give it a > test this with these patches applied :) > > Cheers, > -Adrian > > > Adrian Perez de Castro (2): > package/ninja: do not require cmake > package/pkg-cmake.mk: use ninja instead of make > > package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- > package/pkg-cmake.mk | 24 ++++++++++++++---------- > 2 files changed, 49 insertions(+), 11 deletions(-) > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- /"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From aperez at igalia.com Wed Jan 12 16:47:29 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 18:47:29 +0200 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112160512.GC6032@falbala.internal.home.lespocky.de> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112160512.GC6032@falbala.internal.home.lespocky.de> Message-ID: <20220112184729.GB23006@momiji> Hi Alexander, On Wed, 12 Jan 2022 17:05:13 +0100 Alexander Dahl wrote: > On Wed, Jan 12, 2022 at 03:26:16PM +0200, Adrian Perez de Castro wrote: > > As discussed yesterday, here is a quick stab for testing and getting the > > conversation started about using Ninja for CMake-based packages (hence the > > missing documentation updates and the "RFC" tag in the subject :-D). > > I miss some general motivation for switching from Makefile to Ninja > generator. Can you add some reasoning or numbers to upcoming patch set > revisions? Ninja is generally faster, tends to make better use of parallelism, and in my experience less likely to break in odd ways. Once I have a defconfig with a bigger set of CMake-based packages working I'll do some numbers as well to compare build times before and after the switch to Ninja. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From aperez at igalia.com Wed Jan 12 16:51:43 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 12 Jan 2022 18:51:43 +0200 Subject: [Buildroot] [PATCH RFC 2/2] package/pkg-cmake.mk: use ninja instead of make In-Reply-To: <20220112153516.239321c8@windsurf> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112132618.2634250-3-aperez@igalia.com> <20220112153516.239321c8@windsurf> Message-ID: <20220112185143.GE23006@momiji> Hi, On Wed, 12 Jan 2022 15:35:16 +0100 Thomas Petazzoni wrote: > On Wed, 12 Jan 2022 15:26:18 +0200 > Adrian Perez de Castro wrote: > > > Switch to ninja as the build tool for the CMake package infrastructure. > > Note that the changes make packages which use [host-]cmake-package > > depend on host-ninja. > > > > Signed-off-by: Adrian Perez de Castro > > --- > > package/pkg-cmake.mk | 24 ++++++++++++++---------- > > 1 file changed, 14 insertions(+), 10 deletions(-) > > > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > > index 3b1db35fb6..65f005a914 100644 > > --- a/package/pkg-cmake.mk > > +++ b/package/pkg-cmake.mk > > @@ -51,11 +51,6 @@ endif > > > > define inner-cmake-package > > > > -$(2)_MAKE ?= $$(MAKE) > > -$(2)_INSTALL_OPTS ?= install > > -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > > -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > > This means an audit of all cmake-package packages need to be done to > see if any of those variables is used. I will be going through the packages in the next days, for now a couple of notes on the ones you mentioned already, below. > I could spot: > > MUSEPACK_MAKE = $(MAKE1) I fixed this locally using: MUSEPACK_NINJA_OPTS = -j1 Sadly, switching to Ninja does not fix parallel builds for this package. > But also: > > HOST_MARIADB_MAKE_OPTS = import_executables Replacing with the following works, because the CMake Ninja generator also produces top-level phony targets: HOST_MARIADB_NINJA_OPTS = import_executables Both these tweaks (and likely a bunch more) will be part of v2 of the patch set :) Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From frank.vanbever at essensium.com Wed Jan 12 16:59:12 2022 From: frank.vanbever at essensium.com (Frank Vanbever) Date: Wed, 12 Jan 2022 17:59:12 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/fluentbit: new package In-Reply-To: <20211230155334.16da5582@windsurf> References: <20200217133806.21237-1-frank.vanbever@essensium.com> <20200217145805.18815-1-frank.vanbever@essensium.com> <20211230155334.16da5582@windsurf> Message-ID: <2116555.irdbgypaU6@wintermute> Hi Thomas, On Thursday, 30 December 2021 15:53:34 CET Thomas Petazzoni wrote: > If you're still interested in this package, could you have a look? I took another look and basically came to the same conclusion as you. In an ideal world I'd see it through, but my situation changed in the meantime and right now I don't have the bandwidth to dive into fixing those problems. Sorry about that. Best regards, Frank From fontaine.fabrice at gmail.com Wed Jan 12 17:21:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 18:21:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: needs host-dtc Message-ID: <20220112172100.2991140-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: configure: error: device-tree-compiler not found Fixes: - http://autobuild.buildroot.org/results/d35ff4a0ca0a8463121d717a9727e0d863ca83e8 Signed-off-by: Fabrice Fontaine --- package/riscv-isa-sim/riscv-isa-sim.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index e10dd4c662..59f70fc432 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -8,5 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc $(eval $(host-autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 17:23:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 18:23:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinycbor: disable -Werror Message-ID: <20220112172302.2991419-1-fontaine.fabrice@gmail.com> Disable -Werror to avoid the following build failure with gcc 4.8 raised since bump to version 0.6.0 in commit ee1a2826dcf7ff75f90b0bf9f7aa53d19ce19cf6 and https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types cc1: error: -Werror=int-conversion: no option -Wint-conversion Fixes: - http://autobuild.buildroot.org/results/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa Signed-off-by: Fabrice Fontaine --- .../0001-Makefile-add-DISABLE_WERROR.patch | 44 +++++++++++++++++++ package/tinycbor/tinycbor.mk | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch diff --git a/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch new file mode 100644 index 0000000000..334bea7eb0 --- /dev/null +++ b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch @@ -0,0 +1,44 @@ +From 5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 10 Jan 2022 23:17:45 +0100 +Subject: [PATCH] Makefile: add DISABLE_WERROR + +Allow the user to disable -Werror to avoid the following build failure +with gcc 4.8 raised since version 0.6.0 and +https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: + +/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c +cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types +cc1: error: -Werror=int-conversion: no option -Wint-conversion + +Fixes: + - http://autobuild.buildroot.org/results/a9f/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/intel/tinycbor/commit/5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0] +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6492ea16..3cde2b3d 100644 +--- a/Makefile ++++ b/Makefile +@@ -236,10 +236,15 @@ tag: distcheck + .SECONDARY: + + cflags := $(CPPFLAGS) -I$(SRCDIR)src +-cflags += -std=gnu99 $(CFLAGS) \ ++cflags += -std=gnu99 $(CFLAGS) ++ ++ifneq ($(DISABLE_WERROR),1) ++cflags += \ + -Werror=incompatible-pointer-types \ + -Werror=implicit-function-declaration \ + -Werror=int-conversion ++endif ++ + %.o: %.c + @test -d $(@D) || $(MKDIR) $(@D) + $(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $< diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index bf6e8e4c1e..cad50e633b 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_CJSON),y) TINYCBOR_DEPENDENCIES += cjson endif -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 +TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 ifeq ($(BR2_STATIC_LIBS),y) TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 18:28:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 19:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.5.0 Message-ID: <20220112182800.3128945-1-fontaine.fabrice@gmail.com> https://github.com/FreeRDP/FreeRDP/releases/tag/2.5.0 Signed-off-by: Fabrice Fontaine --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 637e57e8b0..e31b8d5b96 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.4.1.tar.gz.sha256 -sha256 ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf freerdp-2.4.1.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 +sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 40a3904024..c536f6cb1c 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.4.1 +FREERDP_VERSION = 2.5.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 -- 2.34.1 From arnout at mind.be Wed Jan 12 18:39:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 19:39:43 +0100 Subject: [Buildroot] [PATCH] skeleton + init: prepare /run/lock and adjust compat symlinks In-Reply-To: References: <20201004224137.193808-1-nolange79@gmail.com> <20220112091422.1cd29c1f@windsurf> Message-ID: <077dd60c-f482-da24-1718-7d75688a5f8a@mind.be> On 12/01/2022 09:53, Norbert Lange wrote: > > > > Thomas Petazzoni > schrieb am Mi., 12. Jan. 2022, 09:14: > > Hello Norbert, > > On Mon,? 5 Oct 2020 00:41:36 +0200 > Norbert Lange > wrote: > > > Linux distros changed /var/run and /var/lock to reside on an tmpfs in > > /run a long time ago, and buildroot seems to agree by providing this > > tmpfs on all supported init systems. > > I am not 100% sure but it seems like this patch has potentially broken > the build of vtun, which now fails with: > > ? /usr/bin/install: cannot create directory > '/home/giuliobenetti/autobuild/run/instance-0/output-1/target/var/lock': > File exists > > If you look at http://autobuild.buildroot.net/?reason=vtun% > , vtun > version 3.0.4 restarted failing to build on January 10, with this error. > > Could you have a look ? > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > > > Seems like the issue is, that run/lock is not existing when installing. > Anything installed there will be gone (already before this commit), so it's > kinda pointless to do so. Ah, yes, there are many packages that require a directory in a tmpfs and that create it at build time (because they dont "know" that it's going to be a tmpfs) and at runtime (in the init script, through tmpfiles, or by the application itself). > I don't know how many packages have this issue, imho it would be better to fix > them instead of making a run/lock directory for broken packages (that will get > removed later) We're not going to patch packages just for that, because unavoidably some upstreams are not going to be receptive. Creating the directory is a much simpler solution. Regards, Arnout From heiko.thiery at gmail.com Wed Jan 12 18:48:22 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Wed, 12 Jan 2022 19:48:22 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220112184821.916646-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- DEVELOPERS | 2 + board/kontron/bl-imx8mm/boot.cmd | 8 + board/kontron/bl-imx8mm/genimage.cfg | 16 + ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 4 + board/kontron/bl-imx8mm/post-image.sh | 3 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 60 ++++ 9 files changed, 508 insertions(+) create mode 100644 board/kontron/bl-imx8mm/boot.cmd create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100755 board/kontron/bl-imx8mm/post-image.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..93c5760489 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1179,7 +1179,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/boot.cmd b/board/kontron/bl-imx8mm/boot.cmd new file mode 100644 index 0000000000..7ce3198dbc --- /dev/null +++ b/board/kontron/bl-imx8mm/boot.cmd @@ -0,0 +1,8 @@ +echo "Root File Sytem on MMC${devnum}" +setenv rootfs /dev/mmcblk${devnum}p1 +setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} + +load ${devtype} ${devnum} ${kernel_addr_r} boot/Image +load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mm-kontron-n801x-s.dtb + +booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..3a83aa1f03 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33k + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 8M + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..ed088dd0f8 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,28 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..3bc71325c6 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,302 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..4574221fe5 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +mkdir -p $TARGET_DIR/boot/ +cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/kontron/bl-imx8mm/post-image.sh b/board/kontron/bl-imx8mm/post-image.sh new file mode 100755 index 0000000000..564211c829 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-image.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..bebc6f0763 --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,60 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/kontron/bl-imx8mm/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/bl-imx8mm/boot.cmd" -- 2.30.2 From arnout at mind.be Wed Jan 12 18:55:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 19:55:03 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112184729.GB23006@momiji> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112160512.GC6032@falbala.internal.home.lespocky.de> <20220112184729.GB23006@momiji> Message-ID: <53b29654-5d59-26e6-4635-a1ecb87babe0@mind.be> On 12/01/2022 17:47, Adrian Perez de Castro wrote: > Hi Alexander, > > On Wed, 12 Jan 2022 17:05:13 +0100 Alexander Dahl wrote: > >> On Wed, Jan 12, 2022 at 03:26:16PM +0200, Adrian Perez de Castro wrote: >>> As discussed yesterday, here is a quick stab for testing and getting the >>> conversation started about using Ninja for CMake-based packages (hence the >>> missing documentation updates and the "RFC" tag in the subject :-D). >> >> I miss some general motivation for switching from Makefile to Ninja >> generator. Can you add some reasoning or numbers to upcoming patch set >> revisions? > > Ninja is generally faster, tends to make better use of parallelism, and > in my experience less likely to break in odd ways. Once I have a defconfig > with a bigger set of CMake-based packages working I'll do some numbers as > well to compare build times before and after the switch to Ninja. There's one disadvantage to Ninja in Buildroot context: until [1] is fixed, it doesn't collaborate well with top-level parallel build. This means that if you run with a toplevel JLEVEL of e.g. 24, you can easil end up with 40-100 compiles running in parallel. The problem already exists for meson packages, but these are sufficiently rare that they don't pose a problem in practice. I don't know if it's going to become a problem if cmake packages are added to the mix. I don't think this is blocker at all, but it's worth considering. Regards, Arnout [1] https://github.com/ninja-build/ninja/issues/1139 From arnout at mind.be Wed Jan 12 19:01:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:01:27 +0100 Subject: [Buildroot] [PATCHv2] package/grpc: restrict host-grpc to the absolute minimum In-Reply-To: <20220112115100.4bab9b25@windsurf> References: <20210525182044.13785-1-patrickdepinguin@gmail.com> <20220112115100.4bab9b25@windsurf> Message-ID: <1a7148cd-c9fd-c444-8a78-83984f67af4c@mind.be> On 12/01/2022 11:51, Thomas Petazzoni wrote: > Hello Thomas, > > +Yann, Arnout, Peter, to raise their attention on this patch. > > On Tue, 25 May 2021 20:20:44 +0200 > Thomas De Schampheleire wrote: > >> From: Thomas De Schampheleire >> >> Currently, grpc depends on the full host-grpc, which in turn depends on host >> versions of many other libraries. One of these, host-libabseil-cpp, also >> requires a host gcc 4.9 or larger, a dependency which is not met on CentOS >> 7. >> But in fact, the target grpc only needs the 'grpc_cpp_plugin' binary from >> host-grpc. And that binary does not depend on host-libabseil-cpp or other >> libraries, only on host-protobuf. >> >> Given the above, simplify the grpc/host-grpc situation. >> - Add a patch to the (host-)grpc CMakeLists.txt file to add an option to >> only build grpc_cpp_plugin. >> - Update grpc.mk and Config.in to remove the unnecessary dependencies, and >> change the host-grpc configure options to make cmake happy. >> >> The advantages of these changes are: >> - making grpc available to older hosts with gcc < 4.8, like CentOS 7 >> - significantly reducing the build time of host-grpc and its dependencies >> >> The patch was proposed upstream but not accepted with below rationale. >> Perhaps input from others can help in persuading upstream in a future >> attempt. >> >> 'What you're doing sounds like quite a narrow use case. But we simply >> cannot provide a cmake option for every possible scenario in the world. >> Introducing a new cmake option isn't for free and requires careful >> design and maintenance.' >> >> Nevertheless, given the benefits in terms of build time and dependency >> reduction, it makes sense to apply this patch in spite of the disadvantage >> of a local non-upstreamed patch. >> >> Signed-off-by: Thomas De Schampheleire > > So I had a look at this, and indeed, upstream has not been very > supportive. The patch on CMakeLists.txt that you have is not too crazy, > but it would certainly be a bit annoying to maintain forever (even > though for some packages, like python3, we do have many more patches > than that). > > I have thought of enabling the download of the git submodules for just > the host variant, and use the make target that builds just the native > tool that is needed. However, using the git submodules just for the > host variant doesn't work: the tarball has to be the same between host > and target. An option would be to have a separate package, for just the > host variant. A bit meh. > > Perhaps we should just take your patch in fact? :-) Yes, I'd go for accepting the patch. Sometimes we just have to live with it. Regards, Arnout > > Yann, Peter, Arnout, any opinion on this? > > Best regards, > > Thomas > >> --- >> >> v2: fix typo in Config.in comment (Baruch Siach) >> >> >> .../grpc/0004-host-grpc-only-cpp-plugin.patch | 223 ++++++++++++++++++ >> package/grpc/Config.in | 6 +- >> package/grpc/grpc.mk | 27 ++- >> 3 files changed, 244 insertions(+), 12 deletions(-) >> create mode 100644 package/grpc/0004-host-grpc-only-cpp-plugin.patch >> >> diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch >> new file mode 100644 >> index 0000000000..43fad7e3d6 >> --- /dev/null >> +++ b/package/grpc/0004-host-grpc-only-cpp-plugin.patch >> @@ -0,0 +1,223 @@ >> +From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 Mon Sep 17 00:00:00 2001 >> +From: Thomas De Schampheleire >> +Date: Tue, 25 May 2021 14:55:23 +0200 >> +Subject: [PATCH] Add option to restrict building of (host-)grpc to >> + grpc_cpp_plugin only. >> + >> +This avoids unnecessary dependencies on big packages like libabseil-cpp and >> +others. >> + >> +Upstream-status: not accepted (see https://github.com/grpc/grpc/issues/25322) >> + >> +Signed-off-by: Thomas De Schampheleire >> +--- >> + CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- >> + 1 file changed, 35 insertions(+), 8 deletions(-) >> + >> +diff --git a/CMakeLists.txt b/CMakeLists.txt >> +index e8934a3e03..c2df332cc6 100644 >> +--- a/CMakeLists.txt >> ++++ b/CMakeLists.txt >> +@@ -48,12 +48,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) >> + option(gRPC_BUILD_CODEGEN "Build codegen" ON) >> + option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) >> + option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) >> ++option(gRPC_BUILD_PLUGIN_SUPPORT_ONLY "Build plugin support only" OFF) >> + >> + set(gRPC_INSTALL_default ON) >> + if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) >> + # Disable gRPC_INSTALL by default if building as a submodule >> + set(gRPC_INSTALL_default OFF) >> + endif() >> ++if(gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ set(gRPC_INSTALL_default OFF) >> ++endif() >> + set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL >> + "Generate installation target") >> + >> +@@ -367,6 +371,8 @@ add_custom_target(plugins >> + DEPENDS ${_gRPC_PLUGIN_LIST} >> + ) >> + >> ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_custom_target(tools_c >> + DEPENDS >> + check_epollexclusive >> +@@ -382,6 +388,8 @@ add_custom_target(tools_cxx >> + add_custom_target(tools >> + DEPENDS tools_c tools_cxx) >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + protobuf_generate_grpc_cpp( >> + src/proto/grpc/channelz/channelz.proto >> + ) >> +@@ -1000,6 +1008,7 @@ if(gRPC_BUILD_TESTS) >> + DEPENDS buildtests_c buildtests_cxx) >> + endif() >> + >> ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> + >> + add_library(address_sorting >> + third_party/address_sorting/address_sorting.c >> +@@ -1051,6 +1060,8 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + if(gRPC_BUILD_TESTS) >> + >> + add_library(end2end_nosec_tests >> +@@ -1313,6 +1324,8 @@ target_link_libraries(end2end_tests >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(gpr >> + src/core/lib/gpr/alloc.cc >> + src/core/lib/gpr/atm.cc >> +@@ -2106,6 +2119,8 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + if(gRPC_BUILD_CSHARP_EXT) >> + >> + add_library(grpc_csharp_ext SHARED >> +@@ -2288,6 +2303,8 @@ endif() >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(grpc_unsecure >> + src/core/ext/filters/census/grpc_context.cc >> + src/core/ext/filters/client_channel/backend_metric.cc >> +@@ -2650,6 +2667,8 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + if(gRPC_BUILD_TESTS) >> + >> + if(gRPC_BUILD_CODEGEN) >> +@@ -2717,6 +2736,8 @@ endif() >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(grpc++ >> + src/cpp/client/channel_cc.cc >> + src/cpp/client/client_callback.cc >> +@@ -3134,6 +3155,7 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> + >> + if(gRPC_BUILD_CODEGEN) >> + add_library(grpc++_reflection >> +@@ -3374,6 +3396,8 @@ target_link_libraries(grpc++_test_util >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(grpc++_unsecure >> + src/cpp/client/channel_cc.cc >> + src/cpp/client/client_callback.cc >> +@@ -3656,6 +3680,7 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> + >> + add_library(grpc_plugin_support >> + src/compiler/cpp_generator.cc >> +@@ -3715,7 +3740,7 @@ foreach(_hdr >> + endforeach() >> + >> + >> +-if(gRPC_INSTALL) >> ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> + install(TARGETS grpc_plugin_support EXPORT gRPCTargets >> + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} >> + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} >> +@@ -3795,6 +3820,8 @@ endif() >> + >> + endif() >> + >> ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> ++ >> + add_library(upb >> + third_party/upb/upb/decode_fast.c >> + third_party/upb/upb/decode.c >> +@@ -3852,8 +3879,6 @@ if(gRPC_INSTALL) >> + ) >> + endif() >> + >> +- >> +- >> + add_executable(check_epollexclusive >> + test/build/check_epollexclusive.c >> + ) >> +@@ -3906,8 +3931,6 @@ target_link_libraries(gen_hpack_tables >> + gpr >> + ) >> + >> +- >> +- >> + add_executable(gen_legal_metadata_characters >> + tools/codegen/core/gen_legal_metadata_characters.cc >> + ) >> +@@ -3958,6 +3981,8 @@ target_link_libraries(gen_percent_encoding_tables >> + ${_gRPC_ALLTARGETS_LIBRARIES} >> + ) >> + >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> ++ >> + >> + if(gRPC_BUILD_TESTS) >> + >> +@@ -10722,7 +10747,7 @@ target_link_libraries(grpc_cli >> + >> + >> + endif() >> +-if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN) >> ++if(gRPC_BUILD_GRPC_CPP_PLUGIN) >> + >> + add_executable(grpc_cpp_plugin >> + src/compiler/cpp_plugin.cc >> +@@ -10752,7 +10777,7 @@ target_link_libraries(grpc_cpp_plugin >> + >> + >> + >> +-if(gRPC_INSTALL) >> ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> + install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets >> + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} >> + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} >> +@@ -15420,7 +15445,7 @@ endif() >> + >> + >> + >> +- >> ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) >> + >> + if(gRPC_INSTALL) >> + install(EXPORT gRPCTargets >> +@@ -15517,3 +15542,5 @@ generate_pkgconfig( >> + "-lgrpc++_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" >> + "" >> + "grpc++_unsecure.pc") >> ++ >> ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY >> +-- >> +2.26.3 >> + >> diff --git a/package/grpc/Config.in b/package/grpc/Config.in >> index d1bf0d078d..ad3ddbcf19 100644 >> --- a/package/grpc/Config.in >> +++ b/package/grpc/Config.in >> @@ -4,7 +4,6 @@ config BR2_PACKAGE_GRPC >> depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 >> depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf >> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp >> - depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libabseil-cpp >> depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp >> depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC >> depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS >> @@ -20,10 +19,9 @@ config BR2_PACKAGE_GRPC >> >> http://github.com/grpc/grpc >> >> -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" >> +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9" >> depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS >> depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC >> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ >> - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ >> - || !BR2_HOST_GCC_AT_LEAST_4_9 >> + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 >> depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS >> diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk >> index ee8dc38e70..8718b0e956 100644 >> --- a/package/grpc/grpc.mk >> +++ b/package/grpc/grpc.mk >> @@ -14,8 +14,7 @@ GRPC_INSTALL_STAGING = YES >> >> # Need to use host grpc_cpp_plugin during cross compilation. >> GRPC_DEPENDENCIES = c-ares host-grpc libabseil-cpp openssl protobuf re2 zlib >> -HOST_GRPC_DEPENDENCIES = host-c-ares host-libabseil-cpp host-openssl host-protobuf \ >> - host-re2 host-zlib >> +HOST_GRPC_DEPENDENCIES = host-protobuf >> >> # gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have >> # installed a cmake config file, but buildroot uses c-ares' autotools build, >> @@ -70,14 +69,26 @@ GRPC_CONF_OPTS += \ >> -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ >> -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" >> >> +# For host-grpc, we only need the 'grpc_cpp_plugin' binary, which is needed for >> +# target grpc compilation. To avoid unnecessary build steps and host >> +# dependencies, supply enough options to pass the configure checks without >> +# requiring other host packages, unless those needed by grpc_cpp_plugin. >> HOST_GRPC_CONF_OPTS = \ >> - -DgRPC_ABSL_PROVIDER=package \ >> - -D_gRPC_CARES_LIBRARIES=cares \ >> - -DgRPC_CARES_PROVIDER=none \ >> -DgRPC_PROTOBUF_PROVIDER=package \ >> - -DgRPC_RE2_PROVIDER=package \ >> - -DgRPC_SSL_PROVIDER=package \ >> - -DgRPC_ZLIB_PROVIDER=package >> + -DgRPC_ABSL_PROVIDER=none \ >> + -DgRPC_CARES_PROVIDER=none \ >> + -DgRPC_RE2_PROVIDER=none \ >> + -DgRPC_SSL_PROVIDER=none \ >> + -DgRPC_ZLIB_PROVIDER=none \ >> + -DgRPC_BUILD_CODEGEN=OFF \ >> + -DgRPC_BUILD_CSHARP_EXT=OFF \ >> + -DgRPC_BUILD_PLUGIN_SUPPORT_ONLY=ON \ >> + -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ >> + -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF >> >> $(eval $(cmake-package)) >> $(eval $(host-cmake-package)) > > > From arnout at mind.be Wed Jan 12 19:10:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:10:40 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> Message-ID: <0abbcb3c-e2db-ae06-a065-2bcb71b74f8d@mind.be> On 12/01/2022 12:04, Thomas De Schampheleire wrote: > Hi Romain, > > El lun, 10 ene 2022 a las 0:27, Romain Naour () escribi?: >> >> Hello Thomas, >> >> Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : >>> From: Thomas De Schampheleire >>> >>> There are cases where a 64-bit architecture is running a 64-bit kernel but >>> 32-bit userspace. Examples include: >>> * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace >>> * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace >> >> Can you provide a new qemu defconfig that cover this use case? >> This is for gitlab-ci runtime testing. >> >> Best regards, >> Romain >> >> PS: (This email doesn't count as a review of this series :)) > > > Thanks for your interest in this series :-) > > Currently the qemu defconfig that I use uses an external toolchain > built via crosstool-ng. Crosstool-ng is capable of creating a multilib > toolchain supporting 32-bit and 64-bit binaries. > However, Buildroot does not currently support this for internal > toolchains. How do you suggest to proceed here? > Could we perhaps add a crosstool-ng-built multilib toolchain to the > Bootlin toolchains? Bootlin toolchains no - they are generated by Buildroot. However, it would be useful to have such a toolchain as an autobuilder toolchain. We could use it both in a 32-bit and 64-bit config. We can simply add your binary to autobuild.buildroot.org/toolchains/tarballs and add two config fragments to support/config-fragments/autobuild. The same toolchain tarball can then also be used for a runtime test. Regards, Arnout From bernd.kuhls at t-online.de Wed Jan 12 19:17:08 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 12 Jan 2022 20:17:08 +0100 Subject: [Buildroot] [PATCH 3/3] package/kodi-pvr-mythtv: bump version to 19.0.6-Matrix In-Reply-To: <20220112191708.77947-1-bernd.kuhls@t-online.de> References: <20220112191708.77947-1-bernd.kuhls@t-online.de> Message-ID: <20220112191708.77947-3-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index cd96feef70..cb10d24a4f 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 87f696fdb973602967c7dbcc1db5492616f29bfabe687fddd3a276f663a05d44 kodi-pvr-mythtv-19.0.3-Matrix.tar.gz +sha256 8e63e85e055ec1e2d727506c939c4f53f6aef8b714f5c18f73c58102355f2e14 kodi-pvr-mythtv-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 6edca8db50..351fbc4eae 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.3-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.6-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Wed Jan 12 19:17:07 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 12 Jan 2022 20:17:07 +0100 Subject: [Buildroot] [PATCH 2/3] package/kodi-pvr-argustv: bump version to 19.2.1-Matrix In-Reply-To: <20220112191708.77947-1-bernd.kuhls@t-online.de> References: <20220112191708.77947-1-bernd.kuhls@t-online.de> Message-ID: <20220112191708.77947-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index e58f9a4608..33de7d6ca0 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfd19f9c1c4efe556d3764a5bec7842092b246932159ff69cf5bb1f64c8b9473 kodi-pvr-argustv-19.2.0-Matrix.tar.gz +sha256 027e49b56c03d182fbf69ce71a84270dddb06e537814cd9ea209d4baca8d16fe kodi-pvr-argustv-19.2.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 230ef1067c..90d0a53002 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.2.0-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.2.1-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Wed Jan 12 19:17:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 12 Jan 2022 20:17:06 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi-inputstream-adaptive: bump version to 19.0.2-Matrix Message-ID: <20220112191708.77947-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index d193a0c4f8..c7a081f887 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d389af940011887378d1e6ad0ad91b81cfc138b862cf4a43593388c33308cb55 kodi-inputstream-adaptive-19.0.1-Matrix.tar.gz +sha256 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 6044ed07fb..f632a42adb 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.1-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.2-Matrix KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL -- 2.30.2 From arnout at mind.be Wed Jan 12 19:39:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:39:57 +0100 Subject: [Buildroot] [PATCH] system/skeleton: provide run/lock directory In-Reply-To: References: <20220112101021.456463-1-nolange79@gmail.com> Message-ID: <9e39bdad-16dd-1fb4-2c5e-2de0e032fcbc@mind.be> On 12/01/2022 11:19, Norbert Lange wrote: > Am Mi., 12. Jan. 2022 um 11:10 Uhr schrieb Norbert Lange : >> >> We changed the skeletons in bf01e51f3c, so that var/lock >> points to run/lock. This resulted in build failures as >> some packages want to work with these paths. >> >> - Create run/lock, the run directory will be purged >> later anyway (since 5e78e7e97d). >> - for init == systemd, create the var/lock symlink early >> to prevent packages creating this path as directory. >> >> Signed-off-by: Norbert Lange >> --- >> package/skeleton-init-systemd/skeleton-init-systemd.mk | 2 ++ >> system/skeleton/run/{ => lock}/.empty | 0 >> 2 files changed, 2 insertions(+) >> rename system/skeleton/run/{ => lock}/.empty (100%) >> >> diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk >> index 1e212cc2f7..795a171809 100644 >> --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk >> +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk >> @@ -62,6 +62,8 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS >> mkdir -p $(TARGET_DIR)/srv >> mkdir -p $(TARGET_DIR)/var >> ln -s ../run $(TARGET_DIR)/var/run >> + # prevent install scripts to create var/lock as directory >> + ln -s ../run/lock $(TARGET_DIR)/var/lock >> install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf >> $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) >> endef >> diff --git a/system/skeleton/run/.empty b/system/skeleton/run/lock/.empty >> similarity index 100% >> rename from system/skeleton/run/.empty >> rename to system/skeleton/run/lock/.empty >> -- >> 2.34.1 >> > > Fixes: http://autobuild.buildroot.net/results/3ee/3ee8f9ee55e51af38e9dbe7b9840c9589d88a30f Applied to master with that added, thanks. > (and alot more containing the vtun package) > > For someone not fluent with mailing list workflows, and working with a > couple projects, > it might help having a few example commit messages (-templates) in the docs. > ie for respins, bug fixes, versioning (potentially of series) Absolutely! I'm waiting for a really nice example to turn up on the list and steal that for the documentation. Regards, Arnout From arnout at mind.be Wed Jan 12 19:38:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:38:09 +0100 Subject: [Buildroot] [git commit] system/skeleton: provide run/lock directory Message-ID: <20220112193444.1158482A98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02d35007472675c147be79b4ca06959c83ae4128 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We changed the skeletons in bf01e51f3c, so that var/lock points to run/lock. This resulted in build failures as some packages want to work with these paths. - Create run/lock, the run directory will be purged later anyway (since 5e78e7e97d). - for init == systemd, create the var/lock symlink early to prevent packages creating this path as directory. Fixes: http://autobuild.buildroot.net/results/3ee/3ee8f9ee55e51af38e9dbe7b9840c9589d88a30f Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 2 ++ system/skeleton/run/{ => lock}/.empty | 0 2 files changed, 2 insertions(+) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 1e212cc2f7..795a171809 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,8 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + # prevent install scripts to create var/lock as directory + ln -s ../run/lock $(TARGET_DIR)/var/lock install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef diff --git a/system/skeleton/run/.empty b/system/skeleton/run/lock/.empty similarity index 100% rename from system/skeleton/run/.empty rename to system/skeleton/run/lock/.empty From arnout at mind.be Wed Jan 12 19:45:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:45:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.5.0 In-Reply-To: <20220112182800.3128945-1-fontaine.fabrice@gmail.com> References: <20220112182800.3128945-1-fontaine.fabrice@gmail.com> Message-ID: <546b5c8e-2b49-b3bc-2e91-d8210f21d9c5@mind.be> On 12/01/2022 19:28, Fabrice Fontaine wrote: > https://github.com/FreeRDP/FreeRDP/releases/tag/2.5.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/freerdp/freerdp.hash | 4 ++-- > package/freerdp/freerdp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash > index 637e57e8b0..e31b8d5b96 100644 > --- a/package/freerdp/freerdp.hash > +++ b/package/freerdp/freerdp.hash > @@ -1,5 +1,5 @@ > -# From https://pub.freerdp.com/releases/freerdp-2.4.1.tar.gz.sha256 > -sha256 ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf freerdp-2.4.1.tar.gz > +# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 > +sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz > > # Locally calculated > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > index 40a3904024..c536f6cb1c 100644 > --- a/package/freerdp/freerdp.mk > +++ b/package/freerdp/freerdp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FREERDP_VERSION = 2.4.1 > +FREERDP_VERSION = 2.5.0 > FREERDP_SITE = https://pub.freerdp.com/releases > FREERDP_DEPENDENCIES = libglib2 openssl zlib > FREERDP_LICENSE = Apache-2.0 > From arnout at mind.be Wed Jan 12 19:45:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:45:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinycbor: disable -Werror In-Reply-To: <20220112172302.2991419-1-fontaine.fabrice@gmail.com> References: <20220112172302.2991419-1-fontaine.fabrice@gmail.com> Message-ID: <84f17b9f-471f-be29-2fea-5bde1d100389@mind.be> On 12/01/2022 18:23, Fabrice Fontaine wrote: > Disable -Werror to avoid the following build failure with gcc 4.8 raised > since bump to version 0.6.0 in commit > ee1a2826dcf7ff75f90b0bf9f7aa53d19ce19cf6 and > https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: > > /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c > cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types > cc1: error: -Werror=int-conversion: no option -Wint-conversion > > Fixes: > - http://autobuild.buildroot.org/results/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0001-Makefile-add-DISABLE_WERROR.patch | 44 +++++++++++++++++++ > package/tinycbor/tinycbor.mk | 2 +- > 2 files changed, 45 insertions(+), 1 deletion(-) > create mode 100644 package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch > > diff --git a/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch > new file mode 100644 > index 0000000000..334bea7eb0 > --- /dev/null > +++ b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch > @@ -0,0 +1,44 @@ > +From 5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 10 Jan 2022 23:17:45 +0100 > +Subject: [PATCH] Makefile: add DISABLE_WERROR > + > +Allow the user to disable -Werror to avoid the following build failure > +with gcc 4.8 raised since version 0.6.0 and > +https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: > + > +/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c > +cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types > +cc1: error: -Werror=int-conversion: no option -Wint-conversion > + > +Fixes: > + - http://autobuild.buildroot.org/results/a9f/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa > + > +Signed-off-by: Fabrice Fontaine > +[Retrieved from: > +https://github.com/intel/tinycbor/commit/5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0] > +--- > + Makefile | 7 ++++++- > + 1 file changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index 6492ea16..3cde2b3d 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -236,10 +236,15 @@ tag: distcheck > + .SECONDARY: > + > + cflags := $(CPPFLAGS) -I$(SRCDIR)src > +-cflags += -std=gnu99 $(CFLAGS) \ > ++cflags += -std=gnu99 $(CFLAGS) > ++ > ++ifneq ($(DISABLE_WERROR),1) > ++cflags += \ > + -Werror=incompatible-pointer-types \ > + -Werror=implicit-function-declaration \ > + -Werror=int-conversion > ++endif > ++ > + %.o: %.c > + @test -d $(@D) || $(MKDIR) $(@D) > + $(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $< > diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk > index bf6e8e4c1e..cad50e633b 100644 > --- a/package/tinycbor/tinycbor.mk > +++ b/package/tinycbor/tinycbor.mk > @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_CJSON),y) > TINYCBOR_DEPENDENCIES += cjson > endif > > -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 > +TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 > > ifeq ($(BR2_STATIC_LIBS),y) > TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 > From arnout at mind.be Wed Jan 12 19:45:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:45:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: needs host-dtc In-Reply-To: <20220112172100.2991140-1-fontaine.fabrice@gmail.com> References: <20220112172100.2991140-1-fontaine.fabrice@gmail.com> Message-ID: On 12/01/2022 18:21, Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: > > configure: error: device-tree-compiler not found > > Fixes: > - http://autobuild.buildroot.org/results/d35ff4a0ca0a8463121d717a9727e0d863ca83e8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/riscv-isa-sim/riscv-isa-sim.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk > index e10dd4c662..59f70fc432 100644 > --- a/package/riscv-isa-sim/riscv-isa-sim.mk > +++ b/package/riscv-isa-sim/riscv-isa-sim.mk > @@ -8,5 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 > RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) > RISCV_ISA_SIM_LICENSE = BSD-3-Clause > RISCV_ISA_SIM_LICENSE_FILES = LICENSE > +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc > > $(eval $(host-autotools-package)) > From arnout at mind.be Wed Jan 12 19:45:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 20:45:59 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi-inputstream-adaptive: bump version to 19.0.2-Matrix In-Reply-To: <20220112191708.77947-1-bernd.kuhls@t-online.de> References: <20220112191708.77947-1-bernd.kuhls@t-online.de> Message-ID: On 12/01/2022 20:17, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied series to master, thanks. Regards, Arnout > --- > .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- > package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash > index d193a0c4f8..c7a081f887 100644 > --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash > +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 d389af940011887378d1e6ad0ad91b81cfc138b862cf4a43593388c33308cb55 kodi-inputstream-adaptive-19.0.1-Matrix.tar.gz > +sha256 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz > sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL > diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > index 6044ed07fb..f632a42adb 100644 > --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.1-Matrix > +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.2-Matrix > KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) > KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ > KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL > From arnout at mind.be Wed Jan 12 19:42:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:42:58 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: needs host-dtc Message-ID: <20220112193954.28BB482B45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d0f84d2004b04bc93d5ceb58c86640f190e5d78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: configure: error: device-tree-compiler not found Fixes: - http://autobuild.buildroot.org/results/d35ff4a0ca0a8463121d717a9727e0d863ca83e8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/riscv-isa-sim/riscv-isa-sim.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index e10dd4c662..59f70fc432 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -8,5 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc $(eval $(host-autotools-package)) From arnout at mind.be Wed Jan 12 19:43:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:05 +0100 Subject: [Buildroot] [git commit] package/freerdp: bump to version 2.5.0 Message-ID: <20220112193954.3C6488353B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60e27aee9b089de451c0dc3fe9e3fa3afb329447 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/FreeRDP/FreeRDP/releases/tag/2.5.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 637e57e8b0..e31b8d5b96 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.4.1.tar.gz.sha256 -sha256 ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf freerdp-2.4.1.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 +sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 40a3904024..c536f6cb1c 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.4.1 +FREERDP_VERSION = 2.5.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From arnout at mind.be Wed Jan 12 19:43:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:13 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-mythtv: bump version to 19.0.6-Matrix Message-ID: <20220112193954.599BF82B45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8a5f4ecd89a2bd84ab0a7a72f3c367a0980af4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index cd96feef70..cb10d24a4f 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 87f696fdb973602967c7dbcc1db5492616f29bfabe687fddd3a276f663a05d44 kodi-pvr-mythtv-19.0.3-Matrix.tar.gz +sha256 8e63e85e055ec1e2d727506c939c4f53f6aef8b714f5c18f73c58102355f2e14 kodi-pvr-mythtv-19.0.6-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 6edca8db50..351fbc4eae 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.3-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.6-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From arnout at mind.be Wed Jan 12 19:43:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:08 +0100 Subject: [Buildroot] [git commit] package/kodi-inputstream-adaptive: bump version to 19.0.2-Matrix Message-ID: <20220112193954.45E5B82B45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9197cfa5a589a7cc152d249001ad69db4214917c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index d193a0c4f8..c7a081f887 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d389af940011887378d1e6ad0ad91b81cfc138b862cf4a43593388c33308cb55 kodi-inputstream-adaptive-19.0.1-Matrix.tar.gz +sha256 f2285e77043a0c9160d1ab11dd5943cc584be17a2f7920be3002751ff697ec7b kodi-inputstream-adaptive-19.0.2-Matrix.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 6044ed07fb..f632a42adb 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.1-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.2-Matrix KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL From arnout at mind.be Wed Jan 12 19:43:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:02 +0100 Subject: [Buildroot] [git commit] package/tinycbor: disable -Werror Message-ID: <20220112193954.32EE08345C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b5e90c3203f944cb7f7ccad766f38580b9b2b6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable -Werror to avoid the following build failure with gcc 4.8 raised since bump to version 0.6.0 in commit ee1a2826dcf7ff75f90b0bf9f7aa53d19ce19cf6 and https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types cc1: error: -Werror=int-conversion: no option -Wint-conversion Fixes: - http://autobuild.buildroot.org/results/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-Makefile-add-DISABLE_WERROR.patch | 44 ++++++++++++++++++++++ package/tinycbor/tinycbor.mk | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch new file mode 100644 index 0000000000..334bea7eb0 --- /dev/null +++ b/package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch @@ -0,0 +1,44 @@ +From 5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 10 Jan 2022 23:17:45 +0100 +Subject: [PATCH] Makefile: add DISABLE_WERROR + +Allow the user to disable -Werror to avoid the following build failure +with gcc 4.8 raised since version 0.6.0 and +https://github.com/intel/tinycbor/commit/e2a4ed135c4d9101c4df83f2dd033cd249b6ef07: + +/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -fPIC -c -o src/cborerrorstrings.pic.o src/cborerrorstrings.c +cc1: error: -Werror=incompatible-pointer-types: no option -Wincompatible-pointer-types +cc1: error: -Werror=int-conversion: no option -Wint-conversion + +Fixes: + - http://autobuild.buildroot.org/results/a9f/a9fe64c42bb96f9e7b4af3050464f6570c1c00fa + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/intel/tinycbor/commit/5f26eaf8d7be760fafe11ef4a6e0f907e7e8c3f0] +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6492ea16..3cde2b3d 100644 +--- a/Makefile ++++ b/Makefile +@@ -236,10 +236,15 @@ tag: distcheck + .SECONDARY: + + cflags := $(CPPFLAGS) -I$(SRCDIR)src +-cflags += -std=gnu99 $(CFLAGS) \ ++cflags += -std=gnu99 $(CFLAGS) ++ ++ifneq ($(DISABLE_WERROR),1) ++cflags += \ + -Werror=incompatible-pointer-types \ + -Werror=implicit-function-declaration \ + -Werror=int-conversion ++endif ++ + %.o: %.c + @test -d $(@D) || $(MKDIR) $(@D) + $(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $< diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index bf6e8e4c1e..cad50e633b 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_CJSON),y) TINYCBOR_DEPENDENCIES += cjson endif -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 +TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 ifeq ($(BR2_STATIC_LIBS),y) TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 From arnout at mind.be Wed Jan 12 19:43:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 20:43:10 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-argustv: bump version to 19.2.1-Matrix Message-ID: <20220112193954.4FC948345C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=95717ff91b6d20e51a45e3843f089eb08acd91d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index e58f9a4608..33de7d6ca0 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfd19f9c1c4efe556d3764a5bec7842092b246932159ff69cf5bb1f64c8b9473 kodi-pvr-argustv-19.2.0-Matrix.tar.gz +sha256 027e49b56c03d182fbf69ce71a84270dddb06e537814cd9ea209d4baca8d16fe kodi-pvr-argustv-19.2.1-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 230ef1067c..90d0a53002 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 19.2.0-Matrix +KODI_PVR_ARGUSTV_VERSION = 19.2.1-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md From romain.naour at smile.fr Wed Jan 12 20:06:54 2022 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 12 Jan 2022 21:06:54 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <0abbcb3c-e2db-ae06-a065-2bcb71b74f8d@mind.be> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <5269b781-3bed-9b6c-9a4f-2d077964a16e@smile.fr> <0abbcb3c-e2db-ae06-a065-2bcb71b74f8d@mind.be> Message-ID: <7ac86017-7b00-cc39-d6dc-a2dac0028382@smile.fr> Hello Thomas, Arnout, Le 12/01/2022 ? 20:10, Arnout Vandecappelle a ?crit?: > > > On 12/01/2022 12:04, Thomas De Schampheleire wrote: >> Hi Romain, >> >> El lun, 10 ene 2022 a las 0:27, Romain Naour () escribi?: >>> >>> Hello Thomas, >>> >>> Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : >>>> From: Thomas De Schampheleire >>>> >>>> There are cases where a 64-bit architecture is running a 64-bit kernel but >>>> 32-bit userspace. Examples include: >>>> ???? * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace >>>> ???? * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace >>> >>> Can you provide a new qemu defconfig that cover this use case? >>> This is for gitlab-ci runtime testing. >>> >>> Best regards, >>> Romain >>> >>> PS: (This email doesn't count as a review of this series :)) >> >> >> Thanks for your interest in this series :-) >> >> Currently the qemu defconfig that I use uses an external toolchain >> built via crosstool-ng. Crosstool-ng is capable of creating a multilib >> toolchain supporting 32-bit and 64-bit binaries. >> However, Buildroot does not currently support this for internal >> toolchains. How do you suggest to proceed here? >> Could we perhaps add a crosstool-ng-built multilib toolchain to the >> Bootlin toolchains? > > ?Bootlin toolchains no - they are generated by Buildroot. Indeed. > ?However, it would be useful to have such a toolchain as an autobuilder > toolchain. We could use it both in a 32-bit and 64-bit config. We can simply add > your binary to autobuild.buildroot.org/toolchains/tarballs and add two config > fragments to support/config-fragments/autobuild. > > ?The same toolchain tarball can then also be used for a runtime test. Agree, but we have to be able to rebuild them when needed. A script or a simple text would be ok. Best regards, Romain > > ?Regards, > ?Arnout > From arnout at mind.be Wed Jan 12 20:16:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 21:16:23 +0100 Subject: [Buildroot] [git commit] package/networkd-dispatcher: new package Message-ID: <20220112201255.E8D6083456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27856dfd1af18161af84783c785481de9c7e8d94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Networkd-dispatcher is a dispatcher daemon for systemd-networkd connection status changes. This daemon is similar to NetworkManager-dispatcher, but is much more limited in the types of events it supports due to the limited nature of systemd-networkd. To simplify the large number of transitive dependencies, remove the ones that are implied by glibc. To simplify the comment, simply don't show it if python is selected. Python 2 is going to be removed soon anyway. Signed-off-by: Michael Nosthoff [Arnout: add Config.in comment and rework/simplify dependencies] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/networkd-dispatcher/Config.in | 29 ++++++++++++++++++++++ .../networkd-dispatcher/networkd-dispatcher.hash | 3 +++ package/networkd-dispatcher/networkd-dispatcher.mk | 25 +++++++++++++++++++ 5 files changed, 59 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..c15b117610 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2002,6 +2002,7 @@ N: Michael Nosthoff F: package/grpc/ F: package/gtest/ F: package/libabseil-cpp/ +F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ diff --git a/package/Config.in b/package/Config.in index 59297c3f3d..b76f50e565 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2297,6 +2297,7 @@ endif source "package/netstat-nat/Config.in" source "package/network-manager/Config.in" source "package/network-manager-openvpn/Config.in" + source "package/networkd-dispatcher/Config.in" source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in new file mode 100644 index 0000000000..ab8c473951 --- /dev/null +++ b/package/networkd-dispatcher/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_NETWORKD_DISPATCHER + bool "networkd-dispatcher" + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection + depends on !BR2_PACKAGE_PYTHON # python3 + depends on BR2_PACKAGE_SYSTEMD # runtime + select BR2_PACKAGE_DBUS # dbus-python + select BR2_PACKAGE_DBUS_PYTHON # runtime + select BR2_PACKAGE_PYTHON3 # python-gobject + select BR2_PACKAGE_PYTHON_GOBJECT # runtime + select BR2_PACKAGE_SYSTEMD_NETWORKD # runtime + help + Networkd-dispatcher is a dispatcher daemon for + systemd-networkd connection status changes. + This daemon is similar to NetworkManager-dispatcher, + but is much more limited in the types of events it + supports due to the limited nature of systemd-networkd. + + https://gitlab.com/craftyguy/networkd-dispatcher + +comment "networkd-dispatcher needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on BR2_PACKAGE_SYSTEMD + depends on !BR2_PACKAGE_PYTHON + depends on !BR2_HOST_GCC_AT_LEAST_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash new file mode 100644 index 0000000000..ca7c300783 --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk new file mode 100644 index 0000000000..4f609db73a --- /dev/null +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# networkd-dispatcher +# +################################################################################ + +NETWORKD_DISPATCHER_VERSION = 2.1 +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE + +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d +endef + +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf +endef + +$(eval $(generic-package)) From arnout at mind.be Wed Jan 12 20:18:03 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 12 Jan 2022 21:18:03 +0100 Subject: [Buildroot] [git commit] package/iwd: remove numbering from patch Message-ID: <20220112201255.F05678353A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=feb9185fc185c1f76e3789b0dc521e3cf98c1ebb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master check-package says package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch:4: generate your patches with 'git format-patch -N' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch index 6b9cfb3e70..3e808deb88 100644 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch @@ -1,7 +1,7 @@ From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 10 Jan 2022 22:32:18 +0100 -Subject: [PATCH 1/1] dpp: fix implicit declaration of function explicit_bzero +Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From arnout at mind.be Wed Jan 12 20:24:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 21:24:12 +0100 Subject: [Buildroot] [PATCH v5] package/networkd-dispatcher: new package In-Reply-To: <20220110185147.84697-1-buildroot@heine.tech> References: <20220110185147.84697-1-buildroot@heine.tech> Message-ID: <3b7552fe-af31-cab3-b9ec-cfa9fa4076e9@mind.be> On 10/01/2022 19:51, Michael Nosthoff via buildroot wrote: > From: Michael Nosthoff via buildroot > > Networkd-dispatcher is a dispatcher daemon for systemd-networkd > connection status changes. This daemon is similar to > NetworkManager-dispatcher, but is much more limited in the types of > events it supports due to the limited nature of systemd-networkd. > > Signed-off-by: Michael Nosthoff Applied to master, thanks. I reworked the Config.in quite a lot, it's a complicated one! [snip] > diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in > new file mode 100644 > index 0000000000..1dfa12ba45 > --- /dev/null > +++ b/package/networkd-dispatcher/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_NETWORKD_DISPATCHER > + bool "networkd-dispatcher" > + depends on BR2_USE_WCHAR # dbus-python -> glib2 > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection > + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python -> glib2 > + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu > + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection > + depends on BR2_PACKAGE_DBUS # dbus-python dbus-python depends on dbus instead of selecting it because it's a suboption of dbus (though actually implemented in a separate package, which is not really relevant for the user). So here we should instead select dbus. > + depends on BR2_PACKAGE_PYTHON3 # runtime, python-gobject Since this is not a python package, but just a tool that happens to be implemented in python, python3 should be selected instead of depended upon. > + depends on BR2_PACKAGE_SYSTEMD_NETWORKD # runtime > + select BR2_PACKAGE_DBUS_PYTHON > + select BR2_PACKAGE_PYTHON_GOBJECT > + help > + Networkd-dispatcher is a dispatcher daemon for > + systemd-networkd connection status changes. > + This daemon is similar to NetworkManager-dispatcher, > + but is much more limited in the types of events it > + supports due to the limited nature of systemd-networkd. > + > + https://gitlab.com/craftyguy/networkd-dispatcher There should be a comment for the dependencies. Because it become quite complicated, I removed all the dependencies that are implicit from glibc. Regards, Arnout > diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash > new file mode 100644 > index 0000000000..ca7c300783 > --- /dev/null > +++ b/package/networkd-dispatcher/networkd-dispatcher.hash > @@ -0,0 +1,3 @@ > +# locally computed > +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 > +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE > diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk > new file mode 100644 > index 0000000000..4f609db73a > --- /dev/null > +++ b/package/networkd-dispatcher/networkd-dispatcher.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# networkd-dispatcher > +# > +################################################################################ > + > +NETWORKD_DISPATCHER_VERSION = 2.1 > +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 > +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) > +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 > +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE > + > +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher > + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d > +endef > + > +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service > + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ > + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf > +endef > + > +$(eval $(generic-package)) > From arnout at mind.be Wed Jan 12 20:24:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 21:24:12 +0100 Subject: [Buildroot] [PATCH v5] package/networkd-dispatcher: new package In-Reply-To: <20220110185147.84697-1-buildroot@heine.tech> References: <20220110185147.84697-1-buildroot@heine.tech> Message-ID: <3b7552fe-af31-cab3-b9ec-cfa9fa4076e9@mind.be> On 10/01/2022 19:51, Michael Nosthoff via buildroot wrote: > From: Michael Nosthoff via buildroot > > Networkd-dispatcher is a dispatcher daemon for systemd-networkd > connection status changes. This daemon is similar to > NetworkManager-dispatcher, but is much more limited in the types of > events it supports due to the limited nature of systemd-networkd. > > Signed-off-by: Michael Nosthoff Applied to master, thanks. I reworked the Config.in quite a lot, it's a complicated one! [snip] > diff --git a/package/networkd-dispatcher/Config.in b/package/networkd-dispatcher/Config.in > new file mode 100644 > index 0000000000..1dfa12ba45 > --- /dev/null > +++ b/package/networkd-dispatcher/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_NETWORKD_DISPATCHER > + bool "networkd-dispatcher" > + depends on BR2_USE_WCHAR # dbus-python -> glib2 > + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection > + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python -> glib2 > + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu > + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection > + depends on BR2_PACKAGE_DBUS # dbus-python dbus-python depends on dbus instead of selecting it because it's a suboption of dbus (though actually implemented in a separate package, which is not really relevant for the user). So here we should instead select dbus. > + depends on BR2_PACKAGE_PYTHON3 # runtime, python-gobject Since this is not a python package, but just a tool that happens to be implemented in python, python3 should be selected instead of depended upon. > + depends on BR2_PACKAGE_SYSTEMD_NETWORKD # runtime > + select BR2_PACKAGE_DBUS_PYTHON > + select BR2_PACKAGE_PYTHON_GOBJECT > + help > + Networkd-dispatcher is a dispatcher daemon for > + systemd-networkd connection status changes. > + This daemon is similar to NetworkManager-dispatcher, > + but is much more limited in the types of events it > + supports due to the limited nature of systemd-networkd. > + > + https://gitlab.com/craftyguy/networkd-dispatcher There should be a comment for the dependencies. Because it become quite complicated, I removed all the dependencies that are implicit from glibc. Regards, Arnout > diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash > new file mode 100644 > index 0000000000..ca7c300783 > --- /dev/null > +++ b/package/networkd-dispatcher/networkd-dispatcher.hash > @@ -0,0 +1,3 @@ > +# locally computed > +sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 > +sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE > diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk > new file mode 100644 > index 0000000000..4f609db73a > --- /dev/null > +++ b/package/networkd-dispatcher/networkd-dispatcher.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# networkd-dispatcher > +# > +################################################################################ > + > +NETWORKD_DISPATCHER_VERSION = 2.1 > +NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 > +NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) > +NETWORKD_DISPATCHER_LICENSE = GPL-3.0 > +NETWORKD_DISPATCHER_LICENSE_FILES = LICENSE > + > +define NETWORKD_DISPATCHER_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/networkd-dispatcher $(TARGET_DIR)/usr/bin/networkd-dispatcher > + mkdir -p $(TARGET_DIR)/etc/networkd-dispatcher/{routable,dormant,no-carrier,off,carrier,degraded,configuring,configured}.d > +endef > + > +define NETWORKD_DISPATCHER_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/networkd-dispatcher.service > + $(INSTALL) -D -m 0644 $(@D)/networkd-dispatcher.conf \ > + $(TARGET_DIR)/etc/conf.d/networkd-dispatcher.conf > +endef > + > +$(eval $(generic-package)) > From ju.o at free.fr Wed Jan 12 20:26:40 2022 From: ju.o at free.fr (Julien Olivain) Date: Wed, 12 Jan 2022 21:26:40 +0100 Subject: [Buildroot] [PATCH 1/1] board/spike/riscv64/start.sh: add buildroot host dir in PATH Message-ID: <20220112202640.7064-1-ju.o@free.fr> commit 0d0f84d2004b04bc93d5ceb58c86640f190e5d78 added the missing host-dtc dependency to riscv-isa-sim. The spike simulator calls the dtc binary at its startup. The host dtc command needs to be in the PATH at that time. This commit add the buildroot host binary directory into the PATH of the start.sh helper script. It make sure spike will use the buildroot dtc version. This commit fixes this start.sh script on host not providing the dtc command. Since the "spike" binary is now in the PATH, the binary name is also simplified. Signed-off-by: Julien Olivain --- board/spike/riscv64/start.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh index 75b1412df8..6fbbced806 100755 --- a/board/spike/riscv64/start.sh +++ b/board/spike/riscv64/start.sh @@ -3,9 +3,13 @@ SCRIPT_DIR="$(dirname "$0")" BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" +# spike uses dtc at runtime startup, so make sure buildroot host +# directory is in the PATH +export PATH="${BR_BASEDIR}/output/host/usr/bin:$PATH" + # Use Buildroot host spike by default, but allow the caller to # redefine another spike binary -: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" +: "${SPIKE:=spike}" exec "${SPIKE}" \ --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 20:31:17 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 21:31:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/avahi: add hidden libavahi-client option Message-ID: <20220112203117.3133159-1-fontaine.fabrice@gmail.com> This hidden option will simplify packages depending on libavahi-client Signed-off-by: Fabrice Fontaine --- package/avahi/Config.in | 6 ++++++ package/cups-filters/cups-filters.mk | 3 +-- package/libiio/libiio.mk | 3 +-- package/libostree/libostree.mk | 6 +----- package/pipewire/pipewire.mk | 3 +-- package/shairport-sync/shairport-sync.mk | 6 +----- package/vlc/vlc.mk | 3 +-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 95b01bfe92..67722d04a2 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -34,6 +34,12 @@ config BR2_PACKAGE_AVAHI_DAEMON The daemon registers local IP addresses and services using mDNS/DNS-SD. +config BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT + bool + default y + depends on BR2_PACKAGE_AVAHI_DAEMON + depends on BR2_PACKAGE_DBUS + config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY bool "libdns_sd compatibility (Bonjour)" depends on BR2_PACKAGE_AVAHI_DAEMON diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 63b85f0b8b..c8f2dd0aae 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -45,8 +45,7 @@ else CUPS_FILTERS_CONF_OPTS += --disable-dbus endif -# avahi support requires avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) CUPS_FILTERS_DEPENDENCIES += avahi CUPS_FILTERS_CONF_OPTS += --enable-avahi else diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 38b2f83e6e..a4fe0d4541 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -65,8 +65,7 @@ else LIBIIO_CONF_OPTS += -DWITH_AIO=OFF endif -# Avahi support in libiio requires avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) LIBIIO_DEPENDENCIES += avahi LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=ON else diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 22cb83d039..9cbf2848c9 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -37,11 +37,7 @@ else LIBOSTREE_CONF_OPTS += --without-openssl endif -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus config symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) LIBOSTREE_CONF_OPTS += --with-avahi LIBOSTREE_DEPENDENCIES += avahi else diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 604d08f90d..b05ce2bcc2 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -83,8 +83,7 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -# avahi support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index cf49f2b2ed..487e0c05e5 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -22,11 +22,7 @@ SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \ SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)" # Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns). -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus congig symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) SHAIRPORT_SYNC_DEPENDENCIES += avahi SHAIRPORT_SYNC_CONF_OPTS += --with-avahi --without-tinysvcmdns else diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index fe338fcbe8..b793e0efe0 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -117,8 +117,7 @@ else VLC_CONF_OPTS += --disable-alsa endif -# avahi support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) VLC_CONF_OPTS += --enable-avahi VLC_DEPENDENCIES += avahi else -- 2.34.1 From james.hilliard1 at gmail.com Wed Jan 12 20:39:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 13:39:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220112203939.606775-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. Signed-off-by: James Hilliard --- package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- package/qt5/qt5base/qt5base.mk | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..db9ab0c364 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,18 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..6c05e710d8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ -- 2.25.1 From arnout at mind.be Wed Jan 12 20:42:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 12 Jan 2022 21:42:51 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> References: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> Message-ID: On 08/01/2022 18:35, Yann E. MORIN wrote: > Some files contain hard-coded absolute paths that point to the host > and/or staging directories. > > With per-package directories (aka. PPD), these paths point to the PPD > of the package that created the files, when we want them to point to the > PPD of the package that uses them. > > Up until now, we had two hooks that attempted to fix those files: > > - a libtool-specific hook that searches for all .la files and seds > them with the proper PPD, > > - a python-specific hook that tweaks just the sysconfigdata and > removes the byte-compiled version of the sysconfigdata. > > But now, we also have a few other kinds of files for which we need to > fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others > as well. > > We solve this issue by just replacing any PPD in text files, with the > current package's PPD. > > This is very similar to, and inspired from what is done when relocating > the SDK. However, we can't use the existing relocate-sdk script, because > that needs to know the original location, which we do not have when we > aggregate the PPD (we could store it, but we can easily do without it). Looking at the resulting code, it's so small that it's not worth factoring out. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle (Essensium/Mind) > Cc: Adam Duskett > Cc: Louis-Paul CORDIER > Cc: Andreas Naumann > --- > package/pkg-generic.mk | 43 +++++++++++++++++++++--------------------- > 1 file changed, 21 insertions(+), 22 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 6a5fe5507b..1022062bcf 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -90,21 +90,24 @@ endif > ####################################### > # Helper functions > > -# Make sure .la files only reference the current per-package > -# directory. > - > -# $1: package name (lower case) > -# $2: staging directory of the package > ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > -define fixup-libtool-files > - $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ > - -name "*.la" -print0 | xargs -0 --no-run-if-empty \ > - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" > + > +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the > +# proper staging and host directories for the current package: find > +# all text files that contain the PPD root, and replace it with the > +# current package's PPD. > +define PPD_FIXUP_PATHS > + $(Q)grep -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ This will trawl to large binary files and potentially take a long time... > + |while read -d '' f; do \ > + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ ... just to be ignored here. More importantly though: if a file is a symlink, it's going to be hit twice. Worse, if it's a symlink to an absolute path (which most likely points *outside* of STAGING_DIR), we may end up sed'ing something on the host... I notice now that the same (theoretical) issue exists in relocate-sdk.sh. Obviously that script doesn't get thoroughly tested so it may very well be the wrong thing to do... Do you remember perhaps why we don't simply do find $(HOST_DIR) -type f -print0 \ ? I was going to say that we can skip the grep, but then we're back at the large (text) file thing. > + printf '%s\0' "$${f}"; \ Why not do the sed right here, like is done in relocate-sdk.sh? In fact, I'd keep the code as close as possible to relocate-sdk.sh to make later refactoring easier. > + done \ > + |xargs -0 --no-run-if-empty \ > + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' > endef > -endif > > -# Make sure python _sysconfigdata*.py files only reference the current > -# per-package directory. > +# Remove python's pre-compiled "sysconfigdata", as it may contain paths to > +# the original staging or host dirs. > # > # Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) > # because those directories may be created in the same recipe this macro will > @@ -113,19 +116,15 @@ endif > # fail. > # So we just use HOST_DIR as a starting point, and filter on the two directories > # of interest. > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) > define FIXUP_PYTHON_SYSCONFIGDATA Maybe rename to REMOVE_PYTHON_SYSCONFIGATA_PYC Regards, Arnout > $(Q)find $(HOST_DIR) \ > \( -path '$(HOST_DIR)/lib/python*' \ > -o -path '$(STAGING_DIR)/usr/lib/python*' \ > \) \ > - \( \( -name "_sysconfigdata*.pyc" -delete \) \ > - -o \( -name "_sysconfigdata*.py" -print0 \) \ > - \) \ > - | xargs -0 --no-run-if-empty \ > - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' > + \( -name "_sysconfigdata*.pyc" -delete \) > endef > -endif > + > +endif # PPD > > # Functions to collect statistics about installed files > > @@ -278,8 +277,6 @@ $(BUILD_DIR)/%/.stamp_configured: > @$(call pkg_size_before,$(STAGING_DIR),-staging) > @$(call pkg_size_before,$(BINARIES_DIR),-images) > @$(call pkg_size_before,$(HOST_DIR),-host) > - $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) > - $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) > $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) > $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) > $($(PKG)_CONFIGURE_CMDS) > @@ -836,7 +833,9 @@ $(2)_EXTRACT_CMDS ?= \ > $$(TAR_OPTIONS) -) > > # pre/post-steps hooks > -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA > +$(2)_POST_PREPARE_HOOKS += \ > + PPD_FIXUP_PATHS \ > + FIXUP_PYTHON_SYSCONFIGDATA > > ifeq ($$($(2)_TYPE),target) > ifneq ($$(HOST_$(2)_KCONFIG_VAR),) > From fontaine.fabrice at gmail.com Wed Jan 12 21:02:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:02:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/omniorb: bump to version 4.3.0 Message-ID: <20220112210219.3160627-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0 Signed-off-by: Fabrice Fontaine --- package/omniorb/omniorb.hash | 12 ++++++------ package/omniorb/omniorb.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/omniorb/omniorb.hash b/package/omniorb/omniorb.hash index 5ac8614689..f522c1ef67 100644 --- a/package/omniorb/omniorb.hash +++ b/package/omniorb/omniorb.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.4/ -sha1 a6f3c8e96fc09c4ef8d75bd495bbc5256a4773ee omniORB-4.2.4.tar.bz2 -md5 de961e8aa29f3eed95ea40a94c1cccdf omniORB-4.2.4.tar.bz2 +# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0/ +sha1 c3f12c2278f8c4603910c02c8fe892c1dde7217e omniORB-4.3.0.tar.bz2 +md5 8889ab13b444b495ca2c2b48ea6a6bd7 omniORB-4.3.0.tar.bz2 # Locally generated -sha256 28c01cd0df76c1e81524ca369dc9e6e75f57dc70f30688c99c67926e4bdc7a6f omniORB-4.2.4.tar.bz2 -sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING -sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB +sha256 976045a2341f4e9a85068b21f4bd928993292933eeecefea372db09e0219eadd omniORB-4.3.0.tar.bz2 +sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING +sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index 4ecbb9d2c9..a1943968f1 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.2.4 +OMNIORB_VERSION = 4.3.0 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 21:28:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:28:45 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-h2: bump to version 4.1.0 Message-ID: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> - Update site in Config.in - Reorder select - python 2.7 support has been dropped since version 4.0.0 https://github.com/python-hyper/h2/blob/v4.1.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- package/python-h2/Config.in | 5 +++-- package/python-h2/python-h2.hash | 6 +++--- package/python-h2/python-h2.mk | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-h2/Config.in b/package/python-h2/Config.in index dccee9b909..d88ad36761 100644 --- a/package/python-h2/Config.in +++ b/package/python-h2/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_H2 bool "python-h2" - select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_HPACK # runtime + select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime help HTTP/2 State-Machine based protocol implementation. - http://hyper.rtfd.org + https://github.com/python-hyper/h2 diff --git a/package/python-h2/python-h2.hash b/package/python-h2/python-h2.hash index 4193567d37..2f9c8f647f 100644 --- a/package/python-h2/python-h2.hash +++ b/package/python-h2/python-h2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/h2/json -md5 197a99c09f344a0dd987fab9801dc8d0 h2-3.2.0.tar.gz -sha256 875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14 h2-3.2.0.tar.gz +md5 4274f9619c0a43bb4ae01b6b02bf0c99 h2-4.1.0.tar.gz +sha256 a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb h2-4.1.0.tar.gz # Locally computed sha256 checksums -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE +sha256 7a65a5af0cbabf1c16251c7c6b2b7cb46d16a7222e79975b9b61fcd66a2e3f28 LICENSE diff --git a/package/python-h2/python-h2.mk b/package/python-h2/python-h2.mk index 81397bbb10..699e8baece 100644 --- a/package/python-h2/python-h2.mk +++ b/package/python-h2/python-h2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H2_VERSION = 3.2.0 +PYTHON_H2_VERSION = 4.1.0 PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz -PYTHON_H2_SITE = https://files.pythonhosted.org/packages/08/0a/033df0fc05fe94f72517ccd393dd9ff99b1773fd198307638e6d3568a518 +PYTHON_H2_SITE = https://files.pythonhosted.org/packages/2a/32/fec683ddd10629ea4ea46d206752a95a2d8a48c22521edd70b142488efe1 PYTHON_H2_SETUP_TYPE = setuptools PYTHON_H2_LICENSE = MIT PYTHON_H2_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 21:28:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:28:46 +0100 Subject: [Buildroot] [PATCH 2/3] package/python-hpack: bump to version 4.0.0 In-Reply-To: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> References: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> Message-ID: <20220112212847.3166081-2-fontaine.fabrice@gmail.com> - Drop patch (HISTORY.rst removed) - Update site in Config.in - python 2.7 has been dropped - Update indentation in hash file (two spaces) https://github.com/python-hyper/hpack/blob/v4.0.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- ...STORY.rst-from-UTF-8-format-to-ASCII.patch | 40 ------------------- package/python-hpack/Config.in | 3 +- package/python-hpack/python-hpack.hash | 8 ++-- package/python-hpack/python-hpack.mk | 4 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch diff --git a/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch b/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch deleted file mode 100644 index 015b8a24da..0000000000 --- a/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3d195f4f599f37c89419f1db1302f94acb38c264 Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Tue, 1 Aug 2017 10:15:33 +0200 -Subject: [PATCH] Convert HISTORY.rst from UTF-8 format to ASCII -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -UTF-8 formatted file breaks installations on some systems: - -Traceback (most recent call last): - File "setup.py", line 34, in - long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(), - File "/home/peko/autobuild/instance-1/output/target/usr/lib/python3.6/encodings/ascii.py", line 26, in decode - return codecs.ascii_decode(input, self.errors)[0] -UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 1125: ordinal not in range(128) - -To fix this error just replace '?' with 'S' meaning 'Section'. - -Signed-off-by: Yegor Yefremov ---- - HISTORY.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/HISTORY.rst b/HISTORY.rst -index 37b2d9c..b9310f5 100644 ---- a/HISTORY.rst -+++ b/HISTORY.rst -@@ -27,7 +27,7 @@ Release History - - HPACK now tolerates receiving multiple header table size changes in sequence, - rather than only one. - - HPACK now forbids header table size changes anywhere but first in a header -- block, as required by RFC 7541 ? 4.2. -+ block, as required by RFC 7541 S 4.2. - - Other miscellaneous performance improvements. - - 2.3.0 (2016-08-04) --- -2.11.0 - diff --git a/package/python-hpack/Config.in b/package/python-hpack/Config.in index b0ea03bc42..0608f97281 100644 --- a/package/python-hpack/Config.in +++ b/package/python-hpack/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_HPACK bool "python-hpack" + depends on BR2_PACKAGE_PYTHON3 help Pure-Python HPACK header compression. - http://hyper.rtfd.org + https://github.com/python-hyper/hpack diff --git a/package/python-hpack/python-hpack.hash b/package/python-hpack/python-hpack.hash index 72886b0edd..988cbaae0b 100644 --- a/package/python-hpack/python-hpack.hash +++ b/package/python-hpack/python-hpack.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/hpack/json -md5 556b0ae66180f54c2ce8029a0952088b hpack-3.0.0.tar.gz -# Locally computed -sha256 8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2 hpack-3.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/hpack/json +md5 27e01514ef06dc9fa0798d3dcb7de47c hpack-4.0.0.tar.gz +sha256 fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095 hpack-4.0.0.tar.gz +# Locally computed sha256 checksums sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index d6b96649e9..3cf534d055 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HPACK_VERSION = 3.0.0 +PYTHON_HPACK_VERSION = 4.0.0 PYTHON_HPACK_SOURCE = hpack-$(PYTHON_HPACK_VERSION).tar.gz -PYTHON_HPACK_SITE = https://pypi.python.org/packages/44/f1/b4440e46e265a29c0cb7b09b6daec6edf93c79eae713cfed93fbbf8716c5 +PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db19b0f6b370e79d586b3e8528b20252c729c476a2c02954 PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 21:28:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:28:47 +0100 Subject: [Buildroot] [PATCH 3/3] package/python-hyperframe: bump to version 6.0.1 In-Reply-To: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> References: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> Message-ID: <20220112212847.3166081-3-fontaine.fabrice@gmail.com> - Update site in Config.in - python 2.7 support has been dropped since version 6.0.0 - Update indentation in hash file (two spaces) https://github.com/python-hyper/hyperframe/blob/v6.0.1/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- package/python-hyperframe/Config.in | 3 ++- package/python-hyperframe/python-hyperframe.hash | 6 +++--- package/python-hyperframe/python-hyperframe.mk | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-hyperframe/Config.in b/package/python-hyperframe/Config.in index f3318a20e2..30457fe86e 100644 --- a/package/python-hyperframe/Config.in +++ b/package/python-hyperframe/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_HYPERFRAME bool "python-hyperframe" + depends on BR2_PACKAGE_PYTHON3 help HTTP/2 framing layer for Python. - http://hyper.rtfd.org + https://github.com/python-hyper/hyperframe/ diff --git a/package/python-hyperframe/python-hyperframe.hash b/package/python-hyperframe/python-hyperframe.hash index 3e686a4aa2..b39ab51a72 100644 --- a/package/python-hyperframe/python-hyperframe.hash +++ b/package/python-hyperframe/python-hyperframe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hyperframe/json -md5 6919183242feb26d8bce3b4cba81defd hyperframe-5.2.0.tar.gz -sha256 a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f hyperframe-5.2.0.tar.gz +md5 153c064e8ac654aaf136b3388c36de48 hyperframe-6.0.1.tar.gz +sha256 ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914 hyperframe-6.0.1.tar.gz # Locally computed sha256 checksums -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hyperframe/python-hyperframe.mk b/package/python-hyperframe/python-hyperframe.mk index 7640ade5fd..4b13ca51a3 100644 --- a/package/python-hyperframe/python-hyperframe.mk +++ b/package/python-hyperframe/python-hyperframe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HYPERFRAME_VERSION = 5.2.0 +PYTHON_HYPERFRAME_VERSION = 6.0.1 PYTHON_HYPERFRAME_SOURCE = hyperframe-$(PYTHON_HYPERFRAME_VERSION).tar.gz -PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/e6/7f/9a4834af1010dc1d570d5f394dfd9323a7d7ada7d25586bd299fc4cb0356 +PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/5a/2a/4747bff0a17f7281abe73e955d60d80aae537a5d203f417fa1c2e7578ebb PYTHON_HYPERFRAME_SETUP_TYPE = setuptools PYTHON_HYPERFRAME_LICENSE = MIT PYTHON_HYPERFRAME_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 12 21:56:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 12 Jan 2022 22:56:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: add mips64el support Message-ID: <20220112215637.3179786-1-fontaine.fabrice@gmail.com> mips64el is supported since https://sourceforge.net/p/gnu-efi/code/ci/3f234f5b6ff5c16c6ddd5f2c2513fb329aecd30a Signed-off-by: Fabrice Fontaine --- package/gnu-efi/Config.in | 1 + package/gnu-efi/gnu-efi.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index d456a23837..8e35fddbcb 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_aarch64_be default y if BR2_i386 + default y if BR2_mips64el default y if BR2_x86_64 config BR2_PACKAGE_GNU_EFI diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 69618029f4..06bf254738 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -24,6 +24,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) GNU_EFI_PLATFORM = arm else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) GNU_EFI_PLATFORM = aarch64 +else ifeq ($(BR2_mips64el),y) +GNU_EFI_PLATFORM = mips64el endif GNU_EFI_MAKE_OPTS = \ -- 2.34.1 From james.hilliard1 at gmail.com Thu Jan 13 00:09:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 17:09:35 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions Message-ID: <20220113000935.2353800-1-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches which don't have proper version tags. Create a .git file so to trigger headers sync during configure. Hold back updating qt5webengine for now since the latest version requires significant changes to build, just tweak existing version to be compatible with latest kde versions for now. Signed-off-by: James Hilliard --- Changes v4 -> v5: - leave qt5webengine on current version - add minimal tweaks to qt5webengine to build with updated kde deps Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 +- ...Fix-build-with-GCC-11-include-limits.patch | 53 ------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 --------------- .../0008-Add-missing-limits-include.patch | 32 -------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 ----------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 +- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 +- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 +- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 ----------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 +- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 +- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +- package/qt5/qt5location-mapboxgl/Config.in | 4 + .../qt5location-mapboxgl.hash | 16 ++++ .../qt5location-mapboxgl.mk | 14 ++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 +++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 +- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 +- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 +- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 +- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 +- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 +- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 +- ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 +++++++++++++++++++ package/qt5/qt5webengine/qt5webengine.mk | 9 ++- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 +- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 +- 76 files changed, 306 insertions(+), 390 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..3e498f6a28 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..656e3067dc 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,9 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 +QT5_VERSION = $(QT5_VERSION_MAJOR).8 QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..a4ffd6b9a2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 13d3f871973033b24cd0b4a563812277153835897c61152aaebb6e468b3f8233 qtbase-7ec73b4e75eb4359f49e5dd2be291d459a685ace.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..a3206f67bb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 7ec73b4e75eb4359f49e5dd2be291d459a685ace +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..fd616b74a6 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 9237818f2202d9473b035750b2aa598b9c31ea19abf8ae898957d33da03d0553 qtquickcontrols2-0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4be6cd9117 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = 0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..1e4dc54c67 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..849a2b7f1b 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 728012f7762ecd5762d493f8796907c6456f31e7 +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..cebd6d0fe2 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,8 +4,9 @@ # ################################################################################ -QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) +QT5WEBENGINE_VERSION_MAJOR = 5.15 +QT5WEBENGINE_VERSION = $(QT5WEBENGINE_VERSION_MAJOR).2 +QT5WEBENGINE_SITE = https://download.qt.io/archive/qt/$(QT5WEBENGINE_VERSION_MAJOR)/$(QT5WEBENGINE_VERSION)/submodules QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ @@ -44,7 +45,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 13 00:19:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 12 Jan 2022 17:19:46 -0700 Subject: [Buildroot] [PATCH v3 1/3] package/qt5/qt5webengine-chromium-catapult: new package In-Reply-To: <20220112135637.12c5edc4@windsurf> References: <20220107045531.3985241-1-james.hilliard1@gmail.com> <20220112135637.12c5edc4@windsurf> Message-ID: On Wed, Jan 12, 2022 at 5:56 AM Thomas Petazzoni wrote: > > Hello James, > > On Thu, 6 Jan 2022 21:55:29 -0700 > James Hilliard wrote: > > > This version of catapult is python3 compatible and will be used to > > replace the python2 only version in qt5webengine-chromium. > > > > Signed-off-by: James Hilliard > > --- > > Changes v2 -> v3: > > - add kconfig entry > > --- > > package/qt5/Config.in | 1 + > > .../qt5/qt5webengine-chromium-catapult/Config.in | 4 ++++ > > .../qt5webengine-chromium-catapult.hash | 3 +++ > > .../qt5webengine-chromium-catapult.mk | 14 ++++++++++++++ > > 4 files changed, 22 insertions(+) > > create mode 100644 package/qt5/qt5webengine-chromium-catapult/Config.in > > create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash > > create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk > > I have tested this patch series (I'm replying to the v3 because that's > the one I tested) with the following defconfig: > > BR2_arm=y > BR2_arm1176jzf_s=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_QT5WEBENGINE=y > BR2_PACKAGE_RPI_USERLAND=y > > and it failed to build like this: Yeah, there's quite a few issues with the qt5webengine update build in general, I've split out the kde qt5 deps update so that it can be reviewed/tested/merged before the qt5webengine update as the other updates require much more minimal changes and should make it easier to test the qt5webengine update issues separately once the kde are verified to not create regressions: https://patchwork.ozlabs.org/project/buildroot/patch/20220113000935.2353800-1-james.hilliard1 at gmail.com/ I also think I fixed a potentially related issue with qmake sysrootify path generation by disabling it and setting sysroot paths manually, this seems to work better and appears to fix per-package directory builds on a number of the qt5 modules(although some seem to still have issues), this should hopefully make it easier to fix the qt5webengine issues as well: https://patchwork.ozlabs.org/project/buildroot/patch/20220112203939.606775-1-james.hilliard1 at gmail.com/ Both of these should apply on top of master and should not depend on each other. > > FAILED: host/obj/crypto/crypto/nss_key_util.o > /usr/bin/g++ -MMD -MF host/obj/crypto/crypto/nss_key_util.o.d -DCRYPTO_IMPLEMENTATION -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Ihost/gen -I../../3rdparty/chromium -I../../3rdparty/chromium/third_party/perfetto/include -Ihost/gen/third_party/perfetto/build_config -Ihost/gen/third_party/perfetto -I../../3rdparty/chromium/third_party/boringssl/src/include -I../../3rdparty/chromium/third_party/abseil-cpp -I../../3rdparty/chromium/third_party/protobuf/src -Ihost/gen/protoc_out -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointe > r-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -I/usr/include/nss -I/usr/include/nspr -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -I/home/thomas/buildroot/buildroot/output/host/include -c ../../3rdparty/chromium/crypto/nss_key_util.cc -o host/obj/crypto/crypto/nss_key_util.o > In file included from ../../3rdparty/chromium/crypto/nss_key_util.cc:5: > ../../3rdparty/chromium/crypto/nss_key_util.h:8:10: fatal error: secoidt.h: No such file or directory > 8 | #include > | ^~~~~~~~~~~ > compilation terminated. > [19912/23484] CXX host/obj/crypto/crypto/sha2.o > [19913/23484] CXX host/obj/crypto/crypto/secure_hash.o > [19914/23484] CXX host/obj/base/base/base_jumbo_7.o > [19915/23484] CXX host/obj/crypto/crypto/signature_creator.o > [19916/23484] CXX host/obj/base/base/base_jumbo_11.o > [19917/23484] CXX host/obj/crypto/crypto/symmetric_key.o > [19918/23484] CXX host/obj/crypto/crypto/signature_verifier.o > [19919/23484] CXX host/obj/base/base/base_jumbo_4.o > In file included from host/gen/base/base_jumbo_4.cc:6: > ./../../3rdparty/chromium/base/debug/alias.cc:11: warning: ignoring #pragma clang max_tokens_here [-Wunknown-pragmas] > 11 | #pragma clang max_tokens_here 250 > | > ninja: build stopped: subcommand failed. > make[5]: *** [Makefile.gn_run:356: run_ninja] Error 1 > make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 2 > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 > make[1]: *** [package/pkg-generic.mk:295: /home/thomas/buildroot/buildroot/output/build/qt5webengine-5.15.8/.stamp_built] Error 2 > make: *** [Makefile:84: _all] Error 2 > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From jose.pekkarinen at unikie.com Thu Jan 13 05:12:37 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Thu, 13 Jan 2022 07:12:37 +0200 Subject: [Buildroot] [PATCH 2/7] package/minijail: new package In-Reply-To: <20220112170043.03abd8c1@windsurf> References: <20211210141209.1812043-1-jose.pekkarinen@unikie.com> <20211210141209.1812043-2-jose.pekkarinen@unikie.com> <20220105214129.2f5fffae@windsurf> <20220112155103.7e6c11c0@windsurf> <20220112170043.03abd8c1@windsurf> Message-ID: On Wed, Jan 12, 2022 at 6:00 PM Thomas Petazzoni wrote: > > On Wed, 12 Jan 2022 17:08:26 +0200 > Jos? Pekkarinen wrote: > > > > prlimit() exists in musl. Was included, as suggested > > > by the prlimit() man page ? > > > > It is: > > > > $ cat libminijail.c > > [...] > > #include > > [...] > > Ah, it's uClibc that is missing prlimit(). Can you confirm that > minijail builds fine with glibc and musl, but breaks on uClibc due to > prlimit() being missing? > > I'm not sure it's possible to replace prlimit() by setrlimit(). Indeed, > prlimit() has a PID as the first argument, which allows to ste resource > limits on other processes, while setrlimit() only takes care of the > current process. > > I'm afraid it seems we will have to disallow the use of minijail with > uClibc toolchains. Hi, Yes, it is only uclibc, this is the out of test-pkg: $ utils/test-pkg -c minijail.cfg -p minijail bootlin-armv5-uclibc [1/6]: FAILED bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 1 build failed, 0 legal-info failed Thanks! Jos?. From gilles.talis at gmail.com Thu Jan 13 06:51:36 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 07:51:36 +0100 Subject: [Buildroot] [PATCH 1/5] package/serd: new package In-Reply-To: <20220107222613.4124764-1-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> Message-ID: Hi James, all, Le ven. 7 janv. 2022 ? 23:26, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/serd/Config.in | 8 ++++++++ > package/serd/serd.hash | 4 ++++ > package/serd/serd.mk | 20 ++++++++++++++++++++ > 5 files changed, 34 insertions(+) > create mode 100644 package/serd/Config.in > create mode 100644 package/serd/serd.hash > create mode 100644 package/serd/serd.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 3d5c01f795..d99d7798db 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1299,6 +1299,7 @@ F: package/python-tinycss2/ > F: package/python-weasyprint/ > F: package/python-yarl/ > F: package/python-zopfli/ > +F: package/serd/ > F: package/zchunk/ > > N: James Knight > diff --git a/package/Config.in b/package/Config.in > index e9ee4d2ef1..18ae22f227 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1704,6 +1704,7 @@ menu "JSON/XML" > source "package/rapidjson/Config.in" > source "package/rapidxml/Config.in" > source "package/raptor/Config.in" > + source "package/serd/Config.in" > source "package/tinyxml/Config.in" > source "package/tinyxml2/Config.in" > source "package/valijson/Config.in" > diff --git a/package/serd/Config.in b/package/serd/Config.in > new file mode 100644 > index 0000000000..7633a979e2 > --- /dev/null > +++ b/package/serd/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_SERD > + bool "serd" > + help > + Serd is a lightweight C library for RDF syntax which > + supports reading and writing Turtle, TriG, NTriples, and > + NQuads. > + > + https://drobilla.net/software/serd.html > diff --git a/package/serd/serd.hash b/package/serd/serd.hash > new file mode 100644 > index 0000000000..d64a2aa271 > --- /dev/null > +++ b/package/serd/serd.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig > +sha256 affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf serd-0.30.10.tar.bz2 > +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING > diff --git a/package/serd/serd.mk b/package/serd/serd.mk > new file mode 100644 > index 0000000000..85b16f6866 > --- /dev/null > +++ b/package/serd/serd.mk > @@ -0,0 +1,20 @@ > +################################################################################ > +# > +# serd > +# > +################################################################################ > + > +SERD_VERSION = 0.30.10 > +SERD_SITE = https://download.drobilla.net > +SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2 > +SERD_LICENSE = ISC > +SERD_LICENSE_FILES = COPYING > +SERD_INSTALL_STAGING = YES > + > +SERD_CONF_OPTS += --largefile --no-coverage > + > +ifeq ($(BR2_STATIC_LIBS),y) > +SERD_CONF_OPTS += --static --no-shared --static-progs > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Ran compilation test on arm64 with external toolchain. Also ran the test-pkg utility. Tested-by: Gilles Talis From gilles.talis at gmail.com Thu Jan 13 06:52:16 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 07:52:16 +0100 Subject: [Buildroot] [PATCH 2/5] package/sord: new package In-Reply-To: <20220107222613.4124764-2-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> <20220107222613.4124764-2-james.hilliard1@gmail.com> Message-ID: Hi James, all Le ven. 7 janv. 2022 ? 23:26, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/sord/Config.in | 8 ++++++++ > package/sord/sord.hash | 4 ++++ > package/sord/sord.mk | 25 +++++++++++++++++++++++++ > 5 files changed, 39 insertions(+) > create mode 100644 package/sord/Config.in > create mode 100644 package/sord/sord.hash > create mode 100644 package/sord/sord.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index d99d7798db..bc54ab590c 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1300,6 +1300,7 @@ F: package/python-weasyprint/ > F: package/python-yarl/ > F: package/python-zopfli/ > F: package/serd/ > +F: package/sord/ > F: package/zchunk/ > > N: James Knight > diff --git a/package/Config.in b/package/Config.in > index 18ae22f227..6133d6ce32 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1705,6 +1705,7 @@ menu "JSON/XML" > source "package/rapidxml/Config.in" > source "package/raptor/Config.in" > source "package/serd/Config.in" > + source "package/sord/Config.in" > source "package/tinyxml/Config.in" > source "package/tinyxml2/Config.in" > source "package/valijson/Config.in" > diff --git a/package/sord/Config.in b/package/sord/Config.in > new file mode 100644 > index 0000000000..91dfb41d0b > --- /dev/null > +++ b/package/sord/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_SORD > + bool "sord" > + select BR2_PACKAGE_SERD > + help > + Sord is a lightweight C library for storing RDF data in > + memory. > + > + https://drobilla.net/software/sord.html > diff --git a/package/sord/sord.hash b/package/sord/sord.hash > new file mode 100644 > index 0000000000..af175f91f0 > --- /dev/null > +++ b/package/sord/sord.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc > +sha256 7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14 sord-0.16.8.tar.bz2 > +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING > diff --git a/package/sord/sord.mk b/package/sord/sord.mk > new file mode 100644 > index 0000000000..f805805e9d > --- /dev/null > +++ b/package/sord/sord.mk > @@ -0,0 +1,25 @@ > +################################################################################ > +# > +# sord > +# > +################################################################################ > + > +SORD_VERSION = 0.16.8 > +SORD_SITE = https://download.drobilla.net > +SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2 > +SORD_LICENSE = ISC > +SORD_LICENSE_FILES = COPYING > +SORD_DEPENDENCIES = host-pkgconf serd > +SORD_INSTALL_STAGING = YES > + > +ifeq ($(BR2_PACKAGE_PCRE),y) > +SORD_DEPENDENCIES += pcre > +endif > + > +SORD_CONF_OPTS += --no-coverage > + > +ifeq ($(BR2_STATIC_LIBS),y) > +SORD_CONF_OPTS += --static --no-shared --static-progs > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Ran compilation test on arm64 with external toolchain. Also ran the test-pkg utility. Tested-by: Gilles Talis From gilles.talis at gmail.com Thu Jan 13 06:57:41 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 07:57:41 +0100 Subject: [Buildroot] [PATCH 3/5] package/lv2: new package In-Reply-To: <20220107222613.4124764-3-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> <20220107222613.4124764-3-james.hilliard1@gmail.com> Message-ID: Hi James, all Le ven. 7 janv. 2022 ? 23:26, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/lv2/Config.in | 8 ++++++++ > package/lv2/lv2.hash | 4 ++++ > package/lv2/lv2.mk | 32 ++++++++++++++++++++++++++++++++ > 5 files changed, 46 insertions(+) > create mode 100644 package/lv2/Config.in > create mode 100644 package/lv2/lv2.hash > create mode 100644 package/lv2/lv2.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index bc54ab590c..6c6e93f089 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1254,6 +1254,7 @@ F: package/exfatprogs/ > F: package/gensio/ > F: package/lua-std-debug/ > F: package/lua-std-normalize/ > +F: package/lv2/ > F: package/pipewire/ > F: package/python-aioconsole/ > F: package/python-aiodns/ > diff --git a/package/Config.in b/package/Config.in > index 6133d6ce32..a439a456a4 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1358,6 +1358,7 @@ menu "Audio/Sound" > source "package/libsoundtouch/Config.in" > source "package/libsoxr/Config.in" > source "package/libvorbis/Config.in" > + source "package/lv2/Config.in" > source "package/mp4v2/Config.in" > source "package/openal/Config.in" > source "package/opencore-amr/Config.in" > diff --git a/package/lv2/Config.in b/package/lv2/Config.in > new file mode 100644 > index 0000000000..aeeb6d0451 > --- /dev/null > +++ b/package/lv2/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_LV2 > + bool "lv2" > + help > + LV2 is a plugin standard for audio systems. It defines > + a minimal yet extensible C API for plugin code and a > + format for plugin "bundles". > + > + https://lv2plug.in/ > diff --git a/package/lv2/lv2.hash b/package/lv2/lv2.hash > new file mode 100644 > index 0000000000..ed21620bee > --- /dev/null > +++ b/package/lv2/lv2.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# https://lv2plug.in/spec/lv2-1.18.2.tar.bz2.asc > +sha256 4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e lv2-1.18.2.tar.bz2 > +sha256 0b0b07d852e3ce7fa04986e141f73001bd7f260683968f0a19e02dbcc4131aa6 COPYING > diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk > new file mode 100644 > index 0000000000..589b518545 > --- /dev/null > +++ b/package/lv2/lv2.mk > @@ -0,0 +1,32 @@ > +################################################################################ > +# > +# lv2 > +# > +################################################################################ > + > +LV2_VERSION = 1.18.2 > +LV2_SITE = https://lv2plug.in/spec > +LV2_SOURCE = lv2-$(LV2_VERSION).tar.bz2 > +LV2_LICENSE = ISC > +LV2_LICENSE_FILES = COPYING > +LV2_DEPENDENCIES = host-pkgconf > +LV2_INSTALL_STAGING = YES > + > +LV2_CONF_OPTS += \ > + --no-coverage \ > + --no-check-links \ > + --copy-headers > + > +ifeq ($(BR2_PACKAGE_CAIRO),y) > +LV2_DEPENDENCIES += cairo > +endif > + > +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) > +LV2_DEPENDENCIES += libsndfile > +endif > + > +ifeq ($(BR2_PACKAGE_LIBGTK2),y) > +LV2_DEPENDENCIES += libgtk2 > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot I'm OK with your patch. Looks good to me. test-pkg utility reported two failures though: bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: FAILED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: FAILED sourcery-arm [6/6]: OK I will let you and the maintainers decide if the patch can be committed. From gilles.talis at gmail.com Thu Jan 13 07:00:07 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 08:00:07 +0100 Subject: [Buildroot] [PATCH 4/5] package/sratom: new package In-Reply-To: <20220107222613.4124764-4-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> <20220107222613.4124764-4-james.hilliard1@gmail.com> Message-ID: Hi James, all, Le ven. 7 janv. 2022 ? 23:27, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/sratom/Config.in | 10 ++++++++++ > package/sratom/sratom.hash | 4 ++++ > package/sratom/sratom.mk | 21 +++++++++++++++++++++ > 5 files changed, 37 insertions(+) > create mode 100644 package/sratom/Config.in > create mode 100644 package/sratom/sratom.hash > create mode 100644 package/sratom/sratom.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 6c6e93f089..f8aa809294 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1302,6 +1302,7 @@ F: package/python-yarl/ > F: package/python-zopfli/ > F: package/serd/ > F: package/sord/ > +F: package/sratom/ > F: package/zchunk/ > > N: James Knight > diff --git a/package/Config.in b/package/Config.in > index a439a456a4..51a4180569 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1369,6 +1369,7 @@ menu "Audio/Sound" > source "package/spandsp/Config.in" > source "package/speex/Config.in" > source "package/speexdsp/Config.in" > + source "package/sratom/Config.in" > source "package/taglib/Config.in" > source "package/tinyalsa/Config.in" > source "package/tremor/Config.in" > diff --git a/package/sratom/Config.in b/package/sratom/Config.in > new file mode 100644 > index 0000000000..771e82073d > --- /dev/null > +++ b/package/sratom/Config.in > @@ -0,0 +1,10 @@ > +config BR2_PACKAGE_SRATOM > + bool "sratom" > + select BR2_PACKAGE_LV2 > + select BR2_PACKAGE_SERD > + select BR2_PACKAGE_SORD > + help > + Sratom is a library for serialising LV2 atoms to and from > + RDF, particularly the Turtle syntax. > + > + https://drobilla.net/software/sratom.html > diff --git a/package/sratom/sratom.hash b/package/sratom/sratom.hash > new file mode 100644 > index 0000000000..64d460b2ea > --- /dev/null > +++ b/package/sratom/sratom.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# https://download.drobilla.net/sratom-0.6.8.tar.bz2.asc > +sha256 3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df sratom-0.6.8.tar.bz2 > +sha256 3fc429d6b944fa20306357196a28bb4dd7c25e2d67edebec771f44de5bd7f9e8 COPYING > diff --git a/package/sratom/sratom.mk b/package/sratom/sratom.mk > new file mode 100644 > index 0000000000..e1e0f4e033 > --- /dev/null > +++ b/package/sratom/sratom.mk > @@ -0,0 +1,21 @@ > +################################################################################ > +# > +# sratom > +# > +################################################################################ > + > +SRATOM_VERSION = 0.6.8 > +SRATOM_SITE = https://download.drobilla.net > +SRATOM_SOURCE = sratom-$(SRATOM_VERSION).tar.bz2 > +SRATOM_LICENSE = ISC > +SRATOM_LICENSE_FILES = COPYING > +SRATOM_DEPENDENCIES = host-pkgconf lv2 serd sord > +SRATOM_INSTALL_STAGING = YES > + > +SRATOM_CONF_OPTS += --no-coverage > + > +ifeq ($(BR2_STATIC_LIBS),y) > +SRATOM_CONF_OPTS += --static --no-shared > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Ran compilation test on arm64 with external toolchain. Also ran the test-pkg utility which did not go through for two configurations due to dependency failure. But: Tested-by: Gilles Talis anyway. From gilles.talis at gmail.com Thu Jan 13 07:00:34 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 13 Jan 2022 08:00:34 +0100 Subject: [Buildroot] [PATCH 5/5] package/lilv: new package In-Reply-To: <20220107222613.4124764-5-james.hilliard1@gmail.com> References: <20220107222613.4124764-1-james.hilliard1@gmail.com> <20220107222613.4124764-5-james.hilliard1@gmail.com> Message-ID: Hi James, all Le ven. 7 janv. 2022 ? 23:27, James Hilliard a ?crit : > > Signed-off-by: James Hilliard > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/lilv/Config.in | 11 +++++++++++ > package/lilv/lilv.hash | 4 ++++ > package/lilv/lilv.mk | 34 ++++++++++++++++++++++++++++++++++ > 5 files changed, 51 insertions(+) > create mode 100644 package/lilv/Config.in > create mode 100644 package/lilv/lilv.hash > create mode 100644 package/lilv/lilv.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index f8aa809294..c214abe209 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1254,6 +1254,7 @@ F: package/exfatprogs/ > F: package/gensio/ > F: package/lua-std-debug/ > F: package/lua-std-normalize/ > +F: package/lilv/ > F: package/lv2/ > F: package/pipewire/ > F: package/python-aioconsole/ > diff --git a/package/Config.in b/package/Config.in > index 51a4180569..1cf2bb5219 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1358,6 +1358,7 @@ menu "Audio/Sound" > source "package/libsoundtouch/Config.in" > source "package/libsoxr/Config.in" > source "package/libvorbis/Config.in" > + source "package/lilv/Config.in" > source "package/lv2/Config.in" > source "package/mp4v2/Config.in" > source "package/openal/Config.in" > diff --git a/package/lilv/Config.in b/package/lilv/Config.in > new file mode 100644 > index 0000000000..086125cdc9 > --- /dev/null > +++ b/package/lilv/Config.in > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_LILV > + bool "lilv" > + select BR2_PACKAGE_LV2 > + select BR2_PACKAGE_SERD > + select BR2_PACKAGE_SORD > + select BR2_PACKAGE_SRATOM > + help > + Lilv is a C library to make the use of LV2 plugins as simple > + as possible for applications. > + > + https://drobilla.net/software/lilv.html > diff --git a/package/lilv/lilv.hash b/package/lilv/lilv.hash > new file mode 100644 > index 0000000000..afa20fc083 > --- /dev/null > +++ b/package/lilv/lilv.hash > @@ -0,0 +1,4 @@ > +# Locally calculated after checking signature > +# https://download.drobilla.net/lilv-0.24.12.tar.bz2.asc > +sha256 26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061 lilv-0.24.12.tar.bz2 > +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING > diff --git a/package/lilv/lilv.mk b/package/lilv/lilv.mk > new file mode 100644 > index 0000000000..651597953d > --- /dev/null > +++ b/package/lilv/lilv.mk > @@ -0,0 +1,34 @@ > +################################################################################ > +# > +# lilv > +# > +################################################################################ > + > +LILV_VERSION = 0.24.12 > +LILV_SITE = https://download.drobilla.net > +LILV_SOURCE = lilv-$(LILV_VERSION).tar.bz2 > +LILV_LICENSE = ISC > +LILV_LICENSE_FILES = COPYING > +LILV_DEPENDENCIES = host-pkgconf lv2 serd sord sratom > +LILV_INSTALL_STAGING = YES > + > +LILV_CONF_OPTS += \ > + --dyn-manifest \ > + --no-bash-completion \ > + --no-coverage > + > +ifeq ($(BR2_PACKAGE_PYTHON3),y) > +LILV_DEPENDENCIES += python3 > +else > +LILV_CONF_OPTS += --no-bindings > +endif > + > +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) > +LILV_DEPENDENCIES += libsndfile > +endif > + > +ifeq ($(BR2_STATIC_LIBS),y) > +LILV_CONF_OPTS += --static --no-shared --static-progs > +endif > + > +$(eval $(waf-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Ran compilation test on arm64 with external toolchain. Also ran the test-pkg utility which did not go through for two configurations due to dependency failure. But: Tested-by: Gilles Talis anyway. From thomas.petazzoni at bootlin.com Thu Jan 13 07:06:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 07:06:44 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-12 Message-ID: <20220113071133.371F0415E6@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-12 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 62 | 7 | 0 | 69 | 2021.11.x | 29 | 8 | 0 | 37 | master | 111 | 50 | 0 | 161 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 6 host-riscv-isa-sim-1.1.0 | 4 ksmbd-tools-3.4.3 | 4 polkit-0.120 | 4 guile-3.0.7 | 3 vtun-3.0.4 | 3 bird-2.0.8 | 2 bluez5_utils-5.63 | 2 btrfs-progs-5.15.1 | 2 drbd-utils-9.19.0 | 2 gcr-3.40.0 | 2 samba4-4.15.3 | 2 bat-0.18.3 | 1 boinc-7.18.1 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 host-btrfs-progs-5.15.1 | 1 host-gobject-introspection-... | 1 libqb-2.0.3 | 1 libupnp-1.14.12 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.3 | 1 pcsc-lite-1.9.5 | 1 qt5webkit-5.212.0-alpha4 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/c2dd780f4b0b7ff7fde3289cec4ffc2ed254f72b | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/d4cdcb7da3c038a55d306c2ac5621e40beaf4ae4 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/072068f83a62630eb9ba79312b1960b5c459d32e | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/c918b7e9ede9545749f958d33b2f79bde6b7c30e | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/ca37e3f96909f2f3da5d2a54fd3d5783c06cc9c0 | riscv32 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/62160c222a5cc38d728b9d1cc177dd39ef602032 | mips64el | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/30a96db548b53d14c38b8d368bb252ed74e30d4d | ORPH powerpc | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/13d570c7318f2ad7b05c2fb196f04ecb86f1bcc9 | ORPH microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/c2abf60c045c69c7ecbc71df19348de6b3e10139 | arm | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/307780e79cc4c95a19562cebe91b2204bf9bc970 | powerpc64 | drbd-utils-9.19.0 | NOK | http://autobuild.buildroot.net/results/1968724aa0b3d9560c877329f7a12fead1fdf0e4 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1e467d0960206b56a33c0a108e0e76387db09604 | arm | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b | ORPH riscv64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de | ORPH mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/2de13e5fcb9e08ee53f9a2a9907f5c9ea03dad23 | riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/59715e297ef705b72ca20684f466ab03a86c707e | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/7ec31a52659ea37af7f3d118787914fd4e7a6b25 | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/ef724481d44f43539055260af795dd88a6f86f28 | ORPH arm | host-btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/e1efb2b9038858df20ecfb0a91eb5519683b44c3 | ORPH powerpc64le | host-gobject-introspection-... | NOK | http://autobuild.buildroot.net/results/95e4a23c16f6bd96566dc497663f38a0858c5a6e | ORPH mipsel | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/e9658a6cf9feba9473ec3ed1225974bb83feea42 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6339da1618a1b0fec3888c7a5e21a2a07adb6e4b | mips64el | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/d35ff4a0ca0a8463121d717a9727e0d863ca83e8 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6c67db526d31c7e4c31515068d7fa0fc9cc6e72c | arc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/73f3b0d74835ac6e20898f7c4cb69e1f6f4a2e9a | aarch64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/6932c83e2459176d37397b9aadd7679f56497c19 | arc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/3a38fbfaa719860d230d6687f25941202bf3317b | arm | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/3da7ce45b3db98dd81ba41ffd097820b13640f8a | or1k | libqb-2.0.3 | NOK | http://autobuild.buildroot.net/results/bdd35eded20f61261a98cc50681dac3ccdd3cf53 | or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/6448543da06072830417181a49c6cf52f131ffbc | mipsel | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/820b1be882335481584f5d57b3490eda978e3107 | mipsel | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/e97ad48f20a325f5757754a8be2bdb613c86e4ea | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/757cbbbfeddd460bce6f86c1f2f27eea0fcd53a0 | ORPH s390x | polkit-0.120 | NOK | http://autobuild.buildroot.net/results/70243c99f84c4a663ca3d8823572abd97bc53b79 | aarch64 | polkit-0.120 | NOK | http://autobuild.buildroot.net/results/e03385e21f905785a07c105e78eb8a91a81a9819 | mips64el | polkit-0.120 | NOK | http://autobuild.buildroot.net/results/b2d2b27844b32b3609e11005966d85dc0dfb7a9f | powerpc | polkit-0.120 | NOK | http://autobuild.buildroot.net/results/0de79cd0ba25fdd466f5a27d9de3645d99d3632d | mipsel | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/743c25004421363ec79cef28640c3ee636a6bad6 | powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/dcd737a4cb315e4bf1525b9b52fa3727befcdc4f | riscv32 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/db011d6a124817bb603d33a6b4571046abf84bdb | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/20a99570e9df86173074c6f8f6b1fe244540d755 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/31ec8edadd25f2cfec66b7ef02423fff6a3b699b | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/eadf56f38dfd0e6c8242c957d0eedcc5a4ec2433 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e6038719a8a4276ef7e9d3a68699911b37de28d8 | arm | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/5417abef2b9aa14a01400f48fb308519c618a94a | powerpc64 | samba4-4.15.3 | NOK | http://autobuild.buildroot.net/results/c1e2ebbaec6e6871d6e2ea2222d6fb9c79187c4b | arc | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/1f710e331e32c808796fc524f844d636d7de1746 | ORPH riscv64 | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/3ee8f9ee55e51af38e9dbe7b9840c9589d88a30f | ORPH arm | vtun-3.0.4 | NOK | http://autobuild.buildroot.net/results/bd8dda42fb51c821d54742488d088e9bf144604e | ORPH s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/8518113229f7e0c0af978246d57638c19fb53474 | Classification of failures by reason for 2021.02.x -------------------------------------------------- bluez5_utils-5.62 | 1 cegui-0-8-7 | 1 erlang-jiffy-1.0.6 | 1 glib-networking-2.66.0 | 1 host-sentry-cli-1.57.0 | 1 mesa3d-20.3.5 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | bluez5_utils-5.62 | NOK | http://autobuild.buildroot.net/results/68ed580fdb328e3d83a53fa131bfc77362afa5dd | powerpc | cegui-0-8-7 | NOK | http://autobuild.buildroot.net/results/c25526ee0b8fef36a36d0b385617519e27803208 | x86_64 | erlang-jiffy-1.0.6 | NOK | http://autobuild.buildroot.net/results/c4315cf66a4f247804e44b2bb95a972b85825495 | riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/60c996364269a0f6a14d6c34a8b9ae521c657203 | ORPH riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/afc061bd98a0798ac8d3365fc8d26acc95787d9c | xtensa | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/581273576b75f2c89b825b1fa78b2e6565c53806 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/a6d57724d0b5e4f8ddc1b4a7549d6fda59d91091 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 3 bird-2.0.8 | 1 host-go-1.17.3 | 1 libnss-3.73 | 1 mono-6.12.0.90 | 1 qt5webkit-5.9.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/a4e9fc5f8cbc0eddb16f3d32507b95ea764ba9cb | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/de56a02b34e8ba5598b3a3139c0a1568c1726b5b | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/7ce1e639b4eb17b0d8fe1eb00887fc49e4f77836 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/4ca3501d84a9840d155f0ef6d7403d1595e0faf3 | mips64el | host-go-1.17.3 | NOK | http://autobuild.buildroot.net/results/8f815942d6c927e69d9dcf23b00d54b1706336f9 | x86_64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/787e66fd3f2c6ff68ab7d3b6fcc23894e6362405 | arm | mono-6.12.0.90 | NOK | http://autobuild.buildroot.net/results/7785ed0d745a74fb290fdd34715c9f93baf91532 | mipsel | qt5webkit-5.9.1 | NOK | http://autobuild.buildroot.net/results/58258163b8488ed83af381fbb21d18357474247e | Gitlab CI results for 2022-01-12 ================================ -- http://autobuild.buildroot.net From x1gxi9rirbxbkr4c1t48310 at uclibc.org Thu Jan 13 05:15:32 2022 From: x1gxi9rirbxbkr4c1t48310 at uclibc.org (reports) Date: Thu, 13 Jan 2022 06:15:32 +0100 Subject: [Buildroot] delivery failure Message-ID: Email Protection Report You have 3 message(s) received to buildroot at uclibc.org in your quarantine during the last 24 hours. ? 01/13/2022 06:15:32 am sistema at suministrosmega.com ?? Your Have a File On ... 01/13/2022 06:15:32 am giupuml at heroncabinets.com uclibc.org sample order for ... 01/13/2022 06:15:32 am jedomb at detonfan.com Re: wire details for s... View Quarantine ? How do I Blacklist emails as Spam? Click on 'View My Quarantine' above and enter your Email and Email Password. 'Select' the email you want to mark as Spam. Click 'Blacklist' from the top left corner to stop receiving emails from this person. ? How do I Whitelist emails being set as Spam? Click on 'View My Quarantine' above and enter your Email and Email Password. 'Select' the Spam email you want to start receiving. Click 'Whitelist' from the top left corner to start receiving emails from this person. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Thu Jan 13 07:58:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 08:58:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs __sync_*_4 intrinsics Message-ID: <20220113075847.3267080-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/EGL/libEGL.so.1.1.0.p/libegl.c.o: in function `AtomicIncrement': libegl.c:(.text+0x614): undefined reference to `__sync_add_and_fetch_4' Fixes: - http://autobuild.buildroot.org/results/a204953020a714057ec6690e63a3ad8ac621acd5 Signed-off-by: Fabrice Fontaine --- package/libglvnd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index 2d99be8632..cd19fde582 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on !BR2_STATIC_LIBS # dlfcn.h help The GL Vendor-Neutral Dispatch library @@ -45,4 +46,5 @@ config BR2_PACKAGE_PROVIDES_LIBGLES endif comment "libglvnd needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS -- 2.34.1 From aperez at igalia.com Thu Jan 13 08:53:18 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 10:53:18 +0200 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-12 In-Reply-To: <20220113071133.371F0415E6@smtp4.osuosl.org> References: <20220113071133.371F0415E6@smtp4.osuosl.org> Message-ID: <20220113105318.GC97860@momiji> On Thu, 13 Jan 2022 07:06:44 +0000 Thomas Petazzoni wrote: > Detail of failures for master > ----------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > > [...] > > arm | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b | ORPH > riscv64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de | ORPH I ran into the same issue while trying out the switch to Ninja for CMake packages, because trying to build "midori" pulls in "gcr" as a dependency. These build failures in "gcr" have been caused by the update to Meson 0.61; there is an upstream fix here: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81.patch Applying this patch locally made the configure step complete, but then the build step ran into this other issue: [1/114] Generating gck/gck-1.vapi with a custom command FAILED: gck/gck-1.vapi [...] Unknown option --metadatdir=/home/aperez/buildroot/output-cmake/build/gcr-3.40.0/gck Run '/home/aperez/buildroot/output-cmake/per-package/gcr/host/bin/vapigen-0.52 --help' to see a full list of available command line options. ninja: build stopped: subcommand failed. I am trying to fix this other issue before submitting a patch for the "gcr" package. If this second failure rings a bell to anyone, I am all ears^W eyes. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From aperez at igalia.com Thu Jan 13 09:12:30 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 11:12:30 +0200 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-12 In-Reply-To: <20220113105318.GC97860@momiji> References: <20220113071133.371F0415E6@smtp4.osuosl.org> <20220113105318.GC97860@momiji> Message-ID: <20220113111230.GB172867@momiji> On Thu, 13 Jan 2022 10:53:18 +0200 Adrian Perez de Castro wrote: > On Thu, 13 Jan 2022 07:06:44 +0000 Thomas Petazzoni wrote: > > > Detail of failures for master > > ----------------------------- > > > > arch | reason | OK? | url | orph? > > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > > > > [...] > > > > arm | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b | ORPH > > riscv64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de | ORPH > > I ran into the same issue while trying out the switch to Ninja for CMake > packages, because trying to build "midori" pulls in "gcr" as a dependency. > > These build failures in "gcr" have been caused by the update to Meson 0.61; > there is an upstream fix here: > > https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81.patch > > Applying this patch locally made the configure step complete, but then the > build step ran into this other issue: > > [1/114] Generating gck/gck-1.vapi with a custom command > FAILED: gck/gck-1.vapi > [...] > Unknown option --metadatdir=/home/aperez/buildroot/output-cmake/build/gcr-3.40.0/gck > Run '/home/aperez/buildroot/output-cmake/per-package/gcr/host/bin/vapigen-0.52 --help' to see a full list of available command line options. > ninja: build stopped: subcommand failed. > > I am trying to fix this other issue before submitting a patch for the "gcr" > package. If this second failure rings a bell to anyone, I am all ears^W eyes. Found it, this second one is a typo in the Meson source code, the following upstream patch fixes the issue alright: https://github.com/mesonbuild/meson/pull/9806 I'll submit patches for both issues momentarily. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From aperez at igalia.com Thu Jan 13 09:46:30 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 11:46:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/gcr: add upstream patch to fix build with meson 0.61 Message-ID: <20220113094630.2322090-1-aperez@igalia.com> Import an upstream patch which removes usage of an invalid keyword that was being passed to Meson's gnome.generate_gir() function. This fixes the following autobuilder issues: http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de Signed-off-by: Adrian Perez de Castro --- ...wn-kw-argument-in-gnome.generate_gir.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch new file mode 100644 index 0000000000..e672b5e2ac --- /dev/null +++ b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch @@ -0,0 +1,62 @@ +From 145bea264bed98cd435d8babfdee702c06c0afaa Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka +Date: Wed, 12 Jan 2022 00:24:20 +0100 +Subject: [PATCH 1/1] meson: Fix unknown kw argument in gnome.generate_gir + +This argument has been removed in Meson 0.61.0: + + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" + +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: + +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. + +Fixes #89 + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 +--- + gck/meson.build | 1 - + gcr/meson.build | 1 - + ui/meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a21a1e9 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -131,7 +131,6 @@ if get_option('introspection') + sources: gck_gir_sources, + namespace: 'Gck', + nsversion: '@0@'.format(gck_major_version), +- packages: gck_deps, + export_packages: 'gck- at 0@'.format(gck_major_version), + includes: [ 'GObject-2.0', 'Gio-2.0' ], + header: 'gck/gck.h', +diff --git a/gcr/meson.build b/gcr/meson.build +index 06c3a63..f998336 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -189,7 +189,6 @@ if get_option('introspection') + sources: [ gcr_base_public_sources, gcr_base_headers ], + namespace: 'Gcr', + nsversion: '@0@'.format(gcr_major_version), +- packages: gcr_base_deps, + export_packages: 'gcr-base- at 0@'.format(gcr_major_version), + includes: [ + 'GObject-2.0', +diff --git a/ui/meson.build b/ui/meson.build +index e656ea2..32ee057 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -152,7 +152,6 @@ if get_option('introspection') + export_packages: 'gcr-ui- at 0@'.format(gcr_major_version), + identifier_prefix: 'Gcr', + symbol_prefix: 'gcr', +- packages: gcr_ui_deps, + includes: [ + 'GObject-2.0', + 'Gio-2.0', +-- +2.34.1 + -- 2.34.1 From jose.pekkarinen at unikie.com Thu Jan 13 10:05:06 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?q?Jos=C3=A9=20Pekkarinen?=) Date: Thu, 13 Jan 2022 12:05:06 +0200 Subject: [Buildroot] [PATCH] package/minijail: new package Message-ID: <20220113100506.89687-1-jose.pekkarinen@unikie.com> This patch adds package minijail Minijail depends in a toolchain different from uclibc thanks to it's lack of support for prlimits. Signed-off-by: Jos? Pekkarinen --- [ v1 -> v2 ] - Fixed hash file - Fixed static assert patch - Depend in toolchain distinct of uclibc - Remove redundant host libpcap dependency - Remove redundant parenthesis on MINIJAIL_BUILD_CMDS DEVELOPERS | 1 + package/Config.in | 1 + ...te-static_assert-with-_Static_assert.patch | 35 +++++++++++++++++++ package/minijail/Config.in | 12 +++++++ package/minijail/minijail.hash | 5 +++ package/minijail/minijail.mk | 28 +++++++++++++++ 6 files changed, 82 insertions(+) create mode 100644 package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch create mode 100644 package/minijail/Config.in create mode 100644 package/minijail/minijail.hash create mode 100644 package/minijail/minijail.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55f37dfe62..3631021077 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1515,6 +1515,7 @@ F: support/testing/tests/package/test_zfs.py N: Jos? Pekkarinen F: package/alfred/ F: package/bmx7/ +F: package/minijail/ F: package/python-aexpect/ F: package/softhsm2/ F: support/testing/tests/package/sample_python_aexpect.py diff --git a/package/Config.in b/package/Config.in index a1924f96df..3b11b003fb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2556,6 +2556,7 @@ menu "System tools" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" + source "package/minijail/Config.in" source "package/moby-buildkit/Config.in" source "package/monit/Config.in" source "package/multipath-tools/Config.in" diff --git a/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch new file mode 100644 index 0000000000..ff85995114 --- /dev/null +++ b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch @@ -0,0 +1,35 @@ +From 8a6d5a1c48b85fb49f0d68ec31ecc51fd22e7201 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Wed, 12 Jan 2022 17:09:27 +0200 +Subject: [PATCH] Substitute static_assert with _Static_assert +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Substitute static_assert with _Static_assert + +static_assert behaves differently for uclibc +toolchains. Substituting it with the standard +_Static_assert builds on all toolchains tested. + +Signed-off-by: Jos? Pekkarinen +--- + libminijail.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libminijail.c b/libminijail.c +index b935dfd..b154f1c 100644 +--- a/libminijail.c ++++ b/libminijail.c +@@ -2620,7 +2620,7 @@ static int fd_is_open(int fd) + return fcntl(fd, F_GETFD) != -1 || errno != EBADF; + } + +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, ++_Static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, + "If true, ensure_no_fd_conflict will always find an unused fd."); + + /* If parent_fd will be used by a child fd, move it to an unused fd. */ +-- +2.25.1 + diff --git a/package/minijail/Config.in b/package/minijail/Config.in new file mode 100644 index 0000000000..24d307ed54 --- /dev/null +++ b/package/minijail/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_MINIJAIL + bool "minijail" + depends on !BR2_STATIC_LIBS # dlopen() + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_LIBCAP + help + Minijail is a sandboxing tool maintained by google. + + https://google.github.io/minijail/ + +comment "minijail needs a glibc or musl toolchain with dynamic library support" + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/minijail/minijail.hash b/package/minijail/minijail.hash new file mode 100644 index 0000000000..d9f497a86c --- /dev/null +++ b/package/minijail/minijail.hash @@ -0,0 +1,5 @@ +# Locally computed from https://github.com/google/minijail/releases/ +sha256 1ee5a5916491a32c121c7422b4d8c16481c0396a3acab34bf1c44589dcf810ae linux-v17.tar.gz + +# Locally computed +sha256 c6f439c5cf07263f71f01d29b79c79172ee529088e51ab434b22baad0988fe57 LICENSE diff --git a/package/minijail/minijail.mk b/package/minijail/minijail.mk new file mode 100644 index 0000000000..78898865fb --- /dev/null +++ b/package/minijail/minijail.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# minijail +# +################################################################################ + +MINIJAIL_VERSION = linux-v17 +MINIJAIL_SOURCE = $(MINIJAIL_VERSION).tar.gz +MINIJAIL_SITE = "https://github.com/google/minijail/archive/refs/tags" +MINIJAIL_LICENSE = BSD-Style +MINIJAIL_LICENSE_FILES = LICENSE +MINIJAIL_DEPENDENCIES=libcap + +define MINIJAIL_BUILD_CMDS + cd $(@D); \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) CC="$(TARGET_CC)" +endef + +define MINIJAIL_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/minijail0 \ + $(TARGET_DIR)/usr/bin/minijail0 + $(INSTALL) -m 0755 -D $(@D)/libminijailpreload.so \ + $(TARGET_DIR)/lib/libminijailpreload.so + $(INSTALL) -m 0755 -D $(@D)/libminijail.so \ + $(TARGET_DIR)/lib/libminijail.so +endef + +$(eval $(generic-package)) -- 2.25.1 From jose.pekkarinen at unikie.com Thu Jan 13 11:49:51 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?q?Jos=C3=A9=20Pekkarinen?=) Date: Thu, 13 Jan 2022 13:49:51 +0200 Subject: [Buildroot] [PATCH v3] package/opensc: new package Message-ID: <20220113114951.549960-1-jose.pekkarinen@unikie.com> The patch will add package opensc. sourcery-arm toolchain triggers strict aliasing rules that upstream finds no easy way to fix. It is disabled for now until a proper solution is found upstream. Signed-off-by: Jos? Pekkarinen --- [ v1 -> v2 ] Fix hash file, and patches messages. [ v2 -> v3 ] - Remove strict aliasing patch - Add approved patch for maybe uninitialized errors - Disable sourcery-arm toolchain DEVELOPERS | 1 + package/Config.in | 1 + .../0001-Fix-maybe-uninitialized-errors.patch | 83 +++++++++++++++++++ package/opensc/Config.in | 15 ++++ package/opensc/opensc.hash | 5 ++ package/opensc/opensc.mk | 14 ++++ 6 files changed, 119 insertions(+) create mode 100644 package/opensc/0001-Fix-maybe-uninitialized-errors.patch create mode 100644 package/opensc/Config.in create mode 100644 package/opensc/opensc.hash create mode 100644 package/opensc/opensc.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55f37dfe62..45e7192e65 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1515,6 +1515,7 @@ F: support/testing/tests/package/test_zfs.py N: Jos? Pekkarinen F: package/alfred/ F: package/bmx7/ +F: package/opensc/ F: package/python-aexpect/ F: package/softhsm2/ F: support/testing/tests/package/sample_python_aexpect.py diff --git a/package/Config.in b/package/Config.in index a1924f96df..b40909ef89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1643,6 +1643,7 @@ menu "Hardware handling" source "package/mtdev/Config.in" source "package/ne10/Config.in" source "package/neardal/Config.in" + source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" source "package/rpi-rgb-led-matrix/Config.in" diff --git a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch new file mode 100644 index 0000000000..01b7a39818 --- /dev/null +++ b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch @@ -0,0 +1,83 @@ +From bcb39d6f4d2dee6beb035cb2f3618174ec1cb2b0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 13:54:26 +0200 +Subject: [PATCH] Fix maybe uninitialized errors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PR: https://github.com/OpenSC/OpenSC/pull/2466 + +Signed-off-by: Jos? Pekkarinen +--- + src/libopensc/pkcs15-coolkey.c | 12 ++++++------ + src/pkcs15init/pkcs15-asepcos.c | 2 +- + src/tools/opensc-explorer.c | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c +index 586475dd..15684cef 100644 +--- a/src/libopensc/pkcs15-coolkey.c ++++ b/src/libopensc/pkcs15-coolkey.c +@@ -147,9 +147,9 @@ coolkey_find_matching_cert(sc_card_t *card, sc_cardctl_coolkey_object_t *in_obj, + static int + coolkey_get_attribute_ulong(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, CK_ULONG *value) + { +- const u8 *val; +- size_t val_len; +- u8 data_type; ++ const u8 *val = NULL; ++ size_t val_len = 0; ++ u8 data_type = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, &data_type); +@@ -168,8 +168,8 @@ static int + coolkey_get_attribute_boolean(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE attr_type) + { + int r; +- const u8 *val; +- size_t val_len; ++ const u8 *val = NULL; ++ size_t val_len = 0; + + r = coolkey_get_attribute(card, obj, attr_type, &val, &val_len, NULL); + if (r < 0) { +@@ -186,7 +186,7 @@ static int + coolkey_get_attribute_bytes(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, u8 *data, size_t *data_len, size_t max_data_len) + { + const u8 *val; +- size_t val_len; ++ size_t val_len = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, NULL); +diff --git a/src/pkcs15init/pkcs15-asepcos.c b/src/pkcs15init/pkcs15-asepcos.c +index d7122012..bc0efb5c 100644 +--- a/src/pkcs15init/pkcs15-asepcos.c ++++ b/src/pkcs15init/pkcs15-asepcos.c +@@ -221,7 +221,7 @@ static int asepcos_do_store_pin(sc_profile_t *profile, sc_card_t *card, + { + sc_file_t *nfile = NULL; + u8 buf[64], sbuf[64], *p = buf, *q = sbuf; +- int r, akn; ++ int r, akn = 0; + + if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) + return SC_ERROR_OBJECT_NOT_VALID; +diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c +index 9ec4daa1..04efdf8f 100644 +--- a/src/tools/opensc-explorer.c ++++ b/src/tools/opensc-explorer.c +@@ -2472,7 +2472,7 @@ int main(int argc, char *argv[]) + char *line; + int cargc; + char *cargv[260]; +- int multiple; ++ int multiple = 0; + struct command *cmd; + char prompt[3*SC_MAX_PATH_STRING_SIZE]; + +-- +2.25.1 + diff --git a/package/opensc/Config.in b/package/opensc/Config.in new file mode 100644 index 0000000000..5ee52d1de6 --- /dev/null +++ b/package/opensc/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_OPENSC + bool "opensc" + depends on !BR2_STATIC_LIBS # dlopen() + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM + select BR2_PACKAGE_PCSC_LITE + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + help + OpenSC provides a set of libraries and utilities to work + with smart cards. + + https://github.com/OpenSC/OpenSC/wiki + +comment "opensc needs a toolchain with dynamic library support distinct from sourcery-arm" + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash new file mode 100644 index 0000000000..517cfe503a --- /dev/null +++ b/package/opensc/opensc.hash @@ -0,0 +1,5 @@ +# Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ +sha256 8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 opensc-0.22.0.tar.gz + +# Computed locally +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk new file mode 100644 index 0000000000..7221eee944 --- /dev/null +++ b/package/opensc/opensc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# opensc +# +################################################################################ + +OPENSC_VERSION = 0.22.0 +OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) +OPENSC_LICENSE = LGPL-2.1+ +OPENSC_LICENSE_FILES = COPYING +OPENSC_DEPENDENCIES = openssl pcsc-lite +OPENSC_INSTALL_STAGING = YES + +$(eval $(autotools-package)) -- 2.25.1 From aperez at igalia.com Thu Jan 13 11:57:04 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 13:57:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: add upstream patch to fix vapigen support Message-ID: <20220113115704.2354150-1-aperez@igalia.com> Import an upstream patch which fixes a typo in the Meson source code which caused a wrong command line option to be passed to the vapigen program. This fixes the build for all packages which use Meson and provide API bindings generated using said tool. Signed-off-by: Adrian Perez de Castro --- ...x-typo-in-vapigen-option-metadatadir.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch new file mode 100644 index 0000000000..f8cc30ec29 --- /dev/null +++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch @@ -0,0 +1,31 @@ +From 5385e4c0a4dd4f9cf1e15c9c321b22d19cc0011a Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 10 Jan 2022 21:27:30 +0100 +Subject: [PATCH] gnome: fix typo in vapigen option metadatadir + +This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and +can cause a build failure, because --metadatdir is not a valid vapigen +option. + +Signed-off-by: Adrian Perez de Castro +Upstream-Status: https://github.com/mesonbuild/meson/pull/9806 +--- + mesonbuild/modules/gnome.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 1125e56e7..dfc66c2e3 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): + cmd: T.List[T.Union[str, 'ExternalProgram']] + cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] + cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) +- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) ++ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) + cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) + cmd += pkg_cmd + cmd += ['--metadatadir=' + source_dir] +-- +2.34.1 + -- 2.34.1 From aperez at igalia.com Thu Jan 13 12:02:48 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 13 Jan 2022 14:02:48 +0200 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-12 In-Reply-To: <20220113111230.GB172867@momiji> References: <20220113071133.371F0415E6@smtp4.osuosl.org> <20220113105318.GC97860@momiji> <20220113111230.GB172867@momiji> Message-ID: <20220113140248.GB219766@momiji> Hi again, On Thu, 13 Jan 2022 11:12:30 +0200 Adrian Perez de Castro wrote: > On Thu, 13 Jan 2022 10:53:18 +0200 Adrian Perez de Castro wrote: > > On Thu, 13 Jan 2022 07:06:44 +0000 Thomas Petazzoni wrote: > > > > > Detail of failures for master > > > ----------------------------- > > > > > > arch | reason | OK? | url | orph? > > > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > > > > > > [...] > > > > > > arm | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b | ORPH > > > riscv64 | gcr-3.40.0 | NOK | http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de | ORPH > > > > I ran into the same issue while trying out the switch to Ninja for CMake > > packages, because trying to build "midori" pulls in "gcr" as a dependency. > > > > These build failures in "gcr" have been caused by the update to Meson 0.61; > > there is an upstream fix here: > > > > https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81.patch > > Applying this patch locally made the configure step complete, but then the > > build step ran into this other issue: > > > > [1/114] Generating gck/gck-1.vapi with a custom command > > FAILED: gck/gck-1.vapi > > [...] > > Unknown option --metadatdir=/home/aperez/buildroot/output-cmake/build/gcr-3.40.0/gck > > Run '/home/aperez/buildroot/output-cmake/per-package/gcr/host/bin/vapigen-0.52 --help' to see a full list of available command line options. > > ninja: build stopped: subcommand failed. > > > > I am trying to fix this other issue before submitting a patch for the "gcr" > > package. If this second failure rings a bell to anyone, I am all ears^W eyes. > > Found it, this second one is a typo in the Meson source code, the following > upstream patch fixes the issue alright: > > https://github.com/mesonbuild/meson/pull/9806 > > I'll submit patches for both issues momentarily. Fixes sent: - gcr: https://patchwork.ozlabs.org/project/buildroot/patch/20220113094630.2322090-1-aperez at igalia.com/ - meson: https://patchwork.ozlabs.org/project/buildroot/patch/20220113115704.2354150-1-aperez at igalia.com/ Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From charles at steinkuehler.net Thu Jan 13 12:18:48 2022 From: charles at steinkuehler.net (Charles Steinkuehler) Date: Thu, 13 Jan 2022 06:18:48 -0600 Subject: [Buildroot] creating packages for opkg for buildroot based embedded platform software In-Reply-To: References: Message-ID: <2fc839d4-9c06-0197-dc15-58893d78afe9@steinkuehler.net> On 1/11/2022 11:37 AM, Karicheri, Murali wrote: > Hi Baruch, > > > > I fully appreciate the intentions of buildroot to keep it simple. I > had already reviewed the FAQ you had pointed out. What I am looking > for is something outside buildroot. Typically, embedded systems that > I am working with have firmware update mechanism in place. System > doesn't modify the active rootfs but update an alternate set of > partitions and switch to that once update is successful. So, we could > potentially generate two rootfs contents using buildroot. One using > say version 2021.02.02 and another with 2021.02.06 for example. We > are using ARM tool chain for our build and assume we will keep it > same for incremental updates. Understand that we might have to change > the tool chain as well since there could be vulnerability fixes to > tool chain. So, wondering if we could do a diff of both rootfs > contents and create an ipk for the diff and update the alternate > media for this purpose. Also, we will do extensive testing of our > product software. So, this will be QA tested before pushing to field. > > Is there anything work done for this type of use cases? As you have discovered, buildroot is focused on building a complete root filesystem. There are many tools available to manage updates and handle firmware upgrades. Buildroot can build these tools for you (eg: RAUC, SWupdate, etc), but configuration of the embedded system, the update process, and generating the update packages is up to you. There is almost infinite flexibility, which means you can probably do exactly what you want, but that can also make it hard to get something running. I needed a mechanism to do "A B" firmware updates and recently put together a Buildroot + RAUC example for the Raspberry Pi that generates a working basic system that can be updated: https://github.com/cdsteinkuehler/br2rauc This does full rootfs updates and allows for atomic boot loader updates, using the post-image.sh script to build the RAUC bundles needed for performing an update along with the root filesystem image generated by Buildroot. If you want to do partial updates, you can setup RAUC differently, perhaps with an overlay partition to hold your point release updates. -- Charles Steinkuehler charles at steinkuehler.net From thomas.petazzoni at bootlin.com Thu Jan 13 15:49:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 16:49:06 +0100 Subject: [Buildroot] [PATCH RFC 0/2] Use Ninja as build tool for CMake-based packages In-Reply-To: <53b29654-5d59-26e6-4635-a1ecb87babe0@mind.be> References: <20220112132618.2634250-1-aperez@igalia.com> <20220112160512.GC6032@falbala.internal.home.lespocky.de> <20220112184729.GB23006@momiji> <53b29654-5d59-26e6-4635-a1ecb87babe0@mind.be> Message-ID: <20220113164906.5db00b20@windsurf> On Wed, 12 Jan 2022 19:55:03 +0100 Arnout Vandecappelle wrote: > There's one disadvantage to Ninja in Buildroot context: until [1] is fixed, it > doesn't collaborate well with top-level parallel build. This means that if you > run with a toplevel JLEVEL of e.g. 24, you can easil end up with 40-100 compiles > running in parallel. The problem already exists for meson packages, but these > are sufficiently rare that they don't pose a problem in practice. I don't know > if it's going to become a problem if cmake packages are added to the mix. meson-based packages are no longer rare: we now have 116 packages using the meson-package infrastructure, including very high profile packages such as systemd, mesa3d, libglib2, and more. It is still higher than the 328 cmake-based package we have of course, but I wouldn't say that meson is "sufficiently rare" :-) Annoying that this problem hasn't been resolved in upstream ninja :-/ Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From baruch at tkos.co.il Thu Jan 13 16:36:58 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Thu, 13 Jan 2022 18:36:58 +0200 Subject: [Buildroot] [PATCH] package/socat: bump to version 1.7.4.3 Message-ID: <541525e413f6b72c67b8602fc88e916486931d5f.1642091818.git.baruch@tkos.co.il> Update README hash for version number change. Add a patch fixing build with musl. Signed-off-by: Baruch Siach --- ...-correct-the-getprotobynumber_r-test.patch | 43 +++++++++++++++++++ package/socat/socat.hash | 6 +-- package/socat/socat.mk | 2 +- 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch new file mode 100644 index 000000000000..de9540553191 --- /dev/null +++ b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch @@ -0,0 +1,43 @@ +From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 13 Jan 2022 17:56:10 +0200 +Subject: [PATCH] configure.ac: correct the getprotobynumber_r test + +The AC_TRY_COMPILE test succeeds even when libc does not provide the +tested symbol. The compiler produces a warning, but exits successfully. +Use AC_TRY_LINK that will only succeeds if libc provides the symbol. + +This fixes build with musl libc that does not support +getprotobynumber_r(). + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to socat at dest-unreach.org + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d4acc9e7e6f5..973a7f2218c9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) + # getprotobynumber_r() is not standardized + AC_MSG_CHECKING(for getprotobynumber_r() variant) + AC_CACHE_VAL(sc_cv_getprotobynumber_r, +-[AC_TRY_COMPILE([#include ++[AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], + [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024);], + [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL);], + [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], + +-- +2.34.1 + diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 0d9d0ba76c9d..4f7ff5328e28 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 003686f80d820072649660b85f80c58f socat-1.7.4.2.tar.bz2 +md5 5c28dd258ba928326d0716fcb4895cc2 socat-1.7.4.3.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763 socat-1.7.4.2.tar.bz2 +sha256 d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007 socat-1.7.4.3.tar.bz2 # Locally calculated -sha256 062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644 README +sha256 432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index cf2a31b0969c..e20577492d86 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.2 +SOCAT_VERSION = 1.7.4.3 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception -- 2.34.1 From raj.khem at gmail.com Thu Jan 13 17:02:17 2022 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Jan 2022 09:02:17 -0800 Subject: [Buildroot] [PATCH] external-toolchain: Detect linux/version.h via cross compiler In-Reply-To: <20220109000312.6b307c17@windsurf> References: <20201023093641.619746-1-raj.khem@gmail.com> <20220109000312.6b307c17@windsurf> Message-ID: Hi Thomas On Sat, Jan 8, 2022 at 3:03 PM Thomas Petazzoni wrote: > > Hello Khem, > > On Fri, 23 Oct 2020 02:36:41 -0700 > Khem Raj wrote: > > > Using linux/version.h is assumed to be hardcoded inside sysroot but this > > does not consider the case where toolchains might be built with > > --with-native-system-header-dir which means the header directories will > > not be under /usr/include but customized, archlinux, debian > > built cross toolchains use these install settings ( due to multiarch ) > > they have the headers installed like /usr/aarch64-linux-gnu/include and > > not /usr/aarch64-linux-gnu/usr/include > > > > This patch adds logic to use cross compiler to compute the path to > > linux/version.h on the fly, it means we do not really need to assume the > > install structure > > > > Fixes built when using external toolchains provided by archlinux e.g. > > > > Signed-off-by: Khem Raj > > Cc: Thomas Petazzoni > > --- > > support/scripts/check-kernel-headers.sh | 15 ++++++++++++++- > > toolchain/helpers.mk | 2 +- > > .../toolchain-external/pkg-toolchain-external.mk | 3 ++- > > 3 files changed, 17 insertions(+), 3 deletions(-) > > We finally took some time to review and discuss this patch. As you can > probably imagine due to the delay, we are (at least in its current > form) not going to apply it. > > While it would be nice to not hardcode /usr/include/linux/version.h, we > would need: > > - To account for CFLAGS, as they can affect which sysroot is used by > the toolchain in case of multilib toolchains. > > - A solution that also uses the cross-compiler to detect where > is in the case of the internal toolchain backend. > > However, overall, the motivation of using distribution toolchains is > dubious. We still believe that it cannot work, because distribution > toolchains can contain any number of random libraries. The sysroot of > those toolchains (including the random set of libraries that have been > installed) will be copied to Buildroot STAGING_DIR, causing confusion > with the packages that Buildroot will build. > > So overall, we feel that the benefit of the patch is not sufficient > compared to the extra effort to fix the remaining comments that we have > on it. If you're still interested in pursuing this, we would welcome a > new patch that addresses the above two issues. > I think its fine to drop this patch. I was trying to prove that how easy and fast it could be to build buildroot but this is not a real world usecase. > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From yann.morin.1998 at free.fr Thu Jan 13 17:37:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:37:31 +0100 Subject: [Buildroot] [git commit] package/meson: add upstream patch to fix vapigen support Message-ID: <20220113173150.A82798352F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dda369e7e8a4bb77b4449818a16b13c4f530e07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Import an upstream patch which fixes a typo in the Meson source code which caused a wrong command line option to be passed to the vapigen program. This fixes the build for all packages which use Meson and provide API bindings generated using said tool. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...me-fix-typo-in-vapigen-option-metadatadir.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch new file mode 100644 index 0000000000..3788ee0f11 --- /dev/null +++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch @@ -0,0 +1,33 @@ +From 9952446a2a28ea2b009f4b8b2a14ad50f0878bdd Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 10 Jan 2022 21:27:30 +0100 +Subject: [PATCH] gnome: fix typo in vapigen option metadatadir + +This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and +can cause a build failure, because --metadatdir is not a valid vapigen +option. + +[aperez at igalia.com: backport from upstream] +Signed-off-by: Adrian Perez de Castro +[yann.morin.1998 at free.fr: make it an actual backport] +Signed-off-by: Yann E. MORIN +--- + mesonbuild/modules/gnome.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 1125e56e7..dfc66c2e3 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): + cmd: T.List[T.Union[str, 'ExternalProgram']] + cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] + cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) +- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) ++ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) + cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) + cmd += pkg_cmd + cmd += ['--metadatadir=' + source_dir] +-- +2.25.1 + From yann.morin.1998 at free.fr Thu Jan 13 17:41:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:41:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: add upstream patch to fix vapigen support In-Reply-To: <20220113115704.2354150-1-aperez@igalia.com> References: <20220113115704.2354150-1-aperez@igalia.com> Message-ID: <20220113174130.GI1477939@scaer> Adrian, All, On 2022-01-13 13:57 +0200, Adrian Perez de Castro spake thusly: > Import an upstream patch which fixes a typo in the Meson source code > which caused a wrong command line option to be passed to the vapigen > program. This fixes the build for all packages which use Meson and > provide API bindings generated using said tool. > > Signed-off-by: Adrian Perez de Castro > --- > ...x-typo-in-vapigen-option-metadatadir.patch | 31 +++++++++++++++++++ > 1 file changed, 31 insertions(+) > create mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > > diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > new file mode 100644 > index 0000000000..f8cc30ec29 > --- /dev/null > +++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > @@ -0,0 +1,31 @@ > +From 5385e4c0a4dd4f9cf1e15c9c321b22d19cc0011a Mon Sep 17 00:00:00 2001 > +From: Michal Vasilek > +Date: Mon, 10 Jan 2022 21:27:30 +0100 > +Subject: [PATCH] gnome: fix typo in vapigen option metadatadir > + > +This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and > +can cause a build failure, because --metadatdir is not a valid vapigen > +option. > + > +Signed-off-by: Adrian Perez de Castro > +Upstream-Status: https://github.com/mesonbuild/meson/pull/9806 When an upstream PR/MR has been merged, we prefer that an actual backport is made, so that the patch has the proper upstream hash, which helps in the future ases if a version bump includes that commit. So I've made that a proper backport: $ git format-patch -n1 --start-number=3 --no-numbered 9952446a2 Applied to master with this backport, thanks. Regards, Yann E. MORIN. > +--- > + mesonbuild/modules/gnome.py | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py > +index 1125e56e7..dfc66c2e3 100644 > +--- a/mesonbuild/modules/gnome.py > ++++ b/mesonbuild/modules/gnome.py > +@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): > + cmd: T.List[T.Union[str, 'ExternalProgram']] > + cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] > + cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) > +- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) > ++ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) > + cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) > + cmd += pkg_cmd > + cmd += ['--metadatadir=' + source_dir] > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Thu Jan 13 17:47:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 13 Jan 2022 18:47:18 +0100 Subject: [Buildroot] [PATCH 1/2] configs/roseapplypi_defconfig: really change to ext4 rootfs Message-ID: <20220113174721.22549-1-peter@korsgaard.com> Commit b8aebcfd823f83c16 (configs/roseapplypi_defconfig: bump kernel to 5.15.10) adjusted the board to use an ext4 rootfs, but forgot to update the defconfig to enable ext4 rootfs, breaking the build. Correct that. Signed-off-by: Peter Korsgaard --- configs/roseapplepi_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index f4efacf80d..00bdf69d8a 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -21,7 +21,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="owl-s500-roseapplepi" # Filesystem / image -BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloaders -- 2.20.1 From peter at korsgaard.com Thu Jan 13 17:47:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 13 Jan 2022 18:47:19 +0100 Subject: [Buildroot] [PATCH 2/2] configs/roseapplypi_defconfig: bump kernel to 5.15.14 In-Reply-To: <20220113174721.22549-1-peter@korsgaard.com> References: <20220113174721.22549-1-peter@korsgaard.com> Message-ID: <20220113174721.22549-2-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- configs/roseapplepi_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index 00bdf69d8a..0f37d5dc0b 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y -- 2.20.1 From yann.morin.1998 at free.fr Thu Jan 13 17:47:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:47:42 +0100 Subject: [Buildroot] [git commit] package/gcr: add upstream patch to fix build with meson 0.61 Message-ID: <20220113174146.4D77F82127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4eec4c13633500fb4688b2c28d033551dda5ea9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Import an upstream patch which removes usage of an invalid keyword that was being passed to Meson's gnome.generate_gir() function. This fixes the following autobuilder issues: http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...unknown-kw-argument-in-gnome.generate_gir.patch | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch new file mode 100644 index 0000000000..a1d4e1b46f --- /dev/null +++ b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch @@ -0,0 +1,64 @@ +From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka +Date: Wed, 12 Jan 2022 00:24:20 +0100 +Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir + +This argument has been removed in Meson 0.61.0: + + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" + +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: + +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. + +Fixes #89 + +[aperez at igalia.com: backport from upstream] +Signed-off-by: Adrian Perez de Castro +[yann.morin.1998 at free.fr: make it an actual backport] +Signed-off-by: Yann E. MORIN +--- + gck/meson.build | 1 - + gcr/meson.build | 1 - + ui/meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a21a1e9 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -131,7 +131,6 @@ if get_option('introspection') + sources: gck_gir_sources, + namespace: 'Gck', + nsversion: '@0@'.format(gck_major_version), +- packages: gck_deps, + export_packages: 'gck- at 0@'.format(gck_major_version), + includes: [ 'GObject-2.0', 'Gio-2.0' ], + header: 'gck/gck.h', +diff --git a/gcr/meson.build b/gcr/meson.build +index 2233a44..c83641b 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -190,7 +190,6 @@ if get_option('introspection') + sources: [ gcr_base_public_sources, gcr_base_headers ], + namespace: 'Gcr', + nsversion: '@0@'.format(gcr_major_version), +- packages: gcr_base_deps, + export_packages: 'gcr-base- at 0@'.format(gcr_major_version), + includes: [ + 'GObject-2.0', +diff --git a/ui/meson.build b/ui/meson.build +index e656ea2..32ee057 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -152,7 +152,6 @@ if get_option('introspection') + export_packages: 'gcr-ui- at 0@'.format(gcr_major_version), + identifier_prefix: 'Gcr', + symbol_prefix: 'gcr', +- packages: gcr_ui_deps, + includes: [ + 'GObject-2.0', + 'Gio-2.0', +-- +2.25.1 + From yann.morin.1998 at free.fr Thu Jan 13 17:48:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:48:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcr: add upstream patch to fix build with meson 0.61 In-Reply-To: <20220113094630.2322090-1-aperez@igalia.com> References: <20220113094630.2322090-1-aperez@igalia.com> Message-ID: <20220113174820.GJ1477939@scaer> Adrian, All, On 2022-01-13 11:46 +0200, Adrian Perez de Castro spake thusly: > Import an upstream patch which removes usage of an invalid keyword that > was being passed to Meson's gnome.generate_gir() function. > > This fixes the following autobuilder issues: > > http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b > http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de > > Signed-off-by: Adrian Perez de Castro > --- > ...wn-kw-argument-in-gnome.generate_gir.patch | 62 +++++++++++++++++++ > 1 file changed, 62 insertions(+) > create mode 100644 package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch > > diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch > new file mode 100644 > index 0000000000..e672b5e2ac > --- /dev/null > +++ b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch > @@ -0,0 +1,62 @@ > +From 145bea264bed98cd435d8babfdee702c06c0afaa Mon Sep 17 00:00:00 2001 > +From: Jakub Jirutka > +Date: Wed, 12 Jan 2022 00:24:20 +0100 > +Subject: [PATCH 1/1] meson: Fix unknown kw argument in gnome.generate_gir $ make check-package package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch:4: generate your patches with 'git format-patch -N' So I've done that, and done a proper backport. Applied to master, thanks. Regards, Yann E. MORIN. > +This argument has been removed in Meson 0.61.0: > + > + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" > + > +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: > + > +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. > + > +Fixes #89 > + > +Signed-off-by: Adrian Perez de Castro > +Upstream-Status: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 > +--- > + gck/meson.build | 1 - > + gcr/meson.build | 1 - > + ui/meson.build | 1 - > + 3 files changed, 3 deletions(-) > + > +diff --git a/gck/meson.build b/gck/meson.build > +index 756b486..a21a1e9 100644 > +--- a/gck/meson.build > ++++ b/gck/meson.build > +@@ -131,7 +131,6 @@ if get_option('introspection') > + sources: gck_gir_sources, > + namespace: 'Gck', > + nsversion: '@0@'.format(gck_major_version), > +- packages: gck_deps, > + export_packages: 'gck- at 0@'.format(gck_major_version), > + includes: [ 'GObject-2.0', 'Gio-2.0' ], > + header: 'gck/gck.h', > +diff --git a/gcr/meson.build b/gcr/meson.build > +index 06c3a63..f998336 100644 > +--- a/gcr/meson.build > ++++ b/gcr/meson.build > +@@ -189,7 +189,6 @@ if get_option('introspection') > + sources: [ gcr_base_public_sources, gcr_base_headers ], > + namespace: 'Gcr', > + nsversion: '@0@'.format(gcr_major_version), > +- packages: gcr_base_deps, > + export_packages: 'gcr-base- at 0@'.format(gcr_major_version), > + includes: [ > + 'GObject-2.0', > +diff --git a/ui/meson.build b/ui/meson.build > +index e656ea2..32ee057 100644 > +--- a/ui/meson.build > ++++ b/ui/meson.build > +@@ -152,7 +152,6 @@ if get_option('introspection') > + export_packages: 'gcr-ui- at 0@'.format(gcr_major_version), > + identifier_prefix: 'Gcr', > + symbol_prefix: 'gcr', > +- packages: gcr_ui_deps, > + includes: [ > + 'GObject-2.0', > + 'Gio-2.0', > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 13 17:52:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:52:19 +0100 Subject: [Buildroot] [git commit] package/libglvnd: needs __sync_*_4 intrinsics Message-ID: <20220113174620.D79168353E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7996a1a18b7ea8102c7a0ddae57de9624902594f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/EGL/libEGL.so.1.1.0.p/libegl.c.o: in function `AtomicIncrement': libegl.c:(.text+0x614): undefined reference to `__sync_add_and_fetch_4' Fixes: - http://autobuild.buildroot.org/results/a204953020a714057ec6690e63a3ad8ac621acd5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libglvnd/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index 2d99be8632..cd19fde582 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on !BR2_STATIC_LIBS # dlfcn.h help The GL Vendor-Neutral Dispatch library @@ -45,4 +46,5 @@ config BR2_PACKAGE_PROVIDES_LIBGLES endif comment "libglvnd needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS From yann.morin.1998 at free.fr Thu Jan 13 17:52:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:52:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs __sync_*_4 intrinsics In-Reply-To: <20220113075847.3267080-1-fontaine.fabrice@gmail.com> References: <20220113075847.3267080-1-fontaine.fabrice@gmail.com> Message-ID: <20220113175240.GK1477939@scaer> Fabrice, All, On 2022-01-13 08:58 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since the addition of the package > in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: > > /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/EGL/libEGL.so.1.1.0.p/libegl.c.o: in function `AtomicIncrement': > libegl.c:(.text+0x614): undefined reference to `__sync_add_and_fetch_4' > > Fixes: > - http://autobuild.buildroot.org/results/a204953020a714057ec6690e63a3ad8ac621acd5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libglvnd/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in > index 2d99be8632..cd19fde582 100644 > --- a/package/libglvnd/Config.in > +++ b/package/libglvnd/Config.in > @@ -1,5 +1,6 @@ > config BR2_PACKAGE_LIBGLVND > bool "libglvnd" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics > depends on !BR2_STATIC_LIBS # dlfcn.h > help > The GL Vendor-Neutral Dispatch library > @@ -45,4 +46,5 @@ config BR2_PACKAGE_PROVIDES_LIBGLES > endif > > comment "libglvnd needs a toolchain w/ dynamic library" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on BR2_STATIC_LIBS > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From jlyda at carnegierobotics.com Thu Jan 13 17:48:57 2022 From: jlyda at carnegierobotics.com (Jeremy Lyda) Date: Thu, 13 Jan 2022 17:48:57 +0000 Subject: [Buildroot] [PATCH 1/1] package/lvm2: LC_ALL set to "C" locale before generating cmds Message-ID: <03d134dec448470eb60d56a0c8a6ceb5@carnegierobotics.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: package-lvm2-LC_ALL-set-to-C-locale-before-generatin.patch Type: text/x-patch Size: 2475 bytes Desc: package-lvm2-LC_ALL-set-to-C-locale-before-generatin.patch URL: From yann.morin.1998 at free.fr Thu Jan 13 17:58:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:58:15 +0100 Subject: [Buildroot] [git commit] package/socat: bump to version 1.7.4.3 Message-ID: <20220113175219.63C4A83537@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b7ea7a67a3b693cb42c5a981b163f6dfa9e24b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update README hash for version number change. Add a patch fixing build with musl. Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- ...re.ac-correct-the-getprotobynumber_r-test.patch | 43 ++++++++++++++++++++++ package/socat/socat.hash | 6 +-- package/socat/socat.mk | 2 +- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch new file mode 100644 index 0000000000..de95405531 --- /dev/null +++ b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch @@ -0,0 +1,43 @@ +From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 13 Jan 2022 17:56:10 +0200 +Subject: [PATCH] configure.ac: correct the getprotobynumber_r test + +The AC_TRY_COMPILE test succeeds even when libc does not provide the +tested symbol. The compiler produces a warning, but exits successfully. +Use AC_TRY_LINK that will only succeeds if libc provides the symbol. + +This fixes build with musl libc that does not support +getprotobynumber_r(). + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to socat at dest-unreach.org + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d4acc9e7e6f5..973a7f2218c9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) + # getprotobynumber_r() is not standardized + AC_MSG_CHECKING(for getprotobynumber_r() variant) + AC_CACHE_VAL(sc_cv_getprotobynumber_r, +-[AC_TRY_COMPILE([#include ++[AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], + [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024);], + [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL);], + [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], + +-- +2.34.1 + diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 0d9d0ba76c..4f7ff5328e 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 003686f80d820072649660b85f80c58f socat-1.7.4.2.tar.bz2 +md5 5c28dd258ba928326d0716fcb4895cc2 socat-1.7.4.3.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763 socat-1.7.4.2.tar.bz2 +sha256 d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007 socat-1.7.4.3.tar.bz2 # Locally calculated -sha256 062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644 README +sha256 432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index cf2a31b096..e20577492d 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.2 +SOCAT_VERSION = 1.7.4.3 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception From yann.morin.1998 at free.fr Thu Jan 13 17:58:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 18:58:57 +0100 Subject: [Buildroot] [PATCH] package/socat: bump to version 1.7.4.3 In-Reply-To: <541525e413f6b72c67b8602fc88e916486931d5f.1642091818.git.baruch@tkos.co.il> References: <541525e413f6b72c67b8602fc88e916486931d5f.1642091818.git.baruch@tkos.co.il> Message-ID: <20220113175857.GL1477939@scaer> Baruch, All, On 2022-01-13 18:36 +0200, Baruch Siach via buildroot spake thusly: > Update README hash for version number change. > > Add a patch fixing build with musl. > > Signed-off-by: Baruch Siach Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-correct-the-getprotobynumber_r-test.patch | 43 +++++++++++++++++++ > package/socat/socat.hash | 6 +-- > package/socat/socat.mk | 2 +- > 3 files changed, 47 insertions(+), 4 deletions(-) > create mode 100644 package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch > > diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch > new file mode 100644 > index 000000000000..de9540553191 > --- /dev/null > +++ b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch > @@ -0,0 +1,43 @@ > +From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001 > +From: Baruch Siach > +Date: Thu, 13 Jan 2022 17:56:10 +0200 > +Subject: [PATCH] configure.ac: correct the getprotobynumber_r test > + > +The AC_TRY_COMPILE test succeeds even when libc does not provide the > +tested symbol. The compiler produces a warning, but exits successfully. > +Use AC_TRY_LINK that will only succeeds if libc provides the symbol. > + > +This fixes build with musl libc that does not support > +getprotobynumber_r(). > + > +Signed-off-by: Baruch Siach > +--- > +Upstream status: sent to socat at dest-unreach.org > + > + configure.ac | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index d4acc9e7e6f5..973a7f2218c9 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) > + # getprotobynumber_r() is not standardized > + AC_MSG_CHECKING(for getprotobynumber_r() variant) > + AC_CACHE_VAL(sc_cv_getprotobynumber_r, > +-[AC_TRY_COMPILE([#include > ++[AC_TRY_LINK([#include > + #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], > + [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], > +- [AC_TRY_COMPILE([#include > ++ [AC_TRY_LINK([#include > + #include ],[getprotobynumber_r(1,NULL,NULL,1024);], > + [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], > +- [AC_TRY_COMPILE([#include > ++ [AC_TRY_LINK([#include > + #include ],[getprotobynumber_r(1,NULL,NULL);], > + [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], > + > +-- > +2.34.1 > + > diff --git a/package/socat/socat.hash b/package/socat/socat.hash > index 0d9d0ba76c9d..4f7ff5328e28 100644 > --- a/package/socat/socat.hash > +++ b/package/socat/socat.hash > @@ -1,8 +1,8 @@ > # From http://www.dest-unreach.org/socat/download.md5sum > -md5 003686f80d820072649660b85f80c58f socat-1.7.4.2.tar.bz2 > +md5 5c28dd258ba928326d0716fcb4895cc2 socat-1.7.4.3.tar.bz2 > # From http://www.dest-unreach.org/socat/download.sha256sum > -sha256 6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763 socat-1.7.4.2.tar.bz2 > +sha256 d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007 socat-1.7.4.3.tar.bz2 > # Locally calculated > -sha256 062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644 README > +sha256 432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb README > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL > diff --git a/package/socat/socat.mk b/package/socat/socat.mk > index cf2a31b0969c..e20577492d86 100644 > --- a/package/socat/socat.mk > +++ b/package/socat/socat.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SOCAT_VERSION = 1.7.4.2 > +SOCAT_VERSION = 1.7.4.3 > SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 > SOCAT_SITE = http://www.dest-unreach.org/socat/download > SOCAT_LICENSE = GPL-2.0 with OpenSSL exception > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Thu Jan 13 18:05:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 19:05:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix build with kernel < 5.11 Message-ID: <20220113180518.232197-1-fontaine.fabrice@gmail.com> Fix the following build failure with kernel < 5.11 raised since commit f363bc2958812539cf248f6cf44fe519445adf7a: /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/9.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: kernel-shared/volumes.o: in function `create_chunk': volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' Fixes: - http://autobuild.buildroot.org/results/b630dbd078656a974c6ac9645b2e87279ef2adc0 Signed-off-by: Fabrice Fontaine --- ...ocal-definition-for-alignment-macros.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch new file mode 100644 index 0000000000..86c63edc30 --- /dev/null +++ b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch @@ -0,0 +1,46 @@ +From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Thu, 13 Jan 2022 14:47:08 +0100 +Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment + macros + +There's still problem left with compilation on musl and kernel < 5.11, +because __ALIGN_KERNEL is not defined anymore: + +../bin/ld: kernel-shared/volumes.o: in function `create_chunk': +volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' + +Due to the entangled includes and unconditional definition of +__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it +eventually (as kerncompat.h is the first include). Instead add local +definitions of the macros and rename them to avoid name clashes. + +Pull-request: #433 +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] +Signed-off-by: Fabrice Fontaine +--- + kerncompat.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 6ca1526e2..f0a6e196e 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -359,7 +359,14 @@ do { \ + + /* Alignment check */ + #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) +-#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) ++ ++/* ++ * Alignment, copied and renamed from /usr/include/linux/const.h to work around ++ * issues caused by moving the definition in 5.12 ++ */ ++#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) ++#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) + + static inline int is_power_of_2(unsigned long n) + { -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 13 18:07:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 19:07:37 +0100 Subject: [Buildroot] [PATCH 1/2] package/boost: enable regex on host Message-ID: <20220113180738.232377-1-fontaine.fabrice@gmail.com> regex is needed on host for host-riscv-isa-sim Signed-off-by: Fabrice Fontaine --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6e026f4781..6d1046e9a2 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ - python random regex serialization stacktrace system test thread timer \ + python random serialization stacktrace system test thread timer \ type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 13 18:07:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 19:07:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/riscv-isa-sim: needs host-boost In-Reply-To: <20220113180738.232377-1-fontaine.fabrice@gmail.com> References: <20220113180738.232377-1-fontaine.fabrice@gmail.com> Message-ID: <20220113180738.232377-2-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure: error: Could not link against boost_system ! Fixes: - http://autobuild.buildroot.org/results/d1ec407d3a9106be1271e4897d6f578d501439fe Signed-off-by: Fabrice Fontaine --- package/riscv-isa-sim/riscv-isa-sim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index 59f70fc432..ee9067d304 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -8,6 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE -HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc $(eval $(host-autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 13 18:09:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 13 Jan 2022 19:09:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: fix musl build Message-ID: <20220113180940.232530-1-fontaine.fabrice@gmail.com> Fix the following build failure on musl raised since bump to version 2.0.0 in commit 3b9c8f8cb53e449e39899a40712703c272c5eeff: In file included from ../src/pcm_hw.c:42: /home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ | ^~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe Signed-off-by: Fabrice Fontaine --- .../0001-include-time.h-before-asound.h.patch | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 package/tinyalsa/0001-include-time.h-before-asound.h.patch diff --git a/package/tinyalsa/0001-include-time.h-before-asound.h.patch b/package/tinyalsa/0001-include-time.h-before-asound.h.patch new file mode 100644 index 0000000000..c91213e2eb --- /dev/null +++ b/package/tinyalsa/0001-include-time.h-before-asound.h.patch @@ -0,0 +1,76 @@ +From d91e947bda590765e1c791f40e8ffb4135ab1cd3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 11 Jan 2022 00:01:49 +0100 +Subject: [PATCH] include time.h before asound.h + +Include time.h before asound.h to avoid the following build failure on +musl that was already fixed a long time with +https://github.com/tinyalsa/tinyalsa/commit/c8333f8c7a4e4b9549abeef7530b2cd20a18e537 +but reappeared on version 2.0.0: + +In file included from ../src/pcm_hw.c:42: +/home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type + 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ + | ^~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/tinyalsa/tinyalsa/commit/c127110249967e0722d80bb41e33713accdcff8f] +--- + src/mixer.c | 1 + + src/mixer_hw.c | 1 + + src/pcm_hw.c | 1 + + src/pcm_plugin.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/src/mixer.c b/src/mixer.c +index afbc015..029fc84 100644 +--- a/src/mixer.c ++++ b/src/mixer.c +@@ -55,6 +55,7 @@ + #define __user + #endif + ++#include + #include + + #include +diff --git a/src/mixer_hw.c b/src/mixer_hw.c +index da5a390..50e9d07 100644 +--- a/src/mixer_hw.c ++++ b/src/mixer_hw.c +@@ -42,6 +42,7 @@ + #include + + #include ++#include + #include + + #include "mixer_io.h" +diff --git a/src/pcm_hw.c b/src/pcm_hw.c +index 5eb53be..2383ae0 100644 +--- a/src/pcm_hw.c ++++ b/src/pcm_hw.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/pcm_plugin.c b/src/pcm_plugin.c +index 47bf4a5..b6b69aa 100644 +--- a/src/pcm_plugin.c ++++ b/src/pcm_plugin.c +@@ -40,6 +40,7 @@ + + #include + #include ++#include + #include + #include + #include -- 2.34.1 From thomas.petazzoni at bootlin.com Thu Jan 13 19:34:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:34:36 +0100 Subject: [Buildroot] [git commit] package/boost: enable regex on host Message-ID: <20220113192846.2882A8292D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f3a4a5d57bc5e020729de52169765acfb0bea18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master regex is needed on host for host-riscv-isa-sim Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6e026f4781..6d1046e9a2 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ - python random regex serialization stacktrace system test thread timer \ + python random serialization stacktrace system test thread timer \ type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) From thomas.petazzoni at bootlin.com Thu Jan 13 19:34:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:34:39 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: needs host-boost Message-ID: <20220113192846.31D367FDB0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a10835fac773e68eef18d48cb89d76f9f553c33a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure: error: Could not link against boost_system ! Fixes: - http://autobuild.buildroot.org/results/d1ec407d3a9106be1271e4897d6f578d501439fe Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/riscv-isa-sim/riscv-isa-sim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index 59f70fc432..ee9067d304 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -8,6 +8,6 @@ RISCV_ISA_SIM_VERSION = 1.1.0 RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA_SIM_VERSION)) RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE -HOST_RISCV_ISA_SIM_DEPENDENCIES = host-dtc +HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc $(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Thu Jan 13 19:36:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:36:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/boost: enable regex on host In-Reply-To: <20220113180738.232377-1-fontaine.fabrice@gmail.com> References: <20220113180738.232377-1-fontaine.fabrice@gmail.com> Message-ID: <20220113203607.047f32a1@windsurf> On Thu, 13 Jan 2022 19:07:37 +0100 Fabrice Fontaine wrote: > regex is needed on host for host-riscv-isa-sim > > Signed-off-by: Fabrice Fontaine > --- > package/boost/boost.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:36:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:36:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: LC_ALL set to "C" locale before generating cmds In-Reply-To: <03d134dec448470eb60d56a0c8a6ceb5@carnegierobotics.com> References: <03d134dec448470eb60d56a0c8a6ceb5@carnegierobotics.com> Message-ID: <20220113203646.1b921877@windsurf> Hello Jeremy, On Thu, 13 Jan 2022 17:48:57 +0000 Jeremy Lyda via buildroot wrote: > Thanks a lot for your patch. Did you submit this patch to the upstream lvm2 project? Also, could you send the patch with "git send-email", so that it appears inline, and not as an attached file? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:37:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:37:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: fix build with kernel < 5.11 In-Reply-To: <20220113180518.232197-1-fontaine.fabrice@gmail.com> References: <20220113180518.232197-1-fontaine.fabrice@gmail.com> Message-ID: <20220113203713.50bec51a@windsurf> On Thu, 13 Jan 2022 19:05:18 +0100 Fabrice Fontaine wrote: > Fix the following build failure with kernel < 5.11 raised since commit > f363bc2958812539cf248f6cf44fe519445adf7a: > > /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/9.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: kernel-shared/volumes.o: in function `create_chunk': > volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' > > Fixes: > - http://autobuild.buildroot.org/results/b630dbd078656a974c6ac9645b2e87279ef2adc0 > > Signed-off-by: Fabrice Fontaine > --- > ...ocal-definition-for-alignment-macros.patch | 46 +++++++++++++++++++ > 1 file changed, 46 insertions(+) > create mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:37:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:37:07 +0100 Subject: [Buildroot] [git commit] package/btrfs-progs: fix build with kernel < 5.11 Message-ID: <20220113193119.92D7E831C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57ea2264d78dcc66dff1e904c538fa8c23ae3a0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with kernel < 5.11 raised since commit f363bc2958812539cf248f6cf44fe519445adf7a: /tmp/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/9.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: kernel-shared/volumes.o: in function `create_chunk': volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' Fixes: - http://autobuild.buildroot.org/results/b630dbd078656a974c6ac9645b2e87279ef2adc0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...add-local-definition-for-alignment-macros.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch new file mode 100644 index 0000000000..86c63edc30 --- /dev/null +++ b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch @@ -0,0 +1,46 @@ +From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Thu, 13 Jan 2022 14:47:08 +0100 +Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment + macros + +There's still problem left with compilation on musl and kernel < 5.11, +because __ALIGN_KERNEL is not defined anymore: + +../bin/ld: kernel-shared/volumes.o: in function `create_chunk': +volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' + +Due to the entangled includes and unconditional definition of +__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it +eventually (as kerncompat.h is the first include). Instead add local +definitions of the macros and rename them to avoid name clashes. + +Pull-request: #433 +Signed-off-by: David Sterba +[Retrieved from: +https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] +Signed-off-by: Fabrice Fontaine +--- + kerncompat.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 6ca1526e2..f0a6e196e 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -359,7 +359,14 @@ do { \ + + /* Alignment check */ + #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) +-#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) ++ ++/* ++ * Alignment, copied and renamed from /usr/include/linux/const.h to work around ++ * issues caused by moving the definition in 5.12 ++ */ ++#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) ++#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) + + static inline int is_power_of_2(unsigned long n) + { From thomas.petazzoni at bootlin.com Thu Jan 13 19:37:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:37:38 +0100 Subject: [Buildroot] [git commit] package/tinyalsa: fix musl build Message-ID: <20220113193119.9BAAA8356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=495440cf267962501753c19dab8da0714079261f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on musl raised since bump to version 2.0.0 in commit 3b9c8f8cb53e449e39899a40712703c272c5eeff: In file included from ../src/pcm_hw.c:42: /home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ | ^~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-include-time.h-before-asound.h.patch | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/package/tinyalsa/0001-include-time.h-before-asound.h.patch b/package/tinyalsa/0001-include-time.h-before-asound.h.patch new file mode 100644 index 0000000000..c91213e2eb --- /dev/null +++ b/package/tinyalsa/0001-include-time.h-before-asound.h.patch @@ -0,0 +1,76 @@ +From d91e947bda590765e1c791f40e8ffb4135ab1cd3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 11 Jan 2022 00:01:49 +0100 +Subject: [PATCH] include time.h before asound.h + +Include time.h before asound.h to avoid the following build failure on +musl that was already fixed a long time with +https://github.com/tinyalsa/tinyalsa/commit/c8333f8c7a4e4b9549abeef7530b2cd20a18e537 +but reappeared on version 2.0.0: + +In file included from ../src/pcm_hw.c:42: +/home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type + 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ + | ^~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/tinyalsa/tinyalsa/commit/c127110249967e0722d80bb41e33713accdcff8f] +--- + src/mixer.c | 1 + + src/mixer_hw.c | 1 + + src/pcm_hw.c | 1 + + src/pcm_plugin.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/src/mixer.c b/src/mixer.c +index afbc015..029fc84 100644 +--- a/src/mixer.c ++++ b/src/mixer.c +@@ -55,6 +55,7 @@ + #define __user + #endif + ++#include + #include + + #include +diff --git a/src/mixer_hw.c b/src/mixer_hw.c +index da5a390..50e9d07 100644 +--- a/src/mixer_hw.c ++++ b/src/mixer_hw.c +@@ -42,6 +42,7 @@ + #include + + #include ++#include + #include + + #include "mixer_io.h" +diff --git a/src/pcm_hw.c b/src/pcm_hw.c +index 5eb53be..2383ae0 100644 +--- a/src/pcm_hw.c ++++ b/src/pcm_hw.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/pcm_plugin.c b/src/pcm_plugin.c +index 47bf4a5..b6b69aa 100644 +--- a/src/pcm_plugin.c ++++ b/src/pcm_plugin.c +@@ -40,6 +40,7 @@ + + #include + #include ++#include + #include + #include + #include From thomas.petazzoni at bootlin.com Thu Jan 13 19:37:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:37:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: fix musl build In-Reply-To: <20220113180940.232530-1-fontaine.fabrice@gmail.com> References: <20220113180940.232530-1-fontaine.fabrice@gmail.com> Message-ID: <20220113203747.0f423736@windsurf> On Thu, 13 Jan 2022 19:09:40 +0100 Fabrice Fontaine wrote: > Fix the following build failure on musl raised since bump to version > 2.0.0 in commit 3b9c8f8cb53e449e39899a40712703c272c5eeff: > > In file included from ../src/pcm_hw.c:42: > /home/peko/autobuild/instance-1/output-1/host/i586-buildroot-linux-musl/sysroot/usr/include/sound/asound.h:444:18: error: field 'trigger_tstamp' has incomplete type > 444 | struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ > | ^~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/a75e23dc585bd071f4d65face5489ed6ac22edbe > > Signed-off-by: Fabrice Fontaine > --- > .../0001-include-time.h-before-asound.h.patch | 76 +++++++++++++++++++ > 1 file changed, 76 insertions(+) > create mode 100644 package/tinyalsa/0001-include-time.h-before-asound.h.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:19 +0100 Subject: [Buildroot] [PATCH 1/2] configs/roseapplypi_defconfig: really change to ext4 rootfs In-Reply-To: <20220113174721.22549-1-peter@korsgaard.com> References: <20220113174721.22549-1-peter@korsgaard.com> Message-ID: <20220113203819.64feec86@windsurf> On Thu, 13 Jan 2022 18:47:18 +0100 Peter Korsgaard wrote: > Commit b8aebcfd823f83c16 (configs/roseapplypi_defconfig: bump kernel to > 5.15.10) adjusted the board to use an ext4 rootfs, but forgot to update the > defconfig to enable ext4 rootfs, breaking the build. Correct that. > > Signed-off-by: Peter Korsgaard > --- > configs/roseapplepi_defconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:09 +0100 Subject: [Buildroot] [git commit] configs/roseapplypi_defconfig: bump kernel to 5.15.14 Message-ID: <20220113193229.16BA48356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba46964b85b26b6c6537b6339140b353d3e0bdb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- configs/roseapplepi_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index 00bdf69d8a..0f37d5dc0b 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:05 +0100 Subject: [Buildroot] [git commit] configs/roseapplypi_defconfig: really change to ext4 rootfs Message-ID: <20220113193229.0BA18821EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e2a38d38d30c9caab7da55a24f0ffacf7a19e50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b8aebcfd823f83c16 (configs/roseapplypi_defconfig: bump kernel to 5.15.10) adjusted the board to use an ext4 rootfs, but forgot to update the defconfig to enable ext4 rootfs, breaking the build. Correct that. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- configs/roseapplepi_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index f4efacf80d..00bdf69d8a 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -21,7 +21,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="owl-s500-roseapplepi" # Filesystem / image -BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloaders From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:49 +0100 Subject: [Buildroot] [git commit] board/spike/riscv64/start.sh: add buildroot host dir in PATH Message-ID: <20220113193229.20D7A821EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc819438f61c693ffe01cd6827f23372570cb7c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master commit 0d0f84d2004b04bc93d5ceb58c86640f190e5d78 added the missing host-dtc dependency to riscv-isa-sim. The spike simulator calls the dtc binary at its startup. The host dtc command needs to be in the PATH at that time. This commit add the buildroot host binary directory into the PATH of the start.sh helper script. It make sure spike will use the buildroot dtc version. This commit fixes this start.sh script on host not providing the dtc command. Since the "spike" binary is now in the PATH, the binary name is also simplified. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- board/spike/riscv64/start.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh index 75b1412df8..6fbbced806 100755 --- a/board/spike/riscv64/start.sh +++ b/board/spike/riscv64/start.sh @@ -3,9 +3,13 @@ SCRIPT_DIR="$(dirname "$0")" BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" +# spike uses dtc at runtime startup, so make sure buildroot host +# directory is in the PATH +export PATH="${BR_BASEDIR}/output/host/usr/bin:$PATH" + # Use Buildroot host spike by default, but allow the caller to # redefine another spike binary -: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" +: "${SPIKE:=spike}" exec "${SPIKE}" \ --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \ From thomas.petazzoni at bootlin.com Thu Jan 13 19:38:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:38:59 +0100 Subject: [Buildroot] [PATCH 1/1] board/spike/riscv64/start.sh: add buildroot host dir in PATH In-Reply-To: <20220112202640.7064-1-ju.o@free.fr> References: <20220112202640.7064-1-ju.o@free.fr> Message-ID: <20220113203859.763aee2f@windsurf> On Wed, 12 Jan 2022 21:26:40 +0100 Julien Olivain wrote: > commit 0d0f84d2004b04bc93d5ceb58c86640f190e5d78 > added the missing host-dtc dependency to riscv-isa-sim. > > The spike simulator calls the dtc binary at its startup. The host dtc > command needs to be in the PATH at that time. > > This commit add the buildroot host binary directory into the PATH of the > start.sh helper script. It make sure spike will use the buildroot dtc > version. This commit fixes this start.sh script on host not providing > the dtc command. Since the "spike" binary is now in the PATH, the > binary name is also simplified. > > Signed-off-by: Julien Olivain > --- > board/spike/riscv64/start.sh | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:40:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:40:40 +0100 Subject: [Buildroot] [git commit] package/avahi: add hidden libavahi-client option Message-ID: <20220113193430.E733B82DFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55f7c2a580a202638b5c0c9042b24b434632b6a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This hidden option will simplify packages depending on libavahi-client Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/avahi/Config.in | 6 ++++++ package/cups-filters/cups-filters.mk | 3 +-- package/libiio/libiio.mk | 3 +-- package/libostree/libostree.mk | 6 +----- package/pipewire/pipewire.mk | 3 +-- package/shairport-sync/shairport-sync.mk | 6 +----- package/vlc/vlc.mk | 3 +-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 95b01bfe92..2484d8ce5c 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -34,6 +34,12 @@ config BR2_PACKAGE_AVAHI_DAEMON The daemon registers local IP addresses and services using mDNS/DNS-SD. +# This hidden option allows packages that need the libavahi-client to +# more easily determine if it's available or not. +config BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT + bool + default y if BR2_PACKAGE_AVAHI_DAEMON && BR2_PACKAGE_DBUS + config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY bool "libdns_sd compatibility (Bonjour)" depends on BR2_PACKAGE_AVAHI_DAEMON diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 63b85f0b8b..c8f2dd0aae 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -45,8 +45,7 @@ else CUPS_FILTERS_CONF_OPTS += --disable-dbus endif -# avahi support requires avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) CUPS_FILTERS_DEPENDENCIES += avahi CUPS_FILTERS_CONF_OPTS += --enable-avahi else diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 38b2f83e6e..a4fe0d4541 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -65,8 +65,7 @@ else LIBIIO_CONF_OPTS += -DWITH_AIO=OFF endif -# Avahi support in libiio requires avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) LIBIIO_DEPENDENCIES += avahi LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=ON else diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 22cb83d039..9cbf2848c9 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -37,11 +37,7 @@ else LIBOSTREE_CONF_OPTS += --without-openssl endif -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus config symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) LIBOSTREE_CONF_OPTS += --with-avahi LIBOSTREE_DEPENDENCIES += avahi else diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 604d08f90d..b05ce2bcc2 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -83,8 +83,7 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -# avahi support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index cf49f2b2ed..487e0c05e5 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -22,11 +22,7 @@ SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \ SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)" # Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns). -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus congig symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) SHAIRPORT_SYNC_DEPENDENCIES += avahi SHAIRPORT_SYNC_CONF_OPTS += --with-avahi --without-tinysvcmdns else diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index fe338fcbe8..b793e0efe0 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -117,8 +117,7 @@ else VLC_CONF_OPTS += --disable-alsa endif -# avahi support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) VLC_CONF_OPTS += --enable-avahi VLC_DEPENDENCIES += avahi else From thomas.petazzoni at bootlin.com Thu Jan 13 19:41:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:41:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/avahi: add hidden libavahi-client option In-Reply-To: <20220112203117.3133159-1-fontaine.fabrice@gmail.com> References: <20220112203117.3133159-1-fontaine.fabrice@gmail.com> Message-ID: <20220113204127.553738dc@windsurf> On Wed, 12 Jan 2022 21:31:17 +0100 Fabrice Fontaine wrote: > +config BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT > + bool > + default y > + depends on BR2_PACKAGE_AVAHI_DAEMON > + depends on BR2_PACKAGE_DBUS Changed to: default y if BR2_PACKAGE_AVAHI_DAEMON && BR2_PACKAGE_DBUS and applied to master. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:42:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:42:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: add mips64el support In-Reply-To: <20220112215637.3179786-1-fontaine.fabrice@gmail.com> References: <20220112215637.3179786-1-fontaine.fabrice@gmail.com> Message-ID: <20220113204201.0a0329f7@windsurf> On Wed, 12 Jan 2022 22:56:37 +0100 Fabrice Fontaine wrote: > mips64el is supported since > https://sourceforge.net/p/gnu-efi/code/ci/3f234f5b6ff5c16c6ddd5f2c2513fb329aecd30a > > Signed-off-by: Fabrice Fontaine > --- > package/gnu-efi/Config.in | 1 + > package/gnu-efi/gnu-efi.mk | 2 ++ > 2 files changed, 3 insertions(+) Applied to master, thanks. I'm wondering who is using EFI on mips64el though :-) Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:41:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:41:49 +0100 Subject: [Buildroot] [git commit] package/gnu-efi: add mips64el support Message-ID: <20220113193542.987E38356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11b347c03ab0b38389ec11b48f63236a3b4d6547 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master mips64el is supported since https://sourceforge.net/p/gnu-efi/code/ci/3f234f5b6ff5c16c6ddd5f2c2513fb329aecd30a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gnu-efi/Config.in | 1 + package/gnu-efi/gnu-efi.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index d456a23837..8e35fddbcb 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_aarch64_be default y if BR2_i386 + default y if BR2_mips64el default y if BR2_x86_64 config BR2_PACKAGE_GNU_EFI diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 69618029f4..06bf254738 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -24,6 +24,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) GNU_EFI_PLATFORM = arm else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) GNU_EFI_PLATFORM = aarch64 +else ifeq ($(BR2_mips64el),y) +GNU_EFI_PLATFORM = mips64el endif GNU_EFI_MAKE_OPTS = \ From thomas.petazzoni at bootlin.com Thu Jan 13 19:42:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:42:40 +0100 Subject: [Buildroot] [git commit] package/omniorb: bump to version 4.3.0 Message-ID: <20220113193713.943B18356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b051086ab11b2aeeb57465ce3d861ab526846a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/omniorb/omniorb.hash | 12 ++++++------ package/omniorb/omniorb.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/omniorb/omniorb.hash b/package/omniorb/omniorb.hash index 5ac8614689..f522c1ef67 100644 --- a/package/omniorb/omniorb.hash +++ b/package/omniorb/omniorb.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.4/ -sha1 a6f3c8e96fc09c4ef8d75bd495bbc5256a4773ee omniORB-4.2.4.tar.bz2 -md5 de961e8aa29f3eed95ea40a94c1cccdf omniORB-4.2.4.tar.bz2 +# From https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0/ +sha1 c3f12c2278f8c4603910c02c8fe892c1dde7217e omniORB-4.3.0.tar.bz2 +md5 8889ab13b444b495ca2c2b48ea6a6bd7 omniORB-4.3.0.tar.bz2 # Locally generated -sha256 28c01cd0df76c1e81524ca369dc9e6e75f57dc70f30688c99c67926e4bdc7a6f omniORB-4.2.4.tar.bz2 -sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING -sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB +sha256 976045a2341f4e9a85068b21f4bd928993292933eeecefea372db09e0219eadd omniORB-4.3.0.tar.bz2 +sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING +sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index 4ecbb9d2c9..a1943968f1 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.2.4 +OMNIORB_VERSION = 4.3.0 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:32 +0100 Subject: [Buildroot] [git commit] package/python-hyperframe: bump to version 6.0.1 Message-ID: <20220113193713.BCBCD8356E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eee3a1ed92f47d833fe620b1e28cdbc35f5b1ae8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update site in Config.in - python 2.7 support has been dropped since version 6.0.0 - Update indentation in hash file (two spaces) https://github.com/python-hyper/hyperframe/blob/v6.0.1/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-hyperframe/Config.in | 3 ++- package/python-hyperframe/python-hyperframe.hash | 6 +++--- package/python-hyperframe/python-hyperframe.mk | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-hyperframe/Config.in b/package/python-hyperframe/Config.in index f3318a20e2..30457fe86e 100644 --- a/package/python-hyperframe/Config.in +++ b/package/python-hyperframe/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_HYPERFRAME bool "python-hyperframe" + depends on BR2_PACKAGE_PYTHON3 help HTTP/2 framing layer for Python. - http://hyper.rtfd.org + https://github.com/python-hyper/hyperframe/ diff --git a/package/python-hyperframe/python-hyperframe.hash b/package/python-hyperframe/python-hyperframe.hash index 3e686a4aa2..b39ab51a72 100644 --- a/package/python-hyperframe/python-hyperframe.hash +++ b/package/python-hyperframe/python-hyperframe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hyperframe/json -md5 6919183242feb26d8bce3b4cba81defd hyperframe-5.2.0.tar.gz -sha256 a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f hyperframe-5.2.0.tar.gz +md5 153c064e8ac654aaf136b3388c36de48 hyperframe-6.0.1.tar.gz +sha256 ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914 hyperframe-6.0.1.tar.gz # Locally computed sha256 checksums -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hyperframe/python-hyperframe.mk b/package/python-hyperframe/python-hyperframe.mk index 7640ade5fd..4b13ca51a3 100644 --- a/package/python-hyperframe/python-hyperframe.mk +++ b/package/python-hyperframe/python-hyperframe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HYPERFRAME_VERSION = 5.2.0 +PYTHON_HYPERFRAME_VERSION = 6.0.1 PYTHON_HYPERFRAME_SOURCE = hyperframe-$(PYTHON_HYPERFRAME_VERSION).tar.gz -PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/e6/7f/9a4834af1010dc1d570d5f394dfd9323a7d7ada7d25586bd299fc4cb0356 +PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/5a/2a/4747bff0a17f7281abe73e955d60d80aae537a5d203f417fa1c2e7578ebb PYTHON_HYPERFRAME_SETUP_TYPE = setuptools PYTHON_HYPERFRAME_LICENSE = MIT PYTHON_HYPERFRAME_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:23 +0100 Subject: [Buildroot] [git commit] package/python-hpack: bump to version 4.0.0 Message-ID: <20220113193713.B02538356C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4e3ef223f72f035f4bf84cba85f0d0b924bf937 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (HISTORY.rst removed) - Update site in Config.in - python 2.7 has been dropped - Update indentation in hash file (two spaces) https://github.com/python-hyper/hpack/blob/v4.0.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...rt-HISTORY.rst-from-UTF-8-format-to-ASCII.patch | 40 ---------------------- package/python-hpack/Config.in | 3 +- package/python-hpack/python-hpack.hash | 8 ++--- package/python-hpack/python-hpack.mk | 4 +-- 4 files changed, 8 insertions(+), 47 deletions(-) diff --git a/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch b/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch deleted file mode 100644 index 015b8a24da..0000000000 --- a/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3d195f4f599f37c89419f1db1302f94acb38c264 Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Tue, 1 Aug 2017 10:15:33 +0200 -Subject: [PATCH] Convert HISTORY.rst from UTF-8 format to ASCII -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -UTF-8 formatted file breaks installations on some systems: - -Traceback (most recent call last): - File "setup.py", line 34, in - long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(), - File "/home/peko/autobuild/instance-1/output/target/usr/lib/python3.6/encodings/ascii.py", line 26, in decode - return codecs.ascii_decode(input, self.errors)[0] -UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 1125: ordinal not in range(128) - -To fix this error just replace '??' with 'S' meaning 'Section'. - -Signed-off-by: Yegor Yefremov ---- - HISTORY.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/HISTORY.rst b/HISTORY.rst -index 37b2d9c..b9310f5 100644 ---- a/HISTORY.rst -+++ b/HISTORY.rst -@@ -27,7 +27,7 @@ Release History - - HPACK now tolerates receiving multiple header table size changes in sequence, - rather than only one. - - HPACK now forbids header table size changes anywhere but first in a header -- block, as required by RFC 7541 ?? 4.2. -+ block, as required by RFC 7541 S 4.2. - - Other miscellaneous performance improvements. - - 2.3.0 (2016-08-04) --- -2.11.0 - diff --git a/package/python-hpack/Config.in b/package/python-hpack/Config.in index b0ea03bc42..0608f97281 100644 --- a/package/python-hpack/Config.in +++ b/package/python-hpack/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_HPACK bool "python-hpack" + depends on BR2_PACKAGE_PYTHON3 help Pure-Python HPACK header compression. - http://hyper.rtfd.org + https://github.com/python-hyper/hpack diff --git a/package/python-hpack/python-hpack.hash b/package/python-hpack/python-hpack.hash index 72886b0edd..988cbaae0b 100644 --- a/package/python-hpack/python-hpack.hash +++ b/package/python-hpack/python-hpack.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/hpack/json -md5 556b0ae66180f54c2ce8029a0952088b hpack-3.0.0.tar.gz -# Locally computed -sha256 8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2 hpack-3.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/hpack/json +md5 27e01514ef06dc9fa0798d3dcb7de47c hpack-4.0.0.tar.gz +sha256 fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095 hpack-4.0.0.tar.gz +# Locally computed sha256 checksums sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index d6b96649e9..3cf534d055 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HPACK_VERSION = 3.0.0 +PYTHON_HPACK_VERSION = 4.0.0 PYTHON_HPACK_SOURCE = hpack-$(PYTHON_HPACK_VERSION).tar.gz -PYTHON_HPACK_SITE = https://pypi.python.org/packages/44/f1/b4440e46e265a29c0cb7b09b6daec6edf93c79eae713cfed93fbbf8716c5 +PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db19b0f6b370e79d586b3e8528b20252c729c476a2c02954 PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:00 +0100 Subject: [Buildroot] [git commit] package/python-h2: bump to version 4.1.0 Message-ID: <20220113193713.A22AE8356E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23e4fbecb31678751812c54ce3006bab55bb3358 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update site in Config.in - Reorder select - python 2.7 support has been dropped since version 4.0.0 https://github.com/python-hyper/h2/blob/v4.1.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-h2/Config.in | 5 +++-- package/python-h2/python-h2.hash | 6 +++--- package/python-h2/python-h2.mk | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-h2/Config.in b/package/python-h2/Config.in index dccee9b909..d88ad36761 100644 --- a/package/python-h2/Config.in +++ b/package/python-h2/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_H2 bool "python-h2" - select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_HPACK # runtime + select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime help HTTP/2 State-Machine based protocol implementation. - http://hyper.rtfd.org + https://github.com/python-hyper/h2 diff --git a/package/python-h2/python-h2.hash b/package/python-h2/python-h2.hash index 4193567d37..2f9c8f647f 100644 --- a/package/python-h2/python-h2.hash +++ b/package/python-h2/python-h2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/h2/json -md5 197a99c09f344a0dd987fab9801dc8d0 h2-3.2.0.tar.gz -sha256 875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14 h2-3.2.0.tar.gz +md5 4274f9619c0a43bb4ae01b6b02bf0c99 h2-4.1.0.tar.gz +sha256 a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb h2-4.1.0.tar.gz # Locally computed sha256 checksums -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE +sha256 7a65a5af0cbabf1c16251c7c6b2b7cb46d16a7222e79975b9b61fcd66a2e3f28 LICENSE diff --git a/package/python-h2/python-h2.mk b/package/python-h2/python-h2.mk index 81397bbb10..699e8baece 100644 --- a/package/python-h2/python-h2.mk +++ b/package/python-h2/python-h2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H2_VERSION = 3.2.0 +PYTHON_H2_VERSION = 4.1.0 PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz -PYTHON_H2_SITE = https://files.pythonhosted.org/packages/08/0a/033df0fc05fe94f72517ccd393dd9ff99b1773fd198307638e6d3568a518 +PYTHON_H2_SITE = https://files.pythonhosted.org/packages/2a/32/fec683ddd10629ea4ea46d206752a95a2d8a48c22521edd70b142488efe1 PYTHON_H2_SETUP_TYPE = setuptools PYTHON_H2_LICENSE = MIT PYTHON_H2_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/omniorb: bump to version 4.3.0 In-Reply-To: <20220112210219.3160627-1-fontaine.fabrice@gmail.com> References: <20220112210219.3160627-1-fontaine.fabrice@gmail.com> Message-ID: <20220113204342.053a9e0c@windsurf> On Wed, 12 Jan 2022 22:02:19 +0100 Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0 > > Signed-off-by: Fabrice Fontaine > --- > package/omniorb/omniorb.hash | 12 ++++++------ > package/omniorb/omniorb.mk | 2 +- > 2 files changed, 7 insertions(+), 7 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:43:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:43:51 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-h2: bump to version 4.1.0 In-Reply-To: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> References: <20220112212847.3166081-1-fontaine.fabrice@gmail.com> Message-ID: <20220113204351.2d39b41b@windsurf> On Wed, 12 Jan 2022 22:28:45 +0100 Fabrice Fontaine wrote: > - Update site in Config.in > - Reorder select > - python 2.7 support has been dropped since version 4.0.0 > > https://github.com/python-hyper/h2/blob/v4.1.0/CHANGELOG.rst > > Signed-off-by: Fabrice Fontaine > --- > package/python-h2/Config.in | 5 +++-- > package/python-h2/python-h2.hash | 6 +++--- > package/python-h2/python-h2.mk | 4 ++-- > 3 files changed, 8 insertions(+), 7 deletions(-) Series applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:44:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:44:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220112203939.606775-1-james.hilliard1@gmail.com> References: <20220112203939.606775-1-james.hilliard1@gmail.com> Message-ID: <20220113204451.23849f67@windsurf> Hello James, On Wed, 12 Jan 2022 13:39:39 -0700 James Hilliard wrote: > Currently the qmake gcc sysrootify path logic causes issues with > per-package directories, disable automatic gcc sysroot for qt5base > install and override all qt.conf paths manually to point to their > correct locations. > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > instead of the HOST_DIR for cross compilation to work. > > Signed-off-by: James Hilliard > --- > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > package/qt5/qt5base/qt5base.mk | 2 ++ > 2 files changed, 17 insertions(+), 3 deletions(-) Do you have a bit more details on what this changing, i.e how this is making things better? I have no doubt that it can make things better, but it would be useful in the commit log to have extra details on what specific details/aspects it is fixing/improving. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:51:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:51:29 +0100 Subject: [Buildroot] [PATCH] package/minijail: new package In-Reply-To: <20220113100506.89687-1-jose.pekkarinen@unikie.com> References: <20220113100506.89687-1-jose.pekkarinen@unikie.com> Message-ID: <20220113205129.585e3ce6@windsurf> Hello Jos?, Thanks for this new iteration! Comments below. On Thu, 13 Jan 2022 12:05:06 +0200 Jos? Pekkarinen wrote: > This patch adds package minijail > > Minijail depends in a toolchain different from > uclibc thanks to it's lack of support for prlimits. > > Signed-off-by: Jos? Pekkarinen > --- > [ v1 -> v2 ] > - Fixed hash file > - Fixed static assert patch > - Depend in toolchain distinct of uclibc > - Remove redundant host libpcap dependency > - Remove redundant parenthesis on MINIJAIL_BUILD_CMDS If this is v2, your patch should have been generated with "git format-patch -v2", so that its title is [PATCH v2] and not just [PATCH]. > diff --git a/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch > new file mode 100644 > index 0000000000..ff85995114 > --- /dev/null > +++ b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch > @@ -0,0 +1,35 @@ > +From 8a6d5a1c48b85fb49f0d68ec31ecc51fd22e7201 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > +Date: Wed, 12 Jan 2022 17:09:27 +0200 > +Subject: [PATCH] Substitute static_assert with _Static_assert > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Substitute static_assert with _Static_assert > + > +static_assert behaves differently for uclibc > +toolchains. Substituting it with the standard > +_Static_assert builds on all toolchains tested. So this is fixing a problem affecting uClibc toolchains, and below you exclude uClibc toolchains ? Does it make sense to have this patch ? > diff --git a/package/minijail/Config.in b/package/minijail/Config.in > new file mode 100644 > index 0000000000..24d307ed54 > --- /dev/null > +++ b/package/minijail/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_MINIJAIL > + bool "minijail" > + depends on !BR2_STATIC_LIBS # dlopen() > + depends on !BR2_TOOLCHAIN_USES_UCLIBC Please add a comment on top of this that explains why uClibc toolchains are excluded (prlimit not implemented). > + select BR2_PACKAGE_LIBCAP You need to replicate: depends on BR2_USE_MMU from the list of libcap dependencies. > + help > + Minijail is a sandboxing tool maintained by google. > + > + https://google.github.io/minijail/ > + > +comment "minijail needs a glibc or musl toolchain with dynamic library support" and also have it here. > + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC > diff --git a/package/minijail/minijail.hash b/package/minijail/minijail.hash > new file mode 100644 > index 0000000000..d9f497a86c > --- /dev/null > +++ b/package/minijail/minijail.hash > @@ -0,0 +1,5 @@ > +# Locally computed from https://github.com/google/minijail/releases/ > +sha256 1ee5a5916491a32c121c7422b4d8c16481c0396a3acab34bf1c44589dcf810ae linux-v17.tar.gz > + > +# Locally computed > +sha256 c6f439c5cf07263f71f01d29b79c79172ee529088e51ab434b22baad0988fe57 LICENSE > diff --git a/package/minijail/minijail.mk b/package/minijail/minijail.mk > new file mode 100644 > index 0000000000..78898865fb > --- /dev/null > +++ b/package/minijail/minijail.mk > @@ -0,0 +1,28 @@ > +################################################################################ > +# > +# minijail > +# > +################################################################################ > + > +MINIJAIL_VERSION = linux-v17 > +MINIJAIL_SOURCE = $(MINIJAIL_VERSION).tar.gz > +MINIJAIL_SITE = "https://github.com/google/minijail/archive/refs/tags" Please use the following lines instead: MINIJAIL_VERSION = 17 MINIJAIL_SITE = $(call github,google,minijail,linux-v$(MINIJAIL_VERSION)) You will have to adjust the .hash file accordingly. > +MINIJAIL_LICENSE = BSD-Style This is not a license. See https://spdx.org/licenses/ for the list of license identifiers that are valid. > +MINIJAIL_LICENSE_FILES = LICENSE > +MINIJAIL_DEPENDENCIES=libcap Spaces around "=". > +define MINIJAIL_BUILD_CMDS > + cd $(@D); \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) CC="$(TARGET_CC)" No need to cd into $(@D), since you run make with -C $(@D). Please drop the $(d) which is an empty variable. Also please use $(TARGET_CONFIGURE_OPTS). So something like this: $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) I'm pretty sure I already made this comment on a previous version, or perhaps on another package contributed by you. Could you take into account those comments and send a v3 ? It should be good to merge then. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:54:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:54:37 +0100 Subject: [Buildroot] [PATCH v3] package/opensc: new package In-Reply-To: <20220113114951.549960-1-jose.pekkarinen@unikie.com> References: <20220113114951.549960-1-jose.pekkarinen@unikie.com> Message-ID: <20220113205437.47e82728@windsurf> Hello Jos?, On Thu, 13 Jan 2022 13:49:51 +0200 Jos? Pekkarinen wrote: > diff --git a/package/opensc/Config.in b/package/opensc/Config.in > new file mode 100644 > index 0000000000..5ee52d1de6 > --- /dev/null > +++ b/package/opensc/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_OPENSC > + bool "opensc" > + depends on !BR2_STATIC_LIBS # dlopen() > + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM Unfortunately, this is not acceptable. If it breaks with this particular toolchain, it's also likely to break with other toolchains that share similar characteristics (gcc version, etc.). > + select BR2_PACKAGE_PCSC_LITE > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL Why do you force OpenSSL here? Is LibreSSL confirmed to not work with opensc? If so, please add a comment above this select that explains what explain is broken. If you select BR2_PACKAGE_PCSC_LITE, you also need to inherit its dependencies, i.e: depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 19:57:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 20:57:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/gensio: add avahi optional dependency In-Reply-To: References: <20220104204126.3631293-1-fontaine.fabrice@gmail.com> Message-ID: <20220113205733.270b84f0@windsurf> On Mon, 10 Jan 2022 08:45:05 +0100 Fabrice Fontaine wrote: > > > +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) > > > > In the commit message you talk about avahi-client, but here it's avahi-daemon. > > That looks a bit weird... Can you explain? > avahi-client needs avahi-daemon and dbus but perhaps we should add a > BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT hidden option. I suppose you will rework this patch with the new avahi hidden option that you have added? I'll mark this particular patch as Changes Requested. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:22:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:22:22 +0100 Subject: [Buildroot] [PATCH v3] package/opensc: new package In-Reply-To: <20220113205437.47e82728@windsurf> References: <20220113114951.549960-1-jose.pekkarinen@unikie.com> <20220113205437.47e82728@windsurf> Message-ID: <20220113212222.282b9a9c@windsurf> Hello, On Thu, 13 Jan 2022 20:54:37 +0100 Thomas Petazzoni wrote: > > + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM > > Unfortunately, this is not acceptable. If it breaks with this > particular toolchain, it's also likely to break with other toolchains > that share similar characteristics (gcc version, etc.). Just pass --disable-strict in OPENSC_CONF_OPTS, and opensc will nicely build with the Sourcery toolchain. > > + select BR2_PACKAGE_PCSC_LITE > > + select BR2_PACKAGE_OPENSSL > > + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL > > Why do you force OpenSSL here? Is LibreSSL confirmed to not work with > opensc? If so, please add a comment above this select that explains > what explain is broken. I just tested the build with LibreSSL, and it works, so please drop this BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:27:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:27:34 +0100 Subject: [Buildroot] [git commit] package/gdb: remove python2 support Message-ID: <20220113202144.8EC4D82DEE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a607efc6d3606e862babfbd17ca8e39398f7c2a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since at least gdb 7.8, python3 support has been available. As part of the progressive retiring of python2 support, it is time to drop its support in gdb by: - Removing BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host and removing the choice to leave just a BR2_PACKAGE_HOST_GDB_PYTHON3 option. - Adding BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy - Changing depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/gdb/Config.in | 2 +- package/gdb/Config.in.host | 20 +------------------- package/gdb/gdb.mk | 12 +----------- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6c6aca5ac9..dd64b7da1b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_HOST_GDB_PYTHON + bool "GDB Python2 support removed" + select BR2_LEGACY + help + Python2 is deprecated and no longer supported. + Please migrate to Python3. + config BR2_PACKAGE_GSTREAMER1_MM bool "gstreamer1-mm package removed" select BR2_LEGACY diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 6f1a883de7..daad6c910d 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI config BR2_PACKAGE_GDB_PYTHON bool "Python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help This option enables Python support in the target gdb. diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a6e1d7f53c..56999fa9e0 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -30,29 +30,11 @@ config BR2_PACKAGE_HOST_GDB_TUI help This option enables terminal user interface (TUI) for gdb -choice - prompt "Python support" - default BR2_PACKAGE_HOST_GDB_NOPYTHON - help - Select the version of Python you wish to use - -config BR2_PACKAGE_HOST_GDB_NOPYTHON - bool "None" - help - This option disables Python support in the cross gdb. - -config BR2_PACKAGE_HOST_GDB_PYTHON - bool "Python 2" - help - This option enables the Python 2 support in the cross gdb. - config BR2_PACKAGE_HOST_GDB_PYTHON3 - bool "Python 3" + bool "Python support" help This option enables the Python 3 support in the cross gdb. -endchoice - config BR2_PACKAGE_HOST_GDB_SIM bool "Simulator support" depends on !BR2_arc diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4ff498230a..05de3c14d1 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -201,17 +201,10 @@ GDB_CONF_OPTS += --disable-tui endif ifeq ($(BR2_PACKAGE_GDB_PYTHON),y) -ifeq ($(BR2_PACKAGE_PYTHON3),y) # CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_DEPENDENCIES += python3 -else -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_DEPENDENCIES += python -endif GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config else GDB_CONF_OPTS += --without-python @@ -287,10 +280,7 @@ else HOST_GDB_CONF_OPTS += --disable-tui endif -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 -HOST_GDB_DEPENDENCIES += host-python -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 HOST_GDB_DEPENDENCIES += host-python3 else From thomas.petazzoni at bootlin.com Thu Jan 13 20:38:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:38:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: remove python2 support In-Reply-To: <20220104200904.1422985-1-aduskett@gmail.com> References: <20220104200904.1422985-1-aduskett@gmail.com> Message-ID: <20220113213831.4b7c5a8a@windsurf> Hello, On Tue, 4 Jan 2022 12:09:04 -0800 Adam Duskett wrote: > According to the GDB 9.2 changelog, python3 has been supported since at least > 2019. > > - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host > > - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy > > - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to > depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in > > Signed-off-by: Adam Duskett I have applied your patch, after some changes. See below. > diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host > index a6e1d7f53c..2c6c78f20a 100644 > --- a/package/gdb/Config.in.host > +++ b/package/gdb/Config.in.host > @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON > help > This option disables Python support in the cross gdb. > > -config BR2_PACKAGE_HOST_GDB_PYTHON > - bool "Python 2" > - help > - This option enables the Python 2 support in the cross gdb. > - > config BR2_PACKAGE_HOST_GDB_PYTHON3 > bool "Python 3" > help The choice ... endchoice here was no longer needed, so I have only kept BR2_PACKAGE_HOST_GDB_PYTHON3 as an option. > diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk > index 4ff498230a..2929eaf058 100644 > --- a/package/gdb/gdb.mk > +++ b/package/gdb/gdb.mk > @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) This ifeq ($(BR2_PACKAGE_PYTHON3),y) was no longer needed: we know it's always going to be python3. Applied with those changes. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:38:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:38:39 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: use backported ICU patch from upstream Message-ID: <20220113203225.532D383582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e247f605e82fdfca6fbee6365baec982d1468071 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use backported upstream ICU fix instead of adapted downstream patch. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...yStation-ICU-68.1-no-longer-exposes-FALS.patch} | 35 +++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch similarity index 86% rename from package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch rename to package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch index 11d0b7b248..0c3e8b3586 100644 --- a/package/qt5/qt5webkit/0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch +++ b/package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch @@ -1,18 +1,39 @@ -From bf936a2bc8120f693f1effd3d9b130cddc6c4185 Mon Sep 17 00:00:00 2001 -From: Henri Roosen -Date: Thu, 18 Mar 2021 11:53:57 +0100 -Subject: [PATCH] Fix ICU related compile failures from capital bool defines +From 736e1d804d1efa2077c4f1fe0b9084927d82e249 Mon Sep 17 00:00:00 2001 +From: "stephan.szabo at sony.com" + +Date: Tue, 3 Nov 2020 20:06:15 +0000 +Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and + TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522 -See ICU-21267 +Reviewed by Don Olmstead. -Signed-off-by: Henri Roosen +Source/WebCore: + +* platform/text/TextCodecICU.cpp: Replace use of TRUE with true + +Source/WebKit: + +* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false + +Source/WTF: + +Replace uses of FALSE and TRUE with false and true. + +* wtf/text/icu/UTextProvider.h: +* wtf/text/icu/UTextProviderLatin1.cpp: +* wtf/text/icu/UTextProviderUTF16.cpp: + +Change-Id: I876cf2b10b8c858c3d265113c062d159749a2f3e +git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +736e1d804d1efa2077c4f1fe0b9084927d82e249] --- Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- Source/WebCore/platform/text/icu/UTextProvider.h | 8 ++++---- .../platform/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- .../platform/text/icu/UTextProviderUTF16.cpp | 4 ++-- - 4 files changed, 14 insertions(+), 14 deletions(-) + 7 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp index dd6ff0675bb1..e0f4bd718828 100644 From thomas.petazzoni at bootlin.com Thu Jan 13 20:38:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:38:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: use backported ICU patch from upstream In-Reply-To: <20220104205213.1367539-1-james.hilliard1@gmail.com> References: <20220104205213.1367539-1-james.hilliard1@gmail.com> Message-ID: <20220113213855.24e00974@windsurf> On Tue, 4 Jan 2022 13:52:13 -0700 James Hilliard wrote: > Use backported upstream ICU fix instead of adapted downstream patch. > > Signed-off-by: James Hilliard > --- > ...ion-ICU-68.1-no-longer-exposes-FALS.patch} | 35 +++++++++++++++---- > 1 file changed, 28 insertions(+), 7 deletions(-) > rename package/qt5/qt5webkit/{0001-Fix-ICU-related-compile-failures-from-capital-bool-d.patch => 0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch} (86%) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:40:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:40:24 +0100 Subject: [Buildroot] [git commit] package/systemd: add checklist of upgrade caveats Message-ID: <20220113203405.4AB5082DEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0c778c18ce180c02b0210169d7f7df0f9b4499a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bumping the version of systemd is a little more complicated than the usual package, and it's easy to forget some of the things that need to be done - and this has happened several times in the past. Add a checklist of things to worry about when updating systemd. Note that there are many other complicated packages that also need a lot of attention when upgrading. However, systemd is a really critical package so it's more important that we get that one right than, say, valgrind. Cc: Norbert Lange Cc: J??r??my ROSEN Cc: Adam Duskett Cc: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 3811dbae42..2d3971f31d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,6 +4,21 @@ # ################################################################################ +# When updating systemd, take care of the following: +# - Check if the requirements have changed (see README), in particular +# arch and headers +# - If yes, propagate the dependencies to BR2_INIT_SYSTEMD +# - If the required kernel options have changed, update the Config.in +# help text and the list of KCONFIG_ENABLE_OPT. +# - Check if there are new meson_options. Make sure all options are set +# explicitly (usually to default value). +# - If there are new services: +# - create new options for them (if they really are optional); +# - create a new _USER if necessary; +# - create new directory (with _PERMISSIONS) if necessary. +# - Diff sysusers.d with the previous version +# - Diff factory/etc/nsswitch.conf with the previous version +# (details are often sprinkled around in README and manpages) SYSTEMD_VERSION = 250.1 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ From thomas.petazzoni at bootlin.com Thu Jan 13 20:40:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:40:48 +0100 Subject: [Buildroot] [PATCH] package/systemd: add checklist of upgrade caveats In-Reply-To: <20220110131624.3639727-1-arnout@mind.be> References: <20220110131624.3639727-1-arnout@mind.be> Message-ID: <20220113214048.172176b9@windsurf> On Mon, 10 Jan 2022 14:16:24 +0100 "Arnout Vandecappelle (Essensium/Mind)" wrote: > Bumping the version of systemd is a little more complicated than the > usual package, and it's easy to forget some of the things that need to > be done - and this has happened several times in the past. > > Add a checklist of things to worry about when updating systemd. > > Note that there are many other complicated packages that also need a lot > of attention when upgrading. However, systemd is a really critical > package so it's more important that we get that one right than, say, > valgrind. > > Cc: Norbert Lange > Cc: J?r?my ROSEN > Cc: Adam Duskett > Cc: James Hilliard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/systemd/systemd.mk | 12 ++++++++++++ > 1 file changed, 12 insertions(+) Applied to master after taking into account the comments from Baruch and Norbert. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 20:41:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:41:48 +0100 Subject: [Buildroot] [git commit] package/python-gnupg: new package Message-ID: <20220113204212.89FD383582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b8abbe72c281bf646373b53abc2471631b8be71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A wrapper for the Gnu Privacy Guard (GPG or GnuPG). The gnupg module allows Python programs to make use of the functionality provided by the GNU Privacy Guard (abbreviated GPG or GnuPG). Using this module, Python programs can encrypt and decrypt data, digitally sign documents and verify digital signatures, manage (generate, list and delete) encryption keys, using Public Key Infrastructure (PKI) encryption technology based on OpenPGP. https://docs.red-dove.com/python-gnupg/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-gnupg/Config.in | 15 +++++++++++++++ package/python-gnupg/python-gnupg.hash | 5 +++++ package/python-gnupg/python-gnupg.mk | 13 +++++++++++++ 5 files changed, 35 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c15b117610..a17e828aa5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1605,6 +1605,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/ptm2human/ F: package/python-distro/ +F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ diff --git a/package/Config.in b/package/Config.in index b76f50e565..4df1474b91 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1038,6 +1038,7 @@ menu "External python modules" source "package/python-futures/Config.in" source "package/python-git/Config.in" source "package/python-gitdb2/Config.in" + source "package/python-gnupg/Config.in" source "package/python-gobject/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in new file mode 100644 index 0000000000..038a940778 --- /dev/null +++ b/package/python-gnupg/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_GNUPG + bool "python-gnupg" + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime + help + A wrapper for the Gnu Privacy Guard (GPG or GnuPG). + + The gnupg module allows Python programs to make use of the + functionality provided by the GNU Privacy Guard (abbreviated + GPG or GnuPG). Using this module, Python programs can + encrypt and decrypt data, digitally sign documents and + verify digital signatures, manage (generate, list and + delete) encryption keys, using Public Key Infrastructure + (PKI) encryption technology based on OpenPGP. + + https://docs.red-dove.com/python-gnupg/ diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash new file mode 100644 index 0000000000..fa0e8ae6e5 --- /dev/null +++ b/package/python-gnupg/python-gnupg.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-gnupg/json +md5 02c5d77b8db9dfba0741627560d89bd5 python-gnupg-0.4.8.tar.gz +sha256 b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7 python-gnupg-0.4.8.tar.gz +# Locally computed sha256 checksums +sha256 9620da3d3afdfca7dea53c4375c1507ab2d3a4af4e706827023acb49a9ec4a5e LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk new file mode 100644 index 0000000000..f16910e517 --- /dev/null +++ b/package/python-gnupg/python-gnupg.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-gnupg +# +################################################################################ + +PYTHON_GNUPG_VERSION = 0.4.8 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 +PYTHON_GNUPG_LICENSE = BSD-3-Clause +PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt +PYTHON_GNUPG_SETUP_TYPE = setuptools + +$(eval $(python-package)) From romain.naour at gmail.com Thu Jan 13 20:48:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 13 Jan 2022 21:48:50 +0100 Subject: [Buildroot] [PATCH 1/4] arch: move definition of KERNEL_ARCH to Config.in. files In-Reply-To: <20210518113652.29609-2-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-2-patrickdepinguin@gmail.com> Message-ID: <2fae6410-5fbf-776f-f3a7-586c09274738@gmail.com> Hi Thomas, Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > Similar to other arch-specific strings, the 'KERNEL_ARCH' variable can be > determined from Config.in. files. > > Besides aligning with similar strings, this also means simplification: the > big 'sed' covers several architectures not even supported by Buildroot. > Reviewed-by: Romain Naour Best regards, Romain > Signed-off-by: Thomas De Schampheleire > --- > Makefile | 17 +---------------- > arch/Config.in | 3 +++ > arch/Config.in.arc | 3 +++ > arch/Config.in.arm | 4 ++++ > arch/Config.in.csky | 3 +++ > arch/Config.in.m68k | 3 +++ > arch/Config.in.microblaze | 3 +++ > arch/Config.in.mips | 3 +++ > arch/Config.in.nds32 | 3 +++ > arch/Config.in.nios2 | 3 +++ > arch/Config.in.or1k | 3 +++ > arch/Config.in.powerpc | 3 +++ > arch/Config.in.riscv | 3 +++ > arch/Config.in.s390x | 3 +++ > arch/Config.in.sh | 3 +++ > arch/Config.in.sparc | 4 ++++ > arch/Config.in.x86 | 4 ++++ > arch/Config.in.xtensa | 3 +++ > 18 files changed, 55 insertions(+), 16 deletions(-) > > diff --git a/Makefile b/Makefile > index c3305f46e9..7b6998fde6 100644 > --- a/Makefile > +++ b/Makefile > @@ -433,22 +433,7 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > > # Strip off the annoying quoting > ARCH := $(call qstrip,$(BR2_ARCH)) > - > -KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ > - -e s/i.86/i386/ -e s/sun4u/sparc64/ \ > - -e s/arcle/arc/ \ > - -e s/arceb/arc/ \ > - -e s/arm.*/arm/ -e s/sa110/arm/ \ > - -e s/aarch64.*/arm64/ \ > - -e s/nds32.*/nds32/ \ > - -e s/or1k/openrisc/ \ > - -e s/parisc64/parisc/ \ > - -e s/powerpc64.*/powerpc/ \ > - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ > - -e s/riscv.*/riscv/ \ > - -e s/sh.*/sh/ \ > - -e s/s390x/s390/ \ > - -e s/microblazeel/microblaze/) > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > BZCAT := $(call qstrip,$(BR2_BZCAT)) > diff --git a/arch/Config.in b/arch/Config.in > index 155403c363..7575acf48c 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -326,6 +326,9 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_10 > config BR2_ARCH > string > > +config BR2_KERNEL_ARCH > + string > + > config BR2_ENDIAN > string > > diff --git a/arch/Config.in.arc b/arch/Config.in.arc > index f7a6d920b5..cc55c9e68f 100644 > --- a/arch/Config.in.arc > +++ b/arch/Config.in.arc > @@ -62,6 +62,9 @@ config BR2_ARCH > default "arc" if BR2_arcle > default "arceb" if BR2_arceb > > +config BR2_KERNEL_ARCH > + default "arc" > + > config BR2_arc > bool > default y if BR2_arcle || BR2_arceb > diff --git a/arch/Config.in.arm b/arch/Config.in.arm > index 4c0910e4f8..0f50512fad 100644 > --- a/arch/Config.in.arm > +++ b/arch/Config.in.arm > @@ -822,6 +822,10 @@ config BR2_ARCH > default "aarch64" if BR2_aarch64 > default "aarch64_be" if BR2_aarch64_be > > +config BR2_KERNEL_ARCH > + default "arm" if BR2_arm || BR2_armeb > + default "arm64" if BR2_aarch64 || BR2_aarch64_be > + > config BR2_ENDIAN > default "LITTLE" if (BR2_arm || BR2_aarch64) > default "BIG" if (BR2_armeb || BR2_aarch64_be) > diff --git a/arch/Config.in.csky b/arch/Config.in.csky > index 7e2029f759..df9e7ab75b 100644 > --- a/arch/Config.in.csky > +++ b/arch/Config.in.csky > @@ -39,6 +39,9 @@ config BR2_GCC_TARGET_FLOAT_ABI > config BR2_ARCH > default "csky" > > +config BR2_KERNEL_ARCH > + default "csky" > + > config BR2_ENDIAN > default "LITTLE" > > diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k > index 275f47f1d3..7f3aec7232 100644 > --- a/arch/Config.in.m68k > +++ b/arch/Config.in.m68k > @@ -1,6 +1,9 @@ > config BR2_ARCH > default "m68k" if BR2_m68k > > +config BR2_KERNEL_ARCH > + default "m68k" > + > config BR2_ENDIAN > default "BIG" > > diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze > index 5fe2906d40..52aa252a2c 100644 > --- a/arch/Config.in.microblaze > +++ b/arch/Config.in.microblaze > @@ -2,6 +2,9 @@ config BR2_ARCH > default "microblazeel" if BR2_microblazeel > default "microblaze" if BR2_microblazebe > > +config BR2_KERNEL_ARCH > + default "microblaze" > + > config BR2_ENDIAN > default "LITTLE" if BR2_microblazeel > default "BIG" if BR2_microblazebe > diff --git a/arch/Config.in.mips b/arch/Config.in.mips > index 619456c2d5..b4923f8484 100644 > --- a/arch/Config.in.mips > +++ b/arch/Config.in.mips > @@ -235,6 +235,9 @@ config BR2_ARCH > default "mips64" if BR2_mips64 > default "mips64el" if BR2_mips64el > > +config BR2_KERNEL_ARCH > + default "mips" > + > config BR2_ENDIAN > default "LITTLE" if BR2_mipsel || BR2_mips64el > default "BIG" if BR2_mips || BR2_mips64 > diff --git a/arch/Config.in.nds32 b/arch/Config.in.nds32 > index 322ff49f2e..61fc346260 100644 > --- a/arch/Config.in.nds32 > +++ b/arch/Config.in.nds32 > @@ -1,6 +1,9 @@ > config BR2_ARCH > default "nds32le" > > +config BR2_KERNEL_ARCH > + default "nds32" > + > config BR2_GCC_TARGET_ARCH > default "v3" > > diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2 > index aae435fa17..c77b1a1c59 100644 > --- a/arch/Config.in.nios2 > +++ b/arch/Config.in.nios2 > @@ -1,6 +1,9 @@ > config BR2_ARCH > default "nios2" > > +config BR2_KERNEL_ARCH > + default "nios2" > + > config BR2_ENDIAN > default "LITTLE" > > diff --git a/arch/Config.in.or1k b/arch/Config.in.or1k > index abdf498fb8..ef1bded453 100644 > --- a/arch/Config.in.or1k > +++ b/arch/Config.in.or1k > @@ -1,6 +1,9 @@ > config BR2_ARCH > default "or1k" > > +config BR2_KERNEL_ARCH > + default "openrisc" > + > config BR2_ENDIAN > default "BIG" > > diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc > index ba56c9c721..33b2471cf9 100644 > --- a/arch/Config.in.powerpc > +++ b/arch/Config.in.powerpc > @@ -157,6 +157,9 @@ config BR2_ARCH > default "powerpc64" if BR2_powerpc64 > default "powerpc64le" if BR2_powerpc64le > > +config BR2_KERNEL_ARCH > + default "powerpc" > + > config BR2_ENDIAN > default "BIG" if BR2_powerpc || BR2_powerpc64 > default "LITTLE" if BR2_powerpc64le > diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv > index 1fc20e5de7..e8b6ddc833 100644 > --- a/arch/Config.in.riscv > +++ b/arch/Config.in.riscv > @@ -116,6 +116,9 @@ config BR2_ARCH > default "riscv32" if !BR2_ARCH_IS_64 > default "riscv64" if BR2_ARCH_IS_64 > > +config BR2_KERNEL_ARCH > + default "riscv" > + > config BR2_ENDIAN > default "LITTLE" > > diff --git a/arch/Config.in.s390x b/arch/Config.in.s390x > index ad866b421e..bf4b70f957 100644 > --- a/arch/Config.in.s390x > +++ b/arch/Config.in.s390x > @@ -17,6 +17,9 @@ endchoice > config BR2_ARCH > default "s390x" if BR2_s390x > > +config BR2_KERNEL_ARCH > + default "s390" > + > config BR2_ENDIAN > default "BIG" > > diff --git a/arch/Config.in.sh b/arch/Config.in.sh > index b5cce18e22..fde42dfce2 100644 > --- a/arch/Config.in.sh > +++ b/arch/Config.in.sh > @@ -24,6 +24,9 @@ config BR2_ARCH > default "sh4a" if BR2_sh4a > default "sh4aeb" if BR2_sh4aeb > > +config BR2_KERNEL_ARCH > + default "sh" > + > config BR2_ENDIAN > default "LITTLE" if BR2_sh4 || BR2_sh4a > default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb > diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc > index 4c4dc61745..b91df6892b 100644 > --- a/arch/Config.in.sparc > +++ b/arch/Config.in.sparc > @@ -21,6 +21,10 @@ config BR2_ARCH > default "sparc" if BR2_sparc > default "sparc64" if BR2_sparc64 > > +config BR2_KERNEL_ARCH > + default "sparc" if BR2_sparc > + default "sparc64" if BR2_sparc64 > + > config BR2_ENDIAN > default "BIG" > > diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 > index 7aae3cafb7..88ac9cdc44 100644 > --- a/arch/Config.in.x86 > +++ b/arch/Config.in.x86 > @@ -266,6 +266,10 @@ config BR2_ARCH > default "i686" if BR2_x86_athlon_4 > default "x86_64" if BR2_x86_64 > > +config BR2_KERNEL_ARCH > + default "i386" if !BR2_x86_64 > + default "x86_64" if BR2_x86_64 > + > config BR2_ENDIAN > default "LITTLE" > > diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa > index a79d906985..acc340eca6 100644 > --- a/arch/Config.in.xtensa > +++ b/arch/Config.in.xtensa > @@ -48,6 +48,9 @@ config BR2_ENDIAN > config BR2_ARCH > default "xtensa" if BR2_xtensa > > +config BR2_KERNEL_ARCH > + default "xtensa" > + > config BR2_READELF_ARCH_NAME > default "Tensilica Xtensa Processor" > > From thomas.petazzoni at bootlin.com Thu Jan 13 20:51:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 21:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package In-Reply-To: <20220110200151.830192-1-ju.o@free.fr> References: <20220110200151.830192-1-ju.o@free.fr> Message-ID: <20220113215104.02a734a1@windsurf> Hello Julien, On Mon, 10 Jan 2022 21:01:51 +0100 Julien Olivain wrote: > DEVELOPERS | 1 + > package/Config.in | 1 + > package/python-gnupg/Config.in | 15 +++++++++++++++ > package/python-gnupg/python-gnupg.hash | 5 +++++ > package/python-gnupg/python-gnupg.mk | 13 +++++++++++++ > 5 files changed, 35 insertions(+) Thanks for the patch, which I have applied, with a change (see below). However, more importantly, could you write and contribute a test case for python-gnupg in our runtime test infrastructure ? See https://buildroot.org/downloads/manual/manual.html#_using_the_runtime_tests_framework for some amount of details. > +config BR2_PACKAGE_PYTHON_GNUPG > + bool "python-gnupg" > + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime This generates a circular dependency reported by kconfig, because another package does exactly the opposite. So I have inverted the logic here: select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:00:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:00:57 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220112184821.916646-1-heiko.thiery@gmail.com> References: <20220112184821.916646-1-heiko.thiery@gmail.com> Message-ID: <20220113220057.1db30808@windsurf> Hello, On Wed, 12 Jan 2022 19:48:22 +0100 Heiko Thiery wrote: > diff --git a/board/kontron/bl-imx8mm/boot.cmd b/board/kontron/bl-imx8mm/boot.cmd > new file mode 100644 > index 0000000000..7ce3198dbc > --- /dev/null > +++ b/board/kontron/bl-imx8mm/boot.cmd > @@ -0,0 +1,8 @@ > +echo "Root File Sytem on MMC${devnum}" > +setenv rootfs /dev/mmcblk${devnum}p1 > +setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} > + > +load ${devtype} ${devnum} ${kernel_addr_r} boot/Image > +load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mm-kontron-n801x-s.dtb > + > +booti ${kernel_addr_r} - ${fdt_addr_r} Have you considered using extlinux.conf ? This is generally much easier than a boot script, and removes the need to generate the boot script. > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..ed088dd0f8 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,28 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig I suppose the U-Boot patches are on their way upstream? > diff --git a/board/kontron/bl-imx8mm/post-image.sh b/board/kontron/bl-imx8mm/post-image.sh > new file mode 100755 > index 0000000000..564211c829 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/post-image.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg Could you call support/scripts/genimage.sh directly as the post-image script, using the BR2_ROOTFS_POST_SCRIPT_ARGS to pass the -c ... argument? We already do that in many defconfigs. > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y You need FIT support ? > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/bl-imx8mm/boot.cmd" These would no longer be needed if switching to extlinux.conf. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:04:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:04:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-rtsp-server: fix introspection In-Reply-To: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> References: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> Message-ID: <20220113220429.3ae14160@windsurf> Hello Fabrice, On Mon, 20 Dec 2021 10:33:11 +0100 Fabrice Fontaine wrote: > Fix the following build failure with introspection: > > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 > Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 > If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > Fixes: > - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 > > Signed-off-by: Fabrice Fontaine Thanks applied, but see below. > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] You've had some feedback about resubmitting to the monorepo (which I suppose is the new single repo that gstreamer developers are using now). If not already done, could you follow-up on this? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From paul at crapouillou.net Thu Jan 13 21:04:31 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Thu, 13 Jan 2022 21:04:31 +0000 Subject: [Buildroot] [PATCH 1/1] Config.in: add option to only use ccache for BR Message-ID: <20220113210431.1361727-1-paul@crapouillou.net> Add an option, disabled by default, to only use ccache for Buildroot packages. When enabled, ccache will be used when building Buildroot itself, but the toolchain exported as SDK will not make use of ccache to build external programs, unless the "BR_USE_CCACHE" environment variable is set. The motivation behind this change is to be able to speed up iterative building of a Buildroot based distribution, without forcing the users of the SDK to use ccache, which has the problem of clobbering the filesystem in a hidden directory if the cache directory is left as default, or trying to access a cache folder that existed on the machine that built the SDK but which may not exist on the machine on which it was later installed. Signed-off-by: Paul Cercueil --- Config.in | 9 +++++++++ linux/linux.mk | 4 ++++ package/Makefile.in | 4 ++++ toolchain/toolchain-wrapper.c | 5 +++++ toolchain/toolchain-wrapper.mk | 4 ++++ 5 files changed, 26 insertions(+) diff --git a/Config.in b/Config.in index f0cd6f48ed..fec2332077 100644 --- a/Config.in +++ b/Config.in @@ -374,6 +374,15 @@ config BR2_CCACHE_USE_BASEDIR the section "COMPILING IN DIFFERENT DIRECTORIES" in the ccache manual for more information. +config BR2_CCACHE_BR_ONLY + bool "Only use ccache for building Buildroot packages" + default n + help + When enabled, ccache will be used when building Buildroot + itself, but the toolchain exported as SDK will not make use of + ccache to build external programs, unless the "BR_USE_CCACHE" + environment variable is set. + endif config BR2_ENABLE_DEBUG diff --git a/linux/linux.mk b/linux/linux.mk index 61fdc0c76c..339848e29b 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -69,6 +69,10 @@ LINUX_MAKE_ENV = \ $(HOST_MAKE_ENV) \ BR_BINARIES_DIR=$(BINARIES_DIR) +ifeq ($(BR2_CCACHE_BR_ONLY),y) +LINUX_MAKE_ENV += BR_USE_CCACHE=1 +endif + LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod \ $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ diff --git a/package/Makefile.in b/package/Makefile.in index 508ea7c366..34556fa7b0 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -263,6 +263,10 @@ export PERL5LIB=$(HOST_DIR)/lib/perl TARGET_MAKE_ENV = PATH=$(BR_PATH) +ifeq ($(BR2_CCACHE_BR_ONLY),y) + TARGET_MAKE_ENV += BR_USE_CCACHE=1 +endif + TARGET_CONFIGURE_OPTS = \ $(TARGET_MAKE_ENV) \ AR="$(TARGET_AR)" \ diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 0fb6064b1c..bf0194c8fc 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -510,6 +510,11 @@ int main(int argc, char **argv) if (getenv("BR_NO_CCACHE")) /* Skip the ccache call */ exec_args++; +#ifdef BR_CCACHE_BR_ONLY + else if (!getenv("BR_USE_CCACHE")) + /* Skip the ccache call */ + exec_args++; +#endif #endif /* Debug the wrapper to see final arguments passed to the real compiler. */ diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index cbf46f15fa..cda9eaf342 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -73,6 +73,10 @@ ifeq ($(BR2_CCACHE_USE_BASEDIR),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"' endif +ifeq ($(BR2_CCACHE_BR_ONLY),y) +TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BR_ONLY +endif + ifeq ($(BR2_PIC_PIE),y) TOOLCHAIN_WRAPPER_ARGS += -DBR2_PIC_PIE endif -- 2.34.1 From thomas.petazzoni at bootlin.com Thu Jan 13 21:02:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:02:52 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gst1-rtsp-server: fix introspection Message-ID: <20220113210055.5938B83591@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa3e7a63b93620b8227d66c6a973cd6140432cf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with introspection: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-gst-rtsp-server-meson.build-add-gst_dep.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch new file mode 100644 index 0000000000..b63f634598 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch @@ -0,0 +1,41 @@ +From b6bc8fbb72d6d3914c616dc64d15b961493cb9c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Dec 2021 10:09:36 +0100 +Subject: [PATCH] gst/rtsp-server/meson.build: add gst_dep + +Add gst_dep to gst_rtsp_server_deps, in the context of buildroot, this +will avoid the following build failure, because the correct girdir +location will be retrieved from gstreamer-1.0.pc: + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 +Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + +Fixes: + - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] +--- + gst/rtsp-server/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/rtsp-server/meson.build b/gst/rtsp-server/meson.build +index 24d7c39..874da14 100644 +--- a/gst/rtsp-server/meson.build ++++ b/gst/rtsp-server/meson.build +@@ -55,7 +55,7 @@ rtsp_server_headers = [ + + install_headers(rtsp_server_headers, subdir : 'gstreamer-1.0/gst/rtsp-server') + +-gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep] ++gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep, gst_dep] + gst_rtsp_server = library('gstrtspserver- at 0@'.format(api_version), + rtsp_server_sources, + include_directories : rtspserver_incs, +-- +2.33.0 + From thomas.petazzoni at bootlin.com Thu Jan 13 21:09:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:09:54 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-zero: using PARTUUID to identify root filesystem Message-ID: <20220113210414.1B8FA83493@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e68ec6de08f0ae9488a4df62ea15eb7e2bdf7b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The mmc block device number can vary, so passing a mmc block device to specify the location of the rootfs is not a reliable approach. Instead, use the root=PARTUUID= mechanism, where the uuid is found by U-Boot. Signed-off-by: Sergey Kuzminov Signed-off-by: Thomas Petazzoni --- board/orangepi/orangepi-zero/boot.cmd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd index 44f0885ff4..d094a64fe5 100644 --- a/board/orangepi/orangepi-zero/boot.cmd +++ b/board/orangepi/orangepi-zero/boot.cmd @@ -1,6 +1,7 @@ setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +part uuid mmc 0:2 uuid +setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb From thomas.petazzoni at bootlin.com Thu Jan 13 21:10:45 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:10:45 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:using UUID to root In-Reply-To: <20211217233227.16411-1-kuzminov.sergey81@gmail.com> References: <20211217233227.16411-1-kuzminov.sergey81@gmail.com> Message-ID: <20220113221045.0a09cfc1@windsurf> On Sat, 18 Dec 2021 02:32:27 +0300 Sergey Kuzminov wrote: > The mmc block device number can vary. Passing a mmc block device to specify the location of the rootfs is not a reliable approach. > > Signed-off-by: Sergey Kuzminov > --- > board/orangepi/orangepi-zero/boot.cmd | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From jlyda at carnegierobotics.com Thu Jan 13 21:11:08 2022 From: jlyda at carnegierobotics.com (Jeremy Lyda) Date: Thu, 13 Jan 2022 21:11:08 +0000 Subject: [Buildroot] [PATCH 1/1] package/lvm2: LC_ALL set to "C" locale before generating cmds In-Reply-To: <20220113203646.1b921877@windsurf> References: <03d134dec448470eb60d56a0c8a6ceb5@carnegierobotics.com>, <20220113203646.1b921877@windsurf> Message-ID: <397aae451e2840bdad25aecda53d1185@carnegierobotics.com> Hello Thomas, > Thanks a lot for your patch. Did you submit this patch to the upstream > lvm2 project? I have not yet gotten around to it, but I do intend on submitting it, yes. > Also, could you send the patch with "git send-email", so that it > appears inline, and not as an attached file? I am struggling to get `git send-email` to cooperate with our mail server, but I will attach an inline copy of the patch below: >From 8527acf5177dd17c0ffafcd1b331b25a51d7a705 Mon Sep 17 00:00:00 2001 From: Jeremy Lyda Date: Thu, 13 Jan 2022 12:14:01 -0500 Subject: [PATCH 1/1] package/lvm2: LC_ALL set to "C" locale before generating cmds Signed-off-by: Jeremy Lyda --- ...t-to-C-locale-before-generating-cmds.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/lvm2/0001-LC_ALL-set-to-C-locale-before-generating-cmds.patch diff --git a/package/lvm2/0001-LC_ALL-set-to-C-locale-before-generating-cmds.patch b/package/lvm2/0001-LC_ALL-set-to-C-locale-before-generating-cmds.patch new file mode 100644 index 0000000000..d9c31cc3f1 --- /dev/null +++ b/package/lvm2/0001-LC_ALL-set-to-C-locale-before-generating-cmds.patch @@ -0,0 +1,35 @@ +From 8742a873dc3a89095760152db62b827ddba8ca24 Mon Sep 17 00:00:00 2001 +From: Jeremy Lyda +Date: Thu, 13 Jan 2022 12:00:54 -0500 +Subject: [PATCH 1/1] LC_ALL set to "C" locale before generating cmds + +An assumption is made prior to generating the cmds.h header file that the +LC_COLLATE locale setting is set to "C" -- this is not always the case. If the +locale is set for example to "en_US.UTF8" then it will alter the way that +underscores compare to letters and numbers such that underscores will be sorted +after letters and numbers. LVM in our experience does not gracefully handle +this erroneous sorting and results in a segmentation fault at some point in +program execution. Setting LC_ALL to the "C" locale (specifically LC_COLLATE) +ensures a correct, consistent command environment across various systems. + +Signed-off-by: Jeremy Lyda +--- + tools/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile.in b/tools/Makefile.in +index ec546ca63..c8530915c 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -181,7 +181,7 @@ cmds.h: $(srcdir)/command-lines.in Makefile + ( cat $(srcdir)/license.inc && \ + echo "/* Do not edit. This file is generated by the Makefile. */" && \ + echo "cmd(CMD_NONE, none)" && \ +- $(GREP) '^ID:' $(srcdir)/command-lines.in | LANG=C $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \ ++ $(GREP) '^ID:' $(srcdir)/command-lines.in | LANG=C LC_ALL=C $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \ + echo "cmd(CMD_COUNT, count)" \ + ) > $@ + +-- +2.25.1 + -- 2.25.1 From ps.report at gmx.net Thu Jan 13 21:26:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 13 Jan 2022 22:26:05 +0100 Subject: [Buildroot] [PATCH v1] package/mesa3d: fix glvnd option handling Message-ID: <20220113212605.13343-1-ps.report@gmx.net> - enable glvnd option only in case OPENGL_GLX or OPENGL_EGL is enabled Fixes: - http://autobuild.buildroot.net/results/e97ad48f20a325f5757754a8be2bdb613c86e4ea .../build/mesa3d-21.3.3/meson.build:542:4: ERROR: Problem encountered: glvnd requires DRI based GLX and/or EGL Signed-off-by: Peter Seiderer --- package/mesa3d/mesa3d.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index aa365838ab..fb178c10b3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -271,10 +271,14 @@ MESA3D_CFLAGS += -mlong-jump-table-offsets endif ifeq ($(BR2_PACKAGE_LIBGLVND),y) +ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),) MESA3D_DEPENDENCIES += libglvnd MESA3D_CONF_OPTS += -Dglvnd=true else MESA3D_CONF_OPTS += -Dglvnd=false endif +else +MESA3D_CONF_OPTS += -Dglvnd=false +endif $(eval $(meson-package)) -- 2.34.1 From romain.naour at gmail.com Thu Jan 13 21:30:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 13 Jan 2022 22:30:50 +0100 Subject: [Buildroot] [PATCH 2/4] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH In-Reply-To: <20210518113652.29609-3-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-3-patrickdepinguin@gmail.com> Message-ID: Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > The variable 'KERNEL_ARCH' is actually a normalized version of > 'ARCH'/'BR2_ARCH'. For example, 'arcle' and 'arceb' both become 'arc', just > as all powerpc variants become 'powerpc'. > > It is presumably called 'KERNEL_ARCH' because the Linux kernel is typically > the first place where support for a new architecture is added, and thus is > the entity that defines the normalized name. > > However, the term 'KERNEL_ARCH' can also be interpreted as 'the architecture > used by the kernel', which need not be exactly the same as 'the normalized > name for a certain arch'. In particular, for cases where a 64-bit > architecture is running a 64-bit kernel but 32-bit userspace. Examples > include: > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > In such cases, the 'architecture used by the kernel' needs to refer to the > 64-bit name (aarch64, x86_64), whereas all userspace applications need to > refer the, potentially normalized, 32-bit name. > > This means that there need to be two different variables: > > KERNEL_ARCH: the architecture used by the kernel > NORMALIZED_ARCH: the normalized name for the current userspace architecture > > At this moment, both will actually have the same content. But a subsequent > patch will add basic support for situations described above, in which > KERNEL_ARCH may become overwritten to the 64-bit architecture, while > NORMALIZED_ARCH needs to remain the same (32-bit) case. > > This commit replaces use of KERNEL_ARCH where actually the userspace arch is > needed. Places that use KERNEL_ARCH in combination with building of kernel > modules are not touched. > There may be cases where a package builds both a kernel module as userspace, > in which case it may need to know about both KERNEL_ARCH and > NORMALIZED_ARCH, for the case where they differ. But this is to be fixed on > a per-need basis. While reviewing this patch, I noticed that LINUX_ARCH_PATH [1] is wrong for sparc64 LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) Indeed: $ make O=test/qemu_sparc64_sun4u_defconfig printvars VARS=LINUX_ARCH_PATH LINUX_ARCH_PATH=/home/kubu/buildroot/test/qemu_sparc64_sun4u_defconfig/build/linux-5.15/arch/sparc64 But since LINUX_ARCH_PATH is not used for this architecture, it was not noticed. [1] https://git.buildroot.net/buildroot/tree/linux/linux.mk?h=2021.11#n226 Remaining packages using KERNEL_ARCH actually build an out of tree kernel module: jailhouse, linux-fusion, openpowerlink. Reviewed-by: Romain Naour > > Signed-off-by: Thomas De Schampheleire > --- > Makefile | 1 + > boot/barebox/barebox.mk | 10 +++++----- > boot/uboot/uboot.mk | 6 +++--- > package/busybox/busybox.mk | 2 +- > package/environment-setup/environment-setup.mk | 2 +- > package/kvmtool/kvmtool.mk | 4 ++-- > package/libselinux/libselinux.mk | 2 +- > package/linux-tools/linux-tool-perf.mk.in | 4 ++-- > package/linux-tools/linux-tool-selftests.mk.in | 6 +++--- > package/olsr/olsr.mk | 4 ++-- > package/pciutils/pciutils.mk | 2 +- > package/uboot-tools/uboot-tools.mk | 10 +++++----- > 12 files changed, 27 insertions(+), 26 deletions(-) > > diff --git a/Makefile b/Makefile > index 7b6998fde6..c5399e9a35 100644 > --- a/Makefile > +++ b/Makefile > @@ -433,6 +433,7 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > > # Strip off the annoying quoting > ARCH := $(call qstrip,$(BR2_ARCH)) > +NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk > index 8f02f9f9e1..6506294d6d 100644 > --- a/boot/barebox/barebox.mk > +++ b/boot/barebox/barebox.mk > @@ -59,16 +59,16 @@ ifneq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) > $(1)_INSTALL_TARGET = NO > endif > > -ifeq ($$(KERNEL_ARCH),i386) > +ifeq ($$(NORMALIZED_ARCH),i386) > $(1)_ARCH = x86 > -else ifeq ($$(KERNEL_ARCH),x86_64) > +else ifeq ($$(NORMALIZED_ARCH),x86_64) > $(1)_ARCH = x86 > -else ifeq ($$(KERNEL_ARCH),powerpc) > +else ifeq ($$(NORMALIZED_ARCH),powerpc) > $(1)_ARCH = ppc > -else ifeq ($$(KERNEL_ARCH),arm64) > +else ifeq ($$(NORMALIZED_ARCH),arm64) > $(1)_ARCH = arm > else > -$(1)_ARCH = $$(KERNEL_ARCH) > +$(1)_ARCH = $$(NORMALIZED_ARCH) > endif > > $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dbe82e65b1..77df9c8bba 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -139,12 +139,12 @@ endif > > # The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm', so > # we have to special case it. Similar for i386/x86_64 -> x86 > -ifeq ($(KERNEL_ARCH),arm64) > +ifeq ($(NORMALIZED_ARCH),arm64) > UBOOT_ARCH = arm > -else ifneq ($(filter $(KERNEL_ARCH),i386 x86_64),) > +else ifneq ($(filter $(NORMALIZED_ARCH),i386 x86_64),) > UBOOT_ARCH = x86 > else > -UBOOT_ARCH = $(KERNEL_ARCH) > +UBOOT_ARCH = $(NORMALIZED_ARCH) > endif > > UBOOT_MAKE_OPTS += \ > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index e979ac4f4b..456ed04a73 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -99,7 +99,7 @@ endif > > BUSYBOX_MAKE_OPTS = \ > CC="$(TARGET_CC)" \ > - ARCH=$(KERNEL_ARCH) \ > + ARCH=$(NORMALIZED_ARCH) \ > PREFIX="$(TARGET_DIR)" \ > EXTRA_LDFLAGS="$(BUSYBOX_LDFLAGS)" \ > CROSS_COMPILE="$(TARGET_CROSS)" \ > diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk > index fcad013f0d..8e0fdff208 100644 > --- a/package/environment-setup/environment-setup.mk > +++ b/package/environment-setup/environment-setup.mk > @@ -11,7 +11,7 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS > for var in $(TARGET_CONFIGURE_OPTS); do \ > printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ > done > - printf "export \"ARCH=$(KERNEL_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) > + printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) > printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE) > printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \ > --host=$(GNU_TARGET_NAME) \ > diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk > index 2984817c7e..df6ae7e0f1 100644 > --- a/package/kvmtool/kvmtool.mk > +++ b/package/kvmtool/kvmtool.mk > @@ -25,11 +25,11 @@ KVMTOOL_MAKE_OPTS = \ > WERROR=0 > > define KVMTOOL_BUILD_CMDS > - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) > + $(TARGET_MAKE_ENV) ARCH=$(NORMALIZED_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) > endef > > define KVMTOOL_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) \ > + $(TARGET_MAKE_ENV) ARCH=$(NORMALIZED_ARCH) $(MAKE) -C $(@D) \ > $(KVMTOOL_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) prefix=/usr > endef > > diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk > index fdd13aa942..5a62b8d829 100644 > --- a/package/libselinux/libselinux.mk > +++ b/package/libselinux/libselinux.mk > @@ -18,7 +18,7 @@ LIBSELINUX_INSTALL_STAGING = YES > # we won't have to use a relative path in 0002-revert-ln-relative.patch > LIBSELINUX_MAKE_OPTS = \ > $(TARGET_CONFIGURE_OPTS) \ > - ARCH=$(KERNEL_ARCH) \ > + ARCH=$(NORMALIZED_ARCH) \ > SHLIBDIR=/usr/lib > > LIBSELINUX_MAKE_INSTALL_TARGETS = install > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > index efa747cf8d..4e28129f50 100644 > --- a/package/linux-tools/linux-tool-perf.mk.in > +++ b/package/linux-tools/linux-tool-perf.mk.in > @@ -8,10 +8,10 @@ LINUX_TOOLS += perf > > PERF_DEPENDENCIES = host-flex host-bison > > -ifeq ($(KERNEL_ARCH),x86_64) > +ifeq ($(NORMALIZED_ARCH),x86_64) > PERF_ARCH=x86 > else > -PERF_ARCH=$(KERNEL_ARCH) > +PERF_ARCH=$(NORMALIZED_ARCH) > endif > > PERF_MAKE_FLAGS = \ > diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in > index c4e5bf0fea..b824c11bd6 100644 > --- a/package/linux-tools/linux-tool-selftests.mk.in > +++ b/package/linux-tools/linux-tool-selftests.mk.in > @@ -6,13 +6,13 @@ > > LINUX_TOOLS += selftests > > -ifeq ($(KERNEL_ARCH),x86_64) > +ifeq ($(NORMALIZED_ARCH),x86_64) > SELFTESTS_ARCH=x86 > else > -ifeq ($(KERNEL_ARCH),i386) > +ifeq ($(NORMALIZED_ARCH),i386) > SELFTESTS_ARCH=x86 > else > -SELFTESTS_ARCH=$(KERNEL_ARCH) > +SELFTESTS_ARCH=$(NORMALIZED_ARCH) > endif > endif > > diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk > index b2c8e7e001..4ad88991f2 100644 > --- a/package/olsr/olsr.mk > +++ b/package/olsr/olsr.mk > @@ -27,10 +27,10 @@ OLSR_PLUGINS += pud > endif > > define OLSR_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ > + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(NORMALIZED_ARCH) \ > CFLAGS="$(OLSR_CFLAGS)" -C $(@D) olsrd > $(foreach p,$(OLSR_PLUGINS), \ > - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ > + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(NORMALIZED_ARCH) \ > CFLAGS="$(OLSR_CFLAGS)" -C $(@D)/lib/$(p) > ) > endef > diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk > index 9b83b62b55..67defcc743 100644 > --- a/package/pciutils/pciutils.mk > +++ b/package/pciutils/pciutils.mk > @@ -12,7 +12,7 @@ PCIUTILS_LICENSE = GPL-2.0+ > PCIUTILS_LICENSE_FILES = COPYING > PCIUTILS_MAKE_OPTS = \ > CROSS_COMPILE="$(TARGET_CROSS)" \ > - HOST="$(KERNEL_ARCH)-linux" \ > + HOST="$(NORMALIZED_ARCH)-linux" \ > OPT="$(TARGET_CFLAGS)" \ > LDFLAGS="$(TARGET_LDFLAGS)" \ > DNS=no \ > diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk > index 8963d6182e..d60aaa7668 100644 > --- a/package/uboot-tools/uboot-tools.mk > +++ b/package/uboot-tools/uboot-tools.mk > @@ -206,14 +206,14 @@ $(eval $(host-generic-package)) > MKIMAGE = $(HOST_DIR)/bin/mkimage > > # mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86 > -# KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa > -# For arm64, arc, xtensa we'll just keep KERNEL_ARCH > +# NORMALIZED_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa > +# For arm64, arc, xtensa we'll just keep NORMALIZED_ARCH > # For mips64, we'll just keep mips > # For i386 and x86_64, we need to convert This part needs to be fixed due to a recent change. Best regards, Romain > -ifeq ($(KERNEL_ARCH),x86_64) > +ifeq ($(NORMALIZED_ARCH),x86_64) > MKIMAGE_ARCH = x86 > -else ifeq ($(KERNEL_ARCH),i386) > +else ifeq ($(NORMALIZED_ARCH),i386) > MKIMAGE_ARCH = x86 > else > -MKIMAGE_ARCH = $(KERNEL_ARCH) > +MKIMAGE_ARCH = $(NORMALIZED_ARCH) > endif > From thomas.petazzoni at bootlin.com Thu Jan 13 21:12:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:12:03 +0100 Subject: [Buildroot] [git commit] package/pahole: new host package Message-ID: <20220113213356.3AB1B828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddba0ef6b1e8e407c44bb1036a75aecaeb89da92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pahole is a tool used to show data structure embedded in debugging information formats like DWARF. It is notably needed by the Linux kernel to generate BPF Type Format (BTF) information used by Compile Once - Run Everywhere (CO-RE) BPF tools. To be built, pahole needs __LIB to be set to lib at stated in its README. Signed-off-by: Francis Laniel Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in.host | 1 + package/pahole/Config.in.host | 6 ++++++ package/pahole/pahole.hash | 3 +++ package/pahole/pahole.mk | 18 ++++++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a17e828aa5..a91e2dfcde 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -971,6 +971,9 @@ N: Floris Bos F: package/ipmitool/ F: package/odhcploc/ +N: Francis Laniel +F: package/pahole/ + N: Francisco Gonzalez F: package/ser2net/ diff --git a/package/Config.in.host b/package/Config.in.host index c390ae3e7d..20034f6ee0 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -61,6 +61,7 @@ menu "Host utilities" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host" source "package/opkg-utils/Config.in.host" + source "package/pahole/Config.in.host" source "package/parted/Config.in.host" source "package/patchelf/Config.in.host" source "package/pigz/Config.in.host" diff --git a/package/pahole/Config.in.host b/package/pahole/Config.in.host new file mode 100644 index 0000000000..e427629632 --- /dev/null +++ b/package/pahole/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_PAHOLE + bool "host pahole" + help + Pahole and other DWARF utils. + + https://git.kernel.org/pub/scm/devel/pahole/pahole.git diff --git a/package/pahole/pahole.hash b/package/pahole/pahole.hash new file mode 100644 index 0000000000..420db15e75 --- /dev/null +++ b/package/pahole/pahole.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cde85af68b368f50a913be387f94f6b43612a04af6c92387b4dcabb712a668fe pahole-v1.23-br1.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pahole/pahole.mk b/package/pahole/pahole.mk new file mode 100644 index 0000000000..1ad937062d --- /dev/null +++ b/package/pahole/pahole.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# pahole +# +################################################################################ + +PAHOLE_VERSION = v1.23 +PAHOLE_SITE = git://git.kernel.org/pub/scm/devel/pahole/pahole.git +PAHOLE_SITE_METHOD = git +# pahole contains git submodule and relies on them to be built. +PAHOLE_GIT_SUBMODULES = YES +HOST_PAHOLE_DEPENDENCIES = host-elfutils +# Defining __LIB is needed to build pahole. +HOST_PAHOLE_CONF_OPTS = -D__LIB=lib +PAHOLE_LICENSE = GPL-2.0 +PAHOLE_LICENSE_FILES = COPYING + +$(eval $(host-cmake-package)) From thomas.petazzoni at bootlin.com Thu Jan 13 21:23:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:23:27 +0100 Subject: [Buildroot] [git commit] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE Message-ID: <20220113213356.427FB82753@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2da2f359dba50aafef1202edda34374d99b77a14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CONFIG_DEBUG_BTF_INFO relies on pahole, so kernel DWARF are converted to BTF. If CONFIG_DEBUG_BTF_INFO is set and BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE not, an error message is shown and .config is not written. Signed-off-by: Francis Laniel Signed-off-by: Thomas Petazzoni --- linux/Config.in | 12 ++++++++++++ linux/linux.mk | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index 891e2cdcb6..582f37ba7c 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -470,6 +470,18 @@ config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". +config BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE + bool "Needs host pahole" + help + Some Linux kernel configuration options (such as + CONFIG_DEBUG_INFO_BTF) require building a host program + called pahole. Enabling this option will ensure host-pahole + gets built before the Linux kernel. + + Enable this option if you get a Linux kernel build failure + such as "BTF: .tmp_vmlinux.btf: pahole (pahole) is not + available". + # Linux extensions source "linux/Config.ext.in" diff --git a/linux/linux.mk b/linux/linux.mk index 61fdc0c76c..dd2eebd446 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -114,6 +114,17 @@ ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y) LINUX_DEPENDENCIES += host-elfutils host-pkgconf endif +ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE),y) +LINUX_DEPENDENCIES += host-pahole +else +define LINUX_FIXUP_CONFIG_PAHOLE_CHECK + if grep -q "^CONFIG_DEBUG_INFO_BTF=y" $(KCONFIG_DOT_CONFIG); then \ + echo "To use CONFIG_DEBUG_INFO_BTF, enable host-pahole (BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE)" 1>&2; \ + exit 1; \ + fi +endef +endif + # If host-uboot-tools is selected by the user, assume it is needed to # create a custom image ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y) @@ -324,6 +335,7 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_DISABLE_OPT,$(opt)) ) $(LINUX_FIXUP_CONFIG_ENDIANNESS) + $(LINUX_FIXUP_CONFIG_PAHOLE_CHECK) $(if $(BR2_arm)$(BR2_armeb), $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI)) $(if $(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le), From thomas.petazzoni at bootlin.com Thu Jan 13 21:40:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:40:35 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/pahole: new host package In-Reply-To: <20211222174905.71902-2-flaniel@linux.microsoft.com> References: <20211222174905.71902-1-flaniel@linux.microsoft.com> <20211222174905.71902-2-flaniel@linux.microsoft.com> Message-ID: <20220113224035.6423fb12@windsurf> On Wed, 22 Dec 2021 18:49:04 +0100 Francis Laniel wrote: > pahole is a tool used to show data structure embedded in debugging information > formats like DWARF. > It is notably needed by the Linux kernel to generate BPF Type Format (BTF) > information used by Compile Once - Run Everywhere (CO-RE) BPF tools. > > To be built, pahole needs __LIB to be set to lib at stated in its README. > > Signed-off-by: Francis Laniel > --- > DEVELOPERS | 3 +++ > package/Config.in.host | 1 + > package/pahole/Config.in.host | 6 ++++++ > package/pahole/pahole.hash | 3 +++ > package/pahole/pahole.mk | 18 ++++++++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/pahole/Config.in.host > create mode 100644 package/pahole/pahole.hash > create mode 100644 package/pahole/pahole.mk Applied to master with some minor formatting tweaks reported by "make check-package". Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:41:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:41:26 +0100 Subject: [Buildroot] [PATCH v2 2/2] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE In-Reply-To: <20211222174905.71902-3-flaniel@linux.microsoft.com> References: <20211222174905.71902-1-flaniel@linux.microsoft.com> <20211222174905.71902-3-flaniel@linux.microsoft.com> Message-ID: <20220113224126.6b0801dd@windsurf> Hello, On Wed, 22 Dec 2021 18:49:05 +0100 Francis Laniel wrote: > CONFIG_DEBUG_BTF_INFO relies on pahole, so kernel DWARF are converted to BTF. > If CONFIG_DEBUG_BTF_INFO is set and BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE not, > an error message is shown and .config is not written. > > Signed-off-by: Francis Laniel Thanks, applied, with one change. > diff --git a/package/pahole/Config.in.host b/package/pahole/Config.in.host > index e427629632..521874961b 100644 > --- a/package/pahole/Config.in.host > +++ b/package/pahole/Config.in.host > @@ -3,4 +3,6 @@ config BR2_PACKAGE_HOST_PAHOLE > help > Pahole and other DWARF utils. > > + Select this if you want to build a kernel with CONFIG_DEBUG_INFO_BTF set. > + I've dropped this, because it's not really this option that should be enabled if the kernel is configured with CONFIG_DEBUG_INFO_BTF, but the BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE option. Thanks for your contribution! Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:42:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:42:52 +0100 Subject: [Buildroot] [PATCH] board/broadcom: add support for bcm47xx platform devices In-Reply-To: <20211021085540.18764-1-zajec5@gmail.com> References: <20211021085540.18764-1-zajec5@gmail.com> Message-ID: <20220113224252.0a46e30b@windsurf> Hello Rafa?, On Thu, 21 Oct 2021 10:55:40 +0200 Rafa? Mi?ecki wrote: > From: Rafa? Mi?ecki > > Broadcom's bcm47xx is a family of MIPS SoCs going back to the 2002 and > including e.g. Linksys WRT54G with its BCM4702. It evolved through years > and its latest model BCM4706 is still in use nowadays. > > Pretty much all SoCs contain all following components: > 1. CPU > 2. PCIe controller(s) > 3. Ethernet interface(s) > 4. USB controllers > 5. Serial flash controller > 6. GPIO controller (for LEDs and buttons) > 7. Watchdog > > Upstream kernel includes a pretty much complete support for bcm47xx but > it isn't DTS based. Board detection is handled on runtime so there is > one kernel image to serve all. > > Bootloader used in those devices is CFE. It allows booting kernel over > tftp and flashing firmwares using TRX format. It isn't properly open > sourced (except some early versions) and in practice it's irreplaceable. > > This commit adds support for building a bootable kernel based on 5.4 > stable release: > Starting program at 0x80001000 > Linux version 5.4.155 (rmilecki at localhost.localdomain) (gcc version 10.3.0 (Buildroot 2021.08-930-gc0c925605d)) #5 Thu Oct 21 10:16:20 CEST 2021 > > Linux 5.10 doesn't start booting due to some regression that remains to > be debugged. Adding support for building full images (including rootfs) > is also planned for the future. > > Signed-off-by: Rafa? Mi?ecki > --- > board/broadcom/bcm47xx/linux.config | 28 ++++++++++++++++++++++++++++ > configs/broadcom_bcm47xx_defconfig | 8 ++++++++ > 2 files changed, 36 insertions(+) > create mode 100644 board/broadcom/bcm47xx/linux.config > create mode 100644 configs/broadcom_bcm47xx_defconfig Thanks for this contribution, but it doesn't seem to be really useful as it is: the root filesystem generated as a tarball is not even used, and there is no readme.txt. We prefer to have directly useful defconfig files. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:45:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:45:31 +0100 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20211024113931.88898-1-gilles.talis@gmail.com> References: <20211024113931.88898-1-gilles.talis@gmail.com> Message-ID: <20220113224531.6f9ac64a@windsurf> Hello Gilles, On Sun, 24 Oct 2021 13:39:31 +0200 Gilles Talis wrote: > The NanoPi R2S is a FriendlyElec mini-router based on: > > - Rockchip RK3328 SoC > - 1GB (or 2GB) DDR4 RAM > - Gigabit Ethernet (WAN) > - Gigabit Ethernet (USB3) (LAN) > - USB 2.0 Host Port > - MicroSD slot > - Reset button > - WAN - LAN - SYS LED > > https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 > > Signed-off-by: Gilles Talis This obviously looks very good, but there is one question: could you drop the VFAT partition, and have the kernel, DTB and extlinux.conf be directly in the ext4 partition, with U-Boot loading them from the ext4 partition directly? This would simplify things a bit. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 21:50:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 22:50:56 +0100 Subject: [Buildroot] [PATCH RFC] package/binutils: build deterministic archives by default In-Reply-To: <20210929220027.10505-1-romain.naour@gmail.com> References: <20210929220027.10505-1-romain.naour@gmail.com> Message-ID: <20220113225056.52fdda1d@windsurf> Hello Romain, On Thu, 30 Sep 2021 00:00:27 +0200 Romain Naour wrote: > The option --enable-deterministic-archives that build deterministic > archives is supported by binutils since binutils 2.23 [1][2]. > > See "Static libraries" chapter [3]. > https://reproducible-builds.org/docs/archives/ > > Enable this option for target and host variant. > > It was added to Yocto Morty (2.2) in 2016 [4]. > > [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2e30cb575a1d2b1eb8f776356ed59b0722a943d1 > [2] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=9cb80f72d8b8b2f59562692d9385cd5a533e9b3f > [3] https://reproducible-builds.org/docs/archives > [4] https://github.com/openembedded/openembedded-core/commit/df0d525c02780b5a0bd7a177a249c55f41797476 > > Signed-off-by: Romain Naour The drawback of this approach is that it doesn't address the problem for external toolchains, which have not necessarily been built with --enable-deterministic-archives. We could either pass -D in TARGET_AR (but of course that is subject to packages obeying to that), or we could extend the toolchain wrapper to also cover the ar tool ? For this to be worth the effort, it would be useful to get some actual case where this is causing a problem. Indeed, in Buildroot, we don't really care about the reproducibility of .a archives themselves. So unless their lack of reproducibility trickles down to the statically-linked executables that result from using those .a, I'm not sure this is really worth it. I'll mark the patch as Changes Requested, but feel free to disagree and put it back in the New state. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From zajec5 at gmail.com Thu Jan 13 21:56:45 2022 From: zajec5 at gmail.com (=?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?=) Date: Thu, 13 Jan 2022 22:56:45 +0100 Subject: [Buildroot] [PATCH] board/broadcom: add support for bcm47xx platform devices In-Reply-To: <20220113224252.0a46e30b@windsurf> References: <20211021085540.18764-1-zajec5@gmail.com> <20220113224252.0a46e30b@windsurf> Message-ID: On 13.01.2022 22:42, Thomas Petazzoni wrote: > Thanks for this contribution, but it doesn't seem to be really useful > as it is: the root filesystem generated as a tarball is not even used, > and there is no readme.txt. We prefer to have directly useful defconfig > files. Thank you for your feedback, I'm still "learning" buildroot. I aim to upstream 3 Broadcom platforms support and I already learnt about kernel + rootfs + readme.txt in another patch review. I didn't send V2 for bcm47xx yet, I plan to get back to working on it once I (hopefully) get: [PATCH V2] board/broadcom: add support for BCM4908 platform devices accepted (V2 or another one). I want to learn on 1 platform and then get other ones. So I'll work on bcm47xx V2 a bit later. From yann.morin.1998 at free.fr Thu Jan 13 21:58:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 22:58:05 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: References: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> Message-ID: <20220113215805.GM1477939@scaer> Arnout, All, On 2022-01-12 21:42 +0100, Arnout Vandecappelle spake thusly: > On 08/01/2022 18:35, Yann E. MORIN wrote: > >Some files contain hard-coded absolute paths that point to the host > >and/or staging directories. > > > >With per-package directories (aka. PPD), these paths point to the PPD > >of the package that created the files, when we want them to point to the > >PPD of the package that uses them. [--SNIP--] > >+define PPD_FIXUP_PATHS > >+ $(Q)grep -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ > This will trawl to large binary files and potentially take a long time... I too thought of that, and I even discussed it slightly with Peter K. here about what would be most efficient: grep-then-file, or file-then-grep? But if we add --binary-files=without-match to grep, then it will bail-out early on binary files, which would be more efficient. And then we still pass that through file to really get only text files. But a text-file with utf8 is really a binary file, so would grep ignore it? > >+ |while read -d '' f; do \ > >+ file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ > ... just to be ignored here. Again, not sure, because text/plain but utf8-encoded? > More importantly though: if a file is a symlink, it's going to be hit > twice. No, I don't think so: $ man grep [..] -r, --recursive Read all files under each directory, recursively, following symbolic links only if they are on the command line. [...] And that seems to be the case: $ echo Pouet >foo $ ln -s foo bar $ grep -r Pouet . foo:Pouet So, seems OK to me? > Worse, if it's a symlink to an absolute path (which most likely > points *outside* of STAGING_DIR), we may end up sed'ing something on the > host... > I notice now that the same (theoretical) issue exists in relocate-sdk.sh. > Obviously that script doesn't get thoroughly tested so it may very well be > the wrong thing to do... > > Do you remember perhaps why we don't simply do > > find $(HOST_DIR) -type f -print0 \ Maybe we should. But grep -r was an elegant way to combine the recursive feature of find, and limit to the matching files at the same time... I can try to time things to see what's the fastest / less-slow... But given that the symlinks are not an issue in practice, so we care? > ? I was going to say that we can skip the grep, but then we're back at the > large (text) file thing. > > >+ printf '%s\0' "$${f}"; \ > > Why not do the sed right here, like is done in relocate-sdk.sh? In fact, > I'd keep the code as close as possible to relocate-sdk.sh to make later > refactoring easier. Using xarg allows to spawn only a few sed. printf is a shell built-in so it's basically free. [--SNIP--] > > define FIXUP_PYTHON_SYSCONFIGDATA > Maybe rename to REMOVE_PYTHON_SYSCONFIGATA_PYC OK Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Thu Jan 13 22:05:01 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 13 Jan 2022 23:05:01 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <20210518113652.29609-4-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> Message-ID: <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> Hi Thomas, Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > There are cases where a 64-bit architecture is running a 64-bit kernel but > 32-bit userspace. Examples include: > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to > the 32-bit architecture, but the kernel needs to be built with the 64-bit > architecture. > > Make it possible to define the correct architecture to be used for the > kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is > expected to know the valid values. > > Signed-off-by: Thomas De Schampheleire > --- > Makefile | 4 ++++ > arch/Config.in | 15 +++++++++++++++ > 2 files changed, 19 insertions(+) > > diff --git a/Makefile b/Makefile > index c5399e9a35..d09cf7c958 100644 > --- a/Makefile > +++ b/Makefile > @@ -434,7 +434,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > # Strip off the annoying quoting > ARCH := $(call qstrip,$(BR2_ARCH)) > NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > +else > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) > +endif > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > BZCAT := $(call qstrip,$(BR2_BZCAT)) > diff --git a/arch/Config.in b/arch/Config.in > index 7575acf48c..c82100f541 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -329,6 +329,21 @@ config BR2_ARCH > config BR2_KERNEL_ARCH > string > > +config BR2_KERNEL_ARCH_OVERRIDE > + string "Kernel architecture override" Maybe it would be better to add architecture dependencies here (BR2_ARCH_IS_64) > + help > + Normally, the correct kernel architecture value is derived > + from the selected architecture, and you should keep this > + option empty. > + However, there are cases where you may want to enter a custom > + value, for example when using a 64-bit architecture but > + running userspace in 32-bit mode. > + As an example, in case of an x86_64 processor where you want > + 32-bit userspace, BR2_ARCH will be 'i386'/'i486'/'i686' and > + BR2_KERNEL_ARCH_OVERRIDE should be set to 'x86_64'. Note that > + in this example you will also need a multilib toolchain and > + pass '-m32' via BR2_TARGET_OPTIMIZATION. Adding -m32 will force the mulitilib toolchain to produce 32bits binary. But -m64 is also added to the toolchain wrapper for x86_64. Mixing -m64 and -m32 doesn't seems a good idea. Best regards, Romain > + > config BR2_ENDIAN > string > > From thomas.petazzoni at bootlin.com Thu Jan 13 22:10:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:10:56 +0100 Subject: [Buildroot] [git commit] board/raspberrypicm4io: enable RTC and USB overlays Message-ID: <20220113220600.6F5588348E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31ed653166a45eda2403e311a3996b5df59d6775 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The CM4 IO Board is equipped with an on-board RTC connected over I2C, and has USB 2.0 host ports. This commit loads the appropriate overlays to enable both. The USB 2.0 interface is by default disabled on CM4 to reduce the power consumption so it needs to be explicitly enabled on the CM4 IO Board to use the USB ports. Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- board/raspberrypi/config_cm4io.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/raspberrypi/config_cm4io.txt b/board/raspberrypi/config_cm4io.txt index 01f60395b3..cf7e6df1a1 100644 --- a/board/raspberrypi/config_cm4io.txt +++ b/board/raspberrypi/config_cm4io.txt @@ -24,3 +24,10 @@ gpu_mem_1024=100 # fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console dtoverlay=miniuart-bt + +# enable RTC +dtparam=i2c_vc=on +dtoverlay=i2c-rtc,pcf85063a,i2c_csi_dsi + +# enable dwc2 USB controller (USB 2.0) +dtoverlay=dwc2,dr_mode=host From thomas.petazzoni at bootlin.com Thu Jan 13 22:12:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:12:11 +0100 Subject: [Buildroot] [git commit] board/raspberrypicm4io-64: enable RTC and USB overlays Message-ID: <20220113220600.774B681392@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7cf67fc940264e2ad6e60eaa914a214df9b81d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The CM4 IO Board is equipped with an on-board RTC connected over I2C, and has USB 2.0 host ports. This commit loads the appropriate overlays to enable both. The USB 2.0 interface is by default disabled on CM4 to reduce the power consumption so it needs to be explicitly enabled on the CM4 IO Board to use the USB ports. Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- board/raspberrypi/config_cm4io_64bit.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/raspberrypi/config_cm4io_64bit.txt b/board/raspberrypi/config_cm4io_64bit.txt index 6cd8a729cd..813f6eba7b 100644 --- a/board/raspberrypi/config_cm4io_64bit.txt +++ b/board/raspberrypi/config_cm4io_64bit.txt @@ -25,6 +25,13 @@ gpu_mem_1024=100 # fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console dtoverlay=miniuart-bt +# enable RTC +dtparam=i2c_vc=on +dtoverlay=i2c-rtc,pcf85063a,i2c_csi_dsi + +# enable dwc2 USB controller (USB 2.0) +dtoverlay=dwc2,dr_mode=host + # enable 64bits support arm_64bit=1 From thomas.petazzoni at bootlin.com Thu Jan 13 22:13:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:13:22 +0100 Subject: [Buildroot] [PATCH v5 2/6] board/raspberrypicm4io: enable RTC and USB overlays In-Reply-To: <20210921202137.7092-2-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> <20210921202137.7092-2-ps.report@gmx.net> Message-ID: <20220113231322.7c8b978f@windsurf> On Tue, 21 Sep 2021 22:21:33 +0200 Peter Seiderer wrote: > - add RTC and USB dtoverlay entries to config_cm4io.txt > > Signed-off-by: Peter Seiderer > --- > Changes v4 -> v5: > - new patch > --- > board/raspberrypi/config_cm4io.txt | 7 +++++++ > 1 file changed, 7 insertions(+) I have applied to master, after extending the commit log with more details that explain the change. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 22:13:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:13:48 +0100 Subject: [Buildroot] [PATCH v5 3/6] board/raspberrypicm4io-64: enable RTC and USB overlays In-Reply-To: <20210921202137.7092-3-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> <20210921202137.7092-3-ps.report@gmx.net> Message-ID: <20220113231348.678e302f@windsurf> On Tue, 21 Sep 2021 22:21:34 +0200 Peter Seiderer wrote: > - add RTC and USB dtoverlay entries to config_cm4io_64bit.txt > > Signed-off-by: Peter Seiderer I have applied to master, after extending the commit log with more details that explain the change. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Jan 13 22:14:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 13 Jan 2022 23:14:38 +0100 Subject: [Buildroot] [PATCH v2, 1/2] Revert "package/log4cxx: select boost chrono and date-time with gcc < 7" In-Reply-To: <20211121145741.1fa4dffb@windsurf> References: <20211119175553.2413433-1-fontaine.fabrice@gmail.com> <20211121145741.1fa4dffb@windsurf> Message-ID: <20220113231438.5aa8742e@windsurf> Hello Fabrice, On Sun, 21 Nov 2021 14:57:41 +0100 Thomas Petazzoni wrote: > On Fri, 19 Nov 2021 18:55:52 +0100 > Fabrice Fontaine wrote: > > > This reverts commit 3c2245cb65741c965f4bb87d35ac3c64f250a1ae to move > > these selects on boost side as the build failure was raised with gcc >= > > 7 (making this commit a "no-op"). Indeed, the build failure is raised > > with cmake < 3.21.3, because cmake assumed that boost thread depends on > > date-time until > > https://github.com/Kitware/CMake/commit/1ad0c5ae53fc0c4f774166337f0e9c93c578cf9b. > > I don't understand why you say this commit is a no-op. It clearly > isn't. In gcc < 7.x configurations, this commit ensures that boost > chrono and boost date-time are selected. > > The fact that you realize later that the build failure occurred with > gcc >= 7.x, meaning this commit does not help fixing the issue does not > make this commit a no-op. Do you have some feedback/comment on the above questions? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at gmail.com Thu Jan 13 22:15:00 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 13 Jan 2022 23:15:00 +0100 Subject: [Buildroot] [PATCH 4/4] perf: fix compilation in case of i386 userspace with x86_64 kernel In-Reply-To: <20210518113652.29609-5-patrickdepinguin@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-5-patrickdepinguin@gmail.com> Message-ID: <55296fff-7a19-3691-22e2-52095bc5cc47@gmail.com> Hello Thomas, Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit?: > From: Thomas De Schampheleire > > If a 64-bit kernel is combined with 32-bit userspace, and this is achieved > via a multilib toolchain that defaults to 64-bit with '-m32' in > BR2_TARGET_OPTIMIZATION, the '-ld' command will still default to > 64-bit output. > > In this case, packages that use 'ld' directly need to be instructed to use > the correct ABI via the '-m' parameter. 'perf' is one such package. > > Signed-off-by: Thomas De Schampheleire > --- > package/linux-tools/linux-tool-perf.mk.in | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > index 4e28129f50..b84b5fd415 100644 > --- a/package/linux-tools/linux-tool-perf.mk.in > +++ b/package/linux-tools/linux-tool-perf.mk.in > @@ -45,6 +45,9 @@ PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32ltsmipn32" > else > PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf64ltsmip" > endif > +# case for x86 toolchain that defaults to 64-bit output > +else ifeq ($(BR2_i386):$(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),y:x86_64) > +PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf_i386" Do you know why the ARM toolchain doesn't need a similar handling ? Best regards, Romain > endif > > # The call to backtrace() function fails for ARC, because for some > From yann.morin.1998 at free.fr Thu Jan 13 22:33:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 13 Jan 2022 23:33:15 +0100 Subject: [Buildroot] [PATCH V2] board/broadcom: add support for BCM4908 platform devices In-Reply-To: <20211220045213.2210-1-zajec5@gmail.com> References: <20211220045213.2210-1-zajec5@gmail.com> Message-ID: <20220113223315.GN1477939@scaer> Rafa?, All, On 2021-12-20 05:52 +0100, Rafa? Mi?ecki spake thusly: > From: Rafa? Mi?ecki > > BCM4908 is Broadcom's 64-bit platform with Broadcom's own Brahma-B53 > CPU(s). It's mostly used for home routers. > > Kernel config is a minimal setup required to support on-SoC blocks like > NAND controller, Ethernet, switch, USB. > > To make kernels 5.12+ boot those boards require a hacky patch modifying > hyp-stub.S. That booting problem will hopefully get fixes on day in > upstream kernel code. > > There are many BCM4908 devices and all of them can be supported with the > same kernel & rootfs. For that reason this board compiles DTB files for > all 3 upstream supported devices. Compiling DTS files is cheap and it > saves duplicating the same board code for every supported board. > > BCM4908 devices use Broadcom's own CFE bootloader which isn't properly > opensourced. Available CFE sources are very old and cover only some > ancient MIPS devices. > > Signed-off-by: Rafa? Mi?ecki > --- [--SNIP--] > diff --git a/board/broadcom/bcm4908/linux.config b/board/broadcom/bcm4908/linux.config > new file mode 100644 > index 0000000000..446a0bdf83 > --- /dev/null > +++ b/board/broadcom/bcm4908/linux.config > @@ -0,0 +1,41 @@ > +CONFIG_BLK_DEV_INITRD=y > +CONFIG_ARCH_BCM4908=y The in-tree arm64 defconfig has support for CONFIG_ARCH_BCM4908, so can't we use that in-tree defconfig rather than carry a custom config file? If it's just because some drivers are missing, maybe provide them as a config fragment with just the symbols for those drivers. > diff --git a/board/broadcom/bcm4908/patches/linux/0001-arm64-don-t-issue-HVC-on-boot.patch b/board/broadcom/bcm4908/patches/linux/0001-arm64-don-t-issue-HVC-on-boot.patch > new file mode 100644 > index 0000000000..32e2b6330b > --- /dev/null > +++ b/board/broadcom/bcm4908/patches/linux/0001-arm64-don-t-issue-HVC-on-boot.patch > @@ -0,0 +1,32 @@ > +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= > +Date: Thu, 12 Aug 2021 11:52:42 +0200 > +Subject: [PATCH] arm64: don't issue HVC on boot > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit Please use a git-formated patch, which you get with: git format-patch --no-numbered [--SNIP--] > diff --git a/board/broadcom/bcm4908/readme.txt b/board/broadcom/bcm4908/readme.txt > new file mode 100644 > index 0000000000..b918ab8477 > --- /dev/null > +++ b/board/broadcom/bcm4908/readme.txt > @@ -0,0 +1,37 @@ > +BCM4908 > + > +Intro > +===== > + > +This readme covers BCM4908 family of Broadcom SoCs. It includes: > + - BCM4906 > + - BCM4908 > + - BCM49408 > + > +BCM4908 is commonly used in home routers by multiple vendors. > + > +Booting is handled using closed source CFE bootloader. There is no U-Boot (or > +any other) drop-in replacement. CFE supports booting over TFTP and from flash. Out of curiosity, and definitely not needed for that patch: is there no way to chain-boot? I.e. have CFE load a U-Boot, adn then that U-Boot load kernel and so on. > +How to build it > +=============== > + > + $ make broadcom_bcm4908_defconfig > + > + $ make > + > +How to boot using TFTP > +====================== > + > +When set into h (host) / c (tftp) mode CFE tries to boot image from a TFTP I am not sure I grasped what this "h (host) / c (tftp) mode" means. Can we expect users who have such a board to understand that? > +server. That allows booting buildroot built binaries. There are 3 files CFE > +looks for: kernel (Image), rootfs (cpio) and DTB. Exact filenames depend on CFE > +configuration. I would maybe add something like: Inspect the logs of your TFTP server to see what files are requested. Otherwise I think this readme is good. > +Booting from TFTP requires sharing 3 above files in TFTP server root dir. > + > +How to write to flash > +===================== > + > +Writing to flash requires using a custom BCM4908 firmware image format. It isn't > +supported yet. > diff --git a/configs/broadcom_bcm4908_defconfig b/configs/broadcom_bcm4908_defconfig > new file mode 100644 > index 0000000000..85307af053 > --- /dev/null > +++ b/configs/broadcom_bcm4908_defconfig > @@ -0,0 +1,9 @@ > +BR2_aarch64=y > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13.9" You will need to pin the linux-headers to that version too: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y However, why do you want to stick to 5.13.x? Can't we use a more recent version (5.15, or even the brand new 5.16)? Regards, Yann E. MORIN. > +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/broadcom/bcm4908/linux.config" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm4908/bcm4906-netgear-r8000p broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1 broadcom/bcm4908/bcm4908-asus-gt-ac5300" > +BR2_TARGET_ROOTFS_CPIO=y > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From festevam at gmail.com Thu Jan 13 23:14:46 2022 From: festevam at gmail.com (Fabio Estevam) Date: Thu, 13 Jan 2022 20:14:46 -0300 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220113220057.1db30808@windsurf> References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: Hi Heiko, On Thu, Jan 13, 2022 at 6:01 PM Thomas Petazzoni wrote: > Have you considered using extlinux.conf ? This is generally much easier > than a boot script, and removes the need to generate the boot script. I used your patch as a reference and modified it as per Thomas' suggestions to add Buildroot support for imx8mm-evk using only upstream components. Please find attached the patch. I haven't submitted it formally yet because the kernel does not always boot. Usually, it hangs at: mmc1 is current device Scanning mmc 1:1... Found /boot/extlinux/extlinux.conf Retrieving file: /boot/extlinux/extlinux.conf 1: imx8mm-evk-buildroot Retrieving file: /boot/Image append: root=/dev/mmcblk0p1 rootwait rw Retrieving file: /boot/imx8mm-evk.dtb Moving Image from 0x40480000 to 0x40600000, end=42770000 ## Flattened Device Tree blob at 43000000 Booting using the fdt blob at 0x43000000 Loading Device Tree to 000000004fff5000, end 000000004ffffd6b ... OK Starting kernel ... (hangs here) Looks like a U-Boot issue that I need to investigate. Thanks for your patch and hope this helps. -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-imx8mmevkmainline.patch Type: text/x-patch Size: 4730 bytes Desc: not available URL: From fontaine.fabrice at gmail.com Thu Jan 13 23:26:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 00:26:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-rtsp-server: fix introspection In-Reply-To: <20220113220429.3ae14160@windsurf> References: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> <20220113220429.3ae14160@windsurf> Message-ID: Le jeu. 13 janv. 2022 ? 22:04, Thomas Petazzoni a ?crit : > > Hello Fabrice, > > On Mon, 20 Dec 2021 10:33:11 +0100 > Fabrice Fontaine wrote: > > > Fix the following build failure with introspection: > > > > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 > > Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir > > error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 > > If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > > > Fixes: > > - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 > > > > Signed-off-by: Fabrice Fontaine > > Thanks applied, but see below. > > > +Signed-off-by: Fabrice Fontaine > > +[Upstream status: > > +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] > > You've had some feedback about resubmitting to the monorepo (which I > suppose is the new single repo that gstreamer developers are using > now). If not already done, could you follow-up on this? It is already merged: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/e637aae629f5b95b748a6f23abecc2b502272822 > > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From fontaine.fabrice at gmail.com Thu Jan 13 23:29:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 00:29:03 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/gensio: add avahi optional dependency Message-ID: <20220113232903.318853-1-fontaine.fabrice@gmail.com> avahi-client is an optional dependency which is enabled by default since version 2.2.0 and https://github.com/cminyard/gensio/commit/5ab117c9743fd4719f610cf9f1ba45023cc25d7c Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Use BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT package/gensio/gensio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 389de1e263..266ac137a2 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING GENSIO_INSTALL_STAGING = YES +GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),avahi) GENSIO_CONF_OPTS = \ --without-openipmi \ --without-swig \ -- 2.34.1 From aperez at igalia.com Thu Jan 13 23:37:58 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 14 Jan 2022 01:37:58 +0200 Subject: [Buildroot] [PATCH 1/1] package/kf5/kf5-extra-cmake-modules: do not build documentation Message-ID: <20220113233758.110264-1-aperez@igalia.com> Pass needed CMake options to disable generating documentations. The documentation is built using python-sphinx, which is not packaged in Buildroot. Prior to this change, if the build host would have a Python installation with the sphinx module installed the automatic detection tried to build documentation, which would fail in cases where the sphinxcontrib-qthelp package is missing from the host Python installation. The error message in this case was: Extension error: Could not import extension ecm (exception: cannot import name 'htmlescape' from 'sphinx.util.pycompat' (/usr/lib/python3.10/site-packages/sphinx/util/pycompat.py)) Signed-off-by: Adrian Perez de Castro --- .../kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk index 3c4281b960..ba2748456e 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk @@ -14,4 +14,9 @@ KF5_EXTRA_CMAKE_MODULES_DEPENDENCIES = host-pkgconf KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO +KF5_EXTRA_CMAKE_MODULES_CONF_OPTS += \ + -DBUILD_HTML_DOCS=OFF \ + -DBUILD_MAN_DOCS=OFF \ + -DBUILD_QTHELP_DOCS=OFF + $(eval $(cmake-package)) -- 2.34.1 From buildroot at busybox.net Thu Jan 13 23:42:27 2022 From: buildroot at busybox.net (buildroot at busybox.net) Date: 13 Jan 2022 15:42:27 -0800 Subject: [Buildroot] Waiting for the payment 13.1.2022 15:42:27 Message-ID: <20220113154227.F458BECF9A8A956A@busybox.net> An HTML attachment was scrubbed... URL: From buildroot at busybox.net Fri Jan 14 01:54:59 2022 From: buildroot at busybox.net (buildroot at busybox.net) Date: 13 Jan 2022 17:54:59 -0800 Subject: [Buildroot] Waiting for the payment 13.1.2022 17:54:59 Message-ID: <20220113175459.B99CEEE621D0B65E@busybox.net> An HTML attachment was scrubbed... URL: From festevam at gmail.com Fri Jan 14 02:45:55 2022 From: festevam at gmail.com (Fabio Estevam) Date: Thu, 13 Jan 2022 23:45:55 -0300 Subject: [Buildroot] [PATCH v2] configs/imx8mmevk: new defconfig Message-ID: <20220114024555.319448-1-festevam@gmail.com> Add support for imx8mmevk_defconfig that allows booting kernel, U-Boot and TFA from the upstream repositories. Signed-off-by: Fabio Estevam --- Changes since v1: - Also use TF-A and U-Boot upstream versions. DEVELOPERS | 1 + board/freescale/imx8mmevk/genimage.cfg | 16 ++++++++ board/freescale/imx8mmevk/readme.txt | 6 +++ .../boot/extlinux/extlinux.conf | 4 ++ configs/imx8mmevk_defconfig | 39 +++++++++++++++++++ 5 files changed, 66 insertions(+) create mode 100644 board/freescale/imx8mmevk/genimage.cfg create mode 100644 board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf create mode 100644 configs/imx8mmevk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 12777e8d61..e19072a14e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -839,6 +839,7 @@ F: configs/imx6ullevk_defconfig F: configs/imx6ulpico_defconfig F: configs/imx7d-sdb_defconfig F: configs/imx7dpico_defconfig +F: configs/imx8mmevk_defconfig F: configs/imx8mqevk_defconfig F: configs/mx25pdk_defconfig F: configs/mx51evk_defconfig diff --git a/board/freescale/imx8mmevk/genimage.cfg b/board/freescale/imx8mmevk/genimage.cfg new file mode 100644 index 0000000000..3a83aa1f03 --- /dev/null +++ b/board/freescale/imx8mmevk/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33k + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 8M + } +} diff --git a/board/freescale/imx8mmevk/readme.txt b/board/freescale/imx8mmevk/readme.txt index 7b69405d30..a8e80a48f9 100644 --- a/board/freescale/imx8mmevk/readme.txt +++ b/board/freescale/imx8mmevk/readme.txt @@ -10,8 +10,14 @@ Build First, configure Buildroot for the i.MX8MM EVK board: +If you want to use the NXP kernel: + make freescale_imx8mmevk_defconfig +Or if you want to use a mainline kernel: + + make imx8mmevk_defconfig + Build all components: make diff --git a/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..0ba2e4cbfc --- /dev/null +++ b/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +Label imx8mm-evk-buildroot + kernel /boot/Image + devicetree /boot/imx8mm-evk.dtb + append root=/dev/mmcblk1p1 rootwait rw diff --git a/configs/imx8mmevk_defconfig b/configs/imx8mmevk_defconfig new file mode 100644 index 0000000000..170b8d273b --- /dev/null +++ b/configs/imx8mmevk_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_OVERLAY="board/freescale/imx8mmevk/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/imx8mmevk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="240M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30890000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y -- 2.25.1 From festevam at gmail.com Fri Jan 14 02:47:27 2022 From: festevam at gmail.com (Fabio Estevam) Date: Thu, 13 Jan 2022 23:47:27 -0300 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: On Thu, Jan 13, 2022 at 8:14 PM Fabio Estevam wrote: > I haven't submitted it formally yet because the kernel does not always boot. > > Usually, it hangs at: > > mmc1 is current device > Scanning mmc 1:1... > Found /boot/extlinux/extlinux.conf > Retrieving file: /boot/extlinux/extlinux.conf > 1: imx8mm-evk-buildroot > Retrieving file: /boot/Image > append: root=/dev/mmcblk0p1 rootwait rw > Retrieving file: /boot/imx8mm-evk.dtb > Moving Image from 0x40480000 to 0x40600000, end=42770000 > ## Flattened Device Tree blob at 43000000 > Booting using the fdt blob at 0x43000000 > Loading Device Tree to 000000004fff5000, end 000000004ffffd6b ... OK > > Starting kernel ... > (hangs here) > > Looks like a U-Boot issue that I need to investigate. With kernel 5.15.14 it boots fine, so I submitted the patch with 5.15 instead of 5.16. I will investigate the 5.16 boot problem later. From james.hilliard1 at gmail.com Fri Jan 14 04:51:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 13 Jan 2022 21:51:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220113204451.23849f67@windsurf> References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220113204451.23849f67@windsurf> Message-ID: On Thu, Jan 13, 2022 at 12:44 PM Thomas Petazzoni wrote: > > Hello James, > > On Wed, 12 Jan 2022 13:39:39 -0700 > James Hilliard wrote: > > > Currently the qmake gcc sysrootify path logic causes issues with > > per-package directories, disable automatic gcc sysroot for qt5base > > install and override all qt.conf paths manually to point to their > > correct locations. > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > instead of the HOST_DIR for cross compilation to work. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > package/qt5/qt5base/qt5base.mk | 2 ++ > > 2 files changed, 17 insertions(+), 3 deletions(-) > > Do you have a bit more details on what this changing, i.e how this is > making things better? > > I have no doubt that it can make things better, but it would be useful > in the commit log to have extra details on what specific > details/aspects it is fixing/improving. Well it seems to prevent invalid paths causing these errors: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 > > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From doug at schmorgal.com Fri Jan 14 05:07:33 2022 From: doug at schmorgal.com (Doug Brown) Date: Thu, 13 Jan 2022 21:07:33 -0800 Subject: [Buildroot] [PATCH 1/2] package/rtl8723bu: bump to version 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 Message-ID: <20220114050734.497034-1-doug@schmorgal.com> This version fixes a bug that prevents the user from switching from one access point to another. Signed-off-by: Doug Brown --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 04bc776a07..1dad7154b4 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz +sha256 1cd658742ce10b21c92877e09cecc98880680d5f150de3845553005abc542977 rtl8723bu-19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index c35fad5832..e490bddf09 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 +RTL8723BU_VERSION = 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) -- 2.25.1 From doug at schmorgal.com Fri Jan 14 05:07:34 2022 From: doug at schmorgal.com (Doug Brown) Date: Thu, 13 Jan 2022 21:07:34 -0800 Subject: [Buildroot] [PATCH 2/2] package/rtl8723bu: fix firmware install path In-Reply-To: <20220114050734.497034-1-doug@schmorgal.com> References: <20220114050734.497034-1-doug@schmorgal.com> Message-ID: <20220114050734.497034-2-doug@schmorgal.com> The rtl8723b_fw.bin file installed by this package is not actually used by this driver at all. It is used by the btrtl Bluetooth driver in the mainline kernel. The mainline btrtl driver looks for the file in /lib/firmware/rtl_bt rather than /lib/firmware/rtlwifi. This driver's Makefile has an install target that confirms the correct destination firmware directory. Signed-off-by: Doug Brown --- package/rtl8723bu/rtl8723bu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index e490bddf09..838bbedb74 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -13,7 +13,7 @@ RTL8723BU_MODULE_MAKE_OPTS = \ KSRC=$(LINUX_DIR) define RTL8723BU_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtlwifi/rtl8723b_fw.bin + $(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723b_fw.bin endef $(eval $(kernel-module)) -- 2.25.1 From jose.pekkarinen at unikie.com Fri Jan 14 05:50:29 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?Q?Jos=C3=A9_Pekkarinen?=) Date: Fri, 14 Jan 2022 07:50:29 +0200 Subject: [Buildroot] [PATCH] package/minijail: new package In-Reply-To: <20220113205129.585e3ce6@windsurf> References: <20220113100506.89687-1-jose.pekkarinen@unikie.com> <20220113205129.585e3ce6@windsurf> Message-ID: On Thu, Jan 13, 2022 at 9:51 PM Thomas Petazzoni wrote: > > Hello Jos?, > > Thanks for this new iteration! Comments below. > > On Thu, 13 Jan 2022 12:05:06 +0200 > Jos? Pekkarinen wrote: > > > This patch adds package minijail > > > > Minijail depends in a toolchain different from > > uclibc thanks to it's lack of support for prlimits. > > > > Signed-off-by: Jos? Pekkarinen > > --- > > [ v1 -> v2 ] > > - Fixed hash file > > - Fixed static assert patch > > - Depend in toolchain distinct of uclibc > > - Remove redundant host libpcap dependency > > - Remove redundant parenthesis on MINIJAIL_BUILD_CMDS > > If this is v2, your patch should have been generated with "git > format-patch -v2", so that its title is [PATCH v2] and not just [PATCH]. Ack. > > diff --git a/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch > > new file mode 100644 > > index 0000000000..ff85995114 > > --- /dev/null > > +++ b/package/minijail/0001-Substitute-static_assert-with-_Static_assert.patch > > @@ -0,0 +1,35 @@ > > +From 8a6d5a1c48b85fb49f0d68ec31ecc51fd22e7201 Mon Sep 17 00:00:00 2001 > > +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= > > +Date: Wed, 12 Jan 2022 17:09:27 +0200 > > +Subject: [PATCH] Substitute static_assert with _Static_assert > > +MIME-Version: 1.0 > > +Content-Type: text/plain; charset=UTF-8 > > +Content-Transfer-Encoding: 8bit > > + > > +Substitute static_assert with _Static_assert > > + > > +static_assert behaves differently for uclibc > > +toolchains. Substituting it with the standard > > +_Static_assert builds on all toolchains tested. > > So this is fixing a problem affecting uClibc toolchains, and below you > exclude uClibc toolchains ? Does it make sense to have this patch ? Ack. > > diff --git a/package/minijail/Config.in b/package/minijail/Config.in > > new file mode 100644 > > index 0000000000..24d307ed54 > > --- /dev/null > > +++ b/package/minijail/Config.in > > @@ -0,0 +1,12 @@ > > +config BR2_PACKAGE_MINIJAIL > > + bool "minijail" > > + depends on !BR2_STATIC_LIBS # dlopen() > > + depends on !BR2_TOOLCHAIN_USES_UCLIBC > > Please add a comment on top of this that explains why uClibc toolchains > are excluded (prlimit not implemented). Ack. > > + select BR2_PACKAGE_LIBCAP > > You need to replicate: > > depends on BR2_USE_MMU > > from the list of libcap dependencies. > > > + help > > + Minijail is a sandboxing tool maintained by google. > > + > > + https://google.github.io/minijail/ > > + > > +comment "minijail needs a glibc or musl toolchain with dynamic library support" > > and also have it here. Ack. > > + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC > > diff --git a/package/minijail/minijail.hash b/package/minijail/minijail.hash > > new file mode 100644 > > index 0000000000..d9f497a86c > > --- /dev/null > > +++ b/package/minijail/minijail.hash > > @@ -0,0 +1,5 @@ > > +# Locally computed from https://github.com/google/minijail/releases/ > > +sha256 1ee5a5916491a32c121c7422b4d8c16481c0396a3acab34bf1c44589dcf810ae linux-v17.tar.gz > > + > > +# Locally computed > > +sha256 c6f439c5cf07263f71f01d29b79c79172ee529088e51ab434b22baad0988fe57 LICENSE > > diff --git a/package/minijail/minijail.mk b/package/minijail/minijail.mk > > new file mode 100644 > > index 0000000000..78898865fb > > --- /dev/null > > +++ b/package/minijail/minijail.mk > > @@ -0,0 +1,28 @@ > > +################################################################################ > > +# > > +# minijail > > +# > > +################################################################################ > > + > > +MINIJAIL_VERSION = linux-v17 > > +MINIJAIL_SOURCE = $(MINIJAIL_VERSION).tar.gz > > +MINIJAIL_SITE = "https://github.com/google/minijail/archive/refs/tags" > > Please use the following lines instead: > > MINIJAIL_VERSION = 17 > MINIJAIL_SITE = $(call github,google,minijail,linux-v$(MINIJAIL_VERSION)) > > You will have to adjust the .hash file accordingly. > > > +MINIJAIL_LICENSE = BSD-Style > > This is not a license. See https://spdx.org/licenses/ for the list of > license identifiers that are valid. It's license doesn't reference any hint to the existing in spdx, identifying an equivalent is lawyers work. > > +MINIJAIL_LICENSE_FILES = LICENSE > > +MINIJAIL_DEPENDENCIES=libcap > > Spaces around "=". Ack. > > +define MINIJAIL_BUILD_CMDS > > + cd $(@D); \ > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) CC="$(TARGET_CC)" > > No need to cd into $(@D), since you run make with -C $(@D). Please drop > the $(d) which is an empty variable. Also please use > $(TARGET_CONFIGURE_OPTS). So something like this: > > $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) > > I'm pretty sure I already made this comment on a previous version, or > perhaps on another package contributed by you. Yes, sorry, I failed to find the email related. > Could you take into account those comments and send a v3 ? It should be > good to merge then. Thanks a lot! Happy to do so. Thanks! Jos?. From thomas.petazzoni at bootlin.com Fri Jan 14 07:03:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 14 Jan 2022 07:03:58 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-13 Message-ID: <20220114070403.55225415AD@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-13 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 64 | 7 | 0 | 71 | 2021.11.x | 24 | 10 | 0 | 34 | master | 100 | 64 | 0 | 164 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 10 bluez5_utils-5.63 | 7 unknown | 7 frr-8.1 | 5 guile-3.0.7 | 3 ksmbd-tools-3.4.3 | 3 btrfs-progs-5.15.1 | 2 host-riscv-isa-sim-1.1.0 | 2 libglvnd-1.3.2 | 2 libqb-2.0.3 | 2 mesa3d-21.3.3 | 2 wavemon-0.9.4 | 2 babeltrace2-2.0.4 | 1 dnsmasq-2.86 | 1 docker-proxy-55685ba49593e6... | 1 efl-1.26.0 | 1 gstd-0.13.0 | 1 gupnp-av-0.14.0 | 1 gvfs-1.48.1 | 1 host-btrfs-progs-5.15.1 | 1 libwpe-1.12.0 | 1 log4cxx-0.12.0 | 1 nodejs-14.18.2 | 1 piglit-2affee53f3ad7a96f5b3... | 1 poppler-21.12.0 | 1 pulseview-0.4.2 | 1 rtorrent-0.9.8 | 1 sg3_utils-1.47 | 1 vlc-3.0.16 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | babeltrace2-2.0.4 | NOK | http://autobuild.buildroot.net/results/f9ea3f142d7ccce481cfc6daa47ae641c3f11402 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/881d4d30080eeec4de252c0c06b7914ea5f7d6a8 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/eb5c4d9f8c0b915bc46f4ef8ad9e89a21b6aec24 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e2d5ec0be1e760bb361958c6ebf1e480b900c259 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e28801b8053e9d2a7a9609a6bbf415c17a206788 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d79f46c3c7be7e52fa4642446b15b27a8ebdd32a | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/23bddbd290d13196c6bd0d2514353d0eb2604a4e | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/542f372a0dd342a1b22371d21ce347c0ba88a8e3 | mips64el | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/e0526b8591a20c5db13814fb166d459b87bb1ea7 | ORPH powerpc64 | btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/b630dbd078656a974c6ac9645b2e87279ef2adc0 | ORPH arm | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/ecf26d37f2aefa35e584a4f23f053119b4fb4704 | i686 | docker-proxy-55685ba49593e6... | NOK | http://autobuild.buildroot.net/results/36ebb9ace8b69120e696ccc1688c5d695125f462 | mipsel | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/03c24622c043c949ec7a743f9515f70ef9421594 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/c37813bda8f69c3b8eabd9a77f63998f0511d407 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/76372be625e03d09f3f54e613d1e2a77138cbee8 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5bc31d1e6aab27eb7f05e32f891cf40014f8cdbc | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/85ac84b34946609895e47d435aef61f410781dbd | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/bdbaa6155ff57ab01d2b4cb52de813a1ea528b02 | m68k | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/2f1214b2af494e51874e6cfd419cd4c6c5c0d3ac | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/696e89593e9fdaa97dd4fb192e77cf87169414d9 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/b0a6143f19145b00a1023271207676255427cbf0 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c7790a1799868bd03952a69d20b2c592fd546217 | ORPH s390x | gupnp-av-0.14.0 | NOK | http://autobuild.buildroot.net/results/64837bf9611377fe1935c6ff4e52715b58ed75ed | arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/9922ac2d5301db3a6e9a735078914f9f7861428c | ORPH i686 | host-btrfs-progs-5.15.1 | NOK | http://autobuild.buildroot.net/results/5cba551bde76ebe1749a278497a04a6d69e7b7c6 | ORPH powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/63c7c2466b8269a2708ba6a2ad7ee11b6f03e88c | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/d1ec407d3a9106be1271e4897d6f578d501439fe | arm | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/afd519cb2bd8e4505746f7f809cf309d0ca9901e | sh4 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/9794b9a72bcdc23a60f745dfb2b783d3421dd62d | riscv64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/638c303be9fa82ccb353be6cfe2a81c0d634a1e5 | sparc | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/a204953020a714057ec6690e63a3ad8ac621acd5 | ORPH arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/1dca9af43b534c537d8ab922d40ffc1635556333 | ORPH or1k | libqb-2.0.3 | NOK | http://autobuild.buildroot.net/results/6a8c4efd591929b9b22d793cc8f6249e6ae9045d | or1k | libqb-2.0.3 | NOK | http://autobuild.buildroot.net/results/e03782073fae2b1bde84393a73be5cbd59d67d9d | aarch64 | libwpe-1.12.0 | NOK | http://autobuild.buildroot.net/results/fdca71061eb938599e356fe6eed5f58a90d62259 | arc | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/6058173d7997a5632f80f33a1eba9dec47122095 | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/e4946b1c214fa30cfc63ba41755a7fb4c4661fc1 | mipsel | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/6433628db38e3828f2d37cf48ac7a19d0b6c441c | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/a510dfcc34fa12a8c0911525a1ecd6bef7402fc5 | mipsel | piglit-2affee53f3ad7a96f5b3... | NOK | http://autobuild.buildroot.net/results/ff6efa43102a56bb4b87401cd425a5241f0920cd | microblazeel | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/96e77ddba5042ba4dacb16b328fc298a4f00f49a | arm | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/9a7d48c3bb1cafe537d6e5a2be3da8a447a80b03 | arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/c8c8669281265d21fab8029b1f793fe93ef857b9 | ORPH aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c5094c1088f21eccc8ce463fbf86282a19bc2bac | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/aa20d0b3dd74957cfd72dc314b9a40e449eaa6cd | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/347f87cbc46f1207c9f075b580920b98338ea9a6 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6df8e78f518f912eb37266026de07856e9bb7b29 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d8a78ea616cdedd9cfd6c31da98ecf509acea40a | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/148c21e0207fef3afaaf0e10cfd5f3b50a7a4a09 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2972885ea76b1c9dc98b7d963b9b9ecb7721c082 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9a33fb68c758678843f439ee402ef8ff2a7d74ff | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/47f303c17b848d33afd9e41fe29816e18671d984 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b839f8b4dc06ebf42fa9a75e4887cb27ca20fdc4 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/c49300d12a209b18f41d389f092324592b881277 | arm | unknown | NOK | http://autobuild.buildroot.net/results/8bc3414169520fe6a06297cd819c16b5fa614c30 | arc | unknown | NOK | http://autobuild.buildroot.net/results/599263067fbb2c334289d4899c0e7a07cc46de80 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/ec70ce7988b9e78cdecd9cba1ae4ee6de948e48e | arm | unknown | NOK | http://autobuild.buildroot.net/results/7f7e97f14537db0b0fcbc48514c07876867a9cd3 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/95cd4e8faa4e1ca3c60df173232f39aa51cc4508 | arc | unknown | NOK | http://autobuild.buildroot.net/results/93cb507002b852523f29ba84bf42645d10f6642b | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/60db7598fc7b80f983b97b66c3a3ea24ff8756e6 | m68k | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/62a9d11157c283e4e1f26b6e0d097e40c9c5e29d | mips | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/3b4b22e0a5e5486b444cb0bb835c08f05255fa9b | m68k | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/d5f88660cbc0854b6690e004e3c409038224f971 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 1 libcoap-4.2.1 | 1 netdata-1.21.1 | 1 openal-1.20.1 | 1 rocksdb-6.13.3 | 1 suricata-6.0.4 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c415a502fc2672528a1a8ba1c62591e9d8ff1a17 | riscv32 | libcoap-4.2.1 | NOK | http://autobuild.buildroot.net/results/f775ea0d8062da0707cd64ba851a8cd2f87a5de8 | riscv32 | netdata-1.21.1 | NOK | http://autobuild.buildroot.net/results/845e6fd2797d85cafae5bdb2fe8074e3714d7d66 | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/13b16d0e88dbd87ec34e5413caa22c0cf320b0d9 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/790a270c6ccd2d4f5cf0dc329733e62124caddfc | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/0c02128071d73b026f8f23bd6f4837689946c1d3 | arm | unknown | NOK | http://autobuild.buildroot.net/results/8677a4bf0f00e7a87538fd0d2488fcf681d4c2f1 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 4 libnss-3.73 | 2 libqmi-1.30.2 | 1 ndisc6-1.0.5 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/0308d2757a677fff4a8880b239cd7f6183b87b1c | powerpc | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/d02000b72a5855239d7f2121158feb7c9b81edb4 | riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/a54f1533f81ef29e8eb65045eb6ac68d6ce92ea3 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/58f5c33e930a614dfc120e07f83cbc6af284de0e | or1k | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/2f8ad346f317dbf8f3370e3e9707be29fb26e872 | aarch64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/53189d7bef3601bc8a118697aad08135565d7174 | xtensa | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/78c6b80c06f17ffffefa50ab0615295468705512 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/4e5db1f5be1e0a1864f0246de502dff1d4b1f0bc | ORPH riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/4e40ba10f6039e674e2cfdfa5d9b1c112d12d749 | microblazeel | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/3a94ac6f9bc57cd71979021b423af71dc1f4a4c5 | -- http://autobuild.buildroot.net From jose.pekkarinen at unikie.com Fri Jan 14 07:08:52 2022 From: jose.pekkarinen at unikie.com (=?UTF-8?q?Jos=C3=A9=20Pekkarinen?=) Date: Fri, 14 Jan 2022 09:08:52 +0200 Subject: [Buildroot] [PATCH v4] package/opensc: new package Message-ID: <20220114070852.481719-1-jose.pekkarinen@unikie.com> The patch will add package opensc. sourcery-arm toolchain triggers strict aliasing rules that upstream finds no easy way to fix. It is disabled for now until a proper solution is found upstream. Signed-off-by: Jos? Pekkarinen --- [ v1 -> v2 ] Fix hash file, and patches messages. [ v2 -> v3 ] - Remove strict aliasing patch - Add approved patch for maybe uninitialized errors - Disable sourcery-arm toolchain [ v3 -> v4 ] - Enable libressl - Added cascade dependencies - disabled strict building DEVELOPERS | 1 + package/Config.in | 1 + .../0001-Fix-maybe-uninitialized-errors.patch | 83 +++++++++++++++++++ package/opensc/Config.in | 17 ++++ package/opensc/opensc.hash | 5 ++ package/opensc/opensc.mk | 15 ++++ 6 files changed, 122 insertions(+) create mode 100644 package/opensc/0001-Fix-maybe-uninitialized-errors.patch create mode 100644 package/opensc/Config.in create mode 100644 package/opensc/opensc.hash create mode 100644 package/opensc/opensc.mk diff --git a/DEVELOPERS b/DEVELOPERS index 55f37dfe62..45e7192e65 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1515,6 +1515,7 @@ F: support/testing/tests/package/test_zfs.py N: Jos? Pekkarinen F: package/alfred/ F: package/bmx7/ +F: package/opensc/ F: package/python-aexpect/ F: package/softhsm2/ F: support/testing/tests/package/sample_python_aexpect.py diff --git a/package/Config.in b/package/Config.in index a1924f96df..b40909ef89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1643,6 +1643,7 @@ menu "Hardware handling" source "package/mtdev/Config.in" source "package/ne10/Config.in" source "package/neardal/Config.in" + source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" source "package/rpi-rgb-led-matrix/Config.in" diff --git a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch new file mode 100644 index 0000000000..01b7a39818 --- /dev/null +++ b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch @@ -0,0 +1,83 @@ +From bcb39d6f4d2dee6beb035cb2f3618174ec1cb2b0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 13:54:26 +0200 +Subject: [PATCH] Fix maybe uninitialized errors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PR: https://github.com/OpenSC/OpenSC/pull/2466 + +Signed-off-by: Jos? Pekkarinen +--- + src/libopensc/pkcs15-coolkey.c | 12 ++++++------ + src/pkcs15init/pkcs15-asepcos.c | 2 +- + src/tools/opensc-explorer.c | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c +index 586475dd..15684cef 100644 +--- a/src/libopensc/pkcs15-coolkey.c ++++ b/src/libopensc/pkcs15-coolkey.c +@@ -147,9 +147,9 @@ coolkey_find_matching_cert(sc_card_t *card, sc_cardctl_coolkey_object_t *in_obj, + static int + coolkey_get_attribute_ulong(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, CK_ULONG *value) + { +- const u8 *val; +- size_t val_len; +- u8 data_type; ++ const u8 *val = NULL; ++ size_t val_len = 0; ++ u8 data_type = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, &data_type); +@@ -168,8 +168,8 @@ static int + coolkey_get_attribute_boolean(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE attr_type) + { + int r; +- const u8 *val; +- size_t val_len; ++ const u8 *val = NULL; ++ size_t val_len = 0; + + r = coolkey_get_attribute(card, obj, attr_type, &val, &val_len, NULL); + if (r < 0) { +@@ -186,7 +186,7 @@ static int + coolkey_get_attribute_bytes(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, u8 *data, size_t *data_len, size_t max_data_len) + { + const u8 *val; +- size_t val_len; ++ size_t val_len = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, NULL); +diff --git a/src/pkcs15init/pkcs15-asepcos.c b/src/pkcs15init/pkcs15-asepcos.c +index d7122012..bc0efb5c 100644 +--- a/src/pkcs15init/pkcs15-asepcos.c ++++ b/src/pkcs15init/pkcs15-asepcos.c +@@ -221,7 +221,7 @@ static int asepcos_do_store_pin(sc_profile_t *profile, sc_card_t *card, + { + sc_file_t *nfile = NULL; + u8 buf[64], sbuf[64], *p = buf, *q = sbuf; +- int r, akn; ++ int r, akn = 0; + + if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) + return SC_ERROR_OBJECT_NOT_VALID; +diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c +index 9ec4daa1..04efdf8f 100644 +--- a/src/tools/opensc-explorer.c ++++ b/src/tools/opensc-explorer.c +@@ -2472,7 +2472,7 @@ int main(int argc, char *argv[]) + char *line; + int cargc; + char *cargv[260]; +- int multiple; ++ int multiple = 0; + struct command *cmd; + char prompt[3*SC_MAX_PATH_STRING_SIZE]; + +-- +2.25.1 + diff --git a/package/opensc/Config.in b/package/opensc/Config.in new file mode 100644 index 0000000000..1b1ba0d38e --- /dev/null +++ b/package/opensc/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_OPENSC + bool "opensc" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_PCSC_LITE + select BR2_PACKAGE_OPENSSL + help + OpenSC provides a set of libraries and utilities to work + with smart cards. + + https://github.com/OpenSC/OpenSC/wiki + +comment "opensc needs a toolchain with dynamic library support distinct from sourcery-arm" + depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash new file mode 100644 index 0000000000..517cfe503a --- /dev/null +++ b/package/opensc/opensc.hash @@ -0,0 +1,5 @@ +# Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ +sha256 8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 opensc-0.22.0.tar.gz + +# Computed locally +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk new file mode 100644 index 0000000000..c948bc2c79 --- /dev/null +++ b/package/opensc/opensc.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# opensc +# +################################################################################ + +OPENSC_VERSION = 0.22.0 +OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) +OPENSC_LICENSE = LGPL-2.1+ +OPENSC_LICENSE_FILES = COPYING +OPENSC_DEPENDENCIES = openssl pcsc-lite +OPENSC_INSTALL_STAGING = YES +OPENSC_CONF_OPTS="--disable-strict" + +$(eval $(autotools-package)) -- 2.25.1 From fontaine.fabrice at gmail.com Fri Jan 14 07:43:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 08:43:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglvnd: needs threads Message-ID: <20220114074309.356873-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 0378e2e5d9ce9d5676975dfbff501360094fdc1a: In file included from ../src/util/glvnd_pthread.c:39: ../src/util/glvnd_pthread.h:33:10: fatal error: pthread.h: No such file or directory 33 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/63624bafc6f7a225d4db0667df977fd6141561aa Signed-off-by: Fabrice Fontaine --- package/libglvnd/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index cd19fde582..d020c21465 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBGLVND bool "libglvnd" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS help The GL Vendor-Neutral Dispatch library @@ -45,6 +46,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES endif -comment "libglvnd needs a toolchain w/ dynamic library" +comment "libglvnd needs a toolchain w/ dynamic library, threads" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS -- 2.34.1 From giulio.benetti at benettiengineering.com Fri Jan 14 08:45:06 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 14 Jan 2022 09:45:06 +0100 Subject: [Buildroot] [PATCH] package/poppler: fix build failure due to gcc bug 68485 Message-ID: <20220114084506.776644-1-giulio.benetti@benettiengineering.com> The bullet package exhibits gcc bug 68485 when built for the Microblaze architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_68485=y like we already do for BR2_TOOLCHAIN_HAS_GCC_BUG_85180=y. Fixes: http://autobuild.buildroot.net/results/96e77ddba5042ba4dacb16b328fc298a4f00f49a/ Signed-off-by: Giulio Benetti --- package/poppler/poppler.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 9e9bfc9cba..18c044a9f6 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -131,4 +131,12 @@ else POPPLER_CONF_OPTS += -DUSE_FLOAT=ON endif +POPPLER_CXXFLAGS = $(TARGET_CXXCFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +POPPLER_CXXFLAGS += -O0 +endif + +POPPLER_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(POPPLER_CXXFLAGS)" + $(eval $(cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 14 09:15:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 14 Jan 2022 02:15:52 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix pkg-config prefix Message-ID: <20220114091552.3815459-1-james.hilliard1@gmail.com> By default qmake generates pkg-config files with QT_INSTALL_PREFIX as the prefix, this however contains a full sysroot path which breaks per-package directories, use the override QMAKE_PKGCONFIG_PREFIX to set the pkg-config prefix to /usr. Signed-off-by: James Hilliard --- package/qt5/qt5base/qmake.conf.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index 024c074928..03bd825c8a 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -8,6 +8,9 @@ include(../common/linux_device_pre.conf) +# fix pkg-config prefix +QMAKE_PKGCONFIG_PREFIX = /usr + # modifications to g++-unix.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ -- 2.25.1 From aperez at igalia.com Fri Jan 14 09:26:35 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 14 Jan 2022 11:26:35 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: add upstream patch to fix vapigen support In-Reply-To: <20220113174130.GI1477939@scaer> References: <20220113115704.2354150-1-aperez@igalia.com> <20220113174130.GI1477939@scaer> Message-ID: <20220114112635.GB546958@momiji> Hello Yann, On Thu, 13 Jan 2022 18:41:30 +0100 "Yann E. MORIN" wrote: > On 2022-01-13 13:57 +0200, Adrian Perez de Castro spake thusly: > > Import an upstream patch which fixes a typo in the Meson source code > > which caused a wrong command line option to be passed to the vapigen > > program. This fixes the build for all packages which use Meson and > > provide API bindings generated using said tool. > > > > Signed-off-by: Adrian Perez de Castro > > --- > > ...x-typo-in-vapigen-option-metadatadir.patch | 31 +++++++++++++++++++ > > 1 file changed, 31 insertions(+) > > create mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > > > > diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > > new file mode 100644 > > index 0000000000..f8cc30ec29 > > --- /dev/null > > +++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch > > @@ -0,0 +1,31 @@ > > +From 5385e4c0a4dd4f9cf1e15c9c321b22d19cc0011a Mon Sep 17 00:00:00 2001 > > +From: Michal Vasilek > > +Date: Mon, 10 Jan 2022 21:27:30 +0100 > > +Subject: [PATCH] gnome: fix typo in vapigen option metadatadir > > + > > +This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and > > +can cause a build failure, because --metadatdir is not a valid vapigen > > +option. > > + > > +Signed-off-by: Adrian Perez de Castro > > +Upstream-Status: https://github.com/mesonbuild/meson/pull/9806 > > When an upstream PR/MR has been merged, we prefer that an actual > backport is made, so that the patch has the proper upstream hash, > which helps in the future ases if a version bump includes that > commit. > > So I've made that a proper backport: > > $ git format-patch -n1 --start-number=3 --no-numbered 9952446a2 Neat Git command, today I have learnt about a few things that format-patch can do! Thanks for merging both this and the gcr patch :) Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From patrickdepinguin at gmail.com Fri Jan 14 09:33:18 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Fri, 14 Jan 2022 10:33:18 +0100 Subject: [Buildroot] [PATCH 4/4] perf: fix compilation in case of i386 userspace with x86_64 kernel In-Reply-To: <55296fff-7a19-3691-22e2-52095bc5cc47@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-5-patrickdepinguin@gmail.com> <55296fff-7a19-3691-22e2-52095bc5cc47@gmail.com> Message-ID: Hi Romain, El jue, 13 ene 2022 a las 23:17, Romain Naour () escribi?: > > Hello Thomas, > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > If a 64-bit kernel is combined with 32-bit userspace, and this is achieved > > via a multilib toolchain that defaults to 64-bit with '-m32' in > > BR2_TARGET_OPTIMIZATION, the '-ld' command will still default to > > 64-bit output. > > > > In this case, packages that use 'ld' directly need to be instructed to use > > the correct ABI via the '-m' parameter. 'perf' is one such package. > > > > Signed-off-by: Thomas De Schampheleire > > --- > > package/linux-tools/linux-tool-perf.mk.in | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > > index 4e28129f50..b84b5fd415 100644 > > --- a/package/linux-tools/linux-tool-perf.mk.in > > +++ b/package/linux-tools/linux-tool-perf.mk.in > > @@ -45,6 +45,9 @@ PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32ltsmipn32" > > else > > PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf64ltsmip" > > endif > > +# case for x86 toolchain that defaults to 64-bit output > > +else ifeq ($(BR2_i386):$(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),y:x86_64) > > +PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf_i386" > > Do you know why the ARM toolchain doesn't need a similar handling ? If you are referring to the ARM toolchain that I am using, then yes. For Aarch64, it seems not possible to produce a multilib toolchain supporting ARM (32-bit) and Aarch64 (64-bit). I don't know the details about why. In order to support that case, we actually pack two separate toolchains into one 'toolchain' archive, and point Buildroot to the 32-bit one (the top-level directories bin/ lib/ etc. correspond to the 32-bit one). For Linux/u-boot we specifically point to the 64-bit toolchain. So since they are separate toolchains, there is no '-m32' anywhere: either toolchain has a fixed bitness. How we could handle this situation in Buildroot is to be discussed. These changes are not in this series. Best regards, Thomas From michael.opdenacker at bootlin.com Fri Jan 14 09:30:49 2022 From: michael.opdenacker at bootlin.com (Michael Opdenacker) Date: Fri, 14 Jan 2022 10:30:49 +0100 Subject: [Buildroot] [PATCH] linux: clarify BR2_LINUX_KERNEL_CUSTOM_DTS_PATH description Message-ID: <20220114093049.2380117-1-michael.opdenacker@bootlin.com> This clarifies that custom DTSI files can be passed too, and that the files are compiled after being copied to the Linux kernel source tree. Signed-off-by: Michael Opdenacker --- linux/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 582f37ba7c..048a7fbfd0 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -411,9 +411,10 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH string "Out-of-tree Device Tree Source file paths" help - Path to the out-of-tree device tree source files. - You can provide a list of dts paths to copy and - build, separated by spaces. + 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 compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" -- 2.25.1 From heiko.thiery at gmail.com Fri Jan 14 09:39:26 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 14 Jan 2022 10:39:26 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: Hi Fabio, Am Fr., 14. Jan. 2022 um 00:14 Uhr schrieb Fabio Estevam : > > Hi Heiko, > > On Thu, Jan 13, 2022 at 6:01 PM Thomas Petazzoni > wrote: > > > Have you considered using extlinux.conf ? This is generally much easier > > than a boot script, and removes the need to generate the boot script. > > I used your patch as a reference and modified it as per Thomas' > suggestions to add Buildroot support for imx8mm-evk using only > upstream components. > > Please find attached the patch. > > I haven't submitted it formally yet because the kernel does not always boot. Can you tell me how often this happens? I updated my defconfig with the comments from Thomas. Now I bootet the board with that several times and can not see the behavior you describe. > > Usually, it hangs at: > > mmc1 is current device > Scanning mmc 1:1... > Found /boot/extlinux/extlinux.conf > Retrieving file: /boot/extlinux/extlinux.conf > 1: imx8mm-evk-buildroot > Retrieving file: /boot/Image > append: root=/dev/mmcblk0p1 rootwait rw > Retrieving file: /boot/imx8mm-evk.dtb > Moving Image from 0x40480000 to 0x40600000, end=42770000 > ## Flattened Device Tree blob at 43000000 > Booting using the fdt blob at 0x43000000 > Loading Device Tree to 000000004fff5000, end 000000004ffffd6b ... OK > > Starting kernel ... > (hangs here) > > Looks like a U-Boot issue that I need to investigate. > > Thanks for your patch and hope this helps. Your welcome, -- Heiko From heiko.thiery at gmail.com Fri Jan 14 09:42:34 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 14 Jan 2022 10:42:34 +0100 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220113220057.1db30808@windsurf> References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: Hi Thomas, Am Do., 13. Jan. 2022 um 22:00 Uhr schrieb Thomas Petazzoni : > > Hello, > > On Wed, 12 Jan 2022 19:48:22 +0100 > Heiko Thiery wrote: > > > diff --git a/board/kontron/bl-imx8mm/boot.cmd b/board/kontron/bl-imx8mm/boot.cmd > > new file mode 100644 > > index 0000000000..7ce3198dbc > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/boot.cmd > > @@ -0,0 +1,8 @@ > > +echo "Root File Sytem on MMC${devnum}" > > +setenv rootfs /dev/mmcblk${devnum}p1 > > +setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} > > + > > +load ${devtype} ${devnum} ${kernel_addr_r} boot/Image > > +load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mm-kontron-n801x-s.dtb > > + > > +booti ${kernel_addr_r} - ${fdt_addr_r} > > Have you considered using extlinux.conf ? This is generally much easier > than a boot script, and removes the need to generate the boot script. I will switch to extlinux. > > > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > new file mode 100644 > > index 0000000000..ed088dd0f8 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > @@ -0,0 +1,28 @@ > > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > > +From: Heiko Thiery > > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > > I suppose the U-Boot patches are on their way upstream? The patches are already posted upstream: https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > > > diff --git a/board/kontron/bl-imx8mm/post-image.sh b/board/kontron/bl-imx8mm/post-image.sh > > new file mode 100755 > > index 0000000000..564211c829 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/post-image.sh > > @@ -0,0 +1,3 @@ > > +#!/bin/sh > > + > > +support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg > > Could you call support/scripts/genimage.sh directly as the post-image > script, using the BR2_ROOTFS_POST_SCRIPT_ARGS to pass the -c ... > argument? We already do that in many defconfigs. Ok > > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > + > > +BR2_PACKAGE_FREESCALE_IMX=y > > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > > +BR2_PACKAGE_FIRMWARE_IMX=y > > + > > +# Filesystem / image > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > + > > +# Bootloader > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > > +BR2_TARGET_UBOOT_SPL=y > > + > > +# Required host tools to create the SD/eMMC image > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > > You need FIT support ? No .. I will remove it. > > > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/bl-imx8mm/boot.cmd" > > These would no longer be needed if switching to extlinux.conf. Ok. I will prepare and test the new version. Thanks. -- Heiko From nolange79 at gmail.com Fri Jan 14 10:12:45 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Fri, 14 Jan 2022 11:12:45 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/mkusers: allow option for system uid/gid Message-ID: <20220114101247.342256-1-nolange79@gmail.com> Some software decides based on uid/gid whether a user is a system or normal/human user, with differnt behaviour for those flavors (example journald [2]). So adding logic to create system-users is necessary, we take the now common ranges from [1]. This extends the mkusers script to allow -2 for uid/gid, this argument will take an identifier from the system range. System/user ranges are added as variables, and the argument for user/system uid was added as variable aswell. Thus some magic constants could be removed, some further occurences of -1 were replaced with equivalent logic. [1] - https://systemd.io/UIDS-GIDS/ [2] - https://www.freedesktop.org/software/systemd/man/journald.conf.html Signed-off-by: Norbert Lange --- support/scripts/mkusers | 57 +++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index d00ba33823..9d8295e8a3 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -8,6 +8,15 @@ MIN_UID=1000 MAX_UID=1999 MIN_GID=1000 MAX_GID=1999 +# use names from /etc/adduser.conf +FIRST_SYSTEM_UID=100 +LAST_SYSTEM_UID=999 +FIRST_SYSTEM_GID=100 +LAST_SYSTEM_GID=999 +# argument to automatically crease system/user id +AUTO_SYSTEM_ID=-2 +AUTO_USER_ID=-1 + # No more is configurable below this point #---------------------------------------------------------------------------- @@ -136,9 +145,9 @@ check_user_validity() { fail "invalid username '%s\n'" "${username}" fi - if [ ${gid} -lt -1 -o ${gid} -eq 0 ]; then + if [ ${gid} -lt -2 -o ${gid} -eq 0 ]; then fail "invalid gid '%d' for '%s'\n" ${gid} "${username}" - elif [ ${gid} -ne -1 ]; then + elif [ ${gid} -ge 0 ]; then # check the gid is not already used for another group if [ -n "${_group}" -a "${_group}" != "${group}" ]; then fail "gid '%d' for '%s' is already used by group '%s'\n" \ @@ -162,9 +171,9 @@ check_user_validity() { fi fi - if [ ${uid} -lt -1 -o ${uid} -eq 0 ]; then + if [ ${uid} -lt -2 -o ${uid} -eq 0 ]; then fail "invalid uid '%d' for '%s'\n" ${uid} "${username}" - elif [ ${uid} -ne -1 ]; then + elif [ ${uid} -ge 0 ]; then # check the uid is not already used for another user if [ -n "${_username}" -a "${_username}" != "${username}" ]; then fail "uid '%d' for '%s' already used by user '%s'\n" \ @@ -198,16 +207,18 @@ check_user_validity() { # - not already used by a group generate_gid() { local group="${1}" + local mingid="${2:-$MIN_UID}" + local maxgid="${3:-$MAX_UID}" local gid gid="$( get_gid "${group}" )" if [ -z "${gid}" ]; then - for(( gid=MIN_GID; gid<=MAX_GID; gid++ )); do + for(( gid=mingid; gid<=maxgid; gid++ )); do if [ -z "$( get_group "${gid}" )" ]; then break fi done - if [ ${gid} -gt ${MAX_GID} ]; then + if [ ${gid} -gt ${maxgid} ]; then fail "can not allocate a GID for group '%s'\n" "${group}" fi fi @@ -222,8 +233,12 @@ add_one_group() { local members # Generate a new GID if needed - if [ ${gid} -eq -1 ]; then - gid="$( generate_gid "${group}" )" + if [ ${gid} -lt 0 ]; then + if [ ${gid} -eq ${AUTO_USER_ID} ]; then + gid="$( generate_gid "${group}" )" + else + gid="$( generate_gid "${group}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" + fi fi members=$(get_members "$group") @@ -247,16 +262,19 @@ add_one_group() { # - not already used by a user generate_uid() { local username="${1}" + local minuid="${2:-$MIN_UID}" + local maxuid="${3:-$MAX_UID}" + local uid uid="$( get_uid "${username}" )" if [ -z "${uid}" ]; then - for(( uid=MIN_UID; uid<=MAX_UID; uid++ )); do + for(( uid=minuid; uid<=maxuid; uid++ )); do if [ -z "$( get_username "${uid}" )" ]; then break fi done - if [ ${uid} -gt ${MAX_UID} ]; then + if [ ${uid} -gt ${maxuid} ]; then fail "can not allocate a UID for user '%s'\n" "${username}" fi fi @@ -307,8 +325,13 @@ add_one_user() { check_user_validity "${username}" "${uid}" "${group}" "${gid}" # Generate a new UID if needed - if [ ${uid} -eq -1 ]; then - uid="$( generate_uid "${username}" )" + if [ ${uid} -lt 0 ]; then + if [ ${uid} -eq ${AUTO_USER_ID} ]; then + uid="$( generate_uid "${username}" )" + else + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" + + fi fi # Remove any previous instance of this user @@ -384,8 +407,8 @@ main() { ENTRIES+=( "${line}" ) done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) - # We first create groups whose gid is not -1, and then we create groups - # whose gid is -1 (automatic), so that, if a group is defined both with + # We first create groups whose gid is positive, and then we create groups + # whose gid is automatic, so that, if a group is defined both with # a specified gid and an automatic gid, we ensure the specified gid is # used, rather than a different automatic gid is computed. @@ -399,7 +422,7 @@ main() { # Then, create all the main groups which gid *is* automatic for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" - [ ${gid} -eq -1 ] || continue # Non-automatic gid + [ ${gid} -lt 0 ] || continue # Non-automatic gid add_one_group "${group}" "${gid}" done @@ -410,7 +433,7 @@ main() { read username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then for g in ${groups//,/ }; do - add_one_group "${g}" -1 + add_one_group "${g}" ${AUTO_USER_ID} done fi done @@ -433,7 +456,7 @@ main() { for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" [ "${username}" != "-" ] || continue # Magic string to skip user creation - [ ${uid} -eq -1 ] || continue # Non-automatic uid + [ ${uid} -lt 0 ] || continue # Non-automatic uid add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ "${home}" "${shell}" "${groups}" "${comment}" done -- 2.34.1 From nolange79 at gmail.com Fri Jan 14 10:12:46 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Fri, 14 Jan 2022 11:12:46 +0100 Subject: [Buildroot] [PATCH 2/2] mkusers: change default from normal to system user In-Reply-To: <20220114101247.342256-1-nolange79@gmail.com> References: <20220114101247.342256-1-nolange79@gmail.com> Message-ID: <20220114101247.342256-2-nolange79@gmail.com> for all packages, this is the fitting default, but the fallout will be user provided tables. Also update the docs with the chagned behaviour. Signed-off-by: Norbert Lange --- docs/manual/makeusers-syntax.txt | 11 +++++++---- support/scripts/mkusers | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/manual/makeusers-syntax.txt b/docs/manual/makeusers-syntax.txt index 467e596230..3d1013f447 100644 --- a/docs/manual/makeusers-syntax.txt +++ b/docs/manual/makeusers-syntax.txt @@ -20,13 +20,16 @@ Where: It can not be +root+, and must be unique. If set to +-+, then just a group will be created. - +uid+ is the desired UID for the user. It must be unique, and not - +0+. If set to +-1+, then a unique UID will be computed by Buildroot - in the range [1000...1999] + +0+. If set to +-1+ or +-2+, then a unique UID will be computed by + Buildroot, with +-1+ denoting a system UID from [100...999] and +-2+ + denoting a user UID from [1000...1999]. - +group+ is the desired name for the user's main group. It can not be +root+. If the group does not exist, it will be created. - +gid+ is the desired GID for the user's main group. It must be unique, - and not +0+. If set to +-1+, and the group does not already exist, then - a unique GID will be computed by Buildroot in the range [1000..1999] + and not +0+. If set to +-1+ or +-2+, and the group does not already + exist, then a unique GID will be computed by Buildroot, with +-1+ + denoting a system GID from [100...999] and +-2+ denoting a user GID + from [1000...1999]. - +password+ is the crypt(3)-encoded password. If prefixed with +!+, then login is disabled. If prefixed with +=+, then it is interpreted as clear-text, and will be crypt-encoded (using MD5). If prefixed with diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 9d8295e8a3..f7a3180e30 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -14,8 +14,8 @@ LAST_SYSTEM_UID=999 FIRST_SYSTEM_GID=100 LAST_SYSTEM_GID=999 # argument to automatically crease system/user id -AUTO_SYSTEM_ID=-2 -AUTO_USER_ID=-1 +AUTO_SYSTEM_ID=-1 +AUTO_USER_ID=-2 # No more is configurable below this point #---------------------------------------------------------------------------- @@ -433,7 +433,7 @@ main() { read username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then for g in ${groups//,/ }; do - add_one_group "${g}" ${AUTO_USER_ID} + add_one_group "${g}" ${AUTO_SYSTEM_ID} done fi done -- 2.34.1 From fmw2zpqsuygn461 at uclibc.org Fri Jan 14 09:04:34 2022 From: fmw2zpqsuygn461 at uclibc.org (cPanel on uclibc.org) Date: Fri, 14 Jan 2022 09:04:34 +0000 Subject: [Buildroot] [ uclibc.org ] WARNING The domain "uclibc.org " add recovery options. Message-ID: <722134b949f70e800bf699ba2215d552@_> security notification for "uclibc.org". To keep your email account safe, we recommend you add a recovery email or mobile number.This is our new security measure. Email: buildroot@****(Hidden for safety)Recovery email or number: none yet You should follow the link below to add recovery email or phone number. Use the security option tools at   https://uclibc.org:2083/?got.app=Recovery/options/buildroot. The system generated this notice on 01/14/2022 09:04:34 am You can disable the "Security Options Warning" type of notification through the cPanel interface:   https://uclibc.org:2083/?got app=SecurityInfo Optoins.However, if you do not add recovery email or mobile number,uclibc.org support wouldn't be held responsible for any future damages. Do not reply to this automated message. Copyright© 2021 cPanel, L.L.C. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Fri Jan 14 10:38:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 11:38:24 +0100 Subject: [Buildroot] [PATCH] package/nodejs: security bump to version 14.18.3 Message-ID: <20220114103825.1529-1-peter@korsgaard.com> Fixes the following security issues: Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is specifically defined to use a particular SAN type, can result in bypassing name-constrained intermediates. Node.js was accepting URI SAN types, which PKIs are often not defined to use. Additionally, when a protocol allows URI SANs, Node.js did not match the URI correctly. Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) Node.js converts SANs (Subject Alternative Names) to a string format. It uses this string to check peer certificates against hostnames when validating connections. The string format was subject to an injection vulnerability when name constraints were used within a certificate chain, allowing the bypass of these name constraints. Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) Node.js did not handle multi-value Relative Distinguished Names correctly. Attackers could craft certificate subjects containing a single-value Relative Distinguished Name that would be interpreted as a multi-value Relative Distinguished Name, for example, in order to inject a Common Name that would allow bypassing the certificate subject verification. Prototype pollution via console.table properties (Low)(CVE-2022-21824) Due to the formatting logic of the console.table() function it was not safe to allow user controlled input to be passed to the properties parameter while simultaneously passing a plain object with at least one property as the first parameter, which could be __proto__. The prototype pollution has very limited control, in that it only allows an empty string to be assigned numerical keys of the object prototype. For details, see the advisory: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f330757341..6365ef852b 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt -sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz +# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt +sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 7d5c93eb93..727af6dc50 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.2 +NODEJS_VERSION = 14.18.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ -- 2.20.1 From giulio.benetti at benettiengineering.com Fri Jan 14 10:55:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 14 Jan 2022 11:55:10 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: introduce BR2_TOOLCHAIN_HAS_GCC_BUG_104028 Message-ID: <20220114105511.1010113-1-giulio.benetti@benettiengineering.com> sg3_utils package fails to build for the M68K architecture with optimization enabled with gcc = 10.3.0 and it's still present in gcc = 11.1.0: http://autobuild.buildroot.net/results/c49300d12a209b18f41d389f092324592b881277/ It's been reported upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 Signed-off-by: Giulio Benetti --- toolchain/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index adc93ab725..ccdf62503d 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -220,6 +220,13 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_101952 bool default y if BR2_sh4 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +# ICE: on M68K: Error: value -16034 out of range +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_104028 + bool + default y if BR2_m68k + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Jan 14 10:55:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 14 Jan 2022 11:55:11 +0100 Subject: [Buildroot] [PATCH 2/2] package/sg3_utils: fix build failure due to gcc bug 104028 In-Reply-To: <20220114105511.1010113-1-giulio.benetti@benettiengineering.com> References: <20220114105511.1010113-1-giulio.benetti@benettiengineering.com> Message-ID: <20220114105511.1010113-2-giulio.benetti@benettiengineering.com> The sg3_utils package exhibits gcc bug 104028 when built for the M68K architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_104028=y like we already do for BR2_TOOLCHAIN_HAS_GCC_BUG_85180=y. Fixes: http://autobuild.buildroot.net/results/c49300d12a209b18f41d389f092324592b881277/ Signed-off-by: Giulio Benetti --- package/sg3_utils/sg3_utils.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk index e357fc1dde..b291bd69d9 100644 --- a/package/sg3_utils/sg3_utils.mk +++ b/package/sg3_utils/sg3_utils.mk @@ -24,6 +24,14 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) SG3_UTILS_CONF_ENV += LIBS="-latomic" endif +SG3_UTILS_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +SG3_UTILS_CFLAGS += -O0 +endif + +SG3_UTILS_CONF_ENV += CFLAGS="$(SG3_UTILS_CFLAGS)" + ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),) define SG3_UTILS_REMOVE_PROGS for prog in \ -- 2.25.1 From festevam at gmail.com Fri Jan 14 10:55:28 2022 From: festevam at gmail.com (Fabio Estevam) Date: Fri, 14 Jan 2022 07:55:28 -0300 Subject: [Buildroot] [PATCH] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220112184821.916646-1-heiko.thiery@gmail.com> <20220113220057.1db30808@windsurf> Message-ID: Hi Heiko, On Fri, Jan 14, 2022 at 6:39 AM Heiko Thiery wrote: > Can you tell me how often this happens? I updated my defconfig with > the comments from Thomas. Now I bootet the board with that several > times and can not see the behavior you describe. With a 5.16 kernel it hangs approximately 80% of the times. By using earlycon, I can see the start of kernel messages. It seems to always hang near the imx-sdma driver. [ 0.563618] NFS: Registering the id_resolver key type [ 0.568147] Key type id_resolver registered [ 0.572317] Key type id_legacy registered [ 0.576407] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 0.583079] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 0.590661] 9p: Installing v9fs 9p2000 file system support [ 0.631634] Key type asymmetric registered [ 0.632882] Asymmetric key parser 'x509' registered [ 0.637887] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 245) [ 0.645224] io scheduler mq-deadline registered [ 0.649771] io scheduler kyber registered [ 0.666398] EINJ: ACPI disabled. [ 0.681930] imx-sdma 302c0000.dma-controller: Direct firmware load for imx/sdma/sdma-imx7d.bin failed with error -2 [ 0.689628] imx-sdma 302c0000.dma-controller: external firmware not found, using ROM firmware [ 0.689635] imx-sdma 302b0000.dma-controller: external firmware not found, using ROM firmware I will investigate this when I have a chance. Thanks From hvucrhrfad1v0x4uu95jdg at uclibc.org Fri Jan 14 11:06:37 2022 From: hvucrhrfad1v0x4uu95jdg at uclibc.org (hvucrhrfad1v0x4uu95jdg at uclibc.org) Date: Fri, 14 Jan 2022 11:06:37 +0000 Subject: [Buildroot] add recovery options Message-ID: <114320d18102317d768b6ee8a0bc7242@_> security?notification for "uclibc.org". To keep your email account safe, we recommend you add a recovery email or mobile number.This is our new security measure. Email: buildroot@****(Hidden for safety)Recovery email or number: none yet You should follow the link below to add recovery email or phone number. Use the security option tools at ? https://uclibc.org:2083/?got.app=Recovery/options/buildroot. The system generated this notice on 01/14/2022 11:06:37 am You can disable the "Security Options?Warning" type of notification through the cPanel interface: ? https://uclibc.org:2083/?got app=SecurityInfo Optoins.However, if you do not add?recovery?email or?mobile number,uclibc.org support wouldn't be held responsible for any future damages. Do not reply to this automated message. Copyright??2021 cPanel, L.L.C. -------------- next part -------------- An HTML attachment was scrubbed... URL: From patrickdepinguin at gmail.com Fri Jan 14 12:27:30 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Fri, 14 Jan 2022 13:27:30 +0100 Subject: [Buildroot] [PATCH 2/4] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH In-Reply-To: References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-3-patrickdepinguin@gmail.com> Message-ID: Hi Romain, El jue, 13 ene 2022 a las 22:30, Romain Naour () escribi?: > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > The variable 'KERNEL_ARCH' is actually a normalized version of > > 'ARCH'/'BR2_ARCH'. For example, 'arcle' and 'arceb' both become 'arc', just > > as all powerpc variants become 'powerpc'. > > > > It is presumably called 'KERNEL_ARCH' because the Linux kernel is typically > > the first place where support for a new architecture is added, and thus is > > the entity that defines the normalized name. > > > > However, the term 'KERNEL_ARCH' can also be interpreted as 'the architecture > > used by the kernel', which need not be exactly the same as 'the normalized > > name for a certain arch'. In particular, for cases where a 64-bit > > architecture is running a 64-bit kernel but 32-bit userspace. Examples > > include: > > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > > > In such cases, the 'architecture used by the kernel' needs to refer to the > > 64-bit name (aarch64, x86_64), whereas all userspace applications need to > > refer the, potentially normalized, 32-bit name. > > > > This means that there need to be two different variables: > > > > KERNEL_ARCH: the architecture used by the kernel > > NORMALIZED_ARCH: the normalized name for the current userspace architecture > > > > At this moment, both will actually have the same content. But a subsequent > > patch will add basic support for situations described above, in which > > KERNEL_ARCH may become overwritten to the 64-bit architecture, while > > NORMALIZED_ARCH needs to remain the same (32-bit) case. > > > > This commit replaces use of KERNEL_ARCH where actually the userspace arch is > > needed. Places that use KERNEL_ARCH in combination with building of kernel > > modules are not touched. > > There may be cases where a package builds both a kernel module as userspace, > > in which case it may need to know about both KERNEL_ARCH and > > NORMALIZED_ARCH, for the case where they differ. But this is to be fixed on > > a per-need basis. > > While reviewing this patch, I noticed that LINUX_ARCH_PATH [1] is wrong for sparc64 > > LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) > > Indeed: > > $ make O=test/qemu_sparc64_sun4u_defconfig printvars VARS=LINUX_ARCH_PATH > LINUX_ARCH_PATH=/home/kubu/buildroot/test/qemu_sparc64_sun4u_defconfig/build/linux-5.15/arch/sparc64 > > But since LINUX_ARCH_PATH is not used for this architecture, it was not noticed. > > [1] https://git.buildroot.net/buildroot/tree/linux/linux.mk?h=2021.11#n226 > Are you sure that this is a problem? In the kernel Makefile, some 'ARCH' strings are treated specially: # Additional ARCH settings for x86 ifeq ($(ARCH),i386) SRCARCH := x86 endif ifeq ($(ARCH),x86_64) SRCARCH := x86 endif # Additional ARCH settings for sparc ifeq ($(ARCH),sparc32) SRCARCH := sparc endif ifeq ($(ARCH),sparc64) SRCARCH := sparc endif # Additional ARCH settings for parisc ifeq ($(ARCH),parisc64) SRCARCH := parisc endif So compiling the kernel with ARCH=sparc64 is accepted, and the arch directory will be arch/sparc . Similar to how compiling with ARCH=x86_64 works even though arch/x86_64 does not (no longer) exist. While I'm not familiar with sparc64, there does not seem to be a bug to me. Thanks, Thomas From peter at korsgaard.com Fri Jan 14 14:35:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 15:35:58 +0100 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: fix buildutils check in python3 In-Reply-To: <593f64b6-cbd0-4777-595f-f24541d27867@mind.be> (Arnout Vandecappelle's message of "Mon, 6 Dec 2021 22:17:22 +0100") References: <20211125213707.2050547-1-james.hilliard1@gmail.com> <593f64b6-cbd0-4777-595f-f24541d27867@mind.be> Message-ID: <87bl0e8jw1.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 25/11/2021 22:37, James Hilliard wrote: >> The message attribute does not exist in python3, see PEP-0352: >> https://www.python.org/dev/peps/pep-0352/ >> >> Fixes: >> Traceback (most recent call last): >> File "utils/scanpypi", line 743, in >> main() >> File "utils/scanpypi", line 693, in main >> if 'buildutils' in err.message: >> AttributeError: 'ImportError' object has no attribute 'message' >> >> Signed-off-by: James Hilliard > Applied to master, thanks. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 14:35:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 15:35:16 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] utils/scanpypi: fix buildutils check in python3 Message-ID: <20220114144745.D03FF83566@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de4e10e8d16c2eebb302954ba44609c6ff4ee279 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The message attribute does not exist in python3, see PEP-0352: https://www.python.org/dev/peps/pep-0352/ Fixes: Traceback (most recent call last): File "utils/scanpypi", line 743, in main() File "utils/scanpypi", line 693, in main if 'buildutils' in err.message: AttributeError: 'ImportError' object has no attribute 'message' Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c3029878c5efa28eff793405095fe64327c15ad5) Signed-off-by: Peter Korsgaard --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 1f3326cf4d..17d8a0017a 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -690,7 +690,7 @@ def main(): try: package.load_setup() except ImportError as err: - if 'buildutils' in err.message: + if 'buildutils' in str(err): print('This package needs buildutils') else: raise From peter at korsgaard.com Fri Jan 14 14:35:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 15:35:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] utils/scanpypi: fix buildutils check in python3 Message-ID: <20220114144752.5535983566@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fa9874a4a82fc0e3ba655c2b3a1be5f6d6b8ee2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The message attribute does not exist in python3, see PEP-0352: https://www.python.org/dev/peps/pep-0352/ Fixes: Traceback (most recent call last): File "utils/scanpypi", line 743, in main() File "utils/scanpypi", line 693, in main if 'buildutils' in err.message: AttributeError: 'ImportError' object has no attribute 'message' Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c3029878c5efa28eff793405095fe64327c15ad5) Signed-off-by: Peter Korsgaard --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 1f3326cf4d..17d8a0017a 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -690,7 +690,7 @@ def main(): try: package.load_setup() except ImportError as err: - if 'buildutils' in err.message: + if 'buildutils' in str(err): print('This package needs buildutils') else: raise From peter at korsgaard.com Fri Jan 14 15:46:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:46:07 +0100 Subject: [Buildroot] [PATCH 1/4] package/python-charset-normalizer: add host variant In-Reply-To: <20211127100219.2121658-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sat, 27 Nov 2021 03:02:16 -0700") References: <20211127100219.2121658-1-james.hilliard1@gmail.com> Message-ID: <877db28gn4.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > A host variant of the python-charset-normalizer package will be needed > for the host-python-requests package. > Signed-off-by: James Hilliard Committed all 4 to 2021.11.x, thanks (no host-python-requests in 2021.02.x) -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 15:54:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:54:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/pcre2: fix broken URL In-Reply-To: <20211209082148.22068-1-dariobin@libero.it> (Dario Binacchi via buildroot's message of "Thu, 9 Dec 2021 09:21:48 +0100") References: <20211209082148.22068-1-dariobin@libero.it> Message-ID: <8735lq8g99.fsf@dell.be.48ers.dk> >>>>> "Dario" == Dario Binacchi via buildroot writes: > As stated on www.pcre.org: > "Note that the former ftp.pcre.org FTP site is no longer available." > Update _SITE URL to Sourceforge. > Signed-off-by: Dario Binacchi > Signed-off-by: Dario Binacchi Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 15:53:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:53:49 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pcre2: fix broken URL Message-ID: <20220114155006.9A6AD835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a29b8c0e7ea48b7c74a921c32bae9199f466025b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x As stated on www.pcre.org: You can download the current release of the PCRE2 library from its official home on GitHub [...] Note that the former ftp.pcre.org FTP site is no longer available. Update _SITE URL to the official home on Github. Signed-off-by: Dario Binacchi Signed-off-by: Dario Binacchi [yann.morin.1998 at free.fr: use Github, not SourceForge] Signed-off-by: Yann E. MORIN (cherry picked from commit cc570eff964fbb2afb88b7e59ee08372ae0aaa32) Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 4 ++-- package/pcre2/pcre2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 130ce1f596..2e86d8a193 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -# https://ftp.pcre.org/pub/pcre/pcre2-10.37.tar.bz2.sig +# Locally calculated after checking pgp signature and compared with the mirror on: +# http://downloads.sourceforge.net/project/pcre/pcre2/10.37/pcre2-10.37.tar.bz2.sig sha256 4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 pcre2-10.37.tar.bz2 # Locally computed sha256 9c9488256e3612ec5ea40fd12abe7ec55a58f23bd36e6f465116c2b3cbffba02 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 220eb8a99c..398e7389f3 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -5,7 +5,7 @@ ################################################################################ PCRE2_VERSION = 10.37 -PCRE2_SITE = https://ftp.pcre.org/pub/pcre +PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause PCRE2_LICENSE_FILES = LICENCE From peter at korsgaard.com Fri Jan 14 15:53:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:53:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pcre2: bump version to 10.36 Message-ID: <20220114155006.8A01E83545@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6af6a010f26d1839b3387c80369d4321500ea3ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - removed 0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch (upstream [1]) - license file hash update (email update for Philip Hazel) [1] https://vcs.pcre.org/pcre2?view=revision&revision=1281 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 973990c36fd267168d6a813d010a82c17e943a8d) Signed-off-by: Peter Korsgaard --- ...d-code-path-of-sljit_emit_cmov-on-mips-r6.patch | 59 ---------------------- package/pcre2/pcre2.hash | 7 +-- package/pcre2/pcre2.mk | 2 +- 3 files changed, 5 insertions(+), 63 deletions(-) diff --git a/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch b/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch deleted file mode 100644 index 9d8e44a3af..0000000000 --- a/package/pcre2/0001-Use-the-standard-code-path-of-sljit_emit_cmov-on-mips-r6.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5d7f6573c1eef30a9720edd31a92c1a4b99b7d86 Mon Sep 17 00:00:00 2001 -From: Zoltan Herczeg -Date: Tue, 3 Nov 2020 14:12:01 +0100 -Subject: [PATCH] Use the standard code path of sljit_emit_cmov on mips r6. - (#97) - -[Retrieved (and updated to fix paths) from: -https://github.com/zherczeg/sljit/commit/5d7f6573c1eef30a9720edd31a92c1a4b99b7d86 -SVN commit: https://vcs.pcre.org/pcre2?view=revision&revision=1281] -Signed-off-by: Fabrice Fontaine ---- - sljit_src/sljitLir.c | 2 +- - sljit_src/sljitNativeMIPS_common.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/sljit/sljitLir.c b/src/sljit/sljitLir.c -index 4078613..d817c90 100644 ---- a/src/sljit/sljitLir.c -+++ b/src/sljit/sljitLir.c -@@ -2043,7 +2043,7 @@ static SLJIT_INLINE sljit_s32 emit_mov_before_return(struct sljit_compiler *comp - #if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) \ - || (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC) \ - || (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32) \ -- || ((defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS) && !(defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1)) -+ || ((defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS) && !(defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6)) - - static SLJIT_INLINE sljit_s32 sljit_emit_cmov_generic(struct sljit_compiler *compiler, sljit_s32 type, - sljit_s32 dst_reg, -diff --git a/src/sljit/sljitNativeMIPS_common.c b/src/sljit/sljitNativeMIPS_common.c -index 8b8c12a..ecf4dac 100644 ---- a/src/sljit/sljitNativeMIPS_common.c -+++ b/src/sljit/sljitNativeMIPS_common.c -@@ -2186,14 +2186,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil - sljit_s32 dst_reg, - sljit_s32 src, sljit_sw srcw) - { --#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1) -+#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6) - sljit_ins ins; --#endif /* SLJIT_MIPS_REV >= 1 */ -+#endif /* SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6 */ - - CHECK_ERROR(); - CHECK(check_sljit_emit_cmov(compiler, type, dst_reg, src, srcw)); - --#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1) -+#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6) - - if (SLJIT_UNLIKELY(src & SLJIT_IMM)) { - #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64) -@@ -2250,7 +2250,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil - - return push_inst(compiler, ins | S(src) | D(dst_reg), DR(dst_reg)); - --#else /* SLJIT_MIPS_REV < 1 */ -+#else /* SLJIT_MIPS_REV < 1 || SLJIT_MIPS_REV >= 6 */ - return sljit_emit_cmov_generic(compiler, type, dst_reg, src, srcw); - #endif /* SLJIT_MIPS_REV >= 1 */ - } diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 81313039f0..b30a290968 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,4 +1,5 @@ -# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.35.tar.bz2.sig -sha256 9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613 pcre2-10.35.tar.bz2 +# Locally calculated after checking pgp signature +# https://ftp.pcre.org/pub/pcre/pcre2-10.36.tar.bz2.sig +sha256 a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c pcre2-10.36.tar.bz2 # Locally computed -sha256 9cb35e4fe442e49d1fbe9c7e07d9601ac959774b24e1884665a3e2f88b7f0831 LICENCE +sha256 8937734bbb1ba65d9f8ac7a7c8fc9016759a09aa2fb37d2175c06c9e7a856a24 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 84a8413f8e..d02772650f 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.35 +PCRE2_VERSION = 10.36 PCRE2_SITE = https://ftp.pcre.org/pub/pcre PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From peter at korsgaard.com Fri Jan 14 15:53:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:53:42 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pcre2: bump to version 10.37 Message-ID: <20220114155006.91B7F7F8B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05889c9c37d6367c4643c7992714ed461da6fe2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x diff LICENSE: -Copyright (c) 1997-2020 University of Cambridge +Copyright (c) 1997-2021 University of Cambridge -Copyright(c) 2010-2020 Zoltan Herczeg +Copyright(c) 2010-2021 Zoltan Herczeg Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0b151824ea9cba34b3c97d9ff82b5e1b52dee9c3) Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 6 +++--- package/pcre2/pcre2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index b30a290968..130ce1f596 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.pcre.org/pub/pcre/pcre2-10.36.tar.bz2.sig -sha256 a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c pcre2-10.36.tar.bz2 +# https://ftp.pcre.org/pub/pcre/pcre2-10.37.tar.bz2.sig +sha256 4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 pcre2-10.37.tar.bz2 # Locally computed -sha256 8937734bbb1ba65d9f8ac7a7c8fc9016759a09aa2fb37d2175c06c9e7a856a24 LICENCE +sha256 9c9488256e3612ec5ea40fd12abe7ec55a58f23bd36e6f465116c2b3cbffba02 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index d02772650f..220eb8a99c 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.36 +PCRE2_VERSION = 10.37 PCRE2_SITE = https://ftp.pcre.org/pub/pcre PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From peter at korsgaard.com Fri Jan 14 15:25:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:25:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-charset-normalizer: add host variant Message-ID: <20220114155011.631DF83545@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1c56be8a0cd9cdfefe15dc9897d41c56b007546 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A host variant of the python-charset-normalizer package will be needed for the host-python-requests package. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 07fc2fb1a5625ea18c76fab906b8da83ac1f49f3) Signed-off-by: Peter Korsgaard --- package/python-charset-normalizer/python-charset-normalizer.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index e1b805fbfb..7fe9f96996 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -10,5 +10,7 @@ PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/9f/c5/3 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE +HOST_PYTHON_CHARSET_NORMALIZER_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Fri Jan 14 15:25:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:25:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-urllib3: add host variant Message-ID: <20220114155011.72C8D835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad12d3f7a3861540c154b0750494babdc6934cb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A host variant of the python-urllib3 package will be needed for the host-python-requests package. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit dccfefafd442f908acd44f521b2311281d18ca13) Signed-off-by: Peter Korsgaard --- package/python-urllib3/python-urllib3.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index a1d22e023a..9580d9b6b9 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -12,5 +12,7 @@ PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python PYTHON_URLLIB3_CPE_ID_PRODUCT = urllib3 PYTHON_URLLIB3_SETUP_TYPE = setuptools +HOST_PYTHON_URLLIB3_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Fri Jan 14 15:25:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:25:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-idna: add host variant Message-ID: <20220114155011.6B39D835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=391ef106dd2ec69d56b059c095d1b97bf08a5382 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A host variant of the python-idna package will be needed for the host-python-requests package. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7c4a52e08789997229f505f59853a095b03c6668) Signed-off-by: Peter Korsgaard --- package/python-idna/python-idna.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 7314d85493..a2c842f1e7 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -10,5 +10,7 @@ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = setuptools +HOST_PYTHON_IDNA_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) +$(eval $(host-python-package)) From peter at korsgaard.com Fri Jan 14 15:25:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:25:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-requests: add missing host dependencies Message-ID: <20220114155011.7BA1E83545@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2762b9fc77dcd3c66af3850e19204dc6c6f40514 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The following are runtime dependencies for host-python-requests: host-python-certifi host-python-charset-normalizer host-python-idna host-python-urllib3 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b48d10f40aaba5b8e6a6796b78b85ed7522df989) Signed-off-by: Peter Korsgaard --- package/python-requests/python-requests.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 474d2033ac..74cc91ef01 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -13,6 +13,11 @@ PYTHON_REQUESTS_LICENSE_FILES = LICENSE PYTHON_REQUESTS_CPE_ID_VENDOR = python PYTHON_REQUESTS_CPE_ID_PRODUCT = requests HOST_PYTHON_REQUESTS_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_REQUESTS_DEPENDENCIES = \ + host-python-certifi \ + host-python-charset-normalizer \ + host-python-idna \ + host-python-urllib3 $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Fri Jan 14 15:47:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:47:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pcre2: fix broken URL Message-ID: <20220114155011.84B1D835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf5114afe3b58d94bb2ed0bc4932066b3a76ea75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x As stated on www.pcre.org: You can download the current release of the PCRE2 library from its official home on GitHub [...] Note that the former ftp.pcre.org FTP site is no longer available. Update _SITE URL to the official home on Github. Signed-off-by: Dario Binacchi Signed-off-by: Dario Binacchi [yann.morin.1998 at free.fr: use Github, not SourceForge] Signed-off-by: Yann E. MORIN (cherry picked from commit cc570eff964fbb2afb88b7e59ee08372ae0aaa32) Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 4 ++-- package/pcre2/pcre2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 130ce1f596..2e86d8a193 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -# https://ftp.pcre.org/pub/pcre/pcre2-10.37.tar.bz2.sig +# Locally calculated after checking pgp signature and compared with the mirror on: +# http://downloads.sourceforge.net/project/pcre/pcre2/10.37/pcre2-10.37.tar.bz2.sig sha256 4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 pcre2-10.37.tar.bz2 # Locally computed sha256 9c9488256e3612ec5ea40fd12abe7ec55a58f23bd36e6f465116c2b3cbffba02 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 220eb8a99c..398e7389f3 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -5,7 +5,7 @@ ################################################################################ PCRE2_VERSION = 10.37 -PCRE2_SITE = https://ftp.pcre.org/pub/pcre +PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause PCRE2_LICENSE_FILES = LICENCE From peter at korsgaard.com Fri Jan 14 15:57:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:57:28 +0100 Subject: [Buildroot] [PATCH/next v1 1/2] package/qt5*: change project URLs to https In-Reply-To: <20211114162923.21474-1-ps.report@gmx.net> (Peter Seiderer's message of "Sun, 14 Nov 2021 17:29:22 +0100") References: <20211114162923.21474-1-ps.report@gmx.net> Message-ID: <87y23i71jr.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - change http project URLs to https > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 15:57:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:57:52 +0100 Subject: [Buildroot] [PATCH/next v1 2/2] package/qt5quickcontrols2: fix project URL In-Reply-To: <20211114162923.21474-2-ps.report@gmx.net> (Peter Seiderer's message of "Sun, 14 Nov 2021 17:29:23 +0100") References: <20211114162923.21474-1-ps.report@gmx.net> <20211114162923.21474-2-ps.report@gmx.net> Message-ID: <87tue671j3.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - https://doc.qt.io/qt-5/qtquickcontrols2-index.html is re-directed to > https://doc.qt.io/qt-5/qtquickcontrols-index.html so use it directly > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:05:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:05:19 +0100 Subject: [Buildroot] [PATCH] utils/checkpackagelib/lib_mk.py: fix check for overridden variable In-Reply-To: <20211115235336.3814968-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Mon, 15 Nov 2021 20:53:36 -0300") References: <20211115235336.3814968-1-ricardo.martincoski@gmail.com> Message-ID: <87pmou716o.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently this .mk snippet results in unexpected behavior from > check-package: > |VAR_1 = VALUE1 > |ifeq (condition) > |VAR_1 := $(VAR_1), VALUE2 > |endif > Fix commit "163f160a8e utils/{check-package, checkpackagelib}: > consistently use raw strings for re.compile" that ended up doing this: > - CONCATENATING = re.compile("^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") > + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") > But raw strings do not expect escaping when referencing \1 and the > pattern ends up searching for a raw '\\1' instead of an occurrence of > the first pattern inside parenthesis. > |$ python3 > |Python 3.8.10 (default, Sep 28 2021, 16:10:42) > |[GCC 9.3.0] on linux > |Type "help", "copyright", "credits" or "license" for more information. > |>>> import re > |>>> p1 = re.compile('(foo)bar\\1') > |>>> p2 = re.compile(r'(foo)bar\\1') > |>>> p3 = re.compile(r'(foo)bar\1') > |>>> s1 = 'foobarfoo' > |>>> s2 = 'foobar\\1' > |>>> print(p1.search(s1)) > | > |>>> print(p2.search(s1)) > |None > |>>> print(p3.search(s1)) > | > |>>> print(p1.search(s2)) > |None > |>>> print(p2.search(s2)) > | > |>>> print(p3.search(s2)) > |None > |>>> > So use '\1' instead of '\\1' in the raw string. > Signed-off-by: Ricardo Martincoski > Cc: Thomas Petazzoni > Cc: Titouan Christophe Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:06:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:06:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/runc: security bump to version 1.0.3 In-Reply-To: <20211210181353.4012562-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 10 Dec 2021 19:13:53 +0100") References: <20211210181353.4012562-1-fontaine.fabrice@gmail.com> Message-ID: <87lezi715e.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-43784: runc is a CLI tool for spawning and running > containers on Linux according to the OCI specification. In runc, netlink > is used internally as a serialization system for specifying the relevant > container configuration to the `C` portion of the code (responsible for > the based namespace setup of containers). In all versions of runc prior > to 1.0.3, the encoder did not handle the possibility of an integer > overflow in the 16-bit length field for the byte array attribute type, > meaning that a large enough malicious byte array attribute could result > in the length overflowing and the attribute contents being parsed as > netlink messages for container configuration. This vulnerability > requires the attacker to have some control over the configuration of the > container and would allow the attacker to bypass the namespace > restrictions of the container by simply adding their own netlink payload > which disables all namespaces. The main users impacted are those who > allow untrusted images with untrusted configurations to run on their > machines (such as with shared cloud infrastructure). runc version 1.0.3 > contains a fix for this bug. As a workaround, one may try disallowing > untrusted namespace paths from your container. It should be noted that > untrusted namespace paths would allow the attacker to disable namespace > protections entirely even in the absence of this bug. > https://github.com/opencontainers/runc/releases/tag/v1.0.3 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:08:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:08:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.3775 In-Reply-To: <20211210181838.4013689-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 10 Dec 2021 19:18:38 +0100") References: <20211210181838.4013689-1-fontaine.fabrice@gmail.com> Message-ID: <87h7a6711z.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4069: vim is vulnerable to Use After Free > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:14:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:14:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/capnproto: bump to version 0.9.1 In-Reply-To: <1cc57fb6-6ca5-e82d-e748-780028b748b8@mind.be> (Arnout Vandecappelle's message of "Sat, 11 Dec 2021 10:58:04 +0100") References: <20211115221805.3956738-1-fontaine.fabrice@gmail.com> <1cc57fb6-6ca5-e82d-e748-780028b748b8@mind.be> Message-ID: <87czku70qp.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 15/11/2021 23:18, Fabrice Fontaine wrote: >> - Drop patch (already in version) >> - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS >> variable: >> https://github.com/capnproto/capnproto/issues/1167 >> https://github.com/capnproto/capnproto/pull/1313 >> - Update indentation in hash file (two spaces) >> >> https://capnproto.org/news >> >> Fixes: >> - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53 > I've applied to master now, but hte build error of course still > exists on the 2021.11 branch. And 2021.02.x. Committed to 2021.02.x and 2021.11.x to fix that, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 15:57:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:57:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/qt5quickcontrols2: fix project URL Message-ID: <20220114161146.A192C80127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8af3f8029dfd22a134265937b61ba3346e2617e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://doc.qt.io/qt-5/qtquickcontrols2-index.html is re-directed to https://doc.qt.io/qt-5/qtquickcontrols-index.html so use it directly Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 83bf1790c13a6a6ba4e4008f685d7b824ed15079) Signed-off-by: Peter Korsgaard --- package/qt5/qt5quickcontrols2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 3f81e20d52..02e36257cc 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 This module was in tech preview in Qt 5.6, and promoted to a core module in Qt 5.7.0. - https://doc.qt.io/qt-5/qtquickcontrols2-index.html + https://doc.qt.io/qt-5/qtquickcontrols-index.html From peter at korsgaard.com Fri Jan 14 16:01:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:01:34 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mpd: correct typo in help message Message-ID: <20220114161146.AD753835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0fd2911938ff2a56df3214491b96c0d8fece89c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 158a04a0a9ca479146f13828516e77136b903095) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 7a2597558b..7731b203b9 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -398,7 +398,7 @@ config BR2_PACKAGE_MPD_ID3TAG endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7" +comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 8, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ From peter at korsgaard.com Fri Jan 14 16:05:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:05:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/runc: security bump to version 1.0.3 Message-ID: <20220114161146.BF4D680127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53b28814de5c18a5305e717b6ecc3ba3988a93c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-43784: runc is a CLI tool for spawning and running containers on Linux according to the OCI specification. In runc, netlink is used internally as a serialization system for specifying the relevant container configuration to the `C` portion of the code (responsible for the based namespace setup of containers). In all versions of runc prior to 1.0.3, the encoder did not handle the possibility of an integer overflow in the 16-bit length field for the byte array attribute type, meaning that a large enough malicious byte array attribute could result in the length overflowing and the attribute contents being parsed as netlink messages for container configuration. This vulnerability requires the attacker to have some control over the configuration of the container and would allow the attacker to bypass the namespace restrictions of the container by simply adding their own netlink payload which disables all namespaces. The main users impacted are those who allow untrusted images with untrusted configurations to run on their machines (such as with shared cloud infrastructure). runc version 1.0.3 contains a fix for this bug. As a workaround, one may try disallowing untrusted namespace paths from your container. It should be noted that untrusted namespace paths would allow the attacker to disable namespace protections entirely even in the absence of this bug. https://github.com/opencontainers/runc/releases/tag/v1.0.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0acaad1be2a41aecd78ab36fdeb3095d395c8d90) Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 365beac21d..4ef04132bf 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c3cca4bbeb5d9b2f5e3c0c401c9d27bc8a5d2a0db8a2f6a06efd03ad3c38a33 runc-1.0.2.tar.gz +sha256 0eaf2f6606d72f166a5e7138a8a8d4d8f85d84e43448c08c66a1c93ead17a574 runc-1.0.3.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index e77ef8111e..c4e45a00a9 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.0.2 +RUNC_VERSION = 1.0.3 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 14 15:56:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:56:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/qt5*: change project URLs to https Message-ID: <20220114161146.9AB5983487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=abcbd15a86645bb0e7e1960765496781c7e6e242 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 55a7666834e50cb756d7db2fb2ce7a535af61a77) Signed-off-by: Peter Korsgaard --- package/qt5/qt53d/Config.in | 2 +- package/qt5/qt5base/Config.in | 2 +- package/qt5/qt5connectivity/Config.in | 4 ++-- package/qt5/qt5declarative/Config.in | 4 ++-- package/qt5/qt5enginio/Config.in | 2 +- package/qt5/qt5graphicaleffects/Config.in | 2 +- package/qt5/qt5imageformats/Config.in | 2 +- package/qt5/qt5location/Config.in | 2 +- package/qt5/qt5multimedia/Config.in | 2 +- package/qt5/qt5quickcontrols/Config.in | 2 +- package/qt5/qt5script/Config.in | 2 +- package/qt5/qt5sensors/Config.in | 2 +- package/qt5/qt5serialbus/Config.in | 2 +- package/qt5/qt5serialport/Config.in | 2 +- package/qt5/qt5svg/Config.in | 2 +- package/qt5/qt5tools/Config.in | 2 +- package/qt5/qt5wayland/Config.in | 2 +- package/qt5/qt5webchannel/Config.in | 2 +- package/qt5/qt5webengine/Config.in | 2 +- package/qt5/qt5webkit/Config.in | 2 +- package/qt5/qt5websockets/Config.in | 2 +- package/qt5/qt5x11extras/Config.in | 2 +- package/qt5/qt5xmlpatterns/Config.in | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in index 5126078d09..9187bee82b 100644 --- a/package/qt5/qt53d/Config.in +++ b/package/qt5/qt53d/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_QT53D Enable the assimp package to gain the assimp sceneparser plugin. - http://doc.qt.io/qt-5/qt3d-index.html + https://doc.qt.io/qt-5/qt3d-index.html comment "qt53d module needs an OpenGL-capable backend" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index ee7c757c60..8533b27f7a 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5BASE contains the base Qt libraries: QtCore, QtNetwork, QtGui, QtWidgets, etc. - http://qt.io + https://qt.io if BR2_PACKAGE_QT5BASE diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index 51e8978f1f..244d01676d 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -10,8 +10,8 @@ config BR2_PACKAGE_QT5CONNECTIVITY Qt Connectivity module provides support for Bluetooth/NFC peripherials. - http://doc.qt.io/qt-5/qtbluetooth-index.html - http://doc.qt.io/qt-5/qtnfc-index.html + https://doc.qt.io/qt-5/qtbluetooth-index.html + https://doc.qt.io/qt-5/qtnfc-index.html comment "qt5connectivity needs neard and/or bluez5_utils" depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ5_UTILS diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 3ba9224c22..c95c16c827 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_QT5DECLARATIVE Qt Declarative module provides the Qt QML and Qt Quick modules for developing UIs with the QML language - http://doc.qt.io/qt-5/qtqml-index.html - http://doc.qt.io/qt-5/qtquick-index.html + https://doc.qt.io/qt-5/qtqml-index.html + https://doc.qt.io/qt-5/qtquick-index.html if BR2_PACKAGE_QT5DECLARATIVE diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index d445d91dea..b738f0db7c 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_QT5ENGINIO This package has been tagged as deprecated since version 5.6 and not recommended for new design. - http://doc.qt.io/archives/qt-5.5/enginio-index.html + https://doc.qt.io/archives/qt-5.5/enginio-index.html diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in index 69b7fca413..01946d8b7a 100644 --- a/package/qt5/qt5graphicaleffects/Config.in +++ b/package/qt5/qt5graphicaleffects/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS for adding visually impressive and configurable effects to user interfaces. - http://doc.qt.io/qt-5/qtgraphicaleffects-index.html + https://doc.qt.io/qt-5/qtgraphicaleffects-index.html comment "qt5graphicaleffects needs an OpenGL-capable backend" depends on !BR2_PACKAGE_QT5_GL_AVAILABLE diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in index 991f22f514..2504d23a59 100644 --- a/package/qt5/qt5imageformats/Config.in +++ b/package/qt5/qt5imageformats/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5IMAGEFORMATS The Qt Image Formats module provides plugins for additional image formats: TIFF, MNG, TGA, WBMP - http://doc.qt.io/qt-5/qtimageformats-index.html + https://doc.qt.io/qt-5/qtimageformats-index.html diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index c68deb1006..3d91adaf1f 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5LOCATION solutions using the data available from some of the popular location services. - http://doc.qt.io/qt-5/qtlocation-index.html + https://doc.qt.io/qt-5/qtlocation-index.html diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in index dd46575d93..46608555b8 100644 --- a/package/qt5/qt5multimedia/Config.in +++ b/package/qt5/qt5multimedia/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5MULTIMEDIA multimedia capabilities such as media playback and the use of camera and radio devices. - http://doc.qt.io/qt-5/multimediaoverview.html + https://doc.qt.io/qt-5/multimediaoverview.html diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 56fcaf7053..ae090eb6e1 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS The Qt Quick Controls module provides a set of controls that can be used to build complete interfaces in Qt Quick. - http://doc.qt.io/qt-5/qtquickcontrols-index.html + https://doc.qt.io/qt-5/qtquickcontrols-index.html diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in index 1926813e9f..6e08a3dfe8 100644 --- a/package/qt5/qt5script/Config.in +++ b/package/qt5/qt5script/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5SCRIPT 5.5.0 and should be replaced by Qt QML module in new design. - http://doc.qt.io/qt-5/qtscript-index.html + https://doc.qt.io/qt-5/qtscript-index.html diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in index 5e8ee65324..31a42e64aa 100644 --- a/package/qt5/qt5sensors/Config.in +++ b/package/qt5/qt5sensors/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_QT5SENSORS The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. - http://doc.qt.io/qt-5/qtsensors-index.html + https://doc.qt.io/qt-5/qtsensors-index.html diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in index bcfec29b49..466ab7dc9c 100644 --- a/package/qt5/qt5serialbus/Config.in +++ b/package/qt5/qt5serialbus/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5SERIALBUS This module was in tech preview in Qt 5.6, and promoted to a core module in Qt 5.8.0. - http://doc.qt.io/qt-5/qtserialbus-index.html + https://doc.qt.io/qt-5/qtserialbus-index.html comment "qt5serialbus needs headers >= 3.6" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in index 16c2eaa619..90cff86456 100644 --- a/package/qt5/qt5serialport/Config.in +++ b/package/qt5/qt5serialport/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5SERIALPORT includes configuring, I/O operations, getting and setting the control signals of the RS-232 pinouts. - http://doc.qt.io/qt-5/qtserialport-index.html + https://doc.qt.io/qt-5/qtserialport-index.html diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in index e9284913a0..02a5089b19 100644 --- a/package/qt5/qt5svg/Config.in +++ b/package/qt5/qt5svg/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5SVG Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices. - http://doc.qt.io/qt-5/qtsvg-index.html + https://doc.qt.io/qt-5/qtsvg-index.html diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in index 60106c1ee3..428413d5e2 100644 --- a/package/qt5/qt5tools/Config.in +++ b/package/qt5/qt5tools/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5TOOLS Qt Tools provides tools facilitate the development and design of applications. - http://doc.qt.io/qt-5/qtmodules.html#qt-tools + https://doc.qt.io/qt-5/qtmodules.html#qt-tools if BR2_PACKAGE_QT5TOOLS diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in index 0d5a108912..fe698fe876 100644 --- a/package/qt5/qt5wayland/Config.in +++ b/package/qt5/qt5wayland/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5WAYLAND This package corresponds to the qt5wayland module. - http://qt.io + https://qt.io if BR2_PACKAGE_QT5WAYLAND diff --git a/package/qt5/qt5webchannel/Config.in b/package/qt5/qt5webchannel/Config.in index 436e3abb2b..1cd295b146 100644 --- a/package/qt5/qt5webchannel/Config.in +++ b/package/qt5/qt5webchannel/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5WEBCHANNEL a server (QML/C++ application) and a client (HTML/JavaScript or QML application). - http://doc.qt.io/qt-5/qtwebchannel-index.html + https://doc.qt.io/qt-5/qtwebchannel-index.html diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 4e923c7f31..5d537cdf84 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -74,7 +74,7 @@ config BR2_PACKAGE_QT5WEBENGINE be made fully editable by the user through the use of the contenteditable attribute on HTML elements. - http://doc.qt.io/qt-5/qtwebengine-index.html + https://doc.qt.io/qt-5/qtwebengine-index.html if BR2_PACKAGE_QT5WEBENGINE diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 65f08d1c5e..308ae52ee3 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_QT5WEBKIT without GPU since the successor (QtWebEngine) requires OpenGL support. - http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html + https://doc.qt.io/archives/qt-5.5/qtwebkit-index.html comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ diff --git a/package/qt5/qt5websockets/Config.in b/package/qt5/qt5websockets/Config.in index 678fb6fa04..e7bd71b21d 100644 --- a/package/qt5/qt5websockets/Config.in +++ b/package/qt5/qt5websockets/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_QT5WEBSOCKETS process WebSocket requests, or a client that can consume data received from the server, or both. - http://doc.qt.io/qt-5/qtwebsockets-index.html + https://doc.qt.io/qt-5/qtwebsockets-index.html diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in index ff4cc11531..240443a30a 100644 --- a/package/qt5/qt5x11extras/Config.in +++ b/package/qt5/qt5x11extras/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5X11EXTRAS Qt X11 Extras enables the Qt programmer to write applications for the Linux/X11 platform. - http://doc.qt.io/qt-5/qtx11extras-index.html + https://doc.qt.io/qt-5/qtx11extras-index.html diff --git a/package/qt5/qt5xmlpatterns/Config.in b/package/qt5/qt5xmlpatterns/Config.in index 2f3eb24f23..4fcf7e92e3 100644 --- a/package/qt5/qt5xmlpatterns/Config.in +++ b/package/qt5/qt5xmlpatterns/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_QT5XMLPATTERNS The Qt XML Patterns module provides support for XPath, XQuery, XSLT, and XML Schema validation. - http://doc.qt.io/qt-5/qtxmlpatterns-index.html + https://doc.qt.io/qt-5/qtxmlpatterns-index.html From peter at korsgaard.com Fri Jan 14 16:04:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:04:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] utils/checkpackagelib/lib_mk.py: fix check for overridden variable Message-ID: <20220114161146.B5EFC83487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=816b35a37ec96639dd61f54ab1017d1cefd72809 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Currently this .mk snippet results in unexpected behavior from check-package: |VAR_1 = VALUE1 |ifeq (condition) |VAR_1 := $(VAR_1), VALUE2 |endif Fix commit "163f160a8e utils/{check-package, checkpackagelib}: consistently use raw strings for re.compile" that ended up doing this: - CONCATENATING = re.compile("^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") But raw strings do not expect escaping when referencing \1 and the pattern ends up searching for a raw '\\1' instead of an occurrence of the first pattern inside parenthesis. |$ python3 |Python 3.8.10 (default, Sep 28 2021, 16:10:42) |[GCC 9.3.0] on linux |Type "help", "copyright", "credits" or "license" for more information. |>>> import re |>>> p1 = re.compile('(foo)bar\\1') |>>> p2 = re.compile(r'(foo)bar\\1') |>>> p3 = re.compile(r'(foo)bar\1') |>>> s1 = 'foobarfoo' |>>> s2 = 'foobar\\1' |>>> print(p1.search(s1)) | |>>> print(p2.search(s1)) |None |>>> print(p3.search(s1)) | |>>> print(p1.search(s2)) |None |>>> print(p2.search(s2)) | |>>> print(p3.search(s2)) |None |>>> So use '\1' instead of '\\1' in the raw string. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Cc: Titouan Christophe Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5bbedea9c2317bfb04d1efd5fb157e725e86c2fb) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 0278354434..572fe75990 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -77,7 +77,7 @@ class Indent(_CheckFunction): class OverriddenVariable(_CheckFunction): - CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\1\)") END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) OVERRIDING_ASSIGNMENTS = [':=', "="] START_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(start_conditional))) From peter at korsgaard.com Fri Jan 14 16:14:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:14:17 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/capnproto: bump to version 0.9.1 Message-ID: <20220114161146.CFB9A835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f67a4dc06559f77b3c505f3e81168090b0aeb2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Drop patch (already in version) - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS variable: https://github.com/capnproto/capnproto/issues/1167 https://github.com/capnproto/capnproto/pull/1313 - Update indentation in hash file (two spaces) https://capnproto.org/news Fixes: - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ee3e17a7179a68c25b2a420ef7a26d3f3fba14c1) Signed-off-by: Peter Korsgaard --- ...-32-bit-architectures-using-64-bit-time_t.patch | 37 ---------------------- package/capnproto/capnproto.hash | 4 +-- package/capnproto/capnproto.mk | 7 +++- 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch deleted file mode 100644 index ce70ab8f29..0000000000 --- a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 12:10:28 -0800 -Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t - -mutex code uses SYS_futex, which it expects from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -rv32 is using 64bit time_t from get go unlike other 32bit architectures -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 -this aliases it to NR_futex so that SYS_futex is then defined for rv32 - -Signed-off-by: Khem Raj -[Retrieved from: -https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] -Signed-off-by: Fabrice Fontaine ---- - c++/src/kj/mutex.c++ | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ -index c81cead7b..e1594b117 100644 ---- a/c++/src/kj/mutex.c++ -+++ b/c++/src/kj/mutex.c++ -@@ -39,7 +39,13 @@ - - #ifndef SYS_futex - // Missing on Android/Bionic. -+#ifdef __NR_futex - #define SYS_futex __NR_futex -+#elif defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#else -+#error "Need working SYS_futex" -+#endif - #endif - - #ifndef FUTEX_WAIT_PRIVATE diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index d4500e0aad..7fd0e6158b 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz -sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE +sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz +sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 901b57ecda..7fc07043fb 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.8.0 +CAPNPROTO_VERSION = 0.9.1 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE @@ -29,5 +29,10 @@ else CAPNPROTO_CONF_OPTS += --without-openssl endif +# musl doesn't support getcontext/setcontext +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +CAPNPROTO_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DKJ_USE_FIBERS=0" +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Fri Jan 14 16:07:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:07:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.3775 Message-ID: <20220114161146.C7528835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0cca242d34133349c0026d281559b69c6134aec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4069: vim is vulnerable to Use After Free Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 7600ca7960d5d3b9b7eb0ad8690e8ff4c12ecf7d) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6ab309fd9a..9fb162d798 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 16ff13ea2a11da96080510fdfccf5f3a05f82e2c7027494bd8c98704bbf14428 vim-8.2.3690.tar.gz +sha256 acddd083c44a3a62194b73bb2fd1327af2adf256b5978c64f97d2656dda24d07 vim-8.2.3775.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 1fd090b4fc..e0079d3468 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3690 +VIM_VERSION = 8.2.3775 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 14 16:00:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:00:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mpd: correct typo in help message Message-ID: <20220114161151.37657835C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3472ab96734a7f7e43d07117f947cade9cad0f5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 158a04a0a9ca479146f13828516e77136b903095) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 5e49e69442..eb05f25a0b 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -391,7 +391,7 @@ config BR2_PACKAGE_MPD_ID3TAG endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7" +comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 8, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ From peter at korsgaard.com Fri Jan 14 16:07:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:07:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.3775 Message-ID: <20220114161151.54F1C835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=004aafb49b8d8b49d91c1d273a3c12fad77f9dce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4069: vim is vulnerable to Use After Free Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 7600ca7960d5d3b9b7eb0ad8690e8ff4c12ecf7d) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6ab309fd9a..9fb162d798 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 16ff13ea2a11da96080510fdfccf5f3a05f82e2c7027494bd8c98704bbf14428 vim-8.2.3690.tar.gz +sha256 acddd083c44a3a62194b73bb2fd1327af2adf256b5978c64f97d2656dda24d07 vim-8.2.3775.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 1fd090b4fc..e0079d3468 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3690 +VIM_VERSION = 8.2.3775 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 14 16:14:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:14:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/capnproto: bump to version 0.9.1 Message-ID: <20220114161151.6042E835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b05f64c4777c7233578eb06f8565ae432e3590f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Drop patch (already in version) - Fix build on musl by disabling fibers through the new KJ_USE_FIBERS variable: https://github.com/capnproto/capnproto/issues/1167 https://github.com/capnproto/capnproto/pull/1313 - Update indentation in hash file (two spaces) https://capnproto.org/news Fixes: - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ee3e17a7179a68c25b2a420ef7a26d3f3fba14c1) Signed-off-by: Peter Korsgaard --- ...-32-bit-architectures-using-64-bit-time_t.patch | 37 ---------------------- package/capnproto/capnproto.hash | 4 +-- package/capnproto/capnproto.mk | 7 +++- 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch deleted file mode 100644 index ce70ab8f29..0000000000 --- a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 12:10:28 -0800 -Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t - -mutex code uses SYS_futex, which it expects from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -rv32 is using 64bit time_t from get go unlike other 32bit architectures -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 -this aliases it to NR_futex so that SYS_futex is then defined for rv32 - -Signed-off-by: Khem Raj -[Retrieved from: -https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] -Signed-off-by: Fabrice Fontaine ---- - c++/src/kj/mutex.c++ | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ -index c81cead7b..e1594b117 100644 ---- a/c++/src/kj/mutex.c++ -+++ b/c++/src/kj/mutex.c++ -@@ -39,7 +39,13 @@ - - #ifndef SYS_futex - // Missing on Android/Bionic. -+#ifdef __NR_futex - #define SYS_futex __NR_futex -+#elif defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#else -+#error "Need working SYS_futex" -+#endif - #endif - - #ifndef FUTEX_WAIT_PRIVATE diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index d4500e0aad..7fd0e6158b 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz -sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE +sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz +sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 901b57ecda..7fc07043fb 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.8.0 +CAPNPROTO_VERSION = 0.9.1 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE @@ -29,5 +29,10 @@ else CAPNPROTO_CONF_OPTS += --without-openssl endif +# musl doesn't support getcontext/setcontext +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +CAPNPROTO_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DKJ_USE_FIBERS=0" +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Fri Jan 14 16:05:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:05:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/runc: security bump to version 1.0.3 Message-ID: <20220114161151.4BE93835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b025fb5f0e1d74c02a599e4cb743fc1a565f815 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-43784: runc is a CLI tool for spawning and running containers on Linux according to the OCI specification. In runc, netlink is used internally as a serialization system for specifying the relevant container configuration to the `C` portion of the code (responsible for the based namespace setup of containers). In all versions of runc prior to 1.0.3, the encoder did not handle the possibility of an integer overflow in the 16-bit length field for the byte array attribute type, meaning that a large enough malicious byte array attribute could result in the length overflowing and the attribute contents being parsed as netlink messages for container configuration. This vulnerability requires the attacker to have some control over the configuration of the container and would allow the attacker to bypass the namespace restrictions of the container by simply adding their own netlink payload which disables all namespaces. The main users impacted are those who allow untrusted images with untrusted configurations to run on their machines (such as with shared cloud infrastructure). runc version 1.0.3 contains a fix for this bug. As a workaround, one may try disallowing untrusted namespace paths from your container. It should be noted that untrusted namespace paths would allow the attacker to disable namespace protections entirely even in the absence of this bug. https://github.com/opencontainers/runc/releases/tag/v1.0.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0acaad1be2a41aecd78ab36fdeb3095d395c8d90) Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 365beac21d..4ef04132bf 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c3cca4bbeb5d9b2f5e3c0c401c9d27bc8a5d2a0db8a2f6a06efd03ad3c38a33 runc-1.0.2.tar.gz +sha256 0eaf2f6606d72f166a5e7138a8a8d4d8f85d84e43448c08c66a1c93ead17a574 runc-1.0.3.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index e77ef8111e..c4e45a00a9 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.0.2 +RUNC_VERSION = 1.0.3 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 14 15:56:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:56:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/qt5*: change project URLs to https Message-ID: <20220114161151.252BA835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4790030db42a013e44ccd31d9df7ba21756d6db8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 55a7666834e50cb756d7db2fb2ce7a535af61a77) Signed-off-by: Peter Korsgaard --- package/qt5/qt53d/Config.in | 2 +- package/qt5/qt5base/Config.in | 2 +- package/qt5/qt5connectivity/Config.in | 4 ++-- package/qt5/qt5declarative/Config.in | 4 ++-- package/qt5/qt5enginio/Config.in | 2 +- package/qt5/qt5graphicaleffects/Config.in | 2 +- package/qt5/qt5imageformats/Config.in | 2 +- package/qt5/qt5location/Config.in | 2 +- package/qt5/qt5multimedia/Config.in | 2 +- package/qt5/qt5quickcontrols/Config.in | 2 +- package/qt5/qt5script/Config.in | 2 +- package/qt5/qt5sensors/Config.in | 2 +- package/qt5/qt5serialbus/Config.in | 2 +- package/qt5/qt5serialport/Config.in | 2 +- package/qt5/qt5svg/Config.in | 2 +- package/qt5/qt5tools/Config.in | 2 +- package/qt5/qt5wayland/Config.in | 2 +- package/qt5/qt5webchannel/Config.in | 2 +- package/qt5/qt5webengine/Config.in | 2 +- package/qt5/qt5webkit/Config.in | 2 +- package/qt5/qt5websockets/Config.in | 2 +- package/qt5/qt5x11extras/Config.in | 2 +- package/qt5/qt5xmlpatterns/Config.in | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in index 5126078d09..9187bee82b 100644 --- a/package/qt5/qt53d/Config.in +++ b/package/qt5/qt53d/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_QT53D Enable the assimp package to gain the assimp sceneparser plugin. - http://doc.qt.io/qt-5/qt3d-index.html + https://doc.qt.io/qt-5/qt3d-index.html comment "qt53d module needs an OpenGL-capable backend" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index e93b2dec38..5b1749a4e9 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_QT5BASE contains the base Qt libraries: QtCore, QtNetwork, QtGui, QtWidgets, etc. - http://qt.io + https://qt.io if BR2_PACKAGE_QT5BASE diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index 51e8978f1f..244d01676d 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -10,8 +10,8 @@ config BR2_PACKAGE_QT5CONNECTIVITY Qt Connectivity module provides support for Bluetooth/NFC peripherials. - http://doc.qt.io/qt-5/qtbluetooth-index.html - http://doc.qt.io/qt-5/qtnfc-index.html + https://doc.qt.io/qt-5/qtbluetooth-index.html + https://doc.qt.io/qt-5/qtnfc-index.html comment "qt5connectivity needs neard and/or bluez5_utils" depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ5_UTILS diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 3ba9224c22..c95c16c827 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_QT5DECLARATIVE Qt Declarative module provides the Qt QML and Qt Quick modules for developing UIs with the QML language - http://doc.qt.io/qt-5/qtqml-index.html - http://doc.qt.io/qt-5/qtquick-index.html + https://doc.qt.io/qt-5/qtqml-index.html + https://doc.qt.io/qt-5/qtquick-index.html if BR2_PACKAGE_QT5DECLARATIVE diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index d445d91dea..b738f0db7c 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_QT5ENGINIO This package has been tagged as deprecated since version 5.6 and not recommended for new design. - http://doc.qt.io/archives/qt-5.5/enginio-index.html + https://doc.qt.io/archives/qt-5.5/enginio-index.html diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in index 69b7fca413..01946d8b7a 100644 --- a/package/qt5/qt5graphicaleffects/Config.in +++ b/package/qt5/qt5graphicaleffects/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS for adding visually impressive and configurable effects to user interfaces. - http://doc.qt.io/qt-5/qtgraphicaleffects-index.html + https://doc.qt.io/qt-5/qtgraphicaleffects-index.html comment "qt5graphicaleffects needs an OpenGL-capable backend" depends on !BR2_PACKAGE_QT5_GL_AVAILABLE diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in index 991f22f514..2504d23a59 100644 --- a/package/qt5/qt5imageformats/Config.in +++ b/package/qt5/qt5imageformats/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5IMAGEFORMATS The Qt Image Formats module provides plugins for additional image formats: TIFF, MNG, TGA, WBMP - http://doc.qt.io/qt-5/qtimageformats-index.html + https://doc.qt.io/qt-5/qtimageformats-index.html diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index c68deb1006..3d91adaf1f 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5LOCATION solutions using the data available from some of the popular location services. - http://doc.qt.io/qt-5/qtlocation-index.html + https://doc.qt.io/qt-5/qtlocation-index.html diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in index dd46575d93..46608555b8 100644 --- a/package/qt5/qt5multimedia/Config.in +++ b/package/qt5/qt5multimedia/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5MULTIMEDIA multimedia capabilities such as media playback and the use of camera and radio devices. - http://doc.qt.io/qt-5/multimediaoverview.html + https://doc.qt.io/qt-5/multimediaoverview.html diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 56fcaf7053..ae090eb6e1 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS The Qt Quick Controls module provides a set of controls that can be used to build complete interfaces in Qt Quick. - http://doc.qt.io/qt-5/qtquickcontrols-index.html + https://doc.qt.io/qt-5/qtquickcontrols-index.html diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in index 1926813e9f..6e08a3dfe8 100644 --- a/package/qt5/qt5script/Config.in +++ b/package/qt5/qt5script/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5SCRIPT 5.5.0 and should be replaced by Qt QML module in new design. - http://doc.qt.io/qt-5/qtscript-index.html + https://doc.qt.io/qt-5/qtscript-index.html diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in index 5e8ee65324..31a42e64aa 100644 --- a/package/qt5/qt5sensors/Config.in +++ b/package/qt5/qt5sensors/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_QT5SENSORS The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. - http://doc.qt.io/qt-5/qtsensors-index.html + https://doc.qt.io/qt-5/qtsensors-index.html diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in index bcfec29b49..466ab7dc9c 100644 --- a/package/qt5/qt5serialbus/Config.in +++ b/package/qt5/qt5serialbus/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5SERIALBUS This module was in tech preview in Qt 5.6, and promoted to a core module in Qt 5.8.0. - http://doc.qt.io/qt-5/qtserialbus-index.html + https://doc.qt.io/qt-5/qtserialbus-index.html comment "qt5serialbus needs headers >= 3.6" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in index 16c2eaa619..90cff86456 100644 --- a/package/qt5/qt5serialport/Config.in +++ b/package/qt5/qt5serialport/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5SERIALPORT includes configuring, I/O operations, getting and setting the control signals of the RS-232 pinouts. - http://doc.qt.io/qt-5/qtserialport-index.html + https://doc.qt.io/qt-5/qtserialport-index.html diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in index e9284913a0..02a5089b19 100644 --- a/package/qt5/qt5svg/Config.in +++ b/package/qt5/qt5svg/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_QT5SVG Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices. - http://doc.qt.io/qt-5/qtsvg-index.html + https://doc.qt.io/qt-5/qtsvg-index.html diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in index 60106c1ee3..428413d5e2 100644 --- a/package/qt5/qt5tools/Config.in +++ b/package/qt5/qt5tools/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5TOOLS Qt Tools provides tools facilitate the development and design of applications. - http://doc.qt.io/qt-5/qtmodules.html#qt-tools + https://doc.qt.io/qt-5/qtmodules.html#qt-tools if BR2_PACKAGE_QT5TOOLS diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in index 0d5a108912..fe698fe876 100644 --- a/package/qt5/qt5wayland/Config.in +++ b/package/qt5/qt5wayland/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_QT5WAYLAND This package corresponds to the qt5wayland module. - http://qt.io + https://qt.io if BR2_PACKAGE_QT5WAYLAND diff --git a/package/qt5/qt5webchannel/Config.in b/package/qt5/qt5webchannel/Config.in index 436e3abb2b..1cd295b146 100644 --- a/package/qt5/qt5webchannel/Config.in +++ b/package/qt5/qt5webchannel/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5WEBCHANNEL a server (QML/C++ application) and a client (HTML/JavaScript or QML application). - http://doc.qt.io/qt-5/qtwebchannel-index.html + https://doc.qt.io/qt-5/qtwebchannel-index.html diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 4e923c7f31..5d537cdf84 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -74,7 +74,7 @@ config BR2_PACKAGE_QT5WEBENGINE be made fully editable by the user through the use of the contenteditable attribute on HTML elements. - http://doc.qt.io/qt-5/qtwebengine-index.html + https://doc.qt.io/qt-5/qtwebengine-index.html if BR2_PACKAGE_QT5WEBENGINE diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 4abb04844c..82e38dff52 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_QT5WEBKIT without GPU since the successor (QtWebEngine) requires OpenGL support. - http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html + https://doc.qt.io/archives/qt-5.5/qtwebkit-index.html comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.9, host gcc >= 4.9" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ diff --git a/package/qt5/qt5websockets/Config.in b/package/qt5/qt5websockets/Config.in index 678fb6fa04..e7bd71b21d 100644 --- a/package/qt5/qt5websockets/Config.in +++ b/package/qt5/qt5websockets/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_QT5WEBSOCKETS process WebSocket requests, or a client that can consume data received from the server, or both. - http://doc.qt.io/qt-5/qtwebsockets-index.html + https://doc.qt.io/qt-5/qtwebsockets-index.html diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in index ff4cc11531..240443a30a 100644 --- a/package/qt5/qt5x11extras/Config.in +++ b/package/qt5/qt5x11extras/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_QT5X11EXTRAS Qt X11 Extras enables the Qt programmer to write applications for the Linux/X11 platform. - http://doc.qt.io/qt-5/qtx11extras-index.html + https://doc.qt.io/qt-5/qtx11extras-index.html diff --git a/package/qt5/qt5xmlpatterns/Config.in b/package/qt5/qt5xmlpatterns/Config.in index 2f3eb24f23..4fcf7e92e3 100644 --- a/package/qt5/qt5xmlpatterns/Config.in +++ b/package/qt5/qt5xmlpatterns/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_QT5XMLPATTERNS The Qt XML Patterns module provides support for XPath, XQuery, XSLT, and XML Schema validation. - http://doc.qt.io/qt-5/qtxmlpatterns-index.html + https://doc.qt.io/qt-5/qtxmlpatterns-index.html From peter at korsgaard.com Fri Jan 14 16:04:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:04:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] utils/checkpackagelib/lib_mk.py: fix check for overridden variable Message-ID: <20220114161151.41D87835A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56e7d20666934352074ddf5db48acf8627829278 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Currently this .mk snippet results in unexpected behavior from check-package: |VAR_1 = VALUE1 |ifeq (condition) |VAR_1 := $(VAR_1), VALUE2 |endif Fix commit "163f160a8e utils/{check-package, checkpackagelib}: consistently use raw strings for re.compile" that ended up doing this: - CONCATENATING = re.compile("^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") But raw strings do not expect escaping when referencing \1 and the pattern ends up searching for a raw '\\1' instead of an occurrence of the first pattern inside parenthesis. |$ python3 |Python 3.8.10 (default, Sep 28 2021, 16:10:42) |[GCC 9.3.0] on linux |Type "help", "copyright", "credits" or "license" for more information. |>>> import re |>>> p1 = re.compile('(foo)bar\\1') |>>> p2 = re.compile(r'(foo)bar\\1') |>>> p3 = re.compile(r'(foo)bar\1') |>>> s1 = 'foobarfoo' |>>> s2 = 'foobar\\1' |>>> print(p1.search(s1)) | |>>> print(p2.search(s1)) |None |>>> print(p3.search(s1)) | |>>> print(p1.search(s2)) |None |>>> print(p2.search(s2)) | |>>> print(p3.search(s2)) |None |>>> So use '\1' instead of '\\1' in the raw string. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Cc: Titouan Christophe Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5bbedea9c2317bfb04d1efd5fb157e725e86c2fb) Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/lib_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 0278354434..572fe75990 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -77,7 +77,7 @@ class Indent(_CheckFunction): class OverriddenVariable(_CheckFunction): - CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + CONCATENATING = re.compile(r"^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\1\)") END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) OVERRIDING_ASSIGNMENTS = [':=', "="] START_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(start_conditional))) From peter at korsgaard.com Fri Jan 14 15:57:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 16:57:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/qt5quickcontrols2: fix project URL Message-ID: <20220114161151.2E283835B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c11f5d893ebdf10acb4e218856d5f6827e720bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://doc.qt.io/qt-5/qtquickcontrols2-index.html is re-directed to https://doc.qt.io/qt-5/qtquickcontrols-index.html so use it directly Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 83bf1790c13a6a6ba4e4008f685d7b824ed15079) Signed-off-by: Peter Korsgaard --- package/qt5/qt5quickcontrols2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 3f81e20d52..02e36257cc 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 This module was in tech preview in Qt 5.6, and promoted to a core module in Qt 5.7.0. - https://doc.qt.io/qt-5/qtquickcontrols2-index.html + https://doc.qt.io/qt-5/qtquickcontrols-index.html From peter at korsgaard.com Fri Jan 14 16:37:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:37:19 +0100 Subject: [Buildroot] [PATCH] utils/getdeveloperlib.py: fix developer being reported for unrelated path In-Reply-To: <20211121215713.4167839-1-ricardo.martincoski@gmail.com> (Ricardo Martincoski's message of "Sun, 21 Nov 2021 18:57:13 -0300") References: <20211121215713.4167839-1-ricardo.martincoski@gmail.com> Message-ID: <878rvi6zpc.fsf@dell.be.48ers.dk> >>>>> "Ricardo" == Ricardo Martincoski writes: > Currently, by following the instructions in the manual and querying for > developers for a patch that changes path > package/foobar > the script reports both developers that have these entries in the > DEVELOPERS file: > F: package/foo/ > F: package/foobar/ > Starting from commit "afc112b0e4 utils/getdeveloperlib.py: fix issue > with hasfile()" get-developers script uses os.path.abspath() and > os.path.relpath(). > The catch is that those functions return the absolute path and the > relative path without the trailing slash. > When the paths associated to a developer are then compared to the paths > a patch touches, using the string.startswith(), any substring returns > True, leading to developers for package/foo/ being wrongly reported > for package/foobar/ . > Fix this by re-adding the trailing slash after using relpath(). > Signed-off-by: Ricardo Martincoski > Cc: Heiko Thiery > Cc: James Knight > Cc: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:40:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:40:56 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: Don't print directory in 'make' call In-Reply-To: <20211211204815.0159982964@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 11 Dec 2021 21:35:19 +0100") References: <20211211204815.0159982964@busybox.osuosl.org> Message-ID: <874k666zjb.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=c988867fd2c72fe5abeb63c4abe92f10eea6499d > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > It is possible that some users of buildroot have put it in a repository > and call into it from another Makefile such as: > .DEFAULT: > $(MAKE) O=$(abspath $(O)) -C buildroot $(@) > This technique works well except that Make tells us that it changes into > the buildroot directory: > make[1]: Entering directory 'buildroot' > Because this line doesn't have an equals within it, python raises a > ValueError exception within pkg-stats. > This patch has python tell the invoked make not to print directories > Signed-off-by: Cyril Bur > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:36:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:36:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] utils/getdeveloperlib.py: fix developer being reported for unrelated path Message-ID: <20220114164237.5E57E82B9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c062ff23f231c8d8e14b9168841e532768a382ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Currently, by following the instructions in the manual and querying for developers for a patch that changes path package/foobar the script reports both developers that have these entries in the DEVELOPERS file: F: package/foo/ F: package/foobar/ Starting from commit "afc112b0e4 utils/getdeveloperlib.py: fix issue with hasfile()" get-developers script uses os.path.abspath() and os.path.relpath(). The catch is that those functions return the absolute path and the relative path without the trailing slash. When the paths associated to a developer are then compared to the paths a patch touches, using the string.startswith(), any substring returns True, leading to developers for package/foo/ being wrongly reported for package/foobar/ . Fix this by re-adding the trailing slash after using relpath(). Signed-off-by: Ricardo Martincoski Cc: Heiko Thiery Cc: James Knight Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 29bb478a49712dfa8ec25262cac77b7c8ff1e51f) Signed-off-by: Peter Korsgaard --- utils/getdeveloperlib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index e686bc793f..2575c87a36 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -254,6 +254,8 @@ def parse_developers(): for f in dev_files: dev_file = os.path.relpath(f, brpath) dev_file = dev_file.replace(os.sep, '/') # force unix sep + if f[-1] == '/': # relpath removes the trailing / + dev_file = dev_file + '/' files.append(dev_file) elif line == "": if not name: From peter at korsgaard.com Fri Jan 14 16:40:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:40:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: Don't print directory in 'make' call Message-ID: <20220114164237.66C57835C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22c4abd1449880ef1557101308aec84321990371 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x It is possible that some users of buildroot have put it in a repository and call into it from another Makefile such as: .DEFAULT: $(MAKE) O=$(abspath $(O)) -C buildroot $(@) This technique works well except that Make tells us that it changes into the buildroot directory: make[1]: Entering directory 'buildroot' Because this line doesn't have an equals within it, python raises a ValueError exception within pkg-stats. This patch has python tell the invoked make not to print directories Signed-off-by: Cyril Bur Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c988867fd2c72fe5abeb63c4abe92f10eea6499d) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 4e7f27c3a3..6e656bfc29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -364,7 +364,8 @@ def get_config_packages(): def package_init_make_info(): # Fetch all variables at once - variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", + variables = subprocess.check_output(["make", "--no-print-directory", "-s", + "BR2_HAVE_DOT_CONFIG=y", "printvars", "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES %_CPE_ID"]) variable_list = variables.decode().splitlines() From peter at korsgaard.com Fri Jan 14 16:35:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:35:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] utils/getdeveloperlib.py: fix developer being reported for unrelated path Message-ID: <20220114164245.B917883487@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a86d297ba09061051d54cf859b194054afd26ba8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Currently, by following the instructions in the manual and querying for developers for a patch that changes path package/foobar the script reports both developers that have these entries in the DEVELOPERS file: F: package/foo/ F: package/foobar/ Starting from commit "afc112b0e4 utils/getdeveloperlib.py: fix issue with hasfile()" get-developers script uses os.path.abspath() and os.path.relpath(). The catch is that those functions return the absolute path and the relative path without the trailing slash. When the paths associated to a developer are then compared to the paths a patch touches, using the string.startswith(), any substring returns True, leading to developers for package/foo/ being wrongly reported for package/foobar/ . Fix this by re-adding the trailing slash after using relpath(). Signed-off-by: Ricardo Martincoski Cc: Heiko Thiery Cc: James Knight Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 29bb478a49712dfa8ec25262cac77b7c8ff1e51f) Signed-off-by: Peter Korsgaard --- utils/getdeveloperlib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index f2b36862e3..c05e1f888b 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -253,6 +253,8 @@ def parse_developers(): for f in dev_files: dev_file = os.path.relpath(f, brpath) dev_file = dev_file.replace(os.sep, '/') # force unix sep + if f[-1] == '/': # relpath removes the trailing / + dev_file = dev_file + '/' files.append(dev_file) elif line == "": if not name: From peter at korsgaard.com Fri Jan 14 16:40:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:40:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: Don't print directory in 'make' call Message-ID: <20220114164245.C0A94835C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b950f813282b65de014ea3042c569500eee3687 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x It is possible that some users of buildroot have put it in a repository and call into it from another Makefile such as: .DEFAULT: $(MAKE) O=$(abspath $(O)) -C buildroot $(@) This technique works well except that Make tells us that it changes into the buildroot directory: make[1]: Entering directory 'buildroot' Because this line doesn't have an equals within it, python raises a ValueError exception within pkg-stats. This patch has python tell the invoked make not to print directories Signed-off-by: Cyril Bur Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c988867fd2c72fe5abeb63c4abe92f10eea6499d) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 3992c8312a..a435abff3d 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -375,7 +375,8 @@ def get_config_packages(): def package_init_make_info(): # Fetch all variables at once - variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", + variables = subprocess.check_output(["make", "--no-print-directory", "-s", + "BR2_HAVE_DOT_CONFIG=y", "printvars", "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES %_CPE_ID"]) variable_list = variables.decode().splitlines() From peter at korsgaard.com Fri Jan 14 16:56:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:56:07 +0100 Subject: [Buildroot] [git commit] package/grpc: add missing licenses In-Reply-To: <20211211204815.2C2E182964@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 11 Dec 2021 21:46:17 +0100") References: <20211211204815.2C2E182964@busybox.osuosl.org> Message-ID: <87zgny5k9k.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=50c4fd9363c1e7ee864e3892e7c066ce4b38fdd4 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Some of the third party code is BSD-licensed. In addition, the roots.pem > certificate store is MPL-licensed. > This was probably already the case in earlier versions as well, but it > was only noticed while updating to 1.42.0 because the LICENSE file was > adapted for it. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 14 16:51:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:51:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/grpc: add missing licenses Message-ID: <20220114165000.D74698356B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=352f8567909a7fde994b4eca4366a90be7ad7d71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Some of the third party code is BSD-licensed. In addition, the roots.pem certificate store is MPL-licensed. This was probably already the case in earlier versions as well, but it was only noticed while updating to 1.42.0 because the LICENSE file was adapted for it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 50c4fd9363c1e7ee864e3892e7c066ce4b38fdd4) Signed-off-by: Peter Korsgaard --- package/grpc/grpc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index f7a704dcd1..3094a77ade 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -6,7 +6,7 @@ GRPC_VERSION = 1.35.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) -GRPC_LICENSE = Apache-2.0 +GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE GRPC_CPE_ID_VENDOR = grpc From peter at korsgaard.com Fri Jan 14 16:51:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 14 Jan 2022 17:51:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/grpc: add missing licenses Message-ID: <20220114165012.120818356B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fea34dddc967e7fc3377dee8f17bd32615a1523 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Some of the third party code is BSD-licensed. In addition, the roots.pem certificate store is MPL-licensed. This was probably already the case in earlier versions as well, but it was only noticed while updating to 1.42.0 because the LICENSE file was adapted for it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 50c4fd9363c1e7ee864e3892e7c066ce4b38fdd4) Signed-off-by: Peter Korsgaard --- package/grpc/grpc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 1bb4bd2b98..110e5e640a 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -6,7 +6,7 @@ GRPC_VERSION = 1.41.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) -GRPC_LICENSE = Apache-2.0 +GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE GRPC_CPE_ID_VENDOR = grpc From fontaine.fabrice at gmail.com Fri Jan 14 17:18:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 18:18:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable system on host Message-ID: <20220114171847.634174-1-fontaine.fabrice@gmail.com> boost system (which provides boost asio) is needed by host-riscv-isa-sim since its addition in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure: error: Could not find a version of the Boost::Asio library! Fixes: - http://autobuild.buildroot.org/results/6c33a66386ab2171454d8ea8c1bd17a5582e21dd Signed-off-by: Fabrice Fontaine --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6d1046e9a2..2d2a8fb311 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace system test thread timer \ + python random serialization stacktrace test thread timer \ type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) -- 2.34.1 From herve.codina at bootlin.com Fri Jan 14 17:44:33 2022 From: herve.codina at bootlin.com (Herve Codina) Date: Fri, 14 Jan 2022 18:44:33 +0100 Subject: [Buildroot] [PATCH 3/3] package/gstreamer1/gst1-imx2: new package In-Reply-To: <20220112094250.27022-3-sebastien.szymanski@armadeus.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> <20220112094250.27022-3-sebastien.szymanski@armadeus.com> Message-ID: <20220114184433.687ebc15@bootlin.com> Hi S?bastien, all On Wed, 12 Jan 2022 10:42:50 +0100 S?bastien Szymanski wrote: > This is version 2 of gst1-imx. > > Signed-off-by: S?bastien Szymanski > --- > package/gstreamer1/Config.in | 1 + > package/gstreamer1/gst1-imx2/Config.in | 75 +++++++++++++++++++++ > package/gstreamer1/gst1-imx2/gst1-imx2.hash | 3 + > package/gstreamer1/gst1-imx2/gst1-imx2.mk | 75 +++++++++++++++++++++ > 4 files changed, 154 insertions(+) > create mode 100644 package/gstreamer1/gst1-imx2/Config.in > create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.hash > create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.mk > This package seems an update of the existing gst1-imx package. Why add a new package instead of bumping gst1-imx ? Best regards, Herv? -- Herv? Codina, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Fri Jan 14 17:56:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 18:56:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/hiawatha: fix build with gcc 4.8 Message-ID: <20220114175614.963475-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit 4e36e8f2081a66f477dd038793082045876d65ee: /tmp/instance-1/output-1/build/hiawatha-11.1/mbedtls/library/ecjpake.c: In function 'self_test_rng': /tmp/instance-1/output-1/build/hiawatha-11.1/mbedtls/library/ecjpake.c:973:5: error: 'for' loop initial declarations are only allowed in C99 mode for( size_t i = 0; i < len; i++ ) ^ Fixes: - http://autobuild.buildroot.org/results/1befc1552af91f34c600229138910c2078c2fdca Signed-off-by: Fabrice Fontaine --- package/hiawatha/hiawatha.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 14d3c9f1ee..25da98a43c 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -15,6 +15,7 @@ HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver HIAWATHA_CONF_OPTS = \ -DINSTALL_MBEDTLS_HEADERS=OFF \ -DUSE_SYSTEM_MBEDTLS=OFF \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ -DENABLE_TOOLKIT=OFF \ -DCONFIG_DIR=/etc/hiawatha \ -DLOG_DIR=/var/log \ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 18:02:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 19:02:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR Message-ID: <20220114180242.963756-1-fontaine.fabrice@gmail.com> cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb Signed-off-by: Fabrice Fontaine --- package/targetcli-fb/targetcli-fb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..7425423b8f 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 21:06:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 22:06:50 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-configshell-fb: bump to version 1.1.29 Message-ID: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/python-configshell-fb/python-configshell-fb.hash | 2 +- package/python-configshell-fb/python-configshell-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-configshell-fb/python-configshell-fb.hash b/package/python-configshell-fb/python-configshell-fb.hash index 0903e284aa..8fc38f61a6 100644 --- a/package/python-configshell-fb/python-configshell-fb.hash +++ b/package/python-configshell-fb/python-configshell-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 3685446d6ee02881930bb2fdc5fdd254938da66ce9843a5b3676c4246b058e4b python-configshell-fb-1.1.fb18.tar.gz +sha256 24b47284b463dcfb9ee0c1558827e13442127e62fa279b6e0253f136cf49058c python-configshell-fb-1.1.29.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index 94b6fed5ab..d0dd421e8d 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = 1.1.fb18 +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.29 PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 21:06:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 22:06:51 +0100 Subject: [Buildroot] [PATCH 2/3] package/python-rtslib-fb: bump to version 2.1.74 In-Reply-To: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> References: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> Message-ID: <20220114210652.1057109-2-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/python-rtslib-fb/python-rtslib-fb.hash | 2 +- package/python-rtslib-fb/python-rtslib-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index f67231d398..3c2e39fffd 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-2.1.fb57.tar.gz +sha256 9f581c4bcffebc60be236af8a6ebdeccdb66d0435eeb04ab1b743c170b95d046 python-rtslib-fb-2.1.74.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 421fbed0ae..09bde874f0 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = 2.1.fb57 +PYTHON_RTSLIB_FB_VERSION = 2.1.74 # Do not switch site to PyPI: it does not contain the latest version. PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 21:06:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 22:06:52 +0100 Subject: [Buildroot] [PATCH 3/3] package/targetcli-fb: security bump to version 2.1.54 In-Reply-To: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> References: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> Message-ID: <20220114210652.1057109-3-fontaine.fabrice@gmail.com> Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak permissions for /etc/target (and for the backup directory and backup files). Signed-off-by: Fabrice Fontaine --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 207c38e046..64f68a6675 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 7425423b8f..c6ca776b27 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING -- 2.34.1 From heiko.thiery at gmail.com Fri Jan 14 21:15:26 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 14 Jan 2022 22:15:26 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220114211525.2697606-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- v2: - switch to extlinux - directly call genimage.sh - remove post-image.sh - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 7 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 59 ++++ 8 files changed, 505 insertions(+) create mode 100644 board/kontron/bl-imx8mm/extlinux.conf create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..93c5760489 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1179,7 +1179,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf new file mode 100644 index 0000000000..d38f7f81b7 --- /dev/null +++ b/board/kontron/bl-imx8mm/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..6c0ef69591 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,18 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 16K + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33k + } + + partition rootfs { + image = "rootfs.ext4" + offset = 8M + partition-uuid = %PARTUUID% + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..ed088dd0f8 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,28 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..3bc71325c6 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,302 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..5b5648cc14 --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,59 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.30.2 From giulio.benetti at benettiengineering.com Fri Jan 14 21:37:16 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 14 Jan 2022 22:37:16 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220114211525.2697606-1-heiko.thiery@gmail.com> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> Message-ID: Hi Heiko, > Il giorno 14 gen 2022, alle ore 22:17, Heiko Thiery ha scritto: > > ?The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > Cc: Frieder Schrempf > Signed-off-by: Heiko Thiery > --- > v2: > - switch to extlinux > - directly call genimage.sh > - remove post-image.sh > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > > DEVELOPERS | 2 + > board/kontron/bl-imx8mm/extlinux.conf | 4 + > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ > ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ > board/kontron/bl-imx8mm/post-build.sh | 7 + > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > configs/kontron_bl_imx8mm_defconfig | 59 ++++ > 8 files changed, 505 insertions(+) > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > create mode 100644 board/kontron/bl-imx8mm/readme.txt > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index c0bfde69da..93c5760489 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1179,7 +1179,9 @@ F: package/python-sip/ > F: package/uhd/ > > N: Heiko Thiery > +F: board/kontron/bl-imx8mm/ > F: board/kontron/pitx-imx8m/ > +F: configs/kontron_bl_imx8mm_defconfig > F: configs/kontron_pitx_imx8m_defconfig > F: package/altera-stapl/ > F: package/ipmitool/ > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > new file mode 100644 > index 0000000000..d38f7f81b7 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > new file mode 100644 > index 0000000000..6c0ef69591 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/genimage.cfg > @@ -0,0 +1,18 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 16K > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33k I?ve missed V1 patch, here ^^^ please use capitol K letter. I still have to write the linter for genimage.cfg files :-/ > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + offset = 8M > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..ed088dd0f8 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,28 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > + > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > + > +Signed-off-by: Heiko Thiery > +--- > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > +index 35d12fca32..940bf07a92 100644 > +--- a/configs/kontron-sl-mx8mm_defconfig > ++++ b/configs/kontron-sl-mx8mm_defconfig > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > + CONFIG_SPL_TEXT_BASE=0x7E1000 > + CONFIG_TARGET_KONTRON_MX8MM=y > ++CONFIG_SPL_MMC=y > ++CONFIG_SPL_SERIAL=y > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > + CONFIG_SPL=y > + CONFIG_DISTRO_DEFAULTS=y > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > new file mode 100644 > index 0000000000..3bc71325c6 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > @@ -0,0 +1,302 @@ > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > + u-boot.dtsi > + > +When using a board variant that selects the lvds specific dtb the > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > +include this in the board base u-boot.dtsi and create an additional one > +for the lvds variant. > + > +Signed-off-by: Heiko Thiery > +--- > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > + 3 files changed, 135 insertions(+), 123 deletions(-) > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > + > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +new file mode 100644 > +index 0000000000..4bf75722bf > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +@@ -0,0 +1,6 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +index 22d18e6f1c..4bf75722bf 100644 > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +@@ -3,126 +3,4 @@ > + * Copyright (C) 2019 Kontron Electronics GmbH > + */ > + > +-#include "imx8mm-u-boot.dtsi" > +- > +-/ { > +- aliases { > +- usb0 = &usbotg1; > +- usb1 = &usbotg2; > +- }; > +- > +- wdt-reboot { > +- compatible = "wdt-reboot"; > +- wdt = <&wdog1>; > +- u-boot,dm-spl; > +- }; > +- > +- firmware { > +- optee { > +- compatible = "linaro,optee-tz"; > +- method = "smc"; > +- }; > +- }; > +-}; > +- > +-&fec1 { > +- phy-mode = "rgmii-rxid"; > +-}; > +- > +-&i2c1 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&i2c2 { > +- status = "okay"; > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_i2c1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_pmic { > +- u-boot,dm-spl; > +- fsl,pins = < > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > +- /* Disable Pullup for SD_VSEL */ > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > +- >; > +-}; > +- > +-&pinctrl_uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_100mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_200mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&pca9450 { > +- u-boot,dm-spl; > +-}; > +- > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > +- u-boot,dm-spl; > +-}; > +- > +-&ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio2 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio3 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio4 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio5 { > +- u-boot,dm-spl; > +-}; > +- > +-&uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&wdog1 { > +- u-boot,dm-spl; > +-}; > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +new file mode 100644 > +index 0000000000..22d18e6f1c > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +@@ -0,0 +1,128 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-u-boot.dtsi" > ++ > ++/ { > ++ aliases { > ++ usb0 = &usbotg1; > ++ usb1 = &usbotg2; > ++ }; > ++ > ++ wdt-reboot { > ++ compatible = "wdt-reboot"; > ++ wdt = <&wdog1>; > ++ u-boot,dm-spl; > ++ }; > ++ > ++ firmware { > ++ optee { > ++ compatible = "linaro,optee-tz"; > ++ method = "smc"; > ++ }; > ++ }; > ++}; > ++ > ++&fec1 { > ++ phy-mode = "rgmii-rxid"; > ++}; > ++ > ++&i2c1 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&i2c2 { > ++ status = "okay"; > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; I don?t know the hardware of the board and it?s a bit off-topic, but do you really need 2 i2c channels before relocating uboot? Best regards Giulio > ++ > ++&pinctrl_ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_i2c1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_pmic { > ++ u-boot,dm-spl; > ++ fsl,pins = < > ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > ++ /* Disable Pullup for SD_VSEL */ > ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > ++ >; > ++}; > ++ > ++&pinctrl_uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_100mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_200mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pca9450 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > ++ u-boot,dm-spl; > ++}; > ++ > ++&ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio3 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio4 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio5 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&wdog1 { > ++ u-boot,dm-spl; > ++}; > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > new file mode 100644 > index 0000000000..df47ba5174 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/readme.txt > @@ -0,0 +1,85 @@ > +Kontron BL i.MX8M Mini > +====================== > + > +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > + > + > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make kontron_bl_imx8mm_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and build the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? flash.bin > + ??? Image > + ??? imx8mm-kontron-n801x-s.dtb > + ??? lpddr4_pmu_train_1d_dmem_201904.bin > + ??? lpddr4_pmu_train_1d_dmem_202006.bin > + ??? lpddr4_pmu_train_1d_dmem.bin > + ??? lpddr4_pmu_train_1d_dmem_pad.bin > + ??? lpddr4_pmu_train_1d_fw.bin > + ??? lpddr4_pmu_train_1d_imem_201904.bin > + ??? lpddr4_pmu_train_1d_imem_202006.bin > + ??? lpddr4_pmu_train_1d_imem.bin > + ??? lpddr4_pmu_train_1d_imem_pad.bin > + ??? lpddr4_pmu_train_2d_dmem_201904.bin > + ??? lpddr4_pmu_train_2d_dmem_202006.bin > + ??? lpddr4_pmu_train_2d_dmem.bin > + ??? lpddr4_pmu_train_2d_dmem_pad.bin > + ??? lpddr4_pmu_train_2d_fw.bin > + ??? lpddr4_pmu_train_2d_imem_201904.bin > + ??? lpddr4_pmu_train_2d_imem_202006.bin > + ??? lpddr4_pmu_train_2d_imem.bin > + ??? lpddr4_pmu_train_2d_imem_pad.bin > + ??? lpddr4_pmu_train_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot-spl.bin > + > + > +Flashing the SD card image > +========================== > + > +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > + > + $ sudo dd if=output/images/sdcard.img of= > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Insert the SD card > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. To make sure the bootloader loads bootscript from > +the correct location (SD card) set the boot_targets environment variable: > + > + $ setenv boot_targets mmc1 > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > new file mode 100644 > index 0000000000..5b5648cc14 > --- /dev/null > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -0,0 +1,59 @@ > +# Architecture > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y > + > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Fri Jan 14 21:45:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 22:45:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/ipmitool: add freeipmi optional dependency Message-ID: <20220114214526.1153063-1-fontaine.fabrice@gmail.com> freeipmi is an optional dependency which is enabled by default Signed-off-by: Fabrice Fontaine --- package/ipmitool/ipmitool.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index facd97a0b8..801f1ea6b0 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -19,6 +19,13 @@ IPMITOOL_CPE_ID_VENDOR = ipmitool_project # 0013-fru-sdr-Fix-id_string-buffer-overflows.patch IPMITOOL_IGNORE_CVES += CVE-2020-5208 +ifeq ($(BR2_PACKAGE_FREEIPMI),y) +IPMITOOL_DEPENDENCIES += freeipmi +IPMITOOL_CONF_OPTS += --enable-intf-free +else +IPMITOOL_CONF_OPTS += --disable-intf-free +endif + ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) IPMITOOL_DEPENDENCIES += openssl IPMITOOL_CONF_OPTS += --enable-intf-lanplus -- 2.34.1 From heiko.thiery at gmail.com Fri Jan 14 21:54:32 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 14 Jan 2022 22:54:32 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220114211525.2697606-1-heiko.thiery@gmail.com> Message-ID: Hi Giulio, Am Fr., 14. Jan. 2022 um 22:37 Uhr schrieb Giulio Benetti : > > Hi Heiko, > > > Il giorno 14 gen 2022, alle ore 22:17, Heiko Thiery ha scritto: > > > > ?The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > > > Cc: Frieder Schrempf > > Signed-off-by: Heiko Thiery > > --- > > v2: > > - switch to extlinux > > - directly call genimage.sh > > - remove post-image.sh > > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > > > > > DEVELOPERS | 2 + > > board/kontron/bl-imx8mm/extlinux.conf | 4 + > > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > > ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ > > ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ > > board/kontron/bl-imx8mm/post-build.sh | 7 + > > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > > configs/kontron_bl_imx8mm_defconfig | 59 ++++ > > 8 files changed, 505 insertions(+) > > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > > create mode 100644 board/kontron/bl-imx8mm/readme.txt > > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index c0bfde69da..93c5760489 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1179,7 +1179,9 @@ F: package/python-sip/ > > F: package/uhd/ > > > > N: Heiko Thiery > > +F: board/kontron/bl-imx8mm/ > > F: board/kontron/pitx-imx8m/ > > +F: configs/kontron_bl_imx8mm_defconfig > > F: configs/kontron_pitx_imx8m_defconfig > > F: package/altera-stapl/ > > F: package/ipmitool/ > > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > > new file mode 100644 > > index 0000000000..d38f7f81b7 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/extlinux.conf > > @@ -0,0 +1,4 @@ > > +label buildroot > > + kernel /boot/Image > > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > > + append root=PARTUUID=%PARTUUID% rootwait rw > > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > > new file mode 100644 > > index 0000000000..6c0ef69591 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/genimage.cfg > > @@ -0,0 +1,18 @@ > > +image sdcard.img { > > + hdimage { > > + partition-table-type = "gpt" > > + gpt-location = 16K > > + } > > + > > + partition imx-boot { > > + in-partition-table = "no" > > + image = "flash.bin" > > + offset = 33k > > I?ve missed V1 patch, here ^^^ please use capitol K letter. > I still have to write the linter for genimage.cfg files :-/ Indeed .. missed that. I will wait for some more comments and do a v3 with that fixed later. [snip] > > ++&i2c1 { > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&i2c2 { > > ++ status = "okay"; > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > I don?t know the hardware of the board and it?s a bit off-topic, > but do you really need 2 i2c channels before relocating uboot? Good catch. @Frieder: can you say something to that? -- Heiko From fontaine.fabrice at gmail.com Fri Jan 14 22:09:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 23:09:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/open62541: add OPEN62541_CPE_ID_VENDOR Message-ID: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 Signed-off-by: Fabrice Fontaine --- package/open62541/open62541.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 66777ce501..fb28a614e2 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -11,6 +11,7 @@ OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 OPEN62541_LICENSE_FILES = LICENSE +OPEN62541_CPE_ID_VENDOR = open62541 # Force Release build to remove -Werror. # Don't use git describe to get the version number. -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 22:20:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 23:20:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4092 Message-ID: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> Fix CVE-2021-4192: vim is vulnerable to Use After Free Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read Signed-off-by: Fabrice Fontaine --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6fa5d1bef0..fff5072063 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 6643ef0841..408b33a409 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3930 +VIM_VERSION = 8.2.4092 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 14 22:40:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 14 Jan 2022 23:40:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.11 Message-ID: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> Fix the following security issues: - https://www.wireshark.org/security/wnpa-sec-2021-16.html (CVE-2021-4186) - https://www.wireshark.org/security/wnpa-sec-2021-17.html (CVE-2021-4185) - https://www.wireshark.org/security/wnpa-sec-2021-18.html (CVE-2021-4184) - https://www.wireshark.org/security/wnpa-sec-2021-20.html (CVE-2021-4182) - https://www.wireshark.org/security/wnpa-sec-2021-21.html (CVE-2021-4181) https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html Signed-off-by: Fabrice Fontaine --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bc7c9f4d7e..7b67e316ed 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 2ba81d1f39..0361d0bb64 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.10 +WIRESHARK_VERSION = 3.4.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license -- 2.34.1 From tianyuanhao3 at 163.com Sat Jan 15 01:50:04 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Fri, 14 Jan 2022 17:50:04 -0800 Subject: [Buildroot] [PATCH 1/1] package/util-linux/util-linux-libs: add a missing patch Message-ID: <20220115015004.2531151-1-tianyuanhao3@163.com> The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for util-linux, but forgot to create a symlink to util-linux-libs. This results in inconsistent libblkid.so builds from util-linux and util-linux-libs. If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different libblkid.so is used in different $(BASE_DIR)/per-package/$(PKG)_NAME/target. Signed-off-by: TIAN Yuanhao --- ...ibblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch | 1 + 1 file changed, 1 insertion(+) create mode 120000 package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch new file mode 120000 index 0000000000..2f3c482144 --- /dev/null +++ b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch @@ -0,0 +1 @@ +../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch \ No newline at end of file -- 2.25.1 From heiko.thiery at gmail.com Sat Jan 15 06:56:45 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sat, 15 Jan 2022 07:56:45 +0100 Subject: [Buildroot] [PATCH v2] configs/imx8mmevk: new defconfig In-Reply-To: <20220114024555.319448-1-festevam@gmail.com> References: <20220114024555.319448-1-festevam@gmail.com> Message-ID: Hi Fabio, Am Fr., 14. Jan. 2022 um 03:46 Uhr schrieb Fabio Estevam : > > Add support for imx8mmevk_defconfig that allows booting kernel, U-Boot and > TFA from the upstream repositories. > > Signed-off-by: Fabio Estevam > --- > Changes since v1: > - Also use TF-A and U-Boot upstream versions. > > DEVELOPERS | 1 + > board/freescale/imx8mmevk/genimage.cfg | 16 ++++++++ > board/freescale/imx8mmevk/readme.txt | 6 +++ > .../boot/extlinux/extlinux.conf | 4 ++ > configs/imx8mmevk_defconfig | 39 +++++++++++++++++++ > 5 files changed, 66 insertions(+) > create mode 100644 board/freescale/imx8mmevk/genimage.cfg > create mode 100644 board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf > create mode 100644 configs/imx8mmevk_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index 12777e8d61..e19072a14e 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -839,6 +839,7 @@ F: configs/imx6ullevk_defconfig > F: configs/imx6ulpico_defconfig > F: configs/imx7d-sdb_defconfig > F: configs/imx7dpico_defconfig > +F: configs/imx8mmevk_defconfig > F: configs/imx8mqevk_defconfig > F: configs/mx25pdk_defconfig > F: configs/mx51evk_defconfig > diff --git a/board/freescale/imx8mmevk/genimage.cfg b/board/freescale/imx8mmevk/genimage.cfg > new file mode 100644 > index 0000000000..3a83aa1f03 > --- /dev/null > +++ b/board/freescale/imx8mmevk/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33k Giulio pointed out to me that the units should be described with capital letters. > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 8M > + } > +} > diff --git a/board/freescale/imx8mmevk/readme.txt b/board/freescale/imx8mmevk/readme.txt > index 7b69405d30..a8e80a48f9 100644 > --- a/board/freescale/imx8mmevk/readme.txt > +++ b/board/freescale/imx8mmevk/readme.txt > @@ -10,8 +10,14 @@ Build > > First, configure Buildroot for the i.MX8MM EVK board: > > +If you want to use the NXP kernel: > + > make freescale_imx8mmevk_defconfig > > +Or if you want to use a mainline kernel: > + > + make imx8mmevk_defconfig > + > Build all components: > > make > diff --git a/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..0ba2e4cbfc > --- /dev/null > +++ b/board/freescale/imx8mmevk/rootfs_overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,4 @@ > +Label imx8mm-evk-buildroot > + kernel /boot/Image > + devicetree /boot/imx8mm-evk.dtb > + append root=/dev/mmcblk1p1 rootwait rw I my respin I used: append root=PARTUUID=%PARTUUID% rootwait rw The UUID is created in a post-build.sh script and set it in extlinux.conf and genimage.cfg With that the image would not limited to be located on the SD card. > diff --git a/configs/imx8mmevk_defconfig b/configs/imx8mmevk_defconfig > new file mode 100644 > index 0000000000..170b8d273b > --- /dev/null > +++ b/configs/imx8mmevk_defconfig > @@ -0,0 +1,39 @@ > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" > +BR2_ROOTFS_OVERLAY="board/freescale/imx8mmevk/rootfs_overlay" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/imx8mmevk/genimage.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="240M" Do you need 240MB here? > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30890000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > +BR2_PACKAGE_HOST_GENIMAGE=y > -- > 2.25.1 > -- Heiko From thomas.petazzoni at bootlin.com Sat Jan 15 06:57:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 15 Jan 2022 06:57:05 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-14 Message-ID: <20220115065710.5AEB240261@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-14 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 70 | 11 | 0 | 81 | 2021.11.x | 28 | 6 | 0 | 34 | master | 113 | 69 | 0 | 182 | Classification of failures by reason for master ----------------------------------------------- host-riscv-isa-sim-1.1.0 | 9 rygel-0.40.2 | 9 guile-3.0.7 | 5 cryptsetup-2.4.2 | 4 frr-8.1 | 4 unknown | 4 bluez5_utils-5.63 | 2 ksmbd-tools-3.4.3 | 2 pcsc-lite-1.9.5 | 2 pulseview-0.4.2 | 2 vlc-3.0.16 | 2 wavemon-0.9.4 | 2 bat-0.18.3 | 1 bird-2.0.8 | 1 dnsmasq-2.86 | 1 gensio-2.2.9 | 1 gocryptfs-2.2.0 | 1 google-breakpad-7515ab13768... | 1 hiawatha-11.1 | 1 host-nodejs-14.18.2 | 1 ipmitool-1.8.18 | 1 libglvnd-1.3.2 | 1 libwpe-1.12.0 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.3 | 1 oracle-mysql-5.1.73 | 1 qpid-proton-0.35.0 | 1 qt5webkit-5.212.0-alpha4 | 1 rtorrent-0.9.8 | 1 sslh-1.22c | 1 suricata-6.0.4 | 1 tesseract-ocr-5.0.1 | 1 ulog-0389d243352255f6182326... | 1 waylandpp-0.2.8 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/fbcf33d023f59d70e09c8d65a50936f147542d52 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/081983b1aea4e42c508b14cedbc2a702bb847421 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d33810e1461d5d713cc6cd51220bd1f1d22d12ea | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e47d4ecbff3c6c453818003ed1046ad0b03586bf | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/d430815c7d060b45526881fd150fbb319e60b778 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/e2d0e16f69dd55aaaf5e10c37954ef3b6b909b29 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/4dc344db9155c75c7eb98dadb54bcc375dd6c137 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/f72cc7729cd35a3fd57cb6284aac21ce5c6a3285 | mips64el | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/ebb45fb1d8865e8b6837f289b80fd44c9530531c | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4d7179f77197d52b70dc7f846f1e013389897514 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5c48881cc0baf2176442f774d14dfa18c1ab1770 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/27ca87d0ebf9cf2c98bb9dcc705a6c55c6a25643 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/411f08caf5e307a5b639289b9ea0648f9d66d2a4 | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/97a28636cc3c11d92a86cc1b0b306ced3f9e5f19 | arm | gocryptfs-2.2.0 | NOK | http://autobuild.buildroot.net/results/43783f7c8d741bc1e7c83d8b4e7b9b69033b57d2 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/14d430c5e798460ce0362b0a4d6bc1270b7798a2 | sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/99896bcdf6dc40add16bfaeb1903f3bc5c40a056 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a25f4b208fd16586e8406c1fe2bd2fa3cc543eb1 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/00e1fa3fc21c7f7fd0d70801acb3c814f3d0dff2 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/2d0fb68d8cf01f3d5d432aa278622649490a5cae | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a5deaba12abd888826468f2b30eb939db3dbac0e | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/1befc1552af91f34c600229138910c2078c2fdca | mipsel | host-nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/c1ff82b61963d5fbfa0fca2ac0b66c44b7178e2a | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6e55599e8cc33249b331d7ab35e18404a1a81a4e | mips64el | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/4968e4402baa07e385035c67b8af75386e1934f4 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/4018426cbe4bc25000cefc2d8a45f67b0b59b018 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/f783cdc212c8a608f0732869dc738004ff6a67be | nios2 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/485a6894508d218dc2a2c12a4332300d53b5bcf3 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6af52d47cfed2acfbde3a40c52f0b7af10996869 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/8306678f1f22e8a8c0f9ceceeb26594213233c28 | arc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6c33a66386ab2171454d8ea8c1bd17a5582e21dd | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/4eedc823552d29c0bae119412c003696b993ac8a | mips64el | ipmitool-1.8.18 | NOK | http://autobuild.buildroot.net/results/feb68f64d53648f7c95ae825b9c35d086a16154f | powerpc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/d010ac16563690dca83584b8fe5e029a4d3314bf | mipsel | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/b4c3dba395327ab6ae28337efb962c99b2d5b922 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/63624bafc6f7a225d4db0667df977fd6141561aa | ORPH x86_64 | libwpe-1.12.0 | NOK | http://autobuild.buildroot.net/results/a6d564c90a22b23982f7008af95118bb232f8f6c | mipsel | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/6c8a4189e611e7091e5d1707882ffaaaff78d94e | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/4e296b5d1254cdec29e3710f0ef217581bec4a37 | xtensa | oracle-mysql-5.1.73 | NOK | http://autobuild.buildroot.net/results/17a46735fb5c52930ca1f04e42a3d7f44f1d698b | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/bc987ca0a08466cb834d9979ec3ed91b549b87e5 | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/b90f0e3b854682fde31d6a927f05bb092604d254 | ORPH aarch64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/f2e15910cced16fbf5b58eeb9678d8eb1d746cc6 | mips64el | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/492d599183ab104577ca66b0a7e7d9268109deb7 | nds32le | qpid-proton-0.35.0 | NOK | http://autobuild.buildroot.net/results/260eeaccf6765cefc8240665bbe4acca99571a0e | i686 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/2fbd472f455e486780feb78389e76d66fb9bf238 | i586 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/812a3839d34cad1f1a5f644308e984650b08a3b1 | ORPH arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/be408f05124601417abe93842f56e46aefbb0e3e | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/847c729011fc8ae14e6fc3c301e0626a824cc58c | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/94c5d5ba952af1ce763055f0de448e9c4db93244 | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/0e06f07a09321e412a11db6fbfc3b6b7403e5d48 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ebe1037bbe77a0e584e3f7a00a18ede18bba2472 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/df0a213964ef602130fbb3801ad1e0dc41f17b5d | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d05561335a8fb8823cba1a371a340b242c1edc42 | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/105cfaf0f5e4c899eb0f579e7e8981926c39692d | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/289a519831a5085dcd97a8ffc0aa1f2440b2c90a | arm | sslh-1.22c | NOK | http://autobuild.buildroot.net/results/ebe07ee3c256ced96487bc58f661538d7e12adff | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/a2ee74f239b6739425c6fc48853cada4677aadcc | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/f35edee58ab5ab1e388169a7b29ace7d2e311c91 | aarch64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/119e7207db8114c735718c1402d8e01549ea8a5b | arm | unknown | NOK | http://autobuild.buildroot.net/results/34d92ba7008115eb9a6b4dc16d3d0cf488a4d1c1 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/a730286d9773341dd5fb4b70d1202de78abfd86c | i686 | unknown | NOK | http://autobuild.buildroot.net/results/a8223c4d4db98f8e7a89703608924ac90e45c453 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/473816192409d03e9a44c3d3f75cbfc24a1ecd1b | i686 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/43e6cb8bd5bc76a66e6757d70dd3d6df62741c0a | powerpc64le | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/e20e86852b27087983317d28db177282637ac09e | m68k | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/5b818bf9ca34b06cc612e9241c811c40151b729b | s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f2076f8bcb90580b2ce6f6492d1eb995aa452834 | arm | waylandpp-0.2.8 | NOK | http://autobuild.buildroot.net/results/37992f753ac7309659719224e6c4b91aab301d13 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 monkey-f54856ce250c4e257354... | 2 bluez5_utils-5.62 | 1 gensio-2.2.3 | 1 glib-networking-2.66.0 | 1 netdata-1.21.1 | 1 perl-5.32.1 | 1 suricata-6.0.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nios2 | bluez5_utils-5.62 | NOK | http://autobuild.buildroot.net/results/de42002621611351b0162fc726a8287cae48584b | riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/1ea400ee1ffae9c3be328fffd1e422a3590c2683 | riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/67d8c2ea0fc33026db1aeab8c35a261856708985 | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a383430008e0288282eb7bd4fe2159cb65b4419e | aarch64_be | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/173321861d5e3bd363c67b38890f202156fc5a21 | sparc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/879ca24f450ed2c759a3100f7002ad73fb0005ec | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/f22a072a9e5c716885b477d29d64d0c97b36c57b | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/325ce48012a302558ffb9469979d8e95fd600743 | riscv32 | netdata-1.21.1 | NOK | http://autobuild.buildroot.net/results/399a576ed856b384f5481434010287f1d9619c37 | arm | perl-5.32.1 | NOK | http://autobuild.buildroot.net/results/2c13aceda37567d1d184b13c564a9b63ef05f38b | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/f5f77319bb7049d4029dee8347f333dba722fcec | Classification of failures by reason for 2021.11.x -------------------------------------------------- icu-69-1 | 1 libmbim-1.26.0 | 1 libmodsecurity-3.0.6 | 1 libqmi-1.30.2 | 1 nodejs-14.18.1 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | icu-69-1 | NOK | http://autobuild.buildroot.net/results/e89df0bab81a6133a6a206d5d4a3be89e096aa3d | ORPH mipsel | libmbim-1.26.0 | NOK | http://autobuild.buildroot.net/results/2857641e07a7ae67c75b20954c4dd272c343e586 | arm | libmodsecurity-3.0.6 | NOK | http://autobuild.buildroot.net/results/1b17def94d719a01b5acc64a7ca218bf2235d608 | sparc | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/a231ebf0dcdc35e94fac885799099bbfbdd0da87 | mipsel | nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/2542a6399a10195d9790492459420c330075f640 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/828c6489d4114b8f80a3529db37a5bdb22600b83 | Gitlab CI results for 2022-01-14 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083640 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083642 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083643 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083644 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083647 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083648 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083655 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083656 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083657 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083660 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083662 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083664 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083667 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083669 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083671 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083672 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083675 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083679 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083680 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083683 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083685 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083687 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083689 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083691 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083692 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083693 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083696 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083699 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083700 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083703 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083707 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083709 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083711 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083713 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083715 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083716 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083718 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083721 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083722 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083723 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083724 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083725 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083727 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083728 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083758 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083760 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083761 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083763 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083764 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083765 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083769 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083771 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083776 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083772 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083774 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083777 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083779 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083781 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083794 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083828 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083833 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083852 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083854 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083859 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083862 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083864 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083868 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083871 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083874 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083877 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083882 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083893 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083949 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083973 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083986 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083991 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083992 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083999 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084001 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084006 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084007 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084011 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084018 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084024 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084028 | qemu_arm_vexpress_tz | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084122 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084135 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084136 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084144 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084147 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084152 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084154 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084158 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084162 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084166 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084170 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084174 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084179 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084185 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084186 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084214 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084219 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084225 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084235 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084237 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084239 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084243 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084248 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084251 | -- http://autobuild.buildroot.net From peter at korsgaard.com Sat Jan 15 08:43:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:43:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/keepalived: fix CVE-2021-44225 In-Reply-To: <20211207220407.3320031-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 7 Dec 2021 23:04:07 +0100") References: <20211207220407.3320031-1-fontaine.fabrice@gmail.com> Message-ID: <87sftp5qzm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > In Keepalived through 2.2.4, the D-Bus policy does not sufficiently > restrict the message destination, allowing any user to inspect and > manipulate any property. This leads to access-control bypass in some > situations in which an unrelated D-Bus system service has a settable > (writable) property > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 08:55:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:55:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/findutils: enable selinux support In-Reply-To: <20211209222104.222786-1-aduskett@gmail.com> (Adam Duskett's message of "Thu, 9 Dec 2021 14:21:04 -0800") References: <20211209222104.222786-1-aduskett@gmail.com> Message-ID: <87o84d5qeo.fsf@dell.be.48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Signed-off-by: Adam Duskett Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fperrad at gmail.com Sat Jan 15 09:13:54 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sat, 15 Jan 2022 10:13:54 +0100 Subject: [Buildroot] [PATCH] package/janet: bump to version 1.19.2 Message-ID: <20220115091354.60566-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/janet/janet.hash | 2 +- package/janet/janet.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/janet/janet.hash b/package/janet/janet.hash index 8e78d9a4d..50e6b1fef 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bfc29c11a070cc175666f74eb99ea992276d6e269701ba9558a72cef05ac80b4 janet-1.18.1.tar.gz +sha256 02ff892f4bfc060a8a37f4a5c3e659bf34ba5f1f1c5eb07d60dc2642c5cf0476 janet-1.19.2.tar.gz # Locally calculated sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index b00f82846..5b6a9a182 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANET_VERSION = 1.18.1 +JANET_VERSION = 1.19.2 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE -- 2.32.0 From fperrad at gmail.com Sat Jan 15 09:14:18 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sat, 15 Jan 2022 10:14:18 +0100 Subject: [Buildroot] [PATCH] package/luajit: bump to version a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 Message-ID: <20220115091418.60621-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/luajit/luajit.hash | 2 +- package/luajit/luajit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index 1497ee9df..d92eefb39 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b1b19f92451a661ba1167ee0b259299616cb3a1cdaf5ab05d7ccffaffeb4a0fb luajit-05f1984e1a862e4b3d3c3b370c773492e2edf84a.tar.gz +sha256 7ea92e2414b6405c7fb3974ab092707c400a5496e8d4936174b5bd3aa6e94477 luajit-a91d0d9d3bba1a936669cfac3244509a0f2ac0e3.tar.gz # Locally calculated sha256 43fc251179d900f9948e51dd3cc93733d1219f2db060faaa0c8100ad054f54d8 COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index d2af69d1e..7c1b556ff 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a +LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT -- 2.32.0 From yann.morin.1998 at free.fr Sat Jan 15 09:17:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:17:02 +0100 Subject: [Buildroot] [git commit] package/util-linux/util-linux-libs: add a missing patch Message-ID: <20220115091114.E9584825E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93d23ef91fcfd8bf7f5a3ffc23d82bad8e868b34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for util-linux, but forgot to create a symlink to util-linux-libs. This results in inconsistent libblkid.so builds from util-linux and util-linux-libs. If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different libblkid.so is used in different $(BASE_DIR)/per-package/$(PKG)_NAME/target. Signed-off-by: TIAN Yuanhao Signed-off-by: Yann E. MORIN --- .../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch new file mode 120000 index 0000000000..2f3c482144 --- /dev/null +++ b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch @@ -0,0 +1 @@ +../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch \ No newline at end of file From yann.morin.1998 at free.fr Sat Jan 15 09:18:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:18:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/util-linux/util-linux-libs: add a missing patch In-Reply-To: <20220115015004.2531151-1-tianyuanhao3@163.com> References: <20220115015004.2531151-1-tianyuanhao3@163.com> Message-ID: <20220115091803.GA1945846@scaer> Yuanhao, All, On 2022-01-14 17:50 -0800, TIAN Yuanhao spake thusly: > The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for > util-linux, but forgot to create a symlink to util-linux-libs. This > results in inconsistent libblkid.so builds from util-linux and > util-linux-libs. > > If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different > libblkid.so is used in different > $(BASE_DIR)/per-package/$(PKG)_NAME/target. > > Signed-off-by: TIAN Yuanhao Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ibblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch | 1 + > 1 file changed, 1 insertion(+) > create mode 120000 package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch > > diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch > new file mode 120000 > index 0000000000..2f3c482144 > --- /dev/null > +++ b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch > @@ -0,0 +1 @@ > +../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch > \ No newline at end of file > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 09:19:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:19:56 +0100 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4092 Message-ID: <20220115091423.AD3B9825DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33a3f1f30dedaf613dccac5b86ec909a1f404957 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-4192: vim is vulnerable to Use After Free Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6fa5d1bef0..fff5072063 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 6643ef0841..408b33a409 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3930 +VIM_VERSION = 8.2.4092 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From yann.morin.1998 at free.fr Sat Jan 15 09:19:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:19:58 +0100 Subject: [Buildroot] [git commit] package/wireshark: security bump to version 3.4.11 Message-ID: <20220115091423.B5245817B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d19436b88dcea890b6a73b242e2a2cbb66e17fcd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following security issues: - https://www.wireshark.org/security/wnpa-sec-2021-16.html (CVE-2021-4186) - https://www.wireshark.org/security/wnpa-sec-2021-17.html (CVE-2021-4185) - https://www.wireshark.org/security/wnpa-sec-2021-18.html (CVE-2021-4184) - https://www.wireshark.org/security/wnpa-sec-2021-20.html (CVE-2021-4182) - https://www.wireshark.org/security/wnpa-sec-2021-21.html (CVE-2021-4181) https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bc7c9f4d7e..7b67e316ed 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 2ba81d1f39..0361d0bb64 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.10 +WIRESHARK_VERSION = 3.4.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From yann.morin.1998 at free.fr Sat Jan 15 09:21:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:21:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.11 In-Reply-To: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> References: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> Message-ID: <20220115092103.GB1945846@scaer> Fabrice, All, On 2022-01-14 23:40 +0100, Fabrice Fontaine spake thusly: > Fix the following security issues: > - https://www.wireshark.org/security/wnpa-sec-2021-16.html > (CVE-2021-4186) > - https://www.wireshark.org/security/wnpa-sec-2021-17.html > (CVE-2021-4185) > - https://www.wireshark.org/security/wnpa-sec-2021-18.html > (CVE-2021-4184) > - https://www.wireshark.org/security/wnpa-sec-2021-20.html > (CVE-2021-4182) > - https://www.wireshark.org/security/wnpa-sec-2021-21.html > (CVE-2021-4181) > > https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/wireshark/wireshark.hash | 6 +++--- > package/wireshark/wireshark.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash > index bc7c9f4d7e..7b67e316ed 100644 > --- a/package/wireshark/wireshark.hash > +++ b/package/wireshark/wireshark.hash > @@ -1,6 +1,6 @@ > -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt > -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz > -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz > +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt > +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz > +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz > > # Locally calculated > sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING > diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk > index 2ba81d1f39..0361d0bb64 100644 > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WIRESHARK_VERSION = 3.4.10 > +WIRESHARK_VERSION = 3.4.11 > WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz > WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions > WIRESHARK_LICENSE = wireshark license > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 09:21:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:21:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4092 In-Reply-To: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> References: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> Message-ID: <20220115092116.GC1945846@scaer> Fabrice, All, On 2022-01-14 23:20 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2021-4192: vim is vulnerable to Use After Free > Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/vim/vim.hash | 2 +- > package/vim/vim.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/vim/vim.hash b/package/vim/vim.hash > index 6fa5d1bef0..fff5072063 100644 > --- a/package/vim/vim.hash > +++ b/package/vim/vim.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz > +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz > sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE > sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt > diff --git a/package/vim/vim.mk b/package/vim/vim.mk > index 6643ef0841..408b33a409 100644 > --- a/package/vim/vim.mk > +++ b/package/vim/vim.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -VIM_VERSION = 8.2.3930 > +VIM_VERSION = 8.2.4092 > VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) > VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) > VIM_SUBDIR = src > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 09:21:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:21:43 +0100 Subject: [Buildroot] [git commit] package/open62541: add OPEN62541_CPE_ID_VENDOR Message-ID: <20220115091525.A36FC813AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88606bd9eb4cc244388a3dec70a21d54ee3fe352 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/open62541/open62541.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 66777ce501..fb28a614e2 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -11,6 +11,7 @@ OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 OPEN62541_LICENSE_FILES = LICENSE +OPEN62541_CPE_ID_VENDOR = open62541 # Force Release build to remove -Werror. # Don't use git describe to get the version number. From yann.morin.1998 at free.fr Sat Jan 15 09:22:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:22:18 +0100 Subject: [Buildroot] [git commit] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR Message-ID: <20220115091609.2E3E3817E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67af1b5ba50f387f6fb6ec7cc67283e1c9813fc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/targetcli-fb/targetcli-fb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..7425423b8f 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six From yann.morin.1998 at free.fr Sat Jan 15 09:22:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:22:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/open62541: add OPEN62541_CPE_ID_VENDOR In-Reply-To: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> References: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> Message-ID: <20220115092257.GD1945846@scaer> Fabrice, All, On 2022-01-14 23:09 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/open62541/open62541.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk > index 66777ce501..fb28a614e2 100644 > --- a/package/open62541/open62541.mk > +++ b/package/open62541/open62541.mk > @@ -11,6 +11,7 @@ OPEN62541_GIT_SUBMODULES = YES > OPEN62541_INSTALL_STAGING = YES > OPEN62541_LICENSE = MPL-2.0 > OPEN62541_LICENSE_FILES = LICENSE > +OPEN62541_CPE_ID_VENDOR = open62541 > > # Force Release build to remove -Werror. > # Don't use git describe to get the version number. > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 09:23:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR In-Reply-To: <20220114180242.963756-1-fontaine.fabrice@gmail.com> References: <20220114180242.963756-1-fontaine.fabrice@gmail.com> Message-ID: <20220115092312.GE1945846@scaer> Fabrice, All, On 2022-01-14 19:02 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier > for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/targetcli-fb/targetcli-fb.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk > index 75643446d2..7425423b8f 100644 > --- a/package/targetcli-fb/targetcli-fb.mk > +++ b/package/targetcli-fb/targetcli-fb.mk > @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 > TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) > TARGETCLI_FB_LICENSE = Apache-2.0 > TARGETCLI_FB_LICENSE_FILES = COPYING > +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project > TARGETCLI_FB_SETUP_TYPE = setuptools > TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 08:52:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:52:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/findutils: enable selinux support Message-ID: <20220115092443.E9CE3825F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c25e90cb3b4b52968d8bcf0d2722329a073e3bcd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 544839b318d08b7c331cc91b5f66b776d5a87736) Signed-off-by: Peter Korsgaard --- package/findutils/findutils.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index a16f827166..725a7a0287 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -15,4 +15,11 @@ FINDUTILS_CONF_ENV = \ ac_cv_func_working_mktime=yes \ gl_cv_func_wcwidth_works=yes +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +FINDUTILS_DEPENDENCIES += libselinux +FINDUTILS_CONF_OPTS += --with-selinux +else +FINDUTILS_CONF_OPTS += --without-selinux +endif + $(eval $(autotools-package)) From peter at korsgaard.com Sat Jan 15 08:42:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:42:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/keepalived: fix CVE-2021-44225 Message-ID: <20220115092443.DB2F7825F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9088c5ce6f634996db48fa2367e1ca69f721c7bb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x In Keepalived through 2.2.4, the D-Bus policy does not sufficiently restrict the message destination, allowing any user to inspect and manipulate any property. This leads to access-control bypass in some situations in which an unrelated D-Bus system service has a settable (writable) property Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e4464fabb6323dba4974096886166b9c4631fd38) Signed-off-by: Peter Korsgaard --- ...02-dbus-fix-policy-to-not-be-overly-broad.patch | 42 ++++++++++++++++++++++ package/keepalived/keepalived.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch new file mode 100644 index 0000000000..6287d6117d --- /dev/null +++ b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch @@ -0,0 +1,42 @@ +From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Tue, 23 Nov 2021 06:50:59 +0100 +Subject: [PATCH] dbus: fix policy to not be overly broad + +The DBus policy did not restrict the message destination, allowing any +user to inspect and manipulate any property. + +Signed-off-by: Vincent Bernat + +[Retrieved from: +https://github.com/acassen/keepalived/commit/7977fec0be89ae6fe87405b3f8da2f0b5e415e3d] +Signed-off-by: Fabrice Fontaine +--- + keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf +index 2b78a575c..b5ced6085 100644 +--- a/keepalived/dbus/org.keepalived.Vrrp1.conf ++++ b/keepalived/dbus/org.keepalived.Vrrp1.conf +@@ -3,12 +3,15 @@ + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + + +- +- ++ ++ + + +- +- +- ++ ++ ++ + + diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 5d42cab741..e31c02dec5 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -12,6 +12,9 @@ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# 0002-dbus-fix-policy-to-not-be-overly-broad.patch +KEEPALIVED_IGNORE_CVES += CVE-2021-44225 + ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c KEEPALIVED_CONF_OPTS += --enable-json From peter at korsgaard.com Sat Jan 15 08:51:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:51:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/findutils: enable selinux support Message-ID: <20220115092450.464F582627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2ea0138161625322a61217ba3f8ef0d09779c7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 544839b318d08b7c331cc91b5f66b776d5a87736) Signed-off-by: Peter Korsgaard --- package/findutils/findutils.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 918591c53f..3237e5502a 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -15,4 +15,11 @@ FINDUTILS_CONF_ENV = \ ac_cv_func_working_mktime=yes \ gl_cv_func_wcwidth_works=yes +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +FINDUTILS_DEPENDENCIES += libselinux +FINDUTILS_CONF_OPTS += --with-selinux +else +FINDUTILS_CONF_OPTS += --without-selinux +endif + $(eval $(autotools-package)) From peter at korsgaard.com Sat Jan 15 08:41:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 09:41:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/keepalived: fix CVE-2021-44225 Message-ID: <20220115092450.3E0BF825F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=257dda3c473fd6e818812183ba8ce66f8d718412 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x In Keepalived through 2.2.4, the D-Bus policy does not sufficiently restrict the message destination, allowing any user to inspect and manipulate any property. This leads to access-control bypass in some situations in which an unrelated D-Bus system service has a settable (writable) property Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e4464fabb6323dba4974096886166b9c4631fd38) Signed-off-by: Peter Korsgaard --- ...02-dbus-fix-policy-to-not-be-overly-broad.patch | 42 ++++++++++++++++++++++ package/keepalived/keepalived.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch new file mode 100644 index 0000000000..6287d6117d --- /dev/null +++ b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch @@ -0,0 +1,42 @@ +From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Tue, 23 Nov 2021 06:50:59 +0100 +Subject: [PATCH] dbus: fix policy to not be overly broad + +The DBus policy did not restrict the message destination, allowing any +user to inspect and manipulate any property. + +Signed-off-by: Vincent Bernat + +[Retrieved from: +https://github.com/acassen/keepalived/commit/7977fec0be89ae6fe87405b3f8da2f0b5e415e3d] +Signed-off-by: Fabrice Fontaine +--- + keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf +index 2b78a575c..b5ced6085 100644 +--- a/keepalived/dbus/org.keepalived.Vrrp1.conf ++++ b/keepalived/dbus/org.keepalived.Vrrp1.conf +@@ -3,12 +3,15 @@ + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + + +- +- ++ ++ + + +- +- +- ++ ++ ++ + + diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 5d42cab741..e31c02dec5 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -12,6 +12,9 @@ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening +# 0002-dbus-fix-policy-to-not-be-overly-broad.patch +KEEPALIVED_IGNORE_CVES += CVE-2021-44225 + ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c KEEPALIVED_CONF_OPTS += --enable-json From yann.morin.1998 at free.fr Sat Jan 15 09:39:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:39:11 +0100 Subject: [Buildroot] [git commit] package/boost: enable system on host Message-ID: <20220115093409.87FDF8258B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b32c37a260b0fec70fd9c16bca6632d8be19e7f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master boost system (which provides boost asio) is needed by host-riscv-isa-sim since its addition in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure: error: Could not find a version of the Boost::Asio library! Fixes: - http://autobuild.buildroot.org/results/6c33a66386ab2171454d8ea8c1bd17a5582e21dd Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/boost/boost.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6d1046e9a2..2d2a8fb311 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ contract container coroutine date_time exception fiber filesystem graph \ graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace system test thread timer \ + python random serialization stacktrace test thread timer \ type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) From peter at korsgaard.com Sat Jan 15 09:32:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 10:32:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/containerd: security bump to version 1.5.8 Message-ID: <20220115093824.593DE82929@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7bfd519b796cb98c5d4eee2e2e251121689dd604 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The eighth patch release for containerd 1.5 contains a mitigation for CVE-2021-41190 as well as several fixes and updates. https://github.com/containerd/containerd/releases/tag/v1.5.8 Signed-off-by: Fabrice Fontaine Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit fc24c5c30a4c933e81e67d92559b271396186e02) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 594c56a819..f1a6709554 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 09be0cedea77568029aa0c7be9a323b89fa6886b402b5d223780a05b8c7cd45a containerd-1.5.7.tar.gz +sha256 a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790 containerd-1.5.8.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index fdbd2bf3e6..cd975db274 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.7 +CONTAINERD_VERSION = 1.5.8 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 15 09:49:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 10:49:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable system on host In-Reply-To: <20220114171847.634174-1-fontaine.fabrice@gmail.com> References: <20220114171847.634174-1-fontaine.fabrice@gmail.com> Message-ID: <20220115094925.GF1945846@scaer> Fabrice, All, On 2022-01-14 18:18 +0100, Fabrice Fontaine spake thusly: > boost system (which provides boost asio) is needed by host-riscv-isa-sim > since its addition in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: > > configure: error: Could not find a version of the Boost::Asio library! > > Fixes: > - http://autobuild.buildroot.org/results/6c33a66386ab2171454d8ea8c1bd17a5582e21dd > > Signed-off-by: Fabrice Fontaine > --- > package/boost/boost.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/boost/boost.mk b/package/boost/boost.mk > index 6d1046e9a2..2d2a8fb311 100644 > --- a/package/boost/boost.mk > +++ b/package/boost/boost.mk > @@ -17,7 +17,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ > --without-libraries=$(subst $(space),$(comma),atomic chrono context \ > contract container coroutine date_time exception fiber filesystem graph \ > graph_parallel iostreams json locale log math mpi nowide program_options \ > - python random serialization stacktrace system test thread timer \ > + python random serialization stacktrace test thread timer \ > type_erasure wave) I was wondering why we need to disable those, and the original commit log is not very explicit about why this is so (429ffbd2253 boost: add host variant), and the comment is not very helpful either... So I did a test: remove all those exclusion (just exclude python [0]), and build just host-boost (it has no dependency): master : 54s no-exclusion: 2min 38s So yes, this is a big increase. But considering that we have no way for host packages to express dependencies on Boost features, I wonder if we should not just build the whole stuff. For example, packages in a br2-external have no way to say so... Anyway, in the meantime: applied to master, thanks. [0] building the Boost python module would require the python development files be installed on the host, or that we depend on host-python{,3}, neither of which are acceptable Regards, Yann E. MORIN. > BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 09:44:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 10:44:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/containerd: security bump to version 1.5.8 In-Reply-To: <20211210211558.4015391-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 10 Dec 2021 22:15:58 +0100") References: <20211210211558.4015391-1-fontaine.fabrice@gmail.com> Message-ID: <87k0f15o54.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > The eighth patch release for containerd 1.5 contains a mitigation for > CVE-2021-41190 as well as several fixes and updates. > https://github.com/containerd/containerd/releases/tag/v1.5.8 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 1.4.12, which fixes the same issue. -- Bye, Peter Korsgaard From egorenar-dev at posteo.net Sat Jan 15 10:15:23 2022 From: egorenar-dev at posteo.net (Alexander Egorenkov) Date: Sat, 15 Jan 2022 10:15:23 +0000 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: bump to version 0.8.8 Message-ID: <20220115101523.2932-1-egorenar-dev@posteo.net> Signed-off-by: Alexander Egorenkov --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index ac41e4815b72..f063848681ea 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7c5962be6068c78d5256e8fc979cf327988f7560705bb9cc25b508c50ca997c0 multipath-tools-0.8.7.tar.gz +sha256 ff45ddb18a1effbfbe5712f513dd3b7146c68141091fc1c2489af8d6197026ef multipath-tools-0.8.8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 3d8095b0b093..eecfe3900233 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.8.7 +MULTIPATH_TOOLS_VERSION = 0.8.8 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ -- 2.34.1 From yann.morin.1998 at free.fr Sat Jan 15 10:16:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:16:52 +0100 Subject: [Buildroot] [git commit] package/luajit: bump to version a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 Message-ID: <20220115101119.09BC78292F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=589065acf96e89ad503e4943fd55517d769563c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/luajit/luajit.hash | 2 +- package/luajit/luajit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index 1497ee9df4..d92eefb39a 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b1b19f92451a661ba1167ee0b259299616cb3a1cdaf5ab05d7ccffaffeb4a0fb luajit-05f1984e1a862e4b3d3c3b370c773492e2edf84a.tar.gz +sha256 7ea92e2414b6405c7fb3974ab092707c400a5496e8d4936174b5bd3aa6e94477 luajit-a91d0d9d3bba1a936669cfac3244509a0f2ac0e3.tar.gz # Locally calculated sha256 43fc251179d900f9948e51dd3cc93733d1219f2db060faaa0c8100ad054f54d8 COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index d2af69d1e3..7c1b556ff7 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a +LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT From yann.morin.1998 at free.fr Sat Jan 15 10:13:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:13:19 +0100 Subject: [Buildroot] [git commit] package/janet: bump to version 1.19.2 Message-ID: <20220115101119.009DE826D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=012dcef7c23c0470acf6e3a3e841ccaab4f91584 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/janet/janet.hash | 2 +- package/janet/janet.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/janet/janet.hash b/package/janet/janet.hash index 8e78d9a4d1..50e6b1fef0 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bfc29c11a070cc175666f74eb99ea992276d6e269701ba9558a72cef05ac80b4 janet-1.18.1.tar.gz +sha256 02ff892f4bfc060a8a37f4a5c3e659bf34ba5f1f1c5eb07d60dc2642c5cf0476 janet-1.19.2.tar.gz # Locally calculated sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index b00f82846c..5b6a9a182d 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANET_VERSION = 1.18.1 +JANET_VERSION = 1.19.2 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE From fontaine.fabrice at gmail.com Sat Jan 15 10:15:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 11:15:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/ghostscript: fix CVE-2021-45944 Message-ID: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in sampled_data_sample (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine --- ...ack-limits-after-function-evaluation.patch | 52 +++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 ++ 2 files changed, 55 insertions(+) create mode 100644 package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch new file mode 100644 index 0000000000..352f1754f6 --- /dev/null +++ b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch @@ -0,0 +1,52 @@ +From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i References: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> Message-ID: <20220115101535.1699671-2-fontaine.fabrice@gmail.com> Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine --- ...-management-in-sampled_data_continue.patch | 68 +++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 + 2 files changed, 71 insertions(+) create mode 100644 package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch diff --git a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch new file mode 100644 index 0000000000..72e07df0ac --- /dev/null +++ b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i References: <20220115091418.60621-1-francois.perrad@gadz.org> Message-ID: <20220115101811.GG1945846@scaer> Fran?ois, All On 2022-01-15 10:14 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/luajit/luajit.hash | 2 +- > package/luajit/luajit.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash > index 1497ee9df..d92eefb39 100644 > --- a/package/luajit/luajit.hash > +++ b/package/luajit/luajit.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 b1b19f92451a661ba1167ee0b259299616cb3a1cdaf5ab05d7ccffaffeb4a0fb luajit-05f1984e1a862e4b3d3c3b370c773492e2edf84a.tar.gz > +sha256 7ea92e2414b6405c7fb3974ab092707c400a5496e8d4936174b5bd3aa6e94477 luajit-a91d0d9d3bba1a936669cfac3244509a0f2ac0e3.tar.gz > > # Locally calculated > sha256 43fc251179d900f9948e51dd3cc93733d1219f2db060faaa0c8100ad054f54d8 COPYRIGHT > diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk > index d2af69d1e..7c1b556ff 100644 > --- a/package/luajit/luajit.mk > +++ b/package/luajit/luajit.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a > +LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 > LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) > LUAJIT_LICENSE = MIT > LUAJIT_LICENSE_FILES = COPYRIGHT > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 10:18:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:18:27 +0100 Subject: [Buildroot] [PATCH] package/janet: bump to version 1.19.2 In-Reply-To: <20220115091354.60566-1-francois.perrad@gadz.org> References: <20220115091354.60566-1-francois.perrad@gadz.org> Message-ID: <20220115101827.GH1945846@scaer> Fran?ois, All, On 2022-01-15 10:13 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/janet/janet.hash | 2 +- > package/janet/janet.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/janet/janet.hash b/package/janet/janet.hash > index 8e78d9a4d..50e6b1fef 100644 > --- a/package/janet/janet.hash > +++ b/package/janet/janet.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 bfc29c11a070cc175666f74eb99ea992276d6e269701ba9558a72cef05ac80b4 janet-1.18.1.tar.gz > +sha256 02ff892f4bfc060a8a37f4a5c3e659bf34ba5f1f1c5eb07d60dc2642c5cf0476 janet-1.19.2.tar.gz > > # Locally calculated > sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE > diff --git a/package/janet/janet.mk b/package/janet/janet.mk > index b00f82846..5b6a9a182 100644 > --- a/package/janet/janet.mk > +++ b/package/janet/janet.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -JANET_VERSION = 1.18.1 > +JANET_VERSION = 1.19.2 > JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) > JANET_LICENSE = MIT > JANET_LICENSE_FILES = LICENSE > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 10:19:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:19:08 +0100 Subject: [Buildroot] [git commit] package/ipmitool: add freeipmi optional dependency Message-ID: <20220115101248.A11208294C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f6b346a34bdb344c4a001d8bd66f5e973013c17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master freeipmi is an optional dependency which is enabled by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ipmitool/ipmitool.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index facd97a0b8..801f1ea6b0 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -19,6 +19,13 @@ IPMITOOL_CPE_ID_VENDOR = ipmitool_project # 0013-fru-sdr-Fix-id_string-buffer-overflows.patch IPMITOOL_IGNORE_CVES += CVE-2020-5208 +ifeq ($(BR2_PACKAGE_FREEIPMI),y) +IPMITOOL_DEPENDENCIES += freeipmi +IPMITOOL_CONF_OPTS += --enable-intf-free +else +IPMITOOL_CONF_OPTS += --disable-intf-free +endif + ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) IPMITOOL_DEPENDENCIES += openssl IPMITOOL_CONF_OPTS += --enable-intf-lanplus From yann.morin.1998 at free.fr Sat Jan 15 10:19:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:19:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/ipmitool: add freeipmi optional dependency In-Reply-To: <20220114214526.1153063-1-fontaine.fabrice@gmail.com> References: <20220114214526.1153063-1-fontaine.fabrice@gmail.com> Message-ID: <20220115101929.GI1945846@scaer> Fabrice, All, On 2022-01-14 22:45 +0100, Fabrice Fontaine spake thusly: > freeipmi is an optional dependency which is enabled by default > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ipmitool/ipmitool.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk > index facd97a0b8..801f1ea6b0 100644 > --- a/package/ipmitool/ipmitool.mk > +++ b/package/ipmitool/ipmitool.mk > @@ -19,6 +19,13 @@ IPMITOOL_CPE_ID_VENDOR = ipmitool_project > # 0013-fru-sdr-Fix-id_string-buffer-overflows.patch > IPMITOOL_IGNORE_CVES += CVE-2020-5208 > > +ifeq ($(BR2_PACKAGE_FREEIPMI),y) > +IPMITOOL_DEPENDENCIES += freeipmi > +IPMITOOL_CONF_OPTS += --enable-intf-free > +else > +IPMITOOL_CONF_OPTS += --disable-intf-free > +endif > + > ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) > IPMITOOL_DEPENDENCIES += openssl > IPMITOOL_CONF_OPTS += --enable-intf-lanplus > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From rainbox2k12 at msgsafe.io Sat Jan 15 10:14:15 2022 From: rainbox2k12 at msgsafe.io (rainbox2k12) Date: Sat, 15 Jan 2022 10:14:15 +0000 (UTC) Subject: [Buildroot] package/vte: add libvte to buildroot toolchain Message-ID: <20220115101415.986123F41E@exit1-us.msgsafe.io> This patch is needed in order to use libvte in the buildroot toolchain. diff --git a/package/vte/vte.mk b/package/vte/vte.mk index 07e8136..ceb2f09 100644 \--- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -11,6 +11,7 @@ VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) VTE_LICENSE = LGPL-3.0+ VTE_LICENSE_FILES = COPYING.LGPL3 +VTE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_ICU),y) VTE_CONF_OPTS += -Dicu=true \-- Sent using MsgSafe.io's Free Plan Private, encrypted, online communication For everyone. https://www.msgsafe.io -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sat Jan 15 10:23:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:23:03 +0100 Subject: [Buildroot] [git commit] package/targetcli-fb: security bump to version 2.1.54 Message-ID: <20220115101718.49F728296C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=488f92a1c368c842f9f6c1bbae0384cfa803a684 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak permissions for /etc/target (and for the backup directory and backup files). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 207c38e046..64f68a6675 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 7425423b8f..c6ca776b27 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sat Jan 15 10:22:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:22:59 +0100 Subject: [Buildroot] [git commit] package/python-configshell-fb: bump to version 1.1.29 Message-ID: <20220115101718.3885682684@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e61c7eef35ba2c962cac23a2e59ec9920f301348 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-configshell-fb/python-configshell-fb.hash | 2 +- package/python-configshell-fb/python-configshell-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-configshell-fb/python-configshell-fb.hash b/package/python-configshell-fb/python-configshell-fb.hash index 0903e284aa..8fc38f61a6 100644 --- a/package/python-configshell-fb/python-configshell-fb.hash +++ b/package/python-configshell-fb/python-configshell-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 3685446d6ee02881930bb2fdc5fdd254938da66ce9843a5b3676c4246b058e4b python-configshell-fb-1.1.fb18.tar.gz +sha256 24b47284b463dcfb9ee0c1558827e13442127e62fa279b6e0253f136cf49058c python-configshell-fb-1.1.29.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index 94b6fed5ab..d0dd421e8d 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = 1.1.fb18 +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.29 PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sat Jan 15 10:23:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:23:01 +0100 Subject: [Buildroot] [git commit] package/python-rtslib-fb: bump to version 2.1.74 Message-ID: <20220115101718.4110182962@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcba4ae9444ec606bc7a48cbd04d9b55b87ba7fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-rtslib-fb/python-rtslib-fb.hash | 2 +- package/python-rtslib-fb/python-rtslib-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index f67231d398..3c2e39fffd 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-2.1.fb57.tar.gz +sha256 9f581c4bcffebc60be236af8a6ebdeccdb66d0435eeb04ab1b743c170b95d046 python-rtslib-fb-2.1.74.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 421fbed0ae..09bde874f0 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = 2.1.fb57 +PYTHON_RTSLIB_FB_VERSION = 2.1.74 # Do not switch site to PyPI: it does not contain the latest version. PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Sat Jan 15 10:24:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 11:24:15 +0100 Subject: [Buildroot] [PATCH 3/3] package/targetcli-fb: security bump to version 2.1.54 In-Reply-To: <20220114210652.1057109-3-fontaine.fabrice@gmail.com> References: <20220114210652.1057109-1-fontaine.fabrice@gmail.com> <20220114210652.1057109-3-fontaine.fabrice@gmail.com> Message-ID: <20220115102415.GJ1945846@scaer> Fabrice, All, On 2022-01-14 22:06 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak > permissions for /etc/target (and for the backup directory and backup > files). > > Signed-off-by: Fabrice Fontaine Series of 3 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/targetcli-fb/targetcli-fb.hash | 2 +- > package/targetcli-fb/targetcli-fb.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash > index 207c38e046..64f68a6675 100644 > --- a/package/targetcli-fb/targetcli-fb.hash > +++ b/package/targetcli-fb/targetcli-fb.hash > @@ -1,3 +1,3 @@ > # locally computed > -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz > +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz > sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING > diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk > index 7425423b8f..c6ca776b27 100644 > --- a/package/targetcli-fb/targetcli-fb.mk > +++ b/package/targetcli-fb/targetcli-fb.mk > @@ -6,7 +6,7 @@ > > # When upgrading the version, be sure to also upgrade python-rtslib-fb > # and python-configshell-fb at the same time. > -TARGETCLI_FB_VERSION = 2.1.fb41 > +TARGETCLI_FB_VERSION = 2.1.54 > TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) > TARGETCLI_FB_LICENSE = Apache-2.0 > TARGETCLI_FB_LICENSE_FILES = COPYING > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 10:38:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:38:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-containerd: security bump to version 1.4.12 Message-ID: <20220115103230.73668826D6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71786cb620d61498676645fc9087e9518d8b85d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The twelfth patch release for containerd 1.4 contains a few minor bug fixes and an update to mitigate CVE-2021-41190. https://github.com/containerd/containerd/releases/tag/v1.4.12 Signed-off-by: Peter Korsgaard --- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index 82b9d00d8c..ffcbeee54b 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 d42bf6d4f303061166fa5ec2657726a443d978fe13cf08ed13532df5216a61b2 docker-containerd-1.4.11.tar.gz +sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c docker-containerd-1.4.12.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 80f621fe7c..08c189525c 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.4.11 +DOCKER_CONTAINERD_VERSION = 1.4.12 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE From fontaine.fabrice at gmail.com Sat Jan 15 10:37:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 11:37:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable all features except python on host Message-ID: <20220115103754.1759593-1-fontaine.fabrice@gmail.com> Enable all features except python on host variant as suggested by Yann E. Morin in https://patchwork.ozlabs.org/project/buildroot/patch/20220114171847.634174-1-fontaine.fabrice at gmail.com Indeed, host packages have no way to express their dependencies on host boost Signed-off-by: Fabrice Fontaine --- package/boost/boost.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 2d2a8fb311..ad071ed206 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -12,13 +12,7 @@ BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt BOOST_CPE_ID_VENDOR = boost -# keep host variant as minimal as possible -HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ - --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - contract container coroutine date_time exception fiber filesystem graph \ - graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace test thread timer \ - type_erasure wave) +HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc --without-libraries=python BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) -- 2.34.1 From peter at korsgaard.com Sat Jan 15 10:39:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:39:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-utils: fix install rule for alsactl In-Reply-To: <20211211025034.800367-1-admin@khoahoang.com> (Khoa Hoang's message of "Fri, 10 Dec 2021 18:50:34 -0800") References: <20211211025034.800367-1-admin@khoahoang.com> Message-ID: <87fspp5ll2.fsf@dell.be.48ers.dk> >>>>> "Khoa" == Khoa Hoang writes: > The copy command for /usr/share/alsa missing an asterisk cause it to copy to > /usr/share/alsa/alsa instead of /usr/share/alsa where it should be. > Signed-off-by: Khoa Hoang Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 15 10:47:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 11:47:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pysftp: fix dependencies Message-ID: <20220115104729.1760707-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of python-cryptography to version 36.0.1 in commit 01764876e3d4e7ab95c8365f1c83e6c12d49757c: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] Selected by [y]: - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] Selected by [y]: - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/python-pysftp/Config.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in index 5d5b731f33..c65369b667 100644 --- a/package/python-pysftp/Config.in +++ b/package/python-pysftp/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_PYTHON_PYSFTP bool "python-pysftp" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-paramiko -> python-cryptography depends on BR2_PACKAGE_PYTHON3 # python-paramiko -> python-bcrypt - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko select BR2_PACKAGE_PYTHON_PARAMIKO # runtime help A friendly face on SFTP. https://bitbucket.org/dundeemt/pysftp - -comment "python-pysftp needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP -- 2.34.1 From peter at korsgaard.com Sat Jan 15 10:51:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: bump to version 0.103.4 In-Reply-To: <20211211213632.537666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 11 Dec 2021 22:36:31 +0100") References: <20211211213632.537666-1-fontaine.fabrice@gmail.com> Message-ID: <87bl0d5l2f.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > ClamAV 0.103.4 is a critical patch release: > https://blog.clamav.net/2021/11/clamav-01034-and-01041-patch-releases.html > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:54:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:54:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/x11r7/xapp_xauth: bump version to 1.1.1 In-Reply-To: <20211212084857.127023-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 12 Dec 2021 09:48:56 +0100") References: <20211212084857.127023-1-bernd.kuhls@t-online.de> Message-ID: <877db15kx0.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Removed md5 and sha1 license hashes. > Release notes: > https://lists.x.org/archives/xorg-announce/2021-November/003118.html > Signed-off-by: Bernd Kuhls Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:56:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:56:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.5 In-Reply-To: (Christian Stewart via buildroot's message of "Thu, 6 Jan 2022 13:39:35 -0800") References: <20211212090107.2975294-1-christian@paral.in> Message-ID: <8735lp5ku3.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart via buildroot writes: > Hi maintainers, all, > Currently 2021.11.x branch is at version 1.17.3 which is vulnerable to: > - CVE-2021-44716 > - CVE-2021-44717 > Is it currently policy to backport security patches? > Similarly the 2021.02.x LTS branch is at 1.16.10, when the security > fixes landed in 1.16.12. > I've just submitted 1.17.6 to the list and will submit 1.16.12 for > 2021.02.x as well. Committed to 2021.11.x, thanks. Sorry for the delay. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:58:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:58:24 +0100 Subject: [Buildroot] [PATCH 2/2] package/x11r7/xlib_libX11: bump version to 1.7.3.1 In-Reply-To: <20211212084857.127023-2-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 12 Dec 2021 09:48:57 +0100") References: <20211212084857.127023-1-bernd.kuhls@t-online.de> <20211212084857.127023-2-bernd.kuhls@t-online.de> Message-ID: <87y23h465r.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Upstream switched from bz2 to xz tarball. > Release notes: > https://lists.x.org/archives/xorg-announce/2021-December/003120.html > https://lists.x.org/archives/xorg-announce/2021-December/003121.html > Signed-off-by: Bernd Kuhls Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:59:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:59:24 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Roman Gorbenkov, e-mail bouncing In-Reply-To: <20211213080333.791558380D@busybox.osuosl.org> (Thomas Petazzoni's message of "Mon, 13 Dec 2021 09:08:17 +0100") References: <20211213080333.791558380D@busybox.osuosl.org> Message-ID: <87tue54643.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=656f4a3718c5c643e419718ee693109093accbd9 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > : host mxd.relay.renater.fr[194.214.200.9] said: 550 > 5.5.0 Requested actions not taken as the mailbox is unavailable (in reply > to RCPT TO command) > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 15 11:00:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 12:00:11 +0100 Subject: [Buildroot] package/vte: add libvte to buildroot toolchain In-Reply-To: <20220115101415.986123F41E@exit1-us.msgsafe.io> References: <20220115101415.986123F41E@exit1-us.msgsafe.io> Message-ID: <20220115110011.GK1945846@scaer> rainbox2k12, All, On 2022-01-15 10:14 +0000, rainbox2k12 via buildroot spake thusly: > This patch is needed in order to use libvte in the buildroot toolchain. Thanks for your contribution; it definitely makes sense. To accept patches in Buildroot, we need them to be properly authored to a real name. Additionally, patches should have a sign-off that matches the author of the patch. Patches should also be properly formatted with a title and a description. In this case, a appropriate commit-log should probably look like: package/vte: install to staging vte also provides libvte, a library that can be linked to by other programs, so install it in staging. Signed-off-by: Your Real NAME See the manual for more details: https://buildroot.org/downloads/manual/manual.html#submitting-patches > diff --git a/package/vte/vte.mk b/package/vte/vte.mk > > index 07e8136..ceb2f09 100644 > > --- a/package/vte/vte.mk > > +++ b/package/vte/vte.mk > > @@ -11,6 +11,7 @@ VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) > > VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) > > VTE_LICENSE = LGPL-3.0+ > > VTE_LICENSE_FILES = COPYING.LGPL3 > > +VTE_INSTALL_STAGING = YES This patch is heavily mangled by your mailer. Please use 'git send-email' to send patches; this ensures that patches are properly formatted in a mail ready to be applied by maintainers. Regards, Yann E. MORIN. > ifeq ($(BR2_PACKAGE_ICU),y) > > VTE_CONF_OPTS += -Dicu=true > > -- > Sent using [1]MsgSafe.io's Free Plan > Private, encrypted, online communication > For everyone. [2]www.msgsafe.io > > Links: > 1. file:///tmp/mail-html2txt.2089315.NQ2C0Z/https:/www.msgsafe.io/?utm_source=msgsafe&utm_medium=email&utm_campaign=freemailsignature > 2. file:///tmp/mail-html2txt.2089315.NQ2C0Z/https:/www.msgsafe.io/?utm_source=msgsafe&utm_medium=email&utm_campaign=freemailsignature > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 11:01:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:01:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: bump to version 2.1.4 In-Reply-To: <20211212174922.668065-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 12 Dec 2021 18:49:22 +0100") References: <20211212174922.668065-1-fontaine.fabrice@gmail.com> Message-ID: <87pmot4612.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Mutt 2.1.4 was released on December 11, 2021. This is a bug-fix release, > fixing a performance issue when used with DavMail. > Mutt 2.1.3 was released on September 10, 2021. This is a bug-fix > release, fixing some of the fixes in the last release. IMAP and > QRESYNC users are advised to upgrade. > Mutt 2.1.2 was released on August 24, 2021. This is an important bug-fix > release, fixing a potential data-loss IMAP bug, a couple QRESYNC bugs, > and a few other issues. IMAP users are strongly advised to upgrade. > http://www.mutt.org > https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-4-rel/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 10:48:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:48:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/clamav: bump to version 0.103.4 Message-ID: <20220115105522.0F85F829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=daa07be55df578ba78994aba964e8f6f91ccae23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x ClamAV 0.103.4 is a critical patch release: https://blog.clamav.net/2021/11/clamav-01034-and-01041-patch-releases.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ac629ef040fc8b10521d2592c944e09fd70b7016) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index a2ed115d24..d68b04af76 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 clamav-0.103.3.tar.gz +sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 63af111da5..94b589b975 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.3 +CLAMAV_VERSION = 0.103.4 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Sat Jan 15 10:39:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:39:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/alsa-utils: fix install rule for alsactl Message-ID: <20220115105521.F327C82911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bdea4db4ba8df19b50e5ac72217336b1d4e2316 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The copy command for /usr/share/alsa missing an asterisk cause it to copy to /usr/share/alsa/alsa instead of /usr/share/alsa where it should be. Signed-off-by: Khoa Hoang Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6c71b52235d88cd8d38b4fd02c87f791aaa8eff3) Signed-off-by: Peter Korsgaard --- package/alsa-utils/alsa-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 427280c1e6..2603e52f18 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -77,7 +77,7 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS fi if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \ mkdir -p $(TARGET_DIR)/usr/share/; \ - cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \ + cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/; \ fi endef From peter at korsgaard.com Sat Jan 15 10:59:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:59:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: remove Roman Gorbenkov, e-mail bouncing Message-ID: <20220115105522.32F7F82911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1de8b3afe12c40fd127011b888f1c7f55b2227ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x : host mxd.relay.renater.fr[194.214.200.9] said: 550 5.5.0 Requested actions not taken as the mailbox is unavailable (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni (cherry picked from commit 656f4a3718c5c643e419718ee693109093accbd9) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c9848ac428..048d88ff55 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2402,9 +2402,6 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ -N: Roman Gorbenkov -F: package/davfs2/ - N: Ryan Barnett F: package/atftp/ F: package/c-periphery/ From peter at korsgaard.com Sat Jan 15 10:55:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:55:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/go: security bump to 1.17.5 Message-ID: <20220115105522.21838829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=823354d13d9112f83624de9a17c13f5c77f9e1a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x go1.17.4 (released 2021-12-02) includes fixes to the compiler, linker, runtime, and the go/types, net/http, and time packages. go1.17.5 (released 2021-12-09) includes security fixes to the syscall and net/http packages: - CVE-2021-44716 - CVE-2021-44717 https://go.dev/doc/devel/release#go1.17 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit eb92bb01b325521e5bd85349ad57281c1e481c33) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 9031c33d8a..39f8226aae 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0 go1.17.3.src.tar.gz +sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 59177e54db..0d9ceab2bb 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.3 +GO_VERSION = 1.17.5 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Sat Jan 15 10:57:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:57:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/x11r7/xlib_libX11: bump version to 1.7.3.1 Message-ID: <20220115105522.29AE8829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74d578c31c67afaf9fb7a92c07b34e24cc09d1c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Upstream switched from bz2 to xz tarball. Release notes: https://lists.x.org/archives/xorg-announce/2021-December/003120.html https://lists.x.org/archives/xorg-announce/2021-December/003121.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e39d5fb074807ee2e1725549d555153262626e41) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 7aeef33446..126be07f03 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-June/003092.html -sha256 1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c libX11-1.7.2.tar.bz2 -sha512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7 libX11-1.7.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-December/003121.html +sha256 2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989 libX11-1.7.3.1.tar.xz +sha512 a2620076db4bf35ab94706c8ab714e9c3fecbdd533cf99cdffeabaf49a1a1d30a233eb2dc76da51b01d50c43f11780aa3b2936668d982a33fa7d5008be44e25b libX11-1.7.3.1.tar.xz # Locally computed sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index aa3ebf1593..a8dc7f3668 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.7.2 -XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 +XLIB_LIBX11_VERSION = 1.7.3.1 +XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT XLIB_LIBX11_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Jan 15 10:47:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:47:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/clamav: drop first patch Message-ID: <20220115105522.0738A829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4eeeda794b345d3fde69770f215fe6897848a16d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x First patch is not needed since bump to version 0.99.1 in commit 2c8e5dd69f4f281b2b497ae7ec9ec95c47e7c80c and https://github.com/Cisco-Talos/clamav/commit/689005317680854627b79c76ffa6e42a8160b0e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3d565a831d7316ffbd182694b25674ab0101718b) Signed-off-by: Peter Korsgaard --- ...roto.c-fix-build-error-due-to-missing-soc.patch | 34 ---------------------- ...use-backtrace-if-using-uClibc-without-ba.patch} | 0 2 files changed, 34 deletions(-) diff --git a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch deleted file mode 100644 index daac677eaa..0000000000 --- a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 7 May 2018 23:14:46 +0200 -Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un - definition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -proto.c: In function ???dconnect???: -proto.c:86:67: error: invalid application of ???sizeof??? to incomplete type ???struct sockaddr_un??? - if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) - -Signed-off-by: Bernd Kuhls -Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html ---- - clamdscan/proto.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/clamdscan/proto.c b/clamdscan/proto.c -index 0205f6da0..d3396732f 100644 ---- a/clamdscan/proto.c -+++ b/clamdscan/proto.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_SYS_SELECT_H - #include - #endif --- -2.14.3 - diff --git a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch similarity index 100% rename from package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch rename to package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch From peter at korsgaard.com Sat Jan 15 11:00:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:00:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mutt: bump to version 2.1.4 Message-ID: <20220115105522.3C52082911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0743af30a8cc51cf669638e93df26fe9cf3768d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Mutt 2.1.4 was released on December 11, 2021. This is a bug-fix release, fixing a performance issue when used with DavMail. Mutt 2.1.3 was released on September 10, 2021. This is a bug-fix release, fixing some of the fixes in the last release. IMAP and QRESYNC users are advised to upgrade. Mutt 2.1.2 was released on August 24, 2021. This is an important bug-fix release, fixing a potential data-loss IMAP bug, a couple QRESYNC bugs, and a few other issues. IMAP users are strongly advised to upgrade. http://www.mutt.org https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-4-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7686a1382f97b8c2b2de00a8bc20e7208a2123b7) Signed-off-by: Peter Korsgaard --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index 1b58c50065..dceae57b65 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4ae6d60f7f19854c375cc1c27b5768b71e9f450c2adc10c22e45de8a27de524a mutt-2.1.1.tar.gz +sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 66616f032c..44d7864eb6 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.1 +MUTT_VERSION = 2.1.4 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From peter at korsgaard.com Sat Jan 15 10:54:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:54:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/x11r7/xapp_xauth: bump version to 1.1.1 Message-ID: <20220115105522.18F7882911@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dccdddf13ac2106c65ebbfd6e211581e13578517 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Removed md5 and sha1 license hashes. Release notes: https://lists.x.org/archives/xorg-announce/2021-November/003118.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 01414cc093d9e791b15caff37dd426623068883c) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xauth/xapp_xauth.hash | 9 ++++----- package/x11r7/xapp_xauth/xapp_xauth.mk | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xauth/xapp_xauth.hash b/package/x11r7/xapp_xauth/xapp_xauth.hash index 0251c083a7..22ea4cadfd 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.hash +++ b/package/x11r7/xapp_xauth/xapp_xauth.hash @@ -1,7 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003005.html -md5 e50587c1bb832aafd1a19d91a0890a0b xauth-1.1.tar.bz2 -sha1 16180e36d75a23cb182cb91e78f24273f1a63967 xauth-1.1.tar.bz2 -sha256 6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c xauth-1.1.tar.bz2 -sha512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c xauth-1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-November/003118.html +sha256 164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92 xauth-1.1.1.tar.bz2 +sha512 998c3158378fff50d368959c29335173b8d98e02591cb3d7b2f9534b5a44b19deb4cb7da9bf291ca5a37f69f833d72839b2c6611723306d10c1b4968ae4d4120 xauth-1.1.1.tar.bz2 + # Locally computed sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk index cd900f0055..64b064d3bd 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.mk +++ b/package/x11r7/xapp_xauth/xapp_xauth.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XAUTH_VERSION = 1.1 +XAPP_XAUTH_VERSION = 1.1.1 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XAUTH_LICENSE = MIT From peter at korsgaard.com Sat Jan 15 10:48:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:48:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/clamav: bump version to 0.103.3 Message-ID: <20220115105526.61546829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6be56b0fd91c86b606bdbdcc52d9bddc1d47034b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://blog.clamav.net/2021/06/clamav-01033-patch-release.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 3950ab9bc7439ec6eb35dfdc5b36da038ae2ce50) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 679240985b..a2ed115d24 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d4b5d0ac666262e423a326fb54778caa7c69624d6c3f9542895feb8478271bd2 clamav-0.103.2.tar.gz +sha256 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 clamav-0.103.3.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index b3e1ca98ad..63af111da5 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.2 +CLAMAV_VERSION = 0.103.3 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Sat Jan 15 10:39:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:39:29 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/alsa-utils: fix install rule for alsactl Message-ID: <20220115105526.58CD3829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58b40c62f37f5841cbd1c9c6ff55512216101248 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The copy command for /usr/share/alsa missing an asterisk cause it to copy to /usr/share/alsa/alsa instead of /usr/share/alsa where it should be. Signed-off-by: Khoa Hoang Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6c71b52235d88cd8d38b4fd02c87f791aaa8eff3) Signed-off-by: Peter Korsgaard --- package/alsa-utils/alsa-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 427280c1e6..2603e52f18 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -77,7 +77,7 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS fi if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \ mkdir -p $(TARGET_DIR)/usr/share/; \ - cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \ + cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/; \ fi endef From peter at korsgaard.com Sat Jan 15 10:50:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:50:42 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/clamav: bump to version 0.103.4 Message-ID: <20220115105526.73357829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f445c949b0e5018a47107101fe8c5231b2fe3e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x ClamAV 0.103.4 is a critical patch release: https://blog.clamav.net/2021/11/clamav-01034-and-01041-patch-releases.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ac629ef040fc8b10521d2592c944e09fd70b7016) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index a2ed115d24..d68b04af76 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 clamav-0.103.3.tar.gz +sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 63af111da5..94b589b975 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.3 +CLAMAV_VERSION = 0.103.4 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Sat Jan 15 10:53:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:53:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/x11r7/xapp_xauth: bump version to 1.1.1 Message-ID: <20220115105526.7B71C829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a110aa56451bbe0b5713812b44b99e473b69afd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Removed md5 and sha1 license hashes. Release notes: https://lists.x.org/archives/xorg-announce/2021-November/003118.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 01414cc093d9e791b15caff37dd426623068883c) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xauth/xapp_xauth.hash | 9 ++++----- package/x11r7/xapp_xauth/xapp_xauth.mk | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xauth/xapp_xauth.hash b/package/x11r7/xapp_xauth/xapp_xauth.hash index 0251c083a7..22ea4cadfd 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.hash +++ b/package/x11r7/xapp_xauth/xapp_xauth.hash @@ -1,7 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003005.html -md5 e50587c1bb832aafd1a19d91a0890a0b xauth-1.1.tar.bz2 -sha1 16180e36d75a23cb182cb91e78f24273f1a63967 xauth-1.1.tar.bz2 -sha256 6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c xauth-1.1.tar.bz2 -sha512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c xauth-1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-November/003118.html +sha256 164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92 xauth-1.1.1.tar.bz2 +sha512 998c3158378fff50d368959c29335173b8d98e02591cb3d7b2f9534b5a44b19deb4cb7da9bf291ca5a37f69f833d72839b2c6611723306d10c1b4968ae4d4120 xauth-1.1.1.tar.bz2 + # Locally computed sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk index cd900f0055..64b064d3bd 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.mk +++ b/package/x11r7/xapp_xauth/xapp_xauth.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XAUTH_VERSION = 1.1 +XAPP_XAUTH_VERSION = 1.1.1 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XAUTH_LICENSE = MIT From peter at korsgaard.com Sat Jan 15 10:50:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:50:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/clamav: drop first patch Message-ID: <20220115105526.6A6DE829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d645ab244230c03908e7cb6c440ba143c9203cf5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x First patch is not needed since bump to version 0.99.1 in commit 2c8e5dd69f4f281b2b497ae7ec9ec95c47e7c80c and https://github.com/Cisco-Talos/clamav/commit/689005317680854627b79c76ffa6e42a8160b0e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3d565a831d7316ffbd182694b25674ab0101718b) Signed-off-by: Peter Korsgaard --- ...roto.c-fix-build-error-due-to-missing-soc.patch | 34 ---------------------- ...use-backtrace-if-using-uClibc-without-ba.patch} | 0 2 files changed, 34 deletions(-) diff --git a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch deleted file mode 100644 index daac677eaa..0000000000 --- a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 7 May 2018 23:14:46 +0200 -Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un - definition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -proto.c: In function ???dconnect???: -proto.c:86:67: error: invalid application of ???sizeof??? to incomplete type ???struct sockaddr_un??? - if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) - -Signed-off-by: Bernd Kuhls -Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html ---- - clamdscan/proto.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/clamdscan/proto.c b/clamdscan/proto.c -index 0205f6da0..d3396732f 100644 ---- a/clamdscan/proto.c -+++ b/clamdscan/proto.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_SYS_SELECT_H - #include - #endif --- -2.14.3 - diff --git a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch similarity index 100% rename from package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch rename to package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch From peter at korsgaard.com Sat Jan 15 10:59:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:59:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: remove Roman Gorbenkov, e-mail bouncing Message-ID: <20220115105526.8E0D3829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=654d798b829c4f677fa5eca99a4a0e569ec3fa1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x : host mxd.relay.renater.fr[194.214.200.9] said: 550 5.5.0 Requested actions not taken as the mailbox is unavailable (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni (cherry picked from commit 656f4a3718c5c643e419718ee693109093accbd9) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a2c4368dd0..2d7f971b25 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2284,9 +2284,6 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ -N: Roman Gorbenkov -F: package/davfs2/ - N: Ryan Barnett F: package/atftp/ F: package/c-periphery/ From peter at korsgaard.com Sat Jan 15 10:58:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 11:58:14 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/x11r7/xlib_libX11: bump version to 1.7.3.1 Message-ID: <20220115105526.83CD4829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0fe00a878c573663e2cb1cab3ecd8f68eecd340 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Upstream switched from bz2 to xz tarball. Release notes: https://lists.x.org/archives/xorg-announce/2021-December/003120.html https://lists.x.org/archives/xorg-announce/2021-December/003121.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e39d5fb074807ee2e1725549d555153262626e41) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 7aeef33446..126be07f03 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-June/003092.html -sha256 1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c libX11-1.7.2.tar.bz2 -sha512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7 libX11-1.7.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-December/003121.html +sha256 2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989 libX11-1.7.3.1.tar.xz +sha512 a2620076db4bf35ab94706c8ab714e9c3fecbdd533cf99cdffeabaf49a1a1d30a233eb2dc76da51b01d50c43f11780aa3b2936668d982a33fa7d5008be44e25b libX11-1.7.3.1.tar.xz # Locally computed sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index aa3ebf1593..a8dc7f3668 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.7.2 -XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 +XLIB_LIBX11_VERSION = 1.7.3.1 +XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT XLIB_LIBX11_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Jan 15 11:04:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:04:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.40 In-Reply-To: <20211212192544.838696-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 12 Dec 2021 20:25:44 +0100") References: <20211212192544.838696-1-fontaine.fabrice@gmail.com> Message-ID: <87lezh45vp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Drop patches (already in version) > - This bump will fix build failures on ARM > - This bump will fix build failures with old glibc thanks to > https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e1671236671afbf7719b3ef29039ec4ac5102347 > https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.40 > Fixes: > - http://autobuild.buildroot.org/results/faec4ea02f4a6ddf44d54d5784d9de866c2d8a1f > - http://autobuild.buildroot.org/results/31014558b6ad72e0f602095c423d48219dd6ebfa > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 11:06:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:06:14 +0100 Subject: [Buildroot] [PATCH 1/1] DEVELOPERS: add Andreas Ziegler to package/mpd In-Reply-To: <20211213063402.792467-1-br015@umbiko.net> (Andreas Ziegler's message of "Mon, 13 Dec 2021 07:34:02 +0100") References: <20211213063402.792467-1-br015@umbiko.net> Message-ID: <87h7a545sp.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > to monitor issues and changes. > Signed-off-by: Andreas Ziegler Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 15 11:05:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 12:05:33 +0100 Subject: [Buildroot] [git commit] package/ghostscript: fix CVE-2021-45949 Message-ID: <20220115110038.2ED6182A01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c817641331431aeb6db7b487173d63dbd9c73295 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...stack-management-in-sampled_data_continue.patch | 68 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 + 2 files changed, 71 insertions(+) diff --git a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch new file mode 100644 index 0000000000..72e07df0ac --- /dev/null +++ b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i commit: https://git.buildroot.net/buildroot/commit/?id=70910c4092d9c9f359c26436fbc3c75918a90129 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in sampled_data_sample (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ck-stack-limits-after-function-evaluation.patch | 52 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 ++ 2 files changed, 55 insertions(+) diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch new file mode 100644 index 0000000000..352f1754f6 --- /dev/null +++ b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch @@ -0,0 +1,52 @@ +From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i (Maxime Chevallier's message of "Mon, 13 Dec 2021 11:52:55 +0100") References: <20211213105255.650164-1-maxime.chevallier@bootlin.com> Message-ID: <87czkt45lc.fsf@dell.be.48ers.dk> >>>>> "Maxime" == Maxime Chevallier writes: > The Beaglebone Black Wireless needs a specific DT, which u-boot tries to > load based on the board name. Make sure we ship the DT so that we can > boot on that platform. > Signed-off-by: Maxime Chevallier Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 15 11:08:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 12:08:41 +0100 Subject: [Buildroot] [git commit] package/python-pysftp: fix dependencies Message-ID: <20220115110425.E5767825E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=959f3826e827544a15b7f8ef168b1146d5be81d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of python-cryptography to version 36.0.1 in commit 01764876e3d4e7ab95c8365f1c83e6c12d49757c: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] Selected by [y]: - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] Selected by [y]: - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pysftp/Config.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in index 5d5b731f33..c65369b667 100644 --- a/package/python-pysftp/Config.in +++ b/package/python-pysftp/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_PYTHON_PYSFTP bool "python-pysftp" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-paramiko -> python-cryptography depends on BR2_PACKAGE_PYTHON3 # python-paramiko -> python-bcrypt - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko select BR2_PACKAGE_PYTHON_PARAMIKO # runtime help A friendly face on SFTP. https://bitbucket.org/dundeemt/pysftp - -comment "python-pysftp needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 - depends on !BR2_INSTALL_LIBSTDCPP From yann.morin.1998 at free.fr Sat Jan 15 11:11:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 12:11:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pysftp: fix dependencies In-Reply-To: <20220115104729.1760707-1-fontaine.fabrice@gmail.com> References: <20220115104729.1760707-1-fontaine.fabrice@gmail.com> Message-ID: <20220115111153.GL1945846@scaer> Fabrice, All, On 2022-01-15 11:47 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump of python-cryptography > to version 36.0.1 in commit 01764876e3d4e7ab95c8365f1c83e6c12d49757c: > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO > Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] > Selected by [y]: > - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PARAMIKO > Depends on [n]: (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] && BR2_PACKAGE_PYTHON3 [=y] > Selected by [y]: > - BR2_PACKAGE_PYTHON_PYSFTP [=y] && (BR2_PACKAGE_PYTHON [=n] || BR2_PACKAGE_PYTHON3 [=y]) && BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=y] > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-pysftp/Config.in | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/package/python-pysftp/Config.in b/package/python-pysftp/Config.in > index 5d5b731f33..c65369b667 100644 > --- a/package/python-pysftp/Config.in > +++ b/package/python-pysftp/Config.in > @@ -1,13 +1,9 @@ > config BR2_PACKAGE_PYTHON_PYSFTP > bool "python-pysftp" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-paramiko -> python-cryptography > depends on BR2_PACKAGE_PYTHON3 # python-paramiko -> python-bcrypt > - depends on BR2_INSTALL_LIBSTDCPP # python-paramiko > select BR2_PACKAGE_PYTHON_PARAMIKO # runtime > help > A friendly face on SFTP. > > https://bitbucket.org/dundeemt/pysftp > - > -comment "python-pysftp needs a toolchain w/ C++" > - depends on BR2_PACKAGE_PYTHON3 > - depends on !BR2_INSTALL_LIBSTDCPP > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sat Jan 15 11:17:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:17:03 +0100 Subject: [Buildroot] [PATCH 1/2] package/libvirt: fix libvirtd option In-Reply-To: <20211213221035.1779283-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Dec 2021 23:10:34 +0100") References: <20211213221035.1779283-1-fontaine.fabrice@gmail.com> Message-ID: <878rvh45ao.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Replace libvirtd by driver_libvirtd to avoid the following build failure > raised since the addition of the package in commit > ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: > ../output-1/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "libvirtd" > Fixes: > - http://autobuild.buildroot.org/results/3a20db6cb39c0d91213adbe82934274659df43e7 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 11:17:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:17:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/libvirt: fix dependencies in Config.in In-Reply-To: <20211213221035.1779283-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 13 Dec 2021 23:10:35 +0100") References: <20211213221035.1779283-1-fontaine.fabrice@gmail.com> <20211213221035.1779283-2-fontaine.fabrice@gmail.com> Message-ID: <874k6545aj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop spurious "depends on WCHAR" added with commit > ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and adds missing wchar comment > While at it, drop BR2_USE_MMU from comment as it is already added by > BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS and fix indentation before > (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 15 11:16:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 12:16:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/php-apcu: fix build without __sync_*_4 intrinsics Message-ID: <20220115111622.1910388-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 8ddeeffa186d8bce875ac713c1e71483c618842a: configure: error: Compiler does not support atomics --enable-apcu-rwlocks can't be used until https://github.com/krakjoe/apcu/pull/430 is merged (and autoreconf does not work either) Fixes: - http://autobuild.buildroot.org/results/efa/efa3b4406f87a1e9521b66f392a6fa19ac01f0cd/build-end.log Signed-off-by: Fabrice Fontaine --- package/php-apcu/php-apcu.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/php-apcu/php-apcu.mk b/package/php-apcu/php-apcu.mk index ce59611d8f..3ac062e772 100644 --- a/package/php-apcu/php-apcu.mk +++ b/package/php-apcu/php-apcu.mk @@ -22,4 +22,8 @@ define PHP_APCU_PHPIZE endef PHP_APCU_PRE_CONFIGURE_HOOKS += PHP_APCU_PHPIZE +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),) +PHP_APCU_CONF_OPTS += --disable-apcu-rwlocks +endif + $(eval $(autotools-package)) -- 2.34.1 From peter at korsgaard.com Sat Jan 15 11:18:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:18:42 +0100 Subject: [Buildroot] [PATCH] package/json-for-modern-cpp: bump to version 3.10.4 In-Reply-To: <20211214121123.6867-1-buildroot@heine.tech> (Michael Nosthoff via buildroot's message of "Tue, 14 Dec 2021 13:11:21 +0100") References: <20211214121123.6867-1-buildroot@heine.tech> Message-ID: <87zgnx2qnh.fsf@dell.be.48ers.dk> >>>>> "Michael" == Michael Nosthoff via buildroot writes: > This release fixes two bugs introduced in release 3.10.0 and fixes the > conversion of std::filesystem::path. All changes are backward-compatible. > https://github.com/nlohmann/json/releases/tag/v3.10.4 > Signed-off-by: Michael Nosthoff Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 11:20:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:20:00 +0100 Subject: [Buildroot] [PATCH] package/ruby: security update to 3.0.3 In-Reply-To: (Waldemar Brodkorb's message of "Tue, 14 Dec 2021 13:33:10 +0100") References: Message-ID: <87v8yl2qlb.fsf@dell.be.48ers.dk> >>>>> "Waldemar" == Waldemar Brodkorb writes: > Signed-off-by: Waldemar Brodkorb Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 2.7.5, which has the same fixes. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 11:07:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:07:42 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] configs/beaglebone: add DT for the Beaglebone Black Wireless Message-ID: <20220115111347.54A1582A42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=310d3d6bef9719ee7e147e59697143e0f1c0e023 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The Beaglebone Black Wireless needs a specific DT, which u-boot tries to load based on the board name. Make sure we ship the DT so that we can boot on that platform. Signed-off-by: Maxime Chevallier Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1984222c84f53f530dce230d14f30015d971ab3f) Signed-off-by: Peter Korsgaard --- board/beaglebone/genimage.cfg | 1 + configs/beaglebone_defconfig | 2 +- configs/beaglebone_qt5_defconfig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index cfc1039ec4..1c77c58f38 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -10,6 +10,7 @@ image boot.vfat { "am335x-bone.dtb", "am335x-boneblack.dtb", "am335x-bonegreen.dtb", + "am335x-boneblack-wireless.dtb", } } size = 16M diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 9a4be13ec5..5a37f42d3e 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -10,7 +10,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 5f084b77df..11a91677ce 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.7 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y From peter at korsgaard.com Sat Jan 15 11:05:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:05:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add Andreas Ziegler to package/mpd Message-ID: <20220115111347.4A9DB82A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b0360c73c6cca0b5b3dbe4d07e19f998cbfd169 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x to monitor issues and changes. Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f9ae2246045b141537af24769ed491ee3f281608) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2d7f971b25..f90224989f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -131,6 +131,9 @@ F: package/wine/ N: Andreas Klinger F: package/ply/ +N: Andreas Ziegler +F: package/mpd/ + N: Andrey Smirnov F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ From peter at korsgaard.com Sat Jan 15 11:05:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:05:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add Andreas Ziegler to package/mpd Message-ID: <20220115111353.8C60982A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d56287dfe4053c0a3e80f5236dd22be7f7bbe6ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x to monitor issues and changes. Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f9ae2246045b141537af24769ed491ee3f281608) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 048d88ff55..a4fdf3eddd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -133,6 +133,9 @@ F: package/wine/ N: Andreas Klinger F: package/ply/ +N: Andreas Ziegler +F: package/mpd/ + N: Andrey Smirnov F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ From peter at korsgaard.com Sat Jan 15 11:18:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:18:04 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/json-for-modern-cpp: bump to version 3.10.4 Message-ID: <20220115111353.AFBE882A42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed459845821f3fd49b6faf1c50ef723f07d225d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release fixes two bugs introduced in release 3.10.0 and fixes the conversion of std::filesystem::path. All changes are backward-compatible. https://github.com/nlohmann/json/releases/tag/v3.10.4 Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 87577a92aa4df511899d58ec9f7edb1e87c83a67) Signed-off-by: Peter Korsgaard --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index 1a98971dbc..eb14d2fd6d 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e0d7c1b120cac47fa7f14a41d10a5d390f67d423d8e97b9d6834887285d6873c json-3.10.3.tar.gz +sha256 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3 json-3.10.4.tar.gz sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 53cf17d2c6..428473db5a 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.10.3 +JSON_FOR_MODERN_CPP_VERSION = 3.10.4 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From peter at korsgaard.com Sat Jan 15 11:15:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:15:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: fix libvirtd option Message-ID: <20220115111353.9F1F88077E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b287106c74d969c0c185d7da389fe7065e5e167b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Replace libvirtd by driver_libvirtd to avoid the following build failure raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1: ../output-1/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "libvirtd" Fixes: - http://autobuild.buildroot.org/results/3a20db6cb39c0d91213adbe82934274659df43e7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 86f91e14b5c158d4533909656c8174b6f28760af) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 3118de4d58..9a4788c905 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -194,7 +194,7 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Dlibvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -240,7 +240,7 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Dlibvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled endif From peter at korsgaard.com Sat Jan 15 11:04:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:04:19 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pipewire: bump to version 0.3.40 Message-ID: <20220115111353.83C028077E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c2e8a461771a3dd4e25614b70a88d1fa399a9c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Drop patches (already in version) - This bump will fix build failures on ARM - This bump will fix build failures with old glibc thanks to https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e1671236671afbf7719b3ef29039ec4ac5102347 https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.40 Fixes: - http://autobuild.buildroot.org/results/faec4ea02f4a6ddf44d54d5784d9de866c2d8a1f - http://autobuild.buildroot.org/results/31014558b6ad72e0f602095c423d48219dd6ebfa Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88281a5c4efbc637f0a6d1ac6e92f68ba2050c1a) Signed-off-by: Peter Korsgaard --- ...cpu-fix-compilation-on-some-architectures.patch | 28 -------------------- ...02-cpu-disable-VFP-asm-when-not-available.patch | 30 ---------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 2 +- 4 files changed, 2 insertions(+), 60 deletions(-) diff --git a/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch b/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch deleted file mode 100644 index 4465523610..0000000000 --- a/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 651f0decea5f83730c271e9bed03cdd0048fcd49 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 21 Oct 2021 11:09:48 +0200 -Subject: [PATCH] cpu: fix compilation on some architectures - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49] -Signed-off-by: Fabrice Fontaine ---- - spa/plugins/support/cpu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu.c b/spa/plugins/support/cpu.c -index ee1816512..01cff4854 100644 ---- a/spa/plugins/support/cpu.c -+++ b/spa/plugins/support/cpu.c -@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory, - if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL) - this->vm_type = atoi(str); - if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL) -- impl_cpu_zero_denormals(this, spa_atob(str)); -+ spa_cpu_zero_denormals(&this->cpu, spa_atob(str)); - } - - spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x", --- -GitLab - diff --git a/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch b/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch deleted file mode 100644 index 297016edc2..0000000000 --- a/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2cddd4a775c145570f4a8a30d28b57f551d43206 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Mon, 25 Oct 2021 16:32:16 +0200 -Subject: [PATCH] cpu: disable VFP asm when not available - -Fixes #1746 - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/2cddd4a775c145570f4a8a30d28b57f551d43206] -Signed-off-by: Fabrice Fontaine ---- - spa/plugins/support/cpu-arm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c -index c07711f70..fe6222f7c 100644 ---- a/spa/plugins/support/cpu-arm.c -+++ b/spa/plugins/support/cpu-arm.c -@@ -143,7 +143,7 @@ static int arm_zero_denormals(void *object, bool enable) - "msr fpcr, %0 \n" - "isb \n" - : "=r"(cw)::"memory"); --#else -+#elif (defined(__VFP_FP__) && !defined(__SOFTFP__)) - uint32_t cw; - if (enable) - __asm__ __volatile__( --- -GitLab - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 7894939b0d..c41c0a3686 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 fafcde675b264485883df1f3bf7e08f36fd1d661ecc092dcec6fd35a059c2aff pipewire-0.3.39.tar.bz2 +sha256 b6a2eab8bda2f3cb87c3a0a714839696831ad27b5786674c4bd6c3776b9ebc97 pipewire-0.3.40.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index cbf24dd0ec..efda3ad695 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.39 +PIPEWIRE_VERSION = 0.3.40 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) From peter at korsgaard.com Sat Jan 15 11:10:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:10:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/beaglebone: add DT for the Beaglebone Black Wireless Message-ID: <20220115111353.94E3F82A42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f610ca46e01053771bb5d1f63e1bdc356fde59a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The Beaglebone Black Wireless needs a specific DT, which u-boot tries to load based on the board name. Make sure we ship the DT so that we can boot on that platform. Signed-off-by: Maxime Chevallier Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1984222c84f53f530dce230d14f30015d971ab3f) Signed-off-by: Peter Korsgaard --- board/beaglebone/genimage.cfg | 1 + configs/beaglebone_defconfig | 2 +- configs/beaglebone_qt5_defconfig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 1fa6c5f381..42ca2cf107 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -10,6 +10,7 @@ image boot.vfat { "am335x-bone.dtb", "am335x-boneblack.dtb", "am335x-bonegreen.dtb", + "am335x-boneblack-wireless.dtb", } } diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 763696d1dd..06154d98b7 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 5f084b77df..11a91677ce 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.7 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y From peter at korsgaard.com Sat Jan 15 11:16:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:16:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: fix dependencies in Config.in Message-ID: <20220115111353.A769282A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d87b0813b2555dfc855daac54074f0638a2b22b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop spurious "depends on WCHAR" added with commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and adds missing wchar comment While at it, drop BR2_USE_MMU from comment as it is already added by BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS and fix indentation before (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 250e96580391e130951152ae1bf9abc485d637bb) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 5693ecb4cc..e75f1cf15f 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -5,12 +5,12 @@ config BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_USE_MMU # fork() -comment "libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12 (4.11 for AArch64)" +comment "libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, wchar, kernel headers >= 3.12 (4.11 for AArch64)" depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS - depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || !BR2_USE_MMU || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ !(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \ - (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) + (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) config BR2_PACKAGE_LIBVIRT bool "libvirt" @@ -19,7 +19,6 @@ config BR2_PACKAGE_LIBVIRT depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR select BR2_PACKAGE_GNUTLS From peter at korsgaard.com Sat Jan 15 11:19:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:19:01 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/ruby: security update to 3.0.3 Message-ID: <20220115111353.B88088077E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbf58002fe1497cb7aee8fd831c951626285fa16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Waldemar Brodkorb Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5af47e96c42e677541a573e8896cb96ab2603733) Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index e3510cc97e..1208461cd0 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2021/07/07/ruby-3-0-2-released/ -sha512 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4 ruby-3.0.2.tar.xz +# https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/ +sha512 bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00 ruby-3.0.3.tar.xz # License files, Locally calculated sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index b02744f0e5..7966450fd1 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.0 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 RUBY_VERSION_EXT = 3.0.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From fontaine.fabrice at gmail.com Sat Jan 15 11:24:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 12:24:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/bento4: add BENTO4_CPE_ID_VENDOR Message-ID: <20220115112403.1910619-1-fontaine.fabrice@gmail.com> cpe:2.3:a:axiosys:bento4 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aaxiosys%3Abento4 Signed-off-by: Fabrice Fontaine --- package/bento4/bento4.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk index 6e17d1d53b..89ff2e4b85 100644 --- a/package/bento4/bento4.mk +++ b/package/bento4/bento4.mk @@ -9,6 +9,7 @@ BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION)) BENTO4_INSTALL_STAGING = YES BENTO4_LICENSE = GPL-2.0+ BENTO4_LICENSE_FILES = Documents/LICENSE.txt +BENTO4_CPE_ID_VENDOR = axiosys # Source/C++/Core/Ap4Config.h ifeq ($(BR2_ENDIAN),"BIG") -- 2.34.1 From peter at korsgaard.com Sat Jan 15 11:34:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 12:34:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/ruby: security bump to version 2.7.5 Message-ID: <20220115112945.71F0382A7D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9087da9922f10513c604d73f8d5d6d86cea91768 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2021-41817: Regular Expression Denial of Service Vulnerability of Date Parsing Methods https://www.ruby-lang.org/en/news/2021/11/15/date-parsing-method-regexp-dos-cve-2021-41817/ - CVE-2021-41816: Buffer Overrun in CGI.escape_html https://www.ruby-lang.org/en/news/2021/11/24/buffer-overrun-in-cgi-escape_html-cve-2021-41816/ - CVE-2021-41819: Cookie Prefix Spoofing in CGI::Cookie.parse https://www.ruby-lang.org/en/news/2021/11/24/cookie-prefix-spoofing-in-cgi-cookie-parse-cve-2021-41819/ Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index cba48418e7..408bd04e43 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2021/07/07/ruby-2-7-4-released/ -sha256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 ruby-2.7.4.tar.xz +# https://www.ruby-lang.org/en/news/2021/11/24/ruby-2-7-5-released/ +sha256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 ruby-2.7.5.tar.xz # License files, Locally calculated sha256 b09ca195d2de08f0aacfa8793d0af62d7681c304b3ef714b75813721823295a6 LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 24449eac71..d7648efdc6 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 2.7 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).4 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).5 RUBY_VERSION_EXT = 2.7.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From fontaine.fabrice at gmail.com Sat Jan 15 11:42:44 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 12:42:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: security bump to version 3.2.11 Message-ID: <20220115114244.1912724-1-fontaine.fabrice@gmail.com> Fixes: - CVE-2021-45115: Denial-of-service possibility in UserAttributeSimilarityValidator - CVE-2021-45116: Potential information disclosure in dictsort template filter - CVE-2021-45452: Potential directory-traversal via Storage.save() https://www.djangoproject.com/weblog/2022/jan/04/security-releases Signed-off-by: Fabrice Fontaine --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 3eea17e70f..89bc5ffb19 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 4f80208f0e..25a645823b 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.10 +PYTHON_DJANGO_VERSION = 3.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE -- 2.34.1 From festevam at gmail.com Sat Jan 15 12:10:00 2022 From: festevam at gmail.com (Fabio Estevam) Date: Sat, 15 Jan 2022 09:10:00 -0300 Subject: [Buildroot] [PATCH v2] configs/imx8mmevk: new defconfig In-Reply-To: References: <20220114024555.319448-1-festevam@gmail.com> Message-ID: Hi Heiko, On Sat, Jan 15, 2022 at 3:56 AM Heiko Thiery wrote: > > + partition imx-boot { > > + in-partition-table = "no" > > + image = "flash.bin" > > + offset = 33k > > Giulio pointed out to me that the units should be described with > capital letters. Thanks for pointing this out. I will change it. In the long term, we could probably use a common genimage.cfg too. > I my respin I used: > > append root=PARTUUID=%PARTUUID% rootwait rw > > The UUID is created in a post-build.sh script and set it in > extlinux.conf and genimage.cfg > > With that the image would not limited to be located on the SD card. Good idea. Will change it. > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" On my tests, I noticed that if I build U-Boot 2022.01 + TF-A mainline, then the kernel 5.16 does not boot. Using TF-A from the NXP BSP allows me to boot 5.16 without issues. I will try to investigate why this happens with imx8mm-evk, as your board does not show issues. Thanks From yann.morin.1998 at free.fr Sat Jan 15 13:08:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 14:08:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable all features except python on host In-Reply-To: <20220115103754.1759593-1-fontaine.fabrice@gmail.com> References: <20220115103754.1759593-1-fontaine.fabrice@gmail.com> Message-ID: <20220115130828.GM1945846@scaer> Fabrice, All, +Peter K., +Thomas P., +Arnout. On 2022-01-15 11:37 +0100, Fabrice Fontaine spake thusly: > Enable all features except python on host variant as suggested by > Yann E. Morin in > https://patchwork.ozlabs.org/project/buildroot/patch/20220114171847.634174-1-fontaine.fabrice at gmail.com > > Indeed, host packages have no way to express their dependencies on host > boost So, I was not expecting an actual patch so fast, and I was doing more testing here... So, with a recent-enough gcc (e.g. gcc-10 as is available in our Docker image used in our CI), the full Boost (save for python) is indeed built. So I gave it a shot on a much older system, like my autobuilder, that is still running gcc-4.8. And there, only the headers component is built; everything else is just skipped. This means that host packages that depend on specific features of host-boost will fail randomly depending on the host system, and there is no way to prevent that, except by adding appropriate Config.in.host options for host-boost. Note: in our case, host-riscv-isa-sim already depends on gcc >= 4.9, so it would not be selectable on my autobuilder. But still... So I wonder what we should do... Any idea? Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > package/boost/boost.mk | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/package/boost/boost.mk b/package/boost/boost.mk > index 2d2a8fb311..ad071ed206 100644 > --- a/package/boost/boost.mk > +++ b/package/boost/boost.mk > @@ -12,13 +12,7 @@ BOOST_LICENSE = BSL-1.0 > BOOST_LICENSE_FILES = LICENSE_1_0.txt > BOOST_CPE_ID_VENDOR = boost > > -# keep host variant as minimal as possible > -HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ > - --without-libraries=$(subst $(space),$(comma),atomic chrono context \ > - contract container coroutine date_time exception fiber filesystem graph \ > - graph_parallel iostreams json locale log math mpi nowide program_options \ > - python random serialization stacktrace test thread timer \ > - type_erasure wave) > +HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc --without-libraries=python > > BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) > BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 14:20:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 15:20:17 +0100 Subject: [Buildroot] [git commit] package/bento4: add BENTO4_CPE_ID_VENDOR Message-ID: <20220115141444.7807682AE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4830cf9e4ec8b6d0146d373ff2f4a8196c59c89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:axiosys:bento4 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aaxiosys%3Abento4 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/bento4/bento4.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk index 6e17d1d53b..89ff2e4b85 100644 --- a/package/bento4/bento4.mk +++ b/package/bento4/bento4.mk @@ -9,6 +9,7 @@ BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION)) BENTO4_INSTALL_STAGING = YES BENTO4_LICENSE = GPL-2.0+ BENTO4_LICENSE_FILES = Documents/LICENSE.txt +BENTO4_CPE_ID_VENDOR = axiosys # Source/C++/Core/Ap4Config.h ifeq ($(BR2_ENDIAN),"BIG") From yann.morin.1998 at free.fr Sat Jan 15 14:21:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 15:21:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/bento4: add BENTO4_CPE_ID_VENDOR In-Reply-To: <20220115112403.1910619-1-fontaine.fabrice@gmail.com> References: <20220115112403.1910619-1-fontaine.fabrice@gmail.com> Message-ID: <20220115142150.GN1945846@scaer> Fabrice, All, On 2022-01-15 12:24 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:axiosys:bento4 is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aaxiosys%3Abento4 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/bento4/bento4.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/bento4/bento4.mk b/package/bento4/bento4.mk > index 6e17d1d53b..89ff2e4b85 100644 > --- a/package/bento4/bento4.mk > +++ b/package/bento4/bento4.mk > @@ -9,6 +9,7 @@ BENTO4_SITE = $(call github,axiomatic-systems,Bento4,v$(BENTO4_VERSION)) > BENTO4_INSTALL_STAGING = YES > BENTO4_LICENSE = GPL-2.0+ > BENTO4_LICENSE_FILES = Documents/LICENSE.txt > +BENTO4_CPE_ID_VENDOR = axiosys > > # Source/C++/Core/Ap4Config.h > ifeq ($(BR2_ENDIAN),"BIG") > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 14:22:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 15:22:02 +0100 Subject: [Buildroot] [git commit] package/python-django: security bump to version 3.2.11 Message-ID: <20220115141606.C2E3382AF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a17d4aba54e62359cba638809fde5752dd40cf59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - CVE-2021-45115: Denial-of-service possibility in UserAttributeSimilarityValidator - CVE-2021-45116: Potential information disclosure in dictsort template filter - CVE-2021-45452: Potential directory-traversal via Storage.save() https://www.djangoproject.com/weblog/2022/jan/04/security-releases Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 3eea17e70f..89bc5ffb19 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 4f80208f0e..25a645823b 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.10 +PYTHON_DJANGO_VERSION = 3.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Jan 15 14:22:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 15:22:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: security bump to version 3.2.11 In-Reply-To: <20220115114244.1912724-1-fontaine.fabrice@gmail.com> References: <20220115114244.1912724-1-fontaine.fabrice@gmail.com> Message-ID: <20220115142230.GO1945846@scaer> Fabrice, All, On 2022-01-15 12:42 +0100, Fabrice Fontaine spake thusly: > Fixes: > - CVE-2021-45115: Denial-of-service possibility in > UserAttributeSimilarityValidator > - CVE-2021-45116: Potential information disclosure in dictsort template > filter > - CVE-2021-45452: Potential directory-traversal via Storage.save() > > https://www.djangoproject.com/weblog/2022/jan/04/security-releases > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-django/python-django.hash | 4 ++-- > package/python-django/python-django.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash > index 3eea17e70f..89bc5ffb19 100644 > --- a/package/python-django/python-django.hash > +++ b/package/python-django/python-django.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/django/json > -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz > -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz > +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz > +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz > # Locally computed sha256 checksums > sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE > diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk > index 4f80208f0e..25a645823b 100644 > --- a/package/python-django/python-django.mk > +++ b/package/python-django/python-django.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_DJANGO_VERSION = 3.2.10 > +PYTHON_DJANGO_VERSION = 3.2.11 > PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz > # The official Django site has an unpractical URL > -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 > +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b > > PYTHON_DJANGO_LICENSE = BSD-3-Clause > PYTHON_DJANGO_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Sat Jan 15 14:33:43 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 15 Jan 2022 15:33:43 +0100 Subject: [Buildroot] [PATCH 1/2] board/qemu/arm-vexpress-tz: use enable=on Message-ID: <20220115143344.12319-1-romain.naour@gmail.com> Since Qemu 6.0.0 [1], a warning appear in the log if a short-form boolean option is used. [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ccd3b3b8112b670fdccf8a392b8419b173ffccb4 Signed-off-by: Romain Naour Cc: Etienne Carriere Cc: Dick Olsson --- board/qemu/arm-vexpress-tz/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index 7e62e943a6..3036dd54ca 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -16,7 +16,7 @@ from the image directory: -smp 1 -s -m 1024 -d unimp \ -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ - -semihosting-config enable,target=native \ + -semihosting-config enable=on,target=native \ -bios flash.bin # qemu_arm_vexpress_tz_defconfig The boot stage traces (if any) followed by the login prompt will appear -- 2.31.1 From romain.naour at gmail.com Sat Jan 15 14:33:44 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 15 Jan 2022 15:33:44 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <20220115143344.12319-1-romain.naour@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> Message-ID: <20220115143344.12319-2-romain.naour@gmail.com> As for the Buildroot testsuite, multiply every emulator timeout by 10 to avoid sporadic failures in elastic runners. qemu_arm_vexpress_tz_defconfig tested locally with sucess. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 Signed-off-by: Romain Naour --- support/scripts/boot-qemu-image.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py index fba1533bb7..ba50ea69ee 100755 --- a/support/scripts/boot-qemu-image.py +++ b/support/scripts/boot-qemu-image.py @@ -25,7 +25,7 @@ def main(): qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') child = pexpect.spawn(qemu_start, ['serial-only'], - timeout=5, encoding='utf-8', + timeout=50, encoding='utf-8', env={"QEMU_AUDIO_DRV": "none"}) # We want only stdout into the log to avoid double echo @@ -36,7 +36,7 @@ def main(): time.sleep(1) try: - child.expect(["buildroot login:"], timeout=60) + child.expect(["buildroot login:"], timeout=600) except pexpect.EOF as e: # Some emulations require a fork of qemu-system, which may be # missing on the system, and is not provided by Buildroot. @@ -58,7 +58,7 @@ def main(): child.sendline("root\r") try: - child.expect(["# "], timeout=60) + child.expect(["# "], timeout=600) except pexpect.EOF: print("Cannot connect to shell") sys.exit(1) @@ -69,7 +69,7 @@ def main(): child.sendline("poweroff\r") try: - child.expect(["System halted"], timeout=60) + child.expect(["System halted"], timeout=600) child.expect(pexpect.EOF) except pexpect.EOF: pass -- 2.31.1 From fontaine.fabrice at gmail.com Sat Jan 15 14:39:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 15:39:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: bump to version 9.55.0 Message-ID: <20220115143900.2033727-1-fontaine.fabrice@gmail.com> - Drop patches (already in version) - Disable pdf which fails to build and was added by https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=316c3a08269212f1005709da64efcb383f8f5ce0 - Update hash of license file (references on ETS related patents removed with https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=431167121968b066d90b0506347b6eb779e08a3f) https://www.ghostscript.com/doc/9.54.0/News.htm https://www.ghostscript.com/doc/9.55.0/News.htm Signed-off-by: Fabrice Fontaine --- ...05-Fix-typo-in-non-forked-lcms2-code.patch | 28 +++ ...g-702985-drop-use-of-FT_CALLBACK_DEF.patch | 55 ---- ...de-device-specifier-strings-in-acces.patch | 234 ------------------ ...ack-limits-after-function-evaluation.patch | 52 ---- ...-management-in-sampled_data_continue.patch | 68 ----- package/ghostscript/ghostscript.hash | 6 +- package/ghostscript/ghostscript.mk | 12 +- 7 files changed, 33 insertions(+), 422 deletions(-) create mode 100644 package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch delete mode 100644 package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch delete mode 100644 package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch delete mode 100644 package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch delete mode 100644 package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch diff --git a/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch b/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch new file mode 100644 index 0000000000..bb1227f687 --- /dev/null +++ b/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch @@ -0,0 +1,28 @@ +From 830afae5454dea3bff903869d82022306890a96c Mon Sep 17 00:00:00 2001 +From: Robin Watts +Date: Fri, 1 Oct 2021 12:44:44 +0100 +Subject: [PATCH] Bug 704405: Fix typo in non-forked lcms2 code. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=830afae5454dea3bff903869d82022306890a96c] +Signed-off-by: Fabrice Fontaine +--- + base/gsicc_lcms2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/base/gsicc_lcms2.c b/base/gsicc_lcms2.c +index ccf1d7051..9badb6dee 100644 +--- a/base/gsicc_lcms2.c ++++ b/base/gsicc_lcms2.c +@@ -462,7 +462,7 @@ int + gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor, + void *outputcolor, int num_bytes) + { +- return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes); ++ return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes); + } + + int +-- +2.25.1 + diff --git a/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch b/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch deleted file mode 100644 index 044dcc72f1..0000000000 --- a/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Tue, 20 Oct 2020 09:49:45 +0100 -Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def - -From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what -we used when defining our callbacks from Freetype. - -No guidance forthcoming from the Freetype developer who made those changes, -so change to explicitly declaring the callbacks file static. - -Should fix the reported build failures. - -Downloaded from upstream commit: -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b - -Signed-off-by: Bernd Kuhls ---- - base/fapi_ft.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/base/fapi_ft.c b/base/fapi_ft.c -index 65fa6dcf4..21aef2f06 100644 ---- a/base/fapi_ft.c -+++ b/base/fapi_ft.c -@@ -125,7 +125,7 @@ static void - delete_inc_int_info(gs_fapi_server * a_server, - FT_IncrementalRec * a_inc_int_info); - --FT_CALLBACK_DEF(void *) -+static void * - FF_alloc(FT_Memory memory, long size) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; -@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) - return (gs_malloc(mem, size, 1, "FF_alloc")); - } - --FT_CALLBACK_DEF(void *) -+static void * - FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; -@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) - return (tmp); - } - --FT_CALLBACK_DEF(void) -+static void - FF_free(FT_Memory memory, void *block) - { - gs_memory_t *mem = (gs_memory_t *) memory->user; --- -2.17.1 - diff --git a/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch b/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch deleted file mode 100644 index 81436d8228..0000000000 --- a/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch +++ /dev/null @@ -1,234 +0,0 @@ -From a9bd3dec9fde03327a4a2c69dad1036bf9632e20 Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Tue, 7 Sep 2021 20:36:12 +0100 -Subject: [PATCH] Bug 704342: Include device specifier strings in access - validation - -for the "%pipe%", %handle%" and %printer% io devices. - -We previously validated only the part after the "%pipe%" Postscript device -specifier, but this proved insufficient. - -This rebuilds the original file name string, and validates it complete. The -slight complication for "%pipe%" is it can be reached implicitly using -"|" so we have to check both prefixes. - -Addresses CVE-2021-3781 - -Signed-off-by: Peter Korsgaard ---- - base/gdevpipe.c | 22 +++++++++++++++- - base/gp_mshdl.c | 11 +++++++- - base/gp_msprn.c | 10 ++++++- - base/gp_os2pr.c | 13 +++++++++- - base/gslibctx.c | 69 ++++++++++--------------------------------------- - 5 files changed, 65 insertions(+), 60 deletions(-) - -diff --git a/base/gdevpipe.c b/base/gdevpipe.c -index 96d71f5d8..5bdc485be 100644 ---- a/base/gdevpipe.c -+++ b/base/gdevpipe.c -@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access, - #else - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ /* The pipe device can be reached in two ways, explicltly with %pipe% -+ or implicitly with "|", so we have to check for both -+ */ -+ char f[gp_file_name_sizeof]; -+ const char *pipestr = "|"; -+ const size_t pipestrlen = strlen(pipestr); -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); -+ int code1; -+ -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(f, iodev->dname, preflen); -+ memcpy(f + preflen, fname, nlen + 1); -+ -+ code1 = gp_validate_path(mem, f, access); -+ -+ memcpy(f, pipestr, pipestrlen); -+ memcpy(f + pipestrlen, fname, nlen + 1); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (code1 != 0 && gp_validate_path(mem, f, access) != 0 ) - return gs_error_invalidfileaccess; - - /* -diff --git a/base/gp_mshdl.c b/base/gp_mshdl.c -index 2b964ed74..8d87ceadc 100644 ---- a/base/gp_mshdl.c -+++ b/base/gp_mshdl.c -@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access, - long hfile; /* Correct for Win32, may be wrong for Win64 */ - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ char f[gp_file_name_sizeof]; -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(f, iodev->dname, preflen); -+ memcpy(f + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, f, access) != 0) - return gs_error_invalidfileaccess; - - /* First we try the open_handle method. */ -diff --git a/base/gp_msprn.c b/base/gp_msprn.c -index ed4827968..746a974f7 100644 ---- a/base/gp_msprn.c -+++ b/base/gp_msprn.c -@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access, - uintptr_t *ptid = &((tid_t *)(iodev->state))->tid; - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(pname, iodev->dname, preflen); -+ memcpy(pname + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, pname, access) != 0) - return gs_error_invalidfileaccess; - - /* First we try the open_printer method. */ -diff --git a/base/gp_os2pr.c b/base/gp_os2pr.c -index f852c71fc..ba54cde66 100644 ---- a/base/gp_os2pr.c -+++ b/base/gp_os2pr.c -@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access, - FILE ** pfile, char *rfname, uint rnamelen) - { - os2_printer_t *pr = (os2_printer_t *)iodev->state; -- char driver_name[256]; -+ char driver_name[gp_file_name_sizeof]; - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ const size_t preflen = strlen(iodev->dname); -+ const int size_t = strlen(fname); -+ -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(driver_name, iodev->dname, preflen); -+ memcpy(driver_name + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, driver_name, access) != 0) -+ return gs_error_invalidfileaccess; - - /* First we try the open_printer method. */ - /* Note that the loop condition here ensures we don't -diff --git a/base/gslibctx.c b/base/gslibctx.c -index 6dfed6cd5..318039fad 100644 ---- a/base/gslibctx.c -+++ b/base/gslibctx.c -@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s) - int - gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname) - { -- char *fp, f[gp_file_name_sizeof]; -- const int pipe = 124; /* ASCII code for '|' */ -- const int len = strlen(fname); -- int i, code; -+ char f[gp_file_name_sizeof]; -+ int code; - - /* Be sure the string copy will fit */ -- if (len >= gp_file_name_sizeof) -+ if (strlen(fname) >= gp_file_name_sizeof) - return gs_error_rangecheck; - strcpy(f, fname); -- fp = f; - /* Try to rewrite any %d (or similar) in the string */ - rewrite_percent_specifiers(f); -- for (i = 0; i < len; i++) { -- if (f[i] == pipe) { -- fp = &f[i + 1]; -- /* Because we potentially have to check file permissions at two levels -- for the output file (gx_device_open_output_file and the low level -- fopen API, if we're using a pipe, we have to add both the full string, -- (including the '|', and just the command to which we pipe - since at -- the pipe_fopen(), the leading '|' has been stripped. -- */ -- code = gs_add_control_path(mem, gs_permit_file_writing, f); -- if (code < 0) -- return code; -- code = gs_add_control_path(mem, gs_permit_file_control, f); -- if (code < 0) -- return code; -- break; -- } -- if (!IS_WHITESPACE(f[i])) -- break; -- } -- code = gs_add_control_path(mem, gs_permit_file_control, fp); -+ -+ code = gs_add_control_path(mem, gs_permit_file_control, f); - if (code < 0) - return code; -- return gs_add_control_path(mem, gs_permit_file_writing, fp); -+ return gs_add_control_path(mem, gs_permit_file_writing, f); - } - - int - gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname) - { -- char *fp, f[gp_file_name_sizeof]; -- const int pipe = 124; /* ASCII code for '|' */ -- const int len = strlen(fname); -- int i, code; -+ char f[gp_file_name_sizeof]; -+ int code; - - /* Be sure the string copy will fit */ -- if (len >= gp_file_name_sizeof) -+ if (strlen(fname) >= gp_file_name_sizeof) - return gs_error_rangecheck; - strcpy(f, fname); -- fp = f; - /* Try to rewrite any %d (or similar) in the string */ -- for (i = 0; i < len; i++) { -- if (f[i] == pipe) { -- fp = &f[i + 1]; -- /* Because we potentially have to check file permissions at two levels -- for the output file (gx_device_open_output_file and the low level -- fopen API, if we're using a pipe, we have to add both the full string, -- (including the '|', and just the command to which we pipe - since at -- the pipe_fopen(), the leading '|' has been stripped. -- */ -- code = gs_remove_control_path(mem, gs_permit_file_writing, f); -- if (code < 0) -- return code; -- code = gs_remove_control_path(mem, gs_permit_file_control, f); -- if (code < 0) -- return code; -- break; -- } -- if (!IS_WHITESPACE(f[i])) -- break; -- } -- code = gs_remove_control_path(mem, gs_permit_file_control, fp); -+ rewrite_percent_specifiers(f); -+ -+ code = gs_remove_control_path(mem, gs_permit_file_control, f); - if (code < 0) - return code; -- return gs_remove_control_path(mem, gs_permit_file_writing, fp); -+ return gs_remove_control_path(mem, gs_permit_file_writing, f); - } - - int --- -2.20.1 - diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch deleted file mode 100644 index 352f1754f6..0000000000 --- a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Fri, 12 Feb 2021 10:34:23 +0000 -Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. - -During function result sampling, after the callout to the Postscript -interpreter, make sure there is enough stack space available before pushing -or popping entries. - -In thise case, the Postscript procedure for the "function" is totally invalid -(as a function), and leaves the op stack in an unrecoverable state (as far as -function evaluation is concerned). We end up popping more entries off the -stack than are available. - -To cope, add in stack limit checking to throw an appropriate error when this -happens. - -[Retrieved from: -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] -Signed-off-by: Fabrice Fontaine ---- - psi/zfsample.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/psi/zfsample.c b/psi/zfsample.c -index 290809405..652ae02c6 100644 ---- a/psi/zfsample.c -+++ b/psi/zfsample.c -@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) - } else { - if (stack_depth_adjust) { - stack_depth_adjust -= num_out; -- push(O_STACK_PAD - stack_depth_adjust); -- for (i=0;i -Date: Tue, 1 Jun 2021 19:57:16 +0100 -Subject: [PATCH] Bug 703902: Fix op stack management in - sampled_data_continue() - -Replace pop() (which does no checking, and doesn't handle stack extension -blocks) with ref_stack_pop() which does do all that. - -We still use pop() in one case (it's faster), but we have to later use -ref_stack_pop() before calling sampled_data_sample() which also accesses the -op stack. - -Fixes: -https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 - -[Retrieved from: -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] -Signed-off-by: Fabrice Fontaine ---- - psi/zfsample.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/psi/zfsample.c b/psi/zfsample.c -index 0e8e4bc8d..00cd0cfdd 100644 ---- a/psi/zfsample.c -+++ b/psi/zfsample.c -@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) - for (j = 0; j < bps; j++) - data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ - } -- pop(num_out); /* Move op to base of result values */ - -- /* Check if we are done collecting data. */ -+ pop(num_out); /* Move op to base of result values */ - -+ /* From here on, we have to use ref_stack_pop() rather than pop() -+ so that it handles stack extension blocks properly, before calling -+ sampled_data_sample() which also uses the op stack. -+ */ -+ /* Check if we are done collecting data. */ - if (increment_cube_indexes(params, penum->indexes)) { - if (stack_depth_adjust == 0) -- pop(O_STACK_PAD); /* Remove spare stack space */ -+ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ - else -- pop(stack_depth_adjust - num_out); -+ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); - /* Execute the closing procedure, if given */ - code = 0; - if (esp_finish_proc != 0) -@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) - if ((O_STACK_PAD - stack_depth_adjust) < 0) { - stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); - check_op(stack_depth_adjust); -- pop(stack_depth_adjust); -+ ref_stack_pop(&o_stack, stack_depth_adjust); - } - else { - check_ostack(O_STACK_PAD - stack_depth_adjust); -- push(O_STACK_PAD - stack_depth_adjust); -+ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); - for (i=0;i References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-3-patrickdepinguin@gmail.com> Message-ID: <439edf17-a918-09da-bad6-3253ad6bb5a5@gmail.com> Hi Thomas, Le 14/01/2022 ? 13:27, Thomas De Schampheleire a ?crit?: > Hi Romain, > > El jue, 13 ene 2022 a las 22:30, Romain Naour > () escribi?: >> >> Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : >>> From: Thomas De Schampheleire >>> >>> The variable 'KERNEL_ARCH' is actually a normalized version of >>> 'ARCH'/'BR2_ARCH'. For example, 'arcle' and 'arceb' both become 'arc', just >>> as all powerpc variants become 'powerpc'. >>> >>> It is presumably called 'KERNEL_ARCH' because the Linux kernel is typically >>> the first place where support for a new architecture is added, and thus is >>> the entity that defines the normalized name. >>> >>> However, the term 'KERNEL_ARCH' can also be interpreted as 'the architecture >>> used by the kernel', which need not be exactly the same as 'the normalized >>> name for a certain arch'. In particular, for cases where a 64-bit >>> architecture is running a 64-bit kernel but 32-bit userspace. Examples >>> include: >>> * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace >>> * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace >>> >>> In such cases, the 'architecture used by the kernel' needs to refer to the >>> 64-bit name (aarch64, x86_64), whereas all userspace applications need to >>> refer the, potentially normalized, 32-bit name. >>> >>> This means that there need to be two different variables: >>> >>> KERNEL_ARCH: the architecture used by the kernel >>> NORMALIZED_ARCH: the normalized name for the current userspace architecture >>> >>> At this moment, both will actually have the same content. But a subsequent >>> patch will add basic support for situations described above, in which >>> KERNEL_ARCH may become overwritten to the 64-bit architecture, while >>> NORMALIZED_ARCH needs to remain the same (32-bit) case. >>> >>> This commit replaces use of KERNEL_ARCH where actually the userspace arch is >>> needed. Places that use KERNEL_ARCH in combination with building of kernel >>> modules are not touched. >>> There may be cases where a package builds both a kernel module as userspace, >>> in which case it may need to know about both KERNEL_ARCH and >>> NORMALIZED_ARCH, for the case where they differ. But this is to be fixed on >>> a per-need basis. >> >> While reviewing this patch, I noticed that LINUX_ARCH_PATH [1] is wrong for sparc64 >> >> LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) >> >> Indeed: >> >> $ make O=test/qemu_sparc64_sun4u_defconfig printvars VARS=LINUX_ARCH_PATH >> LINUX_ARCH_PATH=/home/kubu/buildroot/test/qemu_sparc64_sun4u_defconfig/build/linux-5.15/arch/sparc64 >> >> But since LINUX_ARCH_PATH is not used for this architecture, it was not noticed. >> >> [1] https://git.buildroot.net/buildroot/tree/linux/linux.mk?h=2021.11#n226 >> > > Are you sure that this is a problem? > In the kernel Makefile, some 'ARCH' strings are treated specially: > > # Additional ARCH settings for x86 > ifeq ($(ARCH),i386) > SRCARCH := x86 > endif > ifeq ($(ARCH),x86_64) > SRCARCH := x86 > endif > > # Additional ARCH settings for sparc > ifeq ($(ARCH),sparc32) > SRCARCH := sparc > endif > ifeq ($(ARCH),sparc64) > SRCARCH := sparc > endif > > # Additional ARCH settings for parisc > ifeq ($(ARCH),parisc64) > SRCARCH := parisc > endif > > > So compiling the kernel with ARCH=sparc64 is accepted, and the arch > directory will be arch/sparc . Similar to how compiling with > ARCH=x86_64 works even though arch/x86_64 does not (no longer) exist. > > While I'm not familiar with sparc64, there does not seem to be a bug to me. I mean LINUX_ARCH_PATH is a Buildroot variable from linux.mk used to copy some files from the kernel build directory. For now LINUX_ARCH_PATH is not used for sparc64 target but if it happens it will break. Best regards, Romain > > Thanks, > Thomas > From fontaine.fabrice at gmail.com Sat Jan 15 15:06:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 16:06:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/mtd: fix build with libexecinfo Message-ID: <20220115150610.2084070-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: tests/fs-tests/integrity/integck-integck.o: in function `check_failed.constprop.0': integck.c:(.text+0x96c): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/9409ebf6517db87672f3f4df5909a8ac4abfe8af Signed-off-by: Fabrice Fontaine --- package/mtd/mtd.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 9f4cc27ef1..45e7c0c61c 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -13,6 +13,15 @@ MTD_CPE_ID_VENDOR = mtd-utils_project MTD_CPE_ID_PRODUCT = mtd-utils MTD_INSTALL_STAGING = YES +MTD_LDFLAGS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +MTD_DEPENDENCIES += libexecinfo +MTD_LDFLAGS += -lexecinfo +endif + +MTD_CONF_ENV += LDFLAGS="$(MTD_LDFLAGS)" + ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) MTD_DEPENDENCIES += zlib lzo host-pkgconf MTD_CONF_OPTS += --with-jffs -- 2.34.1 From peter at korsgaard.com Sat Jan 15 15:17:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:17:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/dav1d: don't override TARGET_LDFLAGS In-Reply-To: <20211214212813.2251144-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 14 Dec 2021 22:28:12 +0100") References: <20211214212813.2251144-1-fontaine.fabrice@gmail.com> Message-ID: <87r1992fl8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > TARGET_LDFLAGS is overriden since the addition of the package in commit > 8d66bc940d6e4707f9773aeb052e94d45fa439ad > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:19:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:19:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/gupnp-tools: bump to version 0.10.2 In-Reply-To: <20211214221504.2937004-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 14 Dec 2021 23:15:04 +0100") References: <20211214221504.2937004-1-fontaine.fabrice@gmail.com> Message-ID: <87mtjx2fhl.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (already in version) > https://gitlab.gnome.org/GNOME/gupnp-tools/-/blob/gupnp-tools-0.10.2/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:24:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:24:49 +0100 Subject: [Buildroot] [PATCH] connman: remove iptables as a fixed dependency In-Reply-To: ("Nuno =?utf-8?Q?Gon=C3=A7alves=22's?= message of "Wed, 15 Dec 2021 12:00:03 +0000") References: Message-ID: <87ilul2f9a.fsf@dell.be.48ers.dk> >>>>> "Nuno" == Nuno Gon?alves writes: > connman might depend on iptables or nftables, and those dependencies > are already selected later in this file as required. > Signed-off-by: Nuno Goncalves Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 15 15:33:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 16:33:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix static build with libgcrypt Message-ID: <20220115153319.2227752-1-fontaine.fabrice@gmail.com> Fix the following static build failure with libgcrypt raised since the addition of the package in commit 663f39c88c01593855c18355a4decdceeffd884b: configure:13665: /home/buildroot/autobuild/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lgcrypt >&5 /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libgcrypt.a(libgcrypt_la-visibility.o): in function `gcry_err_make_from_errno': visibility.c:(.text+0x29): undefined reference to `gpg_err_code_from_errno' Fixes: - http://autobuild.buildroot.org/results/5354f7231cf08bf762e7d86fca874ce63d9a116b Signed-off-by: Fabrice Fontaine --- ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch diff --git a/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch b/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch new file mode 100644 index 0000000000..6db6c2ae3b --- /dev/null +++ b/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch @@ -0,0 +1,50 @@ +From 727291789fa1930a3e5aa04a25e954cfa6e615d6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 15 Jan 2022 16:27:44 +0100 +Subject: [PATCH] configure.ac: use pkg-config to find gcrypt + +Use pkg-config to find gcrypt and avoid the following static build +failure: + +configure:13642: checking for gcry_md_open in -lgcrypt +configure:13665: /home/buildroot/autobuild/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lgcrypt >&5 +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libgcrypt.a(libgcrypt_la-visibility.o): in function `gcry_err_make_from_errno': +visibility.c:(.text+0x29): undefined reference to `gpg_err_code_from_errno' + +Fixes: + - http://autobuild.buildroot.org/results/5354f7231cf08bf762e7d86fca874ce63d9a116b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/52] +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bcc4156ff..531e10b8d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -405,7 +405,11 @@ fi + dnl Checks for libraries. + dnl don\'t include lib if LAN not desired + if test x"${ac_with_encryption}" = xyes; then +- AC_CHECK_LIB([gcrypt], [gcry_md_open], [have_gcrypt=yes], [have_gcrypt=no]) ++ PKG_CHECK_MODULES([GCRYPT], [libgcrypt], [have_gcrypt=yes], [ ++ AC_CHECK_LIB([gcrypt], [gcry_md_open], ++ [have_gcrypt=yes GCRYPT_LIBS=-lgcrypt], ++ [have_gcrypt=no]) ++ ]) + if test "x${have_gcrypt}" = "xno"; then + AC_MSG_ERROR([libgcrypt required to build libfreeipmi]) + AC_MSG_NOTICE([Note: libgpg-error required for libgcrypt]) +@@ -421,7 +425,6 @@ if test x"${ac_with_encryption}" = xyes; then + if test "x${have_gcrypt_threads}" = "xno"; then + AC_MSG_ERROR([libgcrypt with threads support required for libfreeipmi]) + fi +- GCRYPT_LIBS=-lgcrypt + fi + AC_SUBST(GCRYPT_LIBS) + +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Sat Jan 15 15:36:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:36:00 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.9.9 In-Reply-To: <20211216190423.2AEED821EB@busybox.osuosl.org> (Arnout Vandecappelle's message of "Thu, 16 Dec 2021 20:07:37 +0100") References: <20211216190423.2AEED821EB@busybox.osuosl.org> Message-ID: <87ee592eqn.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=ce81a6e6d2ee11b7cc23ad49252f5a696ab20299 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Drop 0030-Fix-cross-compiling-the-uuid-module.patch as the patched code has > been reworked upstream and python3 is built with --disable-uuid: > https://github.com/python/cpython/commit/91a51c5ffc3bd9da28a0000550530f6f2bcc25a2 > Rework 0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch as > the MULTIARCH code is now conditional on !darwin: > https://github.com/python/cpython/commit/9901d153c201d852d27dc9d3074e283c26468f6d > Refresh and renumber remaining patches. > Signed-off-by: Peter Korsgaard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:36:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:36:43 +0100 Subject: [Buildroot] [git commit] package/xen: add XSA-385, 386, 388, 389 security fixes In-Reply-To: <20211216190423.34EC88229F@busybox.osuosl.org> (Arnout Vandecappelle's message of "Thu, 16 Dec 2021 20:07:37 +0100") References: <20211216190423.34EC88229F@busybox.osuosl.org> Message-ID: <87a6fx2epg.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=c0932240fbd891528ae5d479f5df5229ed370416 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes the following security issues: > - XSA-385: guests may exceed their designated memory limit > https://xenbits.xenproject.org/xsa/advisory-385.html > - XSA-386: PCI devices with RMRRs not deassigned correctly > https://xenbits.xenproject.org/xsa/advisory-386.html > - XSA-388: PoD operations on misaligned GFNs > https://xenbits.xenproject.org/xsa/advisory-388.html > - XSA-389: issues with partially successful P2M updates on x86 > https://xenbits.xenproject.org/xsa/advisory-389.html > Signed-off-by: Peter Korsgaard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:16:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:16:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/dav1d: don't override TARGET_LDFLAGS Message-ID: <20220115153049.B0F7D8147C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d80c0e4488f45f14dc7a686a3d3251c93552c342 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x TARGET_LDFLAGS is overriden since the addition of the package in commit 8d66bc940d6e4707f9773aeb052e94d45fa439ad Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6deb6bdc7cee0664a71f3363f4ee2d2e9d2f031b) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 7a798bbd4f..d7224625c8 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -25,7 +25,7 @@ endif # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -DAV1D_LDFLAGS += -latomic +DAV1D_LDFLAGS += $(TARGET_LDFLAGS) -latomic endif $(eval $(meson-package)) From peter at korsgaard.com Sat Jan 15 15:36:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:36:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xen: add XSA-385, 386, 388, 389 security fixes Message-ID: <20220115153049.DF30A82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=773d3bf98e7c0420ab45319355c460f62a72d8f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - XSA-385: guests may exceed their designated memory limit https://xenbits.xenproject.org/xsa/advisory-385.html - XSA-386: PCI devices with RMRRs not deassigned correctly https://xenbits.xenproject.org/xsa/advisory-386.html - XSA-388: PoD operations on misaligned GFNs https://xenbits.xenproject.org/xsa/advisory-388.html - XSA-389: issues with partially successful P2M updates on x86 https://xenbits.xenproject.org/xsa/advisory-389.html Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c0932240fbd891528ae5d479f5df5229ed370416) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 9 +++++++++ package/xen/xen.mk | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index e30db09516..10a778053a 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,12 @@ # Locally computed sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING +# https://xenbits.xenproject.org/xsa/advisory-385.html +sha256 831e86c3adfec532b1a48a0b967b7c58c37db3733aee8d78216eb9d535b34f12 xsa385-4.15.patch +# https://xenbits.xenproject.org/xsa/advisory-386.html +sha256 f2f83c825e249bba9454437b48bbd8307fe7a224f56484388a67af124dfd279b xsa386.patch +# https://xenbits.xenproject.org/xsa/advisory-388.html +sha256 6917267482101a3f8f1d13905e14994344a0af81370c7a2b92275fb176b321a0 xsa388-4.14-1.patch +sha256 d5886e046c69f34f98f7e1fc6ffcc36d92f8fc79242b9dc88412c39aa79b4ac3 xsa388-4.14-2.patch +# https://xenbits.xenproject.org/xsa/advisory-389.html +sha256 b243284679b32ab8c817a2e41562d8694d9781fa8096c268bb41b0cd91684baa xsa389-4.14.patch diff --git a/package/xen/xen.mk b/package/xen/xen.mk index b635996afb..cfc166dc4c 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -11,6 +11,23 @@ XEN_LICENSE_FILES = COPYING XEN_CPE_ID_VENDOR = xen XEN_CPE_ID_PREFIX = cpe:2.3:o XEN_DEPENDENCIES = host-acpica host-python3 +XEN_PATCH = \ + https://xenbits.xenproject.org/xsa/xsa385-4.15.patch \ + https://xenbits.xenproject.org/xsa/xsa386.patch \ + https://xenbits.xenproject.org/xsa/xsa388-4.14-1.patch \ + https://xenbits.xenproject.org/xsa/xsa388-4.14-2.patch \ + https://xenbits.xenproject.org/xsa/xsa389-4.14.patch + +# xsa385-4.15.patch +XEN_IGNORE_CVES += CVE-2021-28706 +# xsa386.patch +XEN_IGNORE_CVES += CVE-2021-28702 +# xsa388-4.14-1.patch +XEN_IGNORE_CVES += CVE-2021-28704 CVE-2021-28707 +# xsa388-4.14-2.patch +XEN_IGNORE_CVES += CVE-2021-28708 +# xsa389-4.14.patch +XEN_IGNORE_CVES += CVE-2021-28705 CVE-2021-28709 # Calculate XEN_ARCH ifeq ($(ARCH),aarch64) From peter at korsgaard.com Sat Jan 15 15:19:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:19:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gupnp-tools: bump to version 0.10.2 Message-ID: <20220115153049.BAD4B82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26b2c756e7eb8ac383d505497627e180007c8b1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop patch (already in version) https://gitlab.gnome.org/GNOME/gupnp-tools/-/blob/gupnp-tools-0.10.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b6e6c45327c6311117dc3316ad8413fc7540597a) Signed-off-by: Peter Korsgaard --- ...001-src-meson.build-upload-needs-gupnp-av.patch | 30 ---------------------- package/gupnp-tools/gupnp-tools.hash | 4 +-- package/gupnp-tools/gupnp-tools.mk | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch b/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch deleted file mode 100644 index f8eba76773..0000000000 --- a/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0831f77e990e363f78e3f6a5c461084988824f7b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 2 Jul 2019 23:48:12 +0200 -Subject: [PATCH] src/meson.build: upload needs gupnp-av - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/gupnp-tools/merge_requests/3] ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 84b2ca2..6601f45 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -2,9 +2,9 @@ subdir('common') - - if get_option('av-tools') and gupnp_av.found() - subdir('av-cp') -+ subdir('upload') - endif - - subdir('discover') - subdir('network-light') - subdir('universal-cp') --subdir('upload') --- -2.20.1 - diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index 30f1b8293d..28a1d26ede 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.0.sha256sum: -sha256 41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d gupnp-tools-0.10.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.2.sha256sum: +sha256 6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c gupnp-tools-0.10.2.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index 182b0145c8..7b34de52a0 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.10 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).0 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).2 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) From peter at korsgaard.com Sat Jan 15 15:23:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:23:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/connman: remove iptables as a mandatory dependency Message-ID: <20220115153049.C5F1D82B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7f987493c49d56474682ac45b16be1b55cf1c32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x connman might depend on iptables or nftables, and those dependencies are already selected later in this file as required. Config.in already only selects iptables if BR2_PACKAGE_CONNMAN_IPTABLES. Signed-off-by: Nuno Goncalves Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit edc46a56f6da78a3f001758d4571695d88f28ffb) Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 0355426e92..e5e596c973 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -7,7 +7,7 @@ CONNMAN_VERSION = 1.40 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman -CONNMAN_DEPENDENCIES = libglib2 dbus iptables +CONNMAN_DEPENDENCIES = libglib2 dbus CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Jan 15 15:37:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:37:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-django: security bump to version 3.2.10 Message-ID: <20220115153049.E72CE82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0896f414e6417b5491496d8793d407c6b19919ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - CVE-2021-44420: Potential bypass of an upstream access control based on URL paths HTTP requests for URLs with trailing newlines could bypass an upstream access control based on URL paths. This issue has low severity, according to the Django security policy. https://www.djangoproject.com/weblog/2021/dec/07/security-releases/ In addition, 3.2.8 / 3.2.9 fixes a number of bugs. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 086d357dfb177ef28d7831716707d2424a2ea4bd) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index ab89f0341c..3eea17e70f 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 2ade1eecca77640abbde6c4589da27dd Django-3.2.7.tar.gz -sha256 95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2 Django-3.2.7.tar.gz +md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz +sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 0850aa1358..4f80208f0e 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.7 +PYTHON_DJANGO_VERSION = 3.2.10 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/59/45/c6fbb3a206df0b7dc3e6e8fae738e042c63d4ddf828c6e1ba10d7417a1d9 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 + PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From peter at korsgaard.com Sat Jan 15 15:25:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:25:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python3: bump version to 3.9.9 Message-ID: <20220115153049.D6BA28147C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b47598e7566fcc97d9819ffd745b936249ee0ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop 0030-Fix-cross-compiling-the-uuid-module.patch as the patched code has been reworked upstream and python3 is built with --disable-uuid: https://github.com/python/cpython/commit/91a51c5ffc3bd9da28a0000550530f6f2bcc25a2 Rework 0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch as the MULTIARCH code is now conditional on !darwin: https://github.com/python/cpython/commit/9901d153c201d852d27dc9d3074e283c26468f6d Refresh and renumber remaining patches. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ce81a6e6d2ee11b7cc23ad49252f5a696ab20299) Signed-off-by: Peter Korsgaard --- ...1-Make-the-build-of-pyc-files-conditional.patch | 14 ++++---- ...gy_getaddrinfo-configure-test-when-cross-.patch | 8 ++--- ...ructure-to-disable-the-build-of-certain-e.patch | 18 +++++----- ...ibrary-header-paths-for-cross-compilation.patch | 4 +-- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 8 ++--- .../python3/0006-Don-t-add-multiarch-paths.patch | 8 ++--- .../0007-Abort-on-failed-module-build.patch | 6 ++-- package/python3/0008-Serial-ioctl-workaround.patch | 4 +-- ...st-the-shebang-of-Python-scripts-for-cros.patch | 4 +-- ...-config.sh.in-ensure-sed-invocations-only.patch | 4 +-- ...stem-locale-and-set-to-default-when-addin.patch | 8 ++--- ...0012-Add-importlib-fix-for-PEP-3147-issue.patch | 6 ++-- ...on-to-disable-installation-of-test-module.patch | 14 ++++---- .../0014-Add-an-option-to-disable-pydoc.patch | 22 ++++++------- .../0015-Add-an-option-to-disable-lib2to3.patch | 24 +++++++------- ...-Add-option-to-disable-the-sqlite3-module.patch | 16 ++++----- ...17-Add-an-option-to-disable-the-tk-module.patch | 16 ++++----- ...dd-an-option-to-disable-the-curses-module.patch | 14 ++++---- .../0019-Add-an-option-to-disable-expat.patch | 18 +++++----- .../0020-Add-an-option-to-disable-CJK-codecs.patch | 8 ++--- .../0021-Add-an-option-to-disable-NIS.patch | 8 ++--- ...0022-Add-an-option-to-disable-unicodedata.patch | 8 ++--- .../0023-Add-an-option-to-disable-IDLE.patch | 20 ++++++------ .../0024-Add-an-option-to-disable-decimal.patch | 12 +++---- ...-option-to-disable-the-ossaudiodev-module.patch | 8 ++--- ...-Add-an-option-to-disable-openssl-support.patch | 8 ++--- ...-an-option-to-disable-the-readline-module.patch | 8 ++--- ...ions-to-disable-zlib-bzip2-and-xz-modules.patch | 8 ++--- ...29-python-config.sh-don-t-reassign-prefix.patch | 4 +-- ...030-Add-an-option-to-disable-uuid-module.patch} | 8 ++--- .../0030-Fix-cross-compiling-the-uuid-module.patch | 38 ---------------------- ...0031-fix-building-on-older-distributions.patch} | 4 +-- ...-fixup-CC-print-multiarch-output-for-mus.patch} | 23 ++++++------- ...-option-to-disable-the-berkeleydb-module.patch} | 8 ++--- ...libc-ng-doesn-t-set-errno-when-encryptio.patch} | 4 +-- ...ry-iteration-error-in-_ExecutorManagerTh.patch} | 6 ++-- package/python3/python3.hash | 6 ++-- package/python3/python3.mk | 2 +- 38 files changed, 185 insertions(+), 222 deletions(-) diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 44902725d7..e40d8c8cd9 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 +From f63cc3031e775b556443c0f5b2725e530823dc49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77f91e72b1..0c809f3d8a 100644 +index 11230fa563..1ed9ad65d2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1550,6 +1550,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1549,6 +1549,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 77f91e72b1..0c809f3d8a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1577,6 +1578,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1576,6 +1577,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -35,10 +35,10 @@ index 77f91e72b1..0c809f3d8a 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index d60f05251a..1ee5a09588 100644 +index 823252be69..4e08118c46 100644 --- a/configure.ac +++ b/configure.ac -@@ -1121,6 +1121,12 @@ fi +@@ -1123,6 +1123,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index d60f05251a..1ee5a09588 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.25.1 +2.20.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 00177814cc..7ddbb8a28a 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 +From 7948fb08b18260811ce64806eec2bef465316b75 Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1ee5a09588..c2445edc88 100644 +index 4e08118c46..40b1f9bac1 100644 --- a/configure.ac +++ b/configure.ac -@@ -4210,7 +4210,7 @@ fi +@@ -4217,7 +4217,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) @@ -23,5 +23,5 @@ index 1ee5a09588..c2445edc88 100644 if test $ipv6 = yes then -- -2.25.1 +2.20.1 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 7cccc588e9..7f84f9a1e4 100644 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 +From 9da015fd909bd50a24479bba9a94cb3d1228043d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0c809f3d8a..7c3dde8dd4 100644 +index 1ed9ad65d2..6eacfd6961 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -216,6 +216,8 @@ FILEMODE= 644 +@@ -215,6 +215,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,7 +56,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -632,6 +634,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -631,6 +633,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -64,7 +64,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1696,7 +1699,8 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1695,7 +1698,8 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -75,10 +75,10 @@ index 0c809f3d8a..7c3dde8dd4 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index c2445edc88..73d66167de 100644 +index 40b1f9bac1..5b897d8e46 100644 --- a/configure.ac +++ b/configure.ac -@@ -3081,6 +3081,8 @@ LIBS="$withval $LIBS" +@@ -3088,6 +3088,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG @@ -88,7 +88,7 @@ index c2445edc88..73d66167de 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index 770866bca7..b6c829b3a5 100644 +index 9a5887b59f..b88d0bb007 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,10 @@ from distutils.spawn import find_executable @@ -104,5 +104,5 @@ index 770866bca7..b6c829b3a5 100644 def get_platform(): -- -2.25.1 +2.20.1 diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 24f369f87f..d64e881379 100644 --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 +From 8d2bc6a84a253c7ba2995a3e3be17ea113c228e2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -63,5 +63,5 @@ index 37feae5df7..e9c3a27856 100644 # Path to the base directory of the project. On Windows the binary may # live in project/PCbuild/win32 or project/PCbuild/amd64. -- -2.25.1 +2.20.1 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index c5abcfd786..2ea2d1d9d6 100644 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 +From 09c17b0194209cae8e057866670e4f4039a5be16 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index b6c829b3a5..ec3ba60607 100644 +index b88d0bb007..254c351519 100644 --- a/setup.py +++ b/setup.py -@@ -1041,12 +1041,9 @@ class PyBuildExt(build_ext): +@@ -1044,12 +1044,9 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) @@ -27,5 +27,5 @@ index b6c829b3a5..ec3ba60607 100644 libraries=readline_libs)) else: -- -2.25.1 +2.20.1 diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch index bb861612b1..23424d86d3 100644 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 +From e87dececb9bc2f4b1cba7f31d67ca2aaecbb52d8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index ec3ba60607..e27620035c 100644 +index 254c351519..5bf39f8a51 100644 --- a/setup.py +++ b/setup.py -@@ -734,10 +734,10 @@ class PyBuildExt(build_ext): +@@ -737,10 +737,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -33,5 +33,5 @@ index ec3ba60607..e27620035c 100644 def init_inc_lib_dirs(self): -- -2.25.1 +2.20.1 diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch index 856fcaac21..7e0dfad115 100644 --- a/package/python3/0007-Abort-on-failed-module-build.patch +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 +From cb4a3bc238ffbc8389c2820f24e72c2b36422b3f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,7 +14,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index e27620035c..d3f0e663f2 100644 +index 5bf39f8a51..36d94432da 100644 --- a/setup.py +++ b/setup.py @@ -524,6 +524,7 @@ class PyBuildExt(build_ext): @@ -26,5 +26,5 @@ index e27620035c..d3f0e663f2 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.25.1 +2.20.1 diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch index df31cd6220..568dcd9503 100644 --- a/package/python3/0008-Serial-ioctl-workaround.patch +++ b/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 +From 0b62a3634d343e4e3be6541d298d58eb81cf1458 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -29,5 +29,5 @@ index 75e5e52320..eefbddfe69 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.25.1 +2.20.1 diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index 8a77fe3708..2bb1d7e2ff 100644 --- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 +From 64bdc89106e6bd76e9b204d9cfef0adb7bfb0f4a Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.25.1 +2.20.1 diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index a1f9ab6cd9..cdacfd5b51 100644 --- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 +From e9f8466944c5000d9b43d25d38ef9eaa8cb0afae Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.25.1 +2.20.1 diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch index 8b0d4f4c4d..8c3ddd0042 100644 --- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch @@ -1,4 +1,4 @@ -From e4ae670e3489544a49dabd1618c32fe73504a7ba Mon Sep 17 00:00:00 2001 +From 6615a314ac7a2bc7efea945677934d6afd3b61d6 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 23 Dec 2015 11:45:48 +0100 Subject: [PATCH] Override system locale and set to default when adding gcc @@ -22,10 +22,10 @@ Signed-off-by: James Hilliard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index d3f0e663f2..926c16f58f 100644 +index 36d94432da..506f6107de 100644 --- a/setup.py +++ b/setup.py -@@ -680,7 +680,7 @@ class PyBuildExt(build_ext): +@@ -683,7 +683,7 @@ class PyBuildExt(build_ext): tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) @@ -35,5 +35,5 @@ index d3f0e663f2..926c16f58f 100644 is_clang = False in_incdirs = False -- -2.25.1 +2.20.1 diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch index 7a885303cb..5cb7c85246 100644 --- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch @@ -1,4 +1,4 @@ -From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 +From cda5c7447403440d679a3cd29d8dc38bb15eca33 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 22 Feb 2017 16:48:49 -0800 Subject: [PATCH] Add importlib fix for PEP 3147 issue @@ -25,7 +25,7 @@ Signed-off-by: Andrey Smirnov 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 25a3f8c0e0..2cb9a9aa52 100644 +index fe31f437da..71e64aef30 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -373,8 +373,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): @@ -101,5 +101,5 @@ index 25a3f8c0e0..2cb9a9aa52 100644 -- -2.25.1 +2.20.1 diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch index 8c1b989361..6cbffdf9e0 100644 --- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch @@ -1,4 +1,4 @@ -From 0337342d413d13f437fd089de91faee70a8bf3f9 Mon Sep 17 00:00:00 2001 +From 5c6722b6790ee6b8828a7f8a90b7fd173b77867f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:01:18 -0800 Subject: [PATCH] Add an option to disable installation of test modules @@ -18,10 +18,10 @@ Signed-off-by: James Hilliard 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7c3dde8dd4..204f293d53 100644 +index 6eacfd6961..bbc779ee6a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1406,8 +1406,29 @@ maninstall: altmaninstall +@@ -1405,8 +1405,29 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -53,7 +53,7 @@ index 7c3dde8dd4..204f293d53 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1468,28 +1489,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ +@@ -1467,28 +1488,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_importlib/zipdata02 \ test/test_zoneinfo test/test_zoneinfo/data \ test/ziptestdata \ @@ -97,10 +97,10 @@ index 7c3dde8dd4..204f293d53 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 73d66167de..92e28d02ee 100644 +index 5b897d8e46..bebad207f8 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,11 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,11 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -113,5 +113,5 @@ index 73d66167de..92e28d02ee 100644 # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -- -2.25.1 +2.20.1 diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch index 0c928a0bb2..66b05d5e52 100644 --- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From a65e5d3caf8e076d531191164c23c6240461f675 Mon Sep 17 00:00:00 2001 +From 57e14d395860a781d0b43b1ef3e2a4a8b04bbf80 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 204f293d53..63e3df0470 100644 +index bbc779ee6a..dd83413f17 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1374,7 +1374,9 @@ bininstall: altbininstall +@@ -1373,7 +1373,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -30,7 +30,7 @@ index 204f293d53..63e3df0470 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1424,7 +1426,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1423,7 +1425,7 @@ LIBSUBDIRS= tkinter site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -39,7 +39,7 @@ index 204f293d53..63e3df0470 100644 zoneinfo TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -@@ -1508,6 +1510,10 @@ ifeq (@TEST_MODULES@,yes) +@@ -1507,6 +1509,10 @@ ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -51,10 +51,10 @@ index 204f293d53..63e3df0470 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 92e28d02ee..174ed85a7c 100644 +index bebad207f8..b748ad7957 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,12 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -68,10 +68,10 @@ index 92e28d02ee..174ed85a7c 100644 AC_ARG_ENABLE(test-modules, diff --git a/setup.py b/setup.py -index 926c16f58f..1fc5fac90c 100644 +index 506f6107de..dcbc109c30 100644 --- a/setup.py +++ b/setup.py -@@ -2565,6 +2565,12 @@ def main(): +@@ -2572,6 +2572,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -84,7 +84,7 @@ index 926c16f58f..1fc5fac90c 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2589,8 +2595,7 @@ def main(): +@@ -2596,8 +2602,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in @@ -95,5 +95,5 @@ index 926c16f58f..1fc5fac90c 100644 # --install-platlib -- -2.25.1 +2.20.1 diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch index fe94cdfded..5e30e53788 100644 --- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 +From bc0681be87109e3e5c35e0bdd225143607350fb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 63e3df0470..8b7de12999 100644 +index dd83413f17..6324970733 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1378,7 +1378,9 @@ ifeq (@PYDOC@,yes) +@@ -1377,7 +1377,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -30,7 +30,7 @@ index 63e3df0470..8b7de12999 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1417,7 +1419,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1416,7 +1418,6 @@ LIBSUBDIRS= tkinter site-packages \ html json http dbm xmlrpc \ sqlite3 \ logging csv wsgiref urllib \ @@ -38,7 +38,7 @@ index 63e3df0470..8b7de12999 100644 ctypes ctypes/macholib \ idlelib idlelib/Icons \ distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1495,9 +1496,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1494,9 +1495,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_email test/test_email/data \ test/test_json \ sqlite3/test \ @@ -48,7 +48,7 @@ index 63e3df0470..8b7de12999 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1506,6 +1504,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1505,6 +1503,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -63,7 +63,7 @@ index 63e3df0470..8b7de12999 100644 ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif -@@ -1606,10 +1612,12 @@ ifeq (@PYC_BUILD@,yes) +@@ -1605,10 +1611,12 @@ ifeq (@PYC_BUILD@,yes) -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -77,10 +77,10 @@ index 63e3df0470..8b7de12999 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index 174ed85a7c..f1f5e9a7b0 100644 +index b748ad7957..58e9a8fe7a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3370,6 +3370,12 @@ AC_ARG_ENABLE(test-modules, +@@ -3377,6 +3377,12 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) @@ -94,10 +94,10 @@ index 174ed85a7c..f1f5e9a7b0 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 1fc5fac90c..4063d7ffa5 100644 +index dcbc109c30..8d6348f560 100644 --- a/setup.py +++ b/setup.py -@@ -2566,10 +2566,11 @@ def main(): +@@ -2573,10 +2573,11 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -112,5 +112,5 @@ index 1fc5fac90c..4063d7ffa5 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.25.1 +2.20.1 diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch index d6c9bccd45..0208bce231 100644 --- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 +From fdef81b6f4280eb26bc620ed8dd3c4dc2018dd29 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8b7de12999..d826d8ac4b 100644 +index 6324970733..f700b780fb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1417,7 +1417,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1416,7 +1416,6 @@ LIBSUBDIRS= tkinter site-packages \ email email/mime \ ensurepip ensurepip/_bundled \ html json http dbm xmlrpc \ @@ -24,7 +24,7 @@ index 8b7de12999..d826d8ac4b 100644 logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ -@@ -1495,7 +1494,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1494,7 +1493,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_asyncio \ test/test_email test/test_email/data \ test/test_json \ @@ -32,7 +32,7 @@ index 8b7de12999..d826d8ac4b 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1512,6 +1510,11 @@ TESTSUBDIRS += lib2to3/tests \ +@@ -1511,6 +1509,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif @@ -45,10 +45,10 @@ index 8b7de12999..d826d8ac4b 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index f1f5e9a7b0..8b5c65974c 100644 +index 58e9a8fe7a..644ed6d895 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,15 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -65,5 +65,5 @@ index f1f5e9a7b0..8b5c65974c 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index b798eb56a5..b3a4d202e8 100644 --- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 +From 8b77e7ce6723e11c1891befe7e6413d8328e8f67 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index d826d8ac4b..dc84384680 100644 +index f700b780fb..4fcf8b5a96 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1411,7 +1411,7 @@ maninstall: altmaninstall +@@ -1410,7 +1410,7 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -25,7 +25,7 @@ index d826d8ac4b..dc84384680 100644 asyncio \ collections concurrent concurrent/futures encodings \ email email/mime \ -@@ -1429,8 +1429,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1428,8 +1428,7 @@ LIBSUBDIRS= tkinter site-packages \ curses \ zoneinfo @@ -35,7 +35,7 @@ index d826d8ac4b..dc84384680 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1502,6 +1501,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1501,6 +1500,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -49,10 +49,10 @@ index d826d8ac4b..dc84384680 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 8b5c65974c..4c72dae960 100644 +index 644ed6d895..a4d06dcb50 100644 --- a/configure.ac +++ b/configure.ac -@@ -3367,6 +3367,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3374,6 +3374,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -69,5 +69,5 @@ index 8b5c65974c..4c72dae960 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch index 93dfac26ec..16d2c1d383 100644 --- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From 962deb43f5f340a8472d432ae8e6d61186f9040e Mon Sep 17 00:00:00 2001 +From 7dea1b79fbb905dd69862862f327cc0f25cd93c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dc84384680..2a82f3308f 100644 +index 4fcf8b5a96..2e45a41140 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1426,7 +1426,6 @@ LIBSUBDIRS= site-packages \ +@@ -1425,7 +1425,6 @@ LIBSUBDIRS= site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -24,7 +24,7 @@ index dc84384680..2a82f3308f 100644 zoneinfo TESTSUBDIRS= test \ -@@ -1507,6 +1506,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ +@@ -1506,6 +1505,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif @@ -36,10 +36,10 @@ index dc84384680..2a82f3308f 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 4c72dae960..acd98381a3 100644 +index a4d06dcb50..f034cd4bcb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3376,6 +3376,15 @@ if test "$TK" = "no"; then +@@ -3383,6 +3383,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -56,5 +56,5 @@ index 4c72dae960..acd98381a3 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch index e7349058c8..79e86bd85a 100644 --- a/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 +From e86dc4209f71d6dc4bfa74fcc2c963b678def39f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2a82f3308f..e678c8817e 100644 +index 2e45a41140..4981087723 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1420,7 +1420,7 @@ LIBSUBDIRS= site-packages \ +@@ -1419,7 +1419,7 @@ LIBSUBDIRS= site-packages \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -32,7 +32,7 @@ index 2a82f3308f..e678c8817e 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1510,6 +1510,10 @@ ifeq (@CURSES@,yes) +@@ -1509,6 +1509,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -44,10 +44,10 @@ index 2a82f3308f..e678c8817e 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index acd98381a3..9ef0ecd42f 100644 +index f034cd4bcb..c90c92c2de 100644 --- a/configure.ac +++ b/configure.ac -@@ -3084,13 +3084,21 @@ PKG_PROG_PKG_CONFIG +@@ -3091,13 +3091,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -75,10 +75,10 @@ index acd98381a3..9ef0ecd42f 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 4063d7ffa5..211a160f29 100644 +index 8d6348f560..0d6fe717da 100644 --- a/setup.py +++ b/setup.py -@@ -1666,7 +1666,7 @@ class PyBuildExt(build_ext): +@@ -1671,7 +1671,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +88,5 @@ index 4063d7ffa5..211a160f29 100644 define_macros = [] extra_compile_args = [] -- -2.25.1 +2.20.1 diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch index 4e22543096..aa1a1499be 100644 --- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch @@ -1,4 +1,4 @@ -From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 +From ede026befe4094635d268e293bfccb9118f19a1c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:49:55 +0100 Subject: [PATCH] Add an option to disable CJK codecs @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 9ef0ecd42f..18e6fd70a0 100644 +index c90c92c2de..d9029f5463 100644 --- a/configure.ac +++ b/configure.ac -@@ -3375,6 +3375,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3382,6 +3382,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -26,5 +26,5 @@ index 9ef0ecd42f..18e6fd70a0 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch index 9cd54df180..2a80e00099 100644 --- a/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch @@ -1,4 +1,4 @@ -From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 +From 1c1acbd3ca7f1184710326fab2d557fed4a216e3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:11 +0100 Subject: [PATCH] Add an option to disable NIS @@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 18e6fd70a0..46d2a8131e 100644 +index d9029f5463..82d9ec77fa 100644 --- a/configure.ac +++ b/configure.ac -@@ -3381,6 +3381,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3388,6 +3388,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) @@ -29,5 +29,5 @@ index 18e6fd70a0..46d2a8131e 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch index 2ddf606a70..c4bcbdf133 100644 --- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch @@ -1,4 +1,4 @@ -From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 +From 9fb4ebe3375ff3fc924d423b6b3400bf2cf82fb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:27 +0100 Subject: [PATCH] Add an option to disable unicodedata @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 46d2a8131e..5844e3b73f 100644 +index 82d9ec77fa..55d257515f 100644 --- a/configure.ac +++ b/configure.ac -@@ -3387,6 +3387,12 @@ AC_ARG_ENABLE(nis, +@@ -3394,6 +3394,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) @@ -26,5 +26,5 @@ index 46d2a8131e..5844e3b73f 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch index 0e35eea699..9235674a55 100644 --- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 +From e3b96113ae2b5a0c3f775d5a9550dbbcffb702dd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -16,10 +16,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e678c8817e..1148bd8708 100644 +index 4981087723..222c386f59 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1372,7 +1372,9 @@ bininstall: altbininstall +@@ -1371,7 +1371,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -29,7 +29,7 @@ index e678c8817e..1148bd8708 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1419,7 +1421,6 @@ LIBSUBDIRS= site-packages \ +@@ -1418,7 +1420,6 @@ LIBSUBDIRS= site-packages \ html json http dbm xmlrpc \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ @@ -37,7 +37,7 @@ index e678c8817e..1148bd8708 100644 distutils distutils/command \ importlib \ turtledemo \ -@@ -1514,6 +1515,10 @@ ifeq (@EXPAT@,yes) +@@ -1513,6 +1514,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -49,10 +49,10 @@ index e678c8817e..1148bd8708 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 5844e3b73f..7bd4623ccd 100644 +index 55d257515f..2efd7a6de0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3429,6 +3429,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -3436,6 +3436,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -66,10 +66,10 @@ index 5844e3b73f..7bd4623ccd 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 211a160f29..c4ee989ba3 100644 +index 0d6fe717da..4f8cfcd28d 100644 --- a/setup.py +++ b/setup.py -@@ -2566,11 +2566,13 @@ def main(): +@@ -2573,11 +2573,13 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -85,5 +85,5 @@ index 211a160f29..c4ee989ba3 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.25.1 +2.20.1 diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch index b5a12f7f38..963dcec70e 100644 --- a/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch @@ -1,4 +1,4 @@ -From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 +From 2eb05b69bb21df7884686ca2620612ac0f95b894 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:31 +0100 Subject: [PATCH] Add an option to disable decimal @@ -19,10 +19,10 @@ Signed-off-by: James Hilliard 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 7bd4623ccd..e513ef6a20 100644 +index 2efd7a6de0..86fd03cdbb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3135,13 +3135,20 @@ fi +@@ -3142,13 +3142,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library @@ -49,10 +49,10 @@ index 7bd4623ccd..e513ef6a20 100644 # Check whether _decimal should use a coroutine-local or thread-local context AC_MSG_CHECKING(for --with-decimal-contextvar) diff --git a/setup.py b/setup.py -index c4ee989ba3..3d0c74bb7f 100644 +index 4f8cfcd28d..b471234473 100644 --- a/setup.py +++ b/setup.py -@@ -2195,7 +2195,7 @@ class PyBuildExt(build_ext): +@@ -2202,7 +2202,7 @@ class PyBuildExt(build_ext): # Stefan Krah's _decimal module extra_compile_args = [] undef_macros = [] @@ -62,5 +62,5 @@ index c4ee989ba3..3d0c74bb7f 100644 libraries = [':libmpdec.so.2'] sources = ['_decimal/_decimal.c'] -- -2.25.1 +2.20.1 diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch index 0f68a08356..d7a9ab6481 100644 --- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -1,4 +1,4 @@ -From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 +From 1773ef327247ff2a6e7ce737637748b67c90419f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:58 +0100 Subject: [PATCH] Add an option to disable the ossaudiodev module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index e513ef6a20..c07505e89e 100644 +index 86fd03cdbb..7ba4ea8d5d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3165,6 +3165,12 @@ fi +@@ -3172,6 +3172,12 @@ fi AC_MSG_RESULT($with_decimal_contextvar) @@ -26,5 +26,5 @@ index e513ef6a20..c07505e89e 100644 AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) AC_ARG_ENABLE(loadable-sqlite-extensions, -- -2.25.1 +2.20.1 diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch index 44d1d3d6b3..33c6ad94b8 100644 --- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch @@ -1,4 +1,4 @@ -From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 +From 9fb639fba83cddfbda20819d58df77bdccf6ba1d Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Feb 2017 17:55:59 -0800 Subject: [PATCH] Add an option to disable openssl support. @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index c07505e89e..612e32faf5 100644 +index 7ba4ea8d5d..96e7e1feed 100644 --- a/configure.ac +++ b/configure.ac -@@ -3406,6 +3406,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3413,6 +3413,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index c07505e89e..612e32faf5 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch index 1597a2a560..f59af5e9a1 100644 --- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch @@ -1,4 +1,4 @@ -From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 +From c246223473b49a719b765520068aaf812f1fe6ca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:29:05 +0100 Subject: [PATCH] Add an option to disable the readline module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 612e32faf5..2a6aaeff60 100644 +index 96e7e1feed..d5732b2474 100644 --- a/configure.ac +++ b/configure.ac -@@ -3412,6 +3412,12 @@ AC_ARG_ENABLE(openssl, +@@ -3419,6 +3419,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index 612e32faf5..2a6aaeff60 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index a1d2ef3255..a2a30ab614 100644 --- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -1,4 +1,4 @@ -From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 +From 4d87cebaff75a19cd7ccf20f1c89abec5a5bce8d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:31:11 +0100 Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index 2a6aaeff60..21479bbd7d 100644 +index d5732b2474..3eadf17306 100644 --- a/configure.ac +++ b/configure.ac -@@ -3418,6 +3418,24 @@ AC_ARG_ENABLE(readline, +@@ -3425,6 +3425,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index 2a6aaeff60..21479bbd7d 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch index 4478b40162..870ec74d74 100644 --- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 +From 1ab6b1fb17c1988baca6b9c578f8de33c44c1a17 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.25.1 +2.20.1 diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch similarity index 81% rename from package/python3/0031-Add-an-option-to-disable-uuid-module.patch rename to package/python3/0030-Add-an-option-to-disable-uuid-module.patch index 92b24b211d..af56742d9e 100644 --- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch @@ -1,4 +1,4 @@ -From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 +From 20ff7301b496efe529e2b313cac4d7af626f5051 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 10:54:56 +0200 Subject: [PATCH] Add an option to disable uuid module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 21479bbd7d..615c16aced 100644 +index 3eadf17306..7812dc5102 100644 --- a/configure.ac +++ b/configure.ac -@@ -3454,6 +3454,15 @@ if test "$CURSES" = "no"; then +@@ -3461,6 +3461,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index 21479bbd7d..615c16aced 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch deleted file mode 100644 index 1bf5fc6db4..0000000000 --- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Fri, 20 Jul 2018 10:17:39 -0400 -Subject: [PATCH] Fix cross compiling the uuid module - -Python 3.7 has a new _uuid module, however, the include directory -search path for uuid.h is hardcoded to /usr/include/uuid, which should -not be used when cross-compiling. - -To fix this, use the same solution as the one used by the NIS -detection: append "uuid" to each of the include directories in -"inc_dirs", instead of hardcoding /usr/include/uuid. - -Signed-off-by: Adam Duskett -[Thomas: drop STAGING_DIR based solution, use a solution similar to -the one used for the NIS detection.] -Signed-off-by: Thomas Petazzoni ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3d0c74bb7f..c7be85f352 100644 ---- a/setup.py -+++ b/setup.py -@@ -1764,7 +1764,8 @@ class PyBuildExt(build_ext): - - def detect_uuid(self): - # Build the _uuid module if possible -- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"]) -+ uuid_incs = find_file("uuid.h", self.inc_dirs, -+ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) - if uuid_incs is not None: - if self.compiler.find_library_file(self.lib_dirs, 'uuid'): - uuid_libs = ['uuid'] --- -2.25.1 - diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0031-fix-building-on-older-distributions.patch similarity index 94% rename from package/python3/0032-fix-building-on-older-distributions.patch rename to package/python3/0031-fix-building-on-older-distributions.patch index fb59e593f4..a8b3465111 100644 --- a/package/python3/0032-fix-building-on-older-distributions.patch +++ b/package/python3/0031-fix-building-on-older-distributions.patch @@ -1,4 +1,4 @@ -From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 +From c9548b8e80eecdd6d0798817698c77649f005b42 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 16 Aug 2018 14:52:37 -0700 Subject: [PATCH] fix building on older distributions @@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 os.unlink(new_path) -- -2.25.1 +2.20.1 diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 71% rename from package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index f70990b254..ec7ecb6a35 100644 --- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From edc0757c56090364e0a95aabfa9f645a16a27569 Mon Sep 17 00:00:00 2001 +From ffe8fb3065973204fce95130c32578163755b71e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -23,26 +23,27 @@ non-multiarch toolchain on some architectures (E.G. PowerPC), but as a workaround, rewrite the --print-multiarch output to match older GCC versions to keep the configure script happy. +[Peter: update for 3.9.9, which made the MULTIARCH logic !darwin] Signed-off-by: Peter Korsgaard --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 615c16aced..241298e6cf 100644 +index 7812dc5102..0ce52b9a7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -727,7 +727,9 @@ then - fi - +@@ -883,7 +883,9 @@ fi + rm -f conftest.c conftest.out --MULTIARCH=$($CC --print-multiarch 2>/dev/null) -+# GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based -+# toolchains confusing python. Fix that up -+MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') + if test x$PLATFORM_TRIPLET != xdarwin; then +- MULTIARCH=$($CC --print-multiarch 2>/dev/null) ++ # GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based ++ # toolchains confusing python. Fix that up ++ MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') + fi AC_SUBST(MULTIARCH) - AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -- -2.25.1 +2.20.1 diff --git a/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch similarity index 80% rename from package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch rename to package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch index a4e8baf4dd..c253f09690 100644 --- a/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch +++ b/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch @@ -1,4 +1,4 @@ -From cf4d7fd9f7cb6c1ced32ee323b2b5755640051b7 Mon Sep 17 00:00:00 2001 +From 368a582879f3d757e3527071fd95a956bb272bd8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Apr 2020 22:01:40 +0200 Subject: [PATCH] Add an option to disable the berkeleydb module @@ -9,10 +9,10 @@ Signed-off-by: Bernd Kuhls 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 72c1d86e82..8c3912d237 100644 +index 0ce52b9a7d..30a4e5fb2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3465,6 +3465,12 @@ if test "$UUID" = "no"; then +@@ -3472,6 +3472,12 @@ if test "$UUID" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" fi @@ -26,5 +26,5 @@ index 72c1d86e82..8c3912d237 100644 AC_ARG_ENABLE(pydoc, -- -2.25.0 +2.20.1 diff --git a/package/python3/0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch similarity index 95% rename from package/python3/0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch rename to package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch index 880277eb1d..44eb450808 100644 --- a/package/python3/0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch +++ b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch @@ -1,4 +1,4 @@ -From 3c83eedcc2df3ecf6c4a17953ca24dff60c1378e Mon Sep 17 00:00:00 2001 +From 09ded6ff285e12221114b281d35fe8f9484a9ea5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 12 Nov 2020 00:16:18 +0100 Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method @@ -36,5 +36,5 @@ index 33dbc46bb3..4692a5270c 100644 raise if result and len(result) == method.total_size: -- -2.25.4 +2.20.1 diff --git a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch similarity index 90% rename from package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch rename to package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch index fbe44c7753..b524795d75 100644 --- a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch +++ b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch @@ -1,4 +1,4 @@ -From 331966be70c371b268a4fcce9e97280cd869f137 Mon Sep 17 00:00:00 2001 +From 234364f756e3083164ec9bfcd4867855048372b4 Mon Sep 17 00:00:00 2001 From: Jakub Kulik Date: Mon, 15 Mar 2021 08:49:28 +0100 Subject: [PATCH] Fix dictionary iteration error in _ExecutorManagerThread @@ -12,7 +12,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py -index 90bc98bf2ec..e3b36dff572 100644 +index 90bc98bf2e..e3b36dff57 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -373,7 +373,7 @@ class _ExecutorManagerThread(threading.Thread): @@ -25,5 +25,5 @@ index 90bc98bf2ec..e3b36dff572 100644 cause = None -- -2.31.1 +2.20.1 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 444dbd982a..15e68ca9f1 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-397/ -md5 fddb060b483bc01850a3f412eea1d954 Python-3.9.7.tar.xz +# From https://www.python.org/downloads/release/python-399/ +md5 11d12076311563252a995201248d17e5 Python-3.9.9.tar.xz # Locally computed -sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57 Python-3.9.7.tar.xz +sha256 06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27 Python-3.9.9.tar.xz sha256 599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70 LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 779f6dcb6c..6f063529b2 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.9 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 +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 peter at korsgaard.com Sat Jan 15 15:37:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:37:33 +0100 Subject: [Buildroot] [git commit] package/python-django: security bump to version 3.2.10 In-Reply-To: <20211216190423.3F963822A3@busybox.osuosl.org> (Arnout Vandecappelle's message of "Thu, 16 Dec 2021 20:07:37 +0100") References: <20211216190423.3F963822A3@busybox.osuosl.org> Message-ID: <875yql2eo2.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=086d357dfb177ef28d7831716707d2424a2ea4bd > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes the following security issues: > - CVE-2021-44420: Potential bypass of an upstream access control based on > URL paths > HTTP requests for URLs with trailing newlines could bypass an upstream > access control based on URL paths. > This issue has low severity, according to the Django security policy. > https://www.djangoproject.com/weblog/2021/dec/07/security-releases/ > In addition, 3.2.8 / 3.2.9 fixes a number of bugs. > Signed-off-by: Peter Korsgaard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 15:19:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:19:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gupnp-tools: bump to version 0.10.2 Message-ID: <20220115153110.526B4821C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8339a5b58390032521577ef6fa4be4653fb1dfc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop patch (already in version) https://gitlab.gnome.org/GNOME/gupnp-tools/-/blob/gupnp-tools-0.10.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b6e6c45327c6311117dc3316ad8413fc7540597a) Signed-off-by: Peter Korsgaard --- ...001-src-meson.build-upload-needs-gupnp-av.patch | 30 ---------------------- package/gupnp-tools/gupnp-tools.hash | 4 +-- package/gupnp-tools/gupnp-tools.mk | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch b/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch deleted file mode 100644 index f8eba76773..0000000000 --- a/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0831f77e990e363f78e3f6a5c461084988824f7b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 2 Jul 2019 23:48:12 +0200 -Subject: [PATCH] src/meson.build: upload needs gupnp-av - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/gupnp-tools/merge_requests/3] ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 84b2ca2..6601f45 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -2,9 +2,9 @@ subdir('common') - - if get_option('av-tools') and gupnp_av.found() - subdir('av-cp') -+ subdir('upload') - endif - - subdir('discover') - subdir('network-light') - subdir('universal-cp') --subdir('upload') --- -2.20.1 - diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index 30f1b8293d..28a1d26ede 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.0.sha256sum: -sha256 41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d gupnp-tools-0.10.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.2.sha256sum: +sha256 6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c gupnp-tools-0.10.2.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index 182b0145c8..7b34de52a0 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.10 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).0 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).2 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) From peter at korsgaard.com Sat Jan 15 15:36:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:36:31 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xen: add XSA-385, 386, 388, 389 security fixes Message-ID: <20220115153110.72E9482B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=381067112a29ae19a0fc50f94e117ff8195c42e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - XSA-385: guests may exceed their designated memory limit https://xenbits.xenproject.org/xsa/advisory-385.html - XSA-386: PCI devices with RMRRs not deassigned correctly https://xenbits.xenproject.org/xsa/advisory-386.html - XSA-388: PoD operations on misaligned GFNs https://xenbits.xenproject.org/xsa/advisory-388.html - XSA-389: issues with partially successful P2M updates on x86 https://xenbits.xenproject.org/xsa/advisory-389.html Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c0932240fbd891528ae5d479f5df5229ed370416) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 9 +++++++++ package/xen/xen.mk | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index e30db09516..10a778053a 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,12 @@ # Locally computed sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING +# https://xenbits.xenproject.org/xsa/advisory-385.html +sha256 831e86c3adfec532b1a48a0b967b7c58c37db3733aee8d78216eb9d535b34f12 xsa385-4.15.patch +# https://xenbits.xenproject.org/xsa/advisory-386.html +sha256 f2f83c825e249bba9454437b48bbd8307fe7a224f56484388a67af124dfd279b xsa386.patch +# https://xenbits.xenproject.org/xsa/advisory-388.html +sha256 6917267482101a3f8f1d13905e14994344a0af81370c7a2b92275fb176b321a0 xsa388-4.14-1.patch +sha256 d5886e046c69f34f98f7e1fc6ffcc36d92f8fc79242b9dc88412c39aa79b4ac3 xsa388-4.14-2.patch +# https://xenbits.xenproject.org/xsa/advisory-389.html +sha256 b243284679b32ab8c817a2e41562d8694d9781fa8096c268bb41b0cd91684baa xsa389-4.14.patch diff --git a/package/xen/xen.mk b/package/xen/xen.mk index b635996afb..cfc166dc4c 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -11,6 +11,23 @@ XEN_LICENSE_FILES = COPYING XEN_CPE_ID_VENDOR = xen XEN_CPE_ID_PREFIX = cpe:2.3:o XEN_DEPENDENCIES = host-acpica host-python3 +XEN_PATCH = \ + https://xenbits.xenproject.org/xsa/xsa385-4.15.patch \ + https://xenbits.xenproject.org/xsa/xsa386.patch \ + https://xenbits.xenproject.org/xsa/xsa388-4.14-1.patch \ + https://xenbits.xenproject.org/xsa/xsa388-4.14-2.patch \ + https://xenbits.xenproject.org/xsa/xsa389-4.14.patch + +# xsa385-4.15.patch +XEN_IGNORE_CVES += CVE-2021-28706 +# xsa386.patch +XEN_IGNORE_CVES += CVE-2021-28702 +# xsa388-4.14-1.patch +XEN_IGNORE_CVES += CVE-2021-28704 CVE-2021-28707 +# xsa388-4.14-2.patch +XEN_IGNORE_CVES += CVE-2021-28708 +# xsa389-4.14.patch +XEN_IGNORE_CVES += CVE-2021-28705 CVE-2021-28709 # Calculate XEN_ARCH ifeq ($(ARCH),aarch64) From peter at korsgaard.com Sat Jan 15 15:24:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:24:32 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/connman: remove iptables as a mandatory dependency Message-ID: <20220115153110.5B04882B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c9e151b19e2b4cb147e44bdeec44814a63a41ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x connman might depend on iptables or nftables, and those dependencies are already selected later in this file as required. Config.in already only selects iptables if BR2_PACKAGE_CONNMAN_IPTABLES. Signed-off-by: Nuno Goncalves Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit edc46a56f6da78a3f001758d4571695d88f28ffb) Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 0355426e92..e5e596c973 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -7,7 +7,7 @@ CONNMAN_VERSION = 1.40 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman -CONNMAN_DEPENDENCIES = libglib2 dbus iptables +CONNMAN_DEPENDENCIES = libglib2 dbus CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Jan 15 15:33:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:33:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python3: bump version to 3.9.9 Message-ID: <20220115153110.6A70D821C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=690b864f1598baf83e8a5d2251c59b3dafded38e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop 0030-Fix-cross-compiling-the-uuid-module.patch as the patched code has been reworked upstream and python3 is built with --disable-uuid: https://github.com/python/cpython/commit/91a51c5ffc3bd9da28a0000550530f6f2bcc25a2 Rework 0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch as the MULTIARCH code is now conditional on !darwin: https://github.com/python/cpython/commit/9901d153c201d852d27dc9d3074e283c26468f6d Refresh and renumber remaining patches. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ce81a6e6d2ee11b7cc23ad49252f5a696ab20299) Signed-off-by: Peter Korsgaard --- ...1-Make-the-build-of-pyc-files-conditional.patch | 14 ++++---- ...gy_getaddrinfo-configure-test-when-cross-.patch | 8 ++--- ...ructure-to-disable-the-build-of-certain-e.patch | 18 +++++----- ...ibrary-header-paths-for-cross-compilation.patch | 4 +-- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 8 ++--- .../python3/0006-Don-t-add-multiarch-paths.patch | 8 ++--- .../0007-Abort-on-failed-module-build.patch | 6 ++-- package/python3/0008-Serial-ioctl-workaround.patch | 4 +-- ...st-the-shebang-of-Python-scripts-for-cros.patch | 4 +-- ...-config.sh.in-ensure-sed-invocations-only.patch | 4 +-- ...stem-locale-and-set-to-default-when-addin.patch | 8 ++--- ...0012-Add-importlib-fix-for-PEP-3147-issue.patch | 6 ++-- ...on-to-disable-installation-of-test-module.patch | 14 ++++---- .../0014-Add-an-option-to-disable-pydoc.patch | 22 ++++++------- .../0015-Add-an-option-to-disable-lib2to3.patch | 24 +++++++------- ...-Add-option-to-disable-the-sqlite3-module.patch | 16 ++++----- ...17-Add-an-option-to-disable-the-tk-module.patch | 16 ++++----- ...dd-an-option-to-disable-the-curses-module.patch | 14 ++++---- .../0019-Add-an-option-to-disable-expat.patch | 18 +++++----- .../0020-Add-an-option-to-disable-CJK-codecs.patch | 8 ++--- .../0021-Add-an-option-to-disable-NIS.patch | 8 ++--- ...0022-Add-an-option-to-disable-unicodedata.patch | 8 ++--- .../0023-Add-an-option-to-disable-IDLE.patch | 20 ++++++------ .../0024-Add-an-option-to-disable-decimal.patch | 12 +++---- ...-option-to-disable-the-ossaudiodev-module.patch | 8 ++--- ...-Add-an-option-to-disable-openssl-support.patch | 8 ++--- ...-an-option-to-disable-the-readline-module.patch | 8 ++--- ...ions-to-disable-zlib-bzip2-and-xz-modules.patch | 8 ++--- ...29-python-config.sh-don-t-reassign-prefix.patch | 4 +-- ...030-Add-an-option-to-disable-uuid-module.patch} | 8 ++--- .../0030-Fix-cross-compiling-the-uuid-module.patch | 38 ---------------------- ...0031-fix-building-on-older-distributions.patch} | 4 +-- ...-fixup-CC-print-multiarch-output-for-mus.patch} | 23 ++++++------- ...Clibc-ng-doesn-t-set-errno-when-encryptio.patch | 4 +-- ...ry-iteration-error-in-_ExecutorManagerTh.patch} | 6 ++-- package/python3/python3.hash | 6 ++-- package/python3/python3.mk | 2 +- 37 files changed, 181 insertions(+), 218 deletions(-) diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 44902725d7..e40d8c8cd9 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 +From f63cc3031e775b556443c0f5b2725e530823dc49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77f91e72b1..0c809f3d8a 100644 +index 11230fa563..1ed9ad65d2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1550,6 +1550,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1549,6 +1549,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 77f91e72b1..0c809f3d8a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1577,6 +1578,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1576,6 +1577,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -35,10 +35,10 @@ index 77f91e72b1..0c809f3d8a 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index d60f05251a..1ee5a09588 100644 +index 823252be69..4e08118c46 100644 --- a/configure.ac +++ b/configure.ac -@@ -1121,6 +1121,12 @@ fi +@@ -1123,6 +1123,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index d60f05251a..1ee5a09588 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.25.1 +2.20.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 00177814cc..7ddbb8a28a 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 +From 7948fb08b18260811ce64806eec2bef465316b75 Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1ee5a09588..c2445edc88 100644 +index 4e08118c46..40b1f9bac1 100644 --- a/configure.ac +++ b/configure.ac -@@ -4210,7 +4210,7 @@ fi +@@ -4217,7 +4217,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) @@ -23,5 +23,5 @@ index 1ee5a09588..c2445edc88 100644 if test $ipv6 = yes then -- -2.25.1 +2.20.1 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 7cccc588e9..7f84f9a1e4 100644 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 +From 9da015fd909bd50a24479bba9a94cb3d1228043d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0c809f3d8a..7c3dde8dd4 100644 +index 1ed9ad65d2..6eacfd6961 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -216,6 +216,8 @@ FILEMODE= 644 +@@ -215,6 +215,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,7 +56,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -632,6 +634,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -631,6 +633,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -64,7 +64,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1696,7 +1699,8 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1695,7 +1698,8 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -75,10 +75,10 @@ index 0c809f3d8a..7c3dde8dd4 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index c2445edc88..73d66167de 100644 +index 40b1f9bac1..5b897d8e46 100644 --- a/configure.ac +++ b/configure.ac -@@ -3081,6 +3081,8 @@ LIBS="$withval $LIBS" +@@ -3088,6 +3088,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG @@ -88,7 +88,7 @@ index c2445edc88..73d66167de 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index 770866bca7..b6c829b3a5 100644 +index 9a5887b59f..b88d0bb007 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,10 @@ from distutils.spawn import find_executable @@ -104,5 +104,5 @@ index 770866bca7..b6c829b3a5 100644 def get_platform(): -- -2.25.1 +2.20.1 diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 24f369f87f..d64e881379 100644 --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 +From 8d2bc6a84a253c7ba2995a3e3be17ea113c228e2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -63,5 +63,5 @@ index 37feae5df7..e9c3a27856 100644 # Path to the base directory of the project. On Windows the binary may # live in project/PCbuild/win32 or project/PCbuild/amd64. -- -2.25.1 +2.20.1 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index c5abcfd786..2ea2d1d9d6 100644 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 +From 09c17b0194209cae8e057866670e4f4039a5be16 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index b6c829b3a5..ec3ba60607 100644 +index b88d0bb007..254c351519 100644 --- a/setup.py +++ b/setup.py -@@ -1041,12 +1041,9 @@ class PyBuildExt(build_ext): +@@ -1044,12 +1044,9 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) @@ -27,5 +27,5 @@ index b6c829b3a5..ec3ba60607 100644 libraries=readline_libs)) else: -- -2.25.1 +2.20.1 diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch index bb861612b1..23424d86d3 100644 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 +From e87dececb9bc2f4b1cba7f31d67ca2aaecbb52d8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index ec3ba60607..e27620035c 100644 +index 254c351519..5bf39f8a51 100644 --- a/setup.py +++ b/setup.py -@@ -734,10 +734,10 @@ class PyBuildExt(build_ext): +@@ -737,10 +737,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -33,5 +33,5 @@ index ec3ba60607..e27620035c 100644 def init_inc_lib_dirs(self): -- -2.25.1 +2.20.1 diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch index 856fcaac21..7e0dfad115 100644 --- a/package/python3/0007-Abort-on-failed-module-build.patch +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 +From cb4a3bc238ffbc8389c2820f24e72c2b36422b3f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,7 +14,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index e27620035c..d3f0e663f2 100644 +index 5bf39f8a51..36d94432da 100644 --- a/setup.py +++ b/setup.py @@ -524,6 +524,7 @@ class PyBuildExt(build_ext): @@ -26,5 +26,5 @@ index e27620035c..d3f0e663f2 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.25.1 +2.20.1 diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch index df31cd6220..568dcd9503 100644 --- a/package/python3/0008-Serial-ioctl-workaround.patch +++ b/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 +From 0b62a3634d343e4e3be6541d298d58eb81cf1458 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -29,5 +29,5 @@ index 75e5e52320..eefbddfe69 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.25.1 +2.20.1 diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index 8a77fe3708..2bb1d7e2ff 100644 --- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 +From 64bdc89106e6bd76e9b204d9cfef0adb7bfb0f4a Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.25.1 +2.20.1 diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index a1f9ab6cd9..cdacfd5b51 100644 --- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 +From e9f8466944c5000d9b43d25d38ef9eaa8cb0afae Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.25.1 +2.20.1 diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch index 8b0d4f4c4d..8c3ddd0042 100644 --- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch @@ -1,4 +1,4 @@ -From e4ae670e3489544a49dabd1618c32fe73504a7ba Mon Sep 17 00:00:00 2001 +From 6615a314ac7a2bc7efea945677934d6afd3b61d6 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 23 Dec 2015 11:45:48 +0100 Subject: [PATCH] Override system locale and set to default when adding gcc @@ -22,10 +22,10 @@ Signed-off-by: James Hilliard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index d3f0e663f2..926c16f58f 100644 +index 36d94432da..506f6107de 100644 --- a/setup.py +++ b/setup.py -@@ -680,7 +680,7 @@ class PyBuildExt(build_ext): +@@ -683,7 +683,7 @@ class PyBuildExt(build_ext): tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) @@ -35,5 +35,5 @@ index d3f0e663f2..926c16f58f 100644 is_clang = False in_incdirs = False -- -2.25.1 +2.20.1 diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch index 7a885303cb..5cb7c85246 100644 --- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch @@ -1,4 +1,4 @@ -From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 +From cda5c7447403440d679a3cd29d8dc38bb15eca33 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 22 Feb 2017 16:48:49 -0800 Subject: [PATCH] Add importlib fix for PEP 3147 issue @@ -25,7 +25,7 @@ Signed-off-by: Andrey Smirnov 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 25a3f8c0e0..2cb9a9aa52 100644 +index fe31f437da..71e64aef30 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -373,8 +373,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): @@ -101,5 +101,5 @@ index 25a3f8c0e0..2cb9a9aa52 100644 -- -2.25.1 +2.20.1 diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch index 8c1b989361..6cbffdf9e0 100644 --- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch @@ -1,4 +1,4 @@ -From 0337342d413d13f437fd089de91faee70a8bf3f9 Mon Sep 17 00:00:00 2001 +From 5c6722b6790ee6b8828a7f8a90b7fd173b77867f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:01:18 -0800 Subject: [PATCH] Add an option to disable installation of test modules @@ -18,10 +18,10 @@ Signed-off-by: James Hilliard 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7c3dde8dd4..204f293d53 100644 +index 6eacfd6961..bbc779ee6a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1406,8 +1406,29 @@ maninstall: altmaninstall +@@ -1405,8 +1405,29 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -53,7 +53,7 @@ index 7c3dde8dd4..204f293d53 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1468,28 +1489,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ +@@ -1467,28 +1488,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_importlib/zipdata02 \ test/test_zoneinfo test/test_zoneinfo/data \ test/ziptestdata \ @@ -97,10 +97,10 @@ index 7c3dde8dd4..204f293d53 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 73d66167de..92e28d02ee 100644 +index 5b897d8e46..bebad207f8 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,11 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,11 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -113,5 +113,5 @@ index 73d66167de..92e28d02ee 100644 # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -- -2.25.1 +2.20.1 diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch index 0c928a0bb2..66b05d5e52 100644 --- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From a65e5d3caf8e076d531191164c23c6240461f675 Mon Sep 17 00:00:00 2001 +From 57e14d395860a781d0b43b1ef3e2a4a8b04bbf80 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 204f293d53..63e3df0470 100644 +index bbc779ee6a..dd83413f17 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1374,7 +1374,9 @@ bininstall: altbininstall +@@ -1373,7 +1373,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -30,7 +30,7 @@ index 204f293d53..63e3df0470 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1424,7 +1426,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1423,7 +1425,7 @@ LIBSUBDIRS= tkinter site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -39,7 +39,7 @@ index 204f293d53..63e3df0470 100644 zoneinfo TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -@@ -1508,6 +1510,10 @@ ifeq (@TEST_MODULES@,yes) +@@ -1507,6 +1509,10 @@ ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -51,10 +51,10 @@ index 204f293d53..63e3df0470 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index 92e28d02ee..174ed85a7c 100644 +index bebad207f8..b748ad7957 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,12 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -68,10 +68,10 @@ index 92e28d02ee..174ed85a7c 100644 AC_ARG_ENABLE(test-modules, diff --git a/setup.py b/setup.py -index 926c16f58f..1fc5fac90c 100644 +index 506f6107de..dcbc109c30 100644 --- a/setup.py +++ b/setup.py -@@ -2565,6 +2565,12 @@ def main(): +@@ -2572,6 +2572,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -84,7 +84,7 @@ index 926c16f58f..1fc5fac90c 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2589,8 +2595,7 @@ def main(): +@@ -2596,8 +2602,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in @@ -95,5 +95,5 @@ index 926c16f58f..1fc5fac90c 100644 # --install-platlib -- -2.25.1 +2.20.1 diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch index fe94cdfded..5e30e53788 100644 --- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 +From bc0681be87109e3e5c35e0bdd225143607350fb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 63e3df0470..8b7de12999 100644 +index dd83413f17..6324970733 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1378,7 +1378,9 @@ ifeq (@PYDOC@,yes) +@@ -1377,7 +1377,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -30,7 +30,7 @@ index 63e3df0470..8b7de12999 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1417,7 +1419,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1416,7 +1418,6 @@ LIBSUBDIRS= tkinter site-packages \ html json http dbm xmlrpc \ sqlite3 \ logging csv wsgiref urllib \ @@ -38,7 +38,7 @@ index 63e3df0470..8b7de12999 100644 ctypes ctypes/macholib \ idlelib idlelib/Icons \ distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1495,9 +1496,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1494,9 +1495,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_email test/test_email/data \ test/test_json \ sqlite3/test \ @@ -48,7 +48,7 @@ index 63e3df0470..8b7de12999 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1506,6 +1504,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1505,6 +1503,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -63,7 +63,7 @@ index 63e3df0470..8b7de12999 100644 ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif -@@ -1606,10 +1612,12 @@ ifeq (@PYC_BUILD@,yes) +@@ -1605,10 +1611,12 @@ ifeq (@PYC_BUILD@,yes) -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -77,10 +77,10 @@ index 63e3df0470..8b7de12999 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index 174ed85a7c..f1f5e9a7b0 100644 +index b748ad7957..58e9a8fe7a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3370,6 +3370,12 @@ AC_ARG_ENABLE(test-modules, +@@ -3377,6 +3377,12 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) @@ -94,10 +94,10 @@ index 174ed85a7c..f1f5e9a7b0 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 1fc5fac90c..4063d7ffa5 100644 +index dcbc109c30..8d6348f560 100644 --- a/setup.py +++ b/setup.py -@@ -2566,10 +2566,11 @@ def main(): +@@ -2573,10 +2573,11 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -112,5 +112,5 @@ index 1fc5fac90c..4063d7ffa5 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.25.1 +2.20.1 diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch index d6c9bccd45..0208bce231 100644 --- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 +From fdef81b6f4280eb26bc620ed8dd3c4dc2018dd29 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8b7de12999..d826d8ac4b 100644 +index 6324970733..f700b780fb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1417,7 +1417,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1416,7 +1416,6 @@ LIBSUBDIRS= tkinter site-packages \ email email/mime \ ensurepip ensurepip/_bundled \ html json http dbm xmlrpc \ @@ -24,7 +24,7 @@ index 8b7de12999..d826d8ac4b 100644 logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ -@@ -1495,7 +1494,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1494,7 +1493,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_asyncio \ test/test_email test/test_email/data \ test/test_json \ @@ -32,7 +32,7 @@ index 8b7de12999..d826d8ac4b 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1512,6 +1510,11 @@ TESTSUBDIRS += lib2to3/tests \ +@@ -1511,6 +1509,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif @@ -45,10 +45,10 @@ index 8b7de12999..d826d8ac4b 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index f1f5e9a7b0..8b5c65974c 100644 +index 58e9a8fe7a..644ed6d895 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,15 @@ if test "$posix_threads" = "yes"; then +@@ -3365,6 +3365,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -65,5 +65,5 @@ index f1f5e9a7b0..8b5c65974c 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index b798eb56a5..b3a4d202e8 100644 --- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 +From 8b77e7ce6723e11c1891befe7e6413d8328e8f67 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index d826d8ac4b..dc84384680 100644 +index f700b780fb..4fcf8b5a96 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1411,7 +1411,7 @@ maninstall: altmaninstall +@@ -1410,7 +1410,7 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -25,7 +25,7 @@ index d826d8ac4b..dc84384680 100644 asyncio \ collections concurrent concurrent/futures encodings \ email email/mime \ -@@ -1429,8 +1429,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1428,8 +1428,7 @@ LIBSUBDIRS= tkinter site-packages \ curses \ zoneinfo @@ -35,7 +35,7 @@ index d826d8ac4b..dc84384680 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata \ -@@ -1502,6 +1501,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1501,6 +1500,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -49,10 +49,10 @@ index d826d8ac4b..dc84384680 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 8b5c65974c..4c72dae960 100644 +index 644ed6d895..a4d06dcb50 100644 --- a/configure.ac +++ b/configure.ac -@@ -3367,6 +3367,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3374,6 +3374,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -69,5 +69,5 @@ index 8b5c65974c..4c72dae960 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch index 93dfac26ec..16d2c1d383 100644 --- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From 962deb43f5f340a8472d432ae8e6d61186f9040e Mon Sep 17 00:00:00 2001 +From 7dea1b79fbb905dd69862862f327cc0f25cd93c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dc84384680..2a82f3308f 100644 +index 4fcf8b5a96..2e45a41140 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1426,7 +1426,6 @@ LIBSUBDIRS= site-packages \ +@@ -1425,7 +1425,6 @@ LIBSUBDIRS= site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -24,7 +24,7 @@ index dc84384680..2a82f3308f 100644 zoneinfo TESTSUBDIRS= test \ -@@ -1507,6 +1506,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ +@@ -1506,6 +1505,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif @@ -36,10 +36,10 @@ index dc84384680..2a82f3308f 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 4c72dae960..acd98381a3 100644 +index a4d06dcb50..f034cd4bcb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3376,6 +3376,15 @@ if test "$TK" = "no"; then +@@ -3383,6 +3383,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -56,5 +56,5 @@ index 4c72dae960..acd98381a3 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch index e7349058c8..79e86bd85a 100644 --- a/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 +From e86dc4209f71d6dc4bfa74fcc2c963b678def39f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2a82f3308f..e678c8817e 100644 +index 2e45a41140..4981087723 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1420,7 +1420,7 @@ LIBSUBDIRS= site-packages \ +@@ -1419,7 +1419,7 @@ LIBSUBDIRS= site-packages \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -32,7 +32,7 @@ index 2a82f3308f..e678c8817e 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1510,6 +1510,10 @@ ifeq (@CURSES@,yes) +@@ -1509,6 +1509,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -44,10 +44,10 @@ index 2a82f3308f..e678c8817e 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index acd98381a3..9ef0ecd42f 100644 +index f034cd4bcb..c90c92c2de 100644 --- a/configure.ac +++ b/configure.ac -@@ -3084,13 +3084,21 @@ PKG_PROG_PKG_CONFIG +@@ -3091,13 +3091,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -75,10 +75,10 @@ index acd98381a3..9ef0ecd42f 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 4063d7ffa5..211a160f29 100644 +index 8d6348f560..0d6fe717da 100644 --- a/setup.py +++ b/setup.py -@@ -1666,7 +1666,7 @@ class PyBuildExt(build_ext): +@@ -1671,7 +1671,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +88,5 @@ index 4063d7ffa5..211a160f29 100644 define_macros = [] extra_compile_args = [] -- -2.25.1 +2.20.1 diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch index 4e22543096..aa1a1499be 100644 --- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch @@ -1,4 +1,4 @@ -From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 +From ede026befe4094635d268e293bfccb9118f19a1c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:49:55 +0100 Subject: [PATCH] Add an option to disable CJK codecs @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 9ef0ecd42f..18e6fd70a0 100644 +index c90c92c2de..d9029f5463 100644 --- a/configure.ac +++ b/configure.ac -@@ -3375,6 +3375,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3382,6 +3382,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -26,5 +26,5 @@ index 9ef0ecd42f..18e6fd70a0 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch index 9cd54df180..2a80e00099 100644 --- a/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch @@ -1,4 +1,4 @@ -From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 +From 1c1acbd3ca7f1184710326fab2d557fed4a216e3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:11 +0100 Subject: [PATCH] Add an option to disable NIS @@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 18e6fd70a0..46d2a8131e 100644 +index d9029f5463..82d9ec77fa 100644 --- a/configure.ac +++ b/configure.ac -@@ -3381,6 +3381,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3388,6 +3388,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) @@ -29,5 +29,5 @@ index 18e6fd70a0..46d2a8131e 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch index 2ddf606a70..c4bcbdf133 100644 --- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch @@ -1,4 +1,4 @@ -From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 +From 9fb4ebe3375ff3fc924d423b6b3400bf2cf82fb6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:27 +0100 Subject: [PATCH] Add an option to disable unicodedata @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 46d2a8131e..5844e3b73f 100644 +index 82d9ec77fa..55d257515f 100644 --- a/configure.ac +++ b/configure.ac -@@ -3387,6 +3387,12 @@ AC_ARG_ENABLE(nis, +@@ -3394,6 +3394,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) @@ -26,5 +26,5 @@ index 46d2a8131e..5844e3b73f 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch index 0e35eea699..9235674a55 100644 --- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 +From e3b96113ae2b5a0c3f775d5a9550dbbcffb702dd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -16,10 +16,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e678c8817e..1148bd8708 100644 +index 4981087723..222c386f59 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1372,7 +1372,9 @@ bininstall: altbininstall +@@ -1371,7 +1371,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -29,7 +29,7 @@ index e678c8817e..1148bd8708 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1419,7 +1421,6 @@ LIBSUBDIRS= site-packages \ +@@ -1418,7 +1420,6 @@ LIBSUBDIRS= site-packages \ html json http dbm xmlrpc \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ @@ -37,7 +37,7 @@ index e678c8817e..1148bd8708 100644 distutils distutils/command \ importlib \ turtledemo \ -@@ -1514,6 +1515,10 @@ ifeq (@EXPAT@,yes) +@@ -1513,6 +1514,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -49,10 +49,10 @@ index e678c8817e..1148bd8708 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 5844e3b73f..7bd4623ccd 100644 +index 55d257515f..2efd7a6de0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3429,6 +3429,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -3436,6 +3436,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -66,10 +66,10 @@ index 5844e3b73f..7bd4623ccd 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 211a160f29..c4ee989ba3 100644 +index 0d6fe717da..4f8cfcd28d 100644 --- a/setup.py +++ b/setup.py -@@ -2566,11 +2566,13 @@ def main(): +@@ -2573,11 +2573,13 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -85,5 +85,5 @@ index 211a160f29..c4ee989ba3 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.25.1 +2.20.1 diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch index b5a12f7f38..963dcec70e 100644 --- a/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch @@ -1,4 +1,4 @@ -From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 +From 2eb05b69bb21df7884686ca2620612ac0f95b894 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:31 +0100 Subject: [PATCH] Add an option to disable decimal @@ -19,10 +19,10 @@ Signed-off-by: James Hilliard 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 7bd4623ccd..e513ef6a20 100644 +index 2efd7a6de0..86fd03cdbb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3135,13 +3135,20 @@ fi +@@ -3142,13 +3142,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library @@ -49,10 +49,10 @@ index 7bd4623ccd..e513ef6a20 100644 # Check whether _decimal should use a coroutine-local or thread-local context AC_MSG_CHECKING(for --with-decimal-contextvar) diff --git a/setup.py b/setup.py -index c4ee989ba3..3d0c74bb7f 100644 +index 4f8cfcd28d..b471234473 100644 --- a/setup.py +++ b/setup.py -@@ -2195,7 +2195,7 @@ class PyBuildExt(build_ext): +@@ -2202,7 +2202,7 @@ class PyBuildExt(build_ext): # Stefan Krah's _decimal module extra_compile_args = [] undef_macros = [] @@ -62,5 +62,5 @@ index c4ee989ba3..3d0c74bb7f 100644 libraries = [':libmpdec.so.2'] sources = ['_decimal/_decimal.c'] -- -2.25.1 +2.20.1 diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch index 0f68a08356..d7a9ab6481 100644 --- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -1,4 +1,4 @@ -From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 +From 1773ef327247ff2a6e7ce737637748b67c90419f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:58 +0100 Subject: [PATCH] Add an option to disable the ossaudiodev module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index e513ef6a20..c07505e89e 100644 +index 86fd03cdbb..7ba4ea8d5d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3165,6 +3165,12 @@ fi +@@ -3172,6 +3172,12 @@ fi AC_MSG_RESULT($with_decimal_contextvar) @@ -26,5 +26,5 @@ index e513ef6a20..c07505e89e 100644 AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) AC_ARG_ENABLE(loadable-sqlite-extensions, -- -2.25.1 +2.20.1 diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch index 44d1d3d6b3..33c6ad94b8 100644 --- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch @@ -1,4 +1,4 @@ -From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 +From 9fb639fba83cddfbda20819d58df77bdccf6ba1d Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Feb 2017 17:55:59 -0800 Subject: [PATCH] Add an option to disable openssl support. @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index c07505e89e..612e32faf5 100644 +index 7ba4ea8d5d..96e7e1feed 100644 --- a/configure.ac +++ b/configure.ac -@@ -3406,6 +3406,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3413,6 +3413,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index c07505e89e..612e32faf5 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch index 1597a2a560..f59af5e9a1 100644 --- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch @@ -1,4 +1,4 @@ -From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 +From c246223473b49a719b765520068aaf812f1fe6ca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:29:05 +0100 Subject: [PATCH] Add an option to disable the readline module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 612e32faf5..2a6aaeff60 100644 +index 96e7e1feed..d5732b2474 100644 --- a/configure.ac +++ b/configure.ac -@@ -3412,6 +3412,12 @@ AC_ARG_ENABLE(openssl, +@@ -3419,6 +3419,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index 612e32faf5..2a6aaeff60 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index a1d2ef3255..a2a30ab614 100644 --- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -1,4 +1,4 @@ -From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 +From 4d87cebaff75a19cd7ccf20f1c89abec5a5bce8d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:31:11 +0100 Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index 2a6aaeff60..21479bbd7d 100644 +index d5732b2474..3eadf17306 100644 --- a/configure.ac +++ b/configure.ac -@@ -3418,6 +3418,24 @@ AC_ARG_ENABLE(readline, +@@ -3425,6 +3425,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index 2a6aaeff60..21479bbd7d 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.20.1 diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch index 4478b40162..870ec74d74 100644 --- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 +From 1ab6b1fb17c1988baca6b9c578f8de33c44c1a17 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.25.1 +2.20.1 diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch similarity index 81% rename from package/python3/0031-Add-an-option-to-disable-uuid-module.patch rename to package/python3/0030-Add-an-option-to-disable-uuid-module.patch index 92b24b211d..af56742d9e 100644 --- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch @@ -1,4 +1,4 @@ -From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 +From 20ff7301b496efe529e2b313cac4d7af626f5051 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 10:54:56 +0200 Subject: [PATCH] Add an option to disable uuid module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 21479bbd7d..615c16aced 100644 +index 3eadf17306..7812dc5102 100644 --- a/configure.ac +++ b/configure.ac -@@ -3454,6 +3454,15 @@ if test "$CURSES" = "no"; then +@@ -3461,6 +3461,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index 21479bbd7d..615c16aced 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.20.1 diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch deleted file mode 100644 index 1bf5fc6db4..0000000000 --- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Fri, 20 Jul 2018 10:17:39 -0400 -Subject: [PATCH] Fix cross compiling the uuid module - -Python 3.7 has a new _uuid module, however, the include directory -search path for uuid.h is hardcoded to /usr/include/uuid, which should -not be used when cross-compiling. - -To fix this, use the same solution as the one used by the NIS -detection: append "uuid" to each of the include directories in -"inc_dirs", instead of hardcoding /usr/include/uuid. - -Signed-off-by: Adam Duskett -[Thomas: drop STAGING_DIR based solution, use a solution similar to -the one used for the NIS detection.] -Signed-off-by: Thomas Petazzoni ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3d0c74bb7f..c7be85f352 100644 ---- a/setup.py -+++ b/setup.py -@@ -1764,7 +1764,8 @@ class PyBuildExt(build_ext): - - def detect_uuid(self): - # Build the _uuid module if possible -- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"]) -+ uuid_incs = find_file("uuid.h", self.inc_dirs, -+ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) - if uuid_incs is not None: - if self.compiler.find_library_file(self.lib_dirs, 'uuid'): - uuid_libs = ['uuid'] --- -2.25.1 - diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0031-fix-building-on-older-distributions.patch similarity index 94% rename from package/python3/0032-fix-building-on-older-distributions.patch rename to package/python3/0031-fix-building-on-older-distributions.patch index fb59e593f4..a8b3465111 100644 --- a/package/python3/0032-fix-building-on-older-distributions.patch +++ b/package/python3/0031-fix-building-on-older-distributions.patch @@ -1,4 +1,4 @@ -From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 +From c9548b8e80eecdd6d0798817698c77649f005b42 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 16 Aug 2018 14:52:37 -0700 Subject: [PATCH] fix building on older distributions @@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 os.unlink(new_path) -- -2.25.1 +2.20.1 diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 71% rename from package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index f70990b254..ec7ecb6a35 100644 --- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From edc0757c56090364e0a95aabfa9f645a16a27569 Mon Sep 17 00:00:00 2001 +From ffe8fb3065973204fce95130c32578163755b71e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -23,26 +23,27 @@ non-multiarch toolchain on some architectures (E.G. PowerPC), but as a workaround, rewrite the --print-multiarch output to match older GCC versions to keep the configure script happy. +[Peter: update for 3.9.9, which made the MULTIARCH logic !darwin] Signed-off-by: Peter Korsgaard --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 615c16aced..241298e6cf 100644 +index 7812dc5102..0ce52b9a7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -727,7 +727,9 @@ then - fi - +@@ -883,7 +883,9 @@ fi + rm -f conftest.c conftest.out --MULTIARCH=$($CC --print-multiarch 2>/dev/null) -+# GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based -+# toolchains confusing python. Fix that up -+MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') + if test x$PLATFORM_TRIPLET != xdarwin; then +- MULTIARCH=$($CC --print-multiarch 2>/dev/null) ++ # GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based ++ # toolchains confusing python. Fix that up ++ MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') + fi AC_SUBST(MULTIARCH) - AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -- -2.25.1 +2.20.1 diff --git a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch index 880277eb1d..44eb450808 100644 --- a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch +++ b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch @@ -1,4 +1,4 @@ -From 3c83eedcc2df3ecf6c4a17953ca24dff60c1378e Mon Sep 17 00:00:00 2001 +From 09ded6ff285e12221114b281d35fe8f9484a9ea5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 12 Nov 2020 00:16:18 +0100 Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method @@ -36,5 +36,5 @@ index 33dbc46bb3..4692a5270c 100644 raise if result and len(result) == method.total_size: -- -2.25.4 +2.20.1 diff --git a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch similarity index 90% rename from package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch rename to package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch index fbe44c7753..b524795d75 100644 --- a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch +++ b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch @@ -1,4 +1,4 @@ -From 331966be70c371b268a4fcce9e97280cd869f137 Mon Sep 17 00:00:00 2001 +From 234364f756e3083164ec9bfcd4867855048372b4 Mon Sep 17 00:00:00 2001 From: Jakub Kulik Date: Mon, 15 Mar 2021 08:49:28 +0100 Subject: [PATCH] Fix dictionary iteration error in _ExecutorManagerThread @@ -12,7 +12,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py -index 90bc98bf2ec..e3b36dff572 100644 +index 90bc98bf2e..e3b36dff57 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -373,7 +373,7 @@ class _ExecutorManagerThread(threading.Thread): @@ -25,5 +25,5 @@ index 90bc98bf2ec..e3b36dff572 100644 cause = None -- -2.31.1 +2.20.1 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 444dbd982a..15e68ca9f1 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-397/ -md5 fddb060b483bc01850a3f412eea1d954 Python-3.9.7.tar.xz +# From https://www.python.org/downloads/release/python-399/ +md5 11d12076311563252a995201248d17e5 Python-3.9.9.tar.xz # Locally computed -sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57 Python-3.9.7.tar.xz +sha256 06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27 Python-3.9.9.tar.xz sha256 599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70 LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 0fab0dd9ba..c66a028bc7 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.9 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 +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 peter at korsgaard.com Sat Jan 15 15:16:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:16:11 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/dav1d: don't override TARGET_LDFLAGS Message-ID: <20220115153110.40FF982B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab4c0e6fc28aa5ea2f07c4699d1bff9c7edca78a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x TARGET_LDFLAGS is overriden since the addition of the package in commit 8d66bc940d6e4707f9773aeb052e94d45fa439ad Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6deb6bdc7cee0664a71f3363f4ee2d2e9d2f031b) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 68f6fc8805..235f070be5 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -25,7 +25,7 @@ endif # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -DAV1D_LDFLAGS += -latomic +DAV1D_LDFLAGS += $(TARGET_LDFLAGS) -latomic endif $(eval $(meson-package)) From peter at korsgaard.com Sat Jan 15 15:37:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:37:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-django: security bump to version 3.2.10 Message-ID: <20220115153110.7ABD082B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=025fa150745f7a6c26d3be656a55a8462b7f45ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2021-44420: Potential bypass of an upstream access control based on URL paths HTTP requests for URLs with trailing newlines could bypass an upstream access control based on URL paths. This issue has low severity, according to the Django security policy. https://www.djangoproject.com/weblog/2021/dec/07/security-releases/ In addition, 3.2.8 / 3.2.9 fixes a number of bugs. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 086d357dfb177ef28d7831716707d2424a2ea4bd) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index ab89f0341c..3eea17e70f 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 2ade1eecca77640abbde6c4589da27dd Django-3.2.7.tar.gz -sha256 95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2 Django-3.2.7.tar.gz +md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz +sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 0850aa1358..4f80208f0e 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.7 +PYTHON_DJANGO_VERSION = 3.2.10 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/59/45/c6fbb3a206df0b7dc3e6e8fae738e042c63d4ddf828c6e1ba10d7417a1d9 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 + PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From peter at korsgaard.com Sat Jan 15 15:38:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:38:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/privoxy: security bump to version 3.0.33 Message-ID: <20220115153156.D94AA82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=325b341440fa646818796a470eaf45241c7b1503 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - cgi_error_no_template(): Encode the template name to prevent XSS (cross-site scripting) when Privoxy is configured to servce the user-manual itself. Commit 0e668e9409c. OVE-20211102-0001. CVE-2021-44543. Reported by: Artem Ivanov - get_url_spec_param(): Free memory of compiled pattern spec before bailing. Reported by Joshua Rogers (Opera) who also provided the fix. Commit 652b4b7cb0. OVE-20211201-0003. CVE-2021-44540. - process_encrypted_request_headers(): Free header memory when failing to get the request destination. Reported by Joshua Rogers (Opera) who also provided the fix. Commit 0509c58045. OVE-20211201-0002. CVE-2021-44541. - send_http_request(): Prevent memory leaks when handling errors Reported by Joshua Rogers (Opera) who also provided the fix. Commit c48d1d6d08. OVE-20211201-0001. CVE-2021-44542. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 44a97dcb93ebe279f15ce625c23930c50beeb009) Signed-off-by: Peter Korsgaard --- package/privoxy/privoxy.hash | 8 ++++---- package/privoxy/privoxy.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index 92ecd1dd21..cf1056ecc4 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.32%20%28stable%29/ -md5 3a0a8ebdf80e0a29154683e74cbf510b privoxy-3.0.32-stable-src.tar.gz -sha1 3a298ab2599fc92555c86dc29a37742d7396a0d3 privoxy-3.0.32-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.33%20%28stable%29/ +md5 d6caf3eaad4812f0658b68d5b3ba3a06 privoxy-3.0.33-stable-src.tar.gz +sha1 688da305077d8ecbcf6423e02201f01f7a7098f4 privoxy-3.0.33-stable-src.tar.gz # Locally computed -sha256 c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7 privoxy-3.0.32-stable-src.tar.gz +sha256 04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae privoxy-3.0.33-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index adb5af28ac..5fe9d5cc3e 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.32 +PRIVOXY_VERSION = 3.0.33 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped From peter at korsgaard.com Sat Jan 15 15:38:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:38:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/privoxy: security bump to version 3.0.33 Message-ID: <20220115153201.5AFEB82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6aa6048432f9bf55527d79997f77b0f6feacae8c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - cgi_error_no_template(): Encode the template name to prevent XSS (cross-site scripting) when Privoxy is configured to servce the user-manual itself. Commit 0e668e9409c. OVE-20211102-0001. CVE-2021-44543. Reported by: Artem Ivanov - get_url_spec_param(): Free memory of compiled pattern spec before bailing. Reported by Joshua Rogers (Opera) who also provided the fix. Commit 652b4b7cb0. OVE-20211201-0003. CVE-2021-44540. - process_encrypted_request_headers(): Free header memory when failing to get the request destination. Reported by Joshua Rogers (Opera) who also provided the fix. Commit 0509c58045. OVE-20211201-0002. CVE-2021-44541. - send_http_request(): Prevent memory leaks when handling errors Reported by Joshua Rogers (Opera) who also provided the fix. Commit c48d1d6d08. OVE-20211201-0001. CVE-2021-44542. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 44a97dcb93ebe279f15ce625c23930c50beeb009) Signed-off-by: Peter Korsgaard --- package/privoxy/privoxy.hash | 8 ++++---- package/privoxy/privoxy.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index 92ecd1dd21..cf1056ecc4 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.32%20%28stable%29/ -md5 3a0a8ebdf80e0a29154683e74cbf510b privoxy-3.0.32-stable-src.tar.gz -sha1 3a298ab2599fc92555c86dc29a37742d7396a0d3 privoxy-3.0.32-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.33%20%28stable%29/ +md5 d6caf3eaad4812f0658b68d5b3ba3a06 privoxy-3.0.33-stable-src.tar.gz +sha1 688da305077d8ecbcf6423e02201f01f7a7098f4 privoxy-3.0.33-stable-src.tar.gz # Locally computed -sha256 c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7 privoxy-3.0.32-stable-src.tar.gz +sha256 04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae privoxy-3.0.33-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index c1859ed5f2..06642200df 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.32 +PRIVOXY_VERSION = 3.0.33 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped From peter at korsgaard.com Sat Jan 15 15:39:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 16:39:02 +0100 Subject: [Buildroot] [PATCH] package/privoxy: security bump to version 3.0.33 In-Reply-To: <20211215171540.4506-1-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 15 Dec 2021 18:15:39 +0100") References: <20211215171540.4506-1-peter@korsgaard.com> Message-ID: <871r192ell.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > - cgi_error_no_template(): Encode the template name to prevent > XSS (cross-site scripting) when Privoxy is configured to servce > the user-manual itself. > Commit 0e668e9409c. OVE-20211102-0001. CVE-2021-44543. > Reported by: Artem Ivanov > - get_url_spec_param(): Free memory of compiled pattern spec > before bailing. > Reported by Joshua Rogers (Opera) who also provided the fix. > Commit 652b4b7cb0. OVE-20211201-0003. CVE-2021-44540. > - process_encrypted_request_headers(): Free header memory when > failing to get the request destination. > Reported by Joshua Rogers (Opera) who also provided the fix. > Commit 0509c58045. OVE-20211201-0002. CVE-2021-44541. > - send_http_request(): Prevent memory leaks when handling errors > Reported by Joshua Rogers (Opera) who also provided the fix. > Commit c48d1d6d08. OVE-20211201-0001. CVE-2021-44542. > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sat Jan 15 16:02:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:02:52 +0100 Subject: [Buildroot] [git commit] board/qemu/arm-vexpress-tz: use enable=on Message-ID: <20220115155637.CF74C82B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=04afe86cd7e85790360548647419a5a40efa6936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since Qemu 6.0.0 [1], a warning appear in the log if a short-form boolean option is used. [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ccd3b3b8112b670fdccf8a392b8419b173ffccb4 Signed-off-by: Romain Naour Cc: Etienne Carriere Cc: Dick Olsson Signed-off-by: Yann E. MORIN --- board/qemu/arm-vexpress-tz/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index 7e62e943a6..3036dd54ca 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -16,7 +16,7 @@ from the image directory: -smp 1 -s -m 1024 -d unimp \ -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ - -semihosting-config enable,target=native \ + -semihosting-config enable=on,target=native \ -bios flash.bin # qemu_arm_vexpress_tz_defconfig The boot stage traces (if any) followed by the login prompt will appear From yann.morin.1998 at free.fr Sat Jan 15 16:03:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:03:28 +0100 Subject: [Buildroot] [PATCH 1/2] board/qemu/arm-vexpress-tz: use enable=on In-Reply-To: <20220115143344.12319-1-romain.naour@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> Message-ID: <20220115160328.GP1945846@scaer> Romain, All, On 2022-01-15 15:33 +0100, Romain Naour spake thusly: > Since Qemu 6.0.0 [1], a warning appear in the log if a short-form > boolean option is used. > > [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ccd3b3b8112b670fdccf8a392b8419b173ffccb4 > > Signed-off-by: Romain Naour > Cc: Etienne Carriere > Cc: Dick Olsson Applied to master, thanks. Regards, Yann E. MORIN. > --- > board/qemu/arm-vexpress-tz/readme.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt > index 7e62e943a6..3036dd54ca 100644 > --- a/board/qemu/arm-vexpress-tz/readme.txt > +++ b/board/qemu/arm-vexpress-tz/readme.txt > @@ -16,7 +16,7 @@ from the image directory: > -smp 1 -s -m 1024 -d unimp \ > -serial stdio \ > -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ > - -semihosting-config enable,target=native \ > + -semihosting-config enable=on,target=native \ > -bios flash.bin # qemu_arm_vexpress_tz_defconfig > > The boot stage traces (if any) followed by the login prompt will appear > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 16:05:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:05:17 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <20220115143344.12319-2-romain.naour@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> <20220115143344.12319-2-romain.naour@gmail.com> Message-ID: <20220115160517.GQ1945846@scaer> Romain, All, On 2022-01-15 15:33 +0100, Romain Naour spake thusly: > As for the Buildroot testsuite, multiply every emulator timeout by 10 > to avoid sporadic failures in elastic runners. > > qemu_arm_vexpress_tz_defconfig tested locally with sucess. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 Are you sure increasing the timeout will fix this failure? The build-run.log contains another error: loaded file zImage from 40400000 to 408CAABF, 004CAAC0 bytes loaded file rootfs.cpio.uboot from 44000000 to 4438FA4E, 0038FA4F bytes Kernel image @ 0x40400000 [ 0x000000 - 0x4caac0 ] ## Loading init Ramdisk from Legacy Image at 44000000 ... Image Name: Created: 2022-01-13 16:06:53 UTC Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 3734031 Bytes = 3.6 MiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 40000000 Booting using the fdt blob at 0x40000000 ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) Using Device Tree in place at 40000000, end 400051f7 So, to me, this is not a timeout issue, but an actual boot issue. Regards, Yann E. MORIN. > Signed-off-by: Romain Naour > --- > support/scripts/boot-qemu-image.py | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py > index fba1533bb7..ba50ea69ee 100755 > --- a/support/scripts/boot-qemu-image.py > +++ b/support/scripts/boot-qemu-image.py > @@ -25,7 +25,7 @@ def main(): > qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') > > child = pexpect.spawn(qemu_start, ['serial-only'], > - timeout=5, encoding='utf-8', > + timeout=50, encoding='utf-8', > env={"QEMU_AUDIO_DRV": "none"}) > > # We want only stdout into the log to avoid double echo > @@ -36,7 +36,7 @@ def main(): > time.sleep(1) > > try: > - child.expect(["buildroot login:"], timeout=60) > + child.expect(["buildroot login:"], timeout=600) > except pexpect.EOF as e: > # Some emulations require a fork of qemu-system, which may be > # missing on the system, and is not provided by Buildroot. > @@ -58,7 +58,7 @@ def main(): > child.sendline("root\r") > > try: > - child.expect(["# "], timeout=60) > + child.expect(["# "], timeout=600) > except pexpect.EOF: > print("Cannot connect to shell") > sys.exit(1) > @@ -69,7 +69,7 @@ def main(): > child.sendline("poweroff\r") > > try: > - child.expect(["System halted"], timeout=60) > + child.expect(["System halted"], timeout=600) > child.expect(pexpect.EOF) > except pexpect.EOF: > pass > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 15 16:04:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 17:04:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost Message-ID: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> Set --with-boost to avoid the following build failure when a non working boost version is installed on host. This failure is raised since the addition of the package in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure:5559: error: Could not find a version of the Boost::Asio library! Fixes: - http://autobuild.buildroot.org/results/855b66b86d979cc922b947da932b0e2388481263 Signed-off-by: Fabrice Fontaine --- package/riscv-isa-sim/riscv-isa-sim.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index ee9067d304..90eed93c36 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -9,5 +9,6 @@ RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc +HOST_RISCV_ISA_SIM_CONF_OPTS = --with-boost=$(HOST_DIR) $(eval $(host-autotools-package)) -- 2.34.1 From yann.morin.1998 at free.fr Sat Jan 15 16:09:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:09:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/multipath-tools: bump to version 0.8.8 In-Reply-To: <20220115101523.2932-1-egorenar-dev@posteo.net> References: <20220115101523.2932-1-egorenar-dev@posteo.net> Message-ID: <20220115160937.GR1945846@scaer> Alexander, All, On 2022-01-15 10:15 +0000, Alexander Egorenkov spake thusly: > Signed-off-by: Alexander Egorenkov Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/multipath-tools/multipath-tools.hash | 2 +- > package/multipath-tools/multipath-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash > index ac41e4815b72..f063848681ea 100644 > --- a/package/multipath-tools/multipath-tools.hash > +++ b/package/multipath-tools/multipath-tools.hash > @@ -1,5 +1,5 @@ > # Locally computed: > -sha256 7c5962be6068c78d5256e8fc979cf327988f7560705bb9cc25b508c50ca997c0 multipath-tools-0.8.7.tar.gz > +sha256 ff45ddb18a1effbfbe5712f513dd3b7146c68141091fc1c2489af8d6197026ef multipath-tools-0.8.8.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 > sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 > sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 > diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk > index 3d8095b0b093..eecfe3900233 100644 > --- a/package/multipath-tools/multipath-tools.mk > +++ b/package/multipath-tools/multipath-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MULTIPATH_TOOLS_VERSION = 0.8.7 > +MULTIPATH_TOOLS_VERSION = 0.8.8 > MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) > > MULTIPATH_TOOLS_LICENSE = \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 15 16:09:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 17:09:08 +0100 Subject: [Buildroot] [git commit] package/multipath-tools: bump to version 0.8.8 Message-ID: <20220115160318.CE55D82B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e4791b751c0f8e0ba218da2c22e71d3e1436b5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index ac41e4815b..f063848681 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7c5962be6068c78d5256e8fc979cf327988f7560705bb9cc25b508c50ca997c0 multipath-tools-0.8.7.tar.gz +sha256 ff45ddb18a1effbfbe5712f513dd3b7146c68141091fc1c2489af8d6197026ef multipath-tools-0.8.8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 3d8095b0b0..eecfe39002 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.8.7 +MULTIPATH_TOOLS_VERSION = 0.8.8 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From fontaine.fabrice at gmail.com Sat Jan 15 16:21:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 15 Jan 2022 17:21:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpdecimal: bump to version 2.5.1 Message-ID: <20220115162142.2300207-1-fontaine.fabrice@gmail.com> Drop patch (already in version) and so autoreconf https://www.bytereef.org/mpdecimal/changelog.html Signed-off-by: Fabrice Fontaine --- ...ort-for-enable-disable-shared-static.patch | 147 ------------------ package/mpdecimal/mpdecimal.hash | 2 +- package/mpdecimal/mpdecimal.mk | 3 +- 3 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch diff --git a/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch b/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch deleted file mode 100644 index 60d6b4bb02..0000000000 --- a/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch +++ /dev/null @@ -1,147 +0,0 @@ -From c349964887901848fb4cd5db53a5bcb6dae27aaa Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 23 Nov 2014 10:16:33 +0100 -Subject: [PATCH] Add minimal support for --{enable,disable}-{shared,static} - -mpdecimal uses autoconf, but not automake or libtool, so this commit -adds some basic handling of --{enable,disable}-{shared,static}, so -that building the shared library can be disabled in pure static -library contexts. - -Signed-off-by: Thomas Petazzoni -[Fabrice: update for 2.5.0 (add libmpdec++)] -Signed-off-by: Fabrice Fontaine ---- - Makefile.in | 6 ++++++ - configure.ac | 13 +++++++++++++ - libmpdec/Makefile.in | 11 ++++++++++- - 3 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 2c91891..0c44f36 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -9,6 +9,8 @@ LIBSTATIC = @LIBSTATIC@ - LIBSONAME = @LIBSONAME@ - LIBSHARED = @LIBSHARED@ - INSTALL = @INSTALL@ -+BUILD_SHARED = @BUILD_SHARED@ -+BUILD_STATIC = @BUILD_STATIC@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -32,9 +34,13 @@ install: FORCE - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) - $(INSTALL) -m 644 libmpdec/mpdecimal.h $(DESTDIR)$(includedir) - $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) -+ifeq ($(BUILD_STATIC),yes) - $(INSTALL) -m 644 libmpdec/$(LIBSTATIC) $(DESTDIR)$(libdir) -+endif -+ifeq ($(BUILD_SHARED),yes) - $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) $(LIBNAME) -+endif - $(INSTALL) -d -m 755 $(DESTDIR)$(docdir) - cp -R doc/* $(DESTDIR)$(docdir) - -@@ -74,9 +80,13 @@ install_libcxx: install_lib - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) - $(INSTALL) -m 644 libmpdec++/decimal.hh $(DESTDIR)$(includedir) - $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) -+ifeq ($(BUILD_STATIC),yes) - $(INSTALL) -m 644 libmpdec++/$(LIBSTATIC_CXX) $(DESTDIR)$(libdir) -+endif -+ifeq ($(BUILD_SHARED),yes) - $(INSTALL) -m 755 libmpdec++/$(LIBSHARED_CXX) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX) && ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX) -+endif - cp -R doc/libmpdec++ $(DESTDIR)$(docdir) - - -diff --git a/configure.ac b/configure.ac -index 7ee8f86..2b3e505 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -88,6 +88,19 @@ CFLAGS="$saved_cflags" - AC_PROG_INSTALL - AC_SUBST(INSTALL) - -+AC_ARG_ENABLE([shared], -+ [AS_HELP_STRING([--enable-shared], [build shared library])], -+ [BUILD_SHARED=$enableval], -+ [BUILD_SHARED=yes]) -+ -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static], [build static library])], -+ [BUILD_STATIC=$enableval], -+ [BUILD_STATIC=yes]) -+ -+AC_SUBST(BUILD_SHARED) -+AC_SUBST(BUILD_STATIC) -+ - # _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect: - # http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html - AC_MSG_CHECKING(for glibc _FORTIFY_SOURCE/memmove bug) -diff --git a/libmpdec/Makefile.in b/libmpdec/Makefile.in -index d9619a3..985c73c 100644 ---- a/libmpdec/Makefile.in -+++ b/libmpdec/Makefile.in -@@ -7,6 +7,8 @@ - LIBSTATIC = @LIBSTATIC@ - LIBSONAME = @LIBSONAME@ - LIBSHARED = @LIBSHARED@ -+BUILD_SHARED = @BUILD_SHARED@ -+BUILD_STATIC = @BUILD_STATIC@ - - CC = @CC@ - LD = @LD@ -@@ -32,8 +34,15 @@ ifeq ($(MAKECMDGOALS), profile_use) - MPD_LDFLAGS += $(MPD_PUSE) - endif - -+ifeq ($(BUILD_SHARED),yes) -+TARGETS += $(LIBSHARED) -+endif -+ -+ifeq ($(BUILD_STATIC),yes) -+TARGETS += $(LIBSTATIC) -+endif - --default: $(LIBSTATIC) $(LIBSHARED) -+default: $(TARGETS) - - - OBJS := basearith.o context.o constants.o convolute.o crt.o mpdecimal.o \ -diff --git a/libmpdec/Makefile.in b/libmpdec/Makefile.in -index d9619a3..985c73c 100644 ---- a/libmpdec++/Makefile.in -+++ b/libmpdec++/Makefile.in -@@ -13,6 +13,8 @@ LIBSTATIC_CXX = @LIBSTATIC_CXX@ - LIBNAME_CXX = @LIBNAME_CXX@ - LIBSONAME_CXX = @LIBSONAME_CXX@ - LIBSHARED_CXX = @LIBSHARED_CXX@ -+BUILD_SHARED = @BUILD_SHARED@ -+BUILD_STATIC = @BUILD_STATIC@ - - CXX = @CXX@ - LDXX = @LDXX@ -@@ -39,8 +41,15 @@ ifeq ($(MAKECMDGOALS), profile_use) - MPD_LDXXFLAGS += $(MPD_PUSE) - endif - -+ifeq ($(BUILD_SHARED),yes) -+TARGETS += $(LIBSHARED_CXX) -+endif -+ -+ifeq ($(BUILD_STATIC),yes) -+TARGETS += $(LIBSTATIC_CXX) -+endif - --default: $(LIBSTATIC_CXX) $(LIBSHARED_CXX) -+default: $(TARGETS) - - - OBJS := decimal.o --- -2.1.0 - diff --git a/package/mpdecimal/mpdecimal.hash b/package/mpdecimal/mpdecimal.hash index c931ee4a6d..81150c7575 100644 --- a/package/mpdecimal/mpdecimal.hash +++ b/package/mpdecimal/mpdecimal.hash @@ -1,4 +1,4 @@ # From http://www.bytereef.org/mpdecimal/download.html -sha256 15417edc8e12a57d1d9d75fa7e3f22b158a3b98f44db9d694cfd2acde8dfa0ca mpdecimal-2.5.0.tar.gz +sha256 9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f mpdecimal-2.5.1.tar.gz # Locally computed sha256 b07528d8b1dbf1e2d2741052996f0876e23342ce2d30d0effa39c5457716c25a LICENSE.txt diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index fa310a2274..25c12c08b1 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -5,12 +5,11 @@ ################################################################################ MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases -MPDECIMAL_VERSION = 2.5.0 +MPDECIMAL_VERSION = 2.5.1 MPDECIMAL_INSTALL_STAGING = YES MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" -MPDECIMAL_AUTORECONF = YES # On i386, by default, mpdecimal tries to uses which is not # available in musl/uclibc. So in this case, we tell mpdecimal to use -- 2.34.1 From peter at korsgaard.com Sat Jan 15 17:31:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 18:31:24 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libopenssl: bump version to 1.1.1m Message-ID: <20220115172500.3973F8258B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c7473698ed47c0cc5d385f6a9cd742991bff383 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Minor bugfix release: Changes between 1.1.1l and 1.1.1m [14 Dec 2021] *) Avoid loading of a dynamic engine twice. [Bernd Edlinger] *) Fixed building on Debian with kfreebsd kernels [Mattias Ellert] *) Prioritise DANE TLSA issuer certs over peer certs [Viktor Dukhovni] *) Fixed random API for MacOS prior to 10.12 These MacOS versions don't support the CommonCrypto APIs [Lenny Primak] Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2b906b975a956bd2b6352b2eec6c3c697317bbbe) Signed-off-by: Peter Korsgaard --- 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 93c688d9dd..a055cbc270 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256 -sha256 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 +sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index b618e3e56b..e713afef7f 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1l +LIBOPENSSL_VERSION = 1.1.1m LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sat Jan 15 17:31:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 18:31:19 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libopenssl: bump version to 1.1.1m Message-ID: <20220115172504.EDA018258B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7642ecec5ea91fc1aabb72153d0dc497cc0471e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Minor bugfix release: Changes between 1.1.1l and 1.1.1m [14 Dec 2021] *) Avoid loading of a dynamic engine twice. [Bernd Edlinger] *) Fixed building on Debian with kfreebsd kernels [Mattias Ellert] *) Prioritise DANE TLSA issuer certs over peer certs [Viktor Dukhovni] *) Fixed random API for MacOS prior to 10.12 These MacOS versions don't support the CommonCrypto APIs [Lenny Primak] Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2b906b975a956bd2b6352b2eec6c3c697317bbbe) Signed-off-by: Peter Korsgaard --- 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 93c688d9dd..a055cbc270 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256 -sha256 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 +sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index f139213315..bd8ef6141a 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1l +LIBOPENSSL_VERSION = 1.1.1m LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sat Jan 15 17:31:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 18:31:41 +0100 Subject: [Buildroot] [git commit] package/libopenssl: bump version to 1.1.1m In-Reply-To: <20211216194555.323F481DED@busybox.osuosl.org> (Arnout Vandecappelle's message of "Thu, 16 Dec 2021 20:23:09 +0100") References: <20211216194555.323F481DED@busybox.osuosl.org> Message-ID: <87wnj029du.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=2b906b975a956bd2b6352b2eec6c3c697317bbbe > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Minor bugfix release: > Changes between 1.1.1l and 1.1.1m [14 Dec 2021] > *) Avoid loading of a dynamic engine twice. > [Bernd Edlinger] > *) Fixed building on Debian with kfreebsd kernels > [Mattias Ellert] > *) Prioritise DANE TLSA issuer certs over peer certs > [Viktor Dukhovni] > *) Fixed random API for MacOS prior to 10.12 > These MacOS versions don't support the CommonCrypto APIs > [Lenny Primak] > Signed-off-by: Peter Korsgaard > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 19:16:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:16:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/civetweb: fix BR2_STATIC_SHARED_LIBS typo In-Reply-To: <20211215215007.3983784-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 15 Dec 2021 22:50:07 +0100") References: <20211215215007.3983784-1-fontaine.fabrice@gmail.com> Message-ID: <87sfto24jj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix typo BR2_STATIC_SHARED_LIBS -> BR2_SHARED_STATIC_LIBS added by > commit db47bc99976c2d4ffb509620a76cfdd369b30559 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From romain.naour at gmail.com Sat Jan 15 19:28:52 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 15 Jan 2022 20:28:52 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <20220115160517.GQ1945846@scaer> References: <20220115143344.12319-1-romain.naour@gmail.com> <20220115143344.12319-2-romain.naour@gmail.com> <20220115160517.GQ1945846@scaer> Message-ID: <737f135e-b936-a21c-8775-349d7db7fb88@gmail.com> Hello Yann, Le 15/01/2022 ? 17:05, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-15 15:33 +0100, Romain Naour spake thusly: >> As for the Buildroot testsuite, multiply every emulator timeout by 10 >> to avoid sporadic failures in elastic runners. >> >> qemu_arm_vexpress_tz_defconfig tested locally with sucess. >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 > > Are you sure increasing the timeout will fix this failure? The > build-run.log contains another error: > > loaded file zImage from 40400000 to 408CAABF, 004CAAC0 bytes > loaded file rootfs.cpio.uboot from 44000000 to 4438FA4E, 0038FA4F bytes > Kernel image @ 0x40400000 [ 0x000000 - 0x4caac0 ] > ## Loading init Ramdisk from Legacy Image at 44000000 ... > Image Name: > Created: 2022-01-13 16:06:53 UTC > Image Type: ARM Linux RAMDisk Image (uncompressed) > Data Size: 3734031 Bytes = 3.6 MiB > Load Address: 00000000 > Entry Point: 00000000 > Verifying Checksum ... OK > ## Flattened Device Tree blob at 40000000 > Booting using the fdt blob at 0x40000000 > ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) > Using Device Tree in place at 40000000, end 400051f7 > > So, to me, this is not a timeout issue, but an actual boot issue. The system stop in the middle of optee startup optee: dynamic shared memory is enabled Also, I got the same error message while testing locally. Best regards, Romain > > Regards, > Yann E. MORIN. > >> Signed-off-by: Romain Naour >> --- >> support/scripts/boot-qemu-image.py | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py >> index fba1533bb7..ba50ea69ee 100755 >> --- a/support/scripts/boot-qemu-image.py >> +++ b/support/scripts/boot-qemu-image.py >> @@ -25,7 +25,7 @@ def main(): >> qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') >> >> child = pexpect.spawn(qemu_start, ['serial-only'], >> - timeout=5, encoding='utf-8', >> + timeout=50, encoding='utf-8', >> env={"QEMU_AUDIO_DRV": "none"}) >> >> # We want only stdout into the log to avoid double echo >> @@ -36,7 +36,7 @@ def main(): >> time.sleep(1) >> >> try: >> - child.expect(["buildroot login:"], timeout=60) >> + child.expect(["buildroot login:"], timeout=600) >> except pexpect.EOF as e: >> # Some emulations require a fork of qemu-system, which may be >> # missing on the system, and is not provided by Buildroot. >> @@ -58,7 +58,7 @@ def main(): >> child.sendline("root\r") >> >> try: >> - child.expect(["# "], timeout=60) >> + child.expect(["# "], timeout=600) >> except pexpect.EOF: >> print("Cannot connect to shell") >> sys.exit(1) >> @@ -69,7 +69,7 @@ def main(): >> child.sendline("poweroff\r") >> >> try: >> - child.expect(["System halted"], timeout=60) >> + child.expect(["System halted"], timeout=600) >> child.expect(pexpect.EOF) >> except pexpect.EOF: >> pass >> -- >> 2.31.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Sat Jan 15 19:31:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:31:04 +0100 Subject: [Buildroot] [PATCH] configs/beaglebone_qt5_defconfig: bump to u-boot 2021.04 In-Reply-To: <20211215222507.762310-1-lothar.felten@gmail.com> (Lothar Felten's message of "Wed, 15 Dec 2021 23:25:07 +0100") References: <20211215222507.762310-1-lothar.felten@gmail.com> Message-ID: <87o84c23uv.fsf@dell.be.48ers.dk> >>>>> "Lothar" == Lothar Felten writes: > Fixes: > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition... > scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > Tested on beaglebone black and beaglebone white (A6) > Signed-off-by: Lothar Felten Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From patrickdepinguin at gmail.com Sat Jan 15 19:31:31 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 20:31:31 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> Message-ID: El jue, 13 ene 2022 a las 23:05, Romain Naour () escribi?: > > Hi Thomas, > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > There are cases where a 64-bit architecture is running a 64-bit kernel but > > 32-bit userspace. Examples include: > > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > > > In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to > > the 32-bit architecture, but the kernel needs to be built with the 64-bit > > architecture. > > > > Make it possible to define the correct architecture to be used for the > > kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is > > expected to know the valid values. > > > > Signed-off-by: Thomas De Schampheleire > > --- > > Makefile | 4 ++++ > > arch/Config.in | 15 +++++++++++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/Makefile b/Makefile > > index c5399e9a35..d09cf7c958 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -434,7 +434,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > > # Strip off the annoying quoting > > ARCH := $(call qstrip,$(BR2_ARCH)) > > NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) > > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > +else > > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) > > +endif > > > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > > BZCAT := $(call qstrip,$(BR2_BZCAT)) > > diff --git a/arch/Config.in b/arch/Config.in > > index 7575acf48c..c82100f541 100644 > > --- a/arch/Config.in > > +++ b/arch/Config.in > > @@ -329,6 +329,21 @@ config BR2_ARCH > > config BR2_KERNEL_ARCH > > string > > > > +config BR2_KERNEL_ARCH_OVERRIDE > > + string "Kernel architecture override" > > Maybe it would be better to add architecture dependencies here (BR2_ARCH_IS_64) > > > + help > > + Normally, the correct kernel architecture value is derived > > + from the selected architecture, and you should keep this > > + option empty. > > + However, there are cases where you may want to enter a custom > > + value, for example when using a 64-bit architecture but > > + running userspace in 32-bit mode. > > + As an example, in case of an x86_64 processor where you want > > + 32-bit userspace, BR2_ARCH will be 'i386'/'i486'/'i686' and > > + BR2_KERNEL_ARCH_OVERRIDE should be set to 'x86_64'. Note that > > + in this example you will also need a multilib toolchain and > > + pass '-m32' via BR2_TARGET_OPTIMIZATION. > > Adding -m32 will force the mulitilib toolchain to produce 32bits binary. > But -m64 is also added to the toolchain wrapper for x86_64. > Mixing -m64 and -m32 doesn't seems a good idea. Well, the last entry on the command-line counts, and since BR2_TARGET_OPTIMIZATION is passed _after_ -m64, the -m32 wins as expected. It would be possible to avoid passing the -m64 but then I think we'll have to make some assumptions about the value of KERNEL_ARCH_OVERRIDE or only cover specific cases. Best regards, Thomas From peter at korsgaard.com Sat Jan 15 19:32:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:32:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/lapack: security bump to version 3.10.0 In-Reply-To: <20211216070201.113909-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Dec 2021 08:02:01 +0100") References: <20211216070201.113909-1-fontaine.fabrice@gmail.com> Message-ID: <87k0f023rp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, > DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, > as also used in OpenBLAS before version 0.3.18. Specially crafted > inputs passed to these functions could cause an application using > lapack to crash or possibly disclose portions of its memory. > - Update license hash, year changed: > https://github.com/Reference-LAPACK/lapack/commit/f67034373ee2972b4ea5de5a3d635b30ad3026c2 > - Update indentation in hash file (two spaces) > http://netlib.org/lapack/lapack-3.10.0.html > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 15 18:12:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 19:12:04 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/civetweb: fix BR2_STATIC_SHARED_LIBS typo Message-ID: <20220115192726.7FB9482D97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b86bd9fee12fbaada52bc383d36626a6ec2fa07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix typo BR2_STATIC_SHARED_LIBS -> BR2_SHARED_STATIC_LIBS added by commit db47bc99976c2d4ffb509620a76cfdd369b30559 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0dbd03a0c93ae286d8b70b5455d699c58acf77e) Signed-off-by: Peter Korsgaard --- package/civetweb/civetweb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 33c3bfdf33..22618fb443 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -54,12 +54,12 @@ ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) CIVETWEB_INSTALL_STAGING = YES CIVETWEB_INSTALL_TARGETS += install-headers -ifeq ($(BR2_STATIC_LIBS)$(BR2_STATIC_SHARED_LIBS),y) +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) CIVETWEB_BUILD_TARGETS += lib CIVETWEB_INSTALL_TARGETS += install-lib endif -ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y) +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) CIVETWEB_BUILD_TARGETS += slib CIVETWEB_INSTALL_TARGETS += install-slib endif From peter at korsgaard.com Sat Jan 15 19:32:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:32:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lapack: security bump to version 3.10.0 Message-ID: <20220115192726.91AF582DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86a3f40405772faca6847553b3a541a501a73c88 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. - Update license hash, year changed: https://github.com/Reference-LAPACK/lapack/commit/f67034373ee2972b4ea5de5a3d635b30ad3026c2 - Update indentation in hash file (two spaces) http://netlib.org/lapack/lapack-3.10.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 59a1fcc69620da8eab1c048977fa22d297b18284) Signed-off-by: Peter Korsgaard --- package/lapack/lapack.hash | 4 ++-- package/lapack/lapack.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lapack/lapack.hash b/package/lapack/lapack.hash index bac7210c29..6f6dbff1a6 100644 --- a/package/lapack/lapack.hash +++ b/package/lapack/lapack.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573 lapack-3.9.0.tar.gz -sha256 d56bd4441b999b80c88df04faf0d8b3d7d3b2bd781cf91242c4188e8a6d0f8be LICENSE +sha256 328c1bea493a32cac5257d84157dc686cc3ab0b004e2bea22044e0a59f6f8a19 lapack-3.10.0.tar.gz +sha256 66246b7d3e6736aea46e63fd5e087659474d07edfe2f9b051d085d9b42aaac61 LICENSE diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 41774f6167..f34f685ae2 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LAPACK_VERSION = 3.9.0 +LAPACK_VERSION = 3.10.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) From peter at korsgaard.com Sat Jan 15 19:24:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:24:42 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/beaglebone_qt5_defconfig: bump to u-boot 2021.04 Message-ID: <20220115192726.88AE982DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=839078c5da6c24727d6a065f5b3728bf8a216ded branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes: /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition... scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here Tested on beaglebone black and beaglebone white (A6) Signed-off-by: Lothar Felten Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b55cb018dbcc10d15b62e049d48b691fa8e4c9c) Signed-off-by: Peter Korsgaard --- configs/beaglebone_qt5_defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 11a91677ce..ff03a05a8e 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -32,13 +32,11 @@ 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="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y From peter at korsgaard.com Sat Jan 15 19:15:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:15:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/civetweb: fix BR2_STATIC_SHARED_LIBS typo Message-ID: <20220115192731.0D1CA82DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56228062ddd1a3c2a0d1a70a8d9d8b6641d46b5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix typo BR2_STATIC_SHARED_LIBS -> BR2_SHARED_STATIC_LIBS added by commit db47bc99976c2d4ffb509620a76cfdd369b30559 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0dbd03a0c93ae286d8b70b5455d699c58acf77e) Signed-off-by: Peter Korsgaard --- package/civetweb/civetweb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 94fbb4f9d8..b20d213a0d 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -54,12 +54,12 @@ ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) CIVETWEB_INSTALL_STAGING = YES CIVETWEB_INSTALL_TARGETS += install-headers -ifeq ($(BR2_STATIC_LIBS)$(BR2_STATIC_SHARED_LIBS),y) +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) CIVETWEB_BUILD_TARGETS += lib CIVETWEB_INSTALL_TARGETS += install-lib endif -ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y) +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) CIVETWEB_BUILD_TARGETS += slib CIVETWEB_INSTALL_TARGETS += install-slib endif From peter at korsgaard.com Sat Jan 15 19:32:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 15 Jan 2022 20:32:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lapack: security bump to version 3.10.0 Message-ID: <20220115192731.14E2382DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4a84a9aa989efd98c160c89fa5edc92538a12d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. - Update license hash, year changed: https://github.com/Reference-LAPACK/lapack/commit/f67034373ee2972b4ea5de5a3d635b30ad3026c2 - Update indentation in hash file (two spaces) http://netlib.org/lapack/lapack-3.10.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 59a1fcc69620da8eab1c048977fa22d297b18284) Signed-off-by: Peter Korsgaard --- package/lapack/lapack.hash | 4 ++-- package/lapack/lapack.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lapack/lapack.hash b/package/lapack/lapack.hash index bac7210c29..6f6dbff1a6 100644 --- a/package/lapack/lapack.hash +++ b/package/lapack/lapack.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573 lapack-3.9.0.tar.gz -sha256 d56bd4441b999b80c88df04faf0d8b3d7d3b2bd781cf91242c4188e8a6d0f8be LICENSE +sha256 328c1bea493a32cac5257d84157dc686cc3ab0b004e2bea22044e0a59f6f8a19 lapack-3.10.0.tar.gz +sha256 66246b7d3e6736aea46e63fd5e087659474d07edfe2f9b051d085d9b42aaac61 LICENSE diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 41774f6167..f34f685ae2 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LAPACK_VERSION = 3.9.0 +LAPACK_VERSION = 3.10.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) From patrickdepinguin at gmail.com Sat Jan 15 19:45:22 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 20:45:22 +0100 Subject: [Buildroot] [PATCH 3/4] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> References: <20210518113652.29609-1-patrickdepinguin@gmail.com> <20210518113652.29609-4-patrickdepinguin@gmail.com> <1a139b63-48ff-fe9e-2041-cc1724a753b2@gmail.com> Message-ID: El jue, 13 ene 2022 a las 23:05, Romain Naour () escribi?: > > Hi Thomas, > > Le 18/05/2021 ? 13:36, Thomas De Schampheleire a ?crit : > > From: Thomas De Schampheleire > > > > There are cases where a 64-bit architecture is running a 64-bit kernel but > > 32-bit userspace. Examples include: > > * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace > > * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace > > > > In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to > > the 32-bit architecture, but the kernel needs to be built with the 64-bit > > architecture. > > > > Make it possible to define the correct architecture to be used for the > > kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is > > expected to know the valid values. > > > > Signed-off-by: Thomas De Schampheleire > > --- > > Makefile | 4 ++++ > > arch/Config.in | 15 +++++++++++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/Makefile b/Makefile > > index c5399e9a35..d09cf7c958 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -434,7 +434,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) > > # Strip off the annoying quoting > > ARCH := $(call qstrip,$(BR2_ARCH)) > > NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) > > KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) > > +else > > +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) > > +endif > > > > ZCAT := $(call qstrip,$(BR2_ZCAT)) > > BZCAT := $(call qstrip,$(BR2_BZCAT)) > > diff --git a/arch/Config.in b/arch/Config.in > > index 7575acf48c..c82100f541 100644 > > --- a/arch/Config.in > > +++ b/arch/Config.in > > @@ -329,6 +329,21 @@ config BR2_ARCH > > config BR2_KERNEL_ARCH > > string > > > > +config BR2_KERNEL_ARCH_OVERRIDE > > + string "Kernel architecture override" > > Maybe it would be better to add architecture dependencies here (BR2_ARCH_IS_64) > Note that BR2_ARCH and BR2_ARCH_IS_64 refer to the architecture Buildroot really uses, which in these scenarios is the 32-bit architecture. So letting BR2_KERNEL_ARCH_OVERRIDE depend on BR2_ARCH_IS_64 is not possible. If we restrict the whole feature to specific cases (e.g. the two ones that I currently need) and extend on case-by-case basis, we could be more specific here. Best regards, Thomas From patrickdepinguin at gmail.com Sat Jan 15 20:02:58 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:02:58 +0100 Subject: [Buildroot] [PATCHv2 0/7] Basic support for 64-bit kernel and 32-bit userland Message-ID: <20220115200306.14037-1-patrickdepinguin@gmail.com> From: Thomas De Schampheleire Hello, Even though there are already cases where a 64-bit kernel is combined with 32-bit userland, like MIPS64n32, that Buildroot can support out-of-the-box, there are other combinations that don't currently work. At work, we have two such cases: - 64-bit x86_64 kernel with 32-bit i386 userspace - 64-bit aarch64 kernel with 32-bit arm userspace This series adds basic support for these cases, with the limitation that the user still needs to know what they are doing. Patch 1 is a general improvement and can land even if you don't agree with the rest. Patch 2 handles the realization that 'KERNEL_ARCH' can mean two different things, and that we need two separate variables. Patch 3 makes it possible for users to specify the kernel architecture that differs from the Buildroot notion of userspace architecture. Patch 4 fixes the build of perf in this mixed 64-bit-kernel+32-bit-userspace case. Patch 5 prepares host-qemu for the case of x86_64. I'm not very fond of the fact that this does not provide a generic solution. Patch 6 adds a new qemu defconfig for x86_64 kernel and x86 userspace, that employs the new logic. Finally patch 7 corrects LINUX_ARCH_PATH for sparc64, not directly related to this series but reported by Romain Naour during his review. As hinted above, users that would like to employ such scenarios still need to know what they are doing: - the correct value of BR2_KERNEL_ARCH_OVERRIDE is to be known by the user - the toolchain should be capable of generating both 64-bit (kernel) output as well as 32-bit userspace output. This is typically done with a multilib toolchain, where the default output is 64-bit so that the kernel build does not require additional changes, while passing the correct '-mXXX' flag as BR2_TARGET_OPTIMIZATION for the userspace compilations. - it is not possible to create one multilib toolchain that supports Aarch64 and (32-bit) ARM output. We have solved it by packaging two individual toolchains in one archive, with symlinks at top-level to the 32-bit toolchain, and some additional changes in Buildroot to make sure the 64-bit toolchain is used where needed (kernel, bootloader) - BR2_KERNEL_64_USERLAND_32 is not automatically passed. An alternative implementation would be to explicitly support certain combinations, but this is less flexible. Best regards, Thomas Thomas De Schampheleire (7): arch: move definition of KERNEL_ARCH to Config.in. files core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH core: introduce BR2_KERNEL_ARCH_OVERRIDE perf: fix compilation in case of i386 userspace with x86_64 kernel package/qemu: add support for overridden KERNEL_ARCH=x86_64 configs: add new qemu defconfig 'x86_multilib' linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 Makefile | 22 ++----- arch/Config.in | 18 ++++++ arch/Config.in.arc | 3 + arch/Config.in.arm | 4 ++ arch/Config.in.csky | 3 + arch/Config.in.m68k | 3 + arch/Config.in.microblaze | 3 + arch/Config.in.mips | 3 + arch/Config.in.nds32 | 3 + arch/Config.in.nios2 | 3 + arch/Config.in.or1k | 3 + arch/Config.in.powerpc | 3 + arch/Config.in.riscv | 3 + arch/Config.in.s390x | 3 + arch/Config.in.sh | 3 + arch/Config.in.sparc | 4 ++ arch/Config.in.x86 | 4 ++ arch/Config.in.xtensa | 3 + board/qemu/x86_multilib/linux.config | 57 +++++++++++++++++++ board/qemu/x86_multilib/post-build.sh | 11 ++++ board/qemu/x86_multilib/readme.txt | 7 +++ boot/barebox/barebox.mk | 10 ++-- boot/uboot/uboot.mk | 6 +- configs/qemu_x86_multilib_defconfig | 26 +++++++++ linux/linux.mk | 2 + package/busybox/busybox.mk | 2 +- .../environment-setup/environment-setup.mk | 2 +- package/kvmtool/kvmtool.mk | 4 +- package/libselinux/libselinux.mk | 2 +- package/linux-tools/linux-tool-perf.mk.in | 7 ++- .../linux-tools/linux-tool-selftests.mk.in | 6 +- package/olsr/olsr.mk | 4 +- package/pciutils/pciutils.mk | 2 +- package/qemu/qemu.mk | 3 + package/uboot-tools/uboot-tools.mk | 10 ++-- 35 files changed, 210 insertions(+), 42 deletions(-) create mode 100644 board/qemu/x86_multilib/linux.config create mode 100755 board/qemu/x86_multilib/post-build.sh create mode 100644 board/qemu/x86_multilib/readme.txt create mode 100644 configs/qemu_x86_multilib_defconfig -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:02:59 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:02:59 +0100 Subject: [Buildroot] [PATCHv2 1/7] arch: move definition of KERNEL_ARCH to Config.in. files In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-2-patrickdepinguin@gmail.com> From: Thomas De Schampheleire Similar to other arch-specific strings, the 'KERNEL_ARCH' variable can be determined from Config.in. files. Besides aligning with similar strings, this also means simplification: the big 'sed' covers several architectures not even supported by Buildroot. Signed-off-by: Thomas De Schampheleire Reviewed-by: Romain Naour --- Makefile | 17 +---------------- arch/Config.in | 3 +++ arch/Config.in.arc | 3 +++ arch/Config.in.arm | 4 ++++ arch/Config.in.csky | 3 +++ arch/Config.in.m68k | 3 +++ arch/Config.in.microblaze | 3 +++ arch/Config.in.mips | 3 +++ arch/Config.in.nds32 | 3 +++ arch/Config.in.nios2 | 3 +++ arch/Config.in.or1k | 3 +++ arch/Config.in.powerpc | 3 +++ arch/Config.in.riscv | 3 +++ arch/Config.in.s390x | 3 +++ arch/Config.in.sh | 3 +++ arch/Config.in.sparc | 4 ++++ arch/Config.in.x86 | 4 ++++ arch/Config.in.xtensa | 3 +++ 18 files changed, 55 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 5fc7137e5a..e012d121b9 100644 --- a/Makefile +++ b/Makefile @@ -437,22 +437,7 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) # Strip off the annoying quoting ARCH := $(call qstrip,$(BR2_ARCH)) - -KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ - -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/arcle/arc/ \ - -e s/arceb/arc/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/aarch64.*/arm64/ \ - -e s/nds32.*/nds32/ \ - -e s/or1k/openrisc/ \ - -e s/parisc64/parisc/ \ - -e s/powerpc64.*/powerpc/ \ - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/riscv.*/riscv/ \ - -e s/sh.*/sh/ \ - -e s/s390x/s390/ \ - -e s/microblazeel/microblaze/) +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) diff --git a/arch/Config.in b/arch/Config.in index c99af89efa..edf337f13e 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -328,6 +328,9 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_ARCH string +config BR2_KERNEL_ARCH + string + config BR2_ENDIAN string diff --git a/arch/Config.in.arc b/arch/Config.in.arc index f7a6d920b5..cc55c9e68f 100644 --- a/arch/Config.in.arc +++ b/arch/Config.in.arc @@ -62,6 +62,9 @@ config BR2_ARCH default "arc" if BR2_arcle default "arceb" if BR2_arceb +config BR2_KERNEL_ARCH + default "arc" + config BR2_arc bool default y if BR2_arcle || BR2_arceb diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 4c0910e4f8..0f50512fad 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -822,6 +822,10 @@ config BR2_ARCH default "aarch64" if BR2_aarch64 default "aarch64_be" if BR2_aarch64_be +config BR2_KERNEL_ARCH + default "arm" if BR2_arm || BR2_armeb + default "arm64" if BR2_aarch64 || BR2_aarch64_be + config BR2_ENDIAN default "LITTLE" if (BR2_arm || BR2_aarch64) default "BIG" if (BR2_armeb || BR2_aarch64_be) diff --git a/arch/Config.in.csky b/arch/Config.in.csky index 7e2029f759..df9e7ab75b 100644 --- a/arch/Config.in.csky +++ b/arch/Config.in.csky @@ -39,6 +39,9 @@ config BR2_GCC_TARGET_FLOAT_ABI config BR2_ARCH default "csky" +config BR2_KERNEL_ARCH + default "csky" + config BR2_ENDIAN default "LITTLE" diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k index 275f47f1d3..7f3aec7232 100644 --- a/arch/Config.in.m68k +++ b/arch/Config.in.m68k @@ -1,6 +1,9 @@ config BR2_ARCH default "m68k" if BR2_m68k +config BR2_KERNEL_ARCH + default "m68k" + config BR2_ENDIAN default "BIG" diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze index 5fe2906d40..52aa252a2c 100644 --- a/arch/Config.in.microblaze +++ b/arch/Config.in.microblaze @@ -2,6 +2,9 @@ config BR2_ARCH default "microblazeel" if BR2_microblazeel default "microblaze" if BR2_microblazebe +config BR2_KERNEL_ARCH + default "microblaze" + config BR2_ENDIAN default "LITTLE" if BR2_microblazeel default "BIG" if BR2_microblazebe diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 619456c2d5..b4923f8484 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -235,6 +235,9 @@ config BR2_ARCH default "mips64" if BR2_mips64 default "mips64el" if BR2_mips64el +config BR2_KERNEL_ARCH + default "mips" + config BR2_ENDIAN default "LITTLE" if BR2_mipsel || BR2_mips64el default "BIG" if BR2_mips || BR2_mips64 diff --git a/arch/Config.in.nds32 b/arch/Config.in.nds32 index 322ff49f2e..61fc346260 100644 --- a/arch/Config.in.nds32 +++ b/arch/Config.in.nds32 @@ -1,6 +1,9 @@ config BR2_ARCH default "nds32le" +config BR2_KERNEL_ARCH + default "nds32" + config BR2_GCC_TARGET_ARCH default "v3" diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2 index aae435fa17..c77b1a1c59 100644 --- a/arch/Config.in.nios2 +++ b/arch/Config.in.nios2 @@ -1,6 +1,9 @@ config BR2_ARCH default "nios2" +config BR2_KERNEL_ARCH + default "nios2" + config BR2_ENDIAN default "LITTLE" diff --git a/arch/Config.in.or1k b/arch/Config.in.or1k index abdf498fb8..ef1bded453 100644 --- a/arch/Config.in.or1k +++ b/arch/Config.in.or1k @@ -1,6 +1,9 @@ config BR2_ARCH default "or1k" +config BR2_KERNEL_ARCH + default "openrisc" + config BR2_ENDIAN default "BIG" diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index ba56c9c721..33b2471cf9 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -157,6 +157,9 @@ config BR2_ARCH default "powerpc64" if BR2_powerpc64 default "powerpc64le" if BR2_powerpc64le +config BR2_KERNEL_ARCH + default "powerpc" + config BR2_ENDIAN default "BIG" if BR2_powerpc || BR2_powerpc64 default "LITTLE" if BR2_powerpc64le diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv index e6436d7c39..1a008a935d 100644 --- a/arch/Config.in.riscv +++ b/arch/Config.in.riscv @@ -118,6 +118,9 @@ config BR2_ARCH default "riscv32" if !BR2_ARCH_IS_64 default "riscv64" if BR2_ARCH_IS_64 +config BR2_KERNEL_ARCH + default "riscv" + config BR2_ENDIAN default "LITTLE" diff --git a/arch/Config.in.s390x b/arch/Config.in.s390x index ad866b421e..bf4b70f957 100644 --- a/arch/Config.in.s390x +++ b/arch/Config.in.s390x @@ -17,6 +17,9 @@ endchoice config BR2_ARCH default "s390x" if BR2_s390x +config BR2_KERNEL_ARCH + default "s390" + config BR2_ENDIAN default "BIG" diff --git a/arch/Config.in.sh b/arch/Config.in.sh index b5cce18e22..fde42dfce2 100644 --- a/arch/Config.in.sh +++ b/arch/Config.in.sh @@ -24,6 +24,9 @@ config BR2_ARCH default "sh4a" if BR2_sh4a default "sh4aeb" if BR2_sh4aeb +config BR2_KERNEL_ARCH + default "sh" + config BR2_ENDIAN default "LITTLE" if BR2_sh4 || BR2_sh4a default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc index 4c4dc61745..b91df6892b 100644 --- a/arch/Config.in.sparc +++ b/arch/Config.in.sparc @@ -21,6 +21,10 @@ config BR2_ARCH default "sparc" if BR2_sparc default "sparc64" if BR2_sparc64 +config BR2_KERNEL_ARCH + default "sparc" if BR2_sparc + default "sparc64" if BR2_sparc64 + config BR2_ENDIAN default "BIG" diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0ba9ecbcea..b38d0f8106 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -337,6 +337,10 @@ config BR2_ARCH default "i686" if BR2_x86_athlon_4 default "x86_64" if BR2_x86_64 +config BR2_KERNEL_ARCH + default "i386" if !BR2_x86_64 + default "x86_64" if BR2_x86_64 + config BR2_ENDIAN default "LITTLE" diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index a79d906985..acc340eca6 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -48,6 +48,9 @@ config BR2_ENDIAN config BR2_ARCH default "xtensa" if BR2_xtensa +config BR2_KERNEL_ARCH + default "xtensa" + config BR2_READELF_ARCH_NAME default "Tensilica Xtensa Processor" -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:00 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:00 +0100 Subject: [Buildroot] [PATCHv2 2/7] core: introduce NORMALIZED_ARCH as non-kernel replacement for KERNEL_ARCH In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-3-patrickdepinguin@gmail.com> From: Thomas De Schampheleire The variable 'KERNEL_ARCH' is actually a normalized version of 'ARCH'/'BR2_ARCH'. For example, 'arcle' and 'arceb' both become 'arc', just as all powerpc variants become 'powerpc'. It is presumably called 'KERNEL_ARCH' because the Linux kernel is typically the first place where support for a new architecture is added, and thus is the entity that defines the normalized name. However, the term 'KERNEL_ARCH' can also be interpreted as 'the architecture used by the kernel', which need not be exactly the same as 'the normalized name for a certain arch'. In particular, for cases where a 64-bit architecture is running a 64-bit kernel but 32-bit userspace. Examples include: * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace In such cases, the 'architecture used by the kernel' needs to refer to the 64-bit name (aarch64, x86_64), whereas all userspace applications need to refer the, potentially normalized, 32-bit name. This means that there need to be two different variables: KERNEL_ARCH: the architecture used by the kernel NORMALIZED_ARCH: the normalized name for the current userspace architecture At this moment, both will actually have the same content. But a subsequent patch will add basic support for situations described above, in which KERNEL_ARCH may become overwritten to the 64-bit architecture, while NORMALIZED_ARCH needs to remain the same (32-bit) case. This commit replaces use of KERNEL_ARCH where actually the userspace arch is needed. Places that use KERNEL_ARCH in combination with building of kernel modules are not touched. There may be cases where a package builds both a kernel module as userspace, in which case it may need to know about both KERNEL_ARCH and NORMALIZED_ARCH, for the case where they differ. But this is to be fixed on a per-need basis. Signed-off-by: Thomas De Schampheleire Reviewed-by: Romain Naour --- Makefile | 1 + boot/barebox/barebox.mk | 10 +++++----- boot/uboot/uboot.mk | 6 +++--- package/busybox/busybox.mk | 2 +- package/environment-setup/environment-setup.mk | 2 +- package/kvmtool/kvmtool.mk | 4 ++-- package/libselinux/libselinux.mk | 2 +- package/linux-tools/linux-tool-perf.mk.in | 4 ++-- package/linux-tools/linux-tool-selftests.mk.in | 6 +++--- package/olsr/olsr.mk | 4 ++-- package/pciutils/pciutils.mk | 2 +- package/uboot-tools/uboot-tools.mk | 10 +++++----- 12 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index e012d121b9..c130eb61c6 100644 --- a/Makefile +++ b/Makefile @@ -437,6 +437,7 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) # Strip off the annoying quoting ARCH := $(call qstrip,$(BR2_ARCH)) +NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) ZCAT := $(call qstrip,$(BR2_ZCAT)) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 8f02f9f9e1..6506294d6d 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -59,16 +59,16 @@ ifneq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) $(1)_INSTALL_TARGET = NO endif -ifeq ($$(KERNEL_ARCH),i386) +ifeq ($$(NORMALIZED_ARCH),i386) $(1)_ARCH = x86 -else ifeq ($$(KERNEL_ARCH),x86_64) +else ifeq ($$(NORMALIZED_ARCH),x86_64) $(1)_ARCH = x86 -else ifeq ($$(KERNEL_ARCH),powerpc) +else ifeq ($$(NORMALIZED_ARCH),powerpc) $(1)_ARCH = ppc -else ifeq ($$(KERNEL_ARCH),arm64) +else ifeq ($$(NORMALIZED_ARCH),arm64) $(1)_ARCH = arm else -$(1)_ARCH = $$(KERNEL_ARCH) +$(1)_ARCH = $$(NORMALIZED_ARCH) endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 574fc7089a..49ebf42800 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -143,12 +143,12 @@ endif # The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm', so # we have to special case it. Similar for i386/x86_64 -> x86 -ifeq ($(KERNEL_ARCH),arm64) +ifeq ($(NORMALIZED_ARCH),arm64) UBOOT_ARCH = arm -else ifneq ($(filter $(KERNEL_ARCH),i386 x86_64),) +else ifneq ($(filter $(NORMALIZED_ARCH),i386 x86_64),) UBOOT_ARCH = x86 else -UBOOT_ARCH = $(KERNEL_ARCH) +UBOOT_ARCH = $(NORMALIZED_ARCH) endif UBOOT_MAKE_OPTS += \ diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60ebc4985f..75e57ba53f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -95,7 +95,7 @@ BUSYBOX_MAKE_OPTS = \ NM="$(TARGET_NM)" \ RANLIB="$(TARGET_RANLIB)" \ CC="$(TARGET_CC)" \ - ARCH=$(KERNEL_ARCH) \ + ARCH=$(NORMALIZED_ARCH) \ PREFIX="$(TARGET_DIR)" \ EXTRA_LDFLAGS="$(BUSYBOX_LDFLAGS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk index f4c52921f7..29ec5a9a95 100644 --- a/package/environment-setup/environment-setup.mk +++ b/package/environment-setup/environment-setup.mk @@ -11,7 +11,7 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS for var in $(TARGET_CONFIGURE_OPTS); do \ printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ done - printf "export \"ARCH=$(KERNEL_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) + printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE) printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index 2984817c7e..df6ae7e0f1 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -25,11 +25,11 @@ KVMTOOL_MAKE_OPTS = \ WERROR=0 define KVMTOOL_BUILD_CMDS - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) + $(TARGET_MAKE_ENV) ARCH=$(NORMALIZED_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) endef define KVMTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) ARCH=$(NORMALIZED_ARCH) $(MAKE) -C $(@D) \ $(KVMTOOL_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) prefix=/usr endef diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index c1e90130d2..5790e79040 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -18,7 +18,7 @@ LIBSELINUX_INSTALL_STAGING = YES # we won't have to use a relative path in 0002-revert-ln-relative.patch LIBSELINUX_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ - ARCH=$(KERNEL_ARCH) \ + ARCH=$(NORMALIZED_ARCH) \ SHLIBDIR=/usr/lib LIBSELINUX_MAKE_INSTALL_TARGETS = install diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index efa747cf8d..4e28129f50 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -8,10 +8,10 @@ LINUX_TOOLS += perf PERF_DEPENDENCIES = host-flex host-bison -ifeq ($(KERNEL_ARCH),x86_64) +ifeq ($(NORMALIZED_ARCH),x86_64) PERF_ARCH=x86 else -PERF_ARCH=$(KERNEL_ARCH) +PERF_ARCH=$(NORMALIZED_ARCH) endif PERF_MAKE_FLAGS = \ diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in index c4e5bf0fea..b824c11bd6 100644 --- a/package/linux-tools/linux-tool-selftests.mk.in +++ b/package/linux-tools/linux-tool-selftests.mk.in @@ -6,13 +6,13 @@ LINUX_TOOLS += selftests -ifeq ($(KERNEL_ARCH),x86_64) +ifeq ($(NORMALIZED_ARCH),x86_64) SELFTESTS_ARCH=x86 else -ifeq ($(KERNEL_ARCH),i386) +ifeq ($(NORMALIZED_ARCH),i386) SELFTESTS_ARCH=x86 else -SELFTESTS_ARCH=$(KERNEL_ARCH) +SELFTESTS_ARCH=$(NORMALIZED_ARCH) endif endif diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index b2c8e7e001..4ad88991f2 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -27,10 +27,10 @@ OLSR_PLUGINS += pud endif define OLSR_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(NORMALIZED_ARCH) \ CFLAGS="$(OLSR_CFLAGS)" -C $(@D) olsrd $(foreach p,$(OLSR_PLUGINS), \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(NORMALIZED_ARCH) \ CFLAGS="$(OLSR_CFLAGS)" -C $(@D)/lib/$(p) ) endef diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 9b83b62b55..67defcc743 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -12,7 +12,7 @@ PCIUTILS_LICENSE = GPL-2.0+ PCIUTILS_LICENSE_FILES = COPYING PCIUTILS_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ - HOST="$(KERNEL_ARCH)-linux" \ + HOST="$(NORMALIZED_ARCH)-linux" \ OPT="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ DNS=no \ diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 37e329a2af..26450b7adf 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -224,14 +224,14 @@ $(eval $(host-generic-package)) MKIMAGE = $(HOST_DIR)/bin/mkimage # mkimage supports alpha arc arm arm64 blackfin ia64 invalid m68k microblaze mips mips64 nds32 nios2 or1k powerpc riscv s390 sandbox sh sparc sparc64 x86 x86_64 xtensa -# KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa +# NORMALIZED_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa # For i386, we need to convert # For openrisc, we need to convert -# For others, we'll just keep KERNEL_ARCH -ifeq ($(KERNEL_ARCH),i386) +# For others, we'll just keep NORMALIZED_ARCH +ifeq ($(NORMALIZED_ARCH),i386) MKIMAGE_ARCH = x86 -else ifeq ($(KERNEL_ARCH),openrisc) +else ifeq ($(NORMALIZED_ARCH),openrisc) MKIMAGE_ARCH = or1k else -MKIMAGE_ARCH = $(KERNEL_ARCH) +MKIMAGE_ARCH = $(NORMALIZED_ARCH) endif -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:01 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:01 +0100 Subject: [Buildroot] [PATCHv2 3/7] core: introduce BR2_KERNEL_ARCH_OVERRIDE In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-4-patrickdepinguin@gmail.com> From: Thomas De Schampheleire There are cases where a 64-bit architecture is running a 64-bit kernel but 32-bit userspace. Examples include: * aarch64 architecture, with aarch64 kernel and 32-bit (ARM) userspace * x86_64 architecture, with x86_64 kernel and 32-bit (i386) userspace In Buildroot, the ARCH/BR2_ARCH and NORMALIZED_ARCH variables will refer to the 32-bit architecture, but the kernel needs to be built with the 64-bit architecture. Make it possible to define the correct architecture to be used for the kernel, in a new config option 'BR2_KERNEL_ARCH_OVERRIDE'. The user is expected to know the valid values. Signed-off-by: Thomas De Schampheleire --- Makefile | 4 ++++ arch/Config.in | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Makefile b/Makefile index c130eb61c6..85b91338a5 100644 --- a/Makefile +++ b/Makefile @@ -438,7 +438,11 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) # Strip off the annoying quoting ARCH := $(call qstrip,$(BR2_ARCH)) NORMALIZED_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),) KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH)) +else +KERNEL_ARCH := $(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)) +endif ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) diff --git a/arch/Config.in b/arch/Config.in index edf337f13e..6d8e2dfd7f 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -331,6 +331,21 @@ config BR2_ARCH config BR2_KERNEL_ARCH string +config BR2_KERNEL_ARCH_OVERRIDE + string "Kernel architecture override" + help + Normally, the correct kernel architecture value is derived + from the selected architecture, and you should keep this + option empty. + However, there are cases where you may want to enter a custom + value, for example when using a 64-bit architecture but + running userspace in 32-bit mode. + As an example, in case of an x86_64 processor where you want + 32-bit userspace, BR2_ARCH will be 'i386'/'i486'/'i686' and + BR2_KERNEL_ARCH_OVERRIDE should be set to 'x86_64'. Note that + in this example you will also need a multilib toolchain and + pass '-m32' via BR2_TARGET_OPTIMIZATION. + config BR2_ENDIAN string -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:02 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:02 +0100 Subject: [Buildroot] [PATCHv2 4/7] perf: fix compilation in case of i386 userspace with x86_64 kernel In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-5-patrickdepinguin@gmail.com> From: Thomas De Schampheleire If a 64-bit kernel is combined with 32-bit userspace, and this is achieved via a multilib toolchain that defaults to 64-bit with '-m32' in BR2_TARGET_OPTIMIZATION, the '-ld' command will still default to 64-bit output. In this case, packages that use 'ld' directly need to be instructed to use the correct ABI via the '-m' parameter. 'perf' is one such package. Signed-off-by: Thomas De Schampheleire --- package/linux-tools/linux-tool-perf.mk.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index 4e28129f50..b84b5fd415 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -45,6 +45,9 @@ PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32ltsmipn32" else PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf64ltsmip" endif +# case for x86 toolchain that defaults to 64-bit output +else ifeq ($(BR2_i386):$(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),y:x86_64) +PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf_i386" endif # The call to backtrace() function fails for ARC, because for some -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:03 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:03 +0100 Subject: [Buildroot] [PATCHv2 5/7] package/qemu: add support for overridden KERNEL_ARCH=x86_64 In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-6-patrickdepinguin@gmail.com> From: Thomas De Schampheleire When the kernel architecture is overridden via BR2_KERNEL_ARCH_OVERRIDE, this has an impact on the required architecture for qemu-system. The correct architecture for Qemu is currently determined based on ARCH, not KERNEL_ARCH. For example, while KERNEL_ARCH is 'powerpc' for all PowerPC variants, ARCH may be powerpc, powerpc64 or powerpc64le. And this translates to ppc, ppc64 and ppc64le for Qemu. This means that it is not generically possible to determine the Qemu architecture based on KERNEL_ARCH alone. For now, already handle the case of x86_64. Signed-off-by: Thomas De Schampheleire --- package/qemu/qemu.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index e69e813059..bcf684e615 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -302,6 +302,9 @@ endif ifeq ($(HOST_QEMU_ARCH),sh4aeb) HOST_QEMU_ARCH = sh4eb endif +ifeq ($(call qstrip,$(BR2_KERNEL_ARCH_OVERRIDE)),x86_64) +HOST_QEMU_SYS_ARCH = x86_64 +endif HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) HOST_QEMU_CFLAGS = $(HOST_CFLAGS) -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:04 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:04 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-7-patrickdepinguin@gmail.com> From: Thomas De Schampheleire Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. Signed-off-by: Thomas De Schampheleire --- Note that the defconfig refers to a toolchain at autobuild.buildroot.org, but is not yet present at that location. I uploaded the toolchain temporarily to: http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz md5sum:b085c0d8f137c078f8f09d116d8364f8 sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 board/qemu/x86_multilib/linux.config | 57 +++++++++++++++++++++++++++ board/qemu/x86_multilib/post-build.sh | 11 ++++++ board/qemu/x86_multilib/readme.txt | 7 ++++ configs/qemu_x86_multilib_defconfig | 26 ++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 board/qemu/x86_multilib/linux.config create mode 100755 board/qemu/x86_multilib/post-build.sh create mode 100644 board/qemu/x86_multilib/readme.txt create mode 100644 configs/qemu_x86_multilib_defconfig diff --git a/board/qemu/x86_multilib/linux.config b/board/qemu/x86_multilib/linux.config new file mode 100644 index 0000000000..0ea9e53a06 --- /dev/null +++ b/board/qemu/x86_multilib/linux.config @@ -0,0 +1,57 @@ +CONFIG_SYSVIPC=y +# CONFIG_USELIB is not set +CONFIG_CGROUPS=y +CONFIG_SMP=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_IA32_EMULATION=y +# CONFIG_COMPAT_32BIT_TIME is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_WIRELESS is not set +CONFIG_PCI=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_NE2K_PCI=y +CONFIG_8139CP=y +# CONFIG_WLAN is not set +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_DRM=y +CONFIG_DRM_QXL=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_DRM_BOCHS=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_HDA_INTEL=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_EXT4_FS=y +CONFIG_AUTOFS4_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/board/qemu/x86_multilib/post-build.sh b/board/qemu/x86_multilib/post-build.sh new file mode 100755 index 0000000000..bf83a002c2 --- /dev/null +++ b/board/qemu/x86_multilib/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -u +set -e + +# Add a console on tty1 +if [ -e ${TARGET_DIR}/etc/inittab ]; then + grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ + sed -i '/GENERIC_SERIAL/a\ +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab +fi diff --git a/board/qemu/x86_multilib/readme.txt b/board/qemu/x86_multilib/readme.txt new file mode 100644 index 0000000000..fbc8ae9a6a --- /dev/null +++ b/board/qemu/x86_multilib/readme.txt @@ -0,0 +1,7 @@ +Run the emulation with: + + qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user # qemu_x86_multilib_defconfig + +Optionally add -smp N to emulate a SMP system with N CPUs. + +The login prompt will appear in the graphical window. diff --git a/configs/qemu_x86_multilib_defconfig b/configs/qemu_x86_multilib_defconfig new file mode 100644 index 0000000000..1c3a8179c1 --- /dev/null +++ b/configs/qemu_x86_multilib_defconfig @@ -0,0 +1,26 @@ +BR2_KERNEL_ARCH_OVERRIDE="x86_64" +BR2_x86_core2=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz" +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-multilib-linux-gnu" +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_15=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TARGET_OPTIMIZATION="-m32" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_multilib/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_multilib/linux.config" +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -- 2.32.0 From patrickdepinguin at gmail.com Sat Jan 15 20:03:05 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Sat, 15 Jan 2022 21:03:05 +0100 Subject: [Buildroot] [PATCHv2 7/7] linux/linux.mk: correct LINUX_ARCH_PATH for sparc64 In-Reply-To: <20220115200306.14037-1-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> Message-ID: <20220115200306.14037-8-patrickdepinguin@gmail.com> From: Thomas De Schampheleire Buildroot uses variable LINUX_ARCH_PATH to refer to the arch-specific directory in the Linux tree, which may not necessarily be arch/$(KERNEL_ARCH). Buildroot already accounts for the case of KERNEL_ARCH=i386 and KERNEL_ARCH=x86_64, but does not for KERNEL_ARCH=sparc64, in which case the correct directory is arch/sparc. Reported-by: Romain Naour Signed-off-by: Thomas De Schampheleire --- linux/linux.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index dd2eebd446..35e2484588 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -242,6 +242,8 @@ ifeq ($(KERNEL_ARCH),i386) LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86 else ifeq ($(KERNEL_ARCH),x86_64) LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86 +else ifeq ($(KERNEL_ARCH),sparc64) +LINUX_ARCH_PATH = $(LINUX_DIR)/arch/sparc else LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH) endif -- 2.32.0 From gilles.talis at gmail.com Sat Jan 15 20:19:19 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sat, 15 Jan 2022 21:19:19 +0100 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220113224531.6f9ac64a@windsurf> References: <20211024113931.88898-1-gilles.talis@gmail.com> <20220113224531.6f9ac64a@windsurf> Message-ID: Hello Thomas, Thanks for the review. Le jeu. 13 janv. 2022 ? 22:45, Thomas Petazzoni a ?crit : > > Hello Gilles, > > On Sun, 24 Oct 2021 13:39:31 +0200 > Gilles Talis wrote: > > > The NanoPi R2S is a FriendlyElec mini-router based on: > > > > - Rockchip RK3328 SoC > > - 1GB (or 2GB) DDR4 RAM > > - Gigabit Ethernet (WAN) > > - Gigabit Ethernet (USB3) (LAN) > > - USB 2.0 Host Port > > - MicroSD slot > > - Reset button > > - WAN - LAN - SYS LED > > > > https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 > > > > Signed-off-by: Gilles Talis > > This obviously looks very good, but there is one question: could you > drop the VFAT partition, and have the kernel, DTB and extlinux.conf be > directly in the ext4 partition, with U-Boot loading them from the ext4 > partition directly? > > This would simplify things a bit. Good suggestion. I will do that and send a v2 shortly. > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Thanks! Gilles From yann.morin.1998 at free.fr Sat Jan 15 20:23:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 15 Jan 2022 21:23:03 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <737f135e-b936-a21c-8775-349d7db7fb88@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> <20220115143344.12319-2-romain.naour@gmail.com> <20220115160517.GQ1945846@scaer> <737f135e-b936-a21c-8775-349d7db7fb88@gmail.com> Message-ID: <20220115202303.GA2216429@scaer> Romain, All, On 2022-01-15 20:28 +0100, Romain Naour spake thusly: > Le 15/01/2022 ? 17:05, Yann E. MORIN a ?crit?: > > On 2022-01-15 15:33 +0100, Romain Naour spake thusly: > >> As for the Buildroot testsuite, multiply every emulator timeout by 10 > >> to avoid sporadic failures in elastic runners. > >> > >> qemu_arm_vexpress_tz_defconfig tested locally with sucess. > >> > >> Fixes: > >> https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 > > Are you sure increasing the timeout will fix this failure? The > > build-run.log contains another error: [--SNIP--] > > ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) > > Using Device Tree in place at 40000000, end 400051f7 > > So, to me, this is not a timeout issue, but an actual boot issue. > > The system stop in the middle of optee startup > optee: dynamic shared memory is enabled I was very confused by the above. Indeed, the log file I downladed earler really stopped at the error message I pasted. I am sure of that, as I still had it in my ~/tmp directory, so I could really double-check. But now I downloaded it again, and indeed, there are much more traces, up to that optee issue you point ed at. This is a really weird situation, that the download I had was only partial... > Also, I got the same error message while testing locally. But testing locally should not have the same impact on boot time, would it? The boot times out on the eleastic runners because they are too slow (and many congtainers contend for the CPU there). But locally, it is really surprising that you hit the exact same timeout issue, and the exact same point in the boot sequence... Anyway, can you resend your patch, as I marked it rejected in patchwork, please? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From gilles.talis at gmail.com Sat Jan 15 20:26:17 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sat, 15 Jan 2022 21:26:17 +0100 Subject: [Buildroot] [PATCH v2] configs/friendlyarm_nanopi_r2s: new defconfig Message-ID: <20220115202617.370414-1-gilles.talis@gmail.com> The NanoPi R2S is a FriendlyElec mini-router based on: - Rockchip RK3328 SoC - 1GB (or 2GB) DDR4 RAM - Gigabit Ethernet (WAN) - Gigabit Ethernet (USB3) (LAN) - USB 2.0 Host Port - MicroSD slot - Reset button - WAN - LAN - SYS LED https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 Signed-off-by: Gilles Talis --- DEVELOPERS | 2 + board/friendlyarm/nanopi-r2s/extlinux.conf | 4 ++ board/friendlyarm/nanopi-r2s/genimage.cfg | 22 +++++++++ board/friendlyarm/nanopi-r2s/post-build.sh | 5 ++ board/friendlyarm/nanopi-r2s/readme.txt | 57 ++++++++++++++++++++++ configs/friendlyarm_nanopi_r2s_defconfig | 34 +++++++++++++ 6 files changed, 124 insertions(+) create mode 100644 board/friendlyarm/nanopi-r2s/extlinux.conf create mode 100644 board/friendlyarm/nanopi-r2s/genimage.cfg create mode 100755 board/friendlyarm/nanopi-r2s/post-build.sh create mode 100644 board/friendlyarm/nanopi-r2s/readme.txt create mode 100644 configs/friendlyarm_nanopi_r2s_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..ca52c0cff2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1073,7 +1073,9 @@ F: configs/qemu_* N: Gilles Talis F: board/freescale/imx8mmevk/ +F: board/friendlyarm/nanopi-r2s/ F: configs/freescale_imx8mmevk_defconfig +F: configs/friendlyarm_nanopi_r2s_defconfig F: package/cctz/ F: package/faad2/ F: package/fdk-aac/ diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf new file mode 100644 index 0000000000..1ea0cdd8a5 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf @@ -0,0 +1,4 @@ +label NanoPi R2S linux + kernel /boot/Image + devicetree /boot/rk3328-nanopi-r2s.dtb + append root=/dev/mmcblk0p1 rw rootwait diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg new file mode 100644 index 0000000000..a686b4f14e --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "idbloader.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot.itb" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + offset = 16M + image = "rootfs.ext4" + } +} diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh new file mode 100755 index 0000000000..1f5ff6a611 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt new file mode 100644 index 0000000000..6d291cdd60 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/readme.txt @@ -0,0 +1,57 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Nanopi R2S. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Nanopi R2S link: +https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 + +This configuration uses ATF, U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_r2s_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +Files created in output directory +================================= + +output/images + +??? bl31.elf +??? boot.vfat +??? extlinux +??? idbloader.img +??? Image +??? rk3328-nanopi-r2s.dtb +??? rootfs.ext2 +??? rootfs.ext4 -> rootfs.ext2 +??? rootfs.tar +??? sdcard.img +??? u-boot.bin +??? u-boot.itb + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Nanopi R2S and power it up. The console +is on the serial line, 1500000 8N1. + +Notes +===== + +This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig new file mode 100644 index 0000000000..a167a39898 --- /dev/null +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -0,0 +1,34 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" +BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.32.0 From james.hilliard1 at gmail.com Sat Jan 15 21:11:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 15 Jan 2022 14:11:12 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220115211112.3224696-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. This fixes some build errors with per-package directories such as: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 Signed-off-by: James Hilliard --- Changes v1 -> v2: - add some missing overrides to qt.conf.in --- package/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 2 ++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..c92f52ced0 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,21 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Tests=@@STAGING_DIR@@/usr/lib/qt/tests +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +Documentation=@@STAGING_DIR@@/doc +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +Settings=@@STAGING_DIR@@/etc +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..6c05e710d8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ -- 2.25.1 From gilles.talis at gmail.com Sat Jan 15 21:14:49 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sat, 15 Jan 2022 22:14:49 +0100 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3_493 Message-ID: <20220115211449.393250-1-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/iozone/iozone.hash | 2 +- package/iozone/iozone.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 1255392e38..9ecf1d1af8 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 93c9142d61e6a71ea43b0a266bad7f49f07ce5f5d31b36f8edf4dd386795c483 iozone3_492.tgz +sha256 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 iozone3_493.tgz diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 2282a44eb8..2df4a2aa84 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,7 +4,7 @@ # ################################################################################ -IOZONE_VERSION = 3.492 +IOZONE_VERSION = 3.493 IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) -- 2.32.0 From ps.report at gmx.net Sat Jan 15 22:37:36 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 15 Jan 2022 23:37:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220112203939.606775-1-james.hilliard1@gmail.com> References: <20220112203939.606775-1-james.hilliard1@gmail.com> Message-ID: <20220115233736.634f0d0b@gmx.net> Hello James, *, On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > Currently the qmake gcc sysrootify path logic causes issues with > per-package directories, disable automatic gcc sysroot for qt5base > install and override all qt.conf paths manually to point to their > correct locations. > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > instead of the HOST_DIR for cross compilation to work. > > Signed-off-by: James Hilliard > --- > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > package/qt5/qt5base/qt5base.mk | 2 ++ > 2 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > index 2215cbd4e1..db9ab0c364 100644 > --- a/package/qt5/qt5base/qt.conf.in > +++ b/package/qt5/qt5base/qt.conf.in > @@ -2,6 +2,18 @@ > Prefix=/usr > HostPrefix=@@HOST_DIR@@ > Sysroot=@@STAGING_DIR@@ > -Headers=/usr/include/qt5 > -Plugins=/usr/lib/qt/plugins > -Examples=/usr/lib/qt/examples > +SysrootifyPrefix=false > +Binaries=@@STAGING_DIR@@/usr/bin > +Libraries=@@STAGING_DIR@@/usr/lib > +Headers=@@STAGING_DIR@@/usr/include/qt5 > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > +Data=@@STAGING_DIR@@ > +Translations=@@STAGING_DIR@@/translations > +ArchData=@@STAGING_DIR@@/usr > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > +Imports=@@STAGING_DIR@@/usr/imports > +Qml2Imports=@@STAGING_DIR@@/usr/qml > +HostBinaries=@@HOST_DIR@@/bin > +HostLibraries=@@HOST_DIR@@/lib > +HostData=@@STAGING_DIR@@ > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index bcdf036f00..6c05e710d8 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > -v \ > -prefix /usr \ > -hostprefix $(HOST_DIR) \ > + -hostdatadir $(STAGING_DIR) \ > -headerdir /usr/include/qt5 \ > -sysroot $(STAGING_DIR) \ > + -no-gcc-sysroot \ > -plugindir /usr/lib/qt/plugins \ > -examplesdir /usr/lib/qt/examples \ > -no-rpath \ This one leads to the following compile failure for qt5webengine-5.15.2: .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory collect2: error: ld returned 1 exit status But the file crti.o exists: $ find . -name crti.o ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o Did not (yet) test with your latest (v2) patch iteration... Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage (see secoidt.h/pk11pub.h No such file or directory failure reported by already by Thomas)... Regards, Peter From ps.report at gmx.net Sat Jan 15 22:53:51 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 15 Jan 2022 23:53:51 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/qt5webengine: fix compile flags for arm In-Reply-To: <20220109150304.45e12aea@windsurf> References: <20200306203410.25008-1-ps.report@gmx.net> <20220109150304.45e12aea@windsurf> Message-ID: <20220115235351.744cbf77@gmx.net> Hello Thomas, On Sun, 9 Jan 2022 15:03:04 +0100, Thomas Petazzoni wrote: > Hello Peter, > > On Fri, 6 Mar 2020 21:34:09 +0100 > Peter Seiderer wrote: > > > The qt5webengine configure simple takes QT_ARCH ('arm') to determine the > > chromium compiler flags and uses some hard coded ARMv7 default values > > for the compiler command line: '... -march=armv7-a -mfloat-abi=hard > > -mtune=generic-armv7-a -mfpu=vfpv3-d16 ...'. > > > > This results e.g. in an illegal instruction failure for rpi zero > > (reported on the mailing list, see [1]). > > > > Disable all arm custom cpu flags (march/mfloat-abi/mtune/mfpu/mthumb) as > > these are already set by the compiler wrapper (via a patch to the chromium > > GN build system BUILD.gn file). > > > > Despite the patch set all known values in the chromium GN build > > system config file chromium/build/config/arm.gni to not disturb > > the compile defines settings logic. > > It's been a very long time since this patch was posted. Does the > problem still occur? There is a patch series from James Hilliard > upgrading qt5webengine: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=279766 Problem still exits with qt5webengine-5.15.2 and qt5webengine-5.15.8... > > Some more questions below. > > > +diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > +index d223a4f6f..16dec5c6a 100644 > > +--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > ++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > +@@ -672,7 +672,8 @@ config("compiler") { > > + # TODO(pcc): The contents of .ARM.attributes should be based on the > > + # -march flag passed at compile time (see llvm.org/pr36291). > > + if (current_cpu == "arm") { > > +- ldflags += [ "-march=$arm_arch" ] > > ++ # disabled for the buildroot compile > > ++ # ldflags += [ "-march=$arm_arch" ] > > + } > > + } > > + > > +@@ -752,13 +753,15 @@ config("compiler_cpu_abi") { > > + ldflags += [ "--target=arm-linux-gnueabihf" ] > > + } > > + if (!is_nacl) { > > +- cflags += [ > > +- "-march=$arm_arch", > > +- "-mfloat-abi=$arm_float_abi", > > +- ] > > ++ # disabled for the buildroot compile > > ++ # cflags += [ > > ++ # "-march=$arm_arch", > > ++ # "-mfloat-abi=$arm_float_abi", > > ++ # ] > > + } > > + if (arm_tune != "") { > > +- cflags += [ "-mtune=$arm_tune" ] > > ++ # disabled for the buildroot compile > > ++ # cflags += [ "-mtune=$arm_tune" ] > > + } > > + } else if (current_cpu == "arm64") { > > + if (is_clang && !is_android && !is_nacl && !is_fuchsia) { > > +@@ -1130,7 +1133,9 @@ config("clang_revision") { > > + > > + config("compiler_arm_fpu") { > > + if (current_cpu == "arm" && !is_ios && !is_nacl) { > > +- cflags = [ "-mfpu=$arm_fpu" ] > > ++ # disabled for the buildroot compile > > ++ # cflags = [ "-mfpu=$arm_fpu" ] > > ++ cflags = [] > > + asmflags = cflags > > + } > > + } > > +@@ -1138,7 +1143,9 @@ config("compiler_arm_fpu") { > > + config("compiler_arm_thumb") { > > + if (current_cpu == "arm" && arm_use_thumb && is_posix && > > + !(is_mac || is_ios || is_nacl)) { > > +- cflags = [ "-mthumb" ] > > ++ # disabled for the buildroot compile > > ++ # cflags = [ "-mthumb" ] > > ++ cflags = [] > > + if (is_android && !is_clang) { > > + # Clang doesn't support this option. > > + cflags += [ "-mthumb-interwork" ] > > You're fixing the problem for ARM, but is there some similar mess for > other CPU architectures? > > > +# configure arm architecture paramter for chromium compile > > +ifeq ($(BR2_arm),y) > > +ifeq ($(BR2_ARM_CPU_ARMV4),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > > + $(SED) 's/^ arm_version = 7$$/ arm_version = 4/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +ifeq ($(BR2_ARM_CPU_ARMV5),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > > + $(SED) 's/^ arm_version = 7$$/ arm_version = 5/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +ifeq ($(BR2_ARM_CPU_ARMV6),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > > + $(SED) 's/^ arm_version = 7$$/ arm_version = 6/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +# no entriy for BR2_ARM_CPU_ARMV7A/BR2_ARM_CPU_ARMV7M, arm_vesion = 7 is already set by default > > + > > +ifeq ($(BR2_ARM_CPU_ARMV8A),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_VERSION > > + $(SED) 's/^ arm_version = 7$$/ arm_version = 8/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +# not known by buildroot, set to some dummy to disable all default logic > > +define QT5WEBENGINE_CONFIGURE_ARM_ARCH > > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "arm-dummy-arch"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > + > > +define QT5WEBENGINE_CONFIGURE_ARM_FPU > > + $(SED) 's/^ arm_fpu = ""$$/ arm_fpu = $(BR2_GCC_TARGET_FPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > + > > +define QT5WEBENGINE_CONFIGURE_ARM_FLOAT_ABI > > + $(SED) 's/^ arm_float_abi = ""$$/ arm_float_abi = $(BR2_GCC_TARGET_FLOAT_ABI)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > + > > +define QT5WEBENGINE_CONFIGURE_ARM_TUNE > > + $(SED) 's/^ arm_tune = ""$$/ arm_tune = $(BR2_GCC_TARGET_CPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > + > > +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) > > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "true"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +else > > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "false"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > + > > +ifeq ($(BR2_ARM_CPU_HAS_THUMB),) > > +define QT5WEBENGINE_CONFIGURE_ARM_THUMB > > + $(SED) 's/^ arm_use_thumb = true$$/ arm_use_thumb = false/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > > +endef > > +endif > > +endif > > What are all those variables doing in the GN Chromium stuff? Setting compiler flags e.g. arm_use_thumb --> -mthumb arm_use_neon --> -DUSE_NEON and influences arm_fpu setting (if not already set)... > > I'm kind of worried by two aspects: > > - This is all very ARM specific, but we have other CPU architectures > supported in Buildroot Yes there is a although some x86/x64 logic setting e.g. -m32/-m64 and -msse2/-mfpmath=sse/-mmmx and some mips/ppc/s390 and more..., but did only take a deeper look at the arm part as the reported failure was about rpi-zero... > > - We already pass the proper CFLAGS, so it's always annoying to > duplicate this logic into package-specific flags Yes... ;-) Regards, Peter > > Thomas From ps.report at gmx.net Sat Jan 15 22:57:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 15 Jan 2022 23:57:58 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/qt5webengine: use buildroot cflags/ldflags for arm In-Reply-To: <20220109150359.1c4a717b@windsurf> References: <20200306203410.25008-1-ps.report@gmx.net> <20200306203410.25008-2-ps.report@gmx.net> <20220109150359.1c4a717b@windsurf> Message-ID: <20220115235758.069ce087@gmx.net> Hello Thomas, On Sun, 9 Jan 2022 15:03:59 +0100, Thomas Petazzoni wrote: > On Fri, 6 Mar 2020 21:34:10 +0100 > Peter Seiderer wrote: > > > +define QT5WEBENGINE_CONFIGURE_COMPILER_FLAGS > > + $(SED) 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))%g' $(@D)/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > + $(SED) 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))%g' $(@D)/src/3rdparty/chromium/build/config/compiler/BUILD.gn > > +endef > > This looks like a good thing. Could it replace the ARM-specific logic > you had in your PATCH 1/2 ? Not sure as there is more optional and/or compile defines logic depending on the various arm-options logic..., the save way seems to be the right setting of the various arm-options (but did not find a better way as to edit/sed the GN files... Regards, Peter > > Thomas From ps.report at gmx.net Sat Jan 15 23:03:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sun, 16 Jan 2022 00:03:04 +0100 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20220109142748.4f7c1a59@windsurf> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> <20220109142748.4f7c1a59@windsurf> Message-ID: <20220116000304.15e7dcf8@gmx.net> Hello Thomas, On Sun, 9 Jan 2022 14:27:48 +0100, Thomas Petazzoni wrote: > On Mon, 21 Dec 2020 21:39:51 +0100 > Peter Seiderer wrote: > > > - add optional host-freetype dependency > > > > Fixes: > > > > Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 > > Returned 1. > > stderr: > > > > Package freetype2 was not found in the pkg-config search path. > > Perhaps you should add the directory containing `freetype2.pc' > > to the PKG_CONFIG_PATH environment variable > > Package 'freetype2', required by 'virtual:world', not found > > Could not run pkg-config. > > > > See //build/linux/BUILD.gn:24:3: whence it was called. > > pkg_config("freetype_from_pkgconfig") { > > ^-------------------------------------- > > See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included. > > public_configs = [ "//build/linux:freetype_from_pkgconfig" ] > > ^-------------------------------------- > > Project ERROR: GN run error! > > make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 > > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 > > I am falling into this issue while building the following defconfig: > > BR2_arm=y > BR2_arm1176jzf_s=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_QT5WEBENGINE=y > BR2_PACKAGE_RPI_USERLAND=y > > Did you had the chance to investigate more deeply why having fontconfig > support in Qt leads qt5webengine wanting to find freetype2 on the host? The observation is that all (optional) qt target options are requested by qtwebengine for the host (and buildroot package fontconfig selects freetype)... Regards, Peter > > Thomas From ps.report at gmx.net Sat Jan 15 23:04:35 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sun, 16 Jan 2022 00:04:35 +0100 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20220109144430.1064ea1c@windsurf> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> <20220109142748.4f7c1a59@windsurf> <20220109144430.1064ea1c@windsurf> Message-ID: <20220116000435.03d5b920@gmx.net> Hello Thomas, On Sun, 9 Jan 2022 14:44:30 +0100, Thomas Petazzoni wrote: > On Sun, 9 Jan 2022 14:27:48 +0100 > Thomas Petazzoni wrote: > > > I am falling into this issue while building the following defconfig: > > > > BR2_arm=y > > BR2_arm1176jzf_s=y > > BR2_TOOLCHAIN_EXTERNAL=y > > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > > BR2_PACKAGE_QT5=y > > BR2_PACKAGE_QT5WEBENGINE=y > > BR2_PACKAGE_RPI_USERLAND=y > > > > Did you had the chance to investigate more deeply why having fontconfig > > support in Qt leads qt5webengine wanting to find freetype2 on the host? > > Interestingly, in commit > https://github.com/meta-qt5/meta-qt5/commit/280487f20bca829527a597d6263b0344a01917ac#diff-f0ffde666f6ff0282f8400203b3ba20968494d3c7245106eca761bd79baa1c78R26 > the meta-qt5 layer, when upgrading Qt to 5.15.2 added jpeg-native and > freetype-native as new unconditional dependencies. > > But there are no explanations. Is it really because the Chromium stuff > is building a host tool with freetype/jpeg, or is it just a workaround > for some incorrect behavior of the Chromium build process that needs > freetype/jpeg on the target, but checks for them on the host? Would say yes... Regards, Peter > > Thomas From james.hilliard1 at gmail.com Sun Jan 16 01:34:36 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 15 Jan 2022 18:34:36 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220115233736.634f0d0b@gmx.net> References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> Message-ID: On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > Hello James, *, > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > Currently the qmake gcc sysrootify path logic causes issues with > > per-package directories, disable automatic gcc sysroot for qt5base > > install and override all qt.conf paths manually to point to their > > correct locations. > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > instead of the HOST_DIR for cross compilation to work. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > package/qt5/qt5base/qt5base.mk | 2 ++ > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > index 2215cbd4e1..db9ab0c364 100644 > > --- a/package/qt5/qt5base/qt.conf.in > > +++ b/package/qt5/qt5base/qt.conf.in > > @@ -2,6 +2,18 @@ > > Prefix=/usr > > HostPrefix=@@HOST_DIR@@ > > Sysroot=@@STAGING_DIR@@ > > -Headers=/usr/include/qt5 > > -Plugins=/usr/lib/qt/plugins > > -Examples=/usr/lib/qt/examples > > +SysrootifyPrefix=false > > +Binaries=@@STAGING_DIR@@/usr/bin > > +Libraries=@@STAGING_DIR@@/usr/lib > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > +Data=@@STAGING_DIR@@ > > +Translations=@@STAGING_DIR@@/translations > > +ArchData=@@STAGING_DIR@@/usr > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > +Imports=@@STAGING_DIR@@/usr/imports > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > +HostBinaries=@@HOST_DIR@@/bin > > +HostLibraries=@@HOST_DIR@@/lib > > +HostData=@@STAGING_DIR@@ > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index bcdf036f00..6c05e710d8 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > -v \ > > -prefix /usr \ > > -hostprefix $(HOST_DIR) \ > > + -hostdatadir $(STAGING_DIR) \ > > -headerdir /usr/include/qt5 \ > > -sysroot $(STAGING_DIR) \ > > + -no-gcc-sysroot \ > > -plugindir /usr/lib/qt/plugins \ > > -examplesdir /usr/lib/qt/examples \ > > -no-rpath \ > > This one leads to the following compile failure for qt5webengine-5.15.2: > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > collect2: error: ld returned 1 exit status Hmm, I'll test that again. > > > But the file crti.o exists: > > $ find . -name crti.o > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > Did not (yet) test with your latest (v2) patch iteration... > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > Thomas)... Does qt5webengine build ok without per-package directories with just the KDE bump for all the other qt5 packages?: https://patchwork.ozlabs.org/project/buildroot/patch/20220113000935.2353800-1-james.hilliard1 at gmail.com/ I separated that out to make it easier to isolate the linker issues with the qt5webengine 5.15.8-lts build. > > Regards, > Peter From james.hilliard1 at gmail.com Sun Jan 16 04:05:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 15 Jan 2022 21:05:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webengine: fix build with glibc 2.34 Message-ID: <20220116040525.3007767-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 16 05:08:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 15 Jan 2022 22:08:57 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220115233736.634f0d0b@gmx.net> References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> Message-ID: On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > Hello James, *, > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > Currently the qmake gcc sysrootify path logic causes issues with > > per-package directories, disable automatic gcc sysroot for qt5base > > install and override all qt.conf paths manually to point to their > > correct locations. > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > instead of the HOST_DIR for cross compilation to work. > > > > Signed-off-by: James Hilliard > > --- > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > package/qt5/qt5base/qt5base.mk | 2 ++ > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > index 2215cbd4e1..db9ab0c364 100644 > > --- a/package/qt5/qt5base/qt.conf.in > > +++ b/package/qt5/qt5base/qt.conf.in > > @@ -2,6 +2,18 @@ > > Prefix=/usr > > HostPrefix=@@HOST_DIR@@ > > Sysroot=@@STAGING_DIR@@ > > -Headers=/usr/include/qt5 > > -Plugins=/usr/lib/qt/plugins > > -Examples=/usr/lib/qt/examples > > +SysrootifyPrefix=false > > +Binaries=@@STAGING_DIR@@/usr/bin > > +Libraries=@@STAGING_DIR@@/usr/lib > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > +Data=@@STAGING_DIR@@ > > +Translations=@@STAGING_DIR@@/translations > > +ArchData=@@STAGING_DIR@@/usr > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > +Imports=@@STAGING_DIR@@/usr/imports > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > +HostBinaries=@@HOST_DIR@@/bin > > +HostLibraries=@@HOST_DIR@@/lib > > +HostData=@@STAGING_DIR@@ > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index bcdf036f00..6c05e710d8 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > -v \ > > -prefix /usr \ > > -hostprefix $(HOST_DIR) \ > > + -hostdatadir $(STAGING_DIR) \ > > -headerdir /usr/include/qt5 \ > > -sysroot $(STAGING_DIR) \ > > + -no-gcc-sysroot \ > > -plugindir /usr/lib/qt/plugins \ > > -examplesdir /usr/lib/qt/examples \ > > -no-rpath \ > > This one leads to the following compile failure for qt5webengine-5.15.2: > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > collect2: error: ld returned 1 exit status So I was able to reproduce this error, however best I can tell it's probably not a regression as the compilation still fails due to a different error without this patch: ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned non-zero exit code. pkgresult = exec_script(pkg_config_script, args, "value") ^---------- Current dir: /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/core/release/ Command: /home/buildroot/buildroot/output/host/bin/python2 /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config libjpeg Returned 1. stderr: Package libjpeg was not found in the pkg-config search path. Perhaps you should add the directory containing `libjpeg.pc' to the PKG_CONFIG_PATH environment variable Package 'libjpeg', required by 'virtual:world', not found Could not run pkg-config. See //third_party/BUILD.gn:17:3: whence it was called. pkg_config("system_libjpeg") { ^----------------------------- See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused the file to be included. "//third_party:jpeg", ^------------------- Project ERROR: GN run error! > > > But the file crti.o exists: > > $ find . -name crti.o > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > Did not (yet) test with your latest (v2) patch iteration... > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > Thomas)... > > Regards, > Peter From thomas.petazzoni at bootlin.com Sun Jan 16 07:08:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 16 Jan 2022 07:08:52 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-15 Message-ID: <20220116070900.72EF04035F@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-15 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 58 | 8 | 0 | 66 | 2021.11.x | 30 | 4 | 0 | 34 | master | 115 | 55 | 0 | 170 | Classification of failures by reason for master ----------------------------------------------- host-riscv-isa-sim-1.1.0 | 10 rygel-0.40.2 | 7 frr-8.1 | 5 gvfs-1.48.1 | 4 bluez5_utils-5.63 | 2 mtd-2.1.3 | 2 nodejs-14.18.2 | 2 pcsc-lite-1.9.5 | 2 qt5webkit-5.212.0-alpha4 | 2 rtorrent-0.9.8 | 2 wavemon-0.9.4 | 2 apcupsd-3.14.14 | 1 bat-0.18.3 | 1 freeipmi-1.6.8 | 1 google-breakpad-7515ab13768... | 1 ksmbd-tools-3.4.3 | 1 libglvnd-1.3.2 | 1 libupnp-1.14.12 | 1 libv4l-1.22.1 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.3 | 1 mongodb-4.2.11 | 1 opencv4-4.5.5 | 1 php-apcu-5.1.20 | 1 powertop-2.13 | 1 pulseview-0.4.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/3f04df1b394b4b4707775f6bca8a6dee1b92367c | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/3076accd1738f88bda4b4c1040f4a720e3e60a3a | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/3f09bceb4988b61d8d8db1c4a91828c66d0725bc | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6631348b0500e297832b30ce3dc47838945899c9 | x86_64 | freeipmi-1.6.8 | NOK | http://autobuild.buildroot.net/results/5354f7231cf08bf762e7d86fca874ce63d9a116b | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/10fbdb17e1b11c1cc4652a7f8860cd6a570560be | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/30f84f949367794bb8cabd4d7d6e6ad7a5287295 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/96c36ea64c1c8009d003c85a5fa35c62c8a4c015 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8a945fd8873256a0108c6bdeec2b08c09c4c8c6a | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/6515cc7cce49ac91372f41813ed68ce356003199 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/9d9608456e3016e6918b6a0e71846623309583b6 | aarch64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/d703792607bb52e81efaf5ba6a0bd53b438400c4 | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/126471bbd80b2b00a49635a73d69a554ae2c8b70 | ORPH i586 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/d81c60adf9cb56b242bb1e60552ff5019feffcf6 | ORPH mips64el | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/8e6fbf48c83d92861e650ce22a812001aee51ce2 | ORPH powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/632f14d4a9980d28d0b1eb1104e2fa8a60727958 | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/b2d69ee063782ac1a0bab1832f53e92e3fdd1b65 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/3e04528eeb05b3fb5f49645b837c5bebc3b13eb1 | sh4 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/5f5fd961c5902e6e63e97f06d917359aa4f4a703 | microblazeel | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/4837aba2025d540eb423af6b3a1e3092ae53c481 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/753450247f18e6ec6e532bbe286a435f2fb4a5e4 | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/35024daa51f80dfdbddbcb2ab607e8d656634cb0 | powerpc64le | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/5395fb39ba0a1127a64345631c85addfb84c936f | aarch64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/855b66b86d979cc922b947da932b0e2388481263 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6af0710e3b4fb72e9208eaba23a84378e4f4c9c2 | x86_64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/c3f0279eac744888412da9970431c45872c6d8f9 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/2ca1a96233c998807c5525a2b6ba77747e6c0760 | ORPH or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/d144c7b9359559df0f366be57d8336941c4e8134 | arm | libv4l-1.22.1 | NOK | http://autobuild.buildroot.net/results/6e71769ab6539e0ca5350be34fda940b4e67ee8c | mips64el | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/bf2036ebcffa0956b71aca6221e73426e56d4817 | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/eddbe414cfa07221c89d9bc0a23b3622cf0dc39d | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/f428ee92e28669721bf7960bb11483d90545bfec | mips64el | mtd-2.1.3 | NOK | http://autobuild.buildroot.net/results/2ae5017a4bfbfd892a070ac47a8ff3a5fa658f4d | arm | mtd-2.1.3 | NOK | http://autobuild.buildroot.net/results/9409ebf6517db87672f3f4df5909a8ac4abfe8af | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/d302653549e9365c2ad4292c1e24d7e73485af51 | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/a004d6139acebc3f8fa8957c437130584fc1bb8a | mips64el | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/8185c9a7d593f0dae78d69a7637895185cd4deb4 | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/bdada9a881996704626e542efa052ddcadbac3f0 | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/7fbf83eb66c841a484943109c1f6df7ab4d25bdb | ORPH sparc | php-apcu-5.1.20 | NOK | http://autobuild.buildroot.net/results/efa3b4406f87a1e9521b66f392a6fa19ac01f0cd | or1k | powertop-2.13 | NOK | http://autobuild.buildroot.net/results/e9ec8a86237f186254b9b4f4650d1e2a8fba984d | x86_64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/ec72723d63f514da5001f97e048db899f3844516 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/351529f7d928e28fa2db22c6297dc70d21db562b | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed | m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/204381f47359ebe0d43ada1ad2a3bbc78bc3f2e7 | ORPH arc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/63493e456f0e4f87cb8fb03f2d3498460b24a11c | ORPH riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ac1d02637f69b3858067d2f0cf68e3c3717d6bf4 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6fa76fd24e43d80095480b5c9157473dca5d890f | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/27d96a09309f3666149299cd3043d0cb4e29185e | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/572d980f9f60fed45e0f722429b65cb0934be415 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/edfc7e088274415311741318cbb7099af75e101d | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/768b98327b70ffcf9a6e6827033a133b74c57cbc | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/99bd2b4ba871502a6df5db2aabc8c87f9b7226c3 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1581ee81ab4194083b714cd1631247a655f216ba | s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/4ddb9143bf60921cbfbd3268d467a989a4f648bc | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 4 gobject-introspection-1.64.1 | 1 openvmtools-10.3.5-10430147 | 1 rauc-1.5.1 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/1cb28988579e8267fd5781b3f232a65531abe4dc | ORPH arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/238862958dba1d6b7b576cbe0ebb0c9deb2845d8 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/16543b1f38b1c4a79e8d53f9043c5a3d6d249afa | microblazeel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4f319738882f053c46eff747d0edc4f035dfdb4a | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/804da91d362a7e9f47b1b57a5938c015583119dc | i586 | openvmtools-10.3.5-10430147 | NOK | http://autobuild.buildroot.net/results/24229bf032e11856a23f750c46796d8acd2aceeb | riscv32 | rauc-1.5.1 | NOK | http://autobuild.buildroot.net/results/15375cc1eb4f4a4351f9e15f163f3f59053a00d9 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/e0f352099102a21185b990d857bdd2419b7529cd | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 2 kismet-2021-08-R1 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/9019ca0e05554649775b78ea6189eb7500138620 | i586 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/a2d13f21109888f387021cfc3adbe6e92ccf33f8 | m68k | kismet-2021-08-R1 | NOK | http://autobuild.buildroot.net/results/54845d7ff2e6866fb54dad5b6b9f3d65afbd6530 | ORPH arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a27d6e7dce06085b6a411d3b47b360d7fbcabc9c | Gitlab CI results for 2022-01-15 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083640 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083642 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083643 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083644 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083647 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083648 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083655 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083656 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083657 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083660 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083662 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083664 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083667 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083669 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083671 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083672 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083675 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083679 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083680 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083683 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083685 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083687 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083689 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083691 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083692 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083693 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083696 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083699 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083700 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083703 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083707 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083709 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083711 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083713 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083715 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083716 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083718 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083721 | cubieboard2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083722 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083723 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083724 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083725 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083727 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083728 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083758 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083760 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083761 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083763 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083764 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083765 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083769 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083771 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083776 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083772 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083774 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083777 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083779 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083781 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083794 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083828 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083833 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083852 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083854 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083859 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083862 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083864 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083868 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083871 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083874 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083877 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083882 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083893 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083949 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083973 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083986 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083991 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083992 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083999 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084001 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084006 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084007 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084011 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084018 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084024 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084028 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084122 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084135 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084136 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084144 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084147 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084152 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084154 | roseapplepi | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084158 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084162 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084166 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084170 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084174 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084179 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084185 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084186 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084214 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084219 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084225 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084235 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084237 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084239 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084243 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084248 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084251 | -- http://autobuild.buildroot.net From gilles.talis at gmail.com Sun Jan 16 08:50:41 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 16 Jan 2022 09:50:41 +0100 Subject: [Buildroot] [PATCH] package/clpeak: new package In-Reply-To: <20211230180010.04c873f9@windsurf> References: <20211024113654.88720-1-gilles.talis@gmail.com> <20211230180010.04c873f9@windsurf> Message-ID: Hi Thomas, thanks for the review. Somehow, I missed this email and just stumbled across it now. Le jeu. 30 d?c. 2021 ? 18:00, Thomas Petazzoni a ?crit : > > Hello Gilles, > > On Sun, 24 Oct 2021 13:36:54 +0200 > Gilles Talis wrote: > > > clpeak is a tool that profiles OpenCL devices to find > > their peak capacities > > > > Signed-off-by: Gilles Talis > > --- > > DEVELOPERS | 1 + > > package/Config.in | 1 + > > package/clpeak/Config.in | 14 ++++++++++++++ > > package/clpeak/clpeak.hash | 3 +++ > > package/clpeak/clpeak.mk | 13 +++++++++++++ > > 5 files changed, 32 insertions(+) > > create mode 100644 package/clpeak/Config.in > > create mode 100644 package/clpeak/clpeak.hash > > create mode 100644 package/clpeak/clpeak.mk > > Thanks for this package submission! Unfortunately, I'm afraid there is > an issue: it downloads stuff during the configure step. See below: Good catch! It seems like clpeak has a hidden dependency that I missed. Whilst I am here, one question: how do we deal with packages that have git submodules dependencies? Is it OK to let the download process download these dependencies? Even if the dependencies are available buildroot packages? > > >>> clpeak 0777205be1d5681d5a76d46ec94588544e8462a5 Configuring > ... > -- The C compiler identification is GNU 9.3.0 > -- The CXX compiler identification is GNU 9.3.0 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Looking for CL_VERSION_2_2 > -- Looking for CL_VERSION_2_2 - found > -- Found OpenCL: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so (found version "2.2") > CMake Warning (dev) in CMakeLists.txt: > No project() command is present. The top-level CMakeLists.txt file must > contain a literal, direct call to the project() command. Add a line of > code such as > > project(ProjectName) > > near the top of the file, but after cmake_minimum_required(). > > CMake is pretending there is a "project(Project)" command on the first > line. > This warning is for project developers. Use -Wno-dev to suppress it. > > -- The C compiler identification is GNU 9.3.0 > -- The CXX compiler identification is GNU 9.3.0 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Configuring done > -- Generating done > -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build > gmake[1]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[2]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > [ 12%] Creating directories for 'hpp_headers' > [ 25%] Performing download step (git clone) for 'hpp_headers' > Cloning into 'hpp_headers'... > remote: Enumerating objects: 558, done. > remote: Counting objects: 100% (558/558), done. > remote: Compressing objects: 100% (396/396), done. > remote: Total 558 (delta 324), reused 355 (delta 155), pack-reused 0 > Receiving objects: 100% (558/558), 762.72 KiB | 5.45 MiB/s, done. > Resolving deltas: 100% (324/324), done. > Already on 'master' > Your branch is up to date with 'origin/master'. > Submodule 'external/CMock' (https://github.com/ThrowTheSwitch/CMock) registered for path 'external/CMock' > Submodule 'external/Unity' (https://github.com/ThrowTheSwitch/Unity) registered for path 'external/Unity' > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock'... > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/Unity'... > Submodule path 'external/CMock': checked out '7cc41ddfdd07dc5eb8359d278f439f14031d64ad' > Submodule 'vendor/c_exception' (https://github.com/throwtheswitch/cexception.git) registered for path 'external/CMock/vendor/c_exception' > Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/unity' > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception'... > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/unity'... > Submodule path 'external/CMock/vendor/c_exception': checked out 'dce9e8b26f2179439002e02d691429e81a32b6c0' > Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/c_exception/vendor/unity' > Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception/vendor/unity'... > Submodule path 'external/CMock/vendor/c_exception/vendor/unity': checked out '2c7629a0ae90ffe991b5fd08e4db8672f72ed64c' > Submodule path 'external/CMock/vendor/unity': checked out '031f3bbe45f8adf504ca3d13e6f093869920b091' > Submodule path 'external/Unity': checked out '7d2bf62b7e6afaf38153041a9d53c21aeeca9a25' > [ 37%] Performing update step for 'hpp_headers' > HEAD is now at 1df82b9 Add param traits for CL_DEVICE_SUPPORTED_REGISTER_ALLOCATIONS_ARM (#165) > [ 50%] No patch step for 'hpp_headers' > [ 62%] Performing configure step for 'hpp_headers' > -- The C compiler identification is GNU 9.3.0 > -- The CXX compiler identification is GNU 9.3.0 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Configuring done > -- Generating done > -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build > [ 75%] Performing build step for 'hpp_headers' > gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > [ 87%] Performing install step for 'hpp_headers' > gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > Install the project... > -- Install configuration: "Release" > -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL > -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/cl2.hpp > -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/opencl.hpp > gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > [100%] Completed 'hpp_headers' > gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > [100%] Built target hpp_headers > gmake[2]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > gmake[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > -- Selected OpenCL includes from /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/include;/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include > -- Selected OpenCL lib /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so > -- Configuring done > -- Generating done > CMake Warning: > Manually-specified variables were not used by the project: > > BUILD_DOC > BUILD_DOCS > BUILD_EXAMPLE > BUILD_EXAMPLES > BUILD_TEST > BUILD_TESTING > BUILD_TESTS > > > -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5 > > Also, while note related to clpeak, I did try to build this > configuration (which uses the NXP OpenCL provider): > > BR2_aarch64=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_CLPEAK=y > BR2_PACKAGE_FREESCALE_IMX=y > BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y > BR2_PACKAGE_IMX_GPU_VIV=y > # BR2_TARGET_ROOTFS_TAR is not set > > and it fails with: > > /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/9.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib64/libGAL.so: undefined reference to `stat at GLIBC_2.33' > > And indeed the C library in this toolchain is glibc 2.31. So this means > that the libGAL library shipped by NXP in imx-gpu-viv will only work > with glibc >= 2.33. Good catch again. This is quite a bummer. I will look into that when time allows. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com thanks Gilles. From ps.report at gmx.net Sun Jan 16 09:19:01 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sun, 16 Jan 2022 10:19:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> Message-ID: <20220116101901.23db5faa@gmx.net> Hello James, On Sat, 15 Jan 2022 22:08:57 -0700, James Hilliard wrote: > On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > > > Hello James, *, > > > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > > > Currently the qmake gcc sysrootify path logic causes issues with > > > per-package directories, disable automatic gcc sysroot for qt5base > > > install and override all qt.conf paths manually to point to their > > > correct locations. > > > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > > instead of the HOST_DIR for cross compilation to work. > > > > > > Signed-off-by: James Hilliard > > > --- > > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > > package/qt5/qt5base/qt5base.mk | 2 ++ > > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > > index 2215cbd4e1..db9ab0c364 100644 > > > --- a/package/qt5/qt5base/qt.conf.in > > > +++ b/package/qt5/qt5base/qt.conf.in > > > @@ -2,6 +2,18 @@ > > > Prefix=/usr > > > HostPrefix=@@HOST_DIR@@ > > > Sysroot=@@STAGING_DIR@@ > > > -Headers=/usr/include/qt5 > > > -Plugins=/usr/lib/qt/plugins > > > -Examples=/usr/lib/qt/examples > > > +SysrootifyPrefix=false > > > +Binaries=@@STAGING_DIR@@/usr/bin > > > +Libraries=@@STAGING_DIR@@/usr/lib > > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > > +Data=@@STAGING_DIR@@ > > > +Translations=@@STAGING_DIR@@/translations > > > +ArchData=@@STAGING_DIR@@/usr > > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > > +Imports=@@STAGING_DIR@@/usr/imports > > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > > +HostBinaries=@@HOST_DIR@@/bin > > > +HostLibraries=@@HOST_DIR@@/lib > > > +HostData=@@STAGING_DIR@@ > > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > > index bcdf036f00..6c05e710d8 100644 > > > --- a/package/qt5/qt5base/qt5base.mk > > > +++ b/package/qt5/qt5base/qt5base.mk > > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > > -v \ > > > -prefix /usr \ > > > -hostprefix $(HOST_DIR) \ > > > + -hostdatadir $(STAGING_DIR) \ > > > -headerdir /usr/include/qt5 \ > > > -sysroot $(STAGING_DIR) \ > > > + -no-gcc-sysroot \ > > > -plugindir /usr/lib/qt/plugins \ > > > -examplesdir /usr/lib/qt/examples \ > > > -no-rpath \ > > > > This one leads to the following compile failure for qt5webengine-5.15.2: > > > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > > collect2: error: ld returned 1 exit status > > So I was able to reproduce this error, however best I can tell it's > probably not a regression This is a known failure, see the patches adding host-freetype/host-libjepeg/host-harfbuzz ([1]) or your own qt5webengine bump adding host-freetype dependency ([2])... Additional the SIGSTKSZ fix is needed... Regards, Peter [1] http://lists.busybox.net/pipermail/buildroot/2022-January/634005.html [2] http://lists.busybox.net/pipermail/buildroot/2022-January/633439.html > as the compilation still fails due to a different error without this patch: > > ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned > non-zero exit code. > pkgresult = exec_script(pkg_config_script, args, "value") > ^---------- > Current dir: /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/core/release/ > Command: /home/buildroot/buildroot/output/host/bin/python2 > /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py > -p /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config > libjpeg > Returned 1. > stderr: > > Package libjpeg was not found in the pkg-config search path. > Perhaps you should add the directory containing `libjpeg.pc' > to the PKG_CONFIG_PATH environment variable > Package 'libjpeg', required by 'virtual:world', not found > Could not run pkg-config. > > See //third_party/BUILD.gn:17:3: whence it was called. > pkg_config("system_libjpeg") { > ^----------------------------- > See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused > the file to be included. > "//third_party:jpeg", > ^------------------- > Project ERROR: GN run error! > > > > > > > But the file crti.o exists: > > > > $ find . -name crti.o > > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > > > > Did not (yet) test with your latest (v2) patch iteration... > > > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > > Thomas)... > > > > Regards, > > Peter > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sun Jan 16 09:43:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 10:43:45 +0100 Subject: [Buildroot] [PATCH v2, 1/2] Revert "package/log4cxx: select boost chrono and date-time with gcc < 7" In-Reply-To: <20220113231438.5aa8742e@windsurf> References: <20211119175553.2413433-1-fontaine.fabrice@gmail.com> <20211121145741.1fa4dffb@windsurf> <20220113231438.5aa8742e@windsurf> Message-ID: Hello Thomas, Le jeu. 13 janv. 2022 ? 23:14, Thomas Petazzoni a ?crit : > > Hello Fabrice, > > On Sun, 21 Nov 2021 14:57:41 +0100 > Thomas Petazzoni wrote: > > > On Fri, 19 Nov 2021 18:55:52 +0100 > > Fabrice Fontaine wrote: > > > > > This reverts commit 3c2245cb65741c965f4bb87d35ac3c64f250a1ae to move > > > these selects on boost side as the build failure was raised with gcc >= > > > 7 (making this commit a "no-op"). Indeed, the build failure is raised > > > with cmake < 3.21.3, because cmake assumed that boost thread depends on > > > date-time until > > > https://github.com/Kitware/CMake/commit/1ad0c5ae53fc0c4f774166337f0e9c93c578cf9b. > > > > I don't understand why you say this commit is a no-op. It clearly > > isn't. In gcc < 7.x configurations, this commit ensures that boost > > chrono and boost date-time are selected. > > > > The fact that you realize later that the build failure occurred with > > gcc >= 7.x, meaning this commit does not help fixing the issue does not > > make this commit a no-op. > > Do you have some feedback/comment on the above questions? Indeed, this is not a no-op so I suggest to only apply the second patch of the serie. > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From james.hilliard1 at gmail.com Sun Jan 16 10:17:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:17:39 -0700 Subject: [Buildroot] [PATCH v3 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220116101739.2623120-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. Also set qmake target pkg-config path for qt5webengine. This fixes some build errors with per-package directories such as: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 Signed-off-by: James Hilliard --- Changes v2 -> v3: - set target pkg-config path Changes v1 -> v2: - add some missing overrides to qt.conf.in --- package/qt5/qt5base/qmake.conf.in | 4 ++++ package/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 2 ++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index 024c074928..d12f884a55 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -8,6 +8,10 @@ include(../common/linux_device_pre.conf) +# set up pkg-config +QMAKE_PKG_CONFIG = $$[QT_HOST_PREFIX]/bin/pkg-config +QMAKE_PKGCONFIG_PREFIX = /usr + # modifications to g++-unix.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..c92f52ced0 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,21 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Tests=@@STAGING_DIR@@/usr/lib/qt/tests +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +Documentation=@@STAGING_DIR@@/doc +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +Settings=@@STAGING_DIR@@/etc +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..6c05e710d8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ -- 2.25.1 From voltagex at voltagex.org Sun Jan 16 10:28:41 2022 From: voltagex at voltagex.org (Adam Baxter) Date: Sun, 16 Jan 2022 21:28:41 +1100 Subject: [Buildroot] nvidia driver fails to build: compiler version check failed Message-ID: Hi all Using buildroot master 6e4791b751c0f8e0ba218da2c22e71d3e1436b5d Config is hopefully attached. Also, the below driver version was released by Nvidia on 2019.11.8 - perhaps it should be updated or removed? make[1]: Entering directory '/home/voltagex/src/buildroot/output/build/linux-5.15.13' Compiler version check failed: The major and minor number of the compiler used to compile the kernel: x86_64-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-1172-g6e4791b751) 11.2.0, GNU ld (GNU Binutils) 2.37 does not match the compiler used here: x86_64-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-1172-g6e4791b751) 11.2.0 Copyright (C) 2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. It is recommended to set the CC environment variable to the compiler that was used to compile the kernel. The compiler version check can be disabled by setting the IGNORE_CC_MISMATCH environment variable to "1". However, mixing compiler versions between the kernel and kernel modules can result in subtle bugs that are difficult to diagnose. *** Failed CC version check. Bailing out! *** make[2]: *** [/home/voltagex/src/buildroot/output/build/nvidia-driver-390.132/kernel/Kbuild:189: cc_version_check] Error 1 (after looking at this I realised I'd probably have more luck with nouveau, anyway) Thanks, Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: .config Type: application/xml Size: 117285 bytes Desc: not available URL: From james.hilliard1 at gmail.com Sun Jan 16 10:28:54 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:28:54 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: <20220116101901.23db5faa@gmx.net> References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> <20220116101901.23db5faa@gmx.net> Message-ID: On Sun, Jan 16, 2022 at 2:19 AM Peter Seiderer wrote: > > Hello James, > > On Sat, 15 Jan 2022 22:08:57 -0700, James Hilliard wrote: > > > On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > > > > > Hello James, *, > > > > > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > > > > > Currently the qmake gcc sysrootify path logic causes issues with > > > > per-package directories, disable automatic gcc sysroot for qt5base > > > > install and override all qt.conf paths manually to point to their > > > > correct locations. > > > > > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > > > instead of the HOST_DIR for cross compilation to work. > > > > > > > > Signed-off-by: James Hilliard > > > > --- > > > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > > > package/qt5/qt5base/qt5base.mk | 2 ++ > > > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > > > index 2215cbd4e1..db9ab0c364 100644 > > > > --- a/package/qt5/qt5base/qt.conf.in > > > > +++ b/package/qt5/qt5base/qt.conf.in > > > > @@ -2,6 +2,18 @@ > > > > Prefix=/usr > > > > HostPrefix=@@HOST_DIR@@ > > > > Sysroot=@@STAGING_DIR@@ > > > > -Headers=/usr/include/qt5 > > > > -Plugins=/usr/lib/qt/plugins > > > > -Examples=/usr/lib/qt/examples > > > > +SysrootifyPrefix=false > > > > +Binaries=@@STAGING_DIR@@/usr/bin > > > > +Libraries=@@STAGING_DIR@@/usr/lib > > > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > > > +Data=@@STAGING_DIR@@ > > > > +Translations=@@STAGING_DIR@@/translations > > > > +ArchData=@@STAGING_DIR@@/usr > > > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > > > +Imports=@@STAGING_DIR@@/usr/imports > > > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > > > +HostBinaries=@@HOST_DIR@@/bin > > > > +HostLibraries=@@HOST_DIR@@/lib > > > > +HostData=@@STAGING_DIR@@ > > > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > > > index bcdf036f00..6c05e710d8 100644 > > > > --- a/package/qt5/qt5base/qt5base.mk > > > > +++ b/package/qt5/qt5base/qt5base.mk > > > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > > > -v \ > > > > -prefix /usr \ > > > > -hostprefix $(HOST_DIR) \ > > > > + -hostdatadir $(STAGING_DIR) \ > > > > -headerdir /usr/include/qt5 \ > > > > -sysroot $(STAGING_DIR) \ > > > > + -no-gcc-sysroot \ > > > > -plugindir /usr/lib/qt/plugins \ > > > > -examplesdir /usr/lib/qt/examples \ > > > > -no-rpath \ > > > > > > This one leads to the following compile failure for qt5webengine-5.15.2: > > > > > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > > > collect2: error: ld returned 1 exit status > > > > So I was able to reproduce this error, however best I can tell it's > > probably not a regression > > This is a known failure, see the patches adding host-freetype/host-libjepeg/host-harfbuzz ([1]) > or your own qt5webengine bump adding host-freetype dependency ([2])... So there's a major pkg-config bug here, I partially fixed it here but it seems gn is mangling some of the paths after getting them from pkg-config: https://patchwork.ozlabs.org/project/buildroot/patch/20220116101739.2623120-1-james.hilliard1 at gmail.com/ This gets the target pkg-config paths set up right at least output/build/qt5webengine-5.15.2/src/core/release/args.gn: pkg_config = "/home/buildroot/buildroot/output/host/bin/pkg-config" host_pkg_config = "/home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config" However gn I think is prepending the target_sysroot to the include paths or something: target_sysroot = "/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot" which causes this error: /home/buildroot/buildroot/output/host/bin/aarch64-linux-g++ -MMD -MF obj/crypto/crypto/nss_util.o.d -DCRYPTO_IMPLEMENTATION -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DCR_SYSROOT_HASH=2cade9ee1ca9186b28ac768c19e1ab7c45ee0600 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen -I../../3rdparty/chromium -I../../3rdparty/chromium/third_party/boringssl/src/include -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -I/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nss -I/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nspr -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti --sysroot=../../../../../host/aarch64-buildroot-linux-gnu/sysroot -fvisibility-inlines-hidden -c ../../3rdparty/chromium/crypto/nss_util.cc -o obj/crypto/crypto/nss_util.o ../../3rdparty/chromium/crypto/nss_util.cc:8:10: fatal error: pk11pub.h: No such file or directory 8 | #include | ^~~~~~~~~~~ The include path being set by gn doesn't exist, although it's at least trying to use the target variant now: /home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nss > > Additional the SIGSTKSZ fix is needed... Yeah, on newer glibc's it's needed. > > Regards, > Peter > > [1] http://lists.busybox.net/pipermail/buildroot/2022-January/634005.html > [2] http://lists.busybox.net/pipermail/buildroot/2022-January/633439.html > > > > as the compilation still fails due to a different error without this patch: > > > > ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned > > non-zero exit code. > > pkgresult = exec_script(pkg_config_script, args, "value") > > ^---------- > > Current dir: /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/core/release/ > > Command: /home/buildroot/buildroot/output/host/bin/python2 > > /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py > > -p /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config > > libjpeg > > Returned 1. > > stderr: > > > > Package libjpeg was not found in the pkg-config search path. > > Perhaps you should add the directory containing `libjpeg.pc' > > to the PKG_CONFIG_PATH environment variable > > Package 'libjpeg', required by 'virtual:world', not found > > Could not run pkg-config. > > > > See //third_party/BUILD.gn:17:3: whence it was called. > > pkg_config("system_libjpeg") { > > ^----------------------------- > > See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused > > the file to be included. > > "//third_party:jpeg", > > ^------------------- > > Project ERROR: GN run error! > > > > > > > > > > > But the file crti.o exists: > > > > > > $ find . -name crti.o > > > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > > > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > > > > > > > Did not (yet) test with your latest (v2) patch iteration... > > > > > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > > > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > > > Thomas)... > > > > > > Regards, > > > Peter > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From james.hilliard1 at gmail.com Sun Jan 16 10:38:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:38:17 -0700 Subject: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency In-Reply-To: <20201221203952.22168-3-ps.report@gmx.net> References: <20201221203952.22168-1-ps.report@gmx.net> <20201221203952.22168-3-ps.report@gmx.net> Message-ID: On Mon, Dec 21, 2020 at 1:40 PM Peter Seiderer wrote: > > - add optional host-freetype dependency > > Fixes: > > Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 > Returned 1. > stderr: > > Package freetype2 was not found in the pkg-config search path. > Perhaps you should add the directory containing `freetype2.pc' > to the PKG_CONFIG_PATH environment variable > Package 'freetype2', required by 'virtual:world', not found > Could not run pkg-config. > > See //build/linux/BUILD.gn:24:3: whence it was called. > pkg_config("freetype_from_pkgconfig") { > ^-------------------------------------- > See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included. > public_configs = [ "//build/linux:freetype_from_pkgconfig" ] > ^-------------------------------------- > Project ERROR: GN run error! > make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 > > - add optiobal hist-libjpeg dependency > > Fixes: > > https://gitlab.com/buildroot.org/buildroot/-/jobs/917539230 > > Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config libjpeg > Returned 1. > stderr: > Package libjpeg was not found in the pkg-config search path. > Perhaps you should add the directory containing `libjpeg.pc' > to the PKG_CONFIG_PATH environment variable > Package 'libjpeg', required by 'virtual:world', not found > Could not run pkg-config. > See //third_party/BUILD.gn:17:3: whence it was called. > pkg_config("system_libjpeg") { > ^----------------------------- > See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused the file to be included. > "//third_party:jpeg", > ^------------------- > Project ERROR: GN run error! > > Signed-off-by: Peter Seiderer Tested-by: James Hilliard > --- > package/qt5/qt5webengine/qt5webengine.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk > index 64c9c96cc2..8ab50a0fbf 100644 > --- a/package/qt5/qt5webengine/qt5webengine.mk > +++ b/package/qt5/qt5webengine/qt5webengine.mk > @@ -29,6 +29,14 @@ endif > > QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss > > +ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y) > +QT5WEBENGINE_DEPENDENCIES += host-freetype > +endif > + > +ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y) > +QT5WEBENGINE_DEPENDENCIES += host-libjpeg > +endif > + > QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg > > ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) > -- > 2.29.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From ju.o at free.fr Sun Jan 16 10:41:14 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 16 Jan 2022 11:41:14 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add test for python-gnupg Message-ID: <20220116104114.103601-1-ju.o@free.fr> This commit add a simple test doing symmetric encryption/decryption to check this python interface with the gpg binary is working fine. Signed-off-by: Julien Olivain --- DEVELOPERS | 2 ++ .../tests/package/sample_python_gnupg.py | 24 +++++++++++++++++++ .../tests/package/test_python_gnupg.py | 21 ++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 support/testing/tests/package/sample_python_gnupg.py create mode 100644 support/testing/tests/package/test_python_gnupg.py diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..e038941b3b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,8 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ +F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/test_python_gnupg.py N: Julien Viard de Galbert F: package/dieharder/ diff --git a/support/testing/tests/package/sample_python_gnupg.py b/support/testing/tests/package/sample_python_gnupg.py new file mode 100644 index 0000000000..b5b718a8cb --- /dev/null +++ b/support/testing/tests/package/sample_python_gnupg.py @@ -0,0 +1,24 @@ +import gnupg + +gpg = gnupg.GPG(verbose=True) + +plain_data = "Some plain text data" +good_passphrase = "Good Passphrase" + +# Test Encrypt +result = gpg.encrypt(plain_data, None, passphrase=good_passphrase, symmetric=True) +assert(result.returncode == 0) +enc_data = str(result) +assert(enc_data != plain_data) + +# Test Good Decrypt +result = gpg.decrypt(enc_data, passphrase=good_passphrase) +assert(result.returncode == 0) +dec_data = str(result) +assert(dec_data == plain_data) + +# Test Bad Decrypt +result = gpg.decrypt(enc_data, passphrase='A Wrong Passphrase') +assert(result.returncode != 0) +dec_data = str(result) +assert(dec_data != plain_data) diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py new file mode 100644 index 0000000000..0c71f6b6d0 --- /dev/null +++ b/support/testing/tests/package/test_python_gnupg.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2GnuPG(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_GNUPG=y + """ + sample_scripts = ["tests/package/sample_python_gnupg.py"] + + +class TestPythonPy3GnuPG(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_GNUPG=y + """ + sample_scripts = ["tests/package/sample_python_gnupg.py"] -- 2.34.1 From james.hilliard1 at gmail.com Sun Jan 16 10:43:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:43:21 -0700 Subject: [Buildroot] [PATCH v4 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220116104321.2696659-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. Also set qmake target pkg-config path for qt5webengine. Set PKG_CONFIG_SYSROOT_DIR="/" in qt5webengine to prevent target pkg-config path mangling. This fixes some build errors with per-package directories such as: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 Signed-off-by: James Hilliard --- Changes v3 -> v4: - fix target pkg-config path mangling Changes v2 -> v3: - set target pkg-config path Changes v1 -> v2: - add some missing overrides to qt.conf.in --- package/qt5/qt5base/qmake.conf.in | 4 ++++ package/qt5/qt5base/qt.conf.in | 21 ++++++++++++++++++--- package/qt5/qt5base/qt5base.mk | 2 ++ package/qt5/qt5webengine/qt5webengine.mk | 4 +++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index 024c074928..d12f884a55 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -8,6 +8,10 @@ include(../common/linux_device_pre.conf) +# set up pkg-config +QMAKE_PKG_CONFIG = $$[QT_HOST_PREFIX]/bin/pkg-config +QMAKE_PKGCONFIG_PREFIX = /usr + # modifications to g++-unix.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..c92f52ced0 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,21 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Tests=@@STAGING_DIR@@/usr/lib/qt/tests +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +Documentation=@@STAGING_DIR@@/doc +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +Settings=@@STAGING_DIR@@/etc +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..6c05e710d8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..06922e4eec 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -44,7 +44,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_SYSROOT_DIR="/" define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python -- 2.25.1 From james.hilliard1 at gmail.com Sun Jan 16 10:45:45 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 03:45:45 -0700 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: disable broken qmake sysrootify In-Reply-To: References: <20220112203939.606775-1-james.hilliard1@gmail.com> <20220115233736.634f0d0b@gmx.net> <20220116101901.23db5faa@gmx.net> Message-ID: On Sun, Jan 16, 2022 at 3:28 AM James Hilliard wrote: > > On Sun, Jan 16, 2022 at 2:19 AM Peter Seiderer wrote: > > > > Hello James, > > > > On Sat, 15 Jan 2022 22:08:57 -0700, James Hilliard wrote: > > > > > On Sat, Jan 15, 2022 at 3:37 PM Peter Seiderer wrote: > > > > > > > > Hello James, *, > > > > > > > > On Wed, 12 Jan 2022 13:39:39 -0700, James Hilliard wrote: > > > > > > > > > Currently the qmake gcc sysrootify path logic causes issues with > > > > > per-package directories, disable automatic gcc sysroot for qt5base > > > > > install and override all qt.conf paths manually to point to their > > > > > correct locations. > > > > > > > > > > Redirect HostData to STAGING_DIR as mkspecs need to be available there > > > > > instead of the HOST_DIR for cross compilation to work. > > > > > > > > > > Signed-off-by: James Hilliard > > > > > --- > > > > > package/qt5/qt5base/qt.conf.in | 18 +++++++++++++++--- > > > > > package/qt5/qt5base/qt5base.mk | 2 ++ > > > > > 2 files changed, 17 insertions(+), 3 deletions(-) > > > > > > > > > > diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in > > > > > index 2215cbd4e1..db9ab0c364 100644 > > > > > --- a/package/qt5/qt5base/qt.conf.in > > > > > +++ b/package/qt5/qt5base/qt.conf.in > > > > > @@ -2,6 +2,18 @@ > > > > > Prefix=/usr > > > > > HostPrefix=@@HOST_DIR@@ > > > > > Sysroot=@@STAGING_DIR@@ > > > > > -Headers=/usr/include/qt5 > > > > > -Plugins=/usr/lib/qt/plugins > > > > > -Examples=/usr/lib/qt/examples > > > > > +SysrootifyPrefix=false > > > > > +Binaries=@@STAGING_DIR@@/usr/bin > > > > > +Libraries=@@STAGING_DIR@@/usr/lib > > > > > +Headers=@@STAGING_DIR@@/usr/include/qt5 > > > > > +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins > > > > > +Examples=@@STAGING_DIR@@/usr/lib/qt/examples > > > > > +Data=@@STAGING_DIR@@ > > > > > +Translations=@@STAGING_DIR@@/translations > > > > > +ArchData=@@STAGING_DIR@@/usr > > > > > +LibraryExecutables=@@STAGING_DIR@@/usr/libexec > > > > > +Imports=@@STAGING_DIR@@/usr/imports > > > > > +Qml2Imports=@@STAGING_DIR@@/usr/qml > > > > > +HostBinaries=@@HOST_DIR@@/bin > > > > > +HostLibraries=@@HOST_DIR@@/lib > > > > > +HostData=@@STAGING_DIR@@ > > > > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > > > > index bcdf036f00..6c05e710d8 100644 > > > > > --- a/package/qt5/qt5base/qt5base.mk > > > > > +++ b/package/qt5/qt5base/qt5base.mk > > > > > @@ -311,8 +311,10 @@ define QT5BASE_CONFIGURE_CMDS > > > > > -v \ > > > > > -prefix /usr \ > > > > > -hostprefix $(HOST_DIR) \ > > > > > + -hostdatadir $(STAGING_DIR) \ > > > > > -headerdir /usr/include/qt5 \ > > > > > -sysroot $(STAGING_DIR) \ > > > > > + -no-gcc-sysroot \ > > > > > -plugindir /usr/lib/qt/plugins \ > > > > > -examplesdir /usr/lib/qt/examples \ > > > > > -no-rpath \ > > > > > > > > This one leads to the following compile failure for qt5webengine-5.15.2: > > > > > > > > .../host/lib/gcc/arm-buildroot-linux-gnueabihf/10.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find crti.o: No such file or directory > > > > collect2: error: ld returned 1 exit status > > > > > > So I was able to reproduce this error, however best I can tell it's > > > probably not a regression > > > > This is a known failure, see the patches adding host-freetype/host-libjepeg/host-harfbuzz ([1]) > > or your own qt5webengine bump adding host-freetype dependency ([2])... > > So there's a major pkg-config bug here, I partially fixed it here but > it seems gn > is mangling some of the paths after getting them from pkg-config: > https://patchwork.ozlabs.org/project/buildroot/patch/20220116101739.2623120-1-james.hilliard1 at gmail.com/ > > This gets the target pkg-config paths set up right at least > output/build/qt5webengine-5.15.2/src/core/release/args.gn: > pkg_config = "/home/buildroot/buildroot/output/host/bin/pkg-config" > host_pkg_config = > "/home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config" > > However gn I think is prepending the target_sysroot to the include > paths or something: > target_sysroot = > "/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot" > > which causes this error: > /home/buildroot/buildroot/output/host/bin/aarch64-linux-g++ -MMD -MF > obj/crypto/crypto/nss_util.o.d -DCRYPTO_IMPLEMENTATION -DUSE_UDEV > -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD > -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS > -D__STDC_FORMAT_MACROS > -DCR_SYSROOT_HASH=2cade9ee1ca9186b28ac768c19e1ab7c45ee0600 -DNDEBUG > -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen > -I../../3rdparty/chromium > -I../../3rdparty/chromium/third_party/boringssl/src/include > -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector > -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe > -pthread -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 > -Wno-unused-local-typedefs -Wno-maybe-uninitialized > -Wno-deprecated-declarations -fno-delete-null-pointer-checks > -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else > -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident > -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 > -fvisibility=hidden > -I/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nss > -I/home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nspr > -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes > -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof > -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti > --sysroot=../../../../../host/aarch64-buildroot-linux-gnu/sysroot > -fvisibility-inlines-hidden -c > ../../3rdparty/chromium/crypto/nss_util.cc -o > obj/crypto/crypto/nss_util.o > ../../3rdparty/chromium/crypto/nss_util.cc:8:10: fatal error: > pk11pub.h: No such file or directory > 8 | #include > | ^~~~~~~~~~~ > > The include path being set by gn doesn't exist, although it's at least > trying to use the > target variant now: > /home/buildroot/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/include/nss Hmm, so I think I found a way to get that to not happen by setting PKG_CONFIG_SYSROOT_DIR="/": https://patchwork.ozlabs.org/project/buildroot/patch/20220116104321.2696659-1-james.hilliard1 at gmail.com/ > > > > > Additional the SIGSTKSZ fix is needed... > > Yeah, on newer glibc's it's needed. > > > > > Regards, > > Peter > > > > [1] http://lists.busybox.net/pipermail/buildroot/2022-January/634005.html > > [2] http://lists.busybox.net/pipermail/buildroot/2022-January/633439.html > > > > > > > as the compilation still fails due to a different error without this patch: > > > > > > ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned > > > non-zero exit code. > > > pkgresult = exec_script(pkg_config_script, args, "value") > > > ^---------- > > > Current dir: /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/core/release/ > > > Command: /home/buildroot/buildroot/output/host/bin/python2 > > > /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py > > > -p /home/buildroot/buildroot/output/build/qt5webengine-5.15.2/host-bin/host-pkg-config > > > libjpeg > > > Returned 1. > > > stderr: > > > > > > Package libjpeg was not found in the pkg-config search path. > > > Perhaps you should add the directory containing `libjpeg.pc' > > > to the PKG_CONFIG_PATH environment variable > > > Package 'libjpeg', required by 'virtual:world', not found > > > Could not run pkg-config. > > > > > > See //third_party/BUILD.gn:17:3: whence it was called. > > > pkg_config("system_libjpeg") { > > > ^----------------------------- > > > See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused > > > the file to be included. > > > "//third_party:jpeg", > > > ^------------------- > > > Project ERROR: GN run error! > > > > > > > > > > > > > > > But the file crti.o exists: > > > > > > > > $ find . -name crti.o > > > > ./build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/csu/crti.o > > > > ./host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/crti.o > > > > > > > > > > > > Did not (yet) test with your latest (v2) patch iteration... > > > > > > > > Compile with qt5webengine bump to 5.15.8-lts fails already before the linking stage > > > > (see secoidt.h/pk11pub.h No such file or directory failure reported by already by > > > > Thomas)... > > > > > > > > Regards, > > > > Peter > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From ju.o at free.fr Sun Jan 16 10:55:41 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 16 Jan 2022 11:55:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package In-Reply-To: <20220113215104.02a734a1@windsurf> References: <20220110200151.830192-1-ju.o@free.fr> <20220113215104.02a734a1@windsurf> Message-ID: <77b72a63fdde563f496649641a0efab1@free.fr> Hi Thomas, On 13/01/2022 21:51, Thomas Petazzoni wrote: > Hello Julien, > > On Mon, 10 Jan 2022 21:01:51 +0100 > Julien Olivain wrote: > >> [...] >> +config BR2_PACKAGE_PYTHON_GNUPG >> + bool "python-gnupg" >> + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime > > This generates a circular dependency reported by kconfig, because > another package does exactly the opposite. So I have inverted the logic > here: > > select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime What do you think about reversing the logic of all Buildroot packages selecting gnupg so they default to gnupg2? Quoting: https://gnupg.org/download/index.html """ GnuPG 1.4 is the old, single binary version which still support the unsafe PGP-2 keys. This branch has no dependencies on the above listed libraries or the Pinentry. However, it lacks many modern features and will receive only important updates. """ There is currently only two packages selecting gnupg: gpgme and python-gnupg Most Linux distributions are now shipping gnupg2 by default. gnupg v1 is now more for legacy/compatibility cases. If you agree, I can send a patch for this. Best regards, Julien. From kuzminov.sergey81 at gmail.com Sun Jan 16 11:26:00 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 16 Jan 2022 14:26:00 +0300 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring Message-ID: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> Changes: - common scenarios for multiple boards to create the SD image: board/orangepi/common; - extlinux.conf instead of boot.scr; - exclude FAT partition; - defconfig refactoring; - kernel: bump to version 5.12.19, if newer then BR2_PACKAGE_XR819_XRADIO will not compile; - u-boot: bump to version 2022.01 Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 5 ++ board/orangepi/common/genimage.cfg | 19 +++++++ board/orangepi/common/post-build.sh | 34 ++++++++++++ board/orangepi/common/uboot-extras.config | 3 + board/orangepi/orangepi-zero/boot.cmd | 9 --- board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ configs/orangepi_zero_defconfig | 67 ++++++++++++++--------- 7 files changed, 102 insertions(+), 71 deletions(-) create mode 100644 board/orangepi/common/extlinux.conf create mode 100644 board/orangepi/common/genimage.cfg create mode 100755 board/orangepi/common/post-build.sh create mode 100644 board/orangepi/common/uboot-extras.config delete mode 100644 board/orangepi/orangepi-zero/boot.cmd delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..015f29270e --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,5 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait console=${console} +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg new file mode 100644 index 0000000000..fd250ef05d --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,19 @@ +image sdcard.img { + hdimage { + partition-table-type = gpt + gpt-no-backup = true + gpt-location = 1008K # 1MB - 16KB + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB - 16KB + } + + partition rootfs { + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh new file mode 100755 index 0000000000..296f94b174 --- /dev/null +++ b/board/orangepi/common/post-build.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "uImage" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + echo "Image" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + echo "Image.gz" + else + echo "zImage" + fi +} + +generic_getty() +{ + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then + echo "" + else + echo "s/\s*console=\S*//" + fi +} + +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" + +sed -e "$(generic_getty)" \ + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ + -e "s/%PARTUUID%/$PARTUUID/g" \ + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" + +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config new file mode 100644 index 0000000000..5aa97523d9 --- /dev/null +++ b/board/orangepi/common/uboot-extras.config @@ -0,0 +1,3 @@ +CONFIG_BOOTDELAY=0 +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv preboot;" diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd deleted file mode 100644 index d094a64fe5..0000000000 --- a/board/orangepi/orangepi-zero/boot.cmd +++ /dev/null @@ -1,9 +0,0 @@ -setenv fdt_high ffffffff - -part uuid mmc 0:2 uuid -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg deleted file mode 100644 index 32f5454ae6..0000000000 --- a/board/orangepi/orangepi-zero/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Zero -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h2-plus-orangepi-zero.dtb", - "boot.scr" - } - } - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..908bcea893 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,49 +1,64 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set +BR2_GCC_ENABLE_LTO=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.19" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y +BR2_TARGET_ROOTFS_TAR=n + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_GENIMAGE=y -# wireless driver and firmware +# Wireless driver and firmware +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x BR2_PACKAGE_XR819_XRADIO=y BR2_PACKAGE_ARMBIAN_FIRMWARE=y BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -# wireless support +# Wireless support BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -# spi flash support +# Spi flash support BR2_PACKAGE_MTD=y -- 2.34.1 From arnout at mind.be Sun Jan 16 12:01:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:01:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package In-Reply-To: <77b72a63fdde563f496649641a0efab1@free.fr> References: <20220110200151.830192-1-ju.o@free.fr> <20220113215104.02a734a1@windsurf> <77b72a63fdde563f496649641a0efab1@free.fr> Message-ID: <6ece845a-20a1-4d79-c544-21e0f1f2fc6f@mind.be> On 16/01/2022 11:55, Julien Olivain wrote: > Hi Thomas, > > On 13/01/2022 21:51, Thomas Petazzoni wrote: >> Hello Julien, >> >> On Mon, 10 Jan 2022 21:01:51 +0100 >> Julien Olivain wrote: >> >>> ?[...] >>> +config BR2_PACKAGE_PYTHON_GNUPG >>> +??? bool "python-gnupg" >>> +??? select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime >> >> This generates a circular dependency reported by kconfig, because >> another package does exactly the opposite. So I have inverted the logic >> here: >> >> select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime > > What do you think about reversing the logic of all Buildroot packages > selecting gnupg so they default to gnupg2? > > Quoting: https://gnupg.org/download/index.html > """ > GnuPG 1.4 is the old, single binary version which still support the > unsafe PGP-2 keys. This branch has no dependencies on the above listed > libraries or the Pinentry. However, it lacks many modern features and > will receive only important updates. > """ > > There is currently only two packages selecting gnupg: > gpgme and python-gnupg > > Most Linux distributions are now shipping gnupg2 by default.? gnupg v1 > is now more for legacy/compatibility cases. Perhaps we should simply remove gnupg instead. We've had gnupg2 for 7.5 years now, that should be enough to migrate. Regards, Arnout > > If you agree, I can send a patch for this. > > Best regards, > > Julien. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Sun Jan 16 12:05:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:05:35 +0100 Subject: [Buildroot] nvidia driver fails to build: compiler version check failed In-Reply-To: References: Message-ID: <35bc0513-f94a-7dc1-e583-7c1a425d78ae@mind.be> On 16/01/2022 11:28, Adam Baxter wrote: > Hi all > > Using buildroot master 6e4791b751c0f8e0ba218da2c22e71d3e1436b5d > > Config is hopefully attached. > > Also, the below driver version was released by Nvidia on 2019.11.8 - perhaps it should be updated or removed? > > make[1]: Entering directory '/home/voltagex/src/buildroot/output/build/linux-5.15.13' > > Compiler version check failed: > > The major and minor number of the compiler used to > compile the kernel: > > x86_64-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-1172-g6e4791b751) 11.2.0, GNU ld (GNU Binutils) 2.37 > > does not match the compiler used here: > > x86_64-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-1172-g6e4791b751) 11.2.0 Clearly these two are the same, so that sounds like a bug in nvidia's compiler check. > Copyright (C) 2021 Free Software Foundation, Inc. > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > > > It is recommended to set the CC environment variable > to the compiler that was used to compile the kernel. > > The compiler version check can be disabled by setting > the IGNORE_CC_MISMATCH environment variable to "1". Sounds like the best option is to set this environment variable in nvidia-driver.mk then. We already make sure that the module is built with the same toolchain as the kernel. Regards, Arnout > However, mixing compiler versions between the kernel > and kernel modules can result in subtle bugs that are > difficult to diagnose. > > *** Failed CC version check. Bailing out! *** > > make[2]: *** [/home/voltagex/src/buildroot/output/build/nvidia-driver-390.132/kernel/Kbuild:189: cc_version_check] Error 1 > > > (after looking at this I realised I'd probably have more luck with nouveau, anyway) > > Thanks, > Adam > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sun Jan 16 12:10:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:10:17 +0100 Subject: [Buildroot] [PATCH] package/clpeak: new package In-Reply-To: References: <20211024113654.88720-1-gilles.talis@gmail.com> <20211230180010.04c873f9@windsurf> Message-ID: <53f0b52a-0bf2-fbd3-a79f-ef3d607bb95a@mind.be> On 16/01/2022 09:50, Gilles Talis wrote: > Hi Thomas, > > thanks for the review. Somehow, I missed this email and just stumbled > across it now. > > Le jeu. 30 d?c. 2021 ? 18:00, Thomas Petazzoni > a ?crit : >> >> Hello Gilles, >> >> On Sun, 24 Oct 2021 13:36:54 +0200 >> Gilles Talis wrote: >> >>> clpeak is a tool that profiles OpenCL devices to find >>> their peak capacities >>> >>> Signed-off-by: Gilles Talis >>> --- >>> DEVELOPERS | 1 + >>> package/Config.in | 1 + >>> package/clpeak/Config.in | 14 ++++++++++++++ >>> package/clpeak/clpeak.hash | 3 +++ >>> package/clpeak/clpeak.mk | 13 +++++++++++++ >>> 5 files changed, 32 insertions(+) >>> create mode 100644 package/clpeak/Config.in >>> create mode 100644 package/clpeak/clpeak.hash >>> create mode 100644 package/clpeak/clpeak.mk >> >> Thanks for this package submission! Unfortunately, I'm afraid there is >> an issue: it downloads stuff during the configure step. See below: > Good catch! It seems like clpeak has a hidden dependency that I missed. > Whilst I am here, one question: how do we deal with packages that have > git submodules dependencies? Is it OK to let the download process > download these dependencies? Even if the dependencies are available > buildroot packages? We prefer to unbundle dependencies (i.e., use the buildroot package rather than the submodule) if that is possible. However, some projects make that really hard (like chromium...) so it's not a strict requirement, more a best effort thing. Regards, Arnout > >> >>>>> clpeak 0777205be1d5681d5a76d46ec94588544e8462a5 Configuring >> ... >> -- The C compiler identification is GNU 9.3.0 >> -- The CXX compiler identification is GNU 9.3.0 >> -- Detecting C compiler ABI info >> -- Detecting C compiler ABI info - done >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped >> -- Detecting C compile features >> -- Detecting C compile features - done >> -- Detecting CXX compiler ABI info >> -- Detecting CXX compiler ABI info - done >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped >> -- Detecting CXX compile features >> -- Detecting CXX compile features - done >> -- Looking for CL_VERSION_2_2 >> -- Looking for CL_VERSION_2_2 - found >> -- Found OpenCL: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so (found version "2.2") >> CMake Warning (dev) in CMakeLists.txt: >> No project() command is present. The top-level CMakeLists.txt file must >> contain a literal, direct call to the project() command. Add a line of >> code such as >> >> project(ProjectName) >> >> near the top of the file, but after cmake_minimum_required(). >> >> CMake is pretending there is a "project(Project)" command on the first >> line. >> This warning is for project developers. Use -Wno-dev to suppress it. >> >> -- The C compiler identification is GNU 9.3.0 >> -- The CXX compiler identification is GNU 9.3.0 >> -- Detecting C compiler ABI info >> -- Detecting C compiler ABI info - done >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped >> -- Detecting C compile features >> -- Detecting C compile features - done >> -- Detecting CXX compiler ABI info >> -- Detecting CXX compiler ABI info - done >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped >> -- Detecting CXX compile features >> -- Detecting CXX compile features - done >> -- Configuring done >> -- Generating done >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build >> gmake[1]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[2]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> [ 12%] Creating directories for 'hpp_headers' >> [ 25%] Performing download step (git clone) for 'hpp_headers' >> Cloning into 'hpp_headers'... >> remote: Enumerating objects: 558, done. >> remote: Counting objects: 100% (558/558), done. >> remote: Compressing objects: 100% (396/396), done. >> remote: Total 558 (delta 324), reused 355 (delta 155), pack-reused 0 >> Receiving objects: 100% (558/558), 762.72 KiB | 5.45 MiB/s, done. >> Resolving deltas: 100% (324/324), done. >> Already on 'master' >> Your branch is up to date with 'origin/master'. >> Submodule 'external/CMock' (https://github.com/ThrowTheSwitch/CMock) registered for path 'external/CMock' >> Submodule 'external/Unity' (https://github.com/ThrowTheSwitch/Unity) registered for path 'external/Unity' >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock'... >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/Unity'... >> Submodule path 'external/CMock': checked out '7cc41ddfdd07dc5eb8359d278f439f14031d64ad' >> Submodule 'vendor/c_exception' (https://github.com/throwtheswitch/cexception.git) registered for path 'external/CMock/vendor/c_exception' >> Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/unity' >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception'... >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/unity'... >> Submodule path 'external/CMock/vendor/c_exception': checked out 'dce9e8b26f2179439002e02d691429e81a32b6c0' >> Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/c_exception/vendor/unity' >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception/vendor/unity'... >> Submodule path 'external/CMock/vendor/c_exception/vendor/unity': checked out '2c7629a0ae90ffe991b5fd08e4db8672f72ed64c' >> Submodule path 'external/CMock/vendor/unity': checked out '031f3bbe45f8adf504ca3d13e6f093869920b091' >> Submodule path 'external/Unity': checked out '7d2bf62b7e6afaf38153041a9d53c21aeeca9a25' >> [ 37%] Performing update step for 'hpp_headers' >> HEAD is now at 1df82b9 Add param traits for CL_DEVICE_SUPPORTED_REGISTER_ALLOCATIONS_ARM (#165) >> [ 50%] No patch step for 'hpp_headers' >> [ 62%] Performing configure step for 'hpp_headers' >> -- The C compiler identification is GNU 9.3.0 >> -- The CXX compiler identification is GNU 9.3.0 >> -- Detecting C compiler ABI info >> -- Detecting C compiler ABI info - done >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped >> -- Detecting C compile features >> -- Detecting C compile features - done >> -- Detecting CXX compiler ABI info >> -- Detecting CXX compiler ABI info - done >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped >> -- Detecting CXX compile features >> -- Detecting CXX compile features - done >> -- Configuring done >> -- Generating done >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build >> [ 75%] Performing build step for 'hpp_headers' >> gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' >> gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' >> [ 87%] Performing install step for 'hpp_headers' >> gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' >> Install the project... >> -- Install configuration: "Release" >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/cl2.hpp >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/opencl.hpp >> gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' >> [100%] Completed 'hpp_headers' >> gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> [100%] Built target hpp_headers >> gmake[2]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> gmake[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' >> -- Selected OpenCL includes from /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/include;/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include >> -- Selected OpenCL lib /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so >> -- Configuring done >> -- Generating done >> CMake Warning: >> Manually-specified variables were not used by the project: >> >> BUILD_DOC >> BUILD_DOCS >> BUILD_EXAMPLE >> BUILD_EXAMPLES >> BUILD_TEST >> BUILD_TESTING >> BUILD_TESTS >> >> >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5 >> >> Also, while note related to clpeak, I did try to build this >> configuration (which uses the NXP OpenCL provider): >> >> BR2_aarch64=y >> BR2_TOOLCHAIN_EXTERNAL=y >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y >> BR2_INIT_NONE=y >> BR2_SYSTEM_BIN_SH_NONE=y >> # BR2_PACKAGE_BUSYBOX is not set >> BR2_PACKAGE_CLPEAK=y >> BR2_PACKAGE_FREESCALE_IMX=y >> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y >> BR2_PACKAGE_IMX_GPU_VIV=y >> # BR2_TARGET_ROOTFS_TAR is not set >> >> and it fails with: >> >> /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/9.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib64/libGAL.so: undefined reference to `stat at GLIBC_2.33' >> >> And indeed the C library in this toolchain is glibc 2.31. So this means >> that the libGAL library shipped by NXP in imx-gpu-viv will only work >> with glibc >= 2.33. > Good catch again. This is quite a bummer. I will look into that when > time allows. > >> >> Best regards, >> >> Thomas >> -- >> Thomas Petazzoni, CTO, Bootlin >> Embedded Linux and Kernel engineering >> https://bootlin.com > thanks > Gilles. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sun Jan 16 12:25:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:25:19 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/mkusers: allow option for system uid/gid In-Reply-To: <20220114101247.342256-1-nolange79@gmail.com> References: <20220114101247.342256-1-nolange79@gmail.com> Message-ID: <5273d4d1-8254-e53d-0ce2-9c390fe315ad@mind.be> On 14/01/2022 11:12, Norbert Lange wrote: > Some software decides based on uid/gid whether a user is a > system or normal/human user, with differnt behaviour for those > flavors (example journald [2]). Thank you for the short yet sufficient summary! > > So adding logic to create system-users is necessary, we take > the now common ranges from [1]. > > This extends the mkusers script to allow -2 for uid/gid, > this argument will take an identifier from the system range. > > System/user ranges are added as variables, and the argument > for user/system uid was added as variable aswell. > Thus some magic constants could be removed, some further > occurences of -1 were replaced with equivalent logic. > > [1] - https://systemd.io/UIDS-GIDS/ > [2] - https://www.freedesktop.org/software/systemd/man/journald.conf.html > > Signed-off-by: Norbert Lange You forgot to mention that this is v2. v1 is here [1]. I think the only change is in the commit message. > --- > support/scripts/mkusers | 57 +++++++++++++++++++++++++++++------------ > 1 file changed, 40 insertions(+), 17 deletions(-) > > diff --git a/support/scripts/mkusers b/support/scripts/mkusers > index d00ba33823..9d8295e8a3 100755 > --- a/support/scripts/mkusers > +++ b/support/scripts/mkusers > @@ -8,6 +8,15 @@ MIN_UID=1000 > MAX_UID=1999 > MIN_GID=1000 > MAX_GID=1999 > +# use names from /etc/adduser.conf > +FIRST_SYSTEM_UID=100 > +LAST_SYSTEM_UID=999 > +FIRST_SYSTEM_GID=100 > +LAST_SYSTEM_GID=999 > +# argument to automatically crease system/user id > +AUTO_SYSTEM_ID=-2 Wouldn't it be better to use -1 for system users (= the usual case) and add -2 for normal users? System users are the usual, after all, and all current in-tree uses of -1 are definitely system users. I though that someone had already made this remark, but I can't find any trace of it. > +AUTO_USER_ID=-1 > + [snip] > @@ -222,8 +233,12 @@ add_one_group() { > local members > > # Generate a new GID if needed > - if [ ${gid} -eq -1 ]; then > - gid="$( generate_gid "${group}" )" > + if [ ${gid} -lt 0 ]; then > + if [ ${gid} -eq ${AUTO_USER_ID} ]; then > + gid="$( generate_gid "${group}" )" (nitpick) For symmetry, I'd always pass the first and last as argument here. > + else > + gid="$( generate_gid "${group}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" > + fi > fi (nitpick) I'd structure the entire block above as follows: if [ ${gid} -eq ${AUTO_USER_ID} ]; then elif [ ${gid} -eq ${AUTO_SYSTEM_ID} ]; then fi That's one level less deep, and more explicit about the system-id branch. Both remarks also apply to the uid case of course. > > members=$(get_members "$group") > @@ -247,16 +262,19 @@ add_one_group() { > # - not already used by a user > generate_uid() { > local username="${1}" > + local minuid="${2:-$MIN_UID}" > + local maxuid="${3:-$MAX_UID}" So here I'd remove the defaults and instead always pass the arguments. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/list/?series=152843&state=%2A&archive=both > + > local uid > > uid="$( get_uid "${username}" )" > if [ -z "${uid}" ]; then > - for(( uid=MIN_UID; uid<=MAX_UID; uid++ )); do > + for(( uid=minuid; uid<=maxuid; uid++ )); do > if [ -z "$( get_username "${uid}" )" ]; then > break > fi > done > - if [ ${uid} -gt ${MAX_UID} ]; then > + if [ ${uid} -gt ${maxuid} ]; then > fail "can not allocate a UID for user '%s'\n" "${username}" > fi > fi > @@ -307,8 +325,13 @@ add_one_user() { > check_user_validity "${username}" "${uid}" "${group}" "${gid}" > > # Generate a new UID if needed > - if [ ${uid} -eq -1 ]; then > - uid="$( generate_uid "${username}" )" > + if [ ${uid} -lt 0 ]; then > + if [ ${uid} -eq ${AUTO_USER_ID} ]; then > + uid="$( generate_uid "${username}" )" > + else > + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" > + > + fi > fi > > # Remove any previous instance of this user > @@ -384,8 +407,8 @@ main() { > ENTRIES+=( "${line}" ) > done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) > > - # We first create groups whose gid is not -1, and then we create groups > - # whose gid is -1 (automatic), so that, if a group is defined both with > + # We first create groups whose gid is positive, and then we create groups > + # whose gid is automatic, so that, if a group is defined both with > # a specified gid and an automatic gid, we ensure the specified gid is > # used, rather than a different automatic gid is computed. > > @@ -399,7 +422,7 @@ main() { > # Then, create all the main groups which gid *is* automatic > for line in "${ENTRIES[@]}"; do > read username uid group gid passwd home shell groups comment <<<"${line}" > - [ ${gid} -eq -1 ] || continue # Non-automatic gid > + [ ${gid} -lt 0 ] || continue # Non-automatic gid > add_one_group "${group}" "${gid}" > done > > @@ -410,7 +433,7 @@ main() { > read username uid group gid passwd home shell groups comment <<<"${line}" > if [ "${groups}" != "-" ]; then > for g in ${groups//,/ }; do > - add_one_group "${g}" -1 > + add_one_group "${g}" ${AUTO_USER_ID} > done > fi > done > @@ -433,7 +456,7 @@ main() { > for line in "${ENTRIES[@]}"; do > read username uid group gid passwd home shell groups comment <<<"${line}" > [ "${username}" != "-" ] || continue # Magic string to skip user creation > - [ ${uid} -eq -1 ] || continue # Non-automatic uid > + [ ${uid} -lt 0 ] || continue # Non-automatic uid > add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ > "${home}" "${shell}" "${groups}" "${comment}" > done > From arnout at mind.be Sun Jan 16 12:27:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 16 Jan 2022 13:27:15 +0100 Subject: [Buildroot] [PATCH 2/2] mkusers: change default from normal to system user In-Reply-To: <20220114101247.342256-2-nolange79@gmail.com> References: <20220114101247.342256-1-nolange79@gmail.com> <20220114101247.342256-2-nolange79@gmail.com> Message-ID: <38a29a75-9f0a-a7b5-cdf3-16d54c00e2a0@mind.be> On 14/01/2022 11:12, Norbert Lange wrote: > for all packages, this is the fitting default, Ah, this is where I saw the remark! :-) I should have read the entire series before commenting. This patch should be squashed with the preceding one. Since my only remarks are nitpicks, I'm going to merge it as is (after squashing) - but later. So I'll already give it my Acked-by: Arnout Vandecappelle (Essensium/Mind) > but the fallout will be user provided tables. > > Also update the docs with the chagned behaviour. > > Signed-off-by: Norbert Lange > --- > docs/manual/makeusers-syntax.txt | 11 +++++++---- > support/scripts/mkusers | 6 +++--- > 2 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/docs/manual/makeusers-syntax.txt b/docs/manual/makeusers-syntax.txt > index 467e596230..3d1013f447 100644 > --- a/docs/manual/makeusers-syntax.txt > +++ b/docs/manual/makeusers-syntax.txt > @@ -20,13 +20,16 @@ Where: > It can not be +root+, and must be unique. If set to +-+, then just a > group will be created. > - +uid+ is the desired UID for the user. It must be unique, and not > - +0+. If set to +-1+, then a unique UID will be computed by Buildroot > - in the range [1000...1999] > + +0+. If set to +-1+ or +-2+, then a unique UID will be computed by > + Buildroot, with +-1+ denoting a system UID from [100...999] and +-2+ > + denoting a user UID from [1000...1999]. > - +group+ is the desired name for the user's main group. It can not > be +root+. If the group does not exist, it will be created. > - +gid+ is the desired GID for the user's main group. It must be unique, > - and not +0+. If set to +-1+, and the group does not already exist, then > - a unique GID will be computed by Buildroot in the range [1000..1999] > + and not +0+. If set to +-1+ or +-2+, and the group does not already > + exist, then a unique GID will be computed by Buildroot, with +-1+ > + denoting a system GID from [100...999] and +-2+ denoting a user GID > + from [1000...1999]. > - +password+ is the crypt(3)-encoded password. If prefixed with +!+, > then login is disabled. If prefixed with +=+, then it is interpreted > as clear-text, and will be crypt-encoded (using MD5). If prefixed with > diff --git a/support/scripts/mkusers b/support/scripts/mkusers > index 9d8295e8a3..f7a3180e30 100755 > --- a/support/scripts/mkusers > +++ b/support/scripts/mkusers > @@ -14,8 +14,8 @@ LAST_SYSTEM_UID=999 > FIRST_SYSTEM_GID=100 > LAST_SYSTEM_GID=999 > # argument to automatically crease system/user id > -AUTO_SYSTEM_ID=-2 > -AUTO_USER_ID=-1 > +AUTO_SYSTEM_ID=-1 > +AUTO_USER_ID=-2 > > # No more is configurable below this point > #---------------------------------------------------------------------------- > @@ -433,7 +433,7 @@ main() { > read username uid group gid passwd home shell groups comment <<<"${line}" > if [ "${groups}" != "-" ]; then > for g in ${groups//,/ }; do > - add_one_group "${g}" ${AUTO_USER_ID} > + add_one_group "${g}" ${AUTO_SYSTEM_ID} > done > fi > done > From romain.naour at gmail.com Sun Jan 16 12:37:47 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 16 Jan 2022 13:37:47 +0100 Subject: [Buildroot] [PATCH 2/2] support/scripts/boot-qemu-image.py: increase the timeout by 10 In-Reply-To: <20220115202303.GA2216429@scaer> References: <20220115143344.12319-1-romain.naour@gmail.com> <20220115143344.12319-2-romain.naour@gmail.com> <20220115160517.GQ1945846@scaer> <737f135e-b936-a21c-8775-349d7db7fb88@gmail.com> <20220115202303.GA2216429@scaer> Message-ID: <6c222807-93f7-2186-8ca7-868b893abf55@gmail.com> Hello Yann, All, Le 15/01/2022 ? 21:23, Yann E. MORIN a ?crit?: > Romain, All, > > On 2022-01-15 20:28 +0100, Romain Naour spake thusly: >> Le 15/01/2022 ? 17:05, Yann E. MORIN a ?crit?: >>> On 2022-01-15 15:33 +0100, Romain Naour spake thusly: >>>> As for the Buildroot testsuite, multiply every emulator timeout by 10 >>>> to avoid sporadic failures in elastic runners. >>>> >>>> qemu_arm_vexpress_tz_defconfig tested locally with sucess. >>>> >>>> Fixes: >>>> https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084046 >>> Are you sure increasing the timeout will fix this failure? The >>> build-run.log contains another error: > [--SNIP--] >>> ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) >>> Using Device Tree in place at 40000000, end 400051f7 >>> So, to me, this is not a timeout issue, but an actual boot issue. >> >> The system stop in the middle of optee startup >> optee: dynamic shared memory is enabled > > I was very confused by the above. Indeed, the log file I downladed > earler really stopped at the error message I pasted. I am sure of that, > as I still had it in my ~/tmp directory, so I could really double-check. > > But now I downloaded it again, and indeed, there are much more traces, > up to that optee issue you point ed at. > > This is a really weird situation, that the download I had was only > partial... weird ineed. > >> Also, I got the same error message while testing locally. > > But testing locally should not have the same impact on boot time, would > it? The boot times out on the eleastic runners because they are too slow > (and many congtainers contend for the CPU there). But locally, it is > really surprising that you hit the exact same timeout issue, and the > exact same point in the boot sequence... I'm not able to reproduce the timeout locally but by looking at the timeout multiplier used for the Buildroot testsuite I would say that a sporadic failures. I restarted the job in gitlab and this time it succeeded: https://gitlab.com/buildroot.org/buildroot/-/jobs/1979108650 Best regards, Romain > > Anyway, can you resend your patch, as I marked it rejected in patchwork, > please? > > Regards, > Yann E. MORIN. > From gilles.talis at gmail.com Sun Jan 16 12:40:47 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 16 Jan 2022 13:40:47 +0100 Subject: [Buildroot] [PATCH] package/clpeak: new package In-Reply-To: <53f0b52a-0bf2-fbd3-a79f-ef3d607bb95a@mind.be> References: <20211024113654.88720-1-gilles.talis@gmail.com> <20211230180010.04c873f9@windsurf> <53f0b52a-0bf2-fbd3-a79f-ef3d607bb95a@mind.be> Message-ID: Le dim. 16 janv. 2022 ? 13:10, Arnout Vandecappelle a ?crit : > > > > On 16/01/2022 09:50, Gilles Talis wrote: > > Hi Thomas, > > > > thanks for the review. Somehow, I missed this email and just stumbled > > across it now. > > > > Le jeu. 30 d?c. 2021 ? 18:00, Thomas Petazzoni > > a ?crit : > >> > >> Hello Gilles, > >> > >> On Sun, 24 Oct 2021 13:36:54 +0200 > >> Gilles Talis wrote: > >> > >>> clpeak is a tool that profiles OpenCL devices to find > >>> their peak capacities > >>> > >>> Signed-off-by: Gilles Talis > >>> --- > >>> DEVELOPERS | 1 + > >>> package/Config.in | 1 + > >>> package/clpeak/Config.in | 14 ++++++++++++++ > >>> package/clpeak/clpeak.hash | 3 +++ > >>> package/clpeak/clpeak.mk | 13 +++++++++++++ > >>> 5 files changed, 32 insertions(+) > >>> create mode 100644 package/clpeak/Config.in > >>> create mode 100644 package/clpeak/clpeak.hash > >>> create mode 100644 package/clpeak/clpeak.mk > >> > >> Thanks for this package submission! Unfortunately, I'm afraid there is > >> an issue: it downloads stuff during the configure step. See below: > > Good catch! It seems like clpeak has a hidden dependency that I missed. > > Whilst I am here, one question: how do we deal with packages that have > > git submodules dependencies? Is it OK to let the download process > > download these dependencies? Even if the dependencies are available > > buildroot packages? > > We prefer to unbundle dependencies (i.e., use the buildroot package rather > than the submodule) if that is possible. However, some projects make that really > hard (like chromium...) so it's not a strict requirement, more a best effort thing. > > Regards, > Arnout thanks for the clarification Arnout! regards Gilles. > > > > >> > >>>>> clpeak 0777205be1d5681d5a76d46ec94588544e8462a5 Configuring > >> ... > >> -- The C compiler identification is GNU 9.3.0 > >> -- The CXX compiler identification is GNU 9.3.0 > >> -- Detecting C compiler ABI info > >> -- Detecting C compiler ABI info - done > >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > >> -- Detecting C compile features > >> -- Detecting C compile features - done > >> -- Detecting CXX compiler ABI info > >> -- Detecting CXX compiler ABI info - done > >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > >> -- Detecting CXX compile features > >> -- Detecting CXX compile features - done > >> -- Looking for CL_VERSION_2_2 > >> -- Looking for CL_VERSION_2_2 - found > >> -- Found OpenCL: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so (found version "2.2") > >> CMake Warning (dev) in CMakeLists.txt: > >> No project() command is present. The top-level CMakeLists.txt file must > >> contain a literal, direct call to the project() command. Add a line of > >> code such as > >> > >> project(ProjectName) > >> > >> near the top of the file, but after cmake_minimum_required(). > >> > >> CMake is pretending there is a "project(Project)" command on the first > >> line. > >> This warning is for project developers. Use -Wno-dev to suppress it. > >> > >> -- The C compiler identification is GNU 9.3.0 > >> -- The CXX compiler identification is GNU 9.3.0 > >> -- Detecting C compiler ABI info > >> -- Detecting C compiler ABI info - done > >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > >> -- Detecting C compile features > >> -- Detecting C compile features - done > >> -- Detecting CXX compiler ABI info > >> -- Detecting CXX compiler ABI info - done > >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > >> -- Detecting CXX compile features > >> -- Detecting CXX compile features - done > >> -- Configuring done > >> -- Generating done > >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build > >> gmake[1]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[2]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[3]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> [ 12%] Creating directories for 'hpp_headers' > >> [ 25%] Performing download step (git clone) for 'hpp_headers' > >> Cloning into 'hpp_headers'... > >> remote: Enumerating objects: 558, done. > >> remote: Counting objects: 100% (558/558), done. > >> remote: Compressing objects: 100% (396/396), done. > >> remote: Total 558 (delta 324), reused 355 (delta 155), pack-reused 0 > >> Receiving objects: 100% (558/558), 762.72 KiB | 5.45 MiB/s, done. > >> Resolving deltas: 100% (324/324), done. > >> Already on 'master' > >> Your branch is up to date with 'origin/master'. > >> Submodule 'external/CMock' (https://github.com/ThrowTheSwitch/CMock) registered for path 'external/CMock' > >> Submodule 'external/Unity' (https://github.com/ThrowTheSwitch/Unity) registered for path 'external/Unity' > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock'... > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/Unity'... > >> Submodule path 'external/CMock': checked out '7cc41ddfdd07dc5eb8359d278f439f14031d64ad' > >> Submodule 'vendor/c_exception' (https://github.com/throwtheswitch/cexception.git) registered for path 'external/CMock/vendor/c_exception' > >> Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/unity' > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception'... > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/unity'... > >> Submodule path 'external/CMock/vendor/c_exception': checked out 'dce9e8b26f2179439002e02d691429e81a32b6c0' > >> Submodule 'vendor/unity' (https://github.com/throwtheswitch/unity.git) registered for path 'external/CMock/vendor/c_exception/vendor/unity' > >> Cloning into '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers/external/CMock/vendor/c_exception/vendor/unity'... > >> Submodule path 'external/CMock/vendor/c_exception/vendor/unity': checked out '2c7629a0ae90ffe991b5fd08e4db8672f72ed64c' > >> Submodule path 'external/CMock/vendor/unity': checked out '031f3bbe45f8adf504ca3d13e6f093869920b091' > >> Submodule path 'external/Unity': checked out '7d2bf62b7e6afaf38153041a9d53c21aeeca9a25' > >> [ 37%] Performing update step for 'hpp_headers' > >> HEAD is now at 1df82b9 Add param traits for CL_DEVICE_SUPPORTED_REGISTER_ALLOCATIONS_ARM (#165) > >> [ 50%] No patch step for 'hpp_headers' > >> [ 62%] Performing configure step for 'hpp_headers' > >> -- The C compiler identification is GNU 9.3.0 > >> -- The CXX compiler identification is GNU 9.3.0 > >> -- Detecting C compiler ABI info > >> -- Detecting C compiler ABI info - done > >> -- Check for working C compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-gcc - skipped > >> -- Detecting C compile features > >> -- Detecting C compile features - done > >> -- Detecting CXX compiler ABI info > >> -- Detecting CXX compiler ABI info - done > >> -- Check for working CXX compiler: /home/thomas/projets/buildroot/output/host/bin/aarch64-linux-g++ - skipped > >> -- Detecting CXX compile features > >> -- Detecting CXX compile features - done > >> -- Configuring done > >> -- Generating done > >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build > >> [ 75%] Performing build step for 'hpp_headers' > >> gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > >> gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > >> [ 87%] Performing install step for 'hpp_headers' > >> gmake[4]: Entering directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > >> Install the project... > >> -- Install configuration: "Release" > >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL > >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/cl2.hpp > >> -- Installing: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include/CL/opencl.hpp > >> gmake[4]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build/hpp/src/hpp_headers-build' > >> [100%] Completed 'hpp_headers' > >> gmake[3]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> [100%] Built target hpp_headers > >> gmake[2]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> gmake[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp/build' > >> -- Selected OpenCL includes from /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/include;/home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5/clhpp_install/include > >> -- Selected OpenCL lib /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libOpenCL.so > >> -- Configuring done > >> -- Generating done > >> CMake Warning: > >> Manually-specified variables were not used by the project: > >> > >> BUILD_DOC > >> BUILD_DOCS > >> BUILD_EXAMPLE > >> BUILD_EXAMPLES > >> BUILD_TEST > >> BUILD_TESTING > >> BUILD_TESTS > >> > >> > >> -- Build files have been written to: /home/thomas/projets/buildroot/output/build/clpeak-0777205be1d5681d5a76d46ec94588544e8462a5 > >> > >> Also, while note related to clpeak, I did try to build this > >> configuration (which uses the NXP OpenCL provider): > >> > >> BR2_aarch64=y > >> BR2_TOOLCHAIN_EXTERNAL=y > >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > >> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y > >> BR2_INIT_NONE=y > >> BR2_SYSTEM_BIN_SH_NONE=y > >> # BR2_PACKAGE_BUSYBOX is not set > >> BR2_PACKAGE_CLPEAK=y > >> BR2_PACKAGE_FREESCALE_IMX=y > >> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y > >> BR2_PACKAGE_IMX_GPU_VIV=y > >> # BR2_TARGET_ROOTFS_TAR is not set > >> > >> and it fails with: > >> > >> /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/9.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: /home/thomas/projets/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib64/libGAL.so: undefined reference to `stat at GLIBC_2.33' > >> > >> And indeed the C library in this toolchain is glibc 2.31. So this means > >> that the libGAL library shipped by NXP in imx-gpu-viv will only work > >> with glibc >= 2.33. > > Good catch again. This is quite a bummer. I will look into that when > > time allows. > > > >> > >> Best regards, > >> > >> Thomas > >> -- > >> Thomas Petazzoni, CTO, Bootlin > >> Embedded Linux and Kernel engineering > >> https://bootlin.com > > thanks > > Gilles. > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From paul at crapouillou.net Sun Jan 16 13:39:03 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Sun, 16 Jan 2022 13:39:03 +0000 Subject: [Buildroot] [PATCH 1/1] Config.in: add option to only use ccache for BR In-Reply-To: <20220113210431.1361727-1-paul@crapouillou.net> References: <20220113210431.1361727-1-paul@crapouillou.net> Message-ID: <3X1T5R.ND9E62SV5PXU3@crapouillou.net> Le jeu., janv. 13 2022 at 21:04:31 +0000, Paul Cercueil a ?crit : > Add an option, disabled by default, to only use ccache for Buildroot > packages. > > When enabled, ccache will be used when building Buildroot itself, but > the toolchain exported as SDK will not make use of ccache to build > external programs, unless the "BR_USE_CCACHE" environment variable is > set. > > The motivation behind this change is to be able to speed up iterative > building of a Buildroot based distribution, without forcing the users > of > the SDK to use ccache, which has the problem of clobbering the s/clobbering/cluttering/ -Paul > filesystem in a hidden directory if the cache directory is left as > default, or trying to access a cache folder that existed on the > machine > that built the SDK but which may not exist on the machine on which it > was later installed. > > Signed-off-by: Paul Cercueil > --- > Config.in | 9 +++++++++ > linux/linux.mk | 4 ++++ > package/Makefile.in | 4 ++++ > toolchain/toolchain-wrapper.c | 5 +++++ > toolchain/toolchain-wrapper.mk | 4 ++++ > 5 files changed, 26 insertions(+) > > diff --git a/Config.in b/Config.in > index f0cd6f48ed..fec2332077 100644 > --- a/Config.in > +++ b/Config.in > @@ -374,6 +374,15 @@ config BR2_CCACHE_USE_BASEDIR > the section "COMPILING IN DIFFERENT DIRECTORIES" in the ccache > manual for more information. > > +config BR2_CCACHE_BR_ONLY > + bool "Only use ccache for building Buildroot packages" > + default n > + help > + When enabled, ccache will be used when building Buildroot > + itself, but the toolchain exported as SDK will not make use of > + ccache to build external programs, unless the "BR_USE_CCACHE" > + environment variable is set. > + > endif > > config BR2_ENABLE_DEBUG > diff --git a/linux/linux.mk b/linux/linux.mk > index 61fdc0c76c..339848e29b 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -69,6 +69,10 @@ LINUX_MAKE_ENV = \ > $(HOST_MAKE_ENV) \ > BR_BINARIES_DIR=$(BINARIES_DIR) > > +ifeq ($(BR2_CCACHE_BR_ONLY),y) > +LINUX_MAKE_ENV += BR_USE_CCACHE=1 > +endif > + > LINUX_INSTALL_IMAGES = YES > LINUX_DEPENDENCIES = host-kmod \ > $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ > diff --git a/package/Makefile.in b/package/Makefile.in > index 508ea7c366..34556fa7b0 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -263,6 +263,10 @@ export PERL5LIB=$(HOST_DIR)/lib/perl > > TARGET_MAKE_ENV = PATH=$(BR_PATH) > > +ifeq ($(BR2_CCACHE_BR_ONLY),y) > + TARGET_MAKE_ENV += BR_USE_CCACHE=1 > +endif > + > TARGET_CONFIGURE_OPTS = \ > $(TARGET_MAKE_ENV) \ > AR="$(TARGET_AR)" \ > diff --git a/toolchain/toolchain-wrapper.c > b/toolchain/toolchain-wrapper.c > index 0fb6064b1c..bf0194c8fc 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -510,6 +510,11 @@ int main(int argc, char **argv) > if (getenv("BR_NO_CCACHE")) > /* Skip the ccache call */ > exec_args++; > +#ifdef BR_CCACHE_BR_ONLY > + else if (!getenv("BR_USE_CCACHE")) > + /* Skip the ccache call */ > + exec_args++; > +#endif > #endif > > /* Debug the wrapper to see final arguments passed to the real > compiler. */ > diff --git a/toolchain/toolchain-wrapper.mk > b/toolchain/toolchain-wrapper.mk > index cbf46f15fa..cda9eaf342 100644 > --- a/toolchain/toolchain-wrapper.mk > +++ b/toolchain/toolchain-wrapper.mk > @@ -73,6 +73,10 @@ ifeq ($(BR2_CCACHE_USE_BASEDIR),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"' > endif > > +ifeq ($(BR2_CCACHE_BR_ONLY),y) > +TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BR_ONLY > +endif > + > ifeq ($(BR2_PIC_PIE),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR2_PIC_PIE > endif > -- > 2.34.1 > From giulio.benetti at benettiengineering.com Sun Jan 16 15:29:42 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 16 Jan 2022 16:29:42 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> References: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> Message-ID: <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> Hi Sergey, Peter, All, > Il giorno 16 gen 2022, alle ore 12:26, Sergey Kuzminov ha scritto: > > ?Changes: > - common scenarios for multiple boards to create the SD image: board/orangepi/common; > - extlinux.conf instead of boot.scr; I?ve seen other boards switching to extlinux.conf instead of boot.scr, but extlinux.conf doesn?t have any checksum while boot.scr does as I remember. I?ve missed previous discussion about this. @Peter as I recall you?ve suggested this. Sorry but I don?t remember the reason and I would still keep boot.scr. I?d prefer the system not booting than a system booting with partial bootlegs honestly. What about that? And? > - exclude FAT partition; > - defconfig refactoring; > - kernel: bump to version 5.12.19, if newer then BR2_PACKAGE_XR819_XRADIO will not compile; > - u-boot: bump to version 2022.01 > > Signed-off-by: Sergey Kuzminov > --- > board/orangepi/common/extlinux.conf | 5 ++ > board/orangepi/common/genimage.cfg | 19 +++++++ > board/orangepi/common/post-build.sh | 34 ++++++++++++ > board/orangepi/common/uboot-extras.config | 3 + > board/orangepi/orangepi-zero/boot.cmd | 9 --- > board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ > configs/orangepi_zero_defconfig | 67 ++++++++++++++--------- > 7 files changed, 102 insertions(+), 71 deletions(-) > create mode 100644 board/orangepi/common/extlinux.conf > create mode 100644 board/orangepi/common/genimage.cfg > create mode 100755 board/orangepi/common/post-build.sh > create mode 100644 board/orangepi/common/uboot-extras.config > delete mode 100644 board/orangepi/orangepi-zero/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg > > diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf > new file mode 100644 > index 0000000000..015f29270e > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,5 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + append root=PARTUUID=%PARTUUID% rootwait console=${console} > +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..fd250ef05d > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,19 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = gpt > + gpt-no-backup = true > + gpt-location = 1008K # 1MB - 16KB > + } > + > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB - 16KB > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh > new file mode 100755 > index 0000000000..296f94b174 > --- /dev/null > +++ b/board/orangepi/common/post-build.sh > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +linux_image() > +{ > + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then > + echo "uImage" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then > + echo "Image" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then > + echo "Image.gz" > + else > + echo "zImage" > + fi > +} > + > +generic_getty() > +{ > + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then > + echo "" > + else > + echo "s/\s*console=\S*//" > + fi > +} > + > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > + > +sed -e "$(generic_getty)" \ > + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ > + -e "s/%PARTUUID%/$PARTUUID/g" \ > + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > + > +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config > new file mode 100644 > index 0000000000..5aa97523d9 > --- /dev/null > +++ b/board/orangepi/common/uboot-extras.config > @@ -0,0 +1,3 @@ > +CONFIG_BOOTDELAY=0 > +CONFIG_USE_PREBOOT=y > +CONFIG_PREBOOT="setenv preboot;" > diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd > deleted file mode 100644 > index d094a64fe5..0000000000 > --- a/board/orangepi/orangepi-zero/boot.cmd > +++ /dev/null > @@ -1,9 +0,0 @@ > -setenv fdt_high ffffffff > - > -part uuid mmc 0:2 uuid > -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg > deleted file mode 100644 > index 32f5454ae6..0000000000 > --- a/board/orangepi/orangepi-zero/genimage.cfg > +++ /dev/null > @@ -1,36 +0,0 @@ > -# Minimal SD card image for the OrangePi Zero > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h2-plus-orangepi-zero.dtb", > - "boot.scr" > - } > - } > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..908bcea893 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,49 +1,64 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_VFPV4=y ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards with sunxi A7 and can speed things up. > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" > -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -# BR2_TARGET_ROOTFS_TAR is not set > +BR2_GCC_ENABLE_LTO=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > -BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.19" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > +BR2_TARGET_ROOTFS_TAR=n > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_GENIMAGE=y > > -# wireless driver and firmware > +# Wireless driver and firmware > +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x > BR2_PACKAGE_XR819_XRADIO=y > BR2_PACKAGE_ARMBIAN_FIRMWARE=y > BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y Can you point a test case? This way I could try to fix building and you could test if it works. Thank you Best regards ?- Giulio Benetti Benetti Engineering sas > > -# wireless support > +# Wireless support > BR2_PACKAGE_IW=y > BR2_PACKAGE_WIRELESS_TOOLS=y > BR2_PACKAGE_WIRELESS_TOOLS_LIB=y > @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > > -# spi flash support > +# Spi flash support > BR2_PACKAGE_MTD=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From heiko.thiery at gmail.com Sun Jan 16 16:14:11 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sun, 16 Jan 2022 17:14:11 +0100 Subject: [Buildroot] [PATCH v3] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220116161410.2796330-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- v3: - change offset value to use capitol 'K' value (thanks Guilio) - add info to uboot patches about submitting to upstream v2: - switch to extlinux - directly call genimage.sh - remove post-image.sh - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 7 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 59 ++++ 8 files changed, 511 insertions(+) create mode 100644 board/kontron/bl-imx8mm/extlinux.conf create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..93c5760489 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1179,7 +1179,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf new file mode 100644 index 0000000000..d38f7f81b7 --- /dev/null +++ b/board/kontron/bl-imx8mm/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..c98bc4f150 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,18 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 16K + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + image = "rootfs.ext4" + offset = 8M + partition-uuid = %PARTUUID% + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..6d76282def --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,31 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..a88d7aba87 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,305 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..5b5648cc14 --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,59 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.30.2 From gilles.talis at gmail.com Sun Jan 16 17:53:20 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 16 Jan 2022 18:53:20 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/clpeak: new package In-Reply-To: <20220116175320.453041-1-gilles.talis@gmail.com> References: <20220116175320.453041-1-gilles.talis@gmail.com> Message-ID: <20220116175320.453041-2-gilles.talis@gmail.com> clpeak is a tool that profiles OpenCL devices to find their peak capacities Signed-off-by: Gilles Talis --- v2: - Added opencl-clhpp dependency DEVELOPERS | 1 + package/Config.in | 1 + package/clpeak/Config.in | 15 +++++++++++++++ package/clpeak/clpeak.hash | 3 +++ package/clpeak/clpeak.mk | 13 +++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/clpeak/Config.in create mode 100644 package/clpeak/clpeak.hash create mode 100644 package/clpeak/clpeak.mk diff --git a/DEVELOPERS b/DEVELOPERS index 483afa4932..04b3f8fba9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1075,6 +1075,7 @@ N: Gilles Talis F: board/freescale/imx8mmevk/ F: configs/freescale_imx8mmevk_defconfig F: package/cctz/ +F: package/clpeak/ F: package/faad2/ F: package/fdk-aac/ F: package/httping/ diff --git a/package/Config.in b/package/Config.in index 08eb3ad809..b38d05b3b3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -87,6 +87,7 @@ menu "Debugging, profiling and benchmark" source "package/bonnie/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" + source "package/clpeak/Config.in" source "package/coremark/Config.in" source "package/coremark-pro/Config.in" source "package/dacapo/Config.in" diff --git a/package/clpeak/Config.in b/package/clpeak/Config.in new file mode 100644 index 0000000000..c83297549c --- /dev/null +++ b/package/clpeak/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_CLPEAK + bool "clpeak" + depends on BR2_PACKAGE_HAS_LIBOPENCL + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_PACKAGE_OPENCL_CLHPP + help + clpeak is a tool that profiles OpenCL devices + to find their peak capacities + + https://github.com/krrishnarraj/clpeak + +comment "clpeak needs an OpenCL provider, a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_PACKAGE_HAS_LIBOPENCL \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/clpeak/clpeak.hash b/package/clpeak/clpeak.hash new file mode 100644 index 0000000000..e0d2c1e92b --- /dev/null +++ b/package/clpeak/clpeak.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 1e9c3f959498253d6bb956dc786de7b3e4019264216a1781c06ae49a1d6600e5 clpeak-0777205be1d5681d5a76d46ec94588544e8462a5.tar.gz +sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/clpeak/clpeak.mk b/package/clpeak/clpeak.mk new file mode 100644 index 0000000000..5fa990fb34 --- /dev/null +++ b/package/clpeak/clpeak.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# clpeak +# +################################################################################ + +CLPEAK_VERSION = 0777205be1d5681d5a76d46ec94588544e8462a5 +CLPEAK_SITE = $(call github,krrishnarraj,clpeak,$(CLPEAK_VERSION)) +CLPEAK_LICENSE = Unlicense +CLPEAK_LICENSE_FILES = LICENSE +CLPEAK_DEPENDENCIES = libopencl opencl-clhpp + +$(eval $(cmake-package)) -- 2.32.0 From gilles.talis at gmail.com Sun Jan 16 17:53:19 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 16 Jan 2022 18:53:19 +0100 Subject: [Buildroot] [PATCH 1/2] package/opencl-clhpp: new package Message-ID: <20220116175320.453041-1-gilles.talis@gmail.com> opencl-clhpp are the OpenCL API C++ bindings Signed-off-by: Gilles Talis --- DEVELOPERS | 1 + package/Config.in | 1 + package/opencl-clhpp/Config.in | 10 ++++++++++ package/opencl-clhpp/opencl-clhpp.hash | 3 +++ package/opencl-clhpp/opencl-clhpp.mk | 16 ++++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/opencl-clhpp/Config.in create mode 100644 package/opencl-clhpp/opencl-clhpp.hash create mode 100644 package/opencl-clhpp/opencl-clhpp.mk diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..483afa4932 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1084,6 +1084,7 @@ F: package/libeXosip2/ F: package/libolm/ F: package/libosip2/ F: package/ocrad/ +F: package/opencl-clhpp/ F: package/opusfile/ F: package/restclient-cpp/ F: package/tesseract-ocr/ diff --git a/package/Config.in b/package/Config.in index 4df1474b91..08eb3ad809 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1564,6 +1564,7 @@ menu "Graphics" source "package/libvips/Config.in" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" + source "package/opencl-clhpp/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" source "package/opengl/Config.in" diff --git a/package/opencl-clhpp/Config.in b/package/opencl-clhpp/Config.in new file mode 100644 index 0000000000..12045be055 --- /dev/null +++ b/package/opencl-clhpp/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_OPENCL_CLHPP + bool "opencl-clhpp" + depends on BR2_INSTALL_LIBSTDCPP + help + opencl-clhpp are the OpenCL API C++ bindings + + http://github.khronos.org/OpenCL-CLHPP/ + +comment "opencl-clhpp needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash new file mode 100644 index 0000000000..27b27cd80c --- /dev/null +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -0,0 +1,3 @@ +# Locally Computed +sha256 869456032e60787eed9fceaeaf6c6cb4452bc0ff97e0f5a271510145a1c8f4d4 opencl-clhpp-2.0.16.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk new file mode 100644 index 0000000000..610cd45b62 --- /dev/null +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# opencl-clhpp +# +################################################################################ + +OPENCL_CLHPP_VERSION = 2.0.16 +OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) +OPENCL_CLHPP_LICENSE = Apache-2.0 +OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt +OPENCL_CLHPP_INSTALL_STAGING = YES + +# OpenCL_CLHPP is a header-only library +OPENCL_CLHPP_INSTALL_TARGET = NO + +$(eval $(cmake-package)) -- 2.32.0 From tambewilliam at gmail.com Sun Jan 16 19:23:20 2022 From: tambewilliam at gmail.com (William Tambe) Date: Sun, 16 Jan 2022 13:23:20 -0600 Subject: [Buildroot] BR2_PACKAGE_DHCP_CLIENT fails to build: readline/history.h: No such file or directory In-Reply-To: <420ac869-6aea-a492-7a74-3014b7bb4cf3@mind.be> References: <420ac869-6aea-a492-7a74-3014b7bb4cf3@mind.be> Message-ID: On Mon, Jan 10, 2022 at 1:33 AM Arnout Vandecappelle wrote: > > > > On 10/01/2022 00:46, William Tambe wrote: > > On Sun, Jan 9, 2022 at 2:08 PM Arnout Vandecappelle wrote: > >> > >> > >> > >> On 09/01/2022 19:18, William Tambe wrote: > >>> I am attempting to build: > >>> > >>> +BR2_PACKAGE_DHCP=y > >>> +BR2_PACKAGE_DHCP_CLIENT=y > >>> > >>> However it fails as follow complaining about not finding readline/history.h: > >>> > >>> making all in /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/bin/nsupdate > >>> /home/tambewilliam/Documents/buildroot-build/host/bin/pu32-elf-gcc > >> > >> pu32 doesn't exist in Buildroot, so this may very well be due to external changes. > > So, do you have external changes that may be the cause of this? IOW, can you > reproduce the problem on upstream Buildroot? > > >> > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35 > >>> -I../.. -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/lwres/include > >>> -I../../lib/lwres/unix/include -I../../lib/lwres/include > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/dns/include > >>> -I../../lib/dns/include > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/bind9/include > >>> -I../../lib/bind9/include > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isc/include > >>> -I../../lib/isc -I../../lib/isc/include -I../../lib/isc/unix/include > >>> -I../../lib/isc/pthreads/include -I../../lib/isc/noatomic/include > >>> -I/home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/lib/isccfg/include > >>> -I../../lib/isccfg/include -D_REENTRANT -DVERSION=\"9.11.35\" > >>> -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > >>> -D_FILE_OFFSET_BITS=64 -Os -g0 -static -W -Wall > >>> -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat > >>> -Wpointer-arith -fno-strict-aliasing -fno-delete-null-pointer-checks > >>> \ > >>> -DSESSION_KEYFILE=\"/var/run/named/session.key\" \ > >>> -c ./nsupdate.c > >>> ./nsupdate.c:104:10: fatal error: readline/history.h: No such file or directory > >>> 104 | #include > >>> | ^~~~~~~~~~~~~~~~~~~~ > >> > >> This sounds like you changed your configuration without doing 'make clean'. Is > >> that possible? > > > > I am building from clean or from scratch. > > > >> > >> Is BR2_PACKAGE_READLINE enabled in your configuration? Has it been built? > > > > Yes, BR2_PACKAGE_READLINE is enabled in my configuration. > > And does it get built? Does output/build/readline/.stamp_staging_installed exist? Yes it gets built and installed and .stamp_staging_installed exists. Below are related buildroot files listing: $ ls -ld buildroot-build/build/readline-8.1/.* drwxr-xr-x 6 tambewilliam tambewilliam 4096 Jan 16 12:58 buildroot-build/build/readline-8.1/. drwxr-xr-x 30 tambewilliam tambewilliam 4096 Jan 16 12:59 buildroot-build/build/readline-8.1/.. -rw-r--r-- 1 tambewilliam tambewilliam 84 Jan 16 12:58 buildroot-build/build/readline-8.1/.applied_patches_list -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.files-list-host.txt -rw-r--r-- 1 tambewilliam tambewilliam 799 Jan 16 12:58 buildroot-build/build/readline-8.1/.files-list-staging.txt -rw-r--r-- 1 tambewilliam tambewilliam 822 Jan 16 12:58 buildroot-build/build/readline-8.1/.files-list.txt -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_built -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_configured -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_downloaded -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_extracted -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_installed -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_patched -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_staging_installed -rw-r--r-- 1 tambewilliam tambewilliam 0 Jan 16 12:58 buildroot-build/build/readline-8.1/.stamp_target_installed > > The bind.mk file has this: > ifeq ($(BR2_PACKAGE_READLINE),y) > BIND_DEPENDENCIES += readline > else > BIND_CONF_OPTS += --with-readline=no > endif > > which should make sure that readline is built and installed before bind. This in > turn should make sure that output/host/*/sysroot/usr/include/readline/history.h > exists. When I search for history.h I find it in following locations: $ find buildroot-build/ | fgrep history.h buildroot-build/target/usr/include/readline/history.h buildroot-build/host/pu32-buildroot-linux-gnu/sysroot/usr/include/readline/history.h buildroot-build/build/bash-5.1/lib/readline/history.h buildroot-build/build/readline-8.1/doc/history.html buildroot-build/build/readline-8.1/history.h How to make buildroot use include path host/pu32-buildroot-linux-gnu/sysroot/usr/include/readline/ such that it will find history.h ? > > Regards, > Arnout > > > > >> > >> Regards, > >> Arnout > >> > >>> compilation terminated. > >>> make[5]: *** [Makefile:473: nsupdate.o] Error 1 > >>> make[4]: *** [Makefile:79: subdirs] Error 1 > >>> make[3]: *** [Makefile:88: subdirs] Error 1 > >>> make[2]: *** [package/pkg-generic.mk:270: > >>> /home/tambewilliam/Documents/buildroot-build/build/bind-9.11.35/.stamp_built] > >>> Error 2 > >>> make[1]: *** [Makefile:23: _all] Error 2 > >>> make[1]: Leaving directory '/home/tambewilliam/Documents/buildroot-build' > >>> make: *** [pu32/makefile:67: pu32-build/buildroot] Error 2 > >>> _______________________________________________ > >>> buildroot mailing list > >>> buildroot at buildroot.org > >>> https://lists.buildroot.org/mailman/listinfo/buildroot > >>> From giulio.benetti at benettiengineering.com Sun Jan 16 19:33:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 16 Jan 2022 20:33:55 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> References: <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> Message-ID: <7398CECE-A994-4692-BCA7-FD6ACB33395F@benettiengineering.com> Hi Sergey, +Cc buildroot ML, > Il giorno 16 gen 2022, alle ore 19:19, Sergey Kuzminov ha scritto: > > ?16.01.2022 18:29, Giulio Benetti: >> Hi Sergey, Peter, All, >> >> +# Architecture >> BR2_arm=y >> BR2_cortex_a7=y >> BR2_ARM_FPU_VFPV4=y >> ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards with sunxi A7 and can speed things up. >> > Hi, Giulio. I will test, thanks. +1 > > >>> +# Wireless driver and firmware >>> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >>> BR2_PACKAGE_XR819_XRADIO=y >>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >> Can you point a test case? This way I could try to fix building and you could test if it works. >> >> Thank you >> Best regards >> ?- >> Giulio Benetti >> Benetti Engineering sas >> > To check, set the parameters in the current version of Buildroot > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.15" > in the configs/orangepi_zero_defconfig file Ok, thank you. Best regards Giulio > > make orangepi_zero_defconfig > make > > From giulio.benetti at benettiengineering.com Sun Jan 16 19:35:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 16 Jan 2022 20:35:13 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> References: <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> Message-ID: <03E379C4-315C-4148-94E7-8A6971376DFB@benettiengineering.com> Add Peter in Cc. Can you please check below about extlinux? Giulio > Il giorno 16 gen 2022, alle ore 16:30, Giulio Benetti ha scritto: > > ?Hi Sergey, Peter, All, > >> Il giorno 16 gen 2022, alle ore 12:26, Sergey Kuzminov ha scritto: >> >> ?Changes: >> - common scenarios for multiple boards to create the SD image: board/orangepi/common; >> - extlinux.conf instead of boot.scr; > > I?ve seen other boards switching to extlinux.conf instead of boot.scr, but extlinux.conf doesn?t have any checksum while boot.scr does as I remember. > I?ve missed previous discussion about this. > > @Peter as I recall you?ve suggested this. Sorry but I don?t remember the reason and I would still keep boot.scr. I?d prefer the system not booting than a system booting with partial bootlegs honestly. > > What about that? > > And? > >> - exclude FAT partition; >> - defconfig refactoring; >> - kernel: bump to version 5.12.19, if newer then BR2_PACKAGE_XR819_XRADIO will not compile; >> - u-boot: bump to version 2022.01 >> >> Signed-off-by: Sergey Kuzminov >> --- >> board/orangepi/common/extlinux.conf | 5 ++ >> board/orangepi/common/genimage.cfg | 19 +++++++ >> board/orangepi/common/post-build.sh | 34 ++++++++++++ >> board/orangepi/common/uboot-extras.config | 3 + >> board/orangepi/orangepi-zero/boot.cmd | 9 --- >> board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ >> configs/orangepi_zero_defconfig | 67 ++++++++++++++--------- >> 7 files changed, 102 insertions(+), 71 deletions(-) >> create mode 100644 board/orangepi/common/extlinux.conf >> create mode 100644 board/orangepi/common/genimage.cfg >> create mode 100755 board/orangepi/common/post-build.sh >> create mode 100644 board/orangepi/common/uboot-extras.config >> delete mode 100644 board/orangepi/orangepi-zero/boot.cmd >> delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg >> >> diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf >> new file mode 100644 >> index 0000000000..015f29270e >> --- /dev/null >> +++ b/board/orangepi/common/extlinux.conf >> @@ -0,0 +1,5 @@ >> +LABEL default >> + kernel /boot/%LINUXIMAGE% >> + devicetreedir /boot >> + append root=PARTUUID=%PARTUUID% rootwait console=${console} >> +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 >> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >> new file mode 100644 >> index 0000000000..fd250ef05d >> --- /dev/null >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,19 @@ >> +image sdcard.img { >> + hdimage { >> + partition-table-type = gpt >> + gpt-no-backup = true >> + gpt-location = 1008K # 1MB - 16KB >> + } >> + >> + partition u-boot { >> + in-partition-table = false >> + image = "u-boot-sunxi-with-spl.bin" >> + offset = 8K >> + size = 1000K # 1MB - 8KB - 16KB >> + } >> + >> + partition rootfs { >> + image = "rootfs.ext4" >> + partition-uuid = %PARTUUID% >> + } >> +} >> diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh >> new file mode 100755 >> index 0000000000..296f94b174 >> --- /dev/null >> +++ b/board/orangepi/common/post-build.sh >> @@ -0,0 +1,34 @@ >> +#!/bin/sh >> + >> +linux_image() >> +{ >> + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then >> + echo "uImage" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then >> + echo "Image" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then >> + echo "Image.gz" >> + else >> + echo "zImage" >> + fi >> +} >> + >> +generic_getty() >> +{ >> + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then >> + echo "" >> + else >> + echo "s/\s*console=\S*//" >> + fi >> +} >> + >> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >> + >> +install -d "$TARGET_DIR/boot/extlinux/" >> + >> +sed -e "$(generic_getty)" \ >> + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ >> + -e "s/%PARTUUID%/$PARTUUID/g" \ >> + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >> + >> +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >> diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config >> new file mode 100644 >> index 0000000000..5aa97523d9 >> --- /dev/null >> +++ b/board/orangepi/common/uboot-extras.config >> @@ -0,0 +1,3 @@ >> +CONFIG_BOOTDELAY=0 >> +CONFIG_USE_PREBOOT=y >> +CONFIG_PREBOOT="setenv preboot;" >> diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd >> deleted file mode 100644 >> index d094a64fe5..0000000000 >> --- a/board/orangepi/orangepi-zero/boot.cmd >> +++ /dev/null >> @@ -1,9 +0,0 @@ >> -setenv fdt_high ffffffff >> - >> -part uuid mmc 0:2 uuid >> -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait >> - >> -fatload mmc 0 $kernel_addr_r zImage >> -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb >> - >> -bootz $kernel_addr_r - $fdt_addr_r >> diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg >> deleted file mode 100644 >> index 32f5454ae6..0000000000 >> --- a/board/orangepi/orangepi-zero/genimage.cfg >> +++ /dev/null >> @@ -1,36 +0,0 @@ >> -# Minimal SD card image for the OrangePi Zero >> -# >> -image boot.vfat { >> - vfat { >> - files = { >> - "zImage", >> - "sun8i-h2-plus-orangepi-zero.dtb", >> - "boot.scr" >> - } >> - } >> - size = 10M >> -} >> - >> -image sdcard.img { >> - hdimage { >> - } >> - >> - partition u-boot { >> - in-partition-table = "no" >> - image = "u-boot-sunxi-with-spl.bin" >> - offset = 8K >> - size = 1016K # 1MB - 8KB >> - } >> - >> - partition boot { >> - partition-type = 0xC >> - bootable = "true" >> - image = "boot.vfat" >> - } >> - >> - partition rootfs { >> - partition-type = 0x83 >> - image = "rootfs.ext4" >> - size = 512M >> - } >> -} >> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >> index 1c107b10e6..908bcea893 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -1,49 +1,64 @@ >> +# Architecture >> BR2_arm=y >> BR2_cortex_a7=y >> BR2_ARM_FPU_VFPV4=y > > ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards with sunxi A7 and can speed things up. > >> + >> +# System >> +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >> -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> BR2_SYSTEM_DHCP="eth0" >> -BR2_LINUX_KERNEL=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" >> -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> -BR2_LINUX_KERNEL_DTS_SUPPORT=y >> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> -BR2_TARGET_ROOTFS_EXT2=y >> -BR2_TARGET_ROOTFS_EXT2_4=y >> -# BR2_TARGET_ROOTFS_TAR is not set >> +BR2_GCC_ENABLE_LTO=y >> + >> +# Bootloader >> BR2_TARGET_UBOOT=y >> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" >> -BR2_PACKAGE_HOST_DOSFSTOOLS=y >> -BR2_PACKAGE_HOST_GENIMAGE=y >> -BR2_PACKAGE_HOST_MTOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" >> + >> +# Kernel >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.19" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >> + >> +# Filesystem >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> +BR2_TARGET_ROOTFS_TAR=n >> + >> +# Image >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >> + >> +# Required tools to create the SD image >> +BR2_PACKAGE_HOST_GENIMAGE=y >> >> -# wireless driver and firmware >> +# Wireless driver and firmware >> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >> BR2_PACKAGE_XR819_XRADIO=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y > > Can you point a test case? This way I could try to fix building and you could test if it works. > > Thank you > Best regards > ?- > Giulio Benetti > Benetti Engineering sas > >> >> -# wireless support >> +# Wireless support >> BR2_PACKAGE_IW=y >> BR2_PACKAGE_WIRELESS_TOOLS=y >> BR2_PACKAGE_WIRELESS_TOOLS_LIB=y >> @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y >> BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y >> BR2_PACKAGE_WPA_SUPPLICANT_CLI=y >> >> -# spi flash support >> +# Spi flash support >> BR2_PACKAGE_MTD=y >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From mail at dbrgn.ch Sun Jan 16 20:15:57 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Sun, 16 Jan 2022 21:15:57 +0100 Subject: [Buildroot] [PATCH 1/1] configs/pcengines_apu2_defconfig: bump kernel to 5.16 Message-ID: <20220116211557.71866ff6@c3po> This fixes the compile errors that were present with the previous kernel version (4.19). Signed-off-by: Danilo Bargen --- configs/pcengines_apu2_defconfig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 68cebb8f6a..eb30f6aee7 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -1,16 +1,26 @@ +# Architecture BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_HOSTNAME="apu2" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_SYSTEM_DHCP="eth0" + +# Kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" + +# Default hostname and TTY +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Networking +BR2_SYSTEM_DHCP="eth0" + +# Rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" BR2_TARGET_ROOTFS_ISO9660_HYBRID=y -# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_SYSLINUX=y -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 21:08:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 22:08:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.4.3 Message-ID: <20220116210816.3210061-1-fontaine.fabrice@gmail.com> Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 https://blog.hartwork.org/posts/expat-2-4-3-released https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 8cf563d8f5..0853c3c76d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ -md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz -sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ +md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz +sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz # Locally calculated -sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb1cfd8c8a..a7ace66095 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.1 +EXPAT_VERSION = 2.4.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 21:49:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 22:49:53 +0100 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5webkit: widgets are mandatory Message-ID: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at /home/fabrice/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): Could not find a package configuration file provided by "Qt5Widgets" with any of the following names: Qt5WidgetsConfig.cmake qt5widgets-config.cmake Add the installation prefix of "Qt5Widgets" to CMAKE_PREFIX_PATH or set "Qt5Widgets_DIR" to a directory containing one of the above files. If "Qt5Widgets" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): Source/cmake/OptionsQt.cmake:646 (find_package) Source/cmake/WebKitCommon.cmake:51 (include) CMakeLists.txt:137 (include) Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index b7beb2b252..68b679dfcd 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5SENSORS select BR2_PACKAGE_QT5WEBCHANNEL -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 21:49:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 22:49:54 +0100 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5webkit: fix build without opengl In-Reply-To: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Message-ID: <20220116214955.3231899-2-fontaine.fabrice@gmail.com> Fix the following build failure without opengl raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at Source/cmake/OptionsQt.cmake:592 (message): Qt with OpenGL support is required for ENABLE_OPENGL WebKit2 unconditionally depends on TextureMapperGL.h and tools builds QtTestBrowser which unconditionally depends on QtOpenGL Fixes: - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 3af1918a46..de3c428fbe 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=ON \ + -DENABLE_WEBKIT2=ON +else +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=OFF \ + -DENABLE_WEBKIT2=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative endif QT5WEBKIT_CONF_OPTS += \ + -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DUSE_LIBHYPHEN=OFF -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 21:49:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 22:49:55 +0100 Subject: [Buildroot] [PATCH 3/3] package/qt5/qt5webkit: build shared core In-Reply-To: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Message-ID: <20220116214955.3231899-3-fontaine.fabrice@gmail.com> Build JavaScriptCore and WebCore as shared libraries to avoid a build failure Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/qt5/qt5webkit/qt5webkit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index de3c428fbe..565c57e813 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -42,6 +42,7 @@ QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DSHARED_CORE=ON \ -DUSE_LIBHYPHEN=OFF $(eval $(cmake-package)) -- 2.34.1 From mail at dbrgn.ch Sun Jan 16 22:04:04 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Sun, 16 Jan 2022 23:04:04 +0100 Subject: [Buildroot] Hash verification from GitHub Message-ID: <20220116230404.71f68dbb@c3po> Hello folks I'm trying to create a new buildroot package (my first one). This is what the makefile (tealdeer.mk) looks like: TEALDEER_VERSION = 1.5.0 TEALDEER_SITE = $(call github,dbrgn,tealdeer,v$(TEALDEER_VERSION)) TEALDEER_LICENSE = Apache-2.0 or MIT TEALDEER_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT $(eval $(cargo-package)) The URL should expand to https://github.com/dbrgn/tealdeer/archive/v1.5.0/tealdeer-1.5.0.tar.gz. To generate the checksum, I ran: $ sha256sum tealdeer-1.5.0.tar.gz 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a tealdeer-1.5.0.tar.gz I also added a hash file (tealdeer.hash): # Locally generated sha256 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a tealdeer-1.5.0.tar.gz sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 a313b5e62b80a08f3aae0fa62ff3de8482ef55247299eb352ab44f87ef456b1b LICENSE-MIT When building this package, checksum verification fails every time. ERROR: tealdeer-1.5.0.tar.gz has wrong sha256 hash: ERROR: expected: 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a ERROR: got : 42febf9ee84721b9230077d62e2fc51201fd59624d3c776ccc1a634788768a60 ERROR: Incomplete download, or man-in-the-middle (MITM) attack No matter how I download the file (via wget, through the GitHub web UI, etc), it always results in the SHA256 checksum starting with 009..., but buildroot always thinks it should be 42f... I also tried changing the TEALDEER_SITE variable as follows: TEALDEER_SITE = https://github.com/dbrgn/tealdeer/archive/v$(TEALDEER_VERSION) ...to ensure that this URL is *really* being downloaded, but it fails every time. Full build log can be found here: https://gist.github.com/dbrgn/cc9e96051a079f5b63c531ca3c195954 Does someone have any pointers why the hash verification would fail in this case? It must be some obvious mistake I'm making, but I cannot figure out what it is. Best regards, Danilo Bargen From fontaine.fabrice at gmail.com Sun Jan 16 22:03:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 23:03:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: fix CVE-2022-22707 Message-ID: <20220116220302.3434242-1-fontaine.fabrice@gmail.com> In lighttpd 1.4.46 through 1.4.63, the mod_extforward_Forwarded function of the mod_extforward plugin has a stack-based buffer overflow (4 bytes representing -1), as demonstrated by remote denial of service (daemon crash) in a non-default configuration. The non-default configuration requires handling of the Forwarded header in a somewhat unusual manner. Also, a 32-bit system is much more likely to be affected than a 64-bit system. Signed-off-by: Fabrice Fontaine --- ...x-out-of-bounds-OOB-write-fixes-3134.patch | 94 +++++++++++++++++++ package/lighttpd/lighttpd.mk | 3 + 2 files changed, 97 insertions(+) create mode 100644 package/lighttpd/0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch diff --git a/package/lighttpd/0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch b/package/lighttpd/0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch new file mode 100644 index 0000000000..2cad8a6d18 --- /dev/null +++ b/package/lighttpd/0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch @@ -0,0 +1,94 @@ +From 8c62a890e23f5853b1a562b03fe3e1bccc6e7664 Mon Sep 17 00:00:00 2001 +From: povcfe +Date: Wed, 5 Jan 2022 11:11:09 +0000 +Subject: [PATCH] [mod_extforward] fix out-of-bounds (OOB) write (fixes #3134) + +(thx povcfe) + +(edited: gstrauss) + +There is a potential remote denial of service in lighttpd mod_extforward +under specific, non-default and uncommon 32-bit lighttpd mod_extforward +configurations. + +Under specific, non-default and uncommon lighttpd mod_extforward +configurations, a remote attacker can trigger a 4-byte out-of-bounds +write of value '-1' to the stack. This is not believed to be exploitable +in any way beyond triggering a crash of the lighttpd server on systems +where the lighttpd server has been built 32-bit and with compiler flags +which enable a stack canary -- gcc/clang -fstack-protector-strong or +-fstack-protector-all, but bug not visible with only -fstack-protector. + +With standard lighttpd builds using -O2 optimization on 64-bit x86_64, +this bug has not been observed to cause adverse behavior, even with +gcc/clang -fstack-protector-strong. + +For the bug to be reachable, the user must be using a non-default +lighttpd configuration which enables mod_extforward and configures +mod_extforward to accept and parse the "Forwarded" header from a trusted +proxy. At this time, support for RFC7239 Forwarded is not common in CDN +providers or popular web server reverse proxies. It bears repeating that +for the user to desire to configure lighttpd mod_extforward to accept +"Forwarded", the user must also be using a trusted proxy (in front of +lighttpd) which understands and actively modifies the "Forwarded" header +sent to lighttpd. + +lighttpd natively supports RFC7239 "Forwarded" +hiawatha natively supports RFC7239 "Forwarded" + +nginx can be manually configured to add a "Forwarded" header +https://www.nginx.com/resources/wiki/start/topics/examples/forwarded/ + +A 64-bit build of lighttpd on x86_64 (not known to be affected by bug) +in front of another 32-bit lighttpd will detect and reject a malicious +"Forwarded" request header, thereby thwarting an attempt to trigger +this bug in an upstream 32-bit lighttpd. + +The following servers currently do not natively support RFC7239 Forwarded: +nginx +apache2 +caddy +node.js +haproxy +squid +varnish-cache +litespeed + +Given the general dearth of support for RFC7239 Forwarded in popular +CDNs and web server reverse proxies, and given the prerequisites in +lighttpd mod_extforward needed to reach this bug, the number of lighttpd +servers vulnerable to this bug is estimated to be vanishingly small. +Large systems using reverse proxies are likely running 64-bit lighttpd, +which is not known to be adversely affected by this bug. + +In the future, it is desirable for more servers to implement RFC7239 +Forwarded. lighttpd developers would like to thank povcfe for reporting +this bug so that it can be fixed before more CDNs and web servers +implement RFC7239 Forwarded. + +x-ref: + "mod_extforward plugin has out-of-bounds (OOB) write of 4-byte -1" + https://redmine.lighttpd.net/issues/3134 + (not yet written or published) + CVE-2022-22707 + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/8c62a890e23f5853b1a562b03fe3e1bccc6e7664] +Signed-off-by: Fabrice Fontaine +--- + src/mod_extforward.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mod_extforward.c b/src/mod_extforward.c +index 733231fd2..1a04befa6 100644 +--- a/src/mod_extforward.c ++++ b/src/mod_extforward.c +@@ -715,7 +715,7 @@ static handler_t mod_extforward_Forwarded (request_st * const r, plugin_data * c + while (s[i] == ' ' || s[i] == '\t') ++i; + if (s[i] == ';') { ++i; continue; } + if (s[i] == ',') { +- if (j >= (int)(sizeof(offsets)/sizeof(int))) break; ++ if (j >= (int)(sizeof(offsets)/sizeof(int))-1) break; + offsets[++j] = -1; /*("offset" separating params from next proxy)*/ + ++i; + continue; diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 5d53767263..eb9556e619 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -39,6 +39,9 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +# 0002-mod_extforward-fix-out-of-bounds-OOB-write-fixes-3134.patch +LIGHTTPD_IGNORE_CVES += CVE-2022-22707 + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 16 22:07:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 16 Jan 2022 23:07:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: fix static build Message-ID: <20220116220724.3460985-1-fontaine.fabrice@gmail.com> Fix the following static build failure raised since the addition of the package in commit 03ca6f4e39874583060317e7e15e9e360220877e: >>> liburing 2.1 Installing to staging directory PATH="/home/buildroot/autobuild/instance-3/output-1/host/bin:/home/buildroot/autobuild/instance-3/output-1/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-3/output-1/build/liburing-2.1 DESTDIR=/home/buildroot/autobuild/instance-3/output-1/host/arc-buildroot-linux-uclibc/sysroot install make[1]: Entering directory '/home/buildroot/autobuild/instance-3/output-1/build/liburing-2.1' sed -e "s%@prefix@%/usr%g" \ -e "s%@libdir@%/usr/lib%g" \ -e "s%@includedir@%/usr/include%g" \ -e "s%@NAME@%liburing%g" \ -e "s%@VERSION@%2.0%g" \ liburing.pc.in >liburing.pc make[2]: Entering directory '/home/buildroot/autobuild/instance-3/output-1/build/liburing-2.1/src' CC setup.os CC queue.os CC syscall.os CC register.os CC liburing.so.2.1.0 /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(__uClibc_main.os): in function `__uClibc_fini': __uClibc_main.c:(.text+0xa2): undefined reference to `__fini_array_start' Fixes: - http://autobuild.buildroot.org/results/54c67e0f5bd2b5f520a250dc13b5846f94fc1790 Signed-off-by: Fabrice Fontaine --- package/liburing/liburing.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index 74ce4156f8..874e268d43 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -30,11 +30,13 @@ define LIBURING_BUILD_CMDS endef define LIBURING_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D) \ + DESTDIR=$(STAGING_DIR) install endef define LIBURING_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) $(LIBURING_MAKE_OPTS) -C $(@D) \ + DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) -- 2.34.1 From james.hilliard1 at gmail.com Sun Jan 16 22:14:58 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 15:14:58 -0700 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <20220116230404.71f68dbb@c3po> References: <20220116230404.71f68dbb@c3po> Message-ID: On Sun, Jan 16, 2022 at 3:04 PM Danilo Bargen wrote: > > Hello folks > > I'm trying to create a new buildroot package (my first one). This is > what the makefile (tealdeer.mk) looks like: > > TEALDEER_VERSION = 1.5.0 > TEALDEER_SITE = $(call github,dbrgn,tealdeer,v$(TEALDEER_VERSION)) > TEALDEER_LICENSE = Apache-2.0 or MIT > TEALDEER_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT > $(eval $(cargo-package)) > > The URL should expand to > https://github.com/dbrgn/tealdeer/archive/v1.5.0/tealdeer-1.5.0.tar.gz. > To generate the checksum, I ran: > > $ sha256sum tealdeer-1.5.0.tar.gz > 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a tealdeer-1.5.0.tar.gz Just use the hash buildroot generated for you, it should be correct. > > I also added a hash file (tealdeer.hash): > > # Locally generated > sha256 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a tealdeer-1.5.0.tar.gz > sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE > sha256 a313b5e62b80a08f3aae0fa62ff3de8482ef55247299eb352ab44f87ef456b1b LICENSE-MIT > > When building this package, checksum verification fails every time. > > ERROR: tealdeer-1.5.0.tar.gz has wrong sha256 hash: > ERROR: expected: 00902a50373ab75fedec4578c6c2c02523fad435486918ad9a86ed01f804358a > ERROR: got : 42febf9ee84721b9230077d62e2fc51201fd59624d3c776ccc1a634788768a60 Use this hash. > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > > No matter how I download the file (via wget, through the GitHub web UI, > etc), it always results in the SHA256 checksum starting with 009..., > but buildroot always thinks it should be 42f... I also tried changing > the TEALDEER_SITE variable as follows: Yeah, it's not going to match since buildroot is doing stuff like vendoring the cargo deps before generating the tarball(to ensure that the package can be built from the tarball without having to download anything additional from cargo): https://github.com/buildroot/buildroot/blob/master/support/download/cargo-post-process > > TEALDEER_SITE = https://github.com/dbrgn/tealdeer/archive/v$(TEALDEER_VERSION) > > ...to ensure that this URL is *really* being downloaded, but it fails > every time. > > Full build log can be found here: > https://gist.github.com/dbrgn/cc9e96051a079f5b63c531ca3c195954 You can see it vendoring the deps in the log here: https://gist.github.com/dbrgn/cc9e96051a079f5b63c531ca3c195954#file-gistfile1-txt-L23-L200 > > Does someone have any pointers why the hash verification would fail in > this case? It must be some obvious mistake I'm making, but I cannot > figure out what it is. > > Best regards, > Danilo Bargen > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From mail at dbrgn.ch Sun Jan 16 22:37:58 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Sun, 16 Jan 2022 23:37:58 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: References: <20220116230404.71f68dbb@c3po> Message-ID: <20220116233758.59918490@c3po> Hello James > Just use the hash buildroot generated for you, it should be correct. > (...) > Yeah, it's not going to match since buildroot is doing stuff like > vendoring the cargo deps before generating the tarball Ahh, that explains it. Does this mean that for Cargo based packages, it will always be TOFU and checksums provided by the project / maintainer cannot be used (because they will mismatch)? Danilo From james.hilliard1 at gmail.com Sun Jan 16 22:51:16 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 16 Jan 2022 15:51:16 -0700 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <20220116233758.59918490@c3po> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> Message-ID: On Sun, Jan 16, 2022 at 3:38 PM Danilo Bargen wrote: > > Hello James > > > Just use the hash buildroot generated for you, it should be correct. > > (...) > > Yeah, it's not going to match since buildroot is doing stuff like > > vendoring the cargo deps before generating the tarball > > Ahh, that explains it. Does this mean that for Cargo based packages, it > will always be TOFU and checksums provided by the project / maintainer > cannot be used (because they will mismatch)? A maintainer could sign the tarball generated by buildroot and upload it to github releases if they want. As you can see the script will bail out if the tarball already has vendored deps: https://github.com/buildroot/buildroot/blob/6e4791b751c0f8e0ba218da2c22e71d3e1436b5d/support/download/cargo-post-process#L16-L19 So as long as the upstream release tarball has vendored deps the hash should not change AFAIU. > > Danilo From mail at dbrgn.ch Sun Jan 16 23:18:14 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 00:18:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/tealdeer: new package Message-ID: <20220117001814.2645cd1b@c3po> Tealdeer is a fast and full-featured tldr client. tldr pages are simplified and community-driven man pages, see https://tldr.sh/ for more information. https://github.com/dbrgn/tealdeer/ Signed-off-by: Danilo Bargen --- DEVELOPERS | 1 + package/Config.in | 1 + package/tealdeer/Config.in | 10 ++++++++++ package/tealdeer/tealdeer.hash | 4 ++++ package/tealdeer/tealdeer.mk | 12 ++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/tealdeer/Config.in create mode 100644 package/tealdeer/tealdeer.hash create mode 100644 package/tealdeer/tealdeer.mk diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..d2f23968d0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -643,6 +643,7 @@ N: Daniel Sangue F: package/libftdi1/ N: Danilo Bargen +F: package/tealdeer/ F: board/pcengines/apu2/ F: configs/pcengines_apu2_defconfig diff --git a/package/Config.in b/package/Config.in index 4df1474b91..6e5e69a4f1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2604,6 +2604,7 @@ menu "System tools" source "package/systemd-bootchart/Config.in" source "package/sysvinit/Config.in" source "package/tar/Config.in" + source "package/tealdeer/Config.in" source "package/thermald/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" diff --git a/package/tealdeer/Config.in b/package/tealdeer/Config.in new file mode 100644 index 0000000000..96ed81614b --- /dev/null +++ b/package/tealdeer/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_TEALDEER + bool "tealdeer" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + A fast and full-featured tldr client. tldr pages are + simplified and community-driven man pages, see + https://tldr.sh/ for more information. + + https://github.com/dbrgn/tealdeer/ diff --git a/package/tealdeer/tealdeer.hash b/package/tealdeer/tealdeer.hash new file mode 100644 index 0000000000..0e53174841 --- /dev/null +++ b/package/tealdeer/tealdeer.hash @@ -0,0 +1,4 @@ +# Locally generated +sha256 42febf9ee84721b9230077d62e2fc51201fd59624d3c776ccc1a634788768a60 tealdeer-1.5.0.tar.gz +sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE +sha256 a313b5e62b80a08f3aae0fa62ff3de8482ef55247299eb352ab44f87ef456b1b LICENSE-MIT diff --git a/package/tealdeer/tealdeer.mk b/package/tealdeer/tealdeer.mk new file mode 100644 index 0000000000..c396225098 --- /dev/null +++ b/package/tealdeer/tealdeer.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# tealdeer +# +################################################################################ + +TEALDEER_VERSION = 1.5.0 +TEALDEER_SITE = $(call github,dbrgn,tealdeer,v$(TEALDEER_VERSION)) +TEALDEER_LICENSE = Apache-2.0 or MIT +TEALDEER_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) -- 2.34.1 From festevam at gmail.com Mon Jan 17 02:05:53 2022 From: festevam at gmail.com (Fabio Estevam) Date: Sun, 16 Jan 2022 23:05:53 -0300 Subject: [Buildroot] [PATCH] configs/mx6sx_udoo_neo: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220117020553.749592-1-festevam@gmail.com> Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 Signed-off-by: Fabio Estevam --- configs/mx6sx_udoo_neo_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 3e1dc33bd4ba..793d992ce7a1 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -13,6 +13,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -- 2.25.1 From david.oberhollenzer at sigma-star.at Mon Jan 17 06:11:12 2022 From: david.oberhollenzer at sigma-star.at (David Oberhollenzer) Date: Mon, 17 Jan 2022 06:11:12 +0000 Subject: [Buildroot] [ANNOUNCE] mtd-utils-2.1.4 is released In-Reply-To: <20220110121715.GA6032@falbala.internal.home.lespocky.de> References: <20220110121715.GA6032@falbala.internal.home.lespocky.de> Message-ID: <816f8625-a002-e3b5-8065-c61e4affa431@sigma-star.at> Hi Alex, On 1/10/22 13:17, Alexander Dahl wrote: > I tried to verify the gpg signature, but I could not find a public > key. At https://keys.openpgp.org/ you only get a not working key: > > gpg: key BCE5DC3C741A02D1: new key but contains no user ID - skipped > I originally uploaded the key to the MTD Key Server: https://pgp.mit.edu/pks/lookup?op=get&search=0xBCE5DC3C741A02D1 using the key from there I can verify the tarball on a clean Debian VM. If I managed to tickle the new Thunderbird GPG support the right way (and Protonmail doesn't mangle it somehow), this mail should also be signed. > I also searched at http://www.linux-mtd.infradead.org/index.html and > could not find a key, could you please point us to a recent version? > Yes, that sounds like a good idea. I will look into updating the website and adding the key. Greetings, David -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenPGP_0xBCE5DC3C741A02D1.asc Type: application/pgp-keys Size: 2487 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenPGP_signature Type: application/pgp-signature Size: 505 bytes Desc: not available URL: From thomas.petazzoni at bootlin.com Mon Jan 17 06:59:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 17 Jan 2022 06:59:53 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-16 Message-ID: <20220117070001.B4A38401A2@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-16 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 66 | 8 | 0 | 74 | 2021.11.x | 30 | 3 | 0 | 33 | master | 104 | 38 | 0 | 142 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 7 host-riscv-isa-sim-1.1.0 | 6 guile-3.0.7 | 3 mesa3d-21.3.3 | 3 frr-8.1 | 2 gensio-2.2.9 | 2 ksmbd-tools-3.4.3 | 2 perl-5.34.0 | 2 babeltrace2-2.0.4 | 1 bat-0.18.3 | 1 bluez5_utils-5.63 | 1 liburing-2.1 | 1 log4cxx-0.12.0 | 1 mongodb-4.2.11 | 1 nodejs-14.18.2 | 1 pcsc-lite-1.9.5 | 1 qt5base-5.15.2 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | babeltrace2-2.0.4 | NOK | http://autobuild.buildroot.net/results/9ce563325410cddd58313fbf04420591e6815684 | i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/1d68b65f578d75bd27652de26d9b93a4b9c3f661 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d06d69a95fa298d7517b55977fbb98451809db78 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b55ffe8056c1819f9e8a9c88a8b52b8fe8458cb8 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7ee89dc6fc97b1f3514d1f0d6ceaef83686a11bf | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/a90da9d54d7c561bc067821ab0559fe32eae88b3 | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/e6c40e34812c6ab2a8c0e0f8bada59b5ddbcf68a | sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/4cfb36b4f05dbfcfbf127f30c96db41f8692edf2 | ORPH riscv64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/5aadc06cf03fc06ae21383c20f817cce8cc1436f | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/e1aa5789619af7567015d67ef969b34d594a5c2d | ORPH x86_64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/a99e56968e7cdc7889ebf1a0f0b45e5816c096d6 | arc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/372a39360c185f20c709aad861202b6a3e2b6412 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/c1f5bdf9da6653ec1ef8a43137e682a385647ea3 | i586 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/9f6785fc25524636ba0d32e95424a681a052cb42 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/89f5d2420a4d52879e7ef9900eb395928a00475f | riscv32 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/2977a8c7f3fc7d9c34dd8b234cc74eca132a1045 | riscv32 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/3b1b2e59d67cd81614730ba5914f05e55a6c084d | powerpc | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/61d0c019ebcd0970c0a61bd495b1794a923c9730 | arc | liburing-2.1 | NOK | http://autobuild.buildroot.net/results/54c67e0f5bd2b5f520a250dc13b5846f94fc1790 | mips64el | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/0ff9765a96aee7dc8b5d8e49b7f2dbd645108709 | riscv64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/6f4139caf4c3c7239f1549fd8a633f60bd436584 | xtensa | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/491ed94925c81b8ce8c6e16540b7e6460dfbec54 | arm | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/47411c1a65184a59133fa140dda1ae8452c73345 | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/b7bf4257e98727f95106299847afff31d8eba32c | mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/022f35125bdc63f05d726391043a3f9f548c4df3 | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/60b909cdb7b8d3086711ca1d8e8a775fdb43fe64 | ORPH arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/941a5e4dee27d44b1f1d643944fc368190c48f5c | arm | perl-5.34.0 | NOK | http://autobuild.buildroot.net/results/27280c26829a725aa621962c83e634da0277cc28 | x86_64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/428efda63532e16897d51dc85f30da9ae3df9d61 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b2044d07d71f5e03a0eac1810b12b9500915a3f4 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5896a5dcc9480aa24375bdbe5a62efaaa252b988 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/8594285cd48b41d19471dc9af70268dfb682054a | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/93aa01ccbbdc58222f928ca8197a726d29efd00a | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c8ab63c451b60650e2f5ae4b9ed34b18c91c168a | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6480fa751d44ecc9c8700687490e37f66513d821 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9137546d039c6387a40b2028e84ca2650f89acf9 | arm | unknown | NOK | http://autobuild.buildroot.net/results/4c4e11bb5766d59d5369e47453ed5e6e303c9cf0 | sparc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/df245d7530e527c81db8ab843f20dda95653355d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 zeromq-4.3.4 | 2 gensio-2.2.3 | 1 gnuradio-3.8.1.0 | 1 mesa3d-20.3.5 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/67826e60c6b7c348baf815d2ad2237f0f367ec1a | sh4 | gnuradio-3.8.1.0 | NOK | http://autobuild.buildroot.net/results/283389f13740f6959173b1ee267c7867456ea268 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/67f177ed41acd7b6dd6a49c6df47b56b9a89aee4 | arc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/e28ed95e37ec4c85a8a31617c24d58b998f5e24e | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/6d491bc6eeb1f4690b3c015b70dcfc7ba5c4d670 | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/0fcf92fdd1c4693bbe3eb505791c5bf2e4ab3783 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/be2f09eb2330b55c26bcee0e273e2d6b44124a15 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/46ef40ed721f5dc2a4f271b54c53255d361d25e1 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 1 libqmi-1.30.2 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/f85424157a5fdab398ba118c75d51474dced92bb | powerpc64le | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/d68c44928da5a1f7025fd005905ee8f5b0d3d287 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7c37b79f66d9b2daa284ee9cd5095d9fbcefc5d5 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- acpica | DISTRO | https://release-monitoring.org/project/00018 | 20200717 | 20211217 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 41.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.3.1 | 4.5.2 | alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.6 | 1.2.6.1 | alsa-plugins | DISTRO | https://release-monitoring.org/project/00041 | 1.2.5 | 1.2.6 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 12.0.0_r27 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.0 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.42.0 | avro-c | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.10 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 19.03.14 | 20.10.11 | ORPH bash | DISTRO | https://release-monitoring.org/project/00166 | 5.1 | 5.1.16 | ORPH bat | DISTRO | https://release-monitoring.org/project/241901 | 0.18.3 | 0.19.0 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2021.4 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.1 | 2021.4 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.5.0 | bcg729 | DISTRO | https://release-monitoring.org/project/14743 | 1.0.4 | 1.1.1 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.0.66 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.66 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.66 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.4 | ORPH bind | DISTRO | https://release-monitoring.org/project/14923 | 9.11.36 | 9.17.21 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.37 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 22.0 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.1.3 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.15.1 | 5.16 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.09 | 3.21 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.34.1 | 1.35.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.7 | 0.5.9 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.4 | 0.5.5 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.4 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.5.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.4.34 | 1.4.36 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.1 | 4.2 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.13 | 6.14 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.17.1 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.4 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.0 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.1 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.1 | 4.3.2 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.8 | 1.5.9 | cryptsetup | DISTRO | https://release-monitoring.org/project/13709 | 2.4.2 | 2.4.3 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.10 | 1.28.11 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.2.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.11.3 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.2.1 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.0.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.5 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.6.1 | 1.8.0 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20211214 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.11 | 20.10.12 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.11 | 20.10.12 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 37 | 38 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.0 | 1.26.1 | eigen | DISTRO | https://release-monitoring.org/project/00666 | 3.3.7 | 3.4.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 20.07 | 21.12 | elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.13.2 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.0 | 0.25.1 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.17 | 1.0.21 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-idna | DISTRO | https://release-monitoring.org/project/45374 | 6.0.0 | 6.1.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.9.0 | 1.11.2 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.6.10 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.9 | 1.0.16 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.25 | 1.0.29 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.10 | 1.0.14 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.7 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.6 | 1.0.8 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.38 | 1.0.45 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.23 | 1.0.27 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.39 | 1.2.0 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.9 | 1.1.13 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.20 | 1.0.24 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.44 | 1.1.48 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.4.10 | 1.5.6 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.28 | 1.0.32 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.8 | 1.0.12 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.9 | 1.0.10 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.3 | 1.4 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.8.0.1 | 2.8.2.0 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.8 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.24 | 6.4.26 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.1 | 5.0 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.29 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.16.1 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.2 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fmc | GUESS | https://release-monitoring.org/project/145761 | fsl-sdk-v2.0 | 0.2.0 | fmt | DISTRO | https://release-monitoring.org/project/11526 | 8.0.1 | 8.1.1 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 5.15.4 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.94 | ORPH fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 21.12.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.10 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdk-pixbuf | DISTRO | https://release-monitoring.org/project/09533 | 2.42.4 | 2.42.6 | ORPH gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.2.9 | 2.3.5 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.53.3 | 9.55.0 | git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.34.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.66.0 | 2.70.1 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.70.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.10 | 3.0.14 | gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.2.32 | 2.3.4 | ORPH gnuplot | DISTRO | https://release-monitoring.org/project/01216 | 5.4.2 | 5.4.3 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.8.2.0 | 3.10.0.0 | gocryptfs | DISTRO | https://release-monitoring.org/project/21085 | 2.2.0 | 2.2.1 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.4 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grub2 | DISTRO | https://release-monitoring.org/project/01257 | 2.04 | 2.06 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 41.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gst-omx | DISTRO | https://release-monitoring.org/project/21845 | 1.18.5 | 1.19.3 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.5 | 1.19.3 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-libav | DISTRO | https://release-monitoring.org/project/21848 | 1.18.5 | 1.19.3 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.5 | 1.19.3 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.2 | ORPH gtkmm3 | DISTRO | https://release-monitoring.org/project/07963 | 3.22.0 | 4.4.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.2 | 1.4.3 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.49.1 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2018.01.1 | 2021.03.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.4.8 | 2.5.1 | haveged | DISTRO | https://release-monitoring.org/project/11695 | 1.9.15 | 1.9.17 | hdparm | DISTRO | https://release-monitoring.org/project/01304 | 9.62 | 9.63 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.11.2 | ORPH hostapd | DISTRO | https://release-monitoring.org/project/01325 | 2.9 | 2.10 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.21.12 | ORPH hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.354 | 0.355 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.4.1 | 2.7.0 | ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.36+nmu1 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.7.5 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.21.9.6 | ORPH intel-mediadriver | DISTRO | https://release-monitoring.org/project/20341 | 22.1.0 | 22.1.1 | iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.492 | 3.493 | ipmiutil | DISTRO | https://release-monitoring.org/project/01391 | 3.1.7 | 3.1.8 | iproute2 | DISTRO | https://release-monitoring.org/project/01392 | 5.15.0 | 5.16.0 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | isl | DISTRO | https://release-monitoring.org/project/13286 | 0.23 | 0.24 | ORPH jack1 | DISTRO | https://release-monitoring.org/project/59394 | 0.125.0 | 0.126.0 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.17 | 1.9.20 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.28 | 2.0.33 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.4 | 1.6 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.3 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.10.4 | 1.13.0 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.0 | json-glib | DISTRO | https://release-monitoring.org/project/13144 | 1.4.4 | 1.6.6 | ORPH jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.2.2 | 3.7.1 | keepalived | DISTRO | https://release-monitoring.org/project/01504 | 2.1.4 | 2.2.7 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.4.1-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.4-Ma... | 20.2.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.6-Ma... | 20.2.3-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.1.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.10-M... | 20.2.1-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.2.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.2-Ma... | 20.1.0-Nexus | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 1.2.0 | 2.1.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | lft | DISTRO | https://release-monitoring.org/project/21863 | 3.8 | 3.91 | ORPH libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.25 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.4.0 | 0.6.1 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 2.0 | libcodec2 | DISTRO | https://release-monitoring.org/project/14605 | 1.0.1 | 1.03 | libev | DISTRO | https://release-monitoring.org/project/01605 | 4.27 | 4.33 | ORPH libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgeos | DISTRO | https://release-monitoring.org/project/13493 | 3.10.1 | 3.10.2 | libgeotiff | DISTRO | https://release-monitoring.org/project/21361 | 1.6.0 | 1.7.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.2 | 3.3.6 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.68.4 | 2.70.2 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.3.2 | 1.4.0 | ORPH libgpg-error | DISTRO | https://release-monitoring.org/project/01628 | 1.42 | 1.43 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.28 | ORPH libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.6.0 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.37 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.12 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.16 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.0 | libjpeg | DISTRO | https://release-monitoring.org/project/21362 | 9d | 9e | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.1 | 0.11.3 | libmhash | DISTRO | https://release-monitoring.org/project/21488 | 0.9.9.9 | 1.4 | ORPH libminiupnpc | DISTRO | https://release-monitoring.org/project/01986 | 2.1.20201016 | 2.2.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.6 | 3.1.7 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.1.5 | 4.2.1 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.10 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 1.1.1m | 3.0.1 | libpagekite | DISTRO | https://release-monitoring.org/project/21366 | 0.91.190530 | 0.91.201110 | libpam-radius-auth | DISTRO | https://release-monitoring.org/project/57834 | 1.4.0 | 2.0.0 | ORPH libpjsip | DISTRO | https://release-monitoring.org/project/15701 | 2.10 | 2.11.1 | libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.0 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.5.0 | 1.6.0 | libqb | DISTRO | https://release-monitoring.org/project/09399 | 2.0.3 | 2.0.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.5 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigsegv | DISTRO | https://release-monitoring.org/project/01722 | 2.13 | 2.14 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.0 | 3.0.4 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.1 | 2.4.2 | libss7 | DISTRO | https://release-monitoring.org/project/21690 | 2.0.0 | 2.0.1 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.5 | libuhttpd | DISTRO | https://release-monitoring.org/project/89386 | 3.12.1 | 3.14.1 | libunistring | DISTRO | https://release-monitoring.org/project/01747 | 0.9.10 | 1.0 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.5.0 | 1.6.2 | ORPH libuv | DISTRO | https://release-monitoring.org/project/10784 | 1.42.0 | 1.43.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.1 | libvirt | DISTRO | https://release-monitoring.org/project/224041 | 7.10.0 | 8.0.0 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.0.21 | 4.3.0 | libxcrypt | DISTRO | https://release-monitoring.org/project/16436 | 4.4.26 | 4.4.27 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.66 | ORPH live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.01.11 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.9 | 1.0.13 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.12.0 | 0.12.1 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.18.0 | 3.19.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.3 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.8 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.3 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.12 | 2.03.14 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.3 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.30 | 10.7.1 | ORPH matchbox-keyboard | DISTRO | https://release-monitoring.org/project/230595 | 0.1 | 0.1.1 | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.0 | 3.1.0 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.4.0 | 0.1.5.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.0.66 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.12 | 1.6.13 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 5.31b | memtester | DISTRO | https://release-monitoring.org/project/01967 | 4.5.0 | 4.5.1 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 21.3.3 | 21.3.4 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 21.3.3 | 21.3.4 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.42.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2021.12 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20190618 | 20210805 | ORPH moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.8.1 | 0.9.3 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.16.10 | 1.18.4 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.11 | 5.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.5 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.30.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.165 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.0 | 2.5.1 | mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.29.3 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.34.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 4.0.3 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.14 | 1.8.19 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtd | DISTRO | https://release-monitoring.org/project/02026 | 2.1.3 | 2.1.4 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.36 | 4.0.37 | mtr | DISTRO | https://release-monitoring.org/project/02029 | 0.94 | 0.95 | ORPH mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.0.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220115 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.30.2 | 0.32.2 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | debian_1.... | 1.218 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.32.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.6.1 | 0.7.3 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9 | 5.9.1 | ORPH network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.32.12 | 1.34.0 | ORPH network-manager-openvpn | DISTRO | https://release-monitoring.org/project/69977 | 1.8.14 | 1.8.16 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.46.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.5 | nmon | DISTRO | https://release-monitoring.org/project/02097 | 16m | 16n | ORPH nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.2 | 17.3.1 | nss-mdns | DISTRO | https://release-monitoring.org/project/05491 | 0.14.1 | 0.15.1 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.132 | 390.147 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 510.39.01 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 1.16 | ORPH ocf-linux | DISTRO | https://release-monitoring.org/project/21541 | 20120127 | 20171122 | ORPH ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.31 | 1.34 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.2.4 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.3 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.19 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.5.5 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.7.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.13+8 | 19+5 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.11.0 | 6.12.0 | openldap | DISTRO | https://release-monitoring.org/project/02551 | 2.4.59 | 2.6.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.2 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.44.10 | opentracing-cpp | DISTRO | https://release-monitoring.org/project/21553 | 1.5.1 | 1.6.0 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 10.3.5-10... | 11.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.5.0 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.27 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.0.66 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.5.1 | 1.5.2 | p11-kit | DISTRO | https://release-monitoring.org/project/02582 | 0.23.22 | 0.24.0 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.0 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH parted | DISTRO | https://release-monitoring.org/project/02596 | 3.3 | 3.4 | patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.9 | 0.14.3 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.3 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202112 | ORPH perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-guess | DISTRO | https://release-monitoring.org/project/17375 | 0.12 | 0.14 | perl-crypt-openssl-rsa | DISTRO | https://release-monitoring.org/project/02748 | 0.31 | 0.32 | perl-date-manip | DISTRO | https://release-monitoring.org/project/02785 | 6.85 | 6.86 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-http-message | DISTRO | https://release-monitoring.org/project/02977 | 6.33 | 6.36 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.072 | 2.074 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.57 | 6.60 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20200907 | perl-net-dns | DISTRO | https://release-monitoring.org/project/03147 | 1.32 | 1.33 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.85 | 1.92 | perl-path-tiny | DISTRO | https://release-monitoring.org/project/11962 | 0.120 | 0.122 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-try-tiny | DISTRO | https://release-monitoring.org/project/11921 | 0.30 | 0.31 | perl-uri | DISTRO | https://release-monitoring.org/project/03485 | 5.09 | 5.10 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0207 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.0.14 | 8.1.1 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.21 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-imagick | DISTRO | https://release-monitoring.org/project/17401 | 3.5.0 | 3.7.0 | ORPH php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.1.2 | php-yaml | DISTRO | https://release-monitoring.org/project/12515 | 2.2.1 | 2.2.2 | ORPH pigpio | DISTRO | https://release-monitoring.org/project/21577 | 79 | 7301 | pigz | DISTRO | https://release-monitoring.org/project/03642 | 2.6 | 2.7 | pinentry | DISTRO | https://release-monitoring.org/project/03643 | 1.1.1 | 1.2.0 | ORPH pkcs11-helper | DISTRO | https://release-monitoring.org/project/91990 | 1.27 | 1.28 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.8.0 | ORPH poco | DISTRO | https://release-monitoring.org/project/05418 | 1.10.1 | 1.11.1 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.01.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.8 | 1.3.9 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.14 | proftpd | DISTRO | https://release-monitoring.org/project/07609 | 1.3.6e | 1.3.7c | proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 8.2.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.11 | 0.11.12 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.3 | protozero | DISTRO | https://release-monitoring.org/project/08002 | 1.7.0 | 1.7.1 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.15 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 14.2 | 15.0 | python-aenum | DISTRO | https://release-monitoring.org/project/34074 | 3.1.0 | 3.1.5 | python-aioblescan | DISTRO | https://release-monitoring.org/project/21242 | 0.2.8 | 0.2.12 | python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.1 | 0.4.3 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiojobs | DISTRO | https://release-monitoring.org/project/21252 | 0.3.0 | 1.0.0 | python-alsaaudio | DISTRO | https://release-monitoring.org/project/10072 | 0.8.4 | 0.9.0 | python-argon2-cffi | DISTRO | https://release-monitoring.org/project/33377 | 21.1.0 | 21.3.0 | python-arrow | DISTRO | https://release-monitoring.org/project/05314 | 1.2.0 | 1.2.1 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.4.1 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 21.2.0 | 21.4.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 21.3.1 | 21.11.1 | python-avro | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | python-bidict | DISTRO | https://release-monitoring.org/project/114352 | 0.21.3 | 0.21.4 | python-bleak | DISTRO | https://release-monitoring.org/project/26271 | 0.12.1 | 0.14.1 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.37 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.37 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2021.5.30 | 2021.10.8 | python-channels | DISTRO | https://release-monitoring.org/project/21937 | 2.3.1 | 3.0.4 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 2.4.1 | 3.3.1 | python-charset-normalizer | DISTRO | https://release-monitoring.org/project/55366 | 2.0.7 | 2.0.10 | python-cheroot | DISTRO | https://release-monitoring.org/project/20163 | 8.2.1 | 8.6.0 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 12.0.1 | 18.6.1 | python-click | DISTRO | https://release-monitoring.org/project/03802 | 7.1.2 | 8.0.3 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.4.1 | 6.6.0 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 1.0.2 | 2.3.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python-daemon | DISTRO | https://release-monitoring.org/project/03816 | 2.2.3 | 2.3.0 | python-daphne | DISTRO | https://release-monitoring.org/project/21939 | 2.4.1 | 3.0.2 | python-dataproperty | DISTRO | https://release-monitoring.org/project/21697 | 0.53.0 | 0.54.2 | python-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog | DISTRO | https://release-monitoring.org/project/03823 | 3.4.0 | 3.5.3 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 3.2.11 | 4.0.1 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 4.1.0 | 5.0.3 | python-docutils | DISTRO | https://release-monitoring.org/project/03849 | 0.15.2 | 0.18.1 | python-ecdsa | DISTRO | https://release-monitoring.org/project/08370 | 0.17.0 | 0.18.0b2 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.2.1 | 4.3.1 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.4.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.2 | python-flask-expects-json | DISTRO | https://release-monitoring.org/project/127659 | 1.5.0 | 1.7.0 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 0.3.1 | 2.1.0 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 2.4.1 | 2.5.1 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 0.15.1 | 1.0.0 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.28.2 | 4.28.5 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.26 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.9 | python-httplib2 | DISTRO | https://release-monitoring.org/project/03887 | 0.19.1 | 0.20.2 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.13.1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.2 | 3.3 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.28.0 | 8.0.0b1 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 1.1.0 | 2.0.1 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-janus | DISTRO | https://release-monitoring.org/project/56567 | 0.6.1 | 1.0.0 | python-jaraco-classes | DISTRO | https://release-monitoring.org/project/20150 | 2.0 | 3.2.1 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 2.0 | 3.5.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.0.2 | 3.0.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 2.5.1 | 4.4.0 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 19.2.0 | 23.5.0 | python-kiwisolver | DISTRO | https://release-monitoring.org/project/16910 | 1.1.0 | 1.3.2 | python-lmdb | DISTRO | https://release-monitoring.org/project/15512 | 1.2.1 | 1.3.0 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.6.5 | 4.7.1 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.1.5 | 1.1.6 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.3.4 | 3.3.6 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.1 | 2.4.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.5.1 | python-memory-profiler | DISTRO | https://release-monitoring.org/project/38508 | 0.58.0 | 0.60.0 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 0.8.4 | 2.0.2 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 8.10.0 | 8.12.0 | python-msgfy | DISTRO | https://release-monitoring.org/project/29716 | 0.1.0 | 0.2.0 | python-msgpack | DISTRO | https://release-monitoring.org/project/21831 | 1.0.2 | 1.0.3 | python-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-nfc | DISTRO | https://release-monitoring.org/project/21829 | 0.13.5 | 1.0.3 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.1 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 0.8.4 | 0.98.9 | python-paho-mqtt | DISTRO | https://release-monitoring.org/project/06084 | 1.4.0 | 1.6.1 | python-pam | DISTRO | https://release-monitoring.org/project/05725 | 0.5.0 | 1.8.4 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | python-pathlib2 | DISTRO | https://release-monitoring.org/project/12723 | 2.3.5 | 2.3.6 | python-pathpy | DISTRO | https://release-monitoring.org/project/21703 | 12.0.1 | 12.5.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.6.0 | 5.8.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 8.4.0 | 9.0.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 21.3.1 | python-portend | DISTRO | https://release-monitoring.org/project/20203 | 2.5 | 3.1.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.20 | 3.0.24 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.3 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python-psycopg2 | DISTRO | https://release-monitoring.org/project/03979 | 2.9.1 | 2.9.3 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2021.1 | 2022.1 | python-py | DISTRO | https://release-monitoring.org/project/03981 | 1.10.0 | 1.11.0 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0a2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.5 | 1.5.6 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.7.4 | 2.11.2 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.2 | 2.0.3 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 1.9.7 | 2.8 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.19.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 2.2.0 | 2.5.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.18.14 | 1.19.4 | python-pynacl | DISTRO | https://release-monitoring.org/project/12703 | 1.4.0 | 1.5.0 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 19.1.0 | 21.0.0 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.11.6 | 3.11.7 | python-pyphen | DISTRO | https://release-monitoring.org/project/19681 | 0.11.0 | 0.12.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.7 | 5.15.6 | python-pyro | DISTRO | https://release-monitoring.org/project/19993 | 3.16 | 4.82 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.5 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.1 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.17.1 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2019.3 | 2021.3 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | python-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 19.0.2 | 22.3.0 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 3.5.3 | 4.1.0 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.26.0 | 2.27.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.1 | python-rsa | DISTRO | https://release-monitoring.org/project/08808 | 4.7.2 | 4.8 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.2 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 18.1.0 | 21.1.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 44.0.0 | 60.5.0 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.17.5 | 3.17.6 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 0.45.2 | 1.3.0 | python-singledispatch | DISTRO | https://release-monitoring.org/project/12013 | 3.4.0.3 | 3.7.0 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.18 | 5.0.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 4.0.0 | 5.0.0 | python-snappy | DISTRO | https://release-monitoring.org/project/07203 | 0.5.4 | 0.6.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.1 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.2.1 | 2.3.1 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.3.10 | 1.4.29 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.2.0 | 1.2.1 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.3.0 | 0.4.2 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 1.14.1 | 5.0.0 | python-terminaltables | DISTRO | https://release-monitoring.org/project/15542 | 3.1.0 | 3.1.10 | python-thrift | DISTRO | https://release-monitoring.org/project/21614 | 0.13.0 | 0.15.0 | python-tinycss2 | DISTRO | https://release-monitoring.org/project/16655 | 1.1.0 | 1.1.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.1 | 1.1.3 | python-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.0 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.0.4 | 6.1 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.40.1 | 4.62.3 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.1.0 | 5.1.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 20.3.0 | 21.5.0 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 20.3.0 | 21.7.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.0.1 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 4.2.0 | 5.1.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.7 | 1.26.8 | python-validators | DISTRO | https://release-monitoring.org/project/19818 | 0.15.0 | 0.18.2 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.1.9 | 0.2.5 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 53.4 | 54.0b1 | python-webpy | DISTRO | https://release-monitoring.org/project/04090 | 0.40 | 0.62 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 0.58.0 | 1.2.3 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.2 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.12.1 | 1.13.3 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 2.3.3 | 3.0.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.27 | 0.31 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.1 | 3.0.2 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.1 | python3 | DISTRO | https://release-monitoring.org/project/13254 | 3.10.1 | 3.10.2 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.12.0 | python3-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2021.11.10 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 59.8.0 | 60.5.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt53d | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5base | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5charts | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5connectivity | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5declarative | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5graphicaleffects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5imageformats | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5location | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5lottie | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5multimedia | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols2 | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quicktimeline | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5remoteobjects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5script | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5scxml | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5sensors | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialbus | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialport | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5svg | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5tools | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5virtualkeyboard | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5wayland | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webchannel | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.212.0-a... | 6.2.2 | qt5websockets | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webview | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5x11extras | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5xmlpatterns | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.1 | 1.2 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-server | DISTRO | https://release-monitoring.org/project/05585 | 3.8.2 | 3.9.12 | ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | readline | DISTRO | https://release-monitoring.org/project/04173 | 8.1 | 8.1.2 | ORPH restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.4 | 1.10.5 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.27.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2112.0 | rtai | DISTRO | https://release-monitoring.org/project/21658 | 4.0.1 | 5.3 | ORPH rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.0.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.58.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.58.0 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.10.0.3 | 2.11.0.1 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.1 | 2.3.5.3 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.6.3 | 1.0.7.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.5.1.5 | 2.5.1.7 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.4.1.1 | 2.5.1.0 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.3.2 | 2.2.3.4 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.2.2 | 0.5.3.0 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.3.0 | sdbus-cpp | DISTRO | https://release-monitoring.org/project/70626 | 0.8.3 | 1.1.0 | sdl2 | DISTRO | https://release-monitoring.org/project/04779 | 2.0.18 | 2.0.20 | sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.0.15 | 2.0.18 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | sedutil | DISTRO | https://release-monitoring.org/project/15203 | 1.15.1 | 1.20.0 | sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 1.59.0 | 1.71.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.13 | sg3_utils | DISTRO | https://release-monitoring.org/project/04801 | 1.47 | 1.47r915 | shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.1 | ORPH skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.10.0.3 | 2.11.1.0 | sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.4.7 | 1.4.10 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.2 | 3.4.8 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.18.0 | 3.1.20.0 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | speexdsp | DISTRO | https://release-monitoring.org/project/08419 | SpeexDSP-... | 1.2.0 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.1 | 3.37.2 | sshfs | DISTRO | https://release-monitoring.org/project/11058 | 3.7.1 | 3.7.2 | ORPH start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.1 | ORPH startup-notification | DISTRO | https://release-monitoring.org/project/10089 | 0.9 | 0.12 | ORPH strace | DISTRO | https://release-monitoring.org/project/04897 | 5.15 | 5.16 | stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.4 | 1.0.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.61 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.4 | ORPH synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.23.1 | 0.28.0 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.34.1 | 3.35.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.42.1 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.4.2 | 12.5.5 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.01 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.4.6 | 2.4.8 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.15.0 | ORPH tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.2a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 2.4.0 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | trace-cmd... | 2.9.4 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.1 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2022.01 | udpcast | DISTRO | https://release-monitoring.org/project/10206 | 20200328 | 20211207 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.10 | 0.11 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 3.15.0.0 | 4.1.0.5 | umtprd | DISTRO | https://release-monitoring.org/project/46129 | 1.3.10 | 1.6.2 | unclutter-xfixes | DISTRO | https://release-monitoring.org/project/09206 | 1.5 | 1.6 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 2.2 | upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | uvw | DISTRO | https://release-monitoring.org/project/33083 | 2.10.0_li... | 2.11.0_li... | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.55.1 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4092 | 8.2.4115 | ORPH vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.22 | 3.2.27 | waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.6.1 | 1.7.0 | wayland | DISTRO | https://release-monitoring.org/project/10061 | 1.19.0 | 1.20.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.23 | 1.24 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.32.4 | 2.34.3 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.10 | 5.5.11 | wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 6.23 | wireguard-linux-compat | DISTRO | https://release-monitoring.org/project/62379 | 1.0.20210606 | 1.0.20211208 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.2 | 0.4.7 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.11 | 3.6.1 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.0 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.1.1 | wpa_supplicant | DISTRO | https://release-monitoring.org/project/05146 | 2.9 | 2.10 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.3 | 2.35.1 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20220111 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 21.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.3 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xml-security-c | DISTRO | https://release-monitoring.org/project/05197 | 2.0.2 | 2.0.4 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 5.45 | 6.02 | xserver_xorg-server | DISTRO | https://release-monitoring.org/project/05250 | 21.1.2 | 21.1.3 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.17 | 3.18 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.0 | 0.3.1 | yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | zynq-boot-bin | DISTRO | https://release-monitoring.org/project/21623 | 2015.1 | 2021.2 | ORPH Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 dnsmasq | CVE-2021-45951 | https://security-tracker.debian.org/tracker/CVE-2021-45951 dnsmasq | CVE-2021-45952 | https://security-tracker.debian.org/tracker/CVE-2021-45952 dnsmasq | CVE-2021-45953 | https://security-tracker.debian.org/tracker/CVE-2021-45953 dnsmasq | CVE-2021-45954 | https://security-tracker.debian.org/tracker/CVE-2021-45954 dnsmasq | CVE-2021-45955 | https://security-tracker.debian.org/tracker/CVE-2021-45955 dnsmasq | CVE-2021-45956 | https://security-tracker.debian.org/tracker/CVE-2021-45956 dnsmasq | CVE-2021-45957 | https://security-tracker.debian.org/tracker/CVE-2021-45957 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 bash | CVE-2019-18276 | https://security-tracker.debian.org/tracker/CVE-2019-18276 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-3487 | https://security-tracker.debian.org/tracker/CVE-2021-3487 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bird | CVE-2021-26928 | https://security-tracker.debian.org/tracker/CVE-2021-26928 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2021-42376 | https://security-tracker.debian.org/tracker/CVE-2021-42376 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 civetweb | CVE-2020-27304 | https://security-tracker.debian.org/tracker/CVE-2020-27304 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exim | CVE-2021-38371 | https://security-tracker.debian.org/tracker/CVE-2021-38371 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2020-35965 | https://security-tracker.debian.org/tracker/CVE-2020-35965 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 flatbuffers | CVE-2020-35864 | https://security-tracker.debian.org/tracker/CVE-2020-35864 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41157 | https://security-tracker.debian.org/tracker/CVE-2021-41157 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-27645 | https://security-tracker.debian.org/tracker/CVE-2021-27645 glibc | CVE-2021-33574 | https://security-tracker.debian.org/tracker/CVE-2021-33574 glibc | CVE-2021-38604 | https://security-tracker.debian.org/tracker/CVE-2021-38604 gnuchess | CVE-2021-30184 | https://security-tracker.debian.org/tracker/CVE-2021-30184 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 go | CVE-2021-29923 | https://security-tracker.debian.org/tracker/CVE-2021-29923 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2020-6624 | https://security-tracker.debian.org/tracker/CVE-2020-6624 jhead | CVE-2020-6625 | https://security-tracker.debian.org/tracker/CVE-2020-6625 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2021-42917 | https://security-tracker.debian.org/tracker/CVE-2021-42917 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libesmtp | CVE-2019-19977 | https://security-tracker.debian.org/tracker/CVE-2019-19977 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libnss | CVE-2021-43527 | https://security-tracker.debian.org/tracker/CVE-2021-43527 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libressl | CVE-2021-41581 | https://security-tracker.debian.org/tracker/CVE-2021-41581 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 liburiparser | CVE-2021-46141 | https://security-tracker.debian.org/tracker/CVE-2021-46141 liburiparser | CVE-2021-46142 | https://security-tracker.debian.org/tracker/CVE-2021-46142 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 monkey | CVE-2013-1771 | https://security-tracker.debian.org/tracker/CVE-2013-1771 monkey | CVE-2013-2183 | https://security-tracker.debian.org/tracker/CVE-2013-2183 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 mutt | CVE-2021-32055 | https://security-tracker.debian.org/tracker/CVE-2021-32055 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 network-manager | CVE-2021-20297 | https://security-tracker.debian.org/tracker/CVE-2021-20297 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvpn | CVE-2021-3606 | https://security-tracker.debian.org/tracker/CVE-2021-3606 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php-imagick | CVE-2019-11037 | https://security-tracker.debian.org/tracker/CVE-2019-11037 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-autobahn | CVE-2020-35678 | https://security-tracker.debian.org/tracker/CVE-2020-35678 python-cryptography | CVE-2020-36242 | https://security-tracker.debian.org/tracker/CVE-2020-36242 python-django | CVE-2021-45115 | https://security-tracker.debian.org/tracker/CVE-2021-45115 python-django | CVE-2021-45116 | https://security-tracker.debian.org/tracker/CVE-2021-45116 python-django | CVE-2021-45452 | https://security-tracker.debian.org/tracker/CVE-2021-45452 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2020-35503 | https://security-tracker.debian.org/tracker/CVE-2020-35503 qemu | CVE-2020-35504 | https://security-tracker.debian.org/tracker/CVE-2020-35504 qemu | CVE-2020-35505 | https://security-tracker.debian.org/tracker/CVE-2020-35505 qemu | CVE-2020-35506 | https://security-tracker.debian.org/tracker/CVE-2020-35506 qemu | CVE-2020-35517 | https://security-tracker.debian.org/tracker/CVE-2020-35517 qemu | CVE-2021-20181 | https://security-tracker.debian.org/tracker/CVE-2021-20181 qemu | CVE-2021-20196 | https://security-tracker.debian.org/tracker/CVE-2021-20196 qemu | CVE-2021-20203 | https://security-tracker.debian.org/tracker/CVE-2021-20203 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-20263 | https://security-tracker.debian.org/tracker/CVE-2021-20263 qemu | CVE-2021-3392 | https://security-tracker.debian.org/tracker/CVE-2021-3392 qemu | CVE-2021-3409 | https://security-tracker.debian.org/tracker/CVE-2021-3409 qemu | CVE-2021-3416 | https://security-tracker.debian.org/tracker/CVE-2021-3416 qemu | CVE-2021-3507 | https://security-tracker.debian.org/tracker/CVE-2021-3507 qemu | CVE-2021-3527 | https://security-tracker.debian.org/tracker/CVE-2021-3527 qemu | CVE-2021-3544 | https://security-tracker.debian.org/tracker/CVE-2021-3544 qemu | CVE-2021-3545 | https://security-tracker.debian.org/tracker/CVE-2021-3545 qemu | CVE-2021-3546 | https://security-tracker.debian.org/tracker/CVE-2021-3546 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 qpid-proton | CVE-2016-2166 | https://security-tracker.debian.org/tracker/CVE-2016-2166 qpid-proton | CVE-2016-4467 | https://security-tracker.debian.org/tracker/CVE-2016-4467 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2021-28966 | https://security-tracker.debian.org/tracker/CVE-2021-28966 rust | CVE-2021-29922 | https://security-tracker.debian.org/tracker/CVE-2021-29922 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2021-3156 | https://security-tracker.debian.org/tracker/CVE-2021-3156 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tools | CVE-2021-3565 | https://security-tracker.debian.org/tracker/CVE-2021-3565 uboot-tools | CVE-2021-27097 | https://security-tracker.debian.org/tracker/CVE-2021-27097 uboot-tools | CVE-2021-27138 | https://security-tracker.debian.org/tracker/CVE-2021-27138 util-linux | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 util-linux-libs | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4187 | https://security-tracker.debian.org/tracker/CVE-2021-4187 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 vim | CVE-2022-0128 | https://security-tracker.debian.org/tracker/CVE-2022-0128 vim | CVE-2022-0156 | https://security-tracker.debian.org/tracker/CVE-2022-0156 vim | CVE-2022-0158 | https://security-tracker.debian.org/tracker/CVE-2022-0158 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 webkitgtk | CVE-2021-45481 | https://security-tracker.debian.org/tracker/CVE-2021-45481 webkitgtk | CVE-2021-45482 | https://security-tracker.debian.org/tracker/CVE-2021-45482 webkitgtk | CVE-2021-45483 | https://security-tracker.debian.org/tracker/CVE-2021-45483 wget | CVE-2021-31879 | https://security-tracker.debian.org/tracker/CVE-2021-31879 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wireshark | CVE-2021-4185 | https://security-tracker.debian.org/tracker/CVE-2021-4185 wireshark | CVE-2021-4186 | https://security-tracker.debian.org/tracker/CVE-2021-4186 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apache | CVE-2021-44224 | https://security-tracker.debian.org/tracker/CVE-2021-44224 apache | CVE-2021-44790 | https://security-tracker.debian.org/tracker/CVE-2021-44790 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 janus-gateway | CVE-2021-4124 | https://security-tracker.debian.org/tracker/CVE-2021-4124 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 lapack | CVE-2021-4048 | https://security-tracker.debian.org/tracker/CVE-2021-4048 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 liburiparser | CVE-2021-46141 | https://security-tracker.debian.org/tracker/CVE-2021-46141 liburiparser | CVE-2021-46142 | https://security-tracker.debian.org/tracker/CVE-2021-46142 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-44732 | https://security-tracker.debian.org/tracker/CVE-2021-44732 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-django | CVE-2021-45115 | https://security-tracker.debian.org/tracker/CVE-2021-45115 python-django | CVE-2021-45116 | https://security-tracker.debian.org/tracker/CVE-2021-45116 python-django | CVE-2021-45452 | https://security-tracker.debian.org/tracker/CVE-2021-45452 python-lxml | CVE-2021-43818 | https://security-tracker.debian.org/tracker/CVE-2021-43818 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2021-36690 | https://security-tracker.debian.org/tracker/CVE-2021-36690 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4187 | https://security-tracker.debian.org/tracker/CVE-2021-4187 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 vim | CVE-2022-0128 | https://security-tracker.debian.org/tracker/CVE-2022-0128 vim | CVE-2022-0156 | https://security-tracker.debian.org/tracker/CVE-2022-0156 vim | CVE-2022-0158 | https://security-tracker.debian.org/tracker/CVE-2022-0158 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wireshark | CVE-2021-4185 | https://security-tracker.debian.org/tracker/CVE-2021-4185 wireshark | CVE-2021-4186 | https://security-tracker.debian.org/tracker/CVE-2021-4186 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From heiko.thiery at gmail.com Mon Jan 17 08:06:16 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 17 Jan 2022 09:06:16 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script Message-ID: <20220117080616.10563-1-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- board/kontron/pitx-imx8m/boot.cmd | 8 -------- board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- board/kontron/pitx-imx8m/post-image.sh | 2 +- configs/kontron_pitx_imx8m_defconfig | 3 +-- 6 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 board/kontron/pitx-imx8m/boot.cmd create mode 100644 board/kontron/pitx-imx8m/extlinux.conf diff --git a/board/kontron/pitx-imx8m/boot.cmd b/board/kontron/pitx-imx8m/boot.cmd deleted file mode 100644 index 4d89235392..0000000000 --- a/board/kontron/pitx-imx8m/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -echo "Root File Sytem on MMC${devnum}" -setenv rootfs /dev/mmcblk${devnum}p1 -setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} - -load ${devtype} ${devnum} ${kernel_addr_r} boot/Image -load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mq-kontron-pitx-imx8m.dtb - -booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/kontron/pitx-imx8m/extlinux.conf b/board/kontron/pitx-imx8m/extlinux.conf new file mode 100644 index 0000000000..2911acec59 --- /dev/null +++ b/board/kontron/pitx-imx8m/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mq-kontron-pitx-imx8m.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg index c78ef0f910..4a0aa117fb 100644 --- a/board/kontron/pitx-imx8m/genimage.cfg +++ b/board/kontron/pitx-imx8m/genimage.cfg @@ -1,5 +1,6 @@ image sdcard.img { hdimage { + partition-table-type = "gpt" } partition imx-boot { @@ -9,8 +10,8 @@ image sdcard.img { } partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% } } diff --git a/board/kontron/pitx-imx8m/post-build.sh b/board/kontron/pitx-imx8m/post-build.sh index 4574221fe5..bf8861f6a9 100755 --- a/board/kontron/pitx-imx8m/post-build.sh +++ b/board/kontron/pitx-imx8m/post-build.sh @@ -1,4 +1,7 @@ #!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" -mkdir -p $TARGET_DIR/boot/ -cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/pitx-imx8m/post-image.sh b/board/kontron/pitx-imx8m/post-image.sh index 564211c829..3452fd4501 100755 --- a/board/kontron/pitx-imx8m/post-image.sh +++ b/board/kontron/pitx-imx8m/post-image.sh @@ -1,3 +1,3 @@ #!/bin/sh -support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 4053e1e398..458083160b 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -15,6 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -50,5 +51,3 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/pitx-imx8m/boot.cmd" -- 2.30.2 From heiko.thiery at gmail.com Mon Jan 17 08:06:17 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 17 Jan 2022 09:06:17 +0100 Subject: [Buildroot] [PATCH 2/2] configs/kontron_pitx_imx8m_defconfig: bump kernel to 5.16.1 In-Reply-To: <20220117080616.10563-1-heiko.thiery@gmail.com> References: <20220117080616.10563-1-heiko.thiery@gmail.com> Message-ID: <20220117080616.10563-2-heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery --- configs/kontron_pitx_imx8m_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 458083160b..7f9c0eeae8 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pitx-imx8mq.dtb" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y -- 2.30.2 From romain.naour at smile.fr Mon Jan 17 09:04:32 2022 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 17 Jan 2022 10:04:32 +0100 Subject: [Buildroot] [PATCH 1/3] legacy: increase the duration during whih we keep legacy symbols In-Reply-To: References: Message-ID: Hello Yann, All, Le 28/03/2021 ? 22:30, Yann E. MORIN a ?crit?: > Our LTS is only one-year long (actually, more like 13 mopnths), which > is still seen as too short by some, who do not have the bandwidth, > willingness, and/or capability to update once a year. > > As such, the 2-year retention guarantee for the legacy symbols, is > often not enough, and people miss on them when eventually migrating. > > Furthermore, the cuystoms so far has been to drop the symbols only after > a 5-year period has elapsed: > f289b1b36f5c legacy: drop options removed more than 5 years ago now > a52e106bbd08 legacy: remove options made legacy 5 years ago > a7f49a9693d7 Config.in.legacy: drop 2013.02 entries > > So, make the customs the new rule: increase the retenetion period to 5 > years. I'm aware of some projects using an out of date Buildroot version from 2012 and 2016. But switching between Buildroot 2012 to Buildroot 2022 requires a complete rework, not just updating the Buildroot defconfig to remove legacy option. Is really a benefit to remove theses legacy config ? Best regards, Romain > > Reported-by: Thomas Petazzoni > Signed-off-by: Yann E. MORIN > --- > Config.in.legacy | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 8ebbc4c295..967b67e03e 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -6,7 +6,7 @@ > # This will make the transition for the user more convenient. > # > # When adding legacy symbols to this file, add them to the front. The oldest > -# symbols will be removed again after about two years. > +# symbols will be removed again after at least five years. > # > # The symbol should be copied as-is from the place where it was previously > # defined, but the help text should be removed or replaced with something that > From nolange79 at gmail.com Mon Jan 17 09:34:34 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Mon, 17 Jan 2022 10:34:34 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/mkusers: allow option for system uid/gid In-Reply-To: <5273d4d1-8254-e53d-0ce2-9c390fe315ad@mind.be> References: <20220114101247.342256-1-nolange79@gmail.com> <5273d4d1-8254-e53d-0ce2-9c390fe315ad@mind.be> Message-ID: Am So., 16. Jan. 2022 um 13:25 Uhr schrieb Arnout Vandecappelle : > > > > On 14/01/2022 11:12, Norbert Lange wrote: > > Some software decides based on uid/gid whether a user is a > > system or normal/human user, with differnt behaviour for those > > flavors (example journald [2]). > > Thank you for the short yet sufficient summary! > > > > > So adding logic to create system-users is necessary, we take > > the now common ranges from [1]. > > > > This extends the mkusers script to allow -2 for uid/gid, > > this argument will take an identifier from the system range. > > > > System/user ranges are added as variables, and the argument > > for user/system uid was added as variable aswell. > > Thus some magic constants could be removed, some further > > occurences of -1 were replaced with equivalent logic. > > > > [1] - https://systemd.io/UIDS-GIDS/ > > [2] - https://www.freedesktop.org/software/systemd/man/journald.conf.html > > > > Signed-off-by: Norbert Lange > > You forgot to mention that this is v2. v1 is here [1]. I did not forget it, just did not find references I pushed the patch before. > > I think the only change is in the commit message. Nah, its a bit more. > > > --- > > support/scripts/mkusers | 57 +++++++++++++++++++++++++++++------------ > > 1 file changed, 40 insertions(+), 17 deletions(-) > > > > diff --git a/support/scripts/mkusers b/support/scripts/mkusers > > index d00ba33823..9d8295e8a3 100755 > > --- a/support/scripts/mkusers > > +++ b/support/scripts/mkusers > > @@ -8,6 +8,15 @@ MIN_UID=1000 > > MAX_UID=1999 > > MIN_GID=1000 > > MAX_GID=1999 > > +# use names from /etc/adduser.conf > > +FIRST_SYSTEM_UID=100 > > +LAST_SYSTEM_UID=999 > > +FIRST_SYSTEM_GID=100 > > +LAST_SYSTEM_GID=999 > > +# argument to automatically crease system/user id > > +AUTO_SYSTEM_ID=-2 > > Wouldn't it be better to use -1 for system users (= the usual case) and add -2 > for normal users? System users are the usual, after all, and all current in-tree > uses of -1 are definitely system users. > > I though that someone had already made this remark, but I can't find any trace > of it. > > > +AUTO_USER_ID=-1 > > + > > [snip] > > @@ -222,8 +233,12 @@ add_one_group() { > > local members > > > > # Generate a new GID if needed > > - if [ ${gid} -eq -1 ]; then > > - gid="$( generate_gid "${group}" )" > > + if [ ${gid} -lt 0 ]; then > > + if [ ${gid} -eq ${AUTO_USER_ID} ]; then > > + gid="$( generate_gid "${group}" )" > > (nitpick) For symmetry, I'd always pass the first and last as argument here. > > > + else > > + gid="$( generate_gid "${group}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" > > + fi > > fi > > (nitpick) I'd structure the entire block above as follows: > > if [ ${gid} -eq ${AUTO_USER_ID} ]; then > elif [ ${gid} -eq ${AUTO_SYSTEM_ID} ]; then > fi > > That's one level less deep, and more explicit about the system-id branch. > > Both remarks also apply to the uid case of course. > > > > > members=$(get_members "$group") > > @@ -247,16 +262,19 @@ add_one_group() { > > # - not already used by a user > > generate_uid() { > > local username="${1}" > > + local minuid="${2:-$MIN_UID}" > > + local maxuid="${3:-$MAX_UID}" > > So here I'd remove the defaults and instead always pass the arguments. > > > > Regards, > Arnout > > [1] > https://patchwork.ozlabs.org/project/buildroot/list/?series=152843&state=%2A&archive=both > > > > + > > local uid > > > > uid="$( get_uid "${username}" )" > > if [ -z "${uid}" ]; then > > - for(( uid=MIN_UID; uid<=MAX_UID; uid++ )); do > > + for(( uid=minuid; uid<=maxuid; uid++ )); do > > if [ -z "$( get_username "${uid}" )" ]; then > > break > > fi > > done > > - if [ ${uid} -gt ${MAX_UID} ]; then > > + if [ ${uid} -gt ${maxuid} ]; then > > fail "can not allocate a UID for user '%s'\n" "${username}" > > fi > > fi > > @@ -307,8 +325,13 @@ add_one_user() { > > check_user_validity "${username}" "${uid}" "${group}" "${gid}" > > > > # Generate a new UID if needed > > - if [ ${uid} -eq -1 ]; then > > - uid="$( generate_uid "${username}" )" > > + if [ ${uid} -lt 0 ]; then > > + if [ ${uid} -eq ${AUTO_USER_ID} ]; then > > + uid="$( generate_uid "${username}" )" > > + else > > + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" > > + > > + fi > > fi > > > > # Remove any previous instance of this user > > @@ -384,8 +407,8 @@ main() { > > ENTRIES+=( "${line}" ) > > done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) > > > > - # We first create groups whose gid is not -1, and then we create groups > > - # whose gid is -1 (automatic), so that, if a group is defined both with > > + # We first create groups whose gid is positive, and then we create groups > > + # whose gid is automatic, so that, if a group is defined both with > > # a specified gid and an automatic gid, we ensure the specified gid is > > # used, rather than a different automatic gid is computed. > > > > @@ -399,7 +422,7 @@ main() { > > # Then, create all the main groups which gid *is* automatic > > for line in "${ENTRIES[@]}"; do > > read username uid group gid passwd home shell groups comment <<<"${line}" > > - [ ${gid} -eq -1 ] || continue # Non-automatic gid > > + [ ${gid} -lt 0 ] || continue # Non-automatic gid > > add_one_group "${group}" "${gid}" > > done > > > > @@ -410,7 +433,7 @@ main() { > > read username uid group gid passwd home shell groups comment <<<"${line}" > > if [ "${groups}" != "-" ]; then > > for g in ${groups//,/ }; do > > - add_one_group "${g}" -1 > > + add_one_group "${g}" ${AUTO_USER_ID} > > done > > fi > > done > > @@ -433,7 +456,7 @@ main() { > > for line in "${ENTRIES[@]}"; do > > read username uid group gid passwd home shell groups comment <<<"${line}" > > [ "${username}" != "-" ] || continue # Magic string to skip user creation > > - [ ${uid} -eq -1 ] || continue # Non-automatic uid > > + [ ${uid} -lt 0 ] || continue # Non-automatic uid > > add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ > > "${home}" "${shell}" "${groups}" "${comment}" > > done > > Norbert From mail at dbrgn.ch Mon Jan 17 09:50:17 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 10:50:17 +0100 Subject: [Buildroot] DMARC on this mailing list Message-ID: <20220117105017.28d6aacc@c3po> Hello folks I recently enabled report-only DMARC on my e-mail domain. After sending a few e-mails to this ML yesterday, this resulted in multiple DMARC would-be rejection e-mails. DMARC relies on SPF (correct sender IP) *or* DKIM (correct signature). A nice tool to visualize this is https://www.learndmarc.com/. If either SPF or DKIM passes, the e-mail should be accepted. In the case of mailing lists, the way I understand it, there are two options: - Rewrite the "From:" header so that the e-mail appears to be coming from the ML itself. Put the original sender e-mail in the "Reply-To" header instead. If this is not being done, the sender IP (the mailing list) does not match the sender e-mail domain and SPF fails. Note that this *might* impact the buildroot ML reputation for some big mailservers. - Expect that mail servers with DMARC enabled also have DKIM enabled, and ensure that the e-mail body is not modified (i.e. turn off the automatically inserted footer). Put mailing list unsubscribe links in the headers instead. This way, even though the sender IP does not match, the signature should still be intact. These approaches are described in the following blog post I found online: https://begriffs.com/posts/2018-09-18-dmarc-mailing-list.html I don't know if mailman allows turning off body modifications (i.e. RFC2369 and RFC2919), but it definitely allows "From"-munging: https://wiki.list.org/DEV/DMARC I'm still quite new to this mailing list and don't want to put out any demands, but I wanted to bring up this issue, since it will probably be more and more of an issue in the future (DMARC adoption is increasing). Cheers, Danilo From baruch at tkos.co.il Mon Jan 17 10:03:03 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 17 Jan 2022 12:03:03 +0200 Subject: [Buildroot] DMARC on this mailing list In-Reply-To: <20220117105017.28d6aacc@c3po> References: <20220117105017.28d6aacc@c3po> Message-ID: <87mtjufzh1.fsf@tarshish> Hi Danilo, On Mon, Jan 17 2022, Danilo Bargen wrote: > I recently enabled report-only DMARC on my e-mail domain. After sending > a few e-mails to this ML yesterday, this resulted in multiple DMARC > would-be rejection e-mails. > > DMARC relies on SPF (correct sender IP) *or* DKIM (correct signature). A > nice tool to visualize this is https://www.learndmarc.com/. If either > SPF or DKIM passes, the e-mail should be accepted. > > In the case of mailing lists, the way I understand it, there are two > options: > > - Rewrite the "From:" header so that the e-mail appears to be coming > from the ML itself. Put the original sender e-mail in the "Reply-To" > header instead. If this is not being done, the sender IP (the mailing > list) does not match the sender e-mail domain and SPF fails. Note > that this *might* impact the buildroot ML reputation for some big > mailservers. > - Expect that mail servers with DMARC enabled also have DKIM enabled, > and ensure that the e-mail body is not modified (i.e. turn off the > automatically inserted footer). Put mailing list unsubscribe links > in the headers instead. This way, even though the sender IP does not > match, the signature should still be intact. > > These approaches are described in the following blog post I found > online: https://begriffs.com/posts/2018-09-18-dmarc-mailing-list.html > > I don't know if mailman allows turning off body modifications (i.e. > RFC2369 and RFC2919), but it definitely allows "From"-munging: > https://wiki.list.org/DEV/DMARC > > I'm still quite new to this mailing list and don't want to put out any > demands, but I wanted to bring up this issue, since it will probably be > more and more of an issue in the future (DMARC adoption is increasing). I can't comment for the owners of the Buildroot list. But you might find this recent discussion from the linux-arm-kernel list interesting: https://lore.kernel.org/linux-arm-kernel/202110211313.B5C5C61 at keescook/ In this thread David Woodhouse describes the lists.infradead.org setup rationale. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From marcus.folkesson at gmail.com Mon Jan 17 10:07:50 2022 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Mon, 17 Jan 2022 11:07:50 +0100 Subject: [Buildroot] candidate packages : ros2 and wxwidgets In-Reply-To: <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> References: <2209e11a-bda9-5193-9b4d-20a5f0fa34e3@linatsea.fr> <20220105142924.4b11ed83@windsurf> <5d0600a1-eb8c-8d69-cf9a-fee4fbca0c73@smile.fr> Message-ID: Hello, On Wed, Jan 05, 2022 at 02:40:47PM +0100, Romain Naour wrote: > > > > I'll be happy to help in the review of such packages. > > Same here, I'll try to help. > Count me in as well. /Marcus -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From yann.morin.1998 at free.fr Mon Jan 17 10:17:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 11:17:05 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> Message-ID: <20220117101705.GB2313964@scaer> James, Danilo, All, On 2022-01-16 15:51 -0700, James Hilliard spake thusly: > On Sun, Jan 16, 2022 at 3:38 PM Danilo Bargen wrote: > > > Just use the hash buildroot generated for you, it should be correct. > > > (...) > > > Yeah, it's not going to match since buildroot is doing stuff like > > > vendoring the cargo deps before generating the tarball > > Ahh, that explains it. Does this mean that for Cargo based packages, it > > will always be TOFU and checksums provided by the project / maintainer > > cannot be used (because they will mismatch)? > A maintainer could sign the tarball generated by buildroot and upload it to > github releases if they want. To be exact: an upstream maintainer (i.e. not a Buildroot maintainer). > As you can see the script will bail out if the tarball already has > vendored deps: > https://github.com/buildroot/buildroot/blob/6e4791b751c0f8e0ba218da2c22e71d3e1436b5d/support/download/cargo-post-process#L16-L19 The script will not "bail out" on pre-vendored tarballs; it will just exit without touching the tarball at all. I.e. it means that we prefer using tarballs as-is from their upstreams, when they are vendored; we only vendor packages which upstreams have not. > So as long as the upstream release tarball has vendored deps the hash should > not change AFAIU. Yes, this is the goal. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From sebastien.szymanski at armadeus.com Mon Jan 17 09:37:39 2022 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=c3=a9bastien_Szymanski?=) Date: Mon, 17 Jan 2022 10:37:39 +0100 Subject: [Buildroot] [PATCH 3/3] package/gstreamer1/gst1-imx2: new package In-Reply-To: <20220114184433.687ebc15@bootlin.com> References: <20220112094250.27022-1-sebastien.szymanski@armadeus.com> <20220112094250.27022-3-sebastien.szymanski@armadeus.com> <20220114184433.687ebc15@bootlin.com> Message-ID: <63ff839c-c7e1-f228-8658-dde65a4d215a@armadeus.com> Hi Herv?, On 1/14/22 18:44, Herve Codina wrote: > Hi S?bastien, all > > On Wed, 12 Jan 2022 10:42:50 +0100 > S?bastien Szymanski wrote: > >> This is version 2 of gst1-imx. >> >> Signed-off-by: S?bastien Szymanski >> --- >> package/gstreamer1/Config.in | 1 + >> package/gstreamer1/gst1-imx2/Config.in | 75 +++++++++++++++++++++ >> package/gstreamer1/gst1-imx2/gst1-imx2.hash | 3 + >> package/gstreamer1/gst1-imx2/gst1-imx2.mk | 75 +++++++++++++++++++++ >> 4 files changed, 154 insertions(+) >> create mode 100644 package/gstreamer1/gst1-imx2/Config.in >> create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.hash >> create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.mk >> > > This package seems an update of the existing gst1-imx package. > > Why add a new package instead of bumping gst1-imx ? It's a rewrite, as the ChangLog says: * Complete rewrite based on GStreamer 1.14, libimxvpuapi 2.1.2, and the new libimxdmabuffer library. This new rewrite is referred to as "v2" (version 2), while the old code is referred to as "v1" (version 1). v1 is no longer being developed; work is focused on v2. I think we should keep gst1-imx v1 for compatibility. Best regards, > > Best regards, > Herv? > -- S?bastien Szymanski, Armadeus Systems Software engineer From yann.morin.1998 at free.fr Mon Jan 17 10:24:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 11:24:50 +0100 Subject: [Buildroot] DMARC on this mailing list In-Reply-To: <20220117105017.28d6aacc@c3po> References: <20220117105017.28d6aacc@c3po> Message-ID: <20220117102450.GC2313964@scaer> Danilo, All, On 2022-01-17 10:50 +0100, Danilo Bargen spake thusly: > I recently enabled report-only DMARC on my e-mail domain. After sending > a few e-mails to this ML yesterday, this resulted in multiple DMARC > would-be rejection e-mails. DMARC has bitten us in the recent past (1.5 year or so...) > DMARC relies on SPF (correct sender IP) *or* DKIM (correct signature). A > nice tool to visualize this is https://www.learndmarc.com/. If either > SPF or DKIM passes, the e-mail should be accepted. > > In the case of mailing lists, the way I understand it, there are two > options: > > - Rewrite the "From:" header so that the e-mail appears to be coming > from the ML itself. Put the original sender e-mail in the "Reply-To" > header instead. If this is not being done, the sender IP (the mailing > list) does not match the sender e-mail domain and SPF fails. Note > that this *might* impact the buildroot ML reputation for some big > mailservers. This is exactly what is going on. You can check for example on the archives: https://lore.kernel.org/buildroot/20220115101415.986123F41E at exit1-us.msgsafe.io/ > - Expect that mail servers with DMARC enabled also have DKIM enabled, > and ensure that the e-mail body is not modified (i.e. turn off the > automatically inserted footer). Put mailing list unsubscribe links > in the headers instead. This way, even though the sender IP does not > match, the signature should still be intact. > > These approaches are described in the following blog post I found > online: https://begriffs.com/posts/2018-09-18-dmarc-mailing-list.html > > I don't know if mailman allows turning off body modifications (i.e. > RFC2369 and RFC2919), but it definitely allows "From"-munging: > https://wiki.list.org/DEV/DMARC Yeah, this is what is being done on this list... Regards, Yann E. MORIN. > I'm still quite new to this mailing list and don't want to put out any > demands, but I wanted to bring up this issue, since it will probably be > more and more of an issue in the future (DMARC adoption is increasing). > > Cheers, > Danilo > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From mail at dbrgn.ch Mon Jan 17 10:24:53 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 11:24:53 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <20220117101705.GB2313964@scaer> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> <20220117101705.GB2313964@scaer> Message-ID: <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> Hello James, Yann On 1/17/22 11:17, Yann E. MORIN wrote: >> A maintainer could sign the tarball generated by buildroot and upload it to >> github releases if they want. > > To be exact: an upstream maintainer (i.e. not a Buildroot maintainer). > > (...) > > I.e. it means that we prefer using tarballs as-is from their upstreams, > when they are vendored; we only vendor packages which upstreams have > not. That makes sense! I am the maintainer of tealdeer, and I'll provide a vendored source tarball for the next release. (I've heard of "cargo vendor" before, but I haven't used it so far.) Maybe a corresponding paragraph could be added to the docs at https://nightly.buildroot.org/#_integration_of_cargo_based_packages ? Thanks for the helpful comments, Danilo From yann.morin.1998 at free.fr Mon Jan 17 10:32:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 11:32:18 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> <20220117101705.GB2313964@scaer> <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> Message-ID: <20220117103218.GD2313964@scaer> Danilo, All, On 2022-01-17 11:24 +0100, Danilo Bargen spake thusly: > On 1/17/22 11:17, Yann E. MORIN wrote: > >>A maintainer could sign the tarball generated by buildroot and upload it to > >>github releases if they want. > > > >To be exact: an upstream maintainer (i.e. not a Buildroot maintainer). > > > >(...) > > > >I.e. it means that we prefer using tarballs as-is from their upstreams, > >when they are vendored; we only vendor packages which upstreams have > >not. > That makes sense! I am the maintainer of tealdeer, and I'll provide a > vendored source tarball for the next release. (I've heard of "cargo vendor" > before, but I haven't used it so far.) > > Maybe a corresponding paragraph could be added to the docs at > https://nightly.buildroot.org/#_integration_of_cargo_based_packages ? Yeah, so I already noticed that the nightly manual is not up to date... It indeed points to the correct sha1 in master, but the Cargo part is not what it should be; it is still the older text from before we added the cargo infra. We're looking into the issue... You can hack on the manual too, it's in: docs/manual/ And you can generate the manual locally: make manual-html Patches welcome! ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fperrad at gmail.com Mon Jan 17 11:36:56 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 17 Jan 2022 12:36:56 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.12 Message-ID: <20220117113656.234077-1-francois.perrad@gadz.org> see https://blog.prosody.im/prosody-0.11.12-released/ Signed-off-by: Francois Perrad --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index ee459f85d..a925d0d00 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz -sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz -sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz -sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz +md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz +sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz +sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz +sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7acfa4708..d697c8556 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.11 +PROSODY_VERSION = 0.11.12 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING -- 2.32.0 From james.hilliard1 at gmail.com Mon Jan 17 11:43:58 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 17 Jan 2022 04:43:58 -0700 Subject: [Buildroot] [PATCH v5 1/1] package/qt5/qt5base: disable broken qmake sysrootify Message-ID: <20220117114358.3814200-1-james.hilliard1@gmail.com> Currently the qmake gcc sysrootify path logic causes issues with per-package directories, disable automatic gcc sysroot for qt5base install and override all qt.conf paths manually to point to their correct locations. Redirect HostData to STAGING_DIR as mkspecs need to be available there instead of the HOST_DIR for cross compilation to work. Also set qmake target pkg-config path for qt5webengine. Set PKG_CONFIG_SYSROOT_DIR="/" in qt5webengine to prevent target pkg-config path mangling. This fixes some build errors with per-package directories such as: /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /usr/lib64/libc_nonshared.a /home/buildroot/buildroot/output/per-package/qt5base/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib/ld-linux-aarch64.so.1 collect2: error: ld returned 1 exit status make[4]: *** [Makefile:122: ../../lib/libQt5Svg.so.5.15.2] Error 1 make[3]: *** [Makefile:48: sub-svg-make_first-ordered] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: /home/buildroot/buildroot/output/build/qt5svg-5.15.2/.stamp_built] Error 2 Also attempt to fix massive amounts of breakage due to use of unsupported config flags in qt5webengine as of 5.10.0: * WebEngine Features are now configured as Qt features and WEBENGINE_CONFIG has been removed. Move target dependencies to qt5base which fixes/works around more per-package issues. More fixes for pkg-config target/host separation. Signed-off-by: James Hilliard --- Changes v4 -> v5: - rework qt5webengine config to use feature flags - try to fix more random breakage Changes v3 -> v4: - fix target pkg-config path mangling Changes v2 -> v3: - set target pkg-config path Changes v1 -> v2: - add some missing overrides to qt.conf.in --- package/libxml2/libxml2.mk | 13 +- package/pkg-qmake.mk | 2 +- package/qt5/qt5base/qmake.conf.in | 4 + package/qt5/qt5base/qt.conf.in | 21 +- package/qt5/qt5base/qt5base.mk | 19 ++ ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 +++++ .../0003-Fix-build-with-system-ICU-68.patch | 291 ++++++++++++++++++ package/qt5/qt5webengine/Config.in | 6 + package/qt5/qt5webengine/qt5webengine.mk | 57 +++- package/webp/webp.mk | 5 + 10 files changed, 477 insertions(+), 17 deletions(-) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch create mode 100644 package/qt5/qt5webengine/0003-Fix-build-with-system-ICU-68.patch diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..ce396703db 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -12,11 +12,15 @@ LIBXML2_LICENSE_FILES = COPYING LIBXML2_CPE_ID_VENDOR = xmlsoft LIBXML2_CONFIG_SCRIPTS = xml2-config +LIBXML2_CFLAGS = $(TARGET_CFLAGS) + # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -LIBXML2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" +LIBXML2_CFLAGS += -mxgot endif +LIBXML2_CONF_ENV += CFLAGS="$(LIBXML2_CFLAGS)" + LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug HOST_LIBXML2_DEPENDENCIES = host-pkgconf @@ -24,6 +28,13 @@ LIBXML2_DEPENDENCIES = host-pkgconf HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python +ifeq ($(BR2_PACKAGE_ICU),y) +LIBXML2_DEPENDENCIES += icu +LIBXML2_CONF_OPTS += --with-icu +else +LIBXML2_CONF_OPTS += --without-icu +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBXML2_DEPENDENCIES += zlib LIBXML2_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..98664fe00b 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -61,7 +61,7 @@ $(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS cd $$($(2)_BUILDDIR) && \ - $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) + $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) -- $$($(2)_CONF_OPTS) endef endif diff --git a/package/qt5/qt5base/qmake.conf.in b/package/qt5/qt5base/qmake.conf.in index 024c074928..d12f884a55 100644 --- a/package/qt5/qt5base/qmake.conf.in +++ b/package/qt5/qt5base/qmake.conf.in @@ -8,6 +8,10 @@ include(../common/linux_device_pre.conf) +# set up pkg-config +QMAKE_PKG_CONFIG = $$[QT_HOST_PREFIX]/bin/pkg-config +QMAKE_PKGCONFIG_PREFIX = /usr + # modifications to g++-unix.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 2215cbd4e1..c92f52ced0 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -2,6 +2,21 @@ Prefix=/usr HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ -Headers=/usr/include/qt5 -Plugins=/usr/lib/qt/plugins -Examples=/usr/lib/qt/examples +SysrootifyPrefix=false +Binaries=@@STAGING_DIR@@/usr/bin +Libraries=@@STAGING_DIR@@/usr/lib +Headers=@@STAGING_DIR@@/usr/include/qt5 +Plugins=@@STAGING_DIR@@/usr/lib/qt/plugins +Examples=@@STAGING_DIR@@/usr/lib/qt/examples +Tests=@@STAGING_DIR@@/usr/lib/qt/tests +Data=@@STAGING_DIR@@ +Translations=@@STAGING_DIR@@/translations +Documentation=@@STAGING_DIR@@/doc +ArchData=@@STAGING_DIR@@/usr +LibraryExecutables=@@STAGING_DIR@@/usr/libexec +Imports=@@STAGING_DIR@@/usr/imports +Qml2Imports=@@STAGING_DIR@@/usr/qml +Settings=@@STAGING_DIR@@/etc +HostBinaries=@@HOST_DIR@@/bin +HostLibraries=@@HOST_DIR@@/lib +HostData=@@STAGING_DIR@@ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..c781276135 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -230,6 +230,22 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples +# Used by qt5webengine +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_FFMPEG),ffmpeg) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBEVENT),libevent) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBNSS),libnss) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXML2),libxml2) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXSLT),libxslt) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_MINIZIP),minizip) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBVPX),libvpx) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_WEBP),webp) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXCURSOR),xlib_libXcursor) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXI),xlib_libXi) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXRANDR),xlib_libXrandr) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),xlib_libXScrnSaver) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXTST),xlib_libXtst) + ifeq ($(BR2_PACKAGE_LIBINPUT),y) QT5BASE_CONFIGURE_OPTS += -libinput QT5BASE_DEPENDENCIES += libinput @@ -311,12 +327,15 @@ define QT5BASE_CONFIGURE_CMDS -v \ -prefix /usr \ -hostprefix $(HOST_DIR) \ + -hostdatadir $(STAGING_DIR) \ -headerdir /usr/include/qt5 \ -sysroot $(STAGING_DIR) \ + -no-gcc-sysroot \ -plugindir /usr/lib/qt/plugins \ -examplesdir /usr/lib/qt/examples \ -no-rpath \ -nomake tests \ + -pkg-config \ -device buildroot \ -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ -device-option BR_COMPILER_CFLAGS="$(QT5BASE_CFLAGS)" \ diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/package/qt5/qt5webengine/0003-Fix-build-with-system-ICU-68.patch b/package/qt5/qt5webengine/0003-Fix-build-with-system-ICU-68.patch new file mode 100644 index 0000000000..103175b97e --- /dev/null +++ b/package/qt5/qt5webengine/0003-Fix-build-with-system-ICU-68.patch @@ -0,0 +1,291 @@ +From 3fe2a7550a93a74d6d1c35a918229eb4c4dc5cb9 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Mon, 16 Nov 2020 13:16:13 +0100 +Subject: [PATCH] Fix build with system ICU 68 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: QTBUG-88116 +Change-Id: I935babf51c2670fad7cc7950a2fe07eb2829c4cb +Reviewed-by: J?ri Valdmann +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +2918e073086af29bd3e4176cd2403dffa789fdc0] +--- + chromium/base/i18n/string_compare.cc | 4 ++-- + chromium/base/i18n/time_formatting.cc | 2 +- + .../autofill/core/common/autofill_regexes.cc | 8 ++++---- + .../renderer/spellcheck_worditerator.cc | 2 +- + .../spoof_checks/idn_spoof_checker.cc | 4 ++-- + .../spoof_checks/skeleton_generator.cc | 2 +- + .../blink/renderer/platform/text/locale_icu.cc | 4 ++-- + .../platform/text/text_break_iterator_icu.cc | 16 ++++++++-------- + .../renderer/platform/text/unicode_utilities.cc | 2 +- + .../renderer/platform/wtf/text/text_codec_icu.cc | 2 +- + chromium/ui/base/l10n/formatter.cc | 6 +++--- + 11 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/src/3rdparty/chromium/base/i18n/string_compare.cc b/src/3rdparty/chromium/base/i18n/string_compare.cc +index 6cd59b98f49..a5fa502b53f 100644 +--- a/src/3rdparty/chromium/base/i18n/string_compare.cc ++++ b/src/3rdparty/chromium/base/i18n/string_compare.cc +@@ -18,8 +18,8 @@ UCollationResult CompareString16WithCollator(const icu::Collator& collator, + StringPiece16 rhs) { + UErrorCode error = U_ZERO_ERROR; + UCollationResult result = collator.compare( +- icu::UnicodeString(FALSE, lhs.data(), static_cast(lhs.length())), +- icu::UnicodeString(FALSE, rhs.data(), static_cast(rhs.length())), ++ icu::UnicodeString(false, lhs.data(), static_cast(lhs.length())), ++ icu::UnicodeString(false, rhs.data(), static_cast(rhs.length())), + error); + DCHECK(U_SUCCESS(error)); + return result; +diff --git a/src/3rdparty/chromium/base/i18n/time_formatting.cc b/src/3rdparty/chromium/base/i18n/time_formatting.cc +index 1a6c1389ba0..106dd0e5b47 100644 +--- a/src/3rdparty/chromium/base/i18n/time_formatting.cc ++++ b/src/3rdparty/chromium/base/i18n/time_formatting.cc +@@ -236,7 +236,7 @@ bool TimeDurationFormatWithSeconds(const TimeDelta time, + icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); + measure_format.formatMeasures(measures, 3, formatted, ignore, status); + *out = i18n::UnicodeStringToString16(formatted); +- return U_SUCCESS(status) == TRUE; ++ return U_SUCCESS(status) == true; + } + + string16 DateIntervalFormat(const Time& begin_time, +diff --git a/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc b/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc +index b141cb2d0f6..a8a688d50c7 100644 +--- a/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc ++++ b/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc +@@ -43,7 +43,7 @@ class AutofillRegexes { + icu::RegexMatcher* AutofillRegexes::GetMatcher(const base::string16& pattern) { + auto it = matchers_.find(pattern); + if (it == matchers_.end()) { +- const icu::UnicodeString icu_pattern(FALSE, pattern.data(), ++ const icu::UnicodeString icu_pattern(false, pattern.data(), + pattern.length()); + + UErrorCode status = U_ZERO_ERROR; +@@ -70,20 +70,20 @@ bool MatchesPattern(const base::string16& input, + base::AutoLock lock(*g_lock); + + icu::RegexMatcher* matcher = g_autofill_regexes->GetMatcher(pattern); +- icu::UnicodeString icu_input(FALSE, input.data(), input.length()); ++ icu::UnicodeString icu_input(false, input.data(), input.length()); + matcher->reset(icu_input); + + UErrorCode status = U_ZERO_ERROR; + UBool matched = matcher->find(0, status); + DCHECK(U_SUCCESS(status)); + +- if (matched == TRUE && match) { ++ if (matched == true && match) { + icu::UnicodeString match_unicode = matcher->group(0, status); + DCHECK(U_SUCCESS(status)); + *match = base::i18n::UnicodeStringToString16(match_unicode); + } + +- return matched == TRUE; ++ return matched == true; + } + + } // namespace autofill +diff --git a/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc b/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc +index 8fe8a6df381..e3a65580c08 100644 +--- a/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc ++++ b/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc +@@ -424,7 +424,7 @@ bool SpellcheckWordIterator::Normalize(size_t input_start, + // spellchecker and we need manual normalization as well. The normalized + // text does not have to be NUL-terminated since its characters are copied to + // string16, which adds a NUL character when we need. +- icu::UnicodeString input(FALSE, &text_[input_start], ++ icu::UnicodeString input(false, &text_[input_start], + base::checked_cast(input_length)); + UErrorCode status = U_ZERO_ERROR; + icu::UnicodeString output; +diff --git a/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc +index 1964793fd3e..c4e01026c38 100644 +--- a/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc ++++ b/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc +@@ -347,7 +347,7 @@ bool IDNSpoofChecker::SafeToDisplayAsUnicode( + if (U_FAILURE(status) || (result & USPOOF_ALL_CHECKS)) + return false; + +- icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(), ++ icu::UnicodeString label_string(false /* isTerminated */, label.data(), + base::checked_cast(label.size())); + + // A punycode label with 'xn--' prefix is not subject to the URL +@@ -677,7 +677,7 @@ bool IDNSpoofChecker::IsWholeScriptConfusableAllowedForTLD( + base::StringPiece tld, + base::StringPiece16 tld_unicode) { + icu::UnicodeString tld_string( +- FALSE /* isTerminated */, tld_unicode.data(), ++ false /* isTerminated */, tld_unicode.data(), + base::checked_cast(tld_unicode.size())); + // Allow if the TLD contains any letter from the script, in which case it's + // likely to be a TLD in that script. +diff --git a/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc b/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc +index 41485914007..b8c1c2f547a 100644 +--- a/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc ++++ b/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc +@@ -117,7 +117,7 @@ SkeletonGenerator::~SkeletonGenerator() = default; + Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 hostname) { + Skeletons skeletons; + size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0); +- icu::UnicodeString host(FALSE, hostname.data(), hostname_length); ++ icu::UnicodeString host(false, hostname.data(), hostname_length); + // If input has any characters outside Latin-Greek-Cyrillic and [0-9._-], + // there is no point in getting rid of diacritics because combining marks + // attached to non-LGC characters are already blocked. +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc +index abff1b1d809..57f1286d4e4 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc +@@ -169,12 +169,12 @@ static String GetDateFormatPattern(const UDateFormat* date_format) { + return g_empty_string; + + UErrorCode status = U_ZERO_ERROR; +- int32_t length = udat_toPattern(date_format, TRUE, nullptr, 0, &status); ++ int32_t length = udat_toPattern(date_format, true, nullptr, 0, &status); + if (status != U_BUFFER_OVERFLOW_ERROR || !length) + return g_empty_string; + StringBuffer buffer(length); + status = U_ZERO_ERROR; +- udat_toPattern(date_format, TRUE, buffer.Characters(), length, &status); ++ udat_toPattern(date_format, true, buffer.Characters(), length, &status); + if (U_FAILURE(status)) + return g_empty_string; + return String::Adopt(buffer); +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc +index a257cd75ccf..898d0c47bb1 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc +@@ -311,13 +311,13 @@ static inline bool TextInChunkOrOutOfRange(UText* text, + text->chunkOffset = offset <= std::numeric_limits::max() + ? static_cast(offset) + : 0; +- is_accessible = TRUE; ++ is_accessible = true; + return true; + } + if (native_index >= native_length && + text->chunkNativeLimit == native_length) { + text->chunkOffset = text->chunkLength; +- is_accessible = FALSE; ++ is_accessible = false; + return true; + } + } else { +@@ -330,12 +330,12 @@ static inline bool TextInChunkOrOutOfRange(UText* text, + text->chunkOffset = offset <= std::numeric_limits::max() + ? static_cast(offset) + : 0; +- is_accessible = TRUE; ++ is_accessible = true; + return true; + } + if (native_index <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- is_accessible = FALSE; ++ is_accessible = false; + return true; + } + } +@@ -346,7 +346,7 @@ static UBool TextLatin1Access(UText* text, + int64_t native_index, + UBool forward) { + if (!text->context) +- return FALSE; ++ return false; + int64_t native_length = TextNativeLength(text); + UBool is_accessible; + if (TextInChunkOrOutOfRange(text, native_index, native_length, forward, +@@ -370,7 +370,7 @@ static UBool TextLatin1Access(UText* text, + DCHECK_EQ(new_context, kPriorContext); + TextLatin1SwitchToPriorContext(text, native_index, native_length, forward); + } +- return TRUE; ++ return true; + } + + static const struct UTextFuncs kTextLatin1Funcs = { +@@ -510,7 +510,7 @@ static void TextUTF16SwitchToPriorContext(UText* text, + + static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) { + if (!text->context) +- return FALSE; ++ return false; + int64_t native_length = TextNativeLength(text); + UBool is_accessible; + if (TextInChunkOrOutOfRange(text, native_index, native_length, forward, +@@ -532,7 +532,7 @@ static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) { + DCHECK_EQ(new_context, kPriorContext); + TextUTF16SwitchToPriorContext(text, native_index, native_length, forward); + } +- return TRUE; ++ return true; + } + + static const struct UTextFuncs kTextUTF16Funcs = { +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc +index 2cefd5390b6..b8c4515dc13 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc +@@ -300,7 +300,7 @@ void NormalizeCharactersIntoNFCForm(const UChar* characters, + DCHECK(U_SUCCESS(status)); + int32_t input_length = static_cast(length); + // copy-on-write. +- icu::UnicodeString normalized(FALSE, characters, input_length); ++ icu::UnicodeString normalized(false, characters, input_length); + // In the vast majority of cases, input is already NFC. Run a quick check + // to avoid normalizing the entire input unnecessarily. + int32_t normalized_prefix_length = +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +index 810d1cd9181..9074b640fff 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +@@ -326,7 +326,7 @@ void TextCodecICU::CreateICUConverter() const { + DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING) + << "ICU ambiguous alias warning for encoding: " << encoding_.GetName(); + if (converter_icu_) +- ucnv_setFallback(converter_icu_, TRUE); ++ ucnv_setFallback(converter_icu_, true); + } + + int TextCodecICU::DecodeToBuffer(UChar* target, +diff --git a/src/3rdparty/chromium/ui/base/l10n/formatter.cc b/src/3rdparty/chromium/ui/base/l10n/formatter.cc +index 486a3a029cb..d7a41724628 100644 +--- a/src/3rdparty/chromium/ui/base/l10n/formatter.cc ++++ b/src/3rdparty/chromium/ui/base/l10n/formatter.cc +@@ -232,7 +232,7 @@ void Formatter::Format(Unit unit, + int value, + icu::UnicodeString* formatted_string) const { + DCHECK(simple_format_[unit]); +- DCHECK(formatted_string->isEmpty() == TRUE); ++ DCHECK(formatted_string->isEmpty() == true); + UErrorCode error = U_ZERO_ERROR; + FormatNumberInPlural(*simple_format_[unit], + value, formatted_string, &error); +@@ -248,7 +248,7 @@ void Formatter::Format(TwoUnits units, + << "Detailed() not implemented for your (format, length) combination!"; + DCHECK(detailed_format_[units][1]) + << "Detailed() not implemented for your (format, length) combination!"; +- DCHECK(formatted_string->isEmpty() == TRUE); ++ DCHECK(formatted_string->isEmpty() == true); + UErrorCode error = U_ZERO_ERROR; + FormatNumberInPlural(*detailed_format_[units][0], value_1, + formatted_string, &error); +@@ -281,7 +281,7 @@ std::unique_ptr Formatter::InitFormat( + base::string16 pattern = l10n_util::GetStringUTF16(pluralities.id); + UErrorCode error = U_ZERO_ERROR; + std::unique_ptr format(new icu::MessageFormat( +- icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error)); ++ icu::UnicodeString(false, pattern.data(), pattern.length()), error)); + DCHECK(U_SUCCESS(error)); + if (format.get()) + return format; +-- +2.25.1 + diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf84..f59d80a312 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -38,18 +38,24 @@ config BR2_PACKAGE_QT5WEBENGINE # https://github.com/v8/v8/blob/5.6.326.55/gypfiles/toolchain.gypi#L1036-L1037 select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNSS select BR2_PACKAGE_LIBVPX select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_OPUS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WEBP_MUX select BR2_PACKAGE_QT5BASE_DBUS select BR2_PACKAGE_QT5BASE_EGLFS select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_JPEG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_PNG select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..30dc397edd 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -7,9 +7,8 @@ QT5WEBENGINE_VERSION = $(QT5_VERSION) QT5WEBENGINE_SITE = $(QT5_SITE) QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz -QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel host-bison host-flex \ + host-gperf host-icu host-ninja host-pkgconf host-python host-webp host-zlib QT5WEBENGINE_INSTALL_STAGING = YES include package/qt5/qt5webengine/chromium-latest.inc @@ -22,29 +21,61 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg endif -ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst +QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss + +ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y) +QT5WEBENGINE_DEPENDENCIES += host-freetype +endif + +ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y) +QT5WEBENGINE_DEPENDENCIES += host-libjpeg endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-system-ffmpeg \ + -feature-webengine-system-glib \ + -feature-webengine-system-harfbuzz \ + -feature-webengine-system-libevent \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libwebp \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-opus \ + -feature-webengine-system-png \ + -feature-webengine-system-zlib -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-system-icu \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn \ + -no-feature-webengine-v8-snapshot-support ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -feature-webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-feature-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -feature-webengine-alsa +else +QT5WEBENGINE_CONF_OPTS += -no-feature-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -feature-webengine-pulseaudio else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-feature-webengine-pulseaudio endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_SYSROOT_DIR="/" define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python @@ -58,7 +89,9 @@ define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) diff --git a/package/webp/webp.mk b/package/webp/webp.mk index d1462426c6..7c2625df23 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -19,6 +19,10 @@ WEBP_CONF_OPTS += \ --with-tiffincludedir=$(STAGING_DIR)/usr/include \ --with-tifflibdir=$(STAGING_DIR)/usr/lib +HOST_WEBP_CONF_OPTS += \ + --enable-libwebpdemux \ + --enable-libwebpmux + ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) WEBP_CONF_OPTS += --enable-libwebpdemux else @@ -56,3 +60,4 @@ WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg) WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From rainbox2k12 at msgsafe.io Mon Jan 17 11:44:19 2022 From: rainbox2k12 at msgsafe.io (rainbox2k12) Date: Mon, 17 Jan 2022 11:44:19 +0000 (UTC) Subject: [Buildroot] package/vte: install to staging Message-ID: <20220117114419.B8EAB3F465@exit1-us.msgsafe.io> Yann, Can you accept my patch as an attached text document? Cheers, Rainer \-- Sent using MsgSafe.io's Free Plan Private, encrypted, online communication For everyone. https://www.msgsafe.io -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: vte-install-staging.patch Type: text/x-patch Size: 648 bytes Desc: not available URL: From guillaume.bressaix at gmail.com Mon Jan 17 12:46:05 2022 From: guillaume.bressaix at gmail.com (Guillaume W. Bres) Date: Mon, 17 Jan 2022 13:46:05 +0100 Subject: [Buildroot] [PATCH] package/libxcrypt: bump to version 4.4.27 Message-ID: <20220117124605.17592-1-guillaume.bressaix@gmail.com> Signed-off-by: Guillaume W. Bres --- package/libxcrypt/libxcrypt.hash | 2 +- package/libxcrypt/libxcrypt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index b47f470020..2b95a35229 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 libxcrypt-4.4.26.tar.gz +sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz sha256 cead8b3d94a143f64ccb571ada1cea47a70a0b847c8d95306e8d78ed68951f3d LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 3c98b30dd5..65efa2bab9 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.26 +LIBXCRYPT_VERSION = 4.4.27 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB -- 2.20.1 From mail at dbrgn.ch Mon Jan 17 12:57:07 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 13:57:07 +0100 Subject: [Buildroot] DMARC on this mailing list In-Reply-To: <20220117102450.GC2313964@scaer> References: <20220117105017.28d6aacc@c3po> <20220117102450.GC2313964@scaer> Message-ID: <03d2153b-9a56-98d7-75d4-d447b3a8e303@dbrgn.ch> Hello Yann >> - Rewrite the "From:" header so that the e-mail appears to be coming >> from the ML itself. Put the original sender e-mail in the "Reply-To" >> header instead. If this is not being done, the sender IP (the mailing >> list) does not match the sender e-mail domain and SPF fails. Note >> that this *might* impact the buildroot ML reputation for some big >> mailservers. > > This is exactly what is going on. You can check for example on the > archives: > https://lore.kernel.org/buildroot/20220115101415.986123F41E at exit1-us.msgsafe.io/ Strange, when I view your e-mail (coming from the ML, containing the "buildroot mailing list" footer) raw data, I still see your address in the "From"-Header, and not buildroot at buildroot.org: From: "Yann E. MORIN" The *sender* is set to Buildroot: Sender: "buildroot" ...but DMARC evaluates the From-Header and not the Sender-Header, as far as I know. Some mailservers that sent me DMARC failure reports after sending e-mails to the buildroot mailing list were: - silica.com - uni-bonn.de - yahoo.com - aol.com mail.ru With a reject policy, my e-mail would have been dropped by those servers. Danilo From mail at dbrgn.ch Mon Jan 17 13:03:54 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Mon, 17 Jan 2022 14:03:54 +0100 Subject: [Buildroot] DMARC on this mailing list In-Reply-To: <03d2153b-9a56-98d7-75d4-d447b3a8e303@dbrgn.ch> References: <20220117105017.28d6aacc@c3po> <20220117102450.GC2313964@scaer> <03d2153b-9a56-98d7-75d4-d447b3a8e303@dbrgn.ch> Message-ID: <417e5e0b-0944-05ee-1d80-c5b57d64e6b2@dbrgn.ch> > Strange, when I view your e-mail (coming from the ML, containing the > "buildroot mailing list" footer) raw data, I still see your address in > the "From"-Header, and not buildroot at buildroot.org: > > ? From: "Yann E. MORIN" The lore.kernel.org archive seems to confirm this, "From"-header is not rewritten: https://lore.kernel.org/buildroot/20220117102450.GC2313964 at scaer/ However, for the archive entry you sent, it does look correct, with a rewritten "From"-header: https://lore.kernel.org/buildroot/20220115101415.986123F41E at exit1-us.msgsafe.io/ I'm not sure what the reason for the difference between these two e-mails is. Danilo From flaniel at linux.microsoft.com Mon Jan 17 13:51:28 2022 From: flaniel at linux.microsoft.com (Francis Laniel) Date: Mon, 17 Jan 2022 14:51:28 +0100 Subject: [Buildroot] [PATCH v2 2/2] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE In-Reply-To: <20220113224126.6b0801dd@windsurf> References: <20211222174905.71902-1-flaniel@linux.microsoft.com> <20211222174905.71902-3-flaniel@linux.microsoft.com> <20220113224126.6b0801dd@windsurf> Message-ID: <16263830.Pqoitud5sI@machine> Hi. Le jeudi 13 janvier 2022, 22:41:26 CET Thomas Petazzoni a ?crit : > Hello, > > On Wed, 22 Dec 2021 18:49:05 +0100 > > Francis Laniel wrote: > > CONFIG_DEBUG_BTF_INFO relies on pahole, so kernel DWARF are converted to > > BTF. If CONFIG_DEBUG_BTF_INFO is set and > > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE not, an error message is shown and > > .config is not written. > > > > Signed-off-by: Francis Laniel > > Thanks, applied, with one change. > > > diff --git a/package/pahole/Config.in.host b/package/pahole/Config.in.host > > index e427629632..521874961b 100644 > > --- a/package/pahole/Config.in.host > > +++ b/package/pahole/Config.in.host > > @@ -3,4 +3,6 @@ config BR2_PACKAGE_HOST_PAHOLE > > > > help > > > > Pahole and other DWARF utils. > > > > + Select this if you want to build a kernel with CONFIG_DEBUG_INFO_BTF > > set. + > > I've dropped this, because it's not really this option that should be > enabled if the kernel is configured with CONFIG_DEBUG_INFO_BTF, but the > BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE option. Your modification made the thing clearer, thank you for it! > Thanks for your contribution! You are welcome! I thank you for the merge! > Best regards, Best regards. > Thomas From yann.morin.1998 at free.fr Mon Jan 17 15:54:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 16:54:18 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <20220117103218.GD2313964@scaer> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> <20220117101705.GB2313964@scaer> <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> <20220117103218.GD2313964@scaer> Message-ID: <20220117155418.GE2313964@scaer> Danilo, All, On 2022-01-17 11:32 +0100, Yann E. MORIN spake thusly: > On 2022-01-17 11:24 +0100, Danilo Bargen spake thusly: [--SNIP--] > > Maybe a corresponding paragraph could be added to the docs at > > https://nightly.buildroot.org/#_integration_of_cargo_based_packages ? > Yeah, so I already noticed that the nightly manual is not up to date... It appears that the local tree that serves to generate the manual was somehow corrupted, and we were only ever building the same old manual over and over again... It has now presumably been resolved, and [0] now reads: A crate can depend on other libraries from crates.io or git repositories, listed in its Cargo.toml file. Buildroot automatically takes care of downloading such dependencies as part of the download step of packages that use the cargo-package infrastructure. Such dependencies are then kept together with the package source code in the tarball cached in Buildroot?s DL_DIR, and therefore the hash of the package?s tarball includes such dependencies. [0] https://nightly.buildroot.org/#_infrastructure_for_cargo_based_packages Maybe it is not so obvious and prominently advertised, indeed; patches to improve the situation are most welcome! :-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 17 16:06:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 17:06:02 +0100 Subject: [Buildroot] Hash verification from GitHub In-Reply-To: <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> References: <20220116230404.71f68dbb@c3po> <20220116233758.59918490@c3po> <20220117101705.GB2313964@scaer> <1ae38367-2e5c-20c7-0ba1-ebaff05cf8e7@dbrgn.ch> Message-ID: <20220117160602.GF2313964@scaer> Danilo, All, On 2022-01-17 11:24 +0100, Danilo Bargen spake thusly: > On 1/17/22 11:17, Yann E. MORIN wrote: > >I.e. it means that we prefer using tarballs as-is from their upstreams, > >when they are vendored; we only vendor packages which upstreams have > >not. > That makes sense! I am the maintainer of tealdeer, and I'll provide a > vendored source tarball for the next release. (I've heard of "cargo vendor" > before, but I haven't used it so far.) Note that vendoring is definitely not a requirement we impose on upstreams. We do prefer when the vendoring has been done by upstream, because it means (at least we hope it does!) that upstream has validated the fully vendored package, and thus we have some confidence everything works as expected. It also avoids the case where an uppstreams for a dependency mucks around with their releases: we already noticed the case where an upstream for a dependency did a re-tag of their release, thus breaking the vendoring of the dependees because it would no longer match the expected hashes in the cargo.toml (or go.mod?). Also (but that's mostly for go, IIRC), we also already noticed that some of the points of distribution (goproxies?) are serving some incorrect archives, thus causing download issues... However, if an upstream decides to not vendor (for whatever reason), then this is perfectly fine for Buildroot; this is exactly why the cargo infra has been made to support doing the vendoring. All in all, it is better that upstream vendors their releases, because it avoids any of the pitfals I mention above. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From tomazsmodis73 at hotmail.com Mon Jan 17 18:29:49 2022 From: tomazsmodis73 at hotmail.com (=?UTF-8?B?VG9tYcW+IFNtb2RpxaE=?=) Date: Mon, 17 Jan 2022 19:29:49 +0100 Subject: [Buildroot] buildroot Qt Raspberry Pi3b+ Message-ID: HI I am trying to build Qt everywhere 5.12.5 against buildroot Raspberry Pi3b+ image/sysroot. I use linaro 7.5 compiler. I rsync the sd card rootfs into sysroot on my host computer. Then I run: ./configure -release -opengl es2 -device linux-rasp-pi-g++ -device-option CROSS_COMPILE=~/RaspberryPiEGLFS/toolsNEW/bin/arm-linux-gnueabihf- -sysroot ~/RaspberryPiEGLFS/sysroot -opensource -confirm-license -skip qtwayland -skip qtlocation -skip qtscript -make libs -prefix /usr/local/qt5pi -extprefix ~/RaspberryPiEGLFS/qt5pi -hostprefix ~/RaspberryPiEGLFS/qt5 -no-use-gold-linker -v -no-gbm It starts to configure but I got error: Running configuration tests... * /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -dumpmachine arm-linux-gnueabihf Checking for valid makespec... * cd /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/config.tests/verifyspec && /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/bin/qmake "CONFIG -= qt debug_and_release app_bundle lib_bundle" "CONFIG += shared warn_off console single_arch" "QMAKE_CFLAGS += --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" "QMAKE_CXXFLAGS += --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" "QMAKE_LFLAGS += --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" -early "CONFIG += cross_compile" /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec * cd /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/config.tests/verifyspec && MAKEFLAGS= /usr/bin/make clean && MAKEFLAGS= /usr/bin/make rm -f verifyspec.o rm -f *~ core *.core /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -c -pipe -marm -mfpu=vfp -mtune=arm1176jzf-s -march=armv6zk -mabi=aapcs-linux -mfloat-abi=hard --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot -O2 -std=gnu++11 -w -fPIC -I/home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec -I. -I/home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/mkspecs/devices/linux-rasp-pi-g++ -o verifyspec.o /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec/verifyspec.cpp /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -mfloat-abi=hard --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot -Wl,-O1 -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/opt/vc/lib -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/usr/lib/arm-linux-gnueabihf -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/lib/arm-linux-gnueabihf -o verifyspec verifyspec.o /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/../lib/gcc/arm-linux-gnueabihf/4.8.3/../../../../arm-linux-gnueabihf/bin/ld: cannot find -lm collect2: error: ld returned 1 exit status make: *** [Makefile:68: verifyspec] Error 1 Note: Also available for Linux: linux-clang linux-icc ERROR: Cannot compile a minimal program. The toolchain or QMakeSpec is broken. Minimal program? What am I missing? Thomas p.s. If I rsync full OS Buster image/rootfs into sysroot on my host it configures ok. I can make and make install the Qt binaries. I can compile Qt app against Buster/Raspbian sysroot. Then I run buildroot Raspberry Pi OS that I have build and wrtten on another sc card and it runs/loads ok. The I copy my Qt elf file to buildroots directory and I get ld.so/libc.so/interpreter problem! I understand this issue and I think if I could build Qt eveywhere against buildroots rootfs it would be ok!? -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Mon Jan 17 18:37:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:37:24 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <70C0CBB8-3896-423C-B7B7-135E02A6AF12@benettiengineering.com> References: <759da9ea-e1b8-353c-9745-1f9d91038f08@benettiengineering.com> <70C0CBB8-3896-423C-B7B7-135E02A6AF12@benettiengineering.com> Message-ID: <0a38b60e-a2b2-e4b4-5780-97680f2563c0@benettiengineering.com> Forgotten again to Cc ML. Sorry! -- Giulio Benetti Benetti Engineering sas On 17/01/22 15:16, Giulio Benetti wrote: > >> Il giorno 17 gen 2022, alle ore 12:38, Giulio Benetti ha scritto: >> >> ?Hi Sergey, >> >>> On 16/01/22 19:19, Sergey Kuzminov wrote: >>> 16.01.2022 18:29, Giulio Benetti: >>>> Hi Sergey, Peter, All, >>>> >>>> +# Architecture >>>> BR2_arm=y >>>> BR2_cortex_a7=y >>>> BR2_ARM_FPU_VFPV4=y >>>> ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards with sunxi A7 and can speed things up. >>>> >>> Hi, Giulio. I will test, thanks. >>>>> +# Wireless driver and firmware >>>>> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >>>>> BR2_PACKAGE_XR819_XRADIO=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >>>> Can you point a test case? This way I could try to fix building and you could test if it works. >>>> >>>> Thank you >>>> Best regards >>>> ?- >>>> Giulio Benetti >>>> Benetti Engineering sas >>>> >>> To check, set the parameters in the current version of Buildroot >>> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >>> BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.15" >>> in the configs/orangepi_zero_defconfig file >>> make orangepi_zero_defconfig >>> make >> >> I've fixed the building of this ^^^: >> https://github.com/giuliobenetti/buildroot/commit/5e8a422b231f395d6674a2310ef0ffbf64ab38dc >> >> Can you test if it works runtime? >> >> This way your actual patch can change using latest Linux(5.16.1). >> >> I've already opened a PR for that patch: >> https://github.com/fifteenhex/xradio/pull/15 > > I haven?t checked there was already a pending PR for this: > https://github.com/fifteenhex/xradio/pull/14 > > Anyway they do the same the thing with 2 different approaches. > > Best regards > Giulio Benetti > Benetti Engineering sas > >> >> Once my patch will be merged I will bump xradio version to latest in Buildroot. >> >> Thank you >> Best regards >> -- >> Giulio Benetti >> Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 17 18:45:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:45:59 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/octavo_osd32mp1_brk: new defconfig In-Reply-To: <20211130103919.19428-1-kory.maincent@bootlin.com> References: <20211130103919.19428-1-kory.maincent@bootlin.com> Message-ID: Hi Kory, On 30/11/21 11:39, Kory Maincent wrote: [SNIP] > diff --git a/configs/octavo_osd32mp1_brk_defconfig b/configs/octavo_osd32mp1_brk_defconfig > new file mode 100644 > index 0000000000..6b775282c0 > --- /dev/null > +++ b/configs/octavo_osd32mp1_brk_defconfig > @@ -0,0 +1,59 @@ > +# architecture > +BR2_arm=y > +BR2_cortex_a7=y Here I think you should add: BR2_ARM_FPU_NEON_VFPV4=y This way, while building, you will have FPU that can use both VFPV4 and NEON. This can speed some package up. Thank you Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 17 18:54:15 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:54:15 +0100 Subject: [Buildroot] [PATCH 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: <20211106181424.299041-2-peron.clem@gmail.com> References: <20211106181424.299041-1-peron.clem@gmail.com> <20211106181424.299041-2-peron.clem@gmail.com> Message-ID: Hi Cl?ment, On 06/11/21 19:14, Cl?ment P?ron wrote: > libfdt fails to compile with on CI. > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > > Bump U-boot and also Kernel and ATF. the commit log and subject doesn't explain that the version bumping(as I suspect) fix the uboot build failure(as I can interpret). Can you please improve commit log by specifying that while bumping(u-boot I think) that error is fixed? And please add: Fixes: the link of the CI failure. Thank you Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Cl?ment P?ron > --- > configs/beelink_gs1_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index 1872aabdf0..ca953df3ea 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" > > -# Kernel Linux headers same as kernel, a 5.5 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y > +# Kernel Linux headers same as kernel, 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" > @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" > > # Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > From giulio.benetti at benettiengineering.com Mon Jan 17 18:47:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:47:31 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/octavo_osd32mp1_red: new defconfig In-Reply-To: <20211130103919.19428-2-kory.maincent@bootlin.com> References: <20211130103919.19428-1-kory.maincent@bootlin.com> <20211130103919.19428-2-kory.maincent@bootlin.com> Message-ID: <1a9f0d17-f5a1-9617-1320-a9169b15307b@benettiengineering.com> Hi Kory, On 30/11/21 11:39, Kory Maincent wrote: [SNIP] > diff --git a/configs/octavo_osd32mp1_red_defconfig b/configs/octavo_osd32mp1_red_defconfig > new file mode 100644 > index 0000000000..1ff45429d2 > --- /dev/null > +++ b/configs/octavo_osd32mp1_red_defconfig > @@ -0,0 +1,59 @@ > +# architecture > +BR2_arm=y > +BR2_cortex_a7=y as for patch [1/2] Here I think you should add: BR2_ARM_FPU_NEON_VFPV4=y This way, while building, you will have FPU that can use both VFPV4 and NEON. This can speed some package up. Thank you Best regards -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 17 18:55:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 19:55:08 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <20211106181424.299041-1-peron.clem@gmail.com> References: <20211106181424.299041-1-peron.clem@gmail.com> Message-ID: Hi Cl?ment, On 06/11/21 19:14, Cl?ment P?ron wrote: > For the moment Beelink GS1 use a default rootfs size of 60M > which make sometimes the build failed due to missing space. > > Increase the rootfs size to 120M. > > Signed-off-by: Cl?ment P?ron Reviewed-by: Giulio Benetti -- Giulio Benetti Benetti Engineering sas > --- > configs/beelink_gs1_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index e88f3e3b69..1872aabdf0 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -24,6 +24,7 @@ BR2_PACKAGE_AUTOSSH=y > BR2_PACKAGE_DROPBEAR=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > From giulio.benetti at benettiengineering.com Mon Jan 17 19:14:05 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 20:14:05 +0100 Subject: [Buildroot] [PATCH 1/1] configs/toradex_colibri_imx6: initial commit In-Reply-To: <20210610105739.488491-1-dev@open-music-kontrollers.ch> References: <20210610105739.488491-1-dev@open-music-kontrollers.ch> Message-ID: <61e64587-f5f2-2a38-5b0a-4cbb9a708557@benettiengineering.com> Hi Hanspeter, On 10/06/21 12:57, Hanspeter Portner wrote: > Based on configs/toradex_apalis_imx6 with Toradex' mainline linux/uboot > branches. > > Tested on: > Module: 'Toradex Col IMX6DL 512MB V1.0A' > Evalboard: 'Toradex Col Evaluation V3.2A' Overall commit log is not that clear. This patch "adds initial support(is it complete?) for toradex_colibri_imx6". Can you please reword this commit log? And... > Signed-off-by: Hanspeter Portner > --- > board/toradex/colibri-imx6/genimage.cfg | 15 +++++++ > board/toradex/colibri-imx6/post-image.sh | 20 +++++++++ > board/toradex/colibri-imx6/readme.txt | 53 ++++++++++++++++++++++++ > board/toradex/colibri-imx6/uEnv.txt | 7 ++++ > configs/toradex_colibri_imx6_defconfig | 25 +++++++++++ > 5 files changed, 120 insertions(+) > create mode 100644 board/toradex/colibri-imx6/genimage.cfg > create mode 100755 board/toradex/colibri-imx6/post-image.sh > create mode 100644 board/toradex/colibri-imx6/readme.txt > create mode 100644 board/toradex/colibri-imx6/uEnv.txt > create mode 100644 configs/toradex_colibri_imx6_defconfig > > diff --git a/board/toradex/colibri-imx6/genimage.cfg b/board/toradex/colibri-imx6/genimage.cfg > new file mode 100644 > index 0000000000..91c927c723 > --- /dev/null > +++ b/board/toradex/colibri-imx6/genimage.cfg > @@ -0,0 +1,15 @@ > +# Minimal SD card image for the Toradex Colibri i.MX6 COM > +# > +# It does not need a boot section for a bootloader since it is booted > +# from its internal flash memory (eMMC). I'm not used to imx6 anymore for many years, so I don't remember how bootloader can automatically load u-boot and linux. Maybe here you didn't explain well what's going on and this should go for sure on commit log too. > + > +image sdcard.img { > + hdimage { > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext2" > + size = 512M > + } > +} > diff --git a/board/toradex/colibri-imx6/post-image.sh b/board/toradex/colibri-imx6/post-image.sh > new file mode 100755 > index 0000000000..b95e175a29 > --- /dev/null > +++ b/board/toradex/colibri-imx6/post-image.sh > @@ -0,0 +1,20 @@ > +#!/usr/bin/env bash > + > +GENIMAGE_CFG="$(dirname $0)/genimage.cfg" > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > +# copy the uEnv.txt to the output/images directory > +cp board/toradex/colibri-imx6/uEnv.txt $BINARIES_DIR/uEnv.txt > + > +rm -rf "${GENIMAGE_TMP}" > + > +# generate rootfs.img > +genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > +RET=${?} > +exit ${RET} > diff --git a/board/toradex/colibri-imx6/readme.txt b/board/toradex/colibri-imx6/readme.txt > new file mode 100644 > index 0000000000..50078db173 > --- /dev/null > +++ b/board/toradex/colibri-imx6/readme.txt > @@ -0,0 +1,53 @@ > +Toradex Colibri i.MX6 Computer on Module > + > +Intro > +===== > + > +The Colibri iMX6 is a SODIMM sized computer module based on NXP?/Freescale > +i.MX 6 SoC. The module targets a wide range of applications, including: > +Medical Devices, Navigation, Industrial Automation, HMIs, Avionics, > +Entertainment system, POS, Data Acquisition, Thin Clients, Robotics, Gaming > +and much more. It offers a wide range of interfaces from simple GPIOs, industry > +standard I2C, SPI, CAN, and UART buses through to high speed USB 2.0 interfaces > +and a 16/32bit external memory bus (parallel bus). The HDMI interface makes it > +very easy to connect large, full HD resolution displays > + > +https://www.toradex.com/computer-on-modules/colibri-arm-family/nxp-freescale-imx6 > + > +It supports one carrier boards: > + > +Colibri Evaluation Board > +https://www.toradex.com/products/carrier-board/colibri-evaluation-board > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make toradex_colibri_imx6_defconfig > + > +Compile everything and build the rootfs image: > + > + $ make > + So here basically you only build the rootfs. > +How to boot the image > +===================== > + > +The board only boots from its internal flash memory eMMC, so the > +bootloader image should be copied to it, following the procedures > +described in Toradex website. > + > +http://developer.toradex.com/knowledge-base/flashing-linux-on-imx6-modules > + > +Buildroot prepares a "sdcard.img" in output/images/ with the kernel > +image, device tree and a root filesystem, ready to be dumped on an SD > +card. > + > + $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M > + > +To boot from the SD card, you should change the U-Boot > +environment. Since U-Boot is running from internal eMMC, you will need > +to access its command line prompt and manually set the necessary > +variables to boot from the external SD card. For convenience, you can > +use uEnv.txt provided in output/images/ as a reference to create the > +necessary U-Boot variables to boot from the SD card. Ah here it's clarified. But this only creates a rootfs and need some external intervention. Couldn't you create support including u-boot in the genimage.cfg? Because what I expect from a defconfig that produces a sdcard.img is that I flash it and it simply works. Otherwise, please rename the defconfig by placing _rootfs_only suffix at the end. But I'd go for having a unique image with u-boot included. > diff --git a/board/toradex/colibri-imx6/uEnv.txt b/board/toradex/colibri-imx6/uEnv.txt > new file mode 100644 > index 0000000000..e8fec787aa > --- /dev/null > +++ b/board/toradex/colibri-imx6/uEnv.txt > @@ -0,0 +1,7 @@ > +setenv boot_file 'zImage' > +setenv fdt_file 'imx6dl-colibri-eval-v3.dtb' > +setenv sdargs 'ip=off root=/dev/mmcblk0p1 rw,noatime rootfstype=ext4 rootwait' > +setenv sddtbload 'ext2load mmc 1:1 ${fdt_addr_r} boot/${fdt_file}' > +setenv sdkernelload 'ext2load mmc 1:1 ${kernel_addr_r} boot/${boot_file}' > +setenv bootcmd 'run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} ${vidargs}; echo Booting from SD card...; run sddtbload; run sdkernelload; bootz ${kernel_addr_r} - ${fdt_addr_r}' > +run bootcmd > diff --git a/configs/toradex_colibri_imx6_defconfig b/configs/toradex_colibri_imx6_defconfig > new file mode 100644 > index 0000000000..0e50381579 > --- /dev/null > +++ b/configs/toradex_colibri_imx6_defconfig > @@ -0,0 +1,25 @@ > +BR2_arm=y > +BR2_cortex_a9=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/toradex/colibri-imx6/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.toradex.com/linux-toradex.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="toradex_5.4.y" > +BR2_LINUX_KERNEL_DEFCONFIG="toradex-imx_v6_v7" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-colibri-eval-v3" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.toradex.com/u-boot-toradex.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="toradex_2020.07" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="colibri_imx6" > +BR2_TARGET_UBOOT_FORMAT_IMG=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="SPL" Where does u-boot binary goes into memory? Because as I can see, eMMC u-boot will be used instead of the sd-card one. So in case you only want to produce a rootfs with linux inside, I would also remove the uboot building here. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas From Alexey.Brodkin at synopsys.com Mon Jan 17 19:20:17 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Mon, 17 Jan 2022 22:20:17 +0300 Subject: [Buildroot] [PATCH] configs/cubieboard2: U-Boot needs Python3 & OpenSSL Message-ID: <20220117192017.8841-1-abrodkin@synopsys.com> After update of the U-Boot [1] we were missing dependency on Python3, and so were seeing failures like in [2]: ------------------------->8-------------------- HOSTLD scripts/dtc/dtc scripts/dtc/pylibfdt/libfdt_wrap.c:154:11: fatal error: Python.h: No such file or directory 154 | # include | ^~~~~~~~~~ compilation terminated. error: command '/usr/bin/gcc' failed with exit code 1 ------------------------->8-------------------- So that get fixed with "BR2_TARGET_UBOOT_NEEDS_PYTHON3=y". And then once we use Python3, we also need OpenSSL, similarly to [3] and the likes. So do it with "BR2_TARGET_UBOOT_NEEDS_OPENSSL=y". Hopefully now all starts to build w/o any issues. And while at it let's add a bit more structure to the config! [1] https://git.buildroot.net/buildroot/commit/?id=06f10a88f30b73aaea5c0e0888d7ba9d9a6420f3 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650570 [3] https://git.buildroot.net/buildroot/commit/?id=cf2a7663ccc6089e98e0d6ec39fa8623749c0c24 Signed-off-by: Alexey Brodkin --- P.S. I didn't see that problem on the U-Boot bump, as I built all locally and quite obviously had Python3 and all the headers installed in the system. --- configs/cubieboard2_defconfig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index a9356295c1..18337fac72 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,32 +1,42 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y + # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 17 19:58:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 20:58:52 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220114211525.2697606-1-heiko.thiery@gmail.com> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> Message-ID: <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> Hi Heiko, I've missed one thing below, On 14/01/22 22:15, Heiko Thiery wrote: [SNIP] > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > new file mode 100644 > index 0000000000..5b5648cc14 > --- /dev/null > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -0,0 +1,59 @@ > +# Architecture > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: BR2_ARM_FPU_VFPV4D16 This is to achieve the maximum performance. Kind regards! -- Giulio Benetti Benetti Engineering sas > + > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > From giulio.benetti at benettiengineering.com Mon Jan 17 20:06:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 21:06:47 +0100 Subject: [Buildroot] [PATCH 1/1] configs/pcengines_apu2_defconfig: bump kernel to 5.16 In-Reply-To: <20220116211557.71866ff6@c3po> References: <20220116211557.71866ff6@c3po> Message-ID: <44c15385-c790-6867-fc1f-b24c922b7e40@benettiengineering.com> Hi Danilo, On 16/01/22 21:15, Danilo Bargen wrote: > This fixes the compile errors that were present with the previous kernel > version (4.19). Is there a build failure log url that you can point? I would also mention that you are refactoring defconfig file in commit log. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > Signed-off-by: Danilo Bargen > --- > configs/pcengines_apu2_defconfig | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > -- > 2.34.1 > > diff --git a/configs/pcengines_apu2_defconfig > b/configs/pcengines_apu2_defconfig index 68cebb8f6a..eb30f6aee7 100644 > --- a/configs/pcengines_apu2_defconfig > +++ b/configs/pcengines_apu2_defconfig > @@ -1,16 +1,26 @@ > +# Architecture > BR2_x86_64=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y > -BR2_TARGET_GENERIC_HOSTNAME="apu2" > -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > -BR2_SYSTEM_DHCP="eth0" > + > +# Kernel > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" > + > +# Default hostname and TTY > +BR2_TARGET_GENERIC_HOSTNAME="apu2" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > + > +# Networking > +BR2_SYSTEM_DHCP="eth0" > + > +# Rootfs > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_ISO9660=y > BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" > BR2_TARGET_ROOTFS_ISO9660_HYBRID=y > -# BR2_TARGET_ROOTFS_TAR is not set > + > +# Bootloader > BR2_TARGET_SYSLINUX=y > From giulio.benetti at benettiengineering.com Mon Jan 17 21:06:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 22:06:36 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> References: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> <759da9ea-e1b8-353c-9745-1f9d91038f08@benettiengineering.com> <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> Message-ID: <3d6ebc46-f664-6125-b378-59c2d9535441@benettiengineering.com> Hi Sergey, please keep ML in Cc(reply to all), thank you I follow with another e-mail -- Giulio Benetti Benetti Engineering sas On 17/01/22 21:56, Sergey Kuzminov wrote: > Hi, Giulio. Wifi is working, thanks. > > # uname -a > Linux OrangePi_Zero 5.16.1 #1 SMP Mon Jan 17 21:46:45 MSK 2022 armv7l > GNU/Linux > # iwconfig > lo??????? no wireless extensions. > > eth0????? no wireless extensions. > > wlan0???? IEEE 802.11? ESSID:"AFD7DF" > ????????? Mode:Managed? Frequency:2.452 GHz? Access Point: > 2C:C8:1B:4C:E1:F3 > ????????? Bit Rate=26 Mb/s?? Tx-Power=20 dBm > ????????? Retry short limit:7?? RTS thr:off?? Fragment thr:off > ????????? Encryption key:off > ????????? Power Management:on > ????????? Link Quality=28/70? Signal level=-82 dBm > ????????? Rx invalid nwid:0? Rx invalid crypt:0? Rx invalid frag:0 > ????????? Tx excessive retries:4? Invalid misc:0?? Missed beacon:0 > > # ifconfig > eth0????? Link encap:Ethernet? HWaddr 02:42:FD:46:1D:D3 > ????????? UP BROADCAST MULTICAST? MTU:1500? Metric:1 > ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 > ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) > ????????? Interrupt:43 > > lo??????? Link encap:Local Loopback > ????????? inet addr:127.0.0.1? Mask:255.0.0.0 > ????????? UP LOOPBACK RUNNING? MTU:65536? Metric:1 > ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 > ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) > > wlan0???? Link encap:Ethernet? HWaddr 12:42:FD:46:1D:D3 > ????????? inet addr:192.168.10.240? Bcast:192.168.10.255 Mask:255.255.255.0 > ????????? UP BROADCAST RUNNING MULTICAST? MTU:1500? Metric:1 > ????????? RX packets:88 errors:0 dropped:34 overruns:0 frame:0 > ????????? TX packets:14 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:13516 (13.1 KiB)? TX bytes:1927 (1.8 KiB) > > # ping google.com > PING google.com (216.239.38.120): 56 data bytes > 64 bytes from 216.239.38.120: seq=0 ttl=102 time=54.890 ms > 64 bytes from 216.239.38.120: seq=1 ttl=102 time=54.102 ms > 64 bytes from 216.239.38.120: seq=2 ttl=102 time=51.583 ms > ^C > --- google.com ping statistics --- > 3 packets transmitted, 3 packets received, 0% packet loss > round-trip min/avg/max = 51.583/53.525/54.890 ms > > > > 17.01.2022 14:38, Giulio Benetti ?????: >> Hi Sergey, >> >> On 16/01/22 19:19, Sergey Kuzminov wrote: >>> 16.01.2022 18:29, Giulio Benetti: >>>> Hi Sergey, Peter, All, >>>> >>>> +# Architecture >>>> BR2_arm=y >>>> BR2_cortex_a7=y >>>> BR2_ARM_FPU_VFPV4=y >>>> ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards >>>> with sunxi A7 and can speed things up. >>>> >>> Hi, Giulio. I will test, thanks. >>> >>> >>>>> +# Wireless driver and firmware >>>>> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >>>>> BR2_PACKAGE_XR819_XRADIO=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >>>> Can you point a test case? This way I could try to fix building and >>>> you could test if it works. >>>> >>>> Thank you >>>> Best regards >>>> ?- >>>> Giulio Benetti >>>> Benetti Engineering sas >>>> >>> To check, set the parameters in the current version of Buildroot >>> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >>> BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.15" >>> in the configs/orangepi_zero_defconfig file >>> >>> make orangepi_zero_defconfig >>> make >> >> I've fixed the building of this ^^^: >> https://github.com/giuliobenetti/buildroot/commit/5e8a422b231f395d6674a2310ef0ffbf64ab38dc >> >> >> Can you test if it works runtime? >> >> This way your actual patch can change using latest Linux(5.16.1). >> >> I've already opened a PR for that patch: >> https://github.com/fifteenhex/xradio/pull/15 >> >> Once my patch will be merged I will bump xradio version to latest in >> Buildroot. >> >> Thank you >> Best regards > > -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 17 21:07:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 22:07:39 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: add patch to build with Linux > 5.12 Message-ID: <20220117210739.2022551-1-giulio.benetti@benettiengineering.com> As explained in the local patch itself of_get_mac_address() has changed, so we need to check against Linux version and use it slightly differently. Patch is pending upstream: https://github.com/fifteenhex/xradio/pull/15 I've realized only later there was already an opened PR for this, anyway IMHO I think my patch is written a little better, so please accept it. And most of all Sergey already tested it and it works: https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html Signed-off-by: Giulio Benetti --- ...fix-building-with-Linux-version-5.12.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch new file mode 100644 index 0000000000..a1d91e2ff7 --- /dev/null +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch @@ -0,0 +1,68 @@ +From 990b19664488a8a3bb8d019a3a6b242dd8ad4c29 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 17 Jan 2022 12:26:00 +0100 +Subject: [PATCH] main.c: fix building with Linux version > 5.12 + +of_get_mac_address() on Linux version > 5.12 requires mac pointer as second +argument and return an int. So let's deal with it by checking linux version +to make it compatible with both Linux version > 5.12 and not. + +Signed-off-by: Giulio Benetti +--- + main.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/main.c b/main.c +index b60e18d..d354521 100644 +--- a/main.c ++++ b/main.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "xradio.h" + #include "fwio.h" +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) + int if_id; + struct ieee80211_hw *dev; + struct xradio_common *hw_priv; ++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 12, 0) ++ unsigned char addr[ETH_ALEN]; ++#else + unsigned char randomaddr[ETH_ALEN]; + const unsigned char *addr = NULL; ++#endif + + //init xradio_common + dev = xradio_init_common(sizeof(struct xradio_common)); +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) + hw_priv->sdio_func = func; + sdio_set_drvdata(func, hw_priv); + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 12, 0) ++ // fill in mac addresses ++ if (hw_priv->pdev->of_node) { ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); ++ } ++ if (err < 0) { ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); ++ eth_random_addr(addr); ++ } ++#else + // fill in mac addresses + if (hw_priv->pdev->of_node) { + addr = of_get_mac_address(hw_priv->pdev->of_node); +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) + eth_random_addr(randomaddr); + addr = randomaddr; + } ++#endif ++ + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); + hw_priv->addresses[1].addr[5] += 0x01; +-- +2.25.1 + -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 17 21:08:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 22:08:20 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> References: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> <759da9ea-e1b8-353c-9745-1f9d91038f08@benettiengineering.com> <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> Message-ID: <4da691a9-cdba-1a3c-0aed-f2b8ac072e0d@benettiengineering.com> Hi Sergey, please keep ML in Cc, On 17/01/22 21:56, Sergey Kuzminov wrote: > Hi, Giulio. Wifi is working, thanks. > > # uname -a > Linux OrangePi_Zero 5.16.1 #1 SMP Mon Jan 17 21:46:45 MSK 2022 armv7l > GNU/Linux > # iwconfig > lo??????? no wireless extensions. > > eth0????? no wireless extensions. > > wlan0???? IEEE 802.11? ESSID:"AFD7DF" > ????????? Mode:Managed? Frequency:2.452 GHz? Access Point: > 2C:C8:1B:4C:E1:F3 > ????????? Bit Rate=26 Mb/s?? Tx-Power=20 dBm > ????????? Retry short limit:7?? RTS thr:off?? Fragment thr:off > ????????? Encryption key:off > ????????? Power Management:on > ????????? Link Quality=28/70? Signal level=-82 dBm > ????????? Rx invalid nwid:0? Rx invalid crypt:0? Rx invalid frag:0 > ????????? Tx excessive retries:4? Invalid misc:0?? Missed beacon:0 > > # ifconfig > eth0????? Link encap:Ethernet? HWaddr 02:42:FD:46:1D:D3 > ????????? UP BROADCAST MULTICAST? MTU:1500? Metric:1 > ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 > ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) > ????????? Interrupt:43 > > lo??????? Link encap:Local Loopback > ????????? inet addr:127.0.0.1? Mask:255.0.0.0 > ????????? UP LOOPBACK RUNNING? MTU:65536? Metric:1 > ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 > ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) > > wlan0???? Link encap:Ethernet? HWaddr 12:42:FD:46:1D:D3 > ????????? inet addr:192.168.10.240? Bcast:192.168.10.255 Mask:255.255.255.0 > ????????? UP BROADCAST RUNNING MULTICAST? MTU:1500? Metric:1 > ????????? RX packets:88 errors:0 dropped:34 overruns:0 frame:0 > ????????? TX packets:14 errors:0 dropped:0 overruns:0 carrier:0 > ????????? collisions:0 txqueuelen:1000 > ????????? RX bytes:13516 (13.1 KiB)? TX bytes:1927 (1.8 KiB) > > # ping google.com > PING google.com (216.239.38.120): 56 data bytes > 64 bytes from 216.239.38.120: seq=0 ttl=102 time=54.890 ms > 64 bytes from 216.239.38.120: seq=1 ttl=102 time=54.102 ms > 64 bytes from 216.239.38.120: seq=2 ttl=102 time=51.583 ms > ^C > --- google.com ping statistics --- > 3 packets transmitted, 3 packets received, 0% packet loss > round-trip min/avg/max = 51.583/53.525/54.890 ms > Thanks a lot for trying. So please bump linux version to latest(5.16.1) and send V2 patch. In the meanwhile I've just sent a patch for rx819-radio: https://patchwork.ozlabs.org/project/buildroot/patch/20220117210739.2022551-1-giulio.benetti at benettiengineering.com/ So when you send V2, please create a cover-letter where you state my patch for rx819-radio is needed to work. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas > > 17.01.2022 14:38, Giulio Benetti ?????: >> Hi Sergey, >> >> On 16/01/22 19:19, Sergey Kuzminov wrote: >>> 16.01.2022 18:29, Giulio Benetti: >>>> Hi Sergey, Peter, All, >>>> >>>> +# Architecture >>>> BR2_arm=y >>>> BR2_cortex_a7=y >>>> BR2_ARM_FPU_VFPV4=y >>>> ?Here ^^^ you can enable VFP+NEON. It?s working on all Olimex boards >>>> with sunxi A7 and can speed things up. >>>> >>> Hi, Giulio. I will test, thanks. >>> >>> >>>>> +# Wireless driver and firmware >>>>> +# [16.01.2022] Doesn't compile with newer kernels > 5.12.x >>>>> BR2_PACKAGE_XR819_XRADIO=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>>>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >>>> Can you point a test case? This way I could try to fix building and >>>> you could test if it works. >>>> >>>> Thank you >>>> Best regards >>>> ?- >>>> Giulio Benetti >>>> Benetti Engineering sas >>>> >>> To check, set the parameters in the current version of Buildroot >>> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y >>> BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.15" >>> in the configs/orangepi_zero_defconfig file >>> >>> make orangepi_zero_defconfig >>> make >> >> I've fixed the building of this ^^^: >> https://github.com/giuliobenetti/buildroot/commit/5e8a422b231f395d6674a2310ef0ffbf64ab38dc >> >> >> Can you test if it works runtime? >> >> This way your actual patch can change using latest Linux(5.16.1). >> >> I've already opened a PR for that patch: >> https://github.com/fifteenhex/xradio/pull/15 >> >> Once my patch will be merged I will bump xradio version to latest in >> Buildroot. >> >> Thank you >> Best regards > > From kuzminov.sergey81 at gmail.com Mon Jan 17 21:19:30 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Tue, 18 Jan 2022 00:19:30 +0300 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <4da691a9-cdba-1a3c-0aed-f2b8ac072e0d@benettiengineering.com> References: <20220116112600.28441-1-kuzminov.sergey81@gmail.com> <300B22A3-0051-4FF0-8B59-499BC08C6A7C@benettiengineering.com> <78e0fe75-0ecc-51ce-6270-d6f228cfdbaf@gmail.com> <759da9ea-e1b8-353c-9745-1f9d91038f08@benettiengineering.com> <5abde9b8-d7de-ceb7-10bb-136f3f5992f1@gmail.com> <4da691a9-cdba-1a3c-0aed-f2b8ac072e0d@benettiengineering.com> Message-ID: <4f564638-77fa-be2c-6bed-2ea5937695d7@gmail.com> Ok. I'll make a v2 patch tomorrow, I want to check something else (BR2_ARM_EABIHF, BR2_ARM_FPU_NEON_VFPV4). 18.01.2022 00:08, Giulio Benetti ?????: > Hi Sergey, > > please keep ML in Cc, > > On 17/01/22 21:56, Sergey Kuzminov wrote: >> Hi, Giulio. Wifi is working, thanks. >> >> # uname -a >> Linux OrangePi_Zero 5.16.1 #1 SMP Mon Jan 17 21:46:45 MSK 2022 armv7l >> GNU/Linux >> # iwconfig >> lo??????? no wireless extensions. >> >> eth0????? no wireless extensions. >> >> wlan0???? IEEE 802.11? ESSID:"AFD7DF" >> ? ????????? Mode:Managed? Frequency:2.452 GHz? Access Point: >> 2C:C8:1B:4C:E1:F3 >> ? ????????? Bit Rate=26 Mb/s?? Tx-Power=20 dBm >> ? ????????? Retry short limit:7?? RTS thr:off?? Fragment thr:off >> ? ????????? Encryption key:off >> ? ????????? Power Management:on >> ? ????????? Link Quality=28/70? Signal level=-82 dBm >> ? ????????? Rx invalid nwid:0? Rx invalid crypt:0? Rx invalid frag:0 >> ? ????????? Tx excessive retries:4? Invalid misc:0?? Missed beacon:0 >> >> # ifconfig >> eth0????? Link encap:Ethernet? HWaddr 02:42:FD:46:1D:D3 >> ? ????????? UP BROADCAST MULTICAST? MTU:1500? Metric:1 >> ? ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 >> ? ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 >> ? ????????? collisions:0 txqueuelen:1000 >> ? ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) >> ? ????????? Interrupt:43 >> >> lo??????? Link encap:Local Loopback >> ? ????????? inet addr:127.0.0.1? Mask:255.0.0.0 >> ? ????????? UP LOOPBACK RUNNING? MTU:65536? Metric:1 >> ? ????????? RX packets:0 errors:0 dropped:0 overruns:0 frame:0 >> ? ????????? TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 >> ? ????????? collisions:0 txqueuelen:1000 >> ? ????????? RX bytes:0 (0.0 B)? TX bytes:0 (0.0 B) >> >> wlan0???? Link encap:Ethernet? HWaddr 12:42:FD:46:1D:D3 >> ? ????????? inet addr:192.168.10.240? Bcast:192.168.10.255 >> Mask:255.255.255.0 >> ? ????????? UP BROADCAST RUNNING MULTICAST? MTU:1500? Metric:1 >> ? ????????? RX packets:88 errors:0 dropped:34 overruns:0 frame:0 >> ? ????????? TX packets:14 errors:0 dropped:0 overruns:0 carrier:0 >> ? ????????? collisions:0 txqueuelen:1000 >> ? ????????? RX bytes:13516 (13.1 KiB)? TX bytes:1927 (1.8 KiB) >> >> # ping google.com >> PING google.com (216.239.38.120): 56 data bytes >> 64 bytes from 216.239.38.120: seq=0 ttl=102 time=54.890 ms >> 64 bytes from 216.239.38.120: seq=1 ttl=102 time=54.102 ms >> 64 bytes from 216.239.38.120: seq=2 ttl=102 time=51.583 ms >> ^C >> --- google.com ping statistics --- >> 3 packets transmitted, 3 packets received, 0% packet loss >> round-trip min/avg/max = 51.583/53.525/54.890 ms >> > > Thanks a lot for trying. So please bump linux version to > latest(5.16.1) and send V2 patch. In the meanwhile I've just sent a > patch for rx819-radio: > https://patchwork.ozlabs.org/project/buildroot/patch/20220117210739.2022551-1-giulio.benetti at benettiengineering.com/ > > > So when you send V2, please create a cover-letter where you state my > patch for rx819-radio is needed to work. > > Thank you! > Best regards From yann.morin.1998 at free.fr Mon Jan 17 21:34:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 22:34:41 +0100 Subject: [Buildroot] [git commit] package/nodejs: security bump to version 14.18.3 Message-ID: <20220117212825.850138349E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9096036f00c5a0f37e3b3916417f0d0b166b73e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is specifically defined to use a particular SAN type, can result in bypassing name-constrained intermediates. Node.js was accepting URI SAN types, which PKIs are often not defined to use. Additionally, when a protocol allows URI SANs, Node.js did not match the URI correctly. Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) Node.js converts SANs (Subject Alternative Names) to a string format. It uses this string to check peer certificates against hostnames when validating connections. The string format was subject to an injection vulnerability when name constraints were used within a certificate chain, allowing the bypass of these name constraints. Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) Node.js did not handle multi-value Relative Distinguished Names correctly. Attackers could craft certificate subjects containing a single-value Relative Distinguished Name that would be interpreted as a multi-value Relative Distinguished Name, for example, in order to inject a Common Name that would allow bypassing the certificate subject verification. Prototype pollution via console.table properties (Low)(CVE-2022-21824) Due to the formatting logic of the console.table() function it was not safe to allow user controlled input to be passed to the properties parameter while simultaneously passing a plain object with at least one property as the first parameter, which could be __proto__. The prototype pollution has very limited control, in that it only allows an empty string to be assigned numerical keys of the object prototype. For details, see the advisory: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f330757341..6365ef852b 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt -sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz +# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt +sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 7d5c93eb93..727af6dc50 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.2 +NODEJS_VERSION = 14.18.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ From yann.morin.1998 at free.fr Mon Jan 17 21:37:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 17 Jan 2022 22:37:21 +0100 Subject: [Buildroot] [PATCH] package/nodejs: security bump to version 14.18.3 In-Reply-To: <20220114103825.1529-1-peter@korsgaard.com> References: <20220114103825.1529-1-peter@korsgaard.com> Message-ID: <20220117213721.GG2313964@scaer> Peter, All, On 2022-01-14 11:38 +0100, Peter Korsgaard spake thusly: > Fixes the following security issues: [--SNIP--] > For details, see the advisory: > https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ It was also reported on IRC that this should also fix some build issue with python 3.10. > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nodejs/nodejs.hash | 4 ++-- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash > index f330757341..6365ef852b 100644 > --- a/package/nodejs/nodejs.hash > +++ b/package/nodejs/nodejs.hash > @@ -1,5 +1,5 @@ > -# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt > -sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz > +# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt > +sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz > > # Hash for license file > sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 7d5c93eb93..727af6dc50 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NODEJS_VERSION = 14.18.2 > +NODEJS_VERSION = 14.18.3 > NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz > NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) > NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Jan 17 21:50:50 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 17 Jan 2022 22:50:50 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: add patch to build with Linux > 5.12 In-Reply-To: <20220117210739.2022551-1-giulio.benetti@benettiengineering.com> References: <20220117210739.2022551-1-giulio.benetti@benettiengineering.com> Message-ID: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> Hi All, > Il giorno 17 gen 2022, alle ore 22:07, Giulio Benetti ha scritto: > > ?As explained in the local patch itself of_get_mac_address() has changed, so > we need to check against Linux version and use it slightly differently. > > Patch is pending upstream: > https://github.com/fifteenhex/xradio/pull/15 > I've realized only later there was already an opened PR for this, anyway > IMHO I think my patch is written a little better, so please accept it. > And most of all Sergey already tested it and it works: > https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html > > Signed-off-by: Giulio Benetti > --- > ...fix-building-with-Linux-version-5.12.patch | 68 +++++++++++++++++++ > 1 file changed, 68 insertions(+) > create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch > > diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch > new file mode 100644 > index 0000000000..a1d91e2ff7 > --- /dev/null > +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.12.patch > @@ -0,0 +1,68 @@ > +From 990b19664488a8a3bb8d019a3a6b242dd8ad4c29 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti > +Date: Mon, 17 Jan 2022 12:26:00 +0100 > +Subject: [PATCH] main.c: fix building with Linux version > 5.12 > + > +of_get_mac_address() on Linux version > 5.12 requires mac pointer as second > +argument and return an int. So let's deal with it by checking linux version > +to make it compatible with both Linux version > 5.12 and not. > + > +Signed-off-by: Giulio Benetti > +--- > + main.c | 17 +++++++++++++++++ > + 1 file changed, 17 insertions(+) > + > +diff --git a/main.c b/main.c > +index b60e18d..d354521 100644 > +--- a/main.c > ++++ b/main.c > +@@ -13,6 +13,7 @@ > + #include > + #include > + #include > ++#include > + > + #include "xradio.h" > + #include "fwio.h" > +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) > + int if_id; > + struct ieee80211_hw *dev; > + struct xradio_common *hw_priv; > ++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 12, 0) > ++ unsigned char addr[ETH_ALEN]; > ++#else > + unsigned char randomaddr[ETH_ALEN]; > + const unsigned char *addr = NULL; > ++#endif > + > + //init xradio_common > + dev = xradio_init_common(sizeof(struct xradio_common)); > +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) > + hw_priv->sdio_func = func; > + sdio_set_drvdata(func, hw_priv); > + > ++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 12, 0) This ^^^ must be >= 5.13. Need to send a v2 and update my PR. Sorry for the noise Giulio > ++ // fill in mac addresses > ++ if (hw_priv->pdev->of_node) { > ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); > ++ } > ++ if (err < 0) { > ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); > ++ eth_random_addr(addr); > ++ } > ++#else > + // fill in mac addresses > + if (hw_priv->pdev->of_node) { > + addr = of_get_mac_address(hw_priv->pdev->of_node); > +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) > + eth_random_addr(randomaddr); > + addr = randomaddr; > + } > ++#endif > ++ > + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); > + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); > + hw_priv->addresses[1].addr[5] += 0x01; > +-- > +2.25.1 > + > -- > 2.25.1 > From fontaine.fabrice at gmail.com Mon Jan 17 22:30:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 17 Jan 2022 23:30:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjpeg: security bump to version 9e Message-ID: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> rdgif.c, cderror.h: add sanity check for GIF image dimensions. Thank to Casper Sun for cjpeg potential vulnerability report. - Update hash of README (changes not related to license) - Update indentation in hash file (two spaces) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 4f0a677d04..1a2e82caef 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz -sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README +sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 6b55aba7e5..caf7f05f44 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,12 +4,8 @@ # ################################################################################ -LIBJPEG_VERSION = 9d -# 9d was released 2020-01-12, but the tarball was replaced upstream circa -# 2021-03, causing hash mismatch. Until there is a new version released, -# use our cached copy from s.b.o. -#LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SITE = http://sources.buildroot.org/libjpeg +LIBJPEG_VERSION = 9e +LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 17 23:04:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 18 Jan 2022 00:04:48 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> Message-ID: <20220118000448.32ea764d@windsurf> On Mon, 17 Jan 2022 20:58:52 +0100 Giulio Benetti wrote: > > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > > new file mode 100644 > > index 0000000000..5b5648cc14 > > --- /dev/null > > +++ b/configs/kontron_bl_imx8mm_defconfig > > @@ -0,0 +1,59 @@ > > +# Architecture > > +BR2_aarch64=y > > +BR2_ARM_FPU_VFPV3=y > > i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: > BR2_ARM_FPU_VFPV4D16 > > This is to achieve the maximum performance. Nope, that's not really how it works. VFPv3 is better than VFPv3-D16. Indeed VFPv3 means that the the FPU has 32 double precision registers, while VFPv3-D16 means that it has "only" 16 double precision registers. So, if the i.MX8MM has only the VFPv3-D16, then indeed it should be chosen, because code compiled with VFPv3 may not work, as it might use too many double precision registers. On the other hand, if the i.MX8MM has the full VFPv3, then BR2_ARM_FPU_VFPV3=y should be used. That being said, the gcc man page only documents vfpv3, vfpv3-d16-fp16, vfpv3-fp16 as extension for armv7-a. Interesting, would need to look into this. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From richard at audacityteam.org Mon Jan 17 23:45:54 2022 From: richard at audacityteam.org (Richard Ash) Date: Mon, 17 Jan 2022 23:45:54 +0000 Subject: [Buildroot] buildroot Qt Raspberry Pi3b+ In-Reply-To: References: Message-ID: <20220117234554.39996df0@audacityteam.org> On Mon, 17 Jan 2022 19:29:49 +0100 Toma? Smodi? wrote: > HI > > I am trying to build Qt everywhere 5.12.5 against buildroot Raspberry > Pi3b+ image/sysroot. I use linaro 7.5 compiler. Did you configure and build buildroot using the linaro compiler? If not, then it's very unlikely to work. > I rsync the sd card rootfs into sysroot on my host computer. That's not the sysroot at all. The SD card contents only has the runtime libraries needed to run binaries. It does not have the headers and static libraries needed to compile software. They are found in the output/staging directory from buildroot (which you will notice is a lot bigger than the target directory! As a minimum, you need to be using the buildroot staging directory as your sysroot. But the bigger question is "why bother"? Buildroot has packages for qt5 so you can just get buildroot to compile whichever bits of QT you need as part of the system, without having to do it by hand. https://git.busybox.net/buildroot/tree/package/qt5 Richard Then I > run: > > ./configure -release -opengl es2 -device linux-rasp-pi-g++ > -device-option > CROSS_COMPILE=~/RaspberryPiEGLFS/toolsNEW/bin/arm-linux-gnueabihf- > -sysroot ~/RaspberryPiEGLFS/sysroot -opensource -confirm-license > -skip qtwayland -skip qtlocation -skip qtscript -make libs -prefix > /usr/local/qt5pi -extprefix ~/RaspberryPiEGLFS/qt5pi -hostprefix > ~/RaspberryPiEGLFS/qt5 -no-use-gold-linker -v -no-gbm > > It starts to configure but I got error: > > Running configuration tests... > > * > /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ > -dumpmachine > > arm-linux-gnueabihf > Checking for valid makespec... > > * cd > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/config.tests/verifyspec > && > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/bin/qmake > "CONFIG -= qt debug_and_release app_bundle lib_bundle" "CONFIG += > shared warn_off console single_arch" "QMAKE_CFLAGS += > --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" "QMAKE_CXXFLAGS += > --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" "QMAKE_LFLAGS += > --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot" -early "CONFIG += > cross_compile" > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec > * cd > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/config.tests/verifyspec > && MAKEFLAGS= /usr/bin/make clean && MAKEFLAGS= /usr/bin/make > > rm -f verifyspec.o > rm -f *~ core *.core > /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ > -c -pipe -marm -mfpu=vfp -mtune=arm1176jzf-s -march=armv6zk > -mabi=aapcs-linux -mfloat-abi=hard > --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot -O2 -std=gnu++11 -w > -fPIC > -I/home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec > -I. > -I/home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/mkspecs/devices/linux-rasp-pi-g++ > -o verifyspec.o > /home/tomaz/RaspberryPiEGLFS/qt-everywhere-src-5.12.5/qtbase/config.tests/verifyspec/verifyspec.cpp > /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ > -mfloat-abi=hard --sysroot=/home/tomaz/RaspberryPiEGLFS/sysroot > -Wl,-O1 > -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/opt/vc/lib > -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/usr/lib/arm-linux-gnueabihf > -Wl,-rpath-link,/home/tomaz/RaspberryPiEGLFS/sysroot/lib/arm-linux-gnueabihf > -o verifyspec verifyspec.o > /home/tomaz/RaspberryPiEGLFS/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/../lib/gcc/arm-linux-gnueabihf/4.8.3/../../../../arm-linux-gnueabihf/bin/ld: > cannot find -lm > collect2: error: ld returned 1 exit status > make: *** [Makefile:68: verifyspec] Error 1 > Note: Also available for Linux: linux-clang linux-icc > > ERROR: Cannot compile a minimal program. The toolchain or QMakeSpec > is broken. > > > Minimal program? What am I missing? > > Thomas > > p.s. If I rsync full OS Buster image/rootfs into sysroot on my host > it configures ok. I can make and make install the Qt binaries. I can > compile Qt app against Buster/Raspbian sysroot. Then I run buildroot > Raspberry Pi OS that I have build and wrtten on another sc card and > it runs/loads ok. The I copy my Qt elf file to buildroots directory > and I get ld.so/libc.so/interpreter problem! I understand this issue > and I think if I could build Qt eveywhere against buildroots rootfs > it would be ok!? > From buildroot at busybox.net Thu Jan 13 20:58:34 2022 From: buildroot at busybox.net (busybox.net) Date: 13 Jan 2022 21:58:34 +0100 Subject: [Buildroot] ACTION REQUIRED Message-ID: <20220113215834.8C7A445E7776F0D9@busybox.net> An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Tue Jan 18 06:35:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 07:35:31 +0100 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> Message-ID: <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> As explained in the local patch itself of_get_mac_address() has changed, so we need to check against Linux version and use it slightly differently. Patch is pending upstream: https://github.com/fifteenhex/xradio/pull/15 I've realized only later there was already an opened PR for this, anyway IMHO I think my patch is written a little better, so please accept it. And most of all Sergey already tested it and it works: https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html Signed-off-by: Giulio Benetti --- V1->V2: * update local patch to build correctly also with Linux >= 5.12.1 < 5.13.0 --- ...fix-building-with-Linux-version-5.13.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch new file mode 100644 index 0000000000..3b9742012e --- /dev/null +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch @@ -0,0 +1,68 @@ +From 4873746fa9d42a8edbc1e192899e00c29ed3d32a Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 17 Jan 2022 12:26:00 +0100 +Subject: [PATCH] main.c: fix building with Linux version >= 5.13 + +of_get_mac_address() on Linux version >= 5.13 requires mac pointer as +second argument and return an int. So let's deal with it by checking linux +version to make it compatible with both Linux version >= 5.13 and not. + +Signed-off-by: Giulio Benetti +--- + main.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/main.c b/main.c +index b60e18d..06cb1f6 100644 +--- a/main.c ++++ b/main.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "xradio.h" + #include "fwio.h" +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) + int if_id; + struct ieee80211_hw *dev; + struct xradio_common *hw_priv; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) ++ unsigned char addr[ETH_ALEN]; ++#else + unsigned char randomaddr[ETH_ALEN]; + const unsigned char *addr = NULL; ++#endif + + //init xradio_common + dev = xradio_init_common(sizeof(struct xradio_common)); +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) + hw_priv->sdio_func = func; + sdio_set_drvdata(func, hw_priv); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) ++ // fill in mac addresses ++ if (hw_priv->pdev->of_node) { ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); ++ } ++ if (err < 0) { ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); ++ eth_random_addr(addr); ++ } ++#else + // fill in mac addresses + if (hw_priv->pdev->of_node) { + addr = of_get_mac_address(hw_priv->pdev->of_node); +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) + eth_random_addr(randomaddr); + addr = randomaddr; + } ++#endif ++ + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); + hw_priv->addresses[1].addr[5] += 0x01; +-- +2.25.1 + -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 06:58:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 07:58:41 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220118000448.32ea764d@windsurf> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> <20220118000448.32ea764d@windsurf> Message-ID: Hi Thomas, On 18/01/22 00:04, Thomas Petazzoni wrote: > On Mon, 17 Jan 2022 20:58:52 +0100 > Giulio Benetti wrote: > >>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig >>> new file mode 100644 >>> index 0000000000..5b5648cc14 >>> --- /dev/null >>> +++ b/configs/kontron_bl_imx8mm_defconfig >>> @@ -0,0 +1,59 @@ >>> +# Architecture >>> +BR2_aarch64=y >>> +BR2_ARM_FPU_VFPV3=y >> >> i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: >> BR2_ARM_FPU_VFPV4D16 >> >> This is to achieve the maximum performance. > > Nope, that's not really how it works. VFPv3 is better than VFPv3-D16. > Indeed VFPv3 means that the the FPU has 32 double precision registers, > while VFPv3-D16 means that it has "only" 16 double precision registers. I'm a bit confused. The datasheet[1] states at 1.4.1: ``` ? Media Processing Engine (MPE) with NEON technology supporting the Advanced Single Instruction Multiple Data architecture ? Floating Point Unit (FPU) with support of the VFPv4-D16 architecture ``` [1]: https://www.nxp.com/docs/en/data-sheet/IMX8MMCEC.pdf So I expect it to only have VFPv4-D16. And also NEON, but we can't mix them up in Aarch64 as I know. > So, if the i.MX8MM has only the VFPv3-D16, then indeed it should be > chosen, because code compiled with VFPv3 may not work, as it might use > too many double precision registers. > > On the other hand, if the i.MX8MM has the full VFPv3, then > BR2_ARM_FPU_VFPV3=y should be used. It only has VFPv4-D16. I think I've explained myself bad. This is not to achieve maximum performance, simply datasheet states it only supports VFPv4-D16[1] and judging from this: https://developer.arm.com/documentation/dui0472/h/CJADDCIF#:~:text=VFPv3%20has%2032%20double%2Dprecision,VFPv3%20with%20half%2Dprecision%20extensions.&text=VFPv4%20has%2032%20double%2Dprecision,to%20the%20features%20of%20VFPv3. VFPv4 is retro-compatible with VFPv3, and I'd expect VFP4v4-D16 to be like that too. Is it possible that at the moment, by mistake, it worked without using more than 16 registers as VFPv3 that is retro-compatible with VFPv4-D16(maybe?). > That being said, the gcc man page only documents vfpv3, vfpv3-d16-fp16, > vfpv3-fp16 as extension for armv7-a. Interesting, would need to look > into this. Yes, but i.MX8MM is a cortex-A53, so armv8-a: https://developer.arm.com/ip-products/processors/cortex-a/cortex-a53 that then is retro-compatible to armv7-a if in Aarch32. But here we use it as BR2_aarch64, so armv8-a: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html and it lists: ``` -mfpu=name This specifies what floating-point hardware (or hardware emulation) is available on the target. Permissible names are: ?auto?, ?vfpv2?, ?vfpv3?, ?vfpv3-fp16?, ?vfpv3-d16?, ?vfpv3-d16-fp16?, ?vfpv3xd?, ?vfpv3xd-fp16?, ?neon-vfpv3?, ?neon-fp16?, ?vfpv4?, ?vfpv4-d16?, ?fpv4-sp-d16?, ?neon-vfpv4?, ?fpv5-d16?, ?fpv5-sp-d16?, ?fp-armv8?, ?neon-fp-armv8? and ?crypto-neon-fp-armv8?. Note that ?neon? is an alias for ?neon-vfpv3? and ?vfp? is an alias for ?vfpv2?. ``` So "vfpv4-d16" is possible. Here I think we need vfpv4-d16 and not vfpv3 because of both DS and RM of i.MX8MM. Does it sound good to you? Thank you Best regards -- Giulio Benetti Benetti Engineering sas From thomas.petazzoni at bootlin.com Tue Jan 18 07:06:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 18 Jan 2022 07:06:49 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-17 Message-ID: <20220118070654.17F4440105@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-17 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 63 | 9 | 0 | 72 | 2021.11.x | 23 | 3 | 0 | 26 | master | 84 | 52 | 0 | 136 | Classification of failures by reason for master ----------------------------------------------- host-riscv-isa-sim-1.1.0 | 12 rygel-0.40.2 | 7 frr-8.1 | 4 bluez5_utils-5.63 | 3 unknown | 3 bat-0.18.3 | 2 apcupsd-3.14.14 | 1 apparmor-3.0.3 | 1 cryptsetup-2.4.2 | 1 efl-1.26.0 | 1 gensio-2.2.9 | 1 google-breakpad-7515ab13768... | 1 gstd-0.13.0 | 1 hiawatha-11.1 | 1 ksmbd-tools-3.4.3 | 1 kvm-unit-tests-kvm-unit-tes... | 1 mesa3d-21.3.3 | 1 mongrel2-1.13.0 | 1 mp4v2-5.0.1 | 1 opencv4-4.5.5 | 1 pcsc-lite-1.9.5 | 1 powertop-2.13 | 1 qt5base-5.15.2 | 1 tesseract-ocr-5.0.1 | 1 ulog-0389d243352255f6182326... | 1 wavemon-0.9.4 | 1 xdriver_xf86-video-mach64-6... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/beb00fc8b71bcd2db87cbdc8e5029fe28c782abd | x86_64 | apparmor-3.0.3 | NOK | http://autobuild.buildroot.net/results/74763096f8eb9bf0bd4226dcd257fe6a0cdd5094 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/5641c78eb9df313c44f2b17de9dbbfece26b3c0c | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/715e5d0ac525406b698b015b5b306f3366a51c11 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/19c82963d6e3655f897bcae54e82fbf5887e46fe | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b91864dc5b4c33a1a29ee34036e6694ca81b9e13 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/dea76eebc09e62989dc117767478d144c8789464 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/bd70dd1e5c6b045fc3a7da6b0cbf6de22d6dcbc6 | x86_64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/479aeee2ad138787119a16577233ff4d3ef0582d | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e6089331b8f3df3678aa5102df5e5bb3668c7637 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/bdac99f54d365f883e9a4272e3f03ebbcd8c4473 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e94fd48210d95ee216c45f68c714ba67515c6cc8 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/40ceb52442bd6589f740eee7521a8fb2fac13da4 | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/deccd3694d5250f51e7b75b93f151ada0dc59b8f | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/5d9cd3eda611b5fedcdd6f5d0c21596ff6de59b5 | mips64el | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/2f04f53df280a7d931615d8898687f5a5bd54803 | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/1ae8ff6834074e07904aa6a8d358804e7117439e | arc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/66e3127c8c7db3a0dc7b808ea06b4ae9cb3cd49e | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6d6587a3e81a282d226efbcf3579fc5ceda51db5 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/a0c12eef60097367366a81aca98fe82d871c67bc | xtensa | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/1e77b711034972fca198251db29df469cc199c25 | sparc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/ff2f711655d335609d325b09b38be1fda359db60 | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/b9315e68e616320c31b63594a62fa01b84506316 | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/ee5813ef9e0d467ab39962df2183dab70b6e9825 | m68k | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/87979167940393416a78301c94f6cd7a8f719cab | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/8a79ffcee4ae595f95f34bbabbec32f25ccde387 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/ec1a394b4c9ba315b916ad84d2372ded55044a32 | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/7d69f16ae0f4bf9d87cf7acbb371c97242c70ec4 | riscv32 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/56e34478f3c5739c8967754d9fa2565310c88b0e | xtensa | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/f205f5edcc774623a60f4fb4e6f2c2854310ed71 | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/45b575f36753a0984da9bb106a7baa957ea554cb | mips64el | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/22487776f35e73bb6ae47b114caee6475d730028 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/de324b733e09057c87352220069fe65f6e535eb8 | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/86b477f1c1d38ff418f638ee0770dd827bcadbe7 | ORPH arm | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/3d77a828adc254b112ad2e5ce214d3e892b2229e | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/225151602eb240f20355982e596670919cf4cb33 | ORPH or1k | powertop-2.13 | NOK | http://autobuild.buildroot.net/results/e9f0deaeb09402a8bb601e616a615d1aa09bdaf6 | riscv64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/f026a0e6f14c9c948cb7771ed7020ef4aa24672e | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/47ddeb8cf5547091d059c348c7f754cf5a3650cb | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/384e4af1db8a962e148825e681c5ce27f7b477ab | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3646635c6a53da02c78be7fce7899b34fdc33b91 | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c4199a4788f6af996e8d31239f6ae9c64eb3b3a0 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ba1ef2ca6e581e5bb05b018dc9ac928c8beaee73 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/03be40d80dc7961abbdc6f3d323cafb0518bd36c | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/18413e663d9081386e26726ac3ca246074a70060 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/b3ee6065bbf1d67007c17f650898b5c6a7ed6f99 | mipsel | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/5bfc759b6a5cfcbb78d4a72c7b3318f491f4d5cf | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/21e773353abc8eee13c8e708bdc5032647692f86 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/8ea47650902b1004569e74fdb0b51b25a04f2e12 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/2a08d439d16128ad285d0bff5c6169bcedeb2ae3 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/59136d64244cb08f870781fa09013a56c3d93dfc | riscv64 | xdriver_xf86-video-mach64-6... | NOK | http://autobuild.buildroot.net/results/07a00bfb9c755a748232025f630d54424117169f | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 5 apcupsd-3.14.14 | 1 mesa3d-20.3.5 | 1 ndisc6-1.0.4 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/4b04a12ec6663a2aae0d6c293c8137d180947fc5 | mips64el | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/ce29083f8e24799424659fdc7ecc98473c074fca | riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/fa2b833b4c14ad580b5dcbcccca488d117424a6d | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/6f7b981e4d357c27ff57f079e038a0b2bcae5e59 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/63bd0633d30fbb5022f7ffa180d2f84c257d949a | powerpc64le | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/cdf7e22668b99a8f615b5fc82f1ba146bfe7d28b | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/668ce7624ababf1edd3da35bbe5b265cf7983a40 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/1c95d309e0455acbca15d366a44accba2804cc72 | ORPH mipsel | unknown | NOK | http://autobuild.buildroot.net/results/31b51516efb0fdaf8226f0ae0203e038cc7d329d | Classification of failures by reason for 2021.11.x -------------------------------------------------- acpid-2.0.33 | 1 libdbi-88b8477d57153b9f736d... | 1 libmbim-1.26.0 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | acpid-2.0.33 | NOK | http://autobuild.buildroot.net/results/509a5c704210e248e6df25657270067499c163f0 | ORPH riscv64 | libdbi-88b8477d57153b9f736d... | NOK | http://autobuild.buildroot.net/results/696b9e8e53b14fc148641226530f84c75ba37d00 | riscv32 | libmbim-1.26.0 | NOK | http://autobuild.buildroot.net/results/e3fc37860a19b6ee3afc97863243a5cb6fb69d42 | Gitlab CI results for 2022-01-17 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1981078627 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/1981078848 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/1981078849 | ORPH -- http://autobuild.buildroot.net From mf at go-sys.de Tue Jan 18 08:13:31 2022 From: mf at go-sys.de (Michael Fischer) Date: Tue, 18 Jan 2022 09:13:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuplot: bump version to 5.4.3 Message-ID: <20220118081331.30088-1-mf@go-sys.de> Signed-off-by: Michael Fischer --- package/gnuplot/gnuplot.hash | 6 +++--- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index fc166205d0..1cc14973d1 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/ -md5 2050ca477199a591543bc968aba7d899 gnuplot-5.4.2.tar.gz -sha1 2e076b29f38bfcb841cb5eb3377fd1a469ced1ac gnuplot-5.4.2.tar.gz +md5 9bb03cfa77e38924e08ffbb9eb59d8b1 gnuplot-5.4.3.tar.gz +sha1 c4b60fd7a700b22fa62b14829cbb0e17911627c9 gnuplot-5.4.3.tar.gz # Locally computed -sha256 e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba gnuplot-5.4.2.tar.gz +sha256 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 gnuplot-5.4.3.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 436d3e5f92..6cf36a0997 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.2 +GNUPLOT_VERSION = 5.4.3 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -- 2.20.1 From etienne.carriere at linaro.org Tue Jan 18 08:54:00 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Tue, 18 Jan 2022 09:54:00 +0100 Subject: [Buildroot] [PATCH 1/2] board/qemu/arm-vexpress-tz: use enable=on In-Reply-To: <20220115143344.12319-1-romain.naour@gmail.com> References: <20220115143344.12319-1-romain.naour@gmail.com> Message-ID: Hello Romain, On Sat, 15 Jan 2022 at 15:33, Romain Naour wrote: > > Since Qemu 6.0.0 [1], a warning appear in the log if a short-form > boolean option is used. > > [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ccd3b3b8112b670fdccf8a392b8419b173ffccb4 > > Signed-off-by: Romain Naour > Cc: Etienne Carriere > Cc: Dick Olsson > --- > board/qemu/arm-vexpress-tz/readme.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt > index 7e62e943a6..3036dd54ca 100644 > --- a/board/qemu/arm-vexpress-tz/readme.txt > +++ b/board/qemu/arm-vexpress-tz/readme.txt > @@ -16,7 +16,7 @@ from the image directory: > -smp 1 -s -m 1024 -d unimp \ > -serial stdio \ > -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ > - -semihosting-config enable,target=native \ > + -semihosting-config enable=on,target=native \ > -bios flash.bin # qemu_arm_vexpress_tz_defconfig > > The boot stage traces (if any) followed by the login prompt will appear > -- > 2.31.1 > Thanks for the fix. Br, Etienne From giulio.benetti at benettiengineering.com Tue Jan 18 10:42:56 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:42:56 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex Message-ID: <20220118104324.2081177-1-giulio.benetti@benettiengineering.com> Hi All, this patchset aims to enable the best FPU strategy for every board with 32-bits Arm Cortex actually present in Buildroot. I don't own these boards so I can't test these changes. What is about Allwinner doesn't worry me because I've tested a lot of cases with Olimex boards, but the other changes are still to be tested. So I ask to the board maintainers to test the patches that involve their boards if possible. Anyway I've checked well all the SoCs Datasheet and I think I've made it correctly, even if in some of them it's not specified if VFPv4 means -D32. I assume it like that because otherwise -D16 is usually specified. Best regards --- Giulio Benetti Benetti Engineering sas Giulio Benetti (28): configs/acmesystems_acqua_a5_256mb_defconfig: enable NEON/VFPV4 FPU strategy configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/beagleboardx15_defconfig: enable NEON/VFPV4 FPU strategy configs/beagleboneai_defconfig: enable NEON/VFPV4 FPU strategy configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_m1_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_m1_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/grinn_liteboard_defconfig: enable NEON/VFPV4 FPU strategy configs/licheepi_zero_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_lite_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_one_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_pc_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_pc_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157a_dk1_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157c_dk2_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157c_odyssey_defconfig: enable NEON/VFPV4 FPU strategy configs/acmesystems_acqua_a5_256mb_defconfig | 1 + configs/acmesystems_acqua_a5_512mb_defconfig | 1 + configs/bananapi_m2_plus_defconfig | 1 + configs/bananapi_m2_ultra_defconfig | 1 + configs/beagleboardx15_defconfig | 1 + configs/beagleboneai_defconfig | 1 + configs/chromebook_snow_defconfig | 1 + configs/freescale_imx7dsabresd_defconfig | 1 + configs/friendlyarm_nanopi_m1_defconfig | 2 +- configs/friendlyarm_nanopi_m1_plus_defconfig | 2 +- configs/friendlyarm_nanopi_neo_defconfig | 2 +- configs/friendlyarm_nanopi_r1_defconfig | 2 +- configs/grinn_liteboard_defconfig | 1 + configs/licheepi_zero_defconfig | 2 +- configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig | 1 + configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/orangepi_lite_defconfig | 2 +- configs/orangepi_one_defconfig | 2 +- configs/orangepi_pc_defconfig | 2 +- configs/orangepi_pc_plus_defconfig | 2 +- configs/orangepi_plus_defconfig | 2 +- configs/orangepi_r1_defconfig | 2 +- configs/orangepi_zero_defconfig | 2 +- configs/stm32mp157a_dk1_defconfig | 1 + configs/stm32mp157c_dk2_defconfig | 1 + configs/stm32mp157c_odyssey_defconfig | 1 + 28 files changed, 28 insertions(+), 12 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:10 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex Message-ID: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Hi All, this patchset aims to enable the best FPU strategy for every board with 32-bits Arm Cortex actually present in Buildroot. I don't own these boards so I can't test these changes. What is about Allwinner doesn't worry me because I've tested a lot of cases with Olimex boards, but the other changes are still to be tested. So I ask to the board maintainers to test the patches that involve their boards if possible. Anyway I've checked well all the SoCs Datasheet and I think I've made it correctly, even if in some of them it's not specified if VFPv4 means -D32. I assume it like that because otherwise -D16 is usually specified. Best regards --- Giulio Benetti Benetti Engineering sas Giulio Benetti (28): configs/acmesystems_acqua_a5_256mb_defconfig: enable NEON/VFPV4 FPU strategy configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/beagleboardx15_defconfig: enable NEON/VFPV4 FPU strategy configs/beagleboneai_defconfig: enable NEON/VFPV4 FPU strategy configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_m1_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_m1_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/grinn_liteboard_defconfig: enable NEON/VFPV4 FPU strategy configs/licheepi_zero_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_lite_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_one_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_pc_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_pc_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_plus_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_r1_defconfig: enable NEON/VFPV4 FPU strategy configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157a_dk1_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157c_dk2_defconfig: enable NEON/VFPV4 FPU strategy configs/stm32mp157c_odyssey_defconfig: enable NEON/VFPV4 FPU strategy configs/acmesystems_acqua_a5_256mb_defconfig | 1 + configs/acmesystems_acqua_a5_512mb_defconfig | 1 + configs/bananapi_m2_plus_defconfig | 1 + configs/bananapi_m2_ultra_defconfig | 1 + configs/beagleboardx15_defconfig | 1 + configs/beagleboneai_defconfig | 1 + configs/chromebook_snow_defconfig | 1 + configs/freescale_imx7dsabresd_defconfig | 1 + configs/friendlyarm_nanopi_m1_defconfig | 2 +- configs/friendlyarm_nanopi_m1_plus_defconfig | 2 +- configs/friendlyarm_nanopi_neo_defconfig | 2 +- configs/friendlyarm_nanopi_r1_defconfig | 2 +- configs/grinn_liteboard_defconfig | 1 + configs/licheepi_zero_defconfig | 2 +- configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig | 1 + configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/orangepi_lite_defconfig | 2 +- configs/orangepi_one_defconfig | 2 +- configs/orangepi_pc_defconfig | 2 +- configs/orangepi_pc_plus_defconfig | 2 +- configs/orangepi_plus_defconfig | 2 +- configs/orangepi_r1_defconfig | 2 +- configs/orangepi_zero_defconfig | 2 +- configs/stm32mp157a_dk1_defconfig | 1 + configs/stm32mp157c_dk2_defconfig | 1 + configs/stm32mp157c_odyssey_defconfig | 1 + 28 files changed, 28 insertions(+), 12 deletions(-) -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:11 +0100 Subject: [Buildroot] [PATCH 01/28] configs/acmesystems_acqua_a5_256mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-2-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/acmesystems_acqua_a5_256mb_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index f8129f3780..991de4c1be 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a5=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:12 +0100 Subject: [Buildroot] [PATCH 02/28] configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/acmesystems_acqua_a5_512mb_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index e399d4a9ff..56885ea5a1 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_SYSTEM_DHCP="eth0" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:13 +0100 Subject: [Buildroot] [PATCH 03/28] configs/bananapi_m2_plus_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-4-giulio.benetti@benettiengineering.com> This boards has Allwinner H3 that supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/bananapi_m2_plus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/bananapi_m2_plus_defconfig b/configs/bananapi_m2_plus_defconfig index 77a403ce81..9522c0c329 100644 --- a/configs/bananapi_m2_plus_defconfig +++ b/configs/bananapi_m2_plus_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:24 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:24 +0100 Subject: [Buildroot] [PATCH 14/28] configs/licheepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-15-giulio.benetti@benettiengineering.com> This board has Allwinner V3s that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/licheepi_zero_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/licheepi_zero_defconfig b/configs/licheepi_zero_defconfig index 2e1a413988..bdb937d2dd 100644 --- a/configs/licheepi_zero_defconfig +++ b/configs/licheepi_zero_defconfig @@ -1,7 +1,7 @@ # Target options BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:37 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:37 +0100 Subject: [Buildroot] [PATCH 27/28] configs/stm32mp157c_dk2_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-28-giulio.benetti@benettiengineering.com> This board has stm32mp157c that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of the default VFPV4-D16. Signed-off-by: Giulio Benetti --- configs/stm32mp157c_dk2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index f1f7baaa08..503ed91843 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -1,6 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.13 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:25 +0100 Subject: [Buildroot] [PATCH 15/28] configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-16-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig index 024e8a1465..c5b9e65a81 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:38 +0100 Subject: [Buildroot] [PATCH 28/28] configs/stm32mp157c_odyssey_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-29-giulio.benetti@benettiengineering.com> This board has stm32mp157c that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of the default VFPV4-D16. Signed-off-by: Giulio Benetti --- configs/stm32mp157c_odyssey_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32mp157c_odyssey_defconfig b/configs/stm32mp157c_odyssey_defconfig index 6b699830b1..6aa772b8c0 100644 --- a/configs/stm32mp157c_odyssey_defconfig +++ b/configs/stm32mp157c_odyssey_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/seeed/stm32mp157c-odyssey/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_OVERLAY="board/seeed/stm32mp157c-odyssey/overlay/" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:26 +0100 Subject: [Buildroot] [PATCH 16/28] configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-17-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig index 3bcd5f0200..35b8c905e5 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:27 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:27 +0100 Subject: [Buildroot] [PATCH 17/28] configs/microchip_sama5d2_icp_mmc_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-18-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/microchip_sama5d2_icp_mmc_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama5d2_icp_mmc_defconfig b/configs/microchip_sama5d2_icp_mmc_defconfig index 4bb3625f83..658d8c18b6 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:28 +0100 Subject: [Buildroot] [PATCH 18/28] configs/microchip_sama5d2_icp_mmc_dev_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-19-giulio.benetti@benettiengineering.com> As pointed by SAMA5D2 Datasheet[1]: ``` The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 functionality to provide support for the ARM v7 Advanced SIMD v2 and Vector Floating-Point v4 (VFPv4) instruction sets. ``` So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf Signed-off-by: Giulio Benetti --- configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/configs/microchip_sama5d2_icp_mmc_dev_defconfig index 052d9e032c..123bb3e69c 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:29 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:29 +0100 Subject: [Buildroot] [PATCH 19/28] configs/orangepi_lite_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-20-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_lite_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index e834816456..9805d953b9 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:30 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:30 +0100 Subject: [Buildroot] [PATCH 20/28] configs/orangepi_one_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-21-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_one_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307..c4e674a6b6 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:31 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:31 +0100 Subject: [Buildroot] [PATCH 21/28] configs/orangepi_pc_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-22-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_pc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c4..8d7d89599a 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:32 +0100 Subject: [Buildroot] [PATCH 22/28] configs/orangepi_pc_plus_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-23-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_pc_plus_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..cb108a8d31 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:33 +0100 Subject: [Buildroot] [PATCH 23/28] configs/orangepi_plus_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-24-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_plus_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig index 11d7486486..897246373b 100644 --- a/configs/orangepi_plus_defconfig +++ b/configs/orangepi_plus_defconfig @@ -1,7 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:34 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:34 +0100 Subject: [Buildroot] [PATCH 24/28] configs/orangepi_r1_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-25-giulio.benetti@benettiengineering.com> This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_r1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig index bad1f9400c..9fff1fa97a 100644 --- a/configs/orangepi_r1_defconfig +++ b/configs/orangepi_r1_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:35 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:35 +0100 Subject: [Buildroot] [PATCH 25/28] configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-26-giulio.benetti@benettiengineering.com> This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/orangepi_zero_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..a0af809e92 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:36 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:36 +0100 Subject: [Buildroot] [PATCH 26/28] configs/stm32mp157a_dk1_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-27-giulio.benetti@benettiengineering.com> This board has stm32mp157a that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of the default VFPV4-D16. Signed-off-by: Giulio Benetti --- configs/stm32mp157a_dk1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index a487ce9891..1768500b74 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -1,6 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.13 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:14 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:14 +0100 Subject: [Buildroot] [PATCH 04/28] configs/bananapi_m2_ultra_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-5-giulio.benetti@benettiengineering.com> This boards has Allwinner A40i/R40/V40 that support NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/bananapi_m2_ultra_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 67ecec424c..b22e597945 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:15 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:15 +0100 Subject: [Buildroot] [PATCH 05/28] configs/beagleboardx15_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-6-giulio.benetti@benettiengineering.com> This board has TI AM5728 that is a cortex-A15 and supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/beagleboardx15_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beagleboardx15_defconfig b/configs/beagleboardx15_defconfig index 039a07b11e..2ee2777dad 100644 --- a/configs/beagleboardx15_defconfig +++ b/configs/beagleboardx15_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a15=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboardx15/genimage.cfg" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:16 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:16 +0100 Subject: [Buildroot] [PATCH 06/28] configs/beagleboneai_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-7-giulio.benetti@benettiengineering.com> This board has TI AM5729 that is a cortex-A15 and supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/beagleboneai_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig index 586a75317e..edc29e4e5e 100644 --- a/configs/beagleboneai_defconfig +++ b/configs/beagleboneai_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a15=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/beagleboneai/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_SYSTEM_DHCP="eth0" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:17 +0100 Subject: [Buildroot] [PATCH 07/28] configs/chromebook_snow_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-8-giulio.benetti@benettiengineering.com> This board has NVIDIA Tegra K1 that is a cortex-A15 and supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/chromebook_snow_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index bcb94b716b..bc188967b3 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a15=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:18 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:18 +0100 Subject: [Buildroot] [PATCH 08/28] configs/freescale_imx7dsabresd_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-9-giulio.benetti@benettiengineering.com> This board has i.M7D that supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/freescale_imx7dsabresd_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 5a9cff488d..dc9d8c0306 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -1,6 +1,7 @@ # architecture BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:19 +0100 Subject: [Buildroot] [PATCH 09/28] configs/friendlyarm_nanopi_m1_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-10-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/friendlyarm_nanopi_m1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/friendlyarm_nanopi_m1_defconfig b/configs/friendlyarm_nanopi_m1_defconfig index 18cfcb261e..6e78e662be 100644 --- a/configs/friendlyarm_nanopi_m1_defconfig +++ b/configs/friendlyarm_nanopi_m1_defconfig @@ -1,7 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:20 +0100 Subject: [Buildroot] [PATCH 10/28] configs/friendlyarm_nanopi_m1_plus_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-11-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/friendlyarm_nanopi_m1_plus_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/friendlyarm_nanopi_m1_plus_defconfig b/configs/friendlyarm_nanopi_m1_plus_defconfig index 06adc54b15..bd4d78cbf6 100644 --- a/configs/friendlyarm_nanopi_m1_plus_defconfig +++ b/configs/friendlyarm_nanopi_m1_plus_defconfig @@ -1,7 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:21 +0100 Subject: [Buildroot] [PATCH 11/28] configs/friendlyarm_nanopi_neo_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-12-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/friendlyarm_nanopi_neo_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/friendlyarm_nanopi_neo_defconfig b/configs/friendlyarm_nanopi_neo_defconfig index 1519d828d6..559a3a2415 100644 --- a/configs/friendlyarm_nanopi_neo_defconfig +++ b/configs/friendlyarm_nanopi_neo_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:22 +0100 Subject: [Buildroot] [PATCH 12/28] configs/friendlyarm_nanopi_r1_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-13-giulio.benetti@benettiengineering.com> This board has Allwinner H3 that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. Signed-off-by: Giulio Benetti --- configs/friendlyarm_nanopi_r1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/friendlyarm_nanopi_r1_defconfig b/configs/friendlyarm_nanopi_r1_defconfig index 8b03f6dd00..8e382b5677 100644 --- a/configs/friendlyarm_nanopi_r1_defconfig +++ b/configs/friendlyarm_nanopi_r1_defconfig @@ -1,7 +1,7 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -- 2.25.1 From giulio.benetti at benettiengineering.com Tue Jan 18 10:43:23 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 11:43:23 +0100 Subject: [Buildroot] [PATCH 13/28] configs/grinn_liteboard_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220118104338.2081259-14-giulio.benetti@benettiengineering.com> This board has i.MX6UL that is a cortex-A7 and supports NEON/VFPV4 FPU strategy, so let's enable it. Signed-off-by: Giulio Benetti --- configs/grinn_liteboard_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 9cad66e15a..640e77c4d7 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,5 +1,6 @@ BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -- 2.25.1 From patrickdepinguin at gmail.com Tue Jan 18 11:19:46 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Tue, 18 Jan 2022 12:19:46 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: <20220115200306.14037-7-patrickdepinguin@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-7-patrickdepinguin@gmail.com> Message-ID: Hi, El s?b, 15 ene 2022 a las 21:03, Thomas De Schampheleire () escribi?: > > From: Thomas De Schampheleire > > Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel > but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. > > Signed-off-by: Thomas De Schampheleire > --- > > Note that the defconfig refers to a toolchain at > autobuild.buildroot.org, but is not yet present at that location. > I uploaded the toolchain temporarily to: > http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz > md5sum:b085c0d8f137c078f8f09d116d8364f8 > sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 > > Romain Naour notified me that this toolchain does not run on the GCC Farm (Illegal instruction) so I made a new version, currently uploaded at: http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11-2.tar.xz md5sum: 3cee64f82675446ad255f6c165786eb5 sha256sum: 6715bfbc195588b6483d39e9ec6d70611cac3b99bf2dd34fedbed0d4e6c7edc1 Best regards, Thomas From adeep at lexina.in Tue Jan 18 11:14:58 2022 From: adeep at lexina.in (Vyacheslav Bocharov) Date: Tue, 18 Jan 2022 14:14:58 +0300 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package Message-ID: <20220118111457.2491318-1-adeep@lexina.in> Firmware Image Package (FIP) sources to sign Amlogic SoC u-boot binaries in LibreELEC, Armbian and meta-meson, buildroot. https://github.com/LibreELEC/amlogic-boot-fip Signed-off-by: Vyacheslav Bocharov --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/amlogic-boot-fip/Config.in | 17 +++++++++ .../amlogic-boot-fip/amlogic-boot-fip.hash | 2 + package/amlogic-boot-fip/amlogic-boot-fip.mk | 37 +++++++++++++++++++ 5 files changed, 60 insertions(+) create mode 100644 package/amlogic-boot-fip/Config.in create mode 100644 package/amlogic-boot-fip/amlogic-boot-fip.hash create mode 100644 package/amlogic-boot-fip/amlogic-boot-fip.mk diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..deda803018 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2894,6 +2894,9 @@ N: Volkov Viacheslav F: package/v4l2grab/ F: package/zbar/ +N: Vyacheslav Bocharov +F: package/amlogic-boot-fip/ + N: Wade Berrier F: package/ngrep/ diff --git a/package/Config.in b/package/Config.in index 4df1474b91..df38024af2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -418,6 +418,7 @@ endmenu menu "Hardware handling" menu "Firmware" source "package/am33x-cm3/Config.in" + source "package/amlogic-boot-fip/Config.in" source "package/armbian-firmware/Config.in" source "package/b43-firmware/Config.in" source "package/linux-firmware/Config.in" diff --git a/package/amlogic-boot-fip/Config.in b/package/amlogic-boot-fip/Config.in new file mode 100644 index 0000000000..ceb09f8247 --- /dev/null +++ b/package/amlogic-boot-fip/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_AMLOGIC_BOOT_FIP + bool "amlogic-boot-fip" + help + This package enables access to various u-boot + blobs from the LibreELEC amlogic-boot-fip repository. + + https://github.com/LibreELEC/amlogic-boot-fip + +if BR2_PACKAGE_AMLOGIC_BOOT_FIP + +config BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD + string "Board uboot firmware config" + depends on BR2_PACKAGE_AMLOGIC_BOOT_FIP + help + Name of the board for which U-Boot firmware should be built + from amlogic-boot-fip +endif diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.hash b/package/amlogic-boot-fip/amlogic-boot-fip.hash new file mode 100644 index 0000000000..5d6dd237e3 --- /dev/null +++ b/package/amlogic-boot-fip/amlogic-boot-fip.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdf9d3872457c33a2755cc504f6b0560a62a6ee04437ac28e66623a345ed4936 amlogic-boot-fip-7ff0004e0e4d261ba81334a2f46302bd06704aca-br1.tar.gz diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.mk b/package/amlogic-boot-fip/amlogic-boot-fip.mk new file mode 100644 index 0000000000..6f646ae871 --- /dev/null +++ b/package/amlogic-boot-fip/amlogic-boot-fip.mk @@ -0,0 +1,37 @@ + +################################################################################ +# +# amlogic-boot-fip +# +################################################################################ + +AMLOGIC_BOOT_FIP_VERSION = 7ff0004e0e4d261ba81334a2f46302bd06704aca +AMLOGIC_BOOT_FIP_SITE = https://github.com/LibreELEC/amlogic-boot-fip +AMLOGIC_BOOT_FIP_SITE_METHOD = git +AMLOGIC_BOOT_FIP_INSTALL_IMAGES = YES +AMLOGIC_BOOT_FIP_DEPENDENCIES = uboot + +AMLOGIC_BOOT_FIP_LICENSE = PROPRIETARY +AMLOGIC_BOOT_FIP_REDISTRIBUTE = NO + +AMLOGIC_BOOT_BINS += u-boot.bin.sd.bin + +define AMLOGIC_BOOT_FIP_BUILD_CMDS + mkdir -p $(@D)/fip + cp $(BINARIES_DIR)/u-boot.bin $(@D)/fip/bl33.bin + cd "$(@D)"; ./build-fip.sh $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) $(@D)/fip/bl33.bin $(@D)/fip +endef + +ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP),y) +ifeq ($(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)),) +$(error No board u-boot firmware config name specified, check your BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD setting) +endif # qstrip BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD +endif + +define AMLOGIC_BOOT_FIP_INSTALL_IMAGES_CMDS + $(foreach f,$(AMLOGIC_BOOT_BINS), \ + cp -dpf "$(@D)/fip/$(f)" "$(BINARIES_DIR)/" + ) +endef + +$(eval $(generic-package)) -- 2.30.2 From romain.naour at gmail.com Tue Jan 18 11:51:43 2022 From: romain.naour at gmail.com (Romain Naour) Date: Tue, 18 Jan 2022 12:51:43 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-7-patrickdepinguin@gmail.com> Message-ID: <13491b39-7995-1aa7-a2cb-5af43467bb95@gmail.com> Hello Thomas, Le 18/01/2022 ? 12:19, Thomas De Schampheleire a ?crit?: > Hi, > > El s?b, 15 ene 2022 a las 21:03, Thomas De Schampheleire > () escribi?: >> >> From: Thomas De Schampheleire >> >> Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel >> but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. >> >> Signed-off-by: Thomas De Schampheleire >> --- >> >> Note that the defconfig refers to a toolchain at >> autobuild.buildroot.org, but is not yet present at that location. >> I uploaded the toolchain temporarily to: >> http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz >> md5sum:b085c0d8f137c078f8f09d116d8364f8 >> sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 >> >> > > Romain Naour notified me that this toolchain does not run on the GCC > Farm (Illegal instruction) so I made a new version, currently uploaded > at: > http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11-2.tar.xz > md5sum: 3cee64f82675446ad255f6c165786eb5 > sha256sum: 6715bfbc195588b6483d39e9ec6d70611cac3b99bf2dd34fedbed0d4e6c7edc1 This toolchain doesn't work either. Did you tried with CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" ? With CT_EXTRA_CXXFLAGS_FOR_BUILD maybe or both. Also, building with a Debian jessie docker container would allow to run the toolchain with old Glibc. Best regards, Romain > > Best regards, > Thomas > From patrickdepinguin at gmail.com Tue Jan 18 12:02:49 2022 From: patrickdepinguin at gmail.com (Thomas De Schampheleire) Date: Tue, 18 Jan 2022 13:02:49 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: <13491b39-7995-1aa7-a2cb-5af43467bb95@gmail.com> References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-7-patrickdepinguin@gmail.com> <13491b39-7995-1aa7-a2cb-5af43467bb95@gmail.com> Message-ID: Hi Romain, El mar, 18 ene 2022 a las 12:51, Romain Naour () escribi?: > > Hello Thomas, > > Le 18/01/2022 ? 12:19, Thomas De Schampheleire a ?crit : > > Hi, > > > > El s?b, 15 ene 2022 a las 21:03, Thomas De Schampheleire > > () escribi?: > >> > >> From: Thomas De Schampheleire > >> > >> Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel > >> but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. > >> > >> Signed-off-by: Thomas De Schampheleire > >> --- > >> > >> Note that the defconfig refers to a toolchain at > >> autobuild.buildroot.org, but is not yet present at that location. > >> I uploaded the toolchain temporarily to: > >> http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz > >> md5sum:b085c0d8f137c078f8f09d116d8364f8 > >> sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 > >> > >> > > > > Romain Naour notified me that this toolchain does not run on the GCC > > Farm (Illegal instruction) so I made a new version, currently uploaded > > at: > > http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11-2.tar.xz > > md5sum: 3cee64f82675446ad255f6c165786eb5 > > sha256sum: 6715bfbc195588b6483d39e9ec6d70611cac3b99bf2dd34fedbed0d4e6c7edc1 > > This toolchain doesn't work either. > > Did you tried with CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" ? > With CT_EXTRA_CXXFLAGS_FOR_BUILD maybe or both. So you get the same error of 'Illegal instruction' ? Following config was used (both the config as the build log are part of the archive): CT_CONFIG_VERSION="3" # CT_PREFIX_DIR_RO is not set CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" CT_EXTRA_CXXFLAGS_FOR_BUILD="-march=x86-64" CT_ARCH_X86=y CT_MULTILIB=y CT_ARCH_64=y CT_STATIC_TOOLCHAIN=y CT_TARGET_VENDOR="multilib" CT_KERNEL_LINUX=y CT_GLIBC_KERNEL_VERSION_NONE=y # CT_CREATE_LDSO_CONF is not set CT_CC_GCC_MULTILIB_LIST="m64,m32" CT_CC_GCC_LNK_HASH_STYLE_BOTH=y CT_CC_LANG_CXX=y CT_DEBUG_GDB=y CT_ZLIB_NEEDED=y > > Also, building with a Debian jessie docker container would allow to run the > toolchain with old Glibc. The toolchain is built statically, so the glibc version on the host does not matter. Perhaps I misunderstand the problem you are referring to? Thanks, Thomas From bonet at grenoble.cnrs.fr Tue Jan 18 12:58:47 2022 From: bonet at grenoble.cnrs.fr (Edgar Bonet) Date: Tue, 18 Jan 2022 13:58:47 +0100 Subject: [Buildroot] [PATCH 02/28] configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> Message-ID: Hi! [Replying to list only, hoping it is the right etiquette.] Giulio Benetti wrote: > --- a/configs/acmesystems_acqua_a5_512mb_defconfig > +++ b/configs/acmesystems_acqua_a5_512mb_defconfig > @@ -1,6 +1,7 @@ > BR2_arm=y > BR2_cortex_a5=y > BR2_ARM_ENABLE_VFP=y > +BR2_ARM_FPU_NEON_VFPV4=y > BR2_ARM_INSTRUCTIONS_THUMB2=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > BR2_SYSTEM_DHCP="eth0" I think this may be missing some dependencies, as this change does not survive `save defconfig'. I tried the following from a clean tree: git pull # from master git am ~/tmp/saved-patch.email # the patch above make acmesystems_acqua_a5_512mb_defconfig make nconfig # no changes to configuration Save Exit make savedefconfig git diff And git showed me that the patch had just been reverted on the worktree. According to arch/Config.in.arm, BR2_ARM_FPU_NEON_VFPV4 depends on BR2_ARM_CPU_HAS_NEON, which is not mentioned in my .config. It also appears that BR2_ARM_ENABLE_NEON selects BR2_ARM_CPU_HAS_NEON. Would BR2_ARM_ENABLE_NEON be the canonical way of making BR2_ARM_FPU_NEON_VFPV4 acceptable? I am a bit confused by the VFP selection logic in arch/Config.in.arm, so I am not sure that would be the right approach. As a follow up question, if this issue is fixed, what would be the simplest way of testing the floating point implementation on the board? I was thinking about adding gnuplot, which doesn't have any dependencies, and having it do some computations. I do not know, however, whether this would exercise the NEON SIMD extensions. Best regards, Edgar. From bonet at grenoble.cnrs.fr Tue Jan 18 13:28:35 2022 From: bonet at grenoble.cnrs.fr (Edgar Bonet) Date: Tue, 18 Jan 2022 14:28:35 +0100 Subject: [Buildroot] [PATCH 02/28] configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> Message-ID: Hi again! Giulio Benetti wrote: > As pointed by SAMA5D2 Datasheet [...] So let's enable VFPV4/NEON FPU > strategy instead of the default VFPV4-D16. BTW, the Acqua is a SAMA5D3[1] (SAMA5D31 or SAMA5D36, depending on the version), not a SAMA5D2. The datasheet[2] of the SAMA5D3 states: The Floating-Point Unit (FPU) supports the ARMv7 VFPv4-D16 architecture without Advanced SIMD extensions (NEON). So I guess the patch is not relevant to this board. [1] https://www.acmesystems.it/acqua [2] https://ww1.microchip.com/downloads/en/DeviceDoc/SAMA5D3-Series-Data-sheet-DS60001609b.pdf From giulio.benetti at benettiengineering.com Tue Jan 18 13:35:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 14:35:25 +0100 Subject: [Buildroot] [PATCH 02/28] configs/acmesystems_acqua_a5_512mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-3-giulio.benetti@benettiengineering.com> Message-ID: Hi Edgar, On 18/01/22 14:28, Edgar Bonet wrote: > Hi again! > > Giulio Benetti wrote: >> As pointed by SAMA5D2 Datasheet [...] So let's enable VFPV4/NEON FPU >> strategy instead of the default VFPV4-D16. > > BTW, the Acqua is a SAMA5D3[1] (SAMA5D31 or SAMA5D36, depending on the > version), not a SAMA5D2. The datasheet[2] of the SAMA5D3 states: > > The Floating-Point Unit (FPU) supports the ARMv7 VFPv4-D16 > architecture without Advanced SIMD extensions (NEON). Ah, thank you. I had the SAMA5D3 opened and I couldn't find anymore which board used it. I thought it was this one. Thanks for pointing. > So I guess the patch is not relevant to this board. Exactly. So please drop this patch and I've set it as rejected in Patchwork. I'll go in depth later with patch 01/28. Thank you for the answers! Best regards -- Giulio Benetti Benetti Engineering sas From ps.report at gmx.net Tue Jan 18 16:18:53 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 17:18:53 +0100 Subject: [Buildroot] [PATCH v1] package/strace: bump version to 5.16 Message-ID: <20220118161853.27777-1-ps.report@gmx.net> - update license file hash for COPYING (copyright year update) Changelog (from [1]): Noteworthy changes in strace 5.16 (2022-01-10) ============================================== * Improvements * Implemented --secontext=mismatch option to find mismatches in SELinux contexts. * Implemented decoding of futex_waitv syscall introduced in Linux 5.16. * Implemented decoding of BPF_LINK_GET_NEXT_ID and BPF_LINK_GET_FD_BY_ID bpf syscall commands. * Enhanced decoding of BPF_MAP_CREATE, BPF_PROG_TEST_RUN, and BPF_PROG_LOAD bpf syscall commands. * Enhanced decoding of BTRFS_IOC_FS_INFO ioctl command. * Updated lists of AUDIT_*, BPF_*, BTRFS_*, DEVCONF_*, FAN_*, ETH_P_*, IPV4_DEVCONF_*, KVM_*, NDA_*, SO_*, and V4L2_* constants. * Updated lists of ioctl commands from Linux 5.16. * Bug fixes * Fixed build for older Android. [1] https://strace.io/files/5.16/ Signed-off-by: Peter Seiderer --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index ff89447bfd..30c90e8e39 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.15/strace-5.15.tar.xz.asc -sha256 ebcac22f297335294dc654425cbc3ce013343bece6da2699e3aec86aee8d72dc strace-5.15.tar.xz -sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING +# https://strace.io/files/5.16/strace-5.16.tar.xz.asc +sha256 dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285 strace-5.16.tar.xz +sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 4b70531aa7..c8c3590f6e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.15 +STRACE_VERSION = 5.16 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ -- 2.34.1 From ps.report at gmx.net Tue Jan 18 16:24:13 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 17:24:13 +0100 Subject: [Buildroot] [PATCH v1] package/rtl8812au-aircrack-ng: bump version to 3a6402e Message-ID: <20220118162413.24664-1-ps.report@gmx.net> Changelog: 47a38b7 Fix kernel 5.15 compilation 6fd304f fix libc6_2.34 dependency on build 307d694 Merge pull request #898 from CGarces/fix_5.15 191f5bc Remove REMAKE_INITRD bd8e44b Add back 8814au support 849206d Merge pull request #913 from iyanmv/iyanmv-remove-remake-initrd 7bb5114 Fix kernel v5.15+ compiler warnings 1b63ee6 Fixed compiler warning for unused function a72835d Fix (test) for IPX header on various distros 3a6402e Fix for kernel v3.20 Signed-off-by: Peter Seiderer --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index 5503b4f22e..ed1921d1c2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c5d8286a00273343fc10d0e16afc52e788ac73b7df57c8159e58a40707f61da rtl8812au-aircrack-ng-b8167e66b4ac046b3b76c2c40008d84528e91594.tar.gz +sha256 acae758c3834196c71f4ee58f53a3c1b29ffd984f63ff2f40f2b080c8785c49f rtl8812au-aircrack-ng-3a6402e9e79802891f1531b435be54f4d8b71f0b.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index d42d953496..2bbca88cfb 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = b8167e66b4ac046b3b76c2c40008d84528e91594 +RTL8812AU_AIRCRACK_NG_VERSION = 3a6402e9e79802891f1531b435be54f4d8b71f0b RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Jan 18 17:33:10 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 18:33:10 +0100 Subject: [Buildroot] [PATCH 01/28] configs/acmesystems_acqua_a5_256mb_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-2-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-2-giulio.benetti@benettiengineering.com> Message-ID: <4ac1fff6-a7ff-063e-82f7-7b1d198ef0a6@benettiengineering.com> Hi All, On 18/01/22 11:43, Giulio Benetti wrote: > As pointed by SAMA5D2 Datasheet[1]: As pointed by Edgar on Patch 02/28 Acqua A5 doesn't have a SAMA5D2 but a SAMA5D3 that doesn't have VFPV4+NEON, but a VFPv4-D16 and NEON, so this can't work. I've marked it as Rejected in Patchwork as patch 01/28 and please drop it. Thank you and sorry for the noise. Best regards -- Giulio Benetti Benetti Engineering sas > ``` > The Cortex-A5 NEON Media Processing Engine (MPE) extends the Cortex-A5 > functionality to provide support for the ARM v7 Advanced SIMD v2 and > Vector Floating-Point v4 (VFPv4) instruction sets. > ``` > > So let's enable VFPV4/NEON FPU strategy instead of the default VFPV4-D16. > > [1]: https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA5D2-Series-Data-sheet-ds60001476G.pdf > > Signed-off-by: Giulio Benetti > --- > configs/acmesystems_acqua_a5_256mb_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig > index f8129f3780..991de4c1be 100644 > --- a/configs/acmesystems_acqua_a5_256mb_defconfig > +++ b/configs/acmesystems_acqua_a5_256mb_defconfig > @@ -1,5 +1,6 @@ > BR2_arm=y > BR2_cortex_a5=y > +BR2_ARM_FPU_NEON_VFPV4=y > BR2_ARM_ENABLE_VFP=y > BR2_ARM_INSTRUCTIONS_THUMB2=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > From kuzminov.sergey81 at gmail.com Tue Jan 18 17:45:55 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Tue, 18 Jan 2022 20:45:55 +0300 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> Message-ID: <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> Hi All, Giulio. I checked the patch, everything works. 18.01.2022 09:35, Giulio Benetti ?????: > As explained in the local patch itself of_get_mac_address() has changed, so > we need to check against Linux version and use it slightly differently. > > Patch is pending upstream: > https://github.com/fifteenhex/xradio/pull/15 > I've realized only later there was already an opened PR for this, anyway > IMHO I think my patch is written a little better, so please accept it. > And most of all Sergey already tested it and it works: > https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * update local patch to build correctly also with Linux >= 5.12.1 < 5.13.0 > --- > ...fix-building-with-Linux-version-5.13.patch | 68 +++++++++++++++++++ > 1 file changed, 68 insertions(+) > create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch > > diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch > new file mode 100644 > index 0000000000..3b9742012e > --- /dev/null > +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch > @@ -0,0 +1,68 @@ > +From 4873746fa9d42a8edbc1e192899e00c29ed3d32a Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti > +Date: Mon, 17 Jan 2022 12:26:00 +0100 > +Subject: [PATCH] main.c: fix building with Linux version >= 5.13 > + > +of_get_mac_address() on Linux version >= 5.13 requires mac pointer as > +second argument and return an int. So let's deal with it by checking linux > +version to make it compatible with both Linux version >= 5.13 and not. > + > +Signed-off-by: Giulio Benetti > +--- > + main.c | 17 +++++++++++++++++ > + 1 file changed, 17 insertions(+) > + > +diff --git a/main.c b/main.c > +index b60e18d..06cb1f6 100644 > +--- a/main.c > ++++ b/main.c > +@@ -13,6 +13,7 @@ > + #include > + #include > + #include > ++#include > + > + #include "xradio.h" > + #include "fwio.h" > +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) > + int if_id; > + struct ieee80211_hw *dev; > + struct xradio_common *hw_priv; > ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) > ++ unsigned char addr[ETH_ALEN]; > ++#else > + unsigned char randomaddr[ETH_ALEN]; > + const unsigned char *addr = NULL; > ++#endif > + > + //init xradio_common > + dev = xradio_init_common(sizeof(struct xradio_common)); > +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) > + hw_priv->sdio_func = func; > + sdio_set_drvdata(func, hw_priv); > + > ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) > ++ // fill in mac addresses > ++ if (hw_priv->pdev->of_node) { > ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); > ++ } > ++ if (err < 0) { > ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); > ++ eth_random_addr(addr); > ++ } > ++#else > + // fill in mac addresses > + if (hw_priv->pdev->of_node) { > + addr = of_get_mac_address(hw_priv->pdev->of_node); > +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) > + eth_random_addr(randomaddr); > + addr = randomaddr; > + } > ++#endif > ++ > + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); > + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); > + hw_priv->addresses[1].addr[5] += 0x01; > +-- > +2.25.1 > + From giulio.benetti at benettiengineering.com Tue Jan 18 17:53:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 18:53:46 +0100 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> Message-ID: Hi Sergey, On 18/01/22 18:45, Sergey Kuzminov wrote: > Hi All, Giulio. > I checked the patch, everything works. Can you please place your: Tested-by: Name Surname ? -- Giulio Benetti Benetti Engineering sas > 18.01.2022 09:35, Giulio Benetti ?????: >> As explained in the local patch itself of_get_mac_address() has changed, so >> we need to check against Linux version and use it slightly differently. >> >> Patch is pending upstream: >> https://github.com/fifteenhex/xradio/pull/15 >> I've realized only later there was already an opened PR for this, anyway >> IMHO I think my patch is written a little better, so please accept it. >> And most of all Sergey already tested it and it works: >> https://lists.buildroot.org/pipermail/buildroot/2022-January/634084.html >> >> Signed-off-by: Giulio Benetti >> --- >> V1->V2: >> * update local patch to build correctly also with Linux >= 5.12.1 < 5.13.0 >> --- >> ...fix-building-with-Linux-version-5.13.patch | 68 +++++++++++++++++++ >> 1 file changed, 68 insertions(+) >> create mode 100644 package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch >> >> diff --git a/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch >> new file mode 100644 >> index 0000000000..3b9742012e >> --- /dev/null >> +++ b/package/xr819-xradio/0001-main.c-fix-building-with-Linux-version-5.13.patch >> @@ -0,0 +1,68 @@ >> +From 4873746fa9d42a8edbc1e192899e00c29ed3d32a Mon Sep 17 00:00:00 2001 >> +From: Giulio Benetti >> +Date: Mon, 17 Jan 2022 12:26:00 +0100 >> +Subject: [PATCH] main.c: fix building with Linux version >= 5.13 >> + >> +of_get_mac_address() on Linux version >= 5.13 requires mac pointer as >> +second argument and return an int. So let's deal with it by checking linux >> +version to make it compatible with both Linux version >= 5.13 and not. >> + >> +Signed-off-by: Giulio Benetti >> +--- >> + main.c | 17 +++++++++++++++++ >> + 1 file changed, 17 insertions(+) >> + >> +diff --git a/main.c b/main.c >> +index b60e18d..06cb1f6 100644 >> +--- a/main.c >> ++++ b/main.c >> +@@ -13,6 +13,7 @@ >> + #include >> + #include >> + #include >> ++#include >> + >> + #include "xradio.h" >> + #include "fwio.h" >> +@@ -499,8 +500,12 @@ int xradio_core_init(struct sdio_func* func) >> + int if_id; >> + struct ieee80211_hw *dev; >> + struct xradio_common *hw_priv; >> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) >> ++ unsigned char addr[ETH_ALEN]; >> ++#else >> + unsigned char randomaddr[ETH_ALEN]; >> + const unsigned char *addr = NULL; >> ++#endif >> + >> + //init xradio_common >> + dev = xradio_init_common(sizeof(struct xradio_common)); >> +@@ -513,6 +518,16 @@ int xradio_core_init(struct sdio_func* func) >> + hw_priv->sdio_func = func; >> + sdio_set_drvdata(func, hw_priv); >> + >> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) >> ++ // fill in mac addresses >> ++ if (hw_priv->pdev->of_node) { >> ++ err = of_get_mac_address(hw_priv->pdev->of_node, addr); >> ++ } >> ++ if (err < 0) { >> ++ dev_warn(hw_priv->pdev, "no mac address provided, using random\n"); >> ++ eth_random_addr(addr); >> ++ } >> ++#else >> + // fill in mac addresses >> + if (hw_priv->pdev->of_node) { >> + addr = of_get_mac_address(hw_priv->pdev->of_node); >> +@@ -522,6 +537,8 @@ int xradio_core_init(struct sdio_func* func) >> + eth_random_addr(randomaddr); >> + addr = randomaddr; >> + } >> ++#endif >> ++ >> + memcpy(hw_priv->addresses[0].addr, addr, ETH_ALEN); >> + memcpy(hw_priv->addresses[1].addr, addr, ETH_ALEN); >> + hw_priv->addresses[1].addr[5] += 0x01; >> +-- >> +2.25.1 >> + > > From kuzminov.sergey81 at gmail.com Tue Jan 18 18:10:14 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Tue, 18 Jan 2022 21:10:14 +0300 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> Message-ID: <48d2b6c8-356d-419a-c284-e2184509d1c5@gmail.com> Tested-by: Sergey Kuzminov 18.01.2022 20:53, Giulio Benetti ?????: > Hi Sergey, > > On 18/01/22 18:45, Sergey Kuzminov wrote: >> Hi All, Giulio. >> I checked the patch, everything works. > > Can you please place your: > Tested-by: Name Surname > ? > From heiko.thiery at gmail.com Tue Jan 18 19:57:36 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Tue, 18 Jan 2022 20:57:36 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220114211525.2697606-1-heiko.thiery@gmail.com> <752cc85f-d3d6-950b-cb5c-fb39e5020bc3@benettiengineering.com> <20220118000448.32ea764d@windsurf> Message-ID: Hi Giulio, Hi Thomas, Am Di., 18. Jan. 2022 um 07:58 Uhr schrieb Giulio Benetti : > > Hi Thomas, > > On 18/01/22 00:04, Thomas Petazzoni wrote: > > On Mon, 17 Jan 2022 20:58:52 +0100 > > Giulio Benetti wrote: > > > >>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > >>> new file mode 100644 > >>> index 0000000000..5b5648cc14 > >>> --- /dev/null > >>> +++ b/configs/kontron_bl_imx8mm_defconfig > >>> @@ -0,0 +1,59 @@ > >>> +# Architecture > >>> +BR2_aarch64=y > >>> +BR2_ARM_FPU_VFPV3=y > >> > >> i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: > >> BR2_ARM_FPU_VFPV4D16 > >> > >> This is to achieve the maximum performance. > > > > Nope, that's not really how it works. VFPv3 is better than VFPv3-D16. > > Indeed VFPv3 means that the the FPU has 32 double precision registers, > > while VFPv3-D16 means that it has "only" 16 double precision registers. > > I'm a bit confused. The datasheet[1] states at 1.4.1: > ``` > ? Media Processing Engine (MPE) with NEON technology supporting the > Advanced Single Instruction Multiple Data architecture > ? Floating Point Unit (FPU) with support of the VFPv4-D16 architecture > ``` > [1]: https://www.nxp.com/docs/en/data-sheet/IMX8MMCEC.pdf > > So I expect it to only have VFPv4-D16. And also NEON, but we can't mix > them up in Aarch64 as I know. > > > So, if the i.MX8MM has only the VFPv3-D16, then indeed it should be > > chosen, because code compiled with VFPv3 may not work, as it might use > > too many double precision registers. > > > > On the other hand, if the i.MX8MM has the full VFPv3, then > > BR2_ARM_FPU_VFPV3=y should be used. > > It only has VFPv4-D16. I think I've explained myself bad. This is not to > achieve maximum performance, simply datasheet states it only supports > VFPv4-D16[1] and judging from this: > https://developer.arm.com/documentation/dui0472/h/CJADDCIF#:~:text=VFPv3%20has%2032%20double%2Dprecision,VFPv3%20with%20half%2Dprecision%20extensions.&text=VFPv4%20has%2032%20double%2Dprecision,to%20the%20features%20of%20VFPv3. > > VFPv4 is retro-compatible with VFPv3, and I'd expect VFP4v4-D16 to be > like that too. Is it possible that at the moment, by mistake, it worked > without using more than 16 registers as VFPv3 that is retro-compatible > with VFPv4-D16(maybe?). > > > That being said, the gcc man page only documents vfpv3, vfpv3-d16-fp16, > > vfpv3-fp16 as extension for armv7-a. Interesting, would need to look > > into this. > > Yes, but i.MX8MM is a cortex-A53, so armv8-a: > https://developer.arm.com/ip-products/processors/cortex-a/cortex-a53 > > that then is retro-compatible to armv7-a if in Aarch32. > But here we use it as BR2_aarch64, so armv8-a: > https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html > > and it lists: > ``` > -mfpu=name > This specifies what floating-point hardware (or hardware emulation) is > available on the target. Permissible names are: ?auto?, ?vfpv2?, > ?vfpv3?, ?vfpv3-fp16?, ?vfpv3-d16?, ?vfpv3-d16-fp16?, ?vfpv3xd?, > ?vfpv3xd-fp16?, ?neon-vfpv3?, ?neon-fp16?, ?vfpv4?, ?vfpv4-d16?, > ?fpv4-sp-d16?, ?neon-vfpv4?, ?fpv5-d16?, ?fpv5-sp-d16?, ?fp-armv8?, > ?neon-fp-armv8? and ?crypto-neon-fp-armv8?. Note that ?neon? is an alias > for ?neon-vfpv3? and ?vfp? is an alias for ?vfpv2?. > ``` > > So "vfpv4-d16" is possible. > > Here I think we need vfpv4-d16 and not vfpv3 because of both DS and RM > of i.MX8MM. > > Does it sound good to you? After following the discussion in IRC between Yann and Michael I am sure that this setting cannot be used for the aarch64/cortex-A53 CPU. The settings BR2_ARM_CPU_HAS_FPU, BR2_ARM_CPU_HAS_VFPV2, BR2_ARM_CPU_HAS_VFPV3, BR2_ARM_CPU_HAS_VFPV4 and BR2_ARM_CPU_HAS_FP_ARMV8 are set implicitly. I probably took the setting from the freescale_imx8mmevk_defconfig, which is then also not correct. I then looked further at the other aarch64 defconfigs and saw that there are more that set the FPU settings. # grep aarch64 -A50 configs/* | grep FPU | wc -l 28 I will remove this setting from the defconfig in this patch and also for the other kontron defconfig. -- Heiko From ps.report at gmx.net Tue Jan 18 20:17:09 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 21:17:09 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/enlightenment: change download URL to https In-Reply-To: <20220118201709.25366-1-ps.report@gmx.net> References: <20220118201709.25366-1-ps.report@gmx.net> Message-ID: <20220118201709.25366-2-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/enlightenment/enlightenment.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 640d5a62bb..24bbd96cd0 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -6,7 +6,7 @@ ENLIGHTENMENT_VERSION = 0.25.0 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt -- 2.34.1 From ps.report at gmx.net Tue Jan 18 20:17:08 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 21:17:08 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/efl: change download URL to https Message-ID: <20220118201709.25366-1-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/efl/efl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 46bce29305..ed0a8acc1d 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -6,7 +6,7 @@ EFL_VERSION = 1.26.0 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl +EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Jan 18 20:40:09 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 21:40:09 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: Message-ID: <966BF669-674E-4A71-82E3-FF7A2B520659@benettiengineering.com> Hi Heiko, Thomas, > Il giorno 18 gen 2022, alle ore 20:58, Heiko Thiery ha scritto: > > ?Hi Giulio, Hi Thomas, > > >> Am Di., 18. Jan. 2022 um 07:58 Uhr schrieb Giulio Benetti >> : >> >> Hi Thomas, >> >>> On 18/01/22 00:04, Thomas Petazzoni wrote: >>> On Mon, 17 Jan 2022 20:58:52 +0100 >>> Giulio Benetti wrote: >>> >>>>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig >>>>> new file mode 100644 >>>>> index 0000000000..5b5648cc14 >>>>> --- /dev/null >>>>> +++ b/configs/kontron_bl_imx8mm_defconfig >>>>> @@ -0,0 +1,59 @@ >>>>> +# Architecture >>>>> +BR2_aarch64=y >>>>> +BR2_ARM_FPU_VFPV3=y >>>> >>>> i.MX8MM supports VFPv4-D16, so I would substitute this ^^^ with: >>>> BR2_ARM_FPU_VFPV4D16 >>>> >>>> This is to achieve the maximum performance. >>> >>> Nope, that's not really how it works. VFPv3 is better than VFPv3-D16. >>> Indeed VFPv3 means that the the FPU has 32 double precision registers, >>> while VFPv3-D16 means that it has "only" 16 double precision registers. >> >> I'm a bit confused. The datasheet[1] states at 1.4.1: >> ``` >> ? Media Processing Engine (MPE) with NEON technology supporting the >> Advanced Single Instruction Multiple Data architecture >> ? Floating Point Unit (FPU) with support of the VFPv4-D16 architecture >> ``` >> [1]: https://www.nxp.com/docs/en/data-sheet/IMX8MMCEC.pdf >> >> So I expect it to only have VFPv4-D16. And also NEON, but we can't mix >> them up in Aarch64 as I know. >> >>> So, if the i.MX8MM has only the VFPv3-D16, then indeed it should be >>> chosen, because code compiled with VFPv3 may not work, as it might use >>> too many double precision registers. >>> >>> On the other hand, if the i.MX8MM has the full VFPv3, then >>> BR2_ARM_FPU_VFPV3=y should be used. >> >> It only has VFPv4-D16. I think I've explained myself bad. This is not to >> achieve maximum performance, simply datasheet states it only supports >> VFPv4-D16[1] and judging from this: >> https://developer.arm.com/documentation/dui0472/h/CJADDCIF#:~:text=VFPv3%20has%2032%20double%2Dprecision,VFPv3%20with%20half%2Dprecision%20extensions.&text=VFPv4%20has%2032%20double%2Dprecision,to%20the%20features%20of%20VFPv3. >> >> VFPv4 is retro-compatible with VFPv3, and I'd expect VFP4v4-D16 to be >> like that too. Is it possible that at the moment, by mistake, it worked >> without using more than 16 registers as VFPv3 that is retro-compatible >> with VFPv4-D16(maybe?). >> >>> That being said, the gcc man page only documents vfpv3, vfpv3-d16-fp16, >>> vfpv3-fp16 as extension for armv7-a. Interesting, would need to look >>> into this. >> >> Yes, but i.MX8MM is a cortex-A53, so armv8-a: >> https://developer.arm.com/ip-products/processors/cortex-a/cortex-a53 >> >> that then is retro-compatible to armv7-a if in Aarch32. >> But here we use it as BR2_aarch64, so armv8-a: >> https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html >> >> and it lists: >> ``` >> -mfpu=name >> This specifies what floating-point hardware (or hardware emulation) is >> available on the target. Permissible names are: ?auto?, ?vfpv2?, >> ?vfpv3?, ?vfpv3-fp16?, ?vfpv3-d16?, ?vfpv3-d16-fp16?, ?vfpv3xd?, >> ?vfpv3xd-fp16?, ?neon-vfpv3?, ?neon-fp16?, ?vfpv4?, ?vfpv4-d16?, >> ?fpv4-sp-d16?, ?neon-vfpv4?, ?fpv5-d16?, ?fpv5-sp-d16?, ?fp-armv8?, >> ?neon-fp-armv8? and ?crypto-neon-fp-armv8?. Note that ?neon? is an alias >> for ?neon-vfpv3? and ?vfp? is an alias for ?vfpv2?. >> ``` >> >> So "vfpv4-d16" is possible. >> >> Here I think we need vfpv4-d16 and not vfpv3 because of both DS and RM >> of i.MX8MM. >> >> Does it sound good to you? > > After following the discussion in IRC between Yann and Michael I am > sure that this setting cannot be used for the aarch64/cortex-A53 CPU. > The settings BR2_ARM_CPU_HAS_FPU, BR2_ARM_CPU_HAS_VFPV2, > BR2_ARM_CPU_HAS_VFPV3, BR2_ARM_CPU_HAS_VFPV4 and > BR2_ARM_CPU_HAS_FP_ARMV8 are set implicitly. Yes, I was wrong and you point that fpu strategy falls back to BR2_ARM_FPU_FP_ARMV8 and it?s ok. But i.MX8MM supports NEON too, so I would go for setting BR2_ARM_FPU_NEON_FP_ARMV8, because as pointed here[1] the armv8 neon now supports IEEE 754 floating point standard. BUT I?ve found that gcc[2] points that: ??? If the selected floating-point hardware includes the NEON extension (e.g. -mfpu=neon), note that floating-point operations are not generated by GCC?s auto-vectorization pass unless -funsafe-math-optimizations is also specified. This is because NEON hardware does not fully implement the IEEE 754 standard for floating-point arithmetic (in particular denormal values are treated as zero), so the use of NEON instructions may lead to a loss of precision. ??? So I still can?t understand if it?s something core related or something gcc related. Does anyone have any more in-depth explanation? Anyway I agree with Heiko to remove the fpu strategy in this defconfig. Best regards ?- Giulio Benetti Benetti Engineering sas [1]: https://developer.arm.com/architectures/instruction-sets/floating-point [2]: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html > > I probably took the setting from the freescale_imx8mmevk_defconfig, > which is then also not correct. > > I then looked further at the other aarch64 defconfigs and saw that > there are more that set the FPU settings. > > # grep aarch64 -A50 configs/* | grep FPU | wc -l > 28 > > I will remove this setting from the defconfig in this patch and also > for the other kontron defconfig. > > -- > Heiko -------------- next part -------------- An HTML attachment was scrubbed... URL: From ps.report at gmx.net Tue Jan 18 21:14:29 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:29 +0100 Subject: [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Message-ID: <20220118211434.9854-1-ps.report@gmx.net> Now based on 5.10.92 (from 5.10.78). Signed-off-by: Peter Seiderer --- configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- configs/raspberrypicm4io_64_defconfig | 2 +- configs/raspberrypicm4io_defconfig | 2 +- configs/raspberrypizero2w_defconfig | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 64f7a93377..4506e94bce 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index f3e7c453ab..7a35794c2d 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 7befbf07e6..9b484c5588 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index ebb6e2252b..4d838ae0e8 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 6a9c4e0d02..0a59ab42a9 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 7d06b0bb5e..40d0c0f888 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 2b5446d8f1..5942f7c4e1 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index ac555ddd5e..4e5580c140 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 257e59536e..cca53f9b37 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 1ab379c557..29cb0472d7 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 9941754e25..017aecc0dd 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index ddd6b97b06..2ea503ca24 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:31 +0100 Subject: [Buildroot] [PATCH v1 3/6] package/rpi-userland: bump version to 14b90ff In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-3-ps.report@gmx.net> Changelog: f5404b2 raspicam: Check system is running legacy camera stack 14b90ff mmal: Hack to make mmal core register VideoCore components Signed-off-by: Peter Seiderer --- package/rpi-userland/rpi-userland.hash | 2 +- package/rpi-userland/rpi-userland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 8ea184a4f6..b837cfe709 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 16c01befff64ebc11a0554e487b00939ed7a716f68dc795db4880b35bb25fa41 rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz +sha256 bb682f3c20bc5c7877531d5666c8dcc674a2f347aa792cf979dc0b07b6261e77 rpi-userland-14b90ff9d9f031391a299e6e006965d02bfd1bb1.tar.gz sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 09a7f6af74..84050b6df3 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = bab9bf8790cd69660d443ce43b4e372999f3f7ac +RPI_USERLAND_VERSION = 14b90ff9d9f031391a299e6e006965d02bfd1bb1 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:32 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:32 +0100 Subject: [Buildroot] [PATCH v1 4/6] package/rpi-bt-firmware: bump version to ea9963f In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-4-ps.report@gmx.net> Chanelog (since 3888ba2): - Sync with RPi-Distro repo Switch to "bullseye" branch which moved several firmware files to the cypress dir. Add 43438 firmware 7.45.98.118 + external clm_blob Add 43455 firmware 7.45.241 and clm_blob - README.md: update link to RPi-distro repo wifi firmware files - Merge pull request #19 from HiassofT/2021-12 Signed-off-by: Peter Seiderer --- package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash index 7e60aa4632..a575a02e97 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-bt-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 8d658ce435..f2d54f33bf 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef +RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:33 +0100 Subject: [Buildroot] [PATCH v1 5/6] package/rpi-wifi-firmware bump version to ea9963f In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-5-ps.report@gmx.net> - add cypress files - update links Chanelog (since 3888ba2): - Sync with RPi-Distro repo Switch to "bullseye" branch which moved several firmware files to the cypress dir. Add 43438 firmware 7.45.98.118 + external clm_blob Add 43455 firmware 7.45.241 and clm_blob Signed-off-by: Peter Seiderer --- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index 09cd197dd8..7ff47b8cfe 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-wifi-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index a467f2c7b4..b54cd359a4 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef +RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx @@ -12,9 +12,17 @@ RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin + ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob + ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt + ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt + ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin + ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress endef $(eval $(generic-package)) -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:34 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:34 +0100 Subject: [Buildroot] [PATCH v1 6/6] package/brcmfmac_sdio-firmware-rpi: new package (former rpi-bt-firmware/rpi-wifi-firmware) In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-6-ps.report@gmx.net> Move rpi-bt-firmware and rpi-wifi-firmware packages to the new brcmfmac_sdio-firmware-rpi one (as they share the same donwload). Signed-off-by: Peter Seiderer --- Notes: - patch moved after the rpi-bt-firmware/rpi-wifi-firmware version bump as it saves some code/download duplication but the new package/name is harder to find/remember... --- Config.in.legacy | 18 ++++++++++++ DEVELOPERS | 3 +- package/Config.in | 3 +- package/brcmfmac_sdio-firmware-rpi/Config.in | 29 +++++++++++++++++++ .../brcmfmac_sdio-firmware-rpi.hash} | 2 +- .../brcmfmac_sdio-firmware-rpi.mk} | 27 +++++++++++++---- package/rpi-bt-firmware/Config.in | 9 ------ package/rpi-bt-firmware/rpi-bt-firmware.hash | 3 -- package/rpi-bt-firmware/rpi-bt-firmware.mk | 17 ----------- package/rpi-wifi-firmware/Config.in | 13 --------- 10 files changed, 71 insertions(+), 53 deletions(-) create mode 100644 package/brcmfmac_sdio-firmware-rpi/Config.in rename package/{rpi-wifi-firmware/rpi-wifi-firmware.hash => brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash} (68%) rename package/{rpi-wifi-firmware/rpi-wifi-firmware.mk => brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk} (61%) delete mode 100644 package/rpi-bt-firmware/Config.in delete mode 100644 package/rpi-bt-firmware/rpi-bt-firmware.hash delete mode 100644 package/rpi-bt-firmware/rpi-bt-firmware.mk delete mode 100644 package/rpi-wifi-firmware/Config.in diff --git a/Config.in.legacy b/Config.in.legacy index dd64b7da1b..465d7bef90 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,24 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_RPI_BT_FIRMWARE + bool "rpi-bt-firmware package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT + help + Package rpi-bt-firmware was moved as option to + package brcmfmac-sdio-firmware-rpi. + +config BR2_PACKAGE_RPI_WIFI_FIRMWARE + bool "rpi-wifi-firmware package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI + help + Package rpi-wifi-firmware was moved as option to + package brcmfmac-sdio-firmware-rpi. + config BR2_PACKAGE_HOST_GDB_PYTHON bool "GDB Python2 support removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..dc810b6fe1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1832,12 +1832,11 @@ F: configs/qemu_riscv64_virt_defconfig N: Martin Bark F: board/raspberrypi/ F: configs/raspberrypi3_defconfig +F: package/brcmfmac_sdio-firmware-rpi/ F: package/ca-certificates/ F: package/connman/ F: package/nodejs/ -F: package/rpi-bt-firmware/ F: package/rpi-firmware/ -F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ diff --git a/package/Config.in b/package/Config.in index 4df1474b91..3b38af7232 100644 --- a/package/Config.in +++ b/package/Config.in @@ -419,15 +419,14 @@ menu "Hardware handling" menu "Firmware" source "package/am33x-cm3/Config.in" source "package/armbian-firmware/Config.in" + source "package/brcmfmac_sdio-firmware-rpi/Config.in" source "package/b43-firmware/Config.in" source "package/linux-firmware/Config.in" source "package/murata-cyw-fw/Config.in" source "package/odroidc2-firmware/Config.in" source "package/qcom-db410c-firmware/Config.in" source "package/rcw-smarc-sal28/Config.in" - source "package/rpi-bt-firmware/Config.in" source "package/rpi-firmware/Config.in" - source "package/rpi-wifi-firmware/Config.in" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" diff --git a/package/brcmfmac_sdio-firmware-rpi/Config.in b/package/brcmfmac_sdio-firmware-rpi/Config.in new file mode 100644 index 0000000000..73f400a2b7 --- /dev/null +++ b/package/brcmfmac_sdio-firmware-rpi/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + bool "brcmfmac-sdio-firmware-rpi" + depends on BR2_arm || BR2_aarch64 + help + Raspberry Broadcom Bluetooth and Wifi firmware. + + https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi + +if BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT + bool "brcmfmac-sdio-firmware-rpi-bt" + help + Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module + firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 + Bluetooth module firmware. + +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI + bool "brcmfmac-sdio-firmware-rpi-wifi" + depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX + help + Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module + NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 + wifi module NVRAM data. + +comment "brcmfmac-sdio-firmware-rpi-wifi conflicts with linux-firmware Broadcom BRCM bcm43xx" + depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX + +endif diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash similarity index 68% rename from package/rpi-wifi-firmware/rpi-wifi-firmware.hash rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index 7ff47b8cfe..a12e92cbac 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk similarity index 61% rename from package/rpi-wifi-firmware/rpi-wifi-firmware.mk rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index b54cd359a4..4d1f285442 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -1,15 +1,24 @@ ################################################################################ # -# rpi-wifi-firmware +# brcmfmac_sdio-firmware-rpi # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) -RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY -RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx -define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS + +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm +endef +endif + +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin @@ -24,5 +33,11 @@ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress endef +endif + +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT) + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI) +endef $(eval $(generic-package)) diff --git a/package/rpi-bt-firmware/Config.in b/package/rpi-bt-firmware/Config.in deleted file mode 100644 index 45643d6a52..0000000000 --- a/package/rpi-bt-firmware/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_RPI_BT_FIRMWARE - bool "rpi-bt-firmware" - depends on BR2_arm || BR2_aarch64 - help - Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module - firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 - Bluetooth module firmware. - - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash deleted file mode 100644 index a575a02e97..0000000000 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk deleted file mode 100644 index f2d54f33bf..0000000000 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# rpi-bt-firmware -# -################################################################################ - -RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d -RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) -RPI_BT_FIRMWARE_LICENSE = PROPRIETARY -RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx - -define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm -endef - -$(eval $(generic-package)) diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in deleted file mode 100644 index 7e81b286c0..0000000000 --- a/package/rpi-wifi-firmware/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_RPI_WIFI_FIRMWARE - bool "rpi-wifi-firmware" - depends on BR2_arm || BR2_aarch64 - depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX - help - Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module - NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 - wifi module NVRAM data. - - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi - -comment "rpi-wifi-firmware conflicts with linux-firmware Broadcom BRCM bcm43xx" - depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX -- 2.34.1 From ps.report at gmx.net Tue Jan 18 21:14:30 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 18 Jan 2022 22:14:30 +0100 Subject: [Buildroot] [PATCH v1 2/6] package/rpi-firmware: bump version to 3f20b83 In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220118211434.9854-2-ps.report@gmx.net> Changelog: 095deea759 kernel: overlays: vc4-kms-v3d: Change composite handling 2e9b609e53c kernel: Bump to 5.10.79 12bc6e36773 firmware: dtoverlay: Rebase aliases in overlays like labels 24d966d35bb kernel: Bump to 5.10.81 ca52e7c1303 kernel: edt-ft5x06 touchscreen fixes 1a0297bfbf7 kernel: Bump to 5.10.82 0a1a871d04c kernel: Fix for IN Token of USB Endpoint 1 stopping occasionally on Pi 4 303d0012cd7 kernel: Bump to 5.10.83 bd8b6d5dc8e kernel: Bump to 5.10.85 56f1b8bbc88 kernel: Bump to 5.10.87 536baf33ae9 kernel: Bump to 5.10.88 ce71e3e9b34 kernel: Bump to 5.10.89 19b570d0d6a firmware: arm-loader: Fix kernel8.img selection on 2837 with arm_64bit=1 fbbde90b709 kernel: drm/vc4: fix non-working audio on RPi3 and no video with DVI 165bd7bc562 firmware: improve firmware camera detection 318e3373496 kernel: Bump to 5.10.90 175984a6dc4 kernel: drm/vc4: Add alpha_blend_mode property to each plane 20c5829b0af kernel: Bump to 5.10.92 3f20b832b27 firmware: arm_loader: Only clip min/max to the same value for turbo clocks Signed-off-by: Peter Seiderer --- 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 7cbfd1b249..ec13115f3b 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a079a31fc80a23421589edcacef94faa713b12d3e77b92710ae2594c8d549477 rpi-firmware-fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25.tar.gz +sha256 33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index f773f83999..b46a7f5270 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25 +RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -- 2.34.1 From kuzminov.sergey81 at gmail.com Tue Jan 18 21:58:03 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Wed, 19 Jan 2022 00:58:03 +0300 Subject: [Buildroot] [PATCH v2] board/orangepi/orangepi-zero:extlinux, refactoring Message-ID: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> Changes: - common scenarios for multiple boards to create the SD image: board/orangepi/common; - extlinux.conf instead of boot.scr; - exclude FAT partition; - defconfig refactoring; - kernel: bump to version 5.16.1; - u-boot: bump to version 2022.01; - added BR2_ARM_FPU_NEON_VFPV4; - added fast_commit for ext4. Patch required to work: https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 5 ++ board/orangepi/common/genimage.cfg | 20 +++++++ board/orangepi/common/post-build.sh | 34 +++++++++++ board/orangepi/common/uboot-extras.config | 3 + board/orangepi/orangepi-zero/boot.cmd | 9 --- board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ configs/orangepi_zero_defconfig | 69 ++++++++++++++--------- 7 files changed, 104 insertions(+), 72 deletions(-) create mode 100644 board/orangepi/common/extlinux.conf create mode 100644 board/orangepi/common/genimage.cfg create mode 100755 board/orangepi/common/post-build.sh create mode 100644 board/orangepi/common/uboot-extras.config delete mode 100644 board/orangepi/orangepi-zero/boot.cmd delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..015f29270e --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,5 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait console=${console} +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg new file mode 100644 index 0000000000..8b80ffb138 --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + hdimage { + partition-table-type = gpt + gpt-no-backup = true + gpt-location = 1008K # 1MB - 16KB + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB - 16KB + } + + partition rootfs { + offset = 1M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh new file mode 100755 index 0000000000..296f94b174 --- /dev/null +++ b/board/orangepi/common/post-build.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "uImage" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + echo "Image" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + echo "Image.gz" + else + echo "zImage" + fi +} + +generic_getty() +{ + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then + echo "" + else + echo "s/\s*console=\S*//" + fi +} + +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" + +sed -e "$(generic_getty)" \ + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ + -e "s/%PARTUUID%/$PARTUUID/g" \ + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" + +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config new file mode 100644 index 0000000000..5aa97523d9 --- /dev/null +++ b/board/orangepi/common/uboot-extras.config @@ -0,0 +1,3 @@ +CONFIG_BOOTDELAY=0 +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv preboot;" diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd deleted file mode 100644 index d094a64fe5..0000000000 --- a/board/orangepi/orangepi-zero/boot.cmd +++ /dev/null @@ -1,9 +0,0 @@ -setenv fdt_high ffffffff - -part uuid mmc 0:2 uuid -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg deleted file mode 100644 index 32f5454ae6..0000000000 --- a/board/orangepi/orangepi-zero/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Zero -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h2-plus-orangepi-zero.dtb", - "boot.scr" - } - } - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..d1cae2b4f3 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,49 +1,64 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_NEON_VFPV4=y +#BR2_ARM_INSTRUCTIONS_THUMB2=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y +BR2_TARGET_ROOTFS_TAR=n + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_GENIMAGE=y -# wireless driver and firmware +# Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y BR2_PACKAGE_ARMBIAN_FIRMWARE=y BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -# wireless support +# Wireless support BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -# spi flash support +# Spi flash support BR2_PACKAGE_MTD=y -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 18 22:24:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 18 Jan 2022 23:24:24 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed Message-ID: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.): configure:13774: checking whether pthreads work with -pthread configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 conftest.c:27:26: error: #error "_REENTRANT must be defined" 27 | # error "_REENTRANT must be defined" | ^~~~~ It should be noted that external bootlins will have to be rebuilt. Fixes: - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 Signed-off-by: Fabrice Fontaine --- ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++ ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch create mode 100644 package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + diff --git a/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 18 22:24:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 18 Jan 2022 23:24:25 +0100 Subject: [Buildroot] [PATCH 2/2] Revert "package/libmicrohttpd: fix pthread detection" In-Reply-To: <20220118222425.164134-1-fontaine.fabrice@gmail.com> References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Message-ID: <20220118222425.164134-2-fontaine.fabrice@gmail.com> This reverts commit 834464792e691a243d456335083b2a8b3363e261, the build failure is not related to the bump to 0.9.75 but to or1k and gcc 10. Signed-off-by: Fabrice Fontaine --- package/libmicrohttpd/libmicrohttpd.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 344e1443fd..f75178bc0a 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -12,10 +12,6 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBMICROHTTPD_CFLAGS += -D_REENTRANT -endif - LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Jan 18 22:34:52 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 18 Jan 2022 23:34:52 +0100 Subject: [Buildroot] [PATCH v2] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> References: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> Message-ID: <3F734133-43FB-4057-8A88-92210A9FDCB4@benettiengineering.com> Hi Sergey, patch subject doesn?t say what you?re doing. How about: orangepi/orangepi-zero: bump Linux and U-Boot versions And in commit log below try to keep it more consistent. Like every change form sounds the same: - create common scenario? - use extlinux.conf instead of boot.scr Etc. > Il giorno 18 gen 2022, alle ore 22:59, Sergey Kuzminov ha scritto: > > ?Changes: > - common scenario for multiple boards to create the SD image: board/orangepi/common; > - extlinux.conf instead of boot.scr; > - exclude FAT partition; > - defconfig refactoring; > - kernel: bump to version 5.16.1; > - u-boot: bump to version 2022.01; > - added BR2_ARM_FPU_NEON_VFPV4; > - added fast_commit for ext4. > > Patch required to work: > https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ > > Signed-off-by: Sergey Kuzminov ?- Here you need to add: V1->V2: * changed this * changed that So in V3 you also need to add: V2->V3: * changed those * etc. > --- > board/orangepi/common/extlinux.conf | 5 ++ > board/orangepi/common/genimage.cfg | 20 +++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++ > board/orangepi/common/uboot-extras.config | 3 + > board/orangepi/orangepi-zero/boot.cmd | 9 --- > board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ > configs/orangepi_zero_defconfig | 69 ++++++++++++++--------- > 7 files changed, 104 insertions(+), 72 deletions(-) > create mode 100644 board/orangepi/common/extlinux.conf > create mode 100644 board/orangepi/common/genimage.cfg > create mode 100755 board/orangepi/common/post-build.sh > create mode 100644 board/orangepi/common/uboot-extras.config > delete mode 100644 board/orangepi/orangepi-zero/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg > > diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf > new file mode 100644 > index 0000000000..015f29270e > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,5 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + append root=PARTUUID=%PARTUUID% rootwait console=${console} > +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..8b80ffb138 > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = gpt > + gpt-no-backup = true > + gpt-location = 1008K # 1MB - 16KB > + } > + > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB - 16KB > + } > + > + partition rootfs { > + offset = 1M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh > new file mode 100755 > index 0000000000..296f94b174 > --- /dev/null > +++ b/board/orangepi/common/post-build.sh > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +linux_image() > +{ > + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then > + echo "uImage" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then > + echo "Image" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then > + echo "Image.gz" > + else > + echo "zImage" > + fi > +} > + > +generic_getty() > +{ > + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then > + echo "" > + else > + echo "s/\s*console=\S*//" > + fi > +} > + > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > + > +sed -e "$(generic_getty)" \ > + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ > + -e "s/%PARTUUID%/$PARTUUID/g" \ > + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > + > +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config > new file mode 100644 > index 0000000000..5aa97523d9 > --- /dev/null > +++ b/board/orangepi/common/uboot-extras.config > @@ -0,0 +1,3 @@ > +CONFIG_BOOTDELAY=0 > +CONFIG_USE_PREBOOT=y > +CONFIG_PREBOOT="setenv preboot;" > diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd > deleted file mode 100644 > index d094a64fe5..0000000000 > --- a/board/orangepi/orangepi-zero/boot.cmd > +++ /dev/null > @@ -1,9 +0,0 @@ > -setenv fdt_high ffffffff > - > -part uuid mmc 0:2 uuid > -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg > deleted file mode 100644 > index 32f5454ae6..0000000000 > --- a/board/orangepi/orangepi-zero/genimage.cfg > +++ /dev/null > @@ -1,36 +0,0 @@ > -# Minimal SD card image for the OrangePi Zero > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h2-plus-orangepi-zero.dtb", > - "boot.scr" > - } > - } > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..d1cae2b4f3 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,49 +1,64 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > -BR2_ARM_FPU_VFPV4=y > +BR2_ARM_EABIHF=y > +BR2_ARM_FPU_NEON_VFPV4=y > +#BR2_ARM_INSTRUCTIONS_THUMB2=y Is there a specific reason for specifying here not thumb2? So ARM? > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" > -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -# BR2_TARGET_ROOTFS_TAR is not set > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > -BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" Here ^^^ I tend to use .fragment extension instead of .config > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" Ditto ^^^ > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > +BR2_TARGET_ROOTFS_TAR=n Here you should keep the form # BR2_TARGET_ROOTFS_TAR not set Instead of assigning =n Best regards ?- Giulio Benetti Benetti Engineering sas > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_GENIMAGE=y > > -# wireless driver and firmware > +# Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > BR2_PACKAGE_ARMBIAN_FIRMWARE=y > BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y > > -# wireless support > +# Wireless support > BR2_PACKAGE_IW=y > BR2_PACKAGE_WIRELESS_TOOLS=y > BR2_PACKAGE_WIRELESS_TOOLS_LIB=y > @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > > -# spi flash support > +# Spi flash support > BR2_PACKAGE_MTD=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Jan 19 07:06:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 19 Jan 2022 07:06:47 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-18 Message-ID: <20220119070657.545B340140@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-18 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 66 | 3 | 0 | 69 | 2021.11.x | 23 | 2 | 0 | 25 | master | 92 | 53 | 0 | 145 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 10 host-riscv-isa-sim-1.1.0 | 8 bluez5_utils-5.63 | 4 gvfs-1.48.1 | 4 log4cxx-0.12.0 | 3 unknown | 3 mesa3d-21.3.3 | 2 babeltrace2-2.0.4 | 1 bat-0.18.3 | 1 cryptsetup-2.4.2 | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 gstd-0.13.0 | 1 guile-3.0.7 | 1 ipmitool-1.8.18 | 1 ksmbd-tools-3.4.3 | 1 libglvnd-1.3.2 | 1 nodejs-14.18.3 | 1 pcsc-lite-1.9.5 | 1 pulseview-0.4.2 | 1 qt5base-5.15.2 | 1 qt5webkit-5.212.0-alpha4 | 1 sslh-1.22c | 1 tpm2-pkcs11-1.7.0 | 1 wavemon-0.9.4 | 1 xdriver_xf86-video-mach64-6... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | babeltrace2-2.0.4 | NOK | http://autobuild.buildroot.net/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/1bfca20d72a0bca2e3336b6edc3a4722d18a7816 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6571ba516c5fb13ab0ab5727671af36d8357ff70 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/b912dd02ec87f6d3faacb163fcb676b0e6028ba0 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2a61a8d8739ec9773f946aec3c00b7ba54bb7a73 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/46f212005463424f93b9f86b0feba17335cf5db8 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/57d6a2a0785245df75fd6c1f38f59e352cce8ae1 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/74ff28b31a001e4451aafb4d69c0839e2b312853 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/daf464b68bb0bec85e0f96f2c6a4deb9cfd7488c | arm | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/9e0de3be130bb618514a32878e1fd3c2717ebce5 | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a927f5d8adbfdff2bb69fb1185aa98c718d5f73a | ORPH s390x | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/f2bc8f2163acda56dddde5bae8d4e0e852e8eeab | ORPH aarch64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/87194e411363b1e872edd0b789c7aa3236aecd6a | ORPH x86_64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/7c426984f57b5f044da597c6ddc602aeacb5e152 | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/aaafaf0fe330fa30fa3bc50eec985b8385733f40 | ORPH arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/53283b708980285341d23ef3e1ec18c1eb64ed89 | arc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/07662a376b7e77c3edca3725132615c2dcec4a0e | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/6dd5b437ac5a1c995c79da9926e454c23eb82bab | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/1cc794a1b82832a3bd62bc9804097fadef8db3c5 | riscv32 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/40af7d5baa8360cae3298d11cdad0ed36655d425 | microblazeel | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/e5648e68ef17ca611728fbcadf2a80c7f3818521 | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/95ddf7e566d38bcb7a61365ebed4a844f3b3bf79 | aarch64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/dee032c078aa3788fb146fc8ceb47bd6fbf5f062 | arc | ipmitool-1.8.18 | NOK | http://autobuild.buildroot.net/results/ef3c9c4507fefdfc34d881d3b2b6f84bf541688f | s390x | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/0693163f4903e8b814d6d8daa6e7e4d2f2341cc7 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/0b9193bba229573156aa92c962ac33584bf4a201 | ORPH x86_64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/a5d3e05f1b1618b603c44c84ad786e4b2f43e260 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/22cfce984a6b1959261ef20540fcb70d92be3129 | riscv64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/1f1412bb0e39e44813bacab73b984f63c20d2f09 | powerpc | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/e12e6c039bf2509370f1ad5f8aa6bcb744d3abff | riscv64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/58d5683a179efc2f79bba53d29ffb32b56c17a5d | x86_64 | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/a1f913e4a2da6fb59f67db6a9de81c41cd75e060 | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/6f926bec146752873f8032b593f0de1cb222ea46 | ORPH sparc64 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/e9002c89321ae1438382dfff023fe1dba3aa096f | x86_64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/27b31481733f08f1cf8cfee34a251d3e69ab2621 | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/1edec9977ce0b2f7a5fa9757bfc5f22149b30a4f | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5ed1912a5c65dce379baeec8160ff6ee113867a6 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ef117ee0d40b36bd4c099b14aa4d2f59d2b2ef9b | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/41df114212d088c7ec2fff0770757092265934bc | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/43fa0d571924bd1ee96b0485cea5b62185a9800f | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/50fe491b3a6c4e6e1cefb36682a97612160112d5 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a5019decffeffdb5aed8bb93153364647b4d3935 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d7b6e3c014f418e3ba1a9b8b91d7d2877ea8fbe6 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f901a69ec0a3b311226fa282c4e4b4abeb845207 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5f4e7afff729d3f1ee145b5441d449f6f3ca351a | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/37bd366dfd1c57cbcd01b115c9074f49c4b1f9fd | arm | sslh-1.22c | NOK | http://autobuild.buildroot.net/results/59c95f4ffda404124409f4c4e9cc2dfe40ef7588 | or1k | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/fda2d1c28ffa7e73d38a52dcd4c7ae79aa0a44a5 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/05ccfe1c4a26585ce2f92f5685cf1b10ab7c8546 | arm | unknown | NOK | http://autobuild.buildroot.net/results/96d25f7893151a6a4f96117c1ce52d20a44fcfba | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7024cb5ef610451ee083c91fb312467709514e2c | xtensa | xdriver_xf86-video-mach64-6... | NOK | http://autobuild.buildroot.net/results/f0a0224a2b368c11236fcc7d14db5175c0a829d1 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c92a15f1e2ce25bfd4791318d85aa2ab385fb51b | xtensa | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/b94330935b48ba8124f42932f49a161cb348830e | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/b5a453a3196c3c8de1186984489356322e2c3ddb | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/9b1a2326b5a10cda27725a991d62091079a2ea75 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9507b99753ba8e72260dfe8b41d291248ecd2c5a | -- http://autobuild.buildroot.net From kuzminov.sergey81 at gmail.com Wed Jan 19 07:50:13 2022 From: kuzminov.sergey81 at gmail.com (Kuzminov Sergey) Date: Wed, 19 Jan 2022 10:50:13 +0300 Subject: [Buildroot] [PATCH v2] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <3F734133-43FB-4057-8A88-92210A9FDCB4@benettiengineering.com> References: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> <3F734133-43FB-4057-8A88-92210A9FDCB4@benettiengineering.com> Message-ID: <9d8e1077-030a-8520-d593-0d2a9c216127@gmail.com> Hi, Giulio. Thanks for the comments, I'll try to do everything right in the evening. I would like to consult about BR2_ARM_INSTRUCTIONS_THUMB2. I tested the build for Orange Zero (Allwinner H2+) using the built-in test in the 7-zip archiver and did not notice any performance differences between VFPV4, NEON_VFPV4, THUMB2. Most likely, another performance testing program is needed to unlock the potential of NEON. But I was more interested in BR2_ARM_INSTRUCTIONS_THUMB2. As it turned out, in my build, all executable files have decreased in size. For example busybox 566Kb (THUMB2) vs. 766Kb (VFPV4/NEON_VFPV4). But I do not know if there are any disadvantages of THUMB 2. Therefore, I added BR2_ARM_INSTRUCTIONS_THUMB 2 to the configuration, but commented so that people could see that this mode is possible for this processor and would make a choice whether to use it. Today I found a good article revealing the essence of what is happening: https://kmittal82.wordpress.com/2012/02/17/armthumbthumb-2/ What should I do? Leave as is, remove or enable BR2_ARM_INSTRUCTIONS_THUMB2. 19.01.2022 1:34, Giulio Benetti: > Hi Sergey, > > patch subject doesn?t say what you?re doing. > How about: > orangepi/orangepi-zero: bump Linux and U-Boot versions > > And in commit log below try to keep it more consistent. Like every change form sounds the same: > - create common scenario? > - use extlinux.conf instead of boot.scr > Etc. > >> Il giorno 18 gen 2022, alle ore 22:59, Sergey Kuzminov ha scritto: >> >> ?Changes: >> - common scenario for multiple boards to create the SD image: board/orangepi/common; >> - extlinux.conf instead of boot.scr; >> - exclude FAT partition; >> - defconfig refactoring; >> - kernel: bump to version 5.16.1; >> - u-boot: bump to version 2022.01; >> - added BR2_ARM_FPU_NEON_VFPV4; >> - added fast_commit for ext4. >> >> Patch required to work: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ >> >> Signed-off-by: Sergey Kuzminov > ?- > Here you need to add: > V1->V2: > * changed this > * changed that > So in V3 you also need to add: > V2->V3: > * changed those > * etc. >> --- >> board/orangepi/common/extlinux.conf | 5 ++ >> board/orangepi/common/genimage.cfg | 20 +++++++ >> board/orangepi/common/post-build.sh | 34 +++++++++++ >> board/orangepi/common/uboot-extras.config | 3 + >> board/orangepi/orangepi-zero/boot.cmd | 9 --- >> board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ >> configs/orangepi_zero_defconfig | 69 ++++++++++++++--------- >> 7 files changed, 104 insertions(+), 72 deletions(-) >> create mode 100644 board/orangepi/common/extlinux.conf >> create mode 100644 board/orangepi/common/genimage.cfg >> create mode 100755 board/orangepi/common/post-build.sh >> create mode 100644 board/orangepi/common/uboot-extras.config >> delete mode 100644 board/orangepi/orangepi-zero/boot.cmd >> delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg >> >> diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf >> new file mode 100644 >> index 0000000000..015f29270e >> --- /dev/null >> +++ b/board/orangepi/common/extlinux.conf >> @@ -0,0 +1,5 @@ >> +LABEL default >> + kernel /boot/%LINUXIMAGE% >> + devicetreedir /boot >> + append root=PARTUUID=%PARTUUID% rootwait console=${console} >> +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 >> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >> new file mode 100644 >> index 0000000000..8b80ffb138 >> --- /dev/null >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,20 @@ >> +image sdcard.img { >> + hdimage { >> + partition-table-type = gpt >> + gpt-no-backup = true >> + gpt-location = 1008K # 1MB - 16KB >> + } >> + >> + partition u-boot { >> + in-partition-table = false >> + image = "u-boot-sunxi-with-spl.bin" >> + offset = 8K >> + size = 1000K # 1MB - 8KB - 16KB >> + } >> + >> + partition rootfs { >> + offset = 1M >> + image = "rootfs.ext4" >> + partition-uuid = %PARTUUID% >> + } >> +} >> diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh >> new file mode 100755 >> index 0000000000..296f94b174 >> --- /dev/null >> +++ b/board/orangepi/common/post-build.sh >> @@ -0,0 +1,34 @@ >> +#!/bin/sh >> + >> +linux_image() >> +{ >> + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then >> + echo "uImage" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then >> + echo "Image" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then >> + echo "Image.gz" >> + else >> + echo "zImage" >> + fi >> +} >> + >> +generic_getty() >> +{ >> + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then >> + echo "" >> + else >> + echo "s/\s*console=\S*//" >> + fi >> +} >> + >> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >> + >> +install -d "$TARGET_DIR/boot/extlinux/" >> + >> +sed -e "$(generic_getty)" \ >> + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ >> + -e "s/%PARTUUID%/$PARTUUID/g" \ >> + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >> + >> +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >> diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config >> new file mode 100644 >> index 0000000000..5aa97523d9 >> --- /dev/null >> +++ b/board/orangepi/common/uboot-extras.config >> @@ -0,0 +1,3 @@ >> +CONFIG_BOOTDELAY=0 >> +CONFIG_USE_PREBOOT=y >> +CONFIG_PREBOOT="setenv preboot;" >> diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd >> deleted file mode 100644 >> index d094a64fe5..0000000000 >> --- a/board/orangepi/orangepi-zero/boot.cmd >> +++ /dev/null >> @@ -1,9 +0,0 @@ >> -setenv fdt_high ffffffff >> - >> -part uuid mmc 0:2 uuid >> -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait >> - >> -fatload mmc 0 $kernel_addr_r zImage >> -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb >> - >> -bootz $kernel_addr_r - $fdt_addr_r >> diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg >> deleted file mode 100644 >> index 32f5454ae6..0000000000 >> --- a/board/orangepi/orangepi-zero/genimage.cfg >> +++ /dev/null >> @@ -1,36 +0,0 @@ >> -# Minimal SD card image for the OrangePi Zero >> -# >> -image boot.vfat { >> - vfat { >> - files = { >> - "zImage", >> - "sun8i-h2-plus-orangepi-zero.dtb", >> - "boot.scr" >> - } >> - } >> - size = 10M >> -} >> - >> -image sdcard.img { >> - hdimage { >> - } >> - >> - partition u-boot { >> - in-partition-table = "no" >> - image = "u-boot-sunxi-with-spl.bin" >> - offset = 8K >> - size = 1016K # 1MB - 8KB >> - } >> - >> - partition boot { >> - partition-type = 0xC >> - bootable = "true" >> - image = "boot.vfat" >> - } >> - >> - partition rootfs { >> - partition-type = 0x83 >> - image = "rootfs.ext4" >> - size = 512M >> - } >> -} >> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >> index 1c107b10e6..d1cae2b4f3 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -1,49 +1,64 @@ >> +# Architecture >> BR2_arm=y >> BR2_cortex_a7=y >> -BR2_ARM_FPU_VFPV4=y >> +BR2_ARM_EABIHF=y >> +BR2_ARM_FPU_NEON_VFPV4=y >> +#BR2_ARM_INSTRUCTIONS_THUMB2=y > Is there a specific reason for specifying here not thumb2? So ARM? > >> + >> +# System >> +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >> -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> BR2_SYSTEM_DHCP="eth0" >> -BR2_LINUX_KERNEL=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" >> -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> -BR2_LINUX_KERNEL_DTS_SUPPORT=y >> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> -BR2_TARGET_ROOTFS_EXT2=y >> -BR2_TARGET_ROOTFS_EXT2_4=y >> -# BR2_TARGET_ROOTFS_TAR is not set >> + >> +# Bootloader >> BR2_TARGET_UBOOT=y >> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" >> -BR2_PACKAGE_HOST_DOSFSTOOLS=y >> -BR2_PACKAGE_HOST_GENIMAGE=y >> -BR2_PACKAGE_HOST_MTOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" > Here ^^^ I tend to use .fragment extension instead of .config > >> + >> +# Kernel >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > Ditto ^^^ > >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >> + >> +# Filesystem >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> +BR2_TARGET_ROOTFS_TAR=n > Here you should keep the form # BR2_TARGET_ROOTFS_TAR not set > Instead of assigning =n > > Best regards > ?- > Giulio Benetti > Benetti Engineering sas > >> + >> +# Image >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >> + >> +# Required tools to create the SD image >> +BR2_PACKAGE_HOST_GENIMAGE=y >> >> -# wireless driver and firmware >> +# Wireless driver and firmware >> BR2_PACKAGE_XR819_XRADIO=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >> >> -# wireless support >> +# Wireless support >> BR2_PACKAGE_IW=y >> BR2_PACKAGE_WIRELESS_TOOLS=y >> BR2_PACKAGE_WIRELESS_TOOLS_LIB=y >> @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y >> BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y >> BR2_PACKAGE_WPA_SUPPLICANT_CLI=y >> >> -# spi flash support >> +# Spi flash support >> BR2_PACKAGE_MTD=y >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Jan 19 07:54:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 19 Jan 2022 08:54:11 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220118222425.164134-1-fontaine.fabrice@gmail.com> References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Message-ID: <20220119085411.22ee6fb6@windsurf> Hello Fabrice, On Tue, 18 Jan 2022 23:24:24 +0100 Fabrice Fontaine wrote: > Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc > 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build > failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, > etc.): > > configure:13774: checking whether pthreads work with -pthread > configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 > conftest.c:27:26: error: #error "_REENTRANT must be defined" > 27 | # error "_REENTRANT must be defined" > | ^~~~~ > > It should be noted that external bootlins will have to be rebuilt. > > Fixes: > - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 > - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 > - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 > > Signed-off-by: Fabrice Fontaine Wow, this patch still hasn't been accepted in upstream gcc? It's been submitted a looong time ago I believe. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From shorne at gmail.com Wed Jan 19 08:13:54 2022 From: shorne at gmail.com (Stafford Horne) Date: Wed, 19 Jan 2022 17:13:54 +0900 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220119085411.22ee6fb6@windsurf> References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> <20220119085411.22ee6fb6@windsurf> Message-ID: On Wed, Jan 19, 2022 at 08:54:11AM +0100, Thomas Petazzoni wrote: > Hello Fabrice, > > On Tue, 18 Jan 2022 23:24:24 +0100 > Fabrice Fontaine wrote: > > > Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc > > 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build > > failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, > > etc.): > > > > configure:13774: checking whether pthreads work with -pthread > > configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 > > conftest.c:27:26: error: #error "_REENTRANT must be defined" > > 27 | # error "_REENTRANT must be defined" > > | ^~~~~ > > > > It should be noted that external bootlins will have to be rebuilt. > > > > Fixes: > > - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 > > - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 > > - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 > > > > Signed-off-by: Fabrice Fontaine > > Wow, this patch still hasn't been accepted in upstream gcc? It's been > submitted a looong time ago I believe. Hello, I must have missed this one. It looks good to me I will push it upstream. -Stafford From giulio.benetti at benettiengineering.com Wed Jan 19 08:14:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 09:14:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220119085411.22ee6fb6@windsurf> References: <20220119085411.22ee6fb6@windsurf> Message-ID: Hi Thomas, All, > Il giorno 19 gen 2022, alle ore 08:56, Thomas Petazzoni ha scritto: > > ?Hello Fabrice, > >> On Tue, 18 Jan 2022 23:24:24 +0100 >> Fabrice Fontaine wrote: >> >> Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc >> 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build >> failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, >> etc.): >> >> configure:13774: checking whether pthreads work with -pthread >> configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 >> conftest.c:27:26: error: #error "_REENTRANT must be defined" >> 27 | # error "_REENTRANT must be defined" >> | ^~~~~ >> >> It should be noted that external bootlins will have to be rebuilt. >> >> Fixes: >> - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 >> - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 >> - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 >> >> Signed-off-by: Fabrice Fontaine > > Wow, this patch still hasn't been accepted in upstream gcc? It's been > submitted a looong time ago I believe. That?s when the new maintainer took over the previous one. I ping him about this so he can commit it. YetAnotherOr1kBug :-) Best regards Giulio > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From giulio.benetti at benettiengineering.com Wed Jan 19 08:16:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 09:16:53 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: References: Message-ID: <1F1B4469-02B4-4D3D-A4DD-B2A76124B13C@benettiengineering.com> Hi Stafford, > Il giorno 19 gen 2022, alle ore 09:14, Stafford Horne ha scritto: > > ?On Wed, Jan 19, 2022 at 08:54:11AM +0100, Thomas Petazzoni wrote: >> Hello Fabrice, >> >>> On Tue, 18 Jan 2022 23:24:24 +0100 >>> Fabrice Fontaine wrote: >>> >>> Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc >>> 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build >>> failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, >>> etc.): >>> >>> configure:13774: checking whether pthreads work with -pthread >>> configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 >>> conftest.c:27:26: error: #error "_REENTRANT must be defined" >>> 27 | # error "_REENTRANT must be defined" >>> | ^~~~~ >>> >>> It should be noted that external bootlins will have to be rebuilt. >>> >>> Fixes: >>> - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 >>> - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 >>> - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 >>> >>> Signed-off-by: Fabrice Fontaine >> >> Wow, this patch still hasn't been accepted in upstream gcc? It's been >> submitted a looong time ago I believe. > > Hello, > > I must have missed this one. It looks good to me I will push it upstream. I?ve just written I would have pinged you soon and you?ve appeared:-) Better this way! Kind regards ?- Giulio Benetti Benetti Engineering sas > > -Stafford > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Wed Jan 19 08:45:45 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 19 Jan 2022 01:45:45 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build Message-ID: <20220119084545.3642950-1-james.hilliard1@gmail.com> The cmake build appears to be missing features such as pkg-config generation support, switch to the regular makefile based build which appears to work better. Signed-off-by: James Hilliard --- package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b562d5d7ef..144c82339f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON +define RE2_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) +endef -$(eval $(cmake-package)) -$(eval $(host-cmake-package)) +define RE2_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install +endef + +define RE2_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install +endef + +define HOST_RE2_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D) +endef + +define HOST_RE2_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) -- 2.25.1 From michael at walle.cc Wed Jan 19 09:01:25 2022 From: michael at walle.cc (Michael Walle) Date: Wed, 19 Jan 2022 10:01:25 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <966BF669-674E-4A71-82E3-FF7A2B520659@benettiengineering.com> References: <966BF669-674E-4A71-82E3-FF7A2B520659@benettiengineering.com> Message-ID: [please don't use html mails] Am 2022-01-18 21:40, schrieb Giulio Benetti: > After following the discussion in IRC between Yann and Michael I am > sure that this setting cannot be used for the aarch64/cortex-A53 CPU. > The settings BR2_ARM_CPU_HAS_FPU, BR2_ARM_CPU_HAS_VFPV2, > BR2_ARM_CPU_HAS_VFPV3, BR2_ARM_CPU_HAS_VFPV4 and > BR2_ARM_CPU_HAS_FP_ARMV8 are set implicitly. > > Yes, I was wrong and you point that fpu strategy falls back to > BR2_ARM_FPU_FP_ARMV8 and it?s ok. > But i.MX8MM supports NEON too, so I would go for setting > BR2_ARM_FPU_NEON_FP_ARMV8, > because as pointed here[1] the armv8 neon now supports IEEE 754 > floating point standard. > > BUT I?ve found that gcc[2] points that: > ??? > > If the selected floating-point hardware includes the NEON extension > (e.g. -mfpu=neon), note that floating-point operations are not > generated by GCC?s auto-vectorization pass unless > -funsafe-math-optimizations is also specified. This is because NEON > hardware does not fully implement the IEEE 754 standard for > floating-point arithmetic (in particular denormal values are treated > as zero), so the use of NEON instructions may lead to a loss of > precision. > ??? That is for aarch32 mode. aarch64 doesn't have the -mfpu switch. Instead the FPU support is either derived automatically or through modifiers of the -mcpu switch. -michael From james.hilliard1 at gmail.com Wed Jan 19 09:03:01 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 19 Jan 2022 02:03:01 -0700 Subject: [Buildroot] [PATCH 1/1] package/libxml2: add optional icu support Message-ID: <20220119090301.3649833-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/libxml2/libxml2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..023a461472 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -24,6 +24,13 @@ LIBXML2_DEPENDENCIES = host-pkgconf HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python +ifeq ($(BR2_PACKAGE_ICU),y) +LIBXML2_DEPENDENCIES += icu +LIBXML2_CONF_OPTS += --with-icu +else +LIBXML2_CONF_OPTS += --without-icu +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBXML2_DEPENDENCIES += zlib LIBXML2_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr -- 2.25.1 From giulio.benetti at benettiengineering.com Wed Jan 19 09:05:13 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 10:05:13 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <966BF669-674E-4A71-82E3-FF7A2B520659@benettiengineering.com> Message-ID: <98e95df3-0fc6-406a-bbb1-b47d99a75141@benettiengineering.com> Hi Michael, On 19/01/22 10:01, Michael Walle wrote: > [please don't use html mails] I know, sometimes I write from mobile and I can't use plain-text :-/ > Am 2022-01-18 21:40, schrieb Giulio Benetti: > >> After following the discussion in IRC between Yann and Michael I am >> sure that this setting cannot be used for the aarch64/cortex-A53 CPU. >> The settings BR2_ARM_CPU_HAS_FPU, BR2_ARM_CPU_HAS_VFPV2, >> BR2_ARM_CPU_HAS_VFPV3, BR2_ARM_CPU_HAS_VFPV4 and >> BR2_ARM_CPU_HAS_FP_ARMV8 are set implicitly. >> >> Yes, I was wrong and you point that fpu strategy falls back to >> BR2_ARM_FPU_FP_ARMV8 and it?s ok. >> But i.MX8MM supports NEON too, so I would go for setting >> BR2_ARM_FPU_NEON_FP_ARMV8, >> because as pointed here[1] the armv8 neon now supports IEEE 754 >> floating point standard. >> >> BUT I?ve found that gcc[2] points that: >> ??? >> >> If the selected floating-point hardware includes the NEON extension >> (e.g. -mfpu=neon), note that floating-point operations are not >> generated by GCC?s auto-vectorization pass unless >> -funsafe-math-optimizations is also specified. This is because NEON >> hardware does not fully implement the IEEE 754 standard for >> floating-point arithmetic (in particular denormal values are treated >> as zero), so the use of NEON instructions may lead to a loss of >> precision. >> ??? > > That is for aarch32 mode. aarch64 doesn't have the -mfpu switch. > Instead the FPU support is either derived automatically or > through modifiers of the -mcpu switch. Thank you for the explanation, indeed as talked in IRC I've found that under armv8-a there are only options for +simd or +crypto. This explains everything to me. Kind regards! -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Wed Jan 19 09:44:55 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 10:44:55 +0100 Subject: [Buildroot] [PATCH v2] board/orangepi/orangepi-zero:extlinux, refactoring In-Reply-To: <9d8e1077-030a-8520-d593-0d2a9c216127@gmail.com> References: <20220118215803.18635-1-kuzminov.sergey81@gmail.com> <3F734133-43FB-4057-8A88-92210A9FDCB4@benettiengineering.com> <9d8e1077-030a-8520-d593-0d2a9c216127@gmail.com> Message-ID: Hi Sergey, adding Romain in Cc for Thumb2 On 19/01/22 08:50, Kuzminov Sergey wrote: > Hi, Giulio. > Thanks for the comments, I'll try to do everything right in the evening. > I would like to consult about BR2_ARM_INSTRUCTIONS_THUMB2. > > I tested the build for Orange Zero (Allwinner H2+) using the built-in > test in the 7-zip archiver and did not notice any performance > differences between VFPV4, NEON_VFPV4, THUMB2. Most likely, another > performance testing program is needed to unlock the potential of NEON. Yes, the mix of VFPV4 and NEON is rare, maybe you can appreciate it with libnss or other packages that use such optimization. Otherwise NEON doesn't get used. But anyway, if it's enabled, we have the chance for it to be used. It's there, so better use it :-) > But I was more interested in BR2_ARM_INSTRUCTIONS_THUMB2. As it turned > out, in my build, all executable files have decreased in size. For > example busybox 566Kb (THUMB2) vs. 766Kb (VFPV4/NEON_VFPV4). But I do > not know if there are any disadvantages of THUMB 2. THUMB2 yes, reduces size and it costs very few in term of performances(like 2% less), check here: https://pagefault.blog/2017/05/03/why-and-how-to-enable-arm-thumb-2-instruction-set-in-yocto/ They also state that every piece of the system should then be compiled with THUMB2, including Linux. About disadvantages, I only read sometimes that it can create some problem depending on toolchain. But here I leave the question to more experienced people than me. Maybe Romain can clarify this. > Therefore, I added > BR2_ARM_INSTRUCTIONS_THUMB 2 to the configuration, but commented so that > people could see that this mode is possible for this processor and would > make a choice whether to use it. Yes, but this is not how we want defconfigs. The option is available issuing: # make menuconfig so one can anyway enable it and give a try. So please remove that commented line. > Today I found a good article revealing the essence of what is happening: > https://kmittal82.wordpress.com/2012/02/17/armthumbthumb-2/ Yes, this article is good too. > What should I do? Leave as is, remove or enable BR2_ARM_INSTRUCTIONS_THUMB2. It can't stay there commented for sure, so if commented you need to remove it. Otherwise, like every Microchip cortex-A5 board does, you can enable it by default. But for consistency with all the other Allwinner SoCs maybe it's better to keep it disabled. Otherwise we should give a try to every Allwinner board(many) with THUMB2. It can be done, but I would think about it later. I mean, Allwinner with ARM instructions is well tested, so I would go for that. PS: please, next time answer in-line, don't top post :-) Thank you Best regards -- Giulio Benetti Benetti Engineering sas > 19.01.2022 1:34, Giulio Benetti: >> Hi Sergey, >> >> patch subject doesn?t say what you?re doing. >> How about: >> orangepi/orangepi-zero: bump Linux and U-Boot versions >> >> And in commit log below try to keep it more consistent. Like every change form sounds the same: >> - create common scenario? >> - use extlinux.conf instead of boot.scr >> Etc. >> >>> Il giorno 18 gen 2022, alle ore 22:59, Sergey Kuzminov ha scritto: >>> >>> ?Changes: >>> - common scenario for multiple boards to create the SD image: board/orangepi/common; >>> - extlinux.conf instead of boot.scr; >>> - exclude FAT partition; >>> - defconfig refactoring; >>> - kernel: bump to version 5.16.1; >>> - u-boot: bump to version 2022.01; >>> - added BR2_ARM_FPU_NEON_VFPV4; >>> - added fast_commit for ext4. >>> >>> Patch required to work: >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ >>> >>> Signed-off-by: Sergey Kuzminov >> ?- >> Here you need to add: >> V1->V2: >> * changed this >> * changed that >> So in V3 you also need to add: >> V2->V3: >> * changed those >> * etc. >>> --- >>> board/orangepi/common/extlinux.conf | 5 ++ >>> board/orangepi/common/genimage.cfg | 20 +++++++ >>> board/orangepi/common/post-build.sh | 34 +++++++++++ >>> board/orangepi/common/uboot-extras.config | 3 + >>> board/orangepi/orangepi-zero/boot.cmd | 9 --- >>> board/orangepi/orangepi-zero/genimage.cfg | 36 ------------ >>> configs/orangepi_zero_defconfig | 69 ++++++++++++++--------- >>> 7 files changed, 104 insertions(+), 72 deletions(-) >>> create mode 100644 board/orangepi/common/extlinux.conf >>> create mode 100644 board/orangepi/common/genimage.cfg >>> create mode 100755 board/orangepi/common/post-build.sh >>> create mode 100644 board/orangepi/common/uboot-extras.config >>> delete mode 100644 board/orangepi/orangepi-zero/boot.cmd >>> delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg >>> >>> diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf >>> new file mode 100644 >>> index 0000000000..015f29270e >>> --- /dev/null >>> +++ b/board/orangepi/common/extlinux.conf >>> @@ -0,0 +1,5 @@ >>> +LABEL default >>> + kernel /boot/%LINUXIMAGE% >>> + devicetreedir /boot >>> + append root=PARTUUID=%PARTUUID% rootwait console=${console} >>> +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 >>> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >>> new file mode 100644 >>> index 0000000000..8b80ffb138 >>> --- /dev/null >>> +++ b/board/orangepi/common/genimage.cfg >>> @@ -0,0 +1,20 @@ >>> +image sdcard.img { >>> + hdimage { >>> + partition-table-type = gpt >>> + gpt-no-backup = true >>> + gpt-location = 1008K # 1MB - 16KB >>> + } >>> + >>> + partition u-boot { >>> + in-partition-table = false >>> + image = "u-boot-sunxi-with-spl.bin" >>> + offset = 8K >>> + size = 1000K # 1MB - 8KB - 16KB >>> + } >>> + >>> + partition rootfs { >>> + offset = 1M >>> + image = "rootfs.ext4" >>> + partition-uuid = %PARTUUID% >>> + } >>> +} >>> diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh >>> new file mode 100755 >>> index 0000000000..296f94b174 >>> --- /dev/null >>> +++ b/board/orangepi/common/post-build.sh >>> @@ -0,0 +1,34 @@ >>> +#!/bin/sh >>> + >>> +linux_image() >>> +{ >>> + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then >>> + echo "uImage" >>> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then >>> + echo "Image" >>> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then >>> + echo "Image.gz" >>> + else >>> + echo "zImage" >>> + fi >>> +} >>> + >>> +generic_getty() >>> +{ >>> + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then >>> + echo "" >>> + else >>> + echo "s/\s*console=\S*//" >>> + fi >>> +} >>> + >>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >>> + >>> +install -d "$TARGET_DIR/boot/extlinux/" >>> + >>> +sed -e "$(generic_getty)" \ >>> + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ >>> + -e "s/%PARTUUID%/$PARTUUID/g" \ >>> + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >>> + >>> +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >>> diff --git a/board/orangepi/common/uboot-extras.config b/board/orangepi/common/uboot-extras.config >>> new file mode 100644 >>> index 0000000000..5aa97523d9 >>> --- /dev/null >>> +++ b/board/orangepi/common/uboot-extras.config >>> @@ -0,0 +1,3 @@ >>> +CONFIG_BOOTDELAY=0 >>> +CONFIG_USE_PREBOOT=y >>> +CONFIG_PREBOOT="setenv preboot;" >>> diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd >>> deleted file mode 100644 >>> index d094a64fe5..0000000000 >>> --- a/board/orangepi/orangepi-zero/boot.cmd >>> +++ /dev/null >>> @@ -1,9 +0,0 @@ >>> -setenv fdt_high ffffffff >>> - >>> -part uuid mmc 0:2 uuid >>> -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait >>> - >>> -fatload mmc 0 $kernel_addr_r zImage >>> -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb >>> - >>> -bootz $kernel_addr_r - $fdt_addr_r >>> diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg >>> deleted file mode 100644 >>> index 32f5454ae6..0000000000 >>> --- a/board/orangepi/orangepi-zero/genimage.cfg >>> +++ /dev/null >>> @@ -1,36 +0,0 @@ >>> -# Minimal SD card image for the OrangePi Zero >>> -# >>> -image boot.vfat { >>> - vfat { >>> - files = { >>> - "zImage", >>> - "sun8i-h2-plus-orangepi-zero.dtb", >>> - "boot.scr" >>> - } >>> - } >>> - size = 10M >>> -} >>> - >>> -image sdcard.img { >>> - hdimage { >>> - } >>> - >>> - partition u-boot { >>> - in-partition-table = "no" >>> - image = "u-boot-sunxi-with-spl.bin" >>> - offset = 8K >>> - size = 1016K # 1MB - 8KB >>> - } >>> - >>> - partition boot { >>> - partition-type = 0xC >>> - bootable = "true" >>> - image = "boot.vfat" >>> - } >>> - >>> - partition rootfs { >>> - partition-type = 0x83 >>> - image = "rootfs.ext4" >>> - size = 512M >>> - } >>> -} >>> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >>> index 1c107b10e6..d1cae2b4f3 100644 >>> --- a/configs/orangepi_zero_defconfig >>> +++ b/configs/orangepi_zero_defconfig >>> @@ -1,49 +1,64 @@ >>> +# Architecture >>> BR2_arm=y >>> BR2_cortex_a7=y >>> -BR2_ARM_FPU_VFPV4=y >>> +BR2_ARM_EABIHF=y >>> +BR2_ARM_FPU_NEON_VFPV4=y >>> +#BR2_ARM_INSTRUCTIONS_THUMB2=y >> Is there a specific reason for specifying here not thumb2? So ARM? >> >>> + >>> +# System >>> +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >>> +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >>> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >>> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >>> -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >>> -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >>> BR2_SYSTEM_DHCP="eth0" >>> -BR2_LINUX_KERNEL=y >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" >>> -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >>> -BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >>> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >>> -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>> -BR2_TARGET_ROOTFS_EXT2=y >>> -BR2_TARGET_ROOTFS_EXT2_4=y >>> -# BR2_TARGET_ROOTFS_TAR is not set >>> + >>> +# Bootloader >>> BR2_TARGET_UBOOT=y >>> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>> BR2_TARGET_UBOOT_CUSTOM_VERSION=y >>> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >>> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" >>> BR2_TARGET_UBOOT_NEEDS_DTC=y >>> BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>> BR2_TARGET_UBOOT_SPL=y >>> BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" >>> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >>> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y >>> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" >>> -BR2_PACKAGE_HOST_DOSFSTOOLS=y >>> -BR2_PACKAGE_HOST_GENIMAGE=y >>> -BR2_PACKAGE_HOST_MTOOLS=y >>> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >>> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.config" >> Here ^^^ I tend to use .fragment extension instead of .config >> >>> + >>> +# Kernel >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >>> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> Ditto ^^^ >> >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >>> + >>> +# Filesystem >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >>> +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" >>> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >>> +BR2_TARGET_ROOTFS_TAR=n >> Here you should keep the form # BR2_TARGET_ROOTFS_TAR not set >> Instead of assigning =n >> >> Best regards >> ?- >> Giulio Benetti >> Benetti Engineering sas >> >>> + >>> +# Image >>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >>> -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" >>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >>> + >>> +# Required tools to create the SD image >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> >>> -# wireless driver and firmware >>> +# Wireless driver and firmware >>> BR2_PACKAGE_XR819_XRADIO=y >>> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >>> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >>> >>> -# wireless support >>> +# Wireless support >>> BR2_PACKAGE_IW=y >>> BR2_PACKAGE_WIRELESS_TOOLS=y >>> BR2_PACKAGE_WIRELESS_TOOLS_LIB=y >>> @@ -51,5 +66,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y >>> BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y >>> BR2_PACKAGE_WPA_SUPPLICANT_CLI=y >>> >>> -# spi flash support >>> +# Spi flash support >>> BR2_PACKAGE_MTD=y >>> -- >>> 2.34.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From tom.marcuzzi at orolia.com Wed Jan 19 14:07:03 2022 From: tom.marcuzzi at orolia.com (Tom Marcuzzi) Date: Wed, 19 Jan 2022 15:07:03 +0100 Subject: [Buildroot] [PATCH 1/1] packages/nodejs: install npm packages on host Message-ID: <20220119140703.12978-1-tom.marcuzzi@orolia.com> Signed-off-by: Tom Marcuzzi --- package/nodejs/Config.in.host | 32 ++++++++++++++++++++++++++++++++ package/nodejs/nodejs.mk | 31 +++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 4ceaf0c73e..601eb6e052 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -16,3 +16,35 @@ config BR2_PACKAGE_HOST_NODEJS comment "host nodejs needs a host gcc >= 8" depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS depends on !BR2_HOST_GCC_AT_LEAST_8 + +if BR2_PACKAGE_HOST_NODEJS + + config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL + string "Additional modules" + help + List of space-separated nodejs modules to install via npm. + See https://npmjs.org/ to find modules and 'npm help install' + for available installation methods. For repeatable builds, + download and save tgz files or clone git repos for the + components you care about. + + Example: + serialport uglify-js at 1.3.4 /my/module/mymodule.tgz \ + git://github.com/someuser/somemodule.git#v1.2 + + This would install the serialport module (at the newest + version), the uglify-js module at 1.3.4, a module from a + filesystem path, and a module from a git repository. + + config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS + string "Additional module dependencies" + help + List of space-separated buildroot recipes which must be + built before your npms can be installed. For example, if in + 'Additional modules' you specified 'node-curl' (see: + https://github.com/jiangmiao/node-curl), you could then + specify 'libcurl' here, to ensure that buildroot builds the + libcurl package, and does so before building your node + modules. + +endif diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 727af6dc50..a342d1c90f 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -96,6 +96,35 @@ NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 +# +# Build the list of modules to install on host. +# +HOST_NODEJS_MODULES_LIST= $(call qstrip,\ + $(BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL)) + +# Define NPM for other packages to use +HOST_NPM = $(HOST_CONFIGURE_OPTS) \ + LDFLAGS="$(HOST_LDFLAGS)" \ + LD="$(HOST_CXX)" \ + npm_config_arch=$(NODEJS_CPU) \ + npm_config_target_arch=$(NODEJS_CPU) \ + npm_config_build_from_source=true \ + npm_config_nodedir=$(HOST_DIR)/nodejs-$(NODEJS_VERSION) \ + npm_config_prefix=$(HOST_DIR)/usr \ + npm_config_cache=$(HOST_DIR)/.npm-cache \ + $(HOST_DIR)/bin/npm +# +# We can only call NPM if there's something to install. +# +ifneq ($(HOST_NODEJS_MODULES_LIST),) +define HOST_NODEJS_INSTALL_MODULES + # If you're having trouble with module installation, adding -d to the + # npm install call below and setting npm_config_rollback=false can both + # help in diagnosing the problem. + $(HOST_NPM) install -g $(HOST_NODEJS_MODULES_LIST) +endef +endif + define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) \ @@ -110,6 +139,8 @@ define HOST_NODEJS_INSTALL_CMDS $(foreach f,$(NODEJS_HOST_TOOLS), \ $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f) ) + + $(HOST_NODEJS_INSTALL_MODULES) endef ifeq ($(BR2_i386),y) -- 2.25.1 From arved at arved.at Wed Jan 19 15:57:39 2022 From: arved at arved.at (Tilman =?utf-8?B?S2Vza2luw7Z6?=) Date: Wed, 19 Jan 2022 16:57:39 +0100 Subject: [Buildroot] [PATCH 1/1] Dependency on liburiparser was removed Message-ID: <20220119155739.c5kzupm5njobmkn6@arved.priv.at> From: Tilman Keskin?z Dependency was removed from Makefile in 593683b45f72169dd94ec14fa18720b3cec9dda4 Signed-off-by: Tilman Keskin?z --- package/tpm2-tss/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2fc56dbd76..857987ae36 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help -- 2.32.0 From giulio.benetti at benettiengineering.com Wed Jan 19 18:23:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 19:23:44 +0100 Subject: [Buildroot] [PATCH v2] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <573cda00-7353-2bfd-dbb3-732cd23c5ae4@kontron.de> References: <20220114211525.2697606-1-heiko.thiery@gmail.com> <573cda00-7353-2bfd-dbb3-732cd23c5ae4@kontron.de> Message-ID: Hi Frieder, Heiko, On 19/01/22 16:38, Frieder Schrempf wrote: > Am 14.01.22 um 22:54 schrieb Heiko Thiery: >> Hi Giulio, >> >> Am Fr., 14. Jan. 2022 um 22:37 Uhr schrieb Giulio Benetti >> : >>> >>> Hi Heiko, >>> >>>> Il giorno 14 gen 2022, alle ore 22:17, Heiko Thiery ha scritto: >>>> >>>> ?The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. >>>> >>>> https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.kontron.com%2Fprodukte%2Fbaseboard-bl-i.mx8m-mini%2Fp158549&data=04%7C01%7Cfrieder.schrempf%40kontron.de%7Cd7a266bb1dac478d7c4108d9d7a8795f%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637777940856116418%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=0wA9otr%2FwIIm37TL3VoW3lj8Ef%2Fcr2L5Dtyr0rqbK%2BI%3D&reserved=0 >>>> >>>> Cc: Frieder Schrempf >>>> Signed-off-by: Heiko Thiery >>>> --- >>>> v2: >>>> - switch to extlinux >>>> - directly call genimage.sh >>>> - remove post-image.sh >>>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT >>>> - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME >>>> >>>> >>>> DEVELOPERS | 2 + >>>> board/kontron/bl-imx8mm/extlinux.conf | 4 + >>>> board/kontron/bl-imx8mm/genimage.cfg | 18 ++ >>>> ...m-kontron-n801x-s-convert-options-to.patch | 28 ++ >>>> ...m-kontron-n801x-s-add-common-board-u.patch | 302 ++++++++++++++++++ >>>> board/kontron/bl-imx8mm/post-build.sh | 7 + >>>> board/kontron/bl-imx8mm/readme.txt | 85 +++++ >>>> configs/kontron_bl_imx8mm_defconfig | 59 ++++ >>>> 8 files changed, 505 insertions(+) >>>> create mode 100644 board/kontron/bl-imx8mm/extlinux.conf >>>> create mode 100644 board/kontron/bl-imx8mm/genimage.cfg >>>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch >>>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch >>>> create mode 100755 board/kontron/bl-imx8mm/post-build.sh >>>> create mode 100644 board/kontron/bl-imx8mm/readme.txt >>>> create mode 100644 configs/kontron_bl_imx8mm_defconfig >>>> >>>> diff --git a/DEVELOPERS b/DEVELOPERS >>>> index c0bfde69da..93c5760489 100644 >>>> --- a/DEVELOPERS >>>> +++ b/DEVELOPERS >>>> @@ -1179,7 +1179,9 @@ F: package/python-sip/ >>>> F: package/uhd/ >>>> >>>> N: Heiko Thiery >>>> +F: board/kontron/bl-imx8mm/ >>>> F: board/kontron/pitx-imx8m/ >>>> +F: configs/kontron_bl_imx8mm_defconfig >>>> F: configs/kontron_pitx_imx8m_defconfig >>>> F: package/altera-stapl/ >>>> F: package/ipmitool/ >>>> diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf >>>> new file mode 100644 >>>> index 0000000000..d38f7f81b7 >>>> --- /dev/null >>>> +++ b/board/kontron/bl-imx8mm/extlinux.conf >>>> @@ -0,0 +1,4 @@ >>>> +label buildroot >>>> + kernel /boot/Image >>>> + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb >>>> + append root=PARTUUID=%PARTUUID% rootwait rw >>>> diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg >>>> new file mode 100644 >>>> index 0000000000..6c0ef69591 >>>> --- /dev/null >>>> +++ b/board/kontron/bl-imx8mm/genimage.cfg >>>> @@ -0,0 +1,18 @@ >>>> +image sdcard.img { >>>> + hdimage { >>>> + partition-table-type = "gpt" >>>> + gpt-location = 16K >>>> + } >>>> + >>>> + partition imx-boot { >>>> + in-partition-table = "no" >>>> + image = "flash.bin" >>>> + offset = 33k >>> >>> I?ve missed V1 patch, here ^^^ please use capitol K letter. >>> I still have to write the linter for genimage.cfg files :-/ >> >> Indeed .. missed that. I will wait for some more comments and do a v3 >> with that fixed later. >> >> [snip] >> >>>> ++&i2c1 { >>>> ++ u-boot,dm-spl; >>>> ++ u-boot,dm-pre-reloc; >>>> ++}; >>>> ++ >>>> ++&i2c2 { >>>> ++ status = "okay"; >>>> ++ u-boot,dm-spl; >>>> ++ u-boot,dm-pre-reloc; >>>> ++}; >>> >>> I don?t know the hardware of the board and it?s a bit off-topic, >>> but do you really need 2 i2c channels before relocating uboot? >> >> Good catch. >> >> @Frieder: can you say something to that? > > Hm, the I2C buses are used in SPL for configuring the PMIC and detecting > the display, so the "u-boot,dm-spl" is correct. I'm not really sure at > what time U-Boot proper probes the devices and if "u-boot,dm-pre-reloc" > is needed or not. > CONFIG_SPL_DM_PMIC_PCA9450 and CONFIG_DM_PMIC_PCA9450 are both enabled and you add uboot,dm-spl and uboot,dm-pre-reloc. What I expect is that PMIC is initialized in SPL and in u-boot pre-reloc. So I think that for i2c1 node uboot,dm-pre-reloc is useless but you need to keep uboot,dm-spl. Same goes for i2c2 if you use it with ush(uboot shell) since you have CONFIG_CMD_I2C enabled. Most of all, i2c2, if it's only used with CMD_I2C you can remove both uboot,dm-spl and uboot,dm-pre-reloc because the CMD_I2C will be available only after u-boot is relocated, for example when ush console is sent out. Of course this deserves a test. Do you have any kind of jtag-debugger to check this? Or can you enable uboot log debugging? That way you will be sure of what is going on. Anyway you could check if PMIC changed its default voltages to what you've programmed and you can also check if i2c2 is probed with i2c ush command. Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Tue Jan 18 17:27:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 18 Jan 2022 18:27:46 +0100 Subject: [Buildroot] [git commit] package/riscv-isa-sim: set --with-boost Message-ID: <20220119201624.83CAB8351F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ae840ba193a90f4cb950526646b831294477454 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set --with-boost to avoid the following build failure when a non working boost version is installed on host. This failure is raised since the addition of the package in commit ea033cecf990ed3f86619647523a9ad2ccb09adb: configure:5559: error: Could not find a version of the Boost::Asio library! Fixes: - http://autobuild.buildroot.org/results/855b66b86d979cc922b947da932b0e2388481263 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/riscv-isa-sim/riscv-isa-sim.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk index ee9067d304..90eed93c36 100644 --- a/package/riscv-isa-sim/riscv-isa-sim.mk +++ b/package/riscv-isa-sim/riscv-isa-sim.mk @@ -9,5 +9,6 @@ RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA RISCV_ISA_SIM_LICENSE = BSD-3-Clause RISCV_ISA_SIM_LICENSE_FILES = LICENSE HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc +HOST_RISCV_ISA_SIM_CONF_OPTS = --with-boost=$(HOST_DIR) $(eval $(host-autotools-package)) From yann.morin.1998 at free.fr Wed Jan 19 20:23:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 21:23:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> Message-ID: <20220119202351.GA3095239@scaer> Fabrice, All, On 2022-01-15 17:04 +0100, Fabrice Fontaine spake thusly: > Set --with-boost to avoid the following build failure when a non working > boost version is installed on host. This failure is raised since the > addition of the package in commit > ea033cecf990ed3f86619647523a9ad2ccb09adb: > > configure:5559: error: Could not find a version of the Boost::Asio library! > > Fixes: > - http://autobuild.buildroot.org/results/855b66b86d979cc922b947da932b0e2388481263 > > Signed-off-by: Fabrice Fontaine > --- > package/riscv-isa-sim/riscv-isa-sim.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk b/package/riscv-isa-sim/riscv-isa-sim.mk > index ee9067d304..90eed93c36 100644 > --- a/package/riscv-isa-sim/riscv-isa-sim.mk > +++ b/package/riscv-isa-sim/riscv-isa-sim.mk > @@ -9,5 +9,6 @@ RISCV_ISA_SIM_SITE = $(call github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA > RISCV_ISA_SIM_LICENSE = BSD-3-Clause > RISCV_ISA_SIM_LICENSE_FILES = LICENSE > HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc > +HOST_RISCV_ISA_SIM_CONF_OPTS = --with-boost=$(HOST_DIR) To be noted: riscv-isa-sim could also be configured with --without-boost and the build succeeds. Anyway: applied to master, thanks. Julien, do you know what ill-effect building without Boost would have? Regards, Yann E. MORIN. > $(eval $(host-autotools-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 20:28:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 21:28:02 +0100 Subject: [Buildroot] [git commit] paclage/tpm2-tss: do not select liburiparser Message-ID: <20220119202333.5A504832B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbb70493af20445fbd24de4c5a15ba0de7f27c6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 593683b45f72 (package/tpm2-tss: remove unused dependency) removed the build-time dependency (in the .mk), but forgot to remove it from the Config.in. Signed-off-by: Tilman Keskin??z [yann.morin.1998 at free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- package/tpm2-tss/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2fc56dbd76..857987ae36 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help From yann.morin.1998 at free.fr Wed Jan 19 20:33:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 21:33:33 +0100 Subject: [Buildroot] [PATCH 1/1] Dependency on liburiparser was removed In-Reply-To: <20220119155739.c5kzupm5njobmkn6@arved.priv.at> References: <20220119155739.c5kzupm5njobmkn6@arved.priv.at> Message-ID: <20220119203333.GB3095239@scaer> Tilman, All, On 2022-01-19 16:57 +0100, Tilman Keskin?z spake thusly: > From: Tilman Keskin?z > > Dependency was removed from Makefile in > 593683b45f72169dd94ec14fa18720b3cec9dda4 The commit title should mention the impacted package, and mention an action in the infinitive tense, like so: package/tpm2-tss: do not select liburiparser The commit log was mostly OK, if a bit confusing, so I reworded it with: Commit 593683b45f72 (package/tpm2-tss: remove unused dependency) removed the build-time dependency (in the .mk), but forgot to remove it from the Config.in. Applied to master with those changes (and for good measure, a typo of mine that I noticed too late, sorry). Thanks! Regards, Yann E. MORIN. > Signed-off-by: Tilman Keskin?z > --- > package/tpm2-tss/Config.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in > index 2fc56dbd76..857987ae36 100644 > --- a/package/tpm2-tss/Config.in > +++ b/package/tpm2-tss/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_TPM2_TSS > bool "tpm2-tss" > depends on !BR2_STATIC_LIBS # dlfcn.h > - select BR2_PACKAGE_LIBURIPARSER > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL > help > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 20:45:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 21:45:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220119084545.3642950-1-james.hilliard1@gmail.com> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> Message-ID: <20220119204518.GC3095239@scaer> James, All, On 2022-01-19 01:45 -0700, James Hilliard spake thusly: > The cmake build appears to be missing features such as pkg-config > generation support, switch to the regular makefile based build > which appears to work better. Can't we just fix the CMakeList.txt and submit a patch upstream, instead? Also, see below... > Signed-off-by: James Hilliard > --- > package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- > 1 file changed, 26 insertions(+), 4 deletions(-) > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > index b562d5d7ef..144c82339f 100644 > --- a/package/re2/re2.mk > +++ b/package/re2/re2.mk > @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause > RE2_LICENSE_FILES = LICENSE > RE2_INSTALL_STAGING = YES > > -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > +define RE2_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + -C $(@D) > +endef > > -$(eval $(cmake-package)) > -$(eval $(host-cmake-package)) > +define RE2_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install > +endef > + > +define RE2_INSTALL_TARGET_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install The 'install' target will forcibly build and install static and shared libs: https://github.com/google/re2/blob/main/Makefile#L297 296: .PHONY: install 297: install: static-install shared-install So, this is probably going to not play nicely for builds where a shared build is not possible. AFAICS, the cmake-based buildsystem got that one correct, though, so it would be a bit of a shame to regress on that point... Regards, Yann E. MORIN. > +endef > + > +define HOST_RE2_BUILD_CMDS > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > + -C $(@D) > +endef > + > +define HOST_RE2_INSTALL_CMDS > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install > +endef > + > +$(eval $(generic-package)) > +$(eval $(host-generic-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at gmail.com Wed Jan 19 20:54:05 2022 From: romain.naour at gmail.com (Romain Naour) Date: Wed, 19 Jan 2022 21:54:05 +0100 Subject: [Buildroot] [PATCHv2 6/7] configs: add new qemu defconfig 'x86_multilib' In-Reply-To: References: <20220115200306.14037-1-patrickdepinguin@gmail.com> <20220115200306.14037-7-patrickdepinguin@gmail.com> <13491b39-7995-1aa7-a2cb-5af43467bb95@gmail.com> Message-ID: <4b9211c6-6858-37a2-ec04-e677178780da@gmail.com> Hi Thomas, Le 18/01/2022 ? 13:02, Thomas De Schampheleire a ?crit?: > Hi Romain, > > El mar, 18 ene 2022 a las 12:51, Romain Naour > () escribi?: >> >> Hello Thomas, >> >> Le 18/01/2022 ? 12:19, Thomas De Schampheleire a ?crit : >>> Hi, >>> >>> El s?b, 15 ene 2022 a las 21:03, Thomas De Schampheleire >>> () escribi?: >>>> >>>> From: Thomas De Schampheleire >>>> >>>> Add a new qemu defconfig for an x86_64 target that will run an x86_64 kernel >>>> but userspace in 32-bit (x86) mode, using BR2_KERNEL_ARCH_OVERRIDE. >>>> >>>> Signed-off-by: Thomas De Schampheleire >>>> --- >>>> >>>> Note that the defconfig refers to a toolchain at >>>> autobuild.buildroot.org, but is not yet present at that location. >>>> I uploaded the toolchain temporarily to: >>>> http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11.tar.xz >>>> md5sum:b085c0d8f137c078f8f09d116d8364f8 >>>> sha256sum 2a5241d9274239532e44d37c65509931fbc120db5991412f946eb38176db4dc2 >>>> >>>> >>> >>> Romain Naour notified me that this toolchain does not run on the GCC >>> Farm (Illegal instruction) so I made a new version, currently uploaded >>> at: >>> http://patrickdepinguin.com/ctng-6737cfaa8ce6-x86_multilib-glibc-gcc11-2.tar.xz >>> md5sum: 3cee64f82675446ad255f6c165786eb5 >>> sha256sum: 6715bfbc195588b6483d39e9ec6d70611cac3b99bf2dd34fedbed0d4e6c7edc1 >> >> This toolchain doesn't work either. >> >> Did you tried with CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" ? >> With CT_EXTRA_CXXFLAGS_FOR_BUILD maybe or both. > > So you get the same error of 'Illegal instruction' ? > > Following config was used (both the config as the build log are part > of the archive): > > CT_CONFIG_VERSION="3" > # CT_PREFIX_DIR_RO is not set > CT_EXTRA_CFLAGS_FOR_BUILD="-march=x86-64" > CT_EXTRA_CXXFLAGS_FOR_BUILD="-march=x86-64" > CT_ARCH_X86=y > CT_MULTILIB=y > CT_ARCH_64=y > CT_STATIC_TOOLCHAIN=y I didn't enabled static toolchain option. Can you try without it. Notes: All Bootlin toolchain use glibc installed on the host, so we can't use really old systems. > CT_TARGET_VENDOR="multilib" > CT_KERNEL_LINUX=y > CT_GLIBC_KERNEL_VERSION_NONE=y > # CT_CREATE_LDSO_CONF is not set > CT_CC_GCC_MULTILIB_LIST="m64,m32" > CT_CC_GCC_LNK_HASH_STYLE_BOTH=y > CT_CC_LANG_CXX=y > CT_DEBUG_GDB=y > CT_ZLIB_NEEDED=y > > > >> >> Also, building with a Debian jessie docker container would allow to run the >> toolchain with old Glibc. > > The toolchain is built statically, so the glibc version on the host > does not matter. > Perhaps I misunderstand the problem you are referring to? I missed that your toolchain was build statically. Usually other prebuilt toolchain are not built statically. Best regards, Romain > > Thanks, > Thomas > From yann.morin.1998 at free.fr Wed Jan 19 21:25:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:25:35 +0100 Subject: [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) In-Reply-To: <20220118211434.9854-1-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> Message-ID: <20220119212535.GD3095239@scaer> Peter, All, On 2022-01-18 22:14 +0100, Peter Seiderer spake thusly: > Now based on 5.10.92 (from 5.10.78). > > Signed-off-by: Peter Seiderer Series of 6 patches applied to master, thanks. I'll further reply to patch 6 with details specific to it... Regards, Yann E. MORIN. > --- > configs/raspberrypi0_defconfig | 2 +- > configs/raspberrypi0w_defconfig | 2 +- > configs/raspberrypi2_defconfig | 2 +- > configs/raspberrypi3_64_defconfig | 2 +- > configs/raspberrypi3_defconfig | 2 +- > configs/raspberrypi3_qt5we_defconfig | 2 +- > configs/raspberrypi4_64_defconfig | 2 +- > configs/raspberrypi4_defconfig | 2 +- > configs/raspberrypi_defconfig | 2 +- > configs/raspberrypicm4io_64_defconfig | 2 +- > configs/raspberrypicm4io_defconfig | 2 +- > configs/raspberrypizero2w_defconfig | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig > index 64f7a93377..4506e94bce 100644 > --- a/configs/raspberrypi0_defconfig > +++ b/configs/raspberrypi0_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > > # Build the DTBs for A/B from the kernel sources: the zero is the same > diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig > index f3e7c453ab..7a35794c2d 100644 > --- a/configs/raspberrypi0w_defconfig > +++ b/configs/raspberrypi0w_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" > diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig > index 7befbf07e6..9b484c5588 100644 > --- a/configs/raspberrypi2_defconfig > +++ b/configs/raspberrypi2_defconfig > @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig > index ebb6e2252b..4d838ae0e8 100644 > --- a/configs/raspberrypi3_64_defconfig > +++ b/configs/raspberrypi3_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig > index 6a9c4e0d02..0a59ab42a9 100644 > --- a/configs/raspberrypi3_defconfig > +++ b/configs/raspberrypi3_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig > index 7d06b0bb5e..40d0c0f888 100644 > --- a/configs/raspberrypi3_qt5we_defconfig > +++ b/configs/raspberrypi3_qt5we_defconfig > @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > index 2b5446d8f1..5942f7c4e1 100644 > --- a/configs/raspberrypi4_64_defconfig > +++ b/configs/raspberrypi4_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > index ac555ddd5e..4e5580c140 100644 > --- a/configs/raspberrypi4_defconfig > +++ b/configs/raspberrypi4_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig > index 257e59536e..cca53f9b37 100644 > --- a/configs/raspberrypi_defconfig > +++ b/configs/raspberrypi_defconfig > @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > > # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources > diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig > index 1ab379c557..29cb0472d7 100644 > --- a/configs/raspberrypicm4io_64_defconfig > +++ b/configs/raspberrypicm4io_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig > index 9941754e25..017aecc0dd 100644 > --- a/configs/raspberrypicm4io_defconfig > +++ b/configs/raspberrypicm4io_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig > index ddd6b97b06..2ea503ca24 100644 > --- a/configs/raspberrypizero2w_defconfig > +++ b/configs/raspberrypizero2w_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:28:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:28:19 +0100 Subject: [Buildroot] [PATCH v1 6/6] package/brcmfmac_sdio-firmware-rpi: new package (former rpi-bt-firmware/rpi-wifi-firmware) In-Reply-To: <20220118211434.9854-6-ps.report@gmx.net> References: <20220118211434.9854-1-ps.report@gmx.net> <20220118211434.9854-6-ps.report@gmx.net> Message-ID: <20220119212819.GE3095239@scaer> Peter, All, On 2022-01-18 22:14 +0100, Peter Seiderer spake thusly: > Move rpi-bt-firmware and rpi-wifi-firmware packages to the new > brcmfmac_sdio-firmware-rpi one (as they share the same donwload). $ make check-package Config.in.legacy:157: line contains trailing whitespace Config.in.legacy:166: line contains trailing whitespace package/Config.in:423: Packages in: menu "Firmware", are not alphabetically ordered; correct order: '-', '_', digits, capitals, lowercase; first incorrect package: b43-firmware package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:12: consecutive empty lines package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:15: expected indent with tabs package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:16: expected indent with tabs I've fixed that. > Signed-off-by: Peter Seiderer > --- > Notes: > - patch moved after the rpi-bt-firmware/rpi-wifi-firmware version bump > as it saves some code/download duplication but the new package/name > is harder to find/remember... Yet, the new package name is the upstream package name, which I believe is better to follow. [--SNIP--] > diff --git a/Config.in.legacy b/Config.in.legacy > index dd64b7da1b..465d7bef90 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,24 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_RPI_BT_FIRMWARE > + bool "rpi-bt-firmware package was renamed" The original symbols did depend on arm || aarch64, so I kept that dependency for both legacy symbols. Applied to master, thanks. Regards, Yann E. MORIN. > + select BR2_LEGACY > + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI > + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT > + help > + Package rpi-bt-firmware was moved as option to > + package brcmfmac-sdio-firmware-rpi. > + > +config BR2_PACKAGE_RPI_WIFI_FIRMWARE > + bool "rpi-wifi-firmware package was renamed" > + select BR2_LEGACY > + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI > + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI > + help > + Package rpi-wifi-firmware was moved as option to > + package brcmfmac-sdio-firmware-rpi. > + > config BR2_PACKAGE_HOST_GDB_PYTHON > bool "GDB Python2 support removed" > select BR2_LEGACY > diff --git a/DEVELOPERS b/DEVELOPERS > index a91e2dfcde..dc810b6fe1 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1832,12 +1832,11 @@ F: configs/qemu_riscv64_virt_defconfig > N: Martin Bark > F: board/raspberrypi/ > F: configs/raspberrypi3_defconfig > +F: package/brcmfmac_sdio-firmware-rpi/ > F: package/ca-certificates/ > F: package/connman/ > F: package/nodejs/ > -F: package/rpi-bt-firmware/ > F: package/rpi-firmware/ > -F: package/rpi-wifi-firmware/ > F: package/tzdata/ > F: package/zic/ > > diff --git a/package/Config.in b/package/Config.in > index 4df1474b91..3b38af7232 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -419,15 +419,14 @@ menu "Hardware handling" > menu "Firmware" > source "package/am33x-cm3/Config.in" > source "package/armbian-firmware/Config.in" > + source "package/brcmfmac_sdio-firmware-rpi/Config.in" > source "package/b43-firmware/Config.in" > source "package/linux-firmware/Config.in" > source "package/murata-cyw-fw/Config.in" > source "package/odroidc2-firmware/Config.in" > source "package/qcom-db410c-firmware/Config.in" > source "package/rcw-smarc-sal28/Config.in" > - source "package/rpi-bt-firmware/Config.in" > source "package/rpi-firmware/Config.in" > - source "package/rpi-wifi-firmware/Config.in" > source "package/sunxi-boards/Config.in" > source "package/ts4900-fpga/Config.in" > source "package/ux500-firmware/Config.in" > diff --git a/package/brcmfmac_sdio-firmware-rpi/Config.in b/package/brcmfmac_sdio-firmware-rpi/Config.in > new file mode 100644 > index 0000000000..73f400a2b7 > --- /dev/null > +++ b/package/brcmfmac_sdio-firmware-rpi/Config.in > @@ -0,0 +1,29 @@ > +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI > + bool "brcmfmac-sdio-firmware-rpi" > + depends on BR2_arm || BR2_aarch64 > + help > + Raspberry Broadcom Bluetooth and Wifi firmware. > + > + https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi > + > +if BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI > + > +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT > + bool "brcmfmac-sdio-firmware-rpi-bt" > + help > + Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module > + firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 > + Bluetooth module firmware. > + > +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI > + bool "brcmfmac-sdio-firmware-rpi-wifi" > + depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > + help > + Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module > + NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 > + wifi module NVRAM data. > + > +comment "brcmfmac-sdio-firmware-rpi-wifi conflicts with linux-firmware Broadcom BRCM bcm43xx" > + depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > + > +endif > diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash > similarity index 68% > rename from package/rpi-wifi-firmware/rpi-wifi-firmware.hash > rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash > index 7ff47b8cfe..a12e92cbac 100644 > --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash > +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz > +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz > sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx > diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk > similarity index 61% > rename from package/rpi-wifi-firmware/rpi-wifi-firmware.mk > rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk > index b54cd359a4..4d1f285442 100644 > --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk > +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk > @@ -1,15 +1,24 @@ > ################################################################################ > # > -# rpi-wifi-firmware > +# brcmfmac_sdio-firmware-rpi > # > ################################################################################ > > -RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d > -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) > -RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY > -RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx > +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d > +BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) > +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY > +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx > > -define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS > + > +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) > +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT > + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm > + $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm > +endef > +endif > + > +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) > +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI > $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm > $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm > ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin > @@ -24,5 +33,11 @@ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS > $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress > $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress > endef > +endif > + > +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS > + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT) > + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI) > +endef > > $(eval $(generic-package)) > diff --git a/package/rpi-bt-firmware/Config.in b/package/rpi-bt-firmware/Config.in > deleted file mode 100644 > index 45643d6a52..0000000000 > --- a/package/rpi-bt-firmware/Config.in > +++ /dev/null > @@ -1,9 +0,0 @@ > -config BR2_PACKAGE_RPI_BT_FIRMWARE > - bool "rpi-bt-firmware" > - depends on BR2_arm || BR2_aarch64 > - help > - Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module > - firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 > - Bluetooth module firmware. > - > - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi > diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash > deleted file mode 100644 > index a575a02e97..0000000000 > --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash > +++ /dev/null > @@ -1,3 +0,0 @@ > -# Locally computed > -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz > -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx > diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk > deleted file mode 100644 > index f2d54f33bf..0000000000 > --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk > +++ /dev/null > @@ -1,17 +0,0 @@ > -################################################################################ > -# > -# rpi-bt-firmware > -# > -################################################################################ > - > -RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d > -RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) > -RPI_BT_FIRMWARE_LICENSE = PROPRIETARY > -RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx > - > -define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS > - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm > - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm > -endef > - > -$(eval $(generic-package)) > diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in > deleted file mode 100644 > index 7e81b286c0..0000000000 > --- a/package/rpi-wifi-firmware/Config.in > +++ /dev/null > @@ -1,13 +0,0 @@ > -config BR2_PACKAGE_RPI_WIFI_FIRMWARE > - bool "rpi-wifi-firmware" > - depends on BR2_arm || BR2_aarch64 > - depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > - help > - Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module > - NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 > - wifi module NVRAM data. > - > - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi > - > -comment "rpi-wifi-firmware conflicts with linux-firmware Broadcom BRCM bcm43xx" > - depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:12:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:12:06 +0100 Subject: [Buildroot] [git commit] package/rpi-bt-firmware: bump version to ea9963f Message-ID: <20220119212206.04AB981763@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=520b760a5320b1995ffd70f607a18964b3c0c2b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Chanelog (since 3888ba2): - Sync with RPi-Distro repo Switch to "bullseye" branch which moved several firmware files to the cypress dir. Add 43438 firmware 7.45.98.118 + external clm_blob Add 43455 firmware 7.45.241 and clm_blob - README.md: update link to RPi-distro repo wifi firmware files - Merge pull request #19 from HiassofT/2021-12 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash index 7e60aa4632..a575a02e97 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-bt-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 8d658ce435..f2d54f33bf 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef +RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx From yann.morin.1998 at free.fr Wed Jan 19 21:12:04 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:12:04 +0100 Subject: [Buildroot] [git commit] package/rpi-userland: bump version to 14b90ff Message-ID: <20220119212205.EFB84835A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a71f9f8276d0d74a25760dfd7937dcb9cb212f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: f5404b2 raspicam: Check system is running legacy camera stack 14b90ff mmal: Hack to make mmal core register VideoCore components Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-userland/rpi-userland.hash | 2 +- package/rpi-userland/rpi-userland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 8ea184a4f6..b837cfe709 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 16c01befff64ebc11a0554e487b00939ed7a716f68dc795db4880b35bb25fa41 rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz +sha256 bb682f3c20bc5c7877531d5666c8dcc674a2f347aa792cf979dc0b07b6261e77 rpi-userland-14b90ff9d9f031391a299e6e006965d02bfd1bb1.tar.gz sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 09a7f6af74..84050b6df3 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = bab9bf8790cd69660d443ce43b4e372999f3f7ac +RPI_USERLAND_VERSION = 14b90ff9d9f031391a299e6e006965d02bfd1bb1 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE From yann.morin.1998 at free.fr Wed Jan 19 21:12:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:12:10 +0100 Subject: [Buildroot] [git commit] package/rpi-wifi-firmware bump version to ea9963f Message-ID: <20220119212206.0C7E78359D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ccb5f9dbe34cdbc54fdf658f5612fbce4bf0f94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add cypress files - update links Chanelog (since 3888ba2): - Sync with RPi-Distro repo Switch to "bullseye" branch which moved several firmware files to the cypress dir. Add 43438 firmware 7.45.98.118 + external clm_blob Add 43455 firmware 7.45.241 and clm_blob Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index 09cd197dd8..7ff47b8cfe 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-wifi-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index a467f2c7b4..b54cd359a4 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef +RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx @@ -12,9 +12,17 @@ RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin + ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob + ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt + ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt + ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin + ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress endef $(eval $(generic-package)) From yann.morin.1998 at free.fr Wed Jan 19 21:11:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:11:58 +0100 Subject: [Buildroot] [git commit] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Message-ID: <20220119212205.DC9FE81763@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a8a6dc41c0571c3cd466ade890b4ed1209ca0e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now based on 5.10.92 (from 5.10.78). Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- configs/raspberrypicm4io_64_defconfig | 2 +- configs/raspberrypicm4io_defconfig | 2 +- configs/raspberrypizero2w_defconfig | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 64f7a93377..4506e94bce 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index f3e7c453ab..7a35794c2d 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 7befbf07e6..9b484c5588 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index ebb6e2252b..4d838ae0e8 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 6a9c4e0d02..0a59ab42a9 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 7d06b0bb5e..40d0c0f888 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 2b5446d8f1..5942f7c4e1 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index ac555ddd5e..4e5580c140 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 257e59536e..cca53f9b37 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 1ab379c557..29cb0472d7 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 9941754e25..017aecc0dd 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index ddd6b97b06..2ea503ca24 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources From yann.morin.1998 at free.fr Wed Jan 19 21:12:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:12:00 +0100 Subject: [Buildroot] [git commit] package/rpi-firmware: bump version to 3f20b83 Message-ID: <20220119212205.E58CE8359D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9958744a0cddfd01e8359ab560e04e9a8cdd5578 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: 095deea759 kernel: overlays: vc4-kms-v3d: Change composite handling 2e9b609e53c kernel: Bump to 5.10.79 12bc6e36773 firmware: dtoverlay: Rebase aliases in overlays like labels 24d966d35bb kernel: Bump to 5.10.81 ca52e7c1303 kernel: edt-ft5x06 touchscreen fixes 1a0297bfbf7 kernel: Bump to 5.10.82 0a1a871d04c kernel: Fix for IN Token of USB Endpoint 1 stopping occasionally on Pi 4 303d0012cd7 kernel: Bump to 5.10.83 bd8b6d5dc8e kernel: Bump to 5.10.85 56f1b8bbc88 kernel: Bump to 5.10.87 536baf33ae9 kernel: Bump to 5.10.88 ce71e3e9b34 kernel: Bump to 5.10.89 19b570d0d6a firmware: arm-loader: Fix kernel8.img selection on 2837 with arm_64bit=1 fbbde90b709 kernel: drm/vc4: fix non-working audio on RPi3 and no video with DVI 165bd7bc562 firmware: improve firmware camera detection 318e3373496 kernel: Bump to 5.10.90 175984a6dc4 kernel: drm/vc4: Add alpha_blend_mode property to each plane 20c5829b0af kernel: Bump to 5.10.92 3f20b832b27 firmware: arm_loader: Only clip min/max to the same value for turbo clocks Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- 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 7cbfd1b249..ec13115f3b 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a079a31fc80a23421589edcacef94faa713b12d3e77b92710ae2594c8d549477 rpi-firmware-fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25.tar.gz +sha256 33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index f773f83999..b46a7f5270 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25 +RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From yann.morin.1998 at free.fr Wed Jan 19 21:24:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:24:11 +0100 Subject: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware Message-ID: <20220119212206.1ACA681763@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7527324132878f98999539bdd97bd3518747f585 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Move rpi-bt-firmware and rpi-wifi-firmware packages to the new brcmfmac_sdio-firmware-rpi one (as they are the same upstream package). Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: - fix check-package - legacy symbols still depend on arm || aarch64 ] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 20 +++++++++++++++ DEVELOPERS | 3 +-- package/Config.in | 3 +-- package/brcmfmac_sdio-firmware-rpi/Config.in | 29 ++++++++++++++++++++++ .../brcmfmac_sdio-firmware-rpi.hash} | 2 +- .../brcmfmac_sdio-firmware-rpi.mk} | 26 ++++++++++++++----- package/rpi-bt-firmware/Config.in | 9 ------- package/rpi-bt-firmware/rpi-bt-firmware.hash | 3 --- package/rpi-bt-firmware/rpi-bt-firmware.mk | 17 ------------- package/rpi-wifi-firmware/Config.in | 13 ---------- 10 files changed, 72 insertions(+), 53 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index dd64b7da1b..c11cb846fb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,26 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_RPI_BT_FIRMWARE + bool "rpi-bt-firmware package was renamed" + depends on BR2_arm || BR2_aarch64 + select BR2_LEGACY + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT + help + Package rpi-bt-firmware was moved as option to + package brcmfmac-sdio-firmware-rpi. + +config BR2_PACKAGE_RPI_WIFI_FIRMWARE + bool "rpi-wifi-firmware package was renamed" + depends on BR2_arm || BR2_aarch64 + select BR2_LEGACY + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI + help + Package rpi-wifi-firmware was moved as option to + package brcmfmac-sdio-firmware-rpi. + config BR2_PACKAGE_HOST_GDB_PYTHON bool "GDB Python2 support removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a91e2dfcde..dc810b6fe1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1832,12 +1832,11 @@ F: configs/qemu_riscv64_virt_defconfig N: Martin Bark F: board/raspberrypi/ F: configs/raspberrypi3_defconfig +F: package/brcmfmac_sdio-firmware-rpi/ F: package/ca-certificates/ F: package/connman/ F: package/nodejs/ -F: package/rpi-bt-firmware/ F: package/rpi-firmware/ -F: package/rpi-wifi-firmware/ F: package/tzdata/ F: package/zic/ diff --git a/package/Config.in b/package/Config.in index 4df1474b91..85188ff873 100644 --- a/package/Config.in +++ b/package/Config.in @@ -420,14 +420,13 @@ menu "Firmware" source "package/am33x-cm3/Config.in" source "package/armbian-firmware/Config.in" source "package/b43-firmware/Config.in" + source "package/brcmfmac_sdio-firmware-rpi/Config.in" source "package/linux-firmware/Config.in" source "package/murata-cyw-fw/Config.in" source "package/odroidc2-firmware/Config.in" source "package/qcom-db410c-firmware/Config.in" source "package/rcw-smarc-sal28/Config.in" - source "package/rpi-bt-firmware/Config.in" source "package/rpi-firmware/Config.in" - source "package/rpi-wifi-firmware/Config.in" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" diff --git a/package/brcmfmac_sdio-firmware-rpi/Config.in b/package/brcmfmac_sdio-firmware-rpi/Config.in new file mode 100644 index 0000000000..73f400a2b7 --- /dev/null +++ b/package/brcmfmac_sdio-firmware-rpi/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + bool "brcmfmac-sdio-firmware-rpi" + depends on BR2_arm || BR2_aarch64 + help + Raspberry Broadcom Bluetooth and Wifi firmware. + + https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi + +if BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI + +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT + bool "brcmfmac-sdio-firmware-rpi-bt" + help + Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module + firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 + Bluetooth module firmware. + +config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI + bool "brcmfmac-sdio-firmware-rpi-wifi" + depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX + help + Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module + NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 + wifi module NVRAM data. + +comment "brcmfmac-sdio-firmware-rpi-wifi conflicts with linux-firmware Broadcom BRCM bcm43xx" + depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX + +endif diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash similarity index 68% rename from package/rpi-wifi-firmware/rpi-wifi-firmware.hash rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index 7ff47b8cfe..a12e92cbac 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz +sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk similarity index 62% rename from package/rpi-wifi-firmware/rpi-wifi-firmware.mk rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index b54cd359a4..5332bf53d7 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -1,15 +1,23 @@ ################################################################################ # -# rpi-wifi-firmware +# brcmfmac_sdio-firmware-rpi # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d -RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) -RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY -RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx -define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm +endef +endif + +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin @@ -24,5 +32,11 @@ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress endef +endif + +define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT) + $(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI) +endef $(eval $(generic-package)) diff --git a/package/rpi-bt-firmware/Config.in b/package/rpi-bt-firmware/Config.in deleted file mode 100644 index 45643d6a52..0000000000 --- a/package/rpi-bt-firmware/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_RPI_BT_FIRMWARE - bool "rpi-bt-firmware" - depends on BR2_arm || BR2_aarch64 - help - Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module - firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0 - Bluetooth module firmware. - - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash deleted file mode 100644 index a575a02e97..0000000000 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk deleted file mode 100644 index f2d54f33bf..0000000000 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# rpi-bt-firmware -# -################################################################################ - -RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d -RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) -RPI_BT_FIRMWARE_LICENSE = PROPRIETARY -RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx - -define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm -endef - -$(eval $(generic-package)) diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in deleted file mode 100644 index 7e81b286c0..0000000000 --- a/package/rpi-wifi-firmware/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_RPI_WIFI_FIRMWARE - bool "rpi-wifi-firmware" - depends on BR2_arm || BR2_aarch64 - depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX - help - Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module - NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455 - wifi module NVRAM data. - - https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi - -comment "rpi-wifi-firmware conflicts with linux-firmware Broadcom BRCM bcm43xx" - depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX From yann.morin.1998 at free.fr Wed Jan 19 21:34:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:34:35 +0100 Subject: [Buildroot] [git commit] package/efl: change download URL to https Message-ID: <20220119213205.91B398359C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3d5b27d5d24079d6c30c568c58e3a5e7c6e3fc7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: canonicalise homepage] Signed-off-by: Yann E. MORIN --- package/efl/Config.in | 2 +- package/efl/efl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 05ded72cf7..eb9c7aebd9 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_EFL help Enlightenment Foundation Libraries - https://enlightenment.org + https://www.enlightenment.org/ if BR2_PACKAGE_EFL diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 46bce29305..ed0a8acc1d 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -6,7 +6,7 @@ EFL_VERSION = 1.26.0 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl +EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ From yann.morin.1998 at free.fr Wed Jan 19 21:34:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:34:43 +0100 Subject: [Buildroot] [git commit] package/enlightenment: change download URL to https Message-ID: <20220119213205.9A7FF835AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6297befe176a2f33b8c598139f73d7e0b9f91c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: also change in Config.in] Signed-off-by: Yann E. MORIN --- package/enlightenment/Config.in | 2 +- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index cd2b8cfe54..cdf4d9211f 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_ENLIGHTENMENT KDE. Enlightenment can be used as a substitute for a full desktop environment. - http://www.enlightenment.org/ + https://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.9" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 640d5a62bb..24bbd96cd0 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -6,7 +6,7 @@ ENLIGHTENMENT_VERSION = 0.25.0 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt From yann.morin.1998 at free.fr Wed Jan 19 21:39:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:39:36 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/efl: change download URL to https In-Reply-To: <20220118201709.25366-1-ps.report@gmx.net> References: <20220118201709.25366-1-ps.report@gmx.net> Message-ID: <20220119213936.GF3095239@scaer> Peter, All, On 2022-01-18 21:17 +0100, Peter Seiderer spake thusly: > Signed-off-by: Peter Seiderer > --- > package/efl/efl.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/efl/efl.mk b/package/efl/efl.mk > index 46bce29305..ed0a8acc1d 100644 > --- a/package/efl/efl.mk > +++ b/package/efl/efl.mk > @@ -6,7 +6,7 @@ > > EFL_VERSION = 1.26.0 > EFL_SOURCE = efl-$(EFL_VERSION).tar.xz > -EFL_SITE = http://download.enlightenment.org/rel/libs/efl > +EFL_SITE = https://download.enlightenment.org/rel/libs/efl I also made the home page canonical in Config.in (see my reply to next patch to see hos I noticed). Applied to master, thanks. Regards, Yann E. MORIN. > EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT > EFL_LICENSE_FILES = \ > COMPLIANCE \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:40:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:40:27 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/enlightenment: change download URL to https In-Reply-To: <20220118201709.25366-2-ps.report@gmx.net> References: <20220118201709.25366-1-ps.report@gmx.net> <20220118201709.25366-2-ps.report@gmx.net> Message-ID: <20220119214027.GG3095239@scaer> Peter, All. On 2022-01-18 21:17 +0100, Peter Seiderer spake thusly: > Signed-off-by: Peter Seiderer > --- > package/enlightenment/enlightenment.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk > index 640d5a62bb..24bbd96cd0 100644 > --- a/package/enlightenment/enlightenment.mk > +++ b/package/enlightenment/enlightenment.mk > @@ -6,7 +6,7 @@ > > ENLIGHTENMENT_VERSION = 0.25.0 > ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz > -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment > +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment I also switched the homepage in Config.in to https, and that's how I noticed that the EFL homepage was not canonical. Applied to master, thanks. Regards, Yann E. MORIN. > ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) > ENLIGHTENMENT_LICENSE_FILES = COPYING \ > src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:45:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:45:22 +0100 Subject: [Buildroot] [git commit] package/strace: bump version to 5.16 Message-ID: <20220119213919.BF8788351F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6775e3e47689088589e0a2448b4033a1bd2853e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - update license file hash for COPYING (copyright year update) Changelog (from [1]): Noteworthy changes in strace 5.16 (2022-01-10) ============================================== * Improvements * Implemented --secontext=mismatch option to find mismatches in SELinux contexts. * Implemented decoding of futex_waitv syscall introduced in Linux 5.16. * Implemented decoding of BPF_LINK_GET_NEXT_ID and BPF_LINK_GET_FD_BY_ID bpf syscall commands. * Enhanced decoding of BPF_MAP_CREATE, BPF_PROG_TEST_RUN, and BPF_PROG_LOAD bpf syscall commands. * Enhanced decoding of BTRFS_IOC_FS_INFO ioctl command. * Updated lists of AUDIT_*, BPF_*, BTRFS_*, DEVCONF_*, FAN_*, ETH_P_*, IPV4_DEVCONF_*, KVM_*, NDA_*, SO_*, and V4L2_* constants. * Updated lists of ioctl commands from Linux 5.16. * Bug fixes * Fixed build for older Android. [1] https://strace.io/files/5.16/ Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index ff89447bfd..30c90e8e39 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.15/strace-5.15.tar.xz.asc -sha256 ebcac22f297335294dc654425cbc3ce013343bece6da2699e3aec86aee8d72dc strace-5.15.tar.xz -sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING +# https://strace.io/files/5.16/strace-5.16.tar.xz.asc +sha256 dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285 strace-5.16.tar.xz +sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 4b70531aa7..c8c3590f6e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.15 +STRACE_VERSION = 5.16 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Jan 19 21:46:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:46:21 +0100 Subject: [Buildroot] [PATCH v1] package/strace: bump version to 5.16 In-Reply-To: <20220118161853.27777-1-ps.report@gmx.net> References: <20220118161853.27777-1-ps.report@gmx.net> Message-ID: <20220119214621.GH3095239@scaer> Peter, All, On 2022-01-18 17:18 +0100, Peter Seiderer spake thusly: > - update license file hash for COPYING (copyright year update) > > Changelog (from [1]): > > Noteworthy changes in strace 5.16 (2022-01-10) > ============================================== > > * Improvements > * Implemented --secontext=mismatch option to find mismatches in SELinux > contexts. > * Implemented decoding of futex_waitv syscall introduced in Linux 5.16. > * Implemented decoding of BPF_LINK_GET_NEXT_ID and BPF_LINK_GET_FD_BY_ID bpf > syscall commands. > * Enhanced decoding of BPF_MAP_CREATE, BPF_PROG_TEST_RUN, and BPF_PROG_LOAD > bpf syscall commands. > * Enhanced decoding of BTRFS_IOC_FS_INFO ioctl command. > * Updated lists of AUDIT_*, BPF_*, BTRFS_*, DEVCONF_*, FAN_*, ETH_P_*, > IPV4_DEVCONF_*, KVM_*, NDA_*, SO_*, and V4L2_* constants. > * Updated lists of ioctl commands from Linux 5.16. > > * Bug fixes > * Fixed build for older Android. > > [1] https://strace.io/files/5.16/ > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/strace/strace.hash | 6 +++--- > package/strace/strace.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/strace/strace.hash b/package/strace/strace.hash > index ff89447bfd..30c90e8e39 100644 > --- a/package/strace/strace.hash > +++ b/package/strace/strace.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 > -# https://strace.io/files/5.15/strace-5.15.tar.xz.asc > -sha256 ebcac22f297335294dc654425cbc3ce013343bece6da2699e3aec86aee8d72dc strace-5.15.tar.xz > -sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING > +# https://strace.io/files/5.16/strace-5.16.tar.xz.asc > +sha256 dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285 strace-5.16.tar.xz > +sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING > sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later > diff --git a/package/strace/strace.mk b/package/strace/strace.mk > index 4b70531aa7..c8c3590f6e 100644 > --- a/package/strace/strace.mk > +++ b/package/strace/strace.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -STRACE_VERSION = 5.15 > +STRACE_VERSION = 5.16 > STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz > STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) > STRACE_LICENSE = LGPL-2.1+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:46:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:46:49 +0100 Subject: [Buildroot] [git commit] package/gnuplot: bump version to 5.4.3 Message-ID: <20220119214115.A86F48351F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a4300e8261f352f9e4af5e569fd55ad944843f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Fischer Signed-off-by: Yann E. MORIN --- package/gnuplot/gnuplot.hash | 6 +++--- package/gnuplot/gnuplot.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index fc166205d0..1cc14973d1 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/ -md5 2050ca477199a591543bc968aba7d899 gnuplot-5.4.2.tar.gz -sha1 2e076b29f38bfcb841cb5eb3377fd1a469ced1ac gnuplot-5.4.2.tar.gz +md5 9bb03cfa77e38924e08ffbb9eb59d8b1 gnuplot-5.4.3.tar.gz +sha1 c4b60fd7a700b22fa62b14829cbb0e17911627c9 gnuplot-5.4.3.tar.gz # Locally computed -sha256 e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba gnuplot-5.4.2.tar.gz +sha256 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 gnuplot-5.4.3.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 436d3e5f92..6cf36a0997 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.2 +GNUPLOT_VERSION = 5.4.3 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From yann.morin.1998 at free.fr Wed Jan 19 21:48:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:48:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuplot: bump version to 5.4.3 In-Reply-To: <20220118081331.30088-1-mf@go-sys.de> References: <20220118081331.30088-1-mf@go-sys.de> Message-ID: <20220119214814.GI3095239@scaer> Michael, All, On 2022-01-18 09:13 +0100, Michael Fischer spake thusly: > Signed-off-by: Michael Fischer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gnuplot/gnuplot.hash | 6 +++--- > package/gnuplot/gnuplot.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash > index fc166205d0..1cc14973d1 100644 > --- a/package/gnuplot/gnuplot.hash > +++ b/package/gnuplot/gnuplot.hash > @@ -1,6 +1,6 @@ > # From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/ > -md5 2050ca477199a591543bc968aba7d899 gnuplot-5.4.2.tar.gz > -sha1 2e076b29f38bfcb841cb5eb3377fd1a469ced1ac gnuplot-5.4.2.tar.gz > +md5 9bb03cfa77e38924e08ffbb9eb59d8b1 gnuplot-5.4.3.tar.gz > +sha1 c4b60fd7a700b22fa62b14829cbb0e17911627c9 gnuplot-5.4.3.tar.gz > # Locally computed > -sha256 e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba gnuplot-5.4.2.tar.gz > +sha256 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 gnuplot-5.4.3.tar.gz > sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright > diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk > index 436d3e5f92..6cf36a0997 100644 > --- a/package/gnuplot/gnuplot.mk > +++ b/package/gnuplot/gnuplot.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GNUPLOT_VERSION = 5.4.2 > +GNUPLOT_VERSION = 5.4.3 > GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) > GNUPLOT_LICENSE = gnuplot license (open source) > GNUPLOT_LICENSE_FILES = Copyright > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:53:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:53:51 +0100 Subject: [Buildroot] [PATCH] configs/cubieboard2: U-Boot needs Python3 & OpenSSL In-Reply-To: <20220117192017.8841-1-abrodkin@synopsys.com> References: <20220117192017.8841-1-abrodkin@synopsys.com> Message-ID: <20220119215351.GA3252931@scaer> Alexey, All, On 2022-01-17 22:20 +0300, Alexey Brodkin via buildroot spake thusly: > After update of the U-Boot [1] we were missing dependency on Python3, > and so were seeing failures like in [2]: > ------------------------->8-------------------- > HOSTLD scripts/dtc/dtc > scripts/dtc/pylibfdt/libfdt_wrap.c:154:11: fatal error: Python.h: No such file or directory > 154 | # include > | ^~~~~~~~~~ > compilation terminated. > error: command '/usr/bin/gcc' failed with exit code 1 > ------------------------->8-------------------- > > So that get fixed with "BR2_TARGET_UBOOT_NEEDS_PYTHON3=y". > And then once we use Python3, we also need OpenSSL, similarly to [3] > and the likes. So do it with "BR2_TARGET_UBOOT_NEEDS_OPENSSL=y". > > Hopefully now all starts to build w/o any issues. > > And while at it let's add a bit more structure to the config! > > [1] https://git.buildroot.net/buildroot/commit/?id=06f10a88f30b73aaea5c0e0888d7ba9d9a6420f3 > [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650570 > [3] https://git.buildroot.net/buildroot/commit/?id=cf2a7663ccc6089e98e0d6ec39fa8623749c0c24 > > Signed-off-by: Alexey Brodkin Applied to master, thanks. > --- > > P.S. I didn't see that problem on the U-Boot bump, as I built all > locally and quite obviously had Python3 and all the headers installed > in the system. Yeah, happens to each and all of us. ;-) Regards, Yann E. MORIN. > --- > configs/cubieboard2_defconfig | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig > index a9356295c1..18337fac72 100644 > --- a/configs/cubieboard2_defconfig > +++ b/configs/cubieboard2_defconfig > @@ -1,32 +1,42 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_NEON_VFPV4=y > + > # Linux headers same as kernel, a 5.15 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" > -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" > -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" > + > +# Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" > BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > BR2_PACKAGE_HOST_UBOOT_TOOLS=y > BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" > + > +# System > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 19 21:50:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 19 Jan 2022 22:50:41 +0100 Subject: [Buildroot] [git commit] configs/cubieboard2: U-Boot needs Python3 & OpenSSL Message-ID: <20220119214719.4DE0582235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=507b1b9770142f9dba418653b1285a65252de705 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master After update of the U-Boot [1] we were missing dependency on Python3, and so were seeing failures like in [2]: ------------------------->8-------------------- HOSTLD scripts/dtc/dtc scripts/dtc/pylibfdt/libfdt_wrap.c:154:11: fatal error: Python.h: No such file or directory 154 | # include | ^~~~~~~~~~ compilation terminated. error: command '/usr/bin/gcc' failed with exit code 1 ------------------------->8-------------------- So that get fixed with "BR2_TARGET_UBOOT_NEEDS_PYTHON3=y". And then once we use Python3, we also need OpenSSL, similarly to [3] and the likes. So do it with "BR2_TARGET_UBOOT_NEEDS_OPENSSL=y". Hopefully now all starts to build w/o any issues. And while at it let's add a bit more structure to the config! [1] https://git.buildroot.net/buildroot/commit/?id=06f10a88f30b73aaea5c0e0888d7ba9d9a6420f3 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/1946650570 [3] https://git.buildroot.net/buildroot/commit/?id=cf2a7663ccc6089e98e0d6ec39fa8623749c0c24 Signed-off-by: Alexey Brodkin Signed-off-by: Yann E. MORIN --- configs/cubieboard2_defconfig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index a9356295c1..18337fac72 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,32 +1,42 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y + # Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y From giulio.benetti at benettiengineering.com Wed Jan 19 22:23:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 19 Jan 2022 23:23:32 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> Message-ID: <20220119222332.66485-1-giulio.benetti@benettiengineering.com> From: Maxime Chevallier Some rules in the refpolicy are declared with "dontaudit", effectively suppressing any AVC violation log, while still denying the actions. This is useful in some cases, where denied actions are to be expected but won't prevent the system from operating. However in some other cases, the suppressed logs are important to troubleshoot some issues. Disabling the "dontaudit" rules can be done either from the running system by rebuilding the policy with "semodules -DB", or when initialy building the policy by using the "enableaudit" make target. This commit allows building the refpolicy with the "enableaudit" target prior to installing it, thanks to a dedicated config option. Signed-off-by: Maxime Chevallier Signed-off-by: Giulio Benetti [Giulio: moved REFPOLICY_POST_BUILD_HOOKS inside ifeq/endef] --- Maxime: V1->V2: * Use POST_BUILD_HOOKS to summon make enableaudit, as per Antoine Tenart and Thomas petazzoni's reviews Giulio: V2->V3: * moved REFPOLICY_POST_BUILD_HOOKS into ifeq/endef as suggested by Antoine Tenart NOTE: this patch superseeds V2: https://patchwork.ozlabs.org/project/buildroot/patch/20210128125256.1419587-1-maxime.chevallier at bootlin.com/ --- package/refpolicy/Config.in | 14 ++++++++++++++ package/refpolicy/refpolicy.mk | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df..caba147feb 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -113,6 +113,20 @@ config BR2_REFPOLICY_EXTRA_MODULES endif +config BR2_REFPOLICY_DISABLE_DONTAUDIT + bool "Disable dontaudit" + help + Builds the refpolicy with the "dontaudit" rules disabled. + This will trigger unseen, and probably unharmful audit logs that are + explicitely silenced otherwise. This option can be helpful for + debugging purposes, should a silenced message cause a real issue + that would otherwise be hard to troubleshoot. + + This option should be used for debugging purposes only, due to + the amount of avc logs it generates. + + If unsure, select n. + endif comment "refpolicy needs a toolchain w/ threads, gcc >= 5, host gcc >= 5" diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 44c50af278..e113c3496e 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -118,6 +118,13 @@ define REFPOLICY_BUILD_CMDS $(REFPOLICY_MAKE) -C $(@D) policy endef +ifeq ($(BR2_REFPOLICY_DISABLE_DONTAUDIT),y) +define REFPOLICY_DISABLE_DONTAUDIT_CMDS + $(REFPOLICY_MAKE) -C $(@D) enableaudit +endef +REFPOLICY_POST_BUILD_HOOKS += REFPOLICY_DISABLE_DONTAUDIT_CMDS +endif + define REFPOLICY_INSTALL_STAGING_CMDS $(REFPOLICY_MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \ install-src install-headers -- 2.25.1 From paguilar at paguilar.org Wed Jan 19 22:32:08 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Wed, 19 Jan 2022 23:32:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/libunistring: bump version to 1.0 Message-ID: <20220119223208.1196891-1-paguilar@paguilar.org> - Update indentation in hash file (two spaces) Signed-off-by: Pedro Aguilar --- package/libunistring/libunistring.hash | 6 +++--- package/libunistring/libunistring.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index 2e4595b17d..145c8c3e54 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz.sig -sha256 eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7 libunistring-0.9.10.tar.xz +sha256 5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741 libunistring-1.0.tar.xz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 1ed7ecf906..a69eacd676 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNISTRING_VERSION = 0.9.10 +LIBUNISTRING_VERSION = 1.0 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES -- 2.25.1 From thomas.petazzoni at bootlin.com Wed Jan 19 22:39:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 19 Jan 2022 23:39:44 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20220119222332.66485-1-giulio.benetti@benettiengineering.com> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> Message-ID: <20220119233944.7ba2d09f@windsurf> On Wed, 19 Jan 2022 23:23:32 +0100 Giulio Benetti wrote: > +config BR2_REFPOLICY_DISABLE_DONTAUDIT > + bool "Disable dontaudit" I am still extremely confused by the name of option, with its double negative. When enabled, this option will disable something that doesn't audit. Meh. Is it possible to find a better name / description that doesn't make one's brain segfault when trying to understand what it does ? The make target that gets triggered is "enableaudit". Would it make sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? It would be nice to get the feedback from Antoine and/or Maxime on this. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From mail at dbrgn.ch Wed Jan 19 23:03:30 2022 From: mail at dbrgn.ch (Danilo Bargen) Date: Thu, 20 Jan 2022 00:03:30 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/pcengines_apu2_defconfig: bump kernel to 5.16 In-Reply-To: <44c15385-c790-6867-fc1f-b24c922b7e40@benettiengineering.com> References: <20220116211557.71866ff6@c3po> <44c15385-c790-6867-fc1f-b24c922b7e40@benettiengineering.com> Message-ID: <20220120000330.29552850@c3po> This fixes the compile errors that were present with the previous kernel version (4.19): https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 Additionally, the defconfig file was refactored: Configuration values are now grouped logically, thus increasing readability and maintainability. Signed-off-by: Danilo Bargen --- Changes v1 -> v2: - improved commit message Signed-off-by: Danilo Bargen --- configs/pcengines_apu2_defconfig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 68cebb8f6a..eb30f6aee7 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -1,16 +1,26 @@ +# Architecture BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_HOSTNAME="apu2" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_SYSTEM_DHCP="eth0" + +# Kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" + +# Default hostname and TTY +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Networking +BR2_SYSTEM_DHCP="eth0" + +# Rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" BR2_TARGET_ROOTFS_ISO9660_HYBRID=y -# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_SYSLINUX=y -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Jan 19 23:56:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 20 Jan 2022 00:56:44 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20220119233944.7ba2d09f@windsurf> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> Message-ID: <58f6a9d8-70e2-308e-d756-e1ec0b18d042@benettiengineering.com> On 19/01/22 23:39, Thomas Petazzoni wrote: > On Wed, 19 Jan 2022 23:23:32 +0100 > Giulio Benetti wrote: > >> +config BR2_REFPOLICY_DISABLE_DONTAUDIT >> + bool "Disable dontaudit" > > I am still extremely confused by the name of option, with its double > negative. > > When enabled, this option will disable something that doesn't audit. > Meh. > > Is it possible to find a better name / description that doesn't make > one's brain segfault when trying to understand what it does ? > > The make target that gets triggered is "enableaudit". Would it make > sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? I didn't check well the make argument..... Sorry. I agree with Thomas on changing the option variable to BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT and name to: "Enable audit" And I would change the help section from: ``` Builds the refpolicy with the "dontaudit" rules disabled. This will trigger unseen, and ... ``` to: ``` Remove all dontaudit rules from policy.conf. This will trigger unseen, and ... ``` as reported in refpolicy README: https://github.com/SELinuxProject/refpolicy/blob/master/README#L78 > It would be nice to get the feedback from Antoine and/or Maxime on this. Following this since I'm not used to this package. Best regards -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Thu Jan 20 00:38:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 19 Jan 2022 17:38:27 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/re2: switch to generic-package make build Message-ID: <20220120003827.395469-1-james.hilliard1@gmail.com> The cmake build appears to be missing features such as pkg-config generation support, switch to the regular makefile based build which appears to work better. Signed-off-by: James Hilliard --- Changes v1 -> v2: - don't built shared libraries if BR2_STATIC_LIBS is set --- package/re2/re2.mk | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b562d5d7ef..2863fcb662 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,8 +10,32 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON +define RE2_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) $(if $(BR2_STATIC_LIBS),static) +endef -$(eval $(cmake-package)) -$(eval $(host-cmake-package)) +define RE2_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ + $(if $(BR2_STATIC_LIBS),static-install,install) +endef + +define RE2_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \ + $(if $(BR2_STATIC_LIBS),static-install,install) +endef + +define HOST_RE2_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D) +endef + +define HOST_RE2_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 20 00:42:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 19 Jan 2022 17:42:46 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220119204518.GC3095239@scaer> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> Message-ID: On Wed, Jan 19, 2022 at 1:45 PM Yann E. MORIN wrote: > > James, All, > > On 2022-01-19 01:45 -0700, James Hilliard spake thusly: > > The cmake build appears to be missing features such as pkg-config > > generation support, switch to the regular makefile based build > > which appears to work better. > > Can't we just fix the CMakeList.txt and submit a patch upstream, > instead? It looked like this had been brought up before and there was some issue that was making this difficult to fix with cmake. See: https://github.com/google/re2/issues/349 > > Also, see below... > > > Signed-off-by: James Hilliard > > --- > > package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- > > 1 file changed, 26 insertions(+), 4 deletions(-) > > > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > > index b562d5d7ef..144c82339f 100644 > > --- a/package/re2/re2.mk > > +++ b/package/re2/re2.mk > > @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause > > RE2_LICENSE_FILES = LICENSE > > RE2_INSTALL_STAGING = YES > > > > -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > +define RE2_BUILD_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > + -C $(@D) > > +endef > > > > -$(eval $(cmake-package)) > > -$(eval $(host-cmake-package)) > > +define RE2_INSTALL_STAGING_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install > > +endef > > + > > +define RE2_INSTALL_TARGET_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install > > The 'install' target will forcibly build and install static and shared > libs: > > https://github.com/google/re2/blob/main/Makefile#L297 > > 296: .PHONY: install > 297: install: static-install shared-install > > So, this is probably going to not play nicely for builds where a shared > build is not possible. Sent a v2 which should fix this: https://patchwork.ozlabs.org/project/buildroot/patch/20220120003827.395469-1-james.hilliard1 at gmail.com/ > > AFAICS, the cmake-based buildsystem got that one correct, though, so it > would be a bit of a shame to regress on that point... > > Regards, > Yann E. MORIN. > > > +endef > > + > > +define HOST_RE2_BUILD_CMDS > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > + -C $(@D) > > +endef > > + > > +define HOST_RE2_INSTALL_CMDS > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install > > +endef > > + > > +$(eval $(generic-package)) > > +$(eval $(host-generic-package)) > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Thu Jan 20 07:06:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 20 Jan 2022 07:06:28 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-19 Message-ID: <20220120070633.38EB640385@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-19 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 65 | 6 | 0 | 71 | 2021.11.x | 18 | 1 | 0 | 19 | master | 91 | 50 | 0 | 141 | Classification of failures by reason for master ----------------------------------------------- host-riscv-isa-sim-1.1.0 | 10 frr-8.1 | 6 rygel-0.40.2 | 6 guile-3.0.7 | 3 unknown | 3 rtorrent-0.9.8 | 2 tesseract-ocr-5.0.1 | 2 bat-0.18.3 | 1 bluez5_utils-5.63 | 1 cryptsetup-2.4.2 | 1 gensio-2.2.9 | 1 google-breakpad-7515ab13768... | 1 gvfs-1.48.1 | 1 host-go-1.17.6 | 1 ksmbd-tools-3.4.3 | 1 libglvnd-1.3.2 | 1 libupnp-1.14.12 | 1 mesa3d-21.3.3 | 1 mongodb-4.2.11 | 1 mono-6.12.0.90 | 1 nodejs-14.18.3 | 1 resiprocate-1.12.0 | 1 ruby-3.1.0 | 1 tpm2-pkcs11-1.7.0 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/e87521dd795b72b78a704aa1172282a8e8744fc5 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/aa64d1b5f7db46dd4e59597aaec328ef239a01d2 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/06bf3ae6db48ddd7e8bea901b8c2a88d96ac5665 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f08c29637d88cc836472e1825b1fa4971d81e030 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/c35688288c6ab7404165a29db27e63b7448dac1f | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/44d74e375998c00e0ea70eb3699021599782d742 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/3ac5e7f085a5103095ccc3a90cd5d2caf672cdc5 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4ff2b8887247f87b3ab176ffa887c0d0387ae02d | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5c40f0a3268d5863f3000336a80eef1aa6f5f465 | or1k | gensio-2.2.9 | NOK | http://autobuild.buildroot.net/results/18dc5dea6a714a9d9b7b62e824658936d51ad70b | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/1b98b2c0f5b0c6dad8eb57a67a3f7fee839545aa | x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/841a352d41727647babce23186b8abdd09fde1d7 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/adb63c3f4565e80d3d01526c40a163df8fb45705 | ORPH riscv32 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/9b1a169aa5ea3529607ae4b40849e91b43568b13 | ORPH riscv64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/2601972c7add2871214a13f98139e8515bc55967 | ORPH mips64el | host-go-1.17.6 | NOK | http://autobuild.buildroot.net/results/201d833e90dce59000458af5a2b1bfd1663af991 | nds32le | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/60ae48de0ee87e7c98ebfe5e4bb931ee16f2ba25 | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/e8a10eae22f1310f39bef0e328ea4970cf90a3e7 | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/1c89a6d170035cb9a990b1e81a074cd642a25eae | sparc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/60b89cdfae4feefd54eeb7bfcd7eddf2f7c76674 | mips64el | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/2e76a505246fcc1ad3ff598a7e57e850c9e26d5b | powerpc | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/57d625e939cebcd3c1f80f18d71094d9d6d0f100 | powerpc64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/343504ec0f99dd16888727fa20811bd29cdeaffc | arm | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/88c8f8f7c6c4930a59c496ac26bf3087c776c98e | x86_64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/f024ce003c121567c4ae53f2e047c606841305fa | riscv64 | host-riscv-isa-sim-1.1.0 | NOK | http://autobuild.buildroot.net/results/76a37d6c207c2c13f1ffc07259f41a6ae4c740f1 | s390x | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/e10bf89c88f7ee784d3af1f0fae4c33343a75fef | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/0d9be02637772039247d0e823cae457c15405852 | ORPH or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/a121b42d3e768e2370ffca75e252eaf31128e2c1 | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/de325f313a118480972f0227ec2112a9672db5f9 | x86_64 | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/0b573c0987087f807460b42aef87caebb7bcbbe6 | arm | mono-6.12.0.90 | NOK | http://autobuild.buildroot.net/results/64c007ec4183ef1726ebab390dc0e8dd15050cb3 | x86_64 | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/68db60ef0a4909ef7b43365f9a1776166aa47804 | riscv64 | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/d76ac39be85ef58f5236f08436f442a4fda30357 | ORPH x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/4714d68a24160fb3a818f3470cc01a66329a1a3c | ORPH powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/89a069fd7b1ce6ebb9b890fd21facd14cf7f3c59 | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/5a38bbbe3680fa49b1ac658434fe682d1fdc83cf | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/20eff05871c3bd3703785537011c3553825d6a5b | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e5dc8dc1273a11f8f500e63c7aaf764a3e01a0f6 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/27f28e7d91715f5a8df4b569358af139c7ad548e | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/dc0c2063a92c6c98afa32765f5168f488c818371 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6c3bf3dee7a3d42e23e1195c9fe25bc8d2e7dfd3 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/edda4cf8232eafc64fd26d9fd89128012c217496 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/b71a4e13a038ec50a220e940b54db143faee6994 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/7b6051055dbe2bb093b2fa48814ccf27df0541b9 | or1k | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/e0a70c7ecae7b4bf71880842517f3aeaaf100ca0 | arm | unknown | NOK | http://autobuild.buildroot.net/results/a4f5fc22aa1774c3fd369666d538f8e0131f5466 | arc | unknown | NOK | http://autobuild.buildroot.net/results/50450e8aa9635b947dc80506c5df045a54127042 | arc | unknown | NOK | http://autobuild.buildroot.net/results/b7b5c97f21e76a8531b16a058f520db729ddf180 | arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1931a9e90fe31b7325555806f6965b16653a7a1d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 apitrace-9.0 | 1 qt5location-5.15.2 | 1 rocksdb-6.13.3 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-9.0 | NOK | http://autobuild.buildroot.net/results/6e87b86b6b01cdb91e8d09afe6e5220d29b445c2 | sparc64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5a162018da395ce19207a9994effa41db3f52da6 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c52f0996efbaeb6dd78a73138dcf4ec480c540c2 | mipsel | qt5location-5.15.2 | NOK | http://autobuild.buildroot.net/results/65fca52bba12bc7011693b063a8e72a539380808 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/ca61cec1922741a2447fed05c95e8b58e99d4af1 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/a27c46399adb20c6535ffbd23958996a43e97c7a | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/76bf9be59ca90afa957c55e8a17322bf10ed0c27 | -- http://autobuild.buildroot.net From maxime.chevallier at bootlin.com Thu Jan 20 07:48:04 2022 From: maxime.chevallier at bootlin.com (Maxime Chevallier) Date: Thu, 20 Jan 2022 08:48:04 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20220119233944.7ba2d09f@windsurf> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> Message-ID: <20220120084804.429f1d54@bootlin.com> Hello Thomas, On Wed, 19 Jan 2022 23:39:44 +0100 Thomas Petazzoni wrote: >On Wed, 19 Jan 2022 23:23:32 +0100 >Giulio Benetti wrote: > >> +config BR2_REFPOLICY_DISABLE_DONTAUDIT >> + bool "Disable dontaudit" > >I am still extremely confused by the name of option, with its double >negative. > >When enabled, this option will disable something that doesn't audit. >Meh. I agree about the confusing double-negative, but it follows the SELinux terminology from the rules syntax. My personal view is that the "make enableaudit" target is a bit confusing already :) >Is it possible to find a better name / description that doesn't make >one's brain segfault when trying to understand what it does ? Maybe we can think of an option name like "BR2_REFPOLICY_VERBOSE_DONTAUDIT", suggesting that we're not silencing these 'dontaudit' rules anymore ? The only actual effect is what gets printed in the AVC logs. >The make target that gets triggered is "enableaudit". Would it make >sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? The more I think about that, the more I think that using "enable/disable" here is misleading, the behaviour stays the same with regard to what gets denied/allow, only the logs are going to change. Thanks, Maxime >It would be nice to get the feedback from Antoine and/or Maxime on this. > >Thomas -- Maxime Chevallier, Bootlin Embedded Linux and kernel engineering https://bootlin.com From heiko.thiery at gmail.com Thu Jan 20 09:19:36 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Thu, 20 Jan 2022 10:19:36 +0100 Subject: [Buildroot] [PATCH v4] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220120091935.15035-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- v4: - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. The FPU options are set implicit. v3: - change offset value to use capitol 'K' value (thanks Guilio) - add info to uboot patches about submitting to upstream v2: - switch to extlinux - directly call genimage.sh - remove post-image.sh - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 7 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 58 ++++ 8 files changed, 510 insertions(+) create mode 100644 board/kontron/bl-imx8mm/extlinux.conf create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index c0bfde69da..93c5760489 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1179,7 +1179,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf new file mode 100644 index 0000000000..d38f7f81b7 --- /dev/null +++ b/board/kontron/bl-imx8mm/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..c98bc4f150 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,18 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 16K + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + image = "rootfs.ext4" + offset = 8M + partition-uuid = %PARTUUID% + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..6d76282def --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,31 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..a88d7aba87 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,305 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..9a9eabff61 --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_aarch64=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.30.2 From atenart at kernel.org Thu Jan 20 09:29:25 2022 From: atenart at kernel.org (Antoine Tenart) Date: Thu, 20 Jan 2022 10:29:25 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <20220120084804.429f1d54@bootlin.com> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> <20220120084804.429f1d54@bootlin.com> Message-ID: <164267096542.4497.13116457792635384701@kwain> Quoting Maxime Chevallier (2022-01-20 08:48:04) > On Wed, 19 Jan 2022 23:39:44 +0100 > Thomas Petazzoni wrote: > >On Wed, 19 Jan 2022 23:23:32 +0100 > >Giulio Benetti wrote: > > > >> +config BR2_REFPOLICY_DISABLE_DONTAUDIT > >> + bool "Disable dontaudit" > > > >I am still extremely confused by the name of option, with its double > >negative. > > > >When enabled, this option will disable something that doesn't audit. > >Meh. > > I agree about the confusing double-negative, but it follows the SELinux > terminology from the rules syntax. My personal view is that the "make > enableaudit" target is a bit confusing already :) Agreed. > >Is it possible to find a better name / description that doesn't make > >one's brain segfault when trying to understand what it does ? > > Maybe we can think of an option name like > "BR2_REFPOLICY_VERBOSE_DONTAUDIT", suggesting that we're not silencing > these 'dontaudit' rules anymore ? The only actual effect is what gets > printed in the AVC logs. > > >The make target that gets triggered is "enableaudit". Would it make > >sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? > > The more I think about that, the more I think that using > "enable/disable" here is misleading, the behaviour stays the same with > regard to what gets denied/allow, only the logs are going to change. I would suggest using BR2_PACKAGE_REFPOLICY_WITH_DONTAUDIT, defaulting to y (using _WITHOUT_ would be less clear IMHO). And in Kconfig something along the lines: bool "Build with dontaudit rules" default y help The refpolicy comes with 'dontaudit' rules suppressing audit logs for known and expected violations of the policy. These rules are enabled by default. Building without the 'dontaudit' rules will lead in more denied actions being logged, which can be useful for debugging purposes. Note that running 'semodules -DB' from a running system will have the same effect. Say y if unsure. (Please check the semodules part, never tried it). WDYT? Antoine From giulio.benetti at benettiengineering.com Thu Jan 20 10:26:54 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 20 Jan 2022 11:26:54 +0100 Subject: [Buildroot] [PATCH v4] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220120091935.15035-1-heiko.thiery@gmail.com> References: <20220120091935.15035-1-heiko.thiery@gmail.com> Message-ID: Hi Heiko, Frieder, On 20/01/22 10:19, Heiko Thiery wrote: > The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > Cc: Frieder Schrempf > Signed-off-by: Heiko Thiery > --- > v4: > - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > The FPU options are set implicit. > > v3: > - change offset value to use capitol 'K' value (thanks Guilio) > - add info to uboot patches about submitting to upstream > > v2: > - switch to extlinux > - directly call genimage.sh > - remove post-image.sh > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > > DEVELOPERS | 2 + > board/kontron/bl-imx8mm/extlinux.conf | 4 + > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > board/kontron/bl-imx8mm/post-build.sh | 7 + > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > configs/kontron_bl_imx8mm_defconfig | 58 ++++ > 8 files changed, 510 insertions(+) > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > create mode 100644 board/kontron/bl-imx8mm/readme.txt > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index c0bfde69da..93c5760489 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1179,7 +1179,9 @@ F: package/python-sip/ > F: package/uhd/ > > N: Heiko Thiery > +F: board/kontron/bl-imx8mm/ > F: board/kontron/pitx-imx8m/ > +F: configs/kontron_bl_imx8mm_defconfig > F: configs/kontron_pitx_imx8m_defconfig > F: package/altera-stapl/ > F: package/ipmitool/ > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > new file mode 100644 > index 0000000000..d38f7f81b7 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > new file mode 100644 > index 0000000000..c98bc4f150 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/genimage.cfg > @@ -0,0 +1,18 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 16K > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33K > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + offset = 8M > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..6d76282def > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,31 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > + > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > +index 35d12fca32..940bf07a92 100644 > +--- a/configs/kontron-sl-mx8mm_defconfig > ++++ b/configs/kontron-sl-mx8mm_defconfig > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > + CONFIG_SPL_TEXT_BASE=0x7E1000 > + CONFIG_TARGET_KONTRON_MX8MM=y > ++CONFIG_SPL_MMC=y > ++CONFIG_SPL_SERIAL=y > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > + CONFIG_SPL=y > + CONFIG_DISTRO_DEFAULTS=y > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > new file mode 100644 > index 0000000000..a88d7aba87 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > @@ -0,0 +1,305 @@ > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > + u-boot.dtsi > + > +When using a board variant that selects the lvds specific dtb the > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > +include this in the board base u-boot.dtsi and create an additional one > +for the lvds variant. > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > + 3 files changed, 135 insertions(+), 123 deletions(-) > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > + > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +new file mode 100644 > +index 0000000000..4bf75722bf > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +@@ -0,0 +1,6 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +index 22d18e6f1c..4bf75722bf 100644 > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +@@ -3,126 +3,4 @@ > + * Copyright (C) 2019 Kontron Electronics GmbH > + */ > + > +-#include "imx8mm-u-boot.dtsi" > +- > +-/ { > +- aliases { > +- usb0 = &usbotg1; > +- usb1 = &usbotg2; > +- }; > +- > +- wdt-reboot { > +- compatible = "wdt-reboot"; > +- wdt = <&wdog1>; > +- u-boot,dm-spl; > +- }; > +- > +- firmware { > +- optee { > +- compatible = "linaro,optee-tz"; > +- method = "smc"; > +- }; > +- }; > +-}; > +- > +-&fec1 { > +- phy-mode = "rgmii-rxid"; > +-}; > +- > +-&i2c1 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&i2c2 { > +- status = "okay"; > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_i2c1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_pmic { > +- u-boot,dm-spl; > +- fsl,pins = < > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > +- /* Disable Pullup for SD_VSEL */ > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > +- >; > +-}; > +- > +-&pinctrl_uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_100mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_200mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&pca9450 { > +- u-boot,dm-spl; > +-}; > +- > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > +- u-boot,dm-spl; > +-}; > +- > +-&ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio2 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio3 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio4 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio5 { > +- u-boot,dm-spl; > +-}; > +- > +-&uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&wdog1 { > +- u-boot,dm-spl; > +-}; > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +new file mode 100644 > +index 0000000000..22d18e6f1c > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +@@ -0,0 +1,128 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-u-boot.dtsi" > ++ > ++/ { > ++ aliases { > ++ usb0 = &usbotg1; > ++ usb1 = &usbotg2; > ++ }; > ++ > ++ wdt-reboot { > ++ compatible = "wdt-reboot"; > ++ wdt = <&wdog1>; > ++ u-boot,dm-spl; > ++ }; > ++ > ++ firmware { > ++ optee { > ++ compatible = "linaro,optee-tz"; > ++ method = "smc"; > ++ }; > ++ }; > ++}; > ++ > ++&fec1 { > ++ phy-mode = "rgmii-rxid"; > ++}; > ++ > ++&i2c1 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&i2c2 { > ++ status = "okay"; > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; any findings for i2c1 and i2c2 nodes? This is not mandatory to be accepted anyway. I've successfully built it so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas From bugzilla at busybox.net Thu Jan 20 12:55:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 20 Jan 2022 12:55:10 +0000 Subject: [Buildroot] [Bug 14531] New: Package EFL - build error Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 Bug ID: 14531 Summary: Package EFL - build error Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: jhiljanen at europower-consulting.com CC: buildroot at uclibc.org Target Milestone: --- I get an error when building the EFL package: output/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze" -- You are receiving this mail because: You are on the CC list for the bug. From heiko.thiery at gmail.com Thu Jan 20 13:52:52 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Thu, 20 Jan 2022 14:52:52 +0100 Subject: [Buildroot] [PATCH] configs/kontron_pitx_imx8m_defconfig: remove BR2_ARM_FPU_VFPV3 Message-ID: <20220120135251.4225-1-heiko.thiery@gmail.com> The FP setting is not used for aarch64 in buildroot. The FPU options are set implicit. Signed-off-by: Heiko Thiery --- configs/kontron_pitx_imx8m_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 7f9c0eeae8..8f756f5246 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -1,6 +1,5 @@ # Architecture BR2_aarch64=y -BR2_ARM_FPU_VFPV3=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" -- 2.30.2 From bugzilla at busybox.net Thu Jan 20 13:54:37 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 20 Jan 2022 13:54:37 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #1 from Giulio Benetti --- Hi jhiljanen, I've tried with Buildroot master branch and I've found 2 missing dependencies: - libinput - libxkbcommon and this deserves a patch But once enabled them efl builds correctly. Which Buildroot version are you using? -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Thu Jan 20 14:09:40 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 20 Jan 2022 14:09:40 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #2 from jhiljanen at europower-consulting.com --- (In reply to Giulio Benetti from comment #1) I pulled the master from git. I don't have BR2_PACKAGE_EFL_EEZE enabled, because I'm using BusyBox init system. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Thu Jan 20 14:39:42 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 20 Jan 2022 14:39:42 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #3 from Giulio Benetti --- Ah ok, now I can reproduce with BR2_PACKAGE_EFL_EEZE not enabled. This must be fixed. Thanks for reporting. I'm going to fix it. Best regards -- You are receiving this mail because: You are on the CC list for the bug. From ps.report at gmx.net Thu Jan 20 17:21:39 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 18:21:39 +0100 Subject: [Buildroot] [PATCH v1] package/hwdata: bump version to 355 Message-ID: <20220120172139.25705-1-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- 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 43cca03b06..7861106859 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ed9a2c8b90371ccf4f0ff88972d87770c1c644e63ca44d2ac72c33200642cdde hwdata-0.354.tar.gz +sha256 0d3d21af57822f35141b524808fd9e4823dbb413df338606195010dc0aa1c935 hwdata-0.355.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 71b59b95ed..4dd9c9e28e 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.354 +HWDATA_VERSION = 0.355 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE -- 2.34.1 From ps.report at gmx.net Thu Jan 20 17:49:39 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 18:49:39 +0100 Subject: [Buildroot] [PATCH v1] package/hwloc: bump version to 2.7.0 Message-ID: <20220120174939.27055-1-ps.report@gmx.net> For details see [1]. [1] https://github.com/open-mpi/hwloc/blob/hwloc-2.7.0/NEWS Signed-off-by: Peter Seiderer --- package/hwloc/hwloc.hash | 4 ++-- package/hwloc/hwloc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index e207a6bb1a..ca77e3301c 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,4 +1,4 @@ -# From https://www.open-mpi.org/software/hwloc/v2.4/ -sha256 392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63 hwloc-2.4.1.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.7/ +sha256 028cee53ebcfe048283a2b3e87f2fa742c83645fc3ae329134bf5bb8b90384e0 hwloc-2.7.0.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 2a5a82cea4..04543a7e64 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,8 +4,8 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.4 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 +HWLOC_VERSION_MAJOR = 2.7 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause -- 2.34.1 From kuzminov.sergey81 at gmail.com Thu Jan 20 18:50:43 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Thu, 20 Jan 2022 21:50:43 +0300 Subject: [Buildroot] [PATCH v3] board/orangepi/orangepi-zero: bump Linux and U-Boot versions Message-ID: <20220120185043.7745-1-kuzminov.sergey81@gmail.com> v1: - Linux: bump to version 5.12.19 (from 5.12.2). - U-Boot: bump to version 2022.01 (from 2021.04). - Added fast_commit for ext4. When creating a file system with this option, writing speeds up twice in some cases: https://lwn.net/Articles/834483/ - Refactoring configs/orangepi_zero_defconfig. - Switched to extlinux. - Createed common scenarios for multiple boards to create an SD image: board/orangepi/common. v2: - Linux: bump to version 5.16.1 (from 5.12.19) thanks to a patch from Giulio for xr819-xradio (link below). - Added in genimage.cfg: partition rootfs {offset = 1M} to prevent possible alignment error. - Added BR2_ARM_EABIHF=y to make it visible in the config file, previously added implicitly. - Replaced BR2_ARM_FPU_VFPV4 with BR2_ARM_FPU_NEON_VFPV4 because processor supports it. - Deleted BR2_GCC_ENABLE_LTO=y, added by mistake. v3: - Changed the name of the patch (from board/orangepi/orangepi-zero:extlinux, refactoring). - Linux: bump to version 5.16.2 (from 5.16.1). - Returned (# BR2_TARGET_ROOTFS_TAR is not set) instead of (BR2_TARGET_ROOTFS_TAR=n), added in v1. - Renamed file uboot-extras.config -> uboot-extras.fragment. - Renamed file linux-extras.config -> linux-extras.fragment. - Deleted (#BR2_ARM_INSTRUCTIONS_THUMB2=y), added in v2. Patch required to work: https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ Signed-off-by: Sergey Kuzminov --- board/orangepi/common/extlinux.conf | 5 ++ board/orangepi/common/genimage.cfg | 20 ++++++ board/orangepi/common/post-build.sh | 34 ++++++++++ board/orangepi/common/uboot-extras.fragment | 3 + board/orangepi/orangepi-zero/boot.cmd | 9 --- board/orangepi/orangepi-zero/genimage.cfg | 36 ---------- ...ux-extras.config => linux-extras.fragment} | 0 configs/orangepi_zero_defconfig | 68 +++++++++++-------- 8 files changed, 103 insertions(+), 72 deletions(-) create mode 100644 board/orangepi/common/extlinux.conf create mode 100644 board/orangepi/common/genimage.cfg create mode 100755 board/orangepi/common/post-build.sh create mode 100644 board/orangepi/common/uboot-extras.fragment delete mode 100644 board/orangepi/orangepi-zero/boot.cmd delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..015f29270e --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,5 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait console=${console} +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg new file mode 100644 index 0000000000..8b80ffb138 --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + hdimage { + partition-table-type = gpt + gpt-no-backup = true + gpt-location = 1008K # 1MB - 16KB + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB - 16KB + } + + partition rootfs { + offset = 1M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh new file mode 100755 index 0000000000..296f94b174 --- /dev/null +++ b/board/orangepi/common/post-build.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "uImage" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + echo "Image" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + echo "Image.gz" + else + echo "zImage" + fi +} + +generic_getty() +{ + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then + echo "" + else + echo "s/\s*console=\S*//" + fi +} + +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" + +sed -e "$(generic_getty)" \ + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ + -e "s/%PARTUUID%/$PARTUUID/g" \ + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" + +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/orangepi/common/uboot-extras.fragment b/board/orangepi/common/uboot-extras.fragment new file mode 100644 index 0000000000..5aa97523d9 --- /dev/null +++ b/board/orangepi/common/uboot-extras.fragment @@ -0,0 +1,3 @@ +CONFIG_BOOTDELAY=0 +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv preboot;" diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd deleted file mode 100644 index d094a64fe5..0000000000 --- a/board/orangepi/orangepi-zero/boot.cmd +++ /dev/null @@ -1,9 +0,0 @@ -setenv fdt_high ffffffff - -part uuid mmc 0:2 uuid -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg deleted file mode 100644 index 32f5454ae6..0000000000 --- a/board/orangepi/orangepi-zero/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Zero -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h2-plus-orangepi-zero.dtb", - "boot.scr" - } - } - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment similarity index 100% rename from board/orangepi/orangepi-zero/linux-extras.config rename to board/orangepi/orangepi-zero/linux-extras.fragment diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..430d38af3e 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,49 +1,63 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.fragment" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.2" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_GENIMAGE=y -# wireless driver and firmware +# Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y BR2_PACKAGE_ARMBIAN_FIRMWARE=y BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -# wireless support +# Wireless support BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y @@ -51,5 +65,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -# spi flash support +# Spi flash support BR2_PACKAGE_MTD=y -- 2.34.1 From ps.report at gmx.net Thu Jan 20 19:26:26 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 20:26:26 +0100 Subject: [Buildroot] [PATCH v1] package/bash: bump version to 5.1.16 Message-ID: <20220120192626.11046-1-ps.report@gmx.net> - remove upstream patch level patches 0001-bash51-001.patch 0002-bash51-002.patch 0003-bash51-003.patch 0004-bash51-004.patch - renumber remaining patches For details see [1]. [1] http://git.savannah.gnu.org/cgit/bash.git/log Signed-off-by: Peter Seiderer --- package/bash/0001-bash51-001.patch | 83 ----------- ...ut.h-add-missing-include-on-stdio.h.patch} | 0 package/bash/0002-bash51-002.patch | 60 -------- ...ocal_shiftstates-vs.-locale_shiftst.patch} | 0 package/bash/0003-bash51-003.patch | 56 -------- ...uote_pathname-vs.-udequote_pathname.patch} | 0 package/bash/0004-bash51-004.patch | 129 ------------------ package/bash/bash.hash | 4 +- package/bash/bash.mk | 2 +- 9 files changed, 3 insertions(+), 331 deletions(-) delete mode 100644 package/bash/0001-bash51-001.patch rename package/bash/{0005-input.h-add-missing-include-on-stdio.h.patch => 0001-input.h-add-missing-include-on-stdio.h.patch} (100%) delete mode 100644 package/bash/0002-bash51-002.patch rename package/bash/{0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch => 0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch} (100%) delete mode 100644 package/bash/0003-bash51-003.patch rename package/bash/{0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch => 0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch} (100%) delete mode 100644 package/bash/0004-bash51-004.patch diff --git a/package/bash/0001-bash51-001.patch b/package/bash/0001-bash51-001.patch deleted file mode 100644 index 8f18cccc31..0000000000 --- a/package/bash/0001-bash51-001.patch +++ /dev/null @@ -1,83 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-001] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-001 - -Bug-Reported-by: Fazal Majid -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00000.html - -Bug-Description: - -There is a missing dependency on a constructed file, which can cause highly -parellel builds to fail. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/Makefile.in 2020-12-04 09:51:19.000000000 -0500 ---- b/Makefile.in 2020-12-16 11:28:36.000000000 -0500 -*************** -*** 1316,1319 **** ---- 1316,1320 ---- - bashline.o: pcomplete.h ${BASHINCDIR}/chartypes.h input.h - bashline.o: ${BASHINCDIR}/shmbutil.h ${BASHINCDIR}/shmbchar.h -+ bashline.o: ${DEFDIR}/builtext.h - bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h - bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h -*************** -*** 1436,1439 **** ---- 1437,1441 ---- - builtins/evalstring.o: jobs.h builtins.h flags.h input.h execute_cmd.h - builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h pathnames.h -+ builtins/evalstring.o: ${DEFDIR}/builtext.h - builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h - builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h xmalloc.h error.h - -*** ../bash-5.1-patched/builtins/Makefile.in 2019-07-25 08:03:45.000000000 -0400 ---- b/builtins/Makefile.in 2020-12-16 11:29:29.000000000 -0500 -*************** -*** 362,366 **** - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h - #evalstring.o: $(topdir)/y.tab.h - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h ---- 362,366 ---- - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h ./builtext.h - #evalstring.o: $(topdir)/y.tab.h - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 1,5 **** - /* patchlevel.h -- current bash patch level */ - -! /* Copyright (C) 2001-2016 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. ---- 1,5 ---- - /* patchlevel.h -- current bash patch level */ - -! /* Copyright (C) 2001-2020 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0005-input.h-add-missing-include-on-stdio.h.patch b/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch similarity index 100% rename from package/bash/0005-input.h-add-missing-include-on-stdio.h.patch rename to package/bash/0001-input.h-add-missing-include-on-stdio.h.patch diff --git a/package/bash/0002-bash51-002.patch b/package/bash/0002-bash51-002.patch deleted file mode 100644 index c9836082c1..0000000000 --- a/package/bash/0002-bash51-002.patch +++ /dev/null @@ -1,60 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-002] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-002 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00037.html - -Bug-Description: - -If there are no jobs, and the `-n' and `-p' options are both supplied to -`wait', bash can assign a value to the variable name specified with `-p' -instead of leaving it unset. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/builtins/wait.def 2020-04-09 15:13:57.000000000 -0400 ---- b/builtins/wait.def 2020-12-11 09:46:49.000000000 -0500 -*************** -*** 214,222 **** - - status = wait_for_any_job (wflags, &pstat); -- if (status < 0) -- status = 127; -- - if (vname && status >= 0) - bind_var_to_int (vname, pstat.pid); - if (list) - unset_waitlist (); ---- 214,222 ---- - - status = wait_for_any_job (wflags, &pstat); - if (vname && status >= 0) - bind_var_to_int (vname, pstat.pid); -+ -+ if (status < 0) -+ status = 127; - if (list) - unset_waitlist (); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch similarity index 100% rename from package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch rename to package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch diff --git a/package/bash/0003-bash51-003.patch b/package/bash/0003-bash51-003.patch deleted file mode 100644 index ff13fb0c9f..0000000000 --- a/package/bash/0003-bash51-003.patch +++ /dev/null @@ -1,56 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-003] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-003 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00050.html - -Bug-Description: - -Bash does not put a command substitution process that is started to perform an -expansion in a child process into the right process group where it can receive -keyboard-generated signals. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 ---- b/subst.c 2020-12-12 13:50:11.000000000 -0500 -*************** -*** 6357,6362 **** - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */ -! if ((subshell_environment & SUBSHELL_PIPE) == 0) - pipeline_pgrp = shell_pgrp; - cleanup_the_pipeline (); ---- 6357,6364 ---- - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or -! we've already forked to run a disk command (and are expanding redirections, -! for example). */ -! if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0) - pipeline_pgrp = shell_pgrp; - cleanup_the_pipeline (); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch similarity index 100% rename from package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch rename to package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch diff --git a/package/bash/0004-bash51-004.patch b/package/bash/0004-bash51-004.patch deleted file mode 100644 index 48a38645f7..0000000000 --- a/package/bash/0004-bash51-004.patch +++ /dev/null @@ -1,129 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-004] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-004 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00039.html - -Bug-Description: - -If a key-value compound array assignment to an associative array is supplied -as an assignment statement argument to the `declare' command that declares the -array, the assignment doesn't perform the correct word expansions. - -This patch makes key-value assignment and subscript assignment perform the -same expansions when they're supplied as an argument to `declare'. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/arrayfunc.c 2020-10-09 11:38:58.000000000 -0400 ---- b/arrayfunc.c 2020-12-11 15:12:22.000000000 -0500 -*************** -*** 598,601 **** ---- 598,622 ---- - } - } -+ -+ /* Return non-zero if L appears to be a key-value pair associative array -+ compound assignment. */ -+ int -+ kvpair_assignment_p (l) -+ WORD_LIST *l; -+ { -+ return (l && (l->word->flags & W_ASSIGNMENT) == 0 && l->word->word[0] != '['); /*]*/ -+ } -+ -+ char * -+ expand_and_quote_kvpair_word (w) -+ char *w; -+ { -+ char *t, *r; -+ -+ t = w ? expand_assignment_string_to_string (w, 0) : 0; -+ r = sh_single_quote (t ? t : ""); -+ free (t); -+ return r; -+ } - #endif - -*************** -*** 641,645 **** - - #if ASSOC_KVPAIR_ASSIGNMENT -! if (assoc_p (var) && nlist && (nlist->word->flags & W_ASSIGNMENT) == 0 && nlist->word->word[0] != '[') /*]*/ - { - iflags = flags & ~ASS_APPEND; ---- 662,666 ---- - - #if ASSOC_KVPAIR_ASSIGNMENT -! if (assoc_p (var) && kvpair_assignment_p (nlist)) - { - iflags = flags & ~ASS_APPEND; -*** ../bash-5.1-patched/arrayfunc.h 2020-04-29 17:24:15.000000000 -0400 ---- b/arrayfunc.h 2020-12-11 14:23:50.000000000 -0500 -*************** -*** 68,71 **** ---- 68,74 ---- - extern void quote_compound_array_list PARAMS((WORD_LIST *, int)); - -+ extern int kvpair_assignment_p PARAMS((WORD_LIST *)); -+ extern char *expand_and_quote_kvpair_word PARAMS((char *)); -+ - extern int unbind_array_element PARAMS((SHELL_VAR *, char *, int)); - extern int skipsubscript PARAMS((const char *, int, int)); -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 ---- b/subst.c 2020-12-11 15:11:10.000000000 -0500 -*************** -*** 11605,11608 **** ---- 11605,11609 ---- - WORD_LIST *l, *nl; - char *t; -+ int kvpair; - - if (flags == 0) -*************** -*** 11619,11622 **** ---- 11620,11627 ---- - /* Associative array */ - l = parse_string_to_word_list (value, 1, "array assign"); -+ #if ASSOC_KVPAIR_ASSIGNMENT -+ kvpair = kvpair_assignment_p (l); -+ #endif -+ - /* For associative arrays, with their arbitrary subscripts, we have to - expand and quote in one step so we don't have to search for the -*************** -*** 11624,11627 **** ---- 11629,11638 ---- - for (nl = l; nl; nl = nl->next) - { -+ #if ASSOC_KVPAIR_ASSIGNMENT -+ if (kvpair) -+ /* keys and values undergo the same set of expansions */ -+ t = expand_and_quote_kvpair_word (nl->word->word); -+ else -+ #endif - if ((nl->word->flags & W_ASSIGNMENT) == 0) - t = sh_single_quote (nl->word->word ? nl->word->word : ""); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 2e547c8c30..4660e9d38a 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://mirror.keystealth.org/gnu/bash/bash-5.1.tar.gz.sig -sha256 cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig +sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 7b853ece08..3aca22898e 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.1 +BASH_VERSION = 5.1.16 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ -- 2.34.1 From ps.report at gmx.net Thu Jan 20 19:27:38 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 20:27:38 +0100 Subject: [Buildroot] [PATCH v1] package/hdparm: bump version to 9.63 Message-ID: <20220120192738.11310-1-ps.report@gmx.net> For details see [1]. [1] https://sourceforge.net/p/hdparm/news/2022/01/hdparm-963-is-released- Signed-off-by: Peter Seiderer --- package/hdparm/hdparm.hash | 2 +- package/hdparm/hdparm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash index b37826caf2..c039481f77 100644 --- a/package/hdparm/hdparm.hash +++ b/package/hdparm/hdparm.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/hdparm/files/hdparm/ -sha1 100b9a5551b71d87b446b415d56c5d45ac41d131 hdparm-9.62.tar.gz +sha1 c8e24233b4d29506907ad2bf0725f793106c3a78 hdparm-9.63.tar.gz # Locally computed sha256 2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f hdparm-9.62.tar.gz sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 6a71c14fa7..2c3b372deb 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.62 +HDPARM_VERSION = 9.63 HDPARM_SITE = https://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT -- 2.34.1 From yann.morin.1998 at free.fr Thu Jan 20 20:35:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:35:31 +0100 Subject: [Buildroot] [git commit] package/hdparm: bump version to 9.63 Message-ID: <20220120203347.7378982DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b50ab233e6e1737cb3aa198fdebb5d9fb5cd89eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://sourceforge.net/p/hdparm/news/2022/01/hdparm-963-is-released- Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/hdparm/hdparm.hash | 2 +- package/hdparm/hdparm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash index b37826caf2..c039481f77 100644 --- a/package/hdparm/hdparm.hash +++ b/package/hdparm/hdparm.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/hdparm/files/hdparm/ -sha1 100b9a5551b71d87b446b415d56c5d45ac41d131 hdparm-9.62.tar.gz +sha1 c8e24233b4d29506907ad2bf0725f793106c3a78 hdparm-9.63.tar.gz # Locally computed sha256 2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f hdparm-9.62.tar.gz sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 6a71c14fa7..2c3b372deb 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.62 +HDPARM_VERSION = 9.63 HDPARM_SITE = https://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT From yann.morin.1998 at free.fr Thu Jan 20 20:35:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:35:28 +0100 Subject: [Buildroot] [git commit] package/bash: bump version to 5.1.16 Message-ID: <20220120203347.69FCE82BDD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80b3c51c06bcb6872168f4f82147ec72938ab0e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - remove upstream patch level patches 0001-bash51-001.patch 0002-bash51-002.patch 0003-bash51-003.patch 0004-bash51-004.patch - renumber remaining patches For details see [1]. [1] http://git.savannah.gnu.org/cgit/bash.git/log Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/bash/0001-bash51-001.patch | 83 ------------- ...1-input.h-add-missing-include-on-stdio.h.patch} | 0 package/bash/0002-bash51-002.patch | 60 ---------- ...ypo-local_shiftstates-vs.-locale_shiftst.patch} | 0 package/bash/0003-bash51-003.patch | 56 --------- ...x-dequote_pathname-vs.-udequote_pathname.patch} | 0 package/bash/0004-bash51-004.patch | 129 --------------------- package/bash/bash.hash | 4 +- package/bash/bash.mk | 2 +- 9 files changed, 3 insertions(+), 331 deletions(-) diff --git a/package/bash/0001-bash51-001.patch b/package/bash/0001-bash51-001.patch deleted file mode 100644 index 8f18cccc31..0000000000 --- a/package/bash/0001-bash51-001.patch +++ /dev/null @@ -1,83 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-001] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-001 - -Bug-Reported-by: Fazal Majid -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00000.html - -Bug-Description: - -There is a missing dependency on a constructed file, which can cause highly -parellel builds to fail. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/Makefile.in 2020-12-04 09:51:19.000000000 -0500 ---- b/Makefile.in 2020-12-16 11:28:36.000000000 -0500 -*************** -*** 1316,1319 **** ---- 1316,1320 ---- - bashline.o: pcomplete.h ${BASHINCDIR}/chartypes.h input.h - bashline.o: ${BASHINCDIR}/shmbutil.h ${BASHINCDIR}/shmbchar.h -+ bashline.o: ${DEFDIR}/builtext.h - bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h - bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h -*************** -*** 1436,1439 **** ---- 1437,1441 ---- - builtins/evalstring.o: jobs.h builtins.h flags.h input.h execute_cmd.h - builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h pathnames.h -+ builtins/evalstring.o: ${DEFDIR}/builtext.h - builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h - builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h xmalloc.h error.h - -*** ../bash-5.1-patched/builtins/Makefile.in 2019-07-25 08:03:45.000000000 -0400 ---- b/builtins/Makefile.in 2020-12-16 11:29:29.000000000 -0500 -*************** -*** 362,366 **** - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h - #evalstring.o: $(topdir)/y.tab.h - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h ---- 362,366 ---- - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h ./builtext.h - #evalstring.o: $(topdir)/y.tab.h - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 1,5 **** - /* patchlevel.h -- current bash patch level */ - -! /* Copyright (C) 2001-2016 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. ---- 1,5 ---- - /* patchlevel.h -- current bash patch level */ - -! /* Copyright (C) 2001-2020 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0005-input.h-add-missing-include-on-stdio.h.patch b/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch similarity index 100% rename from package/bash/0005-input.h-add-missing-include-on-stdio.h.patch rename to package/bash/0001-input.h-add-missing-include-on-stdio.h.patch diff --git a/package/bash/0002-bash51-002.patch b/package/bash/0002-bash51-002.patch deleted file mode 100644 index c9836082c1..0000000000 --- a/package/bash/0002-bash51-002.patch +++ /dev/null @@ -1,60 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-002] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-002 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00037.html - -Bug-Description: - -If there are no jobs, and the `-n' and `-p' options are both supplied to -`wait', bash can assign a value to the variable name specified with `-p' -instead of leaving it unset. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/builtins/wait.def 2020-04-09 15:13:57.000000000 -0400 ---- b/builtins/wait.def 2020-12-11 09:46:49.000000000 -0500 -*************** -*** 214,222 **** - - status = wait_for_any_job (wflags, &pstat); -- if (status < 0) -- status = 127; -- - if (vname && status >= 0) - bind_var_to_int (vname, pstat.pid); - if (list) - unset_waitlist (); ---- 214,222 ---- - - status = wait_for_any_job (wflags, &pstat); - if (vname && status >= 0) - bind_var_to_int (vname, pstat.pid); -+ -+ if (status < 0) -+ status = 127; - if (list) - unset_waitlist (); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch similarity index 100% rename from package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch rename to package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch diff --git a/package/bash/0003-bash51-003.patch b/package/bash/0003-bash51-003.patch deleted file mode 100644 index ff13fb0c9f..0000000000 --- a/package/bash/0003-bash51-003.patch +++ /dev/null @@ -1,56 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-003] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-003 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00050.html - -Bug-Description: - -Bash does not put a command substitution process that is started to perform an -expansion in a child process into the right process group where it can receive -keyboard-generated signals. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 ---- b/subst.c 2020-12-12 13:50:11.000000000 -0500 -*************** -*** 6357,6362 **** - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */ -! if ((subshell_environment & SUBSHELL_PIPE) == 0) - pipeline_pgrp = shell_pgrp; - cleanup_the_pipeline (); ---- 6357,6364 ---- - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or -! we've already forked to run a disk command (and are expanding redirections, -! for example). */ -! if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0) - pipeline_pgrp = shell_pgrp; - cleanup_the_pipeline (); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch similarity index 100% rename from package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch rename to package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch diff --git a/package/bash/0004-bash51-004.patch b/package/bash/0004-bash51-004.patch deleted file mode 100644 index 48a38645f7..0000000000 --- a/package/bash/0004-bash51-004.patch +++ /dev/null @@ -1,129 +0,0 @@ -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-004] -Signed-off-by: Peter Seiderer - - BASH PATCH REPORT - ================= - -Bash-Release: 5.1 -Patch-ID: bash51-004 - -Bug-Reported-by: oguzismailuysal at gmail.com -Bug-Reference-ID: -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00039.html - -Bug-Description: - -If a key-value compound array assignment to an associative array is supplied -as an assignment statement argument to the `declare' command that declares the -array, the assignment doesn't perform the correct word expansions. - -This patch makes key-value assignment and subscript assignment perform the -same expansions when they're supplied as an argument to `declare'. - -Patch (apply with `patch -p0'): - -*** ../bash-5.1-patched/arrayfunc.c 2020-10-09 11:38:58.000000000 -0400 ---- b/arrayfunc.c 2020-12-11 15:12:22.000000000 -0500 -*************** -*** 598,601 **** ---- 598,622 ---- - } - } -+ -+ /* Return non-zero if L appears to be a key-value pair associative array -+ compound assignment. */ -+ int -+ kvpair_assignment_p (l) -+ WORD_LIST *l; -+ { -+ return (l && (l->word->flags & W_ASSIGNMENT) == 0 && l->word->word[0] != '['); /*]*/ -+ } -+ -+ char * -+ expand_and_quote_kvpair_word (w) -+ char *w; -+ { -+ char *t, *r; -+ -+ t = w ? expand_assignment_string_to_string (w, 0) : 0; -+ r = sh_single_quote (t ? t : ""); -+ free (t); -+ return r; -+ } - #endif - -*************** -*** 641,645 **** - - #if ASSOC_KVPAIR_ASSIGNMENT -! if (assoc_p (var) && nlist && (nlist->word->flags & W_ASSIGNMENT) == 0 && nlist->word->word[0] != '[') /*]*/ - { - iflags = flags & ~ASS_APPEND; ---- 662,666 ---- - - #if ASSOC_KVPAIR_ASSIGNMENT -! if (assoc_p (var) && kvpair_assignment_p (nlist)) - { - iflags = flags & ~ASS_APPEND; -*** ../bash-5.1-patched/arrayfunc.h 2020-04-29 17:24:15.000000000 -0400 ---- b/arrayfunc.h 2020-12-11 14:23:50.000000000 -0500 -*************** -*** 68,71 **** ---- 68,74 ---- - extern void quote_compound_array_list PARAMS((WORD_LIST *, int)); - -+ extern int kvpair_assignment_p PARAMS((WORD_LIST *)); -+ extern char *expand_and_quote_kvpair_word PARAMS((char *)); -+ - extern int unbind_array_element PARAMS((SHELL_VAR *, char *, int)); - extern int skipsubscript PARAMS((const char *, int, int)); -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 ---- b/subst.c 2020-12-11 15:11:10.000000000 -0500 -*************** -*** 11605,11608 **** ---- 11605,11609 ---- - WORD_LIST *l, *nl; - char *t; -+ int kvpair; - - if (flags == 0) -*************** -*** 11619,11622 **** ---- 11620,11627 ---- - /* Associative array */ - l = parse_string_to_word_list (value, 1, "array assign"); -+ #if ASSOC_KVPAIR_ASSIGNMENT -+ kvpair = kvpair_assignment_p (l); -+ #endif -+ - /* For associative arrays, with their arbitrary subscripts, we have to - expand and quote in one step so we don't have to search for the -*************** -*** 11624,11627 **** ---- 11629,11638 ---- - for (nl = l; nl; nl = nl->next) - { -+ #if ASSOC_KVPAIR_ASSIGNMENT -+ if (kvpair) -+ /* keys and values undergo the same set of expansions */ -+ t = expand_and_quote_kvpair_word (nl->word->word); -+ else -+ #endif - if ((nl->word->flags & W_ASSIGNMENT) == 0) - t = sh_single_quote (nl->word->word ? nl->word->word : ""); - -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 2e547c8c30..4660e9d38a 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://mirror.keystealth.org/gnu/bash/bash-5.1.tar.gz.sig -sha256 cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig +sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 7b853ece08..3aca22898e 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.1 +BASH_VERSION = 5.1.16 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ From yann.morin.1998 at free.fr Thu Jan 20 20:44:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:44:02 +0100 Subject: [Buildroot] [PATCH v1] package/hdparm: bump version to 9.63 In-Reply-To: <20220120192738.11310-1-ps.report@gmx.net> References: <20220120192738.11310-1-ps.report@gmx.net> Message-ID: <20220120204402.GB3252931@scaer> Peter, All, On 2022-01-20 20:27 +0100, Peter Seiderer spake thusly: > For details see [1]. > > [1] https://sourceforge.net/p/hdparm/news/2022/01/hdparm-963-is-released- > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/hdparm/hdparm.hash | 2 +- > package/hdparm/hdparm.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash > index b37826caf2..c039481f77 100644 > --- a/package/hdparm/hdparm.hash > +++ b/package/hdparm/hdparm.hash > @@ -1,5 +1,5 @@ > # From https://sourceforge.net/projects/hdparm/files/hdparm/ > -sha1 100b9a5551b71d87b446b415d56c5d45ac41d131 hdparm-9.62.tar.gz > +sha1 c8e24233b4d29506907ad2bf0725f793106c3a78 hdparm-9.63.tar.gz > # Locally computed > sha256 2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f hdparm-9.62.tar.gz > sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT > diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk > index 6a71c14fa7..2c3b372deb 100644 > --- a/package/hdparm/hdparm.mk > +++ b/package/hdparm/hdparm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HDPARM_VERSION = 9.62 > +HDPARM_VERSION = 9.63 > HDPARM_SITE = https://downloads.sourceforge.net/project/hdparm/hdparm > HDPARM_LICENSE = BSD-Style > HDPARM_LICENSE_FILES = LICENSE.TXT > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 20 20:44:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:44:15 +0100 Subject: [Buildroot] [PATCH v1] package/bash: bump version to 5.1.16 In-Reply-To: <20220120192626.11046-1-ps.report@gmx.net> References: <20220120192626.11046-1-ps.report@gmx.net> Message-ID: <20220120204415.GC3252931@scaer> Peter, All, On 2022-01-20 20:26 +0100, Peter Seiderer spake thusly: > - remove upstream patch level patches > 0001-bash51-001.patch > 0002-bash51-002.patch > 0003-bash51-003.patch > 0004-bash51-004.patch > > - renumber remaining patches > > For details see [1]. > > [1] http://git.savannah.gnu.org/cgit/bash.git/log > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/bash/0001-bash51-001.patch | 83 ----------- > ...ut.h-add-missing-include-on-stdio.h.patch} | 0 > package/bash/0002-bash51-002.patch | 60 -------- > ...ocal_shiftstates-vs.-locale_shiftst.patch} | 0 > package/bash/0003-bash51-003.patch | 56 -------- > ...uote_pathname-vs.-udequote_pathname.patch} | 0 > package/bash/0004-bash51-004.patch | 129 ------------------ > package/bash/bash.hash | 4 +- > package/bash/bash.mk | 2 +- > 9 files changed, 3 insertions(+), 331 deletions(-) > delete mode 100644 package/bash/0001-bash51-001.patch > rename package/bash/{0005-input.h-add-missing-include-on-stdio.h.patch => 0001-input.h-add-missing-include-on-stdio.h.patch} (100%) > delete mode 100644 package/bash/0002-bash51-002.patch > rename package/bash/{0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch => 0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch} (100%) > delete mode 100644 package/bash/0003-bash51-003.patch > rename package/bash/{0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch => 0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch} (100%) > delete mode 100644 package/bash/0004-bash51-004.patch > > diff --git a/package/bash/0001-bash51-001.patch b/package/bash/0001-bash51-001.patch > deleted file mode 100644 > index 8f18cccc31..0000000000 > --- a/package/bash/0001-bash51-001.patch > +++ /dev/null > @@ -1,83 +0,0 @@ > -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-001] > -Signed-off-by: Peter Seiderer > - > - BASH PATCH REPORT > - ================= > - > -Bash-Release: 5.1 > -Patch-ID: bash51-001 > - > -Bug-Reported-by: Fazal Majid > -Bug-Reference-ID: > -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00000.html > - > -Bug-Description: > - > -There is a missing dependency on a constructed file, which can cause highly > -parellel builds to fail. > - > -Patch (apply with `patch -p0'): > - > -*** ../bash-5.1-patched/Makefile.in 2020-12-04 09:51:19.000000000 -0500 > ---- b/Makefile.in 2020-12-16 11:28:36.000000000 -0500 > -*************** > -*** 1316,1319 **** > ---- 1316,1320 ---- > - bashline.o: pcomplete.h ${BASHINCDIR}/chartypes.h input.h > - bashline.o: ${BASHINCDIR}/shmbutil.h ${BASHINCDIR}/shmbchar.h > -+ bashline.o: ${DEFDIR}/builtext.h > - bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h > - bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h > -*************** > -*** 1436,1439 **** > ---- 1437,1441 ---- > - builtins/evalstring.o: jobs.h builtins.h flags.h input.h execute_cmd.h > - builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h pathnames.h > -+ builtins/evalstring.o: ${DEFDIR}/builtext.h > - builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h > - builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h xmalloc.h error.h > - > -*** ../bash-5.1-patched/builtins/Makefile.in 2019-07-25 08:03:45.000000000 -0400 > ---- b/builtins/Makefile.in 2020-12-16 11:29:29.000000000 -0500 > -*************** > -*** 362,366 **** > - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h > - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h > -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h > - #evalstring.o: $(topdir)/y.tab.h > - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h > ---- 362,366 ---- > - evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h > - evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h > -! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h ./builtext.h > - #evalstring.o: $(topdir)/y.tab.h > - getopt.o: ../config.h $(BASHINCDIR)/memalloc.h > - > -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 > ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 > -*************** > -*** 1,5 **** > - /* patchlevel.h -- current bash patch level */ > - > -! /* Copyright (C) 2001-2016 Free Software Foundation, Inc. > - > - This file is part of GNU Bash, the Bourne Again SHell. > ---- 1,5 ---- > - /* patchlevel.h -- current bash patch level */ > - > -! /* Copyright (C) 2001-2020 Free Software Foundation, Inc. > - > - This file is part of GNU Bash, the Bourne Again SHell. > -*************** > -*** 26,30 **** > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 0 > - > - #endif /* _PATCHLEVEL_H_ */ > ---- 26,30 ---- > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 1 > - > - #endif /* _PATCHLEVEL_H_ */ > diff --git a/package/bash/0005-input.h-add-missing-include-on-stdio.h.patch b/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch > similarity index 100% > rename from package/bash/0005-input.h-add-missing-include-on-stdio.h.patch > rename to package/bash/0001-input.h-add-missing-include-on-stdio.h.patch > diff --git a/package/bash/0002-bash51-002.patch b/package/bash/0002-bash51-002.patch > deleted file mode 100644 > index c9836082c1..0000000000 > --- a/package/bash/0002-bash51-002.patch > +++ /dev/null > @@ -1,60 +0,0 @@ > -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-002] > -Signed-off-by: Peter Seiderer > - > - BASH PATCH REPORT > - ================= > - > -Bash-Release: 5.1 > -Patch-ID: bash51-002 > - > -Bug-Reported-by: oguzismailuysal at gmail.com > -Bug-Reference-ID: > -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00037.html > - > -Bug-Description: > - > -If there are no jobs, and the `-n' and `-p' options are both supplied to > -`wait', bash can assign a value to the variable name specified with `-p' > -instead of leaving it unset. > - > -Patch (apply with `patch -p0'): > - > -*** ../bash-5.1-patched/builtins/wait.def 2020-04-09 15:13:57.000000000 -0400 > ---- b/builtins/wait.def 2020-12-11 09:46:49.000000000 -0500 > -*************** > -*** 214,222 **** > - > - status = wait_for_any_job (wflags, &pstat); > -- if (status < 0) > -- status = 127; > -- > - if (vname && status >= 0) > - bind_var_to_int (vname, pstat.pid); > - if (list) > - unset_waitlist (); > ---- 214,222 ---- > - > - status = wait_for_any_job (wflags, &pstat); > - if (vname && status >= 0) > - bind_var_to_int (vname, pstat.pid); > -+ > -+ if (status < 0) > -+ status = 127; > - if (list) > - unset_waitlist (); > - > -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 > ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 > -*************** > -*** 26,30 **** > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 1 > - > - #endif /* _PATCHLEVEL_H_ */ > ---- 26,30 ---- > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 2 > - > - #endif /* _PATCHLEVEL_H_ */ > diff --git a/package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch > similarity index 100% > rename from package/bash/0006-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch > rename to package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch > diff --git a/package/bash/0003-bash51-003.patch b/package/bash/0003-bash51-003.patch > deleted file mode 100644 > index ff13fb0c9f..0000000000 > --- a/package/bash/0003-bash51-003.patch > +++ /dev/null > @@ -1,56 +0,0 @@ > -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-003] > -Signed-off-by: Peter Seiderer > - > - BASH PATCH REPORT > - ================= > - > -Bash-Release: 5.1 > -Patch-ID: bash51-003 > - > -Bug-Reported-by: oguzismailuysal at gmail.com > -Bug-Reference-ID: > -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00050.html > - > -Bug-Description: > - > -Bash does not put a command substitution process that is started to perform an > -expansion in a child process into the right process group where it can receive > -keyboard-generated signals. > - > -Patch (apply with `patch -p0'): > - > -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 > ---- b/subst.c 2020-12-12 13:50:11.000000000 -0500 > -*************** > -*** 6357,6362 **** > - #if defined (JOB_CONTROL) > - old_pipeline_pgrp = pipeline_pgrp; > -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */ > -! if ((subshell_environment & SUBSHELL_PIPE) == 0) > - pipeline_pgrp = shell_pgrp; > - cleanup_the_pipeline (); > ---- 6357,6364 ---- > - #if defined (JOB_CONTROL) > - old_pipeline_pgrp = pipeline_pgrp; > -! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or > -! we've already forked to run a disk command (and are expanding redirections, > -! for example). */ > -! if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0) > - pipeline_pgrp = shell_pgrp; > - cleanup_the_pipeline (); > - > -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 > ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 > -*************** > -*** 26,30 **** > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 2 > - > - #endif /* _PATCHLEVEL_H_ */ > ---- 26,30 ---- > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 3 > - > - #endif /* _PATCHLEVEL_H_ */ > diff --git a/package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch > similarity index 100% > rename from package/bash/0007-glob-fix-dequote_pathname-vs.-udequote_pathname.patch > rename to package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch > diff --git a/package/bash/0004-bash51-004.patch b/package/bash/0004-bash51-004.patch > deleted file mode 100644 > index 48a38645f7..0000000000 > --- a/package/bash/0004-bash51-004.patch > +++ /dev/null > @@ -1,129 +0,0 @@ > -[From http://mirror.keystealth.org/gnu/bash/bash-5.1-patches/bash51-004] > -Signed-off-by: Peter Seiderer > - > - BASH PATCH REPORT > - ================= > - > -Bash-Release: 5.1 > -Patch-ID: bash51-004 > - > -Bug-Reported-by: oguzismailuysal at gmail.com > -Bug-Reference-ID: > -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00039.html > - > -Bug-Description: > - > -If a key-value compound array assignment to an associative array is supplied > -as an assignment statement argument to the `declare' command that declares the > -array, the assignment doesn't perform the correct word expansions. > - > -This patch makes key-value assignment and subscript assignment perform the > -same expansions when they're supplied as an argument to `declare'. > - > -Patch (apply with `patch -p0'): > - > -*** ../bash-5.1-patched/arrayfunc.c 2020-10-09 11:38:58.000000000 -0400 > ---- b/arrayfunc.c 2020-12-11 15:12:22.000000000 -0500 > -*************** > -*** 598,601 **** > ---- 598,622 ---- > - } > - } > -+ > -+ /* Return non-zero if L appears to be a key-value pair associative array > -+ compound assignment. */ > -+ int > -+ kvpair_assignment_p (l) > -+ WORD_LIST *l; > -+ { > -+ return (l && (l->word->flags & W_ASSIGNMENT) == 0 && l->word->word[0] != '['); /*]*/ > -+ } > -+ > -+ char * > -+ expand_and_quote_kvpair_word (w) > -+ char *w; > -+ { > -+ char *t, *r; > -+ > -+ t = w ? expand_assignment_string_to_string (w, 0) : 0; > -+ r = sh_single_quote (t ? t : ""); > -+ free (t); > -+ return r; > -+ } > - #endif > - > -*************** > -*** 641,645 **** > - > - #if ASSOC_KVPAIR_ASSIGNMENT > -! if (assoc_p (var) && nlist && (nlist->word->flags & W_ASSIGNMENT) == 0 && nlist->word->word[0] != '[') /*]*/ > - { > - iflags = flags & ~ASS_APPEND; > ---- 662,666 ---- > - > - #if ASSOC_KVPAIR_ASSIGNMENT > -! if (assoc_p (var) && kvpair_assignment_p (nlist)) > - { > - iflags = flags & ~ASS_APPEND; > -*** ../bash-5.1-patched/arrayfunc.h 2020-04-29 17:24:15.000000000 -0400 > ---- b/arrayfunc.h 2020-12-11 14:23:50.000000000 -0500 > -*************** > -*** 68,71 **** > ---- 68,74 ---- > - extern void quote_compound_array_list PARAMS((WORD_LIST *, int)); > - > -+ extern int kvpair_assignment_p PARAMS((WORD_LIST *)); > -+ extern char *expand_and_quote_kvpair_word PARAMS((char *)); > -+ > - extern int unbind_array_element PARAMS((SHELL_VAR *, char *, int)); > - extern int skipsubscript PARAMS((const char *, int, int)); > -*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500 > ---- b/subst.c 2020-12-11 15:11:10.000000000 -0500 > -*************** > -*** 11605,11608 **** > ---- 11605,11609 ---- > - WORD_LIST *l, *nl; > - char *t; > -+ int kvpair; > - > - if (flags == 0) > -*************** > -*** 11619,11622 **** > ---- 11620,11627 ---- > - /* Associative array */ > - l = parse_string_to_word_list (value, 1, "array assign"); > -+ #if ASSOC_KVPAIR_ASSIGNMENT > -+ kvpair = kvpair_assignment_p (l); > -+ #endif > -+ > - /* For associative arrays, with their arbitrary subscripts, we have to > - expand and quote in one step so we don't have to search for the > -*************** > -*** 11624,11627 **** > ---- 11629,11638 ---- > - for (nl = l; nl; nl = nl->next) > - { > -+ #if ASSOC_KVPAIR_ASSIGNMENT > -+ if (kvpair) > -+ /* keys and values undergo the same set of expansions */ > -+ t = expand_and_quote_kvpair_word (nl->word->word); > -+ else > -+ #endif > - if ((nl->word->flags & W_ASSIGNMENT) == 0) > - t = sh_single_quote (nl->word->word ? nl->word->word : ""); > - > -*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 > ---- b/patchlevel.h 2020-10-01 11:01:28.000000000 -0400 > -*************** > -*** 26,30 **** > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 3 > - > - #endif /* _PATCHLEVEL_H_ */ > ---- 26,30 ---- > - looks for to find the patch level (for the sccs version string). */ > - > -! #define PATCHLEVEL 4 > - > - #endif /* _PATCHLEVEL_H_ */ > diff --git a/package/bash/bash.hash b/package/bash/bash.hash > index 2e547c8c30..4660e9d38a 100644 > --- a/package/bash/bash.hash > +++ b/package/bash/bash.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature from > -# http://mirror.keystealth.org/gnu/bash/bash-5.1.tar.gz.sig > -sha256 cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.gz > +# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig > +sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/bash/bash.mk b/package/bash/bash.mk > index 7b853ece08..3aca22898e 100644 > --- a/package/bash/bash.mk > +++ b/package/bash/bash.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BASH_VERSION = 5.1 > +BASH_VERSION = 5.1.16 > BASH_SITE = $(BR2_GNU_MIRROR)/bash > BASH_DEPENDENCIES = ncurses readline host-bison > BASH_LICENSE = GPL-3.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 20 20:54:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:54:25 +0100 Subject: [Buildroot] [git commit] package/hwdata: bump version to 355 Message-ID: <20220120205513.8B52F82DC1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b61f0d74c9b91f225e1ec15766c572fe4c9e0b24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- 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 43cca03b06..7861106859 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ed9a2c8b90371ccf4f0ff88972d87770c1c644e63ca44d2ac72c33200642cdde hwdata-0.354.tar.gz +sha256 0d3d21af57822f35141b524808fd9e4823dbb413df338606195010dc0aa1c935 hwdata-0.355.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 71b59b95ed..4dd9c9e28e 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.354 +HWDATA_VERSION = 0.355 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 yann.morin.1998 at free.fr Thu Jan 20 20:54:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 21:54:28 +0100 Subject: [Buildroot] [git commit] package/hwloc: bump version to 2.7.0 Message-ID: <20220120205513.9912F82A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9757e7d99ec02f2464bbd4120c2c260d8bfc7e22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/open-mpi/hwloc/blob/hwloc-2.7.0/NEWS Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/hwloc/hwloc.hash | 4 ++-- package/hwloc/hwloc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index e207a6bb1a..ca77e3301c 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,4 +1,4 @@ -# From https://www.open-mpi.org/software/hwloc/v2.4/ -sha256 392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63 hwloc-2.4.1.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.7/ +sha256 028cee53ebcfe048283a2b3e87f2fa742c83645fc3ae329134bf5bb8b90384e0 hwloc-2.7.0.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 2a5a82cea4..04543a7e64 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,8 +4,8 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.4 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 +HWLOC_VERSION_MAJOR = 2.7 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause From angelo at amarulasolutions.com Thu Jan 20 21:19:41 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Thu, 20 Jan 2022 22:19:41 +0100 Subject: [Buildroot] [PATCH] package/htpdate: bump to version 1.3.3 Message-ID: <20220120211941.1033249-1-angelo@amarulasolutions.com> Update project to its new location and move to use the package provided init scripts. Signed-off-by: Angelo Compagnucci --- package/htpdate/S43htpdate | 51 --------------------------------- package/htpdate/htpdate.hash | 2 +- package/htpdate/htpdate.mk | 6 ++-- package/htpdate/htpdate.service | 13 --------- 4 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 package/htpdate/S43htpdate delete mode 100644 package/htpdate/htpdate.service diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate deleted file mode 100644 index 75f9a995ff..0000000000 --- a/package/htpdate/S43htpdate +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -DAEMON="htpdate" -PIDFILE="/var/run/$DAEMON.pid" - -HTPDATE_ARGS="-a -s -t https://google.com" -test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" - -start() { - printf 'Starting %s: ' "$DAEMON" - # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ - -- -D -i "$PIDFILE" $HTPDATE_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - start -} - -case "$1" in - start|stop|restart) - "$1";; - reload) - # Restart, since there is no true "reload" feature. - restart;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index c38e8784e1..ef27f8f94c 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 f6fb63b18a0d836fda721ae5655ae0b87055db1b582e98c4700f64e1ba5e2d5a htpdate-1.3.1.tar.gz +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index e9323f9106..3c4412b283 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTPDATE_VERSION = 1.3.1 +HTPDATE_VERSION = 1.3.3 HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE @@ -23,12 +23,12 @@ define HTPDATE_INSTALL_TARGET_CMDS endef define HTPDATE_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/htpdate/S43htpdate \ + $(INSTALL) -D -m 0755 $(@D)/scripts/htpdate.init \ $(TARGET_DIR)/etc/init.d/S43htpdate endef define HTPDATE_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/htpdate/htpdate.service \ + $(INSTALL) -D -m 0644 $(@D)/scripts/htpdate.service \ $(TARGET_DIR)/usr/lib/systemd/system/htpdate.service endef diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service deleted file mode 100644 index b7f1371b08..0000000000 --- a/package/htpdate/htpdate.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=htpdate daemon -After=network.target - -[Service] -Type=forking -PIDFile=/run/htpdate.pid -Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" -EnvironmentFile=-/etc/default/htpdate -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS - -[Install] -WantedBy=multi-user.target -- 2.25.1 From yann.morin.1998 at free.fr Thu Jan 20 21:29:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 22:29:16 +0100 Subject: [Buildroot] [PATCH v1] package/hwdata: bump version to 355 In-Reply-To: <20220120172139.25705-1-ps.report@gmx.net> References: <20220120172139.25705-1-ps.report@gmx.net> Message-ID: <20220120212916.GD3252931@scaer> Peter, All, On 2022-01-20 18:21 +0100, Peter Seiderer spake thusly: > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 43cca03b06..7861106859 100644 > --- a/package/hwdata/hwdata.hash > +++ b/package/hwdata/hwdata.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 ed9a2c8b90371ccf4f0ff88972d87770c1c644e63ca44d2ac72c33200642cdde hwdata-0.354.tar.gz > +sha256 0d3d21af57822f35141b524808fd9e4823dbb413df338606195010dc0aa1c935 hwdata-0.355.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE > diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk > index 71b59b95ed..4dd9c9e28e 100644 > --- a/package/hwdata/hwdata.mk > +++ b/package/hwdata/hwdata.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HWDATA_VERSION = 0.354 > +HWDATA_VERSION = 0.355 > HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) > HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 > HWDATA_LICENSE_FILES = COPYING LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ps.report at gmx.net Thu Jan 20 21:29:36 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 22:29:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> Message-ID: <20220120222936.6e7b5aba@gmx.net> Hello James, Yann, On Wed, 19 Jan 2022 17:42:46 -0700, James Hilliard wrote: > On Wed, Jan 19, 2022 at 1:45 PM Yann E. MORIN wrote: > > > > James, All, > > > > On 2022-01-19 01:45 -0700, James Hilliard spake thusly: > > > The cmake build appears to be missing features such as pkg-config > > > generation support, switch to the regular makefile based build > > > which appears to work better. > > > > Can't we just fix the CMakeList.txt and submit a patch upstream, > > instead? > > It looked like this had been brought up before and there was some issue that was > making this difficult to fix with cmake. > See: > https://github.com/google/re2/issues/349 > > > > > Also, see below... > > > > > Signed-off-by: James Hilliard > > > --- > > > package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- > > > 1 file changed, 26 insertions(+), 4 deletions(-) > > > > > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > > > index b562d5d7ef..144c82339f 100644 > > > --- a/package/re2/re2.mk > > > +++ b/package/re2/re2.mk > > > @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause > > > RE2_LICENSE_FILES = LICENSE > > > RE2_INSTALL_STAGING = YES > > > > > > -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > > -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > > +define RE2_BUILD_CMDS > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > + -C $(@D) > > > +endef > > > > > > -$(eval $(cmake-package)) > > > -$(eval $(host-cmake-package)) > > > +define RE2_INSTALL_STAGING_CMDS > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install > > > +endef > > > + > > > +define RE2_INSTALL_TARGET_CMDS > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install > > > > The 'install' target will forcibly build and install static and shared > > libs: > > > > https://github.com/google/re2/blob/main/Makefile#L297 > > > > 296: .PHONY: install > > 297: install: static-install shared-install > > > > So, this is probably going to not play nicely for builds where a shared > > build is not possible. > > Sent a v2 which should fix this: > https://patchwork.ozlabs.org/project/buildroot/patch/20220120003827.395469-1-james.hilliard1 at gmail.com/ > > > > > AFAICS, the cmake-based buildsystem got that one correct, though, so it > > would be a bit of a shame to regress on that point... > > Or keep the cmake build and do the following to install re2.pc (taken from #349, [1]): --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -9,9 +9,20 @@ RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES +# keep original Makefile (for re2.pc install) +RE2_SUPPORTS_IN_SOURCE_BUILD = NO RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON +# install re2.pc +define RE2_INSTALL_PKG_CONFIG + $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) \ + libdir=/usr/lib includedir=/usr/include \ + common-install +endef + +RE2_POST_INSTALL_STAGING_HOOKS += RE2_INSTALL_PKG_CONFIG + $(eval $(cmake-package)) $(eval $(host-cmake-package)) Regards, Peter [1] https://github.com/macports/macports-ports/pull/9836#issuecomment-807868854 > > Regards, > > Yann E. MORIN. > > > > > +endef > > > + > > > +define HOST_RE2_BUILD_CMDS > > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > > + -C $(@D) > > > +endef > > > + > > > +define HOST_RE2_INSTALL_CMDS > > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > > + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install > > > +endef > > > + > > > +$(eval $(generic-package)) > > > +$(eval $(host-generic-package)) > > > -- > > > 2.25.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > -- > > .-----------------.--------------------.------------------.--------------------. > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From yann.morin.1998 at free.fr Thu Jan 20 21:29:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 20 Jan 2022 22:29:48 +0100 Subject: [Buildroot] [PATCH v1] package/hwloc: bump version to 2.7.0 In-Reply-To: <20220120174939.27055-1-ps.report@gmx.net> References: <20220120174939.27055-1-ps.report@gmx.net> Message-ID: <20220120212948.GE3252931@scaer> Peter, All, On 2022-01-20 18:49 +0100, Peter Seiderer spake thusly: > For details see [1]. > > [1] https://github.com/open-mpi/hwloc/blob/hwloc-2.7.0/NEWS > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/hwloc/hwloc.hash | 4 ++-- > package/hwloc/hwloc.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash > index e207a6bb1a..ca77e3301c 100644 > --- a/package/hwloc/hwloc.hash > +++ b/package/hwloc/hwloc.hash > @@ -1,4 +1,4 @@ > -# From https://www.open-mpi.org/software/hwloc/v2.4/ > -sha256 392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63 hwloc-2.4.1.tar.bz2 > +# From https://www.open-mpi.org/software/hwloc/v2.7/ > +sha256 028cee53ebcfe048283a2b3e87f2fa742c83645fc3ae329134bf5bb8b90384e0 hwloc-2.7.0.tar.bz2 > # Locally computed > sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING > diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk > index 2a5a82cea4..04543a7e64 100644 > --- a/package/hwloc/hwloc.mk > +++ b/package/hwloc/hwloc.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -HWLOC_VERSION_MAJOR = 2.4 > -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 > +HWLOC_VERSION_MAJOR = 2.7 > +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 > HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 > HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) > HWLOC_LICENSE = BSD-3-Clause > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ps.report at gmx.net Thu Jan 20 21:43:00 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 20 Jan 2022 22:43:00 +0100 Subject: [Buildroot] [PATCH v1] package/readline: bump version to 8.1.2 Message-ID: <20220120214300.8626-1-ps.report@gmx.net> For details see [1]. [1] http://git.savannah.gnu.org/cgit/readline.git/log Signed-off-by: Peter Seiderer --- package/readline/readline.hash | 5 +++-- package/readline/readline.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/readline/readline.hash b/package/readline/readline.hash index 63172f1121..b0530a2d72 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,5 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 readline-8.1.tar.gz +# Locally calculated after checking pgp signature from +# https://ftp.gnu.org/gnu/readline/readline-8.1.2.tar.gz.sig +sha256 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 readline-8.1.2.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 06a96b67a8..b1fd181b78 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.1 +READLINE_VERSION = 8.1.2 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Jan 20 22:13:32 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 20 Jan 2022 23:13:32 +0100 Subject: [Buildroot] [PATCH v3] board/orangepi/orangepi-zero: bump Linux and U-Boot versions In-Reply-To: <20220120185043.7745-1-kuzminov.sergey81@gmail.com> References: <20220120185043.7745-1-kuzminov.sergey81@gmail.com> Message-ID: Hi Sergey, On 20/01/22 19:50, Sergey Kuzminov wrote: > v1: > - Linux: bump to version 5.12.19 (from 5.12.2). > - U-Boot: bump to version 2022.01 (from 2021.04). > - Added fast_commit for ext4. When creating a file system with this option, writing speeds up twice in some cases: https://lwn.net/Articles/834483/ > - Refactoring configs/orangepi_zero_defconfig. > - Switched to extlinux. > - Createed common scenarios for multiple boards to create an SD image: board/orangepi/common. > > v2: > - Linux: bump to version 5.16.1 (from 5.12.19) thanks to a patch from Giulio for xr819-xradio (link below). On (link below) use [1] instead and then... > - Added in genimage.cfg: partition rootfs {offset = 1M} to prevent possible alignment error. > - Added BR2_ARM_EABIHF=y to make it visible in the config file, previously added implicitly. > - Replaced BR2_ARM_FPU_VFPV4 with BR2_ARM_FPU_NEON_VFPV4 because processor supports it. > - Deleted BR2_GCC_ENABLE_LTO=y, added by mistake. > > v3: > - Changed the name of the patch (from board/orangepi/orangepi-zero:extlinux, refactoring). > - Linux: bump to version 5.16.2 (from 5.16.1). > - Returned (# BR2_TARGET_ROOTFS_TAR is not set) instead of (BR2_TARGET_ROOTFS_TAR=n), added in v1. > - Renamed file uboot-extras.config -> uboot-extras.fragment. > - Renamed file linux-extras.config -> linux-extras.fragment. > - Deleted (#BR2_ARM_INSTRUCTIONS_THUMB2=y), added in v2. > > Patch required to work: > https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ ...put here: [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ > > Signed-off-by: Sergey Kuzminov --- all V1->V2, V2->V3 changes go here with the 3 dashes above And you need to keep V1 as commit log, not listing it here, so it has to summarize what this patch does. I'm wondering if maybe it makes sense to split it up to more than one patch. You're doing lot of stuff in this patch that can be bisectable even with different patches. So please try to move some changes into other patches and keep this one doing what the subject tells: bump Linux and U-Boot versions > --- > board/orangepi/common/extlinux.conf | 5 ++ > board/orangepi/common/genimage.cfg | 20 ++++++ > board/orangepi/common/post-build.sh | 34 ++++++++++ > board/orangepi/common/uboot-extras.fragment | 3 + > board/orangepi/orangepi-zero/boot.cmd | 9 --- > board/orangepi/orangepi-zero/genimage.cfg | 36 ---------- > ...ux-extras.config => linux-extras.fragment} | 0 > configs/orangepi_zero_defconfig | 68 +++++++++++-------- > 8 files changed, 103 insertions(+), 72 deletions(-) > create mode 100644 board/orangepi/common/extlinux.conf > create mode 100644 board/orangepi/common/genimage.cfg > create mode 100755 board/orangepi/common/post-build.sh > create mode 100644 board/orangepi/common/uboot-extras.fragment > delete mode 100644 board/orangepi/orangepi-zero/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg > rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) > > diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf > new file mode 100644 > index 0000000000..015f29270e > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,5 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + append root=PARTUUID=%PARTUUID% rootwait console=${console} > +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..8b80ffb138 > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = gpt > + gpt-no-backup = true > + gpt-location = 1008K # 1MB - 16KB > + } > + > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB - 16KB > + } > + > + partition rootfs { > + offset = 1M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} Here you add a common genimage.cfg, so another patch(including the removal of the one specific genimage.cfg below) > diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh > new file mode 100755 > index 0000000000..296f94b174 > --- /dev/null > +++ b/board/orangepi/common/post-build.sh > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +linux_image() > +{ > + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then > + echo "uImage" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then > + echo "Image" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then > + echo "Image.gz" > + else > + echo "zImage" > + fi > +} > + > +generic_getty() > +{ > + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then > + echo "" > + else > + echo "s/\s*console=\S*//" > + fi > +} > + > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > + > +sed -e "$(generic_getty)" \ > + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ > + -e "s/%PARTUUID%/$PARTUUID/g" \ > + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > + > +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" here ^^^ you add the post-build.sh and including its defconfig option should be another patch. And this should go with the adding of extlinux.conf above because it's related. > diff --git a/board/orangepi/common/uboot-extras.fragment b/board/orangepi/common/uboot-extras.fragment > new file mode 100644 > index 0000000000..5aa97523d9 > --- /dev/null > +++ b/board/orangepi/common/uboot-extras.fragment > @@ -0,0 +1,3 @@ > +CONFIG_BOOTDELAY=0 > +CONFIG_USE_PREBOOT=y > +CONFIG_PREBOOT="setenv preboot;" > diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd > deleted file mode 100644 > index d094a64fe5..0000000000 > --- a/board/orangepi/orangepi-zero/boot.cmd > +++ /dev/null > @@ -1,9 +0,0 @@ > -setenv fdt_high ffffffff > - > -part uuid mmc 0:2 uuid > -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r This ^^^ must be added to extlinux.conf replacing patch. > diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg > deleted file mode 100644 > index 32f5454ae6..0000000000 > --- a/board/orangepi/orangepi-zero/genimage.cfg > +++ /dev/null > @@ -1,36 +0,0 @@ > -# Minimal SD card image for the OrangePi Zero > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h2-plus-orangepi-zero.dtb", > - "boot.scr" > - } > - } > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment > similarity index 100% > rename from board/orangepi/orangepi-zero/linux-extras.config > rename to board/orangepi/orangepi-zero/linux-extras.fragment > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..430d38af3e 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,49 +1,63 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > -BR2_ARM_FPU_VFPV4=y > +BR2_ARM_EABIHF=y > +BR2_ARM_FPU_NEON_VFPV4=y This FPU stuff ^^^ is another patch > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" > -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -# BR2_TARGET_ROOTFS_TAR is not set > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > -BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y Here ^^^ you move lines down, and there can be a patch for only reordering stuff, 1 for uboot and 1 for linux. > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.fragment" This ^^^ goes with uboot-extras.fragment common patch > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.2" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y This ^^^ is ok, but you also moved the lines > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > +# BR2_TARGET_ROOTFS_TAR is not set This ^^^ ? If there is a reason is another patch, and ofc the removal of # not set goes together > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cf > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_GENIMAGE=y This ^^^ goes with common genimage.cfg patch > > -# wireless driver and firmware > +# Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > BR2_PACKAGE_ARMBIAN_FIRMWARE=y > BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y > > -# wireless support > +# Wireless support > BR2_PACKAGE_IW=y > BR2_PACKAGE_WIRELESS_TOOLS=y > BR2_PACKAGE_WIRELESS_TOOLS_LIB=y > @@ -51,5 +65,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > > -# spi flash support > +# Spi flash support > BR2_PACKAGE_MTD=y > Various comment capitalizing is another patch. So I would expect a patchset with like 6/7 patches. Otherwise you move a lot of stuff all in once. But keep in mind that it must be bisectable, so this defconfig has to produce something working after applying every single patch. Kind regards! -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Jan 20 22:14:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 20 Jan 2022 23:14:38 +0100 Subject: [Buildroot] [PATCH v3] board/orangepi/orangepi-zero: bump Linux and U-Boot versions In-Reply-To: References: <20220120185043.7745-1-kuzminov.sergey81@gmail.com> Message-ID: <4a5824ea-2704-d3bd-9b76-ac6f629be230@benettiengineering.com> Ah, sorry for top-posting. Please put me in Cc on next iteration. Thank you :-) -- Giulio Benetti Benetti Engineering sas On 20/01/22 23:13, Giulio Benetti wrote: > Hi Sergey, > > On 20/01/22 19:50, Sergey Kuzminov wrote: >> v1: >> - Linux: bump to version 5.12.19 (from 5.12.2). >> - U-Boot: bump to version 2022.01 (from 2021.04). >> - Added fast_commit for ext4. When creating a file system with this option, writing speeds up twice in some cases: https://lwn.net/Articles/834483/ >> - Refactoring configs/orangepi_zero_defconfig. >> - Switched to extlinux. >> - Createed common scenarios for multiple boards to create an SD image: board/orangepi/common. >> >> v2: >> - Linux: bump to version 5.16.1 (from 5.12.19) thanks to a patch from Giulio for xr819-xradio (link below). > > On (link below) use [1] instead and then... > >> - Added in genimage.cfg: partition rootfs {offset = 1M} to prevent possible alignment error. >> - Added BR2_ARM_EABIHF=y to make it visible in the config file, previously added implicitly. >> - Replaced BR2_ARM_FPU_VFPV4 with BR2_ARM_FPU_NEON_VFPV4 because processor supports it. >> - Deleted BR2_GCC_ENABLE_LTO=y, added by mistake. >> >> v3: >> - Changed the name of the patch (from board/orangepi/orangepi-zero:extlinux, refactoring). >> - Linux: bump to version 5.16.2 (from 5.16.1). >> - Returned (# BR2_TARGET_ROOTFS_TAR is not set) instead of (BR2_TARGET_ROOTFS_TAR=n), added in v1. >> - Renamed file uboot-extras.config -> uboot-extras.fragment. >> - Renamed file linux-extras.config -> linux-extras.fragment. >> - Deleted (#BR2_ARM_INSTRUCTIONS_THUMB2=y), added in v2. >> >> Patch required to work: >> https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ > > ...put here: > [1]: > https://patchwork.ozlabs.org/project/buildroot/patch/20220118063531.2039729-1-giulio.benetti at benettiengineering.com/ > >> >> Signed-off-by: Sergey Kuzminov > > --- > all V1->V2, V2->V3 changes go here with the 3 dashes above > And you need to keep V1 as commit log, not listing it here, so it has to > summarize what this patch does. I'm wondering if maybe it makes sense to > split it up to more than one patch. You're doing lot of stuff in this > patch that can be bisectable even with different patches. So please try > to move some changes into other patches and keep this one doing what the > subject tells: > bump Linux and U-Boot versions > >> --- >> board/orangepi/common/extlinux.conf | 5 ++ >> board/orangepi/common/genimage.cfg | 20 ++++++ >> board/orangepi/common/post-build.sh | 34 ++++++++++ >> board/orangepi/common/uboot-extras.fragment | 3 + >> board/orangepi/orangepi-zero/boot.cmd | 9 --- >> board/orangepi/orangepi-zero/genimage.cfg | 36 ---------- >> ...ux-extras.config => linux-extras.fragment} | 0 >> configs/orangepi_zero_defconfig | 68 +++++++++++-------- >> 8 files changed, 103 insertions(+), 72 deletions(-) >> create mode 100644 board/orangepi/common/extlinux.conf >> create mode 100644 board/orangepi/common/genimage.cfg >> create mode 100755 board/orangepi/common/post-build.sh >> create mode 100644 board/orangepi/common/uboot-extras.fragment >> delete mode 100644 board/orangepi/orangepi-zero/boot.cmd >> delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg >> rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) >> >> diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf >> new file mode 100644 >> index 0000000000..015f29270e >> --- /dev/null >> +++ b/board/orangepi/common/extlinux.conf >> @@ -0,0 +1,5 @@ >> +LABEL default >> + kernel /boot/%LINUXIMAGE% >> + devicetreedir /boot >> + append root=PARTUUID=%PARTUUID% rootwait console=${console} >> +# append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 >> diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg >> new file mode 100644 >> index 0000000000..8b80ffb138 >> --- /dev/null >> +++ b/board/orangepi/common/genimage.cfg >> @@ -0,0 +1,20 @@ >> +image sdcard.img { >> + hdimage { >> + partition-table-type = gpt >> + gpt-no-backup = true >> + gpt-location = 1008K # 1MB - 16KB >> + } >> + >> + partition u-boot { >> + in-partition-table = false >> + image = "u-boot-sunxi-with-spl.bin" >> + offset = 8K >> + size = 1000K # 1MB - 8KB - 16KB >> + } >> + >> + partition rootfs { >> + offset = 1M >> + image = "rootfs.ext4" >> + partition-uuid = %PARTUUID% >> + } >> +} > > Here you add a common genimage.cfg, so another patch(including the > removal of the one specific genimage.cfg below) > >> diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh >> new file mode 100755 >> index 0000000000..296f94b174 >> --- /dev/null >> +++ b/board/orangepi/common/post-build.sh >> @@ -0,0 +1,34 @@ >> +#!/bin/sh >> + >> +linux_image() >> +{ >> + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then >> + echo "uImage" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then >> + echo "Image" >> + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then >> + echo "Image.gz" >> + else >> + echo "zImage" >> + fi >> +} >> + >> +generic_getty() >> +{ >> + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then >> + echo "" >> + else >> + echo "s/\s*console=\S*//" >> + fi >> +} >> + >> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >> + >> +install -d "$TARGET_DIR/boot/extlinux/" >> + >> +sed -e "$(generic_getty)" \ >> + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ >> + -e "s/%PARTUUID%/$PARTUUID/g" \ >> + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >> + >> +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > > here ^^^ you add the post-build.sh and including its defconfig option > should be another patch. And this should go with the adding of > extlinux.conf above because it's related. > >> diff --git a/board/orangepi/common/uboot-extras.fragment b/board/orangepi/common/uboot-extras.fragment >> new file mode 100644 >> index 0000000000..5aa97523d9 >> --- /dev/null >> +++ b/board/orangepi/common/uboot-extras.fragment >> @@ -0,0 +1,3 @@ >> +CONFIG_BOOTDELAY=0 >> +CONFIG_USE_PREBOOT=y >> +CONFIG_PREBOOT="setenv preboot;" >> diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd >> deleted file mode 100644 >> index d094a64fe5..0000000000 >> --- a/board/orangepi/orangepi-zero/boot.cmd >> +++ /dev/null >> @@ -1,9 +0,0 @@ >> -setenv fdt_high ffffffff >> - >> -part uuid mmc 0:2 uuid >> -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait >> - >> -fatload mmc 0 $kernel_addr_r zImage >> -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb >> - >> -bootz $kernel_addr_r - $fdt_addr_r > > This ^^^ must be added to extlinux.conf replacing patch. > >> diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg >> deleted file mode 100644 >> index 32f5454ae6..0000000000 >> --- a/board/orangepi/orangepi-zero/genimage.cfg >> +++ /dev/null >> @@ -1,36 +0,0 @@ >> -# Minimal SD card image for the OrangePi Zero >> -# >> -image boot.vfat { >> - vfat { >> - files = { >> - "zImage", >> - "sun8i-h2-plus-orangepi-zero.dtb", >> - "boot.scr" >> - } >> - } >> - size = 10M >> -} >> - >> -image sdcard.img { >> - hdimage { >> - } >> - >> - partition u-boot { >> - in-partition-table = "no" >> - image = "u-boot-sunxi-with-spl.bin" >> - offset = 8K >> - size = 1016K # 1MB - 8KB >> - } >> - >> - partition boot { >> - partition-type = 0xC >> - bootable = "true" >> - image = "boot.vfat" >> - } >> - >> - partition rootfs { >> - partition-type = 0x83 >> - image = "rootfs.ext4" >> - size = 512M >> - } >> -} >> diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment >> similarity index 100% >> rename from board/orangepi/orangepi-zero/linux-extras.config >> rename to board/orangepi/orangepi-zero/linux-extras.fragment >> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >> index 1c107b10e6..430d38af3e 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -1,49 +1,63 @@ >> +# Architecture >> BR2_arm=y >> BR2_cortex_a7=y >> -BR2_ARM_FPU_VFPV4=y >> +BR2_ARM_EABIHF=y >> +BR2_ARM_FPU_NEON_VFPV4=y > > This FPU stuff ^^^ is another patch > >> + >> +# System >> +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y >> -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" >> -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" >> BR2_SYSTEM_DHCP="eth0" >> -BR2_LINUX_KERNEL=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" >> -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> -BR2_LINUX_KERNEL_DTS_SUPPORT=y >> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" >> -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> -BR2_TARGET_ROOTFS_EXT2=y >> -BR2_TARGET_ROOTFS_EXT2_4=y >> -# BR2_TARGET_ROOTFS_TAR is not set > > > >> + >> +# Bootloader >> BR2_TARGET_UBOOT=y >> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" >> BR2_TARGET_UBOOT_NEEDS_DTC=y >> BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >> BR2_TARGET_UBOOT_SPL=y >> BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" >> -BR2_PACKAGE_HOST_DOSFSTOOLS=y >> -BR2_PACKAGE_HOST_GENIMAGE=y >> -BR2_PACKAGE_HOST_MTOOLS=y >> -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > Here ^^^ you move lines down, and there can be a patch for only > reordering stuff, 1 for uboot and 1 for linux. > >> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/common/uboot-extras.fragment" > > This ^^^ goes with uboot-extras.fragment common patch > >> + >> +# Kernel >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" >> +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.2" >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > This ^^^ is ok, but you also moved the lines > >> + >> +# Filesystem >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" >> +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,fast_commit" >> +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y >> +# BR2_TARGET_ROOTFS_TAR is not set > > This ^^^ ? If there is a reason is another patch, and ofc the removal of > # not set goes together > >> + >> +# Image >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cf > + >> +# Required tools to create the SD image >> +BR2_PACKAGE_HOST_GENIMAGE=y > > This ^^^ goes with common genimage.cfg patch > >> >> -# wireless driver and firmware >> +# Wireless driver and firmware >> BR2_PACKAGE_XR819_XRADIO=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE=y >> BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y >> >> -# wireless support >> +# Wireless support >> BR2_PACKAGE_IW=y >> BR2_PACKAGE_WIRELESS_TOOLS=y >> BR2_PACKAGE_WIRELESS_TOOLS_LIB=y >> @@ -51,5 +65,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y >> BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y >> BR2_PACKAGE_WPA_SUPPLICANT_CLI=y >> >> -# spi flash support >> +# Spi flash support >> BR2_PACKAGE_MTD=y >> > > Various comment capitalizing is another patch. > > So I would expect a patchset with like 6/7 patches. > > Otherwise you move a lot of stuff all in once. > But keep in mind that it must be bisectable, so this defconfig has to > produce something working after applying every single patch. > > Kind regards! > From james.hilliard1 at gmail.com Thu Jan 20 23:57:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 20 Jan 2022 16:57:22 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220120222936.6e7b5aba@gmx.net> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> Message-ID: On Thu, Jan 20, 2022 at 2:29 PM Peter Seiderer wrote: > > Hello James, Yann, > > On Wed, 19 Jan 2022 17:42:46 -0700, James Hilliard wrote: > > > On Wed, Jan 19, 2022 at 1:45 PM Yann E. MORIN wrote: > > > > > > James, All, > > > > > > On 2022-01-19 01:45 -0700, James Hilliard spake thusly: > > > > The cmake build appears to be missing features such as pkg-config > > > > generation support, switch to the regular makefile based build > > > > which appears to work better. > > > > > > Can't we just fix the CMakeList.txt and submit a patch upstream, > > > instead? > > > > It looked like this had been brought up before and there was some issue that was > > making this difficult to fix with cmake. > > See: > > https://github.com/google/re2/issues/349 > > > > > > > > Also, see below... > > > > > > > Signed-off-by: James Hilliard > > > > --- > > > > package/re2/re2.mk | 30 ++++++++++++++++++++++++++---- > > > > 1 file changed, 26 insertions(+), 4 deletions(-) > > > > > > > > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > > > > index b562d5d7ef..144c82339f 100644 > > > > --- a/package/re2/re2.mk > > > > +++ b/package/re2/re2.mk > > > > @@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause > > > > RE2_LICENSE_FILES = LICENSE > > > > RE2_INSTALL_STAGING = YES > > > > > > > > -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > > > -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > > > +define RE2_BUILD_CMDS > > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > > + -C $(@D) > > > > +endef > > > > > > > > -$(eval $(cmake-package)) > > > > -$(eval $(host-cmake-package)) > > > > +define RE2_INSTALL_STAGING_CMDS > > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > > + DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install > > > > +endef > > > > + > > > > +define RE2_INSTALL_TARGET_CMDS > > > > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > > > > + DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install > > > > > > The 'install' target will forcibly build and install static and shared > > > libs: > > > > > > https://github.com/google/re2/blob/main/Makefile#L297 > > > > > > 296: .PHONY: install > > > 297: install: static-install shared-install > > > > > > So, this is probably going to not play nicely for builds where a shared > > > build is not possible. > > > > Sent a v2 which should fix this: > > https://patchwork.ozlabs.org/project/buildroot/patch/20220120003827.395469-1-james.hilliard1 at gmail.com/ > > > > > > > > AFAICS, the cmake-based buildsystem got that one correct, though, so it > > > would be a bit of a shame to regress on that point... > > > > > Or keep the cmake build and do the following to install re2.pc (taken from #349, [1]): > > --- a/package/re2/re2.mk > +++ b/package/re2/re2.mk > @@ -9,9 +9,20 @@ RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) > RE2_LICENSE = BSD-3-Clause > RE2_LICENSE_FILES = LICENSE > RE2_INSTALL_STAGING = YES > +# keep original Makefile (for re2.pc install) > +RE2_SUPPORTS_IN_SOURCE_BUILD = NO > > RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > +# install re2.pc > +define RE2_INSTALL_PKG_CONFIG > + $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) \ > + libdir=/usr/lib includedir=/usr/include \ > + common-install > +endef > + > +RE2_POST_INSTALL_STAGING_HOOKS += RE2_INSTALL_PKG_CONFIG > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) > > Regards, > Peter > > [1] https://github.com/macports/macports-ports/pull/9836#issuecomment-807868854 There's a problem with this approach, the makefile with common-install gets overwritten by the one generated by cmake if cmake is used. > > > > > Regards, > > > Yann E. MORIN. > > > > > > > +endef > > > > + > > > > +define HOST_RE2_BUILD_CMDS > > > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > > > + -C $(@D) > > > > +endef > > > > + > > > > +define HOST_RE2_INSTALL_CMDS > > > > + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ > > > > + -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install > > > > +endef > > > > + > > > > +$(eval $(generic-package)) > > > > +$(eval $(host-generic-package)) > > > > -- > > > > 2.25.1 > > > > > > > > _______________________________________________ > > > > buildroot mailing list > > > > buildroot at buildroot.org > > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > -- > > > .-----------------.--------------------.------------------.--------------------. > > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > > '------------------------------^-------^------------------^--------------------' > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From thomas.petazzoni at bootlin.com Fri Jan 21 06:58:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 06:58:34 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-20 Message-ID: <20220121065839.53738401ED@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-20 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 59 | 7 | 0 | 66 | 2021.11.x | 20 | 3 | 0 | 23 | master | 96 | 30 | 0 | 126 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 5 gvfs-1.48.1 | 3 frr-8.1 | 2 unknown | 2 wavemon-0.9.4 | 2 bat-0.18.3 | 1 belle-sip-4.4.8 | 1 bluez5_utils-5.63 | 1 boinc-7.18.1 | 1 cryptopp-8.6.0 | 1 guile-3.0.7 | 1 hiawatha-11.1 | 1 ksmbd-tools-3.4.3 | 1 libupnp-1.14.12 | 1 log4cxx-0.12.0 | 1 mpv-0.33.1 | 1 pulseview-0.4.2 | 1 qt5webkit-5.212.0-alpha4 | 1 ruby-3.1.0 | 1 vlc-3.0.16 | 1 vte-0.66.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/c47b98659910c7c689d1d961f7b728500d796984 | xtensa | belle-sip-4.4.8 | NOK | http://autobuild.buildroot.net/results/ccf41f643b7a8049c9439f27e9d5907b58275efe | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4e2bb98d2d15438de8269c56272a59d8c5243adb | riscv64 | boinc-7.18.1 | NOK | http://autobuild.buildroot.net/results/c351826f86703570d0f428efce22074997f65b73 | nds32le | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/fa90b416a219a512a482e7dc63e2d72b184307c7 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7f17048efeea993cd7bc9d6eae93ee9547f12d5f | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/51e9218d25b8df1a1dda7b79808cb9e971ae4415 | riscv64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/3ae75d1820dff4e5c2c9b9055152d534c837002e | ORPH i586 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/8d2208e20f2bd9a7bcdc710af2b8694ad0e3626e | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/b2e95f9a8bee1f880a586dee2747815da2b85cb7 | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/4935f221124b905f678197d3f157fe9dee6ae5de | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/8fd8984bc1333c709e1c77e89e5f7db14bc1a52b | sparc64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/28376a96e86cbec4475c2e197f4f56b0cd4471cf | or1k | libupnp-1.14.12 | NOK | http://autobuild.buildroot.net/results/6e3d9c5100bd14d5b2493129466e72c374c1bfd6 | xtensa | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/1c171e503c4e9562ef8670fad8d1b90d591a423c | powerpc64 | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/120d767732c04cf234b4f34503bbf16e57e08b96 | mipsel | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/5fd00cc3fe3ddf64d9114f21314c0039b74e3705 | i586 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/1bfc49cdd3a6279af93666ef9d905c3038c107a7 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/f55217299d5a42d828e7c95b642b49546cc03023 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ee1486b60197610f1a7af2efc86bea9abe4a416e | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d1b328da9dab68820adba22cd7e1b7b66abfd0d5 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d33fd6bcb9d0fe19493120d0cce6b1c10d9ad12e | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c3cdec79b7bd843d297ab4192fd2c3c66c7f13d3 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/0709a19115a6f3dbc6856f9ab609a2e717f12bfc | arm | unknown | NOK | http://autobuild.buildroot.net/results/0d9121e3bc38ddced115577dddf02f507aa92450 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/7eaaeb71ba24bd3320635073add057ca3fdbd9cd | x86_64 | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/c4d17e415fd47c6490a94a812a9f51e968c7ca0b | mips64el | vte-0.66.2 | NOK | http://autobuild.buildroot.net/results/c0d1adeffbf97805a0f669d01929a56ccc66a835 | ORPH sh4 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/80d7e489219c49295bedb1307b33155eda76b80e | arc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/de7e6e4b716dbc4396240b47eb2a777a8ade65f4 | Classification of failures by reason for 2021.02.x -------------------------------------------------- cutelyst-2.11.0 | 1 gobject-introspection-1.64.1 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 openvmtools-10.3.5-10430147 | 1 qt5location-5.15.2 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | cutelyst-2.11.0 | NOK | http://autobuild.buildroot.net/results/04b74af572ed66e8b7e1015605e90642810d6782 | x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/4797658d048163234d0fa69a1d87eb0083bf5444 | ORPH x86_64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/8aac0258be9ab18f26dc5ae072a25d8c6fb8075c | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/8780ca6ac97742e93b7c9ff0685ddd9acfb59650 | i586 | openvmtools-10.3.5-10430147 | NOK | http://autobuild.buildroot.net/results/d144cda2264f04d7074a3af1c5e15baa2e537a26 | arm | qt5location-5.15.2 | NOK | http://autobuild.buildroot.net/results/24bc8aedcc5c678429871933e40553c70dd84d5b | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/a58134722c19c9a4533b398a7c6c4e070cfffaed | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 libtheora-1.1.1 | 1 ndisc6-1.0.5 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/281532d1c0cabdd3b7c7109d96e307fafc551644 | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/a24f123d9a32aced63487234c9f72ecf0464a391 | ORPH arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/cb78d8ecb0ab38e1b866f855e7ab29da314e1324 | ORPH Gitlab CI results for 2022-01-20 ================================ -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Fri Jan 21 06:58:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 07:58:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> Message-ID: <20220121065850.GF3252931@scaer> James, All, On 2022-01-20 16:57 -0700, James Hilliard spake thusly: > On Thu, Jan 20, 2022 at 2:29 PM Peter Seiderer wrote: > > Or keep the cmake build and do the following to install re2.pc (taken from #349, [1]): > > > > --- a/package/re2/re2.mk > > +++ b/package/re2/re2.mk > > @@ -9,9 +9,20 @@ RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) > > RE2_LICENSE = BSD-3-Clause > > RE2_LICENSE_FILES = LICENSE > > RE2_INSTALL_STAGING = YES > > +# keep original Makefile (for re2.pc install) > > +RE2_SUPPORTS_IN_SOURCE_BUILD = NO > > > > RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > > > +# install re2.pc > > +define RE2_INSTALL_PKG_CONFIG > > + $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) \ > > + libdir=/usr/lib includedir=/usr/include \ > > + common-install > > +endef > > + > > +RE2_POST_INSTALL_STAGING_HOOKS += RE2_INSTALL_PKG_CONFIG > > + > > $(eval $(cmake-package)) > > $(eval $(host-cmake-package)) > > > > Regards, > > Peter > > > > [1] https://github.com/macports/macports-ports/pull/9836#issuecomment-807868854 > > There's a problem with this approach, the makefile with common-install > gets overwritten > by the one generated by cmake if cmake is used. It currently gets overwritten, because the build is done in-tree, but What Peter suggests is doing the build out-of-tree, with: RE2_SUPPORTS_IN_SOURCE_BUILD = NO However, I can't say that I am very fond of this option either. Misinx the two buildsystems looks icky... What bothers me a bit, is that common-install also installs the headers, not just the re2.pc, so this could, even if unlikely, conflict with what the cmake-side would do. But when looking at the various bugs about this issue: https://github.com/google/re2/issues/349 -> https://github.com/google/re2/issues/304#issuecomment-808219200 -> https://github.com/macports/macports-ports/pull/9836 re2: change to cmake build to support gprc, which currently needs a cmake version of re2 to build. Try to make it work like the previous autotools build worked. So, that last issue, against homebrew, is interesting: it seems that using the Makefile-based buildsystem is not enough, because it does not isntall the cmake equivalent of re2.pc, which breaks grpc. So, whether we keep the cmake build, or switch to the Makefile build, we would eventually still miss some pieces... Damn, back to square-one... So, I think that Peter's proposal is not so un-appealing, in then end. But then in such situation, I think it would be simpler for us to just apply something like: define RE2_INSTALL_PC $(INTALL) -d -m 0644 $(@D)/re2.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc $(SED) 's, at includedir@,/usr/include,; s, at libdir@,/usr/lib,' \ $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc endef RE2_POST_STAGING_INSTALL_HOOKS += RE2_INSTALL_PC And be done with it: minimal change to the re2 package, no dual-buildsystem situation and thus no install conflict on the headers, usual and simple post-install hook. Thoughts? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Fri Jan 21 07:41:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 08:41:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121065850.GF3252931@scaer> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> Message-ID: <20220121084141.6eac525e@windsurf> On Fri, 21 Jan 2022 07:58:50 +0100 "Yann E. MORIN" wrote: > So, I think that Peter's proposal is not so un-appealing, in then end. > But then in such situation, I think it would be simpler for us to just > apply something like: > > define RE2_INSTALL_PC > $(INTALL) -d -m 0644 $(@D)/re2.pc \ > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > $(SED) 's, at includedir@,/usr/include,; s, at libdir@,/usr/lib,' \ > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > endef > RE2_POST_STAGING_INSTALL_HOOKS += RE2_INSTALL_PC > > And be done with it: minimal change to the re2 package, no dual-buildsystem > situation and thus no install conflict on the headers, usual and simple > post-install hook. I might be missing something in the whole discussion, but why not patch the CMake build system so that it also installs this .pc file, and contribute this fix upstream ? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 21 07:50:45 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 08:50:45 +0100 Subject: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware In-Reply-To: <20220119212206.1ACA681763@busybox.osuosl.org> References: <20220119212206.1ACA681763@busybox.osuosl.org> Message-ID: <20220121085045.2e375b6c@windsurf> Hello, On Wed, 19 Jan 2022 22:24:11 +0100 Yann E. MORIN wrote: > ################################################################################ > # > -# rpi-wifi-firmware > +# brcmfmac_sdio-firmware-rpi A quick nitpicking comment: I tend to dislike _ in package names, and even more so when it's mixed with - in the package name. As it doesn't affect the Config.in option name, perhaps it's still time to adjust this to brcmfmac-sdio-firmware-rpi ? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Fri Jan 21 07:59:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 08:59:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121084141.6eac525e@windsurf> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> <20220121084141.6eac525e@windsurf> Message-ID: <20220121075924.GG3252931@scaer> Thomas, All, On 2022-01-21 08:41 +0100, Thomas Petazzoni spake thusly: > On Fri, 21 Jan 2022 07:58:50 +0100 > "Yann E. MORIN" wrote: > > > So, I think that Peter's proposal is not so un-appealing, in then end. > > But then in such situation, I think it would be simpler for us to just > > apply something like: > > > > define RE2_INSTALL_PC > > $(INTALL) -d -m 0644 $(@D)/re2.pc \ > > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > > $(SED) 's, at includedir@,/usr/include,; s, at libdir@,/usr/lib,' \ > > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > > endef > > RE2_POST_STAGING_INSTALL_HOOKS += RE2_INSTALL_PC > > > > And be done with it: minimal change to the re2 package, no dual-buildsystem > > situation and thus no install conflict on the headers, usual and simple > > post-install hook. > > I might be missing something in the whole discussion, but why not patch > the CMake build system so that it also installs this .pc file, and > contribute this fix upstream ? Because upstream have not been very enthusisatic about it, as James pointed out when I suggested the same. ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 21 08:04:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 09:04:56 +0100 Subject: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware In-Reply-To: <20220121085045.2e375b6c@windsurf> References: <20220119212206.1ACA681763@busybox.osuosl.org> <20220121085045.2e375b6c@windsurf> Message-ID: <20220121080456.GH3252931@scaer> Thomas, All, On 2022-01-21 08:50 +0100, Thomas Petazzoni spake thusly: > On Wed, 19 Jan 2022 22:24:11 +0100 > Yann E. MORIN wrote: > > > ################################################################################ > > # > > -# rpi-wifi-firmware > > +# brcmfmac_sdio-firmware-rpi > A quick nitpicking comment: I tend to dislike _ in package names, and > even more so when it's mixed with - in the package name. As it doesn't > affect the Config.in option name, perhaps it's still time to adjust > this to brcmfmac-sdio-firmware-rpi ? I don't like it much either. But the reason for the rename was to match the upstream name, which is exactly what we suggest in the manual, and that we argue for most of the time. And we also already had bluez5_utils-headers and xutil_util-macros, and 78 packages in package/x11r7/ Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Fri Jan 21 09:17:00 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 21 Jan 2022 02:17:00 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121065850.GF3252931@scaer> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> Message-ID: On Thu, Jan 20, 2022 at 11:58 PM Yann E. MORIN wrote: > > James, All, > > On 2022-01-20 16:57 -0700, James Hilliard spake thusly: > > On Thu, Jan 20, 2022 at 2:29 PM Peter Seiderer wrote: > > > Or keep the cmake build and do the following to install re2.pc (taken from #349, [1]): > > > > > > --- a/package/re2/re2.mk > > > +++ b/package/re2/re2.mk > > > @@ -9,9 +9,20 @@ RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) > > > RE2_LICENSE = BSD-3-Clause > > > RE2_LICENSE_FILES = LICENSE > > > RE2_INSTALL_STAGING = YES > > > +# keep original Makefile (for re2.pc install) > > > +RE2_SUPPORTS_IN_SOURCE_BUILD = NO > > > > > > RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF > > > HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON > > > > > > +# install re2.pc > > > +define RE2_INSTALL_PKG_CONFIG > > > + $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) \ > > > + libdir=/usr/lib includedir=/usr/include \ > > > + common-install > > > +endef > > > + > > > +RE2_POST_INSTALL_STAGING_HOOKS += RE2_INSTALL_PKG_CONFIG > > > + > > > $(eval $(cmake-package)) > > > $(eval $(host-cmake-package)) > > > > > > Regards, > > > Peter > > > > > > [1] https://github.com/macports/macports-ports/pull/9836#issuecomment-807868854 > > > > There's a problem with this approach, the makefile with common-install > > gets overwritten > > by the one generated by cmake if cmake is used. > > It currently gets overwritten, because the build is done in-tree, but > What Peter suggests is doing the build out-of-tree, with: > RE2_SUPPORTS_IN_SOURCE_BUILD = NO > > However, I can't say that I am very fond of this option either. Misinx > the two buildsystems looks icky... What bothers me a bit, is that > common-install also installs the headers, not just the re2.pc, so this > could, even if unlikely, conflict with what the cmake-side would do. > > But when looking at the various bugs about this issue: > > https://github.com/google/re2/issues/349 > -> https://github.com/google/re2/issues/304#issuecomment-808219200 > -> https://github.com/macports/macports-ports/pull/9836 > > re2: change to cmake build to support gprc, which currently needs a > cmake version of re2 to build. Try to make it work like the previous > autotools build worked. > > So, that last issue, against homebrew, is interesting: it seems that > using the Makefile-based buildsystem is not enough, because it does not > isntall the cmake equivalent of re2.pc, which breaks grpc. That appears to have been fixed: https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186 > > So, whether we keep the cmake build, or switch to the Makefile build, we > would eventually still miss some pieces... > > Damn, back to square-one... > > So, I think that Peter's proposal is not so un-appealing, in then end. > But then in such situation, I think it would be simpler for us to just > apply something like: > > define RE2_INSTALL_PC > $(INTALL) -d -m 0644 $(@D)/re2.pc \ > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > $(SED) 's, at includedir@,/usr/include,; s, at libdir@,/usr/lib,' \ > $(STAGING_DIR)/usr/lib/pkgconfig/re2.pc > endef > RE2_POST_STAGING_INSTALL_HOOKS += RE2_INSTALL_PC > > And be done with it: minimal change to the re2 package, no dual-buildsystem > situation and thus no install conflict on the headers, usual and simple > post-install hook. > > Thoughts? > > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Fri Jan 21 10:14:53 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 21 Jan 2022 11:14:53 +0100 Subject: [Buildroot] [PATCH v2] package/xr819-xradio: add patch to build with Linux >= 5.13 In-Reply-To: <48d2b6c8-356d-419a-c284-e2184509d1c5@gmail.com> References: <70BDD76B-E7F2-44C0-A90B-0FABCFD8755D@benettiengineering.com> <20220118063531.2039729-1-giulio.benetti@benettiengineering.com> <834ad33f-d02f-4663-8e99-4bc939cbb9f6@gmail.com> <48d2b6c8-356d-419a-c284-e2184509d1c5@gmail.com> Message-ID: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> Hi All, please drop this patch since the local patch has been upstreamed: https://github.com/fifteenhex/xradio/commit/4873746fa9d42a8edbc1e192899e00c29ed3d32a So I'm going to send a package bump soon that I ask Sergey to test. Thank you! Best regards -- Giulio Benetti Benetti Engineering sas On 18/01/22 19:10, Sergey Kuzminov wrote: > Tested-by: Sergey Kuzminov > > 18.01.2022 20:53, Giulio Benetti ?????: >> Hi Sergey, >> >> On 18/01/22 18:45, Sergey Kuzminov wrote: >>> Hi All, Giulio. >>> I checked the patch, everything works. >> >> Can you please place your: >> Tested-by: Name Surname >> ? >> > From giulio.benetti at benettiengineering.com Fri Jan 21 10:33:02 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 21 Jan 2022 11:33:02 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building In-Reply-To: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> References: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> Message-ID: <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's bump xr819-xradio version. [1]: https://github.com/fifteenhex/xradio/pull/15 Signed-off-by: Giulio Benetti --- package/xr819-xradio/xr819-xradio.hash | 4 ++-- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index efff92ab7d..4a77db0d1a 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz +sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz # Locally computed -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index c1fe3295b6..5f60be887c 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 +XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Jan 21 13:24:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 14:24:51 +0100 Subject: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware In-Reply-To: <20220121080456.GH3252931@scaer> References: <20220119212206.1ACA681763@busybox.osuosl.org> <20220121085045.2e375b6c@windsurf> <20220121080456.GH3252931@scaer> Message-ID: <20220121142451.5dce5ff4@windsurf> On Fri, 21 Jan 2022 09:04:56 +0100 "Yann E. MORIN" wrote: > I don't like it much either. But the reason for the rename was to match > the upstream name, which is exactly what we suggest in the manual, and > that we argue for most of the time. Yeah, I usually make _ to - an exception to this. > And we also already had bluez5_utils-headers and xutil_util-macros, and > 78 packages in package/x11r7/ Which are all examples that I dislike a lot :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Jan 21 13:26:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 21 Jan 2022 14:26:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121075924.GG3252931@scaer> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> <20220121084141.6eac525e@windsurf> <20220121075924.GG3252931@scaer> Message-ID: <20220121142623.7d5d72bc@windsurf> On Fri, 21 Jan 2022 08:59:24 +0100 "Yann E. MORIN" wrote: > > I might be missing something in the whole discussion, but why not patch > > the CMake build system so that it also installs this .pc file, and > > contribute this fix upstream ? > > Because upstream have not been very enthusisatic about it, as James > pointed out when I suggested the same. ;-) Upstream is not enthusiastic about supporting pkg-config, about having their two possible build systems behave in the same way? What sort of odd upstream is that? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From aperez at igalia.com Fri Jan 21 15:42:28 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:28 +0200 Subject: [Buildroot] [PATCH RFC v2 0/7] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220112132618.2634250-2-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> Message-ID: <20220121154235.798255-1-aperez@igalia.com> Hi all, Here's a new version of the patch set to use Ninja for all CMake packages. It is still incomplete (missing documentation, a couple of commits need better commit logs, etc.) so I will be still using the "RFC" tag =) This is what I wrote when I sent the initial version: > In order to avoid the circular dependency of host-ninja requiring itself, > ninja.mk gets changed to use host-generic-package with a build command > that plainly runs the compiler on the set of sources we know are needed > to build a minimal usable version of it under Unix-y systems. This is > basically the list of sources that CMake would have picked (as per the > CMakeLists.txt file) passed straight to $(HOSTCXX). > > The next change modifies pkg-cmake.mk to always pass -GNinja and removes > the $(_INSTALL[_STAGING,_TARGET]_OPTS) variables, because when using > Ninja the "install/fast" targets are not generated by CMake (those are > an internal detail of the Makefile generator, it seems). For consistency > with the Meson package infrastructure variables $(NINJA), $(_NINJA_ENV) > and $(NINJA_OPTS) are honored by the default set of build/install commands. While the main changes remain the same, this v2 includes a few fixes for packages which were needed to make them build using Ninja, and much more testing: out of the 306 packages which use CMake today, I have been able to successfully have 205 of them built. I will follow-up with another email commenting more on this, and with a defconfig attached. At this point I am confident that we can get all the packages built with CMake without loss of functionality. Only 5 packages out of 205 needing minor tweaks is a *very* good sign, IMO. Cheers, -Adrian Adrian Perez de Castro (7): package/ninja: do not require cmake package/pkg-cmake.mk: use ninja instead of make package/musepack: use MUSEPACK_NINJA_OPTS package/mariadb: use HOST_MARIADB_NINJA_OPTS package/kf5/kf5-extra-cmake-modules: do not build documentation package/libcorrect: avoid multiple rules for same target package/racehound: add patch to support building with ninja .../kf5-extra-cmake-modules.mk | 5 + package/libcorrect/libcorrect.mk | 2 + package/mariadb/mariadb.mk | 2 +- package/musepack/musepack.mk | 2 +- package/ninja/ninja.mk | 36 +++++- package/pkg-cmake.mk | 24 ++-- ...pport-non-Make-generators-e.g.-Ninja.patch | 112 ++++++++++++++++++ 7 files changed, 170 insertions(+), 13 deletions(-) create mode 100644 package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:31 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:31 +0200 Subject: [Buildroot] [PATCH RFC v2 3/7] package/musepack: use MUSEPACK_NINJA_OPTS In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-4-aperez@igalia.com> Replace the usage of MUSEPACK_MAKE with MUSEPACK_NINJA_OPTS to disable the parallel build. Unfortunately switching to Ninja for building CMake packages has not solved the parallel build issues. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Tweak muspack package to disallow parallel builds with Ninja. --- package/musepack/musepack.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a5..000db5fd76 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -9,8 +9,8 @@ MUSEPACK_SITE = http://files.musepack.net/source MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c +MUSEPACK_NINJA_OPTS = -j1 $(eval $(cmake-package)) -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:29 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:29 +0200 Subject: [Buildroot] [PATCH RFC v2 1/7] package/ninja: do not require cmake In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-2-aperez@igalia.com> Use host-generic-package to manually build ninja. This avoids the need for host-cmake in preparation for the CMake build system machinery being changed to use ninja instead of make. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - No changes. --- package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index ab1941023e..ae3be6a14f 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -9,8 +9,42 @@ NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING +# Ninja is used by CMake-based packages, avoid a circular dependency by +# by using host-generic-package instead and using a single command to +# compile the binary. This does in essence the same as the "bootstrap.py" +# included in the distribution avoiding the need for host-python. +define HOST_NINJA_BUILD_CMDS + cd $(@D) && $(HOSTCXX) $(HOST_CXXFLAGS) $(HOST_LDFLAGS) \ + src/build_log.cc \ + src/build.cc \ + src/clean.cc \ + src/clparser.cc \ + src/dyndep.cc \ + src/dyndep_parser.cc \ + src/debug_flags.cc \ + src/deps_log.cc \ + src/disk_interface.cc \ + src/edit_distance.cc \ + src/eval_env.cc \ + src/graph.cc \ + src/graphviz.cc \ + src/line_printer.cc \ + src/manifest_parser.cc \ + src/metrics.cc \ + src/parser.cc \ + src/state.cc \ + src/string_piece_util.cc \ + src/util.cc \ + src/version.cc \ + src/depfile_parser.cc \ + src/lexer.cc \ + src/subprocess-posix.cc \ + src/ninja.cc \ + -o ninja +endef + define HOST_NINJA_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja endef -$(eval $(host-cmake-package)) +$(eval $(host-generic-package)) -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:30 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:30 +0200 Subject: [Buildroot] [PATCH RFC v2 2/7] package/pkg-cmake.mk: use ninja instead of make In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-3-aperez@igalia.com> Switch to ninja as the build tool for the CMake package infrastructure. Note that the changes make packages which use [host-]cmake-package depend on host-ninja. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - No changes. --- package/pkg-cmake.mk | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..65f005a914 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -88,6 +83,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ @@ -117,6 +113,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -154,6 +151,8 @@ endif # primitives to find {C,LD}FLAGS, add it to the dependency list. $(2)_DEPENDENCIES += host-pkgconf +$(2)_DEPENDENCIES += host-ninja + $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # @@ -163,11 +162,13 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif endif @@ -178,7 +179,8 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -188,7 +190,8 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -198,7 +201,8 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:32 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:32 +0200 Subject: [Buildroot] [PATCH RFC v2 4/7] package/mariadb: use HOST_MARIADB_NINJA_OPTS In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-5-aperez@igalia.com> Replace usage of HOST_MARIADB_MAKE_OPTS with HOST_MARIADB_NINJA_OPTS. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Tweeak to use CMake+Ninja infra. --- package/mariadb/mariadb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index db967ca3ed..d24174dd74 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -101,7 +101,7 @@ HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system # -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake # must then be passed to cmake during target build. # see also https://mariadb.com/kb/en/mariadb/cross-compiling-mariadb/ -HOST_MARIADB_MAKE_OPTS = import_executables +HOST_MARIADB_NINJA_OPTS = import_executables MARIADB_CONF_OPTS += \ -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:33 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:33 +0200 Subject: [Buildroot] [PATCH RFC v2 5/7] package/kf5/kf5-extra-cmake-modules: do not build documentation In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-6-aperez@igalia.com> Pass needed CMake options to disable generating documentations. The documentation is built using python-sphinx, which is not packaged in Buildroot. Prior to this change, if the build host would have a Python installation with the sphinx module installed the automatic detection tried to build documentation, which would fail in cases where the sphinxcontrib-qthelp package is missing from the host Python installation. The error message in this case was: Extension error: Could not import extension ecm (exception: cannot import name 'htmlescape' from 'sphinx.util.pycompat' (/usr/lib/python3.10/site-packages/sphinx/util/pycompat.py)) Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Add CMake options to skip trying to build documentation. --- .../kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk index 3c4281b960..ba2748456e 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk @@ -14,4 +14,9 @@ KF5_EXTRA_CMAKE_MODULES_DEPENDENCIES = host-pkgconf KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO +KF5_EXTRA_CMAKE_MODULES_CONF_OPTS += \ + -DBUILD_HTML_DOCS=OFF \ + -DBUILD_MAN_DOCS=OFF \ + -DBUILD_QTHELP_DOCS=OFF + $(eval $(cmake-package)) -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:34 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:34 +0200 Subject: [Buildroot] [PATCH RFC v2 6/7] package/libcorrect: avoid multiple rules for same target In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-7-aperez@igalia.com> Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Avoid CMake generating two targets with the same name. Needs a better fix sent upstream to tweak CMakeLists.txt instead. --- package/libcorrect/libcorrect.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcorrect/libcorrect.mk b/package/libcorrect/libcorrect.mk index 0a84aa5c26..225111a64f 100644 --- a/package/libcorrect/libcorrect.mk +++ b/package/libcorrect/libcorrect.mk @@ -10,4 +10,6 @@ LIBCORRECT_LICENSE = BSD-3-Clause LIBCORRECT_LICENSE_FILES = LICENSE LIBCORRECT_INSTALL_STAGING = YES +LIBCORRECT_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF + $(eval $(cmake-package)) -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:42:35 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:42:35 +0200 Subject: [Buildroot] [PATCH RFC v2 7/7] package/racehound: add patch to support building with ninja In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121154235.798255-8-aperez@igalia.com> SSIA. Signed-off-by: Adrian Perez de Castro Upstream-Status: https://github.com/euspectre/racehound/pull/6 --- Changes v1 -> v2: - Patch added to call into Kbuild with plain make. --- ...pport-non-Make-generators-e.g.-Ninja.patch | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch diff --git a/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch b/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch new file mode 100644 index 0000000000..7f90fb8c69 --- /dev/null +++ b/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch @@ -0,0 +1,112 @@ +From f8d266b017fd76e2de9d20e0bb3951a5338075d1 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Fri, 14 Jan 2022 14:33:21 +0200 +Subject: [PATCH] CMake: Support non-Make generators, e.g. Ninja + +--- + cmake/modules/FindKbuild.cmake | 15 +++++++++++++-- + cmake/modules/kbuild_system.cmake | 4 ++-- + cmake/modules/kmodule_files/CMakeLists.txt | 11 +++++++++-- + core/tests/common_target/CMakeLists.txt | 2 +- + 4 files changed, 25 insertions(+), 7 deletions(-) + +diff --git a/cmake/modules/FindKbuild.cmake b/cmake/modules/FindKbuild.cmake +index b79d140..2ba0a78 100644 +--- a/cmake/modules/FindKbuild.cmake ++++ b/cmake/modules/FindKbuild.cmake +@@ -5,6 +5,7 @@ + # (often /lib/modules/${KBUILD_VERSION_STRING}/build) + # KBUILD_INCLUDE_DIR - not used + # KBUILD_FOUND - TRUE if everything is correct, FALSE otherwise ++# KBUILD_MAKE_COMMAND - Command to run for Make invocations. + + if (NOT KBUILD_VERSION_STRING) + set(KBUILD_VERSION_STRING ${CMAKE_SYSTEM_VERSION} CACHE STRING +@@ -18,8 +19,18 @@ endif (NOT KBUILD_BUILD_DIR) + + set(KBUILD_INCLUDE_DIRS "NOT USED") + +-# Note: only KBUILD_BUILD_DIR variable is really used in the project. +-# Other variables defined only for FindModule architecture of CMake. ++# Only makefiles have $(MAKE) defined, in other cases invoke make directly. ++if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") ++ set(KBUILD_MAKE_COMMAND $\(MAKE\)) ++else () ++ find_program(KBUILD_MAKE_COMMAND make REQUIRED) ++ set(KBUILD_MAKE_COMMAND ${KBUILD_MAKE_COMMAND} CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS}) ++endif () ++ ++ ++# Note: only KBUILD_BUILD_DIR and KBUILD_MAKE_COMMAND variables are really ++# used in the project. Other variables defined only for FindModule ++# architecture of CMake. + + # Handle the QUIETLY and REQUIRED arguments and set KBUILD_FOUND to TRUE if + # all listed variables are TRUE +diff --git a/cmake/modules/kbuild_system.cmake b/cmake/modules/kbuild_system.cmake +index e28ef33..e4e33df 100644 +--- a/cmake/modules/kbuild_system.cmake ++++ b/cmake/modules/kbuild_system.cmake +@@ -262,13 +262,13 @@ function(kbuild_add_module name) + > "${_dir}.${_name}.o.cmd") + endforeach(shipped_source_noext_abs ${shipped_source_noext_abs}) + endif(shipped_sources_noext_abs) +- ++ + # The rule to create module + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.ko ${symvers_file} + ${cmd_create_command} + ${symvers_command} +- COMMAND $(MAKE) -C ${KBUILD_BUILD_DIR} ++ COMMAND ${KBUILD_MAKE_COMMAND} -C ${KBUILD_BUILD_DIR} + M=${CMAKE_CURRENT_BINARY_DIR} modules + DEPENDS ${depend_files} + ) +diff --git a/cmake/modules/kmodule_files/CMakeLists.txt b/cmake/modules/kmodule_files/CMakeLists.txt +index 1147cc5..6115153 100644 +--- a/cmake/modules/kmodule_files/CMakeLists.txt ++++ b/cmake/modules/kmodule_files/CMakeLists.txt +@@ -5,7 +5,7 @@ if (NOT KERNELDIR) + set(KERNELDIR /lib/modules/${KBUILD_VERSION_STRING}/build) + endif (NOT KERNELDIR) + +-set(PWD $\(shell pwd\)) ++set(PWD $$\(pwd\)) + + project(kmodule_try_compile) + # Create rule for produce file from another file via copiing +@@ -27,9 +27,16 @@ if(COPY_FILE) + copy_file("${COPY_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/try_compile.ko") + endif(COPY_FILE) + ++# Only makefiles have $(MAKE) defined, in other cases invoke make directly. ++if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") ++ set(KBUILD_MAKE_COMMAND $\(MAKE\)) ++else () ++ find_program(KBUILD_MAKE_COMMAND make REQUIRED) ++endif () ++ + # Rule to produce try_compile.ko from try_compile.c + add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/try_compile.ko" +- COMMAND $(MAKE) -C ${KERNELDIR} M=${PWD} modules ++ COMMAND ${KBUILD_MAKE_COMMAND} -C ${KERNELDIR} M=${PWD} modules + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/try_compile.c") + + # Kbuild system cannot work with out-of-source build, +diff --git a/core/tests/common_target/CMakeLists.txt b/core/tests/common_target/CMakeLists.txt +index cf257ad..fe48e68 100644 +--- a/core/tests/common_target/CMakeLists.txt ++++ b/core/tests/common_target/CMakeLists.txt +@@ -17,7 +17,7 @@ add_custom_target("common_target_module" + + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${KMODULE_NAME}.ko" +- COMMAND $(MAKE) -f module.makefile ++ COMMAND ${KBUILD_MAKE_COMMAND} -f module.makefile + DEPENDS + "${CMAKE_CURRENT_BINARY_DIR}/cfake.c" + "${CMAKE_CURRENT_BINARY_DIR}/cfake.h" +-- +2.34.1 + -- 2.34.1 From aperez at igalia.com Fri Jan 21 15:53:21 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 21 Jan 2022 17:53:21 +0200 Subject: [Buildroot] [PATCH RFC v2 0/7] Use Ninja as build tool for CMake-based packages In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> Message-ID: <20220121175321.GB3065576@momiji> Hello, On Fri, 21 Jan 2022 17:42:28 +0200 Adrian Perez de Castro wrote: > Here's a new version of the patch set to use Ninja for all CMake packages. > It is still incomplete (missing documentation, a couple of commits need > better commit logs, etc.) so I will be still using the "RFC" tag =) > > This is what I wrote when I sent the initial version: > > > In order to avoid the circular dependency of host-ninja requiring itself, > > ninja.mk gets changed to use host-generic-package with a build command > > that plainly runs the compiler on the set of sources we know are needed > > to build a minimal usable version of it under Unix-y systems. This is > > basically the list of sources that CMake would have picked (as per the > > CMakeLists.txt file) passed straight to $(HOSTCXX). > > > > The next change modifies pkg-cmake.mk to always pass -GNinja and removes > > the $(_INSTALL[_STAGING,_TARGET]_OPTS) variables, because when using > > Ninja the "install/fast" targets are not generated by CMake (those are > > an internal detail of the Makefile generator, it seems). For consistency > > with the Meson package infrastructure variables $(NINJA), $(_NINJA_ENV) > > and $(NINJA_OPTS) are honored by the default set of build/install commands. > > While the main changes remain the same, this v2 includes a few fixes for > packages which were needed to make them build using Ninja, and much more > testing: out of the 306 packages which use CMake today, I have been able to > successfully have 205 of them built. I will follow-up with another email > commenting more on this, and with a defconfig attached. > > At this point I am confident that we can get all the packages built with > CMake without loss of functionality. Only 5 packages out of 205 needing > minor tweaks is a *very* good sign, IMO. You can find two files attached to this mail: - v2-status.txt: lists all the CMake packages, marked with the following symbols: - [ ] - Package not yet tested. - [*] - Package tested, builds fine unchanged. - [=] - Package tested, builds with changes/patches applied. - [?] - Package tested, failed to build but the failure does not seem caused from switching from Make to Ninja. - qemu_x86_64_cmakeninja1_defconfig: a defconfig that can be used to build all the packages marked with [*] from the status list. I will need some other different defconfigs to test some of the packages, because they may be platform specific (like rpi-firmware) or need options enabled which conflict with other packages from the list. My plan is to continue in the next weeks and slowly get to the point where all the CMake packages can be built using Ninja, using the minimum amount of defconfigs possible. Cheers, -Adrian -------------- next part -------------- BR2_x86_64=y BR2_CCACHE=y BR2_OPTIMIZE_2=y BR2_SSP_ALL=y BR2_FORTIFY_SOURCE_2=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_FLUIDSYNTH=y BR2_PACKAGE_FLUIDSYNTH_SDL2=y BR2_PACKAGE_GSTREAMER1=y # BR2_PACKAGE_GSTREAMER1_GST_DEBUG is not set BR2_PACKAGE_GST1_PLUGINS_BASE=y BR2_PACKAGE_MUSEPACK=y BR2_PACKAGE_YMPD=y BR2_PACKAGE_UNZIP=y BR2_PACKAGE_SENTRY_NATIVE=y BR2_PACKAGE_TCF_AGENT=y BR2_PACKAGE_JQ=y BR2_PACKAGE_FIRMWARE_UTILS=y BR2_PACKAGE_UNIONFS=y BR2_PACKAGE_FLARE_ENGINE=y BR2_PACKAGE_FLARE_GAME=y BR2_PACKAGE_LUGARU=y BR2_PACKAGE_MINETEST=y BR2_PACKAGE_SOLARUS=y BR2_PACKAGE_SUPERTUX=y BR2_PACKAGE_SUPERTUXKART=y BR2_PACKAGE_MESA3D_DEMOS=y BR2_PACKAGE_MIDORI=y BR2_PACKAGE_CEGUI=y BR2_PACKAGE_FREERDP=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_SDL2_KMSDRM=y BR2_PACKAGE_SDL2_OPENGLES=y BR2_PACKAGE_VULKAN_HEADERS=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_OPENGL=y BR2_PACKAGE_QT5BASE_OPENGL_ES2=y BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5BASE_ICU=y BR2_PACKAGE_QT5LOCATION=y BR2_PACKAGE_QT5SENSORS=y BR2_PACKAGE_QT5TOOLS=y BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS=y BR2_PACKAGE_CUTELYST=y BR2_PACKAGE_GRANTLEE=y BR2_PACKAGE_KF5=y BR2_PACKAGE_KF5_MODEMMANAGER_QT=y BR2_PACKAGE_KF5_NETWORKMANAGER_QT=y BR2_PACKAGE_QJSON=y BR2_PACKAGE_SIMPLE_MAIL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y BR2_PACKAGE_APITRACE=y BR2_PACKAGE_BRICKD=y BR2_PACKAGE_CDRKIT=y BR2_PACKAGE_LIBIEC61850=y BR2_PACKAGE_LINUX_SERIAL_TEST=y BR2_PACKAGE_OPENFPGALOADER=y BR2_PACKAGE_OPENPOWERLINK=y BR2_PACKAGE_READ_EDID=y BR2_PACKAGE_UBUS=y BR2_PACKAGE_LUAJIT_COMPAT52=y BR2_PACKAGE_EASYDBUS=y BR2_PACKAGE_LUA_EV=y BR2_PACKAGE_LUA_SDL2=y BR2_PACKAGE_LUVI=y BR2_PACKAGE_PYTHON3_BZIP2=y BR2_PACKAGE_PYTHON3_PYEXPAT=y BR2_PACKAGE_PYTHON3_XZ=y BR2_PACKAGE_PYTHON3_ZLIB=y BR2_PACKAGE_PYTHON_FLATBUFFERS=y BR2_PACKAGE_PYTHON_MAKO=y BR2_PACKAGE_PYTHON_PAHO_MQTT=y BR2_PACKAGE_PYTHON_PYBIND=y BR2_PACKAGE_ALURE=y BR2_PACKAGE_BCG729=y BR2_PACKAGE_LIBASPLIB=y BR2_PACKAGE_LIBCODEC2=y BR2_PACKAGE_LIBCUE=y BR2_PACKAGE_LIBEBUR128=y BR2_PACKAGE_LIBSOXR=y BR2_PACKAGE_SPEEXDSP=y BR2_PACKAGE_TAGLIB=y BR2_PACKAGE_SNAPPY=y BR2_PACKAGE_ZLIB_NG=y BR2_PACKAGE_ZZIPLIB=y BR2_PACKAGE_LIBOLM=y BR2_PACKAGE_LIBSSH=y BR2_PACKAGE_LIBSSH_SERVER=y BR2_PACKAGE_LIBUECC=y BR2_PACKAGE_USTREAM_SSL=y BR2_PACKAGE_CPPDB=y BR2_PACKAGE_LEVELDB=y BR2_PACKAGE_LIBGIT2=y BR2_PACKAGE_LIBMDBX=y BR2_PACKAGE_LIBMDBX_CXX=y BR2_PACKAGE_MYSQL=y BR2_PACKAGE_MARIADB=y BR2_PACKAGE_EXIV2=y BR2_PACKAGE_GRAPHITE2=y BR2_PACKAGE_INTEL_MEDIASDK=y BR2_PACKAGE_JASPER=y BR2_PACKAGE_LENSFUN=y BR2_PACKAGE_LENSFUN_TOOLS=y BR2_PACKAGE_LIBGTA=y BR2_PACKAGE_LIBGTK3=y # BR2_PACKAGE_LIBGTK3_BROADWAY is not set BR2_PACKAGE_OPENCV4=y BR2_PACKAGE_OPENCV4_LIB_FLANN=y BR2_PACKAGE_OPENCV4_JPEG2000_WITH_OPENJPEG=y BR2_PACKAGE_POPPLER=y BR2_PACKAGE_POPPLER_QT5=y BR2_PACKAGE_WAFFLE=y BR2_PACKAGE_WAYLANDPP=y BR2_PACKAGE_ZXING_CPP=y BR2_PACKAGE_C_PERIPHERY=y BR2_PACKAGE_HACKRF=y BR2_PACKAGE_LET_ME_CREATE=y BR2_PACKAGE_LIBCEC=y BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1=y BR2_PACKAGE_LIBIIO=y BR2_PACKAGE_LIBIQRF=y BR2_PACKAGE_LIBSIGROK=y BR2_PACKAGE_LIBSIGROKCXX=y BR2_PACKAGE_MRAA=y BR2_PACKAGE_CJSON=y BR2_PACKAGE_JSON_FOR_MODERN_CPP=y BR2_PACKAGE_RAPIDJSON=y BR2_PACKAGE_TINYXML2=y BR2_PACKAGE_VALIJSON=y BR2_PACKAGE_XERCES=y BR2_PACKAGE_YAJL=y BR2_PACKAGE_YAML_CPP=y BR2_PACKAGE_GLOG=y BR2_PACKAGE_LOG4CXX=y BR2_PACKAGE_LOG4QT=y BR2_PACKAGE_BENTO4=y BR2_PACKAGE_LIBMATROSKA=y BR2_PACKAGE_LIBYUV=y BR2_PACKAGE_X265=y BR2_PACKAGE_X265_CLI=y BR2_PACKAGE_AZURE_IOT_SDK_C=y BR2_PACKAGE_CURLPP=y BR2_PACKAGE_GRPC=y BR2_PACKAGE_LIBCGI=y # BR2_PACKAGE_LIBCURL_EXTRA_PROTOCOLS_FEATURES is not set BR2_PACKAGE_LIBCURL_MBEDTLS=y BR2_PACKAGE_LIBMINIUPNPC=y BR2_PACKAGE_LIBNETCONF2=y BR2_PACKAGE_LIBRSYNC=y BR2_PACKAGE_LIBUHTTPD=y BR2_PACKAGE_LIBURIPARSER=y BR2_PACKAGE_LIBUWSC=y BR2_PACKAGE_LIBVNCSERVER=y BR2_PACKAGE_NANOMSG=y BR2_PACKAGE_PAHO_MQTT_CPP=y BR2_PACKAGE_PISTACHE=y BR2_PACKAGE_QPID_PROTON=y BR2_PACKAGE_RABBITMQ_C=y BR2_PACKAGE_SYSREPO=y BR2_PACKAGE_THRIFT=y BR2_PACKAGE_WAMPCC=y BR2_PACKAGE_WEBSOCKETPP=y BR2_PACKAGE_ARMADILLO=y BR2_PACKAGE_AVRO_C=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_CCTZ=y BR2_PACKAGE_CEREAL=y BR2_PACKAGE_CLANG=y BR2_PACKAGE_CMOCKA=y BR2_PACKAGE_EIGEN=y BR2_PACKAGE_ELFUTILS=y BR2_PACKAGE_FLANN=y BR2_PACKAGE_FLATCC=y BR2_PACKAGE_GFLAGS=y BR2_PACKAGE_GLI=y BR2_PACKAGE_GTEST=y BR2_PACKAGE_GTEST_GMOCK=y BR2_PACKAGE_LIBB64=y BR2_PACKAGE_LIBCORRECT=y BR2_PACKAGE_LIBEASTL=y BR2_PACKAGE_LIBGEOS=y BR2_PACKAGE_LIBICAL=y BR2_PACKAGE_LIBKS=y BR2_PACKAGE_LIBOSMIUM=y BR2_PACKAGE_LIBSPATIALINDEX=y BR2_PACKAGE_LIBUCI=y BR2_PACKAGE_MSGPACK=y BR2_PACKAGE_QHULL=y BR2_PACKAGE_UVW=y BR2_PACKAGE_UTF8PROC=y BR2_PACKAGE_COLLECTD=y BR2_PACKAGE_COLLECTD_REDIS=y BR2_PACKAGE_GNURADIO_CTRLPORT=y BR2_PACKAGE_GNURADIO_DTV=y BR2_PACKAGE_GNURADIO_PYTHON=y BR2_PACKAGE_GNURADIO_UTILS=y BR2_PACKAGE_GNURADIO_ZEROMQ=y BR2_PACKAGE_GNURADIO_CHANNELS=y BR2_PACKAGE_GNURADIO_QTGUI=y BR2_PACKAGE_GNURADIO_TRELLIS=y BR2_PACKAGE_GNURADIO_UHD=y BR2_PACKAGE_GQRX=y BR2_PACKAGE_GR_OSMOSDR_PYTHON=y BR2_PACKAGE_GR_OSMOSDR_IQFILE=y BR2_PACKAGE_GR_OSMOSDR_RTLSDR=y BR2_PACKAGE_GR_OSMOSDR_RTLSDR_TCP=y BR2_PACKAGE_GR_OSMOSDR_RFSPACE=y BR2_PACKAGE_RTL_433=y BR2_PACKAGE_TASKD=y BR2_PACKAGE_CANNELLONI=y BR2_PACKAGE_EASYFRAMES=y BR2_PACKAGE_GERBERA=y BR2_PACKAGE_HIAWATHA=y BR2_PACKAGE_I2PD=y BR2_PACKAGE_LINPHONE=y BR2_PACKAGE_MJPG_STREAMER=y BR2_PACKAGE_MRP=y BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_NETWORK_MANAGER_TUI=y BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENOBEX=y BR2_PACKAGE_SNORT3=y BR2_PACKAGE_SPICE_PROTOCOL=y BR2_PACKAGE_UHTTPD=y BR2_PACKAGE_UQMI=y BR2_PACKAGE_ZNC=y BR2_PACKAGE_RTTY=y BR2_PACKAGE_TTYD=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_FATCAT=y BR2_PACKAGE_HOST_LLD=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y -------------- next part -------------- [*] package/alure/alure.mk [*] package/apitrace/apitrace.mk [*] package/armadillo/armadillo.mk [*] package/avro-c/avro-c.mk [*] package/azure-iot-sdk-c/azure-iot-sdk-c.mk [*] package/bcg729/bcg729.mk [*] package/bctoolbox/bctoolbox.mk [*] package/belle-sip/belle-sip.mk [*] package/belr/belr.mk [*] package/bento4/bento4.mk [*] package/brickd/brickd.mk [*] package/brotli/brotli.mk [*] package/c-periphery/c-periphery.mk [*] package/cannelloni/cannelloni.mk [*] package/cctz/cctz.mk [*] package/cdrkit/cdrkit.mk [*] package/cegui/cegui.mk [*] package/cereal/cereal.mk [*] package/cfm/cfm.mk [*] package/cjson/cjson.mk [*] package/clang/clang.mk [*] package/cmake/cmake.mk [*] package/cmocka/cmocka.mk [*] package/cog/cog.mk [*] package/cppdb/cppdb.mk [*] package/cppzmq/cppzmq.mk [*] package/curlpp/curlpp.mk [*] package/cutelyst/cutelyst.mk [*] package/doxygen/doxygen.mk [*] package/easydbus/easydbus.mk [*] package/easyframes/easyframes.mk [*] package/eigen/eigen.mk [*] package/exiv2/exiv2.mk [*] package/fatcat/fatcat.mk [*] package/firmware-utils/firmware-utils.mk [*] package/flann/flann.mk [*] package/flare-engine/flare-engine.mk [*] package/flare-game/flare-game.mk [*] package/flatbuffers/flatbuffers.mk [*] package/flatcc/flatcc.mk [*] package/fluidsynth/fluidsynth.mk [*] package/fmt/fmt.mk [*] package/freerdp/freerdp.mk [*] package/gerbera/gerbera.mk [*] package/gflags/gflags.mk [*] package/gli/gli.mk [*] package/glm/glm.mk [*] package/glog/glog.mk [*] package/gnuradio/gnuradio.mk [*] package/gqrx/gqrx.mk [*] package/gr-osmosdr/gr-osmosdr.mk [*] package/grantlee/grantlee.mk [*] package/graphite2/graphite2.mk [*] package/grpc/grpc.mk [*] package/gtest/gtest.mk [*] package/hackrf/hackrf.mk [*] package/hiawatha/hiawatha.mk [*] package/hiredis/hiredis.mk [*] package/i2pd/i2pd.mk [*] package/intel-gmmlib/intel-gmmlib.mk [*] package/intel-mediadriver/intel-mediadriver.mk [*] package/intel-mediasdk/intel-mediasdk.mk [*] package/jasper/jasper.mk [*] package/jpeg-turbo/jpeg-turbo.mk [*] package/json-c/json-c.mk [*] package/json-for-modern-cpp/json-for-modern-cpp.mk [*] package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk [*] package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk [*] package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk [*] package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk [*] package/lapack/lapack.mk [*] package/lensfun/lensfun.mk [*] package/let-me-create/let-me-create.mk [*] package/leveldb/leveldb.mk [*] package/libabseil-cpp/libabseil-cpp.mk [*] package/libasplib/libasplib.mk [*] package/libcec/libcec.mk [*] package/libcgi/libcgi.mk [*] package/libcodec2/libcodec2.mk [*] package/libcue/libcue.mk [*] package/libcuefile/libcuefile.mk [*] package/libeastl/libeastl.mk [*] package/libebml/libebml.mk [*] package/libebur128/libebur128.mk [*] package/libftdi1/libftdi1.mk [*] package/libgeos/libgeos.mk [*] package/libgit2/libgit2.mk [*] package/libgta/libgta.mk [*] package/libical/libical.mk [*] package/libiec61850/libiec61850.mk [*] package/libiio/libiio.mk [*] package/libiqrf/libiqrf.mk [*] package/libks/libks.mk [*] package/libmatroska/libmatroska.mk [*] package/libmdbx/libmdbx.mk [*] package/libminiupnpc/libminiupnpc.mk [*] package/libnetconf2/libnetconf2.mk [*] package/libolm/libolm.mk [*] package/libosmium/libosmium.mk [*] package/libplatform/libplatform.mk [*] package/librsync/librsync.mk [*] package/librtlsdr/librtlsdr.mk [*] package/libssh/libssh.mk [*] package/libubox/libubox.mk [*] package/libuci/libuci.mk [*] package/libuecc/libuecc.mk [*] package/libuhttpd/libuhttpd.mk [*] package/liburiparser/liburiparser.mk [*] package/libvncserver/libvncserver.mk [*] package/libwebsockets/libwebsockets.mk [*] package/libyuv/libyuv.mk [*] package/libzip/libzip.mk [*] package/linphone/linphone.mk [*] package/linux-serial-test/linux-serial-test.mk [*] package/lld/lld.mk [*] package/llvm/llvm.mk [*] package/log4cxx/log4cxx.mk [*] package/log4qt/log4qt.mk [*] package/lua-ev/lua-ev.mk [*] package/lua-sdl2/lua-sdl2.mk [*] package/luv/luv.mk [*] package/luvi/luvi.mk [*] package/lzlib/lzlib.mk [*] package/lzo/lzo.mk [*] package/mariadb/mariadb.mk [*] package/mbedtls/mbedtls.mk [*] package/mediastreamer/mediastreamer.mk [*] package/midori/midori.mk [*] package/mjpg-streamer/mjpg-streamer.mk [*] package/mraa/mraa.mk [*] package/mrp/mrp.mk [*] package/msgpack/msgpack.mk [*] package/musepack/musepack.mk [*] package/nanomsg/nanomsg.mk [*] package/odhcp6c/odhcp6c.mk [*] package/openal/openal.mk [*] package/opencv4/opencv4.mk [*] package/openjpeg/openjpeg.mk [*] package/openobex/openobex.mk [*] package/openpowerlink/openpowerlink.mk [*] package/ortp/ortp.mk [*] package/paho-mqtt-c/paho-mqtt-c.mk [*] package/paho-mqtt-cpp/paho-mqtt-cpp.mk [*] package/physfs/physfs.mk [*] package/pistache/pistache.mk [*] package/poppler/poppler.mk [*] package/protozero/protozero.mk [*] package/pugixml/pugixml.mk [*] package/python-pybind/python-pybind.mk [*] package/qhull/qhull.mk [*] package/qjson/qjson.mk [*] package/qpid-proton/qpid-proton.mk [*] package/rabbitmq-c/rabbitmq-c.mk [*] package/rapidjson/rapidjson.mk [*] package/re2/re2.mk [*] package/read-edid/read-edid.mk [*] package/rtl_433/rtl_433.mk [*] package/rtty/rtty.mk [*] package/sentry-native/sentry-native.mk [*] package/simple-mail/simple-mail.mk [*] package/snappy/snappy.mk [*] package/snort3/snort3.mk [*] package/solarus/solarus.mk [*] package/spdlog/spdlog.mk [*] package/sysrepo/sysrepo.mk [*] package/taglib/taglib.mk [*] package/taskd/taskd.mk [*] package/tcf-agent/tcf-agent.mk [*] package/thrift/thrift.mk [*] package/tinyxml2/tinyxml2.mk [*] package/ttyd/ttyd.mk [*] package/ubus/ubus.mk [*] package/uhd/uhd.mk [*] package/uhttpd/uhttpd.mk [*] package/unionfs/unionfs.mk [*] package/unzip/unzip.mk [*] package/uqmi/uqmi.mk [*] package/ustream-ssl/ustream-ssl.mk [*] package/utf8proc/utf8proc.mk [*] package/uvw/uvw.mk [*] package/valijson/valijson.mk [*] package/vulkan-headers/vulkan-headers.mk [*] package/waffle/waffle.mk [*] package/wampcc/wampcc.mk [*] package/waylandpp/waylandpp.mk [*] package/webkitgtk/webkitgtk.mk [*] package/websocketpp/websocketpp.mk [*] package/woff2/woff2.mk [*] package/wpewebkit/wpewebkit.mk [*] package/x265/x265.mk [*] package/xerces/xerces.mk [*] package/yajl/yajl.mk [*] package/yaml-cpp/yaml-cpp.mk [*] package/ympd/ympd.mk [*] package/zlib-ng/zlib-ng.mk [*] package/znc/znc.mk [*] package/zxing-cpp/zxing-cpp.mk [*] package/zziplib/zziplib.mk [*] package/libsoxr/libsoxr.mk [*] package/libspatialindex/libspatialindex.mk [*] package/lugaru/lugaru.mk [*] package/minetest/minetest.mk [*] package/openfpgaloader/openfpgaloader.mk [*] package/supertux/supertux.mk [*] package/supertuxkart/supertuxkart.mk [=] package/libcorrect/libcorrect.mk [=] package/ninja/ninja.mk [?] package/racehound/racehound.mk [?] package/azmq/azmq.mk [?] package/bullet/bullet.mk [?] package/cppcms/cppcms.mk [?] package/netopeer2/netopeer2.mk [?] package/piglit/piglit.mk [?] package/pulseview/pulseview.mk [?] package/qt5/qt5webkit/qt5webkit.mk [?] package/quazip/quazip.mk [?] package/sysdig/sysdig.mk [?] package/wireshark/wireshark.mk [ ] package/assimp/assimp.mk [ ] package/chipmunk/chipmunk.mk [ ] package/domoticz/domoticz.mk [ ] package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk [ ] package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk [ ] package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk [ ] package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk [ ] package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk [ ] package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk [ ] package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk [ ] package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk [ ] package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk [ ] package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk [ ] package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk [ ] package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk [ ] package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk [ ] package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk [ ] package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk [ ] package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk [ ] package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk [ ] package/kodi-pvr-argustv/kodi-pvr-argustv.mk [ ] package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk [ ] package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk [ ] package/kodi-pvr-filmon/kodi-pvr-filmon.mk [ ] package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk [ ] package/kodi-pvr-hts/kodi-pvr-hts.mk [ ] package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk [ ] package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk [ ] package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk [ ] package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk [ ] package/kodi-pvr-njoy/kodi-pvr-njoy.mk [ ] package/kodi-pvr-octonet/kodi-pvr-octonet.mk [ ] package/kodi-pvr-pctv/kodi-pvr-pctv.mk [ ] package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk [ ] package/kodi-pvr-stalker/kodi-pvr-stalker.mk [ ] package/kodi-pvr-vbox/kodi-pvr-vbox.mk [ ] package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk [ ] package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk [ ] package/kodi-pvr-waipu/kodi-pvr-waipu.mk [ ] package/kodi-pvr-wmc/kodi-pvr-wmc.mk [ ] package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk [ ] package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk [ ] package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk [ ] package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk [ ] package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk [ ] package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk [ ] package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk [ ] package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk [ ] package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk [ ] package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk [ ] package/kodi-screensaver-stars/kodi-screensaver-stars.mk [ ] package/kodi-texturepacker/kodi-texturepacker.mk [ ] package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk [ ] package/kodi-vfs-rar/kodi-vfs-rar.mk [ ] package/kodi-vfs-sftp/kodi-vfs-sftp.mk [ ] package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk [ ] package/kodi-visualisation-goom/kodi-visualisation-goom.mk [ ] package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk [ ] package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk [ ] package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk [ ] package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk [ ] package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk [ ] package/kodi/kodi.mk [ ] package/libcpprestsdk/libcpprestsdk.mk [ ] package/libfreeglut/libfreeglut.mk [ ] package/libglfw/libglfw.mk [ ] package/libressl/libressl.mk [ ] package/libubootenv/libubootenv.mk [ ] package/libuwsc/libuwsc.mk [ ] package/libyang/libyang.mk [ ] package/mfgtools/mfgtools.mk [ ] package/minizip/minizip.mk [ ] package/ne10/ne10.mk [ ] package/ogre/ogre.mk [ ] package/open62541/open62541.mk [ ] package/opencv3/opencv3.mk [ ] package/opentracing-cpp/opentracing-cpp.mk [ ] package/optee-benchmark/optee-benchmark.mk [ ] package/optee-client/optee-client.mk [ ] package/optee-examples/optee-examples.mk [ ] package/optee-test/optee-test.mk [ ] package/osm2pgsql/osm2pgsql.mk [ ] package/rpi-userland/rpi-userland.mk [ ] package/sdbus-cpp/sdbus-cpp.mk [ ] package/stellarium/stellarium.mk [ ] package/synergy/synergy.mk [ ] package/timescaledb/timescaledb.mk [ ] package/xmrig/xmrig.mk -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From quentin.schulz at theobroma-systems.com Fri Jan 21 16:14:58 2022 From: quentin.schulz at theobroma-systems.com (quentin.schulz at theobroma-systems.com) Date: Fri, 21 Jan 2022 17:14:58 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220121161458.220687-1-quentin.schulz@theobroma-systems.com> From: Quentin Schulz 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, 6.1+ and 5.12.12 all contain the necessary patches so let's port them to 5.15.2. As a note, those are also available on kde "fork" in their kde/5.15 branch: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- ...-intensive-painting-of-high-number-o.patch | 136 ++++++++++++++++++ ...-avoiding-huge-number-of-tiny-dashes.patch | 37 +++++ package/qt5/qt5base/qt5base.mk | 4 + 3 files changed, 177 insertions(+) create mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch create mode 100644 package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..fe3a16fd19 --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,136 @@ +From 7f345f2a1c8d9f60c60e8a9d8cc90729794bd2f1 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) +Reviewed-by: Eirik Aavitsland +[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=7f345f2a1c8d9f60c60e8a9d8cc90729794bd2f1] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++++++----- + tests/auto/other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index f4cbf15fc70..f04e3a498d8 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)) { ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + const QPainterPath::ElementType *types = path.elements(); + const qreal *points = path.points(); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 00000000000..d41ced7f5f9 +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.16.3 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..f3c525e584 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 9378ba2ae857df7e21a384e514650823db2355c3 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L??hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +Reviewed-by: Eirik Aavitsland +[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9378ba2ae857df7e21a384e514650823db2355c3 ] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index f04e3a498d8..bd6bdf7be12 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.16.3 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..4ef3759566 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. -- 2.34.1 From kuzminov.sergey81 at gmail.com Fri Jan 21 16:43:59 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Fri, 21 Jan 2022 19:43:59 +0300 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building In-Reply-To: <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> References: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> Message-ID: <1a005bda-86ec-be3d-72b8-153566669f14@gmail.com> 21.01.2022 13:33, Giulio Benetti ?????: > Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's > bump xr819-xradio version. > > [1]: https://github.com/fifteenhex/xradio/pull/15 > > Signed-off-by: Giulio Benetti > --- > package/xr819-xradio/xr819-xradio.hash | 4 ++-- > package/xr819-xradio/xr819-xradio.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash > index efff92ab7d..4a77db0d1a 100644 > --- a/package/xr819-xradio/xr819-xradio.hash > +++ b/package/xr819-xradio/xr819-xradio.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz > +sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz > # Locally computed > -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE > +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE > diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk > index c1fe3295b6..5f60be887c 100644 > --- a/package/xr819-xradio/xr819-xradio.mk > +++ b/package/xr819-xradio/xr819-xradio.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 > +XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 > XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) > XR819_XRADIO_LICENSE = GPL-2.0 > XR819_XRADIO_LICENSE_FILES = LICENSE Tested-by: Sergey Kuzminov From kuzminov.sergey81 at gmail.com Fri Jan 21 16:45:45 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Fri, 21 Jan 2022 19:45:45 +0300 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building In-Reply-To: <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> References: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> Message-ID: <8a692520-6994-d9c9-1fcf-0311a0120353@gmail.com> 21.01.2022 13:33, Giulio Benetti: > Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's > bump xr819-xradio version. > > [1]: https://github.com/fifteenhex/xradio/pull/15 > > Signed-off-by: Giulio Benetti > --- > package/xr819-xradio/xr819-xradio.hash | 4 ++-- > package/xr819-xradio/xr819-xradio.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash > index efff92ab7d..4a77db0d1a 100644 > --- a/package/xr819-xradio/xr819-xradio.hash > +++ b/package/xr819-xradio/xr819-xradio.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz > +sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz > # Locally computed > -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE > +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE > diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk > index c1fe3295b6..5f60be887c 100644 > --- a/package/xr819-xradio/xr819-xradio.mk > +++ b/package/xr819-xradio/xr819-xradio.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 > +XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 > XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) > XR819_XRADIO_LICENSE = GPL-2.0 > XR819_XRADIO_LICENSE_FILES = LICENSE Tested-by: Sergey Kuzminov From quentin.schulz at theobroma-systems.com Fri Jan 21 16:50:46 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Fri, 21 Jan 2022 17:50:46 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so let's port them to 5.15.2. Technically only the first two patches are required to patch the CVE. However, the second patch introduces a regression that is fixed in the third patch. The patches are taken from KDE kde/5.15 git branch. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- v2: - added third patch for fixing regression introduced by the second patch, - cherry-picked commits from kde git kde/5.15 branch instead of taking patches from 5.12.12 since they all applied nicely, ...-intensive-painting-of-high-number-o.patch | 163 ++++++++++++++++++ ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ++++ ...-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++ package/qt5/qt5base/qt5base.mk | 4 + 4 files changed, 304 insertions(+) create mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch create mode 100644 package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch create mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..03287d19ca --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,163 @@ +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Pick-to: 6.1 6.0 5.15 +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) + +* asturmlechner 2021-08-21: +Conflict from preceding 94dd2ceb in dev branch: + src/gui/painting/qpaintengineex.cpp + Resolved via: + + if (pen.style() > Qt::SolidLine) { + QRectF cpRect = path.controlPointRect(); + const QTransform &xf = state()->matrix; +- if (pen.isCosmetic()) { ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ + clipRect = d->exDeviceRect; + cpRect.translate(xf.dx(), xf.dy()); + } else { + +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: + Resolved via: + + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; +- const QList pattern = pen.dashPattern(); ++ const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); + +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 5d8f89eadd..55fdb0c2a0 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 0000000000..d41ced7f5f +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.34.1 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..16e0f20200 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Pick-to: 6.2 6.1 5.15 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L?hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 55fdb0c2a0..19e4b23423 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.34.1 + diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..ca3c2736ae --- /dev/null +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,100 @@ +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 30 Jul 2021 13:03:49 +0200 +Subject: [PATCH] Refix for avoiding huge number of tiny dashes + +Previous fix hit too widely so some valid horizontal and vertical +lines were affected; the root problem being that such lines have an +empty control point rect (width or height is 0). Fix by caculating in +the pen width. + +Pick-to: 6.2 6.1 5.15 +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 8 ++--- + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 19e4b23423..9fe510827a 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); + } + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway +- QRectF extentRect = cpRect & clipRect; ++ qreal pw = pen.widthF() ? pen.widthF() : 1; ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; + const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); +- if (pen.widthF()) +- patternLength *= pen.widthF(); ++ patternLength *= pw; + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { ++ } else if (extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 42e98ce363..d7c3f95f1d 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -308,6 +308,7 @@ private slots: + void fillPolygon(); + + void drawImageAtPointF(); ++ void scaledDashes(); + + private: + void fillData(); +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() + paint.end(); + } + ++void tst_QPainter::scaledDashes() ++{ ++ // Test that we do not hit the limit-huge-number-of-dashes path ++ QRgb fore = qRgb(0, 0, 0xff); ++ QRgb back = qRgb(0xff, 0xff, 0); ++ QImage image(5, 32, QImage::Format_RGB32); ++ image.fill(back); ++ QPainter p(&image); ++ QPen pen(QColor(fore), 3, Qt::DotLine); ++ p.setPen(pen); ++ p.scale(1, 2); ++ p.drawLine(2, 0, 2, 16); ++ p.end(); ++ ++ bool foreFound = false; ++ bool backFound = false; ++ int i = 0; ++ while (i < 32 && (!foreFound || !backFound)) { ++ QRgb pix = image.pixel(3, i); ++ if (pix == fore) ++ foreFound = true; ++ else if (pix == back) ++ backFound = true; ++ i++; ++ } ++ ++ QVERIFY(foreFound); ++ QVERIFY(backFound); ++} ++ + QTEST_MAIN(tst_QPainter) + + #include "tst_qpainter.moc" +-- +2.34.1 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..4ef3759566 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. -- 2.34.1 From fperrad at gmail.com Fri Jan 21 12:38:52 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:52 +0100 Subject: [Buildroot] [PATCH 1/8] package/perl-date-manip: bump to version 6.86 Message-ID: <20220121123859.754653-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-date-manip/perl-date-manip.hash | 4 ++-- package/perl-date-manip/perl-date-manip.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash index d40aa087b..dc267f525 100644 --- a/package/perl-date-manip/perl-date-manip.hash +++ b/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ce3447409d83d16e6dd7bea0a18f24b4 Date-Manip-6.85.tar.gz -sha256 1662393943b7c588478ea9d975200d825f500d26fe9996f2bf7f829cfaa5ccdc Date-Manip-6.85.tar.gz +md5 77123a4cc874f72d7188f859626bdd84 Date-Manip-6.86.tar.gz +sha256 b5203782d03c79aa5822cf33d1828aaa3b4db93a275d4a428c89f56f4713361f Date-Manip-6.86.tar.gz # computed by scancpan sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk index 4ee81d340..35bce456e 100644 --- a/package/perl-date-manip/perl-date-manip.mk +++ b/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.85 +PERL_DATE_MANIP_VERSION = 6.86 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:53 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:53 +0100 Subject: [Buildroot] [PATCH 2/8] package/perl-http-message: bump to version 6.36 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-http-message/perl-http-message.hash | 6 +++--- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 62cf0588a..1a5d9ad0d 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e291f19e9532ffb7d1c80eab786bf0f2 HTTP-Message-6.33.tar.gz -sha256 23b967f71b852cb209ec92a1af6bac89a141dff1650d69824d29a345c1eceef7 HTTP-Message-6.33.tar.gz +md5 e847fb3e297e740080ab6fd1ac127f7f HTTP-Message-6.36.tar.gz +sha256 576a53b486af87db56261a36099776370c06f0087d179fc8c7bb803b48cddd76 HTTP-Message-6.36.tar.gz # computed by scancpan -sha256 1379396dcd2291f17a741d2d6bf14d379f5f2ab91b3c7e7b92c5f82856e2d7ac LICENSE +sha256 f2f428b5f8a3bf4e6a71cd5ea92558a3d123d3d7c5075d34923e71e46dea94df LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 18e673ae1..3b5d6e7b5 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.33 +PERL_HTTP_MESSAGE_VERSION = 6.36 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:54 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:54 +0100 Subject: [Buildroot] [PATCH 3/8] package/perl-io-socket-ssl: bump to version 2.074 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-3-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-io-socket-ssl/perl-io-socket-ssl.hash | 4 ++-- package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index b5dc29973..4a1d71e34 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 4fb67fc8c4817dce8116f2eb7878fd9c IO-Socket-SSL-2.072.tar.gz -sha256 b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d IO-Socket-SSL-2.072.tar.gz +md5 53201b8e4dfaf25d4d661a54fdfda602 IO-Socket-SSL-2.074.tar.gz +sha256 36486b6be49da4d029819cf7069a7b41ed48af0c87e23be0f8e6aba23d08a832 IO-Socket-SSL-2.074.tar.gz # computed by scancpan sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index b32cce12c..1ab70509b 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.072 +PERL_IO_SOCKET_SSL_VERSION = 2.074 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:55 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:55 +0100 Subject: [Buildroot] [PATCH 4/8] package/perl-libwww-perl: bump to version 6.60 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-4-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-libwww-perl/perl-libwww-perl.hash | 6 +++--- package/perl-libwww-perl/perl-libwww-perl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index 2c9b19d6e..e32258050 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e0b7b07a01f19cc507d3a9b55951ce3a libwww-perl-6.57.tar.gz -sha256 30c242359cb808f3fe2b115fb90712410557f0786ad74844f9801fd719bc42f8 libwww-perl-6.57.tar.gz +md5 ce5180358d9279b2843a6518bf2de200 libwww-perl-6.60.tar.gz +sha256 cdd28b9237b9c6791725b9099695c7c3c720b33881606fd6cc7635a5495bb07c libwww-perl-6.60.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE +sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index 23e2aa3bb..aa15ebb59 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.57 +PERL_LIBWWW_PERL_VERSION = 6.60 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:56 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:56 +0100 Subject: [Buildroot] [PATCH 5/8] package/perl-net-dns: bump to version 1.33 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-5-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-net-dns/perl-net-dns.hash | 4 ++-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 916603e71..1af14e2a4 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e8ee02ec42dfeb10ae4a0d175d5fcafc Net-DNS-1.32.tar.gz -sha256 b890a7b44d573f27cc713caadf1e12eaaa4478a6504d1157194df614316b5b50 Net-DNS-1.32.tar.gz +md5 f3ba5295ee588d25dabc74a2ecda296a Net-DNS-1.33.tar.gz +sha256 5a40e7cf524e4bd2c33cf03b82b47d5308b712083aa5ee180b0b5af54c71fbd2 Net-DNS-1.33.tar.gz # computed by scancpan sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index afba3e216..fa7b50c02 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.32 +PERL_NET_DNS_VERSION = 1.33 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:57 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:57 +0100 Subject: [Buildroot] [PATCH 6/8] package/perl-path-tiny: bump to version 0.122 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-6-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-path-tiny/perl-path-tiny.hash | 4 ++-- package/perl-path-tiny/perl-path-tiny.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 6899d5c6b..16f1a9a22 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 046d14dde6e3568aee5085487dd4769e Path-Tiny-0.120.tar.gz -sha256 66a1164981d449da46cc88383fe37f9e352e87e9570bfb960e43fe8ff016ee1b Path-Tiny-0.120.tar.gz +md5 f746d8da5d049a5523b1880666bb0992 Path-Tiny-0.122.tar.gz +sha256 4bc6f76d0548ccd8b38cb66291a885bf0de453d0167562c7b82e8861afdcfb7c Path-Tiny-0.122.tar.gz # computed by scancpan sha256 c1a19c0d83f668a784640c0b41e024f37b182ad38011b170f9200123e57f6070 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index cd4c3bc49..310feed98 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.120 +PERL_PATH_TINY_VERSION = 0.122 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:58 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:58 +0100 Subject: [Buildroot] [PATCH 7/8] package/perl-try-tiny: bump to version 0.31 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-7-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-try-tiny/perl-try-tiny.hash | 6 +++--- package/perl-try-tiny/perl-try-tiny.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-try-tiny/perl-try-tiny.hash b/package/perl-try-tiny/perl-try-tiny.hash index ed4d8ac74..7aa88724f 100644 --- a/package/perl-try-tiny/perl-try-tiny.hash +++ b/package/perl-try-tiny/perl-try-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eb362c3cb32c42f9f28de9ddb7f2ead6 Try-Tiny-0.30.tar.gz -sha256 da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b Try-Tiny-0.30.tar.gz +md5 993a29ee8a03c9bd9c2f7c53d1082a03 Try-Tiny-0.31.tar.gz +sha256 3300d31d8a4075b26d8f46ce864a1d913e0e8467ceeba6655d5d2b2e206c11be Try-Tiny-0.31.tar.gz # computed by scancpan -sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE +sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE diff --git a/package/perl-try-tiny/perl-try-tiny.mk b/package/perl-try-tiny/perl-try-tiny.mk index f13e2ee59..cd2421a3c 100644 --- a/package/perl-try-tiny/perl-try-tiny.mk +++ b/package/perl-try-tiny/perl-try-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TRY_TINY_VERSION = 0.30 +PERL_TRY_TINY_VERSION = 0.31 PERL_TRY_TINY_SOURCE = Try-Tiny-$(PERL_TRY_TINY_VERSION).tar.gz PERL_TRY_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_TRY_TINY_LICENSE = MIT -- 2.32.0 From fperrad at gmail.com Fri Jan 21 12:38:59 2022 From: fperrad at gmail.com (Francois Perrad) Date: Fri, 21 Jan 2022 13:38:59 +0100 Subject: [Buildroot] [PATCH 8/8] package/perl-uri: bump to version 5.10 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121123859.754653-8-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/perl-uri/perl-uri.hash | 6 +++--- package/perl-uri/perl-uri.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index 578beed9b..e7e272c63 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bd66b0c620d076c4b0de9507b5f1fbdf URI-5.09.tar.gz -sha256 03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a URI-5.09.tar.gz +md5 2a00d3dbf891df4256d251382aefd9b9 URI-5.10.tar.gz +sha256 16325d5e308c7b7ab623d1bf944e1354c5f2245afcfadb8eed1e2cae9a0bd0b5 URI-5.10.tar.gz # computed by scancpan -sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE +sha256 d4f0b7a8771dcb1eee79a38c2e466eb997e23565a6687dd1900a2027eabe12a0 LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index d588e8205..d451bc5d6 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.09 +PERL_URI_VERSION = 5.10 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ -- 2.32.0 From yann.morin.1998 at free.fr Fri Jan 21 20:39:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 21:39:46 +0100 Subject: [Buildroot] [PATCH] package/htpdate: bump to version 1.3.3 In-Reply-To: <20220120211941.1033249-1-angelo@amarulasolutions.com> References: <20220120211941.1033249-1-angelo@amarulasolutions.com> Message-ID: <20220121203946.GI3252931@scaer> Angelo, All, On 2022-01-20 22:19 +0100, Angelo Compagnucci spake thusly: > Update project to its new location and move to use the package provided > init scripts. The service file we provide is functional (it uses Google's server) when the upstream service file is not (it uses a dymmy server), same goes for the init script: we are trying to provide works-out-of-the-box experience with sensible defaults. [0] However, the upstream files are very similar to ours, and I see you were the one to push them upstream. [0] And of course, I had to test: https://example.com/ does exist, and does return a date tag. Meh, scratch all the above... Still, I am not too fond of that, because then it means we are departing from our customs to provide our own scripts in all packages... Oh damn, I am not sure... But that is not the biggest issue, see below... > Signed-off-by: Angelo Compagnucci > --- [--SNIP--] > diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk > index e9323f9106..3c4412b283 100644 > --- a/package/htpdate/htpdate.mk > +++ b/package/htpdate/htpdate.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HTPDATE_VERSION = 1.3.1 > +HTPDATE_VERSION = 1.3.3 Er... We have 1.2.6 in the tree, and I could not find the 1.2.6 -> 1.3.1 bump in Patchwork... Are you sure you prepared your patch against master? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 21 20:44:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 21:44:46 +0100 Subject: [Buildroot] [PATCH] package/htpdate: bump to version 1.3.3 In-Reply-To: <20220121203946.GI3252931@scaer> References: <20220120211941.1033249-1-angelo@amarulasolutions.com> <20220121203946.GI3252931@scaer> Message-ID: <20220121204446.GJ3252931@scaer> Angelo, All, On 2022-01-21 21:39 +0100, Yann E. MORIN spake thusly: > On 2022-01-20 22:19 +0100, Angelo Compagnucci spake thusly: > > Update project to its new location and move to use the package provided > > init scripts. Oh, and this is just stating what the patch does, but is missing an explanations why this is a better idea than using our owns, the latter being the really interesting thing that we want to record in a commit log... ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Jan 21 20:50:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 21:50:27 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220121204633.D7CC581DF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9151eab3c7e4548a052be69aecba1f2b1ee6396c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so let's port them to 5.15.2. Technically only the first two patches are required to patch the CVE. However, the second patch introduces a regression that is fixed in the third patch. The patches are taken from KDE kde/5.15 git branch. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN --- ...ssing-intensive-painting-of-high-number-o.patch | 163 +++++++++++++++++++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 +++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++++ package/qt5/qt5base/qt5base.mk | 4 + 4 files changed, 304 insertions(+) diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..03287d19ca --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,163 @@ +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Pick-to: 6.1 6.0 5.15 +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) + +* asturmlechner 2021-08-21: +Conflict from preceding 94dd2ceb in dev branch: + src/gui/painting/qpaintengineex.cpp + Resolved via: + + if (pen.style() > Qt::SolidLine) { + QRectF cpRect = path.controlPointRect(); + const QTransform &xf = state()->matrix; +- if (pen.isCosmetic()) { ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ + clipRect = d->exDeviceRect; + cpRect.translate(xf.dx(), xf.dy()); + } else { + +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: + Resolved via: + + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; +- const QList pattern = pen.dashPattern(); ++ const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); + +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 5d8f89eadd..55fdb0c2a0 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 0000000000..d41ced7f5f +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.34.1 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..16e0f20200 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Pick-to: 6.2 6.1 5.15 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L??hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 55fdb0c2a0..19e4b23423 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.34.1 + diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..ca3c2736ae --- /dev/null +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,100 @@ +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 30 Jul 2021 13:03:49 +0200 +Subject: [PATCH] Refix for avoiding huge number of tiny dashes + +Previous fix hit too widely so some valid horizontal and vertical +lines were affected; the root problem being that such lines have an +empty control point rect (width or height is 0). Fix by caculating in +the pen width. + +Pick-to: 6.2 6.1 5.15 +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 8 ++--- + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 19e4b23423..9fe510827a 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); + } + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway +- QRectF extentRect = cpRect & clipRect; ++ qreal pw = pen.widthF() ? pen.widthF() : 1; ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; + const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); +- if (pen.widthF()) +- patternLength *= pen.widthF(); ++ patternLength *= pw; + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { ++ } else if (extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 42e98ce363..d7c3f95f1d 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -308,6 +308,7 @@ private slots: + void fillPolygon(); + + void drawImageAtPointF(); ++ void scaledDashes(); + + private: + void fillData(); +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() + paint.end(); + } + ++void tst_QPainter::scaledDashes() ++{ ++ // Test that we do not hit the limit-huge-number-of-dashes path ++ QRgb fore = qRgb(0, 0, 0xff); ++ QRgb back = qRgb(0xff, 0xff, 0); ++ QImage image(5, 32, QImage::Format_RGB32); ++ image.fill(back); ++ QPainter p(&image); ++ QPen pen(QColor(fore), 3, Qt::DotLine); ++ p.setPen(pen); ++ p.scale(1, 2); ++ p.drawLine(2, 0, 2, 16); ++ p.end(); ++ ++ bool foreFound = false; ++ bool backFound = false; ++ int i = 0; ++ while (i < 32 && (!foreFound || !backFound)) { ++ QRgb pix = image.pixel(3, i); ++ if (pix == fore) ++ foreFound = true; ++ else if (pix == back) ++ backFound = true; ++ i++; ++ } ++ ++ QVERIFY(foreFound); ++ QVERIFY(backFound); ++} ++ + QTEST_MAIN(tst_QPainter) + + #include "tst_qpainter.moc" +-- +2.34.1 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bcdf036f00..4ef3759566 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. From yann.morin.1998 at free.fr Fri Jan 21 20:53:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 21:53:27 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix CVE-2021-38593 In-Reply-To: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> References: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> Message-ID: <20220121205327.GK3252931@scaer> Quentin, All, On 2022-01-21 17:50 +0100, Quentin Schulz spake thusly: > 5.15.2 is the last public release of 5.15 and does not contain this CVE > fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so > let's port them to 5.15.2. > > Technically only the first two patches are required to patch the CVE. > However, the second patch introduces a regression that is fixed in the third > patch. > > The patches are taken from KDE kde/5.15 git branch. > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Applied to master, thanks. Regards, Yann E. MORIN. > --- > > v2: > - added third patch for fixing regression introduced by the second patch, > - cherry-picked commits from kde git kde/5.15 branch instead of taking > patches from 5.12.12 since they all applied nicely, > > ...-intensive-painting-of-high-number-o.patch | 163 ++++++++++++++++++ > ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ++++ > ...-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++ > package/qt5/qt5base/qt5base.mk | 4 + > 4 files changed, 304 insertions(+) > create mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch > create mode 100644 package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > create mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch > > diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch > new file mode 100644 > index 0000000000..03287d19ca > --- /dev/null > +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch > @@ -0,0 +1,163 @@ > +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 > +From: Eirik Aavitsland > +Date: Tue, 13 Apr 2021 14:23:45 +0200 > +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny > + dashes > + > +When stroking a dashed path, an unnecessary amount of processing would > +be spent if there is a huge number of dashes visible, e.g. because of > +scaling. Since the dashes are too small to be indivdually visible > +anyway, just replace with a semi-transparent solid line for such > +cases. > + > +Pick-to: 6.1 6.0 5.15 > +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 > +Reviewed-by: Allan Sandfeld Jensen > +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) > + > +* asturmlechner 2021-08-21: > +Conflict from preceding 94dd2ceb in dev branch: > + src/gui/painting/qpaintengineex.cpp > + Resolved via: > + > + if (pen.style() > Qt::SolidLine) { > + QRectF cpRect = path.controlPointRect(); > + const QTransform &xf = state()->matrix; > +- if (pen.isCosmetic()) { > ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ > + clipRect = d->exDeviceRect; > + cpRect.translate(xf.dx(), xf.dy()); > + } else { > + > +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: > + Resolved via: > + > + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; > + qreal extent = qMax(extentRect.width(), extentRect.height()); > + qreal patternLength = 0; > +- const QList pattern = pen.dashPattern(); > ++ const QVector pattern = pen.dashPattern(); > + const int patternSize = qMin(pattern.size(), 32); > + for (int i = 0; i < patternSize; i++) > + patternLength += qMax(pattern.at(i), qreal(0)); > + > +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] > +Signed-off-by: Quentin Schulz > +--- > + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- > + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ > + 2 files changed, 69 insertions(+), 9 deletions(-) > + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps > + > +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp > +index 5d8f89eadd..55fdb0c2a0 100644 > +--- a/src/gui/painting/qpaintengineex.cpp > ++++ b/src/gui/painting/qpaintengineex.cpp > +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const > + > + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp > + > +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) > ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) > + { > + #ifdef QT_DEBUG_DRAW > + qDebug() << "QPaintEngineEx::stroke()" << pen; > +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) > + d->stroker.setCubicToHook(qpaintengineex_cubicTo); > + } > + > ++ QRectF clipRect; > ++ QPen pen = inPen; > ++ if (pen.style() > Qt::SolidLine) { > ++ QRectF cpRect = path.controlPointRect(); > ++ const QTransform &xf = state()->matrix; > ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ > ++ clipRect = d->exDeviceRect; > ++ cpRect.translate(xf.dx(), xf.dy()); > ++ } else { > ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); > ++ } > ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway > ++ QRectF extentRect = cpRect & clipRect; > ++ qreal extent = qMax(extentRect.width(), extentRect.height()); > ++ qreal patternLength = 0; > ++ const QVector pattern = pen.dashPattern(); > ++ const int patternSize = qMin(pattern.size(), 32); > ++ for (int i = 0; i < patternSize; i++) > ++ patternLength += qMax(pattern.at(i), qreal(0)); > ++ if (pen.widthF()) > ++ patternLength *= pen.widthF(); > ++ if (qFuzzyIsNull(patternLength)) { > ++ pen.setStyle(Qt::NoPen); > ++ } else if (extent / patternLength > 10000) { > ++ // approximate stream of tiny dashes with semi-transparent solid line > ++ pen.setStyle(Qt::SolidLine); > ++ QColor color(pen.color()); > ++ color.setAlpha(color.alpha() / 2); > ++ pen.setColor(color); > ++ } > ++ } > ++ > + if (!qpen_fast_equals(pen, d->strokerPen)) { > + d->strokerPen = pen; > + d->stroker.setJoinStyle(pen.joinStyle()); > +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) > + return; > + } > + > +- if (pen.style() > Qt::SolidLine) { > +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ > +- d->activeStroker->setClipRect(d->exDeviceRect); > +- } else { > +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); > +- d->activeStroker->setClipRect(clipRect); > +- } > +- } > ++ if (!clipRect.isNull()) > ++ d->activeStroker->setClipRect(clipRect); > + > + if (d->activeStroker == &d->stroker) > + d->stroker.setForceOpen(path.hasExplicitOpen()); > +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps > +new file mode 100644 > +index 0000000000..d41ced7f5f > +--- /dev/null > ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps > +@@ -0,0 +1,34 @@ > ++# Version: 1 > ++# CheckVsReference: 5% > ++ > ++path_addEllipse mypath 20.0 20.0 200.0 200.0 > ++ > ++save > ++setPen blue 20 SolidLine FlatCap > ++pen_setCosmetic true > ++pen_setDashPattern [ 0.0004 0.0004 ] > ++setBrush yellow > ++ > ++drawPath mypath > ++translate 300 0 > ++setRenderHint Antialiasing true > ++drawPath mypath > ++restore > ++ > ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 > ++ > ++setPen blue 20 DotLine FlatCap > ++setBrush yellow > ++ > ++save > ++translate 0 300 > ++scale 0.0001 0.00011 > ++drawPath bigpath > ++restore > ++ > ++save > ++translate 300 300 > ++setRenderHint Antialiasing true > ++scale 0.0001 0.00011 > ++drawPath bigpath > ++restore > +-- > +2.34.1 > + > diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > new file mode 100644 > index 0000000000..16e0f20200 > --- /dev/null > +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > @@ -0,0 +1,37 @@ > +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 > +From: Eirik Aavitsland > +Date: Fri, 23 Jul 2021 15:53:56 +0200 > +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Some pathological cases were not caught by the previous fix. > + > +Fixes: QTBUG-95239 > +Pick-to: 6.2 6.1 5.15 > +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 > +Reviewed-by: Robert L?hning > +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) > +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] > +Signed-off-by: Quentin Schulz > +--- > + src/gui/painting/qpaintengineex.cpp | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp > +index 55fdb0c2a0..19e4b23423 100644 > +--- a/src/gui/painting/qpaintengineex.cpp > ++++ b/src/gui/painting/qpaintengineex.cpp > +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) > + patternLength *= pen.widthF(); > + if (qFuzzyIsNull(patternLength)) { > + pen.setStyle(Qt::NoPen); > +- } else if (extent / patternLength > 10000) { > ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { > + // approximate stream of tiny dashes with semi-transparent solid line > + pen.setStyle(Qt::SolidLine); > + QColor color(pen.color()); > +-- > +2.34.1 > + > diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch > new file mode 100644 > index 0000000000..ca3c2736ae > --- /dev/null > +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch > @@ -0,0 +1,100 @@ > +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 > +From: Eirik Aavitsland > +Date: Fri, 30 Jul 2021 13:03:49 +0200 > +Subject: [PATCH] Refix for avoiding huge number of tiny dashes > + > +Previous fix hit too widely so some valid horizontal and vertical > +lines were affected; the root problem being that such lines have an > +empty control point rect (width or height is 0). Fix by caculating in > +the pen width. > + > +Pick-to: 6.2 6.1 5.15 > +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc > +Reviewed-by: Allan Sandfeld Jensen > +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) > +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] > +Signed-off-by: Quentin Schulz > +--- > + src/gui/painting/qpaintengineex.cpp | 8 ++--- > + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ > + 2 files changed, 35 insertions(+), 4 deletions(-) > + > +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp > +index 19e4b23423..9fe510827a 100644 > +--- a/src/gui/painting/qpaintengineex.cpp > ++++ b/src/gui/painting/qpaintengineex.cpp > +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) > + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); > + } > + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway > +- QRectF extentRect = cpRect & clipRect; > ++ qreal pw = pen.widthF() ? pen.widthF() : 1; > ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; > + qreal extent = qMax(extentRect.width(), extentRect.height()); > + qreal patternLength = 0; > + const QVector pattern = pen.dashPattern(); > + const int patternSize = qMin(pattern.size(), 32); > + for (int i = 0; i < patternSize; i++) > + patternLength += qMax(pattern.at(i), qreal(0)); > +- if (pen.widthF()) > +- patternLength *= pen.widthF(); > ++ patternLength *= pw; > + if (qFuzzyIsNull(patternLength)) { > + pen.setStyle(Qt::NoPen); > +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { > ++ } else if (extent / patternLength > 10000) { > + // approximate stream of tiny dashes with semi-transparent solid line > + pen.setStyle(Qt::SolidLine); > + QColor color(pen.color()); > +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp > +index 42e98ce363..d7c3f95f1d 100644 > +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp > ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp > +@@ -308,6 +308,7 @@ private slots: > + void fillPolygon(); > + > + void drawImageAtPointF(); > ++ void scaledDashes(); > + > + private: > + void fillData(); > +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() > + paint.end(); > + } > + > ++void tst_QPainter::scaledDashes() > ++{ > ++ // Test that we do not hit the limit-huge-number-of-dashes path > ++ QRgb fore = qRgb(0, 0, 0xff); > ++ QRgb back = qRgb(0xff, 0xff, 0); > ++ QImage image(5, 32, QImage::Format_RGB32); > ++ image.fill(back); > ++ QPainter p(&image); > ++ QPen pen(QColor(fore), 3, Qt::DotLine); > ++ p.setPen(pen); > ++ p.scale(1, 2); > ++ p.drawLine(2, 0, 2, 16); > ++ p.end(); > ++ > ++ bool foreFound = false; > ++ bool backFound = false; > ++ int i = 0; > ++ while (i < 32 && (!foreFound || !backFound)) { > ++ QRgb pix = image.pixel(3, i); > ++ if (pix == fore) > ++ foreFound = true; > ++ else if (pix == back) > ++ backFound = true; > ++ i++; > ++ } > ++ > ++ QVERIFY(foreFound); > ++ QVERIFY(backFound); > ++} > ++ > + QTEST_MAIN(tst_QPainter) > + > + #include "tst_qpainter.moc" > +-- > +2.34.1 > + > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index bcdf036f00..4ef3759566 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz > QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib > QT5BASE_INSTALL_STAGING = YES > > +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > +QT5BASE_IGNORE_CVES += CVE-2021-38593 > + > # A few comments: > # * -no-pch to workaround the issue described at > # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Fri Jan 21 21:16:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 21 Jan 2022 14:16:29 -0700 Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build In-Reply-To: <20220121142623.7d5d72bc@windsurf> References: <20220119084545.3642950-1-james.hilliard1@gmail.com> <20220119204518.GC3095239@scaer> <20220120222936.6e7b5aba@gmx.net> <20220121065850.GF3252931@scaer> <20220121084141.6eac525e@windsurf> <20220121075924.GG3252931@scaer> <20220121142623.7d5d72bc@windsurf> Message-ID: On Fri, Jan 21, 2022 at 6:26 AM Thomas Petazzoni wrote: > > On Fri, 21 Jan 2022 08:59:24 +0100 > "Yann E. MORIN" wrote: > > > > I might be missing something in the whole discussion, but why not patch > > > the CMake build system so that it also installs this .pc file, and > > > contribute this fix upstream ? > > > > Because upstream have not been very enthusisatic about it, as James > > pointed out when I suggested the same. ;-) > > Upstream is not enthusiastic about supporting pkg-config, about having > their two possible build systems behave in the same way? What sort of > odd upstream is that? Best I can tell the cmake build is mostly intended for non-system builds/installs or something weird like that. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From yann.morin.1998 at free.fr Fri Jan 21 21:23:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:42 +0100 Subject: [Buildroot] [git commit] package/perl-http-message: bump to version 6.36 Message-ID: <20220121211938.6C8D48353C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b1e9b844c04176555f179a061b9021f6ee1d304 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-http-message/perl-http-message.hash | 6 +++--- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 62cf0588ad..1a5d9ad0df 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e291f19e9532ffb7d1c80eab786bf0f2 HTTP-Message-6.33.tar.gz -sha256 23b967f71b852cb209ec92a1af6bac89a141dff1650d69824d29a345c1eceef7 HTTP-Message-6.33.tar.gz +md5 e847fb3e297e740080ab6fd1ac127f7f HTTP-Message-6.36.tar.gz +sha256 576a53b486af87db56261a36099776370c06f0087d179fc8c7bb803b48cddd76 HTTP-Message-6.36.tar.gz # computed by scancpan -sha256 1379396dcd2291f17a741d2d6bf14d379f5f2ab91b3c7e7b92c5f82856e2d7ac LICENSE +sha256 f2f428b5f8a3bf4e6a71cd5ea92558a3d123d3d7c5075d34923e71e46dea94df LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 18e673ae1c..3b5d6e7b5f 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.33 +PERL_HTTP_MESSAGE_VERSION = 6.36 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:23:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:44 +0100 Subject: [Buildroot] [git commit] package/perl-io-socket-ssl: bump to version 2.074 Message-ID: <20220121211938.752918353E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd75f2d403d6d7a63d151572b955c05ca25f942f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-io-socket-ssl/perl-io-socket-ssl.hash | 4 ++-- package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index b5dc299735..4a1d71e349 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 4fb67fc8c4817dce8116f2eb7878fd9c IO-Socket-SSL-2.072.tar.gz -sha256 b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d IO-Socket-SSL-2.072.tar.gz +md5 53201b8e4dfaf25d4d661a54fdfda602 IO-Socket-SSL-2.074.tar.gz +sha256 36486b6be49da4d029819cf7069a7b41ed48af0c87e23be0f8e6aba23d08a832 IO-Socket-SSL-2.074.tar.gz # computed by scancpan sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index b32cce12c6..1ab70509bd 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.072 +PERL_IO_SOCKET_SSL_VERSION = 2.074 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:23:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:40 +0100 Subject: [Buildroot] [git commit] package/perl-date-manip: bump to version 6.86 Message-ID: <20220121211938.6272B82B4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=068d86abf1d3024dbe3bcd657874d8216e8bb4f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-date-manip/perl-date-manip.hash | 4 ++-- package/perl-date-manip/perl-date-manip.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash index d40aa087b5..dc267f525e 100644 --- a/package/perl-date-manip/perl-date-manip.hash +++ b/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ce3447409d83d16e6dd7bea0a18f24b4 Date-Manip-6.85.tar.gz -sha256 1662393943b7c588478ea9d975200d825f500d26fe9996f2bf7f829cfaa5ccdc Date-Manip-6.85.tar.gz +md5 77123a4cc874f72d7188f859626bdd84 Date-Manip-6.86.tar.gz +sha256 b5203782d03c79aa5822cf33d1828aaa3b4db93a275d4a428c89f56f4713361f Date-Manip-6.86.tar.gz # computed by scancpan sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk index 4ee81d340f..35bce456e2 100644 --- a/package/perl-date-manip/perl-date-manip.mk +++ b/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.85 +PERL_DATE_MANIP_VERSION = 6.86 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:23:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:51 +0100 Subject: [Buildroot] [git commit] package/perl-path-tiny: bump to version 0.122 Message-ID: <20220121211938.914798353E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19f318a1e1126ddc002c3ad25edfe2197bdc3500 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-path-tiny/perl-path-tiny.hash | 4 ++-- package/perl-path-tiny/perl-path-tiny.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 6899d5c6b4..16f1a9a222 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 046d14dde6e3568aee5085487dd4769e Path-Tiny-0.120.tar.gz -sha256 66a1164981d449da46cc88383fe37f9e352e87e9570bfb960e43fe8ff016ee1b Path-Tiny-0.120.tar.gz +md5 f746d8da5d049a5523b1880666bb0992 Path-Tiny-0.122.tar.gz +sha256 4bc6f76d0548ccd8b38cb66291a885bf0de453d0167562c7b82e8861afdcfb7c Path-Tiny-0.122.tar.gz # computed by scancpan sha256 c1a19c0d83f668a784640c0b41e024f37b182ad38011b170f9200123e57f6070 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index cd4c3bc496..310feed98b 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.120 +PERL_PATH_TINY_VERSION = 0.122 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Fri Jan 21 21:23:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:47 +0100 Subject: [Buildroot] [git commit] package/perl-libwww-perl: bump to version 6.60 Message-ID: <20220121211938.7EECF82B4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1050a4c32f55e9e7e521f57490e6ca430119f42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-libwww-perl/perl-libwww-perl.hash | 6 +++--- package/perl-libwww-perl/perl-libwww-perl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index 2c9b19d6ef..e32258050c 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e0b7b07a01f19cc507d3a9b55951ce3a libwww-perl-6.57.tar.gz -sha256 30c242359cb808f3fe2b115fb90712410557f0786ad74844f9801fd719bc42f8 libwww-perl-6.57.tar.gz +md5 ce5180358d9279b2843a6518bf2de200 libwww-perl-6.60.tar.gz +sha256 cdd28b9237b9c6791725b9099695c7c3c720b33881606fd6cc7635a5495bb07c libwww-perl-6.60.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE +sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index 23e2aa3bb8..aa15ebb594 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.57 +PERL_LIBWWW_PERL_VERSION = 6.60 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:23:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:49 +0100 Subject: [Buildroot] [git commit] package/perl-net-dns: bump to version 1.33 Message-ID: <20220121211938.886078353C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b9961c6e15661f74140dd7656ca4485a059bb73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-net-dns/perl-net-dns.hash | 4 ++-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 916603e715..1af14e2a45 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e8ee02ec42dfeb10ae4a0d175d5fcafc Net-DNS-1.32.tar.gz -sha256 b890a7b44d573f27cc713caadf1e12eaaa4478a6504d1157194df614316b5b50 Net-DNS-1.32.tar.gz +md5 f3ba5295ee588d25dabc74a2ecda296a Net-DNS-1.33.tar.gz +sha256 5a40e7cf524e4bd2c33cf03b82b47d5308b712083aa5ee180b0b5af54c71fbd2 Net-DNS-1.33.tar.gz # computed by scancpan sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index afba3e216a..fa7b50c023 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.32 +PERL_NET_DNS_VERSION = 1.33 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT From yann.morin.1998 at free.fr Fri Jan 21 21:23:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:54 +0100 Subject: [Buildroot] [git commit] package/perl-try-tiny: bump to version 0.31 Message-ID: <20220121211938.99C1B82B4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d3a26867b4c28d66314416b4b515a9686f9c2d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-try-tiny/perl-try-tiny.hash | 6 +++--- package/perl-try-tiny/perl-try-tiny.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-try-tiny/perl-try-tiny.hash b/package/perl-try-tiny/perl-try-tiny.hash index ed4d8ac74f..7aa88724f0 100644 --- a/package/perl-try-tiny/perl-try-tiny.hash +++ b/package/perl-try-tiny/perl-try-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eb362c3cb32c42f9f28de9ddb7f2ead6 Try-Tiny-0.30.tar.gz -sha256 da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b Try-Tiny-0.30.tar.gz +md5 993a29ee8a03c9bd9c2f7c53d1082a03 Try-Tiny-0.31.tar.gz +sha256 3300d31d8a4075b26d8f46ce864a1d913e0e8467ceeba6655d5d2b2e206c11be Try-Tiny-0.31.tar.gz # computed by scancpan -sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE +sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE diff --git a/package/perl-try-tiny/perl-try-tiny.mk b/package/perl-try-tiny/perl-try-tiny.mk index f13e2ee59f..cd2421a3cb 100644 --- a/package/perl-try-tiny/perl-try-tiny.mk +++ b/package/perl-try-tiny/perl-try-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TRY_TINY_VERSION = 0.30 +PERL_TRY_TINY_VERSION = 0.31 PERL_TRY_TINY_SOURCE = Try-Tiny-$(PERL_TRY_TINY_VERSION).tar.gz PERL_TRY_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_TRY_TINY_LICENSE = MIT From yann.morin.1998 at free.fr Fri Jan 21 21:23:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:23:56 +0100 Subject: [Buildroot] [git commit] package/perl-uri: bump to version 5.10 Message-ID: <20220121211938.A1EC58359C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=970f1b0df0e47979f0c6284dd5c40ff1d477b506 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/perl-uri/perl-uri.hash | 6 +++--- package/perl-uri/perl-uri.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index 578beed9bf..e7e272c63a 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bd66b0c620d076c4b0de9507b5f1fbdf URI-5.09.tar.gz -sha256 03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a URI-5.09.tar.gz +md5 2a00d3dbf891df4256d251382aefd9b9 URI-5.10.tar.gz +sha256 16325d5e308c7b7ab623d1bf944e1354c5f2245afcfadb8eed1e2cae9a0bd0b5 URI-5.10.tar.gz # computed by scancpan -sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE +sha256 d4f0b7a8771dcb1eee79a38c2e466eb997e23565a6687dd1900a2027eabe12a0 LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index d588e82056..d451bc5d6a 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.09 +PERL_URI_VERSION = 5.10 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ From yann.morin.1998 at free.fr Fri Jan 21 21:28:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 21 Jan 2022 22:28:54 +0100 Subject: [Buildroot] [PATCH 1/8] package/perl-date-manip: bump to version 6.86 In-Reply-To: <20220121123859.754653-1-francois.perrad@gadz.org> References: <20220121123859.754653-1-francois.perrad@gadz.org> Message-ID: <20220121212854.GL3252931@scaer> Fran?ois, All, On 2022-01-21 13:38 +0100, Francois Perrad spake thusly: > Signed-off-by: Francois Perrad Series of 8 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/perl-date-manip/perl-date-manip.hash | 4 ++-- > package/perl-date-manip/perl-date-manip.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash > index d40aa087b..dc267f525 100644 > --- a/package/perl-date-manip/perl-date-manip.hash > +++ b/package/perl-date-manip/perl-date-manip.hash > @@ -1,6 +1,6 @@ > # retrieved by scancpan from http://cpan.metacpan.org/ > -md5 ce3447409d83d16e6dd7bea0a18f24b4 Date-Manip-6.85.tar.gz > -sha256 1662393943b7c588478ea9d975200d825f500d26fe9996f2bf7f829cfaa5ccdc Date-Manip-6.85.tar.gz > +md5 77123a4cc874f72d7188f859626bdd84 Date-Manip-6.86.tar.gz > +sha256 b5203782d03c79aa5822cf33d1828aaa3b4db93a275d4a428c89f56f4713361f Date-Manip-6.86.tar.gz > > # computed by scancpan > sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE > diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk > index 4ee81d340..35bce456e 100644 > --- a/package/perl-date-manip/perl-date-manip.mk > +++ b/package/perl-date-manip/perl-date-manip.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PERL_DATE_MANIP_VERSION = 6.85 > +PERL_DATE_MANIP_VERSION = 6.86 > PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz > PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK > PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sat Jan 22 07:06:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 07:06:51 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-21 Message-ID: <20220122070657.5191C607F2@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-01-21 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 70 | 5 | 0 | 75 | 2021.11.x | 17 | 6 | 0 | 23 | master | 94 | 29 | 0 | 123 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 7 frr-8.1 | 4 bluez5_utils-5.63 | 2 qt5webkit-5.212.0-alpha4 | 2 cryptopp-8.6.0 | 1 cryptsetup-2.4.2 | 1 guile-3.0.7 | 1 gvfs-1.48.1 | 1 hiawatha-11.1 | 1 ksmbd-tools-3.4.3 | 1 libglvnd-1.3.2 | 1 mongodb-4.2.11 | 1 nodejs-14.18.3 | 1 pulseview-0.4.2 | 1 rtorrent-0.9.8 | 1 tesseract-ocr-5.0.1 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6217231b30e9f62574a7408359bb8b18ef0a4228 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/cbca95b985a594e897c9dacbe12341d3a0a34f06 | powerpc | cryptopp-8.6.0 | NOK | http://autobuild.buildroot.net/results/6b96ab6c391e304dc1f6c175e6ae4e68a8362d9b | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/4c5e5eaca926372cc71418583b56ea0d93d110cc | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/dbda895ef25cc48fee89ac49863480a6773778f9 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/5e524ed0b4768304caad7fa29249cf64751ec6d6 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0f43deb205ad3da2b37694aa777f3cbf184436a4 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0e3fd4b6121097e7ea648d57f9f57596a395bec8 | aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/69ade733bd49d6cfafc0f162c352e2d624bfa9b2 | ORPH mipsel | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/e22684977c48652c170da28b3b3ce5808eb63b47 | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/12a20b3f9e4f9f343b7a23f3fed530407827615e | powerpc64 | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/05272cff4dee5b09d00b7f7f50c77bcd6f13f9fa | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/d27fcdd52ad149433e38539ef3bd00b501ae32c4 | ORPH arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/0e199ae9f1bc4d9d6a542afb4a01dce3f605cb5f | mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/f2ab8baa03dd2dad4b9fbe3ed175f006a745f3dd | riscv32 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/4158a3a5ec242eb1987352f75754d4fe63761a38 | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/53016bd78eedffb608efb8f4c069c217fb8859c2 | mipsel | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/0cda723b5fcf349270ad20875aec6d317d774f66 | sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/bd03b1790b50a5f3f8e7697c3ad9ba31dc16e5c3 | ORPH mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/5796cfad0dff3218bac43f3bfb1488b1f953b39d | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/66c839da496742b9a34598cf6d0a2ec83779ba2f | i586 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9c4d38131a27255b7be320c3a6dc1009f0b54aa1 | microblazeel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/408f07a95f55bb8c15c4df092de61ecd1c99bda7 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/303e1b4a2d6e8f9a5abe382d862b601494ae7eb0 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/446b5f21c8906ac75ef9e65670e28ac583eccebb | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/86a60928dc063946886f403211348e65bf8099e2 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/0bac6491188b6681df2ca13eb230706e83cbb130 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/6c789e62dd2b24a4f265aaddc34f30f6283a961b | xtensa | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9e6966d48d75a987b69052d518dbcebb53e7ba6b | Classification of failures by reason for 2021.02.x -------------------------------------------------- gnuradio-3.8.1.0 | 1 gobject-introspection-1.64.1 | 1 gstreamer1-mm-1.10.0 | 1 qt5location-5.15.2 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | gnuradio-3.8.1.0 | NOK | http://autobuild.buildroot.net/results/08143fac4c9a19096d6375500505bf1984423598 | x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/2e14189d66bf643ecef5546fa9f84a62cb6083f4 | ORPH mips | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/2e2175d95d63f4a606da6d38028eb390a8eb9d92 | ORPH x86_64 | qt5location-5.15.2 | NOK | http://autobuild.buildroot.net/results/845168c5ee9c0e77a775f4e764c4205b368ca225 | arm | unknown | NOK | http://autobuild.buildroot.net/results/9162bc2b5fa9408edf2bec3d2a4db48cf3644abb | Classification of failures by reason for 2021.11.x -------------------------------------------------- gstd-0.13.0 | 1 host-erlang-22.2 | 1 libdbi-88b8477d57153b9f736d... | 1 libnss-3.73 | 1 libqmi-1.30.2 | 1 nodejs-14.18.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/da0348d455ac3660491bbec9ff9b8a15d6186b0d | ORPH x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/7f856109152d8c9ad224377317cd750b3870e584 | m68k | libdbi-88b8477d57153b9f736d... | NOK | http://autobuild.buildroot.net/results/adc3b7eb59b9a71ccb2ba79c724b693bbecbf5db | x86_64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/c368e02bedecb8ccb0b5db8c27f61912b43f09a3 | arm | libqmi-1.30.2 | NOK | http://autobuild.buildroot.net/results/dbce587915079f8014ea48524682fd567f33214d | arm | nodejs-14.18.1 | NOK | http://autobuild.buildroot.net/results/c3715d2b8e3a938c6d5dd93d2497ea8adec0f70f | Gitlab CI results for 2022-01-21 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143358 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143361 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143362 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143363 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143366 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143368 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143373 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143375 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143377 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143379 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143381 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143383 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143384 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143386 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143388 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143390 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143391 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143395 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143396 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143397 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143398 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143399 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143401 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143402 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143404 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143405 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143407 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143409 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143410 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143411 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143415 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143416 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143417 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143420 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143427 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143428 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143431 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143433 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143435 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143436 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143437 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143439 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143440 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143460 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143462 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143463 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143464 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143465 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143467 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143469 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143470 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143474 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143472 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143473 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143476 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143477 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143478 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143487 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143500 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143501 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143506 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143507 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143510 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143511 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143512 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143513 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143515 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143517 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143518 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143519 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143522 | mx6sx_udoo_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143527 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143546 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143556 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143562 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143566 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143567 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143572 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143574 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143577 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143578 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143580 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143584 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143590 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143591 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143592 | qemu_ppc_g3beige | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143631 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143660 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143668 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143669 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143671 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143672 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143674 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143675 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143677 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143679 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143680 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143682 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143685 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143687 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143689 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143706 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143707 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143709 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143714 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143715 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143716 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143717 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143718 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/1995143719 | -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Sat Jan 22 10:50:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 11:50:17 +0100 Subject: [Buildroot] [PATCH 2/3] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: <20220113215805.GM1477939@scaer> References: <91348c3073b0dcf57a8ea3227bae74c23a122713.1641663315.git.yann.morin.1998@free.fr> <20220113215805.GM1477939@scaer> Message-ID: <20220122105017.GM3252931@scaer> Arnout, All, On 2022-01-13 22:58 +0100, Yann E. MORIN spake thusly: > On 2022-01-12 21:42 +0100, Arnout Vandecappelle spake thusly: > > On 08/01/2022 18:35, Yann E. MORIN wrote: > > >Some files contain hard-coded absolute paths that point to the host > > >and/or staging directories. > > > > > >With per-package directories (aka. PPD), these paths point to the PPD > > >of the package that created the files, when we want them to point to the > > >PPD of the package that uses them. > [--SNIP--] > > >+define PPD_FIXUP_PATHS > > >+ $(Q)grep -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ > > This will trawl to large binary files and potentially take a long time... > > I too thought of that, and I even discussed it slightly with Peter K. > here about what would be most efficient: grep-then-file, or file-then-grep? > > But if we add --binary-files=without-match to grep, then it will > bail-out early on binary files, which would be more efficient. And then > we still pass that through file to really get only text files. > > But a text-file with utf8 is really a binary file, so would grep ignore > it? So I tried and created a simple file with arbitrary non-ASCII UTF-8 symbols (I just copy-pasted the chinese Wikipedia home page, arbitarily wrapped for "readability"): $ cat foo ????????????????????????????? ?????????????????????????????? ??????????????????????????2005?? ????????????????????????????? 2004-05?????24????????????????????? ?????????????????????????????? ?????????????????????????????? ?????????????????????????????2006 ?2008???????????????????2011-2013???? ????? $ file -b --mime-type foo text/plain $ grep --binary-files=without-match ??? foo 2004-05?????24????????????????????? So, a text file with utf-8 chars is still recognied as a text file, and grep will also not recognise it as a binary file. So we can tell grep to bail out early on binary files, to speed up the stuff. I'd still keep the 'file' test as a further safety net, though. So, grep does not follow symlinks, and we can can speed grep by instructing it to skip binary files. As such, I think all your issues have been addressed now. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sat Jan 22 12:15:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:15:00 +0100 Subject: [Buildroot] [PATCH] configs/kontron_pitx_imx8m_defconfig: remove BR2_ARM_FPU_VFPV3 In-Reply-To: <20220120135251.4225-1-heiko.thiery@gmail.com> References: <20220120135251.4225-1-heiko.thiery@gmail.com> Message-ID: <20220122131500.10cafe0a@windsurf> On Thu, 20 Jan 2022 14:52:52 +0100 Heiko Thiery wrote: > The FP setting is not used for aarch64 in buildroot. The FPU options are > set implicit. > > Signed-off-by: Heiko Thiery > --- > configs/kontron_pitx_imx8m_defconfig | 1 - > 1 file changed, 1 deletion(-) Applied to master, thanks. That being said the FPU handling on AArch64 is not very clear to me. I'm not sure we're handling it correctly in Buildroot today. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:15:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:15:09 +0100 Subject: [Buildroot] [git commit] configs/kontron_pitx_imx8m: remove BR2_ARM_FPU_VFPV3 Message-ID: <20220122120834.CD63C82598@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b399de3a1299636a734c96e6abef063d3dcfc0a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The FP setting is not used for aarch64 in buildroot. The FPU options are set implicit. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- configs/kontron_pitx_imx8m_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 4053e1e398..0e3868b583 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -1,6 +1,5 @@ # Architecture BR2_aarch64=y -BR2_ARM_FPU_VFPV3=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" From thomas.petazzoni at bootlin.com Sat Jan 22 12:15:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:15:21 +0100 Subject: [Buildroot] [git commit] package/readline: bump version to 8.1.2 Message-ID: <20220122120859.C931C825F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d958ae450d41ddf0d44ea5bd84209ba09face868 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] http://git.savannah.gnu.org/cgit/readline.git/log Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/readline/readline.hash | 5 +++-- package/readline/readline.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/readline/readline.hash b/package/readline/readline.hash index 63172f1121..b0530a2d72 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,5 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 readline-8.1.tar.gz +# Locally calculated after checking pgp signature from +# https://ftp.gnu.org/gnu/readline/readline-8.1.2.tar.gz.sig +sha256 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 readline-8.1.2.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 06a96b67a8..b1fd181b78 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.1 +READLINE_VERSION = 8.1.2 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf From thomas.petazzoni at bootlin.com Sat Jan 22 12:15:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:15:50 +0100 Subject: [Buildroot] [PATCH v1] package/readline: bump version to 8.1.2 In-Reply-To: <20220120214300.8626-1-ps.report@gmx.net> References: <20220120214300.8626-1-ps.report@gmx.net> Message-ID: <20220122131550.74a5eb54@windsurf> On Thu, 20 Jan 2022 22:43:00 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] http://git.savannah.gnu.org/cgit/readline.git/log > > Signed-off-by: Peter Seiderer > --- > package/readline/readline.hash | 5 +++-- > package/readline/readline.mk | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:16:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:16:14 +0100 Subject: [Buildroot] [git commit] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building Message-ID: <20220122120934.D8D4A81970@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aab9cb163ece16b5e10a3e3fb14ced6c11f98913 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's bump xr819-xradio version. [1]: https://github.com/fifteenhex/xradio/pull/15 Signed-off-by: Giulio Benetti Tested-by: Sergey Kuzminov Tested-by: Sergey Kuzminov Signed-off-by: Thomas Petazzoni --- package/xr819-xradio/xr819-xradio.hash | 4 ++-- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index efff92ab7d..4a77db0d1a 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 5900821a777b9008d7cf9b8128e0cb75a4623ecb608b45438e17c7a056cde1bf xr819-xradio-6bf0e2e21c80456e2a3d4ad1267caecde7165871.tar.gz +sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz # Locally computed -sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE +sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index c1fe3295b6..5f60be887c 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 6bf0e2e21c80456e2a3d4ad1267caecde7165871 +XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sat Jan 22 12:16:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:16:25 +0100 Subject: [Buildroot] [PATCH] package/xr819-xradio: bump to latest version to fix Linux >= 5.13 building In-Reply-To: <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> References: <2ba595af-2fe2-bcfd-5c3f-f3b7b77cbef9@benettiengineering.com> <20220121103302.1488436-1-giulio.benetti@benettiengineering.com> Message-ID: <20220122131625.39303db2@windsurf> On Fri, 21 Jan 2022 11:33:02 +0100 Giulio Benetti wrote: > Pending PR is now merged[1] and it fixes Linux >= 5.13 building. So let's > bump xr819-xradio version. > > [1]: https://github.com/fifteenhex/xradio/pull/15 > > Signed-off-by: Giulio Benetti > --- > package/xr819-xradio/xr819-xradio.hash | 4 ++-- > package/xr819-xradio/xr819-xradio.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:17:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:17:16 +0100 Subject: [Buildroot] [git commit] configs/pcengines_apu2_defconfig: bump kernel to 5.16 Message-ID: <20220122121045.BF43B81970@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=944eb00fd16b471432ee7cb4106ab9a82a2e57a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This fixes the compile errors that were present with the previous kernel version (4.19): https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 Additionally, the defconfig file was refactored: Configuration values are now grouped logically, thus increasing readability and maintainability. Signed-off-by: Danilo Bargen Signed-off-by: Thomas Petazzoni --- configs/pcengines_apu2_defconfig | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index 68cebb8f6a..0792c93c19 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -1,16 +1,27 @@ +# Architecture BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_HOSTNAME="apu2" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_SYSTEM_DHCP="eth0" + +# Kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" + +# Default hostname and TTY +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Networking +BR2_SYSTEM_DHCP="eth0" + +# Rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" BR2_TARGET_ROOTFS_ISO9660_HYBRID=y # BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_SYSLINUX=y From thomas.petazzoni at bootlin.com Sat Jan 22 12:18:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:18:03 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/pcengines_apu2_defconfig: bump kernel to 5.16 In-Reply-To: <20220120000330.29552850@c3po> References: <20220116211557.71866ff6@c3po> <44c15385-c790-6867-fc1f-b24c922b7e40@benettiengineering.com> <20220120000330.29552850@c3po> Message-ID: <20220122131803.7de0d872@windsurf> On Thu, 20 Jan 2022 00:03:30 +0100 Danilo Bargen wrote: > This fixes the compile errors that were present with the previous > kernel version (4.19): > > https://gitlab.com/buildroot.org/buildroot/-/jobs/1970084022 > > Additionally, the defconfig file was refactored: Configuration > values are now grouped logically, thus increasing readability and > maintainability. > > Signed-off-by: Danilo Bargen Applied to master, with one change. See below. > +# Rootfs > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_ISO9660=y > BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" > BR2_TARGET_ROOTFS_ISO9660_HYBRID=y > -# BR2_TARGET_ROOTFS_TAR is not set Not clear why you dropped this line. So I re-added it. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:18:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:18:50 +0100 Subject: [Buildroot] [git commit] package/libunistring: bump version to 1.0 Message-ID: <20220122121237.03AD5825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ad77c42db2a5359770f3623e12807d65bdec386 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update indentation in hash file (two spaces) Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- package/libunistring/libunistring.hash | 6 +++--- package/libunistring/libunistring.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index 2e4595b17d..81ffd4fb0c 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz.sig -sha256 eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7 libunistring-0.9.10.tar.xz +sha256 5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741 libunistring-1.0.tar.xz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 1ed7ecf906..a69eacd676 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNISTRING_VERSION = 0.9.10 +LIBUNISTRING_VERSION = 1.0 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sat Jan 22 12:19:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:19:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libunistring: bump version to 1.0 In-Reply-To: <20220119223208.1196891-1-paguilar@paguilar.org> References: <20220119223208.1196891-1-paguilar@paguilar.org> Message-ID: <20220122131951.2846f704@windsurf> On Wed, 19 Jan 2022 23:32:08 +0100 Pedro Aguilar wrote: > - Update indentation in hash file (two spaces) I'm not sure what went wrong, but between "sha256" and the hash, you had a tab and not two spaces, so "check-package" was complaining. I fixed that when applying to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 12:20:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:20:07 +0100 Subject: [Buildroot] [git commit] package/libxml2: add optional icu support Message-ID: <20220122121339.712E582627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49d7c85421e87d9d762be9352805cb47a2f0bbeb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libxml2/libxml2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..023a461472 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -24,6 +24,13 @@ LIBXML2_DEPENDENCIES = host-pkgconf HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python +ifeq ($(BR2_PACKAGE_ICU),y) +LIBXML2_DEPENDENCIES += icu +LIBXML2_CONF_OPTS += --with-icu +else +LIBXML2_CONF_OPTS += --without-icu +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBXML2_DEPENDENCIES += zlib LIBXML2_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr From thomas.petazzoni at bootlin.com Sat Jan 22 12:20:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 13:20:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxml2: add optional icu support In-Reply-To: <20220119090301.3649833-1-james.hilliard1@gmail.com> References: <20220119090301.3649833-1-james.hilliard1@gmail.com> Message-ID: <20220122132025.7fc0b510@windsurf> On Wed, 19 Jan 2022 02:03:01 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/libxml2/libxml2.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From bobrofon at gmail.com Sat Jan 22 12:41:11 2022 From: bobrofon at gmail.com (Sergey Bobrenok) Date: Sat, 22 Jan 2022 15:41:11 +0300 Subject: [Buildroot] [PATCH 1/1] package/sdbus-cpp: bump to version 1.1.0 Message-ID: <20220122124111.103131-1-bobrofon@gmail.com> Signed-off-by: Sergey Bobrenok --- package/sdbus-cpp/sdbus-cpp.hash | 3 ++- package/sdbus-cpp/sdbus-cpp.mk | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index 8b87653dfd..3a0e863a86 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 0fd575ae0f463773dd9141242d1133731e2b780fd6526650ce992ba711d88628 v0.8.3.tar.gz +sha256 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 v1.1.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING +sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 24904ee26f..e0fbc5c856 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,12 +4,12 @@ # ################################################################################ -SDBUS_CPP_VERSION = 0.8.3 +SDBUS_CPP_VERSION = 1.1.0 SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd -SDBUS_CPP_LICENSE = LGPL-2.1+ -SDBUS_CPP_LICENSE_FILES = COPYING +SDBUS_CPP_LICENSE = LGPL-2.1+ with exception (headers) +SDBUS_CPP_LICENSE_FILES = COPYING COPYING-LGPL-Exception $(eval $(cmake-package)) -- 2.31.1 From thomas.petazzoni at bootlin.com Sat Jan 22 13:20:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:20:46 +0100 Subject: [Buildroot] [PATCH 1/1] packages/nodejs: install npm packages on host In-Reply-To: <20220119140703.12978-1-tom.marcuzzi@orolia.com> References: <20220119140703.12978-1-tom.marcuzzi@orolia.com> Message-ID: <20220122142046.14e8ff50@windsurf> Hello Tom, On Wed, 19 Jan 2022 15:07:03 +0100 Tom Marcuzzi wrote: > Signed-off-by: Tom Marcuzzi > --- > package/nodejs/Config.in.host | 32 ++++++++++++++++++++++++++++++++ > package/nodejs/nodejs.mk | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 63 insertions(+) Thanks for your patch. Since the change is non-trivial, it would be good to have some details in the commit log about the motivations for the change. I suppose your build process at some point requires NodeJS on the host ? > diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host > index 4ceaf0c73e..601eb6e052 100644 > --- a/package/nodejs/Config.in.host > +++ b/package/nodejs/Config.in.host > @@ -16,3 +16,35 @@ config BR2_PACKAGE_HOST_NODEJS > comment "host nodejs needs a host gcc >= 8" > depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS > depends on !BR2_HOST_GCC_AT_LEAST_8 > + > +if BR2_PACKAGE_HOST_NODEJS > + > + config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL > + string "Additional modules" Please don't indent options, so remove the leading tab on all those lines. > + help > + List of space-separated nodejs modules to install via npm. Perhaps clarify that they will be installed for the host NodeJS. > + See https://npmjs.org/ to find modules and 'npm help install' > + for available installation methods. For repeatable builds, > + download and save tgz files or clone git repos for the > + components you care about. > + > + Example: > + serialport uglify-js at 1.3.4 /my/module/mymodule.tgz \ > + git://github.com/someuser/somemodule.git#v1.2 > + > + This would install the serialport module (at the newest > + version), the uglify-js module at 1.3.4, a module from a > + filesystem path, and a module from a git repository. > + > + config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS > + string "Additional module dependencies" > + help > + List of space-separated buildroot recipes which must be > + built before your npms can be installed. For example, if in > + 'Additional modules' you specified 'node-curl' (see: > + https://github.com/jiangmiao/node-curl), you could then > + specify 'libcurl' here, to ensure that buildroot builds the > + libcurl package, and does so before building your node > + modules. The libcurl example here is bad, because this BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS option should only contain host packages, and never target packages. So the example should mention host-libcurl and not libcurl. Also, this new option BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS is not used anywhere. You forgot to change: HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib to: HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib \ $(call qstrip,(BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS)) Could you have a look at the above questions, so that we can resolve the open points, and converge towards a solution that we can merge ? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:21:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:21:06 +0100 Subject: [Buildroot] [git commit] package/rtl8812au-aircrack-ng: bump version to 3a6402e Message-ID: <20220122131427.9C10182675@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2915d5a9f1f95c99f28a2276e18acdeeb0ab23d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: 47a38b7 Fix kernel 5.15 compilation 6fd304f fix libc6_2.34 dependency on build 307d694 Merge pull request #898 from CGarces/fix_5.15 191f5bc Remove REMAKE_INITRD bd8e44b Add back 8814au support 849206d Merge pull request #913 from iyanmv/iyanmv-remove-remake-initrd 7bb5114 Fix kernel v5.15+ compiler warnings 1b63ee6 Fixed compiler warning for unused function a72835d Fix (test) for IPX header on various distros 3a6402e Fix for kernel v3.20 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index 5503b4f22e..ed1921d1c2 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c5d8286a00273343fc10d0e16afc52e788ac73b7df57c8159e58a40707f61da rtl8812au-aircrack-ng-b8167e66b4ac046b3b76c2c40008d84528e91594.tar.gz +sha256 acae758c3834196c71f4ee58f53a3c1b29ffd984f63ff2f40f2b080c8785c49f rtl8812au-aircrack-ng-3a6402e9e79802891f1531b435be54f4d8b71f0b.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index d42d953496..2bbca88cfb 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = b8167e66b4ac046b3b76c2c40008d84528e91594 +RTL8812AU_AIRCRACK_NG_VERSION = 3a6402e9e79802891f1531b435be54f4d8b71f0b RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sat Jan 22 13:21:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:21:14 +0100 Subject: [Buildroot] [PATCH v1] package/rtl8812au-aircrack-ng: bump version to 3a6402e In-Reply-To: <20220118162413.24664-1-ps.report@gmx.net> References: <20220118162413.24664-1-ps.report@gmx.net> Message-ID: <20220122142114.52195666@windsurf> On Tue, 18 Jan 2022 17:24:13 +0100 Peter Seiderer wrote: > Changelog: > > 47a38b7 Fix kernel 5.15 compilation > 6fd304f fix libc6_2.34 dependency on build > 307d694 Merge pull request #898 from CGarces/fix_5.15 > 191f5bc Remove REMAKE_INITRD > bd8e44b Add back 8814au support > 849206d Merge pull request #913 from iyanmv/iyanmv-remove-remake-initrd > 7bb5114 Fix kernel v5.15+ compiler warnings > 1b63ee6 Fixed compiler warning for unused function > a72835d Fix (test) for IPX header on various distros > 3a6402e Fix for kernel v3.20 > > Signed-off-by: Peter Seiderer > --- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- > package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:33:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:33:27 +0100 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <20220118111457.2491318-1-adeep@lexina.in> References: <20220118111457.2491318-1-adeep@lexina.in> Message-ID: <20220122143327.7d1a1cf7@windsurf> Hello Vyacheslav, [Arnout, Yann, Peter: question for you below.] On Tue, 18 Jan 2022 14:14:58 +0300 Vyacheslav Bocharov via buildroot wrote: > Firmware Image Package (FIP) sources to sign Amlogic SoC u-boot binaries > in LibreELEC, Armbian and meta-meson, buildroot. > > https://github.com/LibreELEC/amlogic-boot-fip > > Signed-off-by: Vyacheslav Bocharov Thanks for this contribution. I have a few small details below. But apart from the small details: there is one very significant issue. The LICENSE file says: // Redistribution and use in source and binary forms, with or without // modification is strictly prohibited without prior written permission // from Amlogic. So how can the contents of this repository be useful? OK, then can be used locally for your own experiments. But for building an actual device that you can ship/provide to others, using the contents of that repository, because Amlogic does not even allow you to distribute the contents of this repository. So I am wondering if it's really reasonable to package this in Buildroot. Arnout, Yann, Peter: what do you think about this? See the license file at https://github.com/LibreELEC/amlogic-boot-fip/blob/master/LICENSE for the full text. > diff --git a/package/amlogic-boot-fip/Config.in b/package/amlogic-boot-fip/Config.in > new file mode 100644 > index 0000000000..ceb09f8247 > --- /dev/null > +++ b/package/amlogic-boot-fip/Config.in > @@ -0,0 +1,17 @@ > +config BR2_PACKAGE_AMLOGIC_BOOT_FIP > + bool "amlogic-boot-fip" Indentation is wrong here: it should be just one tab, but you have one tab + one space. Make sure to run "make check-package" and fix the coding style issues. Also, you need: depends on BR2_TARGET_UBOOT because this package depends on U-Boot being enabled. > diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.hash b/package/amlogic-boot-fip/amlogic-boot-fip.hash > new file mode 100644 > index 0000000000..5d6dd237e3 > --- /dev/null > +++ b/package/amlogic-boot-fip/amlogic-boot-fip.hash > @@ -0,0 +1,2 @@ > +# Locally calculated > +sha256 cdf9d3872457c33a2755cc504f6b0560a62a6ee04437ac28e66623a345ed4936 amlogic-boot-fip-7ff0004e0e4d261ba81334a2f46302bd06704aca-br1.tar.gz Please add the hash of the license file. > diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.mk b/package/amlogic-boot-fip/amlogic-boot-fip.mk > new file mode 100644 > index 0000000000..6f646ae871 > --- /dev/null > +++ b/package/amlogic-boot-fip/amlogic-boot-fip.mk > @@ -0,0 +1,37 @@ > + > +################################################################################ > +# > +# amlogic-boot-fip > +# > +################################################################################ > + > +AMLOGIC_BOOT_FIP_VERSION = 7ff0004e0e4d261ba81334a2f46302bd06704aca > +AMLOGIC_BOOT_FIP_SITE = https://github.com/LibreELEC/amlogic-boot-fip > +AMLOGIC_BOOT_FIP_SITE_METHOD = git Please use the Github macro. Replace the _SITE variable by: AMLOGIC_BOOT_FIP_SITE = $(call github,LibreELEC,amlogic-boot-fip,$(AMLOGIC_BOOT_FIP_VERSION)) and drop the AMLOGIC_BOOT_FIP_SITE_METHOD variable. > +AMLOGIC_BOOT_FIP_INSTALL_IMAGES = YES > +AMLOGIC_BOOT_FIP_DEPENDENCIES = uboot > + > +AMLOGIC_BOOT_FIP_LICENSE = PROPRIETARY Please add AMLOGIC_BOOT_FIP_LICENSE_FILES as there is a license file in the repository (which contains the problematic clause) > +AMLOGIC_BOOT_FIP_REDISTRIBUTE = NO > + > +AMLOGIC_BOOT_BINS += u-boot.bin.sd.bin Just = instead of +=. But is this variable really needed? See below. > + > +define AMLOGIC_BOOT_FIP_BUILD_CMDS > + mkdir -p $(@D)/fip > + cp $(BINARIES_DIR)/u-boot.bin $(@D)/fip/bl33.bin > + cd "$(@D)"; ./build-fip.sh $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) $(@D)/fip/bl33.bin $(@D)/fip Please use tabs for indentation. Is copying $(BINARIES_DIR)/u-boot.bin to $(@D)/fip/bl33.bin if it gets passed as argument to build-fip.sh ? Would something like: cd $(@D) && \ ./build-fip.sh \ $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) \ $(BINARIES_DIR)/u-boot.bin \ $(@D)/fip work ? > +endef > + > +ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP),y) Use: ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP)$(BR_BUILDING),yy) so that this check is only done when building. > +ifeq ($(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)),) > +$(error No board u-boot firmware config name specified, check your BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD setting) > +endif # qstrip BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD > +endif > + > +define AMLOGIC_BOOT_FIP_INSTALL_IMAGES_CMDS > + $(foreach f,$(AMLOGIC_BOOT_BINS), \ > + cp -dpf "$(@D)/fip/$(f)" "$(BINARIES_DIR)/" > + ) Why have a loop with a $(AMLOGIC_BOOT_BINS) if there's only one file to copy? Just: $(INSTALL) -D -m 0644 $(@D)/fip/u-boot.bin.sd.bin $(BINARIES_DIR)/u-boot.bin.sd.bin I would have fixed myself all those small details, but the licensing/redistribution restriction seems to be a major issue to me. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:35:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:35:37 +0100 Subject: [Buildroot] [git commit] package/libjpeg: security bump to version 9e Message-ID: <20220122132930.8739B825C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5e36f80a6629ef5701d4751d7fc6f7dd6a98476 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master rdgif.c, cderror.h: add sanity check for GIF image dimensions. Thank to Casper Sun for cjpeg potential vulnerability report. - Update hash of README (changes not related to license) - Update indentation in hash file (two spaces) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 4f0a677d04..1a2e82caef 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz -sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README +sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 6b55aba7e5..caf7f05f44 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,12 +4,8 @@ # ################################################################################ -LIBJPEG_VERSION = 9d -# 9d was released 2020-01-12, but the tarball was replaced upstream circa -# 2021-03, causing hash mismatch. Until there is a new version released, -# use our cached copy from s.b.o. -#LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SITE = http://sources.buildroot.org/libjpeg +LIBJPEG_VERSION = 9e +LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README From thomas.petazzoni at bootlin.com Sat Jan 22 13:36:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:36:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjpeg: security bump to version 9e In-Reply-To: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> References: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> Message-ID: <20220122143630.5ffd3018@windsurf> On Mon, 17 Jan 2022 23:30:26 +0100 Fabrice Fontaine wrote: > rdgif.c, cderror.h: add sanity check for GIF image dimensions. > Thank to Casper Sun for cjpeg potential vulnerability report. > > - Update hash of README (changes not related to license) > - Update indentation in hash file (two spaces) > > https://jpegclub.org/reference/reference-sources/ > > Signed-off-by: Fabrice Fontaine > --- > package/libjpeg/libjpeg.hash | 4 ++-- > package/libjpeg/libjpeg.mk | 8 ++------ > 2 files changed, 4 insertions(+), 8 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:38:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:38:51 +0100 Subject: [Buildroot] [git commit] package/libxcrypt: bump to version 4.4.27 Message-ID: <20220122133233.3BF6082914@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61ef0ff827754d07cd006f3107d4772ba1d2d1fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The hash of the LICENSING file is modified due to changes in file paths listed in that file. No impact on the licensing terms. Signed-off-by: Guillaume W. Bres Signed-off-by: Thomas Petazzoni --- package/libxcrypt/libxcrypt.hash | 4 ++-- package/libxcrypt/libxcrypt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index b47f470020..99ddf62be0 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e8a544dd19171c1e6191a6044c96cc31496d781ba08b5a00f53310d001d58114 libxcrypt-4.4.26.tar.gz -sha256 cead8b3d94a143f64ccb571ada1cea47a70a0b847c8d95306e8d78ed68951f3d LICENSING +sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz +sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 3c98b30dd5..65efa2bab9 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.26 +LIBXCRYPT_VERSION = 4.4.27 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB From thomas.petazzoni at bootlin.com Sat Jan 22 13:43:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:43:15 +0100 Subject: [Buildroot] [PATCH] package/libxcrypt: bump to version 4.4.27 In-Reply-To: <20220117124605.17592-1-guillaume.bressaix@gmail.com> References: <20220117124605.17592-1-guillaume.bressaix@gmail.com> Message-ID: <20220122144315.030cc013@windsurf> Hello Guillaume, On Mon, 17 Jan 2022 13:46:05 +0100 "Guillaume W. Bres" wrote: > Signed-off-by: Guillaume W. Bres > --- > package/libxcrypt/libxcrypt.hash | 2 +- > package/libxcrypt/libxcrypt.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) I have applied to master, but you had forgotten to test "make legal-info" after this update, and the hash of the license files had changed. I fixed that up, and explained in the commit log why the hash changed. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:52:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:52:21 +0100 Subject: [Buildroot] [git commit] package/vte: install to staging Message-ID: <20220122134552.433EF8291D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2ecc4379d1b310184c721dd4c9be0a12269f6234 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master vte also provides libvte, a library that can be linked to by other programs, so install it in staging. Signed-off-by: Rainer Jonsson Signed-off-by: Thomas Petazzoni --- package/vte/vte.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/vte/vte.mk b/package/vte/vte.mk index 07e813685e..ceb2f09d67 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -11,6 +11,7 @@ VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) VTE_LICENSE = LGPL-3.0+ VTE_LICENSE_FILES = COPYING.LGPL3 +VTE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_ICU),y) VTE_CONF_OPTS += -Dicu=true From thomas.petazzoni at bootlin.com Sat Jan 22 13:53:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:53:23 +0100 Subject: [Buildroot] package/vte: install to staging In-Reply-To: <20220117114419.B8EAB3F465@exit1-us.msgsafe.io> References: <20220117114419.B8EAB3F465@exit1-us.msgsafe.io> Message-ID: <20220122145323.583b4b6c@windsurf> Hello, On Mon, 17 Jan 2022 11:44:19 +0000 (UTC) rainbox2k12 via buildroot wrote: > Can you accept my patch as an attached text document? I have applied your patch. I suppose this msgsafe.io service doesn't provide SMTP, so you can't use git send-email? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 13:54:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:54:13 +0100 Subject: [Buildroot] [git commit] package/prosody: security bump to 0.11.12 Message-ID: <20220122134746.DE22E8291D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d99bd8f7e0e3694828820a5ac1e0a09425d571d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://blog.prosody.im/prosody-0.11.12-released/ Signed-off-by: Francois Perrad [Thomas: update separator for license file hash.] Signed-off-by: Thomas Petazzoni --- package/prosody/prosody.hash | 10 +++++----- package/prosody/prosody.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index ee459f85d8..b6fa6532a5 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz -sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz -sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz -sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz +md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz +sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz +sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz +sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz # Hash for license file: -sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING +sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7acfa4708d..d697c85568 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.11 +PROSODY_VERSION = 0.11.12 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Sat Jan 22 13:54:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 14:54:36 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.12 In-Reply-To: <20220117113656.234077-1-francois.perrad@gadz.org> References: <20220117113656.234077-1-francois.perrad@gadz.org> Message-ID: <20220122145436.080cda5b@windsurf> On Mon, 17 Jan 2022 12:36:56 +0100 Francois Perrad wrote: > see https://blog.prosody.im/prosody-0.11.12-released/ > > Signed-off-by: Francois Perrad > --- > package/prosody/prosody.hash | 8 ++++---- > package/prosody/prosody.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:01:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:01:57 +0100 Subject: [Buildroot] [git commit] configs/mx6sx_udoo_neo: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220122135529.7231182745@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8bf60c50c91e23db2944d32d9a2e9db921cfcc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/mx6sx_udoo_neo_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 3e1dc33bd4..793d992ce7 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -13,6 +13,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" From thomas.petazzoni at bootlin.com Sat Jan 22 14:02:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:02:19 +0100 Subject: [Buildroot] [PATCH] configs/mx6sx_udoo_neo: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20220117020553.749592-1-festevam@gmail.com> References: <20220117020553.749592-1-festevam@gmail.com> Message-ID: <20220122150219.49061424@windsurf> On Sun, 16 Jan 2022 23:05:53 -0300 Fabio Estevam wrote: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1970083907 > > Signed-off-by: Fabio Estevam > --- > configs/mx6sx_udoo_neo_defconfig | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:08:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:08:18 +0100 Subject: [Buildroot] [git commit] configs/kontron_pitx_imx8m: bump kernel to 5.16.1 Message-ID: <20220122140143.E319782929@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96a1344aaed5a36c25b507e5b21f247438a22c67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- configs/kontron_pitx_imx8m_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 2a4aa1a0ab..8f756f5246 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pitx-imx8mq.dtb" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" @@ -18,7 +18,7 @@ BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y From thomas.petazzoni at bootlin.com Sat Jan 22 14:07:23 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:07:23 +0100 Subject: [Buildroot] [git commit] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script Message-ID: <20220122140143.DAA0482926@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed380f62e0260cdf91e60bfb3706f17a96fddabf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- board/kontron/pitx-imx8m/boot.cmd | 8 -------- board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- board/kontron/pitx-imx8m/post-image.sh | 2 +- configs/kontron_pitx_imx8m_defconfig | 3 +-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/board/kontron/pitx-imx8m/boot.cmd b/board/kontron/pitx-imx8m/boot.cmd deleted file mode 100644 index 4d89235392..0000000000 --- a/board/kontron/pitx-imx8m/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -echo "Root File Sytem on MMC${devnum}" -setenv rootfs /dev/mmcblk${devnum}p1 -setenv bootargs root=${rootfs} rootwait rw ${extrabootargs} - -load ${devtype} ${devnum} ${kernel_addr_r} boot/Image -load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mq-kontron-pitx-imx8m.dtb - -booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/kontron/pitx-imx8m/extlinux.conf b/board/kontron/pitx-imx8m/extlinux.conf new file mode 100644 index 0000000000..2911acec59 --- /dev/null +++ b/board/kontron/pitx-imx8m/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mq-kontron-pitx-imx8m.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg index c78ef0f910..4a0aa117fb 100644 --- a/board/kontron/pitx-imx8m/genimage.cfg +++ b/board/kontron/pitx-imx8m/genimage.cfg @@ -1,5 +1,6 @@ image sdcard.img { hdimage { + partition-table-type = "gpt" } partition imx-boot { @@ -9,8 +10,8 @@ image sdcard.img { } partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% } } diff --git a/board/kontron/pitx-imx8m/post-build.sh b/board/kontron/pitx-imx8m/post-build.sh index 4574221fe5..bf8861f6a9 100755 --- a/board/kontron/pitx-imx8m/post-build.sh +++ b/board/kontron/pitx-imx8m/post-build.sh @@ -1,4 +1,7 @@ #!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" -mkdir -p $TARGET_DIR/boot/ -cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/pitx-imx8m/post-image.sh b/board/kontron/pitx-imx8m/post-image.sh index 564211c829..3452fd4501 100755 --- a/board/kontron/pitx-imx8m/post-image.sh +++ b/board/kontron/pitx-imx8m/post-image.sh @@ -1,3 +1,3 @@ #!/bin/sh -support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 0e3868b583..2a4aa1a0ab 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -49,5 +50,3 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/kontron/pitx-imx8m/boot.cmd" From thomas.petazzoni at bootlin.com Sat Jan 22 14:11:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:11:30 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: <20220117080616.10563-1-heiko.thiery@gmail.com> References: <20220117080616.10563-1-heiko.thiery@gmail.com> Message-ID: <20220122151130.59ae7148@windsurf> On Mon, 17 Jan 2022 09:06:16 +0100 Heiko Thiery wrote: > Signed-off-by: Heiko Thiery > --- > board/kontron/pitx-imx8m/boot.cmd | 8 -------- > board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ > board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- > board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- > board/kontron/pitx-imx8m/post-image.sh | 2 +- > configs/kontron_pitx_imx8m_defconfig | 3 +-- > 6 files changed, 14 insertions(+), 15 deletions(-) > delete mode 100644 board/kontron/pitx-imx8m/boot.cmd > create mode 100644 board/kontron/pitx-imx8m/extlinux.conf I have applied, but I am a bit worried about things are going on with this switch to extlinux.conf. Indeed, we have: * Platforms where the UUID is hardcoded into genimage.cfg and extlinux.conf, such as board/beaglev/ * We have platforms where a "uuid" variable in filled in U-Boot before triggering the extlinux.conf logic, and therefore extlinux.conf uses root=PARTUUID=${uuid}. For example board/freescale/imx7dsdb/rootfs_overlay/boot/extlinux/extlinux.conf, board/orangepi/orangepi-zero/boot.cmd, board/solidrun/mx6cubox/rootfs_overlay/boot/extlinux/extlinux.conf, board/technexion/imx6ulpico/rootfs_overlay/boot/extlinux/extlinux.conf, and a few others. * We now have platforms (kontron/smarc-sal28 and kontron/pitx-imx8m) where a random UUID is generated in the post-build script, and used in genimage and extlinux.conf. I'm not sure where we want to go, and how much we want to enforce "best practices" that are common on all platforms, or just let each platform do its little business. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:11:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:11:33 +0100 Subject: [Buildroot] [PATCH 2/2] configs/kontron_pitx_imx8m_defconfig: bump kernel to 5.16.1 In-Reply-To: <20220117080616.10563-2-heiko.thiery@gmail.com> References: <20220117080616.10563-1-heiko.thiery@gmail.com> <20220117080616.10563-2-heiko.thiery@gmail.com> Message-ID: <20220122151133.1e3200cf@windsurf> On Mon, 17 Jan 2022 09:06:17 +0100 Heiko Thiery wrote: > Signed-off-by: Heiko Thiery > --- > configs/kontron_pitx_imx8m_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:32:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:32:43 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex In-Reply-To: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> Message-ID: <20220122153243.009b24ba@windsurf> Hello, On Tue, 18 Jan 2022 11:43:10 +0100 Giulio Benetti wrote: > this patchset aims to enable the best FPU strategy for every board with > 32-bits Arm Cortex actually present in Buildroot. I don't own these boards > so I can't test these changes. What is about Allwinner doesn't worry me > because I've tested a lot of cases with Olimex boards, but the other > changes are still to be tested. > > So I ask to the board maintainers to test the patches that involve their > boards if possible. Anyway I've checked well all the SoCs Datasheet and I > think I've made it correctly, even if in some of them it's not specified > if VFPv4 means -D32. I assume it like that because otherwise -D16 is > usually specified. Do we have a good understand of what -mfpu=neon-vfpv4 does? Your patch series basically converts many defconfigs to use this -mfpu value, but it's not clear to me how it works. What does it mean to combine NEON and VFPv4 instructions? Regarding VFPv4 D16 vs. D32, https://developer.arm.com/documentation/den0018/a/Compiling-NEON-Instructions/GCC-command-line-options/Option-to-specify-the-FPU tells us: VFPv3 and VFPv4 implementations provide 32 double-precision registers. However, when NEON unit is not present, the top sixteen registers (D16-D31) become optional. This is shown by the -d16 in the option name, which means that the top sixteen D registers are not available. So, my understanding is that when NEON is available, the VFPv4 is guaranteed to have the 32 double-precision registers (D32). Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:33:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:33:13 +0100 Subject: [Buildroot] [git commit] Revert "package/libmicrohttpd: fix pthread detection" Message-ID: <20220122142637.E41FF81351@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=937a70001f4d8ebd39050af64deff759f8de4385 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 834464792e691a243d456335083b2a8b3363e261, the build failure is not related to the bump to 0.9.75 but to or1k and gcc 10. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmicrohttpd/libmicrohttpd.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 344e1443fd..f75178bc0a 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -12,10 +12,6 @@ LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBMICROHTTPD_CFLAGS += -D_REENTRANT -endif - LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) From thomas.petazzoni at bootlin.com Sat Jan 22 14:33:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:33:07 +0100 Subject: [Buildroot] [git commit] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed Message-ID: <20220122142637.DBF84818AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98e39dc80ee81a166df90b4ff3232038a63b759c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.): configure:13774: checking whether pthreads work with -pthread configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 conftest.c:27:26: error: #error "_REENTRANT must be defined" 27 | # error "_REENTRANT must be defined" | ^~~~~ It should be noted that external bootlins will have to be rebuilt. Fixes: - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + diff --git a/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + From thomas.petazzoni at bootlin.com Sat Jan 22 14:36:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:36:30 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220118222425.164134-1-fontaine.fabrice@gmail.com> References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Message-ID: <20220122153630.68f6ccc3@windsurf> Hello, On Tue, 18 Jan 2022 23:24:24 +0100 Fabrice Fontaine wrote: > Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc > 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build > failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, > etc.): > > configure:13774: checking whether pthreads work with -pthread > configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 > conftest.c:27:26: error: #error "_REENTRANT must be defined" > 27 | # error "_REENTRANT must be defined" > | ^~~~~ > > It should be noted that external bootlins will have to be rebuilt. > > Fixes: > - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 > - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 > - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 > > Signed-off-by: Fabrice Fontaine > --- > ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++ > ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 +++++++++++++++++++ > 2 files changed, 62 insertions(+) > create mode 100644 package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch > create mode 100644 package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Both patches applied. The Bootlin toolchains are being rebuilt. I'll send an update when the toolchains are ready. Best regards, Thomas Petazzoni -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sat Jan 22 14:39:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:39:32 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to version 2.4.3 Message-ID: <20220122143253.0CF1C828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=829bf508bba7df9aee3f86bcd70394ee487b19a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 https://blog.hartwork.org/posts/expat-2-4-3-released https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 8cf563d8f5..0853c3c76d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ -md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz -sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ +md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz +sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz # Locally calculated -sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb1cfd8c8a..a7ace66095 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.1 +EXPAT_VERSION = 2.4.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sat Jan 22 14:39:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 15:39:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.4.3 In-Reply-To: <20220116210816.3210061-1-fontaine.fabrice@gmail.com> References: <20220116210816.3210061-1-fontaine.fabrice@gmail.com> Message-ID: <20220122153951.48f3e00b@windsurf> On Sun, 16 Jan 2022 22:08:16 +0100 Fabrice Fontaine wrote: > Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 > > https://blog.hartwork.org/posts/expat-2-4-3-released > https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes > > Signed-off-by: Fabrice Fontaine > --- > package/expat/expat.hash | 8 ++++---- > package/expat/expat.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From adeep at lexina.in Sat Jan 22 15:05:06 2022 From: adeep at lexina.in (Vyacheslav) Date: Sat, 22 Jan 2022 18:05:06 +0300 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <20220122143327.7d1a1cf7@windsurf> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> Message-ID: <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> Hi. 22.01.2022 16:33, Thomas Petazzoni wrote: > Hello Vyacheslav, > > [Arnout, Yann, Peter: question for you below.] > > On Tue, 18 Jan 2022 14:14:58 +0300 > Vyacheslav Bocharov via buildroot wrote: > >> Firmware Image Package (FIP) sources to sign Amlogic SoC u-boot binaries >> in LibreELEC, Armbian and meta-meson, buildroot. >> >> https://github.com/LibreELEC/amlogic-boot-fip >> >> Signed-off-by: Vyacheslav Bocharov > > Thanks for this contribution. I have a few small details below. But > apart from the small details: there is one very significant issue. The > LICENSE file says: > > // Redistribution and use in source and binary forms, with or without > // modification is strictly prohibited without prior written permission > // from Amlogic. > > So how can the contents of this repository be useful? OK, then can be > used locally for your own experiments. But for building an actual > device that you can ship/provide to others, using the contents of that > repository, because Amlogic does not even allow you to distribute the > contents of this repository. > > So I am wondering if it's really reasonable to package this in > Buildroot. > You already have package/odroidc2-firmware with same license. amlogic-boot-fip just put all similar binaries together and Neil Armstrong made a build system for aml uboot binaries. > Arnout, Yann, Peter: what do you think about this? See the license file > at https://github.com/LibreELEC/amlogic-boot-fip/blob/master/LICENSE > for the full text. > > >> diff --git a/package/amlogic-boot-fip/Config.in b/package/amlogic-boot-fip/Config.in >> new file mode 100644 >> index 0000000000..ceb09f8247 >> --- /dev/null >> +++ b/package/amlogic-boot-fip/Config.in >> @@ -0,0 +1,17 @@ >> +config BR2_PACKAGE_AMLOGIC_BOOT_FIP >> + bool "amlogic-boot-fip" > > Indentation is wrong here: it should be just one tab, but you have one > tab + one space. Make sure to run "make check-package" and fix the > coding style issues. Thanks, i missed this. > > Also, you need: > > depends on BR2_TARGET_UBOOT > > because this package depends on U-Boot being enabled. > >> diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.hash b/package/amlogic-boot-fip/amlogic-boot-fip.hash >> new file mode 100644 >> index 0000000000..5d6dd237e3 >> --- /dev/null >> +++ b/package/amlogic-boot-fip/amlogic-boot-fip.hash >> @@ -0,0 +1,2 @@ >> +# Locally calculated >> +sha256 cdf9d3872457c33a2755cc504f6b0560a62a6ee04437ac28e66623a345ed4936 amlogic-boot-fip-7ff0004e0e4d261ba81334a2f46302bd06704aca-br1.tar.gz > > Please add the hash of the license file. > >> diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.mk b/package/amlogic-boot-fip/amlogic-boot-fip.mk >> new file mode 100644 >> index 0000000000..6f646ae871 >> --- /dev/null >> +++ b/package/amlogic-boot-fip/amlogic-boot-fip.mk >> @@ -0,0 +1,37 @@ >> + >> +################################################################################ >> +# >> +# amlogic-boot-fip >> +# >> +################################################################################ >> + >> +AMLOGIC_BOOT_FIP_VERSION = 7ff0004e0e4d261ba81334a2f46302bd06704aca >> +AMLOGIC_BOOT_FIP_SITE = https://github.com/LibreELEC/amlogic-boot-fip >> +AMLOGIC_BOOT_FIP_SITE_METHOD = git > > Please use the Github macro. Replace the _SITE variable by: > > AMLOGIC_BOOT_FIP_SITE = $(call github,LibreELEC,amlogic-boot-fip,$(AMLOGIC_BOOT_FIP_VERSION)) > > and drop the AMLOGIC_BOOT_FIP_SITE_METHOD variable. > >> +AMLOGIC_BOOT_FIP_INSTALL_IMAGES = YES >> +AMLOGIC_BOOT_FIP_DEPENDENCIES = uboot >> + >> +AMLOGIC_BOOT_FIP_LICENSE = PROPRIETARY > > Please add AMLOGIC_BOOT_FIP_LICENSE_FILES as there is a license file in > the repository (which contains the problematic clause) > >> +AMLOGIC_BOOT_FIP_REDISTRIBUTE = NO >> + >> +AMLOGIC_BOOT_BINS += u-boot.bin.sd.bin > > Just = instead of +=. But is this variable really needed? See below. > >> + >> +define AMLOGIC_BOOT_FIP_BUILD_CMDS >> + mkdir -p $(@D)/fip >> + cp $(BINARIES_DIR)/u-boot.bin $(@D)/fip/bl33.bin >> + cd "$(@D)"; ./build-fip.sh $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) $(@D)/fip/bl33.bin $(@D)/fip > > Please use tabs for indentation. Is copying $(BINARIES_DIR)/u-boot.bin > to $(@D)/fip/bl33.bin if it gets passed as argument to build-fip.sh ? > > Would something like: > > cd $(@D) && \ > ./build-fip.sh \ > $(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)) \ > $(BINARIES_DIR)/u-boot.bin \ > $(@D)/fip > > work ? Seems to yes. It really can be improved. Thanks. > >> +endef >> + >> +ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP),y) > > Use: > > ifeq ($(BR2_PACKAGE_AMLOGIC_BOOT_FIP)$(BR_BUILDING),yy) > > so that this check is only done when building. > >> +ifeq ($(call qstrip,$(BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD)),) >> +$(error No board u-boot firmware config name specified, check your BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD setting) >> +endif # qstrip BR2_PACKAGE_AMLOGIC_BOOT_FIP_BOARD >> +endif >> + >> +define AMLOGIC_BOOT_FIP_INSTALL_IMAGES_CMDS >> + $(foreach f,$(AMLOGIC_BOOT_BINS), \ >> + cp -dpf "$(@D)/fip/$(f)" "$(BINARIES_DIR)/" >> + ) > > Why have a loop with a $(AMLOGIC_BOOT_BINS) if there's only one file to > copy? In some cases you may need more than one file. But you're right it's better this way. > > Just: > > $(INSTALL) -D -m 0644 $(@D)/fip/u-boot.bin.sd.bin $(BINARIES_DIR)/u-boot.bin.sd.bin > > I would have fixed myself all those small details, but the > licensing/redistribution restriction seems to be a major issue to me. Thank you for sorting out the bugs. I'll fix them in the next version of the patch, if we come to a consensus on the possibility of using the license. > > Best regards, > > Thomas -- Vyacheslav Bocharov From thomas.petazzoni at bootlin.com Sat Jan 22 15:09:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 22 Jan 2022 16:09:14 +0100 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> Message-ID: <20220122160914.7e4cc513@windsurf> Hello, On Sat, 22 Jan 2022 18:05:06 +0300 Vyacheslav wrote: > > So how can the contents of this repository be useful? OK, then can be > > used locally for your own experiments. But for building an actual > > device that you can ship/provide to others, using the contents of that > > repository, because Amlogic does not even allow you to distribute the > > contents of this repository. > > > > So I am wondering if it's really reasonable to package this in > > Buildroot. > > > You already have package/odroidc2-firmware with same license. > amlogic-boot-fip just put all similar binaries together and Neil > Armstrong made a build system for aml uboot binaries. Well, I wasn't aware package/odroidc2-firmware was under the same restrictive license. Are the license terms for package/odroidc2-firmware available somewhere? This package is downloaded from https://github.com/hardkernel/u-boot, but I don't see the license terms from Amlogic preventing redistribution. Of course, I understand that they simply may be missing (which would be really bad!). But how can anyone use those blobs? You can't redistribute them. According to their license, just putting them on Github is not even allowed. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From heiko.thiery at gmail.com Sat Jan 22 15:31:38 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sat, 22 Jan 2022 16:31:38 +0100 Subject: [Buildroot] [PATCH] configs/kontron_pitx_imx8m_defconfig: remove BR2_ARM_FPU_VFPV3 In-Reply-To: <20220122131500.10cafe0a@windsurf> References: <20220120135251.4225-1-heiko.thiery@gmail.com> <20220122131500.10cafe0a@windsurf> Message-ID: Hi Thomas, Am Sa., 22. Jan. 2022 um 13:15 Uhr schrieb Thomas Petazzoni : > > On Thu, 20 Jan 2022 14:52:52 +0100 > Heiko Thiery wrote: > > > The FP setting is not used for aarch64 in buildroot. The FPU options are > > set implicit. > > > > Signed-off-by: Heiko Thiery > > --- > > configs/kontron_pitx_imx8m_defconfig | 1 - > > 1 file changed, 1 deletion(-) > > Applied to master, thanks. That being said the FPU handling on AArch64 > is not very clear to me. I'm not sure we're handling it correctly in > Buildroot today. I must admit that I have not fully understood the topic FPU either. What I am sure of is that the kconfig selection of the "Floating point stategy" option for aarch64 has no effect, since this setting is made implicitly depending on the target architecture used. Therefore, a patch could look something like this to fix this: diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 4c0910e4f8..05acaa9157 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -618,6 +618,7 @@ endchoice choice prompt "Floating point strategy" + depends on BR2_arm || BR2_armeb default BR2_ARM_FPU_FP_ARMV8 if BR2_ARM_CPU_HAS_FP_ARMV8 default BR2_ARM_FPU_FPV5D16 if BR2_ARM_CPU_HAS_FPV5 default BR2_ARM_FPU_FPV4D16 if BR2_ARM_CPU_HAS_FPV4 -- Heiko From bernd.kuhls at t-online.de Sat Jan 22 15:32:07 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 22 Jan 2022 16:32:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-mediadriver: bump version to 22.1.1 Message-ID: <20220122153207.1376790-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 38121da036..ceafa20e80 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c1cd5c4c1b7bd1c7785ed4d553b76b17dd7e673619a39e0c3070246aa671024 intel-media-22.1.0.tar.gz +sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.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 99348537bf..d8820379e7 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 = 22.1.0 +INTEL_MEDIADRIVER_VERSION = 22.1.1 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 22 15:34:41 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 22 Jan 2022 16:34:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.4 Message-ID: <20220122153441.1377553-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1cdfff50c9..09640a903c 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.3 +MESA3D_HEADERS_VERSION = 21.3.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 235a1b55bb..0f373e29a6 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-December/000658.html -sha256 ad7f4613ea7c5d08d9fcb5025270199e6ceb9aa99fd72ee572b70342240a8121 mesa-21.3.3.tar.xz -sha512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673 mesa-21.3.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html +sha256 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d mesa-21.3.4.tar.xz +sha512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9 mesa-21.3.4.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index c4e213088e..0d80813d01 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.3 +MESA3D_VERSION = 21.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.30.2 From bernd.kuhls at t-online.de Sat Jan 22 15:36:29 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 22 Jan 2022 16:36:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-vdr-vnsi: bump version to 19.0.3-Matrix Message-ID: <20220122153629.1378404-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 4cd1f7ad6b..e3dc5585d2 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz +sha256 317442cdfd333f47dfe95d05057a682340dd5ba53efc8894e892ee565b8aaece kodi-pvr-vdr-vnsi-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 65e69d2b23..f0d61d9d2e 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.3-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md -- 2.30.2 From peter at korsgaard.com Sat Jan 22 15:37:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 16:37:13 +0100 Subject: [Buildroot] [PATCH 3/3] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 In-Reply-To: <20220122153714.26991-1-peter@korsgaard.com> References: <20220122153714.26991-1-peter@korsgaard.com> Message-ID: <20220122153714.26991-3-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- configs/qemu_aarch64_virt_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 0caf38112d..9fbf293311 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -- 2.20.1 From peter at korsgaard.com Sat Jan 22 15:37:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 16:37:12 +0100 Subject: [Buildroot] [PATCH 2/3] configs/qemu_aarch64_virt_defconfig: linux.config: enable fb/input support In-Reply-To: <20220122153714.26991-1-peter@korsgaard.com> References: <20220122153714.26991-1-peter@korsgaard.com> Message-ID: <20220122153714.26991-2-peter@korsgaard.com> The Linux config already enabled drm-virtio for graphics output, but not the corresponding virtio-input / evdev drivers for input or the compatibility fb option. Enable them so keyboard/mouse input works and /dev/fb0 is provided. Signed-off-by: Peter Korsgaard --- board/qemu/aarch64-virt/linux.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/qemu/aarch64-virt/linux.config b/board/qemu/aarch64-virt/linux.config index e3a4a92913..f9763b73b7 100644 --- a/board/qemu/aarch64-virt/linux.config +++ b/board/qemu/aarch64-virt/linux.config @@ -47,6 +47,7 @@ CONFIG_DUMMY=y CONFIG_MACVLAN=y CONFIG_VIRTIO_NET=y CONFIG_NLMON=y +CONFIG_INPUT_EVDEV=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y @@ -56,9 +57,11 @@ CONFIG_TCG_TPM=y CONFIG_TCG_TIS=y CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL031=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_MAILBOX=y -- 2.20.1 From peter at korsgaard.com Sat Jan 22 15:37:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 16:37:11 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu_aarch64_virt_defconfig: don't hard code getty port Message-ID: <20220122153714.26991-1-peter@korsgaard.com> The Linux defconfig both has VT and serial port support, so it makes more sense to run getty on /dev/console instead of hard coding the serial port. Signed-off-by: Peter Korsgaard --- configs/qemu_aarch64_virt_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index e6b72d8838..0caf38112d 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -4,7 +4,6 @@ BR2_cortex_a53=y # System BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -- 2.20.1 From heiko.thiery at gmail.com Sat Jan 22 15:59:52 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Sat, 22 Jan 2022 16:59:52 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: <20220122151130.59ae7148@windsurf> References: <20220117080616.10563-1-heiko.thiery@gmail.com> <20220122151130.59ae7148@windsurf> Message-ID: Hi Thomas, Am Sa., 22. Jan. 2022 um 15:11 Uhr schrieb Thomas Petazzoni : > > On Mon, 17 Jan 2022 09:06:16 +0100 > Heiko Thiery wrote: > > > Signed-off-by: Heiko Thiery > > --- > > board/kontron/pitx-imx8m/boot.cmd | 8 -------- > > board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ > > board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- > > board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- > > board/kontron/pitx-imx8m/post-image.sh | 2 +- > > configs/kontron_pitx_imx8m_defconfig | 3 +-- > > 6 files changed, 14 insertions(+), 15 deletions(-) > > delete mode 100644 board/kontron/pitx-imx8m/boot.cmd > > create mode 100644 board/kontron/pitx-imx8m/extlinux.conf > > I have applied, but I am a bit worried about things are going on with > this switch to extlinux.conf. I was not aware of the different approaches. > Indeed, we have: > > * Platforms where the UUID is hardcoded into genimage.cfg and > extlinux.conf, such as board/beaglev/ > > * We have platforms where a "uuid" variable in filled in U-Boot before > triggering the extlinux.conf logic, and therefore extlinux.conf uses > root=PARTUUID=${uuid}. For example > board/freescale/imx7dsdb/rootfs_overlay/boot/extlinux/extlinux.conf, > board/orangepi/orangepi-zero/boot.cmd, > board/solidrun/mx6cubox/rootfs_overlay/boot/extlinux/extlinux.conf, > board/technexion/imx6ulpico/rootfs_overlay/boot/extlinux/extlinux.conf, > and a few others. For the technexion board there is some logic in u-boot to setp and discover the uuid of the root partition. https://source.denx.de/u-boot/u-boot/-/blob/master/include/configs/pico-imx6ul.h#L90 > * We now have platforms (kontron/smarc-sal28 and kontron/pitx-imx8m) > where a random UUID is generated in the post-build script, and used > in genimage and extlinux.conf. With this approach it is independent if the image is installed on the SD card or the eMMC or what else. But here one pitfall is when the image is installed on more devices. > I'm not sure where we want to go, and how much we want to enforce "best > practices" that are common on all platforms, or just let each platform > do its little business. From adeep at lexina.in Sat Jan 22 16:09:28 2022 From: adeep at lexina.in (Vyacheslav) Date: Sat, 22 Jan 2022 19:09:28 +0300 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <20220122160914.7e4cc513@windsurf> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> <20220122160914.7e4cc513@windsurf> Message-ID: <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> Hi, Neil! Can you help us with understanding license for Amlogic binaries in https://github.com/LibreELEC/amlogic-boot-fip? 22.01.2022 18:09, Thomas Petazzoni wrote: > Hello, > > On Sat, 22 Jan 2022 18:05:06 +0300 > Vyacheslav wrote: > >>> So how can the contents of this repository be useful? OK, then can be >>> used locally for your own experiments. But for building an actual >>> device that you can ship/provide to others, using the contents of that >>> repository, because Amlogic does not even allow you to distribute the >>> contents of this repository. >>> >>> So I am wondering if it's really reasonable to package this in >>> Buildroot. >>> >> You already have package/odroidc2-firmware with same license. >> amlogic-boot-fip just put all similar binaries together and Neil >> Armstrong made a build system for aml uboot binaries. > > Well, I wasn't aware package/odroidc2-firmware was under the same > restrictive license. Are the license terms for > package/odroidc2-firmware available somewhere? This package is > downloaded from https://github.com/hardkernel/u-boot, but I don't see > the license terms from Amlogic preventing redistribution. Of course, I > understand that they simply may be missing (which would be really bad!). > > But how can anyone use those blobs? You can't redistribute them. > According to their license, just putting them on Github is not even > allowed. > > Thomas From peter at korsgaard.com Sat Jan 22 16:54:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 17:54:47 +0100 Subject: [Buildroot] [PATCH] package/xserver_xorg-server: security bump to version 21.1.2 In-Reply-To: <20211216171656.27339-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 16 Dec 2021 18:16:55 +0100") References: <20211216171656.27339-1-peter@korsgaard.com> Message-ID: <87bl03zp60.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following vulnerabilities: > * CVE-2021-4008/ZDI-CAN-14192 SProcRenderCompositeGlyphs out-of-bounds > access > The handler for the CompositeGlyphs request of the Render extension does > not properly validate the request length leading to out of bounds memory > write. > * CVE-2021-4009/ZDI-CAN 14950 SProcXFixesCreatePointerBarrier out-of-bounds > access > The handler for the CreatePointerBarrier request of the XFixes extension > does not properly validate the request length leading to out of bounds > memory write. > * CVE-2021-4010/ZDI-CAN-14951 SProcScreenSaverSuspend out-of-bounds access > The handler for the Suspend request of the Screen Saver extension does not > properly validate the request length leading to out of bounds memory > write. > * CVE-2021-4011/ZDI-CAN-14952 SwapCreateRegister out-of-bounds access > The handlers for the RecordCreateContext and RecordRegisterClients > requests of the Record extension do not properly validate the request > length leading to out of bounds memory write. > For details, see the advisory: > https://lists.x.org/archives/xorg-announce/2021-December/003122.html > Builds without systemd unfortunately got broken. Add a patch fixing that > from an upstream merge request: > https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/827 > Signed-off-by: Peter Korsgaard In the mean time xserver 1.20.14 has been released with the same security fixes, so I've used that for 2021.02.x / 2021.11.x. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 16:50:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 17:50:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xserver_xorg-server: security bump to version 1.20.14 Message-ID: <20220122172216.C72CF829F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a29088b78d06e066ba3c743d85c09f25e1c5fd51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following vulnerabilities: * CVE-2021-4008/ZDI-CAN-14192 SProcRenderCompositeGlyphs out-of-bounds access The handler for the CompositeGlyphs request of the Render extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4009/ZDI-CAN 14950 SProcXFixesCreatePointerBarrier out-of-bounds access The handler for the CreatePointerBarrier request of the XFixes extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4010/ZDI-CAN-14951 SProcScreenSaverSuspend out-of-bounds access The handler for the Suspend request of the Screen Saver extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4011/ZDI-CAN-14952 SwapCreateRegister out-of-bounds access The handlers for the RecordCreateContext and RecordRegisterClients requests of the Record extension do not properly validate the request length leading to out of bounds memory write. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2021-December/003122.html Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 8eb56ba027..3d4796ef6b 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-July/003100.html -sha256 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 xorg-server-1.20.13.tar.xz -sha512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 xorg-server-1.20.13.tar.xz +# From https://lists.x.org/archives/xorg-announce/2021-December/003124.html +sha256 5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b xorg-server-1.20.14.tar.xz +sha512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 xorg-server-1.20.14.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index e649fbb7c6..077436dde4 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.20.13 +XSERVER_XORG_SERVER_VERSION = 1.20.14 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Sat Jan 22 16:53:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 17:53:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xserver_xorg-server: security bump to version 1.20.14 Message-ID: <20220122172227.4E44D829F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff1cd8a27540f677dcf6106f3958701922fdb40e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following vulnerabilities: * CVE-2021-4008/ZDI-CAN-14192 SProcRenderCompositeGlyphs out-of-bounds access The handler for the CompositeGlyphs request of the Render extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4009/ZDI-CAN 14950 SProcXFixesCreatePointerBarrier out-of-bounds access The handler for the CreatePointerBarrier request of the XFixes extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4010/ZDI-CAN-14951 SProcScreenSaverSuspend out-of-bounds access The handler for the Suspend request of the Screen Saver extension does not properly validate the request length leading to out of bounds memory write. * CVE-2021-4011/ZDI-CAN-14952 SwapCreateRegister out-of-bounds access The handlers for the RecordCreateContext and RecordRegisterClients requests of the Record extension do not properly validate the request length leading to out of bounds memory write. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2021-December/003122.html Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 8eb56ba027..3d4796ef6b 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-July/003100.html -sha256 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 xorg-server-1.20.13.tar.xz -sha512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 xorg-server-1.20.13.tar.xz +# From https://lists.x.org/archives/xorg-announce/2021-December/003124.html +sha256 5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b xorg-server-1.20.14.tar.xz +sha512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 xorg-server-1.20.14.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index c326230be0..e891a0ee42 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.20.13 +XSERVER_XORG_SERVER_VERSION = 1.20.14 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From peter at korsgaard.com Sat Jan 22 17:32:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:32:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqmi: fix build with help2man In-Reply-To: <20211216184943.580682-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 16 Dec 2021 19:49:43 +0100") References: <20211216184943.580682-1-fontaine.fabrice@gmail.com> Message-ID: <877darzneq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised with help2man since bump to > version 1.30.0 in commit 50c5495f81d3418a0f63fc642dc6beb41cd316e0: > FAILED: docs/man/qmicli.1 > /usr/bin/help2man --output=docs/man/qmicli.1 '--name=Control QMI > devices' '--help-option="--help-all"' > /home/peko/autobuild/instance-1/output-1/build/libqmi-1.30.2/build/src/qmicli/qmicli > help2man: can't get `"--help-all"' info from > /home/peko/autobuild/instance-1/output-1/build/libqmi-1.30.2/build/src/qmicli/qmicli > Try `--no-discard-stderr' if option outputs to stderr > Fixes: > - http://autobuild.buildroot.org/results/15818b6de7378cd75c59b1d6dc732ed9a20c092a > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:39:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:39:37 +0100 Subject: [Buildroot] [PATCH] package/icu: fix build failure due to a library clash In-Reply-To: <20211216164522.3877446-1-anssi.hannula@bitwise.fi> (Anssi Hannula's message of "Thu, 16 Dec 2021 18:45:22 +0200") References: <20211216164522.3877446-1-anssi.hannula@bitwise.fi> Message-ID: <8735lfzn3a.fsf@dell.be.48ers.dk> >>>>> "Anssi" == Anssi Hannula writes: > ICU build scripting adds some host libraries to LD_LIBRARY_PATH by > using constructs of the following form: > LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" > If the original LD_LIBRARY_PATH is empty, this causes the last search > directory be an empty string, i.e. the working directory. > ICU build runs some basic host commands (e.g. "rm") in $(TARGET_DIR)/lib > under such an LD_LIBRARY_PATH, causing target libraries (e.g. libc) to > possibly get loaded instead of host system libraries if they are > compatible enough (e.g. arch matches). > Since the target libraries may not actually be ABI compatible with host > system binaries (e.g. target has an old libc), this can cause crashes > or other errors. > Observed errors include: > (1) rm: libc.so.6: version `GLIBC_2.33' not found (required by rm) > (2) sh: line 1: 1362670 Segmentation fault (core dumped) rm -f libicudata.so.65 > Workaround the issue by setting a dummy LD_LIBRARY_PATH when it would > otherwise be empty. > https://unicode-org.atlassian.net/browse/ICU-21417 > Signed-off-by: Anssi Hannula Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:39:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:39:17 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/icu: fix build failure due to a library clash Message-ID: <20220122173259.B6D7F82A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ca45102f557d277bee9ed856c51c08f02db1cb2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x ICU build scripting adds some host libraries to LD_LIBRARY_PATH by using constructs of the following form: LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" If the original LD_LIBRARY_PATH is empty, this causes the last search directory be an empty string, i.e. the working directory. ICU build runs some basic host commands (e.g. "rm") in $(TARGET_DIR)/lib under such an LD_LIBRARY_PATH, causing target libraries (e.g. libc) to possibly get loaded instead of host system libraries if they are compatible enough (e.g. arch matches). Since the target libraries may not actually be ABI compatible with host system binaries (e.g. target has an old libc), this can cause crashes or other errors. Observed errors include: (1) rm: libc.so.6: version `GLIBC_2.33' not found (required by rm) (2) sh: line 1: 1362670 Segmentation fault (core dumped) rm -f libicudata.so.65 Workaround the issue by setting a dummy LD_LIBRARY_PATH when it would otherwise be empty. https://unicode-org.atlassian.net/browse/ICU-21417 Signed-off-by: Anssi Hannula Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ac1c781149469d71c34cd37ed60a6e1525ca9689) Signed-off-by: Peter Korsgaard --- package/icu/icu.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 2c04c3c775..c5d0c3eefb 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -50,6 +50,17 @@ HOST_ICU_CONF_OPTS = \ ICU_SUBDIR = source HOST_ICU_SUBDIR = source +# ICU build scripting adds paths to LD_LIBRARY_PATH using +# LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" +# which, if LD_LIBRARY_PATH was empty, causes the last search directory +# to be the working directory, causing the build to try to load target +# libraries, possibly crashing the build due to ABI mismatches. +# Workaround by ensuring LD_LIBRARY_PATH is never empty. +# https://unicode-org.atlassian.net/browse/ICU-21417 +ifeq ($(LD_LIBRARY_PATH),) +ICU_MAKE_ENV += LD_LIBRARY_PATH=/dev/null +endif + ICU_CUSTOM_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH)) ifneq ($(ICU_CUSTOM_DATA_PATH),) From peter at korsgaard.com Sat Jan 22 17:39:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:39:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/icu: fix build failure due to a library clash Message-ID: <20220122173310.9CE3F82A14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8b4e8eedcf83d91487d1dad2fd274128a1ca48e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x ICU build scripting adds some host libraries to LD_LIBRARY_PATH by using constructs of the following form: LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" If the original LD_LIBRARY_PATH is empty, this causes the last search directory be an empty string, i.e. the working directory. ICU build runs some basic host commands (e.g. "rm") in $(TARGET_DIR)/lib under such an LD_LIBRARY_PATH, causing target libraries (e.g. libc) to possibly get loaded instead of host system libraries if they are compatible enough (e.g. arch matches). Since the target libraries may not actually be ABI compatible with host system binaries (e.g. target has an old libc), this can cause crashes or other errors. Observed errors include: (1) rm: libc.so.6: version `GLIBC_2.33' not found (required by rm) (2) sh: line 1: 1362670 Segmentation fault (core dumped) rm -f libicudata.so.65 Workaround the issue by setting a dummy LD_LIBRARY_PATH when it would otherwise be empty. https://unicode-org.atlassian.net/browse/ICU-21417 Signed-off-by: Anssi Hannula Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ac1c781149469d71c34cd37ed60a6e1525ca9689) Signed-off-by: Peter Korsgaard --- package/icu/icu.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 2c04c3c775..c5d0c3eefb 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -50,6 +50,17 @@ HOST_ICU_CONF_OPTS = \ ICU_SUBDIR = source HOST_ICU_SUBDIR = source +# ICU build scripting adds paths to LD_LIBRARY_PATH using +# LD_LIBRARY_PATH="custom-path:${LD_LIBRARY_PATH}" +# which, if LD_LIBRARY_PATH was empty, causes the last search directory +# to be the working directory, causing the build to try to load target +# libraries, possibly crashing the build due to ABI mismatches. +# Workaround by ensuring LD_LIBRARY_PATH is never empty. +# https://unicode-org.atlassian.net/browse/ICU-21417 +ifeq ($(LD_LIBRARY_PATH),) +ICU_MAKE_ENV += LD_LIBRARY_PATH=/dev/null +endif + ICU_CUSTOM_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH)) ifneq ($(ICU_CUSTOM_DATA_PATH),) From peter at korsgaard.com Sat Jan 22 17:31:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:31:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libqmi: fix build with help2man Message-ID: <20220122173310.9547982A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ec2241856579b7de135c699288a8d449fe551dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure raised with help2man since bump to version 1.30.0 in commit 50c5495f81d3418a0f63fc642dc6beb41cd316e0: FAILED: docs/man/qmicli.1 /usr/bin/help2man --output=docs/man/qmicli.1 '--name=Control QMI devices' '--help-option="--help-all"' /home/peko/autobuild/instance-1/output-1/build/libqmi-1.30.2/build/src/qmicli/qmicli help2man: can't get `"--help-all"' info from /home/peko/autobuild/instance-1/output-1/build/libqmi-1.30.2/build/src/qmicli/qmicli Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/15818b6de7378cd75c59b1d6dc732ed9a20c092a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7f38ce2103bbb01128dd00f102d0834d03343c2f) Signed-off-by: Peter Korsgaard --- ...uild-add-an-option-to-not-build-man-pages.patch | 65 ++++++++++++++++++++++ package/libqmi/libqmi.mk | 1 + 2 files changed, 66 insertions(+) diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch new file mode 100644 index 0000000000..d9053de537 --- /dev/null +++ b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch @@ -0,0 +1,65 @@ +From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado +Date: Wed, 3 Nov 2021 10:57:51 +0100 +Subject: [PATCH] build: add an option to not build man pages + +When cross-compiling, the compiled binaries cannot be run on the build +machine, unless one defines a helper (e.g. qemu) in the meson +configuration, which is most of the time undesirable. + +If help2man is installed on the build machine, then the build would fail +because of this, so add an option to disable generating the man pages. + +With later versions of meson, it will be possible to automatically +detect this condition. + +Based on the same fix done in libmbim by Nicolas Cavallari, see +https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40 + +Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75 + +[Retrieved (and backported) from: +https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 8 +++++++- + meson_options.txt | 1 + + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e88b43a1..c7312146 100644 +--- a/meson.build ++++ b/meson.build +@@ -223,8 +223,8 @@ if enable_gtk_doc + subdir('docs/reference/libqmi-glib') + endif + +-help2man = find_program('help2man', required: false) +-if help2man.found() ++enable_man = get_option('man') ++if enable_man + subdir('docs/man') + endif + +@@ -237,6 +242,7 @@ summary({ + output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' + output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' + output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' ++output += ' man pages: ' + enable_man.to_string() + '\n\n' + output += ' System paths\n' + output += ' prefix: ' + qmi_prefix + '\n' + output += ' udev base directory: ' + qmi_username + '\n\n' +diff --git a/meson_options.txt b/meson_options.txt +index 4d4f913d..bee5daac 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc + + option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support') + option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') ++option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') + + option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') +-- +GitLab + diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index cd2c2719f9..a4839f1efb 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -12,6 +12,7 @@ LIBQMI_CPE_ID_VENDOR = libqmi_project LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 +LIBQMI_CONF_OPTS = -Dman=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBQMI_DEPENDENCIES += gobject-introspection From peter at korsgaard.com Sat Jan 22 17:44:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:44:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmbim: fix build with help2man In-Reply-To: <20211216233423.1534607-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 17 Dec 2021 00:34:23 +0100") References: <20211216233423.1534607-1-fontaine.fabrice@gmail.com> Message-ID: <87y237y8az.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with help2man raised since bump to > version 1.26.0 in commit be76508af2b2253f95137a28198139732be2dcb3: > FAILED: docs/man/mbimcli.1 > /usr/bin/help2man --output=docs/man/mbimcli.1 '--name=Control MBIM > devices' '--help-option="--help-all"' > /home/peko/autobuild/instance-1/output-1/build/libmbim-1.26.0/build/src/mbimcli/mbimcli > help2man: can't get `"--help-all"' info from > /home/peko/autobuild/instance-1/output-1/build/libmbim-1.26.0/build/src/mbimcli/mbimcli > Try `--no-discard-stderr' if option outputs to stderr > Fixes: > - http://autobuild.buildroot.org/results/eaa2ba54b9c74f07292d3cad4fa96c80e6079702 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:44:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:44:04 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libmbim: fix build with help2man Message-ID: <20220122173757.EA49B82A14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8e11dcf546062a091ac1482b2f35ff4f52965cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure with help2man raised since bump to version 1.26.0 in commit be76508af2b2253f95137a28198139732be2dcb3: FAILED: docs/man/mbimcli.1 /usr/bin/help2man --output=docs/man/mbimcli.1 '--name=Control MBIM devices' '--help-option="--help-all"' /home/peko/autobuild/instance-1/output-1/build/libmbim-1.26.0/build/src/mbimcli/mbimcli help2man: can't get `"--help-all"' info from /home/peko/autobuild/instance-1/output-1/build/libmbim-1.26.0/build/src/mbimcli/mbimcli Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/eaa2ba54b9c74f07292d3cad4fa96c80e6079702 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a315d7c98bb0a853e9fe84639ea15595d9dd4b85) Signed-off-by: Peter Korsgaard --- ...uild-add-an-option-to-not-build-man-pages.patch | 60 ++++++++++++++++++++++ package/libmbim/libmbim.mk | 1 + 2 files changed, 61 insertions(+) diff --git a/package/libmbim/0002-meson-build-add-an-option-to-not-build-man-pages.patch b/package/libmbim/0002-meson-build-add-an-option-to-not-build-man-pages.patch new file mode 100644 index 0000000000..c91756e9a6 --- /dev/null +++ b/package/libmbim/0002-meson-build-add-an-option-to-not-build-man-pages.patch @@ -0,0 +1,60 @@ +From 792af73ea90e9689703ab526dd444fdb1c2f8e40 Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Thu, 14 Oct 2021 12:25:46 +0200 +Subject: [PATCH] meson.build: add an option to not build man pages. + +When cross-compiling, the compiled binaries cannot be run on the build +machine, unless one defines a helper (e.g. qemu) in the meson +configuration, which is most of the time undesirable. + +If help2man is installed on the build machine, then the build would fail +because of this, so add an option to disable generating the man pages. + +With later versions of meson, it will be possible to automatically +detect this condition. + +[Retrieved (and backported) from: +https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 8 +++++++- + meson_options.txt | 1 + + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1c5ee2d..59f1727 100644 +--- a/meson.build ++++ b/meson.build +@@ -184,8 +184,8 @@ if enable_gtk_doc + subdir('docs/reference/libmbim-glib') + endif + +-help2man = find_program('help2man', required: false) +-if help2man.found() ++enable_man = get_option('man') ++if enable_man + subdir('docs/man') + endif + +@@ -198,6 +203,7 @@ summary({ + output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' + output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' + output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' ++output += ' man pages: ' + enable_man.to_string() + '\n\n' + output += ' System paths\n' + output += ' prefix: ' + mbim_prefix + '\n' + output += ' udev base directory: ' + mbim_username + '\n\n' +diff --git a/meson_options.txt b/meson_options.txt +index 1305957..bfa33ab 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -7,5 +7,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc + + option('introspection', type: 'boolean', value: 'true', description: 'build introspection support') + option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') ++option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') + + option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') +-- +GitLab + diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index cdc3fabedb..6737afebe8 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -12,6 +12,7 @@ LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 +LIBMBIM_CONF_OPTS = -Dman=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBMBIM_DEPENDENCIES += gobject-introspection From peter at korsgaard.com Sat Jan 22 17:54:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:54:19 +0100 Subject: [Buildroot] [git commit] package/linux-pam: add missing BR2_USE_MMU dependency on comment In-Reply-To: <20211217214145.112BD802C5@busybox.osuosl.org> (Thomas Petazzoni's message of "Fri, 17 Dec 2021 22:46:55 +0100") References: <20211217214145.112BD802C5@busybox.osuosl.org> Message-ID: <87tudvy7uc.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=8f0df6609a0a1045c16a7d55711f21fc42af756b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > BR2_PACKAGE_LINUX_PAM depends on BR2_USE_MMU, but this dependency is > not taken into account in the Config.in comment, which this commit > fixes. > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:55:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:55:08 +0100 Subject: [Buildroot] [git commit] package/linux-pam: separate locale and wchar dependencies In-Reply-To: <20211217214145.1C5FF80288@busybox.osuosl.org> (Thomas Petazzoni's message of "Fri, 17 Dec 2021 22:46:55 +0100") References: <20211217214145.1C5FF80288@busybox.osuosl.org> Message-ID: <87pmojy7sz.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=ac9261edec111836952970e26cf373cc15b9e8ac > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > They are currently expressed as such: > depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) > which is not the common practice in Buildroot. We prefer to use: > depends on BR2_ENABLE_LOCALE > depends on BR2_USE_WCHAR > This commit ensures linux-pam is consistent with this best practice. > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:59:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:59:52 +0100 Subject: [Buildroot] [git commit] configs/stm32f469_xip_disco: fix kernel bootup In-Reply-To: <20211217215308.46712811FB@busybox.osuosl.org> (Arnout Vandecappelle's message of "Fri, 17 Dec 2021 22:58:11 +0100") References: <20211217215308.46712811FB@busybox.osuosl.org> Message-ID: <87lez7y7l3.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=82c1a437929acaeeb7f0cc198d5e5fa4b7862d5b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The current configuration fails to boot on the stm32f469-disco board. > Make it bootable again by reverting the DRAM patches. > Also change the kernel load address from 0x8010000 to 0x800C000 to > allocate more space to the kernel, since 32kB for the device tree is > enough. > Also clean up the rootfs a bit with the common stm32-post-build.sh > script. > Signed-off-by: Dario Binacchi > Acked-by: Christophe Priouzeau > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Jan 22 17:45:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:45:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pugixml: switch _SITE to https Message-ID: <20220122175335.A1806829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a3c5b173ed08ded0fee9eb02c2846c090a7f5bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1b44913df9b09e4abff3f0419f2b8cd4234dfa1f) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index ddda5a3ccc..bc018180ef 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -5,7 +5,7 @@ ################################################################################ PUGIXML_VERSION = 1.11.4 -PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) +PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md PUGIXML_CPE_ID_VENDOR = pugixml_project From peter at korsgaard.com Sat Jan 22 17:46:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:46:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/x11r7/xapp_xinput-calibrator: switch _SITE to https Message-ID: <20220122175335.ABABA82A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27f4f1f03cf6cf11b711a9090429c8664377750a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 83b587a642075e605a4796a4ef924f90131bddae) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk index 974b83df2c..be86608b85 100644 --- a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk +++ b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk @@ -6,7 +6,7 @@ XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5 XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz -XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator +XAPP_XINPUT_CALIBRATOR_SITE = https://github.com/downloads/tias/xinput_calibrator XAPP_XINPUT_CALIBRATOR_LICENSE = MIT XAPP_XINPUT_CALIBRATOR_LICENSE_FILES = COPYING XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi From peter at korsgaard.com Sat Jan 22 17:54:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:54:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/linux-pam: separate locale and wchar dependencies Message-ID: <20220122175335.C0331829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d259c00fb6f44a7a8512275f6751de22a99ee39f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x They are currently expressed as such: depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) which is not the common practice in Buildroot. We prefer to use: depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR This commit ensures linux-pam is consistent with this best practice. Signed-off-by: Thomas Petazzoni (cherry picked from commit ac9261edec111836952970e26cf373cc15b9e8ac) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 931cfdeccf..27ba55bd61 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LINUX_PAM bool "linux-pam" - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) + depends on BR2_ENABLE_LOCALE + depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FLEX @@ -12,5 +13,5 @@ config BR2_PACKAGE_LINUX_PAM comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" depends on BR2_USE_MMU - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR \ || BR2_STATIC_LIBS From peter at korsgaard.com Sat Jan 22 17:59:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:59:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/stm32f469_xip_disco: fix kernel bootup Message-ID: <20220122175335.C93FD82A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0541a7c2103ba500d5a6ed4ddf08cd839290381f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The current configuration fails to boot on the stm32f469-disco board. Make it bootable again by reverting the DRAM patches. Also change the kernel load address from 0x8010000 to 0x800C000 to allocate more space to the kernel, since 32kB for the device tree is enough. Also clean up the rootfs a bit with the common stm32-post-build.sh script. Signed-off-by: Dario Binacchi Acked-by: Christophe Priouzeau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 82c1a437929acaeeb7f0cc198d5e5fa4b7862d5b) Signed-off-by: Peter Korsgaard --- .../stm32f469-disco/flash_xip.sh | 2 +- .../stm32f469-disco/linux-xip.config | 8 ++-- ...1-stm32f469-i-Update-kernel-start-address.patch | 56 ---------------------- ...m32f469i-disco-change-kernel-load-address.patch | 26 ++++++++++ ...se-default-dram-address-without-remapping.patch | 38 --------------- configs/stm32f469_disco_xip_defconfig | 1 + 6 files changed, 32 insertions(+), 99 deletions(-) diff --git a/board/stmicroelectronics/stm32f469-disco/flash_xip.sh b/board/stmicroelectronics/stm32f469-disco/flash_xip.sh old mode 100644 new mode 100755 index b5a067cee5..da27cd327c --- a/board/stmicroelectronics/stm32f469-disco/flash_xip.sh +++ b/board/stmicroelectronics/stm32f469-disco/flash_xip.sh @@ -15,6 +15,6 @@ ${OUTPUT_DIR}/host/bin/openocd -f board/stm32f469discovery.cfg \ -c "flash info 0" \ -c "flash write_image erase ${OUTPUT_DIR}/images/stm32f469i-disco.bin 0x08000000" \ -c "flash write_image erase ${OUTPUT_DIR}/images/stm32f469-disco.dtb 0x08004000" \ - -c "flash write_image erase ${OUTPUT_DIR}/images/xipImage 0x08010000" \ + -c "flash write_image erase ${OUTPUT_DIR}/images/xipImage 0x0800C000" \ -c "reset run" \ -c "shutdown" diff --git a/board/stmicroelectronics/stm32f469-disco/linux-xip.config b/board/stmicroelectronics/stm32f469-disco/linux-xip.config index 2d0ce59b31..01a94eb9d1 100644 --- a/board/stmicroelectronics/stm32f469-disco/linux-xip.config +++ b/board/stmicroelectronics/stm32f469-disco/linux-xip.config @@ -18,7 +18,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_MULTIUSER is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set -# CONFIG_POSIX_TIMERS is not set +CONFIG_POSIX_TIMERS=y # CONFIG_BUG is not set # CONFIG_BASE_FULL is not set # CONFIG_FUTEX is not set @@ -47,12 +47,12 @@ CONFIG_ARCH_STM32=y CONFIG_CPU_V7M_NUM_IRQ=240 # CONFIG_ARM_DMA_MEM_BUFFERABLE is not set CONFIG_SET_MEM_PARAM=y -CONFIG_DRAM_BASE=0xc0000000 -CONFIG_DRAM_SIZE=0x01000000 +CONFIG_DRAM_BASE=0x00000000 +CONFIG_DRAM_SIZE=0x00800000 CONFIG_HZ_1000=y # CONFIG_ATAGS is not set CONFIG_XIP_KERNEL=y -CONFIG_XIP_PHYS_ADDR=0x08010000 +CONFIG_XIP_PHYS_ADDR=0x0800C000 CONFIG_XIP_DEFLATED_DATA=y # CONFIG_SUSPEND is not set # CONFIG_STACKPROTECTOR is not set diff --git a/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch b/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch deleted file mode 100644 index d5d1e5a8ad..0000000000 --- a/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch +++ /dev/null @@ -1,56 +0,0 @@ -From fe5f3a86d07e378baeeddc1dfecd0686d83aa42f Mon Sep 17 00:00:00 2001 -From: Yauheni Saldatsenka -Date: Sat, 14 Aug 2021 18:54:51 +0300 -Subject: [PATCH] stm32f469-i: Update kernel start address - -As of GNU/Linux v5.12 kernel device tree binary grows above 0x08008000 -and overwrites kernel binary -Therefore this commit moves kernel to the next flash bank - -Signed-off-by: Yauheni Saldatsenka ---- - stm32f469i-disco.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/stm32f469i-disco.c b/stm32f469i-disco.c -index 2da1f4b..46fc06a 100644 ---- a/stm32f469i-disco.c -+++ b/stm32f469i-disco.c -@@ -6,6 +6,7 @@ - #include "gpio.h" - #include "mpu.h" - -+#define KERNEL_ADDR 0x08010000 - #define CONFIG_HSE_HZ 8000000 - #define CONFIG_PLL_M 8 - #define CONFIG_PLL_N 360 -@@ -85,7 +86,7 @@ static void fmc_wait_busy(void) - - void start_kernel(void) - { -- void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(0x08008000 | 1); -+ void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(KERNEL_ADDR | 1); - - kernel(0, ~0UL, 0x08004000); - } -@@ -102,7 +103,7 @@ int main(void) - volatile uint32_t *SYSCFG_MEMRMP = (void *)(SYSCFG_BASE + 0x00); - int i; - -- mpu_config(0x0); -+ mpu_config(0xc0000000); - - if (*FLASH_CR & FLASH_CR_LOCK) { - *FLASH_KEYR = 0x45670123; -@@ -195,8 +196,6 @@ int main(void) - usart_setup(usart_base, 45000000); - usart_putch(usart_base, '.'); - -- *SYSCFG_MEMRMP = 0x4; -- - start_kernel(); - - return 0; --- -2.32.0 - diff --git a/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469i-disco-change-kernel-load-address.patch b/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469i-disco-change-kernel-load-address.patch new file mode 100644 index 0000000000..1f8d929bfb --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469i-disco-change-kernel-load-address.patch @@ -0,0 +1,26 @@ +From d87969f72671cab5a88ba6e2418e43d0fa267d6f Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sat, 13 Nov 2021 15:46:32 +0100 +Subject: [PATCH] stm32f469i-disco: change kernel load address + +Signed-off-by: Dario Binacchi +--- + stm32f469i-disco.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stm32f469i-disco.c b/stm32f469i-disco.c +index 2da1f4b..3aacb12 100644 +--- a/stm32f469i-disco.c ++++ b/stm32f469i-disco.c +@@ -85,7 +85,7 @@ static void fmc_wait_busy(void) + + void start_kernel(void) + { +- void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(0x08008000 | 1); ++ void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(0x0800C000 | 1); + + kernel(0, ~0UL, 0x08004000); + } +-- +2.17.1 + diff --git a/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch b/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch deleted file mode 100644 index 68fe8380a2..0000000000 --- a/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8ccf9f625d00138d86fb7d70f3efd58a8fb4d7ff Mon Sep 17 00:00:00 2001 -From: Yauheni Saldatsenka -Date: Mon, 23 Aug 2021 02:54:22 +0300 -Subject: [PATCH] Use default dram address without remapping - -Signed-off-by: Yauheni Saldatsenka ---- - arch/arm/boot/dts/stm32f469-disco.dts | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts -index 2e1b3bbbe4b5..06845614a19a 100644 ---- a/arch/arm/boot/dts/stm32f469-disco.dts -+++ b/arch/arm/boot/dts/stm32f469-disco.dts -@@ -60,9 +60,9 @@ chosen { - stdout-path = "serial0:115200n8"; - }; - -- memory at 00000000 { -+ memory at c0000000 { - device_type = "memory"; -- reg = <0x00000000 0x1000000>; -+ reg = <0xc0000000 0x1000000>; - }; - - aliases { -@@ -84,7 +84,7 @@ vdd_dsi: vdd-dsi { - }; - - soc { -- dma-ranges = <0xc0000000 0x0 0x10000000>; -+ dma-ranges = <0xc0000000 0xc0000000 0x10000000>; - }; - - leds { --- -2.32.0 - diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 1ceffe4026..e8b2cf3d21 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -3,6 +3,7 @@ BR2_cortex_m4=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches" # BR2_UCLIBC_INSTALL_UTILS is not set BR2_GCC_ENABLE_LTO=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" From peter at korsgaard.com Sat Jan 22 17:53:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:53:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/linux-pam: add missing BR2_USE_MMU dependency on comment Message-ID: <20220122175335.B6AA882A1F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=baed11290ece14044bd5486a17b6f595a1391513 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x BR2_PACKAGE_LINUX_PAM depends on BR2_USE_MMU, but this dependency is not taken into account in the Config.in comment, which this commit fixes. Signed-off-by: Thomas Petazzoni (cherry picked from commit 8f0df6609a0a1045c16a7d55711f21fc42af756b) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 84aee5cdd4..931cfdeccf 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -11,5 +11,6 @@ config BR2_PACKAGE_LINUX_PAM http://linux-pam.org comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" + depends on BR2_USE_MMU depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ || BR2_STATIC_LIBS From peter at korsgaard.com Sat Jan 22 17:45:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:45:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pugixml: switch _SITE to https Message-ID: <20220122175343.7DFDD829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4c8d4a1598054c6c7e6d8e2922476baa0d9ab2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1b44913df9b09e4abff3f0419f2b8cd4234dfa1f) Signed-off-by: Peter Korsgaard --- package/pugixml/pugixml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index ddda5a3ccc..bc018180ef 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -5,7 +5,7 @@ ################################################################################ PUGIXML_VERSION = 1.11.4 -PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) +PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md PUGIXML_CPE_ID_VENDOR = pugixml_project From peter at korsgaard.com Sat Jan 22 17:54:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:54:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/linux-pam: add missing BR2_USE_MMU dependency on comment Message-ID: <20220122175343.8FC2A82A1F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d8d5d4d4d4853e1e1bb37f481262d7fd6324f0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x BR2_PACKAGE_LINUX_PAM depends on BR2_USE_MMU, but this dependency is not taken into account in the Config.in comment, which this commit fixes. Signed-off-by: Thomas Petazzoni (cherry picked from commit 8f0df6609a0a1045c16a7d55711f21fc42af756b) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 84aee5cdd4..931cfdeccf 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -11,5 +11,6 @@ config BR2_PACKAGE_LINUX_PAM http://linux-pam.org comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" + depends on BR2_USE_MMU depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ || BR2_STATIC_LIBS From peter at korsgaard.com Sat Jan 22 17:54:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:54:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/linux-pam: separate locale and wchar dependencies Message-ID: <20220122175343.9959F829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=986fd8838f5c8348db889b9e6418ded3a2306243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x They are currently expressed as such: depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) which is not the common practice in Buildroot. We prefer to use: depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR This commit ensures linux-pam is consistent with this best practice. Signed-off-by: Thomas Petazzoni (cherry picked from commit ac9261edec111836952970e26cf373cc15b9e8ac) Signed-off-by: Peter Korsgaard --- package/linux-pam/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 931cfdeccf..27ba55bd61 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LINUX_PAM bool "linux-pam" - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) + depends on BR2_ENABLE_LOCALE + depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FLEX @@ -12,5 +13,5 @@ config BR2_PACKAGE_LINUX_PAM comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library" depends on BR2_USE_MMU - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR \ || BR2_STATIC_LIBS From peter at korsgaard.com Sat Jan 22 17:45:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 22 Jan 2022 18:45:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/x11r7/xapp_xinput-calibrator: switch _SITE to https Message-ID: <20220122175343.86F4A82A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68d5ac331850439f2b17f586c12c156a47277138 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 83b587a642075e605a4796a4ef924f90131bddae) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk index 974b83df2c..be86608b85 100644 --- a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk +++ b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk @@ -6,7 +6,7 @@ XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5 XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz -XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator +XAPP_XINPUT_CALIBRATOR_SITE = https://github.com/downloads/tias/xinput_calibrator XAPP_XINPUT_CALIBRATOR_LICENSE = MIT XAPP_XINPUT_CALIBRATOR_LICENSE_FILES = COPYING XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi From petr.vorel at gmail.com Sat Jan 22 18:08:04 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 19:08:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: bump version to 2.6.1 Message-ID: <20220122180804.30250-1-petr.vorel@gmail.com> Drop patches backported from this release. Signed-off-by: Petr Vorel --- ...nfsdcltrack-sqlite-Fix-printf-format.patch | 52 --------------- ...rack-nfsdcltrack.c-Fix-printf-format.patch | 48 -------------- ...track-Use-uint64_t-instead-of-time_t.patch | 66 ------------------- package/nfs-utils/nfs-utils.hash | 4 +- package/nfs-utils/nfs-utils.mk | 2 +- 5 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch delete mode 100644 package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch delete mode 100644 package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch deleted file mode 100644 index 14894602c4..0000000000 --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:44 +0000 -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format - -sqlite.c: In function 'sqlite_remove_unreclaimed': -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", - | ~~^ - | | - | long int - | %lld - 548 | grace_start); - | ~~~~~~~~~~~ - | | - | time_t {aka long long int} - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/sqlite.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index f79aebb3..cea4a411 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) - int ret; - char *err = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, - grace_start); - if (ret < 0) { - return ret; --- -2.25.1 - diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch deleted file mode 100644 index 0893959460..0000000000 --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:45 +0000 -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format - -nfsdcltrack.c: In function 'cltrack_gracedone': -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); - | ~~^ ~~~~~~~~~ - | | | - | long int time_t {aka long long int} - | %lld - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index e926f1c0..0b37c094 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) - if (*tail) - return -EINVAL; - -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); - - ret = sqlite_remove_unreclaimed(gracetime); - --- -2.25.1 - diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch deleted file mode 100644 index 384f4fd806..0000000000 --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Tue, 27 Jul 2021 21:12:17 -0400 -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t - -With recent commits (4f2a5b64,5a53426c) that fixed -compile errors on x86_64 machines, caused similar -errors on i686 machines. - -The variable type that was being used was a time_t, -which changes size between architects, which -caused the compile error. - -Changing the variable to uint64_t fixed the issue. - -Signed-off-by: Steve Dickson -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 -Signed-off-by: Petr Vorel ---- - utils/nfsdcltrack/nfsdcltrack.c | 2 +- - utils/nfsdcltrack/sqlite.c | 2 +- - utils/nfsdcltrack/sqlite.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index 0b37c094..7c1c4bcc 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) - { - int ret; - char *tail; -- time_t gracetime; -+ uint64_t gracetime; - - - ret = sqlite_prepare_dbh(storagedir); -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index cea4a411..cf0c6a45 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -540,7 +540,7 @@ out_err: - * remove any client records that were not reclaimed since grace_start. - */ - int --sqlite_remove_unreclaimed(time_t grace_start) -+sqlite_remove_unreclaimed(uint64_t grace_start) - { - int ret; - char *err = NULL; -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h -index 06e7c044..ba8cdfa8 100644 ---- a/utils/nfsdcltrack/sqlite.h -+++ b/utils/nfsdcltrack/sqlite.h -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); - int sqlite_check_client(const unsigned char *clname, const size_t namelen, - const bool has_session); --int sqlite_remove_unreclaimed(const time_t grace_start); -+int sqlite_remove_unreclaimed(const uint64_t grace_start); - int sqlite_query_reclaiming(const time_t grace_start); - - #endif /* _SQLITE_H */ --- -2.32.0 - diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 2073bebd8a..a73bf80e70 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 07b44b5a93..6a3a801359 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.5.4 +NFS_UTILS_VERSION = 2.6.1 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ -- 2.34.1 From petr.vorel at gmail.com Sat Jan 22 18:10:58 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 19:10:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: bump version to 2.6.1 In-Reply-To: <20220122180804.30250-1-petr.vorel@gmail.com> References: <20220122180804.30250-1-petr.vorel@gmail.com> Message-ID: Hi all, note this version does not support NFSv2 any more. Does it need to be mentioned to the commit message? I didn't add it, because even NFSv3 is quite old (and I recommend to use NFSv4.2). Kind regards, Petr From yann.morin.1998 at free.fr Sat Jan 22 18:13:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 19:13:43 +0100 Subject: [Buildroot] [PATCH 0/2 v2] core: fixup PPD paths (branch yem/ppd-fixup-paths) Message-ID: Hello All! This series builds upon previous good work from Andreas [0], Louis-Paul [1], and Adam [2]. The first patch is the core of the change: rather than have multiple hooks that each cater for different types of files (.py, .pc, .pri, .cmake and so on), we jut do what we already do in relocate-sdk: we just look for all text files that have a PPD prefix in them, and replace tht with the current package's PPD. The second patch ensures that we can build reliable files lists, so that files we tweak in the infra are not believed to be installed/modified by the current package. [0] https://lore.kernel.org/buildroot/20200217212350.29750-21-anaumann at ultratronik.de/ [1] https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ [2] https://lore.kernel.org/buildroot/20220106171720.12857-1-aduskett at gmail.com/ Changes v1 -> v2: - use --binary-files=without-match, as this *considerably* speeds up the fixup (Arnout) - rename the python fixup (Arnout) Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (2): core/pkg-generic: fixup all PPD paths in a generic fashion core/pkg-generic: apply post-prepare hooks before monitoring directories package/pkg-generic.mk | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 18:13:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 19:13:44 +0100 Subject: [Buildroot] [PATCH 1/2 v2] core/pkg-generic: fixup all PPD paths in a generic fashion In-Reply-To: References: Message-ID: Some files contain hard-coded absolute paths that point to the host and/or staging directories. With per-package directories (aka. PPD), these paths point to the PPD of the package that created the files, when we want them to point to the PPD of the package that uses them. Up until now, we had two hooks that attempted to fix those files: - a libtool-specific hook that searches for all .la files and seds them with the proper PPD, - a python-specific hook that tweaks just the sysconfigdata and removes the byte-compiled version of the sysconfigdata. But now, we also have a few other kinds of files for which we need to fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others as well. We solve this issue by just replacing any PPD in text files, with the current package's PPD. This is very similar to, and inspired from what is done when relocating the SDK. However, we can't use the existing relocate-sdk script, because that needs to know the original location, which we do not have when we aggregate the PPD (we could store it, but we can easily do without it). Furthermore, we use a construct that is way more efficient than relocate-sdk. First, we skip binary files with grep, which means we have way less files to check with 'file' [0]. Second, we use xargs to sed multiple files at once: printf is a shell built-in, so it's fast, and so we do not have to spawn a sed for each file to fixup. [0] We still keep using 'file' as a safety net, to avoid mangling a binary file that grep would have missed. Finally, the existing python-specific macro is simplified to just remove the pre-compiled sysconfigdata files. And we rename it accordingly. And as for some timings, to see the impact, with the defconfig below, and with the downloads already local, and with a PC mostly idle (mail and IRC activity only): Before Now Delta - without PPD : 7min 27s 7min 23s -0.9% - with PPD : 7min 51s 7min 59s +1.7% - with PPD -j8: 5min 51s 5min 56s +1.4% So we can see a slight increase in time, but it is mostly in the noise (some builds without this change did exceed some builds with this change, due to background noise). Also, depending on scheduling, there can be less parallelism; for example, python3 does not build in parallel, and with this special defconfig, python is on the critical path of a lot of packages that are python modules, which can negatively impact a parallel build too. A more realistic, bigger defconfig would probably be more parallel... YMMV... Delta without PPD is also due to background noise, as those hooks are not used when PPD is not enabled. Defconfig used: BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AIOBLESCAN=y BR2_PACKAGE_PYTHON_AIOCOAP=y BR2_PACKAGE_PYTHON_AIOFILES=y BR2_PACKAGE_PYTHON_AIOHTTP_CORS=y BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR=y BR2_PACKAGE_PYTHON_AIOHTTP_MAKO=y BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES=y BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY=y BR2_PACKAGE_PYTHON_AIOHTTP_SESSION=y BR2_PACKAGE_PYTHON_AIOHTTP_SSE=y BR2_PACKAGE_PYTHON_AIOJOBS=y BR2_PACKAGE_PYTHON_AIOLOGSTASH=y BR2_PACKAGE_PYTHON_AIOMONITOR=y BR2_PACKAGE_PYTHON_AIOPROCESSING=y BR2_PACKAGE_PYTHON_AIOREDIS=y BR2_PACKAGE_PYTHON_AIORWLOCK=y BR2_PACKAGE_PYTHON_AIOZIPKIN=y BR2_PACKAGE_LIGHTTPD=y BR2_PACKAGE_LIGHTTPD_OPENSSL=y BR2_PACKAGE_LIGHTTPD_ZLIB=y BR2_PACKAGE_LIGHTTPD_BZIP2=y BR2_PACKAGE_LIGHTTPD_PCRE=y BR2_PACKAGE_LIGHTTPD_WEBDAV=y # BR2_TARGET_ROOTFS_TAR is not set Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Adam Duskett Cc: Louis-Paul CORDIER Cc: Andreas Naumann --- Changes v1 -> v2: - use grep --binary-files=without-match as it *considerably* speeds up the fixup (Arnout) - rename the python hook (arnout) --- package/pkg-generic.mk | 45 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6a5fe5507b..78226ee266 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -90,21 +90,24 @@ endif ####################################### # Helper functions -# Make sure .la files only reference the current per-package -# directory. - -# $1: package name (lower case) -# $2: staging directory of the package ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define fixup-libtool-files - $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ - -name "*.la" -print0 | xargs -0 --no-run-if-empty \ - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" + +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the +# proper staging and host directories for the current package: find +# all text files that contain the PPD root, and replace it with the +# current package's PPD. +define PPD_FIXUP_PATHS + $(Q)grep --binary-files=without-match -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ + |while read -d '' f; do \ + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ + printf '%s\0' "$${f}"; \ + done \ + |xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef -endif -# Make sure python _sysconfigdata*.py files only reference the current -# per-package directory. +# Remove python's pre-compiled "sysconfigdata", as it may contain paths to +# the original staging or host dirs. # # Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) # because those directories may be created in the same recipe this macro will @@ -113,19 +116,15 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define FIXUP_PYTHON_SYSCONFIGDATA +define PPD_PYTHON_REMOVE_SYSCONFIGDATA_PYC $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ \) \ - \( \( -name "_sysconfigdata*.pyc" -delete \) \ - -o \( -name "_sysconfigdata*.py" -print0 \) \ - \) \ - | xargs -0 --no-run-if-empty \ - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + \( -name "_sysconfigdata*.pyc" -delete \) endef -endif + +endif # PPD # Functions to collect statistics about installed files @@ -278,8 +277,6 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) - $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) @@ -836,7 +833,9 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += \ + PPD_FIXUP_PATHS \ + PPD_PYTHON_REMOVE_SYSCONFIGDATA_PYC ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) -- 2.25.1 From yann.morin.1998 at free.fr Sat Jan 22 18:13:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 19:13:45 +0100 Subject: [Buildroot] [PATCH 2/2 v2] core/pkg-generic: apply post-prepare hooks before monitoring directories In-Reply-To: References: Message-ID: <0883bf75cfefe1b97c562b8dae4b2349dd9ece4f.1642875217.git.yann.morin.1998@free.fr> Monitoring the target/ and host/ directories and so on, will serve to generate lists of files installed by the packages. Those lists are then used to generate graphs of the size those package take on the target for example. With PPD, we will also want to use those lists to only copy those files actually installed by each dependencies of a package, recursively. Currently, those lists are not entirely reliable, as the starting points are established before we apply PPD fixup hooks. As such, at the end of a package installation, fixed up files will be found to belong to the current package, while they were in fact provided by one of its dependency. While this does no big harm, if at all, for the size graphs, it will trigger overwrite detection when we eventually gather packages together to aggregate a PPD or te final host and target. So, we better have the lists of files be reliable. So, we only start monitoring the directories after we apply the PPD fixups (or seen the other way around for a smaller diff: we apply the PPD fixups before we start monitoring the directories). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Herve Codina --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 78226ee266..b3a7e1d60e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call MESSAGE,"Configuring") $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) @$(call pkg_size_before,$(TARGET_DIR)) @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) -- 2.25.1 From giulio.benetti at benettiengineering.com Sat Jan 22 18:21:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 22 Jan 2022 19:21:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: bump version to 2.6.1 In-Reply-To: References: Message-ID: <2DE5F820-FFD4-4E75-9566-25B881883586@benettiengineering.com> Hi Petr, > Il giorno 22 gen 2022, alle ore 19:11, Petr Vorel ha scritto: > > ?Hi all, > > note this version does not support NFSv2 any more. > Does it need to be mentioned to the commit message? Yes, it?s a very good idea. I would also add a note in Config.in help section listing the supported NFS versions available. Can you do that and send a v2 patch? Thank you! ?- Giulio Benetti Benetti Engineering sas > I didn't add it, because even NFSv3 is quite old (and I recommend to use > NFSv4.2). > > Kind regards, > Petr > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From petr.vorel at gmail.com Sat Jan 22 18:50:48 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 19:50:48 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1 Message-ID: <20220122185049.1194-1-petr.vorel@gmail.com> This version dropped support to NFSv2. Drop patches backported from this release. Signed-off-by: Petr Vorel --- Changes v1->v2: * note dropped NFSv2 support ...nfsdcltrack-sqlite-Fix-printf-format.patch | 52 --------------- ...rack-nfsdcltrack.c-Fix-printf-format.patch | 48 -------------- ...track-Use-uint64_t-instead-of-time_t.patch | 66 ------------------- package/nfs-utils/nfs-utils.hash | 4 +- package/nfs-utils/nfs-utils.mk | 2 +- 5 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch delete mode 100644 package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch delete mode 100644 package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch deleted file mode 100644 index 14894602c4..0000000000 --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:44 +0000 -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format - -sqlite.c: In function 'sqlite_remove_unreclaimed': -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", - | ~~^ - | | - | long int - | %lld - 548 | grace_start); - | ~~~~~~~~~~~ - | | - | time_t {aka long long int} - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/sqlite.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index f79aebb3..cea4a411 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) - int ret; - char *err = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, - grace_start); - if (ret < 0) { - return ret; --- -2.25.1 - diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch deleted file mode 100644 index 0893959460..0000000000 --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:45 +0000 -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format - -nfsdcltrack.c: In function 'cltrack_gracedone': -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); - | ~~^ ~~~~~~~~~ - | | | - | long int time_t {aka long long int} - | %lld - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index e926f1c0..0b37c094 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) - if (*tail) - return -EINVAL; - -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); - - ret = sqlite_remove_unreclaimed(gracetime); - --- -2.25.1 - diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch deleted file mode 100644 index 384f4fd806..0000000000 --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Tue, 27 Jul 2021 21:12:17 -0400 -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t - -With recent commits (4f2a5b64,5a53426c) that fixed -compile errors on x86_64 machines, caused similar -errors on i686 machines. - -The variable type that was being used was a time_t, -which changes size between architects, which -caused the compile error. - -Changing the variable to uint64_t fixed the issue. - -Signed-off-by: Steve Dickson -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 -Signed-off-by: Petr Vorel ---- - utils/nfsdcltrack/nfsdcltrack.c | 2 +- - utils/nfsdcltrack/sqlite.c | 2 +- - utils/nfsdcltrack/sqlite.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index 0b37c094..7c1c4bcc 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) - { - int ret; - char *tail; -- time_t gracetime; -+ uint64_t gracetime; - - - ret = sqlite_prepare_dbh(storagedir); -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index cea4a411..cf0c6a45 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -540,7 +540,7 @@ out_err: - * remove any client records that were not reclaimed since grace_start. - */ - int --sqlite_remove_unreclaimed(time_t grace_start) -+sqlite_remove_unreclaimed(uint64_t grace_start) - { - int ret; - char *err = NULL; -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h -index 06e7c044..ba8cdfa8 100644 ---- a/utils/nfsdcltrack/sqlite.h -+++ b/utils/nfsdcltrack/sqlite.h -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); - int sqlite_check_client(const unsigned char *clname, const size_t namelen, - const bool has_session); --int sqlite_remove_unreclaimed(const time_t grace_start); -+int sqlite_remove_unreclaimed(const uint64_t grace_start); - int sqlite_query_reclaiming(const time_t grace_start); - - #endif /* _SQLITE_H */ --- -2.32.0 - diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 2073bebd8a..a73bf80e70 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 07b44b5a93..6a3a801359 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.5.4 +NFS_UTILS_VERSION = 2.6.1 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ -- 2.34.1 From petr.vorel at gmail.com Sat Jan 22 18:50:49 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 19:50:49 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions In-Reply-To: <20220122185049.1194-1-petr.vorel@gmail.com> References: <20220122185049.1194-1-petr.vorel@gmail.com> Message-ID: <20220122185049.1194-2-petr.vorel@gmail.com> Suggested-by: Giulio Benetti Signed-off-by: Petr Vorel --- New in v2 package/nfs-utils/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index df9c12ca44..f00debc420 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -12,6 +12,8 @@ config BR2_PACKAGE_NFS_UTILS help The NFS Linux kernel server. + Supports NFSv3 and optionally NFSv4 (and later). + http://linux-nfs.org/ if BR2_PACKAGE_NFS_UTILS @@ -24,7 +26,7 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4 select BR2_PACKAGE_LVM2 select BR2_PACKAGE_SQLITE help - Enable NFSv4/NFSv4.1 support + Enable NFSv4/NFSv4.1/NFSv4.2 support comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -- 2.34.1 From giulio.benetti at benettiengineering.com Sat Jan 22 19:02:19 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 22 Jan 2022 20:02:19 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions In-Reply-To: <20220122185049.1194-2-petr.vorel@gmail.com> References: <20220122185049.1194-1-petr.vorel@gmail.com> <20220122185049.1194-2-petr.vorel@gmail.com> Message-ID: Hi Petr, On 22/01/22 19:50, Petr Vorel wrote: > Suggested-by: Giulio Benetti > Signed-off-by: Petr Vorel Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti Benetti Engineering sas > --- > New in v2 > > package/nfs-utils/Config.in | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in > index df9c12ca44..f00debc420 100644 > --- a/package/nfs-utils/Config.in > +++ b/package/nfs-utils/Config.in > @@ -12,6 +12,8 @@ config BR2_PACKAGE_NFS_UTILS > help > The NFS Linux kernel server. > > + Supports NFSv3 and optionally NFSv4 (and later). > + > http://linux-nfs.org/ > > if BR2_PACKAGE_NFS_UTILS > @@ -24,7 +26,7 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4 > select BR2_PACKAGE_LVM2 > select BR2_PACKAGE_SQLITE > help > - Enable NFSv4/NFSv4.1 support > + Enable NFSv4/NFSv4.1/NFSv4.2 support > > comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" > depends on BR2_STATIC_LIBS > From yann.morin.1998 at free.fr Sat Jan 22 19:08:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:08:41 +0100 Subject: [Buildroot] [git commit] configs/qemu_aarch64_virt_defconfig: linux.config: enable fb/input support Message-ID: <20220122190259.90DF182A2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5803bbd9002aab836cf0d86c5bf0674e3c1ca819 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Linux config already enabled drm-virtio for graphics output, but not the corresponding virtio-input / evdev drivers for input or the compatibility fb option. Enable them so keyboard/mouse input works and /dev/fb0 is provided. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- board/qemu/aarch64-virt/linux.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/qemu/aarch64-virt/linux.config b/board/qemu/aarch64-virt/linux.config index e3a4a92913..f9763b73b7 100644 --- a/board/qemu/aarch64-virt/linux.config +++ b/board/qemu/aarch64-virt/linux.config @@ -47,6 +47,7 @@ CONFIG_DUMMY=y CONFIG_MACVLAN=y CONFIG_VIRTIO_NET=y CONFIG_NLMON=y +CONFIG_INPUT_EVDEV=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y @@ -56,9 +57,11 @@ CONFIG_TCG_TPM=y CONFIG_TCG_TIS=y CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y +CONFIG_FB=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL031=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_MAILBOX=y From yann.morin.1998 at free.fr Sat Jan 22 19:08:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:08:43 +0100 Subject: [Buildroot] [git commit] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 Message-ID: <20220122190259.993E282A35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e410b4a32c88ab8f0799c276fb02bc2698c8782 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- configs/qemu_aarch64_virt_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 0caf38112d..9fbf293311 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From yann.morin.1998 at free.fr Sat Jan 22 19:08:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:08:38 +0100 Subject: [Buildroot] [git commit] configs/qemu_aarch64_virt_defconfig: don't hard code getty port Message-ID: <20220122190259.880C382972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24307955a2edf9e112ab815c139ceab83b3d4072 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The Linux defconfig both has VT and serial port support, so it makes more sense to run getty on /dev/console instead of hard coding the serial port. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- configs/qemu_aarch64_virt_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index e6b72d8838..0caf38112d 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -4,7 +4,6 @@ BR2_cortex_a53=y # System BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y From yann.morin.1998 at free.fr Sat Jan 22 19:10:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:10:16 +0100 Subject: [Buildroot] [PATCH 1/3] configs/qemu_aarch64_virt_defconfig: don't hard code getty port In-Reply-To: <20220122153714.26991-1-peter@korsgaard.com> References: <20220122153714.26991-1-peter@korsgaard.com> Message-ID: <20220122191016.GA3621364@scaer> Peter, All, On 2022-01-22 16:37 +0100, Peter Korsgaard spake thusly: > The Linux defconfig both has VT and serial port support, so it makes more > sense to run getty on /dev/console instead of hard coding the serial port. > > Signed-off-by: Peter Korsgaard Series of 3 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > configs/qemu_aarch64_virt_defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig > index e6b72d8838..0caf38112d 100644 > --- a/configs/qemu_aarch64_virt_defconfig > +++ b/configs/qemu_aarch64_virt_defconfig > @@ -4,7 +4,6 @@ BR2_cortex_a53=y > > # System > BR2_SYSTEM_DHCP="eth0" > -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 19:13:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:13:46 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1 In-Reply-To: <20220122185049.1194-1-petr.vorel@gmail.com> References: <20220122185049.1194-1-petr.vorel@gmail.com> Message-ID: <20220122191346.GB3621364@scaer> Petr, All, On 2022-01-22 19:50 +0100, Petr Vorel spake thusly: > This version dropped support to NFSv2. > > Drop patches backported from this release. > > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1->v2: > * note dropped NFSv2 support > > ...nfsdcltrack-sqlite-Fix-printf-format.patch | 52 --------------- > ...rack-nfsdcltrack.c-Fix-printf-format.patch | 48 -------------- > ...track-Use-uint64_t-instead-of-time_t.patch | 66 ------------------- > package/nfs-utils/nfs-utils.hash | 4 +- > package/nfs-utils/nfs-utils.mk | 2 +- > 5 files changed, 3 insertions(+), 169 deletions(-) > delete mode 100644 package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > delete mode 100644 package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > delete mode 100644 package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > > diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > deleted file mode 100644 > index 14894602c4..0000000000 > --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 > -From: Petr Vorel > -Date: Thu, 22 Jul 2021 16:15:44 +0000 > -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format > - > -sqlite.c: In function 'sqlite_remove_unreclaimed': > -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] > - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", > - | ~~^ > - | | > - | long int > - | %lld > - 548 | grace_start); > - | ~~~~~~~~~~~ > - | | > - | time_t {aka long long int} > - > -Found in Buildroot riscv32 build. > - > -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log > - > -Signed-off-by: Petr Vorel > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed > -Signed-off-by: Giulio Benetti > ---- > - utils/nfsdcltrack/sqlite.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c > -index f79aebb3..cea4a411 100644 > ---- a/utils/nfsdcltrack/sqlite.c > -+++ b/utils/nfsdcltrack/sqlite.c > -@@ -46,6 +46,7 @@ > - #include > - #include > - #include > -+#include > - #include > - #include > - #include > -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) > - int ret; > - char *err = NULL; > - > -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", > -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, > - grace_start); > - if (ret < 0) { > - return ret; > --- > -2.25.1 > - > diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > deleted file mode 100644 > index 0893959460..0000000000 > --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 > -From: Petr Vorel > -Date: Thu, 22 Jul 2021 16:15:45 +0000 > -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format > - > -nfsdcltrack.c: In function 'cltrack_gracedone': > -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] > - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); > - | ~~^ ~~~~~~~~~ > - | | | > - | long int time_t {aka long long int} > - | %lld > - > -Found in Buildroot riscv32 build. > - > -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log > - > -Signed-off-by: Petr Vorel > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c > -Signed-off-by: Giulio Benetti > ---- > - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c > -index e926f1c0..0b37c094 100644 > ---- a/utils/nfsdcltrack/nfsdcltrack.c > -+++ b/utils/nfsdcltrack/nfsdcltrack.c > -@@ -33,6 +33,7 @@ > - #include > - #include > - #include > -+#include > - #include > - #include > - #include > -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) > - if (*tail) > - return -EINVAL; > - > -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); > -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); > - > - ret = sqlite_remove_unreclaimed(gracetime); > - > --- > -2.25.1 > - > diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > deleted file mode 100644 > index 384f4fd806..0000000000 > --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > +++ /dev/null > @@ -1,66 +0,0 @@ > -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 > -From: Steve Dickson > -Date: Tue, 27 Jul 2021 21:12:17 -0400 > -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t > - > -With recent commits (4f2a5b64,5a53426c) that fixed > -compile errors on x86_64 machines, caused similar > -errors on i686 machines. > - > -The variable type that was being used was a time_t, > -which changes size between architects, which > -caused the compile error. > - > -Changing the variable to uint64_t fixed the issue. > - > -Signed-off-by: Steve Dickson > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 > -Signed-off-by: Petr Vorel > ---- > - utils/nfsdcltrack/nfsdcltrack.c | 2 +- > - utils/nfsdcltrack/sqlite.c | 2 +- > - utils/nfsdcltrack/sqlite.h | 2 +- > - 3 files changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c > -index 0b37c094..7c1c4bcc 100644 > ---- a/utils/nfsdcltrack/nfsdcltrack.c > -+++ b/utils/nfsdcltrack/nfsdcltrack.c > -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) > - { > - int ret; > - char *tail; > -- time_t gracetime; > -+ uint64_t gracetime; > - > - > - ret = sqlite_prepare_dbh(storagedir); > -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c > -index cea4a411..cf0c6a45 100644 > ---- a/utils/nfsdcltrack/sqlite.c > -+++ b/utils/nfsdcltrack/sqlite.c > -@@ -540,7 +540,7 @@ out_err: > - * remove any client records that were not reclaimed since grace_start. > - */ > - int > --sqlite_remove_unreclaimed(time_t grace_start) > -+sqlite_remove_unreclaimed(uint64_t grace_start) > - { > - int ret; > - char *err = NULL; > -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h > -index 06e7c044..ba8cdfa8 100644 > ---- a/utils/nfsdcltrack/sqlite.h > -+++ b/utils/nfsdcltrack/sqlite.h > -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, > - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); > - int sqlite_check_client(const unsigned char *clname, const size_t namelen, > - const bool has_session); > --int sqlite_remove_unreclaimed(const time_t grace_start); > -+int sqlite_remove_unreclaimed(const uint64_t grace_start); > - int sqlite_query_reclaiming(const time_t grace_start); > - > - #endif /* _SQLITE_H */ > --- > -2.32.0 > - > diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash > index 2073bebd8a..a73bf80e70 100644 > --- a/package/nfs-utils/nfs-utils.hash > +++ b/package/nfs-utils/nfs-utils.hash > @@ -1,4 +1,4 @@ > -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc > -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz > +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc > +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz > # Locally computed > sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index 07b44b5a93..6a3a801359 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NFS_UTILS_VERSION = 2.5.4 > +NFS_UTILS_VERSION = 2.6.1 > NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz > NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) > NFS_UTILS_LICENSE = GPL-2.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 19:14:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:14:34 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions In-Reply-To: <20220122185049.1194-2-petr.vorel@gmail.com> References: <20220122185049.1194-1-petr.vorel@gmail.com> <20220122185049.1194-2-petr.vorel@gmail.com> Message-ID: <20220122191434.GC3621364@scaer> Petr, All, On 2022-01-22 19:50 +0100, Petr Vorel spake thusly: > Suggested-by: Giulio Benetti > Signed-off-by: Petr Vorel The commit title was confusing, so I amended it a little, and applied to master, thanks. Regards, Yann E. MORIN. > --- > New in v2 > > package/nfs-utils/Config.in | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in > index df9c12ca44..f00debc420 100644 > --- a/package/nfs-utils/Config.in > +++ b/package/nfs-utils/Config.in > @@ -12,6 +12,8 @@ config BR2_PACKAGE_NFS_UTILS > help > The NFS Linux kernel server. > > + Supports NFSv3 and optionally NFSv4 (and later). > + > http://linux-nfs.org/ > > if BR2_PACKAGE_NFS_UTILS > @@ -24,7 +26,7 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4 > select BR2_PACKAGE_LVM2 > select BR2_PACKAGE_SQLITE > help > - Enable NFSv4/NFSv4.1 support > + Enable NFSv4/NFSv4.1/NFSv4.2 support > > comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" > depends on BR2_STATIC_LIBS > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From petr.vorel at gmail.com Sat Jan 22 19:35:14 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 22 Jan 2022 20:35:14 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/nfs-utils: Update supported versions In-Reply-To: <20220122191434.GC3621364@scaer> References: <20220122185049.1194-1-petr.vorel@gmail.com> <20220122185049.1194-2-petr.vorel@gmail.com> <20220122191434.GC3621364@scaer> Message-ID: > Petr, All, > On 2022-01-22 19:50 +0100, Petr Vorel spake thusly: > > Suggested-by: Giulio Benetti > > Signed-off-by: Petr Vorel > The commit title was confusing, so I amended it a little, and applied > to master, thanks. Yann, thanks a lot for fixing it! Kind regards, Petr > Regards, > Yann E. MORIN. From yann.morin.1998 at free.fr Sat Jan 22 19:11:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:11:56 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: update supported protocol versions in help texts Message-ID: <20220122193531.303D8813B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1945979c8e418063240bc3d3f9c512b878f9acf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Suggested-by: Giulio Benetti Signed-off-by: Petr Vorel Reviewed-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/nfs-utils/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index df9c12ca44..f00debc420 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -12,6 +12,8 @@ config BR2_PACKAGE_NFS_UTILS help The NFS Linux kernel server. + Supports NFSv3 and optionally NFSv4 (and later). + http://linux-nfs.org/ if BR2_PACKAGE_NFS_UTILS @@ -24,7 +26,7 @@ config BR2_PACKAGE_NFS_UTILS_NFSV4 select BR2_PACKAGE_LVM2 select BR2_PACKAGE_SQLITE help - Enable NFSv4/NFSv4.1 support + Enable NFSv4/NFSv4.1/NFSv4.2 support comment "NFSv4/NFSv4.1 support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS From yann.morin.1998 at free.fr Sat Jan 22 19:11:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:11:36 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: bump version to 2.6.1 Message-ID: <20220122193531.26CAD8294C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5039c49d580eaaea493c28c707314a233e40c9fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version dropped support to NFSv2. Drop patches backported from this release. Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- ...0001-nfsdcltrack-sqlite-Fix-printf-format.patch | 52 ----------------- ...sdcltrack-nfsdcltrack.c-Fix-printf-format.patch | 48 ---------------- ...fsdcltrack-Use-uint64_t-instead-of-time_t.patch | 66 ---------------------- package/nfs-utils/nfs-utils.hash | 4 +- package/nfs-utils/nfs-utils.mk | 2 +- 5 files changed, 3 insertions(+), 169 deletions(-) diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch deleted file mode 100644 index 14894602c4..0000000000 --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:44 +0000 -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format - -sqlite.c: In function 'sqlite_remove_unreclaimed': -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", - | ~~^ - | | - | long int - | %lld - 548 | grace_start); - | ~~~~~~~~~~~ - | | - | time_t {aka long long int} - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/sqlite.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index f79aebb3..cea4a411 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) - int ret; - char *err = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, - grace_start); - if (ret < 0) { - return ret; --- -2.25.1 - diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch deleted file mode 100644 index 0893959460..0000000000 --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Thu, 22 Jul 2021 16:15:45 +0000 -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format - -nfsdcltrack.c: In function 'cltrack_gracedone': -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); - | ~~^ ~~~~~~~~~ - | | | - | long int time_t {aka long long int} - | %lld - -Found in Buildroot riscv32 build. - -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log - -Signed-off-by: Petr Vorel -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c -Signed-off-by: Giulio Benetti ---- - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index e926f1c0..0b37c094 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) - if (*tail) - return -EINVAL; - -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); - - ret = sqlite_remove_unreclaimed(gracetime); - --- -2.25.1 - diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch deleted file mode 100644 index 384f4fd806..0000000000 --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Tue, 27 Jul 2021 21:12:17 -0400 -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t - -With recent commits (4f2a5b64,5a53426c) that fixed -compile errors on x86_64 machines, caused similar -errors on i686 machines. - -The variable type that was being used was a time_t, -which changes size between architects, which -caused the compile error. - -Changing the variable to uint64_t fixed the issue. - -Signed-off-by: Steve Dickson -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 -Signed-off-by: Petr Vorel ---- - utils/nfsdcltrack/nfsdcltrack.c | 2 +- - utils/nfsdcltrack/sqlite.c | 2 +- - utils/nfsdcltrack/sqlite.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index 0b37c094..7c1c4bcc 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) - { - int ret; - char *tail; -- time_t gracetime; -+ uint64_t gracetime; - - - ret = sqlite_prepare_dbh(storagedir); -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index cea4a411..cf0c6a45 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -540,7 +540,7 @@ out_err: - * remove any client records that were not reclaimed since grace_start. - */ - int --sqlite_remove_unreclaimed(time_t grace_start) -+sqlite_remove_unreclaimed(uint64_t grace_start) - { - int ret; - char *err = NULL; -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h -index 06e7c044..ba8cdfa8 100644 ---- a/utils/nfsdcltrack/sqlite.h -+++ b/utils/nfsdcltrack/sqlite.h -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); - int sqlite_check_client(const unsigned char *clname, const size_t namelen, - const bool has_session); --int sqlite_remove_unreclaimed(const time_t grace_start); -+int sqlite_remove_unreclaimed(const uint64_t grace_start); - int sqlite_query_reclaiming(const time_t grace_start); - - #endif /* _SQLITE_H */ --- -2.32.0 - diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 2073bebd8a..a73bf80e70 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 07b44b5a93..6a3a801359 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.5.4 +NFS_UTILS_VERSION = 2.6.1 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ From yann.morin.1998 at free.fr Sat Jan 22 19:53:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:53:12 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.4 Message-ID: <20220122194724.60AA78212B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e59579767cacc05c149cc7dbc089652ae5375b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: two spaces in hash file] Signed-off-by: Yann E. MORIN --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1cdfff50c9..09640a903c 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.3 +MESA3D_HEADERS_VERSION = 21.3.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 235a1b55bb..559f21e06a 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-December/000658.html -sha256 ad7f4613ea7c5d08d9fcb5025270199e6ceb9aa99fd72ee572b70342240a8121 mesa-21.3.3.tar.xz -sha512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673 mesa-21.3.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html +sha256 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d mesa-21.3.4.tar.xz +sha512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9 mesa-21.3.4.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index aa365838ab..f49d96025a 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.3 +MESA3D_VERSION = 21.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From yann.morin.1998 at free.fr Sat Jan 22 19:57:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:57:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.4 In-Reply-To: <20220122153441.1377553-1-bernd.kuhls@t-online.de> References: <20220122153441.1377553-1-bernd.kuhls@t-online.de> Message-ID: <20220122195729.GD3621364@scaer> Bernd, All, On 2022-01-22 16:34 +0100, Bernd Kuhls spake thusly: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html > > Signed-off-by: Bernd Kuhls > --- > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > package/mesa3d/mesa3d.hash | 6 +++--- > package/mesa3d/mesa3d.mk | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk > index 1cdfff50c9..09640a903c 100644 > --- a/package/mesa3d-headers/mesa3d-headers.mk > +++ b/package/mesa3d-headers/mesa3d-headers.mk > @@ -12,7 +12,7 @@ endif > > # Not possible to directly refer to mesa3d variables, because of > # first/second expansion trickery... > -MESA3D_HEADERS_VERSION = 21.3.3 > +MESA3D_HEADERS_VERSION = 21.3.4 Do you know why we have patches in mesa3d but not in mesa3d-headers? I would have expected that we would have the same set of patches for both... > MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz > MESA3D_HEADERS_SITE = https://archive.mesa3d.org > MESA3D_HEADERS_DL_SUBDIR = mesa3d > diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash > index 235a1b55bb..0f373e29a6 100644 > --- a/package/mesa3d/mesa3d.hash > +++ b/package/mesa3d/mesa3d.hash > @@ -1,6 +1,6 @@ > -# From https://lists.freedesktop.org/archives/mesa-announce/2021-December/000658.html > -sha256 ad7f4613ea7c5d08d9fcb5025270199e6ceb9aa99fd72ee572b70342240a8121 mesa-21.3.3.tar.xz > -sha512 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673 mesa-21.3.3.tar.xz > +# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html > +sha256 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d mesa-21.3.4.tar.xz > +sha512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9 mesa-21.3.4.tar.xz There were two spaces between hash type and hash, but your update uses a single space, which triggers a check-package warning: $ ./utils/check-package -q package/mesa3d/mesa3d.hash package/mesa3d/mesa3d.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) package/mesa3d/mesa3d.hash:3: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > # License > sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index c4e213088e..0d80813d01 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > # When updating the version, please also update mesa3d-headers > -MESA3D_VERSION = 21.3.3 > +MESA3D_VERSION = 21.3.4 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 19:58:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:58:02 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-vdr-vnsi: bump version to 19.0.3-Matrix Message-ID: <20220122195142.242B48019E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca68aa7bc7c6a822676acb9ea1cb523341b3f51a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 4cd1f7ad6b..e3dc5585d2 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz +sha256 317442cdfd333f47dfe95d05057a682340dd5ba53efc8894e892ee565b8aaece kodi-pvr-vdr-vnsi-19.0.3-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index 65e69d2b23..f0d61d9d2e 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.3-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Sat Jan 22 19:57:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:57:52 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 22.1.1 Message-ID: <20220122195142.1CC45818D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f78f9bff8e432312bbfa85a03e541aec3294aae0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 38121da036..ceafa20e80 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c1cd5c4c1b7bd1c7785ed4d553b76b17dd7e673619a39e0c3070246aa671024 intel-media-22.1.0.tar.gz +sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.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 fd3b22a851..9a2b4a8753 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 = 22.1.0 +INTEL_MEDIADRIVER_VERSION = 22.1.1 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From yann.morin.1998 at free.fr Sat Jan 22 19:58:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:58:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-mediadriver: bump version to 22.1.1 In-Reply-To: <20220122153207.1376790-1-bernd.kuhls@t-online.de> References: <20220122153207.1376790-1-bernd.kuhls@t-online.de> Message-ID: <20220122195840.GE3621364@scaer> Bernd, All, On 2022-01-22 16:32 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 38121da036..ceafa20e80 100644 > --- a/package/intel-mediadriver/intel-mediadriver.hash > +++ b/package/intel-mediadriver/intel-mediadriver.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 6c1cd5c4c1b7bd1c7785ed4d553b76b17dd7e673619a39e0c3070246aa671024 intel-media-22.1.0.tar.gz > +sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.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 99348537bf..d8820379e7 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 = 22.1.0 > +INTEL_MEDIADRIVER_VERSION = 22.1.1 > INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive > INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz > INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 19:59:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 20:59:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-vdr-vnsi: bump version to 19.0.3-Matrix In-Reply-To: <20220122153629.1378404-1-bernd.kuhls@t-online.de> References: <20220122153629.1378404-1-bernd.kuhls@t-online.de> Message-ID: <20220122195905.GF3621364@scaer> Bernd, All, On 2022-01-22 16:36 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 2 +- > package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > index 4cd1f7ad6b..e3dc5585d2 100644 > --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 2471b4c0a22bd3382b7b7e68974d5b6c08a757737086faf82609ebe5dfb5625a kodi-pvr-vdr-vnsi-19.0.2-Matrix.tar.gz > +sha256 317442cdfd333f47dfe95d05057a682340dd5ba53efc8894e892ee565b8aaece kodi-pvr-vdr-vnsi-19.0.3-Matrix.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > index 65e69d2b23..f0d61d9d2e 100644 > --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_PVR_VDR_VNSI_VERSION = 19.0.2-Matrix > +KODI_PVR_VDR_VNSI_VERSION = 19.0.3-Matrix > KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) > KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ > KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 20:00:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 21:00:05 +0100 Subject: [Buildroot] [git commit] package/sdbus-cpp: bump to version 1.1.0 Message-ID: <20220122195614.61939819BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a394c17b79fbdd9d7f441e858e280c2cf225bfd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Sergey Bobrenok Signed-off-by: Yann E. MORIN --- package/sdbus-cpp/sdbus-cpp.hash | 3 ++- package/sdbus-cpp/sdbus-cpp.mk | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index 8b87653dfd..3a0e863a86 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 0fd575ae0f463773dd9141242d1133731e2b780fd6526650ce992ba711d88628 v0.8.3.tar.gz +sha256 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 v1.1.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING +sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 24904ee26f..e0fbc5c856 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,12 +4,12 @@ # ################################################################################ -SDBUS_CPP_VERSION = 0.8.3 +SDBUS_CPP_VERSION = 1.1.0 SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd -SDBUS_CPP_LICENSE = LGPL-2.1+ -SDBUS_CPP_LICENSE_FILES = COPYING +SDBUS_CPP_LICENSE = LGPL-2.1+ with exception (headers) +SDBUS_CPP_LICENSE_FILES = COPYING COPYING-LGPL-Exception $(eval $(cmake-package)) From yann.morin.1998 at free.fr Sat Jan 22 20:03:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 21:03:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdbus-cpp: bump to version 1.1.0 In-Reply-To: <20220122124111.103131-1-bobrofon@gmail.com> References: <20220122124111.103131-1-bobrofon@gmail.com> Message-ID: <20220122200341.GG3621364@scaer> Sergey, All, On 2022-01-22 15:41 +0300, Sergey Bobrenok spake thusly: > Signed-off-by: Sergey Bobrenok > --- > package/sdbus-cpp/sdbus-cpp.hash | 3 ++- > package/sdbus-cpp/sdbus-cpp.mk | 6 +++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash > index 8b87653dfd..3a0e863a86 100644 > --- a/package/sdbus-cpp/sdbus-cpp.hash > +++ b/package/sdbus-cpp/sdbus-cpp.hash > @@ -1,3 +1,4 @@ > # Locally computed: > -sha256 0fd575ae0f463773dd9141242d1133731e2b780fd6526650ce992ba711d88628 v0.8.3.tar.gz > +sha256 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 v1.1.0.tar.gz > sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING > +sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception > diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk > index 24904ee26f..e0fbc5c856 100644 > --- a/package/sdbus-cpp/sdbus-cpp.mk > +++ b/package/sdbus-cpp/sdbus-cpp.mk > @@ -4,12 +4,12 @@ > # > ################################################################################ > > -SDBUS_CPP_VERSION = 0.8.3 > +SDBUS_CPP_VERSION = 1.1.0 > SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz > SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) > SDBUS_CPP_INSTALL_STAGING = YES > SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd > -SDBUS_CPP_LICENSE = LGPL-2.1+ > -SDBUS_CPP_LICENSE_FILES = COPYING > +SDBUS_CPP_LICENSE = LGPL-2.1+ with exception (headers) > +SDBUS_CPP_LICENSE_FILES = COPYING COPYING-LGPL-Exception Thanks for noticing the update in the licensing terms. :-) Applied to master, thanks. Regards, Yann E. MORIN. > $(eval $(cmake-package)) > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 22 21:43:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 22:43:18 +0100 Subject: [Buildroot] [PATCH 1/1] Config.in.legacy: fix typo Message-ID: <20220122214318.136871-1-fontaine.fabrice@gmail.com> Fix typo added by commit 7527324132878f98999539bdd97bd3518747f585: brcmfmac-sdio-firmware-rpi by brcmfmac_sdio-firmware-rpi Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c11cb846fb..62717463df 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -154,7 +154,7 @@ config BR2_PACKAGE_RPI_BT_FIRMWARE select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT help Package rpi-bt-firmware was moved as option to - package brcmfmac-sdio-firmware-rpi. + package brcmfmac_sdio-firmware-rpi. config BR2_PACKAGE_RPI_WIFI_FIRMWARE bool "rpi-wifi-firmware package was renamed" @@ -164,7 +164,7 @@ config BR2_PACKAGE_RPI_WIFI_FIRMWARE select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI help Package rpi-wifi-firmware was moved as option to - package brcmfmac-sdio-firmware-rpi. + package brcmfmac_sdio-firmware-rpi. config BR2_PACKAGE_HOST_GDB_PYTHON bool "GDB Python2 support removed" -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:03:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:03:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/luajit: add LUAJIT_CPE_ID_VENDOR Message-ID: <20220122220334.266735-1-fontaine.fabrice@gmail.com> cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit Signed-off-by: Fabrice Fontaine --- package/luajit/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 7c1b556ff7..cca806309d 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -8,6 +8,7 @@ LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT +LUAJIT_CPE_ID_VENDOR = luajit LUAJIT_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:11:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:11:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: bump to version 3.4.4 Message-ID: <20220122221151.298957-1-fontaine.fabrice@gmail.com> This bump will fix build failure with libkrb5 raised since the addition of the package in commit 6be9913a7eeead7cdac804afc127791ba4b0e69e: management/spnego.c:25:10: fatal error: spnego_mech.h: No such file or directory 25 | #include "spnego_mech.h" | ^~~~~~~~~~~~~~~ https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.4.4 Fixes: - http://autobuild.buildroot.org/results/b4c3dba395327ab6ae28337efb962c99b2d5b922 Signed-off-by: Fabrice Fontaine --- package/ksmbd-tools/ksmbd-tools.hash | 2 +- package/ksmbd-tools/ksmbd-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index ad507bfdb2..d146f36a0e 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz +sha256 f42aec21515e34305bc07e1ce2c4926c87ea7bc8a675ca6d0a453f6b6be34e2b ksmbd-tools-3.4.4.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index b3ffc3e768..b08845b581 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.4.3 +KSMBD_TOOLS_VERSION = 3.4.4 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:23:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:23:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: security bump to version 1.4.64 Message-ID: <20220122222313.303416-1-fontaine.fabrice@gmail.com> Fix CVE-2022-22707: In lighttpd 1.4.46 through 1.4.63, the mod_extforward_Forwarded function of the mod_extforward plugin has a stack-based buffer overflow (4 bytes representing -1), as demonstrated by remote denial of service (daemon crash) in a non-default configuration. The non-default configuration requires handling of the Forwarded header in a somewhat unusual manner. Also, a 32-bit system is much more likely to be affected than a 64-bit system. gdbm, geoip and memcached options have been dropped with https://github.com/lighttpd/lighttpd1.4/commit/86c2d3093686c4f945086c90af9b8a7900925b6b https://www.lighttpd.net/2022/1/19/1.4.64/ Signed-off-by: Fabrice Fontaine --- package/lighttpd/lighttpd.hash | 4 ++-- package/lighttpd/lighttpd.mk | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 7601745fd7..ce026b9b4a 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.63.sha256sum -sha256 2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9 lighttpd-1.4.63.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.64.sha512sum +sha512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 lighttpd-1.4.64.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 5d53767263..f0974dd5b2 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).63 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).64 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -16,8 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ - -Dwith_gdbm=false \ - -Dwith_geoip=false \ -Dwith_gnutls=false \ -Dwith_krb5=false \ -Dwith_ldap=false \ @@ -25,7 +23,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_libunwind=false \ -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ - -Dwith_memcached=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ -- 2.34.1 From yann.morin.1998 at free.fr Sat Jan 22 22:26:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:26:16 +0100 Subject: [Buildroot] [git commit] package/lighttpd: security bump to version 1.4.64 Message-ID: <20220122222619.39A8C8296B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e043719c9747cf3a62780827deae5c08a5c7553f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-22707: In lighttpd 1.4.46 through 1.4.63, the mod_extforward_Forwarded function of the mod_extforward plugin has a stack-based buffer overflow (4 bytes representing -1), as demonstrated by remote denial of service (daemon crash) in a non-default configuration. The non-default configuration requires handling of the Forwarded header in a somewhat unusual manner. Also, a 32-bit system is much more likely to be affected than a 64-bit system. gdbm, geoip and memcached options have been dropped with https://github.com/lighttpd/lighttpd1.4/commit/86c2d3093686c4f945086c90af9b8a7900925b6b https://www.lighttpd.net/2022/1/19/1.4.64/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lighttpd/lighttpd.hash | 4 ++-- package/lighttpd/lighttpd.mk | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 7601745fd7..ce026b9b4a 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.63.sha256sum -sha256 2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9 lighttpd-1.4.63.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.64.sha512sum +sha512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 lighttpd-1.4.64.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 5d53767263..f0974dd5b2 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).63 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).64 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -16,8 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ - -Dwith_gdbm=false \ - -Dwith_geoip=false \ -Dwith_gnutls=false \ -Dwith_krb5=false \ -Dwith_ldap=false \ @@ -25,7 +23,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_libunwind=false \ -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ - -Dwith_memcached=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ From yann.morin.1998 at free.fr Sat Jan 22 22:33:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:33:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: security bump to version 1.4.64 In-Reply-To: <20220122222313.303416-1-fontaine.fabrice@gmail.com> References: <20220122222313.303416-1-fontaine.fabrice@gmail.com> Message-ID: <20220122223357.GI3621364@scaer> Fabrice, All, On 2022-01-22 23:23 +0100, Fabrice Fontaine spake thusly: > Fix CVE-2022-22707: In lighttpd 1.4.46 through 1.4.63, the > mod_extforward_Forwarded function of the mod_extforward plugin has a > stack-based buffer overflow (4 bytes representing -1), as demonstrated > by remote denial of service (daemon crash) in a non-default > configuration. The non-default configuration requires handling of the > Forwarded header in a somewhat unusual manner. Also, a 32-bit system is > much more likely to be affected than a 64-bit system. > > gdbm, geoip and memcached options have been dropped with > https://github.com/lighttpd/lighttpd1.4/commit/86c2d3093686c4f945086c90af9b8a7900925b6b > > https://www.lighttpd.net/2022/1/19/1.4.64/ > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/lighttpd/lighttpd.hash | 4 ++-- > package/lighttpd/lighttpd.mk | 5 +---- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash > index 7601745fd7..ce026b9b4a 100644 > --- a/package/lighttpd/lighttpd.hash > +++ b/package/lighttpd/lighttpd.hash > @@ -1,4 +1,4 @@ > -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.63.sha256sum > -sha256 2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9 lighttpd-1.4.63.tar.xz > +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.64.sha512sum > +sha512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 lighttpd-1.4.64.tar.xz > # Locally calculated > sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING > diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk > index 5d53767263..f0974dd5b2 100644 > --- a/package/lighttpd/lighttpd.mk > +++ b/package/lighttpd/lighttpd.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIGHTTPD_VERSION_MAJOR = 1.4 > -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).63 > +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).64 > LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz > LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x > LIGHTTPD_LICENSE = BSD-3-Clause > @@ -16,8 +16,6 @@ LIGHTTPD_CONF_OPTS = \ > -Dwith_brotli=false \ > -Dwith_dbi=false \ > -Dwith_fam=false \ > - -Dwith_gdbm=false \ > - -Dwith_geoip=false \ > -Dwith_gnutls=false \ > -Dwith_krb5=false \ > -Dwith_ldap=false \ > @@ -25,7 +23,6 @@ LIGHTTPD_CONF_OPTS = \ > -Dwith_libunwind=false \ > -Dwith_maxminddb=false \ > -Dwith_mbedtls=false \ > - -Dwith_memcached=false \ > -Dwith_mysql=false \ > -Dwith_nettle=false \ > -Dwith_nss=false \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 22:35:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:35:13 +0100 Subject: [Buildroot] [git commit] package/ksmbd-tools: bump to version 3.4.4 Message-ID: <20220122222850.BA37182235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbb3e4615851cbd3c3c0ce4a72731347f006dc1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix build failure with libkrb5 raised since the addition of the package in commit 6be9913a7eeead7cdac804afc127791ba4b0e69e: management/spnego.c:25:10: fatal error: spnego_mech.h: No such file or directory 25 | #include "spnego_mech.h" | ^~~~~~~~~~~~~~~ https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.4.4 Fixes: - http://autobuild.buildroot.org/results/b4c3dba395327ab6ae28337efb962c99b2d5b922 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ksmbd-tools/ksmbd-tools.hash | 2 +- package/ksmbd-tools/ksmbd-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index ad507bfdb2..d146f36a0e 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz +sha256 f42aec21515e34305bc07e1ce2c4926c87ea7bc8a675ca6d0a453f6b6be34e2b ksmbd-tools-3.4.4.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index b3ffc3e768..b08845b581 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.4.3 +KSMBD_TOOLS_VERSION = 3.4.4 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sat Jan 22 22:34:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:34:45 +0100 Subject: [Buildroot] [git commit] package/luajit: add LUAJIT_CPE_ID_VENDOR Message-ID: <20220122222850.B09ED82A35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d91f454117fafad219948bf1ea86b0d6e2301f76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/luajit/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 7c1b556ff7..cca806309d 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -8,6 +8,7 @@ LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT +LUAJIT_CPE_ID_VENDOR = luajit LUAJIT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sat Jan 22 22:35:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:35:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/luajit: add LUAJIT_CPE_ID_VENDOR In-Reply-To: <20220122220334.266735-1-fontaine.fabrice@gmail.com> References: <20220122220334.266735-1-fontaine.fabrice@gmail.com> Message-ID: <20220122223547.GJ3621364@scaer> Fabrice, All, On 2022-01-22 23:03 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/luajit/luajit.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk > index 7c1b556ff7..cca806309d 100644 > --- a/package/luajit/luajit.mk > +++ b/package/luajit/luajit.mk > @@ -8,6 +8,7 @@ LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 > LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) > LUAJIT_LICENSE = MIT > LUAJIT_LICENSE_FILES = COPYRIGHT > +LUAJIT_CPE_ID_VENDOR = luajit > > LUAJIT_INSTALL_STAGING = YES > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Jan 22 22:36:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 22 Jan 2022 23:36:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/ksmbd-tools: bump to version 3.4.4 In-Reply-To: <20220122221151.298957-1-fontaine.fabrice@gmail.com> References: <20220122221151.298957-1-fontaine.fabrice@gmail.com> Message-ID: <20220122223607.GK3621364@scaer> Fabrice, All, On 2022-01-22 23:11 +0100, Fabrice Fontaine spake thusly: > This bump will fix build failure with libkrb5 raised since the addition > of the package in commit 6be9913a7eeead7cdac804afc127791ba4b0e69e: > > management/spnego.c:25:10: fatal error: spnego_mech.h: No such file or directory > 25 | #include "spnego_mech.h" > | ^~~~~~~~~~~~~~~ > > https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.4.4 > > Fixes: > - http://autobuild.buildroot.org/results/b4c3dba395327ab6ae28337efb962c99b2d5b922 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ksmbd-tools/ksmbd-tools.hash | 2 +- > package/ksmbd-tools/ksmbd-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash > index ad507bfdb2..d146f36a0e 100644 > --- a/package/ksmbd-tools/ksmbd-tools.hash > +++ b/package/ksmbd-tools/ksmbd-tools.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 bd7218ebfeaa0d6a73c0a4beb9ea506228cd5695c1f8d3f9a9064e2346d52f0a ksmbd-tools-3.4.3.tar.gz > +sha256 f42aec21515e34305bc07e1ce2c4926c87ea7bc8a675ca6d0a453f6b6be34e2b ksmbd-tools-3.4.4.tar.gz > sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING > diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk > index b3ffc3e768..b08845b581 100644 > --- a/package/ksmbd-tools/ksmbd-tools.mk > +++ b/package/ksmbd-tools/ksmbd-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KSMBD_TOOLS_VERSION = 3.4.3 > +KSMBD_TOOLS_VERSION = 3.4.4 > KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) > KSMBD_TOOLS_LICENSE = GPL-2.0+ > KSMBD_TOOLS_LICENSE_FILES = COPYING > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Jan 22 22:35:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:35:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/cereal: bump to version 1.3.1 Message-ID: <20220122223516.306713-1-fontaine.fabrice@gmail.com> - Drop patch (already in version) - Update hash of LICENSE file (license updated to match BSD template: https://github.com/USCiLab/cereal/commit/8291f44e05d3e3ee3c4fc9e088231789b701e17e) - Update indentation in hash file (two spaces) https://github.com/USCiLab/cereal/releases/tag/v1.3.1 Signed-off-by: Fabrice Fontaine --- ...alized-shared_ptr-within-the-archive.patch | 67 ------------------- package/cereal/cereal.hash | 10 +-- package/cereal/cereal.mk | 5 +- 3 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch diff --git a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch b/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch deleted file mode 100644 index 3458ec1b59..0000000000 --- a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f27c12d491955c94583512603bf32c4568f20929 Mon Sep 17 00:00:00 2001 -From: Michael Walz -Date: Tue, 2 Feb 2021 00:50:29 +0100 -Subject: [PATCH] Store a copy of each serialized shared_ptr within the archive - to prevent the shared_ptr to be freed to early. (#667) - -The archives use the memory address pointed by the shared_ptr as a -unique id which must not be reused during lifetime of the archive. -Therefore, the archives stores a copy of it. -This problem was also reported as CVE-2020-11105. - -[Retrieved from: -https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929] -Signed-off-by: Fabrice Fontaine ---- - include/cereal/cereal.hpp | 13 +++++++++++-- - include/cereal/types/memory.hpp | 2 +- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/include/cereal/cereal.hpp b/include/cereal/cereal.hpp -index 99bed9d6..f0d15e8b 100644 ---- a/include/cereal/cereal.hpp -+++ b/include/cereal/cereal.hpp -@@ -369,12 +369,17 @@ namespace cereal - point to the same data. - - @internal -- @param addr The address (see shared_ptr get()) pointed to by the shared pointer -+ @param sharedPointer The shared pointer itself (the adress is taked via get()). -+ The archive takes a copy to prevent the memory location to be freed -+ as long as the address is used as id. This is needed to prevent CVE-2020-11105. - @return A key that uniquely identifies the pointer */ -- inline std::uint32_t registerSharedPointer( void const * addr ) -+ inline std::uint32_t registerSharedPointer(const std::shared_ptr& sharedPointer) - { -+ void const * addr = sharedPointer.get(); -+ - // Handle null pointers by just returning 0 - if(addr == 0) return 0; -+ itsSharedPointerStorage.push_back(sharedPointer); - - auto id = itsSharedPointerMap.find( addr ); - if( id == itsSharedPointerMap.end() ) -@@ -645,6 +650,10 @@ namespace cereal - //! Maps from addresses to pointer ids - std::unordered_map itsSharedPointerMap; - -+ //! Copy of shared pointers used in #itsSharedPointerMap to make sure they are kept alive -+ // during lifetime of itsSharedPointerMap to prevent CVE-2020-11105. -+ std::vector> itsSharedPointerStorage; -+ - //! The id to be given to the next pointer - std::uint32_t itsCurrentPointerId; - -diff --git a/include/cereal/types/memory.hpp b/include/cereal/types/memory.hpp -index 59e9da9b..cac1f334 100644 ---- a/include/cereal/types/memory.hpp -+++ b/include/cereal/types/memory.hpp -@@ -263,7 +263,7 @@ namespace cereal - { - auto & ptr = wrapper.ptr; - -- uint32_t id = ar.registerSharedPointer( ptr.get() ); -+ uint32_t id = ar.registerSharedPointer( ptr ); - ar( CEREAL_NVP_("id", id) ); - - if( id & detail::msb_32bit ) diff --git a/package/cereal/cereal.hash b/package/cereal/cereal.hash index ddaf54e7b4..18889b4d42 100644 --- a/package/cereal/cereal.hash +++ b/package/cereal/cereal.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5 cereal-1.3.0.tar.gz -sha256 18fd7618c44c9fe28b5f54cd19747df3c0472ed33e8507fea571e2acf6e72f34 LICENSE -sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp -sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h -sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt +sha256 65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976 cereal-1.3.1.tar.gz +sha256 58604a126af6a671ea390ee3d5b3e42228aa59b2858fb7af1d5b20b31739ccbb LICENSE +sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp +sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h +sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt diff --git a/package/cereal/cereal.mk b/package/cereal/cereal.mk index 19faa2ac4e..a44f09c743 100644 --- a/package/cereal/cereal.mk +++ b/package/cereal/cereal.mk @@ -4,7 +4,7 @@ # ################################################################################ -CEREAL_VERSION = 1.3.0 +CEREAL_VERSION = 1.3.1 CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) @@ -16,7 +16,4 @@ CEREAL_CONF_OPTS = \ -DTHREAD_SAFE=ON \ -DJUST_INSTALL_CEREAL=ON -# 0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch -CEREAL_IGNORE_CVES += CVE-2020-11105 - $(eval $(cmake-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:44:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:44:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: switch to pcre2 Message-ID: <20220122224410.309822-1-fontaine.fabrice@gmail.com> Switch to pcre2 which is supported since version 1.4.62 and https://github.com/lighttpd/lighttpd1.4/commit/7512d82ca49f1b579819c2974c61de4e3137c70b and enabled by default since version 1.4.64 and https://github.com/lighttpd/lighttpd1.4/commit/750414d3bb6f13c119220e56d0c8123e665dffc5 Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 2 +- package/lighttpd/lighttpd.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9f593a9228..ed674a9227 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -48,7 +48,7 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Enable PCRE support. Needed to support mod_rewrite diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index f0974dd5b2..2a05071209 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -26,6 +26,7 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ + -Dwith_pcre=false \ -Dwith_pgsql=false \ -Dwith_sasl=false \ -Dwith_wolfssl=false \ @@ -65,10 +66,10 @@ LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) -LIGHTTPD_DEPENDENCIES += pcre -LIGHTTPD_CONF_OPTS += -Dwith_pcre=true +LIGHTTPD_DEPENDENCIES += pcre2 +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true else -LIGHTTPD_CONF_OPTS += -Dwith_pcre=false +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 22 22:49:35 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 22 Jan 2022 23:49:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: replace mod_compress by mod_deflate Message-ID: <20220122224935.310100-1-fontaine.fabrice@gmail.com> mod_compress has been subsumed by mod_deflate since version 1.4.56 and https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index ed674a9227..99a09e9766 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -38,13 +38,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB help - Enable zlib support for lighttpd mod_compress. + Enable zlib support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 help - Enable bzip2 support for lighttpd mod_compress. + Enable bzip2 support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" -- 2.34.1 From thomas.petazzoni at bootlin.com Sun Jan 23 07:07:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 23 Jan 2022 07:07:40 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-22 Message-ID: <20220123070745.8D0874040B@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-22 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 60 | 4 | 0 | 64 | 2021.11.x | 14 | 6 | 0 | 20 | master | 101 | 53 | 0 | 154 | Classification of failures by reason for master ----------------------------------------------- frr-8.1 | 7 rtorrent-0.9.8 | 4 rygel-0.40.2 | 4 bluez5_utils-5.63 | 3 qt5webkit-5.212.0-alpha4 | 3 apcupsd-3.14.14 | 2 cryptsetup-2.4.2 | 2 guile-3.0.7 | 2 log4cxx-0.12.0 | 2 mesa3d-21.3.3 | 2 unknown | 2 wavemon-0.9.4 | 2 android-tools-4.2.2+git2013... | 1 bat-0.18.3 | 1 bird-2.0.8 | 1 efl-1.26.0 | 1 file-5.41 | 1 gocryptfs-2.2.0 | 1 hiawatha-11.1 | 1 i2pd-2.40.0 | 1 ksmbd-tools-3.4.3 | 1 kvm-unit-tests-kvm-unit-tes... | 1 mongrel2-1.13.0 | 1 mpv-0.33.1 | 1 nodejs-14.18.3 | 1 powertop-2.13 | 1 qt5base-5.15.2 | 1 resiprocate-1.12.0 | 1 ripgrep-af6b6c543b224d348a8... | 1 vlc-3.0.16 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/0a6f8adfb3039c0c9fd99c61ae9335c86204e592 | sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/84e23aad4a3e13a4e3c8b07b7193d6535f59c1c5 | sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/8ba769e3f6be20b97df09f53b552dbf0d10f0090 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/faa0a158234bb964597e5d162b12afb9e7235049 | mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/fbcedf65e737df700dba9a2d82b55329d90010eb | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/88ee3923c06c9b54784fecac9c3faf54327bf858 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a640a352551806ff7207c17d8a0f9b0d0d7584c5 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a5e186b98e2a9d905f331381de92bbc4ea39c7c9 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/77cc2894c7d3548cb44d2336e093664eb7205cdd | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/aa465580924e321eb3c8c79d62d6de22c41e14ef | x86_64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/7e80d9bf86e33096111895f5ae195dee97112b8c | i586 | file-5.41 | NOK | http://autobuild.buildroot.net/results/0ef268f01541c3ef40d5570a443fec9dbd61c62f | ORPH mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f98ab172d0b62ac2fe9f990c3a22ed5513973887 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/9431a7ec2667c6a50d6cfd2bd9e45e2eab3b2f29 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f968fbfb8c2956aff26f8c10bcf182a9e2ee110e | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4b83d98fa89269e04079af73a6c2bf7d5d3afe72 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1480f602385577c1c18b46c7ca8ad37f04c8c78e | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b59b5d8df58511dd297ebf8852a796e11e0ff765 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/646255d669197b0731189f5249d08b3d6f799038 | i686 | gocryptfs-2.2.0 | NOK | http://autobuild.buildroot.net/results/6c322f7b3236f615d0ca56244ca028c40bbcf2ca | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/4664aeac00cf7ea2bef754a06f1376fdb6683430 | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/b8a07851379d892ab831dd28ceb0a279d5eaffd9 | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/3ef4ef1284d4bd1bfaf516f0879143082da303db | x86_64 | i2pd-2.40.0 | NOK | http://autobuild.buildroot.net/results/733c8f2e0ec561db66559ee461ba3c38df3b614d | arm | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/758390c38868d08facf7bda4b13150986fed59ba | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/cacf3dac9a94c04cdeb627388fda01a4f24e594f | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/41c84dffecb093cb6fc8ccaf79fbb08f499184c8 | powerpc | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/7b396421cd587b7c527e4cce895d094c18e96719 | x86_64 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/9850737277f777d4aa5746164ac20710cf417ad0 | riscv32 | mesa3d-21.3.3 | NOK | http://autobuild.buildroot.net/results/df730ebb102a6da14e3b3c133e383e1f7db47aff | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/623b7c94b8f36cabe08fb7f152edeb8ac318eac4 | powerpc64le | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/51ba392394a98cbe90dfedb0b227ccf57c95d2be | mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/7645900c4a5a184d099063e64aff04fff20e5b49 | or1k | powertop-2.13 | NOK | http://autobuild.buildroot.net/results/35dbc51e5bd6ec25fec1d553e59925bda0340b1e | riscv64 | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/e7c685744b1f1bebb7fec9835bda534a72b7b7c2 | mipsel | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/7664afd0545f4f60a777269ecf0e5232dd126589 | arm | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/24e734291d594933bc89003863333c17c2684479 | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/1e86a2743d840ef2683d02f94c9af39472693332 | arm | resiprocate-1.12.0 | NOK | http://autobuild.buildroot.net/results/e00f28b7c00e5fb71e9cef436c91ed6b2adea043 | ORPH arm | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/40430733edb30a5370bfea9c270c33672231df57 | arm | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/f54ba9169baae8740102b203d8091d0f465fb6e4 | ORPH sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/66a98d8fbc081f7013fb5839d525b4fd07ad0f07 | ORPH powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/1dd0e246b6ea7dc0e232bd98921740fe31f7bcdd | ORPH m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/a3d9078a0e139ef03a700ef4c8b0ca8bdeed516b | ORPH powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/99175e25fde107668c0e13fa34ac9c875b2477bb | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c9d53823e696be079d54f1ec736606bf336fdc58 | microblazeel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/481f477e81dc8c7d36ce810803d2ba1ccb0eca6a | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7ed9dd22399ed7c4cf03027343baf3ad52c3cb84 | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/edaf3348d4cf28b7aa43084f92d51c1d381ec0c6 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/e32b11f232a58a977093a23da1f4a2ff072c29b7 | arc | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/843709019c8ed7d280de9818b38649f480f14984 | s390x | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/50f90e8dd634bd295c51dcf11e85129f40339db2 | sparc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/9e5c93f198ed84d4d4b08ff00c1cac2a79e10860 | Classification of failures by reason for 2021.02.x -------------------------------------------------- gensio-2.2.3 | 1 kismet-2020-12-R3 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/058ed8e9d50d1ce27b32a2b2148b22f0f6be4ecf | arm | kismet-2020-12-R3 | NOK | http://autobuild.buildroot.net/results/5d5cdeba409da4195953af8943524865030637d5 | ORPH or1k | unknown | NOK | http://autobuild.buildroot.net/results/2f53e3c29709406670df21c48347d20ac5ff99c9 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/f399b238ff5bcf0ee0bf4d1d89ecd15c60867ddf | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 3 log4cxx-0.12.0 | 1 rtorrent-0.9.8 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/3cfc0d6099af195822db9c75ba7396b87ca759ec | arm | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/2b1f0ae9f8d1b90f326f88b9ff1c9c88eaa0c5d0 | nios2 | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/e48e05026a6f96ea34f4c0b1fd2b6ac9d1fca2b5 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/fef786fbc6f7235425faf6d84ebd546171f18f41 | riscv32 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/43fb1c983d29929f217fdd65458d3c06c65883be | ORPH or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/09550611052bbee402c81ee7ec9283753aa0f6ca | -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Sun Jan 23 08:32:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 09:32:17 +0100 Subject: [Buildroot] [git commit] package/lighttpd: switch to pcre2 Message-ID: <20220123083029.8E74E82946@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=694189ffa3cddd811620f77e19de9a73a24cd09e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to pcre2 which is supported since version 1.4.62 and https://github.com/lighttpd/lighttpd1.4/commit/7512d82ca49f1b579819c2974c61de4e3137c70b and enabled by default since version 1.4.64 and https://github.com/lighttpd/lighttpd1.4/commit/750414d3bb6f13c119220e56d0c8123e665dffc5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lighttpd/Config.in | 2 +- package/lighttpd/lighttpd.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9f593a9228..ed674a9227 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -48,7 +48,7 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Enable PCRE support. Needed to support mod_rewrite diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index f0974dd5b2..2a05071209 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -26,6 +26,7 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_mysql=false \ -Dwith_nettle=false \ -Dwith_nss=false \ + -Dwith_pcre=false \ -Dwith_pgsql=false \ -Dwith_sasl=false \ -Dwith_wolfssl=false \ @@ -65,10 +66,10 @@ LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) -LIGHTTPD_DEPENDENCIES += pcre -LIGHTTPD_CONF_OPTS += -Dwith_pcre=true +LIGHTTPD_DEPENDENCIES += pcre2 +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true else -LIGHTTPD_CONF_OPTS += -Dwith_pcre=false +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) From yann.morin.1998 at free.fr Sun Jan 23 08:32:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 09:32:19 +0100 Subject: [Buildroot] [git commit] package/lighttpd: replace mod_compress by mod_deflate Message-ID: <20220123083029.9725382A38@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=653dc2e710534494ea41c68c22a279cf8736b125 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master mod_compress has been subsumed by mod_deflate since version 1.4.56 and https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lighttpd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index ed674a9227..99a09e9766 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -38,13 +38,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB help - Enable zlib support for lighttpd mod_compress. + Enable zlib support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 help - Enable bzip2 support for lighttpd mod_compress. + Enable bzip2 support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" From yann.morin.1998 at free.fr Sun Jan 23 08:39:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 09:39:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: switch to pcre2 In-Reply-To: <20220122224410.309822-1-fontaine.fabrice@gmail.com> References: <20220122224410.309822-1-fontaine.fabrice@gmail.com> Message-ID: <20220123083935.GL3621364@scaer> Fabrice, All, On 2022-01-22 23:44 +0100, Fabrice Fontaine spake thusly: > Switch to pcre2 which is supported since version 1.4.62 and > https://github.com/lighttpd/lighttpd1.4/commit/7512d82ca49f1b579819c2974c61de4e3137c70b > and enabled by default since version 1.4.64 and > https://github.com/lighttpd/lighttpd1.4/commit/750414d3bb6f13c119220e56d0c8123e665dffc5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/lighttpd/Config.in | 2 +- > package/lighttpd/lighttpd.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in > index 9f593a9228..ed674a9227 100644 > --- a/package/lighttpd/Config.in > +++ b/package/lighttpd/Config.in > @@ -48,7 +48,7 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 > > config BR2_PACKAGE_LIGHTTPD_PCRE > bool "pcre support" > - select BR2_PACKAGE_PCRE > + select BR2_PACKAGE_PCRE2 > help > Enable PCRE support. Needed to support mod_rewrite > > diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk > index f0974dd5b2..2a05071209 100644 > --- a/package/lighttpd/lighttpd.mk > +++ b/package/lighttpd/lighttpd.mk > @@ -26,6 +26,7 @@ LIGHTTPD_CONF_OPTS = \ > -Dwith_mysql=false \ > -Dwith_nettle=false \ > -Dwith_nss=false \ > + -Dwith_pcre=false \ > -Dwith_pgsql=false \ > -Dwith_sasl=false \ > -Dwith_wolfssl=false \ > @@ -65,10 +66,10 @@ LIGHTTPD_CONF_OPTS += -Dwith_bzip=false > endif > > ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) > -LIGHTTPD_DEPENDENCIES += pcre > -LIGHTTPD_CONF_OPTS += -Dwith_pcre=true > +LIGHTTPD_DEPENDENCIES += pcre2 > +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true > else > -LIGHTTPD_CONF_OPTS += -Dwith_pcre=false > +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false > endif > > ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 08:39:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 09:39:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: replace mod_compress by mod_deflate In-Reply-To: <20220122224935.310100-1-fontaine.fabrice@gmail.com> References: <20220122224935.310100-1-fontaine.fabrice@gmail.com> Message-ID: <20220123083948.GM3621364@scaer> Fabrice, All, On 2022-01-22 23:49 +0100, Fabrice Fontaine spake thusly: > mod_compress has been subsumed by mod_deflate since version 1.4.56 and > https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/lighttpd/Config.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in > index ed674a9227..99a09e9766 100644 > --- a/package/lighttpd/Config.in > +++ b/package/lighttpd/Config.in > @@ -38,13 +38,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB > bool "zlib support" > select BR2_PACKAGE_ZLIB > help > - Enable zlib support for lighttpd mod_compress. > + Enable zlib support for lighttpd mod_deflate. > > config BR2_PACKAGE_LIGHTTPD_BZIP2 > bool "bzip2 support" > select BR2_PACKAGE_BZIP2 > help > - Enable bzip2 support for lighttpd mod_compress. > + Enable bzip2 support for lighttpd mod_deflate. > > config BR2_PACKAGE_LIGHTTPD_PCRE > bool "pcre support" > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 09:11:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 10:11:06 +0100 Subject: [Buildroot] [git commit] package/cereal: bump to version 1.3.1 Message-ID: <20220123090507.7B65B81393@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d824fc1145de69ef00415232668f6f1efe814668 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (already in version) - Update hash of LICENSE file (license updated to match BSD template: https://github.com/USCiLab/cereal/commit/8291f44e05d3e3ee3c4fc9e088231789b701e17e) - Update indentation in hash file (two spaces) https://github.com/USCiLab/cereal/releases/tag/v1.3.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-serialized-shared_ptr-within-the-archive.patch | 67 ---------------------- package/cereal/cereal.hash | 10 ++-- package/cereal/cereal.mk | 5 +- 3 files changed, 6 insertions(+), 76 deletions(-) diff --git a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch b/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch deleted file mode 100644 index 3458ec1b59..0000000000 --- a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f27c12d491955c94583512603bf32c4568f20929 Mon Sep 17 00:00:00 2001 -From: Michael Walz -Date: Tue, 2 Feb 2021 00:50:29 +0100 -Subject: [PATCH] Store a copy of each serialized shared_ptr within the archive - to prevent the shared_ptr to be freed to early. (#667) - -The archives use the memory address pointed by the shared_ptr as a -unique id which must not be reused during lifetime of the archive. -Therefore, the archives stores a copy of it. -This problem was also reported as CVE-2020-11105. - -[Retrieved from: -https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929] -Signed-off-by: Fabrice Fontaine ---- - include/cereal/cereal.hpp | 13 +++++++++++-- - include/cereal/types/memory.hpp | 2 +- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/include/cereal/cereal.hpp b/include/cereal/cereal.hpp -index 99bed9d6..f0d15e8b 100644 ---- a/include/cereal/cereal.hpp -+++ b/include/cereal/cereal.hpp -@@ -369,12 +369,17 @@ namespace cereal - point to the same data. - - @internal -- @param addr The address (see shared_ptr get()) pointed to by the shared pointer -+ @param sharedPointer The shared pointer itself (the adress is taked via get()). -+ The archive takes a copy to prevent the memory location to be freed -+ as long as the address is used as id. This is needed to prevent CVE-2020-11105. - @return A key that uniquely identifies the pointer */ -- inline std::uint32_t registerSharedPointer( void const * addr ) -+ inline std::uint32_t registerSharedPointer(const std::shared_ptr& sharedPointer) - { -+ void const * addr = sharedPointer.get(); -+ - // Handle null pointers by just returning 0 - if(addr == 0) return 0; -+ itsSharedPointerStorage.push_back(sharedPointer); - - auto id = itsSharedPointerMap.find( addr ); - if( id == itsSharedPointerMap.end() ) -@@ -645,6 +650,10 @@ namespace cereal - //! Maps from addresses to pointer ids - std::unordered_map itsSharedPointerMap; - -+ //! Copy of shared pointers used in #itsSharedPointerMap to make sure they are kept alive -+ // during lifetime of itsSharedPointerMap to prevent CVE-2020-11105. -+ std::vector> itsSharedPointerStorage; -+ - //! The id to be given to the next pointer - std::uint32_t itsCurrentPointerId; - -diff --git a/include/cereal/types/memory.hpp b/include/cereal/types/memory.hpp -index 59e9da9b..cac1f334 100644 ---- a/include/cereal/types/memory.hpp -+++ b/include/cereal/types/memory.hpp -@@ -263,7 +263,7 @@ namespace cereal - { - auto & ptr = wrapper.ptr; - -- uint32_t id = ar.registerSharedPointer( ptr.get() ); -+ uint32_t id = ar.registerSharedPointer( ptr ); - ar( CEREAL_NVP_("id", id) ); - - if( id & detail::msb_32bit ) diff --git a/package/cereal/cereal.hash b/package/cereal/cereal.hash index ddaf54e7b4..18889b4d42 100644 --- a/package/cereal/cereal.hash +++ b/package/cereal/cereal.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5 cereal-1.3.0.tar.gz -sha256 18fd7618c44c9fe28b5f54cd19747df3c0472ed33e8507fea571e2acf6e72f34 LICENSE -sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp -sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h -sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt +sha256 65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976 cereal-1.3.1.tar.gz +sha256 58604a126af6a671ea390ee3d5b3e42228aa59b2858fb7af1d5b20b31739ccbb LICENSE +sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp +sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h +sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt diff --git a/package/cereal/cereal.mk b/package/cereal/cereal.mk index 19faa2ac4e..a44f09c743 100644 --- a/package/cereal/cereal.mk +++ b/package/cereal/cereal.mk @@ -4,7 +4,7 @@ # ################################################################################ -CEREAL_VERSION = 1.3.0 +CEREAL_VERSION = 1.3.1 CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) @@ -16,7 +16,4 @@ CEREAL_CONF_OPTS = \ -DTHREAD_SAFE=ON \ -DJUST_INSTALL_CEREAL=ON -# 0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch -CEREAL_IGNORE_CVES += CVE-2020-11105 - $(eval $(cmake-package)) From yann.morin.1998 at free.fr Sun Jan 23 09:11:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 10:11:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/cereal: bump to version 1.3.1 In-Reply-To: <20220122223516.306713-1-fontaine.fabrice@gmail.com> References: <20220122223516.306713-1-fontaine.fabrice@gmail.com> Message-ID: <20220123091149.GA2502@scaer> Fabrice, All, On 2022-01-22 23:35 +0100, Fabrice Fontaine spake thusly: > - Drop patch (already in version) > - Update hash of LICENSE file (license updated to match BSD template: > https://github.com/USCiLab/cereal/commit/8291f44e05d3e3ee3c4fc9e088231789b701e17e) > - Update indentation in hash file (two spaces) > > https://github.com/USCiLab/cereal/releases/tag/v1.3.1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...alized-shared_ptr-within-the-archive.patch | 67 ------------------- > package/cereal/cereal.hash | 10 +-- > package/cereal/cereal.mk | 5 +- > 3 files changed, 6 insertions(+), 76 deletions(-) > delete mode 100644 package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch > > diff --git a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch b/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch > deleted file mode 100644 > index 3458ec1b59..0000000000 > --- a/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch > +++ /dev/null > @@ -1,67 +0,0 @@ > -From f27c12d491955c94583512603bf32c4568f20929 Mon Sep 17 00:00:00 2001 > -From: Michael Walz > -Date: Tue, 2 Feb 2021 00:50:29 +0100 > -Subject: [PATCH] Store a copy of each serialized shared_ptr within the archive > - to prevent the shared_ptr to be freed to early. (#667) > - > -The archives use the memory address pointed by the shared_ptr as a > -unique id which must not be reused during lifetime of the archive. > -Therefore, the archives stores a copy of it. > -This problem was also reported as CVE-2020-11105. > - > -[Retrieved from: > -https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929] > -Signed-off-by: Fabrice Fontaine > ---- > - include/cereal/cereal.hpp | 13 +++++++++++-- > - include/cereal/types/memory.hpp | 2 +- > - 2 files changed, 12 insertions(+), 3 deletions(-) > - > -diff --git a/include/cereal/cereal.hpp b/include/cereal/cereal.hpp > -index 99bed9d6..f0d15e8b 100644 > ---- a/include/cereal/cereal.hpp > -+++ b/include/cereal/cereal.hpp > -@@ -369,12 +369,17 @@ namespace cereal > - point to the same data. > - > - @internal > -- @param addr The address (see shared_ptr get()) pointed to by the shared pointer > -+ @param sharedPointer The shared pointer itself (the adress is taked via get()). > -+ The archive takes a copy to prevent the memory location to be freed > -+ as long as the address is used as id. This is needed to prevent CVE-2020-11105. > - @return A key that uniquely identifies the pointer */ > -- inline std::uint32_t registerSharedPointer( void const * addr ) > -+ inline std::uint32_t registerSharedPointer(const std::shared_ptr& sharedPointer) > - { > -+ void const * addr = sharedPointer.get(); > -+ > - // Handle null pointers by just returning 0 > - if(addr == 0) return 0; > -+ itsSharedPointerStorage.push_back(sharedPointer); > - > - auto id = itsSharedPointerMap.find( addr ); > - if( id == itsSharedPointerMap.end() ) > -@@ -645,6 +650,10 @@ namespace cereal > - //! Maps from addresses to pointer ids > - std::unordered_map itsSharedPointerMap; > - > -+ //! Copy of shared pointers used in #itsSharedPointerMap to make sure they are kept alive > -+ // during lifetime of itsSharedPointerMap to prevent CVE-2020-11105. > -+ std::vector> itsSharedPointerStorage; > -+ > - //! The id to be given to the next pointer > - std::uint32_t itsCurrentPointerId; > - > -diff --git a/include/cereal/types/memory.hpp b/include/cereal/types/memory.hpp > -index 59e9da9b..cac1f334 100644 > ---- a/include/cereal/types/memory.hpp > -+++ b/include/cereal/types/memory.hpp > -@@ -263,7 +263,7 @@ namespace cereal > - { > - auto & ptr = wrapper.ptr; > - > -- uint32_t id = ar.registerSharedPointer( ptr.get() ); > -+ uint32_t id = ar.registerSharedPointer( ptr ); > - ar( CEREAL_NVP_("id", id) ); > - > - if( id & detail::msb_32bit ) > diff --git a/package/cereal/cereal.hash b/package/cereal/cereal.hash > index ddaf54e7b4..18889b4d42 100644 > --- a/package/cereal/cereal.hash > +++ b/package/cereal/cereal.hash > @@ -1,6 +1,6 @@ > # Locally computed > -sha256 329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5 cereal-1.3.0.tar.gz > -sha256 18fd7618c44c9fe28b5f54cd19747df3c0472ed33e8507fea571e2acf6e72f34 LICENSE > -sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp > -sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h > -sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt > +sha256 65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976 cereal-1.3.1.tar.gz > +sha256 58604a126af6a671ea390ee3d5b3e42228aa59b2858fb7af1d5b20b31739ccbb LICENSE > +sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp > +sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h > +sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt > diff --git a/package/cereal/cereal.mk b/package/cereal/cereal.mk > index 19faa2ac4e..a44f09c743 100644 > --- a/package/cereal/cereal.mk > +++ b/package/cereal/cereal.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CEREAL_VERSION = 1.3.0 > +CEREAL_VERSION = 1.3.1 > CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) > # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 > CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) > @@ -16,7 +16,4 @@ CEREAL_CONF_OPTS = \ > -DTHREAD_SAFE=ON \ > -DJUST_INSTALL_CEREAL=ON > > -# 0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch > -CEREAL_IGNORE_CVES += CVE-2020-11105 > - > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Jan 23 09:48:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:45 +0100 Subject: [Buildroot] [PATCH 1/6] package/lighttpd: reorder alphabetically options Message-ID: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 99a09e9766..59c1e0b2a6 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,18 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BZIP2 + bool "bzip2 support" + select BR2_PACKAGE_BZIP2 + help + Enable bzip2 support for lighttpd mod_deflate. + +config BR2_PACKAGE_LIGHTTPD_LUA + bool "lua support" + depends on BR2_PACKAGE_LUA + help + Enable Lua support. Needed to support mod_magnet + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL @@ -34,18 +46,6 @@ config BR2_PACKAGE_LIGHTTPD_PAM help Enable PAM authentication support for lighttpd. -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_deflate. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_deflate. - config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" select BR2_PACKAGE_PCRE2 @@ -59,10 +59,10 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA +config BR2_PACKAGE_LIGHTTPD_ZLIB + bool "zlib support" + select BR2_PACKAGE_ZLIB help - Enable Lua support. Needed to support mod_magnet + Enable zlib support for lighttpd mod_deflate. endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 2a05071209..bdbf75191c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -37,6 +37,20 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) +LIGHTTPD_DEPENDENCIES += bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +else +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) +LIGHTTPD_DEPENDENCIES += lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true +else +LIGHTTPD_CONF_OPTS += -Dwith_lua=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true @@ -51,20 +65,6 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true -else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false -endif - ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_DEPENDENCIES += pcre2 LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true @@ -85,11 +85,11 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += -Dwith_lua=true +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) +LIGHTTPD_DEPENDENCIES += zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += -Dwith_lua=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif define LIGHTTPD_INSTALL_CONFIG -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:46 +0100 Subject: [Buildroot] [PATCH 2/6] package/lighttpd: add zstd support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-2-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 59c1e0b2a6..05a7c84961 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -65,4 +65,10 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB help Enable zlib support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_ZSTD + bool "zstd support" + select BR2_PACKAGE_ZSTD + help + Enable zstd support for lighttpd mod_deflate. + endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index bdbf75191c..4f05db4e29 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -32,7 +32,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ -Dwith_xxhash=true \ - -Dwith_zstd=false \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd @@ -92,6 +91,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) +LIGHTTPD_DEPENDENCIES += zstd +LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +else +LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +endif + define LIGHTTPD_INSTALL_CONFIG $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:47 +0100 Subject: [Buildroot] [PATCH 3/6] package/lighttpd: add brotli support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-3-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- ...uild-meson-fix-typo-in-variable-name.patch | 25 +++++++++++++++++++ package/lighttpd/Config.in | 6 +++++ package/lighttpd/lighttpd.mk | 8 +++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch diff --git a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch new file mode 100644 index 0000000000..d338979d46 --- /dev/null +++ b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch @@ -0,0 +1,25 @@ +From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Thu, 20 Jan 2022 07:04:51 -0500 +Subject: [PATCH] [build] meson: fix typo in variable name + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] +Signed-off-by: Fabrice Fontaine +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 4ee163468..b35c1037f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -266,7 +266,7 @@ endif + libbrotli = [] + if get_option('with_brotli') + libbrotli = [ compiler.find_library('brotlienc') ] +- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include ') ++ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include ') + conf_data.set('HAVE_BROTLI_ENCODE_H', true) + conf_data.set('HAVE_BROTLI', true) + else diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 05a7c84961..f3e252d850 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,12 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BROTLI + bool "brotli support" + select BR2_PACKAGE_BROTLI + help + Enable brotli support for lighttpd mod_deflate. + config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 4f05db4e29..22db1a7348 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -13,7 +13,6 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ @@ -36,6 +35,13 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) +LIGHTTPD_DEPENDENCIES += brotli +LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +else +LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:48 +0100 Subject: [Buildroot] [PATCH 4/6] package/lighttpd: add maxminddb support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-4-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index f3e252d850..9a262dbe93 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,12 @@ config BR2_PACKAGE_LIGHTTPD_LUA help Enable Lua support. Needed to support mod_magnet +config BR2_PACKAGE_LIGHTTPD_MAXMINDDB + bool "maxminddb support" + select BR2_PACKAGE_LIBMAXMINDDB + help + Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 22db1a7348..b2e06c77a1 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -20,7 +20,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ - -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ @@ -56,6 +55,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_lua=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) +LIGHTTPD_DEPENDENCIES += libmaxminddb +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +else +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:49 +0100 Subject: [Buildroot] [PATCH 5/6] package/lighttpd: add krb5 support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-5-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9a262dbe93..595c50c978 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -33,6 +33,12 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 help Enable bzip2 support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_KRB5 + bool "krb5 support" + select BR2_PACKAGE_LIBKRB5 + help + Enable Kerberos5 support for lighttpd mod_auth. + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index b2e06c77a1..a25bb0bfcb 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_krb5=false \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ @@ -48,6 +47,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) +LIGHTTPD_DEPENDENCIES += libkrb5 +LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +else +LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:48:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:48:50 +0100 Subject: [Buildroot] [PATCH 6/6] package/lighttpd: add ldap support In-Reply-To: <20220123094850.491817-1-fontaine.fabrice@gmail.com> References: <20220123094850.491817-1-fontaine.fabrice@gmail.com> Message-ID: <20220123094850.491817-6-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 595c50c978..6425478a94 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,16 @@ config BR2_PACKAGE_LIGHTTPD_KRB5 help Enable Kerberos5 support for lighttpd mod_auth. +config BR2_PACKAGE_LIGHTTPD_LDAP + bool "ldap support" + depends on BR2_USE_MMU # openldap + select BR2_PACKAGE_OPENLDAP + help + Enable LDAP support for lighttpd mod_auth mod_vhostdb_ldap. + +comment "ldap support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index a25bb0bfcb..f8ed7c6f7c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ @@ -54,6 +53,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_krb5=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) +LIGHTTPD_DEPENDENCIES += openldap +LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +else +LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:52 +0100 Subject: [Buildroot] [PATCH v2, 1/6] package/lighttpd: reorder alphabetically options Message-ID: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 99a09e9766..59c1e0b2a6 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,18 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BZIP2 + bool "bzip2 support" + select BR2_PACKAGE_BZIP2 + help + Enable bzip2 support for lighttpd mod_deflate. + +config BR2_PACKAGE_LIGHTTPD_LUA + bool "lua support" + depends on BR2_PACKAGE_LUA + help + Enable Lua support. Needed to support mod_magnet + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL @@ -34,18 +46,6 @@ config BR2_PACKAGE_LIGHTTPD_PAM help Enable PAM authentication support for lighttpd. -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_deflate. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_deflate. - config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" select BR2_PACKAGE_PCRE2 @@ -59,10 +59,10 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA +config BR2_PACKAGE_LIGHTTPD_ZLIB + bool "zlib support" + select BR2_PACKAGE_ZLIB help - Enable Lua support. Needed to support mod_magnet + Enable zlib support for lighttpd mod_deflate. endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 2a05071209..bdbf75191c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -37,6 +37,20 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) +LIGHTTPD_DEPENDENCIES += bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +else +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) +LIGHTTPD_DEPENDENCIES += lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true +else +LIGHTTPD_CONF_OPTS += -Dwith_lua=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true @@ -51,20 +65,6 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true -else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false -endif - ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_DEPENDENCIES += pcre2 LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true @@ -85,11 +85,11 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += -Dwith_lua=true +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) +LIGHTTPD_DEPENDENCIES += zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += -Dwith_lua=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif define LIGHTTPD_INSTALL_CONFIG -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:53 +0100 Subject: [Buildroot] [PATCH v2,2/6] package/lighttpd: add zstd support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-2-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 59c1e0b2a6..05a7c84961 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -65,4 +65,10 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB help Enable zlib support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_ZSTD + bool "zstd support" + select BR2_PACKAGE_ZSTD + help + Enable zstd support for lighttpd mod_deflate. + endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index bdbf75191c..4f05db4e29 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -32,7 +32,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ -Dwith_xxhash=true \ - -Dwith_zstd=false \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd @@ -92,6 +91,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) +LIGHTTPD_DEPENDENCIES += zstd +LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +else +LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +endif + define LIGHTTPD_INSTALL_CONFIG $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:54 +0100 Subject: [Buildroot] [PATCH v2,3/6] package/lighttpd: add brotli support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-3-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- ...uild-meson-fix-typo-in-variable-name.patch | 25 +++++++++++++++++++ package/lighttpd/Config.in | 6 +++++ package/lighttpd/lighttpd.mk | 8 +++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch diff --git a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch new file mode 100644 index 0000000000..d338979d46 --- /dev/null +++ b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch @@ -0,0 +1,25 @@ +From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Thu, 20 Jan 2022 07:04:51 -0500 +Subject: [PATCH] [build] meson: fix typo in variable name + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] +Signed-off-by: Fabrice Fontaine +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 4ee163468..b35c1037f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -266,7 +266,7 @@ endif + libbrotli = [] + if get_option('with_brotli') + libbrotli = [ compiler.find_library('brotlienc') ] +- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include ') ++ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include ') + conf_data.set('HAVE_BROTLI_ENCODE_H', true) + conf_data.set('HAVE_BROTLI', true) + else diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 05a7c84961..f3e252d850 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,12 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BROTLI + bool "brotli support" + select BR2_PACKAGE_BROTLI + help + Enable brotli support for lighttpd mod_deflate. + config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 4f05db4e29..22db1a7348 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -13,7 +13,6 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ @@ -36,6 +35,13 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) +LIGHTTPD_DEPENDENCIES += brotli +LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +else +LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:55 +0100 Subject: [Buildroot] [PATCH v2, 4/6] package/lighttpd: add maxminddb support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-4-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index f3e252d850..9a262dbe93 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,12 @@ config BR2_PACKAGE_LIGHTTPD_LUA help Enable Lua support. Needed to support mod_magnet +config BR2_PACKAGE_LIGHTTPD_MAXMINDDB + bool "maxminddb support" + select BR2_PACKAGE_LIBMAXMINDDB + help + Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 22db1a7348..b2e06c77a1 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -20,7 +20,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ - -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ @@ -56,6 +55,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_lua=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) +LIGHTTPD_DEPENDENCIES += libmaxminddb +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +else +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:56 +0100 Subject: [Buildroot] [PATCH v2,5/6] package/lighttpd: add krb5 support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-5-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9a262dbe93..595c50c978 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -33,6 +33,12 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 help Enable bzip2 support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_KRB5 + bool "krb5 support" + select BR2_PACKAGE_LIBKRB5 + help + Enable Kerberos5 support for lighttpd mod_auth. + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index b2e06c77a1..a25bb0bfcb 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_krb5=false \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ @@ -48,6 +47,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) +LIGHTTPD_DEPENDENCIES += libkrb5 +LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +else +LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 09:59:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 10:59:57 +0100 Subject: [Buildroot] [PATCH v2,6/6] package/lighttpd: add ldap support In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220123095957.492671-6-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix openldap dependency package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 595c50c978..f46e1a9a66 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,16 @@ config BR2_PACKAGE_LIGHTTPD_KRB5 help Enable Kerberos5 support for lighttpd mod_auth. +config BR2_PACKAGE_LIGHTTPD_LDAP + bool "ldap support" + depends on BR2_USE_WCHAR # openldap + select BR2_PACKAGE_OPENLDAP + help + Enable LDAP support for lighttpd mod_auth mod_vhostdb_ldap. + +comment "ldap support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index a25bb0bfcb..f8ed7c6f7c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ @@ -54,6 +53,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_krb5=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) +LIGHTTPD_DEPENDENCIES += openldap +LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +else +LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Jan 23 10:39:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 23 Jan 2022 11:39:22 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name Message-ID: <20220123103922.1928118-1-giulio.benetti@benettiengineering.com> RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. Signed-off-by: Giulio Benetti --- board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf index 5109625160..157c6a715e 100644 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ b/board/orangepi/orangepi-rk3399/extlinux.conf @@ -1,4 +1,4 @@ -label RK3399_ROCKPRO64 linux +label RK3399_ORANGEPI linux kernel /Image devicetree /rk3399-orangepi.dtb append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait -- 2.25.1 From fontaine.fabrice at gmail.com Sun Jan 23 10:40:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 11:40:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/xl2tp: bump to version 1.3.17 Message-ID: <20220123104057.556978-1-fontaine.fabrice@gmail.com> https://github.com/xelerance/xl2tpd/releases/tag/v1.3.17 Signed-off-by: Fabrice Fontaine --- package/xl2tp/xl2tp.hash | 2 +- package/xl2tp/xl2tp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash index 471657f0f2..eca918bc83 100644 --- a/package/xl2tp/xl2tp.hash +++ b/package/xl2tp/xl2tp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 c28608b315adb25c8bf9579c1d6ab52ab47c4c43b68a5ab63c5d039196fd180f xl2tp-1.3.16.tar.gz +sha256 898d9b6a374c78dea5f20d80fd50fac13428ad746fefb16ff5f6bec449affe67 xl2tp-1.3.17.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index 65a78504f3..4a2bd66308 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XL2TP_VERSION = 1.3.16 +XL2TP_VERSION = 1.3.17 XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap XL2TP_LICENSE = GPL-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 10:51:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 11:51:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon: bump to version 0.32.2 Message-ID: <20220123105146.568745-1-fontaine.fabrice@gmail.com> - Switch site to get latest version - README has been renamed to README.md - Update indentation in hash file (two spaces) https://github.com/notroj/neon/blob/0.32.2/NEWS Signed-off-by: Fabrice Fontaine --- package/neon/Config.in | 2 +- package/neon/neon.hash | 10 +++++----- package/neon/neon.mk | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/neon/Config.in b/package/neon/Config.in index 8dc78f0f0a..a3515f4052 100644 --- a/package/neon/Config.in +++ b/package/neon/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NEON help HTTP and WebDAV client library, with a C interface. - http://www.webdav.org/neon/ + https://notroj.github.io/neon/ if BR2_PACKAGE_NEON diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 2ebefbe520..5a5a77a58b 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,6 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca neon-0.30.2.tar.gz # Locally computed -sha256 95f77624e96f6728145826fc895142275451f43f41c073766db3dbbcc8b790b0 README -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING +sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz +# Hash for license files +sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING diff --git a/package/neon/neon.mk b/package/neon/neon.mk index da53735d0e..3bbd12561f 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,10 +4,10 @@ # ################################################################################ -NEON_VERSION = 0.30.2 -NEON_SITE = http://www.webdav.org/neon +NEON_VERSION = 0.32.2 +NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) -NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README +NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath -- 2.34.1 From romain.naour at gmail.com Sun Jan 23 10:56:39 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 23 Jan 2022 11:56:39 +0100 Subject: [Buildroot] [PATCH 3/3] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 In-Reply-To: <20220122153714.26991-3-peter@korsgaard.com> References: <20220122153714.26991-1-peter@korsgaard.com> <20220122153714.26991-3-peter@korsgaard.com> Message-ID: Hello Peter, All Le 22/01/2022 ? 16:37, Peter Korsgaard a ?crit?: > Signed-off-by: Peter Korsgaard > --- > configs/qemu_aarch64_virt_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig > index 0caf38112d..9fbf293311 100644 > --- a/configs/qemu_aarch64_virt_defconfig > +++ b/configs/qemu_aarch64_virt_defconfig > @@ -20,7 +20,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" Why just only taking care of this defconfig ? Most qemu defconfig are using the same kernel version (5.15). Usually we try to keep all of them in sync. Since Qemu defconfigs are runtime tested each week in GitLab-CI maybe we can safely switch to BR2_LINUX_KERNEL_LATEST_VERSION instead ? But we have to check qemu defconfigs using a local kernel patch, currently ppc-mpc8544ds and arm-versatile or keeping kernel custom version for them. Also BR2_LINUX_KERNEL_LATEST_VERSION refer to the latest stable kernel version, not the latest lts version. Thoughts? Best regards, Romain > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > From fontaine.fabrice at gmail.com Sun Jan 23 11:01:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 12:01:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectl: bump to version 4.3.2 Message-ID: <20220123110155.570748-1-fontaine.fabrice@gmail.com> 4.3.2 Oct 7, 2021 - very minor bug. the last command in perfquery is not in a loop and prevents the collectl daemon from starting via the service. Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/collectl/collectl.hash | 8 ++++---- package/collectl/collectl.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/collectl/collectl.hash b/package/collectl/collectl.hash index d866e0becc..1785d25d87 100644 --- a/package/collectl/collectl.hash +++ b/package/collectl/collectl.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2187264d974b36a653c8a4b028ac6eeab23e1885f8b2563a33f06358f39889f1 collectl-4.3.1.src.tar.gz -sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC -sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL +sha256 9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750 collectl-4.3.2.src.tar.gz +sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC +sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL diff --git a/package/collectl/collectl.mk b/package/collectl/collectl.mk index c9fb59293c..c6cb2e1494 100644 --- a/package/collectl/collectl.mk +++ b/package/collectl/collectl.mk @@ -4,7 +4,7 @@ # ################################################################################ -COLLECTL_VERSION = 4.3.1 +COLLECTL_VERSION = 4.3.2 COLLECTL_SOURCE = collectl-$(COLLECTL_VERSION).src.tar.gz COLLECTL_SITE = http://downloads.sourceforge.net/collectl/collectl COLLECTL_LICENSE = Artistic or GPL-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 11:11:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 12:11:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/nmon: bump to version 16n Message-ID: <20220123111126.573758-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/nmon/nmon.hash | 6 +++--- package/nmon/nmon.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nmon/nmon.hash b/package/nmon/nmon.hash index fd3f09c63a..1d7226a4fe 100644 --- a/package/nmon/nmon.hash +++ b/package/nmon/nmon.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/nmon/files/ -md5 df67f07ea4006c6204acff586beada81 lmon16m.c -sha1 68cd02be19036a287fe352823db93223e73a9411 lmon16m.c +md5 a8172601fdc05f3bc58455cbd3f4475e lmon16n.c +sha1 024a3b56179838f0e04bf1706cc9ba56595301a8 lmon16n.c # Locally computed -sha256 2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 lmon16m.c +sha256 c0012cc2d925dee940c37ceae297abac64ba5a5c30e575e7418b04028613f5f2 lmon16n.c diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk index 8b39748cce..01371a8c74 100644 --- a/package/nmon/nmon.mk +++ b/package/nmon/nmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMON_VERSION = 16m +NMON_VERSION = 16n NMON_SITE = https://sourceforge.net/projects/nmon/files NMON_SOURCE = lmon$(NMON_VERSION).c NMON_LICENSE = GPL-3.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 11:22:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 12:22:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/lft: bump to version 3.91 Message-ID: <20220123112220.578219-1-fontaine.fabrice@gmail.com> lft 3.91 / WhoB 3.91 ---------------------- - Fixed bugs.debian.org/cgi-bin/bugreport.cgi?bug=922430 - Updated date lft 3.9 / WhoB 3.9 ---------------------- - Fixed a bug that could indicate a target was closed when it was open - Improved support for DLT_NULL interfaces on BSD-like operating systems - Improved deprecated pcap device enumeration method - Improved GraphViz output format appearance Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/lft/lft.hash | 6 +++--- package/lft/lft.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lft/lft.hash b/package/lft/lft.hash index 91a1fb0659..9bcce843bc 100644 --- a/package/lft/lft.hash +++ b/package/lft/lft.hash @@ -1,5 +1,5 @@ # From http://pwhois.org/lft/ -md5 31b15aabc619707427a73657512560f8 lft-3.8.tar.gz +md5 73cb955546692cf0fb5d7931939c56de lft-3.91.tar.gz # Locally calculated -sha256 10f427e77b0f8207817329bd8ef0310078434612620073369264d15e6f97e990 lft-3.8.tar.gz -sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING +sha256 aad13e671adcfc471ab99417161964882d147893a54664f3f465ec5c8398e6af lft-3.91.tar.gz +sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING diff --git a/package/lft/lft.mk b/package/lft/lft.mk index 5154c83fef..37e6e77767 100644 --- a/package/lft/lft.mk +++ b/package/lft/lft.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFT_VERSION = 3.8 +LFT_VERSION = 3.91 LFT_SITE = http://pwhois.org/get LFT_DEPENDENCIES = libpcap LFT_LICENSE = VOSTROM Public License for Open Source -- 2.34.1 From ju.o at free.fr Sun Jan 23 13:48:03 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 23 Jan 2022 14:48:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynaddsubfx: new package Message-ID: <20220123134803.2269814-1-ju.o@free.fr> ZynAddSubFX is a fully featured open source software synthesizer capable of making a countless number of instruments, from some common heard from expensive hardware to interesting sounds that you'll boost to an amazing universe of sounds. https://zynaddsubfx.sourceforge.io/ Signed-off-by: Julien Olivain --- Checked with: make check-package [...] 0 warnings generated ./utils/test-pkg --all --package zynaddsubfx andes-nds32 [ 1/45]: SKIPPED arm-aarch64 [ 2/45]: OK bootlin-aarch64-glibc [ 3/45]: OK bootlin-arcle-hs38-uclibc [ 4/45]: OK bootlin-armv5-uclibc [ 5/45]: OK bootlin-armv7-glibc [ 6/45]: OK bootlin-armv7m-uclibc [ 7/45]: OK bootlin-armv7-musl [ 8/45]: OK bootlin-m68k-5208-uclibc [ 9/45]: OK bootlin-m68k-68040-uclibc [10/45]: OK bootlin-microblazeel-uclibc [11/45]: OK bootlin-mipsel32r6-glibc [12/45]: OK bootlin-mipsel-uclibc [13/45]: OK bootlin-nios2-glibc [14/45]: OK bootlin-openrisc-uclibc [15/45]: OK bootlin-powerpc64le-power8-glibc [16/45]: OK bootlin-powerpc-e500mc-uclibc [17/45]: OK bootlin-riscv32-glibc [18/45]: OK bootlin-riscv64-glibc [19/45]: OK bootlin-riscv64-musl [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: OK bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK bootlin-xtensa-uclibc [27/45]: OK br-arm-basic [28/45]: SKIPPED br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: SKIPPED sourcery-arm [41/45]: SKIPPED sourcery-arm-thumb2 [42/45]: SKIPPED sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 6 skipped, 0 build failed, 0 legal-info failed --- DEVELOPERS | 1 + package/Config.in | 1 + package/zynaddsubfx/Config.in | 31 ++++++++++++++++++++++++++++ package/zynaddsubfx/zynaddsubfx.hash | 3 +++ package/zynaddsubfx/zynaddsubfx.mk | 28 +++++++++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 package/zynaddsubfx/Config.in create mode 100644 package/zynaddsubfx/zynaddsubfx.hash create mode 100644 package/zynaddsubfx/zynaddsubfx.mk diff --git a/DEVELOPERS b/DEVELOPERS index dc810b6fe1..df9e6ec73b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ +F: package/zynaddsubfx/ N: Julien Viard de Galbert F: package/dieharder/ diff --git a/package/Config.in b/package/Config.in index 85188ff873..e4ca195beb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -62,6 +62,7 @@ menu "Audio and video applications" source "package/wavpack/Config.in" source "package/yavta/Config.in" source "package/ympd/Config.in" + source "package/zynaddsubfx/Config.in" endmenu menu "Compressors and decompressors" diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in new file mode 100644 index 0000000000..837a469e7c --- /dev/null +++ b/package/zynaddsubfx/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_ZYNADDSUBFX + bool "zynaddsubfx" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_SINGLE + select BR2_PACKAGE_LIBLO + select BR2_PACKAGE_MXML + select BR2_PACKAGE_ZLIB + help + ZynAddSubFX is a fully featured open source software + synthesizer capable of making a countless number of + instruments, from some common heard from expensive hardware + to interesting sounds that you'll boost to an amazing + universe of sounds. + + Note: this Buildroot package does not include the graphical + user interface. It is meant to be executed as a headless + daemon to be controlled with MIDI events or network OSC + (Open Sound Control) events. OSC events can be generated + from an external system with the ZynAddSubFX external GUI + program zynaddsubfx-ext-gui. + + https://zynaddsubfx.sourceforge.io/ + +comment "zynaddsubfx needs a toolchain w/ C++11 and threads" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/zynaddsubfx/zynaddsubfx.hash b/package/zynaddsubfx/zynaddsubfx.hash new file mode 100644 index 0000000000..2465d0b864 --- /dev/null +++ b/package/zynaddsubfx/zynaddsubfx.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cbd160778f6cf147f9b0487719edc5197a1404f46d7c7bfd89e153f0d8ce71ae zynaddsubfx-3.0.6.tar.bz2 +sha256 c9bf7643726da4f149e9669cf6f00257e4b3a173e4ab307461b8bd42717dd9a4 COPYING diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk new file mode 100644 index 0000000000..68aa5ce278 --- /dev/null +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# zynaddsubfx +# +################################################################################ + +ZYNADDSUBFX_VERSION = 3.0.6 +ZYNADDSUBFX_SOURCE = zynaddsubfx-$(ZYNADDSUBFX_VERSION).tar.bz2 +ZYNADDSUBFX_SITE = http://downloads.sourceforge.net/zynaddsubfx + +ZYNADDSUBFX_LICENSE = GPLv2+ +ZYNADDSUBFX_LICENSE_FILES = COPYING + +# There is no package in buildroot using LV2 plugins: disabling +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ZYNADDSUBFX_DEPENDENCIES = \ + alsa-lib \ + fftw-single \ + liblo \ + mxml \ + zlib + +$(eval $(cmake-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 13:47:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 14:47:50 +0100 Subject: [Buildroot] [PATCH 1/2] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR Message-ID: <20220123134751.703269-1-fontaine.fabrice@gmail.com> pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: Signed-off-by: Fabrice Fontaine --- package/libpjsip/libpjsip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8feec9bcb2..771db0ac72 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,7 +12,7 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_VENDOR = teluu LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 13:47:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 14:47:51 +0100 Subject: [Buildroot] [PATCH 2/2] package/libpjsip: security bump to version 2.11.1 In-Reply-To: <20220123134751.703269-1-fontaine.fabrice@gmail.com> References: <20220123134751.703269-1-fontaine.fabrice@gmail.com> Message-ID: <20220123134751.703269-2-fontaine.fabrice@gmail.com> Security update. This version is recommended for all users to improve the security of applications using PJSIP. Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 Update indentation in hash file (two spaces) https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr https://github.com/pjsip/pjproject/releases/tag/2.11 https://github.com/pjsip/pjproject/releases/tag/2.11.1 Signed-off-by: Fabrice Fontaine --- package/libpjsip/libpjsip.hash | 4 ++-- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 68c2208885..f39ebf4060 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 771db0ac72..b05cc31a83 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.10 +LIBPJSIP_VERSION = 2.11.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ -- 2.34.1 From peter at korsgaard.com Sun Jan 23 14:48:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 15:48:17 +0100 Subject: [Buildroot] [PATCH 3/3] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 In-Reply-To: References: <20220122153714.26991-1-peter@korsgaard.com> <20220122153714.26991-3-peter@korsgaard.com> Message-ID: On 23/01/2022 11.56, Romain Naour wrote: >> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" > > Why just only taking care of this defconfig ? Simply because I did some other changes to it (see the other patches in the series). > Most qemu defconfig are using the same kernel version (5.15). Usually we try to > keep all of them in sync. Ok. > Since Qemu defconfigs are runtime tested each week in GitLab-CI maybe we can > safely switch to BR2_LINUX_KERNEL_LATEST_VERSION instead ? > But we have to check qemu defconfigs using a local kernel patch, currently > ppc-mpc8544ds and arm-versatile or keeping kernel custom version for them. > > Also BR2_LINUX_KERNEL_LATEST_VERSION refer to the latest stable kernel version, > not the latest lts version. That would mean that they are not really reproducible, so I don't really like it. -- Bye, Peter Korsgaard From romain.naour at gmail.com Sun Jan 23 15:20:15 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 23 Jan 2022 16:20:15 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/pkg-golang.mk: set GOPROXY to proxy.golang.org In-Reply-To: <7c25f4d7-309c-6eb1-00de-552242a64a97@smile.fr> References: <20220109151414.1908259-1-romain.naour@smile.fr> <20220109200806.GD1477939@scaer> <7c25f4d7-309c-6eb1-00de-552242a64a97@smile.fr> Message-ID: Hello Yann, Le 09/01/2022 ? 22:42, Romain Naour a ?crit?: > Hello Yann, All, > > Le 09/01/2022 ? 21:08, Yann E. MORIN a ?crit?: >> Romain, All, >> >> On 2022-01-09 16:14 +0100, Romain Naour spake thusly: >>> While packaging telegraf [1] the download step failed due to a checksum >>> mismatch: >>> >>> go: downloading collectd.org v0.5.0 >>> get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 >>> verifying collectd.org at v0.5.0: checksum mismatch >>> downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= >>> go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= >>> >>> SECURITY ERROR >>> This download does NOT match an earlier download recorded in go.sum. >>> The bits may have been replaced on the origin server, or an attacker may >>> have intercepted the download attempt. >>> >>> For more information, see 'go help module-auth'. >>> >>> go-collectd was bumped in telegraf since several releases (since v1.19.0) without >>> any changes regarding the go-collectd hash. >>> >>> Some users reported an issue [3] when using "GOPROXY=direct" and used >>> "GOPROXY=proxy.golang.org" as a workaround. >> >> I'll put down what we discussed on IRC: >> >> Unfortunately, there are cases the other way around: using a proxy broke >> the vendoring, while a direct connection solved it. So we won't be able >> to satisfy both cases. > > Sure, at least I posted the workaround on the ml. > >> >> Furthermore, relying on a proxy having a cached archive risks breaking >> in the future anyway, as that archived may get eventually get evicted >> out of the cache of the proxy. Or the proxy may disapear in the future, >> or whatever. >> >> In any case, a bad hash is most probably due to one of the following >> issues: >> >> - upstream messed up when adding the dependency and incorrectly copied >> the hash (but that should not happen as adding a dependency is >> supposed to be done with go tools already), >> >> - the upstream of the dependency changed their release (i.e. they >> re-tagged a release) >> >> - the go proxy is caching an incorrect archive (e.g. a partial >> download, or an older archive, or is malicious, or whatever). >> >> In any case, we can't do anything about it, and the upstream of the >> project has to fix the mess. >> >> So, from my point of view, this is a NACK on this patch. > > I created an issue on Telegraf github: > https://github.com/influxdata/telegraf/issues/10408 The issue has been reported to go-collectd project but not reply so far [1] But using GOPROXY=direct is a problem itself since some git repositories are altered or disappear after a release. Building telegraf outside of Buildroot with GOPROXY=direct doesn't reach the collectd problem anymore since it fail earlier due to a missing dependency $ git clone https://github.com/influxdata/telegraf.git $ git checkout release-1.21 $ GOPROXY=direct go mod vendor -v -modcacherw go: github.com/harlow/kinesis-consumer at v0.3.6-0.20210911031324-5a873d6e9fec: invalid version: unknown revision 5a873d6e9fec https://github.com/harlow/kinesis-consumer/commit/5a873d6e9fec "This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository." Telegraf 1.21 build fine using GOPROXY=proxy.golang.org. The Buildroot build seems to mix a direct download and proxy download even if we use GOPROXY=direct: proxy download: go: downloading github.com/harlow/kinesis-consumer v0.3.6-0.20210911031324-5a873d6e9fec direct download: get "collectd.org": found meta tag vcs.metaImport{Prefix:"collectd.org", VCS:"git", RepoRoot:"https://github.com/collectd/go-collectd"} at //collectd.org/?go-get=1 go: downloading github.com/antchfx/jsonquery v1.1.4 verifying collectd.org at v0.5.0: checksum mismatch downloaded: h1:mRTLdljvxJNXPMMO9RSxf0PANDAqu/Tz+I6Dt6OjB28= go.sum: h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= SECURITY ERROR This download does NOT match an earlier download recorded in go.sum. The bits may have been replaced on the origin server, or an attacker may have intercepted the download attempt. See infos about GOPROXY [2]. Cloning all git repo is really slow and use a lot of disk space, 5Go for telegraf. We can use GOPROXY="proxy.golang.org,direct" to use direct download as a fallback [3]. But GOPROXY doesn't save all modules forever [4] "Why did a previously available module become unavailable in the mirror? proxy.golang.org does not save all modules forever. There are a number of reasons for this, but one reason is if proxy.golang.org is not able to detect a suitable license. In this case, only a temporarily cached copy of the module will be made available, and may become unavailable if it is removed from the original source and becomes outdated. The checksums will still remain in the checksum database regardless of whether or not they have become unavailable in the mirror." So we don't have any reliable way to retrieve all required sources to build go packages from sources. Telegraf fetch several hundred of git repository (sometime from personal repos)... [1] https://github.com/collectd/go-collectd/issues/94 [2] https://arslan.io/2019/08/02/why-you-should-use-a-go-module-proxy [3] https://github.com/renovatebot/renovate/issues/7233 [4] https://proxy.golang.org/ Best regards, Romain > > Best regards, > Romain > > >> >> Regards, >> Yann E. MORIN. >> >>> [1] https://github.com/influxdata/telegraf/ >>> [2] https://github.com/influxdata/telegraf/commit/d4b051edc247a13d7fbdaa49d95fe6e93505d14e >>> [3] https://github.com/google/flatbuffers/issues/6466#issuecomment-781954742 >>> >>> Signed-off-by: Romain Naour >>> Cc: Thomas Petazzoni >>> --- >>> package/pkg-golang.mk | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk >>> index 35bcb1673b..e23778d96a 100644 >>> --- a/package/pkg-golang.mk >>> +++ b/package/pkg-golang.mk >>> @@ -85,7 +85,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD >>> $(2)_DOWNLOAD_POST_PROCESS = go >>> $(2)_DL_ENV = \ >>> $(HOST_GO_COMMON_ENV) \ >>> - GOPROXY=direct \ >>> + GOPROXY=proxy.golang.org \ >>> BR_GOMOD=$$($(2)_GOMOD) >>> >>> # Due to vendoring, it is pretty likely that not all licenses are >>> -- >>> 2.31.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From ju.o at free.fr Sun Jan 23 15:34:18 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 23 Jan 2022 16:34:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: new package In-Reply-To: <6ece845a-20a1-4d79-c544-21e0f1f2fc6f@mind.be> References: <20220110200151.830192-1-ju.o@free.fr> <20220113215104.02a734a1@windsurf> <77b72a63fdde563f496649641a0efab1@free.fr> <6ece845a-20a1-4d79-c544-21e0f1f2fc6f@mind.be> Message-ID: <0b192b9e1ca3de226b780e0f9440f000@free.fr> Hi Arnout, On 16/01/2022 13:01, arnout at mind.be wrote: > On 16/01/2022 11:55, Julien Olivain wrote: >> Hi Thomas, >> >> On 13/01/2022 21:51, Thomas Petazzoni wrote: >>> Hello Julien, >>> >>> On Mon, 10 Jan 2022 21:01:51 +0100 >>> Julien Olivain wrote: >>> >>>> ?[...] >>>> +config BR2_PACKAGE_PYTHON_GNUPG >>>> +??? bool "python-gnupg" >>>> +??? select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime >>> >>> This generates a circular dependency reported by kconfig, because >>> another package does exactly the opposite. So I have inverted the >>> logic >>> here: >>> >>> select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime >> >> What do you think about reversing the logic of all Buildroot packages >> selecting gnupg so they default to gnupg2? >> >> Quoting: https://gnupg.org/download/index.html >> """ >> GnuPG 1.4 is the old, single binary version which still support the >> unsafe PGP-2 keys. This branch has no dependencies on the above listed >> libraries or the Pinentry. However, it lacks many modern features and >> will receive only important updates. >> """ >> >> There is currently only two packages selecting gnupg: >> gpgme and python-gnupg >> >> Most Linux distributions are now shipping gnupg2 by default.? gnupg v1 >> is now more for legacy/compatibility cases. > > Perhaps we should simply remove gnupg instead. We've had gnupg2 for > 7.5 years > now, that should be enough to migrate. I think gnupg (version 1) should be kept in Buildroot: - it's still maintained (only for important updates), - it has a smaller footprint (compared to v2), - it has less dependencies (only zlib), - it has less build dependencies (can build static, no need for MMU/threads, ...) gnupg1 might still be useful in some specific cases. This is why I was mentioning to switch the default version to v2, rather than removing v1. Best regards, Julien. > Regards, > Arnout > >> >> If you agree, I can send a patch for this. >> >> Best regards, >> >> Julien. >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From romain.naour at gmail.com Sun Jan 23 15:48:22 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 23 Jan 2022 16:48:22 +0100 Subject: [Buildroot] [PATCH 3/3] configs/qemu_aarch64_virt_defconfig: bump Linux kernel to 5.15.16 In-Reply-To: References: <20220122153714.26991-1-peter@korsgaard.com> <20220122153714.26991-3-peter@korsgaard.com> Message-ID: <9c63c5dc-a9dd-ff60-73e5-a2a7f09746f0@gmail.com> Hello Peter, Le 23/01/2022 ? 15:48, Peter Korsgaard a ?crit?: > On 23/01/2022 11.56, Romain Naour wrote: > >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" >> >> Why just only taking care of this defconfig ? > > Simply because I did some other changes to it (see the other patches in the > series). > >> Most qemu defconfig are using the same kernel version (5.15). Usually we try to >> keep all of them in sync. > > Ok. To test all qemu defconfig in gitlab you can push a branch named "kernel-5.15.16-defconfigs-qemu" Where: "kernel-5.15.16" is a prefix, "-defconfigs-" trigger a pipeline for testing Buildroot defconfis and "qemu" is a pattern to match all defconfig named qemu*. See: https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 The kernel 5.15 is not as old, do we want to follow closely the latest kernel version for Qemu defconfigs? But it's annoying to modify each time the kernel version in several place. > >> Since Qemu defconfigs are runtime tested each week in GitLab-CI maybe we can >> safely switch to BR2_LINUX_KERNEL_LATEST_VERSION instead ? >> But we have to check qemu defconfigs using a local kernel patch, currently >> ppc-mpc8544ds and arm-versatile or keeping kernel custom version for them. >> >> Also BR2_LINUX_KERNEL_LATEST_VERSION refer to the latest stable kernel version, >> not the latest lts version. > > That would mean that they are not really reproducible, so I don't really like it. For a given Buildroot version BR2_LINUX_KERNEL_LATEST_VERSION is set with a default kernel version. Actually defconfigs are already not reproducible since the internal toolchain components version use the default version. But indeed, the kernel version change faster than the toolchain. Best regards, Romain > > -- > Bye, Peter Korsgaard From ricardo.martincoski at gmail.com Sun Jan 23 16:08:44 2022 From: ricardo.martincoski at gmail.com (Ricardo Martincoski) Date: Sun, 23 Jan 2022 13:08:44 -0300 Subject: [Buildroot] [PATCH v2 2/4] support/docker: add python3-pytest In-Reply-To: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> Message-ID: <20220123160847.2653086-2-ricardo.martincoski@gmail.com> ... so the unit tests for check-package can run in the GitLab CI. Signed-off-by: Ricardo Martincoski Acked-by: Romain Naour --- Changes v1 -> v2: - none --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 5ca087546e..120e301b7c 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -41,6 +41,7 @@ RUN apt-get install -y --no-install-recommends \ python3-flake8 \ python3-nose2 \ python3-pexpect \ + python3-pytest \ qemu-system-arm \ qemu-system-x86 \ rsync \ -- 2.25.1 From ricardo.martincoski at gmail.com Sun Jan 23 16:08:45 2022 From: ricardo.martincoski at gmail.com (Ricardo Martincoski) Date: Sun, 23 Jan 2022 13:08:45 -0300 Subject: [Buildroot] [PATCH v2 3/4] utils/checkpackagelib: run unit tests on GitLab CI In-Reply-To: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> Message-ID: <20220123160847.2653086-3-ricardo.martincoski@gmail.com> ... so we can catch regressions on check-package. Signed-off-by: Ricardo Martincoski --- Changes v1 -> v2: - none DO NOT APPLY before applying the patch before, generating a new docker image, uploading it, and updating the image name in the .gitlab-ci.yml --- support/misc/gitlab-ci.yml.in | 4 ++++ support/scripts/generate-gitlab-ci-yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index be7951b3d2..47e72c3213 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,3 +1,7 @@ +.check-check-package_base: + script: + - python3 -m pytest -v utils/checkpackagelib/ + .check-DEVELOPERS_base: # get-developers should print just "No action specified"; if it prints # anything else, it's a parse error. diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index bd79807914..aa43aac019 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -26,7 +26,7 @@ gen_tests() { local do_basics do_defconfigs do_runtime do_testpkg local defconfigs_ext cfg tst - basics=( DEVELOPERS flake8 package ) + basics=( check-package DEVELOPERS flake8 package ) defconfigs=( $(cd configs; LC_ALL=C ls -1 *_defconfig) ) -- 2.25.1 From ricardo.martincoski at gmail.com Sun Jan 23 16:08:43 2022 From: ricardo.martincoski at gmail.com (Ricardo Martincoski) Date: Sun, 23 Jan 2022 13:08:43 -0300 Subject: [Buildroot] [PATCH v2 1/4] utils/checkpackagelib: add unit tests Message-ID: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> So anyone willing to contribute to check-package can run all tests in less than 1 second by using: $ python3 -m pytest -v utils/checkpackagelib/ Most test cases are in the form: @pytest.mark.parametrize('testname,filename,string,expected', function) - testname: a short description of the scenario tested, added in order to improve readability of the log when some tests fail - filename: the filename the check-package function being tested thinks it is testing - string: the content of the file being sent to the function under test - expected: all expected warnings that a given function from check-package should generate for a given file named filename and with string as its content. Signed-off-by: Ricardo Martincoski Cc: Arnout Vandecappelle Cc: Romain Naour --- Changes v1 -> v2: - fix small typo in the commit log expect -> expected - do not test 'none' type for hash (after "5da8218184 support/download: drop support for the 'none' hash"); - use the new spacing convention by default in this testsuite (suggested by Romain Naour) After seeing how the patch was applied at "f35a4b4ae2 utils/check-package: add a check for the new spacing convention", moving it to a new function, it seems more logical to me to keep the test for HashType as-is on v1, and create a new test for HashSpaces. If you or others disagree, I can rework, no problem. It could also be reworked when applying, since now the only change needed is to remove some test cases from the table. Sample run in the GitLab CI: https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/2004909364 Example of a failure, showing enough information to track down the test that fails (copied from v1, there is no such failure in the master branch): |testname = 'immediate assignment inside conditional and unconditional override outside' |filename = 'any.mk' |string = 'VAR_1 = VALUE1\nifeq (condition)\nVAR_1 := $(VAR_1), VALUE2\nendif\nVAR_1 := $(VAR_1), VALUE2\n' |expected = [['any.mk:3: immediate assignment to append to variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'], ['any.mk:5: unconditional override of variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n']] | | @pytest.mark.parametrize('testname,filename,string,expected', overridden_variable) | def test_overridden_variable(testname, filename, string, expected): | warnings = util.check_file(m.OverriddenVariable, filename, string) |> assert warnings == expected |E AssertionError: assert [['any.mk:3: ...), VALUE2\n']] == [['any.mk:3: i...), VALUE2\n']] |E At index 0 diff: ['any.mk:3: conditional override of variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'] != ['any.mk:3: immediate assignment to append to variable VAR_1', 'VAR_1 := $(VAR_1), VALUE2\n'] |E Full diff: |E - [['any.mk:3: conditional override of variable VAR_1', |E + [['any.mk:3: immediate assignment to append to variable VAR_1', |E 'VAR_1 := $(VAR_1), VALUE2\n'], |E ['any.mk:5: unconditional override of variable VAR_1', |E 'VAR_1 := $(VAR_1), VALUE2\n']] | |utils/checkpackagelib/test_lib_mk.py:168: AssertionError |===================== 2 failed, 180 passed in 0.79 seconds ===================== --- utils/checkpackagelib/test_lib.py | 212 ++++++++ utils/checkpackagelib/test_lib_config.py | 387 +++++++++++++++ utils/checkpackagelib/test_lib_hash.py | 183 +++++++ utils/checkpackagelib/test_lib_mk.py | 590 +++++++++++++++++++++++ utils/checkpackagelib/test_lib_patch.py | 96 ++++ utils/checkpackagelib/test_util.py | 8 + 6 files changed, 1476 insertions(+) create mode 100644 utils/checkpackagelib/test_lib.py create mode 100644 utils/checkpackagelib/test_lib_config.py create mode 100644 utils/checkpackagelib/test_lib_hash.py create mode 100644 utils/checkpackagelib/test_lib_mk.py create mode 100644 utils/checkpackagelib/test_lib_patch.py create mode 100644 utils/checkpackagelib/test_util.py diff --git a/utils/checkpackagelib/test_lib.py b/utils/checkpackagelib/test_lib.py new file mode 100644 index 0000000000..976a63d84d --- /dev/null +++ b/utils/checkpackagelib/test_lib.py @@ -0,0 +1,212 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib as m + + +ConsecutiveEmptyLines = [ + ('1 line (no newline)', + 'any', + '', + []), + ('1 line', + 'any', + '\n', + []), + ('2 lines', + 'any', + '\n' + '\n', + [['any:2: consecutive empty lines']]), + ('more than 2 consecutive', + 'any', + '\n' + '\n' + '\n', + [['any:2: consecutive empty lines'], + ['any:3: consecutive empty lines']]), + ('ignore whitespace 1', + 'any', + '\n' + ' ', + [['any:2: consecutive empty lines']]), + ('ignore whitespace 2', + 'any', + ' \n' + '\t\n', + [['any:2: consecutive empty lines']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', ConsecutiveEmptyLines) +def test_ConsecutiveEmptyLines(testname, filename, string, expected): + warnings = util.check_file(m.ConsecutiveEmptyLines, filename, string) + assert warnings == expected + + +EmptyLastLine = [ + ('ignore empty file', + 'any', + '', + []), + ('empty line (newline)', + 'any', + '\n', + [['any:1: empty line at end of file']]), + ('empty line (space, newline)', + 'any', + ' \n', + [['any:1: empty line at end of file']]), + ('empty line (space, no newline)', + 'any', + ' ', + [['any:1: empty line at end of file']]), + ('warn for the last of 2', + 'any', + '\n' + '\n', + [['any:2: empty line at end of file']]), + ('warn for the last of 3', + 'any', + '\n' + '\n' + '\n', + [['any:3: empty line at end of file']]), + ('ignore whitespace', + 'any', + ' \n' + '\t\n', + [['any:2: empty line at end of file']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', EmptyLastLine) +def test_EmptyLastLine(testname, filename, string, expected): + warnings = util.check_file(m.EmptyLastLine, filename, string) + assert warnings == expected + + +NewlineAtEof = [ + ('good', + 'any', + 'text\n', + []), + ('text (bad)', + 'any', + '\n' + 'text', + [['any:2: missing newline at end of file', + 'text']]), + ('space (bad)', + 'any', + '\n' + ' ', + [['any:2: missing newline at end of file', + ' ']]), + ('tab (bad)', + 'any', + '\n' + '\t', + [['any:2: missing newline at end of file', + '\t']]), + ('even for file with one line', + 'any', + ' ', + [['any:1: missing newline at end of file', + ' ']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', NewlineAtEof) +def test_NewlineAtEof(testname, filename, string, expected): + warnings = util.check_file(m.NewlineAtEof, filename, string) + assert warnings == expected + + +TrailingSpace = [ + ('good', + 'any', + 'text\n', + []), + ('ignore missing newline', + 'any', + '\n' + 'text', + []), + ('spaces', + 'any', + 'text \n', + [['any:1: line contains trailing whitespace', + 'text \n']]), + ('tabs after text', + 'any', + 'text\t\t\n', + [['any:1: line contains trailing whitespace', + 'text\t\t\n']]), + ('mix of tabs and spaces', + 'any', + ' \n' + ' ', + [['any:1: line contains trailing whitespace', + ' \n'], + ['any:2: line contains trailing whitespace', + ' ']]), + ('blank line with tabs', + 'any', + '\n' + '\t', + [['any:2: line contains trailing whitespace', + '\t']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', TrailingSpace) +def test_TrailingSpace(testname, filename, string, expected): + warnings = util.check_file(m.TrailingSpace, filename, string) + assert warnings == expected + + +Utf8Characters = [ + ('usual', + 'any', + 'text\n', + []), + ('acceptable character', + 'any', + '\x60', + []), + ('unacceptable character', + 'any', + '\x81', + [['any:1: line contains UTF-8 characters', + '\x81']]), + ('2 warnings', + 'any', + 'text\n' + 'text \xc8 text\n' + '\xc9\n', + [['any:2: line contains UTF-8 characters', + 'text \xc8 text\n'], + ['any:3: line contains UTF-8 characters', + '\xc9\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Utf8Characters) +def test_Utf8Characters(testname, filename, string, expected): + warnings = util.check_file(m.Utf8Characters, filename, string) + assert warnings == expected + + +def test_all_check_functions_are_used(): + import inspect + import checkpackagelib.lib_config as lib_config + import checkpackagelib.lib_hash as lib_hash + import checkpackagelib.lib_mk as lib_mk + import checkpackagelib.lib_patch as lib_patch + c_config = [c[0] for c in inspect.getmembers(lib_config, inspect.isclass)] + c_hash = [c[0] for c in inspect.getmembers(lib_hash, inspect.isclass)] + c_mk = [c[0] for c in inspect.getmembers(lib_mk, inspect.isclass)] + c_patch = [c[0] for c in inspect.getmembers(lib_patch, inspect.isclass)] + c_all = c_config + c_hash + c_mk + c_patch + c_common = [c[0] for c in inspect.getmembers(m, inspect.isclass)] + assert set(c_common) <= set(c_all) diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py new file mode 100644 index 0000000000..91a549adf2 --- /dev/null +++ b/utils/checkpackagelib/test_lib_config.py @@ -0,0 +1,387 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_config as m + + +AttributesOrder = [ + ('good example', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'default y\n' + 'depends on BR2_USE_BAR # runtime\n' + 'select BR2_PACKAGE_BAZ\n' + 'help\n' + '\t help text\n', + []), + ('depends before default', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'depends on BR2_USE_BAR\n' + 'default y\n', + [['any:4: attributes order: type, default, depends on, select, help (url#_config_files)', + 'default y\n']]), + ('select after help', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'help\n' + '\t help text\n' + 'select BR2_PACKAGE_BAZ\n', + [['any:5: attributes order: type, default, depends on, select, help (url#_config_files)', + 'select BR2_PACKAGE_BAZ\n']]), + ('string', + 'any', + 'config BR2_PACKAGE_FOO_PLUGINS\n' + 'string "foo plugins"\n' + 'default "all"\n', + []), + ('ignore tabs', + 'any', + 'config\tBR2_PACKAGE_FOO_PLUGINS\n' + 'default\t"all"\n' + 'string\t"foo plugins"\n', + [['any:3: attributes order: type, default, depends on, select, help (url#_config_files)', + 'string\t"foo plugins"\n']]), + ('choice', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_FOO\n' + '\n' + 'choice\n' + 'prompt "type of foo"\n' + 'default BR2_PACKAGE_FOO_STRING\n' + '\n' + 'config BR2_PACKAGE_FOO_NONE\n' + 'bool "none"\n' + '\n' + 'config BR2_PACKAGE_FOO_STRING\n' + 'bool "string"\n' + '\n' + 'endchoice\n' + '\n' + 'endif\n' + '\n', + []), + ('type after default', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_FOO\n' + '\n' + 'choice\n' + 'default BR2_PACKAGE_FOO_STRING\n' + 'prompt "type of foo"\n', + [['any:7: attributes order: type, default, depends on, select, help (url#_config_files)', + 'prompt "type of foo"\n']]), + ('menu', + 'any', + 'menuconfig BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'help\n' + '\t help text\n' + '\t help text\n' + '\n' + 'if BR2_PACKAGE_FOO\n' + '\n' + 'menu "foo plugins"\n' + 'config BR2_PACKAGE_FOO_COUNTER\n' + 'bool "counter"\n' + '\n' + 'endmenu\n' + '\n' + 'endif\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', AttributesOrder) +def test_AttributesOrder(testname, filename, string, expected): + warnings = util.check_file(m.AttributesOrder, filename, string) + assert warnings == expected + + +CommentsMenusPackagesOrder = [ + ('top menu (good)', + 'package/Config.in', + 'menu "Target packages"\n' + 'source "package/busybox/Config.in"\n' + 'source "package/skeleton/Config.in"\n', + []), + ('top menu (bad)', + 'package/Config.in', + 'source "package/skeleton/Config.in"\n' + 'source "package/busybox/Config.in"\n', + [['package/Config.in:2: Packages in: The top level menu,\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: busybox', + 'source "package/busybox/Config.in"\n']]), + ('menu (bad)', + 'package/Config.in', + 'menu "Target packages"\n' + 'source "package/skeleton/Config.in"\n' + 'source "package/busybox/Config.in"\n', + [['package/Config.in:3: Packages in: menu "Target packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: busybox', + 'source "package/busybox/Config.in"\n']]), + ('underscore (good)', + 'package/Config.in.host', + 'menu "Hardware handling"\n' + 'menu "Firmware"\n' + 'endmenu\n' + 'source "package/usb_modeswitch/Config.in"\n' + 'source "package/usbmount/Config.in"\n', + []), + ('underscore (bad)', + 'package/Config.in.host', + 'menu "Hardware handling"\n' + 'menu "Firmware"\n' + 'endmenu\n' + 'source "package/usbmount/Config.in"\n' + 'source "package/usb_modeswitch/Config.in"\n', + [['package/Config.in.host:5: Packages in: menu "Hardware handling",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: usb_modeswitch', + 'source "package/usb_modeswitch/Config.in"\n']]), + ('ignore other files', + 'any other file', + 'menu "Hardware handling"\n' + 'source "package/bbb/Config.in"\n' + 'source "package/aaa/Config.in"\n', + []), + ('dash (bad)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/aAa/Config.in"\n' + 'source "package/aaa/Config.in"\n', + [['package/Config.in:3: Packages in: menu "packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: a-a', + 'source "package/a-a/Config.in"\n']]), + ('underscore (bad)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/aAa/Config.in"\n' + 'source "package/aaa/Config.in"\n', + [['package/Config.in:4: Packages in: menu "packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: a_a', + 'source "package/a_a/Config.in"\n']]), + ('digit (bad)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/aAa/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/aaa/Config.in"\n', + [['package/Config.in:5: Packages in: menu "packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: a1a', + 'source "package/a1a/Config.in"\n']]), + ('capitals (bad)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/aaa/Config.in"\n' + 'source "package/aAa/Config.in"\n', + [['package/Config.in:6: Packages in: menu "packages",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: aAa', + 'source "package/aAa/Config.in"\n']]), + ('digits, capitals, underscore (good)', + 'package/Config.in', + 'menu "packages"\n' + 'source "package/a-a/Config.in"\n' + 'source "package/a_a/Config.in"\n' + 'source "package/a1a/Config.in"\n' + 'source "package/aAa/Config.in"\n' + 'source "package/aaa/Config.in"\n', + []), + ('conditional menu (good)', + 'package/Config.in', + 'menu "Other"\n' + 'source "package/linux-pam/Config.in"\n' + 'if BR2_PACKAGE_LINUX_PAM\n' + 'comment "linux-pam plugins"\n' + 'source "package/libpam-radius-auth/Config.in"\n' + 'source "package/libpam-tacplus/Config.in"\n' + 'endif\n' + 'source "package/liquid-dsp/Config.in"\n', + []), + ('conditional menu (bad)', + 'package/Config.in', + 'menu "Other"\n' + 'source "package/linux-pam/Config.in"\n' + 'if BR2_PACKAGE_LINUX_PAM\n' + 'comment "linux-pam plugins"\n' + 'source "package/libpam-tacplus/Config.in"\n' + 'source "package/libpam-radius-auth/Config.in"\n' + 'endif\n' + 'source "package/liquid-dsp/Config.in"\n', + [['package/Config.in:6: Packages in: comment "linux-pam plugins",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: libpam-radius-auth', + 'source "package/libpam-radius-auth/Config.in"\n']]), + ('no conditional (bad)', + 'package/Config.in', + 'menu "Other"\n' + 'source "package/linux-pam/Config.in"\n' + 'source "package/libpam-radius-auth/Config.in"\n' + 'source "package/libpam-tacplus/Config.in"\n' + 'source "package/liquid-dsp/Config.in"\n', + [['package/Config.in:3: Packages in: menu "Other",\n' + ' are not alphabetically ordered;\n' + " correct order: '-', '_', digits, capitals, lowercase;\n" + ' first incorrect package: libpam-radius-auth', + 'source "package/libpam-radius-auth/Config.in"\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', CommentsMenusPackagesOrder) +def test_CommentsMenusPackagesOrder(testname, filename, string, expected): + warnings = util.check_file(m.CommentsMenusPackagesOrder, filename, string) + assert warnings == expected + + +HelpText = [ + ('single line', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'default y\n' + 'depends on BR2_USE_BAR # runtime\n' + 'select BR2_PACKAGE_BAZ\n' + 'help\n' + '\t help text\n', + []), + ('larger than 72', + 'any', + 'help\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 123\n' + '\t help text\n', + [['any:3: help text: <2 spaces><62 chars> (url#writing-rules-config-in)', + '\t 123456789 123456789 123456789 123456789 123456789 123456789 123\n', + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12']]), + ('long url at beginning of line', + 'any', + 'help\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' + '\t http://url.that.is.longer.than.seventy.two.characthers/folder_name\n' + '\t https://url.that.is.longer.than.seventy.two.characthers/folder_name\n' + '\t git://url.that.is.longer.than.seventy.two.characthers/folder_name\n', + []), + ('long url not at beginning of line', + 'any', + 'help\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' + '\t refer to http://url.that.is.longer.than.seventy.two.characthers/folder_name\n' + '\n' + '\t http://url.that.is.longer.than.seventy.two.characthers/folder_name\n', + [['any:3: help text: <2 spaces><62 chars> (url#writing-rules-config-in)', + '\t refer to http://url.that.is.longer.than.seventy.two.characthers/folder_name\n', + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12']]), + ('allow beautified items', + 'any', + 'help\n' + '\t 123456789 123456789 123456789 123456789 123456789 123456789 12\n' + '\t summary:\n' + '\t - enable that config\n' + '\t - built it\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', HelpText) +def test_HelpText(testname, filename, string, expected): + warnings = util.check_file(m.HelpText, filename, string) + assert warnings == expected + + +Indent = [ + ('good example', + 'any', + 'config BR2_PACKAGE_FOO\n' + '\tbool "foo"\n' + '\tdefault y\n' + '\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n' + '\tdepends on BR2_INSTALL_LIBSTDCPP\n' + '# very useful comment\n' + '\tselect BR2_PACKAGE_BAZ\n' + '\thelp\n' + '\t help text\n' + '\n' + 'comment "foo needs toolchain w/ C++, threads"\n' + '\tdepends on !BR2_INSTALL_LIBSTDCPP || \\\n' + '\t\t!BR2_TOOLCHAIN_HAS_THREADS\n' + '\n' + 'source "package/foo/bar/Config.in"\n', + []), + ('spaces', + 'any', + 'config BR2_PACKAGE_FOO\n' + ' bool "foo"\n', + [['any:2: should be indented with one tab (url#_config_files)', + ' bool "foo"\n']]), + ('without indent', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'default y\n', + [['any:2: should be indented with one tab (url#_config_files)', + 'default y\n']]), + ('too much tabs', + 'any', + 'config BR2_PACKAGE_FOO\n' + '\t\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n', + [['any:2: should be indented with one tab (url#_config_files)', + '\t\tdepends on BR2_TOOLCHAIN_HAS_THREADS\n']]), + ('help', + 'any', + 'config BR2_PACKAGE_FOO\n' + ' help\n', + [['any:2: should be indented with one tab (url#_config_files)', + ' help\n']]), + ('continuation line', + 'any', + 'comment "foo needs toolchain w/ C++, threads"\n' + '\tdepends on !BR2_INSTALL_LIBSTDCPP || \\\n' + ' !BR2_TOOLCHAIN_HAS_THREADS\n', + [['any:3: continuation line should be indented using tabs', + ' !BR2_TOOLCHAIN_HAS_THREADS\n']]), + ('comment with tabs', + 'any', + '\tcomment "foo needs toolchain w/ C++, threads"\n', + [['any:1: should not be indented', + '\tcomment "foo needs toolchain w/ C++, threads"\n']]), + ('comment with spaces', + 'any', + ' comment "foo needs toolchain w/ C++, threads"\n', + [['any:1: should not be indented', + ' comment "foo needs toolchain w/ C++, threads"\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Indent) +def test_Indent(testname, filename, string, expected): + warnings = util.check_file(m.Indent, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_lib_hash.py b/utils/checkpackagelib/test_lib_hash.py new file mode 100644 index 0000000000..fdc6338189 --- /dev/null +++ b/utils/checkpackagelib/test_lib_hash.py @@ -0,0 +1,183 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_hash as m + + +HashNumberOfFields = [ + ('empty file', + 'any', + '', + []), + ('empty line', + 'any', + '\n', + []), + ('ignore whitespace', + 'any', + '\t\n', + []), + ('ignore comments', + 'any', + '# text\n', + []), + ('1 field', + 'any', + 'field1\n', + [['any:1: expected three fields (url#adding-packages-hash)', + 'field1\n']]), + ('2 fields', + 'any', + 'field1 field2\n', + [['any:1: expected three fields (url#adding-packages-hash)', + 'field1 field2\n']]), + ('4 fields', + 'any', + 'field1 field2 field3 field4\n', + [['any:1: expected three fields (url#adding-packages-hash)', + 'field1 field2 field3 field4\n']]), + ('with 1 space', + 'any', + 'field1 field2 field3\n', + []), + ('many spaces', + 'any', + ' field1 field2 field3\n', + []), + ('tabs', + 'any', + 'field1\tfield2\tfield3\n', + []), + ('mix of tabs and spaces', + 'any', + '\tfield1\t field2\t field3 \n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', HashNumberOfFields) +def test_HashNumberOfFields(testname, filename, string, expected): + warnings = util.check_file(m.HashNumberOfFields, filename, string) + assert warnings == expected + + +HashType = [ + ('ignore empty files', + 'any', + '', + []), + ('ignore 1 field', + 'any', + 'text\n', + []), + ('wrong type', + 'any', + 'text text\n', + [['any:1: unexpected type of hash (url#adding-packages-hash)', + 'text text\n']]), + ('md5 (good)', + 'any', + 'md5 12345678901234567890123456789012\n', + []), + ('md5 (short)', + 'any', + 'md5 123456\n', + [['any:1: hash size does not match type (url#adding-packages-hash)', + 'md5 123456\n', + 'expected 32 hex digits']]), + ('ignore space before', + 'any', + ' md5 12345678901234567890123456789012\n', + []), + ('2 spaces', + 'any', + 'md5 12345678901234567890123456789012\n', + []), + ('ignore tabs', + 'any', + 'md5\t12345678901234567890123456789012\n', + []), + ('common typo', + 'any', + 'md5sum 12345678901234567890123456789012\n', + [['any:1: unexpected type of hash (url#adding-packages-hash)', + 'md5sum 12345678901234567890123456789012\n']]), + ('md5 (too long)', + 'any', + 'md5 123456789012345678901234567890123\n', + [['any:1: hash size does not match type (url#adding-packages-hash)', + 'md5 123456789012345678901234567890123\n', + 'expected 32 hex digits']]), + ('sha1 (good)', + 'any', + 'sha1 1234567890123456789012345678901234567890\n', + []), + ('sha256', + 'any', + 'sha256 1234567890123456789012345678901234567890123456789012345678901234\n', + []), + ('sha384', + 'any', + 'sha384 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456\n', + []), + ('sha512', + 'any', + 'sha512 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678' + '9012345678\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', HashType) +def test_HashType(testname, filename, string, expected): + warnings = util.check_file(m.HashType, filename, string) + assert warnings == expected + + +HashSpaces = [ + ('ignore empty files', + 'any', + '', + []), + ('ignore 1 field', + 'any', + 'text\n', + []), + ('ignore comments', + 'any', + '# type 1234567890123456789012345678901234567890 file\n', + []), + ('ignore trailing space', + 'any', + 'type 1234567890123456789012345678901234567890 file\t \n', + []), + ('2 spaces', + 'any', + 'type 1234567890123456789012345678901234567890 file\n', + []), + ('1 space', + 'any', + 'type 1234567890123456789012345678901234567890 file\n', + [['any:1: separation does not match expectation (url#adding-packages-hash)', + 'type 1234567890123456789012345678901234567890 file\n']]), + ('3 spaces', + 'any', + 'type 1234567890123456789012345678901234567890 file\n', + [['any:1: separation does not match expectation (url#adding-packages-hash)', + 'type 1234567890123456789012345678901234567890 file\n']]), + ('tabs', + 'any', + 'type\t1234567890123456789012345678901234567890\tfile\n', + [['any:1: separation does not match expectation (url#adding-packages-hash)', + 'type\t1234567890123456789012345678901234567890\tfile\n']]), + ('mixed tabs and spaces', + 'any', + 'type\t 1234567890123456789012345678901234567890 \tfile\n', + [['any:1: separation does not match expectation (url#adding-packages-hash)', + 'type\t 1234567890123456789012345678901234567890 \tfile\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', HashSpaces) +def test_HashSpaces(testname, filename, string, expected): + warnings = util.check_file(m.HashSpaces, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py new file mode 100644 index 0000000000..49fa216fcd --- /dev/null +++ b/utils/checkpackagelib/test_lib_mk.py @@ -0,0 +1,590 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_mk as m + + +Indent = [ + ('ignore comment at beginning of line', + 'any', + '# very useful comment\n', + []), + ('ignore comment at end of line', + 'any', + ' # very useful comment\n', + []), + ('do not indent on conditional (good)', + 'any', + 'ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)\n' + 'FOO_CONF_OPTS += something\n' + 'endef\n', + []), + ('do not indent on conditional (bad)', + 'any', + 'ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)\n' + '\tFOO_CONF_OPTS += something\n' + 'endef\n', + [['any:2: unexpected indent with tabs', + '\tFOO_CONF_OPTS += something\n']]), + ('indent after line that ends in backslash (good)', + 'any', + 'FOO_CONF_OPTS += \\\n' + '\tsomething\n', + []), + ('indent after line that ends in backslash (bad)', + 'any', + 'FOO_CONF_OPTS += \\\n' + 'something\n', + [['any:2: expected indent with tabs', + 'something\n']]), + ('indent after 2 lines that ends in backslash (good)', + 'any', + 'FOO_CONF_OPTS += \\\n' + '\tsomething \\\n' + '\tsomething_else\n', + []), + ('indent after 2 lines that ends in backslash (bad)', + 'any', + 'FOO_CONF_OPTS += \\\n' + '\tsomething \\\n' + '\tsomething_else \\\n' + 'FOO_CONF_OPTS += another_thing\n', + [['any:4: expected indent with tabs', + 'FOO_CONF_OPTS += another_thing\n']]), + ('indent inside define (good)', + 'any', + 'define FOO_SOMETHING\n' + '\tcommand\n' + '\tcommand \\\n' + '\t\targuments\n' + 'endef\n' + 'FOO_POST_PATCH_HOOKS += FOO_SOMETHING\n', + []), + ('indent inside define (bad, no indent)', + 'any', + 'define FOO_SOMETHING\n' + 'command\n' + 'endef\n', + [['any:2: expected indent with tabs', + 'command\n']]), + ('indent inside define (bad, spaces)', + 'any', + 'define FOO_SOMETHING\n' + ' command\n' + 'endef\n', + [['any:2: expected indent with tabs', + ' command\n']]), + ('indent make target (good)', + 'any', + 'make_target:\n' + '\tcommand\n' + '\n', + []), + ('indent make target (bad)', + 'any', + 'make_target:\n' + ' command\n' + '\n', + [['any:2: expected indent with tabs', + ' command\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Indent) +def test_Indent(testname, filename, string, expected): + warnings = util.check_file(m.Indent, filename, string) + assert warnings == expected + + +OverriddenVariable = [ + ('simple assignment', + 'any.mk', + 'VAR_1 = VALUE1\n', + []), + ('unconditional override (variable without underscore)', + 'any.mk', + 'VAR1 = VALUE1\n' + 'VAR1 = VALUE1\n', + [['any.mk:2: unconditional override of variable VAR1', + 'VAR1 = VALUE1\n']]), + ('unconditional override (variable with underscore, same value)', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 = VALUE1\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 = VALUE1\n']]), + ('unconditional override (variable with underscore, different value)', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 = VALUE2\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 = VALUE2\n']]), + ('warn for unconditional override even with wrong number of spaces', + 'any.mk', + 'VAR_1= VALUE1\n' + 'VAR_1 =VALUE2\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 =VALUE2\n']]), + ('warn for := override', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 := VALUE2\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 := VALUE2\n']]), + ('append values outside conditional (good)', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 += VALUE2\n', + []), + ('append values outside conditional (bad)', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'VAR_1 := $(VAR_1), VALUE2\n', + [['any.mk:2: unconditional override of variable VAR_1', + 'VAR_1 := $(VAR_1), VALUE2\n']]), + ('immediate assignment inside conditional', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'ifeq (condition)\n' + 'VAR_1 := $(VAR_1), VALUE2\n', + [['any.mk:3: immediate assignment to append to variable VAR_1', + 'VAR_1 := $(VAR_1), VALUE2\n']]), + ('immediate assignment inside conditional and unconditional override outside', + 'any.mk', + 'VAR_1 = VALUE1\n' + 'ifeq (condition)\n' + 'VAR_1 := $(VAR_1), VALUE2\n' + 'endif\n' + 'VAR_1 := $(VAR_1), VALUE2\n', + [['any.mk:3: immediate assignment to append to variable VAR_1', + 'VAR_1 := $(VAR_1), VALUE2\n'], + ['any.mk:5: unconditional override of variable VAR_1', + 'VAR_1 := $(VAR_1), VALUE2\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', OverriddenVariable) +def test_OverriddenVariable(testname, filename, string, expected): + warnings = util.check_file(m.OverriddenVariable, filename, string) + assert warnings == expected + + +PackageHeader = [ + ('first line (good)', + 'any', + 80 * '#' + '\n', + []), + ('first line (bad)', + 'any', + '# very useful comment\n', + [['any:1: should be 80 hashes (url#writing-rules-mk)', + '# very useful comment\n', + 80 * '#']]), + ('second line (bad)', + 'any', + 80 * '#' + '\n' + '# package\n', + [['any:2: should be 1 hash (url#writing-rules-mk)', + '# package\n']]), + ('full header (good)', + 'any', + 80 * '#' + '\n' + '#\n' + '# package\n' + '#\n' + + 80 * '#' + '\n' + '\n', + []), + ('blank line after header (good)', + 'any', + 80 * '#' + '\n' + '#\n' + '# package\n' + '#\n' + + 80 * '#' + '\n' + '\n' + 'FOO_VERSION = 1\n', + []), + ('blank line after header (bad)', + 'any', + 80 * '#' + '\n' + '#\n' + '# package\n' + '#\n' + + 80 * '#' + '\n' + 'FOO_VERSION = 1\n', + [['any:6: should be a blank line (url#writing-rules-mk)', + 'FOO_VERSION = 1\n']]), + ('wrong number of hashes', + 'any', + 79 * '#' + '\n' + '#\n' + '# package\n' + '#\n' + + 81 * '#' + '\n' + '\n', + [['any:1: should be 80 hashes (url#writing-rules-mk)', + 79 * '#' + '\n', + 80 * '#'], + ['any:5: should be 80 hashes (url#writing-rules-mk)', + 81 * '#' + '\n', + 80 * '#']]), + ('allow include without header', + 'any', + 'include $(sort $(wildcard package/foo/*/*.mk))\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', PackageHeader) +def test_PackageHeader(testname, filename, string, expected): + warnings = util.check_file(m.PackageHeader, filename, string) + assert warnings == expected + + +RemoveDefaultPackageSourceVariable = [ + ('bad', + 'any.mk', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', + [['any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), + ('bad with path', + './any.mk', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', + [['./any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), + ('warn for correct line', + './any.mk', + '\n' + '\n' + '\n' + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n', + [['./any.mk:4: remove default value of _SOURCE variable (url#generic-package-reference)', + 'ANY_SOURCE = any-$(ANY_VERSION).tar.gz\n']]), + ('warn ignoring missing spaces', + './any.mk', + 'ANY_SOURCE=any-$(ANY_VERSION).tar.gz\n', + [['./any.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', + 'ANY_SOURCE=any-$(ANY_VERSION).tar.gz\n']]), + ('good', + './any.mk', + 'ANY_SOURCE = aNy-$(ANY_VERSION).tar.gz\n', + []), + ('gcc exception', + 'gcc.mk', + 'GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz\n', + []), + ('binutils exception', + './binutils.mk', + 'BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz\n', + []), + ('gdb exception', + 'gdb/gdb.mk', + 'GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz\n', + []), + ('package name with dash', + 'python-subprocess32.mk', + 'PYTHON_SUBPROCESS32_SOURCE = python-subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz\n', + [['python-subprocess32.mk:1: remove default value of _SOURCE variable (url#generic-package-reference)', + 'PYTHON_SUBPROCESS32_SOURCE = python-subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', RemoveDefaultPackageSourceVariable) +def test_RemoveDefaultPackageSourceVariable(testname, filename, string, expected): + warnings = util.check_file(m.RemoveDefaultPackageSourceVariable, filename, string) + assert warnings == expected + + +SpaceBeforeBackslash = [ + ('no backslash', + 'any.mk', + '\n', + []), + ('ignore missing indent', + 'any.mk', + 'define ANY_SOME_FIXUP\n' + 'for i in $$(find $(STAGING_DIR)/usr/lib* -name "any*.la"); do \\\n', + []), + ('ignore missing space', + 'any.mk', + 'ANY_CONF_ENV= \\\n' + '\tap_cv_void_ptr_lt_long=no \\\n', + []), + ('variable', + 'any.mk', + '\n' + 'ANY = \\\n', + []), + ('2 spaces', + 'any.mk', + 'ANY = \\\n', + [['any.mk:1: use only one space before backslash', + 'ANY = \\\n']]), + ('warn about correct line', + 'any.mk', + '\n' + 'ANY = \\\n', + [['any.mk:2: use only one space before backslash', + 'ANY = \\\n']]), + ('tab', + 'any.mk', + 'ANY =\t\\\n', + [['any.mk:1: use only one space before backslash', + 'ANY =\t\\\n']]), + ('tabs', + 'any.mk', + 'ANY =\t\t\\\n', + [['any.mk:1: use only one space before backslash', + 'ANY =\t\t\\\n']]), + ('spaces and tabs', + 'any.mk', + 'ANY = \t\t\\\n', + [['any.mk:1: use only one space before backslash', + 'ANY = \t\t\\\n']]), + ('mixed spaces and tabs 1', + 'any.mk', + 'ANY = \t \t\\\n', + [['any.mk:1: use only one space before backslash', + 'ANY = \t \t\\\n']]), + ('mixed spaces and tabs 2', + 'any.mk', + 'ANY = \t \\\n', + [['any.mk:1: use only one space before backslash', + 'ANY = \t \\\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', SpaceBeforeBackslash) +def test_SpaceBeforeBackslash(testname, filename, string, expected): + warnings = util.check_file(m.SpaceBeforeBackslash, filename, string) + assert warnings == expected + + +TrailingBackslash = [ + ('no backslash', + 'any.mk', + 'ANY = \n', + []), + ('one line', + 'any.mk', + 'ANY = \\\n', + []), + ('2 lines', + 'any.mk', + 'ANY = \\\n' + '\\\n', + []), + ('empty line after', + 'any.mk', + 'ANY = \\\n' + '\n', + [['any.mk:1: remove trailing backslash', + 'ANY = \\\n']]), + ('line with spaces after', + 'any.mk', + 'ANY = \\\n' + ' \n', + [['any.mk:1: remove trailing backslash', + 'ANY = \\\n']]), + ('line with tabs after', + 'any.mk', + 'ANY = \\\n' + '\t\n', + [['any.mk:1: remove trailing backslash', + 'ANY = \\\n']]), + ('ignore if commented', + 'any.mk', + '# ANY = \\\n' + '\n', + []), + ('real example', + 'any.mk', + 'ANY_CONF_ENV= \t\\\n' + '\tap_cv_void_ptr_lt_long=no \\\n' + '\n', + [['any.mk:2: remove trailing backslash', + '\tap_cv_void_ptr_lt_long=no \\\n']]), + ('ignore whitespace 1', + 'any.mk', + 'ANY = \t\t\\\n', + []), + ('ignore whitespace 2', + 'any.mk', + 'ANY = \t \t\\\n', + []), + ('ignore whitespace 3', + 'any.mk', + 'ANY = \t \\\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', TrailingBackslash) +def test_TrailingBackslash(testname, filename, string, expected): + warnings = util.check_file(m.TrailingBackslash, filename, string) + assert warnings == expected + + +TypoInPackageVariable = [ + ('good', + 'any.mk', + 'ANY_VAR = \n', + []), + ('good with path 1', + './any.mk', + 'ANY_VAR += \n', + []), + ('good with path 2', + 'any/any.mk', + 'ANY_VAR = \n', + []), + ('bad =', + 'any.mk', + 'OTHER_VAR = \n', + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + 'OTHER_VAR = \n']]), + ('bad +=', + 'any.mk', + 'OTHER_VAR += \n', + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + 'OTHER_VAR += \n']]), + ('ignore missing space', + 'any.mk', + 'OTHER_VAR= \n', + [['any.mk:1: possible typo: OTHER_VAR -> *ANY*', + 'OTHER_VAR= \n']]), + ('use path in the warning', + './any.mk', + 'OTHER_VAR = \n', + [['./any.mk:1: possible typo: OTHER_VAR -> *ANY*', + 'OTHER_VAR = \n']]), + ('another name', + 'other.mk', + 'ANY_VAR = \n', + [['other.mk:1: possible typo: ANY_VAR -> *OTHER*', + 'ANY_VAR = \n']]), + ('libc exception', + './any.mk', + 'BR_LIBC = \n', + []), + ('rootfs exception', + 'any.mk', + 'ROOTFS_ANY_VAR += \n', + []), + ('host (good)', + 'any.mk', + 'HOST_ANY_VAR += \n', + []), + ('host (bad)', + 'any.mk', + 'HOST_OTHER_VAR = \n', + [['any.mk:1: possible typo: HOST_OTHER_VAR -> *ANY*', + 'HOST_OTHER_VAR = \n']]), + ('provides', + 'any.mk', + 'ANY_PROVIDES = other thing\n' + 'OTHER_VAR = \n', + []), + ('ignore space', + 'any.mk', + 'ANY_PROVIDES = thing other \n' + 'OTHER_VAR = \n', + []), + ('wrong provides', + 'any.mk', + 'ANY_PROVIDES = other\n' + 'OTHERS_VAR = \n', + [['any.mk:2: possible typo: OTHERS_VAR -> *ANY*', + 'OTHERS_VAR = \n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', TypoInPackageVariable) +def test_TypoInPackageVariable(testname, filename, string, expected): + warnings = util.check_file(m.TypoInPackageVariable, filename, string) + assert warnings == expected + + +UselessFlag = [ + ('autoreconf no', + 'any.mk', + 'ANY_AUTORECONF=NO\n', + [['any.mk:1: useless default value (url#_infrastructure_for_autotools_based_packages)', + 'ANY_AUTORECONF=NO\n']]), + ('host autoreconf no', + 'any.mk', + 'HOST_ANY_AUTORECONF\n', + []), + ('autoreconf yes', + 'any.mk', + 'ANY_AUTORECONF=YES\n', + []), + ('libtool_patch yes', + 'any.mk', + 'ANY_LIBTOOL_PATCH\t= YES\n', + [['any.mk:1: useless default value (url#_infrastructure_for_autotools_based_packages)', + 'ANY_LIBTOOL_PATCH\t= YES\n']]), + ('libtool_patch no', + 'any.mk', + 'ANY_LIBTOOL_PATCH= \t NO\n', + []), + ('generic', + 'any.mk', + 'ANY_INSTALL_IMAGES = NO\n' + 'ANY_INSTALL_REDISTRIBUTE = YES\n' + 'ANY_INSTALL_STAGING = NO\n' + 'ANY_INSTALL_TARGET = YES\n', + [['any.mk:1: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_IMAGES = NO\n'], + ['any.mk:2: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_REDISTRIBUTE = YES\n'], + ['any.mk:3: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_STAGING = NO\n'], + ['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_TARGET = YES\n']]), + ('conditional', + 'any.mk', + 'ifneq (condition)\n' + 'ANY_INSTALL_IMAGES = NO\n' + 'endif\n' + 'ANY_INSTALL_REDISTRIBUTE = YES\n', + [['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', + 'ANY_INSTALL_REDISTRIBUTE = YES\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', UselessFlag) +def test_UselessFlag(testname, filename, string, expected): + warnings = util.check_file(m.UselessFlag, filename, string) + assert warnings == expected + + +VariableWithBraces = [ + ('good', + 'xmlstarlet.mk', + 'XMLSTARLET_CONF_OPTS += \\\n' + '\t--with-libxml-prefix=$(STAGING_DIR)/usr \\\n', + []), + ('bad', + 'xmlstarlet.mk', + 'XMLSTARLET_CONF_OPTS += \\\n' + '\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n', + [['xmlstarlet.mk:2: use $() to delimit variables, not ${}', + '\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n']]), + ('expanded by the shell', + 'sg3_utils.mk', + '\tfor prog in xcopy zone; do \\\n' + '\t\t$(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \\\n' + '\tdone\n', + []), + ('comments', + 'any.mk', + '#\t--with-libxml-prefix=${STAGING_DIR}/usr \\\n', + []), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', VariableWithBraces) +def test_VariableWithBraces(testname, filename, string, expected): + warnings = util.check_file(m.VariableWithBraces, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_lib_patch.py b/utils/checkpackagelib/test_lib_patch.py new file mode 100644 index 0000000000..3b6fadf38c --- /dev/null +++ b/utils/checkpackagelib/test_lib_patch.py @@ -0,0 +1,96 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_patch as m + + +ApplyOrder = [ + ('standard', # catches https://bugs.busybox.net/show_bug.cgi?id=11271 + '0001-description.patch', + '', + []), + ('standard with path', + 'path/0001-description.patch', + '', + []), + ('acceptable format', + '1-description.patch', + '', + []), + ('acceptable format with path', + 'path/1-description.patch', + '', + []), + ('old format', + 'package-0001-description.patch', + '', + [['package-0001-description.patch:0: use name -.patch (url#_providing_patches)']]), + ('old format with path', + 'path/package-0001-description.patch', + '', + [['path/package-0001-description.patch:0: use name -.patch (url#_providing_patches)']]), + ('missing number', + 'description.patch', + '', + [['description.patch:0: use name -.patch (url#_providing_patches)']]), + ('missing number with path', + 'path/description.patch', + '', + [['path/description.patch:0: use name -.patch (url#_providing_patches)']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', ApplyOrder) +def test_ApplyOrder(testname, filename, string, expected): + warnings = util.check_file(m.ApplyOrder, filename, string) + assert warnings == expected + + +NumberedSubject = [ + ('no subject', + 'patch', + '', + []), + ('acceptable because it is not a git patch', + 'patch', + 'Subject: [PATCH 24/105] text\n', + []), + ('good', + 'patch', + 'Subject: [PATCH] text\n' + 'diff --git a/configure.ac b/configure.ac\n', + []), + ('bad', + 'patch', + 'Subject: [PATCH 24/105] text\n' + 'diff --git a/configure.ac b/configure.ac\n', + [["patch:1: generate your patches with 'git format-patch -N'", + 'Subject: [PATCH 24/105] text\n']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', NumberedSubject) +def test_NumberedSubject(testname, filename, string, expected): + warnings = util.check_file(m.NumberedSubject, filename, string) + assert warnings == expected + + +Sob = [ + ('good', + 'patch', + 'Signed-off-by: John Doe \n', + []), + ('empty', + 'patch', + '', + [['patch:0: missing Signed-off-by in the header (url#_format_and_licensing_of_the_package_patches)']]), + ('bad', + 'patch', + 'Subject: [PATCH 24/105] text\n', + [['patch:0: missing Signed-off-by in the header (url#_format_and_licensing_of_the_package_patches)']]), + ] + + + at pytest.mark.parametrize('testname,filename,string,expected', Sob) +def test_Sob(testname, filename, string, expected): + warnings = util.check_file(m.Sob, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_util.py b/utils/checkpackagelib/test_util.py new file mode 100644 index 0000000000..23f2995e27 --- /dev/null +++ b/utils/checkpackagelib/test_util.py @@ -0,0 +1,8 @@ +def check_file(check_function, filename, string): + obj = check_function(filename, 'url') + result = [] + result.append(obj.before()) + for i, line in enumerate(string.splitlines(True)): + result.append(obj.check_line(i + 1, line)) + result.append(obj.after()) + return [r for r in result if r is not None] -- 2.25.1 From ricardo.martincoski at gmail.com Sun Jan 23 16:08:46 2022 From: ricardo.martincoski at gmail.com (Ricardo Martincoski) Date: Sun, 23 Jan 2022 13:08:46 -0300 Subject: [Buildroot] [PATCH v2 4/4] utils/docker-run: new script In-Reply-To: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> References: <20220123160847.2653086-1-ricardo.martincoski@gmail.com> Message-ID: <20220123160847.2653086-4-ricardo.martincoski@gmail.com> Add a small script to run commands in the same docker image used in the GitLab CI. For instance, one can run check-package unit tests without installing pytest directly in the host: $ ./utils/docker-run python3 -m pytest -v utils/checkpackagelib/ Signed-off-by: Ricardo Martincoski --- Changes v1 -> v2: - none NOTE: see also this other series for another use of this script: to call shellcheck from check-package with stable results, not depending on: - the developer having the tool shellcheck installed; - the version of the tool that is installed; http://patchwork.ozlabs.org/project/buildroot/patch/20211226184919.2753591-6-ricardo.martincoski at gmail.com/ --- utils/docker-run | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 utils/docker-run diff --git a/utils/docker-run b/utils/docker-run new file mode 100755 index 0000000000..499c194d13 --- /dev/null +++ b/utils/docker-run @@ -0,0 +1,7 @@ +#!/usr/bin/bash +set -o errexit -o pipefail +DIR=$(dirname "${0}") +MAIN_DIR=$(readlink -f "${DIR}/..") +IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') +set -x +docker run -v ${MAIN_DIR}:/home/br-user -t "${IMAGE}" $* -- 2.25.1 From kuzminov.sergey81 at gmail.com Sun Jan 23 18:07:33 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 23 Jan 2022 21:07:33 +0300 Subject: [Buildroot] [PATCH 25/28] configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-26-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-26-giulio.benetti@benettiengineering.com> Message-ID: <9c9b7005-6f85-f812-21b5-fa029136477b@gmail.com> 18.01.2022 13:43, Giulio Benetti: > This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and > supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. > > Signed-off-by: Giulio Benetti > --- > configs/orangepi_zero_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..a0af809e92 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,6 +1,6 @@ > BR2_arm=y > BR2_cortex_a7=y > -BR2_ARM_FPU_VFPV4=y > +BR2_ARM_FPU_NEON_VFPV4=y > BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y Tested-by: Sergey Kuzminov From kuzminov.sergey81 at gmail.com Sun Jan 23 18:39:13 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Sun, 23 Jan 2022 21:39:13 +0300 Subject: [Buildroot] [PATCH 21/28] configs/orangepi_pc_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <20220118104338.2081259-22-giulio.benetti@benettiengineering.com> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220118104338.2081259-22-giulio.benetti@benettiengineering.com> Message-ID: <277af5a8-5490-9d79-c84f-bac556a0d6af@gmail.com> Tested-by: Sergey Kuzminov From peter at korsgaard.com Sun Jan 23 18:46:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:46:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-plugins-bad: fix typo In-Reply-To: <20211217201528.35309-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 17 Dec 2021 21:15:28 +0100") References: <20211217201528.35309-1-fontaine.fabrice@gmail.com> Message-ID: <87h79uxpcf.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix typo added by commit 4ae8ecea8fb042931cebf8f8d4cb4bc891073a77 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 19:10:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:10:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: security bump to version 2.16.12 In-Reply-To: <20211217191252.30122-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 17 Dec 2021 20:12:52 +0100") References: <20211217191252.30122-1-fontaine.fabrice@gmail.com> Message-ID: <87czkixo7i.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-12 > https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 18:45:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:45:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1/gst1-plugins-bad: fix typo Message-ID: <20220123190401.6BF6082B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a81b639a808ad7c2c0172a16e8741375150eedfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix typo added by commit 4ae8ecea8fb042931cebf8f8d4cb4bc891073a77 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1b53b6ec34cc37aa547eb4d07d6ef43afc04cdee) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 628a9df42c..7bbb1aa5dd 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -331,7 +331,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz select BR2_PACKAGE_LIBASS -comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8" +comment "assrender plugin needs a toolchain w/ C++, gcc >= 4.8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From peter at korsgaard.com Sun Jan 23 19:04:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:04:49 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: remove Evan Zelkowitz Message-ID: <20220123190401.7D7B28136B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7836d25c38fc0566dde7547bc1efd70b012413a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Evan has privately requested to no longer receive e-mails related to this Buildroot package. Signed-off-by: Thomas Petazzoni (cherry picked from commit acc0d51c53d5da45fc0da725513cd0ab8a2d4107) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index f90224989f..e1e526a666 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -761,9 +761,6 @@ F: package/optee-test/ N: Eugene Tarassov F: package/tcf-agent/ -N: Evan Zelkowitz -F: package/sdl_gfx/ - N: Ezequiel Garcia F: board/ci20/ F: configs/ci20_defconfig From peter at korsgaard.com Sun Jan 23 18:35:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:35:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lapack: fix CVE-2021-4048 Message-ID: <20220123190401.5AD81828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5ae65a5e13b121ec726997084e7d6842832d5aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. It should be noted that commit 59a1fcc69620da8eab1c048977fa22d297b18284 wrongly assumed that this CVE was fixed in version 3.10.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 83134027a02a6bea7320323562af9f75429c582f) Signed-off-by: Peter Korsgaard --- .../0001-Fix-out-of-bounds-read-in-slarrv.patch | 82 ++++++++++++++++++++++ package/lapack/lapack.mk | 3 + 2 files changed, 85 insertions(+) diff --git a/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch new file mode 100644 index 0000000000..43c6444b02 --- /dev/null +++ b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch @@ -0,0 +1,82 @@ +From 0631b6beaed60ba118b0b027c0f8d35397bf5df0 Mon Sep 17 00:00:00 2001 +From: Keno Fischer +Date: Thu, 30 Sep 2021 03:51:23 -0400 +Subject: [PATCH] Fix out of bounds read in slarrv + +This was originally reported as https://github.com/JuliaLang/julia/issues/42415. +I've tracked this down to an our of bounds read on the following line: + +https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L423 + +In the crashing example, `M` is `0`, causing `slarrv` to read uninitialized +memory from the work array. I believe the `0` for `M` is correct and indeed, +the documentation above supports that `M` may be zero: + +https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L113-L116 + +I believe it may be sufficient to early-out this function as suggested +in this PR. However, I have limited context for the full routine here, +so I would appreciate a sanity check. + +[Retrieved from: +https://github.com/Reference-LAPACK/lapack/commit/38f3eeee3108b18158409ca2a100e6fe03754781] +Signed-off-by: Fabrice Fontaine +--- + SRC/clarrv.f | 2 +- + SRC/dlarrv.f | 2 +- + SRC/slarrv.f | 2 +- + SRC/zlarrv.f | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SRC/clarrv.f b/SRC/clarrv.f +index 1f09e4da6..42f710757 100644 +--- a/SRC/clarrv.f ++++ b/SRC/clarrv.f +@@ -348,7 +348,7 @@ SUBROUTINE CLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/dlarrv.f b/SRC/dlarrv.f +index b036c1e66..299430361 100644 +--- a/SRC/dlarrv.f ++++ b/SRC/dlarrv.f +@@ -350,7 +350,7 @@ SUBROUTINE DLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/slarrv.f b/SRC/slarrv.f +index 9d72b339a..95f94fd1b 100644 +--- a/SRC/slarrv.f ++++ b/SRC/slarrv.f +@@ -350,7 +350,7 @@ SUBROUTINE SLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/zlarrv.f b/SRC/zlarrv.f +index 51ec558f5..e4be63e0d 100644 +--- a/SRC/zlarrv.f ++++ b/SRC/zlarrv.f +@@ -348,7 +348,7 @@ SUBROUTINE ZLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index f34f685ae2..a80131c9ad 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -12,6 +12,9 @@ LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON +# 0001-Fix-out-of-bounds-read-in-slarrv.patch +LAPACK_IGNORE_CVES += CVE-2021-4048 + ifeq ($(BR2_PACKAGE_LAPACK_COMPLEX),y) LAPACK_CONF_OPTS += -DBUILD_COMPLEX=ON -DBUILD_COMPLEX16=ON else From peter at korsgaard.com Sun Jan 23 19:08:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:08:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mbedtls: security bump to version 2.16.12 Message-ID: <20220123190401.866D982B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea7ed63f1d151c584888529bf9a3a2f5bacf929a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-12 https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da5c80f6750899578882688e68c128d8a21032c8) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index b93da164f9..8247748afd 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.11: -sha256 c18e7e9abf95e69e425260493720470021384a1728417042060a35d0b7b18b41 mbedtls-2.16.11.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12: +sha256 294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393 mbedtls-2.16.12.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 9207daf186..93ac1bb163 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.11 +MBEDTLS_VERSION = 2.16.12 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From peter at korsgaard.com Sun Jan 23 19:03:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:03:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/imagemagick: fix dependency Message-ID: <20220123190401.73D10828C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=815d8f10bcb431151da10434bec034d62e9d287c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS dependency was wrongly added to BR2_PACKAGE_HOST_IMAGEMAGICK by commit df20e4546384d1c249a6a0541183590671e83d77, indeed host-librsvg is only needed by BR2_PACKAGE_HOST_IMAGEMAGICK_SVG Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 38f6b42d310e389245a6772ae20b8bce73e1c61c) Signed-off-by: Peter Korsgaard --- package/imagemagick/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/imagemagick/Config.in.host b/package/imagemagick/Config.in.host index e12d82939a..671b0995dc 100644 --- a/package/imagemagick/Config.in.host +++ b/package/imagemagick/Config.in.host @@ -1,6 +1,5 @@ config BR2_PACKAGE_HOST_IMAGEMAGICK bool "host imagemagick" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help ImageMagick(R) is a software suite to create, edit, and compose bitmap images. It can read, convert and write images @@ -17,6 +16,7 @@ if BR2_PACKAGE_HOST_IMAGEMAGICK config BR2_PACKAGE_HOST_IMAGEMAGICK_SVG bool "SVG support" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help Say 'y' here is you need ImageMagick tools (like convert) to support SVG. From peter at korsgaard.com Sun Jan 23 18:35:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:35:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lapack: add LAPACK_CPE_ID_VENDOR Message-ID: <20220123190401.632688136B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5356cb58be9b2146085aa7f89ff3e1bdcbffe7e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:lapack_project:lapack is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alapack_project%3Alapack Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 52570be4e9bedf4fb543429fcef23873f77a1193) Signed-off-by: Peter Korsgaard --- package/lapack/lapack.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index a80131c9ad..609075842d 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -8,6 +8,7 @@ LAPACK_VERSION = 3.10.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) +LAPACK_CPE_ID_VENDOR = lapack_project LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON From peter at korsgaard.com Sun Jan 23 18:35:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:35:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lapack: add LAPACK_CPE_ID_VENDOR Message-ID: <20220123190408.1689F82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74d23e17d53e704921bc3a699c52c389c07a09fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:lapack_project:lapack is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alapack_project%3Alapack Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 52570be4e9bedf4fb543429fcef23873f77a1193) Signed-off-by: Peter Korsgaard --- package/lapack/lapack.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index a80131c9ad..609075842d 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -8,6 +8,7 @@ LAPACK_VERSION = 3.10.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) +LAPACK_CPE_ID_VENDOR = lapack_project LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON From peter at korsgaard.com Sun Jan 23 19:04:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:04:57 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: remove Evan Zelkowitz Message-ID: <20220123190408.31FCF82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5737ed3478278b66125b8bcf403a3cffa6488a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Evan has privately requested to no longer receive e-mails related to this Buildroot package. Signed-off-by: Thomas Petazzoni (cherry picked from commit acc0d51c53d5da45fc0da725513cd0ab8a2d4107) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a4fdf3eddd..a9179fc154 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -787,9 +787,6 @@ F: package/optee-test/ N: Eugene Tarassov F: package/tcf-agent/ -N: Evan Zelkowitz -F: package/sdl_gfx/ - N: Ezequiel Garcia F: board/ci20/ F: configs/ci20_defconfig From peter at korsgaard.com Sun Jan 23 18:35:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:35:01 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lapack: fix CVE-2021-4048 Message-ID: <20220123190408.0D99682B29@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05b168b3a1d19c183c6085efab0196b6e7a514e3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4048: An out-of-bounds read flaw was found in the CLARRV, DLARRV, SLARRV, and ZLARRV functions in lapack through version 3.10.0, as also used in OpenBLAS before version 0.3.18. Specially crafted inputs passed to these functions could cause an application using lapack to crash or possibly disclose portions of its memory. It should be noted that commit 59a1fcc69620da8eab1c048977fa22d297b18284 wrongly assumed that this CVE was fixed in version 3.10.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 83134027a02a6bea7320323562af9f75429c582f) Signed-off-by: Peter Korsgaard --- .../0001-Fix-out-of-bounds-read-in-slarrv.patch | 82 ++++++++++++++++++++++ package/lapack/lapack.mk | 3 + 2 files changed, 85 insertions(+) diff --git a/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch new file mode 100644 index 0000000000..43c6444b02 --- /dev/null +++ b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch @@ -0,0 +1,82 @@ +From 0631b6beaed60ba118b0b027c0f8d35397bf5df0 Mon Sep 17 00:00:00 2001 +From: Keno Fischer +Date: Thu, 30 Sep 2021 03:51:23 -0400 +Subject: [PATCH] Fix out of bounds read in slarrv + +This was originally reported as https://github.com/JuliaLang/julia/issues/42415. +I've tracked this down to an our of bounds read on the following line: + +https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L423 + +In the crashing example, `M` is `0`, causing `slarrv` to read uninitialized +memory from the work array. I believe the `0` for `M` is correct and indeed, +the documentation above supports that `M` may be zero: + +https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L113-L116 + +I believe it may be sufficient to early-out this function as suggested +in this PR. However, I have limited context for the full routine here, +so I would appreciate a sanity check. + +[Retrieved from: +https://github.com/Reference-LAPACK/lapack/commit/38f3eeee3108b18158409ca2a100e6fe03754781] +Signed-off-by: Fabrice Fontaine +--- + SRC/clarrv.f | 2 +- + SRC/dlarrv.f | 2 +- + SRC/slarrv.f | 2 +- + SRC/zlarrv.f | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SRC/clarrv.f b/SRC/clarrv.f +index 1f09e4da6..42f710757 100644 +--- a/SRC/clarrv.f ++++ b/SRC/clarrv.f +@@ -348,7 +348,7 @@ SUBROUTINE CLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/dlarrv.f b/SRC/dlarrv.f +index b036c1e66..299430361 100644 +--- a/SRC/dlarrv.f ++++ b/SRC/dlarrv.f +@@ -350,7 +350,7 @@ SUBROUTINE DLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/slarrv.f b/SRC/slarrv.f +index 9d72b339a..95f94fd1b 100644 +--- a/SRC/slarrv.f ++++ b/SRC/slarrv.f +@@ -350,7 +350,7 @@ SUBROUTINE SLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * +diff --git a/SRC/zlarrv.f b/SRC/zlarrv.f +index 51ec558f5..e4be63e0d 100644 +--- a/SRC/zlarrv.f ++++ b/SRC/zlarrv.f +@@ -348,7 +348,7 @@ SUBROUTINE ZLARRV( N, VL, VU, D, L, PIVMIN, + * + * Quick return if possible + * +- IF( N.LE.0 ) THEN ++ IF( (N.LE.0).OR.(M.LE.0) ) THEN + RETURN + END IF + * diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index f34f685ae2..a80131c9ad 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -12,6 +12,9 @@ LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON +# 0001-Fix-out-of-bounds-read-in-slarrv.patch +LAPACK_IGNORE_CVES += CVE-2021-4048 + ifeq ($(BR2_PACKAGE_LAPACK_COMPLEX),y) LAPACK_CONF_OPTS += -DBUILD_COMPLEX=ON -DBUILD_COMPLEX16=ON else From peter at korsgaard.com Sun Jan 23 18:45:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:45:21 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1/gst1-plugins-bad: fix typo Message-ID: <20220123190408.1FCB082968@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bda3b9e6c9b6fb19cd25a7b9fe56d776927bf59f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix typo added by commit 4ae8ecea8fb042931cebf8f8d4cb4bc891073a77 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1b53b6ec34cc37aa547eb4d07d6ef43afc04cdee) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1204a65681..239a45bb63 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -331,7 +331,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz select BR2_PACKAGE_LIBASS -comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8" +comment "assrender plugin needs a toolchain w/ C++, gcc >= 4.8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From peter at korsgaard.com Sun Jan 23 19:03:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:03:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/imagemagick: fix dependency Message-ID: <20220123190408.287E582B29@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=535541bd4c674c717921be6bc9330134c504c1e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS dependency was wrongly added to BR2_PACKAGE_HOST_IMAGEMAGICK by commit df20e4546384d1c249a6a0541183590671e83d77, indeed host-librsvg is only needed by BR2_PACKAGE_HOST_IMAGEMAGICK_SVG Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 38f6b42d310e389245a6772ae20b8bce73e1c61c) Signed-off-by: Peter Korsgaard --- package/imagemagick/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/imagemagick/Config.in.host b/package/imagemagick/Config.in.host index e12d82939a..671b0995dc 100644 --- a/package/imagemagick/Config.in.host +++ b/package/imagemagick/Config.in.host @@ -1,6 +1,5 @@ config BR2_PACKAGE_HOST_IMAGEMAGICK bool "host imagemagick" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help ImageMagick(R) is a software suite to create, edit, and compose bitmap images. It can read, convert and write images @@ -17,6 +16,7 @@ if BR2_PACKAGE_HOST_IMAGEMAGICK config BR2_PACKAGE_HOST_IMAGEMAGICK_SVG bool "SVG support" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg help Say 'y' here is you need ImageMagick tools (like convert) to support SVG. From peter at korsgaard.com Sun Jan 23 18:32:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 19:32:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xenomai: fix build with glibc >= 2.34 Message-ID: <20220123190408.0599582968@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee32b0446fd4b202a05e59073c62238dc2aabf6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure with glibc >= 2.34: In file included from timerobj.c:32: In function 'threadobj_set_current', inlined from 'server_prologue' at timerobj.c:94:2: ../../include/copperplate/threadobj.h:252:9: error: 'pthread_setspecific' expecting 1 byte in a region of size 0 [-Werror=stringop-overread] 252 | pthread_setspecific(threadobj_tskey, thobj); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ed93f916eda304b30f320816c85d1b0d4488c699 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 1b3055cc8d25e496928643ef93f3a47910fa4974) Signed-off-by: Peter Korsgaard --- ...e-valid-addresses-for-pthread_setspecific.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch b/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch new file mode 100644 index 0000000000..0c39a4ecf7 --- /dev/null +++ b/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch @@ -0,0 +1,57 @@ +From 627d488db3aa71406e32d4d8934629e8b0f35905 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Sat, 16 Oct 2021 15:46:33 +0200 +Subject: [PATCH] lib/{cobalt,copperplate}: Use valid addresses for + pthread_setspecific + +glibx 2.34 and newer annotated pthread_setspecific in a way that gcc-11 +complains about non-NULL pointers that are outside of what is considered +valid. So use dummy addresses instead. namely the related pthread keys. +Those pointers will never be dereferenced in both use cases. + +See also https://sourceware.org/bugzilla/show_bug.cgi?id=28458. + +Reported-by: Vitaly Chikunov +Signed-off-by: Jan Kiszka + +[Retrieved from: +https://source.denx.de/Xenomai/xenomai/-/commit/627d488db3aa71406e32d4d8934629e8b0f35905] +Signed-off-by: Fabrice Fontaine +--- + include/copperplate/threadobj.h | 6 +++++- + lib/cobalt/printf.c | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h +index 7e6904f4c..c8363415b 100644 +--- a/include/copperplate/threadobj.h ++++ b/include/copperplate/threadobj.h +@@ -173,7 +173,11 @@ void threadobj_save_timeout(struct threadobj_corespec *corespec, + #define __THREAD_M_SPARE6 (1 << 22) + #define __THREAD_M_SPARE7 (1 << 23) + +-#define THREADOBJ_IRQCONTEXT ((struct threadobj *)-2UL) ++/* ++ * We need to use a valid address here. The object will never be dereferenced ++ * when it is identified as IRQ context, so the pthread key itself is fine. ++ */ ++#define THREADOBJ_IRQCONTEXT ((struct threadobj *)&threadobj_tskey) + + struct traceobj; + struct syncobj; +diff --git a/lib/cobalt/printf.c b/lib/cobalt/printf.c +index 8982ddc93..0aa5940c6 100644 +--- a/lib/cobalt/printf.c ++++ b/lib/cobalt/printf.c +@@ -729,7 +729,7 @@ done: + pthread_cond_init(&printer_wakeup, NULL); + spawn_printer_thread(); + /* We just need a non-zero TSD to trigger the dtor upon unwinding. */ +- pthread_setspecific(cleanup_key, (void *)1); ++ pthread_setspecific(cleanup_key, &cleanup_key); + + atexit(rt_print_flush_buffers); + } +-- +GitLab + From peter at korsgaard.com Sun Jan 23 19:08:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:08:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mbedtls: security bump to version 2.16.12 Message-ID: <20220123190408.3A71382968@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9319c37a6085ccc9daf389f40f6f0382f57c05f3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-12 https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da5c80f6750899578882688e68c128d8a21032c8) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index b93da164f9..8247748afd 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.11: -sha256 c18e7e9abf95e69e425260493720470021384a1728417042060a35d0b7b18b41 mbedtls-2.16.11.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.12: +sha256 294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393 mbedtls-2.16.12.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 9207daf186..93ac1bb163 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.11 +MBEDTLS_VERSION = 2.16.12 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From giulio.benetti at benettiengineering.com Sun Jan 23 19:12:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 23 Jan 2022 20:12:25 +0100 Subject: [Buildroot] [PATCH 25/28] configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <9c9b7005-6f85-f812-21b5-fa029136477b@gmail.com> References: <9c9b7005-6f85-f812-21b5-fa029136477b@gmail.com> Message-ID: <83218573-DFC3-4AA3-B21E-F5C32DBADC1B@benettiengineering.com> Hi Sergey, thank you for the Tested-by, but you should put it? > Il giorno 23 gen 2022, alle ore 19:08, Sergey Kuzminov ha scritto: > > ?18.01.2022 13:43, Giulio Benetti: >> This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and >> supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. >> Signed-off-by: Giulio Benetti ?here, after my SoB. And when answering to Mailing List(ML), always use ?Reply to All?. Honestly it?s since years I always use ?Reply to All? because it works both for multiple recipients and for single recipient too. This way I don?t forget to do it. Best regards! Giulio >> --- >> configs/orangepi_zero_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig >> index 1c107b10e6..a0af809e92 100644 >> --- a/configs/orangepi_zero_defconfig >> +++ b/configs/orangepi_zero_defconfig >> @@ -1,6 +1,6 @@ >> BR2_arm=y >> BR2_cortex_a7=y >> -BR2_ARM_FPU_VFPV4=y >> +BR2_ARM_FPU_NEON_VFPV4=y >> BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > > Tested-by: Sergey Kuzminov > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Sun Jan 23 19:35:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:35:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lxml: security bump to version 4.6.5 In-Reply-To: <20211219173830.1364434-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 19 Dec 2021 18:38:30 +0100") References: <20211219173830.1364434-1-fontaine.fabrice@gmail.com> Message-ID: <878rv6xn1y.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - A vulnerability (GHSL-2021-1038) in the HTML cleaner allowed sneaking > script content through SVG images (CVE-2021-43818). > - A vulnerability (GHSL-2021-1037) in the HTML cleaner allowed sneaking > script content through CSS imports and other crafted constructs > (CVE-2021-43818). > https://github.com/lxml/lxml/blob/lxml-4.6.5/CHANGES.txt > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 19:35:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:35:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-lxml: security bump to version 4.6.5 Message-ID: <20220123192944.D9B7C82973@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3377aa01883c8b88ff2c4918cd0dbc0e863e9bdb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - A vulnerability (GHSL-2021-1038) in the HTML cleaner allowed sneaking script content through SVG images (CVE-2021-43818). - A vulnerability (GHSL-2021-1037) in the HTML cleaner allowed sneaking script content through CSS imports and other crafted constructs (CVE-2021-43818). https://github.com/lxml/lxml/blob/lxml-4.6.5/CHANGES.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ad6321660c91c9440c17a770505bfc1742e57d33) Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index dd6446e6cc..e33a8f8109 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468 lxml-4.6.3.tar.gz +sha256 6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca lxml-4.6.5.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 0d3775a1bd..8c2e965af6 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.6.3 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e5/21/a2e4517e3d216f0051687eea3d3317557bde68736f038a3b105ac3809247 +PYTHON_LXML_VERSION = 4.6.5 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e6/e1/34b3ab08553fe9a30e15b2bb9d1803a49d7d907dd9f245638839190042f0 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From peter at korsgaard.com Sun Jan 23 19:34:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:34:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-lxml: security bump to version 4.6.5 Message-ID: <20220123192954.D46AD82973@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cca59981bb2ad73675555f35c4c3f6dcbe7a1fcc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - A vulnerability (GHSL-2021-1038) in the HTML cleaner allowed sneaking script content through SVG images (CVE-2021-43818). - A vulnerability (GHSL-2021-1037) in the HTML cleaner allowed sneaking script content through CSS imports and other crafted constructs (CVE-2021-43818). https://github.com/lxml/lxml/blob/lxml-4.6.5/CHANGES.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ad6321660c91c9440c17a770505bfc1742e57d33) Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index dd6446e6cc..e33a8f8109 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468 lxml-4.6.3.tar.gz +sha256 6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca lxml-4.6.5.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 0d3775a1bd..8c2e965af6 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.6.3 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e5/21/a2e4517e3d216f0051687eea3d3317557bde68736f038a3b105ac3809247 +PYTHON_LXML_VERSION = 4.6.5 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e6/e1/34b3ab08553fe9a30e15b2bb9d1803a49d7d907dd9f245638839190042f0 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From peter at korsgaard.com Sun Jan 23 19:41:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:41:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/janus-gateway: fix CVE-2021-4124 In-Reply-To: <20211222090951.505097-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 22 Dec 2021 10:09:51 +0100") References: <20211222090951.505097-1-fontaine.fabrice@gmail.com> Message-ID: <874k5uxms9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > janus-gateway is vulnerable to Improper Neutralization of Input During > Web Page Generation ('Cross-site Scripting') > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 19:39:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:39:30 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/janus-gateway: fix CVE-2021-4124 Message-ID: <20220123193446.CD97C82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4e00807d44b61a444410afa66650a0095532a8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x janus-gateway is vulnerable to Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting') Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2fd3c2cf43a189430cb53cb1434d37d7a3a78b47) Signed-off-by: Peter Korsgaard --- .../0004-Fixed-missing-XSS-mitigation.patch | 25 ++++++++++++++++++++++ package/janus-gateway/janus-gateway.mk | 3 +++ 2 files changed, 28 insertions(+) diff --git a/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch new file mode 100644 index 0000000000..e1e612133b --- /dev/null +++ b/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch @@ -0,0 +1,25 @@ +From f62bba6513ec840761f2434b93168106c7c65a3d Mon Sep 17 00:00:00 2001 +From: Lorenzo Miniero +Date: Wed, 15 Dec 2021 14:10:01 +0100 +Subject: [PATCH] Fixed missing XSS mitigation (see #2817) + +[Retrieved from: +https://github.com/meetecho/janus-gateway/commit/f62bba6513ec840761f2434b93168106c7c65a3d] +Signed-off-by: Fabrice Fontaine +--- + html/textroomtest.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/html/textroomtest.js b/html/textroomtest.js +index bf95a260a..7d5ae832c 100644 +--- a/html/textroomtest.js ++++ b/html/textroomtest.js +@@ -351,7 +351,7 @@ function sendPrivateMsg(username) { + text: JSON.stringify(message), + error: function(reason) { bootbox.alert(reason); }, + success: function() { +- $('#chatroom').append('

    [' + getDateString() + '] [whisper to ' + display + '] ' + result); ++ $('#chatroom').append('

    [' + getDateString() + '] [whisper to ' + display + '] ' + escapeXmlTags(result)); + $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; + } + }); diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 98e00aeeb8..83d28ff6c7 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -14,6 +14,9 @@ JANUS_GATEWAY_CPE_ID_PRODUCT = janus # 0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4020 +# 0004-Fixed-missing-XSS-mitigation.patch +JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 + # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ libsrtp host-gengetopt libglib2 openssl libconfig \ From peter at korsgaard.com Sun Jan 23 19:38:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:38:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/janus-gateway: fix CVE-2021-4124 Message-ID: <20220123193812.CF7F782B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c756e6ac7b14684712f85fcdc18598431f081a72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x janus-gateway is vulnerable to Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting') Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2fd3c2cf43a189430cb53cb1434d37d7a3a78b47) Signed-off-by: Peter Korsgaard --- .../0004-Fixed-missing-XSS-mitigation.patch | 25 ++++++++++++++++++++++ package/janus-gateway/janus-gateway.mk | 3 +++ 2 files changed, 28 insertions(+) diff --git a/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch new file mode 100644 index 0000000000..e1e612133b --- /dev/null +++ b/package/janus-gateway/0004-Fixed-missing-XSS-mitigation.patch @@ -0,0 +1,25 @@ +From f62bba6513ec840761f2434b93168106c7c65a3d Mon Sep 17 00:00:00 2001 +From: Lorenzo Miniero +Date: Wed, 15 Dec 2021 14:10:01 +0100 +Subject: [PATCH] Fixed missing XSS mitigation (see #2817) + +[Retrieved from: +https://github.com/meetecho/janus-gateway/commit/f62bba6513ec840761f2434b93168106c7c65a3d] +Signed-off-by: Fabrice Fontaine +--- + html/textroomtest.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/html/textroomtest.js b/html/textroomtest.js +index bf95a260a..7d5ae832c 100644 +--- a/html/textroomtest.js ++++ b/html/textroomtest.js +@@ -351,7 +351,7 @@ function sendPrivateMsg(username) { + text: JSON.stringify(message), + error: function(reason) { bootbox.alert(reason); }, + success: function() { +- $('#chatroom').append('

    [' + getDateString() + '] [whisper to ' + display + '] ' + result); ++ $('#chatroom').append('

    [' + getDateString() + '] [whisper to ' + display + '] ' + escapeXmlTags(result)); + $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; + } + }); diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 98e00aeeb8..83d28ff6c7 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -14,6 +14,9 @@ JANUS_GATEWAY_CPE_ID_PRODUCT = janus # 0003-Fix-potential-Cross-site-Scripting-XSS-exploits-in-demos.patch JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4020 +# 0004-Fixed-missing-XSS-mitigation.patch +JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 + # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ libsrtp host-gengetopt libglib2 openssl libconfig \ From peter at korsgaard.com Sun Jan 23 19:49:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:49:43 +0100 Subject: [Buildroot] [PATCH] pakage/apache: security bump to version 2.4.52 In-Reply-To: <20211222174246.26822-1-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 22 Dec 2021 18:42:45 +0100") References: <20211222174246.26822-1-peter@korsgaard.com> Message-ID: <87zgnmw7u0.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > *) SECURITY: CVE-2021-44790: Possible buffer overflow when parsing > multipart content in mod_lua of Apache HTTP Server 2.4.51 and > earlier (cve.mitre.org) > A carefully crafted request body can cause a buffer overflow in > the mod_lua multipart parser (r:parsebody() called from Lua > scripts). > The Apache httpd team is not aware of an exploit for the > vulnerabilty though it might be possible to craft one. > This issue affects Apache HTTP Server 2.4.51 and earlier. > Credits: Chamal > *) SECURITY: CVE-2021-44224: Possible NULL dereference or SSRF in > forward proxy configurations in Apache HTTP Server 2.4.51 and > earlier (cve.mitre.org) > A crafted URI sent to httpd configured as a forward proxy > (ProxyRequests on) can cause a crash (NULL pointer dereference) > or, for configurations mixing forward and reverse proxy > declarations, can allow for requests to be directed to a > declared Unix Domain Socket endpoint (Server Side Request > Forgery). > This issue affects Apache HTTP Server 2.4.7 up to 2.4.51 > (included). > For more details, see the changes file: > https://downloads.apache.org/httpd/CHANGES_2.4.52 > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 19:48:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:48:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/apache: security bump to version 2.4.52 Message-ID: <20220123194303.6B4DD829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e29333183c94e8739ef6995e63a1cccb53219f52 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: *) SECURITY: CVE-2021-44790: Possible buffer overflow when parsing multipart content in mod_lua of Apache HTTP Server 2.4.51 and earlier (cve.mitre.org) A carefully crafted request body can cause a buffer overflow in the mod_lua multipart parser (r:parsebody() called from Lua scripts). The Apache httpd team is not aware of an exploit for the vulnerabilty though it might be possible to craft one. This issue affects Apache HTTP Server 2.4.51 and earlier. Credits: Chamal *) SECURITY: CVE-2021-44224: Possible NULL dereference or SSRF in forward proxy configurations in Apache HTTP Server 2.4.51 and earlier (cve.mitre.org) A crafted URI sent to httpd configured as a forward proxy (ProxyRequests on) can cause a crash (NULL pointer dereference) or, for configurations mixing forward and reverse proxy declarations, can allow for requests to be directed to a declared Unix Domain Socket endpoint (Server Side Request Forgery). This issue affects Apache HTTP Server 2.4.7 up to 2.4.51 (included). For more details, see the changes file: https://downloads.apache.org/httpd/CHANGES_2.4.52 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit bdc3f6888f669919bf8820be1eb75340b48ee7e1) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 138717c336..014d920772 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.51.tar.bz2.{sha256,sha512} -sha256 20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 httpd-2.4.51.tar.bz2 -sha512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} +sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 +sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index d55f43148e..3b518795be 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.51 +APACHE_VERSION = 2.4.52 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From peter at korsgaard.com Sun Jan 23 19:47:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 20:47:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/apache: security bump to version 2.4.52 Message-ID: <20220123194309.E0277829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1eb325609509caa6eced3220f88434add8e08125 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: *) SECURITY: CVE-2021-44790: Possible buffer overflow when parsing multipart content in mod_lua of Apache HTTP Server 2.4.51 and earlier (cve.mitre.org) A carefully crafted request body can cause a buffer overflow in the mod_lua multipart parser (r:parsebody() called from Lua scripts). The Apache httpd team is not aware of an exploit for the vulnerabilty though it might be possible to craft one. This issue affects Apache HTTP Server 2.4.51 and earlier. Credits: Chamal *) SECURITY: CVE-2021-44224: Possible NULL dereference or SSRF in forward proxy configurations in Apache HTTP Server 2.4.51 and earlier (cve.mitre.org) A crafted URI sent to httpd configured as a forward proxy (ProxyRequests on) can cause a crash (NULL pointer dereference) or, for configurations mixing forward and reverse proxy declarations, can allow for requests to be directed to a declared Unix Domain Socket endpoint (Server Side Request Forgery). This issue affects Apache HTTP Server 2.4.7 up to 2.4.51 (included). For more details, see the changes file: https://downloads.apache.org/httpd/CHANGES_2.4.52 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit bdc3f6888f669919bf8820be1eb75340b48ee7e1) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 138717c336..014d920772 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.51.tar.bz2.{sha256,sha512} -sha256 20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 httpd-2.4.51.tar.bz2 -sha512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} +sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 +sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index ff01b25106..5fcb887fbc 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.51 +APACHE_VERSION = 2.4.52 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Sun Jan 23 19:49:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:27 +0100 Subject: [Buildroot] [git commit] package/nmon: bump to version 16n Message-ID: <20220123194537.CC94782B4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a42e347222a2d04947d2e6985ea241ce593a0ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nmon/nmon.hash | 6 +++--- package/nmon/nmon.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nmon/nmon.hash b/package/nmon/nmon.hash index fd3f09c63a..1d7226a4fe 100644 --- a/package/nmon/nmon.hash +++ b/package/nmon/nmon.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/nmon/files/ -md5 df67f07ea4006c6204acff586beada81 lmon16m.c -sha1 68cd02be19036a287fe352823db93223e73a9411 lmon16m.c +md5 a8172601fdc05f3bc58455cbd3f4475e lmon16n.c +sha1 024a3b56179838f0e04bf1706cc9ba56595301a8 lmon16n.c # Locally computed -sha256 2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 lmon16m.c +sha256 c0012cc2d925dee940c37ceae297abac64ba5a5c30e575e7418b04028613f5f2 lmon16n.c diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk index 8b39748cce..01371a8c74 100644 --- a/package/nmon/nmon.mk +++ b/package/nmon/nmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMON_VERSION = 16m +NMON_VERSION = 16n NMON_SITE = https://sourceforge.net/projects/nmon/files NMON_SOURCE = lmon$(NMON_VERSION).c NMON_LICENSE = GPL-3.0+ From yann.morin.1998 at free.fr Sun Jan 23 19:49:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:21 +0100 Subject: [Buildroot] [git commit] package/xl2tp: bump to version 1.3.17 Message-ID: <20220123194537.B33D38296B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa1a33027fabe03f98b10edfa2a94555e9413415 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/xelerance/xl2tpd/releases/tag/v1.3.17 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xl2tp/xl2tp.hash | 2 +- package/xl2tp/xl2tp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash index 471657f0f2..eca918bc83 100644 --- a/package/xl2tp/xl2tp.hash +++ b/package/xl2tp/xl2tp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 c28608b315adb25c8bf9579c1d6ab52ab47c4c43b68a5ab63c5d039196fd180f xl2tp-1.3.16.tar.gz +sha256 898d9b6a374c78dea5f20d80fd50fac13428ad746fefb16ff5f6bec449affe67 xl2tp-1.3.17.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index ca404060a2..e42eeb1709 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XL2TP_VERSION = 1.3.16 +XL2TP_VERSION = 1.3.17 XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap XL2TP_LICENSE = GPL-2.0 From yann.morin.1998 at free.fr Sun Jan 23 19:49:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:34 +0100 Subject: [Buildroot] [git commit] package/libpjsip: security bump to version 2.11.1 Message-ID: <20220123194537.DE43C82B40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c7ad667ec4a25226848baba809e492ca0ff06da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security update. This version is recommended for all users to improve the security of applications using PJSIP. Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 Update indentation in hash file (two spaces) https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr https://github.com/pjsip/pjproject/releases/tag/2.11 https://github.com/pjsip/pjproject/releases/tag/2.11.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libpjsip/libpjsip.hash | 4 ++-- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 68c2208885..f39ebf4060 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8feec9bcb2..0a93780e93 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.10 +LIBPJSIP_VERSION = 2.11.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From yann.morin.1998 at free.fr Sun Jan 23 19:49:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:31 +0100 Subject: [Buildroot] [git commit] package/lft: bump to version 3.91 Message-ID: <20220123194537.D5D628296B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=038d7d685f811d48c2870df86c94c8641539f78b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master lft 3.91 / WhoB 3.91 ---------------------- - Fixed bugs.debian.org/cgi-bin/bugreport.cgi?bug=922430 - Updated date lft 3.9 / WhoB 3.9 ---------------------- - Fixed a bug that could indicate a target was closed when it was open - Improved support for DLT_NULL interfaces on BSD-like operating systems - Improved deprecated pcap device enumeration method - Improved GraphViz output format appearance Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lft/lft.hash | 6 +++--- package/lft/lft.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lft/lft.hash b/package/lft/lft.hash index 91a1fb0659..9bcce843bc 100644 --- a/package/lft/lft.hash +++ b/package/lft/lft.hash @@ -1,5 +1,5 @@ # From http://pwhois.org/lft/ -md5 31b15aabc619707427a73657512560f8 lft-3.8.tar.gz +md5 73cb955546692cf0fb5d7931939c56de lft-3.91.tar.gz # Locally calculated -sha256 10f427e77b0f8207817329bd8ef0310078434612620073369264d15e6f97e990 lft-3.8.tar.gz -sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING +sha256 aad13e671adcfc471ab99417161964882d147893a54664f3f465ec5c8398e6af lft-3.91.tar.gz +sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING diff --git a/package/lft/lft.mk b/package/lft/lft.mk index 5154c83fef..37e6e77767 100644 --- a/package/lft/lft.mk +++ b/package/lft/lft.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFT_VERSION = 3.8 +LFT_VERSION = 3.91 LFT_SITE = http://pwhois.org/get LFT_DEPENDENCIES = libpcap LFT_LICENSE = VOSTROM Public License for Open Source From yann.morin.1998 at free.fr Sun Jan 23 19:49:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:25 +0100 Subject: [Buildroot] [git commit] package/collectl: bump to version 4.3.2 Message-ID: <20220123194537.C3FD282B45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b44e7d988569778d952e9ad3e7e76cfe75bbe7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 4.3.2 Oct 7, 2021 - very minor bug. the last command in perfquery is not in a loop and prevents the collectl daemon from starting via the service. Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/collectl/collectl.hash | 8 ++++---- package/collectl/collectl.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/collectl/collectl.hash b/package/collectl/collectl.hash index d866e0becc..1785d25d87 100644 --- a/package/collectl/collectl.hash +++ b/package/collectl/collectl.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2187264d974b36a653c8a4b028ac6eeab23e1885f8b2563a33f06358f39889f1 collectl-4.3.1.src.tar.gz -sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC -sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL +sha256 9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750 collectl-4.3.2.src.tar.gz +sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC +sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL diff --git a/package/collectl/collectl.mk b/package/collectl/collectl.mk index c9fb59293c..c6cb2e1494 100644 --- a/package/collectl/collectl.mk +++ b/package/collectl/collectl.mk @@ -4,7 +4,7 @@ # ################################################################################ -COLLECTL_VERSION = 4.3.1 +COLLECTL_VERSION = 4.3.2 COLLECTL_SOURCE = collectl-$(COLLECTL_VERSION).src.tar.gz COLLECTL_SITE = http://downloads.sourceforge.net/collectl/collectl COLLECTL_LICENSE = Artistic or GPL-2.0 From yann.morin.1998 at free.fr Sun Jan 23 19:49:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:49:23 +0100 Subject: [Buildroot] [git commit] package/neon: bump to version 0.32.2 Message-ID: <20220123194537.BB3967F93B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=029a6dc3e3320984c6369747e0b79060f13b2afc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch site to get latest version - README has been renamed to README.md - Update indentation in hash file (two spaces) https://github.com/notroj/neon/blob/0.32.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/neon/Config.in | 2 +- package/neon/neon.hash | 10 +++++----- package/neon/neon.mk | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/neon/Config.in b/package/neon/Config.in index d055b37607..45348a7f4d 100644 --- a/package/neon/Config.in +++ b/package/neon/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NEON help HTTP and WebDAV client library, with a C interface. - http://www.webdav.org/neon/ + https://notroj.github.io/neon/ if BR2_PACKAGE_NEON diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 2ebefbe520..5a5a77a58b 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,6 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca neon-0.30.2.tar.gz # Locally computed -sha256 95f77624e96f6728145826fc895142275451f43f41c073766db3dbbcc8b790b0 README -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING +sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz +# Hash for license files +sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING diff --git a/package/neon/neon.mk b/package/neon/neon.mk index da53735d0e..3bbd12561f 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,10 +4,10 @@ # ################################################################################ -NEON_VERSION = 0.30.2 -NEON_SITE = http://www.webdav.org/neon +NEON_VERSION = 0.32.2 +NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) -NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README +NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath From yann.morin.1998 at free.fr Sun Jan 23 19:52:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:52:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/xl2tp: bump to version 1.3.17 In-Reply-To: <20220123104057.556978-1-fontaine.fabrice@gmail.com> References: <20220123104057.556978-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195240.GB2502@scaer> Fabrice, All, On 2022-01-23 11:40 +0100, Fabrice Fontaine spake thusly: > https://github.com/xelerance/xl2tpd/releases/tag/v1.3.17 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/xl2tp/xl2tp.hash | 2 +- > package/xl2tp/xl2tp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash > index 471657f0f2..eca918bc83 100644 > --- a/package/xl2tp/xl2tp.hash > +++ b/package/xl2tp/xl2tp.hash > @@ -1,3 +1,3 @@ > # locally computed > -sha256 c28608b315adb25c8bf9579c1d6ab52ab47c4c43b68a5ab63c5d039196fd180f xl2tp-1.3.16.tar.gz > +sha256 898d9b6a374c78dea5f20d80fd50fac13428ad746fefb16ff5f6bec449affe67 xl2tp-1.3.17.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE > diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk > index 65a78504f3..4a2bd66308 100644 > --- a/package/xl2tp/xl2tp.mk > +++ b/package/xl2tp/xl2tp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XL2TP_VERSION = 1.3.16 > +XL2TP_VERSION = 1.3.17 > XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) > XL2TP_DEPENDENCIES = libpcap > XL2TP_LICENSE = GPL-2.0 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:53:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:53:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/neon: bump to version 0.32.2 In-Reply-To: <20220123105146.568745-1-fontaine.fabrice@gmail.com> References: <20220123105146.568745-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195347.GC2502@scaer> Fabrice, All, On 2022-01-23 11:51 +0100, Fabrice Fontaine spake thusly: > - Switch site to get latest version > - README has been renamed to README.md > - Update indentation in hash file (two spaces) > > https://github.com/notroj/neon/blob/0.32.2/NEWS > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/neon/Config.in | 2 +- > package/neon/neon.hash | 10 +++++----- > package/neon/neon.mk | 6 +++--- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/package/neon/Config.in b/package/neon/Config.in > index 8dc78f0f0a..a3515f4052 100644 > --- a/package/neon/Config.in > +++ b/package/neon/Config.in > @@ -3,7 +3,7 @@ config BR2_PACKAGE_NEON > help > HTTP and WebDAV client library, with a C interface. > > - http://www.webdav.org/neon/ > + https://notroj.github.io/neon/ > > if BR2_PACKAGE_NEON > > diff --git a/package/neon/neon.hash b/package/neon/neon.hash > index 2ebefbe520..5a5a77a58b 100644 > --- a/package/neon/neon.hash > +++ b/package/neon/neon.hash > @@ -1,6 +1,6 @@ > -# Locally calculated after checking pgp signature > -sha256 db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca neon-0.30.2.tar.gz > # Locally computed > -sha256 95f77624e96f6728145826fc895142275451f43f41c073766db3dbbcc8b790b0 README > -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB > -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING > +sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz > +# Hash for license files > +sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md > +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB > +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING > diff --git a/package/neon/neon.mk b/package/neon/neon.mk > index da53735d0e..3bbd12561f 100644 > --- a/package/neon/neon.mk > +++ b/package/neon/neon.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -NEON_VERSION = 0.30.2 > -NEON_SITE = http://www.webdav.org/neon > +NEON_VERSION = 0.32.2 > +NEON_SITE = https://notroj.github.io/neon > NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) > -NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README > +NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md > NEON_CPE_ID_VENDOR = webdav > NEON_INSTALL_STAGING = YES > NEON_CONF_OPTS = --without-gssapi --disable-rpath > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:54:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:54:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectl: bump to version 4.3.2 In-Reply-To: <20220123110155.570748-1-fontaine.fabrice@gmail.com> References: <20220123110155.570748-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195400.GD2502@scaer> Fabrice, All, On 2022-01-23 12:01 +0100, Fabrice Fontaine spake thusly: > 4.3.2 Oct 7, 2021 > - very minor bug. the last command in perfquery is not in a loop and > prevents the collectl daemon from starting via the service. > > Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/collectl/collectl.hash | 8 ++++---- > package/collectl/collectl.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/collectl/collectl.hash b/package/collectl/collectl.hash > index d866e0becc..1785d25d87 100644 > --- a/package/collectl/collectl.hash > +++ b/package/collectl/collectl.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 2187264d974b36a653c8a4b028ac6eeab23e1885f8b2563a33f06358f39889f1 collectl-4.3.1.src.tar.gz > -sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC > -sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING > -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL > +sha256 9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750 collectl-4.3.2.src.tar.gz > +sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC > +sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING > +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL > diff --git a/package/collectl/collectl.mk b/package/collectl/collectl.mk > index c9fb59293c..c6cb2e1494 100644 > --- a/package/collectl/collectl.mk > +++ b/package/collectl/collectl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -COLLECTL_VERSION = 4.3.1 > +COLLECTL_VERSION = 4.3.2 > COLLECTL_SOURCE = collectl-$(COLLECTL_VERSION).src.tar.gz > COLLECTL_SITE = http://downloads.sourceforge.net/collectl/collectl > COLLECTL_LICENSE = Artistic or GPL-2.0 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:54:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:54:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/nmon: bump to version 16n In-Reply-To: <20220123111126.573758-1-fontaine.fabrice@gmail.com> References: <20220123111126.573758-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195425.GE2502@scaer> Fabrice, All, On 2022-01-23 12:11 +0100, Fabrice Fontaine spake thusly: > Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nmon/nmon.hash | 6 +++--- > package/nmon/nmon.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/nmon/nmon.hash b/package/nmon/nmon.hash > index fd3f09c63a..1d7226a4fe 100644 > --- a/package/nmon/nmon.hash > +++ b/package/nmon/nmon.hash > @@ -1,5 +1,5 @@ > # From https://sourceforge.net/projects/nmon/files/ > -md5 df67f07ea4006c6204acff586beada81 lmon16m.c > -sha1 68cd02be19036a287fe352823db93223e73a9411 lmon16m.c > +md5 a8172601fdc05f3bc58455cbd3f4475e lmon16n.c > +sha1 024a3b56179838f0e04bf1706cc9ba56595301a8 lmon16n.c > # Locally computed > -sha256 2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 lmon16m.c > +sha256 c0012cc2d925dee940c37ceae297abac64ba5a5c30e575e7418b04028613f5f2 lmon16n.c > diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk > index 8b39748cce..01371a8c74 100644 > --- a/package/nmon/nmon.mk > +++ b/package/nmon/nmon.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NMON_VERSION = 16m > +NMON_VERSION = 16n > NMON_SITE = https://sourceforge.net/projects/nmon/files > NMON_SOURCE = lmon$(NMON_VERSION).c > NMON_LICENSE = GPL-3.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:54:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:54:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/lft: bump to version 3.91 In-Reply-To: <20220123112220.578219-1-fontaine.fabrice@gmail.com> References: <20220123112220.578219-1-fontaine.fabrice@gmail.com> Message-ID: <20220123195440.GF2502@scaer> Fab rice, All, On 2022-01-23 12:22 +0100, Fabrice Fontaine spake thusly: > lft 3.91 / WhoB 3.91 > ---------------------- > - Fixed bugs.debian.org/cgi-bin/bugreport.cgi?bug=922430 > - Updated date > > lft 3.9 / WhoB 3.9 > ---------------------- > - Fixed a bug that could indicate a target was closed when it was open > - Improved support for DLT_NULL interfaces on BSD-like operating systems > - Improved deprecated pcap device enumeration method > - Improved GraphViz output format appearance > > Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/lft/lft.hash | 6 +++--- > package/lft/lft.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/lft/lft.hash b/package/lft/lft.hash > index 91a1fb0659..9bcce843bc 100644 > --- a/package/lft/lft.hash > +++ b/package/lft/lft.hash > @@ -1,5 +1,5 @@ > # From http://pwhois.org/lft/ > -md5 31b15aabc619707427a73657512560f8 lft-3.8.tar.gz > +md5 73cb955546692cf0fb5d7931939c56de lft-3.91.tar.gz > # Locally calculated > -sha256 10f427e77b0f8207817329bd8ef0310078434612620073369264d15e6f97e990 lft-3.8.tar.gz > -sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING > +sha256 aad13e671adcfc471ab99417161964882d147893a54664f3f465ec5c8398e6af lft-3.91.tar.gz > +sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING > diff --git a/package/lft/lft.mk b/package/lft/lft.mk > index 5154c83fef..37e6e77767 100644 > --- a/package/lft/lft.mk > +++ b/package/lft/lft.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LFT_VERSION = 3.8 > +LFT_VERSION = 3.91 > LFT_SITE = http://pwhois.org/get > LFT_DEPENDENCIES = libpcap > LFT_LICENSE = VOSTROM Public License for Open Source > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 19:54:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 20:54:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/libpjsip: security bump to version 2.11.1 In-Reply-To: <20220123134751.703269-2-fontaine.fabrice@gmail.com> References: <20220123134751.703269-1-fontaine.fabrice@gmail.com> <20220123134751.703269-2-fontaine.fabrice@gmail.com> Message-ID: <20220123195455.GG2502@scaer> Fabrice, All On 2022-01-23 14:47 +0100, Fabrice Fontaine spake thusly: > Security update. This version is recommended for all users to improve > the security of applications using PJSIP. > > Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 > > Update indentation in hash file (two spaces) > > https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph > https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp > https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr > https://github.com/pjsip/pjproject/releases/tag/2.11 > https://github.com/pjsip/pjproject/releases/tag/2.11.1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libpjsip/libpjsip.hash | 4 ++-- > package/libpjsip/libpjsip.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash > index 68c2208885..f39ebf4060 100644 > --- a/package/libpjsip/libpjsip.hash > +++ b/package/libpjsip/libpjsip.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz > -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk > index 771db0ac72..b05cc31a83 100644 > --- a/package/libpjsip/libpjsip.mk > +++ b/package/libpjsip/libpjsip.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -LIBPJSIP_VERSION = 2.10 > +LIBPJSIP_VERSION = 2.11.1 > LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz > LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) > -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz > +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz > > LIBPJSIP_DEPENDENCIES = libsrtp > LIBPJSIP_LICENSE = GPL-2.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Sun Jan 23 20:03:21 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 23 Jan 2022 21:03:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: <20220119202351.GA3095239@scaer> References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> <20220119202351.GA3095239@scaer> Message-ID: Hi Yann, On 19/01/2022 21:23, Yann E. MORIN wrote: > Fabrice, All, > > On 2022-01-15 17:04 +0100, Fabrice Fontaine spake thusly: >> Set --with-boost to avoid the following build failure when a non >> working >> boost version is installed on host. This failure is raised since the >> addition of the package in commit >> ea033cecf990ed3f86619647523a9ad2ccb09adb: >> >> configure:5559: error: Could not find a version of the Boost::Asio >> library! >> >> Fixes: >> - >> http://autobuild.buildroot.org/results/855b66b86d979cc922b947da932b0e2388481263 >> >> Signed-off-by: Fabrice Fontaine >> --- >> package/riscv-isa-sim/riscv-isa-sim.mk | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/package/riscv-isa-sim/riscv-isa-sim.mk >> b/package/riscv-isa-sim/riscv-isa-sim.mk >> index ee9067d304..90eed93c36 100644 >> --- a/package/riscv-isa-sim/riscv-isa-sim.mk >> +++ b/package/riscv-isa-sim/riscv-isa-sim.mk >> @@ -9,5 +9,6 @@ RISCV_ISA_SIM_SITE = $(call >> github,riscv-software-src,riscv-isa-sim,v$(RISCV_ISA >> RISCV_ISA_SIM_LICENSE = BSD-3-Clause >> RISCV_ISA_SIM_LICENSE_FILES = LICENSE >> HOST_RISCV_ISA_SIM_DEPENDENCIES = host-boost host-dtc >> +HOST_RISCV_ISA_SIM_CONF_OPTS = --with-boost=$(HOST_DIR) > > To be noted: riscv-isa-sim could also be configured with > --without-boost > and the build succeeds. > > Anyway: applied to master, thanks. > > Julien, do you know what ill-effect building without Boost would have? The absence of Boost is removing the "Command I/O via socket" feature of riscv-isa-sim (-s command line option). See: https://github.com/riscv-software-src/riscv-isa-sim/blob/v1.1.0/spike_main/spike.cc#L30 It's generally not needed in simple use-cases. My initial intent was to have host-riscv-isa-sim compiled without this Boost support. The upstream riscv-isa-sim detection of boost seems a bit peculiar and does not really honor --without-boost/--without-boost-regex/--without-boost-asio. Setting --without-boost alone on a system with boost will make the ./configure fail with: checking whether the Boost::ASIO library is available... yes configure: error: Could not find a version of the Boost::Asio library! Setting --without-boost --without-boost-regex --without-boost-asio will end up with a successful configuration/compilation, but with a binary linked with libboost_regex.so and libboost_system.so... I believe this part could be slightly improved before setting --without-boost in the BR recipe. I'll have a look into that. Best regards, Julien. > Regards, > Yann E. MORIN. > >> $(eval $(host-autotools-package)) >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ > | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There > is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v > conspiracy. | > '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Jan 23 20:43:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 21:43:03 +0100 Subject: [Buildroot] [PATCH 1/2] package/mpd-mpc: disable documentation In-Reply-To: <20211220125844.2187408-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Dec 2021 13:58:43 +0100") References: <20211220125844.2187408-1-fontaine.fabrice@gmail.com> Message-ID: <87tuduw5d4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable documentation which is available (and enabled by default) since > bump to version 0.31 in commit 0186da2923c07656005264dbb3001ca706a2ef10 > and > https://github.com/MusicPlayerDaemon/mpc/commit/60e173c0198743fd6af906682eadec1cc67a4975 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 20:42:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 21:42:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mpd-mpc: disable documentation Message-ID: <20220123203653.A6BAD8267E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d81064a03c1ade13ee52b4dcd7a33ede4bf23e9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Disable documentation which is available (and enabled by default) since bump to version 0.31 in commit 0186da2923c07656005264dbb3001ca706a2ef10 and https://github.com/MusicPlayerDaemon/mpc/commit/60e173c0198743fd6af906682eadec1cc67a4975 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8a78e215c3bc8bcfcfdd5ba8f8c82d977c91e91b) Signed-off-by: Peter Korsgaard --- package/mpd-mpc/mpd-mpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index 6eebc63cca..d5a981d70e 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -11,5 +11,6 @@ MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPL-2.0+ MPD_MPC_LICENSE_FILES = COPYING MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient +MPD_MPC_CONF_OPTS = -Ddocumentation=disabled $(eval $(meson-package)) From yann.morin.1998 at free.fr Sun Jan 23 20:51:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 21:51:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> <20220119202351.GA3095239@scaer> Message-ID: <20220123205148.GH2502@scaer> Julien, All, On 2022-01-23 21:03 +0100, Julien Olivain spake thusly: > On 19/01/2022 21:23, Yann E. MORIN wrote: [--SNIP--] > >To be noted: riscv-isa-sim could also be configured with --without-boost > >and the build succeeds. > >Julien, do you know what ill-effect building without Boost would have? > > The absence of Boost is removing the "Command I/O via socket" feature of > riscv-isa-sim (-s command line option). See: > https://github.com/riscv-software-src/riscv-isa-sim/blob/v1.1.0/spike_main/spike.cc#L30 > It's generally not needed in simple use-cases. Thanks for the feedback. :-) Indeed, if Boost is not a strict requirement, it would be nice to be able to build without it... > My initial intent was to have host-riscv-isa-sim compiled without this Boost > support. > > The upstream riscv-isa-sim detection of boost seems a bit peculiar and does > not > really honor --without-boost/--without-boost-regex/--without-boost-asio. > > Setting --without-boost alone on a system with boost will make the > ./configure > fail with: > > checking whether the Boost::ASIO library is available... yes > configure: error: Could not find a version of the Boost::Asio library! > > Setting --without-boost --without-boost-regex --without-boost-asio will end > up > with a successful configuration/compilation, but with a binary linked with > libboost_regex.so and libboost_system.so... > > I believe this part could be slightly improved before setting > --without-boost > in the BR recipe. I'll have a look into that. The problem, as you said, is that if Boost is available (either already isntalled on the build machine, or host-boost is puleld in by another package), configuring riscv-isa-sim with --without-boost still breaks with the message you pasted above. But we can't guarantee that Boost (system or host-boost) is not present. So, either we have a patch that fixes the Boost detection (and we push that patch upstream), or we can only depend on host-boost and keep the current status. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Jan 23 20:57:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 23 Jan 2022 21:57:09 +0100 Subject: [Buildroot] [PATCH 25/28] configs/orangepi_zero_defconfig: enable NEON/VFPV4 FPU strategy In-Reply-To: <83218573-DFC3-4AA3-B21E-F5C32DBADC1B@benettiengineering.com> References: <9c9b7005-6f85-f812-21b5-fa029136477b@gmail.com> <83218573-DFC3-4AA3-B21E-F5C32DBADC1B@benettiengineering.com> Message-ID: <20220123205709.GI2502@scaer> Giulio, All, On 2022-01-23 20:12 +0100, Giulio Benetti spake thusly: > Hi Sergey, > > thank you for the Tested-by, but you should put it? > > > Il giorno 23 gen 2022, alle ore 19:08, Sergey Kuzminov ha scritto: > > > > ?18.01.2022 13:43, Giulio Benetti: > >> This board has Allwinner H2+(compatible with H3) that is a cortex-A7 and > >> supports NEON/VFPV4 FPU strategy, so let's enable it instead of only VFPV4. > >> Signed-off-by: Giulio Benetti > > ?here, after my SoB. No, not needed: Patchwork will correctly catch it wherever it is as long as the mail is a proper reply, which it is here, and you can check it on patchwork: the 'T' column is now set to '1' for this patch, and the tested-by tag is properly added to the mbox (which is what we maintainers use when applying patches): $ curl 'https://patchwork.ozlabs.org/project/buildroot/patch/20220118104338.2081259-26-giulio.benetti at benettiengineering.com/mbox/' [...] Signed-off-by: Giulio Benetti Tested-by: Sergey Kuzminov [...] Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Jan 23 21:23:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 22:23:28 +0100 Subject: [Buildroot] [PATCH] package/gcc: fix xtensa overlay for gcc ccache hash In-Reply-To: <20211224095257.2909635-1-yann.morin.1998@free.fr> References: <20211224095257.2909635-1-yann.morin.1998@free.fr> Message-ID: <0fa41a24-0015-eb7f-21bc-2ed851089b54@korsgaard.com> Hi, On 24/12/2021 10.52, Yann E. MORIN wrote: > Commit b3b60706221d (arch/xtensa: allow specifying path to tarball file) > m issed a place where the xtensa overlay was refrenced, thus breaking > the calculation for the ccache hash. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Jan 23 21:20:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 22:20:37 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gcc: fix xtensa overlay for gcc ccache hash Message-ID: <20220123211649.37A1781456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2475ccb4ccc4619d83980ea5e3add7cb7c34c9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit b3b60706221d (arch/xtensa: allow specifying path to tarball file) missed a place where the xtensa overlay was referenced, thus breaking the calculation for the ccache hash. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Max Filippov Signed-off-by: Yann E. MORIN (cherry picked from commit b98ed34072f07f0c367b23d1e018f5b9487b3c34) Signed-off-by: Peter Korsgaard --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 5e419f7ede..28b6a0c95c 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -286,7 +286,7 @@ HOST_GCC_COMMON_CCACHE_HASH_FILES += \ $(addsuffix /gcc/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ $(addsuffix /gcc/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))))) ifeq ($(BR2_xtensa),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_TAR) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_FILE) endif # _CONF_OPTS contains some references to the absolute path of $(HOST_DIR) From peter at korsgaard.com Sun Jan 23 20:42:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 21:42:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mpd-mpc: disable documentation Message-ID: <20220123211656.7C7FD81456@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ea385642d5b33dc347bad3f31d51f3e0f70ec2d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Disable documentation which is available (and enabled by default) since bump to version 0.31 in commit 0186da2923c07656005264dbb3001ca706a2ef10 and https://github.com/MusicPlayerDaemon/mpc/commit/60e173c0198743fd6af906682eadec1cc67a4975 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8a78e215c3bc8bcfcfdd5ba8f8c82d977c91e91b) Signed-off-by: Peter Korsgaard --- package/mpd-mpc/mpd-mpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index 6eebc63cca..d5a981d70e 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -11,5 +11,6 @@ MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPL-2.0+ MPD_MPC_LICENSE_FILES = COPYING MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient +MPD_MPC_CONF_OPTS = -Ddocumentation=disabled $(eval $(meson-package)) From peter at korsgaard.com Sun Jan 23 21:20:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 23 Jan 2022 22:20:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gcc: fix xtensa overlay for gcc ccache hash Message-ID: <20220123211656.881AA82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=adf50a486a70065c18e1b925021343daabf6b4e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit b3b60706221d (arch/xtensa: allow specifying path to tarball file) missed a place where the xtensa overlay was referenced, thus breaking the calculation for the ccache hash. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Max Filippov Signed-off-by: Yann E. MORIN (cherry picked from commit b98ed34072f07f0c367b23d1e018f5b9487b3c34) Signed-off-by: Peter Korsgaard --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index fcc352aa25..3adc1d4e16 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -283,7 +283,7 @@ HOST_GCC_COMMON_CCACHE_HASH_FILES += \ $(addsuffix /gcc/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ $(addsuffix /gcc/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))))) ifeq ($(BR2_xtensa),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_TAR) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_FILE) endif # _CONF_OPTS contains some references to the absolute path of $(HOST_DIR) From fontaine.fabrice at gmail.com Sun Jan 23 21:26:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 22:26:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gvfs: fix build with meson >= 0.61 Message-ID: <20220123212607.781422-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of meson to version 0.61.0 in commit a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f: ../output-1/build/gvfs-1.48.1/daemon/meson.build:368:7: ERROR: Function does not take positional arguments. Fixes: - http://autobuild.buildroot.org/results/6231649fac82a70b215186c3396b879a28a96f60 Signed-off-by: Fabrice Fontaine --- ...e-incorrect-i18n.merge_file-argument.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch diff --git a/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch new file mode 100644 index 0000000000..a85a1a374e --- /dev/null +++ b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch @@ -0,0 +1,33 @@ +From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 + +[Retrieved (and backported) from: +https://gitlab.gnome.org/GNOME/gvfs/-/commit/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0] +Signed-off-by: Fabrice Fontaine +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index 5f9559aa..e20ada29 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -360,7 +360,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab + -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 21:27:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 22:27:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/xml-security-c: bump to version 2.0.4 Message-ID: <20220123212757.781999-1-fontaine.fabrice@gmail.com> Version 2.0.4 of the Apache XML Security for C++ has been released, correcting support for OpenSSL earlier than 1.1. Version 2.0.3 of the Apache XML Security for C++ has been released, adding support for OpenSSL 3.0.0. Drop patch (already in version) and so autoreconf https://santuario.apache.org/cindex.html Signed-off-by: Fabrice Fontaine --- ...ariable-cache-option-for-getcwd-test.patch | 50 ------------------- package/xml-security-c/xml-security-c.hash | 4 +- package/xml-security-c/xml-security-c.mk | 5 +- 3 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch diff --git a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch b/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch deleted file mode 100644 index 26b53ba719..0000000000 --- a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9d14fad412a497fe83cfc6ab594ddc612512f02a Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Thu, 4 Jun 2020 20:34:11 -0500 -Subject: [PATCH] autoconf variable cache option for getcwd test - -The cached variable allows cross compiled builds to successfully set the -desired default for this value without invoking a test. - -Fixes: -https://issues.apache.org/jira/browse/SANTUARIO-549 - -Signed-off-by: Matthew Weber ---- - configure.ac | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b43d7a5..c3d4489 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,14 +74,18 @@ AC_CHECK_FUNCS([strcasecmp]) - - # Check whether getcwd can dynamically allocate memory. - AC_MSG_CHECKING([whether getcwd(NULL, 0) works]) --AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -- #include ], --[char *cwd = getcwd(NULL, 0); --return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])], -- [AC_MSG_RESULT(yes) -- AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], -- [Define to 1 if getcwd(NULL, 0) works])], -- [AC_MSG_RESULT(no)]) -+AC_CACHE_VAL([xml_cv_func_getcwd_null], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include -+ #include -+ char *cwd = getcwd(NULL, 0); -+ return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;]])], -+ [xml_cv_func_getcwd_null=yes], -+ [xml_cv_func_getcwd_null=no])]) -+AC_MSG_RESULT([$xml_cv_func_getcwd_null]) -+if test $xml_cv_func_getcwd_null = yes; then -+AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], -+ [Define to 1 if getcwd(NULL, 0) works]) -+fi - - AC_LANG(C++) - --- -2.17.1 - diff --git a/package/xml-security-c/xml-security-c.hash b/package/xml-security-c/xml-security-c.hash index d91ed86e9c..f4b7041a63 100644 --- a/package/xml-security-c/xml-security-c.hash +++ b/package/xml-security-c/xml-security-c.hash @@ -1,3 +1,3 @@ -# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.2.tar.gz.sha256 -sha256 c303a2b08cb9ca0f5594adcbb83829b1e793175d7114a82f7d78def8bb2e30df xml-security-c-2.0.2.tar.gz +# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.4.tar.gz.sha256 +sha256 a78da6720f6c2ba14100d2426131e0d33eac5a2dba5cc11bdd04974b7eb89003 xml-security-c-2.0.4.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/xml-security-c/xml-security-c.mk b/package/xml-security-c/xml-security-c.mk index fe761819ee..fda9af4798 100644 --- a/package/xml-security-c/xml-security-c.mk +++ b/package/xml-security-c/xml-security-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -XML_SECURITY_C_VERSION = 2.0.2 +XML_SECURITY_C_VERSION = 2.0.4 XML_SECURITY_C_SITE = http://archive.apache.org/dist/santuario/c-library XML_SECURITY_C_LICENSE = Apache-2.0 XML_SECURITY_C_LICENSE_FILES = LICENSE.txt @@ -15,7 +15,4 @@ XML_SECURITY_C_CONF_ENV = \ xml_cv_func_getcwd_null=yes \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -# Patched configure.ac -XML_SECURITY_C_AUTORECONF = YES - $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 21:29:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 22:29:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/libev: bump to version 4.33 Message-ID: <20220123212916.782418-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/xorangekiller/libev-git/blob/rel-4_33/Changes Signed-off-by: Fabrice Fontaine --- package/libev/libev.hash | 4 ++-- package/libev/libev.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libev/libev.hash b/package/libev/libev.hash index 9ab341dedd..a849f3f39a 100644 --- a/package/libev/libev.hash +++ b/package/libev/libev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e libev-4.27.tar.gz -sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE +sha256 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea libev-4.33.tar.gz +sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 38b0530f62..9f3c19d46c 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEV_VERSION = 4.27 +LIBEV_VERSION = 4.33 LIBEV_SITE = http://dist.schmorp.de/libev/Attic LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 21:45:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 22:45:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/vte: needs gcc >= 10 Message-ID: <20220123214548.783629-1-fontaine.fabrice@gmail.com> vte needs C++20 since https://gitlab.gnome.org/GNOME/vte/-/commit/eec33cce0b9359fddda35703e22bffd1f8f28852 to avoid the following build failure raised since bump to version 0.66.2 in commit 53c0c7dd01228122c7ceb44d65f2800dbcf473f1: ../output-1/build/vte-0.66.2/meson.build:144:0: ERROR: Assert failed: option -std=gnu++20 not supported by gcc Fixes: - http://autobuild.buildroot.org/results/c0d1adeffbf97805a0f669d01929a56ccc66a835 Signed-off-by: Fabrice Fontaine --- package/vte/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vte/Config.in b/package/vte/Config.in index 2635a6007c..45d627885f 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_VTE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ @@ -22,13 +22,13 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte -comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 10" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ BR2_TOOLCHAIN_USES_MUSL comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Jan 23 22:01:15 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 23 Jan 2022 23:01:15 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: <20220122151130.59ae7148@windsurf> References: <20220117080616.10563-1-heiko.thiery@gmail.com> <20220122151130.59ae7148@windsurf> Message-ID: Hi Thomas, On 22/01/22 15:11, Thomas Petazzoni wrote: > On Mon, 17 Jan 2022 09:06:16 +0100 > Heiko Thiery wrote: > >> Signed-off-by: Heiko Thiery >> --- >> board/kontron/pitx-imx8m/boot.cmd | 8 -------- >> board/kontron/pitx-imx8m/extlinux.conf | 4 ++++ >> board/kontron/pitx-imx8m/genimage.cfg | 5 +++-- >> board/kontron/pitx-imx8m/post-build.sh | 7 +++++-- >> board/kontron/pitx-imx8m/post-image.sh | 2 +- >> configs/kontron_pitx_imx8m_defconfig | 3 +-- >> 6 files changed, 14 insertions(+), 15 deletions(-) >> delete mode 100644 board/kontron/pitx-imx8m/boot.cmd >> create mode 100644 board/kontron/pitx-imx8m/extlinux.conf > > I have applied, but I am a bit worried about things are going on with > this switch to extlinux.conf. > > Indeed, we have: > > * Platforms where the UUID is hardcoded into genimage.cfg and > extlinux.conf, such as board/beaglev/ > > * We have platforms where a "uuid" variable in filled in U-Boot before > triggering the extlinux.conf logic, and therefore extlinux.conf uses > root=PARTUUID=${uuid}. For example > board/freescale/imx7dsdb/rootfs_overlay/boot/extlinux/extlinux.conf, > board/orangepi/orangepi-zero/boot.cmd, > board/solidrun/mx6cubox/rootfs_overlay/boot/extlinux/extlinux.conf, > board/technexion/imx6ulpico/rootfs_overlay/boot/extlinux/extlinux.conf, > and a few others. > > * We now have platforms (kontron/smarc-sal28 and kontron/pitx-imx8m) > where a random UUID is generated in the post-build script, and used > in genimage and extlinux.conf. > > I'm not sure where we want to go, and how much we want to enforce "best > practices" that are common on all platforms, or just let each platform > do its little business. IMHO the worst drawback I see while using extlinux.conf VS boot.scr is the missing checksum. Especially on embedded systems we deeply treat. Not having such checksum can make system booting without a parameter on linux command line for example, only because 1 ASCII has been corrupted. I prefer the system to not boot at all in general instead of having it "working" while hiding some potential problem. What do you and All think about this? Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sun Jan 23 22:07:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 23:07:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytz: bump to version 2021.3 Message-ID: <20220123220731.787537-1-fontaine.fabrice@gmail.com> - Update hash of LICENSE.txt (year updated) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- package/python-pytz/python-pytz.hash | 6 +++--- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index d1ce81e590..e0f253902c 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 c3d84a465fc56a4edd52cca8873ac0df pytz-2019.3.tar.gz -sha256 b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be pytz-2019.3.tar.gz +md5 d7b7060bbac4970afa2050c139c9fcb6 pytz-2021.3.tar.gz +sha256 acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 pytz-2021.3.tar.gz # Locally computed sha256 checksums -sha256 39f07c72a1bfda349cbd27bac9bcb1e6f8c5b4e5cc3fadf56900406e8cc0b792 LICENSE.txt +sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 888f3c4556..d606750699 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2019.3 +PYTHON_PYTZ_VERSION = 2021.3 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/82/c3/534ddba230bd4fbbd3b7a3d35f3341d014cca213f369a9940925e7e5f691 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 22:14:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 23:14:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyftpdlib: bump to version 1.5.6 Message-ID: <20220123221402.787958-1-fontaine.fabrice@gmail.com> - Update hash of LICENSE file (license updated to make it recognizable by github: https://github.com/giampaolo/pyftpdlib/commit/a3016e7d694c226cae6a2b7672c6c5196124cd7a) - Update indentation in hash file (two spaces) https://github.com/giampaolo/pyftpdlib/blob/release-1.5.6/HISTORY.rst Signed-off-by: Fabrice Fontaine --- package/python-pyftpdlib/python-pyftpdlib.hash | 6 +++--- package/python-pyftpdlib/python-pyftpdlib.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index 7f8da95550..abbb1261b2 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyftpdlib/json -md5 7f8089520d60171bee5dab2b721e8d00 pyftpdlib-1.5.5.tar.gz -sha256 1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752 pyftpdlib-1.5.5.tar.gz +md5 459dd3e685c4b7dfcf574ca05e5586eb pyftpdlib-1.5.6.tar.gz +sha256 fda655d81f29af52885ca2f8a2704134baed540f16d66a0b26e8fdfafd12db5e pyftpdlib-1.5.6.tar.gz # Locally computed sha256 checksums -sha256 18a4ff1ddf890838e36504b307581e3eb42c890a7272ce28b18b3ce1205b7ea8 LICENSE +sha256 67a832551570a5ac5f7901eaa5ece4b9491fda7f2d8c93957c3bbc68a5a76d88 LICENSE diff --git a/package/python-pyftpdlib/python-pyftpdlib.mk b/package/python-pyftpdlib/python-pyftpdlib.mk index dbbb9e2842..931e2dad06 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.5 +PYTHON_PYFTPDLIB_VERSION = 1.5.6 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/27/64/06a574350c79873e908fa9f48b617e7961de50fc468acc0a05d76771bce9 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/31/61/63ef60aca6de07eba1639d9d47f3f8e29462e8bb49d6a8dce9aeff240646 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Jan 23 22:21:50 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 23 Jan 2022 23:21:50 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <164267096542.4497.13116457792635384701@kwain> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> <20220120084804.429f1d54@bootlin.com> <164267096542.4497.13116457792635384701@kwain> Message-ID: <2d19c071-3859-25db-0966-2fd8ca3d845f@benettiengineering.com> Hi Antoine, Maxime, Thomas, All, On 20/01/22 10:29, Antoine Tenart wrote: > Quoting Maxime Chevallier (2022-01-20 08:48:04) >> On Wed, 19 Jan 2022 23:39:44 +0100 >> Thomas Petazzoni wrote: >>> On Wed, 19 Jan 2022 23:23:32 +0100 >>> Giulio Benetti wrote: >>> >>>> +config BR2_REFPOLICY_DISABLE_DONTAUDIT >>>> + bool "Disable dontaudit" >>> >>> I am still extremely confused by the name of option, with its double >>> negative. >>> >>> When enabled, this option will disable something that doesn't audit. >>> Meh. >> >> I agree about the confusing double-negative, but it follows the SELinux >> terminology from the rules syntax. My personal view is that the "make >> enableaudit" target is a bit confusing already :) > > Agreed. > >>> Is it possible to find a better name / description that doesn't make >>> one's brain segfault when trying to understand what it does ? >> >> Maybe we can think of an option name like >> "BR2_REFPOLICY_VERBOSE_DONTAUDIT", suggesting that we're not silencing >> these 'dontaudit' rules anymore ? The only actual effect is what gets >> printed in the AVC logs. >> >>> The make target that gets triggered is "enableaudit". Would it make >>> sense to call this option BR2_PACKAGE_REFPOLICY_ENABLE_AUDIT ? >> >> The more I think about that, the more I think that using >> "enable/disable" here is misleading, the behaviour stays the same with >> regard to what gets denied/allow, only the logs are going to change. > > I would suggest using BR2_PACKAGE_REFPOLICY_WITH_DONTAUDIT, defaulting > to y (using _WITHOUT_ would be less clear IMHO). > > And in Kconfig something along the lines: > > bool "Build with dontaudit rules" > default y > help > The refpolicy comes with 'dontaudit' rules suppressing audit logs > for known and expected violations of the policy. These rules are > enabled by default. Building without the 'dontaudit' rules will lead > in more denied actions being logged, which can be useful for > debugging purposes. Note that running 'semodules -DB' from a running > system will have the same effect. > > Say y if unsure. > > (Please check the semodules part, never tried it). > > WDYT? Re-reading this after some day it looks to me like the simple BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all dontaudit rules from policy.conf", so it's true that it enables audit logs in the end. It's a very specific options and the one who will use it will know what he will enable and most of all we can specify in the help section that: "Removes all dontaudit rules from policy.conf" It changes the perspective we are looking at it, but in the end, it "Removes all dontaudit rules from policy.conf" and subsequentially this leads to show the audits logs. So it enables audits. Does it work for you? Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Sun Jan 23 22:24:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 23:24:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pathlib2: bump to version 2.3.6 Message-ID: <20220123222405.789637-1-fontaine.fabrice@gmail.com> - Update hash of LICENSE.rst (LF replaced by CRLF) - Update indentation in hash file (two spaces) https://github.com/jazzband/pathlib2/blob/2.3.6/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- package/python-pathlib2/python-pathlib2.hash | 6 +++--- package/python-pathlib2/python-pathlib2.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash index 986049d9de..ebd197b62e 100644 --- a/package/python-pathlib2/python-pathlib2.hash +++ b/package/python-pathlib2/python-pathlib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 f2bd0a363eb0f8fa0556f35c1d9e66fb pathlib2-2.3.5.tar.gz -sha256 6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868 pathlib2-2.3.5.tar.gz +md5 e50a0cf94e406c5110b3aed535626e9e pathlib2-2.3.6.tar.gz +sha256 7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f pathlib2-2.3.6.tar.gz # Locally computed sha256 checksums -sha256 f8e02f1a07e4c6fc59a4bee831ddde26b97064105c423b9e24340f35aaa80262 LICENSE.rst +sha256 861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6 LICENSE.rst diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk index d813b77d7e..4bcfea78fb 100644 --- a/package/python-pathlib2/python-pathlib2.mk +++ b/package/python-pathlib2/python-pathlib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHLIB2_VERSION = 2.3.5 +PYTHON_PATHLIB2_VERSION = 2.3.6 PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/94/d8/65c86584e7e97ef824a1845c72bbe95d79f5b306364fa778a3c3e401b309 +PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/df/16/e9d6bcf1aed52a55bc1696324ab22586716053b3e97b85266e0f3ad36bae PYTHON_PATHLIB2_LICENSE = MIT PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst PYTHON_PATHLIB2_SETUP_TYPE = setuptools -- 2.34.1 From fontaine.fabrice at gmail.com Sun Jan 23 22:37:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 23 Jan 2022 23:37:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-itsdangerous: bump to version 2.0.1 Message-ID: <20220123223725.790209-1-fontaine.fabrice@gmail.com> - python 2 support has been dropped since version 2.0.0 and https://github.com/pallets/itsdangerous/commit/e085f3eedf94fe42391aaa9fc349927f8feaa367 - Update hash of license file (license standardized: https://github.com/pallets/itsdangerous/commit/c880f85ccdaee29adab8b47ad79eb7bdec507b57) - Update indentation in hash file (two spaces) https://itsdangerous.palletsprojects.com/en/2.0.x/changes/#version-2-0-1 Signed-off-by: Fabrice Fontaine --- package/python-itsdangerous/Config.in | 4 ++-- package/python-itsdangerous/python-itsdangerous.hash | 8 +++++--- package/python-itsdangerous/python-itsdangerous.mk | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in index 39ec0b7725..72aa9165f8 100644 --- a/package/python-itsdangerous/Config.in +++ b/package/python-itsdangerous/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_ITSDANGEROUS bool "python-itsdangerous" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Itsdangerous contains various helpers to pass data to untrusted environments and to get it back safe and sound. diff --git a/package/python-itsdangerous/python-itsdangerous.hash b/package/python-itsdangerous/python-itsdangerous.hash index 0904a91183..dad4ec0800 100644 --- a/package/python-itsdangerous/python-itsdangerous.hash +++ b/package/python-itsdangerous/python-itsdangerous.hash @@ -1,4 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/itsdangerous/json -md5 9b7f5afa7f1e3acfb7786eeca3d99307 itsdangerous-1.1.0.tar.gz -sha256 321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19 itsdangerous-1.1.0.tar.gz -sha256 feb28bfa348d816b0e7dbaeddf18499ee7e8007c67813db8d6ab37c65e046cd4 LICENSE.rst +md5 996b9763d1b4bd0edd6eb86f0a490629 itsdangerous-2.0.1.tar.gz +sha256 9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 itsdangerous-2.0.1.tar.gz +# Locally computed sha256 checksums +sha256 63af09891b6be8ad1a4252ed43af0f4efba7fc948e228367bed7f3c5ae0b09d7 LICENSE.rst +sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk index 9429233703..c53bc6b9ba 100644 --- a/package/python-itsdangerous/python-itsdangerous.mk +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_ITSDANGEROUS_VERSION = 1.1.0 +PYTHON_ITSDANGEROUS_VERSION = 2.0.1 PYTHON_ITSDANGEROUS_SOURCE = itsdangerous-$(PYTHON_ITSDANGEROUS_VERSION).tar.gz -PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/68/1a/f27de07a8a304ad5fa817bbe383d1238ac4396da447fa11ed937039fa04b +PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/58/66/d6c5859dcac92b442626427a8c7a42322068c5cd5d4a463ce78b93f730b7 PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause -PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst +PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst docs/license.rst $(eval $(python-package)) -- 2.34.1 From bugzilla at busybox.net Sun Jan 23 23:35:49 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 23 Jan 2022 23:35:49 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #4 from Giulio Benetti --- Hi jhiljanen, I've finally managed the problem. When you state: "I don't have BR2_PACKAGE_EFL_EEZE enabled, because I'm using BusyBox init system." means you're not enabling a dynamic /dev management for BusyBox. To do this you have to enable something that is not: BR2_ROOTFS_DEVICE_CREATION_STATIC so for example: BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV This way BR2_PACKAGE_EFL_EEZE will be selectable and efl will build successfully. Here the problem is that efl doesn't really support at the moment the capability to disable eeze, because lot of their modules that depend on eeze don't handle the case of #ifndef HAVE_EEZE/#endif. So the real bug is in efl itself. Here we have 2 ways to go: 1) make efl to depend on BR2_PACKAGE_HAS_UDEV 2) fix efl code and send patches upstream I'm still not sure what to do, I'm going to ask to their Mailing list if they will accept patches through Mailing List by sending with git send-mail(option 2), otherwise I will send a patch for option 1) to Buildroot. Hope this helps Best regards Giulio Benetti -- You are receiving this mail because: You are on the CC list for the bug. From kuzminov.sergey81 at gmail.com Mon Jan 24 05:42:31 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Mon, 24 Jan 2022 08:42:31 +0300 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: References: <20220117080616.10563-1-heiko.thiery@gmail.com> <20220122151130.59ae7148@windsurf> Message-ID: <1dea301e-8425-a1ca-fc69-db338825b19c@gmail.com> Hi All, 24.01.2022 01:01, Giulio Benetti: > IMHO the worst drawback I see while using extlinux.conf VS boot.scr is > the missing checksum. Especially on embedded systems we deeply treat. > Not having such checksum can make system booting without a parameter on > linux command line for example, only because 1 ASCII has been corrupted. > I prefer the system to not boot at all in general instead of having it > "working" while hiding some potential problem. > > What do you and All think about this? IMHO extlinux.conf is more debugging friendly. Boot.scr requires the following command: mkimage -C none -A arm -T script -d boot.cmd boot.scr The mkimage utility (BR2_PACKAGE_HOST_UBOOT_TOOLS) is not on the board, you need to transfer the converted file over the network. Or reconnect the microSD card. From thomas.petazzoni at bootlin.com Mon Jan 24 07:00:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 07:00:32 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-23 Message-ID: <20220124070039.EBC7B60AD6@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-01-23 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 60 | 7 | 0 | 67 | 2021.11.x | 23 | 6 | 0 | 29 | master | 101 | 31 | 0 | 132 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 10 gvfs-1.48.1 | 2 sg3_utils-1.47 | 2 unknown | 2 apcupsd-3.14.14 | 1 bat-0.18.3 | 1 efl-1.26.0 | 1 frr-8.1 | 1 guile-3.0.7 | 1 ksmbd-tools-3.4.3 | 1 kvm-unit-tests-kvm-unit-tes... | 1 pcsc-lite-1.9.5 | 1 poppler-21.12.0 | 1 pulseview-0.4.2 | 1 rtorrent-0.9.8 | 1 ruby-3.1.0 | 1 sslh-1.22c | 1 tinifier-3.4.0 | 1 woff2-1.0.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/63dd67261a134c3225534264292d2d1201f9db17 | arm | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/a6c0e895fd2df273785113a6c784c871b7d50d63 | x86_64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/d2daed9def1a1ca90f317a94df8d9e6c439c40f3 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2893c3bb3aeb004318276e8daf4bec4a5ff4ed76 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/ac1cdc7118a04367e1a22c3f3f4daf1ac4579193 | ORPH riscv64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/6231649fac82a70b215186c3396b879a28a96f60 | ORPH arm | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/5490963b0ade0fc7c754533d97dd158e3cf7d1e7 | ORPH powerpc64le | ksmbd-tools-3.4.3 | NOK | http://autobuild.buildroot.net/results/7ca10984a48b5e1239e40cbca7e585a84f5c8522 | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/b03b46ea2cdd339d563c35c08f32ff10f2b6bf5e | or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/d802ffc20232804aa360c117955e19614edf2f02 | ORPH riscv32 | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/d2f50aa56410c2fff8a0538c57038104906e747e | xtensa | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/dff6f5ac8eb010695992561061ddcd9dab3090c8 | powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/63300c4f20bade0170d89e4ff75705925e1bf638 | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/91c24b5945b33076d70fad168a6cebf095c83d15 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/260bb0e389d4ae23e3141f59c8c2ff4c0b0b0472 | powerpc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d1784e0559d36e7b0ead5e88dfe930cc4aa25373 | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/69bcd929f8e2390b6d482c3cdbf0d3f4d66ce690 | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e28f6d16a1a9e6bd15f9fb921fe4f65ac88ed8dd | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c30a0cf45e61807ae7ebe87bbf9cb777846e4438 | powerpc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/475a7e812258392fb0b8ba055f468106fb1fa752 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/233b3df7dc6d2ea1205b226ece5475a68a9e0ea1 | sparc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ba2cf1a0c0fc533e3ef84a844a098468f4cb7c64 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/452a368197d82a2ad56607937c27b4e69c72be12 | powerpc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/892ad174187018d75acf759be6661a821ab01c28 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/bd371c3bc843056c89b31c2b5e6e95d8ac8677c1 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/019d93ea4f7defad672479adfb2e9f87305d3211 | arm | sslh-1.22c | NOK | http://autobuild.buildroot.net/results/aaaac2beb16730747b4265e81d09cb5e072c7267 | arm | tinifier-3.4.0 | NOK | http://autobuild.buildroot.net/results/a5d3e7b8a858558e03bec05d13706a12ad587690 | sh4 | unknown | NOK | http://autobuild.buildroot.net/results/3bcaf9d47c23c4f49a616c1d782e244593ee3194 | m68k | unknown | NOK | http://autobuild.buildroot.net/results/9299286c8104e4b3c15c711fb6c2d096dcab621d | x86_64 | woff2-1.0.2 | NOK | http://autobuild.buildroot.net/results/8825caace7e41320de74005505ce5840b0745fef | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 apcupsd-3.14.14 | 1 gobject-introspection-1.64.1 | 1 openldap-2.4.59 | 1 qt5location-5.15.2 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/11157ce4b09f521cdafe3303095ed6a063cdfdf3 | x86_64 | gobject-introspection-1.64.1 | NOK | http://autobuild.buildroot.net/results/f45521f486ac8618098b411bf6816a16109e1f5f | ORPH sparc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/ee381989fdeb765dc5c6269f9d835f127e48772b | riscv64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/11804a12660ed04ca7752e601332a62b065e817f | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/9421351bb7f7650c25eb4583d209a440e64d8615 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/63a2e0ec4aefca6cf26fea58b792db9e19634559 | aarch64 | qt5location-5.15.2 | NOK | http://autobuild.buildroot.net/results/1953e641afc11426bba59d6f0bb4574920206863 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 3 ndisc6-1.0.5 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/1bdfe51967bd77a853e1d08caace8cf037e40b23 | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/3233d790fbfbf4bc7b884368a5098746c87d26f1 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/f1b5210517e23dba5d40000438b5f29c5e43ffe5 | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/9f84c9d4c35e954a7f88f760fffd988732f16ef9 | ORPH powerpc | unknown | NOK | http://autobuild.buildroot.net/results/cc9223bb6a519d21d0c83dc7b3568822ea06bcc1 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/d50b6604bb9b1e0fb839441a8e39e896099000b8 | Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- acpica | DISTRO | https://release-monitoring.org/project/00018 | 20200717 | 20211217 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 41.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.3.1 | 4.5.2 | alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.6 | 1.2.6.1 | alsa-plugins | DISTRO | https://release-monitoring.org/project/00041 | 1.2.5 | 1.2.6 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 12.0.0_r27 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 10.8.1 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 16.21.1 | 19.1.0 | at-spi2-atk | DISTRO | https://release-monitoring.org/project/07840 | 2.34.2 | 2.38.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.36.0 | 2.42.0 | avro-c | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.10 | ORPH balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 19.03.14 | 20.10.11 | ORPH bat | DISTRO | https://release-monitoring.org/project/241901 | 0.18.3 | 0.19.0 | batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2021.4 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2021.1 | 2021.4 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.4.1 | 1.5.0 | bcg729 | DISTRO | https://release-monitoring.org/project/14743 | 1.0.4 | 1.1.1 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.0.66 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.0.6 | 8.2.0 | ORPH belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.0.66 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.0.66 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.5 | ORPH bind | DISTRO | https://release-monitoring.org/project/14923 | 9.11.36 | 9.17.22 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.36.1 | 2.37 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 22.0 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.1.3 | botan | DISTRO | https://release-monitoring.org/project/00214 | 2.18.2 | 2.19.1 | ORPH btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.15.1 | 5.16 | ORPH bullet | DISTRO | https://release-monitoring.org/project/07669 | 3.09 | 3.21 | busybox | DISTRO | https://release-monitoring.org/project/00230 | 1.34.1 | 1.35.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.7 | 0.5.9 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.4 | 0.5.5 | ORPH cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.17.4 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH ccache | DISTRO | https://release-monitoring.org/project/00257 | 3.7.12 | 4.5.1 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.4.34 | 1.4.36 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 2.9.4 | 3.7.0 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.3 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.1 | 4.2 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.13 | 6.14 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.17.1 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 0.103.4 | 0.104.2 | clang | DISTRO | https://release-monitoring.org/project/11811 | 9.0.1 | 13.0.0 | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.16.9 | 3.22.1 | cog | DISTRO | https://release-monitoring.org/project/21333 | 0.12.0 | 0.13.3 | containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.5.8 | 1.5.9 | cryptsetup | DISTRO | https://release-monitoring.org/project/13709 | 2.4.2 | 2.4.3 | cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.10 | 1.28.11 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 3.2.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 9.12-vbump | datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.11.4 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.2.2 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.0.1 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.2.9 | dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.2.646 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.25 | 1.26 | debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.7 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.6.1 | 1.8.0 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20200327 | 1.3-20220117 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 20.10.11 | 20.10.12 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 1.24.1 | 2.2.3 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 20.10.11 | 20.10.12 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.19.0 | 9.20.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202111 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 37 | 38 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.0 | 1.26.1 | eigen | DISTRO | https://release-monitoring.org/project/00666 | 3.3.7 | 3.4.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 20.07 | 21.12 | elixir | DISTRO | https://release-monitoring.org/project/00673 | 1.9.4 | 1.13.2 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.0 | 0.25.1 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 22.3.4.22 | 24.2 | erlang-eimp | DISTRO | https://release-monitoring.org/project/17060 | 1.0.17 | 1.0.21 | erlang-goldrush | DISTRO | https://release-monitoring.org/project/09692 | 0.1.9 | 0.2.0 | erlang-idna | DISTRO | https://release-monitoring.org/project/45374 | 6.0.0 | 6.1.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.9.0 | 1.11.2 | erlang-lager | DISTRO | https://release-monitoring.org/project/00727 | 3.6.10 | 3.9.2 | erlang-p1-acme | DISTRO | https://release-monitoring.org/project/45375 | 1.0.9 | 1.0.16 | erlang-p1-cache-tab | DISTRO | https://release-monitoring.org/project/08757 | 1.0.25 | 1.0.29 | erlang-p1-mqtree | DISTRO | https://release-monitoring.org/project/20220 | 1.0.10 | 1.0.14 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.7 | 0.8.0 | erlang-p1-pkix | DISTRO | https://release-monitoring.org/project/20539 | 1.0.6 | 1.0.8 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.38 | 1.0.45 | erlang-p1-stringprep | DISTRO | https://release-monitoring.org/project/09222 | 1.0.23 | 1.0.27 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.0.39 | 1.2.0 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.9 | 1.1.13 | erlang-p1-utils | DISTRO | https://release-monitoring.org/project/08643 | 1.0.20 | 1.0.24 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.44 | 1.1.48 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.4.10 | 1.5.6 | erlang-p1-yaml | DISTRO | https://release-monitoring.org/project/10243 | 1.0.28 | 1.0.32 | erlang-p1-yconf | DISTRO | https://release-monitoring.org/project/45378 | 1.0.8 | 1.0.12 | erlang-p1-zlib | DISTRO | https://release-monitoring.org/project/09283 | 1.0.9 | 1.0.10 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.3 | 1.4 | ethtool | DISTRO | https://release-monitoring.org/project/00763 | 5.15 | 5.16 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.8.0.1 | 2.8.2.0 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.26 | 1.27 | ORPH fatcat | DISTRO | https://release-monitoring.org/project/21349 | 1.1.0 | 1.1.1 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.8 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.24 | 6.4.26 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.1 | 5.0 | fftw-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-long-double | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-quad | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fftw-single | DISTRO | https://release-monitoring.org/project/00803 | 3.3.8 | 3.3.10 | ORPH fio | DISTRO | https://release-monitoring.org/project/00806 | 3.28 | 3.29 | flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.16.1 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.2 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.8 | ORPH fluidsynth | DISTRO | https://release-monitoring.org/project/10437 | 2.2.4 | 2.2.5 | fmc | GUESS | https://release-monitoring.org/project/145761 | fsl-sdk-v2.0 | 0.2.0 | fmt | DISTRO | https://release-monitoring.org/project/11526 | 8.0.1 | 8.1.1 | font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 5.15.4 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.13.1 | 2.13.94 | ORPH freeipmi | DISTRO | https://release-monitoring.org/project/00848 | 1.6.8 | 1.6.9 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.5.0 | 1.8.1 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 21.11.00 | 21.12.00 | gauche | DISTRO | https://release-monitoring.org/project/00873 | 0.9.9 | 0.9.10 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 3.41.0 | ORPH gdk-pixbuf | DISTRO | https://release-monitoring.org/project/09533 | 2.42.4 | 2.42.6 | ORPH gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.2.9 | 2.3.5 | gettext-gnu | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 9.53.3 | 9.55.0 | git | DISTRO | https://release-monitoring.org/project/05350 | 2.31.1 | 2.34.1 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.66.0 | 2.70.1 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.68.2 | 2.70.0 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.5 | 0.9.9.8 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.10 | 3.0.14 | gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.2.32 | 2.3.4 | ORPH gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.8.2.0 | 3.10.0.0 | gnutls | DISTRO | https://release-monitoring.org/project/01221 | 3.7.2 | 3.7.3 | gocryptfs | DISTRO | https://release-monitoring.org/project/21085 | 2.2.0 | 2.2.1 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.14.4 | 2.15.7 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.0.0 | 6.2.0 | ORPH grub2 | DISTRO | https://release-monitoring.org/project/01257 | 2.04 | 2.06 | gsettings-desktop-schemas | DISTRO | https://release-monitoring.org/project/13139 | 3.36.1 | 41.0 | ORPH gsl | DISTRO | https://release-monitoring.org/project/01267 | 2.6 | 2.7.1 | ORPH gst-omx | DISTRO | https://release-monitoring.org/project/21845 | 1.18.5 | 1.19.3 | ORPH gst1-devtools | DISTRO | https://release-monitoring.org/project/21856 | 1.18.5 | 1.19.3 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.0.0 | gst1-interpipe | DISTRO | https://release-monitoring.org/project/21847 | 1.1.7 | 1.1.8 | gst1-libav | DISTRO | https://release-monitoring.org/project/21848 | 1.18.5 | 1.19.3 | ORPH gst1-rtsp-server | DISTRO | https://release-monitoring.org/project/21853 | 1.18.5 | 1.19.3 | ORPH gstd | DISTRO | https://release-monitoring.org/project/235022 | 0.13.0 | 0.13.2 | ORPH gtkmm3 | DISTRO | https://release-monitoring.org/project/07963 | 3.22.0 | 4.4.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.3.2 | gupnp | DISTRO | https://release-monitoring.org/project/01281 | 1.4.2 | 1.4.3 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.49.1 | ORPH hackrf | DISTRO | https://release-monitoring.org/project/06136 | 2018.01.1 | 2021.03.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.4.8 | 2.5.1 | haveged | DISTRO | https://release-monitoring.org/project/11695 | 1.9.15 | 1.9.17 | hidapi | DISTRO | https://release-monitoring.org/project/05594 | 0.11.0 | 0.11.2 | ORPH hostapd | DISTRO | https://release-monitoring.org/project/01325 | 2.9 | 2.10 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.21.12 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.13 | ORPH ifupdown | DISTRO | https://release-monitoring.org/project/21673 | 0.8.16 | 0.8.37 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.0-19 | 7.1.0-20 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.7.5 | inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 3.22.1.0 | ORPH iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.492 | 3.493 | ipmiutil | DISTRO | https://release-monitoring.org/project/01391 | 3.1.7 | 3.1.8 | iproute2 | DISTRO | https://release-monitoring.org/project/01392 | 5.15.0 | 5.16.0 | irrlicht | DISTRO | https://release-monitoring.org/project/01403 | 1.8.4 | 1.8.5 | isl | DISTRO | https://release-monitoring.org/project/13286 | 0.23 | 0.24 | ORPH jack1 | DISTRO | https://release-monitoring.org/project/59394 | 0.125.0 | 0.126.0 | jack2 | DISTRO | https://release-monitoring.org/project/21358 | 1.9.17 | 1.9.20 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.4 | 1.6 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.3 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.10.4 | 1.13.1 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.1 | json-glib | DISTRO | https://release-monitoring.org/project/13144 | 1.4.4 | 1.6.6 | ORPH jszip | DISTRO | https://release-monitoring.org/project/141558 | 3.2.2 | 3.7.1 | keepalived | DISTRO | https://release-monitoring.org/project/01504 | 2.1.4 | 2.2.7 | kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.47.0 | 5.90.0 | kismet | DISTRO | https://release-monitoring.org/project/06966 | 2021-08-R1 | 2022-01-R2 | ORPH kodi-audiodecoder-modplug | DISTRO | https://release-monitoring.org/project/21818 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-nosefart | DISTRO | https://release-monitoring.org/project/21819 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-sidplay | DISTRO | https://release-monitoring.org/project/21820 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-snesapu | DISTRO | https://release-monitoring.org/project/21802 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-stsound | DISTRO | https://release-monitoring.org/project/21801 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audiodecoder-timidity | DISTRO | https://release-monitoring.org/project/21800 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-audiodecoder-vgmstream | DISTRO | https://release-monitoring.org/project/21799 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-audioencoder-flac | DISTRO | https://release-monitoring.org/project/17755 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-lame | DISTRO | https://release-monitoring.org/project/21798 | 19.1.2-Ma... | 20.3.0-Nexus | kodi-audioencoder-vorbis | DISTRO | https://release-monitoring.org/project/21797 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-audioencoder-wav | DISTRO | https://release-monitoring.org/project/21796 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 19.2.1-Ma... | 20.4.1-Nexus | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 19.0.1-Ma... | 20.2.1-Nexus | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 19.0.4-Ma... | 20.2.0-Nexus | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 19.0.2-Ma... | 20.2.0-Nexus | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 19.0.6-Ma... | 20.2.3-Nexus | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 19.0.3-Ma... | 20.2.1-Nexus | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-octonet | DISTRO | https://release-monitoring.org/project/100437 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 19.0.3-Ma... | 20.1.0-Nexus | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 19.0.1-Ma... | 20.2.0-Nexus | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 19.0.3-Ma... | 20.2.2-Nexus | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 19.0.0-Ma... | 20.2.0-Nexus | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 19.1.1-Ma... | 20.3.0-Nexus | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 19.0.2-Ma... | 20.2.1-Nexus | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 19.7.10-M... | 20.2.1-Nexus | kodi-screensaver-asteroids | DISTRO | https://release-monitoring.org/project/21771 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-asterwave | DISTRO | https://release-monitoring.org/project/21770 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-biogenesis | DISTRO | https://release-monitoring.org/project/21768 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-cpblobs | DISTRO | https://release-monitoring.org/project/21767 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-greynetic | DISTRO | https://release-monitoring.org/project/21765 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-matrixtrails | DISTRO | https://release-monitoring.org/project/21764 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pingpong | DISTRO | https://release-monitoring.org/project/21763 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-pyro | DISTRO | https://release-monitoring.org/project/21761 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-screensaver-rsxs | DISTRO | https://release-monitoring.org/project/21760 | 19.0.2-Ma... | 20.1.0-Nexus | kodi-screensaver-stars | DISTRO | https://release-monitoring.org/project/21759 | 19.0.0-Ma... | 20.1.0-Nexus | kodi-vfs-libarchive | DISTRO | https://release-monitoring.org/project/177173 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-rar | DISTRO | https://release-monitoring.org/project/21900 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-vfs-sftp | DISTRO | https://release-monitoring.org/project/21899 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-fishbmc | DISTRO | https://release-monitoring.org/project/21758 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-goom | DISTRO | https://release-monitoring.org/project/21757 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-matrix | DISTRO | https://release-monitoring.org/project/177172 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-shadertoy | DISTRO | https://release-monitoring.org/project/21756 | 19.1.2-Ma... | 20.2.0-Nexus | kodi-visualisation-spectrum | DISTRO | https://release-monitoring.org/project/21755 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-starburst | DISTRO | https://release-monitoring.org/project/85703 | 19.0.1-Ma... | 20.1.0-Nexus | kodi-visualisation-waveform | DISTRO | https://release-monitoring.org/project/21753 | 19.0.2-Ma... | 20.1.0-Nexus | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 1.2.0 | 2.1.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.2 | 0.3.95 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 2.25 | 2.26-1 | ORPH libbpf | DISTRO | https://release-monitoring.org/project/141355 | 0.4.0 | 0.6.1 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.3 | 0.11.4 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 0.42.2 | 2.0 | libcodec2 | DISTRO | https://release-monitoring.org/project/14605 | 1.0.1 | 1.03 | libev | DISTRO | https://release-monitoring.org/project/01605 | 4.27 | 4.33 | ORPH libfuse | GUESS | https://release-monitoring.org/project/00861 | 2.9.9 | 3.10.5 | ORPH libgdiplus | DISTRO | https://release-monitoring.org/project/06440 | 6.0.5 | 6.1 | libgeos | DISTRO | https://release-monitoring.org/project/13493 | 3.10.1 | 3.10.2 | libgeotiff | DISTRO | https://release-monitoring.org/project/21361 | 1.6.0 | 1.7.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.38.2 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.2 | 3.3.6 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.68.4 | 2.70.2 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.3.2 | 1.4.0 | ORPH libgpg-error | DISTRO | https://release-monitoring.org/project/01628 | 1.42 | 1.43 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.28 | ORPH libgtk2 | DISTRO | https://release-monitoring.org/project/13942 | 2.24.33 | 4.6.0 | libgudev | DISTRO | https://release-monitoring.org/project/07735 | 236 | 237 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.32 | 2.37 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.13 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.16 | ORPH libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.2.0 | libkcapi | DISTRO | https://release-monitoring.org/project/16828 | 1.1.5 | 1.3.1 | ORPH libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.11.1 | 0.11.3 | libmhash | DISTRO | https://release-monitoring.org/project/21488 | 0.9.9.9 | 1.4 | ORPH libminiupnpc | DISTRO | https://release-monitoring.org/project/01986 | 2.1.20201016 | 2.2.3 | libmodbus | DISTRO | https://release-monitoring.org/project/09728 | 3.1.6 | 3.1.7 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.9.1 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.1.5 | 4.2.1 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.10 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 1.1.1m | 3.0.1 | libosmium | DISTRO | https://release-monitoring.org/project/07023 | 2.17.2 | 2.17.3 | libpagekite | DISTRO | https://release-monitoring.org/project/21366 | 0.91.190530 | 0.91.201110 | libpam-radius-auth | DISTRO | https://release-monitoring.org/project/57834 | 1.4.0 | 2.0.0 | ORPH libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 6.4.5 | 7.7.0 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.5.0 | 1.6.0 | libqb | DISTRO | https://release-monitoring.org/project/09399 | 2.0.3 | 2.0.4 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.7 | 2.52.5 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.3 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.3 | 20200710 | libsigsegv | DISTRO | https://release-monitoring.org/project/01722 | 2.13 | 2.14 | libsoup | DISTRO | https://release-monitoring.org/project/11483 | 2.74.0 | 3.0.4 | libsrtp | DISTRO | https://release-monitoring.org/project/18547 | 2.4.1 | 2.4.2 | libss7 | DISTRO | https://release-monitoring.org/project/21690 | 2.0.0 | 2.0.1 | libtextstyle | DISTRO | https://release-monitoring.org/project/00898 | 0.20.1 | 0.21 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.5 | libuhttpd | DISTRO | https://release-monitoring.org/project/89386 | 3.12.1 | 3.14.1 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.5.0 | 1.6.2 | ORPH libuv | DISTRO | https://release-monitoring.org/project/10784 | 1.42.0 | 1.43.0 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.12.1 | libvirt | DISTRO | https://release-monitoring.org/project/224041 | 7.10.0 | 8.0.0 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.0.21 | 4.3.1 | libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3119 | 1.51.07 | linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.0.66 | ORPH live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2022.01.21 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.9 | 1.0.13 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 9.0.1 | 13.0.0 | lm-sensors | DISTRO | https://release-monitoring.org/project/01831 | 3-6-0 | 3.6.0 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.12.0 | 0.12.1 | logrotate | DISTRO | https://release-monitoring.org/project/10567 | 3.18.0 | 3.19.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20210927 | 20220121 | ltris | DISTRO | https://release-monitoring.org/project/21503 | 1.2 | 1.2.3 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.8 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.3 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.16.1 | luvi | DISTRO | https://release-monitoring.org/project/21512 | 2.12.0 | 2.13.0 | lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.12 | 2.03.14 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzop | DISTRO | https://release-monitoring.org/project/07486 | 1.03 | 1.04 | make | DISTRO | https://release-monitoring.org/project/01877 | 4.2.1 | 4.3 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.3.30 | 10.7.1 | ORPH matchbox-keyboard | DISTRO | https://release-monitoring.org/project/230595 | 0.1 | 0.1.1 | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.0 | 3.1.0 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.4.0 | 0.1.5.1 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.0.66 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.12 | 1.6.13 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 5.01 | 5.31b | memtester | DISTRO | https://release-monitoring.org/project/01967 | 4.5.0 | 4.5.1 | meson | DISTRO | https://release-monitoring.org/project/06472 | 0.61.0 | 0.61.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.42.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | micropython | DISTRO | https://release-monitoring.org/project/10539 | 1.17 | 1.18 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2021.10 | 2021.12 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20190618 | 20210805 | ORPH moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.8.1 | 0.9.3 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.16.10 | 1.18.4 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.11 | 5.2.0 | mongoose | DISTRO | https://release-monitoring.org/project/07603 | 7.2 | 7.6 | monit | DISTRO | https://release-monitoring.org/project/05483 | 5.26.0 | 5.30.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.90 | 6.12.0.165 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.0 | 2.5.1 | mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.25.15 | 1.29.3 | ORPH mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.33.1 | 0.34.1 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 4.0.3 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.14 | 1.8.19 | mstpd | DISTRO | https://release-monitoring.org/project/235098 | 0.1.0 | 0.05 | mtd | DISTRO | https://release-monitoring.org/project/02026 | 2.1.3 | 2.1.4 | mtools | DISTRO | https://release-monitoring.org/project/02028 | 4.0.36 | 4.0.37 | mtr | DISTRO | https://release-monitoring.org/project/02029 | 0.94 | 0.95 | ORPH mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.18.0 | 1.19.0 | nbd | DISTRO | https://release-monitoring.org/project/02052 | 3.21 | 3.23 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.16 | 2.0.1 | ncurses | DISTRO | https://release-monitoring.org/project/02057 | 6.1 | 6.3-20220122 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | debian_1.... | 1.218 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.21.1 | 1.32.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.6.1 | 0.7.3 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9 | 5.9.1 | ORPH network-manager | DISTRO | https://release-monitoring.org/project/21197 | 1.32.12 | 1.34.0 | ORPH network-manager-openvpn | DISTRO | https://release-monitoring.org/project/69977 | 1.8.14 | 1.8.16 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.41.0 | 1.46.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.20.1 | 1.21.5 | nodejs | DISTRO | https://release-monitoring.org/project/08251 | 14.18.3 | 17.4.0 | nss-mdns | DISTRO | https://release-monitoring.org/project/05491 | 0.14.1 | 0.15.1 | ORPH nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.132 | 390.147 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 510.39.01 | ORPH nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 1.16 | ORPH ocf-linux | DISTRO | https://release-monitoring.org/project/21541 | 20120127 | 20171122 | ORPH ocrad | DISTRO | https://release-monitoring.org/project/02526 | 0.27 | 0.28 | ofono | DISTRO | https://release-monitoring.org/project/16859 | 1.31 | 1.34 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 13.2.4 | open62541 | DISTRO | https://release-monitoring.org/project/16896 | v1.2.2 | 1.2.3 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.18 | 0.3.19 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.17 | 4.5.5 | openfpgaloader | DISTRO | https://release-monitoring.org/project/241709 | 0.6.1 | 0.7.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 11.0.13+8 | 19+6 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 6.11.0 | 6.12.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.0.0 | 4.1.2 | ORPH openpowerlink | DISTRO | https://release-monitoring.org/project/21550 | 2.7.1 | 2.7.2 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.43.3 | 0.44.10 | opentracing-cpp | DISTRO | https://release-monitoring.org/project/21553 | 1.5.1 | 1.6.0 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 10.3.5-10... | 11.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.4.5 | 0.5.0 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.4.5 | 0.5.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.0.28 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.0.66 | ORPH osm2pgsql | DISTRO | https://release-monitoring.org/project/02575 | 1.5.1 | 1.5.2 | p11-kit | DISTRO | https://release-monitoring.org/project/02582 | 0.23.22 | 0.24.1 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.48.2 | 2.50.0 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH parted | DISTRO | https://release-monitoring.org/project/02596 | 3.3 | 3.4 | patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.9 | 0.14.3 | ORPH pax-utils | DISTRO | https://release-monitoring.org/project/02601 | 1.2.6 | 1.3.3 | ORPH pcm-tools | DISTRO | https://release-monitoring.org/project/21377 | 202110 | 202112 | ORPH perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-guess | DISTRO | https://release-monitoring.org/project/17375 | 0.12 | 0.14 | perl-crypt-openssl-rsa | DISTRO | https://release-monitoring.org/project/02748 | 0.31 | 0.32 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 4.050 | perl-gd | DISTRO | https://release-monitoring.org/project/12660 | 2.73 | 2.74 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.60 | 6.61 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20200824 | 1.20200907 | perl-net-http | DISTRO | https://release-monitoring.org/project/03152 | 6.21 | 6.22 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.85 | 1.92 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0207 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.0.14 | 8.1.2 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 1.10.2 | 1.11.0 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.20 | 5.1.21 | php-gnupg | DISTRO | https://release-monitoring.org/project/21743 | 1.5.0 | 1.5.1 | ORPH php-imagick | DISTRO | https://release-monitoring.org/project/17401 | 3.5.0 | 3.7.0 | ORPH php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.3 | 2.2.4 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.0.4 | 3.1.2 | php-yaml | DISTRO | https://release-monitoring.org/project/12515 | 2.2.1 | 2.2.2 | ORPH pigpio | DISTRO | https://release-monitoring.org/project/21577 | 79 | 7301 | pigz | DISTRO | https://release-monitoring.org/project/03642 | 2.6 | 2.7 | pinentry | DISTRO | https://release-monitoring.org/project/03643 | 1.1.1 | 1.2.0 | ORPH pkcs11-helper | DISTRO | https://release-monitoring.org/project/91990 | 1.27 | 1.28 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 1.8.0 | ORPH poco | DISTRO | https://release-monitoring.org/project/05418 | 1.10.1 | 1.11.1 | policycoreutils | DISTRO | https://release-monitoring.org/project/03680 | 3.2 | 20200710 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 21.12.0 | 22.01.0 | powerpc-utils | DISTRO | https://release-monitoring.org/project/10715 | 1.3.8 | 1.3.9 | ORPH powertop | DISTRO | https://release-monitoring.org/project/03702 | 2.13 | 2.14 | proftpd | DISTRO | https://release-monitoring.org/project/07609 | 1.3.6e | 1.3.7c | proj | DISTRO | https://release-monitoring.org/project/21570 | 8.1.1 | 8.2.1 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.3 | protozero | DISTRO | https://release-monitoring.org/project/08002 | 1.7.0 | 1.7.1 | proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.14 | 4.15 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 14.2 | 15.0 | python-aenum | DISTRO | https://release-monitoring.org/project/34074 | 3.1.0 | 3.1.8 | python-aioblescan | DISTRO | https://release-monitoring.org/project/21242 | 0.2.8 | 0.2.12 | python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.1 | 0.4.3 | python-aiohttp-remotes | DISTRO | https://release-monitoring.org/project/21248 | 1.1.0 | 1.2.0 | python-aiojobs | DISTRO | https://release-monitoring.org/project/21252 | 0.3.0 | 1.0.0 | python-aiorwlock | DISTRO | https://release-monitoring.org/project/21254 | 1.2.0 | 1.3.0 | python-alsaaudio | DISTRO | https://release-monitoring.org/project/10072 | 0.8.4 | 0.9.0 | python-argon2-cffi | DISTRO | https://release-monitoring.org/project/33377 | 21.1.0 | 21.3.0 | python-arrow | DISTRO | https://release-monitoring.org/project/05314 | 1.2.0 | 1.2.1 | python-asgiref | DISTRO | https://release-monitoring.org/project/18462 | 3.3.4 | 3.5.0 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 21.2.0 | 21.4.0 | python-autobahn | DISTRO | https://release-monitoring.org/project/07015 | 21.3.1 | 21.11.1 | python-avro | DISTRO | https://release-monitoring.org/project/59411 | 1.10.0 | 1.11.0 | python-bidict | DISTRO | https://release-monitoring.org/project/114352 | 0.21.3 | 0.21.4 | python-bleak | DISTRO | https://release-monitoring.org/project/26271 | 0.12.1 | 0.14.1 | python-boto3 | DISTRO | https://release-monitoring.org/project/08778 | 1.19.2 | 1.20.41 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.22.2 | 1.23.41 | python-canopen | DISTRO | https://release-monitoring.org/project/23230 | 1.0.0 | 2.0.0b1 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2021.5.30 | 2021.10.8 | python-channels | DISTRO | https://release-monitoring.org/project/21937 | 2.3.1 | 3.0.4 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 2.4.1 | 3.3.1 | python-charset-normalizer | DISTRO | https://release-monitoring.org/project/55366 | 2.0.7 | 2.0.10 | python-cheroot | DISTRO | https://release-monitoring.org/project/20163 | 8.2.1 | 8.6.0 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 12.0.1 | 18.6.1 | python-click | DISTRO | https://release-monitoring.org/project/03802 | 7.1.2 | 8.0.3 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.4.1 | 6.6.0 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-cssutils | DISTRO | https://release-monitoring.org/project/13259 | 1.0.2 | 2.3.0 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python-daemon | DISTRO | https://release-monitoring.org/project/03816 | 2.2.3 | 2.3.0 | python-daphne | DISTRO | https://release-monitoring.org/project/21939 | 2.4.1 | 3.0.2 | python-dataproperty | DISTRO | https://release-monitoring.org/project/21697 | 0.53.0 | 0.54.2 | python-decorator | DISTRO | https://release-monitoring.org/project/03819 | 5.1.0 | 5.1.1 | python-dialog | DISTRO | https://release-monitoring.org/project/03823 | 3.4.0 | 3.5.3 | python-dialog3 | DISTRO | https://release-monitoring.org/project/03823 | 3.5.1 | 3.5.3 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 3.2.11 | 4.0.1 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.1.0 | 2.2.0 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 4.1.0 | 5.0.3 | python-docutils | DISTRO | https://release-monitoring.org/project/03849 | 0.15.2 | 0.18.1 | python-ecdsa | DISTRO | https://release-monitoring.org/project/08370 | 0.17.0 | 0.18.0b2 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.2.1 | 4.3.1 | python-filelock | DISTRO | https://release-monitoring.org/project/11739 | 3.3.0 | 3.4.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 1.1.2 | 2.0.2 | python-flask-expects-json | DISTRO | https://release-monitoring.org/project/127659 | 1.5.0 | 1.7.0 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 0.3.1 | 2.1.0 | python-flask-sqlalchemy | DISTRO | https://release-monitoring.org/project/05701 | 2.4.1 | 2.5.1 | python-flask-wtf | DISTRO | https://release-monitoring.org/project/05702 | 0.15.1 | 1.0.0 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.28.2 | 4.28.5 | python-frozenlist | DISTRO | https://release-monitoring.org/project/41138 | 1.2.0 | 1.3.0 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.24 | 3.1.26 | python-gitdb2 | DISTRO | https://release-monitoring.org/project/12730 | 4.0.7 | 4.0.9 | python-greenlet | DISTRO | https://release-monitoring.org/project/06870 | 1.1.2 | 2.0.0a1 | python-httplib2 | DISTRO | https://release-monitoring.org/project/03887 | 0.19.1 | 0.20.2 | python-humanize | DISTRO | https://release-monitoring.org/project/19799 | 3.11.0 | 3.13.1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.2 | 3.3 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 7.28.0 | 8.0.1 | python-iso8601 | DISTRO | https://release-monitoring.org/project/17228 | 0.1.14 | 1.0.2 | python-itsdangerous | DISTRO | https://release-monitoring.org/project/03892 | 1.1.0 | 2.0.1 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-janus | DISTRO | https://release-monitoring.org/project/56567 | 0.6.1 | 1.0.0 | python-jaraco-classes | DISTRO | https://release-monitoring.org/project/20150 | 2.0 | 3.2.1 | python-jaraco-functools | DISTRO | https://release-monitoring.org/project/20165 | 2.0 | 3.5.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.0.2 | 3.0.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 2.5.1 | 4.4.0 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 19.2.0 | 23.5.0 | python-kiwisolver | DISTRO | https://release-monitoring.org/project/16910 | 1.1.0 | 1.3.2 | python-lmdb | DISTRO | https://release-monitoring.org/project/15512 | 1.2.1 | 1.3.0 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.6.5 | 4.7.1 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.1.5 | 1.1.6 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.3.4 | 3.3.6 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.1 | 2.4.2 | python-matplotlib | DISTRO | https://release-monitoring.org/project/03919 | 3.4.3 | 3.5.1 | python-memory-profiler | DISTRO | https://release-monitoring.org/project/38508 | 0.58.0 | 0.60.0 | python-mistune | DISTRO | https://release-monitoring.org/project/06189 | 0.8.4 | 2.0.2 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 8.10.0 | 8.12.0 | python-mpd2 | DISTRO | https://release-monitoring.org/project/19721 | 3.0.4 | 3.0.5 | python-msgfy | DISTRO | https://release-monitoring.org/project/29716 | 0.1.0 | 0.2.0 | python-msgpack | DISTRO | https://release-monitoring.org/project/21831 | 1.0.2 | 1.0.3 | python-multidict | DISTRO | https://release-monitoring.org/project/11132 | 5.2.0 | 6.0.0 | python-networkmanager | DISTRO | https://release-monitoring.org/project/12909 | 2.1 | 2.2 | python-nfc | DISTRO | https://release-monitoring.org/project/21829 | 0.13.5 | 1.0.3 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.21.2 | 1.22.1 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 0.8.4 | 0.98.9 | python-paho-mqtt | DISTRO | https://release-monitoring.org/project/06084 | 1.4.0 | 1.6.1 | python-pam | DISTRO | https://release-monitoring.org/project/05725 | 0.5.0 | 1.8.4 | python-paramiko | DISTRO | https://release-monitoring.org/project/03954 | 2.7.2 | 2.9.2 | python-pathlib2 | DISTRO | https://release-monitoring.org/project/12723 | 2.3.5 | 2.3.6 | python-pathpy | DISTRO | https://release-monitoring.org/project/21703 | 12.0.1 | 12.5.0 | python-pbr | DISTRO | https://release-monitoring.org/project/03960 | 5.6.0 | 5.8.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 8.4.0 | 9.0.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 21.2.4 | 21.3.1 | python-portend | DISTRO | https://release-monitoring.org/project/20203 | 2.5 | 3.1.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.20 | 3.0.24 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 3.19.1 | 3.19.3 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python-psycopg2 | DISTRO | https://release-monitoring.org/project/03979 | 2.9.1 | 2.9.3 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2021.1 | 2022.1 | python-py | DISTRO | https://release-monitoring.org/project/03981 | 1.10.0 | 1.11.0 | python-pycairo | DISTRO | https://release-monitoring.org/project/13166 | 1.19.1 | 1.20.1 | python-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.13.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 1.8.2 | 1.9.0a2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.5 | 1.5.6 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.1.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.7.4 | 2.11.2 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.2 | 2.0.3 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 1.9.7 | 2.8 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.18.1 | 0.19.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 2.2.0 | 2.5.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.18.14 | 1.19.4 | python-pynacl | DISTRO | https://release-monitoring.org/project/12703 | 1.4.0 | 1.5.0 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 19.1.0 | 21.0.0 | python-pyparsing | DISTRO | https://release-monitoring.org/project/03756 | 3.0.6 | 3.0.7 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.11.6 | 3.11.7 | python-pyphen | DISTRO | https://release-monitoring.org/project/19681 | 0.11.0 | 0.12.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.7 | 5.15.6 | python-pyro | DISTRO | https://release-monitoring.org/project/19993 | 3.16 | 4.82 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.5.7 | 0.6.5 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.26.1 | 0.31.1 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.46.1 | 0.64.1 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.15.1 | 0.17.2 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2019.3 | 2021.3 | python-pyusb | DISTRO | https://release-monitoring.org/project/21595 | 1.1.1 | 1.2.1 | python-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 19.0.2 | 22.3.0 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 3.5.3 | 4.1.1 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python-requests | DISTRO | https://release-monitoring.org/project/04004 | 2.26.0 | 2.27.1 | python-rpi-ws281x | DISTRO | https://release-monitoring.org/project/21898 | 4.3.0 | 4.3.1 | python-rsa | DISTRO | https://release-monitoring.org/project/08808 | 4.7.2 | 4.8 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-secretstorage | DISTRO | https://release-monitoring.org/project/04020 | 3.1.2 | 3.3.1 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.4.3 | 1.5.3 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 18.1.0 | 21.1.0 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 44.0.0 | 60.5.0 | python-setuptools-scm | DISTRO | https://release-monitoring.org/project/07874 | 6.3.2 | 6.4.2 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.17.5 | 3.17.6 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 0.45.2 | 1.3.0 | python-singledispatch | DISTRO | https://release-monitoring.org/project/12013 | 3.4.0.3 | 3.7.0 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.18 | 5.0.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 4.0.0 | 5.0.0 | python-snappy | DISTRO | https://release-monitoring.org/project/07203 | 0.5.4 | 0.6.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.4.0 | 5.5.1 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.2.1 | 2.3.1 | python-sqlalchemy | DISTRO | https://release-monitoring.org/project/04034 | 1.3.10 | 1.4.31 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.2.0 | 1.2.1 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.3.0 | 0.4.2 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 1.14.1 | 5.0.0 | python-terminaltables | DISTRO | https://release-monitoring.org/project/15542 | 3.1.0 | 3.1.10 | python-thrift | DISTRO | https://release-monitoring.org/project/21614 | 0.13.0 | 0.15.0 | python-tinycss2 | DISTRO | https://release-monitoring.org/project/16655 | 1.1.0 | 1.1.1 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.1 | 1.1.3 | python-tomli | DISTRO | https://release-monitoring.org/project/207408 | 1.2.0 | 2.0.0 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.0.4 | 6.1 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.40.1 | 4.62.3 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.1.0 | 5.1.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 20.3.0 | 21.5.0 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 20.3.0 | 21.7.0 | python-typing-extensions | DISTRO | https://release-monitoring.org/project/19755 | 3.10.0.2 | 4.0.1 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 4.2.0 | 5.1.0 | python-unittest-xml-reporting | DISTRO | https://release-monitoring.org/project/72281 | 3.0.4 | 3.2.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 1.26.7 | 1.26.8 | python-validators | DISTRO | https://release-monitoring.org/project/19818 | 0.15.0 | 0.18.2 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.1.9 | 0.2.5 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 53.4 | 54.0b1 | python-webpy | DISTRO | https://release-monitoring.org/project/04090 | 0.40 | 0.62 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 0.58.0 | 1.2.3 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.0 | 10.1 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 1.0.1 | 2.0.2 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.12.1 | 1.13.3 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 2.3.3 | 3.0.1 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.27 | 0.31 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.1 | 3.0.2 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.29.0 | 0.38.1 | python3 | DISTRO | https://release-monitoring.org/project/13254 | 3.10.1 | 3.10.2 | python3-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.24 | 3.0.0a10 | python3-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.8.0 | 5.9.0 | python3-pycparser | DISTRO | https://release-monitoring.org/project/08175 | 2.20 | 2.21 | python3-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.11.0 | 3.13.0 | python3-pyyaml | DISTRO | https://release-monitoring.org/project/04123 | 5.4.1 | 6.0b1 | python3-regex | DISTRO | https://release-monitoring.org/project/05548 | 2021.4.4 | 2022.1.18 | python3-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 59.8.0 | 60.5.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.36.0 | qt53d | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5base | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5charts | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5connectivity | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5declarative | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5graphicaleffects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5imageformats | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5location | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5lottie | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5multimedia | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quickcontrols2 | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5quicktimeline | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5remoteobjects | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5script | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5scxml | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5sensors | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialbus | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5serialport | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5svg | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5tools | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5virtualkeyboard | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5wayland | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webchannel | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webkit | DISTRO | https://release-monitoring.org/project/07927 | 5.212.0-a... | 6.2.2 | qt5websockets | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5webview | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5x11extras | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | qt5xmlpatterns | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.2.2 | quazip | DISTRO | https://release-monitoring.org/project/04141 | 1.1 | 1.2 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH rabbitmq-server | DISTRO | https://release-monitoring.org/project/05585 | 3.8.2 | 3.9.13 | ranger | DISTRO | https://release-monitoring.org/project/07426 | 1.7.2 | 1.9.3 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.3 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.4 | 1.10.5 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 6.27.3 | rsyslog | DISTRO | https://release-monitoring.org/project/04218 | 8.2010.0 | 8.2112.0 | rtai | DISTRO | https://release-monitoring.org/project/21658 | 4.0.1 | 5.3 | ORPH rtty | DISTRO | https://release-monitoring.org/project/87994 | 7.4.0 | 8.0.0 | runc | DISTRO | https://release-monitoring.org/project/07462 | 1.0.3 | 1.1.0 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.58.1 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.54.0 | 1.58.1 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.40.3 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.10.0.3 | 2.11.0.1 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.1 | 2.3.5.3 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.6.3 | 1.0.7.1 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.5.1.5 | 2.5.1.7 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.4.1.1 | 2.5.1.0 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.3.2 | 2.2.3.4 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.2.2 | 0.5.3.0 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.15.3 | 4.15.4 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.0.32 | 1.1.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 3.1.2 | 4.3.0 | sdl2 | DISTRO | https://release-monitoring.org/project/04779 | 2.0.18 | 2.0.20 | sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.0.15 | 2.0.18 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.25 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | sedutil | DISTRO | https://release-monitoring.org/project/15203 | 1.15.1 | 1.20.0 | sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 1.59.0 | 1.72.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.4.13 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.4 | 4.3.5 | sg3_utils | DISTRO | https://release-monitoring.org/project/04801 | 1.47 | 1.47r915 | shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.1 | ORPH skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.10.0.3 | 2.11.1.0 | sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.4.7 | 1.4.10 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.4.2 | 3.4.8 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.18.0 | 3.1.20.0 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.38-9760... | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | speexdsp | DISTRO | https://release-monitoring.org/project/08419 | SpeexDSP-... | 1.2.0 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.37.1 | 3.37.2 | sshfs | DISTRO | https://release-monitoring.org/project/11058 | 3.7.1 | 3.7.2 | ORPH start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.21.1 | ORPH startup-notification | DISTRO | https://release-monitoring.org/project/10089 | 0.9 | 0.12 | ORPH stress | DISTRO | https://release-monitoring.org/project/08048 | 1.0.4 | 1.0.5 | stunnel | DISTRO | https://release-monitoring.org/project/04901 | 5.60 | 5.62 | supervisor | DISTRO | https://release-monitoring.org/project/16289 | 4.2.2 | 4.2.4 | ORPH synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.23.1 | 0.28.0 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 3.34.1 | 3.35.1 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 3.42.1 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.4.2 | 12.5.5 | ORPH systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 234 | sysvinit | DISTRO | https://release-monitoring.org/project/21648 | 2.99 | 3.01 | ORPH tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.4.6 | 2.4.8 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.15.0 | ORPH tinyssh | DISTRO | https://release-monitoring.org/project/14678 | 20210601 | 20220101 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tmux | DISTRO | https://release-monitoring.org/project/04980 | 3.1c | 3.2a | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 2.4.0 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | trace-cmd | DISTRO | https://release-monitoring.org/project/07873 | trace-cmd... | 2.9.4 | tree | DISTRO | https://release-monitoring.org/project/05006 | 1.8.0 | 2.0.1 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2022.01 | udpcast | DISTRO | https://release-monitoring.org/project/10206 | 20200328 | 20211207 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.10 | 0.11 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 3.15.0.0 | 4.1.0.5 | umtprd | DISTRO | https://release-monitoring.org/project/46129 | 1.3.10 | 1.6.2 | unclutter-xfixes | DISTRO | https://release-monitoring.org/project/09206 | 1.5 | 1.6 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 2.2 | upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.5.13 | uvw | DISTRO | https://release-monitoring.org/project/33083 | 2.10.0_li... | 2.11.0_li... | vala | DISTRO | https://release-monitoring.org/project/05065 | 0.52.4 | 0.55.1 | ORPH valijson | DISTRO | https://release-monitoring.org/project/18452 | 0.3 | 0.6 | vim | DISTRO | https://release-monitoring.org/project/05092 | 8.2.4092 | 8.2.4186 | ORPH vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.2.22 | 3.2.29 | waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.6.1 | 1.7.0 | wayland | DISTRO | https://release-monitoring.org/project/10061 | 1.19.0 | 1.20.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.23 | 1.24 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.32.4 | 2.34.4 | webp | DISTRO | https://release-monitoring.org/project/01761 | 1.2.1 | 1.2.2 | webrtc-audio-processing | DISTRO | https://release-monitoring.org/project/15929 | 0.3.1 | 1.0 | ORPH whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.10 | 5.5.11 | wilc1000-firmware | DISTRO | https://release-monitoring.org/project/65598 | 14.1 | 15.6 | wine | DISTRO | https://release-monitoring.org/project/05134 | 6.0 | 7.0 | wireguard-linux-compat | DISTRO | https://release-monitoring.org/project/62379 | 1.0.20210606 | 1.0.20211208 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.2 | 0.4.7 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 3.4.11 | 3.6.1 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.14.1 | 0.15.0 | wolfssl | DISTRO | https://release-monitoring.org/project/21631 | 4.8.1-stable | 5.1.1 | wpa_supplicant | DISTRO | https://release-monitoring.org/project/05146 | 2.9 | 2.10 | wpewebkit | DISTRO | https://release-monitoring.org/project/17557 | 2.34.3 | 2.35.1 | xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20220111 | xdotool | DISTRO | https://release-monitoring.org/project/08648 | 3.20160805.1 | 3.20211022.1 | xdriver_xf86-video-amdgpu | DISTRO | https://release-monitoring.org/project/15900 | 19.1.0 | 21.0.0 | xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.3 | 4.16.0 | xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xml-security-c | DISTRO | https://release-monitoring.org/project/05197 | 2.0.2 | 2.0.4 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 5.45 | 6.02 | xserver_xorg-server | DISTRO | https://release-monitoring.org/project/05250 | 21.1.2 | 21.1.3 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.17 | 3.18 | ORPH xterm | DISTRO | https://release-monitoring.org/project/05272 | 367 | 370 | ORPH xvisor | DISTRO | https://release-monitoring.org/project/18448 | 0.3.0 | 0.3.1 | yaml-cpp | DISTRO | https://release-monitoring.org/project/05284 | 0.6.3 | 0.7.0 | ORPH zfs | DISTRO | https://release-monitoring.org/project/11706 | 2.0.5 | 2.1.2 | zstd | DISTRO | https://release-monitoring.org/project/12083 | 1.5.1 | 1.5.2 | zynq-boot-bin | DISTRO | https://release-monitoring.org/project/21623 | 2015.1 | 2021.2 | ORPH Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 clamav | CVE-2022-20698 | https://security-tracker.debian.org/tracker/CVE-2022-20698 containerd | CVE-2021-43816 | https://security-tracker.debian.org/tracker/CVE-2021-43816 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 dnsmasq | CVE-2021-45951 | https://security-tracker.debian.org/tracker/CVE-2021-45951 dnsmasq | CVE-2021-45952 | https://security-tracker.debian.org/tracker/CVE-2021-45952 dnsmasq | CVE-2021-45953 | https://security-tracker.debian.org/tracker/CVE-2021-45953 dnsmasq | CVE-2021-45954 | https://security-tracker.debian.org/tracker/CVE-2021-45954 dnsmasq | CVE-2021-45955 | https://security-tracker.debian.org/tracker/CVE-2021-45955 dnsmasq | CVE-2021-45956 | https://security-tracker.debian.org/tracker/CVE-2021-45956 dnsmasq | CVE-2021-45957 | https://security-tracker.debian.org/tracker/CVE-2021-45957 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libiec61850 | CVE-2021-45769 | https://security-tracker.debian.org/tracker/CVE-2021-45769 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-22815 | https://security-tracker.debian.org/tracker/CVE-2022-22815 python-pillow | CVE-2022-22816 | https://security-tracker.debian.org/tracker/CVE-2022-22816 python-pillow | CVE-2022-22817 | https://security-tracker.debian.org/tracker/CVE-2022-22817 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-22844 | https://security-tracker.debian.org/tracker/CVE-2022-22844 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 bash | CVE-2019-18276 | https://security-tracker.debian.org/tracker/CVE-2019-18276 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-3487 | https://security-tracker.debian.org/tracker/CVE-2021-3487 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bird | CVE-2021-26928 | https://security-tracker.debian.org/tracker/CVE-2021-26928 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2021-42376 | https://security-tracker.debian.org/tracker/CVE-2021-42376 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 civetweb | CVE-2020-27304 | https://security-tracker.debian.org/tracker/CVE-2020-27304 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 clamav | CVE-2022-20698 | https://security-tracker.debian.org/tracker/CVE-2022-20698 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exim | CVE-2021-38371 | https://security-tracker.debian.org/tracker/CVE-2021-38371 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2020-35965 | https://security-tracker.debian.org/tracker/CVE-2020-35965 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 flatbuffers | CVE-2020-35864 | https://security-tracker.debian.org/tracker/CVE-2020-35864 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41157 | https://security-tracker.debian.org/tracker/CVE-2021-41157 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 glibc | CVE-2021-27645 | https://security-tracker.debian.org/tracker/CVE-2021-27645 glibc | CVE-2021-33574 | https://security-tracker.debian.org/tracker/CVE-2021-33574 glibc | CVE-2021-38604 | https://security-tracker.debian.org/tracker/CVE-2021-38604 glibc | CVE-2022-23218 | https://security-tracker.debian.org/tracker/CVE-2022-23218 glibc | CVE-2022-23219 | https://security-tracker.debian.org/tracker/CVE-2022-23219 gnuchess | CVE-2021-30184 | https://security-tracker.debian.org/tracker/CVE-2021-30184 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 go | CVE-2021-29923 | https://security-tracker.debian.org/tracker/CVE-2021-29923 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jhead | CVE-2020-6624 | https://security-tracker.debian.org/tracker/CVE-2020-6624 jhead | CVE-2020-6625 | https://security-tracker.debian.org/tracker/CVE-2020-6625 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2021-42917 | https://security-tracker.debian.org/tracker/CVE-2021-42917 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libesmtp | CVE-2019-19977 | https://security-tracker.debian.org/tracker/CVE-2019-19977 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libnss | CVE-2021-43527 | https://security-tracker.debian.org/tracker/CVE-2021-43527 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libressl | CVE-2021-41581 | https://security-tracker.debian.org/tracker/CVE-2021-41581 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 liburiparser | CVE-2021-46141 | https://security-tracker.debian.org/tracker/CVE-2021-46141 liburiparser | CVE-2021-46142 | https://security-tracker.debian.org/tracker/CVE-2021-46142 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 monkey | CVE-2013-1771 | https://security-tracker.debian.org/tracker/CVE-2013-1771 monkey | CVE-2013-2183 | https://security-tracker.debian.org/tracker/CVE-2013-2183 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 mutt | CVE-2021-32055 | https://security-tracker.debian.org/tracker/CVE-2021-32055 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 network-manager | CVE-2021-20297 | https://security-tracker.debian.org/tracker/CVE-2021-20297 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvpn | CVE-2021-3606 | https://security-tracker.debian.org/tracker/CVE-2021-3606 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php-imagick | CVE-2019-11037 | https://security-tracker.debian.org/tracker/CVE-2019-11037 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-autobahn | CVE-2020-35678 | https://security-tracker.debian.org/tracker/CVE-2020-35678 python-cryptography | CVE-2020-36242 | https://security-tracker.debian.org/tracker/CVE-2020-36242 python-django | CVE-2021-45115 | https://security-tracker.debian.org/tracker/CVE-2021-45115 python-django | CVE-2021-45116 | https://security-tracker.debian.org/tracker/CVE-2021-45116 python-django | CVE-2021-45452 | https://security-tracker.debian.org/tracker/CVE-2021-45452 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-22815 | https://security-tracker.debian.org/tracker/CVE-2022-22815 python-pillow | CVE-2022-22816 | https://security-tracker.debian.org/tracker/CVE-2022-22816 python-pillow | CVE-2022-22817 | https://security-tracker.debian.org/tracker/CVE-2022-22817 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2020-35503 | https://security-tracker.debian.org/tracker/CVE-2020-35503 qemu | CVE-2020-35504 | https://security-tracker.debian.org/tracker/CVE-2020-35504 qemu | CVE-2020-35505 | https://security-tracker.debian.org/tracker/CVE-2020-35505 qemu | CVE-2020-35506 | https://security-tracker.debian.org/tracker/CVE-2020-35506 qemu | CVE-2020-35517 | https://security-tracker.debian.org/tracker/CVE-2020-35517 qemu | CVE-2021-20181 | https://security-tracker.debian.org/tracker/CVE-2021-20181 qemu | CVE-2021-20196 | https://security-tracker.debian.org/tracker/CVE-2021-20196 qemu | CVE-2021-20203 | https://security-tracker.debian.org/tracker/CVE-2021-20203 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-20263 | https://security-tracker.debian.org/tracker/CVE-2021-20263 qemu | CVE-2021-3392 | https://security-tracker.debian.org/tracker/CVE-2021-3392 qemu | CVE-2021-3409 | https://security-tracker.debian.org/tracker/CVE-2021-3409 qemu | CVE-2021-3416 | https://security-tracker.debian.org/tracker/CVE-2021-3416 qemu | CVE-2021-3507 | https://security-tracker.debian.org/tracker/CVE-2021-3507 qemu | CVE-2021-3527 | https://security-tracker.debian.org/tracker/CVE-2021-3527 qemu | CVE-2021-3544 | https://security-tracker.debian.org/tracker/CVE-2021-3544 qemu | CVE-2021-3545 | https://security-tracker.debian.org/tracker/CVE-2021-3545 qemu | CVE-2021-3546 | https://security-tracker.debian.org/tracker/CVE-2021-3546 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 qpid-proton | CVE-2016-2166 | https://security-tracker.debian.org/tracker/CVE-2016-2166 qpid-proton | CVE-2016-4467 | https://security-tracker.debian.org/tracker/CVE-2016-4467 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 ruby | CVE-2021-28966 | https://security-tracker.debian.org/tracker/CVE-2021-28966 rust | CVE-2021-29922 | https://security-tracker.debian.org/tracker/CVE-2021-29922 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sudo | CVE-2021-3156 | https://security-tracker.debian.org/tracker/CVE-2021-3156 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tools | CVE-2021-3565 | https://security-tracker.debian.org/tracker/CVE-2021-3565 uboot-tools | CVE-2021-27097 | https://security-tracker.debian.org/tracker/CVE-2021-27097 uboot-tools | CVE-2021-27138 | https://security-tracker.debian.org/tracker/CVE-2021-27138 util-linux | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 util-linux-libs | CVE-2021-37600 | https://security-tracker.debian.org/tracker/CVE-2021-37600 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4187 | https://security-tracker.debian.org/tracker/CVE-2021-4187 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 vim | CVE-2022-0128 | https://security-tracker.debian.org/tracker/CVE-2022-0128 vim | CVE-2022-0156 | https://security-tracker.debian.org/tracker/CVE-2022-0156 vim | CVE-2022-0158 | https://security-tracker.debian.org/tracker/CVE-2022-0158 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 webkitgtk | CVE-2021-45481 | https://security-tracker.debian.org/tracker/CVE-2021-45481 webkitgtk | CVE-2021-45482 | https://security-tracker.debian.org/tracker/CVE-2021-45482 webkitgtk | CVE-2021-45483 | https://security-tracker.debian.org/tracker/CVE-2021-45483 wget | CVE-2021-31879 | https://security-tracker.debian.org/tracker/CVE-2021-31879 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wireshark | CVE-2021-4185 | https://security-tracker.debian.org/tracker/CVE-2021-4185 wireshark | CVE-2021-4186 | https://security-tracker.debian.org/tracker/CVE-2021-4186 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2021.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-4465 | https://security-tracker.debian.org/tracker/CVE-2007-4465 apache | CVE-2007-5000 | https://security-tracker.debian.org/tracker/CVE-2007-5000 apache | CVE-2007-6388 | https://security-tracker.debian.org/tracker/CVE-2007-6388 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-0455 | https://security-tracker.debian.org/tracker/CVE-2008-0455 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2008-2939 | https://security-tracker.debian.org/tracker/CVE-2008-2939 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2009-1890 | https://security-tracker.debian.org/tracker/CVE-2009-1890 apache | CVE-2009-1891 | https://security-tracker.debian.org/tracker/CVE-2009-1891 apache | CVE-2009-2699 | https://security-tracker.debian.org/tracker/CVE-2009-2699 apache | CVE-2010-0408 | https://security-tracker.debian.org/tracker/CVE-2010-0408 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apache | CVE-2010-0434 | https://security-tracker.debian.org/tracker/CVE-2010-0434 apache | CVE-2010-1452 | https://security-tracker.debian.org/tracker/CVE-2010-1452 apache | CVE-2014-0231 | https://security-tracker.debian.org/tracker/CVE-2014-0231 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 apr | CVE-2021-35940 | https://security-tracker.debian.org/tracker/CVE-2021-35940 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2021-45078 | https://security-tracker.debian.org/tracker/CVE-2021-45078 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bluez5_utils | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-12352 | https://security-tracker.debian.org/tracker/CVE-2020-12352 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 cairo | CVE-2019-6462 | https://security-tracker.debian.org/tracker/CVE-2019-6462 cairo | CVE-2020-35492 | https://security-tracker.debian.org/tracker/CVE-2020-35492 cereal | CVE-2020-11104 | https://security-tracker.debian.org/tracker/CVE-2020-11104 clamav | CVE-2016-1405 | https://security-tracker.debian.org/tracker/CVE-2016-1405 clamav | CVE-2022-20698 | https://security-tracker.debian.org/tracker/CVE-2022-20698 containerd | CVE-2021-43816 | https://security-tracker.debian.org/tracker/CVE-2021-43816 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cups | CVE-2018-6553 | https://security-tracker.debian.org/tracker/CVE-2018-6553 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dbus | CVE-2020-35512 | https://security-tracker.debian.org/tracker/CVE-2020-35512 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 ecryptfs-utils | CVE-2016-1572 | https://security-tracker.debian.org/tracker/CVE-2016-1572 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 exim | CVE-2020-28017 | https://security-tracker.debian.org/tracker/CVE-2020-28017 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 expat | CVE-2021-45960 | https://security-tracker.debian.org/tracker/CVE-2021-45960 expat | CVE-2021-46143 | https://security-tracker.debian.org/tracker/CVE-2021-46143 expat | CVE-2022-22822 | https://security-tracker.debian.org/tracker/CVE-2022-22822 expat | CVE-2022-22823 | https://security-tracker.debian.org/tracker/CVE-2022-22823 expat | CVE-2022-22824 | https://security-tracker.debian.org/tracker/CVE-2022-22824 expat | CVE-2022-22825 | https://security-tracker.debian.org/tracker/CVE-2022-22825 expat | CVE-2022-22826 | https://security-tracker.debian.org/tracker/CVE-2022-22826 expat | CVE-2022-22827 | https://security-tracker.debian.org/tracker/CVE-2022-22827 ffmpeg | CVE-2021-38291 | https://security-tracker.debian.org/tracker/CVE-2021-38291 freeswitch | CVE-2021-37624 | https://security-tracker.debian.org/tracker/CVE-2021-37624 freeswitch | CVE-2021-41105 | https://security-tracker.debian.org/tracker/CVE-2021-41105 freeswitch | CVE-2021-41145 | https://security-tracker.debian.org/tracker/CVE-2021-41145 freeswitch | CVE-2021-41158 | https://security-tracker.debian.org/tracker/CVE-2021-41158 ghostscript | CVE-2021-45944 | https://security-tracker.debian.org/tracker/CVE-2021-45944 ghostscript | CVE-2021-45949 | https://security-tracker.debian.org/tracker/CVE-2021-45949 glibc | CVE-2010-4756 | https://security-tracker.debian.org/tracker/CVE-2010-4756 glibc | CVE-2019-1010022 | https://security-tracker.debian.org/tracker/CVE-2019-1010022 glibc | CVE-2019-1010023 | https://security-tracker.debian.org/tracker/CVE-2019-1010023 glibc | CVE-2019-1010024 | https://security-tracker.debian.org/tracker/CVE-2019-1010024 glibc | CVE-2019-1010025 | https://security-tracker.debian.org/tracker/CVE-2019-1010025 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 go | CVE-2020-29509 | https://security-tracker.debian.org/tracker/CVE-2020-29509 go | CVE-2020-29511 | https://security-tracker.debian.org/tracker/CVE-2020-29511 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 heirloom-mailx | CVE-2004-2771 | https://security-tracker.debian.org/tracker/CVE-2004-2771 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 jansson | CVE-2020-36325 | https://security-tracker.debian.org/tracker/CVE-2020-36325 jasper | CVE-2015-8751 | https://security-tracker.debian.org/tracker/CVE-2015-8751 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2021-36976 | https://security-tracker.debian.org/tracker/CVE-2021-36976 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libiec61850 | CVE-2021-45769 | https://security-tracker.debian.org/tracker/CVE-2021-45769 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 liburiparser | CVE-2021-46141 | https://security-tracker.debian.org/tracker/CVE-2021-46141 liburiparser | CVE-2021-46142 | https://security-tracker.debian.org/tracker/CVE-2021-46142 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 lighttpd | CVE-2022-22707 | https://security-tracker.debian.org/tracker/CVE-2022-22707 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2020-15888 | https://security-tracker.debian.org/tracker/CVE-2020-15888 lua | CVE-2020-15945 | https://security-tracker.debian.org/tracker/CVE-2020-15945 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 matio | CVE-2020-36428 | https://security-tracker.debian.org/tracker/CVE-2020-36428 matio | CVE-2021-36977 | https://security-tracker.debian.org/tracker/CVE-2021-36977 mbedtls | CVE-2020-36477 | https://security-tracker.debian.org/tracker/CVE-2020-36477 mbedtls | CVE-2021-24119 | https://security-tracker.debian.org/tracker/CVE-2021-24119 mbedtls | CVE-2021-45450 | https://security-tracker.debian.org/tracker/CVE-2021-45450 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 midori | CVE-2019-19916 | https://security-tracker.debian.org/tracker/CVE-2019-19916 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-18381 | https://security-tracker.debian.org/tracker/CVE-2017-18381 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mongodb | CVE-2021-20330 | https://security-tracker.debian.org/tracker/CVE-2021-20330 mpd | CVE-2020-7465 | https://security-tracker.debian.org/tracker/CVE-2020-7465 mpd | CVE-2020-7466 | https://security-tracker.debian.org/tracker/CVE-2020-7466 mupdf | CVE-2017-5991 | https://security-tracker.debian.org/tracker/CVE-2017-5991 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2020-18974 | https://security-tracker.debian.org/tracker/CVE-2020-18974 ncurses | CVE-2021-39537 | https://security-tracker.debian.org/tracker/CVE-2021-39537 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openjdk | CVE-2013-0169 | https://security-tracker.debian.org/tracker/CVE-2013-0169 openjpeg | CVE-2015-1239 | https://security-tracker.debian.org/tracker/CVE-2015-1239 openjpeg | CVE-2016-7163 | https://security-tracker.debian.org/tracker/CVE-2016-7163 openjpeg | CVE-2016-9675 | https://security-tracker.debian.org/tracker/CVE-2016-9675 openjpeg | CVE-2021-29338 | https://security-tracker.debian.org/tracker/CVE-2021-29338 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 postgresql | CVE-2017-8806 | https://security-tracker.debian.org/tracker/CVE-2017-8806 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 python | CVE-2015-5652 | https://security-tracker.debian.org/tracker/CVE-2015-5652 python | CVE-2017-17522 | https://security-tracker.debian.org/tracker/CVE-2017-17522 python | CVE-2017-18207 | https://security-tracker.debian.org/tracker/CVE-2017-18207 python | CVE-2019-20907 | https://security-tracker.debian.org/tracker/CVE-2019-20907 python | CVE-2019-9674 | https://security-tracker.debian.org/tracker/CVE-2019-9674 python | CVE-2021-23336 | https://security-tracker.debian.org/tracker/CVE-2021-23336 python-django | CVE-2021-45115 | https://security-tracker.debian.org/tracker/CVE-2021-45115 python-django | CVE-2021-45116 | https://security-tracker.debian.org/tracker/CVE-2021-45116 python-django | CVE-2021-45452 | https://security-tracker.debian.org/tracker/CVE-2021-45452 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2022-22815 | https://security-tracker.debian.org/tracker/CVE-2022-22815 python-pillow | CVE-2022-22816 | https://security-tracker.debian.org/tracker/CVE-2022-22816 python-pillow | CVE-2022-22817 | https://security-tracker.debian.org/tracker/CVE-2022-22817 python-pip | CVE-2018-20225 | https://security-tracker.debian.org/tracker/CVE-2018-20225 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2021-3682 | https://security-tracker.debian.org/tracker/CVE-2021-3682 qemu | CVE-2021-3713 | https://security-tracker.debian.org/tracker/CVE-2021-3713 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 rabbitmq-server | CVE-2018-11087 | https://security-tracker.debian.org/tracker/CVE-2018-11087 rabbitmq-server | CVE-2018-1279 | https://security-tracker.debian.org/tracker/CVE-2018-1279 rabbitmq-server | CVE-2020-5419 | https://security-tracker.debian.org/tracker/CVE-2020-5419 raptor | CVE-2020-25713 | https://security-tracker.debian.org/tracker/CVE-2020-25713 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-1050 | https://security-tracker.debian.org/tracker/CVE-2018-1050 samba4 | CVE-2018-1057 | https://security-tracker.debian.org/tracker/CVE-2018-1057 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2021-36690 | https://security-tracker.debian.org/tracker/CVE-2021-36690 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2022-22844 | https://security-tracker.debian.org/tracker/CVE-2022-22844 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 vim | CVE-2021-4136 | https://security-tracker.debian.org/tracker/CVE-2021-4136 vim | CVE-2021-4166 | https://security-tracker.debian.org/tracker/CVE-2021-4166 vim | CVE-2021-4173 | https://security-tracker.debian.org/tracker/CVE-2021-4173 vim | CVE-2021-4187 | https://security-tracker.debian.org/tracker/CVE-2021-4187 vim | CVE-2021-4192 | https://security-tracker.debian.org/tracker/CVE-2021-4192 vim | CVE-2021-4193 | https://security-tracker.debian.org/tracker/CVE-2021-4193 vim | CVE-2022-0128 | https://security-tracker.debian.org/tracker/CVE-2022-0128 vim | CVE-2022-0156 | https://security-tracker.debian.org/tracker/CVE-2022-0156 vim | CVE-2022-0158 | https://security-tracker.debian.org/tracker/CVE-2022-0158 webkitgtk | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 wireshark | CVE-2021-4181 | https://security-tracker.debian.org/tracker/CVE-2021-4181 wireshark | CVE-2021-4182 | https://security-tracker.debian.org/tracker/CVE-2021-4182 wireshark | CVE-2021-4184 | https://security-tracker.debian.org/tracker/CVE-2021-4184 wireshark | CVE-2021-4185 | https://security-tracker.debian.org/tracker/CVE-2021-4185 wireshark | CVE-2021-4186 | https://security-tracker.debian.org/tracker/CVE-2021-4186 wpewebkit | CVE-2021-42762 | https://security-tracker.debian.org/tracker/CVE-2021-42762 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28038 | https://security-tracker.debian.org/tracker/CVE-2021-28038 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xscreensaver | CVE-2021-34557 | https://security-tracker.debian.org/tracker/CVE-2021-34557 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From christian at paral.in Mon Jan 24 07:11:43 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:11:43 -0800 Subject: [Buildroot] [PATCH 1/1] package/batman-adv: bump to version 2021.04 Message-ID: <20220124071143.15869-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/batman-adv/batman-adv.hash | 4 ++-- package/batman-adv/batman-adv.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index f81df11000..2060e3de2e 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -1,7 +1,7 @@ # From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.1/batman-adv-2021.1.tar.gz.sha1 -sha1 27a0dc7cb74b868bc0ab52794ecedd0448f0fb61 batman-adv-2021.1.tar.gz +sha1 80a3e4d763b6bf35db6e561ed9d6775dc874d7c6 batman-adv-2021.4.tar.gz # Hash for license files -sha256 5a989ba580897268373bd516b87b588061f344af773a0f6b038a3d8d2af028a1 batman-adv-2021.0.tar.gz +sha256 cff7a2f160045fd0dbf1f1cd7e35e93bf489e81cb8b9501b3756daa391f3eb1b batman-adv-2021.4.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index e58ac85bef..838f9b1851 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2021.1 +BATMAN_ADV_VERSION = 2021.4 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT -- 2.34.1 From christian at paral.in Mon Jan 24 07:14:53 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:14:53 -0800 Subject: [Buildroot] [PATCH 1/1] package/containerd: security bump to version 1.5.9 Message-ID: <20220124071453.16225-1-christian@paral.in> CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when it is SELinux" Containers launched through containerd?s CRI implementation on Linux systems which use the SELinux security module and containerd versions since v1.5.0 can cause arbitrary files and directories on the host to be relabeled to match the container process label through the use of specially-configured bind mounts in a hostPath volume. This relabeling elevates permissions for the container, granting full read/write access over the affected files and directories. Kubernetes and crictl can both be configured to use containerd?s CRI implementation. https://github.com/advisories/GHSA-mvff-h3cj-wj9c https://github.com/containerd/containerd/releases/tag/v1.5.9 Signed-off-by: Christian Stewart --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index f1a6709554..d5aafe2e70 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790 containerd-1.5.8.tar.gz +sha256 40c9767af3e87f2c36adf2f563f0a8374e80b30bd2b7aa80058c85912406cef4 containerd-1.5.9.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index cd975db274..8976e12f1a 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.8 +CONTAINERD_VERSION = 1.5.9 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE -- 2.34.1 From christian at paral.in Mon Jan 24 07:17:41 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:17:41 -0800 Subject: [Buildroot] [PATCH 1/1] package/delve: bump to version 1.8.0 Message-ID: <20220124071741.22618-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index 3d117813c6..04ea4954cc 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e73f7fc063632268d3bdf53486aeafd98cceb8f86f4af56903dedfebaefe690d delve-1.6.1.tar.gz +sha256 086106a4776fa155bf20c37d27b9caed55255be6359c7f0bda1893d3adbb614e delve-1.8.0.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 6c346552a4..984d90a03c 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.6.1 +DELVE_VERSION = 1.8.0 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE -- 2.34.1 From christian at paral.in Mon Jan 24 07:25:27 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:25:27 -0800 Subject: [Buildroot] [PATCH 1/1] package/delve: support building as host package Message-ID: <20220124072527.29954-1-christian@paral.in> Users may want to debug Go programs using dlv on the host machine. Adds package host-delve and BR2_PACKAGE_HOST_DELVE. Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/delve/Config.in.host | 7 +++++++ package/delve/delve.mk | 5 +++++ 3 files changed, 13 insertions(+) create mode 100644 package/delve/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 20034f6ee0..341e24926b 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/cramfs/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" + source "package/delve/Config.in.host" source "package/dfu-util/Config.in.host" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" diff --git a/package/delve/Config.in.host b/package/delve/Config.in.host new file mode 100644 index 0000000000..243b02f6a2 --- /dev/null +++ b/package/delve/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_DELVE + bool "delve" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + Delve is a debugger for the Go programming language. + + https://github.com/go-delve/delve diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 6c346552a4..9e00934375 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -14,4 +14,9 @@ DELVE_TAGS = cgo DELVE_BUILD_TARGETS = cmd/dlv DELVE_INSTALL_BINS = $(notdir $(DELVE_BUILD_TARGETS)) +HOST_DELVE_TAGS = cgo +HOST_DELVE_BUILD_TARGETS = cmd/dlv +HOST_DELVE_INSTALL_BINS = $(notdir $(HOST_DELVE_BUILD_TARGETS)) + $(eval $(golang-package)) +$(eval $(host-golang-package)) -- 2.34.1 From christian at paral.in Mon Jan 24 07:37:10 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:37:10 -0800 Subject: [Buildroot] [PATCH 1/2] package/docker-engine: bump to version 20.10.12 Message-ID: <20220124073711.44684-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d1323f507d..ec3a242629 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz +sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 45fa7fa53e..2a1239b676 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.11 +DOCKER_ENGINE_VERSION = 20.10.12 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 -- 2.34.1 From christian at paral.in Mon Jan 24 07:37:11 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:37:11 -0800 Subject: [Buildroot] [PATCH 2/2] package/docker-cli: bump to version 20.10.12 In-Reply-To: <20220124073711.44684-1-christian@paral.in> References: <20220124073711.44684-1-christian@paral.in> Message-ID: <20220124073711.44684-2-christian@paral.in> Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index fbcda5753e..f2fe316540 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz +sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 0e35a60d43..d5cca34efc 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.11 +DOCKER_CLI_VERSION = 20.10.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 -- 2.34.1 From christian at paral.in Mon Jan 24 07:40:36 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:40:36 -0800 Subject: [Buildroot] [PATCH 1/1] package/gocryptfs: bump to version 2.2.1 Message-ID: <20220124074036.53636-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index 94487815f5..ae161d1cd8 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 2a00e9a959..8f70dba7c3 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_VERSION = 2.2.1 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE -- 2.34.1 From christian at paral.in Mon Jan 24 07:41:51 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:41:51 -0800 Subject: [Buildroot] [PATCH 1/1] package/gocryptfs: bump to version 2.2.1 Message-ID: <20220124074151.58966-1-christian@paral.in> Signed-off-by: Christian Stewart --- package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index 94487815f5..ae161d1cd8 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 2a00e9a959..8f70dba7c3 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_VERSION = 2.2.1 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE -- 2.34.1 From buildroot at heine.tech Mon Jan 24 07:42:58 2022 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 24 Jan 2022 08:42:58 +0100 Subject: [Buildroot] [PATCH] package/fmt: bump to version 8.1.1 Message-ID: <20220124074307.91368-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/fmt/fmt.hash | 2 +- package/fmt/fmt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index e735704023..79956c251b 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a627a56eab9554fc1e5dd9a623d0768583b3a383ff70a4312ba68f94c9d415bf fmt-8.0.1.zip +sha256 23778bad8edba12d76e4075da06db591f3b0e3c6c04928ced4a7282ca3400e5d fmt-8.1.1.zip sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 6ec86de7f3..be7ffb022b 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 8.0.1 +FMT_VERSION = 8.1.1 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception -- 2.25.1 From christian at paral.in Mon Jan 24 07:47:15 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:47:15 -0800 Subject: [Buildroot] [PATCH 1/1] package/delve: support building as host package In-Reply-To: <20220124072527.29954-1-christian@paral.in> References: <20220124072527.29954-1-christian@paral.in> Message-ID: Hi all, On Sun, Jan 23, 2022 at 11:25 PM Christian Stewart wrote: > +++ b/package/delve/Config.in.host > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_HOST_DELVE > + bool "delve" This should be "host delve" - just caught it. Thanks, Christian From christian at paral.in Mon Jan 24 07:48:53 2022 From: christian at paral.in (Christian Stewart) Date: Sun, 23 Jan 2022 23:48:53 -0800 Subject: [Buildroot] [PATCH 1/1] package/moby-buildkit: support building as host package Message-ID: <20220124074853.77797-1-christian@paral.in> Users may want to use buildkitd and buildkitctl to build images on the host. Adds package host-moby-buildkit and BR2_PACKAGE_HOST_MOBY_BUILDKIT. Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/moby-buildkit/Config.in.host | 8 ++++++++ package/moby-buildkit/moby-buildkit.mk | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 package/moby-buildkit/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 20034f6ee0..3bf6fab2db 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -53,6 +53,7 @@ menu "Host utilities" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" source "package/mkpasswd/Config.in.host" + source "package/moby-buildkit/Config.in.host" source "package/mtd/Config.in.host" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" diff --git a/package/moby-buildkit/Config.in.host b/package/moby-buildkit/Config.in.host new file mode 100644 index 0000000000..a3b18548f8 --- /dev/null +++ b/package/moby-buildkit/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_MOBY_BUILDKIT + bool "host moby-buildkit" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + BuildKit is a toolkit for converting source code to build + artifacts in an efficient expressive and repeatable manner. + + https://github.com/moby/buildkit diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 3f0df351ef..533ce6485a 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -19,4 +19,10 @@ MOBY_BUILDKIT_LDFLAGS = \ MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) +HOST_MOBY_BUILDKIT_TAGS = cgo +HOST_MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd + +HOST_MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(HOST_MOBY_BUILDKIT_BUILD_TARGETS)) + $(eval $(golang-package)) +$(eval $(host-golang-package)) -- 2.34.1 From christian at paral.in Mon Jan 24 08:00:13 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 24 Jan 2022 00:00:13 -0800 Subject: [Buildroot] [PATCH 1/1] package/runc: bump to version 1.1.0 Message-ID: <20220124080013.83231-1-christian@paral.in> Added LGPL-2.1 license specifier: libseccomp is statically-linked. https://github.com/opencontainers/runc/releases/tag/v1.1.0 Signed-off-by: Christian Stewart --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 4ef04132bf..38d9f52510 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0eaf2f6606d72f166a5e7138a8a8d4d8f85d84e43448c08c66a1c93ead17a574 runc-1.0.3.tar.gz +sha256 a8de57edbf0ff741ea798ccdd99ac0e1b79914f552871bd7cd92b0569f200964 runc-1.1.0.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index c4e45a00a9..a40075544e 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUNC_VERSION = 1.0.3 +RUNC_VERSION = 1.1.0 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) -RUNC_LICENSE = Apache-2.0 +RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE RUNC_CPE_ID_VENDOR = linuxfoundation -- 2.34.1 From mf at go-sys.de Mon Jan 24 08:01:07 2022 From: mf at go-sys.de (Michael Fischer) Date: Mon, 24 Jan 2022 09:01:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: bump version to 2.0.20 Message-ID: <20220124080107.4094-1-mf@go-sys.de> Signed-off-by: Michael Fischer --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 9fa95270c3..26b7ce4102 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.0.18.tar.gz.sig -sha256 94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c SDL2-2.0.18.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.20.tar.gz.sig +sha256 c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06 SDL2-2.0.20.tar.gz # Locally calculated -sha256 52d41d0c82507721ca1fd92c20dc2bf9ca531b3a288ef845a8275c550f118804 LICENSE.txt +sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 54eec85f5e..e0a817e249 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.18 +SDL2_VERSION = 2.0.20 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib -- 2.20.1 From wiselord1983 at gmail.com Mon Jan 24 08:03:52 2022 From: wiselord1983 at gmail.com (Uladzimir Bely) Date: Mon, 24 Jan 2022 11:03:52 +0300 Subject: [Buildroot] [PATCH] package/python-mpd2: bump to version 3.0.5 Message-ID: <20220124080352.2116-1-wiselord1983@gmail.com> Signed-off-by: Uladzimir Bely --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index 83487257ee..88dcb28377 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz -sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz +md5 594dff3e53c8eb6f583ba642bc2c1a27 python-mpd2-3.0.5.tar.gz +sha256 6f1bffd93b9a32fc018a9bbf3487505b52e0d757ec34066905c60a912d492384 python-mpd2-3.0.5.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index f357e302fd..bfe382b59e 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.0.4 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 +PYTHON_MPD2_VERSION = 3.0.5 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ed/c2/263621bdbbc37fa1a55fa1a7f66fd601bf08b3f87481e318a3509fb6c4bf PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt -- 2.34.1 From christian at paral.in Mon Jan 24 08:09:30 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 24 Jan 2022 00:09:30 -0800 Subject: [Buildroot] [PATCH 1/1] package/batman-adv: bump to version 2021.04 In-Reply-To: <20220124071143.15869-1-christian@paral.in> References: <20220124071143.15869-1-christian@paral.in> Message-ID: Hi all, On Sun, Jan 23, 2022 at 11:11 PM Christian Stewart wrote: > --- a/package/batman-adv/batman-adv.hash > +++ b/package/batman-adv/batman-adv.hash > @@ -1,7 +1,7 @@ > # From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.1/batman-adv-2021.1.tar.gz.sha1 > -sha1 27a0dc7cb74b868bc0ab52794ecedd0448f0fb61 batman-adv-2021.1.tar.gz > +sha1 80a3e4d763b6bf35db6e561ed9d6775dc874d7c6 batman-adv-2021.4.tar.gz ... comment should read: # From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.4/batman-adv-2021.4.tar.gz.sha1 Thanks, Christian From giulio.benetti at benettiengineering.com Mon Jan 24 08:12:47 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 09:12:47 +0100 Subject: [Buildroot] [PATCH 1/2] board/kontron/pitx-imx8m: use extlinux instead of U-Boot boot script In-Reply-To: <1dea301e-8425-a1ca-fc69-db338825b19c@gmail.com> References: <1dea301e-8425-a1ca-fc69-db338825b19c@gmail.com> Message-ID: <2BFF5C08-8E54-4689-894E-0A0BE3D6A71A@benettiengineering.com> > Il giorno 24 gen 2022, alle ore 06:43, Sergey Kuzminov ha scritto: > > ?Hi All, > > 24.01.2022 01:01, Giulio Benetti: >> IMHO the worst drawback I see while using extlinux.conf VS boot.scr is the missing checksum. Especially on embedded systems we deeply treat. >> Not having such checksum can make system booting without a parameter on linux command line for example, only because 1 ASCII has been corrupted. >> I prefer the system to not boot at all in general instead of having it "working" while hiding some potential problem. >> What do you and All think about this? > > IMHO extlinux.conf is more debugging friendly. > > Boot.scr requires the following command: > mkimage -C none -A arm -T script -d boot.cmd boot.scr > > The mkimage utility (BR2_PACKAGE_HOST_UBOOT_TOOLS) is not on the board, you need to transfer the converted file over the network. Or reconnect the microSD card. I agree with this too. I?ve found myself many times blaming because I couldn?t simply modify boot.scr on target and reboot. But I find it still dangerous. Another thing that I don?t find possible to do with extlinux.conf is using uboot scripting possibility that enables you to do lot or things, like fdt-overlay expand and apply, show a bmp instead of having a static splashscreen and so on. I don?t think this is achievable with extlinux.conf These are only my thoughts but I still don?t have a solution honestly. In particular to uniform boards. Best regards Giulio From atenart at kernel.org Mon Jan 24 08:44:02 2022 From: atenart at kernel.org (Antoine Tenart) Date: Mon, 24 Jan 2022 09:44:02 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <2d19c071-3859-25db-0966-2fd8ca3d845f@benettiengineering.com> References: <20210128125256.1419587-1-maxime.chevallier@bootlin.com> <20220119222332.66485-1-giulio.benetti@benettiengineering.com> <20220119233944.7ba2d09f@windsurf> <20220120084804.429f1d54@bootlin.com> <164267096542.4497.13116457792635384701@kwain> <2d19c071-3859-25db-0966-2fd8ca3d845f@benettiengineering.com> Message-ID: <164301384246.4708.15294151281235312059@kwain> Quoting Giulio Benetti (2022-01-23 23:21:50) > > Re-reading this after some day it looks to me like the simple > BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all > dontaudit rules from policy.conf", so it's true that it enables audit > logs in the end. It's a very specific options and the one who will use > it will know what he will enable and most of all we can specify in the > help section that: > "Removes all dontaudit rules from policy.conf" > Does it work for you? As long as the help text is clear enough for the user, either config option name should be acceptable. Using the above is good to have an 1:1 mapping with the target name, at the expense of having the help text not matching it and an unclear option name from the user perspective (it's a bit weird not to enable it, at first). For _WITH_DONTAUDIT_, the opposite is true. I'd say there is no perfect solution, we can either stay close to the refpolicy internals or have the Buildroot specifics more consistent; not sure which is better. Thanks, Antoine From peter at korsgaard.com Mon Jan 24 08:58:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 09:58:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <20211124205607.3021277-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Wed, 24 Nov 2021 22:56:07 +0200") References: <20211124205607.3021277-1-aperez@igalia.com> Message-ID: <87mtjlwlvo.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: Hi, > Update to the the next minor release, which fixes an scrolling issue and > incorporated a patch that can now be removed from Buildroot. Release > notes: > https://wpewebkit.org/release/wpewebkit-2.34.2.html > Signed-off-by: Adrian Perez de Castro What about webkitgtk? It would also be good to move that to the 2.34.x series before we release 2022.02. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Mon Jan 24 08:59:45 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 09:59:45 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <164301384246.4708.15294151281235312059@kwain> References: <164301384246.4708.15294151281235312059@kwain> Message-ID: <0FCF99B5-6DEF-4CEB-9686-033655A6802E@benettiengineering.com> > Il giorno 24 gen 2022, alle ore 09:45, Antoine Tenart ha scritto: > > ?Quoting Giulio Benetti (2022-01-23 23:21:50) >> >> Re-reading this after some day it looks to me like the simple >> BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all >> dontaudit rules from policy.conf", so it's true that it enables audit >> logs in the end. It's a very specific options and the one who will use >> it will know what he will enable and most of all we can specify in the >> help section that: >> "Removes all dontaudit rules from policy.conf" > >> Does it work for you? > > As long as the help text is clear enough for the user, either config > option name should be acceptable. Using the above is good to have an 1:1 > mapping with the target name, at the expense of having the help text not > matching it and an unclear option name from the user perspective (it's a > bit weird not to enable it, at first). For _WITH_DONTAUDIT_, the > opposite is true. I'd say there is no perfect solution, we can either > stay close to the refpolicy internals or have the Buildroot specifics > more consistent; not sure which is better. I?d go for Buildroot consistency since we?re in Buildroot. If someone enables refpolicy package and enables ?Enable audit?, I expect to see audit log. Right? This is me at least that I?ve never used refpolicy so I?m agnostic in the topic, so maybe a neutral ?use case? :-) Best regards Giulio > > Thanks, > Antoine > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From atenart at kernel.org Mon Jan 24 09:06:49 2022 From: atenart at kernel.org (Antoine Tenart) Date: Mon, 24 Jan 2022 10:06:49 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <0FCF99B5-6DEF-4CEB-9686-033655A6802E@benettiengineering.com> References: <164301384246.4708.15294151281235312059@kwain> <0FCF99B5-6DEF-4CEB-9686-033655A6802E@benettiengineering.com> Message-ID: <164301520937.4708.9842501306400984658@kwain> Quoting Giulio Benetti (2022-01-24 09:59:45) > > > Il giorno 24 gen 2022, alle ore 09:45, Antoine Tenart ha scritto: > > > > ?Quoting Giulio Benetti (2022-01-23 23:21:50) > >> > >> Re-reading this after some day it looks to me like the simple > >> BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all > >> dontaudit rules from policy.conf", so it's true that it enables audit > >> logs in the end. It's a very specific options and the one who will use > >> it will know what he will enable and most of all we can specify in the > >> help section that: > >> "Removes all dontaudit rules from policy.conf" > > > >> Does it work for you? > > > > As long as the help text is clear enough for the user, either config > > option name should be acceptable. Using the above is good to have an 1:1 > > mapping with the target name, at the expense of having the help text not > > matching it and an unclear option name from the user perspective (it's a > > bit weird not to enable it, at first). For _WITH_DONTAUDIT_, the > > opposite is true. I'd say there is no perfect solution, we can either > > stay close to the refpolicy internals or have the Buildroot specifics > > more consistent; not sure which is better. > > I?d go for Buildroot consistency since we?re in Buildroot. So _WITH_DONTAUDIT_? > If someone enables refpolicy package and enables ?Enable audit?, I > expect to see audit log. Right? Extra audit log* It's not about enabling audit logs, it's about having some known rules to not be silenced in the audit logs as they're known to be problematic. > This is me at least that I?ve never used refpolicy so I?m agnostic in > the topic, so maybe a neutral ?use case? :-) I don't really have a preference for either solution tbh. Antoine From giulio.benetti at benettiengineering.com Mon Jan 24 09:20:59 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 10:20:59 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <164301520937.4708.9842501306400984658@kwain> References: <164301520937.4708.9842501306400984658@kwain> Message-ID: > Il giorno 24 gen 2022, alle ore 10:07, Antoine Tenart ha scritto: > > ?Quoting Giulio Benetti (2022-01-24 09:59:45) >> >>>> Il giorno 24 gen 2022, alle ore 09:45, Antoine Tenart ha scritto: >>> >>> ?Quoting Giulio Benetti (2022-01-23 23:21:50) >>>> >>>> Re-reading this after some day it looks to me like the simple >>>> BR2_PACKAGE_REFPOLICY_ENABLEAUDIT is correct. Because it "Removes all >>>> dontaudit rules from policy.conf", so it's true that it enables audit >>>> logs in the end. It's a very specific options and the one who will use >>>> it will know what he will enable and most of all we can specify in the >>>> help section that: >>>> "Removes all dontaudit rules from policy.conf" >>> >>>> Does it work for you? >>> >>> As long as the help text is clear enough for the user, either config >>> option name should be acceptable. Using the above is good to have an 1:1 >>> mapping with the target name, at the expense of having the help text not >>> matching it and an unclear option name from the user perspective (it's a >>> bit weird not to enable it, at first). For _WITH_DONTAUDIT_, the >>> opposite is true. I'd say there is no perfect solution, we can either >>> stay close to the refpolicy internals or have the Buildroot specifics >>> more consistent; not sure which is better. >> >> I?d go for Buildroot consistency since we?re in Buildroot. > > So _WITH_DONTAUDIT_? > >> If someone enables refpolicy package and enables ?Enable audit?, I >> expect to see audit log. Right? > > Extra audit log* Aaah, here is the point ^^^. > > It's not about enabling audit logs, it's about having some known rules > to not be silenced in the audit logs as they're known to be problematic. Ok, Thanks for the explanation. > >> This is me at least that I?ve never used refpolicy so I?m agnostic in >> the topic, so maybe a neutral ?use case? :-) > > I don't really have a preference for either solution tbh. Then I?d go for: BR2_PACKAGE_REFPOLICY_ENABLE_EXTRA_AUDIT_LOG ?Enable extra audit log? And in the help section I specify all the warnings. Defaulted to n. This way it?s pretty clear to me that I approach the package for the first time. And most of all it?s what it does as you?ve explained me above. Well. I try to respin it this way. Will I receive a Reviewed-by: you then? :-) Best regards Giulio > > Antoine From james.hilliard1 at gmail.com Mon Jan 24 09:26:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 02:26:12 -0700 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.34.0 Message-ID: <20220124092612.4019025-1-james.hilliard1@gmail.com> CONTRIBUTING.md hash changed due to various style updates and additions. Signed-off-by: James Hilliard --- package/network-manager/network-manager.hash | 6 +++--- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index b007a6e88e..d25f0e8194 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.32/NetworkManager-1.32.12.sha256sum -sha256 a8ab36a0a502fe73cd8e3bacb6585f97fbb94ebef79e276cdbaf11c33ff8f54b NetworkManager-1.32.12.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum +sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 e70c2d84a038b972beff16d8662f35567709dff2d552220bd1af6014f6d2215d CONTRIBUTING.md +sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..a90228992c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.32 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 +NETWORK_MANAGER_VERSION_MAJOR = 1.34 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 09:29:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 02:29:49 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-multidict: bump to version 6.0.1 Message-ID: <20220124092949.137812-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 2d9943fc0d..789a6ec59f 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 e28b9592289597b232f09e5cc3857f32 multidict-5.2.0.tar.gz -sha256 0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce multidict-5.2.0.tar.gz +md5 c9a6ee3d39df11616cfe0c89abd5134b multidict-6.0.1.tar.gz +sha256 d40616f3f9326a18e1f2fa7c7e8e0e04a7e5228bfa2bd62c1e0d68fbc259b09b multidict-6.0.1.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 2619cad2ee..ff8fbcd053 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 5.2.0 +PYTHON_MULTIDICT_VERSION = 6.0.1 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/8e/7c/e12a69795b7b7d5071614af2c691c97fbf16a2a513c66ec52dd7d0a115bb +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/78/91/db40f5e6bd2b5d2f3fff0f5edee05035513c11fff09c565368f22129240a PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE -- 2.25.1 From atenart at kernel.org Mon Jan 24 09:29:59 2022 From: atenart at kernel.org (Antoine Tenart) Date: Mon, 24 Jan 2022 10:29:59 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: References: <164301520937.4708.9842501306400984658@kwain> Message-ID: <164301659905.4708.13356617813640521530@kwain> Quoting Giulio Benetti (2022-01-24 10:20:59) > > Then I?d go for: > BR2_PACKAGE_REFPOLICY_ENABLE_EXTRA_AUDIT_LOG > > ?Enable extra audit log? > > And in the help section I specify all the warnings. > Defaulted to n. > > This way it?s pretty clear to me that I approach the package for the > first time. And most of all it?s what it does as you?ve explained me > above. But then it's not close to the refpolicy implementation and I don't find it particularly clear either. Extra audit could be nice in many ways :) Let's wait a bit for other to have time to chime in, they might have an interesting take, or suggestions. Thanks, Antoine From quentin.schulz at theobroma-systems.com Mon Jan 24 09:31:06 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Mon, 24 Jan 2022 10:31:06 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix CVE-2021-38593 In-Reply-To: <20220121205327.GK3252931@scaer> References: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> <20220121205327.GK3252931@scaer> Message-ID: <3e21aca9-71ec-d648-c9e3-058a9f9960b2@theobroma-systems.com> Hi Yann, On 1/21/22 21:53, Yann E. MORIN wrote: > Quentin, All, > > On 2022-01-21 17:50 +0100, Quentin Schulz spake thusly: >> 5.15.2 is the last public release of 5.15 and does not contain this CVE >> fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so >> let's port them to 5.15.2. >> >> Technically only the first two patches are required to patch the CVE. >> However, the second patch introduces a regression that is fixed in the third >> patch. >> >> The patches are taken from KDE kde/5.15 git branch. >> >> Cc: Quentin Schulz >> Signed-off-by: Quentin Schulz > > Applied to master, thanks. > Thanks! I forgot to add that this patch can be applied to 2021.02.x and 2021.11.x branches too since qtbase hasn't changed since. Cc'ing Peter Korsgaard. Regards, Quentin > Regards, > Yann E. MORIN. > >> --- >> >> v2: >> - added third patch for fixing regression introduced by the second patch, >> - cherry-picked commits from kde git kde/5.15 branch instead of taking >> patches from 5.12.12 since they all applied nicely, >> >> ...-intensive-painting-of-high-number-o.patch | 163 ++++++++++++++++++ >> ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ++++ >> ...-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++ >> package/qt5/qt5base/qt5base.mk | 4 + >> 4 files changed, 304 insertions(+) >> create mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch >> create mode 100644 package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch >> create mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch >> >> diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch >> new file mode 100644 >> index 0000000000..03287d19ca >> --- /dev/null >> +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch >> @@ -0,0 +1,163 @@ >> +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 >> +From: Eirik Aavitsland >> +Date: Tue, 13 Apr 2021 14:23:45 +0200 >> +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny >> + dashes >> + >> +When stroking a dashed path, an unnecessary amount of processing would >> +be spent if there is a huge number of dashes visible, e.g. because of >> +scaling. Since the dashes are too small to be indivdually visible >> +anyway, just replace with a semi-transparent solid line for such >> +cases. >> + >> +Pick-to: 6.1 6.0 5.15 >> +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 >> +Reviewed-by: Allan Sandfeld Jensen >> +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) >> + >> +* asturmlechner 2021-08-21: >> +Conflict from preceding 94dd2ceb in dev branch: >> + src/gui/painting/qpaintengineex.cpp >> + Resolved via: >> + >> + if (pen.style() > Qt::SolidLine) { >> + QRectF cpRect = path.controlPointRect(); >> + const QTransform &xf = state()->matrix; >> +- if (pen.isCosmetic()) { >> ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ >> + clipRect = d->exDeviceRect; >> + cpRect.translate(xf.dx(), xf.dy()); >> + } else { >> + >> +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: >> + Resolved via: >> + >> + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; >> + qreal extent = qMax(extentRect.width(), extentRect.height()); >> + qreal patternLength = 0; >> +- const QList pattern = pen.dashPattern(); >> ++ const QVector pattern = pen.dashPattern(); >> + const int patternSize = qMin(pattern.size(), 32); >> + for (int i = 0; i < patternSize; i++) >> + patternLength += qMax(pattern.at(i), qreal(0)); >> + >> +[Retrieved from: https://urldefense.proofpoint.com/v2/url?u=https-3A__invent.kde.org_qt_qt_qtbase_-2D_commit_081d835c040a90f8ee76807354355062ac521dfb&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=LxReUcygQFa7q9x1Lv38CSIctBA3pevrTHehLs5s-Jo&e= ] >> +Signed-off-by: Quentin Schulz >> +--- >> + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- >> + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ >> + 2 files changed, 69 insertions(+), 9 deletions(-) >> + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps >> + >> +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp >> +index 5d8f89eadd..55fdb0c2a0 100644 >> +--- a/src/gui/painting/qpaintengineex.cpp >> ++++ b/src/gui/painting/qpaintengineex.cpp >> +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const >> + >> + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp >> + >> +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) >> ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) >> + { >> + #ifdef QT_DEBUG_DRAW >> + qDebug() << "QPaintEngineEx::stroke()" << pen; >> +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) >> + d->stroker.setCubicToHook(qpaintengineex_cubicTo); >> + } >> + >> ++ QRectF clipRect; >> ++ QPen pen = inPen; >> ++ if (pen.style() > Qt::SolidLine) { >> ++ QRectF cpRect = path.controlPointRect(); >> ++ const QTransform &xf = state()->matrix; >> ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ >> ++ clipRect = d->exDeviceRect; >> ++ cpRect.translate(xf.dx(), xf.dy()); >> ++ } else { >> ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); >> ++ } >> ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway >> ++ QRectF extentRect = cpRect & clipRect; >> ++ qreal extent = qMax(extentRect.width(), extentRect.height()); >> ++ qreal patternLength = 0; >> ++ const QVector pattern = pen.dashPattern(); >> ++ const int patternSize = qMin(pattern.size(), 32); >> ++ for (int i = 0; i < patternSize; i++) >> ++ patternLength += qMax(pattern.at(i), qreal(0)); >> ++ if (pen.widthF()) >> ++ patternLength *= pen.widthF(); >> ++ if (qFuzzyIsNull(patternLength)) { >> ++ pen.setStyle(Qt::NoPen); >> ++ } else if (extent / patternLength > 10000) { >> ++ // approximate stream of tiny dashes with semi-transparent solid line >> ++ pen.setStyle(Qt::SolidLine); >> ++ QColor color(pen.color()); >> ++ color.setAlpha(color.alpha() / 2); >> ++ pen.setColor(color); >> ++ } >> ++ } >> ++ >> + if (!qpen_fast_equals(pen, d->strokerPen)) { >> + d->strokerPen = pen; >> + d->stroker.setJoinStyle(pen.joinStyle()); >> +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) >> + return; >> + } >> + >> +- if (pen.style() > Qt::SolidLine) { >> +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ >> +- d->activeStroker->setClipRect(d->exDeviceRect); >> +- } else { >> +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); >> +- d->activeStroker->setClipRect(clipRect); >> +- } >> +- } >> ++ if (!clipRect.isNull()) >> ++ d->activeStroker->setClipRect(clipRect); >> + >> + if (d->activeStroker == &d->stroker) >> + d->stroker.setForceOpen(path.hasExplicitOpen()); >> +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps >> +new file mode 100644 >> +index 0000000000..d41ced7f5f >> +--- /dev/null >> ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps >> +@@ -0,0 +1,34 @@ >> ++# Version: 1 >> ++# CheckVsReference: 5% >> ++ >> ++path_addEllipse mypath 20.0 20.0 200.0 200.0 >> ++ >> ++save >> ++setPen blue 20 SolidLine FlatCap >> ++pen_setCosmetic true >> ++pen_setDashPattern [ 0.0004 0.0004 ] >> ++setBrush yellow >> ++ >> ++drawPath mypath >> ++translate 300 0 >> ++setRenderHint Antialiasing true >> ++drawPath mypath >> ++restore >> ++ >> ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 >> ++ >> ++setPen blue 20 DotLine FlatCap >> ++setBrush yellow >> ++ >> ++save >> ++translate 0 300 >> ++scale 0.0001 0.00011 >> ++drawPath bigpath >> ++restore >> ++ >> ++save >> ++translate 300 300 >> ++setRenderHint Antialiasing true >> ++scale 0.0001 0.00011 >> ++drawPath bigpath >> ++restore >> +-- >> +2.34.1 >> + >> diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch >> new file mode 100644 >> index 0000000000..16e0f20200 >> --- /dev/null >> +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch >> @@ -0,0 +1,37 @@ >> +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 >> +From: Eirik Aavitsland >> +Date: Fri, 23 Jul 2021 15:53:56 +0200 >> +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes >> +MIME-Version: 1.0 >> +Content-Type: text/plain; charset=UTF-8 >> +Content-Transfer-Encoding: 8bit >> + >> +Some pathological cases were not caught by the previous fix. >> + >> +Fixes: QTBUG-95239 >> +Pick-to: 6.2 6.1 5.15 >> +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 >> +Reviewed-by: Robert L?hning >> +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) >> +[Retrieved from: https://urldefense.proofpoint.com/v2/url?u=https-3A__invent.kde.org_qt_qt_qtbase_-2D_commit_fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=fz3SSDHyG958fkfUi81iVJmZwke0zFEFtSDHJGFm-Ng&e= ] >> +Signed-off-by: Quentin Schulz >> +--- >> + src/gui/painting/qpaintengineex.cpp | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp >> +index 55fdb0c2a0..19e4b23423 100644 >> +--- a/src/gui/painting/qpaintengineex.cpp >> ++++ b/src/gui/painting/qpaintengineex.cpp >> +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) >> + patternLength *= pen.widthF(); >> + if (qFuzzyIsNull(patternLength)) { >> + pen.setStyle(Qt::NoPen); >> +- } else if (extent / patternLength > 10000) { >> ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { >> + // approximate stream of tiny dashes with semi-transparent solid line >> + pen.setStyle(Qt::SolidLine); >> + QColor color(pen.color()); >> +-- >> +2.34.1 >> + >> diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch >> new file mode 100644 >> index 0000000000..ca3c2736ae >> --- /dev/null >> +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch >> @@ -0,0 +1,100 @@ >> +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 >> +From: Eirik Aavitsland >> +Date: Fri, 30 Jul 2021 13:03:49 +0200 >> +Subject: [PATCH] Refix for avoiding huge number of tiny dashes >> + >> +Previous fix hit too widely so some valid horizontal and vertical >> +lines were affected; the root problem being that such lines have an >> +empty control point rect (width or height is 0). Fix by caculating in >> +the pen width. >> + >> +Pick-to: 6.2 6.1 5.15 >> +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc >> +Reviewed-by: Allan Sandfeld Jensen >> +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) >> +[Retrieved from: https://urldefense.proofpoint.com/v2/url?u=https-3A__invent.kde.org_qt_qt_qtbase_-2D_commit_427df34efdcb56582a9ae9f7d2d1f39eeff70328&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=VxwG1OyHtsNChCKsSB0-O3lc8RzKa8eazWKhgLjrvJ0&e= ] >> +Signed-off-by: Quentin Schulz >> +--- >> + src/gui/painting/qpaintengineex.cpp | 8 ++--- >> + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ >> + 2 files changed, 35 insertions(+), 4 deletions(-) >> + >> +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp >> +index 19e4b23423..9fe510827a 100644 >> +--- a/src/gui/painting/qpaintengineex.cpp >> ++++ b/src/gui/painting/qpaintengineex.cpp >> +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) >> + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); >> + } >> + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway >> +- QRectF extentRect = cpRect & clipRect; >> ++ qreal pw = pen.widthF() ? pen.widthF() : 1; >> ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; >> + qreal extent = qMax(extentRect.width(), extentRect.height()); >> + qreal patternLength = 0; >> + const QVector pattern = pen.dashPattern(); >> + const int patternSize = qMin(pattern.size(), 32); >> + for (int i = 0; i < patternSize; i++) >> + patternLength += qMax(pattern.at(i), qreal(0)); >> +- if (pen.widthF()) >> +- patternLength *= pen.widthF(); >> ++ patternLength *= pw; >> + if (qFuzzyIsNull(patternLength)) { >> + pen.setStyle(Qt::NoPen); >> +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { >> ++ } else if (extent / patternLength > 10000) { >> + // approximate stream of tiny dashes with semi-transparent solid line >> + pen.setStyle(Qt::SolidLine); >> + QColor color(pen.color()); >> +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp >> +index 42e98ce363..d7c3f95f1d 100644 >> +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp >> ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp >> +@@ -308,6 +308,7 @@ private slots: >> + void fillPolygon(); >> + >> + void drawImageAtPointF(); >> ++ void scaledDashes(); >> + >> + private: >> + void fillData(); >> +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() >> + paint.end(); >> + } >> + >> ++void tst_QPainter::scaledDashes() >> ++{ >> ++ // Test that we do not hit the limit-huge-number-of-dashes path >> ++ QRgb fore = qRgb(0, 0, 0xff); >> ++ QRgb back = qRgb(0xff, 0xff, 0); >> ++ QImage image(5, 32, QImage::Format_RGB32); >> ++ image.fill(back); >> ++ QPainter p(&image); >> ++ QPen pen(QColor(fore), 3, Qt::DotLine); >> ++ p.setPen(pen); >> ++ p.scale(1, 2); >> ++ p.drawLine(2, 0, 2, 16); >> ++ p.end(); >> ++ >> ++ bool foreFound = false; >> ++ bool backFound = false; >> ++ int i = 0; >> ++ while (i < 32 && (!foreFound || !backFound)) { >> ++ QRgb pix = image.pixel(3, i); >> ++ if (pix == fore) >> ++ foreFound = true; >> ++ else if (pix == back) >> ++ backFound = true; >> ++ i++; >> ++ } >> ++ >> ++ QVERIFY(foreFound); >> ++ QVERIFY(backFound); >> ++} >> ++ >> + QTEST_MAIN(tst_QPainter) >> + >> + #include "tst_qpainter.moc" >> +-- >> +2.34.1 >> + >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index bcdf036f00..4ef3759566 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz >> QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib >> QT5BASE_INSTALL_STAGING = YES >> >> +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch >> +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch >> +QT5BASE_IGNORE_CVES += CVE-2021-38593 >> + >> # A few comments: >> # * -no-pch to workaround the issue described at >> # https://urldefense.proofpoint.com/v2/url?u=http-3A__comments.gmane.org_gmane.comp.lib.qt.devel_5933&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=aUZRl6hSJJWvvpz78VyHB93iMSfaDFegMAHksXfizi0&e= . >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.buildroot.org_mailman_listinfo_buildroot&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=zAi4ywiObkEfms5Q5xyrRrxJboNShoqy5JpVUNfmfnqtLgLQhUUYSXdGNKoWANbX&s=xTyNnJzz7ej7-MydvaHKi1HryNTdQSeo8K8LiTL6N5k&e= > From giulio.benetti at benettiengineering.com Mon Jan 24 09:32:11 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 10:32:11 +0100 Subject: [Buildroot] [PATCH v3] package/refpolicy: Add option to disable "dontaudit" rules In-Reply-To: <164301659905.4708.13356617813640521530@kwain> References: <164301520937.4708.9842501306400984658@kwain> <164301659905.4708.13356617813640521530@kwain> Message-ID: <4bcfec4b-c0eb-7c4e-0fc9-6782b2dbac0a@benettiengineering.com> On 24/01/22 10:29, Antoine Tenart wrote: > Quoting Giulio Benetti (2022-01-24 10:20:59) >> >> Then I?d go for: >> BR2_PACKAGE_REFPOLICY_ENABLE_EXTRA_AUDIT_LOG >> >> ?Enable extra audit log? >> >> And in the help section I specify all the warnings. >> Defaulted to n. >> >> This way it?s pretty clear to me that I approach the package for the >> first time. And most of all it?s what it does as you?ve explained me >> above. > > But then it's not close to the refpolicy implementation and I don't > find it particularly clear either. Extra audit could be nice in many > ways :) > > Let's wait a bit for other to have time to chime in, they might have an > interesting take, or suggestions. Ok, good idea Best regards! -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Mon Jan 24 09:36:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 02:36:10 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiorwlock: bump to version 1.3.0 Message-ID: <20220124093610.410365-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index fad7079789..15584a8a41 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz -sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz +md5 28e4812a1d1d67a2be4370209ece5528 aiorwlock-1.3.0.tar.gz +sha256 83f12d87df4b9728a0b8fda1756585ab0d652b107bab59c6084e1b1ad692ab45 aiorwlock-1.3.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index 4ba4965eb5..a5e7eeae83 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.2.0 +PYTHON_AIORWLOCK_VERSION = 1.3.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/fe/7027595f5e635ac1f597f7160a420e1f642a474576efb697001efea16bdc PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 09:44:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 02:44:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 21.11.1 Message-ID: <20220124094408.421939-1-james.hilliard1@gmail.com> Drop patches that are now upstream. Signed-off-by: James Hilliard --- ...r-packages-and-xbr-templates-package.patch | 54 ----------------- ...y-default-and-don-t-publish-universa.patch | 60 ------------------- package/python-autobahn/python-autobahn.hash | 4 +- package/python-autobahn/python-autobahn.mk | 5 +- 4 files changed, 5 insertions(+), 118 deletions(-) delete mode 100644 package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch delete mode 100644 package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch diff --git a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch b/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch deleted file mode 100644 index f239345dc7..0000000000 --- a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b13b7e38b38e2c79c0a13be32e05f0451483cd01 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sat, 12 Jun 2021 15:32:37 -0600 -Subject: [PATCH] Fix duplicate xbr packages and xbr templates package_data. - (#1492) - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -a370f9e7154e59b313cb675bfcaf8cad6011bd52] ---- - MANIFEST.in | 1 - - setup.py | 10 ++++++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/MANIFEST.in b/MANIFEST.in -index f4cb6da1..1dd32f0e 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -1,4 +1,3 @@ - include LICENSE - include autobahn/nvx/_utf8validator.c - recursive-include autobahn/wamp/gen/schema * --recursive-include autobahn/xbr/templates * -diff --git a/setup.py b/setup.py -index cf4e29ba..f27006da 100644 ---- a/setup.py -+++ b/setup.py -@@ -166,6 +166,12 @@ packages = [ - 'twisted.plugins', - ] - -+xbr_packages = [ -+ 'autobahn.xbr', -+ 'autobahn.asyncio.xbr', -+ 'autobahn.twisted.xbr', -+] -+ - package_data = {'autobahn.asyncio': ['./test/*']} - - entry_points = { -@@ -179,8 +185,8 @@ if 'AUTOBAHN_STRIP_XBR' in os.environ: - shutil.rmtree('autobahn.egg-info', ignore_errors=True) - else: - extras_require_all += extras_require_xbr -- packages += ['autobahn.xbr', 'autobahn.asyncio.xbr', 'autobahn.twisted.xbr'] -- package_data['xbr'] = ['./xbr/contracts/*.json'] -+ packages += xbr_packages -+ package_data['xbr'] = ['./xbr/templates/*.py.jinja2'] - entry_points['console_scripts'] += ["xbrnetwork = autobahn.xbr._cli:_main"] - - # development dependencies --- -2.25.1 - diff --git a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch b/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch deleted file mode 100644 index c2c2cf5777..0000000000 --- a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1e3162bab59cbc2f7cf8b9ef6cadf55ee273c1d8 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 22 Jul 2021 06:56:51 -0600 -Subject: [PATCH] Build with nvx by default and don't publish universal wheel. - (#1493) - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -a35f22eeaafca7568f1deb35c4a1b82ae78f77d4] ---- - Makefile | 8 ++++---- - autobahn/nvx/_utf8validator.py | 7 ++++++- - setup.py | 7 +------ - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/autobahn/nvx/_utf8validator.py b/autobahn/nvx/_utf8validator.py -index e72fc872..34393356 100644 ---- a/autobahn/nvx/_utf8validator.py -+++ b/autobahn/nvx/_utf8validator.py -@@ -44,13 +44,18 @@ ffi.cdef(""" - int nvx_utf8vld_get_impl(void* utf8vld); - """) - -+optional = True -+if 'AUTOBAHN_USE_NVX' in os.environ and os.environ['AUTOBAHN_USE_NVX'] in ['1', 'true']: -+ optional = False -+ - with open(os.path.join(os.path.dirname(__file__), '_utf8validator.c')) as fd: - c_source = fd.read() - ffi.set_source( - "_nvx_utf8validator", - c_source, - libraries=[], -- extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'] -+ extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'], -+ optional=optional - ) - - -diff --git a/setup.py b/setup.py -index f27006da..4889a39e 100644 ---- a/setup.py -+++ b/setup.py -@@ -110,12 +110,7 @@ extras_require_nvx = [ - - # cffi based extension modules to build, currently only NVX - cffi_modules = [] --if 'AUTOBAHN_USE_NVX' in os.environ: -- # FIXME: building this extension will make the wheel -- # produced no longer universal (as in "autobahn-18.4.1-py2.py3-none-any.whl"). -- # on the other hand, I don't know how to selectively include this -- # based on the install flavor the user has chosen (eg pip install autobahn[nvx] -- # should make the following be included) -+if 'AUTOBAHN_USE_NVX' not in os.environ or os.environ['AUTOBAHN_USE_NVX'] not in ['0', 'false']: - cffi_modules.append('autobahn/nvx/_utf8validator.py:ffi') - - extras_require_xbr = [ --- -2.25.1 - diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 7de1e7e673..0bbb9112d0 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 dcba839ee61be33d05042a09c008c6bc autobahn-21.3.1.tar.gz -sha256 e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03 autobahn-21.3.1.tar.gz +md5 1ccd46d938d8b9fed435e9781e54e887 autobahn-21.11.1.tar.gz +sha256 bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18 autobahn-21.11.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 4ec47f54ce..481d9373ad 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 21.3.1 +PYTHON_AUTOBAHN_VERSION = 21.11.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/4c/9e/f5bdfb55d1eab67c4b6d24d1397f95feec792071ff1b2f5a893d6d5247f3 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed +PYTHON_AUTOBAHN_SETUP_TYPE = setuptools PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 24 10:09:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 24 Jan 2022 11:09:20 +0100 Subject: [Buildroot] [PATCH] package/efl: fix build failure with eeze disabled Message-ID: <20220124100920.3005564-1-giulio.benetti@benettiengineering.com> Elput depends on eeze, so if we disable eeze we also need to disable elput by setting the option "input" to false. Fixes: https://bugs.busybox.net/show_bug.cgi?id=14531 Signed-off-by: Giulio Benetti --- package/efl/efl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/efl/efl.mk b/package/efl/efl.mk index ed0a8acc1d..c93961475d 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -65,6 +65,8 @@ EFL_DEPENDENCIES += udev EFL_CONF_OPTS += -Deeze=true else EFL_CONF_OPTS += -Deeze=false +# input(elput) requires eeze, so disable it accordingly +EFL_CONF_OPTS += -Dinput=false endif ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) -- 2.25.1 From bugzilla at busybox.net Mon Jan 24 10:11:17 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 24 Jan 2022 10:11:17 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 Giulio Benetti changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #5 from Giulio Benetti --- Hi jhiljanen, I've found an easier fix with the help of Carsten Haitzler in Enlightment ML. Here is the pending patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220124100920.3005564-1-giulio.benetti at benettiengineering.com/ Best regards -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Mon Jan 24 10:23:41 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:23:41 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-msgpack: bump to version 1.0.3 Message-ID: <20220124102341.469972-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-msgpack/python-msgpack.hash | 4 ++-- package/python-msgpack/python-msgpack.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash index 8e192e3717..382bada4a7 100644 --- a/package/python-msgpack/python-msgpack.hash +++ b/package/python-msgpack/python-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgpack/json -md5 68d5804254642905ba87ede509e68970 msgpack-1.0.2.tar.gz -sha256 fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984 msgpack-1.0.2.tar.gz +md5 2dcb4fa618d7890e5a79de6fe44cbb59 msgpack-1.0.3.tar.gz +sha256 51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e msgpack-1.0.3.tar.gz # Locally computed sha256 checksums sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index dcb525ed1f..c50b7157a0 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 1.0.2 +PYTHON_MSGPACK_VERSION = 1.0.3 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/59/04/87fc6708659c2ed3b0b6d4954f270b6e931def707b227c4554f99bd5401e +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/61/3c/2206f39880d38ca7ad8ac1b28d2d5ca81632d163b2d68ef90e46409ca057 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:29:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:29:53 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: bump to verison 9.0.0 Message-ID: <20220124102953.524912-1-james.hilliard1@gmail.com> License hash change due to copyright year update: https://github.com/python-pillow/Pillow/commit/0bb3f87dcc72a1a80f50690abde5a3ac4576d3d6 Signed-off-by: James Hilliard --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index d14cb5cff6..f3ca8e6014 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 7a1eb5a250c7ccbd549a89e16404f09f Pillow-8.4.0.tar.gz -sha256 b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed Pillow-8.4.0.tar.gz +md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz +sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz # Locally computed sha256 checksums -sha256 5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4 LICENSE +sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 5ed57c55cb..2f2e817882 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 8.4.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/7d/2a/2fc11b54e2742db06297f7fa7f420a0e3069fdcf0e4b57dfec33f0b08622 +PYTHON_PILLOW_VERSION = 9.0.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:36:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:36:34 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-fonttools: bump to version 4.28.5 Message-ID: <20220124103634.527471-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-fonttools/python-fonttools.hash | 4 ++-- package/python-fonttools/python-fonttools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 2e79861e2c..1f9b546c23 100644 --- a/package/python-fonttools/python-fonttools.hash +++ b/package/python-fonttools/python-fonttools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fonttools/json -md5 fcf1425460855b5892c990027b5396c8 fonttools-4.28.2.zip -sha256 dca694331af74c8ad47acc5171e57f6b78fac5692bf050f2ab572964577ac0dd fonttools-4.28.2.zip +md5 4a894b3cd108432f7636849b4026b771 fonttools-4.28.5.zip +sha256 545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca fonttools-4.28.5.zip # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index 9ec369d550..c5c605161b 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.28.2 +PYTHON_FONTTOOLS_VERSION = 4.28.5 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/3c/d5/f722e0d1aed0d547383913c6bc3c4ff35772952057b8e2b8fe3be8df4216 +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/ce/1b/d4cd86f4e6cbd54a3c4f807015b116299bcd6d6587ea0645d88ba9d932bb PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:40:03 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:40:03 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-frozenlist: bump to version 1.3.0 Message-ID: <20220124104003.529661-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-frozenlist/python-frozenlist.hash | 4 ++-- package/python-frozenlist/python-frozenlist.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index fdbf694963..034150397b 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 8f1851ef871d95a15ebcf20255c12f6d frozenlist-1.2.0.tar.gz -sha256 68201be60ac56aff972dc18085800b6ee07973c49103a8aba669dee3d71079de frozenlist-1.2.0.tar.gz +md5 e65d870bd189ba3c21ab7eb10eab22b7 frozenlist-1.3.0.tar.gz +sha256 ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b frozenlist-1.3.0.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 4e26499808..ad618971f7 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.2.0 +PYTHON_FROZENLIST_VERSION = 1.3.0 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/5c/ee/7c6287928ba776567603248e160387cf4143641ecf734e393ad9b2c82475 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/f4/f7/8dfeb76d2a52bcea2b0718427af954ffec98be1d34cd8f282034b3e36829 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE -- 2.25.1 From evgeni at studio-punkt.com Mon Jan 24 10:41:15 2022 From: evgeni at studio-punkt.com (Evgeni Dobrev) Date: Mon, 24 Jan 2022 11:41:15 +0100 Subject: [Buildroot] [PATCH 0/1] fs: fix /tmp and /run clean-up in POSIX shells Message-ID: <20220124104116.12902-1-evgeni@studio-punkt.com> Hi, the fakeroot script uses [^c] to request the deletion of all hidden files within the tmp and run folders. This however does not work under dash (or other POSIX shells) without additional configuration. The proposed patch fixes the clean-up actions introduced with 5e78e7e97d772124f0d31653aca33731abe5b4db . Regards, Evgeni Dobrev (1): fs: fix /tmp and /run clean-up in POSIX shells fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.34.1 From evgeni at studio-punkt.com Mon Jan 24 10:41:16 2022 From: evgeni at studio-punkt.com (Evgeni Dobrev) Date: Mon, 24 Jan 2022 11:41:16 +0100 Subject: [Buildroot] [PATCH 1/1] fs: fix /tmp and /run clean-up in POSIX shells In-Reply-To: <20220124104116.12902-1-evgeni@studio-punkt.com> References: <20220124104116.12902-1-evgeni@studio-punkt.com> Message-ID: <20220124104116.12902-2-evgeni@studio-punkt.com> In POSIX sh, ^ in place of ! in glob bracket expressions is undefined. Signed-off-by: Evgeni Dobrev --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..64a94d9ad8 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) -- 2.34.1 From james.hilliard1 at gmail.com Mon Jan 24 10:42:40 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:42:40 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-jinja2: bump to version 3.0.3 Message-ID: <20220124104240.531060-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-jinja2/python-jinja2.hash | 4 ++-- package/python-jinja2/python-jinja2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash index afd07e89f1..ea7fe71a35 100644 --- a/package/python-jinja2/python-jinja2.hash +++ b/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 059f89375d7ea60eb7013f341f0b89e7 Jinja2-3.0.2.tar.gz -sha256 827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45 Jinja2-3.0.2.tar.gz +md5 b76ae2f0647abebc81e7c03f5fb7b00f Jinja2-3.0.3.tar.gz +sha256 611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 Jinja2-3.0.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index bb53f95699..752daf653c 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 3.0.2 +PYTHON_JINJA2_VERSION = 3.0.3 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/f8/86/7c0eb6e8b05385d1ce682abc0f994abd1668e148fb52603fa86e15d4c110 +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/91/a5/429efc6246119e1e3fbf562c00187d04e83e54619249eb732bb423efa6c6 PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:46:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:46:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-idna: bump to version 3.3 Message-ID: <20220124104639.532519-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-idna/python-idna.hash | 4 ++-- package/python-idna/python-idna.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 08a7be9d56..27c42c8b59 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 08ea8e2ce09e522424e872409c221138 idna-3.2.tar.gz -sha256 467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3 idna-3.2.tar.gz +md5 5856306eac5f25db8249e37a4c6ee3e7 idna-3.3.tar.gz +sha256 9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d idna-3.3.tar.gz # Locally computed sha256 checksums sha256 a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index a2c842f1e7..2a1ec8314b 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.2 +PYTHON_IDNA_VERSION = 3.3 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:49:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:49:14 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-attrs: bump to version 21.4.0 Message-ID: <20220124104914.533634-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-attrs/python-attrs.hash | 6 +++--- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index 5d4c46304e..823a9459bd 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 06af884070d9180694becdb106e5cd65 attrs-21.2.0.tar.gz -sha256 ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb attrs-21.2.0.tar.gz -# Locally computed sha256 +md5 5a9b5e9ceebc380a13fb93235b11bbda attrs-21.4.0.tar.gz +sha256 626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd attrs-21.4.0.tar.gz +# Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index b99a98501c..4877d62285 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 21.2.0 +PYTHON_ATTRS_VERSION = 21.4.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/ed/d6/3ebca4ca65157c12bd08a63e20ac0bdc21ac7f3694040711f9fd073c0ffb +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/d7/77/ebb15fc26d0f815839ecd897b919ed6d85c050feeb83e100e020df9153d2 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:52:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:52:51 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-certifi: bump to version 2021.10.8 Message-ID: <20220124105251.535089-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-certifi/python-certifi.hash | 4 ++-- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index ae122ffc23..0245496ebf 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 4b38238b7305fcb3ffbc4368be4e8845 certifi-2021.5.30.tar.gz -sha256 2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee certifi-2021.5.30.tar.gz +md5 880ed9e5d04aff8f46f5ff82a3a3e395 certifi-2021.10.8.tar.gz +sha256 78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 certifi-2021.10.8.tar.gz # Locally computed sha256 checksums sha256 be9d82f36112f87a7f1d74ecd4887e1467bbae8878a84004a00117b1e475a3e2 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 486548f8c2..17098e3fae 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2021.5.30 +PYTHON_CERTIFI_VERSION = 2021.10.8 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 10:55:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 03:55:27 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-charset-normalizer: bump to version 2.0.10 Message-ID: <20220124105527.536514-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- .../python-charset-normalizer/python-charset-normalizer.hash | 4 ++-- .../python-charset-normalizer/python-charset-normalizer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index f506fa85ed..eb3b67598b 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.hash +++ b/package/python-charset-normalizer/python-charset-normalizer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/charset-normalizer/json -md5 b28e4463613ff3911d5a2dc62b96233f charset-normalizer-2.0.7.tar.gz -sha256 e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0 charset-normalizer-2.0.7.tar.gz +md5 eaed8aaf95d7e3bc2daefcd8d0f03458 charset-normalizer-2.0.10.tar.gz +sha256 876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd charset-normalizer-2.0.10.tar.gz # Locally computed sha256 checksums sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index 7fe9f96996..33f2e132de 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.7 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.10 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/9f/c5/334c019f92c26e59637bb42bd14a190428874b2b2de75a355da394cf16c1 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:00:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:00:14 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-pycparser: bump to version 2.21 Message-ID: <20220124110014.537689-1-james.hilliard1@gmail.com> License hash changed due to year update: https://github.com/eliben/pycparser/commit/78beeb7d6f0a760f90a8592d9533042363a82810 Signed-off-by: James Hilliard --- package/python-pycparser/python-pycparser.hash | 6 +++--- package/python-pycparser/python-pycparser.mk | 4 ++-- package/python3-pycparser/python3-pycparser.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-pycparser/python-pycparser.hash b/package/python-pycparser/python-pycparser.hash index 0426444399..34401a319a 100644 --- a/package/python-pycparser/python-pycparser.hash +++ b/package/python-pycparser/python-pycparser.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycparser/json -md5 b8f88de737db8c346ee8d31c07c7a25a pycparser-2.20.tar.gz -sha256 2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 pycparser-2.20.tar.gz +md5 48f7d743bf018f7bb2ffc5fb976d1492 pycparser-2.21.tar.gz +sha256 e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 pycparser-2.21.tar.gz # Locally computed sha256 checksums -sha256 3c76629880aec2f8578ed914701a4ff9e5da8b60acb8b7ec675abf83c90c5168 LICENSE +sha256 3e7df25b8dfb658c9a91501930d4d943b05087a8347c7e2b4325616af535047b LICENSE diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 5f44a562af..20c3f641a9 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-pycparser/python3-pycparser.mk -PYTHON_PYCPARSER_VERSION = 2.20 +PYTHON_PYCPARSER_VERSION = 2.21 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd +PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3-Clause PYTHON_PYCPARSER_LICENSE_FILES = LICENSE diff --git a/package/python3-pycparser/python3-pycparser.mk b/package/python3-pycparser/python3-pycparser.mk index 68769ceb46..4075f4a38f 100644 --- a/package/python3-pycparser/python3-pycparser.mk +++ b/package/python3-pycparser/python3-pycparser.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-pycparser/python-pycparser.mk -PYTHON3_PYCPARSER_VERSION = 2.20 +PYTHON3_PYCPARSER_VERSION = 2.21 PYTHON3_PYCPARSER_SOURCE = pycparser-$(PYTHON3_PYCPARSER_VERSION).tar.gz -PYTHON3_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd +PYTHON3_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de PYTHON3_PYCPARSER_SETUP_TYPE = setuptools PYTHON3_PYCPARSER_LICENSE = BSD-3-Clause PYTHON3_PYCPARSER_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:17:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:17:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pyyaml: bump to version 6.0 Message-ID: <20220124111725.544497-1-james.hilliard1@gmail.com> Drop python2 support and propagate dependency changes. Ensure optimized cython build is enabled and add host cython dependency. Signed-off-by: James Hilliard --- package/libcamera/libcamera.mk | 2 +- package/mongodb/mongodb.mk | 2 +- package/python-pyyaml/Config.in | 1 + package/python-pyyaml/python-pyyaml.hash | 4 ++-- package/python-pyyaml/python-pyyaml.mk | 9 +++++---- package/python3-pyyaml/python3-pyyaml.hash | 1 - package/python3-pyyaml/python3-pyyaml.mk | 20 -------------------- 7 files changed, 10 insertions(+), 29 deletions(-) delete mode 120000 package/python3-pyyaml/python3-pyyaml.hash delete mode 100644 package/python3-pyyaml/python3-pyyaml.mk diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 0052ca558a..524cf07e03 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -12,7 +12,7 @@ LIBCAMERA_DEPENDENCIES = \ host-pkgconf \ host-python-jinja2 \ host-python3-ply \ - host-python3-pyyaml \ + host-python-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ -Dandroid=disabled \ diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index c33c3c2eb7..92656dd7a4 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -18,7 +18,7 @@ MONGODB_DEPENDENCIES = \ boost \ host-python3-cheetah \ host-python3-psutil \ - host-python3-pyyaml \ + host-python-pyyaml \ host-python3-regex \ host-python-requests \ host-scons \ diff --git a/package/python-pyyaml/Config.in b/package/python-pyyaml/Config.in index 45e818b7e7..eb073b9c03 100644 --- a/package/python-pyyaml/Config.in +++ b/package/python-pyyaml/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYYAML bool "python-pyyaml" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBYAML help The PyYAML package contains binding to the libyaml API. diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash index 82b2f4f880..f8b5332565 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json -md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz -sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz +md5 1d19c798f25e58e3e582f0f8c977dbb8 PyYAML-6.0.tar.gz +sha256 68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2 PyYAML-6.0.tar.gz # Locally computed sha256 checksums sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index c9013de8ec..8f5a2d269e 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -4,17 +4,18 @@ # ################################################################################ -# Please keep in sync package/python3-pyyaml/python3-pyyaml.mk -PYTHON_PYYAML_VERSION = 5.4.1 +PYTHON_PYYAML_VERSION = 6.0 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844 PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml -PYTHON_PYYAML_DEPENDENCIES = libyaml +PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml +PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-pyyaml/python3-pyyaml.hash b/package/python3-pyyaml/python3-pyyaml.hash deleted file mode 120000 index afa4932ecb..0000000000 --- a/package/python3-pyyaml/python3-pyyaml.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pyyaml/python-pyyaml.hash \ No newline at end of file diff --git a/package/python3-pyyaml/python3-pyyaml.mk b/package/python3-pyyaml/python3-pyyaml.mk deleted file mode 100644 index f758341502..0000000000 --- a/package/python3-pyyaml/python3-pyyaml.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-pyyaml -# -################################################################################ - -# Please keep in sync with package/python-pyyaml/python-pyyaml.mk -PYTHON3_PYYAML_VERSION = 5.4.1 -PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz -PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d -PYTHON3_PYYAML_SETUP_TYPE = setuptools -PYTHON3_PYYAML_LICENSE = MIT -PYTHON3_PYYAML_LICENSE_FILES = LICENSE -PYTHON3_PYYAML_CPE_ID_VENDOR = pyyaml -PYTHON3_PYYAML_CPE_ID_PRODUCT = pyyaml -HOST_PYTHON3_PYYAML_DL_SUBDIR = python-pyyaml -HOST_PYTHON3_PYYAML_NEEDS_HOST_PYTHON = python3 -HOST_PYTHON3_PYYAML_DEPENDENCIES = host-libyaml - -$(eval $(host-python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:19:58 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:19:58 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-requests: bump to version 2.27.1 Message-ID: <20220124111958.545565-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 53503a3668..1e4cbaff7b 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 8c745949ad3e9ae83d9927fed213db8a requests-2.26.0.tar.gz -sha256 b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7 requests-2.26.0.tar.gz +md5 bcc01b73974a305cc7c5b092e7d07004 requests-2.27.1.tar.gz +sha256 68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 requests-2.27.1.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 74cc91ef01..962646516e 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.26.0 +PYTHON_REQUESTS_VERSION = 2.27.1 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:24:03 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:24:03 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-terminaltables: bump to version 3.1.10 Message-ID: <20220124112403.546605-1-james.hilliard1@gmail.com> Update repository upstream url and add license hash. Signed-off-by: James Hilliard --- package/python-terminaltables/Config.in | 2 +- package/python-terminaltables/python-terminaltables.hash | 6 ++++-- package/python-terminaltables/python-terminaltables.mk | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/python-terminaltables/Config.in b/package/python-terminaltables/Config.in index 8f3c4296ed..8a387466ec 100644 --- a/package/python-terminaltables/Config.in +++ b/package/python-terminaltables/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_TERMINALTABLES Generate simple tables in terminals from a nested list of strings. - https://github.com/Robpol86/terminaltables + https://github.com/matthewdeanmartin/terminaltables diff --git a/package/python-terminaltables/python-terminaltables.hash b/package/python-terminaltables/python-terminaltables.hash index 3184f5f716..b6c95aa269 100644 --- a/package/python-terminaltables/python-terminaltables.hash +++ b/package/python-terminaltables/python-terminaltables.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/terminaltables/json -md5 863797674d8f75d22e16e6c1fdcbeb41 terminaltables-3.1.0.tar.gz -sha256 f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81 terminaltables-3.1.0.tar.gz +md5 5467e06a1a6e24dc44e6dd241706668e terminaltables-3.1.10.tar.gz +sha256 ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543 terminaltables-3.1.10.tar.gz +# Locally computed sha256 checksums +sha256 2e1320fd337db06a3136d0f4101bd62f13249c95c5b581304f35481e979d432a LICENSE diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index 763f82e9a2..b31ed332b6 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TERMINALTABLES_VERSION = 3.1.0 +PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz -PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/9b/c4/4a21174f32f8a7e1104798c445dacdc1d4df86f2f26722767034e4de4bff +PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools PYTHON_TERMINALTABLES_LICENSE = MIT +PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE $(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:29:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:29:12 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-urllib3: bump to version 1.26.8 Message-ID: <20220124112912.547889-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-urllib3/python-urllib3.hash | 4 ++-- package/python-urllib3/python-urllib3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 066bfb7288..2415f24199 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 e0051a87a956e618a6bb514a07fa7773 urllib3-1.26.7.tar.gz -sha256 4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece urllib3-1.26.7.tar.gz +md5 50831ca7b19bbe2781abb0a4c2d51760 urllib3-1.26.8.tar.gz +sha256 0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c urllib3-1.26.8.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 9580d9b6b9..c9c8a912d1 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.7 +PYTHON_URLLIB3_VERSION = 1.26.8 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/b0/b1/7bbf5181f8e3258efae31702f5eab87d8a74a72a0aa78bc8c08c1466e243 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:37:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:37:49 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pynacl: bump to version 1.5.0 Message-ID: <20220124113749.585264-1-james.hilliard1@gmail.com> Drop patch that is now upstream. Drop python2 support. Drop python-six dependency which is no longer needed. Signed-off-by: James Hilliard --- ...e-spurious-requirement-for-wheel-596.patch | 34 ------------------- package/python-pynacl/Config.in | 2 +- package/python-pynacl/python-pynacl.hash | 6 ++-- package/python-pynacl/python-pynacl.mk | 4 +-- 4 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch diff --git a/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch b/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch deleted file mode 100644 index 4f4a76ce29..0000000000 --- a/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 44fb453931c611d4822343debe902cca8e1c8afe Mon Sep 17 00:00:00 2001 -From: Scott Kitterman -Date: Tue, 26 May 2020 20:08:16 -0400 -Subject: [PATCH] Remove spurious requirement for wheel (#596) - -* Remove spurious requirement for wheel - -* Put wheel back in pyproject.toml - -Co-authored-by: Scott Kitterman -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -44fb453931c611d4822343debe902cca8e1c8afe] ---- - setup.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 9319c1c..d82a7fe 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,8 +35,7 @@ except ImportError: - - - requirements = ["six"] --setup_requirements = ["setuptools", -- "wheel"] -+setup_requirements = ["setuptools"] - test_requirements = ["pytest>=3.2.1,!=3.3.0", - "hypothesis>=3.27.0"] - docs_requirements = ["sphinx>=1.6.5", --- -2.25.1 - diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in index 256f9d5eb6..3bb4e29630 100644 --- a/package/python-pynacl/Config.in +++ b/package/python-pynacl/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PYNACL bool "python-pynacl" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBSODIUM - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime help Python binding to the Networking and Cryptography (NaCl) diff --git a/package/python-pynacl/python-pynacl.hash b/package/python-pynacl/python-pynacl.hash index b6ee2baf0e..85a7447b32 100644 --- a/package/python-pynacl/python-pynacl.hash +++ b/package/python-pynacl/python-pynacl.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/pynacl/json -md5 8c6c57893327a694c72510fb620e4744 PyNaCl-1.4.0.tar.gz -sha256 54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PyNaCl-1.4.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/PyNaCl/json +md5 93989045e25f1111452cfdf5e021814d PyNaCl-1.5.0.tar.gz +sha256 8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba PyNaCl-1.5.0.tar.gz # Locally computed sha256 checksums sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE diff --git a/package/python-pynacl/python-pynacl.mk b/package/python-pynacl/python-pynacl.mk index 1e4155992a..bd2571c3ad 100644 --- a/package/python-pynacl/python-pynacl.mk +++ b/package/python-pynacl/python-pynacl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYNACL_VERSION = 1.4.0 +PYTHON_PYNACL_VERSION = 1.5.0 PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/cf/5a/25aeb636baeceab15c8e57e66b8aa930c011ec1c035f284170cacb05025e +PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/a7/22/27582568be639dfe22ddb3902225f91f2f17ceff88ce80e4db396c8986da PYTHON_PYNACL_LICENSE = Apache-2.0 PYTHON_PYNACL_LICENSE_FILES = LICENSE PYTHON_PYNACL_SETUP_TYPE = setuptools -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 11:52:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 04:52:10 -0700 Subject: [Buildroot] [PATCH 1/1] package/python3-pycryptodomex: bump to version 3.13.0 Message-ID: <20220124115210.591345-1-james.hilliard1@gmail.com> License hash changed due to OCB patents expiry: https://github.com/Legrandin/pycryptodome/commit/5d78d02220022592d79fd7789cc77af6d1859729 Signed-off-by: James Hilliard --- package/python-pycryptodomex/python-pycryptodomex.hash | 6 +++--- package/python-pycryptodomex/python-pycryptodomex.mk | 7 +++---- package/python3-pycryptodomex/python3-pycryptodomex.mk | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 544468b37e..9512f185a8 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 3d007103f68f7e902167719655d2b57a pycryptodomex-3.11.0.tar.gz -sha256 0398366656bb55ebdb1d1d493a7175fc48ade449283086db254ac44c7d318d6d pycryptodomex-3.11.0.tar.gz +md5 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz +sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz # Locally computed sha256 checksums -sha256 c273fb45d120362875aafdd6189f4d7c70f6c36d4cb7ce427e0dc704753639df LICENSE.rst +sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index f1fda7aea2..92780327a1 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -5,14 +5,13 @@ ################################################################################ # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk -PYTHON_PYCRYPTODOMEX_VERSION = 3.11.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/47/14/dd9ad29cd29ea4cc521286f2cb401ca7ac6fd5db0791c5e9bacaf2c9ac78 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ - Public Domain (pycrypto original code), \ - OCB patent license (OCB mode) + Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto $(eval $(python-package)) diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk index ee03a08ec6..06a46cdf63 100644 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ b/package/python3-pycryptodomex/python3-pycryptodomex.mk @@ -5,14 +5,13 @@ ################################################################################ # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.11.0 +PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/47/14/dd9ad29cd29ea4cc521286f2cb401ca7ac6fd5db0791c5e9bacaf2c9ac78 +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON3_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ - Public Domain (pycrypto original code), \ - OCB patent license (OCB mode) + Public Domain (pycrypto original code) PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 24 12:02:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 05:02:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/python{3}-cython: bump to version 0.29.26 Message-ID: <20220124120225.593014-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- package/python3-cython/python3-cython.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 70469c012b..b07f171c25 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 81aff945f5bfdfb86e7a5d24f5467668 Cython-0.29.24.tar.gz -sha256 cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443 Cython-0.29.24.tar.gz +md5 971c9708dd5269180868fc0af986084c Cython-0.29.26.tar.gz +sha256 af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 Cython-0.29.26.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index ffc8e719cd..cf41086dea 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-cython/python3-cython.mk -PYTHON_CYTHON_VERSION = 0.29.24 +PYTHON_CYTHON_VERSION = 0.29.26 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk index 2f15ad8c36..da159cedc8 100644 --- a/package/python3-cython/python3-cython.mk +++ b/package/python3-cython/python3-cython.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-cython/python-cython.mk -PYTHON3_CYTHON_VERSION = 0.29.24 +PYTHON3_CYTHON_VERSION = 0.29.26 PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b PYTHON3_CYTHON_SETUP_TYPE = setuptools PYTHON3_CYTHON_LICENSE = Apache-2.0 PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.25.1 From narmstrong at baylibre.com Mon Jan 24 13:41:49 2022 From: narmstrong at baylibre.com (Neil Armstrong) Date: Mon, 24 Jan 2022 14:41:49 +0100 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> <20220122160914.7e4cc513@windsurf> <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> Message-ID: <4a94b253-6fe7-5e79-b1e9-331b0a9051ca@baylibre.com> Hi Thomas, On 22/01/2022 17:09, Vyacheslav wrote: > Hi, Neil! > Can you help us with understanding license for Amlogic binaries in > https://github.com/LibreELEC/amlogic-boot-fip? > > > 22.01.2022 18:09, Thomas Petazzoni wrote: >> Hello, >> >> On Sat, 22 Jan 2022 18:05:06 +0300 >> Vyacheslav wrote: >> >>>> So how can the contents of this repository be useful? OK, then can be >>>> used locally for your own experiments. But for building an actual >>>> device that you can ship/provide to others, using the contents of that >>>> repository, because Amlogic does not even allow you to distribute the >>>> contents of this repository. >>>> >>>> So I am wondering if it's really reasonable to package this in >>>> Buildroot. >>>> ?? >>> You already have package/odroidc2-firmware with same license. >>> amlogic-boot-fip just put all similar binaries together and Neil >>> Armstrong made a build system for aml uboot binaries. >> >> Well, I wasn't aware package/odroidc2-firmware was under the same >> restrictive license. Are the license terms for >> package/odroidc2-firmware available somewhere? This package is >> downloaded from https://github.com/hardkernel/u-boot, but I don't see >> the license terms from Amlogic preventing redistribution. Of course, I >> understand that they simply may be missing (which would be really bad!). The binaries must be split into 2 categories: - Pre-built: bl2, bl31, bl21, bl32, fip_create, aml_encrypt_*, ddr*.fw, acs_tool.py - Built in the Vendor U-Boot source: acs.bin bl301.bin In 2019, Amlogic finally added a LICENSE for the pre-built binaries, before nobody knew what was the term of the distribution. commit 6abaf9a869a6584b3cfca8b96d0946ed49bc9b64 Author: Lawrence Mok Date: Mon May 6 12:34:56 2019 -0700 add LICENSE file and text referring to it [1/1] Change-Id: Id291f42bec3ddb0c2162e6540ce1f35d1cb1d079 The LICENSE can be found at [1] in Khadas github. Concerning the acs.bin & bl301.bin, they use the U-Boot build system and config header files and all these were also updated with the following SPDX: /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ commit 94de43d3d940cf75b4a9e4fd2a2715be8eff6138 Author: Jiucheng Xu Date: Wed Dec 16 10:11:00 2020 +0800 license: Fix the license of amlogic related codes [1/1] PD#SWPL-39001 Problem: A customer want to add amlogic driver in uboot to their private bootloader. Since the driver codes are licensed under GPL-2.0, and customer have to open their code, so we need fix the license issue. Solution: Fix the license of our related code in uboot by adding MIT license Verify: Franklin Change-Id: I2f3571e8720d1f4db069f882353d6ae050702cba Signed-off-by: Jiucheng Xu Note, none of the vendor who publicly published the Amlogic U-Boot source has this change, so we can consider acs.bin & bl301.bin generated from GPL-2.0 as the commit explains. >> >> But how can anyone use those blobs? You can't redistribute them. >> According to their license, just putting them on Github is not even >> allowed. The pre-built binaries stored on the LibreELEC repository only comes from public Vendor sources (Khadas, HardKernel, Libre Computer, FriendlyARM, Radxa) and checked against vendor repositories we have access to. We assume they got permission from Amlogic to publicly redistribute these binaries as we (BayLibre) were allowed to redistribute the VDEC firmware in [2] & [3]. Note the situation is still unclear, this is why I haven't continued my initial patchset for libretech-cc at [4] following your concerns over licensing. Neil >> >> Thomas [1] https://github.com/khadas/u-boot/blob/khadas-vims-pie/fip/LICENSE [2] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/LICENSE.amlogic_vdec [3] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/meson/vdec?id=e04cc56d0e6b6ff05924ff88fdba1a438ee7d3c8 [4] https://patchwork.ozlabs.org/project/buildroot/cover/1533545408-11248-1-git-send-email-narmstrong at baylibre.com/ From bugzilla at busybox.net Mon Jan 24 13:49:46 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 24 Jan 2022 13:49:46 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #6 from jhiljanen at europower-consulting.com --- (In reply to Giulio Benetti from comment #5) Thank you for your work! -- You are receiving this mail because: You are on the CC list for the bug. From aperez at igalia.com Mon Jan 24 14:02:30 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 24 Jan 2022 16:02:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.34.4 Message-ID: <20220124140230.1697395-1-aperez@igalia.com> This is a minor release which provides fixes for CVE-2021-30934, CVE-2021-30936, CVE-2021-30951, CVE-2021-30952, CVE-2021-30953, CVE-2021-30954, CVE-2021-30984, and the safarileaks.com vulnerability (which has not yet been assigned a CVE number). Release notes can be found at: https://wpewebkit.org/release/wpewebkit-2.34.4.html An accompanying security advisory has been published at: https://wpewebkit.org/security/WSA-2022-0001.html Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 52652b72ae..b863a0d705 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.34.3.tar.xz.sums -md5 f8eb92825bf6477fb04ca017926c2458 wpewebkit-2.34.3.tar.xz -sha1 a72f507dfd6d4d579b2e6c939d7c171c2cfb1d92 wpewebkit-2.34.3.tar.xz -sha256 c35de4bfce35c81cbd6c1da27879b4ea33e20bd51d750ce296a4d100d45f40fc wpewebkit-2.34.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.34.4.tar.xz.sums +md5 b0f7dcb18acfa94cfb42fea0fe10fb0d wpewebkit-2.34.4.tar.xz +sha1 de58481b43a6dba054097f619ee486f7889d7a56 wpewebkit-2.34.4.tar.xz +sha256 3653ba42dbe22a4e6751b3f7cab8d2ebb2db5b7654c5d135a2f9bedf94778cee wpewebkit-2.34.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 2cbed60cb3..25b71f0f50 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.3 +WPEWEBKIT_VERSION = 2.34.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.34.1 From aperez at igalia.com Mon Jan 24 14:16:11 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 24 Jan 2022 16:16:11 +0200 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <87mtjlwlvo.fsf@dell.be.48ers.dk> References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> Message-ID: <20220124161611.GB162969@momiji> Hello Peter, all, On Mon, 24 Jan 2022 09:58:35 +0100 Peter Korsgaard wrote: > >>>>> "Adrian" == Adrian Perez de Castro writes: > > > Update to the the next minor release, which fixes an scrolling issue and > > incorporated a patch that can now be removed from Buildroot. Release > > notes: > > > https://wpewebkit.org/release/wpewebkit-2.34.2.html > > > Signed-off-by: Adrian Perez de Castro > > What about webkitgtk? It would also be good to move that to the 2.34.x > series before we release 2022.02. I have all the intention to update WebKitGTK as soon as I have some spare cycles to figure out a build issue when X11 headers are not present (e.g. in Wayland-only configurations); currently I already have a WIP patch set here: https://git.sr.ht/~aperezdc/buildroot/log/wip/webkitgtk Also I just submitted some moments ago a small patch to update the WPE WebKit package to 2.34.4 as well. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From peter at korsgaard.com Mon Jan 24 14:44:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 15:44:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: bump version to 2.34.2 In-Reply-To: <20220124161611.GB162969@momiji> (Adrian Perez de Castro's message of "Mon, 24 Jan 2022 16:16:11 +0200") References: <20211124205607.3021277-1-aperez@igalia.com> <87mtjlwlvo.fsf@dell.be.48ers.dk> <20220124161611.GB162969@momiji> Message-ID: <87ee4xw5vj.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: Hi, >> What about webkitgtk? It would also be good to move that to the 2.34.x >> series before we release 2022.02. > I have all the intention to update WebKitGTK as soon as I have some spare > cycles to figure out a build issue when X11 headers are not present (e.g. > in Wayland-only configurations); currently I already have a WIP patch set > here: > https://git.sr.ht/~aperezdc/buildroot/log/wip/webkitgtk Ahh, great! > Also I just submitted some moments ago a small patch to update the WPE WebKit > package to 2.34.4 as well. Thanks! -- Bye, Peter Korsgaard From tomazsmodis73 at hotmail.com Mon Jan 24 15:28:00 2022 From: tomazsmodis73 at hotmail.com (=?UTF-8?B?VG9tYcW+IFNtb2RpxaE=?=) Date: Mon, 24 Jan 2022 16:28:00 +0100 Subject: [Buildroot] buildroot EGLFS support Message-ID: Hi With help of Mr. Richard Ash I managed to build my buildroot Os. With the same compiler I buidl/compiled Qt libraries against buildroot sysroot. I was finally able to run some cpp code. I successfully ran Qt console application. However if I try to run Qt GUI Application I got errors. I enabled eglfs support in menuconfig: In target packages, graphic libraries and applications I enabled mesa3d option Gallium swrast driver and OpenGL EGL and OpenGL ES options. I ran make successfully, deployed to Raspberry Pi 3 b+ but after I run my app with: strace ./myapp -platform eglfs I got errror: write(2, "EGL library doesn't support Emul"..., 48EGL library doesn't support Emulator extensions Any advice? kind regards Thomas From fperrad at gmail.com Mon Jan 24 16:55:39 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 24 Jan 2022 17:55:39 +0100 Subject: [Buildroot] [PATCH] package/sqlite: bump to version 3.37.2 Message-ID: <20220124165539.778030-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 604275ebf..deb8d4c14 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz +sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 59b76ce16..b702139f6 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,10 +4,10 @@ # ################################################################################ -SQLITE_VERSION = 3.37.1 -SQLITE_TAR_VERSION = 3370100 +SQLITE_VERSION = 3.37.2 +SQLITE_TAR_VERSION = 3370200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2021 +SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite -- 2.32.0 From peter at korsgaard.com Mon Jan 24 17:16:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:16:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: add optional dependency to icu & libglib2 In-Reply-To: <20211225105738.4716-1-bernd.kuhls@t-online.de> References: <20211225105738.4716-1-bernd.kuhls@t-online.de> Message-ID: <16fb75fb-fb83-918a-3077-2d59001edb0c@korsgaard.com> On 25/12/2021 11.57, Bernd Kuhls wrote: > icu is used in lib/util/charset/ > https://git.samba.org/samba.git/?p=samba.git;a=blob;f=lib/util/charset/wscript_configure;hb=HEAD#l40 > > libglib2 is used in source3/ > https://git.samba.org/samba.git/?p=samba.git;a=blob;f=source3/wscript;hb=HEAD#l1778 > > Signed-off-by: Bernd Kuhls Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 24 17:23:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:23:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.14 In-Reply-To: <20211226162736.5528-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 26 Dec 2021 17:27:36 +0100") References: <20211226162736.5528-1-bernd.kuhls@t-online.de> Message-ID: <87fspdrqsv.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.14 > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 24 17:14:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:14:56 +0100 Subject: [Buildroot] [PATCH] package/cage: only enable XWayland if wlroots has X11 In-Reply-To: <20211225050854.1138268-1-t123yh.xyz@gmail.com> References: <20211225050854.1138268-1-t123yh.xyz@gmail.com> Message-ID: On 25/12/2021 06.08, Yunhao Tian wrote: > Cage requires wlroots to be built with X11 enabled > in order to enable XWayland, otherwise it will fail > with error: > > "ERROR: Problem encountered: Cannot build Cage with > XWayland support: wlroots has been built without it" > > Signed-off-by: Yunhao Tian Committed to 2021.02.x / 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Mon Jan 24 17:23:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 18:23:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml: add TINYXML_CPE_ID_VENDOR Message-ID: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml Signed-off-by: Fabrice Fontaine --- package/tinyxml/tinyxml.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 15280517ac..b8b8e43c05 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,5 +12,6 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README +TINYXML_CPE_ID_VENDOT = tinyxml_project $(eval $(autotools-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 24 17:23:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 18:23:22 +0100 Subject: [Buildroot] [PATCH 2/2] package/tinyxml: fix CVE-2021-42260 In-Reply-To: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> References: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> Message-ID: <20220124172322.2302364-2-fontaine.fabrice@gmail.com> TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by a crafted XML message and leads to a denial of service. Signed-off-by: Fabrice Fontaine --- ...always-advance-the-pointer-if-p-0xef.patch | 37 +++++++++++++++++++ package/tinyxml/tinyxml.mk | 3 ++ 2 files changed, 40 insertions(+) create mode 100644 package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch diff --git a/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch new file mode 100644 index 0000000000..ea0f6476c8 --- /dev/null +++ b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch @@ -0,0 +1,37 @@ +From f7ca0035d17a663f55668e662b840afce7b86112 Mon Sep 17 00:00:00 2001 +From: Christian Voegl +Date: Wed, 27 Oct 2021 11:25:18 +0200 +Subject: [PATCH] In stamp always advance the pointer if *p= 0xef + +The current implementation only advanced if 0xef is followed +by two non-zero bytes. In case of malformed input (0xef should be +the start byte of a three byte character) this leads to an infinite +loop. (CVE-2021-42260) + +[Retrieved (and backported) from: +https://sourceforge.net/p/tinyxml/git/merge-requests/1] +Signed-off-by: Fabrice Fontaine +--- + tinyxmlparser.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 81b7eae..8aa0dfa 100755 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding ) + else + { p +=3; ++col; } // A normal character. + } ++ else ++ { ++ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so ++ // there is something wrong here. Just advance the pointer to evade infinite loops ++ ++p; ++ } + } + else + { +-- +2.34.1 + diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index b8b8e43c05..d173254e31 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -14,4 +14,7 @@ TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README TINYXML_CPE_ID_VENDOT = tinyxml_project +# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch +TINYXML_IGNORE_CVES += CVE-2021-42260 + $(eval $(autotools-package)) -- 2.34.1 From peter at korsgaard.com Mon Jan 24 17:25:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:25:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.9 In-Reply-To: <20211226165756.609096-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 26 Dec 2021 17:57:56 +0100") References: <20211226165756.609096-1-bernd.kuhls@t-online.de> Message-ID: <87bl01rqpd.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://forum.torproject.net/t/release-0-4-6-9-and-0-4-7-3-alpha/1265 > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Mon Jan 24 17:25:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 18:25:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/xvisor: bump to version 0.3.1 Message-ID: <20220124172520.2302603-1-fontaine.fabrice@gmail.com> - Drop first patch (already in version) - Send second patch upstream http://xhypervisor.org/index.php?page=news/20211220 Signed-off-by: Fabrice Fontaine --- .../xvisor/0001-fix-build-with-gcc-10.patch | 64 ------------------- ...smouse-back.c-fix-build-with-gcc-11.patch} | 1 + package/xvisor/xvisor.hash | 2 +- package/xvisor/xvisor.mk | 2 +- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 package/xvisor/0001-fix-build-with-gcc-10.patch rename package/xvisor/{0002-psmouse-back.c-fix-build-with-gcc-11.patch => 0001-psmouse-back.c-fix-build-with-gcc-11.patch} (98%) diff --git a/package/xvisor/0001-fix-build-with-gcc-10.patch b/package/xvisor/0001-fix-build-with-gcc-10.patch deleted file mode 100644 index a538558d86..0000000000 --- a/package/xvisor/0001-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 6 Oct 2020 21:52:20 +0200 -Subject: [PATCH] fix build with gcc 10 - -Define variables in header files as extern to avoid the following build failure -with gcc 10 (which defaults to -fno-common): - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld: -/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: -multiple definition of `sdio_func_type'; -/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: -first defined here - -Fixes: - - http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/xvisor/xvisor/pull/125] ---- - drivers/mmc/core/core.h | 2 +- - emulators/display/drawfn.h | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h -index d75d135a..e2ca3141 100644 ---- a/drivers/mmc/core/core.h -+++ b/drivers/mmc/core/core.h -@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host); - * Note: Must be called with host->lock held. - */ - extern struct vmm_bus sdio_bus_type; --struct vmm_device_type sdio_func_type; -+extern struct vmm_device_type sdio_func_type; - - int __sdio_attach(struct mmc_host *host); - -diff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h -index f9163cff..385deaf6 100644 ---- a/emulators/display/drawfn.h -+++ b/emulators/display/drawfn.h -@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *, - DRAWFN_ORDER_MAX * \ - DRAWFN_FORMAT_MAX) - --drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; - - #endif --- -2.28.0 - diff --git a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch similarity index 98% rename from package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch rename to package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch index 28010034d6..1c02f45c9d 100644 --- a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch +++ b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch @@ -17,6 +17,7 @@ Fixes: - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295 Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xvisor/xvisor/pull/139] --- drivers/input/mouse/alps.h | 4 ++-- drivers/input/mouse/lifebook.h | 6 +++--- diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash index 6938e20e7b..45b6fec49c 100644 --- a/package/xvisor/xvisor.hash +++ b/package/xvisor/xvisor.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 81660d26a0bc63979ba40872f10511df777185712eba2d0e19e816438388de05 xvisor-0.3.0.tar.xz +sha256 b1bb2ca09340e87a2f465c65196892cdd0f59b798794ae69e35d1f883cf9ba49 xvisor-0.3.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 394ff7c80b..dc49258400 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XVISOR_VERSION = 0.3.0 +XVISOR_VERSION = 0.3.1 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ -- 2.34.1 From peter at korsgaard.com Mon Jan 24 17:27:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:27:11 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: remove Ryan Barnett In-Reply-To: <20211227084644.4C44B82975@busybox.osuosl.org> (Thomas Petazzoni's message of "Mon, 27 Dec 2021 09:51:39 +0100") References: <20211227084644.4C44B82975@busybox.osuosl.org> Message-ID: <877daprqmo.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=287601459e15c683feb9517092d8d50099b09915 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > His e-mail address is bouncing (and we have some private information > that explains why): > Ryan Barnett (ryan.barnett at collins.com) > The recipient won't be able to receive this message because it's too large. > The maximum message size that's allowed is 1 KB. This message is 7 KB. > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Mon Jan 24 17:26:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 18:26:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: bump to version 2.03.14 Message-ID: <20220124172623.2303019-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/lvmteam/lvm2/blob/v2_03_14/WHATS_NEW Signed-off-by: Fabrice Fontaine --- package/lvm2/lvm2.hash | 6 +++--- package/lvm2/lvm2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 1260669480..c52eaee1e1 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From http://sources.redhat.com/pub/lvm2/sha512.sum -sha512 e4d3bfb38b346251a2ea2cee7b79f2e12ed407652b659b35b65f58c8bb252943cee1c511713aeec8ff3400790e0e99ea6b83e8740050defe5cbb118f18bf7700 LVM2.2.03.12.tgz +sha512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d LVM2.2.03.14.tgz # Locally computed sha256 checksums -sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB +sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 70da10696c..f875b292f3 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.12 +LVM2_VERSION = 2.03.14 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = http://sources.redhat.com/pub/lvm2 LVM2_INSTALL_STAGING = YES -- 2.34.1 From peter at korsgaard.com Mon Jan 24 17:36:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:36:02 +0100 Subject: [Buildroot] [PATCH] package/coreutils: drop gl_cv_func_fstatat_zero_flag=no from config env In-Reply-To: <20211227072344.16697-1-jcmvbkbc@gmail.com> (Max Filippov's message of "Sun, 26 Dec 2021 23:23:44 -0800") References: <20211227072344.16697-1-jcmvbkbc@gmail.com> Message-ID: <87zgnlqbnh.fsf@dell.be.48ers.dk> >>>>> "Max" == Max Filippov writes: > Configuring coreutils with gl_cv_func_fstatat_zero_flag=no results in > non-functional lchmod library function which causes 'mkfifo -m' to > always complete with the message 'cannot set permissions of ...: Invalid > argument' and an error exit code. gl_cv_func_fstatat_zero_flag=no is not > needed when building coreutils-9.0 for linux and its setting should be > correctly determined by the configure script. > Drop gl_cv_func_fstatat_zero_flag=no from the coreutils configure > environment. > For more details see > https://lists.buildroot.org/pipermail/buildroot/2021-December/631388.html > Signed-off-by: Max Filippov Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Jan 24 16:33:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 17:33:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/cage: only enable XWayland if wlroots has X11 Message-ID: <20220124172936.C6FA982B33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4294adf244cd5083ba957a106c4a13562692367d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Cage requires wlroots to be built with X11 enabled in order to enable XWayland, otherwise it will fail with error: "ERROR: Problem encountered: Cannot build Cage with XWayland support: wlroots has been built without it" Signed-off-by: Yunhao Tian [yann.morin.1998 at free.fr: - drop explicit _XORG7, as _WLROOTS_X11 depends on it ] Signed-off-by: Yann E. MORIN (cherry picked from commit 3e4c2d6213a09e9a0c598f800510acd6687ffcda) Signed-off-by: Peter Korsgaard --- package/cage/cage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cage/cage.mk b/package/cage/cage.mk index 9fc01d36c1..731702b4d3 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -10,7 +10,7 @@ CAGE_LICENSE = MIT CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) CAGE_CONF_OPTS = -Dxwayland=true else CAGE_CONF_OPTS = -Dxwayland=false From peter at korsgaard.com Mon Jan 24 16:28:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 17:28:33 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/samba4: add optional dependency to icu & libglib2 Message-ID: <20220124172936.BE29381DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2619c07f0a479cbdc3739b12d1e7a0cc4ffd562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x icu is used in lib/util/charset/ https://git.samba.org/samba.git/?p=samba.git;a=blob;f=lib/util/charset/wscript_configure;hb=HEAD#l40 libglib2 is used in source3/ https://git.samba.org/samba.git/?p=samba.git;a=blob;f=source3/wscript;hb=HEAD#l1778 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 1c4c68b8fbf471919fbbaf4e688a75c4de36a331) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index b2fb4882cb..5673521836 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -16,8 +16,10 @@ SAMBA4_DEPENDENCIES = \ host-e2fsprogs host-flex host-heimdal host-nfs-utils \ host-perl host-perl-parse-yapp host-python3 \ cmocka e2fsprogs gnutls popt zlib \ + $(if $(BR2_PACKAGE_ICU),icu) \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ + $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ $(if $(BR2_PACKAGE_READLINE),readline) \ $(TARGET_NLS_DEPENDENCIES) SAMBA4_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Mon Jan 24 17:30:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:30:54 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/coreutils: drop gl_cv_func_fstatat_zero_flag=no from config env Message-ID: <20220124172936.D81F8811E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20dffb403d72cc8639db8db5902231e02b9493fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Configuring coreutils with gl_cv_func_fstatat_zero_flag=no results in non-functional lchmod library function which causes 'mkfifo -m' to always complete with the message 'cannot set permissions of ...: Invalid argument' and an error exit code. gl_cv_func_fstatat_zero_flag=no is not needed when building coreutils-9.0 for linux and its setting should be correctly determined by the configure script. Drop gl_cv_func_fstatat_zero_flag=no from the coreutils configure environment. For more details see https://lists.buildroot.org/pipermail/buildroot/2021-December/631388.html Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni (cherry picked from commit fef5d9fbda813668885f2df00d887cb39b4fc505) Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 57b77b8c6a..cfd125e2d2 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -47,7 +47,6 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ gl_cv_func_getcwd_null=yes \ gl_cv_func_getcwd_path_max=yes \ gl_cv_func_gettimeofday_clobber=no \ - gl_cv_func_fstatat_zero_flag=no \ gl_cv_func_link_follows_symlink=no \ gl_cv_func_re_compile_pattern_working=yes \ gl_cv_func_svid_putenv=yes \ From peter at korsgaard.com Mon Jan 24 17:27:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:27:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: remove Ryan Barnett Message-ID: <20220124172936.CF5EC82BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb96c11e6f5eb3dc0384657fe2dacbcdf4d6e4d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x His e-mail address is bouncing (and we have some private information that explains why): Ryan Barnett (ryan.barnett at collins.com) The recipient won't be able to receive this message because it's too large. The maximum message size that's allowed is 1 KB. This message is 7 KB. Signed-off-by: Thomas Petazzoni (cherry picked from commit 287601459e15c683feb9517092d8d50099b09915) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index e1e526a666..9108d11f3c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2284,18 +2284,6 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ -N: Ryan Barnett -F: package/atftp/ -F: package/c-periphery/ -F: package/miraclecast/ -F: package/opkg/ -F: package/opkg-utils/ -F: package/python-pysnmp/ -F: package/python-pysnmp-mibs/ -F: package/python-tornado/ -F: package/resiprocate/ -F: package/websocketpp/ - N: Ryan Wilkins F: package/biosdevname/ From peter at korsgaard.com Mon Jan 24 17:22:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:22:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/php: bump version to 8.0.14 Message-ID: <20220124172947.AB89182BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b769aaa1fcb8e425b17879a229d633a7d5da1f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog: https://www.php.net/ChangeLog-8.php#8.0.14 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7a351e9fbe0b652a3b7472573916d791ba00fa1b) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 254484e72f..329410b54f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 cd976805ec2e9198417651027dfe16854ba2c2c388151ab9d4d268513d52ed52 php-8.0.13.tar.xz +sha256 fbde8247ac200e4de73449d9fefc8b495d323b5be9c10cdb645fb431c91156e3 php-8.0.14.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 8c45da77a2..ca59334104 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.13 +PHP_VERSION = 8.0.14 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Mon Jan 24 16:31:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 17:31:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/cage: only enable XWayland if wlroots has X11 Message-ID: <20220124172947.A0D2B82B33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0031fc0f1825de7207a7c0777a4402750b6d3583 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Cage requires wlroots to be built with X11 enabled in order to enable XWayland, otherwise it will fail with error: "ERROR: Problem encountered: Cannot build Cage with XWayland support: wlroots has been built without it" Signed-off-by: Yunhao Tian [yann.morin.1998 at free.fr: - drop explicit _XORG7, as _WLROOTS_X11 depends on it ] Signed-off-by: Yann E. MORIN (cherry picked from commit 3e4c2d6213a09e9a0c598f800510acd6687ffcda) Signed-off-by: Peter Korsgaard --- package/cage/cage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cage/cage.mk b/package/cage/cage.mk index a661857a95..c132f086f6 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -11,7 +11,7 @@ CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots CAGE_CONF_OPTS = -Dman-pages=disabled -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) CAGE_CONF_OPTS += -Dxwayland=true else CAGE_CONF_OPTS += -Dxwayland=false From peter at korsgaard.com Mon Jan 24 16:28:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 17:28:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/samba4: add optional dependency to icu & libglib2 Message-ID: <20220124172947.9828282972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8e5a9c8cdac32c85e42ed305482a7cf4296c52f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x icu is used in lib/util/charset/ https://git.samba.org/samba.git/?p=samba.git;a=blob;f=lib/util/charset/wscript_configure;hb=HEAD#l40 libglib2 is used in source3/ https://git.samba.org/samba.git/?p=samba.git;a=blob;f=source3/wscript;hb=HEAD#l1778 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 1c4c68b8fbf471919fbbaf4e688a75c4de36a331) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index eb1f3b830e..de019e7afc 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -17,8 +17,10 @@ SAMBA4_DEPENDENCIES = \ host-e2fsprogs host-flex host-heimdal host-nfs-utils \ host-perl host-perl-parse-yapp host-python3 \ cmocka e2fsprogs gnutls popt zlib \ + $(if $(BR2_PACKAGE_ICU),icu) \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ + $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ $(if $(BR2_PACKAGE_READLINE),readline) \ $(TARGET_NLS_DEPENDENCIES) SAMBA4_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Mon Jan 24 17:28:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:28:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/coreutils: drop gl_cv_func_fstatat_zero_flag=no from config env Message-ID: <20220124172947.C4F9781051@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8021a9feca97e14f5143fc339930298ebf12de4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Configuring coreutils with gl_cv_func_fstatat_zero_flag=no results in non-functional lchmod library function which causes 'mkfifo -m' to always complete with the message 'cannot set permissions of ...: Invalid argument' and an error exit code. gl_cv_func_fstatat_zero_flag=no is not needed when building coreutils-9.0 for linux and its setting should be correctly determined by the configure script. Drop gl_cv_func_fstatat_zero_flag=no from the coreutils configure environment. For more details see https://lists.buildroot.org/pipermail/buildroot/2021-December/631388.html Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni (cherry picked from commit fef5d9fbda813668885f2df00d887cb39b4fc505) Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 9c0f46cb29..a31354ac5a 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -45,7 +45,6 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ gl_cv_func_getcwd_null=yes \ gl_cv_func_getcwd_path_max=yes \ gl_cv_func_gettimeofday_clobber=no \ - gl_cv_func_fstatat_zero_flag=no \ gl_cv_func_link_follows_symlink=no \ gl_cv_func_re_compile_pattern_working=yes \ gl_cv_func_svid_putenv=yes \ From peter at korsgaard.com Mon Jan 24 17:24:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:24:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tor: bump version to 0.4.6.9 Message-ID: <20220124172947.B2BC381051@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17be0de47cbaad0e27e16a834f7d90705b0aa488 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://forum.torproject.net/t/release-0-4-6-9-and-0-4-7-3-alpha/1265 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3477d7b1428f460fdf6a75a43604a021a74cf6fc) Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 4dabf777cb..63d47d7fa6 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a tor-0.4.6.8.tar.gz +sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 31e6211693..fc1db6da6b 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.8 +TOR_VERSION = 0.4.6.9 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Jan 24 17:26:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 24 Jan 2022 18:26:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: remove Ryan Barnett Message-ID: <20220124172947.BBBEE82DC2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a35749e6f93e7ff712dd3007efb2b7e8302468e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x His e-mail address is bouncing (and we have some private information that explains why): Ryan Barnett (ryan.barnett at collins.com) The recipient won't be able to receive this message because it's too large. The maximum message size that's allowed is 1 KB. This message is 7 KB. Signed-off-by: Thomas Petazzoni (cherry picked from commit 287601459e15c683feb9517092d8d50099b09915) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a9179fc154..de7d2c3fbf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2402,18 +2402,6 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ -N: Ryan Barnett -F: package/atftp/ -F: package/c-periphery/ -F: package/miraclecast/ -F: package/opkg/ -F: package/opkg-utils/ -F: package/python-pysnmp/ -F: package/python-pysnmp-mibs/ -F: package/python-tornado/ -F: package/resiprocate/ -F: package/websocketpp/ - N: Ryan Wilkins F: package/biosdevname/ From jborne at kalray.eu Mon Jan 24 17:35:21 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Mon, 24 Jan 2022 18:35:21 +0100 Subject: [Buildroot] [RFC PATCH 1/1] Fix binutils/libiberty target install directory. In-Reply-To: <20220124173521.2236-1-jborne@kalray.eu> References: <20220124173521.2236-1-jborne@kalray.eu> Message-ID: <20220124173521.2236-2-jborne@kalray.eu> Change libiberty target installation directory to $(TARGET_DIR). Signed-off-by: Jonathan Borne --- package/binutils/binutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 13f61be035..d2119e67cc 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -106,7 +106,7 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(TARGET_DIR) install endef endif -- 2.17.1 From jborne at kalray.eu Mon Jan 24 17:35:20 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Mon, 24 Jan 2022 18:35:20 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory Message-ID: <20220124173521.2236-1-jborne@kalray.eu> Hi, I stumbled upon a suspicious line in binutils.mk. In BINUTILS_INSTALL_TARGET_CMDS, libopcode and libbfd DESTDIR are both set to $(TARGET_DIR) and libiberty is the only one set to $(STAGING_DIR). Is there a reason behind this? Sorry if this is an obvious question, I am quite new to buildroot. I assume I am probably missing something. I though it was still better to ask... Thanks Best regards. Jonathan. Jonathan Borne(1): Fix binutils/libiberty target install directory. package/binutils/binutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 From baruch at tkos.co.il Mon Jan 24 17:44:29 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 24 Jan 2022 19:44:29 +0200 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <20220124173521.2236-1-jborne@kalray.eu> References: <20220124173521.2236-1-jborne@kalray.eu> Message-ID: <87k0ep9gbx.fsf@tarshish> Hi Jonathan, On Mon, Jan 24 2022, Jonathan Borne via buildroot wrote: > Hi, > I stumbled upon a suspicious line in binutils.mk. > > In BINUTILS_INSTALL_TARGET_CMDS, > libopcode and libbfd DESTDIR are both set to $(TARGET_DIR) > and libiberty is the only one set to $(STAGING_DIR). > > Is there a reason behind this? As I understand that's because libiberty is static only. Buildroot does not copy static libraries to $(TARGET_DIR) because they are only used at build time, but not at run-time. baruch > Sorry if this is an obvious question, I am quite new to buildroot. > I assume I am probably missing something. > I though it was still better to ask... > > Thanks > Best regards. > Jonathan. > > > Jonathan Borne(1): > Fix binutils/libiberty target install directory. > > package/binutils/binutils.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From romain.naour at smile.fr Mon Jan 24 18:12:10 2022 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 24 Jan 2022 19:12:10 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <87k0ep9gbx.fsf@tarshish> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> Message-ID: <10b5c0bb-03ca-605f-b1c7-2aac2a5aabff@smile.fr> Hello, Le 24/01/2022 ? 18:44, Baruch Siach via buildroot a ?crit?: > Hi Jonathan, > > On Mon, Jan 24 2022, Jonathan Borne via buildroot wrote: >> Hi, >> I stumbled upon a suspicious line in binutils.mk. >> >> In BINUTILS_INSTALL_TARGET_CMDS, >> libopcode and libbfd DESTDIR are both set to $(TARGET_DIR) >> and libiberty is the only one set to $(STAGING_DIR). >> >> Is there a reason behind this? > > As I understand that's because libiberty is static only. Buildroot does > not copy static libraries to $(TARGET_DIR) because they are only used at > build time, but not at run-time. Maybe we can just remove libiberty (static) from BINUTILS_INSTALL_TARGET_CMDS because it's already installed in staging by BINUTILS_INSTALL_STAGING_CMDS Best regards, Romain > > baruch > >> Sorry if this is an obvious question, I am quite new to buildroot. >> I assume I am probably missing something. >> I though it was still better to ask... >> >> Thanks >> Best regards. >> Jonathan. >> >> >> Jonathan Borne(1): >> Fix binutils/libiberty target install directory. >> >> package/binutils/binutils.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > From ju.o at free.fr Mon Jan 24 18:47:44 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 24 Jan 2022 19:47:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: <20220123205148.GH2502@scaer> References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> <20220119202351.GA3095239@scaer> <20220123205148.GH2502@scaer> Message-ID: <51028e4dcbbad93168992ae30a6f8330@free.fr> Hi Yann, All, On 23/01/2022 21:51, Yann E. MORIN wrote: > Julien, All, > > On 2022-01-23 21:03 +0100, Julien Olivain spake thusly: >> On 19/01/2022 21:23, Yann E. MORIN wrote: > [--SNIP--] >> >To be noted: riscv-isa-sim could also be configured with --without-boost >> >and the build succeeds. >> >Julien, do you know what ill-effect building without Boost would have? >> >> The absence of Boost is removing the "Command I/O via socket" feature >> of >> riscv-isa-sim (-s command line option). See: >> https://github.com/riscv-software-src/riscv-isa-sim/blob/v1.1.0/spike_main/spike.cc#L30 >> It's generally not needed in simple use-cases. > > Thanks for the feedback. :-) > > Indeed, if Boost is not a strict requirement, it would be nice to be > able to build without it... > >> My initial intent was to have host-riscv-isa-sim compiled without this >> Boost >> support. >> >> The upstream riscv-isa-sim detection of boost seems a bit peculiar and >> does >> not >> really honor >> --without-boost/--without-boost-regex/--without-boost-asio. >> >> Setting --without-boost alone on a system with boost will make the >> ./configure >> fail with: >> >> checking whether the Boost::ASIO library is available... yes >> configure: error: Could not find a version of the Boost::Asio >> library! >> >> Setting --without-boost --without-boost-regex --without-boost-asio >> will end >> up >> with a successful configuration/compilation, but with a binary linked >> with >> libboost_regex.so and libboost_system.so... >> >> I believe this part could be slightly improved before setting >> --without-boost >> in the BR recipe. I'll have a look into that. > > The problem, as you said, is that if Boost is available (either already > isntalled on the build machine, or host-boost is puleld in by another > package), configuring riscv-isa-sim with --without-boost still breaks > with the message you pasted above. > > But we can't guarantee that Boost (system or host-boost) is not > present. > > So, either we have a patch that fixes the Boost detection (and we push > that patch upstream), or we can only depend on host-boost and keep the > current status. I proposed a small upstream improvement of the boost detection here: https://github.com/riscv-software-src/riscv-isa-sim/pull/909 This should allow a clean host-riscv-isa-sim build in Buildroot using --without-boost is all situations (i.e. host has/hasn't boost, br host has/hasn't boost). Best regards, Julien. > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ > | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There > is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v > conspiracy. | > '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Mon Jan 24 19:56:34 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 24 Jan 2022 20:56:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluidsynth: bump to version 2.2.5 Message-ID: <20220124195634.522856-1-ju.o@free.fr> For change log since v2.2.4, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.5 Signed-off-by: Julien Olivain --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 4e544bc7f6..0d41c16d8d 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83cb1dba04c632ede74f0c0717018b062c0e00b639722203b23f77a961afd390 fluidsynth-2.2.4.tar.gz +sha256 9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8 fluidsynth-2.2.5.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 4ca8518ae0..b500944c16 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.2.4 +FLUIDSYNTH_VERSION = 2.2.5 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE -- 2.34.1 From ps.report at gmx.net Mon Jan 24 20:16:28 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 24 Jan 2022 21:16:28 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220124201628.11015-1-ps.report@gmx.net> For details see [1]. [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html Signed-off-by: Peter Seiderer --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index eafbe9254a..9c10a42dca 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz +sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf0fee409b..88d4984e2f 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 20:45:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 21:45:29 +0100 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <4a94b253-6fe7-5e79-b1e9-331b0a9051ca@baylibre.com> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> <20220122160914.7e4cc513@windsurf> <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> <4a94b253-6fe7-5e79-b1e9-331b0a9051ca@baylibre.com> Message-ID: <20220124214529.56b1bf5d@windsurf> Hello Neil, Thanks for the additional feedback. On Mon, 24 Jan 2022 14:41:49 +0100 Neil Armstrong wrote: > The binaries must be split into 2 categories: > - Pre-built: bl2, bl31, bl21, bl32, fip_create, aml_encrypt_*, ddr*.fw, acs_tool.py > - Built in the Vendor U-Boot source: acs.bin bl301.bin Right. > In 2019, Amlogic finally added a LICENSE for the pre-built binaries, before > nobody knew what was the term of the distribution. > > commit 6abaf9a869a6584b3cfca8b96d0946ed49bc9b64 > Author: Lawrence Mok > Date: Mon May 6 12:34:56 2019 -0700 > > add LICENSE file and text referring to it [1/1] > > Change-Id: Id291f42bec3ddb0c2162e6540ce1f35d1cb1d079 > > The LICENSE can be found at [1] in Khadas github. And this license is the one used at https://github.com/LibreELEC/amlogic-boot-fip which Vyacheslav wants to package in Buildroot, and this license is extremely restrictive. Basically, it says that excepts private use of the content of this repository, you can't do anything with it. > Concerning the acs.bin & bl301.bin, they use the U-Boot build system and > config header files and all these were also updated with the following SPDX: > /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ I don't really see what the license of the U-Boot build system and config headers has to do with the resulting license of the binaries. > commit 94de43d3d940cf75b4a9e4fd2a2715be8eff6138 > Author: Jiucheng Xu > Date: Wed Dec 16 10:11:00 2020 +0800 > > license: Fix the license of amlogic related codes [1/1] > > PD#SWPL-39001 > > Problem: > A customer want to add amlogic driver in uboot to > their private bootloader. Since the driver codes > are licensed under GPL-2.0, and customer have > to open their code, so we need fix the license > issue. > > Solution: > Fix the license of our related code in uboot by > adding MIT license > > Verify: > Franklin > > Change-Id: I2f3571e8720d1f4db069f882353d6ae050702cba > Signed-off-by: Jiucheng Xu > > Note, none of the vendor who publicly published the Amlogic U-Boot > source has this change, so we can consider acs.bin & bl301.bin > generated from GPL-2.0 as the commit explains. This is really a stretch. The question is which source files are compiled into acs.bin and bl301.bin ? If they use parts under the GPL-2.0, then indeed we can assume the whole is also under GPL-2.0, as it is the only license under which derivative works can be published. But the repository at https://github.com/LibreELEC/amlogic-boot-fip/ contains a lot more things than acs.bin and bl301.bin. > The pre-built binaries stored on the LibreELEC repository only comes from > public Vendor sources (Khadas, HardKernel, Libre Computer, FriendlyARM, Radxa) > and checked against vendor repositories we have access to. > > We assume they got permission from Amlogic to publicly redistribute these binaries > as we (BayLibre) were allowed to redistribute the VDEC firmware in [2] & [3]. If that's the case, then why does https://github.com/LibreELEC/amlogic-boot-fip has this LICENSE file with scary terms? I am really surprised by how unclear the licensing terms are for those blobs. This should scare pretty much any company from doing products based on Amlogic SoCs. Would it be possible to clarify this with Amlogic, and instead of their silly terms of "you can't do anything with it", have a license that at least allows distribution on Amlogic platforms? Again, thanks for your support on this! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ps.report at gmx.net Mon Jan 24 20:58:11 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 24 Jan 2022 21:58:11 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-interpipe: bump version to 1.1.8 Message-ID: <20220124205811.15913-1-ps.report@gmx.net> Changelog (since 1.1.7): 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element ddaa9b5 Add conditional build according to GST_VERSION_MINOR 730dea6 Bump project version 8718b12 Add initialization for the GstAppSinkCallbacks struct f015ff7 Remove redundant initialization of new_event callback 530da92 Update copyright year in README file e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct f0f3b8e Fix README copyright date to 2016-2022 814982e Merge branch 'hotfix/add-new-event-callback' Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 348abdb003..d9f09d2985 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 0fd29d3cba623163dd5852989d7ca21eee9033da9d14a467ccd5e527e3b4297b gst1-interpipe-1.1.7-br1.tar.gz +sha256 b97af0dfa108c5f736a961c388267c7a9c8f915e753985d7e85939091032deed gst1-interpipe-v1.1.8-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index fa4485e6f8..cec23e7fa7 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.7 +GST1_INTERPIPE_VERSION = v1.1.8 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 21:02:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:02:38 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <87k0ep9gbx.fsf@tarshish> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> Message-ID: <20220124220238.1fa0568b@windsurf> On Mon, 24 Jan 2022 19:44:29 +0200 Baruch Siach via buildroot wrote: > > Is there a reason behind this? > > As I understand that's because libiberty is static only. Buildroot does > not copy static libraries to $(TARGET_DIR) because they are only used at > build time, but not at run-time. True, but it doesn't make sense to do that in BINUTILS_INSTALL_TARGET_CMDS. It should go in BINUTILS_INSTALL_STAGING_CMDS, where it is already present, as Romain pointed out. So basically: $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install needs to be dropped from BINUTILS_INSTALL_TARGET_CMDS, if indeed libiberty is only installed as a static library. However, taking a step back: # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging define BINUTILS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef # If we don't want full binutils on target ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif This is *extremely* suspicious. Indeed, we get the libraries unconditionally installed in staging, so any other library or program that we build after binutils can potentially link against thosze libraries. But we only install them conditionally in $(TARGET_DIR) if BR2_PACKAGE_BINUTILS_TARGET=y. This seems very bad to me. Both target and staging installations should be done under the same condition. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:03:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:03:09 +0100 Subject: [Buildroot] [git commit] package/libev: bump to version 4.33 Message-ID: <20220124205624.B2A8D822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3edc9055c2098de37d4365a20fe278deaa0cebb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/xorangekiller/libev-git/blob/rel-4_33/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libev/libev.hash | 4 ++-- package/libev/libev.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libev/libev.hash b/package/libev/libev.hash index 9ab341dedd..a849f3f39a 100644 --- a/package/libev/libev.hash +++ b/package/libev/libev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e libev-4.27.tar.gz -sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE +sha256 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea libev-4.33.tar.gz +sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 38b0530f62..9f3c19d46c 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEV_VERSION = 4.27 +LIBEV_VERSION = 4.33 LIBEV_SITE = http://dist.schmorp.de/libev/Attic LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Jan 24 20:58:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 21:58:58 +0100 Subject: [Buildroot] [git commit] package/xml-security-c: bump to version 2.0.4 Message-ID: <20220124205624.AA7E1822E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27d08083ed4db5bd055219574cc602aaf8053a49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Version 2.0.4 of the Apache XML Security for C++ has been released, correcting support for OpenSSL earlier than 1.1. Version 2.0.3 of the Apache XML Security for C++ has been released, adding support for OpenSSL 3.0.0. Drop patch (already in version) and so autoreconf https://santuario.apache.org/cindex.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...onf-variable-cache-option-for-getcwd-test.patch | 50 ---------------------- package/xml-security-c/xml-security-c.hash | 4 +- package/xml-security-c/xml-security-c.mk | 5 +-- 3 files changed, 3 insertions(+), 56 deletions(-) diff --git a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch b/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch deleted file mode 100644 index 26b53ba719..0000000000 --- a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9d14fad412a497fe83cfc6ab594ddc612512f02a Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Thu, 4 Jun 2020 20:34:11 -0500 -Subject: [PATCH] autoconf variable cache option for getcwd test - -The cached variable allows cross compiled builds to successfully set the -desired default for this value without invoking a test. - -Fixes: -https://issues.apache.org/jira/browse/SANTUARIO-549 - -Signed-off-by: Matthew Weber ---- - configure.ac | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b43d7a5..c3d4489 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,14 +74,18 @@ AC_CHECK_FUNCS([strcasecmp]) - - # Check whether getcwd can dynamically allocate memory. - AC_MSG_CHECKING([whether getcwd(NULL, 0) works]) --AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -- #include ], --[char *cwd = getcwd(NULL, 0); --return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])], -- [AC_MSG_RESULT(yes) -- AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], -- [Define to 1 if getcwd(NULL, 0) works])], -- [AC_MSG_RESULT(no)]) -+AC_CACHE_VAL([xml_cv_func_getcwd_null], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include -+ #include -+ char *cwd = getcwd(NULL, 0); -+ return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;]])], -+ [xml_cv_func_getcwd_null=yes], -+ [xml_cv_func_getcwd_null=no])]) -+AC_MSG_RESULT([$xml_cv_func_getcwd_null]) -+if test $xml_cv_func_getcwd_null = yes; then -+AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], -+ [Define to 1 if getcwd(NULL, 0) works]) -+fi - - AC_LANG(C++) - --- -2.17.1 - diff --git a/package/xml-security-c/xml-security-c.hash b/package/xml-security-c/xml-security-c.hash index d91ed86e9c..f4b7041a63 100644 --- a/package/xml-security-c/xml-security-c.hash +++ b/package/xml-security-c/xml-security-c.hash @@ -1,3 +1,3 @@ -# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.2.tar.gz.sha256 -sha256 c303a2b08cb9ca0f5594adcbb83829b1e793175d7114a82f7d78def8bb2e30df xml-security-c-2.0.2.tar.gz +# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.4.tar.gz.sha256 +sha256 a78da6720f6c2ba14100d2426131e0d33eac5a2dba5cc11bdd04974b7eb89003 xml-security-c-2.0.4.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/xml-security-c/xml-security-c.mk b/package/xml-security-c/xml-security-c.mk index fe761819ee..fda9af4798 100644 --- a/package/xml-security-c/xml-security-c.mk +++ b/package/xml-security-c/xml-security-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -XML_SECURITY_C_VERSION = 2.0.2 +XML_SECURITY_C_VERSION = 2.0.4 XML_SECURITY_C_SITE = http://archive.apache.org/dist/santuario/c-library XML_SECURITY_C_LICENSE = Apache-2.0 XML_SECURITY_C_LICENSE_FILES = LICENSE.txt @@ -15,7 +15,4 @@ XML_SECURITY_C_CONF_ENV = \ xml_cv_func_getcwd_null=yes \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -# Patched configure.ac -XML_SECURITY_C_AUTORECONF = YES - $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Jan 24 21:03:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:03:33 +0100 Subject: [Buildroot] [git commit] package/vte: needs gcc >= 10 Message-ID: <20220124205648.A11B2822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63245fcf9bc801facd7b4775cc4ae9d31c3c8e24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master vte needs C++20 since https://gitlab.gnome.org/GNOME/vte/-/commit/eec33cce0b9359fddda35703e22bffd1f8f28852 to avoid the following build failure raised since bump to version 0.66.2 in commit 53c0c7dd01228122c7ceb44d65f2800dbcf473f1: ../output-1/build/vte-0.66.2/meson.build:144:0: ERROR: Assert failed: option -std=gnu++20 not supported by gcc Fixes: - http://autobuild.buildroot.org/results/c0d1adeffbf97805a0f669d01929a56ccc66a835 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/vte/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vte/Config.in b/package/vte/Config.in index 2635a6007c..45d627885f 100644 --- a/package/vte/Config.in +++ b/package/vte/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_VTE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ @@ -22,13 +22,13 @@ config BR2_PACKAGE_VTE http://github.com/GNOME/vte -comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 10" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ BR2_TOOLCHAIN_USES_MUSL comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend" From thomas.petazzoni at bootlin.com Mon Jan 24 21:03:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:03:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/libev: bump to version 4.33 In-Reply-To: <20220123212916.782418-1-fontaine.fabrice@gmail.com> References: <20220123212916.782418-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220347.60f82184@windsurf> On Sun, 23 Jan 2022 22:29:16 +0100 Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://github.com/xorangekiller/libev-git/blob/rel-4_33/Changes > > Signed-off-by: Fabrice Fontaine > --- > package/libev/libev.hash | 4 ++-- > package/libev/libev.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:03:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:03:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/vte: needs gcc >= 10 In-Reply-To: <20220123214548.783629-1-fontaine.fabrice@gmail.com> References: <20220123214548.783629-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220354.724aab7e@windsurf> On Sun, 23 Jan 2022 22:45:48 +0100 Fabrice Fontaine wrote: > vte needs C++20 since > https://gitlab.gnome.org/GNOME/vte/-/commit/eec33cce0b9359fddda35703e22bffd1f8f28852 > to avoid the following build failure raised since bump to version 0.66.2 > in commit 53c0c7dd01228122c7ceb44d65f2800dbcf473f1: > > ../output-1/build/vte-0.66.2/meson.build:144:0: ERROR: Assert failed: option -std=gnu++20 not supported by gcc > > Fixes: > - http://autobuild.buildroot.org/results/c0d1adeffbf97805a0f669d01929a56ccc66a835 > > Signed-off-by: Fabrice Fontaine > --- > package/vte/Config.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:05:21 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:05:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml: add TINYXML_CPE_ID_VENDOR In-Reply-To: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> References: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220521.14758457@windsurf> On Mon, 24 Jan 2022 18:23:21 +0100 Fabrice Fontaine wrote: > cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml > > Signed-off-by: Fabrice Fontaine > --- > package/tinyxml/tinyxml.mk | 1 + > 1 file changed, 1 insertion(+) Both applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:05:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:05:00 +0100 Subject: [Buildroot] [git commit] package/tinyxml: fix CVE-2021-42260 Message-ID: <20220124205911.49458822C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b23ef210299ca7f0eedf8fc898b0e5a0f3578293 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by a crafted XML message and leads to a denial of service. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...tamp-always-advance-the-pointer-if-p-0xef.patch | 37 ++++++++++++++++++++++ package/tinyxml/tinyxml.mk | 3 ++ 2 files changed, 40 insertions(+) diff --git a/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch new file mode 100644 index 0000000000..ea0f6476c8 --- /dev/null +++ b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch @@ -0,0 +1,37 @@ +From f7ca0035d17a663f55668e662b840afce7b86112 Mon Sep 17 00:00:00 2001 +From: Christian Voegl +Date: Wed, 27 Oct 2021 11:25:18 +0200 +Subject: [PATCH] In stamp always advance the pointer if *p= 0xef + +The current implementation only advanced if 0xef is followed +by two non-zero bytes. In case of malformed input (0xef should be +the start byte of a three byte character) this leads to an infinite +loop. (CVE-2021-42260) + +[Retrieved (and backported) from: +https://sourceforge.net/p/tinyxml/git/merge-requests/1] +Signed-off-by: Fabrice Fontaine +--- + tinyxmlparser.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 81b7eae..8aa0dfa 100755 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding ) + else + { p +=3; ++col; } // A normal character. + } ++ else ++ { ++ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so ++ // there is something wrong here. Just advance the pointer to evade infinite loops ++ ++p; ++ } + } + else + { +-- +2.34.1 + diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index b8b8e43c05..d173254e31 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -14,4 +14,7 @@ TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README TINYXML_CPE_ID_VENDOT = tinyxml_project +# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch +TINYXML_IGNORE_CVES += CVE-2021-42260 + $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Jan 24 21:04:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:04:50 +0100 Subject: [Buildroot] [git commit] package/tinyxml: add TINYXML_CPE_ID_VENDOR Message-ID: <20220124205911.3E650812D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e46157821f0ad4107e8ddcf039661e9ac189609 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinyxml/tinyxml.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 15280517ac..b8b8e43c05 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,5 +12,6 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README +TINYXML_CPE_ID_VENDOT = tinyxml_project $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Jan 24 21:05:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:05:54 +0100 Subject: [Buildroot] [git commit] package/xvisor: bump to version 0.3.1 Message-ID: <20220124205911.53065822F6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4f8b8968770ecbf6444a5921c6472f126717626 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop first patch (already in version) - Send second patch upstream http://xhypervisor.org/index.php?page=news/20211220 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xvisor/0001-fix-build-with-gcc-10.patch | 64 ---------------------- ...001-psmouse-back.c-fix-build-with-gcc-11.patch} | 1 + package/xvisor/xvisor.hash | 2 +- package/xvisor/xvisor.mk | 2 +- 4 files changed, 3 insertions(+), 66 deletions(-) diff --git a/package/xvisor/0001-fix-build-with-gcc-10.patch b/package/xvisor/0001-fix-build-with-gcc-10.patch deleted file mode 100644 index a538558d86..0000000000 --- a/package/xvisor/0001-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 6 Oct 2020 21:52:20 +0200 -Subject: [PATCH] fix build with gcc 10 - -Define variables in header files as extern to avoid the following build failure -with gcc 10 (which defaults to -fno-common): - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld: -/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: -multiple definition of `sdio_func_type'; -/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: -first defined here - -Fixes: - - http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/xvisor/xvisor/pull/125] ---- - drivers/mmc/core/core.h | 2 +- - emulators/display/drawfn.h | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h -index d75d135a..e2ca3141 100644 ---- a/drivers/mmc/core/core.h -+++ b/drivers/mmc/core/core.h -@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host); - * Note: Must be called with host->lock held. - */ - extern struct vmm_bus sdio_bus_type; --struct vmm_device_type sdio_func_type; -+extern struct vmm_device_type sdio_func_type; - - int __sdio_attach(struct mmc_host *host); - -diff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h -index f9163cff..385deaf6 100644 ---- a/emulators/display/drawfn.h -+++ b/emulators/display/drawfn.h -@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *, - DRAWFN_ORDER_MAX * \ - DRAWFN_FORMAT_MAX) - --drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; - --drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; -+extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; - - #endif --- -2.28.0 - diff --git a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch similarity index 98% rename from package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch rename to package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch index 28010034d6..1c02f45c9d 100644 --- a/package/xvisor/0002-psmouse-back.c-fix-build-with-gcc-11.patch +++ b/package/xvisor/0001-psmouse-back.c-fix-build-with-gcc-11.patch @@ -17,6 +17,7 @@ Fixes: - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295 Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xvisor/xvisor/pull/139] --- drivers/input/mouse/alps.h | 4 ++-- drivers/input/mouse/lifebook.h | 6 +++--- diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash index 6938e20e7b..45b6fec49c 100644 --- a/package/xvisor/xvisor.hash +++ b/package/xvisor/xvisor.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 81660d26a0bc63979ba40872f10511df777185712eba2d0e19e816438388de05 xvisor-0.3.0.tar.xz +sha256 b1bb2ca09340e87a2f465c65196892cdd0f59b798794ae69e35d1f883cf9ba49 xvisor-0.3.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 394ff7c80b..dc49258400 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XVISOR_VERSION = 0.3.0 +XVISOR_VERSION = 0.3.1 XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:08 +0100 Subject: [Buildroot] [git commit] package/lvm2: bump to version 2.03.14 Message-ID: <20220124205922.D6861822C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fb9b70238e8aec99e44f531b99a7e71f2822b94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/lvmteam/lvm2/blob/v2_03_14/WHATS_NEW Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lvm2/lvm2.hash | 6 +++--- package/lvm2/lvm2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 1260669480..c52eaee1e1 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From http://sources.redhat.com/pub/lvm2/sha512.sum -sha512 e4d3bfb38b346251a2ea2cee7b79f2e12ed407652b659b35b65f58c8bb252943cee1c511713aeec8ff3400790e0e99ea6b83e8740050defe5cbb118f18bf7700 LVM2.2.03.12.tgz +sha512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d LVM2.2.03.14.tgz # Locally computed sha256 checksums -sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB +sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index a5724328ff..89fdf2c1be 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.12 +LVM2_VERSION = 2.03.14 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = http://sources.redhat.com/pub/lvm2 LVM2_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/xvisor: bump to version 0.3.1 In-Reply-To: <20220124172520.2302603-1-fontaine.fabrice@gmail.com> References: <20220124172520.2302603-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220624.0fabcad6@windsurf> On Mon, 24 Jan 2022 18:25:20 +0100 Fabrice Fontaine wrote: > - Drop first patch (already in version) > - Send second patch upstream > > http://xhypervisor.org/index.php?page=news/20211220 > > Signed-off-by: Fabrice Fontaine > --- > .../xvisor/0001-fix-build-with-gcc-10.patch | 64 ------------------- > ...smouse-back.c-fix-build-with-gcc-11.patch} | 1 + > package/xvisor/xvisor.hash | 2 +- > package/xvisor/xvisor.mk | 2 +- > 4 files changed, 3 insertions(+), 66 deletions(-) > delete mode 100644 package/xvisor/0001-fix-build-with-gcc-10.patch > rename package/xvisor/{0002-psmouse-back.c-fix-build-with-gcc-11.patch => 0001-psmouse-back.c-fix-build-with-gcc-11.patch} (98%) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:36 +0100 Subject: [Buildroot] [git commit] package/fluidsynth: bump to version 2.2.5 Message-ID: <20220124205950.C2ED380FD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=506ad7f7e3b81f2ef509923f364fac9f4a922c1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log since v2.2.4, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.5 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 4e544bc7f6..0d41c16d8d 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83cb1dba04c632ede74f0c0717018b062c0e00b639722203b23f77a961afd390 fluidsynth-2.2.4.tar.gz +sha256 9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8 fluidsynth-2.2.5.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 4ca8518ae0..b500944c16 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.2.4 +FLUIDSYNTH_VERSION = 2.2.5 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/fluidsynth: bump to version 2.2.5 In-Reply-To: <20220124195634.522856-1-ju.o@free.fr> References: <20220124195634.522856-1-ju.o@free.fr> Message-ID: <20220124220647.0156c7cb@windsurf> On Mon, 24 Jan 2022 20:56:34 +0100 Julien Olivain wrote: > For change log since v2.2.4, see: > - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.5 > > Signed-off-by: Julien Olivain > --- > package/fluidsynth/fluidsynth.hash | 2 +- > package/fluidsynth/fluidsynth.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:54 +0100 Subject: [Buildroot] [git commit] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220124210009.20B1C822F6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12dcad48f6bce89adfc9462120b68fcc89b4c615 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index eafbe9254a..9c10a42dca 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz +sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf0fee409b..88d4984e2f 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From thomas.petazzoni at bootlin.com Mon Jan 24 21:07:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:07:07 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: <20220124201628.11015-1-ps.report@gmx.net> References: <20220124201628.11015-1-ps.report@gmx.net> Message-ID: <20220124220707.688fee47@windsurf> On Mon, 24 Jan 2022 21:16:28 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html > > Signed-off-by: Peter Seiderer > --- > package/util-linux/util-linux.hash | 2 +- > package/util-linux/util-linux.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:02:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:02:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/xml-security-c: bump to version 2.0.4 In-Reply-To: <20220123212757.781999-1-fontaine.fabrice@gmail.com> References: <20220123212757.781999-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220251.65336d07@windsurf> On Sun, 23 Jan 2022 22:27:57 +0100 Fabrice Fontaine wrote: > Version 2.0.4 of the Apache XML Security for C++ has been released, > correcting support for OpenSSL earlier than 1.1. > > Version 2.0.3 of the Apache XML Security for C++ has been released, > adding support for OpenSSL 3.0.0. > > Drop patch (already in version) and so autoreconf > > https://santuario.apache.org/cindex.html > > Signed-off-by: Fabrice Fontaine > --- > ...ariable-cache-option-for-getcwd-test.patch | 50 ------------------- > package/xml-security-c/xml-security-c.hash | 4 +- > package/xml-security-c/xml-security-c.mk | 5 +- > 3 files changed, 3 insertions(+), 56 deletions(-) > delete mode 100644 package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:06:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:06:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: bump to version 2.03.14 In-Reply-To: <20220124172623.2303019-1-fontaine.fabrice@gmail.com> References: <20220124172623.2303019-1-fontaine.fabrice@gmail.com> Message-ID: <20220124220630.0f3cde77@windsurf> On Mon, 24 Jan 2022 18:26:23 +0100 Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://github.com/lvmteam/lvm2/blob/v2_03_14/WHATS_NEW > > Signed-off-by: Fabrice Fontaine > --- > package/lvm2/lvm2.hash | 6 +++--- > package/lvm2/lvm2.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:15:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:15:40 +0100 Subject: [Buildroot] [git commit] package/gst1-interpipe: bump version to 1.1.8 Message-ID: <20220124210854.D79E8818C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0872ac72b79439a0106768ae2b58e824e1f316da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog (since 1.1.7): 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element ddaa9b5 Add conditional build according to GST_VERSION_MINOR 730dea6 Bump project version 8718b12 Add initialization for the GstAppSinkCallbacks struct f015ff7 Remove redundant initialization of new_event callback 530da92 Update copyright year in README file e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct f0f3b8e Fix README copyright date to 2016-2022 814982e Merge branch 'hotfix/add-new-event-callback' Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 348abdb003..d9f09d2985 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 0fd29d3cba623163dd5852989d7ca21eee9033da9d14a467ccd5e527e3b4297b gst1-interpipe-1.1.7-br1.tar.gz +sha256 b97af0dfa108c5f736a961c388267c7a9c8f915e753985d7e85939091032deed gst1-interpipe-v1.1.8-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index fa4485e6f8..cec23e7fa7 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.7 +GST1_INTERPIPE_VERSION = v1.1.8 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module From thomas.petazzoni at bootlin.com Mon Jan 24 21:15:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:15:51 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-interpipe: bump version to 1.1.8 In-Reply-To: <20220124205811.15913-1-ps.report@gmx.net> References: <20220124205811.15913-1-ps.report@gmx.net> Message-ID: <20220124221551.692f4d3f@windsurf> On Mon, 24 Jan 2022 21:58:11 +0100 Peter Seiderer wrote: > Changelog (since 1.1.7): > > 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element > ddaa9b5 Add conditional build according to GST_VERSION_MINOR > 730dea6 Bump project version > 8718b12 Add initialization for the GstAppSinkCallbacks struct > f015ff7 Remove redundant initialization of new_event callback > 530da92 Update copyright year in README file > e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct > f0f3b8e Fix README copyright date to 2016-2022 > 814982e Merge branch 'hotfix/add-new-event-callback' > > Signed-off-by: Peter Seiderer > --- > package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- > package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Jan 24 21:16:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:16:14 +0100 Subject: [Buildroot] [git commit] package/sqlite: bump to version 3.37.2 Message-ID: <20220124210929.9D252822DD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b9d6162a633daaf8a3f0e01ff67a81c3ef0e051 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 604275ebfb..deb8d4c14c 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e sqlite-autoconf-3370100.tar.gz +sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 59b76ce164..b702139f6c 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,10 +4,10 @@ # ################################################################################ -SQLITE_VERSION = 3.37.1 -SQLITE_TAR_VERSION = 3370100 +SQLITE_VERSION = 3.37.2 +SQLITE_TAR_VERSION = 3370200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2021 +SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite From thomas.petazzoni at bootlin.com Mon Jan 24 21:16:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:16:20 +0100 Subject: [Buildroot] [PATCH] package/sqlite: bump to version 3.37.2 In-Reply-To: <20220124165539.778030-1-francois.perrad@gadz.org> References: <20220124165539.778030-1-francois.perrad@gadz.org> Message-ID: <20220124221620.0f5f0cb0@windsurf> On Mon, 24 Jan 2022 17:55:39 +0100 Francois Perrad wrote: > Signed-off-by: Francois Perrad > --- > package/sqlite/sqlite.hash | 2 +- > package/sqlite/sqlite.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Jan 24 21:21:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 24 Jan 2022 22:21:49 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <20220124220238.1fa0568b@windsurf> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> Message-ID: <20220124212149.GJ2502@scaer> Thomas, All, On 2022-01-24 22:02 +0100, Thomas Petazzoni spake thusly: > On Mon, 24 Jan 2022 19:44:29 +0200 > Baruch Siach via buildroot wrote: > > > > Is there a reason behind this? > > > > As I understand that's because libiberty is static only. Buildroot does > > not copy static libraries to $(TARGET_DIR) because they are only used at > > build time, but not at run-time. > > True, but it doesn't make sense to do that in > BINUTILS_INSTALL_TARGET_CMDS. It should go in > BINUTILS_INSTALL_STAGING_CMDS, where it is already present, as Romain > pointed out. > > So basically: > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > needs to be dropped from BINUTILS_INSTALL_TARGET_CMDS, if indeed > libiberty is only installed as a static library. > > However, taking a step back: > > # We just want libbfd, libiberty and libopcodes, > # not the full-blown binutils in staging > define BINUTILS_INSTALL_STAGING_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > endef > > # If we don't want full binutils on target > ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > define BINUTILS_INSTALL_TARGET_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > endef > endif > > This is *extremely* suspicious. Indeed, we get the libraries > unconditionally installed in staging, so any other library or program > that we build after binutils can potentially link against thosze > libraries. > > But we only install them conditionally in $(TARGET_DIR) if > BR2_PACKAGE_BINUTILS_TARGET=y. > > This seems very bad to me. Both target and staging installations should > be done under the same condition. Not really. You missed the fact that binutils is an autotools package. As such, when BR2_PACKAGE_BINUTILS_TARGET=n, then the full binutils are instaleld in target, so the libs will be installed in target. So whatever gets in staging is present in target, but target can be a superset of what is in staging, so whatever links to a binutils lib from staging will find it in target. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 24 21:23:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 24 Jan 2022 22:23:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: set --with-boost In-Reply-To: <51028e4dcbbad93168992ae30a6f8330@free.fr> References: <20220115160449.2292472-1-fontaine.fabrice@gmail.com> <20220119202351.GA3095239@scaer> <20220123205148.GH2502@scaer> <51028e4dcbbad93168992ae30a6f8330@free.fr> Message-ID: <20220124212358.GK2502@scaer> Julien, All, On 2022-01-24 19:47 +0100, Julien Olivain spake thusly: > On 23/01/2022 21:51, Yann E. MORIN wrote: [--SNIP--] > >So, either we have a patch that fixes the Boost detection (and we push > >that patch upstream), or we can only depend on host-boost and keep the > >current status. > > I proposed a small upstream improvement of the boost detection here: > https://github.com/riscv-software-src/riscv-isa-sim/pull/909 > > This should allow a clean host-riscv-isa-sim build in Buildroot using > --without-boost is all situations (i.e. host has/hasn't boost, br host > has/hasn't boost). Thanks for the heads up. It looks like upstream has been positive about that patch of yours, great! :-) When they actually merge it, do not hesitate to send an update to buildroot to backport that patch. Thanks! Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From angelo at amarulasolutions.com Mon Jan 24 21:34:20 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 24 Jan 2022 22:34:20 +0100 Subject: [Buildroot] [PATCH v2] package/htpdate: bump to version 1.3.3 Message-ID: <20220124213420.1171861-1-angelo@amarulasolutions.com> Bump and update project to its new location. Signed-off-by: Angelo Compagnucci --- * Rebased on master * Keeping buildroot package init scripts package/htpdate/S43htpdate | 2 +- package/htpdate/htpdate.hash | 2 +- package/htpdate/htpdate.mk | 6 +++--- package/htpdate/htpdate.service | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate index 75f9a995ff..5971d70639 100644 --- a/package/htpdate/S43htpdate +++ b/package/htpdate/S43htpdate @@ -9,7 +9,7 @@ test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" \ -- -D -i "$PIDFILE" $HTPDATE_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index 824266c1bc..ef27f8f94c 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 52022346a9..200c3207a2 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,13 +4,13 @@ # ################################################################################ -HTPDATE_VERSION = 1.2.6 -HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) +HTPDATE_VERSION = 1.3.3 +HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 +HTPDATE_BUILD_OPTS = https HTPDATE_DEPENDENCIES += openssl host-pkgconf endif diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service index b7f1371b08..95220581d4 100644 --- a/package/htpdate/htpdate.service +++ b/package/htpdate/htpdate.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/run/htpdate.pid Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" EnvironmentFile=-/etc/default/htpdate -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS +ExecStart=/usr/sbin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS [Install] WantedBy=multi-user.target -- 2.25.1 From fontaine.fabrice at gmail.com Mon Jan 24 21:34:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 22:34:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/poppler: fix introspection build Message-ID: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since commit 9d1d4818c39d97ad7a1cdf6e075b9acae6dfff71: [ 98%] Generating Poppler-0.18.typelib Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e Signed-off-by: Fabrice Fontaine --- ...txt-allow-the-user-to-configure-INTR.patch | 43 +++++++++++++++++++ package/poppler/poppler.mk | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch diff --git a/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch new file mode 100644 index 0000000000..473966d7c9 --- /dev/null +++ b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch @@ -0,0 +1,43 @@ +From f9e5d423b0f765f2393a95c3299a2d827b9d3fb3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 24 Jan 2022 09:28:20 +0100 +Subject: [PATCH] glib/CMakeLists.txt: allow the user to configure + INTROSPECTION_COMPILER_ARGS + +Allow the user to add its own parameters such as +--includedir=$(STAGING_DIR)/usr/share/gir-1.0 to +INTROSPECTION_COMPILER_ARGS to avoid the following build failure when +cross-compiling with buildroot: + +[ 98%] Generating Poppler-0.18.typelib +Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + +Fixes: + - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1049] +--- + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 7510e69e..f5130e3c 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -119,7 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) + # General gir: Reset object-list for introspection & load tool args + set(INTROSPECTION_GIRS) + set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all") +- set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") ++ set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") + + # Poppler: Assign package to gir & export keys + set(Poppler_0_18_gir "poppler-glib") +-- +2.34.1 + diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 9e9bfc9cba..7062923c6c 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -44,7 +44,9 @@ endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) POPPLER_DEPENDENCIES += gobject-introspection -POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=ON +POPPLER_CONF_OPTS += \ + -DENABLE_GOBJECT_INTROSPECTION=ON \ + -DINTROSPECTION_COMPILER_ARGS="--includedir=$(STAGING_DIR)/usr/share/gir-1.0" else POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF endif -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 24 21:36:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 22:36:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/sslh: fix build with gcc 4.8 Message-ID: <20220124213631.2444354-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.22c in commit 5b9c58531e97b012a8a11c6ae5145b16dcfb8f74: sslh-select.c: In function 'udp_timeouts': sslh-select.c:480:5: error: 'for' loop initial declarations are only allowed in C99 mode for (int i = 0; i < fd_info->max_fd; i++) { ^ Fixes: - http://autobuild.buildroot.org/results/aaaac2beb16730747b4265e81d09cb5e072c7267 Signed-off-by: Fabrice Fontaine --- package/sslh/sslh.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 99fb6bf922..897b3b6505 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -11,7 +11,7 @@ SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING SSLH_DEPENDENCIES = pcre2 -SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) +SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" ifeq ($(BR2_PACKAGE_LIBBSD),y) SSLH_DEPENDENCIES += libbsd -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 21:53:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 24 Jan 2022 22:53:56 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <20220124212149.GJ2502@scaer> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> <20220124212149.GJ2502@scaer> Message-ID: <20220124225356.03c1c658@windsurf> On Mon, 24 Jan 2022 22:21:49 +0100 "Yann E. MORIN" wrote: > > # We just want libbfd, libiberty and libopcodes, > > # not the full-blown binutils in staging > > define BINUTILS_INSTALL_STAGING_CMDS > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > endef > > > > # If we don't want full binutils on target > > ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > > define BINUTILS_INSTALL_TARGET_CMDS > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > endef > > endif > > > > This is *extremely* suspicious. Indeed, we get the libraries > > unconditionally installed in staging, so any other library or program > > that we build after binutils can potentially link against thosze > > libraries. > > > > But we only install them conditionally in $(TARGET_DIR) if > > BR2_PACKAGE_BINUTILS_TARGET=y. > > > > This seems very bad to me. Both target and staging installations should > > be done under the same condition. > > Not really. You missed the fact that binutils is an autotools package. > > As such, when BR2_PACKAGE_BINUTILS_TARGET=n, then the full binutils are > instaleld in target, so the libs will be installed in target. Aah, indeed, the condition is: ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > So whatever gets in staging is present in target, but target can be a > superset of what is in staging, so whatever links to a binutils lib from > staging will find it in target. Correct! Thanks for pointing me at my own mistake :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From angelo at amarulasolutions.com Mon Jan 24 21:59:04 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 24 Jan 2022 22:59:04 +0100 Subject: [Buildroot] [PATCH v3] package/htpdate: bump to version 1.3.3 Message-ID: <20220124215904.1200436-1-angelo@amarulasolutions.com> Bump and update project to its new location. Signed-off-by: Angelo Compagnucci --- v1->v2: * Rebased on master * Keeping buildroot package init scripts v2->v3: * Updating LICENSE hash package/htpdate/S43htpdate | 2 +- package/htpdate/htpdate.hash | 4 ++-- package/htpdate/htpdate.mk | 6 +++--- package/htpdate/htpdate.service | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate index 75f9a995ff..5971d70639 100644 --- a/package/htpdate/S43htpdate +++ b/package/htpdate/S43htpdate @@ -9,7 +9,7 @@ test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" \ -- -D -i "$PIDFILE" $HTPDATE_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index 824266c1bc..6876f2da51 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz -sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz +sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 52022346a9..200c3207a2 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,13 +4,13 @@ # ################################################################################ -HTPDATE_VERSION = 1.2.6 -HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) +HTPDATE_VERSION = 1.3.3 +HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 +HTPDATE_BUILD_OPTS = https HTPDATE_DEPENDENCIES += openssl host-pkgconf endif diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service index b7f1371b08..95220581d4 100644 --- a/package/htpdate/htpdate.service +++ b/package/htpdate/htpdate.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/run/htpdate.pid Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" EnvironmentFile=-/etc/default/htpdate -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS +ExecStart=/usr/sbin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS [Install] WantedBy=multi-user.target -- 2.25.1 From fontaine.fabrice at gmail.com Mon Jan 24 22:10:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 23:10:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump to version 0.103.5 Message-ID: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> ClamAV 0.103.5 is a critical patch release with the following fix: - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the clamscan --gen-json option) is enabled. https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md Signed-off-by: Fabrice Fontaine --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index d68b04af76..73f4ff88f1 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz +sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 94b589b975..cd2d06e6b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.4 +CLAMAV_VERSION = 0.103.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 24 22:16:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 23:16:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: bump to version 1.6.9 Message-ID: <20220124221657.2629467-1-fontaine.fabrice@gmail.com> Drop patches (already in version) and so autoreconf https://github.com/chu11/freeipmi-mirror/blob/freeipmi-1-6-9/NEWS Signed-off-by: Fabrice Fontaine --- package/freeipmi/0001-fix-build-on-musl.patch | 49 ------------------ .../0002-check-for-inb-and-outb.patch | 50 ------------------- ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 ------------------- package/freeipmi/freeipmi.hash | 2 +- package/freeipmi/freeipmi.mk | 4 +- 5 files changed, 2 insertions(+), 153 deletions(-) delete mode 100644 package/freeipmi/0001-fix-build-on-musl.patch delete mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch delete mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch diff --git a/package/freeipmi/0001-fix-build-on-musl.patch b/package/freeipmi/0001-fix-build-on-musl.patch deleted file mode 100644 index ff7425d221..0000000000 --- a/package/freeipmi/0001-fix-build-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 Oct 2021 00:26:40 +0200 -Subject: [PATCH] fix build on musl - -musl doesn't provide getmsg or putmsg even if stropts.h is available - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2] ---- - configure.ac | 1 + - libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 562dd624e..711b27674 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) - AC_CHECK_FUNCS([iopl]) - AC_CHECK_FUNCS([asprintf]) - AC_CHECK_FUNCS([cbrt]) -+AC_CHECK_FUNCS([getmsg putmsg]) - - dnl sighandler_t apparently not defined in Apple/OS X - AC_CHECK_TYPES([sighandler_t], [], [], [[#include ]]) -diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c -index 05caca8b6..4ae8c5719 100644 ---- a/libfreeipmi/driver/ipmi-sunbmc-driver.c -+++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c -@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx, - assert (ctx->io_init); - assert (ctx->putmsg_intf); - --#if defined(HAVE_SYS_STROPTS_H) -+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG) - memset (&sbuf, '\0', sizeof (struct strbuf)); - - /* Due to API differences, we need to extract the cmd out of the -@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx, - return (-1); - } - --#if defined(HAVE_SYS_STROPTS_H) -+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG) - if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0) - { - SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno); diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch deleted file mode 100644 index 3bc006acc7..0000000000 --- a/package/freeipmi/0002-check-for-inb-and-outb.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 2 Jan 2022 10:37:00 +0100 -Subject: [PATCH] check for inb and outb - -Check for inb and outb before using them to avoid the following build -failure on uclibc-ng: - -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': -/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' - -Fixes: - - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] ---- - configure.ac | 2 +- - libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 711b27674..bcc4156ff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) - AC_CHECK_FUNCS([getline getprogname]) - AC_CHECK_FUNCS([strerror strerror_r]) - AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) --AC_CHECK_FUNCS([iopl]) -+AC_CHECK_FUNCS([inb iopl outb]) - AC_CHECK_FUNCS([asprintf]) - AC_CHECK_FUNCS([cbrt]) - AC_CHECK_FUNCS([getmsg putmsg]) -diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c -index c212887c0..a9d4b2e96 100644 ---- a/libfreeipmi/driver/ipmi-kcs-driver.c -+++ b/libfreeipmi/driver/ipmi-kcs-driver.c -@@ -162,7 +162,7 @@ - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - # define _INB(port) inb (port) - # define _OUTB(data, port) outb (port, data) --#elif defined(HAVE_IOPL) -+#elif defined(HAVE_INB) && defined(HAVE_OUTB) - # define _INB(port) inb (port) - # define _OUTB(data, port) outb (data, port) - #else --- -2.33.0 - diff --git a/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch b/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch deleted file mode 100644 index 6db6c2ae3b..0000000000 --- a/package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 727291789fa1930a3e5aa04a25e954cfa6e615d6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 15 Jan 2022 16:27:44 +0100 -Subject: [PATCH] configure.ac: use pkg-config to find gcrypt - -Use pkg-config to find gcrypt and avoid the following static build -failure: - -configure:13642: checking for gcry_md_open in -lgcrypt -configure:13665: /home/buildroot/autobuild/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lgcrypt >&5 -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libgcrypt.a(libgcrypt_la-visibility.o): in function `gcry_err_make_from_errno': -visibility.c:(.text+0x29): undefined reference to `gpg_err_code_from_errno' - -Fixes: - - http://autobuild.buildroot.org/results/5354f7231cf08bf762e7d86fca874ce63d9a116b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/52] ---- - configure.ac | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bcc4156ff..531e10b8d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -405,7 +405,11 @@ fi - dnl Checks for libraries. - dnl don\'t include lib if LAN not desired - if test x"${ac_with_encryption}" = xyes; then -- AC_CHECK_LIB([gcrypt], [gcry_md_open], [have_gcrypt=yes], [have_gcrypt=no]) -+ PKG_CHECK_MODULES([GCRYPT], [libgcrypt], [have_gcrypt=yes], [ -+ AC_CHECK_LIB([gcrypt], [gcry_md_open], -+ [have_gcrypt=yes GCRYPT_LIBS=-lgcrypt], -+ [have_gcrypt=no]) -+ ]) - if test "x${have_gcrypt}" = "xno"; then - AC_MSG_ERROR([libgcrypt required to build libfreeipmi]) - AC_MSG_NOTICE([Note: libgpg-error required for libgcrypt]) -@@ -421,7 +425,6 @@ if test x"${ac_with_encryption}" = xyes; then - if test "x${have_gcrypt_threads}" = "xno"; then - AC_MSG_ERROR([libgcrypt with threads support required for libfreeipmi]) - fi -- GCRYPT_LIBS=-lgcrypt - fi - AC_SUBST(GCRYPT_LIBS) - --- -2.34.1 - diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index f73b4a25fe..05fb50bd4c 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71 freeipmi-1.6.8.tar.gz +sha256 f25e1c35f3d0f1b5a99cc31ecc2353ca83ed46a15163842fba870127dc9c8206 freeipmi-1.6.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index b25ef0a4c6..9fb59245b9 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.8 +FREEIPMI_VERSION = 1.6.9 FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ @@ -14,8 +14,6 @@ FREEIPMI_LICENSE_FILES = \ COPYING.sunbmc COPYING.ZRESEARCH FREEIPMI_DEPENDENCIES = host-pkgconf FREEIPMI_INSTALL_STAGING = YES -# We're patching configure.ac -FREEIPMI_AUTORECONF = YES # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE FREEIPMI_CONF_OPTS = --without-random-device -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 24 22:18:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 23:18:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/whois: bump to version 5.5.11 Message-ID: <20220124221838.2630565-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 1478d60697..4bdfd74b20 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois/whois_5.5.10.dsc -sha256 2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd whois_5.5.10.tar.xz +# From http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois/whois_5.5.11.dsc +sha256 966281eb8301c14a1acc17e46c70061f73179d80e370aef43065c22f0947fb87 whois_5.5.11.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index c5d0a6f2ad..544cb9c2f7 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.10 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois +WHOIS_VERSION = 5.5.11 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ -- 2.34.1 From ps.report at gmx.net Mon Jan 24 22:34:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 24 Jan 2022 23:34:05 +0100 Subject: [Buildroot] buildroot EGLFS support In-Reply-To: References: Message-ID: <20220124233405.250ab307@gmx.net> Hello Toma?, On Mon, 24 Jan 2022 16:28:00 +0100, Toma? Smodi? wrote: > Hi > > With help of Mr. Richard Ash I managed to build my buildroot Os. > > With the same compiler I buidl/compiled Qt libraries against buildroot > sysroot. Why compile outside of buildroot? Qt is well integrated into buildroot (as Richard already pointed out [1])... > > I was finally able to run some cpp code. I successfully ran Qt console > application. > > However if I try to run Qt GUI Application I got errors. I enabled eglfs > support in menuconfig: > > In target packages, graphic libraries and applications I enabled mesa3d > option Gallium swrast driver and OpenGL EGL and OpenGL ES options. Why swrast and not 'Gallium vc4 driver'? > > I ran make successfully, deployed to Raspberry Pi 3 b+ but after I run > my app with: > > strace ./myapp -platform eglfs > > I got errror: > > write(2, "EGL library doesn't support Emul"..., 48EGL library doesn't > support Emulator extensions > > Any advice? My 'standard' RPi3 (64-bit) buildroot test configuration is like the following: BR2_aarch64=y BR2_ARM_FPU_VFPV4=y BR2_OPTIMIZE_3=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_GLIBC_UTILS=y BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" BR2_GENERATE_LOCALE="en_US" BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_STRACE=y BR2_PACKAGE_DEJAVU=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" BR2_PACKAGE_QT5BASE_FONTCONFIG=y BR2_PACKAGE_QT5BASE_HARFBUZZ=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5QUICKCONTROLS=y BR2_PACKAGE_QT5QUICKCONTROLS2=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="384M" # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y Needs only the added 'dtoverlay=vc4-kms-v3d' to the boot-partition config.txt file, most provided Qt gui examples run fine, e.g. /usr/lib/qt/examples/gui/analogclock/analogclock or /usr/lib/qt/examples/quickcontrols2/gallery/gallery etc. Regards, Peter [1] http://lists.busybox.net/pipermail/buildroot/2022-January/634093.html > > kind regards Thomas > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From quentin at barbe.me Mon Jan 24 22:35:55 2022 From: quentin at barbe.me (Quentin Barbe) Date: Mon, 24 Jan 2022 23:35:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/uboot-tools: add fw_printenv to host uboot tools Message-ID: <20220124223555.8595-1-quentin@barbe.me> This is useful to be able to customize the default env images in post build scripts. Signed-off-by: Quentin Barbe --- package/uboot-tools/uboot-tools.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 37e329a2af..961e123fc5 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -203,6 +203,7 @@ endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT define HOST_UBOOT_TOOLS_BUILD_CMDS $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only + $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) envtools no-dot-config-targets=envtools $(HOST_UBOOT_TOOLS_GENERATE_ENVIMAGE) $(HOST_UBOOT_TOOLS_GENERATE_BOOT_SCRIPT) endef @@ -212,6 +213,8 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(HOST_DIR)/bin/mkeficapsule $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(HOST_DIR)/bin/fw_printenv + ln -sf $(HOST_DIR)/bin/fw_printenv $(HOST_DIR)/bin/fw_setenv $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) $(HOST_UBOOT_TOOLS_INSTALL_BOOT_SCRIPT) endef -- 2.30.2 From fontaine.fabrice at gmail.com Mon Jan 24 22:38:06 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 24 Jan 2022 23:38:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnpupnp: bump to version 4.2.1 Message-ID: <20220124223806.2720164-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/libnpupnp/libnpupnp.hash | 4 ++-- package/libnpupnp/libnpupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnpupnp/libnpupnp.hash b/package/libnpupnp/libnpupnp.hash index 9ebfd13379..276bf93c99 100644 --- a/package/libnpupnp/libnpupnp.hash +++ b/package/libnpupnp/libnpupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.1.5.tar.gz.sha256 -sha256 566f5895376a14aa87997de7ce3454595646613d1d0af34d05c31f6d9fe884a9 libnpupnp-4.1.5.tar.gz +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.2.1.tar.gz.sha256 +sha256 e0e59eb2d3d024e827050428e0e7eb228355912a38c85eb30bfeb2f0926eca4c libnpupnp-4.2.1.tar.gz # Hash for license file: sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libnpupnp/libnpupnp.mk b/package/libnpupnp/libnpupnp.mk index 03ac01c915..09bfa34b87 100644 --- a/package/libnpupnp/libnpupnp.mk +++ b/package/libnpupnp/libnpupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNPUPNP_VERSION = 4.1.5 +LIBNPUPNP_VERSION = 4.2.1 LIBNPUPNP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBNPUPNP_LICENSE = BSD-3-Clause LIBNPUPNP_LICENSE_FILES = COPYING -- 2.34.1 From quentin at barbe.me Mon Jan 24 22:09:54 2022 From: quentin at barbe.me (Quentin Barbe) Date: Mon, 24 Jan 2022 23:09:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/uboot-tools: add fw_printenv to host uboot tools Message-ID: <20220124220954.7602-1-quentin@barbe.me> This is useful to be able to customize the default env images in post build scripts. Signed-off-by: Quentin Barbe --- package/uboot-tools/uboot-tools.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 37e329a2af..961e123fc5 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -203,6 +203,7 @@ endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT define HOST_UBOOT_TOOLS_BUILD_CMDS $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only + $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) envtools no-dot-config-targets=envtools $(HOST_UBOOT_TOOLS_GENERATE_ENVIMAGE) $(HOST_UBOOT_TOOLS_GENERATE_BOOT_SCRIPT) endef @@ -212,6 +213,8 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(HOST_DIR)/bin/mkeficapsule $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(HOST_DIR)/bin/fw_printenv + ln -sf $(HOST_DIR)/bin/fw_printenv $(HOST_DIR)/bin/fw_setenv $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) $(HOST_UBOOT_TOOLS_INSTALL_BOOT_SCRIPT) endef -- 2.30.2 From thomas.petazzoni at bootlin.com Mon Jan 24 23:00:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:00:58 +0100 Subject: [Buildroot] [PATCH 00/16] Bootlin toolchain updates and x86 updates Message-ID: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Hello, This series: - Updates the OpenRISC Bootlin toolchains recently rebuilt with the _REENTRANT fix (PATCH 1) - Adds support for the new Bootlin toolchains targetting the x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 CPU variants (PATCH 2 and 3) - Simplifies the definition of BR2_ARCH in arch/Config.in.x86 in preparation for the addition of many Intel CPU variants (PATCH 4) - Syncs up the list of Intel CPU variants supported by gcc up to the point where AVX512 is introduced (PATCH 5, 6, 7, 8) - Uses the new BR2_X86_CPU_HAS_AVX512 in the definition of x86-64-v4, and also in the Bootlin toolchains script, and the files it generates (PATCH 9, 10, 11) - Adds all remaining Intel CPU variants supported by gcc up to gcc 11.x (PATCH 12, 13, 14, 15) - Documents how the arch/Config.in.x86 is ordered (PATCH 16) Note that I have left aside the "knl" and "knm" architectures as it seems they have been used much. But if for completeness reasons we want to add them, it can certainly be done. Thanks in advance for your review. Note that I mostly interested in the patches up to 11. The remaining patches are less relevant to me directly, so if you don't feel like we should add all those CPU variants, I'm fine if patches 12, 13, 14 and 15 are rejected. Best regards, Thomas Thomas Petazzoni (16): toolchain/toolchain-external/toolchain-external-bootlin: re-update OpenRISC toolchains support/scripts/gen-bootlin-toolchains: add support for new x86-64 toolchains toolchain/toolchain-external/toolchain-external-bootlin: update with new x86-64 toolchains arch/Config.in.x86: drastically simplify the BR2_ARCH definition arch/Config.in.x86: add "newer" names for several Intel x86 CPU variants arch/Config.in.x86: westmere and silvermont were added in gcc 4.9 arch/Config.in.x86: add broadwell Intel CPU variant arch/Config.in.x86: add skylake CPU variants arch/Config.in.x86: x86-64-v4 implies AVX512 support/scripts/gen-bootlin-toolchains: add missing BR2_X86_CPU_HAS_AVX512 condition for x86-64-v4 toolchain/toolchain-external/toolchain-external-bootlin: regenerate with AVX512 condition for x86-64-v4 toolchain arch/Config.in.x86: add cannonlake, icelake-client, icelake-server CPU variants arch/Config.in.x86: add goldmont, goldmont-plus, tremont, cascadelake, tigerlake CPU variants arch/Config.in.x86: add cooperlake CPU variant arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake arch/Config.in.x86: indicate how the CPU variants are ordered arch/Config.in.x86 | 294 ++++++++++- support/scripts/gen-bootlin-toolchains | 49 ++ .../tests/toolchain/test_external_bootlin.py | 225 +++++++++ .../Config.in.options | 457 +++++++++++++++++- .../toolchain-external-bootlin.hash | 46 +- .../toolchain-external-bootlin.mk | 98 +++- 6 files changed, 1129 insertions(+), 40 deletions(-) -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:00 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:00 +0100 Subject: [Buildroot] [PATCH 02/16] support/scripts/gen-bootlin-toolchains: add support for new x86-64 toolchains In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-3-thomas.petazzoni@bootlin.com> Following the merge of d6ce2a16814fd96a45888a774da6a4db74cd540a ("arch/Config.in.x86: add option for -march=x86-64") and eeace1cc13ce09a0c88ce177465b836d6eb58298 ("arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4"), bootlin.toolchains.com now provides toolchains targetting the x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 architecture variants. This commits modifies gen-bootlin-toolchains to support these toolchains. It should be noted that the description for the x86-64-v3 and x86-64-v4 toolchains are for now the same, as Buildroot doesn't yet have the options to describe the extra features that x86-64-v4 expects to find on the hardware platform. Signed-off-by: Thomas Petazzoni --- support/scripts/gen-bootlin-toolchains | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index f160a44152..a42ddb4097 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -178,6 +178,54 @@ arches = { 'conditions': ['BR2_sparc', 'BR2_sparc_v8'], 'prefix': 'sparc', }, + 'x86-64': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64'], + 'prefix': 'x86_64', + }, + 'x86-64-v2': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v2'], + 'prefix': 'x86_64', + }, + 'x86-64-v3': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42', + 'BR2_X86_CPU_HAS_AVX', + 'BR2_X86_CPU_HAS_AVX2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v3'], + 'prefix': 'x86_64', + }, + 'x86-64-v4': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42', + 'BR2_X86_CPU_HAS_AVX', + 'BR2_X86_CPU_HAS_AVX2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v4'], + 'prefix': 'x86_64', + }, 'x86-64-core-i7': { 'conditions': ['BR2_x86_64', 'BR2_X86_CPU_HAS_MMX', -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:00:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:00:59 +0100 Subject: [Buildroot] [PATCH 01/16] toolchain/toolchain-external/toolchain-external-bootlin: re-update OpenRISC toolchains In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-2-thomas.petazzoni@bootlin.com> The OpenRISC toolchains have been rebuilt once again, this time with the _REENTRANT fixed merged in commit 98e39dc80ee81a166df90b4ff3232038a63b759c ("package/gcc: define _REENTRANT for OpenRISC when -pthread is passed") Signed-off-by: Thomas Petazzoni --- .../toolchain-external-bootlin/Config.in.options | 8 ++++---- .../toolchain-external-bootlin.hash | 16 ++++++++-------- .../toolchain-external-bootlin.mk | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 94dea4a386..55b6d4c786 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -2400,7 +2400,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2021.11-4" + bool "openrisc musl bleeding-edge 2021.11-5" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -2423,7 +2423,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2021.11-4" + bool "openrisc musl stable 2021.11-5" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -2445,7 +2445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2021.11-4" + bool "openrisc uclibc bleeding-edge 2021.11-5" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -2468,7 +2468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2021.11-4" + bool "openrisc uclibc stable 2021.11-5" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 638130d8b8..8819782ac5 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -192,14 +192,14 @@ sha256 30d82c7ca41a0df9931a29a46ed881f21a889e9e59baf04e820c6679be87a7fb mips64 sha256 5c2dc11062f4817e81a328b12ab30be486b7e68c7c876eb45fffca72332a8804 nios2--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2021.11-1.sha256 sha256 f6f37f1e551edda0251ece8d906ed720bd8ec45da9d4b3e1d13721bdc9ef2882 nios2--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-4.sha256 -sha256 9100a143a2f96c46d4d593fb25f4cab4a2efc61371f12bd1a686fbd52ee64c63 openrisc--musl--bleeding-edge-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-4.sha256 -sha256 72fce2be59c18a5b3a02f51ebb83119a0f3d29ab7f2d5cd560038ff6f94f137a openrisc--musl--stable-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-4.sha256 -sha256 ffbdedf741bcfeadaf0c52ac09af83b24eedca2e9a5fc563127c5fdbd10c79a6 openrisc--uclibc--bleeding-edge-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-4.sha256 -sha256 082ec406a6a516d582a092e63f9078e200a1e32dc24d47928f90c09b1e61819b openrisc--uclibc--stable-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-5.sha256 +sha256 03f46c8fdded0002a2a04749bcf86136ec26a841654bf9fdc14575cc510739c6 openrisc--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-5.sha256 +sha256 409e4a7473125e7de7c8b0e6bc1cb971d53e63ac057e9a19102e4ce1467f442a openrisc--musl--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 9028d4e526f9e805b021791443805541a179eaf2e47a2af4dfbefb2021e44e9f openrisc--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-5.sha256 +sha256 f07d8e465f7e94e55330cfb55bbaf9fc27e4bb7b688271ead60a15aec3dbbf76 openrisc--uclibc--stable-2021.11-5.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2021.11-1.sha256 sha256 53afdbe1e48d0c60d560db8d17042a99288661fe10eebbfcfec4e56a6c2ca594 powerpc-440fp--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2021.11-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 f28592272c..64ae44f364 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -583,25 +583,25 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:02 +0100 Subject: [Buildroot] [PATCH 04/16] arch/Config.in.x86: drastically simplify the BR2_ARCH definition In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-5-thomas.petazzoni@bootlin.com> The BR2_ARCH definition is like this: * i486 for the i486 platform * i586 for a small number of platforms * i686 for all other x86 platforms when used in 32-bit, but we enumerate their entire list * x86_64 for all x86 64-bit platforms The list for i686 is long and needs to be extended everytime a new platform is added, with no added value. So this commit simplifies that by replacing this long list with just: default "i686" if BR2_i386 This works because Kconfig guarantees us that if an i386 platform matches an earlier case (i486 or one of the i586 platforms), the i486 and i586 earlier in the list will match. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0ba9ecbcea..a330d72f1d 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -311,30 +311,12 @@ config BR2_ARCH default "i686" if BR2_x86_c32 default "i586" if BR2_x86_winchip_c6 default "i586" if BR2_x86_winchip2 - default "i686" if BR2_x86_i686 - default "i686" if BR2_x86_pentium2 - default "i686" if BR2_x86_pentium3 - default "i686" if BR2_x86_pentium4 - default "i686" if BR2_x86_pentium_m - default "i686" if BR2_x86_pentiumpro - default "i686" if BR2_x86_prescott - default "i686" if BR2_x86_nocona && BR2_i386 - default "i686" if BR2_x86_core2 && BR2_i386 - default "i686" if BR2_x86_corei7 && BR2_i386 - default "i686" if BR2_x86_westmere && BR2_i386 - default "i686" if BR2_x86_corei7_avx && BR2_i386 - default "i686" if BR2_x86_core_avx2 && BR2_i386 - default "i686" if BR2_x86_atom && BR2_i386 - default "i686" if BR2_x86_silvermont && BR2_i386 - default "i686" if BR2_x86_opteron && BR2_i386 - default "i686" if BR2_x86_opteron_sse3 && BR2_i386 - default "i686" if BR2_x86_barcelona && BR2_i386 - default "i686" if BR2_x86_jaguar && BR2_i386 - default "i686" if BR2_x86_steamroller && BR2_i386 - default "i686" if BR2_x86_k6 - default "i686" if BR2_x86_k6_2 - default "i686" if BR2_x86_athlon - default "i686" if BR2_x86_athlon_4 + # We use the property of Kconfig that the first match of a + # list of default will be chosen. So the following entry will + # not match for all BR2_i386=y configurations, but only the + # ones that didn't match any of the previous cases (i486, + # i586). + default "i686" if BR2_i386 default "x86_64" if BR2_x86_64 config BR2_ENDIAN -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:03 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:03 +0100 Subject: [Buildroot] [PATCH 05/16] arch/Config.in.x86: add "newer" names for several Intel x86 CPU variants In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-6-thomas.petazzoni@bootlin.com> In gcc commit d3c11974032e21121a051d423a1d71097edf752f ("Use proper Intel processor names for -march=/-mtune="), which was merged in gcc 4.9, the following replacements were made: * corei7 -> nehalem * corei7-avx -> sandybridge * core-avx-i -> ivybridge * core-avx2 -> haswell * atom -> bonnel * slm -> silvermont So this commit marks the Buildroot options BR2_x86_corei7, BR2_x86_corei7_avx, BR2_x86_core_avx2 and BR2_x86_atom as deprecated, and adds the four corresponding options with the newer names. Note that the older options are still kept because the new option names are only supported starting gcc 4.9, and we theoretically still supports targets gcc as old as gcc 4.3. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index a330d72f1d..4beb11662d 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -174,6 +174,19 @@ config BR2_x86_corei7 select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + help + This option is deprecated. Since gcc 4.9, the gcc option + "nehalem" is preferred. Use BR2_x86_nehalem instead. +config BR2_x86_nehalem + bool "nehalem" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_westmere bool "westmere" select BR2_X86_CPU_HAS_MMX @@ -193,6 +206,20 @@ config BR2_x86_corei7_avx select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX + help + This option is deprecated. Since gcc 4.9, the gcc option + "sandybridge" is preferred. Use BR2_x86_sandybridge instead. +config BR2_x86_sandybridge + bool "sandybridge" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_core_avx2 bool "core-avx2" select BR2_X86_CPU_HAS_MMX @@ -204,6 +231,21 @@ config BR2_x86_core_avx2 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 + help + This option is deprecated. Since gcc 4.9, the gcc option + "haswell" is preferred. Use BR2_x86_haswell instead. +config BR2_x86_haswell + bool "haswell" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -211,6 +253,17 @@ config BR2_x86_atom select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 select BR2_X86_CPU_HAS_SSSE3 + help + This option is deprecated. Since gcc 4.9, the gcc option + "bonnel" is preferred. Use BR2_x86_bonnel instead. +config BR2_x86_bonnel + bool "bonnel" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_silvermont bool "silvermont" select BR2_X86_CPU_HAS_MMX @@ -341,9 +394,13 @@ config BR2_GCC_TARGET_ARCH default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 + default "nehalem" if BR2_x86_nehalem default "corei7-avx" if BR2_x86_corei7_avx + default "sandybridge" if BR2_x86_sandybridge default "core-avx2" if BR2_x86_core_avx2 + default "haswell" if BR2_x86_haswell default "atom" if BR2_x86_atom + default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "k8" if BR2_x86_opteron -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:04 +0100 Subject: [Buildroot] [PATCH 06/16] arch/Config.in.x86: westmere and silvermont were added in gcc 4.9 In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-7-thomas.petazzoni@bootlin.com> These were added in gcc commit d3c11974032e21121a051d423a1d71097edf752f ("Use proper Intel processor names for -march=/-mtune=") which was merged in gcc 4.9. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 4beb11662d..0aae26799c 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -196,6 +196,7 @@ config BR2_x86_westmere select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_corei7_avx bool "corei7-avx" select BR2_X86_CPU_HAS_MMX @@ -273,6 +274,7 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:01 +0100 Subject: [Buildroot] [PATCH 03/16] toolchain/toolchain-external/toolchain-external-bootlin: update with new x86-64 toolchains In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-4-thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni --- .../tests/toolchain/test_external_bootlin.py | 225 +++++++++ .../Config.in.options | 446 ++++++++++++++++++ .../toolchain-external-bootlin.hash | 30 ++ .../toolchain-external-bootlin.mk | 90 ++++ 4 files changed, 791 insertions(+) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index 5e908b957e..cf6174303e 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2362,6 +2362,231 @@ class TestExternalToolchainBootlinSparcv8UclibcStable(TestExternalToolchain): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664GlibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664MuslStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664UclibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664corei7GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 55b6d4c786..42cad21d71 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -37,6 +37,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 default y if BR2_sparc && BR2_sparc_v8 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 @@ -3791,6 +3795,448 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE + bool "x86-64 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 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_X86_64_GLIBC_STABLE + bool "x86-64 glibc stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE + bool "x86-64 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 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_X86_64_MUSL_STABLE + bool "x86-64 musl stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE + bool "x86-64 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64 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_X86_64_UCLIBC_STABLE + bool "x86-64 uclibc stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE + bool "x86-64-v2 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v2 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_X86_64_V2_MUSL_BLEEDING_EDGE + bool "x86-64-v2 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v2 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_X86_64_V2_UCLIBC_BLEEDING_EDGE + bool "x86-64-v2 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v2 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_X86_64_V3_GLIBC_BLEEDING_EDGE + bool "x86-64-v3 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v3 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_X86_64_V3_MUSL_BLEEDING_EDGE + bool "x86-64-v3 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v3 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_X86_64_V3_UCLIBC_BLEEDING_EDGE + bool "x86-64-v3 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v3 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_X86_64_V4_GLIBC_BLEEDING_EDGE + bool "x86-64-v4 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v4 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_X86_64_V4_MUSL_BLEEDING_EDGE + bool "x86-64-v4 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v4 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_X86_64_V4_UCLIBC_BLEEDING_EDGE + bool "x86-64-v4 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v4 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_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE bool "x86-64-core-i7 glibc bleeding-edge 2021.11-1" depends on BR2_x86_64 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 8819782ac5..6542694033 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -306,6 +306,36 @@ sha256 0ef307f6c91733ee82ce65801768013f7e6220b605f4e152158cb55b4f983582 sparc6 sha256 3c85420becb7caa84a9a229483f3f2d7158eb66817acdfa5d5700c3a05436cba sparcv8--uclibc--bleeding-edge-2021.11-3.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2021.11-1.sha256 sha256 f6d35e33338b26e71403b4c6d3944ab561f2a6e9b801ab33fbb401b4722044dd sparcv8--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2021.11-5.sha256 +sha256 024fd8edc91b9bfd643f8cf94e3f3ff2a6457aea654d10ef3516db8c3d94d5f5 x86-64--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2021.11-5.sha256 +sha256 6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0 x86-64--glibc--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2021.11-5.sha256 +sha256 468e6b73146595923fe87980a30adb54cd78f4c1e2f228e1a2c9bb705ea4243d x86-64--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2021.11-5.sha256 +sha256 2943617f6537ca195a66fb9db4a801a5dd1c108741c400d530d558d06908dd75 x86-64--musl--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 4aa8b8e2806d6fc87ba64ccec0a59b8a2fb5d157cda006d893e3f2264b7f0f10 x86-64--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2021.11-5.sha256 +sha256 e68fd1b23f4a5c5132f2122e4012c17eb24e5179b2ff45bb793a27ac30dd454f x86-64--uclibc--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2021.11-5.sha256 +sha256 af20cf98ce937f298e0958e16793bb4c7b08236bc69ab11574a4266cccc3823d x86-64-v2--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2021.11-5.sha256 +sha256 17add21a0337d2f7d0d79d1f21db88098c3474920d71f902be46e8995eb86d35 x86-64-v2--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 b3ef49012af9fc9c2c8a44b0a20722be69b518cec5db06e48480291fc28aefe0 x86-64-v2--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2021.11-5.sha256 +sha256 244d4afab02b9c54c76385657d26798515331d7d4fa90928315366f31b9cc39e x86-64-v3--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2021.11-5.sha256 +sha256 551cff1b6425e2a6ced7b7ad032fba49b43ed095faae38d1842260ac0b5d6dbf x86-64-v3--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 30188f50adef711b55ac1d5be7218e0d6ee4200ddb8660e4d4971a9cefe22f91 x86-64-v3--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2021.11-5.sha256 +sha256 0cd2de7c4103aa8cf47b72dc71146eb3bf7742a18d56c93128340ab3f4175804 x86-64-v4--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2021.11-5.sha256 +sha256 e159da16459e0f0d06a9a7467d5121202ab95e2fa6bf8abffdc0008c72fe9b07 x86-64-v4--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 984f011d170d3e46322ae4a110c86ebf995598d877f410201b3fb3d86e25dac2 x86-64-v4--uclibc--bleeding-edge-2021.11-5.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2021.11-1.sha256 sha256 a3dbfcd3347a72ca344ae77882f929615776ea9b1b058eeea0a0915e7db89b69 x86-64-core-i7--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2021.11-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 64ae44f364..fb19ef2909 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -924,6 +924,96 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:05 +0100 Subject: [Buildroot] [PATCH 07/16] arch/Config.in.x86: add broadwell Intel CPU variant In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-8-thomas.petazzoni@bootlin.com> It was added in gcc 4.9. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0aae26799c..d5d84715b8 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -247,6 +247,18 @@ config BR2_x86_haswell select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_broadwell + bool "broadwell" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -401,6 +413,7 @@ config BR2_GCC_TARGET_ARCH default "sandybridge" if BR2_x86_sandybridge default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell + default "broadwell" if BR2_x86_broadwell default "atom" if BR2_x86_atom default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:07 +0100 Subject: [Buildroot] [PATCH 09/16] arch/Config.in.x86: x86-64-v4 implies AVX512 In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-10-thomas.petazzoni@bootlin.com> Now that we have BR2_X86_CPU_HAS_AVX512, we can use it to fix the x86-64-v4 definition, which implies AVX512 support according to https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 6b18580ae4..2034fb3bb7 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -146,6 +146,7 @@ config BR2_x86_x86_64_v4 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 help This option corresponds to the x86-64-v4 micro-architecture -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:06 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:06 +0100 Subject: [Buildroot] [PATCH 08/16] arch/Config.in.x86: add skylake CPU variants In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-9-thomas.petazzoni@bootlin.com> Both skylake and skylake-avx512 were added in gcc 6.x. According to https://en.wikipedia.org/wiki/Skylake_(microarchitecture) the early Skylake processors indeed did not have AVX512 support, while the later ones did, hence the separate gcc options. Due to this being the first CPU we support with AVX512, this commit adds BR2_X86_CPU_HAS_AVX512. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index d5d84715b8..6b18580ae4 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -19,6 +19,8 @@ config BR2_X86_CPU_HAS_AVX bool config BR2_X86_CPU_HAS_AVX2 bool +config BR2_X86_CPU_HAS_AVX512 + bool choice prompt "Target Architecture Variant" @@ -259,6 +261,18 @@ config BR2_x86_broadwell select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_skylake + bool "skylake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -287,6 +301,19 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_skylake_avx512 + bool "skylake-avx512" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -414,10 +441,12 @@ config BR2_GCC_TARGET_ARCH default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell default "broadwell" if BR2_x86_broadwell + default "skylake" if BR2_x86_skylake default "atom" if BR2_x86_atom default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont + default "skylake-avx512" if BR2_x86_skylake_avx512 default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:08 +0100 Subject: [Buildroot] [PATCH 10/16] support/scripts/gen-bootlin-toolchains: add missing BR2_X86_CPU_HAS_AVX512 condition for x86-64-v4 In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-11-thomas.petazzoni@bootlin.com> The x86-64-v4 toolchain assumes availability of AVX512, as per the definition of the x86-64-v4 "standard". Signed-off-by: Thomas Petazzoni --- support/scripts/gen-bootlin-toolchains | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index a42ddb4097..dc173fa949 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -222,7 +222,8 @@ arches = { 'BR2_X86_CPU_HAS_SSE4', 'BR2_X86_CPU_HAS_SSE42', 'BR2_X86_CPU_HAS_AVX', - 'BR2_X86_CPU_HAS_AVX2'], + 'BR2_X86_CPU_HAS_AVX2', + 'BR2_X86_CPU_HAS_AVX512'], 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v4'], 'prefix': 'x86_64', }, -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:09 +0100 Subject: [Buildroot] [PATCH 11/16] toolchain/toolchain-external/toolchain-external-bootlin: regenerate with AVX512 condition for x86-64-v4 toolchain In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-12-thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni --- .../toolchain-external-bootlin/Config.in.options | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 42cad21d71..4b4404620c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -40,7 +40,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 - default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 && BR2_X86_CPU_HAS_AVX512 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 @@ -4152,6 +4152,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -4185,6 +4186,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -4217,6 +4219,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:11 +0100 Subject: [Buildroot] [PATCH 13/16] arch/Config.in.x86: add goldmont, goldmont-plus, tremont, cascadelake, tigerlake CPU variants In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-14-thomas.petazzoni@bootlin.com> These were added in gcc 9.x. The goldmont, goldmont-plus and tremont are for the low-power CPUs. While cascadelake and tigerlake are for the high-end ones. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index e9c55bb319..dffc9a74d3 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -302,6 +302,36 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_goldmont + bool "goldmont" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_goldmont_plus + bool "goldmont-plus" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_tremont + bool "tremont" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_x86_skylake_avx512 bool "skylake-avx512" select BR2_X86_CPU_HAS_MMX @@ -354,6 +384,32 @@ config BR2_x86_icelake_server select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_cascadelake + bool "cascadelake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_tigerlake + bool "tigerlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -486,10 +542,15 @@ config BR2_GCC_TARGET_ARCH default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont + default "goldmont" if BR2_x86_goldmont + default "goldmont-plus" if BR2_x86_goldmont_plus + default "tremont" if BR2_x86_tremont default "skylake-avx512" if BR2_x86_skylake_avx512 default "cannonlake" if BR2_x86_cannonlake default "icelake-client" if BR2_x86_icelake_client default "icelake-server" if BR2_x86_icelake_server + default "cascadelake" if BR2_x86_cascadelake + default "tigerlake" if BR2_x86_tigerlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:12 +0100 Subject: [Buildroot] [PATCH 14/16] arch/Config.in.x86: add cooperlake CPU variant In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-15-thomas.petazzoni@bootlin.com> It was added in gcc 10.x. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index dffc9a74d3..08837b7cea 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -397,6 +397,19 @@ config BR2_x86_cascadelake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_cooperlake + bool "cooperlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_10 config BR2_x86_tigerlake bool "tigerlake" select BR2_X86_CPU_HAS_MMX @@ -550,6 +563,7 @@ config BR2_GCC_TARGET_ARCH default "icelake-client" if BR2_x86_icelake_client default "icelake-server" if BR2_x86_icelake_server default "cascadelake" if BR2_x86_cascadelake + default "cooperlake" if BR2_x86_cooperlake default "tigerlake" if BR2_x86_tigerlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:14 +0100 Subject: [Buildroot] [PATCH 16/16] arch/Config.in.x86: indicate how the CPU variants are ordered In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-17-thomas.petazzoni@bootlin.com> They are loosely ordered according to the ordering of the gcc documentation. It is not entirely correct as the generic x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 are listed before i386 in the gcc documentation, but this nevertheless gives a good explanation for the overall ordering of the list. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index cae5502051..27f2bfcd4c 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -22,6 +22,9 @@ config BR2_X86_CPU_HAS_AVX2 config BR2_X86_CPU_HAS_AVX512 bool +# This list of CPU architecture variant is (loosely) ordered according +# to the gcc documentation at +# https://gcc.gnu.org/onlinedocs/gcc-11.2.0/gcc/x86-Options.html choice prompt "Target Architecture Variant" default BR2_x86_i586 if BR2_i386 -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:13 +0100 Subject: [Buildroot] [PATCH 15/16] arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-16-thomas.petazzoni@bootlin.com> These were added in gcc 11.x. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 08837b7cea..cae5502051 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -423,6 +423,45 @@ config BR2_x86_tigerlake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_sapphirerapids + bool "sapphirerapids" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_alderlake + bool "alderlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_rocketlake + bool "rocketlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -565,6 +604,9 @@ config BR2_GCC_TARGET_ARCH default "cascadelake" if BR2_x86_cascadelake default "cooperlake" if BR2_x86_cooperlake default "tigerlake" if BR2_x86_tigerlake + default "sapphirerapids" if BR2_x86_sapphirerapids + default "alderlake" if BR2_x86_alderlake + default "rocketlake" if BR2_x86_rocketlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:01:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:01:10 +0100 Subject: [Buildroot] [PATCH 12/16] arch/Config.in.x86: add cannonlake, icelake-client, icelake-server CPU variants In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220124230116.203218-13-thomas.petazzoni@bootlin.com> These were added in gcc 8.x. Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 2034fb3bb7..e9c55bb319 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -315,6 +315,45 @@ config BR2_x86_skylake_avx512 select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +config BR2_x86_cannonlake + bool "cannonlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_icelake_client + bool "icelake-client" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_icelake_server + bool "icelake-server" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -448,6 +487,9 @@ config BR2_GCC_TARGET_ARCH default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "skylake-avx512" if BR2_x86_skylake_avx512 + default "cannonlake" if BR2_x86_cannonlake + default "icelake-client" if BR2_x86_icelake_client + default "icelake-server" if BR2_x86_icelake_server default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Jan 24 23:10:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:10:19 +0100 Subject: [Buildroot] [git commit] Revert "package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995)" Message-ID: <20220124230405.D208481D63@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9887615eda3076679fca2fe3a8335aa9cfc09f72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 12dcad48f6bce89adfc9462120b68fcc89b4c615, as it causes massive build breakage. Fixes: http://autobuild.buildroot.net/results/c2edca241e754566add0fd6b3f049c7945723cfc/ http://autobuild.buildroot.net/results/27d4aaef1fcffb51fa82b6ad6b0fe303a6d7be33/ --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 9c10a42dca..eafbe9254a 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz +sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 88d4984e2f..cf0fee409b 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From thomas.petazzoni at bootlin.com Mon Jan 24 23:12:22 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 00:12:22 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: <20220124220707.688fee47@windsurf> References: <20220124201628.11015-1-ps.report@gmx.net> <20220124220707.688fee47@windsurf> Message-ID: <20220125001222.582e094a@windsurf> On Mon, 24 Jan 2022 22:07:07 +0100 Thomas Petazzoni wrote: > Applied to master, thanks. And I reverted, because it breaks the build: http://autobuild.buildroot.net/?reason=%util-linux-2.37.3 (I didn't investigate, it's too late here.) Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From wbx at openadk.org Tue Jan 25 00:15:45 2022 From: wbx at openadk.org (Waldemar Brodkorb) Date: Tue, 25 Jan 2022 01:15:45 +0100 Subject: [Buildroot] [PATCH] package/uclibc: update to 1.0.40 Message-ID: Signed-off-by: Waldemar Brodkorb --- package/uclibc/uclibc.hash | 4 ++-- package/uclibc/uclibc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 25bbabf2ea..989c9d887a 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.38/uClibc-ng-1.0.39.tar.xz.sha256 -sha256 cb089dfe14867a38f222d6428e85d0e1191dcbb66dd9b1a671484f6bc7c81920 uClibc-ng-1.0.39.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.40/uClibc-ng-1.0.40.tar.xz.sha256 +sha256 d863f01815a64174d5019c73475e8aff5b60848a13876e79daf5d3d83ce7f889 uClibc-ng-1.0.40.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 0feedb6cfa..d79eaa1d0d 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.39 +UCLIBC_VERSION = 1.0.40 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ -- 2.30.2 From james.hilliard1 at gmail.com Tue Jan 25 02:05:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 24 Jan 2022 19:05:53 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-multidict: bump to version 6.0.2 Message-ID: <20220125020553.626832-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 2d9943fc0d..999c8867d0 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 e28b9592289597b232f09e5cc3857f32 multidict-5.2.0.tar.gz -sha256 0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce multidict-5.2.0.tar.gz +md5 f8230905ad1f50c87e8d9cc6b0bb7ca2 multidict-6.0.2.tar.gz +sha256 5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013 multidict-6.0.2.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 2619cad2ee..1a9aec7ba7 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 5.2.0 +PYTHON_MULTIDICT_VERSION = 6.0.2 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/8e/7c/e12a69795b7b7d5071614af2c691c97fbf16a2a513c66ec52dd7d0a115bb +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/fa/a7/71c253cdb8a1528802bac7503bf82fe674367e4055b09c28846fdfa4ab90 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE -- 2.25.1 From peterlin at andestech.com Tue Jan 25 05:49:54 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 25 Jan 2022 13:49:54 +0800 Subject: [Buildroot] [PATCH v2 1/3] board/andes: rearrange nds32 folder structure Message-ID: <20220125054956.27492-1-peterlin@andestech.com> Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 board/andes/{ => ae3xx}/readme.txt | 0 configs/andes_ae3xx_defconfig | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename board/andes/{ => ae3xx}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) rename board/andes/{ => ae3xx}/readme.txt (100%) diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae3xx/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch similarity index 100% rename from board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch rename to board/andes/ae3xx/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/readme.txt b/board/andes/ae3xx/readme.txt similarity index 100% rename from board/andes/readme.txt rename to board/andes/ae3xx/readme.txt diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae3xx_defconfig index 52634caa50..18051115c3 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae3xx_defconfig @@ -1,5 +1,5 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae3xx/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y -- 2.17.1 From peterlin at andestech.com Tue Jan 25 05:49:55 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 25 Jan 2022 13:49:55 +0800 Subject: [Buildroot] [PATCH v2 2/3] board/andes/ae350: add support for Andes AE350 In-Reply-To: <20220125054956.27492-1-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> Message-ID: <20220125054956.27492-2-peterlin@andestech.com> This patch provides defconfig and basic support for the Andes 45 series RISC-V architecture. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ board/andes/ae350/boot.cmd | 3 + board/andes/ae350/genimage_sdcard.cfg | 29 ++ ...isable-PIC-explicitly-for-assembling.patch | 29 ++ ...2-Enable-cache-for-opensbi-jump-mode.patch | 25 ++ ...001-Fix-mmc-no-partition-table-error.patch | 27 ++ ...2-Prevent-fw_dynamic-from-relocation.patch | 27 ++ ...0003-Fix-u-boot-proper-booting-issue.patch | 26 ++ ...04-Enable-printing-OpenSBI-boot-logo.patch | 25 ++ board/andes/ae350/readme.txt | 63 ++++ board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 40 +++ 12 files changed, 573 insertions(+) create mode 100755 board/andes/ae350/ae350.dts create mode 100644 board/andes/ae350/boot.cmd create mode 100644 board/andes/ae350/genimage_sdcard.cfg create mode 100644 board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch create mode 100644 board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch create mode 100644 board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch create mode 100644 board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch create mode 100644 board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch create mode 100644 board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch create mode 100644 board/andes/ae350/readme.txt create mode 100644 board/andes/ae350/uboot.config.fragment create mode 100644 configs/andes_ae350_45_defconfig diff --git a/board/andes/ae350/ae350.dts b/board/andes/ae350/ae350.dts new file mode 100755 index 0000000000..5e5d70ab25 --- /dev/null +++ b/board/andes/ae350/ae350.dts @@ -0,0 +1,274 @@ +/dts-v1/; + +/ { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,ae350"; + model = "andestech,ax45"; + aliases { + uart0 = &serial0; + spi0 = &spi; + }; + + chosen { + bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7"; + stdout-path = "uart0:38400n8"; + }; + cpus { + #address-cells = <1>; + #size-cells = <0>; + timebase-frequency = <60000000>; + CPU0: cpu at 0 { + device_type = "cpu"; + reg = <0>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU0_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU1: cpu at 1 { + device_type = "cpu"; + reg = <1>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU1_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU2: cpu at 2 { + device_type = "cpu"; + reg = <2>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU2_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU3: cpu at 3 { + device_type = "cpu"; + reg = <3>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU3_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + }; + L2: l2-cache at e0500000 { + compatible = "cache"; + cache-level = <2>; + cache-size = <0x80000>; + reg = <0x00000000 0xe0500000 0x00000000 0x00001000>; + andes,inst-prefetch = <3>; + andes,data-prefetch = <3>; + // The value format is + andes,tag-ram-ctl = <0 0>; + andes,data-ram-ctl = <0 0>; + }; + memory at 0 { + reg = <0x00000000 0x00000000 0x00000000 0x80000000>; + device_type = "memory"; + }; + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,riscv-ae350-soc", "simple-bus"; + ranges; + plic0: interrupt-controller at e4000000 { + compatible = "riscv,plic0"; + reg = <0x00000000 0xe4000000 0x00000000 0x02000000>; + interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <71>; + }; + plic1: interrupt-controller at e6400000 { + compatible = "riscv,plic1"; + reg = <0x00000000 0xe6400000 0x00000000 0x00400000>; + interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <4>; + }; + plmt0: plmt0 at e6000000 { + compatible = "riscv,plmt0"; + reg = <0x00000000 0xe6000000 0x00000000 0x00100000>; + interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>; + }; + spiclk: virt_100mhz { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; + timer0: timer at f0400000 { + compatible = "andestech,atcpit100"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + }; + pwm: pwm at f0400000 { + compatible = "andestech,atcpit100-pwm"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + pwm-cells = <2>; + }; + wdt: wdt at f0500000 { + compatible = "andestech,atcwdt200"; + reg = <0x00000000 0xf0500000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <15000000>; + }; + serial0: serial at f0300000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x00000000 0xf0300000 0x00000000 0x00001000>; + interrupts = <9 4>; + interrupt-parent = <&plic0>; + clock-frequency = <19660800>; + reg-shift = <2>; + reg-offset = <32>; + no-loopback-test = <1>; + }; + rtc0: rtc at f0600000 { + compatible = "andestech,atcrtc100"; + reg = <0x00000000 0xf0600000 0x00000000 0x00001000>; + interrupts = <1 4 2 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + gpio: gpio at f0700000 { + compatible = "andestech,atcgpio100"; + reg = <0x00000000 0xf0700000 0x00000000 0x00001000>; + interrupts = <7 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + mac0: mac at e0100000 { + compatible = "andestech,atmac100"; + reg = <0x00000000 0xe0100000 0x00000000 0x00001000>; + interrupts = <19 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + smu: smu at f0100000 { + compatible = "andestech,atcsmu"; + reg = <0x00000000 0xf0100000 0x00000000 0x00001000>; + }; + mmc0: mmc at f0e00000 { + compatible = "andestech,atfsdc010"; + reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>; + interrupts = <18 4>; + interrupt-parent = <&plic0>; + clock-freq-min-max = <400000 100000000>; + max-frequency = <100000000>; + fifo-depth = <16>; + cap-sd-highspeed; + dma-coherent; + }; + dma0: dma at f0c00000 { + compatible = "andestech,atcdmac300"; + reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>; + interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>; + interrupt-parent = <&plic0>; + dma-channels = <8>; + }; + lcd0: lcd at e0200000 { + compatible = "andestech,atflcdc100"; + reg = <0x00000000 0xe0200000 0x00000000 0x00001000>; + interrupts = <20 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + pmu: pmu { + compatible = "riscv,andes-pmu"; + device_type = "pmu"; + }; + spi: spi at f0b00000 { + compatible = "andestech,atcspi200"; + reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>; + interrupts = <4 4>; + interrupt-parent = <&plic0>; + #address-cells = <1>; + #size-cells = <0>; + num-cs = <1>; + clocks = <&spiclk>; + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0x00000000>; + spi-max-frequency = <50000000>; + spi-cpol; + spi-cpha; + }; + }; + }; +}; diff --git a/board/andes/ae350/boot.cmd b/board/andes/ae350/boot.cmd new file mode 100644 index 0000000000..2a046c6c7a --- /dev/null +++ b/board/andes/ae350/boot.cmd @@ -0,0 +1,3 @@ +setenv bootargs earlycon=sbi root=/dev/mmcblk0p2 rootwait +load mmc 0:1 0x600000 Image +booti 0x600000 - $fdtcontroladdr diff --git a/board/andes/ae350/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..e8bb3d4903 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,29 @@ +image boot.vfat { + vfat { + files = { + "Image", + "boot.scr", + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 128M +} + +image sdcard.img { + hdimage { + gpt = true + } + + partition u-boot { + partition-type-uuid = ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4 + image = "rootfs.ext4" + } +} diff --git a/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch new file mode 100644 index 0000000000..aeafed4c9f --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch @@ -0,0 +1,29 @@ +From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 29 Dec 2021 16:04:54 +0800 +Subject: [PATCH] Disable PIC explicitly for assembling + +This patch is necessary if the fw_dynamic load address +is not equal to link address. +However, they are equal currently, since we include an u-boot +patch for preventing fw_dynamic relocation. + +Signed-off-by: Yu Chien Peter Lin +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index d6f097d..441518d 100644 +--- a/Makefile ++++ b/Makefile +@@ -225,6 +225,7 @@ ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + ASFLAGS += $(GENFLAGS) + ASFLAGS += $(platform-asflags-y) + ASFLAGS += $(firmware-asflags-y) ++ASFLAGS += -fno-pic + + ARFLAGS = rcs + +-- +2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch new file mode 100644 index 0000000000..ae48a760c8 --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch @@ -0,0 +1,25 @@ +From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 30 Dec 2021 08:47:34 +0800 +Subject: [PATCH] Enable cache for opensbi jump mode + +Signed-off-by: Yu Chien Peter Lin +--- + firmware/fw_base.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/firmware/fw_base.S b/firmware/fw_base.S +index ab33e11..155d230 100644 +--- a/firmware/fw_base.S ++++ b/firmware/fw_base.S +@@ -46,6 +46,8 @@ + .globl _start + .globl _start_warm + _start: ++ li t0, 0x80003 ++ csrw 0x7ca, t0 + /* Find preferred boot HART id */ + MOV_3R s0, a0, s1, a1, s2, a2 + call fw_boot_hart +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch new file mode 100644 index 0000000000..7aff3cebf6 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch @@ -0,0 +1,27 @@ +From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:00:59 +0800 +Subject: [PATCH] Fix mmc no partition table error + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf..3b1e0aa0 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev) + return ret; + #endif + +- if (dev_read_bool(dev, "cap-mmc-highspeed") || \ +- dev_read_bool(dev, "cap-sd-highspeed")) +- chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz; +- + ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps, + priv->minmax[1] , priv->minmax[0]); + chip->mmc = &plat->mmc; +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch new file mode 100644 index 0000000000..c6e1896f1c --- /dev/null +++ b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch @@ -0,0 +1,27 @@ +From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:02:26 +0800 +Subject: [PATCH] Prevent fw_dynamic from relocation + +This patch prevents OpenSBI relocation, load fw_dynamic to link address + +Signed-off-by: Yu Chien Peter Lin +--- + board/AndesTech/ax25-ae350/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig +index e50f505a..385c4c11 100644 +--- a/board/AndesTech/ax25-ae350/Kconfig ++++ b/board/AndesTech/ax25-ae350/Kconfig +@@ -25,7 +25,7 @@ config SPL_TEXT_BASE + default 0x800000 + + config SPL_OPENSBI_LOAD_ADDR +- default 0x01000000 ++ default 0x0 + + config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch new file mode 100644 index 0000000000..20598fdba4 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch @@ -0,0 +1,26 @@ +From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 18:17:39 +0800 +Subject: [PATCH] Fix u-boot proper booting issue + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/cpu/start.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S +index 76850ec9..2ccda4f5 100644 +--- a/arch/riscv/cpu/start.S ++++ b/arch/riscv/cpu/start.S +@@ -139,7 +139,9 @@ call_harts_early_init: + * accesses gd). + */ + mv gp, s0 ++#if !CONFIG_IS_ENABLED(RISCV_SMODE) + bnez tp, secondary_hart_loop ++#endif + #endif + + jal board_init_f_init_reserve +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch new file mode 100644 index 0000000000..efd78ab26d --- /dev/null +++ b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch @@ -0,0 +1,25 @@ +From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 6 Jan 2022 13:50:07 +0800 +Subject: [PATCH] Enable printing OpenSBI boot logo + +Signed-off-by: Yu Chien Peter Lin +--- + include/opensbi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/opensbi.h b/include/opensbi.h +index d812cc8c..91fb8fd9 100644 +--- a/include/opensbi.h ++++ b/include/opensbi.h +@@ -20,7 +20,7 @@ + + enum sbi_scratch_options { + /** Disable prints during boot */ +- SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0), ++ SBI_SCRATCH_NO_BOOT_PRINTS = 0, + }; + + /** Representation dynamic info passed by previous booting stage */ +-- +2.25.1 diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..a104bb108e --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,63 @@ +Intro +===== + +Andestech AE350 Platform + +The AE350 prototype demonstrates the AE350 platform on the FPGA. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make andes_ae350_45_defconfig + +If you want to customize your configuration: + + $ make menuconfig + +Build everything +---------------- +Note: you will need to access to the network, since Buildroot will +download the packages' sources. + + $ make + +Result of the build +------------------- + +After building, you should obtain the following files: + + output/images/ + |-- Image + |-- ae350.dtb + |-- boot.scr + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- rootfs.ext2 + |-- rootfs.ext4 -> rootfs.ext2 + |-- sdcard.img + |-- u-boot-spl.bin + `-- u-boot.itb + +Copy the sdcard.img to a SD card with "dd": + + $ sudo dd if=sdcard.img of=/dev/sdX bs=4096 + +Your SD card partition should be: + + Disk /dev/mmcblk0: 31457280 sectors, 3072M + Logical sector size: 512 + Disk identifier (GUID): 546663ee-d2f1-427f-93a5-5c7b69dd801c + Partition table holds up to 128 entries + First usable sector is 34, last usable sector is 385062 + + Number Start (sector) End (sector) Size Name + 1 34 262177 128M u-boot + 2 262178 385057 60.0M rootfs + +Insert SD card and reset the board, should boot Linux from mmc. diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment new file mode 100644 index 0000000000..4992d712a5 --- /dev/null +++ b/board/andes/ae350/uboot.config.fragment @@ -0,0 +1,5 @@ +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_MMC=y +# CONFIG_SPL_RAM_SUPPORT is not set +# CONFIG_OF_BOARD is not set +CONFIG_OF_SEPARATE=y diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig new file mode 100644 index 0000000000..b8f91e50b3 --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,40 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,andestech,linux,591f3f73757ab80b46e7e1e10067ce3c82ff83a9)/linux-591f3f73757ab80b46e7e1e10067ce3c82ff83a9.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="andes/ae350" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/andes/ae350/boot.cmd" -- 2.17.1 From peterlin at andestech.com Tue Jan 25 05:49:56 2022 From: peterlin at andestech.com (Yu Chien Peter Lin) Date: Tue, 25 Jan 2022 13:49:56 +0800 Subject: [Buildroot] [PATCH v2 3/3] DEVELOPERS: add Yu-Chien Lin to board/andes In-Reply-To: <20220125054956.27492-1-peterlin@andestech.com> References: <20220125054956.27492-1-peterlin@andestech.com> Message-ID: <20220125054956.27492-3-peterlin@andestech.com> Nylon is no longer at Andes. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao --- DEVELOPERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index dc810b6fe1..b191734d5a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2137,10 +2137,11 @@ N: Norbert Lange F: package/systemd/ F: package/tcf-agent/ -N: Nylon Chen +N: Yu Chien Peter Lin F: arch/Config.in.nds32 F: board/andes F: configs/andes_ae3xx_defconfig +F: configs/andes_ae350_45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel -- 2.17.1 From baruch at tkos.co.il Tue Jan 25 06:01:55 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Tue, 25 Jan 2022 08:01:55 +0200 Subject: [Buildroot] [PATCH v2] package/htpdate: bump to version 1.3.3 In-Reply-To: <20220124213420.1171861-1-angelo@amarulasolutions.com> References: <20220124213420.1171861-1-angelo@amarulasolutions.com> Message-ID: <877dao9ws8.fsf@tarshish> Hi Angelo, On Mon, Jan 24 2022, Angelo Compagnucci wrote: > Bump and update project to its new location. > > Signed-off-by: Angelo Compagnucci > --- > * Rebased on master > * Keeping buildroot package init scripts > > package/htpdate/S43htpdate | 2 +- > package/htpdate/htpdate.hash | 2 +- > package/htpdate/htpdate.mk | 6 +++--- > package/htpdate/htpdate.service | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate > index 75f9a995ff..5971d70639 100644 > --- a/package/htpdate/S43htpdate > +++ b/package/htpdate/S43htpdate > @@ -9,7 +9,7 @@ test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" > start() { > printf 'Starting %s: ' "$DAEMON" > # shellcheck disable=SC2086 # we need the word splitting > - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ > + start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" \ > -- -D -i "$PIDFILE" $HTPDATE_ARGS > status=$? > if [ "$status" -eq 0 ]; then > diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash > index 824266c1bc..ef27f8f94c 100644 > --- a/package/htpdate/htpdate.hash > +++ b/package/htpdate/htpdate.hash > @@ -1,3 +1,3 @@ > # Locally calculated: > -sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz > +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz > sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE > diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk > index 52022346a9..200c3207a2 100644 > --- a/package/htpdate/htpdate.mk > +++ b/package/htpdate/htpdate.mk > @@ -4,13 +4,13 @@ > # > ################################################################################ > > -HTPDATE_VERSION = 1.2.6 > -HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) > +HTPDATE_VERSION = 1.3.3 > +HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) You should update the Config.in link as well. baruch > HTPDATE_LICENSE = GPL-2.0+ > HTPDATE_LICENSE_FILES = LICENSE > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > -HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 > +HTPDATE_BUILD_OPTS = https > HTPDATE_DEPENDENCIES += openssl host-pkgconf > endif > > diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service > index b7f1371b08..95220581d4 100644 > --- a/package/htpdate/htpdate.service > +++ b/package/htpdate/htpdate.service > @@ -7,7 +7,7 @@ Type=forking > PIDFile=/run/htpdate.pid > Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" > EnvironmentFile=-/etc/default/htpdate > -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS > +ExecStart=/usr/sbin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS > > [Install] > WantedBy=multi-user.target -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From thomas.petazzoni at bootlin.com Tue Jan 25 07:05:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 07:05:39 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-24 Message-ID: <20220125070545.09FA6401E1@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-24 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 51 | 12 | 0 | 63 | 2021.11.x | 24 | 1 | 0 | 25 | master | 91 | 43 | 0 | 134 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 11 host-util-linux-2.37.3 | 6 bluez5_utils-5.63 | 5 guile-3.0.7 | 3 frr-8.1 | 2 log4cxx-0.12.0 | 2 util-linux-2.37.3 | 2 bat-0.18.3 | 1 cairo-1.16.0 | 1 gvfs-1.48.1 | 1 kf5-kcoreaddons-5.47.0 | 1 kvm-unit-tests-kvm-unit-tes... | 1 libplist-2.2.0 | 1 mp4v2-5.0.1 | 1 netopeer2-2.0.35 | 1 rtorrent-0.9.8 | 1 sg3_utils-1.47 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | bat-0.18.3 | NOK | http://autobuild.buildroot.net/results/56dc103362e7ba7917c97b8c172476db72cf3232 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/593b9029a08436b850ff6af87517ac195c4d5fa5 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/85593d26a76835d2ca4e6accb1d7b83ad1e9098e | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/be6fbe69a6efe464ff156835f8ee27f59a911c16 | mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/f39dcea082bec2979cc56ab2547e51f33bc8e6fa | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/d2b7910bbd1db5339dab4759ad1f2f2481778a83 | mips64el | cairo-1.16.0 | NOK | http://autobuild.buildroot.net/results/66a50dc62e5818bfdcf0d0ecd4f599d0183d778d | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/610682d7e5c3fdcde06700828767fd67ec14be9f | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/af9e1c0d391f6e9998aacd5f00474e85c50247fd | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/25c3e9577a85ae30d76d3b5f6cb29805ec09a2b9 | ORPH sparc64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c2d566c5d5decfc699315c6e9a57e9e0f3cd0e99 | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/250814848233f66b7311d3a3eaa7f831e8c0c9b0 | ORPH aarch64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/ff4a829741676dbc501b70b3f6216fdc0182fcef | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/6e9bbd6ff1156fbfc79470a45672a0cd3da9a61a | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/43a1e376d2886b218b32a7d585132bac82181b31 | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/768cee9e747a008aaf42c434b0317f2ac0e3d180 | ORPH arm | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/e68e5c2600663668e62fbb85c859a97ed47843e8 | ORPH sh4 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/f18662c2064231bcf78d8438cce8bc0c9c261a52 | ORPH mipsel | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/27d4aaef1fcffb51fa82b6ad6b0fe303a6d7be33 | ORPH riscv32 | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/0267ff54ee82d853476ff7d6b14edb4aba308aa2 | powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/d0daf3dbbafc6b86bf89a6fa26c14d3fe9c9dde1 | or1k | libplist-2.2.0 | NOK | http://autobuild.buildroot.net/results/529846d9f76d810998315fa45fbffa5107e20aab | ORPH i686 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/65cc4ffa5be35e74ea4e2616373cce49056b1072 | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/e40cc85013721d5812229009490476627e83d0a3 | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/e5e6a7c2bd0cee79cb13135fe68cecc08ad96feb | ORPH riscv64 | netopeer2-2.0.35 | NOK | http://autobuild.buildroot.net/results/0660a4f767d5cdaf07b28a508101b87f0300850f | x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/846a91e5aeda960af08f3fccf58049c24da91a15 | ORPH powerpc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/12ebe83d6b2bc4f07b708f13489c9980e7eae705 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/42887b48e05f7fb23f80745852c3903efcea39e5 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/40b25b1c93ecaf30d91a6ad2fb434d6b494a965b | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/bc50609b429692c52e2983d44efae19cf61bcd31 | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f94780f625aa5e81d49cbbb894495d69d4d71d1b | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/bc8104f65deb54eeca8762ec99dce8c5e3a93fbc | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/4ae504a3ef8e8ff42d9eef6aee27e3a376583147 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/09e19e36823e78a75a1824040f6f52a67ac72756 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6eb39050d7ea2e8b0b1910f4cc2c35cf6e7dc5a4 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/7eaec1554cd5017651b31ca2dc875f9c2617ecc8 | mips64el | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6db5ee4f3bb6cb19bf24056ae694be17b67f9f83 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/e84e1201748035a05e2d0c8f95069d7c64816c2a | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/5f75cc4a1f13ee5de46910841beb66fa188b312d | mipsel | util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/30285d1da000de87d8ffa514eef957b2e15037ce | ORPH arm | util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/c2edca241e754566add0fd6b3f049c7945723cfc | ORPH riscv64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/2b564613e240e6105f64307cf2327d8403a8678c | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 gstreamer1-mm-1.10.0 | 1 haproxy-2.2.17 | 1 kismet-2020-12-R3 | 1 mesa3d-20.3.5 | 1 monkey-f54856ce250c4e257354... | 1 ndisc6-1.0.4 | 1 rocksdb-6.13.3 | 1 unknown | 1 xvisor-0.3.0 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/7b38a56dbc1705092efc8e1386e6f6119e8abd95 | ORPH sh4 | haproxy-2.2.17 | NOK | http://autobuild.buildroot.net/results/a8bd3b93c475e8b6213fc0c6276fc8b34fd6b567 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/0d9aa01ccf7dec1833c2c27d561ae527f4b0c31a | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/b3e810f0c7228b51e8a24b7ecccb867affaddb30 | m68k | kismet-2020-12-R3 | NOK | http://autobuild.buildroot.net/results/76a0dab1ac3d841c2d7fa5d31ec87b129b9b10c5 | ORPH arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/11a18e5ce6ea4870dc027f16e1ca4e083cdd1fe0 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/ef5af7fcb50bab30eebae6758109c34909765274 | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/75c7c6dc8a587f076246c765c0a7c1e0d63efaf3 | ORPH m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/36d0072d9870cf18604e504a445e7aba521edc8c | arm | unknown | NOK | http://autobuild.buildroot.net/results/409c59df06e8ef7a7f8ed50a9132d4fe9a63b06d | x86_64 | xvisor-0.3.0 | NOK | http://autobuild.buildroot.net/results/6159ee6b20e4253db3bae72a3e4cd61071792fb0 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/af487bfa353492104c28a3d8686c6266843f81f5 | Classification of failures by reason for 2021.11.x -------------------------------------------------- libnss-3.73 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/e02c7a0e22d8eee226e5c906537f7dfc559e067e | Gitlab CI results for 2022-01-24 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ ...nMips32r6elGlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006799239 | ORPH TestLuajitLuaFileSystem | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006798984 | ORPH TestLuvi | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006798997 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006798998 | ORPH TestPythonPy3Boto3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006799043 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006799132 | ORPH TestRustBin | https://gitlab.com/buildroot.org/buildroot/-/jobs/2006799133 | ORPH -- http://autobuild.buildroot.net From giulio.benetti at benettiengineering.com Tue Jan 25 07:09:07 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 25 Jan 2022 08:09:07 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-24 In-Reply-To: <20220125070545.09FA6401E1@smtp2.osuosl.org> References: <20220125070545.09FA6401E1@smtp2.osuosl.org> Message-ID: <78204a26-75d9-ef6a-bf7f-dee8b47fa508@benettiengineering.com> Hi Peter, On 25/01/22 08:05, Thomas Petazzoni wrote: [SNIP] > Detail of failures for 2021.11.x > -------------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > microblazeel | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/e02c7a0e22d8eee226e5c906537f7dfc559e067e | This ^^^ is fixed by: https://git.buildroot.net/buildroot/commit/?id=540029eb4550760c2190a18ecbf0cb4391bb1dea Best regards -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Tue Jan 25 07:41:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:06 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: drastically simplify the BR2_ARCH definition Message-ID: <20220125074920.4C91E8233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73d135a695cf59eb8ab6aafb59bfd281a7400203 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The BR2_ARCH definition is like this: * i486 for the i486 platform * i586 for a small number of platforms * i686 for all other x86 platforms when used in 32-bit, but we enumerate their entire list * x86_64 for all x86 64-bit platforms The list for i686 is long and needs to be extended everytime a new platform is added, with no added value. So this commit simplifies that by replacing this long list with just: default "i686" if BR2_i386 This works because Kconfig guarantees us that if an i386 platform matches an earlier case (i486 or one of the i586 platforms), the i486 and i586 earlier in the list will match. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0ba9ecbcea..a330d72f1d 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -311,30 +311,12 @@ config BR2_ARCH default "i686" if BR2_x86_c32 default "i586" if BR2_x86_winchip_c6 default "i586" if BR2_x86_winchip2 - default "i686" if BR2_x86_i686 - default "i686" if BR2_x86_pentium2 - default "i686" if BR2_x86_pentium3 - default "i686" if BR2_x86_pentium4 - default "i686" if BR2_x86_pentium_m - default "i686" if BR2_x86_pentiumpro - default "i686" if BR2_x86_prescott - default "i686" if BR2_x86_nocona && BR2_i386 - default "i686" if BR2_x86_core2 && BR2_i386 - default "i686" if BR2_x86_corei7 && BR2_i386 - default "i686" if BR2_x86_westmere && BR2_i386 - default "i686" if BR2_x86_corei7_avx && BR2_i386 - default "i686" if BR2_x86_core_avx2 && BR2_i386 - default "i686" if BR2_x86_atom && BR2_i386 - default "i686" if BR2_x86_silvermont && BR2_i386 - default "i686" if BR2_x86_opteron && BR2_i386 - default "i686" if BR2_x86_opteron_sse3 && BR2_i386 - default "i686" if BR2_x86_barcelona && BR2_i386 - default "i686" if BR2_x86_jaguar && BR2_i386 - default "i686" if BR2_x86_steamroller && BR2_i386 - default "i686" if BR2_x86_k6 - default "i686" if BR2_x86_k6_2 - default "i686" if BR2_x86_athlon - default "i686" if BR2_x86_athlon_4 + # We use the property of Kconfig that the first match of a + # list of default will be chosen. So the following entry will + # not match for all BR2_i386=y configurations, but only the + # ones that didn't match any of the previous cases (i486, + # i586). + default "i686" if BR2_i386 default "x86_64" if BR2_x86_64 config BR2_ENDIAN From yann.morin.1998 at free.fr Tue Jan 25 07:41:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:24 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add cannonlake, icelake-client, icelake-server CPU variants Message-ID: <20220125074920.8D7868233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86a70de48e6608c222ec6f9b443420ab62406722 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These were added in gcc 8.x. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 2034fb3bb7..e9c55bb319 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -315,6 +315,45 @@ config BR2_x86_skylake_avx512 select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +config BR2_x86_cannonlake + bool "cannonlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_icelake_client + bool "icelake-client" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_icelake_server + bool "icelake-server" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -448,6 +487,9 @@ config BR2_GCC_TARGET_ARCH default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "skylake-avx512" if BR2_x86_skylake_avx512 + default "cannonlake" if BR2_x86_cannonlake + default "icelake-client" if BR2_x86_icelake_client + default "icelake-server" if BR2_x86_icelake_server default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona From yann.morin.1998 at free.fr Tue Jan 25 07:40:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:40:59 +0100 Subject: [Buildroot] [git commit] support/scripts/gen-bootlin-toolchains: add support for new x86-64 toolchains Message-ID: <20220125074920.378B082774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93cb79318147191bf3b9fc2b047c24095f3194bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Following the merge of d6ce2a16814fd96a45888a774da6a4db74cd540a ("arch/Config.in.x86: add option for -march=x86-64") and eeace1cc13ce09a0c88ce177465b836d6eb58298 ("arch/Config.in.x86: add support for x86-64-v2, x86-64-v3, x86-64-v4"), bootlin.toolchains.com now provides toolchains targetting the x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 architecture variants. This commits modifies gen-bootlin-toolchains to support these toolchains. It should be noted that the description for the x86-64-v3 and x86-64-v4 toolchains are for now the same, as Buildroot doesn't yet have the options to describe the extra features that x86-64-v4 expects to find on the hardware platform. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/scripts/gen-bootlin-toolchains | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index f160a44152..a42ddb4097 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -178,6 +178,54 @@ arches = { 'conditions': ['BR2_sparc', 'BR2_sparc_v8'], 'prefix': 'sparc', }, + 'x86-64': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64'], + 'prefix': 'x86_64', + }, + 'x86-64-v2': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v2'], + 'prefix': 'x86_64', + }, + 'x86-64-v3': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42', + 'BR2_X86_CPU_HAS_AVX', + 'BR2_X86_CPU_HAS_AVX2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v3'], + 'prefix': 'x86_64', + }, + 'x86-64-v4': { + 'conditions': ['BR2_x86_64', + 'BR2_X86_CPU_HAS_MMX', + 'BR2_X86_CPU_HAS_SSE', + 'BR2_X86_CPU_HAS_SSE2', + 'BR2_X86_CPU_HAS_SSE3', + 'BR2_X86_CPU_HAS_SSSE3', + 'BR2_X86_CPU_HAS_SSE4', + 'BR2_X86_CPU_HAS_SSE42', + 'BR2_X86_CPU_HAS_AVX', + 'BR2_X86_CPU_HAS_AVX2'], + 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v4'], + 'prefix': 'x86_64', + }, 'x86-64-core-i7': { 'conditions': ['BR2_x86_64', 'BR2_X86_CPU_HAS_MMX', From yann.morin.1998 at free.fr Tue Jan 25 07:41:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:28 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add cooperlake CPU variant Message-ID: <20220125074920.9C4338277A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b84dcf9686f7e97249676915b7c042f3624e453 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It was added in gcc 10.x. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index dffc9a74d3..08837b7cea 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -397,6 +397,19 @@ config BR2_x86_cascadelake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_cooperlake + bool "cooperlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_10 config BR2_x86_tigerlake bool "tigerlake" select BR2_X86_CPU_HAS_MMX @@ -550,6 +563,7 @@ config BR2_GCC_TARGET_ARCH default "icelake-client" if BR2_x86_icelake_client default "icelake-server" if BR2_x86_icelake_server default "cascadelake" if BR2_x86_cascadelake + default "cooperlake" if BR2_x86_cooperlake default "tigerlake" if BR2_x86_tigerlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 From yann.morin.1998 at free.fr Tue Jan 25 07:41:14 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:14 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add skylake CPU variants Message-ID: <20220125074920.6C1C082774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c0088718ebca4166f87606d5fd811a4190750e6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Both skylake and skylake-avx512 were added in gcc 6.x. According to https://en.wikipedia.org/wiki/Skylake_(microarchitecture) the early Skylake processors indeed did not have AVX512 support, while the later ones did, hence the separate gcc options. Due to this being the first CPU we support with AVX512, this commit adds BR2_X86_CPU_HAS_AVX512. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index d5d84715b8..6b18580ae4 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -19,6 +19,8 @@ config BR2_X86_CPU_HAS_AVX bool config BR2_X86_CPU_HAS_AVX2 bool +config BR2_X86_CPU_HAS_AVX512 + bool choice prompt "Target Architecture Variant" @@ -259,6 +261,18 @@ config BR2_x86_broadwell select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_skylake + bool "skylake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -287,6 +301,19 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_skylake_avx512 + bool "skylake-avx512" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -414,10 +441,12 @@ config BR2_GCC_TARGET_ARCH default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell default "broadwell" if BR2_x86_broadwell + default "skylake" if BR2_x86_skylake default "atom" if BR2_x86_atom default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont + default "skylake-avx512" if BR2_x86_skylake_avx512 default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona From yann.morin.1998 at free.fr Tue Jan 25 07:41:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:10 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: westmere and silvermont were added in gcc 4.9 Message-ID: <20220125074920.5C7F88277A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a21705e7314c856dd8f75a66c99913376f3fd0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These were added in gcc commit d3c11974032e21121a051d423a1d71097edf752f ("Use proper Intel processor names for -march=/-mtune=") which was merged in gcc 4.9. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 4beb11662d..0aae26799c 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -196,6 +196,7 @@ config BR2_x86_westmere select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_corei7_avx bool "corei7-avx" select BR2_X86_CPU_HAS_MMX @@ -273,6 +274,7 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 From yann.morin.1998 at free.fr Tue Jan 25 07:41:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:26 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add goldmont, goldmont-plus, tremont, cascadelake, tigerlake CPU variants Message-ID: <20220125074920.947B582774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffcefb3a75d622fb283ec9a0e09b127de7c39110 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These were added in gcc 9.x. The goldmont, goldmont-plus and tremont are for the low-power CPUs. While cascadelake and tigerlake are for the high-end ones. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index e9c55bb319..dffc9a74d3 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -302,6 +302,36 @@ config BR2_x86_silvermont select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_goldmont + bool "goldmont" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_goldmont_plus + bool "goldmont-plus" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_tremont + bool "tremont" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_x86_skylake_avx512 bool "skylake-avx512" select BR2_X86_CPU_HAS_MMX @@ -354,6 +384,32 @@ config BR2_x86_icelake_server select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_x86_cascadelake + bool "cascadelake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_tigerlake + bool "tigerlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -486,10 +542,15 @@ config BR2_GCC_TARGET_ARCH default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont + default "goldmont" if BR2_x86_goldmont + default "goldmont-plus" if BR2_x86_goldmont_plus + default "tremont" if BR2_x86_tremont default "skylake-avx512" if BR2_x86_skylake_avx512 default "cannonlake" if BR2_x86_cannonlake default "icelake-client" if BR2_x86_icelake_client default "icelake-server" if BR2_x86_icelake_server + default "cascadelake" if BR2_x86_cascadelake + default "tigerlake" if BR2_x86_tigerlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona From yann.morin.1998 at free.fr Tue Jan 25 07:41:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:08 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add "newer" names for several Intel x86 CPU variants Message-ID: <20220125074920.5432E82774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=653fa001f30414165cb54dde577688d78cca6b42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In gcc commit d3c11974032e21121a051d423a1d71097edf752f ("Use proper Intel processor names for -march=/-mtune="), which was merged in gcc 4.9, the following replacements were made: * corei7 -> nehalem * corei7-avx -> sandybridge * core-avx-i -> ivybridge * core-avx2 -> haswell * atom -> bonnel * slm -> silvermont So this commit marks the Buildroot options BR2_x86_corei7, BR2_x86_corei7_avx, BR2_x86_core_avx2 and BR2_x86_atom as deprecated, and adds the four corresponding options with the newer names. Note that the older options are still kept because the new option names are only supported starting gcc 4.9, and we theoretically still supports targets gcc as old as gcc 4.3. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index a330d72f1d..4beb11662d 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -174,6 +174,19 @@ config BR2_x86_corei7 select BR2_X86_CPU_HAS_SSSE3 select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 + help + This option is deprecated. Since gcc 4.9, the gcc option + "nehalem" is preferred. Use BR2_x86_nehalem instead. +config BR2_x86_nehalem + bool "nehalem" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_westmere bool "westmere" select BR2_X86_CPU_HAS_MMX @@ -193,6 +206,20 @@ config BR2_x86_corei7_avx select BR2_X86_CPU_HAS_SSE4 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX + help + This option is deprecated. Since gcc 4.9, the gcc option + "sandybridge" is preferred. Use BR2_x86_sandybridge instead. +config BR2_x86_sandybridge + bool "sandybridge" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_core_avx2 bool "core-avx2" select BR2_X86_CPU_HAS_MMX @@ -204,6 +231,21 @@ config BR2_x86_core_avx2 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 + help + This option is deprecated. Since gcc 4.9, the gcc option + "haswell" is preferred. Use BR2_x86_haswell instead. +config BR2_x86_haswell + bool "haswell" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -211,6 +253,17 @@ config BR2_x86_atom select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 select BR2_X86_CPU_HAS_SSSE3 + help + This option is deprecated. Since gcc 4.9, the gcc option + "bonnel" is preferred. Use BR2_x86_bonnel instead. +config BR2_x86_bonnel + bool "bonnel" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_silvermont bool "silvermont" select BR2_X86_CPU_HAS_MMX @@ -341,9 +394,13 @@ config BR2_GCC_TARGET_ARCH default "nocona" if BR2_x86_nocona default "core2" if BR2_x86_core2 default "corei7" if BR2_x86_corei7 + default "nehalem" if BR2_x86_nehalem default "corei7-avx" if BR2_x86_corei7_avx + default "sandybridge" if BR2_x86_sandybridge default "core-avx2" if BR2_x86_core_avx2 + default "haswell" if BR2_x86_haswell default "atom" if BR2_x86_atom + default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "k8" if BR2_x86_opteron From yann.morin.1998 at free.fr Tue Jan 25 07:41:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:19 +0100 Subject: [Buildroot] [git commit] support/scripts/gen-bootlin-toolchains: add missing BR2_X86_CPU_HAS_AVX512 condition for x86-64-v4 Message-ID: <20220125074920.7D73D8233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ed58f94ee2944959a1c35850fb62241eefc99fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The x86-64-v4 toolchain assumes availability of AVX512, as per the definition of the x86-64-v4 "standard". Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/scripts/gen-bootlin-toolchains | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index a42ddb4097..dc173fa949 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -222,7 +222,8 @@ arches = { 'BR2_X86_CPU_HAS_SSE4', 'BR2_X86_CPU_HAS_SSE42', 'BR2_X86_CPU_HAS_AVX', - 'BR2_X86_CPU_HAS_AVX2'], + 'BR2_X86_CPU_HAS_AVX2', + 'BR2_X86_CPU_HAS_AVX512'], 'test_options': ['BR2_x86_64', 'BR2_x86_x86_64_v4'], 'prefix': 'x86_64', }, From yann.morin.1998 at free.fr Tue Jan 25 07:41:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:12 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add broadwell Intel CPU variant Message-ID: <20220125074920.645B68233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3702977799b6a9a6f7e0f9bfaf83fccd95e9dc41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It was added in gcc 4.9. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 0aae26799c..d5d84715b8 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -247,6 +247,18 @@ config BR2_x86_haswell select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 +config BR2_x86_broadwell + bool "broadwell" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_x86_atom bool "atom" select BR2_X86_CPU_HAS_MMX @@ -401,6 +413,7 @@ config BR2_GCC_TARGET_ARCH default "sandybridge" if BR2_x86_sandybridge default "core-avx2" if BR2_x86_core_avx2 default "haswell" if BR2_x86_haswell + default "broadwell" if BR2_x86_broadwell default "atom" if BR2_x86_atom default "bonnel" if BR2_x86_bonnel default "westmere" if BR2_x86_westmere From yann.morin.1998 at free.fr Tue Jan 25 07:40:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:40:57 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: re-update OpenRISC toolchains Message-ID: <20220125074920.2F2268233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7910b5e72df6e9b6c1dc6d3f041cf154668bd3b2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The OpenRISC toolchains have been rebuilt once again, this time with the _REENTRANT fixed merged in commit 98e39dc80ee81a166df90b4ff3232038a63b759c ("package/gcc: define _REENTRANT for OpenRISC when -pthread is passed") Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../toolchain-external-bootlin/Config.in.options | 8 ++++---- .../toolchain-external-bootlin.hash | 16 ++++++++-------- .../toolchain-external-bootlin.mk | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 94dea4a386..55b6d4c786 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -2400,7 +2400,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2021.11-4" + bool "openrisc musl bleeding-edge 2021.11-5" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -2423,7 +2423,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2021.11-4" + bool "openrisc musl stable 2021.11-5" depends on BR2_or1k depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -2445,7 +2445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2021.11-4" + bool "openrisc uclibc bleeding-edge 2021.11-5" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -2468,7 +2468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2021.11-4" + bool "openrisc uclibc stable 2021.11-5" depends on BR2_or1k select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 638130d8b8..8819782ac5 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -192,14 +192,14 @@ sha256 30d82c7ca41a0df9931a29a46ed881f21a889e9e59baf04e820c6679be87a7fb mips64 sha256 5c2dc11062f4817e81a328b12ab30be486b7e68c7c876eb45fffca72332a8804 nios2--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2021.11-1.sha256 sha256 f6f37f1e551edda0251ece8d906ed720bd8ec45da9d4b3e1d13721bdc9ef2882 nios2--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-4.sha256 -sha256 9100a143a2f96c46d4d593fb25f4cab4a2efc61371f12bd1a686fbd52ee64c63 openrisc--musl--bleeding-edge-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-4.sha256 -sha256 72fce2be59c18a5b3a02f51ebb83119a0f3d29ab7f2d5cd560038ff6f94f137a openrisc--musl--stable-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-4.sha256 -sha256 ffbdedf741bcfeadaf0c52ac09af83b24eedca2e9a5fc563127c5fdbd10c79a6 openrisc--uclibc--bleeding-edge-2021.11-4.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-4.sha256 -sha256 082ec406a6a516d582a092e63f9078e200a1e32dc24d47928f90c09b1e61819b openrisc--uclibc--stable-2021.11-4.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-5.sha256 +sha256 03f46c8fdded0002a2a04749bcf86136ec26a841654bf9fdc14575cc510739c6 openrisc--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-5.sha256 +sha256 409e4a7473125e7de7c8b0e6bc1cb971d53e63ac057e9a19102e4ce1467f442a openrisc--musl--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 9028d4e526f9e805b021791443805541a179eaf2e47a2af4dfbefb2021e44e9f openrisc--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-5.sha256 +sha256 f07d8e465f7e94e55330cfb55bbaf9fc27e4bb7b688271ead60a15aec3dbbf76 openrisc--uclibc--stable-2021.11-5.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2021.11-1.sha256 sha256 53afdbe1e48d0c60d560db8d17042a99288661fe10eebbfcfec4e56a6c2ca594 powerpc-440fp--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2021.11-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 f28592272c..64ae44f364 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -583,25 +583,25 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-4 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif From yann.morin.1998 at free.fr Tue Jan 25 07:41:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:02 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: update with new x86-64 toolchains Message-ID: <20220125074920.437C48277A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7df632905fdd7d9334b71f08d8b324841912144f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../tests/toolchain/test_external_bootlin.py | 225 +++++++++++ .../toolchain-external-bootlin/Config.in.options | 446 +++++++++++++++++++++ .../toolchain-external-bootlin.hash | 30 ++ .../toolchain-external-bootlin.mk | 90 +++++ 4 files changed, 791 insertions(+) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index 5e908b957e..cf6174303e 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2362,6 +2362,231 @@ class TestExternalToolchainBootlinSparcv8UclibcStable(TestExternalToolchain): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664GlibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664MuslStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664UclibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v2UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v3UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinX8664v4UclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664corei7GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 55b6d4c786..42cad21d71 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -37,6 +37,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 default y if BR2_sparc && BR2_sparc_v8 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 @@ -3791,6 +3795,448 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE + bool "x86-64 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 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_X86_64_GLIBC_STABLE + bool "x86-64 glibc stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE + bool "x86-64 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 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_X86_64_MUSL_STABLE + bool "x86-64 musl stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64 architecture, using the + musl C library. This is a stable version, which means it is + using stable and proven versions of gcc, gdb and binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE + bool "x86-64 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64 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_X86_64_UCLIBC_STABLE + bool "x86-64 uclibc stable 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64 architecture, using the + uclibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE + bool "x86-64-v2 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v2 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_X86_64_V2_MUSL_BLEEDING_EDGE + bool "x86-64-v2 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v2 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_X86_64_V2_UCLIBC_BLEEDING_EDGE + bool "x86-64-v2 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v2 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_X86_64_V3_GLIBC_BLEEDING_EDGE + bool "x86-64-v3 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v3 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_X86_64_V3_MUSL_BLEEDING_EDGE + bool "x86-64-v3 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v3 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_X86_64_V3_UCLIBC_BLEEDING_EDGE + bool "x86-64-v3 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v3 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_X86_64_V4_GLIBC_BLEEDING_EDGE + bool "x86-64-v4 glibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v4 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_X86_64_V4_MUSL_BLEEDING_EDGE + bool "x86-64-v4 musl bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + 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 x86-64-v4 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_X86_64_V4_UCLIBC_BLEEDING_EDGE + bool "x86-64-v4 uclibc bleeding-edge 2021.11-5" + depends on BR2_x86_64 + depends on BR2_X86_CPU_HAS_MMX + depends on BR2_X86_CPU_HAS_SSE + depends on BR2_X86_CPU_HAS_SSE2 + depends on BR2_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + 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 x86-64-v4 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_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE bool "x86-64-core-i7 glibc bleeding-edge 2021.11-1" depends on BR2_x86_64 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 8819782ac5..6542694033 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -306,6 +306,36 @@ sha256 0ef307f6c91733ee82ce65801768013f7e6220b605f4e152158cb55b4f983582 sparc6 sha256 3c85420becb7caa84a9a229483f3f2d7158eb66817acdfa5d5700c3a05436cba sparcv8--uclibc--bleeding-edge-2021.11-3.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2021.11-1.sha256 sha256 f6d35e33338b26e71403b4c6d3944ab561f2a6e9b801ab33fbb401b4722044dd sparcv8--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2021.11-5.sha256 +sha256 024fd8edc91b9bfd643f8cf94e3f3ff2a6457aea654d10ef3516db8c3d94d5f5 x86-64--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2021.11-5.sha256 +sha256 6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0 x86-64--glibc--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2021.11-5.sha256 +sha256 468e6b73146595923fe87980a30adb54cd78f4c1e2f228e1a2c9bb705ea4243d x86-64--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2021.11-5.sha256 +sha256 2943617f6537ca195a66fb9db4a801a5dd1c108741c400d530d558d06908dd75 x86-64--musl--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 4aa8b8e2806d6fc87ba64ccec0a59b8a2fb5d157cda006d893e3f2264b7f0f10 x86-64--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2021.11-5.sha256 +sha256 e68fd1b23f4a5c5132f2122e4012c17eb24e5179b2ff45bb793a27ac30dd454f x86-64--uclibc--stable-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2021.11-5.sha256 +sha256 af20cf98ce937f298e0958e16793bb4c7b08236bc69ab11574a4266cccc3823d x86-64-v2--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2021.11-5.sha256 +sha256 17add21a0337d2f7d0d79d1f21db88098c3474920d71f902be46e8995eb86d35 x86-64-v2--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 b3ef49012af9fc9c2c8a44b0a20722be69b518cec5db06e48480291fc28aefe0 x86-64-v2--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2021.11-5.sha256 +sha256 244d4afab02b9c54c76385657d26798515331d7d4fa90928315366f31b9cc39e x86-64-v3--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2021.11-5.sha256 +sha256 551cff1b6425e2a6ced7b7ad032fba49b43ed095faae38d1842260ac0b5d6dbf x86-64-v3--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 30188f50adef711b55ac1d5be7218e0d6ee4200ddb8660e4d4971a9cefe22f91 x86-64-v3--uclibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2021.11-5.sha256 +sha256 0cd2de7c4103aa8cf47b72dc71146eb3bf7742a18d56c93128340ab3f4175804 x86-64-v4--glibc--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2021.11-5.sha256 +sha256 e159da16459e0f0d06a9a7467d5121202ab95e2fa6bf8abffdc0008c72fe9b07 x86-64-v4--musl--bleeding-edge-2021.11-5.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2021.11-5.sha256 +sha256 984f011d170d3e46322ae4a110c86ebf995598d877f410201b3fb3d86e25dac2 x86-64-v4--uclibc--bleeding-edge-2021.11-5.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2021.11-1.sha256 sha256 a3dbfcd3347a72ca344ae77882f929615776ea9b1b058eeea0a0915e7db89b69 x86-64-core-i7--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2021.11-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 64ae44f364..fb19ef2909 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -924,6 +924,96 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 From yann.morin.1998 at free.fr Tue Jan 25 07:41:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:17 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: x86-64-v4 implies AVX512 Message-ID: <20220125074920.7630C82774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fa073c65fce21e5f8ad0baf74e431f4cb598458 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that we have BR2_X86_CPU_HAS_AVX512, we can use it to fix the x86-64-v4 definition, which implies AVX512 support according to https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 6b18580ae4..2034fb3bb7 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -146,6 +146,7 @@ config BR2_x86_x86_64_v4 select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 help This option corresponds to the x86-64-v4 micro-architecture From yann.morin.1998 at free.fr Tue Jan 25 07:41:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:22 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: regenerate with AVX512 condition for x86-64-v4 toolchain Message-ID: <20220125074920.861618277A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82879ada2bb997dd3a6ff8541fe1a9169a832dba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../toolchain-external/toolchain-external-bootlin/Config.in.options | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 42cad21d71..4b4404620c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -40,7 +40,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 - default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 && BR2_X86_CPU_HAS_AVX512 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 @@ -4152,6 +4152,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -4185,6 +4186,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 @@ -4217,6 +4219,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR From yann.morin.1998 at free.fr Tue Jan 25 07:41:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:33 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: indicate how the CPU variants are ordered Message-ID: <20220125074920.AAC6082774@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=206ce351619e401cc7d7e53f1baad7b20d3d2da5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master They are loosely ordered according to the ordering of the gcc documentation. It is not entirely correct as the generic x86-64, x86-64-v2, x86-64-v3 and x86-64-v4 are listed before i386 in the gcc documentation, but this nevertheless gives a good explanation for the overall ordering of the list. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index cae5502051..27f2bfcd4c 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -22,6 +22,9 @@ config BR2_X86_CPU_HAS_AVX2 config BR2_X86_CPU_HAS_AVX512 bool +# This list of CPU architecture variant is (loosely) ordered according +# to the gcc documentation at +# https://gcc.gnu.org/onlinedocs/gcc-11.2.0/gcc/x86-Options.html choice prompt "Target Architecture Variant" default BR2_x86_i586 if BR2_i386 From yann.morin.1998 at free.fr Tue Jan 25 07:41:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:41:30 +0100 Subject: [Buildroot] [git commit] arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake Message-ID: <20220125074920.A3BBC8233A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7b9413056ccc1a359375c756c3f3c4e7e96e344 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master These were added in gcc 11.x. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in.x86 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 08837b7cea..cae5502051 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -423,6 +423,45 @@ config BR2_x86_tigerlake select BR2_X86_CPU_HAS_AVX2 select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_x86_sapphirerapids + bool "sapphirerapids" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_alderlake + bool "alderlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_x86_rocketlake + bool "rocketlake" + select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 + select BR2_X86_CPU_HAS_SSE3 + select BR2_X86_CPU_HAS_SSSE3 + select BR2_X86_CPU_HAS_SSE4 + select BR2_X86_CPU_HAS_SSE42 + select BR2_X86_CPU_HAS_AVX + select BR2_X86_CPU_HAS_AVX2 + select BR2_X86_CPU_HAS_AVX512 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_x86_k6 bool "k6" depends on !BR2_x86_64 @@ -565,6 +604,9 @@ config BR2_GCC_TARGET_ARCH default "cascadelake" if BR2_x86_cascadelake default "cooperlake" if BR2_x86_cooperlake default "tigerlake" if BR2_x86_tigerlake + default "sapphirerapids" if BR2_x86_sapphirerapids + default "alderlake" if BR2_x86_alderlake + default "rocketlake" if BR2_x86_rocketlake default "k8" if BR2_x86_opteron default "k8-sse3" if BR2_x86_opteron_sse3 default "barcelona" if BR2_x86_barcelona From yann.morin.1998 at free.fr Tue Jan 25 07:58:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 08:58:17 +0100 Subject: [Buildroot] [PATCH 00/16] Bootlin toolchain updates and x86 updates In-Reply-To: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> Message-ID: <20220125075817.GA457876@scaer> Thomas, All, On 2022-01-25 00:00 +0100, Thomas Petazzoni spake thusly: [--SNIP--] > Thomas Petazzoni (16): > toolchain/toolchain-external/toolchain-external-bootlin: re-update > OpenRISC toolchains > support/scripts/gen-bootlin-toolchains: add support for new x86-64 > toolchains > toolchain/toolchain-external/toolchain-external-bootlin: update with > new x86-64 toolchains > arch/Config.in.x86: drastically simplify the BR2_ARCH definition > arch/Config.in.x86: add "newer" names for several Intel x86 CPU > variants I was wondering if we should expand the prompt to include the fact that they are deprecated, or specific to gcc versions before 4.9... But whatever I tried was ugly or confusing, so I just left it as-is. Full series applied to master, thanks. Regards, Yann E. MORIN. > arch/Config.in.x86: westmere and silvermont were added in gcc 4.9 > arch/Config.in.x86: add broadwell Intel CPU variant > arch/Config.in.x86: add skylake CPU variants > arch/Config.in.x86: x86-64-v4 implies AVX512 > support/scripts/gen-bootlin-toolchains: add missing > BR2_X86_CPU_HAS_AVX512 condition for x86-64-v4 > toolchain/toolchain-external/toolchain-external-bootlin: regenerate > with AVX512 condition for x86-64-v4 toolchain > arch/Config.in.x86: add cannonlake, icelake-client, icelake-server CPU > variants > arch/Config.in.x86: add goldmont, goldmont-plus, tremont, cascadelake, > tigerlake CPU variants > arch/Config.in.x86: add cooperlake CPU variant > arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake > arch/Config.in.x86: indicate how the CPU variants are ordered > > arch/Config.in.x86 | 294 ++++++++++- > support/scripts/gen-bootlin-toolchains | 49 ++ > .../tests/toolchain/test_external_bootlin.py | 225 +++++++++ > .../Config.in.options | 457 +++++++++++++++++- > .../toolchain-external-bootlin.hash | 46 +- > .../toolchain-external-bootlin.mk | 98 +++- > 6 files changed, 1129 insertions(+), 40 deletions(-) > > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Tue Jan 25 09:11:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 25 Jan 2022 10:11:25 +0100 Subject: [Buildroot] [PATCH 00/16] Bootlin toolchain updates and x86 updates In-Reply-To: <20220125075817.GA457876@scaer> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> <20220125075817.GA457876@scaer> Message-ID: <20220125101125.6974b8bf@windsurf> Hello, On Tue, 25 Jan 2022 08:58:17 +0100 "Yann E. MORIN" wrote: > > Thomas Petazzoni (16): > > toolchain/toolchain-external/toolchain-external-bootlin: re-update > > OpenRISC toolchains > > support/scripts/gen-bootlin-toolchains: add support for new x86-64 > > toolchains > > toolchain/toolchain-external/toolchain-external-bootlin: update with > > new x86-64 toolchains > > arch/Config.in.x86: drastically simplify the BR2_ARCH definition > > arch/Config.in.x86: add "newer" names for several Intel x86 CPU > > variants > > I was wondering if we should expand the prompt to include the fact that > they are deprecated, or specific to gcc versions before 4.9... But > whatever I tried was ugly or confusing, so I just left it as-is. Originally, I was hoping to simply remove them, and add Config.in.legacy entries for these options, selecting the new ones. But alas, before gcc 4.9, the "new" names didn't exist. > Full series applied to master, thanks. Wow, thanks \o/ Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From bugzilla at busybox.net Tue Jan 25 10:52:06 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 25 Jan 2022 10:52:06 +0000 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14531 --- Comment #7 from Fabrice Fontaine --- (In reply to Giulio Benetti from comment #5) Hi Giulio, I already sent a patch in December: https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ I didn't take time to take into account the remarks from Romain Naour however I think that this approach is better. Best Regards, Fabrice -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Tue Jan 25 12:27:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 25 Jan 2022 13:27:39 +0100 Subject: [Buildroot] [Bug 14531] Package EFL - build error In-Reply-To: References: Message-ID: <2fe58d01-39a1-9c38-fa7d-1e6b7648ad2b@benettiengineering.com> Hi Fabrice, On 25/01/22 11:52, bugzilla at busybox.net wrote: > https://bugs.busybox.net/show_bug.cgi?id=14531 > > --- Comment #7 from Fabrice Fontaine --- > (In reply to Giulio Benetti from comment #5) > > Hi Giulio, > > I already sent a patch in December: > https://patchwork.ozlabs.org/project/buildroot/patch/20211230221904.3064022-1-fontaine.fabrice at gmail.com/ Damn, I didn't notice it before :-/ > I didn't take time to take into account the remarks from Romain Naour however I > think that this approach is better. They are 2 different approaches. The problem is the efl dependency handling that is not consistent leading to pitfall. Honestly I'd expect that if eeze is disabled it automatically disable all libraries that depend on it, but it's not that way. Thank you for pointing :-) Best regards -- Giulio Benetti Benetti Engineering sas From tom.marcuzzi at orolia.com Tue Jan 25 13:05:05 2022 From: tom.marcuzzi at orolia.com (Tom Marcuzzi) Date: Tue, 25 Jan 2022 14:05:05 +0100 Subject: [Buildroot] [PATCH v2] packages/nodejs: install npm packages on host In-Reply-To: <20220119140703.12978-1-tom.marcuzzi@orolia.com> References: <20220119140703.12978-1-tom.marcuzzi@orolia.com> Message-ID: <20220125130506.668690-1-tom.marcuzzi@orolia.com> Installing npm packages on host allows to use JavaScript tools that runs on NodeJS (such as webpack) to build web applications. Signed-off-by: Tom Marcuzzi --- Changes v1 -> v2: - Fixed indentation and help in Config.in.host - Corrected use of BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS - Rename HOST_NPM to NPMHOST to prevent check-package warning package/nodejs/Config.in.host | 32 ++++++++++++++++++++++++++++++++ package/nodejs/nodejs.mk | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 4ceaf0c73e..0b67a59c55 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -16,3 +16,35 @@ config BR2_PACKAGE_HOST_NODEJS comment "host nodejs needs a host gcc >= 8" depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS depends on !BR2_HOST_GCC_AT_LEAST_8 + +if BR2_PACKAGE_HOST_NODEJS + +config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL + string "Additional modules" + help + List of space-separated nodejs modules to install via npm + on host. See https://npmjs.org/ to find modules and + 'npm help install' for available installation methods. + For repeatable builds, download and save tgz files or + clone git repos for the components you care about. + + Example: + serialport uglify-js at 1.3.4 /my/module/mymodule.tgz \ + git://github.com/someuser/somemodule.git#v1.2 + + This would install the serialport module (at the newest + version), the uglify-js module at 1.3.4, a module from a + filesystem path, and a module from a git repository. + +config BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS + string "Additional module dependencies" + help + List of space-separated buildroot recipes which must be + built before your npms can be installed on host. For example, + if in 'Additional modules' you specified 'node-curl' (see: + https://github.com/jiangmiao/node-curl), you could then + specify 'host-libcurl' here, to ensure that buildroot builds + the host-libcurl package, and does so before building your node + modules. + +endif diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 727af6dc50..8a4a2ff0cf 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -10,7 +10,8 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib +HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib \ + $(call qstrip,$(BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL_DEPS)) NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE @@ -96,6 +97,35 @@ NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 +# +# Build the list of modules to install on host. +# +HOST_NODEJS_MODULES_LIST= $(call qstrip,\ + $(BR2_PACKAGE_HOST_NODEJS_MODULES_ADDITIONAL)) + +# Define NPMHOST for other packages to use +NPMHOST = $(HOST_CONFIGURE_OPTS) \ + LDFLAGS="$(HOST_LDFLAGS)" \ + LD="$(HOST_CXX)" \ + npm_config_arch=$(NODEJS_CPU) \ + npm_config_target_arch=$(NODEJS_CPU) \ + npm_config_build_from_source=true \ + npm_config_nodedir=$(HOST_DIR)/nodejs-$(NODEJS_VERSION) \ + npm_config_prefix=$(HOST_DIR)/usr \ + npm_config_cache=$(HOST_DIR)/.npm-cache \ + $(HOST_DIR)/bin/npm +# +# We can only call NPMHOST if there's something to install. +# +ifneq ($(HOST_NODEJS_MODULES_LIST),) +define HOST_NODEJS_INSTALL_MODULES + # If you're having trouble with module installation, adding -d to the + # npm install call below and setting npm_config_rollback=false can both + # help in diagnosing the problem. + $(NPMHOST) install -g $(HOST_NODEJS_MODULES_LIST) +endef +endif + define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) \ @@ -110,6 +140,8 @@ define HOST_NODEJS_INSTALL_CMDS $(foreach f,$(NODEJS_HOST_TOOLS), \ $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f) ) + + $(HOST_NODEJS_INSTALL_MODULES) endef ifeq ($(BR2_i386),y) -- 2.25.1 From aduskett at gmail.com Tue Jan 25 16:38:58 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 25 Jan 2022 08:38:58 -0800 Subject: [Buildroot] [PATCH 1/3] package/mender: bump to version 3.2.0 Message-ID: <20220125163900.269015-1-aduskett@gmail.com> Other changes: - Updated license hashes due to year changes, removals, and additions. Tested with: ./support/testing/run-tests tests.package.test_mender.TestMender Signed-off-by: Adam Duskett --- package/mender/mender.hash | 15 ++++++++------- package/mender/mender.mk | 7 ++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package/mender/mender.hash b/package/mender/mender.hash index 40d82f072f..af2780513d 100644 --- a/package/mender/mender.hash +++ b/package/mender/mender.hash @@ -1,12 +1,12 @@ # Locally computed: -sha256 716ba7110dd68cdafc5caa989706ff67bbac0617c284d666aa81605850be5763 3.1.0.tar.gz +sha256 b4f097b9dbf63d51ac837d6958ed0a2d9167a459ec502c15ef813d895d04f638 3.2.0.tar.gz # Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. -sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE -sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE +sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a vendor/github.com/mendersoftware/mender-artifact/LICENSE sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE @@ -14,26 +14,27 @@ sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor # BSD 2 Clause license. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE sha256 e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128 vendor/github.com/godbus/dbus/LICENSE +sha256 2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d vendor/github.com/gorilla/websocket/LICENSE # # BSD 3 Clause license. -sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE +sha256 0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf vendor/github.com/klauspost/compress/LICENSE sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/term/LICENSE # # ISC license. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE # # MIT license. sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE +sha256 5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212 vendor/github.com/klauspost/cpuid/v2/LICENSE sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/v2/LICENSE sha256 b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0 vendor/github.com/stretchr/objx/LICENSE -sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE # @@ -41,4 +42,4 @@ sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md # sha256 of all the vendor licenses combined -sha256 4f3541ea69b9b6e3959679576c146b42ba9a840a9dc4e593bff43e5e3a313d24 LIC_FILES_CHKSUM.sha256 +sha256 e6d8321e71be932e08b8923fe9e24e06a95c7e74a6b86e6f73696436ae0ea54f LIC_FILES_CHKSUM.sha256 diff --git a/package/mender/mender.mk b/package/mender/mender.mk index ddf3e43be2..61f872220c 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 3.1.0 +MENDER_VERSION = 3.2.0 MENDER_SITE = https://github.com/mendersoftware/mender/archive MENDER_SOURCE = $(MENDER_VERSION).tar.gz MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 @@ -20,20 +20,21 @@ MENDER_LICENSE_FILES = \ vendor/github.com/mendersoftware/progressbar/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/godbus/dbus/LICENSE \ + vendor/github.com/gorilla/websocket/LICENSE \ vendor/github.com/klauspost/compress/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ - vendor/golang.org/x/crypto/LICENSE \ vendor/golang.org/x/sys/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ + vendor/golang.org/x/term/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/klauspost/pgzip/LICENSE \ + vendor/github.com/klauspost/cpuid/v2/LICENSE \ vendor/github.com/sirupsen/logrus/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/ungerik/go-sysfs/LICENSE \ vendor/github.com/urfave/cli/v2/LICENSE \ vendor/github.com/stretchr/objx/LICENSE \ - vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \ vendor/gopkg.in/yaml.v3/LICENSE \ vendor/github.com/mattn/go-isatty/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md -- 2.34.1 From aduskett at gmail.com Tue Jan 25 16:38:59 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 25 Jan 2022 08:38:59 -0800 Subject: [Buildroot] [PATCH 2/3] package/mender/mender.mk: add bootloader-integration inventory script In-Reply-To: <20220125163900.269015-1-aduskett@gmail.com> References: <20220125163900.269015-1-aduskett@gmail.com> Message-ID: <20220125163900.269015-2-aduskett@gmail.com> This script is installed in the official meta-mender yocto recipe. Install it here as well. Signed-off-by: Adam Duskett --- package/mender/mender.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 61f872220c..2a601d2b1d 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -61,7 +61,7 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \ $(TARGET_DIR)/usr/share/mender/identity/mender-device-identity - $(foreach f,hostinfo network os rootfs-type, \ + $(foreach f,bootloader-integration hostinfo network os rootfs-type, \ $(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \ $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) -- 2.34.1 From aduskett at gmail.com Tue Jan 25 16:39:00 2022 From: aduskett at gmail.com (Adam Duskett) Date: Tue, 25 Jan 2022 08:39:00 -0800 Subject: [Buildroot] [PATCH 3/3] package/mender-artifact: bump to version 3.7.0 In-Reply-To: <20220125163900.269015-1-aduskett@gmail.com> References: <20220125163900.269015-1-aduskett@gmail.com> Message-ID: <20220125163900.269015-3-aduskett@gmail.com> Other changes: - Updated license hashes due to year changes, removals, and additions. Signed-off-by: Adam Duskett --- package/mender-artifact/mender-artifact.hash | 27 ++++++++++++++++---- package/mender-artifact/mender-artifact.mk | 22 +++++++++++++--- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/package/mender-artifact/mender-artifact.hash b/package/mender-artifact/mender-artifact.hash index 27f18862bc..3018a349b4 100644 --- a/package/mender-artifact/mender-artifact.hash +++ b/package/mender-artifact/mender-artifact.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 c46c305616cf53e65b786862addf04d97c388e451f11478886967b494c4ce5d9 mender-artifact-3.6.1.tar.gz -sha256 ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a LIC_FILES_CHKSUM.sha256 +sha256 42898957ae015ea36ecf068e293df12572c09c1d4f0a8a615c106ae9aed5695d mender-artifact-3.7.0.tar.gz +sha256 31e34a6aeee65e7d45e243e86ac16de5530679f76041df362a7e86c90a54ad90 LIC_FILES_CHKSUM.sha256 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the # following command: @@ -11,6 +11,14 @@ sha256 ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a LIC_FI sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/genproto/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/grpc/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/appengine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/kms/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd vendor/go.opencensus.io/LICENSE +sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/golang/groupcache/LICENSE + # # BSD 2 Clause licenses. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE @@ -18,10 +26,18 @@ sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor # BSD 3 Clause licenses. sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE -sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/remyoudompheng/go-liblzma/LICENSE -sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE +sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf vendor/github.com/klauspost/compress/LICENSE sha256 75e1ca97a84a9da6051dee0114333388216f2c4a5a028296b882ff3d57274735 vendor/github.com/russross/blackfriday/v2/LICENSE.txt +sha256 17b5d209ba8f9684257ecfcff87df6ceda6194143a8fbd074f29727cff6f0c40 vendor/github.com/google/go-cmp/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/oauth2/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/text/LICENSE +sha256 110244b02140866ee37d17fa7449436a377ec3b85a481fbb208f4c87964382de vendor/google.golang.org/api/LICENSE +sha256 fc0a2f71df4e8f047902da53d1f85301be43e0f360fc167057a2d04658ed2ba9 vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE +sha256 4835612df0098ca95f8e7d9e3bffcb02358d435dbb38057c844c99d7f725eb20 vendor/google.golang.org/protobuf/LICENSE +sha256 8778a9fc1eaffb03ab873caae251df2d224f6b5502be8777d3cd573a4dd43903 vendor/github.com/golang/protobuf/LICENSE +sha256 b95218cd9607855a6536384c0262922b30a0c2bf56e4ced790240f3a3bac4722 vendor/github.com/googleapis/gax-go/v2/LICENSE # # ISC licenses. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE @@ -35,3 +51,4 @@ sha256 a55959c4e3e8917bfa857359bb641115336276a6cc97408fd8197e079fb18470 vendor sha256 c8024e31c1de453fea90f22a221968835cc7af9d520274a2576c9ec9976055b0 vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE +sha256 5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212 vendor/github.com/klauspost/cpuid/v2/LICENSE diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index 34d0cd9469..68bbad9a4d 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOST_MENDER_ARTIFACT_VERSION = 3.6.1 +HOST_MENDER_ARTIFACT_VERSION = 3.7.0 HOST_MENDER_ARTIFACT_SITE = $(call github,mendersoftware,mender-artifact,$(HOST_MENDER_ARTIFACT_VERSION)) HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT HOST_MENDER_ARTIFACT_LICENSE_FILES = \ @@ -12,13 +12,28 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ LIC_FILES_CHKSUM.sha256 \ vendor/github.com/minio/sha256-simd/LICENSE \ vendor/github.com/mendersoftware/progressbar/LICENSE \ + vendor/google.golang.org/genproto/LICENSE \ + vendor/google.golang.org/grpc/LICENSE \ + vendor/google.golang.org/appengine/LICENSE \ + vendor/cloud.google.com/go/kms/LICENSE \ + vendor/cloud.google.com/go/LICENSE \ + vendor/go.opencensus.io/LICENSE \ + vendor/github.com/golang/groupcache/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ vendor/golang.org/x/sys/LICENSE \ - vendor/golang.org/x/crypto/LICENSE \ vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ vendor/github.com/klauspost/compress/LICENSE \ vendor/github.com/russross/blackfriday/v2/LICENSE.txt \ + vendor/github.com/google/go-cmp/LICENSE \ + vendor/golang.org/x/net/LICENSE \ + vendor/golang.org/x/oauth2/LICENSE \ + vendor/golang.org/x/text/LICENSE \ + vendor/google.golang.org/api/LICENSE \ + vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE \ + vendor/google.golang.org/protobuf/LICENSE \ + vendor/github.com/golang/protobuf/LICENSE \ + vendor/github.com/googleapis/gax-go/v2/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/urfave/cli/LICENSE \ @@ -27,7 +42,8 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md \ vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE \ vendor/gopkg.in/yaml.v3/LICENSE \ - vendor/github.com/mattn/go-isatty/LICENSE + vendor/github.com/mattn/go-isatty/LICENSE \ + vendor/github.com/klauspost/cpuid/v2/LICENSE HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz -- 2.34.1 From peter at korsgaard.com Tue Jan 25 16:43:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 17:43:43 +0100 Subject: [Buildroot] [PATCH] package/binutils: fix an OpenRISC binutils 2.37 patch In-Reply-To: <20211226103329.660967-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni's message of "Sun, 26 Dec 2021 11:33:29 +0100") References: <20211226103329.660967-1-thomas.petazzoni@bootlin.com> Message-ID: <87mtjjn4u8.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > When binutils 2.37 was introduced in commit > 62f0232980c8168631b29f27edf612af8109c691 ("package/binutils: add > version 2.37"), the patch > 0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch was > not properly updated. Indeed, between binutils 2.36 and 2.37, binutils > has switched to using the standard "bool" type, so instead of using > TRUE/FALSE, true/false must be used. > With this change, the binutils patch matches the one that was merged > upstream. > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Tue Jan 25 17:01:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 18:01:21 +0100 Subject: [Buildroot] [PATCH 00/16] Bootlin toolchain updates and x86 updates In-Reply-To: <20220125101125.6974b8bf@windsurf> References: <20220124230116.203218-1-thomas.petazzoni@bootlin.com> <20220125075817.GA457876@scaer> <20220125101125.6974b8bf@windsurf> Message-ID: <20220125170121.GB457876@scaer> Thomas, All, On 2022-01-25 10:11 +0100, Thomas Petazzoni spake thusly: > On Tue, 25 Jan 2022 08:58:17 +0100 > "Yann E. MORIN" wrote: > > > Thomas Petazzoni (16): [--SNIP--] > > > arch/Config.in.x86: add "newer" names for several Intel x86 CPU > > > variants > > I was wondering if we should expand the prompt to include the fact that > > they are deprecated, or specific to gcc versions before 4.9... But > > whatever I tried was ugly or confusing, so I just left it as-is. > Originally, I was hoping to simply remove them, and add > Config.in.legacy entries for these options, selecting the new ones. But > alas, before gcc 4.9, the "new" names didn't exist. Yeah, I was wondering why we would not add them to legacy, then I read the commit log. ;-) But in the end, I believe legacy should be doable, albeit a bit ugly. In legacy (only two entries used as example): config BR2_x86_corei7 bool "corei7 has been renamed to nehalem" select BR2_LEGACY config BR2_x86_atom bool "atom has been renamed to bonnel" select BR2_LEGACY And then in the choice in arch/Config.in.x86: choice bool "Target Architecture Variant" default BR2_x86_nehalem if BR2_x86_corei7 # legacy default BR2_x86_bonnel if BR2_x86_atom # legacy default default BR2_x86_i586 if BR2_i386 depends on BR2_i386 || BR2_x86_64 # [0] [...] config BR2_x86_nehalem bool "nehalem (corei7 for gcc < 4.9)" config BR2_x86_bonnel bool "bonnel (previously: atom)" endchoice config BR2_GCC_TARGET_ARCH [...] default "nehalem" if BR2_x86_nehalem && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 default "corei7" if BR2_x86_nehalem # Legacy fallback default "bonnel" if BR2_x86_bonnel && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 default "atom" if BR2_x86_bonnel # Legacy fallback [...] This is a bit ugly, but a minor inconvenience. Note how I wrote two different prompts: it's just for illustration purposes, we'll need to settle on one or the other (or something else). [0] this dependency is superfluous, as the whole of arch/Config.in.x86 is already conditionally included with this same condition from arch/Config.in Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Tue Jan 25 17:03:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:03:32 +0100 Subject: [Buildroot] [PATCH 1/3] configs/warp7: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20211227175130.2986949-1-festevam@gmail.com> (Fabio Estevam's message of "Mon, 27 Dec 2021 14:51:28 -0300") References: <20211227175130.2986949-1-festevam@gmail.com> Message-ID: <87zgnjlpcr.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006500 > Signed-off-by: Fabio Estevam Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:03:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:03:38 +0100 Subject: [Buildroot] [PATCH 2/3] configs/mx6cubox: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20211227175130.2986949-2-festevam@gmail.com> (Fabio Estevam's message of "Mon, 27 Dec 2021 14:51:29 -0300") References: <20211227175130.2986949-1-festevam@gmail.com> <20211227175130.2986949-2-festevam@gmail.com> Message-ID: <87v8y7lpcl.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006257 > Signed-off-by: Fabio Estevam Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:04:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:04:24 +0100 Subject: [Buildroot] [PATCH 3/3] configs/imx6ullevk: Select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20211227175130.2986949-3-festevam@gmail.com> (Fabio Estevam's message of "Mon, 27 Dec 2021 14:51:30 -0300") References: <20211227175130.2986949-1-festevam@gmail.com> <20211227175130.2986949-3-festevam@gmail.com> Message-ID: <87r18vlpbb.fsf@dell.be.48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory > 1178 | # include > | ^~~~~~~~~~~~~~~ > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006189 > Signed-off-by: Fabio Estevam Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:01:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:01:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/warp7: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220125165919.56913827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e77dc1817a9f42e7ec9733b6c616ac534851101b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006500 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit f7071471ba64bc3e0036c1884dc3657568859113) Signed-off-by: Peter Korsgaard --- configs/warp7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 830d5187c8..5fca9f6cfc 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_BOARDNAME="warp7" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # wifi firmware for brcm43430 BR2_PACKAGE_LINUX_FIRMWARE=y From peter at korsgaard.com Tue Jan 25 16:33:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 17:33:39 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/binutils: fix an OpenRISC binutils 2.37 patch Message-ID: <20220125165919.4DA30827A0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a059006a1b8c2c8d4f1e04819031308a08e87898 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When binutils 2.37 was introduced in commit 62f0232980c8168631b29f27edf612af8109c691 ("package/binutils: add version 2.37"), the patch 0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch was not properly updated. Indeed, between binutils 2.36 and 2.37, binutils has switched to using the standard "bool" type, so instead of using TRUE/FALSE, true/false must be used. With this change, the binutils patch matches the one that was merged upstream. Signed-off-by: Thomas Petazzoni Reviewed-by: Giulio Benetti Signed-off-by: Yann E. MORIN (cherry picked from commit b032faa4019b60b34fd96df0a46ee7308e1fe074) Signed-off-by: Peter Korsgaard --- .../0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch index 779baeab63..0d18321ee1 100644 --- a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch @@ -46,7 +46,7 @@ index 32063ab0289..67252394173 100644 + _bfd_error_handler + (_("%pB: pc-relative relocation against dynamic symbol %s"), + input_bfd, name); -+ ret_val = FALSE; ++ ret_val = false; + bfd_set_error (bfd_error_bad_value); + } + break; From peter at korsgaard.com Tue Jan 25 17:04:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:04:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/imx6ullevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220125165919.6913C827A0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8a25482f3083f0d69ba3d48771477c61a24ab13 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006189 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit d9f72e37bdad345d80a5dd1c12ab7df2396b35b8) Signed-off-by: Peter Korsgaard --- configs/imx6ullevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index 06641f1458..c6e2981697 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From peter at korsgaard.com Tue Jan 25 17:02:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:02:33 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] configs/mx6cubox: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20220125165919.5EBEE827B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=850b8697a2f46c8d0f5c3ec816711bff74d8da25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory 1178 | # include | ^~~~~~~~~~~~~~~ Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006257 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 635f4b8b5a04d0802aa429fb92dbcd757feed66c) Signed-off-by: Peter Korsgaard --- configs/mx6cubox_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index d0ce2f9a6d..e80d995525 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -39,6 +39,7 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From peter at korsgaard.com Tue Jan 25 17:10:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: bump to version 20.10.11 In-Reply-To: <20211227003034.8877-1-christian@paral.in> (Christian Stewart's message of "Sun, 26 Dec 2021 16:30:34 -0800") References: <20211227003034.8877-1-christian@paral.in> Message-ID: <87mtjjlp1c.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Signed-off-by: Christian Stewart Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:10:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-cli: bump to version 20.10.11 In-Reply-To: <20211227003655.78166-1-christian@paral.in> (Christian Stewart's message of "Sun, 26 Dec 2021 16:36:55 -0800") References: <20211227003655.78166-1-christian@paral.in> Message-ID: <87ilu7lp18.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Signed-off-by: Christian Stewart Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 17:10:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-cli: bump to version 20.10.11 Message-ID: <20220125170404.6A285827BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d039cb94b2c2cf1286419e490a4f7f40c53cd7e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 60acafc80648bd87e86c574912ee71bd8bc64cbf) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 6eb9413a11..fbcda5753e 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d91010813824070dd2380013c8f343e61e6dda170f7853f024bda39b432b64ba docker-cli-20.10.9.tar.gz +sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 3a344bca36..0e35a60d43 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.9 +DOCKER_CLI_VERSION = 20.10.11 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Jan 25 17:10:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:48 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-engine: bump to version 20.10.11 Message-ID: <20220125170404.61D88827B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efbe462c8a2ddf514ca1e23ae347c8b79b863fd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 35cf2a00b2a97d32b80491043e802e8ed69bfbf9) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 5e15842859..d1323f507d 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 359e8854d0d51bc884d434f182f64ca62f25fbbe7b9c6a336eb09f212fe8cc9a docker-engine-20.10.9.tar.gz +sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 84366d9334..45fa7fa53e 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.9 +DOCKER_ENGINE_VERSION = 20.10.11 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Jan 25 17:10:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-engine: bump to version 20.10.11 Message-ID: <20220125170410.D5120827B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=114c95105f3543581497345159dde29d0567ce83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 35cf2a00b2a97d32b80491043e802e8ed69bfbf9) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 5e15842859..d1323f507d 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 359e8854d0d51bc884d434f182f64ca62f25fbbe7b9c6a336eb09f212fe8cc9a docker-engine-20.10.9.tar.gz +sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 84366d9334..45fa7fa53e 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.9 +DOCKER_ENGINE_VERSION = 20.10.11 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Jan 25 17:10:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:10:42 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-cli: bump to version 20.10.11 Message-ID: <20220125170410.DD88E827BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42850cce084406bc7ecbed1ff53c42eb40c83616 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 60acafc80648bd87e86c574912ee71bd8bc64cbf) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 6eb9413a11..fbcda5753e 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d91010813824070dd2380013c8f343e61e6dda170f7853f024bda39b432b64ba docker-cli-20.10.9.tar.gz +sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 3a344bca36..0e35a60d43 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.9 +DOCKER_CLI_VERSION = 20.10.11 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Jan 25 17:17:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:17:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/connman: add iwd support Message-ID: <20220125171229.04BFA82785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=528b64ab0e0fd20adf07ac284ed5d46de11d1859 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x IWD is a runtime dependency for the connman iwd plugin. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 9892fd8f06e51be6b838e99dce5075aceeda1142) Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index e5e596c973..8c66a69882 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -85,6 +85,12 @@ else CONNMAN_CONF_OPTS += --disable-wispr endif +ifeq ($(BR2_PACKAGE_IWD),y) +CONNMAN_CONF_OPTS += --enable-iwd +else +CONNMAN_CONF_OPTS += --disable-iwd +endif + define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef From peter at korsgaard.com Tue Jan 25 17:17:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:17:17 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/connman: add iwd support Message-ID: <20220125171239.EB97582785@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=123e8b59879bda71e29c6e6485a75e9fc10bfdf6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x IWD is a runtime dependency for the connman iwd plugin. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 9892fd8f06e51be6b838e99dce5075aceeda1142) Signed-off-by: Peter Korsgaard --- package/connman/connman.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index e5e596c973..8c66a69882 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -85,6 +85,12 @@ else CONNMAN_CONF_OPTS += --disable-wispr endif +ifeq ($(BR2_PACKAGE_IWD),y) +CONNMAN_CONF_OPTS += --enable-iwd +else +CONNMAN_CONF_OPTS += --disable-iwd +endif + define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef From peter at korsgaard.com Tue Jan 25 17:17:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:17:26 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/connman: add iwd support In-Reply-To: <20211222000241.1894807-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 21 Dec 2021 17:02:41 -0700") References: <20211222000241.1894807-1-james.hilliard1@gmail.com> Message-ID: <87ee4vlopl.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > IWD is a runtime dependency for the connman iwd plugin. > Signed-off-by: James Hilliard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Tue Jan 25 17:33:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 18:33:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer/gst1-plugins-bad: fix build with neon Message-ID: <20220125173328.3475928-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of neon to version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc: ../output-1/build/gst1-plugins-bad-1.18.5/ext/neon/meson.build:1:0: ERROR: Invalid version of dependency, need 'neon' ['<= 0.31.99'] found '0.32.2'. Fixes: - http://autobuild.buildroot.org/results/eaf1890176431000ea8b371956f0d2d7e9907aea Signed-off-by: Fabrice Fontaine --- ...n-Allow-building-against-neon-0-32-x.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch diff --git a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch b/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch new file mode 100644 index 0000000000..e995a8cb91 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch @@ -0,0 +1,29 @@ +From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 26 Sep 2021 21:34:30 +0200 +Subject: [PATCH] neon: Allow building against neon 0.32.x + +No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3 + +Part-of: + +[Retrieved from: +https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0] +Signed-off-by: Fabrice Fontaine +--- + subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/neon/meson.build b/ext/neon/meson.build +index bf49be9111..abd9763649 100644 +--- a/ext/neon/meson.build ++++ b/ext/neon/meson.build +@@ -1,4 +1,4 @@ +-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'], ++neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'], + required : get_option('neon')) + + if neon_dep.found() +-- +GitLab + -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 17:34:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 18:34:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongodb: security bump to version 4.2.18 Message-ID: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> Fix CVE-2021-20330: An attacker with basic CRUD permissions on a replicated collection can run the applyOps command with specially malformed oplog entries, resulting in a potential denial of service on secondaries. This issue affects MongoDB Server v4.0 versions prior to 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server v4.4 versions prior to 4.4.6. Drop third patch (already in version) https://docs.mongodb.com/master/release-notes/4.2/ Signed-off-by: Fabrice Fontaine --- ...-MINSIGSTKSZ-is-no-longer-a-constant.patch | 49 ------------------- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch diff --git a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch b/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch deleted file mode 100644 index 02b35c6e4f..0000000000 --- a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ef08d0dbc99db8c4620512e92bfb3154282eb5d3 Mon Sep 17 00:00:00 2001 -From: Andrew Morrow -Date: Wed, 15 Sep 2021 15:23:42 -0400 -Subject: [PATCH] SERVER-59459 With glibc-2.34, MINSIGSTKSZ is no longer a - constant - -[Retrieved (and backported) from: -https://github.com/mongodb/mongo/commit/ef08d0dbc99db8c4620512e92bfb3154282eb5d3] -Signed-off-by: Fabrice Fontaine ---- - src/mongo/stdx/thread.h | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h -index 7b15bb561bd9..6f1e16cdeb36 100644 ---- a/src/mongo/stdx/thread.h -+++ b/src/mongo/stdx/thread.h -@@ -76,11 +76,19 @@ class SigAltStackController { - } - - private: -+ static size_t _getStackSize() { -+ // It would be nice for this to be a constexpr, but -+ // MINSIGSTKSZ became a macro that invoked `sysconf` in glibc -+ // 2.34. -+ static const std::size_t kMinSigStkSz = MINSIGSTKSZ; -+ return std::max(kMongoMinSignalStackSize, kMinSigStkSz); -+ } -+ - void _install() const { - stack_t ss; - ss.ss_sp = _stackStorage.get(); - ss.ss_flags = 0; -- ss.ss_size = kStackSize; -+ ss.ss_size = _getStackSize(); - if (sigaltstack(&ss, nullptr)) { - abort(); - } -@@ -107,9 +115,7 @@ class SigAltStackController { - // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) - static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; - -- static constexpr std::size_t kStackSize = -- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); -- std::unique_ptr _stackStorage = std::make_unique(kStackSize); -+ std::unique_ptr _stackStorage = std::make_unique(_getStackSize()); - - #else // !MONGO_HAS_SIGALTSTACK - auto makeInstallGuard() const { diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 3b2580cc43..02da8ad452 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index c33c3c2eb7..f666e83a03 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.11 +MONGODB_VERSION = 4.2.18 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz -- 2.34.1 From peter at korsgaard.com Tue Jan 25 17:35:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:35:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/glibc: add a patch to fix build issue in kernels >= 3.15 and < 5.1 on Microblaze Message-ID: <20220125172932.587F782302@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=941714483eed1cd0cf3524b30e5ff1fe96f348f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x As explained in the patch itself, there is a bug in the handling of __pselect32() in glibc for the Microblaze architecture. There a special Microblaze variant that was added to support kernels older than < 3.15, but it "hides" a generic implementation that is needed to support kernels newer than 3.15 but older than 5.1 (which is when the time64 support for 32-bit architectures was added, making __pselect32 no longer needed). This bug causes a glibc build failure for kernels >= 3.15 but < 5.1, on Microblaze. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 17ebb6ffaed73bd144639775a10a09e651f1c6e3) Signed-off-by: Peter Korsgaard --- ...x-sysv-linux-microblaze-pselect32.c-add-m.patch | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch b/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch new file mode 100644 index 0000000000..3597cd6a11 --- /dev/null +++ b/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch @@ -0,0 +1,85 @@ +From af06fe63f9babb6d0179ae5d7d9245daada6bf56 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 26 Dec 2021 10:30:01 +0100 +Subject: [PATCH] sysdeps/unix/sysv/linux/microblaze/pselect32.c: add missing + implementation when !__ASSUME_TIME64_SYSCALLS + +In commit a92f4e6299fe0e3cb6f77e79de00817aece501ce ("linux: Add time64 +pselect support"), a Microblaze specific implementation of +__pselect32() was added to cover the case of kernels < 3.15 which lack +the pselect6 system call. + +This new file sysdeps/unix/sysv/linux/microblaze/pselect32.c takes +precedence over the default implementation +sysdeps/unix/sysv/linux/pselect32.c. + +However sysdeps/unix/sysv/linux/pselect32.c provides an implementation +of __pselect32() which is needed when __ASSUME_TIME64_SYSCALLS is not +defined. On Microblaze, which is a 32-bit architecture, +__ASSUME_TIME64_SYSCALLS is only true for kernels >= 5.1. + +Due to sysdeps/unix/sysv/linux/microblaze/pselect32.c taking +precedence over sysdeps/unix/sysv/linux/pselect32.c, it means that +when we are with a kernel >= 3.15 but < 5.1, we need a __pselect32() +implementation, but sysdeps/unix/sysv/linux/microblaze/pselect32.c +doesn't provide it, and sysdeps/unix/sysv/linux/pselect32.c which +would provide it is not compiled in. + +This causes the following build failure on Microblaze with for example +Linux kernel headers 4.9: + +/home/thomas/buildroot/buildroot/output/host/lib/gcc/microblazeel-buildroot-linux-gnu/10.3.0/../../../../microblazeel-buildroot-linux-gnu/bin/ld: /home/thomas/buildroot/buildroot/output/build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/libc_pic.os: in function `__pselect64': +(.text+0x120b44): undefined reference to `__pselect32' +collect2: error: ld returned 1 exit status + +To fix this, we take a crude approach: replicate in +sysdeps/unix/sysv/linux/microblaze/pselect32.c the +!__ASSUME_TIME64_SYSCALLS implementation that is already in +sysdeps/unix/sysv/linux/pselect32.c. + +Upstream: https://sourceware.org/pipermail/libc-alpha/2021-December/134635.html +Signed-off-by: Thomas Petazzoni +--- + .../unix/sysv/linux/microblaze/pselect32.c | 22 +++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/sysdeps/unix/sysv/linux/microblaze/pselect32.c b/sysdeps/unix/sysv/linux/microblaze/pselect32.c +index 70b7b52a48..6b6b3e8a2e 100644 +--- a/sysdeps/unix/sysv/linux/microblaze/pselect32.c ++++ b/sysdeps/unix/sysv/linux/microblaze/pselect32.c +@@ -22,7 +22,25 @@ + #include + #include + +-#ifndef __ASSUME_PSELECT ++#if !defined(__ASSUME_TIME64_SYSCALLS) ++int ++__pselect32 (int nfds, fd_set *readfds, fd_set *writefds, ++ fd_set *exceptfds, const struct __timespec64 *timeout, ++ const sigset_t *sigmask) ++{ ++ struct timespec ts32, *pts32 = NULL; ++ if (timeout != NULL) ++ { ++ ts32 = valid_timespec64_to_timespec (*timeout); ++ pts32 = &ts32; ++ } ++ ++ return SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, ++ pts32, ++ ((__syscall_ulong_t[]){ (uintptr_t) sigmask, ++ __NSIG_BYTES })); ++} ++#elif !defined(__ASSUME_PSELECT) + int + __pselect32 (int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, const struct __timespec64 *timeout, +@@ -57,4 +75,4 @@ __pselect32 (int nfds, fd_set *readfds, fd_set *writefds, + + return ret; + } +-#endif /* __ASSUME_PSELECT */ ++#endif +-- +2.31.1 + From peter at korsgaard.com Tue Jan 25 17:39:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 18:39:15 +0100 Subject: [Buildroot] [PATCH] package/glibc: add a patch to fix build issue in kernels >= 3.15 and < 5.1 on Microblaze In-Reply-To: <20211226104520.663206-1-thomas.petazzoni@bootlin.com> References: <20211226104520.663206-1-thomas.petazzoni@bootlin.com> Message-ID: <2d5dcf47-01c7-8a69-5ac9-25440798bd19@korsgaard.com> On 26/12/2021 11.45, Thomas Petazzoni wrote: > As explained in the patch itself, there is a bug in the handling of > __pselect32() in glibc for the Microblaze architecture. There a > special Microblaze variant that was added to support kernels older > than < 3.15, but it "hides" a generic implementation that is needed to > support kernels newer than 3.15 but older than 5.1 (which is when the > time64 support for 32-bit architectures was added, making __pselect32 > no longer needed). > > This bug causes a glibc build failure for kernels >= 3.15 but < 5.1, > on Microblaze. > > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 18:06:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:06:47 +0100 Subject: [Buildroot] [PATCH] package/gcc/Config.in.host: fix BR2_GCC_VERSION_ARC select of BR2_TOOLCHAIN_GCC_AT_LEAST_xyz In-Reply-To: <20211228204448.GB3390456@scaer> (Yann E. MORIN's message of "Tue, 28 Dec 2021 21:44:48 +0100") References: <20211227215833.1136054-1-thomas.petazzoni@bootlin.com> <20211228204448.GB3390456@scaer> Message-ID: <87a6fjlmfc.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Thomas, All, > On 2021-12-27 22:58 +0100, Thomas Petazzoni spake thusly: >> When the gcc arc version was bumped to a version using gcc >> 10.x (arc-2020.09-release) in commit >> 0791abfba0227803b19895ea22326f4e17ac93dc, the select of >> BR2_GCC_VERSION_ARC on the appropriate BR2_TOOLCHAIN_GCC_AT_LEAST_xyz >> was not updated. This commit fixes this issue. > I've slightly rephrased the commit log to also add a reference to > 0b4c7ba01cfe (toolchain: update option descriptions for ARC tools > arc-2020.09-release) which also missed updating the select. > Nice catch, applied to master, thanks. Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 18:06:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:06:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gcc/Config.in.host: fix BR2_GCC_VERSION_ARC select of BR2_TOOLCHAIN_GCC_AT_LEAST_xyz Message-ID: <20220125180001.C1D22818F6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57941d2e66d5147dcc9241e248a240cb47d0212c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When the gcc arc version was bumped to a version using gcc 10.x (arc-2020.09-release) in commit 0791abfba022 (toolchain: update ARC tools to arc-2020.09-release), the select of BR2_GCC_VERSION_ARC on the appropriate BR2_TOOLCHAIN_GCC_AT_LEAST_xyz was not updated. Commit 0b4c7ba01cfe (toolchain: update option descriptions for ARC tools arc-2020.09-release) fixed the prompt, but still forgot to update the appropriate BR2_TOOLCHAIN_GCC_AT_LEAST_xyz. This commit eventually fixes this issue. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 81662cf228290f4abd72243730156baabb8b91c9) Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index aa2665cbee..a1fe192d3a 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -12,7 +12,7 @@ config BR2_GCC_VERSION_ARC bool "gcc arc (10.x)" # Only supported architecture depends on BR2_arc - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 config BR2_GCC_VERSION_POWERPC_SPE bool "gcc powerpc spe" From peter at korsgaard.com Tue Jan 25 18:08:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:08:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/rng-tools: fix musl build In-Reply-To: <20211228133959.3690191-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 28 Dec 2021 14:39:59 +0100") References: <20211228133959.3690191-1-fontaine.fabrice@gmail.com> Message-ID: <875yq7lmcz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following musl build failure raised since bump to version 6.14 > in commit 5292d1cf9ad0605cc264fedc75c1b9a169aa183b: > /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: > rngd-rngd_jitter.o: in function `rngd_notime_start': > rngd_jitter.c:(.text+0xdc2): undefined reference to `pthread_attr_setaffinity_np' > Fixes: > - http://autobuild.buildroot.org/results/3ec7df86856aa9bee2f18a8faa44fd58bc8a6657 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 18:07:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:07:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rng-tools: fix musl build Message-ID: <20220125180126.9FD73818AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b30309847e307dee233d7cd8c57586f1ff50cad5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following musl build failure raised since bump to version 6.14 in commit 5292d1cf9ad0605cc264fedc75c1b9a169aa183b: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: rngd-rngd_jitter.o: in function `rngd_notime_start': rngd_jitter.c:(.text+0xdc2): undefined reference to `pthread_attr_setaffinity_np' Fixes: - http://autobuild.buildroot.org/results/3ec7df86856aa9bee2f18a8faa44fd58bc8a6657 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d94e2b6dd4f291a77bbfd06eabb7ce85c9bb6aa9) Signed-off-by: Peter Korsgaard --- ...-detect-non-posix-extensions-for-pthreads.patch | 43 +++++++++++++++++++ ...se-of-either-pthread-affinity-set-methods.patch | 49 ++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch b/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch new file mode 100644 index 0000000000..ba6cf63d7c --- /dev/null +++ b/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch @@ -0,0 +1,43 @@ +From d1840e54a15fc454936cada10cce7fd91d06232b Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Thu, 15 Jul 2021 08:43:01 -0400 +Subject: [PATCH] Adding ability to detect non-posix extensions for pthreads + +Theres a desire to build rngd with musl, which doesn't have all the gnu +extensions (but it has some). So test for those. Note, this requires +the addition of the USE_EXTENSIONS macro to enable -d_GNU_SOURCE + +Signed-off-by: Neil Horman + +[Retrieved from: +https://github.com/nhorman/rng-tools/commit/d1840e54a15fc454936cada10cce7fd91d06232b] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 0fe06fc..de7dca3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,7 @@ AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD + AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_HEADERS([rng-tools-config.h]) + AC_CONFIG_MACRO_DIRS([m4]) ++AC_USE_SYSTEM_EXTENSIONS + + dnl Parse options + +@@ -100,6 +101,12 @@ AS_IF( + ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] + ) + ++AC_CHECK_DECL(pthread_attr_setaffinity_np, ++ [AC_DEFINE([HAVE_PTHREAD_ATTR_SETAFFINITY], 1,[Set ATTR_SETAFFINITY])], ++ [ AC_CHECK_DECL(pthread_setaffinity_np, ++ [AC_DEFINE([HAVE_PTHREAD_SETAFFINITY],1, [Set PTHREAD_SETAFFINITY])], [ AC_MSG_ERROR([Neither pthread_setaffinity_np nor pthread_attr_setaffinity_np found])],[[#include ]]) ++ ], [[#include ]]) ++ + AS_IF( + [ test "x$with_nistbeacon" != "xno"], + [ diff --git a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch b/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch new file mode 100644 index 0000000000..17285baa6a --- /dev/null +++ b/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch @@ -0,0 +1,49 @@ +From 5caa086dc14cecf68d1a5c31e87ba1efb2c00893 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Thu, 15 Jul 2021 08:48:10 -0400 +Subject: [PATCH] Allow for use of either pthread affinity set methods + +musl has support for pthread_setaffinity_np, but not +pthread_attr_setaffinity_np. so check for hte existence of either +function in configure, and use the appropriate one. + +Signed-off-by: Neil Horman + +[Retrieved from: +https://github.com/nhorman/rng-tools/commit/5caa086dc14cecf68d1a5c31e87ba1efb2c00893] +Signed-off-by: Fabrice Fontaine +--- + rngd_jitter.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/rngd_jitter.c b/rngd_jitter.c +index ea29436..5c7e09e 100644 +--- a/rngd_jitter.c ++++ b/rngd_jitter.c +@@ -67,12 +67,25 @@ static int rngd_notime_start(void *ctx, + for(i=i-1;i>=0;i--) { + CPU_SET(i,cpus); + } +- pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); + ++ /* ++ * Note that only one of: ++ * HAVE_PTHREAD_ATTR_SETAFFINITY ++ * and ++ * HAVE_PTHREAD_SETAFFINITY ++ * Will ever be set, as per the configure.ac logic ++ */ ++#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY ++ pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); ++#endif + ret = -pthread_create(&thread_ctx->notime_thread_id, + &thread_ctx->notime_pthread_attr, + start_routine, arg); + ++#ifdef HAVE_PTHREAD_SETAFFINITY ++ pthread_setaffinity_np(&thread_ctx->notime_thread_id, cpusize, cpus); ++#endif ++ + CPU_FREE(cpus); + return ret; + } From peter at korsgaard.com Tue Jan 25 18:09:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:09:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/collectd: add missing comment for mysql dependencies Message-ID: <20220125180302.79BDC825DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f54fa1d46972059790203547063b67f72be8fa7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f877c668114c3dab465127a307b3268f1f34db5b) Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 82c24fdbc3..d783317f8a 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -377,6 +377,10 @@ config BR2_PACKAGE_COLLECTD_MYSQL Connects to a MySQL database and issues a "show status" command. +comment "mysql needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_COLLECTD_NETLINK bool "netlink" select BR2_PACKAGE_LIBMNL From peter at korsgaard.com Tue Jan 25 18:09:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:09:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/collectd: add missing comment for mysql dependencies Message-ID: <20220125180307.372AA825DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f517fae03e547d6c9e6c4fe373b17b61469afa1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f877c668114c3dab465127a307b3268f1f34db5b) Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index d44d4e4913..9c38d87bcb 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -384,6 +384,10 @@ config BR2_PACKAGE_COLLECTD_MYSQL Connects to a MySQL database and issues a "show status" command. +comment "mysql needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_COLLECTD_NETLINK bool "netlink" select BR2_PACKAGE_LIBMNL From peter at korsgaard.com Tue Jan 25 18:10:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:10:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectd: add missing C++ comment for mysql In-Reply-To: <20211228220911.32556057@windsurf> (Thomas Petazzoni's message of "Tue, 28 Dec 2021 22:09:11 +0100") References: <20211030215307.2155221-1-fontaine.fabrice@gmail.com> <20211228220911.32556057@windsurf> Message-ID: <871r0vlm9v.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Sat, 30 Oct 2021 23:53:07 +0200 > Fabrice Fontaine wrote: >> Add missing C++ comment for mysql and while at it drops depends on >> MMU and threads which are always true >> >> Signed-off-by: Fabrice Fontaine >> --- >> package/collectd/Config.in | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) > I have applied the comment addition, but not the removal of > "duplicated" dependencies. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Tue Jan 25 18:17:28 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:17:28 +0100 Subject: [Buildroot] [git commit] package/python-mpd2: bump to version 3.0.5 Message-ID: <20220125181205.A0632822FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be89d78a0f0731b387a0a0bd00e8118c6728fa72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Uladzimir Bely Signed-off-by: Yann E. MORIN --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index 83487257ee..88dcb28377 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz -sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz +md5 594dff3e53c8eb6f583ba642bc2c1a27 python-mpd2-3.0.5.tar.gz +sha256 6f1bffd93b9a32fc018a9bbf3487505b52e0d757ec34066905c60a912d492384 python-mpd2-3.0.5.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index f357e302fd..bfe382b59e 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.0.4 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 +PYTHON_MPD2_VERSION = 3.0.5 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ed/c2/263621bdbbc37fa1a55fa1a7f66fd601bf08b3f87481e318a3509fb6c4bf PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Tue Jan 25 18:19:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:19:21 +0100 Subject: [Buildroot] [PATCH] package/python-mpd2: bump to version 3.0.5 In-Reply-To: <20220124080352.2116-1-wiselord1983@gmail.com> References: <20220124080352.2116-1-wiselord1983@gmail.com> Message-ID: <20220125181921.GC457876@scaer> Uladzimir, All, On 2022-01-24 11:03 +0300, Uladzimir Bely spake thusly: > Signed-off-by: Uladzimir Bely Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-mpd2/python-mpd2.hash | 4 ++-- > package/python-mpd2/python-mpd2.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash > index 83487257ee..88dcb28377 100644 > --- a/package/python-mpd2/python-mpd2.hash > +++ b/package/python-mpd2/python-mpd2.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/python-mpd2/json > -md5 e31c6063e9c2e029a26b0815cd08b05e python-mpd2-3.0.4.tar.gz > -sha256 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5 python-mpd2-3.0.4.tar.gz > +md5 594dff3e53c8eb6f583ba642bc2c1a27 python-mpd2-3.0.5.tar.gz > +sha256 6f1bffd93b9a32fc018a9bbf3487505b52e0d757ec34066905c60a912d492384 python-mpd2-3.0.5.tar.gz > # Locally computed sha256 checksums > sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt > diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk > index f357e302fd..bfe382b59e 100644 > --- a/package/python-mpd2/python-mpd2.mk > +++ b/package/python-mpd2/python-mpd2.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -PYTHON_MPD2_VERSION = 3.0.4 > -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ad/92/bec26455a3a6d6146bcf2a974f5c3509d451306413b386fc12b037d9e3b0 > +PYTHON_MPD2_VERSION = 3.0.5 > +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/ed/c2/263621bdbbc37fa1a55fa1a7f66fd601bf08b3f87481e318a3509fb6c4bf > PYTHON_MPD2_SETUP_TYPE = setuptools > PYTHON_MPD2_LICENSE = LGPL-3.0+ > PYTHON_MPD2_LICENSE_FILES = LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 25 18:20:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:46 +0100 Subject: [Buildroot] [git commit] package/python-pyftpdlib: bump to version 1.5.6 Message-ID: <20220125182726.CDAB7827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4211a933a3f9762b2816c372f7aa2ca5e92db32d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update hash of LICENSE file (license updated to make it recognizable by github: https://github.com/giampaolo/pyftpdlib/commit/a3016e7d694c226cae6a2b7672c6c5196124cd7a) - Update indentation in hash file (two spaces) https://github.com/giampaolo/pyftpdlib/blob/release-1.5.6/HISTORY.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pyftpdlib/python-pyftpdlib.hash | 6 +++--- package/python-pyftpdlib/python-pyftpdlib.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index 7f8da95550..abbb1261b2 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyftpdlib/json -md5 7f8089520d60171bee5dab2b721e8d00 pyftpdlib-1.5.5.tar.gz -sha256 1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752 pyftpdlib-1.5.5.tar.gz +md5 459dd3e685c4b7dfcf574ca05e5586eb pyftpdlib-1.5.6.tar.gz +sha256 fda655d81f29af52885ca2f8a2704134baed540f16d66a0b26e8fdfafd12db5e pyftpdlib-1.5.6.tar.gz # Locally computed sha256 checksums -sha256 18a4ff1ddf890838e36504b307581e3eb42c890a7272ce28b18b3ce1205b7ea8 LICENSE +sha256 67a832551570a5ac5f7901eaa5ece4b9491fda7f2d8c93957c3bbc68a5a76d88 LICENSE diff --git a/package/python-pyftpdlib/python-pyftpdlib.mk b/package/python-pyftpdlib/python-pyftpdlib.mk index dbbb9e2842..931e2dad06 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.5 +PYTHON_PYFTPDLIB_VERSION = 1.5.6 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/27/64/06a574350c79873e908fa9f48b617e7961de50fc468acc0a05d76771bce9 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/31/61/63ef60aca6de07eba1639d9d47f3f8e29462e8bb49d6a8dce9aeff240646 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:20:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:43 +0100 Subject: [Buildroot] [git commit] package/python-pytz: bump to version 2021.3 Message-ID: <20220125182726.C2F79827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b603f2a1e8f2875e1f1c4cec385a73b3e88901b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update hash of LICENSE.txt (year updated) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pytz/python-pytz.hash | 6 +++--- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index d1ce81e590..e0f253902c 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 c3d84a465fc56a4edd52cca8873ac0df pytz-2019.3.tar.gz -sha256 b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be pytz-2019.3.tar.gz +md5 d7b7060bbac4970afa2050c139c9fcb6 pytz-2021.3.tar.gz +sha256 acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 pytz-2021.3.tar.gz # Locally computed sha256 checksums -sha256 39f07c72a1bfda349cbd27bac9bcb1e6f8c5b4e5cc3fadf56900406e8cc0b792 LICENSE.txt +sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 888f3c4556..d606750699 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2019.3 +PYTHON_PYTZ_VERSION = 2021.3 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/82/c3/534ddba230bd4fbbd3b7a3d35f3341d014cca213f369a9940925e7e5f691 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From yann.morin.1998 at free.fr Tue Jan 25 18:20:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:53 +0100 Subject: [Buildroot] [git commit] package/python-aiorwlock: bump to version 1.3.0 Message-ID: <20220125182726.EFF3D827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea135ccb7a2e00e3e0572430a2ecf5cd6a879370 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index fad7079789..15584a8a41 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz -sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz +md5 28e4812a1d1d67a2be4370209ece5528 aiorwlock-1.3.0.tar.gz +sha256 83f12d87df4b9728a0b8fda1756585ab0d652b107bab59c6084e1b1ad692ab45 aiorwlock-1.3.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index 4ba4965eb5..a5e7eeae83 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.2.0 +PYTHON_AIORWLOCK_VERSION = 1.3.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/fe/7027595f5e635ac1f597f7160a420e1f642a474576efb697001efea16bdc PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:20:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:51 +0100 Subject: [Buildroot] [git commit] package/python-itsdangerous: bump to version 2.0.1 Message-ID: <20220125182726.E5780827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bd2ae3b4fc0fd16300861a55c04ad6d72389d49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - python 2 support has been dropped since version 2.0.0 and https://github.com/pallets/itsdangerous/commit/e085f3eedf94fe42391aaa9fc349927f8feaa367 - Update hash of license file (license standardized: https://github.com/pallets/itsdangerous/commit/c880f85ccdaee29adab8b47ad79eb7bdec507b57) - Update indentation in hash file (two spaces) https://itsdangerous.palletsprojects.com/en/2.0.x/changes/#version-2-0-1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-itsdangerous/Config.in | 4 ++-- package/python-itsdangerous/python-itsdangerous.hash | 8 +++++--- package/python-itsdangerous/python-itsdangerous.mk | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in index 39ec0b7725..72aa9165f8 100644 --- a/package/python-itsdangerous/Config.in +++ b/package/python-itsdangerous/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_ITSDANGEROUS bool "python-itsdangerous" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Itsdangerous contains various helpers to pass data to untrusted environments and to get it back safe and sound. diff --git a/package/python-itsdangerous/python-itsdangerous.hash b/package/python-itsdangerous/python-itsdangerous.hash index 0904a91183..dad4ec0800 100644 --- a/package/python-itsdangerous/python-itsdangerous.hash +++ b/package/python-itsdangerous/python-itsdangerous.hash @@ -1,4 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/itsdangerous/json -md5 9b7f5afa7f1e3acfb7786eeca3d99307 itsdangerous-1.1.0.tar.gz -sha256 321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19 itsdangerous-1.1.0.tar.gz -sha256 feb28bfa348d816b0e7dbaeddf18499ee7e8007c67813db8d6ab37c65e046cd4 LICENSE.rst +md5 996b9763d1b4bd0edd6eb86f0a490629 itsdangerous-2.0.1.tar.gz +sha256 9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 itsdangerous-2.0.1.tar.gz +# Locally computed sha256 checksums +sha256 63af09891b6be8ad1a4252ed43af0f4efba7fc948e228367bed7f3c5ae0b09d7 LICENSE.rst +sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk index 9429233703..c53bc6b9ba 100644 --- a/package/python-itsdangerous/python-itsdangerous.mk +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_ITSDANGEROUS_VERSION = 1.1.0 +PYTHON_ITSDANGEROUS_VERSION = 2.0.1 PYTHON_ITSDANGEROUS_SOURCE = itsdangerous-$(PYTHON_ITSDANGEROUS_VERSION).tar.gz -PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/68/1a/f27de07a8a304ad5fa817bbe383d1238ac4396da447fa11ed937039fa04b +PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/58/66/d6c5859dcac92b442626427a8c7a42322068c5cd5d4a463ce78b93f730b7 PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause -PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst +PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst docs/license.rst $(eval $(python-package)) From yann.morin.1998 at free.fr Tue Jan 25 18:23:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:29 +0100 Subject: [Buildroot] [git commit] package/python{, 3}-pycparser: bump to version 2.21 Message-ID: <20220125182727.70CDF827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c2a2aa1faeff4d3396b7ba402b54e1d874b679f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/eliben/pycparser/commit/78beeb7d6f0a760f90a8592d9533042363a82810 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycparser/python-pycparser.hash | 6 +++--- package/python-pycparser/python-pycparser.mk | 4 ++-- package/python3-pycparser/python3-pycparser.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-pycparser/python-pycparser.hash b/package/python-pycparser/python-pycparser.hash index 0426444399..34401a319a 100644 --- a/package/python-pycparser/python-pycparser.hash +++ b/package/python-pycparser/python-pycparser.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycparser/json -md5 b8f88de737db8c346ee8d31c07c7a25a pycparser-2.20.tar.gz -sha256 2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 pycparser-2.20.tar.gz +md5 48f7d743bf018f7bb2ffc5fb976d1492 pycparser-2.21.tar.gz +sha256 e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 pycparser-2.21.tar.gz # Locally computed sha256 checksums -sha256 3c76629880aec2f8578ed914701a4ff9e5da8b60acb8b7ec675abf83c90c5168 LICENSE +sha256 3e7df25b8dfb658c9a91501930d4d943b05087a8347c7e2b4325616af535047b LICENSE diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 5f44a562af..20c3f641a9 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-pycparser/python3-pycparser.mk -PYTHON_PYCPARSER_VERSION = 2.20 +PYTHON_PYCPARSER_VERSION = 2.21 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd +PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3-Clause PYTHON_PYCPARSER_LICENSE_FILES = LICENSE diff --git a/package/python3-pycparser/python3-pycparser.mk b/package/python3-pycparser/python3-pycparser.mk index 68769ceb46..4075f4a38f 100644 --- a/package/python3-pycparser/python3-pycparser.mk +++ b/package/python3-pycparser/python3-pycparser.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-pycparser/python-pycparser.mk -PYTHON3_PYCPARSER_VERSION = 2.20 +PYTHON3_PYCPARSER_VERSION = 2.21 PYTHON3_PYCPARSER_SOURCE = pycparser-$(PYTHON3_PYCPARSER_VERSION).tar.gz -PYTHON3_PYCPARSER_SITE = https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd +PYTHON3_PYCPARSER_SITE = https://files.pythonhosted.org/packages/5e/0b/95d387f5f4433cb0f53ff7ad859bd2c6051051cebbb564f139a999ab46de PYTHON3_PYCPARSER_SETUP_TYPE = setuptools PYTHON3_PYCPARSER_LICENSE = BSD-3-Clause PYTHON3_PYCPARSER_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:03 +0100 Subject: [Buildroot] [git commit] package/python-msgpack: bump to version 1.0.3 Message-ID: <20220125182727.0F35F827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81527c31652fc959661ac651d1f721f4ab5f6c4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-msgpack/python-msgpack.hash | 4 ++-- package/python-msgpack/python-msgpack.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash index 8e192e3717..382bada4a7 100644 --- a/package/python-msgpack/python-msgpack.hash +++ b/package/python-msgpack/python-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgpack/json -md5 68d5804254642905ba87ede509e68970 msgpack-1.0.2.tar.gz -sha256 fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984 msgpack-1.0.2.tar.gz +md5 2dcb4fa618d7890e5a79de6fe44cbb59 msgpack-1.0.3.tar.gz +sha256 51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e msgpack-1.0.3.tar.gz # Locally computed sha256 checksums sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index dcb525ed1f..c50b7157a0 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 1.0.2 +PYTHON_MSGPACK_VERSION = 1.0.3 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/59/04/87fc6708659c2ed3b0b6d4954f270b6e931def707b227c4554f99bd5401e +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/61/3c/2206f39880d38ca7ad8ac1b28d2d5ca81632d163b2d68ef90e46409ca057 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Tue Jan 25 18:20:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:20:48 +0100 Subject: [Buildroot] [git commit] package/python-pathlib2: bump to version 2.3.6 Message-ID: <20220125182726.D9966827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a5fd47c1eed1a350b7c24b16ba8c56fa5129846 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update hash of LICENSE.rst (LF replaced by CRLF) - Update indentation in hash file (two spaces) https://github.com/jazzband/pathlib2/blob/2.3.6/CHANGELOG.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-pathlib2/python-pathlib2.hash | 6 +++--- package/python-pathlib2/python-pathlib2.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pathlib2/python-pathlib2.hash b/package/python-pathlib2/python-pathlib2.hash index 986049d9de..ebd197b62e 100644 --- a/package/python-pathlib2/python-pathlib2.hash +++ b/package/python-pathlib2/python-pathlib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 f2bd0a363eb0f8fa0556f35c1d9e66fb pathlib2-2.3.5.tar.gz -sha256 6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868 pathlib2-2.3.5.tar.gz +md5 e50a0cf94e406c5110b3aed535626e9e pathlib2-2.3.6.tar.gz +sha256 7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f pathlib2-2.3.6.tar.gz # Locally computed sha256 checksums -sha256 f8e02f1a07e4c6fc59a4bee831ddde26b97064105c423b9e24340f35aaa80262 LICENSE.rst +sha256 861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6 LICENSE.rst diff --git a/package/python-pathlib2/python-pathlib2.mk b/package/python-pathlib2/python-pathlib2.mk index d813b77d7e..4bcfea78fb 100644 --- a/package/python-pathlib2/python-pathlib2.mk +++ b/package/python-pathlib2/python-pathlib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHLIB2_VERSION = 2.3.5 +PYTHON_PATHLIB2_VERSION = 2.3.6 PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/94/d8/65c86584e7e97ef824a1845c72bbe95d79f5b306364fa778a3c3e401b309 +PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/df/16/e9d6bcf1aed52a55bc1696324ab22586716053b3e97b85266e0f3ad36bae PYTHON_PATHLIB2_LICENSE = MIT PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst PYTHON_PATHLIB2_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Tue Jan 25 18:26:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:26:36 +0100 Subject: [Buildroot] [git commit] package/python-requests: bump to version 2.27.1 Message-ID: <20220125182727.79E11827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4f9982a196dccc5f2e7cd340bfc1f54bbc411cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 53503a3668..1e4cbaff7b 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 8c745949ad3e9ae83d9927fed213db8a requests-2.26.0.tar.gz -sha256 b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7 requests-2.26.0.tar.gz +md5 bcc01b73974a305cc7c5b092e7d07004 requests-2.27.1.tar.gz +sha256 68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 requests-2.27.1.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 74cc91ef01..962646516e 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.26.0 +PYTHON_REQUESTS_VERSION = 2.27.1 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:21 +0100 Subject: [Buildroot] [git commit] package/python-certifi: bump to version 2021.10.8 Message-ID: <20220125182727.58E9A827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ac0bdf971a1898aafd0de1a6d462dbc7593fda2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-certifi/python-certifi.hash | 4 ++-- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index ae122ffc23..0245496ebf 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 4b38238b7305fcb3ffbc4368be4e8845 certifi-2021.5.30.tar.gz -sha256 2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee certifi-2021.5.30.tar.gz +md5 880ed9e5d04aff8f46f5ff82a3a3e395 certifi-2021.10.8.tar.gz +sha256 78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 certifi-2021.10.8.tar.gz # Locally computed sha256 checksums sha256 be9d82f36112f87a7f1d74ecd4887e1467bbae8878a84004a00117b1e475a3e2 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 486548f8c2..17098e3fae 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2021.5.30 +PYTHON_CERTIFI_VERSION = 2021.10.8 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:10 +0100 Subject: [Buildroot] [git commit] package/python-frozenlist: bump to version 1.3.0 Message-ID: <20220125182727.30C78827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b33cfb30feeb75090b3e308e6e012eb8b6eeae8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-frozenlist/python-frozenlist.hash | 4 ++-- package/python-frozenlist/python-frozenlist.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index fdbf694963..034150397b 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 8f1851ef871d95a15ebcf20255c12f6d frozenlist-1.2.0.tar.gz -sha256 68201be60ac56aff972dc18085800b6ee07973c49103a8aba669dee3d71079de frozenlist-1.2.0.tar.gz +md5 e65d870bd189ba3c21ab7eb10eab22b7 frozenlist-1.3.0.tar.gz +sha256 ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b frozenlist-1.3.0.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 4e26499808..ad618971f7 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.2.0 +PYTHON_FROZENLIST_VERSION = 1.3.0 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/5c/ee/7c6287928ba776567603248e160387cf4143641ecf734e393ad9b2c82475 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/f4/f7/8dfeb76d2a52bcea2b0718427af954ffec98be1d34cd8f282034b3e36829 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:13 +0100 Subject: [Buildroot] [git commit] package/python-jinja2: bump to version 3.0.3 Message-ID: <20220125182727.3B29E827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24ea41cfa2759eeac043690eb6b1b428249ef968 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-jinja2/python-jinja2.hash | 4 ++-- package/python-jinja2/python-jinja2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash index afd07e89f1..ea7fe71a35 100644 --- a/package/python-jinja2/python-jinja2.hash +++ b/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 059f89375d7ea60eb7013f341f0b89e7 Jinja2-3.0.2.tar.gz -sha256 827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45 Jinja2-3.0.2.tar.gz +md5 b76ae2f0647abebc81e7c03f5fb7b00f Jinja2-3.0.3.tar.gz +sha256 611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 Jinja2-3.0.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index bb53f95699..752daf653c 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 3.0.2 +PYTHON_JINJA2_VERSION = 3.0.3 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/f8/86/7c0eb6e8b05385d1ce682abc0f994abd1668e148fb52603fa86e15d4c110 +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/91/a5/429efc6246119e1e3fbf562c00187d04e83e54619249eb732bb423efa6c6 PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst From yann.morin.1998 at free.fr Tue Jan 25 18:23:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:23 +0100 Subject: [Buildroot] [git commit] package/python-charset-normalizer: bump to version 2.0.10 Message-ID: <20220125182727.6776E827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=051a6f8afbb0b4e5a56e011a12fa3427e89e4c10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-charset-normalizer/python-charset-normalizer.hash | 4 ++-- package/python-charset-normalizer/python-charset-normalizer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index f506fa85ed..eb3b67598b 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.hash +++ b/package/python-charset-normalizer/python-charset-normalizer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/charset-normalizer/json -md5 b28e4463613ff3911d5a2dc62b96233f charset-normalizer-2.0.7.tar.gz -sha256 e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0 charset-normalizer-2.0.7.tar.gz +md5 eaed8aaf95d7e3bc2daefcd8d0f03458 charset-normalizer-2.0.10.tar.gz +sha256 876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd charset-normalizer-2.0.10.tar.gz # Locally computed sha256 checksums sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index 7fe9f96996..33f2e132de 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.7 +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.10 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/9f/c5/334c019f92c26e59637bb42bd14a190428874b2b2de75a355da394cf16c1 +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:08 +0100 Subject: [Buildroot] [git commit] package/python-fonttools: bump to version 4.28.5 Message-ID: <20220125182727.2607A827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b844a3679a8c925f3d6603476814c57220e64bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-fonttools/python-fonttools.hash | 4 ++-- package/python-fonttools/python-fonttools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 2e79861e2c..1f9b546c23 100644 --- a/package/python-fonttools/python-fonttools.hash +++ b/package/python-fonttools/python-fonttools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fonttools/json -md5 fcf1425460855b5892c990027b5396c8 fonttools-4.28.2.zip -sha256 dca694331af74c8ad47acc5171e57f6b78fac5692bf050f2ab572964577ac0dd fonttools-4.28.2.zip +md5 4a894b3cd108432f7636849b4026b771 fonttools-4.28.5.zip +sha256 545c05d0f7903a863c2020e07b8f0a57517f2c40d940bded77076397872d14ca fonttools-4.28.5.zip # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index 9ec369d550..c5c605161b 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.28.2 +PYTHON_FONTTOOLS_VERSION = 4.28.5 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/3c/d5/f722e0d1aed0d547383913c6bc3c4ff35772952057b8e2b8fe3be8df4216 +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/ce/1b/d4cd86f4e6cbd54a3c4f807015b116299bcd6d6587ea0645d88ba9d932bb PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:26:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:26:37 +0100 Subject: [Buildroot] [git commit] package/python-terminaltables: bump to version 3.1.10 Message-ID: <20220125182727.84621827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d190bc39220022b9dd2febf80a1bd970455d3a01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update repository upstream url and add license hash. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-terminaltables/Config.in | 2 +- package/python-terminaltables/python-terminaltables.hash | 6 ++++-- package/python-terminaltables/python-terminaltables.mk | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/python-terminaltables/Config.in b/package/python-terminaltables/Config.in index 8f3c4296ed..8a387466ec 100644 --- a/package/python-terminaltables/Config.in +++ b/package/python-terminaltables/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_TERMINALTABLES Generate simple tables in terminals from a nested list of strings. - https://github.com/Robpol86/terminaltables + https://github.com/matthewdeanmartin/terminaltables diff --git a/package/python-terminaltables/python-terminaltables.hash b/package/python-terminaltables/python-terminaltables.hash index 3184f5f716..b6c95aa269 100644 --- a/package/python-terminaltables/python-terminaltables.hash +++ b/package/python-terminaltables/python-terminaltables.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/terminaltables/json -md5 863797674d8f75d22e16e6c1fdcbeb41 terminaltables-3.1.0.tar.gz -sha256 f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81 terminaltables-3.1.0.tar.gz +md5 5467e06a1a6e24dc44e6dd241706668e terminaltables-3.1.10.tar.gz +sha256 ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543 terminaltables-3.1.10.tar.gz +# Locally computed sha256 checksums +sha256 2e1320fd337db06a3136d0f4101bd62f13249c95c5b581304f35481e979d432a LICENSE diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index 763f82e9a2..b31ed332b6 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TERMINALTABLES_VERSION = 3.1.0 +PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz -PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/9b/c4/4a21174f32f8a7e1104798c445dacdc1d4df86f2f26722767034e4de4bff +PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools PYTHON_TERMINALTABLES_LICENSE = MIT +PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE $(eval $(python-package)) From yann.morin.1998 at free.fr Tue Jan 25 18:23:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:19 +0100 Subject: [Buildroot] [git commit] package/python-attrs: bump to version 21.4.0 Message-ID: <20220125182727.4F2D7827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e58fb81634432a037afc180929744f86f843cc58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-attrs/python-attrs.hash | 6 +++--- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index 5d4c46304e..823a9459bd 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 06af884070d9180694becdb106e5cd65 attrs-21.2.0.tar.gz -sha256 ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb attrs-21.2.0.tar.gz -# Locally computed sha256 +md5 5a9b5e9ceebc380a13fb93235b11bbda attrs-21.4.0.tar.gz +sha256 626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd attrs-21.4.0.tar.gz +# Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index b99a98501c..4877d62285 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 21.2.0 +PYTHON_ATTRS_VERSION = 21.4.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/ed/d6/3ebca4ca65157c12bd08a63e20ac0bdc21ac7f3694040711f9fd073c0ffb +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/d7/77/ebb15fc26d0f815839ecd897b919ed6d85c050feeb83e100e020df9153d2 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:23:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:15 +0100 Subject: [Buildroot] [git commit] package/python-idna: bump to version 3.3 Message-ID: <20220125182727.458E4827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=952867c45247b43d51e80d2f294622ab3c108b60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-idna/python-idna.hash | 4 ++-- package/python-idna/python-idna.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 08a7be9d56..27c42c8b59 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 08ea8e2ce09e522424e872409c221138 idna-3.2.tar.gz -sha256 467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3 idna-3.2.tar.gz +md5 5856306eac5f25db8249e37a4c6ee3e7 idna-3.3.tar.gz +sha256 9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d idna-3.3.tar.gz # Locally computed sha256 checksums sha256 a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index a2c842f1e7..2a1ec8314b 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.2 +PYTHON_IDNA_VERSION = 3.3 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Tue Jan 25 18:26:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:26:37 +0100 Subject: [Buildroot] [git commit] package/python-urllib3: bump to version 1.26.8 Message-ID: <20220125182727.8D7C2827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4ac3ae9446e7261445f6772ef4f76615cf16bf82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-urllib3/python-urllib3.hash | 4 ++-- package/python-urllib3/python-urllib3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 066bfb7288..2415f24199 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 e0051a87a956e618a6bb514a07fa7773 urllib3-1.26.7.tar.gz -sha256 4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece urllib3-1.26.7.tar.gz +md5 50831ca7b19bbe2781abb0a4c2d51760 urllib3-1.26.8.tar.gz +sha256 0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c urllib3-1.26.8.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 9580d9b6b9..c9c8a912d1 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.7 +PYTHON_URLLIB3_VERSION = 1.26.8 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/b0/b1/7bbf5181f8e3258efae31702f5eab87d8a74a72a0aa78bc8c08c1466e243 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python From yann.morin.1998 at free.fr Tue Jan 25 18:30:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:30:39 +0100 Subject: [Buildroot] [git commit] package/python{, 3}-cython: bump to version 0.29.26 Message-ID: <20220125182727.AE009827E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=037df68cc8fcd2358d548775c641c75cc15c9f83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- package/python3-cython/python3-cython.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 70469c012b..b07f171c25 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 81aff945f5bfdfb86e7a5d24f5467668 Cython-0.29.24.tar.gz -sha256 cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443 Cython-0.29.24.tar.gz +md5 971c9708dd5269180868fc0af986084c Cython-0.29.26.tar.gz +sha256 af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 Cython-0.29.26.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index ffc8e719cd..cf41086dea 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-cython/python3-cython.mk -PYTHON_CYTHON_VERSION = 0.29.24 +PYTHON_CYTHON_VERSION = 0.29.26 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk index 2f15ad8c36..da159cedc8 100644 --- a/package/python3-cython/python3-cython.mk +++ b/package/python3-cython/python3-cython.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-cython/python-cython.mk -PYTHON3_CYTHON_VERSION = 0.29.24 +PYTHON3_CYTHON_VERSION = 0.29.26 PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz -PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/59/e3/78c921adf4423fff68da327cc91b73a16c63f29752efe7beb6b88b6dd79d +PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b PYTHON3_CYTHON_SETUP_TYPE = setuptools PYTHON3_CYTHON_LICENSE = Apache-2.0 PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From yann.morin.1998 at free.fr Tue Jan 25 18:29:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:29:29 +0100 Subject: [Buildroot] [git commit] package/python-pynacl: bump to version 1.5.0 Message-ID: <20220125182727.9A487827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ad6b3974366844a54c7dadbcffbc62853504675 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch that is now upstream. Drop python2 support. Drop python-six dependency which is no longer needed. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: update paramiko python3 dependency comment] Signed-off-by: Yann E. MORIN --- package/python-paramiko/Config.in | 2 +- ...Remove-spurious-requirement-for-wheel-596.patch | 34 ---------------------- package/python-pynacl/Config.in | 2 +- package/python-pynacl/python-pynacl.hash | 6 ++-- package/python-pynacl/python-pynacl.mk | 4 +-- 5 files changed, 7 insertions(+), 41 deletions(-) diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index e44237b0c2..d48051bd22 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography - depends on BR2_PACKAGE_PYTHON3 # python-bcrypt, python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-bcrypt, python-cryptography, python-pynacl select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime diff --git a/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch b/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch deleted file mode 100644 index 4f4a76ce29..0000000000 --- a/package/python-pynacl/0001-Remove-spurious-requirement-for-wheel-596.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 44fb453931c611d4822343debe902cca8e1c8afe Mon Sep 17 00:00:00 2001 -From: Scott Kitterman -Date: Tue, 26 May 2020 20:08:16 -0400 -Subject: [PATCH] Remove spurious requirement for wheel (#596) - -* Remove spurious requirement for wheel - -* Put wheel back in pyproject.toml - -Co-authored-by: Scott Kitterman -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -44fb453931c611d4822343debe902cca8e1c8afe] ---- - setup.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 9319c1c..d82a7fe 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,8 +35,7 @@ except ImportError: - - - requirements = ["six"] --setup_requirements = ["setuptools", -- "wheel"] -+setup_requirements = ["setuptools"] - test_requirements = ["pytest>=3.2.1,!=3.3.0", - "hypothesis>=3.27.0"] - docs_requirements = ["sphinx>=1.6.5", --- -2.25.1 - diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in index 256f9d5eb6..3bb4e29630 100644 --- a/package/python-pynacl/Config.in +++ b/package/python-pynacl/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PYNACL bool "python-pynacl" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBSODIUM - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime help Python binding to the Networking and Cryptography (NaCl) diff --git a/package/python-pynacl/python-pynacl.hash b/package/python-pynacl/python-pynacl.hash index b6ee2baf0e..85a7447b32 100644 --- a/package/python-pynacl/python-pynacl.hash +++ b/package/python-pynacl/python-pynacl.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/pynacl/json -md5 8c6c57893327a694c72510fb620e4744 PyNaCl-1.4.0.tar.gz -sha256 54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PyNaCl-1.4.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/PyNaCl/json +md5 93989045e25f1111452cfdf5e021814d PyNaCl-1.5.0.tar.gz +sha256 8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba PyNaCl-1.5.0.tar.gz # Locally computed sha256 checksums sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE diff --git a/package/python-pynacl/python-pynacl.mk b/package/python-pynacl/python-pynacl.mk index 1e4155992a..bd2571c3ad 100644 --- a/package/python-pynacl/python-pynacl.mk +++ b/package/python-pynacl/python-pynacl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYNACL_VERSION = 1.4.0 +PYTHON_PYNACL_VERSION = 1.5.0 PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/cf/5a/25aeb636baeceab15c8e57e66b8aa930c011ec1c035f284170cacb05025e +PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/a7/22/27582568be639dfe22ddb3902225f91f2f17ceff88ce80e4db396c8986da PYTHON_PYNACL_LICENSE = Apache-2.0 PYTHON_PYNACL_LICENSE_FILES = LICENSE PYTHON_PYNACL_SETUP_TYPE = setuptools From yann.morin.1998 at free.fr Tue Jan 25 18:30:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:30:39 +0100 Subject: [Buildroot] [git commit] package/python-multidict: bump to version 6.0.2 Message-ID: <20220125182727.B801F827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba48bb937bf4499e2be122bf15d0d4a1f9714143 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 2d9943fc0d..999c8867d0 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 e28b9592289597b232f09e5cc3857f32 multidict-5.2.0.tar.gz -sha256 0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce multidict-5.2.0.tar.gz +md5 f8230905ad1f50c87e8d9cc6b0bb7ca2 multidict-6.0.2.tar.gz +sha256 5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013 multidict-6.0.2.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 2619cad2ee..1a9aec7ba7 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 5.2.0 +PYTHON_MULTIDICT_VERSION = 6.0.2 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/8e/7c/e12a69795b7b7d5071614af2c691c97fbf16a2a513c66ec52dd7d0a115bb +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/fa/a7/71c253cdb8a1528802bac7503bf82fe674367e4055b09c28846fdfa4ab90 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:30:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:30:39 +0100 Subject: [Buildroot] [git commit] package/python{, 3}-pycryptodomex: bump to version 3.13.0 Message-ID: <20220125182727.A36F1827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54f5fe5c6d2df4c133c805842e1df30410258010 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to OCB patents expiry: https://github.com/Legrandin/pycryptodome/commit/5d78d02220022592d79fd7789cc77af6d1859729 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycryptodomex/python-pycryptodomex.hash | 6 +++--- package/python-pycryptodomex/python-pycryptodomex.mk | 7 +++---- package/python3-pycryptodomex/python3-pycryptodomex.mk | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 544468b37e..9512f185a8 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 3d007103f68f7e902167719655d2b57a pycryptodomex-3.11.0.tar.gz -sha256 0398366656bb55ebdb1d1d493a7175fc48ade449283086db254ac44c7d318d6d pycryptodomex-3.11.0.tar.gz +md5 dcf0d13044c700410bdce31a5afdf6d0 pycryptodomex-3.13.0.tar.gz +sha256 63443230247837dd03c5d4028cae5cb2e6793a9ae110e321798bee48a04ff3e9 pycryptodomex-3.13.0.tar.gz # Locally computed sha256 checksums -sha256 c273fb45d120362875aafdd6189f4d7c70f6c36d4cb7ce427e0dc704753639df LICENSE.rst +sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index f1fda7aea2..92780327a1 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -5,14 +5,13 @@ ################################################################################ # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk -PYTHON_PYCRYPTODOMEX_VERSION = 3.11.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/47/14/dd9ad29cd29ea4cc521286f2cb401ca7ac6fd5db0791c5e9bacaf2c9ac78 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ - Public Domain (pycrypto original code), \ - OCB patent license (OCB mode) + Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto $(eval $(python-package)) diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk index ee03a08ec6..06a46cdf63 100644 --- a/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ b/package/python3-pycryptodomex/python3-pycryptodomex.mk @@ -5,14 +5,13 @@ ################################################################################ # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.11.0 +PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0 PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/47/14/dd9ad29cd29ea4cc521286f2cb401ca7ac6fd5db0791c5e9bacaf2c9ac78 +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619 PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON3_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ - Public Domain (pycrypto original code), \ - OCB patent license (OCB mode) + Public Domain (pycrypto original code) PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3 From yann.morin.1998 at free.fr Tue Jan 25 18:21:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:21:32 +0100 Subject: [Buildroot] [git commit] package/python-autobahn: bump to version 21.11.1 Message-ID: <20220125182727.06126827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67db399099a7c9832766680a3fdecb4050a3d6b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches that are now upstream. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: don't duplicate _SETUP_TYPE] Signed-off-by: Yann E. MORIN --- ...te-xbr-packages-and-xbr-templates-package.patch | 54 ------------------- ...nvx-by-default-and-don-t-publish-universa.patch | 60 ---------------------- package/python-autobahn/python-autobahn.hash | 4 +- package/python-autobahn/python-autobahn.mk | 4 +- 4 files changed, 4 insertions(+), 118 deletions(-) diff --git a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch b/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch deleted file mode 100644 index f239345dc7..0000000000 --- a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b13b7e38b38e2c79c0a13be32e05f0451483cd01 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sat, 12 Jun 2021 15:32:37 -0600 -Subject: [PATCH] Fix duplicate xbr packages and xbr templates package_data. - (#1492) - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -a370f9e7154e59b313cb675bfcaf8cad6011bd52] ---- - MANIFEST.in | 1 - - setup.py | 10 ++++++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/MANIFEST.in b/MANIFEST.in -index f4cb6da1..1dd32f0e 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -1,4 +1,3 @@ - include LICENSE - include autobahn/nvx/_utf8validator.c - recursive-include autobahn/wamp/gen/schema * --recursive-include autobahn/xbr/templates * -diff --git a/setup.py b/setup.py -index cf4e29ba..f27006da 100644 ---- a/setup.py -+++ b/setup.py -@@ -166,6 +166,12 @@ packages = [ - 'twisted.plugins', - ] - -+xbr_packages = [ -+ 'autobahn.xbr', -+ 'autobahn.asyncio.xbr', -+ 'autobahn.twisted.xbr', -+] -+ - package_data = {'autobahn.asyncio': ['./test/*']} - - entry_points = { -@@ -179,8 +185,8 @@ if 'AUTOBAHN_STRIP_XBR' in os.environ: - shutil.rmtree('autobahn.egg-info', ignore_errors=True) - else: - extras_require_all += extras_require_xbr -- packages += ['autobahn.xbr', 'autobahn.asyncio.xbr', 'autobahn.twisted.xbr'] -- package_data['xbr'] = ['./xbr/contracts/*.json'] -+ packages += xbr_packages -+ package_data['xbr'] = ['./xbr/templates/*.py.jinja2'] - entry_points['console_scripts'] += ["xbrnetwork = autobahn.xbr._cli:_main"] - - # development dependencies --- -2.25.1 - diff --git a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch b/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch deleted file mode 100644 index c2c2cf5777..0000000000 --- a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1e3162bab59cbc2f7cf8b9ef6cadf55ee273c1d8 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 22 Jul 2021 06:56:51 -0600 -Subject: [PATCH] Build with nvx by default and don't publish universal wheel. - (#1493) - -Signed-off-by: James Hilliard -[james.hilliard1 at gmail.com: backport from upstream commit -a35f22eeaafca7568f1deb35c4a1b82ae78f77d4] ---- - Makefile | 8 ++++---- - autobahn/nvx/_utf8validator.py | 7 ++++++- - setup.py | 7 +------ - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/autobahn/nvx/_utf8validator.py b/autobahn/nvx/_utf8validator.py -index e72fc872..34393356 100644 ---- a/autobahn/nvx/_utf8validator.py -+++ b/autobahn/nvx/_utf8validator.py -@@ -44,13 +44,18 @@ ffi.cdef(""" - int nvx_utf8vld_get_impl(void* utf8vld); - """) - -+optional = True -+if 'AUTOBAHN_USE_NVX' in os.environ and os.environ['AUTOBAHN_USE_NVX'] in ['1', 'true']: -+ optional = False -+ - with open(os.path.join(os.path.dirname(__file__), '_utf8validator.c')) as fd: - c_source = fd.read() - ffi.set_source( - "_nvx_utf8validator", - c_source, - libraries=[], -- extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'] -+ extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'], -+ optional=optional - ) - - -diff --git a/setup.py b/setup.py -index f27006da..4889a39e 100644 ---- a/setup.py -+++ b/setup.py -@@ -110,12 +110,7 @@ extras_require_nvx = [ - - # cffi based extension modules to build, currently only NVX - cffi_modules = [] --if 'AUTOBAHN_USE_NVX' in os.environ: -- # FIXME: building this extension will make the wheel -- # produced no longer universal (as in "autobahn-18.4.1-py2.py3-none-any.whl"). -- # on the other hand, I don't know how to selectively include this -- # based on the install flavor the user has chosen (eg pip install autobahn[nvx] -- # should make the following be included) -+if 'AUTOBAHN_USE_NVX' not in os.environ or os.environ['AUTOBAHN_USE_NVX'] not in ['0', 'false']: - cffi_modules.append('autobahn/nvx/_utf8validator.py:ffi') - - extras_require_xbr = [ --- -2.25.1 - diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 7de1e7e673..0bbb9112d0 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 dcba839ee61be33d05042a09c008c6bc autobahn-21.3.1.tar.gz -sha256 e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03 autobahn-21.3.1.tar.gz +md5 1ccd46d938d8b9fed435e9781e54e887 autobahn-21.11.1.tar.gz +sha256 bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18 autobahn-21.11.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 4ec47f54ce..db9e5083d1 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 21.3.1 +PYTHON_AUTOBAHN_VERSION = 21.11.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/4c/9e/f5bdfb55d1eab67c4b6d24d1397f95feec792071ff1b2f5a893d6d5247f3 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar From yann.morin.1998 at free.fr Tue Jan 25 18:23:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:23:06 +0100 Subject: [Buildroot] [git commit] package/python-pillow: bump to verison 9.0.0 Message-ID: <20220125182727.1C8FB827E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8b56565c2c134e2327554e47874139474588a33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash change due to copyright year update: https://github.com/python-pillow/Pillow/commit/0bb3f87dcc72a1a80f50690abde5a3ac4576d3d6 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index d14cb5cff6..f3ca8e6014 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 7a1eb5a250c7ccbd549a89e16404f09f Pillow-8.4.0.tar.gz -sha256 b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed Pillow-8.4.0.tar.gz +md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz +sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz # Locally computed sha256 checksums -sha256 5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4 LICENSE +sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 5ed57c55cb..2f2e817882 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 8.4.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/7d/2a/2fc11b54e2742db06297f7fa7f420a0e3069fdcf0e4b57dfec33f0b08622 +PYTHON_PILLOW_VERSION = 9.0.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Jan 25 18:36:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:36:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-autobahn: bump to version 21.11.1 In-Reply-To: <20220124094408.421939-1-james.hilliard1@gmail.com> References: <20220124094408.421939-1-james.hilliard1@gmail.com> Message-ID: <20220125183640.GD457876@scaer> James, All, On 2022-01-24 02:44 -0700, James Hilliard spake thusly: > Drop patches that are now upstream. > > Signed-off-by: James Hilliard > --- [--SNIP--] > diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk > index 4ec47f54ce..481d9373ad 100644 > --- a/package/python-autobahn/python-autobahn.mk > +++ b/package/python-autobahn/python-autobahn.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -PYTHON_AUTOBAHN_VERSION = 21.3.1 > +PYTHON_AUTOBAHN_VERSION = 21.11.1 > PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz > -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/4c/9e/f5bdfb55d1eab67c4b6d24d1397f95feec792071ff1b2f5a893d6d5247f3 > +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/f1/d3/23fdf1ab0104b1b65d2f7884e923f0526750a59f96334d752afc79cf44ed > +PYTHON_AUTOBAHN_SETUP_TYPE = setuptools $ make check-package package/python-autobahn/python-autobahn.mk:15: unconditional override of variable PYTHON_AUTOBAHN_SETUP_TYPE python-autobachn was already declared as a setuptools package; your change was superfluous. Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > PYTHON_AUTOBAHN_LICENSE = MIT > PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE > PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 25 18:38:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:38:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pynacl: bump to version 1.5.0 In-Reply-To: <20220124113749.585264-1-james.hilliard1@gmail.com> References: <20220124113749.585264-1-james.hilliard1@gmail.com> Message-ID: <20220125183816.GE457876@scaer> James, All, On 2022-01-24 04:37 -0700, James Hilliard spake thusly: > Drop patch that is now upstream. > > Drop python2 support. > > Drop python-six dependency which is no longer needed. > > Signed-off-by: James Hilliard > --- [--SNIP--] > diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in > index 256f9d5eb6..3bb4e29630 100644 > --- a/package/python-pynacl/Config.in > +++ b/package/python-pynacl/Config.in > @@ -1,7 +1,7 @@ > config BR2_PACKAGE_PYTHON_PYNACL > bool "python-pynacl" > + depends on BR2_PACKAGE_PYTHON3 You forgot to update the comment in paramiko. Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 25 18:42:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:42:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytz: bump to version 2021.3 In-Reply-To: <20220123220731.787537-1-fontaine.fabrice@gmail.com> References: <20220123220731.787537-1-fontaine.fabrice@gmail.com> Message-ID: <20220125184209.GF457876@scaer> Fabrice, All, On 2022-01-23 23:07 +0100, Fabrice Fontaine spake thusly: > - Update hash of LICENSE.txt (year updated) > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine This, and the three followimng python updates, applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-pytz/python-pytz.hash | 6 +++--- > package/python-pytz/python-pytz.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash > index d1ce81e590..e0f253902c 100644 > --- a/package/python-pytz/python-pytz.hash > +++ b/package/python-pytz/python-pytz.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pytz/json > -md5 c3d84a465fc56a4edd52cca8873ac0df pytz-2019.3.tar.gz > -sha256 b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be pytz-2019.3.tar.gz > +md5 d7b7060bbac4970afa2050c139c9fcb6 pytz-2021.3.tar.gz > +sha256 acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 pytz-2021.3.tar.gz > # Locally computed sha256 checksums > -sha256 39f07c72a1bfda349cbd27bac9bcb1e6f8c5b4e5cc3fadf56900406e8cc0b792 LICENSE.txt > +sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt > diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk > index 888f3c4556..d606750699 100644 > --- a/package/python-pytz/python-pytz.mk > +++ b/package/python-pytz/python-pytz.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYTZ_VERSION = 2019.3 > +PYTHON_PYTZ_VERSION = 2021.3 > PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz > -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/82/c3/534ddba230bd4fbbd3b7a3d35f3341d014cca213f369a9940925e7e5f691 > +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a > PYTHON_PYTZ_SETUP_TYPE = setuptools > PYTHON_PYTZ_LICENSE = MIT > PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Jan 25 18:43:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 19:43:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiorwlock: bump to version 1.3.0 In-Reply-To: <20220124093610.410365-1-james.hilliard1@gmail.com> References: <20220124093610.410365-1-james.hilliard1@gmail.com> Message-ID: <20220125184330.GG457876@scaer> James, All, On 2022-01-24 02:36 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard Applied to master, along with a bunch of your other python package updates, thanks. Regards, Yann E. MORIN. > --- > package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- > package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash > index fad7079789..15584a8a41 100644 > --- a/package/python-aiorwlock/python-aiorwlock.hash > +++ b/package/python-aiorwlock/python-aiorwlock.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aiorwlock/json > -md5 f0fac247fd884f59d53f6deeb866a52d aiorwlock-1.2.0.tar.gz > -sha256 3626ed72f92a57e71c685d7fc0329578e5d2dee2ab80805beec8b5119053146d aiorwlock-1.2.0.tar.gz > +md5 28e4812a1d1d67a2be4370209ece5528 aiorwlock-1.3.0.tar.gz > +sha256 83f12d87df4b9728a0b8fda1756585ab0d652b107bab59c6084e1b1ad692ab45 aiorwlock-1.3.0.tar.gz > # Locally computed sha256 checksums > sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE > diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk > index 4ba4965eb5..a5e7eeae83 100644 > --- a/package/python-aiorwlock/python-aiorwlock.mk > +++ b/package/python-aiorwlock/python-aiorwlock.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIORWLOCK_VERSION = 1.2.0 > +PYTHON_AIORWLOCK_VERSION = 1.3.0 > PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz > -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/22/84/98ef7b69764b0ceee7afe2139f45f9cbba21c849b0bd8a6eeecb11ee650d > +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/fe/7027595f5e635ac1f597f7160a420e1f642a474576efb697001efea16bdc > PYTHON_AIORWLOCK_SETUP_TYPE = setuptools > PYTHON_AIORWLOCK_LICENSE = Apache-2.0 > PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Tue Jan 25 18:51:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 19:51:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/gupnp: bump to version 1.4.3 Message-ID: <20220125185126.52194-1-fontaine.fabrice@gmail.com> https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.3/NEWS Signed-off-by: Fabrice Fontaine --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index cc78be7d5d..cc5e2b5775 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.2.sha256sum: -sha256 bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc gupnp-1.4.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: +sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index aebf9225a8..dca747f064 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ -- 2.34.1 From peter at korsgaard.com Tue Jan 25 18:59:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:59:30 +0100 Subject: [Buildroot] [git commit] package/erlang-rebar: fix linking failure on shared library In-Reply-To: <20211228214236.BD2C582B78@busybox.osuosl.org> (Yann E. MORIN's message of "Tue, 28 Dec 2021 22:47:41 +0100") References: <20211228214236.BD2C582B78@busybox.osuosl.org> Message-ID: <87wnink5f1.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b00c034fe58ad2ae87b2289e07912b6c10d19ee1 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Add patch to fix linking failure while creating shared library. As > explained in the patch itself, there is no specific variable for when we > link a shared library and rebar itself rely on the default LDFLAGS. Since > by default every CFLAGS is filled with -fPIC we need to make sure that > every LDFLAGS is the same, so not having any other *_LDFLAGS variable to > fille with -fPIC let's add it to the main LDFLAGS. > Fixes: > http://autobuild.buildroot.net/results/602/60296a48210e7ffc6bc9fa50ee586441a8957e85/ > Signed-off-by: Giulio Benetti > Signed-off-by: Yann E. MORIN Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From colin.foster at in-advantage.com Tue Jan 25 19:07:14 2022 From: colin.foster at in-advantage.com (Colin Foster) Date: Tue, 25 Jan 2022 11:07:14 -0800 Subject: [Buildroot] [PATCH] support/dependencies: add suggested regex to sanitize PATH variable Message-ID: <20220125190714.30785-1-colin.foster@in-advantage.com> WSL typically has /mnt/c/Program Files/... in the PATH variable. The suggested command will remove anything that has spaces in PATH, which should probably be good enough for most users who see this error. Signed-off-by: Colin Foster --- support/dependencies/dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index c604a9efcc..e49dfb84a5 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -41,7 +41,8 @@ case ":${PATH:-unset}:" in (*" "*|*"${TAB}"*|*"${NL}"*) printf "\n" printf "Your PATH contains spaces, TABs, and/or newline (\\\n) characters.\n" - printf "This doesn't work. Fix you PATH.\n" + printf "This doesn't work. Fix your PATH. You can try running:\n" + printf "export PATH=\$(echo \$PATH | grep -Po \"(?::|^)[^\ :]+(?=(?::|$))\" | tr -d '\\\n'; echo)\n" exit 1 ;; esac -- 2.25.1 From fontaine.fabrice at gmail.com Tue Jan 25 19:06:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 20:06:49 +0100 Subject: [Buildroot] [PATCH 1/2] package/xvisor: drop arm support Message-ID: <20220125190650.107677-1-fontaine.fabrice@gmail.com> Support for old 32-bit ARM boards (i.e. ARMv5, ARMv6, ARMv7a) without virtualization has been dropped since https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 resulting in the following build failure since bump to version 0.3.1 in commit c4f8b8968770ecbf6444a5921c6472f126717626: *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v6-defconfig"! *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-0/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v7-defconfig"! Fixes: - http://autobuild.buildroot.org/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b - http://autobuild.buildroot.org/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 Signed-off-by: Fabrice Fontaine --- package/xvisor/Config.in | 6 +----- package/xvisor/xvisor.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index eb7475b86d..55c43e6959 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool default y depends on BR2_USE_MMU - depends on BR2_arm || BR2_aarch64 || BR2_x86_64 - depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV7M + depends on BR2_aarch64 || BR2_x86_64 menuconfig BR2_PACKAGE_XVISOR bool "xvisor" @@ -32,9 +31,6 @@ endchoice config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" - default "generic-v5" if BR2_ARM_CPU_ARMV5 - default "generic-v6" if BR2_ARM_CPU_ARMV6 - default "generic-v7" if BR2_ARM_CPU_ARMV7A default "generic-v8" if BR2_aarch64 default "x86_64_generic" if BR2_x86_64 depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index dc49258400..4ceb5ed7cb 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -30,7 +30,7 @@ XVISOR_KCONFIG_EDITORS = menuconfig ifeq ($(BR2_x86_64),y) XVISOR_ARCH = x86 -else ifeq ($(BR2_arm)$(BR2_aarch64),y) +else ifeq ($(BR2_aarch64),y) XVISOR_ARCH = arm endif -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 19:06:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 20:06:50 +0100 Subject: [Buildroot] [PATCH 2/2] package/xvisor: add riscv support In-Reply-To: <20220125190650.107677-1-fontaine.fabrice@gmail.com> References: <20220125190650.107677-1-fontaine.fabrice@gmail.com> Message-ID: <20220125190650.107677-2-fontaine.fabrice@gmail.com> riscv is supported since version 0.3.0 and https://github.com/xvisor/xvisor/commit/d6feda4e80eefd372294b081111ce709d08ee4c0 Signed-off-by: Fabrice Fontaine --- package/xvisor/Config.in | 4 +++- package/xvisor/xvisor.mk | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index 55c43e6959..4e7a3e1b53 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool default y depends on BR2_USE_MMU - depends on BR2_aarch64 || BR2_x86_64 + depends on BR2_aarch64 || BR2_riscv || BR2_x86_64 menuconfig BR2_PACKAGE_XVISOR bool "xvisor" @@ -32,6 +32,8 @@ endchoice config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" default "generic-v8" if BR2_aarch64 + default "generic-32b" if BR2_RISCV_32 + default "generic-64b" if BR2_RISCV_64 default "x86_64_generic" if BR2_x86_64 depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG help diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 4ceb5ed7cb..1a7b49e689 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -32,6 +32,8 @@ ifeq ($(BR2_x86_64),y) XVISOR_ARCH = x86 else ifeq ($(BR2_aarch64),y) XVISOR_ARCH = arm +else ifeq ($(BR2_riscv),y) +XVISOR_ARCH = riscv endif ifeq ($(BR2_PACKAGE_XVISOR)$(BR_BUILDING),yy) -- 2.34.1 From peter at korsgaard.com Tue Jan 25 18:59:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 19:59:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/erlang-rebar: fix linking failure on shared library Message-ID: <20220125191346.D9FF4822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c630f207bf527977150ef59659b8d0b573f26c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add patch to fix linking failure while creating shared library. As explained in the patch itself, there is no specific variable for when we link a shared library and rebar itself rely on the default LDFLAGS. Since by default every CFLAGS is filled with -fPIC we need to make sure that every LDFLAGS is the same, so not having any other *_LDFLAGS variable to fille with -fPIC let's add it to the main LDFLAGS. Fixes: http://autobuild.buildroot.net/results/602/60296a48210e7ffc6bc9fa50ee586441a8957e85/ Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN (cherry picked from commit b00c034fe58ad2ae87b2289e07912b6c10d19ee1) Signed-off-by: Peter Korsgaard --- ...ort_compiler-add-fPIC-to-LDFLAGS-by-defau.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch b/package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch new file mode 100644 index 0000000000..a9c1670a1f --- /dev/null +++ b/package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch @@ -0,0 +1,35 @@ +From 7f54d48ee5db037778ead310e0b8278f3fe70b41 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sun, 19 Dec 2021 07:52:55 +0100 +Subject: [PATCH] src/rebar_port_compiler: add -fPIC to LDFLAGS by default + +Since both DRV_CFLAGS and EXE_CFLAGS list -fPIC we need also the LDFLAGS +to follow them. Unfortunately adding -fPIC only to DRV_LDFLAGS and +EXE_LDFLAGS is not sufficient, since when linking as a library(.so) it +doesn't take into account those variables. Since -fPIC is needed by default +by any kind of linking, let's add it to the general -fPIC. Rebar seems to +link libraries without taking into account any variable listed in: +src/rebar_port_compiler.erl +this after testing and tracing for every variable. + +Signed-off-by: Giulio Benetti +--- + src/rebar_port_compiler.erl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl +index 9679c80..bd08b21 100644 +--- a/src/rebar_port_compiler.erl ++++ b/src/rebar_port_compiler.erl +@@ -645,6 +645,8 @@ default_env() -> + {"OBJCOPY", get_tool(Arch, "objcopy", "objcopy")}, + {"OBJDUMP", get_tool(Arch, "objdump", "objdump")}, + ++ {"LDFLAGS", "-fPIC $LDFLAGS"}, ++ + {"DRV_CXX_TEMPLATE", + "$CXX -c $CXXFLAGS $DRV_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"}, + {"DRV_CC_TEMPLATE", +-- +2.25.1 + From peter at korsgaard.com Tue Jan 25 19:22:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 20:22:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libdbi: needs dynamic library Message-ID: <20220125191637.5FAF8822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d4a00623ebc44f197b08e039fe533bba82290b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x libdbi needs dynamic library to avoid the following build failure raised since the addition of the package in commit c6aac6ebdbbd3873110a9e19de1957e49cb9344e: dbi_main.c:84:2: error: #error no dynamic loading support 84 | #error no dynamic loading support | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/9cd56a625cbd52b0c070e2d462e02f5161d9631d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a24f0e8eeebbd6a77775a5eb5dbe830417fc9d22) Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 4 ++++ package/libdbi-drivers/Config.in | 4 ++++ package/libdbi/Config.in | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 9c38d87bcb..05fb577345 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -214,11 +214,15 @@ config BR2_PACKAGE_COLLECTD_CURL_XML config BR2_PACKAGE_COLLECTD_DBI bool "dbi" + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBDBI help Executes SQL statements on various databases and interprets the returned data. +comment "dbi support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_COLLECTD_DF bool "df" help diff --git a/package/libdbi-drivers/Config.in b/package/libdbi-drivers/Config.in index 087e6aaf0e..7c505340c1 100644 --- a/package/libdbi-drivers/Config.in +++ b/package/libdbi-drivers/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_LIBDBI_DRIVERS bool "libdbi-drivers" + depends on !BR2_STATIC_LIBS # libdbi select BR2_PACKAGE_LIBDBI help The libdbi-drivers project provides the database-specific drivers for the libdbi framework. http://libdbi-drivers.sourceforge.net + +comment "libdbi-drivers needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libdbi/Config.in b/package/libdbi/Config.in index ded2bc6e53..13ac344f82 100644 --- a/package/libdbi/Config.in +++ b/package/libdbi/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_LIBDBI bool "lidbi" + depends on !BR2_STATIC_LIBS help libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl. http://libdbi.sourceforge.net + +comment "libdbi needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS From peter at korsgaard.com Tue Jan 25 19:23:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 20:23:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdbi: needs dynamic library In-Reply-To: <20211228230513.5ebc14e9@windsurf> (Thomas Petazzoni's message of "Tue, 28 Dec 2021 23:05:13 +0100") References: <20211014160824.2154396-1-fontaine.fabrice@gmail.com> <20211228230513.5ebc14e9@windsurf> Message-ID: <87sftbk4ad.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Thu, 14 Oct 2021 18:08:24 +0200 > Fabrice Fontaine wrote: >> libdbi needs dynamic library to avoid the following build failure raised >> since the addition of the package in commit >> c6aac6ebdbbd3873110a9e19de1957e49cb9344e: >> >> dbi_main.c:84:2: error: #error no dynamic loading support >> 84 | #error no dynamic loading support >> | ^~~~~ >> >> Fixes: >> - http://autobuild.buildroot.org/results/9cd56a625cbd52b0c070e2d462e02f5161d9631d >> >> Signed-off-by: Fabrice Fontaine >> --- >> package/libdbi-drivers/Config.in | 4 ++++ >> package/libdbi/Config.in | 4 ++++ >> 2 files changed, 8 insertions(+) > Applied to master, but after adding the !BR2_STATIC_LIBS dependency to > collectd, as suggested by Herv?. Indeed, we prefer to duplicate those > dependencies, if they turn out to change at the top-level > BR2_PACKAGE_COLLECTD option. Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From ps.report at gmx.net Tue Jan 25 20:11:08 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 25 Jan 2022 21:11:08 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) In-Reply-To: <20220125001222.582e094a@windsurf> References: <20220124201628.11015-1-ps.report@gmx.net> <20220124220707.688fee47@windsurf> <20220125001222.582e094a@windsurf> Message-ID: <20220125211108.1143b77b@gmx.net> Hello Thomas, On Tue, 25 Jan 2022 00:12:22 +0100, Thomas Petazzoni wrote: > On Mon, 24 Jan 2022 22:07:07 +0100 > Thomas Petazzoni wrote: > > > Applied to master, thanks. > > And I reverted, because it breaks the build: > > http://autobuild.buildroot.net/?reason=%util-linux-2.37.3 > > (I didn't investigate, it's too late here.) The failure is make[3]: *** No rule to make target 'disk-utils/raw.8', needed by 'all-am'. Stop. upstream known [1] and [2] (and fixed in the next release), seems to be a packaging error and could be fixed/work-around (or hacked) by (will install an empty man page to staging/target): touch build/util-linux-2.37.3/disk-utils/raw.8 Can send an updated patch with this fix(?)... Regards, Peter [1] https://github.com/util-linux/util-linux/issues/1579 [2] https://github.com/util-linux/util-linux/issues/1577 > > Best regards, > > Thomas From arnout at mind.be Tue Jan 25 20:49:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 25 Jan 2022 21:49:17 +0100 Subject: [Buildroot] [PATCH 0/2 v2] core: fixup PPD paths (branch yem/ppd-fixup-paths) In-Reply-To: References: Message-ID: <27e2c9f6-8ed6-b23e-ba39-9f04e29f4590@mind.be> On 22/01/2022 19:13, Yann E. MORIN wrote: > Hello All! > > This series builds upon previous good work from Andreas [0], Louis-Paul > [1], and Adam [2]. > > The first patch is the core of the change: rather than have multiple > hooks that each cater for different types of files (.py, .pc, .pri, > .cmake and so on), we jut do what we already do in relocate-sdk: we just > look for all text files that have a PPD prefix in them, and replace tht > with the current package's PPD. > > The second patch ensures that we can build reliable files lists, so that > files we tweak in the infra are not believed to be installed/modified by > the current package. > > [0] https://lore.kernel.org/buildroot/20200217212350.29750-21-anaumann at ultratronik.de/ > [1] https://lore.kernel.org/buildroot/a339f273-33f3-f232-eac4-6e50427abf6d at cordier.org/ > [2] https://lore.kernel.org/buildroot/20220106171720.12857-1-aduskett at gmail.com/ > > Changes v1 -> v2: > - use --binary-files=without-match, as this *considerably* speeds up > the fixup (Arnout) > - rename the python fixup (Arnout) Both applied to master, thanks. Regards, Arnout > > Regards, > Yann E. MORIN. > > > ---------------------------------------------------------------- > Yann E. MORIN (2): > core/pkg-generic: fixup all PPD paths in a generic fashion > core/pkg-generic: apply post-prepare hooks before monitoring directories > > package/pkg-generic.mk | 47 +++++++++++++++++++++++------------------------ > 1 file changed, 23 insertions(+), 24 deletions(-) > From arnout at mind.be Tue Jan 25 20:47:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 25 Jan 2022 21:47:17 +0100 Subject: [Buildroot] [git commit] core/pkg-generic: apply post-prepare hooks before monitoring directories Message-ID: <20220125204237.D5D9182810@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f9a1c621302c6cdf01dfff88f0343d7b03a6107 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Monitoring the target/ and host/ directories and so on, will serve to generate lists of files installed by the packages. Those lists are then used to generate graphs of the size those package take on the target for example. With PPD, we will also want to use those lists to only copy those files actually installed by each dependencies of a package, recursively. Currently, those lists are not entirely reliable, as the starting points are established before we apply PPD fixup hooks. As such, at the end of a package installation, fixed up files will be found to belong to the current package, while they were in fact provided by one of its dependency. While this does no big harm, if at all, for the size graphs, it will trigger overwrite detection when we eventually gather packages together to aggregate a PPD or te final host and target. So, we better have the lists of files be reliable. So, we only start monitoring the directories after we apply the PPD fixups (or seen the other way around for a smaller diff: we apply the PPD fixups before we start monitoring the directories). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Herve Codina Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 78226ee266..b3a7e1d60e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -273,11 +273,11 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call MESSAGE,"Configuring") $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) @$(call pkg_size_before,$(TARGET_DIR)) @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) From arnout at mind.be Tue Jan 25 20:37:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 25 Jan 2022 21:37:48 +0100 Subject: [Buildroot] [git commit] core/pkg-generic: fixup all PPD paths in a generic fashion Message-ID: <20220125204237.CCA6182627@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b06294e9897e90862656416e8b67fdace15488d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some files contain hard-coded absolute paths that point to the host and/or staging directories. With per-package directories (aka. PPD), these paths point to the PPD of the package that created the files, when we want them to point to the PPD of the package that uses them. Up until now, we had two hooks that attempted to fix those files: - a libtool-specific hook that searches for all .la files and seds them with the proper PPD, - a python-specific hook that tweaks just the sysconfigdata and removes the byte-compiled version of the sysconfigdata. But now, we also have a few other kinds of files for which we need to fix the PPD: .cmake, .pc, or .pri files, and probably a bunch of others as well. We solve this issue by just replacing any PPD in text files, with the current package's PPD. This is very similar to, and inspired from what is done when relocating the SDK. However, we can't use the existing relocate-sdk script, because that needs to know the original location, which we do not have when we aggregate the PPD (we could store it, but we can easily do without it). Furthermore, we use a construct that is way more efficient than relocate-sdk. First, we skip binary files with grep, which means we have way less files to check with 'file' [0]. Second, we use xargs to sed multiple files at once: printf is a shell built-in, so it's fast, and so we do not have to spawn a sed for each file to fixup. [0] We still keep using 'file' as a safety net, to avoid mangling a binary file that grep would have missed. Finally, the existing python-specific macro is simplified to just remove the pre-compiled sysconfigdata files. And we rename it accordingly. And as for some timings, to see the impact, with the defconfig below, and with the downloads already local, and with a PC mostly idle (mail and IRC activity only): Before Now Delta - without PPD : 7min 27s 7min 23s -0.9% - with PPD : 7min 51s 7min 59s +1.7% - with PPD -j8: 5min 51s 5min 56s +1.4% So we can see a slight increase in time, but it is mostly in the noise (some builds without this change did exceed some builds with this change, due to background noise). Also, depending on scheduling, there can be less parallelism; for example, python3 does not build in parallel, and with this special defconfig, python is on the critical path of a lot of packages that are python modules, which can negatively impact a parallel build too. A more realistic, bigger defconfig would probably be more parallel... YMMV... Delta without PPD is also due to background noise, as those hooks are not used when PPD is not enabled. Defconfig used: BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AIOBLESCAN=y BR2_PACKAGE_PYTHON_AIOCOAP=y BR2_PACKAGE_PYTHON_AIOFILES=y BR2_PACKAGE_PYTHON_AIOHTTP_CORS=y BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR=y BR2_PACKAGE_PYTHON_AIOHTTP_MAKO=y BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES=y BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY=y BR2_PACKAGE_PYTHON_AIOHTTP_SESSION=y BR2_PACKAGE_PYTHON_AIOHTTP_SSE=y BR2_PACKAGE_PYTHON_AIOJOBS=y BR2_PACKAGE_PYTHON_AIOLOGSTASH=y BR2_PACKAGE_PYTHON_AIOMONITOR=y BR2_PACKAGE_PYTHON_AIOPROCESSING=y BR2_PACKAGE_PYTHON_AIOREDIS=y BR2_PACKAGE_PYTHON_AIORWLOCK=y BR2_PACKAGE_PYTHON_AIOZIPKIN=y BR2_PACKAGE_LIGHTTPD=y BR2_PACKAGE_LIGHTTPD_OPENSSL=y BR2_PACKAGE_LIGHTTPD_ZLIB=y BR2_PACKAGE_LIGHTTPD_BZIP2=y BR2_PACKAGE_LIGHTTPD_PCRE=y BR2_PACKAGE_LIGHTTPD_WEBDAV=y # BR2_TARGET_ROOTFS_TAR is not set Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Adam Duskett Cc: Louis-Paul CORDIER Cc: Andreas Naumann Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-generic.mk | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6a5fe5507b..78226ee266 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -90,21 +90,24 @@ endif ####################################### # Helper functions -# Make sure .la files only reference the current per-package -# directory. - -# $1: package name (lower case) -# $2: staging directory of the package ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define fixup-libtool-files - $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \ - -name "*.la" -print0 | xargs -0 --no-run-if-empty \ - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" + +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the +# proper staging and host directories for the current package: find +# all text files that contain the PPD root, and replace it with the +# current package's PPD. +define PPD_FIXUP_PATHS + $(Q)grep --binary-files=without-match -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ + |while read -d '' f; do \ + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ + printf '%s\0' "$${f}"; \ + done \ + |xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef -endif -# Make sure python _sysconfigdata*.py files only reference the current -# per-package directory. +# Remove python's pre-compiled "sysconfigdata", as it may contain paths to +# the original staging or host dirs. # # Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) # because those directories may be created in the same recipe this macro will @@ -113,19 +116,15 @@ endif # fail. # So we just use HOST_DIR as a starting point, and filter on the two directories # of interest. -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define FIXUP_PYTHON_SYSCONFIGDATA +define PPD_PYTHON_REMOVE_SYSCONFIGDATA_PYC $(Q)find $(HOST_DIR) \ \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ \) \ - \( \( -name "_sysconfigdata*.pyc" -delete \) \ - -o \( -name "_sysconfigdata*.py" -print0 \) \ - \) \ - | xargs -0 --no-run-if-empty \ - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + \( -name "_sysconfigdata*.pyc" -delete \) endef -endif + +endif # PPD # Functions to collect statistics about installed files @@ -278,8 +277,6 @@ $(BUILD_DIR)/%/.stamp_configured: @$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(BINARIES_DIR),-images) @$(call pkg_size_before,$(HOST_DIR),-host) - $(call fixup-libtool-files,$(NAME),$(HOST_DIR)) - $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) @@ -836,7 +833,9 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA +$(2)_POST_PREPARE_HOOKS += \ + PPD_FIXUP_PATHS \ + PPD_PYTHON_REMOVE_SYSCONFIGDATA_PYC ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) From yann.morin.1998 at free.fr Tue Jan 25 20:55:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 25 Jan 2022 21:55:23 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex In-Reply-To: <20220122153243.009b24ba@windsurf> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220122153243.009b24ba@windsurf> Message-ID: <20220125205523.GH457876@scaer> Thomas, Giulio, All, On 2022-01-22 15:32 +0100, Thomas Petazzoni spake thusly: > On Tue, 18 Jan 2022 11:43:10 +0100 > Giulio Benetti wrote: > > > this patchset aims to enable the best FPU strategy for every board with > > 32-bits Arm Cortex actually present in Buildroot. I don't own these boards > > so I can't test these changes. What is about Allwinner doesn't worry me > > because I've tested a lot of cases with Olimex boards, but the other > > changes are still to be tested. > > > > So I ask to the board maintainers to test the patches that involve their > > boards if possible. Anyway I've checked well all the SoCs Datasheet and I > > think I've made it correctly, even if in some of them it's not specified > > if VFPv4 means -D32. I assume it like that because otherwise -D16 is > > usually specified. > > Do we have a good understand of what -mfpu=neon-vfpv4 does? Your patch > series basically converts many defconfigs to use this -mfpu value, but > it's not clear to me how it works. What does it mean to combine NEON > and VFPv4 instructions? The gcc man page states that specifying Neon as part of the fpu setting has no effect, unless the -funsafe-math-optimizations is also specified, because Neon is not compliant zith IEEE 754: If the selected floating-point hardware includes the NEON extension (e.g. -mfpu=neon), note that floating-point operations are not generated by GCC's auto-vectorization pass unless -funsafe-math-optimizations is also specified. This is because NEON hardware does not fully implement the IEEE 754 standard for floating-point arithmetic (in particular denormal values are treated as zero), so the use of NEON instructions may lead to a loss of precision. So it is my understanding that using Neon is not a good idea overall. It should only be requested on-demand by people who know what they are doing, and most probably, be setting appropriate CFLAGS on a per-package basis. Additionally, changing the default FPU setting on those defconfigs is not really interesting. Indeed, the base system that (most of) those defconfig build are probably not exercising the FPU setting much (the busybox login and shell are probably not using much FPU insns). So, for me, this series is a no-go, first because it has not been tsted on actual hardware, second because some of the changes introduce a dubious feature which is actually a no-op at best, or worse will generate incorrect code. Regards, Yann E. MORIN. > Regarding VFPv4 D16 vs. D32, > https://developer.arm.com/documentation/den0018/a/Compiling-NEON-Instructions/GCC-command-line-options/Option-to-specify-the-FPU > tells us: > > VFPv3 and VFPv4 implementations provide 32 double-precision > registers. However, when NEON unit is not present, the top sixteen > registers (D16-D31) become optional. This is shown by the -d16 in the > option name, which means that the top sixteen D registers are not > available. > > So, my understanding is that when NEON is available, the VFPv4 is > guaranteed to have the 32 double-precision registers (D32). > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Tue Jan 25 20:57:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 25 Jan 2022 21:57:37 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <20211106181424.299041-1-peron.clem@gmail.com> References: <20211106181424.299041-1-peron.clem@gmail.com> Message-ID: <73fe7aba-588b-133b-f0a6-960cbefb162f@mind.be> Hi Cle?ment, On 06/11/2021 19:14, Cl?ment P?ron wrote: > For the moment Beelink GS1 use a default rootfs size of 60M > which make sometimes the build failed due to missing space. That's surprising... The only thing in the rootfs is busybox, so the rootfs size should be way less than 1MB, let alone 60MB... Also, "sometimes" is suspicious. The rootfs should be almost binary identical between two builds (there are some dates and paths in there if you don't enable BR2_REPRODUCIBLE). Do you have a bit more detail/example of how it fails? Regards, Arnout > > Increase the rootfs size to 120M. > > Signed-off-by: Cl?ment P?ron > --- > configs/beelink_gs1_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index e88f3e3b69..1872aabdf0 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -24,6 +24,7 @@ BR2_PACKAGE_AUTOSSH=y > BR2_PACKAGE_DROPBEAR=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y From peter at korsgaard.com Tue Jan 25 21:07:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:07:52 +0100 Subject: [Buildroot] [git commit] Makefile: set HOST*_NOCCACHE variables only if unset In-Reply-To: <20211229090605.B5B8182A06@busybox.osuosl.org> (Thomas Petazzoni's message of "Wed, 29 Dec 2021 10:11:27 +0100") References: <20211229090605.B5B8182A06@busybox.osuosl.org> Message-ID: <87o83zjzh3.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=c5912e7db37cc0a04696cf081410ec007f8f0be9 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Set HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE only if they are not > set. This allows recursive calls to "make" to work as intended in the > presence of ccache. Such recursive calls to "make" can for example > happen if one calls "make legal-info" from within a post-build script, > to integrate some results of the legal-info output into the root > filesystem. > Without guarding these variables, a recursive invocation of make would > re-define > HOSTCC_NOCCACHE := $(HOSTCC) > and > HOSTCXX_NOCCACHE := $(HOSTCXX) > at a point in time when HOSTCC and HOSTCXX already point to ccache. > It used to work by "accident" until > ca6a2907c27c8171336643d1ab41bd5c34ee3794 ("make: support: use `command > -v' instead of `which'"), due to how "which" was behaving when invoked > with multiple arguments. After switching to "command -v", which > behaves different with multiple arguments, this HOSTCC_NOCCACHE > redefinition problem surfaced. Even though > ca6a2907c27c8171336643d1ab41bd5c34ee3794 has since then been reverted > for other reasons, it does make sense to guard the definition of > HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE to not rely on a side-effect of > using "which". > Signed-off-by: Markus Mayer > Reviewed-by: Petr Vorel > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Tue Jan 25 21:08:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 22:08:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: disable tests Message-ID: <20220125210800.299916-1-fontaine.fabrice@gmail.com> Disable tests which are enabled since bump to version 2.0.35 in commit 13d4856b916d797c3c771669edd3eb883336766f and https://github.com/CESNET/netopeer2/commit/466a0b3c268ee319b4f65980404715a2723b4c0a to avoid the following build failure if cmocka is built before netopeer2: In file included from /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/stdint.h:20, from /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/lib/gcc/riscv64-buildroot-linux-musl/10.3.0/include/stdint.h:9, from /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/libyang/libyang.h:18, from /home/buildroot/autobuild/instance-2/output-1/build/netopeer2-2.0.35/tests/test_sub_ntf.c:27: /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/bits/alltypes.h:53:24: error: conflicting types for 'uintptr_t' 53 | typedef unsigned _Addr uintptr_t; | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/0660a4f767d5cdaf07b28a508101b87f0300850f Signed-off-by: Fabrice Fontaine --- package/netopeer2/netopeer2.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index c8b6763313..43f22b7e4c 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -11,7 +11,9 @@ NETOPEER2_LICENSE = BSD-3-Clause NETOPEER2_LICENSE_FILES = LICENSE NETOPEER2_DEPENDENCIES = libnetconf2 libyang sysrepo host-sysrepo -NETOPEER2_CONF_OPTS = -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) +NETOPEER2_CONF_OPTS = \ + -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) \ + -DENABLE_TESTS=OFF # Set a build specific SYSREPO_SHM_PREFIX to ensure we can safely delete the # files. This also ensures that concurrent parallel builds will not be -- 2.34.1 From peter at korsgaard.com Tue Jan 25 21:11:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:11:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.3930 In-Reply-To: <20211229101950.534749-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 29 Dec 2021 11:19:50 +0100") References: <20211229101950.534749-1-fontaine.fabrice@gmail.com> Message-ID: <87k0enjzbp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4136: vim is vulnerable to Heap-based Buffer Overflow > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Jan 25 21:10:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:10:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.3930 Message-ID: <20220125210530.4179D814BB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11f7c50bc2a0451bab846166cbc4ab680205e545 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4136: vim is vulnerable to Heap-based Buffer Overflow Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f5ec93be3c1d9deda2a7ad516c258128561f62e9) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 9fb162d798..6fa5d1bef0 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 acddd083c44a3a62194b73bb2fd1327af2adf256b5978c64f97d2656dda24d07 vim-8.2.3775.tar.gz +sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index e0079d3468..6643ef0841 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3775 +VIM_VERSION = 8.2.3930 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Tue Jan 25 21:07:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:07:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Makefile: set HOST*_NOCCACHE variables only if unset Message-ID: <20220125210534.E4F39814BB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a6bcea2b1da0c38344baa55feab9b6990f6c697 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Set HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE only if they are not set. This allows recursive calls to "make" to work as intended in the presence of ccache. Such recursive calls to "make" can for example happen if one calls "make legal-info" from within a post-build script, to integrate some results of the legal-info output into the root filesystem. Without guarding these variables, a recursive invocation of make would re-define HOSTCC_NOCCACHE := $(HOSTCC) and HOSTCXX_NOCCACHE := $(HOSTCXX) at a point in time when HOSTCC and HOSTCXX already point to ccache. It used to work by "accident" until ca6a2907c27c8171336643d1ab41bd5c34ee3794 ("make: support: use `command -v' instead of `which'"), due to how "which" was behaving when invoked with multiple arguments. After switching to "command -v", which behaves different with multiple arguments, this HOSTCC_NOCCACHE redefinition problem surfaced. Even though ca6a2907c27c8171336643d1ab41bd5c34ee3794 has since then been reverted for other reasons, it does make sense to guard the definition of HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE to not rely on a side-effect of using "which". Signed-off-by: Markus Mayer Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni (cherry picked from commit c5912e7db37cc0a04696cf081410ec007f8f0be9) Signed-off-by: Peter Korsgaard --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 74ef7dc598..386b4f4e44 100644 --- a/Makefile +++ b/Makefile @@ -286,12 +286,16 @@ ifndef HOSTCC HOSTCC := gcc HOSTCC := $(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc) endif +ifndef HOSTCC_NOCCACHE HOSTCC_NOCCACHE := $(HOSTCC) +endif ifndef HOSTCXX HOSTCXX := g++ HOSTCXX := $(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++) endif +ifndef HOSTCXX_NOCCACHE HOSTCXX_NOCCACHE := $(HOSTCXX) +endif ifndef HOSTCPP HOSTCPP := cpp endif From peter at korsgaard.com Tue Jan 25 21:10:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:10:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.3930 Message-ID: <20220125210534.ED396825E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=292f2d7ca073f0161c0c7f1bd23c1d920b273bc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4136: vim is vulnerable to Heap-based Buffer Overflow Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f5ec93be3c1d9deda2a7ad516c258128561f62e9) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 9fb162d798..6fa5d1bef0 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 acddd083c44a3a62194b73bb2fd1327af2adf256b5978c64f97d2656dda24d07 vim-8.2.3775.tar.gz +sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index e0079d3468..6643ef0841 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3775 +VIM_VERSION = 8.2.3930 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From arnout at mind.be Tue Jan 25 21:13:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 25 Jan 2022 22:13:01 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/gcc: use binutils wrappers for target libs In-Reply-To: References: <20201017221743.160029-1-nolange79@gmail.com> <20201017221743.160029-2-nolange79@gmail.com> <20220109151653.GC1477939@scaer> Message-ID: <0ff95c8d-0967-e5aa-bb9f-d0d6fe8c1b33@mind.be> On 10/01/2022 11:43, Arnout Vandecappelle wrote: > > > On 09/01/2022 22:08, Norbert Lange wrote: >> Am So., 9. Jan. 2022 um 16:16 Uhr schrieb Yann E. MORIN >> : >>> >>> Nrobert, All, >>> >>> On 2020-10-18 00:17 +0200, Norbert Lange spake thusly: >>>> This will use gcc-ar, gcc-nm and gcc-ranlib instead of the >>>> normal binutils tools. The difference is that with the >>>> wrappers, gcc plugins will be automatically picked up, >>>> which might be necessary with some flags. >>>> >>>> Signed-off-by: Norbert Lange >>>> --- >>>> v1->v2: >>>> *?? Only set those wrappers if gc 4.7 or newer >>>> --- >>>> ? package/gcc/gcc.mk | 3 +++ >>>> ? 1 file changed, 3 insertions(+) >>>> >>>> diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk >>>> index 114c2887a0..a24ffe3ee2 100644 >>>> --- a/package/gcc/gcc.mk >>>> +++ b/package/gcc/gcc.mk >>>> @@ -99,6 +99,9 @@ GCC_COMMON_TARGET_CFLAGS += -Wno-error >>>> ? endif >>>> >>>> ? # Propagate options used for target software building to GCC target libs >>>> +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) ?This is actually not needed - the lowest GCC version we have for the internal toolchain is 8. >>>> +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm >>>> RANLIB_FOR_TARGET=gcc-ranlib >>> >>> So we were a bit skeptical about this one. >>> >>> First, we believe that only the final gcc should be using those. Indeed, >>> we do not need much of the initial gcc, except libgcc.a, which anyway >>> gets overwitten by the final gcc, so we do not care that the libgcc.a is >>> built with LTO (and thus the gcc wrappers). >> >>> Second, gcc initial is only used to build glibc, and as your patch 4 >>> states, glibc must not be built with LTO, we we also do not care that >>> the initial gcc uses its wrappers to build libgcc. > > ?Although I may have been the one to make this obvservation to begin with, I'm > starting to come back on that. Even though indeed it is probably not very > useful to apply the wrappers to gcc-initial, it doesn't hurt either. And by > putting it in _COMMON_CONF_ENV, we make sure that (almost) all of the options > are together in gcc.mk. Note that --enable-lto is also in COMMON_OPTS. > >>> >>> Third, shouldn't we be using the tupple-prefixed wrappers? Or does it >>> just happens that gcc will internally add its build directory to PATH so >>> that it can find the un-prefixed just-built ones? >>> >>> For that last point, I added gcc-ar, gcc-nm, and gcc-ranlib in my PATH, >>> that are just simple wrapper scripts that trace their being called, and >>> then call to the actual gcca-r et al.: >>> >>> ???? #!/bin/sh >>> ???? me="${0}" >>> ???? my_name="${0##*/}" >>> ???? found=false >>> ???? for i in $(which -a "${my_name}"); do >>> ???????? if [ "${i}" -ef "${me}" ]; then >>> ???????????? found=true >>> ???????? elif ${found}; then >>> ???????????? me="${i}" >>> ???????? fi >>> ???? done >>> ???? if ! ${found}; then >>> ???????? exit 42 >>> ???? fi >>> ???? printf "YEM: wrapped %s\n" "${me}" >>> ???? exec "${me}" "${@}" >>> >>> Turns out that the 'YEM: wrapped' string occurs nowhere in the build >>> directory (so it does not end up in config.log or whatever), and it >>> does not even appear on the stdout/stderr either. >>> >>> So I am wondering how we can exercise these... Any hint? >> >> Can't tell anymore, I went to crosstool-ng for the compiler some time ago, >> so unlike my other patches I dont use them anymore. > >> ?From my memory, it affected some of the additional libs gcc builds, >> libstdc++, some sanitizers maybe. >> there was not absolute paths or tuples as the various stages should >> use the wrappers from the previous ones. I believe the final compiler >> ignores PATH and uses the stage2-compiler with abs path to build the >> included target libraries. > > ?That it doesn't look in PATH indeed sounds feasible. > > ?However, what is very surprising is that GCC doesn't automatically use the > plugins when --enable-lto is passed. Before blindly adding some random > options, we want to really understand why it is needed, in case maybe things > are already broken in some other way, and to be able in the future to make > changes and understand if they're OK or not. > > ?That said, I have checked and indeed, without these options it seems to use > plain ar instead of gcc-ar. > > ?So I looked a bit deeper, and found this really old bug about enabling lto > for libgcc [1]. It refers to a bunch of other issues found while doing this. > > ?For me, however, the conclusion is that the patch should be applied, but with > better explanation. That way, you can set BR2_TARGET_OPTIMIZATION to -flto and > get an LTO'ed libgcc/libstdc++/etc. If LTO is not used, it doesn't harm to use > the wrapper. ?I summarized this discussion and applied to master, thanks. ?Regards, ?Arnout > > ?There's just one little concern though: I think the wrappers aren't even > generated unless LTO is enabled. But that point is moot - since GCC N (where N > > 4.9 and < 9), LTO is enabled by default, and we don't pass --disable-lto if > LTO is not enabled. In other words, nowadays the BR2_GCC_ENABLE_LTO symbol is > useless. > > > ?Regards, > ?Arnout > > > [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59893 > > > >> >> I am just sure it was very deliberately done *this* way. >> >> Norbert >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> From peter at korsgaard.com Tue Jan 25 21:15:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:15:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/vlc: needs host-gettext In-Reply-To: <20211228220302.2886460-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 28 Dec 2021 23:03:02 +0100") References: <20211228220302.2886460-1-bernd.kuhls@t-online.de> Message-ID: <87fspbjz55.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Build fails on systems without /usr/bin/msgfmt > Fixes: > http://autobuild.buildroot.net/results/3c9/3c9893dd92d784a0520a287c4d4a5e760393c95f/ > Signed-off-by: Bernd Kuhls Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Tue Jan 25 21:10:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 25 Jan 2022 22:10:26 +0100 Subject: [Buildroot] [git commit] package/gcc: use binutils wrappers for target libs Message-ID: <20220125210819.A504C825E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee228403e9741b6c799ce1ef34c15993086f266d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This will use gcc-ar, gcc-nm and gcc-ranlib instead of the normal binutils tools. The difference is that with the wrappers, gcc plugins will be automatically picked up, which is necessary to build with LTO. With this enabled, it is possible to build everything (including libgcc and libstdc++) with LTO by setting BR2_TARGET_OPTIMIZATION="-flto". Note that you'd expect that the GCC build system would automatically do this when --enable-lto is set, but this is not the case. There are some open bugs [1][2] to allow building libgcc and libstdc++ with LTO support but it's apparently not done yet. Note that there are also reports of problems building libstdc++ with LTO [3], but it seems that's no longer a problem (and the bug didn't get updated). Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59893 [2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77278 [3] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60160 --- package/gcc/gcc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 3adc1d4e16..128cf8421d 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -104,6 +104,7 @@ endif # Propagate options used for target software building to GCC target libs HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" +HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib # libitm needs sparc V9+ ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) From peter at korsgaard.com Tue Jan 25 21:14:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:14:37 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vlc: needs host-gettext Message-ID: <20220125210906.C306D825E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=575a94b1acc2079f6f0ebb37f451f6bf044c99eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Build fails on systems without /usr/bin/msgfmt. This has been an issue that exists since at least vlc 3.0.7, with build failures that can be found as early as August 2019. Fixes: http://autobuild.buildroot.net/results/3c9893dd92d784a0520a287c4d4a5e760393c95f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 153d028303c88b25344f33ddee0094b2ac5e2f49) Signed-off-by: Peter Korsgaard --- package/vlc/vlc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 06fc650f6f..fe338fcbe8 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -11,7 +11,7 @@ VLC_LICENSE = GPL-2.0+, LGPL-2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_CPE_ID_VENDOR = videolan VLC_CPE_ID_PRODUCT = vlc_media_player -VLC_DEPENDENCIES = host-pkgconf +VLC_DEPENDENCIES = host-gettext host-pkgconf VLC_AUTORECONF = YES # Install vlc libraries in staging. From peter at korsgaard.com Tue Jan 25 21:14:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 25 Jan 2022 22:14:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vlc: needs host-gettext Message-ID: <20220125210911.0AAB9825E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c4f7f1c2efc9ed079d8520d053b507b4cabfea3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Build fails on systems without /usr/bin/msgfmt. This has been an issue that exists since at least vlc 3.0.7, with build failures that can be found as early as August 2019. Fixes: http://autobuild.buildroot.net/results/3c9893dd92d784a0520a287c4d4a5e760393c95f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 153d028303c88b25344f33ddee0094b2ac5e2f49) Signed-off-by: Peter Korsgaard --- package/vlc/vlc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 06fc650f6f..fe338fcbe8 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -11,7 +11,7 @@ VLC_LICENSE = GPL-2.0+, LGPL-2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_CPE_ID_VENDOR = videolan VLC_CPE_ID_PRODUCT = vlc_media_player -VLC_DEPENDENCIES = host-pkgconf +VLC_DEPENDENCIES = host-gettext host-pkgconf VLC_AUTORECONF = YES # Install vlc libraries in staging. From fontaine.fabrice at gmail.com Tue Jan 25 21:20:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 22:20:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-dataproperty: bump to version 0.54.2 Message-ID: <20220125212039.300631-1-fontaine.fabrice@gmail.com> https://github.com/thombashi/DataProperty/releases/tag/v0.54.2 https://github.com/thombashi/DataProperty/releases/tag/v0.54.1 https://github.com/thombashi/DataProperty/releases/tag/v0.54.0 Signed-off-by: Fabrice Fontaine --- package/python-dataproperty/python-dataproperty.hash | 6 +++--- package/python-dataproperty/python-dataproperty.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-dataproperty/python-dataproperty.hash b/package/python-dataproperty/python-dataproperty.hash index 9a8c250125..380846e9f1 100644 --- a/package/python-dataproperty/python-dataproperty.hash +++ b/package/python-dataproperty/python-dataproperty.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/DataProperty/json -md5 6a6930ae266399df58707a13a5f0cfa6 DataProperty-0.53.0.tar.gz -sha256 9589b5c5b400a77e1aeb63d89d755043bbe00043219336963c93db5df49cbaf7 DataProperty-0.53.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/dataproperty/json +md5 ce5fd0d37b6d0ca57f144e22cd62bfec DataProperty-0.54.2.tar.gz +sha256 df2fcf00e7a57f0a6089f686f847527eb3c91ded5c419daef6d06ee4bb1187b4 DataProperty-0.54.2.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 5ceb7f72f5..1b07dc1bb7 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.53.0 +PYTHON_DATAPROPERTY_VERSION = 0.54.2 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/df/d0/36deb707996c5ef48ab353804291f44f59bd9d46875c384d163ad106df1a +PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/9a/03/44fb9094c4fb8032f254eaa37b3b07db82fa35779ceca097b3cde8464749 PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 21:32:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 22:32:41 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-sqliteschema: drop python-six dependency Message-ID: <20220125213242.301404-1-fontaine.fabrice@gmail.com> python-six is not a dependency since version 1.0.0 and https://github.com/thombashi/sqliteschema/commit/3aae6a0bb6d4b11ef2c83cb23a796a320ea422da which dropped python 2 support Signed-off-by: Fabrice Fontaine --- package/python-sqliteschema/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in index 8383647129..b8fed33c49 100644 --- a/package/python-sqliteschema/Config.in +++ b/package/python-sqliteschema/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_PYTHON_SQLITESCHEMA bool "python-sqliteschema" - depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 21:32:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 22:32:42 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-sqliteschema: bump to version 1.2.1 In-Reply-To: <20220125213242.301404-1-fontaine.fabrice@gmail.com> References: <20220125213242.301404-1-fontaine.fabrice@gmail.com> Message-ID: <20220125213242.301404-2-fontaine.fabrice@gmail.com> https://github.com/thombashi/sqliteschema/releases/tag/v1.2.1 Signed-off-by: Fabrice Fontaine --- package/python-sqliteschema/python-sqliteschema.hash | 4 ++-- package/python-sqliteschema/python-sqliteschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sqliteschema/python-sqliteschema.hash b/package/python-sqliteschema/python-sqliteschema.hash index 310e56ab32..e60bd64325 100644 --- a/package/python-sqliteschema/python-sqliteschema.hash +++ b/package/python-sqliteschema/python-sqliteschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqliteschema/json -md5 ca70006e289f1d506124de779ed73d64 sqliteschema-1.2.0.tar.gz -sha256 4c18f141239c58b6dbdc69130be41ed9740d8209a7ab6d529ba982a8b79c071a sqliteschema-1.2.0.tar.gz +md5 4fb0130e7cc60d92be468091fbfc3d51 sqliteschema-1.2.1.tar.gz +sha256 dde195bd7bc70d5841bc01dff20ec23bd43be87d760d2dfc7c7f2e5fd3808ef3 sqliteschema-1.2.1.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-sqliteschema/python-sqliteschema.mk b/package/python-sqliteschema/python-sqliteschema.mk index e4fd0de2fb..5c52e35111 100644 --- a/package/python-sqliteschema/python-sqliteschema.mk +++ b/package/python-sqliteschema/python-sqliteschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLITESCHEMA_VERSION = 1.2.0 +PYTHON_SQLITESCHEMA_VERSION = 1.2.1 PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/5c/d3/0c2e4c989a8d45f9443e431d7cbf89af4aba719fb0647b5f722716ef3990 +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/85/f8/be54d4bebf551cb533d1dea11c3bf165a1a408c2a1cceb1f9724aadd9967 PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools PYTHON_SQLITESCHEMA_LICENSE = MIT PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Tue Jan 25 21:48:22 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 25 Jan 2022 22:48:22 +0100 Subject: [Buildroot] [PATCH 00/28] Use the best FPU strategies on 32-bits Arm Cortex In-Reply-To: <20220125205523.GH457876@scaer> References: <20220118104338.2081259-1-giulio.benetti@benettiengineering.com> <20220122153243.009b24ba@windsurf> <20220125205523.GH457876@scaer> Message-ID: Hi Yann, Thomas, All, On 25/01/22 21:55, Yann E. MORIN wrote: > Thomas, Giulio, All, > > On 2022-01-22 15:32 +0100, Thomas Petazzoni spake thusly: >> On Tue, 18 Jan 2022 11:43:10 +0100 >> Giulio Benetti wrote: >> >>> this patchset aims to enable the best FPU strategy for every board with >>> 32-bits Arm Cortex actually present in Buildroot. I don't own these boards >>> so I can't test these changes. What is about Allwinner doesn't worry me >>> because I've tested a lot of cases with Olimex boards, but the other >>> changes are still to be tested. >>> >>> So I ask to the board maintainers to test the patches that involve their >>> boards if possible. Anyway I've checked well all the SoCs Datasheet and I >>> think I've made it correctly, even if in some of them it's not specified >>> if VFPv4 means -D32. I assume it like that because otherwise -D16 is >>> usually specified. >> >> Do we have a good understand of what -mfpu=neon-vfpv4 does? Your patch >> series basically converts many defconfigs to use this -mfpu value, but >> it's not clear to me how it works. What does it mean to combine NEON >> and VFPv4 instructions? > > The gcc man page states that specifying Neon as part of the fpu setting > has no effect, unless the -funsafe-math-optimizations is also specified, > because Neon is not compliant zith IEEE 754: > > If the selected floating-point hardware includes the NEON extension > (e.g. -mfpu=neon), note that floating-point operations are not > generated by GCC's auto-vectorization pass unless > -funsafe-math-optimizations is also specified. This is because NEON > hardware does not fully implement the IEEE 754 standard for > floating-point arithmetic (in particular denormal values are treated > as zero), so the use of NEON instructions may lead to a loss of > precision. > > So it is my understanding that using Neon is not a good idea overall. It > should only be requested on-demand by people who know what they are > doing, and most probably, be setting appropriate CFLAGS on a per-package > basis. > > Additionally, changing the default FPU setting on those defconfigs is > not really interesting. Indeed, the base system that (most of) those > defconfig build are probably not exercising the FPU setting much (the > busybox login and shell are probably not using much FPU insns). > > So, for me, this series is a no-go, first because it has not been tsted > on actual hardware, second because some of the changes introduce a > dubious feature which is actually a no-op at best, or worse will > generate incorrect code. I agree with you, it's too dangerous. I mean, I've tested on all Allwinner Axx series, but haven't check that in the end the assembly code corresponding. What I plan to do later, so now you can reject this patchset, is to use the smallest package that uses fpu instructions for sure, then enable for example: -mfpu=vfpv4 check AND -mfpu=neon-vfpv4 This way I will have my real answer before eventually re-submitting while explaining this in detail. Also, once I will have cleared this topic and it comes out that fpu is not use with neon-vfpv4, then I'll send patches to remove that fpu strategy on the boards I've set it to it. I thought it was easier, instead this is an insidious topic. So yes, let's drop this and thank you all for helping me to clarify. Kind regards! -- Giulio Benetti Benetti Engineering sas > Regards, > Yann E. MORIN. > >> Regarding VFPv4 D16 vs. D32, >> https://developer.arm.com/documentation/den0018/a/Compiling-NEON-Instructions/GCC-command-line-options/Option-to-specify-the-FPU >> tells us: >> >> VFPv3 and VFPv4 implementations provide 32 double-precision >> registers. However, when NEON unit is not present, the top sixteen >> registers (D16-D31) become optional. This is shown by the -d16 in the >> option name, which means that the top sixteen D registers are not >> available. >> >> So, my understanding is that when NEON is available, the VFPv4 is >> guaranteed to have the 32 double-precision registers (D32). >> >> Thomas >> -- >> Thomas Petazzoni, co-owner and CEO, Bootlin >> Embedded Linux and Kernel engineering and training >> https://bootlin.com > From ps.report at gmx.net Tue Jan 25 22:15:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 25 Jan 2022 23:15:33 +0100 Subject: [Buildroot] [PATCH v2] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) Message-ID: <20220125221533.17535-1-ps.report@gmx.net> - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.4 release download package For details see [1]. [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- Changes v1 -> v2: - add workaround for missing disk-utils/raw.8 file --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index eafbe9254a..9c10a42dca 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz +sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf0fee409b..baf9ed3406 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -267,6 +267,13 @@ else UTIL_LINUX_CONF_OPTS += --without-libmagic endif +# workaround missing disk-utils/raw.8 file in util-linux-2.37.4 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_PRE_BUILD_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + # Install PAM configuration files ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) define UTIL_LINUX_INSTALL_PAMFILES -- 2.34.1 From fontaine.fabrice at gmail.com Tue Jan 25 22:34:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 25 Jan 2022 23:34:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/tesseract-ocr: override neon check Message-ID: <20220125223454.444515-1-fontaine.fabrice@gmail.com> Override neon check to avoid the following build failure with uclibc-ng raised since bump to version 5.0.1 in commit df3f0c226fccd8d6143b09a1e05a0f5f23587136: src/arch/simddetect.cpp:61:14: fatal error: sys/auxv.h: No such file or directory 61 | # include | ^~~~~~~~~~~~ It should be noted that a patch to properly fix this build failure was rejected by upstream as "ARM support without NEON would result in a very slow Tesseract": https://github.com/tesseract-ocr/tesseract/pull/3717 So, a follow-up patch adding a dependency on !BR2_TOOLCHAIN_USES_UCLIBC for all CPU architectures or only for ARM without NEON could be approriate. Fixes: - http://autobuild.buildroot.org/results/0bac6491188b6681df2ca13eb230706e83cbb130 Signed-off-by: Fabrice Fontaine --- package/tesseract-ocr/tesseract-ocr.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index 7e23e64136..a7498931fb 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -24,6 +24,12 @@ TESSERACT_OCR_CONF_ENV = \ TESSERACT_OCR_CONF_OPTS = \ --disable-opencl +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +TESSERACT_OCR_CONF_ENV += ax_cv_check_cxxflags__mfpu_neon=yes +else +TESSERACT_OCR_CONF_ENV += ax_cv_check_cxxflags__mfpu_neon=no +endif + # Language data files download ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_ENG),y) TESSERACT_OCR_DATA_FILES += eng.traineddata -- 2.34.1 From lotorev at gmail.com Wed Jan 26 03:01:51 2022 From: lotorev at gmail.com (Vitaliy Lotorev) Date: Wed, 26 Jan 2022 06:01:51 +0300 Subject: [Buildroot] Buildroot check-package packaged as pre-commit.com hook Message-ID: Hi, To unify Buildroot linting experience on CI and in devs environment I developed a python wrapper package [1] that installs check-package Buildroot linter and dependencies. On the top of that there is a .pre-commit-hooks.yaml that allows to install and run check-package as pre-commit hook (https://pre-commit.com). Hope someone finds it useful :) [1] https://github.com/vlotorev/buildroot-utils -------------- next part -------------- An HTML attachment was scrubbed... URL: From kuzminov.sergey81 at gmail.com Wed Jan 26 05:18:08 2022 From: kuzminov.sergey81 at gmail.com (Sergey Kuzminov) Date: Wed, 26 Jan 2022 08:18:08 +0300 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: refactoring, bump Linux and U-Boot versions Message-ID: <20220126051808.26581-1-kuzminov.sergey81@gmail.com> Changelog: - Refactoring configs/orangepi_zero_defconfig. - Linux: bump to version 5.15.16 (from 5.12.2). - U-Boot: bump to version 2022.01 (from 2021.04). Signed-off-by: Sergey Kuzminov --- ...ux-extras.config => linux-extras.fragment} | 0 configs/orangepi_zero_defconfig | 32 +++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment similarity index 100% rename from board/orangepi/orangepi-zero/linux-extras.config rename to board/orangepi/orangepi-zero/linux-extras.fragment diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1c107b10e6..5aaa1566c5 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,49 +1,61 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y + +# System BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" + +# Required tools to create the SD image BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# Image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" -# wireless driver and firmware +# Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y BR2_PACKAGE_ARMBIAN_FIRMWARE=y BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y -# wireless support +# Wireless support BR2_PACKAGE_IW=y BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WIRELESS_TOOLS_LIB=y @@ -51,5 +63,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -# spi flash support +# Spi flash support BR2_PACKAGE_MTD=y -- 2.34.1 From adeep at lexina.in Wed Jan 26 05:41:26 2022 From: adeep at lexina.in (Vyacheslav) Date: Wed, 26 Jan 2022 08:41:26 +0300 Subject: [Buildroot] [PATCH] package/amlogic-boot-fip: new package In-Reply-To: <20220124214529.56b1bf5d@windsurf> References: <20220118111457.2491318-1-adeep@lexina.in> <20220122143327.7d1a1cf7@windsurf> <27eb54d9-6897-a2df-00c3-fb6dca8aba91@lexina.in> <20220122160914.7e4cc513@windsurf> <1a3ce2b5-4b17-b79f-5dd5-29637575d473@lexina.in> <4a94b253-6fe7-5e79-b1e9-331b0a9051ca@baylibre.com> <20220124214529.56b1bf5d@windsurf> Message-ID: Hi. Thanks all for replies. 24.01.2022 23:45, Thomas Petazzoni wrote: > Hello Neil, > > Thanks for the additional feedback. > > On Mon, 24 Jan 2022 14:41:49 +0100 > Neil Armstrong wrote: > >> The binaries must be split into 2 categories: >> - Pre-built: bl2, bl31, bl21, bl32, fip_create, aml_encrypt_*, ddr*.fw, acs_tool.py >> - Built in the Vendor U-Boot source: acs.bin bl301.bin > > Right. > >> In 2019, Amlogic finally added a LICENSE for the pre-built binaries, before >> nobody knew what was the term of the distribution. >> >> commit 6abaf9a869a6584b3cfca8b96d0946ed49bc9b64 >> Author: Lawrence Mok >> Date: Mon May 6 12:34:56 2019 -0700 >> >> add LICENSE file and text referring to it [1/1] >> >> Change-Id: Id291f42bec3ddb0c2162e6540ce1f35d1cb1d079 >> >> The LICENSE can be found at [1] in Khadas github. > > And this license is the one used at > https://github.com/LibreELEC/amlogic-boot-fip which Vyacheslav wants to > package in Buildroot, and this license is extremely restrictive. > Basically, it says that excepts private use of the content of this > repository, you can't do anything with it. > >> Concerning the acs.bin & bl301.bin, they use the U-Boot build system and >> config header files and all these were also updated with the following SPDX: >> /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > > I don't really see what the license of the U-Boot build system and > config headers has to do with the resulting license of the binaries. > >> commit 94de43d3d940cf75b4a9e4fd2a2715be8eff6138 >> Author: Jiucheng Xu >> Date: Wed Dec 16 10:11:00 2020 +0800 >> >> license: Fix the license of amlogic related codes [1/1] >> >> PD#SWPL-39001 >> >> Problem: >> A customer want to add amlogic driver in uboot to >> their private bootloader. Since the driver codes >> are licensed under GPL-2.0, and customer have >> to open their code, so we need fix the license >> issue. >> >> Solution: >> Fix the license of our related code in uboot by >> adding MIT license >> >> Verify: >> Franklin >> >> Change-Id: I2f3571e8720d1f4db069f882353d6ae050702cba >> Signed-off-by: Jiucheng Xu >> >> Note, none of the vendor who publicly published the Amlogic U-Boot >> source has this change, so we can consider acs.bin & bl301.bin >> generated from GPL-2.0 as the commit explains. > > This is really a stretch. The question is which source files are > compiled into acs.bin and bl301.bin ? If they use parts under the > GPL-2.0, then indeed we can assume the whole is also under GPL-2.0, as > it is the only license under which derivative works can be published. These sources usually published inside Amlogic U-Boot source > > But the repository at https://github.com/LibreELEC/amlogic-boot-fip/ > contains a lot more things than acs.bin and bl301.bin. > >> The pre-built binaries stored on the LibreELEC repository only comes from >> public Vendor sources (Khadas, HardKernel, Libre Computer, FriendlyARM, Radxa) >> and checked against vendor repositories we have access to. >> >> We assume they got permission from Amlogic to publicly redistribute these binaries >> as we (BayLibre) were allowed to redistribute the VDEC firmware in [2] & [3]. > > If that's the case, then why does > https://github.com/LibreELEC/amlogic-boot-fip has this LICENSE file > with scary terms? > > I am really surprised by how unclear the licensing terms are for those > blobs. This should scare pretty much any company from doing products > based on Amlogic SoCs. > > Would it be possible to clarify this with Amlogic, and instead of their > silly terms of "you can't do anything with it", have a license that at > least allows distribution on Amlogic platforms? I will try to contact Amlogic via JetHome, but most likely after the Chinese New Year. > > Again, thanks for your support on this! > > Thomas > From thomas.petazzoni at bootlin.com Wed Jan 26 07:06:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 07:06:27 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-25 Message-ID: <20220126070633.AB83F40629@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-25 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 62 | 7 | 0 | 69 | 2021.11.x | 23 | 6 | 0 | 29 | master | 98 | 40 | 0 | 138 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 7 host-util-linux-2.37.3 | 3 bluez5_utils-5.63 | 2 frr-8.1 | 2 rtorrent-0.9.8 | 2 wavemon-0.9.4 | 2 xvisor-0.3.1 | 2 cryptsetup-2.4.2 | 1 file-5.41 | 1 google-breakpad-7515ab13768... | 1 gst1-plugins-bad-1.18.5 | 1 gstd-0.13.0 | 1 guile-3.0.7 | 1 kvm-unit-tests-kvm-unit-tes... | 1 libiio-0.23 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.4 | 1 mongrel2-1.13.0 | 1 mtd-2.1.3 | 1 oracle-mysql-5.1.73 | 1 pcsc-lite-1.9.5 | 1 piglit-2affee53f3ad7a96f5b3... | 1 pipewire-0.3.43 | 1 qt5webkit-5.212.0-alpha4 | 1 ruby-3.1.0 | 1 tesseract-ocr-5.0.1 | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/54adb8da5e66e02f3943a681e21e8f26020723ea | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/76eae25f0c53205aad295cb79833aa59cb5aade9 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/c723c687d5c26206c98cfa84789e9fdbdbad31b4 | i586 | file-5.41 | NOK | http://autobuild.buildroot.net/results/31246e6d4dd51863c16e17cf5011092f3c4b7bb4 | ORPH nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2756ee8a00d78c2a04762972bcddf3c15564a0c0 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/ed31b5f6ef268009d5f8e76d0c1e18337a9e905a | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/97e3722e8ede7fa2aa0073dab4df654f3df186fb | i686 | gst1-plugins-bad-1.18.5 | NOK | http://autobuild.buildroot.net/results/eaf1890176431000ea8b371956f0d2d7e9907aea | ORPH arm | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/b9db1a63fa3740b7c6e089ddc2e1557ea0ca0f5e | ORPH aarch64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/d6ceddf52d22453fe21665b9b865f2c782382353 | ORPH x86_64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/562757475bbd1d3fdfe2ce3f5237d8d4cf1479ae | ORPH riscv64 | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/271d8a7d670b6a7314b8e2159829a222b54f41cc | ORPH mips64el | host-util-linux-2.37.3 | NOK | http://autobuild.buildroot.net/results/11bc283f48b058738b89204517daac7d720abf03 | ORPH powerpc64le | kvm-unit-tests-kvm-unit-tes... | NOK | http://autobuild.buildroot.net/results/917191d50af8f97b7bda82a669f3185660f64373 | arm | libiio-0.23 | NOK | http://autobuild.buildroot.net/results/e8847eabd5df1d9d31b88d69230145916020585c | x86_64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/f635b4c0032ce5cf8a56f526ba6092c0895e9b11 | x86_64 | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/55c3c66c6c909853d47a470e0bbbab7186c83793 | arm | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/3e931bb6833e58f6ddb56ebbc0c599d71c3a8625 | riscv64 | mtd-2.1.3 | NOK | http://autobuild.buildroot.net/results/f9bcc2f70eba388b28616bbff2d6e3b3e298837b | xtensa | oracle-mysql-5.1.73 | NOK | http://autobuild.buildroot.net/results/9a6e946cca1fe51ad157e6ca12ce5d7f41e8c8dc | ORPH or1k | pcsc-lite-1.9.5 | NOK | http://autobuild.buildroot.net/results/1ec8035c8f01e5488b5ae4e079badfa0c543f958 | ORPH arc | piglit-2affee53f3ad7a96f5b3... | NOK | http://autobuild.buildroot.net/results/889a0aa9d8e78c066b03a491003fa8cd03597309 | sparc | pipewire-0.3.43 | NOK | http://autobuild.buildroot.net/results/192f40a5c6e05fc11507494e19db52a47082fc35 | aarch64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/f9aac4aa3cc590e77a510223624aebdc8547a8ed | or1k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/0aad6294d1f24a9e37e7fa56093aeabdac0f6298 | ORPH xtensa | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/fe114a9af0ac0afc77243fd27035477bfc315e8c | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/7fb735e45754f415a32b348be465849d5f0d999a | sparc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a566e2dcabb20625fa3471b610674ad46117acaf | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d088d25baed4e150850c7dc35e19e04821520c51 | powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/953702716339fa18a1f8ff6f9e7164938a3a32d6 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ef794d13e33665706c559230533f510f9b09f82e | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c076313116d1673de4ea83771c7ec2747ccfa99c | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2c4f10e59fa30b51571fdd49b3a4b073321ee876 | or1k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9cc341458465e085fbcb7f11db3b4fb50dabf748 | arm | tesseract-ocr-5.0.1 | NOK | http://autobuild.buildroot.net/results/7d43c5b119bfdbef58ef0982d2f7a6260e2b7e0c | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/5bd88a00dfb20bfaec848b9364f62bbf4badef47 | i686 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7b8d62b1243136b236f5b44af024d41be5bbcec4 | powerpc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1b8021154751346fb5600b2b141980bdcd7e550d | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 apcupsd-3.14.14 | 1 gensio-2.2.3 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/95417fecaf5976aa788c4c6f5ec58f3d75619c73 | riscv32 | gensio-2.2.3 | NOK | http://autobuild.buildroot.net/results/f165cda8231d63d7b315532a805fca96829b6786 | mipsel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/981cd03f661e96e86e4dbbd7b2fcb66bf7adedb4 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/360860fa5a9764620e9c759bafe925537f5c36c9 | powerpc | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/6ef4b40c949458afafde99746ccdb1cae3427f31 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/52ce384941c2a7b72563d66fc3e5315d0d413729 | m68k | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/cad0d08147f78d82228b2e54648a718fb292fb90 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 3 libdbi-88b8477d57153b9f736d... | 1 libnss-3.73 | 1 log4cxx-0.12.0 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/384a0f8a933ef3f3fd58234667e8aa1ab182ddf1 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/95c73e4235569012043c7c2909b8b65459502052 | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/626168546a3ef19fce9fe59be5ef0531e752548b | m68k | libdbi-88b8477d57153b9f736d... | NOK | http://autobuild.buildroot.net/results/d8b2626828d09351bbd91a7931f5b94e2bf790b9 | mipsel | libnss-3.73 | NOK | http://autobuild.buildroot.net/results/69dc2eb15f7d6c9727b48dfd888f5d611e0ce20d | arm | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/6c917351920678771987a9f06c3bb8c0dd489b17 | -- http://autobuild.buildroot.net From pieter.degendt at gmail.com Wed Jan 26 08:25:05 2022 From: pieter.degendt at gmail.com (Pieter De Gendt) Date: Wed, 26 Jan 2022 09:25:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/boost: enable context/coroutine for arm variants Message-ID: <20220126082505.10253-1-pieter.degendt@gmail.com> Add boost context support for aarch64/aarch64_be and select AAPCS as ABI for all arm variants. Signed-off-by: Pieter De Gendt --- package/boost/Config.in | 1 + package/boost/boost.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 1c405a36c3..cc11b8f53e 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -74,6 +74,7 @@ config BR2_PACKAGE_BOOST_CONTAINER config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS bool default y if ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) + default y if (BR2_aarch64 || BR2_aarch64_be) default y if BR2_i386 default y if BR2_mips default y if BR2_mipsel diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 2d2a8fb311..b6681b0ad3 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -85,7 +85,7 @@ HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ ifeq ($(BR2_MIPS_OABI32),y) BOOST_ABI = o32 -else ifeq ($(BR2_arm),y) +else ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be),y) BOOST_ABI = aapcs else BOOST_ABI = sysv -- 2.34.1 From mf at go-sys.de Wed Jan 26 09:04:57 2022 From: mf at go-sys.de (Michael Fischer) Date: Wed, 26 Jan 2022 10:04:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: add optional nmcli support Message-ID: <20220126090457.32015-1-mf@go-sys.de> When NetworkManager is built without the READLINE package the nmcli was not build. Signed-off-by: Michael Fischer --- package/network-manager/Config.in | 7 ++++++- package/network-manager/network-manager.mk | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..1a123a26e2 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -37,6 +37,12 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI help This option enables terminal based UI +config BR2_PACKAGE_NETWORK_MANAGER_CLI + bool "nmcli support" + select BR2_PACKAGE_READLINE + help + This option enables support for NetworkManager Command Line Interface + config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER @@ -54,7 +60,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS select BR2_PACKAGE_JANSSON help This option enables support for OpenVSwitch - endif comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..1eb9233b44 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -135,7 +135,7 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-polkit endif -ifeq ($(BR2_PACKAGE_READLINE),y) +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y) NETWORK_MANAGER_DEPENDENCIES += readline NETWORK_MANAGER_CONF_OPTS += --with-nmcli else -- 2.20.1 From mf at go-sys.de Wed Jan 26 09:28:10 2022 From: mf at go-sys.de (Michael Fischer) Date: Wed, 26 Jan 2022 10:28:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/busybox: bump version to 1.35.0 Message-ID: <20220126092810.6645-1-mf@go-sys.de> Signed-off-by: Michael Fischer --- package/busybox/busybox.hash | 4 ++-- package/busybox/busybox.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 1f34651d7b..2091cdaf65 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.34.1.tar.bz2.sha256 -sha256 415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549 busybox-1.34.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 +sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60ebc4985f..669366b903 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.34.1 +BUSYBOX_VERSION = 1.35.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 -- 2.20.1 From peter at korsgaard.com Wed Jan 26 12:22:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:22:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5location: Fix build failures without opengl In-Reply-To: <20211229234520.2957740-1-aduskett@gmail.com> (Adam Duskett's message of "Wed, 29 Dec 2021 15:45:20 -0800") References: <20211229234520.2957740-1-aduskett@gmail.com> Message-ID: <87pmoeit3y.fsf@dell.be.48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Backport a patch that fixes several "const marked override but does not > override" compilation errors when openGL is not enabled. > Patch fetched from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353 > Fixes: > http://autobuild.buildroot.net/results/6378e43d50dfad13a45522492f14c9df7acd64e4 > Signed-off-by: Adam Duskett Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 12:24:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:24:28 +0100 Subject: [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor In-Reply-To: <20211230135621.2255847-7-romain.naour@gmail.com> (Romain Naour's message of "Thu, 30 Dec 2021 14:56:21 +0100") References: <20211230135621.2255847-1-romain.naour@gmail.com> <20211230135621.2255847-7-romain.naour@gmail.com> Message-ID: <87lez2it1f.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Fixes: > radeon_present.c: In function ?radeon_present_check_flip?: > radeon_present.c:281:21: error: invalid use of undefined type ?struct radeon_pixmap? > 281 | if (priv && priv->fb_failed) > | ^~ > Signed-off-by: Romain Naour > Cc: Bernd Kuhls Is this only needed for xserver 21.x or does it also need to be backported to 2021.02.x / 2021.11.x? -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 12:26:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:26:08 +0100 Subject: [Buildroot] [PATCH/next v3, 1/1] package/font-awesome: make it compatible with fontconfig In-Reply-To: <20211230152059.465b21a8@windsurf> (Thomas Petazzoni's message of "Thu, 30 Dec 2021 15:20:59 +0100") References: <20200226090939.1810498-1-fontaine.fabrice@gmail.com> <20211230152059.465b21a8@windsurf> Message-ID: <87h79qisyn.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Wed, 26 Feb 2020 10:09:39 +0100 > Fabrice Fontaine wrote: >> This commit installs font-awesome in the standard fonts directory >> making it available systemwide. >> >> Thanks to baruch for his technical critique. >> Signed-off-by: Benjamin Calderon >> Signed-off-by: Fabrice Fontaine >> --- >> Changes v2 -> v3 (after review of Baruch Siach): >> - Create a symlink to avoid duplication > I have applied with a reworked commit log. That being said, I am not > sure it was really the "best" solution. It probably would be nicer to > install the fonts usable by fontconfig directly in /usr/share/fonts/, > keeping the rest in /usr/share/font-awesome/. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 12:36:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:36:34 +0100 Subject: [Buildroot] [PATCH] package/gstreamer1/gst1-plugins-bad: add missing Config.in comment on udev In-Reply-To: <20211229093317.1256594-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni's message of "Wed, 29 Dec 2021 10:33:16 +0100") References: <20211229093317.1256594-1-thomas.petazzoni@bootlin.com> Message-ID: <87czkeish9.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > The BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS option has a > dependency on BR2_PACKAGE_HAS_UDEV, but no Config.in comment was added > about this dependency. This commit addresses that. > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 12:26:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:26:01 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/font-awesome: make it visible by fontconfig Message-ID: <20220126124312.B73068257D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11fbee06c3bfa53f9194b7c115570ed3877e1565 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This commit creates a symlink that ensures fontconfig will find the fonts installed by the font-awesome package. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 0979a9e13c45afa20d60122747409cf82164147c) Signed-off-by: Peter Korsgaard --- package/font-awesome/font-awesome.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/font-awesome/font-awesome.mk b/package/font-awesome/font-awesome.mk index 666346be0e..5211ac22a5 100644 --- a/package/font-awesome/font-awesome.mk +++ b/package/font-awesome/font-awesome.mk @@ -13,6 +13,8 @@ define FONT_AWESOME_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/font-awesome/ $(foreach d,$(FONT_AWESOME_DIRECTORIES_LIST),\ cp -dpfr $(@D)/$(d) $(TARGET_DIR)/usr/share/font-awesome$(sep)) + mkdir -p $(TARGET_DIR)/usr/share/fonts/ + ln -sf ../font-awesome $(TARGET_DIR)/usr/share/fonts/font-awesome endef $(eval $(generic-package)) From peter at korsgaard.com Wed Jan 26 12:22:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:22:03 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/qt5/qt5location: fix build failures without opengl Message-ID: <20220126124312.ADD0F82241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c27663d70b19d07edbe3a64e406e0ca7c8a8a802 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Backport a patch that fixes several "const marked override but does not override" compilation errors when openGL is not enabled. Patch fetched from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353 Fixes: http://autobuild.buildroot.net/results/6378e43d50dfad13a45522492f14c9df7acd64e4 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit cea2b082eb35d9fd466833098463e2adcbb40022) Signed-off-by: Peter Korsgaard --- ...0002-fix-compilation-for-no-opengl-builds.patch | 528 +++++++++++++++++++++ 1 file changed, 528 insertions(+) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch new file mode 100644 index 0000000000..98e65df202 --- /dev/null +++ b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch @@ -0,0 +1,528 @@ +From 4bcacd0dc8f73de7b9e5e5f5fa2129fd88bdff3b Mon Sep 17 00:00:00 2001 +From: Michal Klocek +Date: Mon, 11 Jan 2021 16:02:14 +0100 +Subject: [PATCH] Fix compilation for no opengl builds + +Disables experimental labs qml plugin, which +since a4469cad40 depends heavily on opengl backend. + +Fix warnings with msvc when compiling without experimental +plugin. + +Task-number: QTBUG-91623 +Fixes: QTBUG-88017 +Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8 + +Signed-off-by: Michal Klocek +Signed-off-by: Alex Blasche + +[Retrieved from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353] +Signed-off-by: Adam Duskett +--- + src/location/configure.json | 1 + + .../qdeclarativecirclemapitem.cpp | 20 +++++++++++-- + .../qdeclarativecirclemapitem_p_p.h | 2 ++ + .../qdeclarativepolygonmapitem.cpp | 27 +++++++++++++---- + .../qdeclarativepolygonmapitem_p_p.h | 6 ++++ + .../qdeclarativepolylinemapitem.cpp | 30 +++++++++++++++---- + .../qdeclarativepolylinemapitem_p.h | 2 ++ + .../qdeclarativepolylinemapitem_p_p.h | 5 +++- + .../qdeclarativerectanglemapitem.cpp | 17 +++++++++-- + .../qdeclarativerectanglemapitem_p_p.h | 2 ++ + src/location/location.pro | 9 +++++- + .../itemsoverlay/qgeomapitemsoverlay.cpp | 9 +++++- + 12 files changed, 109 insertions(+), 21 deletions(-) + +diff --git a/src/location/configure.json b/src/location/configure.json +index 62ab029..6d01a9a 100644 +--- a/src/location/configure.json ++++ b/src/location/configure.json +@@ -9,6 +9,7 @@ + "label": "Qt.labs.location experimental QML plugin", + "purpose": "Provides experimental QtLocation QML types", + "section": "Location", ++ "condition": "config.opengl", + "output": [ "privateFeature" ] + }, + "geoservices_osm": { +diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +index 841c29a..955de2c 100644 +--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +@@ -446,6 +446,7 @@ void QDeclarativeCircleMapItem::updatePolish() + */ + void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldCenter, qreal oldRadius, const QGeoCoordinate &newCenter, qreal newRadius) + { ++#if QT_CONFIG(opengl) + if (m_backend != QDeclarativeCircleMapItem::OpenGL) + return; + +@@ -459,6 +460,9 @@ void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldC + QScopedPointer d(static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); + m_d.swap(d); + } ++#else ++ return; ++#endif + } + + /*! +@@ -534,9 +538,17 @@ void QDeclarativeCircleMapItem::setBackend(QDeclarativeCircleMapItem::Backend b) + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativeCircleMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativeCircleMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativeCircleMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -565,7 +577,9 @@ QDeclarativeCircleMapItemPrivate::~QDeclarativeCircleMapItemPrivate() {} + + QDeclarativeCircleMapItemPrivateCPU::~QDeclarativeCircleMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativeCircleMapItemPrivateOpenGL::~QDeclarativeCircleMapItemPrivateOpenGL() {} ++#endif + + bool QDeclarativeCircleMapItemPrivate::preserveCircleGeometry (QList &path, + const QGeoCoordinate ¢er, qreal distance, const QGeoProjectionWebMercator &p) +diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h +index 4cf4217..dbe6c8b 100644 +--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h +@@ -275,6 +275,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateOpenGL: public QDeclarativeCircleMapItemPrivate + { + public: +@@ -443,6 +444,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +index fa6ee17..af4f55e 100644 +--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +@@ -334,6 +334,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map, qreal stroke + this->translate(QPointF(strokeWidth, strokeWidth)); + } + ++#if QT_CONFIG(opengl) + QGeoMapPolygonGeometryOpenGL::QGeoMapPolygonGeometryOpenGL(){ + } + +@@ -344,6 +345,7 @@ void QGeoMapPolygonGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const + geopath.append(QWebMercator::mercatorToCoord(c)); + updateSourcePoints(map, geopath); + } ++#endif + + // wrapPath always preserves the geometry + // This one handles holes +@@ -452,6 +454,7 @@ static void cutPathEars(const QList &wrappedPath, + screenIndices << quint32(i); + } + ++#if QT_CONFIG(opengl) + /*! + \internal + */ +@@ -594,7 +597,7 @@ void QGeoMapPolygonGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebMe + sourceBounds_.setWidth(brect.width()); + sourceBounds_.setHeight(brect.height()); + } +- ++#endif // QT_CONFIG(opengl) + /* + * QDeclarativePolygonMapItem Private Implementations + */ +@@ -603,8 +606,9 @@ QDeclarativePolygonMapItemPrivate::~QDeclarativePolygonMapItemPrivate() {} + + QDeclarativePolygonMapItemPrivateCPU::~QDeclarativePolygonMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativePolygonMapItemPrivateOpenGL::~QDeclarativePolygonMapItemPrivateOpenGL() {} +- ++#endif + /* + * QDeclarativePolygonMapItem Implementation + */ +@@ -689,9 +693,17 @@ void QDeclarativePolygonMapItem::setBackend(QDeclarativePolygonMapItem::Backend + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativePolygonMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativePolygonMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativePolygonMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativePolygonMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -898,6 +910,7 @@ void QDeclarativePolygonMapItem::geometryChanged(const QRectF &newGeometry, cons + + ////////////////////////////////////////////////////////////////////// + ++#if QT_CONFIG(opengl) + QSGMaterialShader *MapPolygonMaterial::createShader() const + { + return new MapPolygonShader(); +@@ -916,6 +929,7 @@ QSGMaterialType *MapPolygonMaterial::type() const + static QSGMaterialType type; + return &type; + } ++#endif + + MapPolygonNode::MapPolygonNode() : + border_(new MapPolylineNode()), +@@ -967,6 +981,7 @@ void MapPolygonNode::update(const QColor &fillColor, const QColor &borderColor, + } + } + ++#if QT_CONFIG(opengl) + MapPolygonNodeGL::MapPolygonNodeGL() : + //fill_material_(this), + fill_material_(), +@@ -1052,5 +1067,5 @@ void MapPolygonShader::updateState(const QSGMaterialShader::RenderState &state, + program()->setUniformValue(m_center_lowpart_id, vecCenter_lowpart); + program()->setUniformValue(m_wrapOffset_id, float(newMaterial->wrapOffset())); + } +- ++#endif // QT_CONFIG(opengl) + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h +index 8d566e6..5e75deb 100644 +--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h +@@ -89,6 +89,7 @@ protected: + bool assumeSimple_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QGeoMapPolygonGeometryOpenGL : public QGeoMapItemGeometry + { + public: +@@ -197,6 +198,7 @@ private: + int m_color_id; + int m_wrapOffset_id; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT MapPolygonMaterial : public QSGFlatColorMaterial + { +@@ -269,6 +271,7 @@ private: + QSGGeometry geometry_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT MapPolygonNodeGL : public MapItemGeometryNode + { + +@@ -284,6 +287,7 @@ public: + MapPolygonMaterial fill_material_; + QSGGeometry geometry_; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivate + { +@@ -479,6 +483,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivateOpenGL: public QDeclarativePolygonMapItemPrivate + { + public: +@@ -662,6 +667,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +index d59704d..83d253f 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +@@ -769,6 +769,7 @@ bool QGeoMapPolylineGeometry::contains(const QPointF &point) const + return false; + } + ++#if QT_CONFIG(opengl) + void QGeoMapPolylineGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const QGeoPolygon &poly) + { + if (!sourceDirty_) +@@ -921,6 +922,7 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM + sourceBounds_.setWidth(brect.width() + strokeWidth); + sourceBounds_.setHeight(brect.height() + strokeWidth); + } ++#endif // QT_CONFIG(opengl) + + /* + * QDeclarativePolygonMapItem Private Implementations +@@ -928,12 +930,13 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM + + QDeclarativePolylineMapItemPrivate::~QDeclarativePolylineMapItemPrivate() {} + +- + QDeclarativePolylineMapItemPrivateCPU::~QDeclarativePolylineMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativePolylineMapItemPrivateOpenGLLineStrip::~QDeclarativePolylineMapItemPrivateOpenGLLineStrip() {} + + QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPrivateOpenGLExtruded() {} ++#endif + + /* + * QDeclarativePolygonMapItem Implementation +@@ -941,10 +944,12 @@ QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPr + + struct PolylineBackendSelector + { ++#if QT_CONFIG(opengl) + PolylineBackendSelector() + { + backend = (qgetenv("QTLOCATION_OPENGL_ITEMS").toInt()) ? QDeclarativePolylineMapItem::OpenGLExtruded : QDeclarativePolylineMapItem::Software; + } ++#endif + QDeclarativePolylineMapItem::Backend backend = QDeclarativePolylineMapItem::Software; + }; + +@@ -1236,11 +1241,22 @@ void QDeclarativePolylineMapItem::setBackend(QDeclarativePolylineMapItem::Backen + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativePolylineMapItemPrivateCPU(*this)) +- : ((m_backend == OpenGLExtruded) +- ? static_cast(new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) +- : static_cast(new QDeclarativePolylineMapItemPrivateOpenGLLineStrip(*this)))); ++ QScopedPointer d( ++ (m_backend == Software) ++ ? static_cast( ++ new QDeclarativePolylineMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : ((m_backend == OpenGLExtruded) ++ ? static_cast( ++ new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) ++ : static_cast( ++ new QDeclarativePolylineMapItemPrivateOpenGLLineStrip( ++ *this)))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -1477,6 +1493,7 @@ void MapPolylineNode::update(const QColor &fillColor, + } + } + ++#if QT_CONFIG(opengl) + MapPolylineNodeOpenGLLineStrip::MapPolylineNodeOpenGLLineStrip() + : geometry_(QSGGeometry::defaultAttributes_Point2D(), 0) + { +@@ -2080,5 +2097,6 @@ unsigned int QGeoMapItemLODGeometry::zoomForLOD(unsigned int zoom) + return res; + return res + 1; // give more resolution when closing in + } ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +index 9cd20ea..d3d0ebd 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +@@ -97,8 +97,10 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativ + public: + enum Backend { + Software = 0, ++#if QT_CONFIG(opengl) + OpenGLLineStrip = 1, + OpenGLExtruded = 2, ++#endif + }; + + explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0); +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +index 2a921e2..e184391 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +@@ -213,6 +213,7 @@ protected: + QSGGeometry geometry_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QGeoMapItemLODGeometry + { + public: +@@ -566,6 +567,7 @@ protected: + MapPolylineMaterialExtruded fill_material_; + QSGGeometry m_geometryTriangulating; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate + { +@@ -720,6 +722,7 @@ public: + MapPolylineNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLLineStrip: public QDeclarativePolylineMapItemPrivate + { + public: +@@ -884,7 +887,7 @@ public: + + MapPolylineNodeOpenGLExtruded *m_nodeTri = nullptr; + }; +- ++#endif // QT_CONFIG(opengl) + QT_END_NAMESPACE + + #endif // QDECLARATIVEPOLYLINEMAPITEM_P_P_H +diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +index 74d2cc1..6192be0 100644 +--- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +@@ -185,9 +185,18 @@ void QDeclarativeRectangleMapItem::setBackend(QDeclarativeRectangleMapItem::Back + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativeRectangleMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativeRectangleMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif ++ + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -397,6 +406,8 @@ QDeclarativeRectangleMapItemPrivate::~QDeclarativeRectangleMapItemPrivate() {} + + QDeclarativeRectangleMapItemPrivateCPU::~QDeclarativeRectangleMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativeRectangleMapItemPrivateOpenGL::~QDeclarativeRectangleMapItemPrivateOpenGL() {} ++#endif + + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h +index 65d2f61..f7ecd2a 100644 +--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h +@@ -244,6 +244,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateOpenGL: public QDeclarativeRectangleMapItemPrivate + { + public: +@@ -410,6 +411,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/location.pro b/src/location/location.pro +index b0e2c3f..ae20271 100644 +--- a/src/location/location.pro ++++ b/src/location/location.pro +@@ -39,7 +39,14 @@ include(maps/maps.pri) + include(places/places.pri) + include(declarativemaps/declarativemaps.pri) + include(declarativeplaces/declarativeplaces.pri) +-qtConfig(location-labs-plugin):include(labs/labs.pri) ++qtConfig(location-labs-plugin) { ++ include(labs/labs.pri) ++} else { ++ # FIXME: this should be moved out of plugin source code, geojson is referenced from other places ++ # within codebase,however compilation of location-labs-plugin is optional ++ PRIVATE_HEADERS += labs/qgeojson_p.h ++ SOURCES += labs/qgeojson.cpp ++} + + HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp +index 1ebad08..a764438 100644 +--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp ++++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp +@@ -103,6 +103,7 @@ QGeoMap::Capabilities QGeoMapItemsOverlay::capabilities() const + bool QGeoMapItemsOverlay::createMapObjectImplementation(QGeoMapObject *obj) + { + #ifndef LOCATIONLABS ++ Q_UNUSED(obj); + return false; + #else + Q_D(QGeoMapItemsOverlay); +@@ -132,7 +133,9 @@ QSGNode *QGeoMapItemsOverlay::updateSceneGraph(QSGNode *node, QQuickWindow *wind + + void QGeoMapItemsOverlay::removeMapObject(QGeoMapObject *obj) + { +-#ifdef LOCATIONLABS ++#ifndef LOCATIONLABS ++ Q_UNUSED(obj); ++#else + Q_D(QGeoMapItemsOverlay); + d->removeMapObject(obj); + #endif +@@ -169,7 +172,11 @@ QRectF QGeoMapItemsOverlayPrivate::visibleArea() const + QGeoMapItemsOverlayPrivate::QGeoMapItemsOverlayPrivate(QGeoMappingManagerEngineItemsOverlay *engine, QGeoMapItemsOverlay *map) + : QGeoMapPrivate(engine, new QGeoProjectionWebMercator) + { ++#ifndef LOCATIONLABS ++ Q_UNUSED(map); ++#else + m_qsgSupport.m_map = map; ++#endif + } + + QGeoMapItemsOverlayPrivate::~QGeoMapItemsOverlayPrivate() +-- +2.33.1 + From peter at korsgaard.com Wed Jan 26 12:34:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:34:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1/gst1-plugins-bad: add missing Config.in comment on udev Message-ID: <20220126124312.C0EF282829@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d9f754a5bf92d008469b0f281bfd9fe139ed218 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS option has a dependency on BR2_PACKAGE_HAS_UDEV, but no Config.in comment was added about this dependency. This commit addresses that. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 029a3c3ed7d84f26e7f2d5726aeb46af797fda5d) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 239a45bb63..f9f9aed486 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -665,6 +665,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS help Video4Linux Stateless CODECs support +comment "v4l2codecs need udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 bool "x265" depends on BR2_INSTALL_LIBSTDCPP From peter at korsgaard.com Wed Jan 26 12:25:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:25:37 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/font-awesome: make it visible by fontconfig Message-ID: <20220126124317.AD8B78257D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0990b46f521a778ea3064b0eef29adde6fe60d4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This commit creates a symlink that ensures fontconfig will find the fonts installed by the font-awesome package. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 0979a9e13c45afa20d60122747409cf82164147c) Signed-off-by: Peter Korsgaard --- package/font-awesome/font-awesome.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/font-awesome/font-awesome.mk b/package/font-awesome/font-awesome.mk index 666346be0e..5211ac22a5 100644 --- a/package/font-awesome/font-awesome.mk +++ b/package/font-awesome/font-awesome.mk @@ -13,6 +13,8 @@ define FONT_AWESOME_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/font-awesome/ $(foreach d,$(FONT_AWESOME_DIRECTORIES_LIST),\ cp -dpfr $(@D)/$(d) $(TARGET_DIR)/usr/share/font-awesome$(sep)) + mkdir -p $(TARGET_DIR)/usr/share/fonts/ + ln -sf ../font-awesome $(TARGET_DIR)/usr/share/fonts/font-awesome endef $(eval $(generic-package)) From peter at korsgaard.com Wed Jan 26 12:34:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:34:48 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1/gst1-plugins-bad: add missing Config.in comment on udev Message-ID: <20220126124317.B746982829@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20ba4f6d31a8406eb307a68d8654534c77d8061d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS option has a dependency on BR2_PACKAGE_HAS_UDEV, but no Config.in comment was added about this dependency. This commit addresses that. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 029a3c3ed7d84f26e7f2d5726aeb46af797fda5d) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 7bbb1aa5dd..a74008bf77 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -658,6 +658,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS help Video4Linux Stateless CODECs support +comment "v4l2codecs need udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 bool "x265" depends on BR2_INSTALL_LIBSTDCPP From peter at korsgaard.com Wed Jan 26 12:22:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 13:22:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/qt5/qt5location: fix build failures without opengl Message-ID: <20220126124317.A42C282241@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6e486cf1e815c50d6cac136296e08bbd0816062 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Backport a patch that fixes several "const marked override but does not override" compilation errors when openGL is not enabled. Patch fetched from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353 Fixes: http://autobuild.buildroot.net/results/6378e43d50dfad13a45522492f14c9df7acd64e4 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit cea2b082eb35d9fd466833098463e2adcbb40022) Signed-off-by: Peter Korsgaard --- ...0002-fix-compilation-for-no-opengl-builds.patch | 528 +++++++++++++++++++++ 1 file changed, 528 insertions(+) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch new file mode 100644 index 0000000000..98e65df202 --- /dev/null +++ b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch @@ -0,0 +1,528 @@ +From 4bcacd0dc8f73de7b9e5e5f5fa2129fd88bdff3b Mon Sep 17 00:00:00 2001 +From: Michal Klocek +Date: Mon, 11 Jan 2021 16:02:14 +0100 +Subject: [PATCH] Fix compilation for no opengl builds + +Disables experimental labs qml plugin, which +since a4469cad40 depends heavily on opengl backend. + +Fix warnings with msvc when compiling without experimental +plugin. + +Task-number: QTBUG-91623 +Fixes: QTBUG-88017 +Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8 + +Signed-off-by: Michal Klocek +Signed-off-by: Alex Blasche + +[Retrieved from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353] +Signed-off-by: Adam Duskett +--- + src/location/configure.json | 1 + + .../qdeclarativecirclemapitem.cpp | 20 +++++++++++-- + .../qdeclarativecirclemapitem_p_p.h | 2 ++ + .../qdeclarativepolygonmapitem.cpp | 27 +++++++++++++---- + .../qdeclarativepolygonmapitem_p_p.h | 6 ++++ + .../qdeclarativepolylinemapitem.cpp | 30 +++++++++++++++---- + .../qdeclarativepolylinemapitem_p.h | 2 ++ + .../qdeclarativepolylinemapitem_p_p.h | 5 +++- + .../qdeclarativerectanglemapitem.cpp | 17 +++++++++-- + .../qdeclarativerectanglemapitem_p_p.h | 2 ++ + src/location/location.pro | 9 +++++- + .../itemsoverlay/qgeomapitemsoverlay.cpp | 9 +++++- + 12 files changed, 109 insertions(+), 21 deletions(-) + +diff --git a/src/location/configure.json b/src/location/configure.json +index 62ab029..6d01a9a 100644 +--- a/src/location/configure.json ++++ b/src/location/configure.json +@@ -9,6 +9,7 @@ + "label": "Qt.labs.location experimental QML plugin", + "purpose": "Provides experimental QtLocation QML types", + "section": "Location", ++ "condition": "config.opengl", + "output": [ "privateFeature" ] + }, + "geoservices_osm": { +diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +index 841c29a..955de2c 100644 +--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +@@ -446,6 +446,7 @@ void QDeclarativeCircleMapItem::updatePolish() + */ + void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldCenter, qreal oldRadius, const QGeoCoordinate &newCenter, qreal newRadius) + { ++#if QT_CONFIG(opengl) + if (m_backend != QDeclarativeCircleMapItem::OpenGL) + return; + +@@ -459,6 +460,9 @@ void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldC + QScopedPointer d(static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); + m_d.swap(d); + } ++#else ++ return; ++#endif + } + + /*! +@@ -534,9 +538,17 @@ void QDeclarativeCircleMapItem::setBackend(QDeclarativeCircleMapItem::Backend b) + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativeCircleMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativeCircleMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativeCircleMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -565,7 +577,9 @@ QDeclarativeCircleMapItemPrivate::~QDeclarativeCircleMapItemPrivate() {} + + QDeclarativeCircleMapItemPrivateCPU::~QDeclarativeCircleMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativeCircleMapItemPrivateOpenGL::~QDeclarativeCircleMapItemPrivateOpenGL() {} ++#endif + + bool QDeclarativeCircleMapItemPrivate::preserveCircleGeometry (QList &path, + const QGeoCoordinate ¢er, qreal distance, const QGeoProjectionWebMercator &p) +diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h +index 4cf4217..dbe6c8b 100644 +--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h +@@ -275,6 +275,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateOpenGL: public QDeclarativeCircleMapItemPrivate + { + public: +@@ -443,6 +444,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +index fa6ee17..af4f55e 100644 +--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +@@ -334,6 +334,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map, qreal stroke + this->translate(QPointF(strokeWidth, strokeWidth)); + } + ++#if QT_CONFIG(opengl) + QGeoMapPolygonGeometryOpenGL::QGeoMapPolygonGeometryOpenGL(){ + } + +@@ -344,6 +345,7 @@ void QGeoMapPolygonGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const + geopath.append(QWebMercator::mercatorToCoord(c)); + updateSourcePoints(map, geopath); + } ++#endif + + // wrapPath always preserves the geometry + // This one handles holes +@@ -452,6 +454,7 @@ static void cutPathEars(const QList &wrappedPath, + screenIndices << quint32(i); + } + ++#if QT_CONFIG(opengl) + /*! + \internal + */ +@@ -594,7 +597,7 @@ void QGeoMapPolygonGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebMe + sourceBounds_.setWidth(brect.width()); + sourceBounds_.setHeight(brect.height()); + } +- ++#endif // QT_CONFIG(opengl) + /* + * QDeclarativePolygonMapItem Private Implementations + */ +@@ -603,8 +606,9 @@ QDeclarativePolygonMapItemPrivate::~QDeclarativePolygonMapItemPrivate() {} + + QDeclarativePolygonMapItemPrivateCPU::~QDeclarativePolygonMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativePolygonMapItemPrivateOpenGL::~QDeclarativePolygonMapItemPrivateOpenGL() {} +- ++#endif + /* + * QDeclarativePolygonMapItem Implementation + */ +@@ -689,9 +693,17 @@ void QDeclarativePolygonMapItem::setBackend(QDeclarativePolygonMapItem::Backend + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativePolygonMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativePolygonMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativePolygonMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativePolygonMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -898,6 +910,7 @@ void QDeclarativePolygonMapItem::geometryChanged(const QRectF &newGeometry, cons + + ////////////////////////////////////////////////////////////////////// + ++#if QT_CONFIG(opengl) + QSGMaterialShader *MapPolygonMaterial::createShader() const + { + return new MapPolygonShader(); +@@ -916,6 +929,7 @@ QSGMaterialType *MapPolygonMaterial::type() const + static QSGMaterialType type; + return &type; + } ++#endif + + MapPolygonNode::MapPolygonNode() : + border_(new MapPolylineNode()), +@@ -967,6 +981,7 @@ void MapPolygonNode::update(const QColor &fillColor, const QColor &borderColor, + } + } + ++#if QT_CONFIG(opengl) + MapPolygonNodeGL::MapPolygonNodeGL() : + //fill_material_(this), + fill_material_(), +@@ -1052,5 +1067,5 @@ void MapPolygonShader::updateState(const QSGMaterialShader::RenderState &state, + program()->setUniformValue(m_center_lowpart_id, vecCenter_lowpart); + program()->setUniformValue(m_wrapOffset_id, float(newMaterial->wrapOffset())); + } +- ++#endif // QT_CONFIG(opengl) + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h +index 8d566e6..5e75deb 100644 +--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h +@@ -89,6 +89,7 @@ protected: + bool assumeSimple_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QGeoMapPolygonGeometryOpenGL : public QGeoMapItemGeometry + { + public: +@@ -197,6 +198,7 @@ private: + int m_color_id; + int m_wrapOffset_id; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT MapPolygonMaterial : public QSGFlatColorMaterial + { +@@ -269,6 +271,7 @@ private: + QSGGeometry geometry_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT MapPolygonNodeGL : public MapItemGeometryNode + { + +@@ -284,6 +287,7 @@ public: + MapPolygonMaterial fill_material_; + QSGGeometry geometry_; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivate + { +@@ -479,6 +483,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivateOpenGL: public QDeclarativePolygonMapItemPrivate + { + public: +@@ -662,6 +667,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +index d59704d..83d253f 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +@@ -769,6 +769,7 @@ bool QGeoMapPolylineGeometry::contains(const QPointF &point) const + return false; + } + ++#if QT_CONFIG(opengl) + void QGeoMapPolylineGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const QGeoPolygon &poly) + { + if (!sourceDirty_) +@@ -921,6 +922,7 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM + sourceBounds_.setWidth(brect.width() + strokeWidth); + sourceBounds_.setHeight(brect.height() + strokeWidth); + } ++#endif // QT_CONFIG(opengl) + + /* + * QDeclarativePolygonMapItem Private Implementations +@@ -928,12 +930,13 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM + + QDeclarativePolylineMapItemPrivate::~QDeclarativePolylineMapItemPrivate() {} + +- + QDeclarativePolylineMapItemPrivateCPU::~QDeclarativePolylineMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativePolylineMapItemPrivateOpenGLLineStrip::~QDeclarativePolylineMapItemPrivateOpenGLLineStrip() {} + + QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPrivateOpenGLExtruded() {} ++#endif + + /* + * QDeclarativePolygonMapItem Implementation +@@ -941,10 +944,12 @@ QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPr + + struct PolylineBackendSelector + { ++#if QT_CONFIG(opengl) + PolylineBackendSelector() + { + backend = (qgetenv("QTLOCATION_OPENGL_ITEMS").toInt()) ? QDeclarativePolylineMapItem::OpenGLExtruded : QDeclarativePolylineMapItem::Software; + } ++#endif + QDeclarativePolylineMapItem::Backend backend = QDeclarativePolylineMapItem::Software; + }; + +@@ -1236,11 +1241,22 @@ void QDeclarativePolylineMapItem::setBackend(QDeclarativePolylineMapItem::Backen + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativePolylineMapItemPrivateCPU(*this)) +- : ((m_backend == OpenGLExtruded) +- ? static_cast(new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) +- : static_cast(new QDeclarativePolylineMapItemPrivateOpenGLLineStrip(*this)))); ++ QScopedPointer d( ++ (m_backend == Software) ++ ? static_cast( ++ new QDeclarativePolylineMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : ((m_backend == OpenGLExtruded) ++ ? static_cast( ++ new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) ++ : static_cast( ++ new QDeclarativePolylineMapItemPrivateOpenGLLineStrip( ++ *this)))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -1477,6 +1493,7 @@ void MapPolylineNode::update(const QColor &fillColor, + } + } + ++#if QT_CONFIG(opengl) + MapPolylineNodeOpenGLLineStrip::MapPolylineNodeOpenGLLineStrip() + : geometry_(QSGGeometry::defaultAttributes_Point2D(), 0) + { +@@ -2080,5 +2097,6 @@ unsigned int QGeoMapItemLODGeometry::zoomForLOD(unsigned int zoom) + return res; + return res + 1; // give more resolution when closing in + } ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +index 9cd20ea..d3d0ebd 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +@@ -97,8 +97,10 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativ + public: + enum Backend { + Software = 0, ++#if QT_CONFIG(opengl) + OpenGLLineStrip = 1, + OpenGLExtruded = 2, ++#endif + }; + + explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0); +diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +index 2a921e2..e184391 100644 +--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +@@ -213,6 +213,7 @@ protected: + QSGGeometry geometry_; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QGeoMapItemLODGeometry + { + public: +@@ -566,6 +567,7 @@ protected: + MapPolylineMaterialExtruded fill_material_; + QSGGeometry m_geometryTriangulating; + }; ++#endif // QT_CONFIG(opengl) + + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate + { +@@ -720,6 +722,7 @@ public: + MapPolylineNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLLineStrip: public QDeclarativePolylineMapItemPrivate + { + public: +@@ -884,7 +887,7 @@ public: + + MapPolylineNodeOpenGLExtruded *m_nodeTri = nullptr; + }; +- ++#endif // QT_CONFIG(opengl) + QT_END_NAMESPACE + + #endif // QDECLARATIVEPOLYLINEMAPITEM_P_P_H +diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +index 74d2cc1..6192be0 100644 +--- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp ++++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +@@ -185,9 +185,18 @@ void QDeclarativeRectangleMapItem::setBackend(QDeclarativeRectangleMapItem::Back + if (b == m_backend) + return; + m_backend = b; +- QScopedPointer d((m_backend == Software) +- ? static_cast(new QDeclarativeRectangleMapItemPrivateCPU(*this)) +- : static_cast(new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); ++ QScopedPointer d( ++ (m_backend == Software) ? static_cast( ++ new QDeclarativeRectangleMapItemPrivateCPU(*this)) ++#if QT_CONFIG(opengl) ++ : static_cast( ++ new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); ++#else ++ : nullptr); ++ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " ++ "support"); ++#endif ++ + m_d.swap(d); + m_d->onGeoGeometryChanged(); + emit backendChanged(); +@@ -397,6 +406,8 @@ QDeclarativeRectangleMapItemPrivate::~QDeclarativeRectangleMapItemPrivate() {} + + QDeclarativeRectangleMapItemPrivateCPU::~QDeclarativeRectangleMapItemPrivateCPU() {} + ++#if QT_CONFIG(opengl) + QDeclarativeRectangleMapItemPrivateOpenGL::~QDeclarativeRectangleMapItemPrivateOpenGL() {} ++#endif + + QT_END_NAMESPACE +diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h +index 65d2f61..f7ecd2a 100644 +--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h ++++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h +@@ -244,6 +244,7 @@ public: + MapPolygonNode *m_node = nullptr; + }; + ++#if QT_CONFIG(opengl) + class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateOpenGL: public QDeclarativeRectangleMapItemPrivate + { + public: +@@ -410,6 +411,7 @@ public: + MapPolygonNodeGL *m_node = nullptr; + MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; + }; ++#endif // QT_CONFIG(opengl) + + QT_END_NAMESPACE + +diff --git a/src/location/location.pro b/src/location/location.pro +index b0e2c3f..ae20271 100644 +--- a/src/location/location.pro ++++ b/src/location/location.pro +@@ -39,7 +39,14 @@ include(maps/maps.pri) + include(places/places.pri) + include(declarativemaps/declarativemaps.pri) + include(declarativeplaces/declarativeplaces.pri) +-qtConfig(location-labs-plugin):include(labs/labs.pri) ++qtConfig(location-labs-plugin) { ++ include(labs/labs.pri) ++} else { ++ # FIXME: this should be moved out of plugin source code, geojson is referenced from other places ++ # within codebase,however compilation of location-labs-plugin is optional ++ PRIVATE_HEADERS += labs/qgeojson_p.h ++ SOURCES += labs/qgeojson.cpp ++} + + HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp +index 1ebad08..a764438 100644 +--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp ++++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp +@@ -103,6 +103,7 @@ QGeoMap::Capabilities QGeoMapItemsOverlay::capabilities() const + bool QGeoMapItemsOverlay::createMapObjectImplementation(QGeoMapObject *obj) + { + #ifndef LOCATIONLABS ++ Q_UNUSED(obj); + return false; + #else + Q_D(QGeoMapItemsOverlay); +@@ -132,7 +133,9 @@ QSGNode *QGeoMapItemsOverlay::updateSceneGraph(QSGNode *node, QQuickWindow *wind + + void QGeoMapItemsOverlay::removeMapObject(QGeoMapObject *obj) + { +-#ifdef LOCATIONLABS ++#ifndef LOCATIONLABS ++ Q_UNUSED(obj); ++#else + Q_D(QGeoMapItemsOverlay); + d->removeMapObject(obj); + #endif +@@ -169,7 +172,11 @@ QRectF QGeoMapItemsOverlayPrivate::visibleArea() const + QGeoMapItemsOverlayPrivate::QGeoMapItemsOverlayPrivate(QGeoMappingManagerEngineItemsOverlay *engine, QGeoMapItemsOverlay *map) + : QGeoMapPrivate(engine, new QGeoProjectionWebMercator) + { ++#ifndef LOCATIONLABS ++ Q_UNUSED(map); ++#else + m_qsgSupport.m_map = map; ++#endif + } + + QGeoMapItemsOverlayPrivate::~QGeoMapItemsOverlayPrivate() +-- +2.33.1 + From peter at korsgaard.com Wed Jan 26 13:01:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:01:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/tcpreplay: security bump to version 4.3.4 In-Reply-To: <20211230223606.3076350-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 30 Dec 2021 23:36:06 +0100") References: <20211230223606.3076350-1-fontaine.fabrice@gmail.com> Message-ID: <878rv2irb7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - heap buffer overflow in tcpreplay fast_edit_packet > - heap buffer overflow in tcpreplay get_next_packet > - CVE-2020-24266 heap buffer overflow in tcpprep get_l2len > - CVE-2020-24265 heap buffer overflow in tcpprep > - Drop patch (already in version) and so autoreconf > - Update hash of license file (http -> https with > https://github.com/appneta/tcpreplay/commit/ad8a18005347b3cef84a9b478d56de96d1ad254f) > https://github.com/appneta/tcpreplay/releases/tag/v4.3.4 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 13:01:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:01:34 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tcpreplay: security bump to version 4.3.4 Message-ID: <20220126125502.D2ADA81439@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06f7e1f240dcad847d28f56ec5180f0987f95ccc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - heap buffer overflow in tcpreplay fast_edit_packet - heap buffer overflow in tcpreplay get_next_packet - CVE-2020-24266 heap buffer overflow in tcpprep get_l2len - CVE-2020-24265 heap buffer overflow in tcpprep - Drop patch (already in version) and so autoreconf - Update hash of license file (http -> https with https://github.com/appneta/tcpreplay/commit/ad8a18005347b3cef84a9b478d56de96d1ad254f) https://github.com/appneta/tcpreplay/releases/tag/v4.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit cd5191efd97e814099d211288a9956e88677ff75) Signed-off-by: Peter Korsgaard --- .../0001-configure-ac-fix-without-libdnet.patch | 76 ---------------------- package/tcpreplay/tcpreplay.hash | 6 +- package/tcpreplay/tcpreplay.mk | 4 +- 3 files changed, 4 insertions(+), 82 deletions(-) diff --git a/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch b/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch deleted file mode 100644 index 75ed4f94de..0000000000 --- a/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch +++ /dev/null @@ -1,76 +0,0 @@ -From acee9c0c46f71f1f4c33c2dadf69d19e24b90f27 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 13 Aug 2019 20:19:23 +0200 -Subject: [PATCH] configure.ac: fix --without-libdnet - -Allow the user to disable libdnet check through --without-libdnet. -This option is useful to cross-compile tcpreplay to avoid build failures -if libdnet is installed on host but not on target, see -https://bugs.buildroot.org/show_bug.cgi?id=12096 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/appneta/tcpreplay/pull/567] ---- - configure.ac | 48 +++++++++++++++++++++++++----------------------- - 1 file changed, 25 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 39ba58b7..5de3dcb5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1464,30 +1464,32 @@ if test $have_cygwin = no ; then - AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]), - [trydnetdir=$withval]) - -- case "$build_os" in -- linux*) -- dnl # Debian/Ubuntu already have a package called libdnet -- dnl # so you the package you want to install libdumbnet-dev -- for testdir in $trydnetdir /usr/local /opt/local /usr ; do -- if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then -- LDNETINC="$($testdir/bin/dumbnet-config --cflags)" -- LDNETLIB="$($testdir/bin/dumbnet-config --libs)" -- libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)" -- founddnet=$testdir -- fi -- done -- ;; -- esac -+ if test $trydnetdir != no; then -+ case "$build_os" in -+ linux*) -+ dnl # Debian/Ubuntu already have a package called libdnet -+ dnl # so you the package you want to install libdumbnet-dev -+ for testdir in $trydnetdir /usr/local /opt/local /usr ; do -+ if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then -+ LDNETINC="$($testdir/bin/dumbnet-config --cflags)" -+ LDNETLIB="$($testdir/bin/dumbnet-config --libs)" -+ libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)" -+ founddnet=$testdir -+ fi -+ done -+ ;; -+ esac - -- if test $founddnet = no ; then -- for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do -- if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then -- LDNETINC="$($testdir/bin/dnet-config --cflags)" -- LDNETLIB="$($testdir/bin/dnet-config --libs)" -- libdnet_version="$($testdir/bin/dnet-config --version)" -- founddnet=$testdir -- fi -- done -+ if test $founddnet = no ; then -+ for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do -+ if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then -+ LDNETINC="$($testdir/bin/dnet-config --cflags)" -+ LDNETLIB="$($testdir/bin/dnet-config --libs)" -+ libdnet_version="$($testdir/bin/dnet-config --version)" -+ founddnet=$testdir -+ fi -+ done -+ fi - fi - - if test $founddnet = no ; then diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index e83efd78b1..8bcdae958c 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://github.com/appneta/tcpreplay/releases/download/v4.3.3/tcpreplay-4.3.3.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.3.4/tcpreplay-4.3.4.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 5e960e2a4432f583adbd11fa0855d17b73d9e0f2d6453b749f27aacaee53bab5 tcpreplay-4.3.3.tar.xz -sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE +sha256 42c055106e55852c29d94bb6e1b9e001a0723349f2985eb893a47d384c85002b tcpreplay-4.3.4.tar.xz +sha256 07cf5e92d475287a7d1663b33097f40cae5adf03ed8920fcd4374e3dfb48c8ad docs/LICENSE diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 9208cb8176..ef65403974 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.3.3 +TCPREPLAY_VERSION = 4.3.4 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 @@ -15,8 +15,6 @@ TCPREPLAY_CONF_ENV = \ TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \ --enable-pcapconfig TCPREPLAY_DEPENDENCIES = libpcap -# We're patching configure.ac -TCPREPLAY_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no From peter at korsgaard.com Wed Jan 26 13:01:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:01:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tcpreplay: security bump to version 4.3.4 Message-ID: <20220126125511.1E5A381439@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0171ea611a308cf227dd2f8f8f79bf1616f34ad7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - heap buffer overflow in tcpreplay fast_edit_packet - heap buffer overflow in tcpreplay get_next_packet - CVE-2020-24266 heap buffer overflow in tcpprep get_l2len - CVE-2020-24265 heap buffer overflow in tcpprep - Drop patch (already in version) and so autoreconf - Update hash of license file (http -> https with https://github.com/appneta/tcpreplay/commit/ad8a18005347b3cef84a9b478d56de96d1ad254f) https://github.com/appneta/tcpreplay/releases/tag/v4.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit cd5191efd97e814099d211288a9956e88677ff75) Signed-off-by: Peter Korsgaard --- .../0001-configure-ac-fix-without-libdnet.patch | 76 ---------------------- package/tcpreplay/tcpreplay.hash | 6 +- package/tcpreplay/tcpreplay.mk | 4 +- 3 files changed, 4 insertions(+), 82 deletions(-) diff --git a/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch b/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch deleted file mode 100644 index 75ed4f94de..0000000000 --- a/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch +++ /dev/null @@ -1,76 +0,0 @@ -From acee9c0c46f71f1f4c33c2dadf69d19e24b90f27 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 13 Aug 2019 20:19:23 +0200 -Subject: [PATCH] configure.ac: fix --without-libdnet - -Allow the user to disable libdnet check through --without-libdnet. -This option is useful to cross-compile tcpreplay to avoid build failures -if libdnet is installed on host but not on target, see -https://bugs.buildroot.org/show_bug.cgi?id=12096 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/appneta/tcpreplay/pull/567] ---- - configure.ac | 48 +++++++++++++++++++++++++----------------------- - 1 file changed, 25 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 39ba58b7..5de3dcb5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1464,30 +1464,32 @@ if test $have_cygwin = no ; then - AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]), - [trydnetdir=$withval]) - -- case "$build_os" in -- linux*) -- dnl # Debian/Ubuntu already have a package called libdnet -- dnl # so you the package you want to install libdumbnet-dev -- for testdir in $trydnetdir /usr/local /opt/local /usr ; do -- if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then -- LDNETINC="$($testdir/bin/dumbnet-config --cflags)" -- LDNETLIB="$($testdir/bin/dumbnet-config --libs)" -- libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)" -- founddnet=$testdir -- fi -- done -- ;; -- esac -+ if test $trydnetdir != no; then -+ case "$build_os" in -+ linux*) -+ dnl # Debian/Ubuntu already have a package called libdnet -+ dnl # so you the package you want to install libdumbnet-dev -+ for testdir in $trydnetdir /usr/local /opt/local /usr ; do -+ if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then -+ LDNETINC="$($testdir/bin/dumbnet-config --cflags)" -+ LDNETLIB="$($testdir/bin/dumbnet-config --libs)" -+ libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)" -+ founddnet=$testdir -+ fi -+ done -+ ;; -+ esac - -- if test $founddnet = no ; then -- for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do -- if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then -- LDNETINC="$($testdir/bin/dnet-config --cflags)" -- LDNETLIB="$($testdir/bin/dnet-config --libs)" -- libdnet_version="$($testdir/bin/dnet-config --version)" -- founddnet=$testdir -- fi -- done -+ if test $founddnet = no ; then -+ for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do -+ if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then -+ LDNETINC="$($testdir/bin/dnet-config --cflags)" -+ LDNETLIB="$($testdir/bin/dnet-config --libs)" -+ libdnet_version="$($testdir/bin/dnet-config --version)" -+ founddnet=$testdir -+ fi -+ done -+ fi - fi - - if test $founddnet = no ; then diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index e83efd78b1..8bcdae958c 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://github.com/appneta/tcpreplay/releases/download/v4.3.3/tcpreplay-4.3.3.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.3.4/tcpreplay-4.3.4.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 5e960e2a4432f583adbd11fa0855d17b73d9e0f2d6453b749f27aacaee53bab5 tcpreplay-4.3.3.tar.xz -sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE +sha256 42c055106e55852c29d94bb6e1b9e001a0723349f2985eb893a47d384c85002b tcpreplay-4.3.4.tar.xz +sha256 07cf5e92d475287a7d1663b33097f40cae5adf03ed8920fcd4374e3dfb48c8ad docs/LICENSE diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 9208cb8176..ef65403974 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.3.3 +TCPREPLAY_VERSION = 4.3.4 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 @@ -15,8 +15,6 @@ TCPREPLAY_CONF_ENV = \ TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \ --enable-pcapconfig TCPREPLAY_DEPENDENCIES = libpcap -# We're patching configure.ac -TCPREPLAY_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no From peter at korsgaard.com Wed Jan 26 13:07:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:07:03 +0100 Subject: [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor In-Reply-To: <20211231124728.1692301-1-romain.naour@gmail.com> (Romain Naour's message of "Fri, 31 Dec 2021 13:47:26 +0100") References: <20211231124728.1692301-1-romain.naour@gmail.com> Message-ID: <874k5qir2g.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Flare games use OGG audio file format througt SDL2-mixer. > Without OGG support, flare-engine trigger a lot of errors in its > log and fail to start the game. > ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format > Signed-off-by: Romain Naour Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 13:07:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:07:09 +0100 Subject: [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file In-Reply-To: <20211231124728.1692301-2-romain.naour@gmail.com> (Romain Naour's message of "Fri, 31 Dec 2021 13:47:27 +0100") References: <20211231124728.1692301-1-romain.naour@gmail.com> <20211231124728.1692301-2-romain.naour@gmail.com> Message-ID: <87zgnihchu.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > The previous version bump [1] added the hash of LICENSE.txt but > forgot to update FLARE_GAME_LICENSE_FILES. > [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c > Signed-off-by: Romain Naour Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 13:06:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:06:30 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Message-ID: <20220126130032.854DF82753@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27b6400b3fe591345080c06029c2af082d7246df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Flare games use OGG audio file format througt SDL2-mixer. Without OGG support, flare-engine trigger a lot of errors in its log and fail to start the game. ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 1f66c3557a391a00a7527e2b2e8fddd83f0ba0aa) Signed-off-by: Peter Korsgaard --- package/flare-engine/Config.in | 1 + package/flare-engine/flare-engine.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index d08b740af3..9c997c2b9a 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FLARE_ENGINE select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER select BR2_PACKAGE_SDL2_TTF + select BR2_PACKAGE_TREMOR # for SDL2_mixer ogg support help Flare (Free Libre Action Roleplaying Engine) is a simple game engine built to handle a very specific kind of game: diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index e2f3eefa28..6ff4ca36b4 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -9,7 +9,7 @@ FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSIO FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING -FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf +FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf tremor # Don't use /usr/games and /usr/share/games FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare From peter at korsgaard.com Wed Jan 26 13:06:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:06:53 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/flare-game: really use LICENSE.txt as license file Message-ID: <20220126130032.91A6182814@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f81703f466d4bc252932a4e1e8454482e70f88a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The previous version bump [1] added the hash of LICENSE.txt but forgot to update FLARE_GAME_LICENSE_FILES. [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 7684604188f829820f96ced628137ff880e302f6) Signed-off-by: Peter Korsgaard --- package/flare-game/flare-game.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index 4bebc79595..e015ef4687 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -8,7 +8,7 @@ FLARE_GAME_VERSION = 1.11 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) -FLARE_GAME_LICENSE_FILES = README +FLARE_GAME_LICENSE_FILES = LICENSE.txt FLARE_GAME_DEPENDENCIES = flare-engine From peter at korsgaard.com Wed Jan 26 13:05:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:05:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Message-ID: <20220126130036.82FCB82753@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a17bb098d474737f74ce23dbbdb78e28c5676719 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Flare games use OGG audio file format througt SDL2-mixer. Without OGG support, flare-engine trigger a lot of errors in its log and fail to start the game. ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 1f66c3557a391a00a7527e2b2e8fddd83f0ba0aa) Signed-off-by: Peter Korsgaard --- package/flare-engine/Config.in | 1 + package/flare-engine/flare-engine.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index d08b740af3..9c997c2b9a 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FLARE_ENGINE select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER select BR2_PACKAGE_SDL2_TTF + select BR2_PACKAGE_TREMOR # for SDL2_mixer ogg support help Flare (Free Libre Action Roleplaying Engine) is a simple game engine built to handle a very specific kind of game: diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index 14d2681fda..d722a42208 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -9,7 +9,7 @@ FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING -FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf +FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf tremor # Don't use /usr/games and /usr/share/games FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare From peter at korsgaard.com Wed Jan 26 13:05:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 14:05:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/flare-game: really use LICENSE.txt as license file Message-ID: <20220126130036.8E3E982814@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98524b449615350a860ccf0b63a106d7742477d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The previous version bump [1] added the hash of LICENSE.txt but forgot to update FLARE_GAME_LICENSE_FILES. [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 7684604188f829820f96ced628137ff880e302f6) Signed-off-by: Peter Korsgaard --- package/flare-game/flare-game.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index d65e3d6c38..2845dc9714 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -8,7 +8,7 @@ FLARE_GAME_VERSION = 1.11 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) -FLARE_GAME_LICENSE_FILES = README +FLARE_GAME_LICENSE_FILES = LICENSE.txt FLARE_GAME_DEPENDENCIES = flare-engine From heiko.thiery at gmail.com Wed Jan 26 13:17:30 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Wed, 26 Jan 2022 14:17:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/netopeer2: disable tests In-Reply-To: <20220125210800.299916-1-fontaine.fabrice@gmail.com> References: <20220125210800.299916-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, Am Di., 25. Jan. 2022 um 22:09 Uhr schrieb Fabrice Fontaine : > > Disable tests which are enabled since bump to version 2.0.35 in commit > 13d4856b916d797c3c771669edd3eb883336766f and > https://github.com/CESNET/netopeer2/commit/466a0b3c268ee319b4f65980404715a2723b4c0a > to avoid the following build failure if cmocka is built before > netopeer2: > > In file included from /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/stdint.h:20, > from /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/lib/gcc/riscv64-buildroot-linux-musl/10.3.0/include/stdint.h:9, > from /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/libyang/libyang.h:18, > from /home/buildroot/autobuild/instance-2/output-1/build/netopeer2-2.0.35/tests/test_sub_ntf.c:27: > /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/bits/alltypes.h:53:24: error: conflicting types for 'uintptr_t' > 53 | typedef unsigned _Addr uintptr_t; > | ^~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/0660a4f767d5cdaf07b28a508101b87f0300850f > > Signed-off-by: Fabrice Fontaine Reviewed-by: Heiko Thiery > --- > package/netopeer2/netopeer2.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk > index c8b6763313..43f22b7e4c 100644 > --- a/package/netopeer2/netopeer2.mk > +++ b/package/netopeer2/netopeer2.mk > @@ -11,7 +11,9 @@ NETOPEER2_LICENSE = BSD-3-Clause > NETOPEER2_LICENSE_FILES = LICENSE > NETOPEER2_DEPENDENCIES = libnetconf2 libyang sysrepo host-sysrepo > > -NETOPEER2_CONF_OPTS = -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) > +NETOPEER2_CONF_OPTS = \ > + -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) \ > + -DENABLE_TESTS=OFF > > # Set a build specific SYSREPO_SHM_PREFIX to ensure we can safely delete the > # files. This also ensures that concurrent parallel builds will not be > -- > 2.34.1 > From peter at korsgaard.com Wed Jan 26 14:36:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:36:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency In-Reply-To: <20220101000408.1538099-1-james.hilliard1@gmail.com> (James Hilliard's message of "Fri, 31 Dec 2021 17:04:08 -0700") References: <20220101000408.1538099-1-james.hilliard1@gmail.com> Message-ID: <87v8y6h8c7.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Fixes: > File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in > File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in > File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in > ModuleNotFoundError: No module named 'aiosignal' > Signed-off-by: James Hilliard When was this introduced? Do we need to backport this to 2021.02.x / 2021.11.x? -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 14:40:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:40:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: bump to version 14.18.2 In-Reply-To: <20211231100725.3662078-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 31 Dec 2021 11:07:25 +0100") References: <20211231100725.3662078-1-fontaine.fabrice@gmail.com> Message-ID: <87r18uh86i.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This bump will fix the following build failure raised since bump of > python3 to version 3.10.1 in commit > 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > Please use python3.9 or python3.8 or python3.7 or python3.6 or python3.5 or python2.7. > /usr/bin/python3.7 ./configure > /usr/bin/python3.5 ./configure > /home/peko/autobuild/instance-1/output-1/host/bin/python2.7 ./configure > Node.js configure: Found Python 3.10.1... > https://github.com/nodejs/node/releases/tag/v14.18.2 > Fixes: > - http://autobuild.buildroot.org/results/9e2ebb9c3681ec0485eaa042fa838c8ee62f649b > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 14:39:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:39:09 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/nodejs: bump to version 14.18.2 Message-ID: <20220126143337.50ED1825F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed95b7bbc2b110e19dd97b6a03613b9a51d37288 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This bump will fix the following build failure raised since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: Please use python3.9 or python3.8 or python3.7 or python3.6 or python3.5 or python2.7. /usr/bin/python3.7 ./configure /usr/bin/python3.5 ./configure /home/peko/autobuild/instance-1/output-1/host/bin/python2.7 ./configure Node.js configure: Found Python 3.10.1... https://github.com/nodejs/node/releases/tag/v14.18.2 Fixes: - http://autobuild.buildroot.org/results/9e2ebb9c3681ec0485eaa042fa838c8ee62f649b Signed-off-by: Fabrice Fontaine Tested-by: James Hilliard Signed-off-by: Yann E. MORIN (cherry picked from commit 06735b085fd595ffc233e48cc5a57f4fa555b02c) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 3a4571e8e5..f330757341 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.17.6/SHASUMS256.txt -sha256 3fa1d71adddfab2f5e3e41874b4eddbdf92b65cade4a43922fb1e437afcf89ed node-v14.18.1.tar.xz +# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt +sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 42ef1baa64..44bf786dfd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.1 +NODEJS_VERSION = 14.18.2 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ From peter at korsgaard.com Wed Jan 26 14:46:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:46:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libnss: fix build failure with make version 4.3 Message-ID: <20220126144049.A33D4825F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5037ecffd5d42771ece111a220e011fec547764 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Make 4.3 is buggy and when parallel building host-libnss/libnss we end up with a failure thrown by make itself. So let's work-around this by don't parallel build the package if Make version is 4.3. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN (cherry picked from commit 540029eb4550760c2190a18ecbf0cb4391bb1dea) Signed-off-by: Peter Korsgaard --- package/libnss/libnss.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 2e26abdfc0..d885da0480 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING LIBNSS_CPE_ID_VENDOR = mozilla LIBNSS_CPE_ID_PRODUCT = nss +# Don't parallel build if make version = 4.3 +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) +LIBNSS_MAKE = $(MAKE1) +else +LIBNSS_MAKE = $(MAKE) +endif + LIBNSS_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) @@ -71,12 +78,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 endif define HOST_LIBNSS_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(HOST_LIBNSS_BUILD_VARS) - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ From peter at korsgaard.com Wed Jan 26 14:47:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:47:41 +0100 Subject: [Buildroot] [PATCH] package/libnss: fix build failure with make version 4.3 In-Reply-To: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Sat, 1 Jan 2022 22:09:52 +0100") References: <20220101210952.2148256-1-giulio.benetti@benettiengineering.com> Message-ID: <87mtjih7ua.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Make 4.3 is buggy and when parallel building host-libnss/libnss we end up > with a failure thrown by make itself. So let's work-around this by don't > parallel build the package if Make version is 4.3. > Signed-off-by: Giulio Benetti Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 14:48:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 15:48:08 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-24 In-Reply-To: <78204a26-75d9-ef6a-bf7f-dee8b47fa508@benettiengineering.com> (Giulio Benetti's message of "Tue, 25 Jan 2022 08:09:07 +0100") References: <20220125070545.09FA6401E1@smtp2.osuosl.org> <78204a26-75d9-ef6a-bf7f-dee8b47fa508@benettiengineering.com> Message-ID: <87a6fih7tj.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Hi Peter, > On 25/01/22 08:05, Thomas Petazzoni wrote: > [SNIP] >> Detail of failures for 2021.11.x >> -------------------------------- >> >> arch | reason | OK? | url | orph? >> -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- >> microblazeel | libnss-3.73 | NOK | >> http://autobuild.buildroot.net/results/e02c7a0e22d8eee226e5c906537f7dfc559e067e >> | > This ^^^ is fixed by: > https://git.buildroot.net/buildroot/commit/?id=540029eb4550760c2190a18ecbf0cb4391bb1dea Thanks for the heads up, applied to 2021.11.x -- Bye, Peter Korsgaard From fperrad at gmail.com Wed Jan 26 14:55:02 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 26 Jan 2022 15:55:02 +0100 Subject: [Buildroot] [PATCH 1/2] package/lua: bump to version 5.4.4 Message-ID: <20220126145503.1032630-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/lua/5.4.3/lua.hash | 6 ------ package/lua/{5.4.3 => 5.4.4}/0001-root-path.patch | 0 package/lua/{5.4.3 => 5.4.4}/0002-shared-libs-for-lua.patch | 0 package/lua/{5.4.3 => 5.4.4}/0011-linenoise.patch | 2 +- package/lua/5.4.4/lua.hash | 6 ++++++ package/lua/lua.mk | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 package/lua/5.4.3/lua.hash rename package/lua/{5.4.3 => 5.4.4}/0001-root-path.patch (100%) rename package/lua/{5.4.3 => 5.4.4}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.4.3 => 5.4.4}/0011-linenoise.patch (97%) create mode 100644 package/lua/5.4.4/lua.hash diff --git a/package/lua/5.4.3/lua.hash b/package/lua/5.4.3/lua.hash deleted file mode 100644 index be3604837..000000000 --- a/package/lua/5.4.3/lua.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -md5 ef63ed2ecfb713646a7fcc583cf5f352 lua-5.4.3.tar.gz -sha1 1dda2ef23a9828492b4595c0197766de6e784bc7 lua-5.4.3.tar.gz - -# Locally computed -sha256 d205bfea131113bcdd64d4ebe4a50ce34063b42bad24b93e44b4b0d853ae4d49 doc/readme.html diff --git a/package/lua/5.4.3/0001-root-path.patch b/package/lua/5.4.4/0001-root-path.patch similarity index 100% rename from package/lua/5.4.3/0001-root-path.patch rename to package/lua/5.4.4/0001-root-path.patch diff --git a/package/lua/5.4.3/0002-shared-libs-for-lua.patch b/package/lua/5.4.4/0002-shared-libs-for-lua.patch similarity index 100% rename from package/lua/5.4.3/0002-shared-libs-for-lua.patch rename to package/lua/5.4.4/0002-shared-libs-for-lua.patch diff --git a/package/lua/5.4.3/0011-linenoise.patch b/package/lua/5.4.4/0011-linenoise.patch similarity index 97% rename from package/lua/5.4.3/0011-linenoise.patch rename to package/lua/5.4.4/0011-linenoise.patch index 7b9d6d76f..68316e108 100644 --- a/package/lua/5.4.3/0011-linenoise.patch +++ b/package/lua/5.4.4/0011-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -421,6 +421,14 @@ +@@ -428,6 +428,14 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) diff --git a/package/lua/5.4.4/lua.hash b/package/lua/5.4.4/lua.hash new file mode 100644 index 000000000..b55b17f25 --- /dev/null +++ b/package/lua/5.4.4/lua.hash @@ -0,0 +1,6 @@ +# Hashes from: https://www.lua.org/ftp/ +md5 bd8ce7069ff99a400efd14cf339a727b lua-5.4.4.tar.gz +sha1 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd lua-5.4.4.tar.gz + +# Locally computed +sha256 2556ac7198243f9f83130b9c81016e1904f7b30351481f1c28e02475dbd237fb doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 844e165df..09e7b34f7 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.3 +LUA_VERSION = 5.4.4 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else -- 2.32.0 From fperrad at gmail.com Wed Jan 26 14:55:03 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 26 Jan 2022 15:55:03 +0100 Subject: [Buildroot] [PATCH 2/2] package/lua: use Lua 5.4 as default In-Reply-To: <20220126145503.1032630-1-francois.perrad@gadz.org> References: <20220126145503.1032630-1-francois.perrad@gadz.org> Message-ID: <20220126145503.1032630-2-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/lua/Config.in | 2 +- support/testing/tests/package/test_lua.py | 4 ++-- support/testing/tests/package/test_lua_sdl2.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/lua/Config.in b/package/lua/Config.in index 5d4cee5d5..309dd6eec 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" - default BR2_PACKAGE_LUA_5_3 + default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. diff --git a/support/testing/tests/package/test_lua.py b/support/testing/tests/package/test_lua.py index 573ae0100..9703dffbd 100644 --- a/support/testing/tests/package/test_lua.py +++ b/support/testing/tests/package/test_lua.py @@ -42,8 +42,8 @@ class TestLua(TestLuaBase): def test_run(self): self.login() - self.version_test('Lua 5.3') - self.g_version_test('Lua 5.3') + self.version_test('Lua 5.4') + self.g_version_test('Lua 5.4') class TestLuajit(TestLuaBase): diff --git a/support/testing/tests/package/test_lua_sdl2.py b/support/testing/tests/package/test_lua_sdl2.py index 22c4087f5..b9aad15f4 100644 --- a/support/testing/tests/package/test_lua_sdl2.py +++ b/support/testing/tests/package/test_lua_sdl2.py @@ -5,6 +5,7 @@ class TestLuaLuaSDL2(TestLuaBase): config = TestLuaBase.config + \ """ BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_5_3=y BR2_PACKAGE_LUA_SDL2=y BR2_PACKAGE_SDL2_IMAGE=y BR2_PACKAGE_SDL2_MIXER=y -- 2.32.0 From jborne at kalray.eu Wed Jan 26 15:30:44 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Wed, 26 Jan 2022 16:30:44 +0100 (CET) Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <20220124225356.03c1c658@windsurf> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> <20220124212149.GJ2502@scaer> <20220124225356.03c1c658@windsurf> Message-ID: <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> Hi again, thank you very much for your answers! ----- On Jan 24, 2022, at 10:53 PM, Thomas Petazzoni thomas.petazzoni at bootlin.com wrote: > On Mon, 24 Jan 2022 22:21:49 +0100 > "Yann E. MORIN" wrote: > >> > # We just want libbfd, libiberty and libopcodes, >> > # not the full-blown binutils in staging >> > define BINUTILS_INSTALL_STAGING_CMDS >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install >> > endef >> > >> > # If we don't want full binutils on target >> > ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) >> > define BINUTILS_INSTALL_TARGET_CMDS >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install >> > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install >> > endef >> > endif >> > >> > This is *extremely* suspicious. Indeed, we get the libraries >> > unconditionally installed in staging, so any other library or program >> > that we build after binutils can potentially link against thosze >> > libraries. >> > >> > But we only install them conditionally in $(TARGET_DIR) if >> > BR2_PACKAGE_BINUTILS_TARGET=y. >> > >> > This seems very bad to me. Both target and staging installations should >> > be done under the same condition. >> >> Not really. You missed the fact that binutils is an autotools package. >> >> As such, when BR2_PACKAGE_BINUTILS_TARGET=n, then the full binutils are >> instaleld in target, so the libs will be installed in target. I think you made a typo here... The full binutils install to target is made when BR2_PACKAGE_BINUTILS_TARGET=y. > > Aah, indeed, the condition is: > > ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > Double negation is a bit confusing indeed, maybe the message could be changed to # If we don't want full binutils on target ifeq ($(BR2_PACKAGE_BINUTILS_TARGET),n) >> So whatever gets in staging is present in target, but target can be a >> superset of what is in staging, so whatever links to a binutils lib from >> staging will find it in target. Agreed! So if I understand correctly, as was suggested by Romain and Thomas, we could indeed get rid of $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install in BINUTILS_INSTALL_TARGET_CMDS. Thanks again Best Regards. Jonathan. From thomas.petazzoni at bootlin.com Wed Jan 26 15:52:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 16:52:49 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> <20220124212149.GJ2502@scaer> <20220124225356.03c1c658@windsurf> <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> Message-ID: <20220126165249.0445bdc9@windsurf> On Wed, 26 Jan 2022 16:30:44 +0100 (CET) Jonathan Borne wrote: > Double negation is a bit confusing indeed, > maybe the message could be changed to > > # If we don't want full binutils on target > ifeq ($(BR2_PACKAGE_BINUTILS_TARGET),n) This is never going to be true, as disabled options have an empty value. To work, it should be: ifeq ($(BR2_PACKAGE_BINUTILS_TARGET),) > Agreed! So if I understand correctly, as was suggested by Romain and Thomas, > we could indeed get rid of > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > in BINUTILS_INSTALL_TARGET_CMDS. Yes! Thanks, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From giulio.benetti at benettiengineering.com Wed Jan 26 16:55:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 26 Jan 2022 17:55:12 +0100 Subject: [Buildroot] [PATCH] configs/orangepi_zero_defconfig: refactoring, bump Linux and U-Boot versions In-Reply-To: <20220126051808.26581-1-kuzminov.sergey81@gmail.com> References: <20220126051808.26581-1-kuzminov.sergey81@gmail.com> Message-ID: <392822cd-0b96-fa58-39bb-9834fb0f6be5@benettiengineering.com> Hi Sergey, All, On 26/01/22 06:18, Sergey Kuzminov wrote: > Changelog: > - Refactoring configs/orangepi_zero_defconfig. > - Linux: bump to version 5.15.16 (from 5.12.2). > - U-Boot: bump to version 2022.01 (from 2021.04). > > Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti [Only built successfully] Best regards -- Giulio Benetti Benetti Engineering sas > --- > ...ux-extras.config => linux-extras.fragment} | 0 > configs/orangepi_zero_defconfig | 32 +++++++++++++------ > 2 files changed, 22 insertions(+), 10 deletions(-) > rename board/orangepi/orangepi-zero/{linux-extras.config => linux-extras.fragment} (100%) > > diff --git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.fragment > similarity index 100% > rename from board/orangepi/orangepi-zero/linux-extras.config > rename to board/orangepi/orangepi-zero/linux-extras.fragment > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 1c107b10e6..5aaa1566c5 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -1,49 +1,61 @@ > +# Architecture > BR2_arm=y > BR2_cortex_a7=y > BR2_ARM_FPU_VFPV4=y > -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y > + > +# System > BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" > BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" > +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_SYSTEM_DHCP="eth0" > + > +# Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.16" > BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config" > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > + > +# Required tools to create the SD image > BR2_PACKAGE_HOST_UBOOT_TOOLS=y > BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > + > +# Image > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > > -# wireless driver and firmware > +# Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > BR2_PACKAGE_ARMBIAN_FIRMWARE=y > BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y > > -# wireless support > +# Wireless support > BR2_PACKAGE_IW=y > BR2_PACKAGE_WIRELESS_TOOLS=y > BR2_PACKAGE_WIRELESS_TOOLS_LIB=y > @@ -51,5 +63,5 @@ BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > > -# spi flash support > +# Spi flash support > BR2_PACKAGE_MTD=y From yann.morin.1998 at free.fr Wed Jan 26 17:14:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 18:14:50 +0100 Subject: [Buildroot] [RFC PATCH 0/1] Fix binutils/libiberty target install directory In-Reply-To: <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> References: <20220124173521.2236-1-jborne@kalray.eu> <87k0ep9gbx.fsf@tarshish> <20220124220238.1fa0568b@windsurf> <20220124212149.GJ2502@scaer> <20220124225356.03c1c658@windsurf> <608336144.1670038.1643211044586.JavaMail.zimbra@kalray.eu> Message-ID: <20220126171450.GI457876@scaer> Jonathan, All, On 2022-01-26 16:30 +0100, Jonathan Borne via buildroot spake thusly: > ----- On Jan 24, 2022, at 10:53 PM, Thomas Petazzoni thomas.petazzoni at bootlin.com wrote: > > On Mon, 24 Jan 2022 22:21:49 +0100 > > "Yann E. MORIN" wrote: > >> As such, when BR2_PACKAGE_BINUTILS_TARGET=n, then the full binutils are > >> instaleld in target, so the libs will be installed in target. > I think you made a typo here... > The full binutils install to target is made when BR2_PACKAGE_BINUTILS_TARGET=y. Hehe... ;-) > >> So whatever gets in staging is present in target, but target can be a > >> superset of what is in staging, so whatever links to a binutils lib from > >> staging will find it in target. > > Agreed! So if I understand correctly, as was suggested by Romain and Thomas, > we could indeed get rid of > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > > in BINUTILS_INSTALL_TARGET_CMDS. Yes, but to avoid any confusion, please also add a comment above the staging installation commands that states that libiberty is static only, as Baruch pointed out earlier. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Jan 26 17:01:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 18:01:08 +0100 Subject: [Buildroot] [git commit] support/testing: add test for python-gnupg Message-ID: <20220126173505.B4714812BF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a79397fc5f6eb82805dbdff173d7f8cbfaea186 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit add a simple test doing symmetric encryption/decryption to check this python interface with the gpg binary is working fine. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ .../testing/tests/package/sample_python_gnupg.py | 24 ++++++++++++++++++++++ support/testing/tests/package/test_python_gnupg.py | 21 +++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dc810b6fe1..1d729e5ce4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,8 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ +F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/test_python_gnupg.py N: Julien Viard de Galbert F: package/dieharder/ diff --git a/support/testing/tests/package/sample_python_gnupg.py b/support/testing/tests/package/sample_python_gnupg.py new file mode 100644 index 0000000000..b5b718a8cb --- /dev/null +++ b/support/testing/tests/package/sample_python_gnupg.py @@ -0,0 +1,24 @@ +import gnupg + +gpg = gnupg.GPG(verbose=True) + +plain_data = "Some plain text data" +good_passphrase = "Good Passphrase" + +# Test Encrypt +result = gpg.encrypt(plain_data, None, passphrase=good_passphrase, symmetric=True) +assert(result.returncode == 0) +enc_data = str(result) +assert(enc_data != plain_data) + +# Test Good Decrypt +result = gpg.decrypt(enc_data, passphrase=good_passphrase) +assert(result.returncode == 0) +dec_data = str(result) +assert(dec_data == plain_data) + +# Test Bad Decrypt +result = gpg.decrypt(enc_data, passphrase='A Wrong Passphrase') +assert(result.returncode != 0) +dec_data = str(result) +assert(dec_data != plain_data) diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py new file mode 100644 index 0000000000..0c71f6b6d0 --- /dev/null +++ b/support/testing/tests/package/test_python_gnupg.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2GnuPG(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_GNUPG=y + """ + sample_scripts = ["tests/package/sample_python_gnupg.py"] + + +class TestPythonPy3GnuPG(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_GNUPG=y + """ + sample_scripts = ["tests/package/sample_python_gnupg.py"] From yann.morin.1998 at free.fr Wed Jan 26 17:42:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 18:42:18 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add test for python-gnupg In-Reply-To: <20220116104114.103601-1-ju.o@free.fr> References: <20220116104114.103601-1-ju.o@free.fr> Message-ID: <20220126174218.GJ457876@scaer> Julien, All, On 2022-01-16 11:41 +0100, Julien Olivain spake thusly: > This commit add a simple test doing symmetric encryption/decryption > to check this python interface with the gpg binary is working fine. > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 2 ++ > .../tests/package/sample_python_gnupg.py | 24 +++++++++++++++++++ > .../tests/package/test_python_gnupg.py | 21 ++++++++++++++++ > 3 files changed, 47 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_gnupg.py > create mode 100644 support/testing/tests/package/test_python_gnupg.py > > diff --git a/DEVELOPERS b/DEVELOPERS > index a91e2dfcde..e038941b3b 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1611,6 +1611,8 @@ F: package/python-distro/ > F: package/python-gnupg/ > F: package/python-pyalsa/ > F: package/riscv-isa-sim/ > +F: support/testing/tests/package/sample_python_gnupg.py > +F: support/testing/tests/package/test_python_gnupg.py > > N: Julien Viard de Galbert > F: package/dieharder/ > diff --git a/support/testing/tests/package/sample_python_gnupg.py b/support/testing/tests/package/sample_python_gnupg.py > new file mode 100644 > index 0000000000..b5b718a8cb > --- /dev/null > +++ b/support/testing/tests/package/sample_python_gnupg.py > @@ -0,0 +1,24 @@ > +import gnupg > + > +gpg = gnupg.GPG(verbose=True) > + > +plain_data = "Some plain text data" > +good_passphrase = "Good Passphrase" > + > +# Test Encrypt > +result = gpg.encrypt(plain_data, None, passphrase=good_passphrase, symmetric=True) > +assert(result.returncode == 0) > +enc_data = str(result) > +assert(enc_data != plain_data) > + > +# Test Good Decrypt > +result = gpg.decrypt(enc_data, passphrase=good_passphrase) > +assert(result.returncode == 0) > +dec_data = str(result) > +assert(dec_data == plain_data) > + > +# Test Bad Decrypt > +result = gpg.decrypt(enc_data, passphrase='A Wrong Passphrase') > +assert(result.returncode != 0) > +dec_data = str(result) > +assert(dec_data != plain_data) > diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py > new file mode 100644 > index 0000000000..0c71f6b6d0 > --- /dev/null > +++ b/support/testing/tests/package/test_python_gnupg.py > @@ -0,0 +1,21 @@ > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy2GnuPG(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON=y > + BR2_PACKAGE_PYTHON_GNUPG=y > + """ > + sample_scripts = ["tests/package/sample_python_gnupg.py"] > + > + > +class TestPythonPy3GnuPG(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_GNUPG=y > + """ > + sample_scripts = ["tests/package/sample_python_gnupg.py"] > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Wed Jan 26 17:44:40 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 26 Jan 2022 10:44:40 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency In-Reply-To: <87v8y6h8c7.fsf@dell.be.48ers.dk> References: <20220101000408.1538099-1-james.hilliard1@gmail.com> <87v8y6h8c7.fsf@dell.be.48ers.dk> Message-ID: On Wed, Jan 26, 2022 at 7:36 AM Peter Korsgaard wrote: > > >>>>> "James" == James Hilliard writes: > > > Fixes: > > File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in > > File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in > > File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in > > ModuleNotFoundError: No module named 'aiosignal' > > > Signed-off-by: James Hilliard > > When was this introduced? Do we need to backport this to 2021.02.x / > 2021.11.x? Looks like it's required for aiohttp v3.8.0 and newer, so we shouldn't need to backport. > > -- > Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 18:36:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 19:36:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: add aiosignal runtime dependency In-Reply-To: (James Hilliard's message of "Wed, 26 Jan 2022 10:44:40 -0700") References: <20220101000408.1538099-1-james.hilliard1@gmail.com> <87v8y6h8c7.fsf@dell.be.48ers.dk> Message-ID: <87sftafiov.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > On Wed, Jan 26, 2022 at 7:36 AM Peter Korsgaard wrote: >> >> >>>>> "James" == James Hilliard writes: >> >> > Fixes: >> > File "/usr/lib/python3.10/site-packages/aiohttp/__init__.py", line 6, in >> > File "/usr/lib/python3.10/site-packages/aiohttp/client.py", line 88, in >> > File "/usr/lib/python3.10/site-packages/aiohttp/tracing.py", line 5, in >> > ModuleNotFoundError: No module named 'aiosignal' >> >> > Signed-off-by: James Hilliard >> >> When was this introduced? Do we need to backport this to 2021.02.x / >> 2021.11.x? > Looks like it's required for aiohttp v3.8.0 and newer, so we shouldn't > need to backport. Ok, great. It is quite helpful to mention such things in the commit messages. -- Bye, Peter Korsgaard From ps.report at gmx.net Wed Jan 26 19:34:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 26 Jan 2022 20:34:31 +0100 Subject: [Buildroot] [PATCH v1] package/binutils: add upstream patch for v2.37 fixing linking of thin archives Message-ID: <20220126193431.17777-1-ps.report@gmx.net> Add upstream patch ([1]) for v2.37 fixing linkig of thin archives (see [2] for details). Fixes: .../host/bin/arm-buildroot-linux-gnueabihf-g++ [...] -o libQt5WebEngineCore.so.5.15.2 [...] .../arm-buildroot-linux-gnueabihf/bin/ld: .../build/qt5webengine-5.15.2/src/core/release/obj/third_party/boringssl/libboringssl.a: error adding symbols: malformed archive collect2: error: ld returned 1 exit status make[5]: *** [Makefile.core_module:90: ../../lib/libQt5WebEngineCore.so.5.15.2] Error 1 make[4]: *** [Makefile:124: sub-core_module-pro-make_first] Error 2 make[3]: *** [Makefile:79: sub-core-make_first] Error 2 make[2]: *** [Makefile:49: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:295: .../build/qt5webengine-5.15.2/.stamp_built] Error 2 make: *** [Makefile:23: _all] Error 2 [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0 [2] https://sourceware.org/bugzilla/show_bug.cgi?id=28138 Signed-off-by: Peter Seiderer --- Notes: - maybe the same failure as http://autobuild.buildroot.net/results/55c3c66c6c909853d47a470e0bbbab7186c83793 .../host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-gnu/11.2.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: src/intel/dev/libintel_dev.a: error adding symbols: malformed archive with BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y --- ...le-descriptor-if-there-is-no-archive.patch | 236 ++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch diff --git a/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch new file mode 100644 index 0000000000..46697cc5c8 --- /dev/null +++ b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch @@ -0,0 +1,236 @@ +From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 26 Jul 2021 05:59:55 -0700 +Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd + +Close the file descriptor if there is no archive plugin file descriptor +to avoid running out of file descriptors on thin archives with many +archive members. + +bfd/ + + PR ld/28138 + * plugin.c (bfd_plugin_close_file_descriptor): Close the file + descriptor there is no archive plugin file descriptor. + +ld/ + + PR ld/28138 + * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for + native build. + + PR ld/28138 + * testsuite/ld-plugin/lto.exp: Run ld/28138 tests. + * testsuite/ld-plugin/pr28138.c: New file. + * testsuite/ld-plugin/pr28138-1.c: Likewise. + * testsuite/ld-plugin/pr28138-2.c: Likewise. + * testsuite/ld-plugin/pr28138-3.c: Likewise. + * testsuite/ld-plugin/pr28138-4.c: Likewise. + * testsuite/ld-plugin/pr28138-5.c: Likewise. + * testsuite/ld-plugin/pr28138-6.c: Likewise. + * testsuite/ld-plugin/pr28138-7.c: Likewise. + +(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742) +(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2) + +[Upstream: + https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0] +Signed-off-by: Peter Seiderer +--- + bfd/plugin.c | 8 +++++++ + ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++ + ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++ + 10 files changed, 104 insertions(+) + create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c + create mode 100644 ld/testsuite/ld-plugin/pr28138.c + +diff --git a/bfd/plugin.c b/bfd/plugin.c +index 6cfa2b66470..3bab8febe88 100644 +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd) + && !bfd_is_thin_archive (abfd->my_archive)) + abfd = abfd->my_archive; + ++ /* Close the file descriptor if there is no archive plugin file ++ descriptor. */ ++ if (abfd->archive_plugin_fd == -1) ++ { ++ close (fd); ++ return; ++ } ++ + abfd->archive_plugin_fd_open_count--; + /* Dup the archive plugin file descriptor for later use, which + will be closed by _bfd_archive_close_and_cleanup. */ +diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp +index def69e43ab3..999d911ce6a 100644 +--- a/ld/testsuite/ld-plugin/lto.exp ++++ b/ld/testsuite/ld-plugin/lto.exp +@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } { + } + } + ++run_cc_link_tests [list \ ++ [list \ ++ "Build pr28138.a" \ ++ "-T" "" \ ++ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \ ++ pr28138-6.c pr28138-7.c} {} "pr28138.a" \ ++ ] \ ++ [list \ ++ "Build pr28138.o" \ ++ "" "" \ ++ {pr28138.c} {} \ ++ ] \ ++] ++ ++set exec_output [run_host_cmd "sh" \ ++ "-c \"ulimit -n 20; \ ++ $CC -Btmpdir/ld -o tmpdir/pr28138 \ ++ tmpdir/pr28138.o tmpdir/pr28138.a\""] ++set exec_output [prune_warnings $exec_output] ++if [string match "" $exec_output] then { ++ if { [isnative] } { ++ set exec_output [run_host_cmd "tmpdir/pr28138" ""] ++ if [string match "PASS" $exec_output] then { ++ pass "PR ld/28138" ++ } else { ++ fail "PR ld/28138" ++ } ++ } else { ++ pass "PR ld/28138" ++ } ++} else { ++ fail "PR ld/28138" ++} ++ + set testname "Build liblto-11.a" + remote_file host delete "tmpdir/liblto-11.a" + set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] +diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c +new file mode 100644 +index 00000000000..51d119e1642 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-1.c +@@ -0,0 +1,6 @@ ++extern int a0(void); ++int ++a1(void) ++{ ++ return 1 + a0(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c +new file mode 100644 +index 00000000000..1120cd797e9 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-2.c +@@ -0,0 +1,6 @@ ++extern int a1(void); ++int ++a2(void) ++{ ++ return 1 + a1(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c +new file mode 100644 +index 00000000000..ec464947ee6 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-3.c +@@ -0,0 +1,6 @@ ++extern int a2(void); ++int ++a3(void) ++{ ++ return 1 + a2(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c +new file mode 100644 +index 00000000000..475701b2c5c +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-4.c +@@ -0,0 +1,6 @@ ++extern int a3(void); ++int ++a4(void) ++{ ++ return 1 + a3(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c +new file mode 100644 +index 00000000000..e24f86c363e +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-5.c +@@ -0,0 +1,6 @@ ++extern int a4(void); ++int ++a5(void) ++{ ++ return 1 + a4(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c +new file mode 100644 +index 00000000000..b5b938bdb21 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-6.c +@@ -0,0 +1,6 @@ ++extern int a5(void); ++int ++a6(void) ++{ ++ return 1 + a5(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c +new file mode 100644 +index 00000000000..4ef75bf0f0c +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-7.c +@@ -0,0 +1,6 @@ ++extern int a6(void); ++int ++a7(void) ++{ ++ return 1 + a6(); ++} +diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c +new file mode 100644 +index 00000000000..68252c9f382 +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138.c +@@ -0,0 +1,20 @@ ++#include ++ ++extern int a7(void); ++ ++int ++a0(void) ++{ ++ return 0; ++} ++ ++int ++main() ++{ ++ if (a7() == 7) ++ { ++ printf ("PASS\n"); ++ return 0; ++ } ++ return 1; ++} +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Wed Jan 26 20:00:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:00:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: fix avahi build In-Reply-To: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 1 Jan 2022 15:26:16 +0100") References: <20220101142616.1176357-1-fontaine.fabrice@gmail.com> Message-ID: <87o83yfesx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since commit > 27908c6eab768d0b9fd3444a929b3f1b1510da71: > ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency > "avahi-client" not found, tried pkgconfig > Fixes: > - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:03:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:03:17 +0100 Subject: [Buildroot] [PATCH 1/3] package/tpm2-tss: remove unused dependency In-Reply-To: <20220101223900.2970405-1-who+buildroot@cnackers.org> (Erik Larsson's message of "Sat, 1 Jan 2022 23:38:58 +0100") References: <20220101223900.2970405-1-who+buildroot@cnackers.org> Message-ID: <87k0emfenu.fsf@dell.be.48ers.dk> >>>>> "Erik" == Erik Larsson writes: > The last reference of uriparser was removed in: > https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e > Signed-off-by: Erik Larsson Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:03:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:03:45 +0100 Subject: [Buildroot] [git commit] paclage/tpm2-tss: do not select liburiparser In-Reply-To: <20220119202333.5A504832B5@busybox.osuosl.org> (Yann E. MORIN's message of "Wed, 19 Jan 2022 21:28:02 +0100") References: <20220119202333.5A504832B5@busybox.osuosl.org> Message-ID: <87fspafen2.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=cbb70493af20445fbd24de4c5a15ba0de7f27c6e > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Commit 593683b45f72 (package/tpm2-tss: remove unused dependency) > removed the build-time dependency (in the .mk), but forgot to > remove it from the Config.in. > Signed-off-by: Tilman Keskin?z > [yann.morin.1998 at free.fr: reword commit log] > Signed-off-by: Yann E. MORIN Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:02:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:02:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tpm2-tss: remove unused dependency Message-ID: <20220126195820.25E928140B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47b28bb6ad65ed97bcdf7c245b06931f51662f71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The last reference of uriparser was removed in: https://github.com/tpm2-software/tpm2-tss/commit/17a670dd4c0e4effc2ac3cdf021c299fa92df70e Signed-off-by: Erik Larsson Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 593683b45f72169dd94ec14fa18720b3cec9dda4) Signed-off-by: Peter Korsgaard --- package/tpm2-tss/tpm2-tss.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 71aa3feb96..060883c377 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -11,7 +11,7 @@ TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES -TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf +TPM2_TSS_DEPENDENCIES = openssl host-pkgconf # 0001-configure-Only-use-CXX-when-fuzzing.patch TPM2_TSS_AUTORECONF = YES From peter at korsgaard.com Wed Jan 26 19:59:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 20:59:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pipewire: fix avahi build Message-ID: <20220126195820.191DD81503@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf791f4051576d7175dd63db5c14320ed5cbca4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure raised since commit 27908c6eab768d0b9fd3444a929b3f1b1510da71: ../output-1/build/pipewire-0.3.40/meson.build:348:0: ERROR: Dependency "avahi-client" not found, tried pkgconfig Fixes: - http://autobuild.buildroot.org/results/d1707ad82159aafbddb69c503109bf2e830f0f29 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f5131f6f28e384eb9dca1b11f571536e38d3ee9d) Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index efda3ad695..7043745cc1 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -82,7 +82,8 @@ else PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# avahi support needs avahi-client, which needs avahi-daemon and dbus +ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) PIPEWIRE_CONF_OPTS += -Davahi=enabled PIPEWIRE_DEPENDENCIES += avahi else From peter at korsgaard.com Wed Jan 26 20:02:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:02:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] paclage/tpm2-tss: do not select liburiparser Message-ID: <20220126195820.2E7C782879@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1256840581a4a8256929b7a30f7ce8931a87693 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 593683b45f72 (package/tpm2-tss: remove unused dependency) removed the build-time dependency (in the .mk), but forgot to remove it from the Config.in. Signed-off-by: Tilman Keskin??z [yann.morin.1998 at free.fr: reword commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit cbb70493af20445fbd24de4c5a15ba0de7f27c6e) Signed-off-by: Peter Korsgaard --- package/tpm2-tss/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2fc56dbd76..857987ae36 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help From peter at korsgaard.com Wed Jan 26 20:07:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:07:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 1 Jan 2022 23:59:06 +0100") References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> Message-ID: <87bkzyfehm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > The LXC 4.0 branch is supported until June 2025. > Only bugfixes and securitiy issues get included into the stable bugfix > releases, so it's always safe and recommended to keep up and run the > latest bugfix release. > https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:06:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:06:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lxc: bump to version 4.0.11 Message-ID: <20220126200013.AD1CB8110A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3650dfb892fd85205dca7c563ab50b355d316d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The LXC 4.0 branch is supported until June 2025. Only bugfixes and securitiy issues get included into the stable bugfix releases, so it's always safe and recommended to keep up and run the latest bugfix release. https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 97a504ed30dbeaca4704cbac8699d98ce7f26102) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index efd7a8e42c..2b58df2f1d 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 93f6d2535f..4d63fc14cb 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.10 +LXC_VERSION = 4.0.11 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From peter at korsgaard.com Wed Jan 26 20:06:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:06:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lxc: bump to version 4.0.11 Message-ID: <20220126200102.1502782153@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23b5ad969c17c2cfe3b3eee5f184e38e351ee392 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The LXC 4.0 branch is supported until June 2025. Only bugfixes and securitiy issues get included into the stable bugfix releases, so it's always safe and recommended to keep up and run the latest bugfix release. https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 97a504ed30dbeaca4704cbac8699d98ce7f26102) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index efd7a8e42c..2b58df2f1d 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz +sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 93f6d2535f..4d63fc14cb 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.10 +LXC_VERSION = 4.0.11 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From james.hilliard1 at gmail.com Wed Jan 26 20:09:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 26 Jan 2022 13:09:24 -0700 Subject: [Buildroot] [PATCH v1] package/binutils: add upstream patch for v2.37 fixing linking of thin archives In-Reply-To: <20220126193431.17777-1-ps.report@gmx.net> References: <20220126193431.17777-1-ps.report@gmx.net> Message-ID: On Wed, Jan 26, 2022 at 12:34 PM Peter Seiderer wrote: > > Add upstream patch ([1]) for v2.37 fixing linkig of thin archives (see [2] for > details). > > Fixes: > > .../host/bin/arm-buildroot-linux-gnueabihf-g++ [...] -o libQt5WebEngineCore.so.5.15.2 [...] > .../arm-buildroot-linux-gnueabihf/bin/ld: .../build/qt5webengine-5.15.2/src/core/release/obj/third_party/boringssl/libboringssl.a: error adding symbols: malformed archive > collect2: error: ld returned 1 exit status > make[5]: *** [Makefile.core_module:90: ../../lib/libQt5WebEngineCore.so.5.15.2] Error 1 > make[4]: *** [Makefile:124: sub-core_module-pro-make_first] Error 2 > make[3]: *** [Makefile:79: sub-core-make_first] Error 2 > make[2]: *** [Makefile:49: sub-src-make_first] Error 2 > make[1]: *** [package/pkg-generic.mk:295: .../build/qt5webengine-5.15.2/.stamp_built] Error 2 > make: *** [Makefile:23: _all] Error 2 > > [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0 > [2] https://sourceware.org/bugzilla/show_bug.cgi?id=28138 > > Signed-off-by: Peter Seiderer Reviewed-by: James Hilliard > --- > Notes: > - maybe the same failure as > > http://autobuild.buildroot.net/results/55c3c66c6c909853d47a470e0bbbab7186c83793 > > .../host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-gnu/11.2.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: src/intel/dev/libintel_dev.a: error adding symbols: malformed archive > > with BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y > --- > ...le-descriptor-if-there-is-no-archive.patch | 236 ++++++++++++++++++ > 1 file changed, 236 insertions(+) > create mode 100644 package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch > > diff --git a/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch > new file mode 100644 > index 0000000000..46697cc5c8 > --- /dev/null > +++ b/package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch > @@ -0,0 +1,236 @@ > +From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001 > +From: "H.J. Lu" > +Date: Mon, 26 Jul 2021 05:59:55 -0700 > +Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd > + > +Close the file descriptor if there is no archive plugin file descriptor > +to avoid running out of file descriptors on thin archives with many > +archive members. > + > +bfd/ > + > + PR ld/28138 > + * plugin.c (bfd_plugin_close_file_descriptor): Close the file > + descriptor there is no archive plugin file descriptor. > + > +ld/ > + > + PR ld/28138 > + * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for > + native build. > + > + PR ld/28138 > + * testsuite/ld-plugin/lto.exp: Run ld/28138 tests. > + * testsuite/ld-plugin/pr28138.c: New file. > + * testsuite/ld-plugin/pr28138-1.c: Likewise. > + * testsuite/ld-plugin/pr28138-2.c: Likewise. > + * testsuite/ld-plugin/pr28138-3.c: Likewise. > + * testsuite/ld-plugin/pr28138-4.c: Likewise. > + * testsuite/ld-plugin/pr28138-5.c: Likewise. > + * testsuite/ld-plugin/pr28138-6.c: Likewise. > + * testsuite/ld-plugin/pr28138-7.c: Likewise. > + > +(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742) > +(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2) > + > +[Upstream: > + https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0] > +Signed-off-by: Peter Seiderer > +--- > + bfd/plugin.c | 8 +++++++ > + ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++ > + ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++ > + ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++ > + 10 files changed, 104 insertions(+) > + create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c > + create mode 100644 ld/testsuite/ld-plugin/pr28138.c > + > +diff --git a/bfd/plugin.c b/bfd/plugin.c > +index 6cfa2b66470..3bab8febe88 100644 > +--- a/bfd/plugin.c > ++++ b/bfd/plugin.c > +@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd) > + && !bfd_is_thin_archive (abfd->my_archive)) > + abfd = abfd->my_archive; > + > ++ /* Close the file descriptor if there is no archive plugin file > ++ descriptor. */ > ++ if (abfd->archive_plugin_fd == -1) > ++ { > ++ close (fd); > ++ return; > ++ } > ++ > + abfd->archive_plugin_fd_open_count--; > + /* Dup the archive plugin file descriptor for later use, which > + will be closed by _bfd_archive_close_and_cleanup. */ > +diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp > +index def69e43ab3..999d911ce6a 100644 > +--- a/ld/testsuite/ld-plugin/lto.exp > ++++ b/ld/testsuite/ld-plugin/lto.exp > +@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } { > + } > + } > + > ++run_cc_link_tests [list \ > ++ [list \ > ++ "Build pr28138.a" \ > ++ "-T" "" \ > ++ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \ > ++ pr28138-6.c pr28138-7.c} {} "pr28138.a" \ > ++ ] \ > ++ [list \ > ++ "Build pr28138.o" \ > ++ "" "" \ > ++ {pr28138.c} {} \ > ++ ] \ > ++] > ++ > ++set exec_output [run_host_cmd "sh" \ > ++ "-c \"ulimit -n 20; \ > ++ $CC -Btmpdir/ld -o tmpdir/pr28138 \ > ++ tmpdir/pr28138.o tmpdir/pr28138.a\""] > ++set exec_output [prune_warnings $exec_output] > ++if [string match "" $exec_output] then { > ++ if { [isnative] } { > ++ set exec_output [run_host_cmd "tmpdir/pr28138" ""] > ++ if [string match "PASS" $exec_output] then { > ++ pass "PR ld/28138" > ++ } else { > ++ fail "PR ld/28138" > ++ } > ++ } else { > ++ pass "PR ld/28138" > ++ } > ++} else { > ++ fail "PR ld/28138" > ++} > ++ > + set testname "Build liblto-11.a" > + remote_file host delete "tmpdir/liblto-11.a" > + set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] > +diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c > +new file mode 100644 > +index 00000000000..51d119e1642 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-1.c > +@@ -0,0 +1,6 @@ > ++extern int a0(void); > ++int > ++a1(void) > ++{ > ++ return 1 + a0(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c > +new file mode 100644 > +index 00000000000..1120cd797e9 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-2.c > +@@ -0,0 +1,6 @@ > ++extern int a1(void); > ++int > ++a2(void) > ++{ > ++ return 1 + a1(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c > +new file mode 100644 > +index 00000000000..ec464947ee6 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-3.c > +@@ -0,0 +1,6 @@ > ++extern int a2(void); > ++int > ++a3(void) > ++{ > ++ return 1 + a2(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c > +new file mode 100644 > +index 00000000000..475701b2c5c > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-4.c > +@@ -0,0 +1,6 @@ > ++extern int a3(void); > ++int > ++a4(void) > ++{ > ++ return 1 + a3(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c > +new file mode 100644 > +index 00000000000..e24f86c363e > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-5.c > +@@ -0,0 +1,6 @@ > ++extern int a4(void); > ++int > ++a5(void) > ++{ > ++ return 1 + a4(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c > +new file mode 100644 > +index 00000000000..b5b938bdb21 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-6.c > +@@ -0,0 +1,6 @@ > ++extern int a5(void); > ++int > ++a6(void) > ++{ > ++ return 1 + a5(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c > +new file mode 100644 > +index 00000000000..4ef75bf0f0c > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138-7.c > +@@ -0,0 +1,6 @@ > ++extern int a6(void); > ++int > ++a7(void) > ++{ > ++ return 1 + a6(); > ++} > +diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c > +new file mode 100644 > +index 00000000000..68252c9f382 > +--- /dev/null > ++++ b/ld/testsuite/ld-plugin/pr28138.c > +@@ -0,0 +1,20 @@ > ++#include > ++ > ++extern int a7(void); > ++ > ++int > ++a0(void) > ++{ > ++ return 0; > ++} > ++ > ++int > ++main() > ++{ > ++ if (a7() == 7) > ++ { > ++ printf ("PASS\n"); > ++ return 0; > ++ } > ++ return 1; > ++} > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Wed Jan 26 20:09:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:09:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiio: set PYTHON_EXECUTABLE In-Reply-To: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 2 Jan 2022 18:43:29 +0100") References: <20220102174329.2823931-1-fontaine.fabrice@gmail.com> Message-ID: <877damfed0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set PYTHON_EXECUTABLE to avoid the following build failure when > BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without > setuptools on host: > -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter > -- new > -- Python_EXECUTABLE /usr/bin/python3.5 > [...] > Traceback (most recent call last): > File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in > from setuptools import setup > ImportError: No module named 'setuptools' > Fixes: > - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:08:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:08:57 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libiio: set PYTHON_EXECUTABLE Message-ID: <20220126200310.3BD4781346@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2686b22bc5254163519974fc85f85f609ac0a363 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Set PYTHON_EXECUTABLE to avoid the following build failure when BR2_PACKAGE_PYTHON is enabled but libiio finds python3 without setuptools on host: -- Found Python: /usr/bin/python3.5 (found version "3.5.3") found components: Interpreter -- new -- Python_EXECUTABLE /usr/bin/python3.5 [...] Traceback (most recent call last): File "/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.23/bindings/python/setup.py", line 15, in from setuptools import setup ImportError: No module named 'setuptools' Fixes: - http://autobuild.buildroot.org/results/d80e56e4ad84c8e7f244cf6d1cb96c116e8eb734 Signed-off-by: Fabrice Fontaine Acked-by: Paul Cercueil Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f384de4f4ec646c28dab6c442dd6bb2f06628725) Signed-off-by: Peter Korsgaard --- package/libiio/libiio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index f706298c22..38b2f83e6e 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -76,8 +76,10 @@ endif ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) ifeq ($(BR2_PACKAGE_PYTHON),y) LIBIIO_DEPENDENCIES += host-python-setuptools python +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python else ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBIIO_DEPENDENCIES += host-python3-setuptools python3 +LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 endif LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON else From peter at korsgaard.com Wed Jan 26 20:13:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:13:36 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-pyqt5: Fix parallel build In-Reply-To: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> (Florent AUMAITRE's message of "Mon, 3 Jan 2022 17:54:51 +0100") References: <20220103165451.2769-1-florent.aumaitre@medianesysteme.com> Message-ID: <8735lafe6n.fsf@dell.be.48ers.dk> >>>>> "Florent" == Florent AUMAITRE writes: > This patch fix build of python-pyqt5 package when parallel build is used > Signed-off-by: Florent AUMAITRE > Changes v1 -> v2: > - Re-use the existing QT5_INSTALL_QT_CONF macro from package/qt5/qt5.mk (suggested by Thomas Petazzoni) > Signed-off-by: Florent AUMAITRE Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:12:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:12:34 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-pyqt5: Fix per-package build Message-ID: <20220126200652.083F58255D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eed125b1ca46965f43ffe699b3c307ab496c0835 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x pyqt5 uses qmake internally, but is python package rather than a qmake package. Therefore, we need to manually apply the same fixup as for qmake packages. Without this, top-level parallel build may fail because dependencies are looked for in the qt5 per-package staging directory instead of the python-pyqt5 one. Signed-off-by: Florent AUMAITRE Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 51c22b4ba905f8e0a0f75189715eab628cefab6c) Signed-off-by: Peter Korsgaard --- package/python-pyqt5/python-pyqt5.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 8f28c90d15..b05043563e 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL ) endef +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP + PYTHON_PYQT5_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ From peter at korsgaard.com Wed Jan 26 20:12:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:12:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-pyqt5: Fix per-package build Message-ID: <20220126200700.06ADD8255D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19fdc1367a16931e69fe9e3b07f37119eeae1589 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x pyqt5 uses qmake internally, but is python package rather than a qmake package. Therefore, we need to manually apply the same fixup as for qmake packages. Without this, top-level parallel build may fail because dependencies are looked for in the qt5 per-package staging directory instead of the python-pyqt5 one. Signed-off-by: Florent AUMAITRE Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 51c22b4ba905f8e0a0f75189715eab628cefab6c) Signed-off-by: Peter Korsgaard --- package/python-pyqt5/python-pyqt5.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 8f28c90d15..b05043563e 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -152,6 +152,11 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL ) endef +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP + PYTHON_PYQT5_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ From peter at korsgaard.com Wed Jan 26 20:20:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:20:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mutt: bump to version 2.1.5 Message-ID: <20220126201335.91706817EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=896791904c14ada0b0960dc899f9491b6b045bc1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, fixing two SMTP authentication issues, a crash bug on NetBSD, and a couple other issues. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit db156d693a54fadb43f6b487902ae6795477921f) Signed-off-by: Peter Korsgaard --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index dceae57b65..d439b23aa3 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3361b682ea23df88961fa9835196698aefd2ebf0aba494599b29d1c4b1b4db79 mutt-2.1.4.tar.gz +sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 44d7864eb6..7e9046fe8a 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.4 +MUTT_VERSION = 2.1.5 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From peter at korsgaard.com Wed Jan 26 20:20:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:20:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/mutt: bump to version 2.1.5 In-Reply-To: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 4 Jan 2022 19:25:08 +0100") References: <20220104182508.3375382-1-fontaine.fabrice@gmail.com> Message-ID: <87y232dzaa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Mutt 2.1.5 was released on December 30, 2021. This is a bug-fix release, > fixing two SMTP authentication issues, a crash bug on NetBSD, and a > couple other issues. > https://gitlab.com/muttmua/mutt/-/blob/mutt-2-1-5-rel/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Wed Jan 26 20:22:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 21:22:36 +0100 Subject: [Buildroot] [PATCH] package/polkit: bump to fix CVE-2021-4034 Message-ID: <20220126202236.1399934-1-yann.morin.1998@free.fr> We are currently using the fork by Adam, with support for duktape as a JS engine. But upstream has finally merged that just a day ago. Woohoo! Between the fork we were using and upstream, there are very little changes, mostly centered around: - translations - buildsystem - duktape - CVE-2021-4034 So, we just switch to using the HEAD of the repo: it has not much more than the two important changes: duktape and the CVE fix. Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine --- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index f108ac19ec..1fedb5a707 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz +sha256 243fa69d1e480510c504723487716cda7d6fb588360c7c8f7ec6ba4a3f6ae60e polkit-a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index a7ab725c81..61666594a2 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,13 +4,16 @@ # ################################################################################ -POLKIT_VERSION = 0.120 -POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) +POLKIT_VERSION = a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_INSTALL_STAGING = YES +# Fix was comitted in a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) -- 2.25.1 From fontaine.fabrice at gmail.com Wed Jan 26 20:29:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 21:29:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: link examples with -latomic Message-ID: <20220126202942.1495636-1-fontaine.fabrice@gmail.com> Link examples with -latomic to avoid the following build failure raised since commit 3edc1cc44c7bd2deed31d28fa9534e67f32334e8: FAILED: spa/examples/adapter-control /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 Signed-off-by: Fabrice Fontaine --- ...eson.build-add-atomic_dep-dependency.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch diff --git a/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch b/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch new file mode 100644 index 0000000000..b91adbe7e4 --- /dev/null +++ b/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch @@ -0,0 +1,40 @@ +From 8d9dc023ac12cf305c28786891d5b15e13f29a3d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 25 Jan 2022 17:22:02 +0100 +Subject: [PATCH] spa/meson.build: add atomic_dep dependency + +Commit fa64d93e64592d5edd8767f722cf4ea093641052 moved the atomic_dep +from pipewire-jack to pipewire_dep however atomic_dep should also be +added to spa_dev to avoid the following build failure when building +examples (which don't depend on pipewire_dep): + +FAILED: spa/examples/adapter-control +/home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': +adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 + +[Retrieved from: +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8d9dc023ac12cf305c28786891d5b15e13f29a3d] +Signed-off-by: Fabrice Fontaine +--- + spa/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/spa/meson.build b/spa/meson.build +index 4ad37cdb4..2404748df 100644 +--- a/spa/meson.build ++++ b/spa/meson.build +@@ -9,6 +9,7 @@ spa_dep = declare_dependency( + include_directories : [ + include_directories('include'), + ], ++ dependencies : [atomic_dep], + version : spaversion, + variables : { + 'plugindir' : meson.current_build_dir() / 'plugins', +-- +GitLab + -- 2.34.1 From peter at korsgaard.com Wed Jan 26 20:32:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:32:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburiparser: security bump to version 0.9.6 In-Reply-To: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 6 Jan 2022 23:39:05 +0100") References: <20220106223905.1069334-1-fontaine.fabrice@gmail.com> Message-ID: <87tudqdyqq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fixed: [CVE-2021-46141] > Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* > functions where the text range in .hostText would not be duped using > malloc but remain unchanged (and hence "not owned") for URIs with > an IPv4 or IPv6 address hostname; depending on how an application > uses uriparser, this could lead the application into a use-after-free > situation. > As the second half, fix uriFreeUriMembers* functions that would not > free .hostText memory for URIs with an IPv4 or IPv6 address host; > also, calling uriFreeUriMembers* multiple times on a URI of this > very nature would result in trying to free pointers to stack > (rather than heap) memory. > - Fixed: [CVE-2021-46142] > Fix functions uriNormalizeSyntax* for out-of-memory situations > (i.e. malloc returning NULL) for URIs containing empty segments > (any of user info, host text, query, or fragment) where previously > pointers to stack (rather than heap) memory were freed. > https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:32:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:32:10 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/liburiparser: security bump to version 0.9.6 Message-ID: <20220126202615.25CFF825DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b40f28f808123748c87da7af323c26aa5dd9eee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fixed: [CVE-2021-46141] Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* functions where the text range in .hostText would not be duped using malloc but remain unchanged (and hence "not owned") for URIs with an IPv4 or IPv6 address hostname; depending on how an application uses uriparser, this could lead the application into a use-after-free situation. As the second half, fix uriFreeUriMembers* functions that would not free .hostText memory for URIs with an IPv4 or IPv6 address host; also, calling uriFreeUriMembers* multiple times on a URI of this very nature would result in trying to free pointers to stack (rather than heap) memory. - Fixed: [CVE-2021-46142] Fix functions uriNormalizeSyntax* for out-of-memory situations (i.e. malloc returning NULL) for URIs containing empty segments (any of user info, host text, query, or fragment) where previously pointers to stack (rather than heap) memory were freed. https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e00379361e16f24a348c12bb26eab4dc0af94e84) Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 60acca2215..8b40807541 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c7bc604ece..c9903bd74f 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.5 -LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Jan 26 20:32:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:32:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/liburiparser: bump to version 0.9.5 Message-ID: <20220126202615.1D631822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=942ed061d76a192bcd403cb1782964a89d74ae45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://github.com/uriparser/uriparser/blob/uriparser-0.9.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index feb5945849..60acca2215 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b7cdabe5611408fc2c3a10f8beecb881a0c7e93ff669c578cd9e3e6d64b8f87b uriparser-0.9.4.tar.bz2 +sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index 4ba1e051e3..c7bc604ece 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.4 +LIBURIPARSER_VERSION = 0.9.5 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause From peter at korsgaard.com Wed Jan 26 20:31:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:31:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/liburiparser: security bump to version 0.9.6 Message-ID: <20220126202624.BA892822E9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6a838d6ac61e18c97445c75d3df0196ead4e73d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Fixed: [CVE-2021-46141] Fix a bug affecting both uriNormalizeSyntax* and uriMakeOwner* functions where the text range in .hostText would not be duped using malloc but remain unchanged (and hence "not owned") for URIs with an IPv4 or IPv6 address hostname; depending on how an application uses uriparser, this could lead the application into a use-after-free situation. As the second half, fix uriFreeUriMembers* functions that would not free .hostText memory for URIs with an IPv4 or IPv6 address host; also, calling uriFreeUriMembers* multiple times on a URI of this very nature would result in trying to free pointers to stack (rather than heap) memory. - Fixed: [CVE-2021-46142] Fix functions uriNormalizeSyntax* for out-of-memory situations (i.e. malloc returning NULL) for URIs containing empty segments (any of user info, host text, query, or fragment) where previously pointers to stack (rather than heap) memory were freed. https://github.com/uriparser/uriparser/blob/uriparser-0.9.6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e00379361e16f24a348c12bb26eab4dc0af94e84) Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 60acca2215..8b40807541 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c uriparser-0.9.5.tar.bz2 +sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c7bc604ece..c9903bd74f 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.5 -LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Wed Jan 26 20:32:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:32:11 +0100 Subject: [Buildroot] [git commit] package/iozone: bump to version 3_493 Message-ID: <20220126203111.1E4FE817D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9558f3d66561ef6cc24f79c1b60e2879ab144f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Gilles Talis Signed-off-by: Thomas Petazzoni --- package/iozone/iozone.hash | 2 +- package/iozone/iozone.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 1255392e38..9ecf1d1af8 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 93c9142d61e6a71ea43b0a266bad7f49f07ce5f5d31b36f8edf4dd386795c483 iozone3_492.tgz +sha256 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 iozone3_493.tgz diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 2282a44eb8..2df4a2aa84 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,7 +4,7 @@ # ################################################################################ -IOZONE_VERSION = 3.492 +IOZONE_VERSION = 3.493 IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) From thomas.petazzoni at bootlin.com Wed Jan 26 20:38:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:38:17 +0100 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3_493 In-Reply-To: <20220115211449.393250-1-gilles.talis@gmail.com> References: <20220115211449.393250-1-gilles.talis@gmail.com> Message-ID: <20220126213817.0da7b271@windsurf> On Sat, 15 Jan 2022 22:14:49 +0100 Gilles Talis wrote: > Signed-off-by: Gilles Talis > --- > package/iozone/iozone.hash | 2 +- > package/iozone/iozone.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Wed Jan 26 20:38:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:38:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: bump version to 1.17.6 In-Reply-To: <878rvrmo2g.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Fri, 07 Jan 2022 18:51:35 +0100") References: <20220106213014.433782-1-christian@paral.in> <878rvrmo2g.fsf@dell.be.48ers.dk> Message-ID: <87pmoedygx.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Christian" == Christian Stewart writes: >> View the release notes for more information: >> https://go.dev/doc/devel/release.html#go1.17.minor >> Signed-off-by: Christian Stewart > Committed, thanks. Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:37:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:37:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/go: bump version to 1.17.6 Message-ID: <20220126203138.CE79F82582@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=288007dc4a3c95a705c811d6c6cbb64a623ae733 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x View the release notes for more information: https://go.dev/doc/devel/release.html#go1.17.minor Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 7af6659cb2cbd54b2ca6bad2d91291815e83fbc2) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 39f8226aae..9111c8c9aa 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 3defb9a09bed042403195e872dcbc8c6fae1485963332279668ec52e80a95a2d go1.17.5.src.tar.gz +sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 0d9ceab2bb..062bec378c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.5 +GO_VERSION = 1.17.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From fontaine.fabrice at gmail.com Wed Jan 26 20:37:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 21:37:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4224 Message-ID: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository vim/vim prior to 8.2.4120 Signed-off-by: Fabrice Fontaine --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fff5072063..49056b31cd 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 408b33a409..74ab1ec584 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4092 +VIM_VERSION = 8.2.4224 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src -- 2.34.1 From peter at korsgaard.com Wed Jan 26 20:42:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:42:34 +0100 Subject: [Buildroot] [PATCHv3 1/2] package/mender: remove single hyphen command In-Reply-To: <20220106153542.1668688-1-romain.naour@smile.fr> (Romain Naour's message of "Thu, 6 Jan 2022 16:35:41 +0100") References: <20220106153542.1668688-1-romain.naour@smile.fr> Message-ID: <87lez2dy9x.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Single hyphen commands has been removed since Mender 3.0.0 [1] > [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 > Signed-off-by: Romain Naour > Cc: Adam Duskett Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:47:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:47:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: fix comment In-Reply-To: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 7 Jan 2022 21:53:14 +0100") References: <20220107205314.1470071-1-fontaine.fabrice@gmail.com> Message-ID: <87h79qdy2b.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that > BR2_USE_WCHAR is due to flac dependency but flac is optional so remove > this comment and add boost instead > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:46:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:46:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mpd: fix comment Message-ID: <20220126204254.4ECE68282D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae3a6754176de54a4c068e8dcbf3b97d22e10c23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that BR2_USE_WCHAR is due to flac dependency but flac is optional so remove this comment and add boost instead Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 20584d1ef270d5c1851c1cd537833ec5882edcba) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index eb05f25a0b..0d58bd6756 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,7 +1,7 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac + depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC From peter at korsgaard.com Wed Jan 26 20:41:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:41:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mender: remove single hyphen command Message-ID: <20220126204254.462A281D78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7263cf4946682c4674dd63881fd166f81e3f0921 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Single hyphen commands has been removed since Mender 3.0.0 [1] [1] https://github.com/mendersoftware/mender/commit/fd838ec1b08f3d429b1d81607e9c35a87a104ee6 Signed-off-by: Romain Naour Cc: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 97daba5781bf58a6476c76a2910254bd9cbd329e) Signed-off-by: Peter Korsgaard --- package/mender/S42mender | 2 +- package/mender/mender-client.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mender/S42mender b/package/mender/S42mender index 108fecfea9..dc60f94f8b 100644 --- a/package/mender/S42mender +++ b/package/mender/S42mender @@ -25,7 +25,7 @@ start() { umask 077 start-stop-daemon -S -q -b -m -p /var/run/mender.pid \ - --exec /usr/bin/mender -- -daemon + --exec /usr/bin/mender -- daemon [ $? = 0 ] && echo "OK" || echo "FAIL" } stop() { diff --git a/package/mender/mender-client.service b/package/mender/mender-client.service index 2a5f476ee5..5539a56fd6 100644 --- a/package/mender/mender-client.service +++ b/package/mender/mender-client.service @@ -17,7 +17,7 @@ if [ -L /var/lib/mender \ mkdir -p "$(readlink /var/lib/mender)"; \ fi; \ fi' -ExecStart=/usr/bin/mender -daemon +ExecStart=/usr/bin/mender daemon Restart=on-abort [Install] From fontaine.fabrice at gmail.com Wed Jan 26 20:52:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 21:52:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyopenssl: bump to version 21.0.0 Message-ID: <20220126205225.1533816-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/pyca/pyopenssl/blob/21.0.0/CHANGELOG.rst Signed-off-by: Fabrice Fontaine --- package/python-pyopenssl/python-pyopenssl.hash | 8 ++++---- package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index b457aeacdd..5a3bc5dde9 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 d9804fedbd1eb0c7d9243397b1fbf972 pyOpenSSL-19.1.0.tar.gz -sha256 9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507 pyOpenSSL-19.1.0.tar.gz -# Locally computed sha256 -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +md5 2ec707d15b4e92f5ca5e46e5aab2f4ca pyOpenSSL-21.0.0.tar.gz +sha256 5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3 pyOpenSSL-21.0.0.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index a7ea7edfde..2ba8c2e73d 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 19.1.0 +PYTHON_PYOPENSSL_VERSION = 21.0.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/0d/1d/6cc4bd4e79f78be6640fab268555a11af48474fac9df187c3361a1d1d2f0 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/54/9a/2a43c5dbf4507f86f7c43cba4195d5e25a81c988fd7b0ea779dfc9c6973f PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 26 20:57:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:57:30 +0100 Subject: [Buildroot] [PATCH v2] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220115202617.370414-1-gilles.talis@gmail.com> References: <20220115202617.370414-1-gilles.talis@gmail.com> Message-ID: <20220126215730.30425623@windsurf> Hello Gilles, On Sat, 15 Jan 2022 21:26:17 +0100 Gilles Talis wrote: > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV4=y > +BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y Thanks for this v2. Unfortunately, there is one thing I did not notice when reviewing v1: you should use fixed versions of the Linux kernel, U-Boot and TF-A. Here your defconfig uses whatever is the latest, which is not the policy we have chosen for our defconfigs. Could you fix that up by using fixed versions? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 20:58:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:58:09 +0100 Subject: [Buildroot] [git commit] Config.in.legacy: fix typo Message-ID: <20220126205120.6FCAF82386@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ed2b74717a4557c4ffd822326530b73b7506524 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix typo added by commit 7527324132878f98999539bdd97bd3518747f585: brcmfmac-sdio-firmware-rpi by brcmfmac_sdio-firmware-rpi Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c11cb846fb..62717463df 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -154,7 +154,7 @@ config BR2_PACKAGE_RPI_BT_FIRMWARE select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT help Package rpi-bt-firmware was moved as option to - package brcmfmac-sdio-firmware-rpi. + package brcmfmac_sdio-firmware-rpi. config BR2_PACKAGE_RPI_WIFI_FIRMWARE bool "rpi-wifi-firmware package was renamed" @@ -164,7 +164,7 @@ config BR2_PACKAGE_RPI_WIFI_FIRMWARE select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI help Package rpi-wifi-firmware was moved as option to - package brcmfmac-sdio-firmware-rpi. + package brcmfmac_sdio-firmware-rpi. config BR2_PACKAGE_HOST_GDB_PYTHON bool "GDB Python2 support removed" From thomas.petazzoni at bootlin.com Wed Jan 26 20:58:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:58:24 +0100 Subject: [Buildroot] [PATCH 1/1] Config.in.legacy: fix typo In-Reply-To: <20220122214318.136871-1-fontaine.fabrice@gmail.com> References: <20220122214318.136871-1-fontaine.fabrice@gmail.com> Message-ID: <20220126215824.38e88c72@windsurf> On Sat, 22 Jan 2022 22:43:18 +0100 Fabrice Fontaine wrote: > Fix typo added by commit 7527324132878f98999539bdd97bd3518747f585: > brcmfmac-sdio-firmware-rpi by brcmfmac_sdio-firmware-rpi > > Signed-off-by: Fabrice Fontaine > --- > Config.in.legacy | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 26 21:02:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 22:02:26 +0100 Subject: [Buildroot] [PATCH 2021.02.x] package/polkit: backport upstream patch to fix CVE-2021-4034 Message-ID: <20220126210226.1689899-1-yann.morin.1998@free.fr> Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine --- ...l-privilege-escalation-CVE-2021-4034.patch | 79 +++++++++++++++++++ package/polkit/polkit.mk | 3 + 2 files changed, 82 insertions(+) create mode 100644 package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch diff --git a/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch new file mode 100644 index 0000000000..8c01eed775 --- /dev/null +++ b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch @@ -0,0 +1,79 @@ +From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001 +From: Jan Rybar +Date: Tue, 25 Jan 2022 17:21:46 +0000 +Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034) + +--- + src/programs/pkcheck.c | 5 +++++ + src/programs/pkexec.c | 23 ++++++++++++++++++++--- + 2 files changed, 25 insertions(+), 3 deletions(-) + +diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c +index f1bb4e1..768525c 100644 +--- a/src/programs/pkcheck.c ++++ b/src/programs/pkcheck.c +@@ -363,6 +363,11 @@ main (int argc, char *argv[]) + local_agent_handle = NULL; + ret = 126; + ++ if (argc < 1) ++ { ++ exit(126); ++ } ++ + /* Disable remote file access from GIO. */ + setenv ("GIO_USE_VFS", "local", 1); + +diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c +index 7698c5c..84e5ef6 100644 +--- a/src/programs/pkexec.c ++++ b/src/programs/pkexec.c +@@ -488,6 +488,15 @@ main (int argc, char *argv[]) + pid_t pid_of_caller; + gpointer local_agent_handle; + ++ ++ /* ++ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out. ++ */ ++ if (argc<1) ++ { ++ exit(127); ++ } ++ + ret = 127; + authority = NULL; + subject = NULL; +@@ -614,10 +623,10 @@ main (int argc, char *argv[]) + + path = g_strdup (pwstruct.pw_shell); + if (!path) +- { ++ { + g_printerr ("No shell configured or error retrieving pw_shell\n"); + goto out; +- } ++ } + /* If you change this, be sure to change the if (!command_line) + case below too */ + command_line = g_strdup (path); +@@ -636,7 +645,15 @@ main (int argc, char *argv[]) + goto out; + } + g_free (path); +- argv[n] = path = s; ++ path = s; ++ ++ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated. ++ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination ++ */ ++ if (argv[n] != NULL) ++ { ++ argv[n] = path; ++ } + } + if (access (path, F_OK) != 0) + { +-- +2.25.1 + diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index e00b634b7f..3fd041a813 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -12,6 +12,9 @@ POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES +# 0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ libglib2 host-intltool expat spidermonkey $(TARGET_NLS_DEPENDENCIES) -- 2.25.1 From fontaine.fabrice at gmail.com Wed Jan 26 21:00:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 22:00:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/umtprd: bump to version 1.6.2 Message-ID: <20220126210039.1535791-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/viveris/uMTP-Responder/blob/umtprd-1.6.2/Release-notes.txt Signed-off-by: Fabrice Fontaine --- package/umtprd/umtprd.hash | 4 ++-- package/umtprd/umtprd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/umtprd/umtprd.hash b/package/umtprd/umtprd.hash index 170837d84b..7cd75619ab 100644 --- a/package/umtprd/umtprd.hash +++ b/package/umtprd/umtprd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cce45c7d3df0022fc013c79de21b1f11b1027d090aeb628669f08b0c20d2afdd umtprd-1.3.10.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE +sha256 1de40511c1dd4618719cff2058dfe68a595f1b9284c80afa89d6d1a1c80aec29 umtprd-1.6.2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk index f1a4e66cff..c5e0ee512e 100644 --- a/package/umtprd/umtprd.mk +++ b/package/umtprd/umtprd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UMTPRD_VERSION = 1.3.10 +UMTPRD_VERSION = 1.6.2 UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive UMTPRD_LICENSE = GPL-3.0+ UMTPRD_LICENSE_FILES = LICENSE -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 26 21:04:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:04:19 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add ldap support Message-ID: <20220126205732.9DB7E82883@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd35a0578eeadaedf9b634086c9c979193aaa21f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 595c50c978..f46e1a9a66 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,16 @@ config BR2_PACKAGE_LIGHTTPD_KRB5 help Enable Kerberos5 support for lighttpd mod_auth. +config BR2_PACKAGE_LIGHTTPD_LDAP + bool "ldap support" + depends on BR2_USE_WCHAR # openldap + select BR2_PACKAGE_OPENLDAP + help + Enable LDAP support for lighttpd mod_auth mod_vhostdb_ldap. + +comment "ldap support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index a25bb0bfcb..f8ed7c6f7c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \ @@ -54,6 +53,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_krb5=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) +LIGHTTPD_DEPENDENCIES += openldap +LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +else +LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true From thomas.petazzoni at bootlin.com Wed Jan 26 20:58:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:58:48 +0100 Subject: [Buildroot] [git commit] package/lighttpd: reorder alphabetically options Message-ID: <20220126205732.7118C82386@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2b90b94894366fa81eac0767a0f4ad42289cd6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 99a09e9766..59c1e0b2a6 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,18 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BZIP2 + bool "bzip2 support" + select BR2_PACKAGE_BZIP2 + help + Enable bzip2 support for lighttpd mod_deflate. + +config BR2_PACKAGE_LIGHTTPD_LUA + bool "lua support" + depends on BR2_PACKAGE_LUA + help + Enable Lua support. Needed to support mod_magnet + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL @@ -34,18 +46,6 @@ config BR2_PACKAGE_LIGHTTPD_PAM help Enable PAM authentication support for lighttpd. -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_deflate. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_deflate. - config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" select BR2_PACKAGE_PCRE2 @@ -59,10 +59,10 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA +config BR2_PACKAGE_LIGHTTPD_ZLIB + bool "zlib support" + select BR2_PACKAGE_ZLIB help - Enable Lua support. Needed to support mod_magnet + Enable zlib support for lighttpd mod_deflate. endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 2a05071209..bdbf75191c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -37,6 +37,20 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) +LIGHTTPD_DEPENDENCIES += bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +else +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) +LIGHTTPD_DEPENDENCIES += lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true +else +LIGHTTPD_CONF_OPTS += -Dwith_lua=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true @@ -51,20 +65,6 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true -else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false -endif - ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_DEPENDENCIES += pcre2 LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true @@ -85,11 +85,11 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += -Dwith_lua=true +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) +LIGHTTPD_DEPENDENCIES += zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += -Dwith_lua=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif define LIGHTTPD_INSTALL_CONFIG From thomas.petazzoni at bootlin.com Wed Jan 26 20:58:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 21:58:56 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add zstd support Message-ID: <20220126205732.796177FB5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17ed9108a65ba78b108cb4d4b936cf0940948faf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 59c1e0b2a6..05a7c84961 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -65,4 +65,10 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB help Enable zlib support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_ZSTD + bool "zstd support" + select BR2_PACKAGE_ZSTD + help + Enable zstd support for lighttpd mod_deflate. + endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index bdbf75191c..4f05db4e29 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -32,7 +32,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ -Dwith_xxhash=true \ - -Dwith_zstd=false \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd @@ -92,6 +91,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) +LIGHTTPD_DEPENDENCIES += zstd +LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +else +LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +endif + define LIGHTTPD_INSTALL_CONFIG $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www From thomas.petazzoni at bootlin.com Wed Jan 26 21:04:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:04:07 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add krb5 support Message-ID: <20220126205732.954317FB5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef9a628c595695b875f7ca018e7e4a27564a1317 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 9a262dbe93..595c50c978 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -33,6 +33,12 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 help Enable bzip2 support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_KRB5 + bool "krb5 support" + select BR2_PACKAGE_LIBKRB5 + help + Enable Kerberos5 support for lighttpd mod_auth. + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index b2e06c77a1..a25bb0bfcb 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_krb5=false \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ @@ -48,6 +47,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) +LIGHTTPD_DEPENDENCIES += libkrb5 +LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +else +LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true From thomas.petazzoni at bootlin.com Wed Jan 26 21:03:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:03:37 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add maxminddb support Message-ID: <20220126205732.8C0E282386@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c97efff6aa1acdf78acdc6d3783a37d7cdabc260 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index f3e252d850..9a262dbe93 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -39,6 +39,12 @@ config BR2_PACKAGE_LIGHTTPD_LUA help Enable Lua support. Needed to support mod_magnet +config BR2_PACKAGE_LIGHTTPD_MAXMINDDB + bool "maxminddb support" + select BR2_PACKAGE_LIBMAXMINDDB + help + Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 22db1a7348..b2e06c77a1 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -20,7 +20,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ - -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ -Dwith_mysql=false \ -Dwith_nettle=false \ @@ -56,6 +55,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_lua=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) +LIGHTTPD_DEPENDENCIES += libmaxminddb +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +else +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true From thomas.petazzoni at bootlin.com Wed Jan 26 21:03:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:03:28 +0100 Subject: [Buildroot] [git commit] package/lighttpd: add brotli support Message-ID: <20220126205732.827B182883@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e6ea33ded6354b6f6e6122b124707db89a2ef2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...002-build-meson-fix-typo-in-variable-name.patch | 25 ++++++++++++++++++++++ package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 ++++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch new file mode 100644 index 0000000000..d338979d46 --- /dev/null +++ b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch @@ -0,0 +1,25 @@ +From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Thu, 20 Jan 2022 07:04:51 -0500 +Subject: [PATCH] [build] meson: fix typo in variable name + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] +Signed-off-by: Fabrice Fontaine +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 4ee163468..b35c1037f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -266,7 +266,7 @@ endif + libbrotli = [] + if get_option('with_brotli') + libbrotli = [ compiler.find_library('brotlienc') ] +- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include ') ++ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include ') + conf_data.set('HAVE_BROTLI_ENCODE_H', true) + conf_data.set('HAVE_BROTLI', true) + else diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 05a7c84961..f3e252d850 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,12 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BROTLI + bool "brotli support" + select BR2_PACKAGE_BROTLI + help + Enable brotli support for lighttpd mod_deflate. + config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 4f05db4e29..22db1a7348 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -13,7 +13,6 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ @@ -36,6 +35,13 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) +LIGHTTPD_DEPENDENCIES += brotli +LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +else +LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 LIGHTTPD_CONF_OPTS += -Dwith_bzip=true From thomas.petazzoni at bootlin.com Wed Jan 26 21:04:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:04:57 +0100 Subject: [Buildroot] [PATCH v2, 1/6] package/lighttpd: reorder alphabetically options In-Reply-To: <20220123095957.492671-1-fontaine.fabrice@gmail.com> References: <20220123095957.492671-1-fontaine.fabrice@gmail.com> Message-ID: <20220126220457.2cd3d919@windsurf> On Sun, 23 Jan 2022 10:59:52 +0100 Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine > --- > package/lighttpd/Config.in | 32 ++++++++++++++++---------------- > package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ > 2 files changed, 34 insertions(+), 34 deletions(-) Series applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:05:18 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:05:18 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name Message-ID: <20220126205832.7AB4181906@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07a0d71657323d137bfb33e29311bff29ac58539 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf index 5109625160..157c6a715e 100644 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ b/board/orangepi/orangepi-rk3399/extlinux.conf @@ -1,4 +1,4 @@ -label RK3399_ROCKPRO64 linux +label RK3399_ORANGEPI linux kernel /Image devicetree /rk3399-orangepi.dtb append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait From thomas.petazzoni at bootlin.com Wed Jan 26 21:05:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:05:29 +0100 Subject: [Buildroot] [PATCH] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name In-Reply-To: <20220123103922.1928118-1-giulio.benetti@benettiengineering.com> References: <20220123103922.1928118-1-giulio.benetti@benettiengineering.com> Message-ID: <20220126220529.246fa6d3@windsurf> On Sun, 23 Jan 2022 11:39:22 +0100 Giulio Benetti wrote: > RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal > with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. > > Signed-off-by: Giulio Benetti > --- > board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:06:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:06:04 +0100 Subject: [Buildroot] [git commit] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR Message-ID: <20220126205914.E00C581906@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c99d84fb9694000a91fa04abc820f3e63a14e7e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpjsip/libpjsip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 0a93780e93..b05cc31a83 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,7 +12,7 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_VENDOR = teluu LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) From thomas.petazzoni at bootlin.com Wed Jan 26 21:06:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:06:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR In-Reply-To: <20220123134751.703269-1-fontaine.fabrice@gmail.com> References: <20220123134751.703269-1-fontaine.fabrice@gmail.com> Message-ID: <20220126220610.7d44f5cc@windsurf> On Sun, 23 Jan 2022 14:47:50 +0100 Fabrice Fontaine wrote: > pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: > > > > > > Signed-off-by: Fabrice Fontaine > --- > package/libpjsip/libpjsip.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Wed Jan 26 21:12:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 22:12:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/bullet: bump to version 3.21 Message-ID: <20220126211220.1550407-1-fontaine.fabrice@gmail.com> - Drop patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...HACD-inc-vhacdMutex.h-fix-musl-build.patch | 42 ------------------- package/bullet/bullet.hash | 4 +- package/bullet/bullet.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch diff --git a/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch b/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch deleted file mode 100644 index d01bb97d99..0000000000 --- a/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dd37b97e79aea231ae026ac93c6ca4c7a2667582 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 7 Aug 2021 17:11:24 +0200 -Subject: [PATCH] Extras/VHACD/inc/vhacdMutex.h: fix musl build - -Fix the following build failure on musl (which does not provide -PTHREAD_MUTEX_RECURSIVE_NP): - -In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289, - from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19, - from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18, - from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28: -/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()': -/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h:97:54: error: 'PTHREAD_MUTEX_RECURSIVE_NP' was not declared in this scope; did you mean 'PTHREAD_MUTEX_RECURSIVE'? - 97 | VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/bulletphysics/bullet3/pull/3930] ---- - Extras/VHACD/inc/vhacdMutex.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Extras/VHACD/inc/vhacdMutex.h b/Extras/VHACD/inc/vhacdMutex.h -index 4d1ad2a7d..78c111383 100644 ---- a/Extras/VHACD/inc/vhacdMutex.h -+++ b/Extras/VHACD/inc/vhacdMutex.h -@@ -69,7 +69,7 @@ - #include - #endif - --#if defined(__APPLE__) -+#if defined(__APPLE__) || !defined(__GLIBC__) - #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE - #endif - --- -2.30.2 - diff --git a/package/bullet/bullet.hash b/package/bullet/bullet.hash index 813e8299e1..5c70c683b0 100644 --- a/package/bullet/bullet.hash +++ b/package/bullet/bullet.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f2feef9322329c0571d9066fede2db0ede92b19f7f7fdf54def3b4651f02af03 bullet-3.09.tar.gz -sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt +sha256 49d1ee47aa8cbb0bc6bb459f0a4cfb9579b40e28f5c7d9a36c313e3031fb3965 bullet-3.21.tar.gz +sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt diff --git a/package/bullet/bullet.mk b/package/bullet/bullet.mk index cc72be7c60..9afd922ec9 100644 --- a/package/bullet/bullet.mk +++ b/package/bullet/bullet.mk @@ -4,7 +4,7 @@ # ################################################################################ -BULLET_VERSION = 3.09 +BULLET_VERSION = 3.21 BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION)) BULLET_INSTALL_STAGING = YES BULLET_LICENSE = Zlib -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 26 21:17:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:17:17 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: new package Message-ID: <20220126211029.693108197C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=18a863063735e2c658fa6947a4e540e9dda6c431 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ZynAddSubFX is a fully featured open source software synthesizer capable of making a countless number of instruments, from some common heard from expensive hardware to interesting sounds that you'll boost to an amazing universe of sounds. https://zynaddsubfx.sourceforge.io/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/zynaddsubfx/Config.in | 31 +++++++++++++++++++++++++++++++ package/zynaddsubfx/zynaddsubfx.hash | 3 +++ package/zynaddsubfx/zynaddsubfx.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 63 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1d729e5ce4..fe8de1916e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,7 @@ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ +F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/test_python_gnupg.py diff --git a/package/Config.in b/package/Config.in index 85188ff873..e4ca195beb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -62,6 +62,7 @@ menu "Audio and video applications" source "package/wavpack/Config.in" source "package/yavta/Config.in" source "package/ympd/Config.in" + source "package/zynaddsubfx/Config.in" endmenu menu "Compressors and decompressors" diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in new file mode 100644 index 0000000000..837a469e7c --- /dev/null +++ b/package/zynaddsubfx/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_ZYNADDSUBFX + bool "zynaddsubfx" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_SINGLE + select BR2_PACKAGE_LIBLO + select BR2_PACKAGE_MXML + select BR2_PACKAGE_ZLIB + help + ZynAddSubFX is a fully featured open source software + synthesizer capable of making a countless number of + instruments, from some common heard from expensive hardware + to interesting sounds that you'll boost to an amazing + universe of sounds. + + Note: this Buildroot package does not include the graphical + user interface. It is meant to be executed as a headless + daemon to be controlled with MIDI events or network OSC + (Open Sound Control) events. OSC events can be generated + from an external system with the ZynAddSubFX external GUI + program zynaddsubfx-ext-gui. + + https://zynaddsubfx.sourceforge.io/ + +comment "zynaddsubfx needs a toolchain w/ C++11 and threads" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/zynaddsubfx/zynaddsubfx.hash b/package/zynaddsubfx/zynaddsubfx.hash new file mode 100644 index 0000000000..2465d0b864 --- /dev/null +++ b/package/zynaddsubfx/zynaddsubfx.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cbd160778f6cf147f9b0487719edc5197a1404f46d7c7bfd89e153f0d8ce71ae zynaddsubfx-3.0.6.tar.bz2 +sha256 c9bf7643726da4f149e9669cf6f00257e4b3a173e4ab307461b8bd42717dd9a4 COPYING diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk new file mode 100644 index 0000000000..158b5b4ede --- /dev/null +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# zynaddsubfx +# +################################################################################ + +ZYNADDSUBFX_VERSION = 3.0.6 +ZYNADDSUBFX_SOURCE = zynaddsubfx-$(ZYNADDSUBFX_VERSION).tar.bz2 +ZYNADDSUBFX_SITE = http://downloads.sourceforge.net/zynaddsubfx +ZYNADDSUBFX_LICENSE = GPL-2.0+ +ZYNADDSUBFX_LICENSE_FILES = COPYING + +# There is no package in buildroot using LV2 plugins: disabling +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ZYNADDSUBFX_DEPENDENCIES = \ + alsa-lib \ + fftw-single \ + liblo \ + mxml \ + zlib + +$(eval $(cmake-package)) From thomas.petazzoni at bootlin.com Wed Jan 26 21:18:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:18:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/zynaddsubfx: new package In-Reply-To: <20220123134803.2269814-1-ju.o@free.fr> References: <20220123134803.2269814-1-ju.o@free.fr> Message-ID: <20220126221824.2f484564@windsurf> On Sun, 23 Jan 2022 14:48:03 +0100 Julien Olivain wrote: > +ZYNADDSUBFX_LICENSE = GPLv2+ We use GPL-2.0+ and not GPLv2+. With this very minor nit, patch applied to master. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Jan 26 21:17:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 22:17:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: add pgsql support Message-ID: <20220126211749.1550932-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index eb8ab480a0..57bb756603 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -86,6 +86,16 @@ config BR2_PACKAGE_LIGHTTPD_PCRE help Enable PCRE support. Needed to support mod_rewrite +config BR2_PACKAGE_LIGHTTPD_PGSQL + bool "pgsql support" + depends on BR2_USE_MMU # postgresql + select BR2_PACKAGE_POSTGRESQL + help + Enable postgres support for lighttpd mod_vhostdb_pgsql. + +comment "pgsql support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_WEBDAV bool "webdav support" select BR2_PACKAGE_LIBXML2 diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 90b4ba0a72..595c59cb37 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -22,7 +22,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_nettle=false \ -Dwith_nss=false \ -Dwith_pcre=false \ - -Dwith_pgsql=false \ -Dwith_sasl=false \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ @@ -101,6 +100,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) +LIGHTTPD_DEPENDENCIES += postgresql +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +else +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Jan 26 21:18:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:18:31 +0100 Subject: [Buildroot] [git commit] package/gvfs: fix build with meson >= 0.61 Message-ID: <20220126211403.49F3B82815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=334a69f12ebc8fd23818f33d4dfb17f8864d95e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of meson to version 0.61.0 in commit a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f: ../output-1/build/gvfs-1.48.1/daemon/meson.build:368:7: ERROR: Function does not take positional arguments. Fixes: - http://autobuild.buildroot.org/results/6231649fac82a70b215186c3396b879a28a96f60 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...Remove-incorrect-i18n.merge_file-argument.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch new file mode 100644 index 0000000000..a85a1a374e --- /dev/null +++ b/package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch @@ -0,0 +1,33 @@ +From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 + +[Retrieved (and backported) from: +https://gitlab.gnome.org/GNOME/gvfs/-/commit/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0] +Signed-off-by: Fabrice Fontaine +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index 5f9559aa..e20ada29 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -360,7 +360,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab + From thomas.petazzoni at bootlin.com Wed Jan 26 21:20:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:20:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gvfs: fix build with meson >= 0.61 In-Reply-To: <20220123212607.781422-1-fontaine.fabrice@gmail.com> References: <20220123212607.781422-1-fontaine.fabrice@gmail.com> Message-ID: <20220126222059.3d1e848a@windsurf> On Sun, 23 Jan 2022 22:26:07 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump of meson to version > 0.61.0 in commit a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f: > > ../output-1/build/gvfs-1.48.1/daemon/meson.build:368:7: ERROR: Function does not take positional arguments. > > Fixes: > - http://autobuild.buildroot.org/results/6231649fac82a70b215186c3396b879a28a96f60 > > Signed-off-by: Fabrice Fontaine > --- > ...e-incorrect-i18n.merge_file-argument.patch | 33 +++++++++++++++++++ > 1 file changed, 33 insertions(+) > create mode 100644 package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:21:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:21:34 +0100 Subject: [Buildroot] [git commit] package/batman-adv: bump to version 2021.04 Message-ID: <20220126211500.42E3382127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e15bd8e51ba1b72a59140c84e59971d71086431 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/batman-adv/batman-adv.hash | 6 +++--- package/batman-adv/batman-adv.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index f81df11000..c098663739 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -1,7 +1,7 @@ -# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.1/batman-adv-2021.1.tar.gz.sha1 -sha1 27a0dc7cb74b868bc0ab52794ecedd0448f0fb61 batman-adv-2021.1.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2021.4/batman-adv-2021.4.tar.gz.sha1 +sha1 80a3e4d763b6bf35db6e561ed9d6775dc874d7c6 batman-adv-2021.4.tar.gz # Hash for license files -sha256 5a989ba580897268373bd516b87b588061f344af773a0f6b038a3d8d2af028a1 batman-adv-2021.0.tar.gz +sha256 cff7a2f160045fd0dbf1f1cd7e35e93bf489e81cb8b9501b3756daa391f3eb1b batman-adv-2021.4.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index e58ac85bef..838f9b1851 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2021.1 +BATMAN_ADV_VERSION = 2021.4 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT From thomas.petazzoni at bootlin.com Wed Jan 26 21:21:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:21:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/batman-adv: bump to version 2021.04 In-Reply-To: <20220124071143.15869-1-christian@paral.in> References: <20220124071143.15869-1-christian@paral.in> Message-ID: <20220126222158.65f5e60a@windsurf> On Sun, 23 Jan 2022 23:11:43 -0800 Christian Stewart via buildroot wrote: > Signed-off-by: Christian Stewart > --- > package/batman-adv/batman-adv.hash | 4 ++-- > package/batman-adv/batman-adv.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:22:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:22:55 +0100 Subject: [Buildroot] [git commit] package/containerd: security bump to version 1.5.9 Message-ID: <20220126211606.BBFC582127@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=935bd589a356f51e5c97d111877bd2052f0c9da5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when it is SELinux" Containers launched through containerd???s CRI implementation on Linux systems which use the SELinux security module and containerd versions since v1.5.0 can cause arbitrary files and directories on the host to be relabeled to match the container process label through the use of specially-configured bind mounts in a hostPath volume. This relabeling elevates permissions for the container, granting full read/write access over the affected files and directories. Kubernetes and crictl can both be configured to use containerd???s CRI implementation. https://github.com/advisories/GHSA-mvff-h3cj-wj9c https://github.com/containerd/containerd/releases/tag/v1.5.9 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index f1a6709554..d5aafe2e70 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790 containerd-1.5.8.tar.gz +sha256 40c9767af3e87f2c36adf2f563f0a8374e80b30bd2b7aa80058c85912406cef4 containerd-1.5.9.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index cd975db274..8976e12f1a 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.8 +CONTAINERD_VERSION = 1.5.9 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Jan 26 21:23:09 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:23:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/containerd: security bump to version 1.5.9 In-Reply-To: <20220124071453.16225-1-christian@paral.in> References: <20220124071453.16225-1-christian@paral.in> Message-ID: <20220126222309.44ad5b0f@windsurf> On Sun, 23 Jan 2022 23:14:53 -0800 Christian Stewart via buildroot wrote: > CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when > it is SELinux" > > Containers launched through containerd?s CRI implementation on Linux systems > which use the SELinux security module and containerd versions since v1.5.0 can > cause arbitrary files and directories on the host to be relabeled to match the > container process label through the use of specially-configured bind mounts in a > hostPath volume. This relabeling elevates permissions for the container, > granting full read/write access over the affected files and directories. > Kubernetes and crictl can both be configured to use containerd?s CRI > implementation. > > https://github.com/advisories/GHSA-mvff-h3cj-wj9c > https://github.com/containerd/containerd/releases/tag/v1.5.9 > > Signed-off-by: Christian Stewart > --- > package/containerd/containerd.hash | 2 +- > package/containerd/containerd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:24:14 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:24:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/delve: bump to version 1.8.0 In-Reply-To: <20220124071741.22618-1-christian@paral.in> References: <20220124071741.22618-1-christian@paral.in> Message-ID: <20220126222414.7b378d17@windsurf> On Sun, 23 Jan 2022 23:17:41 -0800 Christian Stewart via buildroot wrote: > Signed-off-by: Christian Stewart > --- > package/delve/delve.hash | 2 +- > package/delve/delve.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:23:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:23:59 +0100 Subject: [Buildroot] [git commit] package/delve: bump to version 1.8.0 Message-ID: <20220126212131.39E0682707@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37097d6d60d8edb08e226e64401fe055521de676 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index 3d117813c6..04ea4954cc 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e73f7fc063632268d3bdf53486aeafd98cceb8f86f4af56903dedfebaefe690d delve-1.6.1.tar.gz +sha256 086106a4776fa155bf20c37d27b9caed55255be6359c7f0bda1893d3adbb614e delve-1.8.0.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 6c346552a4..984d90a03c 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.6.1 +DELVE_VERSION = 1.8.0 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Jan 26 21:24:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:24:37 +0100 Subject: [Buildroot] [git commit] package/delve: support building as host package Message-ID: <20220126212131.456B781D55@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e7b8f9412ac12225e441acbd5228e97c2e38ca7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Users may want to debug Go programs using dlv on the host machine. Adds package host-delve and BR2_PACKAGE_HOST_DELVE. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/delve/Config.in.host | 7 +++++++ package/delve/delve.mk | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index 20034f6ee0..341e24926b 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/cramfs/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" + source "package/delve/Config.in.host" source "package/dfu-util/Config.in.host" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" diff --git a/package/delve/Config.in.host b/package/delve/Config.in.host new file mode 100644 index 0000000000..dab5ca8914 --- /dev/null +++ b/package/delve/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_DELVE + bool "host delve" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + Delve is a debugger for the Go programming language. + + https://github.com/go-delve/delve diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 984d90a03c..4ca1786ffc 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -14,4 +14,9 @@ DELVE_TAGS = cgo DELVE_BUILD_TARGETS = cmd/dlv DELVE_INSTALL_BINS = $(notdir $(DELVE_BUILD_TARGETS)) +HOST_DELVE_TAGS = cgo +HOST_DELVE_BUILD_TARGETS = cmd/dlv +HOST_DELVE_INSTALL_BINS = $(notdir $(HOST_DELVE_BUILD_TARGETS)) + $(eval $(golang-package)) +$(eval $(host-golang-package)) From thomas.petazzoni at bootlin.com Wed Jan 26 21:28:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:28:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/delve: support building as host package In-Reply-To: <20220124072527.29954-1-christian@paral.in> References: <20220124072527.29954-1-christian@paral.in> Message-ID: <20220126222826.09444e06@windsurf> On Sun, 23 Jan 2022 23:25:27 -0800 Christian Stewart via buildroot wrote: > Users may want to debug Go programs using dlv on the host machine. > > Adds package host-delve and BR2_PACKAGE_HOST_DELVE. > > Signed-off-by: Christian Stewart > --- > package/Config.in.host | 1 + > package/delve/Config.in.host | 7 +++++++ > package/delve/delve.mk | 5 +++++ > 3 files changed, 13 insertions(+) > create mode 100644 package/delve/Config.in.host Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:28:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:28:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/docker-engine: bump to version 20.10.12 In-Reply-To: <20220124073711.44684-1-christian@paral.in> References: <20220124073711.44684-1-christian@paral.in> Message-ID: <20220126222855.080cf833@windsurf> On Sun, 23 Jan 2022 23:37:10 -0800 Christian Stewart via buildroot wrote: > Signed-off-by: Christian Stewart > --- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:29:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:29:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/gocryptfs: bump to version 2.2.1 In-Reply-To: <20220124074151.58966-1-christian@paral.in> References: <20220124074151.58966-1-christian@paral.in> Message-ID: <20220126222957.61a2191d@windsurf> On Sun, 23 Jan 2022 23:41:51 -0800 Christian Stewart via buildroot wrote: > Signed-off-by: Christian Stewart > --- > package/gocryptfs/gocryptfs.hash | 2 +- > package/gocryptfs/gocryptfs.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:28:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:28:40 +0100 Subject: [Buildroot] [git commit] package/docker-engine: bump to version 20.10.12 Message-ID: <20220126213746.A58DE826DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64cf3dc6c46c7b04d5d0ca1c024b9cf3d0efeaf1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d1323f507d..ec3a242629 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz +sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 45fa7fa53e..2a1239b676 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.11 +DOCKER_ENGINE_VERSION = 20.10.12 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Wed Jan 26 21:29:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:29:49 +0100 Subject: [Buildroot] [git commit] package/gocryptfs: bump to version 2.2.1 Message-ID: <20220126213746.B8F728291D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=436983e0a3c075c2d8ea417c61e58b295323d15b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/gocryptfs/gocryptfs.hash | 2 +- package/gocryptfs/gocryptfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index 94487815f5..ae161d1cd8 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4d89b76fe0b0c7218099f6f0ea6c1c87efe13927d95579a6ede82f20b6dbe48a gocryptfs-2.2.0.tar.gz +sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 2a00e9a959..8f70dba7c3 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.0 +GOCRYPTFS_VERSION = 2.2.1 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Jan 26 21:28:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:28:43 +0100 Subject: [Buildroot] [git commit] package/docker-cli: bump to version 20.10.12 Message-ID: <20220126213746.AE2D07FB3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70d1858353029d4a45e5f0d4a705b07837736c21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index fbcda5753e..f2fe316540 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz +sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 0e35a60d43..d5cca34efc 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.11 +DOCKER_CLI_VERSION = 20.10.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Wed Jan 26 21:45:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:45:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpewebkit: security bump to version 2.34.4 In-Reply-To: <20220124140230.1697395-1-aperez@igalia.com> References: <20220124140230.1697395-1-aperez@igalia.com> Message-ID: <20220126224515.125150ef@windsurf> On Mon, 24 Jan 2022 16:02:30 +0200 Adrian Perez de Castro wrote: > This is a minor release which provides fixes for CVE-2021-30934, > CVE-2021-30936, CVE-2021-30951, CVE-2021-30952, CVE-2021-30953, > CVE-2021-30954, CVE-2021-30984, and the safarileaks.com vulnerability > (which has not yet been assigned a CVE number). Release notes can be > found at: > > https://wpewebkit.org/release/wpewebkit-2.34.4.html > > An accompanying security advisory has been published at: > > https://wpewebkit.org/security/WSA-2022-0001.html > > Signed-off-by: Adrian Perez de Castro > --- > package/wpewebkit/wpewebkit.hash | 8 ++++---- > package/wpewebkit/wpewebkit.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:44:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:44:44 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.34.4 Message-ID: <20220126214843.EE9368276B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2c5bf66aceb795fbeb8e275f2df08788af1a864 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor release which provides fixes for CVE-2021-30934, CVE-2021-30936, CVE-2021-30951, CVE-2021-30952, CVE-2021-30953, CVE-2021-30954, CVE-2021-30984, and the safarileaks.com vulnerability (which has not yet been assigned a CVE number). Release notes can be found at: https://wpewebkit.org/release/wpewebkit-2.34.4.html An accompanying security advisory has been published at: https://wpewebkit.org/security/WSA-2022-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 52652b72ae..b863a0d705 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.34.3.tar.xz.sums -md5 f8eb92825bf6477fb04ca017926c2458 wpewebkit-2.34.3.tar.xz -sha1 a72f507dfd6d4d579b2e6c939d7c171c2cfb1d92 wpewebkit-2.34.3.tar.xz -sha256 c35de4bfce35c81cbd6c1da27879b4ea33e20bd51d750ce296a4d100d45f40fc wpewebkit-2.34.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.34.4.tar.xz.sums +md5 b0f7dcb18acfa94cfb42fea0fe10fb0d wpewebkit-2.34.4.tar.xz +sha1 de58481b43a6dba054097f619ee486f7889d7a56 wpewebkit-2.34.4.tar.xz +sha256 3653ba42dbe22a4e6751b3f7cab8d2ebb2db5b7654c5d135a2f9bedf94778cee wpewebkit-2.34.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 64c179534f..8d564d8223 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.3 +WPEWEBKIT_VERSION = 2.34.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Wed Jan 26 21:50:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:50:15 +0100 Subject: [Buildroot] [git commit] package/htpdate: bump to version 1.3.3 Message-ID: <20220126214844.0389580538@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=163509a8e0d558e6339c5489f072dfe805e0cc34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump and update project to its new location. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/htpdate/Config.in | 2 +- package/htpdate/S43htpdate | 2 +- package/htpdate/htpdate.hash | 4 ++-- package/htpdate/htpdate.mk | 6 +++--- package/htpdate/htpdate.service | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/htpdate/Config.in b/package/htpdate/Config.in index 42c10c308b..d2a71fb696 100644 --- a/package/htpdate/Config.in +++ b/package/htpdate/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_HTPDATE The HTTP Time Protocol (HTP) is used to synchronize a computer's time with web servers as reference time source. - https://github.com/angeloc/htpdate + https://github.com/twekkel/htpdate diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate index 75f9a995ff..5971d70639 100644 --- a/package/htpdate/S43htpdate +++ b/package/htpdate/S43htpdate @@ -9,7 +9,7 @@ test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" \ -- -D -i "$PIDFILE" $HTPDATE_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index 824266c1bc..b56522ea99 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz -sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE +sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz +sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 52022346a9..200c3207a2 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,13 +4,13 @@ # ################################################################################ -HTPDATE_VERSION = 1.2.6 -HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) +HTPDATE_VERSION = 1.3.3 +HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 +HTPDATE_BUILD_OPTS = https HTPDATE_DEPENDENCIES += openssl host-pkgconf endif diff --git a/package/htpdate/htpdate.service b/package/htpdate/htpdate.service index b7f1371b08..95220581d4 100644 --- a/package/htpdate/htpdate.service +++ b/package/htpdate/htpdate.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/run/htpdate.pid Environment=HTPDATE_ARGS="-a -s -t https://www.google.com" EnvironmentFile=-/etc/default/htpdate -ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS +ExecStart=/usr/sbin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS [Install] WantedBy=multi-user.target From thomas.petazzoni at bootlin.com Wed Jan 26 21:56:16 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:56:16 +0100 Subject: [Buildroot] [PATCH v3] package/htpdate: bump to version 1.3.3 In-Reply-To: <20220124215904.1200436-1-angelo@amarulasolutions.com> References: <20220124215904.1200436-1-angelo@amarulasolutions.com> Message-ID: <20220126225616.2ba8e512@windsurf> On Mon, 24 Jan 2022 22:59:04 +0100 Angelo Compagnucci wrote: > Bump and update project to its new location. > > Signed-off-by: Angelo Compagnucci > --- > v1->v2: > * Rebased on master > * Keeping buildroot package init scripts Applied to master, thanks. You had forgotten to update the Config.in file with the new link to the upstream site (as suggested by Baruch on your v2) and the hash file had incorrect spacing causing "make check-package" warnings. I fixed both when applying. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 21:56:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 22:56:26 +0100 Subject: [Buildroot] [git commit] package/python-pyyaml: bump to version 6.0 Message-ID: <20220126214936.872A780FF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d893f870f7c0be22b340cd5fca5ae0661c20182 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop python2 support and propagate dependency changes. Ensure optimized cython build is enabled and add host cython dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libcamera/libcamera.mk | 2 +- package/mongodb/mongodb.mk | 2 +- package/python-pyyaml/Config.in | 1 + package/python-pyyaml/python-pyyaml.hash | 4 ++-- package/python-pyyaml/python-pyyaml.mk | 9 +++++---- package/python3-pyyaml/python3-pyyaml.hash | 1 - package/python3-pyyaml/python3-pyyaml.mk | 20 -------------------- 7 files changed, 10 insertions(+), 29 deletions(-) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 0052ca558a..524cf07e03 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -12,7 +12,7 @@ LIBCAMERA_DEPENDENCIES = \ host-pkgconf \ host-python-jinja2 \ host-python3-ply \ - host-python3-pyyaml \ + host-python-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ -Dandroid=disabled \ diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index c33c3c2eb7..92656dd7a4 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -18,7 +18,7 @@ MONGODB_DEPENDENCIES = \ boost \ host-python3-cheetah \ host-python3-psutil \ - host-python3-pyyaml \ + host-python-pyyaml \ host-python3-regex \ host-python-requests \ host-scons \ diff --git a/package/python-pyyaml/Config.in b/package/python-pyyaml/Config.in index 45e818b7e7..eb073b9c03 100644 --- a/package/python-pyyaml/Config.in +++ b/package/python-pyyaml/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYYAML bool "python-pyyaml" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBYAML help The PyYAML package contains binding to the libyaml API. diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash index 82b2f4f880..f8b5332565 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json -md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz -sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz +md5 1d19c798f25e58e3e582f0f8c977dbb8 PyYAML-6.0.tar.gz +sha256 68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2 PyYAML-6.0.tar.gz # Locally computed sha256 checksums sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index c9013de8ec..8f5a2d269e 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -4,17 +4,18 @@ # ################################################################################ -# Please keep in sync package/python3-pyyaml/python3-pyyaml.mk -PYTHON_PYYAML_VERSION = 5.4.1 +PYTHON_PYYAML_VERSION = 6.0 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844 PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml -PYTHON_PYYAML_DEPENDENCIES = libyaml +PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml +PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-pyyaml/python3-pyyaml.hash b/package/python3-pyyaml/python3-pyyaml.hash deleted file mode 120000 index afa4932ecb..0000000000 --- a/package/python3-pyyaml/python3-pyyaml.hash +++ /dev/null @@ -1 +0,0 @@ -../python-pyyaml/python-pyyaml.hash \ No newline at end of file diff --git a/package/python3-pyyaml/python3-pyyaml.mk b/package/python3-pyyaml/python3-pyyaml.mk deleted file mode 100644 index f758341502..0000000000 --- a/package/python3-pyyaml/python3-pyyaml.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-pyyaml -# -################################################################################ - -# Please keep in sync with package/python-pyyaml/python-pyyaml.mk -PYTHON3_PYYAML_VERSION = 5.4.1 -PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz -PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d -PYTHON3_PYYAML_SETUP_TYPE = setuptools -PYTHON3_PYYAML_LICENSE = MIT -PYTHON3_PYYAML_LICENSE_FILES = LICENSE -PYTHON3_PYYAML_CPE_ID_VENDOR = pyyaml -PYTHON3_PYYAML_CPE_ID_PRODUCT = pyyaml -HOST_PYTHON3_PYYAML_DL_SUBDIR = python-pyyaml -HOST_PYTHON3_PYYAML_NEEDS_HOST_PYTHON = python3 -HOST_PYTHON3_PYYAML_DEPENDENCIES = host-libyaml - -$(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Wed Jan 26 22:00:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:00:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyyaml: bump to version 6.0 In-Reply-To: <20220124111725.544497-1-james.hilliard1@gmail.com> References: <20220124111725.544497-1-james.hilliard1@gmail.com> Message-ID: <20220126230025.67670779@windsurf> On Mon, 24 Jan 2022 04:17:25 -0700 James Hilliard wrote: > Drop python2 support and propagate dependency changes. > > Ensure optimized cython build is enabled and add host cython > dependency. > > Signed-off-by: James Hilliard > --- > package/libcamera/libcamera.mk | 2 +- > package/mongodb/mongodb.mk | 2 +- > package/python-pyyaml/Config.in | 1 + > package/python-pyyaml/python-pyyaml.hash | 4 ++-- > package/python-pyyaml/python-pyyaml.mk | 9 +++++---- > package/python3-pyyaml/python3-pyyaml.hash | 1 - > package/python3-pyyaml/python3-pyyaml.mk | 20 -------------------- > 7 files changed, 10 insertions(+), 29 deletions(-) > delete mode 120000 package/python3-pyyaml/python3-pyyaml.hash > delete mode 100644 package/python3-pyyaml/python3-pyyaml.mk Applied to master, thanks. I was surprised by the usage of host-python-pyyaml by host-sdbusplus. Indeed, host-sdbusplus depends on host-python3 and host-python-pyyaml, the latter being (before your patch) forcefully build for Python 2.x. So of the 3 Python modules that host-sdbusplus needs (inflection, mako, pyyaml), inflection and mako were installed for the host Python 3.x interpreter, and host-python-pyyaml for the host Python 2.x interpreter. And the host-sdbusplus build, even though it depended on host-python3, was in fact using host Python 2.x... which raises a question on the actual need of host-python-inflection and host-python-mako... as they are not actually needed during the build: the build succeeds when host-sdbusplus uses host Python 2.x, while mako and inflection are installed for host Python 3.x. It seems like they are only used at runtime ? But that also wouldn't work. Anyway, now with host-python-pyyaml being python3 only, this kind of solves the problem. But perhaps host-sdbusplus should be explicitly told to use $(HOST_DIR)/bin/python3, because if $(HOST_DIR)/bin/python2 is here, it will use it, and it won't have access to pyyaml. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:05:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:05:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/poppler: fix introspection build In-Reply-To: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> References: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230532.43ebcc51@windsurf> Hello Fabrice, +Adam for GOI expertise. On Mon, 24 Jan 2022 22:34:45 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since commit > 9d1d4818c39d97ad7a1cdf6e075b9acae6dfff71: > > [ 98%] Generating Poppler-0.18.typelib > Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 > If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > Fixes: > - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e > > Signed-off-by: Fabrice Fontaine > --- > ...txt-allow-the-user-to-configure-INTR.patch | 43 +++++++++++++++++++ > package/poppler/poppler.mk | 4 +- > 2 files changed, 46 insertions(+), 1 deletion(-) > create mode 100644 package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > > diff --git a/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > new file mode 100644 > index 0000000000..473966d7c9 > --- /dev/null > +++ b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > @@ -0,0 +1,43 @@ > +From f9e5d423b0f765f2393a95c3299a2d827b9d3fb3 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Mon, 24 Jan 2022 09:28:20 +0100 > +Subject: [PATCH] glib/CMakeLists.txt: allow the user to configure > + INTROSPECTION_COMPILER_ARGS > + > +Allow the user to add its own parameters such as > +--includedir=$(STAGING_DIR)/usr/share/gir-1.0 to > +INTROSPECTION_COMPILER_ARGS to avoid the following build failure when > +cross-compiling with buildroot: > + > +[ 98%] Generating Poppler-0.18.typelib > +Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > +error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 > +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > + > +Fixes: > + - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1049] > +--- > + glib/CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt > +index 7510e69e..f5130e3c 100644 > +--- a/glib/CMakeLists.txt > ++++ b/glib/CMakeLists.txt > +@@ -119,7 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) > + # General gir: Reset object-list for introspection & load tool args > + set(INTROSPECTION_GIRS) > + set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all") > +- set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") > ++ set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") Is this the right way of doing this? I see that glib-2.0.pc file has a "girdir" variable (which you have added in package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch to fix build issues in atk or libnice). So it seems like atk and libnice are automatically able to use these pkg-config files to find out this gir directory. Shouldn't poppler do the same ? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:05:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:05:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/sslh: fix build with gcc 4.8 In-Reply-To: <20220124213631.2444354-1-fontaine.fabrice@gmail.com> References: <20220124213631.2444354-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230559.2957b075@windsurf> On Mon, 24 Jan 2022 22:36:31 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 1.22c in > commit 5b9c58531e97b012a8a11c6ae5145b16dcfb8f74: > > sslh-select.c: In function 'udp_timeouts': > sslh-select.c:480:5: error: 'for' loop initial declarations are only allowed in C99 mode > for (int i = 0; i < fd_info->max_fd; i++) { > ^ > > Fixes: > - http://autobuild.buildroot.org/results/aaaac2beb16730747b4265e81d09cb5e072c7267 > > Signed-off-by: Fabrice Fontaine > --- > package/sslh/sslh.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:06:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:06:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump to version 0.103.5 In-Reply-To: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> References: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230633.4a76c296@windsurf> On Mon, 24 Jan 2022 23:10:47 +0100 Fabrice Fontaine wrote: > ClamAV 0.103.5 is a critical patch release with the following fix: > > - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. > Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with > libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the > clamscan --gen-json option) is enabled. > > https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md > > Signed-off-by: Fabrice Fontaine > --- > package/clamav/clamav.hash | 2 +- > package/clamav/clamav.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:05:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:05:55 +0100 Subject: [Buildroot] [git commit] package/sslh: fix build with gcc 4.8 Message-ID: <20220126215945.9C042827A0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96c6ccb49808c312a7dfbd12edf08716de621405 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 1.22c in commit 5b9c58531e97b012a8a11c6ae5145b16dcfb8f74: sslh-select.c: In function 'udp_timeouts': sslh-select.c:480:5: error: 'for' loop initial declarations are only allowed in C99 mode for (int i = 0; i < fd_info->max_fd; i++) { ^ Fixes: - http://autobuild.buildroot.org/results/aaaac2beb16730747b4265e81d09cb5e072c7267 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/sslh/sslh.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 99fb6bf922..897b3b6505 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -11,7 +11,7 @@ SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING SSLH_DEPENDENCIES = pcre2 -SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) +SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" ifeq ($(BR2_PACKAGE_LIBBSD),y) SSLH_DEPENDENCIES += libbsd From thomas.petazzoni at bootlin.com Wed Jan 26 22:06:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:06:29 +0100 Subject: [Buildroot] [git commit] package/clamav: security bump to version 0.103.5 Message-ID: <20220126215945.A44FD7FA40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f92c093c7a39b8e0d6754c452268b0af20ef860b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ClamAV 0.103.5 is a critical patch release with the following fix: - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the clamscan --gen-json option) is enabled. https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index d68b04af76..73f4ff88f1 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz +sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 94b589b975..cd2d06e6b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.4 +CLAMAV_VERSION = 0.103.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From thomas.petazzoni at bootlin.com Wed Jan 26 22:08:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:08:26 +0100 Subject: [Buildroot] [git commit] package/freeipmi: bump to version 1.6.9 Message-ID: <20220126220146.3CBC58276A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f53928c2cb9bcc188a2586fc97535c2238ead50b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) and so autoreconf https://github.com/chu11/freeipmi-mirror/blob/freeipmi-1-6-9/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/freeipmi/0001-fix-build-on-musl.patch | 49 --------------------- package/freeipmi/0002-check-for-inb-and-outb.patch | 50 ---------------------- package/freeipmi/freeipmi.hash | 2 +- package/freeipmi/freeipmi.mk | 4 +- 4 files changed, 2 insertions(+), 103 deletions(-) diff --git a/package/freeipmi/0001-fix-build-on-musl.patch b/package/freeipmi/0001-fix-build-on-musl.patch deleted file mode 100644 index ff7425d221..0000000000 --- a/package/freeipmi/0001-fix-build-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 Oct 2021 00:26:40 +0200 -Subject: [PATCH] fix build on musl - -musl doesn't provide getmsg or putmsg even if stropts.h is available - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2] ---- - configure.ac | 1 + - libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 562dd624e..711b27674 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) - AC_CHECK_FUNCS([iopl]) - AC_CHECK_FUNCS([asprintf]) - AC_CHECK_FUNCS([cbrt]) -+AC_CHECK_FUNCS([getmsg putmsg]) - - dnl sighandler_t apparently not defined in Apple/OS X - AC_CHECK_TYPES([sighandler_t], [], [], [[#include ]]) -diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c -index 05caca8b6..4ae8c5719 100644 ---- a/libfreeipmi/driver/ipmi-sunbmc-driver.c -+++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c -@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx, - assert (ctx->io_init); - assert (ctx->putmsg_intf); - --#if defined(HAVE_SYS_STROPTS_H) -+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG) - memset (&sbuf, '\0', sizeof (struct strbuf)); - - /* Due to API differences, we need to extract the cmd out of the -@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx, - return (-1); - } - --#if defined(HAVE_SYS_STROPTS_H) -+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG) - if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0) - { - SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno); diff --git a/package/freeipmi/0002-check-for-inb-and-outb.patch b/package/freeipmi/0002-check-for-inb-and-outb.patch deleted file mode 100644 index 3bc006acc7..0000000000 --- a/package/freeipmi/0002-check-for-inb-and-outb.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 47249279f3ef2c1fcfc312294f1c98c35232aed0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 2 Jan 2022 10:37:00 +0100 -Subject: [PATCH] check for inb and outb - -Check for inb and outb before using them to avoid the following build -failure on uclibc-ng: - -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../libfreeipmi/.libs/libfreeipmi.a(libfreeipmi_la-ipmi-kcs-driver.o): in function `_ipmi_kcs_test_if_state': -/home/buildroot/autobuild/instance-1/output-1/build/freeipmi-1.6.8/libfreeipmi/driver/ipmi-kcs-driver.c:537: undefined reference to `inb' - -Fixes: - - http://autobuild.buildroot.org/results/13f58266f7747c183033c811a4e8ca6fa30b6f4d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/50] ---- - configure.ac | 2 +- - libfreeipmi/driver/ipmi-kcs-driver.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 711b27674..bcc4156ff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -476,7 +476,7 @@ AC_CHECK_FUNCS([memcpy mempcpy memset mlock]) - AC_CHECK_FUNCS([getline getprogname]) - AC_CHECK_FUNCS([strerror strerror_r]) - AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked]) --AC_CHECK_FUNCS([iopl]) -+AC_CHECK_FUNCS([inb iopl outb]) - AC_CHECK_FUNCS([asprintf]) - AC_CHECK_FUNCS([cbrt]) - AC_CHECK_FUNCS([getmsg putmsg]) -diff --git a/libfreeipmi/driver/ipmi-kcs-driver.c b/libfreeipmi/driver/ipmi-kcs-driver.c -index c212887c0..a9d4b2e96 100644 ---- a/libfreeipmi/driver/ipmi-kcs-driver.c -+++ b/libfreeipmi/driver/ipmi-kcs-driver.c -@@ -162,7 +162,7 @@ - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - # define _INB(port) inb (port) - # define _OUTB(data, port) outb (port, data) --#elif defined(HAVE_IOPL) -+#elif defined(HAVE_INB) && defined(HAVE_OUTB) - # define _INB(port) inb (port) - # define _OUTB(data, port) outb (data, port) - #else --- -2.33.0 - diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index f73b4a25fe..05fb50bd4c 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71 freeipmi-1.6.8.tar.gz +sha256 f25e1c35f3d0f1b5a99cc31ecc2353ca83ed46a15163842fba870127dc9c8206 freeipmi-1.6.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index b25ef0a4c6..9fb59245b9 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.8 +FREEIPMI_VERSION = 1.6.9 FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ @@ -14,8 +14,6 @@ FREEIPMI_LICENSE_FILES = \ COPYING.sunbmc COPYING.ZRESEARCH FREEIPMI_DEPENDENCIES = host-pkgconf FREEIPMI_INSTALL_STAGING = YES -# We're patching configure.ac -FREEIPMI_AUTORECONF = YES # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE FREEIPMI_CONF_OPTS = --without-random-device From thomas.petazzoni at bootlin.com Wed Jan 26 22:09:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:09:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: bump to version 1.6.9 In-Reply-To: <20220124221657.2629467-1-fontaine.fabrice@gmail.com> References: <20220124221657.2629467-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230926.7b02ffda@windsurf> On Mon, 24 Jan 2022 23:16:57 +0100 Fabrice Fontaine wrote: > Drop patches (already in version) and so autoreconf > > https://github.com/chu11/freeipmi-mirror/blob/freeipmi-1-6-9/NEWS > > Signed-off-by: Fabrice Fontaine > --- > package/freeipmi/0001-fix-build-on-musl.patch | 49 ------------------ > .../0002-check-for-inb-and-outb.patch | 50 ------------------- > ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 ------------------- > package/freeipmi/freeipmi.hash | 2 +- > package/freeipmi/freeipmi.mk | 4 +- > 5 files changed, 2 insertions(+), 153 deletions(-) > delete mode 100644 package/freeipmi/0001-fix-build-on-musl.patch > delete mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch > delete mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch This patch was not applying on master, because it was assuming that "package/freeipmi: fix static build with libgcrypt" was applied, which isn't in master. Since the patch added by "package/freeipmi: fix static build with libgcrypt" is not in upstream freeipmi, I applied the version bump, but without the removal of patch 0003. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:09:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:09:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix static build with libgcrypt In-Reply-To: <20220115153319.2227752-1-fontaine.fabrice@gmail.com> References: <20220115153319.2227752-1-fontaine.fabrice@gmail.com> Message-ID: <20220126230936.32fe7c2e@windsurf> On Sat, 15 Jan 2022 16:33:19 +0100 Fabrice Fontaine wrote: > Fix the following static build failure with libgcrypt raised since the > addition of the package in commit > 663f39c88c01593855c18355a4decdceeffd884b: > > configure:13665: /home/buildroot/autobuild/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lgcrypt >&5 > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libgcrypt.a(libgcrypt_la-visibility.o): in function `gcry_err_make_from_errno': > visibility.c:(.text+0x29): undefined reference to `gpg_err_code_from_errno' > > Fixes: > - http://autobuild.buildroot.org/results/5354f7231cf08bf762e7d86fca874ce63d9a116b > > Signed-off-by: Fabrice Fontaine > --- > ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 +++++++++++++++++++ > 1 file changed, 50 insertions(+) > create mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch I've marked this one as Not Applicable. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:09:50 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:09:50 +0100 Subject: [Buildroot] [git commit] package/whois: bump to version 5.5.11 Message-ID: <20220126220305.B04DD8276A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7deb5618efefdef4d4a6eac2b4c4dc3c11d484c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 1478d60697..4bdfd74b20 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois/whois_5.5.10.dsc -sha256 2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd whois_5.5.10.tar.xz +# From http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois/whois_5.5.11.dsc +sha256 966281eb8301c14a1acc17e46c70061f73179d80e370aef43065c22f0947fb87 whois_5.5.11.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index c5d0a6f2ad..544cb9c2f7 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.10 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20210606T204545Z/pool/main/w/whois +WHOIS_VERSION = 5.5.11 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ From thomas.petazzoni at bootlin.com Wed Jan 26 22:14:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:14:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: add optional nmcli support In-Reply-To: <20220126090457.32015-1-mf@go-sys.de> References: <20220126090457.32015-1-mf@go-sys.de> Message-ID: <20220126231432.37374caf@windsurf> Hello, +Yann on legacy handling (see below) On Wed, 26 Jan 2022 10:04:57 +0100 Michael Fischer wrote: > When NetworkManager is built without the READLINE package the nmcli was not build. Well, this was kind of expected, and isn't really a correct explanation for this change. A better explanation I believe is more something like this: """ The network-manager package builds the nmcli utility when the readline package is enabled. However, this is not necessarily obvious to the user. Therefore, this commit adds an explicit option to enable the nmcli tool, which automatically selects readline. """ > > Signed-off-by: Michael Fischer > +config BR2_PACKAGE_NETWORK_MANAGER_CLI > + bool "nmcli support" > + select BR2_PACKAGE_READLINE > + help > + This option enables support for NetworkManager Command Line Interface I think this line is too long, make sure to run "make check-package". But a bigger problem is the legacy handling. Indeed, before your patch, a configuration with BR2_PACKAGE_NETWORK_MANAGER=y and BR2_PACKAGE_READLINE=y gets nmcli. After your patch, such a configuration no longer has nmcli compiled, because BR2_PACKAGE_NETWORK_MANAGER_CLI is not enabled. Is this important to address, I don't know. Is it possible to address is by doing: config BR2_PACKAGE_NETWORK_MANAGER_CLI bool "nmcli support" default y if BR2_PACKAGE_READLINE select BR2_PACKAGE_READLINE I don't know if Kconfig is happy about such a construct. Yann? :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:15:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:15:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/busybox: bump version to 1.35.0 In-Reply-To: <20220126092810.6645-1-mf@go-sys.de> References: <20220126092810.6645-1-mf@go-sys.de> Message-ID: <20220126231554.0fcc106d@windsurf> Hello Michael, Thanks for your patch! On Wed, 26 Jan 2022 10:28:10 +0100 Michael Fischer wrote: > Signed-off-by: Michael Fischer > --- > package/busybox/busybox.hash | 4 ++-- > package/busybox/busybox.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Thanks, but don't we also need a refresh of package/busybox/busybox.config and package/busybox/busybox-minimal.config at the same time? I'm not even sure when was the last time they were refreshed. Maybe we need a first patch that refreshes them before the bump, and then the version bump itself with the refresh corresponding to the version bump ? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:16:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:16:29 +0100 Subject: [Buildroot] [git commit] package/pipewire: link examples with -latomic Message-ID: <20220126220941.081E68123F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6dd830766e7b35f53eecbf2a85261b99564cde76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Link examples with -latomic to avoid the following build failure raised since commit 3edc1cc44c7bd2deed31d28fa9534e67f32334e8: FAILED: spa/examples/adapter-control /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...spa-meson.build-add-atomic_dep-dependency.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch b/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch new file mode 100644 index 0000000000..b91adbe7e4 --- /dev/null +++ b/package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch @@ -0,0 +1,40 @@ +From 8d9dc023ac12cf305c28786891d5b15e13f29a3d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 25 Jan 2022 17:22:02 +0100 +Subject: [PATCH] spa/meson.build: add atomic_dep dependency + +Commit fa64d93e64592d5edd8767f722cf4ea093641052 moved the atomic_dep +from pipewire-jack to pipewire_dep however atomic_dep should also be +added to spa_dev to avoid the following build failure when building +examples (which don't depend on pipewire_dep): + +FAILED: spa/examples/adapter-control +/home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': +adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 + +[Retrieved from: +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8d9dc023ac12cf305c28786891d5b15e13f29a3d] +Signed-off-by: Fabrice Fontaine +--- + spa/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/spa/meson.build b/spa/meson.build +index 4ad37cdb4..2404748df 100644 +--- a/spa/meson.build ++++ b/spa/meson.build +@@ -9,6 +9,7 @@ spa_dep = declare_dependency( + include_directories : [ + include_directories('include'), + ], ++ dependencies : [atomic_dep], + version : spaversion, + variables : { + 'plugindir' : meson.current_build_dir() / 'plugins', +-- +GitLab + From thomas.petazzoni at bootlin.com Wed Jan 26 22:16:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:16:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: link examples with -latomic In-Reply-To: <20220126202942.1495636-1-fontaine.fabrice@gmail.com> References: <20220126202942.1495636-1-fontaine.fabrice@gmail.com> Message-ID: <20220126231638.5183ec78@windsurf> On Wed, 26 Jan 2022 21:29:42 +0100 Fabrice Fontaine wrote: > Link examples with -latomic to avoid the following build failure raised > since commit 3edc1cc44c7bd2deed31d28fa9534e67f32334e8: > > FAILED: spa/examples/adapter-control > /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc-linux-gcc -o spa/examples/adapter-control spa/examples/adapter-control.p/adapter-control.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group -lintl -ldl -pthread -lm -Wl,--end-group > /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: spa/examples/adapter-control.p/adapter-control.c.o: in function `spa_graph_node_trigger': > adapter-control.c:(.text+0xdf4): undefined reference to `__atomic_fetch_sub_4' > > Fixes: > - http://autobuild.buildroot.org/results/192f40a5c6e05fc11507494e19db52a47082fc35 > > Signed-off-by: Fabrice Fontaine > --- > ...eson.build-add-atomic_dep-dependency.patch | 40 +++++++++++++++++++ > 1 file changed, 40 insertions(+) > create mode 100644 package/pipewire/0001-spa-meson.build-add-atomic_dep-dependency.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:16:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:16:56 +0100 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4224 Message-ID: <20220126221006.E7C26817DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3da56369c75473ee3fac768b86382adcdec3f76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository vim/vim prior to 8.2.4120 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fff5072063..49056b31cd 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 408b33a409..74ab1ec584 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4092 +VIM_VERSION = 8.2.4224 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From thomas.petazzoni at bootlin.com Wed Jan 26 22:17:02 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:17:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4224 In-Reply-To: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> References: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> Message-ID: <20220126231702.7da0b712@windsurf> On Wed, 26 Jan 2022 21:37:33 +0100 Fabrice Fontaine wrote: > Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository > vim/vim prior to 8.2.4120 > > Signed-off-by: Fabrice Fontaine > --- > package/vim/vim.hash | 2 +- > package/vim/vim.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Jan 26 22:17:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 23:17:08 +0100 Subject: [Buildroot] [PATCH 1/1] fs: fix /tmp and /run clean-up in POSIX shells In-Reply-To: <20220124104116.12902-2-evgeni@studio-punkt.com> References: <20220124104116.12902-1-evgeni@studio-punkt.com> <20220124104116.12902-2-evgeni@studio-punkt.com> Message-ID: <20220126221708.GK457876@scaer> Evgeni, All, On 2022-01-24 11:41 +0100, Evgeni Dobrev via buildroot spake thusly: > In POSIX sh, ^ in place of ! in glob bracket expressions > is undefined. > > Signed-off-by: Evgeni Dobrev > --- > fs/common.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..64a94d9ad8 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) TIL that bracket expressions are actually valid and specified by POSIX. But we do guarantee that we do have bash as a shell when running Buildroot, so I think it is fair to also run the fs script with bash: diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..f8a6da6bc4 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -172,7 +172,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(BASE_TARGET_DIR)/ \ $$(TARGET_DIR) - echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) + echo '#!$(SHELL)' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) However, $(SHELL) is not always correct, so we'd probably need: diff --git a/Makefile b/Makefile index 5fc7137e5a..bb9955f5b6 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ # we want bash as shell SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ - else echo sh; fi; fi) + else which sh; fi; fi) # Set O variable if not already done on the command line; # or avoid confusing packages that can use the O=

     syntax for out-of-tree But in the end this is quite more changes than what you propose. Can we also shorten the command? echo "rm -rf $$(TARGET_DIR)/{run,tmp}/* $$(TARGET_DIR)/{run,tmp}/.[!.]*" >> $$(FAKEROOT_SCRIPT) Regards, Yann E. MORIN. > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Wed Jan 26 22:22:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 23:22:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/poppler: fix introspection build In-Reply-To: <20220126230532.43ebcc51@windsurf> References: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> <20220126230532.43ebcc51@windsurf> Message-ID: Hello, Le mer. 26 janv. 2022 ? 23:05, Thomas Petazzoni a ?crit : > > Hello Fabrice, > > +Adam for GOI expertise. > > On Mon, 24 Jan 2022 22:34:45 +0100 > Fabrice Fontaine wrote: > > > Fix the following build failure raised since commit > > 9d1d4818c39d97ad7a1cdf6e075b9acae6dfff71: > > > > [ 98%] Generating Poppler-0.18.typelib > > Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > > error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 > > If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > > > Fixes: > > - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...txt-allow-the-user-to-configure-INTR.patch | 43 +++++++++++++++++++ > > package/poppler/poppler.mk | 4 +- > > 2 files changed, 46 insertions(+), 1 deletion(-) > > create mode 100644 package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > > > > diff --git a/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > > new file mode 100644 > > index 0000000000..473966d7c9 > > --- /dev/null > > +++ b/package/poppler/0002-glib-CMakeLists.txt-allow-the-user-to-configure-INTR.patch > > @@ -0,0 +1,43 @@ > > +From f9e5d423b0f765f2393a95c3299a2d827b9d3fb3 Mon Sep 17 00:00:00 2001 > > +From: Fabrice Fontaine > > +Date: Mon, 24 Jan 2022 09:28:20 +0100 > > +Subject: [PATCH] glib/CMakeLists.txt: allow the user to configure > > + INTROSPECTION_COMPILER_ARGS > > + > > +Allow the user to add its own parameters such as > > +--includedir=$(STAGING_DIR)/usr/share/gir-1.0 to > > +INTROSPECTION_COMPILER_ARGS to avoid the following build failure when > > +cross-compiling with buildroot: > > + > > +[ 98%] Generating Poppler-0.18.typelib > > +Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > > +error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 > > +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > > +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > > + > > +Fixes: > > + - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e > > + > > +Signed-off-by: Fabrice Fontaine > > +[Upstream status: > > +https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1049] > > +--- > > + glib/CMakeLists.txt | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt > > +index 7510e69e..f5130e3c 100644 > > +--- a/glib/CMakeLists.txt > > ++++ b/glib/CMakeLists.txt > > +@@ -119,7 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) > > + # General gir: Reset object-list for introspection & load tool args > > + set(INTROSPECTION_GIRS) > > + set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all") > > +- set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") > > ++ set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") > > Is this the right way of doing this? I see that glib-2.0.pc file has a > "girdir" variable (which you have added in > package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch > to fix build issues in atk or libnice). So it seems like atk and > libnice are automatically able to use these pkg-config files to find > out this gir directory. Indeed, this is true but atk and libnice are meson packages. For autotools packages, commit 8dda79970661090f202e1f20e5982ba53fdaeb95 updated Makefile.introspection. > > Shouldn't poppler do the same ? poppler is a cmake-package and I thought that the suggested approach is the simplest, less invasive and quickest approach. Upstream is also ok for this patch. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From yann.morin.1998 at free.fr Wed Jan 26 22:28:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 26 Jan 2022 23:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: add optional nmcli support In-Reply-To: <20220126231432.37374caf@windsurf> References: <20220126090457.32015-1-mf@go-sys.de> <20220126231432.37374caf@windsurf> Message-ID: <20220126222800.GL457876@scaer> Thomas, Michael, All, On 2022-01-26 23:14 +0100, Thomas Petazzoni spake thusly: > On Wed, 26 Jan 2022 10:04:57 +0100 > Michael Fischer wrote: [--SNIP--] > > +config BR2_PACKAGE_NETWORK_MANAGER_CLI > > + bool "nmcli support" > > + select BR2_PACKAGE_READLINE > > + help > > + This option enables support for NetworkManager Command Line Interface > > I think this line is too long, make sure to run "make check-package". > > But a bigger problem is the legacy handling. Indeed, before your patch, > a configuration with BR2_PACKAGE_NETWORK_MANAGER=y and > BR2_PACKAGE_READLINE=y gets nmcli. After your patch, such a > configuration no longer has nmcli compiled, because > BR2_PACKAGE_NETWORK_MANAGER_CLI is not enabled. I was also looking at that patch, and was wondering what we could do. I do not like efaulting symbols to 'y', even conditionally, and I would also expect people to regression-test their systems when they upgrade anyway. > Is this important to address, I don't know. > > Is it possible to address is by doing: > > config BR2_PACKAGE_NETWORK_MANAGER_CLI > bool "nmcli support" > default y if BR2_PACKAGE_READLINE > select BR2_PACKAGE_READLINE > > I don't know if Kconfig is happy about such a construct. Yann? :-) No it is not valid: you have both a backward and a forward dependency that drive the availability of the symbol: package/readline/Config.in:1:error: recursive dependency detected! package/readline/Config.in:1: symbol BR2_PACKAGE_READLINE is selected by BR2_PACKAGE_NETWORK_MANAGER_CLI package/network-manager/Config.in:36: symbol BR2_PACKAGE_NETWORK_MANAGER_CLI depends on BR2_PACKAGE_READLINE For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" TBH, I would just leave it like that... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Jan 26 22:32:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:32:04 +0100 Subject: [Buildroot] [PATCH 1/2] package/xvisor: drop arm support In-Reply-To: <20220125190650.107677-1-fontaine.fabrice@gmail.com> References: <20220125190650.107677-1-fontaine.fabrice@gmail.com> Message-ID: <20220126233204.36d9c37c@windsurf> On Tue, 25 Jan 2022 20:06:49 +0100 Fabrice Fontaine wrote: > Support for old 32-bit ARM boards (i.e. ARMv5, ARMv6, ARMv7a) without > virtualization has been dropped since > https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 > resulting in the following build failure since bump to version 0.3.1 in > commit c4f8b8968770ecbf6444a5921c6472f126717626: > > *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v6-defconfig"! > > *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-0/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v7-defconfig"! > > Fixes: > - http://autobuild.buildroot.org/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b > - http://autobuild.buildroot.org/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 > > Signed-off-by: Fabrice Fontaine > --- > package/xvisor/Config.in | 6 +----- > package/xvisor/xvisor.mk | 2 +- > 2 files changed, 2 insertions(+), 6 deletions(-) I think this is based on a misunderstanding of the https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 commit. This commit says that they remove support for "ARM32 without virtualization support", but there are ARM32 cores with virtualization support! As explained in the commit log, the ARM32 cores that support the ARMv7ve instruction set are still supported by Xvisor. This means that Cortex-A7, Cortex-A12, Cortex-A15 and Cortex-A17, which are all ARM32 cores, are still supported by Xvisor. So this patch entirely dropping ARM32 from Xvisor isn't entirely correct. So, the change should be more like this: config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool depends on BR2_USE_MMU default y if BR2_aarch64 default y if BR2_x86_64 default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17 config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" - default "generic-v5" if BR2_ARM_CPU_ARMV5 - default "generic-v6" if BR2_ARM_CPU_ARMV6 - default "generic-v7" if BR2_ARM_CPU_ARMV7A + default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A default "generic-v8" if BR2_aarch64 default "x86_64_generic" if BR2_x86_64 What do you think ? Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:32:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:32:32 +0100 Subject: [Buildroot] [git commit] package/gupnp: bump to version 1.4.3 Message-ID: <20220126222545.070A782626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5312db2b1fbddaeb209ffaaefe611d32754a5382 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.3/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index cc78be7d5d..cc5e2b5775 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.2.sha256sum: -sha256 bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc gupnp-1.4.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: +sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index aebf9225a8..dca747f064 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ From thomas.petazzoni at bootlin.com Wed Jan 26 22:32:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:32:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/gupnp: bump to version 1.4.3 In-Reply-To: <20220125185126.52194-1-fontaine.fabrice@gmail.com> References: <20220125185126.52194-1-fontaine.fabrice@gmail.com> Message-ID: <20220126233240.1dbd1147@windsurf> On Tue, 25 Jan 2022 19:51:26 +0100 Fabrice Fontaine wrote: > https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.4.3/NEWS > > Signed-off-by: Fabrice Fontaine > --- > package/gupnp/gupnp.hash | 4 ++-- > package/gupnp/gupnp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:33:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:33:15 +0100 Subject: [Buildroot] [git commit] package/mongodb: security bump to version 4.2.18 Message-ID: <20220126222628.05A8E82626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49bbf644d4acd3dfe6f3fd0db39e6fed78abf58f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2021-20330: An attacker with basic CRUD permissions on a replicated collection can run the applyOps command with specially malformed oplog entries, resulting in a potential denial of service on secondaries. This issue affects MongoDB Server v4.0 versions prior to 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server v4.4 versions prior to 4.4.6. Drop third patch (already in version) https://docs.mongodb.com/master/release-notes/4.2/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch | 49 ---------------------- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch b/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch deleted file mode 100644 index 02b35c6e4f..0000000000 --- a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ef08d0dbc99db8c4620512e92bfb3154282eb5d3 Mon Sep 17 00:00:00 2001 -From: Andrew Morrow -Date: Wed, 15 Sep 2021 15:23:42 -0400 -Subject: [PATCH] SERVER-59459 With glibc-2.34, MINSIGSTKSZ is no longer a - constant - -[Retrieved (and backported) from: -https://github.com/mongodb/mongo/commit/ef08d0dbc99db8c4620512e92bfb3154282eb5d3] -Signed-off-by: Fabrice Fontaine ---- - src/mongo/stdx/thread.h | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h -index 7b15bb561bd9..6f1e16cdeb36 100644 ---- a/src/mongo/stdx/thread.h -+++ b/src/mongo/stdx/thread.h -@@ -76,11 +76,19 @@ class SigAltStackController { - } - - private: -+ static size_t _getStackSize() { -+ // It would be nice for this to be a constexpr, but -+ // MINSIGSTKSZ became a macro that invoked `sysconf` in glibc -+ // 2.34. -+ static const std::size_t kMinSigStkSz = MINSIGSTKSZ; -+ return std::max(kMongoMinSignalStackSize, kMinSigStkSz); -+ } -+ - void _install() const { - stack_t ss; - ss.ss_sp = _stackStorage.get(); - ss.ss_flags = 0; -- ss.ss_size = kStackSize; -+ ss.ss_size = _getStackSize(); - if (sigaltstack(&ss, nullptr)) { - abort(); - } -@@ -107,9 +115,7 @@ class SigAltStackController { - // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) - static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; - -- static constexpr std::size_t kStackSize = -- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); -- std::unique_ptr _stackStorage = std::make_unique(kStackSize); -+ std::unique_ptr _stackStorage = std::make_unique(_getStackSize()); - - #else // !MONGO_HAS_SIGALTSTACK - auto makeInstallGuard() const { diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 3b2580cc43..02da8ad452 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 92656dd7a4..311b9de14e 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.11 +MONGODB_VERSION = 4.2.18 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz From thomas.petazzoni at bootlin.com Wed Jan 26 22:33:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:33:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongodb: security bump to version 4.2.18 In-Reply-To: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> References: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> Message-ID: <20220126233324.523b01d9@windsurf> On Tue, 25 Jan 2022 18:34:22 +0100 Fabrice Fontaine wrote: > Fix CVE-2021-20330: An attacker with basic CRUD permissions on a > replicated collection can run the applyOps command with specially > malformed oplog entries, resulting in a potential denial of service on > secondaries. This issue affects MongoDB Server v4.0 versions prior to > 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server > v4.4 versions prior to 4.4.6. > > Drop third patch (already in version) > > https://docs.mongodb.com/master/release-notes/4.2/ > > Signed-off-by: Fabrice Fontaine > --- > ...-MINSIGSTKSZ-is-no-longer-a-constant.patch | 49 ------------------- > package/mongodb/mongodb.hash | 2 +- > package/mongodb/mongodb.mk | 2 +- > 3 files changed, 2 insertions(+), 51 deletions(-) > delete mode 100644 package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Jan 26 22:33:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:33:58 +0100 Subject: [Buildroot] [git commit] package/gstreamer/gst1-plugins-bad: fix build with neon Message-ID: <20220126222709.D01E182626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90eca683f3272ec246098b5e6ef97b99f5844ea4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of neon to version 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc: ../output-1/build/gst1-plugins-bad-1.18.5/ext/neon/meson.build:1:0: ERROR: Invalid version of dependency, need 'neon' ['<= 0.31.99'] found '0.32.2'. Fixes: - http://autobuild.buildroot.org/results/eaf1890176431000ea8b371956f0d2d7e9907aea Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-neon-Allow-building-against-neon-0-32-x.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch b/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch new file mode 100644 index 0000000000..e995a8cb91 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch @@ -0,0 +1,29 @@ +From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 26 Sep 2021 21:34:30 +0200 +Subject: [PATCH] neon: Allow building against neon 0.32.x + +No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3 + +Part-of: + +[Retrieved from: +https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b83e85ab677c79b46f520abebd1ee031e3a139c0] +Signed-off-by: Fabrice Fontaine +--- + subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/neon/meson.build b/ext/neon/meson.build +index bf49be9111..abd9763649 100644 +--- a/ext/neon/meson.build ++++ b/ext/neon/meson.build +@@ -1,4 +1,4 @@ +-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'], ++neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'], + required : get_option('neon')) + + if neon_dep.found() +-- +GitLab + From thomas.petazzoni at bootlin.com Wed Jan 26 22:34:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:34:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer/gst1-plugins-bad: fix build with neon In-Reply-To: <20220125173328.3475928-1-fontaine.fabrice@gmail.com> References: <20220125173328.3475928-1-fontaine.fabrice@gmail.com> Message-ID: <20220126233407.6b987cea@windsurf> On Tue, 25 Jan 2022 18:33:28 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since bump of neon to version > 0.32.2 in commit 029a6dc3e3320984c6369747e0b79060f13b2afc: > > ../output-1/build/gst1-plugins-bad-1.18.5/ext/neon/meson.build:1:0: ERROR: Invalid version of dependency, need 'neon' ['<= 0.31.99'] found '0.32.2'. > > Fixes: > - http://autobuild.buildroot.org/results/eaf1890176431000ea8b371956f0d2d7e9907aea > > Signed-off-by: Fabrice Fontaine > --- > ...n-Allow-building-against-neon-0-32-x.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-neon-Allow-building-against-neon-0-32-x.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From petr.vorel at gmail.com Wed Jan 26 22:35:20 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Wed, 26 Jan 2022 23:35:20 +0100 Subject: [Buildroot] [PATCH] package/uclibc: update to 1.0.40 In-Reply-To: References: Message-ID: Hi Waldemar, Reviewed-by: Petr Vorel Kind regards, Petr From thomas.petazzoni at bootlin.com Wed Jan 26 22:35:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 26 Jan 2022 23:35:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/poppler: fix introspection build In-Reply-To: References: <20220124213445.2426794-1-fontaine.fabrice@gmail.com> <20220126230532.43ebcc51@windsurf> Message-ID: <20220126233536.36053b53@windsurf> On Wed, 26 Jan 2022 23:22:24 +0100 Fabrice Fontaine wrote: > Indeed, this is true but atk and libnice are meson packages. > For autotools packages, commit > 8dda79970661090f202e1f20e5982ba53fdaeb95 updated > Makefile.introspection. Correct, I also looked into these :-) > poppler is a cmake-package and I thought that the suggested approach > is the simplest, less invasive and quickest approach. Upstream is also > ok for this patch. Yeah, maybe it's the most pragmatic solution. It just feels annoying that we have to teach "all" users of GOI where the GIR files are located. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Wed Jan 26 22:38:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 23:38:23 +0100 Subject: [Buildroot] [PATCH 1/2] package/xvisor: drop arm support In-Reply-To: <20220126233204.36d9c37c@windsurf> References: <20220125190650.107677-1-fontaine.fabrice@gmail.com> <20220126233204.36d9c37c@windsurf> Message-ID: Le mer. 26 janv. 2022 ? 23:32, Thomas Petazzoni a ?crit : > > On Tue, 25 Jan 2022 20:06:49 +0100 > Fabrice Fontaine wrote: > > > Support for old 32-bit ARM boards (i.e. ARMv5, ARMv6, ARMv7a) without > > virtualization has been dropped since > > https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 > > resulting in the following build failure since bump to version 0.3.1 in > > commit c4f8b8968770ecbf6444a5921c6472f126717626: > > > > *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v6-defconfig"! > > > > *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-0/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v7-defconfig"! > > > > Fixes: > > - http://autobuild.buildroot.org/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b > > - http://autobuild.buildroot.org/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/xvisor/Config.in | 6 +----- > > package/xvisor/xvisor.mk | 2 +- > > 2 files changed, 2 insertions(+), 6 deletions(-) > > I think this is based on a misunderstanding of the > https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 > commit. This commit says that they remove support for "ARM32 without > virtualization support", but there are ARM32 cores with virtualization > support! As explained in the commit log, the ARM32 cores that support > the ARMv7ve instruction set are still supported by Xvisor. > > This means that Cortex-A7, Cortex-A12, Cortex-A15 and Cortex-A17, which > are all ARM32 cores, are still supported by Xvisor. So this patch > entirely dropping ARM32 from Xvisor isn't entirely correct. > > So, the change should be more like this: > > config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS > bool > depends on BR2_USE_MMU > default y if BR2_aarch64 > default y if BR2_x86_64 > default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17 > > config BR2_PACKAGE_XVISOR_DEFCONFIG > string "Defconfig name" > - default "generic-v5" if BR2_ARM_CPU_ARMV5 > - default "generic-v6" if BR2_ARM_CPU_ARMV6 > - default "generic-v7" if BR2_ARM_CPU_ARMV7A > + default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A > default "generic-v8" if BR2_aarch64 > default "x86_64_generic" if BR2_x86_64 > > What do you think ? You have more knowledge than me on ARM32. I'll send a v2 of the serie. > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice From romain.naour at smile.fr Wed Jan 26 22:49:30 2022 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 26 Jan 2022 23:49:30 +0100 Subject: [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor In-Reply-To: <87lez2it1f.fsf@dell.be.48ers.dk> References: <20211230135621.2255847-1-romain.naour@gmail.com> <20211230135621.2255847-7-romain.naour@gmail.com> <87lez2it1f.fsf@dell.be.48ers.dk> Message-ID: Peter, Le 26/01/2022 ? 13:24, Peter Korsgaard a ?crit?: >>>>>> "Romain" == Romain Naour writes: > > > Fixes: > > radeon_present.c: In function ?radeon_present_check_flip?: > > radeon_present.c:281:21: error: invalid use of undefined type ?struct radeon_pixmap? > > 281 | if (priv && priv->fb_failed) > > | ^~ > > > Signed-off-by: Romain Naour > > Cc: Bernd Kuhls > > Is this only needed for xserver 21.x or does it also need to be > backported to 2021.02.x / 2021.11.x? > I haven't tried with previous xserver release but I don't think it's related to the xserver version. The issue has been introduced with xf86-video-ati-19.1.0 [1] which is available in Buildroot since 2019.11. [1] https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=33803c85f761d343aa7300311b8e9489b1a89495 Best regards, Romain From alistair23 at gmail.com Wed Jan 26 22:49:39 2022 From: alistair23 at gmail.com (Alistair Francis) Date: Thu, 27 Jan 2022 08:49:39 +1000 Subject: [Buildroot] [PATCH 2/2] package/xvisor: add riscv support In-Reply-To: <20220125190650.107677-2-fontaine.fabrice@gmail.com> References: <20220125190650.107677-1-fontaine.fabrice@gmail.com> <20220125190650.107677-2-fontaine.fabrice@gmail.com> Message-ID: On Wed, Jan 26, 2022 at 5:09 AM Fabrice Fontaine wrote: > > riscv is supported since version 0.3.0 and > https://github.com/xvisor/xvisor/commit/d6feda4e80eefd372294b081111ce709d08ee4c0 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Alistair Francis Alistair > --- > package/xvisor/Config.in | 4 +++- > package/xvisor/xvisor.mk | 2 ++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in > index 55c43e6959..4e7a3e1b53 100644 > --- a/package/xvisor/Config.in > +++ b/package/xvisor/Config.in > @@ -2,7 +2,7 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS > bool > default y > depends on BR2_USE_MMU > - depends on BR2_aarch64 || BR2_x86_64 > + depends on BR2_aarch64 || BR2_riscv || BR2_x86_64 > > menuconfig BR2_PACKAGE_XVISOR > bool "xvisor" > @@ -32,6 +32,8 @@ endchoice > config BR2_PACKAGE_XVISOR_DEFCONFIG > string "Defconfig name" > default "generic-v8" if BR2_aarch64 > + default "generic-32b" if BR2_RISCV_32 > + default "generic-64b" if BR2_RISCV_64 > default "x86_64_generic" if BR2_x86_64 > depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG > help > diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk > index 4ceb5ed7cb..1a7b49e689 100644 > --- a/package/xvisor/xvisor.mk > +++ b/package/xvisor/xvisor.mk > @@ -32,6 +32,8 @@ ifeq ($(BR2_x86_64),y) > XVISOR_ARCH = x86 > else ifeq ($(BR2_aarch64),y) > XVISOR_ARCH = arm > +else ifeq ($(BR2_riscv),y) > +XVISOR_ARCH = riscv > endif > > ifeq ($(BR2_PACKAGE_XVISOR)$(BR_BUILDING),yy) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Wed Jan 26 22:51:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 23:51:58 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/xvisor: drop ARM32 without virtualization support Message-ID: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> Support for old 32-bit ARM boards (i.e. ARMv5, ARMv6, ARMv7a) without virtualization has been dropped since https://github.com/xvisor/xvisor/commit/9fcd69692484e0f6aa5036c27196f55c797582c5 resulting in the following build failure since bump to version 0.3.1 in commit c4f8b8968770ecbf6444a5921c6472f126717626: *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v6-defconfig"! *** Can't find default configuration "/home/giuliobenetti/autobuild/run/instance-0/output-1/build/xvisor-0.3.1/arch/arm/configs/generic-v7-defconfig"! As spotted by Thomas Petazzoni in https://patchwork.ozlabs.org/project/buildroot/patch/20220125190650.107677-1-fontaine.fabrice at gmail.com, "ARM32 cores that support the ARMv7ve instruction set are still supported by Xvisor. This means that Cortex-A7, Cortex-A12, Cortex-A15 and Cortex-A17, which are all ARM32 cores, are still supported" Fixes: - http://autobuild.buildroot.org/results/1211bf6ff10c75815fa3ac320532fab5fe649a2b - http://autobuild.buildroot.org/results/2bcbbb270df71d2489b7bc83e56c898c58cc90d2 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Keep ARM32 with virtualization package/xvisor/Config.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index eb7475b86d..71628e633e 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool - default y + default y if BR2_aarch64 + default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17 + default y if BR2_x86_64 depends on BR2_USE_MMU - depends on BR2_arm || BR2_aarch64 || BR2_x86_64 - depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV7M menuconfig BR2_PACKAGE_XVISOR bool "xvisor" @@ -32,9 +32,7 @@ endchoice config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" - default "generic-v5" if BR2_ARM_CPU_ARMV5 - default "generic-v6" if BR2_ARM_CPU_ARMV6 - default "generic-v7" if BR2_ARM_CPU_ARMV7A + default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A default "generic-v8" if BR2_aarch64 default "x86_64_generic" if BR2_x86_64 depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG -- 2.34.1 From fontaine.fabrice at gmail.com Wed Jan 26 22:51:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 26 Jan 2022 23:51:59 +0100 Subject: [Buildroot] [PATCH v2,2/2] package/xvisor: add riscv support In-Reply-To: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> References: <20220126225159.1567622-1-fontaine.fabrice@gmail.com> Message-ID: <20220126225159.1567622-2-fontaine.fabrice@gmail.com> riscv is supported since version 0.3.0 and https://github.com/xvisor/xvisor/commit/d6feda4e80eefd372294b081111ce709d08ee4c0 Signed-off-by: Fabrice Fontaine Reviewed-by: Alistair Francis --- package/xvisor/Config.in | 3 +++ package/xvisor/xvisor.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index 71628e633e..1eb50c8abe 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17 + default y if BR2_riscv default y if BR2_x86_64 depends on BR2_USE_MMU @@ -34,6 +35,8 @@ config BR2_PACKAGE_XVISOR_DEFCONFIG string "Defconfig name" default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A default "generic-v8" if BR2_aarch64 + default "generic-32b" if BR2_RISCV_32 + default "generic-64b" if BR2_RISCV_64 default "x86_64_generic" if BR2_x86_64 depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG help diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index dc49258400..d7bb288ea8 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -32,6 +32,8 @@ ifeq ($(BR2_x86_64),y) XVISOR_ARCH = x86 else ifeq ($(BR2_arm)$(BR2_aarch64),y) XVISOR_ARCH = arm +else ifeq ($(BR2_riscv),y) +XVISOR_ARCH = riscv endif ifeq ($(BR2_PACKAGE_XVISOR)$(BR_BUILDING),yy) -- 2.34.1 From petr.vorel at gmail.com Wed Jan 26 23:00:14 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Jan 2022 00:00:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/ltp-testsuite: bump version to 20220121 Message-ID: <20220126230014.15420-1-petr.vorel@gmail.com> LTP now builds metadata directory as host target. It's mandatory, therefore adding HOST_CFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc). Drop patches from this release. Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it). Signed-off-by: Petr Vorel --- ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++-------- .../0002-lib-fix-MemAvailable-parsing.patch | 36 ----------- ...-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------ ...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ------------------ ...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 ------------------- package/ltp-testsuite/ltp-testsuite.hash | 6 +- package/ltp-testsuite/ltp-testsuite.mk | 4 +- 7 files changed, 23 insertions(+), 223 deletions(-) delete mode 100644 package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch delete mode 100644 package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch delete mode 100644 package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch delete mode 100644 package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch diff --git a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch index a167d938e1..2ceba64ed5 100644 --- a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +++ b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch @@ -1,4 +1,4 @@ -From bee452dfa2a34ba7df7db677e5673cbdcd23f61e Mon Sep 17 00:00:00 2001 +From f34c6ca3d543968e900d6327d8b5900db63f08ad Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Thu, 1 Oct 2020 23:28:39 +0200 Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc @@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h new file mode 100644 -index 000000000..d0e0e93d7 +index 0000000000..d0e0e93d7f --- /dev/null +++ b/include/lapi/sysinfo.h @@ -0,0 +1,22 @@ @@ -83,7 +83,7 @@ index 000000000..d0e0e93d7 + +#endif /* SYSINFO_H__ */ diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h -index d99441c86..0d26e9d45 100644 +index d99441c86f..0d26e9d455 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -12,7 +12,7 @@ @@ -96,44 +96,33 @@ index d99441c86..0d26e9d45 100644 #include #include diff --git a/lib/safe_macros.c b/lib/safe_macros.c -index a5b6bc504..20d01d304 100644 +index a5b6bc5047..87d922a928 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c -@@ -11,7 +11,6 @@ +@@ -11,7 +11,7 @@ #include #include #include -#include ++#include "lapi/sysinfo.h" #include #include #include -@@ -23,6 +22,7 @@ - #include - #include "test.h" - #include "safe_macros.h" -+#include "lapi/sysinfo.h" - - char *safe_basename(const char *file, const int lineno, - void (*cleanup_fn) (void), char *path) diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index 69077861f..ae1cad29b 100644 +index 4a49747613..000688f5a3 100644 --- a/lib/tst_memutils.c +++ b/lib/tst_memutils.c -@@ -5,11 +5,11 @@ - +@@ -6,7 +6,7 @@ + #include #include #include -#include ++#include "lapi/sysinfo.h" #include #define TST_NO_DEFAULT_MAIN - #include "tst_test.h" -+#include "lapi/sysinfo.h" - - #define BLOCKSIZE (16 * 1024 * 1024) - diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c -index 9676ea4b5..33b2ac822 100644 +index 20cb95191d..3462dc3f82 100644 --- a/testcases/kernel/mem/mtest01/mtest01.c +++ b/testcases/kernel/mem/mtest01/mtest01.c @@ -20,7 +20,6 @@ @@ -153,7 +142,7 @@ index 9676ea4b5..33b2ac822 100644 #define FIVE_HUNDRED_MB (500ULL*1024*1024) diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c -index 263b8e78b..4fa52e6ea 100644 +index 263b8e78bf..4fa52e6eae 100644 --- a/testcases/kernel/syscalls/madvise/madvise06.c +++ b/testcases/kernel/syscalls/madvise/madvise06.c @@ -46,7 +46,7 @@ @@ -166,7 +155,7 @@ index 263b8e78b..4fa52e6ea 100644 #include "tst_cgroup.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c -index 2ea44a2be..a237345ef 100644 +index 2ea44a2beb..a237345ef7 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c @@ -69,7 +69,7 @@ @@ -179,7 +168,7 @@ index 2ea44a2be..a237345ef 100644 #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c -index 7ad0e8bdc..61fa1ab75 100644 +index 7ad0e8bdcf..61fa1ab757 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c @@ -65,7 +65,7 @@ @@ -192,7 +181,7 @@ index 7ad0e8bdc..61fa1ab75 100644 #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c -index af7cb6421..dc5ae65e3 100644 +index af7cb6421e..dc5ae65e35 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c @@ -13,7 +13,7 @@ @@ -205,7 +194,7 @@ index af7cb6421..dc5ae65e3 100644 #include "lapi/posix_clocks.h" #include "tst_test.h" diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -index 22e7c3638..572701f9f 100644 +index 22e7c36386..572701f9fd 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c @@ -43,7 +43,7 @@ @@ -218,5 +207,5 @@ index 22e7c3638..572701f9f 100644 #include "../testfrmw/testfrmw.h" -- -2.33.0 +2.34.1 diff --git a/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch b/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch deleted file mode 100644 index 4a9a5b2363..0000000000 --- a/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001 -From: Ralph Siemsen -Date: Mon, 27 Sep 2021 22:18:50 -0400 -Subject: [PATCH] lib: fix MemAvailable parsing - -The amount of available memory was not being returned correctly, which -resulted in tests being executed when they should have been skipped. - -Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable") -Signed-off-by: Ralph Siemsen -Signed-off-by: Li Wang -Signed-off-by: Petr Vorel -[ upstream status: e42149e28 ("lib: fix MemAvailable parsing") ] ---- - lib/tst_memutils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index ae1cad29b..a46de78f5 100644 ---- a/lib/tst_memutils.c -+++ b/lib/tst_memutils.c -@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar) - - long long tst_available_mem(void) - { -- long long mem_available; -+ unsigned long long mem_available = 0; - -- if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld", -+ if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu", - &mem_available)) { - mem_available = SAFE_READ_MEMINFO("MemFree:") - + SAFE_READ_MEMINFO("Cached:"); --- -2.33.0 - diff --git a/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch b/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch deleted file mode 100644 index 056c769feb..0000000000 --- a/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:38:42 +0200 -Subject: [PATCH] lapi/rtnetlink.h: Fix include guards - -Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS") - -Signed-off-by: Petr Vorel -[ upstream status: a2a212cf8 ("lapi/rtnetlink.h: Fix include guards") ] ---- - include/lapi/rtnetlink.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h -index 8a1b5385b..04e9ad51a 100644 ---- a/include/lapi/rtnetlink.h -+++ b/include/lapi/rtnetlink.h -@@ -1,8 +1,8 @@ - // SPDX-License-Identifier: GPL-2.0-or-later - /* Copyright (c) 2021 Petr Vorel */ - --#ifndef LAPI_IF_ADDR_H__ --# define LAPI_IF_ADDR_H__ -+#ifndef LAPI_RTNETLINK_H__ -+# define LAPI_RTNETLINK_H__ - - #include - -@@ -10,4 +10,4 @@ - # define IFA_FLAGS 8 - #endif - --#endif /* LAPI_IF_ADDR_H__ */ -+#endif /* LAPI_RTNETLINK_H__ */ --- -2.33.0 - diff --git a/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch b/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch deleted file mode 100644 index 4044636e63..0000000000 --- a/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch +++ /dev/null @@ -1,58 +0,0 @@ -From b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:37:19 +0200 -Subject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h - -There will be fix in next commit for missing IFA_F_NOPREFIXROUTE which -requires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h, -as it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just -like includes . - -Signed-off-by: Petr Vorel -[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-3-petr.vorel at gmail.com/T/#u ] ---- - include/lapi/if_addr.h | 16 ++++++++++++++++ - include/lapi/rtnetlink.h | 5 +---- - 2 files changed, 17 insertions(+), 4 deletions(-) - create mode 100644 include/lapi/if_addr.h - -diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h -new file mode 100644 -index 000000000..4e50a0a4e ---- /dev/null -+++ b/include/lapi/if_addr.h -@@ -0,0 +1,16 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later -+/* -+ * Copyright (c) 2021 Petr Vorel -+ */ -+ -+#ifndef LAPI_IF_ADDR_H__ -+#define LAPI_IF_ADDR_H__ -+ -+#include -+ -+#ifndef IFA_FLAGS -+# define IFA_FLAGS 8 -+#endif -+ -+ -+#endif /* LAPI_IF_ADDR_H__ */ -diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h -index 04e9ad51a..089bf1a0d 100644 ---- a/include/lapi/rtnetlink.h -+++ b/include/lapi/rtnetlink.h -@@ -5,9 +5,6 @@ - # define LAPI_RTNETLINK_H__ - - #include -- --#ifndef IFA_FLAGS --# define IFA_FLAGS 8 --#endif -+#include "lapi/if_addr.h" - - #endif /* LAPI_RTNETLINK_H__ */ --- -2.33.0 - diff --git a/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch b/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch deleted file mode 100644 index b54e052992..0000000000 --- a/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 9e357fb4fc00ab9c303e314b85b9ae3836141f81 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:56:29 +0200 -Subject: [PATCH] lapi/if_addr.h: Define IFA_FLAGS - -and use it in icmp_rate_limit01.c. - -This fixes error on toolchains with very old kernel headers, e.g. -Buildroot sourcery-arm: - -icmp_rate_limit01.c:82:3: error: 'IFA_F_NOPREFIXROUTE' undeclared (first use in this function) - IFA_F_NOPREFIXROUTE); - -Fixed because IFA_F_NOPREFIXROUTE was added in 3.14 and the oldest -system we still support is Cent0S 7 with 3.10 kernel. - -NOTE: Cent0S 7 is obviously heavily patched thus it contains -IFA_F_NOPREFIXROUTE and therefore CI build didn't catch this error. - -Signed-off-by: Petr Vorel -[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-4-petr.vorel at gmail.com/T/#u ] ---- - include/lapi/if_addr.h | 3 +++ - testcases/cve/icmp_rate_limit01.c | 3 ++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h -index 4e50a0a4e..0f7e44784 100644 ---- a/include/lapi/if_addr.h -+++ b/include/lapi/if_addr.h -@@ -12,5 +12,8 @@ - # define IFA_FLAGS 8 - #endif - -+#ifndef IFA_F_NOPREFIXROUTE -+# define IFA_F_NOPREFIXROUTE 0x200 -+#endif - - #endif /* LAPI_IF_ADDR_H__ */ -diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c -index b3a237b30..3ada32675 100644 ---- a/testcases/cve/icmp_rate_limit01.c -+++ b/testcases/cve/icmp_rate_limit01.c -@@ -27,11 +27,12 @@ - #include - #include - #include --#include - #include - - #include - #include -+ -+#include "lapi/if_addr.h" - #include "tst_test.h" - #include "tst_netdevice.h" - --- -2.33.0 - diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index a9f3cfdfe1..bd648cbfdd 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,5 +1,5 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1 -sha1 dad7737f609e358c4060cb446b9cae5c026fc137 ltp-full-20210927.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1 +sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15 ltp-full-20210927.tar.xz +sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index cc6d3c63b6..bc1497e940 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20210927 +LTP_TESTSUITE_VERSION = 20220121 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) @@ -70,6 +70,8 @@ LTP_TESTSUITE_CONF_ENV += \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" +LTP_TESTSUITE_MAKE_ENV += HOST_CFLAGS="$(HOST_CFLAGS)" + # uclibc: bessel support normally not enabled LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ testcases/misc/math/float/bessel/ \ -- 2.34.1 From petr.vorel at gmail.com Wed Jan 26 23:56:52 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Jan 2022 00:56:52 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 Message-ID: <20220126235652.25712-1-petr.vorel@gmail.com> LTP now builds metadata directory as host target. It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc). Drop patches from this release. Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it). Signed-off-by: Petr Vorel --- Changes v1->v2: * Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc when compiling host target) Kind regards, Petr ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++-------- .../0002-lib-fix-MemAvailable-parsing.patch | 36 ----------- ...-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------ ...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ------------------ ...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 ------------------- package/ltp-testsuite/ltp-testsuite.hash | 6 +- package/ltp-testsuite/ltp-testsuite.mk | 6 +- 7 files changed, 25 insertions(+), 223 deletions(-) delete mode 100644 package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch delete mode 100644 package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch delete mode 100644 package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch delete mode 100644 package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch diff --git a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch index a167d938e1..2ceba64ed5 100644 --- a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +++ b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch @@ -1,4 +1,4 @@ -From bee452dfa2a34ba7df7db677e5673cbdcd23f61e Mon Sep 17 00:00:00 2001 +From f34c6ca3d543968e900d6327d8b5900db63f08ad Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Thu, 1 Oct 2020 23:28:39 +0200 Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc @@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h new file mode 100644 -index 000000000..d0e0e93d7 +index 0000000000..d0e0e93d7f --- /dev/null +++ b/include/lapi/sysinfo.h @@ -0,0 +1,22 @@ @@ -83,7 +83,7 @@ index 000000000..d0e0e93d7 + +#endif /* SYSINFO_H__ */ diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h -index d99441c86..0d26e9d45 100644 +index d99441c86f..0d26e9d455 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -12,7 +12,7 @@ @@ -96,44 +96,33 @@ index d99441c86..0d26e9d45 100644 #include #include diff --git a/lib/safe_macros.c b/lib/safe_macros.c -index a5b6bc504..20d01d304 100644 +index a5b6bc5047..87d922a928 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c -@@ -11,7 +11,6 @@ +@@ -11,7 +11,7 @@ #include #include #include -#include ++#include "lapi/sysinfo.h" #include #include #include -@@ -23,6 +22,7 @@ - #include - #include "test.h" - #include "safe_macros.h" -+#include "lapi/sysinfo.h" - - char *safe_basename(const char *file, const int lineno, - void (*cleanup_fn) (void), char *path) diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index 69077861f..ae1cad29b 100644 +index 4a49747613..000688f5a3 100644 --- a/lib/tst_memutils.c +++ b/lib/tst_memutils.c -@@ -5,11 +5,11 @@ - +@@ -6,7 +6,7 @@ + #include #include #include -#include ++#include "lapi/sysinfo.h" #include #define TST_NO_DEFAULT_MAIN - #include "tst_test.h" -+#include "lapi/sysinfo.h" - - #define BLOCKSIZE (16 * 1024 * 1024) - diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c -index 9676ea4b5..33b2ac822 100644 +index 20cb95191d..3462dc3f82 100644 --- a/testcases/kernel/mem/mtest01/mtest01.c +++ b/testcases/kernel/mem/mtest01/mtest01.c @@ -20,7 +20,6 @@ @@ -153,7 +142,7 @@ index 9676ea4b5..33b2ac822 100644 #define FIVE_HUNDRED_MB (500ULL*1024*1024) diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c -index 263b8e78b..4fa52e6ea 100644 +index 263b8e78bf..4fa52e6eae 100644 --- a/testcases/kernel/syscalls/madvise/madvise06.c +++ b/testcases/kernel/syscalls/madvise/madvise06.c @@ -46,7 +46,7 @@ @@ -166,7 +155,7 @@ index 263b8e78b..4fa52e6ea 100644 #include "tst_cgroup.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c -index 2ea44a2be..a237345ef 100644 +index 2ea44a2beb..a237345ef7 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c @@ -69,7 +69,7 @@ @@ -179,7 +168,7 @@ index 2ea44a2be..a237345ef 100644 #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c -index 7ad0e8bdc..61fa1ab75 100644 +index 7ad0e8bdcf..61fa1ab757 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c @@ -65,7 +65,7 @@ @@ -192,7 +181,7 @@ index 7ad0e8bdc..61fa1ab75 100644 #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c -index af7cb6421..dc5ae65e3 100644 +index af7cb6421e..dc5ae65e35 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c @@ -13,7 +13,7 @@ @@ -205,7 +194,7 @@ index af7cb6421..dc5ae65e3 100644 #include "lapi/posix_clocks.h" #include "tst_test.h" diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -index 22e7c3638..572701f9f 100644 +index 22e7c36386..572701f9fd 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c @@ -43,7 +43,7 @@ @@ -218,5 +207,5 @@ index 22e7c3638..572701f9f 100644 #include "../testfrmw/testfrmw.h" -- -2.33.0 +2.34.1 diff --git a/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch b/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch deleted file mode 100644 index 4a9a5b2363..0000000000 --- a/package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001 -From: Ralph Siemsen -Date: Mon, 27 Sep 2021 22:18:50 -0400 -Subject: [PATCH] lib: fix MemAvailable parsing - -The amount of available memory was not being returned correctly, which -resulted in tests being executed when they should have been skipped. - -Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable") -Signed-off-by: Ralph Siemsen -Signed-off-by: Li Wang -Signed-off-by: Petr Vorel -[ upstream status: e42149e28 ("lib: fix MemAvailable parsing") ] ---- - lib/tst_memutils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index ae1cad29b..a46de78f5 100644 ---- a/lib/tst_memutils.c -+++ b/lib/tst_memutils.c -@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar) - - long long tst_available_mem(void) - { -- long long mem_available; -+ unsigned long long mem_available = 0; - -- if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld", -+ if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu", - &mem_available)) { - mem_available = SAFE_READ_MEMINFO("MemFree:") - + SAFE_READ_MEMINFO("Cached:"); --- -2.33.0 - diff --git a/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch b/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch deleted file mode 100644 index 056c769feb..0000000000 --- a/package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:38:42 +0200 -Subject: [PATCH] lapi/rtnetlink.h: Fix include guards - -Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS") - -Signed-off-by: Petr Vorel -[ upstream status: a2a212cf8 ("lapi/rtnetlink.h: Fix include guards") ] ---- - include/lapi/rtnetlink.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h -index 8a1b5385b..04e9ad51a 100644 ---- a/include/lapi/rtnetlink.h -+++ b/include/lapi/rtnetlink.h -@@ -1,8 +1,8 @@ - // SPDX-License-Identifier: GPL-2.0-or-later - /* Copyright (c) 2021 Petr Vorel */ - --#ifndef LAPI_IF_ADDR_H__ --# define LAPI_IF_ADDR_H__ -+#ifndef LAPI_RTNETLINK_H__ -+# define LAPI_RTNETLINK_H__ - - #include - -@@ -10,4 +10,4 @@ - # define IFA_FLAGS 8 - #endif - --#endif /* LAPI_IF_ADDR_H__ */ -+#endif /* LAPI_RTNETLINK_H__ */ --- -2.33.0 - diff --git a/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch b/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch deleted file mode 100644 index 4044636e63..0000000000 --- a/package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch +++ /dev/null @@ -1,58 +0,0 @@ -From b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:37:19 +0200 -Subject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h - -There will be fix in next commit for missing IFA_F_NOPREFIXROUTE which -requires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h, -as it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just -like includes . - -Signed-off-by: Petr Vorel -[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-3-petr.vorel at gmail.com/T/#u ] ---- - include/lapi/if_addr.h | 16 ++++++++++++++++ - include/lapi/rtnetlink.h | 5 +---- - 2 files changed, 17 insertions(+), 4 deletions(-) - create mode 100644 include/lapi/if_addr.h - -diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h -new file mode 100644 -index 000000000..4e50a0a4e ---- /dev/null -+++ b/include/lapi/if_addr.h -@@ -0,0 +1,16 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later -+/* -+ * Copyright (c) 2021 Petr Vorel -+ */ -+ -+#ifndef LAPI_IF_ADDR_H__ -+#define LAPI_IF_ADDR_H__ -+ -+#include -+ -+#ifndef IFA_FLAGS -+# define IFA_FLAGS 8 -+#endif -+ -+ -+#endif /* LAPI_IF_ADDR_H__ */ -diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h -index 04e9ad51a..089bf1a0d 100644 ---- a/include/lapi/rtnetlink.h -+++ b/include/lapi/rtnetlink.h -@@ -5,9 +5,6 @@ - # define LAPI_RTNETLINK_H__ - - #include -- --#ifndef IFA_FLAGS --# define IFA_FLAGS 8 --#endif -+#include "lapi/if_addr.h" - - #endif /* LAPI_RTNETLINK_H__ */ --- -2.33.0 - diff --git a/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch b/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch deleted file mode 100644 index b54e052992..0000000000 --- a/package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 9e357fb4fc00ab9c303e314b85b9ae3836141f81 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 29 Sep 2021 19:56:29 +0200 -Subject: [PATCH] lapi/if_addr.h: Define IFA_FLAGS - -and use it in icmp_rate_limit01.c. - -This fixes error on toolchains with very old kernel headers, e.g. -Buildroot sourcery-arm: - -icmp_rate_limit01.c:82:3: error: 'IFA_F_NOPREFIXROUTE' undeclared (first use in this function) - IFA_F_NOPREFIXROUTE); - -Fixed because IFA_F_NOPREFIXROUTE was added in 3.14 and the oldest -system we still support is Cent0S 7 with 3.10 kernel. - -NOTE: Cent0S 7 is obviously heavily patched thus it contains -IFA_F_NOPREFIXROUTE and therefore CI build didn't catch this error. - -Signed-off-by: Petr Vorel -[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-4-petr.vorel at gmail.com/T/#u ] ---- - include/lapi/if_addr.h | 3 +++ - testcases/cve/icmp_rate_limit01.c | 3 ++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h -index 4e50a0a4e..0f7e44784 100644 ---- a/include/lapi/if_addr.h -+++ b/include/lapi/if_addr.h -@@ -12,5 +12,8 @@ - # define IFA_FLAGS 8 - #endif - -+#ifndef IFA_F_NOPREFIXROUTE -+# define IFA_F_NOPREFIXROUTE 0x200 -+#endif - - #endif /* LAPI_IF_ADDR_H__ */ -diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c -index b3a237b30..3ada32675 100644 ---- a/testcases/cve/icmp_rate_limit01.c -+++ b/testcases/cve/icmp_rate_limit01.c -@@ -27,11 +27,12 @@ - #include - #include - #include --#include - #include - - #include - #include -+ -+#include "lapi/if_addr.h" - #include "tst_test.h" - #include "tst_netdevice.h" - --- -2.33.0 - diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index a9f3cfdfe1..bd648cbfdd 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,5 +1,5 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1 -sha1 dad7737f609e358c4060cb446b9cae5c026fc137 ltp-full-20210927.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1 +sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15 ltp-full-20210927.tar.xz +sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index cc6d3c63b6..d9b7133b07 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20210927 +LTP_TESTSUITE_VERSION = 20220121 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) @@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" +LTP_TESTSUITE_MAKE_ENV += \ + HOST_CFLAGS="$(HOST_CFLAGS)" \ + HOST_LDFLAGS="$(HOST_LDFLAGS)" + # uclibc: bessel support normally not enabled LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ testcases/misc/math/float/bessel/ \ -- 2.34.1 From christian at paral.in Thu Jan 27 03:40:17 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 19:40:17 -0800 Subject: [Buildroot] [PATCH 1/1] package/buildah: new package Message-ID: <20220127034017.91761-1-christian@paral.in> Adds both host and target packages for buildah. Buildah is a tool that facilitates building OCI images. https://github.com/containers/buildah Signed-off-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/Config.in.host | 1 + package/buildah/Config.in | 21 ++++++++++++++++++ package/buildah/Config.in.host | 7 ++++++ package/buildah/buildah.hash | 3 +++ package/buildah/buildah.mk | 39 ++++++++++++++++++++++++++++++++++ 7 files changed, 73 insertions(+) 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 fe8de1916e..80e7c5abee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -529,6 +529,7 @@ F: package/python-pylibftdi/ N: Christian Stewart F: package/batman-adv/ +F: package/buildah/ F: package/containerd/ F: package/delve/ F: package/docker-cli/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..91eb66a454 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2523,6 +2523,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/containerd/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..d2e59388ae 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -7,6 +7,7 @@ menu "Host utilities" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/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/Config.in b/package/buildah/Config.in new file mode 100644 index 0000000000..f4378be679 --- /dev/null +++ b/package/buildah/Config.in @@ -0,0 +1,21 @@ +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 + depends on BR2_USE_MMU # libgpgme -> libassuan + # gnupg is 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 + help + Buildah is a tool that facilitates building OCI images. + + https://github.com/containers/buildah + +comment "buildah needs a toolchain w/ threads" + 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 diff --git a/package/buildah/Config.in.host b/package/buildah/Config.in.host new file mode 100644 index 0000000000..ca294e6f92 --- /dev/null +++ b/package/buildah/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_BUILDAH + bool "buildah" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + 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..c7e00d02a7 --- /dev/null +++ b/package/buildah/buildah.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d99b5187a25bc9d7385408732a0e155df0458b4d2cea6e8d002f3fa2cbaac76f buildah-1.24.0.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk new file mode 100644 index 0000000000..87eed8b834 --- /dev/null +++ b/package/buildah/buildah.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# buildah +# +################################################################################ + +BUILDAH_VERSION = 1.24.0 +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)) + +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)) -- 2.35.0 From christian at paral.in Thu Jan 27 04:02:49 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 20:02:49 -0800 Subject: [Buildroot] [PATCH v2 1/2] package/runc: add host package Message-ID: <20220127040250.128604-1-christian@paral.in> Adds support for building runc as a host package. The bin name and gomod have to be specified as the pkg-golang infrastructure assumes the bin name will be "host-runc" on default. Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/runc/Config.in.host | 8 ++++++++ package/runc/runc.mk | 8 ++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/runc/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..2ce015eacf 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -81,6 +81,7 @@ menu "Host utilities" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" source "package/riscv-isa-sim/Config.in.host" + source "package/runc/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host new file mode 100644 index 0000000000..ce0dd518a6 --- /dev/null +++ b/package/runc/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_RUNC + bool "host runc" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + runC is a CLI tool for spawning and running containers + according to the OCP specification. + + https://github.com/opencontainers/runc diff --git a/package/runc/runc.mk b/package/runc/runc.mk index c4e45a00a9..932bf39eea 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -10,6 +10,8 @@ RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE RUNC_CPE_ID_VENDOR = linuxfoundation +RUNC_GOMOD = github.com/opencontainers/runc + RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build @@ -23,4 +25,10 @@ RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif +HOST_RUNC_BIN_NAME = runc +HOST_RUNC_LDFLAGS = $(RUNC_LDFLAGS) +HOST_RUNC_TAGS = $(RUNC_TAGS) +HOST_RUNC_INSTALL_BINS = $(HOST_RUNC_BIN_NAME) + $(eval $(golang-package)) +$(eval $(host-golang-package)) -- 2.35.0 From christian at paral.in Thu Jan 27 04:02:50 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 20:02:50 -0800 Subject: [Buildroot] [PATCH v2 2/2] package/buildah: new package In-Reply-To: <20220127040250.128604-1-christian@paral.in> References: <20220127040250.128604-1-christian@paral.in> Message-ID: <20220127040250.128604-2-christian@paral.in> Adds both host and target packages for buildah. Buildah is a tool that facilitates building OCI images. https://github.com/containers/buildah Signed-off-by: Christian Stewart --- v1 -> v2: - add package to developers - add host runc dependency for host package - add libgpgme runtime dependency Signed-off-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/Config.in.host | 1 + package/buildah/Config.in | 23 ++++++++++++++++++++ package/buildah/Config.in.host | 8 +++++++ package/buildah/buildah.hash | 3 +++ package/buildah/buildah.mk | 39 ++++++++++++++++++++++++++++++++++ 7 files changed, 76 insertions(+) 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 fe8de1916e..80e7c5abee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -529,6 +529,7 @@ F: package/python-pylibftdi/ N: Christian Stewart F: package/batman-adv/ +F: package/buildah/ F: package/containerd/ F: package/delve/ F: package/docker-cli/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..91eb66a454 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2523,6 +2523,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/containerd/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 2ce015eacf..6aadb1b640 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -7,6 +7,7 @@ menu "Host utilities" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/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/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..c7e00d02a7 --- /dev/null +++ b/package/buildah/buildah.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d99b5187a25bc9d7385408732a0e155df0458b4d2cea6e8d002f3fa2cbaac76f buildah-1.24.0.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk new file mode 100644 index 0000000000..87eed8b834 --- /dev/null +++ b/package/buildah/buildah.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# buildah +# +################################################################################ + +BUILDAH_VERSION = 1.24.0 +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)) + +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)) -- 2.35.0 From baruch at tkos.co.il Thu Jan 27 05:39:23 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Thu, 27 Jan 2022 07:39:23 +0200 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 In-Reply-To: <20220126235652.25712-1-petr.vorel@gmail.com> References: <20220126235652.25712-1-petr.vorel@gmail.com> Message-ID: <87lez191e6.fsf@tarshish> Hi Petr, On Thu, Jan 27 2022, Petr Vorel wrote: > LTP now builds metadata directory as host target. > It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make > (adding to configure does not work) to avoid adding -mlongcalls > -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc). > > Drop patches from this release. > > Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch > (still safe to carry it). > > Signed-off-by: Petr Vorel > --- > Changes v1->v2: > * Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc > when compiling host target) [...] > diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash > index a9f3cfdfe1..bd648cbfdd 100644 > --- a/package/ltp-testsuite/ltp-testsuite.hash > +++ b/package/ltp-testsuite/ltp-testsuite.hash > @@ -1,5 +1,5 @@ > -# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1 > -sha1 dad7737f609e358c4060cb446b9cae5c026fc137 ltp-full-20210927.tar.xz > +# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1 > +sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz > # Locally computed > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > -sha256 779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15 ltp-full-20210927.tar.xz > +sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz > diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk > index cc6d3c63b6..d9b7133b07 100644 > --- a/package/ltp-testsuite/ltp-testsuite.mk > +++ b/package/ltp-testsuite/ltp-testsuite.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LTP_TESTSUITE_VERSION = 20210927 > +LTP_TESTSUITE_VERSION = 20220121 > LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz > LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) > > @@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \ > LIBS="$(LTP_TESTSUITE_LIBS)" \ > SYSROOT="$(STAGING_DIR)" > > +LTP_TESTSUITE_MAKE_ENV += \ > + HOST_CFLAGS="$(HOST_CFLAGS)" \ > + HOST_LDFLAGS="$(HOST_LDFLAGS)" I think you should have TARGET_* on the right side of the assignment, since this is a target package. baruch > + > # uclibc: bessel support normally not enabled > LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ > testcases/misc/math/float/bessel/ \ -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From christian at paral.in Thu Jan 27 06:25:03 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 22:25:03 -0800 Subject: [Buildroot] [PATCH v3 1/2] package/runc: add host package Message-ID: <20220127062504.1835450-1-christian@paral.in> Adds support for building runc as a host package. The bin name and gomod have to be specified as the pkg-golang infrastructure assumes the bin name will be "host-runc" on default. Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/runc/Config.in.host | 8 ++++++++ package/runc/runc.mk | 8 ++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/runc/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 341e24926b..2ce015eacf 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -81,6 +81,7 @@ menu "Host utilities" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" source "package/riscv-isa-sim/Config.in.host" + source "package/runc/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host new file mode 100644 index 0000000000..ce0dd518a6 --- /dev/null +++ b/package/runc/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_RUNC + bool "host runc" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + runC is a CLI tool for spawning and running containers + according to the OCP specification. + + https://github.com/opencontainers/runc diff --git a/package/runc/runc.mk b/package/runc/runc.mk index c4e45a00a9..932bf39eea 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -10,6 +10,8 @@ RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE RUNC_CPE_ID_VENDOR = linuxfoundation +RUNC_GOMOD = github.com/opencontainers/runc + RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build @@ -23,4 +25,10 @@ RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif +HOST_RUNC_BIN_NAME = runc +HOST_RUNC_LDFLAGS = $(RUNC_LDFLAGS) +HOST_RUNC_TAGS = $(RUNC_TAGS) +HOST_RUNC_INSTALL_BINS = $(HOST_RUNC_BIN_NAME) + $(eval $(golang-package)) +$(eval $(host-golang-package)) -- 2.35.0 From christian at paral.in Thu Jan 27 06:25:04 2022 From: christian at paral.in (Christian Stewart) Date: Wed, 26 Jan 2022 22:25:04 -0800 Subject: [Buildroot] [PATCH v3 2/2] package/buildah: new package In-Reply-To: <20220127062504.1835450-1-christian@paral.in> References: <20220127062504.1835450-1-christian@paral.in> Message-ID: <20220127062504.1835450-2-christian@paral.in> 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 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 fe8de1916e..80e7c5abee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -529,6 +529,7 @@ F: package/python-pylibftdi/ N: Christian Stewart F: package/batman-adv/ +F: package/buildah/ F: package/containerd/ F: package/delve/ F: package/docker-cli/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..91eb66a454 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2523,6 +2523,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/containerd/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 2ce015eacf..6aadb1b640 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -7,6 +7,7 @@ menu "Host utilities" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/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..c7e00d02a7 --- /dev/null +++ b/package/buildah/buildah.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d99b5187a25bc9d7385408732a0e155df0458b4d2cea6e8d002f3fa2cbaac76f buildah-1.24.0.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk new file mode 100644 index 0000000000..658d7ef56f --- /dev/null +++ b/package/buildah/buildah.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# buildah +# +################################################################################ + +BUILDAH_VERSION = 1.24.0 +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)) -- 2.35.0 From thomas.petazzoni at bootlin.com Thu Jan 27 07:08:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 27 Jan 2022 07:08:44 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-26 Message-ID: <20220127070849.936CC83386@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-01-26 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 57 | 8 | 1 | 66 | 2021.11.x | 23 | 2 | 0 | 25 | master | 86 | 42 | 0 | 128 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 7 rtorrent-0.9.8 | 6 bluez5_utils-5.63 | 3 frr-8.1 | 3 mongodb-4.2.11 | 3 gvfs-1.48.1 | 2 log4cxx-0.12.0 | 2 unknown | 2 wavemon-0.9.4 | 2 xvisor-0.3.1 | 2 efl-1.26.0 | 1 guile-3.0.7 | 1 kf5-kcoreaddons-5.47.0 | 1 libglvnd-1.3.2 | 1 mesa3d-21.3.4 | 1 nodejs-14.18.3 | 1 php-apcu-5.1.20 | 1 ruby-3.1.0 | 1 sg3_utils-1.47 | 1 suricata-6.0.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/034d3d7519596e36df6cf0ebc3e87e6b192b81d0 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/78c0705dba994b2c164f3367f458c98dec49a2d1 | mips | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/a434711259e269e1423523d0c5be6711385a2b85 | aarch64 | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/7e13979851926975b842f4c71379dbf81d012674 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/06c2ac8a1124011cf7d8e654bcb828af6db1f2ae | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/f2d89a5e45fcecb0b7d014767dfd182cae1e9f10 | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/4fe535c71fb37015fc99f3151a52e9b7641220d7 | powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/3db47d5f101e62942c8dce777a3929cf8f22eb1b | ORPH riscv64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/127999dd2ba3b1c3d39eae36a99b5c4a63a50422 | ORPH aarch64 | gvfs-1.48.1 | NOK | http://autobuild.buildroot.net/results/87d35c2635b0a9ef63b77c357701865236764d09 | ORPH or1k | kf5-kcoreaddons-5.47.0 | NOK | http://autobuild.buildroot.net/results/e6040c4d40cf234ee72e237fbd9c52682279d19c | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/9545f3127c862a7265c09153742dc5bff2272559 | ORPH riscv64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/8e2d33d8bc1739b29f8a230802d4591165a1a0fd | mips64el | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/7ee2a4bf27568acd91790f1283ccc066dcff46b8 | x86_64 | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/eba070b876c77c55f09c4d82f321e70c4cb7bdeb | x86_64 | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/88f6a03bce1b58af926d18011bf5449170eab2b3 | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/6ed9143a7012a574f067edd7c969f1c1d3d46d91 | arm | mongodb-4.2.11 | NOK | http://autobuild.buildroot.net/results/766b3faa902ef200121841bd5675506a4992b213 | arm | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/2c812e012d2b8552924d646c682713d9120e8100 | arm | php-apcu-5.1.20 | NOK | http://autobuild.buildroot.net/results/9816237b8c3465e4bee21a0377da47ca62c890bc | m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/a0dc157a54f95afa0d5c452a0fee22a94f9069ad | ORPH powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/6be860d79ffebe7021c3c927c7495720ea0e060e | ORPH xtensa | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/03c95c866f0b8c50e494489130207c8e73c77616 | ORPH sh4 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/142cdd994669313ff8ba4430512cecfa262a6750 | ORPH powerpc | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/269ede899ab28baf162cb153da91f567f050369e | ORPH x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/1325e438682e583614363e3e8c29aa89a1dddeb7 | ORPH riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/faebaad581aa673088bf89d1a14b431f08b35765 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6c48ab0803ceb130d7d5ef979e3aeb84e6f12f30 | sh4 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a458af58ded8c4cb517e40ee61f2052379684a14 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/bb87ff12e37bba83dbf71614d36de3f9e64a2089 | powerpc64le | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/417ff7a87e2b3c61c7cca037ac57286e1a987d43 | i686 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/54cce5841655d2bc9ee34ce460efbf59c7786be3 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/0238056e8c4577d63d810fc1ed3d1783354855b7 | m68k | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f8b1b57b52b75a6431fc37030ec64fdc0fe4c042 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/1e73576d1c22c54f4ea61ec663ca80de2f6bd3be | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/3d44543167319e99b1848a622925ce47cd4a9af0 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/17d26f8c18066f8290ba249f3c591e0a0a6753b7 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/11ca4ece89703ce9c4f283bcc1b975f56626202b | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/77dd568e94f275af476a9324f5288afc6282c791 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1cac8cf2a5956c273a73905eb14c97cb2b75c2d4 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/cd245e455299b91e204f07196f3f3169e4179772 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/3ba3bbc6cb558df75f2d79b15614ab650d09e9b6 | Classification of failures by reason for 2021.02.x -------------------------------------------------- apcupsd-3.14.14 | 1 host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 openal-1.20.1 | 1 poppler | 1 qt5webkit-5.9.1 | 1 rocksdb-6.13.3 | 1 uboot-tools-2020.04 | 1 unknown | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/1a16d6ce541a37f43846f274e41765bb1f413601 | powerpc | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/120ff6ff5342805b1320f27fd14974a763a4a71e | sh4 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/d432f159c7ebe7299b806de29d829f8ddf90d00e | or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/420448b66e8fe5f6d939d51db234d5b74d472da2 | nios2 | poppler | TIM | http://autobuild.buildroot.net/results/356fa066273a47c9a1344fa214e7e56b7d2a3187 | mipsel | qt5webkit-5.9.1 | NOK | http://autobuild.buildroot.net/results/1c232d49cddd291c442db823a2e4ed6df77f7a35 | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/a9d88f994d38bfe6fd027a2c9a82ec31a1b0a8fb | arm | uboot-tools-2020.04 | NOK | http://autobuild.buildroot.net/results/1a665b8fcdf9b42e7abe82e9c1034fb21790066d | m68k | unknown | NOK | http://autobuild.buildroot.net/results/6e01511da93de5a182a2d0a8f503165c0005f922 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/6bc5fd15805eebe43def686d377a1409dd548567 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/7d3ba65c101be258879678379480c97e6b213f4b | -- http://autobuild.buildroot.net From peter at korsgaard.com Thu Jan 27 07:12:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:12:18 +0100 Subject: [Buildroot] [git commit] package/sofia-sip: bump version to 1.13.6 In-Reply-To: <20220107232022.04480834E2@busybox.osuosl.org> (Peter Korsgaard's message of "Sat, 8 Jan 2022 00:26:21 +0100") References: <20220107232022.04480834E2@busybox.osuosl.org> Message-ID: <87czkdejot.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=30b2dbeae3930084634e126ead4e1e2930a58bad > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Needed to bump freeswitch to 1.10.7. > Signed-off-by: Bernd Kuhls > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:10:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:10:28 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/sofia-sip: don't set 'NDEBUG' explicitly Message-ID: <20220127070548.82A7C82862@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b326de0f793b6202a873aaf1fef5a3353f8d18d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x BR2_ENABLE_DEBUG should just steer the availability of debug symbols and should have no negative effect on performance. Introduction of 'assert' statements, 'debug'-type builds with additional logging, etc. should be steered by BR2_ENABLE_RUNTIME_DEBUG instead. The sofia-sip package was setting '--enable-ndebug' conditionally based on BR2_ENABLE_DEBUG, and this would have to be updated to be based on BR2_ENABLE_RUNTIME_DEBUG. However, the sofia-sip option '--enable-ndebug' only sets the 'NDEBUG' preprocessor macro, and the core package infrastructure already sets this macro correctly based on BR2_ENABLE_RUNTIME_DEBUG. This means that the explicit '--enable-ndebug' flag can be removed. Suggested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN (cherry picked from commit 0993954814e8f54c7fea5dcb6dff1cc2c3d3e780) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 274c72fce8..fb565637eb 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -30,8 +30,4 @@ SOFIA_SIP_CONF_OPTS += \ --without-openssl endif -ifeq ($(BR2_ENABLE_DEBUG),) -SOFIA_SIP_CONF_OPTS += --enable-ndebug -endif - $(eval $(autotools-package)) From peter at korsgaard.com Thu Jan 27 07:11:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:11:44 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/freeswitch: security bump version to 1.10.7 Message-ID: <20220127070548.A4F6282862@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69a02feb789d5517e4b81eb02f9ea3eb775824b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: - CVE-2021-41105: FreeSWITCH susceptible to Denial of Service via invalid SRTP packets When handling SRTP calls, FreeSWITCH is susceptible to a DoS where calls can be terminated by remote attackers. This attack can be done continuously, thus denying encrypted calls during the attack. https://github.com/signalwire/freeswitch/security/advisories/GHSA-jh42-prph-gp36 - CVE-2021-41157: FreeSWITCH does not authenticate SIP SUBSCRIBE requests by default By default, SIP requests of the type SUBSCRIBE are not authenticated in the affected versions of FreeSWITCH. https://github.com/signalwire/freeswitch/security/advisories/GHSA-g7xg-7c54-rmpj - CVE-2021-37624: FreeSWITCH does not authenticate SIP MESSAGE requests, leading to spam and message spoofing By default, SIP requests of the type MESSAGE (RFC 3428) are not authenticated in the affected versions of FreeSWITCH. MESSAGE requests are relayed to SIP user agents registered with the FreeSWITCH server without requiring any authentication. Although this behaviour can be changed by setting the auth-messages parameter to true, it is not the default setting. https://github.com/signalwire/freeswitch/security/advisories/GHSA-mjcm-q9h8-9xv3 - CVE-2021-41145: FreeSWITCH susceptible to Denial of Service via SIP flooding When flooding FreeSWITCH with SIP messages, it was observed that after a number of seconds the process was killed by the operating system due to memory exhaustion https://github.com/signalwire/freeswitch/security/advisories/GHSA-jvpq-23v4-gp3m - CVE-2021-41158: FreeSWITCH vulnerable to SIP digest leak for configured gateways An attacker can perform a SIP digest leak attack against FreeSWITCH and receive the challenge response of a gateway configured on the FreeSWITCH server. This is done by challenging FreeSWITCH's SIP requests with the realm set to that of the gateway, thus forcing FreeSWITCH to respond with the challenge response which is based on the password of that targeted gateway. https://github.com/signalwire/freeswitch/security/advisories/GHSA-3v3f-99mv-qvj4 Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 Removed patch, upstream applied a different fix: https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b Added optional dependency to libks, needed due to upstream commit https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 Added upstream patches to fix build errors. Signed-off-by: Bernd Kuhls [Peter: mention security fixes] Signed-off-by: Peter Korsgaard (cherry picked from commit 829777c1c9a0d40c8c5753e6fe86acfc78edfc92) Signed-off-by: Peter Korsgaard --- ...-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch | 26 +++++ ...lications-mod_cv-mod_cv.cpp-fix-build-wit.patch | 44 ------- .../freeswitch/0002-core-fix--disable-libyuv.patch | 129 +++++++++++++++++++++ package/freeswitch/freeswitch.hash | 4 +- package/freeswitch/freeswitch.mk | 8 +- 5 files changed, 163 insertions(+), 48 deletions(-) diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch new file mode 100644 index 0000000000..57f6e660c1 --- /dev/null +++ b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch @@ -0,0 +1,26 @@ +From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 +From: Dragos Oancea +Date: Tue, 26 Oct 2021 08:42:58 +0000 +Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac + +Signed-off-by: Bernd Kuhls +--- + src/switch_rtp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/switch_rtp.c b/src/switch_rtp.c +index 1880bbb19c..843ee81381 100644 +--- a/src/switch_rtp.c ++++ b/src/switch_rtp.c +@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); + snprintf(header, sizeof(header), "Source-Lost"); + #if SWITCH_BYTE_ORDER == __BIG_ENDIAN +- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ ++ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ + #else + tmpLost = ntohl(rtcp_report_block->lost)>>8; + tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch b/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch deleted file mode 100644 index cd0a3ab4c2..0000000000 --- a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Oct 2020 23:06:36 +0200 -Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv - 3.4.9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use cvScalar instead of CV_RGB to avoid the following build failure with -opencv 3.4.9: - -mod_cv.cpp:693:24: error: conversion from ???cv::Scalar {aka cv::Scalar_}??? to non-scalar type ???CvScalar??? requested - CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); - ^ - -Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since -version 3.4.2 and -https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f - -It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/signalwire/freeswitch/pull/914] ---- - src/mod/applications/mod_cv/mod_cv.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp -index 582f925abf..bbec755e91 100644 ---- a/src/mod/applications/mod_cv/mod_cv.cpp -+++ b/src/mod/applications/mod_cv/mod_cv.cpp -@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context) - //printf("WTF %d\n", object_neighbors); - //cout << "Detected " << object_neighbors << " object neighbors" << endl; - const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors); -- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); -+ CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0); - rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1); - - parse_stats(&context->nestDetected, nestedObjects.size(), context->skip); --- -2.28.0 - diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch new file mode 100644 index 0000000000..137cb27cf8 --- /dev/null +++ b/package/freeswitch/0002-core-fix--disable-libyuv.patch @@ -0,0 +1,129 @@ +From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 +From: Sebastian Kemper +Date: Mon, 1 Nov 2021 09:59:09 +0100 +Subject: [PATCH] [core] fix "--disable-libyuv" + +Recent changes made it impossible to compile freeswitch without libyuv +support. + +src/switch_core_video.c: In function 'switch_img_read_from_file': +src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] +RAWToI420(data, width * 3, +^ +src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] +ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); +^ + +Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 + +Signed-off-by: Bernd Kuhls +Signed-off-by: Sebastian Kemper +--- + src/switch_core_video.c | 12 ++++++++++++ + tests/unit/switch_core_video.c | 4 ++++ + 2 files changed, 16 insertions(+) + +diff --git a/src/switch_core_video.c b/src/switch_core_video.c +index 7dbd685d6ee..0d377f9c3e4 100644 +--- a/src/switch_core_video.c ++++ b/src/switch_core_video.c +@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha + + SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) + { ++#ifdef SWITCH_HAVE_YUV + int width = 0, height = 0, channels = 0; + int comp = STBI_rgb; + unsigned char *data = NULL; +@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name + } else if (data) { + stbi_image_free(data); + } ++#endif + + return NULL; + } + + SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + const char *ext = strrchr(file_name, '.'); +@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co + free(data); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif + } + + typedef struct data_url_context_s { +@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { + char **urlP; + } data_url_context_t; + ++#ifdef SWITCH_HAVE_YUV + static void data_url_write_func(void *context, void *data, int size) + { + switch_buffer_t *buffer = (switch_buffer_t *)context; + switch_buffer_write(buffer, data, size); + } ++#endif + + SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + int stride_in_bytes = 0; +@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** + switch_buffer_destroy(&buffer); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif /* SWITCH_HAVE_YUV */ + } + + +diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c +index 27c96102929..e395db474d5 100644 +--- a/tests/unit/switch_core_video.c ++++ b/tests/unit/switch_core_video.c +@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEARDOWN_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(data_url_test) + { + char *data_url = NULL; +@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") + unlink(argb_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + + FST_TEST_BEGIN(img_patch) + { +@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEST_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(stb_data_url) + { + switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); +@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") + unlink(jpg_write_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + } + FST_SUITE_END() + } diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index dc5a67980f..8066c620c4 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 -sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 +sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 944867cc75..c576e5f267 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.6 +FREESWITCH_VERSION = 1.10.7 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -120,7 +120,6 @@ FREESWITCH_ENABLED_MODULES += \ endpoints/mod_rtc \ endpoints/mod_rtmp \ endpoints/mod_sofia \ - endpoints/mod_verto \ event_handlers/mod_cdr_csv \ event_handlers/mod_cdr_sqlite \ event_handlers/mod_event_socket \ @@ -209,6 +208,11 @@ FREESWITCH_DEPENDENCIES += libilbc FREESWITCH_ENABLED_MODULES += codecs/mod_ilbc endif +ifeq ($(BR2_PACKAGE_LIBKS),y) +FREESWITCH_DEPENDENCIES += libks +FREESWITCH_ENABLED_MODULES += endpoints/mod_verto +endif + ifeq ($(BR2_PACKAGE_LIBLDNS),y) FREESWITCH_DEPENDENCIES += libldns FREESWITCH_ENABLED_MODULES += applications/mod_enum From peter at korsgaard.com Thu Jan 27 07:09:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:09:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/sofia-sip: bump version to 1.13.3 Message-ID: <20220127070548.68431814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=652752cb4d9b2709519198761b36c24761a30be9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Removed patches which were applied upstream: https://github.com/freeswitch/sofia-sip/commit/f6f29b483e9c31ce8d3e87419ec3deea8679312d https://github.com/freeswitch/sofia-sip/commit/d568475eb7291bc72f585a116319b05d80b818e1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7210b40c93c8c2d3ac1f51e546544b8453974a9b) Signed-off-by: Peter Korsgaard --- ...ag.h-reintroduce-soatag_local_sdp_str_ref.patch | 30 ----------------- .../sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch | 38 ---------------------- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 2 +- 4 files changed, 2 insertions(+), 70 deletions(-) diff --git a/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch b/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch deleted file mode 100644 index 57c0bfe250..0000000000 --- a/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bcd0f17fd83f2dfe570a3ab17249a5c7290b27f2 Mon Sep 17 00:00:00 2001 -From: Pekka Pessi -Date: Thu, 24 Mar 2011 14:45:21 +0200 -Subject: [PATCH] soa_tag.h: reintroduce soatag_local_sdp_str_ref - -Thanks to Erik Habicht for spotting it - -Signed-off-by: Bernd Kuhls -[rebased for sofia-sip 1.13.1-d10a3d268c, patch sent upstream - https://github.com/freeswitch/sofia-sip/pull/23] ---- - libsofia-sip-ua/soa/sofia-sip/soa_tag.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h b/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -index 723ca02..d9448d6 100644 ---- a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -+++ b/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -@@ -130,7 +130,7 @@ SOFIAPUBVAR tag_typedef_t soatag_local_sdp_ref; - SOFIAPUBVAR tag_typedef_t soatag_local_sdp_str; - #define SOATAG_LOCAL_SDP_STR_REF(x) \ - soatag_local_sdp_str_ref, tag_str_vr(&(x)) --SOFIAPUBVAR tag_typedef_t soatag_session_sdp_str_ref; -+SOFIAPUBVAR tag_typedef_t soatag_local_sdp_str_ref; - - #define SOATAG_AF(x) soatag_af, tag_int_v((x)) - SOFIAPUBVAR tag_typedef_t soatag_af; --- -1.7.7 - diff --git a/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch b/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch deleted file mode 100644 index a2cc412843..0000000000 --- a/package/sofia-sip/0002-sofia-sip-fix-s2tcase.c.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d66a2e55daf223737c07c59b1be45a2d91212ef6 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 26 Jul 2020 13:47:16 +0200 -Subject: [PATCH] [sofia-sip] fix s2tcase.c - -Fixes build error with recent libcheck: -https://github.com/freeswitch/sofia-sip/issues/22 - -Signed-off-by: Bernd Kuhls ---- - s2check/s2tcase.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libs/sofia-sip/s2check/s2tcase.c b/libs/sofia-sip/s2check/s2tcase.c -index 382aaa3ad7..d67694c2ce 100644 ---- a/s2check/s2tcase.c -+++ b/s2check/s2tcase.c -@@ -57,7 +57,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, - if (strcmp(*patterns, "*")) { - printf("%s: selected\n", name); - } -- _tcase_add_test(tc, tf, name, signo, 0, start, end); -+ _tcase_add_test(tc, tf, name, signo, start, end); - return; - } - } -@@ -67,7 +67,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, - if (strcmp(*patterns, "*")) { - printf("%s: selected\n", name); - } -- _tcase_add_test(tc, tf, name, signo, 0, start, end); -+ _tcase_add_test(tc, tf, name, signo, start, end); - return; - } - } --- -2.27.0 - diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 99b315e276..0484cc1501 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 4cf0de1aaa1e1737db5a8fe4104021a8e60a148a4534f92b5affdd9782e404aa sofia-sip-1.13.1-d10a3d268c.tar.gz +sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index ef1b35fa2c..5c383400ff 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.1-d10a3d268c +SOFIA_SIP_VERSION = 1.13.3-8071e8accd SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Thu Jan 27 07:12:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:12:30 +0100 Subject: [Buildroot] [git commit] package/freeswitch: security bump version to 1.10.7 In-Reply-To: <20220107232022.0E707834E4@busybox.osuosl.org> (Peter Korsgaard's message of "Sat, 8 Jan 2022 00:26:21 +0100") References: <20220107232022.0E707834E4@busybox.osuosl.org> Message-ID: <878rv1ejoh.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=829777c1c9a0d40c8c5753e6fe86acfc78edfc92 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fixes the following security issues: > - CVE-2021-41105: FreeSWITCH susceptible to Denial of Service via invalid > SRTP packets > When handling SRTP calls, FreeSWITCH is susceptible to a DoS where calls > can be terminated by remote attackers. This attack can be done > continuously, thus denying encrypted calls during the attack. > https://github.com/signalwire/freeswitch/security/advisories/GHSA-jh42-prph-gp36 > - CVE-2021-41157: FreeSWITCH does not authenticate SIP SUBSCRIBE requests by default > By default, SIP requests of the type SUBSCRIBE are not authenticated in > the affected versions of FreeSWITCH. > https://github.com/signalwire/freeswitch/security/advisories/GHSA-g7xg-7c54-rmpj > - CVE-2021-37624: FreeSWITCH does not authenticate SIP MESSAGE requests, > leading to spam and message spoofing > By default, SIP requests of the type MESSAGE (RFC 3428) are not > authenticated in the affected versions of FreeSWITCH. MESSAGE requests > are relayed to SIP user agents registered with the FreeSWITCH server > without requiring any authentication. Although this behaviour can be > changed by setting the auth-messages parameter to true, it is not the > default setting. > https://github.com/signalwire/freeswitch/security/advisories/GHSA-mjcm-q9h8-9xv3 > - CVE-2021-41145: FreeSWITCH susceptible to Denial of Service via SIP flooding > When flooding FreeSWITCH with SIP messages, it was observed that after a > number of seconds the process was killed by the operating system due to > memory exhaustion > https://github.com/signalwire/freeswitch/security/advisories/GHSA-jvpq-23v4-gp3m > - CVE-2021-41158: FreeSWITCH vulnerable to SIP digest leak for configured gateways > An attacker can perform a SIP digest leak attack against FreeSWITCH and > receive the challenge response of a gateway configured on the FreeSWITCH > server. This is done by challenging FreeSWITCH's SIP requests with the > realm set to that of the gateway, thus forcing FreeSWITCH to respond with > the challenge response which is based on the password of that targeted > gateway. > https://github.com/signalwire/freeswitch/security/advisories/GHSA-3v3f-99mv-qvj4 > Release notes: > https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 > Removed patch, upstream applied a different fix: > https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b > Added optional dependency to libks, needed due to upstream commit > https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 > Added upstream patches to fix build errors. > Signed-off-by: Bernd Kuhls > [Peter: mention security fixes] > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Jan 26 20:46:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:46:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mpd: fix comment Message-ID: <20220127070548.5AD2A8285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28d817c058aa7cbb24ccd3f67c17012fbd22f8ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 1bf512e9fff9fef1eb5f58c3279ca007cbabd0ab wrongly added that BR2_USE_WCHAR is due to flac dependency but flac is optional so remove this comment and add boost instead Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 20584d1ef270d5c1851c1cd537833ec5882edcba) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 7731b203b9..e1da654450 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,7 +1,7 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac + depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC From peter at korsgaard.com Thu Jan 27 07:10:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:10:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/sofia-sip: bump version to 1.13.6 Message-ID: <20220127070548.8D4488285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=778e32d6a817fc571009419a992a7bbcc5ea6ad1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Needed to bump freeswitch to 1.10.7. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 30b2dbeae3930084634e126ead4e1e2930a58bad) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 0484cc1501..6f6ff6d052 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.tar.gz +sha256 d39a3287038f1c9a747c1abc94a1379a726a9dfaf969285f955141883f7b810f sofia-sip-1.13.6-4152840260.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index fb565637eb..2bac480542 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.3-8071e8accd -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs +SOFIA_SIP_VERSION = 1.13.6-4152840260 +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Thu Jan 27 07:11:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:11:14 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/freeswitch: bump version to 1.10.6 Message-ID: <20220127070548.9942A8285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53a24740ecd4f544a237bcf7eab637cfdc501b57 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b3f75b1b637f1c2d4ce79ecb840746b5365a080d) Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 4 ++-- package/freeswitch/freeswitch.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index d95e05c0b1..dc5a67980f 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.5.-release.tar.xz.sha256 -sha256 3e26600767a82946eca94af2c8f14712783aa83db5fb1cc57585f544aecce327 freeswitch-1.10.5.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 +sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 7880151fa5..944867cc75 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.5 +FREESWITCH_VERSION = 1.10.6 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging From peter at korsgaard.com Thu Jan 27 07:10:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:10:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/sofia-sip: correct passing of '--enable-ndebug' Message-ID: <20220127070548.771C082872@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9651f61bbc2d92598f852eba8d00753fa7ed010 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The preprocessor option NDEBUG, triggered by the configure option '--enable-ndebug', should be read as 'no-debug'. When NDEBUG is set, asserts are _disabled_. The sofia-sip package had inverted logic, and set '--enable-ndebug' when BR2_ENABLE_DEBUG was enabled, while it should be the other way around. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas De Schampheleire Signed-off-by: Yann E. MORIN (cherry picked from commit fb12adbb7613a4c05643491453dbc09151b5bf48) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 5c383400ff..274c72fce8 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -30,7 +30,7 @@ SOFIA_SIP_CONF_OPTS += \ --without-openssl endif -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_DEBUG),) SOFIA_SIP_CONF_OPTS += --enable-ndebug endif From peter at korsgaard.com Wed Jan 26 20:52:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:52:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/sofia-sip: bump version to 1.13.6 Message-ID: <20220127070554.312008229B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16cbd66f0404f7984b78c118dc32196c974e65bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Needed to bump freeswitch to 1.10.7. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 30b2dbeae3930084634e126ead4e1e2930a58bad) Signed-off-by: Peter Korsgaard --- package/sofia-sip/sofia-sip.hash | 2 +- package/sofia-sip/sofia-sip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 0484cc1501..6f6ff6d052 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b539444a5d03e281b829ee9133ae9e717f2d2a03399808365e5ab85574e25d95 sofia-sip-1.13.3-8071e8accd.tar.gz +sha256 d39a3287038f1c9a747c1abc94a1379a726a9dfaf969285f955141883f7b810f sofia-sip-1.13.6-4152840260.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index fb565637eb..2bac480542 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.3-8071e8accd -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs +SOFIA_SIP_VERSION = 1.13.6-4152840260 +SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip SOFIA_SIP_INSTALL_STAGING = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Jan 26 20:52:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 26 Jan 2022 21:52:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/freeswitch: security bump version to 1.10.7 Message-ID: <20220127070554.398528285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecaafd1804496ac853a710075e43c7d39f2c0695 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: - CVE-2021-41105: FreeSWITCH susceptible to Denial of Service via invalid SRTP packets When handling SRTP calls, FreeSWITCH is susceptible to a DoS where calls can be terminated by remote attackers. This attack can be done continuously, thus denying encrypted calls during the attack. https://github.com/signalwire/freeswitch/security/advisories/GHSA-jh42-prph-gp36 - CVE-2021-41157: FreeSWITCH does not authenticate SIP SUBSCRIBE requests by default By default, SIP requests of the type SUBSCRIBE are not authenticated in the affected versions of FreeSWITCH. https://github.com/signalwire/freeswitch/security/advisories/GHSA-g7xg-7c54-rmpj - CVE-2021-37624: FreeSWITCH does not authenticate SIP MESSAGE requests, leading to spam and message spoofing By default, SIP requests of the type MESSAGE (RFC 3428) are not authenticated in the affected versions of FreeSWITCH. MESSAGE requests are relayed to SIP user agents registered with the FreeSWITCH server without requiring any authentication. Although this behaviour can be changed by setting the auth-messages parameter to true, it is not the default setting. https://github.com/signalwire/freeswitch/security/advisories/GHSA-mjcm-q9h8-9xv3 - CVE-2021-41145: FreeSWITCH susceptible to Denial of Service via SIP flooding When flooding FreeSWITCH with SIP messages, it was observed that after a number of seconds the process was killed by the operating system due to memory exhaustion https://github.com/signalwire/freeswitch/security/advisories/GHSA-jvpq-23v4-gp3m - CVE-2021-41158: FreeSWITCH vulnerable to SIP digest leak for configured gateways An attacker can perform a SIP digest leak attack against FreeSWITCH and receive the challenge response of a gateway configured on the FreeSWITCH server. This is done by challenging FreeSWITCH's SIP requests with the realm set to that of the gateway, thus forcing FreeSWITCH to respond with the challenge response which is based on the password of that targeted gateway. https://github.com/signalwire/freeswitch/security/advisories/GHSA-3v3f-99mv-qvj4 Release notes: https://github.com/signalwire/freeswitch/releases/tag/v1.10.7 Removed patch, upstream applied a different fix: https://github.com/signalwire/freeswitch/commit/e9fde845de5b8885282bf5e70f4be3645c5c3e9b Added optional dependency to libks, needed due to upstream commit https://github.com/signalwire/freeswitch/commit/ed9851666615d283effb76edc7028cc08b07eff9 Added upstream patches to fix build errors. Signed-off-by: Bernd Kuhls [Peter: mention security fixes] Signed-off-by: Peter Korsgaard (cherry picked from commit 829777c1c9a0d40c8c5753e6fe86acfc78edfc92) Signed-off-by: Peter Korsgaard --- ...-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch | 26 +++++ ...lications-mod_cv-mod_cv.cpp-fix-build-wit.patch | 44 ------- .../freeswitch/0002-core-fix--disable-libyuv.patch | 129 +++++++++++++++++++++ package/freeswitch/freeswitch.hash | 4 +- package/freeswitch/freeswitch.mk | 8 +- 5 files changed, 163 insertions(+), 48 deletions(-) diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch new file mode 100644 index 0000000000..57f6e660c1 --- /dev/null +++ b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch @@ -0,0 +1,26 @@ +From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 +From: Dragos Oancea +Date: Tue, 26 Oct 2021 08:42:58 +0000 +Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac + +Signed-off-by: Bernd Kuhls +--- + src/switch_rtp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/switch_rtp.c b/src/switch_rtp.c +index 1880bbb19c..843ee81381 100644 +--- a/src/switch_rtp.c ++++ b/src/switch_rtp.c +@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); + snprintf(header, sizeof(header), "Source-Lost"); + #if SWITCH_BYTE_ORDER == __BIG_ENDIAN +- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ ++ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ + #else + tmpLost = ntohl(rtcp_report_block->lost)>>8; + tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch b/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch deleted file mode 100644 index cd0a3ab4c2..0000000000 --- a/package/freeswitch/0001-src-mod-applications-mod_cv-mod_cv.cpp-fix-build-wit.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 575409a14e62f73e83309daf8ff6642a235f250c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Oct 2020 23:06:36 +0200 -Subject: [PATCH] src/mod/applications/mod_cv/mod_cv.cpp: fix build with opencv - 3.4.9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use cvScalar instead of CV_RGB to avoid the following build failure with -opencv 3.4.9: - -mod_cv.cpp:693:24: error: conversion from ???cv::Scalar {aka cv::Scalar_}??? to non-scalar type ???CvScalar??? requested - CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); - ^ - -Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since -version 3.4.2 and -https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f - -It should be noted that CV_RGB(r,g,b) = cvScalar(b,g,r,0) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/signalwire/freeswitch/pull/914] ---- - src/mod/applications/mod_cv/mod_cv.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp -index 582f925abf..bbec755e91 100644 ---- a/src/mod/applications/mod_cv/mod_cv.cpp -+++ b/src/mod/applications/mod_cv/mod_cv.cpp -@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context) - //printf("WTF %d\n", object_neighbors); - //cout << "Detected " << object_neighbors << " object neighbors" << endl; - const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors); -- CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0); -+ CvScalar col = cvScalar(0, 0, (float)255 * object_neighbors / max_neighbors, 0); - rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1); - - parse_stats(&context->nestDetected, nestedObjects.size(), context->skip); --- -2.28.0 - diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch new file mode 100644 index 0000000000..137cb27cf8 --- /dev/null +++ b/package/freeswitch/0002-core-fix--disable-libyuv.patch @@ -0,0 +1,129 @@ +From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 +From: Sebastian Kemper +Date: Mon, 1 Nov 2021 09:59:09 +0100 +Subject: [PATCH] [core] fix "--disable-libyuv" + +Recent changes made it impossible to compile freeswitch without libyuv +support. + +src/switch_core_video.c: In function 'switch_img_read_from_file': +src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] +RAWToI420(data, width * 3, +^ +src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] +ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); +^ + +Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". + +Downloaded from upstream commit: +https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 + +Signed-off-by: Bernd Kuhls +Signed-off-by: Sebastian Kemper +--- + src/switch_core_video.c | 12 ++++++++++++ + tests/unit/switch_core_video.c | 4 ++++ + 2 files changed, 16 insertions(+) + +diff --git a/src/switch_core_video.c b/src/switch_core_video.c +index 7dbd685d6ee..0d377f9c3e4 100644 +--- a/src/switch_core_video.c ++++ b/src/switch_core_video.c +@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha + + SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) + { ++#ifdef SWITCH_HAVE_YUV + int width = 0, height = 0, channels = 0; + int comp = STBI_rgb; + unsigned char *data = NULL; +@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name + } else if (data) { + stbi_image_free(data); + } ++#endif + + return NULL; + } + + SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + const char *ext = strrchr(file_name, '.'); +@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co + free(data); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif + } + + typedef struct data_url_context_s { +@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { + char **urlP; + } data_url_context_t; + ++#ifdef SWITCH_HAVE_YUV + static void data_url_write_func(void *context, void *data, int size) + { + switch_buffer_t *buffer = (switch_buffer_t *)context; + switch_buffer_write(buffer, data, size); + } ++#endif + + SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) + { ++#ifndef SWITCH_HAVE_YUV ++ return SWITCH_STATUS_FALSE; ++#else + int comp = STBI_rgb; + unsigned char *data = NULL; + int stride_in_bytes = 0; +@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** + switch_buffer_destroy(&buffer); + + return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; ++#endif /* SWITCH_HAVE_YUV */ + } + + +diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c +index 27c96102929..e395db474d5 100644 +--- a/tests/unit/switch_core_video.c ++++ b/tests/unit/switch_core_video.c +@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEARDOWN_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(data_url_test) + { + char *data_url = NULL; +@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") + unlink(argb_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + + FST_TEST_BEGIN(img_patch) + { +@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") + } + FST_TEST_END() + ++#ifdef SWITCH_HAVE_YUV + FST_TEST_BEGIN(stb_data_url) + { + switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); +@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") + unlink(jpg_write_filename); + } + FST_TEST_END() ++#endif /* SWITCH_HAVE_YUV */ + } + FST_SUITE_END() + } diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index dc5a67980f..8066c620c4 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.6.-release.tar.xz.sha256 -sha256 9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d freeswitch-1.10.6.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 +sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 944867cc75..c576e5f267 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.6 +FREESWITCH_VERSION = 1.10.7 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging @@ -120,7 +120,6 @@ FREESWITCH_ENABLED_MODULES += \ endpoints/mod_rtc \ endpoints/mod_rtmp \ endpoints/mod_sofia \ - endpoints/mod_verto \ event_handlers/mod_cdr_csv \ event_handlers/mod_cdr_sqlite \ event_handlers/mod_event_socket \ @@ -209,6 +208,11 @@ FREESWITCH_DEPENDENCIES += libilbc FREESWITCH_ENABLED_MODULES += codecs/mod_ilbc endif +ifeq ($(BR2_PACKAGE_LIBKS),y) +FREESWITCH_DEPENDENCIES += libks +FREESWITCH_ENABLED_MODULES += endpoints/mod_verto +endif + ifeq ($(BR2_PACKAGE_LIBLDNS),y) FREESWITCH_DEPENDENCIES += libldns FREESWITCH_ENABLED_MODULES += applications/mod_enum From peter at korsgaard.com Thu Jan 27 07:15:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:15:56 +0100 Subject: [Buildroot] [git commit] package/rhash: fix activation of gettext In-Reply-To: <20220108111557.3CBB282A91@busybox.osuosl.org> (Thomas Petazzoni's message of "Sat, 8 Jan 2022 12:21:59 +0100") References: <20220108111557.3CBB282A91@busybox.osuosl.org> Message-ID: <874k5pejir.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=5630e83c8452d3e9039feb15fd30ea005bfc6b55 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is > wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set > Signed-off-by: Fabrice Fontaine > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:15:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:15:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rhash: fix activation of gettext Message-ID: <20220127071035.BF7D18285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c17eeadab3aaa04ac0e97bf803b280220cd4f96c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5630e83c8452d3e9039feb15fd30ea005bfc6b55) Signed-off-by: Peter Korsgaard --- package/rhash/rhash.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 92abcd29b0..d15d6f5968 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -15,9 +15,9 @@ RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) -RHASH_CONF_OPTS += --disable-gettext -else RHASH_CONF_OPTS += --enable-gettext +else +RHASH_CONF_OPTS += --disable-gettext endif ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) From peter at korsgaard.com Thu Jan 27 07:15:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:15:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rhash: fix activation of gettext Message-ID: <20220127071040.87B9E8285F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5e649a544da652a38683b2fd40c48cbec96fc59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Since commit ead2afda13e5541a7d8e759f5cfec4ab38605dcc, gettext is wrongly disabled when BR2_SYSTEM_ENABLE_NLS is set Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5630e83c8452d3e9039feb15fd30ea005bfc6b55) Signed-off-by: Peter Korsgaard --- package/rhash/rhash.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index d19c355cbb..02af0aa57b 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -15,9 +15,9 @@ RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) -RHASH_CONF_OPTS += --disable-gettext -else RHASH_CONF_OPTS += --enable-gettext +else +RHASH_CONF_OPTS += --disable-gettext endif ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) From peter at korsgaard.com Thu Jan 27 07:19:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:19:31 +0100 Subject: [Buildroot] [git commit] package/opengl/libgbm: clarify option comments In-Reply-To: <20220108160854.2EB0F831C3@busybox.osuosl.org> (Thomas Petazzoni's message of "Sat, 8 Jan 2022 17:14:55 +0100") References: <20220108160854.2EB0F831C3@busybox.osuosl.org> Message-ID: <87zgnhd4sc.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=2b5f7ce29288e2ba393ca7cd4768a83cdb5dec48 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The comments were *after* the option they applied to, which was > confusing, so bring back the comments before the option they apply to. > In addition, instead of saying "this option", explicitly name the > option to clear any ambiguity. > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:19:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:19:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/opengl/libgbm: clarify option comments Message-ID: <20220127071246.CD09882212@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbbf702f00d7f92bf3a33ac880b1c8942998bbac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The comments were *after* the option they applied to, which was confusing, so bring back the comments before the option they apply to. In addition, instead of saying "this option", explicitly name the option to clear any ambiguity. Signed-off-by: Thomas Petazzoni (cherry picked from commit 2b5f7ce29288e2ba393ca7cd4768a83cdb5dec48) Signed-off-by: Peter Korsgaard --- package/opengl/libgbm/Config.in | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/package/opengl/libgbm/Config.in b/package/opengl/libgbm/Config.in index 7aa3efb97a..6eb39761c4 100644 --- a/package/opengl/libgbm/Config.in +++ b/package/opengl/libgbm/Config.in @@ -5,20 +5,21 @@ config BR2_PACKAGE_PROVIDES_LIBGBM string depends on BR2_PACKAGE_HAS_LIBGBM +# gbm implementations should select +# BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT if they +# provide the format modifier plane count feature. This API was +# initially introduced in mesa3d version 17. A gbm implementation +# provides this feature if it is implement function +# gbm_device_get_format_modifier_plane_count. config BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT bool depends on BR2_PACKAGE_HAS_LIBGBM -# gbm implementations should select this option if they provide the -# format modifier plane count feature. This API was initially introduced -# in mesa3d version 17. A gbm implementation provides this feature if it -# is implement function gbm_device_get_format_modifier_plane_count. - +# gbm implementations should select +# BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF if they provide the dma +# buffer feature. This API was initially introduced in mesa3d version +# 10. A gbm implementation provides this feature if it is implement +# function gbm_bo_get_fd. config BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF bool depends on BR2_PACKAGE_HAS_LIBGBM - -# gbm implementations should select this option if they provide the -# dma buffer feature. This API was initially introduced in mesa3d -# version 10. A gbm implementation provides this feature if it -# is implement function gbm_bo_get_fd. From peter at korsgaard.com Thu Jan 27 07:23:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:23:04 +0100 Subject: [Buildroot] [git commit] package/ca-certificates: remove dependency on host-python-cryptography In-Reply-To: <20220108164622.89A0281DFE@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 8 Jan 2022 17:51:24 +0100") References: <20220108164622.89A0281DFE@busybox.osuosl.org> Message-ID: <87v8y5d4mf.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: Hi, > commit: https://git.buildroot.net/buildroot/commit/?id=363dd649f31c7e7732f3cd509d43cebbb53e51ce > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The host-python-cryptography module is only used by ca-certificates > for a check of the expiration date of certificates, which is only a > warning not even causing the build to abort, i.e something that > Buildroot users are most likely never going to see. > Since the host-python-cryptography dependency would soon require a > dependency on rust, it's a lot simpler to just patch the > certdata2pem.py script to no longer require cryptography, but only > make use of it if available. > Signed-off-by: Thomas Petazzoni > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [snip] > +++ b/package/ca-certificates/ca-certificates.mk > @@ -7,7 +7,7 @@ > CA_CERTIFICATES_VERSION = 20211016 > CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz > CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates > -CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 host-python-cryptography > +CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 Can we then change to BR2_PYTHON3_HOST_DEPENDENCY instead of host-python3 now that no extra python modules are used? -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Thu Jan 27 07:39:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 27 Jan 2022 08:39:26 +0100 Subject: [Buildroot] [git commit] package/ca-certificates: remove dependency on host-python-cryptography In-Reply-To: <87v8y5d4mf.fsf@dell.be.48ers.dk> References: <20220108164622.89A0281DFE@busybox.osuosl.org> <87v8y5d4mf.fsf@dell.be.48ers.dk> Message-ID: <20220127083926.6b773ada@windsurf> On Thu, 27 Jan 2022 08:23:04 +0100 Peter Korsgaard wrote: > > +++ b/package/ca-certificates/ca-certificates.mk > > @@ -7,7 +7,7 @@ > > CA_CERTIFICATES_VERSION = 20211016 > > CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz > > CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates > > -CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 host-python-cryptography > > +CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 > > Can we then change to BR2_PYTHON3_HOST_DEPENDENCY instead of > host-python3 now that no extra python modules are used? Good point. I would say that yes, probably we could do that. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Jan 27 07:53:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:53:31 +0100 Subject: [Buildroot] [git commit] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 In-Reply-To: <20220108164622.9ABE7832B4@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 8 Jan 2022 17:51:24 +0100") References: <20220108164622.9ABE7832B4@busybox.osuosl.org> Message-ID: <87r18td37o.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=1ed4147e76fe56322c47468be8a222204c459adf > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for > BR2_ARM_CPU_ARMV7A, but it also needs a special value for > BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for > ARMv5TE is identified with the "armv5te" architecture name, see > https://doc.rust-lang.org/nightly/rustc/platform-support.html. > We noticed this because Rust binaries wouldn't work on an ARMv5 > platform (Illegal instruction). This was due to the usage of the > arm-unknown-linux-gnueabi variant of the Rust standard library, which > is for ARMv6. Thanks to this commit, we correctly use the > armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly > on ARMv5TE. > A better approach would be to do the conversion from architecture > options to Rust tuples in a single string symbol that also defines the > supported architectures, similar to how it's done in e.g. openblas. > However, that's a much bigger change. So for now, just do the easy thing > and fix this one issue. > Signed-off-by: Thomas Petazzoni > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:53:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:53:59 +0100 Subject: [Buildroot] [git commit] package/rustc: fix the riscv64gc architecture handling In-Reply-To: <20220108164622.A463581DFE@busybox.osuosl.org> (Arnout Vandecappelle's message of "Sat, 8 Jan 2022 17:51:24 +0100") References: <20220108164622.A463581DFE@busybox.osuosl.org> Message-ID: <87mtjhd36w.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=79c5639597e961a36ee10e55b0479e642013448f > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit > or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need > to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true > when BR2_riscv is true. > Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to > allow rust-bin to download its pre-compiled standard library > correctly. > Signed-off-by: Thomas Petazzoni > Reviewed-by: Alistair Francis > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:54:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:54:43 +0100 Subject: [Buildroot] [git commit] package/libeastl: drop duplicated sentence In-Reply-To: <20220108172225.2F0708324A@busybox.osuosl.org> (Peter Korsgaard's message of "Sat, 8 Jan 2022 18:28:20 +0100") References: <20220108172225.2F0708324A@busybox.osuosl.org> Message-ID: <87ilu5d35o.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=59bbe7cc7418d61a5d2963f1d30e558c3111a95e > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Drop duplicated sentence from Config.in > Signed-off-by: Fabrice Fontaine > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:54:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:54:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libeastl: drop duplicated sentence Message-ID: <20220127074754.ABDC28284B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acb675ec4c3c776713a9fb671aa0a1372b293174 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop duplicated sentence from Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 59bbe7cc7418d61a5d2963f1d30e558c3111a95e) Signed-off-by: Peter Korsgaard --- package/libeastl/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 7609434519..5abea8f810 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help EASTL stands for Electronic Arts Standard Template - Library. EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is an extensive From peter at korsgaard.com Thu Jan 27 07:53:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:53:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rustc: fix the riscv64gc architecture handling Message-ID: <20220127074809.E037B82872@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7ac9116604e874f30188a24b8cd045b5766a773 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x riscv64gc was made available for BR2_riscv, but RISC-V can be 32-bit or 64-bit, so we need to restrict it to BR2_RISCV_64. There's no need to keep the BR2_riscv dependency, as BR2_RISCV_64 can only be true when BR2_riscv is true. Also, BR2_PACKAGE_HOST_RUSTC_ARCH needs to be set to riscv64gc to allow rust-bin to download its pre-compiled standard library correctly. Signed-off-by: Thomas Petazzoni Reviewed-by: Alistair Francis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 79c5639597e961a36ee10e55b0479e642013448f) Signed-off-by: Peter Korsgaard --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index fe7404b3bd..80d1d1a3d8 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -49,7 +49,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS default y if BR2_powerpc64le && BR2_TOOLCHAIN_USES_GLIBC # riscv64gc-unknown-linux-gnu # "g" stands for imafd, and we also need "c". - default y if BR2_riscv && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ + default y if BR2_RISCV_64 && BR2_RISCV_ISA_RVI && BR2_RISCV_ISA_RVM && \ BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ BR2_TOOLCHAIN_USES_GLIBC @@ -104,6 +104,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH string default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A + default "riscv64gc" if BR2_RISCV_64 default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI From peter at korsgaard.com Thu Jan 27 07:23:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:23:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rustc: fix BR2_PACKAGE_HOST_RUSTC_ARCH for ARMv5 Message-ID: <20220127074809.D80A0825CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a45747f72f8d5579eb29ee71ed82669df75c964 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x BR2_PACKAGE_HOST_RUSTC_ARCH only had a special value for BR2_ARM_CPU_ARMV7A, but it also needs a special value for BR2_ARM_CPU_ARMV5, as the pre-compiled Rust standard library for ARMv5TE is identified with the "armv5te" architecture name, see https://doc.rust-lang.org/nightly/rustc/platform-support.html. We noticed this because Rust binaries wouldn't work on an ARMv5 platform (Illegal instruction). This was due to the usage of the arm-unknown-linux-gnueabi variant of the Rust standard library, which is for ARMv6. Thanks to this commit, we correctly use the armv5te-unknown-linux-gnueabi variant, and Rust binaries work properly on ARMv5TE. A better approach would be to do the conversion from architecture options to Rust tuples in a single string symbol that also defines the supported architectures, similar to how it's done in e.g. openblas. However, that's a much bigger change. So for now, just do the easy thing and fix this one issue. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1ed4147e76fe56322c47468be8a222204c459adf) Signed-off-by: Peter Korsgaard --- package/rustc/Config.in.host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 90ea56f626..fe7404b3bd 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -102,8 +102,9 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH string + default "armv5te" if BR2_ARM_CPU_ARMV5 default "armv7" if BR2_ARM_CPU_ARMV7A - default BR2_ARCH if !BR2_ARM_CPU_ARMV7A + default BR2_ARCH config BR2_PACKAGE_HOST_RUSTC_ABI string From peter at korsgaard.com Thu Jan 27 07:54:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:54:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libeastl: drop duplicated sentence Message-ID: <20220127074809.EB6D1825CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=824bd21137998cd54d431acb8b6ee03c3fc65a31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop duplicated sentence from Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 59bbe7cc7418d61a5d2963f1d30e558c3111a95e) Signed-off-by: Peter Korsgaard --- package/libeastl/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 7609434519..5abea8f810 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help EASTL stands for Electronic Arts Standard Template - Library. EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is an extensive From thomas.petazzoni at bootlin.com Thu Jan 27 07:57:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 27 Jan 2022 08:57:04 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/runc: add host package In-Reply-To: <20220127062504.1835450-1-christian@paral.in> References: <20220127062504.1835450-1-christian@paral.in> Message-ID: <20220127085704.2192a320@windsurf> Hello, On Wed, 26 Jan 2022 22:25:03 -0800 Christian Stewart wrote: > diff --git a/package/runc/runc.mk b/package/runc/runc.mk > index c4e45a00a9..932bf39eea 100644 > --- a/package/runc/runc.mk > +++ b/package/runc/runc.mk > @@ -10,6 +10,8 @@ RUNC_LICENSE = Apache-2.0 > RUNC_LICENSE_FILES = LICENSE > RUNC_CPE_ID_VENDOR = linuxfoundation > > +RUNC_GOMOD = github.com/opencontainers/runc How is this related to the addition of the host package? This seems unrelated. Why is this needed now? > +HOST_RUNC_BIN_NAME = runc Why is this not needed for the target package ? > +HOST_RUNC_LDFLAGS = $(RUNC_LDFLAGS) > +HOST_RUNC_TAGS = $(RUNC_TAGS) > +HOST_RUNC_INSTALL_BINS = $(HOST_RUNC_BIN_NAME) This makes me think we should probably have some inheritance of those variables between the target variant and the host variant of the package. However, HOST_RUNC_TAGS = $(RUNC_TAGS) looks most likely wrong. Indeed: ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) RUNC_DEPENDENCIES += libapparmor RUNC_TAGS += apparmor endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif and you most likely don't want HOST_RUNC_TAGS to contain apparmor or seccomp, because we are not building libseccomp or libapparmor for the host. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Jan 27 07:57:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:57 +0100 Subject: [Buildroot] [git commit] package/libpri: add Linux in comment In-Reply-To: <20220108173322.F35FB83242@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 8 Jan 2022 18:39:25 +0100") References: <20220108173322.F35FB83242@busybox.osuosl.org> Message-ID: <87ee4td30a.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=0730b8b8228391ec36ace6e1d1d0831590b8d0cf > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Add "Linux" before kernel in comment to be consistent with other > packages and manual > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:58:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:58:03 +0100 Subject: [Buildroot] [git commit] package/libss7: add Linux in comment In-Reply-To: <20220108173323.0886D832C8@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 8 Jan 2022 18:39:25 +0100") References: <20220108173323.0886D832C8@busybox.osuosl.org> Message-ID: <87a6fhd304.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=e0de6291e3fe8d9f6c572a5206b8ead3719f6829 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Add "Linux" before kernel in comment to be consistent with other > packages and manual > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 07:58:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:58:29 +0100 Subject: [Buildroot] [git commit] package/nvidia-driver: add Linux in comment In-Reply-To: <20220108173323.11DED832CE@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 8 Jan 2022 18:39:25 +0100") References: <20220108173323.11DED832CE@busybox.osuosl.org> Message-ID: <875yq5d2ze.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=956cd5b9b7136344bc2641fbe3e1abfa2eff1bc8 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Add "Linux" before kernel in comment to be consistent with other > packages and manual > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 08:00:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 09:00:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/hackrf: add a comma between licenses In-Reply-To: <20220108173403.2819830-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 8 Jan 2022 18:34:03 +0100") References: <20220108173403.2819830-1-fontaine.fabrice@gmail.com> Message-ID: <871r0td2wu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Thu Jan 27 08:01:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 27 Jan 2022 09:01:41 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/buildah: new package In-Reply-To: <20220127062504.1835450-2-christian@paral.in> References: <20220127062504.1835450-1-christian@paral.in> <20220127062504.1835450-2-christian@paral.in> Message-ID: <20220127090141.7d0645f2@windsurf> Hello, On Wed, 26 Jan 2022 22:25:04 -0800 Christian Stewart wrote: > v1 -> v2: > > - add package to developers > - add host runc dependency for host package > - add libgpgme runtime dependency Considering that there are runtime dependency concerns, it would be nice to have a simple test case in support/testing/. > diff --git a/package/buildah/buildah.hash b/package/buildah/buildah.hash > new file mode 100644 > index 0000000000..c7e00d02a7 > --- /dev/null > +++ b/package/buildah/buildah.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 d99b5187a25bc9d7385408732a0e155df0458b4d2cea6e8d002f3fa2cbaac76f buildah-1.24.0.tar.gz > +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk > new file mode 100644 > index 0000000000..658d7ef56f > --- /dev/null > +++ b/package/buildah/buildah.mk > @@ -0,0 +1,46 @@ > +################################################################################ > +# > +# buildah > +# > +################################################################################ > + > +BUILDAH_VERSION = 1.24.0 > +BUILDAH_SITE = $(call github,containers,buildah,v$(BUILDAH_VERSION)) > + > +BUILDAH_LICENSE = Apache-2.0 > +BUILDAH_LICENSE_FILES = LICENSE > + > +BUILDAH_DEPENDENCIES = libgpgme Is libgpgme really a runtime dependency, as noted in your changelog? If it is, then it's not needed in BUILDAH_DEPENDENCIES. However, it would be somewhat surprising for it to be only a runtime dependency. Could you confirm? Does it get dlopen()ed at runtime? Or it's not the library that is used at runtime, but some program that is installed by libgpgme? > +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) That "repetition" also makes me think we should have some level of inheritance between target and host variables in the golang-package infrastructure. For BUILD_TARGETS, TAGS and INSTALL_BINS, it sounds fine to do it. However, for LDFLAGS, it's a bit weird, as normally, LDFLAGS are different between host and target. However here, there are mostly used to pass these version-related -X options, that are in fact the same between host and target. Should we have a separate variable to pass those flags ? Not sure. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Jan 27 07:59:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:59:41 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/hackrf: add a comma between licenses Message-ID: <20220127075826.4BF86827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c88e47b3cbc0d17102f88c475e4fce5bce029427 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 4afa6fd8c1457dce95b830da3ad3b0d255ca1d09) Signed-off-by: Peter Korsgaard --- package/hackrf/hackrf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 391bddcdb0..d80f87e6b9 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -7,7 +7,7 @@ HACKRF_VERSION = 2018.01.1 HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz -HACKRF_LICENSE = GPL-2.0+ BSD-3-Clause +HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host From peter at korsgaard.com Thu Jan 27 07:57:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libpri: add Linux in comment Message-ID: <20220127075826.323B2827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b5d05b92c97053be8b45b2477e87f4c32791929 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0730b8b8228391ec36ace6e1d1d0831590b8d0cf) Signed-off-by: Peter Korsgaard --- package/libpri/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpri/Config.in b/package/libpri/Config.in index de2d96fcc4..0684d2ac83 100644 --- a/package/libpri/Config.in +++ b/package/libpri/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI http://www.asterisk.org/downloads/libpri -comment "libpri needs a kernel to be built" +comment "libpri needs a Linux kernel to be built" depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Thu Jan 27 07:58:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:58:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/nvidia-driver: add Linux in comment Message-ID: <20220127075826.435948287C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbec0270f3a5f7c0370cec64418da311f721dc89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 956cd5b9b7136344bc2641fbe3e1abfa2eff1bc8) Signed-off-by: Peter Korsgaard --- package/nvidia-driver/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 9631b3e70c..a8617a939b 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -75,7 +75,7 @@ config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA -comment "nvidia kernel module needs a kernel to be built" +comment "nvidia kernel module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_NVIDIA_DRIVER_MODULE From peter at korsgaard.com Thu Jan 27 07:57:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libss7: add Linux in comment Message-ID: <20220127075826.3AD3382872@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=579654f570d24778d5ec86dae652cc48803cb01d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e0de6291e3fe8d9f6c572a5206b8ead3719f6829) Signed-off-by: Peter Korsgaard --- package/libss7/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index bdf5fbe3a8..d8bcf11ce7 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBSS7 http://www.asterisk.org/downloads/libss7 -comment "libss7 needs a kernel to be built" +comment "libss7 needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL comment "libss7 needs a toolchain w/ threads" From peter at korsgaard.com Thu Jan 27 07:57:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:36 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libss7: add Linux in comment Message-ID: <20220127075831.3FF3F82872@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2628dcdd4750e7988c4491a17d5c480d4240b81f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e0de6291e3fe8d9f6c572a5206b8ead3719f6829) Signed-off-by: Peter Korsgaard --- package/libss7/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libss7/Config.in b/package/libss7/Config.in index bdf5fbe3a8..d8bcf11ce7 100644 --- a/package/libss7/Config.in +++ b/package/libss7/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBSS7 http://www.asterisk.org/downloads/libss7 -comment "libss7 needs a kernel to be built" +comment "libss7 needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL comment "libss7 needs a toolchain w/ threads" From peter at korsgaard.com Thu Jan 27 07:57:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:57:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libpri: add Linux in comment Message-ID: <20220127075831.387D6827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=957a7ff5b65f6d34fe3fcdbc5ccc85c2c6511143 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0730b8b8228391ec36ace6e1d1d0831590b8d0cf) Signed-off-by: Peter Korsgaard --- package/libpri/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpri/Config.in b/package/libpri/Config.in index de2d96fcc4..0684d2ac83 100644 --- a/package/libpri/Config.in +++ b/package/libpri/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBPRI http://www.asterisk.org/downloads/libpri -comment "libpri needs a kernel to be built" +comment "libpri needs a Linux kernel to be built" depends on BR2_USE_MMU depends on !BR2_LINUX_KERNEL From peter at korsgaard.com Thu Jan 27 07:59:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:59:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/hackrf: add a comma between licenses Message-ID: <20220127075831.4F4EA827A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b75389cb41d133d281a9c743ab5f20ebd58bd73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 4afa6fd8c1457dce95b830da3ad3b0d255ca1d09) Signed-off-by: Peter Korsgaard --- package/hackrf/hackrf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 391bddcdb0..d80f87e6b9 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -7,7 +7,7 @@ HACKRF_VERSION = 2018.01.1 HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz -HACKRF_LICENSE = GPL-2.0+ BSD-3-Clause +HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host From peter at korsgaard.com Thu Jan 27 07:58:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 08:58:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/nvidia-driver: add Linux in comment Message-ID: <20220127075831.47A058287C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58203964d7fb9c33228cabc3fee415f97c19e663 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add "Linux" before kernel in comment to be consistent with other packages and manual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 956cd5b9b7136344bc2641fbe3e1abfa2eff1bc8) Signed-off-by: Peter Korsgaard --- package/nvidia-driver/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 9631b3e70c..a8617a939b 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -75,7 +75,7 @@ config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA -comment "nvidia kernel module needs a kernel to be built" +comment "nvidia kernel module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_NVIDIA_DRIVER_MODULE From paul at crapouillou.net Thu Jan 27 09:50:12 2022 From: paul at crapouillou.net (Paul Cercueil) Date: Thu, 27 Jan 2022 09:50:12 +0000 Subject: [Buildroot] [PATCH 1/1] package/umtprd: bump to version 1.6.2 In-Reply-To: <20220126210039.1535791-1-fontaine.fabrice@gmail.com> References: <20220126210039.1535791-1-fontaine.fabrice@gmail.com> Message-ID: Hi, Le mer., janv. 26 2022 at 22:00:39 +0100, Fabrice Fontaine a ?crit : > Update indentation in hash file (two spaces) > > https://github.com/viveris/uMTP-Responder/blob/umtprd-1.6.2/Release-notes.txt > > Signed-off-by: Fabrice Fontaine Thanks! It's been on my to-do list for too long. Acked-by: Paul Cercueil Cheers, -Paul > --- > package/umtprd/umtprd.hash | 4 ++-- > package/umtprd/umtprd.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/umtprd/umtprd.hash b/package/umtprd/umtprd.hash > index 170837d84b..7cd75619ab 100644 > --- a/package/umtprd/umtprd.hash > +++ b/package/umtprd/umtprd.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 cce45c7d3df0022fc013c79de21b1f11b1027d090aeb628669f08b0c20d2afdd umtprd-1.3.10.tar.gz > -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE > +sha256 > 1de40511c1dd4618719cff2058dfe68a595f1b9284c80afa89d6d1a1c80aec29 > umtprd-1.6.2.tar.gz > +sha256 > 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 > LICENSE > diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk > index f1a4e66cff..c5e0ee512e 100644 > --- a/package/umtprd/umtprd.mk > +++ b/package/umtprd/umtprd.mk > @@ -4,7 +4,7 @@ > # > > ################################################################################ > > -UMTPRD_VERSION = 1.3.10 > +UMTPRD_VERSION = 1.6.2 > UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive > UMTPRD_LICENSE = GPL-3.0+ > UMTPRD_LICENSE_FILES = LICENSE > -- > 2.34.1 > From evgeni at studio-punkt.com Thu Jan 27 10:34:39 2022 From: evgeni at studio-punkt.com (Evgeni Dobrev) Date: Thu, 27 Jan 2022 11:34:39 +0100 Subject: [Buildroot] [PATCH 1/1] fs: fix /tmp and /run clean-up in POSIX shells In-Reply-To: <20220126221708.GK457876@scaer> References: <20220124104116.12902-1-evgeni@studio-punkt.com> <20220124104116.12902-2-evgeni@studio-punkt.com> <20220126221708.GK457876@scaer> Message-ID: Hi Yann, indeed the support for [^] vs [!] is more complicated than I thought initially ( see "Rationale" under https://github.com/koalaman/shellcheck/wiki/SC3026 ). Would the following be a bad idea: echo "find $$(TARGET_DIR)/run $$(TARGET_DIR)/tmp -mindepth 1 -delete" >> $$(FAKEROOT_SCRIPT) - it avoids the glob support complication - it is shorter Regards, Evgeni On Wed, Jan 26, 2022 at 11:17:08PM +0100, Yann E. MORIN wrote: > Evgeni, All, > > On 2022-01-24 11:41 +0100, Evgeni Dobrev via buildroot spake thusly: > > In POSIX sh, ^ in place of ! in glob bracket expressions > > is undefined. > > > > Signed-off-by: Evgeni Dobrev > > --- > > fs/common.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/fs/common.mk b/fs/common.mk > > index 45beb5ae7b..64a94d9ad8 100644 > > --- a/fs/common.mk > > +++ b/fs/common.mk > > @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) > > TIL that bracket expressions are actually valid and specified by POSIX. > > But we do guarantee that we do have bash as a shell when running > Buildroot, so I think it is fair to also run the fs script with bash: > > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..f8a6da6bc4 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -172,7 +172,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > $$(BASE_TARGET_DIR)/ \ > $$(TARGET_DIR) > > - echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) > + echo '#!$(SHELL)' > $$(FAKEROOT_SCRIPT) > echo "set -e" >> $$(FAKEROOT_SCRIPT) > > echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) > > However, $(SHELL) is not always correct, so we'd probably need: > > diff --git a/Makefile b/Makefile > index 5fc7137e5a..bb9955f5b6 100644 > --- a/Makefile > +++ b/Makefile > @@ -30,7 +30,7 @@ > # we want bash as shell > SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ > else if [ -x /bin/bash ]; then echo /bin/bash; \ > - else echo sh; fi; fi) > + else which sh; fi; fi) > > # Set O variable if not already done on the command line; > # or avoid confusing packages that can use the O= syntax for out-of-tree > > But in the end this is quite more changes than what you propose. > > Can we also shorten the command? > > echo "rm -rf $$(TARGET_DIR)/{run,tmp}/* $$(TARGET_DIR)/{run,tmp}/.[!.]*" >> $$(FAKEROOT_SCRIPT) > > Regards, > Yann E. MORIN. > > > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From mf at go-sys.de Thu Jan 27 10:46:58 2022 From: mf at go-sys.de (Michael Fischer) Date: Thu, 27 Jan 2022 11:46:58 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/network-manager: add optional nmcli support In-Reply-To: <20220126231432.37374caf@windsurf> References: <20220126231432.37374caf@windsurf> Message-ID: <20220127104658.9895-1-mf@go-sys.de> The network-manager package builds the nmcli utility when the readline package is enabled. However, this is not necessarily obvious to the user. Therefore, this commit adds an explicit option to enable the nmcli tool, which automatically selects readline. Signed-off-by: Michael Fischer --- package/network-manager/Config.in | 8 +++++++- package/network-manager/network-manager.mk | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..f61a046a95 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -37,6 +37,13 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI help This option enables terminal based UI +config BR2_PACKAGE_NETWORK_MANAGER_CLI + bool "nmcli support" + select BR2_PACKAGE_READLINE + help + This option enables support for the + NetworkManager Command Line Interface + config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER @@ -54,7 +61,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS select BR2_PACKAGE_JANSSON help This option enables support for OpenVSwitch - endif comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..1eb9233b44 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -135,7 +135,7 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-polkit endif -ifeq ($(BR2_PACKAGE_READLINE),y) +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y) NETWORK_MANAGER_DEPENDENCIES += readline NETWORK_MANAGER_CONF_OPTS += --with-nmcli else -- 2.20.1 From peter at korsgaard.com Thu Jan 27 10:52:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 11:52:52 +0100 Subject: [Buildroot] [PATCH] package/poppler: use HTTPS for upstream URL In-Reply-To: <20220109093735.4860-1-peter@korsgaard.com> (Peter Korsgaard's message of "Sun, 9 Jan 2022 10:37:33 +0100") References: <20220109093735.4860-1-peter@korsgaard.com> Message-ID: <87wnilbgcb.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes: > http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ > The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget > versions (E.G. s.b.o): > wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz > DEBUG output created by Wget 1.14 on linux-gnu. > URI encoding = ?UTF-8? > Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) > Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) > --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz > Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 > Caching poppler.freedesktop.org => 147.75.198.156 > Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. > Created socket 3. > Releasing 0x0000000001ceda80 (new refcount 1). > ---request begin--- > GET /poppler-21.12.0.tar.xz HTTP/1.1 > User-Agent: Wget/1.14 (linux-gnu) > Accept: */* > Host: poppler.freedesktop.org > Connection: Keep-Alive > ---request end--- > HTTP request sent, awaiting response... > ---response begin--- > HTTP/1.1 308 Permanent Redirect > Date: Sun, 09 Jan 2022 09:28:02 GMT > Content-Type: text/html > Content-Length: 164 > Connection: keep-alive > Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz > ---response end--- > 308 Permanent Redirect > Registered socket 3 for persistent reuse. > Skipping 164 bytes of body: [ > 308 Permanent Redirect > >

    308 Permanent Redirect

    >
    nginx
    > > > ] done. > 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 10:52:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 11:52:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/poppler: use HTTPS for upstream URL Message-ID: <20220127104609.5AC3A8282A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c0c34c6346e54ea8089a163540a45c327859082 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes: http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget versions (E.G. s.b.o): wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz DEBUG output created by Wget 1.14 on linux-gnu. URI encoding = ???UTF-8??? Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 Caching poppler.freedesktop.org => 147.75.198.156 Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. Created socket 3. Releasing 0x0000000001ceda80 (new refcount 1). ---request begin--- GET /poppler-21.12.0.tar.xz HTTP/1.1 User-Agent: Wget/1.14 (linux-gnu) Accept: */* Host: poppler.freedesktop.org Connection: Keep-Alive ---request end--- HTTP request sent, awaiting response... ---response begin--- HTTP/1.1 308 Permanent Redirect Date: Sun, 09 Jan 2022 09:28:02 GMT Content-Type: text/html Content-Length: 164 Connection: keep-alive Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz ---response end--- 308 Permanent Redirect Registered socket 3 for persistent reuse. Skipping 164 bytes of body: [ 308 Permanent Redirect

    308 Permanent Redirect

    nginx
    ] done. 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. Signed-off-by: Peter Korsgaard (cherry picked from commit c39e0abba945dcc52e2e9e70b92fc94f1c351c0b) Signed-off-by: Peter Korsgaard --- package/poppler/Config.in | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 521e3e65a8..b2bc49fc75 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POPPLER Poppler is a PDF rendering library based on the xpdf-3.0 code base. - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ if BR2_PACKAGE_POPPLER diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index a5a97d974b..ae77cf2e5d 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -6,7 +6,7 @@ POPPLER_VERSION = 0.84.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org +POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Jan 27 10:52:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 11:52:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/poppler: use HTTPS for upstream URL Message-ID: <20220127104615.D60308282A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae2a31295c010e94483031eb1c0b8539698f5959 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes: http://autobuild.buildroot.net/results/145/1456f9512371ecb5a0a374943178e4bd7b0967e8/ The HTTP URL returns a 308 redirect to HTTPS, which confuses old wget versions (E.G. s.b.o): wget -d http://poppler.freedesktop.org/poppler-21.12.0.tar.xz DEBUG output created by Wget 1.14 on linux-gnu. URI encoding = ???UTF-8??? Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) Converted file name 'poppler-21.12.0.tar.xz' (UTF-8) -> 'poppler-21.12.0.tar.xz' (UTF-8) --2022-01-09 09:28:02-- http://poppler.freedesktop.org/poppler-21.12.0.tar.xz Resolving poppler.freedesktop.org (poppler.freedesktop.org)... 147.75.198.156 Caching poppler.freedesktop.org => 147.75.198.156 Connecting to poppler.freedesktop.org (poppler.freedesktop.org)|147.75.198.156|:80... connected. Created socket 3. Releasing 0x0000000001ceda80 (new refcount 1). ---request begin--- GET /poppler-21.12.0.tar.xz HTTP/1.1 User-Agent: Wget/1.14 (linux-gnu) Accept: */* Host: poppler.freedesktop.org Connection: Keep-Alive ---request end--- HTTP request sent, awaiting response... ---response begin--- HTTP/1.1 308 Permanent Redirect Date: Sun, 09 Jan 2022 09:28:02 GMT Content-Type: text/html Content-Length: 164 Connection: keep-alive Location: https://poppler.freedesktop.org/poppler-21.12.0.tar.xz ---response end--- 308 Permanent Redirect Registered socket 3 for persistent reuse. Skipping 164 bytes of body: [ 308 Permanent Redirect

    308 Permanent Redirect

    nginx
    ] done. 2022-01-09 09:28:02 ERROR 308: Permanent Redirect. Signed-off-by: Peter Korsgaard (cherry picked from commit c39e0abba945dcc52e2e9e70b92fc94f1c351c0b) Signed-off-by: Peter Korsgaard --- package/poppler/Config.in | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 521e3e65a8..b2bc49fc75 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_POPPLER Poppler is a PDF rendering library based on the xpdf-3.0 code base. - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ if BR2_PACKAGE_POPPLER diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index a5a97d974b..ae77cf2e5d 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -6,7 +6,7 @@ POPPLER_VERSION = 0.84.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org +POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING From mf at go-sys.de Thu Jan 27 12:18:24 2022 From: mf at go-sys.de (Michael Fischer) Date: Thu, 27 Jan 2022 13:18:24 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/busybox: bump version to 1.35.0 In-Reply-To: <20220126231554.0fcc106d@windsurf> References: <20220126231554.0fcc106d@windsurf> Message-ID: <20220127121824.32092-1-mf@go-sys.de> Updating the busybox configuration files by loading and saving it back. Signed-off-by: Michael Fischer --- package/busybox/busybox-minimal.config | 151 +++++++++++++++++------- package/busybox/busybox.config | 154 +++++++++++++++++-------- package/busybox/busybox.hash | 4 +- package/busybox/busybox.mk | 2 +- 4 files changed, 222 insertions(+), 89 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 65a347756d..9eae0f51f4 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.28.0 -# Wed Feb 7 09:47:09 2018 +# Busybox version: 1.35.0 +# Thu Jan 27 10:16:03 2022 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,6 +24,7 @@ CONFIG_FEATURE_WTMP=y # CONFIG_FEATURE_PIDFILE is not set CONFIG_PID_FILE_PATH="" CONFIG_BUSYBOX=y +CONFIG_FEATURE_SHOW_SCRIPT=y CONFIG_FEATURE_INSTALLER=y # CONFIG_INSTALL_NO_USR is not set CONFIG_FEATURE_SUID=y @@ -33,8 +34,8 @@ CONFIG_FEATURE_SUID=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y # # Build Options @@ -52,6 +53,8 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set +CONFIG_STACK_OPTIMIZATION_386=y +CONFIG_STATIC_LIBGCC=y # # Installation Options ("make install" behavior) @@ -73,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -81,15 +85,21 @@ CONFIG_NO_DEBUG_LIB=y # Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set +CONFIG_FLOAT_DURATION=y CONFIG_FEATURE_RTMINMAX=y +CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y @@ -100,6 +110,7 @@ CONFIG_FEATURE_REVERSE_SEARCH=y CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_WINCH=y # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set # CONFIG_LOCALE_SUPPORT is not set # CONFIG_UNICODE_SUPPORT is not set @@ -112,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y # # Applets @@ -149,10 +152,13 @@ CONFIG_LZCAT=y CONFIG_XZCAT=y # CONFIG_XZ is not set # CONFIG_BZIP2 is not set +CONFIG_BZIP2_SMALL=0 CONFIG_FEATURE_BZIP2_DECOMPRESS=y # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set +# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set +# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_GZIP is not set @@ -188,6 +194,22 @@ CONFIG_LZOPCAT=y # # Coreutils # +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for date and touch +# +# CONFIG_FEATURE_TIMEZONE is not set + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_FEATURE_CATN=y @@ -198,10 +220,13 @@ CONFIG_CHOWN=y # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y CONFIG_CKSUM=y +CONFIG_CRC32=y # CONFIG_COMM is not set CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set +# CONFIG_FEATURE_CP_REFLINK is not set CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set @@ -213,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y # CONFIG_FEATURE_DF_FANCY is not set +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -228,7 +254,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y CONFIG_FALSE=y CONFIG_FOLD=y -# CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y @@ -283,9 +308,9 @@ CONFIG_SHRED=y # CONFIG_SHUF is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set # CONFIG_STAT is not set @@ -295,6 +320,7 @@ CONFIG_STTY=y # CONFIG_SUM is not set CONFIG_SYNC=y # CONFIG_FEATURE_SYNC_FANCY is not set +# CONFIG_FSYNC is not set # CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -306,7 +332,6 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y # CONFIG_TIMEOUT is not set CONFIG_TOUCH=y -# CONFIG_FEATURE_TOUCH_NODEREF is not set CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -321,31 +346,17 @@ CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y CONFIG_UUDECODE=y +CONFIG_BASE32=y # CONFIG_BASE64 is not set CONFIG_UUENCODE=y CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHOAMI=y CONFIG_WHO=y CONFIG_W=y # CONFIG_USERS is not set +CONFIG_WHOAMI=y CONFIG_YES=y -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - # # Console Utilities # @@ -409,6 +420,7 @@ CONFIG_SED=y CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_8BIT is not set # CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_COLON_EXPAND is not set # CONFIG_FEATURE_VI_YANKMARK is not set # CONFIG_FEATURE_VI_SEARCH is not set # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -422,6 +434,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_UNDO is not set # CONFIG_FEATURE_VI_UNDO_QUEUE is not set CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 +# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -430,13 +443,19 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FIND is not set # CONFIG_FEATURE_FIND_PRINT0 is not set # CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_ATIME is not set +# CONFIG_FEATURE_FIND_CTIME is not set # CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_AMIN is not set +# CONFIG_FEATURE_FIND_CMIN is not set # CONFIG_FEATURE_FIND_PERM is not set # CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_EXECUTABLE is not set # CONFIG_FEATURE_FIND_XDEV is not set # CONFIG_FEATURE_FIND_MAXDEPTH is not set # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_SAMEFILE is not set # CONFIG_FEATURE_FIND_EXEC is not set # CONFIG_FEATURE_FIND_EXEC_PLUS is not set # CONFIG_FEATURE_FIND_USER is not set @@ -446,7 +465,9 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FEATURE_FIND_PAREN is not set # CONFIG_FEATURE_FIND_SIZE is not set # CONFIG_FEATURE_FIND_PRUNE is not set +# CONFIG_FEATURE_FIND_QUIT is not set # CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_EMPTY is not set # CONFIG_FEATURE_FIND_PATH is not set # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -473,6 +494,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y +CONFIG_FEATURE_WAIT_FOR_INIT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y @@ -495,10 +517,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set CONFIG_ADDUSER=y # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=60000 @@ -605,7 +627,6 @@ CONFIG_FSFREEZE=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y # CONFIG_HEXDUMP is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HD is not set CONFIG_XXD=y # CONFIG_HWCLOCK is not set @@ -624,6 +645,7 @@ CONFIG_XXD=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set CONFIG_MESG=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y CONFIG_MKE2FS=y @@ -647,6 +669,8 @@ CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y # CONFIG_MOUNTPOINT is not set +CONFIG_NOLOGIN=y +# CONFIG_NOLOGIN_DEPENDENCIES is not set # CONFIG_NSENTER is not set # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set @@ -673,6 +697,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set # CONFIG_UEVENT is not set CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -693,6 +718,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_BCACHE is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +CONFIG_FEATURE_VOLUMEID_EROFS=y # CONFIG_FEATURE_VOLUMEID_EXFAT is not set # CONFIG_FEATURE_VOLUMEID_EXT is not set # CONFIG_FEATURE_VOLUMEID_F2FS is not set @@ -700,6 +726,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_LFS is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set @@ -719,8 +746,15 @@ CONFIG_FEATURE_VOLUMEID_MINIX=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +CONFIG_BC=y +# CONFIG_DC is not set +CONFIG_FEATURE_DC_BIG=y +# CONFIG_FEATURE_DC_LIBM is not set +CONFIG_FEATURE_BC_INTERACTIVE=y +CONFIG_FEATURE_BC_LONG_OPTIONS=y # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -739,8 +773,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set CONFIG_FEATURE_CROND_DIR="" # CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set @@ -748,10 +780,10 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set # CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASHCP is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -764,6 +796,7 @@ CONFIG_HEXEDIT=y # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set +CONFIG_I2CTRANSFER=y # CONFIG_INOTIFYD is not set # CONFIG_LESS is not set CONFIG_FEATURE_LESS_MAXLINES=0 @@ -776,12 +809,15 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_FEATURE_LESS_RAW is not set +# CONFIG_FEATURE_LESS_ENV is not set CONFIG_LSSCSI=y # CONFIG_MAKEDEVS is not set # CONFIG_FEATURE_MAKEDEVS_LEAF is not set # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set +CONFIG_MIM=y # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -795,16 +831,18 @@ CONFIG_SETFATTR=y CONFIG_SETSERIAL=y # CONFIG_STRINGS is not set # CONFIG_TIME is not set +CONFIG_TS=y # CONFIG_TTYSIZE is not set -# CONFIG_UBIRENAME is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set +# CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -813,6 +851,10 @@ CONFIG_SETSERIAL=y # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_HWIB=y +# CONFIG_FEATURE_TLS_SHA1 is not set # CONFIG_ARP is not set # CONFIG_ARPING is not set # CONFIG_BRCTL is not set @@ -830,6 +872,7 @@ CONFIG_SETSERIAL=y CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -841,6 +884,10 @@ CONFIG_DNSDOMAINNAME=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_FEATURE_HTTPD_GZIP is not set +# CONFIG_FEATURE_HTTPD_ETAG is not set +# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set +# CONFIG_FEATURE_HTTPD_DATE is not set +# CONFIG_FEATURE_HTTPD_ACL_IP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -895,9 +942,12 @@ CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set CONFIG_FEATURE_NETSTAT_PRG=y # CONFIG_NSLOOKUP is not set +# CONFIG_FEATURE_NSLOOKUP_BIG is not set +# CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set # CONFIG_FEATURE_NTPD_CONF is not set +# CONFIG_FEATURE_NTP_AUTH is not set CONFIG_PING=y # CONFIG_PING6 is not set # CONFIG_FEATURE_FANCY_PING is not set @@ -905,6 +955,8 @@ CONFIG_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set +CONFIG_TC=y +CONFIG_FEATURE_TC_INGRESS=y # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y @@ -913,9 +965,11 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_FEATURE_TELNET_WIDTH=y # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -932,6 +986,7 @@ CONFIG_FEATURE_TELNET_WIDTH=y CONFIG_WGET=y # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_FEATURE_WGET_STATUSBAR is not set +CONFIG_FEATURE_WGET_FTP=y # CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_TIMEOUT is not set # CONFIG_FEATURE_WGET_HTTPS is not set @@ -952,10 +1007,12 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set +# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set # # Common options for DHCP applets # +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 @@ -973,17 +1030,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_IOSTAT is not set @@ -1022,7 +1081,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_WATCH is not set -# CONFIG_FEATURE_SHOW_THREADS is not set # # Runit Utilities @@ -1038,6 +1096,7 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" CONFIG_SVC=y +CONFIG_SVOK=y # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set # CONFIG_GETENFORCE is not set @@ -1062,10 +1121,13 @@ CONFIG_SH_IS_HUSH=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +# CONFIG_SHELL_ASH is not set # CONFIG_ASH is not set # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set # CONFIG_ASH_INTERNAL_GLOB is not set # CONFIG_ASH_BASH_COMPAT is not set +# CONFIG_ASH_BASH_SOURCE_CURDIR is not set +# CONFIG_ASH_BASH_NOT_FOUND_HOOK is not set # CONFIG_ASH_JOB_CONTROL is not set # CONFIG_ASH_ALIAS is not set # CONFIG_ASH_RANDOM_SUPPORT is not set @@ -1080,8 +1142,11 @@ CONFIG_BASH_IS_NONE=y # CONFIG_ASH_CMDCMD is not set # CONFIG_CTTYHACK is not set CONFIG_HUSH=y +CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +CONFIG_HUSH_LINENO_VAR=y CONFIG_HUSH_INTERACTIVE=y CONFIG_HUSH_SAVEHISTORY=y CONFIG_HUSH_JOB=y @@ -1102,6 +1167,7 @@ CONFIG_HUSH_EXPORT_N=y CONFIG_HUSH_READONLY=y CONFIG_HUSH_KILL=y CONFIG_HUSH_WAIT=y +CONFIG_HUSH_COMMAND=y CONFIG_HUSH_TRAP=y CONFIG_HUSH_TYPE=y CONFIG_HUSH_TIMES=y @@ -1118,11 +1184,13 @@ CONFIG_HUSH_GETOPTS=y # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set CONFIG_FEATURE_SH_READ_FRAC=y # CONFIG_FEATURE_SH_HISTFILESIZE is not set +CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y # # System Logging Utilities @@ -1137,6 +1205,7 @@ CONFIG_FEATURE_SH_READ_FRAC=y # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 3925521f28..52cb8ffcd8 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.28.0 -# Wed Feb 7 09:44:57 2018 +# Busybox version: 1.35.0 +# Thu Jan 27 10:16:54 2022 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,6 +24,7 @@ CONFIG_FEATURE_WTMP=y # CONFIG_FEATURE_PIDFILE is not set CONFIG_PID_FILE_PATH="" CONFIG_BUSYBOX=y +CONFIG_FEATURE_SHOW_SCRIPT=y CONFIG_FEATURE_INSTALLER=y # CONFIG_INSTALL_NO_USR is not set CONFIG_FEATURE_SUID=y @@ -33,8 +34,8 @@ CONFIG_FEATURE_SUID=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y # # Build Options @@ -52,6 +53,8 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set +CONFIG_STACK_OPTIMIZATION_386=y +CONFIG_STATIC_LIBGCC=y # # Installation Options ("make install" behavior) @@ -73,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -81,15 +85,21 @@ CONFIG_NO_DEBUG_LIB=y # Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set +CONFIG_FLOAT_DURATION=y CONFIG_FEATURE_RTMINMAX=y +CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y @@ -100,6 +110,7 @@ CONFIG_FEATURE_REVERSE_SEARCH=y CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_WINCH=y # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set # CONFIG_LOCALE_SUPPORT is not set # CONFIG_UNICODE_SUPPORT is not set @@ -112,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y # # Applets @@ -149,10 +152,13 @@ CONFIG_UNXZ=y CONFIG_XZCAT=y CONFIG_XZ=y # CONFIG_BZIP2 is not set +CONFIG_BZIP2_SMALL=0 CONFIG_FEATURE_BZIP2_DECOMPRESS=y CONFIG_CPIO=y # CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set +# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set +# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set CONFIG_GZIP=y @@ -188,6 +194,22 @@ CONFIG_FEATURE_UNZIP_XZ=y # # Coreutils # +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for date and touch +# +CONFIG_FEATURE_TIMEZONE=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_FEATURE_CATN=y @@ -198,10 +220,13 @@ CONFIG_CHOWN=y # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y CONFIG_CKSUM=y +CONFIG_CRC32=y # CONFIG_COMM is not set CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set +# CONFIG_FEATURE_CP_REFLINK is not set CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set @@ -213,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y # CONFIG_FEATURE_DF_FANCY is not set +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -228,7 +254,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y CONFIG_FALSE=y CONFIG_FOLD=y -# CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y @@ -283,9 +308,9 @@ CONFIG_SHRED=y # CONFIG_SHUF is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set # CONFIG_STAT is not set @@ -295,6 +320,7 @@ CONFIG_STTY=y # CONFIG_SUM is not set CONFIG_SYNC=y # CONFIG_FEATURE_SYNC_FANCY is not set +# CONFIG_FSYNC is not set # CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -306,7 +332,6 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y # CONFIG_TIMEOUT is not set CONFIG_TOUCH=y -# CONFIG_FEATURE_TOUCH_NODEREF is not set CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -321,31 +346,17 @@ CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y CONFIG_UUDECODE=y +CONFIG_BASE32=y CONFIG_BASE64=y CONFIG_UUENCODE=y CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHOAMI=y CONFIG_WHO=y CONFIG_W=y # CONFIG_USERS is not set +CONFIG_WHOAMI=y CONFIG_YES=y -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - # # Console Utilities # @@ -413,6 +424,7 @@ CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_COLON_EXPAND=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -426,6 +438,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_UNDO=y CONFIG_FEATURE_VI_UNDO_QUEUE=y CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_VI_VERBOSE_STATUS=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -434,13 +447,19 @@ CONFIG_FEATURE_ALLOW_EXEC=y CONFIG_FIND=y CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_ATIME=y +CONFIG_FEATURE_FIND_CTIME=y CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_AMIN=y +CONFIG_FEATURE_FIND_CMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_EXECUTABLE=y CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y # CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_SAMEFILE=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y @@ -450,7 +469,9 @@ CONFIG_FEATURE_FIND_DEPTH=y CONFIG_FEATURE_FIND_PAREN=y CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_QUIT=y # CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -477,6 +498,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y +CONFIG_FEATURE_WAIT_FOR_INIT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y @@ -499,10 +521,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set -CONFIG_ADDGROUP=y -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set +CONFIG_ADDGROUP=y +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set CONFIG_ADDUSER=y # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=60000 @@ -609,7 +631,6 @@ CONFIG_FSTRIM=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HD is not set CONFIG_XXD=y CONFIG_HWCLOCK=y @@ -652,6 +673,8 @@ CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y CONFIG_MOUNTPOINT=y +CONFIG_NOLOGIN=y +# CONFIG_NOLOGIN_DEPENDENCIES is not set # CONFIG_NSENTER is not set CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y @@ -678,6 +701,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_SWITCH_ROOT=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -698,6 +722,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_BCACHE is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +CONFIG_FEATURE_VOLUMEID_EROFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_F2FS=y @@ -705,6 +730,7 @@ CONFIG_FEATURE_VOLUMEID_FAT=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_LFS is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set @@ -724,8 +750,15 @@ CONFIG_FEATURE_VOLUMEID_UBIFS=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +CONFIG_BC=y +CONFIG_DC=y +CONFIG_FEATURE_DC_BIG=y +# CONFIG_FEATURE_DC_LIBM is not set +CONFIG_FEATURE_BC_INTERACTIVE=y +CONFIG_FEATURE_BC_LONG_OPTIONS=y # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -744,8 +777,6 @@ CONFIG_CROND=y CONFIG_FEATURE_CROND_SPECIAL_TIMES=y CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_FEATURE_DC_LIBM is not set # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set @@ -753,10 +784,10 @@ CONFIG_DC=y # CONFIG_FEATURE_DEVFS is not set CONFIG_DEVMEM=y # CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASHCP is not set CONFIG_HDPARM=y CONFIG_FEATURE_HDPARM_GET_IDENTITY=y # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -769,6 +800,7 @@ CONFIG_I2CGET=y CONFIG_I2CSET=y CONFIG_I2CDUMP=y CONFIG_I2CDETECT=y +CONFIG_I2CTRANSFER=y # CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -781,12 +813,15 @@ CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_FEATURE_LESS_RAW is not set +# CONFIG_FEATURE_LESS_ENV is not set CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set CONFIG_MICROCOM=y +CONFIG_MIM=y CONFIG_MT=y # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -800,16 +835,18 @@ CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TS=y # CONFIG_TTYSIZE is not set -CONFIG_UBIRENAME=y # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set +CONFIG_UBIRENAME=y # CONFIG_VOLNAME is not set CONFIG_WATCHDOG=y +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -818,6 +855,10 @@ CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_HWIB=y +# CONFIG_FEATURE_TLS_SHA1 is not set CONFIG_ARP=y CONFIG_ARPING=y # CONFIG_BRCTL is not set @@ -835,6 +876,7 @@ CONFIG_ETHER_WAKE=y CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -846,6 +888,10 @@ CONFIG_DNSDOMAINNAME=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_FEATURE_HTTPD_GZIP is not set +# CONFIG_FEATURE_HTTPD_ETAG is not set +# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set +# CONFIG_FEATURE_HTTPD_DATE is not set +# CONFIG_FEATURE_HTTPD_ACL_IP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -900,9 +946,12 @@ CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set CONFIG_NSLOOKUP=y +CONFIG_FEATURE_NSLOOKUP_BIG=y +CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set # CONFIG_FEATURE_NTPD_CONF is not set +# CONFIG_FEATURE_NTP_AUTH is not set CONFIG_PING=y # CONFIG_PING6 is not set CONFIG_FEATURE_FANCY_PING=y @@ -910,6 +959,8 @@ CONFIG_FEATURE_FANCY_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set +CONFIG_TC=y +CONFIG_FEATURE_TC_INGRESS=y # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y @@ -918,14 +969,12 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_FEATURE_TELNET_WIDTH=y # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set CONFIG_TFTP=y # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +CONFIG_FEATURE_TFTP_HPA_COMPAT=y # CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y @@ -941,6 +990,7 @@ CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_FTP=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_TIMEOUT=y # CONFIG_FEATURE_WGET_HTTPS is not set @@ -961,10 +1011,12 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set +# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set # # Common options for DHCP applets # +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 @@ -982,17 +1034,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R -O search" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_SHOW_THREADS is not set CONFIG_FREE=y CONFIG_FUSER=y # CONFIG_IOSTAT is not set @@ -1031,7 +1085,6 @@ CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_WATCH=y -# CONFIG_FEATURE_SHOW_THREADS is not set # # Runit Utilities @@ -1047,6 +1100,7 @@ CONFIG_WATCH=y # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" CONFIG_SVC=y +CONFIG_SVOK=y # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set # CONFIG_GETENFORCE is not set @@ -1071,10 +1125,13 @@ CONFIG_SH_IS_ASH=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_BASH_SOURCE_CURDIR is not set +CONFIG_ASH_BASH_NOT_FOUND_HOOK=y CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_RANDOM_SUPPORT=y @@ -1089,8 +1146,11 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set @@ -1111,6 +1171,7 @@ CONFIG_ASH_CMDCMD=y # CONFIG_HUSH_READONLY is not set # CONFIG_HUSH_KILL is not set # CONFIG_HUSH_WAIT is not set +# CONFIG_HUSH_COMMAND is not set # CONFIG_HUSH_TRAP is not set # CONFIG_HUSH_TYPE is not set # CONFIG_HUSH_TIMES is not set @@ -1127,11 +1188,13 @@ CONFIG_ASH_CMDCMD=y # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set CONFIG_FEATURE_SH_READ_FRAC=y # CONFIG_FEATURE_SH_HISTFILESIZE is not set +CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y # # System Logging Utilities @@ -1146,6 +1209,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 1f34651d7b..2091cdaf65 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.34.1.tar.bz2.sha256 -sha256 415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549 busybox-1.34.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 +sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60ebc4985f..669366b903 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.34.1 +BUSYBOX_VERSION = 1.35.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 -- 2.20.1 From jborne at kalray.eu Thu Jan 27 13:53:38 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Thu, 27 Jan 2022 14:53:38 +0100 Subject: [Buildroot] [PATCH 0/1] remove libiberty from target install Message-ID: <20220127135339.25430-1-jborne@kalray.eu> Hi, Following my earlier request for comment and your answers, I'm providing this patch... I hope this is Ok. This is pretty much my first patch submission... Thanks again for your nice answers. Best regards. Jonathan. Jonathan Borne (1): package/binutils: remove libiberty from target install package/binutils/binutils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.1 From jborne at kalray.eu Thu Jan 27 13:53:39 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Thu, 27 Jan 2022 14:53:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/binutils: remove libiberty from target install In-Reply-To: <20220127135339.25430-1-jborne@kalray.eu> References: <20220127135339.25430-1-jborne@kalray.eu> Message-ID: <20220127135339.25430-2-jborne@kalray.eu> In BINUTILS_INSTALL_TARGET_CMDS, libiberty is installed to STAGING_DIR This is not necessary since libiberty is already unconditionally installed to staging in BINUTILS_INSTALL_STAGING_CMDS. Furthermore the presence of STAGING_DIR path in TARGET_CMDS is confusing. Moreover libiberty is static only. Static libraries are only used at build time, not at run time so we do not want to install libiberty on target. This commit removes the unnecessary libiberty install in TARGET_CMDS and add a comment to clarify why we do not see libiberty installed on target. Signed-off-by: Jonathan Borne --- package/binutils/binutils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 13f61be035..32ca70d325 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -95,6 +95,8 @@ BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging +# Static-only libraries such as libiberty are used at buildtime in staging +# but are not installed to target. define BINUTILS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install @@ -106,7 +108,6 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif -- 2.17.1 From james.hilliard1 at gmail.com Thu Jan 27 16:21:00 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 09:21:00 -0700 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.1 Message-ID: <20220127162100.2629696-1-james.hilliard1@gmail.com> Drop patch that is now upstream. Signed-off-by: James Hilliard --- ...x-typo-in-vapigen-option-metadatadir.patch | 33 ------------------- package/meson/meson.hash | 4 +-- package/meson/meson.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch deleted file mode 100644 index 3788ee0f11..0000000000 --- a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9952446a2a28ea2b009f4b8b2a14ad50f0878bdd Mon Sep 17 00:00:00 2001 -From: Michal Vasilek -Date: Mon, 10 Jan 2022 21:27:30 +0100 -Subject: [PATCH] gnome: fix typo in vapigen option metadatadir - -This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and -can cause a build failure, because --metadatdir is not a valid vapigen -option. - -[aperez at igalia.com: backport from upstream] -Signed-off-by: Adrian Perez de Castro -[yann.morin.1998 at free.fr: make it an actual backport] -Signed-off-by: Yann E. MORIN ---- - mesonbuild/modules/gnome.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 1125e56e7..dfc66c2e3 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): - cmd: T.List[T.Union[str, 'ExternalProgram']] - cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] - cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) -- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) -+ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) - cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) - cmd += pkg_cmd - cmd += ['--metadatadir=' + source_dir] --- -2.25.1 - diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c9be54be05..c2d53519d4 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz.asc -sha256 ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c meson-0.61.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc +sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e63dc725bf..c40f9f220c 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.0 +MESON_VERSION = 0.61.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 16:29:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 09:29:25 -0700 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.3 Message-ID: <20220127162925.2639638-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index f89b2ce17d..81f51eac20 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 ccfdd97679972cd3d9fb15bc3c647a3ee3351a434e20e1e3eec2851caa1b4849 systemd-250.1.tar.gz +sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 2d3971f31d..5626b54e8e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.1 +SYSTEMD_VERSION = 250.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.25.1 From peter at korsgaard.com Thu Jan 27 16:39:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:39:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gnuchess: security bump to version 6.2.9 Message-ID: <20220127163217.594CE8197C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f40890a29f008589a7cfa8a27818432d2ddc8d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixed potential buffer overflow in pgnload and pgnreplay (CVE-2021-30184) https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85aab41ef9f818216635c9b0f64bf9c20c176135) Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index b68eb6e0ee..0248abcf71 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 29d3590849..630b3aefa7 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.8 +GNUCHESS_VERSION = 6.2.9 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Jan 27 16:39:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:39:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gnuchess: bump to version 6.2.8 Message-ID: <20220127163217.50FA382837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b58aa61fa14b31c7c5f03151469a0fb6bdffccc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://lists.gnu.org/archive/html/info-gnu-chess/2021-05/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4cb36ff7707d7b591b2896b089ce2f6c76a99275) Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index 1641a7d8f9..b68eb6e0ee 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 e536675a61abe82e61b919f6b786755441d9fcd4c21e1c82fb9e5340dd229846 gnuchess-6.2.7.tar.gz +sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 60327dfe06..29d3590849 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.7 +GNUCHESS_VERSION = 6.2.8 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Jan 27 16:38:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:38:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gnuchess: security bump to version 6.2.9 Message-ID: <20220127163222.B53E482837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52404bc144d9ced1b2194cff1d95ffdc2110f892 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixed potential buffer overflow in pgnload and pgnreplay (CVE-2021-30184) https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85aab41ef9f818216635c9b0f64bf9c20c176135) Signed-off-by: Peter Korsgaard --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index b68eb6e0ee..0248abcf71 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847 gnuchess-6.2.8.tar.gz +sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 29d3590849..630b3aefa7 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.8 +GNUCHESS_VERSION = 6.2.9 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Jan 27 16:40:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:40:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnuchess: security bump to version 6.2.9 In-Reply-To: <20220109125456.316484-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 13:54:56 +0100") References: <20220109125456.316484-1-fontaine.fabrice@gmail.com> Message-ID: <87sft9b08i.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fixed potential buffer overflow in pgnload and pgnreplay > (CVE-2021-30184) > https://lists.gnu.org/archive/html/info-gnu-chess/2021-07/msg00000.html > https://git.savannah.gnu.org/cgit/chess.git/tree/NEWS?h=v6.2.9 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:41:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:41:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pkg-python.mk: fix typos Message-ID: <20220127163448.7BBB182837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=947b6bc79924101f2a7956fd291be05d5f512d6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x s/interperter/interpreter/ and drop 'use use' / 'depend on use'. Signed-off-by: Peter Korsgaard (cherry picked from commit 65054d1a1964548a72c320b075cb20a122117952) Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 59a48e5a87..7cdd858628 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -170,8 +170,8 @@ endif # - for target packages, we always depend on the default python interpreter # (the one selected by the config); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we depend on use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) @@ -230,8 +230,8 @@ endif # SETUP_TYPE # - for target packages, we always use the default python interpreter (which # is the same version as the one built and installed on the target); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we use use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) From peter at korsgaard.com Thu Jan 27 16:41:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:41:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pkg-python.mk: fix typos Message-ID: <20220127163452.EF91282837@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9279040543e9d2de39d8fdf222f80c82bb9c445e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x s/interperter/interpreter/ and drop 'use use' / 'depend on use'. Signed-off-by: Peter Korsgaard (cherry picked from commit 65054d1a1964548a72c320b075cb20a122117952) Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index e6b81bdfd3..bb1e6e5826 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -162,8 +162,8 @@ endif # - for target packages, we always depend on the default python interpreter # (the one selected by the config); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we depend on use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) @@ -222,8 +222,8 @@ endif # SETUP_TYPE # - for target packages, we always use the default python interpreter (which # is the same version as the one built and installed on the target); # - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we use use the default -# interperter; +# - if *_NEEDS_HOST_PYTHON is not set, then we use the default +# interpreter; # - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) From peter at korsgaard.com Thu Jan 27 16:45:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:45:09 +0100 Subject: [Buildroot] [PATCH] package/mesa3d/mesa3d.mk: fix typo in comment Message-ID: <20220127164509.22867-1-peter@korsgaard.com> Commit 6a51177af14a2ddaa (package/mesa3d: always enable glx-direct if glx is enabled) introduced a typo in the comment, fix that. Signed-off-by: Peter Korsgaard --- package/mesa3d/mesa3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index f49d96025a..6907d8c94f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -73,7 +73,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. -# Always enable glx-direct; without it, amy GLX applications don't work. +# Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ -Dglx=dri \ -Dglx-direct=true -- 2.20.1 From peter at korsgaard.com Thu Jan 27 16:47:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:47:11 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: account for unsure CVEs In-Reply-To: <20220109162602.909E582A93@busybox.osuosl.org> (Thomas Petazzoni's message of "Sun, 9 Jan 2022 17:31:55 +0100") References: <20220109162602.909E582A93@busybox.osuosl.org> Message-ID: <87o83xazxs.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=a206bbc5fe3453f8763268261c4a7aa6ba2c275d > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The .affects() method of the CVE class in support/scripts/cve.py can > return 3 values: CVE_AFFECTS, CVE_DOESNT_AFFECT and CVE_UNKNOWN. > We of course properly account for CVEs where .affects() return > CVE_AFFECTS, but the ones for which CVE_UNKNOWN is returned are > currently ignored, and therefore treated as if they did not affect the > package. > However CVE_UNKNOWN in fact indicates that the v_start/v_end fields of > the CPE entry could not be parsed by > distutils.version.LooseVersion(). Instead of ignoring such cases, this > commit adds support for the concept of "unsure CVEs", which will be > listed next to CVEs known to affect the package, so that we are aware > of them and can investigate the version issue. > Signed-off-by: Gregory CLEMENT > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:48:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:48:32 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: add --disable option In-Reply-To: <20220109162602.991D282DEC@busybox.osuosl.org> (Thomas Petazzoni's message of "Sun, 9 Jan 2022 17:31:55 +0100") References: <20220109162602.991D282DEC@busybox.osuosl.org> Message-ID: <87k0elazvj.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b102352b62917b053cae1f5d0591fe6507d81522 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > When debugging pkg-stats, it's quite useful to be able to disable some > features that are quite long (checking upstream URL, checking latest > version, checking CVE). This commit adds a --disable option, which can > take a comma-separated list of features to disable, such as: > ./support/scripts/pkg-stats --disable url,upstream > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. Committed to 2021.11.x, thanks. > --- > support/scripts/pkg-stats | 23 ++++++++++++++++------- > 1 file changed, 16 insertions(+), 7 deletions(-) > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index 00ca5647ee..7e20ccc0da 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -1099,6 +1099,10 @@ def resolvepath(path): > return os.path.abspath(os.path.expanduser(path)) > +def list_str(values): > + return values.split(',') > + > + > def parse_args(): > parser = argparse.ArgumentParser() > output = parser.add_argument_group('output', 'Output file(s)') > @@ -1115,6 +1119,9 @@ def parse_args(): > help='List of packages (comma separated)') > parser.add_argument('--nvd-path', dest='nvd_path', > help='Path to the local NVD database', type=resolvepath) > + parser.add_argument('--disable', type=list_str, > + help='Features to disable, comma-separated (cve, upstream, url)', > + default=[]) > args = parser.parse_args() > if not args.html and not args.json: > parser.error('at least one of --html or --json (or both) is required') > @@ -1161,13 +1168,15 @@ def __main__(): > pkg.set_url() > pkg.set_ignored_cves() > pkg.set_developers(developers) > - print("Checking URL status") > - loop = asyncio.get_event_loop() > - loop.run_until_complete(check_package_urls(packages)) > - print("Getting latest versions ...") > - loop = asyncio.get_event_loop() > - loop.run_until_complete(check_package_latest_version(packages)) > - if args.nvd_path: > + if not "url" in args.disable: > + print("Checking URL status") > + loop = asyncio.get_event_loop() > + loop.run_until_complete(check_package_urls(packages)) > + if not "upstream" in args.disable: > + print("Getting latest versions ...") > + loop = asyncio.get_event_loop() > + loop.run_until_complete(check_package_latest_version(packages)) > + if not "cve" in args.disable and args.nvd_path: > print("Checking packages CVEs") > check_package_cves(args.nvd_path, packages) > check_package_cpes(args.nvd_path, packages) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:48:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:48:43 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: add --disable option In-Reply-To: <20220109162602.991D282DEC@busybox.osuosl.org> (Thomas Petazzoni's message of "Sun, 9 Jan 2022 17:31:55 +0100") References: <20220109162602.991D282DEC@busybox.osuosl.org> Message-ID: <87ilu5azv8.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=b102352b62917b053cae1f5d0591fe6507d81522 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > When debugging pkg-stats, it's quite useful to be able to disable some > features that are quite long (checking upstream URL, checking latest > version, checking CVE). This commit adds a --disable option, which can > take a comma-separated list of features to disable, such as: > ./support/scripts/pkg-stats --disable url,upstream > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:46:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:46:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: account for unsure CVEs Message-ID: <20220127164713.5803E821F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1329957bdc123cef61aa1a68772188ac4f87a69 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The .affects() method of the CVE class in support/scripts/cve.py can return 3 values: CVE_AFFECTS, CVE_DOESNT_AFFECT and CVE_UNKNOWN. We of course properly account for CVEs where .affects() return CVE_AFFECTS, but the ones for which CVE_UNKNOWN is returned are currently ignored, and therefore treated as if they did not affect the package. However CVE_UNKNOWN in fact indicates that the v_start/v_end fields of the CPE entry could not be parsed by distutils.version.LooseVersion(). Instead of ignoring such cases, this commit adds support for the concept of "unsure CVEs", which will be listed next to CVEs known to affect the package, so that we are aware of them and can investigate the version issue. Signed-off-by: Gregory CLEMENT Signed-off-by: Thomas Petazzoni (cherry picked from commit a206bbc5fe3453f8763268261c4a7aa6ba2c275d) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index a435abff3d..00ca5647ee 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -101,6 +101,7 @@ class Package: self.cpeid = None self.cves = list() self.ignored_cves = list() + self.unsure_cves = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -580,8 +581,11 @@ def check_package_cve_affects(cve, cpe_product_pkgs): if product not in cpe_product_pkgs: continue for pkg in cpe_product_pkgs[product]: - if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS: + cve_status = cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) + if cve_status == cve.CVE_AFFECTS: pkg.cves.append(cve.identifier) + elif cve_status == cve.CVE_UNKNOWN: + pkg.unsure_cves.append(cve.identifier) def check_package_cves(nvd_path, packages): @@ -607,7 +611,7 @@ def check_package_cves(nvd_path, packages): for pkg in packages: if 'cve' not in pkg.status: - if pkg.cves: + if pkg.cves or pkg.unsure_cves: pkg.status['cve'] = ("error", "affected by CVEs") else: pkg.status['cve'] = ("ok", "not affected by CVEs") @@ -662,8 +666,11 @@ def calculate_stats(packages): stats["version-not-uptodate"] += 1 stats["patches"] += pkg.patch_count stats["total-cves"] += len(pkg.cves) + stats["total-unsure-cves"] += len(pkg.unsure_cves) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 + if len(pkg.unsure_cves) != 0: + stats["pkg-unsure-cves"] += 1 if pkg.cpeid: stats["cpe-id"] += 1 else: @@ -921,6 +928,8 @@ def dump_html_pkg(f, pkg): if pkg.is_status_error("cve"): for cve in pkg.cves: f.write("     %s
    \n" % (cve, cve)) + for cve in pkg.unsure_cves: + f.write("     %s (unsure)
    \n" % (cve, cve)) elif pkg.is_status_na("cve"): f.write(" %s" % pkg.status['cve'][1]) else: @@ -1024,6 +1033,10 @@ def dump_html_stats(f, stats): stats["pkg-cves"]) f.write("Total number of CVEs affecting all packages%s\n" % stats["total-cves"]) + f.write("Packages affected by unsure CVEs%s\n" % + stats["pkg-unsure-cves"]) + f.write("Total number of unsure CVEs affecting all packages%s\n" % + stats["total-unsure-cves"]) f.write("Packages with CPE ID%s\n" % stats["cpe-id"]) f.write("Packages without CPE ID%s\n" % From peter at korsgaard.com Thu Jan 27 16:54:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:54:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: fix ssh2 option Message-ID: <20220127164713.72E46821F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7e5a5a7918021697e9f309a14e4999e90059fb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c077b4a919d697c0b4f5c0c30d945418691e2e23) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 9a4788c905..291d892bae 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -219,10 +219,10 @@ LIBVIRT_CONF_OPTS += -Dsasl=disabled endif ifeq ($(BR2_PACKAGE_LIBSSH2),y) -LIBVIRT_CONF_OPTS += -Dssh2=enabled +LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 else -LIBVIRT_CONF_OPTS += -Dssh2=disabled +LIBVIRT_CONF_OPTS += -Dlibssh2=disabled endif ifeq ($(BR2_PACKAGE_LIBVIRT_LXC),y) From peter at korsgaard.com Thu Jan 27 16:48:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:48:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: add --disable option Message-ID: <20220127164713.60A24829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1261aa3c06a6392d674f4119b258aa722c47e59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When debugging pkg-stats, it's quite useful to be able to disable some features that are quite long (checking upstream URL, checking latest version, checking CVE). This commit adds a --disable option, which can take a comma-separated list of features to disable, such as: ./support/scripts/pkg-stats --disable url,upstream Signed-off-by: Thomas Petazzoni (cherry picked from commit b102352b62917b053cae1f5d0591fe6507d81522) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 00ca5647ee..7e20ccc0da 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1099,6 +1099,10 @@ def resolvepath(path): return os.path.abspath(os.path.expanduser(path)) +def list_str(values): + return values.split(',') + + def parse_args(): parser = argparse.ArgumentParser() output = parser.add_argument_group('output', 'Output file(s)') @@ -1115,6 +1119,9 @@ def parse_args(): help='List of packages (comma separated)') parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) + parser.add_argument('--disable', type=list_str, + help='Features to disable, comma-separated (cve, upstream, url)', + default=[]) args = parser.parse_args() if not args.html and not args.json: parser.error('at least one of --html or --json (or both) is required') @@ -1161,13 +1168,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - print("Checking URL status") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_urls(packages)) - print("Getting latest versions ...") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_latest_version(packages)) - if args.nvd_path: + if not "url" in args.disable: + print("Checking URL status") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_urls(packages)) + if not "upstream" in args.disable: + print("Getting latest versions ...") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_latest_version(packages)) + if not "cve" in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From peter at korsgaard.com Thu Jan 27 16:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:50:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: fix flake8 errors Message-ID: <20220127164713.69916829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29e4ff33c36ca865d9940edc16b1fd82a6006ebe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x support/scripts/pkg-stats:1171:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1175:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1179:8: E713 test for membership should be 'not in' 3 E713 test for membership should be 'not in' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1955772278 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 02e679d8bf8acae9e110820858d1f242ff971af8) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7e20ccc0da..abd36a3dd5 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1168,15 +1168,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - if not "url" in args.disable: + if "url" not in args.disable: print("Checking URL status") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_urls(packages)) - if not "upstream" in args.disable: + if "upstream" not in args.disable: print("Getting latest versions ...") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_latest_version(packages)) - if not "cve" in args.disable and args.nvd_path: + if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From peter at korsgaard.com Thu Jan 27 16:46:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:46:35 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: account for unsure CVEs Message-ID: <20220127164720.CEB34821F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67be1ff4f7c6db8091d1b09daa9e6765e6a6f329 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The .affects() method of the CVE class in support/scripts/cve.py can return 3 values: CVE_AFFECTS, CVE_DOESNT_AFFECT and CVE_UNKNOWN. We of course properly account for CVEs where .affects() return CVE_AFFECTS, but the ones for which CVE_UNKNOWN is returned are currently ignored, and therefore treated as if they did not affect the package. However CVE_UNKNOWN in fact indicates that the v_start/v_end fields of the CPE entry could not be parsed by distutils.version.LooseVersion(). Instead of ignoring such cases, this commit adds support for the concept of "unsure CVEs", which will be listed next to CVEs known to affect the package, so that we are aware of them and can investigate the version issue. Signed-off-by: Gregory CLEMENT Signed-off-by: Thomas Petazzoni (cherry picked from commit a206bbc5fe3453f8763268261c4a7aa6ba2c275d) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 6e656bfc29..0ac7466776 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -101,6 +101,7 @@ class Package: self.cpeid = None self.cves = list() self.ignored_cves = list() + self.unsure_cves = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -569,8 +570,11 @@ def check_package_cve_affects(cve, cpe_product_pkgs): if product not in cpe_product_pkgs: continue for pkg in cpe_product_pkgs[product]: - if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS: + cve_status = cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) + if cve_status == cve.CVE_AFFECTS: pkg.cves.append(cve.identifier) + elif cve_status == cve.CVE_UNKNOWN: + pkg.unsure_cves.append(cve.identifier) def check_package_cves(nvd_path, packages): @@ -596,7 +600,7 @@ def check_package_cves(nvd_path, packages): for pkg in packages: if 'cve' not in pkg.status: - if pkg.cves: + if pkg.cves or pkg.unsure_cves: pkg.status['cve'] = ("error", "affected by CVEs") else: pkg.status['cve'] = ("ok", "not affected by CVEs") @@ -651,8 +655,11 @@ def calculate_stats(packages): stats["version-not-uptodate"] += 1 stats["patches"] += pkg.patch_count stats["total-cves"] += len(pkg.cves) + stats["total-unsure-cves"] += len(pkg.unsure_cves) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 + if len(pkg.unsure_cves) != 0: + stats["pkg-unsure-cves"] += 1 if pkg.cpeid: stats["cpe-id"] += 1 else: @@ -904,6 +911,8 @@ def dump_html_pkg(f, pkg): if pkg.is_status_error("cve"): for cve in pkg.cves: f.write("     %s
    \n" % (cve, cve)) + for cve in pkg.unsure_cves: + f.write("     %s (unsure)
    \n" % (cve, cve)) elif pkg.is_status_na("cve"): f.write(" %s" % pkg.status['cve'][1]) else: @@ -986,6 +995,10 @@ def dump_html_stats(f, stats): stats["pkg-cves"]) f.write("Total number of CVEs affecting all packages%s\n" % stats["total-cves"]) + f.write("Packages affected by unsure CVEs%s\n" % + stats["pkg-unsure-cves"]) + f.write("Total number of unsure CVEs affecting all packages%s\n" % + stats["total-unsure-cves"]) f.write("Packages with CPE ID%s\n" % stats["cpe-id"]) f.write("Packages without CPE ID%s\n" % From peter at korsgaard.com Thu Jan 27 16:50:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:50:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: fix flake8 errors Message-ID: <20220127164720.E872C821F7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8f4ca025d3040f474977b7597bc22e226dc7b7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x support/scripts/pkg-stats:1171:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1175:8: E713 test for membership should be 'not in' support/scripts/pkg-stats:1179:8: E713 test for membership should be 'not in' 3 E713 test for membership should be 'not in' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1955772278 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 02e679d8bf8acae9e110820858d1f242ff971af8) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 2ccb7a8362..f6da090d22 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1130,15 +1130,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - if not "url" in args.disable: + if "url" not in args.disable: print("Checking URL status") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_urls(packages)) - if not "upstream" in args.disable: + if "upstream" not in args.disable: print("Getting latest versions ...") loop = asyncio.get_event_loop() loop.run_until_complete(check_package_latest_version(packages)) - if not "cve" in args.disable and args.nvd_path: + if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From peter at korsgaard.com Thu Jan 27 16:48:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:48:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: add --disable option Message-ID: <20220127164720.D69D3829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=679d40823bb3fc88e7358e88199b7a7d1e8c7bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x When debugging pkg-stats, it's quite useful to be able to disable some features that are quite long (checking upstream URL, checking latest version, checking CVE). This commit adds a --disable option, which can take a comma-separated list of features to disable, such as: ./support/scripts/pkg-stats --disable url,upstream Signed-off-by: Thomas Petazzoni (cherry picked from commit b102352b62917b053cae1f5d0591fe6507d81522) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 0ac7466776..2ccb7a8362 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1061,6 +1061,10 @@ def resolvepath(path): return os.path.abspath(os.path.expanduser(path)) +def list_str(values): + return values.split(',') + + def parse_args(): parser = argparse.ArgumentParser() output = parser.add_argument_group('output', 'Output file(s)') @@ -1077,6 +1081,9 @@ def parse_args(): help='List of packages (comma separated)') parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) + parser.add_argument('--disable', type=list_str, + help='Features to disable, comma-separated (cve, upstream, url)', + default=[]) args = parser.parse_args() if not args.html and not args.json: parser.error('at least one of --html or --json (or both) is required') @@ -1123,13 +1130,15 @@ def __main__(): pkg.set_url() pkg.set_ignored_cves() pkg.set_developers(developers) - print("Checking URL status") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_urls(packages)) - print("Getting latest versions ...") - loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_latest_version(packages)) - if args.nvd_path: + if not "url" in args.disable: + print("Checking URL status") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_urls(packages)) + if not "upstream" in args.disable: + print("Getting latest versions ...") + loop = asyncio.get_event_loop() + loop.run_until_complete(check_package_latest_version(packages)) + if not "cve" in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) check_package_cpes(args.nvd_path, packages) From peter at korsgaard.com Thu Jan 27 16:57:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:57:49 +0100 Subject: [Buildroot] [PATCH 1/3] package/libvirt: fix ssh2 option In-Reply-To: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 21:00:37 +0100") References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> Message-ID: <87a6fhazg2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since commit > fbf25acfbfd5a73b3560918bea081768abbe5723: > output/build/libvirt-7.7.0/meson.build:1:0: ERROR: Unknown options: "ssh2" > Fixes: > - No autobuilder failures (yet) > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:58:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:58:21 +0100 Subject: [Buildroot] [PATCH 2/3] package/libvirt: disable sasl In-Reply-To: <20220109200039.3188788-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 9 Jan 2022 21:00:38 +0100") References: <20220109200039.3188788-1-fontaine.fabrice@gmail.com> <20220109200039.3188788-2-fontaine.fabrice@gmail.com> Message-ID: <875yq5azf6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > sasl depends on libsasl2 (https://github.com/cyrusimap/cyrus-sasl) which > is not packaged yet in buildroot and will result in the following build > failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: > output/build/libvirt-7.7.0/meson.build:1212:2: ERROR: Dependency "libsasl2" not found, tried pkgconfig > Fixes: > - No autobuilder failures (yet) > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 16:58:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 17:58:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: disable sasl Message-ID: <20220127165358.E760A829F9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf0b5f24427dc01106d0c3c892763588dcb21b85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x sasl depends on libsasl2 (https://github.com/cyrusimap/cyrus-sasl) which is not packaged yet in buildroot and will result in the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: output/build/libvirt-7.7.0/meson.build:1212:2: ERROR: Dependency "libsasl2" not found, tried pkgconfig Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ba2016dc04271844416088b766284f9a22a6b58d) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 291d892bae..e7bfe6964d 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -62,6 +62,7 @@ LIBVIRT_CONF_OPTS = \ -Dpciaccess=enabled \ -Dpm_utils=disabled \ -Dsanlock=disabled \ + -Dsasl=disabled \ -Dsecdriver_apparmor=disabled \ -Dstorage_iscsi=disabled \ -Dstorage_iscsi_direct=disabled \ @@ -211,13 +212,6 @@ else LIBVIRT_CONF_OPTS += -Dnss=disabled endif -ifeq ($(BR2_PACKAGE_LIBGSASL),y) -LIBVIRT_CONF_OPTS += -Dsasl=enabled -LIBVIRT_DEPENDENCIES += libgsasl -else -LIBVIRT_CONF_OPTS += -Dsasl=disabled -endif - ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBVIRT_CONF_OPTS += -Dlibssh2=enabled LIBVIRT_DEPENDENCIES += libssh2 From petr.vorel at gmail.com Thu Jan 27 17:33:40 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Jan 2022 18:33:40 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 In-Reply-To: <87lez191e6.fsf@tarshish> References: <20220126235652.25712-1-petr.vorel@gmail.com> <87lez191e6.fsf@tarshish> Message-ID: Hi Baruch, > Hi Petr, > On Thu, Jan 27 2022, Petr Vorel wrote: > > LTP now builds metadata directory as host target. > > It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make > > (adding to configure does not work) to avoid adding -mlongcalls > > -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc). > > Drop patches from this release. > > Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch > > (still safe to carry it). > > Signed-off-by: Petr Vorel > > --- > > Changes v1->v2: > > * Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc > > when compiling host target) > [...] ... > > @@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \ > > LIBS="$(LTP_TESTSUITE_LIBS)" \ > > SYSROOT="$(STAGING_DIR)" > > +LTP_TESTSUITE_MAKE_ENV += \ > > + HOST_CFLAGS="$(HOST_CFLAGS)" \ > > + HOST_LDFLAGS="$(HOST_LDFLAGS)" > I think you should have TARGET_* on the right side of the assignment, > since this is a target package. No, it must be HOST_* because the whole exercise is needed to allow one bit of LTP code built for as host target. I tried to explain this in the commit message, but clearly I wasn't clear :). I've tested it on complete build that it's working like this. But using TARGET_* as you suggest HOST_CFLAGS would have the same options as CFLAGS, which I'm trying to avoid (that's the default if we don't set anything [1]). With TARGET_* (or nothing set at all) it fails at least on these 2 builds: br-arm-full-static [5/6]: FAILED bootlin-xtensa-uclibc [24/45]: FAILED * br-arm-full-static make -C "metadata" \ -f "br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata/Makefile" all make[1]: Entering directory 'br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata' /usr/bin/gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Os -g0 -static -Ibr-test-pkg/br-arm-full-static/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/tirpc -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -static metaparse.c -o metaparse /usr/lib64/gcc/x86_64-suse-linux/11/../../../../x86_64-suse-linux/bin/ld: cannot find -lc collect2: error: ld returned 1 exit status make[1]: *** [../include/mk/rules.mk:27: metaparse] Error 1 make[1]: Leaving directory 'br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata' make: *** [Makefile:106: metadata-all] Error 2 * bootlin-xtensa-uclibc make -C "metadata" \ -f "br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata/Makefile" all make[1]: Entering directory 'br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata' /usr/bin/gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -mlongcalls -mauto-litpools -Os -g0 -Ibr-test-pkg/bootlin-xtensa-uclibc/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/include/tirpc -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition metaparse.c -o metaparse gcc: error: unrecognized command-line option ?-mlongcalls? gcc: error: unrecognized command-line option ?-mauto-litpools? make[1]: *** [../include/mk/rules.mk:27: metaparse] Error 1 make[1]: Leaving directory 'br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata' Kind regards, Petr [1] https://lore.kernel.org/ltp/YfJ6fIbFvN7rD0SR at pevik/ > baruch From fontaine.fabrice at gmail.com Thu Jan 27 17:53:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 27 Jan 2022 18:53:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/htpdate: fix install Message-ID: <20220127175359.2330776-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: >>> htpdate 1.3.3 Installing to target PATH="/home/buildroot/autobuild/instance-0/output-1/host/bin:/home/buildroot/autobuild/instance-0/output-1/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3 DESTDIR=/home/buildroot/autobuild/instance-0/output-1/target install make[1]: Entering directory '/home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3' strip -s htpdate strip: Unable to recognise the format of the input file `htpdate' Fixes: - http://autobuild.buildroot.org/results/f1034de5ebc2fc2c49711820077d0b6e5e13aea5 Signed-off-by: Fabrice Fontaine --- package/htpdate/htpdate.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 200c3207a2..54b3ec2569 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -19,7 +19,8 @@ define HTPDATE_BUILD_CMDS endef define HTPDATE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR) install endef define HTPDATE_INSTALL_INIT_SYSV -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 27 18:04:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 27 Jan 2022 19:04:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/jasper: use JAS_ENABLE_DOC Message-ID: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> Replace CMAKE_DISABLE_FIND_PACKAGE_{DOXYGEN,LATEX} by JAS_ENABLE_DOC which is available (and working as expected) since version 2.0.20 and https://github.com/jasper-software/jasper/commit/cddb7b199a1c78f3ec0b2c6b8af705588437af4b Signed-off-by: Fabrice Fontaine --- package/jasper/jasper.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 6ef1afcac7..59c5b3d66a 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -11,9 +11,7 @@ JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = \ - -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ - -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE +JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF -- 2.34.1 From fontaine.fabrice at gmail.com Thu Jan 27 18:04:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 27 Jan 2022 19:04:56 +0100 Subject: [Buildroot] [PATCH 2/2] package/jasper: bump to version 2.0.33 In-Reply-To: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> References: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> Message-ID: <20220127180456.2338773-2-fontaine.fabrice@gmail.com> https://github.com/jasper-software/jasper/blob/version-2.0.33/NEWS Signed-off-by: Fabrice Fontaine --- package/jasper/jasper.hash | 2 +- package/jasper/jasper.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index 67653a8e88..410bcfc683 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b4e5f682be0ab1a5acb0eeb6bf41d6ce17a658bb8e2dbda95de40100939cc88 jasper-2.0.28.tar.gz +sha256 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a jasper-2.0.33.tar.gz sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 59c5b3d66a..05168db763 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,8 +4,8 @@ # ################################################################################ -JASPER_VERSION = 2.0.28 -JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) +JASPER_VERSION = 2.0.33 +JASPER_SITE = https://github.com/jasper-software/jasper/releases/download/version-$(JASPER_VERSION) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE -- 2.34.1 From peter at korsgaard.com Thu Jan 27 18:30:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:30:32 +0100 Subject: [Buildroot] [PATCH 1/2] DEVELOPERS: add entry for avrdude to Yegor Yefremov In-Reply-To: <20220110085850.11095-1-yegorslists@googlemail.com> (yegorslists's message of "Mon, 10 Jan 2022 09:58:49 +0100") References: <20220110085850.11095-1-yegorslists@googlemail.com> Message-ID: <871r0tav5j.fsf@dell.be.48ers.dk> >>>>> "yegorslists---" == yegorslists--- via buildroot writes: > From: Yegor Yefremov > Signed-off-by: Yegor Yefremov Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 18:30:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:30:51 +0100 Subject: [Buildroot] [git commit] Developpers: remove Santosh Multhalli for valjson In-Reply-To: <20220110140611.2CCBF83241@busybox.osuosl.org> (Yann E. MORIN's message of "Mon, 10 Jan 2022 15:11:53 +0100") References: <20220110140611.2CCBF83241@busybox.osuosl.org> Message-ID: <87wnil9gkk.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=31fd98c6ae7c39d779e7f9729e55ec65a7f847ff > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Signed-off-by: Santosh Multhalli > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 18:31:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:31:45 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: drop Henrique Camargo In-Reply-To: <20220111144110.01B1D82B52@busybox.osuosl.org> (Thomas Petazzoni's message of "Tue, 11 Jan 2022 15:46:59 +0100") References: <20220111144110.01B1D82B52@busybox.osuosl.org> Message-ID: <87sft99gj2.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=f51be73f25bdc9b370db42996475136098ebd251 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > He has privately requested to no longer be notified regarding this > package. > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Jan 27 18:31:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:31:23 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: drop Henrique Camargo Message-ID: <20220127182510.84F3C82A00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3da77e6b2555a35ead4807e39c5520822f7142df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x He has privately requested to no longer be notified regarding this package. Signed-off-by: Thomas Petazzoni (cherry picked from commit f51be73f25bdc9b370db42996475136098ebd251) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 834419f9c5..e2c0f4d521 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1145,9 +1145,6 @@ F: package/linuxptp/ F: package/netopeer2/ F: package/sysrepo/ -N: Henrique Camargo -F: package/json-glib/ - N: Herv?? Codina F: package/dtbocfg/ F: package/libdbi/ From peter at korsgaard.com Thu Jan 27 18:20:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:20:51 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: libvirtd needs C++ for nmap-ncat Message-ID: <20220127182510.4A09D829FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53195812536db9890745f6ed69174888177bb812 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure raised since commit fbf25acfbfd5a73b3560918bea081768abbe5723: WARNING: unmet direct dependencies detected for BR2_PACKAGE_NMAP Depends on [n]: BR2_INSTALL_LIBSTDCPP [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] Selected by [y]: - BR2_PACKAGE_LIBVIRT_DAEMON [=y] && BR2_PACKAGE_LIBVIRT [=y] && !BR2_PACKAGE_NETCAT_OPENBSD [=n] Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: C++ only needed without NETCAT_OPENBSD] Signed-off-by: Yann E. MORIN (cherry picked from commit 4dff1be05e906f5c3cfd56ebc1458579635b4ca7) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index e75f1cf15f..103d1b9543 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,6 +44,7 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y + depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES @@ -57,6 +58,9 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. +comment "libvirtd needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD + # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON From peter at korsgaard.com Thu Jan 27 18:29:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:29:43 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] DEVELOPERS: add entry for avrdude to Yegor Yefremov Message-ID: <20220127182510.6F52E829FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a19f45e6428f538b2cce3b71ee2efde717cf4624 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN (cherry picked from commit 922fdcd47d092e9d2f7000afcb7997a2a2ed2111) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index de7d2c3fbf..1775b75791 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2883,6 +2883,7 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ +F: package/avrdude/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ From peter at korsgaard.com Thu Jan 27 18:29:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:29:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Developpers: remove Santosh Multhalli for valjson Message-ID: <20220127182510.79E2E829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11f988730e18fccbf3c865193ae8da929b900b40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Santosh Multhalli Signed-off-by: Yann E. MORIN (cherry picked from commit 31fd98c6ae7c39d779e7f9729e55ec65a7f847ff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1775b75791..834419f9c5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2425,9 +2425,6 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Santosh Multhalli -F: package/valijson/ - N: S??bastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ From peter at korsgaard.com Thu Jan 27 18:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:21:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirtd: fix recursive dependency in Kconfig Message-ID: <20220127182510.56B66829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcc1585d9ddb12ff849cf0e0940d90389e23123e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit 4dff1be05e90 (package/libvirt: libvirtd needs C++ for nmap-ncat) introduce a recursive dependency (really: a circular dependency): package/busybox/Config.in:33:error: recursive dependency detected! package/busybox/Config.in:33: symbol BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is selected by BR2_PACKAGE_EBTABLES_UTILS_SAVE package/ebtables/Config.in:11: symbol BR2_PACKAGE_EBTABLES_UTILS_SAVE depends on BR2_PACKAGE_EBTABLES package/ebtables/Config.in:1: symbol BR2_PACKAGE_EBTABLES is selected by BR2_PACKAGE_LIBVIRT_DAEMON package/libvirt/Config.in:44: symbol BR2_PACKAGE_LIBVIRT_DAEMON depends on BR2_PACKAGE_NETCAT_OPENBSD package/netcat-openbsd/Config.in:1: symbol BR2_PACKAGE_NETCAT_OPENBSD depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS As usual with this kind of circular depednency, it is not trivial to see what the real cuplrit is, or where to cut the circle. A simple solution in this case is to drop the C++ dependency, and switch the netcat-openbsd and nmap-ncat dependencies conditions. Signed-off-by: Yann E. MORIN (cherry picked from commit f81242ae4fb64ab85af5d38e70246222276552ae) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 103d1b9543..b91b8e2c1c 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,15 +44,13 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y - depends on BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_NETCAT_OPENBSD # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES select BR2_PACKAGE_IPTABLES select BR2_PACKAGE_IPROUTE2 # These are required because there is no way to unequivocally select a modern netcat - select BR2_PACKAGE_NMAP if !BR2_PACKAGE_NETCAT_OPENBSD - select BR2_PACKAGE_NMAP_NCAT if !BR2_PACKAGE_NETCAT_OPENBSD + select BR2_PACKAGE_NETCAT_OPENBSD if !BR2_PACKAGE_NMAP_NCAT select BR2_PACKAGE_RADVD help Build the libvirt daemon (libvirtd) otherwise build only the From peter at korsgaard.com Thu Jan 27 18:21:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:21:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: drop C++ comment Message-ID: <20220127182510.6030082A00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=213d4e125ddb398cacbe4a0aec4f631f3ca1d55c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit f81242ae4fb64ab85af5d38e70246222276552ae forgot to drop C++ comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit fb9a65d98b128c1b06069013e0ab874779ef5228) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index b91b8e2c1c..af0fc36aea 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -56,9 +56,6 @@ config BR2_PACKAGE_LIBVIRT_DAEMON Build the libvirt daemon (libvirtd) otherwise build only the utility programs. -comment "libvirtd needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_NETCAT_OPENBSD - # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON From peter at korsgaard.com Thu Jan 27 18:29:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:29:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: add entry for avrdude to Yegor Yefremov Message-ID: <20220127182514.E376D829FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1cd0d2cf52511215df0586174a2609c374c0513 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN (cherry picked from commit 922fdcd47d092e9d2f7000afcb7997a2a2ed2111) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9108d11f3c..1e54d62466 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2737,6 +2737,7 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ +F: package/avrdude/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ From peter at korsgaard.com Thu Jan 27 18:29:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 27 Jan 2022 19:29:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Developpers: remove Santosh Multhalli for valjson Message-ID: <20220127182514.EFA9F829FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35baab9abf3ffa44d2318eb5d2063cfd5547b88d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Santosh Multhalli Signed-off-by: Yann E. MORIN (cherry picked from commit 31fd98c6ae7c39d779e7f9729e55ec65a7f847ff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1e54d62466..57e4592b4a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2309,9 +2309,6 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Santosh Multhalli -F: package/valijson/ - N: S??bastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ From james.hilliard1 at gmail.com Thu Jan 27 18:39:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 11:39:24 -0700 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson Message-ID: <20220127183924.1938903-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/network-manager/Config.in | 1 + package/network-manager/network-manager.mk | 100 ++++++++++----------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..da1a7d79b3 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help This option enables support for ModemManager diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..290333e16c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ libgcrypt wireless_tools util-linux host-intltool libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no - NETWORK_MANAGER_CONF_OPTS = \ - --disable-introspection \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --without-nm-cloud-setup + -Dintrospection=false \ + -Ddocs=false \ + -Dtests=no \ + -Dqt=false \ + -Dcrypto=gnutls \ + -Diptables=/usr/sbin/iptables \ + -Difupdown=false \ + -Dnm_cloud_setup=false \ + -Dsession_tracking_consolekit=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd -NETWORK_MANAGER_CONF_OPTS += --with-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=true else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=false endif ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl -NETWORK_MANAGER_CONF_OPTS += --enable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true else -NETWORK_MANAGER_CONF_OPTS += --disable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false endif ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl -NETWORK_MANAGER_CONF_OPTS += --with-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true else -NETWORK_MANAGER_CONF_OPTS += --without-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) NETWORK_MANAGER_DEPENDENCIES += libselinux -NETWORK_MANAGER_CONF_OPTS += --with-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true else -NETWORK_MANAGER_CONF_OPTS += --without-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=true NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=true else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=true else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_CONF_OPTS += \ - --with-systemd-journal \ - --with-config-logging-backend-default=journal \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd + -Dsystemd_journal=true \ + -Dconfig_logging_backend_default=journal \ + -Dsession_tracking=systemd \ + -Dsuspend_resume=systemd else NETWORK_MANAGER_CONF_OPTS += \ - --without-systemd-journal \ - --with-config-logging-backend-default=syslog \ - --without-session-tracking \ - --with-suspend-resume=upower + -Dsystemd_journal=false \ + -Dconfig_logging_backend_default=syslog \ + -Dsession_tracking=no \ + -Dsuspend_resume=upower \ + -Dsystemdsystemunitdir=no endif ifeq ($(BR2_PACKAGE_POLKIT),y) NETWORK_MANAGER_DEPENDENCIES += polkit -NETWORK_MANAGER_CONF_OPTS += --enable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true else -NETWORK_MANAGER_CONF_OPTS += --disable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false endif ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false endif define NETWORK_MANAGER_INSTALL_INIT_SYSV @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.25.1 From yann.morin.1998 at free.fr Thu Jan 27 18:46:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 19:46:29 +0100 Subject: [Buildroot] [git commit] package/mesa3d/mesa3d.mk: fix typo in comment Message-ID: <20220127183940.C03B58257C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9a7f54083e9b4c2461abcf06cfb0387a7ce51dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 6a51177af14a2ddaa (package/mesa3d: always enable glx-direct if glx is enabled) introduced a typo in the comment, fix that. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/mesa3d/mesa3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index f49d96025a..6907d8c94f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -73,7 +73,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. -# Always enable glx-direct; without it, amy GLX applications don't work. +# Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ -Dglx=dri \ -Dglx-direct=true From yann.morin.1998 at free.fr Thu Jan 27 18:47:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 19:47:02 +0100 Subject: [Buildroot] [PATCH] package/mesa3d/mesa3d.mk: fix typo in comment In-Reply-To: <20220127164509.22867-1-peter@korsgaard.com> References: <20220127164509.22867-1-peter@korsgaard.com> Message-ID: <20220127184702.GM457876@scaer> Peter, All, On 2022-01-27 17:45 +0100, Peter Korsgaard spake thusly: > Commit 6a51177af14a2ddaa (package/mesa3d: always enable glx-direct if glx is > enabled) introduced a typo in the comment, fix that. > > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/mesa3d/mesa3d.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index f49d96025a..6907d8c94f 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -73,7 +73,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) > # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi > # xlib : xlib conflicts with any dri driver > # gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. > -# Always enable glx-direct; without it, amy GLX applications don't work. > +# Always enable glx-direct; without it, many GLX applications don't work. > MESA3D_CONF_OPTS += \ > -Dglx=dri \ > -Dglx-direct=true > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 27 18:49:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 19:49:45 +0100 Subject: [Buildroot] [git commit] package/htpdate: fix install Message-ID: <20220127184256.B4004829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e7e19a5b07e533716f3e1612c10a85fa2966d6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: >>> htpdate 1.3.3 Installing to target PATH="/home/buildroot/autobuild/instance-0/output-1/host/bin:/home/buildroot/autobuild/instance-0/output-1/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3 DESTDIR=/home/buildroot/autobuild/instance-0/output-1/target install make[1]: Entering directory '/home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3' strip -s htpdate strip: Unable to recognise the format of the input file `htpdate' Fixes: - http://autobuild.buildroot.org/results/f1034de5ebc2fc2c49711820077d0b6e5e13aea5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/htpdate/htpdate.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 200c3207a2..54b3ec2569 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -19,7 +19,8 @@ define HTPDATE_BUILD_CMDS endef define HTPDATE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR) install endef define HTPDATE_INSTALL_INIT_SYSV From yann.morin.1998 at free.fr Thu Jan 27 18:50:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 19:50:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/htpdate: fix install In-Reply-To: <20220127175359.2330776-1-fontaine.fabrice@gmail.com> References: <20220127175359.2330776-1-fontaine.fabrice@gmail.com> Message-ID: <20220127185005.GN457876@scaer> Fabrice, All, On 2022-01-27 18:53 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 1.3.3 in > commit 163509a8e0d558e6339c5489f072dfe805e0cc34: > > >>> htpdate 1.3.3 Installing to target > PATH="/home/buildroot/autobuild/instance-0/output-1/host/bin:/home/buildroot/autobuild/instance-0/output-1/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3 DESTDIR=/home/buildroot/autobuild/instance-0/output-1/target install > make[1]: Entering directory '/home/buildroot/autobuild/instance-0/output-1/build/htpdate-1.3.3' > strip -s htpdate > strip: Unable to recognise the format of the input file `htpdate' > > Fixes: > - http://autobuild.buildroot.org/results/f1034de5ebc2fc2c49711820077d0b6e5e13aea5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/htpdate/htpdate.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk > index 200c3207a2..54b3ec2569 100644 > --- a/package/htpdate/htpdate.mk > +++ b/package/htpdate/htpdate.mk > @@ -19,7 +19,8 @@ define HTPDATE_BUILD_CMDS > endef > > define HTPDATE_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install > + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ > + DESTDIR=$(TARGET_DIR) install > endef > > define HTPDATE_INSTALL_INIT_SYSV > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Thu Jan 27 19:23:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:07 -0700 Subject: [Buildroot] [PATCH v2 1/5] package/serd: new package Message-ID: <20220127192311.1954197-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/serd/Config.in | 8 ++++++++ package/serd/serd.hash | 4 ++++ package/serd/serd.mk | 20 ++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/serd/Config.in create mode 100644 package/serd/serd.hash create mode 100644 package/serd/serd.mk diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..6e40b0e9ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1335,6 +1335,7 @@ F: package/python-tomli/ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ +F: package/serd/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index e4ca195beb..decf523821 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1720,6 +1720,7 @@ menu "JSON/XML" source "package/rapidjson/Config.in" source "package/rapidxml/Config.in" source "package/raptor/Config.in" + source "package/serd/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" diff --git a/package/serd/Config.in b/package/serd/Config.in new file mode 100644 index 0000000000..7633a979e2 --- /dev/null +++ b/package/serd/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SERD + bool "serd" + help + Serd is a lightweight C library for RDF syntax which + supports reading and writing Turtle, TriG, NTriples, and + NQuads. + + https://drobilla.net/software/serd.html diff --git a/package/serd/serd.hash b/package/serd/serd.hash new file mode 100644 index 0000000000..d64a2aa271 --- /dev/null +++ b/package/serd/serd.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig +sha256 affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf serd-0.30.10.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/serd/serd.mk b/package/serd/serd.mk new file mode 100644 index 0000000000..85b16f6866 --- /dev/null +++ b/package/serd/serd.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# serd +# +################################################################################ + +SERD_VERSION = 0.30.10 +SERD_SITE = https://download.drobilla.net +SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2 +SERD_LICENSE = ISC +SERD_LICENSE_FILES = COPYING +SERD_INSTALL_STAGING = YES + +SERD_CONF_OPTS += --largefile --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SERD_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 19:23:08 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:08 -0700 Subject: [Buildroot] [PATCH v2 2/5] package/sord: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: <20220127192311.1954197-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sord/Config.in | 8 ++++++++ package/sord/sord.hash | 4 ++++ package/sord/sord.mk | 25 +++++++++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/sord/Config.in create mode 100644 package/sord/sord.hash create mode 100644 package/sord/sord.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6e40b0e9ae..0d70c676d5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1336,6 +1336,7 @@ F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ F: package/serd/ +F: package/sord/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index decf523821..aa700bc8d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1721,6 +1721,7 @@ menu "JSON/XML" source "package/rapidxml/Config.in" source "package/raptor/Config.in" source "package/serd/Config.in" + source "package/sord/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" diff --git a/package/sord/Config.in b/package/sord/Config.in new file mode 100644 index 0000000000..91dfb41d0b --- /dev/null +++ b/package/sord/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SORD + bool "sord" + select BR2_PACKAGE_SERD + help + Sord is a lightweight C library for storing RDF data in + memory. + + https://drobilla.net/software/sord.html diff --git a/package/sord/sord.hash b/package/sord/sord.hash new file mode 100644 index 0000000000..af175f91f0 --- /dev/null +++ b/package/sord/sord.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc +sha256 7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14 sord-0.16.8.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/sord/sord.mk b/package/sord/sord.mk new file mode 100644 index 0000000000..f805805e9d --- /dev/null +++ b/package/sord/sord.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# sord +# +################################################################################ + +SORD_VERSION = 0.16.8 +SORD_SITE = https://download.drobilla.net +SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2 +SORD_LICENSE = ISC +SORD_LICENSE_FILES = COPYING +SORD_DEPENDENCIES = host-pkgconf serd +SORD_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_PCRE),y) +SORD_DEPENDENCIES += pcre +endif + +SORD_CONF_OPTS += --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SORD_CONF_OPTS += --static --no-shared --static-progs +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 19:23:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:09 -0700 Subject: [Buildroot] [PATCH v2 3/5] package/lv2: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: <20220127192311.1954197-3-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - disable plugins for static build --- DEVELOPERS | 1 + package/Config.in | 1 + package/lv2/Config.in | 8 ++++++++ package/lv2/lv2.hash | 4 ++++ package/lv2/lv2.mk | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 package/lv2/Config.in create mode 100644 package/lv2/lv2.hash create mode 100644 package/lv2/lv2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0d70c676d5..548570aa46 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1285,6 +1285,7 @@ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/lv2/ F: package/pipewire/ F: package/python-aioconsole/ F: package/python-aiodns/ diff --git a/package/Config.in b/package/Config.in index aa700bc8d7..80d3f9ff3c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1372,6 +1372,7 @@ menu "Audio/Sound" source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" + source "package/lv2/Config.in" source "package/mp4v2/Config.in" source "package/openal/Config.in" source "package/opencore-amr/Config.in" diff --git a/package/lv2/Config.in b/package/lv2/Config.in new file mode 100644 index 0000000000..aeeb6d0451 --- /dev/null +++ b/package/lv2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LV2 + bool "lv2" + help + LV2 is a plugin standard for audio systems. It defines + a minimal yet extensible C API for plugin code and a + format for plugin "bundles". + + https://lv2plug.in/ diff --git a/package/lv2/lv2.hash b/package/lv2/lv2.hash new file mode 100644 index 0000000000..ed21620bee --- /dev/null +++ b/package/lv2/lv2.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://lv2plug.in/spec/lv2-1.18.2.tar.bz2.asc +sha256 4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e lv2-1.18.2.tar.bz2 +sha256 0b0b07d852e3ce7fa04986e141f73001bd7f260683968f0a19e02dbcc4131aa6 COPYING diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk new file mode 100644 index 0000000000..13ffaa34b0 --- /dev/null +++ b/package/lv2/lv2.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# lv2 +# +################################################################################ + +LV2_VERSION = 1.18.2 +LV2_SITE = https://lv2plug.in/spec +LV2_SOURCE = lv2-$(LV2_VERSION).tar.bz2 +LV2_LICENSE = ISC +LV2_LICENSE_FILES = COPYING +LV2_DEPENDENCIES = host-pkgconf +LV2_INSTALL_STAGING = YES + +LV2_CONF_OPTS += \ + --no-coverage \ + --no-check-links \ + --copy-headers + +ifeq ($(BR2_PACKAGE_CAIRO),y) +LV2_DEPENDENCIES += cairo +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +LV2_DEPENDENCIES += libsndfile +endif + +ifeq ($(BR2_PACKAGE_LIBGTK2),y) +LV2_DEPENDENCIES += libgtk2 +endif + +ifeq ($(BR2_STATIC_LIBS),y) +LV2_CONF_OPTS += --no-plugins +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 19:23:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:10 -0700 Subject: [Buildroot] [PATCH v2 4/5] package/sratom: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: <20220127192311.1954197-4-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- DEVELOPERS | 1 + package/Config.in | 1 + package/sratom/Config.in | 10 ++++++++++ package/sratom/sratom.hash | 4 ++++ package/sratom/sratom.mk | 21 +++++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/sratom/Config.in create mode 100644 package/sratom/sratom.hash create mode 100644 package/sratom/sratom.mk diff --git a/DEVELOPERS b/DEVELOPERS index 548570aa46..c4c46fc3bd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1338,6 +1338,7 @@ F: package/python-yarl/ F: package/python-zopfli/ F: package/serd/ F: package/sord/ +F: package/sratom/ F: package/zchunk/ N: James Knight diff --git a/package/Config.in b/package/Config.in index 80d3f9ff3c..547620a266 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1383,6 +1383,7 @@ menu "Audio/Sound" source "package/spandsp/Config.in" source "package/speex/Config.in" source "package/speexdsp/Config.in" + source "package/sratom/Config.in" source "package/taglib/Config.in" source "package/tinyalsa/Config.in" source "package/tremor/Config.in" diff --git a/package/sratom/Config.in b/package/sratom/Config.in new file mode 100644 index 0000000000..771e82073d --- /dev/null +++ b/package/sratom/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_SRATOM + bool "sratom" + select BR2_PACKAGE_LV2 + select BR2_PACKAGE_SERD + select BR2_PACKAGE_SORD + help + Sratom is a library for serialising LV2 atoms to and from + RDF, particularly the Turtle syntax. + + https://drobilla.net/software/sratom.html diff --git a/package/sratom/sratom.hash b/package/sratom/sratom.hash new file mode 100644 index 0000000000..64d460b2ea --- /dev/null +++ b/package/sratom/sratom.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/sratom-0.6.8.tar.bz2.asc +sha256 3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df sratom-0.6.8.tar.bz2 +sha256 3fc429d6b944fa20306357196a28bb4dd7c25e2d67edebec771f44de5bd7f9e8 COPYING diff --git a/package/sratom/sratom.mk b/package/sratom/sratom.mk new file mode 100644 index 0000000000..e1e0f4e033 --- /dev/null +++ b/package/sratom/sratom.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# sratom +# +################################################################################ + +SRATOM_VERSION = 0.6.8 +SRATOM_SITE = https://download.drobilla.net +SRATOM_SOURCE = sratom-$(SRATOM_VERSION).tar.bz2 +SRATOM_LICENSE = ISC +SRATOM_LICENSE_FILES = COPYING +SRATOM_DEPENDENCIES = host-pkgconf lv2 serd sord +SRATOM_INSTALL_STAGING = YES + +SRATOM_CONF_OPTS += --no-coverage + +ifeq ($(BR2_STATIC_LIBS),y) +SRATOM_CONF_OPTS += --static --no-shared +endif + +$(eval $(waf-package)) -- 2.25.1 From james.hilliard1 at gmail.com Thu Jan 27 19:23:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 12:23:11 -0700 Subject: [Buildroot] [PATCH v2 5/5] package/lilv: new package In-Reply-To: <20220127192311.1954197-1-james.hilliard1@gmail.com> References: <20220127192311.1954197-1-james.hilliard1@gmail.com> Message-ID: <20220127192311.1954197-5-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - require dynamic library support --- DEVELOPERS | 1 + package/Config.in | 1 + package/lilv/Config.in | 15 +++++++++++++++ package/lilv/lilv.hash | 4 ++++ package/lilv/lilv.mk | 30 ++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 package/lilv/Config.in create mode 100644 package/lilv/lilv.hash create mode 100644 package/lilv/lilv.mk diff --git a/DEVELOPERS b/DEVELOPERS index c4c46fc3bd..5bde1695e7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1285,6 +1285,7 @@ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/lilv/ F: package/lv2/ F: package/pipewire/ F: package/python-aioconsole/ diff --git a/package/Config.in b/package/Config.in index 547620a266..84a53577e7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1372,6 +1372,7 @@ menu "Audio/Sound" source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" + source "package/lilv/Config.in" source "package/lv2/Config.in" source "package/mp4v2/Config.in" source "package/openal/Config.in" diff --git a/package/lilv/Config.in b/package/lilv/Config.in new file mode 100644 index 0000000000..08d54bcf8b --- /dev/null +++ b/package/lilv/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LILV + bool "lilv" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LV2 + select BR2_PACKAGE_SERD + select BR2_PACKAGE_SORD + select BR2_PACKAGE_SRATOM + help + Lilv is a C library to make the use of LV2 plugins as simple + as possible for applications. + + https://drobilla.net/software/lilv.html + +comment "lilv needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/lilv/lilv.hash b/package/lilv/lilv.hash new file mode 100644 index 0000000000..afa20fc083 --- /dev/null +++ b/package/lilv/lilv.hash @@ -0,0 +1,4 @@ +# Locally calculated after checking signature +# https://download.drobilla.net/lilv-0.24.12.tar.bz2.asc +sha256 26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061 lilv-0.24.12.tar.bz2 +sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/lilv/lilv.mk b/package/lilv/lilv.mk new file mode 100644 index 0000000000..5f9186e66a --- /dev/null +++ b/package/lilv/lilv.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# lilv +# +################################################################################ + +LILV_VERSION = 0.24.12 +LILV_SITE = https://download.drobilla.net +LILV_SOURCE = lilv-$(LILV_VERSION).tar.bz2 +LILV_LICENSE = ISC +LILV_LICENSE_FILES = COPYING +LILV_DEPENDENCIES = host-pkgconf lv2 serd sord sratom +LILV_INSTALL_STAGING = YES + +LILV_CONF_OPTS += \ + --dyn-manifest \ + --no-bash-completion \ + --no-coverage + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LILV_DEPENDENCIES += python3 +else +LILV_CONF_OPTS += --no-bindings +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +LILV_DEPENDENCIES += libsndfile +endif + +$(eval $(waf-package)) -- 2.25.1 From yann.morin.1998 at free.fr Thu Jan 27 19:26:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 20:26:33 +0100 Subject: [Buildroot] [git commit] package/jasper: simplify disabling documentation Message-ID: <20220127192022.7E49582946@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b630df6fb24ec7f79564bea5fd6d0154268a6ed3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace CMAKE_DISABLE_FIND_PACKAGE_{DOXYGEN,LATEX} by JAS_ENABLE_DOC which is available (and working as expected) since version 2.0.20 and https://github.com/jasper-software/jasper/commit/cddb7b199a1c78f3ec0b2c6b8af705588437af4b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/jasper/jasper.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 6ef1afcac7..59c5b3d66a 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -11,9 +11,7 @@ JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = \ - -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ - -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE +JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF From yann.morin.1998 at free.fr Thu Jan 27 19:27:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 20:27:02 +0100 Subject: [Buildroot] [git commit] package/jasper: bump to version 2.0.33 Message-ID: <20220127192022.8695B82A00@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f791221c8616bfa6d338ce6c287353395cc2c61a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/jasper-software/jasper/blob/version-2.0.33/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/jasper/jasper.hash | 2 +- package/jasper/jasper.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index 67653a8e88..410bcfc683 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b4e5f682be0ab1a5acb0eeb6bf41d6ce17a658bb8e2dbda95de40100939cc88 jasper-2.0.28.tar.gz +sha256 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a jasper-2.0.33.tar.gz sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 59c5b3d66a..05168db763 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,8 +4,8 @@ # ################################################################################ -JASPER_VERSION = 2.0.28 -JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) +JASPER_VERSION = 2.0.33 +JASPER_SITE = https://github.com/jasper-software/jasper/releases/download/version-$(JASPER_VERSION) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Thu Jan 27 19:28:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 20:28:22 +0100 Subject: [Buildroot] [PATCH 1/2] package/jasper: use JAS_ENABLE_DOC In-Reply-To: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> References: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> Message-ID: <20220127192822.GO457876@scaer> Fabrice, All, On 2022-01-27 19:04 +0100, Fabrice Fontaine spake thusly: > Replace CMAKE_DISABLE_FIND_PACKAGE_{DOXYGEN,LATEX} by JAS_ENABLE_DOC > which is available (and working as expected) since version 2.0.20 and > https://github.com/jasper-software/jasper/commit/cddb7b199a1c78f3ec0b2c6b8af705588437af4b > > Signed-off-by: Fabrice Fontaine I've slightly reworded the commit title, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/jasper/jasper.mk | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk > index 6ef1afcac7..59c5b3d66a 100644 > --- a/package/jasper/jasper.mk > +++ b/package/jasper/jasper.mk > @@ -11,9 +11,7 @@ JASPER_LICENSE = JasPer-2.0 > JASPER_LICENSE_FILES = LICENSE > JASPER_CPE_ID_VENDOR = jasper_project > JASPER_SUPPORTS_IN_SOURCE_BUILD = NO > -JASPER_CONF_OPTS = \ > - -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ > - -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE > +JASPER_CONF_OPTS = -DJAS_ENABLE_DOC=OFF > > ifeq ($(BR2_STATIC_LIBS),y) > JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Thu Jan 27 19:28:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 20:28:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/jasper: bump to version 2.0.33 In-Reply-To: <20220127180456.2338773-2-fontaine.fabrice@gmail.com> References: <20220127180456.2338773-1-fontaine.fabrice@gmail.com> <20220127180456.2338773-2-fontaine.fabrice@gmail.com> Message-ID: <20220127192837.GP457876@scaer> Fabrice, All, On 2022-01-27 19:04 +0100, Fabrice Fontaine spake thusly: > https://github.com/jasper-software/jasper/blob/version-2.0.33/NEWS > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/jasper/jasper.hash | 2 +- > package/jasper/jasper.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash > index 67653a8e88..410bcfc683 100644 > --- a/package/jasper/jasper.hash > +++ b/package/jasper/jasper.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 6b4e5f682be0ab1a5acb0eeb6bf41d6ce17a658bb8e2dbda95de40100939cc88 jasper-2.0.28.tar.gz > +sha256 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a jasper-2.0.33.tar.gz > sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE > diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk > index 59c5b3d66a..05168db763 100644 > --- a/package/jasper/jasper.mk > +++ b/package/jasper/jasper.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -JASPER_VERSION = 2.0.28 > -JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) > +JASPER_VERSION = 2.0.33 > +JASPER_SITE = https://github.com/jasper-software/jasper/releases/download/version-$(JASPER_VERSION) > JASPER_INSTALL_STAGING = YES > JASPER_LICENSE = JasPer-2.0 > JASPER_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From christian at paral.in Thu Jan 27 20:31:09 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 27 Jan 2022 12:31:09 -0800 Subject: [Buildroot] [PATCH v3 2/2] package/buildah: new package In-Reply-To: <20220127090141.7d0645f2@windsurf> References: <20220127062504.1835450-1-christian@paral.in> <20220127062504.1835450-2-christian@paral.in> <20220127090141.7d0645f2@windsurf> Message-ID: Hi Thomas, On Thu, Jan 27, 2022 at 12:01 AM Thomas Petazzoni wrote: > Considering that there are runtime dependency concerns, it would be > nice to have a simple test case in support/testing/. OK, something like "buildah pull" or so? > > +BUILDAH_DEPENDENCIES = libgpgme > > Is libgpgme really a runtime dependency, as noted in your changelog? If Gpg is a runtime dependency, libgpgme is a build dependency. > > +HOST_BUILDAH_BUILD_TARGETS = $(BUILDAH_BUILD_TARGETS) > > +HOST_BUILDAH_TAGS = $(BUILDAH_TAGS) > > +HOST_BUILDAH_LDFLAGS = $(BUILDAH_LDFLAGS) > > +HOST_BUILDAH_INSTALL_BINS = $(BUILDAH_INSTALL_BINS) > > That "repetition" also makes me think we should have some level of > inheritance between target and host variables in the golang-package > infrastructure. For BUILD_TARGETS, TAGS and INSTALL_BINS, it sounds > fine to do it. Yes - unless the package overrides them - this should be fine. I was a bit surprised that it, on default, tries to build the binary named "host-runc" as well as a Go package named "host-runc". Of course, this is not the name of neither the binary nor the package. So the host-golang infra should remove the host- prefix for the default BUILD_TARGETS and INSTALL_BINS. This would also be fixed if those values were inherited from the target package. > However, for LDFLAGS, it's a bit weird, as normally, > LDFLAGS are different between host and target. However here, there are > mostly used to pass these version-related -X options, that are in fact > the same between host and target. Should we have a separate variable to > pass those flags ? Not sure. They are quite common for Go packages - could call them DEFINES or something similar. The syntax overrides the value of a global variable in a package. Best regards, Christian From yann.morin.1998 at free.fr Thu Jan 27 21:09:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 22:09:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson In-Reply-To: <20220127183924.1938903-1-james.hilliard1@gmail.com> References: <20220127183924.1938903-1-james.hilliard1@gmail.com> Message-ID: <20220127210924.GQ457876@scaer> James, All, On 2022-01-27 11:39 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard > --- > package/network-manager/Config.in | 1 + > package/network-manager/network-manager.mk | 100 ++++++++++----------- > 2 files changed, 48 insertions(+), 53 deletions(-) > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > index a48cb37b15..da1a7d79b3 100644 > --- a/package/network-manager/Config.in > +++ b/package/network-manager/Config.in > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI > config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER > bool "modem-manager support" > select BR2_PACKAGE_MODEM_MANAGER > + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO It looks like this is totally unrelated to the switch to meson, and should be applied in its own right, and then backported to the maintenance branches, no? If it is due to the switch to meson, then it should be explained in the commit log. Regards, Yann E. MORIN. > help > This option enables support for ModemManager > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > index 974320fce0..290333e16c 100644 > --- a/package/network-manager/network-manager.mk > +++ b/package/network-manager/network-manager.mk > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > NETWORK_MANAGER_INSTALL_STAGING = YES > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ > libgcrypt wireless_tools util-linux host-intltool libndp > NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) > NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome > NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager > NETWORK_MANAGER_SELINUX_MODULES = networkmanager > > -NETWORK_MANAGER_CONF_ENV = \ > - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ > - ac_cv_file__etc_fedora_release=no \ > - ac_cv_file__etc_mandriva_release=no \ > - ac_cv_file__etc_debian_version=no \ > - ac_cv_file__etc_redhat_release=no \ > - ac_cv_file__etc_SuSE_release=no > - > NETWORK_MANAGER_CONF_OPTS = \ > - --disable-introspection \ > - --disable-tests \ > - --disable-qt \ > - --disable-more-warnings \ > - --with-crypto=gnutls \ > - --with-iptables=/usr/sbin/iptables \ > - --disable-ifupdown \ > - --without-nm-cloud-setup > + -Dintrospection=false \ > + -Ddocs=false \ > + -Dtests=no \ > + -Dqt=false \ > + -Dcrypto=gnutls \ > + -Diptables=/usr/sbin/iptables \ > + -Difupdown=false \ > + -Dnm_cloud_setup=false \ > + -Dsession_tracking_consolekit=false > > ifeq ($(BR2_PACKAGE_AUDIT),y) > NETWORK_MANAGER_DEPENDENCIES += audit > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes > else > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no > endif > > ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient > endif > > ifeq ($(BR2_PACKAGE_DHCPCD),y) > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd > endif > > ifeq ($(BR2_PACKAGE_IWD),y) > NETWORK_MANAGER_DEPENDENCIES += iwd > -NETWORK_MANAGER_CONF_OPTS += --with-iwd > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false > endif > > ifeq ($(BR2_PACKAGE_LIBCURL),y) > NETWORK_MANAGER_DEPENDENCIES += libcurl > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true > else > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false > endif > > ifeq ($(BR2_PACKAGE_LIBPSL),y) > NETWORK_MANAGER_DEPENDENCIES += libpsl > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false > endif > > ifeq ($(BR2_PACKAGE_LIBSELINUX),y) > NETWORK_MANAGER_DEPENDENCIES += libselinux > -NETWORK_MANAGER_CONF_OPTS += --with-selinux > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-selinux > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false > endif > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) > -NETWORK_MANAGER_DEPENDENCIES += modem-manager > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false > endif > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true > NETWORK_MANAGER_DEPENDENCIES += jansson > else > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false > endif > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) > NETWORK_MANAGER_DEPENDENCIES += pppd > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true > else > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false > endif > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) > NETWORK_MANAGER_DEPENDENCIES += newt > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false > endif > > ifeq ($(BR2_PACKAGE_OFONO),y) > NETWORK_MANAGER_DEPENDENCIES += ofono > -NETWORK_MANAGER_CONF_OPTS += --with-ofono > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-ofono > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false > endif > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > NETWORK_MANAGER_DEPENDENCIES += systemd > NETWORK_MANAGER_CONF_OPTS += \ > - --with-systemd-journal \ > - --with-config-logging-backend-default=journal \ > - --with-session-tracking=systemd \ > - --with-suspend-resume=systemd > + -Dsystemd_journal=true \ > + -Dconfig_logging_backend_default=journal \ > + -Dsession_tracking=systemd \ > + -Dsuspend_resume=systemd > else > NETWORK_MANAGER_CONF_OPTS += \ > - --without-systemd-journal \ > - --with-config-logging-backend-default=syslog \ > - --without-session-tracking \ > - --with-suspend-resume=upower > + -Dsystemd_journal=false \ > + -Dconfig_logging_backend_default=syslog \ > + -Dsession_tracking=no \ > + -Dsuspend_resume=upower \ > + -Dsystemdsystemunitdir=no > endif > > ifeq ($(BR2_PACKAGE_POLKIT),y) > NETWORK_MANAGER_DEPENDENCIES += polkit > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true > else > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false > endif > > ifeq ($(BR2_PACKAGE_READLINE),y) > NETWORK_MANAGER_DEPENDENCIES += readline > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true > else > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false > endif > > define NETWORK_MANAGER_INSTALL_INIT_SYSV > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD > > endef > > -$(eval $(autotools-package)) > +$(eval $(meson-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Thu Jan 27 21:15:07 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 14:15:07 -0700 Subject: [Buildroot] [PATCH v6 1/1] package/qt5: bump packages to latest kde submodule versions Message-ID: <20220127211507.2767083-1-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches which don't have proper version tags. Create a .git file so to trigger headers sync during configure. Hold back updating qt5webengine for now since the latest version requires significant changes to build, just tweak existing version to be compatible with latest kde versions for now. Signed-off-by: James Hilliard --- Changes v5 -> v6: - drop upstream patches - rebase on master Changes v4 -> v5: - leave qt5webengine on current version - add minimal tweaks to qt5webengine to build with updated kde deps Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 +- ...Fix-build-with-GCC-11-include-limits.patch | 53 ------ ...avoiding-huge-number-of-tiny-dashes.patch} | 0 .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------- .../0008-Add-missing-limits-include.patch | 32 ---- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 ----- ...-intensive-painting-of-high-number-o.patch | 163 ------------------ ...-avoiding-huge-number-of-tiny-dashes.patch | 100 ----------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 +- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 +- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 +- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 ----- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 +- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 +- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +- package/qt5/qt5location-mapboxgl/Config.in | 4 + .../qt5location-mapboxgl.hash | 16 ++ .../qt5location-mapboxgl.mk | 14 ++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 +- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 +- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 +- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 +- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 +- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 +- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 +- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 +- ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 ++++++++ package/qt5/qt5webengine/qt5webengine.mk | 9 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 +- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 +- 79 files changed, 306 insertions(+), 653 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch rename package/qt5/qt5base/{0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch => 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch} (100%) delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch delete mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..3e498f6a28 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..656e3067dc 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,9 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 +QT5_VERSION = $(QT5_VERSION_MAJOR).8 QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch similarity index 100% rename from package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch rename to package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch deleted file mode 100644 index 03287d19ca..0000000000 --- a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Tue, 13 Apr 2021 14:23:45 +0200 -Subject: [PATCH] Avoid processing-intensive painting of high number of tiny - dashes - -When stroking a dashed path, an unnecessary amount of processing would -be spent if there is a huge number of dashes visible, e.g. because of -scaling. Since the dashes are too small to be indivdually visible -anyway, just replace with a semi-transparent solid line for such -cases. - -Pick-to: 6.1 6.0 5.15 -Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) - -* asturmlechner 2021-08-21: -Conflict from preceding 94dd2ceb in dev branch: - src/gui/painting/qpaintengineex.cpp - Resolved via: - - if (pen.style() > Qt::SolidLine) { - QRectF cpRect = path.controlPointRect(); - const QTransform &xf = state()->matrix; -- if (pen.isCosmetic()) { -+ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ - clipRect = d->exDeviceRect; - cpRect.translate(xf.dx(), xf.dy()); - } else { - -FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: - Resolved via: - - QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; - qreal extent = qMax(extentRect.width(), extentRect.height()); - qreal patternLength = 0; -- const QList pattern = pen.dashPattern(); -+ const QVector pattern = pen.dashPattern(); - const int patternSize = qMin(pattern.size(), 32); - for (int i = 0; i < patternSize; i++) - patternLength += qMax(pattern.at(i), qreal(0)); - -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- - .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ - 2 files changed, 69 insertions(+), 9 deletions(-) - create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 5d8f89eadd..55fdb0c2a0 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const - - Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp - --void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) -+void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - { - #ifdef QT_DEBUG_DRAW - qDebug() << "QPaintEngineEx::stroke()" << pen; -@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) - d->stroker.setCubicToHook(qpaintengineex_cubicTo); - } - -+ QRectF clipRect; -+ QPen pen = inPen; -+ if (pen.style() > Qt::SolidLine) { -+ QRectF cpRect = path.controlPointRect(); -+ const QTransform &xf = state()->matrix; -+ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ -+ clipRect = d->exDeviceRect; -+ cpRect.translate(xf.dx(), xf.dy()); -+ } else { -+ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); -+ } -+ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway -+ QRectF extentRect = cpRect & clipRect; -+ qreal extent = qMax(extentRect.width(), extentRect.height()); -+ qreal patternLength = 0; -+ const QVector pattern = pen.dashPattern(); -+ const int patternSize = qMin(pattern.size(), 32); -+ for (int i = 0; i < patternSize; i++) -+ patternLength += qMax(pattern.at(i), qreal(0)); -+ if (pen.widthF()) -+ patternLength *= pen.widthF(); -+ if (qFuzzyIsNull(patternLength)) { -+ pen.setStyle(Qt::NoPen); -+ } else if (extent / patternLength > 10000) { -+ // approximate stream of tiny dashes with semi-transparent solid line -+ pen.setStyle(Qt::SolidLine); -+ QColor color(pen.color()); -+ color.setAlpha(color.alpha() / 2); -+ pen.setColor(color); -+ } -+ } -+ - if (!qpen_fast_equals(pen, d->strokerPen)) { - d->strokerPen = pen; - d->stroker.setJoinStyle(pen.joinStyle()); -@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) - return; - } - -- if (pen.style() > Qt::SolidLine) { -- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ -- d->activeStroker->setClipRect(d->exDeviceRect); -- } else { -- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); -- d->activeStroker->setClipRect(clipRect); -- } -- } -+ if (!clipRect.isNull()) -+ d->activeStroker->setClipRect(clipRect); - - if (d->activeStroker == &d->stroker) - d->stroker.setForceOpen(path.hasExplicitOpen()); -diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps -new file mode 100644 -index 0000000000..d41ced7f5f ---- /dev/null -+++ b/tests/auto/other/lancelot/scripts/tinydashes.qps -@@ -0,0 +1,34 @@ -+# Version: 1 -+# CheckVsReference: 5% -+ -+path_addEllipse mypath 20.0 20.0 200.0 200.0 -+ -+save -+setPen blue 20 SolidLine FlatCap -+pen_setCosmetic true -+pen_setDashPattern [ 0.0004 0.0004 ] -+setBrush yellow -+ -+drawPath mypath -+translate 300 0 -+setRenderHint Antialiasing true -+drawPath mypath -+restore -+ -+path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 -+ -+setPen blue 20 DotLine FlatCap -+setBrush yellow -+ -+save -+translate 0 300 -+scale 0.0001 0.00011 -+drawPath bigpath -+restore -+ -+save -+translate 300 300 -+setRenderHint Antialiasing true -+scale 0.0001 0.00011 -+drawPath bigpath -+restore --- -2.34.1 - diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index ca3c2736ae..0000000000 --- a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 30 Jul 2021 13:03:49 +0200 -Subject: [PATCH] Refix for avoiding huge number of tiny dashes - -Previous fix hit too widely so some valid horizontal and vertical -lines were affected; the root problem being that such lines have an -empty control point rect (width or height is 0). Fix by caculating in -the pen width. - -Pick-to: 6.2 6.1 5.15 -Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 8 ++--- - .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ - 2 files changed, 35 insertions(+), 4 deletions(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 19e4b23423..9fe510827a 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); - } - // Check to avoid generating unwieldy amount of dashes that will not be visible anyway -- QRectF extentRect = cpRect & clipRect; -+ qreal pw = pen.widthF() ? pen.widthF() : 1; -+ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; - qreal extent = qMax(extentRect.width(), extentRect.height()); - qreal patternLength = 0; - const QVector pattern = pen.dashPattern(); - const int patternSize = qMin(pattern.size(), 32); - for (int i = 0; i < patternSize; i++) - patternLength += qMax(pattern.at(i), qreal(0)); -- if (pen.widthF()) -- patternLength *= pen.widthF(); -+ patternLength *= pw; - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { -+ } else if (extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); -diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -index 42e98ce363..d7c3f95f1d 100644 ---- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -@@ -308,6 +308,7 @@ private slots: - void fillPolygon(); - - void drawImageAtPointF(); -+ void scaledDashes(); - - private: - void fillData(); -@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() - paint.end(); - } - -+void tst_QPainter::scaledDashes() -+{ -+ // Test that we do not hit the limit-huge-number-of-dashes path -+ QRgb fore = qRgb(0, 0, 0xff); -+ QRgb back = qRgb(0xff, 0xff, 0); -+ QImage image(5, 32, QImage::Format_RGB32); -+ image.fill(back); -+ QPainter p(&image); -+ QPen pen(QColor(fore), 3, Qt::DotLine); -+ p.setPen(pen); -+ p.scale(1, 2); -+ p.drawLine(2, 0, 2, 16); -+ p.end(); -+ -+ bool foreFound = false; -+ bool backFound = false; -+ int i = 0; -+ while (i < 32 && (!foreFound || !backFound)) { -+ QRgb pix = image.pixel(3, i); -+ if (pix == fore) -+ foreFound = true; -+ else if (pix == back) -+ backFound = true; -+ i++; -+ } -+ -+ QVERIFY(foreFound); -+ QVERIFY(backFound); -+} -+ - QTEST_MAIN(tst_QPainter) - - #include "tst_qpainter.moc" --- -2.34.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..a4ffd6b9a2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 13d3f871973033b24cd0b4a563812277153835897c61152aaebb6e468b3f8233 qtbase-7ec73b4e75eb4359f49e5dd2be291d459a685ace.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4ef3759566..b5501f8a9c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 7ec73b4e75eb4359f49e5dd2be291d459a685ace +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..f9dc08a6e0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..036baed444 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..fd616b74a6 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 9237818f2202d9473b035750b2aa598b9c31ea19abf8ae898957d33da03d0553 qtquickcontrols2-0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..4be6cd9117 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = 0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..1e4dc54c67 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..849a2b7f1b 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 728012f7762ecd5762d493f8796907c6456f31e7 +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..1e2c658109 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..db0884fd18 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..35708ec077 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..70e5b2655e 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..cebd6d0fe2 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,8 +4,9 @@ # ################################################################################ -QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) +QT5WEBENGINE_VERSION_MAJOR = 5.15 +QT5WEBENGINE_VERSION = $(QT5WEBENGINE_VERSION_MAJOR).2 +QT5WEBENGINE_SITE = https://download.qt.io/archive/qt/$(QT5WEBENGINE_VERSION_MAJOR)/$(QT5WEBENGINE_VERSION)/submodules QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ @@ -44,7 +45,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From yann.morin.1998 at free.fr Thu Jan 27 21:15:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 22:15:08 +0100 Subject: [Buildroot] [git commit] package/binutils: remove libiberty from target install Message-ID: <20220127210927.1332682753@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4edfb8fef84d64a62d14d485e7cead3ab9e0b8b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In BINUTILS_INSTALL_TARGET_CMDS (target!), libiberty is installed to STAGING_DIR. This is not necessary since libiberty is already unconditionally installed to staging in BINUTILS_INSTALL_STAGING_CMDS. Furthermore the presence of STAGING_DIR path in TARGET_CMDS is confusing and incorrect. Moreover libiberty is static only. Static libraries are only used at build time, not at run time so we do not need to install libiberty in target. This commit removes the incorrect libiberty install in TARGET_CMDS and adds a comment to clarify why we do not see libiberty installed on target. Signed-off-by: Jonathan Borne [yann.morin.1998 at free.fr: - reword comment, move it toward the _INSTALL_TARGET_CMDS - rewrap and slightly reword commit log ] Signed-off-by: Yann E. MORIN --- package/binutils/binutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 13f61be035..8c4a1371ca 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -103,10 +103,10 @@ endef # If we don't want full binutils on target ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) +# libiberty is static-only, so it is only installed to staging, above. define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif From yann.morin.1998 at free.fr Thu Jan 27 21:18:19 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 27 Jan 2022 22:18:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/binutils: remove libiberty from target install In-Reply-To: <20220127135339.25430-2-jborne@kalray.eu> References: <20220127135339.25430-1-jborne@kalray.eu> <20220127135339.25430-2-jborne@kalray.eu> Message-ID: <20220127211819.GR457876@scaer> Jonathan, All, Thanks for this new iteration. :-) On 2022-01-27 14:53 +0100, Jonathan Borne via buildroot spake thusly: > In BINUTILS_INSTALL_TARGET_CMDS, libiberty is installed > to STAGING_DIR > > This is not necessary since libiberty is already > unconditionally installed to staging in > BINUTILS_INSTALL_STAGING_CMDS. Furthermore the presence > of STAGING_DIR path in TARGET_CMDS is confusing. > > Moreover libiberty is static only. Static libraries > are only used at build time, not at run time so > we do not want to install libiberty on target. > > This commit removes the unnecessary libiberty > install in TARGET_CMDS and add a comment to clarify > why we do not see libiberty installed on target. I've slightly reworded the commit log, and rewrapped it closer to the usual 72-char width. > Signed-off-by: Jonathan Borne > --- > package/binutils/binutils.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk > index 13f61be035..32ca70d325 100644 > --- a/package/binutils/binutils.mk > +++ b/package/binutils/binutils.mk > @@ -95,6 +95,8 @@ BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) > > # We just want libbfd, libiberty and libopcodes, > # not the full-blown binutils in staging > +# Static-only libraries such as libiberty are used at buildtime in staging > +# but are not installed to target. I believe the comment in fact makes more sense closer to the _ISNTALL_TARGET_CMDS, so I moved it there, and reworded it appropriately. Applied to master, thanks. Regards, Yann E. MORIN. > define BINUTILS_INSTALL_STAGING_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install > @@ -106,7 +108,6 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) > define BINUTILS_INSTALL_TARGET_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install > endef > endif > > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Thu Jan 27 21:18:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 27 Jan 2022 14:18:39 -0700 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson In-Reply-To: <20220127210924.GQ457876@scaer> References: <20220127183924.1938903-1-james.hilliard1@gmail.com> <20220127210924.GQ457876@scaer> Message-ID: On Thu, Jan 27, 2022 at 2:09 PM Yann E. MORIN wrote: > > James, All, > > On 2022-01-27 11:39 -0700, James Hilliard spake thusly: > > Signed-off-by: James Hilliard > > --- > > package/network-manager/Config.in | 1 + > > package/network-manager/network-manager.mk | 100 ++++++++++----------- > > 2 files changed, 48 insertions(+), 53 deletions(-) > > > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > > index a48cb37b15..da1a7d79b3 100644 > > --- a/package/network-manager/Config.in > > +++ b/package/network-manager/Config.in > > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI > > config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER > > bool "modem-manager support" > > select BR2_PACKAGE_MODEM_MANAGER > > + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO > > It looks like this is totally unrelated to the switch to meson, and > should be applied in its own right, and then backported to the > maintenance branches, no? > > If it is due to the switch to meson, then it should be explained in the > commit log. Well meson is enforcing that dependency is present while autotools was not. I'm not really sure if it's actually a hard requirement for the modem manager integration to work correctly. > > Regards, > Yann E. MORIN. > > > help > > This option enables support for ModemManager > > > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > index 974320fce0..290333e16c 100644 > > --- a/package/network-manager/network-manager.mk > > +++ b/package/network-manager/network-manager.mk > > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 > > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > > NETWORK_MANAGER_INSTALL_STAGING = YES > > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ > > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ > > libgcrypt wireless_tools util-linux host-intltool libndp > > NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) > > NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md > > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome > > NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager > > NETWORK_MANAGER_SELINUX_MODULES = networkmanager > > > > -NETWORK_MANAGER_CONF_ENV = \ > > - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ > > - ac_cv_file__etc_fedora_release=no \ > > - ac_cv_file__etc_mandriva_release=no \ > > - ac_cv_file__etc_debian_version=no \ > > - ac_cv_file__etc_redhat_release=no \ > > - ac_cv_file__etc_SuSE_release=no > > - > > NETWORK_MANAGER_CONF_OPTS = \ > > - --disable-introspection \ > > - --disable-tests \ > > - --disable-qt \ > > - --disable-more-warnings \ > > - --with-crypto=gnutls \ > > - --with-iptables=/usr/sbin/iptables \ > > - --disable-ifupdown \ > > - --without-nm-cloud-setup > > + -Dintrospection=false \ > > + -Ddocs=false \ > > + -Dtests=no \ > > + -Dqt=false \ > > + -Dcrypto=gnutls \ > > + -Diptables=/usr/sbin/iptables \ > > + -Difupdown=false \ > > + -Dnm_cloud_setup=false \ > > + -Dsession_tracking_consolekit=false > > > > ifeq ($(BR2_PACKAGE_AUDIT),y) > > NETWORK_MANAGER_DEPENDENCIES += audit > > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no > > endif > > > > ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) > > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient > > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient > > endif > > > > ifeq ($(BR2_PACKAGE_DHCPCD),y) > > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd > > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd > > endif > > > > ifeq ($(BR2_PACKAGE_IWD),y) > > NETWORK_MANAGER_DEPENDENCIES += iwd > > -NETWORK_MANAGER_CONF_OPTS += --with-iwd > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBCURL),y) > > NETWORK_MANAGER_DEPENDENCIES += libcurl > > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBPSL),y) > > NETWORK_MANAGER_DEPENDENCIES += libpsl > > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBSELINUX),y) > > NETWORK_MANAGER_DEPENDENCIES += libselinux > > -NETWORK_MANAGER_CONF_OPTS += --with-selinux > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-selinux > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) > > -NETWORK_MANAGER_DEPENDENCIES += modem-manager > > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 > > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) > > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true > > NETWORK_MANAGER_DEPENDENCIES += jansson > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) > > NETWORK_MANAGER_DEPENDENCIES += pppd > > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) > > NETWORK_MANAGER_DEPENDENCIES += newt > > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false > > endif > > > > ifeq ($(BR2_PACKAGE_OFONO),y) > > NETWORK_MANAGER_DEPENDENCIES += ofono > > -NETWORK_MANAGER_CONF_OPTS += --with-ofono > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-ofono > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false > > endif > > > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > > NETWORK_MANAGER_DEPENDENCIES += systemd > > NETWORK_MANAGER_CONF_OPTS += \ > > - --with-systemd-journal \ > > - --with-config-logging-backend-default=journal \ > > - --with-session-tracking=systemd \ > > - --with-suspend-resume=systemd > > + -Dsystemd_journal=true \ > > + -Dconfig_logging_backend_default=journal \ > > + -Dsession_tracking=systemd \ > > + -Dsuspend_resume=systemd > > else > > NETWORK_MANAGER_CONF_OPTS += \ > > - --without-systemd-journal \ > > - --with-config-logging-backend-default=syslog \ > > - --without-session-tracking \ > > - --with-suspend-resume=upower > > + -Dsystemd_journal=false \ > > + -Dconfig_logging_backend_default=syslog \ > > + -Dsession_tracking=no \ > > + -Dsuspend_resume=upower \ > > + -Dsystemdsystemunitdir=no > > endif > > > > ifeq ($(BR2_PACKAGE_POLKIT),y) > > NETWORK_MANAGER_DEPENDENCIES += polkit > > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false > > endif > > > > ifeq ($(BR2_PACKAGE_READLINE),y) > > NETWORK_MANAGER_DEPENDENCIES += readline > > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false > > endif > > > > define NETWORK_MANAGER_INSTALL_INIT_SYSV > > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD > > > > endef > > > > -$(eval $(autotools-package)) > > +$(eval $(meson-package)) > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Thu Jan 27 23:22:09 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 27 Jan 2022 23:22:09 +0000 Subject: [Buildroot] [Bug 14556] New: python-crossbar fails to build Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14556 Bug ID: 14556 Summary: python-crossbar fails to build Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: emile.cormier.jr at gmail.com CC: buildroot at uclibc.org Target Milestone: --- The buildroot crossbar package does not work in the latest release/head of buildroot. After two days of playing dependency whac-a-mole, I've been able to make it work again with the following steps: 1. Remove the package-crossbar/0002-Remove-idna-requirement.patch and replace it with another patch which does the following: - Change the idna requirement to >=2.5,<4 to match that of the Requests v2.27.1 package included with the latest buildroot. The idna v3.3 package is the one currently bundled with buildroot. - Change the urllib3 requirement to >=1.21.1,<1.27 to match that of the Requests v2.27.1 package included with the latest buildroot. The urllib3 v1.26.8 package is the one currently bundled with buildroot. - Remove the importlib-resources>=4.1.1 requirement. The importlib-resources 5.0 features have been merged into the CPython 3.10 included with the latest buildroot. 2. Generate a new python-zlmdb package via utility/scanpypi. scanpypi fails before terminating, but it generates a viable python-zlmdb package nonetheless. 3. Add a patch for the new python-zlmdb package which removes pytest-runner from the setup-requirements in setup.py. 4. Bump buildroot's python-pyopenssl version to 21.0.0. 5. Bump buildroot's python-snappy version to 0.6.0. 6. Bump buildroot's python-trek version to 21.5.0. 7. Add these missing dependencies in python-crossbar/Config.in: bcrypt, cffi, colorama, wsaccel, zlmdb, argon_cffi, cbor2, flatbuffers, msgpack, snappy, ujson I will submit a patch with the above changes, but I first need some time to familiarize myself with your submission conventions. (Cross-posted to https://github.com/crossbario/crossbar/issues/1936) -- You are receiving this mail because: You are on the CC list for the bug. From petr.vorel at gmail.com Fri Jan 28 01:46:02 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Fri, 28 Jan 2022 02:46:02 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/ltp-testsuite: bump version to 20220121 In-Reply-To: <87lez191e6.fsf@tarshish> References: <20220126235652.25712-1-petr.vorel@gmail.com> <87lez191e6.fsf@tarshish> Message-ID: Hi, FYI tested: bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed andes-nds32 [ 1/45]: OK arm-aarch64 [ 2/45]: OK bootlin-aarch64-glibc [ 3/45]: OK bootlin-arcle-hs38-uclibc [ 4/45]: OK bootlin-armv5-uclibc [ 5/45]: OK bootlin-armv7-glibc [ 6/45]: OK bootlin-armv7m-uclibc [ 7/45]: SKIPPED bootlin-armv7-musl [ 8/45]: OK bootlin-microblazeel-uclibc [ 9/45]: OK bootlin-mipsel-uclibc [10/45]: OK bootlin-mipsel32r6-glibc [11/45]: OK bootlin-m68k-5208-uclibc [12/45]: SKIPPED bootlin-m68k-68040-uclibc [13/45]: OK bootlin-nios2-glibc [14/45]: SKIPPED bootlin-openrisc-uclibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: OK bootlin-powerpc64le-power8-glibc [17/45]: OK bootlin-riscv32-glibc [18/45]: OK bootlin-riscv64-glibc [19/45]: OK bootlin-riscv64-musl [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc-uclibc [22/45]: SKIPPED bootlin-sparc64-glibc [23/45]: OK bootlin-xtensa-uclibc [24/45]: OK bootlin-x86-64-glibc [25/45]: OK bootlin-x86-64-musl [26/45]: OK bootlin-x86-64-uclibc [27/45]: OK br-arm-basic [28/45]: OK br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: OK br-i386-pentium-mmx-musl [31/45]: OK br-i386-pentium4-full [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips [43/45]: OK sourcery-mips64 [44/45]: OK sourcery-nios2 [45/45]: SKIPPED 45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Kind regards, Petr From cheart0 at gmail.com Fri Jan 28 03:59:23 2022 From: cheart0 at gmail.com (Chris) Date: Fri, 28 Jan 2022 12:59:23 +0900 Subject: [Buildroot] swupdate suricatta build error Message-ID: Hi, there Did anybody ever see the same issue? When build 2021.11 for raspberry pi, we added swupdate package and enabled suricatta mode by "make swupdate-menuconfig", then we got error as below, suricatta/common.c:79:26: error: storage size of ?json_res? isn?t known 79 | enum json_tokener_error json_res; | ^~~~~~~~ suricatta/common.c:82:15: warning: implicit declaration of function ?json_tokener_parse_ex? [-Wimplicit-function-declaration] 82 | json_root = json_tokener_parse_ex( | ^~~~~~~~~~~~~~~~~~~~~ suricatta/common.c:82:13: warning: assignment to ?struct json_object *? from ?int? makes pointer from integer without a cast [-Wint-conversion] 82 | json_root = json_tokener_parse_ex( | ^ suricatta/common.c:84:23: warning: implicit declaration of function ?json_tokener_get_error? [-Wimplicit-function-declaration] 84 | } while ((json_res = json_tokener_get_error(json_tokenizer)) == | ^~~~~~~~~~~~~~~~~~~~~~ suricatta/common.c:85:4: error: ?json_tokener_continue? undeclared (first use in this function) 85 | json_tokener_continue); | ^~~~~~~~~~~~~~~~~~~~~ suricatta/common.c:85:4: note: each undeclared identifier is reported only once for each function it appears in suricatta/common.c:86:18: error: ?json_tokener_success? undeclared (first use in this function); did you mean ?json_tokener_error?? 86 | if (json_res != json_tokener_success) { | ^~~~~~~~~~~~~~~~~~~~ | json_tokener_error suricatta/suricatta.c:17:10: fatal error: json-c/json.h: No such file or directory 17 | #include - host machine (OS/release) --Linux MINT20 - version of Buildroot--2021.11 - target for which the build fails--raspberry pi b - package(s) for which the build fails--swupdate - the command that fails and its output--as posted above - any information you think that may be relevant Thanks Chris -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Fri Jan 28 04:51:40 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 07:51:40 +0300 Subject: [Buildroot] [PATCH 1/1] package/protozero: bump version to 1.7.1 Message-ID: <20220128045140.272465-1-fido_max@inbox.ru> Drop upstream patch. Release-notes: https://github.com/mapbox/protozero/releases/tag/v1.7.1 Signed-off-by: Maxim Kochetkov --- ...CMakeLists.txt-respect-BUILD_TESTING.patch | 47 ------------------- package/protozero/protozero.hash | 2 +- package/protozero/protozero.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch diff --git a/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch b/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch deleted file mode 100644 index d0267e3283..0000000000 --- a/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 03daae49c8fa94513b508bd12f1597e8e5e086f2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 17 Apr 2021 13:06:44 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_TESTING - -Don't build tests if the standard cmake BUILD_TESTING variable is set to -OFF. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mapbox/protozero/pull/105] ---- - CMakeLists.txt | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9702d6..7a40212 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,6 +23,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - - #----------------------------------------------------------------------------- - -+option(BUILD_TESTING "Build tests" ON) - option(WERROR "Add -Werror flag to build (turns warnings into errors)" ON) - - if(MSVC) -@@ -134,13 +135,13 @@ install(DIRECTORY include/protozero DESTINATION include) - - #----------------------------------------------------------------------------- - --enable_testing() -- - add_subdirectory(doc) - - add_subdirectory(tools) - --add_subdirectory(test) -- -+if(BUILD_TESTING) -+ enable_testing() -+ add_subdirectory(test) -+endif() - - #----------------------------------------------------------------------------- --- -2.30.2 - diff --git a/package/protozero/protozero.hash b/package/protozero/protozero.hash index 5453e01ecf..f0b8e39009 100644 --- a/package/protozero/protozero.hash +++ b/package/protozero/protozero.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 beffbdfab060854fd770178a8db9c028b5b6ee4a059a2fed82c46390a85f3f31 protozero-1.7.0.tar.gz +sha256 27e0017d5b3ba06d646a3ec6391d5ccc8500db821be480aefd2e4ddc3de5ff99 protozero-1.7.1.tar.gz sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE.md sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.from_folly diff --git a/package/protozero/protozero.mk b/package/protozero/protozero.mk index 80d16192e3..a46e37d69b 100644 --- a/package/protozero/protozero.mk +++ b/package/protozero/protozero.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOZERO_VERSION = 1.7.0 +PROTOZERO_VERSION = 1.7.1 PROTOZERO_SITE = $(call github,mapbox,protozero,v$(PROTOZERO_VERSION)) PROTOZERO_LICENSE = BSD-2-Clause, Apache-2.0 PROTOZERO_LICENSE_FILES = LICENSE.md LICENSE.from_folly -- 2.33.1 From fido_max at inbox.ru Fri Jan 28 05:00:13 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 08:00:13 +0300 Subject: [Buildroot] [PATCH 1/1] package/libgeos: bump version to 3.10.2 Message-ID: <20220128050013.277864-1-fido_max@inbox.ru> Changelog: https://github.com/libgeos/geos/blob/3.10.2/NEWS Signed-off-by: Maxim Kochetkov --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index d2c27955ac..f93badbaa3 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a8148eec9636814c8ab0f8f5266ce6f9b914ed65b0d083fc43bb0bbb01f83648 geos-3.10.1.tar.bz2 +sha256 50bbc599ac386b4c2b3962dcc411f0040a61f204aaef4eba7225ecdd0cf45715 geos-3.10.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 745eb32256..197def1212 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.10.1 +LIBGEOS_VERSION = 3.10.2 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 -- 2.33.1 From fido_max at inbox.ru Fri Jan 28 05:13:32 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 08:13:32 +0300 Subject: [Buildroot] [PATCH 1/1] package/libosmium: bump version to 2.17.3 Message-ID: <20220128051332.459202-1-fido_max@inbox.ru> Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.17.3 Signed-off-by: Maxim Kochetkov --- package/libosmium/libosmium.hash | 2 +- package/libosmium/libosmium.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libosmium/libosmium.hash b/package/libosmium/libosmium.hash index 564b7c07d7..ccfd3b09b0 100644 --- a/package/libosmium/libosmium.hash +++ b/package/libosmium/libosmium.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f30e37c28f37ca3857b8107a12e6d138a0719831eca52a836692909801c8b0bd libosmium-2.17.2.tar.gz +sha256 ff85d55ca83d77fc41f6b7ae77f3d8d4337d299cbb4cc60c00e1f9d90d94e71b libosmium-2.17.3.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk index 82dd274bba..6510af4e77 100644 --- a/package/libosmium/libosmium.mk +++ b/package/libosmium/libosmium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSMIUM_VERSION = 2.17.2 +LIBOSMIUM_VERSION = 2.17.3 LIBOSMIUM_SITE = $(call github,osmcode,libosmium,v$(LIBOSMIUM_VERSION)) LIBOSMIUM_LICENSE = BSL-1.0 LIBOSMIUM_LICENSE_FILES = LICENSE -- 2.33.1 From fido_max at inbox.ru Fri Jan 28 05:59:10 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 08:59:10 +0300 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: bump version 1.5.2 Message-ID: <20220128055910.798614-1-fido_max@inbox.ru> Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.5.2 Signed-off-by: Maxim Kochetkov --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index c488949b62..88299745fb 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e osm2pgsql-1.5.1.tar.gz +sha256 4af0b925180ead2710eb68af28f70c91a81fb21dde5f80659d78e9fd14cf52cc osm2pgsql-1.5.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 74193c62cf..43440e0db8 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.5.1 +OSM2PGSQL_VERSION = 1.5.2 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING -- 2.33.1 From fido_max at inbox.ru Fri Jan 28 06:07:28 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 28 Jan 2022 09:07:28 +0300 Subject: [Buildroot] [PATCH 1/1 next] package/osm2pgsql: bump version 1.6.0 Message-ID: <20220128060728.800722-1-fido_max@inbox.ru> Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.6.0 Signed-off-by: Maxim Kochetkov --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 88299745fb..898fcd5500 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4af0b925180ead2710eb68af28f70c91a81fb21dde5f80659d78e9fd14cf52cc osm2pgsql-1.5.2.tar.gz +sha256 0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5 osm2pgsql-1.6.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 43440e0db8..b00976d28b 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.5.2 +OSM2PGSQL_VERSION = 1.6.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING -- 2.33.1 From thomas.petazzoni at bootlin.com Fri Jan 28 07:08:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 28 Jan 2022 07:08:20 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-27 Message-ID: <20220128070824.9FB3F410CB@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-01-27 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 51 | 14 | 0 | 65 | 2021.11.x | 21 | 7 | 0 | 28 | master | 85 | 44 | 0 | 129 | Classification of failures by reason for master ----------------------------------------------- htpdate-1.3.3 | 5 rygel-0.40.2 | 5 unknown | 5 frr-8.1 | 4 guile-3.0.7 | 2 host-delve-1.8.0 | 2 log4cxx-0.12.0 | 2 rtorrent-0.9.8 | 2 bird-2.0.8 | 1 bluez5_utils-5.63 | 1 cryptsetup-2.4.2 | 1 dnsmasq-2.86 | 1 glslsandbox-player-2021.08.24 | 1 hiawatha-11.1 | 1 jasper-2.0.28 | 1 mongodb-4.2.18 | 1 mongrel2-1.13.0 | 1 mp4v2-5.0.1 | 1 nodejs-14.18.3 | 1 pistache-f2f5a50fbfb5b8ef6c... | 1 pulseview-0.4.2 | 1 vdr-2.6.0 | 1 vlc-3.0.16 | 1 wavemon-0.9.4 | 1 xvisor-0.3.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/5a1a94efe3eab09050ab56caec88b411cae451ed | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/1e52863f27ef19b2555d5bf360812e1cb4a48725 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/dc74e318564f642bd8fddcca2721a650f21af3c5 | arm | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/9c09a31cef5abfeaf774c025df678a33c18aad5e | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/6fc95af66fd39481fac5c0e06a46f7a56c931d64 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/bf6d2615526a84e91110bce13f57779478a285e9 | arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8b700fe2442a56fd47c8a01a8ba1a2dd57f65a8f | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/bc109f875ced91c99aeecf7a102f1453b99d1270 | arc | glslsandbox-player-2021.08.24 | NOK | http://autobuild.buildroot.net/results/8c153d9082b0193ca4db6f2a7f879e49f27dff2f | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/6ff930a94023e3b4b787c99d10ea3bb4b606b4b7 | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/2dfbb7f8de52247fbce64037deaabec5f06c75a4 | ORPH arm | hiawatha-11.1 | NOK | http://autobuild.buildroot.net/results/ec6ca34a8b00204ee5f14cda17a3f38a95e509a1 | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/ba9d5d02f0394abcd1c346d716812bf5f86da452 | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/4fecb2e4d8de4669f52ceaa25771468de2f2b9d8 | arc | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/2084229fd67cc7d340c3e64ab2836825e629f817 | riscv64 | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/f1034de5ebc2fc2c49711820077d0b6e5e13aea5 | nios2 | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/e800b73900ae957436f7b93db00706e7f157b188 | powerpc | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/28cc14f488c92ff982271a03795b44d9a241e6fb | riscv64 | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/f0b64c97e7333ba9ce2276d76ae139d44ab8b0f5 | x86_64 | jasper-2.0.28 | NOK | http://autobuild.buildroot.net/results/4e965c07f607bc75e980e613267cedc1c4febd91 | x86_64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/8d49ab7cd9952f6a13bdd330e875012d0601f1d2 | s390x | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/ea0cd0ef5a6c625072504e6c631af77808628578 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/cfedb7f6432dd1ed1f4d4000541b5c76de65f5d4 | mips | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/fb95b2472a6e7c60115048fbf1c6e1d19d09fa3c | arm | mp4v2-5.0.1 | NOK | http://autobuild.buildroot.net/results/b2d4e16a7984528b8179abe4774aced433a7572c | ORPH mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/b2e204a84747949d7b0c1422f2c2310fc03fbdd4 | nios2 | pistache-f2f5a50fbfb5b8ef6c... | NOK | http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031 | ORPH sh4 | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/f5f51d043d088256ed455c205d8355ddcc1f6f8f | m68k | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/8dfad4391d8c89cf2448cf32bb6635d2a870d5f1 | ORPH x86_64 | rtorrent-0.9.8 | NOK | http://autobuild.buildroot.net/results/c8e77d3a44bdf4b241ead03f773b9695718d5570 | ORPH aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a5aa04382491043ddc6c79126668041a5b39b855 | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d58f5f005db0a82c430deecdc6a38da84e2f25c3 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/deeda871e1b6ed50cf0b2ccc354fe6ae27886cc4 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/a4576f1a9cb5a2485c8e58fc0f638315c6f6317c | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/ef595d1ec24bcd565da3f80ca2781a0e830cc9ab | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/97b6dff3278abe3909cf92c9e31604bf3eb6e955 | powerpc64le | unknown | NOK | http://autobuild.buildroot.net/results/bb64b1ec66cc5eed4e33d84e3bed6dfdf8c4a22a | arm | unknown | NOK | http://autobuild.buildroot.net/results/e308a4103ccc05cfe1d7ddda2162163930c55056 | i686 | unknown | NOK | http://autobuild.buildroot.net/results/34d04685f7438baa019ed49f5ec7e90c82a4022c | microblazeel | unknown | NOK | http://autobuild.buildroot.net/results/339c5e66414d83025051e6389f25f432b6d73fe6 | m68k | vdr-2.6.0 | NOK | http://autobuild.buildroot.net/results/427830ab64583961552038dc98cec5a4da35b83e | arm | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/fbfa6428d05c9c26cdded044cb560583f8aad1a9 | powerpc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/93963b2602145bafac21349a46e274638f87b36a | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/c63e8279de9f033aacb94f4bac1cbceb33d2d949 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 monkey-f54856ce250c4e257354... | 2 asterisk-16.21.1 | 1 libostree-2020.8 | 1 libtheora-1.1.1 | 1 mesa3d-20.3.5 | 1 ndisc6-1.0.4 | 1 openal-1.20.1 | 1 openldap-2.4.59 | 1 openvmtools-10.3.5-10430147 | 1 uboot-tools-2020.04 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | asterisk-16.21.1 | NOK | http://autobuild.buildroot.net/results/51014e9a47cad500dc075f98cfeba4802f8c8cf4 | m68k | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/bdaab2422c3e9187b18a1ed791d7f91c45e51ca1 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/36fe55fa88d2dd2472d1761a76fd40f228faeb73 | mips | libostree-2020.8 | NOK | http://autobuild.buildroot.net/results/14f1cff870f5322350810d8a2729fd2a47a2e7b3 | or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/7ac2c2c43c51f597caafe8350aa3239da2a9166d | ORPH arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/4e882b11ee3debaa9b74ea15acf85bc9f161419a | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/e4bb49b02ecb5482155f2026b527ef68981172fe | arm | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/803b992736c3b75985a679bd586f1054f57cd39c | arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/19244f86c21a334cf395b6c2f72daac61782f342 | ORPH or1k | openal-1.20.1 | NOK | http://autobuild.buildroot.net/results/a0a98d274ca48139d2b044ce09f02ef99bc2be7b | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/e3f8ecbdd3d5755f1daf840f26869fb3f24951ca | x86_64 | openvmtools-10.3.5-10430147 | NOK | http://autobuild.buildroot.net/results/026acc7d45f1836f0bde034d0edb51f38d4ed873 | arm | uboot-tools-2020.04 | NOK | http://autobuild.buildroot.net/results/9e7938479794fba5eaf22b42b69f57112b68a16d | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/8af4e0d735069ccceac76fdc1b02d1c378cbab10 | Classification of failures by reason for 2021.11.x -------------------------------------------------- host-erlang-22.2 | 5 log4cxx-0.12.0 | 1 unknown | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/0b5ce47d0d1e94016065913b11c2720d50969f47 | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/10a8920847fc2df0f82bb89d62d81ca24de8328c | x86_64 | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/d22b59163b0666ab33012acbeb2fd6fa7fa30127 | mipsel | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/1bee2e1ad6bee97f0c4cf572fb320cc6a005e9cd | arm | host-erlang-22.2 | NOK | http://autobuild.buildroot.net/results/564eabd8125899113e960fdcdd19157bad20ea67 | xtensa | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/9d38cc6d8af874d61390b2daa5eb53f7e1d4e225 | arm | unknown | NOK | http://autobuild.buildroot.net/results/d39a15f1a2cf4d0e730ddc6e992037468e94a677 | Gitlab CI results for 2022-01-27 ================================ -- http://autobuild.buildroot.net From ps.report at gmx.net Fri Jan 28 07:50:17 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 08:50:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson In-Reply-To: <20220127210924.GQ457876@scaer> References: <20220127183924.1938903-1-james.hilliard1@gmail.com> <20220127210924.GQ457876@scaer> Message-ID: <20220128085017.786b1c13@gmx.net> Hello James, Yann, On Thu, 27 Jan 2022 22:09:24 +0100, "Yann E. MORIN" wrote: > James, All, > > On 2022-01-27 11:39 -0700, James Hilliard spake thusly: > > Signed-off-by: James Hilliard > > --- > > package/network-manager/Config.in | 1 + > > package/network-manager/network-manager.mk | 100 ++++++++++----------- > > 2 files changed, 48 insertions(+), 53 deletions(-) > > > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > > index a48cb37b15..da1a7d79b3 100644 > > --- a/package/network-manager/Config.in > > +++ b/package/network-manager/Config.in > > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI > > config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER > > bool "modem-manager support" > > select BR2_PACKAGE_MODEM_MANAGER > > + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO > > It looks like this is totally unrelated to the switch to meson, and > should be applied in its own right, and then backported to the > maintenance branches, no? > > If it is due to the switch to meson, then it should be explained in the > commit log. > > Regards, > Yann E. MORIN. > > > help > > This option enables support for ModemManager > > > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > index 974320fce0..290333e16c 100644 > > --- a/package/network-manager/network-manager.mk > > +++ b/package/network-manager/network-manager.mk > > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 > > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > > NETWORK_MANAGER_INSTALL_STAGING = YES > > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ > > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ Same comment as Yann beofore, here for added dbus dependency... Regards, Peter > > libgcrypt wireless_tools util-linux host-intltool libndp > > NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) > > NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md > > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome > > NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager > > NETWORK_MANAGER_SELINUX_MODULES = networkmanager > > > > -NETWORK_MANAGER_CONF_ENV = \ > > - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ > > - ac_cv_file__etc_fedora_release=no \ > > - ac_cv_file__etc_mandriva_release=no \ > > - ac_cv_file__etc_debian_version=no \ > > - ac_cv_file__etc_redhat_release=no \ > > - ac_cv_file__etc_SuSE_release=no > > - > > NETWORK_MANAGER_CONF_OPTS = \ > > - --disable-introspection \ > > - --disable-tests \ > > - --disable-qt \ > > - --disable-more-warnings \ > > - --with-crypto=gnutls \ > > - --with-iptables=/usr/sbin/iptables \ > > - --disable-ifupdown \ > > - --without-nm-cloud-setup > > + -Dintrospection=false \ > > + -Ddocs=false \ > > + -Dtests=no \ > > + -Dqt=false \ > > + -Dcrypto=gnutls \ > > + -Diptables=/usr/sbin/iptables \ > > + -Difupdown=false \ > > + -Dnm_cloud_setup=false \ > > + -Dsession_tracking_consolekit=false > > > > ifeq ($(BR2_PACKAGE_AUDIT),y) > > NETWORK_MANAGER_DEPENDENCIES += audit > > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no > > endif > > > > ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) > > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient > > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient > > endif > > > > ifeq ($(BR2_PACKAGE_DHCPCD),y) > > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd > > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd > > endif > > > > ifeq ($(BR2_PACKAGE_IWD),y) > > NETWORK_MANAGER_DEPENDENCIES += iwd > > -NETWORK_MANAGER_CONF_OPTS += --with-iwd > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBCURL),y) > > NETWORK_MANAGER_DEPENDENCIES += libcurl > > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBPSL),y) > > NETWORK_MANAGER_DEPENDENCIES += libpsl > > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false > > endif > > > > ifeq ($(BR2_PACKAGE_LIBSELINUX),y) > > NETWORK_MANAGER_DEPENDENCIES += libselinux > > -NETWORK_MANAGER_CONF_OPTS += --with-selinux > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-selinux > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) > > -NETWORK_MANAGER_DEPENDENCIES += modem-manager > > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 > > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) > > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true > > NETWORK_MANAGER_DEPENDENCIES += jansson > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) > > NETWORK_MANAGER_DEPENDENCIES += pppd > > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false > > endif > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) > > NETWORK_MANAGER_DEPENDENCIES += newt > > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false > > endif > > > > ifeq ($(BR2_PACKAGE_OFONO),y) > > NETWORK_MANAGER_DEPENDENCIES += ofono > > -NETWORK_MANAGER_CONF_OPTS += --with-ofono > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-ofono > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false > > endif > > > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > > NETWORK_MANAGER_DEPENDENCIES += systemd > > NETWORK_MANAGER_CONF_OPTS += \ > > - --with-systemd-journal \ > > - --with-config-logging-backend-default=journal \ > > - --with-session-tracking=systemd \ > > - --with-suspend-resume=systemd > > + -Dsystemd_journal=true \ > > + -Dconfig_logging_backend_default=journal \ > > + -Dsession_tracking=systemd \ > > + -Dsuspend_resume=systemd > > else > > NETWORK_MANAGER_CONF_OPTS += \ > > - --without-systemd-journal \ > > - --with-config-logging-backend-default=syslog \ > > - --without-session-tracking \ > > - --with-suspend-resume=upower > > + -Dsystemd_journal=false \ > > + -Dconfig_logging_backend_default=syslog \ > > + -Dsession_tracking=no \ > > + -Dsuspend_resume=upower \ > > + -Dsystemdsystemunitdir=no > > endif > > > > ifeq ($(BR2_PACKAGE_POLKIT),y) > > NETWORK_MANAGER_DEPENDENCIES += polkit > > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false > > endif > > > > ifeq ($(BR2_PACKAGE_READLINE),y) > > NETWORK_MANAGER_DEPENDENCIES += readline > > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false > > endif > > > > define NETWORK_MANAGER_INSTALL_INIT_SYSV > > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD > > > > endef > > > > -$(eval $(autotools-package)) > > +$(eval $(meson-package)) > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Fri Jan 28 08:10:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 09:10:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/erlang: bump to version 22.3.4.22 Message-ID: <20220128080408.D3C6A829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08b34bc3920106a78c6b0cdfb17ceb5b86621aec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Drop third patch (already in version) - Fix build failure with autoconf >= 2.70 raised since commit ecd54b65c1f998a7ccd91f7c523e4ff38c4781da Fixes: - http://autobuild.buildroot.org/results/4f52b2f194dcfd619fefb192d1c0fd070d5bd408 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 2ad6a3a428831b343823ee3bd95d8d5813a0697c) Signed-off-by: Peter Korsgaard --- ...-avoid-ODR-violation-of-ei_default_socket.patch | 54 ---------------------- package/erlang/erlang.hash | 9 ++-- package/erlang/erlang.mk | 7 +-- 3 files changed, 9 insertions(+), 61 deletions(-) diff --git a/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch b/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch deleted file mode 100644 index 69b6fae81f..0000000000 --- a/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch +++ /dev/null @@ -1,54 +0,0 @@ -From de870d7f9f36b3e68f280057851a4585a67ab219 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 14 Jan 2020 23:15:01 +0000 -Subject: [PATCH] ei_portio.h: avoid ODR violation of - 'ei_default_socket_callbacks' - -Noticed as a build failure against fresh gcc-master: - -``` -LD otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(eirecv.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send_reg.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(epmd_port.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_portio.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -collect2: error: ld returned 1 exit status -make[3]: *** [x86_64-unknown-linux-gnu/Makefile:669: otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call] Error 1 -``` - -The failure looks legitimate: `ei_default_socket_callbacks` is a -struct defined in 'ei_portio.h' and in 'ei_portio.c'. - -The change flips 'ei_portio.h' definition to declaration. - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Signed-off-by: Sergei Trofimovich - -Patch taken from upstream: https://github.com/erlang/otp/commit/de870d7f9f36b3e68f280057851a4585a67ab219 -Signed-off-by: Heiko Thiery ---- - lib/erl_interface/src/misc/ei_portio.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/erl_interface/src/misc/ei_portio.h b/lib/erl_interface/src/misc/ei_portio.h -index 84ebc5039a..5172d085b4 100644 - ---- a/lib/erl_interface/src/misc/ei_portio.h -+++ b/lib/erl_interface/src/misc/ei_portio.h -@@ -47,7 +47,7 @@ int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iov - int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs); - #endif - --ei_socket_callbacks ei_default_socket_callbacks; -+extern ei_socket_callbacks ei_default_socket_callbacks; - - #define EI_FD_AS_CTX__(FD) \ - ((void *) (long) (FD)) --- -2.20.1 - diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash index 3c2f039496..338545a0ba 100644 --- a/package/erlang/erlang.hash +++ b/package/erlang/erlang.hash @@ -1,4 +1,5 @@ -# md5 from http://www.erlang.org/download/MD5, sha256 locally computed -md5 b2b48dad6e69c1e882843edbf2abcfd3 otp_src_22.2.tar.gz -sha256 89c2480cdac566065577c82704a48e10f89cf2e6ca5ab99e1cf80027784c678f otp_src_22.2.tar.gz -sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt +# From https://github.com/erlang/otp/releases/download/OTP-22.3.4.22/SHA256.txt +sha256 e7f0793e62f8da4f7551dc9c1c0de76c40f19773ba516121fc56315c840f60cc otp_src_22.3.4.22.tar.gz + +# Hash for license file +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 527eb15a00..ac2c204a49 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -5,8 +5,9 @@ ################################################################################ # See note below when updating Erlang -ERLANG_VERSION = 22.2 -ERLANG_SITE = http://www.erlang.org/download +ERLANG_VERSION = 22.3.4.22 +ERLANG_SITE = \ + https://github.com/erlang/otp/releases/download/OTP-$(ERLANG_VERSION) ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz ERLANG_DEPENDENCIES = host-erlang @@ -37,7 +38,7 @@ HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF # Whenever updating Erlang, this value should be updated as well, to the # value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.13.1 +ERLANG_EI_VSN = 3.13.2.2 # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes From troglobit at gmail.com Fri Jan 28 08:42:44 2022 From: troglobit at gmail.com (Joachim Wiberg) Date: Fri, 28 Jan 2022 09:42:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdb: backport fix for gdbserver 11.1 on aarch64 Message-ID: <20220128084244.2258811-1-troglobit@gmail.com> Backported from upstream GDB geb79b23, with ChangeLogs stripped so the patch applies properly on Buildroot. https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=eb79b23 Fixes the following issue: # gdbserver /dev/hvc1 inadyn -n -l debug Process inadyn created; pid = 675 Remote debugging using /dev/hvc1 ../../gdbserver/regcache.cc:257: A problem internal to GDBserver has been detected. Unknown register tag_ctl requested Signed-off-by: Joachim Wiberg --- .../11.1/0010-gdbserver-aarch64-support.patch | 317 ++++++++++++++++++ 1 file changed, 317 insertions(+) create mode 100644 package/gdb/11.1/0010-gdbserver-aarch64-support.patch diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch new file mode 100644 index 0000000000..c915b8fe6f --- /dev/null +++ b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch @@ -0,0 +1,317 @@ +From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001 +From: Luis Machado +Date: Fri, 29 Oct 2021 14:54:36 -0300 +Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic + +The current register set selection mechanism for AArch64 is static, based +on a pre-populated array of register sets. + +This means that we might potentially probe register sets that are not +available. This is OK if the kernel errors out during ptrace, but probing the +tag_ctl register, for example, does not result in a ptrace error if the kernel +supports the tagged address ABI but not MTE (PR 28355). + +Making the register set selection dynamic, based on feature checks, solves +this and simplifies the code a bit. It allows us to list all of the register +sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties. + +gdb/ChangeLog: + +2021-11-03 Luis Machado + + PR gdb/28355 + + * arch/aarch64.h (struct aarch64_features): New struct. + +gdbserver/ChangeLog: + +2021-11-03 Luis Machado + + PR gdb/28355 + + * linux-aarch64-low.cc (is_sve_tdesc): Remove. + (aarch64_target::low_arch_setup): Rework to adjust the register sets. + (aarch64_regsets): Update to list all register sets. + (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr. + (aarch64_sve_regsets, aarch64_sve_regsets_info) + (regs_info_aarch64_sve): Remove. + (aarch64_adjust_register_sets): New. + (aarch64_target::get_regs_info): Remove references to removed structs. + (initialize_low_arch): Likewise. +--- + gdb/arch/aarch64.h | 9 ++ + gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++--------------- + 4 files changed, 130 insertions(+), 85 deletions(-) + +diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h +index 0eb702c5b5e..95edb664b55 100644 +--- a/gdb/arch/aarch64.h ++++ b/gdb/arch/aarch64.h +@@ -22,6 +22,15 @@ + + #include "gdbsupport/tdesc.h" + ++/* Holds information on what architectural features are available. This is ++ used to select register sets. */ ++struct aarch64_features ++{ ++ bool sve = false; ++ bool pauth = false; ++ bool mte = false; ++}; ++ + /* Create the aarch64 target description. A non zero VQ value indicates both + the presence of SVE and the Vector Quotient - the number of 128bit chunks in + an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH +diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc +index daccfef746e..9a8cb4169a7 100644 +--- a/gdbserver/linux-aarch64-low.cc ++++ b/gdbserver/linux-aarch64-low.cc +@@ -196,16 +196,6 @@ is_64bit_tdesc (void) + return register_size (regcache->tdesc, 0) == 8; + } + +-/* Return true if the regcache contains the number of SVE registers. */ +- +-static bool +-is_sve_tdesc (void) +-{ +- struct regcache *regcache = get_thread_regcache (current_thread, 0); +- +- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve"); +-} +- + static void + aarch64_fill_gregset (struct regcache *regcache, void *buf) + { +@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent, + *child->priv->arch_private = *parent->priv->arch_private; + } + +-/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ +-#define AARCH64_HWCAP_PACA (1 << 30) +- +-/* Implementation of linux target ops method "low_arch_setup". */ +- +-void +-aarch64_target::low_arch_setup () +-{ +- unsigned int machine; +- int is_elf64; +- int tid; +- +- tid = lwpid_of (current_thread); +- +- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); +- +- if (is_elf64) +- { +- uint64_t vq = aarch64_sve_get_vq (tid); +- unsigned long hwcap = linux_get_hwcap (8); +- unsigned long hwcap2 = linux_get_hwcap2 (8); +- bool pauth_p = hwcap & AARCH64_HWCAP_PACA; +- /* MTE is AArch64-only. */ +- bool mte_p = hwcap2 & HWCAP2_MTE; +- +- current_process ()->tdesc +- = aarch64_linux_read_description (vq, pauth_p, mte_p); +- } +- else +- current_process ()->tdesc = aarch32_linux_read_description (); +- +- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); +-} +- + /* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */ + + static void +@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf) + return aarch64_sve_regs_copy_from_reg_buf (regcache, buf); + } + ++/* Array containing all the possible register sets for AArch64/Linux. During ++ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for ++ validity and enabled/disabled accordingly. ++ ++ Their sizes are set to 0 here, but they will be adjusted later depending ++ on whether each register set is available or not. */ + static struct regset_info aarch64_regsets[] = + { ++ /* GPR registers. */ + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, +- sizeof (struct user_pt_regs), GENERAL_REGS, ++ 0, GENERAL_REGS, + aarch64_fill_gregset, aarch64_store_gregset }, ++ /* Floating Point (FPU) registers. */ + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET, +- sizeof (struct user_fpsimd_state), FP_REGS, ++ 0, FP_REGS, + aarch64_fill_fpregset, aarch64_store_fpregset + }, ++ /* Scalable Vector Extension (SVE) registers. */ ++ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, ++ 0, EXTENDED_REGS, ++ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache ++ }, ++ /* PAC registers. */ + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, +- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, +- NULL, aarch64_store_pauthregset }, ++ 0, OPTIONAL_REGS, ++ nullptr, aarch64_store_pauthregset }, ++ /* Tagged address control / MTE registers. */ + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, +- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, +- aarch64_store_mteregset }, ++ 0, OPTIONAL_REGS, ++ aarch64_fill_mteregset, aarch64_store_mteregset }, + NULL_REGSET + }; + +@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info = + { + aarch64_regsets, /* regsets */ + 0, /* num_regsets */ +- NULL, /* disabled_regsets */ ++ nullptr, /* disabled_regsets */ + }; + + static struct regs_info regs_info_aarch64 = + { +- NULL, /* regset_bitmap */ +- NULL, /* usrregs */ ++ nullptr, /* regset_bitmap */ ++ nullptr, /* usrregs */ + &aarch64_regsets_info, + }; + +-static struct regset_info aarch64_sve_regsets[] = ++/* Given FEATURES, adjust the available register sets by setting their ++ sizes. A size of 0 means the register set is disabled and won't be ++ used. */ ++ ++static void ++aarch64_adjust_register_sets (const struct aarch64_features &features) + { +- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, +- sizeof (struct user_pt_regs), GENERAL_REGS, +- aarch64_fill_gregset, aarch64_store_gregset }, +- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, +- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS, +- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache +- }, +- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, +- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, +- NULL, aarch64_store_pauthregset }, +- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, +- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, +- aarch64_store_mteregset }, +- NULL_REGSET +-}; ++ struct regset_info *regset; + +-static struct regsets_info aarch64_sve_regsets_info = +- { +- aarch64_sve_regsets, /* regsets. */ +- 0, /* num_regsets. */ +- NULL, /* disabled_regsets. */ +- }; ++ for (regset = aarch64_regsets; regset->size >= 0; regset++) ++ { ++ switch (regset->nt_type) ++ { ++ case NT_PRSTATUS: ++ /* General purpose registers are always present. */ ++ regset->size = sizeof (struct user_pt_regs); ++ break; ++ case NT_FPREGSET: ++ /* This is unavailable when SVE is present. */ ++ if (!features.sve) ++ regset->size = sizeof (struct user_fpsimd_state); ++ break; ++ case NT_ARM_SVE: ++ if (features.sve) ++ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE); ++ break; ++ case NT_ARM_PAC_MASK: ++ if (features.pauth) ++ regset->size = AARCH64_PAUTH_REGS_SIZE; ++ break; ++ case NT_ARM_TAGGED_ADDR_CTRL: ++ if (features.mte) ++ regset->size = AARCH64_LINUX_SIZEOF_MTE; ++ break; ++ default: ++ gdb_assert_not_reached ("Unknown register set found."); ++ } ++ } ++} + +-static struct regs_info regs_info_aarch64_sve = +- { +- NULL, /* regset_bitmap. */ +- NULL, /* usrregs. */ +- &aarch64_sve_regsets_info, +- }; ++/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ ++#define AARCH64_HWCAP_PACA (1 << 30) ++ ++/* Implementation of linux target ops method "low_arch_setup". */ ++ ++void ++aarch64_target::low_arch_setup () ++{ ++ unsigned int machine; ++ int is_elf64; ++ int tid; ++ ++ tid = lwpid_of (current_thread); ++ ++ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); ++ ++ if (is_elf64) ++ { ++ struct aarch64_features features; ++ ++ uint64_t vq = aarch64_sve_get_vq (tid); ++ features.sve = (vq > 0); ++ /* A-profile PAC is 64-bit only. */ ++ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; ++ /* A-profile MTE is 64-bit only. */ ++ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; ++ ++ current_process ()->tdesc ++ = aarch64_linux_read_description (vq, features.pauth, features.mte); ++ ++ /* Adjust the register sets we should use for this particular set of ++ features. */ ++ aarch64_adjust_register_sets (features); ++ } ++ else ++ current_process ()->tdesc = aarch32_linux_read_description (); ++ ++ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); ++} + + /* Implementation of linux target ops method "get_regs_info". */ + +@@ -802,9 +821,7 @@ aarch64_target::get_regs_info () + if (!is_64bit_tdesc ()) + return ®s_info_aarch32; + +- if (is_sve_tdesc ()) +- return ®s_info_aarch64_sve; +- ++ /* AArch64 64-bit registers. */ + return ®s_info_aarch64; + } + +@@ -3294,5 +3311,4 @@ initialize_low_arch (void) + initialize_low_arch_aarch32 (); + + initialize_regsets_info (&aarch64_regsets_info); +- initialize_regsets_info (&aarch64_sve_regsets_info); + } +-- +2.27.0 + From jborne at kalray.eu Fri Jan 28 09:15:02 2022 From: jborne at kalray.eu (Jonathan Borne) Date: Fri, 28 Jan 2022 10:15:02 +0100 (CET) Subject: [Buildroot] [PATCH 1/1] package/binutils: remove libiberty from target install In-Reply-To: <20220127211819.GR457876@scaer> References: <20220127135339.25430-1-jborne@kalray.eu> <20220127135339.25430-2-jborne@kalray.eu> <20220127211819.GR457876@scaer> Message-ID: <519255027.1854303.1643361302026.JavaMail.zimbra@kalray.eu> ----- On Jan 27, 2022, at 10:18 PM, Yann E. MORIN yann.morin.1998 at free.fr wrote: > Jonathan, All, > > Thanks for this new iteration. :-) > > On 2022-01-27 14:53 +0100, Jonathan Borne via buildroot spake thusly: >> In BINUTILS_INSTALL_TARGET_CMDS, libiberty is installed >> to STAGING_DIR >> >> This is not necessary since libiberty is already >> unconditionally installed to staging in >> BINUTILS_INSTALL_STAGING_CMDS. Furthermore the presence >> of STAGING_DIR path in TARGET_CMDS is confusing. >> >> Moreover libiberty is static only. Static libraries >> are only used at build time, not at run time so >> we do not want to install libiberty on target. >> >> This commit removes the unnecessary libiberty >> install in TARGET_CMDS and add a comment to clarify >> why we do not see libiberty installed on target. > > I've slightly reworded the commit log, and rewrapped it closer to the > usual 72-char width. > That's perfect. I will think about the wrapping next time. >> Signed-off-by: Jonathan Borne >> --- >> package/binutils/binutils.mk | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk >> index 13f61be035..32ca70d325 100644 >> --- a/package/binutils/binutils.mk >> +++ b/package/binutils/binutils.mk >> @@ -95,6 +95,8 @@ BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) >> >> # We just want libbfd, libiberty and libopcodes, >> # not the full-blown binutils in staging >> +# Static-only libraries such as libiberty are used at buildtime in staging >> +# but are not installed to target. > > I believe the comment in fact makes more sense closer to the > _ISNTALL_TARGET_CMDS, so I moved it there, and reworded it > appropriately. > I hesitated a bit about the right place to put this comment but that's definitively cleaner this way. > Applied to master, thanks. > > Regards, > Yann E. MORIN. > Nice! Thank you very much! Best regards, Jonathan >> define BINUTILS_INSTALL_STAGING_CMDS >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install >> @@ -106,7 +108,6 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) >> define BINUTILS_INSTALL_TARGET_CMDS >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install >> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install >> - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install >> endef >> endif >> >> -- >> 2.17.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. >| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | >| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | >| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | >| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > > > To declare a filtering error, please use the following link : > https://www.security-mail.net/reporter.php?mid=16157.61f30c1f.e3bf2.0&r=jborne%40kalray.eu&s=yann.morin.1998%40free.fr&o=Re%3A+%5BBuildroot%5D+%5BPATCH+1%2F1%5D+package%2Fbinutils%3A+remove+libiberty+from+target+install&verdict=C&c=175bda5746a47a6dc86efbf686983009e1fe0acd From bernd.kuhls at t-online.de Fri Jan 28 09:48:27 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 28 Jan 2022 10:48:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.15 Message-ID: <20220128094827.2705597-1-bernd.kuhls@t-online.de> Changelog: https://www.php.net/ChangeLog-8.php#8.0.15 Signed-off-by: Bernd Kuhls --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 329410b54f..e78385cbe7 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 fbde8247ac200e4de73449d9fefc8b495d323b5be9c10cdb645fb431c91156e3 php-8.0.14.tar.xz +sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index ca59334104..c9de8c2c76 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.14 +PHP_VERSION = 8.0.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Fri Jan 28 09:50:40 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 28 Jan 2022 10:50:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.4 Message-ID: <20220128095040.2706666-1-bernd.kuhls@t-online.de> Release notes: https://www.samba.org/samba/history/samba-4.15.4.html Signed-off-by: Bernd Kuhls --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 4749f6f597..130b628e32 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.3.tar.asc -sha256 519399404391550345846768ea4dd0fe7fcb04e20c2b891b5eeb02e5554137db samba-4.15.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.4.tar.asc +sha256 499065a589b7b9ffb8e3eb6efa8575985919a2999972afc469520a47322aec11 samba-4.15.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 14f9302e21..1d4b985437 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.3 +SAMBA4_VERSION = 4.15.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Fri Jan 28 09:52:49 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Fri, 28 Jan 2022 10:52:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.5 Message-ID: <20220128095249.2707373-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 09640a903c..871cf2f495 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.4 +MESA3D_HEADERS_VERSION = 21.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 559f21e06a..e36d798e21 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000659.html -sha256 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d mesa-21.3.4.tar.xz -sha512 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9 mesa-21.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html +sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz +sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 888ef58ad3..b1d0858ce3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.4 +MESA3D_VERSION = 21.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.30.2 From peter at korsgaard.com Fri Jan 28 10:25:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 11:25:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series Message-ID: <20220128101908.8A98B82858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa7f960200be32f6443f4684e721dd1142375345 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db14f7d71505aad2ae1e4aefc5c0ece97f5eacec) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index db0c58129f..264cbde98e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" 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 9062b72a0e..116d4af1d6 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 b3e9ba06a299a3e2ead4a15753bc46a3e0c90d3b92ffeed1034ccc9f13a717f0 linux-5.15.6.tar.xz +sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9bc3c873c5..89307fdb99 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -374,14 +374,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 default "5.14.21" if BR2_KERNEL_HEADERS_5_14 - default "5.15.6" if BR2_KERNEL_HEADERS_5_15 + default "5.15.13" if BR2_KERNEL_HEADERS_5_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Fri Jan 28 10:27:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 11:27:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15}.x series Message-ID: <20220128102110.EE47582858@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf066e053c6f0e84294dae7f5cf908064f6e7623 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db14f7d71505aad2ae1e4aefc5c0ece97f5eacec) [Peter: drop 5.15.x bump] 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 a60ff7d1fa..e7addf1810 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.83" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.90" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" 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 8246c7dc09..e22ac924bc 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 linux-5.10.83.tar.xz -sha256 6246fe1776d83039d71f74eb839f38ebdec23e1b37a7bf76f3bce13cbf0290be linux-5.4.163.tar.xz +sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz +sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6d2f83619493e656276dbf22afcdb80f42320e697570419380773bb4916130fd linux-4.4.293.tar.xz -sha256 b55d77774ed631f57f736bcdab021f68167455c9daede7e9e4161b4d564d8b53 linux-4.9.291.tar.xz -sha256 9784204f95cfc7de1c933088e6f9364e99a29988ae4e6b9353677637eb171aa0 linux-4.14.256.tar.xz -sha256 8f4ecd71fbcdd733c2849e2e5afe59d351c463c9a699bdbf428d88fa911009db linux-4.19.219.tar.xz +sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz +sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz +sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz +sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 740ed6c09d..fb9867525c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -346,12 +346,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.293" if BR2_KERNEL_HEADERS_4_4 - default "4.9.291" if BR2_KERNEL_HEADERS_4_9 - default "4.14.256" if BR2_KERNEL_HEADERS_4_14 - default "4.19.219" if BR2_KERNEL_HEADERS_4_19 - default "5.4.163" if BR2_KERNEL_HEADERS_5_4 - default "5.10.83" if BR2_KERNEL_HEADERS_5_10 + default "4.4.298" if BR2_KERNEL_HEADERS_4_4 + default "4.9.296" if BR2_KERNEL_HEADERS_4_9 + default "4.14.261" if BR2_KERNEL_HEADERS_4_14 + default "4.19.224" if BR2_KERNEL_HEADERS_4_19 + default "5.4.170" if BR2_KERNEL_HEADERS_5_4 + default "5.10.90" if BR2_KERNEL_HEADERS_5_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From thomas.devoogdt at gmail.com Fri Jan 28 10:59:16 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Fri, 28 Jan 2022 11:59:16 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.69.1 Message-ID: <20220128105917.30421-1-thomas.devoogdt@barco.com> The internal_pcre option was dropped in: https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c Signed-off-by: Thomas Devoogdt --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index c402cbafa5..ce73d54f16 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.68.4', + version : '2.69.1', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index d421e025ff..0363b6e081 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum -sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz +# https://download.gnome.org/sources/glib/2.69/glib-2.69.1.sha256sum +sha256 f92f34057a091fc8638d91f10cece842cb8618e9a1090b0ddb19cc15a21bf39c glib-2.69.1.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index af73aeb3bf..46bbba18ad 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.69 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -30,7 +30,6 @@ HOST_LIBGLIB2_CONF_OPTS = \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ - -Dinternal_pcre=false \ -Dtests=false \ -Doss_fuzz=disabled @@ -52,7 +51,6 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ -Dglib_debug=disabled \ - -Dinternal_pcre=false \ -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ -Dtests=false \ -- 2.17.1 From thomas.devoogdt at gmail.com Fri Jan 28 10:59:17 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Fri, 28 Jan 2022 11:59:17 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsoup: bump to version 3.0.4 In-Reply-To: <20220128105917.30421-1-thomas.devoogdt@barco.com> References: <20220128105917.30421-1-thomas.devoogdt@barco.com> Message-ID: <20220128105917.30421-2-thomas.devoogdt@barco.com> Drop upstreamed patch: https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c The gnome option was dropped in: https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 backend): https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 Signed-off-by: Thomas Devoogdt --- Config.in.legacy | 6 +++ .../0001-meson.build-set-c_std-to-gnu99.patch | 40 ------------------- package/libsoup/Config.in | 6 +-- package/libsoup/libsoup.hash | 4 +- package/libsoup/libsoup.mk | 11 ++--- package/midori/Config.in | 1 - 6 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..d1fa68f894 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LIBSOUP_GNOME + bool "libsoup-gnome support was removed" + select BR2_LEGACY + help + Build libsoup-gnome library. + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 diff --git a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch b/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch deleted file mode 100644 index f2e8f7701d..0000000000 --- a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5c3d431bdb094c59997f2a23e31e83f815ab667c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 1 Jul 2021 22:09:23 +0200 -Subject: [PATCH] meson.build: set c_std to gnu99 - -Set c_std to gnu99 to avoid the following build failure with gcc 4.8: - -In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/resolv.h:65:0, - from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/gio/gnetworking.h:40, - from ../libsoup/soup-address.c:14: -/tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/arpa/nameser.h:115:2: error: unknown type name 'u_char' - const u_char *_msg, *_eom; - ^ - -Fixes: - - http://autobuild.buildroot.org/results/56b9cb987e25b99d6fed16c537552f47c3376f21 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/241] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 4dfd8c15..a5ebc63a 100644 ---- a/meson.build -+++ b/meson.build -@@ -2,6 +2,6 @@ project('libsoup', 'c', - version: '2.74.0', - meson_version : '>= 0.50', - license : 'LGPL2', -- default_options : 'c_std=c99') -+ default_options : 'c_std=gnu99') - - gnome = import('gnome') - --- -2.30.2 - diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 02e8e8b578..c98c61a31e 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSOUP depends on BR2_USE_WCHAR # glib2, gnutls and libpsl depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 + select BR2_PACKAGE_NGHTTP2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBPSL @@ -16,11 +17,6 @@ config BR2_PACKAGE_LIBSOUP if BR2_PACKAGE_LIBSOUP -config BR2_PACKAGE_LIBSOUP_GNOME - bool "libsoup-gnome" - help - Build libsoup-gnome library. - config BR2_PACKAGE_LIBSOUP_SSL bool "https support" depends on !BR2_STATIC_LIBS # glib-networking, gnutls diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 95c1c26eb4..00591fc0ad 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.0.sha256sum -sha256 33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e libsoup-2.74.0.tar.xz +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/3.0/libsoup-3.0.4.sha256sum +sha256 5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b libsoup-3.0.4.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 1a26714992..ce40a7dabf 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.74 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +LIBSOUP_VERSION_MAJOR = 3.0 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).4 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ @@ -16,6 +16,7 @@ LIBSOUP_DEPENDENCIES = \ host-intltool \ host-libglib2 \ host-pkgconf \ + nghttp2 \ libglib2 \ libpsl \ libxml2 \ @@ -55,10 +56,4 @@ else LIBSOUP_CONF_OPTS += -Dgssapi=disabled endif -ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) -LIBSOUP_CONF_OPTS += -Dgnome=true -else -LIBSOUP_CONF_OPTS += -Dgnome=false -endif - $(eval $(meson-package)) diff --git a/package/midori/Config.in b/package/midori/Config.in index d98d7cb161..715295e5a6 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -41,7 +41,6 @@ config BR2_PACKAGE_MIDORI select BR2_PACKAGE_LIBPEAS select BR2_PACKAGE_LIBPEAS_WIDGETS select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBSOUP_GNOME select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_SQLITE -- 2.17.1 From giulio.benetti at benettiengineering.com Fri Jan 28 11:05:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 28 Jan 2022 12:05:41 +0100 Subject: [Buildroot] [PATCH] package/libcamera: fix missing comment for binutils-bug-27597 In-Reply-To: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> References: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> Message-ID: <20220128110542.1101197-2-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libcamera/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 23a0040abf..88db054975 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -92,7 +92,7 @@ comment "lc-compliance test application needs a toolchain w/ C++, wchar, threads endif # BR2_PACKAGE_LIBCAMERA -comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" +comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7, not binutils bug 27597" depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Jan 28 11:05:40 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 28 Jan 2022 12:05:40 +0100 Subject: [Buildroot] [PATCH] package/kf5/kf5-kcoreaddons: add missing comment dependency for binutils-bug-27597 Message-ID: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/kf5/kf5-kcoreaddons/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/kf5/kf5-kcoreaddons/Config.in b/package/kf5/kf5-kcoreaddons/Config.in index 02bd38e395..eef43101a2 100644 --- a/package/kf5/kf5-kcoreaddons/Config.in +++ b/package/kf5/kf5-kcoreaddons/Config.in @@ -13,3 +13,6 @@ config BR2_PACKAGE_KF5_KCOREADDONS on top of QtCore to perform various tasks. https://api.kde.org/frameworks/kcoreaddons/html/index.html + +comment "kf5-kcoreaddons needs a toolchain w/o bug 27597" + depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 -- 2.25.1 From giulio.benetti at benettiengineering.com Fri Jan 28 11:05:42 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 28 Jan 2022 12:05:42 +0100 Subject: [Buildroot] [PATCH] package/pistache: disable package if affected by BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 In-Reply-To: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> References: <20220128110542.1101197-1-giulio.benetti@benettiengineering.com> Message-ID: <20220128110542.1101197-3-giulio.benetti@benettiengineering.com> Package pistache is affected by binutils bug 27597(Nios II), so let's disable it when BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597=y. Let'a also indent the comment dependencies. Fixes: http://autobuild.buildroot.net/results/0e7b74c5a07ced2bbae1a0a8c7d7ba26dfa04031/ Signed-off-by: Giulio Benetti --- package/pistache/Config.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 64d6340827..96aed5210a 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_PISTACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure C++14 and provides @@ -12,9 +13,10 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar" +comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ - BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR + BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || \ + BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 -- 2.25.1 From d.lang at abatec.at Fri Jan 28 11:12:58 2022 From: d.lang at abatec.at (Lang Daniel) Date: Fri, 28 Jan 2022 11:12:58 +0000 Subject: [Buildroot] [PATCH] package/dbus-cxx: new package Message-ID: DBus-cxx provides an object-oriented interface to DBus Signed-off-by: Lang Daniel --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-gcc11-include-typeinfo.patch | 29 ++++++ .../0002-cmake-improve-include-paths.patch | 91 +++++++++++++++++++ package/dbus-cxx/0003-sasl-use-uid_t.patch | 41 +++++++++ package/dbus-cxx/Config.in | 40 ++++++++ package/dbus-cxx/dbus-cxx.hash | 5 + package/dbus-cxx/dbus-cxx.mk | 28 ++++++ 8 files changed, 236 insertions(+) create mode 100644 package/dbus-cxx/0001-gcc11-include-typeinfo.patch create mode 100644 package/dbus-cxx/0002-cmake-improve-include-paths.patch create mode 100644 package/dbus-cxx/0003-sasl-use-uid_t.patch create mode 100644 package/dbus-cxx/Config.in create mode 100644 package/dbus-cxx/dbus-cxx.hash create mode 100644 package/dbus-cxx/dbus-cxx.mk diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..c319c53e00 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -626,6 +626,7 @@ N: Daniel J. Leach F: package/dacapo/ N: Daniel Lang +F: package/dbus-cxx/ F: package/paho-mqtt-cpp/ N: Damien Lanson diff --git a/package/Config.in b/package/Config.in index e4ca195beb..4e3d261cc1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -460,6 +460,7 @@ endmenu source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" source "package/dbus-cpp/Config.in" + source "package/dbus-cxx/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in" source "package/dbus-triggerd/Config.in" diff --git a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch new file mode 100644 index 0000000000..b4b7d83de2 --- /dev/null +++ b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch @@ -0,0 +1,29 @@ +From 0a4c5db225d8d213916655593471e303ba71e0ea Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk +Date: Mon, 13 Dec 2021 03:42:44 +0100 +Subject: [PATCH] Include typeinfo for typeid() (#83) + +Otherwise fails with: + error: must '#include ' before using 'typeid' + +Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/83 +Upstream-Status: Accepted +Signed-off-by: Daniel Lang + +--- + dbus-cxx/demangle.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h +index b71bcb9..9a4e99b 100644 +--- a/dbus-cxx/demangle.h ++++ b/dbus-cxx/demangle.h +@@ -21,6 +21,7 @@ + #define DBUSCXX_DEMANGLE_H + + #include ++#include + #include + + #if DBUS_CXX_HAS_CXXABI_H + diff --git a/package/dbus-cxx/0002-cmake-improve-include-paths.patch b/package/dbus-cxx/0002-cmake-improve-include-paths.patch new file mode 100644 index 0000000000..1f6a36a2c0 --- /dev/null +++ b/package/dbus-cxx/0002-cmake-improve-include-paths.patch @@ -0,0 +1,91 @@ +From 5a0ebbf55515a928acf9926d3fcd789115e347d3 Mon Sep 17 00:00:00 2001 +From: Lang Daniel +Date: Mon, 17 Jan 2022 13:57:55 +0100 +Subject: [PATCH] cmake: improve include paths + +Adding the dbus-cxx subfolders as an include path might override system +headers (signal.h for gcc 10). +By removing the subfolders, includes can happen via #include "..." or +via #include . + +Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/86 +Upstream-Status: Accepted +Signed-off-by: Daniel Lang + +--- + CMakeLists.txt | 4 +--- + dbus-cxx/matchrule.h | 2 +- + dbus-cxx/sasl.h | 2 +- + dbus-cxx/sendmsgtransport.cpp | 2 +- + dbus-cxx/simpletransport.cpp | 2 +- + 5 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b6d28c..e76cd61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -207,9 +207,7 @@ set( DBUS_CXX_HEADERS + + set( DBUS_CXX_INCLUDE_DIRECTORIES + ${PROJECT_SOURCE_DIR} +- ${PROJECT_SOURCE_DIR}/dbus-cxx +- ${PROJECT_BINARY_DIR} +- ${PROJECT_BINARY_DIR}/dbus-cxx ) ++ ${PROJECT_BINARY_DIR} ) + include_directories( ${DBUS_CXX_INCLUDE_DIRECTORIES} + ${dbus_INCLUDE_DIRS} + ${sigc_INCLUDE_DIRS} ) +diff --git a/dbus-cxx/matchrule.h b/dbus-cxx/matchrule.h +index 69fdab7..18c9e81 100644 +--- a/dbus-cxx/matchrule.h ++++ b/dbus-cxx/matchrule.h +@@ -20,7 +20,7 @@ + #define DBUSCXX_MATCH_RULE_H + + #include +-#include "dbus-cxx-config.h" ++#include + + namespace DBus { + +diff --git a/dbus-cxx/sasl.h b/dbus-cxx/sasl.h +index d7429a3..44edd6e 100644 +--- a/dbus-cxx/sasl.h ++++ b/dbus-cxx/sasl.h +@@ -19,7 +19,7 @@ + #ifndef DBUSCXX_SASL_H + #define DBUSCXX_SASL_H + +-#include ++#include + + #include + #include +diff --git a/dbus-cxx/sendmsgtransport.cpp b/dbus-cxx/sendmsgtransport.cpp +index ae053ff..a10ae66 100644 +--- a/dbus-cxx/sendmsgtransport.cpp ++++ b/dbus-cxx/sendmsgtransport.cpp +@@ -21,8 +21,8 @@ + #include "dbus-cxx-private.h" + #include "utility.h" + #include "validator.h" ++#include "message.h" + +-#include + #include + #include + #include +diff --git a/dbus-cxx/simpletransport.cpp b/dbus-cxx/simpletransport.cpp +index f291d9f..fed4364 100644 +--- a/dbus-cxx/simpletransport.cpp ++++ b/dbus-cxx/simpletransport.cpp +@@ -18,7 +18,7 @@ + ***************************************************************************/ + #include "simpletransport.h" + +-#include ++#include "dbus-cxx-private.h" + #include "demarshaling.h" + #include "message.h" + #include "utility.h" + diff --git a/package/dbus-cxx/0003-sasl-use-uid_t.patch b/package/dbus-cxx/0003-sasl-use-uid_t.patch new file mode 100644 index 0000000000..e517068891 --- /dev/null +++ b/package/dbus-cxx/0003-sasl-use-uid_t.patch @@ -0,0 +1,41 @@ +From 9db9673c0c2407e18e215844adadbd4a397e6f78 Mon Sep 17 00:00:00 2001 +From: Lang Daniel +Date: Fri, 28 Jan 2022 07:53:13 +0100 +Subject: [PATCH] use uid_t instead of __uid_t + +uclibc and glibc define getuid() as +extern __uid_t getuid (void) __THROW; +https://elixir.bootlin.com/glibc/glibc-2.34/source/posix/unistd.h#L698 +which is a typedef for unsigned int. + +musl uses uid_t as return type +uid_t getuid(void); +https://elixir.bootlin.com/musl/v1.2.2/source/include/unistd.h#L108 +which is a typedef to unsigned. + +glibc and uclibc include typedefs from __uid_t to uid_t, +which means one should be able to use uid_t as a replacement +for __uid_t and make compiling with all three c standard libraries +possible. + +Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/87 +Signed-off-by: Daniel Lang + +--- + dbus-cxx/sasl.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp +index e8a6060..7a76af6 100644 +--- a/dbus-cxx/sasl.cpp ++++ b/dbus-cxx/sasl.cpp +@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { + bool success = false; + bool negotiatedFD = false; + std::vector serverGUID; +- __uid_t uid = getuid(); ++ uid_t uid = getuid(); + std::string line; + std::smatch regex_match; + + diff --git a/package/dbus-cxx/Config.in b/package/dbus-cxx/Config.in new file mode 100644 index 0000000000..49f0f2237e --- /dev/null +++ b/package/dbus-cxx/Config.in @@ -0,0 +1,40 @@ +config BR2_PACKAGE_DBUS_CXX + bool "dbus-cxx" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_DBUS # runtime dependency + select BR2_PACKAGE_LIBSIGC + help + DBus-cxx is a C++ implementation for DBus. DBus is a + Linux-specific RPC (remote procedure call) and + IPC (inter-process communications) mechanism. + DBus-cxx provides an object-oriented view of all programs + on the DBus, and allows an object-oriented way of + exporting methods onto the DBus. + + https://dbus-cxx.github.io/ + +if BR2_PACKAGE_DBUS_CXX + +config BR2_PACKAGE_DBUS_CXX_QT + bool "Qt support" + depends on BR2_PACKAGE_QT5 + +comment "Qt support needs Qt5" + depends on !BR2_PACKAGE_QT5 + +config BR2_PACKAGE_DBUS_CXX_GLIB + bool "Glib support" + depends on BR2_PACKAGE_LIBGLIB2 + +comment "Glib support needs libglib2" + depends on !BR2_PACKAGE_LIBGLIB2 + +endif + +comment "dbus-cxx needs a toolchain w/ C++, threads, gcc >= 7 and dynamic library support" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash new file mode 100644 index 0000000000..907de1866f --- /dev/null +++ b/package/dbus-cxx/dbus-cxx.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 05c4f4750261f09819564bb8ee93b5d7f56fd05bbcd755858860fa6697d09c2a dbus-cxx-2.1.0.tar.gz +sha256 e85e018c8ee7d4f439b097289bf4371f6fcfec24e89f3e77c422944501bc383d COPYING +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 cmake-modules/LICENSE_1_0.txt +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 tools/libcppgenerate/LICENSE diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk new file mode 100644 index 0000000000..e184ef48ef --- /dev/null +++ b/package/dbus-cxx/dbus-cxx.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# dbus-cxx +# +################################################################################ + +DBUS_CXX_VERSION = 2.1.0 +DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) +DBUS_CXX_LICENSE = Boost license (cmake-modules), Apache 2.0 (libcppgenerate), GPL-3.0 +DBUS_CXX_LICENSE_FILES = cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE COPYING +DBUS_CXX_INSTALL_STAGING = YES +DBUS_CXX_DEPENDENCIES = libsigc + +ifeq ($(BR2_PACKAGE_DBUS_CXX_QT),y) +DBUS_CXX_CONF_OPTS += -DENABLE_QT_SUPPORT=ON +DBUS_CXX_DEPENDENCIES += qt5base +else +DBUS_CXX_CONF_OPTS += -DENABLE_QT_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_DBUS_CXX_GLIB),y) +DBUS_CXX_CONF_OPTS += -DENABLE_GLIB_SUPPORT=ON +DBUS_CXX_DEPENDENCIES += libglib2 +else +DBUS_CXX_CONF_OPTS += -DENABLE_GLIB_SUPPORT=OFF +endif + +$(eval $(cmake-package)) -- 2.25.1 From peter at korsgaard.com Fri Jan 28 11:33:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 12:33:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-rtsp-server: fix introspection In-Reply-To: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 20 Dec 2021 10:33:11 +0100") References: <20211220093311.1927043-1-fontaine.fabrice@gmail.com> Message-ID: <87czkc9jss.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with introspection: > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler > gst/rtsp-server/GstRtspServer-1.0.gir --output > gst/rtsp-server/GstRtspServer-1.0.typelib > --includedir=/usr/share/gir-1.0 > Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 > If the above error message is about missing .so libraries, then > setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. > Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" > Fixes: > - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From aperez at igalia.com Fri Jan 28 11:42:23 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 28 Jan 2022 13:42:23 +0200 Subject: [Buildroot] [PATCH 2/2] package/libsoup: bump to version 3.0.4 In-Reply-To: <20220128105917.30421-2-thomas.devoogdt@barco.com> References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> Message-ID: <20220128134223.GB765275@momiji> Hello Thomas, all, On Fri, 28 Jan 2022 11:59:17 +0100 Thomas Devoogdt wrote: > Drop upstreamed patch: > https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c > > The gnome option was dropped in: > https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a > > A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 backend): > https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 > > Signed-off-by: Thomas Devoogdt > --- > Config.in.legacy | 6 +++ > .../0001-meson.build-set-c_std-to-gnu99.patch | 40 ------------------- > package/libsoup/Config.in | 6 +-- > package/libsoup/libsoup.hash | 4 +- > package/libsoup/libsoup.mk | 11 ++--- > package/midori/Config.in | 1 - > 6 files changed, 12 insertions(+), 56 deletions(-) > delete mode 100644 package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch Note that libsoup3 has a new API [1] (and ABI, therefore). Packages using libsoup2 may not even compile with libsoup3, or may crash at runtime in unexpected ways. You will need followup patches to modify packages that depend on libsoup to make them use libsoup2. For example in package/wpewebkit.mk we are currently passing -DUSE_SOUP2=ON to CMake, which needs to be changed to OFF. Some packages may not even support yet building with libsoup3. Therefore we may need to keep the libsoup2 package. This is possible, as both versions are parallel-installable. But then there is one more issue: one cannot use both libraries in the same process. Which means, for example, if wpewebkit gets changed to use libsoup3, then GStreamer *also* needs to be changed because both are used inside WebKit. These are all reasons why I have not yet sent patches to do the switch. Probably we want to discuss how to go ahead with the libsoup3 migration in Buildroot. Cheers, ?Adri?n --- [1] https://libsoup.org/libsoup-3.0/ch02.html -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From thomas.devoogdt at gmail.com Fri Jan 28 12:33:32 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Fri, 28 Jan 2022 13:33:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsoup: bump to version 3.0.4 In-Reply-To: <20220128134223.GB765275@momiji> References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> <20220128134223.GB765275@momiji> Message-ID: Hello Adri?n, all, I tested indeed libsoup3 against webkitgtk 2.34.4 [1]. By dropping -DUSE_SOUP2=ON from your commit, I was able to build webkitgtk 2.34.4. You are right, other packages will have to migrate as well, e.g. a GStreamer bump to 1.19.3 is needed [2]. A quick search learns me that BR2_PACKAGE_LIBSOUP is/can be selected in/for: - BR2_PACKAGE_GMPC (no explicit support mentioned yet) - BR2_PACKAGE_GSSDP (support on master branch [3]) - BR2_PACKAGE_GUPNP_TOOLS (no explicit support mentioned yet) - BR2_PACKAGE_GVFS (no explicit support mentioned yet) - BR2_PACKAGE_LIBOSTREE (no explicit support mentioned yet) - BR2_PACKAGE_MIDORI (no explicit support mentioned yet) - BR2_PACKAGE_WPEWEBKIT (no explicit support mentioned yet) - BR2_PACKAGE_GST1_PLUGINS_GOOD (starting from 1.19.3) - BR2_PACKAGE_GSTD (starting from 1.19.3) - BR2_PACKAGE_WEBKITGTK (starting from 2.34.4) Kr, Thomas Devoogdt --- [1] https://git.sr.ht/~aperezdc/buildroot/commit/5dc402d58659a35a30afd1de1a8fb8075034f3fc [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1044 [3] https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/7 Op vr 28 jan. 2022 om 12:42 schreef Adrian Perez de Castro < aperez at igalia.com>: > Hello Thomas, all, > > On Fri, 28 Jan 2022 11:59:17 +0100 Thomas Devoogdt < > thomas.devoogdt at gmail.com> wrote: > > Drop upstreamed patch: > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c > > > > The gnome option was dropped in: > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a > > > > A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 > backend): > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 > > > > Signed-off-by: Thomas Devoogdt > > --- > > Config.in.legacy | 6 +++ > > .../0001-meson.build-set-c_std-to-gnu99.patch | 40 ------------------- > > package/libsoup/Config.in | 6 +-- > > package/libsoup/libsoup.hash | 4 +- > > package/libsoup/libsoup.mk | 11 ++--- > > package/midori/Config.in | 1 - > > 6 files changed, 12 insertions(+), 56 deletions(-) > > delete mode 100644 > package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch > > Note that libsoup3 has a new API [1] (and ABI, therefore). Packages using > libsoup2 may not even compile with libsoup3, or may crash at runtime in > unexpected ways. > > You will need followup patches to modify packages that depend on libsoup > to make them use libsoup2. For example in package/wpewebkit.mk we are > currently passing -DUSE_SOUP2=ON to CMake, which needs to be changed to > OFF. > > Some packages may not even support yet building with libsoup3. Therefore > we may need to keep the libsoup2 package. This is possible, as both > versions > are parallel-installable. But then there is one more issue: one cannot use > both libraries in the same process. Which means, for example, if wpewebkit > gets changed to use libsoup3, then GStreamer *also* needs to be changed > because both are used inside WebKit. > > These are all reasons why I have not yet sent patches to do the switch. > Probably we want to discuss how to go ahead with the libsoup3 migration in > Buildroot. > > Cheers, > ?Adri?n > > --- > [1] https://libsoup.org/libsoup-3.0/ch02.html > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Fri Jan 28 12:44:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:44:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/util-linux/util-linux-libs: add a missing patch In-Reply-To: <20220115015004.2531151-1-tianyuanhao3@163.com> (TIAN Yuanhao's message of "Fri, 14 Jan 2022 17:50:04 -0800") References: <20220115015004.2531151-1-tianyuanhao3@163.com> Message-ID: <874k5o9gig.fsf@dell.be.48ers.dk> >>>>> "TIAN" == TIAN Yuanhao writes: > The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for > util-linux, but forgot to create a symlink to util-linux-libs. This > results in inconsistent libblkid.so builds from util-linux and > util-linux-libs. > If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different > libblkid.so is used in different > $(BASE_DIR)/per-package/$(PKG)_NAME/target. > Signed-off-by: TIAN Yuanhao Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From ps.report at gmx.net Fri Jan 28 12:45:36 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 13:45:36 +0100 Subject: [Buildroot] [PATCH v1 1/3] package/log4cxx: change download URL to https Message-ID: <20220128124538.31789-1-ps.report@gmx.net> - change download URL to https Signed-off-by: Peter Seiderer --- package/log4cxx/log4cxx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index e799b0fb16..7612774583 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -5,7 +5,7 @@ ################################################################################ LOG4CXX_VERSION = 0.12.0 -LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) +LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 -- 2.34.1 From ps.report at gmx.net Fri Jan 28 12:45:38 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 13:45:38 +0100 Subject: [Buildroot] [PATCH v1 3/3] package/log4cxx: bump version to 0.12.1 In-Reply-To: <20220128124538.31789-1-ps.report@gmx.net> References: <20220128124538.31789-1-ps.report@gmx.net> Message-ID: <20220128124538.31789-3-ps.report@gmx.net> - drop 0001-LOGCXX-528.patch (from upstream [1]) - renumber remainnig patch Changelog (for deteils see [2]): - This is a minor bugfix release to fix issues found with 0.12.0. Notably, this version fixes a bug where a multithreaded application would crash when using a rolling file. [LOGCXX-534] - Crashed in log->forcedLog function when running with multi-thread [LOGCXX-528] - log4cxx fails to build on Centos 7.6 / g++ 4.8.5 / Boost 1.53 [1] https://github.com/apache/logging-log4cxx/commit/249dd85494a430d95fd69d89f42b02fd950cda51 [2] https://logging.apache.org/log4cxx/latest_stable/changelog.html#0.12.1 Signed-off-by: Peter Seiderer --- package/log4cxx/0001-LOGCXX-528.patch | 189 ------------------ ...ly-check-for-boost-if-really-needed.patch} | 0 package/log4cxx/log4cxx.hash | 4 +- package/log4cxx/log4cxx.mk | 2 +- 4 files changed, 3 insertions(+), 192 deletions(-) delete mode 100644 package/log4cxx/0001-LOGCXX-528.patch rename package/log4cxx/{0002-boost-fallback-only-check-for-boost-if-really-needed.patch => 0001-boost-fallback-only-check-for-boost-if-really-needed.patch} (100%) diff --git a/package/log4cxx/0001-LOGCXX-528.patch b/package/log4cxx/0001-LOGCXX-528.patch deleted file mode 100644 index d1d3189024..0000000000 --- a/package/log4cxx/0001-LOGCXX-528.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 249dd85494a430d95fd69d89f42b02fd950cda51 Mon Sep 17 00:00:00 2001 -From: Robert Middleton -Date: Thu, 22 Jul 2021 15:27:50 -0700 -Subject: [PATCH] LOGCXX-528 (#66) - -Fixes for checking that C++11 is available. Fix for older compilers. - -[Retrieved from: -https://github.com/apache/logging-log4cxx/commit/249dd85494a430d95fd69d89f42b02fd950cda51] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 10 +++++++++ - src/cmake/boost-fallback/boost-fallback.cmake | 21 ++++++++++--------- - src/main/cpp/hierarchy.cpp | 4 ++-- - src/main/include/CMakeLists.txt | 2 +- - .../log4cxx/helpers/appenderattachableimpl.h | 1 + - .../include/log4cxx/helpers/aprinitializer.h | 1 + - src/main/include/log4cxx/helpers/loglog.h | 1 + - .../include/log4cxx/helpers/serversocket.h | 1 + - src/main/include/log4cxx/level.h | 1 + - src/main/include/log4cxx/rolling/action.h | 1 + - 10 files changed, 30 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5b44ef1a..9c6e63902 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,6 +41,9 @@ if( NOT "${CMAKE_CXX_STANDARD}") - set(CMAKE_CXX_STANDARD 17) - endif() - -+# Don't allow for compiler-specific extensions -+set(CMAKE_CXX_EXTENSIONS OFF) -+ - # Building - add_subdirectory(src) - -@@ -185,6 +188,13 @@ if(APACHE_MAINTAINER) - ) - endif() - -+# -+# Check for any fatal configuration errors -+# -+if( "${SHARED_MUTEX_IMPL}" STREQUAL "NONE" ) -+ message( FATAL_ERROR "No shared_mutex implementation found. Requires Boost or C++17" ) -+endif() -+ - # - # Output configuration information - # Similar to APR CMake configuration -diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake -index a8d7d441b..8285b0b99 100644 ---- a/src/cmake/boost-fallback/boost-fallback.cmake -+++ b/src/cmake/boost-fallback/boost-fallback.cmake -@@ -56,16 +56,17 @@ try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" - "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp") - - find_package(Boost COMPONENTS thread) --try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -- "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedptr.cpp") --try_compile(Boost_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -- "${CMAKE_CURRENT_LIST_DIR}/test-boostmutex.cpp") --try_compile(Boost_SHARED_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -- "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedmutex.cpp" -- LINK_LIBRARIES Threads::Threads --) --try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -- "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") -+if( ${Boost_FOUND} ) -+ try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -+ "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedptr.cpp") -+ try_compile(Boost_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -+ "${CMAKE_CURRENT_LIST_DIR}/test-boostmutex.cpp") -+ try_compile(Boost_SHARED_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -+ "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedmutex.cpp" -+ LINK_LIBRARIES Threads::Threads Boost::thread) -+ try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -+ "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") -+endif( ${Boost_FOUND} ) - - # Link the target with the appropriate boost libraries(if required) - function(boostfallback_link target) -diff --git a/src/main/cpp/hierarchy.cpp b/src/main/cpp/hierarchy.cpp -index 4f5174448..c70d39dbb 100644 ---- a/src/main/cpp/hierarchy.cpp -+++ b/src/main/cpp/hierarchy.cpp -@@ -223,7 +223,7 @@ LoggerPtr Hierarchy::getLogger(const LogString& name, - else - { - LoggerPtr logger(factory->makeNewLoggerInstance(pool, name)); -- logger->setHierarchy(weak_from_this()); -+ logger->setHierarchy(shared_from_this()); - loggers->insert(LoggerMap::value_type(name, logger)); - - ProvisionNodeMap::iterator it2 = provisionNodes->find(name); -@@ -423,6 +423,6 @@ void Hierarchy::configureRoot(){ - // LOGCXX-322 we need to turn the repositroy into a weak_ptr, and we - // can't use weak_from_this() in the constructor. - if( !root->getLoggerRepository().lock() ){ -- root->setHierarchy(weak_from_this()); -+ root->setHierarchy(shared_from_this()); - } - } -diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt -index 8183660a5..584941c97 100644 ---- a/src/main/include/CMakeLists.txt -+++ b/src/main/include/CMakeLists.txt -@@ -133,7 +133,7 @@ if( ${STD_SHARED_MUTEX_FOUND} ) - elseif( ${Boost_SHARED_MUTEX_FOUND} ) - set( SHARED_MUTEX_IMPL "boost::shared_mutex" ) - else() -- set( SMART_PTR_IMPL "NONE" ) -+ set( SHARED_MUTEX_IMPL "NONE" ) - endif() - - if( ${STD_ATOMIC_FOUND} ) -diff --git a/src/main/include/log4cxx/helpers/appenderattachableimpl.h b/src/main/include/log4cxx/helpers/appenderattachableimpl.h -index 40e77d93c..b80b5aade 100644 ---- a/src/main/include/log4cxx/helpers/appenderattachableimpl.h -+++ b/src/main/include/log4cxx/helpers/appenderattachableimpl.h -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/helpers/aprinitializer.h b/src/main/include/log4cxx/helpers/aprinitializer.h -index 6f3f55070..fccd18e0f 100644 ---- a/src/main/include/log4cxx/helpers/aprinitializer.h -+++ b/src/main/include/log4cxx/helpers/aprinitializer.h -@@ -30,6 +30,7 @@ extern "C" { - } - - #include -+#include - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/helpers/loglog.h b/src/main/include/log4cxx/helpers/loglog.h -index d54785ddc..a4c92416a 100644 ---- a/src/main/include/log4cxx/helpers/loglog.h -+++ b/src/main/include/log4cxx/helpers/loglog.h -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/helpers/serversocket.h b/src/main/include/log4cxx/helpers/serversocket.h -index e6e6d475e..7da75b969 100644 ---- a/src/main/include/log4cxx/helpers/serversocket.h -+++ b/src/main/include/log4cxx/helpers/serversocket.h -@@ -19,6 +19,7 @@ - #define _LOG4CXX_HELPERS_SERVER_SOCKET_H - - #include -+#include - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/level.h b/src/main/include/log4cxx/level.h -index 4ca4bf28c..7848c902a 100644 ---- a/src/main/include/log4cxx/level.h -+++ b/src/main/include/log4cxx/level.h -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #if defined(_MSC_VER) - #pragma warning ( push ) -diff --git a/src/main/include/log4cxx/rolling/action.h b/src/main/include/log4cxx/rolling/action.h -index 0e8d55f36..fc4497813 100644 ---- a/src/main/include/log4cxx/rolling/action.h -+++ b/src/main/include/log4cxx/rolling/action.h -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - namespace log4cxx - { diff --git a/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch b/package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch similarity index 100% rename from package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch rename to package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 6fc0d8836e..12633c8e57 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/logging/log4cxx/0.12.0/apache-log4cxx-0.12.0.tar.gz.sha512 -sha512 00fe571f9c511bf93b17cac8269ce00f7e817e8d723acf62bddff1bbe0e7facd0ab2fd75c01a93870f7e5c66718b2b73fc22c5f193bfd204e34d052b1123e60d apache-log4cxx-0.12.0.tar.gz +# From https://www.apache.org/dist/logging/log4cxx/0.12.1/apache-log4cxx-0.12.1.tar.gz.sha512 +sha512 807058734cebf7c92e99484313becbc6be63e48bd930889c733318bb78dfec498b66aaa12255ed30879abb005b32e2b965f9dd87ec50d0421ca067f3f66280d9 apache-log4cxx-0.12.1.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index 7612774583..d20cc792a6 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CXX_VERSION = 0.12.0 +LOG4CXX_VERSION = 0.12.1 LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES -- 2.34.1 From peter at korsgaard.com Fri Jan 28 12:45:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:45:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4092 In-Reply-To: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 14 Jan 2022 23:20:55 +0100") References: <20220114222055.1202119-1-fontaine.fabrice@gmail.com> Message-ID: <87zgng81vv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4192: vim is vulnerable to Use After Free > Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From ps.report at gmx.net Fri Jan 28 12:45:37 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 13:45:37 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/log4cxx: fix boost-fallback (only check for boost if really needed) In-Reply-To: <20220128124538.31789-1-ps.report@gmx.net> References: <20220128124538.31789-1-ps.report@gmx.net> Message-ID: <20220128124538.31789-2-ps.report@gmx.net> - add patch 0002-boost-fallback-only-check-for-boost-if-really-needed.patch to check for boost if really needed (in case of legacy c++ standard < c++17) Fixes: - http://autobuild.buildroot.net/results/8d49ab7cd9952f6a13bdd330e875012d0601f1d2 -- Found Boost: .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include (found version "1.78.0") found components: thread chrono missing components: date_time atomic CMake Error at .../build/log4cxx-0.12.0/boost-fallback-compile-tests/CMakeFiles/CMakeTmp/CMakeLists.txt:19 (add_executable): Target "cmTC_aac37" links to target "Boost::date_time" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? CMake Error at .../build/log4cxx-0.12.0/boost-fallback-compile-tests/CMakeFiles/CMakeTmp/CMakeLists.txt:19 (add_executable): Target "cmTC_aac37" links to target "Boost::atomic" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Signed-off-by: Peter Seiderer --- ...nly-check-for-boost-if-really-needed.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch diff --git a/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch b/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch new file mode 100644 index 0000000000..7df29ea120 --- /dev/null +++ b/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch @@ -0,0 +1,36 @@ +From 24e7adc8d67b3c8f7d275b4f9a7e70a61b73fcd4 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 28 Jan 2022 13:11:01 +0100 +Subject: [PATCH] boost-fallback: only check for boost if really needed + +- only check for boost if really needed (in case of legacy c++ standard < c++17) + +Signed-off-by: Peter Seiderer +--- + src/cmake/boost-fallback/boost-fallback.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake +index 8285b0b9..0ecf8c6c 100644 +--- a/src/cmake/boost-fallback/boost-fallback.cmake ++++ b/src/cmake/boost-fallback/boost-fallback.cmake +@@ -55,6 +55,8 @@ try_compile(STD_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tes + try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" + "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp") + ++# search for boost only in case needed for legacy c++ standard < c++17 ++if(NOT ${STD_THREAD_FOUND} OR NOT ${STD_MUTEX_FOUND} OR NOT ${STD_SHARED_MUTEX_FOUND} OR NOT ${STD_SHARED_PTR_FOUND} OR NOT ${STD_ATOMIC_FOUND}) + find_package(Boost COMPONENTS thread) + if( ${Boost_FOUND} ) + try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" +@@ -67,6 +69,7 @@ if( ${Boost_FOUND} ) + try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" + "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") + endif( ${Boost_FOUND} ) ++endif() + + # Link the target with the appropriate boost libraries(if required) + function(boostfallback_link target) +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Fri Jan 28 12:46:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:46:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireshark: security bump to version 3.4.11 Message-ID: <20220128123916.4E02B82AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75d2730ac1e75603509b72d711d1003799b6cdd1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following security issues: - https://www.wireshark.org/security/wnpa-sec-2021-16.html (CVE-2021-4186) - https://www.wireshark.org/security/wnpa-sec-2021-17.html (CVE-2021-4185) - https://www.wireshark.org/security/wnpa-sec-2021-18.html (CVE-2021-4184) - https://www.wireshark.org/security/wnpa-sec-2021-20.html (CVE-2021-4182) - https://www.wireshark.org/security/wnpa-sec-2021-21.html (CVE-2021-4181) https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d19436b88dcea890b6a73b242e2a2cbb66e17fcd) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bc7c9f4d7e..7b67e316ed 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 91d215f183..7715680767 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.10 +WIRESHARK_VERSION = 3.4.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From peter at korsgaard.com Fri Jan 28 11:32:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 12:32:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gstreamer1/gst1-rtsp-server: fix introspection Message-ID: <20220128123916.3D32F818E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d77ea65bb7e23083b0af6ea0625bb7e7a973491 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following build failure with introspection: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit fa3e7a63b93620b8227d66c6a973cd6140432cf3) Signed-off-by: Peter Korsgaard --- ...1-gst-rtsp-server-meson.build-add-gst_dep.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch new file mode 100644 index 0000000000..b63f634598 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch @@ -0,0 +1,41 @@ +From b6bc8fbb72d6d3914c616dc64d15b961493cb9c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Dec 2021 10:09:36 +0100 +Subject: [PATCH] gst/rtsp-server/meson.build: add gst_dep + +Add gst_dep to gst_rtsp_server_deps, in the context of buildroot, this +will avoid the following build failure, because the correct girdir +location will be retrieved from gstreamer-1.0.pc: + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 +Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + +Fixes: + - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] +--- + gst/rtsp-server/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/rtsp-server/meson.build b/gst/rtsp-server/meson.build +index 24d7c39..874da14 100644 +--- a/gst/rtsp-server/meson.build ++++ b/gst/rtsp-server/meson.build +@@ -55,7 +55,7 @@ rtsp_server_headers = [ + + install_headers(rtsp_server_headers, subdir : 'gstreamer-1.0/gst/rtsp-server') + +-gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep] ++gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep, gst_dep] + gst_rtsp_server = library('gstrtspserver- at 0@'.format(api_version), + rtsp_server_sources, + include_directories : rtspserver_incs, +-- +2.33.0 + From peter at korsgaard.com Fri Jan 28 12:44:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:44:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4092 Message-ID: <20220128123916.4589F82A99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17e4a53cc991150886f2f8fa901f6d630871aef2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4192: vim is vulnerable to Use After Free Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 33a3f1f30dedaf613dccac5b86ec909a1f404957) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6fa5d1bef0..fff5072063 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 6643ef0841..408b33a409 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3930 +VIM_VERSION = 8.2.4092 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 28 12:46:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:46:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.11 In-Reply-To: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 14 Jan 2022 23:40:35 +0100") References: <20220114224035.1502100-1-fontaine.fabrice@gmail.com> Message-ID: <87v8y481uq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues: > - https://www.wireshark.org/security/wnpa-sec-2021-16.html > (CVE-2021-4186) > - https://www.wireshark.org/security/wnpa-sec-2021-17.html > (CVE-2021-4185) > - https://www.wireshark.org/security/wnpa-sec-2021-18.html > (CVE-2021-4184) > - https://www.wireshark.org/security/wnpa-sec-2021-20.html > (CVE-2021-4182) > - https://www.wireshark.org/security/wnpa-sec-2021-21.html > (CVE-2021-4181) > https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 11:30:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 12:30:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gstreamer1/gst1-rtsp-server: fix introspection Message-ID: <20220128123934.8CEB8829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=598b97465ae61a8f07adfcc81cbd503646175081 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure with introspection: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit fa3e7a63b93620b8227d66c6a973cd6140432cf3) Signed-off-by: Peter Korsgaard --- ...1-gst-rtsp-server-meson.build-add-gst_dep.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch new file mode 100644 index 0000000000..b63f634598 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/0001-gst-rtsp-server-meson.build-add-gst_dep.patch @@ -0,0 +1,41 @@ +From b6bc8fbb72d6d3914c616dc64d15b961493cb9c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 20 Dec 2021 10:09:36 +0100 +Subject: [PATCH] gst/rtsp-server/meson.build: add gst_dep + +Add gst_dep to gst_rtsp_server_deps, in the context of buildroot, this +will avoid the following build failure, because the correct girdir +location will be retrieved from gstreamer-1.0.pc: + +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst/rtsp-server/GstRtspServer-1.0.gir --output gst/rtsp-server/GstRtspServer-1.0.typelib --includedir=/usr/share/gir-1.0 +Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file gst/rtsp-server/GstRtspServer-1.0.gir: Failed to parse included gir Gst-1.0 +If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. +Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + +Fixes: + - http://autobuild.buildroot.org/results/04af6b22cfa0cffb6a3109a3b32b27137ad2e0b0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/217] +--- + gst/rtsp-server/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/rtsp-server/meson.build b/gst/rtsp-server/meson.build +index 24d7c39..874da14 100644 +--- a/gst/rtsp-server/meson.build ++++ b/gst/rtsp-server/meson.build +@@ -55,7 +55,7 @@ rtsp_server_headers = [ + + install_headers(rtsp_server_headers, subdir : 'gstreamer-1.0/gst/rtsp-server') + +-gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep] ++gst_rtsp_server_deps = [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep, gst_dep] + gst_rtsp_server = library('gstrtspserver- at 0@'.format(api_version), + rtsp_server_sources, + include_directories : rtspserver_incs, +-- +2.33.0 + From peter at korsgaard.com Fri Jan 28 11:37:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 12:37:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux/util-linux-libs: add a missing patch Message-ID: <20220128123934.9559A82A99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7261f8e7a05729cb689be2539965833824d2db25 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The commit 2f5068640161f7b267099e28b69d4c2280b4ded3 added a patch for util-linux, but forgot to create a symlink to util-linux-libs. This results in inconsistent libblkid.so builds from util-linux and util-linux-libs. If you enable BR2_PER_PACKAGE_DIRECTORIES, you will find that different libblkid.so is used in different $(BASE_DIR)/per-package/$(PKG)_NAME/target. Signed-off-by: TIAN Yuanhao Signed-off-by: Yann E. MORIN (cherry picked from commit 93d23ef91fcfd8bf7f5a3ffc23d82bad8e868b34) Signed-off-by: Peter Korsgaard --- .../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch new file mode 120000 index 0000000000..2f3c482144 --- /dev/null +++ b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch @@ -0,0 +1 @@ +../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch \ No newline at end of file From peter at korsgaard.com Fri Jan 28 12:45:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:45:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.4092 Message-ID: <20220128123934.9D32282AA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd8f975dc0c526ec8761fc89f222e95c29b009c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4192: vim is vulnerable to Use After Free Fix CVE-2021-4193: vim is vulnerable to Out-of-bounds Read Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 33a3f1f30dedaf613dccac5b86ec909a1f404957) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 6fa5d1bef0..fff5072063 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 39579f7d50a6e8d7c13105a288fd85f4cdfad7f11df49706bd8f16ab37fe43b8 vim-8.2.3930.tar.gz +sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 6643ef0841..408b33a409 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.3930 +VIM_VERSION = 8.2.4092 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 28 12:45:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 13:45:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wireshark: security bump to version 3.4.11 Message-ID: <20220128123934.A5BA6829FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dd97c860cfa2109b58b5f2aa5e9d68495f79652 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following security issues: - https://www.wireshark.org/security/wnpa-sec-2021-16.html (CVE-2021-4186) - https://www.wireshark.org/security/wnpa-sec-2021-17.html (CVE-2021-4185) - https://www.wireshark.org/security/wnpa-sec-2021-18.html (CVE-2021-4184) - https://www.wireshark.org/security/wnpa-sec-2021-20.html (CVE-2021-4182) - https://www.wireshark.org/security/wnpa-sec-2021-21.html (CVE-2021-4181) https://www.wireshark.org/docs/relnotes/wireshark-3.4.11.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d19436b88dcea890b6a73b242e2a2cbb66e17fcd) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bc7c9f4d7e..7b67e316ed 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.10.txt -sha1 63839abd94d3ae376f860e2d2969777680106578 wireshark-3.4.10.tar.xz -sha256 8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef wireshark-3.4.10.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt +sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz +sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 2ba81d1f39..0361d0bb64 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.10 +WIRESHARK_VERSION = 3.4.11 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From ps.report at gmx.net Fri Jan 28 13:40:21 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 28 Jan 2022 14:40:21 +0100 Subject: [Buildroot] [PATCH v1 2/3] package/log4cxx: fix boost-fallback (only check for boost if really needed) In-Reply-To: <20220128124538.31789-2-ps.report@gmx.net> References: <20220128124538.31789-1-ps.report@gmx.net> <20220128124538.31789-2-ps.report@gmx.net> Message-ID: <20220128144021.543b2a0b@gmx.net> On Fri, 28 Jan 2022 13:45:37 +0100, Peter Seiderer wrote: > - add patch 0002-boost-fallback-only-check-for-boost-if-really-needed.patch > to check for boost if really needed (in case of legacy c++ standard < c++17) > > Fixes: > > - http://autobuild.buildroot.net/results/8d49ab7cd9952f6a13bdd330e875012d0601f1d2 > > -- Found Boost: .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include (found version "1.78.0") found components: thread chrono missing components: date_time atomic > CMake Error at .../build/log4cxx-0.12.0/boost-fallback-compile-tests/CMakeFiles/CMakeTmp/CMakeLists.txt:19 (add_executable): > Target "cmTC_aac37" links to target "Boost::date_time" but the target was > not found. Perhaps a find_package() call is missing for an IMPORTED > target, or an ALIAS target is missing? > > CMake Error at .../build/log4cxx-0.12.0/boost-fallback-compile-tests/CMakeFiles/CMakeTmp/CMakeLists.txt:19 (add_executable): > Target "cmTC_aac37" links to target "Boost::atomic" but the target was not > found. Perhaps a find_package() call is missing for an IMPORTED target, or > an ALIAS target is missing? > > Signed-off-by: Peter Seiderer > --- > ...nly-check-for-boost-if-really-needed.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch > > diff --git a/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch b/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch > new file mode 100644 > index 0000000000..7df29ea120 > --- /dev/null > +++ b/package/log4cxx/0002-boost-fallback-only-check-for-boost-if-really-needed.patch > @@ -0,0 +1,36 @@ > +From 24e7adc8d67b3c8f7d275b4f9a7e70a61b73fcd4 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Fri, 28 Jan 2022 13:11:01 +0100 > +Subject: [PATCH] boost-fallback: only check for boost if really needed > + > +- only check for boost if really needed (in case of legacy c++ standard < c++17) > + > +Signed-off-by: Peter Seiderer Upstream: https://github.com/apache/logging-log4cxx/pull/107 And https://patchwork.ozlabs.org/project/buildroot/patch/20211119175553.2413433-2-fontaine.fabrice at gmail.com/ for previous attempt to fix a similar/same failure... Regards, Peter > +--- > + src/cmake/boost-fallback/boost-fallback.cmake | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake > +index 8285b0b9..0ecf8c6c 100644 > +--- a/src/cmake/boost-fallback/boost-fallback.cmake > ++++ b/src/cmake/boost-fallback/boost-fallback.cmake > +@@ -55,6 +55,8 @@ try_compile(STD_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tes > + try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" > + "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp") > + > ++# search for boost only in case needed for legacy c++ standard < c++17 > ++if(NOT ${STD_THREAD_FOUND} OR NOT ${STD_MUTEX_FOUND} OR NOT ${STD_SHARED_MUTEX_FOUND} OR NOT ${STD_SHARED_PTR_FOUND} OR NOT ${STD_ATOMIC_FOUND}) > + find_package(Boost COMPONENTS thread) > + if( ${Boost_FOUND} ) > + try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" > +@@ -67,6 +69,7 @@ if( ${Boost_FOUND} ) > + try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" > + "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") > + endif( ${Boost_FOUND} ) > ++endif() > + > + # Link the target with the appropriate boost libraries(if required) > + function(boostfallback_link target) > +-- > +2.34.1 > + From aperez at igalia.com Fri Jan 28 14:13:14 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Fri, 28 Jan 2022 16:13:14 +0200 Subject: [Buildroot] libsoup3 migration (was: Re: [PATCH 2/2] package/libsoup: bump to version 3.0.4) In-Reply-To: References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> <20220128134223.GB765275@momiji> Message-ID: <20220128161314.GB770598@momiji> Hello Thomas, all, On Fri, 28 Jan 2022 13:33:32 +0100 Thomas Devoogdt wrote: > Hello Adri?n, all, > > I tested indeed libsoup3 against webkitgtk 2.34.4 [1]. By dropping > -DUSE_SOUP2=ON > from your commit, I was able to build webkitgtk 2.34.4. > > You are right, other packages will have to migrate as well, > e.g. a GStreamer bump to 1.19.3 is needed [2]. > > A quick search learns me that BR2_PACKAGE_LIBSOUP is/can be selected in/for: > - BR2_PACKAGE_GMPC (no explicit support mentioned yet) > - BR2_PACKAGE_GSSDP (support on master branch [3]) > - BR2_PACKAGE_GUPNP_TOOLS (no explicit support mentioned yet) > - BR2_PACKAGE_GVFS (no explicit support mentioned yet) > - BR2_PACKAGE_LIBOSTREE (no explicit support mentioned yet) > - BR2_PACKAGE_MIDORI (no explicit support mentioned yet) > - BR2_PACKAGE_WPEWEBKIT (no explicit support mentioned yet) > > - BR2_PACKAGE_GST1_PLUGINS_GOOD (starting from 1.19.3) > - BR2_PACKAGE_GSTD (starting from 1.19.3) > - BR2_PACKAGE_WEBKITGTK (starting from 2.34.4) There is a tracking table for the libsoup3 migration that one of my work mates has been maintaining up to date; you can find it here: https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 For most of the packages from Buildroot that you listed there are patches filed to their corresponding upstreams. The way I see it, there are three possible ways for a migration: - Keep both libsoup2 and libsoup3 in the tree, migrate packages to libsoup3 where possible and where we do not see conflicts (like loading both versions in the same process) likely to happen. - Replace libsoup2 with libsoup3 *now*, import patches into the Buildroot tree for the packages which do not yet have releases compatible with libsoup3. - Replace libsoup2 with libsoup3 *later*, once all upstreams of packages present in Buildroot put out releases that work with libsoup3. Personally I tend to think the last option is likely to be the best, to avoid confusions and the possibility that people who use Buildroot as basis for their work get into nasty situations due to both libsoup2 and libsoup3 being available. Opinions? > --- > [1] > https://git.sr.ht/~aperezdc/buildroot/commit/5dc402d58659a35a30afd1de1a8fb8075034f3fc > [2] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1044 > [3] https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/7 > > > Op vr 28 jan. 2022 om 12:42 schreef Adrian Perez de Castro < > aperez at igalia.com>: > > > Hello Thomas, all, > > > > On Fri, 28 Jan 2022 11:59:17 +0100 Thomas Devoogdt < > > thomas.devoogdt at gmail.com> wrote: > > > Drop upstreamed patch: > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c > > > > > > The gnome option was dropped in: > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a > > > > > > A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 > > backend): > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 > > > > > > Signed-off-by: Thomas Devoogdt > > > --- > > > Config.in.legacy | 6 +++ > > > .../0001-meson.build-set-c_std-to-gnu99.patch | 40 ------------------- > > > package/libsoup/Config.in | 6 +-- > > > package/libsoup/libsoup.hash | 4 +- > > > package/libsoup/libsoup.mk | 11 ++--- > > > package/midori/Config.in | 1 - > > > 6 files changed, 12 insertions(+), 56 deletions(-) > > > delete mode 100644 > > package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch > > > > Note that libsoup3 has a new API [1] (and ABI, therefore). Packages using > > libsoup2 may not even compile with libsoup3, or may crash at runtime in > > unexpected ways. > > > > You will need followup patches to modify packages that depend on libsoup > > to make them use libsoup2. For example in package/wpewebkit.mk we are > > currently passing -DUSE_SOUP2=ON to CMake, which needs to be changed to > > OFF. > > > > Some packages may not even support yet building with libsoup3. Therefore > > we may need to keep the libsoup2 package. This is possible, as both > > versions > > are parallel-installable. But then there is one more issue: one cannot use > > both libraries in the same process. Which means, for example, if wpewebkit > > gets changed to use libsoup3, then GStreamer *also* needs to be changed > > because both are used inside WebKit. > > > > These are all reasons why I have not yet sent patches to do the switch. > > Probably we want to discuss how to go ahead with the libsoup3 migration in > > Buildroot. > > > > Cheers, > > ?Adri?n > > > > --- > > [1] https://libsoup.org/libsoup-3.0/ch02.html > > Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From universeiii at gmx.de Fri Jan 28 14:51:03 2022 From: universeiii at gmx.de (Andreas Ehmanns) Date: Fri, 28 Jan 2022 15:51:03 +0100 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: add config option for custom patches Message-ID: <20220128145103.3422-1-universeiii@gmx.de> Many embedded board manufacturer provide their BSP as patches to linux kernel and u-boot. They can simply be applied by setting the corresponding buildroot config (custom patches). Nowadays patches for the arm trusted firmware (ATF) are also part of BSP deliveries but there is no config option in buildroot for ATF to apply custom patches. This patch adds (similar to linux kernel and u-boot) an option to apply custom patches to ATF. Signed-off-by: Andreas Ehmanns --- boot/arm-trusted-firmware/Config.in | 8 +++++++ .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index b1fc03e10b..786a3083a2 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -63,6 +63,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION endif +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH + string "Custom ATF patches" + help + A space-separated list of patches to apply to ATF. + Each patch can be described as an URL, a local file path, + or a directory. In the case of a directory, all files + matching *.patch in the directory will be applied. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM string "ATF platform" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 03fa83b7b5..d329bdbfc3 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -29,6 +29,27 @@ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) endif +# Analogous code exists in linux/linux.mk. Basically, the generic +# package infrastructure handles downloading and applying remote +# patches. Local patches are handled depending on whether they are +# directories or files. +ARM_TRUSTED_FIRMWARE_PATCHES = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH)) +ARM_TRUSTED_FIRMWARE_PATCH = $(filter ftp://% http://% https://%,$(ARM_TRUSTED_FIRMWARE_PATCHES)) + +define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES + for p in $(filter-out ftp://% http://% https://%,$(ARM_TRUSTED_FIRMWARE_PATCHES)) ; do \ + if test -d $$p ; then \ + $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \ + else \ + $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \ + fi \ + done +endef +ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES + +# We have no way to know the hashes for user-supplied patches. +BR_NO_CHECK_HASH_FOR += $(notdir $(ARM_TRUSTED_FIRMWARE_PATCHES)) + ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) -- 2.26.2 From robert.hancock at calian.com Fri Jan 28 16:25:12 2022 From: robert.hancock at calian.com (Robert Hancock) Date: Fri, 28 Jan 2022 16:25:12 +0000 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: add config option for custom patches In-Reply-To: <20220128145103.3422-1-universeiii@gmx.de> References: <20220128145103.3422-1-universeiii@gmx.de> Message-ID: <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> On Fri, 2022-01-28 at 15:51 +0100, Andreas Ehmanns wrote: > Many embedded board manufacturer provide their BSP as patches to > linux kernel and u-boot. They can simply be applied by setting the > corresponding buildroot config (custom patches). > Nowadays patches for the arm trusted firmware (ATF) are also part of > BSP deliveries but there is no config option in buildroot for ATF > to apply custom patches. > This patch adds (similar to linux kernel and u-boot) an option to > apply custom patches to ATF. Hi Andreas, You shouldn't need a custom option to add patches for each package. If you add patches to $(BR2_EXTERNAL)/patches/arm-trusted-firmware then they will get applied automatically, we are using this mechanism already. I think the specific patch options for the kernel and U-Boot may predate that mechanism but don't need to be used anymore either. > > Signed-off-by: Andreas Ehmanns > --- > boot/arm-trusted-firmware/Config.in | 8 +++++++ > .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ > 2 files changed, 29 insertions(+) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- > firmware/Config.in > index b1fc03e10b..786a3083a2 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -63,6 +63,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION > > endif > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH > + string "Custom ATF patches" > + help > + A space-separated list of patches to apply to ATF. > + Each patch can be described as an URL, a local file path, > + or a directory. In the case of a directory, all files > + matching *.patch in the directory will be applied. > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM > string "ATF platform" > help > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm- > trusted-firmware/arm-trusted-firmware.mk > index 03fa83b7b5..d329bdbfc3 100644 > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > @@ -29,6 +29,27 @@ ifeq > ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST > BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) > endif > > +# Analogous code exists in linux/linux.mk. Basically, the generic > +# package infrastructure handles downloading and applying remote > +# patches. Local patches are handled depending on whether they are > +# directories or files. > +ARM_TRUSTED_FIRMWARE_PATCHES = $(call > qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH)) > +ARM_TRUSTED_FIRMWARE_PATCH = $(filter > https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ > https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 > fh66I9s3_Ij- > rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM > _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- > rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) > + > +define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES > + for p in $(filter-out > https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ > https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 > fh66I9s3_Ij- > rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM > _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- > rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) ; do \ > + if test -d $$p ; then \ > + $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \ > + else \ > + $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || > exit 1; \ > + fi \ > + done > +endef > +ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += > ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES > + > +# We have no way to know the hashes for user-supplied patches. > +BR_NO_CHECK_HASH_FOR += $(notdir $(ARM_TRUSTED_FIRMWARE_PATCHES)) > + > ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES > > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) > -- > 2.26.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://urldefense.com/v3/__https://lists.buildroot.org/mailman/listinfo/buildroot__;!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78CXtWZJI$ From peter at korsgaard.com Fri Jan 28 16:53:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:53:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR Message-ID: <20220128164633.E1B5A807B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb15463735f23b16601ef3f8b9f744f7cd421e5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 67af1b5ba50f387f6fb6ec7cc67283e1c9813fc0) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..7425423b8f 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six From peter at korsgaard.com Fri Jan 28 16:53:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:53:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/open62541: add OPEN62541_CPE_ID_VENDOR Message-ID: <20220128164633.D9A2C82707@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8af955d48aaaaa5caca577d804e0780ad40ed5ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 88606bd9eb4cc244388a3dec70a21d54ee3fe352) Signed-off-by: Peter Korsgaard --- package/open62541/open62541.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 102e09a429..8adf09a79d 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -12,6 +12,7 @@ OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 OPEN62541_LICENSE_FILES = LICENSE +OPEN62541_CPE_ID_VENDOR = open62541 # Force Release build to remove -Werror. # Don't use git describe to get the version number. From peter at korsgaard.com Fri Jan 28 16:53:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:53:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR Message-ID: <20220128164712.0329C82AFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cdc0f655e9fad98d7c0239b9d8b6161b4c8f40d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 67af1b5ba50f387f6fb6ec7cc67283e1c9813fc0) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..7425423b8f 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,6 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.fb41 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING +TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six From peter at korsgaard.com Fri Jan 28 16:53:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:53:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/open62541: add OPEN62541_CPE_ID_VENDOR Message-ID: <20220128164711.EE77B82825@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2c278e83fd7774b5fcd52c1e82a4546639da03e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 88606bd9eb4cc244388a3dec70a21d54ee3fe352) Signed-off-by: Peter Korsgaard --- package/open62541/open62541.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 66777ce501..fb28a614e2 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -11,6 +11,7 @@ OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 OPEN62541_LICENSE_FILES = LICENSE +OPEN62541_CPE_ID_VENDOR = open62541 # Force Release build to remove -Werror. # Don't use git describe to get the version number. From peter at korsgaard.com Fri Jan 28 16:55:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:55:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/open62541: add OPEN62541_CPE_ID_VENDOR In-Reply-To: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 14 Jan 2022 23:09:54 +0100") References: <20220114220954.1179812-1-fontaine.fabrice@gmail.com> Message-ID: <87mtjf94vz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:open62541:open62541 is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen62541%3Aopen62541 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:55:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:55:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/targetcli-fb: add TARGETCLI_FB_CPE_ID_VENDOR In-Reply-To: <20220114180242.963756-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 14 Jan 2022 19:02:42 +0100") References: <20220114180242.963756-1-fontaine.fabrice@gmail.com> Message-ID: <87ilu394vc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:targetcli-fb_project:targetcli-fb is a valid CPE identifier > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atargetcli-fb_project%3Atargetcli-fb > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:57:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:57:15 +0100 Subject: [Buildroot] [git commit] package/targetcli-fb: security bump to version 2.1.54 In-Reply-To: <20220115101718.49F728296C@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 15 Jan 2022 11:23:03 +0100") References: <20220115101718.49F728296C@busybox.osuosl.org> Message-ID: <87ee4r94t0.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=488f92a1c368c842f9f6c1bbae0384cfa803a684 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak > permissions for /etc/target (and for the backup directory and backup > files). > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:56:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:56:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/targetcli-fb: security bump to version 2.1.54 Message-ID: <20220128165024.C155882A43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8280160e7d157ea7fde79b56582cff28eda0f71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak permissions for /etc/target (and for the backup directory and backup files). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 488f92a1c368c842f9f6c1bbae0384cfa803a684) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 207c38e046..64f68a6675 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 7425423b8f..c6ca776b27 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 16:56:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:56:23 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/targetcli-fb: security bump to version 2.1.54 Message-ID: <20220128165028.D836682A43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f9b37303b63feb13514cee47e0ae3e66ce7c945 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2020-13867: Open-iSCSI targetcli-fb through 2.1.52 has weak permissions for /etc/target (and for the backup directory and backup files). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 488f92a1c368c842f9f6c1bbae0384cfa803a684) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 207c38e046..64f68a6675 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 7425423b8f..c6ca776b27 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 16:59:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:59:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/ghostscript: fix CVE-2021-45944 In-Reply-To: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 15 Jan 2022 11:15:34 +0100") References: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> Message-ID: <87a6ff94ov.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in > sampled_data_sample (called from sampled_data_continue and interp). > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:59:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:59:49 +0100 Subject: [Buildroot] [PATCH 2/2] package/ghostscript: fix CVE-2021-45949 In-Reply-To: <20220115101535.1699671-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 15 Jan 2022 11:15:35 +0100") References: <20220115101535.1699671-1-fontaine.fabrice@gmail.com> <20220115101535.1699671-2-fontaine.fabrice@gmail.com> Message-ID: <875yq394oq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer > overflow in sampled_data_finish (called from sampled_data_continue and > interp). > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 16:59:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:59:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/ghostscript: fix CVE-2021-45944 Message-ID: <20220128165257.E411D82AFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a11767de07d2d4fbb15e08002a0041b5c70e85b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in sampled_data_sample (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 70910c4092d9c9f359c26436fbc3c75918a90129) Signed-off-by: Peter Korsgaard --- ...ck-stack-limits-after-function-evaluation.patch | 52 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 ++ 2 files changed, 55 insertions(+) diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch new file mode 100644 index 0000000000..352f1754f6 --- /dev/null +++ b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch @@ -0,0 +1,52 @@ +From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i commit: https://git.buildroot.net/buildroot/commit/?id=813833e121abc3653e696284f3acc6c68d2a891e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop spurious space added by commit f9e359d7653f4af32a491e2baf4b6e524554174b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7e47d01c995b6a8329a4dafd4d5b2645b73cc9f2) Signed-off-by: Peter Korsgaard --- package/ghostscript/ghostscript.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index ca24c61678..d502d19206 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -71,7 +71,7 @@ endif ifeq ($(BR2_PACKAGE_CUPS),y) GHOSTSCRIPT_DEPENDENCIES += cups -GHOSTSCRIPT_CONF_OPTS += \ +GHOSTSCRIPT_CONF_OPTS += \ CUPSCONFIG=$(STAGING_DIR)/usr/bin/cups-config \ --enable-cups else From peter at korsgaard.com Fri Jan 28 16:59:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 17:59:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/ghostscript: fix CVE-2021-45949 Message-ID: <20220128165257.F08AF82AFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d908fb496b7bef62e7ccab27f68170685770a59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c817641331431aeb6db7b487173d63dbd9c73295) Signed-off-by: Peter Korsgaard --- ...stack-management-in-sampled_data_continue.patch | 68 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 + 2 files changed, 71 insertions(+) diff --git a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch new file mode 100644 index 0000000000..72e07df0ac --- /dev/null +++ b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i commit: https://git.buildroot.net/buildroot/commit/?id=226a8ae7f20cea17472c0232a022d7d526e660a3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Ghostscript GhostPDL 9.50 through 9.54.0 has a heap-based buffer overflow in sampled_data_finish (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c817641331431aeb6db7b487173d63dbd9c73295) Signed-off-by: Peter Korsgaard --- ...stack-management-in-sampled_data_continue.patch | 68 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 + 2 files changed, 71 insertions(+) diff --git a/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch new file mode 100644 index 0000000000..72e07df0ac --- /dev/null +++ b/package/ghostscript/0004-Bug-703902-Fix-op-stack-management-in-sampled_data_continue.patch @@ -0,0 +1,68 @@ +From 2a3129365d3bc0d4a41f107ef175920d1505d1f7 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 1 Jun 2021 19:57:16 +0100 +Subject: [PATCH] Bug 703902: Fix op stack management in + sampled_data_continue() + +Replace pop() (which does no checking, and doesn't handle stack extension +blocks) with ref_stack_pop() which does do all that. + +We still use pop() in one case (it's faster), but we have to later use +ref_stack_pop() before calling sampled_data_sample() which also accesses the +op stack. + +Fixes: +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34675 + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=2a3129365d3bc0d4a41f107ef175920d1505d1f7] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 0e8e4bc8d..00cd0cfdd 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -533,15 +533,19 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + for (j = 0; j < bps; j++) + data_ptr[bps * i + j] = (byte)(cv >> ((bps - 1 - j) * 8)); /* MSB first */ + } +- pop(num_out); /* Move op to base of result values */ + +- /* Check if we are done collecting data. */ ++ pop(num_out); /* Move op to base of result values */ + ++ /* From here on, we have to use ref_stack_pop() rather than pop() ++ so that it handles stack extension blocks properly, before calling ++ sampled_data_sample() which also uses the op stack. ++ */ ++ /* Check if we are done collecting data. */ + if (increment_cube_indexes(params, penum->indexes)) { + if (stack_depth_adjust == 0) +- pop(O_STACK_PAD); /* Remove spare stack space */ ++ ref_stack_pop(&o_stack, O_STACK_PAD); /* Remove spare stack space */ + else +- pop(stack_depth_adjust - num_out); ++ ref_stack_pop(&o_stack, stack_depth_adjust - num_out); + /* Execute the closing procedure, if given */ + code = 0; + if (esp_finish_proc != 0) +@@ -554,11 +558,11 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + if ((O_STACK_PAD - stack_depth_adjust) < 0) { + stack_depth_adjust = -(O_STACK_PAD - stack_depth_adjust); + check_op(stack_depth_adjust); +- pop(stack_depth_adjust); ++ ref_stack_pop(&o_stack, stack_depth_adjust); + } + else { + check_ostack(O_STACK_PAD - stack_depth_adjust); +- push(O_STACK_PAD - stack_depth_adjust); ++ ref_stack_push(&o_stack, O_STACK_PAD - stack_depth_adjust); + for (i=0;i commit: https://git.buildroot.net/buildroot/commit/?id=cfdca3ebf81bee54b3fc5e3a378c5e3131dfe2e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Ghostscript GhostPDL 9.50 through 9.53.3 has a use-after-free in sampled_data_sample (called from sampled_data_continue and interp). Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 70910c4092d9c9f359c26436fbc3c75918a90129) Signed-off-by: Peter Korsgaard --- ...ck-stack-limits-after-function-evaluation.patch | 52 ++++++++++++++++++++++ package/ghostscript/ghostscript.mk | 3 ++ 2 files changed, 55 insertions(+) diff --git a/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch new file mode 100644 index 0000000000..352f1754f6 --- /dev/null +++ b/package/ghostscript/0003-oss-fuzz-30715-Check-stack-limits-after-function-evaluation.patch @@ -0,0 +1,52 @@ +From 7861fcad13c497728189feafb41cd57b5b50ea25 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Fri, 12 Feb 2021 10:34:23 +0000 +Subject: [PATCH] oss-fuzz 30715: Check stack limits after function evaluation. + +During function result sampling, after the callout to the Postscript +interpreter, make sure there is enough stack space available before pushing +or popping entries. + +In thise case, the Postscript procedure for the "function" is totally invalid +(as a function), and leaves the op stack in an unrecoverable state (as far as +function evaluation is concerned). We end up popping more entries off the +stack than are available. + +To cope, add in stack limit checking to throw an appropriate error when this +happens. + +[Retrieved from: +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7861fcad13c497728189feafb41cd57b5b50ea25] +Signed-off-by: Fabrice Fontaine +--- + psi/zfsample.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/psi/zfsample.c b/psi/zfsample.c +index 290809405..652ae02c6 100644 +--- a/psi/zfsample.c ++++ b/psi/zfsample.c +@@ -551,9 +551,17 @@ sampled_data_continue(i_ctx_t *i_ctx_p) + } else { + if (stack_depth_adjust) { + stack_depth_adjust -= num_out; +- push(O_STACK_PAD - stack_depth_adjust); +- for (i=0;i (Fabrice Fontaine's message of "Sat, 15 Jan 2022 12:42:44 +0100") References: <20220115114244.1912724-1-fontaine.fabrice@gmail.com> Message-ID: <871r0r94my.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fixes: > - CVE-2021-45115: Denial-of-service possibility in > UserAttributeSimilarityValidator > - CVE-2021-45116: Potential information disclosure in dictsort template > filter > - CVE-2021-45452: Potential directory-traversal via Storage.save() > https://www.djangoproject.com/weblog/2022/jan/04/security-releases > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 17:00:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 18:00:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-django: security bump to version 3.2.11 Message-ID: <20220128165406.8DD7F8140B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f541ba0cfffd5653adf1b3c36cbd046e7542f6e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes: - CVE-2021-45115: Denial-of-service possibility in UserAttributeSimilarityValidator - CVE-2021-45116: Potential information disclosure in dictsort template filter - CVE-2021-45452: Potential directory-traversal via Storage.save() https://www.djangoproject.com/weblog/2022/jan/04/security-releases Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a17d4aba54e62359cba638809fde5752dd40cf59) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 3eea17e70f..89bc5ffb19 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 4f80208f0e..25a645823b 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.10 +PYTHON_DJANGO_VERSION = 3.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 28 17:00:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 18:00:21 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-django: security bump to version 3.2.11 Message-ID: <20220128165411.0FEA182A2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a07dc684c304eade263e83f863abee3ed587a986 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes: - CVE-2021-45115: Denial-of-service possibility in UserAttributeSimilarityValidator - CVE-2021-45116: Potential information disclosure in dictsort template filter - CVE-2021-45452: Potential directory-traversal via Storage.save() https://www.djangoproject.com/weblog/2022/jan/04/security-releases Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a17d4aba54e62359cba638809fde5752dd40cf59) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 3eea17e70f..89bc5ffb19 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 eaf0c3b4ac6b22cae9068360e6fd2d1b Django-3.2.10.tar.gz -sha256 074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4 Django-3.2.10.tar.gz +md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz +sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 4f80208f0e..25a645823b 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.10 +PYTHON_DJANGO_VERSION = 3.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/8e/c6dfc718d572e4b33b56824b9e71e5ab9be8072e6747fc6184d206c3fdb3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 28 17:03:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 18:03:26 +0100 Subject: [Buildroot] [PATCH] package/nodejs: security bump to version 14.18.3 In-Reply-To: <20220114103825.1529-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 14 Jan 2022 11:38:24 +0100") References: <20220114103825.1529-1-peter@korsgaard.com> Message-ID: <87wnij7py9.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) > Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is > specifically defined to use a particular SAN type, can result in bypassing > name-constrained intermediates. Node.js was accepting URI SAN types, which > PKIs are often not defined to use. Additionally, when a protocol allows URI > SANs, Node.js did not match the URI correctly. > Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) > Node.js converts SANs (Subject Alternative Names) to a string format. It > uses this string to check peer certificates against hostnames when > validating connections. The string format was subject to an injection > vulnerability when name constraints were used within a certificate chain, > allowing the bypass of these name constraints. > Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) > Node.js did not handle multi-value Relative Distinguished Names correctly. > Attackers could craft certificate subjects containing a single-value > Relative Distinguished Name that would be interpreted as a multi-value > Relative Distinguished Name, for example, in order to inject a Common Name > that would allow bypassing the certificate subject verification. > Prototype pollution via console.table properties (Low)(CVE-2022-21824) > Due to the formatting logic of the console.table() function it was not safe > to allow user controlled input to be passed to the properties parameter > while simultaneously passing a plain object with at least one property as > the first parameter, which could be __proto__. The prototype pollution has > very limited control, in that it only allows an empty string to be assigned > numerical keys of the object prototype. > For details, see the advisory: > https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ > Signed-off-by: Peter Korsgaard Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 12.22.9 which contains the same fixes. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Fri Jan 28 17:16:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 28 Jan 2022 18:16:55 +0100 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: add config option for custom patches In-Reply-To: <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> References: <20220128145103.3422-1-universeiii@gmx.de> <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> Message-ID: <20220128171655.GS457876@scaer> Robert, Andreas, All, On 2022-01-28 16:25 +0000, Robert Hancock via buildroot spake thusly: > On Fri, 2022-01-28 at 15:51 +0100, Andreas Ehmanns wrote: > > Many embedded board manufacturer provide their BSP as patches to > > linux kernel and u-boot. They can simply be applied by setting the > > corresponding buildroot config (custom patches). > > Nowadays patches for the arm trusted firmware (ATF) are also part of > > BSP deliveries but there is no config option in buildroot for ATF > > to apply custom patches. > > This patch adds (similar to linux kernel and u-boot) an option to > > apply custom patches to ATF. > You shouldn't need a custom option to add patches for each package. If you add > patches to $(BR2_EXTERNAL)/patches/arm-trusted-firmware then they will get > applied automatically, we are using this mechanism already. I think you forgot a part to this: ... as long as you set BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/patches" in your Buildroot configuration. BR2_GLOBAL_PATCH_DIR is the generic solution to apply custom patches to any package in Buildroot. BR2_GLOBAL_PATCH_DIR can even be a space-separated list of directories. And it can also use a 'series' file rather than just globing *.patch. > I think the specific patch options for the kernel and U-Boot may predate that > mechanism but don't need to be used anymore either. Indeed. We're keeping them just because of inertia... Regards, Yann E. MORIN. > > Signed-off-by: Andreas Ehmanns > > --- > > boot/arm-trusted-firmware/Config.in | 8 +++++++ > > .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ > > 2 files changed, 29 insertions(+) > > > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- > > firmware/Config.in > > index b1fc03e10b..786a3083a2 100644 > > --- a/boot/arm-trusted-firmware/Config.in > > +++ b/boot/arm-trusted-firmware/Config.in > > @@ -63,6 +63,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION > > > > endif > > > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH > > + string "Custom ATF patches" > > + help > > + A space-separated list of patches to apply to ATF. > > + Each patch can be described as an URL, a local file path, > > + or a directory. In the case of a directory, all files > > + matching *.patch in the directory will be applied. > > + > > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM > > string "ATF platform" > > help > > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm- > > trusted-firmware/arm-trusted-firmware.mk > > index 03fa83b7b5..d329bdbfc3 100644 > > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > > @@ -29,6 +29,27 @@ ifeq > > ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST > > BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) > > endif > > > > +# Analogous code exists in linux/linux.mk. Basically, the generic > > +# package infrastructure handles downloading and applying remote > > +# patches. Local patches are handled depending on whether they are > > +# directories or files. > > +ARM_TRUSTED_FIRMWARE_PATCHES = $(call > > qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH)) > > +ARM_TRUSTED_FIRMWARE_PATCH = $(filter > > https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ > > https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 > > fh66I9s3_Ij- > > rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM > > _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- > > rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) > > + > > +define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES > > + for p in $(filter-out > > https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ > > https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 > > fh66I9s3_Ij- > > rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM > > _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- > > rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) ; do \ > > + if test -d $$p ; then \ > > + $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \ > > + else \ > > + $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || > > exit 1; \ > > + fi \ > > + done > > +endef > > +ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += > > ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES > > + > > +# We have no way to know the hashes for user-supplied patches. > > +BR_NO_CHECK_HASH_FOR += $(notdir $(ARM_TRUSTED_FIRMWARE_PATCHES)) > > + > > ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES > > > > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) > > -- > > 2.26.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://urldefense.com/v3/__https://lists.buildroot.org/mailman/listinfo/buildroot__;!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78CXtWZJI$ > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.devoogdt at gmail.com Fri Jan 28 17:23:25 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Fri, 28 Jan 2022 18:23:25 +0100 Subject: [Buildroot] libsoup3 migration (was: Re: [PATCH 2/2] package/libsoup: bump to version 3.0.4) In-Reply-To: <20220128161314.GB770598@momiji> References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> <20220128134223.GB765275@momiji> <20220128161314.GB770598@momiji> Message-ID: Hello Adri?n, all, Over time, we might have to support both versions anyway, since not all packages will migrate that quickly. If we go for option 1, then we can do it as follows: Introducing a flag called BR2_PACKAGE_LIBSOUP_3. The flag should have a life-cycle of 3 stages: 1. The newly introduced flag should default to 'false'. All packages which don't support libsoup3 support can add a 'depend on !BR2_PACKAGE_LIBSOUP_3' mark. 2. Over time, we can set the default to 'true', but keep the possibility to use libsoup2 for packages that still lack libsoup3 support. 3. Mark the BR2_PACKAGE_LIBSOUP_3 as legacy. The main advantage of this strategy is that people can start using libsoup3. The Disadvantage is that the new flag has to be maintained for a while. Kr, Thomas Op vr 28 jan. 2022 om 15:13 schreef Adrian Perez de Castro < aperez at igalia.com>: > Hello Thomas, all, > > On Fri, 28 Jan 2022 13:33:32 +0100 Thomas Devoogdt < > thomas.devoogdt at gmail.com> wrote: > > Hello Adri?n, all, > > > > I tested indeed libsoup3 against webkitgtk 2.34.4 [1]. By dropping > > -DUSE_SOUP2=ON > > from your commit, I was able to build webkitgtk 2.34.4. > > > > You are right, other packages will have to migrate as well, > > e.g. a GStreamer bump to 1.19.3 is needed [2]. > > > > A quick search learns me that BR2_PACKAGE_LIBSOUP is/can be selected > in/for: > > - BR2_PACKAGE_GMPC (no explicit support mentioned yet) > > - BR2_PACKAGE_GSSDP (support on master branch [3]) > > - BR2_PACKAGE_GUPNP_TOOLS (no explicit support mentioned yet) > > - BR2_PACKAGE_GVFS (no explicit support mentioned yet) > > - BR2_PACKAGE_LIBOSTREE (no explicit support mentioned yet) > > - BR2_PACKAGE_MIDORI (no explicit support mentioned yet) > > - BR2_PACKAGE_WPEWEBKIT (no explicit support mentioned yet) > > > > - BR2_PACKAGE_GST1_PLUGINS_GOOD (starting from 1.19.3) > > - BR2_PACKAGE_GSTD (starting from 1.19.3) > > - BR2_PACKAGE_WEBKITGTK (starting from 2.34.4) > > There is a tracking table for the libsoup3 migration that one of my work > mates > has been maintaining up to date; you can find it here: > > https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 > > For most of the packages from Buildroot that you listed there are patches > filed to their corresponding upstreams. > > The way I see it, there are three possible ways for a migration: > > - Keep both libsoup2 and libsoup3 in the tree, migrate packages to libsoup3 > where possible and where we do not see conflicts (like loading both > versions > in the same process) likely to happen. > > - Replace libsoup2 with libsoup3 *now*, import patches into the Buildroot > tree > for the packages which do not yet have releases compatible with libsoup3. > > - Replace libsoup2 with libsoup3 *later*, once all upstreams of packages > present in Buildroot put out releases that work with libsoup3. > > Personally I tend to think the last option is likely to be the best, to > avoid > confusions and the possibility that people who use Buildroot as basis for > their work get into nasty situations due to both libsoup2 and libsoup3 > being > available. > > Opinions? > > > --- > > [1] > > > https://git.sr.ht/~aperezdc/buildroot/commit/5dc402d58659a35a30afd1de1a8fb8075034f3fc > > [2] > https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1044 > > [3] https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/7 > > > > > > Op vr 28 jan. 2022 om 12:42 schreef Adrian Perez de Castro < > > aperez at igalia.com>: > > > > > Hello Thomas, all, > > > > > > On Fri, 28 Jan 2022 11:59:17 +0100 Thomas Devoogdt < > > > thomas.devoogdt at gmail.com> wrote: > > > > Drop upstreamed patch: > > > > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c > > > > > > > > The gnome option was dropped in: > > > > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a > > > > > > > > A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 > > > backend): > > > > > > > > https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 > > > > > > > > Signed-off-by: Thomas Devoogdt > > > > --- > > > > Config.in.legacy | 6 +++ > > > > .../0001-meson.build-set-c_std-to-gnu99.patch | 40 > ------------------- > > > > package/libsoup/Config.in | 6 +-- > > > > package/libsoup/libsoup.hash | 4 +- > > > > package/libsoup/libsoup.mk | 11 ++--- > > > > package/midori/Config.in | 1 - > > > > 6 files changed, 12 insertions(+), 56 deletions(-) > > > > delete mode 100644 > > > package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch > > > > > > Note that libsoup3 has a new API [1] (and ABI, therefore). Packages > using > > > libsoup2 may not even compile with libsoup3, or may crash at runtime in > > > unexpected ways. > > > > > > You will need followup patches to modify packages that depend on > libsoup > > > to make them use libsoup2. For example in package/wpewebkit.mk we are > > > currently passing -DUSE_SOUP2=ON to CMake, which needs to be changed to > > > OFF. > > > > > > Some packages may not even support yet building with libsoup3. > Therefore > > > we may need to keep the libsoup2 package. This is possible, as both > > > versions > > > are parallel-installable. But then there is one more issue: one cannot > use > > > both libraries in the same process. Which means, for example, if > wpewebkit > > > gets changed to use libsoup3, then GStreamer *also* needs to be changed > > > because both are used inside WebKit. > > > > > > These are all reasons why I have not yet sent patches to do the switch. > > > Probably we want to discuss how to go ahead with the libsoup3 > migration in > > > Buildroot. > > > > > > Cheers, > > > ?Adri?n > > > > > > --- > > > [1] https://libsoup.org/libsoup-3.0/ch02.html > > > > > Cheers, > ?Adri?n > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Fri Jan 28 17:30:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 18:30:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/xml-security-c: needs threads Message-ID: <20220128173002.2483220-1-fontaine.fabrice@gmail.com> Add threads dependency to avoid the following build failure raised since bump to version 2.0.4 in commit 27d08083ed4db5bd055219574cc602aaf8053a49: configure: error: unable to find pthreads, currently this is required Fixes: - http://autobuild.buildroot.org/results/b6065efaa722f2da911c7cf150d446da621e8c71 Signed-off-by: Fabrice Fontaine --- package/xml-security-c/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/xml-security-c/Config.in b/package/xml-security-c/Config.in index 02544d5a01..c7963be69a 100644 --- a/package/xml-security-c/Config.in +++ b/package/xml-security-c/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_XML_SECURITY_C depends on !BR2_STATIC_LIBS # xerces depends on BR2_USE_WCHAR # xerces depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_XERCES @@ -13,6 +14,7 @@ config BR2_PACKAGE_XML_SECURITY_C https://santuario.apache.org/cindex.html -comment "xml-security-c needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7" +comment "xml-security-c needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 17:32:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 18:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/midori: drop select of libsoup-gnome Message-ID: <20220128173204.2483569-1-fontaine.fabrice@gmail.com> libsoup-gnome is not used by midori since bump to version 9.0 in commit 42f19d49fb2da891be9266a2f843292d24847f18 and https://github.com/midori-browser/core/commit/0c2d8f0ea61f20476542e861bc1772a878a54d32 Signed-off-by: Fabrice Fontaine --- package/midori/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/midori/Config.in b/package/midori/Config.in index d98d7cb161..715295e5a6 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -41,7 +41,6 @@ config BR2_PACKAGE_MIDORI select BR2_PACKAGE_LIBPEAS select BR2_PACKAGE_LIBPEAS_WIDGETS select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBSOUP_GNOME select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_SQLITE -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 17:45:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 18:45:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/htpdate: fix static openssl build Message-ID: <20220128174540.2502417-1-fontaine.fabrice@gmail.com> Fix the following static build failure with openssl raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(rec_layer_d1.o): in function `DTLS_RECORD_LAYER_new': rec_layer_d1.c:(.text+0x124): undefined reference to `CRYPTO_malloc' Fixes: - http://autobuild.buildroot.org/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 Signed-off-by: Fabrice Fontaine --- ...-config-to-determine-openssl-LDFLAGS.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch diff --git a/package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch b/package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch new file mode 100644 index 0000000000..c229ca6d89 --- /dev/null +++ b/package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch @@ -0,0 +1,43 @@ +From 81fd178abed833defce18562e8122d5c85822ccb Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Fri, 28 Jan 2022 18:37:24 +0100 +Subject: [PATCH] Use pkg-config to determine openssl LDFLAGS + +Depending on its build configuration, openssl might not be compiled with +dynamic zlib support, and programs that link against openssl need to link +against zlib as well, as illustrated in this build failure: +http://autobuild.buildroot.net/results/ae9/ae946ca72238840b3eaa5fe823e8d620618f7462/ + +Signed-off-by: Titouan Christophe +[Retrieved (and slightly updated) from: +https://github.com/angeloc/htpdate/commit/72fcf9f82770e927e058a2eaa327d0eecb1e3c8d] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/twekkel/htpdate/pull/17] +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4796efa..46c8681 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,6 +4,7 @@ mandir = ${prefix}/share/man + + CC ?= gcc + CFLAGS += -Wall -std=c11 -pedantic -O2 ++PKG_CONFIG ?= pkg-config + + INSTALL ?= install -c + STRIP ?= strip -s +@@ -14,7 +15,7 @@ htpdate: htpdate.c + $(CC) $(CFLAGS) -o htpdate htpdate.c + + https: htpdate.c +- $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c -lssl ++ $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c $(shell $(PKG_CONFIG) --libs libssl) + + install: all + $(STRIP) htpdate +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Fri Jan 28 18:11:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:11:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.69.1 In-Reply-To: <20220128105917.30421-1-thomas.devoogdt@barco.com> (Thomas Devoogdt's message of "Fri, 28 Jan 2022 11:59:16 +0100") References: <20220128105917.30421-1-thomas.devoogdt@barco.com> Message-ID: <87sft77mtd.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > The internal_pcre option was dropped in: > https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c > Signed-off-by: Thomas Devoogdt > --- > package/libglib2/0002-remove-cpp-requirement.patch | 2 +- > package/libglib2/libglib2.hash | 4 ++-- > package/libglib2/libglib2.mk | 6 ++---- > 3 files changed, 5 insertions(+), 7 deletions(-) > +++ b/package/libglib2/libglib2.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > -LIBGLIB2_VERSION_MAJOR = 2.68 > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > +LIBGLIB2_VERSION_MAJOR = 2.69 > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 The "odd" libglib versions numbers are afaik development versions. We normally only use stable versions in Buildroot. Do you have any idea when 2.70 is planned? -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:25:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:25:35 +0100 Subject: [Buildroot] libsoup3 migration In-Reply-To: <20220128161314.GB770598@momiji> (Adrian Perez de Castro's message of "Fri, 28 Jan 2022 16:13:14 +0200") References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <20220128105917.30421-2-thomas.devoogdt@barco.com> <20220128134223.GB765275@momiji> <20220128161314.GB770598@momiji> Message-ID: <87o83v7m5c.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: Hi, > There is a tracking table for the libsoup3 migration that one of my work mates > has been maintaining up to date; you can find it here: > https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 > For most of the packages from Buildroot that you listed there are patches > filed to their corresponding upstreams. Thanks, that is helpful! > The way I see it, there are three possible ways for a migration: > - Keep both libsoup2 and libsoup3 in the tree, migrate packages to libsoup3 > where possible and where we do not see conflicts (like loading both versions > in the same process) likely to happen. > - Replace libsoup2 with libsoup3 *now*, import patches into the Buildroot tree > for the packages which do not yet have releases compatible with libsoup3. > - Replace libsoup2 with libsoup3 *later*, once all upstreams of packages > present in Buildroot put out releases that work with libsoup3. > Personally I tend to think the last option is likely to be the best, to avoid > confusions and the possibility that people who use Buildroot as basis for > their work get into nasty situations due to both libsoup2 and libsoup3 being > available. We don't want to maintain any more patches than needed, so option 2 isn't very nice. The question about having both v2 and v3 in the tree at the same time probably depends on how long v2 will be supported upstream, how fast applications will be migrate to v3 and how fast they will drop their v2 support - E.G. we still want to be able to pull in security fixes to any packages using libsoup during the 2022.02.x support period. We typically don't go as far as detecting any possible runtime issues from package combinations in Kconfig, and it looks like libsoup v2 recently gained some support for detecting an already loaded v3, so perhaps that is good enough? https://www.mail-archive.com/ftp-release-list at gnome.org/msg32190.html -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:26:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:26:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.69.1 In-Reply-To: <87sft77mtd.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Fri, 28 Jan 2022 19:11:10 +0100") References: <20220128105917.30421-1-thomas.devoogdt@barco.com> <87sft77mtd.fsf@dell.be.48ers.dk> Message-ID: <87k0ej7m3d.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: Hi, >> -LIBGLIB2_VERSION_MAJOR = 2.68 >> -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 >> +LIBGLIB2_VERSION_MAJOR = 2.69 >> +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 > The "odd" libglib versions numbers are afaik development versions. We > normally only use stable versions in Buildroot. Do you have any idea > when 2.70 is planned? Ahh, it is already out: https://download.gnome.org/sources/glib/2.70/ -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:27:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:27:45 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/nodejs: security bump to version 12.22.9 Message-ID: <20220128182120.5C3CB822AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cee7b40cab2fd5cf4c9dbe34b41d71fa75677eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issues: Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is specifically defined to use a particular SAN type, can result in bypassing name-constrained intermediates. Node.js was accepting URI SAN types, which PKIs are often not defined to use. Additionally, when a protocol allows URI SANs, Node.js did not match the URI correctly. Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) Node.js converts SANs (Subject Alternative Names) to a string format. It uses this string to check peer certificates against hostnames when validating connections. The string format was subject to an injection vulnerability when name constraints were used within a certificate chain, allowing the bypass of these name constraints. Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) Node.js did not handle multi-value Relative Distinguished Names correctly. Attackers could craft certificate subjects containing a single-value Relative Distinguished Name that would be interpreted as a multi-value Relative Distinguished Name, for example, in order to inject a Common Name that would allow bypassing the certificate subject verification. Prototype pollution via console.table properties (Low)(CVE-2022-21824) Due to the formatting logic of the console.table() function it was not safe to allow user controlled input to be passed to the properties parameter while simultaneously passing a plain object with at least one property as the first parameter, which could be __proto__. The prototype pollution has very limited control, in that it only allows an empty string to be assigned numerical keys of the object prototype. For details, see the advisory: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f31c7d5d69..11d5ec0672 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.22.7/SHASUMS256.txt -sha256 cc6a23b44870679a94bd8f3c8d4e1f4b77bb2712a36888ab87463459e6785f6b node-v12.22.7.tar.xz +# From https://nodejs.org/dist/v12.22.9/SHASUMS256.txt +sha256 da982c03e584c2b6e50f432cc5e46605d4e3d8451125be25a645fe716873e24a node-v12.22.9.tar.xz # Hash for license file sha256 221417a7ca275112a5ac54639b36ee3c5184e74631ea1e1b01b701293b655190 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index c8c5223a0b..c6649ce993 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 12.22.7 +NODEJS_VERSION = 12.22.9 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From peter at korsgaard.com Fri Jan 28 18:36:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:36:23 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5base: fix CVE-2021-38593 In-Reply-To: <3e21aca9-71ec-d648-c9e3-058a9f9960b2@theobroma-systems.com> (Quentin Schulz's message of "Mon, 24 Jan 2022 10:31:06 +0100") References: <20220121165046.183224-1-quentin.schulz@theobroma-systems.com> <20220121205327.GK3252931@scaer> <3e21aca9-71ec-d648-c9e3-058a9f9960b2@theobroma-systems.com> Message-ID: <87fsp77lnc.fsf@dell.be.48ers.dk> >>>>> "Quentin" == Quentin Schulz writes: > Hi Yann, > On 1/21/22 21:53, Yann E. MORIN wrote: >> Quentin, All, >> >> On 2022-01-21 17:50 +0100, Quentin Schulz spake thusly: >>> 5.15.2 is the last public release of 5.15 and does not contain this CVE >>> fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so >>> let's port them to 5.15.2. >>> >>> Technically only the first two patches are required to patch the CVE. >>> However, the second patch introduces a regression that is fixed in the third >>> patch. >>> >>> The patches are taken from KDE kde/5.15 git branch. >>> >>> Cc: Quentin Schulz >>> Signed-off-by: Quentin Schulz >> >> Applied to master, thanks. >> > Thanks! > I forgot to add that this patch can be applied to 2021.02.x and > 2021.11.x branches too since qtbase hasn't changed since. Thanks for the heads up. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:37:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:37:05 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/efl: change download URL to https In-Reply-To: <20220118201709.25366-1-ps.report@gmx.net> (Peter Seiderer's message of "Tue, 18 Jan 2022 21:17:08 +0100") References: <20220118201709.25366-1-ps.report@gmx.net> Message-ID: <87bkzv7lm6.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:37:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:37:09 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/enlightenment: change download URL to https In-Reply-To: <20220118201709.25366-2-ps.report@gmx.net> (Peter Seiderer's message of "Tue, 18 Jan 2022 21:17:09 +0100") References: <20220118201709.25366-1-ps.report@gmx.net> <20220118201709.25366-2-ps.report@gmx.net> Message-ID: <877daj7lm2.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 18:34:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:34:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/efl: change download URL to https Message-ID: <20220128183019.448D482B2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=345edd4b4732cdd5d48b04fdce0a4b140ff6f058 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: canonicalise homepage] Signed-off-by: Yann E. MORIN (cherry picked from commit c3d5b27d5d24079d6c30c568c58e3a5e7c6e3fc7) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 2 +- package/efl/efl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 05ded72cf7..eb9c7aebd9 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_EFL help Enlightenment Foundation Libraries - https://enlightenment.org + https://www.enlightenment.org/ if BR2_PACKAGE_EFL diff --git a/package/efl/efl.mk b/package/efl/efl.mk index cdb05aa551..1d7057c50b 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -6,7 +6,7 @@ EFL_VERSION = 1.25.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl +EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ From peter at korsgaard.com Fri Jan 28 18:36:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:36:09 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220128183019.55DD282B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0cbf7935acc8b18ee047381ec657db418e22147 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so let's port them to 5.15.2. Technically only the first two patches are required to patch the CVE. However, the second patch introduces a regression that is fixed in the third patch. The patches are taken from KDE kde/5.15 git branch. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN (cherry picked from commit 9151eab3c7e4548a052be69aecba1f2b1ee6396c) Signed-off-by: Peter Korsgaard --- ...ssing-intensive-painting-of-high-number-o.patch | 163 +++++++++++++++++++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 +++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++++ package/qt5/qt5base/qt5base.mk | 4 + 4 files changed, 304 insertions(+) diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..03287d19ca --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,163 @@ +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Pick-to: 6.1 6.0 5.15 +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) + +* asturmlechner 2021-08-21: +Conflict from preceding 94dd2ceb in dev branch: + src/gui/painting/qpaintengineex.cpp + Resolved via: + + if (pen.style() > Qt::SolidLine) { + QRectF cpRect = path.controlPointRect(); + const QTransform &xf = state()->matrix; +- if (pen.isCosmetic()) { ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ + clipRect = d->exDeviceRect; + cpRect.translate(xf.dx(), xf.dy()); + } else { + +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: + Resolved via: + + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; +- const QList pattern = pen.dashPattern(); ++ const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); + +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 5d8f89eadd..55fdb0c2a0 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 0000000000..d41ced7f5f +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.34.1 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..16e0f20200 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Pick-to: 6.2 6.1 5.15 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L??hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 55fdb0c2a0..19e4b23423 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.34.1 + diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..ca3c2736ae --- /dev/null +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,100 @@ +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 30 Jul 2021 13:03:49 +0200 +Subject: [PATCH] Refix for avoiding huge number of tiny dashes + +Previous fix hit too widely so some valid horizontal and vertical +lines were affected; the root problem being that such lines have an +empty control point rect (width or height is 0). Fix by caculating in +the pen width. + +Pick-to: 6.2 6.1 5.15 +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 8 ++--- + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 19e4b23423..9fe510827a 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); + } + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway +- QRectF extentRect = cpRect & clipRect; ++ qreal pw = pen.widthF() ? pen.widthF() : 1; ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; + const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); +- if (pen.widthF()) +- patternLength *= pen.widthF(); ++ patternLength *= pw; + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { ++ } else if (extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 42e98ce363..d7c3f95f1d 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -308,6 +308,7 @@ private slots: + void fillPolygon(); + + void drawImageAtPointF(); ++ void scaledDashes(); + + private: + void fillData(); +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() + paint.end(); + } + ++void tst_QPainter::scaledDashes() ++{ ++ // Test that we do not hit the limit-huge-number-of-dashes path ++ QRgb fore = qRgb(0, 0, 0xff); ++ QRgb back = qRgb(0xff, 0xff, 0); ++ QImage image(5, 32, QImage::Format_RGB32); ++ image.fill(back); ++ QPainter p(&image); ++ QPen pen(QColor(fore), 3, Qt::DotLine); ++ p.setPen(pen); ++ p.scale(1, 2); ++ p.drawLine(2, 0, 2, 16); ++ p.end(); ++ ++ bool foreFound = false; ++ bool backFound = false; ++ int i = 0; ++ while (i < 32 && (!foreFound || !backFound)) { ++ QRgb pix = image.pixel(3, i); ++ if (pix == fore) ++ foreFound = true; ++ else if (pix == back) ++ backFound = true; ++ i++; ++ } ++ ++ QVERIFY(foreFound); ++ QVERIFY(backFound); ++} ++ + QTEST_MAIN(tst_QPainter) + + #include "tst_qpainter.moc" +-- +2.34.1 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 7897e4294a..62dc16b647 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. From peter at korsgaard.com Fri Jan 28 18:35:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:35:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/enlightenment: change download URL to https Message-ID: <20220128183019.4C6E97FF88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=072c2aec0b2b34f1c1589d7e121ffcf56a747922 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: also change in Config.in] Signed-off-by: Yann E. MORIN (cherry picked from commit f6297befe176a2f33b8c598139f73d7e0b9f91c9) Signed-off-by: Peter Korsgaard --- package/enlightenment/Config.in | 2 +- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 91cdd896f6..e4affc1eec 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_ENLIGHTENMENT KDE. Enlightenment can be used as a substitute for a full desktop environment. - http://www.enlightenment.org/ + https://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.8" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 969b391cdc..7684009996 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -6,7 +6,7 @@ ENLIGHTENMENT_VERSION = 0.24.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt From peter at korsgaard.com Fri Jan 28 17:01:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 18:01:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/nodejs: security bump to version 14.18.3 Message-ID: <20220128183025.4EB0F82B2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8d740b04a58ffd8d8347d9ce2e33f6298e1bea2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issues: Improper handling of URI Subject Alternative Names (Medium)(CVE-2021-44531) Accepting arbitrary Subject Alternative Name (SAN) types, unless a PKI is specifically defined to use a particular SAN type, can result in bypassing name-constrained intermediates. Node.js was accepting URI SAN types, which PKIs are often not defined to use. Additionally, when a protocol allows URI SANs, Node.js did not match the URI correctly. Certificate Verification Bypass via String Injection (Medium)(CVE-2021-44532) Node.js converts SANs (Subject Alternative Names) to a string format. It uses this string to check peer certificates against hostnames when validating connections. The string format was subject to an injection vulnerability when name constraints were used within a certificate chain, allowing the bypass of these name constraints. Incorrect handling of certificate subject and issuer fields (Medium)(CVE-2021-44533) Node.js did not handle multi-value Relative Distinguished Names correctly. Attackers could craft certificate subjects containing a single-value Relative Distinguished Name that would be interpreted as a multi-value Relative Distinguished Name, for example, in order to inject a Common Name that would allow bypassing the certificate subject verification. Prototype pollution via console.table properties (Low)(CVE-2022-21824) Due to the formatting logic of the console.table() function it was not safe to allow user controlled input to be passed to the properties parameter while simultaneously passing a plain object with at least one property as the first parameter, which could be __proto__. The prototype pollution has very limited control, in that it only allows an empty string to be assigned numerical keys of the object prototype. For details, see the advisory: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9096036f00c5a0f37e3b3916417f0d0b166b73e8) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f330757341..6365ef852b 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.18.2/SHASUMS256.txt -sha256 3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b node-v14.18.2.tar.xz +# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt +sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz # Hash for license file sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 44bf786dfd..bd34860ef7 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 14.18.2 +NODEJS_VERSION = 14.18.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ From peter at korsgaard.com Fri Jan 28 18:35:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:35:09 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/efl: change download URL to https Message-ID: <20220128183025.569D782B2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=681fc3e74c2cdacad5f02682bf4314dad7112472 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: canonicalise homepage] Signed-off-by: Yann E. MORIN (cherry picked from commit c3d5b27d5d24079d6c30c568c58e3a5e7c6e3fc7) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 2 +- package/efl/efl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 05ded72cf7..eb9c7aebd9 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -21,7 +21,7 @@ config BR2_PACKAGE_EFL help Enlightenment Foundation Libraries - https://enlightenment.org + https://www.enlightenment.org/ if BR2_PACKAGE_EFL diff --git a/package/efl/efl.mk b/package/efl/efl.mk index cdb05aa551..1d7057c50b 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -6,7 +6,7 @@ EFL_VERSION = 1.25.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl +EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT EFL_LICENSE_FILES = \ COMPLIANCE \ From peter at korsgaard.com Fri Jan 28 18:35:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:35:11 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/enlightenment: change download URL to https Message-ID: <20220128183025.5F1D482B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4390ab28726ee48226a48ed112100239427ae2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: also change in Config.in] Signed-off-by: Yann E. MORIN (cherry picked from commit f6297befe176a2f33b8c598139f73d7e0b9f91c9) Signed-off-by: Peter Korsgaard --- package/enlightenment/Config.in | 2 +- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 91cdd896f6..e4affc1eec 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_ENLIGHTENMENT KDE. Enlightenment can be used as a substitute for a full desktop environment. - http://www.enlightenment.org/ + https://www.enlightenment.org/ comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.8" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 969b391cdc..7684009996 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -6,7 +6,7 @@ ENLIGHTENMENT_VERSION = 0.24.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment +ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt From peter at korsgaard.com Fri Jan 28 18:35:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 19:35:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/qt5/qt5base: fix CVE-2021-38593 Message-ID: <20220128183025.6848782B2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c5064a8b489070a46e7075be4db17f17b1e1fcf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x 5.15.2 is the last public release of 5.15 and does not contain this CVE fix. However, >=6.1.2 and >5.12.12 all contain the necessary patches so let's port them to 5.15.2. Technically only the first two patches are required to patch the CVE. However, the second patch introduces a regression that is fixed in the third patch. The patches are taken from KDE kde/5.15 git branch. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Yann E. MORIN (cherry picked from commit 9151eab3c7e4548a052be69aecba1f2b1ee6396c) Signed-off-by: Peter Korsgaard --- ...ssing-intensive-painting-of-high-number-o.patch | 163 +++++++++++++++++++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 +++++ ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 100 +++++++++++++ package/qt5/qt5base/qt5base.mk | 4 + 4 files changed, 304 insertions(+) diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch new file mode 100644 index 0000000000..03287d19ca --- /dev/null +++ b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch @@ -0,0 +1,163 @@ +From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Tue, 13 Apr 2021 14:23:45 +0200 +Subject: [PATCH] Avoid processing-intensive painting of high number of tiny + dashes + +When stroking a dashed path, an unnecessary amount of processing would +be spent if there is a huge number of dashes visible, e.g. because of +scaling. Since the dashes are too small to be indivdually visible +anyway, just replace with a semi-transparent solid line for such +cases. + +Pick-to: 6.1 6.0 5.15 +Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) + +* asturmlechner 2021-08-21: +Conflict from preceding 94dd2ceb in dev branch: + src/gui/painting/qpaintengineex.cpp + Resolved via: + + if (pen.style() > Qt::SolidLine) { + QRectF cpRect = path.controlPointRect(); + const QTransform &xf = state()->matrix; +- if (pen.isCosmetic()) { ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ + clipRect = d->exDeviceRect; + cpRect.translate(xf.dx(), xf.dy()); + } else { + +FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: + Resolved via: + + QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; +- const QList pattern = pen.dashPattern(); ++ const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); + +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- + .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ + 2 files changed, 69 insertions(+), 9 deletions(-) + create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 5d8f89eadd..55fdb0c2a0 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const + + Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp + +-void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) ++void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + { + #ifdef QT_DEBUG_DRAW + qDebug() << "QPaintEngineEx::stroke()" << pen; +@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + d->stroker.setCubicToHook(qpaintengineex_cubicTo); + } + ++ QRectF clipRect; ++ QPen pen = inPen; ++ if (pen.style() > Qt::SolidLine) { ++ QRectF cpRect = path.controlPointRect(); ++ const QTransform &xf = state()->matrix; ++ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ ++ clipRect = d->exDeviceRect; ++ cpRect.translate(xf.dx(), xf.dy()); ++ } else { ++ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); ++ } ++ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway ++ QRectF extentRect = cpRect & clipRect; ++ qreal extent = qMax(extentRect.width(), extentRect.height()); ++ qreal patternLength = 0; ++ const QVector pattern = pen.dashPattern(); ++ const int patternSize = qMin(pattern.size(), 32); ++ for (int i = 0; i < patternSize; i++) ++ patternLength += qMax(pattern.at(i), qreal(0)); ++ if (pen.widthF()) ++ patternLength *= pen.widthF(); ++ if (qFuzzyIsNull(patternLength)) { ++ pen.setStyle(Qt::NoPen); ++ } else if (extent / patternLength > 10000) { ++ // approximate stream of tiny dashes with semi-transparent solid line ++ pen.setStyle(Qt::SolidLine); ++ QColor color(pen.color()); ++ color.setAlpha(color.alpha() / 2); ++ pen.setColor(color); ++ } ++ } ++ + if (!qpen_fast_equals(pen, d->strokerPen)) { + d->strokerPen = pen; + d->stroker.setJoinStyle(pen.joinStyle()); +@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) + return; + } + +- if (pen.style() > Qt::SolidLine) { +- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ +- d->activeStroker->setClipRect(d->exDeviceRect); +- } else { +- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); +- d->activeStroker->setClipRect(clipRect); +- } +- } ++ if (!clipRect.isNull()) ++ d->activeStroker->setClipRect(clipRect); + + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); +diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps +new file mode 100644 +index 0000000000..d41ced7f5f +--- /dev/null ++++ b/tests/auto/other/lancelot/scripts/tinydashes.qps +@@ -0,0 +1,34 @@ ++# Version: 1 ++# CheckVsReference: 5% ++ ++path_addEllipse mypath 20.0 20.0 200.0 200.0 ++ ++save ++setPen blue 20 SolidLine FlatCap ++pen_setCosmetic true ++pen_setDashPattern [ 0.0004 0.0004 ] ++setBrush yellow ++ ++drawPath mypath ++translate 300 0 ++setRenderHint Antialiasing true ++drawPath mypath ++restore ++ ++path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 ++ ++setPen blue 20 DotLine FlatCap ++setBrush yellow ++ ++save ++translate 0 300 ++scale 0.0001 0.00011 ++drawPath bigpath ++restore ++ ++save ++translate 300 300 ++setRenderHint Antialiasing true ++scale 0.0001 0.00011 ++drawPath bigpath ++restore +-- +2.34.1 + diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..16e0f20200 --- /dev/null +++ b/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,37 @@ +From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 23 Jul 2021 15:53:56 +0200 +Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some pathological cases were not caught by the previous fix. + +Fixes: QTBUG-95239 +Pick-to: 6.2 6.1 5.15 +Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 +Reviewed-by: Robert L??hning +(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 55fdb0c2a0..19e4b23423 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + patternLength *= pen.widthF(); + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (extent / patternLength > 10000) { ++ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +-- +2.34.1 + diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch new file mode 100644 index 0000000000..ca3c2736ae --- /dev/null +++ b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch @@ -0,0 +1,100 @@ +From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 +From: Eirik Aavitsland +Date: Fri, 30 Jul 2021 13:03:49 +0200 +Subject: [PATCH] Refix for avoiding huge number of tiny dashes + +Previous fix hit too widely so some valid horizontal and vertical +lines were affected; the root problem being that such lines have an +empty control point rect (width or height is 0). Fix by caculating in +the pen width. + +Pick-to: 6.2 6.1 5.15 +Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) +[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] +Signed-off-by: Quentin Schulz +--- + src/gui/painting/qpaintengineex.cpp | 8 ++--- + .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp +index 19e4b23423..9fe510827a 100644 +--- a/src/gui/painting/qpaintengineex.cpp ++++ b/src/gui/painting/qpaintengineex.cpp +@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) + clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); + } + // Check to avoid generating unwieldy amount of dashes that will not be visible anyway +- QRectF extentRect = cpRect & clipRect; ++ qreal pw = pen.widthF() ? pen.widthF() : 1; ++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; + qreal extent = qMax(extentRect.width(), extentRect.height()); + qreal patternLength = 0; + const QVector pattern = pen.dashPattern(); + const int patternSize = qMin(pattern.size(), 32); + for (int i = 0; i < patternSize; i++) + patternLength += qMax(pattern.at(i), qreal(0)); +- if (pen.widthF()) +- patternLength *= pen.widthF(); ++ patternLength *= pw; + if (qFuzzyIsNull(patternLength)) { + pen.setStyle(Qt::NoPen); +- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { ++ } else if (extent / patternLength > 10000) { + // approximate stream of tiny dashes with semi-transparent solid line + pen.setStyle(Qt::SolidLine); + QColor color(pen.color()); +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 42e98ce363..d7c3f95f1d 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -308,6 +308,7 @@ private slots: + void fillPolygon(); + + void drawImageAtPointF(); ++ void scaledDashes(); + + private: + void fillData(); +@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() + paint.end(); + } + ++void tst_QPainter::scaledDashes() ++{ ++ // Test that we do not hit the limit-huge-number-of-dashes path ++ QRgb fore = qRgb(0, 0, 0xff); ++ QRgb back = qRgb(0xff, 0xff, 0); ++ QImage image(5, 32, QImage::Format_RGB32); ++ image.fill(back); ++ QPainter p(&image); ++ QPen pen(QColor(fore), 3, Qt::DotLine); ++ p.setPen(pen); ++ p.scale(1, 2); ++ p.drawLine(2, 0, 2, 16); ++ p.end(); ++ ++ bool foreFound = false; ++ bool backFound = false; ++ int i = 0; ++ while (i < 32 && (!foreFound || !backFound)) { ++ QRgb pix = image.pixel(3, i); ++ if (pix == fore) ++ foreFound = true; ++ else if (pix == back) ++ backFound = true; ++ i++; ++ } ++ ++ QVERIFY(foreFound); ++ QVERIFY(backFound); ++} ++ + QTEST_MAIN(tst_QPainter) + + #include "tst_qpainter.moc" +-- +2.34.1 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9da3de468a..ddeab204f7 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -11,6 +11,10 @@ QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch +# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +QT5BASE_IGNORE_CVES += CVE-2021-38593 + # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. From james.hilliard1 at gmail.com Fri Jan 28 19:19:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 28 Jan 2022 12:19:52 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/network-manager: migrate autotools build system to meson Message-ID: <20220128191952.2776015-1-james.hilliard1@gmail.com> We need to add dbus as a build dependency since the meson build system uses dbus pkg-config to determine install locations. The meson build also requires mobile-broadband-info in order to get the database pkg-config variable. Signed-off-by: James Hilliard --- Changes v1 -> v2: - add comments on new dependencies --- package/network-manager/Config.in | 1 + package/network-manager/network-manager.mk | 100 ++++++++++----------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..da1a7d79b3 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help This option enables support for ModemManager diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 974320fce0..290333e16c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ libgcrypt wireless_tools util-linux host-intltool libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no - NETWORK_MANAGER_CONF_OPTS = \ - --disable-introspection \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --without-nm-cloud-setup + -Dintrospection=false \ + -Ddocs=false \ + -Dtests=no \ + -Dqt=false \ + -Dcrypto=gnutls \ + -Diptables=/usr/sbin/iptables \ + -Difupdown=false \ + -Dnm_cloud_setup=false \ + -Dsession_tracking_consolekit=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd -NETWORK_MANAGER_CONF_OPTS += --with-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=true else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=false endif ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl -NETWORK_MANAGER_CONF_OPTS += --enable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true else -NETWORK_MANAGER_CONF_OPTS += --disable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false endif ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl -NETWORK_MANAGER_CONF_OPTS += --with-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true else -NETWORK_MANAGER_CONF_OPTS += --without-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) NETWORK_MANAGER_DEPENDENCIES += libselinux -NETWORK_MANAGER_CONF_OPTS += --with-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true else -NETWORK_MANAGER_CONF_OPTS += --without-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=true NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=true else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=true else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_CONF_OPTS += \ - --with-systemd-journal \ - --with-config-logging-backend-default=journal \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd + -Dsystemd_journal=true \ + -Dconfig_logging_backend_default=journal \ + -Dsession_tracking=systemd \ + -Dsuspend_resume=systemd else NETWORK_MANAGER_CONF_OPTS += \ - --without-systemd-journal \ - --with-config-logging-backend-default=syslog \ - --without-session-tracking \ - --with-suspend-resume=upower + -Dsystemd_journal=false \ + -Dconfig_logging_backend_default=syslog \ + -Dsession_tracking=no \ + -Dsuspend_resume=upower \ + -Dsystemdsystemunitdir=no endif ifeq ($(BR2_PACKAGE_POLKIT),y) NETWORK_MANAGER_DEPENDENCIES += polkit -NETWORK_MANAGER_CONF_OPTS += --enable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true else -NETWORK_MANAGER_CONF_OPTS += --disable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false endif ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false endif define NETWORK_MANAGER_INSTALL_INIT_SYSV @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.25.1 From james.hilliard1 at gmail.com Fri Jan 28 19:23:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 28 Jan 2022 12:23:21 -0700 Subject: [Buildroot] [PATCH 1/1] package/network-manager: migrate autotools build system to meson In-Reply-To: <20220128085017.786b1c13@gmx.net> References: <20220127183924.1938903-1-james.hilliard1@gmail.com> <20220127210924.GQ457876@scaer> <20220128085017.786b1c13@gmx.net> Message-ID: On Fri, Jan 28, 2022 at 12:50 AM Peter Seiderer wrote: > > Hello James, Yann, > > On Thu, 27 Jan 2022 22:09:24 +0100, "Yann E. MORIN" wrote: > > > James, All, > > > > On 2022-01-27 11:39 -0700, James Hilliard spake thusly: > > > Signed-off-by: James Hilliard > > > --- > > > package/network-manager/Config.in | 1 + > > > package/network-manager/network-manager.mk | 100 ++++++++++----------- > > > 2 files changed, 48 insertions(+), 53 deletions(-) > > > > > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > > > index a48cb37b15..da1a7d79b3 100644 > > > --- a/package/network-manager/Config.in > > > +++ b/package/network-manager/Config.in > > > @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI > > > config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER > > > bool "modem-manager support" > > > select BR2_PACKAGE_MODEM_MANAGER > > > + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO > > > > It looks like this is totally unrelated to the switch to meson, and > > should be applied in its own right, and then backported to the > > maintenance branches, no? > > > > If it is due to the switch to meson, then it should be explained in the > > commit log. > > > > Regards, > > Yann E. MORIN. > > > > > help > > > This option enables support for ModemManager > > > > > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > > index 974320fce0..290333e16c 100644 > > > --- a/package/network-manager/network-manager.mk > > > +++ b/package/network-manager/network-manager.mk > > > @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 > > > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > > > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > > > NETWORK_MANAGER_INSTALL_STAGING = YES > > > -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ > > > +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ > > Same comment as Yann beofore, here for added dbus dependency... Yeah, seems both are just needed due to the pkg-config variables being needed: https://patchwork.ozlabs.org/project/buildroot/patch/20220128191952.2776015-1-james.hilliard1 at gmail.com/ > > Regards, > Peter > > > > libgcrypt wireless_tools util-linux host-intltool libndp > > > NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) > > > NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md > > > @@ -17,129 +17,123 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome > > > NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager > > > NETWORK_MANAGER_SELINUX_MODULES = networkmanager > > > > > > -NETWORK_MANAGER_CONF_ENV = \ > > > - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ > > > - ac_cv_file__etc_fedora_release=no \ > > > - ac_cv_file__etc_mandriva_release=no \ > > > - ac_cv_file__etc_debian_version=no \ > > > - ac_cv_file__etc_redhat_release=no \ > > > - ac_cv_file__etc_SuSE_release=no > > > - > > > NETWORK_MANAGER_CONF_OPTS = \ > > > - --disable-introspection \ > > > - --disable-tests \ > > > - --disable-qt \ > > > - --disable-more-warnings \ > > > - --with-crypto=gnutls \ > > > - --with-iptables=/usr/sbin/iptables \ > > > - --disable-ifupdown \ > > > - --without-nm-cloud-setup > > > + -Dintrospection=false \ > > > + -Ddocs=false \ > > > + -Dtests=no \ > > > + -Dqt=false \ > > > + -Dcrypto=gnutls \ > > > + -Diptables=/usr/sbin/iptables \ > > > + -Difupdown=false \ > > > + -Dnm_cloud_setup=false \ > > > + -Dsession_tracking_consolekit=false > > > > > > ifeq ($(BR2_PACKAGE_AUDIT),y) > > > NETWORK_MANAGER_DEPENDENCIES += audit > > > -NETWORK_MANAGER_CONF_OPTS += --with-libaudit > > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-libaudit > > > +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no > > > endif > > > > > > ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) > > > -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient > > > +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient > > > endif > > > > > > ifeq ($(BR2_PACKAGE_DHCPCD),y) > > > -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd > > > +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd > > > endif > > > > > > ifeq ($(BR2_PACKAGE_IWD),y) > > > NETWORK_MANAGER_DEPENDENCIES += iwd > > > -NETWORK_MANAGER_CONF_OPTS += --with-iwd > > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > > > +NETWORK_MANAGER_CONF_OPTS += -Diwd=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_LIBCURL),y) > > > NETWORK_MANAGER_DEPENDENCIES += libcurl > > > -NETWORK_MANAGER_CONF_OPTS += --enable-concheck > > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --disable-concheck > > > +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_LIBPSL),y) > > > NETWORK_MANAGER_DEPENDENCIES += libpsl > > > -NETWORK_MANAGER_CONF_OPTS += --with-libpsl > > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-libpsl > > > +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_LIBSELINUX),y) > > > NETWORK_MANAGER_DEPENDENCIES += libselinux > > > -NETWORK_MANAGER_CONF_OPTS += --with-selinux > > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-selinux > > > +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) > > > -NETWORK_MANAGER_DEPENDENCIES += modem-manager > > > -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 > > > +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info > > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 > > > +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) > > > -NETWORK_MANAGER_CONF_OPTS += --enable-ovs > > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=true > > > NETWORK_MANAGER_DEPENDENCIES += jansson > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --disable-ovs > > > +NETWORK_MANAGER_CONF_OPTS += -Dovs=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) > > > NETWORK_MANAGER_DEPENDENCIES += pppd > > > -NETWORK_MANAGER_CONF_OPTS += --enable-ppp > > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --disable-ppp > > > +NETWORK_MANAGER_CONF_OPTS += -Dppp=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) > > > NETWORK_MANAGER_DEPENDENCIES += newt > > > -NETWORK_MANAGER_CONF_OPTS += --with-nmtui > > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-nmtui > > > +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_OFONO),y) > > > NETWORK_MANAGER_DEPENDENCIES += ofono > > > -NETWORK_MANAGER_CONF_OPTS += --with-ofono > > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-ofono > > > +NETWORK_MANAGER_CONF_OPTS += -Dofono=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) > > > NETWORK_MANAGER_DEPENDENCIES += systemd > > > NETWORK_MANAGER_CONF_OPTS += \ > > > - --with-systemd-journal \ > > > - --with-config-logging-backend-default=journal \ > > > - --with-session-tracking=systemd \ > > > - --with-suspend-resume=systemd > > > + -Dsystemd_journal=true \ > > > + -Dconfig_logging_backend_default=journal \ > > > + -Dsession_tracking=systemd \ > > > + -Dsuspend_resume=systemd > > > else > > > NETWORK_MANAGER_CONF_OPTS += \ > > > - --without-systemd-journal \ > > > - --with-config-logging-backend-default=syslog \ > > > - --without-session-tracking \ > > > - --with-suspend-resume=upower > > > + -Dsystemd_journal=false \ > > > + -Dconfig_logging_backend_default=syslog \ > > > + -Dsession_tracking=no \ > > > + -Dsuspend_resume=upower \ > > > + -Dsystemdsystemunitdir=no > > > endif > > > > > > ifeq ($(BR2_PACKAGE_POLKIT),y) > > > NETWORK_MANAGER_DEPENDENCIES += polkit > > > -NETWORK_MANAGER_CONF_OPTS += --enable-polkit > > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --disable-polkit > > > +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false > > > endif > > > > > > ifeq ($(BR2_PACKAGE_READLINE),y) > > > NETWORK_MANAGER_DEPENDENCIES += readline > > > -NETWORK_MANAGER_CONF_OPTS += --with-nmcli > > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true > > > else > > > -NETWORK_MANAGER_CONF_OPTS += --without-nmcli > > > +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false > > > endif > > > > > > define NETWORK_MANAGER_INSTALL_INIT_SYSV > > > @@ -152,4 +146,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD > > > > > > endef > > > > > > -$(eval $(autotools-package)) > > > +$(eval $(meson-package)) > > > -- > > > 2.25.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > From peter at korsgaard.com Fri Jan 28 19:28:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:28:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjpeg: security bump to version 9e In-Reply-To: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 17 Jan 2022 23:30:26 +0100") References: <20220117223026.3567941-1-fontaine.fabrice@gmail.com> Message-ID: <8735l77j94.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > rdgif.c, cderror.h: add sanity check for GIF image dimensions. > Thank to Casper Sun for cjpeg potential vulnerability report. > - Update hash of README (changes not related to license) > - Update indentation in hash file (two spaces) > https://jpegclub.org/reference/reference-sources/ > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 19:33:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:33:13 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.12 In-Reply-To: <20220117113656.234077-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 17 Jan 2022 12:36:56 +0100") References: <20220117113656.234077-1-francois.perrad@gadz.org> Message-ID: <87y22z64g6.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://blog.prosody.im/prosody-0.11.12-released/ > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 19:27:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:27:21 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libjpeg: security bump to version 9e Message-ID: <20220128192734.A3FBC829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0eb0c1bba0876cfa19e83a0d7284aa7431157f05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x rdgif.c, cderror.h: add sanity check for GIF image dimensions. Thank to Casper Sun for cjpeg potential vulnerability report. - Update hash of README (changes not related to license) - Update indentation in hash file (two spaces) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b5e36f80a6629ef5701d4751d7fc6f7dd6a98476) Signed-off-by: Peter Korsgaard --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 4f0a677d04..1a2e82caef 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz -sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README +sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 6b55aba7e5..caf7f05f44 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,12 +4,8 @@ # ################################################################################ -LIBJPEG_VERSION = 9d -# 9d was released 2020-01-12, but the tarball was replaced upstream circa -# 2021-03, causing hash mismatch. Until there is a new version released, -# use our cached copy from s.b.o. -#LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SITE = http://sources.buildroot.org/libjpeg +LIBJPEG_VERSION = 9e +LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README From peter at korsgaard.com Fri Jan 28 19:30:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:30:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/prosody: security bump to 0.11.12 Message-ID: <20220128192734.B416F82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15e3def173ba2013e50ab731560df57d48564e83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x see https://blog.prosody.im/prosody-0.11.12-released/ Signed-off-by: Francois Perrad [Thomas: update separator for license file hash.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 2d99bd8f7e0e3694828820a5ac1e0a09425d571d) Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 10 +++++----- package/prosody/prosody.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index ee459f85d8..b6fa6532a5 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz -sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz -sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz -sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz +md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz +sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz +sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz +sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz # Hash for license file: -sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING +sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7acfa4708d..d697c85568 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.11 +PROSODY_VERSION = 0.11.12 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 19:30:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:30:20 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/prosody: bump to version 0.11.11 Message-ID: <20220128192734.AC4C982B2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f4a347754ed4f6f1730a38390448ec5f7fe2bfe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit ab9d3bb9900be3106928734274ce67e0a5cbf7b9) Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 4579545e39..ee459f85d8 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 6130b79fb64141909330caf83a79a131 prosody-0.11.10.tar.gz -sha1 4dc8b2f783b43e7a5e781b1fc8aee48b0e106def prosody-0.11.10.tar.gz -sha256 c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1 prosody-0.11.10.tar.gz -sha512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb prosody-0.11.10.tar.gz +md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz +sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz +sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz +sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 0eeb32cd3f..7acfa4708d 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.10 +PROSODY_VERSION = 0.11.11 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 19:27:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:27:26 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libjpeg: security bump to version 9e Message-ID: <20220128192741.C9618829F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2aa5e89e153045e0a54c43b0fa4dc3dbc8ab510a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x rdgif.c, cderror.h: add sanity check for GIF image dimensions. Thank to Casper Sun for cjpeg potential vulnerability report. - Update hash of README (changes not related to license) - Update indentation in hash file (two spaces) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b5e36f80a6629ef5701d4751d7fc6f7dd6a98476) Signed-off-by: Peter Korsgaard --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 4f0a677d04..1a2e82caef 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz -sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README +sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 6b55aba7e5..caf7f05f44 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,12 +4,8 @@ # ################################################################################ -LIBJPEG_VERSION = 9d -# 9d was released 2020-01-12, but the tarball was replaced upstream circa -# 2021-03, causing hash mismatch. Until there is a new version released, -# use our cached copy from s.b.o. -#LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SITE = http://sources.buildroot.org/libjpeg +LIBJPEG_VERSION = 9e +LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README From peter at korsgaard.com Fri Jan 28 19:29:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:29:53 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/prosody: bump to version 0.11.11 Message-ID: <20220128192741.D278582B2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb388212b5f337bff798e4d0af89322658dc9c18 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit ab9d3bb9900be3106928734274ce67e0a5cbf7b9) Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 4579545e39..ee459f85d8 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 6130b79fb64141909330caf83a79a131 prosody-0.11.10.tar.gz -sha1 4dc8b2f783b43e7a5e781b1fc8aee48b0e106def prosody-0.11.10.tar.gz -sha256 c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1 prosody-0.11.10.tar.gz -sha512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb prosody-0.11.10.tar.gz +md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz +sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz +sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz +sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 0eeb32cd3f..7acfa4708d 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.10 +PROSODY_VERSION = 0.11.11 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 19:29:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 20:29:59 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/prosody: security bump to 0.11.12 Message-ID: <20220128192741.DA2EE82B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35bd926e18efeffb2351a70333083a84caa47627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x see https://blog.prosody.im/prosody-0.11.12-released/ Signed-off-by: Francois Perrad [Thomas: update separator for license file hash.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 2d99bd8f7e0e3694828820a5ac1e0a09425d571d) Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 10 +++++----- package/prosody/prosody.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index ee459f85d8..b6fa6532a5 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 78d01bb97a935f6a776d141873a33fd7 prosody-0.11.11.tar.gz -sha1 ff653812fcb1789a517b55281a8d01e9e8261848 prosody-0.11.11.tar.gz -sha256 a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 prosody-0.11.11.tar.gz -sha512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9 prosody-0.11.11.tar.gz +md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz +sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz +sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz +sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz # Hash for license file: -sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING +sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 7acfa4708d..d697c85568 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.11 +PROSODY_VERSION = 0.11.12 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From peter at korsgaard.com Fri Jan 28 20:05:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:05:29 +0100 Subject: [Buildroot] [PATCH 1/2] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed In-Reply-To: <20220118222425.164134-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 18 Jan 2022 23:24:24 +0100") References: <20220118222425.164134-1-fontaine.fabrice@gmail.com> Message-ID: <87tudn62ye.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc > 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build > failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, > etc.): > configure:13774: checking whether pthreads work with -pthread > configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 > conftest.c:27:26: error: #error "_REENTRANT must be defined" > 27 | # error "_REENTRANT must be defined" > | ^~~~~ > It should be noted that external bootlins will have to be rebuilt. > Fixes: > - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 > - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 > - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:06:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:06:20 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to version 2.4.3 In-Reply-To: <20220122143253.0CF1C828C8@busybox.osuosl.org> (Thomas Petazzoni's message of "Sat, 22 Jan 2022 15:39:32 +0100") References: <20220122143253.0CF1C828C8@busybox.osuosl.org> Message-ID: <87pmob62wz.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=829bf508bba7df9aee3f86bcd70394ee487b19a6 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 > https://blog.hartwork.org/posts/expat-2-4-3-released > https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes > Signed-off-by: Fabrice Fontaine > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:04:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:04:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed Message-ID: <20220128200131.3158282B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b212e4c605569c484fa7489a3b349143864e4334 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.): configure:13774: checking whether pthreads work with -pthread configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 conftest.c:27:26: error: #error "_REENTRANT must be defined" 27 | # error "_REENTRANT must be defined" | ^~~~~ It should be noted that external bootlins will have to be rebuilt. Fixes: - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 98e39dc80ee81a166df90b4ff3232038a63b759c) [Peter: drop 11.2.0 patch] Signed-off-by: Peter Korsgaard --- ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + From peter at korsgaard.com Fri Jan 28 20:06:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:06:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: security bump to version 2.4.3 Message-ID: <20220128200131.3A70182B40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e16885b3811a827a37a017c493fdb5d9889bdbb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 https://blog.hartwork.org/posts/expat-2-4-3-released https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 829bf508bba7df9aee3f86bcd70394ee487b19a6) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 8cf563d8f5..0853c3c76d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ -md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz -sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ +md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz +sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz # Locally calculated -sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb1cfd8c8a..a7ace66095 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.1 +EXPAT_VERSION = 2.4.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Fri Jan 28 20:05:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:05:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: security bump to version 2.4.3 Message-ID: <20220128200136.3E5DC82B40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a800c82206b287e147de5560d146a32f743dd1aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-45960, CVE-2021-46143 and CVE-2022-22822 to CVE-2022-22827 https://blog.hartwork.org/posts/expat-2-4-3-released https://github.com/libexpat/libexpat/blob/R_2_4_3/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 829bf508bba7df9aee3f86bcd70394ee487b19a6) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 8cf563d8f5..0853c3c76d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ -md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz -sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ +md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz +sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz # Locally calculated -sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz +sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb1cfd8c8a..a7ace66095 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.1 +EXPAT_VERSION = 2.4.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Fri Jan 28 20:05:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:05:18 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gcc: define _REENTRANT for OpenRISC when -pthread is passed Message-ID: <20220128200136.3524682B2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62cdd112374c7a7bf5c83e5872811e5e3d53722c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Patch added by commit eee96b0f0ad224b3e09a9b98c26d056e18f17fd5 on gcc 9.3.0 must also be applied on gcc 10 and 11 to avoid the following build failure on numerous packages (babeltrace2, pcsc-lite, tpm2-pkcs11, etc.): configure:13774: checking whether pthreads work with -pthread configure:13868: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/bin/or1k-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -std=gnu99 -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 conftest.c:27:26: error: #error "_REENTRANT must be defined" 27 | # error "_REENTRANT must be defined" | ^~~~~ It should be noted that external bootlins will have to be rebuilt. Fixes: - http://autobuild.buildroot.org/results/cb58d4fbaeb08d188c2f8bf05ef1604789fa8766 - http://autobuild.buildroot.org/results/7af9d4b68bd46ed260ed66ba2cc3c9c21482e741 - http://autobuild.buildroot.org/results/6f926bec146752873f8032b593f0de1cb222ea46 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 98e39dc80ee81a166df90b4ff3232038a63b759c) Signed-off-by: Peter Korsgaard --- ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ ..._REENTRANT-for-OpenRISC-when-pthread-is-p.patch | 31 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + diff --git a/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 0000000000..5ac03d7c0c --- /dev/null +++ b/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index cbdc781418f..36303af892c 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.31.1 + From universeiii at gmx.de Fri Jan 28 20:27:43 2022 From: universeiii at gmx.de (Andreas Ehmanns) Date: Fri, 28 Jan 2022 21:27:43 +0100 Subject: [Buildroot] [PATCH] boot/arm-trusted-firmware: add config option for custom patches In-Reply-To: <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> References: <20220128145103.3422-1-universeiii@gmx.de> <24f645845a855b039cfa19432c2417e9cedce104.camel@calian.com> Message-ID: <2d6ae233-5b36-8fd9-3bdf-3c4c01eafc22@gmx.de> On 1/28/22 17:25, Robert Hancock via buildroot wrote: > On Fri, 2022-01-28 at 15:51 +0100, Andreas Ehmanns wrote: >> Many embedded board manufacturer provide their BSP as patches to >> linux kernel and u-boot. They can simply be applied by setting the >> corresponding buildroot config (custom patches). >> Nowadays patches for the arm trusted firmware (ATF) are also part of >> BSP deliveries but there is no config option in buildroot for ATF >> to apply custom patches. >> This patch adds (similar to linux kernel and u-boot) an option to >> apply custom patches to ATF. > Hi Andreas, > > You shouldn't need a custom option to add patches for each package. If you add > patches to $(BR2_EXTERNAL)/patches/arm-trusted-firmware then they will get > applied automatically, we are using this mechanism already. > > I think the specific patch options for the kernel and U-Boot may predate that > mechanism but don't need to be used anymore either. Hi Robert, Hi Yann, I typically store BSP Patches under board///patches// ... This is necessary for me since I have to manage a lot of different embedded boards with buildroot. Every manufacturer has its own patches, often different patches for different boards and also for different releases. A global patch directory does not help because I have to configure in each defconfig which patches from which manufacturer/board/version combination should be applied. For that I use the custom patch option of linux and uboot since a lot of years and it works perfectly for me. So I transferred this mechanism to ATF too. This patch helps me managing all the different combination of BSP versions, therefore I thought it may be helpful for others too. Regards, Andreas >> Signed-off-by: Andreas Ehmanns >> --- >> boot/arm-trusted-firmware/Config.in | 8 +++++++ >> .../arm-trusted-firmware.mk | 21 +++++++++++++++++++ >> 2 files changed, 29 insertions(+) >> >> diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted- >> firmware/Config.in >> index b1fc03e10b..786a3083a2 100644 >> --- a/boot/arm-trusted-firmware/Config.in >> +++ b/boot/arm-trusted-firmware/Config.in >> @@ -63,6 +63,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION >> >> endif >> >> +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH >> + string "Custom ATF patches" >> + help >> + A space-separated list of patches to apply to ATF. >> + Each patch can be described as an URL, a local file path, >> + or a directory. In the case of a directory, all files >> + matching *.patch in the directory will be applied. >> + >> config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM >> string "ATF platform" >> help >> diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm- >> trusted-firmware/arm-trusted-firmware.mk >> index 03fa83b7b5..d329bdbfc3 100644 >> --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk >> +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk >> @@ -29,6 +29,27 @@ ifeq >> ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST >> BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) >> endif >> >> +# Analogous code exists in linux/linux.mk. Basically, the generic >> +# package infrastructure handles downloading and applying remote >> +# patches. Local patches are handled depending on whether they are >> +# directories or files. >> +ARM_TRUSTED_FIRMWARE_PATCHES = $(call >> qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH)) >> +ARM_TRUSTED_FIRMWARE_PATCH = $(filter >> https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ >> https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 >> fh66I9s3_Ij- >> rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM >> _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- >> rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) >> + >> +define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES >> + for p in $(filter-out >> https://urldefense.com/v3/__ftp://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78mYZP6cg$ >> https://urldefense.com/v3/__http://*__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128 >> fh66I9s3_Ij- >> rcq9bSBMIxBB8jTXDxe6jH78b3MIP3A$ https://urldefense.com/v3/__https://*,$(ARM >> _TRUSTED_FIRMWARE_PATCHES)__;JQ!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij- >> rcq9bSBMIxBB8jTXDxe6jH78N2PO7_g$ ) ; do \ >> + if test -d $$p ; then \ >> + $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \ >> + else \ >> + $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || >> exit 1; \ >> + fi \ >> + done >> +endef >> +ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += >> ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES >> + >> +# We have no way to know the hashes for user-supplied patches. >> +BR_NO_CHECK_HASH_FOR += $(notdir $(ARM_TRUSTED_FIRMWARE_PATCHES)) >> + >> ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES >> >> ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) >> -- >> 2.26.2 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://urldefense.com/v3/__https://lists.buildroot.org/mailman/listinfo/buildroot__;!!IOGos0k!zefK7OglGeltoASai_ZVP128fh66I9s3_Ij-rcq9bSBMIxBB8jTXDxe6jH78CXtWZJI$ From peter at korsgaard.com Fri Jan 28 20:36:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:36:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/luajit: add LUAJIT_CPE_ID_VENDOR In-Reply-To: <20220122220334.266735-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 22 Jan 2022 23:03:34 +0100") References: <20220122220334.266735-1-fontaine.fabrice@gmail.com> Message-ID: <87leyz61hw.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:38:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:38:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/lighttpd: replace mod_compress by mod_deflate In-Reply-To: <20220122224935.310100-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 22 Jan 2022 23:49:35 +0100") References: <20220122224935.310100-1-fontaine.fabrice@gmail.com> Message-ID: <87h79n61fb.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > mod_compress has been subsumed by mod_deflate since version 1.4.56 and > https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:41:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:41:30 +0100 Subject: [Buildroot] [git commit] package/libpjsip: security bump to version 2.11.1 In-Reply-To: <20220123194537.DE43C82B40@busybox.osuosl.org> (Yann E. MORIN's message of "Sun, 23 Jan 2022 20:49:34 +0100") References: <20220123194537.DE43C82B40@busybox.osuosl.org> Message-ID: <87czkb61ad.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=2c7ad667ec4a25226848baba809e492ca0ff06da > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Security update. This version is recommended for all users to improve > the security of applications using PJSIP. > Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 > Update indentation in hash file (two spaces) > https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph > https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp > https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr > https://github.com/pjsip/pjproject/releases/tag/2.11 > https://github.com/pjsip/pjproject/releases/tag/2.11.1 > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:44:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:44:23 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml: add TINYXML_CPE_ID_VENDOR In-Reply-To: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 24 Jan 2022 18:23:21 +0100") References: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> Message-ID: <878ruz615k.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:44:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:44:28 +0100 Subject: [Buildroot] [PATCH 2/2] package/tinyxml: fix CVE-2021-42260 In-Reply-To: <20220124172322.2302364-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 24 Jan 2022 18:23:22 +0100") References: <20220124172322.2302364-1-fontaine.fabrice@gmail.com> <20220124172322.2302364-2-fontaine.fabrice@gmail.com> Message-ID: <874k5n615f.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in > tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by > a crafted XML message and leads to a denial of service. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 20:36:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:36:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/luajit: add LUAJIT_CPE_ID_VENDOR Message-ID: <20220128203942.BD2C0821A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e75d81356be71c79cbe59bd7b9a267ef7f06fb51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d91f454117fafad219948bf1ea86b0d6e2301f76) Signed-off-by: Peter Korsgaard --- package/luajit/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index defa21dd3f..12042cd04b 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -8,6 +8,7 @@ LUAJIT_VERSION = 2.1.2 LUAJIT_SITE = $(call github,moonjit,moonjit,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT +LUAJIT_CPE_ID_VENDOR = luajit LUAJIT_INSTALL_STAGING = YES From peter at korsgaard.com Fri Jan 28 20:37:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:37:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lighttpd: replace mod_compress by mod_deflate Message-ID: <20220128203942.C582882B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb8b3112878c1d57e642ba69c196184eb2000f73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x mod_compress has been subsumed by mod_deflate since version 1.4.56 and https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 653dc2e710534494ea41c68c22a279cf8736b125) Signed-off-by: Peter Korsgaard --- package/lighttpd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index e9a5aa34f0..3e468ce9c8 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -37,13 +37,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB help - Enable zlib support for lighttpd mod_compress. + Enable zlib support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 help - Enable bzip2 support for lighttpd mod_compress. + Enable bzip2 support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" From peter at korsgaard.com Fri Jan 28 20:43:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:43:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tinyxml: add TINYXML_CPE_ID_VENDOR Message-ID: <20220128203942.D7A33821A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1eb773baf6c6c06190a487b590424ffd1d9cded3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 6e46157821f0ad4107e8ddcf039661e9ac189609) Signed-off-by: Peter Korsgaard --- package/tinyxml/tinyxml.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 15280517ac..b8b8e43c05 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,5 +12,6 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README +TINYXML_CPE_ID_VENDOT = tinyxml_project $(eval $(autotools-package)) From peter at korsgaard.com Fri Jan 28 20:41:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:41:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libpjsip: security bump to version 2.11.1 Message-ID: <20220128203942.CE84282B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f448847223b00567c048e152ed37e375eae7ad8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Security update. This version is recommended for all users to improve the security of applications using PJSIP. Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 Update indentation in hash file (two spaces) https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr https://github.com/pjsip/pjproject/releases/tag/2.11 https://github.com/pjsip/pjproject/releases/tag/2.11.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2c7ad667ec4a25226848baba809e492ca0ff06da) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 4 ++-- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 68c2208885..f39ebf4060 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8feec9bcb2..0a93780e93 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.10 +LIBPJSIP_VERSION = 2.11.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Fri Jan 28 20:44:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:44:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/tinyxml: fix CVE-2021-42260 Message-ID: <20220128203942.E18B582B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43df60902ce19c3d8f71857be757a8997b9d53ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by a crafted XML message and leads to a denial of service. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b23ef210299ca7f0eedf8fc898b0e5a0f3578293) Signed-off-by: Peter Korsgaard --- ...tamp-always-advance-the-pointer-if-p-0xef.patch | 37 ++++++++++++++++++++++ package/tinyxml/tinyxml.mk | 3 ++ 2 files changed, 40 insertions(+) diff --git a/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch new file mode 100644 index 0000000000..ea0f6476c8 --- /dev/null +++ b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch @@ -0,0 +1,37 @@ +From f7ca0035d17a663f55668e662b840afce7b86112 Mon Sep 17 00:00:00 2001 +From: Christian Voegl +Date: Wed, 27 Oct 2021 11:25:18 +0200 +Subject: [PATCH] In stamp always advance the pointer if *p= 0xef + +The current implementation only advanced if 0xef is followed +by two non-zero bytes. In case of malformed input (0xef should be +the start byte of a three byte character) this leads to an infinite +loop. (CVE-2021-42260) + +[Retrieved (and backported) from: +https://sourceforge.net/p/tinyxml/git/merge-requests/1] +Signed-off-by: Fabrice Fontaine +--- + tinyxmlparser.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 81b7eae..8aa0dfa 100755 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding ) + else + { p +=3; ++col; } // A normal character. + } ++ else ++ { ++ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so ++ // there is something wrong here. Just advance the pointer to evade infinite loops ++ ++p; ++ } + } + else + { +-- +2.34.1 + diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index b8b8e43c05..d173254e31 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -14,4 +14,7 @@ TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README TINYXML_CPE_ID_VENDOT = tinyxml_project +# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch +TINYXML_IGNORE_CVES += CVE-2021-42260 + $(eval $(autotools-package)) From peter at korsgaard.com Fri Jan 28 20:39:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:39:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lighttpd: replace mod_compress by mod_deflate Message-ID: <20220128203949.A137C82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0dab0bd0be3018facc25bcc9227926af59fd0c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x mod_compress has been subsumed by mod_deflate since version 1.4.56 and https://github.com/lighttpd/lighttpd1.4/commit/dab212b5f5ee468b632f40f28699efc810f27210 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 653dc2e710534494ea41c68c22a279cf8736b125) Signed-off-by: Peter Korsgaard --- package/lighttpd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index e9a5aa34f0..3e468ce9c8 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -37,13 +37,13 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB help - Enable zlib support for lighttpd mod_compress. + Enable zlib support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2 help - Enable bzip2 support for lighttpd mod_compress. + Enable bzip2 support for lighttpd mod_deflate. config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" From peter at korsgaard.com Fri Jan 28 20:43:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:43:48 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tinyxml: fix CVE-2021-42260 Message-ID: <20220128203949.BABE182B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55ef8028572f4fc9e9212f8bbe2d5bf7a8f9b71a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x TinyXML through 2.6.2 has an infinite loop in TiXmlParsingData::Stamp in tinyxmlparser.cpp via the TIXML_UTF_LEAD_0 case. It can be triggered by a crafted XML message and leads to a denial of service. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b23ef210299ca7f0eedf8fc898b0e5a0f3578293) Signed-off-by: Peter Korsgaard --- ...tamp-always-advance-the-pointer-if-p-0xef.patch | 37 ++++++++++++++++++++++ package/tinyxml/tinyxml.mk | 3 ++ 2 files changed, 40 insertions(+) diff --git a/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch new file mode 100644 index 0000000000..ea0f6476c8 --- /dev/null +++ b/package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch @@ -0,0 +1,37 @@ +From f7ca0035d17a663f55668e662b840afce7b86112 Mon Sep 17 00:00:00 2001 +From: Christian Voegl +Date: Wed, 27 Oct 2021 11:25:18 +0200 +Subject: [PATCH] In stamp always advance the pointer if *p= 0xef + +The current implementation only advanced if 0xef is followed +by two non-zero bytes. In case of malformed input (0xef should be +the start byte of a three byte character) this leads to an infinite +loop. (CVE-2021-42260) + +[Retrieved (and backported) from: +https://sourceforge.net/p/tinyxml/git/merge-requests/1] +Signed-off-by: Fabrice Fontaine +--- + tinyxmlparser.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 81b7eae..8aa0dfa 100755 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding ) + else + { p +=3; ++col; } // A normal character. + } ++ else ++ { ++ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so ++ // there is something wrong here. Just advance the pointer to evade infinite loops ++ ++p; ++ } + } + else + { +-- +2.34.1 + diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index b8b8e43c05..d173254e31 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -14,4 +14,7 @@ TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README TINYXML_CPE_ID_VENDOT = tinyxml_project +# 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch +TINYXML_IGNORE_CVES += CVE-2021-42260 + $(eval $(autotools-package)) From peter at korsgaard.com Fri Jan 28 20:43:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:43:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/tinyxml: add TINYXML_CPE_ID_VENDOR Message-ID: <20220128203949.B17828230F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b22fb63c7f66df5337392f1889764a3885133b6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:tinyxml_project:tinyxml is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Atinyxml_project%3Atinyxml Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 6e46157821f0ad4107e8ddcf039661e9ac189609) Signed-off-by: Peter Korsgaard --- package/tinyxml/tinyxml.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 15280517ac..b8b8e43c05 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,5 +12,6 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README +TINYXML_CPE_ID_VENDOT = tinyxml_project $(eval $(autotools-package)) From peter at korsgaard.com Fri Jan 28 20:36:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:36:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/luajit: add LUAJIT_CPE_ID_VENDOR Message-ID: <20220128203949.98D2F8230F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e2ae214fdde95daf104ab8a72df25127a3f98c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:luajit:luajit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aluajit%3Aluajit Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d91f454117fafad219948bf1ea86b0d6e2301f76) Signed-off-by: Peter Korsgaard --- package/luajit/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index d2af69d1e3..1f45fb8af0 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -8,6 +8,7 @@ LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT +LUAJIT_CPE_ID_VENDOR = luajit LUAJIT_INSTALL_STAGING = YES From peter at korsgaard.com Fri Jan 28 20:41:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:41:10 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libpjsip: security bump to version 2.11.1 Message-ID: <20220128203949.A95DA82B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9c73096689ea5a5b3bf2b5e020d9e1e77189056 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Security update. This version is recommended for all users to improve the security of applications using PJSIP. Fix CVE-2020-15260, CVE-2021-21375 and CVE-2021-32686 Update indentation in hash file (two spaces) https://github.com/pjsip/pjproject/security/advisories/GHSA-8hcp-hm38-mfph https://github.com/pjsip/pjproject/security/advisories/GHSA-hvq6-f89p-frvp https://github.com/pjsip/pjproject/security/advisories/GHSA-cv8x-p47p-99wr https://github.com/pjsip/pjproject/releases/tag/2.11 https://github.com/pjsip/pjproject/releases/tag/2.11.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2c7ad667ec4a25226848baba809e492ca0ff06da) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 4 ++-- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 68c2208885..f39ebf4060 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de pjproject-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8feec9bcb2..0a93780e93 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.10 +LIBPJSIP_VERSION = 2.11.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.10.tar.gz +# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Fri Jan 28 20:50:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:50:20 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-interpipe: bump version to 1.1.8 In-Reply-To: <20220124205811.15913-1-ps.report@gmx.net> (Peter Seiderer's message of "Mon, 24 Jan 2022 21:58:11 +0100") References: <20220124205811.15913-1-ps.report@gmx.net> Message-ID: <87zgnf4mb7.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Changelog (since 1.1.7): > 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element > ddaa9b5 Add conditional build according to GST_VERSION_MINOR > 730dea6 Bump project version > 8718b12 Add initialization for the GstAppSinkCallbacks struct > f015ff7 Remove redundant initialization of new_event callback > 530da92 Update copyright year in README file > e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct > f0f3b8e Fix README copyright date to 2016-2022 > 814982e Merge branch 'hotfix/add-new-event-callback' > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Fri Jan 28 20:52:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 21:52:00 +0100 Subject: [Buildroot] [PATCH 1/2] package/glslsandbox: kms needs gbm Message-ID: <20220128205201.2798205-1-fontaine.fabrice@gmail.com> Obviously, KMS/DRM/GBM needs gbm so add a dependency on libgbm which was added by commit 4a541ee93242e67f7fab625607f5501c6925d451: checking for gbm... no configure: error: Package requirements (gbm) were not met: Package 'gbm', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/31b3fff9748300e293b4efb5615176ccce48dd15 Signed-off-by: Fabrice Fontaine --- package/glslsandbox-player/Config.in | 1 + package/glslsandbox-player/glslsandbox-player.mk | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 3aa6049dfb..e36e8d74c8 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -70,6 +70,7 @@ choice config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS bool "KMS/DRM/GBM" depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index c5fbf062b7..8886788587 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -37,9 +37,7 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-install-scripts endif ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) -# gbm dependency is not needed, as it is normally packaged with -# libegl/libgles drivers. -GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm +GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm libgbm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 20:52:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 21:52:01 +0100 Subject: [Buildroot] [PATCH 2/2] package/libglvnd: bump to version 1.4.0 In-Reply-To: <20220128205201.2798205-1-fontaine.fabrice@gmail.com> References: <20220128205201.2798205-1-fontaine.fabrice@gmail.com> Message-ID: <20220128205201.2798205-2-fontaine.fabrice@gmail.com> - Update hash of README.md (extra paragraph removed with https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/a7bb6f4d19d1258d83c8800af885936a243e07bb) - Update hash of uthash license (year updated with https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/b3a958feb03694e2f0df71482875684e45353964) https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v1.4.0 Signed-off-by: Fabrice Fontaine --- package/libglvnd/libglvnd.hash | 6 +++--- package/libglvnd/libglvnd.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libglvnd/libglvnd.hash b/package/libglvnd/libglvnd.hash index 15e76ea9e8..e463a8def5 100644 --- a/package/libglvnd/libglvnd.hash +++ b/package/libglvnd/libglvnd.hash @@ -1,7 +1,7 @@ # Locally computed -sha256 6332c27f4c792b09a3eb1d7ae18c2d6ff6a0acaf3a746489caf859e659fca2f7 libglvnd-v1.3.2.tar.gz +sha256 c4a884503d2412dc1fa209613aa8a77193aeb7065b823fe1775dc8b6f3e45211 libglvnd-1.4.0.tar.gz # Locally computed hashes for license files -sha256 224534547628a9e5e889d8808385bd38839e6bdb77d89c90ac04dad6891a4f5f README.md -sha256 bebdc0fd27cd37af8406e47af23c113866b7856c3f7349ffcbc672029ec8acf7 src/util/uthash/LICENSE +sha256 f84a3eca98cc5bdf5318741124c38c5e877f856df8c7e229ee5065e5c61038c2 README.md +sha256 e9b9aac8421b6d29176c6f23f6f7a907194245e35ef99ace10839734961cfaa2 src/util/uthash/LICENSE sha256 f6f207863675ca5a5128fd120b9aef4f4bbab73ffa57e5f771ccffc8e3cc56b7 src/util/cJSON/LICENSE diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 3df609f6eb..4149e8b1e6 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBGLVND_VERSION = 1.3.2 -LIBGLVND_SOURCE = libglvnd-v$(LIBGLVND_VERSION).tar.gz -LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$(LIBGLVND_VERSION) +LIBGLVND_VERSION = 1.4.0 +LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/uploads/ca5bf4295beb39bb324f692c481ac8a1 LIBGLVND_LICENSE = \ libglvnd license, \ -- 2.34.1 From peter at korsgaard.com Fri Jan 28 21:03:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:03:53 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name In-Reply-To: <20220126205832.7AB4181906@busybox.osuosl.org> (Thomas Petazzoni's message of "Wed, 26 Jan 2022 22:05:18 +0100") References: <20220126205832.7AB4181906@busybox.osuosl.org> Message-ID: <87v8y34lom.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > commit: https://git.buildroot.net/buildroot/commit/?id=07a0d71657323d137bfb33e29311bff29ac58539 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal > with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. > Signed-off-by: Giulio Benetti > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:05:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:05:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR In-Reply-To: <20220123134751.703269-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 23 Jan 2022 14:47:50 +0100") References: <20220123134751.703269-1-fontaine.fabrice@gmail.com> Message-ID: <87r18r4llu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: > > > > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:07:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:07:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/containerd: security bump to version 1.5.9 In-Reply-To: <20220126222309.44ad5b0f@windsurf> (Thomas Petazzoni's message of "Wed, 26 Jan 2022 22:23:09 +0100") References: <20220124071453.16225-1-christian@paral.in> <20220126222309.44ad5b0f@windsurf> Message-ID: <87mtjf4li3.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > On Sun, 23 Jan 2022 23:14:53 -0800 > Christian Stewart via buildroot wrote: >> CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when >> it is SELinux" >> >> Containers launched through containerd?s CRI implementation on Linux systems >> which use the SELinux security module and containerd versions since v1.5.0 can >> cause arbitrary files and directories on the host to be relabeled to match the >> container process label through the use of specially-configured bind mounts in a >> hostPath volume. This relabeling elevates permissions for the container, >> granting full read/write access over the affected files and directories. >> Kubernetes and crictl can both be configured to use containerd?s CRI >> implementation. >> >> https://github.com/advisories/GHSA-mvff-h3cj-wj9c >> https://github.com/containerd/containerd/releases/tag/v1.5.9 >> >> Signed-off-by: Christian Stewart >> --- >> package/containerd/containerd.hash | 2 +- >> package/containerd/containerd.mk | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) Committed to 2021.11.x, thanks (2021.02.x not affected). -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:04:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:04:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR Message-ID: <20220128210100.525B582B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2784581a7d62a36da07b6460b7ae6f42aa1efd11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c99d84fb9694000a91fa04abc820f3e63a14e7e9) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 0a93780e93..b05cc31a83 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,7 +12,7 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_VENDOR = teluu LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) From peter at korsgaard.com Fri Jan 28 21:03:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:03:18 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name Message-ID: <20220128210100.4742282B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=050acd180c5a256e2f8632a308ccb1ba687cda45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 07a0d71657323d137bfb33e29311bff29ac58539) Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf index 5109625160..157c6a715e 100644 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ b/board/orangepi/orangepi-rk3399/extlinux.conf @@ -1,4 +1,4 @@ -label RK3399_ROCKPRO64 linux +label RK3399_ORANGEPI linux kernel /Image devicetree /rk3399-orangepi.dtb append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait From peter at korsgaard.com Fri Jan 28 20:50:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:50:04 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gst1-interpipe: bump version to 1.1.8 Message-ID: <20220128210100.3DB4482964@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19bfe48a265e8dea3a2f18b24a70435470c48d08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changelog (since 1.1.7): 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element ddaa9b5 Add conditional build according to GST_VERSION_MINOR 730dea6 Bump project version 8718b12 Add initialization for the GstAppSinkCallbacks struct f015ff7 Remove redundant initialization of new_event callback 530da92 Update copyright year in README file e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct f0f3b8e Fix README copyright date to 2016-2022 814982e Merge branch 'hotfix/add-new-event-callback' Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0872ac72b79439a0106768ae2b58e824e1f316da) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 348abdb003..d9f09d2985 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 0fd29d3cba623163dd5852989d7ca21eee9033da9d14a467ccd5e527e3b4297b gst1-interpipe-1.1.7-br1.tar.gz +sha256 b97af0dfa108c5f736a961c388267c7a9c8f915e753985d7e85939091032deed gst1-interpipe-v1.1.8-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index fa4485e6f8..cec23e7fa7 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.7 +GST1_INTERPIPE_VERSION = v1.1.8 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module From peter at korsgaard.com Fri Jan 28 20:49:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 21:49:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gst1-interpipe: bump version to 1.1.8 Message-ID: <20220128210105.46B5A82964@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9c5056288c8d1214f421b2d1ce181211218a711 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog (since 1.1.7): 8b70f08 Add definition of new event GstAppSinkCallbacks for interpipesink element ddaa9b5 Add conditional build according to GST_VERSION_MINOR 730dea6 Bump project version 8718b12 Add initialization for the GstAppSinkCallbacks struct f015ff7 Remove redundant initialization of new_event callback 530da92 Update copyright year in README file e8ce826 Add explanatory comment on the memset of GstAppSinkCallbacks struct f0f3b8e Fix README copyright date to 2016-2022 814982e Merge branch 'hotfix/add-new-event-callback' Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0872ac72b79439a0106768ae2b58e824e1f316da) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-interpipe/gst1-interpipe.hash | 2 +- package/gstreamer1/gst1-interpipe/gst1-interpipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 348abdb003..d9f09d2985 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 0fd29d3cba623163dd5852989d7ca21eee9033da9d14a467ccd5e527e3b4297b gst1-interpipe-1.1.7-br1.tar.gz +sha256 b97af0dfa108c5f736a961c388267c7a9c8f915e753985d7e85939091032deed gst1-interpipe-v1.1.8-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index fa4485e6f8..cec23e7fa7 100644 --- a/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.7 +GST1_INTERPIPE_VERSION = v1.1.8 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module From peter at korsgaard.com Fri Jan 28 21:03:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:03:30 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] board/orangepi/orangepi-rk3399/extlinux.conf: fix label name Message-ID: <20220128210105.50E0F82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eebadec5d158bb53614c170486c53850cf6e4bad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x RK3399_ROCKPRO64 has been picked from pine64/rockpro64 but here we deal with orangepi-rk3399, so let's change the label to RK3399_ORANGEPI. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 07a0d71657323d137bfb33e29311bff29ac58539) Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-rk3399/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf index 5109625160..157c6a715e 100644 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ b/board/orangepi/orangepi-rk3399/extlinux.conf @@ -1,4 +1,4 @@ -label RK3399_ROCKPRO64 linux +label RK3399_ORANGEPI linux kernel /Image devicetree /rk3399-orangepi.dtb append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait From peter at korsgaard.com Fri Jan 28 21:06:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:06:46 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/containerd: security bump to version 1.5.9 Message-ID: <20220128210105.6148182B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd140f26cc5a80b24cb60b6a19d8ed0921a7d06e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x CVE-2021-43816: "Unprivileged pod using `hostPath` can side-step active LSM when it is SELinux" Containers launched through containerd???s CRI implementation on Linux systems which use the SELinux security module and containerd versions since v1.5.0 can cause arbitrary files and directories on the host to be relabeled to match the container process label through the use of specially-configured bind mounts in a hostPath volume. This relabeling elevates permissions for the container, granting full read/write access over the affected files and directories. Kubernetes and crictl can both be configured to use containerd???s CRI implementation. https://github.com/advisories/GHSA-mvff-h3cj-wj9c https://github.com/containerd/containerd/releases/tag/v1.5.9 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 935bd589a356f51e5c97d111877bd2052f0c9da5) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index f1a6709554..d5aafe2e70 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790 containerd-1.5.8.tar.gz +sha256 40c9767af3e87f2c36adf2f563f0a8374e80b30bd2b7aa80058c85912406cef4 containerd-1.5.9.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index cd975db274..8976e12f1a 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.8 +CONTAINERD_VERSION = 1.5.9 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From peter at korsgaard.com Fri Jan 28 21:04:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:04:03 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libpjsip: update LIBPJSIP_CPE_ID_VENDOR Message-ID: <20220128210105.58CAB82964@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fe6230ee2c92c0322f2a26e61a00b0b9a2f33be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x pjsip:pjsip has been deprecated by teluu:pjsip since September 2021: Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c99d84fb9694000a91fa04abc820f3e63a14e7e9) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 0a93780e93..b05cc31a83 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -12,7 +12,7 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_VENDOR = teluu LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) From peter at korsgaard.com Fri Jan 28 21:09:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:09:03 +0100 Subject: [Buildroot] [PATCH 1/2] package/docker-engine: bump to version 20.10.12 In-Reply-To: <20220124073711.44684-1-christian@paral.in> (Christian Stewart's message of "Sun, 23 Jan 2022 23:37:10 -0800") References: <20220124073711.44684-1-christian@paral.in> Message-ID: <87ilu34lg0.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Signed-off-by: Christian Stewart Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:09:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/docker-cli: bump to version 20.10.12 In-Reply-To: <20220124073711.44684-2-christian@paral.in> (Christian Stewart's message of "Sun, 23 Jan 2022 23:37:11 -0800") References: <20220124073711.44684-1-christian@paral.in> <20220124073711.44684-2-christian@paral.in> Message-ID: <87ee4r4lfv.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > Signed-off-by: Christian Stewart Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:08:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:08:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-cli: bump to version 20.10.12 Message-ID: <20220128210309.4A03B82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42d642acc16c69783a40d1d00d5e5419ae850232 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 70d1858353029d4a45e5f0d4a705b07837736c21) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index fbcda5753e..f2fe316540 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz +sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 0e35a60d43..d5cca34efc 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.11 +DOCKER_CLI_VERSION = 20.10.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Jan 28 21:08:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:08:54 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-engine: bump to version 20.10.12 Message-ID: <20220128210309.3F0B682964@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=177b477df76429571ba3d0957991b5147546476a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 64cf3dc6c46c7b04d5d0ca1c024b9cf3d0efeaf1) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d1323f507d..ec3a242629 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz +sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 45fa7fa53e..2a1239b676 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.11 +DOCKER_ENGINE_VERSION = 20.10.12 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Jan 28 21:08:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:08:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-engine: bump to version 20.10.12 Message-ID: <20220128210314.6E78782B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6f7d795751a16a86026e31432dd48a11c7a3894 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 64cf3dc6c46c7b04d5d0ca1c024b9cf3d0efeaf1) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index d1323f507d..ec3a242629 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fa7835bf7c17c293621967bd5096642fa1e3e1b597fbc7d7bd35f455d886495 docker-engine-20.10.11.tar.gz +sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 45fa7fa53e..2a1239b676 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.11 +DOCKER_ENGINE_VERSION = 20.10.12 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Jan 28 21:08:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:08:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-cli: bump to version 20.10.12 Message-ID: <20220128210314.7845182B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=deacc25cd63e24614b9d27dae47762b45c205c6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 70d1858353029d4a45e5f0d4a705b07837736c21) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index fbcda5753e..f2fe316540 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d55fdead906cbea8608ef39d5a62d54d1118e604a5ae7e2d58b4fb54a599a7 docker-cli-20.10.11.tar.gz +sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 0e35a60d43..d5cca34efc 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.11 +DOCKER_CLI_VERSION = 20.10.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From peter at korsgaard.com Fri Jan 28 21:12:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:12:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump to version 0.103.5 In-Reply-To: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 24 Jan 2022 23:10:47 +0100") References: <20220124221047.2597699-1-fontaine.fabrice@gmail.com> Message-ID: <87a6ff4l9o.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > ClamAV 0.103.5 is a critical patch release with the following fix: > - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. > Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with > libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the > clamscan --gen-json option) is enabled. > https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:15:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:15:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4224 In-Reply-To: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 26 Jan 2022 21:37:33 +0100") References: <20220126203733.1531511-1-fontaine.fabrice@gmail.com> Message-ID: <875yq34l4r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository > vim/vim prior to 8.2.4120 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:17:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:17:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/mongodb: security bump to version 4.2.18 In-Reply-To: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 25 Jan 2022 18:34:22 +0100") References: <20220125173422.3476090-1-fontaine.fabrice@gmail.com> Message-ID: <871r0r4l23.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-20330: An attacker with basic CRUD permissions on a > replicated collection can run the applyOps command with specially > malformed oplog entries, resulting in a potential denial of service on > secondaries. This issue affects MongoDB Server v4.0 versions prior to > 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server > v4.4 versions prior to 4.4.6. > Drop third patch (already in version) > https://docs.mongodb.com/master/release-notes/4.2/ > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:14:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:14:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4224 Message-ID: <20220128211207.AD7BC82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b26a86ffa2e7dd1a2896e0717b890fb8f309046f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository vim/vim prior to 8.2.4120 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d3da56369c75473ee3fac768b86382adcdec3f76) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fff5072063..49056b31cd 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 408b33a409..74ab1ec584 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4092 +VIM_VERSION = 8.2.4224 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 28 21:12:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:12:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/clamav: security bump to version 0.103.5 Message-ID: <20220128211207.A581582A96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e81847715fb0e43cd79ef170d22e94938e16c9ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x ClamAV 0.103.5 is a critical patch release with the following fix: - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the clamscan --gen-json option) is enabled. https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f92c093c7a39b8e0d6754c452268b0af20ef860b) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index d68b04af76..73f4ff88f1 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz +sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 94b589b975..cd2d06e6b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.4 +CLAMAV_VERSION = 0.103.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Fri Jan 28 21:17:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:17:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mongodb: security bump to version 4.2.18 Message-ID: <20220128211207.B619382B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d146485de18f807015a17926918c7c4a02de48a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-20330: An attacker with basic CRUD permissions on a replicated collection can run the applyOps command with specially malformed oplog entries, resulting in a potential denial of service on secondaries. This issue affects MongoDB Server v4.0 versions prior to 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server v4.4 versions prior to 4.4.6. Drop third patch (already in version) https://docs.mongodb.com/master/release-notes/4.2/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 49bbf644d4acd3dfe6f3fd0db39e6fed78abf58f) Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 3b2580cc43..02da8ad452 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 377484a00b..8220999df7 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.11 +MONGODB_VERSION = 4.2.18 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz From peter at korsgaard.com Fri Jan 28 21:12:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:12:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/clamav: security bump to version 0.103.5 Message-ID: <20220128211214.50C2182A96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ece7b2f709aab572304174413c0e495bb016cdcf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x ClamAV 0.103.5 is a critical patch release with the following fix: - CVE-2022-20698: Fix for invalid pointer read that may cause a crash. Affects 0.104.1, 0.103.4 and prior when ClamAV is compiled with libjson-c and the CL_SCAN_GENERAL_COLLECT_METADATA scan option (the clamscan --gen-json option) is enabled. https://github.com/Cisco-Talos/clamav/blob/clamav-0.103.5/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f92c093c7a39b8e0d6754c452268b0af20ef860b) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index d68b04af76..73f4ff88f1 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 clamav-0.103.4.tar.gz +sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 94b589b975..cd2d06e6b3 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.4 +CLAMAV_VERSION = 0.103.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From peter at korsgaard.com Fri Jan 28 21:15:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:15:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.4224 Message-ID: <20220128211214.5872B82B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a76cdac04445e8d2003f45522827c7cd959c7a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-0261: Heap-based Buffer Overflow in GitHub repository vim/vim prior to 8.2.4120 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d3da56369c75473ee3fac768b86382adcdec3f76) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fff5072063..49056b31cd 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2464110940c3d8d53bfef6d16912653c85187132fc0f87e937a382cafc4c6370 vim-8.2.4092.tar.gz +sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 408b33a409..74ab1ec584 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4092 +VIM_VERSION = 8.2.4224 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Fri Jan 28 21:16:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:16:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mongodb: security bump to version 4.2.18 Message-ID: <20220128211214.6063182B52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ed039eafbc418b271d24eb16dba5b924d02c914 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-20330: An attacker with basic CRUD permissions on a replicated collection can run the applyOps command with specially malformed oplog entries, resulting in a potential denial of service on secondaries. This issue affects MongoDB Server v4.0 versions prior to 4.0.25; MongoDB Server v4.2 versions prior to 4.2.14; MongoDB Server v4.4 versions prior to 4.4.6. Drop third patch (already in version) https://docs.mongodb.com/master/release-notes/4.2/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 49bbf644d4acd3dfe6f3fd0db39e6fed78abf58f) Signed-off-by: Peter Korsgaard --- ...-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch | 49 ---------------------- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch b/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch deleted file mode 100644 index 02b35c6e4f..0000000000 --- a/package/mongodb/0003-SERVER-59459-With-glibc-2-34-MINSIGSTKSZ-is-no-longer-a-constant.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ef08d0dbc99db8c4620512e92bfb3154282eb5d3 Mon Sep 17 00:00:00 2001 -From: Andrew Morrow -Date: Wed, 15 Sep 2021 15:23:42 -0400 -Subject: [PATCH] SERVER-59459 With glibc-2.34, MINSIGSTKSZ is no longer a - constant - -[Retrieved (and backported) from: -https://github.com/mongodb/mongo/commit/ef08d0dbc99db8c4620512e92bfb3154282eb5d3] -Signed-off-by: Fabrice Fontaine ---- - src/mongo/stdx/thread.h | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h -index 7b15bb561bd9..6f1e16cdeb36 100644 ---- a/src/mongo/stdx/thread.h -+++ b/src/mongo/stdx/thread.h -@@ -76,11 +76,19 @@ class SigAltStackController { - } - - private: -+ static size_t _getStackSize() { -+ // It would be nice for this to be a constexpr, but -+ // MINSIGSTKSZ became a macro that invoked `sysconf` in glibc -+ // 2.34. -+ static const std::size_t kMinSigStkSz = MINSIGSTKSZ; -+ return std::max(kMongoMinSignalStackSize, kMinSigStkSz); -+ } -+ - void _install() const { - stack_t ss; - ss.ss_sp = _stackStorage.get(); - ss.ss_flags = 0; -- ss.ss_size = kStackSize; -+ ss.ss_size = _getStackSize(); - if (sigaltstack(&ss, nullptr)) { - abort(); - } -@@ -107,9 +115,7 @@ class SigAltStackController { - // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) - static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; - -- static constexpr std::size_t kStackSize = -- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); -- std::unique_ptr _stackStorage = std::make_unique(kStackSize); -+ std::unique_ptr _stackStorage = std::make_unique(_getStackSize()); - - #else // !MONGO_HAS_SIGALTSTACK - auto makeInstallGuard() const { diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 3b2580cc43..02da8ad452 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz +sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index ede03e44d6..8c2e0db2bb 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.11 +MONGODB_VERSION = 4.2.18 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz From peter at korsgaard.com Fri Jan 28 21:21:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:21:14 +0100 Subject: [Buildroot] [PATCH] package/polkit: bump to fix CVE-2021-4034 In-Reply-To: <20220126202236.1399934-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 26 Jan 2022 21:22:36 +0100") References: <20220126202236.1399934-1-yann.morin.1998@free.fr> Message-ID: <87wnij36b9.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > We are currently using the fork by Adam, with support for duktape as a > JS engine. But upstream has finally merged that just a day ago. Woohoo! > Between the fork we were using and upstream, there are very little > changes, mostly centered around: > - translations > - buildsystem > - duktape > - CVE-2021-4034 > So, we just switch to using the HEAD of the repo: it has not much more > than the two important changes: duktape and the CVE fix. > Signed-off-by: Yann E. MORIN > Cc: Marek Belisko > Cc: Adam Duskett > Cc: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Fri Jan 28 21:20:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 22:20:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/keepalived: bump to version 2.2.7 Message-ID: <20220128212005.2899314-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://www.keepalived.org/release-notes/Release-2.2.7.html https://www.keepalived.org/release-notes/Release-2.2.4.html https://www.keepalived.org/release-notes/Release-2.2.3.html https://www.keepalived.org/release-notes/Release-2.2.2.html https://www.keepalived.org/release-notes/Release-2.2.0.html https://www.keepalived.org/release-notes/Release-2.1.5.html Signed-off-by: Fabrice Fontaine --- .../0001-core-Fix-compiling-on-RHEL-9.patch | 34 --------------- ...us-fix-policy-to-not-be-overly-broad.patch | 42 ------------------- package/keepalived/keepalived.hash | 2 +- package/keepalived/keepalived.mk | 5 +-- 4 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch delete mode 100644 package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch diff --git a/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch b/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch deleted file mode 100644 index 39134fcc35..0000000000 --- a/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Tue, 8 Jun 2021 08:57:45 +0100 -Subject: [PATCH] core: Fix compiling on RHEL 9 - -Signed-off-by: Quentin Armitage - -[Retrieved from: -https://github.com/acassen/keepalived/commit/3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d] -Signed-off-by: Fabrice Fontaine ---- - keepalived/core/layer4.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c -index d2cc971a3..fdca04913 100644 ---- a/keepalived/core/layer4.c -+++ b/keepalived/core/layer4.c -@@ -27,13 +27,14 @@ - #include - #include - #include -+#include -+#include - #include - #include - #ifdef ERRQUEUE_NEEDS_SYS_TIME - #include - #endif - #include --#include - - #include "layer4.h" - #include "logger.h" diff --git a/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch b/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch deleted file mode 100644 index 6287d6117d..0000000000 --- a/package/keepalived/0002-dbus-fix-policy-to-not-be-overly-broad.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 -From: Vincent Bernat -Date: Tue, 23 Nov 2021 06:50:59 +0100 -Subject: [PATCH] dbus: fix policy to not be overly broad - -The DBus policy did not restrict the message destination, allowing any -user to inspect and manipulate any property. - -Signed-off-by: Vincent Bernat - -[Retrieved from: -https://github.com/acassen/keepalived/commit/7977fec0be89ae6fe87405b3f8da2f0b5e415e3d] -Signed-off-by: Fabrice Fontaine ---- - keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf -index 2b78a575c..b5ced6085 100644 ---- a/keepalived/dbus/org.keepalived.Vrrp1.conf -+++ b/keepalived/dbus/org.keepalived.Vrrp1.conf -@@ -3,12 +3,15 @@ - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - - -- -- -+ -+ - - -- -- -- -+ -+ -+ - - diff --git a/package/keepalived/keepalived.hash b/package/keepalived/keepalived.hash index 94af43c3e6..9d8ab949b7 100644 --- a/package/keepalived/keepalived.hash +++ b/package/keepalived/keepalived.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 245bf399e4320064996ac5507236a8896f545d005f6c4c3b91701bcbc5728c60 keepalived-2.1.4.tar.gz +sha256 c61940d874154a560a54627ecf7ef47adebdf832164368d10bf242a4d9b7d49d keepalived-2.2.7.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index e31c02dec5..7a1123b4dd 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEEPALIVED_VERSION = 2.1.4 +KEEPALIVED_VERSION = 2.2.7 KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl KEEPALIVED_LICENSE = GPL-2.0+ @@ -12,9 +12,6 @@ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening -# 0002-dbus-fix-policy-to-not-be-overly-broad.patch -KEEPALIVED_IGNORE_CVES += CVE-2021-44225 - ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c KEEPALIVED_CONF_OPTS += --enable-json -- 2.34.1 From peter at korsgaard.com Fri Jan 28 21:19:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:19:59 +0100 Subject: [Buildroot] [git commit] package/polkit: bump to fix CVE-2021-4034 Message-ID: <20220128211521.13EC182B50@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4aecb964aff92e5cc956b2d3b700ac7841041463 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We are currently using the fork by Adam, with support for duktape as a JS engine. But upstream has finally merged that just a day ago. Woohoo! Between the fork we were using and upstream, there are very little changes, mostly centered around: - translations - buildsystem - duktape - CVE-2021-4034 So, we just switch to using the HEAD of the repo: it has not much more than the two important changes: duktape and the CVE fix. Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index f108ac19ec..1fedb5a707 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz +sha256 243fa69d1e480510c504723487716cda7d6fb588360c7c8f7ec6ba4a3f6ae60e polkit-a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index a7ab725c81..61666594a2 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,13 +4,16 @@ # ################################################################################ -POLKIT_VERSION = 0.120 -POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) +POLKIT_VERSION = a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_INSTALL_STAGING = YES +# Fix was comitted in a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) From peter at korsgaard.com Fri Jan 28 21:22:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:22:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.3 In-Reply-To: <20220127162925.2639638-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 27 Jan 2022 09:29:25 -0700") References: <20220127162925.2639638-1-james.hilliard1@gmail.com> Message-ID: <87sft7368j.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:22:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:22:40 +0100 Subject: [Buildroot] [git commit] package/systemd: bump to version 250.3 Message-ID: <20220128211603.B56408251A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5777d6e725fb4ecc25e16f15ac764de03939202f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index f89b2ce17d..81f51eac20 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 ccfdd97679972cd3d9fb15bc3c647a3ee3351a434e20e1e3eec2851caa1b4849 systemd-250.1.tar.gz +sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 2d3971f31d..5626b54e8e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.1 +SYSTEMD_VERSION = 250.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From fontaine.fabrice at gmail.com Fri Jan 28 21:50:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 22:50:12 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkcs11-helper: drop autoreconf Message-ID: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> autoreconf is not needed since commit dbf8047f64f081ffbc97b67dd891690632377692 as the official tarball already ships a configure file Signed-off-by: Fabrice Fontaine --- package/pkcs11-helper/pkcs11-helper.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 805e000759..90929404be 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -10,7 +10,6 @@ PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/p PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL PKCS11_HELPER_DEPENDENCIES = host-pkgconf -PKCS11_HELPER_AUTORECONF = YES PKCS11_HELPER_INSTALL_STAGING = YES PKCS11_HELPER_CONF_OPTS = \ -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 21:50:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 22:50:13 +0100 Subject: [Buildroot] [PATCH 2/2] package/pkcs11-helper: bump to version 1.28 In-Reply-To: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> References: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> Message-ID: <20220128215013.2997212-2-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/OpenSC/pkcs11-helper/releases/tag/pkcs11-helper-1.28 Signed-off-by: Fabrice Fontaine --- .../0001-nss-use-nss-pkcs11-h.patch | 62 ------------------- package/pkcs11-helper/pkcs11-helper.hash | 2 +- package/pkcs11-helper/pkcs11-helper.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch diff --git a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch b/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch deleted file mode 100644 index d0b573446f..0000000000 --- a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d159a5c59c80552c3e8ea75d9bcf29b3a8e8289d Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 30 Jul 2021 20:06:36 +0300 -Subject: [PATCH] nss: use nss pkcs11.h - -make nss happy with its own extensions and non-standard behavior. -[Retrieved (and updated to remove ChangeLog update) from: -https://github.com/OpenSC/pkcs11-helper/pull/39] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 1 + - lib/_pkcs11h-crypto-nss.c | 14 ++++++++++---- - lib/common.h | 7 +++++++ - 3 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/lib/_pkcs11h-crypto-nss.c b/lib/_pkcs11h-crypto-nss.c -index 4b70e826..f57f9e6b 100644 ---- a/lib/_pkcs11h-crypto-nss.c -+++ b/lib/_pkcs11h-crypto-nss.c -@@ -48,15 +48,21 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include "common.h" -- --#include "_pkcs11h-crypto.h" -+#ifdef HAVE_CONFIG_H -+#include -+#endif - - #if defined(ENABLE_PKCS11H_ENGINE_NSS) --#define _PKCS11T_H_ /* required so no conflict with ours */ - #include - #include - -+/* Use PKCS#11 of nss to avoid conflicts and make nss happy with its own extensions */ -+#define PKCS11_H 1 -+ -+#include "common.h" -+ -+#include "_pkcs11h-crypto.h" -+ - static - int - __pkcs11h_crypto_nss_initialize ( -diff --git a/lib/common.h b/lib/common.h -index 61a958af..2499e9c5 100644 ---- a/lib/common.h -+++ b/lib/common.h -@@ -72,5 +72,12 @@ - - #define _PKCS11H_ASSERT assert - -+#ifndef FALSE -+#define FALSE 0 -+#endif -+#ifndef TRUE -+#define TRUE 1 -+#endif -+ - #endif - diff --git a/package/pkcs11-helper/pkcs11-helper.hash b/package/pkcs11-helper/pkcs11-helper.hash index d707bcf914..4114378ab8 100644 --- a/package/pkcs11-helper/pkcs11-helper.hash +++ b/package/pkcs11-helper/pkcs11-helper.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 653730f0c561bbf5941754c0783976113589b2dc64a0661c908dc878bfa4e58b pkcs11-helper-1.27.0.tar.bz2 +sha256 5bd55adafdbb708e096070dd0a910f23e1d5fd6291922398c1a15f00fff2b5ec pkcs11-helper-1.28.0.tar.bz2 sha256 808705ac1daafe07a76431929575c5712a8693977a39ec9102aed25f030754d9 COPYING sha256 865496cf23a6c792739ff2f9ea11e95ac99db89cfe3780a295b4e1495a9c19fe COPYING.BSD sha256 cd2e7d63a11058f19c58b06fb8c759140ce70788369dce6e6e9db40d3475021e COPYING.GPL diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 90929404be..4fc3e21e5a 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -4,7 +4,7 @@ # ################################################################################ -PKCS11_HELPER_VERSION = 1.27 +PKCS11_HELPER_VERSION = 1.28 PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).0.tar.bz2 PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-$(PKCS11_HELPER_VERSION) PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause -- 2.34.1 From peter at korsgaard.com Fri Jan 28 21:58:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:58:04 +0100 Subject: [Buildroot] [PATCH 2021.02.x] package/polkit: backport upstream patch to fix CVE-2021-4034 In-Reply-To: <20220126210226.1689899-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 26 Jan 2022 22:02:26 +0100") References: <20220126210226.1689899-1-yann.morin.1998@free.fr> Message-ID: <87o83v34lv.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Signed-off-by: Yann E. MORIN > Cc: Marek Belisko > Cc: Adam Duskett > Cc: Fabrice Fontaine > --- > ...l-privilege-escalation-CVE-2021-4034.patch | 79 +++++++++++++++++++ > package/polkit/polkit.mk | 3 + > 2 files changed, 82 insertions(+) > create mode 100644 package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch > diff --git a/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch > new file mode 100644 > index 0000000000..8c01eed775 > --- /dev/null > +++ b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch > @@ -0,0 +1,79 @@ > +From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001 > +From: Jan Rybar > +Date: Tue, 25 Jan 2022 17:21:46 +0000 > +Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034) > + Added your s-o-b to make check-package happy and applied to 2021.02.x, thanks! -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Jan 28 21:55:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 28 Jan 2022 22:55:55 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/polkit: backport upstream patch to fix CVE-2021-4034 Message-ID: <20220128215117.14EC182B53@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90cf9188c96f391ac56788100af326df923b4c37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-local-privilege-escalation-CVE-2021-4034.patch | 80 ++++++++++++++++++++++ package/polkit/polkit.mk | 3 + 2 files changed, 83 insertions(+) diff --git a/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch new file mode 100644 index 0000000000..515fdb81c1 --- /dev/null +++ b/package/polkit/0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch @@ -0,0 +1,80 @@ +From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001 +From: Jan Rybar +Date: Tue, 25 Jan 2022 17:21:46 +0000 +Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034) + +Signed-off-by: "Yann E. MORIN" +--- + src/programs/pkcheck.c | 5 +++++ + src/programs/pkexec.c | 23 ++++++++++++++++++++--- + 2 files changed, 25 insertions(+), 3 deletions(-) + +diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c +index f1bb4e1..768525c 100644 +--- a/src/programs/pkcheck.c ++++ b/src/programs/pkcheck.c +@@ -363,6 +363,11 @@ main (int argc, char *argv[]) + local_agent_handle = NULL; + ret = 126; + ++ if (argc < 1) ++ { ++ exit(126); ++ } ++ + /* Disable remote file access from GIO. */ + setenv ("GIO_USE_VFS", "local", 1); + +diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c +index 7698c5c..84e5ef6 100644 +--- a/src/programs/pkexec.c ++++ b/src/programs/pkexec.c +@@ -488,6 +488,15 @@ main (int argc, char *argv[]) + pid_t pid_of_caller; + gpointer local_agent_handle; + ++ ++ /* ++ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out. ++ */ ++ if (argc<1) ++ { ++ exit(127); ++ } ++ + ret = 127; + authority = NULL; + subject = NULL; +@@ -614,10 +623,10 @@ main (int argc, char *argv[]) + + path = g_strdup (pwstruct.pw_shell); + if (!path) +- { ++ { + g_printerr ("No shell configured or error retrieving pw_shell\n"); + goto out; +- } ++ } + /* If you change this, be sure to change the if (!command_line) + case below too */ + command_line = g_strdup (path); +@@ -636,7 +645,15 @@ main (int argc, char *argv[]) + goto out; + } + g_free (path); +- argv[n] = path = s; ++ path = s; ++ ++ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated. ++ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination ++ */ ++ if (argv[n] != NULL) ++ { ++ argv[n] = path; ++ } + } + if (access (path, F_OK) != 0) + { +-- +2.25.1 + diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index e00b634b7f..3fd041a813 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -12,6 +12,9 @@ POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES +# 0004-pkexec-local-privilege-escalation-CVE-2021-4034.patch +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ libglib2 host-intltool expat spidermonkey $(TARGET_NLS_DEPENDENCIES) From fontaine.fabrice at gmail.com Fri Jan 28 21:56:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 22:56:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/p11-kit: bump to version 0.24.1 Message-ID: <20220128215657.3023442-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/p11-glue/p11-kit/releases/tag/0.24.1 https://github.com/p11-glue/p11-kit/releases/tag/0.24.0 Signed-off-by: Fabrice Fontaine --- ...ts-c-Add-stdint-h-to-fix-compilation.patch | 28 ------------------- package/p11-kit/p11-kit.hash | 2 +- package/p11-kit/p11-kit.mk | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch diff --git a/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch b/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch deleted file mode 100644 index d4828666d3..0000000000 --- a/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 507c394cfcf4edffc5e4450c5d737e545c26b857 Mon Sep 17 00:00:00 2001 -From: Daniel Engberg -Date: Sat, 12 Dec 2020 18:56:38 +0100 -Subject: [PATCH] p11-kit/lists.c: Add stdint.h to fix compilation - -Add stdint.h otherwise compilation fails on FreeBSD 13-CURRENT with "use of undeclared identifier 'SIZE_MAX'" - -Signed-off-by: Daniel Engberg - -[Retrieved from: -https://github.com/p11-glue/p11-kit/commit/507c394cfcf4edffc5e4450c5d737e545c26b857] -Signed-off-by: Fabrice Fontaine ---- - p11-kit/lists.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/p11-kit/lists.c b/p11-kit/lists.c -index 365a6d89..1d9062be 100644 ---- a/p11-kit/lists.c -+++ b/p11-kit/lists.c -@@ -39,6 +39,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/package/p11-kit/p11-kit.hash b/package/p11-kit/p11-kit.hash index 3481a40b00..e950060c91 100644 --- a/package/p11-kit/p11-kit.hash +++ b/package/p11-kit/p11-kit.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6 p11-kit-0.23.22.tar.xz +sha256 d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8 p11-kit-0.24.1.tar.xz # Locally computed sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 284eb0fa35..868e3a7c9b 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -4,7 +4,7 @@ # ################################################################################ -P11_KIT_VERSION = 0.23.22 +P11_KIT_VERSION = 0.24.1 P11_KIT_SOURCE = p11-kit-$(P11_KIT_VERSION).tar.xz P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION) P11_KIT_INSTALL_STAGING = YES -- 2.34.1 From fontaine.fabrice at gmail.com Fri Jan 28 22:07:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 28 Jan 2022 23:07:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: bump to version 3.14.1 Message-ID: <20220128220738.3028614-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.1 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.0 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.13.0 Signed-off-by: Fabrice Fontaine --- ...001-openssl.c-fix-build-with-wolfssl.patch | 47 ------------------- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch diff --git a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch deleted file mode 100644 index deb1a0f93b..0000000000 --- a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e5c5ed1c64cfc715729c9bfbfdcc4be225f344ff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:32:39 +0200 -Subject: [PATCH] openssl.c: fix build with wolfssl - -Fix the following build failure with wolfssl: - -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new': -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function) - 174 | SSL_CTX_set_ciphersuites(c, tls13_ciphersuites); - | ^~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/d0fb629b40b05ad828775894fabed878692bb222 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/ssl/pull/1] ---- - openssl.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/openssl.c b/openssl.c -index 8f3d8b7..c42638c 100644 ---- a/src/ssl/openssl.c -+++ b/src/ssl/openssl.c -@@ -71,14 +71,14 @@ - "TLS13-AES256-GCM-SHA384:" \ - ecdhe_aead_ciphers - #else --# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -- "TLS_AES_128_GCM_SHA256:" \ -- "TLS_AES_256_GCM_SHA384" -- - # define top_ciphers \ - ecdhe_aead_ciphers - #endif - -+# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -+ "TLS_AES_128_GCM_SHA256:" \ -+ "TLS_AES_256_GCM_SHA384" -+ - #define ecdhe_aead_ciphers \ - "ECDHE-ECDSA-CHACHA20-POLY1305:" \ - "ECDHE-ECDSA-AES128-GCM-SHA256:" \ --- -2.30.2 - diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 98bd6e513b..e4fde4eb64 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz +sha256 512d4abfced0ec916d985d3d1eac7528e6676eecae6aca27fdaf313374e29f16 libuhttpd-3.14.1.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 3a99fe0613..b8cf935d01 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.12.1 +LIBUHTTPD_VERSION = 3.14.1 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Sat Jan 29 00:38:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 28 Jan 2022 17:38:57 -0700 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5webkit: fix build without opengl In-Reply-To: <20220116214955.3231899-2-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> <20220116214955.3231899-2-fontaine.fabrice@gmail.com> Message-ID: On Sun, Jan 16, 2022 at 2:51 PM Fabrice Fontaine wrote: > > Fix the following build failure without opengl raised since bump to > version 5.212.0-alpha4 in commit > df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > CMake Error at Source/cmake/OptionsQt.cmake:592 (message): > Qt with OpenGL support is required for ENABLE_OPENGL > > WebKit2 unconditionally depends on TextureMapperGL.h and tools builds > QtTestBrowser which unconditionally depends on QtOpenGL > > Fixes: > - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed > > Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard > --- > package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 3af1918a46..de3c428fbe 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > # in the archive. > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > > +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) > +QT5WEBKIT_CONF_OPTS += \ > + -DENABLE_OPENGL=ON \ > + -DENABLE_WEBKIT2=ON > +else > +QT5WEBKIT_CONF_OPTS += \ > + -DENABLE_OPENGL=OFF \ > + -DENABLE_WEBKIT2=OFF > +endif > + > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender > endif > @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative > endif > > QT5WEBKIT_CONF_OPTS += \ > + -DENABLE_TOOLS=OFF \ > -DPORT=Qt \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > -DUSE_LIBHYPHEN=OFF > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Sat Jan 29 07:08:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 29 Jan 2022 07:08:15 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-28 Message-ID: <20220129070821.7886340217@smtp2.osuosl.org> Hello, Autobuild statistics for 2022-01-28 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 56 | 3 | 0 | 59 | 2021.11.x | 24 | 3 | 0 | 27 | master | 95 | 43 | 0 | 138 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 8 efl-1.26.0 | 3 guile-3.0.7 | 3 pulseview-0.4.2 | 3 wavemon-0.9.4 | 3 xvisor-0.3.1 | 3 bluez5_utils-5.63 | 2 cryptsetup-2.4.2 | 2 frr-8.1 | 2 unknown | 2 apitrace-10.0 | 1 google-breakpad-7515ab13768... | 1 htpdate-1.3.3 | 1 libglvnd-1.3.2 | 1 log4cxx-0.12.0 | 1 mesa3d-21.3.4 | 1 mongrel2-1.13.0 | 1 qt5base-5.15.2 | 1 rabbitmq-server-3.8.2 | 1 sg3_utils-1.47 | 1 ulog-0389d243352255f6182326... | 1 xml-security-c-2.0.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | apitrace-10.0 | NOK | http://autobuild.buildroot.net/results/7306bf05962fec30fbe98b1eb8ee09b3162b8080 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/483e199d98055bfaed4bb39d86be43d2399d7e44 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/2be71a93e34ed4187d803878140da8ad408ee69b | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/6b634d116e474d250f6eead8c1851a4761753368 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/fba5a691df78bb168984b5cf59587ce8f3270b92 | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/d1b07a9da2572313b1cc5324460b3aea83802b25 | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/aca7ccd8ac96bade59a205c8a1a062cabdad531f | mipsel | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/4cbfb7180715f540b7e6486ab00ba00535726345 | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a66804073ad558869148ecbbeca23128658c336c | microblazeel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/b7de1d85ee966b5c3a8a038163b215a856cba6c0 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/3d0087f9d3be37963d471bcafbc1761464a7729a | riscv64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/a9beb47a528310541fc65e49d61123d16c450f6f | ORPH arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/c9634ecbe3462430a2a32d08dacf11d63813819c | ORPH powerpc64le | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/03352427b91e7955351f0887c36077d2ce55effc | ORPH sh4 | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 | arm | libglvnd-1.3.2 | NOK | http://autobuild.buildroot.net/results/673dd087f7b8b60668cd7f2d67bf758f2de8c3bf | ORPH sh4 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/41e47f76d7a86b25c9aff1d08beaeb39cb6c9e94 | arm | mesa3d-21.3.4 | NOK | http://autobuild.buildroot.net/results/3b2e30d147dbdb4d9e74bd534cad8bb7a28ca1c8 | mips64el | mongrel2-1.13.0 | NOK | http://autobuild.buildroot.net/results/80e167f6596aee56f1008f6bb286e3b326ceba89 | mips64el | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/83843238e18b44b1c0c1dedd9b8204e80d8ec8c2 | mips64el | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/7b2b2a07991d955581d8ec035b1d3d08dfc4c5e9 | powerpc | pulseview-0.4.2 | NOK | http://autobuild.buildroot.net/results/9004c1019011286aabda757c6a14ec725c398f4f | arm | qt5base-5.15.2 | NOK | http://autobuild.buildroot.net/results/c762350e8deb6499d3b636e8b9410dc315f188ca | riscv64 | rabbitmq-server-3.8.2 | NOK | http://autobuild.buildroot.net/results/cb5abfef8bb9516860c65bbdc1780f6c67561e87 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/d4e193480d9a1c009cd889ccd4610e8601ff1a37 | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/6601cb785519a9073bdd547f6a3b2d2a3f09aefe | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/eade1c03916e6d644ebc7b8a995a45af99d173f3 | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/784016ef58af2861a7085f2e53965f68823d50b1 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/17a24db93f74a31a455ebe3cc2d6aa0caa08d0a3 | riscv64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/2c9dd75b0da9a288ed33bc0c3d16021825649ad0 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/e3dd03bc02aeb8e1b0d9de6ffa153cdb36331114 | arc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/1ecbdcb953d96afe9d7efee78bfe395892435a57 | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/3517c60fcedd6b060a45255af79486a73cd2666f | powerpc64 | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/f5cbcd3f762d18e8321a0ba7cb34f21bc4ebfda2 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/01313be3272fe7f40db0395bd446366feaa01718 | arm | unknown | NOK | http://autobuild.buildroot.net/results/e1a586c437bf1ce8e32ca08e922fb87b4cfc1a69 | aarch64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/fee2aaa2f21cfa17ccf37852821d010015ad132b | mips64el | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/694a892b51530776f810a7b0afc51f4186164d2a | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/03bfb07db28214ad0edcbef140826a1c27d740f4 | arm | xml-security-c-2.0.4 | NOK | http://autobuild.buildroot.net/results/b6065efaa722f2da911c7cf150d446da621e8c71 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/c50b17a15dbaf05e18e3125ddd215296c79434ab | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/e6e2eb7fc6f378d49d61d3609b0a8c07d5ab5d50 | arm | xvisor-0.3.1 | NOK | http://autobuild.buildroot.net/results/42dfe2e445b020b6de8e8edcebe4358afcc3fb80 | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 1 python-pybind-2.6.1 | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/99fe839ac197ec7628c43b9d431595974de61d31 | aarch64 | python-pybind-2.6.1 | NOK | http://autobuild.buildroot.net/results/9bec461a1c7e35495a191bf28ca203625d67cebf | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/c71492a8e99131863482085166ecea749162d6d4 | Classification of failures by reason for 2021.11.x -------------------------------------------------- nodejs-14.18.2 | 1 openal-1.21.1 | 1 weston-9.0.0 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mipsel | nodejs-14.18.2 | NOK | http://autobuild.buildroot.net/results/1a828fcf92dd6dd3cfba396269825a258a24c3d0 | or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/c3cea7e7267d81c31c8a190137c3264f17872e33 | arm | weston-9.0.0 | NOK | http://autobuild.buildroot.net/results/f00b6197ba93e4581663be73ffb8903f62d81476 | Gitlab CI results for 2022-01-28 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478161 | andes_ae3xx | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478164 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478165 | arcturus_ucp1020 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478166 | arm_juno | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478168 | armadeus_apf27 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478170 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478175 | at91sam9g20dfc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478176 | at91sam9g45m10ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478177 | at91sam9rlek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478178 | at91sam9x5ek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478179 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478180 | at91sam9x5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478181 | at91sam9x5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478182 | atmel_sama5d27_som1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478183 | atmel_sama5d2_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478184 | atmel_sama5d2_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478185 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478186 | atmel_sama5d3_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478187 | atmel_sama5d3_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478188 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478189 | atmel_sama5d3xek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478190 | atmel_sama5d4_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478191 | atmel_sama5d4_xplained_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478192 | atmel_sama5d4_xplained_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478193 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478194 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478196 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478197 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478198 | bananapi_m2_ultra | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478199 | bananapi_m64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478201 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478202 | beagleboardx15 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478203 | beaglebone_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478205 | beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478207 | beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478210 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478213 | engicam_imx6qdl_icore | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478216 | engicam_imx6qdl_icore_qt5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478217 | engicam_imx6qdl_icore_rqs | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478219 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478220 | engicam_imx6ul_isiot | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478222 | freescale_imx6qsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478236 | freescale_imx6sxsabresd | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478238 | freescale_imx8mnevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478246 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478248 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478255 | freescale_t1040d4rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478256 | freescale_t2080_qds_rdb | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478258 | friendlyarm_nanopc_t4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478260 | friendlyarm_nanopi_a64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478262 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478264 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478266 | ORPH friendlyarm_nanopi_m4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478268 | friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478274 | friendlyarm_nanopi_neo2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478270 | friendlyarm_nanopi_neo4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478273 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478276 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478278 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478280 | imx23evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478287 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478298 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478299 | lego_ev3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478304 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478305 | microchip_sam9x60ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478307 | microchip_sam9x60ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478309 | microchip_sama5d27_wlsom1_ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478310 | ...hip_sama5d27_wlsom1_ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478311 | microchip_sama5d2_icp_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478312 | microchip_sama5d2_icp_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478314 | microchip_sama7g5ek_mmc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478315 | microchip_sama7g5ek_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478316 | mx25pdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478319 | odroidxu4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478335 | olimex_imx233_olinuxino | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478343 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478353 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478358 | orangepi_pc2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478359 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478362 | ORPH orangepi_prime | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478363 | orangepi_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478366 | orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478368 | orangepi_zero_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371 | pc_x86_64_bios | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478374 | pcengines_apu2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478376 | pine64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478377 | pine64_sopine | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478378 | qemu_ppc64_pseries | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478400 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478427 | riotboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478438 | roc_pc_rk3399 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478440 | rock_pi_4 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478443 | rock_pi_n10 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478444 | rock_pi_n8 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478445 | rockpro64 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478446 | s6lx9_microboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478448 | snps_aarch64_vdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478450 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478451 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478452 | snps_archs38_hsdk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478457 | socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478460 | solidrun_clearfog | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478461 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478478 | ts4900 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478480 | ts7680 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478482 | warpboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478491 | zynq_microzed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478492 | zynq_qmtech | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478493 | zynq_zc706 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478494 | zynq_zed | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478495 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478496 | -- http://autobuild.buildroot.net From peter at korsgaard.com Sat Jan 29 08:30:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 09:30:18 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/polkit: enable selinux policykit module for refpolicy Message-ID: <20220129082339.87A88826DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9a07a5887b422c9459bb6e80770c8a5d6c8514c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This is needed for polkit to work with SELinux. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b89163a067f6fd7d555e102ccbbe389a6dddc52d) Signed-off-by: Peter Korsgaard --- package/polkit/polkit.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index a8b91d21bc..a7ab725c81 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -14,6 +14,8 @@ POLKIT_INSTALL_STAGING = YES POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) +POLKIT_SELINUX_MODULES = policykit + POLKIT_LDFLAGS = $(TARGET_NLS_LIBS) POLKIT_CONF_OPTS = \ From peter at korsgaard.com Sat Jan 29 08:30:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 09:30:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/polkit: bump to version 0.120 Message-ID: <20220129082339.7CED1818AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b6623e47899e788b7e72dda64d3c4ff479fcfe7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Drop upstreamed patches - change the location of polkit.its and polkit.loc to match their new locations. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 079528bb9c887b393ade82032761d0bef867313b) Signed-off-by: Peter Korsgaard --- .../0002-Improve-meson_post_install-script.patch | 124 --------------------- ...undant-computation-of-dbus-data-directory.patch | 35 ------ ...uild-Don-t-require-dbus-development-files.patch | 42 ------- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 6 +- 5 files changed, 4 insertions(+), 205 deletions(-) diff --git a/package/polkit/0002-Improve-meson_post_install-script.patch b/package/polkit/0002-Improve-meson_post_install-script.patch deleted file mode 100644 index 932bf88f59..0000000000 --- a/package/polkit/0002-Improve-meson_post_install-script.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 6c8022392713955c5ae0061e22b50a16a1c2252a Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 15 Jul 2021 12:36:05 +0000 -Subject: [PATCH] Improve meson_post_install script - -[Retrieved from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/6c8022392713955c5ae0061e22b50a16a1c2252a] -Signed-off-by: Fabrice Fontaine ---- - .gitlab-ci.yml | 3 +-- - meson_post_install.py | 58 +++++++++++++++++++++++++++++++++++-------- - 2 files changed, 49 insertions(+), 12 deletions(-) - -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index 8ac3e9f..6d0abb4 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -26,8 +26,6 @@ build_stable: - before_script: - - dnf upgrade -y --nogpgcheck fedora-release fedora-repos* - - dnf update -y && dnf install -y $DEPENDENCIES -- - getent group polkitd >/dev/null || groupadd -r polkitd -- - getent passwd polkitd >/dev/null || useradd -r -g polkitd -d / -s /sbin/nologin -c "User for polkitd" polkitd - - script: - - meson setup -@@ -43,6 +41,7 @@ build_stable: - - meson compile -C builddir - - meson test -C builddir - - meson install -C builddir -+ - DESTDIR=$(pwd)/DESTDIR meson install -C builddir - artifacts: - name: 'test logs' - when: 'always' -diff --git a/meson_post_install.py b/meson_post_install.py -index 0a0fccf..0ab7469 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -1,20 +1,44 @@ - #!/usr/bin/env python3 - --import getpass - import os - import pwd - import sys - -+destdir = os.environ.get('DESTDIR') - prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX'] - --bindir = os.path.join(prefix, sys.argv[1]) --pkgdatadir = os.path.join(prefix, sys.argv[2]) --pkglibdir = os.path.join(prefix, sys.argv[3]) --pkgsysconfdir = os.path.join(prefix, sys.argv[4]) -+def destdir_path(p): -+ if os.path.isabs(p): -+ if destdir is None: -+ return p -+ else: -+ return os.path.join(destdir, os.path.relpath(p, '/')) -+ else: -+ return os.path.join(prefix, p) - --polkitd_uid = pwd.getpwnam(sys.argv[5]).pw_uid -+bindir = destdir_path(sys.argv[1]) -+pkgdatadir = destdir_path(sys.argv[2]) -+pkglibdir = destdir_path(sys.argv[3]) -+pkgsysconfdir = destdir_path(sys.argv[4]) -+polkitd_user = sys.argv[5] - --os.chmod(os.path.join(bindir, 'pkexec'), 0o4775) -+try: -+ polkitd_uid = pwd.getpwnam(polkitd_user).pw_uid -+except KeyError: -+ polkitd_uid = None -+ -+dst = os.path.join(bindir, 'pkexec') -+ -+if os.geteuid() == 0: -+ os.chmod(dst, 0o4755) -+ os.chown(dst, 0, -1) -+else: -+ print( -+ 'Owner and mode of {} need to be setuid root (04755) after ' -+ 'installation'.format( -+ dst, -+ ) -+ ) - - dst_dirs = [ - os.path.join(pkgsysconfdir, 'rules.d'), -@@ -24,13 +48,27 @@ dst_dirs = [ - for dst in dst_dirs: - if not os.path.exists(dst): - os.makedirs(dst, mode=0o700) -- if getpass.getuser() == "root": -+ if os.geteuid() == 0 and polkitd_uid is not None: - os.chown(dst, polkitd_uid, -1) -+ else: -+ print( -+ 'Owner of {} needs to be set to {} after installation'.format( -+ dst, polkitd_user, -+ ) -+ ) - - # polkit-agent-helper-1 need to be setuid root because it's used to - # authenticate not only the invoking user, but possibly also root - # and/or other users. - dst = os.path.join(pkglibdir, 'polkit-agent-helper-1') --os.chmod(dst, 0o4755) --if getpass.getuser() == "root": -+ -+if os.geteuid() == 0: -+ os.chmod(dst, 0o4755) - os.chown(dst, 0, -1) -+else: -+ print( -+ 'Owner and mode of {} need to be setuid root (04755) after ' -+ 'installation'.format( -+ dst, -+ ) -+ ) --- -GitLab - diff --git a/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch b/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch deleted file mode 100644 index 7fce2e10a5..0000000000 --- a/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9fa097f4dde92a0c1675400228b4cb965ed3e123 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 3 Jun 2021 18:55:29 +0100 -Subject: [PATCH] build: Remove redundant computation of dbus data directory - -We were asking pkg-config "if I define ${datadir} to pk_prefix/pk_datadir, -what would ${datadir} be?" but the answer is obviously always going to be -pk_prefix/pk_datadir. - -Signed-off-by: Simon McVittie - -[Retrieved (and slightly updated for duktape fork) from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/9fa097f4dde92a0c1675400228b4cb965ed3e123] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 6a6799e..03a7683 100644 ---- a/meson.build -+++ b/meson.build -@@ -136,8 +136,7 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin - endif - - dbus_dep = dependency('dbus-1') --dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838 --dbus_policydir = dbus_confdir / 'dbus-1/system.d' -+dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' - dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) - - # check OS --- -GitLab - diff --git a/package/polkit/0004-build-Don-t-require-dbus-development-files.patch b/package/polkit/0004-build-Don-t-require-dbus-development-files.patch deleted file mode 100644 index 1b7adbf67f..0000000000 --- a/package/polkit/0004-build-Don-t-require-dbus-development-files.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4bb2157adae620c8b07caf5a24b177d1f90f2fbb Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 3 Jun 2021 18:57:00 +0100 -Subject: [PATCH] build: Don't require dbus development files - -We don't actually need libdbus, only the dbus-daemon's installation -directory for system services, which in practice is always going to be -/usr/share/dbus-1/system-services. - -Signed-off-by: Simon McVittie - -[Retrieved (and slightly updated for duktape fork) from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/4bb2157adae620c8b07caf5a24b177d1f90f2fbb] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 03a7683..539ec7a 100644 ---- a/meson.build -+++ b/meson.build -@@ -135,9 +135,14 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin - js_dep = dependency('mozjs-78') - endif - --dbus_dep = dependency('dbus-1') -+dbus_dep = dependency('dbus-1', required: false) - dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' --dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) -+if dbus_dep.found() -+ dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) -+else -+ # libdbus development files not installed, assume a standard layout -+ dbus_system_bus_services_dir = pk_prefix / pk_datadir / 'dbus-1' / 'system-services' -+endif - - # check OS - host_system = host_machine.system() --- -GitLab - diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index 9677e19bb0..f108ac19ec 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 88d078f1d1f653fd31fe42e46cc3d9b7dd468e70684075e32fe1766dc7ece517 polkit-0.119.tar.gz +sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index ed6f1a5a8f..a8b91d21bc 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -POLKIT_VERSION = 0.119 +POLKIT_VERSION = 0.120 POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING @@ -39,9 +39,9 @@ endif # polkit.{its,loc} are needed for gvfs and must be installed in $(HOST_DIR) # and not $(STAGING_DIR) define POLKIT_INSTALL_ITS - $(INSTALL) -D -m 644 $(@D)/data/polkit.its \ + $(INSTALL) -D -m 644 $(@D)/gettext/its/polkit.its \ $(HOST_DIR)/share/gettext/its/polkit.its - $(INSTALL) -D -m 644 $(@D)/data/polkit.loc \ + $(INSTALL) -D -m 644 $(@D)/gettext/its/polkit.loc \ $(HOST_DIR)/share/gettext/its/polkit.loc endef POLKIT_POST_INSTALL_TARGET_HOOKS += POLKIT_INSTALL_ITS From peter at korsgaard.com Sat Jan 29 08:30:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 09:30:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/polkit: bump to fix CVE-2021-4034 Message-ID: <20220129082339.917AD82707@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1e6c004d0707a3c024356cad0bfc820da9a5ebf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x We are currently using the fork by Adam, with support for duktape as a JS engine. But upstream has finally merged that just a day ago. Woohoo! Between the fork we were using and upstream, there are very little changes, mostly centered around: - translations - buildsystem - duktape - CVE-2021-4034 So, we just switch to using the HEAD of the repo: it has not much more than the two important changes: duktape and the CVE fix. Signed-off-by: Yann E. MORIN Cc: Marek Belisko Cc: Adam Duskett Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4aecb964aff92e5cc956b2d3b700ac7841041463) Signed-off-by: Peter Korsgaard --- package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index f108ac19ec..1fedb5a707 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz +sha256 243fa69d1e480510c504723487716cda7d6fb588360c7c8f7ec6ba4a3f6ae60e polkit-a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index a7ab725c81..61666594a2 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,13 +4,16 @@ # ################################################################################ -POLKIT_VERSION = 0.120 -POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) +POLKIT_VERSION = a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_INSTALL_STAGING = YES +# Fix was comitted in a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_IGNORE_CVE = CVE-2021-4034 + POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) From peter at korsgaard.com Sat Jan 29 08:31:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 09:31:24 +0100 Subject: [Buildroot] [PATCH] package/polkit: bump to fix CVE-2021-4034 In-Reply-To: <20220126202236.1399934-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 26 Jan 2022 21:22:36 +0100") References: <20220126202236.1399934-1-yann.morin.1998@free.fr> Message-ID: <87k0ej2bab.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > We are currently using the fork by Adam, with support for duktape as a > JS engine. But upstream has finally merged that just a day ago. Woohoo! > Between the fork we were using and upstream, there are very little > changes, mostly centered around: > - translations > - buildsystem > - duktape > - CVE-2021-4034 > So, we just switch to using the HEAD of the repo: it has not much more > than the two important changes: duktape and the CVE fix. > Signed-off-by: Yann E. MORIN > Cc: Marek Belisko > Cc: Adam Duskett > Cc: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Jan 29 09:42:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 10:42:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo: fix debug build Message-ID: <20220129094222.3583303-1-fontaine.fabrice@gmail.com> There is no --debug mode for cargo resulting in the following build failure in ripgrep since its conversion to cargo infrastructure in commit 342fd3e7350479dc368541ac77a5130ebb53194c: error: Found argument '--debug' which wasn't expected, or isn't valid in this context Fixes: - http://autobuild.buildroot.org/results/772ebdd6a39950457a59419bdc1376cb0e0a3611 Signed-off-by: Fabrice Fontaine --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 614d46ad64..e74a8358bc 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -104,7 +104,7 @@ define $(2)_BUILD_CMDS $$($(2)_CARGO_ENV) \ cargo build \ --offline \ - $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ + $$(if $$(BR2_ENABLE_DEBUG),,--release) \ --manifest-path Cargo.toml \ --locked \ $$($(2)_CARGO_BUILD_OPTS) -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 29 10:44:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 11:44:25 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/htpdate: fix static openssl build Message-ID: <20220129104425.3724653-1-fontaine.fabrice@gmail.com> Fix the following static build failure with openssl raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(rec_layer_d1.o): in function `DTLS_RECORD_LAYER_new': rec_layer_d1.c:(.text+0x124): undefined reference to `CRYPTO_malloc' Fixes: - http://autobuild.buildroot.org/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Move pkg-config call in htpdate.mk following upstream feedback: https://github.com/twekkel/htpdate/pull/17 ...BS-to-be-configured-from-environment.patch | 37 +++++++++++++++++++ package/htpdate/htpdate.mk | 4 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch diff --git a/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch new file mode 100644 index 0000000000..6dca2babab --- /dev/null +++ b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch @@ -0,0 +1,37 @@ +From 4ba90fedd553c3b06c925fb6ff5245a5dcabace9 Mon Sep 17 00:00:00 2001 +From: Eddy Vervest +Date: Sat, 29 Jan 2022 10:58:13 +0100 +Subject: [PATCH] Allow SSL_LIBS to be configured from environment + +[Retrieved from: +https://github.com/twekkel/htpdate/commit/4ba90fedd553c3b06c925fb6ff5245a5dcabace9] +Signed-off-by: Fabrice Fontaine +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 4796efa..cf077e6 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,8 +2,9 @@ prefix = $(DESTDIR)/usr + bindir = ${prefix}/sbin + mandir = ${prefix}/share/man + +-CC ?= gcc +-CFLAGS += -Wall -std=c11 -pedantic -O2 ++CC ?= gcc ++CFLAGS += -Wall -std=c11 -pedantic -O2 ++SSL_LIBS ?= -lssl + + INSTALL ?= install -c + STRIP ?= strip -s +@@ -14,7 +15,7 @@ htpdate: htpdate.c + $(CC) $(CFLAGS) -o htpdate htpdate.c + + https: htpdate.c +- $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c -lssl ++ $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c $(SSL_LIBS) + + install: all + $(STRIP) htpdate diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 54b3ec2569..e32480fc85 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -10,7 +10,9 @@ HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = https +HTPDATE_BUILD_OPTS = \ + https \ + SSL_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" HTPDATE_DEPENDENCIES += openssl host-pkgconf endif -- 2.34.1 From peron.clem at gmail.com Sat Jan 29 11:03:49 2022 From: peron.clem at gmail.com (=?UTF-8?B?Q2zDqW1lbnQgUMOpcm9u?=) Date: Sat, 29 Jan 2022 12:03:49 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Your daily results for 2022-01-28 In-Reply-To: <61f4e7d9.1c69fb81.722e5.a0feSMTPIN_ADDED_MISSING@mx.google.com> References: <61f4e7d9.1c69fb81.722e5.a0feSMTPIN_ADDED_MISSING@mx.google.com> Message-ID: Hello Thomas, On Sat, 29 Jan 2022 at 08:08, Thomas Petazzoni wrote: > > Hello, > > Gitlab CI failures > ================== > > Below is a list of Gitlab CI job failures in relation to defconfigs or > runtime tests you are in charge of. Please help us improving the quality > of Buildroot by investigating those build failures and sending patches > to fix them. > > Results for 'master' > -------------------- > > Build failures related to your defconfigs: > > defconfig | link to the job > ----------------------------------+-------------------------------------------------------------- > beelink_gs1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 > > > > Thanks for your contribution to Buildroot! Not related to the content of the email but it seems that since June 2020 the mail format has changed. Before I received email with the To recipient defined like this: To: "Cl?ment P?ron" Now it has been changed to: To: "Cl?ment P?ron " I use GMail as a mail client and the To is no longer properly parsed. See attached original mail and picture attached (If attachment are allowed) Thanks, Clement > > > -- > http://autobuild.buildroot.net -------------- next part -------------- An embedded message was scrubbed... From: Thomas Petazzoni Subject: [autobuild.buildroot.net] Your daily results for 2022-01-28 Date: Sat, 29 Jan 2022 07:08:09 -0000 Size: 4673 URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: mail_parsed_issue.png Type: image/png Size: 16156 bytes Desc: not available URL: From fontaine.fabrice at gmail.com Sat Jan 29 11:07:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 12:07:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix static build with openipmi Message-ID: <20220129110734.3737599-1-fontaine.fabrice@gmail.com> Fix the following static build failure with openipmi raised since commit 8f6b346a34bdb344c4a001d8bd66f5e973013c17: /home/peko/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/libfreeipmi.a(libfreeipmi_la-ipmi-md5.o): in function `md5_init': ipmi-md5.c:(.text+0xa7c): multiple definition of `md5_init'; ../lib/.libs/libipmitool.a(md5.o):md5.c:(.text+0xab0): first defined here Fixes: - http://autobuild.buildroot.org/results/01b22faf08a798ecc5d5465e1c0c13fa024f1096 Signed-off-by: Fabrice Fontaine --- ...-rename-md2-and-md5-functions-macros.patch | 695 ++++++++++++++++++ 1 file changed, 695 insertions(+) create mode 100644 package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch diff --git a/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch new file mode 100644 index 0000000000..0de5b29c9c --- /dev/null +++ b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch @@ -0,0 +1,695 @@ +From 50eeda7f14c4eaa56aa86ba570a47557456544f2 Mon Sep 17 00:00:00 2001 +From: Albert Chu +Date: Wed, 19 Jan 2022 11:55:55 -0800 +Subject: [PATCH] libfreeipmi: rename md2 and md5 functions / macros + +Static compilation with libfreeipmi can lead to problems if +other software has similarly named md2/md5 functions +(such as md5_init()). Prefix all macros and functions with +'ipmi_' as needed. Update all callers accordingly. + +[Retrieved from: +https://github.com/chu11/freeipmi-mirror/commit/50eeda7f14c4eaa56aa86ba570a47557456544f2] +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 11 ++ + libfreeipmi/interface/ipmi-lan-interface.c | 48 +++---- + .../interface/ipmi-rmcpplus-interface.c | 2 +- + libfreeipmi/libcommon/ipmi-md2.c | 72 +++++------ + libfreeipmi/libcommon/ipmi-md2.h | 30 ++--- + libfreeipmi/libcommon/ipmi-md5.c | 64 +++++----- + libfreeipmi/libcommon/ipmi-md5.h | 18 +-- + libfreeipmi/util/ipmi-lan-util.c | 120 +++++++++--------- + 8 files changed, 188 insertions(+), 177 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 883a195cf..60bf8c323 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,14 @@ ++2021-01-19 Albert Chu ++ ++ * libfreeipmi/libcommon/ipmi-md2.h, ++ libfreeipmi/libcommon/ipmi-md2.c, ++ libfreeipmi/libcommon/ipmi-md5.h, ++ libfreeipmi/libcommon/ipmi-md5.c: Static compilation with ++ libfreeipmi can lead to problems if other software has similarly ++ named md2/md5 functions (such as md5_init()). Prefix all macros ++ and functions with 'ipmi_' as needed. Update all callers ++ accordingly. ++ + 2022-01-18 Fabrice Fontaine + + * configure.ac: use pkg-config to find gcrypt +diff --git a/libfreeipmi/interface/ipmi-lan-interface.c b/libfreeipmi/interface/ipmi-lan-interface.c +index 20099d770..658be53e1 100644 +--- a/libfreeipmi/interface/ipmi-lan-interface.c ++++ b/libfreeipmi/interface/ipmi-lan-interface.c +@@ -533,37 +533,37 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_rmcp_hdr, + + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- uint8_t digest[MD2_DIGEST_LENGTH]; ++ ipmi_md2_t ctx; ++ uint8_t digest[IPMI_MD2_DIGEST_LENGTH]; + +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); + +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, session_id_buf, session_id_len); +- md2_update_data (&ctx, msg_data_ptr, msg_data_count); +- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, digest, MD2_DIGEST_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md2_update_data (&ctx, msg_data_ptr, msg_data_count); ++ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, digest, IPMI_MD2_DIGEST_LENGTH); ++ ipmi_md2_init (&ctx); + + memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- uint8_t digest[MD5_DIGEST_LENGTH]; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, session_id_buf, session_id_len); +- md5_update_data (&ctx, msg_data_ptr, msg_data_count); +- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, digest, MD5_DIGEST_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ uint8_t digest[IPMI_MD5_DIGEST_LENGTH]; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md5_update_data (&ctx, msg_data_ptr, msg_data_count); ++ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, digest, IPMI_MD5_DIGEST_LENGTH); ++ ipmi_md5_init (&ctx); + + memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); + } +diff --git a/libfreeipmi/interface/ipmi-rmcpplus-interface.c b/libfreeipmi/interface/ipmi-rmcpplus-interface.c +index 1f462da7e..d1fd0753a 100644 +--- a/libfreeipmi/interface/ipmi-rmcpplus-interface.c ++++ b/libfreeipmi/interface/ipmi-rmcpplus-interface.c +@@ -1134,7 +1134,7 @@ _construct_session_trlr_authentication_code (uint8_t integrity_algorithm, + { + hash_algorithm = IPMI_CRYPT_HASH_MD5; + hash_flags = 0; +- expected_digest_len = MD5_DIGEST_LENGTH; ++ expected_digest_len = IPMI_MD5_DIGEST_LENGTH; + copy_digest_len = IPMI_MD5_128_AUTHENTICATION_CODE_LENGTH; + } + else /* IPMI_INTEGRITY_ALGORITHM_HMAC_SHA256_128 */ +diff --git a/libfreeipmi/libcommon/ipmi-md2.c b/libfreeipmi/libcommon/ipmi-md2.c +index 6e9386be7..076b555bd 100644 +--- a/libfreeipmi/libcommon/ipmi-md2.c ++++ b/libfreeipmi/libcommon/ipmi-md2.c +@@ -101,15 +101,15 @@ static unsigned char S[256] = + 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14 + }; + +-#define L ctx->l +-#define X ctx->x +-#define C ctx->c +-#define M ctx->m +-#define Mlen ctx->mlen +-#define MD2_MAGIC 0xf00fd00d ++#define L ctx->l ++#define X ctx->x ++#define C ctx->c ++#define M ctx->m ++#define Mlen ctx->mlen ++#define IPMI_MD2_MAGIC 0xf00fd00d + + int +-md2_init (md2_t *ctx) ++ipmi_md2_init (ipmi_md2_t *ctx) + { + + if (ctx == NULL) +@@ -118,26 +118,26 @@ md2_init (md2_t *ctx) + return (-1); + } + +- ctx->magic = MD2_MAGIC; ++ ctx->magic = IPMI_MD2_MAGIC; + + L = 0; + Mlen = 0; +- memset (X, '\0', MD2_BUFFER_LENGTH); +- memset (C, '\0', MD2_CHKSUM_LENGTH); +- memset (M, '\0', MD2_BLOCK_LENGTH); ++ memset (X, '\0', IPMI_MD2_BUFFER_LENGTH); ++ memset (C, '\0', IPMI_MD2_CHKSUM_LENGTH); ++ memset (M, '\0', IPMI_MD2_BLOCK_LENGTH); + + return (0); + } + + static void +-_md2_update_digest_and_checksum (md2_t *ctx) ++_ipmi_md2_update_digest_and_checksum (ipmi_md2_t *ctx) + { + unsigned int j, k; + uint8_t c, t; + + /* Update X */ + +- for (j = 0; j < MD2_BLOCK_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) + { + X[16+j] = M[j]; + X[32+j] = (X[16+j] ^ X[j]); +@@ -145,9 +145,9 @@ _md2_update_digest_and_checksum (md2_t *ctx) + + t = 0; + +- for (j = 0; j < MD2_ROUNDS_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_ROUNDS_LENGTH; j++) + { +- for (k = 0; k < MD2_BUFFER_LENGTH; k++) ++ for (k = 0; k < IPMI_MD2_BUFFER_LENGTH; k++) + { + t = X[k] = (X[k] ^ S[t]); + } +@@ -166,7 +166,7 @@ _md2_update_digest_and_checksum (md2_t *ctx) + * Set C[j] to C[j] xor S[c xor L]. + */ + +- for (j = 0; j < MD2_BLOCK_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) + { + c = M[j]; + C[j] = C[j] ^ S[c ^ L]; +@@ -175,10 +175,10 @@ _md2_update_digest_and_checksum (md2_t *ctx) + } + + int +-md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) ++ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen) + { + +- if (ctx == NULL || ctx->magic != MD2_MAGIC || buf == NULL) ++ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC || buf == NULL) + { + errno = EINVAL; + return (-1); +@@ -187,19 +187,19 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) + if (buflen == 0) + return (0); + +- if ((Mlen + buflen) >= MD2_BLOCK_LENGTH) ++ if ((Mlen + buflen) >= IPMI_MD2_BLOCK_LENGTH) + { + unsigned int bufcount; + +- bufcount = (MD2_BLOCK_LENGTH - Mlen); ++ bufcount = (IPMI_MD2_BLOCK_LENGTH - Mlen); + memcpy (M + Mlen, buf, bufcount); +- _md2_update_digest_and_checksum (ctx); ++ _ipmi_md2_update_digest_and_checksum (ctx); + +- while ((buflen - bufcount) >= MD2_BLOCK_LENGTH) ++ while ((buflen - bufcount) >= IPMI_MD2_BLOCK_LENGTH) + { +- memcpy (M, buf + bufcount, MD2_BLOCK_LENGTH); +- bufcount += MD2_BLOCK_LENGTH; +- _md2_update_digest_and_checksum (ctx); ++ memcpy (M, buf + bufcount, IPMI_MD2_BLOCK_LENGTH); ++ bufcount += IPMI_MD2_BLOCK_LENGTH; ++ _ipmi_md2_update_digest_and_checksum (ctx); + } + + Mlen = buflen - bufcount; +@@ -217,33 +217,33 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) + } + + static void +-_md2_append_padding_and_checksum (md2_t *ctx) ++_ipmi_md2_append_padding_and_checksum (ipmi_md2_t *ctx) + { + unsigned int padlen; + int padindex; + +- padlen = MD2_PADDING_LENGTH - Mlen; ++ padlen = IPMI_MD2_PADDING_LENGTH - Mlen; + padindex = padlen - 1; + +- md2_update_data (ctx, padding[padindex], padlen); ++ ipmi_md2_update_data (ctx, padding[padindex], padlen); + +- md2_update_data (ctx, C, MD2_CHKSUM_LENGTH); ++ ipmi_md2_update_data (ctx, C, IPMI_MD2_CHKSUM_LENGTH); + } + + int +-md2_finish (md2_t *ctx, void *digest, unsigned int digestlen) ++ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen) + { +- if (ctx == NULL || ctx->magic != MD2_MAGIC +- || digest == NULL || digestlen < MD2_DIGEST_LENGTH) ++ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC ++ || digest == NULL || digestlen < IPMI_MD2_DIGEST_LENGTH) + { + errno = EINVAL; + return (-1); + } + +- _md2_append_padding_and_checksum (ctx); +- memcpy (digest, X, MD2_DIGEST_LENGTH); ++ _ipmi_md2_append_padding_and_checksum (ctx); ++ memcpy (digest, X, IPMI_MD2_DIGEST_LENGTH); + +- ctx->magic = ~MD2_MAGIC; +- return (MD2_DIGEST_LENGTH); ++ ctx->magic = ~IPMI_MD2_MAGIC; ++ return (IPMI_MD2_DIGEST_LENGTH); + } + +diff --git a/libfreeipmi/libcommon/ipmi-md2.h b/libfreeipmi/libcommon/ipmi-md2.h +index c102fce2c..05328e85e 100644 +--- a/libfreeipmi/libcommon/ipmi-md2.h ++++ b/libfreeipmi/libcommon/ipmi-md2.h +@@ -34,26 +34,26 @@ + + #include + +-#define MD2_BLOCK_LENGTH 16 +-#define MD2_BUFFER_LENGTH 48 +-#define MD2_CHKSUM_LENGTH 16 +-#define MD2_DIGEST_LENGTH 16 +-#define MD2_PADDING_LENGTH 16 +-#define MD2_ROUNDS_LENGTH 18 +- +-typedef struct __md2 { ++#define IPMI_MD2_BLOCK_LENGTH 16 ++#define IPMI_MD2_BUFFER_LENGTH 48 ++#define IPMI_MD2_CHKSUM_LENGTH 16 ++#define IPMI_MD2_DIGEST_LENGTH 16 ++#define IPMI_MD2_PADDING_LENGTH 16 ++#define IPMI_MD2_ROUNDS_LENGTH 18 ++ ++typedef struct __ipmi_md2 { + uint32_t magic; + uint8_t l; + unsigned int mlen; +- uint8_t x[MD2_BUFFER_LENGTH]; +- uint8_t c[MD2_CHKSUM_LENGTH]; +- uint8_t m[MD2_BLOCK_LENGTH]; +-} md2_t; ++ uint8_t x[IPMI_MD2_BUFFER_LENGTH]; ++ uint8_t c[IPMI_MD2_CHKSUM_LENGTH]; ++ uint8_t m[IPMI_MD2_BLOCK_LENGTH]; ++} ipmi_md2_t; + +-int md2_init (md2_t *ctx); ++int ipmi_md2_init (ipmi_md2_t *ctx); + +-int md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen); ++int ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen); + +-int md2_finish (md2_t *ctx, void *digest, unsigned int digestlen); ++int ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen); + + #endif /* IPMI_MD2_H */ +diff --git a/libfreeipmi/libcommon/ipmi-md5.c b/libfreeipmi/libcommon/ipmi-md5.c +index 17073b85f..c84e350a6 100644 +--- a/libfreeipmi/libcommon/ipmi-md5.c ++++ b/libfreeipmi/libcommon/ipmi-md5.c +@@ -92,7 +92,7 @@ static uint32_t T[64] = + #define D ctx->d + #define M ctx->m + #define Mlen ctx->mlen +-#define MD5_MAGIC 0xfb0fdb0d ++#define IPMI_MD5_MAGIC 0xfb0fdb0d + + #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) + #define G(x,y,z) (((x) & (z)) | ((y) & (~(z)))) +@@ -126,7 +126,7 @@ static uint32_t T[64] = + } while (0) + + int +-md5_init (md5_t *ctx) ++ipmi_md5_init (ipmi_md5_t *ctx) + { + if (ctx == NULL) + { +@@ -134,13 +134,13 @@ md5_init (md5_t *ctx) + return (-1); + } + +- ctx->magic = MD5_MAGIC; ++ ctx->magic = IPMI_MD5_MAGIC; + + Mlen = 0; + ctx->bytes_mod_64 = 0; + ctx->bit_count[0] = 0; + ctx->bit_count[1] = 0; +- memset (M, '\0', MD5_BLOCK_LENGTH); ++ memset (M, '\0', IPMI_MD5_BLOCK_LENGTH); + + /* initial values are listed low-order byte first */ + A = 0x67452301; +@@ -152,16 +152,16 @@ md5_init (md5_t *ctx) + } + + static void +-_md5_update_digest (md5_t *ctx) ++_ipmi_md5_update_digest (ipmi_md5_t *ctx) + { + uint32_t AA, BB, CC, DD; +- uint32_t X[MD5_BLOCK_WORDS_LENGTH]; ++ uint32_t X[IPMI_MD5_BLOCK_WORDS_LENGTH]; + unsigned int j; + + /* Note there are no endian issues here, compiler is required to + * handle shifts correctly + */ +- for (j = 0; j < MD5_BLOCK_WORDS_LENGTH; j++) ++ for (j = 0; j < IPMI_MD5_BLOCK_WORDS_LENGTH; j++) + X[j] = ((uint32_t)M[j*4] + | ((uint32_t)M[j*4+1] << 8) + | ((uint32_t)M[j*4+2] << 16) +@@ -251,7 +251,7 @@ _md5_update_digest (md5_t *ctx) + } + + static void +-_md5_update_count (md5_t *ctx, unsigned int buflen) ++_ipmi_md5_update_count (ipmi_md5_t *ctx, unsigned int buflen) + { + + /* Use two uint32_t integers to hold our 64 bit count. +@@ -272,10 +272,10 @@ _md5_update_count (md5_t *ctx, unsigned int buflen) + } + + int +-md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) ++ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen) + { + +- if (ctx == NULL || ctx->magic != MD5_MAGIC || buf == NULL) ++ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC || buf == NULL) + { + errno = EINVAL; + return (-1); +@@ -284,28 +284,28 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) + if (buflen == 0) + return (0); + +- if ((Mlen + buflen) >= MD5_BLOCK_LENGTH) ++ if ((Mlen + buflen) >= IPMI_MD5_BLOCK_LENGTH) + { + unsigned int bufcount; + +- bufcount = (MD5_BLOCK_LENGTH - Mlen); ++ bufcount = (IPMI_MD5_BLOCK_LENGTH - Mlen); + memcpy (M + Mlen, buf, bufcount); +- _md5_update_digest (ctx); +- _md5_update_count (ctx, bufcount); ++ _ipmi_md5_update_digest (ctx); ++ _ipmi_md5_update_count (ctx, bufcount); + +- while ((buflen - bufcount) >= MD5_BLOCK_LENGTH) ++ while ((buflen - bufcount) >= IPMI_MD5_BLOCK_LENGTH) + { +- memcpy (M, buf + bufcount, MD5_BLOCK_LENGTH); +- bufcount += MD5_BLOCK_LENGTH; +- _md5_update_digest (ctx); +- _md5_update_count (ctx, MD5_BLOCK_LENGTH); ++ memcpy (M, buf + bufcount, IPMI_MD5_BLOCK_LENGTH); ++ bufcount += IPMI_MD5_BLOCK_LENGTH; ++ _ipmi_md5_update_digest (ctx); ++ _ipmi_md5_update_count (ctx, IPMI_MD5_BLOCK_LENGTH); + } + + Mlen = buflen - bufcount; + if (Mlen > 0) + { + memcpy (M, buf + bufcount, Mlen); +- _md5_update_count (ctx, Mlen); ++ _ipmi_md5_update_count (ctx, Mlen); + } + } + else +@@ -313,14 +313,14 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) + /* Not enough data to update digest, just copy in data */ + memcpy (M + Mlen, buf, buflen); + Mlen += buflen; +- _md5_update_count (ctx, buflen); ++ _ipmi_md5_update_count (ctx, buflen); + } + + return (buflen); + } + + static void +-_md5_append_padding_and_length (md5_t *ctx) ++_ipmi_md5_append_padding_and_length (ipmi_md5_t *ctx) + { + unsigned int padlen; + char length[8]; +@@ -348,23 +348,23 @@ _md5_append_padding_and_length (md5_t *ctx) + length[6] = (ctx->bit_count[0] & 0x00ff0000) >> 16; + length[7] = (ctx->bit_count[0] & 0xff000000) >> 24; + +- md5_update_data (ctx, padding, padlen); +- md5_update_data (ctx, length, 8); ++ ipmi_md5_update_data (ctx, padding, padlen); ++ ipmi_md5_update_data (ctx, length, 8); + } + + int +-md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) ++ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen) + { +- uint8_t buf[MD5_DIGEST_LENGTH]; ++ uint8_t buf[IPMI_MD5_DIGEST_LENGTH]; + +- if (ctx == NULL || ctx->magic != MD5_MAGIC +- || digest == NULL || digestlen < MD5_DIGEST_LENGTH) ++ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC ++ || digest == NULL || digestlen < IPMI_MD5_DIGEST_LENGTH) + { + errno = EINVAL; + return (-1); + } + +- _md5_append_padding_and_length (ctx); ++ _ipmi_md5_append_padding_and_length (ctx); + + /* Note there are no endian issues here, compiler is required to + * handle bitmasks and shifts correctly +@@ -387,7 +387,7 @@ md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) + buf[14] = (D & 0x00ff0000) >> 16; + buf[15] = (D & 0xff000000) >> 24; + +- memcpy (digest, buf, MD5_DIGEST_LENGTH); +- ctx->magic = ~MD5_MAGIC; +- return (MD5_DIGEST_LENGTH); ++ memcpy (digest, buf, IPMI_MD5_DIGEST_LENGTH); ++ ctx->magic = ~IPMI_MD5_MAGIC; ++ return (IPMI_MD5_DIGEST_LENGTH); + } +diff --git a/libfreeipmi/libcommon/ipmi-md5.h b/libfreeipmi/libcommon/ipmi-md5.h +index 0f86f1754..6b863ef36 100644 +--- a/libfreeipmi/libcommon/ipmi-md5.h ++++ b/libfreeipmi/libcommon/ipmi-md5.h +@@ -34,11 +34,11 @@ + + #include + +-#define MD5_BLOCK_LENGTH 64 +-#define MD5_BLOCK_WORDS_LENGTH (MD5_BLOCK_LENGTH/4) +-#define MD5_DIGEST_LENGTH 16 ++#define IPMI_MD5_BLOCK_LENGTH 64 ++#define IPMI_MD5_BLOCK_WORDS_LENGTH (IPMI_MD5_BLOCK_LENGTH/4) ++#define IPMI_MD5_DIGEST_LENGTH 16 + +-typedef struct __md5 { ++typedef struct __ipmi_md5 { + uint32_t magic; + unsigned int mlen; + unsigned int bytes_mod_64; +@@ -47,13 +47,13 @@ typedef struct __md5 { + uint32_t b; + uint32_t c; + uint32_t d; +- uint8_t m[MD5_BLOCK_LENGTH]; +-} md5_t; ++ uint8_t m[IPMI_MD5_BLOCK_LENGTH]; ++} ipmi_md5_t; + +-int md5_init (md5_t *ctx); ++int ipmi_md5_init (ipmi_md5_t *ctx); + +-int md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen); ++int ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen); + +-int md5_finish (md5_t *ctx, void *digest, unsigned int digestlen); ++int ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen); + + #endif /* IPMI_MD5_H */ +diff --git a/libfreeipmi/util/ipmi-lan-util.c b/libfreeipmi/util/ipmi-lan-util.c +index cd269fcb9..a374acc8d 100644 +--- a/libfreeipmi/util/ipmi-lan-util.c ++++ b/libfreeipmi/util/ipmi-lan-util.c +@@ -281,33 +281,33 @@ ipmi_lan_check_session_authentication_code (fiid_obj_t obj_lan_session_hdr_rs, + + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); +- +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, session_id_buf, session_id_len); +- md2_update_data (&ctx, buf, len); +- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); ++ ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md2_update_data (&ctx, buf, len); ++ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_init (&ctx); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, session_id_buf, session_id_len); +- md5_update_data (&ctx, buf, len); +- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md5_update_data (&ctx, buf, len); ++ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_init (&ctx); + } + } + +@@ -451,45 +451,45 @@ ipmi_lan_check_packet_session_authentication_code (const void *pkt, + memcpy (pwbuf, authentication_code_data, authentication_code_data_len); + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); +- +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, +- pkt + session_id_offset, +- session_id_len); +- md2_update_data (&ctx, +- pkt + data_offset, +- pkt_len - data_offset); +- md2_update_data (&ctx, +- pkt + session_sequence_number_offset, +- session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); ++ ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, ++ pkt + session_id_offset, ++ session_id_len); ++ ipmi_md2_update_data (&ctx, ++ pkt + data_offset, ++ pkt_len - data_offset); ++ ipmi_md2_update_data (&ctx, ++ pkt + session_sequence_number_offset, ++ session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_init (&ctx); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, +- pkt + session_id_offset, +- session_id_len); +- md5_update_data (&ctx, +- pkt + data_offset, +- pkt_len - data_offset); +- md5_update_data (&ctx, +- pkt + session_sequence_number_offset, +- session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, ++ pkt + session_id_offset, ++ session_id_len); ++ ipmi_md5_update_data (&ctx, ++ pkt + data_offset, ++ pkt_len - data_offset); ++ ipmi_md5_update_data (&ctx, ++ pkt + session_sequence_number_offset, ++ session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_init (&ctx); + } + } + else /* authentication_type == IPMI_AUTHENTICATION_TYPE_STRAIGHT_PASSWORD_KEY -- 2.34.1 From peron.clem at gmail.com Sat Jan 29 11:11:23 2022 From: peron.clem at gmail.com (=?UTF-8?B?Q2zDqW1lbnQgUMOpcm9u?=) Date: Sat, 29 Jan 2022 12:11:23 +0100 Subject: [Buildroot] [PATCH 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <73fe7aba-588b-133b-f0a6-960cbefb162f@mind.be> References: <20211106181424.299041-1-peron.clem@gmail.com> <73fe7aba-588b-133b-f0a6-960cbefb162f@mind.be> Message-ID: Hi Arnout, On Tue, 25 Jan 2022 at 21:57, Arnout Vandecappelle wrote: > > Hi Cle?ment, > > On 06/11/2021 19:14, Cl?ment P?ron wrote: > > For the moment Beelink GS1 use a default rootfs size of 60M > > which make sometimes the build failed due to missing space. > > That's surprising... The only thing in the rootfs is busybox, so the rootfs > size should be way less than 1MB, let alone 60MB... > > Also, "sometimes" is suspicious. The rootfs should be almost binary identical > between two builds (there are some dates and paths in there if you don't enable > BR2_REPRODUCIBLE). > > Do you have a bit more detail/example of how it fails? Agree, "Sometimes" is not the proper word, I received two times a mail saying missing space in the target, maybe it was due to a package that was wrongly added by default with some dependencies? (Can't find them again). Anyway 60MiB is really low and I need to change it every time I want to add a graphic stack. I will edit the commit log and send a V2. Regards, Clement > > Regards, > Arnout > > > > > Increase the rootfs size to 120M. > > > > Signed-off-by: Cl?ment P?ron > > --- > > configs/beelink_gs1_defconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > > index e88f3e3b69..1872aabdf0 100644 > > --- a/configs/beelink_gs1_defconfig > > +++ b/configs/beelink_gs1_defconfig > > @@ -24,6 +24,7 @@ BR2_PACKAGE_AUTOSSH=y > > BR2_PACKAGE_DROPBEAR=y > > BR2_TARGET_ROOTFS_EXT2=y > > BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > > > # Firmware > > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y From peron.clem at gmail.com Sat Jan 29 11:12:53 2022 From: peron.clem at gmail.com (=?UTF-8?B?Q2zDqW1lbnQgUMOpcm9u?=) Date: Sat, 29 Jan 2022 12:12:53 +0100 Subject: [Buildroot] [PATCH 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: References: <20211106181424.299041-1-peron.clem@gmail.com> <20211106181424.299041-2-peron.clem@gmail.com> Message-ID: Hi Giulio, On Mon, 17 Jan 2022 at 19:54, Giulio Benetti wrote: > > Hi Cl?ment, > > On 06/11/21 19:14, Cl?ment P?ron wrote: > > libfdt fails to compile with on CI. > > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > > collect2: error: ld returned 1 exit status > > > > Bump U-boot and also Kernel and ATF. > > the commit log and subject doesn't explain that the version bumping(as I > suspect) fix the uboot build failure(as I can interpret). Can you please > improve commit log by specifying that while bumping(u-boot I think) that > error is fixed? Thanks for the review, I will send a V2 Regards, Clement > > And please add: > > Fixes: > the link of the CI failure. > > Thank you > Best regards > -- > Giulio Benetti > Benetti Engineering sas > > > Signed-off-by: Cl?ment P?ron > > --- > > configs/beelink_gs1_defconfig | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > > index 1872aabdf0..ca953df3ea 100644 > > --- a/configs/beelink_gs1_defconfig > > +++ b/configs/beelink_gs1_defconfig > > @@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" > > > > -# Kernel Linux headers same as kernel, a 5.5 series > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y > > +# Kernel Linux headers same as kernel, 5.15 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" > > @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > # Firmware > > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" > > > > # Bootloader > > BR2_TARGET_UBOOT=y > > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" > > BR2_TARGET_UBOOT_NEEDS_DTC=y > > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > > From peron.clem at gmail.com Sat Jan 29 11:17:30 2022 From: peron.clem at gmail.com (=?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?=) Date: Sat, 29 Jan 2022 12:17:30 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beelink_gs1: increase rootfs size to 120M Message-ID: <20220129111731.736265-1-peron.clem@gmail.com> For the moment Beelink GS1 use a default rootfs size of 60M, which is a bit low if you want to add some packages like a graphic stack. Increase the rootfs size to 120M. Reviewed-by: Giulio Benetti Signed-off-by: Cl?ment P?ron --- configs/beelink_gs1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index e88f3e3b69..1872aabdf0 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -24,6 +24,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_DROPBEAR=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -- 2.32.0 From peron.clem at gmail.com Sat Jan 29 11:17:31 2022 From: peron.clem at gmail.com (=?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?=) Date: Sat, 29 Jan 2022 12:17:31 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: <20220129111731.736265-1-peron.clem@gmail.com> References: <20220129111731.736265-1-peron.clem@gmail.com> Message-ID: <20220129111731.736265-2-peron.clem@gmail.com> U-boot libfdt fails to compile on CI. /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 As this fix has been already upstreamed just bump U-boot package. Let's also bump Kernel and ATF as the board is properly supported upstream. Signed-off-by: Cl?ment P?ron --- configs/beelink_gs1_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index 1872aabdf0..ca953df3ea 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -# Kernel Linux headers same as kernel, a 5.5 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y +# Kernel Linux headers same as kernel, 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -- 2.32.0 From giulio.benetti at benettiengineering.com Sat Jan 29 11:22:17 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 12:22:17 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: <20220129111731.736265-2-peron.clem@gmail.com> References: <20220129111731.736265-2-peron.clem@gmail.com> Message-ID: <6757E6B9-1D89-4E85-8C96-87CA1F111835@benettiengineering.com> Hi Cl?ment, > Il giorno 29 gen 2022, alle ore 12:18, Cl?ment P?ron ha scritto: > > ?U-boot libfdt fails to compile on CI. > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 > > As this fix has been already upstreamed just bump U-boot package. > > Let's also bump Kernel and ATF as the board is properly supported upstream. > > Signed-off-by: Cl?ment P?ron Reviewed-by: Giulio Benetti Best regards Giulio > --- > configs/beelink_gs1_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index 1872aabdf0..ca953df3ea 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" > > -# Kernel Linux headers same as kernel, a 5.5 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y > +# Kernel Linux headers same as kernel, 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" > @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" > > # Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From michael at amarulasolutions.com Sat Jan 29 13:03:54 2022 From: michael at amarulasolutions.com (Michael Trimarchi) Date: Sat, 29 Jan 2022 14:03:54 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO Message-ID: <20220129130354.1094543-1-michael@amarulasolutions.com> Add initial support for iMX8MN BSH SMM S2 PRO board: - Linux: v5.17-rc1 - Uboot 2022-01-rc1 (reference tree) - Default packages from buildroot Cc: Ariel D'Alessandro Cc: Jagan Teki Signed-off-by: Michael Trimarchi --- DEVELOPERS | 2 + board/bsh/bsh-imx8mn/extlinux.conf | 4 ++ board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ board/bsh/bsh-imx8mn/post-image.sh | 3 ++ board/bsh/bsh-imx8mn/readme.txt | 60 ++++++++++++++++++++++++++++++ configs/bsh_smms2pro_defconfig | 42 +++++++++++++++++++++ 7 files changed, 135 insertions(+) create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg create mode 100755 board/bsh/bsh-imx8mn/post-build.sh create mode 100755 board/bsh/bsh-imx8mn/post-image.sh create mode 100644 board/bsh/bsh-imx8mn/readme.txt create mode 100644 configs/bsh_smms2pro_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..fc66fb6b83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig F: configs/snps_archs38_vdk_defconfig N: Ariel D'Alessandro +F: board/bsh/ F: package/axfsutils/ F: package/mali-t76x/ @@ -2018,6 +2019,7 @@ F: package/python-crc16/ F: package/python-pyzmq/ N: Michael Trimarchi +F: board/bsh/ F: package/python-spidev/ N: Michael Vetter diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf new file mode 100644 index 0000000000..9111354742 --- /dev/null +++ b/board/bsh/bsh-imx8mn/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg new file mode 100644 index 0000000000..4a0aa117fb --- /dev/null +++ b/board/bsh/bsh-imx8mn/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "imx8-boot-sd.bin" + offset = 33K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/bsh/bsh-imx8mn/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh new file mode 100755 index 0000000000..3452fd4501 --- /dev/null +++ b/board/bsh/bsh-imx8mn/post-image.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt new file mode 100644 index 0000000000..b84f2ff4be --- /dev/null +++ b/board/bsh/bsh-imx8mn/readme.txt @@ -0,0 +1,60 @@ +How to build it +=============== + +Configure buildroot: + + $ make bsh_smms2pro_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and buildr the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? Image + ??? imx8-boot-sd.bin + ??? imx8mn-bsh-smm-s2pro.dtb + ??? ddr_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot.itb + ??? u-boot-nodtb.bin + ??? u-boot-spl.bin + ??? u-boot-spl-ddr.bin + + +Flashing the emmc card image +========================== + +To install the image on on eMMC + + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img + + +Preparing the board +=================== + + * Connect a serial line to the board + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig new file mode 100644 index 0000000000..5f58d184b2 --- /dev/null +++ b/configs/bsh_smms2pro_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/bsh/bsh-imx8mn/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -- 2.25.1 From giulio.benetti at benettiengineering.com Sat Jan 29 13:32:21 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 14:32:21 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <20220129130354.1094543-1-michael@amarulasolutions.com> References: <20220129130354.1094543-1-michael@amarulasolutions.com> Message-ID: <00DCA0AA-C62D-4A45-8DDF-7E275F75047C@benettiengineering.com> Hi Michael, Ariel, happy to meet you here :-), > Il giorno 29 gen 2022, alle ore 14:04, Michael Trimarchi ha scritto: > > ?Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 > - Uboot 2022-01-rc1 (reference tree) I?m not very sure it?s a good idea using an -rc1 version. I see 3 chances: 1) backport to previous versions(it would be a mess) 2) wait until v5.17 is released in 7 weeks :-/ 3) keep as is while someone else gives his Tested-by: For example Ariel, that will also be one of the two maintainers of this board as I read below. And later bump uboot and Linux versions as soon as they are released. > - Default packages from buildroot Here please specify a https URL for the board like this: https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > > Cc: Ariel D'Alessandro > Cc: Jagan Teki > Signed-off-by: Michael Trimarchi > --- > DEVELOPERS | 2 + > board/bsh/bsh-imx8mn/extlinux.conf | 4 ++ > board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > board/bsh/bsh-imx8mn/readme.txt | 60 ++++++++++++++++++++++++++++++ > configs/bsh_smms2pro_defconfig | 42 +++++++++++++++++++++ > 7 files changed, 135 insertions(+) > create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > create mode 100644 board/bsh/bsh-imx8mn/readme.txt > create mode 100644 configs/bsh_smms2pro_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index fe8de1916e..fc66fb6b83 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > F: configs/snps_archs38_vdk_defconfig > > N: Ariel D'Alessandro > +F: board/bsh/ > F: package/axfsutils/ > F: package/mali-t76x/ > > @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > F: package/python-pyzmq/ > > N: Michael Trimarchi > +F: board/bsh/ > F: package/python-spidev/ > > N: Michael Vetter > diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > new file mode 100644 > index 0000000000..9111354742 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > new file mode 100644 > index 0000000000..4a0aa117fb > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/genimage.cfg > @@ -0,0 +1,17 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "imx8-boot-sd.bin" > + offset = 33K > + } > + > + partition rootfs { > + offset = 8M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > new file mode 100755 > index 0000000000..3452fd4501 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-image.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > new file mode 100644 > index 0000000000..b84f2ff4be > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/readme.txt > @@ -0,0 +1,60 @@ > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make bsh_smms2pro_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and buildr the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? Image > + ??? imx8-boot-sd.bin > + ??? imx8mn-bsh-smm-s2pro.dtb > + ??? ddr_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot.itb > + ??? u-boot-nodtb.bin > + ??? u-boot-spl.bin > + ??? u-boot-spl-ddr.bin > + > + > +Flashing the emmc card image > +========================== > + > +To install the image on on eMMC > + > + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > new file mode 100644 > index 0000000000..5f58d184b2 > --- /dev/null > +++ b/configs/bsh_smms2pro_defconfig > @@ -0,0 +1,42 @@ > +BR2_aarch64=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/bsh/bsh-imx8mn/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" This ^^^ wip name doesn?t sound that good to me. Ariel, is it possible to give a tag with a version like v0.1? So something shorter and more clear. > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" > +BR2_TARGET_UBOOT_SPL=y Have you given a go with latest Buildroot docker to check if uboot needs libfdtpy, python3 etc.? It?s highly probable it needs them. Kind regards ?- Giulio Benetti Benetti Engineering sas > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From michael at amarulasolutions.com Sat Jan 29 13:38:29 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Sat, 29 Jan 2022 14:38:29 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <00DCA0AA-C62D-4A45-8DDF-7E275F75047C@benettiengineering.com> References: <20220129130354.1094543-1-michael@amarulasolutions.com> <00DCA0AA-C62D-4A45-8DDF-7E275F75047C@benettiengineering.com> Message-ID: Hi Giulio On Sat, Jan 29, 2022 at 2:32 PM Giulio Benetti wrote: > > Hi Michael, Ariel, > > happy to meet you here :-), > > Il giorno 29 gen 2022, alle ore 14:04, Michael Trimarchi ha scritto: > > ?Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 > - Uboot 2022-01-rc1 (reference tree) > > > I?m not very sure it?s a good idea using an -rc1 version. I see 3 chances: > 1) backport to previous versions(it would be a mess) > 2) wait until v5.17 is released in 7 weeks :-/ > 3) keep as is while someone else gives his Tested-by: Well, only a few people can test it. I will wait Ariel > For example Ariel, that will also be one of the two maintainers of this board as I read below. > And later bump uboot and Linux versions as soon as they are released. > uboot is there for a while. I have other board that get their uboot source from gitlab or other download point. I think that we need to ensure a valid commit point. I should maybe force uboot to a specific one > - Default packages from buildroot > > > Here please specify a https URL for the board like this: > https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > Ok > > Cc: Ariel D'Alessandro > Cc: Jagan Teki > Signed-off-by: Michael Trimarchi > --- > DEVELOPERS | 2 + > board/bsh/bsh-imx8mn/extlinux.conf | 4 ++ > board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > board/bsh/bsh-imx8mn/readme.txt | 60 ++++++++++++++++++++++++++++++ > configs/bsh_smms2pro_defconfig | 42 +++++++++++++++++++++ > 7 files changed, 135 insertions(+) > create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > create mode 100644 board/bsh/bsh-imx8mn/readme.txt > create mode 100644 configs/bsh_smms2pro_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index fe8de1916e..fc66fb6b83 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > F: configs/snps_archs38_vdk_defconfig > > N: Ariel D'Alessandro > +F: board/bsh/ > F: package/axfsutils/ > F: package/mali-t76x/ > > @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > F: package/python-pyzmq/ > > N: Michael Trimarchi > +F: board/bsh/ > F: package/python-spidev/ > > N: Michael Vetter > diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > new file mode 100644 > index 0000000000..9111354742 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > new file mode 100644 > index 0000000000..4a0aa117fb > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/genimage.cfg > @@ -0,0 +1,17 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "imx8-boot-sd.bin" > + offset = 33K > + } > + > + partition rootfs { > + offset = 8M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > new file mode 100755 > index 0000000000..3452fd4501 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-image.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > new file mode 100644 > index 0000000000..b84f2ff4be > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/readme.txt > @@ -0,0 +1,60 @@ > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make bsh_smms2pro_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and buildr the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? Image > + ??? imx8-boot-sd.bin > + ??? imx8mn-bsh-smm-s2pro.dtb > + ??? ddr_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot.itb > + ??? u-boot-nodtb.bin > + ??? u-boot-spl.bin > + ??? u-boot-spl-ddr.bin > + > + > +Flashing the emmc card image > +========================== > + > +To install the image on on eMMC > + > + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > new file mode 100644 > index 0000000000..5f58d184b2 > --- /dev/null > +++ b/configs/bsh_smms2pro_defconfig > @@ -0,0 +1,42 @@ > +BR2_aarch64=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/bsh/bsh-imx8mn/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" > > > This ^^^ wip name doesn?t sound that good to me. Ariel, is it possible to give a tag with a version like v0.1? So something shorter and more clear. > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" > +BR2_TARGET_UBOOT_SPL=y > > > Have you given a go with latest Buildroot docker to check if uboot needs libfdtpy, python3 etc.? > It?s highly probable it needs them. Suggestion, should be given to the other newest board that was added. I think that you are talking about host-tools here. Please point me to this buildroot docker Michael > > Kind regards > ?- > Giulio Benetti > Benetti Engineering sas > > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From giulio.benetti at benettiengineering.com Sat Jan 29 13:54:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 14:54:26 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: Message-ID: <6D05417C-EE4C-4145-BDB2-5CD9AC5A39A5@benettiengineering.com> Hi Michael, > Il giorno 29 gen 2022, alle ore 14:38, Michael Nazzareno Trimarchi ha scritto: > > ?Hi Giulio > >> On Sat, Jan 29, 2022 at 2:32 PM Giulio Benetti >> wrote: >> >> Hi Michael, Ariel, >> >> happy to meet you here :-), >> >> Il giorno 29 gen 2022, alle ore 14:04, Michael Trimarchi ha scritto: >> >> ?Add initial support for iMX8MN BSH SMM S2 PRO board: >> >> - Linux: v5.17-rc1 >> - Uboot 2022-01-rc1 (reference tree) >> >> >> I?m not very sure it?s a good idea using an -rc1 version. I see 3 chances: >> 1) backport to previous versions(it would be a mess) >> 2) wait until v5.17 is released in 7 weeks :-/ >> 3) keep as is while someone else gives his Tested-by: > > Well, only a few people can test it. I will wait Ariel Ok > >> For example Ariel, that will also be one of the two maintainers of this board as I read below. >> And later bump uboot and Linux versions as soon as they are released. >> > > uboot is there for a while. I have other board that get their uboot > source from gitlab or other download point. > I think that we need to ensure a valid commit point. I should maybe > force uboot to a specific one +1 > >> - Default packages from buildroot >> >> >> Here please specify a https URL for the board like this: >> https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ >> > > Ok > >> >> Cc: Ariel D'Alessandro >> Cc: Jagan Teki >> Signed-off-by: Michael Trimarchi >> --- >> DEVELOPERS | 2 + >> board/bsh/bsh-imx8mn/extlinux.conf | 4 ++ >> board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ >> board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ >> board/bsh/bsh-imx8mn/post-image.sh | 3 ++ >> board/bsh/bsh-imx8mn/readme.txt | 60 ++++++++++++++++++++++++++++++ >> configs/bsh_smms2pro_defconfig | 42 +++++++++++++++++++++ >> 7 files changed, 135 insertions(+) >> create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf >> create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg >> create mode 100755 board/bsh/bsh-imx8mn/post-build.sh >> create mode 100755 board/bsh/bsh-imx8mn/post-image.sh >> create mode 100644 board/bsh/bsh-imx8mn/readme.txt >> create mode 100644 configs/bsh_smms2pro_defconfig >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index fe8de1916e..fc66fb6b83 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig >> F: configs/snps_archs38_vdk_defconfig >> >> N: Ariel D'Alessandro >> +F: board/bsh/ >> F: package/axfsutils/ >> F: package/mali-t76x/ >> >> @@ -2018,6 +2019,7 @@ F: package/python-crc16/ >> F: package/python-pyzmq/ >> >> N: Michael Trimarchi >> +F: board/bsh/ >> F: package/python-spidev/ >> >> N: Michael Vetter >> diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf >> new file mode 100644 >> index 0000000000..9111354742 >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/extlinux.conf >> @@ -0,0 +1,4 @@ >> +label buildroot >> + kernel /boot/Image >> + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb >> + append root=PARTUUID=%PARTUUID% rootwait rw >> diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg >> new file mode 100644 >> index 0000000000..4a0aa117fb >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/genimage.cfg >> @@ -0,0 +1,17 @@ >> +image sdcard.img { >> + hdimage { >> + partition-table-type = "gpt" >> + } >> + >> + partition imx-boot { >> + in-partition-table = "no" >> + image = "imx8-boot-sd.bin" >> + offset = 33K >> + } >> + >> + partition rootfs { >> + offset = 8M >> + image = "rootfs.ext4" >> + partition-uuid = %PARTUUID% >> + } >> +} >> diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh >> new file mode 100755 >> index 0000000000..bf8861f6a9 >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/post-build.sh >> @@ -0,0 +1,7 @@ >> +#!/bin/sh >> +BOARD_DIR="$(dirname $0)" >> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >> + >> +install -d "$TARGET_DIR/boot/extlinux/" >> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >> diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh >> new file mode 100755 >> index 0000000000..3452fd4501 >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/post-image.sh >> @@ -0,0 +1,3 @@ >> +#!/bin/sh >> + >> +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg >> diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt >> new file mode 100644 >> index 0000000000..b84f2ff4be >> --- /dev/null >> +++ b/board/bsh/bsh-imx8mn/readme.txt >> @@ -0,0 +1,60 @@ >> +How to build it >> +=============== >> + >> +Configure buildroot: >> + >> + $ make bsh_smms2pro_defconfig >> + >> +Change settings to fit your needs (optional): >> + >> + $ make menuconfig >> + >> +Compile everything and buildr the rootfs image: >> + >> + $ make >> + >> + >> +Result of the build >> +=================== >> + >> +After building, the output/images directory contains: >> + >> + output/images/ >> + ??? bl31.bin >> + ??? boot.scr >> + ??? ddr_fw.bin >> + ??? Image >> + ??? imx8-boot-sd.bin >> + ??? imx8mn-bsh-smm-s2pro.dtb >> + ??? ddr_fw.bin >> + ??? rootfs.ext2 >> + ??? rootfs.ext4 -> rootfs.ext2 >> + ??? rootfs.tar >> + ??? sdcard.img >> + ??? u-boot.bin >> + ??? u-boot.itb >> + ??? u-boot-nodtb.bin >> + ??? u-boot-spl.bin >> + ??? u-boot-spl-ddr.bin >> + >> + >> +Flashing the emmc card image >> +========================== >> + >> +To install the image on on eMMC >> + >> + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img >> + >> + >> +Preparing the board >> +=================== >> + >> + * Connect a serial line to the board >> + * Power-up the board >> + >> + >> +Booting the board >> +================= >> + >> +By default the bootloader will search for the first valid image, starting >> +with the internal eMMC. >> diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig >> new file mode 100644 >> index 0000000000..5f58d184b2 >> --- /dev/null >> +++ b/configs/bsh_smms2pro_defconfig >> @@ -0,0 +1,42 @@ >> +BR2_aarch64=y >> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/bsh/bsh-imx8mn/post-build.sh" >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" >> >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" >> >> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" >> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_PACKAGE_FREESCALE_IMX=y >> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y >> +BR2_PACKAGE_FIRMWARE_IMX=y >> +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" >> +BR2_TARGET_UBOOT=y >> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> +BR2_TARGET_UBOOT_CUSTOM_GIT=y >> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" >> >> >> This ^^^ wip name doesn?t sound that good to me. Ariel, is it possible to give a tag with a version like v0.1? So something shorter and more clear. >> >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" >> +BR2_TARGET_UBOOT_SPL=y >> >> >> Have you given a go with latest Buildroot docker to check if uboot needs libfdtpy, python3 etc.? >> It?s highly probable it needs them. > > Suggestion, should be given to the other newest board that was added. Correct, I?m going to check my latest board reviews about this > I think that you are talking about > host-tools here. Yes > Please point me to this buildroot docker https://hub.docker.com/r/buildroot/base/tags # docker pull buildroot/base:20211120.1925 Best regards ?- Giulio Benetti Benetti Engineering sas > > Michael > >> >> Kind regards >> ?- >> Giulio Benetti >> Benetti Engineering sas >> >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_IMX_MKIMAGE=y >> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y >> +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > > > -- > Michael Nazzareno Trimarchi > Co-Founder & Chief Executive Officer > M. +39 347 913 2170 > michael at amarulasolutions.com > __________________________________ > > Amarula Solutions BV > Joop Geesinkweg 125, 1114 AB, Amsterdam, NL > T. +31 (0)85 111 9172 > info at amarulasolutions.com > www.amarulasolutions.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From michael at amarulasolutions.com Sat Jan 29 14:08:31 2022 From: michael at amarulasolutions.com (Michael Trimarchi) Date: Sat, 29 Jan 2022 15:08:31 +0100 Subject: [Buildroot] [PATCH] package/freescale-imx: Add installation of easrc-imx8mn.bin firmware Message-ID: <20220129140831.1284832-1-michael@amarulasolutions.com> The easrc firmware is used for audio resampling. The firmware for now exists only for imx8mn device Signed-off-by: Michael Trimarchi --- package/freescale-imx/firmware-imx/Config.in | 4 ++++ package/freescale-imx/firmware-imx/firmware-imx.mk | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index df266fb28e..06c4d8036c 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -39,6 +39,10 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW bool default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EASRC_FW + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EPDC_FW bool default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 3acd053d0f..211a43c4ca 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -113,6 +113,17 @@ define FIRMWARE_IMX_INSTALL_IMAGE_HDMI_FW endef endif +# +# EASRC firmware +# + +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EASRC_FW),y) +define FIRMWARE_IMX_INSTALL_TARGET_EASRC_FW + mkdir -p $(TARGET_DIR)/lib/firmware/imx + cp -r $(@D)/firmware/easrc $(TARGET_DIR)/lib/firmware/imx +endef +endif + # # EPDC firmware # @@ -160,6 +171,7 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS endef define FIRMWARE_IMX_INSTALL_TARGET_CMDS + $(FIRMWARE_IMX_INSTALL_TARGET_EASRC_FW) $(FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW) $(FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW) $(FIRMWARE_IMX_INSTALL_TARGET_VPU_FW) -- 2.25.1 From romain.naour at gmail.com Sat Jan 29 14:23:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 15:23:50 +0100 Subject: [Buildroot] [PATCH 1/3] package/poke: install libpoke.so to staging Message-ID: <20220129142352.1197168-1-romain.naour@gmail.com> Poke generate a library libpoke.so, so install it to staging. Signed-off-by: Romain Naour --- package/poke/poke.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/poke/poke.mk b/package/poke/poke.mk index fed023e954..ddd03ae3b0 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -13,6 +13,7 @@ POKE_LICENSE_FILES = COPYING jitter/COPYING # 0001-configure.ac-HELP2MAN-replace-by-false-when-cross-co.patch POKE_AUTORECONF = YES +POKE_INSTALL_STAGING = YES POKE_DEPENDENCIES = host-flex host-bison host-pkgconf bdwgc readline # poke bundle gnulib that doesn't support the case where -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 14:23:51 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 15:23:51 +0100 Subject: [Buildroot] [PATCH 2/3] package/poke: disable minimal-threading with thumb or thumb2 In-Reply-To: <20220129142352.1197168-1-romain.naour@gmail.com> References: <20220129142352.1197168-1-romain.naour@gmail.com> Message-ID: <20220129142352.1197168-2-romain.naour@gmail.com> Disable minimal-threading when thumb or thumb2 is enabled due to build and runtime issues. After fixing the build issue "Error: invalid swi expression" with upstream, poke fail to run with the following error: # poke ERROR: specialized instruction beghl/retR (opcode 25) is defective but has no replacement [...] Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/2030046871 Reported upstream [1]. [1] https://lists.gnu.org/archive/html/poke-devel/2022-01/msg00162.html Signed-off-by: Romain Naour --- package/poke/poke.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..91518f5854 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -46,6 +46,15 @@ POKE_CONF_OPTS = \ --disable-libnbd \ --with-libreadline-prefix=$(STAGING_DIR) +# Disable minimal-threading when thumb or thumb2 is enabled +# due to runtime issue. +# https://lists.gnu.org/archive/html/poke-devel/2022-01/msg00162.html +ifeq ($(BR2_ARM_CPU_HAS_THUMB)$(BR2_ARM_CPU_HAS_THUMB2),y) +POKE_CONF_OPTS += --disable-dispatch-minimal-threading +else +POKE_CONF_OPTS += --enable-dispatch-minimal-threading +endif + ifeq ($(BR2_PACKAGE_JSON_C),y) POKE_DEPENDENCIES += json-c POKE_CONF_OPTS += --enable-mi -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 14:23:52 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 15:23:52 +0100 Subject: [Buildroot] [PATCH 3/3] package/poke: bump to version 2.0 In-Reply-To: <20220129142352.1197168-1-romain.naour@gmail.com> References: <20220129142352.1197168-1-romain.naour@gmail.com> Message-ID: <20220129142352.1197168-3-romain.naour@gmail.com> Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6270 # of unsupported tests 7 See: http://www.jemarch.net/poke-2.0-relnotes.html Tested: https://gitlab.com/kubu93/buildroot/-/pipelines/458943718 Signed-off-by: Romain Naour --- test-pkg config: BR2_PACKAGE_POKE=y BR2_PACKAGE_JSON_C=y --- ...P2MAN-replace-by-true-when-cross-com.patch | 6 ++-- ...andom.c-fix-build-with-uclibc-1.0.35.patch | 28 +++++++++---------- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index c169516153..85a76e068e 100644 --- a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -1,4 +1,4 @@ -From b35dadae6371c3727cac46ae5bd348b66aa411fc Mon Sep 17 00:00:00 2001 +From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 30 Apr 2021 15:43:59 +0200 Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when @@ -17,10 +17,10 @@ Signed-off-by: Romain Naour 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2c6f1aef..9c4c9be2 100644 +index a1943b57..c633f719 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) +@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) else diff --git a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch index 757dc3f760..bd20b5d2c6 100644 --- a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch +++ b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -1,4 +1,4 @@ -From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 +From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 1 Apr 2021 07:49:46 +0200 Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 @@ -15,7 +15,7 @@ In file included from ./sys/random.h:40, /tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? 7 | #include +++ |+#include - 8 | + 8 | This patch is not upstreamable as it is only a workaround for uclibc < 1.0.35, upstream uclibc has been patched with @@ -26,15 +26,15 @@ Fixes: Signed-off-by: Fabrice Fontaine --- - jitter/gnulib-local/getrandom.c | 1 + - gl/getrandom.c | 1 + gl-libpoke/getrandom.c | 1 + + gl/getrandom.c | 1 + + jitter/gnulib-local/getrandom.c | 1 + 3 files changed, 3 insertions(+) -diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/jitter/gnulib-local/getrandom.c -+++ b/jitter/gnulib-local/getrandom.c +diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c +index e146873..3948d8d 100644 +--- a/gl-libpoke/getrandom.c ++++ b/gl-libpoke/getrandom.c @@ -19,6 +19,7 @@ #include @@ -44,7 +44,7 @@ index 41212fb32..0ad3f9648 100644 #include diff --git a/gl/getrandom.c b/gl/getrandom.c -index 41212fb32..0ad3f9648 100644 +index e146873..3948d8d 100644 --- a/gl/getrandom.c +++ b/gl/getrandom.c @@ -19,6 +19,7 @@ @@ -55,10 +55,10 @@ index 41212fb32..0ad3f9648 100644 #include #include -diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/gl-libpoke/getrandom.c -+++ b/gl-libpoke/getrandom.c +diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c +index e146873..3948d8d 100644 +--- a/jitter/gnulib-local/getrandom.c ++++ b/jitter/gnulib-local/getrandom.c @@ -19,6 +19,7 @@ #include @@ -68,5 +68,5 @@ index 41212fb32..0ad3f9648 100644 #include -- -2.30.2 +2.31.1 diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 1367262f54..7bf2204c55 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce054df29560c921230132703ee449fe130b6e25ab03aa6cc796bb401506aa24 poke-1.4.tar.gz +sha256 5b822bf3e112c9fb5c0c9ab22a30a45a5d5e4d16e3f7436052bb720aa26b9a58 poke-2.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index 91518f5854..e92d9506ce 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.0 POKE_SITE = $(BR2_GNU_MIRROR)/poke # gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) -- 2.31.1 From fontaine.fabrice at gmail.com Sat Jan 29 15:48:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 16:48:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/android-tools: fastboot needs gcc >= 5 Message-ID: <20220129154800.3819350-1-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 dependency to fastboot: Makefile:591: *** libsepol is in the dependency chain of libselinux that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/2430ba4afb40569ed54506201494baeebf6c5d42 Signed-off-by: Fabrice Fontaine --- package/android-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/android-tools/Config.in b/package/android-tools/Config.in index a36c4db189..22d17f5fae 100644 --- a/package/android-tools/Config.in +++ b/package/android-tools/Config.in @@ -38,6 +38,7 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT bool "fastboot" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_ZLIB @@ -46,8 +47,9 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT the target, which can be used to reflash other target devices implementing the fastboot protocol. -comment "fastboot needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "fastboot needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || _ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "fastboot needs headers >= 3.10 (PowerPC64), headers >= 3.16 (MIPS64)" depends on !BR2_arc -- 2.34.1 From fontaine.fabrice at gmail.com Sat Jan 29 15:50:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 29 Jan 2022 16:50:19 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/android-tools: fastboot needs gcc >= 5 Message-ID: <20220129155019.3819750-1-fontaine.fabrice@gmail.com> Commit 56d9b887685c86fd4fbadda247cdbe733d499e81 forgot to add gcc >= 5 dependency to fastboot: Makefile:591: *** libsepol is in the dependency chain of libselinux that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/2430ba4afb40569ed54506201494baeebf6c5d42 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo package/android-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/android-tools/Config.in b/package/android-tools/Config.in index a36c4db189..bc76d545c1 100644 --- a/package/android-tools/Config.in +++ b/package/android-tools/Config.in @@ -38,6 +38,7 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT bool "fastboot" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_ZLIB @@ -46,8 +47,9 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT the target, which can be used to reflash other target devices implementing the fastboot protocol. -comment "fastboot needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "fastboot needs a toolchain w/ threads, dynamic library, gcc >= 5" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "fastboot needs headers >= 3.10 (PowerPC64), headers >= 3.16 (MIPS64)" depends on !BR2_arc -- 2.34.1 From peter at korsgaard.com Sat Jan 29 18:14:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 19:14:59 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Update for 2021.02.9 Message-ID: <20220129180819.2AD0582761@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af67915161af4243cfdbd81408cd6ba64a8438eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard --- CHANGES | 29 +++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e967c265cd..f7d14f636d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,32 @@ +2021.02.9, released January 29th, 2022 + + Important / security related fixes. + + check-package: Improve variable override check + + pkg-stats: List CVEs where the version info cannot be parsed + as unsure rather than completely ignoring them. + + Defconfigs: Beaglebone: Support BeagleBone black wireless + + Updated/fixed packages: alsa-utils, apache, cage, capnproto, + civetweb, clamav, collectd, connman, coreutils, dav1d, + docker-cli, docker-containerd, docker-engine, expat, + findutils, flare-engine, flare-game, font-awesome, freeswitch, + gcc, ghostscript, gnuchess, go, grpc, gst1-interpipe, + gst1-plugins-bad, gst-rtsp-sever, gupnp-tools, hackrf, icu, + imagemagick, janus-gateway, keepalived, lapack, libjpeg, + libopenssl, libpjsip, liburiparser, linux-pam, lxc, mbedtls, + mongodb, mpd-mpc, nodejs, openblas, pcre2, polkit, poppler, + privoxy, prosody, python-django, python-lxml, python-pyqt5, + python3, qt5base, qt5location, rhash, ruby, runc, samba4, + sofia-sip, targetcli-fb, tcpreplay, tinyxml, vim, vlc, + wireshark, xapp_xauth, xen, xlib_libX11, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #14471: alsa_utils wrong deployment + 2021.02.8, released December 14th, 2021 Important / security related fixes. diff --git a/Makefile b/Makefile index 926695afd3..d1a5d4d71e 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.8 +export BR2_VERSION := 2021.02.9 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1639501000 +BR2_VERSION_EPOCH = 1643480000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ae1dd51650..ff793ccba8 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.8' +RELEASE='2021.02.9' ### Change here for more memory/cores ### VM_MEMORY=2048 From giulio.benetti at benettiengineering.com Sat Jan 29 18:34:26 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 19:34:26 +0100 Subject: [Buildroot] [PATCH] package/apitrace: fix build failure on m68k architecture Message-ID: <20220129183426.152177-1-giulio.benetti@benettiengineering.com> apitrace uses very big switch statements, which causes the build to fail on m68k, because the offsets there are only 16-bit. We fix that by using -mlong-jump-table-offsets on m68k, to use 32-bit offsets for switch statements. That flag is available on gcc version >= 7 but apitrace package already depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7, so we can use it with no problem. Fixes: http://autobuild.buildroot.net/results/7306bf05962fec30fbe98b1eb8ee09b3162b8080/ Signed-off-by: Giulio Benetti --- package/apitrace/apitrace.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/apitrace/apitrace.mk b/package/apitrace/apitrace.mk index 3656a5722b..c47562233b 100644 --- a/package/apitrace/apitrace.mk +++ b/package/apitrace/apitrace.mk @@ -38,6 +38,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) APITRACE_CXXFLAGS += -O0 endif +# m68k needs 32-bit offsets in switch tables to build +ifeq ($(BR2_m68k),y) +APITRACE_CXXFLAGS += -mlong-jump-table-offsets +endif + APITRACE_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(APITRACE_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(APITRACE_CXXFLAGS)" -- 2.25.1 From ps.report at gmx.net Sat Jan 29 19:07:55 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Sat, 29 Jan 2022 20:07:55 +0100 Subject: [Buildroot] swupdate suricatta build error In-Reply-To: References: Message-ID: <20220129200755.17188a26@gmx.net> Hello Chris, On Fri, 28 Jan 2022 12:59:23 +0900, Chris wrote: > Hi, there > Did anybody ever see the same issue? When build 2021.11 for raspberry pi, > we added swupdate package and enabled suricatta mode by "make > swupdate-menuconfig", then we got error as below, > > suricatta/common.c:79:26: error: storage size of ?json_res? isn?t known > 79 | enum json_tokener_error json_res; > | ^~~~~~~~ > suricatta/common.c:82:15: warning: implicit declaration of function > ?json_tokener_parse_ex? [-Wimplicit-function-declaration] > 82 | json_root = json_tokener_parse_ex( > | ^~~~~~~~~~~~~~~~~~~~~ > suricatta/common.c:82:13: warning: assignment to ?struct json_object *? > from ?int? makes pointer from integer without a cast [-Wint-conversion] > 82 | json_root = json_tokener_parse_ex( > | ^ > suricatta/common.c:84:23: warning: implicit declaration of function > ?json_tokener_get_error? [-Wimplicit-function-declaration] > 84 | } while ((json_res = json_tokener_get_error(json_tokenizer)) == > | ^~~~~~~~~~~~~~~~~~~~~~ > suricatta/common.c:85:4: error: ?json_tokener_continue? undeclared (first > use in this function) > 85 | json_tokener_continue); > | ^~~~~~~~~~~~~~~~~~~~~ > suricatta/common.c:85:4: note: each undeclared identifier is reported only > once for each function it appears in > suricatta/common.c:86:18: error: ?json_tokener_success? undeclared (first > use in this function); did you mean ?json_tokener_error?? > 86 | if (json_res != json_tokener_success) { > | ^~~~~~~~~~~~~~~~~~~~ > | json_tokener_error > suricatta/suricatta.c:17:10: fatal error: json-c/json.h: No such file or > directory > 17 | #include > > > - host machine (OS/release) --Linux MINT20 > - version of Buildroot--2021.11 > - target for which the build fails--raspberry pi b > - package(s) for which the build fails--swupdate > - the command that fails and its output--as posted above > - any information you think that may be relevant > > > Thanks > Chris Seems suricatta depens on json-c, simple enable additional BR2_PACKAGE_JSON_C=y in your .config file (or json-c via 'make menuconfig')... Note: swupdate has already an optional dependency on json-c (see [1]) but an hard dependency for an changed swupdate config (via 'make swupdate-menuconfig' is hard to express in buildroot)... Regards, Peter [1] https://git.buildroot.net/buildroot/tree/package/swupdate/swupdate.mk#n42 From peter at korsgaard.com Sat Jan 29 19:14:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 29 Jan 2022 20:14:37 +0100 Subject: [Buildroot] Buildroot 2021.02.9 released Message-ID: <87ee4q2w2q.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.02.9 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.02.9.tar.gz or http://buildroot.org/downloads/buildroot-2021.02.9.tar.bz2 Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.02.9 is a bugfix release on the current long term release, fixing a number of important / security related issues discovered since the 2021.02.8 release. - Defconfigs: Beaglebone: Support BeagleBone black wireless - Security fixes for apache, clamav, docker-containerd, expat, freeswitch, ghostscript, gnuchess, go, janus-gateway, keepalived, lapack, libjpeg, libpjsip, liburiparser, mbedtls, mongodb, nodejs, openblas, polkit, privoxy, prosody, python-django, python-lxml, qt5base, ruby, runc, targetcli-fb, tcpreplay, tinyxml, vim, wireshark, xen, xserver_xorg-server - Fixes for download/compilation/runtime/license issues in alsa-utils, cage, capnproto, civetweb, connman, coreutils, dav1d, docker-cli, docker-engine, flare-engine, flare-game, font-awesome, gcc, grpc, gst1-interpipe, gst1-rtsp-server, gupnp-tools, hackrf, icu, imagemagick, libopenssl, linux-pam, lxc, mpd-mpc, pcre2, python-pyqt5, python3, qt5location, rhash, samba4, vlc, xapp_xauth, xlib_libX11 For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.02.9 Users of the affected packages are strongly encouraged to upgrade. Many thanks to all the people contributing to this release: git shortlog -sn 2021.02.8.. 57 Fabrice Fontaine 14 Peter Korsgaard 11 Bernd Kuhls 7 Thomas Petazzoni 6 Peter Seiderer 5 Christian Stewart 3 Francois Perrad 2 Adam Duskett 2 Andreas Ziegler 2 Arnout Vandecappelle (Essensium/Mind) 2 James Hilliard 2 Ricardo Martincoski 2 Romain Naour 2 Thomas De Schampheleire 2 Yann E. MORIN 1 Anssi Hannula 1 Cyril Bur 1 Dario Binacchi 1 Florent AUMAITRE 1 Giulio Benetti 1 Gregory CLEMENT 1 Khoa Hoang 1 Max Filippov 1 Maxime Chevallier 1 Nuno Gon?alves 1 Quentin Schulz 1 Santosh Multhalli 1 Yegor Yefremov 1 Yunhao Tian -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Sat Jan 29 19:46:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 29 Jan 2022 20:46:33 +0100 Subject: [Buildroot] [PATCH] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <6D05417C-EE4C-4145-BDB2-5CD9AC5A39A5@benettiengineering.com> References: <6D05417C-EE4C-4145-BDB2-5CD9AC5A39A5@benettiengineering.com> Message-ID: Hi Michael, On 29/01/22 14:54, Giulio Benetti wrote: [SNIP] >>> Have you given a go with latest Buildroot docker to check if uboot >>> needs libfdtpy, python3 etc.? >>> It?s highly probable it needs them. >> >> Suggestion, should be given to the other newest board that was added. > > Correct, I?m going to check my latest board reviews about this I've pointed them tbh >> I think that you are talking about >> host-tools here. > > Yes > >> Please point me to this buildroot docker > > https://hub.docker.com/r/buildroot/base/tags > > # docker pull buildroot/base:20211120.1925 This is not correct, sorry, I've just given a try and it builds correctly even if it fails with gitlab CI. You have to use this docker: docker pull buildroot/base:20210922.2200 Best regards! -- Giulio Benetti Benetti Engineering sas From james.hilliard1 at gmail.com Sat Jan 29 20:27:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 29 Jan 2022 13:27:51 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: add missing openssl build dependency Message-ID: <20220129202751.3851776-1-james.hilliard1@gmail.com> Fixes: build/temp.linux-x86_64-3.10/_openssl.c:575:10: fatal error: openssl/opensslv.h: No such file or directory 575 | #include | ^~~~~~~~~~~~~~~~~~~~ Signed-off-by: James Hilliard --- package/python-cryptography/python-cryptography.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index fc1686af9a..e642691bc5 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -12,7 +12,11 @@ PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-setuptools-rust host-python-cffi host-rustc +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" -- 2.25.1 From james.hilliard1 at gmail.com Sat Jan 29 20:34:38 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 29 Jan 2022 13:34:38 -0700 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.58.1 Message-ID: <20220129203438.3855797-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/rust-bin/rust-bin.hash | 198 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index bdb1f07fcc..9f8788a295 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,102 +1,102 @@ -# From https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 9c3baf8ec849978b0206262fc402ac9d24fdb2a8ae7b5d785b09022dbdbc20e8 rust-1.54.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9fb4a22b74120b81a4d896326b02d121d5f996b3288580c346ea55a52d8946a9 rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a1a77737d218087eb7d3613adcde2c9e383d758cdf128646a0ee63396145270b rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 9a7ff8e4cd160f6a58c3b5c7e679b7acdc427c2440ecc70a31a5dc71bbecd0c8 rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c87dc1681756c9c275eba690c6a05bcdd2ac3bd04a70ae039869dc85fff18b69 rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 74c9f120ad8a443798ebec74302b5166a0880b13b1d8c43dde0c8ba70d9e4b2d rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 2a19d96cf9e863448b21ff989550da54080312ce99272128cc0eb3b1fe5c73cc rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 481192a6906c44501f910a35fc49ed9b1b271925c4569a52f45d9efbc2058ae2 rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 2716f587d0da1dd26fc64251303f5705230f5b86e47e9af35e11622d01ceb963 rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 b1f25af230f3b6fd930452024bd0cc9f4599bfb15f09f802cdb756effa516bbf rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 86549aca1b65188cedf3f1c8fce5af3d7f817450418367049d4bbe8c69ba1da0 rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 7823b95fc3fcd7cc47ba767e2e917c9efbafed2d5ad0b74e7c087600bd72e54f rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 f9a650a3970dbc321e8979dd87ed02fd8f9d03901c3fb1a87724f3c214eb6e57 rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 19a80cfaf18c15eaa1c112312c0cb0ccfd14179407118b35735cdcfc1cc4c60f rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 7c747dea305f5d4b1c6a23d064fbb41e24bb56f2917867020bb57cb064878dc4 rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.asc -sha256 b52dd3d4ae465037ed2987e23457d30e1a75fd16c2c421613ec52c250947a5f8 rust-std-1.54.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e88269a37ebfbff52fcd07746c53fc0bfa2570531f10f226800d5783ce735e3f rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.asc -sha256 947054afa4d6e37c64e484c704b5f09043783b83aafbf7a00e6959442b1fc14f rust-std-1.54.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 59c0bd07976f9e18e05e328e2f0acd9e99b736ea0330a03b313842e5c5816e13 rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.asc -sha256 02611ec7a6d510572803b4bd9948f0790e9f0ae8e3047ff7fa465300346e3b74 rust-std-1.54.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 dba582de46b7f97ba85b2d75662482df67214e71e0b9cea3c9c153c9d371a00f rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2e94aedf59369d81524dfe8027e6e4fb0fe338d2ee7869bd96e5cef24974cf0e rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 d1d32bc202b026470ec2c37826fef92bd91f46b08ed1e2620a50eadba03d7095 rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 25d0c06fb445e16d7aac3b5370b43e72600a2aee41fa06605f64a3b8a8ed0e4b rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 626b4255d31c35fa77669471c15ec63b0e88726115538e598a6ef6e814d83bae rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 0f4aaec3ef60ad3c017a39925a1627cc79cd5be00cc8ea7759a470c24b0b66e7 rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 116b2cd682cc5902f91a1ffbe2eb649262d871cd3c47e539afeb723513ae15eb rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 f0329a9d6c96eeb1db5cb7969dbadbab58768b8bff48a1ffc89103031945126e rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 c08b7df82a30acacb3afcdad34b3384e77a9f35ce6bef10d43f29f129fab35e1 rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 8b9ac3e1947036d6f2a3939edd279631fc1b0a260507343a8b3e9ecd448fe738 rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 6ce101e3c5b1bae6006c61a18dcb5685fe0ff57ea8c00a36e6bf95f748abe5f6 rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a22e19859b3c5032daac1633637546a986c51bdfa3ad0db6e394e6cc461f466b rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 c2de24eb3e524c0fdd1e8116f578c103035da1ece1e4c06efab67999180eefe8 rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 110ca4967351d8535f3d39e24f40e2941c20346c5765d3530270e134ae50568e rust-1.58.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f71b077caf0becbd0af9fd22bc1fa31c4fdf7a21fe046da8a15a7bde1286da25 rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 c7a016ac63aeb5481d661ee3e680b57d35d5ccb902c605c32937a047a02cff49 rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 4c8d9774fb1f6cfa616f2c43395f438e887a38f0cd901a3886056cc1c1b84c30 rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 eb58c2b72e9bbe50c80e9f2981e14d737198f7e17a4cad524d00baefdfa3bc1d rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 58e3f4905c3e7028811971219a3222640f947062fb93dbe51c1674551e9b06a6 rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 b354f0ad28d8cc7d5996d46c3a310c80aa6486ac7b89abcd1eeef7f13435e0ff rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 705fba2a50835354112ab86d1ee8889c39f3c7265d7ca26f1dffebaa463600a6 rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 0505759fa8b26c902a701f266db4bfbfe496de71c5c6548a55c562fe9d386485 rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 9ca8adb43b4e75556a99b6c7a9bc1d9aab894bbe109736c34582169ec81aee14 rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 9f38bc3220d659ff482db9a0ace9dcb7051991d471149fad7bbb62fce8314e04 rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 1511c675d17033737ab2bd1e87b525aaf59e0455f5a717ab0a91fd849949164f rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 2cf8a8cc2441a1bb4b45b690c87fff4df975fac077240706c08594e26f901bdc rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 db86e823484f210884d7d815ffcd7dae355bba86e18151b0838ec06544bb8126 rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 02bce02f929114cc60126410fceeab6c0bcc8b96c394de9516d8f449880cb585 rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.asc +sha256 e80d5769f042a00388546dbd26cb40c045d5dddc84e5da3f98d174027ed9eaaa rust-std-1.58.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 d7f2bc431db551ea9019a6d50d4e3f11e14fabbea3abec1478ac72a281309152 rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.asc +sha256 c70fbb13aedfb88cfec8098355a155a4edce3d52f9b099bc033b7c7ac45aab00 rust-std-1.58.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 b678ac0282cbb1965f9a7485a1f56b01d0229f91ddff5a18a9628f86970f5902 rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.asc +sha256 2f571f4c9b4e86e278539e811f495fb84f44898d4333b983a3d95ef5d2c0fdd8 rust-std-1.58.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 7f2f613606f039eec83239753a83c227b1d3c39b6474647234e7788a1541e850 rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 7283539843df5c8abd06b0ce3830efeab0d673447b45d3b6636d2eb296d28681 rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 3d2935e0979a7150cc271481f5f06569005ee27f0a7ef7ed1a5393c3e34b1974 rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 33078d23ea70ca405b5938e5a2a74fbf4ec7dc41b729e4991e3e01d4c8370028 rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 fdade0d00dac3524348041ec915a5a96208c9c1929ce746ab6352d0d2897a3a7 rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 c747a00ac9a6ee70793002e6db2fbce3b2cd60eda277729468d18369736c6c8e rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 7813f825e5d10aac0ded4b3f785970c69c25464b4edcf9c2b83eff0e55ee95f3 rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 c68d93de3a46ec709788fee2c38a298a261d4254d299299195ab3474b316a59b rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 a85f5f42918e8b140d7093ba49fc46a21625863538c95d2db03f831cc445f025 rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 2d7276fe261478c377913177dcec3e0aeed84f2c567db0ae8e415efee7bb9ce0 rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 7a7cd002c63179f3f47d64b1140c180986322a7cc0d31de61d7c4728cedacba0 rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 e72367c15906f021f46801652181c917cd3328be022b93bb30506724f7b56256 rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 b0d3e03c9b1eff6e241383913b02653ba80776626ca7c4a93f36c2ad829ba989 rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index bc8a485ac5..d4cb8f50ea 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.54.0 +RUST_BIN_VERSION = 1.58.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 30a348e982..7eb8f59603 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.asc -sha256 a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4 rustc-1.54.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.asc +sha256 2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469 rustc-1.58.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 26ee2a9362..5fad7d404c 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.54.0 +RUST_VERSION = 1.58.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT -- 2.25.1 From thomas.devoogdt at gmail.com Sat Jan 29 21:42:34 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Sat, 29 Jan 2022 22:42:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.70.0 Message-ID: <20220129214235.5133-1-thomas.devoogdt@gmail.com> The internal_pcre option was dropped in: https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c Signed-off-by: Thomas Devoogdt --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index c402cbafa5..2f95228932 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.68.4', + version : '2.70.0', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index d421e025ff..580be3e08e 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum -sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum +sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index af73aeb3bf..d3cba1a8bb 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.70 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -30,7 +30,6 @@ HOST_LIBGLIB2_CONF_OPTS = \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ - -Dinternal_pcre=false \ -Dtests=false \ -Doss_fuzz=disabled @@ -52,7 +51,6 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ -Dglib_debug=disabled \ - -Dinternal_pcre=false \ -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ -Dtests=false \ -- 2.17.1 From thomas.devoogdt at gmail.com Sat Jan 29 21:42:35 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Sat, 29 Jan 2022 22:42:35 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsoup: add choice between libsoup2 and libsoup3 In-Reply-To: <20220129214235.5133-1-thomas.devoogdt@gmail.com> References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> Message-ID: <20220129214235.5133-2-thomas.devoogdt@gmail.com> Libsoup3 has a new API [1], packages using libsoup2 may not compile with libsoup3 or may crash at runtime in unexpected ways. So the default will (for now) stay on libsoup2. A tracking table for the migration can be found here [2]. Changes for libsoup3: - "0001-meson.build-set-c_std-to-gnu99.patch" is upstream now [3]. - The "gnome" option was dropped in [4]. - A new "libnghttp2" dependency is added since libsoup 2.99.6 (HTTP2 backend) [5]. [1] https://libsoup.org/libsoup-3.0/ch02.html [2] https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 [3] https://gitlab.gnome.org/GNOME/libsoup/-/commit/5c3d431bdb094c59997f2a23e31e83f815ab667c [4] https://gitlab.gnome.org/GNOME/libsoup/-/commit/3fcaa882c4eb29fd754cdb6dd06195632cb4b52a [5] https://gitlab.gnome.org/GNOME/libsoup/-/commit/1a1d29c3114ca86c673d0c0b02a492d0962dcfe8 Signed-off-by: Thomas Devoogdt --- .../0001-meson.build-set-c_std-to-gnu99.patch | 0 package/libsoup/Config.in | 16 ++++++++++++++++ package/libsoup/libsoup.hash | 2 ++ package/libsoup/libsoup.mk | 11 +++++++++++ 4 files changed, 29 insertions(+) rename package/libsoup/{ => 2.74.0}/0001-meson.build-set-c_std-to-gnu99.patch (100%) diff --git a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch b/package/libsoup/2.74.0/0001-meson.build-set-c_std-to-gnu99.patch similarity index 100% rename from package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch rename to package/libsoup/2.74.0/0001-meson.build-set-c_std-to-gnu99.patch diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 02e8e8b578..959ddedef5 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -16,8 +16,24 @@ config BR2_PACKAGE_LIBSOUP if BR2_PACKAGE_LIBSOUP +choice + prompt "libsoup version" + default BR2_PACKAGE_LIBSOUP_VERSION_2 + help + Select the version of libsoup you wish to use. + +config BR2_PACKAGE_LIBSOUP_VERSION_3 + select BR2_PACKAGE_NGHTTP2 + bool "libsoup3" + +config BR2_PACKAGE_LIBSOUP_VERSION_2 + bool "libsoup2" + +endchoice + config BR2_PACKAGE_LIBSOUP_GNOME bool "libsoup-gnome" + depends on BR2_PACKAGE_LIBSOUP_VERSION_2 help Build libsoup-gnome library. diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 95c1c26eb4..6d87cc67e8 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,3 +1,5 @@ +# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/3.0/libsoup-3.0.0.sha256sum +sha256 cde05f3e20114ce985cbd03d575ff74e5e41e70a218e5eb3068c4bf4710dbf2b libsoup-3.0.0.tar.xz # From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.0.sha256sum sha256 33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e libsoup-2.74.0.tar.xz # Locally calculated diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 1a26714992..bd8ce40643 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,13 @@ # ################################################################################ +ifeq ($(BR2_PACKAGE_LIBSOUP_VERSION_3),y) +LIBSOUP_VERSION_MAJOR = 3.0 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +else LIBSOUP_VERSION_MAJOR = 2.74 LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +endif LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ @@ -55,10 +60,16 @@ else LIBSOUP_CONF_OPTS += -Dgssapi=disabled endif +ifeq ($(BR2_PACKAGE_LIBSOUP_VERSION_2),y) ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) LIBSOUP_CONF_OPTS += -Dgnome=true else LIBSOUP_CONF_OPTS += -Dgnome=false endif +endif + +ifeq ($(BR2_PACKAGE_LIBSOUP_VERSION_3),y) +LIBSOUP_DEPENDENCIES += nghttp2 +endif $(eval $(meson-package)) -- 2.17.1 From romain.naour at gmail.com Sat Jan 29 22:46:47 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:47 +0100 Subject: [Buildroot] [PATCH 1/5] package/efl: bump to version 1.26.1 Message-ID: <20220129224651.1282263-1-romain.naour@gmail.com> This is a bug-fix release. See: https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 Signed-off-by: Romain Naour --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 6364d276c0..8d50400eb7 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://www.enlightenment.org/news/2021-12-26-efl-1.26.0 -sha256 a4a9bce45fd27f8541874e44a130f64550bee1f2f72feaa6c8a758d92eaf204c efl-1.26.0.tar.xz +# From https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 +sha256 86a9677e3d48dd0c13a399ebb417bd417bd8d150d6b06cc491bc92275c88a642 efl-1.26.1.tar.xz sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING diff --git a/package/efl/efl.mk b/package/efl/efl.mk index ed0a8acc1d..43a2dc4fcb 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.26.0 +EFL_VERSION = 1.26.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 22:46:48 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:48 +0100 Subject: [Buildroot] [PATCH 2/5] package/enlightenment: bump to version 0.25.1 In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220129224651.1282263-2-romain.naour@gmail.com> This is the a bugfix release. See: https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 Signed-off-by: Romain Naour --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index dd4c4d78c0..2d977b86f7 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,4 +1,4 @@ -# From https://www.enlightenment.org/news/2021-12-26-enlightenment-0.25.0 -sha256 7d6e72ceed5aca135b7a49c2a1c1eb9d8fde1318613517401d0418e0e5f6df06 enlightenment-0.25.0.tar.xz +# From https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 +sha256 2cf05fe3d96ef35e823619dbc0ac513ecabcae2186800ecd804924a637112444 enlightenment-0.25.1.tar.xz sha256 8d2fbc393e967cd6f5b8559d1744881a6a1ceb3ec6e1c2368c3916809ffccb8d COPYING sha256 cdc77ee1732455b203610f923fe4196046b3f7509038c48dc0b0c7e3492c23f3 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 24bbd96cd0..95670e800d 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.25.0 +ENLIGHTENMENT_VERSION = 0.25.1 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 22:46:49 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:49 +0100 Subject: [Buildroot] [PATCH 3/5] package/efl: rework eeze handling in Kconfig In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220129224651.1282263-3-romain.naour@gmail.com> Commit [1] added eeze dependency using "depends on" to several efl options (drm, libmount) instead of selecting eeze and propagate the udev reverse dependency. The dependency between eeze, libinput, efl drm requires to add a new libinput option. Rework eeze handling to use select BR2_PACKAGE_EFL_EEZE since the user is already aware of the udev dependency (BR2_PACKAGE_HAS_UDEV). [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 Signed-off-by: Romain Naour --- package/efl/Config.in | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd9..21845ba306 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -115,7 +115,8 @@ config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT bool "Enable libmount support (recommended)" default y - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # eeze + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # libblkid is part of required tools, see EFL's README. @@ -126,7 +127,7 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT Enlightenment and its filemanager. comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,7 +174,7 @@ config BR2_PACKAGE_EFL_WAYLAND depends on BR2_PACKAGE_WAYLAND depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine - depends on BR2_PACKAGE_EFL_EEZE # efl drm + depends on BR2_PACKAGE_HAS_UDEV # efl drm (eeze) depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput select BR2_PACKAGE_EFL_DRM @@ -182,7 +183,7 @@ config BR2_PACKAGE_EFL_WAYLAND comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" depends on BR2_PACKAGE_WAYLAND depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ || !BR2_ENABLE_LOCALE choice @@ -215,9 +216,10 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV (eeze) depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON @@ -232,7 +234,7 @@ config BR2_PACKAGE_EFL_DRM comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_HAS_UDEV comment "libevas loaders" -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 22:46:50 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:50 +0100 Subject: [Buildroot] [PATCH 4/5] package/efl: handle input option In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220129224651.1282263-4-romain.naour@gmail.com> From: Fabrice Fontaine Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input option on target which was added (and enabled by default) by https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be resulting in the following build failure when eeze is disabled: ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". Fixes: - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e Signed-off-by: Fabrice Fontaine [Romain: use BR2_PACKAGE_EFL_LIBINPUT for BR2_PACKAGE_EFL_DRM] Signed-off-by: Romain Naour --- v2: rework BR2_PACKAGE_EFL_DRM --- package/efl/Config.in | 19 +++++++++++++++---- package/efl/efl.mk | 7 +++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 21845ba306..bc89f2609b 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI so you may also trigger code paths with bugs that are never normally used. +config BR2_PACKAGE_EFL_LIBINPUT + bool "Enable libinput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Libinput is used to support gesture recognition. + +comment "libinput needs udev /dev management (eeze)" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_EFL_LIBSNDFILE bool "Enable libsndfile support (recommended)" default y @@ -216,13 +229,11 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_HAS_UDEV (eeze) + depends on BR2_PACKAGE_HAS_UDEV # elput, eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_EFL_LIBINPUT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBINPUT # For elput - select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 43a2dc4fcb..021afa8204 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -67,6 +67,13 @@ else EFL_CONF_OPTS += -Deeze=false endif +ifeq ($(BR2_PACKAGE_EFL_LIBINPUT),y) +EFL_DEPENDENCIES += libinput libxkbcommon +EFL_CONF_OPTS += -Dinput=true +else +EFL_CONF_OPTS += -Dinput=false +endif + ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux EFL_CONF_OPTS += -Dlibmount=true -- 2.31.1 From romain.naour at gmail.com Sat Jan 29 22:46:51 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 29 Jan 2022 23:46:51 +0100 Subject: [Buildroot] [PATCH 5/5] docs/manual/adding-packages-directory.txt: reorder select/depends In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220129224651.1282263-5-romain.naour@gmail.com> >From [1]: "Even though the ordering has absolutely no consequences in Kconfig, it is not logical (when reading). It is more logical and far easier to understand when depends come first, followed by the selects." Also, the Config.in example in the manual suggests to use this coding style [2]." Use the correct coding style in the chapter "Choosing depends on or select" in the manual. [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html [2] https://nightly.buildroot.org/manual.html#_coding_style Signed-off-by: Romain Naour --- docs/manual/adding-packages-directory.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 6c68d7aa67..e5c7462a6c 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -196,13 +196,13 @@ config BR2_PACKAGE_E -------------------------- config BR2_PACKAGE_D bool "Package D" - select BR2_PACKAGE_B depends on BR2_PACKAGE_A + select BR2_PACKAGE_B config BR2_PACKAGE_E bool "Package E" - select BR2_PACKAGE_D depends on BR2_PACKAGE_A + select BR2_PACKAGE_D -------------------------- Overall, for package library dependencies, +select+ should be -- 2.31.1 From peter at korsgaard.com Sat Jan 29 23:09:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 30 Jan 2022 00:09:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Update for 2021.11.1 Message-ID: <20220129230245.DE9B6822BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=323ae1e681c24babfb375cb46bc81df551a3e0b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard --- CHANGES | 36 ++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 698d5d72a6..1e1c060107 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,39 @@ +2021.11.1, released January 29th, 2022 + + Important / security related fixes. + + check-package: Improve variable override check + + pkg-stats: List CVEs where the version info cannot be parsed + as unsure rather than completely ignoring them. + + Defconfigs: Beaglebone: Support BeagleBone black wireless, + stm32f469_xip_disco: Fix kernel boot + + Updated/fixed packages: alsa-utils, apache, binutils, cage, + capnproto, civetweb, clamav, collectd, connman, containerd, + coreutils, dav1d, docker-cli, docker-engine, erlang, + erlang-rebar, expat, findutils, flare-engine, flare-game, + font-awesome, freeswitch, gcc, ghostscript, glibc, gnuchess, + go, grpc, gst1-interpipe, gst1-rtsp-server, gupnp-tools, + hackrf, icu, imagemagick, janus-gateway, json-for-modern-cpp, + keepalived, lapack, libdbi, libiio, libjpeg, libmbim, libnss, + libopenssl, libpjsip, libqmi, liburiparser, libvirt, + linux-pam, lxc, mbedtls, mender, mongodb, mpd-mpc, mutt, + nodejs, openblas, pcre2, php, pipewire, polkit, privoxy, + prosody, python-charset-normalizer, python-django, + python-idna, python-lxml, python-pyqt5, python-requests, + python-urllib3, python3, qt5base, qt5location, rhash, + rng-tools, ruby, runc, rustc, samba4, sofia-sip, targetcli-fb, + tcpreplay, tinyxml, tor, tpm2-tss, util-linux-libs, vim, vlc, + wireshark, xapp_xauth, xapp_xinput-calibrator, xen, xenomai, + xlib_libX11, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #14451: nodejs won't build on Fedora 35 + #14471: alsa_utils wrong deployment + 2021.11, released December 5th, 2021 Various fixes. diff --git a/Makefile b/Makefile index 386b4f4e44..45fd44dd62 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.11 +export BR2_VERSION := 2021.11.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1638734000 +BR2_VERSION_EPOCH = 1643497000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 2bcb59c08b..eb312081fe 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11' +RELEASE='2021.11.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From giulio.benetti at benettiengineering.com Sat Jan 29 23:14:20 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 30 Jan 2022 00:14:20 +0100 Subject: [Buildroot] [PATCH] board/andes: fix build failure with host gcc >= 10 Message-ID: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> Add patch to fix linux bug: ``` HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ``` Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478164 Signed-off-by: Giulio Benetti --- ...ve-redundant-YYLOC-global-declaratio.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch new file mode 100644 index 0000000000..71ae991816 --- /dev/null +++ b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch @@ -0,0 +1,52 @@ +From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Tue, 14 Jan 2020 18:53:41 +0100 +Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration + +gcc 10 will default to -fno-common, which causes this error at link +time: + + (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here + +This is because both dtc-lexer as well as dtc-parser define the same +global symbol yyloc. Before with -fcommon those were merged into one +defintion. The proper solution would be to to mark this as "extern", +however that leads to: + + dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] + 26 | extern YYLTYPE yylloc; + | ^~~~~~ +In file included from dtc-lexer.l:24: +dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here + 127 | extern YYLTYPE yylloc; + | ^~~~~~ +cc1: all warnings being treated as errors + +which means the declaration is completely redundant and can just be +dropped. + +Signed-off-by: Dirk Mueller +Signed-off-by: David Gibson +[robh: cherry-pick from upstream] +Cc: stable at vger.kernel.org +Signed-off-by: Rob Herring +Signed-off-by: Giulio Benetti +--- + scripts/dtc/dtc-lexer.l | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l +index 06c040902444..d1b3810156c7 100644 +--- a/scripts/dtc/dtc-lexer.l ++++ b/scripts/dtc/dtc-lexer.l +@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +-- +2.25.1 + -- 2.25.1 From thomas.petazzoni at bootlin.com Sun Jan 30 07:06:29 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 07:06:29 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-01-29 Message-ID: <20220130070634.7A31082BD6@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-01-29 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 50 | 9 | 0 | 59 | 2021.11.x | 24 | 1 | 0 | 25 | master | 88 | 41 | 1 | 130 | Classification of failures by reason for master ----------------------------------------------- rygel-0.40.2 | 11 guile-3.0.7 | 3 unknown | 3 cryptsetup-2.4.2 | 2 log4cxx-0.12.0 | 2 apcupsd-3.14.14 | 1 apitrace-10.0 | 1 bluez5_utils-5.63 | 1 dnsmasq-2.86 | 1 efl-1.26.0 | 1 file-5.41 | 1 frr | 1 frr-8.1 | 1 google-breakpad-7515ab13768... | 1 host-delve-1.8.0 | 1 htpdate-1.3.3 | 1 ipmitool-1.8.18 | 1 libcamera-40f5fddca7f774944... | 1 libtheora-1.1.1 | 1 mongodb-4.2.18 | 1 mono-6.12.0.90 | 1 nodejs-14.18.3 | 1 qt5webkit-5.212.0-alpha4 | 1 ripgrep-af6b6c543b224d348a8... | 1 ruby-3.1.0 | 1 ulog-0389d243352255f6182326... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/74a6b83aea8a7b3c35fdfe7509730b72932aaa83 | m68k | apitrace-10.0 | NOK | http://autobuild.buildroot.net/results/88ebcb486ca3fbeec2239537eea9879d89e9467e | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/24b7f114cdcac8daab1b46f05a5e38096cfca05e | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/86b6b13e6be8375875caebcd91de91fef83f72e8 | microblazeel | cryptsetup-2.4.2 | NOK | http://autobuild.buildroot.net/results/e5bcb5b7cdeb569dde447bd22fcb263a2b5a1a3a | xtensa | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/3aaa5e1523049df18692b90d61cdff182e1cd1dd | arm | efl-1.26.0 | NOK | http://autobuild.buildroot.net/results/a6809c2d80b325e72bc6e771fe4aed53fe20042f | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/e32ac63caedc4399614a30582f29f8b65aac2c71 | ORPH arc | frr | TIM | http://autobuild.buildroot.net/results/118b4ed145a46772899e472b8fc34eeabe7f5532 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1f625c2122765609e8da43511b9b6a62b7cbcc4a | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/f861b3152e343b5b6092f8be2723636a708157b3 | arm | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/f20ab6a7c560d929cbc7649b811884c78fa2e4d2 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/7da11b2dcbc1cc8134754cca9cca926d5a8f83c0 | ORPH x86_64 | guile-3.0.7 | NOK | http://autobuild.buildroot.net/results/44ce26c5cf46b4ae1ecadd2bf8902a5fab278233 | ORPH arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/0de2c31d9cf279cbc569b054e55b260ba8c94527 | arm | htpdate-1.3.3 | NOK | http://autobuild.buildroot.net/results/f53ee40222c42c421836a6cbd9f199c6c70df6d9 | arm | ipmitool-1.8.18 | NOK | http://autobuild.buildroot.net/results/01b22faf08a798ecc5d5465e1c0c13fa024f1096 | powerpc | libcamera-40f5fddca7f774944... | NOK | http://autobuild.buildroot.net/results/a1077815895ab847c5ca82ec17c7d13fe97cff53 | xtensa | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/1912bd1213a23c1bb0995a3d322a5c1e0d605270 | ORPH x86_64 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/d0f99ad2c38432854689b7d3383ba3ae64adf8d7 | riscv32 | log4cxx-0.12.0 | NOK | http://autobuild.buildroot.net/results/8308ec2a83868c2446670a47998dee679c48367a | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/536839681cec37d7adaf8fc7cc287be3336ccb29 | arm | mono-6.12.0.90 | NOK | http://autobuild.buildroot.net/results/0f9ae32c07f2fc5c7ac2099c3a0d0d5238bc8e53 | mipsel | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/f0b34c628f1ce2b98428cc7996377802a088ca2f | x86_64 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/194a9b21cb67a2fa296a1faed3df51dc2ccc518a | aarch64 | ripgrep-af6b6c543b224d348a8... | NOK | http://autobuild.buildroot.net/results/a03b756e52bc79fc3c27a36f60aebed113405cf2 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/8bf6573281b02d4ce24a27b67b2ba2424cc38b27 | sparc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/14d85969132c17ae6fef524aad67a3e69e616181 | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9b86de606fbeccc414c89f2b6c7c2a71513fb4dc | powerpc | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/9ca75a49dc94801de96367b7224a355b358052fc | aarch64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c1b3727dd5ce70fe2eef298f5cdfec999ad65500 | sparc64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/866275dad076a5b129fc004f9df3af3823f9a5d6 | nios2 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/f4f43b67534d9f4d4265c0df1f30d2b9608ca045 | i686 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/50febe44f0e9985736a03a7e8ae605e4f87fbce0 | xtensa | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/b47f32a5e5b8373bd53ae4e4a41a280dcc2e7952 | i586 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/c279988e715139cbee9f83c9d1a21491bd140df6 | arm | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/3f0af43bea780ee1196189b36dc40031ba7d512c | x86_64 | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/bcf1613fffe9723a3aa1ce157fe0b187026bc74b | arm | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/9fd5fedb0e7b1f781875a0327b3d558aa208c3dc | arm | unknown | NOK | http://autobuild.buildroot.net/results/2430ba4afb40569ed54506201494baeebf6c5d42 | arc | unknown | NOK | http://autobuild.buildroot.net/results/0f0f683d3c48dfcdcaf619ab924ee5c54e7d9a9f | mips64el | unknown | NOK | http://autobuild.buildroot.net/results/64f163f3c55e9a0ba45db23375384988dc9f2f6d | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 mesa3d-20.3.5 | 2 host-go-1.16.13 | 1 monkey-f54856ce250c4e257354... | 1 openldap-2.4.59 | 1 rauc-1.5.1 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | host-go-1.16.13 | NOK | http://autobuild.buildroot.net/results/8c47d27a1fa8c9dd2beed685938071e2c50bfdb6 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a7fa76bf73b46fac10a690f8cb03c41a02679a51 | nios2 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/7ec8d67a7aba7aa9484f31c2a6943c7d3e92f7da | nios2 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/75afadb7c62ba1a0bad6b3000d01b085f5553d21 | arm | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/d8106a7135645b5ccff7f8273df9a7316a19f6eb | mips64el | mesa3d-20.3.5 | NOK | http://autobuild.buildroot.net/results/1e8ed45385721d824f77dc8d0ffb7cc712871706 | mips64el | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/914ff822a8bd92e57a163f448915355dd8663343 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/838f6d1a4f26b2fbd2eae1086119a285be66a5ed | riscv32 | rauc-1.5.1 | NOK | http://autobuild.buildroot.net/results/a5a8732047d90df6020d2513e3183bea73ee6afe | Classification of failures by reason for 2021.11.x -------------------------------------------------- wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a09911c39e38ae0575aca836e76ae982f688f45f | -- http://autobuild.buildroot.net From james.hilliard1 at gmail.com Sun Jan 30 09:05:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 30 Jan 2022 02:05:35 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: fix get_platform for target builds Message-ID: <20220130090535.404853-1-james.hilliard1@gmail.com> Replicate the logic used to set _PYTHON_HOST_PLATFORM in configure.ac: https://github.com/python/cpython/blob/v3.10.2/configure.ac#L441-L446 This should correctly set the sysconfig platform for cross builds: https://github.com/python/cpython/blob/v3.10.2/Lib/sysconfig.py#L704-L706 Not setting this appears to cause distutils/setuptools to use the wrong build directory names for c extensions, however this doesn't seem to cause build or runtime errors as the installation paths still appear to be correct for staging/target installs. Signed-off-by: James Hilliard --- package/pkg-python.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 22ea77352c..d751311791 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -20,6 +20,13 @@ # ################################################################################ +ifeq ($(BR2_arm)$(BR2_armeb),y) +PKG_PYTHON_ARCH = arm +else +PKG_PYTHON_ARCH = $(ARCH) +endif +PKG_PYTHON_HOST_PLATFORM = linux-$(PKG_PYTHON_ARCH) + # basename does not evaluate if a file exists, so we must check to ensure # the _sysconfigdata__linux_*.py file exists. The "|| true" is added to return # an empty string if the file does not exist. @@ -33,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ PYTHONNOUSERSITE=1 \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ @@ -60,6 +68,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ -- 2.25.1 From peter at korsgaard.com Sun Jan 30 09:45:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 30 Jan 2022 10:45:49 +0100 Subject: [Buildroot] Buildroot 2021.11.1 released Message-ID: <87a6fd36b6.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.08.1 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.11.1.tar.gz or http://buildroot.org/downloads/buildroot-2021.11.1.tar.xz Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.11.1 is a bugfix release, fixing a number of important / security related issues discovered since the 2021.11 release. - Defconfigs: Beaglebone: Support BeagleBone black wireless, stm32f469_xip_disco: Fix kernel boot - Security fixes for apache, clamav, containerd, expat, freeswitch, ghostscript, gnuchess, go, janus-gateway, keepalived, lapack, libjpeg, libpjsip, liburiparser, mbedtls, mongodb, nodejs, openblas, polkit, privoxy, prosody, python-django, python-lxml, qt5base, ruby, runc, targetcli-fb, tcpreplay, tinyxml, vim, wireshark, xen, xserver_xorg-server - Fixes for download/compilation/runtime/license issues in alsa-utils, binutils, cage, capnproto, civetweb, connman, coreutils, dav1d, docker-cli, docker-engine, erlang, erlang-rebar, findutils, flare-engine, flare-game, font-awesome, gcc, glibc, grpc, gst1-rtsp-server, gst1-interpipe, gupnp-tools, hackrf, icu, imagemagick, json-for-modern-cpp, libdbi, libiio, libmbim, libnss, libopenssl, libqmi, libvirt, linux-pam, lxc, mender, mpd-mpc, mutt, pcre2, php, pipewire, python-pyqt5, python-requests, python3, qt5location, rhash, rng-tools, rustc, samba4, tor, tpm2-tss, util-linux-libs, vlc, xapp_xauth, xenomai, xlib_libX11 For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.11.1 Users of the affected packages are strongly encouraged to upgrade. Many thanks to all the people contributing to this release: git shortlog -sn 2021.11.. 73 Fabrice Fontaine 14 Thomas Petazzoni 12 Peter Korsgaard 10 Bernd Kuhls 7 Christian Stewart 6 James Hilliard 5 Peter Seiderer 4 Adam Duskett 3 Fabio Estevam 3 Giulio Benetti 3 Romain Naour 3 Yann E. MORIN 2 Andreas Ziegler 2 Arnout Vandecappelle (Essensium/Mind) 2 Dario Binacchi 2 Francois Perrad 2 Ricardo Martincoski 1 Anssi Hannula 1 Cyril Bur 1 Erik Larsson 1 Florent AUMAITRE 1 Gregory CLEMENT 1 Khoa Hoang 1 Lothar Felten 1 Markus Mayer 1 Max Filippov 1 Maxime Chevallier 1 Michael Nosthoff 1 Nuno Gon?alves 1 Quentin Schulz 1 Santosh Multhalli 1 TIAN Yuanhao 1 Tilman Keskin?z 1 Waldemar Brodkorb 1 Yegor Yefremov 1 Yunhao Tian -- Bye, Peter Korsgaard From gilles.talis at gmail.com Sun Jan 30 09:58:20 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 30 Jan 2022 10:58:20 +0100 Subject: [Buildroot] [PATCH v2] configs/friendlyarm_nanopi_r2s: new defconfig In-Reply-To: <20220126215730.30425623@windsurf> References: <20220115202617.370414-1-gilles.talis@gmail.com> <20220126215730.30425623@windsurf> Message-ID: Hi Thomas, thanks for the review. Le mer. 26 janv. 2022 ? 21:57, Thomas Petazzoni a ?crit : > > Hello Gilles, > > On Sat, 15 Jan 2022 21:26:17 +0100 > Gilles Talis wrote: > > > +BR2_aarch64=y > > +BR2_ARM_FPU_VFPV4=y > > +BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" > > +BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > Thanks for this v2. Unfortunately, there is one thing I did not notice > when reviewing v1: you should use fixed versions of the Linux kernel, > U-Boot and TF-A. Here your defconfig uses whatever is the latest, which > is not the policy we have chosen for our defconfigs. > > Could you fix that up by using fixed versions? Yes. Will send a v3 shortly. > > Thanks a lot! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Thanks! Gilles. From gilles.talis at gmail.com Sun Jan 30 10:11:50 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 30 Jan 2022 11:11:50 +0100 Subject: [Buildroot] [PATCH v3] configs/friendlyarm_nanopi_r2s: new defconfig Message-ID: <20220130101150.20605-1-gilles.talis@gmail.com> The NanoPi R2S is a FriendlyElec mini-router based on: - Rockchip RK3328 SoC - 1GB (or 2GB) DDR4 RAM - Gigabit Ethernet (WAN) - Gigabit Ethernet (USB3) (LAN) - USB 2.0 Host Port - MicroSD slot - Reset button - WAN - LAN - SYS LED https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 Signed-off-by: Gilles Talis --- Changes v1 -> v2: - Drop VFAT partition (kernel, DTB and ext4linux.conf in ext4 partition) Changes v2 -> v3: - Use fixed versions of u-boot, kernel and TF-A --- DEVELOPERS | 2 + board/friendlyarm/nanopi-r2s/extlinux.conf | 4 ++ board/friendlyarm/nanopi-r2s/genimage.cfg | 22 +++++++++ board/friendlyarm/nanopi-r2s/post-build.sh | 5 ++ board/friendlyarm/nanopi-r2s/readme.txt | 57 ++++++++++++++++++++++ configs/friendlyarm_nanopi_r2s_defconfig | 41 ++++++++++++++++ 6 files changed, 131 insertions(+) create mode 100644 board/friendlyarm/nanopi-r2s/extlinux.conf create mode 100644 board/friendlyarm/nanopi-r2s/genimage.cfg create mode 100755 board/friendlyarm/nanopi-r2s/post-build.sh create mode 100644 board/friendlyarm/nanopi-r2s/readme.txt create mode 100644 configs/friendlyarm_nanopi_r2s_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..f8a062558c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1073,7 +1073,9 @@ F: configs/qemu_* N: Gilles Talis F: board/freescale/imx8mmevk/ +F: board/friendlyarm/nanopi-r2s/ F: configs/freescale_imx8mmevk_defconfig +F: configs/friendlyarm_nanopi_r2s_defconfig F: package/cctz/ F: package/faad2/ F: package/fdk-aac/ diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf new file mode 100644 index 0000000000..1ea0cdd8a5 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf @@ -0,0 +1,4 @@ +label NanoPi R2S linux + kernel /boot/Image + devicetree /boot/rk3328-nanopi-r2s.dtb + append root=/dev/mmcblk0p1 rw rootwait diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg new file mode 100644 index 0000000000..a686b4f14e --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "idbloader.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot.itb" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + offset = 16M + image = "rootfs.ext4" + } +} diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh new file mode 100755 index 0000000000..1f5ff6a611 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt new file mode 100644 index 0000000000..6d291cdd60 --- /dev/null +++ b/board/friendlyarm/nanopi-r2s/readme.txt @@ -0,0 +1,57 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Nanopi R2S. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Nanopi R2S link: +https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 + +This configuration uses ATF, U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_r2s_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +Files created in output directory +================================= + +output/images + +??? bl31.elf +??? boot.vfat +??? extlinux +??? idbloader.img +??? Image +??? rk3328-nanopi-r2s.dtb +??? rootfs.ext2 +??? rootfs.ext4 -> rootfs.ext2 +??? rootfs.tar +??? sdcard.img +??? u-boot.bin +??? u-boot.itb + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Nanopi R2S and power it up. The console +is on the serial line, 1500000 8N1. + +Notes +===== + +This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig new file mode 100644 index 0000000000..6fcfcd7159 --- /dev/null +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" +BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.32.0 From yegorslists at googlemail.com Sun Jan 30 10:51:16 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Sun, 30 Jan 2022 11:51:16 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov Message-ID: <20220130105116.18458-1-yegorslists@googlemail.com> From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..a4b4fa2f70 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2992,6 +2992,7 @@ F: package/circus/ F: package/dhcpcd/ F: package/feh/ F: package/giblib/ +F: package/hostapd/ F: package/imlib2/ F: package/jquery-datetimepicker/ F: package/jquery-sidebar/ @@ -3020,6 +3021,7 @@ F: package/swig/ F: package/qt5/qt5serialbus/ F: package/sdparm/ F: package/ti-utils/ +F: package/wpa_supplicant/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ -- 2.17.0 From yegorslists at googlemail.com Sun Jan 30 10:54:59 2022 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Sun, 30 Jan 2022 11:54:59 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov Message-ID: <20220130105459.19339-1-yegorslists@googlemail.com> From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a4b4fa2f70..e17803f38a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3002,6 +3002,8 @@ F: package/libical/ F: package/libmbim/ F: package/libndp/ F: package/libnftnl/ +F: package/libqmi/ +F: package/libqrtr-glib/ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ -- 2.17.0 From bernd.kuhls at t-online.de Sun Jan 30 12:34:35 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 30 Jan 2022 13:34:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.16.3 Message-ID: <20220130123435.13149-1-bernd.kuhls@t-online.de> Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 7960522f35..36b0c8c8a1 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee07a66a2cd8332695fb377b685ccf90e56fcff1717316211dee22bde7357d1f xmrig-6.16.2.tar.gz +sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ff2e8d6c1f..7fa638a54c 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.2 +XMRIG_VERSION = 6.16.3 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE -- 2.30.2 From thomas.petazzoni at bootlin.com Sun Jan 30 13:43:33 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:43:33 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov Message-ID: <20220130134605.E006B82870@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4bdbc7c505157d0039d1010e67f653b0f89b945 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..a4b4fa2f70 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2992,6 +2992,7 @@ F: package/circus/ F: package/dhcpcd/ F: package/feh/ F: package/giblib/ +F: package/hostapd/ F: package/imlib2/ F: package/jquery-datetimepicker/ F: package/jquery-sidebar/ @@ -3020,6 +3021,7 @@ F: package/swig/ F: package/qt5/qt5serialbus/ F: package/sdparm/ F: package/ti-utils/ +F: package/wpa_supplicant/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ From thomas.petazzoni at bootlin.com Sun Jan 30 13:43:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:43:35 +0100 Subject: [Buildroot] [git commit] package/xmrig: bump version to 6.16.3 Message-ID: <20220130134605.F1C6C82A75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0623d12244ae40a25603958ff6f4ee9d2db31698 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 7960522f35..36b0c8c8a1 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ee07a66a2cd8332695fb377b685ccf90e56fcff1717316211dee22bde7357d1f xmrig-6.16.2.tar.gz +sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index ff2e8d6c1f..7fa638a54c 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.2 +XMRIG_VERSION = 6.16.3 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sun Jan 30 13:43:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:43:34 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov Message-ID: <20220130134605.E8B2E82A6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73ce754531b5e45bd42b56c58718fbacc754406f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a4b4fa2f70..e17803f38a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3002,6 +3002,8 @@ F: package/libical/ F: package/libmbim/ F: package/libndp/ F: package/libnftnl/ +F: package/libqmi/ +F: package/libqrtr-glib/ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:25 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for hostapd and wpa_supplicant to Yegor Yefremov In-Reply-To: <20220130105116.18458-1-yegorslists@googlemail.com> References: <20220130105116.18458-1-yegorslists@googlemail.com> Message-ID: <20220130145325.733f8d3d@windsurf> On Sun, 30 Jan 2022 11:51:16 +0100 yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > Signed-off-by: Yegor Yefremov > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:28 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add entry for libqmi and libqrtr-glib to Yegor Yefremov In-Reply-To: <20220130105459.19339-1-yegorslists@googlemail.com> References: <20220130105459.19339-1-yegorslists@googlemail.com> Message-ID: <20220130145328.4192c53e@windsurf> On Sun, 30 Jan 2022 11:54:59 +0100 yegorslists--- via buildroot wrote: > From: Yegor Yefremov > > Signed-off-by: Yegor Yefremov > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/xmrig: bump version to 6.16.3 In-Reply-To: <20220130123435.13149-1-bernd.kuhls@t-online.de> References: <20220130123435.13149-1-bernd.kuhls@t-online.de> Message-ID: <20220130145331.5474ffa9@windsurf> On Sun, 30 Jan 2022 13:34:35 +0100 Bernd Kuhls wrote: > Changelog: > https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md > > Signed-off-by: Bernd Kuhls > --- > package/xmrig/xmrig.hash | 2 +- > package/xmrig/xmrig.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:00:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:00:17 +0100 Subject: [Buildroot] [PATCH 1/5] package/efl: bump to version 1.26.1 In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> Message-ID: <20220130150017.5914a95a@windsurf> On Sat, 29 Jan 2022 23:46:47 +0100 Romain Naour wrote: > This is a bug-fix release. > > See: https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 > > Signed-off-by: Romain Naour > --- > package/efl/efl.hash | 4 ++-- > package/efl/efl.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:00:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:00:20 +0100 Subject: [Buildroot] [PATCH 2/5] package/enlightenment: bump to version 0.25.1 In-Reply-To: <20220129224651.1282263-2-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-2-romain.naour@gmail.com> Message-ID: <20220130150020.2a13b8e5@windsurf> On Sat, 29 Jan 2022 23:46:48 +0100 Romain Naour wrote: > This is the a bugfix release. > > See: > https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 > > Signed-off-by: Romain Naour > --- > package/enlightenment/enlightenment.hash | 4 ++-- > package/enlightenment/enlightenment.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:02:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:02:43 +0100 Subject: [Buildroot] [PATCH 3/5] package/efl: rework eeze handling in Kconfig In-Reply-To: <20220129224651.1282263-3-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-3-romain.naour@gmail.com> Message-ID: <20220130150243.5795f1fa@windsurf> On Sat, 29 Jan 2022 23:46:49 +0100 Romain Naour wrote: > Commit [1] added eeze dependency using "depends on" to several efl > options (drm, libmount) instead of selecting eeze and propagate the > udev reverse dependency. I do agree with changing from a "depends on BR2_PACKAGE_EFL_EEZE" to a "depends BR2_PACKAGE_HAS_UDEV" + "select BR2_PACKAGE_EFL_EEZE". However... > The dependency between eeze, libinput, efl drm requires to add a new > libinput option. ... I don't understand this justification. Could you clarify. Even after reading PATCH 4/5, I don't get the relationship. PATCH 4/5 could have been done (I guess using the same principle of "depends on BR2_PACKAGE_EFL_EEZE". > Rework eeze handling to use select BR2_PACKAGE_EFL_EEZE since the > user is already aware of the udev dependency (BR2_PACKAGE_HAS_UDEV). I don't understand why you say the user is already aware of the udev dependency? Thanks to the comments? > comment "efl's libmount support needs udev /dev management (eeze)" Remove the "eeze" between parenthesis here I believe. > - depends on !BR2_PACKAGE_EFL_EEZE > + depends on !BR2_PACKAGE_HAS_UDEV > > config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG > bool > @@ -173,7 +174,7 @@ config BR2_PACKAGE_EFL_WAYLAND > depends on BR2_PACKAGE_WAYLAND > depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine > - depends on BR2_PACKAGE_EFL_EEZE # efl drm > + depends on BR2_PACKAGE_HAS_UDEV # efl drm (eeze) > depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only > depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput > select BR2_PACKAGE_EFL_DRM > @@ -182,7 +183,7 @@ config BR2_PACKAGE_EFL_WAYLAND > comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" Ditto. > depends on BR2_PACKAGE_WAYLAND > depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ > - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ > + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ > || !BR2_ENABLE_LOCALE > > choice > @@ -215,9 +216,10 @@ endchoice # OpenGL support > > config BR2_PACKAGE_EFL_DRM > bool "Evas DRM Engine" > - depends on BR2_PACKAGE_EFL_EEZE > + depends on BR2_PACKAGE_HAS_UDEV (eeze) Does this line really parses correctly? > depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d > + select BR2_PACKAGE_EFL_EEZE > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_LIBINPUT # For elput > select BR2_PACKAGE_LIBXKBCOMMON > @@ -232,7 +234,7 @@ config BR2_PACKAGE_EFL_DRM > > comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" Remove the "eeze" between parenthesis. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:05:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:05:27 +0100 Subject: [Buildroot] [PATCH 4/5] package/efl: handle input option In-Reply-To: <20220129224651.1282263-4-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-4-romain.naour@gmail.com> Message-ID: <20220130150527.12c67565@windsurf> Hello, On Sat, 29 Jan 2022 23:46:50 +0100 Romain Naour wrote: > +config BR2_PACKAGE_EFL_LIBINPUT > + bool "Enable libinput support (recommended)" > + default y > + depends on BR2_PACKAGE_HAS_UDEV # libinput Should be: depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze > +comment "libinput needs udev /dev management (eeze)" Drop "eeze" between parenthesis. > + depends on !BR2_PACKAGE_HAS_UDEV > + > config BR2_PACKAGE_EFL_LIBSNDFILE > bool "Enable libsndfile support (recommended)" > default y > @@ -216,13 +229,11 @@ endchoice # OpenGL support > > config BR2_PACKAGE_EFL_DRM > bool "Evas DRM Engine" > - depends on BR2_PACKAGE_HAS_UDEV (eeze) > + depends on BR2_PACKAGE_HAS_UDEV # elput, eeze You fixed a bug from the previous commit here. What is "elput" ? > depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d > - select BR2_PACKAGE_EFL_EEZE > + select BR2_PACKAGE_EFL_LIBINPUT Is that the explanation for PATCH 3/5 ? But even that doesn't seem to justify PATCH 3/5: you could have done the same with a "depends on BR2_PACKAGE_EFL_EEZE". Again: I agree with PATCH 3/5, and I think it's the right patch. I just don't understand the justification it has in its commit log. > select BR2_PACKAGE_LIBDRM > - select BR2_PACKAGE_LIBINPUT # For elput What is "elput" ? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:51 +0100 Subject: [Buildroot] [git commit] package/enlightenment: bump to version 0.25.1 Message-ID: <20220130140530.CDF857FEA9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e889bc8db5ac67031abec8a55ba12abb3c443555 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is the a bugfix release. See: https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index dd4c4d78c0..2d977b86f7 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,4 +1,4 @@ -# From https://www.enlightenment.org/news/2021-12-26-enlightenment-0.25.0 -sha256 7d6e72ceed5aca135b7a49c2a1c1eb9d8fde1318613517401d0418e0e5f6df06 enlightenment-0.25.0.tar.xz +# From https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 +sha256 2cf05fe3d96ef35e823619dbc0ac513ecabcae2186800ecd804924a637112444 enlightenment-0.25.1.tar.xz sha256 8d2fbc393e967cd6f5b8559d1744881a6a1ceb3ec6e1c2368c3916809ffccb8d COPYING sha256 cdc77ee1732455b203610f923fe4196046b3f7509038c48dc0b0c7e3492c23f3 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 24bbd96cd0..95670e800d 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.25.0 +ENLIGHTENMENT_VERSION = 0.25.1 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) From thomas.petazzoni at bootlin.com Sun Jan 30 13:53:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 14:53:46 +0100 Subject: [Buildroot] [git commit] package/efl: bump to version 1.26.1 Message-ID: <20220130140530.C5D9F82A52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8aa81ad9f129f8aa3ccd5bdb1207c0ecc3de147a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a bug-fix release. See: https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 6364d276c0..8d50400eb7 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://www.enlightenment.org/news/2021-12-26-efl-1.26.0 -sha256 a4a9bce45fd27f8541874e44a130f64550bee1f2f72feaa6c8a758d92eaf204c efl-1.26.0.tar.xz +# From https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 +sha256 86a9677e3d48dd0c13a399ebb417bd417bd8d150d6b06cc491bc92275c88a642 efl-1.26.1.tar.xz sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING diff --git a/package/efl/efl.mk b/package/efl/efl.mk index ed0a8acc1d..43a2dc4fcb 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.26.0 +EFL_VERSION = 1.26.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT From thomas.petazzoni at bootlin.com Sun Jan 30 14:12:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:12:28 +0100 Subject: [Buildroot] [git commit] docs/manual/adding-packages-directory.txt: reorder select/depends Message-ID: <20220130140530.D72C082A75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39458e33c1e0c4704fd1dbcd64b87cb7016c6deb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master >From [1]: "Even though the ordering has absolutely no consequences in Kconfig, it is not logical (when reading). It is more logical and far easier to understand when depends come first, followed by the selects." Also, the Config.in example in the manual suggests to use this coding style [2]." Use the correct coding style in the chapter "Choosing depends on or select" in the manual. [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html [2] https://nightly.buildroot.org/manual.html#_coding_style Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 6c68d7aa67..e5c7462a6c 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -196,13 +196,13 @@ config BR2_PACKAGE_E -------------------------- config BR2_PACKAGE_D bool "Package D" - select BR2_PACKAGE_B depends on BR2_PACKAGE_A + select BR2_PACKAGE_B config BR2_PACKAGE_E bool "Package E" - select BR2_PACKAGE_D depends on BR2_PACKAGE_A + select BR2_PACKAGE_D -------------------------- Overall, for package library dependencies, +select+ should be From thomas.petazzoni at bootlin.com Sun Jan 30 14:12:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:12:34 +0100 Subject: [Buildroot] [PATCH 5/5] docs/manual/adding-packages-directory.txt: reorder select/depends In-Reply-To: <20220129224651.1282263-5-romain.naour@gmail.com> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-5-romain.naour@gmail.com> Message-ID: <20220130151234.6ab8458c@windsurf> On Sat, 29 Jan 2022 23:46:51 +0100 Romain Naour wrote: > From [1]: > "Even though the ordering has absolutely no consequences in Kconfig, it > is not logical (when reading). It is more logical and far easier to > understand when depends come first, followed by the selects." > > Also, the Config.in example in the manual suggests to use this coding > style [2]." > > Use the correct coding style in the chapter "Choosing depends on or select" > in the manual. > > [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html > [2] https://nightly.buildroot.org/manual.html#_coding_style > > Signed-off-by: Romain Naour > --- > docs/manual/adding-packages-directory.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:17:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:17:25 +0100 Subject: [Buildroot] [git commit] package/{rust, rust-bin}: bump to version 1.58.1 Message-ID: <20220130141029.4FC9782A52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a865fc386d9e7b7e23e5bca051f38ab45920829f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 198 ++++++++++++++++++++--------------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index bdb1f07fcc..9f8788a295 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,102 +1,102 @@ -# From https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 9c3baf8ec849978b0206262fc402ac9d24fdb2a8ae7b5d785b09022dbdbc20e8 rust-1.54.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9fb4a22b74120b81a4d896326b02d121d5f996b3288580c346ea55a52d8946a9 rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a1a77737d218087eb7d3613adcde2c9e383d758cdf128646a0ee63396145270b rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 9a7ff8e4cd160f6a58c3b5c7e679b7acdc427c2440ecc70a31a5dc71bbecd0c8 rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c87dc1681756c9c275eba690c6a05bcdd2ac3bd04a70ae039869dc85fff18b69 rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 74c9f120ad8a443798ebec74302b5166a0880b13b1d8c43dde0c8ba70d9e4b2d rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 2a19d96cf9e863448b21ff989550da54080312ce99272128cc0eb3b1fe5c73cc rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 481192a6906c44501f910a35fc49ed9b1b271925c4569a52f45d9efbc2058ae2 rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 2716f587d0da1dd26fc64251303f5705230f5b86e47e9af35e11622d01ceb963 rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 b1f25af230f3b6fd930452024bd0cc9f4599bfb15f09f802cdb756effa516bbf rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 86549aca1b65188cedf3f1c8fce5af3d7f817450418367049d4bbe8c69ba1da0 rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 7823b95fc3fcd7cc47ba767e2e917c9efbafed2d5ad0b74e7c087600bd72e54f rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 f9a650a3970dbc321e8979dd87ed02fd8f9d03901c3fb1a87724f3c214eb6e57 rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 19a80cfaf18c15eaa1c112312c0cb0ccfd14179407118b35735cdcfc1cc4c60f rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 7c747dea305f5d4b1c6a23d064fbb41e24bb56f2917867020bb57cb064878dc4 rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.asc -sha256 b52dd3d4ae465037ed2987e23457d30e1a75fd16c2c421613ec52c250947a5f8 rust-std-1.54.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e88269a37ebfbff52fcd07746c53fc0bfa2570531f10f226800d5783ce735e3f rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.asc -sha256 947054afa4d6e37c64e484c704b5f09043783b83aafbf7a00e6959442b1fc14f rust-std-1.54.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 59c0bd07976f9e18e05e328e2f0acd9e99b736ea0330a03b313842e5c5816e13 rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.asc -sha256 02611ec7a6d510572803b4bd9948f0790e9f0ae8e3047ff7fa465300346e3b74 rust-std-1.54.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 dba582de46b7f97ba85b2d75662482df67214e71e0b9cea3c9c153c9d371a00f rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2e94aedf59369d81524dfe8027e6e4fb0fe338d2ee7869bd96e5cef24974cf0e rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 d1d32bc202b026470ec2c37826fef92bd91f46b08ed1e2620a50eadba03d7095 rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 25d0c06fb445e16d7aac3b5370b43e72600a2aee41fa06605f64a3b8a8ed0e4b rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 626b4255d31c35fa77669471c15ec63b0e88726115538e598a6ef6e814d83bae rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 0f4aaec3ef60ad3c017a39925a1627cc79cd5be00cc8ea7759a470c24b0b66e7 rust-std-1.54.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 116b2cd682cc5902f91a1ffbe2eb649262d871cd3c47e539afeb723513ae15eb rust-std-1.54.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 f0329a9d6c96eeb1db5cb7969dbadbab58768b8bff48a1ffc89103031945126e rust-std-1.54.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 c08b7df82a30acacb3afcdad34b3384e77a9f35ce6bef10d43f29f129fab35e1 rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 8b9ac3e1947036d6f2a3939edd279631fc1b0a260507343a8b3e9ecd448fe738 rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 6ce101e3c5b1bae6006c61a18dcb5685fe0ff57ea8c00a36e6bf95f748abe5f6 rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a22e19859b3c5032daac1633637546a986c51bdfa3ad0db6e394e6cc461f466b rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 c2de24eb3e524c0fdd1e8116f578c103035da1ece1e4c06efab67999180eefe8 rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 110ca4967351d8535f3d39e24f40e2941c20346c5765d3530270e134ae50568e rust-1.58.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f71b077caf0becbd0af9fd22bc1fa31c4fdf7a21fe046da8a15a7bde1286da25 rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 c7a016ac63aeb5481d661ee3e680b57d35d5ccb902c605c32937a047a02cff49 rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 4c8d9774fb1f6cfa616f2c43395f438e887a38f0cd901a3886056cc1c1b84c30 rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 eb58c2b72e9bbe50c80e9f2981e14d737198f7e17a4cad524d00baefdfa3bc1d rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 58e3f4905c3e7028811971219a3222640f947062fb93dbe51c1674551e9b06a6 rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 b354f0ad28d8cc7d5996d46c3a310c80aa6486ac7b89abcd1eeef7f13435e0ff rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 705fba2a50835354112ab86d1ee8889c39f3c7265d7ca26f1dffebaa463600a6 rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 0505759fa8b26c902a701f266db4bfbfe496de71c5c6548a55c562fe9d386485 rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 9ca8adb43b4e75556a99b6c7a9bc1d9aab894bbe109736c34582169ec81aee14 rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 9f38bc3220d659ff482db9a0ace9dcb7051991d471149fad7bbb62fce8314e04 rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 1511c675d17033737ab2bd1e87b525aaf59e0455f5a717ab0a91fd849949164f rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 2cf8a8cc2441a1bb4b45b690c87fff4df975fac077240706c08594e26f901bdc rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 db86e823484f210884d7d815ffcd7dae355bba86e18151b0838ec06544bb8126 rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 02bce02f929114cc60126410fceeab6c0bcc8b96c394de9516d8f449880cb585 rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.asc +sha256 e80d5769f042a00388546dbd26cb40c045d5dddc84e5da3f98d174027ed9eaaa rust-std-1.58.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 d7f2bc431db551ea9019a6d50d4e3f11e14fabbea3abec1478ac72a281309152 rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.asc +sha256 c70fbb13aedfb88cfec8098355a155a4edce3d52f9b099bc033b7c7ac45aab00 rust-std-1.58.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 b678ac0282cbb1965f9a7485a1f56b01d0229f91ddff5a18a9628f86970f5902 rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.asc +sha256 2f571f4c9b4e86e278539e811f495fb84f44898d4333b983a3d95ef5d2c0fdd8 rust-std-1.58.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 7f2f613606f039eec83239753a83c227b1d3c39b6474647234e7788a1541e850 rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 7283539843df5c8abd06b0ce3830efeab0d673447b45d3b6636d2eb296d28681 rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 3d2935e0979a7150cc271481f5f06569005ee27f0a7ef7ed1a5393c3e34b1974 rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 33078d23ea70ca405b5938e5a2a74fbf4ec7dc41b729e4991e3e01d4c8370028 rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 fdade0d00dac3524348041ec915a5a96208c9c1929ce746ab6352d0d2897a3a7 rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 c747a00ac9a6ee70793002e6db2fbce3b2cd60eda277729468d18369736c6c8e rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 7813f825e5d10aac0ded4b3f785970c69c25464b4edcf9c2b83eff0e55ee95f3 rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 c68d93de3a46ec709788fee2c38a298a261d4254d299299195ab3474b316a59b rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 a85f5f42918e8b140d7093ba49fc46a21625863538c95d2db03f831cc445f025 rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 2d7276fe261478c377913177dcec3e0aeed84f2c567db0ae8e415efee7bb9ce0 rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 7a7cd002c63179f3f47d64b1140c180986322a7cc0d31de61d7c4728cedacba0 rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 e72367c15906f021f46801652181c917cd3328be022b93bb30506724f7b56256 rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 b0d3e03c9b1eff6e241383913b02653ba80776626ca7c4a93f36c2ad829ba989 rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index bc8a485ac5..d4cb8f50ea 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.54.0 +RUST_BIN_VERSION = 1.58.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 30a348e982..7eb8f59603 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.asc -sha256 a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4 rustc-1.54.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.asc +sha256 2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469 rustc-1.58.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 26ee2a9362..5fad7d404c 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.54.0 +RUST_VERSION = 1.58.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From thomas.petazzoni at bootlin.com Sun Jan 30 14:17:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:17:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.58.1 In-Reply-To: <20220129203438.3855797-1-james.hilliard1@gmail.com> References: <20220129203438.3855797-1-james.hilliard1@gmail.com> Message-ID: <20220130151743.1dc28539@windsurf> On Sat, 29 Jan 2022 13:34:38 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/rust-bin/rust-bin.hash | 198 ++++++++++++++++----------------- > package/rust-bin/rust-bin.mk | 2 +- > package/rust/rust.hash | 6 +- > package/rust/rust.mk | 2 +- > 4 files changed, 104 insertions(+), 104 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:18:12 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:18:12 +0100 Subject: [Buildroot] [git commit] package/poke: install libpoke.so to staging Message-ID: <20220130142119.A0CB982A52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3af06834c80a5efe5696dac0aab81cb233cec334 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Poke generate a library libpoke.so, so install it to staging. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/poke/poke.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/poke/poke.mk b/package/poke/poke.mk index fed023e954..ddd03ae3b0 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -13,6 +13,7 @@ POKE_LICENSE_FILES = COPYING jitter/COPYING # 0001-configure.ac-HELP2MAN-replace-by-false-when-cross-co.patch POKE_AUTORECONF = YES +POKE_INSTALL_STAGING = YES POKE_DEPENDENCIES = host-flex host-bison host-pkgconf bdwgc readline # poke bundle gnulib that doesn't support the case where From thomas.petazzoni at bootlin.com Sun Jan 30 14:28:26 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:28:26 +0100 Subject: [Buildroot] [PATCH 1/3] package/poke: install libpoke.so to staging In-Reply-To: <20220129142352.1197168-1-romain.naour@gmail.com> References: <20220129142352.1197168-1-romain.naour@gmail.com> Message-ID: <20220130152826.27bed0e4@windsurf> On Sat, 29 Jan 2022 15:23:50 +0100 Romain Naour wrote: > Poke generate a library libpoke.so, so install it to staging. > > Signed-off-by: Romain Naour > --- > package/poke/poke.mk | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:28:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:28:38 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: add missing openssl build dependency Message-ID: <20220130142326.9897D8282A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e2976aee57cb4f8f75899c4ad5a5ea4ff8f5ad4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 01764876e3d4e7ab95c8365f1c83e6c12d49757c ("package/python-cryptography: bump version to 36.0.1") incorrectly removed the build dependency on openssl. This causes the following build failure: build/temp.linux-x86_64-3.10/_openssl.c:575:10: fatal error: openssl/opensslv.h: No such file or directory 575 | #include | ^~~~~~~~~~~~~~~~~~~~ as OpenSSL is no longer guaranteed to be built before python-cryptography (the Config.in file still had a "select BR2_PACKAGE_OPENSSL" guaranteeing that OpenSSL would be built, but not necessarily before). Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-cryptography/python-cryptography.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index fc1686af9a..e642691bc5 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -12,7 +12,11 @@ PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-setuptools-rust host-python-cffi host-rustc +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" From thomas.petazzoni at bootlin.com Sun Jan 30 14:30:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:30:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: add missing openssl build dependency In-Reply-To: <20220129202751.3851776-1-james.hilliard1@gmail.com> References: <20220129202751.3851776-1-james.hilliard1@gmail.com> Message-ID: <20220130153056.312fb1b2@windsurf> On Sat, 29 Jan 2022 13:27:51 -0700 James Hilliard wrote: > Fixes: > build/temp.linux-x86_64-3.10/_openssl.c:575:10: fatal error: openssl/opensslv.h: No such file or directory > 575 | #include > | ^~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: James Hilliard > --- > package/python-cryptography/python-cryptography.mk | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Applied to master with an extended commit log, especially pointing at when the regression/issue was introduced. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:46:05 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:46:05 +0100 Subject: [Buildroot] [PATCH 2/3] package/poke: disable minimal-threading with thumb or thumb2 In-Reply-To: <20220129142352.1197168-2-romain.naour@gmail.com> References: <20220129142352.1197168-1-romain.naour@gmail.com> <20220129142352.1197168-2-romain.naour@gmail.com> Message-ID: <20220130154605.5fad582e@windsurf> Hello, On Sat, 29 Jan 2022 15:23:51 +0100 Romain Naour wrote: > +# Disable minimal-threading when thumb or thumb2 is enabled > +# due to runtime issue. > +# https://lists.gnu.org/archive/html/poke-devel/2022-01/msg00162.html > +ifeq ($(BR2_ARM_CPU_HAS_THUMB)$(BR2_ARM_CPU_HAS_THUMB2),y) > +POKE_CONF_OPTS += --disable-dispatch-minimal-threading > +else > +POKE_CONF_OPTS += --enable-dispatch-minimal-threading > +endif I don't understand this patch, because minimal-threading is already disabled by default (at least in poke 1.4, I haven't checked in poke 2.0). jitter/configure.ac contains: # Is the minimal-threading dispatch enabled? Check the default and the # configure command-line option. AC_MSG_CHECKING([if minimal-threading dispatch is enabled]) # FIXME: reenable this when I make defect handling reliable. #default=$(test "x$JITTER_HAVE_ACTUAL_GCC" = "xyes" && echo yes || echo no) default=no AC_ARG_ENABLE([dispatch-minimal-threading], AS_HELP_STRING([--enable-dispatch-minimal-threading], [enable minimal threading dispatch: default yes if and only if GCC (not an imitation) is used]), jitter_enable_dispatch_minimal_threading="$enableval", jitter_enable_dispatch_minimal_threading="$default") if test "x$jitter_enable_dispatch_minimal_threading" = "xyes"; then jitter_best_dispatch_model="minimal-threading" jitter_enabled_dispatch_models="$jitter_enabled_dispatch_models minimal-threading" fi AC_MSG_RESULT([$jitter_enable_dispatch_minimal_threading$jitter_subpackage_disclaimer]) # FIXME: remove this warning message when I make defect handling reliable. if test "x$jitter_enable_dispatch_minimal_threading" = "xyes"; then AC_MSG_WARN([minimal-threading dispatch is currently unreliable, and should not be used in production until defective instruction replacement is fully implemented]) fi See the "default=no" ? Also, when building with the following defconfig: BR2_arm=y BR2_cortex_a8=y BR2_ARM_EABI=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_POKE=y # BR2_TARGET_ROOTFS_TAR is not set The minimal threading is already disabled: checking if switch dispatching is enabled... yes, provisionally (sub-package mode) checking if direct-threading dispatch is enabled... yes, provisionally (sub-package mode) checking if minimal-threading dispatch is enabled... no, provisionally (sub-package mode) checking if no-threading dispatch is enabled... no, provisionally (sub-package mode) configure: sub-package mode: disabling every dispatch except direct-threading configure: (the following dispatches could have been enabled: switch direct-threading) configure: enabled dispatching models are: direct-threading configure: the best enabled dispatching model is: direct-threading So what this patch is doing is in fact slightly the opposite of what he says: instead of disabling minimal threading for thumb or thumb2, it enables it for any other platform. Are you sure this patch was needed for poke 1.4, and not for poke 2.0 ? Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:49:08 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:49:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/libsoup: add choice between libsoup2 and libsoup3 In-Reply-To: <20220129214235.5133-2-thomas.devoogdt@gmail.com> References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> <20220129214235.5133-2-thomas.devoogdt@gmail.com> Message-ID: <20220130154908.0ff0f0b6@windsurf> Hello Thomas, Thanks for your patch. On Sat, 29 Jan 2022 22:42:35 +0100 Thomas Devoogdt wrote: > Libsoup3 has a new API [1], packages using libsoup2 may not > compile with libsoup3 or may crash at runtime in unexpected > ways. So the default will (for now) stay on libsoup2. > A tracking table for the migration can be found here [2]. A "choice" is not going to work well, as it means that in a given configuration we will only be able to install either packages that need libsoup2 *or* packages that libsoup3, bit not a mix of both. Is it possible to install both libsoup2 and libsoup3 side-by-side in the same system? This requires them having a different library name and a different location for header files. If that's the case, we will definitely want to have a separate libsoup3 package, so that we can install libsoup and libsoup3 side by side in the same system. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:50:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:50:42 +0100 Subject: [Buildroot] [git commit] package/libglib2: bump version to 2.70.0 Message-ID: <20220130144346.7617282AE5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=079923d5fabf4f887bb140808cb16067ca08b19b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The internal_pcre option was dropped in: https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- package/libglib2/0002-remove-cpp-requirement.patch | 2 +- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index c402cbafa5..2f95228932 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.68.4', + version : '2.70.0', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index d421e025ff..580be3e08e 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum -sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum +sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index af73aeb3bf..d3cba1a8bb 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.70 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ @@ -30,7 +30,6 @@ HOST_LIBGLIB2_CONF_OPTS = \ -Dselinux=disabled \ -Dsystemtap=false \ -Dxattr=false \ - -Dinternal_pcre=false \ -Dtests=false \ -Doss_fuzz=disabled @@ -52,7 +51,6 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ -Dglib_debug=disabled \ - -Dinternal_pcre=false \ -Dlibelf=disabled \ -Dgio_module_dir=/usr/lib/gio/modules \ -Dtests=false \ From thomas.petazzoni at bootlin.com Sun Jan 30 14:51:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:51:35 +0100 Subject: [Buildroot] [git commit] board/andes: fix build failure with host gcc >= 10 Message-ID: <20220130144438.AE24282A52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3529e8c21c939d73cc0090cb41c17b02db5b1013 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add patch to fix linux bug: ``` HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ``` Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478164 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...-Remove-redundant-YYLOC-global-declaratio.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch new file mode 100644 index 0000000000..71ae991816 --- /dev/null +++ b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch @@ -0,0 +1,52 @@ +From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Tue, 14 Jan 2020 18:53:41 +0100 +Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration + +gcc 10 will default to -fno-common, which causes this error at link +time: + + (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here + +This is because both dtc-lexer as well as dtc-parser define the same +global symbol yyloc. Before with -fcommon those were merged into one +defintion. The proper solution would be to to mark this as "extern", +however that leads to: + + dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] + 26 | extern YYLTYPE yylloc; + | ^~~~~~ +In file included from dtc-lexer.l:24: +dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here + 127 | extern YYLTYPE yylloc; + | ^~~~~~ +cc1: all warnings being treated as errors + +which means the declaration is completely redundant and can just be +dropped. + +Signed-off-by: Dirk Mueller +Signed-off-by: David Gibson +[robh: cherry-pick from upstream] +Cc: stable at vger.kernel.org +Signed-off-by: Rob Herring +Signed-off-by: Giulio Benetti +--- + scripts/dtc/dtc-lexer.l | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l +index 06c040902444..d1b3810156c7 100644 +--- a/scripts/dtc/dtc-lexer.l ++++ b/scripts/dtc/dtc-lexer.l +@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +-- +2.25.1 + From thomas.petazzoni at bootlin.com Sun Jan 30 14:52:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:52:35 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.70.0 In-Reply-To: <20220129214235.5133-1-thomas.devoogdt@gmail.com> References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> Message-ID: <20220130155235.2f51e08a@windsurf> On Sat, 29 Jan 2022 22:42:34 +0100 Thomas Devoogdt wrote: > The internal_pcre option was dropped in: > https://gitlab.gnome.org/GNOME/glib/-/commit/9fbd7f3dc1f029b64b6991a540402b2bfa98de5c > > Signed-off-by: Thomas Devoogdt > --- > package/libglib2/0002-remove-cpp-requirement.patch | 2 +- > package/libglib2/libglib2.hash | 4 ++-- > package/libglib2/libglib2.mk | 6 ++---- > 3 files changed, 5 insertions(+), 7 deletions(-) I've applied, thanks! It would be nice if you could watch http://autobuild.buildroot.net/ in the next few days and see if there are any failures related to libglib2 (note: failures can happen in other packages that libglib2), as major updates of libglib2 have several times caused breakage. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:53:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:53:25 +0100 Subject: [Buildroot] [PATCH] board/andes: fix build failure with host gcc >= 10 In-Reply-To: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> References: <20220129231420.3470589-1-giulio.benetti@benettiengineering.com> Message-ID: <20220130155325.635964dc@windsurf> Hello Giulio, On Sun, 30 Jan 2022 00:14:20 +0100 Giulio Benetti wrote: > Add patch to fix linux bug: > ``` > HOSTLD scripts/dtc/dtc > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > ``` > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478164 > > Signed-off-by: Giulio Benetti > --- > ...ve-redundant-YYLOC-global-declaratio.patch | 52 +++++++++++++++++++ > 1 file changed, 52 insertions(+) > create mode 100644 board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch I've applied to master. However, I would have very much preferred a kernel version bump, tested by Nylon Chen. Nylon: could you send a patch to update this defconfig to a newer kernel version? Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:55:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:55:13 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: fix debug build Message-ID: <20220130144826.BA4A482747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=32a0230d7028d9cbe90e25bcbf5d814dbe1b9967 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There is no --debug mode for cargo resulting in the following build failure in ripgrep since its conversion to cargo infrastructure in commit 342fd3e7350479dc368541ac77a5130ebb53194c: error: Found argument '--debug' which wasn't expected, or isn't valid in this context Fixes: - http://autobuild.buildroot.org/results/772ebdd6a39950457a59419bdc1376cb0e0a3611 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 614d46ad64..e74a8358bc 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -104,7 +104,7 @@ define $(2)_BUILD_CMDS $$($(2)_CARGO_ENV) \ cargo build \ --offline \ - $$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \ + $$(if $$(BR2_ENABLE_DEBUG),,--release) \ --manifest-path Cargo.toml \ --locked \ $$($(2)_CARGO_BUILD_OPTS) From thomas.petazzoni at bootlin.com Sun Jan 30 14:55:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:55:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo: fix debug build In-Reply-To: <20220129094222.3583303-1-fontaine.fabrice@gmail.com> References: <20220129094222.3583303-1-fontaine.fabrice@gmail.com> Message-ID: <20220130155559.11d4fea3@windsurf> On Sat, 29 Jan 2022 10:42:22 +0100 Fabrice Fontaine wrote: > There is no --debug mode for cargo resulting in the following build > failure in ripgrep since its conversion to cargo infrastructure in > commit 342fd3e7350479dc368541ac77a5130ebb53194c: > > error: Found argument '--debug' which wasn't expected, or isn't valid in this context > > Fixes: > - http://autobuild.buildroot.org/results/772ebdd6a39950457a59419bdc1376cb0e0a3611 > > Signed-off-by: Fabrice Fontaine > --- > package/pkg-cargo.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. However, I'm wondering if we shouldn't instead use: --profile=release and --profile=dev See https://doc.rust-lang.org/cargo/reference/profiles.html Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:56:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:56:17 +0100 Subject: [Buildroot] [git commit] package/pkcs11-helper: drop autoreconf Message-ID: <20220130144927.3969F82747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59f8a971ae6c8f88bf99dede56946e701a2c1b40 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master autoreconf is not needed since commit dbf8047f64f081ffbc97b67dd891690632377692 as the official tarball already ships a configure file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pkcs11-helper/pkcs11-helper.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 805e000759..90929404be 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -10,7 +10,6 @@ PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/p PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL PKCS11_HELPER_DEPENDENCIES = host-pkgconf -PKCS11_HELPER_AUTORECONF = YES PKCS11_HELPER_INSTALL_STAGING = YES PKCS11_HELPER_CONF_OPTS = \ From thomas.petazzoni at bootlin.com Sun Jan 30 14:56:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:56:25 +0100 Subject: [Buildroot] [git commit] package/pkcs11-helper: bump to version 1.28 Message-ID: <20220130144927.42E1482AEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a2e33c5149c902e8532be7db6b97a6ef4fb9e62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/OpenSC/pkcs11-helper/releases/tag/pkcs11-helper-1.28 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch | 62 ---------------------- package/pkcs11-helper/pkcs11-helper.hash | 2 +- package/pkcs11-helper/pkcs11-helper.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) diff --git a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch b/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch deleted file mode 100644 index d0b573446f..0000000000 --- a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d159a5c59c80552c3e8ea75d9bcf29b3a8e8289d Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 30 Jul 2021 20:06:36 +0300 -Subject: [PATCH] nss: use nss pkcs11.h - -make nss happy with its own extensions and non-standard behavior. -[Retrieved (and updated to remove ChangeLog update) from: -https://github.com/OpenSC/pkcs11-helper/pull/39] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 1 + - lib/_pkcs11h-crypto-nss.c | 14 ++++++++++---- - lib/common.h | 7 +++++++ - 3 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/lib/_pkcs11h-crypto-nss.c b/lib/_pkcs11h-crypto-nss.c -index 4b70e826..f57f9e6b 100644 ---- a/lib/_pkcs11h-crypto-nss.c -+++ b/lib/_pkcs11h-crypto-nss.c -@@ -48,15 +48,21 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include "common.h" -- --#include "_pkcs11h-crypto.h" -+#ifdef HAVE_CONFIG_H -+#include -+#endif - - #if defined(ENABLE_PKCS11H_ENGINE_NSS) --#define _PKCS11T_H_ /* required so no conflict with ours */ - #include - #include - -+/* Use PKCS#11 of nss to avoid conflicts and make nss happy with its own extensions */ -+#define PKCS11_H 1 -+ -+#include "common.h" -+ -+#include "_pkcs11h-crypto.h" -+ - static - int - __pkcs11h_crypto_nss_initialize ( -diff --git a/lib/common.h b/lib/common.h -index 61a958af..2499e9c5 100644 ---- a/lib/common.h -+++ b/lib/common.h -@@ -72,5 +72,12 @@ - - #define _PKCS11H_ASSERT assert - -+#ifndef FALSE -+#define FALSE 0 -+#endif -+#ifndef TRUE -+#define TRUE 1 -+#endif -+ - #endif - diff --git a/package/pkcs11-helper/pkcs11-helper.hash b/package/pkcs11-helper/pkcs11-helper.hash index d707bcf914..4114378ab8 100644 --- a/package/pkcs11-helper/pkcs11-helper.hash +++ b/package/pkcs11-helper/pkcs11-helper.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 653730f0c561bbf5941754c0783976113589b2dc64a0661c908dc878bfa4e58b pkcs11-helper-1.27.0.tar.bz2 +sha256 5bd55adafdbb708e096070dd0a910f23e1d5fd6291922398c1a15f00fff2b5ec pkcs11-helper-1.28.0.tar.bz2 sha256 808705ac1daafe07a76431929575c5712a8693977a39ec9102aed25f030754d9 COPYING sha256 865496cf23a6c792739ff2f9ea11e95ac99db89cfe3780a295b4e1495a9c19fe COPYING.BSD sha256 cd2e7d63a11058f19c58b06fb8c759140ce70788369dce6e6e9db40d3475021e COPYING.GPL diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 90929404be..4fc3e21e5a 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -4,7 +4,7 @@ # ################################################################################ -PKCS11_HELPER_VERSION = 1.27 +PKCS11_HELPER_VERSION = 1.28 PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).0.tar.bz2 PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-$(PKCS11_HELPER_VERSION) PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause From thomas.petazzoni at bootlin.com Sun Jan 30 14:56:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:56:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkcs11-helper: drop autoreconf In-Reply-To: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> References: <20220128215013.2997212-1-fontaine.fabrice@gmail.com> Message-ID: <20220130155646.24ea8390@windsurf> On Fri, 28 Jan 2022 22:50:12 +0100 Fabrice Fontaine wrote: > autoreconf is not needed since commit > dbf8047f64f081ffbc97b67dd891690632377692 as the official tarball already > ships a configure file > > Signed-off-by: Fabrice Fontaine > --- > package/pkcs11-helper/pkcs11-helper.mk | 1 - > 1 file changed, 1 deletion(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:56:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:56:57 +0100 Subject: [Buildroot] [git commit] package/p11-kit: bump to version 0.24.1 Message-ID: <20220130144959.2516982747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4fabac3f7fd55570e1ccddc023a64bef712d2fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/p11-glue/p11-kit/releases/tag/0.24.1 https://github.com/p11-glue/p11-kit/releases/tag/0.24.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...t-lists-c-Add-stdint-h-to-fix-compilation.patch | 28 ---------------------- package/p11-kit/p11-kit.hash | 2 +- package/p11-kit/p11-kit.mk | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch b/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch deleted file mode 100644 index d4828666d3..0000000000 --- a/package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 507c394cfcf4edffc5e4450c5d737e545c26b857 Mon Sep 17 00:00:00 2001 -From: Daniel Engberg -Date: Sat, 12 Dec 2020 18:56:38 +0100 -Subject: [PATCH] p11-kit/lists.c: Add stdint.h to fix compilation - -Add stdint.h otherwise compilation fails on FreeBSD 13-CURRENT with "use of undeclared identifier 'SIZE_MAX'" - -Signed-off-by: Daniel Engberg - -[Retrieved from: -https://github.com/p11-glue/p11-kit/commit/507c394cfcf4edffc5e4450c5d737e545c26b857] -Signed-off-by: Fabrice Fontaine ---- - p11-kit/lists.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/p11-kit/lists.c b/p11-kit/lists.c -index 365a6d89..1d9062be 100644 ---- a/p11-kit/lists.c -+++ b/p11-kit/lists.c -@@ -39,6 +39,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/package/p11-kit/p11-kit.hash b/package/p11-kit/p11-kit.hash index 3481a40b00..e950060c91 100644 --- a/package/p11-kit/p11-kit.hash +++ b/package/p11-kit/p11-kit.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6 p11-kit-0.23.22.tar.xz +sha256 d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8 p11-kit-0.24.1.tar.xz # Locally computed sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 284eb0fa35..868e3a7c9b 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -4,7 +4,7 @@ # ################################################################################ -P11_KIT_VERSION = 0.23.22 +P11_KIT_VERSION = 0.24.1 P11_KIT_SOURCE = p11-kit-$(P11_KIT_VERSION).tar.xz P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION) P11_KIT_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Jan 30 14:57:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:57:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/p11-kit: bump to version 0.24.1 In-Reply-To: <20220128215657.3023442-1-fontaine.fabrice@gmail.com> References: <20220128215657.3023442-1-fontaine.fabrice@gmail.com> Message-ID: <20220130155704.67ce3036@windsurf> On Fri, 28 Jan 2022 22:56:57 +0100 Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/p11-glue/p11-kit/releases/tag/0.24.1 > https://github.com/p11-glue/p11-kit/releases/tag/0.24.0 > > Signed-off-by: Fabrice Fontaine > --- > ...ts-c-Add-stdint-h-to-fix-compilation.patch | 28 ------------------- > package/p11-kit/p11-kit.hash | 2 +- > package/p11-kit/p11-kit.mk | 2 +- > 3 files changed, 2 insertions(+), 30 deletions(-) > delete mode 100644 package/p11-kit/0001-p11-kit-lists-c-Add-stdint-h-to-fix-compilation.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 14:57:19 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:57:19 +0100 Subject: [Buildroot] [git commit] package/libuhttpd: bump to version 3.14.1 Message-ID: <20220130145021.16A6682747@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61797c52f5deef2cb67e60cf075ca243078c8855 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.1 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.0 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.13.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-openssl.c-fix-build-with-wolfssl.patch | 47 ---------------------- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch deleted file mode 100644 index deb1a0f93b..0000000000 --- a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e5c5ed1c64cfc715729c9bfbfdcc4be225f344ff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:32:39 +0200 -Subject: [PATCH] openssl.c: fix build with wolfssl - -Fix the following build failure with wolfssl: - -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new': -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function) - 174 | SSL_CTX_set_ciphersuites(c, tls13_ciphersuites); - | ^~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/d0fb629b40b05ad828775894fabed878692bb222 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/ssl/pull/1] ---- - openssl.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/openssl.c b/openssl.c -index 8f3d8b7..c42638c 100644 ---- a/src/ssl/openssl.c -+++ b/src/ssl/openssl.c -@@ -71,14 +71,14 @@ - "TLS13-AES256-GCM-SHA384:" \ - ecdhe_aead_ciphers - #else --# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -- "TLS_AES_128_GCM_SHA256:" \ -- "TLS_AES_256_GCM_SHA384" -- - # define top_ciphers \ - ecdhe_aead_ciphers - #endif - -+# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -+ "TLS_AES_128_GCM_SHA256:" \ -+ "TLS_AES_256_GCM_SHA384" -+ - #define ecdhe_aead_ciphers \ - "ECDHE-ECDSA-CHACHA20-POLY1305:" \ - "ECDHE-ECDSA-AES128-GCM-SHA256:" \ --- -2.30.2 - diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 98bd6e513b..e4fde4eb64 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz +sha256 512d4abfced0ec916d985d3d1eac7528e6676eecae6aca27fdaf313374e29f16 libuhttpd-3.14.1.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 3a99fe0613..b8cf935d01 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.12.1 +LIBUHTTPD_VERSION = 3.14.1 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sun Jan 30 14:57:28 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 15:57:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: bump to version 3.14.1 In-Reply-To: <20220128220738.3028614-1-fontaine.fabrice@gmail.com> References: <20220128220738.3028614-1-fontaine.fabrice@gmail.com> Message-ID: <20220130155728.7f171314@windsurf> On Fri, 28 Jan 2022 23:07:38 +0100 Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.1 > https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.0 > https://github.com/zhaojh329/libuhttpd/releases/tag/v3.13.0 > > Signed-off-by: Fabrice Fontaine > --- > ...001-openssl.c-fix-build-with-wolfssl.patch | 47 ------------------- > package/libuhttpd/libuhttpd.hash | 2 +- > package/libuhttpd/libuhttpd.mk | 2 +- > 3 files changed, 2 insertions(+), 49 deletions(-) > delete mode 100644 package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 15:00:27 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 16:00:27 +0100 Subject: [Buildroot] [git commit] package/htpdate: fix static openssl build Message-ID: <20220130145353.DEC2882AEC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ad05acb1e8c83da6c31b88ea2d543f4fe210004 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure with openssl raised since bump to version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(rec_layer_d1.o): in function `DTLS_RECORD_LAYER_new': rec_layer_d1.c:(.text+0x124): undefined reference to `CRYPTO_malloc' Fixes: - http://autobuild.buildroot.org/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...SL_LIBS-to-be-configured-from-environment.patch | 37 ++++++++++++++++++++++ package/htpdate/htpdate.mk | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch new file mode 100644 index 0000000000..6dca2babab --- /dev/null +++ b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch @@ -0,0 +1,37 @@ +From 4ba90fedd553c3b06c925fb6ff5245a5dcabace9 Mon Sep 17 00:00:00 2001 +From: Eddy Vervest +Date: Sat, 29 Jan 2022 10:58:13 +0100 +Subject: [PATCH] Allow SSL_LIBS to be configured from environment + +[Retrieved from: +https://github.com/twekkel/htpdate/commit/4ba90fedd553c3b06c925fb6ff5245a5dcabace9] +Signed-off-by: Fabrice Fontaine +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 4796efa..cf077e6 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,8 +2,9 @@ prefix = $(DESTDIR)/usr + bindir = ${prefix}/sbin + mandir = ${prefix}/share/man + +-CC ?= gcc +-CFLAGS += -Wall -std=c11 -pedantic -O2 ++CC ?= gcc ++CFLAGS += -Wall -std=c11 -pedantic -O2 ++SSL_LIBS ?= -lssl + + INSTALL ?= install -c + STRIP ?= strip -s +@@ -14,7 +15,7 @@ htpdate: htpdate.c + $(CC) $(CFLAGS) -o htpdate htpdate.c + + https: htpdate.c +- $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c -lssl ++ $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c $(SSL_LIBS) + + install: all + $(STRIP) htpdate diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 54b3ec2569..e32480fc85 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -10,7 +10,9 @@ HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) -HTPDATE_BUILD_OPTS = https +HTPDATE_BUILD_OPTS = \ + https \ + SSL_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" HTPDATE_DEPENDENCIES += openssl host-pkgconf endif From thomas.petazzoni at bootlin.com Sun Jan 30 15:02:58 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 16:02:58 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/htpdate: fix static openssl build In-Reply-To: <20220129104425.3724653-1-fontaine.fabrice@gmail.com> References: <20220129104425.3724653-1-fontaine.fabrice@gmail.com> Message-ID: <20220130160258.20d80a8d@windsurf> On Sat, 29 Jan 2022 11:44:25 +0100 Fabrice Fontaine wrote: > Fix the following static build failure with openssl raised since bump to > version 1.3.3 in commit 163509a8e0d558e6339c5489f072dfe805e0cc34: > > /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(rec_layer_d1.o): in function `DTLS_RECORD_LAYER_new': > rec_layer_d1.c:(.text+0x124): undefined reference to `CRYPTO_malloc' > > Fixes: > - http://autobuild.buildroot.org/results/75ad8515916dfa056b17c97fdd95c7eb4d83a304 > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Move pkg-config call in htpdate.mk following upstream feedback: > https://github.com/twekkel/htpdate/pull/17 I'm a bit surprised by your feedback to upstream's reaction. Indeed, it would have been possible in the Makefile to make use of pkg-config if it's available, and if not fallback to just using -lssl. Preserve the existing behavior, doesn't make pkg-config mandatory, but allows people like use to make use of pkg-config. Anyway, I've applied your patch as-is. And it made me wonder why host-pkgconf was already part of the package dependencies? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at gmail.com Sun Jan 30 16:36:39 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 30 Jan 2022 17:36:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.11 In-Reply-To: <87bl0t1a9o.fsf@gmail.com> References: <20220101225906.2341845-1-fontaine.fabrice@gmail.com> <87bl0t1a9o.fsf@gmail.com> Message-ID: <114f25cd-b392-fbde-ce20-eef87447f1c0@gmail.com> Hello Fabrice, Joachim, All, Le 03/01/2022 ? 09:41, Joachim Wiberg a ?crit?: > On Sat, Jan 01, 2022 at 23:59, Fabrice Fontaine wrote: >> The LXC 4.0 branch is supported until June 2025. >> Only bugfixes and securitiy issues get included into the stable bugfix >> releases, so it's always safe and recommended to keep up and run the >> latest bugfix release. Well it also includes new features since this version bump break lxc with all kernel < 5.6 due to the broken fall back when the new mount API is not supported. We have a test for lxc using a kernel 4.19 that trigger this issue [1]. See lxc.log: (kernel 5.5) DEBUG conf - conf.c:lxc_setup_devpts_child:1682 - No new devpts instance will be mounted since no pts devices are required lxc-start lxc_iperf3 DEBUG conf - conf.c:lxc_setup_dev_console:1966 - Cleared all (0) mounts from "/dev/console" lxc-start lxc_iperf3 ERROR mount_utils - mount_utils.c:mount_at:661 - No such file or directory - Failed to mount "/proc/self/fd/44" to "/proc/self/fd/43" lxc-start lxc_iperf3 ERROR conf - conf.c:lxc_setup_dev_console:1988 - No such file or directory - Failed to mount "10(/dev/pts/0)" on "43" lxc-start lxc_iperf3 ERROR conf - conf.c:lxc_setup_console:2143 - No such file or directory - Failed to setup console (kernel 5.6) lxc-start lxc_iperf3 TRACE mount_utils - mount_utils.c:can_use_mount_api:582 - Kernel supports mount api lxc-start lxc_iperf3 TRACE mount_utils - mount_utils.c:move_detached_mount:328 - Attach detached mount 45 to filesystem at 43 lxc-start lxc_iperf3 TRACE conf - conf.c:lxc_setup_dev_console:1990 - Setup console "/dev/pts/0" [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/2006798998 This issue is not yet fixed in lxc stable-4.0 branch. Can you have a look? Best regards, Romain >> >> https://discuss.linuxcontainers.org/t/lxc-4-0-11-has-been-released/12427 >> >> Signed-off-by: Fabrice Fontaine > > Reviewed-by: Joachim Wiberg > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > From thomas.petazzoni at bootlin.com Sun Jan 30 17:06:54 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:06:54 +0100 Subject: [Buildroot] [git commit] package/freeipmi: fix static build with openipmi Message-ID: <20220130165957.AF23582862@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7bc68d9b10aba88f74095aff85dfd8a730d05348 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure with openipmi raised since commit 8f6b346a34bdb344c4a001d8bd66f5e973013c17: /home/peko/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/libfreeipmi.a(libfreeipmi_la-ipmi-md5.o): in function `md5_init': ipmi-md5.c:(.text+0xa7c): multiple definition of `md5_init'; ../lib/.libs/libipmitool.a(md5.o):md5.c:(.text+0xab0): first defined here Fixes: - http://autobuild.buildroot.org/results/01b22faf08a798ecc5d5465e1c0c13fa024f1096 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...eipmi-rename-md2-and-md5-functions-macros.patch | 695 +++++++++++++++++++++ 1 file changed, 695 insertions(+) diff --git a/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch new file mode 100644 index 0000000000..0de5b29c9c --- /dev/null +++ b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch @@ -0,0 +1,695 @@ +From 50eeda7f14c4eaa56aa86ba570a47557456544f2 Mon Sep 17 00:00:00 2001 +From: Albert Chu +Date: Wed, 19 Jan 2022 11:55:55 -0800 +Subject: [PATCH] libfreeipmi: rename md2 and md5 functions / macros + +Static compilation with libfreeipmi can lead to problems if +other software has similarly named md2/md5 functions +(such as md5_init()). Prefix all macros and functions with +'ipmi_' as needed. Update all callers accordingly. + +[Retrieved from: +https://github.com/chu11/freeipmi-mirror/commit/50eeda7f14c4eaa56aa86ba570a47557456544f2] +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 11 ++ + libfreeipmi/interface/ipmi-lan-interface.c | 48 +++---- + .../interface/ipmi-rmcpplus-interface.c | 2 +- + libfreeipmi/libcommon/ipmi-md2.c | 72 +++++------ + libfreeipmi/libcommon/ipmi-md2.h | 30 ++--- + libfreeipmi/libcommon/ipmi-md5.c | 64 +++++----- + libfreeipmi/libcommon/ipmi-md5.h | 18 +-- + libfreeipmi/util/ipmi-lan-util.c | 120 +++++++++--------- + 8 files changed, 188 insertions(+), 177 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 883a195cf..60bf8c323 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,14 @@ ++2021-01-19 Albert Chu ++ ++ * libfreeipmi/libcommon/ipmi-md2.h, ++ libfreeipmi/libcommon/ipmi-md2.c, ++ libfreeipmi/libcommon/ipmi-md5.h, ++ libfreeipmi/libcommon/ipmi-md5.c: Static compilation with ++ libfreeipmi can lead to problems if other software has similarly ++ named md2/md5 functions (such as md5_init()). Prefix all macros ++ and functions with 'ipmi_' as needed. Update all callers ++ accordingly. ++ + 2022-01-18 Fabrice Fontaine + + * configure.ac: use pkg-config to find gcrypt +diff --git a/libfreeipmi/interface/ipmi-lan-interface.c b/libfreeipmi/interface/ipmi-lan-interface.c +index 20099d770..658be53e1 100644 +--- a/libfreeipmi/interface/ipmi-lan-interface.c ++++ b/libfreeipmi/interface/ipmi-lan-interface.c +@@ -533,37 +533,37 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_rmcp_hdr, + + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- uint8_t digest[MD2_DIGEST_LENGTH]; ++ ipmi_md2_t ctx; ++ uint8_t digest[IPMI_MD2_DIGEST_LENGTH]; + +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); + +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, session_id_buf, session_id_len); +- md2_update_data (&ctx, msg_data_ptr, msg_data_count); +- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, digest, MD2_DIGEST_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md2_update_data (&ctx, msg_data_ptr, msg_data_count); ++ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, digest, IPMI_MD2_DIGEST_LENGTH); ++ ipmi_md2_init (&ctx); + + memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- uint8_t digest[MD5_DIGEST_LENGTH]; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, session_id_buf, session_id_len); +- md5_update_data (&ctx, msg_data_ptr, msg_data_count); +- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, digest, MD5_DIGEST_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ uint8_t digest[IPMI_MD5_DIGEST_LENGTH]; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md5_update_data (&ctx, msg_data_ptr, msg_data_count); ++ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, digest, IPMI_MD5_DIGEST_LENGTH); ++ ipmi_md5_init (&ctx); + + memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); + } +diff --git a/libfreeipmi/interface/ipmi-rmcpplus-interface.c b/libfreeipmi/interface/ipmi-rmcpplus-interface.c +index 1f462da7e..d1fd0753a 100644 +--- a/libfreeipmi/interface/ipmi-rmcpplus-interface.c ++++ b/libfreeipmi/interface/ipmi-rmcpplus-interface.c +@@ -1134,7 +1134,7 @@ _construct_session_trlr_authentication_code (uint8_t integrity_algorithm, + { + hash_algorithm = IPMI_CRYPT_HASH_MD5; + hash_flags = 0; +- expected_digest_len = MD5_DIGEST_LENGTH; ++ expected_digest_len = IPMI_MD5_DIGEST_LENGTH; + copy_digest_len = IPMI_MD5_128_AUTHENTICATION_CODE_LENGTH; + } + else /* IPMI_INTEGRITY_ALGORITHM_HMAC_SHA256_128 */ +diff --git a/libfreeipmi/libcommon/ipmi-md2.c b/libfreeipmi/libcommon/ipmi-md2.c +index 6e9386be7..076b555bd 100644 +--- a/libfreeipmi/libcommon/ipmi-md2.c ++++ b/libfreeipmi/libcommon/ipmi-md2.c +@@ -101,15 +101,15 @@ static unsigned char S[256] = + 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14 + }; + +-#define L ctx->l +-#define X ctx->x +-#define C ctx->c +-#define M ctx->m +-#define Mlen ctx->mlen +-#define MD2_MAGIC 0xf00fd00d ++#define L ctx->l ++#define X ctx->x ++#define C ctx->c ++#define M ctx->m ++#define Mlen ctx->mlen ++#define IPMI_MD2_MAGIC 0xf00fd00d + + int +-md2_init (md2_t *ctx) ++ipmi_md2_init (ipmi_md2_t *ctx) + { + + if (ctx == NULL) +@@ -118,26 +118,26 @@ md2_init (md2_t *ctx) + return (-1); + } + +- ctx->magic = MD2_MAGIC; ++ ctx->magic = IPMI_MD2_MAGIC; + + L = 0; + Mlen = 0; +- memset (X, '\0', MD2_BUFFER_LENGTH); +- memset (C, '\0', MD2_CHKSUM_LENGTH); +- memset (M, '\0', MD2_BLOCK_LENGTH); ++ memset (X, '\0', IPMI_MD2_BUFFER_LENGTH); ++ memset (C, '\0', IPMI_MD2_CHKSUM_LENGTH); ++ memset (M, '\0', IPMI_MD2_BLOCK_LENGTH); + + return (0); + } + + static void +-_md2_update_digest_and_checksum (md2_t *ctx) ++_ipmi_md2_update_digest_and_checksum (ipmi_md2_t *ctx) + { + unsigned int j, k; + uint8_t c, t; + + /* Update X */ + +- for (j = 0; j < MD2_BLOCK_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) + { + X[16+j] = M[j]; + X[32+j] = (X[16+j] ^ X[j]); +@@ -145,9 +145,9 @@ _md2_update_digest_and_checksum (md2_t *ctx) + + t = 0; + +- for (j = 0; j < MD2_ROUNDS_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_ROUNDS_LENGTH; j++) + { +- for (k = 0; k < MD2_BUFFER_LENGTH; k++) ++ for (k = 0; k < IPMI_MD2_BUFFER_LENGTH; k++) + { + t = X[k] = (X[k] ^ S[t]); + } +@@ -166,7 +166,7 @@ _md2_update_digest_and_checksum (md2_t *ctx) + * Set C[j] to C[j] xor S[c xor L]. + */ + +- for (j = 0; j < MD2_BLOCK_LENGTH; j++) ++ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) + { + c = M[j]; + C[j] = C[j] ^ S[c ^ L]; +@@ -175,10 +175,10 @@ _md2_update_digest_and_checksum (md2_t *ctx) + } + + int +-md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) ++ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen) + { + +- if (ctx == NULL || ctx->magic != MD2_MAGIC || buf == NULL) ++ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC || buf == NULL) + { + errno = EINVAL; + return (-1); +@@ -187,19 +187,19 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) + if (buflen == 0) + return (0); + +- if ((Mlen + buflen) >= MD2_BLOCK_LENGTH) ++ if ((Mlen + buflen) >= IPMI_MD2_BLOCK_LENGTH) + { + unsigned int bufcount; + +- bufcount = (MD2_BLOCK_LENGTH - Mlen); ++ bufcount = (IPMI_MD2_BLOCK_LENGTH - Mlen); + memcpy (M + Mlen, buf, bufcount); +- _md2_update_digest_and_checksum (ctx); ++ _ipmi_md2_update_digest_and_checksum (ctx); + +- while ((buflen - bufcount) >= MD2_BLOCK_LENGTH) ++ while ((buflen - bufcount) >= IPMI_MD2_BLOCK_LENGTH) + { +- memcpy (M, buf + bufcount, MD2_BLOCK_LENGTH); +- bufcount += MD2_BLOCK_LENGTH; +- _md2_update_digest_and_checksum (ctx); ++ memcpy (M, buf + bufcount, IPMI_MD2_BLOCK_LENGTH); ++ bufcount += IPMI_MD2_BLOCK_LENGTH; ++ _ipmi_md2_update_digest_and_checksum (ctx); + } + + Mlen = buflen - bufcount; +@@ -217,33 +217,33 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) + } + + static void +-_md2_append_padding_and_checksum (md2_t *ctx) ++_ipmi_md2_append_padding_and_checksum (ipmi_md2_t *ctx) + { + unsigned int padlen; + int padindex; + +- padlen = MD2_PADDING_LENGTH - Mlen; ++ padlen = IPMI_MD2_PADDING_LENGTH - Mlen; + padindex = padlen - 1; + +- md2_update_data (ctx, padding[padindex], padlen); ++ ipmi_md2_update_data (ctx, padding[padindex], padlen); + +- md2_update_data (ctx, C, MD2_CHKSUM_LENGTH); ++ ipmi_md2_update_data (ctx, C, IPMI_MD2_CHKSUM_LENGTH); + } + + int +-md2_finish (md2_t *ctx, void *digest, unsigned int digestlen) ++ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen) + { +- if (ctx == NULL || ctx->magic != MD2_MAGIC +- || digest == NULL || digestlen < MD2_DIGEST_LENGTH) ++ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC ++ || digest == NULL || digestlen < IPMI_MD2_DIGEST_LENGTH) + { + errno = EINVAL; + return (-1); + } + +- _md2_append_padding_and_checksum (ctx); +- memcpy (digest, X, MD2_DIGEST_LENGTH); ++ _ipmi_md2_append_padding_and_checksum (ctx); ++ memcpy (digest, X, IPMI_MD2_DIGEST_LENGTH); + +- ctx->magic = ~MD2_MAGIC; +- return (MD2_DIGEST_LENGTH); ++ ctx->magic = ~IPMI_MD2_MAGIC; ++ return (IPMI_MD2_DIGEST_LENGTH); + } + +diff --git a/libfreeipmi/libcommon/ipmi-md2.h b/libfreeipmi/libcommon/ipmi-md2.h +index c102fce2c..05328e85e 100644 +--- a/libfreeipmi/libcommon/ipmi-md2.h ++++ b/libfreeipmi/libcommon/ipmi-md2.h +@@ -34,26 +34,26 @@ + + #include + +-#define MD2_BLOCK_LENGTH 16 +-#define MD2_BUFFER_LENGTH 48 +-#define MD2_CHKSUM_LENGTH 16 +-#define MD2_DIGEST_LENGTH 16 +-#define MD2_PADDING_LENGTH 16 +-#define MD2_ROUNDS_LENGTH 18 +- +-typedef struct __md2 { ++#define IPMI_MD2_BLOCK_LENGTH 16 ++#define IPMI_MD2_BUFFER_LENGTH 48 ++#define IPMI_MD2_CHKSUM_LENGTH 16 ++#define IPMI_MD2_DIGEST_LENGTH 16 ++#define IPMI_MD2_PADDING_LENGTH 16 ++#define IPMI_MD2_ROUNDS_LENGTH 18 ++ ++typedef struct __ipmi_md2 { + uint32_t magic; + uint8_t l; + unsigned int mlen; +- uint8_t x[MD2_BUFFER_LENGTH]; +- uint8_t c[MD2_CHKSUM_LENGTH]; +- uint8_t m[MD2_BLOCK_LENGTH]; +-} md2_t; ++ uint8_t x[IPMI_MD2_BUFFER_LENGTH]; ++ uint8_t c[IPMI_MD2_CHKSUM_LENGTH]; ++ uint8_t m[IPMI_MD2_BLOCK_LENGTH]; ++} ipmi_md2_t; + +-int md2_init (md2_t *ctx); ++int ipmi_md2_init (ipmi_md2_t *ctx); + +-int md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen); ++int ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen); + +-int md2_finish (md2_t *ctx, void *digest, unsigned int digestlen); ++int ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen); + + #endif /* IPMI_MD2_H */ +diff --git a/libfreeipmi/libcommon/ipmi-md5.c b/libfreeipmi/libcommon/ipmi-md5.c +index 17073b85f..c84e350a6 100644 +--- a/libfreeipmi/libcommon/ipmi-md5.c ++++ b/libfreeipmi/libcommon/ipmi-md5.c +@@ -92,7 +92,7 @@ static uint32_t T[64] = + #define D ctx->d + #define M ctx->m + #define Mlen ctx->mlen +-#define MD5_MAGIC 0xfb0fdb0d ++#define IPMI_MD5_MAGIC 0xfb0fdb0d + + #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) + #define G(x,y,z) (((x) & (z)) | ((y) & (~(z)))) +@@ -126,7 +126,7 @@ static uint32_t T[64] = + } while (0) + + int +-md5_init (md5_t *ctx) ++ipmi_md5_init (ipmi_md5_t *ctx) + { + if (ctx == NULL) + { +@@ -134,13 +134,13 @@ md5_init (md5_t *ctx) + return (-1); + } + +- ctx->magic = MD5_MAGIC; ++ ctx->magic = IPMI_MD5_MAGIC; + + Mlen = 0; + ctx->bytes_mod_64 = 0; + ctx->bit_count[0] = 0; + ctx->bit_count[1] = 0; +- memset (M, '\0', MD5_BLOCK_LENGTH); ++ memset (M, '\0', IPMI_MD5_BLOCK_LENGTH); + + /* initial values are listed low-order byte first */ + A = 0x67452301; +@@ -152,16 +152,16 @@ md5_init (md5_t *ctx) + } + + static void +-_md5_update_digest (md5_t *ctx) ++_ipmi_md5_update_digest (ipmi_md5_t *ctx) + { + uint32_t AA, BB, CC, DD; +- uint32_t X[MD5_BLOCK_WORDS_LENGTH]; ++ uint32_t X[IPMI_MD5_BLOCK_WORDS_LENGTH]; + unsigned int j; + + /* Note there are no endian issues here, compiler is required to + * handle shifts correctly + */ +- for (j = 0; j < MD5_BLOCK_WORDS_LENGTH; j++) ++ for (j = 0; j < IPMI_MD5_BLOCK_WORDS_LENGTH; j++) + X[j] = ((uint32_t)M[j*4] + | ((uint32_t)M[j*4+1] << 8) + | ((uint32_t)M[j*4+2] << 16) +@@ -251,7 +251,7 @@ _md5_update_digest (md5_t *ctx) + } + + static void +-_md5_update_count (md5_t *ctx, unsigned int buflen) ++_ipmi_md5_update_count (ipmi_md5_t *ctx, unsigned int buflen) + { + + /* Use two uint32_t integers to hold our 64 bit count. +@@ -272,10 +272,10 @@ _md5_update_count (md5_t *ctx, unsigned int buflen) + } + + int +-md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) ++ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen) + { + +- if (ctx == NULL || ctx->magic != MD5_MAGIC || buf == NULL) ++ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC || buf == NULL) + { + errno = EINVAL; + return (-1); +@@ -284,28 +284,28 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) + if (buflen == 0) + return (0); + +- if ((Mlen + buflen) >= MD5_BLOCK_LENGTH) ++ if ((Mlen + buflen) >= IPMI_MD5_BLOCK_LENGTH) + { + unsigned int bufcount; + +- bufcount = (MD5_BLOCK_LENGTH - Mlen); ++ bufcount = (IPMI_MD5_BLOCK_LENGTH - Mlen); + memcpy (M + Mlen, buf, bufcount); +- _md5_update_digest (ctx); +- _md5_update_count (ctx, bufcount); ++ _ipmi_md5_update_digest (ctx); ++ _ipmi_md5_update_count (ctx, bufcount); + +- while ((buflen - bufcount) >= MD5_BLOCK_LENGTH) ++ while ((buflen - bufcount) >= IPMI_MD5_BLOCK_LENGTH) + { +- memcpy (M, buf + bufcount, MD5_BLOCK_LENGTH); +- bufcount += MD5_BLOCK_LENGTH; +- _md5_update_digest (ctx); +- _md5_update_count (ctx, MD5_BLOCK_LENGTH); ++ memcpy (M, buf + bufcount, IPMI_MD5_BLOCK_LENGTH); ++ bufcount += IPMI_MD5_BLOCK_LENGTH; ++ _ipmi_md5_update_digest (ctx); ++ _ipmi_md5_update_count (ctx, IPMI_MD5_BLOCK_LENGTH); + } + + Mlen = buflen - bufcount; + if (Mlen > 0) + { + memcpy (M, buf + bufcount, Mlen); +- _md5_update_count (ctx, Mlen); ++ _ipmi_md5_update_count (ctx, Mlen); + } + } + else +@@ -313,14 +313,14 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) + /* Not enough data to update digest, just copy in data */ + memcpy (M + Mlen, buf, buflen); + Mlen += buflen; +- _md5_update_count (ctx, buflen); ++ _ipmi_md5_update_count (ctx, buflen); + } + + return (buflen); + } + + static void +-_md5_append_padding_and_length (md5_t *ctx) ++_ipmi_md5_append_padding_and_length (ipmi_md5_t *ctx) + { + unsigned int padlen; + char length[8]; +@@ -348,23 +348,23 @@ _md5_append_padding_and_length (md5_t *ctx) + length[6] = (ctx->bit_count[0] & 0x00ff0000) >> 16; + length[7] = (ctx->bit_count[0] & 0xff000000) >> 24; + +- md5_update_data (ctx, padding, padlen); +- md5_update_data (ctx, length, 8); ++ ipmi_md5_update_data (ctx, padding, padlen); ++ ipmi_md5_update_data (ctx, length, 8); + } + + int +-md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) ++ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen) + { +- uint8_t buf[MD5_DIGEST_LENGTH]; ++ uint8_t buf[IPMI_MD5_DIGEST_LENGTH]; + +- if (ctx == NULL || ctx->magic != MD5_MAGIC +- || digest == NULL || digestlen < MD5_DIGEST_LENGTH) ++ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC ++ || digest == NULL || digestlen < IPMI_MD5_DIGEST_LENGTH) + { + errno = EINVAL; + return (-1); + } + +- _md5_append_padding_and_length (ctx); ++ _ipmi_md5_append_padding_and_length (ctx); + + /* Note there are no endian issues here, compiler is required to + * handle bitmasks and shifts correctly +@@ -387,7 +387,7 @@ md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) + buf[14] = (D & 0x00ff0000) >> 16; + buf[15] = (D & 0xff000000) >> 24; + +- memcpy (digest, buf, MD5_DIGEST_LENGTH); +- ctx->magic = ~MD5_MAGIC; +- return (MD5_DIGEST_LENGTH); ++ memcpy (digest, buf, IPMI_MD5_DIGEST_LENGTH); ++ ctx->magic = ~IPMI_MD5_MAGIC; ++ return (IPMI_MD5_DIGEST_LENGTH); + } +diff --git a/libfreeipmi/libcommon/ipmi-md5.h b/libfreeipmi/libcommon/ipmi-md5.h +index 0f86f1754..6b863ef36 100644 +--- a/libfreeipmi/libcommon/ipmi-md5.h ++++ b/libfreeipmi/libcommon/ipmi-md5.h +@@ -34,11 +34,11 @@ + + #include + +-#define MD5_BLOCK_LENGTH 64 +-#define MD5_BLOCK_WORDS_LENGTH (MD5_BLOCK_LENGTH/4) +-#define MD5_DIGEST_LENGTH 16 ++#define IPMI_MD5_BLOCK_LENGTH 64 ++#define IPMI_MD5_BLOCK_WORDS_LENGTH (IPMI_MD5_BLOCK_LENGTH/4) ++#define IPMI_MD5_DIGEST_LENGTH 16 + +-typedef struct __md5 { ++typedef struct __ipmi_md5 { + uint32_t magic; + unsigned int mlen; + unsigned int bytes_mod_64; +@@ -47,13 +47,13 @@ typedef struct __md5 { + uint32_t b; + uint32_t c; + uint32_t d; +- uint8_t m[MD5_BLOCK_LENGTH]; +-} md5_t; ++ uint8_t m[IPMI_MD5_BLOCK_LENGTH]; ++} ipmi_md5_t; + +-int md5_init (md5_t *ctx); ++int ipmi_md5_init (ipmi_md5_t *ctx); + +-int md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen); ++int ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen); + +-int md5_finish (md5_t *ctx, void *digest, unsigned int digestlen); ++int ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen); + + #endif /* IPMI_MD5_H */ +diff --git a/libfreeipmi/util/ipmi-lan-util.c b/libfreeipmi/util/ipmi-lan-util.c +index cd269fcb9..a374acc8d 100644 +--- a/libfreeipmi/util/ipmi-lan-util.c ++++ b/libfreeipmi/util/ipmi-lan-util.c +@@ -281,33 +281,33 @@ ipmi_lan_check_session_authentication_code (fiid_obj_t obj_lan_session_hdr_rs, + + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); +- +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, session_id_buf, session_id_len); +- md2_update_data (&ctx, buf, len); +- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); ++ ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md2_update_data (&ctx, buf, len); ++ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_init (&ctx); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, session_id_buf, session_id_len); +- md5_update_data (&ctx, buf, len); +- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); ++ ipmi_md5_update_data (&ctx, buf, len); ++ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_init (&ctx); + } + } + +@@ -451,45 +451,45 @@ ipmi_lan_check_packet_session_authentication_code (const void *pkt, + memcpy (pwbuf, authentication_code_data, authentication_code_data_len); + if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) + { +- md2_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); +- +- md2_init (&ctx); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_update_data (&ctx, +- pkt + session_id_offset, +- session_id_len); +- md2_update_data (&ctx, +- pkt + data_offset, +- pkt_len - data_offset); +- md2_update_data (&ctx, +- pkt + session_sequence_number_offset, +- session_sequence_number_len); +- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md2_init (&ctx); ++ ipmi_md2_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); ++ ++ ipmi_md2_init (&ctx); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_update_data (&ctx, ++ pkt + session_id_offset, ++ session_id_len); ++ ipmi_md2_update_data (&ctx, ++ pkt + data_offset, ++ pkt_len - data_offset); ++ ipmi_md2_update_data (&ctx, ++ pkt + session_sequence_number_offset, ++ session_sequence_number_len); ++ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md2_init (&ctx); + } + else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) + { +- md5_t ctx; +- +- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); +- +- md5_init (&ctx); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_update_data (&ctx, +- pkt + session_id_offset, +- session_id_len); +- md5_update_data (&ctx, +- pkt + data_offset, +- pkt_len - data_offset); +- md5_update_data (&ctx, +- pkt + session_sequence_number_offset, +- session_sequence_number_len); +- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); +- md5_init (&ctx); ++ ipmi_md5_t ctx; ++ ++ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); ++ ++ ipmi_md5_init (&ctx); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_update_data (&ctx, ++ pkt + session_id_offset, ++ session_id_len); ++ ipmi_md5_update_data (&ctx, ++ pkt + data_offset, ++ pkt_len - data_offset); ++ ipmi_md5_update_data (&ctx, ++ pkt + session_sequence_number_offset, ++ session_sequence_number_len); ++ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); ++ ipmi_md5_init (&ctx); + } + } + else /* authentication_type == IPMI_AUTHENTICATION_TYPE_STRAIGHT_PASSWORD_KEY From thomas.petazzoni at bootlin.com Sun Jan 30 17:07:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:07:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeipmi: fix static build with openipmi In-Reply-To: <20220129110734.3737599-1-fontaine.fabrice@gmail.com> References: <20220129110734.3737599-1-fontaine.fabrice@gmail.com> Message-ID: <20220130180710.0634772d@windsurf> On Sat, 29 Jan 2022 12:07:34 +0100 Fabrice Fontaine wrote: > Fix the following static build failure with openipmi raised since commit > 8f6b346a34bdb344c4a001d8bd66f5e973013c17: > > /home/peko/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-musleabihf/10.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/lib/libfreeipmi.a(libfreeipmi_la-ipmi-md5.o): in function `md5_init': > ipmi-md5.c:(.text+0xa7c): multiple definition of `md5_init'; ../lib/.libs/libipmitool.a(md5.o):md5.c:(.text+0xab0): first defined here > > Fixes: > - http://autobuild.buildroot.org/results/01b22faf08a798ecc5d5465e1c0c13fa024f1096 > > Signed-off-by: Fabrice Fontaine > --- > ...-rename-md2-and-md5-functions-macros.patch | 695 ++++++++++++++++++ > 1 file changed, 695 insertions(+) > create mode 100644 package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 17:16:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:16:32 +0100 Subject: [Buildroot] [git commit] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 Message-ID: <20220130170940.6693882626@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87ee52a205ec0a250cd448ab6c12f40a7c85a272 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master U-boot libfdt fails to compile on CI. /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 As this fix has been already upstreamed just bump U-boot package. Let's also bump Kernel and ATF as the board is properly supported upstream. Signed-off-by: Cl??ment P??ron Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/beelink_gs1_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index b461574a98..aa8a2cfb6b 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -9,11 +9,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" -# Kernel Linux headers same as kernel, a 5.5 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y +# Kernel Linux headers same as kernel, 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" @@ -24,14 +24,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From thomas.petazzoni at bootlin.com Sun Jan 30 17:16:59 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:16:59 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 In-Reply-To: <20220129111731.736265-2-peron.clem@gmail.com> References: <20220129111731.736265-1-peron.clem@gmail.com> <20220129111731.736265-2-peron.clem@gmail.com> Message-ID: <20220130181659.1e3aae5a@windsurf> On Sat, 29 Jan 2022 12:17:31 +0100 Cl?ment P?ron wrote: > U-boot libfdt fails to compile on CI. > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > > https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208 > > As this fix has been already upstreamed just bump U-boot package. > > Let's also bump Kernel and ATF as the board is properly supported upstream. > > Signed-off-by: Cl?ment P?ron > --- > configs/beelink_gs1_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 17:18:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:18:30 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <20220129111731.736265-1-peron.clem@gmail.com> References: <20220129111731.736265-1-peron.clem@gmail.com> Message-ID: <20220130181830.3170d14f@windsurf> On Sat, 29 Jan 2022 12:17:30 +0100 Cl?ment P?ron wrote: > For the moment Beelink GS1 use a default rootfs size of 60M, > which is a bit low if you want to add some packages like a > graphic stack. > > Increase the rootfs size to 120M. > > Reviewed-by: Giulio Benetti > Signed-off-by: Cl?ment P?ron > --- > configs/beelink_gs1_defconfig | 1 + > 1 file changed, 1 insertion(+) I have not applied this one. Indeed, any defconfig that uses the default rootfs size of 60M would have the problem of "if I add more packages, it doesn't fit in the image". The defconfigs are meant to be minimal, so it doesn't make sense to increase the size to 120M to accommodate some possible package additions. Maybe even 120M is not going to be enough depending on how many packages you add (and how large they are). So I've marked this patch as Rejected. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Jan 30 17:19:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:19:10 +0100 Subject: [Buildroot] [git commit] package/midori: drop select of libsoup-gnome Message-ID: <20220130171212.94A0B81933@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75bea7b215675da9e097f9105d9b97aa4fc4f5b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libsoup-gnome is not used by midori since bump to version 9.0 in commit 42f19d49fb2da891be9266a2f843292d24847f18 and https://github.com/midori-browser/core/commit/0c2d8f0ea61f20476542e861bc1772a878a54d32 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/midori/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/midori/Config.in b/package/midori/Config.in index d98d7cb161..715295e5a6 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -41,7 +41,6 @@ config BR2_PACKAGE_MIDORI select BR2_PACKAGE_LIBPEAS select BR2_PACKAGE_LIBPEAS_WIDGETS select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBSOUP_GNOME select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_SQLITE From thomas.petazzoni at bootlin.com Sun Jan 30 17:19:17 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 30 Jan 2022 18:19:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/midori: drop select of libsoup-gnome In-Reply-To: <20220128173204.2483569-1-fontaine.fabrice@gmail.com> References: <20220128173204.2483569-1-fontaine.fabrice@gmail.com> Message-ID: <20220130181917.3232550a@windsurf> On Fri, 28 Jan 2022 18:32:04 +0100 Fabrice Fontaine wrote: > libsoup-gnome is not used by midori since bump to version 9.0 in commit > 42f19d49fb2da891be9266a2f843292d24847f18 and > https://github.com/midori-browser/core/commit/0c2d8f0ea61f20476542e861bc1772a878a54d32 > > Signed-off-by: Fabrice Fontaine > --- > package/midori/Config.in | 1 - > 1 file changed, 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From ju.o at free.fr Sun Jan 30 17:21:45 2022 From: ju.o at free.fr (Julien Olivain) Date: Sun, 30 Jan 2022 18:21:45 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add test for python-distro Message-ID: <20220130172145.888946-1-ju.o@free.fr> This commit add a simple test checking the reported distro name and id are Buildroot (as reported by /etc/os-release). Signed-off-by: Julien Olivain --- DEVELOPERS | 2 ++ .../tests/package/sample_python_distro.py | 4 ++++ .../tests/package/test_python_distro.py | 21 +++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 support/testing/tests/package/sample_python_distro.py create mode 100644 support/testing/tests/package/test_python_distro.py diff --git a/DEVELOPERS b/DEVELOPERS index e17803f38a..368f95796b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1612,7 +1612,9 @@ F: package/python-gnupg/ F: package/python-pyalsa/ F: package/riscv-isa-sim/ F: package/zynaddsubfx/ +F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py N: Julien Viard de Galbert diff --git a/support/testing/tests/package/sample_python_distro.py b/support/testing/tests/package/sample_python_distro.py new file mode 100644 index 0000000000..b31f129718 --- /dev/null +++ b/support/testing/tests/package/sample_python_distro.py @@ -0,0 +1,4 @@ +import distro + +assert(distro.name() == 'Buildroot') +assert(distro.id() == 'buildroot') diff --git a/support/testing/tests/package/test_python_distro.py b/support/testing/tests/package/test_python_distro.py new file mode 100644 index 0000000000..943b29e47e --- /dev/null +++ b/support/testing/tests/package/test_python_distro.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Distro(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_DISTRO=y + """ + sample_scripts = ["tests/package/sample_python_distro.py"] + + +class TestPythonPy3Distro(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DISTRO=y + """ + sample_scripts = ["tests/package/sample_python_distro.py"] -- 2.34.1 From romain.naour at gmail.com Sun Jan 30 17:32:43 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 30 Jan 2022 18:32:43 +0100 Subject: [Buildroot] [PATCH 2/3] package/poke: disable minimal-threading with thumb or thumb2 In-Reply-To: <20220130154605.5fad582e@windsurf> References: <20220129142352.1197168-1-romain.naour@gmail.com> <20220129142352.1197168-2-romain.naour@gmail.com> <20220130154605.5fad582e@windsurf> Message-ID: Hello Thomas, Le 30/01/2022 ? 15:46, Thomas Petazzoni a ?crit?: > Hello, > > On Sat, 29 Jan 2022 15:23:51 +0100 > Romain Naour wrote: > >> +# Disable minimal-threading when thumb or thumb2 is enabled >> +# due to runtime issue. >> +# https://lists.gnu.org/archive/html/poke-devel/2022-01/msg00162.html >> +ifeq ($(BR2_ARM_CPU_HAS_THUMB)$(BR2_ARM_CPU_HAS_THUMB2),y) >> +POKE_CONF_OPTS += --disable-dispatch-minimal-threading >> +else >> +POKE_CONF_OPTS += --enable-dispatch-minimal-threading >> +endif > > I don't understand this patch, because minimal-threading is already > disabled by default (at least in poke 1.4, I haven't checked in poke > 2.0). jitter/configure.ac contains: > > # Is the minimal-threading dispatch enabled? Check the default and the > # configure command-line option. > AC_MSG_CHECKING([if minimal-threading dispatch is enabled]) > # FIXME: reenable this when I make defect handling reliable. > #default=$(test "x$JITTER_HAVE_ACTUAL_GCC" = "xyes" && echo yes || echo no) > default=no > AC_ARG_ENABLE([dispatch-minimal-threading], > AS_HELP_STRING([--enable-dispatch-minimal-threading], > [enable minimal threading dispatch: default yes if and > only if GCC (not an imitation) is used]), > jitter_enable_dispatch_minimal_threading="$enableval", > jitter_enable_dispatch_minimal_threading="$default") > if test "x$jitter_enable_dispatch_minimal_threading" = "xyes"; then > jitter_best_dispatch_model="minimal-threading" > jitter_enabled_dispatch_models="$jitter_enabled_dispatch_models minimal-threading" > fi > AC_MSG_RESULT([$jitter_enable_dispatch_minimal_threading$jitter_subpackage_disclaimer]) > # FIXME: remove this warning message when I make defect handling reliable. > if test "x$jitter_enable_dispatch_minimal_threading" = "xyes"; then > AC_MSG_WARN([minimal-threading dispatch is currently unreliable, and should > not be used in production until defective instruction replacement is fully > implemented]) > fi > > See the "default=no" ? > > Also, when building with the following defconfig: > > BR2_arm=y > BR2_cortex_a8=y > BR2_ARM_EABI=y > BR2_ARM_INSTRUCTIONS_THUMB2=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_POKE=y > # BR2_TARGET_ROOTFS_TAR is not set > > The minimal threading is already disabled: > > checking if switch dispatching is enabled... yes, provisionally (sub-package mode) > checking if direct-threading dispatch is enabled... yes, provisionally (sub-package mode) > checking if minimal-threading dispatch is enabled... no, provisionally (sub-package mode) > checking if no-threading dispatch is enabled... no, provisionally (sub-package mode) > configure: sub-package mode: disabling every dispatch except > direct-threading > configure: (the following dispatches could have been enabled: > switch direct-threading) > configure: enabled dispatching models are: > direct-threading > configure: the best enabled dispatching model is: > direct-threading > > So what this patch is doing is in fact slightly the opposite of what he > says: instead of disabling minimal threading for thumb or thumb2, it > enables it for any other platform. > > Are you sure this patch was needed for poke 1.4, and not for poke 2.0 ? I overlooked that was disabled by default in poke 1.4. I only checked if this option was present in poke 1.4. So this patch must be merged in the poke version bump. Best regards, Romain > > Best regards, > > Thomas > From romain.naour at gmail.com Sun Jan 30 17:40:39 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sun, 30 Jan 2022 18:40:39 +0100 Subject: [Buildroot] [PATCH 3/5] package/efl: rework eeze handling in Kconfig In-Reply-To: <20220130150243.5795f1fa@windsurf> References: <20220129224651.1282263-1-romain.naour@gmail.com> <20220129224651.1282263-3-romain.naour@gmail.com> <20220130150243.5795f1fa@windsurf> Message-ID: <400c4077-1e25-a5fd-592e-cbf149d7a626@gmail.com> Hello Thomas, Le 30/01/2022 ? 15:02, Thomas Petazzoni a ?crit?: > On Sat, 29 Jan 2022 23:46:49 +0100 > Romain Naour wrote: > >> Commit [1] added eeze dependency using "depends on" to several efl >> options (drm, libmount) instead of selecting eeze and propagate the >> udev reverse dependency. > > I do agree with changing from a "depends on BR2_PACKAGE_EFL_EEZE" to a > "depends BR2_PACKAGE_HAS_UDEV" + "select BR2_PACKAGE_EFL_EEZE". > However... > >> The dependency between eeze, libinput, efl drm requires to add a new >> libinput option. > > ... I don't understand this justification. Could you clarify. Even > after reading PATCH 4/5, I don't get the relationship. PATCH 4/5 could > have been done (I guess using the same principle of "depends on > BR2_PACKAGE_EFL_EEZE". AFAIK, efl drm needs libinput (elput) that requires udev (eeze). Until now we don't have a libinput option to disable it when eeze is also disabled. > >> Rework eeze handling to use select BR2_PACKAGE_EFL_EEZE since the >> user is already aware of the udev dependency (BR2_PACKAGE_HAS_UDEV). > > I don't understand why you say the user is already aware of the udev > dependency? Thanks to the comments? I mean if eeze can be selected, it means that the used either selected systemd or eudev. > >> comment "efl's libmount support needs udev /dev management (eeze)" > > Remove the "eeze" between parenthesis here I believe. > >> - depends on !BR2_PACKAGE_EFL_EEZE >> + depends on !BR2_PACKAGE_HAS_UDEV >> >> config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG >> bool >> @@ -173,7 +174,7 @@ config BR2_PACKAGE_EFL_WAYLAND >> depends on BR2_PACKAGE_WAYLAND >> depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm >> depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine >> - depends on BR2_PACKAGE_EFL_EEZE # efl drm >> + depends on BR2_PACKAGE_HAS_UDEV # efl drm (eeze) >> depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only >> depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput >> select BR2_PACKAGE_EFL_DRM >> @@ -182,7 +183,7 @@ config BR2_PACKAGE_EFL_WAYLAND >> comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" > > Ditto. > >> depends on BR2_PACKAGE_WAYLAND >> depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ >> - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ >> + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ >> || !BR2_ENABLE_LOCALE >> >> choice >> @@ -215,9 +216,10 @@ endchoice # OpenGL support >> >> config BR2_PACKAGE_EFL_DRM >> bool "Evas DRM Engine" >> - depends on BR2_PACKAGE_EFL_EEZE >> + depends on BR2_PACKAGE_HAS_UDEV (eeze) > > Does this line really parses correctly? > >> depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm >> depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d >> + select BR2_PACKAGE_EFL_EEZE >> select BR2_PACKAGE_LIBDRM >> select BR2_PACKAGE_LIBINPUT # For elput >> select BR2_PACKAGE_LIBXKBCOMMON >> @@ -232,7 +234,7 @@ config BR2_PACKAGE_EFL_DRM >> >> comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" > > Remove the "eeze" between parenthesis. Best regards, Romain > > Thanks! > > Thomas > From giulio.benetti at benettiengineering.com Sun Jan 30 19:49:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 30 Jan 2022 20:49:08 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Giulio Benetti to sunxi-tools package Message-ID: <20220130194908.1658031-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0c11a25359..38724726d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1110,6 +1110,7 @@ F: package/python-uvloop/ F: package/rockchip-mali/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ +F: package/sunxi-tools/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ -- 2.25.1 From peter at korsgaard.com Sun Jan 30 20:13:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 30 Jan 2022 21:13:32 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.02.9 Message-ID: <20220130200732.DC334814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14233f3f0fdf133f30510a9e8c35faff4f22eb8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 961ca0ef87..2d082062a2 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
    Download
    -

    Latest long term support release: 2021.02.8

    +

    Latest long term support release: 2021.02.9

    - +
    - +
    -

    buildroot-2021.02.8.tar.gz

    -

    PGP signature

    +

    buildroot-2021.02.9.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2021.02.8.tar.bz2

    -

    PGP signature

    +

    buildroot-2021.02.9.tar.bz2

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index 85426677bf..d1dbc582a6 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

    News

      +
    • +
      +
      +
      +

      2021.02.9 released

      +

      29 January 2022

      +
      +
      +

      The 2021.02.9 bugfix release is out, fixing a number of important / + security related issues discovered since the 2021.02.8 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2021.02.9 release.

      +
      +
      +
      • +
    • From peter at korsgaard.com Sun Jan 30 20:02:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 30 Jan 2022 21:02:40 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.11.1 Message-ID: <20220130200732.C1C8F814A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce361c33615437c17f55c1765a20766b0fa2602f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 89c70997ce..961ca0ef87 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
    -

    Latest stable release: 2021.11

    +

    Latest stable release: 2021.11.1

    - +
    - +
    -

    buildroot-2021.11.tar.gz

    -

    PGP signature

    +

    buildroot-2021.11.1.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2021.11.tar.xz

    -

    PGP signature

    +

    buildroot-2021.11.1.tar.xz

    +

    PGP signature

    For me, libsoup3 support is important for the additional APIs that webkitgtk 2.34.4 is providing. kr, Thomas Op zo 30 jan. 2022 om 23:17 schreef Thomas Petazzoni < thomas.petazzoni at bootlin.com>: > On Mon, 31 Jan 2022 00:02:21 +0200 > Adrian Perez de Castro wrote: > > > > Is it possible to install both libsoup2 and libsoup3 side-by-side in > > > the same system? This requires them having a different library name and > > > a different location for header files. > > > > Yes, libsoup2 and libsoup3 are parallel-installable, both can coexist in > > the same system. The only caveat is, as I mentioned in a previous email, > > that having both versions loaded in the same process will result in odd > > crashes and assorted failures due to symbols clashing. > > If both libsoup2 and libsoup3 are enabled in the same build, it's going > to be difficult to guarantee that one application doesn't end up > loading both, by the usage of separate shared libraries that > independently use a different version of libsoup. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com > -------------- next part -------------- An HTML attachment was scrubbed... URL: From heiko.thiery at gmail.com Mon Jan 31 11:42:05 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 31 Jan 2022 12:42:05 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <20220131085216.1256242-1-michael@amarulasolutions.com> References: <20220131085216.1256242-1-michael@amarulasolutions.com> Message-ID: Hi Michael, Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi : > > Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 > - Uboot 2022-01-rc1 (reference tree) > - Default packages from buildroot > > https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > > Add Ariel D'Alessandro as co-maintainer, we work together on > platform mainline > > Build and tested using: > docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > Cc: Ariel D'Alessandro > Cc: Jagan Teki > Signed-off-by: Michael Trimarchi > --- > Changes V1->V2: > - add the board reference page > - test with docker > - adjust the buildroot config in order to use buildman > --- > DEVELOPERS | 2 ++ > board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ > board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ > configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ > 7 files changed, 134 insertions(+) > create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > create mode 100644 board/bsh/bsh-imx8mn/readme.txt > create mode 100644 configs/bsh_smms2pro_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index fe8de1916e..fc66fb6b83 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > F: configs/snps_archs38_vdk_defconfig > > N: Ariel D'Alessandro > +F: board/bsh/ > F: package/axfsutils/ > F: package/mali-t76x/ > > @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > F: package/python-pyzmq/ > > N: Michael Trimarchi > +F: board/bsh/ > F: package/python-spidev/ > > N: Michael Vetter > diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > new file mode 100644 > index 0000000000..9111354742 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > new file mode 100644 > index 0000000000..bc100b171d > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/genimage.cfg > @@ -0,0 +1,17 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33K > + } > + > + partition rootfs { > + offset = 8M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > new file mode 100755 > index 0000000000..3452fd4501 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/post-image.sh > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > new file mode 100644 > index 0000000000..ae30666cd0 > --- /dev/null > +++ b/board/bsh/bsh-imx8mn/readme.txt > @@ -0,0 +1,55 @@ > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make bsh_smms2pro_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and buildr the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? Image > + ??? flash.bin > + ??? ddr3* > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot-nodtb.bin > + ??? u-boot-spl.bin > + > + > +Flashing the emmc card image > +========================== > + > +To install the image on on eMMC > + > + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > new file mode 100644 > index 0000000000..8472c6db2b > --- /dev/null > +++ b/configs/bsh_smms2pro_defconfig > @@ -0,0 +1,46 @@ > +BR2_aarch64=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y When building the final imx flash.bin image with binman this host tool is no longer required. > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Same here. -- Heiko From michael at amarulasolutions.com Mon Jan 31 11:48:01 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 31 Jan 2022 12:48:01 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131085216.1256242-1-michael@amarulasolutions.com> Message-ID: Hi Heiko On Mon, Jan 31, 2022 at 12:42 PM Heiko Thiery wrote: > > Hi Michael, > > Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi > : > > > > Add initial support for iMX8MN BSH SMM S2 PRO board: > > > > - Linux: v5.17-rc1 > > - Uboot 2022-01-rc1 (reference tree) > > - Default packages from buildroot > > > > https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > > > > Add Ariel D'Alessandro as co-maintainer, we work together on > > platform mainline > > > > Build and tested using: > > docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > > > Cc: Ariel D'Alessandro > > Cc: Jagan Teki > > Signed-off-by: Michael Trimarchi > > --- > > Changes V1->V2: > > - add the board reference page > > - test with docker > > - adjust the buildroot config in order to use buildman > > --- > > DEVELOPERS | 2 ++ > > board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ > > board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > > board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > > board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > > board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ > > configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ > > 7 files changed, 134 insertions(+) > > create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > > create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > > create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > > create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > > create mode 100644 board/bsh/bsh-imx8mn/readme.txt > > create mode 100644 configs/bsh_smms2pro_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index fe8de1916e..fc66fb6b83 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > > F: configs/snps_archs38_vdk_defconfig > > > > N: Ariel D'Alessandro > > +F: board/bsh/ > > F: package/axfsutils/ > > F: package/mali-t76x/ > > > > @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > > F: package/python-pyzmq/ > > > > N: Michael Trimarchi > > +F: board/bsh/ > > F: package/python-spidev/ > > > > N: Michael Vetter > > diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > > new file mode 100644 > > index 0000000000..9111354742 > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/extlinux.conf > > @@ -0,0 +1,4 @@ > > +label buildroot > > + kernel /boot/Image > > + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > > + append root=PARTUUID=%PARTUUID% rootwait rw > > diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > > new file mode 100644 > > index 0000000000..bc100b171d > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/genimage.cfg > > @@ -0,0 +1,17 @@ > > +image sdcard.img { > > + hdimage { > > + partition-table-type = "gpt" > > + } > > + > > + partition imx-boot { > > + in-partition-table = "no" > > + image = "flash.bin" > > + offset = 33K > > + } > > + > > + partition rootfs { > > + offset = 8M > > + image = "rootfs.ext4" > > + partition-uuid = %PARTUUID% > > + } > > +} > > diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > > new file mode 100755 > > index 0000000000..bf8861f6a9 > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/post-build.sh > > @@ -0,0 +1,7 @@ > > +#!/bin/sh > > +BOARD_DIR="$(dirname $0)" > > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > > + > > +install -d "$TARGET_DIR/boot/extlinux/" > > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > > diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > > new file mode 100755 > > index 0000000000..3452fd4501 > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/post-image.sh > > @@ -0,0 +1,3 @@ > > +#!/bin/sh > > + > > +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > > diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > > new file mode 100644 > > index 0000000000..ae30666cd0 > > --- /dev/null > > +++ b/board/bsh/bsh-imx8mn/readme.txt > > @@ -0,0 +1,55 @@ > > +How to build it > > +=============== > > + > > +Configure buildroot: > > + > > + $ make bsh_smms2pro_defconfig > > + > > +Change settings to fit your needs (optional): > > + > > + $ make menuconfig > > + > > +Compile everything and buildr the rootfs image: > > + > > + $ make > > + > > + > > +Result of the build > > +=================== > > + > > +After building, the output/images directory contains: > > + > > + output/images/ > > + ??? bl31.bin > > + ??? Image > > + ??? flash.bin > > + ??? ddr3* > > + ??? rootfs.ext2 > > + ??? rootfs.ext4 -> rootfs.ext2 > > + ??? rootfs.tar > > + ??? sdcard.img > > + ??? u-boot.bin > > + ??? u-boot-nodtb.bin > > + ??? u-boot-spl.bin > > + > > + > > +Flashing the emmc card image > > +========================== > > + > > +To install the image on on eMMC > > + > > + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > > + > > + > > +Preparing the board > > +=================== > > + > > + * Connect a serial line to the board > > + * Power-up the board > > + > > + > > +Booting the board > > +================= > > + > > +By default the bootloader will search for the first valid image, starting > > +with the internal eMMC. > > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > > new file mode 100644 > > index 0000000000..8472c6db2b > > --- /dev/null > > +++ b/configs/bsh_smms2pro_defconfig > > @@ -0,0 +1,46 @@ > > +BR2_aarch64=y > > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > > +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > +BR2_PACKAGE_FREESCALE_IMX=y > > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > > +BR2_PACKAGE_FIRMWARE_IMX=y > > +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > > When building the final imx flash.bin image with binman this host tool > is no longer required. > > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > > Same here. You mean the UBOOT_TOOLS* package. I will drop as soon as I have a uboot downloading point in apertis (better the this one) Michael > > -- > Heiko -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From giulio.benetti at benettiengineering.com Mon Jan 31 12:05:48 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 13:05:48 +0100 Subject: [Buildroot] [PATCH 0/5] synopsys: boards maintenance In-Reply-To: <20220131081214.12773-1-geomatsi@gmail.com> References: <20220131081214.12773-1-geomatsi@gmail.com> Message-ID: <48cd0534-15fc-3dda-4a39-64487b112229@benettiengineering.com> Hi Sergey, On 31/01/22 09:12, Sergey Matyukevich wrote: > Hi all, > > This is a maintenance patch series for Synopsys boards. Outdated > and unused VDK configurations are removed. All the other boards > receive Linux kernel and U-Boot updates. Have you tested on the real boards or only check if they built successfully? Best regards -- Giulio Benetti Benetti Engineering sas > Regards, > Sergey > > > Sergey Matyukevich (5): > configs/snps_arc700_axs101: bump kernel and u-boot versions > configs/snps_archs32_axs103: bump kernel and u-boot versions > configs/snps_archs38_hsdk: bump kernel and u-boot versions > configs/snps_archs38_haps: bump kernel and u-boot versions > board/synopsys: remove outdated vdk boards > > board/synopsys/axs10x/uboot-fragment.config | 1 + > .../synopsys/vdk/linux-vdk-aarch64-defconfig | 143 ------------------ > board/synopsys/vdk/readme.txt | 65 -------- > configs/snps_aarch64_vdk_defconfig | 12 -- > configs/snps_arc700_axs101_defconfig | 10 +- > configs/snps_archs38_axs103_defconfig | 10 +- > configs/snps_archs38_haps_defconfig | 6 +- > configs/snps_archs38_hsdk_defconfig | 7 +- > configs/snps_archs38_vdk_defconfig | 20 --- > 9 files changed, 20 insertions(+), 254 deletions(-) > create mode 100644 board/synopsys/axs10x/uboot-fragment.config > delete mode 100644 board/synopsys/vdk/linux-vdk-aarch64-defconfig > delete mode 100644 board/synopsys/vdk/readme.txt > delete mode 100644 configs/snps_aarch64_vdk_defconfig > delete mode 100644 configs/snps_archs38_vdk_defconfig > From giulio.benetti at benettiengineering.com Mon Jan 31 12:34:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 13:34:41 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.4 Message-ID: <20220131123441.3645526-1-giulio.benetti@benettiengineering.com> All local patches except on have been upstreamed, so let's remove them and rename/rebase the remaining one. Signed-off-by: Giulio Benetti --- ...ake-install-for-non-root-don-t-stri.patch} | 24 +++- ...Makefile.in-replace-IROOT-by-DESTDIR.patch | 113 ------------------ ...etloadavg.c-compilation-revert-to-3..patch | 39 ------ ...-Makefile-fix-parallel-build-failure.patch | 41 ------- package/at/at.hash | 2 +- package/at/at.mk | 2 +- 6 files changed, 20 insertions(+), 201 deletions(-) rename package/at/{0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch => 0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch} (89%) delete mode 100644 package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch delete mode 100644 package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch delete mode 100644 package/at/0004-Makefile-fix-parallel-build-failure.patch diff --git a/package/at/0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch b/package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch similarity index 89% rename from package/at/0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch rename to package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch index f6c07e9fe2..74972d5dd3 100644 --- a/package/at/0002-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch +++ b/package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch @@ -1,4 +1,4 @@ -From 71d9a23ab6a73ec1287acc683716481090095de0 Mon Sep 17 00:00:00 2001 +From d3ebf63f0e1274eb7835983cb7d79216aa0a0137 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Jul 2021 16:47:56 +0200 Subject: [PATCH] Makefile.in: fix make install for non-root, don't strip @@ -10,16 +10,28 @@ Signed-off-by: Peter Korsgaard Signed-off-by: Vicente Olivert Riera [Vincent: tweak the patch for the new version] Signed-off-by: Giulio Benetti -[Giulio: convert patch to git format and rebase to version 3.2.2] +[Giulio: convert patch to git format and rebase to version 3.2.2 and +3.2.4] --- - Makefile.in | 47 +++++++++++++++++++++++------------------------ - 1 file changed, 23 insertions(+), 24 deletions(-) + Makefile.in | 51 +++++++++++++++++++++++++++------------------------ + 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in -index a7197f2..0b35a67 100644 +index 4ae194f..e6892d9 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -99,43 +99,42 @@ atrun: atrun.in +@@ -25,6 +25,10 @@ DESTDIR = $(IROOT) + $(warning IROOT is deprecated, you should use DESTDIR instead) + endif + ++ifdef IROOT ++DESTDIR = $(DESTDIR) ++endif ++ + DAEMON_USERNAME = @DAEMON_USERNAME@ + DAEMON_GROUPNAME= @DAEMON_GROUPNAME@ + LOADAVG_MX = @LOADAVG_MX@ +@@ -102,43 +106,42 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all diff --git a/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch deleted file mode 100644 index a9538589c1..0000000000 --- a/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch +++ /dev/null @@ -1,113 +0,0 @@ -From cbfd3296d7d0742d9e35b01ec9e433afe2c36c63 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Tue, 1 Dec 2009 20:57:45 +0100 -Subject: [PATCH] Makefile.in: replace IROOT by DESTDIR - -This patch replaces IROOT by DESTDIR, which is the autotools standard -variable. For backwards compatibilty IROOT overwrites the DESTDIR. - -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Vicente Olivert Riera -[Vincent: tweak the patch for the new version] -Signed-off-by: Giulio Benetti -[Giulio: convert patch to git format and rebase to version 3.2.2] ---- - Makefile.in | 72 ++++++++++++++++++++++++++++------------------------- - 1 file changed, 38 insertions(+), 34 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 3e8303c..a7197f2 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -20,6 +20,10 @@ etcdir = @ETCDIR@ - atjobdir = @ATJBD@ - systemdsystemunitdir = @systemdsystemunitdir@ - -+ifdef IROOT -+DESTDIR = $(DESTDIR) -+endif -+ - DAEMON_USERNAME = @DAEMON_USERNAME@ - DAEMON_GROUPNAME= @DAEMON_GROUPNAME@ - LOADAVG_MX = @LOADAVG_MX@ -@@ -95,43 +99,43 @@ atrun: atrun.in - $(CC) -c $(CFLAGS) $(DEFS) $*.c - - install: all -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdatadir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) -- chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) -- touch $(IROOT)$(LFILE) -- chmod 600 $(IROOT)$(LFILE) -- chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) -- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir) -- $(LN_S) -f at $(IROOT)$(bindir)/atq -- $(LN_S) -f at $(IROOT)$(bindir)/atrm -- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) -- $(INSTALL) -g root -o root -m 755 batch-job $(IROOT)$(atdatadir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) -- $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ -- cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 -- $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/ -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdatadir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir) -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) -+ chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) -+ touch $(DESTDIR)$(LFILE) -+ chmod 600 $(DESTDIR)$(LFILE) -+ chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE) -+ test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/ -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir) -+ $(LN_S) -f at $(DESTDIR)$(bindir)/atq -+ $(LN_S) -f at $(DESTDIR)$(bindir)/atrm -+ $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir) -+ $(INSTALL) -g root -o root -m 755 batch-job $(DESTDIR)$(atdatadir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) -+ $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/ -+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 -+ $(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/ - sed "s,\$${exec_prefix},$(exec_prefix),g" tmpman -- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 -+ $(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8 - rm -f tmpman -- $(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/ -- cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 -- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) -- rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ -- $(IROOT)$(mandir)/cat1/atq.1* -- rm -f $(IROOT)$(mandir)/cat1/atd.8* -+ $(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/ -+ cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 -+ $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir) -+ rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \ -+ $(DESTDIR)$(mandir)/cat1/atq.1* -+ rm -f $(DESTDIR)$(mandir)/cat1/atd.8* - if test x"$(systemdsystemunitdir)" != xno; then \ -- $(INSTALL) -o root -g root -m 755 -d $(IROOT)$(systemdsystemunitdir); \ -- $(INSTALL) -o root -g root -m 644 atd.service $(IROOT)$(systemdsystemunitdir); \ -+ $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ -+ $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ - fi - - dist: checkin $(DIST) $(LIST) Filelist.asc --- -2.25.1 - diff --git a/package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch b/package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch deleted file mode 100644 index fb515af8d9..0000000000 --- a/package/at/0003-getloadavg-fix-getloadavg.c-compilation-revert-to-3..patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4eda31cea9fb3c77fe2748a65960f24ffb42f9ff Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Fri, 23 Jul 2021 16:51:17 +0200 -Subject: [PATCH] getloadavg: fix getloadavg.c compilation, revert to 3.1.10 - version - -getloadavg.c shipped with 3.1.13 doesn't compile because it references -headers not shipped. Fix it by simply reverting to the 3.1.10 version. - -Signed-off-by: Peter Korsgaard -Signed-off-by: Giulio Benetti -[Giulio: convert patch to git format] ---- - getloadavg.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/getloadavg.c b/getloadavg.c -index cf5869f..23d18eb 100644 ---- a/getloadavg.c -+++ b/getloadavg.c -@@ -66,11 +66,12 @@ Boston, MA 02110-1301 USA */ - - /* This should always be first. */ - #ifdef HAVE_CONFIG_H --#include -+#include "config.h" - #endif - --#include "lisp.h" --#include "sysfile.h" /* for encapsulated open, close, read, write */ -+#include -+#include -+#include - - #ifndef HAVE_GETLOADAVG - --- -2.25.1 - diff --git a/package/at/0004-Makefile-fix-parallel-build-failure.patch b/package/at/0004-Makefile-fix-parallel-build-failure.patch deleted file mode 100644 index 6e3dc24ca4..0000000000 --- a/package/at/0004-Makefile-fix-parallel-build-failure.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3ace0b57e2aacb784c01a3c7694c6c92461937ff Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Thu, 20 Feb 2020 22:00:11 +0100 -Subject: [PATCH] Makefile: fix parallel build failure - -At the moment parallel build fails due to 2 causes: -1) parsetime.l tries to include incomplete y.tab.h, since y.tab.h is the -result of yacc -d parsetime.y -2) when compiling y.tab.c, y.tab.c itself is not complete, since it is -the result of yacc -d parsetime.y - -So fix it by: -1) making parsetime.l to wait for y.tab.h to be created by yacc -2) waiting for y.tab.c and y.tab.h to be created before compile them - -Signed-off-by: Giulio Benetti ---- - Makefile.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index 4c11913..57c3a0c 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y - lex.yy.c: parsetime.l - $(LEX) -i parsetime.l - -+parsetime.l: y.tab.h -+ - atd.service: atd.service.in - cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ - -@@ -173,3 +175,4 @@ perm.o: perm.c config.h privs.h at.h - posixtm.o: posixtm.c posixtm.h - daemon.o: daemon.c config.h daemon.h privs.h - getloadavg.o: getloadavg.c config.h getloadavg.h -+y.tab.o: y.tab.c y.tab.h --- -2.20.1 - diff --git a/package/at/at.hash b/package/at/at.hash index 88a9e8a91d..d4ad9aa436 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088 at_3.2.2.orig.tar.gz +sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index bbeed2a0e8..6637f0df64 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.2 +AT_VERSION = 3.2.4 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_AUTORECONF = YES -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 31 12:39:08 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 13:39:08 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131085216.1256242-1-michael@amarulasolutions.com> Message-ID: Hi Michael, Heiko, All, On 31/01/22 12:48, Michael Nazzareno Trimarchi wrote: > Hi Heiko > > On Mon, Jan 31, 2022 at 12:42 PM Heiko Thiery wrote: >> >> Hi Michael, >> >> Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi >> : >>> >>> Add initial support for iMX8MN BSH SMM S2 PRO board: >>> >>> - Linux: v5.17-rc1 >>> - Uboot 2022-01-rc1 (reference tree) >>> - Default packages from buildroot >>> >>> https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ >>> >>> Add Ariel D'Alessandro as co-maintainer, we work together on >>> platform mainline >>> >>> Build and tested using: >>> docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>> >>> Cc: Ariel D'Alessandro >>> Cc: Jagan Teki >>> Signed-off-by: Michael Trimarchi >>> --- >>> Changes V1->V2: >>> - add the board reference page >>> - test with docker >>> - adjust the buildroot config in order to use buildman >>> --- >>> DEVELOPERS | 2 ++ >>> board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ >>> board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ >>> board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ >>> board/bsh/bsh-imx8mn/post-image.sh | 3 ++ >>> board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ >>> configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ >>> 7 files changed, 134 insertions(+) >>> create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf >>> create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg >>> create mode 100755 board/bsh/bsh-imx8mn/post-build.sh >>> create mode 100755 board/bsh/bsh-imx8mn/post-image.sh >>> create mode 100644 board/bsh/bsh-imx8mn/readme.txt >>> create mode 100644 configs/bsh_smms2pro_defconfig >>> >>> diff --git a/DEVELOPERS b/DEVELOPERS >>> index fe8de1916e..fc66fb6b83 100644 >>> --- a/DEVELOPERS >>> +++ b/DEVELOPERS >>> @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig >>> F: configs/snps_archs38_vdk_defconfig >>> >>> N: Ariel D'Alessandro >>> +F: board/bsh/ >>> F: package/axfsutils/ >>> F: package/mali-t76x/ >>> >>> @@ -2018,6 +2019,7 @@ F: package/python-crc16/ >>> F: package/python-pyzmq/ >>> >>> N: Michael Trimarchi >>> +F: board/bsh/ >>> F: package/python-spidev/ >>> >>> N: Michael Vetter >>> diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf >>> new file mode 100644 >>> index 0000000000..9111354742 >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/extlinux.conf >>> @@ -0,0 +1,4 @@ >>> +label buildroot >>> + kernel /boot/Image >>> + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb >>> + append root=PARTUUID=%PARTUUID% rootwait rw >>> diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg >>> new file mode 100644 >>> index 0000000000..bc100b171d >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/genimage.cfg >>> @@ -0,0 +1,17 @@ >>> +image sdcard.img { >>> + hdimage { >>> + partition-table-type = "gpt" >>> + } >>> + >>> + partition imx-boot { >>> + in-partition-table = "no" >>> + image = "flash.bin" >>> + offset = 33K >>> + } >>> + >>> + partition rootfs { >>> + offset = 8M >>> + image = "rootfs.ext4" >>> + partition-uuid = %PARTUUID% >>> + } >>> +} >>> diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh >>> new file mode 100755 >>> index 0000000000..bf8861f6a9 >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/post-build.sh >>> @@ -0,0 +1,7 @@ >>> +#!/bin/sh >>> +BOARD_DIR="$(dirname $0)" >>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >>> + >>> +install -d "$TARGET_DIR/boot/extlinux/" >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >>> diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh >>> new file mode 100755 >>> index 0000000000..3452fd4501 >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/post-image.sh >>> @@ -0,0 +1,3 @@ >>> +#!/bin/sh >>> + >>> +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg >>> diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt >>> new file mode 100644 >>> index 0000000000..ae30666cd0 >>> --- /dev/null >>> +++ b/board/bsh/bsh-imx8mn/readme.txt >>> @@ -0,0 +1,55 @@ >>> +How to build it >>> +=============== >>> + >>> +Configure buildroot: >>> + >>> + $ make bsh_smms2pro_defconfig >>> + >>> +Change settings to fit your needs (optional): >>> + >>> + $ make menuconfig >>> + >>> +Compile everything and buildr the rootfs image: >>> + >>> + $ make >>> + >>> + >>> +Result of the build >>> +=================== >>> + >>> +After building, the output/images directory contains: >>> + >>> + output/images/ >>> + ??? bl31.bin >>> + ??? Image >>> + ??? flash.bin >>> + ??? ddr3* >>> + ??? rootfs.ext2 >>> + ??? rootfs.ext4 -> rootfs.ext2 >>> + ??? rootfs.tar >>> + ??? sdcard.img >>> + ??? u-boot.bin >>> + ??? u-boot-nodtb.bin >>> + ??? u-boot-spl.bin >>> + >>> + >>> +Flashing the emmc card image >>> +========================== >>> + >>> +To install the image on on eMMC >>> + >>> + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img >>> + >>> + >>> +Preparing the board >>> +=================== >>> + >>> + * Connect a serial line to the board >>> + * Power-up the board >>> + >>> + >>> +Booting the board >>> +================= >>> + >>> +By default the bootloader will search for the first valid image, starting >>> +with the internal eMMC. >>> diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig >>> new file mode 100644 >>> index 0000000000..8472c6db2b >>> --- /dev/null >>> +++ b/configs/bsh_smms2pro_defconfig >>> @@ -0,0 +1,46 @@ >>> +BR2_aarch64=y >>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" >>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" >>> +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" >>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" >>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" >>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>> +BR2_PACKAGE_FREESCALE_IMX=y >>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y >>> +BR2_PACKAGE_FIRMWARE_IMX=y >>> +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" >>> +BR2_TARGET_UBOOT=y >>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" >>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>> +BR2_TARGET_UBOOT_SPL=y >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> +BR2_PACKAGE_HOST_IMX_MKIMAGE=y >> >> When building the final imx flash.bin image with binman this host tool >> is no longer required. >> >>> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y >>> +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y >> >> Same here. > > You mean the UBOOT_TOOLS* package. I will drop as soon as I have a > uboot downloading point in apertis (better the this one) I think Heiko means BR2_PACKAGE_HOST_IMX_MKIMAGE=y, indeed I've just built successfully the defconfig. So I give you a: Reviewed-by: Giulio Benetti removing BR2_PACKAGE_HOST_IMX_MKIMAGE=y and with the promise to bump Linux and U-Boot versions as soon as new versions are released with the goal of removing the -rc1 versions. Kind regards to everybody! -- Giulio Benetti Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Jan 31 12:41:38 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 13:41:38 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131085216.1256242-1-michael@amarulasolutions.com> Message-ID: <32d9ead7-e961-0b9d-10a3-c1ea8337b957@benettiengineering.com> On 31/01/22 13:39, Giulio Benetti wrote: > Hi Michael, Heiko, All, > > On 31/01/22 12:48, Michael Nazzareno Trimarchi wrote: >> Hi Heiko >> >> On Mon, Jan 31, 2022 at 12:42 PM Heiko Thiery wrote: >>> >>> Hi Michael, >>> >>> Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi >>> : >>>> >>>> Add initial support for iMX8MN BSH SMM S2 PRO board: >>>> >>>> - Linux: v5.17-rc1 >>>> - Uboot 2022-01-rc1 (reference tree) >>>> - Default packages from buildroot >>>> >>>> https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ >>>> >>>> Add Ariel D'Alessandro as co-maintainer, we work together on >>>> platform mainline >>>> >>>> Build and tested using: >>>> docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 >>>> >>>> Cc: Ariel D'Alessandro >>>> Cc: Jagan Teki >>>> Signed-off-by: Michael Trimarchi >>>> --- >>>> Changes V1->V2: >>>> - add the board reference page >>>> - test with docker >>>> - adjust the buildroot config in order to use buildman >>>> --- >>>> DEVELOPERS | 2 ++ >>>> board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ >>>> board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ >>>> board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ >>>> board/bsh/bsh-imx8mn/post-image.sh | 3 ++ >>>> board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ >>>> configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ >>>> 7 files changed, 134 insertions(+) >>>> create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf >>>> create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg >>>> create mode 100755 board/bsh/bsh-imx8mn/post-build.sh >>>> create mode 100755 board/bsh/bsh-imx8mn/post-image.sh >>>> create mode 100644 board/bsh/bsh-imx8mn/readme.txt >>>> create mode 100644 configs/bsh_smms2pro_defconfig >>>> >>>> diff --git a/DEVELOPERS b/DEVELOPERS >>>> index fe8de1916e..fc66fb6b83 100644 >>>> --- a/DEVELOPERS >>>> +++ b/DEVELOPERS >>>> @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig >>>> F: configs/snps_archs38_vdk_defconfig >>>> >>>> N: Ariel D'Alessandro >>>> +F: board/bsh/ >>>> F: package/axfsutils/ >>>> F: package/mali-t76x/ >>>> >>>> @@ -2018,6 +2019,7 @@ F: package/python-crc16/ >>>> F: package/python-pyzmq/ >>>> >>>> N: Michael Trimarchi >>>> +F: board/bsh/ >>>> F: package/python-spidev/ >>>> >>>> N: Michael Vetter >>>> diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf >>>> new file mode 100644 >>>> index 0000000000..9111354742 >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/extlinux.conf >>>> @@ -0,0 +1,4 @@ >>>> +label buildroot >>>> + kernel /boot/Image >>>> + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb >>>> + append root=PARTUUID=%PARTUUID% rootwait rw >>>> diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg >>>> new file mode 100644 >>>> index 0000000000..bc100b171d >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/genimage.cfg >>>> @@ -0,0 +1,17 @@ >>>> +image sdcard.img { >>>> + hdimage { >>>> + partition-table-type = "gpt" >>>> + } >>>> + >>>> + partition imx-boot { >>>> + in-partition-table = "no" >>>> + image = "flash.bin" >>>> + offset = 33K >>>> + } >>>> + >>>> + partition rootfs { >>>> + offset = 8M >>>> + image = "rootfs.ext4" >>>> + partition-uuid = %PARTUUID% >>>> + } >>>> +} >>>> diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh >>>> new file mode 100755 >>>> index 0000000000..bf8861f6a9 >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/post-build.sh >>>> @@ -0,0 +1,7 @@ >>>> +#!/bin/sh >>>> +BOARD_DIR="$(dirname $0)" >>>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >>>> + >>>> +install -d "$TARGET_DIR/boot/extlinux/" >>>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >>>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >>>> diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh >>>> new file mode 100755 >>>> index 0000000000..3452fd4501 >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/post-image.sh >>>> @@ -0,0 +1,3 @@ >>>> +#!/bin/sh >>>> + >>>> +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg >>>> diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt >>>> new file mode 100644 >>>> index 0000000000..ae30666cd0 >>>> --- /dev/null >>>> +++ b/board/bsh/bsh-imx8mn/readme.txt >>>> @@ -0,0 +1,55 @@ >>>> +How to build it >>>> +=============== >>>> + >>>> +Configure buildroot: >>>> + >>>> + $ make bsh_smms2pro_defconfig >>>> + >>>> +Change settings to fit your needs (optional): >>>> + >>>> + $ make menuconfig >>>> + >>>> +Compile everything and buildr the rootfs image: >>>> + >>>> + $ make >>>> + >>>> + >>>> +Result of the build >>>> +=================== >>>> + >>>> +After building, the output/images directory contains: >>>> + >>>> + output/images/ >>>> + ??? bl31.bin >>>> + ??? Image >>>> + ??? flash.bin >>>> + ??? ddr3* >>>> + ??? rootfs.ext2 >>>> + ??? rootfs.ext4 -> rootfs.ext2 >>>> + ??? rootfs.tar >>>> + ??? sdcard.img >>>> + ??? u-boot.bin >>>> + ??? u-boot-nodtb.bin >>>> + ??? u-boot-spl.bin >>>> + >>>> + >>>> +Flashing the emmc card image >>>> +========================== >>>> + >>>> +To install the image on on eMMC >>>> + >>>> + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img >>>> + >>>> + >>>> +Preparing the board >>>> +=================== >>>> + >>>> + * Connect a serial line to the board >>>> + * Power-up the board >>>> + >>>> + >>>> +Booting the board >>>> +================= >>>> + >>>> +By default the bootloader will search for the first valid image, starting >>>> +with the internal eMMC. >>>> diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig >>>> new file mode 100644 >>>> index 0000000000..8472c6db2b >>>> --- /dev/null >>>> +++ b/configs/bsh_smms2pro_defconfig >>>> @@ -0,0 +1,46 @@ >>>> +BR2_aarch64=y >>>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" >>>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" >>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" >>>> +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" >>>> +BR2_LINUX_KERNEL=y >>>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" >>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" >>>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" >>>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>>> +BR2_PACKAGE_FREESCALE_IMX=y >>>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y >>>> +BR2_PACKAGE_FIRMWARE_IMX=y >>>> +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y >>>> +BR2_TARGET_ROOTFS_EXT2=y >>>> +BR2_TARGET_ROOTFS_EXT2_4=y >>>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" >>>> +BR2_TARGET_UBOOT=y >>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y >>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" >>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" >>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" >>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>>> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>>> +BR2_TARGET_UBOOT_SPL=y >>>> +BR2_PACKAGE_HOST_GENIMAGE=y >>>> +BR2_PACKAGE_HOST_IMX_MKIMAGE=y >>> >>> When building the final imx flash.bin image with binman this host tool >>> is no longer required. >>> >>>> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y >>>> +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y >>> >>> Same here. >> >> You mean the UBOOT_TOOLS* package. I will drop as soon as I have a >> uboot downloading point in apertis (better the this one) > > I think Heiko means BR2_PACKAGE_HOST_IMX_MKIMAGE=y, indeed I've just > built successfully the defconfig. > > So I give you a: > Reviewed-by: Giulio Benetti > > removing BR2_PACKAGE_HOST_IMX_MKIMAGE=y > > and with the promise to bump Linux and U-Boot versions as soon as new > versions are released with the goal of removing the -rc1 versions. Forgotten to mention again, we need Ariel "Tested-by:" before applying. Regards -- Giulio Benetti Benetti Engineering sas From peron.clem at gmail.com Mon Jan 31 12:43:14 2022 From: peron.clem at gmail.com (=?UTF-8?B?Q2zDqW1lbnQgUMOpcm9u?=) Date: Mon, 31 Jan 2022 13:43:14 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/beelink_gs1: increase rootfs size to 120M In-Reply-To: <20220130181830.3170d14f@windsurf> References: <20220129111731.736265-1-peron.clem@gmail.com> <20220130181830.3170d14f@windsurf> Message-ID: Hi Thomas, On Sun, 30 Jan 2022 at 18:18, Thomas Petazzoni wrote: > > On Sat, 29 Jan 2022 12:17:30 +0100 > Cl?ment P?ron wrote: > > > For the moment Beelink GS1 use a default rootfs size of 60M, > > which is a bit low if you want to add some packages like a > > graphic stack. > > > > Increase the rootfs size to 120M. > > > > Reviewed-by: Giulio Benetti > > Signed-off-by: Cl?ment P?ron > > --- > > configs/beelink_gs1_defconfig | 1 + > > 1 file changed, 1 insertion(+) > > I have not applied this one. Indeed, any defconfig that uses the > default rootfs size of 60M would have the problem of "if I add more > packages, it doesn't fit in the image". The defconfigs are meant to be > minimal, so it doesn't make sense to increase the size to 120M to > accommodate some possible package additions. Maybe even 120M is not > going to be enough depending on how many packages you add (and how > large they are). Ok, Thanks for the explanation > > So I've marked this patch as Rejected. > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From michael at amarulasolutions.com Mon Jan 31 12:43:35 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 31 Jan 2022 13:43:35 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <32d9ead7-e961-0b9d-10a3-c1ea8337b957@benettiengineering.com> References: <20220131085216.1256242-1-michael@amarulasolutions.com> <32d9ead7-e961-0b9d-10a3-c1ea8337b957@benettiengineering.com> Message-ID: Hi git diff diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig index 8472c6db2b..34d92fa4cc 100644 --- a/configs/bsh_smms2pro_defconfig +++ b/configs/bsh_smms2pro_defconfig @@ -41,6 +41,3 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Those are not needed. Anyway I need to change uboot download point and waiting from Ariel Michael On Mon, Jan 31, 2022 at 1:41 PM Giulio Benetti wrote: > > On 31/01/22 13:39, Giulio Benetti wrote: > > Hi Michael, Heiko, All, > > > > On 31/01/22 12:48, Michael Nazzareno Trimarchi wrote: > >> Hi Heiko > >> > >> On Mon, Jan 31, 2022 at 12:42 PM Heiko Thiery wrote: > >>> > >>> Hi Michael, > >>> > >>> Am Mo., 31. Jan. 2022 um 09:52 Uhr schrieb Michael Trimarchi > >>> : > >>>> > >>>> Add initial support for iMX8MN BSH SMM S2 PRO board: > >>>> > >>>> - Linux: v5.17-rc1 > >>>> - Uboot 2022-01-rc1 (reference tree) > >>>> - Default packages from buildroot > >>>> > >>>> https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > >>>> > >>>> Add Ariel D'Alessandro as co-maintainer, we work together on > >>>> platform mainline > >>>> > >>>> Build and tested using: > >>>> docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > >>>> > >>>> Cc: Ariel D'Alessandro > >>>> Cc: Jagan Teki > >>>> Signed-off-by: Michael Trimarchi > >>>> --- > >>>> Changes V1->V2: > >>>> - add the board reference page > >>>> - test with docker > >>>> - adjust the buildroot config in order to use buildman > >>>> --- > >>>> DEVELOPERS | 2 ++ > >>>> board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ > >>>> board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ > >>>> board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ > >>>> board/bsh/bsh-imx8mn/post-image.sh | 3 ++ > >>>> board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ > >>>> configs/bsh_smms2pro_defconfig | 46 +++++++++++++++++++++++++ > >>>> 7 files changed, 134 insertions(+) > >>>> create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf > >>>> create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg > >>>> create mode 100755 board/bsh/bsh-imx8mn/post-build.sh > >>>> create mode 100755 board/bsh/bsh-imx8mn/post-image.sh > >>>> create mode 100644 board/bsh/bsh-imx8mn/readme.txt > >>>> create mode 100644 configs/bsh_smms2pro_defconfig > >>>> > >>>> diff --git a/DEVELOPERS b/DEVELOPERS > >>>> index fe8de1916e..fc66fb6b83 100644 > >>>> --- a/DEVELOPERS > >>>> +++ b/DEVELOPERS > >>>> @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig > >>>> F: configs/snps_archs38_vdk_defconfig > >>>> > >>>> N: Ariel D'Alessandro > >>>> +F: board/bsh/ > >>>> F: package/axfsutils/ > >>>> F: package/mali-t76x/ > >>>> > >>>> @@ -2018,6 +2019,7 @@ F: package/python-crc16/ > >>>> F: package/python-pyzmq/ > >>>> > >>>> N: Michael Trimarchi > >>>> +F: board/bsh/ > >>>> F: package/python-spidev/ > >>>> > >>>> N: Michael Vetter > >>>> diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf > >>>> new file mode 100644 > >>>> index 0000000000..9111354742 > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/extlinux.conf > >>>> @@ -0,0 +1,4 @@ > >>>> +label buildroot > >>>> + kernel /boot/Image > >>>> + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb > >>>> + append root=PARTUUID=%PARTUUID% rootwait rw > >>>> diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg > >>>> new file mode 100644 > >>>> index 0000000000..bc100b171d > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/genimage.cfg > >>>> @@ -0,0 +1,17 @@ > >>>> +image sdcard.img { > >>>> + hdimage { > >>>> + partition-table-type = "gpt" > >>>> + } > >>>> + > >>>> + partition imx-boot { > >>>> + in-partition-table = "no" > >>>> + image = "flash.bin" > >>>> + offset = 33K > >>>> + } > >>>> + > >>>> + partition rootfs { > >>>> + offset = 8M > >>>> + image = "rootfs.ext4" > >>>> + partition-uuid = %PARTUUID% > >>>> + } > >>>> +} > >>>> diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh > >>>> new file mode 100755 > >>>> index 0000000000..bf8861f6a9 > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/post-build.sh > >>>> @@ -0,0 +1,7 @@ > >>>> +#!/bin/sh > >>>> +BOARD_DIR="$(dirname $0)" > >>>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" > >>>> + > >>>> +install -d "$TARGET_DIR/boot/extlinux/" > >>>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > >>>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > >>>> diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh > >>>> new file mode 100755 > >>>> index 0000000000..3452fd4501 > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/post-image.sh > >>>> @@ -0,0 +1,3 @@ > >>>> +#!/bin/sh > >>>> + > >>>> +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg > >>>> diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt > >>>> new file mode 100644 > >>>> index 0000000000..ae30666cd0 > >>>> --- /dev/null > >>>> +++ b/board/bsh/bsh-imx8mn/readme.txt > >>>> @@ -0,0 +1,55 @@ > >>>> +How to build it > >>>> +=============== > >>>> + > >>>> +Configure buildroot: > >>>> + > >>>> + $ make bsh_smms2pro_defconfig > >>>> + > >>>> +Change settings to fit your needs (optional): > >>>> + > >>>> + $ make menuconfig > >>>> + > >>>> +Compile everything and buildr the rootfs image: > >>>> + > >>>> + $ make > >>>> + > >>>> + > >>>> +Result of the build > >>>> +=================== > >>>> + > >>>> +After building, the output/images directory contains: > >>>> + > >>>> + output/images/ > >>>> + ??? bl31.bin > >>>> + ??? Image > >>>> + ??? flash.bin > >>>> + ??? ddr3* > >>>> + ??? rootfs.ext2 > >>>> + ??? rootfs.ext4 -> rootfs.ext2 > >>>> + ??? rootfs.tar > >>>> + ??? sdcard.img > >>>> + ??? u-boot.bin > >>>> + ??? u-boot-nodtb.bin > >>>> + ??? u-boot-spl.bin > >>>> + > >>>> + > >>>> +Flashing the emmc card image > >>>> +========================== > >>>> + > >>>> +To install the image on on eMMC > >>>> + > >>>> + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img > >>>> + > >>>> + > >>>> +Preparing the board > >>>> +=================== > >>>> + > >>>> + * Connect a serial line to the board > >>>> + * Power-up the board > >>>> + > >>>> + > >>>> +Booting the board > >>>> +================= > >>>> + > >>>> +By default the bootloader will search for the first valid image, starting > >>>> +with the internal eMMC. > >>>> diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > >>>> new file mode 100644 > >>>> index 0000000000..8472c6db2b > >>>> --- /dev/null > >>>> +++ b/configs/bsh_smms2pro_defconfig > >>>> @@ -0,0 +1,46 @@ > >>>> +BR2_aarch64=y > >>>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > >>>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" > >>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" > >>>> +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" > >>>> +BR2_LINUX_KERNEL=y > >>>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y > >>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" > >>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" > >>>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > >>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y > >>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" > >>>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > >>>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y > >>>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > >>>> +BR2_PACKAGE_FREESCALE_IMX=y > >>>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y > >>>> +BR2_PACKAGE_FIRMWARE_IMX=y > >>>> +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y > >>>> +BR2_TARGET_ROOTFS_EXT2=y > >>>> +BR2_TARGET_ROOTFS_EXT2_4=y > >>>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" > >>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" > >>>> +BR2_TARGET_UBOOT=y > >>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > >>>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y > >>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" > >>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="wip/adalessandro/bsh-smm2-pro" > >>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" > >>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y > >>>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > >>>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > >>>> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > >>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > >>>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > >>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > >>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > >>>> +BR2_TARGET_UBOOT_SPL=y > >>>> +BR2_PACKAGE_HOST_GENIMAGE=y > >>>> +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > >>> > >>> When building the final imx flash.bin image with binman this host tool > >>> is no longer required. > >>> > >>>> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > >>>> +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > >>> > >>> Same here. > >> > >> You mean the UBOOT_TOOLS* package. I will drop as soon as I have a > >> uboot downloading point in apertis (better the this one) > > > > I think Heiko means BR2_PACKAGE_HOST_IMX_MKIMAGE=y, indeed I've just > > built successfully the defconfig. > > > > So I give you a: > > Reviewed-by: Giulio Benetti > > > > removing BR2_PACKAGE_HOST_IMX_MKIMAGE=y > > > > and with the promise to bump Linux and U-Boot versions as soon as new > > versions are released with the goal of removing the -rc1 versions. > > Forgotten to mention again, we need Ariel "Tested-by:" before applying. > > Regards > -- > Giulio Benetti > Benetti Engineering sas -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From heiko.thiery at gmail.com Mon Jan 31 12:45:58 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 31 Jan 2022 13:45:58 +0100 Subject: [Buildroot] [PATCH V2] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: References: <20220131085216.1256242-1-michael@amarulasolutions.com> <32d9ead7-e961-0b9d-10a3-c1ea8337b957@benettiengineering.com> Message-ID: Hi, Am Mo., 31. Jan. 2022 um 13:43 Uhr schrieb Michael Nazzareno Trimarchi : > > Hi > > git diff > diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig > index 8472c6db2b..34d92fa4cc 100644 > --- a/configs/bsh_smms2pro_defconfig > +++ b/configs/bsh_smms2pro_defconfig > @@ -41,6 +41,3 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > BR2_TARGET_UBOOT_SPL=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_IMX_MKIMAGE=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > > Those are not needed. Anyway I need to change uboot download point and > waiting from Ariel Yes .. this is what I meant. -- Heiko From geomatsi at gmail.com Mon Jan 31 13:09:03 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 31 Jan 2022 16:09:03 +0300 Subject: [Buildroot] [PATCH 0/5] synopsys: boards maintenance In-Reply-To: <48cd0534-15fc-3dda-4a39-64487b112229@benettiengineering.com> References: <20220131081214.12773-1-geomatsi@gmail.com> <48cd0534-15fc-3dda-4a39-64487b112229@benettiengineering.com> Message-ID: Hi Giulio, > Hi Sergey, > > On 31/01/22 09:12, Sergey Matyukevich wrote: > > Hi all, > > > > This is a maintenance patch series for Synopsys boards. Outdated > > and unused VDK configurations are removed. All the other boards > > receive Linux kernel and U-Boot updates. > > Have you tested on the real boards or only check if they built successfully? I have tested all the images on hardware. Regards, Sergey From giulio.benetti at benettiengineering.com Mon Jan 31 13:10:46 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 14:10:46 +0100 Subject: [Buildroot] [PATCH 0/5] synopsys: boards maintenance In-Reply-To: References: Message-ID: > Il giorno 31 gen 2022, alle ore 14:09, Sergey Matyukevich ha scritto: > > ?Hi Giulio, > >> Hi Sergey, >> >>> On 31/01/22 09:12, Sergey Matyukevich wrote: >>> Hi all, >>> >>> This is a maintenance patch series for Synopsys boards. Outdated >>> and unused VDK configurations are removed. All the other boards >>> receive Linux kernel and U-Boot updates. >> >> Have you tested on the real boards or only check if they built successfully? > > I have tested all the images on hardware. Perfect :-) Best regards Giulio Benetti > > Regards, > Sergey From michael at amarulasolutions.com Mon Jan 31 14:55:55 2022 From: michael at amarulasolutions.com (Michael Trimarchi) Date: Mon, 31 Jan 2022 15:55:55 +0100 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO Message-ID: <20220131145555.2819020-1-michael@amarulasolutions.com> Add initial support for iMX8MN BSH SMM S2 PRO board: - Linux: v5.17-rc1 - Uboot 2022-01-rc1 (reference tree) - Default packages from buildroot https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ Add Ariel D'Alessandro as co-maintainer, we work together on platform mainline Build and tested using: docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 Cc: Ariel D'Alessandro Cc: Jagan Teki Cc: Heiko Thiery Cc: Giulio Benetti Reviewed-by: Giulio Benetti Signed-off-by: Michael Trimarchi --- Changes V2->V3: - Update the uboot download point - Add feedback from Heiko Thiery - Add feddback from Giulio Benetti Changes V1->V2: - add the board reference page - test with docker - adjust the buildroot config in order to use buildman --- DEVELOPERS | 2 ++ board/bsh/bsh-imx8mn/extlinux.conf | 4 +++ board/bsh/bsh-imx8mn/genimage.cfg | 17 +++++++++ board/bsh/bsh-imx8mn/post-build.sh | 7 ++++ board/bsh/bsh-imx8mn/post-image.sh | 3 ++ board/bsh/bsh-imx8mn/readme.txt | 55 ++++++++++++++++++++++++++++++ configs/bsh_smms2pro_defconfig | 43 +++++++++++++++++++++++ 7 files changed, 131 insertions(+) create mode 100644 board/bsh/bsh-imx8mn/extlinux.conf create mode 100644 board/bsh/bsh-imx8mn/genimage.cfg create mode 100755 board/bsh/bsh-imx8mn/post-build.sh create mode 100755 board/bsh/bsh-imx8mn/post-image.sh create mode 100644 board/bsh/bsh-imx8mn/readme.txt create mode 100644 configs/bsh_smms2pro_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fe8de1916e..fc66fb6b83 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -220,6 +220,7 @@ F: configs/snps_archs38_hsdk_defconfig F: configs/snps_archs38_vdk_defconfig N: Ariel D'Alessandro +F: board/bsh/ F: package/axfsutils/ F: package/mali-t76x/ @@ -2018,6 +2019,7 @@ F: package/python-crc16/ F: package/python-pyzmq/ N: Michael Trimarchi +F: board/bsh/ F: package/python-spidev/ N: Michael Vetter diff --git a/board/bsh/bsh-imx8mn/extlinux.conf b/board/bsh/bsh-imx8mn/extlinux.conf new file mode 100644 index 0000000000..9111354742 --- /dev/null +++ b/board/bsh/bsh-imx8mn/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/bsh/bsh-imx8mn/genimage.cfg b/board/bsh/bsh-imx8mn/genimage.cfg new file mode 100644 index 0000000000..bc100b171d --- /dev/null +++ b/board/bsh/bsh-imx8mn/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/bsh/bsh-imx8mn/post-build.sh b/board/bsh/bsh-imx8mn/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/bsh/bsh-imx8mn/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/bsh/bsh-imx8mn/post-image.sh b/board/bsh/bsh-imx8mn/post-image.sh new file mode 100755 index 0000000000..3452fd4501 --- /dev/null +++ b/board/bsh/bsh-imx8mn/post-image.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +support/scripts/genimage.sh -c ${BINARIES_DIR}/genimage.cfg diff --git a/board/bsh/bsh-imx8mn/readme.txt b/board/bsh/bsh-imx8mn/readme.txt new file mode 100644 index 0000000000..ae30666cd0 --- /dev/null +++ b/board/bsh/bsh-imx8mn/readme.txt @@ -0,0 +1,55 @@ +How to build it +=============== + +Configure buildroot: + + $ make bsh_smms2pro_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and buildr the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? Image + ??? flash.bin + ??? ddr3* + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-nodtb.bin + ??? u-boot-spl.bin + + +Flashing the emmc card image +========================== + +To install the image on on eMMC + + $ sudo uuu -b emmc_all output/images/flash.bin output/images/sdcard.img + + +Preparing the board +=================== + + * Connect a serial line to the board + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. diff --git a/configs/bsh_smms2pro_defconfig b/configs/bsh_smms2pro_defconfig new file mode 100644 index 0000000000..9fd7fb8e7c --- /dev/null +++ b/configs/bsh_smms2pro_defconfig @@ -0,0 +1,43 @@ +BR2_aarch64=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/bsh-imx8mn/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/bsh-imx8mn/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-bsh-smm-s2pro.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.17-rc1" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR3=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.apertis.org/adalessandro/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-bsh-smm2" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y -- 2.25.1 From heiko.thiery at gmail.com Mon Jan 31 15:30:23 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 31 Jan 2022 16:30:23 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig Message-ID: <20220131153022.351662-1-heiko.thiery@gmail.com> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 Cc: Frieder Schrempf Signed-off-by: Heiko Thiery --- v5: - remove BR2_PACKAGE_HOST_UBOOT_TOOLS v4: - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. The FPU options are set implicit. v3: - change offset value to use capitol 'K' value (thanks Guilio) - add info to uboot patches about submitting to upstream v2: - switch to extlinux - directly call genimage.sh - remove post-image.sh - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME DEVELOPERS | 2 + board/kontron/bl-imx8mm/extlinux.conf | 4 + board/kontron/bl-imx8mm/genimage.cfg | 18 ++ ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ board/kontron/bl-imx8mm/post-build.sh | 7 + board/kontron/bl-imx8mm/readme.txt | 85 +++++ configs/kontron_bl_imx8mm_defconfig | 58 ++++ 8 files changed, 510 insertions(+) create mode 100644 board/kontron/bl-imx8mm/extlinux.conf create mode 100644 board/kontron/bl-imx8mm/genimage.cfg create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch create mode 100755 board/kontron/bl-imx8mm/post-build.sh create mode 100644 board/kontron/bl-imx8mm/readme.txt create mode 100644 configs/kontron_bl_imx8mm_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..38724726d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1183,7 +1183,9 @@ F: package/python-sip/ F: package/uhd/ N: Heiko Thiery +F: board/kontron/bl-imx8mm/ F: board/kontron/pitx-imx8m/ +F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/ipmitool/ diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf new file mode 100644 index 0000000000..d38f7f81b7 --- /dev/null +++ b/board/kontron/bl-imx8mm/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg new file mode 100644 index 0000000000..c98bc4f150 --- /dev/null +++ b/board/kontron/bl-imx8mm/genimage.cfg @@ -0,0 +1,18 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 16K + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + image = "rootfs.ext4" + offset = 8M + partition-uuid = %PARTUUID% + } +} diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch new file mode 100644 index 0000000000..6d76282def --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch @@ -0,0 +1,31 @@ +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Mon, 10 Jan 2022 14:13:02 +0100 +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig + +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + configs/kontron-sl-mx8mm_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig +index 35d12fca32..940bf07a92 100644 +--- a/configs/kontron-sl-mx8mm_defconfig ++++ b/configs/kontron-sl-mx8mm_defconfig +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" + CONFIG_SPL_TEXT_BASE=0x7E1000 + CONFIG_TARGET_KONTRON_MX8MM=y ++CONFIG_SPL_MMC=y ++CONFIG_SPL_SERIAL=y + CONFIG_BOOTCOUNT_BOOTLIMIT=3 + CONFIG_SPL=y + CONFIG_DISTRO_DEFAULTS=y +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch new file mode 100644 index 0000000000..a88d7aba87 --- /dev/null +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch @@ -0,0 +1,305 @@ +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 12 Jan 2022 08:44:36 +0100 +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board + u-boot.dtsi + +When using a board variant that selects the lvds specific dtb the +*.u-boot.dtsi file will not be included. To have a lvds dtb specific +u-boot.dtsi file move this part to a common board u-boot.dtsi file and +include this in the board base u-boot.dtsi and create an additional one +for the lvds variant. + +Patch submitted upstream: +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ + +Signed-off-by: Heiko Thiery +--- + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ + 3 files changed, 135 insertions(+), 123 deletions(-) + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi + +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +new file mode 100644 +index 0000000000..4bf75722bf +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +index 22d18e6f1c..4bf75722bf 100644 +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +@@ -3,126 +3,4 @@ + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +-#include "imx8mm-u-boot.dtsi" +- +-/ { +- aliases { +- usb0 = &usbotg1; +- usb1 = &usbotg2; +- }; +- +- wdt-reboot { +- compatible = "wdt-reboot"; +- wdt = <&wdog1>; +- u-boot,dm-spl; +- }; +- +- firmware { +- optee { +- compatible = "linaro,optee-tz"; +- method = "smc"; +- }; +- }; +-}; +- +-&fec1 { +- phy-mode = "rgmii-rxid"; +-}; +- +-&i2c1 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&i2c2 { +- status = "okay"; +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_ecspi1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_i2c1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_pmic { +- u-boot,dm-spl; +- fsl,pins = < +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 +- /* Disable Pullup for SD_VSEL */ +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 +- >; +-}; +- +-&pinctrl_uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&pinctrl_usdhc1 { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_100mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc1_200mhz { +- u-boot,dm-spl; +-}; +- +-&pinctrl_usdhc2 { +- u-boot,dm-spl; +-}; +- +-&pca9450 { +- u-boot,dm-spl; +-}; +- +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { +- u-boot,dm-spl; +-}; +- +-&ecspi1 { +- u-boot,dm-spl; +-}; +- +-&gpio1 { +- u-boot,dm-spl; +-}; +- +-&gpio2 { +- u-boot,dm-spl; +-}; +- +-&gpio3 { +- u-boot,dm-spl; +-}; +- +-&gpio4 { +- u-boot,dm-spl; +-}; +- +-&gpio5 { +- u-boot,dm-spl; +-}; +- +-&uart3 { +- u-boot,dm-spl; +- u-boot,dm-pre-reloc; +-}; +- +-&usdhc1 { +- u-boot,dm-spl; +-}; +- +-&usdhc2 { +- u-boot,dm-spl; +-}; +- +-&wdog1 { +- u-boot,dm-spl; +-}; ++#include "imx8mm-kontron-n801x-u-boot.dtsi" +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +new file mode 100644 +index 0000000000..22d18e6f1c +--- /dev/null ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +@@ -0,0 +1,128 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2019 Kontron Electronics GmbH ++ */ ++ ++#include "imx8mm-u-boot.dtsi" ++ ++/ { ++ aliases { ++ usb0 = &usbotg1; ++ usb1 = &usbotg2; ++ }; ++ ++ wdt-reboot { ++ compatible = "wdt-reboot"; ++ wdt = <&wdog1>; ++ u-boot,dm-spl; ++ }; ++ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++}; ++ ++&fec1 { ++ phy-mode = "rgmii-rxid"; ++}; ++ ++&i2c1 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_i2c1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_pmic { ++ u-boot,dm-spl; ++ fsl,pins = < ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 ++ /* Disable Pullup for SD_VSEL */ ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 ++ >; ++}; ++ ++&pinctrl_uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&pinctrl_usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_100mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc1_200mhz { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl_usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&pca9450 { ++ u-boot,dm-spl; ++}; ++ ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { ++ u-boot,dm-spl; ++}; ++ ++&ecspi1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio1 { ++ u-boot,dm-spl; ++}; ++ ++&gpio2 { ++ u-boot,dm-spl; ++}; ++ ++&gpio3 { ++ u-boot,dm-spl; ++}; ++ ++&gpio4 { ++ u-boot,dm-spl; ++}; ++ ++&gpio5 { ++ u-boot,dm-spl; ++}; ++ ++&uart3 { ++ u-boot,dm-spl; ++ u-boot,dm-pre-reloc; ++}; ++ ++&usdhc1 { ++ u-boot,dm-spl; ++}; ++ ++&usdhc2 { ++ u-boot,dm-spl; ++}; ++ ++&wdog1 { ++ u-boot,dm-spl; ++}; +-- +2.30.2 + diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh new file mode 100755 index 0000000000..bf8861f6a9 --- /dev/null +++ b/board/kontron/bl-imx8mm/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt new file mode 100644 index 0000000000..df47ba5174 --- /dev/null +++ b/board/kontron/bl-imx8mm/readme.txt @@ -0,0 +1,85 @@ +Kontron BL i.MX8M Mini +====================== + +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 + + +How to build it +=============== + +Configure buildroot: + + $ make kontron_bl_imx8mm_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ??? bl31.bin + ??? boot.scr + ??? ddr_fw.bin + ??? flash.bin + ??? Image + ??? imx8mm-kontron-n801x-s.dtb + ??? lpddr4_pmu_train_1d_dmem_201904.bin + ??? lpddr4_pmu_train_1d_dmem_202006.bin + ??? lpddr4_pmu_train_1d_dmem.bin + ??? lpddr4_pmu_train_1d_dmem_pad.bin + ??? lpddr4_pmu_train_1d_fw.bin + ??? lpddr4_pmu_train_1d_imem_201904.bin + ??? lpddr4_pmu_train_1d_imem_202006.bin + ??? lpddr4_pmu_train_1d_imem.bin + ??? lpddr4_pmu_train_1d_imem_pad.bin + ??? lpddr4_pmu_train_2d_dmem_201904.bin + ??? lpddr4_pmu_train_2d_dmem_202006.bin + ??? lpddr4_pmu_train_2d_dmem.bin + ??? lpddr4_pmu_train_2d_dmem_pad.bin + ??? lpddr4_pmu_train_2d_fw.bin + ??? lpddr4_pmu_train_2d_imem_201904.bin + ??? lpddr4_pmu_train_2d_imem_202006.bin + ??? lpddr4_pmu_train_2d_imem.bin + ??? lpddr4_pmu_train_2d_imem_pad.bin + ??? lpddr4_pmu_train_fw.bin + ??? rootfs.ext2 + ??? rootfs.ext4 -> rootfs.ext2 + ??? rootfs.tar + ??? sdcard.img + ??? u-boot.bin + ??? u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Preparing the board +=================== + + * Connect a serial line to the board + * Insert the SD card + * Power-up the board + + +Booting the board +================= + +By default the bootloader will search for the first valid image, starting +with the internal eMMC. To make sure the bootloader loads bootscript from +the correct location (SD card) set the boot_targets environment variable: + + $ setenv boot_targets mmc1 diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig new file mode 100644 index 0000000000..0cf0115bfa --- /dev/null +++ b/configs/kontron_bl_imx8mm_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y + +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y + +# Required host tools to create the SD/eMMC image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_PACKAGE_HOST_GENIMAGE=y -- 2.30.2 From michael at amarulasolutions.com Mon Jan 31 15:36:04 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 31 Jan 2022 16:36:04 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220131153022.351662-1-heiko.thiery@gmail.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> Message-ID: Hi Heiko On Mon, Jan 31, 2022 at 4:30 PM Heiko Thiery wrote: > > The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > Cc: Frieder Schrempf > Signed-off-by: Heiko Thiery > --- > v5: > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS > > v4: > - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > The FPU options are set implicit. > > v3: > - change offset value to use capitol 'K' value (thanks Guilio) > - add info to uboot patches about submitting to upstream > > v2: > - switch to extlinux > - directly call genimage.sh > - remove post-image.sh > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > DEVELOPERS | 2 + > board/kontron/bl-imx8mm/extlinux.conf | 4 + > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > board/kontron/bl-imx8mm/post-build.sh | 7 + > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > configs/kontron_bl_imx8mm_defconfig | 58 ++++ > 8 files changed, 510 insertions(+) > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > create mode 100644 board/kontron/bl-imx8mm/readme.txt > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index a1ec9a091e..38724726d4 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1183,7 +1183,9 @@ F: package/python-sip/ > F: package/uhd/ > > N: Heiko Thiery > +F: board/kontron/bl-imx8mm/ > F: board/kontron/pitx-imx8m/ > +F: configs/kontron_bl_imx8mm_defconfig > F: configs/kontron_pitx_imx8m_defconfig > F: package/altera-stapl/ > F: package/ipmitool/ > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > new file mode 100644 > index 0000000000..d38f7f81b7 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > new file mode 100644 > index 0000000000..c98bc4f150 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/genimage.cfg > @@ -0,0 +1,18 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 16K > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33K > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + offset = 8M > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..6d76282def > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,31 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > + > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > +index 35d12fca32..940bf07a92 100644 > +--- a/configs/kontron-sl-mx8mm_defconfig > ++++ b/configs/kontron-sl-mx8mm_defconfig > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > + CONFIG_SPL_TEXT_BASE=0x7E1000 > + CONFIG_TARGET_KONTRON_MX8MM=y > ++CONFIG_SPL_MMC=y > ++CONFIG_SPL_SERIAL=y > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > + CONFIG_SPL=y > + CONFIG_DISTRO_DEFAULTS=y > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > new file mode 100644 > index 0000000000..a88d7aba87 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > @@ -0,0 +1,305 @@ > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > + u-boot.dtsi > + > +When using a board variant that selects the lvds specific dtb the > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > +include this in the board base u-boot.dtsi and create an additional one > +for the lvds variant. > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > + 3 files changed, 135 insertions(+), 123 deletions(-) > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > + > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +new file mode 100644 > +index 0000000000..4bf75722bf > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +@@ -0,0 +1,6 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +index 22d18e6f1c..4bf75722bf 100644 > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +@@ -3,126 +3,4 @@ > + * Copyright (C) 2019 Kontron Electronics GmbH > + */ > + > +-#include "imx8mm-u-boot.dtsi" > +- > +-/ { > +- aliases { > +- usb0 = &usbotg1; > +- usb1 = &usbotg2; > +- }; > +- > +- wdt-reboot { > +- compatible = "wdt-reboot"; > +- wdt = <&wdog1>; > +- u-boot,dm-spl; > +- }; > +- > +- firmware { > +- optee { > +- compatible = "linaro,optee-tz"; > +- method = "smc"; > +- }; > +- }; > +-}; > +- > +-&fec1 { > +- phy-mode = "rgmii-rxid"; > +-}; > +- > +-&i2c1 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&i2c2 { > +- status = "okay"; > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_i2c1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_pmic { > +- u-boot,dm-spl; > +- fsl,pins = < > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > +- /* Disable Pullup for SD_VSEL */ > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > +- >; > +-}; > +- > +-&pinctrl_uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_100mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_200mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&pca9450 { > +- u-boot,dm-spl; > +-}; > +- > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > +- u-boot,dm-spl; > +-}; > +- > +-&ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio2 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio3 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio4 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio5 { > +- u-boot,dm-spl; > +-}; > +- > +-&uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&wdog1 { > +- u-boot,dm-spl; > +-}; > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +new file mode 100644 > +index 0000000000..22d18e6f1c > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +@@ -0,0 +1,128 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-u-boot.dtsi" > ++ > ++/ { > ++ aliases { > ++ usb0 = &usbotg1; > ++ usb1 = &usbotg2; > ++ }; > ++ > ++ wdt-reboot { > ++ compatible = "wdt-reboot"; > ++ wdt = <&wdog1>; > ++ u-boot,dm-spl; > ++ }; > ++ > ++ firmware { > ++ optee { > ++ compatible = "linaro,optee-tz"; > ++ method = "smc"; > ++ }; > ++ }; > ++}; > ++ > ++&fec1 { > ++ phy-mode = "rgmii-rxid"; > ++}; > ++ > ++&i2c1 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&i2c2 { > ++ status = "okay"; > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_i2c1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_pmic { > ++ u-boot,dm-spl; > ++ fsl,pins = < > ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > ++ /* Disable Pullup for SD_VSEL */ > ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > ++ >; > ++}; > ++ > ++&pinctrl_uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_100mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_200mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pca9450 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > ++ u-boot,dm-spl; > ++}; > ++ > ++&ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio3 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio4 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio5 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&wdog1 { > ++ u-boot,dm-spl; > ++}; > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > new file mode 100644 > index 0000000000..df47ba5174 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/readme.txt > @@ -0,0 +1,85 @@ > +Kontron BL i.MX8M Mini > +====================== > + > +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > + > + > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make kontron_bl_imx8mm_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and build the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? flash.bin > + ??? Image > + ??? imx8mm-kontron-n801x-s.dtb > + ??? lpddr4_pmu_train_1d_dmem_201904.bin > + ??? lpddr4_pmu_train_1d_dmem_202006.bin > + ??? lpddr4_pmu_train_1d_dmem.bin > + ??? lpddr4_pmu_train_1d_dmem_pad.bin > + ??? lpddr4_pmu_train_1d_fw.bin > + ??? lpddr4_pmu_train_1d_imem_201904.bin > + ??? lpddr4_pmu_train_1d_imem_202006.bin > + ??? lpddr4_pmu_train_1d_imem.bin > + ??? lpddr4_pmu_train_1d_imem_pad.bin > + ??? lpddr4_pmu_train_2d_dmem_201904.bin > + ??? lpddr4_pmu_train_2d_dmem_202006.bin > + ??? lpddr4_pmu_train_2d_dmem.bin > + ??? lpddr4_pmu_train_2d_dmem_pad.bin > + ??? lpddr4_pmu_train_2d_fw.bin > + ??? lpddr4_pmu_train_2d_imem_201904.bin > + ??? lpddr4_pmu_train_2d_imem_202006.bin > + ??? lpddr4_pmu_train_2d_imem.bin > + ??? lpddr4_pmu_train_2d_imem_pad.bin > + ??? lpddr4_pmu_train_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot-spl.bin > + > + > +Flashing the SD card image > +========================== > + > +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > + > + $ sudo dd if=output/images/sdcard.img of= > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Insert the SD card > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. To make sure the bootloader loads bootscript from > +the correct location (SD card) set the boot_targets environment variable: > + > + $ setenv boot_targets mmc1 > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > new file mode 100644 > index 0000000000..0cf0115bfa > --- /dev/null > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -0,0 +1,58 @@ > +# Architecture > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y > + > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > +BR2_PACKAGE_HOST_GENIMAGE=y I have seen that some people like to have this organization but it's not really nice to maintain. I would like to savedefconfig and use that one instead of having nice commented part. Is this mandatory? Michael > -- > 2.30.2 > -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From giulio.benetti at benettiengineering.com Mon Jan 31 15:37:33 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 16:37:33 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <20220131153022.351662-1-heiko.thiery@gmail.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> Message-ID: Hi Heiko, > Il giorno 31 gen 2022, alle ore 16:31, Heiko Thiery ha scritto: > > ?The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > Cc: Frieder Schrempf > Signed-off-by: Heiko Thiery Reviewed-by: Giulio Benetti Best regards Giulio > --- > v5: > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS > > v4: > - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > The FPU options are set implicit. > > v3: > - change offset value to use capitol 'K' value (thanks Guilio) > - add info to uboot patches about submitting to upstream > > v2: > - switch to extlinux > - directly call genimage.sh > - remove post-image.sh > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > DEVELOPERS | 2 + > board/kontron/bl-imx8mm/extlinux.conf | 4 + > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > board/kontron/bl-imx8mm/post-build.sh | 7 + > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > configs/kontron_bl_imx8mm_defconfig | 58 ++++ > 8 files changed, 510 insertions(+) > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > create mode 100644 board/kontron/bl-imx8mm/readme.txt > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index a1ec9a091e..38724726d4 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1183,7 +1183,9 @@ F: package/python-sip/ > F: package/uhd/ > > N: Heiko Thiery > +F: board/kontron/bl-imx8mm/ > F: board/kontron/pitx-imx8m/ > +F: configs/kontron_bl_imx8mm_defconfig > F: configs/kontron_pitx_imx8m_defconfig > F: package/altera-stapl/ > F: package/ipmitool/ > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > new file mode 100644 > index 0000000000..d38f7f81b7 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/extlinux.conf > @@ -0,0 +1,4 @@ > +label buildroot > + kernel /boot/Image > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > + append root=PARTUUID=%PARTUUID% rootwait rw > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > new file mode 100644 > index 0000000000..c98bc4f150 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/genimage.cfg > @@ -0,0 +1,18 @@ > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 16K > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "flash.bin" > + offset = 33K > + } > + > + partition rootfs { > + image = "rootfs.ext4" > + offset = 8M > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > new file mode 100644 > index 0000000000..6d76282def > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > @@ -0,0 +1,31 @@ > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > + > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > +index 35d12fca32..940bf07a92 100644 > +--- a/configs/kontron-sl-mx8mm_defconfig > ++++ b/configs/kontron-sl-mx8mm_defconfig > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > + CONFIG_SPL_TEXT_BASE=0x7E1000 > + CONFIG_TARGET_KONTRON_MX8MM=y > ++CONFIG_SPL_MMC=y > ++CONFIG_SPL_SERIAL=y > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > + CONFIG_SPL=y > + CONFIG_DISTRO_DEFAULTS=y > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > new file mode 100644 > index 0000000000..a88d7aba87 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > @@ -0,0 +1,305 @@ > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > +From: Heiko Thiery > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > + u-boot.dtsi > + > +When using a board variant that selects the lvds specific dtb the > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > +include this in the board base u-boot.dtsi and create an additional one > +for the lvds variant. > + > +Patch submitted upstream: > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > + > +Signed-off-by: Heiko Thiery > +--- > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > + 3 files changed, 135 insertions(+), 123 deletions(-) > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > + > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +new file mode 100644 > +index 0000000000..4bf75722bf > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > +@@ -0,0 +1,6 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +index 22d18e6f1c..4bf75722bf 100644 > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > +@@ -3,126 +3,4 @@ > + * Copyright (C) 2019 Kontron Electronics GmbH > + */ > + > +-#include "imx8mm-u-boot.dtsi" > +- > +-/ { > +- aliases { > +- usb0 = &usbotg1; > +- usb1 = &usbotg2; > +- }; > +- > +- wdt-reboot { > +- compatible = "wdt-reboot"; > +- wdt = <&wdog1>; > +- u-boot,dm-spl; > +- }; > +- > +- firmware { > +- optee { > +- compatible = "linaro,optee-tz"; > +- method = "smc"; > +- }; > +- }; > +-}; > +- > +-&fec1 { > +- phy-mode = "rgmii-rxid"; > +-}; > +- > +-&i2c1 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&i2c2 { > +- status = "okay"; > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_i2c1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_pmic { > +- u-boot,dm-spl; > +- fsl,pins = < > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > +- /* Disable Pullup for SD_VSEL */ > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > +- >; > +-}; > +- > +-&pinctrl_uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&pinctrl_usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_100mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc1_200mhz { > +- u-boot,dm-spl; > +-}; > +- > +-&pinctrl_usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&pca9450 { > +- u-boot,dm-spl; > +-}; > +- > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > +- u-boot,dm-spl; > +-}; > +- > +-&ecspi1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio1 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio2 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio3 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio4 { > +- u-boot,dm-spl; > +-}; > +- > +-&gpio5 { > +- u-boot,dm-spl; > +-}; > +- > +-&uart3 { > +- u-boot,dm-spl; > +- u-boot,dm-pre-reloc; > +-}; > +- > +-&usdhc1 { > +- u-boot,dm-spl; > +-}; > +- > +-&usdhc2 { > +- u-boot,dm-spl; > +-}; > +- > +-&wdog1 { > +- u-boot,dm-spl; > +-}; > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +new file mode 100644 > +index 0000000000..22d18e6f1c > +--- /dev/null > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > +@@ -0,0 +1,128 @@ > ++// SPDX-License-Identifier: GPL-2.0+ > ++/* > ++ * Copyright (C) 2019 Kontron Electronics GmbH > ++ */ > ++ > ++#include "imx8mm-u-boot.dtsi" > ++ > ++/ { > ++ aliases { > ++ usb0 = &usbotg1; > ++ usb1 = &usbotg2; > ++ }; > ++ > ++ wdt-reboot { > ++ compatible = "wdt-reboot"; > ++ wdt = <&wdog1>; > ++ u-boot,dm-spl; > ++ }; > ++ > ++ firmware { > ++ optee { > ++ compatible = "linaro,optee-tz"; > ++ method = "smc"; > ++ }; > ++ }; > ++}; > ++ > ++&fec1 { > ++ phy-mode = "rgmii-rxid"; > ++}; > ++ > ++&i2c1 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&i2c2 { > ++ status = "okay"; > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_i2c1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_pmic { > ++ u-boot,dm-spl; > ++ fsl,pins = < > ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > ++ /* Disable Pullup for SD_VSEL */ > ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > ++ >; > ++}; > ++ > ++&pinctrl_uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&pinctrl_usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_100mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc1_200mhz { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pinctrl_usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&pca9450 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > ++ u-boot,dm-spl; > ++}; > ++ > ++&ecspi1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio3 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio4 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&gpio5 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&uart3 { > ++ u-boot,dm-spl; > ++ u-boot,dm-pre-reloc; > ++}; > ++ > ++&usdhc1 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&usdhc2 { > ++ u-boot,dm-spl; > ++}; > ++ > ++&wdog1 { > ++ u-boot,dm-spl; > ++}; > +-- > +2.30.2 > + > diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > new file mode 100755 > index 0000000000..bf8861f6a9 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/post-build.sh > @@ -0,0 +1,7 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > new file mode 100644 > index 0000000000..df47ba5174 > --- /dev/null > +++ b/board/kontron/bl-imx8mm/readme.txt > @@ -0,0 +1,85 @@ > +Kontron BL i.MX8M Mini > +====================== > + > +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > + > + > +How to build it > +=============== > + > +Configure buildroot: > + > + $ make kontron_bl_imx8mm_defconfig > + > +Change settings to fit your needs (optional): > + > + $ make menuconfig > + > +Compile everything and build the rootfs image: > + > + $ make > + > + > +Result of the build > +=================== > + > +After building, the output/images directory contains: > + > + output/images/ > + ??? bl31.bin > + ??? boot.scr > + ??? ddr_fw.bin > + ??? flash.bin > + ??? Image > + ??? imx8mm-kontron-n801x-s.dtb > + ??? lpddr4_pmu_train_1d_dmem_201904.bin > + ??? lpddr4_pmu_train_1d_dmem_202006.bin > + ??? lpddr4_pmu_train_1d_dmem.bin > + ??? lpddr4_pmu_train_1d_dmem_pad.bin > + ??? lpddr4_pmu_train_1d_fw.bin > + ??? lpddr4_pmu_train_1d_imem_201904.bin > + ??? lpddr4_pmu_train_1d_imem_202006.bin > + ??? lpddr4_pmu_train_1d_imem.bin > + ??? lpddr4_pmu_train_1d_imem_pad.bin > + ??? lpddr4_pmu_train_2d_dmem_201904.bin > + ??? lpddr4_pmu_train_2d_dmem_202006.bin > + ??? lpddr4_pmu_train_2d_dmem.bin > + ??? lpddr4_pmu_train_2d_dmem_pad.bin > + ??? lpddr4_pmu_train_2d_fw.bin > + ??? lpddr4_pmu_train_2d_imem_201904.bin > + ??? lpddr4_pmu_train_2d_imem_202006.bin > + ??? lpddr4_pmu_train_2d_imem.bin > + ??? lpddr4_pmu_train_2d_imem_pad.bin > + ??? lpddr4_pmu_train_fw.bin > + ??? rootfs.ext2 > + ??? rootfs.ext4 -> rootfs.ext2 > + ??? rootfs.tar > + ??? sdcard.img > + ??? u-boot.bin > + ??? u-boot-spl.bin > + > + > +Flashing the SD card image > +========================== > + > +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > + > + $ sudo dd if=output/images/sdcard.img of= > + > + > +Preparing the board > +=================== > + > + * Connect a serial line to the board > + * Insert the SD card > + * Power-up the board > + > + > +Booting the board > +================= > + > +By default the bootloader will search for the first valid image, starting > +with the internal eMMC. To make sure the bootloader loads bootscript from > +the correct location (SD card) set the boot_targets environment variable: > + > + $ setenv boot_targets mmc1 > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > new file mode 100644 > index 0000000000..0cf0115bfa > --- /dev/null > +++ b/configs/kontron_bl_imx8mm_defconfig > @@ -0,0 +1,58 @@ > +# Architecture > +BR2_aarch64=y > +BR2_ARM_FPU_VFPV3=y > + > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > + > +# System > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > +BR2_PACKAGE_FIRMWARE_IMX=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > +BR2_TARGET_UBOOT_SPL=y > + > +# Required host tools to create the SD/eMMC image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > +BR2_PACKAGE_HOST_GENIMAGE=y > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From heiko.thiery at gmail.com Mon Jan 31 15:42:39 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Mon, 31 Jan 2022 16:42:39 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220131153022.351662-1-heiko.thiery@gmail.com> Message-ID: Hi Michael, Am Mo., 31. Jan. 2022 um 16:36 Uhr schrieb Michael Nazzareno Trimarchi : > > Hi Heiko > > On Mon, Jan 31, 2022 at 4:30 PM Heiko Thiery wrote: > > > > The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > > > > https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > > > Cc: Frieder Schrempf > > Signed-off-by: Heiko Thiery > > --- > > v5: > > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS > > > > v4: > > - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > > The FPU options are set implicit. > > > > v3: > > - change offset value to use capitol 'K' value (thanks Guilio) > > - add info to uboot patches about submitting to upstream > > > > v2: > > - switch to extlinux > > - directly call genimage.sh > > - remove post-image.sh > > - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > > - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > > > > DEVELOPERS | 2 + > > board/kontron/bl-imx8mm/extlinux.conf | 4 + > > board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > > ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > > ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > > board/kontron/bl-imx8mm/post-build.sh | 7 + > > board/kontron/bl-imx8mm/readme.txt | 85 +++++ > > configs/kontron_bl_imx8mm_defconfig | 58 ++++ > > 8 files changed, 510 insertions(+) > > create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > > create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > > create mode 100755 board/kontron/bl-imx8mm/post-build.sh > > create mode 100644 board/kontron/bl-imx8mm/readme.txt > > create mode 100644 configs/kontron_bl_imx8mm_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index a1ec9a091e..38724726d4 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1183,7 +1183,9 @@ F: package/python-sip/ > > F: package/uhd/ > > > > N: Heiko Thiery > > +F: board/kontron/bl-imx8mm/ > > F: board/kontron/pitx-imx8m/ > > +F: configs/kontron_bl_imx8mm_defconfig > > F: configs/kontron_pitx_imx8m_defconfig > > F: package/altera-stapl/ > > F: package/ipmitool/ > > diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > > new file mode 100644 > > index 0000000000..d38f7f81b7 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/extlinux.conf > > @@ -0,0 +1,4 @@ > > +label buildroot > > + kernel /boot/Image > > + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > > + append root=PARTUUID=%PARTUUID% rootwait rw > > diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > > new file mode 100644 > > index 0000000000..c98bc4f150 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/genimage.cfg > > @@ -0,0 +1,18 @@ > > +image sdcard.img { > > + hdimage { > > + partition-table-type = "gpt" > > + gpt-location = 16K > > + } > > + > > + partition imx-boot { > > + in-partition-table = "no" > > + image = "flash.bin" > > + offset = 33K > > + } > > + > > + partition rootfs { > > + image = "rootfs.ext4" > > + offset = 8M > > + partition-uuid = %PARTUUID% > > + } > > +} > > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > new file mode 100644 > > index 0000000000..6d76282def > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > > @@ -0,0 +1,31 @@ > > +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > > +From: Heiko Thiery > > +Date: Mon, 10 Jan 2022 14:13:02 +0100 > > +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > > + > > +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > > + > > +Patch submitted upstream: > > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > > + > > +Signed-off-by: Heiko Thiery > > +--- > > + configs/kontron-sl-mx8mm_defconfig | 2 ++ > > + 1 file changed, 2 insertions(+) > > + > > +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > > +index 35d12fca32..940bf07a92 100644 > > +--- a/configs/kontron-sl-mx8mm_defconfig > > ++++ b/configs/kontron-sl-mx8mm_defconfig > > +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > > + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > > + CONFIG_SPL_TEXT_BASE=0x7E1000 > > + CONFIG_TARGET_KONTRON_MX8MM=y > > ++CONFIG_SPL_MMC=y > > ++CONFIG_SPL_SERIAL=y > > + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > > + CONFIG_SPL=y > > + CONFIG_DISTRO_DEFAULTS=y > > +-- > > +2.30.2 > > + > > diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > > new file mode 100644 > > index 0000000000..a88d7aba87 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > > @@ -0,0 +1,305 @@ > > +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > > +From: Heiko Thiery > > +Date: Wed, 12 Jan 2022 08:44:36 +0100 > > +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > > + u-boot.dtsi > > + > > +When using a board variant that selects the lvds specific dtb the > > +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > > +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > > +include this in the board base u-boot.dtsi and create an additional one > > +for the lvds variant. > > + > > +Patch submitted upstream: > > +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > > + > > +Signed-off-by: Heiko Thiery > > +--- > > + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > > + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > > + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > > + 3 files changed, 135 insertions(+), 123 deletions(-) > > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > > + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > > + > > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > > +new file mode 100644 > > +index 0000000000..4bf75722bf > > +--- /dev/null > > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > > +@@ -0,0 +1,6 @@ > > ++// SPDX-License-Identifier: GPL-2.0+ > > ++/* > > ++ * Copyright (C) 2019 Kontron Electronics GmbH > > ++ */ > > ++ > > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > > +index 22d18e6f1c..4bf75722bf 100644 > > +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > > +@@ -3,126 +3,4 @@ > > + * Copyright (C) 2019 Kontron Electronics GmbH > > + */ > > + > > +-#include "imx8mm-u-boot.dtsi" > > +- > > +-/ { > > +- aliases { > > +- usb0 = &usbotg1; > > +- usb1 = &usbotg2; > > +- }; > > +- > > +- wdt-reboot { > > +- compatible = "wdt-reboot"; > > +- wdt = <&wdog1>; > > +- u-boot,dm-spl; > > +- }; > > +- > > +- firmware { > > +- optee { > > +- compatible = "linaro,optee-tz"; > > +- method = "smc"; > > +- }; > > +- }; > > +-}; > > +- > > +-&fec1 { > > +- phy-mode = "rgmii-rxid"; > > +-}; > > +- > > +-&i2c1 { > > +- u-boot,dm-spl; > > +- u-boot,dm-pre-reloc; > > +-}; > > +- > > +-&i2c2 { > > +- status = "okay"; > > +- u-boot,dm-spl; > > +- u-boot,dm-pre-reloc; > > +-}; > > +- > > +-&pinctrl_ecspi1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_i2c1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_pmic { > > +- u-boot,dm-spl; > > +- fsl,pins = < > > +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > > +- /* Disable Pullup for SD_VSEL */ > > +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > > +- >; > > +-}; > > +- > > +-&pinctrl_uart3 { > > +- u-boot,dm-spl; > > +- u-boot,dm-pre-reloc; > > +-}; > > +- > > +-&pinctrl_usdhc1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_usdhc1_100mhz { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_usdhc1_200mhz { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pinctrl_usdhc2 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&pca9450 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&ecspi1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio2 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio3 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio4 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&gpio5 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&uart3 { > > +- u-boot,dm-spl; > > +- u-boot,dm-pre-reloc; > > +-}; > > +- > > +-&usdhc1 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&usdhc2 { > > +- u-boot,dm-spl; > > +-}; > > +- > > +-&wdog1 { > > +- u-boot,dm-spl; > > +-}; > > ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > > +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > > +new file mode 100644 > > +index 0000000000..22d18e6f1c > > +--- /dev/null > > ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > > +@@ -0,0 +1,128 @@ > > ++// SPDX-License-Identifier: GPL-2.0+ > > ++/* > > ++ * Copyright (C) 2019 Kontron Electronics GmbH > > ++ */ > > ++ > > ++#include "imx8mm-u-boot.dtsi" > > ++ > > ++/ { > > ++ aliases { > > ++ usb0 = &usbotg1; > > ++ usb1 = &usbotg2; > > ++ }; > > ++ > > ++ wdt-reboot { > > ++ compatible = "wdt-reboot"; > > ++ wdt = <&wdog1>; > > ++ u-boot,dm-spl; > > ++ }; > > ++ > > ++ firmware { > > ++ optee { > > ++ compatible = "linaro,optee-tz"; > > ++ method = "smc"; > > ++ }; > > ++ }; > > ++}; > > ++ > > ++&fec1 { > > ++ phy-mode = "rgmii-rxid"; > > ++}; > > ++ > > ++&i2c1 { > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&i2c2 { > > ++ status = "okay"; > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&pinctrl_ecspi1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_i2c1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_pmic { > > ++ u-boot,dm-spl; > > ++ fsl,pins = < > > ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > > ++ /* Disable Pullup for SD_VSEL */ > > ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > > ++ >; > > ++}; > > ++ > > ++&pinctrl_uart3 { > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&pinctrl_usdhc1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_usdhc1_100mhz { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_usdhc1_200mhz { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pinctrl_usdhc2 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&pca9450 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&ecspi1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio2 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio3 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio4 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&gpio5 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&uart3 { > > ++ u-boot,dm-spl; > > ++ u-boot,dm-pre-reloc; > > ++}; > > ++ > > ++&usdhc1 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&usdhc2 { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++&wdog1 { > > ++ u-boot,dm-spl; > > ++}; > > +-- > > +2.30.2 > > + > > diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > > new file mode 100755 > > index 0000000000..bf8861f6a9 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/post-build.sh > > @@ -0,0 +1,7 @@ > > +#!/bin/sh > > +BOARD_DIR="$(dirname $0)" > > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > > + > > +install -d "$TARGET_DIR/boot/extlinux/" > > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > > +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > > diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > > new file mode 100644 > > index 0000000000..df47ba5174 > > --- /dev/null > > +++ b/board/kontron/bl-imx8mm/readme.txt > > @@ -0,0 +1,85 @@ > > +Kontron BL i.MX8M Mini > > +====================== > > + > > +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > > + > > + > > +How to build it > > +=============== > > + > > +Configure buildroot: > > + > > + $ make kontron_bl_imx8mm_defconfig > > + > > +Change settings to fit your needs (optional): > > + > > + $ make menuconfig > > + > > +Compile everything and build the rootfs image: > > + > > + $ make > > + > > + > > +Result of the build > > +=================== > > + > > +After building, the output/images directory contains: > > + > > + output/images/ > > + ??? bl31.bin > > + ??? boot.scr > > + ??? ddr_fw.bin > > + ??? flash.bin > > + ??? Image > > + ??? imx8mm-kontron-n801x-s.dtb > > + ??? lpddr4_pmu_train_1d_dmem_201904.bin > > + ??? lpddr4_pmu_train_1d_dmem_202006.bin > > + ??? lpddr4_pmu_train_1d_dmem.bin > > + ??? lpddr4_pmu_train_1d_dmem_pad.bin > > + ??? lpddr4_pmu_train_1d_fw.bin > > + ??? lpddr4_pmu_train_1d_imem_201904.bin > > + ??? lpddr4_pmu_train_1d_imem_202006.bin > > + ??? lpddr4_pmu_train_1d_imem.bin > > + ??? lpddr4_pmu_train_1d_imem_pad.bin > > + ??? lpddr4_pmu_train_2d_dmem_201904.bin > > + ??? lpddr4_pmu_train_2d_dmem_202006.bin > > + ??? lpddr4_pmu_train_2d_dmem.bin > > + ??? lpddr4_pmu_train_2d_dmem_pad.bin > > + ??? lpddr4_pmu_train_2d_fw.bin > > + ??? lpddr4_pmu_train_2d_imem_201904.bin > > + ??? lpddr4_pmu_train_2d_imem_202006.bin > > + ??? lpddr4_pmu_train_2d_imem.bin > > + ??? lpddr4_pmu_train_2d_imem_pad.bin > > + ??? lpddr4_pmu_train_fw.bin > > + ??? rootfs.ext2 > > + ??? rootfs.ext4 -> rootfs.ext2 > > + ??? rootfs.tar > > + ??? sdcard.img > > + ??? u-boot.bin > > + ??? u-boot-spl.bin > > + > > + > > +Flashing the SD card image > > +========================== > > + > > +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > > + > > + $ sudo dd if=output/images/sdcard.img of= > > + > > + > > +Preparing the board > > +=================== > > + > > + * Connect a serial line to the board > > + * Insert the SD card > > + * Power-up the board > > + > > + > > +Booting the board > > +================= > > + > > +By default the bootloader will search for the first valid image, starting > > +with the internal eMMC. To make sure the bootloader loads bootscript from > > +the correct location (SD card) set the boot_targets environment variable: > > + > > + $ setenv boot_targets mmc1 > > diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > > new file mode 100644 > > index 0000000000..0cf0115bfa > > --- /dev/null > > +++ b/configs/kontron_bl_imx8mm_defconfig > > @@ -0,0 +1,58 @@ > > +# Architecture > > +BR2_aarch64=y > > +BR2_ARM_FPU_VFPV3=y > > + > > +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > > + > > +# System > > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > > + > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > > +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > + > > +BR2_PACKAGE_FREESCALE_IMX=y > > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > > +BR2_PACKAGE_FIRMWARE_IMX=y > > + > > +# Filesystem / image > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > + > > +# Bootloader > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > > +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > > +BR2_TARGET_UBOOT_SPL=y > > + > > +# Required host tools to create the SD/eMMC image > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > > +BR2_PACKAGE_HOST_GENIMAGE=y > > I have seen that some people like to have this organization but it's > not really nice to maintain. I would like > to savedefconfig and use that one instead of having nice commented > part. Is this mandatory? As far as I know there is no rule how to do that. For me it seems to be more readable and clean. But this is only my opinion. -- Heiko From bugzilla at busybox.net Mon Jan 31 15:52:48 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 31 Jan 2022 15:52:48 +0000 Subject: [Buildroot] [Bug 14366] 2021.11-rc2: Build of nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 --- Comment #2 from Jens Maus --- I can confirm that this issue still exists in 2021.11.1. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Jan 31 15:56:44 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 31 Jan 2022 15:56:44 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 Jens Maus changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|2021.11-rc2: Build of |Nodejs fails with "version |nodejs fails with "version |`GLIBC_2.34' not found" on |`GLIBC_2.34' not found" on |Ubuntu 20.04 |Ubuntu 20.04 | -- You are receiving this mail because: You are on the CC list for the bug. From thomas.devoogdt at gmail.com Mon Jan 31 16:16:10 2022 From: thomas.devoogdt at gmail.com (Thomas Devoogdt) Date: Mon, 31 Jan 2022 17:16:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.70.0 In-Reply-To: <20220130155235.2f51e08a@windsurf> References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> <20220130155235.2f51e08a@windsurf> Message-ID: Hi Thomas, All, > It's a bit difficult to follow http://autobuild.buildroot.net/, but I saw one thing when doing a quick scan: bluez5_utils: http://autobuild.buildroot.net/results/5c7/5c75ad724df3ff726559acee0da31f777ef6bc68/build-end.log --> g_memdup, deprecated since 2.68: https://docs.gtk.org/glib/func.memdup.html Kr, Thomas -------------- next part -------------- An HTML attachment was scrubbed... URL: From ariel.dalessandro at collabora.com Mon Jan 31 16:19:58 2022 From: ariel.dalessandro at collabora.com (Ariel D'Alessandro) Date: Mon, 31 Jan 2022 13:19:58 -0300 Subject: [Buildroot] [PATCH V3] board: Add support for iMX8MN BSH SMM S2 PRO In-Reply-To: <20220131145555.2819020-1-michael@amarulasolutions.com> References: <20220131145555.2819020-1-michael@amarulasolutions.com> Message-ID: Hi Michael, all, On 1/31/22 11:55, Michael Trimarchi wrote: > Add initial support for iMX8MN BSH SMM S2 PRO board: > > - Linux: v5.17-rc1 > - Uboot 2022-01-rc1 (reference tree) > - Default packages from buildroot > > https://www.apertis.org/reference_hardware/imx8mn_bsh_smm_s2pro_setup/ > > Add Ariel D'Alessandro as co-maintainer, we work together on > platform mainline > > Build and tested using: > docker pull registry.gitlab.com/buildroot.org/buildroot/base:20220105.2314 > > Cc: Ariel D'Alessandro > Cc: Jagan Teki > Cc: Heiko Thiery > Cc: Giulio Benetti > Reviewed-by: Giulio Benetti > Signed-off-by: Michael Trimarchi Tested-by: Ariel D'Alessandro From giulio.benetti at benettiengineering.com Mon Jan 31 16:38:49 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 17:38:49 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220131153022.351662-1-heiko.thiery@gmail.com> Message-ID: <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> Hi Michael, On 31/01/22 16:42, Heiko Thiery wrote: > Hi Michael, > > > Am Mo., 31. Jan. 2022 um 16:36 Uhr schrieb Michael Nazzareno Trimarchi > : >> >> Hi Heiko >> >> On Mon, Jan 31, 2022 at 4:30 PM Heiko Thiery wrote: >>> >>> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. >>> >>> https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 >>> >>> Cc: Frieder Schrempf >>> Signed-off-by: Heiko Thiery >>> --- >>> v5: >>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS >>> >>> v4: >>> - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. >>> The FPU options are set implicit. >>> >>> v3: >>> - change offset value to use capitol 'K' value (thanks Guilio) >>> - add info to uboot patches about submitting to upstream >>> >>> v2: >>> - switch to extlinux >>> - directly call genimage.sh >>> - remove post-image.sh >>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT >>> - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME >>> >>> DEVELOPERS | 2 + >>> board/kontron/bl-imx8mm/extlinux.conf | 4 + >>> board/kontron/bl-imx8mm/genimage.cfg | 18 ++ >>> ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ >>> ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ >>> board/kontron/bl-imx8mm/post-build.sh | 7 + >>> board/kontron/bl-imx8mm/readme.txt | 85 +++++ >>> configs/kontron_bl_imx8mm_defconfig | 58 ++++ >>> 8 files changed, 510 insertions(+) >>> create mode 100644 board/kontron/bl-imx8mm/extlinux.conf >>> create mode 100644 board/kontron/bl-imx8mm/genimage.cfg >>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch >>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch >>> create mode 100755 board/kontron/bl-imx8mm/post-build.sh >>> create mode 100644 board/kontron/bl-imx8mm/readme.txt >>> create mode 100644 configs/kontron_bl_imx8mm_defconfig >>> >>> diff --git a/DEVELOPERS b/DEVELOPERS >>> index a1ec9a091e..38724726d4 100644 >>> --- a/DEVELOPERS >>> +++ b/DEVELOPERS >>> @@ -1183,7 +1183,9 @@ F: package/python-sip/ >>> F: package/uhd/ >>> >>> N: Heiko Thiery >>> +F: board/kontron/bl-imx8mm/ >>> F: board/kontron/pitx-imx8m/ >>> +F: configs/kontron_bl_imx8mm_defconfig >>> F: configs/kontron_pitx_imx8m_defconfig >>> F: package/altera-stapl/ >>> F: package/ipmitool/ >>> diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf >>> new file mode 100644 >>> index 0000000000..d38f7f81b7 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/extlinux.conf >>> @@ -0,0 +1,4 @@ >>> +label buildroot >>> + kernel /boot/Image >>> + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb >>> + append root=PARTUUID=%PARTUUID% rootwait rw >>> diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg >>> new file mode 100644 >>> index 0000000000..c98bc4f150 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/genimage.cfg >>> @@ -0,0 +1,18 @@ >>> +image sdcard.img { >>> + hdimage { >>> + partition-table-type = "gpt" >>> + gpt-location = 16K >>> + } >>> + >>> + partition imx-boot { >>> + in-partition-table = "no" >>> + image = "flash.bin" >>> + offset = 33K >>> + } >>> + >>> + partition rootfs { >>> + image = "rootfs.ext4" >>> + offset = 8M >>> + partition-uuid = %PARTUUID% >>> + } >>> +} >>> diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch >>> new file mode 100644 >>> index 0000000000..6d76282def >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch >>> @@ -0,0 +1,31 @@ >>> +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 >>> +From: Heiko Thiery >>> +Date: Mon, 10 Jan 2022 14:13:02 +0100 >>> +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig >>> + >>> +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL >>> + >>> +Patch submitted upstream: >>> +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ >>> + >>> +Signed-off-by: Heiko Thiery >>> +--- >>> + configs/kontron-sl-mx8mm_defconfig | 2 ++ >>> + 1 file changed, 2 insertions(+) >>> + >>> +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig >>> +index 35d12fca32..940bf07a92 100644 >>> +--- a/configs/kontron-sl-mx8mm_defconfig >>> ++++ b/configs/kontron-sl-mx8mm_defconfig >>> +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y >>> + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" >>> + CONFIG_SPL_TEXT_BASE=0x7E1000 >>> + CONFIG_TARGET_KONTRON_MX8MM=y >>> ++CONFIG_SPL_MMC=y >>> ++CONFIG_SPL_SERIAL=y >>> + CONFIG_BOOTCOUNT_BOOTLIMIT=3 >>> + CONFIG_SPL=y >>> + CONFIG_DISTRO_DEFAULTS=y >>> +-- >>> +2.30.2 >>> + >>> diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch >>> new file mode 100644 >>> index 0000000000..a88d7aba87 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch >>> @@ -0,0 +1,305 @@ >>> +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 >>> +From: Heiko Thiery >>> +Date: Wed, 12 Jan 2022 08:44:36 +0100 >>> +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board >>> + u-boot.dtsi >>> + >>> +When using a board variant that selects the lvds specific dtb the >>> +*.u-boot.dtsi file will not be included. To have a lvds dtb specific >>> +u-boot.dtsi file move this part to a common board u-boot.dtsi file and >>> +include this in the board base u-boot.dtsi and create an additional one >>> +for the lvds variant. >>> + >>> +Patch submitted upstream: >>> +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ >>> + >>> +Signed-off-by: Heiko Thiery >>> +--- >>> + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + >>> + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- >>> + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ >>> + 3 files changed, 135 insertions(+), 123 deletions(-) >>> + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi >>> + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi >>> + >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi >>> +new file mode 100644 >>> +index 0000000000..4bf75722bf >>> +--- /dev/null >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi >>> +@@ -0,0 +1,6 @@ >>> ++// SPDX-License-Identifier: GPL-2.0+ >>> ++/* >>> ++ * Copyright (C) 2019 Kontron Electronics GmbH >>> ++ */ >>> ++ >>> ++#include "imx8mm-kontron-n801x-u-boot.dtsi" >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi >>> +index 22d18e6f1c..4bf75722bf 100644 >>> +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi >>> +@@ -3,126 +3,4 @@ >>> + * Copyright (C) 2019 Kontron Electronics GmbH >>> + */ >>> + >>> +-#include "imx8mm-u-boot.dtsi" >>> +- >>> +-/ { >>> +- aliases { >>> +- usb0 = &usbotg1; >>> +- usb1 = &usbotg2; >>> +- }; >>> +- >>> +- wdt-reboot { >>> +- compatible = "wdt-reboot"; >>> +- wdt = <&wdog1>; >>> +- u-boot,dm-spl; >>> +- }; >>> +- >>> +- firmware { >>> +- optee { >>> +- compatible = "linaro,optee-tz"; >>> +- method = "smc"; >>> +- }; >>> +- }; >>> +-}; >>> +- >>> +-&fec1 { >>> +- phy-mode = "rgmii-rxid"; >>> +-}; >>> +- >>> +-&i2c1 { >>> +- u-boot,dm-spl; >>> +- u-boot,dm-pre-reloc; >>> +-}; >>> +- >>> +-&i2c2 { >>> +- status = "okay"; >>> +- u-boot,dm-spl; >>> +- u-boot,dm-pre-reloc; >>> +-}; >>> +- >>> +-&pinctrl_ecspi1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_i2c1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_pmic { >>> +- u-boot,dm-spl; >>> +- fsl,pins = < >>> +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 >>> +- /* Disable Pullup for SD_VSEL */ >>> +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 >>> +- >; >>> +-}; >>> +- >>> +-&pinctrl_uart3 { >>> +- u-boot,dm-spl; >>> +- u-boot,dm-pre-reloc; >>> +-}; >>> +- >>> +-&pinctrl_usdhc1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_usdhc1_100mhz { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_usdhc1_200mhz { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pinctrl_usdhc2 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&pca9450 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&ecspi1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio2 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio3 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio4 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&gpio5 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&uart3 { >>> +- u-boot,dm-spl; >>> +- u-boot,dm-pre-reloc; >>> +-}; >>> +- >>> +-&usdhc1 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&usdhc2 { >>> +- u-boot,dm-spl; >>> +-}; >>> +- >>> +-&wdog1 { >>> +- u-boot,dm-spl; >>> +-}; >>> ++#include "imx8mm-kontron-n801x-u-boot.dtsi" >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi >>> +new file mode 100644 >>> +index 0000000000..22d18e6f1c >>> +--- /dev/null >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi >>> +@@ -0,0 +1,128 @@ >>> ++// SPDX-License-Identifier: GPL-2.0+ >>> ++/* >>> ++ * Copyright (C) 2019 Kontron Electronics GmbH >>> ++ */ >>> ++ >>> ++#include "imx8mm-u-boot.dtsi" >>> ++ >>> ++/ { >>> ++ aliases { >>> ++ usb0 = &usbotg1; >>> ++ usb1 = &usbotg2; >>> ++ }; >>> ++ >>> ++ wdt-reboot { >>> ++ compatible = "wdt-reboot"; >>> ++ wdt = <&wdog1>; >>> ++ u-boot,dm-spl; >>> ++ }; >>> ++ >>> ++ firmware { >>> ++ optee { >>> ++ compatible = "linaro,optee-tz"; >>> ++ method = "smc"; >>> ++ }; >>> ++ }; >>> ++}; >>> ++ >>> ++&fec1 { >>> ++ phy-mode = "rgmii-rxid"; >>> ++}; >>> ++ >>> ++&i2c1 { >>> ++ u-boot,dm-spl; >>> ++ u-boot,dm-pre-reloc; >>> ++}; >>> ++ >>> ++&i2c2 { >>> ++ status = "okay"; >>> ++ u-boot,dm-spl; >>> ++ u-boot,dm-pre-reloc; >>> ++}; >>> ++ >>> ++&pinctrl_ecspi1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_i2c1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_pmic { >>> ++ u-boot,dm-spl; >>> ++ fsl,pins = < >>> ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 >>> ++ /* Disable Pullup for SD_VSEL */ >>> ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 >>> ++ >; >>> ++}; >>> ++ >>> ++&pinctrl_uart3 { >>> ++ u-boot,dm-spl; >>> ++ u-boot,dm-pre-reloc; >>> ++}; >>> ++ >>> ++&pinctrl_usdhc1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_usdhc1_100mhz { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_usdhc1_200mhz { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pinctrl_usdhc2 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&pca9450 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&ecspi1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio2 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio3 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio4 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&gpio5 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&uart3 { >>> ++ u-boot,dm-spl; >>> ++ u-boot,dm-pre-reloc; >>> ++}; >>> ++ >>> ++&usdhc1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&usdhc2 { >>> ++ u-boot,dm-spl; >>> ++}; >>> ++ >>> ++&wdog1 { >>> ++ u-boot,dm-spl; >>> ++}; >>> +-- >>> +2.30.2 >>> + >>> diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh >>> new file mode 100755 >>> index 0000000000..bf8861f6a9 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/post-build.sh >>> @@ -0,0 +1,7 @@ >>> +#!/bin/sh >>> +BOARD_DIR="$(dirname $0)" >>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" >>> + >>> +install -d "$TARGET_DIR/boot/extlinux/" >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" >>> diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt >>> new file mode 100644 >>> index 0000000000..df47ba5174 >>> --- /dev/null >>> +++ b/board/kontron/bl-imx8mm/readme.txt >>> @@ -0,0 +1,85 @@ >>> +Kontron BL i.MX8M Mini >>> +====================== >>> + >>> +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 >>> + >>> + >>> +How to build it >>> +=============== >>> + >>> +Configure buildroot: >>> + >>> + $ make kontron_bl_imx8mm_defconfig >>> + >>> +Change settings to fit your needs (optional): >>> + >>> + $ make menuconfig >>> + >>> +Compile everything and build the rootfs image: >>> + >>> + $ make >>> + >>> + >>> +Result of the build >>> +=================== >>> + >>> +After building, the output/images directory contains: >>> + >>> + output/images/ >>> + ??? bl31.bin >>> + ??? boot.scr >>> + ??? ddr_fw.bin >>> + ??? flash.bin >>> + ??? Image >>> + ??? imx8mm-kontron-n801x-s.dtb >>> + ??? lpddr4_pmu_train_1d_dmem_201904.bin >>> + ??? lpddr4_pmu_train_1d_dmem_202006.bin >>> + ??? lpddr4_pmu_train_1d_dmem.bin >>> + ??? lpddr4_pmu_train_1d_dmem_pad.bin >>> + ??? lpddr4_pmu_train_1d_fw.bin >>> + ??? lpddr4_pmu_train_1d_imem_201904.bin >>> + ??? lpddr4_pmu_train_1d_imem_202006.bin >>> + ??? lpddr4_pmu_train_1d_imem.bin >>> + ??? lpddr4_pmu_train_1d_imem_pad.bin >>> + ??? lpddr4_pmu_train_2d_dmem_201904.bin >>> + ??? lpddr4_pmu_train_2d_dmem_202006.bin >>> + ??? lpddr4_pmu_train_2d_dmem.bin >>> + ??? lpddr4_pmu_train_2d_dmem_pad.bin >>> + ??? lpddr4_pmu_train_2d_fw.bin >>> + ??? lpddr4_pmu_train_2d_imem_201904.bin >>> + ??? lpddr4_pmu_train_2d_imem_202006.bin >>> + ??? lpddr4_pmu_train_2d_imem.bin >>> + ??? lpddr4_pmu_train_2d_imem_pad.bin >>> + ??? lpddr4_pmu_train_fw.bin >>> + ??? rootfs.ext2 >>> + ??? rootfs.ext4 -> rootfs.ext2 >>> + ??? rootfs.tar >>> + ??? sdcard.img >>> + ??? u-boot.bin >>> + ??? u-boot-spl.bin >>> + >>> + >>> +Flashing the SD card image >>> +========================== >>> + >>> +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) >>> + >>> + $ sudo dd if=output/images/sdcard.img of= >>> + >>> + >>> +Preparing the board >>> +=================== >>> + >>> + * Connect a serial line to the board >>> + * Insert the SD card >>> + * Power-up the board >>> + >>> + >>> +Booting the board >>> +================= >>> + >>> +By default the bootloader will search for the first valid image, starting >>> +with the internal eMMC. To make sure the bootloader loads bootscript from >>> +the correct location (SD card) set the boot_targets environment variable: >>> + >>> + $ setenv boot_targets mmc1 >>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig >>> new file mode 100644 >>> index 0000000000..0cf0115bfa >>> --- /dev/null >>> +++ b/configs/kontron_bl_imx8mm_defconfig >>> @@ -0,0 +1,58 @@ >>> +# Architecture >>> +BR2_aarch64=y >>> +BR2_ARM_FPU_VFPV3=y >>> + >>> +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" >>> + >>> +# System >>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" >>> + >>> +# Kernel >>> +BR2_LINUX_KERNEL=y >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" >>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" >>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>> + >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >>> + >>> +BR2_PACKAGE_FREESCALE_IMX=y >>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y >>> +BR2_PACKAGE_FIRMWARE_IMX=y >>> + >>> +# Filesystem / image >>> +BR2_TARGET_ROOTFS_EXT2=y >>> +BR2_TARGET_ROOTFS_EXT2_4=y >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>> + >>> +# Bootloader >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" >>> +BR2_TARGET_UBOOT=y >>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y >>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>> +BR2_TARGET_UBOOT_SPL=y >>> + >>> +# Required host tools to create the SD/eMMC image >>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >>> +BR2_PACKAGE_HOST_GENIMAGE=y >> >> I have seen that some people like to have this organization but it's >> not really nice to maintain. I would like >> to savedefconfig and use that one instead of having nice commented >> part. Is this mandatory? > > As far as I know there is no rule how to do that. For me it seems to > be more readable and clean. But this is only my opinion. As Heiko pointed it's a very good habit. One thing that must be taken into account while doing it, is to keep the various BR2_* configs ordered as they are ordere inside the various Config.in Best regards -- Giulio Benetti Benetti Engineering sas From fontaine.fabrice at gmail.com Mon Jan 31 16:40:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 31 Jan 2022 17:40:58 +0100 Subject: [Buildroot] [PATCH 1/2] package/libglib2: bump version to 2.70.0 In-Reply-To: References: <20220129214235.5133-1-thomas.devoogdt@gmail.com> <20220130155235.2f51e08a@windsurf> Message-ID: Hi, Le lun. 31 janv. 2022 ? 17:16, Thomas Devoogdt a ?crit : > > Hi Thomas, All, > > > It's a bit difficult to follow http://autobuild.buildroot.net/, but > I saw one thing when doing a quick scan: > > bluez5_utils: http://autobuild.buildroot.net/results/5c7/5c75ad724df3ff726559acee0da31f777ef6bc68/build-end.log > --> g_memdup, deprecated since 2.68: https://docs.gtk.org/glib/func.memdup.html You can also add this one: - libblockdev: http://autobuild.buildroot.net/results/2fd/2fd1b4001b64004be49dd91329945ab108e1a90c/build-end.log exec.c: In function 'bd_utils_exec_and_report_status_error': exec.c:239:5: error: 'g_spawn_check_exit_status' is deprecated: Use 'g_spawn_check_wait_status' instead [-Werror=deprecated-declarations] 239 | if (!g_spawn_check_exit_status (exit_status, error)) { | ^~ > > Kr, > Thomas > Best Regards, Fabrice From michael at amarulasolutions.com Mon Jan 31 16:42:23 2022 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 31 Jan 2022 17:42:23 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> Message-ID: Hi On Mon, Jan 31, 2022 at 5:38 PM Giulio Benetti wrote: > > Hi Michael, > > On 31/01/22 16:42, Heiko Thiery wrote: > > Hi Michael, > > > > > > Am Mo., 31. Jan. 2022 um 16:36 Uhr schrieb Michael Nazzareno Trimarchi > > : > >> > >> Hi Heiko > >> > >> On Mon, Jan 31, 2022 at 4:30 PM Heiko Thiery wrote: > >>> > >>> The BL i.MX8M Mini is a baseboard that includes the SoM SL i.MX8M Mini. > >>> > >>> https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > >>> > >>> Cc: Frieder Schrempf > >>> Signed-off-by: Heiko Thiery > >>> --- > >>> v5: > >>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS > >>> > >>> v4: > >>> - remove BR2_ARM_FPU_VFPV3 since this option is not used for aarch64. > >>> The FPU options are set implicit. > >>> > >>> v3: > >>> - change offset value to use capitol 'K' value (thanks Guilio) > >>> - add info to uboot patches about submitting to upstream > >>> > >>> v2: > >>> - switch to extlinux > >>> - directly call genimage.sh > >>> - remove post-image.sh > >>> - remove BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT > >>> - add BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME > >>> > >>> DEVELOPERS | 2 + > >>> board/kontron/bl-imx8mm/extlinux.conf | 4 + > >>> board/kontron/bl-imx8mm/genimage.cfg | 18 ++ > >>> ...m-kontron-n801x-s-convert-options-to.patch | 31 ++ > >>> ...m-kontron-n801x-s-add-common-board-u.patch | 305 ++++++++++++++++++ > >>> board/kontron/bl-imx8mm/post-build.sh | 7 + > >>> board/kontron/bl-imx8mm/readme.txt | 85 +++++ > >>> configs/kontron_bl_imx8mm_defconfig | 58 ++++ > >>> 8 files changed, 510 insertions(+) > >>> create mode 100644 board/kontron/bl-imx8mm/extlinux.conf > >>> create mode 100644 board/kontron/bl-imx8mm/genimage.cfg > >>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > >>> create mode 100644 board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > >>> create mode 100755 board/kontron/bl-imx8mm/post-build.sh > >>> create mode 100644 board/kontron/bl-imx8mm/readme.txt > >>> create mode 100644 configs/kontron_bl_imx8mm_defconfig > >>> > >>> diff --git a/DEVELOPERS b/DEVELOPERS > >>> index a1ec9a091e..38724726d4 100644 > >>> --- a/DEVELOPERS > >>> +++ b/DEVELOPERS > >>> @@ -1183,7 +1183,9 @@ F: package/python-sip/ > >>> F: package/uhd/ > >>> > >>> N: Heiko Thiery > >>> +F: board/kontron/bl-imx8mm/ > >>> F: board/kontron/pitx-imx8m/ > >>> +F: configs/kontron_bl_imx8mm_defconfig > >>> F: configs/kontron_pitx_imx8m_defconfig > >>> F: package/altera-stapl/ > >>> F: package/ipmitool/ > >>> diff --git a/board/kontron/bl-imx8mm/extlinux.conf b/board/kontron/bl-imx8mm/extlinux.conf > >>> new file mode 100644 > >>> index 0000000000..d38f7f81b7 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/extlinux.conf > >>> @@ -0,0 +1,4 @@ > >>> +label buildroot > >>> + kernel /boot/Image > >>> + devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb > >>> + append root=PARTUUID=%PARTUUID% rootwait rw > >>> diff --git a/board/kontron/bl-imx8mm/genimage.cfg b/board/kontron/bl-imx8mm/genimage.cfg > >>> new file mode 100644 > >>> index 0000000000..c98bc4f150 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/genimage.cfg > >>> @@ -0,0 +1,18 @@ > >>> +image sdcard.img { > >>> + hdimage { > >>> + partition-table-type = "gpt" > >>> + gpt-location = 16K > >>> + } > >>> + > >>> + partition imx-boot { > >>> + in-partition-table = "no" > >>> + image = "flash.bin" > >>> + offset = 33K > >>> + } > >>> + > >>> + partition rootfs { > >>> + image = "rootfs.ext4" > >>> + offset = 8M > >>> + partition-uuid = %PARTUUID% > >>> + } > >>> +} > >>> diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > >>> new file mode 100644 > >>> index 0000000000..6d76282def > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch > >>> @@ -0,0 +1,31 @@ > >>> +From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 > >>> +From: Heiko Thiery > >>> +Date: Mon, 10 Jan 2022 14:13:02 +0100 > >>> +Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig > >>> + > >>> +CONFIG_SPL_MMC and CONFIG_SPL_SERIAL > >>> + > >>> +Patch submitted upstream: > >>> +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery at gmail.com/ > >>> + > >>> +Signed-off-by: Heiko Thiery > >>> +--- > >>> + configs/kontron-sl-mx8mm_defconfig | 2 ++ > >>> + 1 file changed, 2 insertions(+) > >>> + > >>> +diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig > >>> +index 35d12fca32..940bf07a92 100644 > >>> +--- a/configs/kontron-sl-mx8mm_defconfig > >>> ++++ b/configs/kontron-sl-mx8mm_defconfig > >>> +@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y > >>> + CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" > >>> + CONFIG_SPL_TEXT_BASE=0x7E1000 > >>> + CONFIG_TARGET_KONTRON_MX8MM=y > >>> ++CONFIG_SPL_MMC=y > >>> ++CONFIG_SPL_SERIAL=y > >>> + CONFIG_BOOTCOUNT_BOOTLIMIT=3 > >>> + CONFIG_SPL=y > >>> + CONFIG_DISTRO_DEFAULTS=y > >>> +-- > >>> +2.30.2 > >>> + > >>> diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > >>> new file mode 100644 > >>> index 0000000000..a88d7aba87 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch > >>> @@ -0,0 +1,305 @@ > >>> +From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 > >>> +From: Heiko Thiery > >>> +Date: Wed, 12 Jan 2022 08:44:36 +0100 > >>> +Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board > >>> + u-boot.dtsi > >>> + > >>> +When using a board variant that selects the lvds specific dtb the > >>> +*.u-boot.dtsi file will not be included. To have a lvds dtb specific > >>> +u-boot.dtsi file move this part to a common board u-boot.dtsi file and > >>> +include this in the board base u-boot.dtsi and create an additional one > >>> +for the lvds variant. > >>> + > >>> +Patch submitted upstream: > >>> +https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery at gmail.com/ > >>> + > >>> +Signed-off-by: Heiko Thiery > >>> +--- > >>> + .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + > >>> + .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- > >>> + arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ > >>> + 3 files changed, 135 insertions(+), 123 deletions(-) > >>> + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > >>> + create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > >>> + > >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > >>> +new file mode 100644 > >>> +index 0000000000..4bf75722bf > >>> +--- /dev/null > >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi > >>> +@@ -0,0 +1,6 @@ > >>> ++// SPDX-License-Identifier: GPL-2.0+ > >>> ++/* > >>> ++ * Copyright (C) 2019 Kontron Electronics GmbH > >>> ++ */ > >>> ++ > >>> ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > >>> +index 22d18e6f1c..4bf75722bf 100644 > >>> +--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi > >>> +@@ -3,126 +3,4 @@ > >>> + * Copyright (C) 2019 Kontron Electronics GmbH > >>> + */ > >>> + > >>> +-#include "imx8mm-u-boot.dtsi" > >>> +- > >>> +-/ { > >>> +- aliases { > >>> +- usb0 = &usbotg1; > >>> +- usb1 = &usbotg2; > >>> +- }; > >>> +- > >>> +- wdt-reboot { > >>> +- compatible = "wdt-reboot"; > >>> +- wdt = <&wdog1>; > >>> +- u-boot,dm-spl; > >>> +- }; > >>> +- > >>> +- firmware { > >>> +- optee { > >>> +- compatible = "linaro,optee-tz"; > >>> +- method = "smc"; > >>> +- }; > >>> +- }; > >>> +-}; > >>> +- > >>> +-&fec1 { > >>> +- phy-mode = "rgmii-rxid"; > >>> +-}; > >>> +- > >>> +-&i2c1 { > >>> +- u-boot,dm-spl; > >>> +- u-boot,dm-pre-reloc; > >>> +-}; > >>> +- > >>> +-&i2c2 { > >>> +- status = "okay"; > >>> +- u-boot,dm-spl; > >>> +- u-boot,dm-pre-reloc; > >>> +-}; > >>> +- > >>> +-&pinctrl_ecspi1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_i2c1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_pmic { > >>> +- u-boot,dm-spl; > >>> +- fsl,pins = < > >>> +- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > >>> +- /* Disable Pullup for SD_VSEL */ > >>> +- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > >>> +- >; > >>> +-}; > >>> +- > >>> +-&pinctrl_uart3 { > >>> +- u-boot,dm-spl; > >>> +- u-boot,dm-pre-reloc; > >>> +-}; > >>> +- > >>> +-&pinctrl_usdhc1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_usdhc1_100mhz { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_usdhc1_200mhz { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pinctrl_usdhc2 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&pca9450 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&ecspi1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio2 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio3 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio4 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&gpio5 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&uart3 { > >>> +- u-boot,dm-spl; > >>> +- u-boot,dm-pre-reloc; > >>> +-}; > >>> +- > >>> +-&usdhc1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&usdhc2 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> +- > >>> +-&wdog1 { > >>> +- u-boot,dm-spl; > >>> +-}; > >>> ++#include "imx8mm-kontron-n801x-u-boot.dtsi" > >>> +diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > >>> +new file mode 100644 > >>> +index 0000000000..22d18e6f1c > >>> +--- /dev/null > >>> ++++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi > >>> +@@ -0,0 +1,128 @@ > >>> ++// SPDX-License-Identifier: GPL-2.0+ > >>> ++/* > >>> ++ * Copyright (C) 2019 Kontron Electronics GmbH > >>> ++ */ > >>> ++ > >>> ++#include "imx8mm-u-boot.dtsi" > >>> ++ > >>> ++/ { > >>> ++ aliases { > >>> ++ usb0 = &usbotg1; > >>> ++ usb1 = &usbotg2; > >>> ++ }; > >>> ++ > >>> ++ wdt-reboot { > >>> ++ compatible = "wdt-reboot"; > >>> ++ wdt = <&wdog1>; > >>> ++ u-boot,dm-spl; > >>> ++ }; > >>> ++ > >>> ++ firmware { > >>> ++ optee { > >>> ++ compatible = "linaro,optee-tz"; > >>> ++ method = "smc"; > >>> ++ }; > >>> ++ }; > >>> ++}; > >>> ++ > >>> ++&fec1 { > >>> ++ phy-mode = "rgmii-rxid"; > >>> ++}; > >>> ++ > >>> ++&i2c1 { > >>> ++ u-boot,dm-spl; > >>> ++ u-boot,dm-pre-reloc; > >>> ++}; > >>> ++ > >>> ++&i2c2 { > >>> ++ status = "okay"; > >>> ++ u-boot,dm-spl; > >>> ++ u-boot,dm-pre-reloc; > >>> ++}; > >>> ++ > >>> ++&pinctrl_ecspi1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_i2c1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_pmic { > >>> ++ u-boot,dm-spl; > >>> ++ fsl,pins = < > >>> ++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 > >>> ++ /* Disable Pullup for SD_VSEL */ > >>> ++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 > >>> ++ >; > >>> ++}; > >>> ++ > >>> ++&pinctrl_uart3 { > >>> ++ u-boot,dm-spl; > >>> ++ u-boot,dm-pre-reloc; > >>> ++}; > >>> ++ > >>> ++&pinctrl_usdhc1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_usdhc1_100mhz { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_usdhc1_200mhz { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pinctrl_usdhc2 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&pca9450 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&{/soc at 0/bus at 30800000/i2c at 30a20000/pmic at 25/regulators} { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&ecspi1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio2 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio3 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio4 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&gpio5 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&uart3 { > >>> ++ u-boot,dm-spl; > >>> ++ u-boot,dm-pre-reloc; > >>> ++}; > >>> ++ > >>> ++&usdhc1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&usdhc2 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> ++ > >>> ++&wdog1 { > >>> ++ u-boot,dm-spl; > >>> ++}; > >>> +-- > >>> +2.30.2 > >>> + > >>> diff --git a/board/kontron/bl-imx8mm/post-build.sh b/board/kontron/bl-imx8mm/post-build.sh > >>> new file mode 100755 > >>> index 0000000000..bf8861f6a9 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/post-build.sh > >>> @@ -0,0 +1,7 @@ > >>> +#!/bin/sh > >>> +BOARD_DIR="$(dirname $0)" > >>> +PARTUUID="$($HOST_DIR/bin/uuidgen)" > >>> + > >>> +install -d "$TARGET_DIR/boot/extlinux/" > >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > >>> +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > >>> diff --git a/board/kontron/bl-imx8mm/readme.txt b/board/kontron/bl-imx8mm/readme.txt > >>> new file mode 100644 > >>> index 0000000000..df47ba5174 > >>> --- /dev/null > >>> +++ b/board/kontron/bl-imx8mm/readme.txt > >>> @@ -0,0 +1,85 @@ > >>> +Kontron BL i.MX8M Mini > >>> +====================== > >>> + > >>> +https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549 > >>> + > >>> + > >>> +How to build it > >>> +=============== > >>> + > >>> +Configure buildroot: > >>> + > >>> + $ make kontron_bl_imx8mm_defconfig > >>> + > >>> +Change settings to fit your needs (optional): > >>> + > >>> + $ make menuconfig > >>> + > >>> +Compile everything and build the rootfs image: > >>> + > >>> + $ make > >>> + > >>> + > >>> +Result of the build > >>> +=================== > >>> + > >>> +After building, the output/images directory contains: > >>> + > >>> + output/images/ > >>> + ??? bl31.bin > >>> + ??? boot.scr > >>> + ??? ddr_fw.bin > >>> + ??? flash.bin > >>> + ??? Image > >>> + ??? imx8mm-kontron-n801x-s.dtb > >>> + ??? lpddr4_pmu_train_1d_dmem_201904.bin > >>> + ??? lpddr4_pmu_train_1d_dmem_202006.bin > >>> + ??? lpddr4_pmu_train_1d_dmem.bin > >>> + ??? lpddr4_pmu_train_1d_dmem_pad.bin > >>> + ??? lpddr4_pmu_train_1d_fw.bin > >>> + ??? lpddr4_pmu_train_1d_imem_201904.bin > >>> + ??? lpddr4_pmu_train_1d_imem_202006.bin > >>> + ??? lpddr4_pmu_train_1d_imem.bin > >>> + ??? lpddr4_pmu_train_1d_imem_pad.bin > >>> + ??? lpddr4_pmu_train_2d_dmem_201904.bin > >>> + ??? lpddr4_pmu_train_2d_dmem_202006.bin > >>> + ??? lpddr4_pmu_train_2d_dmem.bin > >>> + ??? lpddr4_pmu_train_2d_dmem_pad.bin > >>> + ??? lpddr4_pmu_train_2d_fw.bin > >>> + ??? lpddr4_pmu_train_2d_imem_201904.bin > >>> + ??? lpddr4_pmu_train_2d_imem_202006.bin > >>> + ??? lpddr4_pmu_train_2d_imem.bin > >>> + ??? lpddr4_pmu_train_2d_imem_pad.bin > >>> + ??? lpddr4_pmu_train_fw.bin > >>> + ??? rootfs.ext2 > >>> + ??? rootfs.ext4 -> rootfs.ext2 > >>> + ??? rootfs.tar > >>> + ??? sdcard.img > >>> + ??? u-boot.bin > >>> + ??? u-boot-spl.bin > >>> + > >>> + > >>> +Flashing the SD card image > >>> +========================== > >>> + > >>> +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) > >>> + > >>> + $ sudo dd if=output/images/sdcard.img of= > >>> + > >>> + > >>> +Preparing the board > >>> +=================== > >>> + > >>> + * Connect a serial line to the board > >>> + * Insert the SD card > >>> + * Power-up the board > >>> + > >>> + > >>> +Booting the board > >>> +================= > >>> + > >>> +By default the bootloader will search for the first valid image, starting > >>> +with the internal eMMC. To make sure the bootloader loads bootscript from > >>> +the correct location (SD card) set the boot_targets environment variable: > >>> + > >>> + $ setenv boot_targets mmc1 > >>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig > >>> new file mode 100644 > >>> index 0000000000..0cf0115bfa > >>> --- /dev/null > >>> +++ b/configs/kontron_bl_imx8mm_defconfig > >>> @@ -0,0 +1,58 @@ > >>> +# Architecture > >>> +BR2_aarch64=y > >>> +BR2_ARM_FPU_VFPV3=y > >>> + > >>> +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" > >>> + > >>> +# System > >>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" > >>> + > >>> +# Kernel > >>> +BR2_LINUX_KERNEL=y > >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > >>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > >>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y > >>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" > >>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > >>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y > >>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > >>> + > >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > >>> + > >>> +BR2_PACKAGE_FREESCALE_IMX=y > >>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y > >>> +BR2_PACKAGE_FIRMWARE_IMX=y > >>> + > >>> +# Filesystem / image > >>> +BR2_TARGET_ROOTFS_EXT2=y > >>> +BR2_TARGET_ROOTFS_EXT2_4=y > >>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > >>> + > >>> +# Bootloader > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > >>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" > >>> +BR2_TARGET_UBOOT=y > >>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > >>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" > >>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" > >>> +BR2_TARGET_UBOOT_NEEDS_DTC=y > >>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > >>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > >>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y > >>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y > >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" > >>> +BR2_TARGET_UBOOT_SPL=y > >>> + > >>> +# Required host tools to create the SD/eMMC image > >>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" > >>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > >>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > >>> +BR2_PACKAGE_HOST_GENIMAGE=y > >> > >> I have seen that some people like to have this organization but it's > >> not really nice to maintain. I would like > >> to savedefconfig and use that one instead of having nice commented > >> part. Is this mandatory? > > > > As far as I know there is no rule how to do that. For me it seems to > > be more readable and clean. But this is only my opinion. > > As Heiko pointed it's a very good habit. > > One thing that must be taken into account while doing it, is to keep the > various BR2_* configs ordered as they are ordere inside the various > Config.in There are good information indeed but even those information must be keep updated. Daily work show me that work on savedefconfig make things nicely. Some of your option can be at some point autoselect by another one and so on. Michael > > Best regards > -- > Giulio Benetti > Benetti Engineering sas -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael at amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info at amarulasolutions.com www.amarulasolutions.com From giulio.benetti at benettiengineering.com Mon Jan 31 17:11:44 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 18:11:44 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> Message-ID: <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> On 31/01/22 17:42, Michael Nazzareno Trimarchi wrote: [SNIP] >>>>> diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig >>>>> new file mode 100644 >>>>> index 0000000000..0cf0115bfa >>>>> --- /dev/null >>>>> +++ b/configs/kontron_bl_imx8mm_defconfig >>>>> @@ -0,0 +1,58 @@ >>>>> +# Architecture >>>>> +BR2_aarch64=y >>>>> +BR2_ARM_FPU_VFPV3=y >>>>> + >>>>> +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" >>>>> + >>>>> +# System >>>>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" >>>>> + >>>>> +# Kernel >>>>> +BR2_LINUX_KERNEL=y >>>>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>>>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" >>>>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" >>>>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>>>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>>>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>>>> + >>>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >>>>> + >>>>> +BR2_PACKAGE_FREESCALE_IMX=y >>>>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y >>>>> +BR2_PACKAGE_FIRMWARE_IMX=y >>>>> + >>>>> +# Filesystem / image >>>>> +BR2_TARGET_ROOTFS_EXT2=y >>>>> +BR2_TARGET_ROOTFS_EXT2_4=y >>>>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>>>> + >>>>> +# Bootloader >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y >>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" >>>>> +BR2_TARGET_UBOOT=y >>>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>>>> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y >>>>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >>>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" >>>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>>>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>>>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y >>>>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>>>> +BR2_TARGET_UBOOT_SPL=y >>>>> + >>>>> +# Required host tools to create the SD/eMMC image >>>>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" >>>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >>>>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >>>>> +BR2_PACKAGE_HOST_GENIMAGE=y >>>> >>>> I have seen that some people like to have this organization but it's >>>> not really nice to maintain. I would like >>>> to savedefconfig and use that one instead of having nice commented >>>> part. Is this mandatory? >>> >>> As far as I know there is no rule how to do that. For me it seems to >>> be more readable and clean. But this is only my opinion. >> >> As Heiko pointed it's a very good habit. >> >> One thing that must be taken into account while doing it, is to keep the >> various BR2_* configs ordered as they are ordere inside the various >> Config.in > > There are good information indeed but even those information must be > keep updated. Daily work show me that work on > savedefconfig make things nicely. Some of your option can be at some > point autoselect by another one and so on. Yes, you're right, I've noticed that too. It's "not that automatic", but if you check the first 25 defconfigs you can see that more or less the 70% use the "descriptive" way. So basically one should savedefconfig to another file and compare to the configs/*_defconfig and eventually modify. Anyway there is still not a standard decided. So maintainers will accept both ways. Cheers -- Giulio Benetti Benetti Engineering sas From yann.morin.1998 at free.fr Mon Jan 31 17:13:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 31 Jan 2022 18:13:55 +0100 Subject: [Buildroot] [PATCH 1/2] boot/uboot: fix build with host-gcc 10+ In-Reply-To: <45a93a2b-2172-2cd2-8ccb-77f251e55dbc@mind.be> References: <45a93a2b-2172-2cd2-8ccb-77f251e55dbc@mind.be> Message-ID: <20220131171355.GU457876@scaer> Arnout, All, On 2022-01-31 08:42 +0100, Arnout Vandecappelle spake thusly: > On 30/01/2022 22:10, Yann E. MORIN wrote: [--SNIP--] > >Upstream just dropped that line altogether: > > https://source.denx.de/u-boot/u-boot/-/commit/018921ee79d3f30893614b3b2b63b588d8544f73 > >So, we use a little sed-grep combo to do the exact same change. [--SNIP--] > >+# Older versions break on gcc 10+ because of redefined symbols > >+define UBOOT_DROP_YYLLOC > >+ $(SED) '/^YYLTYPE yylloc;$$/d' `grep -l -r -E '^YYLTYPE yylloc;$$' $(@D)` > > Why not use > grep ... | xargs --no-run-if-empty $(SED) ... > > which also avoids the "no input files" problem. Yes, this is the obviously correct solution; I just did not have time to handle it this morning... ;-) > Also: > - Isn't it enough to search in $(@D)/scripts? I was also a bit conflicted on that one. It should even be enough to look up scripts/dtc/ (kconfig was never impacted). > - I guess we should use -Z to make is 0-separated. I'm not a 100% sure, but > I vaguely remember encountering a U-Boot or Linux vendor fork which had file > names with spaces in them. Whether that exists or not, I am now trying to always use -Z et al. when dealing with lists of files in shell. Thanks for the input; v2 incoming shortly... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From nealf at xilinx.com Mon Jan 31 17:30:37 2022 From: nealf at xilinx.com (Neal Frager) Date: Mon, 31 Jan 2022 17:30:37 +0000 Subject: [Buildroot] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Message-ID: Changes included with this patch: 1. Removing ATF and U-Boot patches which are no longer necessary since they are in mainline. 2. Using Xilinx github for ATF, U-Boot and Linux as there are updates which may not yet be in mainline. 3. Adding a zynqmp_zcu102_defconfig. Signed-off-by: Neal Frager This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-configs-zynqmp_zcu10x-Bump-ATF-U-Boot-Linux-to-Xilin.patch Type: application/octet-stream Size: 26963 bytes Desc: 0001-configs-zynqmp_zcu10x-Bump-ATF-U-Boot-Linux-to-Xilin.patch URL: From fperrad at gmail.com Mon Jan 31 14:47:34 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 31 Jan 2022 15:47:34 +0100 Subject: [Buildroot] [PATCH] package/prosody: security bump to 0.11.13 Message-ID: <20220131144734.1199549-1-francois.perrad@gadz.org> see https://prosody.im/doc/release/0.11.13 Signed-off-by: Francois Perrad --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index b6fa6532a..3a3a363a4 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz -sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz -sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz -sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz +md5 7214ee57d4702585bd0d3428e69790b4 prosody-0.11.13.tar.gz +sha1 1cc5a72d98738872d0c1a4c34b1fcb8878348c7d prosody-0.11.13.tar.gz +sha256 39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432 prosody-0.11.13.tar.gz +sha512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 prosody-0.11.13.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index d697c8556..62ba073b9 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.12 +PROSODY_VERSION = 0.11.13 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING -- 2.32.0 From b.bilas at grinn-global.com Mon Jan 31 17:45:29 2022 From: b.bilas at grinn-global.com (Bartosz Bilas) Date: Mon, 31 Jan 2022 18:45:29 +0100 Subject: [Buildroot] [PATCH v5] configs/kontron_bl_imx8mm_defconfig: new defconfig In-Reply-To: <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> References: <20220131153022.351662-1-heiko.thiery@gmail.com> <12be81a6-7f2e-35b8-4f44-d8a20fce74f1@benettiengineering.com> <86bf975a-1599-005a-5ebc-a149cc973da4@benettiengineering.com> Message-ID: <3ea22a9d-938a-5086-66c6-a8f5510c8573@grinn-global.com> Hello, On 31.01.2022 18:11, Giulio Benetti wrote: > On 31/01/22 17:42, Michael Nazzareno Trimarchi wrote: > > [SNIP] > >>>>>> diff --git a/configs/kontron_bl_imx8mm_defconfig >>>>>> b/configs/kontron_bl_imx8mm_defconfig >>>>>> new file mode 100644 >>>>>> index 0000000000..0cf0115bfa >>>>>> --- /dev/null >>>>>> +++ b/configs/kontron_bl_imx8mm_defconfig >>>>>> @@ -0,0 +1,58 @@ >>>>>> +# Architecture >>>>>> +BR2_aarch64=y >>>>>> +BR2_ARM_FPU_VFPV3=y >>>>>> + >>>>>> +BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" >>>>>> + >>>>>> +# System >>>>>> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" >>>>>> + >>>>>> +# Kernel >>>>>> +BR2_LINUX_KERNEL=y >>>>>> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>>>>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" >>>>>> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>>>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >>>>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" >>>>>> +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y >>>>>> +BR2_LINUX_KERNEL_INSTALL_TARGET=y >>>>>> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >>>>>> + >>>>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y >>>>>> + >>>>>> +BR2_PACKAGE_FREESCALE_IMX=y >>>>>> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y >>>>>> +BR2_PACKAGE_FIRMWARE_IMX=y >>>>>> + >>>>>> +# Filesystem / image >>>>>> +BR2_TARGET_ROOTFS_EXT2=y >>>>>> +BR2_TARGET_ROOTFS_EXT2_4=y >>>>>> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >>>>>> + >>>>>> +# Bootloader >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y >>>>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" >>>>>> >>>>>> +BR2_TARGET_UBOOT=y >>>>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >>>>>> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y >>>>>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" >>>>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" >>>>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y >>>>>> +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y >>>>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>>>>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" >>>>>> +BR2_TARGET_UBOOT_SPL=y >>>>>> + >>>>>> +# Required host tools to create the SD/eMMC image >>>>>> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" >>>>>> >>>>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >>>>>> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" >>>>>> +BR2_PACKAGE_HOST_GENIMAGE=y >>>>> >>>>> I have seen that some people like to have this organization but it's >>>>> not really nice to maintain. I would like >>>>> to savedefconfig and use that one instead of having nice commented >>>>> part. Is this mandatory? >>>> >>>> As far as I know there is no rule how to do that. For me it seems to >>>> be more readable and clean. But this is only my opinion. >>> >>> As Heiko pointed it's a very good habit. >>> >>> One thing that must be taken into account while doing it, is to keep >>> the >>> various BR2_* configs ordered as they are ordere inside the various >>> Config.in >> >> There are good information indeed but even those information must be >> keep updated. Daily work show me that work on >> savedefconfig make things nicely. Some of your option can be at some >> point autoselect by another one and so on. > > Yes, you're right, I've noticed that too. It's "not that automatic", > but if you check the first 25 defconfigs you can see that more or less > the 70% use the "descriptive" way. So basically one should > savedefconfig to another file and compare to the configs/*_defconfig > and eventually modify. > > Anyway there is still not a standard decided. So maintainers will > accept both ways. The global sync via `savedefconfig` for all existing configs should solve everything. Besides, it should be impossible to edit those files manually. Best Bartek From giulio.benetti at benettiengineering.com Mon Jan 31 17:53:41 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 18:53:41 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.3.0 Message-ID: <20220131175341.4091688-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 1615933a6e..20ef6c5f51 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd harfbuzz-3.2.0.tar.xz +sha256 f6fb9f28d3df7c027f38b283ec28944fb9900ab2898b149c75c91c34c9c186e6 harfbuzz-3.3.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 67eab359c6..5f4625f96f 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.2.0 +HARFBUZZ_VERSION = 3.3.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) -- 2.25.1 From giulio.benetti at benettiengineering.com Mon Jan 31 18:07:39 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 31 Jan 2022 19:07:39 +0100 Subject: [Buildroot] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: <8f3868bc-5fe0-d016-a203-9b7ad5773136@benettiengineering.com> Hi Neal, can you please re-send using: # git send-mail --to ... otherwise it's impossible to review your patch. Thank you Best regards! -- Giulio Benetti Benetti Engineering sas On 31/01/22 18:30, Neal Frager wrote: > Changes included with this patch: > 1. Removing ATF and U-Boot patches which are no longer necessary since they are in mainline. > 2. Using Xilinx github for ATF, U-Boot and Linux as there are updates which may not yet be in mainline. > 3. Adding a zynqmp_zcu102_defconfig. > > Signed-off-by: Neal Frager > This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Mon Jan 31 18:10:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 31 Jan 2022 18:10:58 +0000 Subject: [Buildroot] [Bug 14561] New: OpenJDK does not compile when building in WSL Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14561 Bug ID: 14561 Summary: OpenJDK does not compile when building in WSL Product: buildroot Version: 2021.11 Hardware: All OS: Windows Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: colin.foster at in-advantage.com CC: buildroot at uclibc.org Target Milestone: --- Tested in 2021.11. As the summary suggests, when building in WSLv2, OpenJDK fails. If I were to wager a guess, OpenJDK is trying to be too smart about the fact that it is building on a Windows OS. Jumping to a Linux machine and compiling with the same config works as expected. checking for egrep... /usr/bin/grep -E checking for fgrep... /usr/bin/grep -F checking for a sed that does not truncate output... /usr/bin/sed checking for df... /usr/bin/df checking for nice... /usr/bin/nice checking for greadlink... [not found] checking for readlink... /usr/bin/readlink checking for cygpath... [not found] checking for wslpath... /usr/bin/wslpath checking for lsb_release... /usr/bin/lsb_release checking for cmd.exe... /mnt/c/Windows/system32/cmd.exe checking for cmp... /usr/bin/cmp checking for uniq... /usr/bin/uniq checking build system type... x86_64-pc-wsl checking host system type... arm-buildroot-linux-gnueabihf checking target system type... arm-buildroot-linux-gnueabihf checking openjdk-build os-cpu... windows-x86_64 checking openjdk-target os-cpu... linux-arm checking openjdk-target C library... default checking compilation type... cross /home/colin/src/buildroot/output/build/openjdk-17.0.1+12/build/.configure-support/generated-configure.sh: line 34833: import: command not found /home/colin/src/buildroot/output/build/openjdk-17.0.1+12/build/.configure-support/generated-configure.sh: line 34834: verify: command not found configure: error: The path of TOPDIR, which resolves as "/home/colin/src/buildroot/output/build/openjdk-17.0.1+12", could not be imported. configure exiting with result code 1 make: *** [package/pkg-generic.mk:285: /home/colin/src/buildroot/output/build/openjdk-17.0.1+12/.stamp_configured] Error 1 -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Mon Jan 31 18:16:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 11:16:35 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/bpftool: new package Message-ID: <20220131181635.4165602-1-james.hilliard1@gmail.com> Move the target bpftool build out of linux-tools so that it is up to date. This also fixes build issues due to differences between kernel versions. The latest version should be fully backwards compatible. The host bpftool is needed for enabling features such as the systemd bpf-framework(to be added in a future patch). Signed-off-by: James Hilliard --- Changes v1 -> v2: - move target bpftool out of linux-tools into stand-alone build --- Config.in.legacy | 8 ++++ DEVELOPERS | 1 + package/Config.in | 1 + package/bpftool/Config.in | 18 ++++++++ package/bpftool/bpftool.hash | 5 +++ package/bpftool/bpftool.mk | 45 ++++++++++++++++++++ package/linux-tools/linux-tool-bpftool.mk.in | 37 ---------------- 7 files changed, 78 insertions(+), 37 deletions(-) create mode 100644 package/bpftool/Config.in create mode 100644 package/bpftool/bpftool.hash create mode 100644 package/bpftool/bpftool.mk delete mode 100644 package/linux-tools/linux-tool-bpftool.mk.in diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..dce236b3b4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL + bool "bpftool was moved" + select BR2_LEGACY + select BR2_PACKAGE_BPFTOOL + help + The linux-tools bpftool build has been moved out + of the linux-tools package. + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..51b52871ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1282,6 +1282,7 @@ F: configs/pine64_sopine_defconfig N: James Hilliard F: package/apcupsd/ +F: package/bpftool/ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..dbdcc3919b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -86,6 +86,7 @@ menu "Debugging, profiling and benchmark" source "package/babeltrace2/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" + source "package/bpftool/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" source "package/coremark/Config.in" diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in new file mode 100644 index 0000000000..39475aa962 --- /dev/null +++ b/package/bpftool/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_BPFTOOL + bool "bpftool" + depends on !BR2_nios2 # binutils + depends on BR2_USE_WCHAR # binutils, elfutils + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_ELFUTILS + help + bpftool is a tool for for inspection and simple manipulation + of eBPF programs and maps. + +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on !BR2_nios2 + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash new file mode 100644 index 0000000000..c7d4ae250e --- /dev/null +++ b/package/bpftool/bpftool.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk new file mode 100644 index 0000000000..a642759a96 --- /dev/null +++ b/package/bpftool/bpftool.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# bpftool +# +################################################################################ + +BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_SITE = https://github.com/libbpf/bpftool +BPFTOOL_SITE_METHOD = git +BPFTOOL_GIT_SUBMODULES = YES +BPFTOOL_LICENSE = GPL-2.0, BSD-2-Clause +BPFTOOL_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0 +BPFTOOL_DEPENDENCIES = binutils elfutils +HOST_BPFTOOL_DEPENDENCIES = host-elfutils host-pkgconf host-zlib + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +BPFTOOL_DEPENDENCIES += libcap +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +BPFTOOL_DEPENDENCIES += zlib +endif + +define BPFTOOL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define HOST_BPFTOOL_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define BPFTOOL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src DESTDIR="$(TARGET_DIR)" prefix=/usr +endef + +define HOST_BPFTOOL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/linux-tools/linux-tool-bpftool.mk.in b/package/linux-tools/linux-tool-bpftool.mk.in deleted file mode 100644 index 0c4d3693a3..0000000000 --- a/package/linux-tools/linux-tool-bpftool.mk.in +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# bpftool -# -################################################################################ - -LINUX_TOOLS += bpftool - -BPFTOOL_DEPENDENCIES = binutils elfutils - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -BPFTOOL_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BPFTOOL_DEPENDENCIES += zlib -endif - -BPFTOOL_MAKE_OPTS = $(LINUX_MAKE_FLAGS) - -define BPFTOOL_BUILD_CMDS - $(Q)if ! grep install $(LINUX_DIR)/tools/bpf/bpftool/Makefile >/dev/null 2>&1 ; then \ - echo "Your kernel version is too old and does not have install section in the bpf tools." ; \ - echo "At least kernel 4.15 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) -endef - -define BPFTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - install -endef -- 2.25.1 From james.hilliard1 at gmail.com Mon Jan 31 18:22:56 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 11:22:56 -0700 Subject: [Buildroot] [PATCH v3 1/1] package/bpftool: new package Message-ID: <20220131182256.4187299-1-james.hilliard1@gmail.com> Move the target bpftool build out of linux-tools so that it is up to date. This also fixes build issues due to differences between kernel versions. The latest version should be fully backwards compatible. The host bpftool is needed for enabling features such as the systemd bpf-framework(to be added in a future patch). Signed-off-by: James Hilliard --- Changes v2 -> v3: - fix target install Changes v1 -> v2: - move target bpftool out of linux-tools into stand-alone build --- Config.in.legacy | 8 ++++ DEVELOPERS | 1 + package/Config.in | 1 + package/bpftool/Config.in | 18 ++++++++ package/bpftool/bpftool.hash | 5 +++ package/bpftool/bpftool.mk | 45 ++++++++++++++++++++ package/linux-tools/linux-tool-bpftool.mk.in | 37 ---------------- 7 files changed, 78 insertions(+), 37 deletions(-) create mode 100644 package/bpftool/Config.in create mode 100644 package/bpftool/bpftool.hash create mode 100644 package/bpftool/bpftool.mk delete mode 100644 package/linux-tools/linux-tool-bpftool.mk.in diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..dce236b3b4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL + bool "bpftool was moved" + select BR2_LEGACY + select BR2_PACKAGE_BPFTOOL + help + The linux-tools bpftool build has been moved out + of the linux-tools package. + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..51b52871ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1282,6 +1282,7 @@ F: configs/pine64_sopine_defconfig N: James Hilliard F: package/apcupsd/ +F: package/bpftool/ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..dbdcc3919b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -86,6 +86,7 @@ menu "Debugging, profiling and benchmark" source "package/babeltrace2/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" + source "package/bpftool/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" source "package/coremark/Config.in" diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in new file mode 100644 index 0000000000..39475aa962 --- /dev/null +++ b/package/bpftool/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_BPFTOOL + bool "bpftool" + depends on !BR2_nios2 # binutils + depends on BR2_USE_WCHAR # binutils, elfutils + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_ELFUTILS + help + bpftool is a tool for for inspection and simple manipulation + of eBPF programs and maps. + +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on !BR2_nios2 + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash new file mode 100644 index 0000000000..c7d4ae250e --- /dev/null +++ b/package/bpftool/bpftool.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk new file mode 100644 index 0000000000..4276f91958 --- /dev/null +++ b/package/bpftool/bpftool.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# bpftool +# +################################################################################ + +BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_SITE = https://github.com/libbpf/bpftool +BPFTOOL_SITE_METHOD = git +BPFTOOL_GIT_SUBMODULES = YES +BPFTOOL_LICENSE = GPL-2.0, BSD-2-Clause +BPFTOOL_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0 +BPFTOOL_DEPENDENCIES = binutils elfutils +HOST_BPFTOOL_DEPENDENCIES = host-elfutils host-pkgconf host-zlib + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +BPFTOOL_DEPENDENCIES += libcap +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +BPFTOOL_DEPENDENCIES += zlib +endif + +define BPFTOOL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define HOST_BPFTOOL_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define BPFTOOL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(TARGET_DIR)" prefix=/usr +endef + +define HOST_BPFTOOL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/linux-tools/linux-tool-bpftool.mk.in b/package/linux-tools/linux-tool-bpftool.mk.in deleted file mode 100644 index 0c4d3693a3..0000000000 --- a/package/linux-tools/linux-tool-bpftool.mk.in +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# bpftool -# -################################################################################ - -LINUX_TOOLS += bpftool - -BPFTOOL_DEPENDENCIES = binutils elfutils - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -BPFTOOL_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BPFTOOL_DEPENDENCIES += zlib -endif - -BPFTOOL_MAKE_OPTS = $(LINUX_MAKE_FLAGS) - -define BPFTOOL_BUILD_CMDS - $(Q)if ! grep install $(LINUX_DIR)/tools/bpf/bpftool/Makefile >/dev/null 2>&1 ; then \ - echo "Your kernel version is too old and does not have install section in the bpf tools." ; \ - echo "At least kernel 4.15 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) -endef - -define BPFTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - install -endef -- 2.25.1 From fperrad at gmail.com Mon Jan 31 14:58:25 2022 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 31 Jan 2022 15:58:25 +0100 Subject: [Buildroot] [PATCH] package/expat: security bump to 2.4.4 Message-ID: <20220131145825.1206899-1-francois.perrad@gadz.org> fix CVE-2022-23852, CVE-2022-23990 Signed-off-by: Francois Perrad --- package/expat/expat.hash | 6 +++--- package/expat/expat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0853c3c76..312980166 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ -md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz -sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.4/ +md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz +sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz # Locally calculated sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz diff --git a/package/expat/expat.mk b/package/expat/expat.mk index a7ace6609..250600c25 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.3 +EXPAT_VERSION = 2.4.4 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.32.0 From james.hilliard1 at gmail.com Mon Jan 31 18:51:54 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 11:51:54 -0700 Subject: [Buildroot] [PATCH v4 1/1] package/bpftool: new package Message-ID: <20220131185154.26343-1-james.hilliard1@gmail.com> Move the target bpftool build out of linux-tools so that it is up to date. This also fixes build issues due to differences between kernel versions. The latest version should be fully backwards compatible. The host bpftool is needed for enabling features such as the systemd bpf-framework(to be added in a future patch). Signed-off-by: James Hilliard --- Changes v3 -> v4: - remove linux-tools bpftool kconfig entry Changes v2 -> v3: - fix target install Changes v1 -> v2: - move target bpftool out of linux-tools into stand-alone build --- Config.in.legacy | 8 ++++ DEVELOPERS | 1 + package/Config.in | 1 + package/bpftool/Config.in | 18 ++++++++ package/bpftool/bpftool.hash | 5 +++ package/bpftool/bpftool.mk | 45 ++++++++++++++++++++ package/linux-tools/Config.in | 22 ---------- package/linux-tools/linux-tool-bpftool.mk.in | 37 ---------------- 8 files changed, 78 insertions(+), 59 deletions(-) create mode 100644 package/bpftool/Config.in create mode 100644 package/bpftool/bpftool.hash create mode 100644 package/bpftool/bpftool.mk delete mode 100644 package/linux-tools/linux-tool-bpftool.mk.in diff --git a/Config.in.legacy b/Config.in.legacy index 62717463df..dce236b3b4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL + bool "bpftool was moved" + select BR2_LEGACY + select BR2_PACKAGE_BPFTOOL + help + The linux-tools bpftool build has been moved out + of the linux-tools package. + config BR2_PACKAGE_RPI_BT_FIRMWARE bool "rpi-bt-firmware package was renamed" depends on BR2_arm || BR2_aarch64 diff --git a/DEVELOPERS b/DEVELOPERS index a1ec9a091e..51b52871ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1282,6 +1282,7 @@ F: configs/pine64_sopine_defconfig N: James Hilliard F: package/apcupsd/ +F: package/bpftool/ F: package/exfatprogs/ F: package/gensio/ F: package/lua-std-debug/ diff --git a/package/Config.in b/package/Config.in index e4ca195beb..dbdcc3919b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -86,6 +86,7 @@ menu "Debugging, profiling and benchmark" source "package/babeltrace2/Config.in" source "package/blktrace/Config.in" source "package/bonnie/Config.in" + source "package/bpftool/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" source "package/coremark/Config.in" diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in new file mode 100644 index 0000000000..39475aa962 --- /dev/null +++ b/package/bpftool/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_BPFTOOL + bool "bpftool" + depends on !BR2_nios2 # binutils + depends on BR2_USE_WCHAR # binutils, elfutils + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_ELFUTILS + help + bpftool is a tool for for inspection and simple manipulation + of eBPF programs and maps. + +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" + depends on !BR2_nios2 + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash new file mode 100644 index 0000000000..c7d4ae250e --- /dev/null +++ b/package/bpftool/bpftool.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 c868cb85bf44195ec6cd20649c3db4f7aff64a38d950a1c2911d981fb2d7042c bpftool-a7f0e7f057283ae8af3de4578bcb8b7ee80b7144-br1.tar.gz +sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk new file mode 100644 index 0000000000..4276f91958 --- /dev/null +++ b/package/bpftool/bpftool.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# bpftool +# +################################################################################ + +BPFTOOL_VERSION = a7f0e7f057283ae8af3de4578bcb8b7ee80b7144 +BPFTOOL_SITE = https://github.com/libbpf/bpftool +BPFTOOL_SITE_METHOD = git +BPFTOOL_GIT_SUBMODULES = YES +BPFTOOL_LICENSE = GPL-2.0, BSD-2-Clause +BPFTOOL_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0 +BPFTOOL_DEPENDENCIES = binutils elfutils +HOST_BPFTOOL_DEPENDENCIES = host-elfutils host-pkgconf host-zlib + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +BPFTOOL_DEPENDENCIES += libcap +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +BPFTOOL_DEPENDENCIES += zlib +endif + +define BPFTOOL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define HOST_BPFTOOL_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src +endef + +define BPFTOOL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(TARGET_DIR)" prefix=/usr +endef + +define HOST_BPFTOOL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 28641dccdd..f459b41762 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -5,28 +5,6 @@ menu "Linux Kernel Tools" config BR2_PACKAGE_LINUX_TOOLS bool -config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL - bool "bpftool" - depends on !BR2_nios2 # binutils - depends on BR2_USE_WCHAR # binutils, elfutils - depends on !BR2_STATIC_LIBS # elfutils - depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - select BR2_PACKAGE_LINUX_TOOLS - select BR2_PACKAGE_BINUTILS - select BR2_PACKAGE_ELFUTILS - help - bpftool is a tool for for inspection and simple manipulation - of eBPF programs and maps. - - These tools are available only from kernel version 4.15. - -comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" - depends on !BR2_nios2 - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) - config BR2_PACKAGE_LINUX_TOOLS_CPUPOWER bool "cpupower" select BR2_PACKAGE_LINUX_TOOLS diff --git a/package/linux-tools/linux-tool-bpftool.mk.in b/package/linux-tools/linux-tool-bpftool.mk.in deleted file mode 100644 index 0c4d3693a3..0000000000 --- a/package/linux-tools/linux-tool-bpftool.mk.in +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# bpftool -# -################################################################################ - -LINUX_TOOLS += bpftool - -BPFTOOL_DEPENDENCIES = binutils elfutils - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -BPFTOOL_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BPFTOOL_DEPENDENCIES += zlib -endif - -BPFTOOL_MAKE_OPTS = $(LINUX_MAKE_FLAGS) - -define BPFTOOL_BUILD_CMDS - $(Q)if ! grep install $(LINUX_DIR)/tools/bpf/bpftool/Makefile >/dev/null 2>&1 ; then \ - echo "Your kernel version is too old and does not have install section in the bpf tools." ; \ - echo "At least kernel 4.15 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) -endef - -define BPFTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/bpf/bpftool \ - $(BPFTOOL_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - install -endef -- 2.25.1 From aduskett at gmail.com Mon Jan 31 19:31:16 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 31 Jan 2022 11:31:16 -0800 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5webkit: fix build without opengl In-Reply-To: References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> <20220116214955.3231899-2-fontaine.fabrice@gmail.com> Message-ID: Reviewed-by: Adam Duskett Tested-by: Adam Duskett On Fri, Jan 28, 2022 at 4:39 PM James Hilliard wrote: > > On Sun, Jan 16, 2022 at 2:51 PM Fabrice Fontaine > wrote: > > > > Fix the following build failure without opengl raised since bump to > > version 5.212.0-alpha4 in commit > > df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > > > CMake Error at Source/cmake/OptionsQt.cmake:592 (message): > > Qt with OpenGL support is required for ENABLE_OPENGL > > > > WebKit2 unconditionally depends on TextureMapperGL.h and tools builds > > QtTestBrowser which unconditionally depends on QtOpenGL > > > > Fixes: > > - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed > > > > Signed-off-by: Fabrice Fontaine > Reviewed-by: James Hilliard > > --- > > package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > > index 3af1918a46..de3c428fbe 100644 > > --- a/package/qt5/qt5webkit/qt5webkit.mk > > +++ b/package/qt5/qt5webkit/qt5webkit.mk > > @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > > # in the archive. > > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > > > > +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) > > +QT5WEBKIT_CONF_OPTS += \ > > + -DENABLE_OPENGL=ON \ > > + -DENABLE_WEBKIT2=ON > > +else > > +QT5WEBKIT_CONF_OPTS += \ > > + -DENABLE_OPENGL=OFF \ > > + -DENABLE_WEBKIT2=OFF > > +endif > > + > > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > > QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender > > endif > > @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative > > endif > > > > QT5WEBKIT_CONF_OPTS += \ > > + -DENABLE_TOOLS=OFF \ > > -DPORT=Qt \ > > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > > -DUSE_LIBHYPHEN=OFF > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From aduskett at gmail.com Mon Jan 31 19:31:33 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 31 Jan 2022 11:31:33 -0800 Subject: [Buildroot] [PATCH 3/3] package/qt5/qt5webkit: build shared core In-Reply-To: <20220116214955.3231899-3-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> <20220116214955.3231899-3-fontaine.fabrice@gmail.com> Message-ID: Reviewed-by: Adam Duskett Tested-by: Adam Duskett On Sun, Jan 16, 2022 at 1:52 PM Fabrice Fontaine wrote: > > Build JavaScriptCore and WebCore as shared libraries to avoid a build > failure > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webkit/qt5webkit.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index de3c428fbe..565c57e813 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -42,6 +42,7 @@ QT5WEBKIT_CONF_OPTS += \ > -DENABLE_TOOLS=OFF \ > -DPORT=Qt \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ > + -DSHARED_CORE=ON \ > -DUSE_LIBHYPHEN=OFF > > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From aduskett at gmail.com Mon Jan 31 19:32:36 2022 From: aduskett at gmail.com (Adam Duskett) Date: Mon, 31 Jan 2022 11:32:36 -0800 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5webkit: widgets are mandatory In-Reply-To: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Message-ID: Reviewed-by: Adam Duskett Tested-by: Adam Duskett On Sun, Jan 16, 2022 at 1:51 PM Fabrice Fontaine wrote: > > Fix the following build failure raised since bump to version > 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > CMake Error at /home/fabrice/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): > Could not find a package configuration file provided by "Qt5Widgets" with > any of the following names: > > Qt5WidgetsConfig.cmake > qt5widgets-config.cmake > > Add the installation prefix of "Qt5Widgets" to CMAKE_PREFIX_PATH or set > "Qt5Widgets_DIR" to a directory containing one of the above files. If > "Qt5Widgets" provides a separate development package or SDK, be sure it has > been installed. > Call Stack (most recent call first): > Source/cmake/OptionsQt.cmake:646 (find_package) > Source/cmake/WebKitCommon.cmake:51 (include) > CMakeLists.txt:137 (include) > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webkit/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in > index b7beb2b252..68b679dfcd 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -17,6 +17,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_LIBPNG > select BR2_PACKAGE_QT5BASE_ICU > select BR2_PACKAGE_QT5BASE_GUI > + select BR2_PACKAGE_QT5BASE_WIDGETS > select BR2_PACKAGE_QT5LOCATION > select BR2_PACKAGE_QT5SENSORS > select BR2_PACKAGE_QT5WEBCHANNEL > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From geomatsi at gmail.com Mon Jan 31 19:48:17 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 31 Jan 2022 22:48:17 +0300 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump version to 2.10 Message-ID: <20220131194818.2084092-1-geomatsi@gmail.com> Update wpa_supplicant to the latest release v2.10. Drop all the patches as they have already been upstreamed. Remove from .mk file all the WPA_SUPPLICANT_IGNORE_CVES records since those CVEs will not be reported against the new version. Signed-off-by: Sergey Matyukevich --- ...re-management-frame-from-unexpected-.patch | 77 ------------ ...DigestAlgorithmIdentifier-parameters.patch | 116 ------------------ ...dbool.h-to-allow-C99-bool-to-be-used.patch | 32 ----- ...-functions-for-recognizing-tag-value.patch | 37 ------ package/wpa_supplicant/wpa_supplicant.hash | 4 +- package/wpa_supplicant/wpa_supplicant.mk | 14 +-- 6 files changed, 2 insertions(+), 278 deletions(-) delete mode 100644 package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch delete mode 100644 package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch delete mode 100644 package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch delete mode 100644 package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch diff --git a/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch deleted file mode 100644 index 959788c2e9..0000000000 --- a/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: [PATCH] AP: Silently ignore management frame from unexpected source - address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Signed-off-by: Jouni Malinen - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch] ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 31587685fe3b..34ca379edc3d 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28db44b7..e7065372e158 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.20.1 - diff --git a/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch b/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch deleted file mode 100644 index 5dcfed9406..0000000000 --- a/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch +++ /dev/null @@ -1,116 +0,0 @@ -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 18:19:31 +0200 -Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters - -The supported hash algorithms do not use AlgorithmIdentifier parameters. -However, there are implementations that include NULL parameters in -addition to ones that omit the parameters. Previous implementation did -not check the parameters value at all which supported both these cases, -but did not reject any other unexpected information. - -Use strict validation of digest algorithm parameters and reject any -unexpected value when validating a signature. This is needed to prevent -potential forging attacks. - -Signed-off-by: Jouni Malinen -Signed-off-by: Peter Korsgaard ---- - src/tls/pkcs1.c | 21 +++++++++++++++++++++ - src/tls/x509v3.c | 20 ++++++++++++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c -index bbdb0d72d..5761dfed0 100644 ---- a/src/tls/pkcs1.c -+++ b/src/tls/pkcs1.c -@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", -+ hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "PKCS #1: Unexpected digest algorithm parameters"); -+ os_free(decrypted); -+ return -1; -+ } - - if (!asn1_oid_equal(&oid, hash_alg)) { - char txt[100], txt2[100]; -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c -index a8944dd2f..df337ec4d 100644 ---- a/src/tls/x509v3.c -+++ b/src/tls/x509v3.c -@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "X509: Unexpected digest algorithm parameters"); -+ os_free(data); -+ return -1; -+ } - - if (x509_sha1_oid(&oid)) { - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { --- -2.20.1 - diff --git a/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch b/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch deleted file mode 100644 index e52dbdb694..0000000000 --- a/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 99cf89555313056d3a8fa54b21d02dc880b363e1 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 20 Apr 2020 20:29:31 +0300 -Subject: [PATCH] Include stdbool.h to allow C99 bool to be used - -We have practically started requiring some C99 features, so might as -well finally go ahead and bring in the C99 bool as well. - -Signed-off-by: Jouni Malinen -[geomatsi at gmail.com: backport from upstream] -Signed-off-by: Sergey Matyukevich -[yann.morin.1998 at free.fr: keep upstream sha1 in header, drop numbering] -Signed-off-by: Yann E. MORIN ---- - src/utils/includes.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/utils/includes.h b/src/utils/includes.h -index 75513fc8c..741fc9c14 100644 ---- a/src/utils/includes.h -+++ b/src/utils/includes.h -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.25.1 - diff --git a/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch b/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch deleted file mode 100644 index a5415e7daf..0000000000 --- a/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9a990e8c4eb92dd64e0ec483599820e45c35ac23 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 23:14:23 +0200 -Subject: [PATCH] ASN.1: Add helper functions for recognizing tag values - -Signed-off-by: Jouni Malinen -[geomatsi at gmail.com: backport asn1_is_null() from upstream 9a990e8c4eb9] -Signed-off-by: Sergey Matyukevich -[yann.morin.1998 at free.fr: - - reformat, keep the upstream sha1 and title, - - drop numbering -] -Signed-off-by: Yann E. MORIN ---- - src/tls/asn1.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 102 insertions(+) - -diff --git a/src/tls/asn1.h b/src/tls/asn1.h -index de3430adb..a4d1be473 100644 ---- a/src/tls/asn1.h -+++ b/src/tls/asn1.h -@@ -66,6 +66,12 @@ struct wpabuf * asn1_build_alg_id(const struct asn1_oid *oid, - unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); - int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); - -+static inline bool asn1_is_null(const struct asn1_hdr *hdr) -+{ -+ return hdr->class == ASN1_CLASS_UNIVERSAL && -+ hdr->tag == ASN1_TAG_NULL; -+} -+ - extern struct asn1_oid asn1_sha1_oid; - extern struct asn1_oid asn1_sha256_oid; - --- -2.25.1 - diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index 2387391a3c..b442be6ed5 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -1,5 +1,3 @@ # Locally calculated -sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz +sha256 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f wpa_supplicant-2.10.tar.gz sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README -sha256 c4d65cc13863e0237d0644198558e2c47b4ed91e2b2be4516ff590724187c4a5 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch -sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 3c0b0c1dfc..b414144774 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,11 +4,8 @@ # ################################################################################ -WPA_SUPPLICANT_VERSION = 2.9 +WPA_SUPPLICANT_VERSION = 2.10 WPA_SUPPLICANT_SITE = http://w1.fi/releases -WPA_SUPPLICANT_PATCH = \ - https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch \ - https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi @@ -19,15 +16,6 @@ WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) WPA_SUPPLICANT_SELINUX_MODULES = networkmanager -# 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch -WPA_SUPPLICANT_IGNORE_CVES += CVE-2019-16275 - -# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch -WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-27803 - -# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch -WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-30004 - # install the wpa_client library WPA_SUPPLICANT_INSTALL_STAGING = YES -- 2.35.0 From geomatsi at gmail.com Mon Jan 31 19:48:18 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 31 Jan 2022 22:48:18 +0300 Subject: [Buildroot] [PATCH 2/2] package/hostapd: bump version to 2.10 In-Reply-To: <20220131194818.2084092-1-geomatsi@gmail.com> References: <20220131194818.2084092-1-geomatsi@gmail.com> Message-ID: <20220131194818.2084092-2-geomatsi@gmail.com> Update hostapd to the latest release v2.10. Drop all the patches as they have already been upstreamed. Remove from .mk file all the HOSTAPD_IGNORE_CVES records since those CVEs will not be reported against the new version. Signed-off-by: Sergey Matyukevich --- ...re-management-frame-from-unexpected-.patch | 77 ------------ ...DigestAlgorithmIdentifier-parameters.patch | 116 ------------------ ...dbool.h-to-allow-C99-bool-to-be-used.patch | 32 ----- ...-functions-for-recognizing-tag-value.patch | 37 ------ package/hostapd/hostapd.hash | 6 +- package/hostapd/hostapd.mk | 19 +-- 6 files changed, 2 insertions(+), 285 deletions(-) delete mode 100644 package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch delete mode 100644 package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch delete mode 100644 package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch delete mode 100644 package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch diff --git a/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch deleted file mode 100644 index 959788c2e9..0000000000 --- a/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: [PATCH] AP: Silently ignore management frame from unexpected source - address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Signed-off-by: Jouni Malinen - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch] ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 31587685fe3b..34ca379edc3d 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28db44b7..e7065372e158 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.20.1 - diff --git a/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch b/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch deleted file mode 100644 index 5dcfed9406..0000000000 --- a/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch +++ /dev/null @@ -1,116 +0,0 @@ -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 18:19:31 +0200 -Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters - -The supported hash algorithms do not use AlgorithmIdentifier parameters. -However, there are implementations that include NULL parameters in -addition to ones that omit the parameters. Previous implementation did -not check the parameters value at all which supported both these cases, -but did not reject any other unexpected information. - -Use strict validation of digest algorithm parameters and reject any -unexpected value when validating a signature. This is needed to prevent -potential forging attacks. - -Signed-off-by: Jouni Malinen -Signed-off-by: Peter Korsgaard ---- - src/tls/pkcs1.c | 21 +++++++++++++++++++++ - src/tls/x509v3.c | 20 ++++++++++++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c -index bbdb0d72d..5761dfed0 100644 ---- a/src/tls/pkcs1.c -+++ b/src/tls/pkcs1.c -@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", -+ hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "PKCS #1: Unexpected digest algorithm parameters"); -+ os_free(decrypted); -+ return -1; -+ } - - if (!asn1_oid_equal(&oid, hash_alg)) { - char txt[100], txt2[100]; -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c -index a8944dd2f..df337ec4d 100644 ---- a/src/tls/x509v3.c -+++ b/src/tls/x509v3.c -@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "X509: Unexpected digest algorithm parameters"); -+ os_free(data); -+ return -1; -+ } - - if (x509_sha1_oid(&oid)) { - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { --- -2.20.1 - diff --git a/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch b/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch deleted file mode 100644 index e52dbdb694..0000000000 --- a/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 99cf89555313056d3a8fa54b21d02dc880b363e1 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 20 Apr 2020 20:29:31 +0300 -Subject: [PATCH] Include stdbool.h to allow C99 bool to be used - -We have practically started requiring some C99 features, so might as -well finally go ahead and bring in the C99 bool as well. - -Signed-off-by: Jouni Malinen -[geomatsi at gmail.com: backport from upstream] -Signed-off-by: Sergey Matyukevich -[yann.morin.1998 at free.fr: keep upstream sha1 in header, drop numbering] -Signed-off-by: Yann E. MORIN ---- - src/utils/includes.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/utils/includes.h b/src/utils/includes.h -index 75513fc8c..741fc9c14 100644 ---- a/src/utils/includes.h -+++ b/src/utils/includes.h -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.25.1 - diff --git a/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch b/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch deleted file mode 100644 index a5415e7daf..0000000000 --- a/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9a990e8c4eb92dd64e0ec483599820e45c35ac23 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 23:14:23 +0200 -Subject: [PATCH] ASN.1: Add helper functions for recognizing tag values - -Signed-off-by: Jouni Malinen -[geomatsi at gmail.com: backport asn1_is_null() from upstream 9a990e8c4eb9] -Signed-off-by: Sergey Matyukevich -[yann.morin.1998 at free.fr: - - reformat, keep the upstream sha1 and title, - - drop numbering -] -Signed-off-by: Yann E. MORIN ---- - src/tls/asn1.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 102 insertions(+) - -diff --git a/src/tls/asn1.h b/src/tls/asn1.h -index de3430adb..a4d1be473 100644 ---- a/src/tls/asn1.h -+++ b/src/tls/asn1.h -@@ -66,6 +66,12 @@ struct wpabuf * asn1_build_alg_id(const struct asn1_oid *oid, - unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); - int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); - -+static inline bool asn1_is_null(const struct asn1_hdr *hdr) -+{ -+ return hdr->class == ASN1_CLASS_UNIVERSAL && -+ hdr->tag == ASN1_TAG_NULL; -+} -+ - extern struct asn1_oid asn1_sha1_oid; - extern struct asn1_oid asn1_sha256_oid; - --- -2.25.1 - diff --git a/package/hostapd/hostapd.hash b/package/hostapd/hostapd.hash index 9ac5f4b392..f8183d1620 100644 --- a/package/hostapd/hostapd.hash +++ b/package/hostapd/hostapd.hash @@ -1,7 +1,3 @@ # Locally calculated -sha256 881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7 hostapd-2.9.tar.gz -sha256 2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch -sha256 49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch -sha256 a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch -sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch +sha256 206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d hostapd-2.10.tar.gz sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index e988999d3e..075cb2a8d0 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -4,32 +4,15 @@ # ################################################################################ -HOSTAPD_VERSION = 2.9 +HOSTAPD_VERSION = 2.10 HOSTAPD_SITE = http://w1.fi/releases HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config -HOSTAPD_PATCH = \ - https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \ - https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \ - https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \ - https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch HOSTAPD_DEPENDENCIES = host-pkgconf HOSTAPD_CFLAGS = $(TARGET_CFLAGS) HOSTAPD_LICENSE = BSD-3-Clause HOSTAPD_LICENSE_FILES = README -# 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch -HOSTAPD_IGNORE_CVES += CVE-2019-16275 - -# 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch -HOSTAPD_IGNORE_CVES += CVE-2020-12695 - -# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch -HOSTAPD_IGNORE_CVES += CVE-2021-30004 - -# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch -HOSTAPD_IGNORE_CVES += CVE-2021-27803 - HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_SELINUX_MODULES = hostapd HOSTAPD_CONFIG_SET = -- 2.35.0 From arnout at mind.be Mon Jan 31 19:57:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 31 Jan 2022 20:57:16 +0100 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5webkit: widgets are mandatory In-Reply-To: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> References: <20220116214955.3231899-1-fontaine.fabrice@gmail.com> Message-ID: On 16/01/2022 22:49, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version > 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: > > CMake Error at /home/fabrice/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): > Could not find a package configuration file provided by "Qt5Widgets" with > any of the following names: > > Qt5WidgetsConfig.cmake > qt5widgets-config.cmake > > Add the installation prefix of "Qt5Widgets" to CMAKE_PREFIX_PATH or set > "Qt5Widgets_DIR" to a directory containing one of the above files. If > "Qt5Widgets" provides a separate development package or SDK, be sure it has > been installed. > Call Stack (most recent call first): > Source/cmake/OptionsQt.cmake:646 (find_package) > Source/cmake/WebKitCommon.cmake:51 (include) > CMakeLists.txt:137 (include) > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine Series applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5webkit/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in > index b7beb2b252..68b679dfcd 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -17,6 +17,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_LIBPNG > select BR2_PACKAGE_QT5BASE_ICU > select BR2_PACKAGE_QT5BASE_GUI > + select BR2_PACKAGE_QT5BASE_WIDGETS > select BR2_PACKAGE_QT5LOCATION > select BR2_PACKAGE_QT5SENSORS > select BR2_PACKAGE_QT5WEBCHANNEL From arnout at mind.be Mon Jan 31 19:54:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 20:54:41 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: fix build without opengl Message-ID: <20220131195022.9665982821@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea8579141c1af9e3afc08e1d398e5187a67f38cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without opengl raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at Source/cmake/OptionsQt.cmake:592 (message): Qt with OpenGL support is required for ENABLE_OPENGL WebKit2 unconditionally depends on TextureMapperGL.h and tools builds QtTestBrowser which unconditionally depends on QtOpenGL Fixes: - http://autobuild.buildroot.org/results/5604555279f99ba0221dd8d0baf9ab4d7cca3aed Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/qt5webkit.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 3af1918a46..de3c428fbe 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,16 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=ON \ + -DENABLE_WEBKIT2=ON +else +QT5WEBKIT_CONF_OPTS += \ + -DENABLE_OPENGL=OFF \ + -DENABLE_WEBKIT2=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBKIT_DEPENDENCIES += xlib_libXcomposite xlib_libXext xlib_libXrender endif @@ -29,6 +39,7 @@ QT5WEBKIT_DEPENDENCIES += qt5declarative endif QT5WEBKIT_CONF_OPTS += \ + -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DUSE_LIBHYPHEN=OFF From arnout at mind.be Mon Jan 31 19:55:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 20:55:50 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: build shared core Message-ID: <20220131195022.A035982825@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bebeb772eb0b28ab1488ce91bc59a06a573ee6e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Build JavaScriptCore and WebCore as shared libraries to avoid a build failure Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/qt5webkit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index de3c428fbe..565c57e813 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -42,6 +42,7 @@ QT5WEBKIT_CONF_OPTS += \ -DENABLE_TOOLS=OFF \ -DPORT=Qt \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DSHARED_CORE=ON \ -DUSE_LIBHYPHEN=OFF $(eval $(cmake-package)) From arnout at mind.be Mon Jan 31 19:54:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 20:54:10 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: widgets are mandatory Message-ID: <20220131195022.8D3E281376@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2dd01a63004994393ca42c90f99aeaf767a61e9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: CMake Error at /home/fabrice/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): Could not find a package configuration file provided by "Qt5Widgets" with any of the following names: Qt5WidgetsConfig.cmake qt5widgets-config.cmake Add the installation prefix of "Qt5Widgets" to CMAKE_PREFIX_PATH or set "Qt5Widgets_DIR" to a directory containing one of the above files. If "Qt5Widgets" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): Source/cmake/OptionsQt.cmake:646 (find_package) Source/cmake/WebKitCommon.cmake:51 (include) CMakeLists.txt:137 (include) Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index b7beb2b252..68b679dfcd 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5SENSORS select BR2_PACKAGE_QT5WEBCHANNEL From yegorslists at googlemail.com Mon Jan 31 20:14:42 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 31 Jan 2022 21:14:42 +0100 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump version to 2.10 In-Reply-To: <20220131194818.2084092-1-geomatsi@gmail.com> References: <20220131194818.2084092-1-geomatsi@gmail.com> Message-ID: Hi Sergey, On Mon, Jan 31, 2022 at 8:48 PM Sergey Matyukevich wrote: > > Update wpa_supplicant to the latest release v2.10. Drop all the patches > as they have already been upstreamed. Remove from .mk file all the > WPA_SUPPLICANT_IGNORE_CVES records since those CVEs will not be > reported against the new version. > > Signed-off-by: Sergey Matyukevich > --- > ...re-management-frame-from-unexpected-.patch | 77 ------------ > ...DigestAlgorithmIdentifier-parameters.patch | 116 ------------------ > ...dbool.h-to-allow-C99-bool-to-be-used.patch | 32 ----- > ...-functions-for-recognizing-tag-value.patch | 37 ------ > package/wpa_supplicant/wpa_supplicant.hash | 4 +- > package/wpa_supplicant/wpa_supplicant.mk | 14 +-- > 6 files changed, 2 insertions(+), 278 deletions(-) > delete mode 100644 package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch > delete mode 100644 package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch > delete mode 100644 package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch > delete mode 100644 package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch > > diff --git a/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch > deleted file mode 100644 > index 959788c2e9..0000000000 > --- a/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch > +++ /dev/null > @@ -1,77 +0,0 @@ > -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 > -From: Jouni Malinen > -Date: Thu, 29 Aug 2019 11:52:04 +0300 > -Subject: [PATCH] AP: Silently ignore management frame from unexpected source > - address > - > -Do not process any received Management frames with unexpected/invalid SA > -so that we do not add any state for unexpected STA addresses or end up > -sending out frames to unexpected destination. This prevents unexpected > -sequences where an unprotected frame might end up causing the AP to send > -out a response to another device and that other device processing the > -unexpected response. > - > -In particular, this prevents some potential denial of service cases > -where the unexpected response frame from the AP might result in a > -connected station dropping its association. > - > -Signed-off-by: Jouni Malinen > - > -Signed-off-by: Fabrice Fontaine > -[Retrieved from: > -https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch] > ---- > - src/ap/drv_callbacks.c | 13 +++++++++++++ > - src/ap/ieee802_11.c | 12 ++++++++++++ > - 2 files changed, 25 insertions(+) > - > -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c > -index 31587685fe3b..34ca379edc3d 100644 > ---- a/src/ap/drv_callbacks.c > -+++ b/src/ap/drv_callbacks.c > -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, > - "hostapd_notif_assoc: Skip event with no address"); > - return -1; > - } > -+ > -+ if (is_multicast_ether_addr(addr) || > -+ is_zero_ether_addr(addr) || > -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { > -+ /* Do not process any frames with unexpected/invalid SA so that > -+ * we do not add any state for unexpected STA addresses or end > -+ * up sending out frames to unexpected destination. */ > -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR > -+ " in received indication - ignore this indication silently", > -+ __func__, MAC2STR(addr)); > -+ return 0; > -+ } > -+ > - random_add_randomness(addr, ETH_ALEN); > - > - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, > -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c > -index c85a28db44b7..e7065372e158 100644 > ---- a/src/ap/ieee802_11.c > -+++ b/src/ap/ieee802_11.c > -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, > - fc = le_to_host16(mgmt->frame_control); > - stype = WLAN_FC_GET_STYPE(fc); > - > -+ if (is_multicast_ether_addr(mgmt->sa) || > -+ is_zero_ether_addr(mgmt->sa) || > -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { > -+ /* Do not process any frames with unexpected/invalid SA so that > -+ * we do not add any state for unexpected STA addresses or end > -+ * up sending out frames to unexpected destination. */ > -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR > -+ " in received frame - ignore this frame silently", > -+ MAC2STR(mgmt->sa)); > -+ return 0; > -+ } > -+ > - if (stype == WLAN_FC_STYPE_BEACON) { > - handle_beacon(hapd, mgmt, len, fi); > - return 1; > --- > -2.20.1 > - > diff --git a/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch b/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch > deleted file mode 100644 > index 5dcfed9406..0000000000 > --- a/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch > +++ /dev/null > @@ -1,116 +0,0 @@ > -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 > -From: Jouni Malinen > -Date: Sat, 13 Mar 2021 18:19:31 +0200 > -Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters > - > -The supported hash algorithms do not use AlgorithmIdentifier parameters. > -However, there are implementations that include NULL parameters in > -addition to ones that omit the parameters. Previous implementation did > -not check the parameters value at all which supported both these cases, > -but did not reject any other unexpected information. > - > -Use strict validation of digest algorithm parameters and reject any > -unexpected value when validating a signature. This is needed to prevent > -potential forging attacks. > - > -Signed-off-by: Jouni Malinen > -Signed-off-by: Peter Korsgaard > ---- > - src/tls/pkcs1.c | 21 +++++++++++++++++++++ > - src/tls/x509v3.c | 20 ++++++++++++++++++++ > - 2 files changed, 41 insertions(+) > - > -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c > -index bbdb0d72d..5761dfed0 100644 > ---- a/src/tls/pkcs1.c > -+++ b/src/tls/pkcs1.c > -@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, > - os_free(decrypted); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", > -+ hdr.payload, hdr.length); > - > - pos = hdr.payload; > - end = pos + hdr.length; > -@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, > - os_free(decrypted); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", > -+ hdr.payload, hdr.length); > - da_end = hdr.payload + hdr.length; > - > - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { > -@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, > - os_free(decrypted); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", > -+ next, da_end - next); > -+ > -+ /* > -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to > -+ * omit the parameters, but there are implementation that encode these > -+ * as a NULL element. Allow these two cases and reject anything else. > -+ */ > -+ if (da_end > next && > -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || > -+ !asn1_is_null(&hdr) || > -+ hdr.payload + hdr.length != da_end)) { > -+ wpa_printf(MSG_DEBUG, > -+ "PKCS #1: Unexpected digest algorithm parameters"); > -+ os_free(decrypted); > -+ return -1; > -+ } > - > - if (!asn1_oid_equal(&oid, hash_alg)) { > - char txt[100], txt2[100]; > -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c > -index a8944dd2f..df337ec4d 100644 > ---- a/src/tls/x509v3.c > -+++ b/src/tls/x509v3.c > -@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, > - os_free(data); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); > - > - pos = hdr.payload; > - end = pos + hdr.length; > -@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, > - os_free(data); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", > -+ hdr.payload, hdr.length); > - da_end = hdr.payload + hdr.length; > - > - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { > -@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, > - os_free(data); > - return -1; > - } > -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", > -+ next, da_end - next); > -+ > -+ /* > -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to > -+ * omit the parameters, but there are implementation that encode these > -+ * as a NULL element. Allow these two cases and reject anything else. > -+ */ > -+ if (da_end > next && > -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || > -+ !asn1_is_null(&hdr) || > -+ hdr.payload + hdr.length != da_end)) { > -+ wpa_printf(MSG_DEBUG, > -+ "X509: Unexpected digest algorithm parameters"); > -+ os_free(data); > -+ return -1; > -+ } > - > - if (x509_sha1_oid(&oid)) { > - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { > --- > -2.20.1 > - > diff --git a/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch b/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch > deleted file mode 100644 > index e52dbdb694..0000000000 > --- a/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 99cf89555313056d3a8fa54b21d02dc880b363e1 Mon Sep 17 00:00:00 2001 > -From: Jouni Malinen > -Date: Mon, 20 Apr 2020 20:29:31 +0300 > -Subject: [PATCH] Include stdbool.h to allow C99 bool to be used > - > -We have practically started requiring some C99 features, so might as > -well finally go ahead and bring in the C99 bool as well. > - > -Signed-off-by: Jouni Malinen > -[geomatsi at gmail.com: backport from upstream] > -Signed-off-by: Sergey Matyukevich > -[yann.morin.1998 at free.fr: keep upstream sha1 in header, drop numbering] > -Signed-off-by: Yann E. MORIN > ---- > - src/utils/includes.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/utils/includes.h b/src/utils/includes.h > -index 75513fc8c..741fc9c14 100644 > ---- a/src/utils/includes.h > -+++ b/src/utils/includes.h > -@@ -18,6 +18,7 @@ > - > - #include > - #include > -+#include > - #include > - #include > - #include > --- > -2.25.1 > - > diff --git a/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch b/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch > deleted file mode 100644 > index a5415e7daf..0000000000 > --- a/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From 9a990e8c4eb92dd64e0ec483599820e45c35ac23 Mon Sep 17 00:00:00 2001 > -From: Jouni Malinen > -Date: Sat, 13 Mar 2021 23:14:23 +0200 > -Subject: [PATCH] ASN.1: Add helper functions for recognizing tag values > - > -Signed-off-by: Jouni Malinen > -[geomatsi at gmail.com: backport asn1_is_null() from upstream 9a990e8c4eb9] > -Signed-off-by: Sergey Matyukevich > -[yann.morin.1998 at free.fr: > - - reformat, keep the upstream sha1 and title, > - - drop numbering > -] > -Signed-off-by: Yann E. MORIN > ---- > - src/tls/asn1.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ > - 1 file changed, 102 insertions(+) > - > -diff --git a/src/tls/asn1.h b/src/tls/asn1.h > -index de3430adb..a4d1be473 100644 > ---- a/src/tls/asn1.h > -+++ b/src/tls/asn1.h > -@@ -66,6 +66,12 @@ struct wpabuf * asn1_build_alg_id(const struct asn1_oid *oid, > - unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); > - int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); > - > -+static inline bool asn1_is_null(const struct asn1_hdr *hdr) > -+{ > -+ return hdr->class == ASN1_CLASS_UNIVERSAL && > -+ hdr->tag == ASN1_TAG_NULL; > -+} > -+ > - extern struct asn1_oid asn1_sha1_oid; > - extern struct asn1_oid asn1_sha256_oid; > - > --- > -2.25.1 > - > diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash > index 2387391a3c..b442be6ed5 100644 > --- a/package/wpa_supplicant/wpa_supplicant.hash > +++ b/package/wpa_supplicant/wpa_supplicant.hash > @@ -1,5 +1,3 @@ > # Locally calculated > -sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz > +sha256 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f wpa_supplicant-2.10.tar.gz > sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README > -sha256 c4d65cc13863e0237d0644198558e2c47b4ed91e2b2be4516ff590724187c4a5 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch > -sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch > diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk > index 3c0b0c1dfc..b414144774 100644 > --- a/package/wpa_supplicant/wpa_supplicant.mk > +++ b/package/wpa_supplicant/wpa_supplicant.mk > @@ -4,11 +4,8 @@ > # > ################################################################################ > > -WPA_SUPPLICANT_VERSION = 2.9 > +WPA_SUPPLICANT_VERSION = 2.10 > WPA_SUPPLICANT_SITE = http://w1.fi/releases > -WPA_SUPPLICANT_PATCH = \ > - https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch \ > - https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch > WPA_SUPPLICANT_LICENSE = BSD-3-Clause > WPA_SUPPLICANT_LICENSE_FILES = README > WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi > @@ -19,15 +16,6 @@ WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ > WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) > WPA_SUPPLICANT_SELINUX_MODULES = networkmanager > > -# 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch > -WPA_SUPPLICANT_IGNORE_CVES += CVE-2019-16275 > - > -# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch > -WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-27803 > - > -# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch > -WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-30004 > - > # install the wpa_client library > WPA_SUPPLICANT_INSTALL_STAGING = YES Have you tried to build wpa_supplicant without BR2_PACKAGE_WPA_SUPPLICANT_WPA3 and enabled BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING? I've got a linking error. I have also sent a quick and dirty patch to the hostap mailing list [1] but still got no answer. [1] http://lists.infradead.org/pipermail/hostap/2022-January/040181.html Regards, Yegor From ju.o at free.fr Mon Jan 31 20:16:34 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 31 Jan 2022 21:16:34 +0100 Subject: [Buildroot] [PATCH 1/2] package/glslsandbox: kms needs gbm In-Reply-To: <20220130225207.04efc439@windsurf> References: <20220128205201.2798205-1-fontaine.fabrice@gmail.com> <20220130225207.04efc439@windsurf> Message-ID: Hi Thomas, Fabrice, Yann, On 30/01/2022 22:52, Thomas Petazzoni wrote: > Hello Fabrice, > > On Fri, 28 Jan 2022 21:52:00 +0100 > Fabrice Fontaine wrote: > >> diff --git a/package/glslsandbox-player/Config.in >> b/package/glslsandbox-player/Config.in >> index 3aa6049dfb..e36e8d74c8 100644 >> --- a/package/glslsandbox-player/Config.in >> +++ b/package/glslsandbox-player/Config.in >> @@ -70,6 +70,7 @@ choice >> config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS >> bool "KMS/DRM/GBM" >> depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm >> + depends on BR2_PACKAGE_HAS_LIBGBM >> select BR2_PACKAGE_LIBDRM > > So, yes, this is needed, but isn't sufficient. Indeed, now you can > potentially enable glslsandbox-player even if you don't meet the > dependency for at least one of the "Native windowing system" (see the > choice...endchoice in the package Config.in). > > The top-level BR2_PACKAGE_GLSLSANDBOX_PLAYER option is even carrying a > "bogus" depends on BR2_TOOLCHAIN_HAS_THREADS to make sure that at least > the BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS option is available. > > But with your change, this is no longer true, and adding depends on > BR2_PACKAGE_HAS_LIBGBM to the package top-level option doesn't make > sense. > > So I've tried to make sure that glslsandbox-player is only available > when one of the windowing systems dependencies is met, by doing this: > > diff --git a/package/glslsandbox-player/Config.in > b/package/glslsandbox-player/Config.in > index 2d15a7e270..35fe7b3c6a 100644 > --- a/package/glslsandbox-player/Config.in > +++ b/package/glslsandbox-player/Config.in > @@ -1,10 +1,20 @@ > +config BR2_PACKAGE_GLSLSANDBOX_SUPPORTS_WINDOWING_SYSTEM > + bool > + default y if BR2_PACKAGE_SUNXI_MALI_UTGARD > + default y if BR2_PACKAGE_MALI_T76X > + default y if BR2_PACKAGE_RPI_USERLAND > + default y if BR2_PACKAGE_SDL2_OPENGLES > + default y if BR2_PACKAGE_TI_SGX_UM > + default y if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB > + default y if BR2_PACKAGE_WAYLAND > + default y if BR2_PACKAGE_XORG7 > + default y if BR2_TOOLCHAIN_HAS_THREADS > + > config BR2_PACKAGE_GLSLSANDBOX_PLAYER > bool "glslsandbox-player" > depends on BR2_PACKAGE_HAS_LIBEGL > depends on BR2_PACKAGE_HAS_LIBGLES > - # Doesn't really depend on threads, but this makes sure we have > at least > - # one native windowing system available, and is good enough in > practice. > - depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_PACKAGE_GLSLSANDBOX_SUPPORTS_WINDOWING_SYSTEM > help > GLSL Sandbox standalone player allow one to run and render > (most of) nice shaders available online on the > > (this would have been the change *before* your patch). But > unfortunately, this causes Kconfig to goes nuts with a silly recursive > dependency: > > package/python3/Config.in:5:error: recursive dependency detected! > package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by > BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS > package/glslsandbox-player/Config.in:44: symbol > BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS depends on > BR2_PACKAGE_GLSLSANDBOX_PLAYER > package/glslsandbox-player/Config.in:13: symbol > BR2_PACKAGE_GLSLSANDBOX_PLAYER depends on > BR2_PACKAGE_GLSLSANDBOX_SUPPORTS_WINDOWING_SYSTEM > package/glslsandbox-player/Config.in:6: symbol > BR2_PACKAGE_GLSLSANDBOX_SUPPORTS_WINDOWING_SYSTEM depends on > BR2_PACKAGE_SDL2_OPENGLES > package/sdl2/Config.in:54: symbol BR2_PACKAGE_SDL2_OPENGLES depends on > BR2_PACKAGE_SDL2 > package/sdl2/Config.in:1: symbol BR2_PACKAGE_SDL2 is selected by > BR2_PACKAGE_FFMPEG_FFPLAY > package/ffmpeg/Config.in:51: symbol BR2_PACKAGE_FFMPEG_FFPLAY depends > on BR2_PACKAGE_FFMPEG > package/ffmpeg/Config.in:18: symbol BR2_PACKAGE_FFMPEG is selected by > BR2_PACKAGE_KODI > package/kodi/Config.in:51: symbol BR2_PACKAGE_KODI depends on > BR2_PACKAGE_PYTHON3 > > which I have no idea how to resolve :-/ I would like to suggest the following: glslsandbox-player introduced last year a "Null Windowing System", which does not require anything. See: https://github.com/jolivain/glslsandbox-player/blob/v2021.08.24/src/native_gfx_nullws.c Some ancient EGL implementations worked that way (TI SGX, i.MX5 AMD GPU, ...). Basically, this windowing system is always expected to compile. But it will not always work at runtime. (For an "always working" minimal configuration, for testing for example, I would recommend a Mesa3D/GBM/KMS swrast/llvmpipe relying on Kernel DRM VKMS). This NullWS could be the fallback needed which is needed here. The "bogus" BR2_TOOLCHAIN_HAS_THREADS dependency could also be removed. What do you think about that approach? If you agree, I can send a patch for adding this NullWS. After that, I think this patch proposed by Fabrice can be applied as is. Best regards, Julien. > Thomas From joerg.krause at embedded.rocks Mon Jan 31 20:21:51 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Mon, 31 Jan 2022 20:21:51 +0000 Subject: [Buildroot] [PATCH 1/1] linux: build after wireless-regdb if enabled for early loading support Message-ID: <20220131202151.937124-1-joerg.krause@embedded.rocks> To support building in the wireless regulatory database files (regulatory.db*) into the kernel using the CONFIG_EXTRA_FIRMWARE option, we need to ensure that the database files are installed before the Linux kernel is built. Signed-off-by: J?rg Krause --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index dd2eebd446..ffe0606930 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -72,7 +72,8 @@ LINUX_MAKE_ENV = \ LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod \ $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ - $(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware) + $(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware) \ + $(if $(BR2_PACKAGE_WIRELESS_REGDB),wireless-regdb) # Starting with 4.16, the generated kconfig paser code is no longer # shipped with the kernel sources, so we need flex and bison, but -- 2.35.1 From arnout at mind.be Mon Jan 31 20:38:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 31 Jan 2022 21:38:08 +0100 Subject: [Buildroot] [PATCHv2 1/2] utils/size-stats-compare: clarify meaning of variables in print_result In-Reply-To: <20210303150451.7963-1-patrickdepinguin@gmail.com> References: <20210303150451.7963-1-patrickdepinguin@gmail.com> Message-ID: <527fd8d5-6c7e-aa10-06ba-e634ba3c600d@mind.be> On 03/03/2021 16:04, Thomas De Schampheleire wrote: > From: Thomas De Schampheleire > > print_result is juggling with entry[x][y] which is not very readable. > While a better solution would be to use a class and reference named > attributes, that would require some bigger changes in the script. > > Instead, make a minimal improvement by assigning the entry[x][y] values to > intermediate variables. Store them in a dict for easy usage from a format > string. > > Signed-off-by: Thomas De Schampheleire Series applied to master, thanks. It's a bit silly that this has to take a year, but it is what it is... Regards, Arnout > --- > v2: new patch > > utils/size-stats-compare | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/utils/size-stats-compare b/utils/size-stats-compare > index a3d7f250c6..de67b72587 100755 > --- a/utils/size-stats-compare > +++ b/utils/size-stats-compare > @@ -77,9 +77,16 @@ def print_results(result, threshold): > # list_result is a list of tuples: (name, (flag, size difference)) > > for entry in sorted(list_result, key=lambda entry: entry[1][1]): > - if threshold is not None and abs(entry[1][1]) <= threshold: > + > + data = dict( > + name=entry[0], > + action=entry[1][0], > + size=entry[1][1], > + ) > + > + if threshold is not None and abs(data['size']) <= threshold: > continue > - print('%12s %7s %s' % (entry[1][1], entry[1][0], entry[0])) > + print('{size:12d} {action:7s} {name}'.format(**data)) > > > # main ######################################################################### From arnout at mind.be Mon Jan 31 20:24:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 21:24:40 +0100 Subject: [Buildroot] [git commit] utils/size-stats-compare: clarify meaning of variables in print_result Message-ID: <20220131203116.0291E825D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9b1dffa5d17c7af5d6171de88348431a6260308 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master print_result is juggling with entry[x][y] which is not very readable. While a better solution would be to use a class and reference named attributes, that would require some bigger changes in the script. Instead, make a minimal improvement by assigning the entry[x][y] values to intermediate variables. Store them in a dict for easy usage from a format string. Signed-off-by: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/size-stats-compare | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/size-stats-compare b/utils/size-stats-compare index 422972e488..c679150654 100755 --- a/utils/size-stats-compare +++ b/utils/size-stats-compare @@ -77,9 +77,15 @@ def print_results(result, threshold): # list_result is a list of tuples: (name, (flag, size difference)) for entry in sorted(list_result, key=lambda entry: entry[1][1]): - if threshold is not None and abs(entry[1][1]) <= threshold: + data = dict( + name=entry[0], + action=entry[1][0], + size=entry[1][1], + ) + + if threshold is not None and abs(data['size']) <= threshold: continue - print('%12s %7s %s' % (entry[1][1], entry[1][0], entry[0])) + print('{size:12d} {action:7s} {name}'.format(**data)) # main ######################################################################### From arnout at mind.be Mon Jan 31 20:32:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 21:32:22 +0100 Subject: [Buildroot] [git commit] utils/size-stats-compare: add package name in detail output Message-ID: <20220131203116.0BEB382826@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=391f70b6893e0b502b69f40c69df412f24519060 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master size-stats-compare gives an overview of the size increase/decrease between two cases, based on packages-file-list.txt. The 'detail' mode gives info per file, otherwise per package. But sometimes, you want the detailed per-file info, but only for a specific package. Since the detailed output no longer lists the package name, you cannot simply grep for it. A workaround was to filter the input packages-file-list.txt's first, and then pass these filtered versions to size-stats-compare. Make this easier by adding the package name next to the filename in detailed output. This allows grep'ing normally. For example: $ utils/size-stats-compare orig new -t 100 -d | grep ebtables -67712 removed ebtables lib/ebtables/libebtc.so -66764 removed ebtables lib/ebtables/libebt_nat.so -66752 removed ebtables sbin/ebtables -66704 removed ebtables lib/ebtables/libebt_arp.so -66700 removed ebtables lib/ebtables/libebt_stp.so -66700 removed ebtables lib/ebtables/libebt_among.so -66684 removed ebtables lib/ebtables/libebt_ip.so -66676 removed ebtables lib/ebtables/libebt_limit.so -66656 removed ebtables lib/ebtables/libebt_log.so -66648 removed ebtables lib/ebtables/libebt_mark.so -66636 removed ebtables lib/ebtables/libebt_pkttype.so -66604 removed ebtables lib/ebtables/libebt_vlan.so -66588 removed ebtables lib/ebtables/libebt_ulog.so -66588 removed ebtables lib/ebtables/libebt_nflog.so -66584 removed ebtables lib/ebtables/libebt_arpreply.so -66544 removed ebtables lib/ebtables/libebt_ip6.so -66540 removed ebtables lib/ebtables/libebt_802_3.so -66536 removed ebtables lib/ebtables/libebt_standard.so -66524 removed ebtables lib/ebtables/libebt_mark_m.so -66524 removed ebtables lib/ebtables/libebt_redirect.so -66452 removed ebtables lib/ebtables/libebtable_filter.so -66452 removed ebtables lib/ebtables/libebtable_broute.so -66452 removed ebtables lib/ebtables/libebtable_nat.so 45 ebtables etc/ethertypes 66752 added ebtables usr/sbin/ebtablesd 66752 added ebtables usr/sbin/ebtables-legacy 66752 added ebtables usr/sbin/ebtablesu 200840 added ebtables usr/lib/libebtc.so.0.0.0 Signed-off-by: Thomas De Schampheleire --- utils/size-stats-compare | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/utils/size-stats-compare b/utils/size-stats-compare index c679150654..2ccbe7d191 100755 --- a/utils/size-stats-compare +++ b/utils/size-stats-compare @@ -40,9 +40,9 @@ def read_file_size_csv(inputf, detail=None): for row in reader: if detail: - sizes[row[0]] = int(row[2]) + sizes[(row[0], row[1])] = int(row[2]) else: - sizes[row[1]] = int(row[3]) + sizes[(None, row[1])] = int(row[3]) return sizes @@ -73,19 +73,27 @@ def print_results(result, threshold): from six import iteritems list_result = list(iteritems(result)) - # result is a dictionary: name -> (flag, size difference) - # list_result is a list of tuples: (name, (flag, size difference)) + # result is a dictionary: (filename, pkgname) -> (flag, size difference) + # list_result is a list of tuples: ((filename, pkgname), (flag, size difference)) + # filename may be None if no detail is requested. + + maxpkgname=max(len(pkgname) for filename, pkgname in result) for entry in sorted(list_result, key=lambda entry: entry[1][1]): data = dict( - name=entry[0], + filename=entry[0][0], + pkgname=entry[0][1], action=entry[1][0], size=entry[1][1], + maxpkgname=maxpkgname, ) if threshold is not None and abs(data['size']) <= threshold: continue - print('{size:12d} {action:7s} {name}'.format(**data)) + if data['filename']: + print('{size:12d} {action:7s} {pkgname:{maxpkgname}s} {filename}'.format(**data)) + else: + print('{size:12d} {action:7s} {pkgname}'.format(**data)) # main ######################################################################### @@ -132,5 +140,5 @@ print('Size difference per %s (bytes), threshold = %s' % (keyword, args.threshol print(80*'-') print_results(delta, args.threshold) print(80*'-') -print_results({'TOTAL': ('', sum(new_sizes.values()) - sum(old_sizes.values()))}, +print_results({(None, 'TOTAL'): ('', sum(new_sizes.values()) - sum(old_sizes.values()))}, threshold=None) From geomatsi at gmail.com Mon Jan 31 20:38:36 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Mon, 31 Jan 2022 23:38:36 +0300 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump version to 2.10 In-Reply-To: References: <20220131194818.2084092-1-geomatsi@gmail.com> Message-ID: Hello Yegor, > Hi Sergey, > > On Mon, Jan 31, 2022 at 8:48 PM Sergey Matyukevich wrote: > > > > Update wpa_supplicant to the latest release v2.10. Drop all the patches > > as they have already been upstreamed. Remove from .mk file all the > > WPA_SUPPLICANT_IGNORE_CVES records since those CVEs will not be > > reported against the new version. > > > > Signed-off-by: Sergey Matyukevich ... > Have you tried to build wpa_supplicant without > BR2_PACKAGE_WPA_SUPPLICANT_WPA3 and enabled > BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING? I've got a linking error. > I have also sent a quick and dirty patch to the hostap mailing list > [1] but still got no answer. > > [1] http://lists.infradead.org/pipermail/hostap/2022-January/040181.html So far I have not observed that problem. I think we can handle it independently from the revision update, adding fixup patches if needed. I tried to reproduce it using the following wpa_supplicant configuration: BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y However build succeeded. Could you please post your wpa_supplicant configuration snippet ? Probably the root cause is in openssl and some of its features need to be enabled in package/wpa_supplicant/Config.in. Regards, Sergey From arnout at mind.be Mon Jan 31 20:54:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 31 Jan 2022 21:54:08 +0100 Subject: [Buildroot] [PATCH 2/3] utils/test-pkg: add ability to fail when skipped In-Reply-To: <20220101210857.GA69135@scaer> References: <20211201230827.35080-1-matthew.weber@collins.com> <20211201230827.35080-2-matthew.weber@collins.com> <20220101210857.GA69135@scaer> Message-ID: On 01/01/2022 22:08, Yann E. MORIN wrote: > Matthew, All, > > On 2021-12-01 17:08 -0600, Matthew Weber via buildroot spake thusly: >> Add flag to allow the return value to be incremented when a skip >> happens, treating the overall run as a failure. >> >> This flag could be used when using test-pkg for local validation of >> downstream packages, for example in a user's br2-external. An example of >> this could be a user choosing to use test-pkg as part of a CI >> infrastructure where the fragment and toolchains are tightly controlled >> to test a package against multiple toolchains easily. >> >> In this case, the user would want to lower the rate of false-positives >> of that fragment/toolchain configuration if a build is instead skipped >> (which may happen in the case of buildroot version bumps where >> dependencies could change). > > I am a bit skeptical about this use-case. > > As I understand it, wht is most interesting in a CI setup for internal > development, is that *all* internal packages do build togetrher and form > a working sysem *as a whole*. > > As such, a CI setup would build the defconfig file(s) for a project (and > run the integration test-suite), rather than build each package > individually I don't think the intention is necessarily to build each package individually. Although it actually does make a whole lot of sense to do that, because it helps to check if the dependencies are set correctly. So, the obvious way to take the approach that Yann proposes is to have a list of defconfigs that enable all the packages in the external with the various toolchains. However, that still doesn't solve the issue that Matt faces, because any package can silently disappear from the config if its dependencies are no longer met. But indeed, it would make a *whole* lot of sense to add a check to %_defconfig that everything in the defconfig still appears in the generated .config file. If it doesn't, there is something really wrong... So yeah, I tend to agree that this is not the approach we should have upstream. Note that in CI it's very easy to check the output of test-pkg and search for SKIPPED lines. So it's not that this feature is really *needed* to land upstream. Therefore, I've marked the series as Rejected. As always, you're welcome to argue why we should include it after all. Regards, Arnout > > Building each package individually with test-pkg would have the > disadvantage that it takes more time overall, as all the common deps are > build as many times as there are packages to test, and package are also > dependencies one of the others, so most packages would be built more > than once as well... > > So, I am really not convinced... > > Regards, > Yann E. MORIN. > >> Signed-off-by: Matthew Weber >> --- >> utils/test-pkg | 18 +++++++++++++++--- >> 1 file changed, 15 insertions(+), 3 deletions(-) >> >> diff --git a/utils/test-pkg b/utils/test-pkg >> index d0472f176b..97957008fa 100755 >> --- a/utils/test-pkg >> +++ b/utils/test-pkg >> @@ -18,8 +18,8 @@ main() { >> local -a toolchains >> local pkg_br_name >> >> - o='hakc:d:n:p:r:t:e:' >> - O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,' >> + o='hakc:d:n:p:r:t:e:f' >> + O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,externals:,fail-on-skip' >> opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" >> eval set -- "${opts}" >> >> @@ -29,6 +29,7 @@ main() { >> number=0 >> mode=0 >> prepare_only=0 >> + fail_on_skip=0 >> toolchains_csv="${TOOLCHAINS_CSV}" >> while [ ${#} -gt 0 ]; do >> case "${1}" in >> @@ -65,6 +66,9 @@ main() { >> (-e|--externals) >> BR2_EXTERNALS="${2}"; shift 2 >> ;; >> + (-f|--fail-on-skip) >> + fail_on_skip=1; shift 1 >> + ;; >> (--) >> shift; break >> ;; >> @@ -147,7 +151,12 @@ main() { >> printf "%d builds, %d skipped, %d build failed, %d legal-info failed\n" \ >> ${nb} ${nb_skip} ${nb_fail} ${nb_legal} >> >> - return $((nb_fail + nb_legal)) >> + nb_result=$((nb_fail + nb_legal)) >> + if [ ${fail_on_skip} ]; then >> + nb_result=$((nb_result + nb_skip)) >> + fi >> + >> + return $nb_result >> } >> >> build_one() { >> @@ -279,6 +288,9 @@ Options: >> Externals to be used as part of the build process. Packages from >> within these externals may be tested. >> >> + -f, --fail-on-skip >> + If any builds are skipped, return a negative exit value. >> + >> Example: >> >> Testing libcec would require a config snippet that contains: >> -- >> 2.17.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From geomatsi at gmail.com Mon Jan 31 21:24:55 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 00:24:55 +0300 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update Message-ID: <20220131212456.3176156-1-geomatsi@gmail.com> ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type To fix the first genimage error report, change 'partition-type' entries to the appropriate 'partition-type-uuid'. Then genimage starts to complain about overlaps: ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000) ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. To fix the second genimage error report, update the size of bootloader file. Do not reserve additional space for GPT partition table since new genimage is able to keep track of it. Signed-off-by: Sergey Matyukevich --- board/orangepi/orangepi-zero-plus2/genimage.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index aee9719ae4..5a7ee7707a 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -22,11 +22,11 @@ image sdcard.img { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8K - size = 1032K # 1MB - 8KB + 16KB(GPT) + size = 1016K # 1MB - 8KB } partition boot { - partition-type = 0xC + partition-type-uuid = "F" bootable = "true" image = "boot.vfat" } @@ -34,7 +34,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type = 0x83 + partition-type-uuid = "L" image = "rootfs.ext4" size = 256M } -- 2.35.0 From geomatsi at gmail.com Mon Jan 31 21:24:56 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Tue, 1 Feb 2022 00:24:56 +0300 Subject: [Buildroot] [PATCH 2/2] configs/orangepi_zero_plus2: BSP update In-Reply-To: <20220131212456.3176156-1-geomatsi@gmail.com> References: <20220131212456.3176156-1-geomatsi@gmail.com> Message-ID: <20220131212456.3176156-2-geomatsi@gmail.com> Bump Linux kernel to 5.16.1 and U-Boot to 2022.01. Select option BR2_TARGET_UBOOT_NEEDS_OPENSSL since U-Boot requires openssl. Root filesystem does not fit into default 60M anymore, so increase its size. Signed-off-by: Sergey Matyukevich --- configs/orangepi_zero_plus2_defconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index da2d3b4178..9d88b37ac9 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y @@ -33,7 +34,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" @@ -56,6 +57,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -- 2.35.0 From luca at lucaceresoli.net Mon Jan 31 21:31:42 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Mon, 31 Jan 2022 22:31:42 +0100 Subject: [Buildroot] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 In-Reply-To: References: Message-ID: Hi Neal, On 31/01/22 18:30, Neal Frager wrote: > Changes included with this patch: > 1. Removing ATF and U-Boot patches which are no longer necessary since they are in mainline. > 2. Using Xilinx github for ATF, U-Boot and Linux as there are updates which may not yet be in mainline. > 3. Adding a zynqmp_zcu102_defconfig. > > Signed-off-by: Neal Frager Thank you for your contribution. I appreciate it very much! Please don't point to my luca/next branch for the pmufw download URL, but use the tag I pushed to master a few hours ago. This is the URL: https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin More comments will be made easier after you send the patch inline as Giulio already asked. > This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. This sort of message is generally considered incompatible with submission to open source projects, and in some mailing lists is causes messages to be deleted and ignored. Maybe the Buildroot community is not so picky, but it would be nice if you could remove it. -- Luca From yegorslists at googlemail.com Mon Jan 31 21:32:45 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 31 Jan 2022 22:32:45 +0100 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump version to 2.10 In-Reply-To: References: <20220131194818.2084092-1-geomatsi@gmail.com> Message-ID: On Mon, Jan 31, 2022 at 9:38 PM Sergey Matyukevich wrote: > > Hello Yegor, > > > Hi Sergey, > > > > On Mon, Jan 31, 2022 at 8:48 PM Sergey Matyukevich wrote: > > > > > > Update wpa_supplicant to the latest release v2.10. Drop all the patches > > > as they have already been upstreamed. Remove from .mk file all the > > > WPA_SUPPLICANT_IGNORE_CVES records since those CVEs will not be > > > reported against the new version. > > > > > > Signed-off-by: Sergey Matyukevich > > ... > > > Have you tried to build wpa_supplicant without > > BR2_PACKAGE_WPA_SUPPLICANT_WPA3 and enabled > > BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING? I've got a linking error. > > I have also sent a quick and dirty patch to the hostap mailing list > > [1] but still got no answer. > > > > [1] http://lists.infradead.org/pipermail/hostap/2022-January/040181.html > > So far I have not observed that problem. I think we can handle it > independently from the revision update, adding fixup patches if needed. > > I tried to reproduce it using the following wpa_supplicant configuration: > > BR2_PACKAGE_WPA_SUPPLICANT=y > BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y > BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y > > However build succeeded. Could you please post your wpa_supplicant > configuration snippet ? Probably the root cause is in openssl and some > of its features need to be enabled in package/wpa_supplicant/Config.in. I have pinned it down: BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y BR2_PACKAGE_WPA_SUPPLICANT_EAP=y It is BR2_PACKAGE_WPA_SUPPLICANT_EAP option the selects NEED_SHA384. Regards, Yegor From yann.morin.1998 at free.fr Mon Jan 31 21:38:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 31 Jan 2022 22:38:06 +0100 Subject: [Buildroot] [PATCH 0/2 v2] linux|uboot: fix build with host-gcc 10+ for older versions (branch yem/yylloc) Message-ID: Hello All! This two-patch series aims at side-stepping the multiple symbol declaration in older Linux and U-Boot, where the infamous yylloc is defined more than once. Like we have a fix for the perl timeconst issue in linux, do s similar tweak for yylloc in the two packages known to be affected, Linux and U-Boot. Here is a pipeline with all the defconfig builds: https://gitlab.com/ymorin/buildroot/-/pipelines/460207930 There are still some failures, but none relate to the yylloc issue: - too long build time or not space left on device (I am only using elastic runners) - defconfig not up-to-date (e.g. using kernel headers version since removed) - missing host dependencies for kernel (openssl, libelf) or uboot (python) - another host-gcc 10+ symbol redefinition issue (galileo [0]) - make 4.3 issues. For example: amarula_a64_relic_defconfig https://gitlab.com/ymorin/buildroot/-/jobs/2035820886 DTC arch/arm/dts/sun50i-a64-amarula-relic.dtb Error: arch/arm/dts/.sun50i-a64-amarula-relic.dtb.pre.tmp:66.1-10 syntax error FATAL ERROR: Unable to parse input tree This is caused by make 4.3 that no longer treats '#' as special in macros, and shall no longer be escaped: https://lwn.net/Articles/810071/ This causes '\#include "something"' to be injected as-is at the end of the temporary DTS, and of course, dtc does not cope nicely with that... [1] Unfortuantely, I don't think we can do a generic fixup for that one... - some other issues (e.g. deprecated 'partition-type' for geniamge..) [0] this was fixed in 2014 in the kernel: - eeeda4cd06e828b331b15741a204ff9f5874d28d [1] this was fixed in 2018 in uboot: - e5e701c2b8470de044c5c71d2a54ecfc72680d59 - 0c544115379ed77c1843a194e26960e5b8f3d369 Changes v1 -> v2: - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout) - extend cover-ltter with a pipeline reference and analysese of remaining build failures Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (2): boot/uboot: fix build with host-gcc 10+ linux: fix build with host-gcc 10+ boot/uboot/uboot.mk | 7 +++++++ linux/linux.mk | 7 +++++++ 2 files changed, 14 insertions(+) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Jan 31 21:38:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 31 Jan 2022 22:38:08 +0100 Subject: [Buildroot] [PATCH 1/2 v2] boot/uboot: fix build with host-gcc 10+ In-Reply-To: References: Message-ID: <79dd83642a7b1964ed69d74c4b0f93eada940a4e.1643665029.git.yann.morin.1998@free.fr> Some older versions of U-Boot, or custom versions (like forks for some boards), fail to build with host-gcc 10+, because of redefined symbols: HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status make[4]: *** [scripts/Makefile.host:106: scripts/dtc/dtc] E Since this has been fixed in recent-ish versions, we can't use an unconditionaly patch, so we must have a conditional patch. However, a patch may not always apply to arbitrary U-Boot versions or forks. Upstream just dropped that line altogether: https://source.denx.de/u-boot/u-boot/-/commit/018921ee79d3f30893614b3b2b63b588d8544f73 So, we use a little sed-grep combo to do the exact same change. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v2: - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout) --- boot/uboot/uboot.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 574fc7089a..21db1d9d60 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -244,6 +244,13 @@ endef UBOOT_POST_EXTRACT_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE UBOOT_POST_RSYNC_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE +# Older versions break on gcc 10+ because of redefined symbols +define UBOOT_DROP_YYLLOC + $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ + |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' +endef +UBOOT_POST_PATCH_HOOKS += UBOOT_DROP_YYLLOC + ifneq ($(ARCH_XTENSA_OVERLAY_FILE),) define UBOOT_XTENSA_OVERLAY_EXTRACT $(call arch-xtensa-overlay-extract,$(@D),u-boot) -- 2.25.1 From yann.morin.1998 at free.fr Mon Jan 31 21:38:09 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 31 Jan 2022 22:38:09 +0100 Subject: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+ In-Reply-To: References: Message-ID: Some older versions of linux, or custom versions (like forks for some boards), fail to build with host-gcc 10+, because of redefined symbols: HOSTLD scripts/dtc/dtc /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status Since this has been fixed in recent-ish versions, we can't use an unconditionaly patch, so we must have a conditional patch. However, a patch may not always apply to arbitrary U-Boot versions or forks. Upstream just dropped that line altogether: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e33a814e772cdc36436c8c188d8c42d019fda639 So, we use a little sed-grep combo to do the exact same change. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v2: - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout) --- linux/linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index dd2eebd446..410b714360 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -268,6 +268,13 @@ endef LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES +# Older versions break on gcc 10+ because of redefined symbols +define LINUX_DROP_YYLLOC + $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ + |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' +endef +LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC + # Older linux kernels use deprecated perl constructs in timeconst.pl # that were removed for perl 5.22+ so it breaks on newer distributions # Try a dry-run patch to see if this applies, if it does go ahead -- 2.25.1 From fontaine.fabrice at gmail.com Mon Jan 31 22:02:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 31 Jan 2022 23:02:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/cgilua: add CGILUA_CPE_ID_VENDOR Message-ID: <20220131220240.127249-1-fontaine.fabrice@gmail.com> cpe:2.3:a:keplerproject:cgilua is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Akeplerproject%3Acgilua Signed-off-by: Fabrice Fontaine --- package/cgilua/cgilua.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk index 7471be3da0..8061eaf3a6 100644 --- a/package/cgilua/cgilua.mk +++ b/package/cgilua/cgilua.mk @@ -8,5 +8,6 @@ CGILUA_VERSION = 6.0.2-0 CGILUA_SUBDIR = cgilua CGILUA_LICENSE = MIT CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html +CGILUA_CPE_ID_VENDOR = keplerproject $(eval $(luarocks-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Mon Jan 31 22:08:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 31 Jan 2022 23:08:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: needs MMU Message-ID: <20220131220841.127708-1-fontaine.fabrice@gmail.com> libuhttpd needs MMU since version 3.13.0 and https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840 to avoid the following build failure raised since commit 61797c52f5deef2cb67e60cf075ca243078c8855: /home/buildroot/autobuild/instance-0/output-1/build/libuhttpd-3.14.1/src/cgi.c: In function 'create_cgi': /home/buildroot/autobuild/instance-0/output-1/build/libuhttpd-3.14.1/src/cgi.c:321:11: error: implicit declaration of function 'fork' [-Werror=implicit-function-declaration] 321 | pid = fork(); | ^~~~ Fixes: - http://autobuild.buildroot.org/results/8d2a79dacf9ac423f7ece51b8c23f3683238312b Signed-off-by: Fabrice Fontaine --- package/libuhttpd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index 9159341d89..52bbd313bc 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBUHTTPD bool "libuhttpd" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBEV select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL help -- 2.34.1 From ps.report at gmx.net Mon Jan 31 22:10:43 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 31 Jan 2022 23:10:43 +0100 Subject: [Buildroot] [PATCH 2/2 v2] linux: fix build with host-gcc 10+ In-Reply-To: References: Message-ID: <20220131231043.615b992b@gmx.net> Hello Yann, one nitpick... On Mon, 31 Jan 2022 22:38:09 +0100, "Yann E. MORIN" wrote: > Some older versions of linux, or custom versions (like forks for some > boards), fail to build with host-gcc 10+, because of redefined symbols: > > HOSTLD scripts/dtc/dtc > /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition > of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here > collect2: error: ld returned 1 exit status > > Since this has been fixed in recent-ish versions, we can't use an > unconditionaly patch, so we must have a conditional patch. However, a > patch may not always apply to arbitrary U-Boot versions or forks. s/U-Boot/Linux kernel/ Regards, Peter > > Upstream just dropped that line altogether: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e33a814e772cdc36436c8c188d8c42d019fda639 > > So, we use a little sed-grep combo to do the exact same change. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Arnout Vandecappelle (Essensium/Mind) > > --- > Changes v1 -> v2: > - don't fail if no file to fix: use 'grep -Z |xargs -0 -r' (Arnout) > --- > linux/linux.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/linux/linux.mk b/linux/linux.mk > index dd2eebd446..410b714360 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -268,6 +268,13 @@ endef > > LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES > > +# Older versions break on gcc 10+ because of redefined symbols > +define LINUX_DROP_YYLLOC > + $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ > + |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' > +endef > +LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC > + > # Older linux kernels use deprecated perl constructs in timeconst.pl > # that were removed for perl 5.22+ so it breaks on newer distributions > # Try a dry-run patch to see if this applies, if it does go ahead From ps.report at gmx.net Mon Jan 31 22:30:24 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 31 Jan 2022 23:30:24 +0100 Subject: [Buildroot] [PATCH v1] package/qt5base: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220131223024.22386-1-ps.report@gmx.net> - depend and link against libexecinfo if enabled to fix linking failure in case execinfo.h is detected for qlogging: qt5base-5.15.2/src/corelib/global/qlogging.cpp:110 - __has_include() - libexecinfo already depends on !BR2_TOOLCHAIN_USES_GLIBC - rename plain QT5BASE_CONFIGURE_ARCH_CONFIG to QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC Fixes: - http://autobuild.buildroot.net/results/e7c685744b1f1bebb7fec9835bda534a72b7b7c2 .../riscv64-buildroot-linux-musl/bin/ld: .../build/qt5base-5.15.2/src/corelib/global/qlogging.cpp:1398: undefined reference to `backtrace_symbols' Signed-off-by: Peter Seiderer --- package/qt5/qt5base/qt5base.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4ef3759566..59c423c49c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -234,6 +234,14 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples +# see qt5base-5.15.2/src/corelib/global/qlogging.cpp:110 - __has_include() +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +QT5BASE_DEPENDENCIES += libexecinfo +define QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO + printf '!host_build { \n LIBS += -lexecinfo\n }' >$(QT5BASE_ARCH_CONFIG_FILE) +endef +endif + ifeq ($(BR2_PACKAGE_LIBINPUT),y) QT5BASE_CONFIGURE_OPTS += -libinput QT5BASE_DEPENDENCIES += libinput @@ -282,7 +290,7 @@ endif QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) # Qt 5.8 needs atomics, which on various architectures are in -latomic -define QT5BASE_CONFIGURE_ARCH_CONFIG +define QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC printf '!host_build { \n LIBS += -latomic\n }' >$(QT5BASE_ARCH_CONFIG_FILE) endef endif @@ -305,7 +313,8 @@ define QT5BASE_CONFIGURE_CMDS $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h $(QT5BASE_CONFIGURE_CONFIG_FILE) touch $(QT5BASE_ARCH_CONFIG_FILE) - $(QT5BASE_CONFIGURE_ARCH_CONFIG) + $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC) + $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO) $(QT5BASE_CONFIGURE_HOSTCC) (cd $(@D); \ $(TARGET_MAKE_ENV) \ -- 2.34.1 From arnout at mind.be Mon Jan 31 22:43:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 31 Jan 2022 23:43:46 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/pkg-meson: separate infrastructure logic from package In-Reply-To: <20211203215438.213437-1-nolange79@gmail.com> References: <20211203215438.213437-1-nolange79@gmail.com> Message-ID: <077c8dc8-eb09-1672-615f-d86e15abf87e@mind.be> On 03/12/2021 22:54, Norbert Lange wrote: > Move all logic related to handling meson packages to the > package/pkg-meson file. This now mirrors the other build > systems and keeps the package itself clean. > > Correctly prefix variables with PKG_MESON_ > > Signed-off-by: Norbert Lange > --- > v2->v3: > - rebase, split up the moving > > v1->v2: > - squash 2 commits, really hard to separate as moving and renaming > variables from 2 to one location affects alot code. > - use TOOLCHAIN_POST_INSTALL_STAGING_HOOKS again. > - consistently use double quotes for sed patterns > > Signed-off-by: Norbert Lange > --- > package/meson/meson.mk | 38 -------------------------------------- > package/pkg-meson.mk | 40 +++++++++++++++++++++++++++++++++++++++- > 2 files changed, 39 insertions(+), 39 deletions(-) > > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index a8c846126a..5553c15d91 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -13,44 +13,6 @@ MESON_SETUP_TYPE = setuptools > HOST_MESON_DEPENDENCIES = host-ninja > HOST_MESON_NEEDS_HOST_PYTHON = python3 > > -HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) > -HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) > - > -# https://mesonbuild.com/Reference-tables.html#cpu-families > -ifeq ($(BR2_arcle)$(BR2_arceb),y) > -HOST_MESON_TARGET_CPU_FAMILY = arc > -else ifeq ($(BR2_arm)$(BR2_armeb),y) > -HOST_MESON_TARGET_CPU_FAMILY = arm > -else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) > -HOST_MESON_TARGET_CPU_FAMILY = aarch64 > -else ifeq ($(BR2_i386),y) > -HOST_MESON_TARGET_CPU_FAMILY = x86 > -else ifeq ($(BR2_m68k),y) > -HOST_MESON_TARGET_CPU_FAMILY = m68k > -else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) > -HOST_MESON_TARGET_CPU_FAMILY = microblaze > -else ifeq ($(BR2_mips)$(BR2_mipsel),y) > -HOST_MESON_TARGET_CPU_FAMILY = mips > -else ifeq ($(BR2_mips64)$(BR2_mips64el),y) > -HOST_MESON_TARGET_CPU_FAMILY = mips64 > -else ifeq ($(BR2_powerpc),y) > -HOST_MESON_TARGET_CPU_FAMILY = ppc > -else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > -HOST_MESON_TARGET_CPU_FAMILY = ppc64 > -else ifeq ($(BR2_riscv),y) > -HOST_MESON_TARGET_CPU_FAMILY = riscv64 > -else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) > -HOST_MESON_TARGET_CPU_FAMILY = sh4 > -else ifeq ($(BR2_sparc),y) > -HOST_MESON_TARGET_CPU_FAMILY = sparc > -else ifeq ($(BR2_sparc64),y) > -HOST_MESON_TARGET_CPU_FAMILY = sparc64 > -else ifeq ($(BR2_x86_64),y) > -HOST_MESON_TARGET_CPU_FAMILY = x86_64 > -else > -HOST_MESON_TARGET_CPU_FAMILY = $(ARCH) > -endif > - > # Avoid interpreter shebang longer than 128 chars > define HOST_MESON_SET_INTERPRETER > $(SED) '1s:.*:#!/usr/bin/env python3:' $(HOST_DIR)/bin/meson > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 16a90d157b..4914486665 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -185,9 +185,47 @@ meson-package = $(call inner-meson-package,$(pkgname),$(call UPPERCASE,$(pkgname > host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) > > ################################################################################ > -# Generation of the Meson cross-compilation.conf file > +# Generation of the Meson compile flags and cross-compilation file > ################################################################################ > > +# https://mesonbuild.com/Reference-tables.html#cpu-families > +ifeq ($(BR2_arcle)$(BR2_arceb),y) > +PKG_MESON_TARGET_CPU_FAMILY = arc > +else ifeq ($(BR2_arm)$(BR2_armeb),y) > +PKG_MESON_TARGET_CPU_FAMILY = arm > +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) > +PKG_MESON_TARGET_CPU_FAMILY = aarch64 > +else ifeq ($(BR2_i386),y) > +PKG_MESON_TARGET_CPU_FAMILY = x86 > +else ifeq ($(BR2_m68k),y) > +PKG_MESON_TARGET_CPU_FAMILY = m68k > +else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) > +PKG_MESON_TARGET_CPU_FAMILY = microblaze > +else ifeq ($(BR2_mips)$(BR2_mipsel),y) > +PKG_MESON_TARGET_CPU_FAMILY = mips > +else ifeq ($(BR2_mips64)$(BR2_mips64el),y) > +PKG_MESON_TARGET_CPU_FAMILY = mips64 > +else ifeq ($(BR2_powerpc),y) > +PKG_MESON_TARGET_CPU_FAMILY = ppc > +else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > +PKG_MESON_TARGET_CPU_FAMILY = ppc64 > +else ifeq ($(BR2_riscv),y) > +PKG_MESON_TARGET_CPU_FAMILY = riscv64 > +else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) > +PKG_MESON_TARGET_CPU_FAMILY = sh4 > +else ifeq ($(BR2_sparc),y) > +PKG_MESON_TARGET_CPU_FAMILY = sparc > +else ifeq ($(BR2_sparc64),y) > +PKG_MESON_TARGET_CPU_FAMILY = sparc64 > +else ifeq ($(BR2_x86_64),y) > +PKG_MESON_TARGET_CPU_FAMILY = x86_64 > +else > +PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) > +endif > + > +HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) > +HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) I moved all this to the beginning of the file, since it's (indirectly) used within inner-meson-package. Applied to master with that changed, thanks. Regards, Arnout > + > # Generate a Meson cross-compilation.conf suitable for use with the > # SDK; also install the file as a template for users to add their > # own flags if they need to. From fontaine.fabrice at gmail.com Mon Jan 31 22:52:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 31 Jan 2022 23:52:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.4.4 Message-ID: <20220131225230.178602-1-fontaine.fabrice@gmail.com> Expat 2.4.4 has been released yesterday. Besides a memory leak bugfix to xmlwf and fixes to the build system, this release is about security fixes. There are 2 CVEs involved, both related to fixed-size integer math (integer overflow) near memory allocation, not unlike what we had with 2.4.3 before. Impact is denial of service, or more. Fix CVE-2022-23852 and CVE-2022-23990 https://blog.hartwork.org/posts/expat-2-4-4-released/ https://github.com/libexpat/libexpat/blob/R_2_4_4/expat/Changes Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0853c3c76d..10e13206d0 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.3/ -md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz -sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.4/ +md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz +sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz # Locally calculated -sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz +sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index a7ace66095..250600c25e 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.3 +EXPAT_VERSION = 2.4.4 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.34.1 From james.hilliard1 at gmail.com Mon Jan 31 22:56:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 31 Jan 2022 15:56:22 -0700 Subject: [Buildroot] [PATCH v7 1/1] package/qt5: bump packages to latest kde submodule versions Message-ID: <20220131225622.90226-1-james.hilliard1@gmail.com> This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 We need to remove some patches applied upstream already. We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches which don't have proper version tags. Create a .git file so to trigger headers sync during configure. Hold back updating qt5webengine for now since the latest version requires significant changes to build, just tweak existing version to be compatible with latest kde versions for now. Signed-off-by: James Hilliard --- Changes v6 -> v7: - update kde versions(fixes qt5webkit build) Changes v5 -> v6: - drop upstream patches - rebase on master Changes v4 -> v5: - leave qt5webengine on current version - add minimal tweaks to qt5webengine to build with updated kde deps Changes v2 -> v3: - add kconfig entry for qt5location-mapboxgl Changes v1 -> v2: - fix headers sync and update MODULE_VERSION --- package/pkg-qmake.mk | 4 +- package/qt5/Config.in | 1 + package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 +- ...Fix-build-with-GCC-11-include-limits.patch | 53 ------ ...avoiding-huge-number-of-tiny-dashes.patch} | 0 .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------- .../0008-Add-missing-limits-include.patch | 32 ---- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 ----- ...-intensive-painting-of-high-number-o.patch | 163 ------------------ ...-avoiding-huge-number-of-tiny-dashes.patch | 100 ----------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 +- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 +- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 +- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 ----- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 +- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 +- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +- package/qt5/qt5location-mapboxgl/Config.in | 4 + .../qt5location-mapboxgl.hash | 16 ++ .../qt5location-mapboxgl.mk | 14 ++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/Config.in | 1 + package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 +- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 +- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 +- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 +- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 +- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 +- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 +- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 +- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 +- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 +- ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 ++++++++ package/qt5/qt5webengine/qt5webengine.mk | 9 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 +- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 +- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 +- 79 files changed, 306 insertions(+), 653 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch rename package/qt5/qt5base/{0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch => 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch} (100%) delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch delete mode 100644 package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/Config.in create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%) create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 4dcaf6dd62..fdaddf08df 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..3e498f6a28 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" +source "package/qt5/qt5location-mapboxgl/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3ffb7b0063..656e3067dc 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,9 +5,9 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 +QT5_VERSION = $(QT5_VERSION_MAJOR).8 QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 43b2132cc7..32d3675619 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index f3eff9edf0..9a07d189bd 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted file mode 100644 index f014a160d5..0000000000 --- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch similarity index 100% rename from package/qt5/qt5base/0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch rename to package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted file mode 100644 index d20600c6ce..0000000000 --- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll -Reviewed-by: Thiago Macieira -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 - diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted file mode 100644 index e489f2e551..0000000000 --- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - --- -2.32.0 - diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted file mode 100644 index 98c7210551..0000000000 --- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 - diff --git a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch b/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch deleted file mode 100644 index 03287d19ca..0000000000 --- a/package/qt5/qt5base/0010-Avoid-processing-intensive-painting-of-high-number-o.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 307bc02e379e63aa9b7a3d21bbcd9c84d34c600f Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Tue, 13 Apr 2021 14:23:45 +0200 -Subject: [PATCH] Avoid processing-intensive painting of high number of tiny - dashes - -When stroking a dashed path, an unnecessary amount of processing would -be spent if there is a huge number of dashes visible, e.g. because of -scaling. Since the dashes are too small to be indivdually visible -anyway, just replace with a semi-transparent solid line for such -cases. - -Pick-to: 6.1 6.0 5.15 -Change-Id: I9e9f7861257ad5bce46a0cf113d1a9d7824911e6 -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit f4d791b330d02777fcaf02938732892eb3167e9b) - -* asturmlechner 2021-08-21: -Conflict from preceding 94dd2ceb in dev branch: - src/gui/painting/qpaintengineex.cpp - Resolved via: - - if (pen.style() > Qt::SolidLine) { - QRectF cpRect = path.controlPointRect(); - const QTransform &xf = state()->matrix; -- if (pen.isCosmetic()) { -+ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ - clipRect = d->exDeviceRect; - cpRect.translate(xf.dx(), xf.dy()); - } else { - -FTBFS from preceding 471e4fcb in dev branch changing QVector to QList: - Resolved via: - - QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; - qreal extent = qMax(extentRect.width(), extentRect.height()); - qreal patternLength = 0; -- const QList pattern = pen.dashPattern(); -+ const QVector pattern = pen.dashPattern(); - const int patternSize = qMin(pattern.size(), 32); - for (int i = 0; i < patternSize; i++) - patternLength += qMax(pattern.at(i), qreal(0)); - -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/081d835c040a90f8ee76807354355062ac521dfb] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 44 +++++++++++++++---- - .../other/lancelot/scripts/tinydashes.qps | 34 ++++++++++++++ - 2 files changed, 69 insertions(+), 9 deletions(-) - create mode 100644 tests/auto/other/lancelot/scripts/tinydashes.qps - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 5d8f89eadd..55fdb0c2a0 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -385,7 +385,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const - - Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp - --void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) -+void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - { - #ifdef QT_DEBUG_DRAW - qDebug() << "QPaintEngineEx::stroke()" << pen; -@@ -403,6 +403,38 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) - d->stroker.setCubicToHook(qpaintengineex_cubicTo); - } - -+ QRectF clipRect; -+ QPen pen = inPen; -+ if (pen.style() > Qt::SolidLine) { -+ QRectF cpRect = path.controlPointRect(); -+ const QTransform &xf = state()->matrix; -+ if (qt_pen_is_cosmetic(pen, state()->renderHints)){ -+ clipRect = d->exDeviceRect; -+ cpRect.translate(xf.dx(), xf.dy()); -+ } else { -+ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); -+ } -+ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway -+ QRectF extentRect = cpRect & clipRect; -+ qreal extent = qMax(extentRect.width(), extentRect.height()); -+ qreal patternLength = 0; -+ const QVector pattern = pen.dashPattern(); -+ const int patternSize = qMin(pattern.size(), 32); -+ for (int i = 0; i < patternSize; i++) -+ patternLength += qMax(pattern.at(i), qreal(0)); -+ if (pen.widthF()) -+ patternLength *= pen.widthF(); -+ if (qFuzzyIsNull(patternLength)) { -+ pen.setStyle(Qt::NoPen); -+ } else if (extent / patternLength > 10000) { -+ // approximate stream of tiny dashes with semi-transparent solid line -+ pen.setStyle(Qt::SolidLine); -+ QColor color(pen.color()); -+ color.setAlpha(color.alpha() / 2); -+ pen.setColor(color); -+ } -+ } -+ - if (!qpen_fast_equals(pen, d->strokerPen)) { - d->strokerPen = pen; - d->stroker.setJoinStyle(pen.joinStyle()); -@@ -430,14 +462,8 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) - return; - } - -- if (pen.style() > Qt::SolidLine) { -- if (qt_pen_is_cosmetic(pen, state()->renderHints)){ -- d->activeStroker->setClipRect(d->exDeviceRect); -- } else { -- QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); -- d->activeStroker->setClipRect(clipRect); -- } -- } -+ if (!clipRect.isNull()) -+ d->activeStroker->setClipRect(clipRect); - - if (d->activeStroker == &d->stroker) - d->stroker.setForceOpen(path.hasExplicitOpen()); -diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps -new file mode 100644 -index 0000000000..d41ced7f5f ---- /dev/null -+++ b/tests/auto/other/lancelot/scripts/tinydashes.qps -@@ -0,0 +1,34 @@ -+# Version: 1 -+# CheckVsReference: 5% -+ -+path_addEllipse mypath 20.0 20.0 200.0 200.0 -+ -+save -+setPen blue 20 SolidLine FlatCap -+pen_setCosmetic true -+pen_setDashPattern [ 0.0004 0.0004 ] -+setBrush yellow -+ -+drawPath mypath -+translate 300 0 -+setRenderHint Antialiasing true -+drawPath mypath -+restore -+ -+path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0 -+ -+setPen blue 20 DotLine FlatCap -+setBrush yellow -+ -+save -+translate 0 300 -+scale 0.0001 0.00011 -+drawPath bigpath -+restore -+ -+save -+translate 300 300 -+setRenderHint Antialiasing true -+scale 0.0001 0.00011 -+drawPath bigpath -+restore --- -2.34.1 - diff --git a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index ca3c2736ae..0000000000 --- a/package/qt5/qt5base/0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 3b1a60f651776a7b2d155803b07a52a9e27bdf78 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 30 Jul 2021 13:03:49 +0200 -Subject: [PATCH] Refix for avoiding huge number of tiny dashes - -Previous fix hit too widely so some valid horizontal and vertical -lines were affected; the root problem being that such lines have an -empty control point rect (width or height is 0). Fix by caculating in -the pen width. - -Pick-to: 6.2 6.1 5.15 -Change-Id: I7a436e873f6d485028f6759d0e2c6456f07eebdc -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit 84aba80944a2e1c3058d7a1372e0e66676411884) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/427df34efdcb56582a9ae9f7d2d1f39eeff70328] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 8 ++--- - .../gui/painting/qpainter/tst_qpainter.cpp | 31 +++++++++++++++++++ - 2 files changed, 35 insertions(+), 4 deletions(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 19e4b23423..9fe510827a 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -415,18 +415,18 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect)); - } - // Check to avoid generating unwieldy amount of dashes that will not be visible anyway -- QRectF extentRect = cpRect & clipRect; -+ qreal pw = pen.widthF() ? pen.widthF() : 1; -+ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect; - qreal extent = qMax(extentRect.width(), extentRect.height()); - qreal patternLength = 0; - const QVector pattern = pen.dashPattern(); - const int patternSize = qMin(pattern.size(), 32); - for (int i = 0; i < patternSize; i++) - patternLength += qMax(pattern.at(i), qreal(0)); -- if (pen.widthF()) -- patternLength *= pen.widthF(); -+ patternLength *= pw; - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { -+ } else if (extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); -diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -index 42e98ce363..d7c3f95f1d 100644 ---- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -@@ -308,6 +308,7 @@ private slots: - void fillPolygon(); - - void drawImageAtPointF(); -+ void scaledDashes(); - - private: - void fillData(); -@@ -5468,6 +5469,36 @@ void tst_QPainter::drawImageAtPointF() - paint.end(); - } - -+void tst_QPainter::scaledDashes() -+{ -+ // Test that we do not hit the limit-huge-number-of-dashes path -+ QRgb fore = qRgb(0, 0, 0xff); -+ QRgb back = qRgb(0xff, 0xff, 0); -+ QImage image(5, 32, QImage::Format_RGB32); -+ image.fill(back); -+ QPainter p(&image); -+ QPen pen(QColor(fore), 3, Qt::DotLine); -+ p.setPen(pen); -+ p.scale(1, 2); -+ p.drawLine(2, 0, 2, 16); -+ p.end(); -+ -+ bool foreFound = false; -+ bool backFound = false; -+ int i = 0; -+ while (i < 32 && (!foreFound || !backFound)) { -+ QRgb pix = image.pixel(3, i); -+ if (pix == fore) -+ foreFound = true; -+ else if (pix == back) -+ backFound = true; -+ i++; -+ } -+ -+ QVERIFY(foreFound); -+ QVERIFY(backFound); -+} -+ - QTEST_MAIN(tst_QPainter) - - #include "tst_qpainter.moc" --- -2.34.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a824890e3c..396f5044ff 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4ef3759566..d8a0bf1d16 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index b52be714b7..021d4ea19f 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 2c40ac1c89..24e635b93b 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index 24de869120..a50f19d7f2 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3edc2d666a..12e9d637b2 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6402b505bf..a4c79be10b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted file mode 100644 index 0e6da652f9..0000000000 --- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ?void QQmlProfilerEvent::assignNumbers(const Container&)?: - qqmlprofilerevent_p.h:314:65: error: ?numeric_limits? is not a member of ?std? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ?>? token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ?::max? has not been declared; did you mean ?std::max?? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index ab83b71814..adda7e03ba 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 3318cd24c8..e63a78021a 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9d7a837b8b..e755f0848b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index a9ddff454e..542eb4de90 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index b4281e712d..49690de3bb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index ffb094d566..506cd123a8 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 9fc121111c..412e31c652 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch similarity index 81% rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch index 0894af9ce5..0f56a488e3 100644 --- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: add uClibc] Signed-off-by: Yann E. MORIN --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() { diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in new file mode 100644 index 0000000000..4f62a110fb --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5location source tree. +config BR2_PACKAGE_QT5LOCATION_MAPBOXGL + bool diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file mode 100644 index 0000000000..e44081c465 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash @@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file mode 100644 index 0000000000..38ba10e579 --- /dev/null +++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt +QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch similarity index 100% rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in index 3d91adaf1f..b811f9a590 100644 --- a/package/qt5/qt5location/Config.in +++ b/package/qt5/qt5location/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_QT5LOCATION bool "qt5location" select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5LOCATION_MAPBOXGL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 0bb293305c..52649897b1 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index ea741d0df6..98af8b233b 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL @@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package)) diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 740f9072f2..46ab3f60df 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 1423a629b9..e9614fbecf 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 54cc1de632..0b62cf1bed 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index b70a4ecf51..1c4d930248 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 39eddc3afc..6695369063 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk index a58c4c5e14..ef51abddf8 100644 --- a/package/qt5/qt5opcua/qt5opcua.mk +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 1fa0d6430a..2138b3e313 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 1ac8689d6e..c2b5ae182e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index f66a1186ee..766fd69077 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f0315b0f0301fdb16d6ee78c57e3cd600121884c1356ca1160ace96a57ac17bc qtquickcontrols2-d8d6b14b9907adbc6ce307d52be34aaa761a58fa.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 2f6dcd1f2f..ff1a49a9ce 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = d8d6b14b9907adbc6ce307d52be34aaa761a58fa +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index ac97fc319c..c2d0b11f2b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index ef6927f928..49d0cb330b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 30c5bfc51d..a2573a018a 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index a6b5f0954c..b7dee4f2f3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 783598047b..0b34ff3e8f 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 77254fec0f..4e51eacfc3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 6f816548e6..85e72f5378 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 186a2d381b..d5d26536a3 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 179c9833e0..6be87e8cf9 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index f928aad1c1..eebda912a9 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 4f05049b99..8b560a8a83 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 412a255612..fc62c85318 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 37bc8401f8..6d821c387f 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 902967c757..370093f6f8 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 7773a940bb..1e4dc54c67 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index d4b31c231e..849a2b7f1b 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 728012f7762ecd5762d493f8796907c6456f31e7 +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index e52d8e6df7..a563801997 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0543afd8f7..e2385080ce 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 82f132378e..432e3099c3 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 a91024f241df0d24ee398c262b61d126d451c70f05ef109901cfb483d1201538 qtvirtualkeyboard-98d1fd864cbb6c7c012c4139118808af110fb8f0.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 3984c9866e..8e997a2426 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 98d1fd864cbb6c7c012c4139118808af110fb8f0 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index b17dbdd10d..1a7400de67 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0076bbfe73..bcc4915022 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 47c7da3365..af195b32b3 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 176c0fd7a3..042a28fca9 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch new file mode 100644 index 0000000000..44a6424c7d --- /dev/null +++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch @@ -0,0 +1,76 @@ +From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 4 Aug 2021 19:11:06 +0200 +Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 + +* fixes: +[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o +FAILED: obj/third_party/breakpad/client/exception_handler.o +/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' + 254 | max(const _Tp& __a, const _Tp& __b) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, + from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' + 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' + 3461 | max(initializer_list<_Tp> __l) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ +In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, + from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' + 3467 | max(initializer_list<_Tp> __l, _Compare __comp) + | ^~~ +../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: +../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' + 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + | ~~~~~~~~^~~~~~~~~~~~~~~~~ + +Adapted from: +https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch + +Signed-off-by: Martin Jansa +Signed-off-by: James Hilliard +--- + .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c40997..2e43ba6fc04 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 64c9c96cc2..cebd6d0fe2 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,8 +4,9 @@ # ################################################################################ -QT5WEBENGINE_VERSION = $(QT5_VERSION) -QT5WEBENGINE_SITE = $(QT5_SITE) +QT5WEBENGINE_VERSION_MAJOR = 5.15 +QT5WEBENGINE_VERSION = $(QT5WEBENGINE_VERSION_MAJOR).2 +QT5WEBENGINE_SITE = https://download.qt.io/archive/qt/$(QT5WEBENGINE_VERSION_MAJOR)/$(QT5WEBENGINE_VERSION)/submodules QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ @@ -44,7 +45,9 @@ endif # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBENGINE_ENV = \ + PATH=$(@D)/host-bin:$(BR_PATH) \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig define QT5WEBENGINE_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 29a9ebe439..3cc87865dc 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index a35cdc5799..d222f025ee 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index c1cee9cf85..51d0fb0d7a 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0f37f3eb85..ed1cfe5065 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 08e6753f21..b854cedcb6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 075d36dcd8..7b1e32df17 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 682e114a7f..c0e3caa407 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6845483327..27818ecb78 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative -- 2.25.1 From arnout at mind.be Mon Jan 31 23:00:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 1 Feb 2022 00:00:58 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/pkg-meson: improve generation of cross-compilation file In-Reply-To: <20211203215438.213437-2-nolange79@gmail.com> References: <20211203215438.213437-1-nolange79@gmail.com> <20211203215438.213437-2-nolange79@gmail.com> Message-ID: <44572e0d-1989-106f-65fa-4b784427e15b@mind.be> On 03/12/2021 22:54, Norbert Lange wrote: > Removed a few variables, as they were only used to communicate > between the meson package and pkg-meson.mk and are not needed > anymore. > > Moved cross-compilation.conf.in out of meson package. > > Creating the cross-compilation.conf files for packages is now > using the original template. > To avoid duplicate code, the common sed pattern is stored in > a make variable. > > Use explicit Buildroot variables for compiler tools, > and some fixes. (TARGET_LDFLAGS and TARGET_CXXFLAGS > were mixed up with PKG_TARGET_CFLAGS) > > Signed-off-by: Norbert Lange Applied to master, but see below. > --- > v2->v3: > - rebase > > v1->v2: > - squash 2 commits, really hard to separate as moving and renaming > variables from 2 to one location affects alot code. > - use TOOLCHAIN_POST_INSTALL_STAGING_HOOKS again. > - consistently use double quotes for sed patterns > > Signed-off-by: Norbert Lange > --- > package/pkg-meson.mk | 58 +++++++++---------- > .../misc}/cross-compilation.conf.in | 10 ++-- > 2 files changed, 33 insertions(+), 35 deletions(-) > rename {package/meson => support/misc}/cross-compilation.conf.in (84%) > > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 4914486665..77dc2b46b0 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -67,19 +67,9 @@ $(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS) > define $(2)_CONFIGURE_CMDS > rm -rf $$($$(PKG)_SRCDIR)/build > mkdir -p $$($$(PKG)_SRCDIR)/build > - sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%g' \ > - -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ > - -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ > - -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ > - -e "s%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g" \ > - -e "s%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g" \ > - -e "s%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g" \ > - -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ > - -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ > - -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ > - -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ > + sed -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ > -e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \ > - package/meson/cross-compilation.conf.in \ > + $$(call PKG_MESON_CROSSCONFIG_SED,$(2)_CFLAGS,$(2)_CXXFLAGS,$(2)_LDFLAGS) \ > > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf > PATH=$$(BR_PATH) \ > CC_FOR_BUILD="$$(HOSTCC)" \ > @@ -223,31 +213,39 @@ else > PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) > endif > > -HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) > -HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) > +# Generates sed patterns for patching the cross-compilation.conf template, > +# since Flags might contain commas the arguments are passed indirectly by > +# variable name (stripped to deal with whitespaces). > +# Arguments are variable containing cflags, cxxflags, ldflags. > +define PKG_MESON_CROSSCONFIG_SED > + -e "s%@TARGET_CC@%$(TARGET_CC)%g" \ > + -e "s%@TARGET_CXX@%$(TARGET_CXX)%g" \ > + -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ > + -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ > + -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ > + -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ > + -e "s%@TARGET_ENDIAN@%$(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN)))%g" \ > + -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ > + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ > + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ > + -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ > + -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ > + -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ > + $(TOPDIR)/support/misc/cross-compilation.conf.in > +endef > > # Generate a Meson cross-compilation.conf suitable for use with the > # SDK; also install the file as a template for users to add their > # own flags if they need to. > define PKG_MESON_INSTALL_CROSS_CONF > mkdir -p $(HOST_DIR)/etc/meson > - sed -e 's%@TARGET_CROSS@%$(TARGET_CROSS)%g' \ > - -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ > - -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ > - -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ > - -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ > - -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g" \ > - -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g" \ > - -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ > - -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ > - -e 's%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g' \ > - $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > + sed -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ > + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_LDFLAGS@%g" \ > + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CXXFLAGS@%g" \ > + $(call PKG_MESON_CROSSCONFIG_SED) \ This could have been $(call PKG_MESON_CROSSCONFIG_SED,$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@,$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CXXFLAGS@,$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_LDFLAGS@) which is of course completely unreadable. While looking at this, however, I noticed that there's something wrong with the cross-compilation.conf.in we generate. It contains this: c_args = ['-D_LARGEFILE_SOURCE', ..., '-D_FORTIFY_SOURCE=1'@PKG_TARGET_CFLAGS@] c_link_args = [@PKG_TARGET_CFLAGS@] which means that @PKG_TARGET_CFLAGS@ can't be replaced with anything sane: in c_args, it must start with a comma, but in c_link_args it must not start with comma. But this was already wrong before this patch. In fact, this was already a problem since the very time that Peter introduced PKG_TARGET_CFLAGS. I'm not sure what to do about it. > > $(HOST_DIR)/etc/meson/cross-compilation.conf.in > - sed -e 's%@PKG_TARGET_CFLAGS@%%g' \ > - -e 's%@PKG_TARGET_LDFLAGS@%%g' \ > - -e 's%@PKG_TARGET_CXXFLAGS@%%g' \ > - $(HOST_DIR)/etc/meson/cross-compilation.conf.in \ > + sed $(call PKG_MESON_CROSSCONFIG_SED,TARGET_CFLAGS,TARGET_CXXFLAGS,TARGET_LDFLAGS) \ > > $(HOST_DIR)/etc/meson/cross-compilation.conf > endef > > -TOOLCHAIN_TARGET_FINALIZE_HOOKS += PKG_MESON_INSTALL_CROSS_CONF > +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += PKG_MESON_INSTALL_CROSS_CONF This change (do it in post-install-staging instead of target-finalize) is not explained in the commit message, and it reverts an earlier change [1]. So I reverted that part. Regards, Arnout [1] https://lore.kernel.org/buildroot/20191204150225.33749-1-thomas.petazzoni at bootlin.com/ > diff --git a/package/meson/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > similarity index 84% > rename from package/meson/cross-compilation.conf.in > rename to support/misc/cross-compilation.conf.in > index 7a7ece97ae..18cf258a8e 100644 > --- a/package/meson/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -4,11 +4,11 @@ > # - Buildroot's 'target' is Meson's 'host' > > [binaries] > -c = '@TARGET_CROSS at gcc' > -cpp = '@TARGET_CROSS at g++' > -ar = '@TARGET_CROSS at ar' > -strip = '@TARGET_CROSS at strip' > -pkgconfig = '@HOST_DIR@/bin/pkgconf' > +c = '@TARGET_CC@' > +cpp = '@TARGET_CXX@' > +ar = '@TARGET_AR@' > +strip = '@TARGET_STRIP@' > +pkgconfig = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > From arnout at mind.be Mon Jan 31 21:21:05 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 22:21:05 +0100 Subject: [Buildroot] [git commit] package/pkg-meson: separate infrastructure logic from package Message-ID: <20220131225416.D227C82803@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56e31ff9dbbff8774c29875cf4316e403cb89691 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Move all logic related to handling meson packages to the package/pkg-meson file. This now mirrors the other build systems and keeps the package itself clean. Correctly prefix variables with PKG_MESON_ Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.mk | 38 -------------------------------------- package/pkg-meson.mk | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e63dc725bf..6c0d1ab08e 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -13,44 +13,6 @@ MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja HOST_MESON_NEEDS_HOST_PYTHON = python3 -HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) -HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) - -# https://mesonbuild.com/Reference-tables.html#cpu-families -ifeq ($(BR2_arcle)$(BR2_arceb),y) -HOST_MESON_TARGET_CPU_FAMILY = arc -else ifeq ($(BR2_arm)$(BR2_armeb),y) -HOST_MESON_TARGET_CPU_FAMILY = arm -else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) -HOST_MESON_TARGET_CPU_FAMILY = aarch64 -else ifeq ($(BR2_i386),y) -HOST_MESON_TARGET_CPU_FAMILY = x86 -else ifeq ($(BR2_m68k),y) -HOST_MESON_TARGET_CPU_FAMILY = m68k -else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) -HOST_MESON_TARGET_CPU_FAMILY = microblaze -else ifeq ($(BR2_mips)$(BR2_mipsel),y) -HOST_MESON_TARGET_CPU_FAMILY = mips -else ifeq ($(BR2_mips64)$(BR2_mips64el),y) -HOST_MESON_TARGET_CPU_FAMILY = mips64 -else ifeq ($(BR2_powerpc),y) -HOST_MESON_TARGET_CPU_FAMILY = ppc -else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) -HOST_MESON_TARGET_CPU_FAMILY = ppc64 -else ifeq ($(BR2_riscv),y) -HOST_MESON_TARGET_CPU_FAMILY = riscv64 -else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) -HOST_MESON_TARGET_CPU_FAMILY = sh4 -else ifeq ($(BR2_sparc),y) -HOST_MESON_TARGET_CPU_FAMILY = sparc -else ifeq ($(BR2_sparc64),y) -HOST_MESON_TARGET_CPU_FAMILY = sparc64 -else ifeq ($(BR2_x86_64),y) -HOST_MESON_TARGET_CPU_FAMILY = x86_64 -else -HOST_MESON_TARGET_CPU_FAMILY = $(ARCH) -endif - # Avoid interpreter shebang longer than 128 chars define HOST_MESON_SET_INTERPRETER $(SED) '1s:.*:#!/usr/bin/env python3:' $(HOST_DIR)/bin/meson diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index ec535174b6..91f0f3244b 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -29,6 +29,44 @@ MESON = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/meson NINJA = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/ninja NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) +# https://mesonbuild.com/Reference-tables.html#cpu-families +ifeq ($(BR2_arcle)$(BR2_arceb),y) +PKG_MESON_TARGET_CPU_FAMILY = arc +else ifeq ($(BR2_arm)$(BR2_armeb),y) +PKG_MESON_TARGET_CPU_FAMILY = arm +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) +PKG_MESON_TARGET_CPU_FAMILY = aarch64 +else ifeq ($(BR2_i386),y) +PKG_MESON_TARGET_CPU_FAMILY = x86 +else ifeq ($(BR2_m68k),y) +PKG_MESON_TARGET_CPU_FAMILY = m68k +else ifeq ($(BR2_microblazeel)$(BR2_microblazebe),y) +PKG_MESON_TARGET_CPU_FAMILY = microblaze +else ifeq ($(BR2_mips)$(BR2_mipsel),y) +PKG_MESON_TARGET_CPU_FAMILY = mips +else ifeq ($(BR2_mips64)$(BR2_mips64el),y) +PKG_MESON_TARGET_CPU_FAMILY = mips64 +else ifeq ($(BR2_powerpc),y) +PKG_MESON_TARGET_CPU_FAMILY = ppc +else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) +PKG_MESON_TARGET_CPU_FAMILY = ppc64 +else ifeq ($(BR2_riscv),y) +PKG_MESON_TARGET_CPU_FAMILY = riscv64 +else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) +PKG_MESON_TARGET_CPU_FAMILY = sh4 +else ifeq ($(BR2_sparc),y) +PKG_MESON_TARGET_CPU_FAMILY = sparc +else ifeq ($(BR2_sparc64),y) +PKG_MESON_TARGET_CPU_FAMILY = sparc64 +else ifeq ($(BR2_x86_64),y) +PKG_MESON_TARGET_CPU_FAMILY = x86_64 +else +PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) +endif + +HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) +HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) + ################################################################################ # inner-meson-package -- defines how the configuration, compilation and # installation of a Meson package should be done, implements a few hooks to @@ -181,7 +219,7 @@ meson-package = $(call inner-meson-package,$(pkgname),$(call UPPERCASE,$(pkgname host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) ################################################################################ -# Generation of the Meson cross-compilation.conf file +# Generation of the Meson compile flags and cross-compilation file ################################################################################ # Generate a Meson cross-compilation.conf suitable for use with the From arnout at mind.be Mon Jan 31 22:36:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 31 Jan 2022 23:36:11 +0100 Subject: [Buildroot] [git commit] package/pkg-meson: improve generation of cross-compilation file Message-ID: <20220131225416.DEC9B80F72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=675f02fd3f0b11b24eab62b781038e492c40bf90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed a few variables, as they were only used to communicate between the meson package and pkg-meson.mk and are not needed anymore. Moved cross-compilation.conf.in out of meson package. Creating the cross-compilation.conf files for packages is now using the original template. To avoid duplicate code, the common sed pattern is stored in a make variable. Use explicit Buildroot variables for compiler tools, and some fixes. (TARGET_LDFLAGS and TARGET_CXXFLAGS were mixed up with PKG_TARGET_CFLAGS) Signed-off-by: Norbert Lange [Arnout: keep PKG_MESON_INSTALL_CROSS_CONF in TOOLCHAIN_TARGET_FINALIZE_HOOKS] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-meson.mk | 56 +++++++++++----------- .../misc}/cross-compilation.conf.in | 10 ++-- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 91f0f3244b..85de98e03a 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -64,8 +64,26 @@ else PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) endif -HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) -HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) +# Generates sed patterns for patching the cross-compilation.conf template, +# since Flags might contain commas the arguments are passed indirectly by +# variable name (stripped to deal with whitespaces). +# Arguments are variable containing cflags, cxxflags, ldflags. +define PKG_MESON_CROSSCONFIG_SED + -e "s%@TARGET_CC@%$(TARGET_CC)%g" \ + -e "s%@TARGET_CXX@%$(TARGET_CXX)%g" \ + -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ + -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ + -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ + -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ + -e "s%@TARGET_ENDIAN@%$(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN)))%g" \ + -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ + -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ + -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ + $(TOPDIR)/support/misc/cross-compilation.conf.in +endef ################################################################################ # inner-meson-package -- defines how the configuration, compilation and @@ -101,19 +119,9 @@ $(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS) define $(2)_CONFIGURE_CMDS rm -rf $$($$(PKG)_SRCDIR)/build mkdir -p $$($$(PKG)_SRCDIR)/build - sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%g' \ - -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ - -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ - -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e "s%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g" \ - -e "s%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g" \ - -e "s%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g" \ - -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ - -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ - -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ - -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ + sed -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ -e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \ - package/meson/cross-compilation.conf.in \ + $$(call PKG_MESON_CROSSCONFIG_SED,$(2)_CFLAGS,$(2)_CXXFLAGS,$(2)_LDFLAGS) \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf PATH=$$(BR_PATH) \ CC_FOR_BUILD="$$(HOSTCC)" \ @@ -227,22 +235,12 @@ host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE # own flags if they need to. define PKG_MESON_INSTALL_CROSS_CONF mkdir -p $(HOST_DIR)/etc/meson - sed -e 's%@TARGET_CROSS@%$(TARGET_CROSS)%g' \ - -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ - -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ - -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ - -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g" \ - -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g" \ - -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ - -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ - -e 's%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g' \ - $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ + sed -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ + -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_LDFLAGS@%g" \ + -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CXXFLAGS@%g" \ + $(call PKG_MESON_CROSSCONFIG_SED) \ > $(HOST_DIR)/etc/meson/cross-compilation.conf.in - sed -e 's%@PKG_TARGET_CFLAGS@%%g' \ - -e 's%@PKG_TARGET_LDFLAGS@%%g' \ - -e 's%@PKG_TARGET_CXXFLAGS@%%g' \ - $(HOST_DIR)/etc/meson/cross-compilation.conf.in \ + sed $(call PKG_MESON_CROSSCONFIG_SED,TARGET_CFLAGS,TARGET_CXXFLAGS,TARGET_LDFLAGS) \ > $(HOST_DIR)/etc/meson/cross-compilation.conf endef diff --git a/package/meson/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in similarity index 84% rename from package/meson/cross-compilation.conf.in rename to support/misc/cross-compilation.conf.in index 7a7ece97ae..18cf258a8e 100644 --- a/package/meson/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -4,11 +4,11 @@ # - Buildroot's 'target' is Meson's 'host' [binaries] -c = '@TARGET_CROSS at gcc' -cpp = '@TARGET_CROSS at g++' -ar = '@TARGET_CROSS at ar' -strip = '@TARGET_CROSS at strip' -pkgconfig = '@HOST_DIR@/bin/pkgconf' +c = '@TARGET_CC@' +cpp = '@TARGET_CXX@' +ar = '@TARGET_AR@' +strip = '@TARGET_STRIP@' +pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' From fontaine.fabrice at gmail.com Mon Jan 31 23:00:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Feb 2022 00:00:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/iproute2: fix musl build Message-ID: <20220131230015.181368-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since bump to version 5.16.0 in commit 8f54d6d7859c0eabf303a44b26e6fafb1cb50143: ax25_ntop.c:5:10: fatal error: netax25/ax25.h: No such file or directory 5 | #include | ^~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/455840288bbe13ed585b0e2dc7b20a294dd1eee1 Signed-off-by: Fabrice Fontaine --- ...0001-lib-fix-ax25-h-include-for-musl.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch diff --git a/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch b/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch new file mode 100644 index 0000000000..1f8860c5d8 --- /dev/null +++ b/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch @@ -0,0 +1,37 @@ +From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 13 Jan 2022 08:14:13 +0000 +Subject: [PATCH] lib: fix ax25.h include for musl + +ax25.h isn't guaranteed to be avilable in netax25/*; +it's dependent on our choice of libc (it's not available +on musl at least) [0]. + +Let's use the version from linux-headers. + +[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers +Bug: https://bugs.gentoo.org/831102 + +Signed-off-by: Sam James +Signed-off-by: Stephen Hemminger + +[Retrieved from: +https://github.com/shemminger/iproute2/commit/8bced38a941a181f1468fa39541e872e51b6022f] +Signed-off-by: Fabrice Fontaine +--- + lib/ax25_ntop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c +index cfd0e04b0..3a72a43e9 100644 +--- a/lib/ax25_ntop.c ++++ b/lib/ax25_ntop.c +@@ -2,7 +2,7 @@ + + #include + #include +-#include ++#include + + #include "utils.h" + -- 2.34.1 From petr.vorel at gmail.com Mon Jan 31 23:05:19 2022 From: petr.vorel at gmail.com (Petr Vorel) Date: Tue, 1 Feb 2022 00:05:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/iproute2: fix musl build In-Reply-To: <20220131230015.181368-1-fontaine.fabrice@gmail.com> References: <20220131230015.181368-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, good catch! Reviewed-by: Petr Vorel ... > diff --git a/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch b/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch ... > +[Retrieved from: > +https://github.com/shemminger/iproute2/commit/8bced38a941a181f1468fa39541e872e51b6022f] I'd use URL from primary git: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8bced38a941a181f1468fa39541e872e51b6022f Kind regards, Petr From ps.report at gmx.net Mon Jan 31 23:07:30 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 1 Feb 2022 00:07:30 +0100 Subject: [Buildroot] [PATCH v1] package/libcamera: fix uclibc/musl compile with libexecinfo enabled Message-ID: <20220131230730.22235-1-ps.report@gmx.net> - depend and link against libexecinfo if enabled to fix linking failure in case execinfo.h is detected, see libcamera-40f5fddca7f774944a53f58eeaebc4db79c373d8/meson.build: 32 if cc.has_header_symbol('execinfo.h', 'backtrace') 33 config_h.set('HAVE_BACKTRACE', 1) 34 endif - libexecinfo already depends on !BR2_TOOLCHAIN_USES_GLIBC Fixes: - http://autobuild.buildroot.net/results/a1077815895ab847c5ca82ec17c7d13fe97cff53 .../powerpc-buildroot-linux-uclibc/bin/ld: src/libcamera/base/libcamera-base.so.p/log.cpp.o: in function `libcamera::Logger::backtrace()': log.cpp:(.text+0x34b0): undefined reference to `backtrace' .../powerpc-buildroot-linux-uclibc/bin/ld: log.cpp:(.text+0x34c0): undefined reference to `backtrace_symbols' Signed-off-by: Peter Seiderer --- package/libcamera/libcamera.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 524cf07e03..9be45d248a 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -99,4 +99,9 @@ else LIBCAMERA_CONF_OPTS += -Dtracing=disabled endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LIBCAMERA_DEPENDENCIES += libexecinfo +LIBCAMERA_LDFLAGS += -lexecinfo +endif + $(eval $(meson-package)) -- 2.34.1